This commit was manufactured by cvs2svn to create tag 'csl-arm-2003-q4'.csl-arm-2003-q4

Sprout from master 2003-12-22 00:59:55 UTC DJ Delorie <dj@redhat.com> '* configure.in (*-*-uclinux): Exclude newlib, libgloss and rda.'
Cherrypick from cygnus 1999-05-03 07:29:06 UTC Richard Henderson <rth@redhat.com> '19990502 sourceware import':
    COPYING
    COPYING.LIB
    README
    config/mh-armpic
    config/mh-elfalphapic
    config/mh-m68kpic
    config/mh-papic
    config/mh-ppcpic
    config/mh-x86pic
    config/mt-d30v
    config/mt-netware
    config/mt-ospace
    etc/add-log.el
    etc/add-log.vi
    etc/configbuild.ein
    etc/configbuild.fig
    etc/configbuild.jin
    etc/configbuild.tin
    etc/configdev.ein
    etc/configdev.fig
    etc/configdev.jin
    etc/configdev.tin
    etc/configure
    etc/configure.in
    include/aout/hp.h
    include/aout/hppa.h
    include/coff/sym.h
    include/coff/symconst.h
    include/fopen-bin.h
    include/fopen-same.h
    include/fopen-vms.h
    include/gdbm.h
    include/mpw/ChangeLog
    include/mpw/README
    include/mpw/dir.h
    include/mpw/dirent.h
    include/mpw/fcntl.h
    include/mpw/grp.h
    include/mpw/mpw.h
    include/mpw/pwd.h
    include/mpw/stat.h
    include/mpw/sys/file.h
    include/mpw/sys/param.h
    include/mpw/sys/resource.h
    include/mpw/sys/stat.h
    include/mpw/sys/time.h
    include/mpw/sys/types.h
    include/mpw/utime.h
    include/mpw/varargs.h
    include/nlm/ppc-ext.h
    include/opcode/mn10200.h
    include/opcode/tahoe.h
    include/opcode/tic30.h
    makefile.vms
    move-if-change
    mpw-README
    mpw-build.in
    mpw-config.in
    mpw-configure
    mpw-install
    setup.com
    ylwrap
Delete:
    djunpack.bat
    winsup/CYGWIN_LICENSE
    winsup/ChangeLog
    winsup/Makefile.common
    winsup/Makefile.in
    winsup/bz2lib/CHANGES
    winsup/bz2lib/ChangeLog
    winsup/bz2lib/LICENSE
    winsup/bz2lib/Makefile
    winsup/bz2lib/Makefile-libbz2_so
    winsup/bz2lib/Makefile.in
    winsup/bz2lib/README
    winsup/bz2lib/README.COMPILATION.PROBLEMS
    winsup/bz2lib/Y2K_INFO
    winsup/bz2lib/aclocal.m4
    winsup/bz2lib/blocksort.c
    winsup/bz2lib/bzip2.1
    winsup/bz2lib/bzip2.1.preformatted
    winsup/bz2lib/bzip2.c
    winsup/bz2lib/bzip2.txt
    winsup/bz2lib/bzip2recover.c
    winsup/bz2lib/bzlib.c
    winsup/bz2lib/bzlib.h
    winsup/bz2lib/bzlib_private.h
    winsup/bz2lib/compress.c
    winsup/bz2lib/configure
    winsup/bz2lib/configure.in
    winsup/bz2lib/crctable.c
    winsup/bz2lib/decompress.c
    winsup/bz2lib/dlltest.c
    winsup/bz2lib/dlltest.dsp
    winsup/bz2lib/huffman.c
    winsup/bz2lib/libbz2.def
    winsup/bz2lib/libbz2.dsp
    winsup/bz2lib/makefile.msc
    winsup/bz2lib/manual.ps
    winsup/bz2lib/manual.texi
    winsup/bz2lib/manual_1.html
    winsup/bz2lib/manual_2.html
    winsup/bz2lib/manual_3.html
    winsup/bz2lib/manual_4.html
    winsup/bz2lib/manual_toc.html
    winsup/bz2lib/randtable.c
    winsup/bz2lib/sample1.bz2
    winsup/bz2lib/sample1.ref
    winsup/bz2lib/sample2.bz2
    winsup/bz2lib/sample2.ref
    winsup/bz2lib/sample3.bz2
    winsup/bz2lib/sample3.ref
    winsup/bz2lib/spewG.c
    winsup/bz2lib/unzcrash.c
    winsup/bz2lib/words0
    winsup/bz2lib/words1
    winsup/bz2lib/words2
    winsup/bz2lib/words3
    winsup/configure
    winsup/configure.in
    winsup/cygserver/ChangeLog
    winsup/cygserver/Makefile.in
    winsup/cygserver/README
    winsup/cygserver/bsd_helper.cc
    winsup/cygserver/bsd_helper.h
    winsup/cygserver/bsd_log.cc
    winsup/cygserver/bsd_log.h
    winsup/cygserver/bsd_mutex.cc
    winsup/cygserver/bsd_mutex.h
    winsup/cygserver/client.cc
    winsup/cygserver/configure
    winsup/cygserver/configure.in
    winsup/cygserver/cygserver-config
    winsup/cygserver/cygserver.cc
    winsup/cygserver/cygserver.conf
    winsup/cygserver/msg.cc
    winsup/cygserver/process.cc
    winsup/cygserver/process.h
    winsup/cygserver/sem.cc
    winsup/cygserver/shm.cc
    winsup/cygserver/sysv_msg.cc
    winsup/cygserver/sysv_sem.cc
    winsup/cygserver/sysv_shm.cc
    winsup/cygserver/threaded_queue.cc
    winsup/cygserver/threaded_queue.h
    winsup/cygserver/transport.cc
    winsup/cygserver/transport.h
    winsup/cygserver/transport_pipes.cc
    winsup/cygserver/transport_pipes.h
    winsup/cygserver/transport_sockets.cc
    winsup/cygserver/transport_sockets.h
    winsup/cygserver/woutsup.h
    winsup/cygwin/CYGWIN_LICENSE
    winsup/cygwin/ChangeLog
    winsup/cygwin/ChangeLog-1995
    winsup/cygwin/ChangeLog-1996
    winsup/cygwin/ChangeLog-1997
    winsup/cygwin/ChangeLog-1998
    winsup/cygwin/ChangeLog-1999
    winsup/cygwin/ChangeLog-2000
    winsup/cygwin/ChangeLog-2001
    winsup/cygwin/ChangeLog-2002
    winsup/cygwin/Makefile.in
    winsup/cygwin/ROADMAP
    winsup/cygwin/acconfig.h
    winsup/cygwin/ansi.sgml
    winsup/cygwin/assert.cc
    winsup/cygwin/autoload.cc
    winsup/cygwin/automode.c
    winsup/cygwin/binmode.c
    winsup/cygwin/child_info.h
    winsup/cygwin/config.h.in
    winsup/cygwin/config/i386/profile.h
    winsup/cygwin/config/i386/setjmp.c
    winsup/cygwin/configure
    winsup/cygwin/configure.in
    winsup/cygwin/cpuid.h
    winsup/cygwin/crt0.c
    winsup/cygwin/cxx.cc
    winsup/cygwin/cygerrno.h
    winsup/cygwin/cygheap.cc
    winsup/cygwin/cygheap.h
    winsup/cygwin/cygmagic
    winsup/cygwin/cygmalloc.h
    winsup/cygwin/cygserver.h
    winsup/cygwin/cygserver_ipc.h
    winsup/cygwin/cygserver_msg.h
    winsup/cygwin/cygserver_sem.h
    winsup/cygwin/cygserver_shm.h
    winsup/cygwin/cygthread.cc
    winsup/cygwin/cygthread.h
    winsup/cygwin/cygtls.h
    winsup/cygwin/cygwin-shilka
    winsup/cygwin/cygwin.din
    winsup/cygwin/cygwin.sc
    winsup/cygwin/cygwin_version.h
    winsup/cygwin/dcrt0.cc
    winsup/cygwin/debug.cc
    winsup/cygwin/debug.h
    winsup/cygwin/delqueue.cc
    winsup/cygwin/devices.cc
    winsup/cygwin/devices.h
    winsup/cygwin/devices.in
    winsup/cygwin/dir.cc
    winsup/cygwin/dlfcn.cc
    winsup/cygwin/dll_init.cc
    winsup/cygwin/dll_init.h
    winsup/cygwin/dll_init.sgml
    winsup/cygwin/dlmalloc.c
    winsup/cygwin/dlmalloc.h
    winsup/cygwin/dtable.cc
    winsup/cygwin/dtable.h
    winsup/cygwin/dtable.sgml
    winsup/cygwin/environ.cc
    winsup/cygwin/environ.h
    winsup/cygwin/errno.cc
    winsup/cygwin/exceptions.cc
    winsup/cygwin/exec.cc
    winsup/cygwin/external.cc
    winsup/cygwin/external.sgml
    winsup/cygwin/fcntl.cc
    winsup/cygwin/fhandler.cc
    winsup/cygwin/fhandler.h
    winsup/cygwin/fhandler_clipboard.cc
    winsup/cygwin/fhandler_console.cc
    winsup/cygwin/fhandler_disk_file.cc
    winsup/cygwin/fhandler_dsp.cc
    winsup/cygwin/fhandler_fifo.cc
    winsup/cygwin/fhandler_floppy.cc
    winsup/cygwin/fhandler_mem.cc
    winsup/cygwin/fhandler_nodevice.cc
    winsup/cygwin/fhandler_proc.cc
    winsup/cygwin/fhandler_process.cc
    winsup/cygwin/fhandler_random.cc
    winsup/cygwin/fhandler_raw.cc
    winsup/cygwin/fhandler_registry.cc
    winsup/cygwin/fhandler_serial.cc
    winsup/cygwin/fhandler_socket.cc
    winsup/cygwin/fhandler_tape.cc
    winsup/cygwin/fhandler_termios.cc
    winsup/cygwin/fhandler_tty.cc
    winsup/cygwin/fhandler_virtual.cc
    winsup/cygwin/fhandler_windows.cc
    winsup/cygwin/fhandler_zero.cc
    winsup/cygwin/flock.cc
    winsup/cygwin/fork.cc
    winsup/cygwin/gcrt0.c
    winsup/cygwin/gendef
    winsup/cygwin/gendevices
    winsup/cygwin/gentls_offsets
    winsup/cygwin/glob.c
    winsup/cygwin/gmon.c
    winsup/cygwin/gmon.h
    winsup/cygwin/grp.cc
    winsup/cygwin/heap.cc
    winsup/cygwin/heap.h
    winsup/cygwin/hires.h
    winsup/cygwin/how-autoload-works.txt
    winsup/cygwin/how-cygheap-works.txt
    winsup/cygwin/how-fhandlers-work.txt
    winsup/cygwin/how-signals-work.txt
    winsup/cygwin/how-spawn-works.txt
    winsup/cygwin/how-to-debug-cygwin.txt
    winsup/cygwin/how-vfork-works.txt
    winsup/cygwin/include/a.out.h
    winsup/cygwin/include/arpa/ftp.h
    winsup/cygwin/include/arpa/inet.h
    winsup/cygwin/include/arpa/telnet.h
    winsup/cygwin/include/asm/byteorder.h
    winsup/cygwin/include/asm/socket.h
    winsup/cygwin/include/asm/types.h
    winsup/cygwin/include/cygwin/acl.h
    winsup/cygwin/include/cygwin/config.h
    winsup/cygwin/include/cygwin/core_dump.h
    winsup/cygwin/include/cygwin/cygwin_dll.h
    winsup/cygwin/include/cygwin/fs.h
    winsup/cygwin/include/cygwin/grp.h
    winsup/cygwin/include/cygwin/hdreg.h
    winsup/cygwin/include/cygwin/icmp.h
    winsup/cygwin/include/cygwin/if.h
    winsup/cygwin/include/cygwin/in.h
    winsup/cygwin/include/cygwin/in_systm.h
    winsup/cygwin/include/cygwin/ipc.h
    winsup/cygwin/include/cygwin/msg.h
    winsup/cygwin/include/cygwin/mtio.h
    winsup/cygwin/include/cygwin/rdevio.h
    winsup/cygwin/include/cygwin/sem.h
    winsup/cygwin/include/cygwin/shm.h
    winsup/cygwin/include/cygwin/signal.h
    winsup/cygwin/include/cygwin/socket.h
    winsup/cygwin/include/cygwin/sockios.h
    winsup/cygwin/include/cygwin/stat.h
    winsup/cygwin/include/cygwin/sysproto.h
    winsup/cygwin/include/cygwin/types.h
    winsup/cygwin/include/cygwin/uio.h
    winsup/cygwin/include/cygwin/version.h
    winsup/cygwin/include/dlfcn.h
    winsup/cygwin/include/err.h
    winsup/cygwin/include/exceptions.h
    winsup/cygwin/include/fcntl.h
    winsup/cygwin/include/features.h
    winsup/cygwin/include/fnmatch.h
    winsup/cygwin/include/getopt.h
    winsup/cygwin/include/glob.h
    winsup/cygwin/include/icmp.h
    winsup/cygwin/include/inttypes.h
    winsup/cygwin/include/io.h
    winsup/cygwin/include/lastlog.h
    winsup/cygwin/include/limits.h
    winsup/cygwin/include/mapi.h
    winsup/cygwin/include/memory.h
    winsup/cygwin/include/mntent.h
    winsup/cygwin/include/net/if.h
    winsup/cygwin/include/netdb.h
    winsup/cygwin/include/netinet/in.h
    winsup/cygwin/include/netinet/in_systm.h
    winsup/cygwin/include/netinet/ip.h
    winsup/cygwin/include/netinet/ip_icmp.h
    winsup/cygwin/include/netinet/tcp.h
    winsup/cygwin/include/netinet/udp.h
    winsup/cygwin/include/paths.h
    winsup/cygwin/include/poll.h
    winsup/cygwin/include/pthread.h
    winsup/cygwin/include/pty.h
    winsup/cygwin/include/sched.h
    winsup/cygwin/include/semaphore.h
    winsup/cygwin/include/stdint.h
    winsup/cygwin/include/strings.h
    winsup/cygwin/include/sys/acl.h
    winsup/cygwin/include/sys/cdefs.h
    winsup/cygwin/include/sys/copying.dj
    winsup/cygwin/include/sys/cygwin.h
    winsup/cygwin/include/sys/dirent.h
    winsup/cygwin/include/sys/file.h
    winsup/cygwin/include/sys/ioctl.h
    winsup/cygwin/include/sys/ipc.h
    winsup/cygwin/include/sys/mman.h
    winsup/cygwin/include/sys/mount.h
    winsup/cygwin/include/sys/msg.h
    winsup/cygwin/include/sys/mtio.h
    winsup/cygwin/include/sys/param.h
    winsup/cygwin/include/sys/poll.h
    winsup/cygwin/include/sys/procfs.h
    winsup/cygwin/include/sys/queue.h
    winsup/cygwin/include/sys/resource.h
    winsup/cygwin/include/sys/select.h
    winsup/cygwin/include/sys/sem.h
    winsup/cygwin/include/sys/shm.h
    winsup/cygwin/include/sys/smallprint.h
    winsup/cygwin/include/sys/socket.h
    winsup/cygwin/include/sys/soundcard.h
    winsup/cygwin/include/sys/statfs.h
    winsup/cygwin/include/sys/strace.h
    winsup/cygwin/include/sys/syslog.h
    winsup/cygwin/include/sys/sysmacros.h
    winsup/cygwin/include/sys/sysproto.h
    winsup/cygwin/include/sys/termio.h
    winsup/cygwin/include/sys/termios.h
    winsup/cygwin/include/sys/ttychars.h
    winsup/cygwin/include/sys/uio.h
    winsup/cygwin/include/sys/un.h
    winsup/cygwin/include/sys/utime.h
    winsup/cygwin/include/sys/utmp.h
    winsup/cygwin/include/sys/utsname.h
    winsup/cygwin/include/sys/vfs.h
    winsup/cygwin/include/sys/wait.h
    winsup/cygwin/include/sysexits.h
    winsup/cygwin/include/syslog.h
    winsup/cygwin/include/termio.h
    winsup/cygwin/include/tzfile.h
    winsup/cygwin/init.cc
    winsup/cygwin/ioctl.cc
    winsup/cygwin/ipc.cc
    winsup/cygwin/lib/_cygwin_crt0_common.cc
    winsup/cygwin/lib/crt0.h
    winsup/cygwin/lib/cygwin_attach_dll.c
    winsup/cygwin/lib/cygwin_crt0.c
    winsup/cygwin/lib/dll_entry.c
    winsup/cygwin/lib/dll_main.cc
    winsup/cygwin/lib/libcmain.c
    winsup/cygwin/lib/premain0.c
    winsup/cygwin/lib/premain1.c
    winsup/cygwin/lib/premain2.c
    winsup/cygwin/lib/premain3.c
    winsup/cygwin/lib/pseudo-reloc.c
    winsup/cygwin/libc/bsdlib.cc
    winsup/cygwin/libc/fnmatch.c
    winsup/cygwin/libc/getopt.c
    winsup/cygwin/libc/iruserok.c
    winsup/cygwin/localtime.cc
    winsup/cygwin/malloc.cc
    winsup/cygwin/malloc_wrapper.cc
    winsup/cygwin/mcount.c
    winsup/cygwin/misc-std.sgml
    winsup/cygwin/miscfuncs.cc
    winsup/cygwin/mkvers.sh
    winsup/cygwin/mmap.cc
    winsup/cygwin/msg.cc
    winsup/cygwin/net.cc
    winsup/cygwin/netdb.cc
    winsup/cygwin/newsym
    winsup/cygwin/ntdll.h
    winsup/cygwin/ntea.cc
    winsup/cygwin/passwd.cc
    winsup/cygwin/path.cc
    winsup/cygwin/path.h
    winsup/cygwin/path.sgml
    winsup/cygwin/perprocess.h
    winsup/cygwin/perthread.h
    winsup/cygwin/pinfo.cc
    winsup/cygwin/pinfo.h
    winsup/cygwin/pipe.cc
    winsup/cygwin/poll.cc
    winsup/cygwin/posix.sgml
    winsup/cygwin/profil.c
    winsup/cygwin/profil.h
    winsup/cygwin/pseudo-reloc.cc
    winsup/cygwin/pthread.cc
    winsup/cygwin/pwdgrp.h
    winsup/cygwin/regex/COPYRIGHT
    winsup/cygwin/regex/cclass.h
    winsup/cygwin/regex/cname.h
    winsup/cygwin/regex/engine.c
    winsup/cygwin/regex/engine.ih
    winsup/cygwin/regex/mkh
    winsup/cygwin/regex/regcomp.c
    winsup/cygwin/regex/regcomp.ih
    winsup/cygwin/regex/regerror.c
    winsup/cygwin/regex/regerror.ih
    winsup/cygwin/regex/regex.3
    winsup/cygwin/regex/regex.7
    winsup/cygwin/regex/regex.h
    winsup/cygwin/regex/regex2.h
    winsup/cygwin/regex/regexec.c
    winsup/cygwin/regex/regfree.c
    winsup/cygwin/regex/tests
    winsup/cygwin/regex/utils.h
    winsup/cygwin/regexp/COPYRIGHT
    winsup/cygwin/regexp/README
    winsup/cygwin/regexp/regexp.h
    winsup/cygwin/regexp/regmagic.h
    winsup/cygwin/regexp/v8_regerror.c
    winsup/cygwin/regexp/v8_regexp.c
    winsup/cygwin/regexp/v8_regsub.c
    winsup/cygwin/registry.cc
    winsup/cygwin/registry.h
    winsup/cygwin/resource.cc
    winsup/cygwin/rmsym
    winsup/cygwin/scandir.cc
    winsup/cygwin/sched.cc
    winsup/cygwin/sec_acl.cc
    winsup/cygwin/sec_helper.cc
    winsup/cygwin/security.cc
    winsup/cygwin/security.h
    winsup/cygwin/select.cc
    winsup/cygwin/select.h
    winsup/cygwin/sem.cc
    winsup/cygwin/shared.cc
    winsup/cygwin/shared.sgml
    winsup/cygwin/shared_info.h
    winsup/cygwin/shm.cc
    winsup/cygwin/signal.cc
    winsup/cygwin/sigproc.cc
    winsup/cygwin/sigproc.h
    winsup/cygwin/smallprint.c
    winsup/cygwin/spawn.cc
    winsup/cygwin/speclib
    winsup/cygwin/stackdump.sgml
    winsup/cygwin/strace.cc
    winsup/cygwin/string.h
    winsup/cygwin/strsep.cc
    winsup/cygwin/sync.cc
    winsup/cygwin/sync.h
    winsup/cygwin/syscalls.cc
    winsup/cygwin/sysconf.cc
    winsup/cygwin/syslog.cc
    winsup/cygwin/termios.cc
    winsup/cygwin/textmode.c
    winsup/cygwin/thread.cc
    winsup/cygwin/thread.h
    winsup/cygwin/times.cc
    winsup/cygwin/tlsoffsets.h
    winsup/cygwin/tty.cc
    winsup/cygwin/tty.h
    winsup/cygwin/tz_posixrules.h
    winsup/cygwin/uinfo.cc
    winsup/cygwin/uname.cc
    winsup/cygwin/wait.cc
    winsup/cygwin/winbase.h
    winsup/cygwin/wincap.cc
    winsup/cygwin/wincap.h
    winsup/cygwin/window.cc
    winsup/cygwin/winsup.h
    winsup/cygwin/winver.rc
    winsup/cygwin/wsock_event.h
    winsup/doc/ChangeLog
    winsup/doc/Makefile.in
    winsup/doc/calls.texinfo
    winsup/doc/changes.texinfo
    winsup/doc/configure
    winsup/doc/configure.in
    winsup/doc/copy.texinfo
    winsup/doc/cygwin-api.in.sgml
    winsup/doc/cygwin-ug-net.in.sgml
    winsup/doc/cygwin-ug.in.sgml
    winsup/doc/cygwinenv.sgml
    winsup/doc/dll.sgml
    winsup/doc/doctool.c
    winsup/doc/doctool.txt
    winsup/doc/effectively.sgml
    winsup/doc/faq.texinfo
    winsup/doc/fhandler-tut.txt
    winsup/doc/filemodes.sgml
    winsup/doc/gcc.sgml
    winsup/doc/gdb.sgml
    winsup/doc/history.texinfo
    winsup/doc/how-api.texinfo
    winsup/doc/how-programming.texinfo
    winsup/doc/how-resources.texinfo
    winsup/doc/how-using.texinfo
    winsup/doc/how.texinfo
    winsup/doc/install.texinfo
    winsup/doc/legal.sgml
    winsup/doc/ntsec.sgml
    winsup/doc/overview.sgml
    winsup/doc/overview2.sgml
    winsup/doc/pathnames.sgml
    winsup/doc/programming.sgml
    winsup/doc/readme.texinfo
    winsup/doc/relnotes.texinfo
    winsup/doc/setup-net.sgml
    winsup/doc/setup.sgml
    winsup/doc/setup2.sgml
    winsup/doc/textbinary.sgml
    winsup/doc/using.sgml
    winsup/doc/what.texinfo
    winsup/doc/who.texinfo
    winsup/doc/windres.sgml
    winsup/mingw/CRT_fp10.c
    winsup/mingw/CRT_fp8.c
    winsup/mingw/CRT_noglob.c
    winsup/mingw/CRTfmode.c
    winsup/mingw/CRTglob.c
    winsup/mingw/CRTinit.c
    winsup/mingw/ChangeLog
    winsup/mingw/Makefile.in
    winsup/mingw/README
    winsup/mingw/TODO
    winsup/mingw/binmode.c
    winsup/mingw/config.guess
    winsup/mingw/config.sub
    winsup/mingw/configure
    winsup/mingw/configure.in
    winsup/mingw/crt1.c
    winsup/mingw/crtdll.def
    winsup/mingw/crtmt.c
    winsup/mingw/crtst.c
    winsup/mingw/dllcrt1.c
    winsup/mingw/dllmain.c
    winsup/mingw/gccmain.c
    winsup/mingw/include/_mingw.h
    winsup/mingw/include/assert.h
    winsup/mingw/include/complex.h
    winsup/mingw/include/conio.h
    winsup/mingw/include/ctype.h
    winsup/mingw/include/dir.h
    winsup/mingw/include/direct.h
    winsup/mingw/include/dirent.h
    winsup/mingw/include/dos.h
    winsup/mingw/include/errno.h
    winsup/mingw/include/excpt.h
    winsup/mingw/include/fcntl.h
    winsup/mingw/include/fenv.h
    winsup/mingw/include/float.h
    winsup/mingw/include/getopt.h
    winsup/mingw/include/inttypes.h
    winsup/mingw/include/io.h
    winsup/mingw/include/limits.h
    winsup/mingw/include/locale.h
    winsup/mingw/include/malloc.h
    winsup/mingw/include/math.h
    winsup/mingw/include/mbctype.h
    winsup/mingw/include/mbstring.h
    winsup/mingw/include/mem.h
    winsup/mingw/include/memory.h
    winsup/mingw/include/process.h
    winsup/mingw/include/search.h
    winsup/mingw/include/setjmp.h
    winsup/mingw/include/share.h
    winsup/mingw/include/signal.h
    winsup/mingw/include/stdarg.h
    winsup/mingw/include/stddef.h
    winsup/mingw/include/stdint.h
    winsup/mingw/include/stdio.h
    winsup/mingw/include/stdlib.h
    winsup/mingw/include/string.h
    winsup/mingw/include/strings.h
    winsup/mingw/include/sys/fcntl.h
    winsup/mingw/include/sys/file.h
    winsup/mingw/include/sys/locking.h
    winsup/mingw/include/sys/param.h
    winsup/mingw/include/sys/stat.h
    winsup/mingw/include/sys/time.h
    winsup/mingw/include/sys/timeb.h
    winsup/mingw/include/sys/types.h
    winsup/mingw/include/sys/unistd.h
    winsup/mingw/include/sys/utime.h
    winsup/mingw/include/tchar.h
    winsup/mingw/include/time.h
    winsup/mingw/include/unistd.h
    winsup/mingw/include/utime.h
    winsup/mingw/include/values.h
    winsup/mingw/include/varargs.h
    winsup/mingw/include/wchar.h
    winsup/mingw/include/wctype.h
    winsup/mingw/init.c
    winsup/mingw/install-sh
    winsup/mingw/isascii.c
    winsup/mingw/iscsym.c
    winsup/mingw/iscsymf.c
    winsup/mingw/jamfile
    winsup/mingw/main.c
    winsup/mingw/mingwex/Makefile.in
    winsup/mingw/mingwex/_Exit.c
    winsup/mingw/mingwex/atoll.c
    winsup/mingw/mingwex/complex/cabs.c
    winsup/mingw/mingwex/complex/cacos.c
    winsup/mingw/mingwex/complex/cacosh.c
    winsup/mingw/mingwex/complex/casin.c
    winsup/mingw/mingwex/complex/casinh.c
    winsup/mingw/mingwex/complex/catan.c
    winsup/mingw/mingwex/complex/catanh.c
    winsup/mingw/mingwex/complex/ccos.c
    winsup/mingw/mingwex/complex/ccosh.c
    winsup/mingw/mingwex/complex/cexp.c
    winsup/mingw/mingwex/complex/cimag.c
    winsup/mingw/mingwex/complex/clog.c
    winsup/mingw/mingwex/complex/cpow.c
    winsup/mingw/mingwex/complex/cproj.c
    winsup/mingw/mingwex/complex/creal.c
    winsup/mingw/mingwex/complex/csin.c
    winsup/mingw/mingwex/complex/csinh.c
    winsup/mingw/mingwex/complex/csqrt.c
    winsup/mingw/mingwex/complex/ctan.c
    winsup/mingw/mingwex/complex/ctanh.c
    winsup/mingw/mingwex/configure
    winsup/mingw/mingwex/configure.in
    winsup/mingw/mingwex/dirent.c
    winsup/mingw/mingwex/feclearexcept.c
    winsup/mingw/mingwex/fegetenv.c
    winsup/mingw/mingwex/fegetexceptflag.c
    winsup/mingw/mingwex/fegetround.c
    winsup/mingw/mingwex/feholdexcept.c
    winsup/mingw/mingwex/feraiseexcept.c
    winsup/mingw/mingwex/fesetenv.c
    winsup/mingw/mingwex/fesetexceptflag.c
    winsup/mingw/mingwex/fesetround.c
    winsup/mingw/mingwex/fetestexcept.c
    winsup/mingw/mingwex/feupdateenv.c
    winsup/mingw/mingwex/fwide.c
    winsup/mingw/mingwex/getopt.c
    winsup/mingw/mingwex/imaxabs.c
    winsup/mingw/mingwex/imaxdiv.c
    winsup/mingw/mingwex/ldtoa.c
    winsup/mingw/mingwex/lltoa.c
    winsup/mingw/mingwex/lltow.c
    winsup/mingw/mingwex/math/acosf.c
    winsup/mingw/mingwex/math/acosl.c
    winsup/mingw/mingwex/math/asinf.c
    winsup/mingw/mingwex/math/asinl.c
    winsup/mingw/mingwex/math/atan2f.c
    winsup/mingw/mingwex/math/atan2l.c
    winsup/mingw/mingwex/math/atanf.c
    winsup/mingw/mingwex/math/atanl.c
    winsup/mingw/mingwex/math/cbrt.c
    winsup/mingw/mingwex/math/cbrtf.c
    winsup/mingw/mingwex/math/cbrtl.c
    winsup/mingw/mingwex/math/ceilf.S
    winsup/mingw/mingwex/math/ceill.S
    winsup/mingw/mingwex/math/cephes_emath.c
    winsup/mingw/mingwex/math/cephes_emath.h
    winsup/mingw/mingwex/math/cephes_mconf.h
    winsup/mingw/mingwex/math/copysign.S
    winsup/mingw/mingwex/math/copysignf.S
    winsup/mingw/mingwex/math/copysignl.S
    winsup/mingw/mingwex/math/cosf.S
    winsup/mingw/mingwex/math/coshf.c
    winsup/mingw/mingwex/math/coshl.c
    winsup/mingw/mingwex/math/cosl.S
    winsup/mingw/mingwex/math/exp2.S
    winsup/mingw/mingwex/math/exp2f.S
    winsup/mingw/mingwex/math/exp2l.S
    winsup/mingw/mingwex/math/expf.c
    winsup/mingw/mingwex/math/expl.c
    winsup/mingw/mingwex/math/fabs.c
    winsup/mingw/mingwex/math/fabsf.c
    winsup/mingw/mingwex/math/fabsl.c
    winsup/mingw/mingwex/math/fdim.c
    winsup/mingw/mingwex/math/fdimf.c
    winsup/mingw/mingwex/math/fdiml.c
    winsup/mingw/mingwex/math/floorf.S
    winsup/mingw/mingwex/math/floorl.S
    winsup/mingw/mingwex/math/fma.S
    winsup/mingw/mingwex/math/fmaf.S
    winsup/mingw/mingwex/math/fmal.c
    winsup/mingw/mingwex/math/fmax.c
    winsup/mingw/mingwex/math/fmaxf.c
    winsup/mingw/mingwex/math/fmaxl.c
    winsup/mingw/mingwex/math/fmin.c
    winsup/mingw/mingwex/math/fminf.c
    winsup/mingw/mingwex/math/fminl.c
    winsup/mingw/mingwex/math/fmodf.c
    winsup/mingw/mingwex/math/fmodl.c
    winsup/mingw/mingwex/math/fp_consts.c
    winsup/mingw/mingwex/math/fp_consts.h
    winsup/mingw/mingwex/math/fp_constsf.c
    winsup/mingw/mingwex/math/fp_constsl.c
    winsup/mingw/mingwex/math/fpclassify.c
    winsup/mingw/mingwex/math/fpclassifyf.c
    winsup/mingw/mingwex/math/fpclassifyl.c
    winsup/mingw/mingwex/math/frexpf.c
    winsup/mingw/mingwex/math/frexpl.S
    winsup/mingw/mingwex/math/fucom.c
    winsup/mingw/mingwex/math/hypotf.c
    winsup/mingw/mingwex/math/hypotl.c
    winsup/mingw/mingwex/math/ilogb.S
    winsup/mingw/mingwex/math/ilogbf.S
    winsup/mingw/mingwex/math/ilogbl.S
    winsup/mingw/mingwex/math/isnan.c
    winsup/mingw/mingwex/math/isnanf.c
    winsup/mingw/mingwex/math/isnanl.c
    winsup/mingw/mingwex/math/ldexpf.c
    winsup/mingw/mingwex/math/ldexpl.c
    winsup/mingw/mingwex/math/lgamma.c
    winsup/mingw/mingwex/math/lgammaf.c
    winsup/mingw/mingwex/math/lgammal.c
    winsup/mingw/mingwex/math/llrint.c
    winsup/mingw/mingwex/math/llrintf.c
    winsup/mingw/mingwex/math/llrintl.c
    winsup/mingw/mingwex/math/llround.c
    winsup/mingw/mingwex/math/llroundf.c
    winsup/mingw/mingwex/math/llroundl.c
    winsup/mingw/mingwex/math/log10f.S
    winsup/mingw/mingwex/math/log10l.S
    winsup/mingw/mingwex/math/log1p.S
    winsup/mingw/mingwex/math/log1pf.S
    winsup/mingw/mingwex/math/log1pl.S
    winsup/mingw/mingwex/math/log2.S
    winsup/mingw/mingwex/math/log2f.S
    winsup/mingw/mingwex/math/log2l.S
    winsup/mingw/mingwex/math/logb.c
    winsup/mingw/mingwex/math/logbf.c
    winsup/mingw/mingwex/math/logbl.c
    winsup/mingw/mingwex/math/logf.S
    winsup/mingw/mingwex/math/logl.S
    winsup/mingw/mingwex/math/lrint.c
    winsup/mingw/mingwex/math/lrintf.c
    winsup/mingw/mingwex/math/lrintl.c
    winsup/mingw/mingwex/math/lround.c
    winsup/mingw/mingwex/math/lroundf.c
    winsup/mingw/mingwex/math/lroundl.c
    winsup/mingw/mingwex/math/modff.c
    winsup/mingw/mingwex/math/modfl.c
    winsup/mingw/mingwex/math/nearbyint.S
    winsup/mingw/mingwex/math/nearbyintf.S
    winsup/mingw/mingwex/math/nearbyintl.S
    winsup/mingw/mingwex/math/nextafterf.c
    winsup/mingw/mingwex/math/pow.c
    winsup/mingw/mingwex/math/powf.c
    winsup/mingw/mingwex/math/powi.c
    winsup/mingw/mingwex/math/powif.c
    winsup/mingw/mingwex/math/powil.c
    winsup/mingw/mingwex/math/powl.c
    winsup/mingw/mingwex/math/remainder.S
    winsup/mingw/mingwex/math/remainderf.S
    winsup/mingw/mingwex/math/remainderl.S
    winsup/mingw/mingwex/math/remquo.S
    winsup/mingw/mingwex/math/remquof.S
    winsup/mingw/mingwex/math/remquol.S
    winsup/mingw/mingwex/math/rint.c
    winsup/mingw/mingwex/math/rintf.c
    winsup/mingw/mingwex/math/rintl.c
    winsup/mingw/mingwex/math/round.c
    winsup/mingw/mingwex/math/roundf.c
    winsup/mingw/mingwex/math/roundl.c
    winsup/mingw/mingwex/math/s_erf.c
    winsup/mingw/mingwex/math/scalbn.S
    winsup/mingw/mingwex/math/scalbnf.S
    winsup/mingw/mingwex/math/scalbnl.S
    winsup/mingw/mingwex/math/sf_erf.c
    winsup/mingw/mingwex/math/signbit.c
    winsup/mingw/mingwex/math/signbitf.c
    winsup/mingw/mingwex/math/signbitl.c
    winsup/mingw/mingwex/math/sinf.S
    winsup/mingw/mingwex/math/sinhf.c
    winsup/mingw/mingwex/math/sinhl.c
    winsup/mingw/mingwex/math/sinl.S
    winsup/mingw/mingwex/math/sqrtf.c
    winsup/mingw/mingwex/math/sqrtl.c
    winsup/mingw/mingwex/math/tanf.S
    winsup/mingw/mingwex/math/tanhf.c
    winsup/mingw/mingwex/math/tanhl.c
    winsup/mingw/mingwex/math/tanl.S
    winsup/mingw/mingwex/math/tgamma.c
    winsup/mingw/mingwex/math/tgammaf.c
    winsup/mingw/mingwex/math/tgammal.c
    winsup/mingw/mingwex/math/trunc.c
    winsup/mingw/mingwex/math/truncf.c
    winsup/mingw/mingwex/math/truncl.c
    winsup/mingw/mingwex/mbsinit.c
    winsup/mingw/mingwex/mingw-fseek.c
    winsup/mingw/mingwex/sitest.c
    winsup/mingw/mingwex/stdio/snprintf.c
    winsup/mingw/mingwex/stdio/snwprintf.c
    winsup/mingw/mingwex/stdio/vfscanf.c
    winsup/mingw/mingwex/stdio/vfwscanf.c
    winsup/mingw/mingwex/stdio/vscanf.c
    winsup/mingw/mingwex/stdio/vsnprintf.c
    winsup/mingw/mingwex/stdio/vsnwprintf.c
    winsup/mingw/mingwex/stdio/vsscanf.c
    winsup/mingw/mingwex/stdio/vswscanf.c
    winsup/mingw/mingwex/stdio/vwscanf.c
    winsup/mingw/mingwex/strtof.c
    winsup/mingw/mingwex/strtoimax.c
    winsup/mingw/mingwex/strtold.c
    winsup/mingw/mingwex/strtoumax.c
    winsup/mingw/mingwex/testwmem.c
    winsup/mingw/mingwex/ulltoa.c
    winsup/mingw/mingwex/ulltow.c
    winsup/mingw/mingwex/wcstof.c
    winsup/mingw/mingwex/wcstoimax.c
    winsup/mingw/mingwex/wcstold.c
    winsup/mingw/mingwex/wcstoumax.c
    winsup/mingw/mingwex/wdirent.c
    winsup/mingw/mingwex/wmemchr.c
    winsup/mingw/mingwex/wmemcmp.c
    winsup/mingw/mingwex/wmemcpy.c
    winsup/mingw/mingwex/wmemmove.c
    winsup/mingw/mingwex/wmemset.c
    winsup/mingw/mingwex/wtoll.c
    winsup/mingw/mkinstalldirs
    winsup/mingw/moldname.def.in
    winsup/mingw/msvcrt.def.in
    winsup/mingw/mthr.c
    winsup/mingw/mthr_init.c
    winsup/mingw/mthr_stub.c
    winsup/mingw/profile/Makefile.in
    winsup/mingw/profile/configure
    winsup/mingw/profile/configure.in
    winsup/mingw/profile/gcrt0.c
    winsup/mingw/profile/gmon.c
    winsup/mingw/profile/gmon.h
    winsup/mingw/profile/mcount.c
    winsup/mingw/profile/profil.c
    winsup/mingw/profile/profil.h
    winsup/mingw/profile/profile.h
    winsup/mingw/pseudo-reloc-list.c
    winsup/mingw/pseudo-reloc.c
    winsup/mingw/readme.txt
    winsup/mingw/samples/dirent/jamfile
    winsup/mingw/samples/dirent/test.c
    winsup/mingw/samples/dirent/wtest.c
    winsup/mingw/samples/dlltest/dll.c
    winsup/mingw/samples/dlltest/dll.def
    winsup/mingw/samples/dlltest/dll.h
    winsup/mingw/samples/dlltest/exe.c
    winsup/mingw/samples/dlltest/exe.exp
    winsup/mingw/samples/dlltest/expexe.c
    winsup/mingw/samples/dlltest/expexe.def
    winsup/mingw/samples/dlltest/jamfile
    winsup/mingw/samples/dlltest/loaddll.c
    winsup/mingw/samples/dlltest/loadexe.c
    winsup/mingw/samples/dlltest/readme.txt
    winsup/mingw/samples/dlltest/silly.cpp
    winsup/mingw/samples/dlltest/silly.def
    winsup/mingw/samples/dlltest/silly.exp
    winsup/mingw/samples/dlltest/silly.h
    winsup/mingw/samples/dlltest/sillydll.cpp
    winsup/mingw/samples/filehand/filehand.c
    winsup/mingw/samples/filehand/jamfile
    winsup/mingw/samples/filehand/junk.txt
    winsup/mingw/samples/fixargv/fixargv.c
    winsup/mingw/samples/fixargv/fixargv.h
    winsup/mingw/samples/fixargv/readme.txt
    winsup/mingw/samples/fmode/all.c
    winsup/mingw/samples/fmode/jamfile
    winsup/mingw/samples/fmode/readme.txt
    winsup/mingw/samples/fmode/test.c
    winsup/mingw/samples/fmode/test2.c
    winsup/mingw/samples/globbing/glob.c
    winsup/mingw/samples/globbing/jamfile
    winsup/mingw/samples/globbing/noglob.c
    winsup/mingw/samples/globbing/readme.txt
    winsup/mingw/samples/print/jamfile
    winsup/mingw/samples/print/prntest.c
    winsup/mingw/samples/seh/eh3.c
    winsup/mingw/samples/seh/exutil.c
    winsup/mingw/samples/seh/exutil.def
    winsup/mingw/samples/seh/exutil.h
    winsup/mingw/samples/seh/jamfile
    winsup/mingw/samples/seh/sehfix.c
    winsup/mingw/samples/seh/sehsub.c
    winsup/mingw/samples/seh/sehtest.c
    winsup/mingw/samples/simpledll/dll.c
    winsup/mingw/samples/simpledll/dll.cpp
    winsup/mingw/samples/simpledll/dll.def
    winsup/mingw/samples/simpledll/exe.c
    winsup/mingw/samples/simpledll/jamfile
    winsup/mingw/samples/simpledll/makedll.bat
    winsup/mingw/samples/test/jamfile
    winsup/mingw/samples/test/test.c
    winsup/mingw/samples/wintest/jamfile
    winsup/mingw/samples/wintest/test.c
    winsup/mingw/strcasecmp.c
    winsup/mingw/strncasecmp.c
    winsup/mingw/test_headers.c
    winsup/mingw/toascii.c
    winsup/mingw/txtmode.c
    winsup/mingw/wcscmpi.c
    winsup/subauth/ChangeLog
    winsup/subauth/Makefile.in
    winsup/subauth/configure
    winsup/subauth/configure.in
    winsup/subauth/cygsuba.c
    winsup/subauth/cygsuba.din
    winsup/testsuite/ChangeLog
    winsup/testsuite/Makefile.in
    winsup/testsuite/README
    winsup/testsuite/config/default.exp
    winsup/testsuite/configure
    winsup/testsuite/configure.in
    winsup/testsuite/cygrun.c
    winsup/testsuite/libltp/include/dataascii.h
    winsup/testsuite/libltp/include/databin.h
    winsup/testsuite/libltp/include/file_lock.h
    winsup/testsuite/libltp/include/forker.h
    winsup/testsuite/libltp/include/open_flags.h
    winsup/testsuite/libltp/include/pattern.h
    winsup/testsuite/libltp/include/random_range.h
    winsup/testsuite/libltp/include/rmobj.h
    winsup/testsuite/libltp/include/search_path.h
    winsup/testsuite/libltp/include/str_to_bytes.h
    winsup/testsuite/libltp/include/string_to_tokens.h
    winsup/testsuite/libltp/include/test.h
    winsup/testsuite/libltp/include/tlibio.h
    winsup/testsuite/libltp/include/usctest.h
    winsup/testsuite/libltp/include/write_log.h
    winsup/testsuite/libltp/lib/dataascii.c
    winsup/testsuite/libltp/lib/databin.c
    winsup/testsuite/libltp/lib/datapid.c
    winsup/testsuite/libltp/lib/forker.c
    winsup/testsuite/libltp/lib/get_high_address.c
    winsup/testsuite/libltp/lib/libtestsuite.c
    winsup/testsuite/libltp/lib/open_flags.c
    winsup/testsuite/libltp/lib/parse_opts.c
    winsup/testsuite/libltp/lib/pattern.c
    winsup/testsuite/libltp/lib/rmobj.c
    winsup/testsuite/libltp/lib/search_path.c
    winsup/testsuite/libltp/lib/str_to_bytes.c
    winsup/testsuite/libltp/lib/string_to_tokens.c
    winsup/testsuite/libltp/lib/tst_res.c
    winsup/testsuite/libltp/lib/tst_sig.c
    winsup/testsuite/libltp/lib/tst_tmpdir.c
    winsup/testsuite/libltp/lib/write_log.c
    winsup/testsuite/winsup.api/checksignal.c
    winsup/testsuite/winsup.api/crlf.c
    winsup/testsuite/winsup.api/devzero.c
    winsup/testsuite/winsup.api/iospeed.c
    winsup/testsuite/winsup.api/known_bugs.tcl
    winsup/testsuite/winsup.api/ltp/access01.c
    winsup/testsuite/winsup.api/ltp/access03.c
    winsup/testsuite/winsup.api/ltp/access04.c
    winsup/testsuite/winsup.api/ltp/access05.c
    winsup/testsuite/winsup.api/ltp/alarm01.c
    winsup/testsuite/winsup.api/ltp/alarm02.c
    winsup/testsuite/winsup.api/ltp/alarm03.c
    winsup/testsuite/winsup.api/ltp/alarm07.c
    winsup/testsuite/winsup.api/ltp/asyncio02.c
    winsup/testsuite/winsup.api/ltp/chdir02.c
    winsup/testsuite/winsup.api/ltp/chdir04.c
    winsup/testsuite/winsup.api/ltp/chmod01.c
    winsup/testsuite/winsup.api/ltp/chmod02.c
    winsup/testsuite/winsup.api/ltp/chown01.c
    winsup/testsuite/winsup.api/ltp/close01.c
    winsup/testsuite/winsup.api/ltp/close02.c
    winsup/testsuite/winsup.api/ltp/close08.c
    winsup/testsuite/winsup.api/ltp/creat01.c
    winsup/testsuite/winsup.api/ltp/creat03.c
    winsup/testsuite/winsup.api/ltp/creat09.c
    winsup/testsuite/winsup.api/ltp/dup01.c
    winsup/testsuite/winsup.api/ltp/dup02.c
    winsup/testsuite/winsup.api/ltp/dup03.c
    winsup/testsuite/winsup.api/ltp/dup04.c
    winsup/testsuite/winsup.api/ltp/dup05.c
    winsup/testsuite/winsup.api/ltp/execl01.c
    winsup/testsuite/winsup.api/ltp/execle01.c
    winsup/testsuite/winsup.api/ltp/execlp01.c
    winsup/testsuite/winsup.api/ltp/execv01.c
    winsup/testsuite/winsup.api/ltp/execve01.c
    winsup/testsuite/winsup.api/ltp/execvp01.c
    winsup/testsuite/winsup.api/ltp/exit01.c
    winsup/testsuite/winsup.api/ltp/exit02.c
    winsup/testsuite/winsup.api/ltp/fchdir01.c
    winsup/testsuite/winsup.api/ltp/fchdir02.c
    winsup/testsuite/winsup.api/ltp/fchmod01.c
    winsup/testsuite/winsup.api/ltp/fchown01.c
    winsup/testsuite/winsup.api/ltp/fcntl02.c
    winsup/testsuite/winsup.api/ltp/fcntl03.c
    winsup/testsuite/winsup.api/ltp/fcntl04.c
    winsup/testsuite/winsup.api/ltp/fcntl05.c
    winsup/testsuite/winsup.api/ltp/fcntl07.c
    winsup/testsuite/winsup.api/ltp/fcntl07B.c
    winsup/testsuite/winsup.api/ltp/fcntl08.c
    winsup/testsuite/winsup.api/ltp/fcntl09.c
    winsup/testsuite/winsup.api/ltp/fcntl10.c
    winsup/testsuite/winsup.api/ltp/fork01.c
    winsup/testsuite/winsup.api/ltp/fork02.c
    winsup/testsuite/winsup.api/ltp/fork03.c
    winsup/testsuite/winsup.api/ltp/fork04.c
    winsup/testsuite/winsup.api/ltp/fork06.c
    winsup/testsuite/winsup.api/ltp/fork07.c
    winsup/testsuite/winsup.api/ltp/fork09.c
    winsup/testsuite/winsup.api/ltp/fork10.c
    winsup/testsuite/winsup.api/ltp/fork11.c
    winsup/testsuite/winsup.api/ltp/fpathconf01.c
    winsup/testsuite/winsup.api/ltp/fstat01.c
    winsup/testsuite/winsup.api/ltp/fstat02.c
    winsup/testsuite/winsup.api/ltp/fstat03.c
    winsup/testsuite/winsup.api/ltp/fstat04.c
    winsup/testsuite/winsup.api/ltp/fsync01.c
    winsup/testsuite/winsup.api/ltp/ftruncate01.c
    winsup/testsuite/winsup.api/ltp/ftruncate02.c
    winsup/testsuite/winsup.api/ltp/ftruncate03.c
    winsup/testsuite/winsup.api/ltp/getegid01.c
    winsup/testsuite/winsup.api/ltp/geteuid01.c
    winsup/testsuite/winsup.api/ltp/getgid01.c
    winsup/testsuite/winsup.api/ltp/getgid02.c
    winsup/testsuite/winsup.api/ltp/getgid03.c
    winsup/testsuite/winsup.api/ltp/getgroups01.c
    winsup/testsuite/winsup.api/ltp/getgroups02.c
    winsup/testsuite/winsup.api/ltp/gethostid01.c
    winsup/testsuite/winsup.api/ltp/gethostname01.c
    winsup/testsuite/winsup.api/ltp/getpgid01.c
    winsup/testsuite/winsup.api/ltp/getpgid02.c
    winsup/testsuite/winsup.api/ltp/getpgrp01.c
    winsup/testsuite/winsup.api/ltp/getpid01.c
    winsup/testsuite/winsup.api/ltp/getpid02.c
    winsup/testsuite/winsup.api/ltp/getppid01.c
    winsup/testsuite/winsup.api/ltp/getppid02.c
    winsup/testsuite/winsup.api/ltp/getuid01.c
    winsup/testsuite/winsup.api/ltp/getuid02.c
    winsup/testsuite/winsup.api/ltp/getuid03.c
    winsup/testsuite/winsup.api/ltp/kill01.c
    winsup/testsuite/winsup.api/ltp/kill02.c
    winsup/testsuite/winsup.api/ltp/kill03.c
    winsup/testsuite/winsup.api/ltp/kill04.c
    winsup/testsuite/winsup.api/ltp/kill09.c
    winsup/testsuite/winsup.api/ltp/link02.c
    winsup/testsuite/winsup.api/ltp/link03.c
    winsup/testsuite/winsup.api/ltp/link04.c
    winsup/testsuite/winsup.api/ltp/link05.c
    winsup/testsuite/winsup.api/ltp/lseek01.c
    winsup/testsuite/winsup.api/ltp/lseek02.c
    winsup/testsuite/winsup.api/ltp/lseek03.c
    winsup/testsuite/winsup.api/ltp/lseek04.c
    winsup/testsuite/winsup.api/ltp/lseek05.c
    winsup/testsuite/winsup.api/ltp/lseek06.c
    winsup/testsuite/winsup.api/ltp/lseek07.c
    winsup/testsuite/winsup.api/ltp/lseek08.c
    winsup/testsuite/winsup.api/ltp/lseek09.c
    winsup/testsuite/winsup.api/ltp/lseek10.c
    winsup/testsuite/winsup.api/ltp/lstat02.c
    winsup/testsuite/winsup.api/ltp/mkdir01.c
    winsup/testsuite/winsup.api/ltp/mkdir08.c
    winsup/testsuite/winsup.api/ltp/mknod01.c
    winsup/testsuite/winsup.api/ltp/mmap001.c
    winsup/testsuite/winsup.api/ltp/mmap02.c
    winsup/testsuite/winsup.api/ltp/mmap03.c
    winsup/testsuite/winsup.api/ltp/mmap04.c
    winsup/testsuite/winsup.api/ltp/mmap05.c
    winsup/testsuite/winsup.api/ltp/mmap06.c
    winsup/testsuite/winsup.api/ltp/mmap07.c
    winsup/testsuite/winsup.api/ltp/mmap08.c
    winsup/testsuite/winsup.api/ltp/munmap01.c
    winsup/testsuite/winsup.api/ltp/munmap02.c
    winsup/testsuite/winsup.api/ltp/nice05.c
    winsup/testsuite/winsup.api/ltp/open02.c
    winsup/testsuite/winsup.api/ltp/open03.c
    winsup/testsuite/winsup.api/ltp/pathconf01.c
    winsup/testsuite/winsup.api/ltp/pause01.c
    winsup/testsuite/winsup.api/ltp/pipe01.c
    winsup/testsuite/winsup.api/ltp/pipe08.c
    winsup/testsuite/winsup.api/ltp/pipe09.c
    winsup/testsuite/winsup.api/ltp/pipe10.c
    winsup/testsuite/winsup.api/ltp/pipe11.c
    winsup/testsuite/winsup.api/ltp/poll01.c
    winsup/testsuite/winsup.api/ltp/read01.c
    winsup/testsuite/winsup.api/ltp/read04.c
    winsup/testsuite/winsup.api/ltp/readdir01.c
    winsup/testsuite/winsup.api/ltp/readlink01.c
    winsup/testsuite/winsup.api/ltp/readlink02.c
    winsup/testsuite/winsup.api/ltp/readlink03.c
    winsup/testsuite/winsup.api/ltp/rename01.c
    winsup/testsuite/winsup.api/ltp/rename02.c
    winsup/testsuite/winsup.api/ltp/rename08.c
    winsup/testsuite/winsup.api/ltp/rename10.c
    winsup/testsuite/winsup.api/ltp/rmdir01.c
    winsup/testsuite/winsup.api/ltp/rmdir04.c
    winsup/testsuite/winsup.api/ltp/rmdir05.c
    winsup/testsuite/winsup.api/ltp/sbrk01.c
    winsup/testsuite/winsup.api/ltp/select01.c
    winsup/testsuite/winsup.api/ltp/select02.c
    winsup/testsuite/winsup.api/ltp/select03.c
    winsup/testsuite/winsup.api/ltp/setgid01.c
    winsup/testsuite/winsup.api/ltp/setgroups01.c
    winsup/testsuite/winsup.api/ltp/setpgid01.c
    winsup/testsuite/winsup.api/ltp/setregid01.c
    winsup/testsuite/winsup.api/ltp/setreuid01.c
    winsup/testsuite/winsup.api/ltp/setuid01.c
    winsup/testsuite/winsup.api/ltp/setuid02.c
    winsup/testsuite/winsup.api/ltp/signal03.c
    winsup/testsuite/winsup.api/ltp/stat01.c
    winsup/testsuite/winsup.api/ltp/stat02.c
    winsup/testsuite/winsup.api/ltp/stat03.c
    winsup/testsuite/winsup.api/ltp/stat05.c
    winsup/testsuite/winsup.api/ltp/stat06.c
    winsup/testsuite/winsup.api/ltp/symlink01.c
    winsup/testsuite/winsup.api/ltp/symlink02.c
    winsup/testsuite/winsup.api/ltp/symlink03.c
    winsup/testsuite/winsup.api/ltp/symlink04.c
    winsup/testsuite/winsup.api/ltp/symlink05.c
    winsup/testsuite/winsup.api/ltp/sync01.c
    winsup/testsuite/winsup.api/ltp/sync02.c
    winsup/testsuite/winsup.api/ltp/time01.c
    winsup/testsuite/winsup.api/ltp/time02.c
    winsup/testsuite/winsup.api/ltp/times01.c
    winsup/testsuite/winsup.api/ltp/times02.c
    winsup/testsuite/winsup.api/ltp/times03.c
    winsup/testsuite/winsup.api/ltp/truncate01.c
    winsup/testsuite/winsup.api/ltp/truncate02.c
    winsup/testsuite/winsup.api/ltp/ulimit01.c
    winsup/testsuite/winsup.api/ltp/umask01.c
    winsup/testsuite/winsup.api/ltp/umask02.c
    winsup/testsuite/winsup.api/ltp/umask03.c
    winsup/testsuite/winsup.api/ltp/uname01.c
    winsup/testsuite/winsup.api/ltp/unlink05.c
    winsup/testsuite/winsup.api/ltp/unlink06.c
    winsup/testsuite/winsup.api/ltp/unlink07.c
    winsup/testsuite/winsup.api/ltp/unlink08.c
    winsup/testsuite/winsup.api/ltp/vfork01.c
    winsup/testsuite/winsup.api/ltp/wait02.c
    winsup/testsuite/winsup.api/ltp/wait401.c
    winsup/testsuite/winsup.api/ltp/wait402.c
    winsup/testsuite/winsup.api/ltp/write01.c
    winsup/testsuite/winsup.api/ltp/write02.c
    winsup/testsuite/winsup.api/ltp/write03.c
    winsup/testsuite/winsup.api/mmaptest01.c
    winsup/testsuite/winsup.api/mmaptest02.c
    winsup/testsuite/winsup.api/mmaptest03.c
    winsup/testsuite/winsup.api/mmaptest04.c
    winsup/testsuite/winsup.api/msgtest.c
    winsup/testsuite/winsup.api/nullgetcwd.c
    winsup/testsuite/winsup.api/pthread/cancel1.c
    winsup/testsuite/winsup.api/pthread/cancel10.c
    winsup/testsuite/winsup.api/pthread/cancel11.c
    winsup/testsuite/winsup.api/pthread/cancel12.c
    winsup/testsuite/winsup.api/pthread/cancel2.c
    winsup/testsuite/winsup.api/pthread/cancel3.c
    winsup/testsuite/winsup.api/pthread/cancel4.c
    winsup/testsuite/winsup.api/pthread/cancel5.c
    winsup/testsuite/winsup.api/pthread/cancel6.c
    winsup/testsuite/winsup.api/pthread/cancel7.c
    winsup/testsuite/winsup.api/pthread/cancel8.c
    winsup/testsuite/winsup.api/pthread/cancel9.c
    winsup/testsuite/winsup.api/pthread/cleanup2.c
    winsup/testsuite/winsup.api/pthread/cleanup3.c
    winsup/testsuite/winsup.api/pthread/condvar1.c
    winsup/testsuite/winsup.api/pthread/condvar2.c
    winsup/testsuite/winsup.api/pthread/condvar2_1.c
    winsup/testsuite/winsup.api/pthread/condvar3.c
    winsup/testsuite/winsup.api/pthread/condvar3_1.c
    winsup/testsuite/winsup.api/pthread/condvar3_2.c
    winsup/testsuite/winsup.api/pthread/condvar3_3.c
    winsup/testsuite/winsup.api/pthread/condvar4.c
    winsup/testsuite/winsup.api/pthread/condvar5.c
    winsup/testsuite/winsup.api/pthread/condvar6.c
    winsup/testsuite/winsup.api/pthread/condvar7.c
    winsup/testsuite/winsup.api/pthread/condvar8.c
    winsup/testsuite/winsup.api/pthread/condvar9.c
    winsup/testsuite/winsup.api/pthread/count1.c
    winsup/testsuite/winsup.api/pthread/create1.c
    winsup/testsuite/winsup.api/pthread/create2.c
    winsup/testsuite/winsup.api/pthread/equal1.c
    winsup/testsuite/winsup.api/pthread/exit1.c
    winsup/testsuite/winsup.api/pthread/exit2.c
    winsup/testsuite/winsup.api/pthread/exit3.c
    winsup/testsuite/winsup.api/pthread/inherit1.c
    winsup/testsuite/winsup.api/pthread/join0.c
    winsup/testsuite/winsup.api/pthread/join1.c
    winsup/testsuite/winsup.api/pthread/join2.c
    winsup/testsuite/winsup.api/pthread/mainthreadexits.c
    winsup/testsuite/winsup.api/pthread/mutex1.c
    winsup/testsuite/winsup.api/pthread/mutex1d.c
    winsup/testsuite/winsup.api/pthread/mutex1e.c
    winsup/testsuite/winsup.api/pthread/mutex1n.c
    winsup/testsuite/winsup.api/pthread/mutex1r.c
    winsup/testsuite/winsup.api/pthread/mutex2.c
    winsup/testsuite/winsup.api/pthread/mutex3.c
    winsup/testsuite/winsup.api/pthread/mutex4.c
    winsup/testsuite/winsup.api/pthread/mutex5.c
    winsup/testsuite/winsup.api/pthread/mutex6d.c
    winsup/testsuite/winsup.api/pthread/mutex6e.c
    winsup/testsuite/winsup.api/pthread/mutex6n.c
    winsup/testsuite/winsup.api/pthread/mutex6r.c
    winsup/testsuite/winsup.api/pthread/mutex7.c
    winsup/testsuite/winsup.api/pthread/mutex7d.c
    winsup/testsuite/winsup.api/pthread/mutex7e.c
    winsup/testsuite/winsup.api/pthread/mutex7n.c
    winsup/testsuite/winsup.api/pthread/mutex7r.c
    winsup/testsuite/winsup.api/pthread/once1.c
    winsup/testsuite/winsup.api/pthread/priority1.c
    winsup/testsuite/winsup.api/pthread/priority2.c
    winsup/testsuite/winsup.api/pthread/rwlock1.c
    winsup/testsuite/winsup.api/pthread/rwlock2.c
    winsup/testsuite/winsup.api/pthread/rwlock3.c
    winsup/testsuite/winsup.api/pthread/rwlock4.c
    winsup/testsuite/winsup.api/pthread/rwlock5.c
    winsup/testsuite/winsup.api/pthread/rwlock6.c
    winsup/testsuite/winsup.api/pthread/rwlock7.c
    winsup/testsuite/winsup.api/pthread/self1.c
    winsup/testsuite/winsup.api/pthread/self2.c
    winsup/testsuite/winsup.api/pthread/test.h
    winsup/testsuite/winsup.api/pthread/threadidafterfork.c
    winsup/testsuite/winsup.api/pthread/tsd1.c
    winsup/testsuite/winsup.api/samples/sample-fail.c
    winsup/testsuite/winsup.api/samples/sample-miscompile.c
    winsup/testsuite/winsup.api/samples/sample-pass.c
    winsup/testsuite/winsup.api/semtest.c
    winsup/testsuite/winsup.api/shmtest.c
    winsup/testsuite/winsup.api/sigchld.c
    winsup/testsuite/winsup.api/signal-into-win32-api.c
    winsup/testsuite/winsup.api/systemcall.c
    winsup/testsuite/winsup.api/waitpid.c
    winsup/testsuite/winsup.api/winsup.exp
    winsup/utils/ChangeLog
    winsup/utils/ChangeLog-2000
    winsup/utils/Makefile.in
    winsup/utils/aclocal.m4
    winsup/utils/configure
    winsup/utils/configure.in
    winsup/utils/cygcheck.cc
    winsup/utils/cygpath.cc
    winsup/utils/dump_setup.cc
    winsup/utils/dumper.cc
    winsup/utils/dumper.h
    winsup/utils/getfacl.c
    winsup/utils/ipcrm.c
    winsup/utils/ipcs.c
    winsup/utils/kill.cc
    winsup/utils/mkgroup.c
    winsup/utils/mkpasswd.c
    winsup/utils/module_info.cc
    winsup/utils/mount.cc
    winsup/utils/parse_pe.cc
    winsup/utils/passwd.c
    winsup/utils/path.cc
    winsup/utils/path.h
    winsup/utils/ps.cc
    winsup/utils/regtool.cc
    winsup/utils/setfacl.c
    winsup/utils/ssp.c
    winsup/utils/ssp.txt
    winsup/utils/strace.cc
    winsup/utils/umount.cc
    winsup/utils/utils.sgml
    winsup/w32api/CONTRIBUTIONS
    winsup/w32api/ChangeLog
    winsup/w32api/Makefile.in
    winsup/w32api/README.w32api
    winsup/w32api/TODO
    winsup/w32api/config.guess
    winsup/w32api/config.sub
    winsup/w32api/configure
    winsup/w32api/configure.in
    winsup/w32api/include/GL/gl.h
    winsup/w32api/include/GL/glext.h
    winsup/w32api/include/GL/glu.h
    winsup/w32api/include/accctrl.h
    winsup/w32api/include/aclapi.h
    winsup/w32api/include/afxres.h
    winsup/w32api/include/basetsd.h
    winsup/w32api/include/basetyps.h
    winsup/w32api/include/cderr.h
    winsup/w32api/include/cguid.h
    winsup/w32api/include/comcat.h
    winsup/w32api/include/commctrl.h
    winsup/w32api/include/commdlg.h
    winsup/w32api/include/cpl.h
    winsup/w32api/include/cplext.h
    winsup/w32api/include/custcntl.h
    winsup/w32api/include/dbt.h
    winsup/w32api/include/dde.h
    winsup/w32api/include/ddeml.h
    winsup/w32api/include/ddk/atm.h
    winsup/w32api/include/ddk/batclass.h
    winsup/w32api/include/ddk/cfg.h
    winsup/w32api/include/ddk/cfgmgr32.h
    winsup/w32api/include/ddk/d4drvif.h
    winsup/w32api/include/ddk/d4iface.h
    winsup/w32api/include/ddk/ddkmapi.h
    winsup/w32api/include/ddk/hidclass.h
    winsup/w32api/include/ddk/hidpi.h
    winsup/w32api/include/ddk/hidusage.h
    winsup/w32api/include/ddk/mcd.h
    winsup/w32api/include/ddk/miniport.h
    winsup/w32api/include/ddk/minitape.h
    winsup/w32api/include/ddk/mountdev.h
    winsup/w32api/include/ddk/mountmgr.h
    winsup/w32api/include/ddk/ndis.h
    winsup/w32api/include/ddk/ndisguid.h
    winsup/w32api/include/ddk/ndistapi.h
    winsup/w32api/include/ddk/ndiswan.h
    winsup/w32api/include/ddk/netevent.h
    winsup/w32api/include/ddk/netpnp.h
    winsup/w32api/include/ddk/newdev.h
    winsup/w32api/include/ddk/ntapi.h
    winsup/w32api/include/ddk/ntdd8042.h
    winsup/w32api/include/ddk/ntddbeep.h
    winsup/w32api/include/ddk/ntddcdrm.h
    winsup/w32api/include/ddk/ntddcdvd.h
    winsup/w32api/include/ddk/ntddchgr.h
    winsup/w32api/include/ddk/ntdddisk.h
    winsup/w32api/include/ddk/ntddk.h
    winsup/w32api/include/ddk/ntddkbd.h
    winsup/w32api/include/ddk/ntddmou.h
    winsup/w32api/include/ddk/ntddndis.h
    winsup/w32api/include/ddk/ntddpar.h
    winsup/w32api/include/ddk/ntddpcm.h
    winsup/w32api/include/ddk/ntddscsi.h
    winsup/w32api/include/ddk/ntddser.h
    winsup/w32api/include/ddk/ntddstor.h
    winsup/w32api/include/ddk/ntddtape.h
    winsup/w32api/include/ddk/ntddtdi.h
    winsup/w32api/include/ddk/ntddvdeo.h
    winsup/w32api/include/ddk/ntddvol.h
    winsup/w32api/include/ddk/ntifs.h
    winsup/w32api/include/ddk/ntpoapi.h
    winsup/w32api/include/ddk/ntstatus.h
    winsup/w32api/include/ddk/parallel.h
    winsup/w32api/include/ddk/pfhook.h
    winsup/w32api/include/ddk/poclass.h
    winsup/w32api/include/ddk/scsi.h
    winsup/w32api/include/ddk/scsiscan.h
    winsup/w32api/include/ddk/scsiwmi.h
    winsup/w32api/include/ddk/smbus.h
    winsup/w32api/include/ddk/srb.h
    winsup/w32api/include/ddk/storport.h
    winsup/w32api/include/ddk/tdi.h
    winsup/w32api/include/ddk/tdiinfo.h
    winsup/w32api/include/ddk/tdikrnl.h
    winsup/w32api/include/ddk/tdistat.h
    winsup/w32api/include/ddk/tvout.h
    winsup/w32api/include/ddk/upssvc.h
    winsup/w32api/include/ddk/usb.h
    winsup/w32api/include/ddk/usb100.h
    winsup/w32api/include/ddk/usbcamdi.h
    winsup/w32api/include/ddk/usbdi.h
    winsup/w32api/include/ddk/usbioctl.h
    winsup/w32api/include/ddk/usbiodef.h
    winsup/w32api/include/ddk/usbscan.h
    winsup/w32api/include/ddk/usbuser.h
    winsup/w32api/include/ddk/video.h
    winsup/w32api/include/ddk/videoagp.h
    winsup/w32api/include/ddk/win2k.h
    winsup/w32api/include/ddk/winddi.h
    winsup/w32api/include/ddk/winddk.h
    winsup/w32api/include/ddk/winnt4.h
    winsup/w32api/include/ddk/winxp.h
    winsup/w32api/include/ddk/ws2san.h
    winsup/w32api/include/ddk/xfilter.h
    winsup/w32api/include/dhcpcsdk.h
    winsup/w32api/include/dlgs.h
    winsup/w32api/include/docobj.h
    winsup/w32api/include/errorrep.h
    winsup/w32api/include/exdisp.h
    winsup/w32api/include/exdispid.h
    winsup/w32api/include/httpext.h
    winsup/w32api/include/idispids.h
    winsup/w32api/include/imagehlp.h
    winsup/w32api/include/imm.h
    winsup/w32api/include/initguid.h
    winsup/w32api/include/intshcut.h
    winsup/w32api/include/ipexport.h
    winsup/w32api/include/iphlpapi.h
    winsup/w32api/include/ipifcons.h
    winsup/w32api/include/iprtrmib.h
    winsup/w32api/include/iptypes.h
    winsup/w32api/include/isguids.h
    winsup/w32api/include/largeint.h
    winsup/w32api/include/lm.h
    winsup/w32api/include/lmaccess.h
    winsup/w32api/include/lmalert.h
    winsup/w32api/include/lmapibuf.h
    winsup/w32api/include/lmat.h
    winsup/w32api/include/lmaudit.h
    winsup/w32api/include/lmbrowsr.h
    winsup/w32api/include/lmchdev.h
    winsup/w32api/include/lmconfig.h
    winsup/w32api/include/lmcons.h
    winsup/w32api/include/lmerr.h
    winsup/w32api/include/lmerrlog.h
    winsup/w32api/include/lmmsg.h
    winsup/w32api/include/lmremutl.h
    winsup/w32api/include/lmrepl.h
    winsup/w32api/include/lmserver.h
    winsup/w32api/include/lmshare.h
    winsup/w32api/include/lmsname.h
    winsup/w32api/include/lmstats.h
    winsup/w32api/include/lmsvc.h
    winsup/w32api/include/lmuse.h
    winsup/w32api/include/lmuseflg.h
    winsup/w32api/include/lmwksta.h
    winsup/w32api/include/lzexpand.h
    winsup/w32api/include/mapi.h
    winsup/w32api/include/mciavi.h
    winsup/w32api/include/mcx.h
    winsup/w32api/include/mgmtapi.h
    winsup/w32api/include/mmsystem.h
    winsup/w32api/include/mshtml.h
    winsup/w32api/include/mswsock.h
    winsup/w32api/include/nb30.h
    winsup/w32api/include/nddeapi.h
    winsup/w32api/include/nspapi.h
    winsup/w32api/include/ntdef.h
    winsup/w32api/include/ntdll.h
    winsup/w32api/include/ntldap.h
    winsup/w32api/include/ntsecapi.h
    winsup/w32api/include/ntsecpkg.h
    winsup/w32api/include/oaidl.h
    winsup/w32api/include/objbase.h
    winsup/w32api/include/objfwd.h
    winsup/w32api/include/objidl.h
    winsup/w32api/include/ocidl.h
    winsup/w32api/include/odbcinst.h
    winsup/w32api/include/ole.h
    winsup/w32api/include/ole2.h
    winsup/w32api/include/ole2ver.h
    winsup/w32api/include/oleacc.h
    winsup/w32api/include/oleauto.h
    winsup/w32api/include/olectl.h
    winsup/w32api/include/olectlid.h
    winsup/w32api/include/oledlg.h
    winsup/w32api/include/oleidl.h
    winsup/w32api/include/pbt.h
    winsup/w32api/include/poppack.h
    winsup/w32api/include/powrprof.h
    winsup/w32api/include/prsht.h
    winsup/w32api/include/psapi.h
    winsup/w32api/include/pshpack1.h
    winsup/w32api/include/pshpack2.h
    winsup/w32api/include/pshpack4.h
    winsup/w32api/include/pshpack8.h
    winsup/w32api/include/rapi.h
    winsup/w32api/include/ras.h
    winsup/w32api/include/rasdlg.h
    winsup/w32api/include/raserror.h
    winsup/w32api/include/rassapi.h
    winsup/w32api/include/regstr.h
    winsup/w32api/include/richedit.h
    winsup/w32api/include/richole.h
    winsup/w32api/include/rpc.h
    winsup/w32api/include/rpcdce.h
    winsup/w32api/include/rpcdce2.h
    winsup/w32api/include/rpcdcep.h
    winsup/w32api/include/rpcndr.h
    winsup/w32api/include/rpcnsi.h
    winsup/w32api/include/rpcnsip.h
    winsup/w32api/include/rpcnterr.h
    winsup/w32api/include/rpcproxy.h
    winsup/w32api/include/schannel.h
    winsup/w32api/include/schnlsp.h
    winsup/w32api/include/scrnsave.h
    winsup/w32api/include/secext.h
    winsup/w32api/include/security.h
    winsup/w32api/include/servprov.h
    winsup/w32api/include/setupapi.h
    winsup/w32api/include/shellapi.h
    winsup/w32api/include/shlguid.h
    winsup/w32api/include/shlobj.h
    winsup/w32api/include/shlwapi.h
    winsup/w32api/include/snmp.h
    winsup/w32api/include/sql.h
    winsup/w32api/include/sqlext.h
    winsup/w32api/include/sqltypes.h
    winsup/w32api/include/sqlucode.h
    winsup/w32api/include/sspi.h
    winsup/w32api/include/subauth.h
    winsup/w32api/include/svcguid.h
    winsup/w32api/include/tlhelp32.h
    winsup/w32api/include/tmschema.h
    winsup/w32api/include/unknwn.h
    winsup/w32api/include/userenv.h
    winsup/w32api/include/uxtheme.h
    winsup/w32api/include/vfw.h
    winsup/w32api/include/w32api.h
    winsup/w32api/include/winable.h
    winsup/w32api/include/winbase.h
    winsup/w32api/include/winber.h
    winsup/w32api/include/wincon.h
    winsup/w32api/include/wincrypt.h
    winsup/w32api/include/windef.h
    winsup/w32api/include/windows.h
    winsup/w32api/include/windowsx.h
    winsup/w32api/include/winerror.h
    winsup/w32api/include/wingdi.h
    winsup/w32api/include/wininet.h
    winsup/w32api/include/winioctl.h
    winsup/w32api/include/winldap.h
    winsup/w32api/include/winnetwk.h
    winsup/w32api/include/winnls.h
    winsup/w32api/include/winnt.h
    winsup/w32api/include/winperf.h
    winsup/w32api/include/winreg.h
    winsup/w32api/include/winresrc.h
    winsup/w32api/include/winsnmp.h
    winsup/w32api/include/winsock.h
    winsup/w32api/include/winsock2.h
    winsup/w32api/include/winspool.h
    winsup/w32api/include/winsvc.h
    winsup/w32api/include/winuser.h
    winsup/w32api/include/winver.h
    winsup/w32api/include/ws2spi.h
    winsup/w32api/include/ws2tcpip.h
    winsup/w32api/include/wsahelp.h
    winsup/w32api/include/wsipx.h
    winsup/w32api/include/wsnetbs.h
    winsup/w32api/include/wtypes.h
    winsup/w32api/include/zmouse.h
    winsup/w32api/install-sh
    winsup/w32api/lib/Makefile.in
    winsup/w32api/lib/advapi32.def
    winsup/w32api/lib/avicap32.def
    winsup/w32api/lib/avifil32.def
    winsup/w32api/lib/cap.def
    winsup/w32api/lib/comctl32.def
    winsup/w32api/lib/comdlg32.def
    winsup/w32api/lib/crypt32.def
    winsup/w32api/lib/ctl3d32.def
    winsup/w32api/lib/d3dim.def
    winsup/w32api/lib/d3drm.def
    winsup/w32api/lib/d3dxof.def
    winsup/w32api/lib/ddk/Makefile.in
    winsup/w32api/lib/ddk/apcups.def
    winsup/w32api/lib/ddk/cfgmgr32.def
    winsup/w32api/lib/ddk/dxapi.def
    winsup/w32api/lib/ddk/hal.def
    winsup/w32api/lib/ddk/hid.def
    winsup/w32api/lib/ddk/hidparse.def
    winsup/w32api/lib/ddk/mcd.def
    winsup/w32api/lib/ddk/ndis.def
    winsup/w32api/lib/ddk/ntoskrnl.def
    winsup/w32api/lib/ddk/scsiport.def
    winsup/w32api/lib/ddk/tdi.def
    winsup/w32api/lib/ddk/usbcamd.def
    winsup/w32api/lib/ddk/usbcamd2.def
    winsup/w32api/lib/ddk/videoprt.def
    winsup/w32api/lib/ddk/win32k.def
    winsup/w32api/lib/ddraw.def
    winsup/w32api/lib/dhcpcsvc.def
    winsup/w32api/lib/dinput.c
    winsup/w32api/lib/dinput.def
    winsup/w32api/lib/dlcapi.def
    winsup/w32api/lib/dplayx.def
    winsup/w32api/lib/dsetup.def
    winsup/w32api/lib/dsound.def
    winsup/w32api/lib/dxguid.c
    winsup/w32api/lib/faultrep.def
    winsup/w32api/lib/gdi32.def
    winsup/w32api/lib/glaux.def
    winsup/w32api/lib/glu32.def
    winsup/w32api/lib/glut.def
    winsup/w32api/lib/glut32.def
    winsup/w32api/lib/igmpagnt.def
    winsup/w32api/lib/imagehlp.def
    winsup/w32api/lib/imm32.def
    winsup/w32api/lib/iphlpapi.def
    winsup/w32api/lib/kernel32.c
    winsup/w32api/lib/kernel32.def
    winsup/w32api/lib/largeint.c
    winsup/w32api/lib/lz32.def
    winsup/w32api/lib/mapi32.def
    winsup/w32api/lib/mfcuia32.def
    winsup/w32api/lib/mgmtapi.def
    winsup/w32api/lib/mpr.def
    winsup/w32api/lib/msacm32.def
    winsup/w32api/lib/mshtml-uuid.c
    winsup/w32api/lib/msimg32.def
    winsup/w32api/lib/msvcp60.def
    winsup/w32api/lib/msvfw32.def
    winsup/w32api/lib/mswsock.def
    winsup/w32api/lib/nddeapi.def
    winsup/w32api/lib/netapi32.def
    winsup/w32api/lib/ntdll.def
    winsup/w32api/lib/odbc32.def
    winsup/w32api/lib/odbccp32.def
    winsup/w32api/lib/ole32.def
    winsup/w32api/lib/oleacc.def
    winsup/w32api/lib/oleaut32.def
    winsup/w32api/lib/olecli32.def
    winsup/w32api/lib/oledlg.def
    winsup/w32api/lib/olepro32.def
    winsup/w32api/lib/olesvr32.def
    winsup/w32api/lib/opengl32.def
    winsup/w32api/lib/penwin32.def
    winsup/w32api/lib/pkpd32.def
    winsup/w32api/lib/powrprof.def
    winsup/w32api/lib/psapi.def
    winsup/w32api/lib/rapi.def
    winsup/w32api/lib/rasapi32.def
    winsup/w32api/lib/rasdlg.def
    winsup/w32api/lib/res.rc
    winsup/w32api/lib/rpcdce4.def
    winsup/w32api/lib/rpcns4.def
    winsup/w32api/lib/rpcrt4.def
    winsup/w32api/lib/scrnsave.c
    winsup/w32api/lib/secur32.def
    winsup/w32api/lib/setupapi.def
    winsup/w32api/lib/shell32.c
    winsup/w32api/lib/shell32.def
    winsup/w32api/lib/shfolder.def
    winsup/w32api/lib/shlwapi.def
    winsup/w32api/lib/snmpapi.def
    winsup/w32api/lib/svrapi.def
    winsup/w32api/lib/tapi32.def
    winsup/w32api/lib/test.c
    winsup/w32api/lib/th32.def
    winsup/w32api/lib/thunk32.def
    winsup/w32api/lib/url.def
    winsup/w32api/lib/user32.def
    winsup/w32api/lib/userenv.def
    winsup/w32api/lib/uuid.c
    winsup/w32api/lib/uxtheme.def
    winsup/w32api/lib/vdmdbg.def
    winsup/w32api/lib/version.def
    winsup/w32api/lib/vfw32.mri
    winsup/w32api/lib/win32spl.def
    winsup/w32api/lib/wininet.def
    winsup/w32api/lib/winmm.def
    winsup/w32api/lib/winspool.def
    winsup/w32api/lib/winstrm.def
    winsup/w32api/lib/wldap32.def
    winsup/w32api/lib/wow32.def
    winsup/w32api/lib/ws2_32.def
    winsup/w32api/lib/wsnmp32.def
    winsup/w32api/lib/wsock32.def
    winsup/w32api/lib/wst.def

1593 files changed, 0 insertions, 500170 deletions

diff --git a/djunpack.bat b/djunpack.bat
deleted file mode 100755
index f09f5ed32..000000000
--- a/djunpack.bat
+++ /dev/null
@@ -1,52 +0,0 @@
-@echo off

-Rem

-Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line

-Rem format, or else stock DOS/Windows shells will refuse to run it.

-Rem

-Rem This batch file unpacks the GDB distribution while simultaneously

-Rem renaming some of the files whose names are invalid on DOS or conflict

-Rem with other file names after truncation to DOS 8+3 namespace.

-Rem

-Rem Invoke like this:

-Rem

-Rem     djunpack gdb-XYZ.tar

-Rem

-Rem where XYZ is the version number.  If the argument includes leading

-Rem directories, it MUST use backslashes, not forward slashes.

-Rem

-Rem The following 2 lines need to be changed with each new GDB release, to

-Rem be identical to the name of the top-level directory where the GDB

-Rem distribution unpacks itself.

-set GDBVER=gdb-5.0

-if "%GDBVER%"=="gdb-5.0" GoTo EnvOk

-Rem If their environment space is too small, re-exec with a larger one

-command.com /e:4096 /c %0 %1

-GoTo End

-:EnvOk

-if not exist %1 GoTo NoArchive

-djtar -x -p -o %GDBVER%/gdb/config/djgpp/fnchange.lst %1 > fnchange.tmp

-Rem The following uses a feature of COPY whereby it does not copy

-Rem empty files.  We need that because the previous line will create

-Rem an empty fnchange.tmp even if the command failed for some reason.

-copy fnchange.tmp junk.tmp > nul

-if not exist junk.tmp GoTo NoDjTar

-del junk.tmp

-sed -e 's,@V@,%GDBVER%,g' < fnchange.tmp > fnchange.lst

-Rem See the comment above about the reason for using COPY.

-copy fnchange.lst junk.tmp > nul

-if not exist junk.tmp GoTo NoSed

-del junk.tmp

-djtar -x -n fnchange.lst %1

-GoTo End

-:NoSed

-echo FAIL: Sed is not available.

-GoTo End

-:NoDjTar

-echo FAIL: DJTAR is not available or no fnchange.lst file in %1.

-GoTo End

-:NoArchive

-echo FAIL: the file %1 does not seem to exist.

-echo Remember that %1 cannot use forward slashes, only backslashes.

-GoTo End

-:End

-set GDBVER=

diff --git a/winsup/CYGWIN_LICENSE b/winsup/CYGWIN_LICENSE
deleted file mode 100644
index 7c6adad80..000000000
--- a/winsup/CYGWIN_LICENSE
+++ /dev/null
@@ -1,38 +0,0 @@
---------------------------------------------------------------------------
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License (GPL) as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
---------------------------------------------------------------------------
-
-			*** NOTE ***
-
-In accordance with section 10 of the GPL, Red Hat permits programs whose
-sources are distributed under a license that complies with the Open
-Source definition to be linked with libcygwin.a without libcygwin.a
-itself causing the resulting program to be covered by the GNU GPL.
-
-This means that you can port an Open Source(tm) application to cygwin,
-and distribute that executable as if it didn't include a copy of
-libcygwin.a linked into it.  Note that this does not apply to the cygwin
-DLL itself.  If you distribute a (possibly modified) version of the DLL
-you must adhere to the terms of the GPL, i.e. you must provide sources
-for the cygwin DLL.
-
-See http://www.opensource.org/docs/definition_plain.html for the precise Open Source
-Definition referenced above.
-
-Red Hat sells a special Cygwin License for customers who are unable to
-provide their application in open source code form.  For more
-information, please see: http://www.redhat.com/software/tools/cygwin/,
-or call 866-2REDHAT ext.  3007
-
diff --git a/winsup/ChangeLog b/winsup/ChangeLog
deleted file mode 100644
index 3e7cef661..000000000
--- a/winsup/ChangeLog
+++ /dev/null
@@ -1,380 +0,0 @@
-2003-11-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in: Make cygserver depending on cygwin.
-
-2003-11-20  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Make --use-server the default.
-	* configure: Regenerate.
-
-2003-08-05  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common: Hmm.  Older compilers seem to need -nostdinc.
-
-2003-08-05  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common: Don't use -nostdinc with g++.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Only use localhost when building mingw with distcc or
-	gcc won't be able to find .exp files on other hosts.
-
-2003-07-18  Vaclav Haisman  <V.Haisman@sh.cvut.cz>
-  
-	* Makefile.common (CFLAGS_COMMON): Remove -march=i386.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Add --enable-server option.
-	* configure: Regenerate.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common (CFLAGS_COMMON): Remove -Winline since it is too
-	noisy on newer versions of gcc.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Add cygserver subdir.
-	* Makefile.in: Ditto.
-	* configure: Regenerate.
-
-	* Makefile.common: Remove debugging statements.
-
-2003-05-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.common: Remove newlib_sys_include and
-	newlib_sys_include_include entirely.  Set CRT0 to cygwin/crt0.o.
-
-2003-04-18  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Reorganize to try to allow lack of mingw/w32api to work.
-
-2003-04-11  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common (w32api_lib): Fix w32api detection.
-
-2003-03-28  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common (ALL_CXXFLAGS): Make normal '=' type variable so that
-	CXXFLAGS is properly interpreted.
-
-2003-03-17  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common (w32api_lib): Default to system w32api directory if
-	w32api is missing from source.
-
-2003-03-17  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common: Fix typo from previous checkin.
-
-2003-03-17  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: w32api directory was already optional.  Semi-revert
-	2003-02-06 change.
-	* configure: Regenerate.
-	* Makefile.common: Don't specific -nostdinc if there is no w32api
-	directory.
-
-2003-03-09  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common: Avoid double slashes in GCC_INCLUDE.
-
-2003-02-12  Christopher Faylor  <cgf@redhat.com>
-
-	* MAINTAINERS: Remove out-of-date file.
-
-2003-02-06  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Make w32api directory optional.
-	* configure: Regenerate.
-
-2003-01-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.common (MINGW_LDFLAGS): Add mingw/mingwex builddir.
-
-2002-12-21  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common: Don't attempt to pretty-print c++ errors.
-
-2002-12-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.common: Define MINGW_LDFLAGS.
-	* configure.in: Reorder SUBDIRS to have mingw before cygwin.
-	* configure: Regenerate from configure.in.
-
-2002-09-27  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (check): Be more defensive when creating testsuite
-	config.status.
-
-2002-08-16  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Change COMPILE_C* definitions.
-
-2002-08-10  Earnie Boyd  <earnie@users.sf.net>
-
-	* w32sdk: New winsup module.
-
-2002-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common (MINGW_INCLUDES): Simplify.
-	(MINGW_CFLAGS): New.
-	(MINGW_CXXFLAGS): Ditto.
-
-2002-06-02  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Complain about lack of w32api directory.
-	* configure: Regenerate.
-
-2002-04-25  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Remove cinstall target.
-	* Makefile.in: Ditto.
-	* configure: Regenerate.
-
-2002-02-19  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Avoid building w32api or mingw if they don't exist.
-	* configure: Regenerate.
-
-2001-12-18  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Don't attempt to use zlib directory as a dependency if
-	it doesn't exist.
-
-2001-12-14  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Detect zlib subdirectory.
-	* configure: Regenerate
-	* Makefile.in: Exit immediately if a sub-make fails.
-	* Makefile.common: Add automatic rules for bz2lib and zlib.
-
-2001-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Force configure in testsuite directory if config.status
-	does not exist.
-
-2001-11-03  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Disable subauth directory test.
-	* configure: Regenerate.
-	* Makefile.in: Use MAKE variable in directory builds.
-
-2001-11-03  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Add directory dependencies to ensure ordering when using
-	'make -jN'.
-
-2001-11-03  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common: Remove preferred-stack-boundary setting since gcc
-	2.95.3 doesn't work well with it.
-
-2001-11-01  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common: Add some stuff to common CFLAGS.
-
-2001-10-29  Egor Duda  <deo@logos-m.ru>
-
-	* Makefile.in: Propagate 'clean' to subdirs properly.
-
-2001-10-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* configure: Regenerate, removing erroneous SUBDIRS substitution.
-
-2001-10-24  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Only build testsuite directory on first 'make check'.
-	* configure.in: Remove testsuite from SUBDIRS.
-	* configure: Regenerate.
-
-2001-10-12  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Add -nostdinc to CXXFLAGS.
-
-2001-10-12  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.common: Perform more include file testing trickery.
-
-Sun Oct  7 23:08:46 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common: Avoid adding -I options to compile if they already
-	exist in CC or C*FLAGS.  This prevents warnings from newer versions of
-	gcc.
-
-Tue May 15 01:09:56 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common: Change method for finding current directory.
-
-Sat May  5 00:14:03 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Fix typo.
-	* configure: Regenerate.
-
-Fri May  4 11:24:53 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Make subauth configuration optional.
-	* configure: Regenerate.
-
-Fri May  4 15:06:00  Corinna Vinschen <corinna@vinschen.de>
-
-	* subauth: New subdirectory.
-	* configure.in: Add subauth to the list of subdirectories.
-	* configure: Regenerated from configure.in.
-
-Wed Apr 18 18:45:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Add bz2lib.
-
-2001-03-19  DJ Delorie  <dj@redhat.com>
-
-	* configure: fix regeneration bug.
-
-Thu Feb 22 13:36:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* Makefile.common: Revert previous change.
-
-Wed Feb 21 22:41:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* Makefile.common: Add `-fvtable-thunks' to COMPILE_CXX.
-
-Sun Dec  3 00:21:31 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common: Eliminate checks for libgcc.a and libstdc++.a.  Use
-	CXX for g++ compiles.
-	* configure.in: Find correct c++ compiler.
-	* configure: Regenerate.
-
-Mon Oct 23 00:50:02 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common (LIBGCC): Acommodate older gcc's that don't need
-	libstdc++.a.
-
-Sat Oct 21 18:01:22 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common (LIBGCC): Find libstdc++.a as well as libc.a since
-	builtin functions are in this library in newer gcc's.
-
-Sun Oct  1 22:02:38 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common: Extend VERBOSE default.
-	* Makefile.in: Don't clean the testsuite separately.  It's already part
-	of CLEAN_SUBDIRS.
-
-2000-09-30  Christopher Faylor  <cgf@cygnus.com>
-
-	* Makefile.common: Default to VERBOSE when part of overall source
-	tree build.
-
-2000-09-02  Egor Duda  <deo@logos-m.ru>
-
-	* Makefile.in: Add new goal "check"
-	* configure.in: When doing native build do configure in
-	testsuite subdirectory
-	* configure: Regenerate.
-
-Fri Sep  1 10:15:37 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: More normalization.
-
-Thu Aug 31 16:37:31 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Normalize 'pwd' based on location of winsup.
-
-Thu Aug 24 15:02:26 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common: Add bupdir2 to reference above the i686-pc-cygwin
-	directory.
-
-Thu Jun 22 18:28:06 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add dummy info targets.
-
-Tue Jun 20 13:36:23 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Bow to necessity and build w32api before anything else.
-	* configure: Regenerate.
-
-Sat Jun 17 13:50:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Detect "cross-hosting" situation and add a subset of
-	directories to SUBDIRS.
-	* configure: Regenerate.
-
-Thu May 25 18:39:24 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Don't assume that cinstall directory exists.
-	* configure: Regenerate
-
-2000-05-24  DJ Delorie  <dj@cygnus.com>
-
-	* Makefile.common (%.o): further simplify, add "..." to make it obvious
-	it's an abbreviated command line.
-
-Thu May 18 14:33:05 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* MAINTAINERS: Add Corinna to general list.
-
-2000-04-17  DJ Delorie  <dj@cygnus.com>
-
-	* Makefile.common (srcdir): remove dependence on where pwd is
-	
-Sun Apr  9 23:47:45 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common: Resolve srcdir to absolute path or it will confuse
-	usages when passed to submakes.  Eliminate vestigal use of
-	MAKEOVERRIDES.
-
-Sun Apr  9 02:06:49 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Work around MAKEOVERRIDES problem with older versions
-	of make.
-	* Makefile.common: Ditto.
-
-Fri Apr  7 17:04:02  Ron Parker <rdparker@sourceware.cygnus.com>
-
-	* configure.in: Added cinstall to the list of subdirs.
-	* configure: Regenerate.
-	
-Thu Mar 30 23:45:00 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* MAINTAINERS: Add Ron Parker as maintainer of cinstall stuff.
-
-Sun Feb  6 18:15:44 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Do the standard CC/CFLAGS stuff for propagation to
-	sub-configures.
-	* configure: Regenerate.
-
-2000-01-26  DJ Delorie  <dj@cygnus.com>
-
-	* doc/Makefile.in: fix doctool -d options
-
-Fri Jan 21 12:51:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common: No need to rerun Makefile if config.status changes.
-	That should happen automatically.
-	* Makefile.in: Ditto.
-
-Sat Jan  8 14:40:01 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common: Remove cygwin DLL specific stuff.  Make Makefile
-	target PRECIOUS.
-	* Makefile.in: Make Makefile target PRECIOUS.
-
-Fri Jan  7 21:00:49 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.common: Remove cygwin DLL specific stuff.  Correctly deal
-	with updir stuff when building in the same directory as the source.
-
-Thu Jan  6 19:04:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Create new directory structure
-	* Makefile.in: New file.
-	* configure.in: New file.
-	* configure: New file.
-	* Makefile.common: New file.
-	* cygwin: New directory.
-	* w32api: New directory.
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
deleted file mode 100644
index 1edd4dc3c..000000000
--- a/winsup/Makefile.common
+++ /dev/null
@@ -1,195 +0,0 @@
-# Makefile.common - common definitions for the winsup directory
-#
-# Copyright 2000, 2001 Red Hat, Inc.
-#
-# This file is part of Cygwin.
-#
-# This software is a copyrighted work licensed under the terms of the
-# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-# details.
-
-# This makefile requires GNU make.
-
-CFLAGS_COMMON:=-Wall -Wwrite-strings -fno-common -pipe -fbuiltin -fmessage-length=0# -finline-functions
-MALLOC_DEBUG:=#-DMALLOC_DEBUG -I/cygnus/src/uberbaum/winsup/cygwin/dlmalloc
-MALLOC_OBJ:=#/cygnus/src/uberbaum/winsup/cygwin/dlmalloc/malloc.o
-
-override srcdir:=${shell cd $(srcdir); pwd}
-ifneq (,${filter-out /%,$(srcdir)})
-    updir:=$(srcdir)/..
-    updir1:=$(updir)/..
-else
-    updir:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(srcdir)):::}}
-ifneq (,${findstring /,$(updir)})
-    updir1:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(updir)):::}}
-else
-    updir1:=$(updir)/..
-endif
-endif
-
-pwd:=${shell pwd}
-ifneq "${filter winsup%,${notdir $(pwd)}}" ""
-    here:=${pwd}/cygwin
-else
-    here:=${dir $(pwd)}cygwin
-endif
-bupdir:=${shell cd $(here)/..; pwd}
-ifneq (,${filter-out /%,$(bupdir)})
-    bupdir1:=../..
-    bupdir2:=../../..
-else
-ifneq (,${findstring /,$(bupdir)})
-    bupdir1:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(bupdir)):::}}
-else
-    bupdir1:=$(bupdir)/..
-endif
-ifneq (,${findstring /,$(bupdir1)})
-    bupdir2:=${patsubst %:::,%,${patsubst %/:::,%,$(dir $(bupdir1)):::}}
-else
-    bupdir2:=$(bupdir1)/..
-endif
-endif
-
-zlib_source:=$(updir)/zlib
-zlib_build:=$(bupdir)/zlib
-bz2lib_source:=$(updir)/bz2lib
-bz2lib_build:=$(bupdir)/bz2lib
-w32api_source:=$(updir)/w32api
-w32api_build:=$(bupdir)/w32api
-w32api_lib:=$(w32api_build)/lib
-newlib_source:=$(updir1)/newlib
-newlib_build:=$(bupdir1)/newlib
-cygwin_build:=$(bupdir)/cygwin
-cygwin_source:=$(updir)/cygwin
-mingw_build:=$(bupdir)/mingw
-mingw_source:=$(updir)/mingw
-utils_build:=$(bupdir)/utils
-utils_source:=$(updir)/utils
-ifeq (,${findstring $(newlib_source)/libc/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
-newlib_include:=-I$(newlib_source)/libc/include
-endif
-ifeq (,${findstring $(cygwin_source)/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
-cygwin_include:=-I$(cygwin_source)/include
-endif
-
-# Try to determine what directories are available in winsup.
-# Attempt to properly detect missing mingw or w32api and adjust command
-# line parameters appropriately
-
-nostdinc:=${shell [ -d "$(updir)/w32api" ] && echo "-nostdinc"}
-ifneq (,$(nostdinc))
-nostdincxx:=-nostdinc++
-ifeq (,${findstring $(w32api_source),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
-w32api_include:=-I$(w32api_source)/include
-endif
-endif
-
-mingw_include:=${shell [ -d "$(mingw_source)/include" ] && echo "-I$(mingw_source)/include"}
-ifneq (,$(mingw_include))
-nostdlib:=-nostdlib
-else
-nostdlib:=
-endif
-
-ifeq (,${nostdlib})
-nostdinc:=
-endif
-
-INCLUDES:=-I. $(cygwin_include) -I$(cygwin_source) $(newlib_include) $(w32api_include)
-ifdef CONFIG_DIR
-INCLUDES+=-I$(CONFIG_DIR)
-endif
-
-MINGW_INCLUDES:=${mingw_include} $(w32api_include)
-MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES)
-MINGW_CXXFLAGS:=${filter-out $(newlib_source)/%,$(CXXFLAGS)} -mno-cygwin $(MINGW_INCLUDES)
-MINGW_LDFLAGS:=-B${mingw_build} -B${mingw_build}/mingwex
-
-GCC_DEFAULT_OPTIONS:=$(CFLAGS_COMMON) $(CFLAGS_CONFIG) $(INCLUDES)
-
-# Link in libc and libm from newlib
-
-LIBC:=$(newlib_build)/libc/libc.a
-LIBM:=$(newlib_build)/libm/libm.a
-CRT0:=$(cygwin_build)/crt0.o
-
-ALL_CFLAGS:=$(DEFS) $(MALLOC_DEBUG) $(CFLAGS) $(GCC_DEFAULT_OPTIONS)
-ALL_CXXFLAGS=$(DEFS) $(MALLOC_DEBUG) $(CXXFLAGS) $(GCC_DEFAULT_OPTIONS)
-
-ifndef PREPROCESS
-c=-c
-o=.o
-else
-c=-E
-o=.E
-endif
-
-libgcc:=${subst \,/,${shell $(CC_FOR_TARGET) -print-libgcc-file-name}}
-gcc_libdir:=${word 1,${dir $(libgcc)}}
-ifeq (,${findstring $(gcc_libdir),$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
-GCC_INCLUDE:=${subst //,/,-I$(gcc_libdir)/include}
-endif
-
-COMPILE_CXX=$(CXX) $c $(nostdincxx) $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \
-	     -fno-rtti -fno-exceptions
-COMPILE_CC=$(CC) $c $(nostdinc) $(ALL_CFLAGS) $(GCC_INCLUDE)
-
-vpath %.a	$(cygwin_build):$(w32api_lib):$(newlib_build)/libc:$(newlib_build)/libm
-
-MAKEOVERRIDES_WORKAROUND=${wordlist 2,1,a b c}
-
-ifneq ($(MAKEOVERRIDES_WORKAROUND),)
-    override MAKE:=$(MAKE) $(MAKEOVERRIDES)
-    MAKEOVERRIDES:=
-    export MAKEOVERRIDES
-endif
-
-ifdef RPATH_ENVVAR
-VERBOSE=1
-endif
-
-ifneq "${findstring -B,$(COMPILE_CXX) $(COMPILE_CC)}" ""
-VERBOSE=1
-endif
-
-.PRECIOUS: %.o
-
-%.o: %.cc
-ifdef VERBOSE
-	$(COMPILE_CXX) -o $(@D)/$(*F)$o $<
-else
-	@echo $(CXX) $c $(CXXFLAGS) ... $(*F).cc
-	@$(COMPILE_CXX) -o $(@D)/$(*F)$o $<
-endif
-
-%.o: %.c
-ifdef VERBOSE
-	$(COMPILE_CC) -o $(@D)/$(*F)$o $<
-else
-	@echo $(CC) $c $(CFLAGS) ... $(*F).c
-	@$(COMPILE_CC) -o $(@D)/$(*F)$o $<
-endif
-
-$(bupdir1)/libiberty/%.o: $(updir1)/libiberty/%.c
-	@$(MAKE) -C $(@D) $(@F)
-
-$(w32api_lib)/%.a: $(w32api_lib)/Makefile
-	@$(MAKE) --no-print-dir -C $(@D) $(@F)
-
-$(bz2lib)/%.a: $(bz2lib)/Makefile
-	@$(MAKE) --no-print-dir -C $(@D) $(@F)
-
-$(zlib)/%.a: $(zlib)/Makefile
-	@$(MAKE) --no-print-dir -C $(@D) $(@F)
-
-all:
-
-# For auto-rebuilding the Makefile
-
-.PRECIOUS: Makefile
-
-Makefile: Makefile.in $(srcdir)/configure.in config.status
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
diff --git a/winsup/Makefile.in b/winsup/Makefile.in
deleted file mode 100644
index ca3272412..000000000
--- a/winsup/Makefile.in
+++ /dev/null
@@ -1,120 +0,0 @@
-# Makefile.in for windows stuff
-# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-#
-# This file is part of Cygwin.
-#
-# This software is a copyrighted work licensed under the terms of the
-# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-# details.
-
-# This makefile requires GNU make.
-
-SHELL:=@SHELL@
-VPATH:=@srcdir@
-srcdir:=@srcdir@
-objdir:=.
-
-target_alias:=@target_alias@
-build_alias:=@build_alias@
-host_alias:=@host_alias@
-prefix:=@prefix@
-
-program_transform_name:=@program_transform_name@
-exec_prefix:=@exec_prefix@
-bindir:=@bindir@
-libdir:=@libdir@
-ifeq ($(target_alias),$(host_alias))
-ifeq ($(build_alias),$(host_alias))
-tooldir:=$(exec_prefix)
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-datadir:=@datadir@
-infodir:=@infodir@
-includedir:=@includedir@
-
-SUBDIRS=@SUBDIRS@
-INSTALL_SUBDIRS=${patsubst %,install_%,$(SUBDIRS)}
-CLEAN_SUBDIRS=${patsubst %,clean_%,$(SUBDIRS)}
-ZLIB=${findstring zlib,$(SUBDIRS)}
-
-.PHONY: all install clean all-info info install-info check \
-	$(SUBDIRS) $(INSTALL_SUBDIRS) $(CLEAN_SUBDIRS)
-
-.SUFFIXES:
-
-MAKEOVERRIDES_WORKAROUND=${wordlist 2,1,a b c}
-
-ifneq ($(MAKEOVERRIDES_WORKAROUND),)
-    override MAKE:=$(MAKE) $(MAKEOVERRIDES)
-    MAKEOVERRIDES:=
-    export MAKEOVERRIDES
-endif
-
-all: Makefile $(SUBDIRS)
-
-install: Makefile $(INSTALL_SUBDIRS)
-
-clean: $(CLEAN_SUBDIRS)
-
-all-info:
-
-install-info:
-
-info:
-
-$(SUBDIRS):
-	@if cd $@ 2>/dev/null; then \
-	    test "$@" = "mingw" && export DISTCC_HOSTS=localhost;\
-	    $(MAKE) all || exit 1; \
-	fi || exit 0
-
-$(INSTALL_SUBDIRS):
-	@if cd ${patsubst install_%,%,$@} 2>/dev/null; then \
-	    $(MAKE) install || exit 1; \
-	fi || exit 0
-
-$(CLEAN_SUBDIRS):
-	@if cd ${patsubst clean_%,%,$@} 2>/dev/null; then \
-	    $(MAKE) clean || exit 1; \
-	fi || exit 0
-
-.PRECIOUS: Makefile
-
-Makefile: Makefile.in $(srcdir)/configure.in config.status
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
-
-check: cygwin
-	@if [ -f testsuite/config.status ]; then \
-	    cd testsuite; \
-	else \
-	    (mkdir testsuite 2>/dev/null || exit 0); \
-	    cd testsuite; \
-	    sed -n -e '1,/^done/{' -e 's%winsup/cygwin\([ /]\)%winsup/testsuite\1%g; ' -e 'p; }'  ../cygwin/config.status > config.status; \
-	    chmod a+x config.status; \
-	    sh ./config.status --recheck; \
-	    sh ./config.status; \
-	fi; \
-	$(MAKE) check
-
-utils: cygwin mingw
-
-mingw: w32api
-
-cygwin: w32api
-
-cygserver: cygwin
-
-install_utils: cygwin mingw
-
-install_mingw: w32api
-
-install_cygwin: w32api
-
-install_cygserver: cygwin
diff --git a/winsup/bz2lib/CHANGES b/winsup/bz2lib/CHANGES
deleted file mode 100644
index ecaf4170e..000000000
--- a/winsup/bz2lib/CHANGES
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-0.9.0
-~~~~~
-First version.
-
-
-0.9.0a
-~~~~~~
-Removed 'ranlib' from Makefile, since most modern Unix-es 
-don't need it, or even know about it.
-
-
-0.9.0b
-~~~~~~
-Fixed a problem with error reporting in bzip2.c.  This does not effect
-the library in any way.  Problem is: versions 0.9.0 and 0.9.0a (of the
-program proper) compress and decompress correctly, but give misleading
-error messages (internal panics) when an I/O error occurs, instead of
-reporting the problem correctly.  This shouldn't give any data loss
-(as far as I can see), but is confusing.
-
-Made the inline declarations disappear for non-GCC compilers.
-
-
-0.9.0c
-~~~~~~
-Fixed some problems in the library pertaining to some boundary cases.
-This makes the library behave more correctly in those situations.  The
-fixes apply only to features (calls and parameters) not used by
-bzip2.c, so the non-fixedness of them in previous versions has no
-effect on reliability of bzip2.c.
-
-In bzlib.c:
-   * made zero-length BZ_FLUSH work correctly in bzCompress().
-   * fixed bzWrite/bzRead to ignore zero-length requests.
-   * fixed bzread to correctly handle read requests after EOF.
-   * wrong parameter order in call to bzDecompressInit in
-     bzBuffToBuffDecompress.  Fixed.
-
-In compress.c:
-   * changed setting of nGroups in sendMTFValues() so as to 
-     do a bit better on small files.  This _does_ effect
-     bzip2.c.
-
-
-0.9.5a
-~~~~~~
-Major change: add a fallback sorting algorithm (blocksort.c)
-to give reasonable behaviour even for very repetitive inputs.
-Nuked --repetitive-best and --repetitive-fast since they are
-no longer useful.
-
-Minor changes: mostly a whole bunch of small changes/
-bugfixes in the driver (bzip2.c).  Changes pertaining to the
-user interface are:
-
-   allow decompression of symlink'd files to stdout
-   decompress/test files even without .bz2 extension
-   give more accurate error messages for I/O errors
-   when compressing/decompressing to stdout, don't catch control-C
-   read flags from BZIP2 and BZIP environment variables
-   decline to break hard links to a file unless forced with -f
-   allow -c flag even with no filenames
-   preserve file ownerships as far as possible
-   make -s -1 give the expected block size (100k)
-   add a flag -q --quiet to suppress nonessential warnings
-   stop decoding flags after --, so files beginning in - can be handled
-   resolved inconsistent naming: bzcat or bz2cat ?
-   bzip2 --help now returns 0
-
-Programming-level changes are:
-
-   fixed syntax error in GET_LL4 for Borland C++ 5.02
-   let bzBuffToBuffDecompress return BZ_DATA_ERROR{_MAGIC}
-   fix overshoot of mode-string end in bzopen_or_bzdopen
-   wrapped bzlib.h in #ifdef __cplusplus ... extern "C" { ... }
-   close file handles under all error conditions
-   added minor mods so it compiles with DJGPP out of the box
-   fixed Makefile so it doesn't give problems with BSD make
-   fix uninitialised memory reads in dlltest.c
-
-0.9.5b
-~~~~~~
-Open stdin/stdout in binary mode for DJGPP.
-
-0.9.5c
-~~~~~~
-Changed BZ_N_OVERSHOOT to be ... + 2 instead of ... + 1.  The + 1
-version could cause the sorted order to be wrong in some extremely
-obscure cases.  Also changed setting of quadrant in blocksort.c.
-
-0.9.5d
-~~~~~~
-The only functional change is to make bzlibVersion() in the library
-return the correct string.  This has no effect whatsoever on the
-functioning of the bzip2 program or library.  Added a couple of casts
-so the library compiles without warnings at level 3 in MS Visual
-Studio 6.0.  Included a Y2K statement in the file Y2K_INFO.  All other
-changes are minor documentation changes.
-
-1.0
-~~~
-Several minor bugfixes and enhancements:
-
-* Large file support.  The library uses 64-bit counters to
-  count the volume of data passing through it.  bzip2.c 
-  is now compiled with -D_FILE_OFFSET_BITS=64 to get large
-  file support from the C library.  -v correctly prints out
-  file sizes greater than 4 gigabytes.  All these changes have
-  been made without assuming a 64-bit platform or a C compiler
-  which supports 64-bit ints, so, except for the C library
-  aspect, they are fully portable.
-
-* Decompression robustness.  The library/program should be
-  robust to any corruption of compressed data, detecting and
-  handling _all_ corruption, instead of merely relying on
-  the CRCs.  What this means is that the program should 
-  never crash, given corrupted data, and the library should
-  always return BZ_DATA_ERROR.
-
-* Fixed an obscure race-condition bug only ever observed on
-  Solaris, in which, if you were very unlucky and issued
-  control-C at exactly the wrong time, both input and output
-  files would be deleted.
-
-* Don't run out of file handles on test/decompression when
-  large numbers of files have invalid magic numbers.
-
-* Avoid library namespace pollution.  Prefix all exported 
-  symbols with BZ2_.
-
-* Minor sorting enhancements from my DCC2000 paper.
-
-* Advance the version number to 1.0, so as to counteract the
-  (false-in-this-case) impression some people have that programs 
-  with version numbers less than 1.0 are in someway, experimental,
-  pre-release versions.
-
-* Create an initial Makefile-libbz2_so to build a shared library.
-  Yes, I know I should really use libtool et al ...
-
-* Make the program exit with 2 instead of 0 when decompression
-  fails due to a bad magic number (ie, an invalid bzip2 header).
-  Also exit with 1 (as the manual claims :-) whenever a diagnostic
-  message would have been printed AND the corresponding operation 
-  is aborted, for example
-     bzip2: Output file xx already exists.
-  When a diagnostic message is printed but the operation is not 
-  aborted, for example
-     bzip2: Can't guess original name for wurble -- using wurble.out
-  then the exit value 0 is returned, unless some other problem is
-  also detected.
-
-  I think it corresponds more closely to what the manual claims now.
-
-
-1.0.1
-~~~~~
-* Modified dlltest.c so it uses the new BZ2_ naming scheme.
-* Modified makefile-msc to fix minor build probs on Win2k.
-* Updated README.COMPILATION.PROBLEMS.
-
-There are no functionality changes or bug fixes relative to version
-1.0.0.  This is just a documentation update + a fix for minor Win32
-build problems.  For almost everyone, upgrading from 1.0.0 to 1.0.1 is
-utterly pointless.  Don't bother.
diff --git a/winsup/bz2lib/ChangeLog b/winsup/bz2lib/ChangeLog
deleted file mode 100644
index 939dea3e8..000000000
--- a/winsup/bz2lib/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-2002-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Use MINGW stuff from Makefile.common.
-
-Wed Apr 18 23:54:53 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add -U_WIN32 to CFLAGS compile line to avoid
-	inappropriate Windows-isms.
-
-Wed Apr 18 15:58:28 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Initial checkin from net sources.
-	Makefile.in: New file.
-	configure.in: New file.
-	configure: New file.
diff --git a/winsup/bz2lib/LICENSE b/winsup/bz2lib/LICENSE
deleted file mode 100644
index 88fa6d88a..000000000
--- a/winsup/bz2lib/LICENSE
+++ /dev/null
@@ -1,39 +0,0 @@
-
-This program, "bzip2" and associated library "libbzip2", are
-copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. The origin of this software must not be misrepresented; you must 
-   not claim that you wrote the original software.  If you use this 
-   software in a product, an acknowledgment in the product 
-   documentation would be appreciated but is not required.
-
-3. Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
-
-4. The name of the author may not be used to endorse or promote 
-   products derived from this software without specific prior written 
-   permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Julian Seward, Cambridge, UK.
-jseward@acm.org
-bzip2/libbzip2 version 1.0 of 21 March 2000
-
diff --git a/winsup/bz2lib/Makefile b/winsup/bz2lib/Makefile
deleted file mode 100644
index ab17f4979..000000000
--- a/winsup/bz2lib/Makefile
+++ /dev/null
@@ -1,141 +0,0 @@
-
-SHELL=/bin/sh
-CC=gcc
-BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
-
-OBJS= blocksort.o  \
-      huffman.o    \
-      crctable.o   \
-      randtable.o  \
-      compress.o   \
-      decompress.o \
-      bzlib.o
-
-all: libbz2.a bzip2 bzip2recover test
-
-bzip2: libbz2.a bzip2.o
-	$(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2
-
-bzip2recover: bzip2recover.o
-	$(CC) $(CFLAGS) -o bzip2recover bzip2recover.o
-
-libbz2.a: $(OBJS)
-	rm -f libbz2.a
-	ar cq libbz2.a $(OBJS)
-	@if ( test -f /usr/bin/ranlib -o -f /bin/ranlib -o \
-		-f /usr/ccs/bin/ranlib ) ; then \
-		echo ranlib libbz2.a ; \
-		ranlib libbz2.a ; \
-	fi
-
-test: bzip2
-	@cat words1
-	./bzip2 -1  < sample1.ref > sample1.rb2
-	./bzip2 -2  < sample2.ref > sample2.rb2
-	./bzip2 -3  < sample3.ref > sample3.rb2
-	./bzip2 -d  < sample1.bz2 > sample1.tst
-	./bzip2 -d  < sample2.bz2 > sample2.tst
-	./bzip2 -ds < sample3.bz2 > sample3.tst
-	cmp sample1.bz2 sample1.rb2 
-	cmp sample2.bz2 sample2.rb2
-	cmp sample3.bz2 sample3.rb2
-	cmp sample1.tst sample1.ref
-	cmp sample2.tst sample2.ref
-	cmp sample3.tst sample3.ref
-	@cat words3
-
-PREFIX=/usr
-
-install: bzip2 bzip2recover
-	if ( test ! -d $(PREFIX)/bin ) ; then mkdir $(PREFIX)/bin ; fi
-	if ( test ! -d $(PREFIX)/lib ) ; then mkdir $(PREFIX)/lib ; fi
-	if ( test ! -d $(PREFIX)/man ) ; then mkdir $(PREFIX)/man ; fi
-	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir $(PREFIX)/man/man1 ; fi
-	if ( test ! -d $(PREFIX)/include ) ; then mkdir $(PREFIX)/include ; fi
-	cp -f bzip2 $(PREFIX)/bin/bzip2
-	cp -f bzip2 $(PREFIX)/bin/bunzip2
-	cp -f bzip2 $(PREFIX)/bin/bzcat
-	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
-	chmod a+x $(PREFIX)/bin/bzip2
-	chmod a+x $(PREFIX)/bin/bunzip2
-	chmod a+x $(PREFIX)/bin/bzcat
-	chmod a+x $(PREFIX)/bin/bzip2recover
-	cp -f bzip2.1 $(PREFIX)/man/man1
-	chmod a+r $(PREFIX)/man/man1/bzip2.1
-	cp -f bzlib.h $(PREFIX)/include
-	chmod a+r $(PREFIX)/include/bzlib.h
-	cp -f libbz2.a $(PREFIX)/lib
-	chmod a+r $(PREFIX)/lib/libbz2.a
-
-clean: 
-	rm -f *.o libbz2.a bzip2 bzip2recover \
-	sample1.rb2 sample2.rb2 sample3.rb2 \
-	sample1.tst sample2.tst sample3.tst
-
-blocksort.o: blocksort.c
-	@cat words0
-	$(CC) $(CFLAGS) -c blocksort.c
-huffman.o: huffman.c
-	$(CC) $(CFLAGS) -c huffman.c
-crctable.o: crctable.c
-	$(CC) $(CFLAGS) -c crctable.c
-randtable.o: randtable.c
-	$(CC) $(CFLAGS) -c randtable.c
-compress.o: compress.c
-	$(CC) $(CFLAGS) -c compress.c
-decompress.o: decompress.c
-	$(CC) $(CFLAGS) -c decompress.c
-bzlib.o: bzlib.c
-	$(CC) $(CFLAGS) -c bzlib.c
-bzip2.o: bzip2.c
-	$(CC) $(CFLAGS) -c bzip2.c
-bzip2recover.o: bzip2recover.c
-	$(CC) $(CFLAGS) -c bzip2recover.c
-
-DISTNAME=bzip2-1.0.1
-tarfile:
-	rm -f $(DISTNAME)
-	ln -sf . $(DISTNAME)
-	tar cvf $(DISTNAME).tar \
-	   $(DISTNAME)/blocksort.c \
-	   $(DISTNAME)/huffman.c \
-	   $(DISTNAME)/crctable.c \
-	   $(DISTNAME)/randtable.c \
-	   $(DISTNAME)/compress.c \
-	   $(DISTNAME)/decompress.c \
-	   $(DISTNAME)/bzlib.c \
-	   $(DISTNAME)/bzip2.c \
-	   $(DISTNAME)/bzip2recover.c \
-	   $(DISTNAME)/bzlib.h \
-	   $(DISTNAME)/bzlib_private.h \
-	   $(DISTNAME)/Makefile \
-	   $(DISTNAME)/manual.texi \
-	   $(DISTNAME)/manual.ps \
-	   $(DISTNAME)/LICENSE \
-	   $(DISTNAME)/bzip2.1 \
-	   $(DISTNAME)/bzip2.1.preformatted \
-	   $(DISTNAME)/bzip2.txt \
-	   $(DISTNAME)/words0 \
-	   $(DISTNAME)/words1 \
-	   $(DISTNAME)/words2 \
-	   $(DISTNAME)/words3 \
-	   $(DISTNAME)/sample1.ref \
-	   $(DISTNAME)/sample2.ref \
-	   $(DISTNAME)/sample3.ref \
-	   $(DISTNAME)/sample1.bz2 \
-	   $(DISTNAME)/sample2.bz2 \
-	   $(DISTNAME)/sample3.bz2 \
-	   $(DISTNAME)/dlltest.c \
-	   $(DISTNAME)/*.html \
-	   $(DISTNAME)/README \
-	   $(DISTNAME)/README.COMPILATION.PROBLEMS \
-	   $(DISTNAME)/CHANGES \
-	   $(DISTNAME)/libbz2.def \
-	   $(DISTNAME)/libbz2.dsp \
-	   $(DISTNAME)/dlltest.dsp \
-	   $(DISTNAME)/makefile.msc \
-	   $(DISTNAME)/Y2K_INFO \
-	   $(DISTNAME)/unzcrash.c \
-	   $(DISTNAME)/spewG.c \
-	   $(DISTNAME)/Makefile-libbz2_so
diff --git a/winsup/bz2lib/Makefile-libbz2_so b/winsup/bz2lib/Makefile-libbz2_so
deleted file mode 100644
index a347c50e9..000000000
--- a/winsup/bz2lib/Makefile-libbz2_so
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# This Makefile builds a shared version of the library, 
-# libbz2.so.1.0.1, with soname libbz2.so.1.0,
-# at least on x86-Linux (RedHat 5.2), 
-# with gcc-2.7.2.3.  Please see the README file for some 
-# important info about building the library like this.
-
-SHELL=/bin/sh
-CC=gcc
-BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
-
-OBJS= blocksort.o  \
-      huffman.o    \
-      crctable.o   \
-      randtable.o  \
-      compress.o   \
-      decompress.o \
-      bzlib.o
-
-all: $(OBJS)
-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.1 $(OBJS)
-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.1
-	rm -f libbz2.so.1.0
-	ln -s libbz2.so.1.0.1 libbz2.so.1.0
-
-clean: 
-	rm -f $(OBJS) bzip2.o libbz2.so.1.0.1 libbz2.so.1.0 bzip2-shared
-
-blocksort.o: blocksort.c
-	$(CC) $(CFLAGS) -c blocksort.c
-huffman.o: huffman.c
-	$(CC) $(CFLAGS) -c huffman.c
-crctable.o: crctable.c
-	$(CC) $(CFLAGS) -c crctable.c
-randtable.o: randtable.c
-	$(CC) $(CFLAGS) -c randtable.c
-compress.o: compress.c
-	$(CC) $(CFLAGS) -c compress.c
-decompress.o: decompress.c
-	$(CC) $(CFLAGS) -c decompress.c
-bzlib.o: bzlib.c
-	$(CC) $(CFLAGS) -c bzlib.c
diff --git a/winsup/bz2lib/Makefile.in b/winsup/bz2lib/Makefile.in
deleted file mode 100644
index a34b146a6..000000000
--- a/winsup/bz2lib/Makefile.in
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright (c) 2000, Red Hat, Inc.
-#
-#     This program is free software; you can redistribute it and/or modify
-#     it under the terms of the GNU General Public License as published by
-#     the Free Software Foundation; either version 2 of the License, or
-#     (at your option) any later version.
-#
-#     A copy of the GNU General Public License can be found at
-#     http://www.gnu.org/
-#
-# Written by Christopher Faylor <cgf@redhat.com>
-#
-# Makefile for Cygwin installer
-
-SHELL :=@SHELL@
-
-srcdir:=@srcdir@
-VPATH:=@srcdir@
-prefix:=@prefix@
-exec_prefix:=@exec_prefix@
-
-bindir:=@bindir@
-etcdir:=$(exec_prefix)/etc
-
-program_transform_name :=@program_transform_name@
-
-INSTALL:=@INSTALL@
-INSTALL_PROGRAM:=@INSTALL_PROGRAM@
-INSTALL_DATA:=@INSTALL_DATA@
-
-EXEEXT:=@EXEEXT@
-EXEEXT_FOR_BUILD :=@EXEEXT_FOR_BUILD@
-
-CC:=@CC@
-CC_FOR_TARGET:=$(CC)
-CXX:=@CXX@
-
-CFLAGS:=@CFLAGS@ -nostdinc
-CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -fno-rtti
-CXX:=@CXX@
-
-WINDRES:=@WINDRES@
-OBJCOPY:=@OBJCOPY@
-AR:=@AR@
-RANLIB:=@RANLIB@
-
-include $(srcdir)/../Makefile.common
-
-
-ZLIB:=zlib/libzcygw.a
-BZ2LIB:=$(bupdir)/bz2lib/libbz2.a
-libmingw32.a:=$(mingw_build)/libmingw32.a
-libuser32:=$(w32api_lib)/libuser32.a
-libkernel32:=$(w32api_lib)/libkernel32.a
-
-ALL_DEP_LDLIBS:=$(ZLIB) $(BZ2LIB) $(w32api_lib)/libole32.a $(w32api_lib)/libwsock32.a \
-		$(w32api_lib)/libnetapi32.a $(w32api_lib)/libadvapi32.a \
-		$(w32api_lib)/libuuid.a $(libkernel32) $(w32api_lib)/libuser32.a \
-		$(libmingw32)
-
-ALL_LDLIBS:=${patsubst $(mingw_build)/lib%.a,-l%,\
-	      ${patsubst $(w32api_lib)/lib%.a,-l%,\
-		${filter-out $(libmingw32),\
-		  ${filter-out $(libuser32),\
-		    ${filter-out $(libkernel32), $(ALL_DEP_LDLIBS)}}}}}
-
-ALL_LDFLAGS:=${filter-out -I%, \
-	       ${filter-out -W%, \
-		-B$(w32api_lib)/ -B${mingw_build}/ $(MINGW_CFLAGS) $(LDFLAGS)}}
-
-LIBS:=libbz2.a
-
-OBJS:=blocksort.o bzlib.o compress.o decompress.o huffman.o crctable.o randtable.o
-
-.SUFFIXES:
-.NOEXPORT:
-
-.PHONY: all install clean realclean
-
-all: Makefile $(LIBS)
-
-$(LIBS): $(OBJS)
-	$(AR) cru $@ $?
-	$(RANLIB) $@
-
-clean:
-	rm -f *.o *.rc *.a
-
-realclean: clean
-	rm -f  Makefile config.cache
-
-install: all
-: Nothing to install
-
-%.o: %.c
-ifdef VERBOSE
-	$(CC) $c -o $(@D)/$(basename $@)$o -MD $(MINGW_CFLAGS) $<
-else
-	@echo $(CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) ... $^;\
-	$(CC) $c -o $(@D)/$(basename $@)$o -MD $(MINGW_CFLAGS) $<
-endif
-
-
-D=$(wildcard *.d)
-ifneq ($D,)
-include $D
-endif
diff --git a/winsup/bz2lib/README b/winsup/bz2lib/README
deleted file mode 100644
index 22945a256..000000000
--- a/winsup/bz2lib/README
+++ /dev/null
@@ -1,166 +0,0 @@
-
-This is the README for bzip2, a block-sorting file compressor, version
-1.0.  This version is fully compatible with the previous public
-releases, bzip2-0.1pl2, bzip2-0.9.0 and bzip2-0.9.5.
-
-bzip2-1.0 is distributed under a BSD-style license.  For details,
-see the file LICENSE.
-
-Complete documentation is available in Postscript form (manual.ps) or
-html (manual_toc.html).  A plain-text version of the manual page is
-available as bzip2.txt.  A statement about Y2K issues is now included
-in the file Y2K_INFO.
-
-
-HOW TO BUILD -- UNIX
-
-Type `make'.  This builds the library libbz2.a and then the
-programs bzip2 and bzip2recover.  Six self-tests are run.
-If the self-tests complete ok, carry on to installation:
-
-To install in /usr/bin, /usr/lib, /usr/man and /usr/include, type
-   make install
-To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type 
-   make install PREFIX=/xxx/yyy
-If you are (justifiably) paranoid and want to see what 'make install'
-is going to do, you can first do
-   make -n install                      or
-   make -n install PREFIX=/xxx/yyy      respectively.
-The -n instructs make to show the commands it would execute, but
-not actually execute them.
-
-
-HOW TO BUILD -- UNIX, shared library libbz2.so.
-
-Do 'make -f Makefile-libbz2_so'.  This Makefile seems to work for
-Linux-ELF (RedHat 5.2 on an x86 box), with gcc.  I make no claims
-that it works for any other platform, though I suspect it probably
-will work for most platforms employing both ELF and gcc.
-
-bzip2-shared, a client of the shared library, is also build, but
-not self-tested.  So I suggest you also build using the normal
-Makefile, since that conducts a self-test.
-
-Important note for people upgrading .so's from 0.9.0/0.9.5 to
-version 1.0.  All the functions in the library have been renamed,
-from (eg) bzCompress to BZ2_bzCompress, to avoid namespace pollution.
-Unfortunately this means that the libbz2.so created by
-Makefile-libbz2_so will not work with any program which used an
-older version of the library.  Sorry.  I do encourage library
-clients to make the effort to upgrade to use version 1.0, since
-it is both faster and more robust than previous versions.
-
-
-HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc.
-
-It's difficult for me to support compilation on all these platforms.
-My approach is to collect binaries for these platforms, and put them
-on the master web page (http://sourceware.cygnus.com/bzip2).  Look
-there.  However (FWIW), bzip2-1.0 is very standard ANSI C and should
-compile unmodified with MS Visual C.  For Win32, there is one
-important caveat: in bzip2.c, you must set BZ_UNIX to 0 and
-BZ_LCCWIN32 to 1 before building.  If you have difficulties building,
-you might want to read README.COMPILATION.PROBLEMS.
-
-
-VALIDATION
-
-Correct operation, in the sense that a compressed file can always be
-decompressed to reproduce the original, is obviously of paramount
-importance.  To validate bzip2, I used a modified version of Mark
-Nelson's churn program.  Churn is an automated test driver which
-recursively traverses a directory structure, using bzip2 to compress
-and then decompress each file it encounters, and checking that the
-decompressed data is the same as the original.  There are more details
-in Section 4 of the user guide.
-
-
-
-Please read and be aware of the following:
-
-WARNING:
-
-   This program (attempts to) compress data by performing several
-   non-trivial transformations on it.  Unless you are 100% familiar
-   with *all* the algorithms contained herein, and with the
-   consequences of modifying them, you should NOT meddle with the
-   compression or decompression machinery.  Incorrect changes can and
-   very likely *will* lead to disastrous loss of data.
-
-
-DISCLAIMER:
-
-   I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
-   USE OF THIS PROGRAM, HOWSOEVER CAUSED.
-
-   Every compression of a file implies an assumption that the
-   compressed file can be decompressed to reproduce the original.
-   Great efforts in design, coding and testing have been made to
-   ensure that this program works correctly.  However, the complexity
-   of the algorithms, and, in particular, the presence of various
-   special cases in the code which occur with very low but non-zero
-   probability make it impossible to rule out the possibility of bugs
-   remaining in the program.  DO NOT COMPRESS ANY DATA WITH THIS
-   PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER
-   SMALL, THAT THE DATA WILL NOT BE RECOVERABLE.
-
-   That is not to say this program is inherently unreliable.  Indeed,
-   I very much hope the opposite is true.  bzip2 has been carefully
-   constructed and extensively tested.
-
-
-PATENTS:
-
-   To the best of my knowledge, bzip2 does not use any patented
-   algorithms.  However, I do not have the resources available to
-   carry out a full patent search.  Therefore I cannot give any
-   guarantee of the above statement.
-
-End of legalities.
-
-
-WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ?
-
-   * Approx 10% faster compression, 30% faster decompression
-   * -t (test mode) is a lot quicker
-   * Can decompress concatenated compressed files
-   * Programming interface, so programs can directly read/write .bz2 files
-   * Less restrictive (BSD-style) licensing
-   * Flag handling more compatible with GNU gzip
-   * Much more documentation, i.e., a proper user manual
-   * Hopefully, improved portability (at least of the library)
-
-WHAT'S NEW IN 0.9.5 ?
-
-   * Compression speed is much less sensitive to the input
-     data than in previous versions.  Specifically, the very
-     slow performance caused by repetitive data is fixed.
-   * Many small improvements in file and flag handling.
-   * A Y2K statement.
-
-WHAT'S NEW IN 1.0
-
-   See the CHANGES file.
-
-I hope you find bzip2 useful.  Feel free to contact me at
-   jseward@acm.org
-if you have any suggestions or queries.  Many people mailed me with
-comments, suggestions and patches after the releases of bzip-0.15,
-bzip-0.21, bzip2-0.1pl2 and bzip2-0.9.0, and the changes in bzip2 are
-largely a result of this feedback.  I thank you for your comments.
-
-At least for the time being, bzip2's "home" is (or can be reached via)
-http://www.muraroa.demon.co.uk.
-
-Julian Seward
-jseward@acm.org
-
-Cambridge, UK
-18   July 1996 (version 0.15)
-25 August 1996 (version 0.21)
- 7 August 1997 (bzip2, version 0.1)
-29 August 1997 (bzip2, version 0.1pl2)
-23 August 1998 (bzip2, version 0.9.0)
- 8   June 1999 (bzip2, version 0.9.5)
- 4   Sept 1999 (bzip2, version 0.9.5d)
- 5    May 2000 (bzip2, version 1.0pre8)
diff --git a/winsup/bz2lib/README.COMPILATION.PROBLEMS b/winsup/bz2lib/README.COMPILATION.PROBLEMS
deleted file mode 100644
index d621ad597..000000000
--- a/winsup/bz2lib/README.COMPILATION.PROBLEMS
+++ /dev/null
@@ -1,130 +0,0 @@
-
-bzip2-1.0 should compile without problems on the vast majority of
-platforms.  Using the supplied Makefile, I've built and tested it
-myself for x86-linux, sparc-solaris, alpha-linux, x86-cygwin32 and
-alpha-tru64unix.  With makefile.msc, Visual C++ 6.0 and nmake, you can
-build a native Win32 version too.  Large file support seems to work
-correctly on at least alpha-tru64unix and x86-cygwin32 (on Windows
-2000).
-
-When I say "large file" I mean a file of size 2,147,483,648 (2^31)
-bytes or above.  Many older OSs can't handle files above this size,
-but many newer ones can.  Large files are pretty huge -- most files
-you'll encounter are not Large Files.
-
-Earlier versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide
-variety of platforms without difficulty, and I hope this version will
-continue in that tradition.  However, in order to support large files,
-I've had to include the define -D_FILE_OFFSET_BITS=64 in the Makefile.
-This can cause problems.
-
-The technique of adding -D_FILE_OFFSET_BITS=64 to get large file
-support is, as far as I know, the Recommended Way to get correct large
-file support.  For more details, see the Large File Support
-Specification, published by the Large File Summit, at
-   http://www.sas.com/standard/large.file/
-
-As a general comment, if you get compilation errors which you think
-are related to large file support, try removing the above define from
-the Makefile, ie, delete the line
-   BIGFILES=-D_FILE_OFFSET_BITS=64 
-from the Makefile, and do 'make clean ; make'.  This will give you a
-version of bzip2 without large file support, which, for most
-applications, is probably not a problem.  
-
-Alternatively, try some of the platform-specific hints listed below.
-
-You can use the spewG.c program to generate huge files to test bzip2's
-large file support, if you are feeling paranoid.  Be aware though that
-any compilation problems which affect bzip2 will also affect spewG.c,
-alas.
-
-
-Known problems as of 1.0pre8:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* HP/UX 10.20 and 11.00, using gcc (2.7.2.3 and 2.95.2):  A large
-  number of warnings appear, including the following:
-
-     /usr/include/sys/resource.h: In function `getrlimit':
-     /usr/include/sys/resource.h:168: 
-        warning: implicit declaration of function `__getrlimit64'
-     /usr/include/sys/resource.h: In function `setrlimit':
-     /usr/include/sys/resource.h:170: 
-        warning: implicit declaration of function `__setrlimit64'
-
-  This would appear to be a problem with large file support, header
-  files and gcc.  gcc may or may not give up at this point.  If it
-  fails, you might be able to improve matters by adding 
-     -D__STDC_EXT__=1
-  to the BIGFILES variable in the Makefile (ie, change its definition
-  to
-     BIGFILES=-D_FILE_OFFSET_BITS=64 -D__STDC_EXT__=1
-
-  Even if gcc does produce a binary which appears to work (ie passes
-  its self-tests), you might want to test it to see if it works properly
-  on large files.
-
-
-* HP/UX 10.20 and 11.00, using HP's cc compiler.
-
-  No specific problems for this combination, except that you'll need to
-  specify the -Ae flag, and zap the gcc-specific stuff
-  -Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce.
-  You should retain -D_FILE_OFFSET_BITS=64 in order to get large
-  file support -- which is reported to work ok for this HP/UX + cc
-  combination.
-
-
-* SunOS 4.1.X.
-
-  Amazingly, there are still people out there using this venerable old
-  banger.  I shouldn't be too rude -- I started life on SunOS, and
-  it was a pretty darn good OS, way back then.  Anyway:
-
-     SunOS doesn't seem to have strerror(), so you'll have to use
-     perror(), perhaps by doing adding this (warning: UNTESTED CODE):
-
-     char* strerror ( int errnum )
-     {
-        if (errnum < 0 || errnum >= sys_nerr)
-           return "Unknown error"; 
-        else
-           return sys_errlist[errnum];
-     }
-
-   Or you could comment out the relevant calls to strerror; they're
-   not mission-critical.  Or you could upgrade to Solaris.  Ha ha ha!
-   (what??  you think I've got Bad Attitude?) 
-
-
-* Making a shared library on Solaris.  (Not really a compilation
-  problem, but many people ask ...)  
-
-  Firstly, if you have Solaris 8, either you have libbz2.so already
-  on your system, or you can install it from the Solaris CD.  
-
-  Secondly, be aware that there are potential naming conflicts
-  between the .so file supplied with Solaris 8, and the .so file
-  which Makefile-libbz2_so will make.  Makefile-libbz2_so creates
-  a .so which has the names which I intend to be "official" as
-  of version 1.0.0 and onwards.  Unfortunately, the .so in
-  Solaris 8 appeared before I decided on the final names, so
-  the two libraries are incompatible.  We have since communicated
-  and I hope that the problems will have been solved in the next
-  version of Solaris, whenever that might appear.
-
-  All that said: you might be able to get somewhere
-  by finding the line in Makefile-libbz2_so which says
-
-  $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.1 $(OBJS)
-
-  and replacing with 
-
-  ($CC) -G -shared -o libbz2.so.1.0.1 -h libbz2.so.1.0 $(OBJS)
-  
-  If gcc objects to the combination -fpic -fPIC, get rid of
-  the second one, leaving just "-fpic".
-
-
-That's the end of the currently known compilation problems.
diff --git a/winsup/bz2lib/Y2K_INFO b/winsup/bz2lib/Y2K_INFO
deleted file mode 100644
index 55fd56a2e..000000000
--- a/winsup/bz2lib/Y2K_INFO
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Y2K status of bzip2 and libbzip2, versions 0.1, 0.9.0 and 0.9.5
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Informally speaking:
-   bzip2 is a compression program built on top of libbzip2, 
-   a library which does the real work of compression and 
-   decompression.  As far as I am aware, libbzip2 does not have 
-   any date-related code at all.
-
-   bzip2 itself copies dates from source to destination files 
-   when compressing or decompressing, using the 'stat' and 'utime' 
-   UNIX system calls.  It doesn't examine, manipulate or store the 
-   dates in any way.  So as far as I can see, there shouldn't be any 
-   problem with bzip2 providing 'stat' and 'utime' work correctly 
-   on your system.
-
-   On non-unix platforms (those for which BZ_UNIX in bzip2.c is
-   not set to 1), bzip2 doesn't even do the date copying.
-
-   Overall, informally speaking, I don't think bzip2 or libbzip2 
-   have a Y2K problem.
-
-Formally speaking:
-   I am not prepared to offer you any assurance whatsoever 
-   regarding Y2K issues in my software.  You alone assume the 
-   entire risk of using the software.  The disclaimer of liability 
-   in the LICENSE file in the bzip2 source distribution continues 
-   to apply on this issue as with every other issue pertaining 
-   to the software.
-
-Julian Seward
-Cambridge, UK
-25 August 1999
diff --git a/winsup/bz2lib/aclocal.m4 b/winsup/bz2lib/aclocal.m4
deleted file mode 100644
index f5379a5be..000000000
--- a/winsup/bz2lib/aclocal.m4
+++ /dev/null
@@ -1,137 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN(AM_MAINTAINER_MODE,
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-# Define a conditional.
-
-AC_DEFUN(AM_CONDITIONAL,
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
diff --git a/winsup/bz2lib/blocksort.c b/winsup/bz2lib/blocksort.c
deleted file mode 100644
index ec426725b..000000000
--- a/winsup/bz2lib/blocksort.c
+++ /dev/null
@@ -1,1134 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Block sorting machinery                               ---*/
-/*---                                           blocksort.c ---*/
-/*-------------------------------------------------------------*/
-
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
-
-  To get some idea how the block sorting algorithms in this file 
-  work, read my paper 
-     On the Performance of BWT Sorting Algorithms
-  in Proceedings of the IEEE Data Compression Conference 2000,
-  Snowbird, Utah, USA, 27-30 March 2000.  The main sort in this
-  file implements the algorithm called  cache  in the paper.
---*/
-
-
-#include "bzlib_private.h"
-
-/*---------------------------------------------*/
-/*--- Fallback O(N log(N)^2) sorting        ---*/
-/*--- algorithm, for repetitive blocks      ---*/
-/*---------------------------------------------*/
-
-/*---------------------------------------------*/
-static 
-__inline__
-void fallbackSimpleSort ( UInt32* fmap, 
-                          UInt32* eclass, 
-                          Int32   lo, 
-                          Int32   hi )
-{
-   Int32 i, j, tmp;
-   UInt32 ec_tmp;
-
-   if (lo == hi) return;
-
-   if (hi - lo > 3) {
-      for ( i = hi-4; i >= lo; i-- ) {
-         tmp = fmap[i];
-         ec_tmp = eclass[tmp];
-         for ( j = i+4; j <= hi && ec_tmp > eclass[fmap[j]]; j += 4 )
-            fmap[j-4] = fmap[j];
-         fmap[j-4] = tmp;
-      }
-   }
-
-   for ( i = hi-1; i >= lo; i-- ) {
-      tmp = fmap[i];
-      ec_tmp = eclass[tmp];
-      for ( j = i+1; j <= hi && ec_tmp > eclass[fmap[j]]; j++ )
-         fmap[j-1] = fmap[j];
-      fmap[j-1] = tmp;
-   }
-}
-
-
-/*---------------------------------------------*/
-#define fswap(zz1, zz2) \
-   { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; }
-
-#define fvswap(zzp1, zzp2, zzn)       \
-{                                     \
-   Int32 yyp1 = (zzp1);               \
-   Int32 yyp2 = (zzp2);               \
-   Int32 yyn  = (zzn);                \
-   while (yyn > 0) {                  \
-      fswap(fmap[yyp1], fmap[yyp2]);  \
-      yyp1++; yyp2++; yyn--;          \
-   }                                  \
-}
-
-
-#define fmin(a,b) ((a) < (b)) ? (a) : (b)
-
-#define fpush(lz,hz) { stackLo[sp] = lz; \
-                       stackHi[sp] = hz; \
-                       sp++; }
-
-#define fpop(lz,hz) { sp--;              \
-                      lz = stackLo[sp];  \
-                      hz = stackHi[sp]; }
-
-#define FALLBACK_QSORT_SMALL_THRESH 10
-#define FALLBACK_QSORT_STACK_SIZE   100
-
-
-static
-void fallbackQSort3 ( UInt32* fmap, 
-                      UInt32* eclass,
-                      Int32   loSt, 
-                      Int32   hiSt )
-{
-   Int32 unLo, unHi, ltLo, gtHi, n, m;
-   Int32 sp, lo, hi;
-   UInt32 med, r, r3;
-   Int32 stackLo[FALLBACK_QSORT_STACK_SIZE];
-   Int32 stackHi[FALLBACK_QSORT_STACK_SIZE];
-
-   r = 0;
-
-   sp = 0;
-   fpush ( loSt, hiSt );
-
-   while (sp > 0) {
-
-      AssertH ( sp < FALLBACK_QSORT_STACK_SIZE, 1004 );
-
-      fpop ( lo, hi );
-      if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) {
-         fallbackSimpleSort ( fmap, eclass, lo, hi );
-         continue;
-      }
-
-      /* Random partitioning.  Median of 3 sometimes fails to
-         avoid bad cases.  Median of 9 seems to help but 
-         looks rather expensive.  This too seems to work but
-         is cheaper.  Guidance for the magic constants 
-         7621 and 32768 is taken from Sedgewick's algorithms
-         book, chapter 35.
-      */
-      r = ((r * 7621) + 1) % 32768;
-      r3 = r % 3;
-      if (r3 == 0) med = eclass[fmap[lo]]; else
-      if (r3 == 1) med = eclass[fmap[(lo+hi)>>1]]; else
-                   med = eclass[fmap[hi]];
-
-      unLo = ltLo = lo;
-      unHi = gtHi = hi;
-
-      while (1) {
-         while (1) {
-            if (unLo > unHi) break;
-            n = (Int32)eclass[fmap[unLo]] - (Int32)med;
-            if (n == 0) { 
-               fswap(fmap[unLo], fmap[ltLo]); 
-               ltLo++; unLo++; 
-               continue; 
-            };
-            if (n > 0) break;
-            unLo++;
-         }
-         while (1) {
-            if (unLo > unHi) break;
-            n = (Int32)eclass[fmap[unHi]] - (Int32)med;
-            if (n == 0) { 
-               fswap(fmap[unHi], fmap[gtHi]); 
-               gtHi--; unHi--; 
-               continue; 
-            };
-            if (n < 0) break;
-            unHi--;
-         }
-         if (unLo > unHi) break;
-         fswap(fmap[unLo], fmap[unHi]); unLo++; unHi--;
-      }
-
-      AssertD ( unHi == unLo-1, "fallbackQSort3(2)" );
-
-      if (gtHi < ltLo) continue;
-
-      n = fmin(ltLo-lo, unLo-ltLo); fvswap(lo, unLo-n, n);
-      m = fmin(hi-gtHi, gtHi-unHi); fvswap(unLo, hi-m+1, m);
-
-      n = lo + unLo - ltLo - 1;
-      m = hi - (gtHi - unHi) + 1;
-
-      if (n - lo > hi - m) {
-         fpush ( lo, n );
-         fpush ( m, hi );
-      } else {
-         fpush ( m, hi );
-         fpush ( lo, n );
-      }
-   }
-}
-
-#undef fmin
-#undef fpush
-#undef fpop
-#undef fswap
-#undef fvswap
-#undef FALLBACK_QSORT_SMALL_THRESH
-#undef FALLBACK_QSORT_STACK_SIZE
-
-
-/*---------------------------------------------*/
-/* Pre:
-      nblock > 0
-      eclass exists for [0 .. nblock-1]
-      ((UChar*)eclass) [0 .. nblock-1] holds block
-      ptr exists for [0 .. nblock-1]
-
-   Post:
-      ((UChar*)eclass) [0 .. nblock-1] holds block
-      All other areas of eclass destroyed
-      fmap [0 .. nblock-1] holds sorted order
-      bhtab [ 0 .. 2+(nblock/32) ] destroyed
-*/
-
-#define       SET_BH(zz)  bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
-#define     CLEAR_BH(zz)  bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
-#define     ISSET_BH(zz)  (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
-#define      WORD_BH(zz)  bhtab[(zz) >> 5]
-#define UNALIGNED_BH(zz)  ((zz) & 0x01f)
-
-static
-void fallbackSort ( UInt32* fmap, 
-                    UInt32* eclass, 
-                    UInt32* bhtab,
-                    Int32   nblock,
-                    Int32   verb )
-{
-   Int32 ftab[257];
-   Int32 ftabCopy[256];
-   Int32 H, i, j, k, l, r, cc, cc1;
-   Int32 nNotDone;
-   Int32 nBhtab;
-   UChar* eclass8 = (UChar*)eclass;
-
-   /*--
-      Initial 1-char radix sort to generate
-      initial fmap and initial BH bits.
-   --*/
-   if (verb >= 4)
-      VPrintf0 ( "        bucket sorting ...\n" );
-   for (i = 0; i < 257;    i++) ftab[i] = 0;
-   for (i = 0; i < nblock; i++) ftab[eclass8[i]]++;
-   for (i = 0; i < 256;    i++) ftabCopy[i] = ftab[i];
-   for (i = 1; i < 257;    i++) ftab[i] += ftab[i-1];
-
-   for (i = 0; i < nblock; i++) {
-      j = eclass8[i];
-      k = ftab[j] - 1;
-      ftab[j] = k;
-      fmap[k] = i;
-   }
-
-   nBhtab = 2 + (nblock / 32);
-   for (i = 0; i < nBhtab; i++) bhtab[i] = 0;
-   for (i = 0; i < 256; i++) SET_BH(ftab[i]);
-
-   /*--
-      Inductively refine the buckets.  Kind-of an
-      "exponential radix sort" (!), inspired by the
-      Manber-Myers suffix array construction algorithm.
-   --*/
-
-   /*-- set sentinel bits for block-end detection --*/
-   for (i = 0; i < 32; i++) { 
-      SET_BH(nblock + 2*i);
-      CLEAR_BH(nblock + 2*i + 1);
-   }
-
-   /*-- the log(N) loop --*/
-   H = 1;
-   while (1) {
-
-      if (verb >= 4) 
-         VPrintf1 ( "        depth %6d has ", H );
-
-      j = 0;
-      for (i = 0; i < nblock; i++) {
-         if (ISSET_BH(i)) j = i;
-         k = fmap[i] - H; if (k < 0) k += nblock;
-         eclass[k] = j;
-      }
-
-      nNotDone = 0;
-      r = -1;
-      while (1) {
-
-	 /*-- find the next non-singleton bucket --*/
-         k = r + 1;
-         while (ISSET_BH(k) && UNALIGNED_BH(k)) k++;
-         if (ISSET_BH(k)) {
-            while (WORD_BH(k) == 0xffffffff) k += 32;
-            while (ISSET_BH(k)) k++;
-         }
-         l = k - 1;
-         if (l >= nblock) break;
-         while (!ISSET_BH(k) && UNALIGNED_BH(k)) k++;
-         if (!ISSET_BH(k)) {
-            while (WORD_BH(k) == 0x00000000) k += 32;
-            while (!ISSET_BH(k)) k++;
-         }
-         r = k - 1;
-         if (r >= nblock) break;
-
-         /*-- now [l, r] bracket current bucket --*/
-         if (r > l) {
-            nNotDone += (r - l + 1);
-            fallbackQSort3 ( fmap, eclass, l, r );
-
-            /*-- scan bucket and generate header bits-- */
-            cc = -1;
-            for (i = l; i <= r; i++) {
-               cc1 = eclass[fmap[i]];
-               if (cc != cc1) { SET_BH(i); cc = cc1; };
-            }
-         }
-      }
-
-      if (verb >= 4) 
-         VPrintf1 ( "%6d unresolved strings\n", nNotDone );
-
-      H *= 2;
-      if (H > nblock || nNotDone == 0) break;
-   }
-
-   /*-- 
-      Reconstruct the original block in
-      eclass8 [0 .. nblock-1], since the
-      previous phase destroyed it.
-   --*/
-   if (verb >= 4)
-      VPrintf0 ( "        reconstructing block ...\n" );
-   j = 0;
-   for (i = 0; i < nblock; i++) {
-      while (ftabCopy[j] == 0) j++;
-      ftabCopy[j]--;
-      eclass8[fmap[i]] = (UChar)j;
-   }
-   AssertH ( j < 256, 1005 );
-}
-
-#undef       SET_BH
-#undef     CLEAR_BH
-#undef     ISSET_BH
-#undef      WORD_BH
-#undef UNALIGNED_BH
-
-
-/*---------------------------------------------*/
-/*--- The main, O(N^2 log(N)) sorting       ---*/
-/*--- algorithm.  Faster for "normal"       ---*/
-/*--- non-repetitive blocks.                ---*/
-/*---------------------------------------------*/
-
-/*---------------------------------------------*/
-static
-__inline__
-Bool mainGtU ( UInt32  i1, 
-               UInt32  i2,
-               UChar*  block, 
-               UInt16* quadrant,
-               UInt32  nblock,
-               Int32*  budget )
-{
-   Int32  k;
-   UChar  c1, c2;
-   UInt16 s1, s2;
-
-   AssertD ( i1 != i2, "mainGtU" );
-   /* 1 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 2 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 3 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 4 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 5 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 6 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 7 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 8 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 9 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 10 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 11 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-   /* 12 */
-   c1 = block[i1]; c2 = block[i2];
-   if (c1 != c2) return (c1 > c2);
-   i1++; i2++;
-
-   k = nblock + 8;
-
-   do {
-      /* 1 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 2 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 3 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 4 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 5 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 6 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 7 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-      /* 8 */
-      c1 = block[i1]; c2 = block[i2];
-      if (c1 != c2) return (c1 > c2);
-      s1 = quadrant[i1]; s2 = quadrant[i2];
-      if (s1 != s2) return (s1 > s2);
-      i1++; i2++;
-
-      if (i1 >= nblock) i1 -= nblock;
-      if (i2 >= nblock) i2 -= nblock;
-
-      k -= 8;
-      (*budget)--;
-   }
-      while (k >= 0);
-
-   return False;
-}
-
-
-/*---------------------------------------------*/
-/*--
-   Knuth's increments seem to work better
-   than Incerpi-Sedgewick here.  Possibly
-   because the number of elems to sort is
-   usually small, typically <= 20.
---*/
-static
-Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
-                   9841, 29524, 88573, 265720,
-                   797161, 2391484 };
-
-static
-void mainSimpleSort ( UInt32* ptr,
-                      UChar*  block,
-                      UInt16* quadrant,
-                      Int32   nblock,
-                      Int32   lo, 
-                      Int32   hi, 
-                      Int32   d,
-                      Int32*  budget )
-{
-   Int32 i, j, h, bigN, hp;
-   UInt32 v;
-
-   bigN = hi - lo + 1;
-   if (bigN < 2) return;
-
-   hp = 0;
-   while (incs[hp] < bigN) hp++;
-   hp--;
-
-   for (; hp >= 0; hp--) {
-      h = incs[hp];
-
-      i = lo + h;
-      while (True) {
-
-         /*-- copy 1 --*/
-         if (i > hi) break;
-         v = ptr[i];
-         j = i;
-         while ( mainGtU ( 
-                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget 
-                 ) ) {
-            ptr[j] = ptr[j-h];
-            j = j - h;
-            if (j <= (lo + h - 1)) break;
-         }
-         ptr[j] = v;
-         i++;
-
-         /*-- copy 2 --*/
-         if (i > hi) break;
-         v = ptr[i];
-         j = i;
-         while ( mainGtU ( 
-                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget 
-                 ) ) {
-            ptr[j] = ptr[j-h];
-            j = j - h;
-            if (j <= (lo + h - 1)) break;
-         }
-         ptr[j] = v;
-         i++;
-
-         /*-- copy 3 --*/
-         if (i > hi) break;
-         v = ptr[i];
-         j = i;
-         while ( mainGtU ( 
-                    ptr[j-h]+d, v+d, block, quadrant, nblock, budget 
-                 ) ) {
-            ptr[j] = ptr[j-h];
-            j = j - h;
-            if (j <= (lo + h - 1)) break;
-         }
-         ptr[j] = v;
-         i++;
-
-         if (*budget < 0) return;
-      }
-   }
-}
-
-
-/*---------------------------------------------*/
-/*--
-   The following is an implementation of
-   an elegant 3-way quicksort for strings,
-   described in a paper "Fast Algorithms for
-   Sorting and Searching Strings", by Robert
-   Sedgewick and Jon L. Bentley.
---*/
-
-#define mswap(zz1, zz2) \
-   { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; }
-
-#define mvswap(zzp1, zzp2, zzn)       \
-{                                     \
-   Int32 yyp1 = (zzp1);               \
-   Int32 yyp2 = (zzp2);               \
-   Int32 yyn  = (zzn);                \
-   while (yyn > 0) {                  \
-      mswap(ptr[yyp1], ptr[yyp2]);    \
-      yyp1++; yyp2++; yyn--;          \
-   }                                  \
-}
-
-static 
-__inline__
-UChar mmed3 ( UChar a, UChar b, UChar c )
-{
-   UChar t;
-   if (a > b) { t = a; a = b; b = t; };
-   if (b > c) { 
-      b = c;
-      if (a > b) b = a;
-   }
-   return b;
-}
-
-#define mmin(a,b) ((a) < (b)) ? (a) : (b)
-
-#define mpush(lz,hz,dz) { stackLo[sp] = lz; \
-                          stackHi[sp] = hz; \
-                          stackD [sp] = dz; \
-                          sp++; }
-
-#define mpop(lz,hz,dz) { sp--;             \
-                         lz = stackLo[sp]; \
-                         hz = stackHi[sp]; \
-                         dz = stackD [sp]; }
-
-
-#define mnextsize(az) (nextHi[az]-nextLo[az])
-
-#define mnextswap(az,bz)                                        \
-   { Int32 tz;                                                  \
-     tz = nextLo[az]; nextLo[az] = nextLo[bz]; nextLo[bz] = tz; \
-     tz = nextHi[az]; nextHi[az] = nextHi[bz]; nextHi[bz] = tz; \
-     tz = nextD [az]; nextD [az] = nextD [bz]; nextD [bz] = tz; }
-
-
-#define MAIN_QSORT_SMALL_THRESH 20
-#define MAIN_QSORT_DEPTH_THRESH (BZ_N_RADIX + BZ_N_QSORT)
-#define MAIN_QSORT_STACK_SIZE 100
-
-static
-void mainQSort3 ( UInt32* ptr,
-                  UChar*  block,
-                  UInt16* quadrant,
-                  Int32   nblock,
-                  Int32   loSt, 
-                  Int32   hiSt, 
-                  Int32   dSt,
-                  Int32*  budget )
-{
-   Int32 unLo, unHi, ltLo, gtHi, n, m, med;
-   Int32 sp, lo, hi, d;
-
-   Int32 stackLo[MAIN_QSORT_STACK_SIZE];
-   Int32 stackHi[MAIN_QSORT_STACK_SIZE];
-   Int32 stackD [MAIN_QSORT_STACK_SIZE];
-
-   Int32 nextLo[3];
-   Int32 nextHi[3];
-   Int32 nextD [3];
-
-   sp = 0;
-   mpush ( loSt, hiSt, dSt );
-
-   while (sp > 0) {
-
-      AssertH ( sp < MAIN_QSORT_STACK_SIZE, 1001 );
-
-      mpop ( lo, hi, d );
-      if (hi - lo < MAIN_QSORT_SMALL_THRESH || 
-          d > MAIN_QSORT_DEPTH_THRESH) {
-         mainSimpleSort ( ptr, block, quadrant, nblock, lo, hi, d, budget );
-         if (*budget < 0) return;
-         continue;
-      }
-
-      med = (Int32) 
-            mmed3 ( block[ptr[ lo         ]+d],
-                    block[ptr[ hi         ]+d],
-                    block[ptr[ (lo+hi)>>1 ]+d] );
-
-      unLo = ltLo = lo;
-      unHi = gtHi = hi;
-
-      while (True) {
-         while (True) {
-            if (unLo > unHi) break;
-            n = ((Int32)block[ptr[unLo]+d]) - med;
-            if (n == 0) { 
-               mswap(ptr[unLo], ptr[ltLo]); 
-               ltLo++; unLo++; continue; 
-            };
-            if (n >  0) break;
-            unLo++;
-         }
-         while (True) {
-            if (unLo > unHi) break;
-            n = ((Int32)block[ptr[unHi]+d]) - med;
-            if (n == 0) { 
-               mswap(ptr[unHi], ptr[gtHi]); 
-               gtHi--; unHi--; continue; 
-            };
-            if (n <  0) break;
-            unHi--;
-         }
-         if (unLo > unHi) break;
-         mswap(ptr[unLo], ptr[unHi]); unLo++; unHi--;
-      }
-
-      AssertD ( unHi == unLo-1, "mainQSort3(2)" );
-
-      if (gtHi < ltLo) {
-         mpush(lo, hi, d+1 );
-         continue;
-      }
-
-      n = mmin(ltLo-lo, unLo-ltLo); mvswap(lo, unLo-n, n);
-      m = mmin(hi-gtHi, gtHi-unHi); mvswap(unLo, hi-m+1, m);
-
-      n = lo + unLo - ltLo - 1;
-      m = hi - (gtHi - unHi) + 1;
-
-      nextLo[0] = lo;  nextHi[0] = n;   nextD[0] = d;
-      nextLo[1] = m;   nextHi[1] = hi;  nextD[1] = d;
-      nextLo[2] = n+1; nextHi[2] = m-1; nextD[2] = d+1;
-
-      if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
-      if (mnextsize(1) < mnextsize(2)) mnextswap(1,2);
-      if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
-
-      AssertD (mnextsize(0) >= mnextsize(1), "mainQSort3(8)" );
-      AssertD (mnextsize(1) >= mnextsize(2), "mainQSort3(9)" );
-
-      mpush (nextLo[0], nextHi[0], nextD[0]);
-      mpush (nextLo[1], nextHi[1], nextD[1]);
-      mpush (nextLo[2], nextHi[2], nextD[2]);
-   }
-}
-
-#undef mswap
-#undef mvswap
-#undef mpush
-#undef mpop
-#undef mmin
-#undef mnextsize
-#undef mnextswap
-#undef MAIN_QSORT_SMALL_THRESH
-#undef MAIN_QSORT_DEPTH_THRESH
-#undef MAIN_QSORT_STACK_SIZE
-
-
-/*---------------------------------------------*/
-/* Pre:
-      nblock > N_OVERSHOOT
-      block32 exists for [0 .. nblock-1 +N_OVERSHOOT]
-      ((UChar*)block32) [0 .. nblock-1] holds block
-      ptr exists for [0 .. nblock-1]
-
-   Post:
-      ((UChar*)block32) [0 .. nblock-1] holds block
-      All other areas of block32 destroyed
-      ftab [0 .. 65536 ] destroyed
-      ptr [0 .. nblock-1] holds sorted order
-      if (*budget < 0), sorting was abandoned
-*/
-
-#define BIGFREQ(b) (ftab[((b)+1) << 8] - ftab[(b) << 8])
-#define SETMASK (1 << 21)
-#define CLEARMASK (~(SETMASK))
-
-static
-void mainSort ( UInt32* ptr, 
-                UChar*  block,
-                UInt16* quadrant, 
-                UInt32* ftab,
-                Int32   nblock,
-                Int32   verb,
-                Int32*  budget )
-{
-   Int32  i, j, k, ss, sb;
-   Int32  runningOrder[256];
-   Bool   bigDone[256];
-   Int32  copyStart[256];
-   Int32  copyEnd  [256];
-   UChar  c1;
-   Int32  numQSorted;
-   UInt16 s;
-   if (verb >= 4) VPrintf0 ( "        main sort initialise ...\n" );
-
-   /*-- set up the 2-byte frequency table --*/
-   for (i = 65536; i >= 0; i--) ftab[i] = 0;
-
-   j = block[0] << 8;
-   i = nblock-1;
-   for (; i >= 3; i -= 4) {
-      quadrant[i] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i]) << 8);
-      ftab[j]++;
-      quadrant[i-1] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i-1]) << 8);
-      ftab[j]++;
-      quadrant[i-2] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i-2]) << 8);
-      ftab[j]++;
-      quadrant[i-3] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i-3]) << 8);
-      ftab[j]++;
-   }
-   for (; i >= 0; i--) {
-      quadrant[i] = 0;
-      j = (j >> 8) | ( ((UInt16)block[i]) << 8);
-      ftab[j]++;
-   }
-
-   /*-- (emphasises close relationship of block & quadrant) --*/
-   for (i = 0; i < BZ_N_OVERSHOOT; i++) {
-      block   [nblock+i] = block[i];
-      quadrant[nblock+i] = 0;
-   }
-
-   if (verb >= 4) VPrintf0 ( "        bucket sorting ...\n" );
-
-   /*-- Complete the initial radix sort --*/
-   for (i = 1; i <= 65536; i++) ftab[i] += ftab[i-1];
-
-   s = block[0] << 8;
-   i = nblock-1;
-   for (; i >= 3; i -= 4) {
-      s = (s >> 8) | (block[i] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i;
-      s = (s >> 8) | (block[i-1] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i-1;
-      s = (s >> 8) | (block[i-2] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i-2;
-      s = (s >> 8) | (block[i-3] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i-3;
-   }
-   for (; i >= 0; i--) {
-      s = (s >> 8) | (block[i] << 8);
-      j = ftab[s] -1;
-      ftab[s] = j;
-      ptr[j] = i;
-   }
-
-   /*--
-      Now ftab contains the first loc of every small bucket.
-      Calculate the running order, from smallest to largest
-      big bucket.
-   --*/
-   for (i = 0; i <= 255; i++) {
-      bigDone     [i] = False;
-      runningOrder[i] = i;
-   }
-
-   {
-      Int32 vv;
-      Int32 h = 1;
-      do h = 3 * h + 1; while (h <= 256);
-      do {
-         h = h / 3;
-         for (i = h; i <= 255; i++) {
-            vv = runningOrder[i];
-            j = i;
-            while ( BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv) ) {
-               runningOrder[j] = runningOrder[j-h];
-               j = j - h;
-               if (j <= (h - 1)) goto zero;
-            }
-            zero:
-            runningOrder[j] = vv;
-         }
-      } while (h != 1);
-   }
-
-   /*--
-      The main sorting loop.
-   --*/
-
-   numQSorted = 0;
-
-   for (i = 0; i <= 255; i++) {
-
-      /*--
-         Process big buckets, starting with the least full.
-         Basically this is a 3-step process in which we call
-         mainQSort3 to sort the small buckets [ss, j], but
-         also make a big effort to avoid the calls if we can.
-      --*/
-      ss = runningOrder[i];
-
-      /*--
-         Step 1:
-         Complete the big bucket [ss] by quicksorting
-         any unsorted small buckets [ss, j], for j != ss.  
-         Hopefully previous pointer-scanning phases have already
-         completed many of the small buckets [ss, j], so
-         we don't have to sort them at all.
-      --*/
-      for (j = 0; j <= 255; j++) {
-         if (j != ss) {
-            sb = (ss << 8) + j;
-            if ( ! (ftab[sb] & SETMASK) ) {
-               Int32 lo = ftab[sb]   & CLEARMASK;
-               Int32 hi = (ftab[sb+1] & CLEARMASK) - 1;
-               if (hi > lo) {
-                  if (verb >= 4)
-                     VPrintf4 ( "        qsort [0x%x, 0x%x]   "
-                                "done %d   this %d\n",
-                                ss, j, numQSorted, hi - lo + 1 );
-                  mainQSort3 ( 
-                     ptr, block, quadrant, nblock, 
-                     lo, hi, BZ_N_RADIX, budget 
-                  );   
-                  numQSorted += (hi - lo + 1);
-                  if (*budget < 0) return;
-               }
-            }
-            ftab[sb] |= SETMASK;
-         }
-      }
-
-      AssertH ( !bigDone[ss], 1006 );
-
-      /*--
-         Step 2:
-         Now scan this big bucket [ss] so as to synthesise the
-         sorted order for small buckets [t, ss] for all t,
-         including, magically, the bucket [ss,ss] too.
-         This will avoid doing Real Work in subsequent Step 1's.
-      --*/
-      {
-         for (j = 0; j <= 255; j++) {
-            copyStart[j] =  ftab[(j << 8) + ss]     & CLEARMASK;
-            copyEnd  [j] = (ftab[(j << 8) + ss + 1] & CLEARMASK) - 1;
-         }
-         for (j = ftab[ss << 8] & CLEARMASK; j < copyStart[ss]; j++) {
-            k = ptr[j]-1; if (k < 0) k += nblock;
-            c1 = block[k];
-            if (!bigDone[c1])
-               ptr[ copyStart[c1]++ ] = k;
-         }
-         for (j = (ftab[(ss+1) << 8] & CLEARMASK) - 1; j > copyEnd[ss]; j--) {
-            k = ptr[j]-1; if (k < 0) k += nblock;
-            c1 = block[k];
-            if (!bigDone[c1]) 
-               ptr[ copyEnd[c1]-- ] = k;
-         }
-      }
-
-      AssertH ( copyStart[ss]-1 == copyEnd[ss], 1007 );
-
-      for (j = 0; j <= 255; j++) ftab[(j << 8) + ss] |= SETMASK;
-
-      /*--
-         Step 3:
-         The [ss] big bucket is now done.  Record this fact,
-         and update the quadrant descriptors.  Remember to
-         update quadrants in the overshoot area too, if
-         necessary.  The "if (i < 255)" test merely skips
-         this updating for the last bucket processed, since
-         updating for the last bucket is pointless.
-
-         The quadrant array provides a way to incrementally
-         cache sort orderings, as they appear, so as to 
-         make subsequent comparisons in fullGtU() complete
-         faster.  For repetitive blocks this makes a big
-         difference (but not big enough to be able to avoid
-         the fallback sorting mechanism, exponential radix sort).
-
-         The precise meaning is: at all times:
-
-            for 0 <= i < nblock and 0 <= j <= nblock
-
-            if block[i] != block[j], 
-
-               then the relative values of quadrant[i] and 
-                    quadrant[j] are meaningless.
-
-               else {
-                  if quadrant[i] < quadrant[j]
-                     then the string starting at i lexicographically
-                     precedes the string starting at j
-
-                  else if quadrant[i] > quadrant[j]
-                     then the string starting at j lexicographically
-                     precedes the string starting at i
-
-                  else
-                     the relative ordering of the strings starting
-                     at i and j has not yet been determined.
-               }
-      --*/
-      bigDone[ss] = True;
-
-      if (i < 255) {
-         Int32 bbStart  = ftab[ss << 8] & CLEARMASK;
-         Int32 bbSize   = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart;
-         Int32 shifts   = 0;
-
-         while ((bbSize >> shifts) > 65534) shifts++;
-
-         for (j = bbSize-1; j >= 0; j--) {
-            Int32 a2update     = ptr[bbStart + j];
-            UInt16 qVal        = (UInt16)(j >> shifts);
-            quadrant[a2update] = qVal;
-            if (a2update < BZ_N_OVERSHOOT)
-               quadrant[a2update + nblock] = qVal;
-         }
-         AssertH ( ((bbSize-1) >> shifts) <= 65535, 1002 );
-      }
-
-   }
-
-   if (verb >= 4)
-      VPrintf3 ( "        %d pointers, %d sorted, %d scanned\n",
-                 nblock, numQSorted, nblock - numQSorted );
-}
-
-#undef BIGFREQ
-#undef SETMASK
-#undef CLEARMASK
-
-
-/*---------------------------------------------*/
-/* Pre:
-      nblock > 0
-      arr2 exists for [0 .. nblock-1 +N_OVERSHOOT]
-      ((UChar*)arr2)  [0 .. nblock-1] holds block
-      arr1 exists for [0 .. nblock-1]
-
-   Post:
-      ((UChar*)arr2) [0 .. nblock-1] holds block
-      All other areas of block destroyed
-      ftab [ 0 .. 65536 ] destroyed
-      arr1 [0 .. nblock-1] holds sorted order
-*/
-void BZ2_blockSort ( EState* s )
-{
-   UInt32* ptr    = s->ptr; 
-   UChar*  block  = s->block;
-   UInt32* ftab   = s->ftab;
-   Int32   nblock = s->nblock;
-   Int32   verb   = s->verbosity;
-   Int32   wfact  = s->workFactor;
-   UInt16* quadrant;
-   Int32   budget;
-   Int32   budgetInit;
-   Int32   i;
-
-   if (nblock < 10000) {
-      fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb );
-   } else {
-      /* Calculate the location for quadrant, remembering to get
-         the alignment right.  Assumes that &(block[0]) is at least
-         2-byte aligned -- this should be ok since block is really
-         the first section of arr2.
-      */
-      i = nblock+BZ_N_OVERSHOOT;
-      if (i & 1) i++;
-      quadrant = (UInt16*)(&(block[i]));
-
-      /* (wfact-1) / 3 puts the default-factor-30
-         transition point at very roughly the same place as 
-         with v0.1 and v0.9.0.  
-         Not that it particularly matters any more, since the
-         resulting compressed stream is now the same regardless
-         of whether or not we use the main sort or fallback sort.
-      */
-      if (wfact < 1  ) wfact = 1;
-      if (wfact > 100) wfact = 100;
-      budgetInit = nblock * ((wfact-1) / 3);
-      budget = budgetInit;
-
-      mainSort ( ptr, block, quadrant, ftab, nblock, verb, &budget );
-      if (verb >= 3) 
-         VPrintf3 ( "      %d work, %d block, ratio %5.2f\n",
-                    budgetInit - budget,
-                    nblock, 
-                    (float)(budgetInit - budget) /
-                    (float)(nblock==0 ? 1 : nblock) ); 
-      if (budget < 0) {
-         if (verb >= 2) 
-            VPrintf0 ( "    too repetitive; using fallback"
-                       " sorting algorithm\n" );
-         fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb );
-      }
-   }
-
-   s->origPtr = -1;
-   for (i = 0; i < s->nblock; i++)
-      if (ptr[i] == 0)
-         { s->origPtr = i; break; };
-
-   AssertH( s->origPtr != -1, 1003 );
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                       blocksort.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/winsup/bz2lib/bzip2.1 b/winsup/bz2lib/bzip2.1
deleted file mode 100644
index 7de54a011..000000000
--- a/winsup/bz2lib/bzip2.1
+++ /dev/null
@@ -1,439 +0,0 @@
-.PU
-.TH bzip2 1
-.SH NAME
-bzip2, bunzip2 \- a block-sorting file compressor, v1.0
-.br
-bzcat \- decompresses files to stdout
-.br
-bzip2recover \- recovers data from damaged bzip2 files
-
-.SH SYNOPSIS
-.ll +8
-.B bzip2
-.RB [ " \-cdfkqstvzVL123456789 " ]
-[
-.I "filenames \&..."
-]
-.ll -8
-.br
-.B bunzip2
-.RB [ " \-fkvsVL " ]
-[ 
-.I "filenames \&..."
-]
-.br
-.B bzcat
-.RB [ " \-s " ]
-[ 
-.I "filenames \&..."
-]
-.br
-.B bzip2recover
-.I "filename"
-
-.SH DESCRIPTION
-.I bzip2
-compresses files using the Burrows-Wheeler block sorting
-text compression algorithm, and Huffman coding.  Compression is
-generally considerably better than that achieved by more conventional
-LZ77/LZ78-based compressors, and approaches the performance of the PPM
-family of statistical compressors.
-
-The command-line options are deliberately very similar to 
-those of 
-.I GNU gzip, 
-but they are not identical.
-
-.I bzip2
-expects a list of file names to accompany the
-command-line flags.  Each file is replaced by a compressed version of
-itself, with the name "original_name.bz2".  
-Each compressed file
-has the same modification date, permissions, and, when possible,
-ownership as the corresponding original, so that these properties can
-be correctly restored at decompression time.  File name handling is
-naive in the sense that there is no mechanism for preserving original
-file names, permissions, ownerships or dates in filesystems which lack
-these concepts, or have serious file name length restrictions, such as
-MS-DOS.
-
-.I bzip2
-and
-.I bunzip2
-will by default not overwrite existing
-files.  If you want this to happen, specify the \-f flag.
-
-If no file names are specified,
-.I bzip2
-compresses from standard
-input to standard output.  In this case,
-.I bzip2
-will decline to
-write compressed output to a terminal, as this would be entirely
-incomprehensible and therefore pointless.
-
-.I bunzip2
-(or
-.I bzip2 \-d) 
-decompresses all
-specified files.  Files which were not created by 
-.I bzip2
-will be detected and ignored, and a warning issued.  
-.I bzip2
-attempts to guess the filename for the decompressed file 
-from that of the compressed file as follows:
-
-       filename.bz2    becomes   filename
-       filename.bz     becomes   filename
-       filename.tbz2   becomes   filename.tar
-       filename.tbz    becomes   filename.tar
-       anyothername    becomes   anyothername.out
-
-If the file does not end in one of the recognised endings, 
-.I .bz2, 
-.I .bz, 
-.I .tbz2
-or
-.I .tbz, 
-.I bzip2 
-complains that it cannot
-guess the name of the original file, and uses the original name
-with
-.I .out
-appended.
-
-As with compression, supplying no
-filenames causes decompression from 
-standard input to standard output.
-
-.I bunzip2 
-will correctly decompress a file which is the
-concatenation of two or more compressed files.  The result is the
-concatenation of the corresponding uncompressed files.  Integrity
-testing (\-t) 
-of concatenated 
-compressed files is also supported.
-
-You can also compress or decompress files to the standard output by
-giving the \-c flag.  Multiple files may be compressed and
-decompressed like this.  The resulting outputs are fed sequentially to
-stdout.  Compression of multiple files 
-in this manner generates a stream
-containing multiple compressed file representations.  Such a stream
-can be decompressed correctly only by
-.I bzip2 
-version 0.9.0 or
-later.  Earlier versions of
-.I bzip2
-will stop after decompressing
-the first file in the stream.
-
-.I bzcat
-(or
-.I bzip2 -dc) 
-decompresses all specified files to
-the standard output.
-
-.I bzip2
-will read arguments from the environment variables
-.I BZIP2
-and
-.I BZIP,
-in that order, and will process them
-before any arguments read from the command line.  This gives a 
-convenient way to supply default arguments.
-
-Compression is always performed, even if the compressed 
-file is slightly
-larger than the original.  Files of less than about one hundred bytes
-tend to get larger, since the compression mechanism has a constant
-overhead in the region of 50 bytes.  Random data (including the output
-of most file compressors) is coded at about 8.05 bits per byte, giving
-an expansion of around 0.5%.
-
-As a self-check for your protection, 
-.I 
-bzip2
-uses 32-bit CRCs to
-make sure that the decompressed version of a file is identical to the
-original.  This guards against corruption of the compressed data, and
-against undetected bugs in
-.I bzip2
-(hopefully very unlikely).  The
-chances of data corruption going undetected is microscopic, about one
-chance in four billion for each file processed.  Be aware, though, that
-the check occurs upon decompression, so it can only tell you that
-something is wrong.  It can't help you 
-recover the original uncompressed
-data.  You can use 
-.I bzip2recover
-to try to recover data from
-damaged files.
-
-Return values: 0 for a normal exit, 1 for environmental problems (file
-not found, invalid flags, I/O errors, &c), 2 to indicate a corrupt
-compressed file, 3 for an internal consistency error (eg, bug) which
-caused
-.I bzip2
-to panic.
-
-.SH OPTIONS
-.TP
-.B \-c --stdout
-Compress or decompress to standard output.
-.TP
-.B \-d --decompress
-Force decompression.  
-.I bzip2, 
-.I bunzip2 
-and
-.I bzcat 
-are
-really the same program, and the decision about what actions to take is
-done on the basis of which name is used.  This flag overrides that
-mechanism, and forces 
-.I bzip2
-to decompress.
-.TP
-.B \-z --compress
-The complement to \-d: forces compression, regardless of the
-invokation name.
-.TP
-.B \-t --test
-Check integrity of the specified file(s), but don't decompress them.
-This really performs a trial decompression and throws away the result.
-.TP
-.B \-f --force
-Force overwrite of output files.  Normally,
-.I bzip2 
-will not overwrite
-existing output files.  Also forces 
-.I bzip2 
-to break hard links
-to files, which it otherwise wouldn't do.
-.TP
-.B \-k --keep
-Keep (don't delete) input files during compression
-or decompression.
-.TP
-.B \-s --small
-Reduce memory usage, for compression, decompression and testing.  Files
-are decompressed and tested using a modified algorithm which only
-requires 2.5 bytes per block byte.  This means any file can be
-decompressed in 2300k of memory, albeit at about half the normal speed.
-
-During compression, \-s selects a block size of 200k, which limits
-memory use to around the same figure, at the expense of your compression
-ratio.  In short, if your machine is low on memory (8 megabytes or
-less), use \-s for everything.  See MEMORY MANAGEMENT below.
-.TP
-.B \-q --quiet
-Suppress non-essential warning messages.  Messages pertaining to
-I/O errors and other critical events will not be suppressed.
-.TP
-.B \-v --verbose
-Verbose mode -- show the compression ratio for each file processed.
-Further \-v's increase the verbosity level, spewing out lots of
-information which is primarily of interest for diagnostic purposes.
-.TP
-.B \-L --license -V --version
-Display the software version, license terms and conditions.
-.TP
-.B \-1 to \-9
-Set the block size to 100 k, 200 k ..  900 k when compressing.  Has no
-effect when decompressing.  See MEMORY MANAGEMENT below.
-.TP
-.B \--
-Treats all subsequent arguments as file names, even if they start
-with a dash.  This is so you can handle files with names beginning
-with a dash, for example: bzip2 \-- \-myfilename.
-.TP
-.B \--repetitive-fast --repetitive-best
-These flags are redundant in versions 0.9.5 and above.  They provided
-some coarse control over the behaviour of the sorting algorithm in
-earlier versions, which was sometimes useful.  0.9.5 and above have an
-improved algorithm which renders these flags irrelevant.
-
-.SH MEMORY MANAGEMENT
-.I bzip2 
-compresses large files in blocks.  The block size affects
-both the compression ratio achieved, and the amount of memory needed for
-compression and decompression.  The flags \-1 through \-9
-specify the block size to be 100,000 bytes through 900,000 bytes (the
-default) respectively.  At decompression time, the block size used for
-compression is read from the header of the compressed file, and
-.I bunzip2
-then allocates itself just enough memory to decompress
-the file.  Since block sizes are stored in compressed files, it follows
-that the flags \-1 to \-9 are irrelevant to and so ignored
-during decompression.
-
-Compression and decompression requirements, 
-in bytes, can be estimated as:
-
-       Compression:   400k + ( 8 x block size )
-
-       Decompression: 100k + ( 4 x block size ), or
-                      100k + ( 2.5 x block size )
-
-Larger block sizes give rapidly diminishing marginal returns.  Most of
-the compression comes from the first two or three hundred k of block
-size, a fact worth bearing in mind when using
-.I bzip2
-on small machines.
-It is also important to appreciate that the decompression memory
-requirement is set at compression time by the choice of block size.
-
-For files compressed with the default 900k block size,
-.I bunzip2
-will require about 3700 kbytes to decompress.  To support decompression
-of any file on a 4 megabyte machine, 
-.I bunzip2
-has an option to
-decompress using approximately half this amount of memory, about 2300
-kbytes.  Decompression speed is also halved, so you should use this
-option only where necessary.  The relevant flag is -s.
-
-In general, try and use the largest block size memory constraints allow,
-since that maximises the compression achieved.  Compression and
-decompression speed are virtually unaffected by block size.
-
-Another significant point applies to files which fit in a single block
--- that means most files you'd encounter using a large block size.  The
-amount of real memory touched is proportional to the size of the file,
-since the file is smaller than a block.  For example, compressing a file
-20,000 bytes long with the flag -9 will cause the compressor to
-allocate around 7600k of memory, but only touch 400k + 20000 * 8 = 560
-kbytes of it.  Similarly, the decompressor will allocate 3700k but only
-touch 100k + 20000 * 4 = 180 kbytes.
-
-Here is a table which summarises the maximum memory usage for different
-block sizes.  Also recorded is the total compressed size for 14 files of
-the Calgary Text Compression Corpus totalling 3,141,622 bytes.  This
-column gives some feel for how compression varies with block size.
-These figures tend to understate the advantage of larger block sizes for
-larger files, since the Corpus is dominated by smaller files.
-
-           Compress   Decompress   Decompress   Corpus
-    Flag     usage      usage       -s usage     Size
-
-     -1      1200k       500k         350k      914704
-     -2      2000k       900k         600k      877703
-     -3      2800k      1300k         850k      860338
-     -4      3600k      1700k        1100k      846899
-     -5      4400k      2100k        1350k      845160
-     -6      5200k      2500k        1600k      838626
-     -7      6100k      2900k        1850k      834096
-     -8      6800k      3300k        2100k      828642
-     -9      7600k      3700k        2350k      828642
-
-.SH RECOVERING DATA FROM DAMAGED FILES
-.I bzip2
-compresses files in blocks, usually 900kbytes long.  Each
-block is handled independently.  If a media or transmission error causes
-a multi-block .bz2
-file to become damaged, it may be possible to
-recover data from the undamaged blocks in the file.
-
-The compressed representation of each block is delimited by a 48-bit
-pattern, which makes it possible to find the block boundaries with
-reasonable certainty.  Each block also carries its own 32-bit CRC, so
-damaged blocks can be distinguished from undamaged ones.
-
-.I bzip2recover
-is a simple program whose purpose is to search for
-blocks in .bz2 files, and write each block out into its own .bz2 
-file.  You can then use
-.I bzip2 
-\-t
-to test the
-integrity of the resulting files, and decompress those which are
-undamaged.
-
-.I bzip2recover
-takes a single argument, the name of the damaged file, 
-and writes a number of files "rec0001file.bz2",
-"rec0002file.bz2", etc, containing the  extracted  blocks.
-The  output  filenames  are  designed  so  that the use of
-wildcards in subsequent processing -- for example,  
-"bzip2 -dc  rec*file.bz2 > recovered_data" -- lists the files in
-the correct order.
-
-.I bzip2recover
-should be of most use dealing with large .bz2
-files,  as  these will contain many blocks.  It is clearly
-futile to use it on damaged single-block  files,  since  a
-damaged  block  cannot  be recovered.  If you wish to minimise 
-any potential data loss through media  or  transmission errors, 
-you might consider compressing with a smaller
-block size.
-
-.SH PERFORMANCE NOTES
-The sorting phase of compression gathers together similar strings in the
-file.  Because of this, files containing very long runs of repeated
-symbols, like "aabaabaabaab ..."  (repeated several hundred times) may
-compress more slowly than normal.  Versions 0.9.5 and above fare much
-better than previous versions in this respect.  The ratio between
-worst-case and average-case compression time is in the region of 10:1.
-For previous versions, this figure was more like 100:1.  You can use the
-\-vvvv option to monitor progress in great detail, if you want.
-
-Decompression speed is unaffected by these phenomena.
-
-.I bzip2
-usually allocates several megabytes of memory to operate
-in, and then charges all over it in a fairly random fashion.  This means
-that performance, both for compressing and decompressing, is largely
-determined by the speed at which your machine can service cache misses.
-Because of this, small changes to the code to reduce the miss rate have
-been observed to give disproportionately large performance improvements.
-I imagine 
-.I bzip2
-will perform best on machines with very large caches.
-
-.SH CAVEATS
-I/O error messages are not as helpful as they could be.
-.I bzip2
-tries hard to detect I/O errors and exit cleanly, but the details of
-what the problem is sometimes seem rather misleading.
-
-This manual page pertains to version 1.0 of
-.I bzip2.  
-Compressed
-data created by this version is entirely forwards and backwards
-compatible with the previous public releases, versions 0.1pl2, 0.9.0
-and 0.9.5,
-but with the following exception: 0.9.0 and above can correctly
-decompress multiple concatenated compressed files.  0.1pl2 cannot do
-this; it will stop after decompressing just the first file in the
-stream.
-
-.I bzip2recover
-uses 32-bit integers to represent bit positions in
-compressed files, so it cannot handle compressed files more than 512
-megabytes long.  This could easily be fixed.
-
-.SH AUTHOR
-Julian Seward, jseward@acm.org.
-
-http://sourceware.cygnus.com/bzip2
-http://www.muraroa.demon.co.uk
-
-The ideas embodied in
-.I bzip2
-are due to (at least) the following
-people: Michael Burrows and David Wheeler (for the block sorting
-transformation), David Wheeler (again, for the Huffman coder), Peter
-Fenwick (for the structured coding model in the original
-.I bzip,
-and many refinements), and Alistair Moffat, Radford Neal and Ian Witten
-(for the arithmetic coder in the original
-.I bzip).  
-I am much
-indebted for their help, support and advice.  See the manual in the
-source distribution for pointers to sources of documentation.  Christian
-von Roques encouraged me to look for faster sorting algorithms, so as to
-speed up compression.  Bela Lubkin encouraged me to improve the
-worst-case compression performance.  Many people sent patches, helped
-with portability problems, lent machines, gave advice and were generally
-helpful.
diff --git a/winsup/bz2lib/bzip2.1.preformatted b/winsup/bz2lib/bzip2.1.preformatted
deleted file mode 100644
index 9f18339e9..000000000
--- a/winsup/bz2lib/bzip2.1.preformatted
+++ /dev/null
@@ -1,462 +0,0 @@
-
-
-
-bzip2(1)                                                 bzip2(1)
-
-
-NNAAMMEE
-       bzip2, bunzip2 - a block-sorting file compressor, v1.0
-       bzcat - decompresses files to stdout
-       bzip2recover - recovers data from damaged bzip2 files
-
-
-SSYYNNOOPPSSIISS
-       bbzziipp22 [ --ccddffkkqqssttvvzzVVLL112233445566778899 ] [ _f_i_l_e_n_a_m_e_s _._._.  ]
-       bbuunnzziipp22 [ --ffkkvvssVVLL ] [ _f_i_l_e_n_a_m_e_s _._._.  ]
-       bbzzccaatt [ --ss ] [ _f_i_l_e_n_a_m_e_s _._._.  ]
-       bbzziipp22rreeccoovveerr _f_i_l_e_n_a_m_e
-
-
-DDEESSCCRRIIPPTTIIOONN
-       _b_z_i_p_2  compresses  files  using  the Burrows-Wheeler block
-       sorting text compression algorithm,  and  Huffman  coding.
-       Compression  is  generally  considerably  better than that
-       achieved by more conventional LZ77/LZ78-based compressors,
-       and  approaches  the performance of the PPM family of sta-
-       tistical compressors.
-
-       The command-line options are deliberately very similar  to
-       those of _G_N_U _g_z_i_p_, but they are not identical.
-
-       _b_z_i_p_2  expects  a list of file names to accompany the com-
-       mand-line flags.  Each file is replaced  by  a  compressed
-       version  of  itself,  with  the  name "original_name.bz2".
-       Each compressed file has the same modification date,  per-
-       missions, and, when possible, ownership as the correspond-
-       ing original, so that these properties  can  be  correctly
-       restored  at  decompression  time.   File name handling is
-       naive in the sense that there is no mechanism for preserv-
-       ing  original file names, permissions, ownerships or dates
-       in filesystems which lack these concepts, or have  serious
-       file name length restrictions, such as MS-DOS.
-
-       _b_z_i_p_2  and  _b_u_n_z_i_p_2 will by default not overwrite existing
-       files.  If you want this to happen, specify the -f flag.
-
-       If no file names  are  specified,  _b_z_i_p_2  compresses  from
-       standard  input  to  standard output.  In this case, _b_z_i_p_2
-       will decline to write compressed output to a terminal,  as
-       this  would  be  entirely  incomprehensible  and therefore
-       pointless.
-
-       _b_u_n_z_i_p_2 (or _b_z_i_p_2 _-_d_) decompresses  all  specified  files.
-       Files which were not created by _b_z_i_p_2 will be detected and
-       ignored, and a warning issued.  _b_z_i_p_2  attempts  to  guess
-       the  filename  for  the decompressed file from that of the
-       compressed file as follows:
-
-              filename.bz2    becomes   filename
-              filename.bz     becomes   filename
-              filename.tbz2   becomes   filename.tar
-
-
-
-                                                                1
-
-
-
-
-
-bzip2(1)                                                 bzip2(1)
-
-
-              filename.tbz    becomes   filename.tar
-              anyothername    becomes   anyothername.out
-
-       If the file does not end in one of the recognised endings,
-       _._b_z_2_,  _._b_z_,  _._t_b_z_2 or _._t_b_z_, _b_z_i_p_2 complains that it cannot
-       guess the name of the original file, and uses the original
-       name with _._o_u_t appended.
-
-       As  with compression, supplying no filenames causes decom-
-       pression from standard input to standard output.
-
-       _b_u_n_z_i_p_2 will correctly decompress a file which is the con-
-       catenation of two or more compressed files.  The result is
-       the concatenation of the corresponding uncompressed files.
-       Integrity testing (-t) of concatenated compressed files is
-       also supported.
-
-       You can also compress or decompress files to the  standard
-       output  by giving the -c flag.  Multiple files may be com-
-       pressed and decompressed like this.  The resulting outputs
-       are  fed  sequentially to stdout.  Compression of multiple
-       files in this manner generates a stream containing  multi-
-       ple compressed file representations.  Such a stream can be
-       decompressed correctly only  by  _b_z_i_p_2  version  0.9.0  or
-       later.   Earlier  versions of _b_z_i_p_2 will stop after decom-
-       pressing the first file in the stream.
-
-       _b_z_c_a_t (or _b_z_i_p_2 _-_d_c_) decompresses all specified  files  to
-       the standard output.
-
-       _b_z_i_p_2  will  read arguments from the environment variables
-       _B_Z_I_P_2 and _B_Z_I_P_, in  that  order,  and  will  process  them
-       before  any  arguments  read  from the command line.  This
-       gives a convenient way to supply default arguments.
-
-       Compression is always performed, even  if  the  compressed
-       file  is slightly larger than the original.  Files of less
-       than about one hundred bytes tend to get larger, since the
-       compression  mechanism  has  a  constant  overhead  in the
-       region of 50 bytes.  Random data (including the output  of
-       most  file  compressors)  is  coded at about 8.05 bits per
-       byte, giving an expansion of around 0.5%.
-
-       As a self-check for your  protection,  _b_z_i_p_2  uses  32-bit
-       CRCs  to make sure that the decompressed version of a file
-       is identical to the original.  This guards against corrup-
-       tion  of  the compressed data, and against undetected bugs
-       in _b_z_i_p_2 (hopefully very unlikely).  The chances  of  data
-       corruption  going  undetected  is  microscopic,  about one
-       chance in four billion for each file processed.  Be aware,
-       though,  that  the  check occurs upon decompression, so it
-       can only tell you that something is wrong.  It can't  help
-       you  recover  the original uncompressed data.  You can use
-       _b_z_i_p_2_r_e_c_o_v_e_r to try to recover data from damaged files.
-
-
-
-                                                                2
-
-
-
-
-
-bzip2(1)                                                 bzip2(1)
-
-
-       Return values: 0 for a normal exit,  1  for  environmental
-       problems  (file not found, invalid flags, I/O errors, &c),
-       2 to indicate a corrupt compressed file, 3 for an internal
-       consistency error (eg, bug) which caused _b_z_i_p_2 to panic.
-
-
-OOPPTTIIOONNSS
-       --cc ----ssttddoouutt
-              Compress or decompress to standard output.
-
-       --dd ----ddeeccoommpprreessss
-              Force  decompression.  _b_z_i_p_2_, _b_u_n_z_i_p_2 and _b_z_c_a_t are
-              really the same program,  and  the  decision  about
-              what  actions to take is done on the basis of which
-              name is used.  This flag overrides that  mechanism,
-              and forces _b_z_i_p_2 to decompress.
-
-       --zz ----ccoommpprreessss
-              The  complement  to -d: forces compression, regard-
-              less of the invokation name.
-
-       --tt ----tteesstt
-              Check integrity of the specified file(s), but don't
-              decompress  them.   This  really  performs  a trial
-              decompression and throws away the result.
-
-       --ff ----ffoorrccee
-              Force overwrite of output files.   Normally,  _b_z_i_p_2
-              will  not  overwrite  existing  output files.  Also
-              forces _b_z_i_p_2 to break hard links to files, which it
-              otherwise wouldn't do.
-
-       --kk ----kkeeeepp
-              Keep  (don't delete) input files during compression
-              or decompression.
-
-       --ss ----ssmmaallll
-              Reduce memory usage, for compression, decompression
-              and  testing.   Files  are  decompressed and tested
-              using a modified algorithm which only requires  2.5
-              bytes  per  block byte.  This means any file can be
-              decompressed in 2300k of memory,  albeit  at  about
-              half the normal speed.
-
-              During  compression,  -s  selects  a  block size of
-              200k, which limits memory use to  around  the  same
-              figure,  at  the expense of your compression ratio.
-              In short, if your  machine  is  low  on  memory  (8
-              megabytes  or  less),  use  -s for everything.  See
-              MEMORY MANAGEMENT below.
-
-       --qq ----qquuiieett
-              Suppress non-essential warning messages.   Messages
-              pertaining  to I/O errors and other critical events
-
-
-
-                                                                3
-
-
-
-
-
-bzip2(1)                                                 bzip2(1)
-
-
-              will not be suppressed.
-
-       --vv ----vveerrbboossee
-              Verbose mode -- show the compression ratio for each
-              file  processed.   Further  -v's  increase the ver-
-              bosity level, spewing out lots of information which
-              is primarily of interest for diagnostic purposes.
-
-       --LL ----lliicceennssee --VV ----vveerrssiioonn
-              Display  the  software  version,  license terms and
-              conditions.
-
-       --11 ttoo --99
-              Set the block size to 100 k, 200 k ..  900  k  when
-              compressing.   Has  no  effect  when decompressing.
-              See MEMORY MANAGEMENT below.
-
-       ----     Treats all subsequent arguments as file names, even
-              if they start with a dash.  This is so you can han-
-              dle files with names beginning  with  a  dash,  for
-              example: bzip2 -- -myfilename.
-
-       ----rreeppeettiittiivvee--ffaasstt ----rreeppeettiittiivvee--bbeesstt
-              These  flags  are  redundant  in versions 0.9.5 and
-              above.  They provided some coarse control over  the
-              behaviour  of the sorting algorithm in earlier ver-
-              sions, which was sometimes useful.  0.9.5 and above
-              have  an  improved  algorithm  which  renders these
-              flags irrelevant.
-
-
-MMEEMMOORRYY MMAANNAAGGEEMMEENNTT
-       _b_z_i_p_2 compresses large files in blocks.   The  block  size
-       affects  both  the  compression  ratio  achieved,  and the
-       amount of memory needed for compression and decompression.
-       The  flags  -1  through  -9  specify  the block size to be
-       100,000 bytes through 900,000 bytes (the default)  respec-
-       tively.   At  decompression  time, the block size used for
-       compression is read from  the  header  of  the  compressed
-       file, and _b_u_n_z_i_p_2 then allocates itself just enough memory
-       to decompress the file.  Since block sizes are  stored  in
-       compressed  files,  it follows that the flags -1 to -9 are
-       irrelevant to and so ignored during decompression.
-
-       Compression and decompression requirements, in bytes,  can
-       be estimated as:
-
-              Compression:   400k + ( 8 x block size )
-
-              Decompression: 100k + ( 4 x block size ), or
-                             100k + ( 2.5 x block size )
-
-       Larger  block  sizes  give  rapidly  diminishing  marginal
-       returns.  Most of the compression comes from the first two
-
-
-
-                                                                4
-
-
-
-
-
-bzip2(1)                                                 bzip2(1)
-
-
-       or  three hundred k of block size, a fact worth bearing in
-       mind when using _b_z_i_p_2  on  small  machines.   It  is  also
-       important  to  appreciate  that  the  decompression memory
-       requirement is set at compression time by  the  choice  of
-       block size.
-
-       For  files  compressed  with  the default 900k block size,
-       _b_u_n_z_i_p_2 will require about 3700 kbytes to decompress.   To
-       support decompression of any file on a 4 megabyte machine,
-       _b_u_n_z_i_p_2 has an option to  decompress  using  approximately
-       half this amount of memory, about 2300 kbytes.  Decompres-
-       sion speed is also halved, so you should use  this  option
-       only where necessary.  The relevant flag is -s.
-
-       In general, try and use the largest block size memory con-
-       straints  allow,  since  that  maximises  the  compression
-       achieved.   Compression and decompression speed are virtu-
-       ally unaffected by block size.
-
-       Another significant point applies to files which fit in  a
-       single  block  --  that  means  most files you'd encounter
-       using a large block  size.   The  amount  of  real  memory
-       touched is proportional to the size of the file, since the
-       file is smaller than a block.  For example, compressing  a
-       file  20,000  bytes  long  with the flag -9 will cause the
-       compressor to allocate around 7600k of  memory,  but  only
-       touch 400k + 20000 * 8 = 560 kbytes of it.  Similarly, the
-       decompressor will allocate 3700k but  only  touch  100k  +
-       20000 * 4 = 180 kbytes.
-
-       Here  is a table which summarises the maximum memory usage
-       for different block sizes.  Also  recorded  is  the  total
-       compressed  size for 14 files of the Calgary Text Compres-
-       sion Corpus totalling 3,141,622 bytes.  This column  gives
-       some  feel  for  how  compression  varies with block size.
-       These figures tend to understate the advantage  of  larger
-       block  sizes  for  larger files, since the Corpus is domi-
-       nated by smaller files.
-
-                  Compress   Decompress   Decompress   Corpus
-           Flag     usage      usage       -s usage     Size
-
-            -1      1200k       500k         350k      914704
-            -2      2000k       900k         600k      877703
-            -3      2800k      1300k         850k      860338
-            -4      3600k      1700k        1100k      846899
-            -5      4400k      2100k        1350k      845160
-            -6      5200k      2500k        1600k      838626
-            -7      6100k      2900k        1850k      834096
-            -8      6800k      3300k        2100k      828642
-            -9      7600k      3700k        2350k      828642
-
-
-
-
-
-
-                                                                5
-
-
-
-
-
-bzip2(1)                                                 bzip2(1)
-
-
-RREECCOOVVEERRIINNGG DDAATTAA FFRROOMM DDAAMMAAGGEEDD FFIILLEESS
-       _b_z_i_p_2 compresses files in blocks, usually 900kbytes  long.
-       Each block is handled independently.  If a media or trans-
-       mission error causes a multi-block  .bz2  file  to  become
-       damaged,  it  may  be  possible  to  recover data from the
-       undamaged blocks in the file.
-
-       The compressed representation of each block  is  delimited
-       by  a  48-bit pattern, which makes it possible to find the
-       block boundaries with reasonable  certainty.   Each  block
-       also  carries its own 32-bit CRC, so damaged blocks can be
-       distinguished from undamaged ones.
-
-       _b_z_i_p_2_r_e_c_o_v_e_r is a  simple  program  whose  purpose  is  to
-       search  for blocks in .bz2 files, and write each block out
-       into its own .bz2 file.  You can then use _b_z_i_p_2 -t to test
-       the integrity of the resulting files, and decompress those
-       which are undamaged.
-
-       _b_z_i_p_2_r_e_c_o_v_e_r takes a single argument, the name of the dam-
-       aged file, and writes a number of files "rec0001file.bz2",
-       "rec0002file.bz2", etc, containing the  extracted  blocks.
-       The  output  filenames  are  designed  so  that the use of
-       wildcards in subsequent processing -- for example,  "bzip2
-       -dc   rec*file.bz2 > recovered_data" -- lists the files in
-       the correct order.
-
-       _b_z_i_p_2_r_e_c_o_v_e_r should be of most use dealing with large .bz2
-       files,  as  these will contain many blocks.  It is clearly
-       futile to use it on damaged single-block  files,  since  a
-       damaged  block  cannot  be recovered.  If you wish to min-
-       imise any potential data loss through media  or  transmis-
-       sion errors, you might consider compressing with a smaller
-       block size.
-
-
-PPEERRFFOORRMMAANNCCEE NNOOTTEESS
-       The sorting phase of compression gathers together  similar
-       strings  in  the  file.  Because of this, files containing
-       very long runs of  repeated  symbols,  like  "aabaabaabaab
-       ..."   (repeated  several hundred times) may compress more
-       slowly than normal.  Versions 0.9.5 and  above  fare  much
-       better  than previous versions in this respect.  The ratio
-       between worst-case and average-case compression time is in
-       the  region  of  10:1.  For previous versions, this figure
-       was more like 100:1.  You can use the -vvvv option to mon-
-       itor progress in great detail, if you want.
-
-       Decompression speed is unaffected by these phenomena.
-
-       _b_z_i_p_2  usually  allocates  several  megabytes of memory to
-       operate in, and then charges all over it in a fairly  ran-
-       dom  fashion.   This means that performance, both for com-
-       pressing and decompressing, is largely determined  by  the
-
-
-
-                                                                6
-
-
-
-
-
-bzip2(1)                                                 bzip2(1)
-
-
-       speed  at  which  your  machine  can service cache misses.
-       Because of this, small changes to the code to  reduce  the
-       miss  rate  have  been observed to give disproportionately
-       large performance improvements.  I imagine _b_z_i_p_2 will per-
-       form best on machines with very large caches.
-
-
-CCAAVVEEAATTSS
-       I/O  error  messages  are not as helpful as they could be.
-       _b_z_i_p_2 tries hard to detect I/O errors  and  exit  cleanly,
-       but  the  details  of  what  the problem is sometimes seem
-       rather misleading.
-
-       This manual page pertains to version 1.0 of  _b_z_i_p_2_.   Com-
-       pressed  data created by this version is entirely forwards
-       and  backwards  compatible  with   the   previous   public
-       releases,  versions  0.1pl2, 0.9.0 and 0.9.5, but with the
-       following exception: 0.9.0 and above can correctly  decom-
-       press multiple concatenated compressed files.  0.1pl2 can-
-       not do this; it will stop  after  decompressing  just  the
-       first file in the stream.
-
-       _b_z_i_p_2_r_e_c_o_v_e_r  uses  32-bit integers to represent bit posi-
-       tions in compressed files, so it cannot handle  compressed
-       files  more than 512 megabytes long.  This could easily be
-       fixed.
-
-
-AAUUTTHHOORR
-       Julian Seward, jseward@acm.org.
-
-       http://sourceware.cygnus.com/bzip2
-       http://www.muraroa.demon.co.uk
-
-       The ideas embodied in _b_z_i_p_2 are due to (at least) the fol-
-       lowing people: Michael Burrows and David Wheeler (for  the
-       block  sorting  transformation), David Wheeler (again, for
-       the Huffman coder), Peter Fenwick (for the structured cod-
-       ing model in the original _b_z_i_p_, and many refinements), and
-       Alistair Moffat, Radford Neal  and  Ian  Witten  (for  the
-       arithmetic  coder  in  the  original  _b_z_i_p_)_.   I  am  much
-       indebted for their help, support and advice.  See the man-
-       ual  in the source distribution for pointers to sources of
-       documentation.  Christian von Roques encouraged me to look
-       for  faster sorting algorithms, so as to speed up compres-
-       sion.  Bela Lubkin encouraged me to improve the worst-case
-       compression performance.  Many people sent patches, helped
-       with portability problems, lent machines, gave advice  and
-       were generally helpful.
-
-
-
-
-
-
-
-
-                                                                7
-
-
diff --git a/winsup/bz2lib/bzip2.c b/winsup/bz2lib/bzip2.c
deleted file mode 100644
index 56adfdcbc..000000000
--- a/winsup/bz2lib/bzip2.c
+++ /dev/null
@@ -1,2044 +0,0 @@
-
-/*-----------------------------------------------------------*/
-/*--- A block-sorting, lossless compressor        bzip2.c ---*/
-/*-----------------------------------------------------------*/
-
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
---*/
-
-
-/*----------------------------------------------------*/
-/*--- IMPORTANT                                    ---*/
-/*----------------------------------------------------*/
-
-/*--
-   WARNING:
-      This program and library (attempts to) compress data by 
-      performing several non-trivial transformations on it.  
-      Unless you are 100% familiar with *all* the algorithms 
-      contained herein, and with the consequences of modifying them, 
-      you should NOT meddle with the compression or decompression 
-      machinery.  Incorrect changes can and very likely *will* 
-      lead to disasterous loss of data.
-
-   DISCLAIMER:
-      I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
-      USE OF THIS PROGRAM, HOWSOEVER CAUSED.
-
-      Every compression of a file implies an assumption that the
-      compressed file can be decompressed to reproduce the original.
-      Great efforts in design, coding and testing have been made to
-      ensure that this program works correctly.  However, the
-      complexity of the algorithms, and, in particular, the presence
-      of various special cases in the code which occur with very low
-      but non-zero probability make it impossible to rule out the
-      possibility of bugs remaining in the program.  DO NOT COMPRESS
-      ANY DATA WITH THIS PROGRAM AND/OR LIBRARY UNLESS YOU ARE PREPARED 
-      TO ACCEPT THE POSSIBILITY, HOWEVER SMALL, THAT THE DATA WILL 
-      NOT BE RECOVERABLE.
-
-      That is not to say this program is inherently unreliable.
-      Indeed, I very much hope the opposite is true.  bzip2/libbzip2
-      has been carefully constructed and extensively tested.
-
-   PATENTS:
-      To the best of my knowledge, bzip2/libbzip2 does not use any 
-      patented algorithms.  However, I do not have the resources 
-      available to carry out a full patent search.  Therefore I cannot 
-      give any guarantee of the above statement.
---*/
-
-
-
-/*----------------------------------------------------*/
-/*--- and now for something much more pleasant :-) ---*/
-/*----------------------------------------------------*/
-
-/*---------------------------------------------*/
-/*--
-  Place a 1 beside your platform, and 0 elsewhere.
---*/
-
-/*--
-  Generic 32-bit Unix.
-  Also works on 64-bit Unix boxes.
---*/
-#define BZ_UNIX      1
-
-/*--
-  Win32, as seen by Jacob Navia's excellent
-  port of (Chris Fraser & David Hanson)'s excellent
-  lcc compiler.
---*/
-#define BZ_LCCWIN32  0
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#undef  BZ_LCCWIN32
-#define BZ_LCCWIN32 1
-#undef  BZ_UNIX
-#define BZ_UNIX 0
-#endif
-
-
-/*---------------------------------------------*/
-/*--
-  Some stuff for all platforms.
---*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <math.h>
-#include <errno.h>
-#include <ctype.h>
-#include "bzlib.h"
-
-#define ERROR_IF_EOF(i)       { if ((i) == EOF)  ioError(); }
-#define ERROR_IF_NOT_ZERO(i)  { if ((i) != 0)    ioError(); }
-#define ERROR_IF_MINUS_ONE(i) { if ((i) == (-1)) ioError(); }
-
-
-/*---------------------------------------------*/
-/*--
-   Platform-specific stuff.
---*/
-
-#if BZ_UNIX
-#   include <sys/types.h>
-#   include <utime.h>
-#   include <unistd.h>
-#   include <sys/stat.h>
-#   include <sys/times.h>
-
-#   define PATH_SEP    '/'
-#   define MY_LSTAT    lstat
-#   define MY_S_IFREG  S_ISREG
-#   define MY_STAT     stat
-
-#   define APPEND_FILESPEC(root, name) \
-      root=snocString((root), (name))
-
-#   define APPEND_FLAG(root, name) \
-      root=snocString((root), (name))
-
-#   define SET_BINARY_MODE(fd) /**/
-
-#   ifdef __GNUC__
-#      define NORETURN __attribute__ ((noreturn))
-#   else
-#      define NORETURN /**/
-#   endif
-#   ifdef __DJGPP__
-#     include <io.h>
-#     include <fcntl.h>
-#     undef MY_LSTAT
-#     define MY_LSTAT stat
-#     undef SET_BINARY_MODE
-#     define SET_BINARY_MODE(fd)                        \
-        do {                                            \
-           int retVal = setmode ( fileno ( fd ),        \
-                                 O_BINARY );            \
-           ERROR_IF_MINUS_ONE ( retVal );               \
-        } while ( 0 )
-#   endif
-#   ifdef __CYGWIN__
-#     include <io.h>
-#     include <fcntl.h>
-#     undef SET_BINARY_MODE
-#     define SET_BINARY_MODE(fd)                        \
-        do {                                            \
-           int retVal = setmode ( fileno ( fd ),        \
-                                 O_BINARY );            \
-           ERROR_IF_MINUS_ONE ( retVal );               \
-        } while ( 0 )
-#   endif
-#endif
-
-
-
-#if BZ_LCCWIN32
-#   include <io.h>
-#   include <fcntl.h>
-#   include <sys\stat.h>
-
-#   define NORETURN       /**/
-#   define PATH_SEP       '\\'
-#   define MY_LSTAT       _stat
-#   define MY_STAT        _stat
-#   define MY_S_IFREG(x)  ((x) & _S_IFREG)
-
-#   define APPEND_FLAG(root, name) \
-      root=snocString((root), (name))
-
-#   if 0
-   /*-- lcc-win32 seems to expand wildcards itself --*/
-#   define APPEND_FILESPEC(root, spec)                \
-      do {                                            \
-         if ((spec)[0] == '-') {                      \
-            root = snocString((root), (spec));        \
-         } else {                                     \
-            struct _finddata_t c_file;                \
-            long hFile;                               \
-            hFile = _findfirst((spec), &c_file);      \
-            if ( hFile == -1L ) {                     \
-               root = snocString ((root), (spec));    \
-            } else {                                  \
-               int anInt = 0;                         \
-               while ( anInt == 0 ) {                 \
-                  root = snocString((root),           \
-                            &c_file.name[0]);         \
-                  anInt = _findnext(hFile, &c_file);  \
-               }                                      \
-            }                                         \
-         }                                            \
-      } while ( 0 )
-#   else
-#   define APPEND_FILESPEC(root, name)                \
-      root = snocString ((root), (name))
-#   endif
-
-#   define SET_BINARY_MODE(fd)                        \
-      do {                                            \
-         int retVal = setmode ( fileno ( fd ),        \
-                               O_BINARY );            \
-         ERROR_IF_MINUS_ONE ( retVal );               \
-      } while ( 0 )
-
-#endif
-
-
-/*---------------------------------------------*/
-/*--
-  Some more stuff for all platforms :-)
---*/
-
-typedef char            Char;
-typedef unsigned char   Bool;
-typedef unsigned char   UChar;
-typedef int             Int32;
-typedef unsigned int    UInt32;
-typedef short           Int16;
-typedef unsigned short  UInt16;
-                                       
-#define True  ((Bool)1)
-#define False ((Bool)0)
-
-/*--
-  IntNative is your platform's `native' int size.
-  Only here to avoid probs with 64-bit platforms.
---*/
-typedef int IntNative;
-
-
-/*---------------------------------------------------*/
-/*--- Misc (file handling) data decls             ---*/
-/*---------------------------------------------------*/
-
-Int32   verbosity;
-Bool    keepInputFiles, smallMode, deleteOutputOnInterrupt;
-Bool    forceOverwrite, testFailsExist, unzFailsExist, noisy;
-Int32   numFileNames, numFilesProcessed, blockSize100k;
-Int32   exitValue;
-
-/*-- source modes; F==file, I==stdin, O==stdout --*/
-#define SM_I2O           1
-#define SM_F2O           2
-#define SM_F2F           3
-
-/*-- operation modes --*/
-#define OM_Z             1
-#define OM_UNZ           2
-#define OM_TEST          3
-
-Int32   opMode;
-Int32   srcMode;
-
-#define FILE_NAME_LEN 1034
-
-Int32   longestFileName;
-Char    inName [FILE_NAME_LEN];
-Char    outName[FILE_NAME_LEN];
-Char    tmpName[FILE_NAME_LEN];
-Char    *progName;
-Char    progNameReally[FILE_NAME_LEN];
-FILE    *outputHandleJustInCase;
-Int32   workFactor;
-
-static void    panic                 ( Char* )   NORETURN;
-static void    ioError               ( void )    NORETURN;
-static void    outOfMemory           ( void )    NORETURN;
-static void    configError           ( void )    NORETURN;
-static void    crcError              ( void )    NORETURN;
-static void    cleanUpAndFail        ( Int32 )   NORETURN;
-static void    compressedStreamEOF   ( void )    NORETURN;
-
-static void    copyFileName ( Char*, Char* );
-static void*   myMalloc     ( Int32 );
-
-
-
-/*---------------------------------------------------*/
-/*--- An implementation of 64-bit ints.  Sigh.    ---*/
-/*--- Roll on widespread deployment of ANSI C9X ! ---*/
-/*---------------------------------------------------*/
-
-typedef
-   struct { UChar b[8]; } 
-   UInt64;
-
-static
-void uInt64_from_UInt32s ( UInt64* n, UInt32 lo32, UInt32 hi32 )
-{
-   n->b[7] = (UChar)((hi32 >> 24) & 0xFF);
-   n->b[6] = (UChar)((hi32 >> 16) & 0xFF);
-   n->b[5] = (UChar)((hi32 >> 8)  & 0xFF);
-   n->b[4] = (UChar) (hi32        & 0xFF);
-   n->b[3] = (UChar)((lo32 >> 24) & 0xFF);
-   n->b[2] = (UChar)((lo32 >> 16) & 0xFF);
-   n->b[1] = (UChar)((lo32 >> 8)  & 0xFF);
-   n->b[0] = (UChar) (lo32        & 0xFF);
-}
-
-static
-double uInt64_to_double ( UInt64* n )
-{
-   Int32  i;
-   double base = 1.0;
-   double sum  = 0.0;
-   for (i = 0; i < 8; i++) {
-      sum  += base * (double)(n->b[i]);
-      base *= 256.0;
-   }
-   return sum;
-}
-
-static
-void uInt64_add ( UInt64* src, UInt64* dst )
-{
-   Int32 i;
-   Int32 carry = 0;
-   for (i = 0; i < 8; i++) {
-      carry += ( ((Int32)src->b[i]) + ((Int32)dst->b[i]) );
-      dst->b[i] = (UChar)(carry & 0xFF);
-      carry >>= 8;
-   }
-}
-
-static
-void uInt64_sub ( UInt64* src, UInt64* dst )
-{
-   Int32 t, i;
-   Int32 borrow = 0;
-   for (i = 0; i < 8; i++) {
-      t = ((Int32)dst->b[i]) - ((Int32)src->b[i]) - borrow;
-      if (t < 0) {
-         dst->b[i] = (UChar)(t + 256);
-         borrow = 1;
-      } else {
-         dst->b[i] = (UChar)t;
-         borrow = 0;
-      }
-   }
-}
-
-static
-void uInt64_mul ( UInt64* a, UInt64* b, UInt64* r_hi, UInt64* r_lo )
-{
-   UChar sum[16];
-   Int32 ia, ib, carry;
-   for (ia = 0; ia < 16; ia++) sum[ia] = 0;
-   for (ia = 0; ia < 8; ia++) {
-      carry = 0;
-      for (ib = 0; ib < 8; ib++) {
-         carry += ( ((Int32)sum[ia+ib]) 
-                    + ((Int32)a->b[ia]) * ((Int32)b->b[ib]) );
-         sum[ia+ib] = (UChar)(carry & 0xFF);
-         carry >>= 8;
-      }
-      sum[ia+8] = (UChar)(carry & 0xFF);
-      if ((carry >>= 8) != 0) panic ( "uInt64_mul" );
-   }
-
-   for (ia = 0; ia < 8; ia++) r_hi->b[ia] = sum[ia+8];
-   for (ia = 0; ia < 8; ia++) r_lo->b[ia] = sum[ia];
-}
-
-
-static
-void uInt64_shr1 ( UInt64* n )
-{
-   Int32 i;
-   for (i = 0; i < 8; i++) {
-      n->b[i] >>= 1;
-      if (i < 7 && (n->b[i+1] & 1)) n->b[i] |= 0x80;
-   }
-}
-
-static
-void uInt64_shl1 ( UInt64* n )
-{
-   Int32 i;
-   for (i = 7; i >= 0; i--) {
-      n->b[i] <<= 1;
-      if (i > 0 && (n->b[i-1] & 0x80)) n->b[i]++;
-   }
-}
-
-static
-Bool uInt64_isZero ( UInt64* n )
-{
-   Int32 i;
-   for (i = 0; i < 8; i++)
-      if (n->b[i] != 0) return 0;
-   return 1;
-}
-
-static
-Int32 uInt64_qrm10 ( UInt64* n )
-{
-   /* Divide *n by 10, and return the remainder.  Long division
-      is difficult, so we cheat and instead multiply by
-      0xCCCC CCCC CCCC CCCD, which is 0.8 (viz, 0.1 << 3).
-   */
-   Int32  i;
-   UInt64 tmp1, tmp2, n_orig, zero_point_eight;
-
-   zero_point_eight.b[1] = zero_point_eight.b[2] = 
-   zero_point_eight.b[3] = zero_point_eight.b[4] = 
-   zero_point_eight.b[5] = zero_point_eight.b[6] = 
-   zero_point_eight.b[7] = 0xCC;
-   zero_point_eight.b[0] = 0xCD;
-
-   n_orig = *n;
-
-   /* divide n by 10, 
-      by multiplying by 0.8 and then shifting right 3 times */
-   uInt64_mul ( n, &zero_point_eight, &tmp1, &tmp2 );
-   uInt64_shr1(&tmp1); uInt64_shr1(&tmp1); uInt64_shr1(&tmp1); 
-   *n = tmp1;
-   
-   /* tmp1 = 8*n, tmp2 = 2*n */
-   uInt64_shl1(&tmp1); uInt64_shl1(&tmp1); uInt64_shl1(&tmp1);
-   tmp2 = *n; uInt64_shl1(&tmp2);
-
-   /* tmp1 = 10*n */
-   uInt64_add ( &tmp2, &tmp1 );
-
-   /* n_orig = n_orig - 10*n */
-   uInt64_sub ( &tmp1, &n_orig );
-
-   /* n_orig should now hold quotient, in range 0 .. 9 */
-   for (i = 7; i >= 1; i--) 
-      if (n_orig.b[i] != 0) panic ( "uInt64_qrm10(1)" );
-   if (n_orig.b[0] > 9)
-      panic ( "uInt64_qrm10(2)" );
-
-   return (int)n_orig.b[0];
-}
-
-/* ... and the Whole Entire Point of all this UInt64 stuff is
-   so that we can supply the following function.
-*/
-static
-void uInt64_toAscii ( char* outbuf, UInt64* n )
-{
-   Int32  i, q;
-   UChar  buf[32];
-   Int32  nBuf   = 0;
-   UInt64 n_copy = *n;
-   do {
-      q = uInt64_qrm10 ( &n_copy );
-      buf[nBuf] = q + '0';
-      nBuf++;
-   } while (!uInt64_isZero(&n_copy));
-   outbuf[nBuf] = 0;
-   for (i = 0; i < nBuf; i++) outbuf[i] = buf[nBuf-i-1];
-}
-
-
-/*---------------------------------------------------*/
-/*--- Processing of complete files and streams    ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------*/
-static 
-Bool myfeof ( FILE* f )
-{
-   Int32 c = fgetc ( f );
-   if (c == EOF) return True;
-   ungetc ( c, f );
-   return False;
-}
-
-
-/*---------------------------------------------*/
-static 
-void compressStream ( FILE *stream, FILE *zStream )
-{
-   BZFILE* bzf = NULL;
-   UChar   ibuf[5000];
-   Int32   nIbuf;
-   UInt32  nbytes_in_lo32, nbytes_in_hi32;
-   UInt32  nbytes_out_lo32, nbytes_out_hi32;
-   Int32   bzerr, bzerr_dummy, ret;
-
-   SET_BINARY_MODE(stream);
-   SET_BINARY_MODE(zStream);
-
-   if (ferror(stream)) goto errhandler_io;
-   if (ferror(zStream)) goto errhandler_io;
-
-   bzf = BZ2_bzWriteOpen ( &bzerr, zStream, 
-                           blockSize100k, verbosity, workFactor );   
-   if (bzerr != BZ_OK) goto errhandler;
-
-   if (verbosity >= 2) fprintf ( stderr, "\n" );
-
-   while (True) {
-
-      if (myfeof(stream)) break;
-      nIbuf = fread ( ibuf, sizeof(UChar), 5000, stream );
-      if (ferror(stream)) goto errhandler_io;
-      if (nIbuf > 0) BZ2_bzWrite ( &bzerr, bzf, (void*)ibuf, nIbuf );
-      if (bzerr != BZ_OK) goto errhandler;
-
-   }
-
-   BZ2_bzWriteClose64 ( &bzerr, bzf, 0, 
-                        &nbytes_in_lo32, &nbytes_in_hi32,
-                        &nbytes_out_lo32, &nbytes_out_hi32 );
-   if (bzerr != BZ_OK) goto errhandler;
-
-   if (ferror(zStream)) goto errhandler_io;
-   ret = fflush ( zStream );
-   if (ret == EOF) goto errhandler_io;
-   if (zStream != stdout) {
-      ret = fclose ( zStream );
-      if (ret == EOF) goto errhandler_io;
-   }
-   if (ferror(stream)) goto errhandler_io;
-   ret = fclose ( stream );
-   if (ret == EOF) goto errhandler_io;
-
-   if (nbytes_in_lo32 == 0 && nbytes_in_hi32 == 0) 
-      nbytes_in_lo32 = 1;
-
-   if (verbosity >= 1) {
-      Char   buf_nin[32], buf_nout[32];
-      UInt64 nbytes_in,   nbytes_out;
-      double nbytes_in_d, nbytes_out_d;
-      uInt64_from_UInt32s ( &nbytes_in, 
-                            nbytes_in_lo32, nbytes_in_hi32 );
-      uInt64_from_UInt32s ( &nbytes_out, 
-                            nbytes_out_lo32, nbytes_out_hi32 );
-      nbytes_in_d  = uInt64_to_double ( &nbytes_in );
-      nbytes_out_d = uInt64_to_double ( &nbytes_out );
-      uInt64_toAscii ( buf_nin, &nbytes_in );
-      uInt64_toAscii ( buf_nout, &nbytes_out );
-      fprintf ( stderr, "%6.3f:1, %6.3f bits/byte, "
-                        "%5.2f%% saved, %s in, %s out.\n",
-                nbytes_in_d / nbytes_out_d,
-                (8.0 * nbytes_out_d) / nbytes_in_d,
-                100.0 * (1.0 - nbytes_out_d / nbytes_in_d),
-                buf_nin,
-                buf_nout
-              );
-   }
-
-   return;
-
-   errhandler:
-   BZ2_bzWriteClose64 ( &bzerr_dummy, bzf, 1, 
-                        &nbytes_in_lo32, &nbytes_in_hi32,
-                        &nbytes_out_lo32, &nbytes_out_hi32 );
-   switch (bzerr) {
-      case BZ_CONFIG_ERROR:
-         configError(); break;
-      case BZ_MEM_ERROR:
-         outOfMemory (); break;
-      case BZ_IO_ERROR:
-         errhandler_io:
-         ioError(); break;
-      default:
-         panic ( "compress:unexpected error" );
-   }
-
-   panic ( "compress:end" );
-   /*notreached*/
-}
-
-
-
-/*---------------------------------------------*/
-static 
-Bool uncompressStream ( FILE *zStream, FILE *stream )
-{
-   BZFILE* bzf = NULL;
-   Int32   bzerr, bzerr_dummy, ret, nread, streamNo, i;
-   UChar   obuf[5000];
-   UChar   unused[BZ_MAX_UNUSED];
-   Int32   nUnused;
-   UChar*  unusedTmp;
-
-   nUnused = 0;
-   streamNo = 0;
-
-   SET_BINARY_MODE(stream);
-   SET_BINARY_MODE(zStream);
-
-   if (ferror(stream)) goto errhandler_io;
-   if (ferror(zStream)) goto errhandler_io;
-
-   while (True) {
-
-      bzf = BZ2_bzReadOpen ( 
-               &bzerr, zStream, verbosity, 
-               (int)smallMode, unused, nUnused
-            );
-      if (bzf == NULL || bzerr != BZ_OK) goto errhandler;
-      streamNo++;
-
-      while (bzerr == BZ_OK) {
-         nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
-         if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler;
-         if ((bzerr == BZ_OK || bzerr == BZ_STREAM_END) && nread > 0)
-            fwrite ( obuf, sizeof(UChar), nread, stream );
-         if (ferror(stream)) goto errhandler_io;
-      }
-      if (bzerr != BZ_STREAM_END) goto errhandler;
-
-      BZ2_bzReadGetUnused ( &bzerr, bzf, (void**)(&unusedTmp), &nUnused );
-      if (bzerr != BZ_OK) panic ( "decompress:bzReadGetUnused" );
-
-      for (i = 0; i < nUnused; i++) unused[i] = unusedTmp[i];
-
-      BZ2_bzReadClose ( &bzerr, bzf );
-      if (bzerr != BZ_OK) panic ( "decompress:bzReadGetUnused" );
-
-      if (nUnused == 0 && myfeof(zStream)) break;
-
-   }
-
-   if (ferror(zStream)) goto errhandler_io;
-   ret = fclose ( zStream );
-   if (ret == EOF) goto errhandler_io;
-
-   if (ferror(stream)) goto errhandler_io;
-   ret = fflush ( stream );
-   if (ret != 0) goto errhandler_io;
-   if (stream != stdout) {
-      ret = fclose ( stream );
-      if (ret == EOF) goto errhandler_io;
-   }
-   if (verbosity >= 2) fprintf ( stderr, "\n    " );
-   return True;
-
-   errhandler:
-   BZ2_bzReadClose ( &bzerr_dummy, bzf );
-   switch (bzerr) {
-      case BZ_CONFIG_ERROR:
-         configError(); break;
-      case BZ_IO_ERROR:
-         errhandler_io:
-         ioError(); break;
-      case BZ_DATA_ERROR:
-         crcError();
-      case BZ_MEM_ERROR:
-         outOfMemory();
-      case BZ_UNEXPECTED_EOF:
-         compressedStreamEOF();
-      case BZ_DATA_ERROR_MAGIC:
-         if (zStream != stdin) fclose(zStream);
-         if (stream != stdout) fclose(stream);
-         if (streamNo == 1) {
-            return False;
-         } else {
-            if (noisy)
-            fprintf ( stderr, 
-                      "\n%s: %s: trailing garbage after EOF ignored\n",
-                      progName, inName );
-            return True;       
-         }
-      default:
-         panic ( "decompress:unexpected error" );
-   }
-
-   panic ( "decompress:end" );
-   return True; /*notreached*/
-}
-
-
-/*---------------------------------------------*/
-static 
-Bool testStream ( FILE *zStream )
-{
-   BZFILE* bzf = NULL;
-   Int32   bzerr, bzerr_dummy, ret, nread, streamNo, i;
-   UChar   obuf[5000];
-   UChar   unused[BZ_MAX_UNUSED];
-   Int32   nUnused;
-   UChar*  unusedTmp;
-
-   nUnused = 0;
-   streamNo = 0;
-
-   SET_BINARY_MODE(zStream);
-   if (ferror(zStream)) goto errhandler_io;
-
-   while (True) {
-
-      bzf = BZ2_bzReadOpen ( 
-               &bzerr, zStream, verbosity, 
-               (int)smallMode, unused, nUnused
-            );
-      if (bzf == NULL || bzerr != BZ_OK) goto errhandler;
-      streamNo++;
-
-      while (bzerr == BZ_OK) {
-         nread = BZ2_bzRead ( &bzerr, bzf, obuf, 5000 );
-         if (bzerr == BZ_DATA_ERROR_MAGIC) goto errhandler;
-      }
-      if (bzerr != BZ_STREAM_END) goto errhandler;
-
-      BZ2_bzReadGetUnused ( &bzerr, bzf, (void**)(&unusedTmp), &nUnused );
-      if (bzerr != BZ_OK) panic ( "test:bzReadGetUnused" );
-
-      for (i = 0; i < nUnused; i++) unused[i] = unusedTmp[i];
-
-      BZ2_bzReadClose ( &bzerr, bzf );
-      if (bzerr != BZ_OK) panic ( "test:bzReadGetUnused" );
-      if (nUnused == 0 && myfeof(zStream)) break;
-
-   }
-
-   if (ferror(zStream)) goto errhandler_io;
-   ret = fclose ( zStream );
-   if (ret == EOF) goto errhandler_io;
-
-   if (verbosity >= 2) fprintf ( stderr, "\n    " );
-   return True;
-
-   errhandler:
-   BZ2_bzReadClose ( &bzerr_dummy, bzf );
-   if (verbosity == 0) 
-      fprintf ( stderr, "%s: %s: ", progName, inName );
-   switch (bzerr) {
-      case BZ_CONFIG_ERROR:
-         configError(); break;
-      case BZ_IO_ERROR:
-         errhandler_io:
-         ioError(); break;
-      case BZ_DATA_ERROR:
-         fprintf ( stderr,
-                   "data integrity (CRC) error in data\n" );
-         return False;
-      case BZ_MEM_ERROR:
-         outOfMemory();
-      case BZ_UNEXPECTED_EOF:
-         fprintf ( stderr,
-                   "file ends unexpectedly\n" );
-         return False;
-      case BZ_DATA_ERROR_MAGIC:
-         if (zStream != stdin) fclose(zStream);
-         if (streamNo == 1) {
-          fprintf ( stderr, 
-                    "bad magic number (file not created by bzip2)\n" );
-            return False;
-         } else {
-            if (noisy)
-            fprintf ( stderr, 
-                      "trailing garbage after EOF ignored\n" );
-            return True;       
-         }
-      default:
-         panic ( "test:unexpected error" );
-   }
-
-   panic ( "test:end" );
-   return True; /*notreached*/
-}
-
-
-/*---------------------------------------------------*/
-/*--- Error [non-] handling grunge                ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------*/
-static
-void setExit ( Int32 v )
-{
-   if (v > exitValue) exitValue = v;
-}
-
-
-/*---------------------------------------------*/
-static 
-void cadvise ( void )
-{
-   if (noisy)
-   fprintf (
-      stderr,
-      "\nIt is possible that the compressed file(s) have become corrupted.\n"
-        "You can use the -tvv option to test integrity of such files.\n\n"
-        "You can use the `bzip2recover' program to *attempt* to recover\n"
-        "data from undamaged sections of corrupted files.\n\n"
-    );
-}
-
-
-/*---------------------------------------------*/
-static 
-void showFileNames ( void )
-{
-   if (noisy)
-   fprintf (
-      stderr,
-      "\tInput file = %s, output file = %s\n",
-      inName, outName 
-   );
-}
-
-
-/*---------------------------------------------*/
-static 
-void cleanUpAndFail ( Int32 ec )
-{
-   IntNative retVal;
-
-   if ( srcMode == SM_F2F 
-        && opMode != OM_TEST
-        && deleteOutputOnInterrupt ) {
-      if (noisy)
-      fprintf ( stderr, "%s: Deleting output file %s, if it exists.\n",
-                progName, outName );
-      if (outputHandleJustInCase != NULL)
-         fclose ( outputHandleJustInCase );
-      retVal = remove ( outName );
-      if (retVal != 0)
-         fprintf ( stderr,
-                   "%s: WARNING: deletion of output file (apparently) failed.\n",
-                   progName );
-   }
-   if (noisy && numFileNames > 0 && numFilesProcessed < numFileNames) {
-      fprintf ( stderr, 
-                "%s: WARNING: some files have not been processed:\n"
-                "\t%d specified on command line, %d not processed yet.\n\n",
-                progName, numFileNames, 
-                          numFileNames - numFilesProcessed );
-   }
-   setExit(ec);
-   exit(exitValue);
-}
-
-
-/*---------------------------------------------*/
-static 
-void panic ( Char* s )
-{
-   fprintf ( stderr,
-             "\n%s: PANIC -- internal consistency error:\n"
-             "\t%s\n"
-             "\tThis is a BUG.  Please report it to me at:\n"
-             "\tjseward@acm.org\n",
-             progName, s );
-   showFileNames();
-   cleanUpAndFail( 3 );
-}
-
-
-/*---------------------------------------------*/
-static 
-void crcError ( void )
-{
-   fprintf ( stderr,
-             "\n%s: Data integrity error when decompressing.\n",
-             progName );
-   showFileNames();
-   cadvise();
-   cleanUpAndFail( 2 );
-}
-
-
-/*---------------------------------------------*/
-static 
-void compressedStreamEOF ( void )
-{
-   fprintf ( stderr,
-             "\n%s: Compressed file ends unexpectedly;\n\t"
-             "perhaps it is corrupted?  *Possible* reason follows.\n",
-             progName );
-   perror ( progName );
-   showFileNames();
-   cadvise();
-   cleanUpAndFail( 2 );
-}
-
-
-/*---------------------------------------------*/
-static 
-void ioError ( void )
-{
-   fprintf ( stderr,
-             "\n%s: I/O or other error, bailing out.  "
-             "Possible reason follows.\n",
-             progName );
-   perror ( progName );
-   showFileNames();
-   cleanUpAndFail( 1 );
-}
-
-
-/*---------------------------------------------*/
-static 
-void mySignalCatcher ( IntNative n )
-{
-   fprintf ( stderr,
-             "\n%s: Control-C or similar caught, quitting.\n",
-             progName );
-   cleanUpAndFail(1);
-}
-
-
-/*---------------------------------------------*/
-static 
-void mySIGSEGVorSIGBUScatcher ( IntNative n )
-{
-   if (opMode == OM_Z)
-      fprintf ( 
-      stderr,
-      "\n%s: Caught a SIGSEGV or SIGBUS whilst compressing.\n"
-      "\n"
-      "   Possible causes are (most likely first):\n"
-      "   (1) This computer has unreliable memory or cache hardware\n"
-      "       (a surprisingly common problem; try a different machine.)\n"
-      "   (2) A bug in the compiler used to create this executable\n"
-      "       (unlikely, if you didn't compile bzip2 yourself.)\n"
-      "   (3) A real bug in bzip2 -- I hope this should never be the case.\n"
-      "   The user's manual, Section 4.3, has more info on (1) and (2).\n"
-      "   \n"
-      "   If you suspect this is a bug in bzip2, or are unsure about (1)\n"
-      "   or (2), feel free to report it to me at: jseward@acm.org.\n"
-      "   Section 4.3 of the user's manual describes the info a useful\n"
-      "   bug report should have.  If the manual is available on your\n"
-      "   system, please try and read it before mailing me.  If you don't\n"
-      "   have the manual or can't be bothered to read it, mail me anyway.\n"
-      "\n",
-      progName );
-      else
-      fprintf ( 
-      stderr,
-      "\n%s: Caught a SIGSEGV or SIGBUS whilst decompressing.\n"
-      "\n"
-      "   Possible causes are (most likely first):\n"
-      "   (1) The compressed data is corrupted, and bzip2's usual checks\n"
-      "       failed to detect this.  Try bzip2 -tvv my_file.bz2.\n"
-      "   (2) This computer has unreliable memory or cache hardware\n"
-      "       (a surprisingly common problem; try a different machine.)\n"
-      "   (3) A bug in the compiler used to create this executable\n"
-      "       (unlikely, if you didn't compile bzip2 yourself.)\n"
-      "   (4) A real bug in bzip2 -- I hope this should never be the case.\n"
-      "   The user's manual, Section 4.3, has more info on (2) and (3).\n"
-      "   \n"
-      "   If you suspect this is a bug in bzip2, or are unsure about (2)\n"
-      "   or (3), feel free to report it to me at: jseward@acm.org.\n"
-      "   Section 4.3 of the user's manual describes the info a useful\n"
-      "   bug report should have.  If the manual is available on your\n"
-      "   system, please try and read it before mailing me.  If you don't\n"
-      "   have the manual or can't be bothered to read it, mail me anyway.\n"
-      "\n",
-      progName );
-
-   showFileNames();
-   if (opMode == OM_Z)
-      cleanUpAndFail( 3 ); else
-      { cadvise(); cleanUpAndFail( 2 ); }
-}
-
-
-/*---------------------------------------------*/
-static 
-void outOfMemory ( void )
-{
-   fprintf ( stderr,
-             "\n%s: couldn't allocate enough memory\n",
-             progName );
-   showFileNames();
-   cleanUpAndFail(1);
-}
-
-
-/*---------------------------------------------*/
-static 
-void configError ( void )
-{
-   fprintf ( stderr,
-             "bzip2: I'm not configured correctly for this platform!\n"
-             "\tI require Int32, Int16 and Char to have sizes\n"
-             "\tof 4, 2 and 1 bytes to run properly, and they don't.\n"
-             "\tProbably you can fix this by defining them correctly,\n"
-             "\tand recompiling.  Bye!\n" );
-   setExit(3);
-   exit(exitValue);
-}
-
-
-/*---------------------------------------------------*/
-/*--- The main driver machinery                   ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------*/
-static 
-void pad ( Char *s )
-{
-   Int32 i;
-   if ( (Int32)strlen(s) >= longestFileName ) return;
-   for (i = 1; i <= longestFileName - (Int32)strlen(s); i++)
-      fprintf ( stderr, " " );
-}
-
-
-/*---------------------------------------------*/
-static 
-void copyFileName ( Char* to, Char* from ) 
-{
-   if ( strlen(from) > FILE_NAME_LEN-10 )  {
-      fprintf (
-         stderr,
-         "bzip2: file name\n`%s'\n"
-         "is suspiciously (more than %d chars) long.\n"
-         "Try using a reasonable file name instead.  Sorry! :-)\n",
-         from, FILE_NAME_LEN-10
-      );
-      setExit(1);
-      exit(exitValue);
-   }
-
-  strncpy(to,from,FILE_NAME_LEN-10);
-  to[FILE_NAME_LEN-10]='\0';
-}
-
-
-/*---------------------------------------------*/
-static 
-Bool fileExists ( Char* name )
-{
-   FILE *tmp   = fopen ( name, "rb" );
-   Bool exists = (tmp != NULL);
-   if (tmp != NULL) fclose ( tmp );
-   return exists;
-}
-
-
-/*---------------------------------------------*/
-/*--
-  if in doubt, return True
---*/
-static 
-Bool notAStandardFile ( Char* name )
-{
-   IntNative      i;
-   struct MY_STAT statBuf;
-
-   i = MY_LSTAT ( name, &statBuf );
-   if (i != 0) return True;
-   if (MY_S_IFREG(statBuf.st_mode)) return False;
-   return True;
-}
-
-
-/*---------------------------------------------*/
-/*--
-  rac 11/21/98 see if file has hard links to it
---*/
-static 
-Int32 countHardLinks ( Char* name )
-{  
-   IntNative      i;
-   struct MY_STAT statBuf;
-
-   i = MY_LSTAT ( name, &statBuf );
-   if (i != 0) return 0;
-   return (statBuf.st_nlink - 1);
-}
-
-
-/*---------------------------------------------*/
-static 
-void copyDatePermissionsAndOwner ( Char *srcName, Char *dstName )
-{
-#if BZ_UNIX
-   IntNative      retVal;
-   struct MY_STAT statBuf;
-   struct utimbuf uTimBuf;
-
-   retVal = MY_LSTAT ( srcName, &statBuf );
-   ERROR_IF_NOT_ZERO ( retVal );
-   uTimBuf.actime = statBuf.st_atime;
-   uTimBuf.modtime = statBuf.st_mtime;
-
-   retVal = chmod ( dstName, statBuf.st_mode );
-   ERROR_IF_NOT_ZERO ( retVal );
-
-   retVal = utime ( dstName, &uTimBuf );
-   ERROR_IF_NOT_ZERO ( retVal );
-
-   retVal = chown ( dstName, statBuf.st_uid, statBuf.st_gid );
-   /* chown() will in many cases return with EPERM, which can
-      be safely ignored.
-   */
-#endif
-}
-
-
-/*---------------------------------------------*/
-static 
-void setInterimPermissions ( Char *dstName )
-{
-#if BZ_UNIX
-   IntNative      retVal;
-   retVal = chmod ( dstName, S_IRUSR | S_IWUSR );
-   ERROR_IF_NOT_ZERO ( retVal );
-#endif
-}
-
-
-/*---------------------------------------------*/
-static 
-Bool containsDubiousChars ( Char* name )
-{
-   Bool cdc = False;
-   for (; *name != '\0'; name++)
-      if (*name == '?' || *name == '*') cdc = True;
-   return cdc;
-}
-
-
-/*---------------------------------------------*/
-#define BZ_N_SUFFIX_PAIRS 4
-
-Char* zSuffix[BZ_N_SUFFIX_PAIRS] 
-   = { ".bz2", ".bz", ".tbz2", ".tbz" };
-Char* unzSuffix[BZ_N_SUFFIX_PAIRS] 
-   = { "", "", ".tar", ".tar" };
-
-static 
-Bool hasSuffix ( Char* s, Char* suffix )
-{
-   Int32 ns = strlen(s);
-   Int32 nx = strlen(suffix);
-   if (ns < nx) return False;
-   if (strcmp(s + ns - nx, suffix) == 0) return True;
-   return False;
-}
-
-static 
-Bool mapSuffix ( Char* name, 
-                 Char* oldSuffix, Char* newSuffix )
-{
-   if (!hasSuffix(name,oldSuffix)) return False;
-   name[strlen(name)-strlen(oldSuffix)] = 0;
-   strcat ( name, newSuffix );
-   return True;
-}
-
-
-/*---------------------------------------------*/
-static 
-void compress ( Char *name )
-{
-   FILE  *inStr;
-   FILE  *outStr;
-   Int32 n, i;
-
-   deleteOutputOnInterrupt = False;
-
-   if (name == NULL && srcMode != SM_I2O)
-      panic ( "compress: bad modes\n" );
-
-   switch (srcMode) {
-      case SM_I2O: 
-         copyFileName ( inName, "(stdin)" );
-         copyFileName ( outName, "(stdout)" ); 
-         break;
-      case SM_F2F: 
-         copyFileName ( inName, name );
-         copyFileName ( outName, name );
-         strcat ( outName, ".bz2" ); 
-         break;
-      case SM_F2O: 
-         copyFileName ( inName, name );
-         copyFileName ( outName, "(stdout)" ); 
-         break;
-   }
-
-   if ( srcMode != SM_I2O && containsDubiousChars ( inName ) ) {
-      if (noisy)
-      fprintf ( stderr, "%s: There are no files matching `%s'.\n",
-                progName, inName );
-      setExit(1);
-      return;
-   }
-   if ( srcMode != SM_I2O && !fileExists ( inName ) ) {
-      fprintf ( stderr, "%s: Can't open input file %s: %s.\n",
-                progName, inName, strerror(errno) );
-      setExit(1);
-      return;
-   }
-   for (i = 0; i < BZ_N_SUFFIX_PAIRS; i++) {
-      if (hasSuffix(inName, zSuffix[i])) {
-         if (noisy)
-         fprintf ( stderr, 
-                   "%s: Input file %s already has %s suffix.\n",
-                   progName, inName, zSuffix[i] );
-         setExit(1);
-         return;
-      }
-   }
-   if ( srcMode == SM_F2F && !forceOverwrite && notAStandardFile ( inName )) {
-      if (noisy)
-      fprintf ( stderr, "%s: Input file %s is not a normal file.\n",
-                progName, inName );
-      setExit(1);
-      return;
-   }
-   if ( srcMode == SM_F2F && !forceOverwrite && fileExists ( outName ) ) {
-      fprintf ( stderr, "%s: Output file %s already exists.\n",
-                progName, outName );
-      setExit(1);
-      return;
-   }
-   if ( srcMode == SM_F2F && !forceOverwrite &&
-        (n=countHardLinks ( inName )) > 0) {
-      fprintf ( stderr, "%s: Input file %s has %d other link%s.\n",
-                progName, inName, n, n > 1 ? "s" : "" );
-      setExit(1);
-      return;
-   }
-
-   switch ( srcMode ) {
-
-      case SM_I2O:
-         inStr = stdin;
-         outStr = stdout;
-         if ( isatty ( fileno ( stdout ) ) ) {
-            fprintf ( stderr,
-                      "%s: I won't write compressed data to a terminal.\n",
-                      progName );
-            fprintf ( stderr, "%s: For help, type: `%s --help'.\n",
-                              progName, progName );
-            setExit(1);
-            return;
-         };
-         break;
-
-      case SM_F2O:
-         inStr = fopen ( inName, "rb" );
-         outStr = stdout;
-         if ( isatty ( fileno ( stdout ) ) ) {
-            fprintf ( stderr,
-                      "%s: I won't write compressed data to a terminal.\n",
-                      progName );
-            fprintf ( stderr, "%s: For help, type: `%s --help'.\n",
-                              progName, progName );
-            if ( inStr != NULL ) fclose ( inStr );
-            setExit(1);
-            return;
-         };
-         if ( inStr == NULL ) {
-            fprintf ( stderr, "%s: Can't open input file %s: %s.\n",
-                      progName, inName, strerror(errno) );
-            setExit(1);
-            return;
-         };
-         break;
-
-      case SM_F2F:
-         inStr = fopen ( inName, "rb" );
-         outStr = fopen ( outName, "wb" );
-         if ( outStr == NULL) {
-            fprintf ( stderr, "%s: Can't create output file %s: %s.\n",
-                      progName, outName, strerror(errno) );
-            if ( inStr != NULL ) fclose ( inStr );
-            setExit(1);
-            return;
-         }
-         if ( inStr == NULL ) {
-            fprintf ( stderr, "%s: Can't open input file %s: %s.\n",
-                      progName, inName, strerror(errno) );
-            if ( outStr != NULL ) fclose ( outStr );
-            setExit(1);
-            return;
-         };
-         setInterimPermissions ( outName );
-         break;
-
-      default:
-         panic ( "compress: bad srcMode" );
-         break;
-   }
-
-   if (verbosity >= 1) {
-      fprintf ( stderr,  "  %s: ", inName );
-      pad ( inName );
-      fflush ( stderr );
-   }
-
-   /*--- Now the input and output handles are sane.  Do the Biz. ---*/
-   outputHandleJustInCase = outStr;
-   deleteOutputOnInterrupt = True;
-   compressStream ( inStr, outStr );
-   outputHandleJustInCase = NULL;
-
-   /*--- If there was an I/O error, we won't get here. ---*/
-   if ( srcMode == SM_F2F ) {
-      copyDatePermissionsAndOwner ( inName, outName );
-      deleteOutputOnInterrupt = False;
-      if ( !keepInputFiles ) {
-         IntNative retVal = remove ( inName );
-         ERROR_IF_NOT_ZERO ( retVal );
-      }
-   }
-
-   deleteOutputOnInterrupt = False;
-}
-
-
-/*---------------------------------------------*/
-static 
-void uncompress ( Char *name )
-{
-   FILE  *inStr;
-   FILE  *outStr;
-   Int32 n, i;
-   Bool  magicNumberOK;
-   Bool  cantGuess;
-
-   deleteOutputOnInterrupt = False;
-
-   if (name == NULL && srcMode != SM_I2O)
-      panic ( "uncompress: bad modes\n" );
-
-   cantGuess = False;
-   switch (srcMode) {
-      case SM_I2O: 
-         copyFileName ( inName, "(stdin)" );
-         copyFileName ( outName, "(stdout)" ); 
-         break;
-      case SM_F2F: 
-         copyFileName ( inName, name );
-         copyFileName ( outName, name );
-         for (i = 0; i < BZ_N_SUFFIX_PAIRS; i++)
-            if (mapSuffix(outName,zSuffix[i],unzSuffix[i]))
-               goto zzz; 
-         cantGuess = True;
-         strcat ( outName, ".out" );
-         break;
-      case SM_F2O: 
-         copyFileName ( inName, name );
-         copyFileName ( outName, "(stdout)" ); 
-         break;
-   }
-
-   zzz:
-   if ( srcMode != SM_I2O && containsDubiousChars ( inName ) ) {
-      if (noisy)
-      fprintf ( stderr, "%s: There are no files matching `%s'.\n",
-                progName, inName );
-      setExit(1);
-      return;
-   }
-   if ( srcMode != SM_I2O && !fileExists ( inName ) ) {
-      fprintf ( stderr, "%s: Can't open input file %s: %s.\n",
-                progName, inName, strerror(errno) );
-      setExit(1);
-      return;
-   }
-   if ( srcMode == SM_F2F && !forceOverwrite && notAStandardFile ( inName )) {
-      if (noisy)
-      fprintf ( stderr, "%s: Input file %s is not a normal file.\n",
-                progName, inName );
-      setExit(1);
-      return;
-   }
-   if ( /* srcMode == SM_F2F implied && */ cantGuess ) {
-      if (noisy)
-      fprintf ( stderr, 
-                "%s: Can't guess original name for %s -- using %s\n",
-                progName, inName, outName );
-      /* just a warning, no return */
-   }   
-   if ( srcMode == SM_F2F && !forceOverwrite && fileExists ( outName ) ) {
-      fprintf ( stderr, "%s: Output file %s already exists.\n",
-                progName, outName );
-      setExit(1);
-      return;
-   }
-   if ( srcMode == SM_F2F && !forceOverwrite &&
-        (n=countHardLinks ( inName ) ) > 0) {
-      fprintf ( stderr, "%s: Input file %s has %d other link%s.\n",
-                progName, inName, n, n > 1 ? "s" : "" );
-      setExit(1);
-      return;
-   }
-
-   switch ( srcMode ) {
-
-      case SM_I2O:
-         inStr = stdin;
-         outStr = stdout;
-         if ( isatty ( fileno ( stdin ) ) ) {
-            fprintf ( stderr,
-                      "%s: I won't read compressed data from a terminal.\n",
-                      progName );
-            fprintf ( stderr, "%s: For help, type: `%s --help'.\n",
-                              progName, progName );
-            setExit(1);
-            return;
-         };
-         break;
-
-      case SM_F2O:
-         inStr = fopen ( inName, "rb" );
-         outStr = stdout;
-         if ( inStr == NULL ) {
-            fprintf ( stderr, "%s: Can't open input file %s:%s.\n",
-                      progName, inName, strerror(errno) );
-            if ( inStr != NULL ) fclose ( inStr );
-            setExit(1);
-            return;
-         };
-         break;
-
-      case SM_F2F:
-         inStr = fopen ( inName, "rb" );
-         outStr = fopen ( outName, "wb" );
-         if ( outStr == NULL) {
-            fprintf ( stderr, "%s: Can't create output file %s: %s.\n",
-                      progName, outName, strerror(errno) );
-            if ( inStr != NULL ) fclose ( inStr );
-            setExit(1);
-            return;
-         }
-         if ( inStr == NULL ) {
-            fprintf ( stderr, "%s: Can't open input file %s: %s.\n",
-                      progName, inName, strerror(errno) );
-            if ( outStr != NULL ) fclose ( outStr );
-            setExit(1);
-            return;
-         };
-         setInterimPermissions ( outName );
-         break;
-
-      default:
-         panic ( "uncompress: bad srcMode" );
-         break;
-   }
-
-   if (verbosity >= 1) {
-      fprintf ( stderr, "  %s: ", inName );
-      pad ( inName );
-      fflush ( stderr );
-   }
-
-   /*--- Now the input and output handles are sane.  Do the Biz. ---*/
-   outputHandleJustInCase = outStr;
-   deleteOutputOnInterrupt = True;
-   magicNumberOK = uncompressStream ( inStr, outStr );
-   outputHandleJustInCase = NULL;
-
-   /*--- If there was an I/O error, we won't get here. ---*/
-   if ( magicNumberOK ) {
-      if ( srcMode == SM_F2F ) {
-         copyDatePermissionsAndOwner ( inName, outName );
-         deleteOutputOnInterrupt = False;
-         if ( !keepInputFiles ) {
-            IntNative retVal = remove ( inName );
-            ERROR_IF_NOT_ZERO ( retVal );
-         }
-      }
-   } else {
-      unzFailsExist = True;
-      deleteOutputOnInterrupt = False;
-      if ( srcMode == SM_F2F ) {
-         IntNative retVal = remove ( outName );
-         ERROR_IF_NOT_ZERO ( retVal );
-      }
-   }
-   deleteOutputOnInterrupt = False;
-
-   if ( magicNumberOK ) {
-      if (verbosity >= 1)
-         fprintf ( stderr, "done\n" );
-   } else {
-      setExit(2);
-      if (verbosity >= 1)
-         fprintf ( stderr, "not a bzip2 file.\n" ); else
-         fprintf ( stderr,
-                   "%s: %s is not a bzip2 file.\n",
-                   progName, inName );
-   }
-
-}
-
-
-/*---------------------------------------------*/
-static 
-void testf ( Char *name )
-{
-   FILE *inStr;
-   Bool allOK;
-
-   deleteOutputOnInterrupt = False;
-
-   if (name == NULL && srcMode != SM_I2O)
-      panic ( "testf: bad modes\n" );
-
-   copyFileName ( outName, "(none)" );
-   switch (srcMode) {
-      case SM_I2O: copyFileName ( inName, "(stdin)" ); break;
-      case SM_F2F: copyFileName ( inName, name ); break;
-      case SM_F2O: copyFileName ( inName, name ); break;
-   }
-
-   if ( srcMode != SM_I2O && containsDubiousChars ( inName ) ) {
-      if (noisy)
-      fprintf ( stderr, "%s: There are no files matching `%s'.\n",
-                progName, inName );
-      setExit(1);
-      return;
-   }
-   if ( srcMode != SM_I2O && !fileExists ( inName ) ) {
-      fprintf ( stderr, "%s: Can't open input %s: %s.\n",
-                progName, inName, strerror(errno) );
-      setExit(1);
-      return;
-   }
-
-   switch ( srcMode ) {
-
-      case SM_I2O:
-         if ( isatty ( fileno ( stdin ) ) ) {
-            fprintf ( stderr,
-                      "%s: I won't read compressed data from a terminal.\n",
-                      progName );
-            fprintf ( stderr, "%s: For help, type: `%s --help'.\n",
-                              progName, progName );
-            setExit(1);
-            return;
-         };
-         inStr = stdin;
-         break;
-
-      case SM_F2O: case SM_F2F:
-         inStr = fopen ( inName, "rb" );
-         if ( inStr == NULL ) {
-            fprintf ( stderr, "%s: Can't open input file %s:%s.\n",
-                      progName, inName, strerror(errno) );
-            setExit(1);
-            return;
-         };
-         break;
-
-      default:
-         panic ( "testf: bad srcMode" );
-         break;
-   }
-
-   if (verbosity >= 1) {
-      fprintf ( stderr, "  %s: ", inName );
-      pad ( inName );
-      fflush ( stderr );
-   }
-
-   /*--- Now the input handle is sane.  Do the Biz. ---*/
-   allOK = testStream ( inStr );
-
-   if (allOK && verbosity >= 1) fprintf ( stderr, "ok\n" );
-   if (!allOK) testFailsExist = True;
-}
-
-
-/*---------------------------------------------*/
-static 
-void license ( void )
-{
-   fprintf ( stderr,
-
-    "bzip2, a block-sorting file compressor.  "
-    "Version %s.\n"
-    "   \n"
-    "   Copyright (C) 1996-2000 by Julian Seward.\n"
-    "   \n"
-    "   This program is free software; you can redistribute it and/or modify\n"
-    "   it under the terms set out in the LICENSE file, which is included\n"
-    "   in the bzip2-1.0 source distribution.\n"
-    "   \n"
-    "   This program is distributed in the hope that it will be useful,\n"
-    "   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-    "   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-    "   LICENSE file for more details.\n"
-    "   \n",
-    BZ2_bzlibVersion()
-   );
-}
-
-
-/*---------------------------------------------*/
-static 
-void usage ( Char *fullProgName )
-{
-   fprintf (
-      stderr,
-      "bzip2, a block-sorting file compressor.  "
-      "Version %s.\n"
-      "\n   usage: %s [flags and input files in any order]\n"
-      "\n"
-      "   -h --help           print this message\n"
-      "   -d --decompress     force decompression\n"
-      "   -z --compress       force compression\n"
-      "   -k --keep           keep (don't delete) input files\n"
-      "   -f --force          overwrite existing output files\n"
-      "   -t --test           test compressed file integrity\n"
-      "   -c --stdout         output to standard out\n"
-      "   -q --quiet          suppress noncritical error messages\n"
-      "   -v --verbose        be verbose (a 2nd -v gives more)\n"
-      "   -L --license        display software version & license\n"
-      "   -V --version        display software version & license\n"
-      "   -s --small          use less memory (at most 2500k)\n"
-      "   -1 .. -9            set block size to 100k .. 900k\n"
-      "\n"
-      "   If invoked as `bzip2', default action is to compress.\n"
-      "              as `bunzip2',  default action is to decompress.\n"
-      "              as `bzcat', default action is to decompress to stdout.\n"
-      "\n"
-      "   If no file names are given, bzip2 compresses or decompresses\n"
-      "   from standard input to standard output.  You can combine\n"
-      "   short flags, so `-v -4' means the same as -v4 or -4v, &c.\n"
-#if BZ_UNIX
-      "\n"
-#endif
-      ,
-
-      BZ2_bzlibVersion(),
-      fullProgName
-   );
-}
-
-
-/*---------------------------------------------*/
-static 
-void redundant ( Char* flag )
-{
-   fprintf ( 
-      stderr, 
-      "%s: %s is redundant in versions 0.9.5 and above\n",
-      progName, flag );
-}
-
-
-/*---------------------------------------------*/
-/*--
-  All the garbage from here to main() is purely to
-  implement a linked list of command-line arguments,
-  into which main() copies argv[1 .. argc-1].
-
-  The purpose of this exercise is to facilitate 
-  the expansion of wildcard characters * and ? in 
-  filenames for OSs which don't know how to do it
-  themselves, like MSDOS, Windows 95 and NT.
-
-  The actual Dirty Work is done by the platform-
-  specific macro APPEND_FILESPEC.
---*/
-
-typedef
-   struct zzzz {
-      Char        *name;
-      struct zzzz *link;
-   }
-   Cell;
-
-
-/*---------------------------------------------*/
-static 
-void *myMalloc ( Int32 n )
-{
-   void* p;
-
-   p = malloc ( (size_t)n );
-   if (p == NULL) outOfMemory ();
-   return p;
-}
-
-
-/*---------------------------------------------*/
-static 
-Cell *mkCell ( void )
-{
-   Cell *c;
-
-   c = (Cell*) myMalloc ( sizeof ( Cell ) );
-   c->name = NULL;
-   c->link = NULL;
-   return c;
-}
-
-
-/*---------------------------------------------*/
-static 
-Cell *snocString ( Cell *root, Char *name )
-{
-   if (root == NULL) {
-      Cell *tmp = mkCell();
-      tmp->name = (Char*) myMalloc ( 5 + strlen(name) );
-      strcpy ( tmp->name, name );
-      return tmp;
-   } else {
-      Cell *tmp = root;
-      while (tmp->link != NULL) tmp = tmp->link;
-      tmp->link = snocString ( tmp->link, name );
-      return root;
-   }
-}
-
-
-/*---------------------------------------------*/
-static 
-void addFlagsFromEnvVar ( Cell** argList, Char* varName ) 
-{
-   Int32 i, j, k;
-   Char *envbase, *p;
-
-   envbase = getenv(varName);
-   if (envbase != NULL) {
-      p = envbase;
-      i = 0;
-      while (True) {
-         if (p[i] == 0) break;
-         p += i;
-         i = 0;
-         while (isspace((Int32)(p[0]))) p++;
-         while (p[i] != 0 && !isspace((Int32)(p[i]))) i++;
-         if (i > 0) {
-            k = i; if (k > FILE_NAME_LEN-10) k = FILE_NAME_LEN-10;
-            for (j = 0; j < k; j++) tmpName[j] = p[j];
-            tmpName[k] = 0;
-            APPEND_FLAG(*argList, tmpName);
-         }
-      }
-   }
-}
-
-
-/*---------------------------------------------*/
-#define ISFLAG(s) (strcmp(aa->name, (s))==0)
-
-IntNative main ( IntNative argc, Char *argv[] )
-{
-   Int32  i, j;
-   Char   *tmp;
-   Cell   *argList;
-   Cell   *aa;
-   Bool   decode;
-
-   /*-- Be really really really paranoid :-) --*/
-   if (sizeof(Int32) != 4 || sizeof(UInt32) != 4  ||
-       sizeof(Int16) != 2 || sizeof(UInt16) != 2  ||
-       sizeof(Char)  != 1 || sizeof(UChar)  != 1)
-      configError();
-
-   /*-- Initialise --*/
-   outputHandleJustInCase  = NULL;
-   smallMode               = False;
-   keepInputFiles          = False;
-   forceOverwrite          = False;
-   noisy                   = True;
-   verbosity               = 0;
-   blockSize100k           = 9;
-   testFailsExist          = False;
-   unzFailsExist           = False;
-   numFileNames            = 0;
-   numFilesProcessed       = 0;
-   workFactor              = 30;
-   deleteOutputOnInterrupt = False;
-   exitValue               = 0;
-   i = j = 0; /* avoid bogus warning from egcs-1.1.X */
-
-   /*-- Set up signal handlers for mem access errors --*/
-   signal (SIGSEGV, mySIGSEGVorSIGBUScatcher);
-#if BZ_UNIX
-#ifndef __DJGPP__
-   signal (SIGBUS,  mySIGSEGVorSIGBUScatcher);
-#endif
-#endif
-
-   copyFileName ( inName,  "(none)" );
-   copyFileName ( outName, "(none)" );
-
-   copyFileName ( progNameReally, argv[0] );
-   progName = &progNameReally[0];
-   for (tmp = &progNameReally[0]; *tmp != '\0'; tmp++)
-      if (*tmp == PATH_SEP) progName = tmp + 1;
-
-
-   /*-- Copy flags from env var BZIP2, and 
-        expand filename wildcards in arg list.
-   --*/
-   argList = NULL;
-   addFlagsFromEnvVar ( &argList,  "BZIP2" );
-   addFlagsFromEnvVar ( &argList,  "BZIP" );
-   for (i = 1; i <= argc-1; i++)
-      APPEND_FILESPEC(argList, argv[i]);
-
-
-   /*-- Find the length of the longest filename --*/
-   longestFileName = 7;
-   numFileNames    = 0;
-   decode          = True;
-   for (aa = argList; aa != NULL; aa = aa->link) {
-      if (ISFLAG("--")) { decode = False; continue; }
-      if (aa->name[0] == '-' && decode) continue;
-      numFileNames++;
-      if (longestFileName < (Int32)strlen(aa->name) )
-         longestFileName = (Int32)strlen(aa->name);
-   }
-
-
-   /*-- Determine source modes; flag handling may change this too. --*/
-   if (numFileNames == 0)
-      srcMode = SM_I2O; else srcMode = SM_F2F;
-
-
-   /*-- Determine what to do (compress/uncompress/test/cat). --*/
-   /*-- Note that subsequent flag handling may change this. --*/
-   opMode = OM_Z;
-
-   if ( (strstr ( progName, "unzip" ) != 0) ||
-        (strstr ( progName, "UNZIP" ) != 0) )
-      opMode = OM_UNZ;
-
-   if ( (strstr ( progName, "z2cat" ) != 0) ||
-        (strstr ( progName, "Z2CAT" ) != 0) ||
-        (strstr ( progName, "zcat" ) != 0)  ||
-        (strstr ( progName, "ZCAT" ) != 0) )  {
-      opMode = OM_UNZ;
-      srcMode = (numFileNames == 0) ? SM_I2O : SM_F2O;
-   }
-
-
-   /*-- Look at the flags. --*/
-   for (aa = argList; aa != NULL; aa = aa->link) {
-      if (ISFLAG("--")) break;
-      if (aa->name[0] == '-' && aa->name[1] != '-') {
-         for (j = 1; aa->name[j] != '\0'; j++) {
-            switch (aa->name[j]) {
-               case 'c': srcMode          = SM_F2O; break;
-               case 'd': opMode           = OM_UNZ; break;
-               case 'z': opMode           = OM_Z; break;
-               case 'f': forceOverwrite   = True; break;
-               case 't': opMode           = OM_TEST; break;
-               case 'k': keepInputFiles   = True; break;
-               case 's': smallMode        = True; break;
-               case 'q': noisy            = False; break;
-               case '1': blockSize100k    = 1; break;
-               case '2': blockSize100k    = 2; break;
-               case '3': blockSize100k    = 3; break;
-               case '4': blockSize100k    = 4; break;
-               case '5': blockSize100k    = 5; break;
-               case '6': blockSize100k    = 6; break;
-               case '7': blockSize100k    = 7; break;
-               case '8': blockSize100k    = 8; break;
-               case '9': blockSize100k    = 9; break;
-               case 'V':
-               case 'L': license();            break;
-               case 'v': verbosity++; break;
-               case 'h': usage ( progName );
-                         exit ( 0 );
-                         break;
-               default:  fprintf ( stderr, "%s: Bad flag `%s'\n",
-                                   progName, aa->name );
-                         usage ( progName );
-                         exit ( 1 );
-                         break;
-            }
-         }
-      }
-   }
-   
-   /*-- And again ... --*/
-   for (aa = argList; aa != NULL; aa = aa->link) {
-      if (ISFLAG("--")) break;
-      if (ISFLAG("--stdout"))            srcMode          = SM_F2O;  else
-      if (ISFLAG("--decompress"))        opMode           = OM_UNZ;  else
-      if (ISFLAG("--compress"))          opMode           = OM_Z;    else
-      if (ISFLAG("--force"))             forceOverwrite   = True;    else
-      if (ISFLAG("--test"))              opMode           = OM_TEST; else
-      if (ISFLAG("--keep"))              keepInputFiles   = True;    else
-      if (ISFLAG("--small"))             smallMode        = True;    else
-      if (ISFLAG("--quiet"))             noisy            = False;   else
-      if (ISFLAG("--version"))           license();                  else
-      if (ISFLAG("--license"))           license();                  else
-      if (ISFLAG("--exponential"))       workFactor = 1;             else 
-      if (ISFLAG("--repetitive-best"))   redundant(aa->name);        else
-      if (ISFLAG("--repetitive-fast"))   redundant(aa->name);        else
-      if (ISFLAG("--verbose"))           verbosity++;                else
-      if (ISFLAG("--help"))              { usage ( progName ); exit ( 0 ); }
-         else
-         if (strncmp ( aa->name, "--", 2) == 0) {
-            fprintf ( stderr, "%s: Bad flag `%s'\n", progName, aa->name );
-            usage ( progName );
-            exit ( 1 );
-         }
-   }
-
-   if (verbosity > 4) verbosity = 4;
-   if (opMode == OM_Z && smallMode && blockSize100k > 2) 
-      blockSize100k = 2;
-
-   if (opMode == OM_TEST && srcMode == SM_F2O) {
-      fprintf ( stderr, "%s: -c and -t cannot be used together.\n",
-                progName );
-      exit ( 1 );
-   }
-
-   if (srcMode == SM_F2O && numFileNames == 0)
-      srcMode = SM_I2O;
-
-   if (opMode != OM_Z) blockSize100k = 0;
-
-   if (srcMode == SM_F2F) {
-      signal (SIGINT,  mySignalCatcher);
-      signal (SIGTERM, mySignalCatcher);
-#     if BZ_UNIX
-      signal (SIGHUP,  mySignalCatcher);
-#     endif
-   }
-
-   if (opMode == OM_Z) {
-     if (srcMode == SM_I2O) {
-        compress ( NULL );
-     } else {
-        decode = True;
-        for (aa = argList; aa != NULL; aa = aa->link) {
-           if (ISFLAG("--")) { decode = False; continue; }
-           if (aa->name[0] == '-' && decode) continue;
-           numFilesProcessed++;
-           compress ( aa->name );
-        }
-     }
-   } 
-   else
-
-   if (opMode == OM_UNZ) {
-      unzFailsExist = False;
-      if (srcMode == SM_I2O) {
-         uncompress ( NULL );
-      } else {
-         decode = True;
-         for (aa = argList; aa != NULL; aa = aa->link) {
-            if (ISFLAG("--")) { decode = False; continue; }
-            if (aa->name[0] == '-' && decode) continue;
-            numFilesProcessed++;
-            uncompress ( aa->name );
-         }      
-      }
-      if (unzFailsExist) { 
-         setExit(2); 
-         exit(exitValue);
-      }
-   } 
-
-   else {
-      testFailsExist = False;
-      if (srcMode == SM_I2O) {
-         testf ( NULL );
-      } else {
-         decode = True;
-         for (aa = argList; aa != NULL; aa = aa->link) {
-	    if (ISFLAG("--")) { decode = False; continue; }
-            if (aa->name[0] == '-' && decode) continue;
-            numFilesProcessed++;
-            testf ( aa->name );
-	 }
-      }
-      if (testFailsExist && noisy) {
-         fprintf ( stderr,
-           "\n"
-           "You can use the `bzip2recover' program to attempt to recover\n"
-           "data from undamaged sections of corrupted files.\n\n"
-         );
-         setExit(2);
-         exit(exitValue);
-      }
-   }
-
-   /* Free the argument list memory to mollify leak detectors 
-      (eg) Purify, Checker.  Serves no other useful purpose.
-   */
-   aa = argList;
-   while (aa != NULL) {
-      Cell* aa2 = aa->link;
-      if (aa->name != NULL) free(aa->name);
-      free(aa);
-      aa = aa2;
-   }
-
-   return exitValue;
-}
-
-
-/*-----------------------------------------------------------*/
-/*--- end                                         bzip2.c ---*/
-/*-----------------------------------------------------------*/
diff --git a/winsup/bz2lib/bzip2.txt b/winsup/bz2lib/bzip2.txt
deleted file mode 100644
index 4f1ae8620..000000000
--- a/winsup/bz2lib/bzip2.txt
+++ /dev/null
@@ -1,376 +0,0 @@
-
-
-NAME
-       bzip2, bunzip2 - a block-sorting file compressor, v1.0
-       bzcat - decompresses files to stdout
-       bzip2recover - recovers data from damaged bzip2 files
-
-
-SYNOPSIS
-       bzip2 [ -cdfkqstvzVL123456789 ] [ filenames ...  ]
-       bunzip2 [ -fkvsVL ] [ filenames ...  ]
-       bzcat [ -s ] [ filenames ...  ]
-       bzip2recover filename
-
-
-DESCRIPTION
-       bzip2  compresses  files  using  the Burrows-Wheeler block
-       sorting text compression algorithm,  and  Huffman  coding.
-       Compression  is  generally  considerably  better than that
-       achieved by more conventional LZ77/LZ78-based compressors,
-       and  approaches  the performance of the PPM family of sta-
-       tistical compressors.
-
-       The command-line options are deliberately very similar  to
-       those of GNU gzip, but they are not identical.
-
-       bzip2  expects  a list of file names to accompany the com-
-       mand-line flags.  Each file is replaced  by  a  compressed
-       version  of  itself,  with  the  name "original_name.bz2".
-       Each compressed file has the same modification date,  per-
-       missions, and, when possible, ownership as the correspond-
-       ing original, so that these properties  can  be  correctly
-       restored  at  decompression  time.   File name handling is
-       naive in the sense that there is no mechanism for preserv-
-       ing  original file names, permissions, ownerships or dates
-       in filesystems which lack these concepts, or have  serious
-       file name length restrictions, such as MS-DOS.
-
-       bzip2  and  bunzip2 will by default not overwrite existing
-       files.  If you want this to happen, specify the -f flag.
-
-       If no file names  are  specified,  bzip2  compresses  from
-       standard  input  to  standard output.  In this case, bzip2
-       will decline to write compressed output to a terminal,  as
-       this  would  be  entirely  incomprehensible  and therefore
-       pointless.
-
-       bunzip2 (or bzip2 -d) decompresses  all  specified  files.
-       Files which were not created by bzip2 will be detected and
-       ignored, and a warning issued.  bzip2  attempts  to  guess
-       the  filename  for  the decompressed file from that of the
-       compressed file as follows:
-
-              filename.bz2    becomes   filename
-              filename.bz     becomes   filename
-              filename.tbz2   becomes   filename.tar
-              filename.tbz    becomes   filename.tar
-              anyothername    becomes   anyothername.out
-
-       If the file does not end in one of the recognised endings,
-       .bz2,  .bz,  .tbz2 or .tbz, bzip2 complains that it cannot
-       guess the name of the original file, and uses the original
-       name with .out appended.
-
-       As  with compression, supplying no filenames causes decom-
-       pression from standard input to standard output.
-
-       bunzip2 will correctly decompress a file which is the con-
-       catenation of two or more compressed files.  The result is
-       the concatenation of the corresponding uncompressed files.
-       Integrity testing (-t) of concatenated compressed files is
-       also supported.
-
-       You can also compress or decompress files to the  standard
-       output  by giving the -c flag.  Multiple files may be com-
-       pressed and decompressed like this.  The resulting outputs
-       are  fed  sequentially to stdout.  Compression of multiple
-       files in this manner generates a stream containing  multi-
-       ple compressed file representations.  Such a stream can be
-       decompressed correctly only  by  bzip2  version  0.9.0  or
-       later.   Earlier  versions of bzip2 will stop after decom-
-       pressing the first file in the stream.
-
-       bzcat (or bzip2 -dc) decompresses all specified  files  to
-       the standard output.
-
-       bzip2  will  read arguments from the environment variables
-       BZIP2 and BZIP, in  that  order,  and  will  process  them
-       before  any  arguments  read  from the command line.  This
-       gives a convenient way to supply default arguments.
-
-       Compression is always performed, even  if  the  compressed
-       file  is slightly larger than the original.  Files of less
-       than about one hundred bytes tend to get larger, since the
-       compression  mechanism  has  a  constant  overhead  in the
-       region of 50 bytes.  Random data (including the output  of
-       most  file  compressors)  is  coded at about 8.05 bits per
-       byte, giving an expansion of around 0.5%.
-
-       As a self-check for your  protection,  bzip2  uses  32-bit
-       CRCs  to make sure that the decompressed version of a file
-       is identical to the original.  This guards against corrup-
-       tion  of  the compressed data, and against undetected bugs
-       in bzip2 (hopefully very unlikely).  The chances  of  data
-       corruption  going  undetected  is  microscopic,  about one
-       chance in four billion for each file processed.  Be aware,
-       though,  that  the  check occurs upon decompression, so it
-       can only tell you that something is wrong.  It can't  help
-       you  recover  the original uncompressed data.  You can use
-       bzip2recover to try to recover data from damaged files.
-
-       Return values: 0 for a normal exit,  1  for  environmental
-       problems  (file not found, invalid flags, I/O errors, &c),
-       2 to indicate a corrupt compressed file, 3 for an internal
-       consistency error (eg, bug) which caused bzip2 to panic.
-
-
-OPTIONS
-       -c --stdout
-              Compress or decompress to standard output.
-
-       -d --decompress
-              Force  decompression.  bzip2, bunzip2 and bzcat are
-              really the same program,  and  the  decision  about
-              what  actions to take is done on the basis of which
-              name is used.  This flag overrides that  mechanism,
-              and forces bzip2 to decompress.
-
-       -z --compress
-              The  complement  to -d: forces compression, regard-
-              less of the invokation name.
-
-       -t --test
-              Check integrity of the specified file(s), but don't
-              decompress  them.   This  really  performs  a trial
-              decompression and throws away the result.
-
-       -f --force
-              Force overwrite of output files.   Normally,  bzip2
-              will  not  overwrite  existing  output files.  Also
-              forces bzip2 to break hard links to files, which it
-              otherwise wouldn't do.
-
-       -k --keep
-              Keep  (don't delete) input files during compression
-              or decompression.
-
-       -s --small
-              Reduce memory usage, for compression, decompression
-              and  testing.   Files  are  decompressed and tested
-              using a modified algorithm which only requires  2.5
-              bytes  per  block byte.  This means any file can be
-              decompressed in 2300k of memory,  albeit  at  about
-              half the normal speed.
-
-              During  compression,  -s  selects  a  block size of
-              200k, which limits memory use to  around  the  same
-              figure,  at  the expense of your compression ratio.
-              In short, if your  machine  is  low  on  memory  (8
-              megabytes  or  less),  use  -s for everything.  See
-              MEMORY MANAGEMENT below.
-
-       -q --quiet
-              Suppress non-essential warning messages.   Messages
-              pertaining  to I/O errors and other critical events
-              will not be suppressed.
-
-       -v --verbose
-              Verbose mode -- show the compression ratio for each
-              file  processed.   Further  -v's  increase the ver-
-              bosity level, spewing out lots of information which
-              is primarily of interest for diagnostic purposes.
-
-       -L --license -V --version
-              Display  the  software  version,  license terms and
-              conditions.
-
-       -1 to -9
-              Set the block size to 100 k, 200 k ..  900  k  when
-              compressing.   Has  no  effect  when decompressing.
-              See MEMORY MANAGEMENT below.
-
-       --     Treats all subsequent arguments as file names, even
-              if they start with a dash.  This is so you can han-
-              dle files with names beginning  with  a  dash,  for
-              example: bzip2 -- -myfilename.
-
-       --repetitive-fast --repetitive-best
-              These  flags  are  redundant  in versions 0.9.5 and
-              above.  They provided some coarse control over  the
-              behaviour  of the sorting algorithm in earlier ver-
-              sions, which was sometimes useful.  0.9.5 and above
-              have  an  improved  algorithm  which  renders these
-              flags irrelevant.
-
-
-MEMORY MANAGEMENT
-       bzip2 compresses large files in blocks.   The  block  size
-       affects  both  the  compression  ratio  achieved,  and the
-       amount of memory needed for compression and decompression.
-       The  flags  -1  through  -9  specify  the block size to be
-       100,000 bytes through 900,000 bytes (the default)  respec-
-       tively.   At  decompression  time, the block size used for
-       compression is read from  the  header  of  the  compressed
-       file, and bunzip2 then allocates itself just enough memory
-       to decompress the file.  Since block sizes are  stored  in
-       compressed  files,  it follows that the flags -1 to -9 are
-       irrelevant to and so ignored during decompression.
-
-       Compression and decompression requirements, in bytes,  can
-       be estimated as:
-
-              Compression:   400k + ( 8 x block size )
-
-              Decompression: 100k + ( 4 x block size ), or
-                             100k + ( 2.5 x block size )
-
-       Larger  block  sizes  give  rapidly  diminishing  marginal
-       returns.  Most of the compression comes from the first two
-       or  three hundred k of block size, a fact worth bearing in
-       mind when using bzip2  on  small  machines.   It  is  also
-       important  to  appreciate  that  the  decompression memory
-       requirement is set at compression time by  the  choice  of
-       block size.
-
-       For  files  compressed  with  the default 900k block size,
-       bunzip2 will require about 3700 kbytes to decompress.   To
-       support decompression of any file on a 4 megabyte machine,
-       bunzip2 has an option to  decompress  using  approximately
-       half this amount of memory, about 2300 kbytes.  Decompres-
-       sion speed is also halved, so you should use  this  option
-       only where necessary.  The relevant flag is -s.
-
-       In general, try and use the largest block size memory con-
-       straints  allow,  since  that  maximises  the  compression
-       achieved.   Compression and decompression speed are virtu-
-       ally unaffected by block size.
-
-       Another significant point applies to files which fit in  a
-       single  block  --  that  means  most files you'd encounter
-       using a large block  size.   The  amount  of  real  memory
-       touched is proportional to the size of the file, since the
-       file is smaller than a block.  For example, compressing  a
-       file  20,000  bytes  long  with the flag -9 will cause the
-       compressor to allocate around 7600k of  memory,  but  only
-       touch 400k + 20000 * 8 = 560 kbytes of it.  Similarly, the
-       decompressor will allocate 3700k but  only  touch  100k  +
-       20000 * 4 = 180 kbytes.
-
-       Here  is a table which summarises the maximum memory usage
-       for different block sizes.  Also  recorded  is  the  total
-       compressed  size for 14 files of the Calgary Text Compres-
-       sion Corpus totalling 3,141,622 bytes.  This column  gives
-       some  feel  for  how  compression  varies with block size.
-       These figures tend to understate the advantage  of  larger
-       block  sizes  for  larger files, since the Corpus is domi-
-       nated by smaller files.
-
-                  Compress   Decompress   Decompress   Corpus
-           Flag     usage      usage       -s usage     Size
-
-            -1      1200k       500k         350k      914704
-            -2      2000k       900k         600k      877703
-            -3      2800k      1300k         850k      860338
-            -4      3600k      1700k        1100k      846899
-            -5      4400k      2100k        1350k      845160
-            -6      5200k      2500k        1600k      838626
-            -7      6100k      2900k        1850k      834096
-            -8      6800k      3300k        2100k      828642
-            -9      7600k      3700k        2350k      828642
-
-
-RECOVERING DATA FROM DAMAGED FILES
-       bzip2 compresses files in blocks, usually 900kbytes  long.
-       Each block is handled independently.  If a media or trans-
-       mission error causes a multi-block  .bz2  file  to  become
-       damaged,  it  may  be  possible  to  recover data from the
-       undamaged blocks in the file.
-
-       The compressed representation of each block  is  delimited
-       by  a  48-bit pattern, which makes it possible to find the
-       block boundaries with reasonable  certainty.   Each  block
-       also  carries its own 32-bit CRC, so damaged blocks can be
-       distinguished from undamaged ones.
-
-       bzip2recover is a  simple  program  whose  purpose  is  to
-       search  for blocks in .bz2 files, and write each block out
-       into its own .bz2 file.  You can then use bzip2 -t to test
-       the integrity of the resulting files, and decompress those
-       which are undamaged.
-
-       bzip2recover takes a single argument, the name of the dam-
-       aged file, and writes a number of files "rec0001file.bz2",
-       "rec0002file.bz2", etc, containing the  extracted  blocks.
-       The  output  filenames  are  designed  so  that the use of
-       wildcards in subsequent processing -- for example,  "bzip2
-       -dc   rec*file.bz2 > recovered_data" -- lists the files in
-       the correct order.
-
-       bzip2recover should be of most use dealing with large .bz2
-       files,  as  these will contain many blocks.  It is clearly
-       futile to use it on damaged single-block  files,  since  a
-       damaged  block  cannot  be recovered.  If you wish to min-
-       imise any potential data loss through media  or  transmis-
-       sion errors, you might consider compressing with a smaller
-       block size.
-
-
-PERFORMANCE NOTES
-       The sorting phase of compression gathers together  similar
-       strings  in  the  file.  Because of this, files containing
-       very long runs of  repeated  symbols,  like  "aabaabaabaab
-       ..."   (repeated  several hundred times) may compress more
-       slowly than normal.  Versions 0.9.5 and  above  fare  much
-       better  than previous versions in this respect.  The ratio
-       between worst-case and average-case compression time is in
-       the  region  of  10:1.  For previous versions, this figure
-       was more like 100:1.  You can use the -vvvv option to mon-
-       itor progress in great detail, if you want.
-
-       Decompression speed is unaffected by these phenomena.
-
-       bzip2  usually  allocates  several  megabytes of memory to
-       operate in, and then charges all over it in a fairly  ran-
-       dom  fashion.   This means that performance, both for com-
-       pressing and decompressing, is largely determined  by  the
-       speed  at  which  your  machine  can service cache misses.
-       Because of this, small changes to the code to  reduce  the
-       miss  rate  have  been observed to give disproportionately
-       large performance improvements.  I imagine bzip2 will per-
-       form best on machines with very large caches.
-
-
-CAVEATS
-       I/O  error  messages  are not as helpful as they could be.
-       bzip2 tries hard to detect I/O errors  and  exit  cleanly,
-       but  the  details  of  what  the problem is sometimes seem
-       rather misleading.
-
-       This manual page pertains to version 1.0 of bzip2.  Com-
-       pressed  data created by this version is entirely forwards
-       and  backwards  compatible  with   the   previous   public
-       releases,  versions  0.1pl2, 0.9.0 and 0.9.5, but with the
-       following exception: 0.9.0 and above can correctly  decom-
-       press multiple concatenated compressed files.  0.1pl2 can-
-       not do this; it will stop  after  decompressing  just  the
-       first file in the stream.
-
-       bzip2recover  uses  32-bit integers to represent bit posi-
-       tions in compressed files, so it cannot handle  compressed
-       files  more than 512 megabytes long.  This could easily be
-       fixed.
-
-
-AUTHOR
-       Julian Seward, jseward@acm.org.
-
-       http://sourceware.cygnus.com/bzip2
-       http://www.muraroa.demon.co.uk
-
-       The ideas embodied in bzip2 are due to (at least) the fol-
-       lowing  people: Michael Burrows and David Wheeler (for the
-       block sorting transformation), David Wheeler  (again,  for
-       the Huffman coder), Peter Fenwick (for the structured cod-
-       ing model in the original bzip, and many refinements), and
-       Alistair  Moffat,  Radford  Neal  and  Ian Witten (for the
-       arithmetic  coder  in  the  original  bzip).   I  am  much
-       indebted for their help, support and advice.  See the man-
-       ual in the source distribution for pointers to sources  of
-       documentation.  Christian von Roques encouraged me to look
-       for faster sorting algorithms, so as to speed up  compres-
-       sion.  Bela Lubkin encouraged me to improve the worst-case
-       compression performance.  Many people sent patches, helped
-       with  portability problems, lent machines, gave advice and
-       were generally helpful.
-
diff --git a/winsup/bz2lib/bzip2recover.c b/winsup/bz2lib/bzip2recover.c
deleted file mode 100644
index ba3d17563..000000000
--- a/winsup/bz2lib/bzip2recover.c
+++ /dev/null
@@ -1,435 +0,0 @@
-
-/*-----------------------------------------------------------*/
-/*--- Block recoverer program for bzip2                   ---*/
-/*---                                      bzip2recover.c ---*/
-/*-----------------------------------------------------------*/
-
-/*--
-  This program is bzip2recover, a program to attempt data 
-  salvage from damaged files created by the accompanying
-  bzip2-1.0 program.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
---*/
-
-/*--
-  This program is a complete hack and should be rewritten
-  properly.  It isn't very complicated.
---*/
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-typedef  unsigned int   UInt32;
-typedef  int            Int32;
-typedef  unsigned char  UChar;
-typedef  char           Char;
-typedef  unsigned char  Bool;
-#define True    ((Bool)1)
-#define False   ((Bool)0)
-
-
-Char inFileName[2000];
-Char outFileName[2000];
-Char progName[2000];
-
-UInt32 bytesOut = 0;
-UInt32 bytesIn  = 0;
-
-
-/*---------------------------------------------------*/
-/*--- I/O errors                                  ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------*/
-void readError ( void )
-{
-   fprintf ( stderr,
-             "%s: I/O error reading `%s', possible reason follows.\n",
-            progName, inFileName );
-   perror ( progName );
-   fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n",
-             progName );
-   exit ( 1 );
-}
-
-
-/*---------------------------------------------*/
-void writeError ( void )
-{
-   fprintf ( stderr,
-             "%s: I/O error reading `%s', possible reason follows.\n",
-            progName, inFileName );
-   perror ( progName );
-   fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n",
-             progName );
-   exit ( 1 );
-}
-
-
-/*---------------------------------------------*/
-void mallocFail ( Int32 n )
-{
-   fprintf ( stderr,
-             "%s: malloc failed on request for %d bytes.\n",
-            progName, n );
-   fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n",
-             progName );
-   exit ( 1 );
-}
-
-
-/*---------------------------------------------------*/
-/*--- Bit stream I/O                              ---*/
-/*---------------------------------------------------*/
-
-typedef
-   struct {
-      FILE*  handle;
-      Int32  buffer;
-      Int32  buffLive;
-      Char   mode;
-   }
-   BitStream;
-
-
-/*---------------------------------------------*/
-BitStream* bsOpenReadStream ( FILE* stream )
-{
-   BitStream *bs = malloc ( sizeof(BitStream) );
-   if (bs == NULL) mallocFail ( sizeof(BitStream) );
-   bs->handle = stream;
-   bs->buffer = 0;
-   bs->buffLive = 0;
-   bs->mode = 'r';
-   return bs;
-}
-
-
-/*---------------------------------------------*/
-BitStream* bsOpenWriteStream ( FILE* stream )
-{
-   BitStream *bs = malloc ( sizeof(BitStream) );
-   if (bs == NULL) mallocFail ( sizeof(BitStream) );
-   bs->handle = stream;
-   bs->buffer = 0;
-   bs->buffLive = 0;
-   bs->mode = 'w';
-   return bs;
-}
-
-
-/*---------------------------------------------*/
-void bsPutBit ( BitStream* bs, Int32 bit )
-{
-   if (bs->buffLive == 8) {
-      Int32 retVal = putc ( (UChar) bs->buffer, bs->handle );
-      if (retVal == EOF) writeError();
-      bytesOut++;
-      bs->buffLive = 1;
-      bs->buffer = bit & 0x1;
-   } else {
-      bs->buffer = ( (bs->buffer << 1) | (bit & 0x1) );
-      bs->buffLive++;
-   };
-}
-
-
-/*---------------------------------------------*/
-/*--
-   Returns 0 or 1, or 2 to indicate EOF.
---*/
-Int32 bsGetBit ( BitStream* bs )
-{
-   if (bs->buffLive > 0) {
-      bs->buffLive --;
-      return ( ((bs->buffer) >> (bs->buffLive)) & 0x1 );
-   } else {
-      Int32 retVal = getc ( bs->handle );
-      if ( retVal == EOF ) {
-         if (errno != 0) readError();
-         return 2;
-      }
-      bs->buffLive = 7;
-      bs->buffer = retVal;
-      return ( ((bs->buffer) >> 7) & 0x1 );
-   }
-}
-
-
-/*---------------------------------------------*/
-void bsClose ( BitStream* bs )
-{
-   Int32 retVal;
-
-   if ( bs->mode == 'w' ) {
-      while ( bs->buffLive < 8 ) {
-         bs->buffLive++;
-         bs->buffer <<= 1;
-      };
-      retVal = putc ( (UChar) (bs->buffer), bs->handle );
-      if (retVal == EOF) writeError();
-      bytesOut++;
-      retVal = fflush ( bs->handle );
-      if (retVal == EOF) writeError();
-   }
-   retVal = fclose ( bs->handle );
-   if (retVal == EOF) {
-      if (bs->mode == 'w') writeError(); else readError();
-   }
-   free ( bs );
-}
-
-
-/*---------------------------------------------*/
-void bsPutUChar ( BitStream* bs, UChar c )
-{
-   Int32 i;
-   for (i = 7; i >= 0; i--)
-      bsPutBit ( bs, (((UInt32) c) >> i) & 0x1 );
-}
-
-
-/*---------------------------------------------*/
-void bsPutUInt32 ( BitStream* bs, UInt32 c )
-{
-   Int32 i;
-
-   for (i = 31; i >= 0; i--)
-      bsPutBit ( bs, (c >> i) & 0x1 );
-}
-
-
-/*---------------------------------------------*/
-Bool endsInBz2 ( Char* name )
-{
-   Int32 n = strlen ( name );
-   if (n <= 4) return False;
-   return
-      (name[n-4] == '.' &&
-       name[n-3] == 'b' &&
-       name[n-2] == 'z' &&
-       name[n-1] == '2');
-}
-
-
-/*---------------------------------------------------*/
-/*---                                             ---*/
-/*---------------------------------------------------*/
-
-#define BLOCK_HEADER_HI  0x00003141UL
-#define BLOCK_HEADER_LO  0x59265359UL
-
-#define BLOCK_ENDMARK_HI 0x00001772UL
-#define BLOCK_ENDMARK_LO 0x45385090UL
-
-
-UInt32 bStart[20000];
-UInt32 bEnd[20000];
-UInt32 rbStart[20000];
-UInt32 rbEnd[20000];
-
-Int32 main ( Int32 argc, Char** argv )
-{
-   FILE*       inFile;
-   FILE*       outFile;
-   BitStream*  bsIn, *bsWr;
-   Int32       currBlock, b, wrBlock;
-   UInt32      bitsRead;
-   Int32       rbCtr;
-
-
-   UInt32      buffHi, buffLo, blockCRC;
-   Char*       p;
-
-   strcpy ( progName, argv[0] );
-   inFileName[0] = outFileName[0] = 0;
-
-   fprintf ( stderr, "bzip2recover 1.0: extracts blocks from damaged .bz2 files.\n" );
-
-   if (argc != 2) {
-      fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n",
-                        progName, progName );
-      exit(1);
-   }
-
-   strcpy ( inFileName, argv[1] );
-
-   inFile = fopen ( inFileName, "rb" );
-   if (inFile == NULL) {
-      fprintf ( stderr, "%s: can't read `%s'\n", progName, inFileName );
-      exit(1);
-   }
-
-   bsIn = bsOpenReadStream ( inFile );
-   fprintf ( stderr, "%s: searching for block boundaries ...\n", progName );
-
-   bitsRead = 0;
-   buffHi = buffLo = 0;
-   currBlock = 0;
-   bStart[currBlock] = 0;
-
-   rbCtr = 0;
-
-   while (True) {
-      b = bsGetBit ( bsIn );
-      bitsRead++;
-      if (b == 2) {
-         if (bitsRead >= bStart[currBlock] &&
-            (bitsRead - bStart[currBlock]) >= 40) {
-            bEnd[currBlock] = bitsRead-1;
-            if (currBlock > 0)
-               fprintf ( stderr, "   block %d runs from %d to %d (incomplete)\n",
-                         currBlock,  bStart[currBlock], bEnd[currBlock] );
-         } else
-            currBlock--;
-         break;
-      }
-      buffHi = (buffHi << 1) | (buffLo >> 31);
-      buffLo = (buffLo << 1) | (b & 1);
-      if ( ( (buffHi & 0x0000ffff) == BLOCK_HEADER_HI 
-             && buffLo == BLOCK_HEADER_LO)
-           || 
-           ( (buffHi & 0x0000ffff) == BLOCK_ENDMARK_HI 
-             && buffLo == BLOCK_ENDMARK_LO)
-         ) {
-         if (bitsRead > 49)
-            bEnd[currBlock] = bitsRead-49; else
-            bEnd[currBlock] = 0;
-         if (currBlock > 0 &&
-	     (bEnd[currBlock] - bStart[currBlock]) >= 130) {
-            fprintf ( stderr, "   block %d runs from %d to %d\n",
-                      rbCtr+1,  bStart[currBlock], bEnd[currBlock] );
-            rbStart[rbCtr] = bStart[currBlock];
-            rbEnd[rbCtr] = bEnd[currBlock];
-            rbCtr++;
-         }
-         currBlock++;
-
-         bStart[currBlock] = bitsRead;
-      }
-   }
-
-   bsClose ( bsIn );
-
-   /*-- identified blocks run from 1 to rbCtr inclusive. --*/
-
-   if (rbCtr < 1) {
-      fprintf ( stderr,
-                "%s: sorry, I couldn't find any block boundaries.\n",
-                progName );
-      exit(1);
-   };
-
-   fprintf ( stderr, "%s: splitting into blocks\n", progName );
-
-   inFile = fopen ( inFileName, "rb" );
-   if (inFile == NULL) {
-      fprintf ( stderr, "%s: can't open `%s'\n", progName, inFileName );
-      exit(1);
-   }
-   bsIn = bsOpenReadStream ( inFile );
-
-   /*-- placate gcc's dataflow analyser --*/
-   blockCRC = 0; bsWr = 0;
-
-   bitsRead = 0;
-   outFile = NULL;
-   wrBlock = 0;
-   while (True) {
-      b = bsGetBit(bsIn);
-      if (b == 2) break;
-      buffHi = (buffHi << 1) | (buffLo >> 31);
-      buffLo = (buffLo << 1) | (b & 1);
-      if (bitsRead == 47+rbStart[wrBlock]) 
-         blockCRC = (buffHi << 16) | (buffLo >> 16);
-
-      if (outFile != NULL && bitsRead >= rbStart[wrBlock]
-                          && bitsRead <= rbEnd[wrBlock]) {
-         bsPutBit ( bsWr, b );
-      }
-
-      bitsRead++;
-
-      if (bitsRead == rbEnd[wrBlock]+1) {
-         if (outFile != NULL) {
-            bsPutUChar ( bsWr, 0x17 ); bsPutUChar ( bsWr, 0x72 );
-            bsPutUChar ( bsWr, 0x45 ); bsPutUChar ( bsWr, 0x38 );
-            bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
-            bsPutUInt32 ( bsWr, blockCRC );
-            bsClose ( bsWr );
-         }
-         if (wrBlock >= rbCtr) break;
-         wrBlock++;
-      } else
-      if (bitsRead == rbStart[wrBlock]) {
-         outFileName[0] = 0;
-         sprintf ( outFileName, "rec%4d", wrBlock+1 );
-         for (p = outFileName; *p != 0; p++) if (*p == ' ') *p = '0';
-         strcat ( outFileName, inFileName );
-         if ( !endsInBz2(outFileName)) strcat ( outFileName, ".bz2" );
-
-         fprintf ( stderr, "   writing block %d to `%s' ...\n",
-                           wrBlock+1, outFileName );
-
-         outFile = fopen ( outFileName, "wb" );
-         if (outFile == NULL) {
-            fprintf ( stderr, "%s: can't write `%s'\n",
-                      progName, outFileName );
-            exit(1);
-         }
-         bsWr = bsOpenWriteStream ( outFile );
-         bsPutUChar ( bsWr, 'B' ); bsPutUChar ( bsWr, 'Z' );
-         bsPutUChar ( bsWr, 'h' ); bsPutUChar ( bsWr, '9' );
-         bsPutUChar ( bsWr, 0x31 ); bsPutUChar ( bsWr, 0x41 );
-         bsPutUChar ( bsWr, 0x59 ); bsPutUChar ( bsWr, 0x26 );
-         bsPutUChar ( bsWr, 0x53 ); bsPutUChar ( bsWr, 0x59 );
-      }
-   }
-
-   fprintf ( stderr, "%s: finished\n", progName );
-   return 0;
-}
-
-
-
-/*-----------------------------------------------------------*/
-/*--- end                                  bzip2recover.c ---*/
-/*-----------------------------------------------------------*/
diff --git a/winsup/bz2lib/bzlib.c b/winsup/bz2lib/bzlib.c
deleted file mode 100644
index 4a06d9f14..000000000
--- a/winsup/bz2lib/bzlib.c
+++ /dev/null
@@ -1,1564 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Library top-level functions.                          ---*/
-/*---                                               bzlib.c ---*/
-/*-------------------------------------------------------------*/
-
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
---*/
-
-/*--
-   CHANGES
-   ~~~~~~~
-   0.9.0 -- original version.
-
-   0.9.0a/b -- no changes in this file.
-
-   0.9.0c
-      * made zero-length BZ_FLUSH work correctly in bzCompress().
-      * fixed bzWrite/bzRead to ignore zero-length requests.
-      * fixed bzread to correctly handle read requests after EOF.
-      * wrong parameter order in call to bzDecompressInit in
-        bzBuffToBuffDecompress.  Fixed.
---*/
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------------*/
-/*--- Compression stuff                           ---*/
-/*---------------------------------------------------*/
-
-
-/*---------------------------------------------------*/
-#ifndef BZ_NO_STDIO
-void BZ2_bz__AssertH__fail ( int errcode )
-{
-   fprintf(stderr, 
-      "\n\nbzip2/libbzip2: internal error number %d.\n"
-      "This is a bug in bzip2/libbzip2, %s.\n"
-      "Please report it to me at: jseward@acm.org.  If this happened\n"
-      "when you were using some program which uses libbzip2 as a\n"
-      "component, you should also report this bug to the author(s)\n"
-      "of that program.  Please make an effort to report this bug;\n"
-      "timely and accurate bug reports eventually lead to higher\n"
-      "quality software.  Thanks.  Julian Seward, 21 March 2000.\n\n",
-      errcode,
-      BZ2_bzlibVersion()
-   );
-   exit(3);
-}
-#endif
-
-
-/*---------------------------------------------------*/
-static
-int bz_config_ok ( void )
-{
-   if (sizeof(int)   != 4) return 0;
-   if (sizeof(short) != 2) return 0;
-   if (sizeof(char)  != 1) return 0;
-   return 1;
-}
-
-
-/*---------------------------------------------------*/
-static
-void* default_bzalloc ( void* opaque, Int32 items, Int32 size )
-{
-   void* v = malloc ( items * size );
-   return v;
-}
-
-static
-void default_bzfree ( void* opaque, void* addr )
-{
-   if (addr != NULL) free ( addr );
-}
-
-
-/*---------------------------------------------------*/
-static
-void prepare_new_block ( EState* s )
-{
-   Int32 i;
-   s->nblock = 0;
-   s->numZ = 0;
-   s->state_out_pos = 0;
-   BZ_INITIALISE_CRC ( s->blockCRC );
-   for (i = 0; i < 256; i++) s->inUse[i] = False;
-   s->blockNo++;
-}
-
-
-/*---------------------------------------------------*/
-static
-void init_RL ( EState* s )
-{
-   s->state_in_ch  = 256;
-   s->state_in_len = 0;
-}
-
-
-static
-Bool isempty_RL ( EState* s )
-{
-   if (s->state_in_ch < 256 && s->state_in_len > 0)
-      return False; else
-      return True;
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzCompressInit) 
-                    ( bz_stream* strm, 
-                     int        blockSize100k,
-                     int        verbosity,
-                     int        workFactor )
-{
-   Int32   n;
-   EState* s;
-
-   if (!bz_config_ok()) return BZ_CONFIG_ERROR;
-
-   if (strm == NULL || 
-       blockSize100k < 1 || blockSize100k > 9 ||
-       workFactor < 0 || workFactor > 250)
-     return BZ_PARAM_ERROR;
-
-   if (workFactor == 0) workFactor = 30;
-   if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
-   if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
-
-   s = BZALLOC( sizeof(EState) );
-   if (s == NULL) return BZ_MEM_ERROR;
-   s->strm = strm;
-
-   s->arr1 = NULL;
-   s->arr2 = NULL;
-   s->ftab = NULL;
-
-   n       = 100000 * blockSize100k;
-   s->arr1 = BZALLOC( n                  * sizeof(UInt32) );
-   s->arr2 = BZALLOC( (n+BZ_N_OVERSHOOT) * sizeof(UInt32) );
-   s->ftab = BZALLOC( 65537              * sizeof(UInt32) );
-
-   if (s->arr1 == NULL || s->arr2 == NULL || s->ftab == NULL) {
-      if (s->arr1 != NULL) BZFREE(s->arr1);
-      if (s->arr2 != NULL) BZFREE(s->arr2);
-      if (s->ftab != NULL) BZFREE(s->ftab);
-      if (s       != NULL) BZFREE(s);
-      return BZ_MEM_ERROR;
-   }
-
-   s->blockNo           = 0;
-   s->state             = BZ_S_INPUT;
-   s->mode              = BZ_M_RUNNING;
-   s->combinedCRC       = 0;
-   s->blockSize100k     = blockSize100k;
-   s->nblockMAX         = 100000 * blockSize100k - 19;
-   s->verbosity         = verbosity;
-   s->workFactor        = workFactor;
-
-   s->block             = (UChar*)s->arr2;
-   s->mtfv              = (UInt16*)s->arr1;
-   s->zbits             = NULL;
-   s->ptr               = (UInt32*)s->arr1;
-
-   strm->state          = s;
-   strm->total_in_lo32  = 0;
-   strm->total_in_hi32  = 0;
-   strm->total_out_lo32 = 0;
-   strm->total_out_hi32 = 0;
-   init_RL ( s );
-   prepare_new_block ( s );
-   return BZ_OK;
-}
-
-
-/*---------------------------------------------------*/
-static
-void add_pair_to_block ( EState* s )
-{
-   Int32 i;
-   UChar ch = (UChar)(s->state_in_ch);
-   for (i = 0; i < s->state_in_len; i++) {
-      BZ_UPDATE_CRC( s->blockCRC, ch );
-   }
-   s->inUse[s->state_in_ch] = True;
-   switch (s->state_in_len) {
-      case 1:
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         break;
-      case 2:
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         break;
-      case 3:
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         break;
-      default:
-         s->inUse[s->state_in_len-4] = True;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = (UChar)ch; s->nblock++;
-         s->block[s->nblock] = ((UChar)(s->state_in_len-4));
-         s->nblock++;
-         break;
-   }
-}
-
-
-/*---------------------------------------------------*/
-static
-void flush_RL ( EState* s )
-{
-   if (s->state_in_ch < 256) add_pair_to_block ( s );
-   init_RL ( s );
-}
-
-
-/*---------------------------------------------------*/
-#define ADD_CHAR_TO_BLOCK(zs,zchh0)               \
-{                                                 \
-   UInt32 zchh = (UInt32)(zchh0);                 \
-   /*-- fast track the common case --*/           \
-   if (zchh != zs->state_in_ch &&                 \
-       zs->state_in_len == 1) {                   \
-      UChar ch = (UChar)(zs->state_in_ch);        \
-      BZ_UPDATE_CRC( zs->blockCRC, ch );          \
-      zs->inUse[zs->state_in_ch] = True;          \
-      zs->block[zs->nblock] = (UChar)ch;          \
-      zs->nblock++;                               \
-      zs->state_in_ch = zchh;                     \
-   }                                              \
-   else                                           \
-   /*-- general, uncommon cases --*/              \
-   if (zchh != zs->state_in_ch ||                 \
-      zs->state_in_len == 255) {                  \
-      if (zs->state_in_ch < 256)                  \
-         add_pair_to_block ( zs );                \
-      zs->state_in_ch = zchh;                     \
-      zs->state_in_len = 1;                       \
-   } else {                                       \
-      zs->state_in_len++;                         \
-   }                                              \
-}
-
-
-/*---------------------------------------------------*/
-static
-Bool copy_input_until_stop ( EState* s )
-{
-   Bool progress_in = False;
-
-   if (s->mode == BZ_M_RUNNING) {
-
-      /*-- fast track the common case --*/
-      while (True) {
-         /*-- block full? --*/
-         if (s->nblock >= s->nblockMAX) break;
-         /*-- no input? --*/
-         if (s->strm->avail_in == 0) break;
-         progress_in = True;
-         ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); 
-         s->strm->next_in++;
-         s->strm->avail_in--;
-         s->strm->total_in_lo32++;
-         if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++;
-      }
-
-   } else {
-
-      /*-- general, uncommon case --*/
-      while (True) {
-         /*-- block full? --*/
-         if (s->nblock >= s->nblockMAX) break;
-         /*-- no input? --*/
-         if (s->strm->avail_in == 0) break;
-         /*-- flush/finish end? --*/
-         if (s->avail_in_expect == 0) break;
-         progress_in = True;
-         ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); 
-         s->strm->next_in++;
-         s->strm->avail_in--;
-         s->strm->total_in_lo32++;
-         if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++;
-         s->avail_in_expect--;
-      }
-   }
-   return progress_in;
-}
-
-
-/*---------------------------------------------------*/
-static
-Bool copy_output_until_stop ( EState* s )
-{
-   Bool progress_out = False;
-
-   while (True) {
-
-      /*-- no output space? --*/
-      if (s->strm->avail_out == 0) break;
-
-      /*-- block done? --*/
-      if (s->state_out_pos >= s->numZ) break;
-
-      progress_out = True;
-      *(s->strm->next_out) = s->zbits[s->state_out_pos];
-      s->state_out_pos++;
-      s->strm->avail_out--;
-      s->strm->next_out++;
-      s->strm->total_out_lo32++;
-      if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-   }
-
-   return progress_out;
-}
-
-
-/*---------------------------------------------------*/
-static
-Bool handle_compress ( bz_stream* strm )
-{
-   Bool progress_in  = False;
-   Bool progress_out = False;
-   EState* s = strm->state;
-   
-   while (True) {
-
-      if (s->state == BZ_S_OUTPUT) {
-         progress_out |= copy_output_until_stop ( s );
-         if (s->state_out_pos < s->numZ) break;
-         if (s->mode == BZ_M_FINISHING && 
-             s->avail_in_expect == 0 &&
-             isempty_RL(s)) break;
-         prepare_new_block ( s );
-         s->state = BZ_S_INPUT;
-         if (s->mode == BZ_M_FLUSHING && 
-             s->avail_in_expect == 0 &&
-             isempty_RL(s)) break;
-      }
-
-      if (s->state == BZ_S_INPUT) {
-         progress_in |= copy_input_until_stop ( s );
-         if (s->mode != BZ_M_RUNNING && s->avail_in_expect == 0) {
-            flush_RL ( s );
-            BZ2_compressBlock ( s, (Bool)(s->mode == BZ_M_FINISHING) );
-            s->state = BZ_S_OUTPUT;
-         }
-         else
-         if (s->nblock >= s->nblockMAX) {
-            BZ2_compressBlock ( s, False );
-            s->state = BZ_S_OUTPUT;
-         }
-         else
-         if (s->strm->avail_in == 0) {
-            break;
-         }
-      }
-
-   }
-
-   return progress_in || progress_out;
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action )
-{
-   Bool progress;
-   EState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   preswitch:
-   switch (s->mode) {
-
-      case BZ_M_IDLE:
-         return BZ_SEQUENCE_ERROR;
-
-      case BZ_M_RUNNING:
-         if (action == BZ_RUN) {
-            progress = handle_compress ( strm );
-            return progress ? BZ_RUN_OK : BZ_PARAM_ERROR;
-         } 
-         else
-	 if (action == BZ_FLUSH) {
-            s->avail_in_expect = strm->avail_in;
-            s->mode = BZ_M_FLUSHING;
-            goto preswitch;
-         }
-         else
-         if (action == BZ_FINISH) {
-            s->avail_in_expect = strm->avail_in;
-            s->mode = BZ_M_FINISHING;
-            goto preswitch;
-         }
-         else 
-            return BZ_PARAM_ERROR;
-
-      case BZ_M_FLUSHING:
-         if (action != BZ_FLUSH) return BZ_SEQUENCE_ERROR;
-         if (s->avail_in_expect != s->strm->avail_in) 
-            return BZ_SEQUENCE_ERROR;
-         progress = handle_compress ( strm );
-         if (s->avail_in_expect > 0 || !isempty_RL(s) ||
-             s->state_out_pos < s->numZ) return BZ_FLUSH_OK;
-         s->mode = BZ_M_RUNNING;
-         return BZ_RUN_OK;
-
-      case BZ_M_FINISHING:
-         if (action != BZ_FINISH) return BZ_SEQUENCE_ERROR;
-         if (s->avail_in_expect != s->strm->avail_in) 
-            return BZ_SEQUENCE_ERROR;
-         progress = handle_compress ( strm );
-         if (!progress) return BZ_SEQUENCE_ERROR;
-         if (s->avail_in_expect > 0 || !isempty_RL(s) ||
-             s->state_out_pos < s->numZ) return BZ_FINISH_OK;
-         s->mode = BZ_M_IDLE;
-         return BZ_STREAM_END;
-   }
-   return BZ_OK; /*--not reached--*/
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzCompressEnd)  ( bz_stream *strm )
-{
-   EState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   if (s->arr1 != NULL) BZFREE(s->arr1);
-   if (s->arr2 != NULL) BZFREE(s->arr2);
-   if (s->ftab != NULL) BZFREE(s->ftab);
-   BZFREE(strm->state);
-
-   strm->state = NULL;   
-
-   return BZ_OK;
-}
-
-
-/*---------------------------------------------------*/
-/*--- Decompression stuff                         ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzDecompressInit) 
-                     ( bz_stream* strm, 
-                       int        verbosity,
-                       int        small )
-{
-   DState* s;
-
-   if (!bz_config_ok()) return BZ_CONFIG_ERROR;
-
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   if (small != 0 && small != 1) return BZ_PARAM_ERROR;
-   if (verbosity < 0 || verbosity > 4) return BZ_PARAM_ERROR;
-
-   if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc;
-   if (strm->bzfree == NULL) strm->bzfree = default_bzfree;
-
-   s = BZALLOC( sizeof(DState) );
-   if (s == NULL) return BZ_MEM_ERROR;
-   s->strm                  = strm;
-   strm->state              = s;
-   s->state                 = BZ_X_MAGIC_1;
-   s->bsLive                = 0;
-   s->bsBuff                = 0;
-   s->calculatedCombinedCRC = 0;
-   strm->total_in_lo32      = 0;
-   strm->total_in_hi32      = 0;
-   strm->total_out_lo32     = 0;
-   strm->total_out_hi32     = 0;
-   s->smallDecompress       = (Bool)small;
-   s->ll4                   = NULL;
-   s->ll16                  = NULL;
-   s->tt                    = NULL;
-   s->currBlockNo           = 0;
-   s->verbosity             = verbosity;
-
-   return BZ_OK;
-}
-
-
-/*---------------------------------------------------*/
-static
-void unRLE_obuf_to_output_FAST ( DState* s )
-{
-   UChar k1;
-
-   if (s->blockRandomised) {
-
-      while (True) {
-         /* try to finish existing run */
-         while (True) {
-            if (s->strm->avail_out == 0) return;
-            if (s->state_out_len == 0) break;
-            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
-            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
-            s->state_out_len--;
-            s->strm->next_out++;
-            s->strm->avail_out--;
-            s->strm->total_out_lo32++;
-            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-         }
-   
-         /* can a new run be started? */
-         if (s->nblock_used == s->save_nblock+1) return;
-               
-   
-         s->state_out_len = 1;
-         s->state_out_ch = s->k0;
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 2;
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 3;
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         s->state_out_len = ((Int32)k1) + 4;
-         BZ_GET_FAST(s->k0); BZ_RAND_UPD_MASK; 
-         s->k0 ^= BZ_RAND_MASK; s->nblock_used++;
-      }
-
-   } else {
-
-      /* restore */
-      UInt32        c_calculatedBlockCRC = s->calculatedBlockCRC;
-      UChar         c_state_out_ch       = s->state_out_ch;
-      Int32         c_state_out_len      = s->state_out_len;
-      Int32         c_nblock_used        = s->nblock_used;
-      Int32         c_k0                 = s->k0;
-      UInt32*       c_tt                 = s->tt;
-      UInt32        c_tPos               = s->tPos;
-      char*         cs_next_out          = s->strm->next_out;
-      unsigned int  cs_avail_out         = s->strm->avail_out;
-      /* end restore */
-
-      UInt32       avail_out_INIT = cs_avail_out;
-      Int32        s_save_nblockPP = s->save_nblock+1;
-      unsigned int total_out_lo32_old;
-
-      while (True) {
-
-         /* try to finish existing run */
-         if (c_state_out_len > 0) {
-            while (True) {
-               if (cs_avail_out == 0) goto return_notr;
-               if (c_state_out_len == 1) break;
-               *( (UChar*)(cs_next_out) ) = c_state_out_ch;
-               BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch );
-               c_state_out_len--;
-               cs_next_out++;
-               cs_avail_out--;
-            }
-            s_state_out_len_eq_one:
-            {
-               if (cs_avail_out == 0) { 
-                  c_state_out_len = 1; goto return_notr;
-               };
-               *( (UChar*)(cs_next_out) ) = c_state_out_ch;
-               BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch );
-               cs_next_out++;
-               cs_avail_out--;
-            }
-         }   
-         /* can a new run be started? */
-         if (c_nblock_used == s_save_nblockPP) {
-            c_state_out_len = 0; goto return_notr;
-         };   
-         c_state_out_ch = c_k0;
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         if (k1 != c_k0) { 
-            c_k0 = k1; goto s_state_out_len_eq_one; 
-         };
-         if (c_nblock_used == s_save_nblockPP) 
-            goto s_state_out_len_eq_one;
-   
-         c_state_out_len = 2;
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         if (c_nblock_used == s_save_nblockPP) continue;
-         if (k1 != c_k0) { c_k0 = k1; continue; };
-   
-         c_state_out_len = 3;
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         if (c_nblock_used == s_save_nblockPP) continue;
-         if (k1 != c_k0) { c_k0 = k1; continue; };
-   
-         BZ_GET_FAST_C(k1); c_nblock_used++;
-         c_state_out_len = ((Int32)k1) + 4;
-         BZ_GET_FAST_C(c_k0); c_nblock_used++;
-      }
-
-      return_notr:
-      total_out_lo32_old = s->strm->total_out_lo32;
-      s->strm->total_out_lo32 += (avail_out_INIT - cs_avail_out);
-      if (s->strm->total_out_lo32 < total_out_lo32_old)
-         s->strm->total_out_hi32++;
-
-      /* save */
-      s->calculatedBlockCRC = c_calculatedBlockCRC;
-      s->state_out_ch       = c_state_out_ch;
-      s->state_out_len      = c_state_out_len;
-      s->nblock_used        = c_nblock_used;
-      s->k0                 = c_k0;
-      s->tt                 = c_tt;
-      s->tPos               = c_tPos;
-      s->strm->next_out     = cs_next_out;
-      s->strm->avail_out    = cs_avail_out;
-      /* end save */
-   }
-}
-
-
-
-/*---------------------------------------------------*/
-__inline__ Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab )
-{
-   Int32 nb, na, mid;
-   nb = 0;
-   na = 256;
-   do {
-      mid = (nb + na) >> 1;
-      if (indx >= cftab[mid]) nb = mid; else na = mid;
-   }
-   while (na - nb != 1);
-   return nb;
-}
-
-
-/*---------------------------------------------------*/
-static
-void unRLE_obuf_to_output_SMALL ( DState* s )
-{
-   UChar k1;
-
-   if (s->blockRandomised) {
-
-      while (True) {
-         /* try to finish existing run */
-         while (True) {
-            if (s->strm->avail_out == 0) return;
-            if (s->state_out_len == 0) break;
-            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
-            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
-            s->state_out_len--;
-            s->strm->next_out++;
-            s->strm->avail_out--;
-            s->strm->total_out_lo32++;
-            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-         }
-   
-         /* can a new run be started? */
-         if (s->nblock_used == s->save_nblock+1) return;
-               
-   
-         s->state_out_len = 1;
-         s->state_out_ch = s->k0;
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 2;
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 3;
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; 
-         k1 ^= BZ_RAND_MASK; s->nblock_used++;
-         s->state_out_len = ((Int32)k1) + 4;
-         BZ_GET_SMALL(s->k0); BZ_RAND_UPD_MASK; 
-         s->k0 ^= BZ_RAND_MASK; s->nblock_used++;
-      }
-
-   } else {
-
-      while (True) {
-         /* try to finish existing run */
-         while (True) {
-            if (s->strm->avail_out == 0) return;
-            if (s->state_out_len == 0) break;
-            *( (UChar*)(s->strm->next_out) ) = s->state_out_ch;
-            BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch );
-            s->state_out_len--;
-            s->strm->next_out++;
-            s->strm->avail_out--;
-            s->strm->total_out_lo32++;
-            if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++;
-         }
-   
-         /* can a new run be started? */
-         if (s->nblock_used == s->save_nblock+1) return;
-   
-         s->state_out_len = 1;
-         s->state_out_ch = s->k0;
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 2;
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         s->state_out_len = 3;
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         if (s->nblock_used == s->save_nblock+1) continue;
-         if (k1 != s->k0) { s->k0 = k1; continue; };
-   
-         BZ_GET_SMALL(k1); s->nblock_used++;
-         s->state_out_len = ((Int32)k1) + 4;
-         BZ_GET_SMALL(s->k0); s->nblock_used++;
-      }
-
-   }
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
-{
-   DState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   while (True) {
-      if (s->state == BZ_X_IDLE) return BZ_SEQUENCE_ERROR;
-      if (s->state == BZ_X_OUTPUT) {
-         if (s->smallDecompress)
-            unRLE_obuf_to_output_SMALL ( s ); else
-            unRLE_obuf_to_output_FAST  ( s );
-         if (s->nblock_used == s->save_nblock+1 && s->state_out_len == 0) {
-            BZ_FINALISE_CRC ( s->calculatedBlockCRC );
-            if (s->verbosity >= 3) 
-               VPrintf2 ( " {0x%x, 0x%x}", s->storedBlockCRC, 
-                          s->calculatedBlockCRC );
-            if (s->verbosity >= 2) VPrintf0 ( "]" );
-            if (s->calculatedBlockCRC != s->storedBlockCRC)
-               return BZ_DATA_ERROR;
-            s->calculatedCombinedCRC 
-               = (s->calculatedCombinedCRC << 1) | 
-                    (s->calculatedCombinedCRC >> 31);
-            s->calculatedCombinedCRC ^= s->calculatedBlockCRC;
-            s->state = BZ_X_BLKHDR_1;
-         } else {
-            return BZ_OK;
-         }
-      }
-      if (s->state >= BZ_X_MAGIC_1) {
-         Int32 r = BZ2_decompress ( s );
-         if (r == BZ_STREAM_END) {
-            if (s->verbosity >= 3)
-               VPrintf2 ( "\n    combined CRCs: stored = 0x%x, computed = 0x%x", 
-                          s->storedCombinedCRC, s->calculatedCombinedCRC );
-            if (s->calculatedCombinedCRC != s->storedCombinedCRC)
-               return BZ_DATA_ERROR;
-            return r;
-         }
-         if (s->state != BZ_X_OUTPUT) return r;
-      }
-   }
-
-   AssertH ( 0, 6001 );
-
-   return 0;  /*NOTREACHED*/
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzDecompressEnd)  ( bz_stream *strm )
-{
-   DState* s;
-   if (strm == NULL) return BZ_PARAM_ERROR;
-   s = strm->state;
-   if (s == NULL) return BZ_PARAM_ERROR;
-   if (s->strm != strm) return BZ_PARAM_ERROR;
-
-   if (s->tt   != NULL) BZFREE(s->tt);
-   if (s->ll16 != NULL) BZFREE(s->ll16);
-   if (s->ll4  != NULL) BZFREE(s->ll4);
-
-   BZFREE(strm->state);
-   strm->state = NULL;
-
-   return BZ_OK;
-}
-
-
-#ifndef BZ_NO_STDIO
-/*---------------------------------------------------*/
-/*--- File I/O stuff                              ---*/
-/*---------------------------------------------------*/
-
-#define BZ_SETERR(eee)                    \
-{                                         \
-   if (bzerror != NULL) *bzerror = eee;   \
-   if (bzf != NULL) bzf->lastErr = eee;   \
-}
-
-typedef 
-   struct {
-      FILE*     handle;
-      Char      buf[BZ_MAX_UNUSED];
-      Int32     bufN;
-      Bool      writing;
-      bz_stream strm;
-      Int32     lastErr;
-      Bool      initialisedOk;
-   }
-   bzFile;
-
-
-/*---------------------------------------------*/
-static Bool myfeof ( FILE* f )
-{
-   Int32 c = fgetc ( f );
-   if (c == EOF) return True;
-   ungetc ( c, f );
-   return False;
-}
-
-
-/*---------------------------------------------------*/
-BZFILE* BZ_API(BZ2_bzWriteOpen) 
-                    ( int*  bzerror,      
-                      FILE* f, 
-                      int   blockSize100k, 
-                      int   verbosity,
-                      int   workFactor )
-{
-   Int32   ret;
-   bzFile* bzf = NULL;
-
-   BZ_SETERR(BZ_OK);
-
-   if (f == NULL ||
-       (blockSize100k < 1 || blockSize100k > 9) ||
-       (workFactor < 0 || workFactor > 250) ||
-       (verbosity < 0 || verbosity > 4))
-      { BZ_SETERR(BZ_PARAM_ERROR); return NULL; };
-
-   if (ferror(f))
-      { BZ_SETERR(BZ_IO_ERROR); return NULL; };
-
-   bzf = malloc ( sizeof(bzFile) );
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_MEM_ERROR); return NULL; };
-
-   BZ_SETERR(BZ_OK);
-   bzf->initialisedOk = False;
-   bzf->bufN          = 0;
-   bzf->handle        = f;
-   bzf->writing       = True;
-   bzf->strm.bzalloc  = NULL;
-   bzf->strm.bzfree   = NULL;
-   bzf->strm.opaque   = NULL;
-
-   if (workFactor == 0) workFactor = 30;
-   ret = BZ2_bzCompressInit ( &(bzf->strm), blockSize100k, 
-                              verbosity, workFactor );
-   if (ret != BZ_OK)
-      { BZ_SETERR(ret); free(bzf); return NULL; };
-
-   bzf->strm.avail_in = 0;
-   bzf->initialisedOk = True;
-   return bzf;   
-}
-
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzWrite)
-             ( int*    bzerror, 
-               BZFILE* b, 
-               void*   buf, 
-               int     len )
-{
-   Int32 n, n2, ret;
-   bzFile* bzf = (bzFile*)b;
-
-   BZ_SETERR(BZ_OK);
-   if (bzf == NULL || buf == NULL || len < 0)
-      { BZ_SETERR(BZ_PARAM_ERROR); return; };
-   if (!(bzf->writing))
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-   if (ferror(bzf->handle))
-      { BZ_SETERR(BZ_IO_ERROR); return; };
-
-   if (len == 0)
-      { BZ_SETERR(BZ_OK); return; };
-
-   bzf->strm.avail_in = len;
-   bzf->strm.next_in  = buf;
-
-   while (True) {
-      bzf->strm.avail_out = BZ_MAX_UNUSED;
-      bzf->strm.next_out = bzf->buf;
-      ret = BZ2_bzCompress ( &(bzf->strm), BZ_RUN );
-      if (ret != BZ_RUN_OK)
-         { BZ_SETERR(ret); return; };
-
-      if (bzf->strm.avail_out < BZ_MAX_UNUSED) {
-         n = BZ_MAX_UNUSED - bzf->strm.avail_out;
-         n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), 
-                       n, bzf->handle );
-         if (n != n2 || ferror(bzf->handle))
-            { BZ_SETERR(BZ_IO_ERROR); return; };
-      }
-
-      if (bzf->strm.avail_in == 0)
-         { BZ_SETERR(BZ_OK); return; };
-   }
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzWriteClose)
-                  ( int*          bzerror, 
-                    BZFILE*       b, 
-                    int           abandon,
-                    unsigned int* nbytes_in,
-                    unsigned int* nbytes_out )
-{
-   BZ2_bzWriteClose64 ( bzerror, b, abandon, 
-                        nbytes_in, NULL, nbytes_out, NULL );
-}
-
-
-void BZ_API(BZ2_bzWriteClose64)
-                  ( int*          bzerror, 
-                    BZFILE*       b, 
-                    int           abandon,
-                    unsigned int* nbytes_in_lo32,
-                    unsigned int* nbytes_in_hi32,
-                    unsigned int* nbytes_out_lo32,
-                    unsigned int* nbytes_out_hi32 )
-{
-   Int32   n, n2, ret;
-   bzFile* bzf = (bzFile*)b;
-
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_OK); return; };
-   if (!(bzf->writing))
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-   if (ferror(bzf->handle))
-      { BZ_SETERR(BZ_IO_ERROR); return; };
-
-   if (nbytes_in_lo32 != NULL) *nbytes_in_lo32 = 0;
-   if (nbytes_in_hi32 != NULL) *nbytes_in_hi32 = 0;
-   if (nbytes_out_lo32 != NULL) *nbytes_out_lo32 = 0;
-   if (nbytes_out_hi32 != NULL) *nbytes_out_hi32 = 0;
-
-   if ((!abandon) && bzf->lastErr == BZ_OK) {
-      while (True) {
-         bzf->strm.avail_out = BZ_MAX_UNUSED;
-         bzf->strm.next_out = bzf->buf;
-         ret = BZ2_bzCompress ( &(bzf->strm), BZ_FINISH );
-         if (ret != BZ_FINISH_OK && ret != BZ_STREAM_END)
-            { BZ_SETERR(ret); return; };
-
-         if (bzf->strm.avail_out < BZ_MAX_UNUSED) {
-            n = BZ_MAX_UNUSED - bzf->strm.avail_out;
-            n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), 
-                          n, bzf->handle );
-            if (n != n2 || ferror(bzf->handle))
-               { BZ_SETERR(BZ_IO_ERROR); return; };
-         }
-
-         if (ret == BZ_STREAM_END) break;
-      }
-   }
-
-   if ( !abandon && !ferror ( bzf->handle ) ) {
-      fflush ( bzf->handle );
-      if (ferror(bzf->handle))
-         { BZ_SETERR(BZ_IO_ERROR); return; };
-   }
-
-   if (nbytes_in_lo32 != NULL)
-      *nbytes_in_lo32 = bzf->strm.total_in_lo32;
-   if (nbytes_in_hi32 != NULL)
-      *nbytes_in_hi32 = bzf->strm.total_in_hi32;
-   if (nbytes_out_lo32 != NULL)
-      *nbytes_out_lo32 = bzf->strm.total_out_lo32;
-   if (nbytes_out_hi32 != NULL)
-      *nbytes_out_hi32 = bzf->strm.total_out_hi32;
-
-   BZ_SETERR(BZ_OK);
-   BZ2_bzCompressEnd ( &(bzf->strm) );
-   free ( bzf );
-}
-
-
-/*---------------------------------------------------*/
-BZFILE* BZ_API(BZ2_bzReadOpen) 
-                   ( int*  bzerror, 
-                     FILE* f, 
-                     int   verbosity,
-                     int   small,
-                     void* unused,
-                     int   nUnused )
-{
-   bzFile* bzf = NULL;
-   int     ret;
-
-   BZ_SETERR(BZ_OK);
-
-   if (f == NULL || 
-       (small != 0 && small != 1) ||
-       (verbosity < 0 || verbosity > 4) ||
-       (unused == NULL && nUnused != 0) ||
-       (unused != NULL && (nUnused < 0 || nUnused > BZ_MAX_UNUSED)))
-      { BZ_SETERR(BZ_PARAM_ERROR); return NULL; };
-
-   if (ferror(f))
-      { BZ_SETERR(BZ_IO_ERROR); return NULL; };
-
-   bzf = malloc ( sizeof(bzFile) );
-   if (bzf == NULL) 
-      { BZ_SETERR(BZ_MEM_ERROR); return NULL; };
-
-   BZ_SETERR(BZ_OK);
-
-   bzf->initialisedOk = False;
-   bzf->handle        = f;
-   bzf->bufN          = 0;
-   bzf->writing       = False;
-   bzf->strm.bzalloc  = NULL;
-   bzf->strm.bzfree   = NULL;
-   bzf->strm.opaque   = NULL;
-   
-   while (nUnused > 0) {
-      bzf->buf[bzf->bufN] = *((UChar*)(unused)); bzf->bufN++;
-      unused = ((void*)( 1 + ((UChar*)(unused))  ));
-      nUnused--;
-   }
-
-   ret = BZ2_bzDecompressInit ( &(bzf->strm), verbosity, small );
-   if (ret != BZ_OK)
-      { BZ_SETERR(ret); free(bzf); return NULL; };
-
-   bzf->strm.avail_in = bzf->bufN;
-   bzf->strm.next_in  = bzf->buf;
-
-   bzf->initialisedOk = True;
-   return bzf;   
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzReadClose) ( int *bzerror, BZFILE *b )
-{
-   bzFile* bzf = (bzFile*)b;
-
-   BZ_SETERR(BZ_OK);
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_OK); return; };
-
-   if (bzf->writing)
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-
-   if (bzf->initialisedOk)
-      (void)BZ2_bzDecompressEnd ( &(bzf->strm) );
-   free ( bzf );
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzRead) 
-           ( int*    bzerror, 
-             BZFILE* b, 
-             void*   buf, 
-             int     len )
-{
-   Int32   n, ret;
-   bzFile* bzf = (bzFile*)b;
-
-   BZ_SETERR(BZ_OK);
-
-   if (bzf == NULL || buf == NULL || len < 0)
-      { BZ_SETERR(BZ_PARAM_ERROR); return 0; };
-
-   if (bzf->writing)
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return 0; };
-
-   if (len == 0)
-      { BZ_SETERR(BZ_OK); return 0; };
-
-   bzf->strm.avail_out = len;
-   bzf->strm.next_out = buf;
-
-   while (True) {
-
-      if (ferror(bzf->handle)) 
-         { BZ_SETERR(BZ_IO_ERROR); return 0; };
-
-      if (bzf->strm.avail_in == 0 && !myfeof(bzf->handle)) {
-         n = fread ( bzf->buf, sizeof(UChar), 
-                     BZ_MAX_UNUSED, bzf->handle );
-         if (ferror(bzf->handle))
-            { BZ_SETERR(BZ_IO_ERROR); return 0; };
-         bzf->bufN = n;
-         bzf->strm.avail_in = bzf->bufN;
-         bzf->strm.next_in = bzf->buf;
-      }
-
-      ret = BZ2_bzDecompress ( &(bzf->strm) );
-
-      if (ret != BZ_OK && ret != BZ_STREAM_END)
-         { BZ_SETERR(ret); return 0; };
-
-      if (ret == BZ_OK && myfeof(bzf->handle) && 
-          bzf->strm.avail_in == 0 && bzf->strm.avail_out > 0)
-         { BZ_SETERR(BZ_UNEXPECTED_EOF); return 0; };
-
-      if (ret == BZ_STREAM_END)
-         { BZ_SETERR(BZ_STREAM_END);
-           return len - bzf->strm.avail_out; };
-      if (bzf->strm.avail_out == 0)
-         { BZ_SETERR(BZ_OK); return len; };
-      
-   }
-
-   return 0; /*not reached*/
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzReadGetUnused) 
-                     ( int*    bzerror, 
-                       BZFILE* b, 
-                       void**  unused, 
-                       int*    nUnused )
-{
-   bzFile* bzf = (bzFile*)b;
-   if (bzf == NULL)
-      { BZ_SETERR(BZ_PARAM_ERROR); return; };
-   if (bzf->lastErr != BZ_STREAM_END)
-      { BZ_SETERR(BZ_SEQUENCE_ERROR); return; };
-   if (unused == NULL || nUnused == NULL)
-      { BZ_SETERR(BZ_PARAM_ERROR); return; };
-
-   BZ_SETERR(BZ_OK);
-   *nUnused = bzf->strm.avail_in;
-   *unused = bzf->strm.next_in;
-}
-#endif
-
-
-/*---------------------------------------------------*/
-/*--- Misc convenience stuff                      ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzBuffToBuffCompress) 
-                         ( char*         dest, 
-                           unsigned int* destLen,
-                           char*         source, 
-                           unsigned int  sourceLen,
-                           int           blockSize100k, 
-                           int           verbosity, 
-                           int           workFactor )
-{
-   bz_stream strm;
-   int ret;
-
-   if (dest == NULL || destLen == NULL || 
-       source == NULL ||
-       blockSize100k < 1 || blockSize100k > 9 ||
-       verbosity < 0 || verbosity > 4 ||
-       workFactor < 0 || workFactor > 250) 
-      return BZ_PARAM_ERROR;
-
-   if (workFactor == 0) workFactor = 30;
-   strm.bzalloc = NULL;
-   strm.bzfree = NULL;
-   strm.opaque = NULL;
-   ret = BZ2_bzCompressInit ( &strm, blockSize100k, 
-                              verbosity, workFactor );
-   if (ret != BZ_OK) return ret;
-
-   strm.next_in = source;
-   strm.next_out = dest;
-   strm.avail_in = sourceLen;
-   strm.avail_out = *destLen;
-
-   ret = BZ2_bzCompress ( &strm, BZ_FINISH );
-   if (ret == BZ_FINISH_OK) goto output_overflow;
-   if (ret != BZ_STREAM_END) goto errhandler;
-
-   /* normal termination */
-   *destLen -= strm.avail_out;   
-   BZ2_bzCompressEnd ( &strm );
-   return BZ_OK;
-
-   output_overflow:
-   BZ2_bzCompressEnd ( &strm );
-   return BZ_OUTBUFF_FULL;
-
-   errhandler:
-   BZ2_bzCompressEnd ( &strm );
-   return ret;
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzBuffToBuffDecompress) 
-                           ( char*         dest, 
-                             unsigned int* destLen,
-                             char*         source, 
-                             unsigned int  sourceLen,
-                             int           small,
-                             int           verbosity )
-{
-   bz_stream strm;
-   int ret;
-
-   if (dest == NULL || destLen == NULL || 
-       source == NULL ||
-       (small != 0 && small != 1) ||
-       verbosity < 0 || verbosity > 4) 
-          return BZ_PARAM_ERROR;
-
-   strm.bzalloc = NULL;
-   strm.bzfree = NULL;
-   strm.opaque = NULL;
-   ret = BZ2_bzDecompressInit ( &strm, verbosity, small );
-   if (ret != BZ_OK) return ret;
-
-   strm.next_in = source;
-   strm.next_out = dest;
-   strm.avail_in = sourceLen;
-   strm.avail_out = *destLen;
-
-   ret = BZ2_bzDecompress ( &strm );
-   if (ret == BZ_OK) goto output_overflow_or_eof;
-   if (ret != BZ_STREAM_END) goto errhandler;
-
-   /* normal termination */
-   *destLen -= strm.avail_out;
-   BZ2_bzDecompressEnd ( &strm );
-   return BZ_OK;
-
-   output_overflow_or_eof:
-   if (strm.avail_out > 0) {
-      BZ2_bzDecompressEnd ( &strm );
-      return BZ_UNEXPECTED_EOF;
-   } else {
-      BZ2_bzDecompressEnd ( &strm );
-      return BZ_OUTBUFF_FULL;
-   };      
-
-   errhandler:
-   BZ2_bzDecompressEnd ( &strm );
-   return ret; 
-}
-
-
-/*---------------------------------------------------*/
-/*--
-   Code contributed by Yoshioka Tsuneo
-   (QWF00133@niftyserve.or.jp/tsuneo-y@is.aist-nara.ac.jp),
-   to support better zlib compatibility.
-   This code is not _officially_ part of libbzip2 (yet);
-   I haven't tested it, documented it, or considered the
-   threading-safeness of it.
-   If this code breaks, please contact both Yoshioka and me.
---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-/*--
-   return version like "0.9.0c".
---*/
-const char * BZ_API(BZ2_bzlibVersion)(void)
-{
-   return BZ_VERSION;
-}
-
-
-#ifndef BZ_NO_STDIO
-/*---------------------------------------------------*/
-
-#if defined(_WIN32) || defined(OS2) || defined(MSDOS)
-#   include <fcntl.h>
-#   include <io.h>
-#   define SET_BINARY_MODE(file) setmode(fileno(file),O_BINARY)
-#else
-#   define SET_BINARY_MODE(file)
-#endif
-static
-BZFILE * bzopen_or_bzdopen
-               ( const char *path,   /* no use when bzdopen */
-                 int fd,             /* no use when bzdopen */
-                 const char *mode,
-                 int open_mode)      /* bzopen: 0, bzdopen:1 */
-{
-   int    bzerr;
-   char   unused[BZ_MAX_UNUSED];
-   int    blockSize100k = 9;
-   int    writing       = 0;
-   char   mode2[10]     = "";
-   FILE   *fp           = NULL;
-   BZFILE *bzfp         = NULL;
-   int    verbosity     = 0;
-   int    workFactor    = 30;
-   int    smallMode     = 0;
-   int    nUnused       = 0; 
-
-   if (mode == NULL) return NULL;
-   while (*mode) {
-      switch (*mode) {
-      case 'r':
-         writing = 0; break;
-      case 'w':
-         writing = 1; break;
-      case 's':
-         smallMode = 1; break;
-      default:
-         if (isdigit((int)(*mode))) {
-            blockSize100k = *mode-'0';
-         }
-      }
-      mode++;
-   }
-   strcat(mode2, writing ? "w" : "r" );
-   strcat(mode2,"b");   /* binary mode */
-
-   if (open_mode==0) {
-      if (path==NULL || strcmp(path,"")==0) {
-        fp = (writing ? stdout : stdin);
-        SET_BINARY_MODE(fp);
-      } else {
-        fp = fopen(path,mode2);
-      }
-   } else {
-#ifdef BZ_STRICT_ANSI
-      fp = NULL;
-#else
-      fp = fdopen(fd,mode2);
-#endif
-   }
-   if (fp == NULL) return NULL;
-
-   if (writing) {
-      /* Guard against total chaos and anarchy -- JRS */
-      if (blockSize100k < 1) blockSize100k = 1;
-      if (blockSize100k > 9) blockSize100k = 9; 
-      bzfp = BZ2_bzWriteOpen(&bzerr,fp,blockSize100k,
-                             verbosity,workFactor);
-   } else {
-      bzfp = BZ2_bzReadOpen(&bzerr,fp,verbosity,smallMode,
-                            unused,nUnused);
-   }
-   if (bzfp == NULL) {
-      if (fp != stdin && fp != stdout) fclose(fp);
-      return NULL;
-   }
-   return bzfp;
-}
-
-
-/*---------------------------------------------------*/
-/*--
-   open file for read or write.
-      ex) bzopen("file","w9")
-      case path="" or NULL => use stdin or stdout.
---*/
-BZFILE * BZ_API(BZ2_bzopen)
-               ( const char *path,
-                 const char *mode )
-{
-   return bzopen_or_bzdopen(path,-1,mode,/*bzopen*/0);
-}
-
-
-/*---------------------------------------------------*/
-BZFILE * BZ_API(BZ2_bzdopen)
-               ( int fd,
-                 const char *mode )
-{
-   return bzopen_or_bzdopen(NULL,fd,mode,/*bzdopen*/1);
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzread) (BZFILE* b, void* buf, int len )
-{
-   int bzerr, nread;
-   if (((bzFile*)b)->lastErr == BZ_STREAM_END) return 0;
-   nread = BZ2_bzRead(&bzerr,b,buf,len);
-   if (bzerr == BZ_OK || bzerr == BZ_STREAM_END) {
-      return nread;
-   } else {
-      return -1;
-   }
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzwrite) (BZFILE* b, void* buf, int len )
-{
-   int bzerr;
-
-   BZ2_bzWrite(&bzerr,b,buf,len);
-   if(bzerr == BZ_OK){
-      return len;
-   }else{
-      return -1;
-   }
-}
-
-
-/*---------------------------------------------------*/
-int BZ_API(BZ2_bzflush) (BZFILE *b)
-{
-   /* do nothing now... */
-   return 0;
-}
-
-
-/*---------------------------------------------------*/
-void BZ_API(BZ2_bzclose) (BZFILE* b)
-{
-   int bzerr;
-   FILE *fp = ((bzFile *)b)->handle;
-   
-   if (b==NULL) {return;}
-   if(((bzFile*)b)->writing){
-      BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL);
-      if(bzerr != BZ_OK){
-         BZ2_bzWriteClose(NULL,b,1,NULL,NULL);
-      }
-   }else{
-      BZ2_bzReadClose(&bzerr,b);
-   }
-   if(fp!=stdin && fp!=stdout){
-      fclose(fp);
-   }
-}
-
-
-/*---------------------------------------------------*/
-/*--
-   return last error code 
---*/
-static char *bzerrorstrings[] = {
-       "OK"
-      ,"SEQUENCE_ERROR"
-      ,"PARAM_ERROR"
-      ,"MEM_ERROR"
-      ,"DATA_ERROR"
-      ,"DATA_ERROR_MAGIC"
-      ,"IO_ERROR"
-      ,"UNEXPECTED_EOF"
-      ,"OUTBUFF_FULL"
-      ,"CONFIG_ERROR"
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-};
-
-
-const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum)
-{
-   int err = ((bzFile *)b)->lastErr;
-
-   if(err>0) err = 0;
-   *errnum = err;
-   return bzerrorstrings[err*-1];
-}
-#endif
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                           bzlib.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/winsup/bz2lib/bzlib.h b/winsup/bz2lib/bzlib.h
deleted file mode 100644
index c9447a295..000000000
--- a/winsup/bz2lib/bzlib.h
+++ /dev/null
@@ -1,319 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Public header file for the library.                   ---*/
-/*---                                               bzlib.h ---*/
-/*-------------------------------------------------------------*/
-
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
---*/
-
-
-#ifndef _BZLIB_H
-#define _BZLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BZ_RUN               0
-#define BZ_FLUSH             1
-#define BZ_FINISH            2
-
-#define BZ_OK                0
-#define BZ_RUN_OK            1
-#define BZ_FLUSH_OK          2
-#define BZ_FINISH_OK         3
-#define BZ_STREAM_END        4
-#define BZ_SEQUENCE_ERROR    (-1)
-#define BZ_PARAM_ERROR       (-2)
-#define BZ_MEM_ERROR         (-3)
-#define BZ_DATA_ERROR        (-4)
-#define BZ_DATA_ERROR_MAGIC  (-5)
-#define BZ_IO_ERROR          (-6)
-#define BZ_UNEXPECTED_EOF    (-7)
-#define BZ_OUTBUFF_FULL      (-8)
-#define BZ_CONFIG_ERROR      (-9)
-
-typedef 
-   struct {
-      char *next_in;
-      unsigned int avail_in;
-      unsigned int total_in_lo32;
-      unsigned int total_in_hi32;
-
-      char *next_out;
-      unsigned int avail_out;
-      unsigned int total_out_lo32;
-      unsigned int total_out_hi32;
-
-      void *state;
-
-      void *(*bzalloc)(void *,int,int);
-      void (*bzfree)(void *,void *);
-      void *opaque;
-   } 
-   bz_stream;
-
-
-#ifndef BZ_IMPORT
-#define BZ_EXPORT
-#endif
-
-#ifdef _WIN32
-#   include <stdio.h>
-#   include <windows.h>
-#   ifdef small
-      /* windows.h define small to char */
-#      undef small
-#   endif
-#   ifdef BZ_EXPORT
-#   define BZ_API(func) WINAPI func
-#   define BZ_EXTERN extern
-#   else
-   /* import windows dll dynamically */
-#   define BZ_API(func) (WINAPI * func)
-#   define BZ_EXTERN
-#   endif
-#else
-#   define BZ_API(func) func
-#   define BZ_EXTERN extern
-#endif
-
-
-/*-- Core (low-level) library functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( 
-      bz_stream* strm, 
-      int        blockSize100k, 
-      int        verbosity, 
-      int        workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompress) ( 
-      bz_stream* strm, 
-      int action 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( 
-      bz_stream *strm, 
-      int       verbosity, 
-      int       small
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( 
-      bz_stream *strm 
-   );
-
-
-
-/*-- High(er) level library functions --*/
-
-#ifndef BZ_NO_STDIO
-#define BZ_MAX_UNUSED 5000
-
-typedef void BZFILE;
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( 
-      int*  bzerror,   
-      FILE* f, 
-      int   verbosity, 
-      int   small,
-      void* unused,    
-      int   nUnused 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( 
-      int*    bzerror, 
-      BZFILE* b 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void**  unused,  
-      int*    nUnused 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzRead) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( 
-      int*  bzerror,      
-      FILE* f, 
-      int   blockSize100k, 
-      int   verbosity, 
-      int   workFactor 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWrite) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in, 
-      unsigned int* nbytes_out 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in_lo32, 
-      unsigned int* nbytes_in_hi32, 
-      unsigned int* nbytes_out_lo32, 
-      unsigned int* nbytes_out_hi32
-   );
-#endif
-
-
-/*-- Utility functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           blockSize100k, 
-      int           verbosity, 
-      int           workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           small, 
-      int           verbosity 
-   );
-
-
-/*--
-   Code contributed by Yoshioka Tsuneo
-   (QWF00133@niftyserve.or.jp/tsuneo-y@is.aist-nara.ac.jp),
-   to support better zlib compatibility.
-   This code is not _officially_ part of libbzip2 (yet);
-   I haven't tested it, documented it, or considered the
-   threading-safeness of it.
-   If this code breaks, please contact both Yoshioka and me.
---*/
-
-BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) (
-      void
-   );
-
-#ifndef BZ_NO_STDIO
-BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) (
-      const char *path,
-      const char *mode
-   );
-
-BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
-      int        fd,
-      const char *mode
-   );
-         
-BZ_EXTERN int BZ_API(BZ2_bzread) (
-      BZFILE* b, 
-      void* buf, 
-      int len 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzwrite) (
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzflush) (
-      BZFILE* b
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzclose) (
-      BZFILE* b
-   );
-
-BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
-      BZFILE *b, 
-      int    *errnum
-   );
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/*-------------------------------------------------------------*/
-/*--- end                                           bzlib.h ---*/
-/*-------------------------------------------------------------*/
diff --git a/winsup/bz2lib/bzlib_private.h b/winsup/bz2lib/bzlib_private.h
deleted file mode 100644
index fb51c7a1d..000000000
--- a/winsup/bz2lib/bzlib_private.h
+++ /dev/null
@@ -1,530 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Private header file for the library.                  ---*/
-/*---                                       bzlib_private.h ---*/
-/*-------------------------------------------------------------*/
-
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
---*/
-
-
-#ifndef _BZLIB_PRIVATE_H
-#define _BZLIB_PRIVATE_H
-
-#include <stdlib.h>
-
-#ifndef BZ_NO_STDIO
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#endif
-
-#include "bzlib.h"
-
-
-
-/*-- General stuff. --*/
-
-#define BZ_VERSION  "1.0.1, 23-June-2000"
-
-typedef char            Char;
-typedef unsigned char   Bool;
-typedef unsigned char   UChar;
-typedef int             Int32;
-typedef unsigned int    UInt32;
-typedef short           Int16;
-typedef unsigned short  UInt16;
-
-#define True  ((Bool)1)
-#define False ((Bool)0)
-
-#ifndef __GNUC__
-#define __inline__  /* */
-#endif 
-
-#ifndef BZ_NO_STDIO
-extern void BZ2_bz__AssertH__fail ( int errcode );
-#define AssertH(cond,errcode) \
-   { if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); }
-#if BZ_DEBUG
-#define AssertD(cond,msg) \
-   { if (!(cond)) {       \
-      fprintf ( stderr,   \
-        "\n\nlibbzip2(debug build): internal error\n\t%s\n", msg );\
-      exit(1); \
-   }}
-#else
-#define AssertD(cond,msg) /* */
-#endif
-#define VPrintf0(zf) \
-   fprintf(stderr,zf)
-#define VPrintf1(zf,za1) \
-   fprintf(stderr,zf,za1)
-#define VPrintf2(zf,za1,za2) \
-   fprintf(stderr,zf,za1,za2)
-#define VPrintf3(zf,za1,za2,za3) \
-   fprintf(stderr,zf,za1,za2,za3)
-#define VPrintf4(zf,za1,za2,za3,za4) \
-   fprintf(stderr,zf,za1,za2,za3,za4)
-#define VPrintf5(zf,za1,za2,za3,za4,za5) \
-   fprintf(stderr,zf,za1,za2,za3,za4,za5)
-#else
-extern void bz_internal_error ( int errcode );
-#define AssertH(cond,errcode) \
-   { if (!(cond)) bz_internal_error ( errcode ); }
-#define AssertD(cond,msg) /* */
-#define VPrintf0(zf) /* */
-#define VPrintf1(zf,za1) /* */
-#define VPrintf2(zf,za1,za2) /* */
-#define VPrintf3(zf,za1,za2,za3) /* */
-#define VPrintf4(zf,za1,za2,za3,za4) /* */
-#define VPrintf5(zf,za1,za2,za3,za4,za5) /* */
-#endif
-
-
-#define BZALLOC(nnn) (strm->bzalloc)(strm->opaque,(nnn),1)
-#define BZFREE(ppp)  (strm->bzfree)(strm->opaque,(ppp))
-
-
-/*-- Constants for the back end. --*/
-
-#define BZ_MAX_ALPHA_SIZE 258
-#define BZ_MAX_CODE_LEN    23
-
-#define BZ_RUNA 0
-#define BZ_RUNB 1
-
-#define BZ_N_GROUPS 6
-#define BZ_G_SIZE   50
-#define BZ_N_ITERS  4
-
-#define BZ_MAX_SELECTORS (2 + (900000 / BZ_G_SIZE))
-
-
-
-/*-- Stuff for randomising repetitive blocks. --*/
-
-extern Int32 BZ2_rNums[512];
-
-#define BZ_RAND_DECLS                          \
-   Int32 rNToGo;                               \
-   Int32 rTPos                                 \
-
-#define BZ_RAND_INIT_MASK                      \
-   s->rNToGo = 0;                              \
-   s->rTPos  = 0                               \
-
-#define BZ_RAND_MASK ((s->rNToGo == 1) ? 1 : 0)
-
-#define BZ_RAND_UPD_MASK                       \
-   if (s->rNToGo == 0) {                       \
-      s->rNToGo = BZ2_rNums[s->rTPos];         \
-      s->rTPos++;                              \
-      if (s->rTPos == 512) s->rTPos = 0;       \
-   }                                           \
-   s->rNToGo--;
-
-
-
-/*-- Stuff for doing CRCs. --*/
-
-extern UInt32 BZ2_crc32Table[256];
-
-#define BZ_INITIALISE_CRC(crcVar)              \
-{                                              \
-   crcVar = 0xffffffffL;                       \
-}
-
-#define BZ_FINALISE_CRC(crcVar)                \
-{                                              \
-   crcVar = ~(crcVar);                         \
-}
-
-#define BZ_UPDATE_CRC(crcVar,cha)              \
-{                                              \
-   crcVar = (crcVar << 8) ^                    \
-            BZ2_crc32Table[(crcVar >> 24) ^    \
-                           ((UChar)cha)];      \
-}
-
-
-
-/*-- States and modes for compression. --*/
-
-#define BZ_M_IDLE      1
-#define BZ_M_RUNNING   2
-#define BZ_M_FLUSHING  3
-#define BZ_M_FINISHING 4
-
-#define BZ_S_OUTPUT    1
-#define BZ_S_INPUT     2
-
-#define BZ_N_RADIX 2
-#define BZ_N_QSORT 12
-#define BZ_N_SHELL 18
-#define BZ_N_OVERSHOOT (BZ_N_RADIX + BZ_N_QSORT + BZ_N_SHELL + 2)
-
-
-
-
-/*-- Structure holding all the compression-side stuff. --*/
-
-typedef
-   struct {
-      /* pointer back to the struct bz_stream */
-      bz_stream* strm;
-
-      /* mode this stream is in, and whether inputting */
-      /* or outputting data */
-      Int32    mode;
-      Int32    state;
-
-      /* remembers avail_in when flush/finish requested */
-      UInt32   avail_in_expect;
-
-      /* for doing the block sorting */
-      UInt32*  arr1;
-      UInt32*  arr2;
-      UInt32*  ftab;
-      Int32    origPtr;
-
-      /* aliases for arr1 and arr2 */
-      UInt32*  ptr;
-      UChar*   block;
-      UInt16*  mtfv;
-      UChar*   zbits;
-
-      /* for deciding when to use the fallback sorting algorithm */
-      Int32    workFactor;
-
-      /* run-length-encoding of the input */
-      UInt32   state_in_ch;
-      Int32    state_in_len;
-      BZ_RAND_DECLS;
-
-      /* input and output limits and current posns */
-      Int32    nblock;
-      Int32    nblockMAX;
-      Int32    numZ;
-      Int32    state_out_pos;
-
-      /* map of bytes used in block */
-      Int32    nInUse;
-      Bool     inUse[256];
-      UChar    unseqToSeq[256];
-
-      /* the buffer for bit stream creation */
-      UInt32   bsBuff;
-      Int32    bsLive;
-
-      /* block and combined CRCs */
-      UInt32   blockCRC;
-      UInt32   combinedCRC;
-
-      /* misc administratium */
-      Int32    verbosity;
-      Int32    blockNo;
-      Int32    blockSize100k;
-
-      /* stuff for coding the MTF values */
-      Int32    nMTF;
-      Int32    mtfFreq    [BZ_MAX_ALPHA_SIZE];
-      UChar    selector   [BZ_MAX_SELECTORS];
-      UChar    selectorMtf[BZ_MAX_SELECTORS];
-
-      UChar    len     [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    code    [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    rfreq   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      /* second dimension: only 3 needed; 4 makes index calculations faster */
-      UInt32   len_pack[BZ_MAX_ALPHA_SIZE][4];
-
-   }
-   EState;
-
-
-
-/*-- externs for compression. --*/
-
-extern void 
-BZ2_blockSort ( EState* );
-
-extern void 
-BZ2_compressBlock ( EState*, Bool );
-
-extern void 
-BZ2_bsInitWrite ( EState* );
-
-extern void 
-BZ2_hbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 );
-
-extern void 
-BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 );
-
-
-
-/*-- states for decompression. --*/
-
-#define BZ_X_IDLE        1
-#define BZ_X_OUTPUT      2
-
-#define BZ_X_MAGIC_1     10
-#define BZ_X_MAGIC_2     11
-#define BZ_X_MAGIC_3     12
-#define BZ_X_MAGIC_4     13
-#define BZ_X_BLKHDR_1    14
-#define BZ_X_BLKHDR_2    15
-#define BZ_X_BLKHDR_3    16
-#define BZ_X_BLKHDR_4    17
-#define BZ_X_BLKHDR_5    18
-#define BZ_X_BLKHDR_6    19
-#define BZ_X_BCRC_1      20
-#define BZ_X_BCRC_2      21
-#define BZ_X_BCRC_3      22
-#define BZ_X_BCRC_4      23
-#define BZ_X_RANDBIT     24
-#define BZ_X_ORIGPTR_1   25
-#define BZ_X_ORIGPTR_2   26
-#define BZ_X_ORIGPTR_3   27
-#define BZ_X_MAPPING_1   28
-#define BZ_X_MAPPING_2   29
-#define BZ_X_SELECTOR_1  30
-#define BZ_X_SELECTOR_2  31
-#define BZ_X_SELECTOR_3  32
-#define BZ_X_CODING_1    33
-#define BZ_X_CODING_2    34
-#define BZ_X_CODING_3    35
-#define BZ_X_MTF_1       36
-#define BZ_X_MTF_2       37
-#define BZ_X_MTF_3       38
-#define BZ_X_MTF_4       39
-#define BZ_X_MTF_5       40
-#define BZ_X_MTF_6       41
-#define BZ_X_ENDHDR_2    42
-#define BZ_X_ENDHDR_3    43
-#define BZ_X_ENDHDR_4    44
-#define BZ_X_ENDHDR_5    45
-#define BZ_X_ENDHDR_6    46
-#define BZ_X_CCRC_1      47
-#define BZ_X_CCRC_2      48
-#define BZ_X_CCRC_3      49
-#define BZ_X_CCRC_4      50
-
-
-
-/*-- Constants for the fast MTF decoder. --*/
-
-#define MTFA_SIZE 4096
-#define MTFL_SIZE 16
-
-
-
-/*-- Structure holding all the decompression-side stuff. --*/
-
-typedef
-   struct {
-      /* pointer back to the struct bz_stream */
-      bz_stream* strm;
-
-      /* state indicator for this stream */
-      Int32    state;
-
-      /* for doing the final run-length decoding */
-      UChar    state_out_ch;
-      Int32    state_out_len;
-      Bool     blockRandomised;
-      BZ_RAND_DECLS;
-
-      /* the buffer for bit stream reading */
-      UInt32   bsBuff;
-      Int32    bsLive;
-
-      /* misc administratium */
-      Int32    blockSize100k;
-      Bool     smallDecompress;
-      Int32    currBlockNo;
-      Int32    verbosity;
-
-      /* for undoing the Burrows-Wheeler transform */
-      Int32    origPtr;
-      UInt32   tPos;
-      Int32    k0;
-      Int32    unzftab[256];
-      Int32    nblock_used;
-      Int32    cftab[257];
-      Int32    cftabCopy[257];
-
-      /* for undoing the Burrows-Wheeler transform (FAST) */
-      UInt32   *tt;
-
-      /* for undoing the Burrows-Wheeler transform (SMALL) */
-      UInt16   *ll16;
-      UChar    *ll4;
-
-      /* stored and calculated CRCs */
-      UInt32   storedBlockCRC;
-      UInt32   storedCombinedCRC;
-      UInt32   calculatedBlockCRC;
-      UInt32   calculatedCombinedCRC;
-
-      /* map of bytes used in block */
-      Int32    nInUse;
-      Bool     inUse[256];
-      Bool     inUse16[16];
-      UChar    seqToUnseq[256];
-
-      /* for decoding the MTF values */
-      UChar    mtfa   [MTFA_SIZE];
-      Int32    mtfbase[256 / MTFL_SIZE];
-      UChar    selector   [BZ_MAX_SELECTORS];
-      UChar    selectorMtf[BZ_MAX_SELECTORS];
-      UChar    len  [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-
-      Int32    limit  [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    base   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    perm   [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-      Int32    minLens[BZ_N_GROUPS];
-
-      /* save area for scalars in the main decompress code */
-      Int32    save_i;
-      Int32    save_j;
-      Int32    save_t;
-      Int32    save_alphaSize;
-      Int32    save_nGroups;
-      Int32    save_nSelectors;
-      Int32    save_EOB;
-      Int32    save_groupNo;
-      Int32    save_groupPos;
-      Int32    save_nextSym;
-      Int32    save_nblockMAX;
-      Int32    save_nblock;
-      Int32    save_es;
-      Int32    save_N;
-      Int32    save_curr;
-      Int32    save_zt;
-      Int32    save_zn; 
-      Int32    save_zvec;
-      Int32    save_zj;
-      Int32    save_gSel;
-      Int32    save_gMinlen;
-      Int32*   save_gLimit;
-      Int32*   save_gBase;
-      Int32*   save_gPerm;
-
-   }
-   DState;
-
-
-
-/*-- Macros for decompression. --*/
-
-#define BZ_GET_FAST(cccc)                     \
-    s->tPos = s->tt[s->tPos];                 \
-    cccc = (UChar)(s->tPos & 0xff);           \
-    s->tPos >>= 8;
-
-#define BZ_GET_FAST_C(cccc)                   \
-    c_tPos = c_tt[c_tPos];                    \
-    cccc = (UChar)(c_tPos & 0xff);            \
-    c_tPos >>= 8;
-
-#define SET_LL4(i,n)                                          \
-   { if (((i) & 0x1) == 0)                                    \
-        s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else    \
-        s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4);  \
-   }
-
-#define GET_LL4(i)                             \
-   ((((UInt32)(s->ll4[(i) >> 1])) >> (((i) << 2) & 0x4)) & 0xF)
-
-#define SET_LL(i,n)                          \
-   { s->ll16[i] = (UInt16)(n & 0x0000ffff);  \
-     SET_LL4(i, n >> 16);                    \
-   }
-
-#define GET_LL(i) \
-   (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
-
-#define BZ_GET_SMALL(cccc)                            \
-      cccc = BZ2_indexIntoF ( s->tPos, s->cftab );    \
-      s->tPos = GET_LL(s->tPos);
-
-
-/*-- externs for decompression. --*/
-
-extern Int32 
-BZ2_indexIntoF ( Int32, Int32* );
-
-extern Int32 
-BZ2_decompress ( DState* );
-
-extern void 
-BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
-                           Int32,  Int32, Int32 );
-
-
-#endif
-
-
-/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/
-
-#ifdef BZ_NO_STDIO
-#ifndef NULL
-#define NULL 0
-#endif
-#endif
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                   bzlib_private.h ---*/
-/*-------------------------------------------------------------*/
diff --git a/winsup/bz2lib/compress.c b/winsup/bz2lib/compress.c
deleted file mode 100644
index cc5e31d6f..000000000
--- a/winsup/bz2lib/compress.c
+++ /dev/null
@@ -1,714 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Compression machinery (not incl block sorting)        ---*/
-/*---                                            compress.c ---*/
-/*-------------------------------------------------------------*/
-
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
---*/
-
-/*--
-   CHANGES
-   ~~~~~~~
-   0.9.0 -- original version.
-
-   0.9.0a/b -- no changes in this file.
-
-   0.9.0c
-      * changed setting of nGroups in sendMTFValues() so as to 
-        do a bit better on small files
---*/
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------------*/
-/*--- Bit stream I/O                              ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-void BZ2_bsInitWrite ( EState* s )
-{
-   s->bsLive = 0;
-   s->bsBuff = 0;
-}
-
-
-/*---------------------------------------------------*/
-static
-void bsFinishWrite ( EState* s )
-{
-   while (s->bsLive > 0) {
-      s->zbits[s->numZ] = (UChar)(s->bsBuff >> 24);
-      s->numZ++;
-      s->bsBuff <<= 8;
-      s->bsLive -= 8;
-   }
-}
-
-
-/*---------------------------------------------------*/
-#define bsNEEDW(nz)                           \
-{                                             \
-   while (s->bsLive >= 8) {                   \
-      s->zbits[s->numZ]                       \
-         = (UChar)(s->bsBuff >> 24);          \
-      s->numZ++;                              \
-      s->bsBuff <<= 8;                        \
-      s->bsLive -= 8;                         \
-   }                                          \
-}
-
-
-/*---------------------------------------------------*/
-static
-__inline__
-void bsW ( EState* s, Int32 n, UInt32 v )
-{
-   bsNEEDW ( n );
-   s->bsBuff |= (v << (32 - s->bsLive - n));
-   s->bsLive += n;
-}
-
-
-/*---------------------------------------------------*/
-static
-void bsPutUInt32 ( EState* s, UInt32 u )
-{
-   bsW ( s, 8, (u >> 24) & 0xffL );
-   bsW ( s, 8, (u >> 16) & 0xffL );
-   bsW ( s, 8, (u >>  8) & 0xffL );
-   bsW ( s, 8,  u        & 0xffL );
-}
-
-
-/*---------------------------------------------------*/
-static
-void bsPutUChar ( EState* s, UChar c )
-{
-   bsW( s, 8, (UInt32)c );
-}
-
-
-/*---------------------------------------------------*/
-/*--- The back end proper                         ---*/
-/*---------------------------------------------------*/
-
-/*---------------------------------------------------*/
-static
-void makeMaps_e ( EState* s )
-{
-   Int32 i;
-   s->nInUse = 0;
-   for (i = 0; i < 256; i++)
-      if (s->inUse[i]) {
-         s->unseqToSeq[i] = s->nInUse;
-         s->nInUse++;
-      }
-}
-
-
-/*---------------------------------------------------*/
-static
-void generateMTFValues ( EState* s )
-{
-   UChar   yy[256];
-   Int32   i, j;
-   Int32   zPend;
-   Int32   wr;
-   Int32   EOB;
-
-   /* 
-      After sorting (eg, here),
-         s->arr1 [ 0 .. s->nblock-1 ] holds sorted order,
-         and
-         ((UChar*)s->arr2) [ 0 .. s->nblock-1 ] 
-         holds the original block data.
-
-      The first thing to do is generate the MTF values,
-      and put them in
-         ((UInt16*)s->arr1) [ 0 .. s->nblock-1 ].
-      Because there are strictly fewer or equal MTF values
-      than block values, ptr values in this area are overwritten
-      with MTF values only when they are no longer needed.
-
-      The final compressed bitstream is generated into the
-      area starting at
-         (UChar*) (&((UChar*)s->arr2)[s->nblock])
-
-      These storage aliases are set up in bzCompressInit(),
-      except for the last one, which is arranged in 
-      compressBlock().
-   */
-   UInt32* ptr   = s->ptr;
-   UChar* block  = s->block;
-   UInt16* mtfv  = s->mtfv;
-
-   makeMaps_e ( s );
-   EOB = s->nInUse+1;
-
-   for (i = 0; i <= EOB; i++) s->mtfFreq[i] = 0;
-
-   wr = 0;
-   zPend = 0;
-   for (i = 0; i < s->nInUse; i++) yy[i] = (UChar) i;
-
-   for (i = 0; i < s->nblock; i++) {
-      UChar ll_i;
-      AssertD ( wr <= i, "generateMTFValues(1)" );
-      j = ptr[i]-1; if (j < 0) j += s->nblock;
-      ll_i = s->unseqToSeq[block[j]];
-      AssertD ( ll_i < s->nInUse, "generateMTFValues(2a)" );
-
-      if (yy[0] == ll_i) { 
-         zPend++;
-      } else {
-
-         if (zPend > 0) {
-            zPend--;
-            while (True) {
-               if (zPend & 1) {
-                  mtfv[wr] = BZ_RUNB; wr++; 
-                  s->mtfFreq[BZ_RUNB]++; 
-               } else {
-                  mtfv[wr] = BZ_RUNA; wr++; 
-                  s->mtfFreq[BZ_RUNA]++; 
-               }
-               if (zPend < 2) break;
-               zPend = (zPend - 2) / 2;
-            };
-            zPend = 0;
-         }
-         {
-            register UChar  rtmp;
-            register UChar* ryy_j;
-            register UChar  rll_i;
-            rtmp  = yy[1];
-            yy[1] = yy[0];
-            ryy_j = &(yy[1]);
-            rll_i = ll_i;
-            while ( rll_i != rtmp ) {
-               register UChar rtmp2;
-               ryy_j++;
-               rtmp2  = rtmp;
-               rtmp   = *ryy_j;
-               *ryy_j = rtmp2;
-            };
-            yy[0] = rtmp;
-            j = ryy_j - &(yy[0]);
-            mtfv[wr] = j+1; wr++; s->mtfFreq[j+1]++;
-         }
-
-      }
-   }
-
-   if (zPend > 0) {
-      zPend--;
-      while (True) {
-         if (zPend & 1) {
-            mtfv[wr] = BZ_RUNB; wr++; 
-            s->mtfFreq[BZ_RUNB]++; 
-         } else {
-            mtfv[wr] = BZ_RUNA; wr++; 
-            s->mtfFreq[BZ_RUNA]++; 
-         }
-         if (zPend < 2) break;
-         zPend = (zPend - 2) / 2;
-      };
-      zPend = 0;
-   }
-
-   mtfv[wr] = EOB; wr++; s->mtfFreq[EOB]++;
-
-   s->nMTF = wr;
-}
-
-
-/*---------------------------------------------------*/
-#define BZ_LESSER_ICOST  0
-#define BZ_GREATER_ICOST 15
-
-static
-void sendMTFValues ( EState* s )
-{
-   Int32 v, t, i, j, gs, ge, totc, bt, bc, iter;
-   Int32 nSelectors, alphaSize, minLen, maxLen, selCtr;
-   Int32 nGroups, nBytes;
-
-   /*--
-   UChar  len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-   is a global since the decoder also needs it.
-
-   Int32  code[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-   Int32  rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
-   are also globals only used in this proc.
-   Made global to keep stack frame size small.
-   --*/
-
-
-   UInt16 cost[BZ_N_GROUPS];
-   Int32  fave[BZ_N_GROUPS];
-
-   UInt16* mtfv = s->mtfv;
-
-   if (s->verbosity >= 3)
-      VPrintf3( "      %d in block, %d after MTF & 1-2 coding, "
-                "%d+2 syms in use\n", 
-                s->nblock, s->nMTF, s->nInUse );
-
-   alphaSize = s->nInUse+2;
-   for (t = 0; t < BZ_N_GROUPS; t++)
-      for (v = 0; v < alphaSize; v++)
-         s->len[t][v] = BZ_GREATER_ICOST;
-
-   /*--- Decide how many coding tables to use ---*/
-   AssertH ( s->nMTF > 0, 3001 );
-   if (s->nMTF < 200)  nGroups = 2; else
-   if (s->nMTF < 600)  nGroups = 3; else
-   if (s->nMTF < 1200) nGroups = 4; else
-   if (s->nMTF < 2400) nGroups = 5; else
-                       nGroups = 6;
-
-   /*--- Generate an initial set of coding tables ---*/
-   { 
-      Int32 nPart, remF, tFreq, aFreq;
-
-      nPart = nGroups;
-      remF  = s->nMTF;
-      gs = 0;
-      while (nPart > 0) {
-         tFreq = remF / nPart;
-         ge = gs-1;
-         aFreq = 0;
-         while (aFreq < tFreq && ge < alphaSize-1) {
-            ge++;
-            aFreq += s->mtfFreq[ge];
-         }
-
-         if (ge > gs 
-             && nPart != nGroups && nPart != 1 
-             && ((nGroups-nPart) % 2 == 1)) {
-            aFreq -= s->mtfFreq[ge];
-            ge--;
-         }
-
-         if (s->verbosity >= 3)
-            VPrintf5( "      initial group %d, [%d .. %d], "
-                      "has %d syms (%4.1f%%)\n",
-                      nPart, gs, ge, aFreq, 
-                      (100.0 * (float)aFreq) / (float)(s->nMTF) );
- 
-         for (v = 0; v < alphaSize; v++)
-            if (v >= gs && v <= ge) 
-               s->len[nPart-1][v] = BZ_LESSER_ICOST; else
-               s->len[nPart-1][v] = BZ_GREATER_ICOST;
- 
-         nPart--;
-         gs = ge+1;
-         remF -= aFreq;
-      }
-   }
-
-   /*--- 
-      Iterate up to BZ_N_ITERS times to improve the tables.
-   ---*/
-   for (iter = 0; iter < BZ_N_ITERS; iter++) {
-
-      for (t = 0; t < nGroups; t++) fave[t] = 0;
-
-      for (t = 0; t < nGroups; t++)
-         for (v = 0; v < alphaSize; v++)
-            s->rfreq[t][v] = 0;
-
-      /*---
-        Set up an auxiliary length table which is used to fast-track
-	the common case (nGroups == 6). 
-      ---*/
-      if (nGroups == 6) {
-         for (v = 0; v < alphaSize; v++) {
-            s->len_pack[v][0] = (s->len[1][v] << 16) | s->len[0][v];
-            s->len_pack[v][1] = (s->len[3][v] << 16) | s->len[2][v];
-            s->len_pack[v][2] = (s->len[5][v] << 16) | s->len[4][v];
-	 }
-      }
-
-      nSelectors = 0;
-      totc = 0;
-      gs = 0;
-      while (True) {
-
-         /*--- Set group start & end marks. --*/
-         if (gs >= s->nMTF) break;
-         ge = gs + BZ_G_SIZE - 1; 
-         if (ge >= s->nMTF) ge = s->nMTF-1;
-
-         /*-- 
-            Calculate the cost of this group as coded
-            by each of the coding tables.
-         --*/
-         for (t = 0; t < nGroups; t++) cost[t] = 0;
-
-         if (nGroups == 6 && 50 == ge-gs+1) {
-            /*--- fast track the common case ---*/
-            register UInt32 cost01, cost23, cost45;
-            register UInt16 icv;
-            cost01 = cost23 = cost45 = 0;
-
-#           define BZ_ITER(nn)                \
-               icv = mtfv[gs+(nn)];           \
-               cost01 += s->len_pack[icv][0]; \
-               cost23 += s->len_pack[icv][1]; \
-               cost45 += s->len_pack[icv][2]; \
-
-            BZ_ITER(0);  BZ_ITER(1);  BZ_ITER(2);  BZ_ITER(3);  BZ_ITER(4);
-            BZ_ITER(5);  BZ_ITER(6);  BZ_ITER(7);  BZ_ITER(8);  BZ_ITER(9);
-            BZ_ITER(10); BZ_ITER(11); BZ_ITER(12); BZ_ITER(13); BZ_ITER(14);
-            BZ_ITER(15); BZ_ITER(16); BZ_ITER(17); BZ_ITER(18); BZ_ITER(19);
-            BZ_ITER(20); BZ_ITER(21); BZ_ITER(22); BZ_ITER(23); BZ_ITER(24);
-            BZ_ITER(25); BZ_ITER(26); BZ_ITER(27); BZ_ITER(28); BZ_ITER(29);
-            BZ_ITER(30); BZ_ITER(31); BZ_ITER(32); BZ_ITER(33); BZ_ITER(34);
-            BZ_ITER(35); BZ_ITER(36); BZ_ITER(37); BZ_ITER(38); BZ_ITER(39);
-            BZ_ITER(40); BZ_ITER(41); BZ_ITER(42); BZ_ITER(43); BZ_ITER(44);
-            BZ_ITER(45); BZ_ITER(46); BZ_ITER(47); BZ_ITER(48); BZ_ITER(49);
-
-#           undef BZ_ITER
-
-            cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16;
-            cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16;
-            cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
-
-         } else {
-	    /*--- slow version which correctly handles all situations ---*/
-            for (i = gs; i <= ge; i++) { 
-               UInt16 icv = mtfv[i];
-               for (t = 0; t < nGroups; t++) cost[t] += s->len[t][icv];
-            }
-         }
- 
-         /*-- 
-            Find the coding table which is best for this group,
-            and record its identity in the selector table.
-         --*/
-         bc = 999999999; bt = -1;
-         for (t = 0; t < nGroups; t++)
-            if (cost[t] < bc) { bc = cost[t]; bt = t; };
-         totc += bc;
-         fave[bt]++;
-         s->selector[nSelectors] = bt;
-         nSelectors++;
-
-         /*-- 
-            Increment the symbol frequencies for the selected table.
-          --*/
-         if (nGroups == 6 && 50 == ge-gs+1) {
-            /*--- fast track the common case ---*/
-
-#           define BZ_ITUR(nn) s->rfreq[bt][ mtfv[gs+(nn)] ]++
-
-            BZ_ITUR(0);  BZ_ITUR(1);  BZ_ITUR(2);  BZ_ITUR(3);  BZ_ITUR(4);
-            BZ_ITUR(5);  BZ_ITUR(6);  BZ_ITUR(7);  BZ_ITUR(8);  BZ_ITUR(9);
-            BZ_ITUR(10); BZ_ITUR(11); BZ_ITUR(12); BZ_ITUR(13); BZ_ITUR(14);
-            BZ_ITUR(15); BZ_ITUR(16); BZ_ITUR(17); BZ_ITUR(18); BZ_ITUR(19);
-            BZ_ITUR(20); BZ_ITUR(21); BZ_ITUR(22); BZ_ITUR(23); BZ_ITUR(24);
-            BZ_ITUR(25); BZ_ITUR(26); BZ_ITUR(27); BZ_ITUR(28); BZ_ITUR(29);
-            BZ_ITUR(30); BZ_ITUR(31); BZ_ITUR(32); BZ_ITUR(33); BZ_ITUR(34);
-            BZ_ITUR(35); BZ_ITUR(36); BZ_ITUR(37); BZ_ITUR(38); BZ_ITUR(39);
-            BZ_ITUR(40); BZ_ITUR(41); BZ_ITUR(42); BZ_ITUR(43); BZ_ITUR(44);
-            BZ_ITUR(45); BZ_ITUR(46); BZ_ITUR(47); BZ_ITUR(48); BZ_ITUR(49);
-
-#           undef BZ_ITUR
-
-         } else {
-	    /*--- slow version which correctly handles all situations ---*/
-            for (i = gs; i <= ge; i++)
-               s->rfreq[bt][ mtfv[i] ]++;
-         }
-
-         gs = ge+1;
-      }
-      if (s->verbosity >= 3) {
-         VPrintf2 ( "      pass %d: size is %d, grp uses are ", 
-                   iter+1, totc/8 );
-         for (t = 0; t < nGroups; t++)
-            VPrintf1 ( "%d ", fave[t] );
-         VPrintf0 ( "\n" );
-      }
-
-      /*--
-        Recompute the tables based on the accumulated frequencies.
-      --*/
-      for (t = 0; t < nGroups; t++)
-         BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]), 
-                                 alphaSize, 20 );
-   }
-
-
-   AssertH( nGroups < 8, 3002 );
-   AssertH( nSelectors < 32768 &&
-            nSelectors <= (2 + (900000 / BZ_G_SIZE)),
-            3003 );
-
-
-   /*--- Compute MTF values for the selectors. ---*/
-   {
-      UChar pos[BZ_N_GROUPS], ll_i, tmp2, tmp;
-      for (i = 0; i < nGroups; i++) pos[i] = i;
-      for (i = 0; i < nSelectors; i++) {
-         ll_i = s->selector[i];
-         j = 0;
-         tmp = pos[j];
-         while ( ll_i != tmp ) {
-            j++;
-            tmp2 = tmp;
-            tmp = pos[j];
-            pos[j] = tmp2;
-         };
-         pos[0] = tmp;
-         s->selectorMtf[i] = j;
-      }
-   };
-
-   /*--- Assign actual codes for the tables. --*/
-   for (t = 0; t < nGroups; t++) {
-      minLen = 32;
-      maxLen = 0;
-      for (i = 0; i < alphaSize; i++) {
-         if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
-         if (s->len[t][i] < minLen) minLen = s->len[t][i];
-      }
-      AssertH ( !(maxLen > 20), 3004 );
-      AssertH ( !(minLen < 1),  3005 );
-      BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]), 
-                          minLen, maxLen, alphaSize );
-   }
-
-   /*--- Transmit the mapping table. ---*/
-   { 
-      Bool inUse16[16];
-      for (i = 0; i < 16; i++) {
-          inUse16[i] = False;
-          for (j = 0; j < 16; j++)
-             if (s->inUse[i * 16 + j]) inUse16[i] = True;
-      }
-     
-      nBytes = s->numZ;
-      for (i = 0; i < 16; i++)
-         if (inUse16[i]) bsW(s,1,1); else bsW(s,1,0);
-
-      for (i = 0; i < 16; i++)
-         if (inUse16[i])
-            for (j = 0; j < 16; j++) {
-               if (s->inUse[i * 16 + j]) bsW(s,1,1); else bsW(s,1,0);
-            }
-
-      if (s->verbosity >= 3) 
-         VPrintf1( "      bytes: mapping %d, ", s->numZ-nBytes );
-   }
-
-   /*--- Now the selectors. ---*/
-   nBytes = s->numZ;
-   bsW ( s, 3, nGroups );
-   bsW ( s, 15, nSelectors );
-   for (i = 0; i < nSelectors; i++) { 
-      for (j = 0; j < s->selectorMtf[i]; j++) bsW(s,1,1);
-      bsW(s,1,0);
-   }
-   if (s->verbosity >= 3)
-      VPrintf1( "selectors %d, ", s->numZ-nBytes );
-
-   /*--- Now the coding tables. ---*/
-   nBytes = s->numZ;
-
-   for (t = 0; t < nGroups; t++) {
-      Int32 curr = s->len[t][0];
-      bsW ( s, 5, curr );
-      for (i = 0; i < alphaSize; i++) {
-         while (curr < s->len[t][i]) { bsW(s,2,2); curr++; /* 10 */ };
-         while (curr > s->len[t][i]) { bsW(s,2,3); curr--; /* 11 */ };
-         bsW ( s, 1, 0 );
-      }
-   }
-
-   if (s->verbosity >= 3)
-      VPrintf1 ( "code lengths %d, ", s->numZ-nBytes );
-
-   /*--- And finally, the block data proper ---*/
-   nBytes = s->numZ;
-   selCtr = 0;
-   gs = 0;
-   while (True) {
-      if (gs >= s->nMTF) break;
-      ge = gs + BZ_G_SIZE - 1; 
-      if (ge >= s->nMTF) ge = s->nMTF-1;
-      AssertH ( s->selector[selCtr] < nGroups, 3006 );
-
-      if (nGroups == 6 && 50 == ge-gs+1) {
-            /*--- fast track the common case ---*/
-            UInt16 mtfv_i;
-            UChar* s_len_sel_selCtr 
-               = &(s->len[s->selector[selCtr]][0]);
-            Int32* s_code_sel_selCtr
-               = &(s->code[s->selector[selCtr]][0]);
-
-#           define BZ_ITAH(nn)                      \
-               mtfv_i = mtfv[gs+(nn)];              \
-               bsW ( s,                             \
-                     s_len_sel_selCtr[mtfv_i],      \
-                     s_code_sel_selCtr[mtfv_i] )
-
-            BZ_ITAH(0);  BZ_ITAH(1);  BZ_ITAH(2);  BZ_ITAH(3);  BZ_ITAH(4);
-            BZ_ITAH(5);  BZ_ITAH(6);  BZ_ITAH(7);  BZ_ITAH(8);  BZ_ITAH(9);
-            BZ_ITAH(10); BZ_ITAH(11); BZ_ITAH(12); BZ_ITAH(13); BZ_ITAH(14);
-            BZ_ITAH(15); BZ_ITAH(16); BZ_ITAH(17); BZ_ITAH(18); BZ_ITAH(19);
-            BZ_ITAH(20); BZ_ITAH(21); BZ_ITAH(22); BZ_ITAH(23); BZ_ITAH(24);
-            BZ_ITAH(25); BZ_ITAH(26); BZ_ITAH(27); BZ_ITAH(28); BZ_ITAH(29);
-            BZ_ITAH(30); BZ_ITAH(31); BZ_ITAH(32); BZ_ITAH(33); BZ_ITAH(34);
-            BZ_ITAH(35); BZ_ITAH(36); BZ_ITAH(37); BZ_ITAH(38); BZ_ITAH(39);
-            BZ_ITAH(40); BZ_ITAH(41); BZ_ITAH(42); BZ_ITAH(43); BZ_ITAH(44);
-            BZ_ITAH(45); BZ_ITAH(46); BZ_ITAH(47); BZ_ITAH(48); BZ_ITAH(49);
-
-#           undef BZ_ITAH
-
-      } else {
-	 /*--- slow version which correctly handles all situations ---*/
-         for (i = gs; i <= ge; i++) {
-            bsW ( s, 
-                  s->len  [s->selector[selCtr]] [mtfv[i]],
-                  s->code [s->selector[selCtr]] [mtfv[i]] );
-         }
-      }
-
-
-      gs = ge+1;
-      selCtr++;
-   }
-   AssertH( selCtr == nSelectors, 3007 );
-
-   if (s->verbosity >= 3)
-      VPrintf1( "codes %d\n", s->numZ-nBytes );
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_compressBlock ( EState* s, Bool is_last_block )
-{
-   if (s->nblock > 0) {
-
-      BZ_FINALISE_CRC ( s->blockCRC );
-      s->combinedCRC = (s->combinedCRC << 1) | (s->combinedCRC >> 31);
-      s->combinedCRC ^= s->blockCRC;
-      if (s->blockNo > 1) s->numZ = 0;
-
-      if (s->verbosity >= 2)
-         VPrintf4( "    block %d: crc = 0x%8x, "
-                   "combined CRC = 0x%8x, size = %d\n",
-                   s->blockNo, s->blockCRC, s->combinedCRC, s->nblock );
-
-      BZ2_blockSort ( s );
-   }
-
-   s->zbits = (UChar*) (&((UChar*)s->arr2)[s->nblock]);
-
-   /*-- If this is the first block, create the stream header. --*/
-   if (s->blockNo == 1) {
-      BZ2_bsInitWrite ( s );
-      bsPutUChar ( s, 'B' );
-      bsPutUChar ( s, 'Z' );
-      bsPutUChar ( s, 'h' );
-      bsPutUChar ( s, (UChar)('0' + s->blockSize100k) );
-   }
-
-   if (s->nblock > 0) {
-
-      bsPutUChar ( s, 0x31 ); bsPutUChar ( s, 0x41 );
-      bsPutUChar ( s, 0x59 ); bsPutUChar ( s, 0x26 );
-      bsPutUChar ( s, 0x53 ); bsPutUChar ( s, 0x59 );
-
-      /*-- Now the block's CRC, so it is in a known place. --*/
-      bsPutUInt32 ( s, s->blockCRC );
-
-      /*-- 
-         Now a single bit indicating (non-)randomisation. 
-         As of version 0.9.5, we use a better sorting algorithm
-         which makes randomisation unnecessary.  So always set
-         the randomised bit to 'no'.  Of course, the decoder
-         still needs to be able to handle randomised blocks
-         so as to maintain backwards compatibility with
-         older versions of bzip2.
-      --*/
-      bsW(s,1,0);
-
-      bsW ( s, 24, s->origPtr );
-      generateMTFValues ( s );
-      sendMTFValues ( s );
-   }
-
-
-   /*-- If this is the last block, add the stream trailer. --*/
-   if (is_last_block) {
-
-      bsPutUChar ( s, 0x17 ); bsPutUChar ( s, 0x72 );
-      bsPutUChar ( s, 0x45 ); bsPutUChar ( s, 0x38 );
-      bsPutUChar ( s, 0x50 ); bsPutUChar ( s, 0x90 );
-      bsPutUInt32 ( s, s->combinedCRC );
-      if (s->verbosity >= 2)
-         VPrintf1( "    final combined CRC = 0x%x\n   ", s->combinedCRC );
-      bsFinishWrite ( s );
-   }
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                        compress.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/winsup/bz2lib/configure b/winsup/bz2lib/configure
deleted file mode 100755
index c45c7001c..000000000
--- a/winsup/bz2lib/configure
+++ /dev/null
@@ -1,1896 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=bzlib.h
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-ac_aux_dir=
-for ac_dir in `cd $srcdir/../..;pwd` $srcdir/`cd $srcdir/../..;pwd`; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in `cd $srcdir/../..;pwd` $srcdir/`cd $srcdir/../..;pwd`" 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:559: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:612: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:669: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-PACKAGE=libbz2
-
-VERSION=0.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:715: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:728: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:741: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:754: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:767: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:781: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-
-
-CPPFLAGS=-U_WIN32
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:820: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:841: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:867: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AR"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:899: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AR="ar"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:934: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="${ac_tool_prefix}nm"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_NM"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "nm", so it can be a program name with args.
-set dummy nm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:966: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="nm"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_NM" && ac_cv_prog_NM="nm"
-fi
-fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  NM="nm"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1001: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1033: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB="ranlib"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB="ranlib"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1068: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CC"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1100: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CC="gcc"
-fi
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1136: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1185: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1209: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-gstabs+ -O2"
-  else
-    CFLAGS="-O2"
-  fi
-  if test "$ac_test_CXXFLAGS" != set; then
-    CXXFLAGS='$(CFLAGS)'
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1251: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1304: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1319 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1336 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1353 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1384: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1389 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 1414 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 1432 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1453 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1488: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1493 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:1504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1521: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1526 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:1533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1552: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-echo "configure:1583: checking for object suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftest*
-echo 'int i = 1;' > conftest.$ac_ext
-if { (eval echo configure:1589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  for ac_file in conftest.*; do
-    case $ac_file in
-    *.c) ;;
-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
-    esac
-  done
-else
-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
-ac_objext=$ac_cv_objext
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@AR@%$AR%g
-s%@NM@%$NM%g
-s%@RANLIB@%$RANLIB%g
-s%@CC@%$CC%g
-s%@CPP@%$CPP%g
-s%@EXEEXT@%$EXEEXT%g
-s%@OBJEXT@%$OBJEXT%g
-s%@installdata@%$installdata%g
-s%@uninstalldata@%$uninstalldata%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/winsup/bz2lib/configure.in b/winsup/bz2lib/configure.in
deleted file mode 100644
index e65d0e2b6..000000000
--- a/winsup/bz2lib/configure.in
+++ /dev/null
@@ -1,65 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.13)
-
-AC_INIT(bzlib.h)
-AC_CONFIG_AUX_DIR(`cd $srcdir/../..;pwd`)
-AM_INIT_AUTOMAKE(libbz2, 0.0)
-AM_MAINTAINER_MODE
-
-# FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-# are probably using a cross compiler, which will not be able to fully
-# link an executable.  This should really be fixed in autoconf
-# itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-gstabs+ -O2"
-  else
-    CFLAGS="-O2"
-  fi
-  if test "$ac_test_CXXFLAGS" != set; then
-    CXXFLAGS='$(CFLAGS)'
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-CPPFLAGS=-U_WIN32
-AC_CANONICAL_HOST
-AC_CHECK_TOOL(AR, ar, ar)
-AC_CHECK_TOOL(NM, nm, nm)
-AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
-LIB_AC_PROG_CC
-AC_PROG_INSTALL
-AC_STDC_HEADERS
-AC_EXEEXT
-AC_OBJEXT
-
-AC_SUBST(installdata)dnl
-AC_SUBST(uninstalldata)dnl
-
-AC_OUTPUT([Makefile])
diff --git a/winsup/bz2lib/crctable.c b/winsup/bz2lib/crctable.c
deleted file mode 100644
index 61c040c4f..000000000
--- a/winsup/bz2lib/crctable.c
+++ /dev/null
@@ -1,144 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Table for doing CRCs                                  ---*/
-/*---                                            crctable.c ---*/
-/*-------------------------------------------------------------*/
-
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
---*/
-
-
-#include "bzlib_private.h"
-
-/*--
-  I think this is an implementation of the AUTODIN-II,
-  Ethernet & FDDI 32-bit CRC standard.  Vaguely derived
-  from code by Rob Warnock, in Section 51 of the
-  comp.compression FAQ.
---*/
-
-UInt32 BZ2_crc32Table[256] = {
-
-   /*-- Ugly, innit? --*/
-
-   0x00000000L, 0x04c11db7L, 0x09823b6eL, 0x0d4326d9L,
-   0x130476dcL, 0x17c56b6bL, 0x1a864db2L, 0x1e475005L,
-   0x2608edb8L, 0x22c9f00fL, 0x2f8ad6d6L, 0x2b4bcb61L,
-   0x350c9b64L, 0x31cd86d3L, 0x3c8ea00aL, 0x384fbdbdL,
-   0x4c11db70L, 0x48d0c6c7L, 0x4593e01eL, 0x4152fda9L,
-   0x5f15adacL, 0x5bd4b01bL, 0x569796c2L, 0x52568b75L,
-   0x6a1936c8L, 0x6ed82b7fL, 0x639b0da6L, 0x675a1011L,
-   0x791d4014L, 0x7ddc5da3L, 0x709f7b7aL, 0x745e66cdL,
-   0x9823b6e0L, 0x9ce2ab57L, 0x91a18d8eL, 0x95609039L,
-   0x8b27c03cL, 0x8fe6dd8bL, 0x82a5fb52L, 0x8664e6e5L,
-   0xbe2b5b58L, 0xbaea46efL, 0xb7a96036L, 0xb3687d81L,
-   0xad2f2d84L, 0xa9ee3033L, 0xa4ad16eaL, 0xa06c0b5dL,
-   0xd4326d90L, 0xd0f37027L, 0xddb056feL, 0xd9714b49L,
-   0xc7361b4cL, 0xc3f706fbL, 0xceb42022L, 0xca753d95L,
-   0xf23a8028L, 0xf6fb9d9fL, 0xfbb8bb46L, 0xff79a6f1L,
-   0xe13ef6f4L, 0xe5ffeb43L, 0xe8bccd9aL, 0xec7dd02dL,
-   0x34867077L, 0x30476dc0L, 0x3d044b19L, 0x39c556aeL,
-   0x278206abL, 0x23431b1cL, 0x2e003dc5L, 0x2ac12072L,
-   0x128e9dcfL, 0x164f8078L, 0x1b0ca6a1L, 0x1fcdbb16L,
-   0x018aeb13L, 0x054bf6a4L, 0x0808d07dL, 0x0cc9cdcaL,
-   0x7897ab07L, 0x7c56b6b0L, 0x71159069L, 0x75d48ddeL,
-   0x6b93dddbL, 0x6f52c06cL, 0x6211e6b5L, 0x66d0fb02L,
-   0x5e9f46bfL, 0x5a5e5b08L, 0x571d7dd1L, 0x53dc6066L,
-   0x4d9b3063L, 0x495a2dd4L, 0x44190b0dL, 0x40d816baL,
-   0xaca5c697L, 0xa864db20L, 0xa527fdf9L, 0xa1e6e04eL,
-   0xbfa1b04bL, 0xbb60adfcL, 0xb6238b25L, 0xb2e29692L,
-   0x8aad2b2fL, 0x8e6c3698L, 0x832f1041L, 0x87ee0df6L,
-   0x99a95df3L, 0x9d684044L, 0x902b669dL, 0x94ea7b2aL,
-   0xe0b41de7L, 0xe4750050L, 0xe9362689L, 0xedf73b3eL,
-   0xf3b06b3bL, 0xf771768cL, 0xfa325055L, 0xfef34de2L,
-   0xc6bcf05fL, 0xc27dede8L, 0xcf3ecb31L, 0xcbffd686L,
-   0xd5b88683L, 0xd1799b34L, 0xdc3abdedL, 0xd8fba05aL,
-   0x690ce0eeL, 0x6dcdfd59L, 0x608edb80L, 0x644fc637L,
-   0x7a089632L, 0x7ec98b85L, 0x738aad5cL, 0x774bb0ebL,
-   0x4f040d56L, 0x4bc510e1L, 0x46863638L, 0x42472b8fL,
-   0x5c007b8aL, 0x58c1663dL, 0x558240e4L, 0x51435d53L,
-   0x251d3b9eL, 0x21dc2629L, 0x2c9f00f0L, 0x285e1d47L,
-   0x36194d42L, 0x32d850f5L, 0x3f9b762cL, 0x3b5a6b9bL,
-   0x0315d626L, 0x07d4cb91L, 0x0a97ed48L, 0x0e56f0ffL,
-   0x1011a0faL, 0x14d0bd4dL, 0x19939b94L, 0x1d528623L,
-   0xf12f560eL, 0xf5ee4bb9L, 0xf8ad6d60L, 0xfc6c70d7L,
-   0xe22b20d2L, 0xe6ea3d65L, 0xeba91bbcL, 0xef68060bL,
-   0xd727bbb6L, 0xd3e6a601L, 0xdea580d8L, 0xda649d6fL,
-   0xc423cd6aL, 0xc0e2d0ddL, 0xcda1f604L, 0xc960ebb3L,
-   0xbd3e8d7eL, 0xb9ff90c9L, 0xb4bcb610L, 0xb07daba7L,
-   0xae3afba2L, 0xaafbe615L, 0xa7b8c0ccL, 0xa379dd7bL,
-   0x9b3660c6L, 0x9ff77d71L, 0x92b45ba8L, 0x9675461fL,
-   0x8832161aL, 0x8cf30badL, 0x81b02d74L, 0x857130c3L,
-   0x5d8a9099L, 0x594b8d2eL, 0x5408abf7L, 0x50c9b640L,
-   0x4e8ee645L, 0x4a4ffbf2L, 0x470cdd2bL, 0x43cdc09cL,
-   0x7b827d21L, 0x7f436096L, 0x7200464fL, 0x76c15bf8L,
-   0x68860bfdL, 0x6c47164aL, 0x61043093L, 0x65c52d24L,
-   0x119b4be9L, 0x155a565eL, 0x18197087L, 0x1cd86d30L,
-   0x029f3d35L, 0x065e2082L, 0x0b1d065bL, 0x0fdc1becL,
-   0x3793a651L, 0x3352bbe6L, 0x3e119d3fL, 0x3ad08088L,
-   0x2497d08dL, 0x2056cd3aL, 0x2d15ebe3L, 0x29d4f654L,
-   0xc5a92679L, 0xc1683bceL, 0xcc2b1d17L, 0xc8ea00a0L,
-   0xd6ad50a5L, 0xd26c4d12L, 0xdf2f6bcbL, 0xdbee767cL,
-   0xe3a1cbc1L, 0xe760d676L, 0xea23f0afL, 0xeee2ed18L,
-   0xf0a5bd1dL, 0xf464a0aaL, 0xf9278673L, 0xfde69bc4L,
-   0x89b8fd09L, 0x8d79e0beL, 0x803ac667L, 0x84fbdbd0L,
-   0x9abc8bd5L, 0x9e7d9662L, 0x933eb0bbL, 0x97ffad0cL,
-   0xafb010b1L, 0xab710d06L, 0xa6322bdfL, 0xa2f33668L,
-   0xbcb4666dL, 0xb8757bdaL, 0xb5365d03L, 0xb1f740b4L
-};
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                        crctable.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/winsup/bz2lib/decompress.c b/winsup/bz2lib/decompress.c
deleted file mode 100644
index cdced1889..000000000
--- a/winsup/bz2lib/decompress.c
+++ /dev/null
@@ -1,660 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Decompression machinery                               ---*/
-/*---                                          decompress.c ---*/
-/*-------------------------------------------------------------*/
-
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
---*/
-
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------------*/
-static
-void makeMaps_d ( DState* s )
-{
-   Int32 i;
-   s->nInUse = 0;
-   for (i = 0; i < 256; i++)
-      if (s->inUse[i]) {
-         s->seqToUnseq[s->nInUse] = i;
-         s->nInUse++;
-      }
-}
-
-
-/*---------------------------------------------------*/
-#define RETURN(rrr)                               \
-   { retVal = rrr; goto save_state_and_return; };
-
-#define GET_BITS(lll,vvv,nnn)                     \
-   case lll: s->state = lll;                      \
-   while (True) {                                 \
-      if (s->bsLive >= nnn) {                     \
-         UInt32 v;                                \
-         v = (s->bsBuff >>                        \
-             (s->bsLive-nnn)) & ((1 << nnn)-1);   \
-         s->bsLive -= nnn;                        \
-         vvv = v;                                 \
-         break;                                   \
-      }                                           \
-      if (s->strm->avail_in == 0) RETURN(BZ_OK);  \
-      s->bsBuff                                   \
-         = (s->bsBuff << 8) |                     \
-           ((UInt32)                              \
-              (*((UChar*)(s->strm->next_in))));   \
-      s->bsLive += 8;                             \
-      s->strm->next_in++;                         \
-      s->strm->avail_in--;                        \
-      s->strm->total_in_lo32++;                   \
-      if (s->strm->total_in_lo32 == 0)            \
-         s->strm->total_in_hi32++;                \
-   }
-
-#define GET_UCHAR(lll,uuu)                        \
-   GET_BITS(lll,uuu,8)
-
-#define GET_BIT(lll,uuu)                          \
-   GET_BITS(lll,uuu,1)
-
-/*---------------------------------------------------*/
-#define GET_MTF_VAL(label1,label2,lval)           \
-{                                                 \
-   if (groupPos == 0) {                           \
-      groupNo++;                                  \
-      if (groupNo >= nSelectors)                  \
-         RETURN(BZ_DATA_ERROR);                   \
-      groupPos = BZ_G_SIZE;                       \
-      gSel = s->selector[groupNo];                \
-      gMinlen = s->minLens[gSel];                 \
-      gLimit = &(s->limit[gSel][0]);              \
-      gPerm = &(s->perm[gSel][0]);                \
-      gBase = &(s->base[gSel][0]);                \
-   }                                              \
-   groupPos--;                                    \
-   zn = gMinlen;                                  \
-   GET_BITS(label1, zvec, zn);                    \
-   while (1) {                                    \
-      if (zn > 20 /* the longest code */)         \
-         RETURN(BZ_DATA_ERROR);                   \
-      if (zvec <= gLimit[zn]) break;              \
-      zn++;                                       \
-      GET_BIT(label2, zj);                        \
-      zvec = (zvec << 1) | zj;                    \
-   };                                             \
-   if (zvec - gBase[zn] < 0                       \
-       || zvec - gBase[zn] >= BZ_MAX_ALPHA_SIZE)  \
-      RETURN(BZ_DATA_ERROR);                      \
-   lval = gPerm[zvec - gBase[zn]];                \
-}
-
-
-/*---------------------------------------------------*/
-Int32 BZ2_decompress ( DState* s )
-{
-   UChar      uc;
-   Int32      retVal;
-   Int32      minLen, maxLen;
-   bz_stream* strm = s->strm;
-
-   /* stuff that needs to be saved/restored */
-   Int32  i;
-   Int32  j;
-   Int32  t;
-   Int32  alphaSize;
-   Int32  nGroups;
-   Int32  nSelectors;
-   Int32  EOB;
-   Int32  groupNo;
-   Int32  groupPos;
-   Int32  nextSym;
-   Int32  nblockMAX;
-   Int32  nblock;
-   Int32  es;
-   Int32  N;
-   Int32  curr;
-   Int32  zt;
-   Int32  zn; 
-   Int32  zvec;
-   Int32  zj;
-   Int32  gSel;
-   Int32  gMinlen;
-   Int32* gLimit;
-   Int32* gBase;
-   Int32* gPerm;
-
-   if (s->state == BZ_X_MAGIC_1) {
-      /*initialise the save area*/
-      s->save_i           = 0;
-      s->save_j           = 0;
-      s->save_t           = 0;
-      s->save_alphaSize   = 0;
-      s->save_nGroups     = 0;
-      s->save_nSelectors  = 0;
-      s->save_EOB         = 0;
-      s->save_groupNo     = 0;
-      s->save_groupPos    = 0;
-      s->save_nextSym     = 0;
-      s->save_nblockMAX   = 0;
-      s->save_nblock      = 0;
-      s->save_es          = 0;
-      s->save_N           = 0;
-      s->save_curr        = 0;
-      s->save_zt          = 0;
-      s->save_zn          = 0;
-      s->save_zvec        = 0;
-      s->save_zj          = 0;
-      s->save_gSel        = 0;
-      s->save_gMinlen     = 0;
-      s->save_gLimit      = NULL;
-      s->save_gBase       = NULL;
-      s->save_gPerm       = NULL;
-   }
-
-   /*restore from the save area*/
-   i           = s->save_i;
-   j           = s->save_j;
-   t           = s->save_t;
-   alphaSize   = s->save_alphaSize;
-   nGroups     = s->save_nGroups;
-   nSelectors  = s->save_nSelectors;
-   EOB         = s->save_EOB;
-   groupNo     = s->save_groupNo;
-   groupPos    = s->save_groupPos;
-   nextSym     = s->save_nextSym;
-   nblockMAX   = s->save_nblockMAX;
-   nblock      = s->save_nblock;
-   es          = s->save_es;
-   N           = s->save_N;
-   curr        = s->save_curr;
-   zt          = s->save_zt;
-   zn          = s->save_zn; 
-   zvec        = s->save_zvec;
-   zj          = s->save_zj;
-   gSel        = s->save_gSel;
-   gMinlen     = s->save_gMinlen;
-   gLimit      = s->save_gLimit;
-   gBase       = s->save_gBase;
-   gPerm       = s->save_gPerm;
-
-   retVal = BZ_OK;
-
-   switch (s->state) {
-
-      GET_UCHAR(BZ_X_MAGIC_1, uc);
-      if (uc != 'B') RETURN(BZ_DATA_ERROR_MAGIC);
-
-      GET_UCHAR(BZ_X_MAGIC_2, uc);
-      if (uc != 'Z') RETURN(BZ_DATA_ERROR_MAGIC);
-
-      GET_UCHAR(BZ_X_MAGIC_3, uc)
-      if (uc != 'h') RETURN(BZ_DATA_ERROR_MAGIC);
-
-      GET_BITS(BZ_X_MAGIC_4, s->blockSize100k, 8)
-      if (s->blockSize100k < '1' || 
-          s->blockSize100k > '9') RETURN(BZ_DATA_ERROR_MAGIC);
-      s->blockSize100k -= '0';
-
-      if (s->smallDecompress) {
-         s->ll16 = BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) );
-         s->ll4  = BZALLOC( 
-                      ((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar) 
-                   );
-         if (s->ll16 == NULL || s->ll4 == NULL) RETURN(BZ_MEM_ERROR);
-      } else {
-         s->tt  = BZALLOC( s->blockSize100k * 100000 * sizeof(Int32) );
-         if (s->tt == NULL) RETURN(BZ_MEM_ERROR);
-      }
-
-      GET_UCHAR(BZ_X_BLKHDR_1, uc);
-
-      if (uc == 0x17) goto endhdr_2;
-      if (uc != 0x31) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_2, uc);
-      if (uc != 0x41) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_3, uc);
-      if (uc != 0x59) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_4, uc);
-      if (uc != 0x26) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_5, uc);
-      if (uc != 0x53) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_BLKHDR_6, uc);
-      if (uc != 0x59) RETURN(BZ_DATA_ERROR);
-
-      s->currBlockNo++;
-      if (s->verbosity >= 2)
-         VPrintf1 ( "\n    [%d: huff+mtf ", s->currBlockNo );
- 
-      s->storedBlockCRC = 0;
-      GET_UCHAR(BZ_X_BCRC_1, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_BCRC_2, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_BCRC_3, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_BCRC_4, uc);
-      s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
-
-      GET_BITS(BZ_X_RANDBIT, s->blockRandomised, 1);
-
-      s->origPtr = 0;
-      GET_UCHAR(BZ_X_ORIGPTR_1, uc);
-      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
-      GET_UCHAR(BZ_X_ORIGPTR_2, uc);
-      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
-      GET_UCHAR(BZ_X_ORIGPTR_3, uc);
-      s->origPtr = (s->origPtr << 8) | ((Int32)uc);
-
-      if (s->origPtr < 0)
-         RETURN(BZ_DATA_ERROR);
-      if (s->origPtr > 10 + 100000*s->blockSize100k) 
-         RETURN(BZ_DATA_ERROR);
-
-      /*--- Receive the mapping table ---*/
-      for (i = 0; i < 16; i++) {
-         GET_BIT(BZ_X_MAPPING_1, uc);
-         if (uc == 1) 
-            s->inUse16[i] = True; else 
-            s->inUse16[i] = False;
-      }
-
-      for (i = 0; i < 256; i++) s->inUse[i] = False;
-
-      for (i = 0; i < 16; i++)
-         if (s->inUse16[i])
-            for (j = 0; j < 16; j++) {
-               GET_BIT(BZ_X_MAPPING_2, uc);
-               if (uc == 1) s->inUse[i * 16 + j] = True;
-            }
-      makeMaps_d ( s );
-      if (s->nInUse == 0) RETURN(BZ_DATA_ERROR);
-      alphaSize = s->nInUse+2;
-
-      /*--- Now the selectors ---*/
-      GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
-      if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
-      GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
-      if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
-      for (i = 0; i < nSelectors; i++) {
-         j = 0;
-         while (True) {
-            GET_BIT(BZ_X_SELECTOR_3, uc);
-            if (uc == 0) break;
-            j++;
-            if (j >= nGroups) RETURN(BZ_DATA_ERROR);
-         }
-         s->selectorMtf[i] = j;
-      }
-
-      /*--- Undo the MTF values for the selectors. ---*/
-      {
-         UChar pos[BZ_N_GROUPS], tmp, v;
-         for (v = 0; v < nGroups; v++) pos[v] = v;
-   
-         for (i = 0; i < nSelectors; i++) {
-            v = s->selectorMtf[i];
-            tmp = pos[v];
-            while (v > 0) { pos[v] = pos[v-1]; v--; }
-            pos[0] = tmp;
-            s->selector[i] = tmp;
-         }
-      }
-
-      /*--- Now the coding tables ---*/
-      for (t = 0; t < nGroups; t++) {
-         GET_BITS(BZ_X_CODING_1, curr, 5);
-         for (i = 0; i < alphaSize; i++) {
-            while (True) {
-               if (curr < 1 || curr > 20) RETURN(BZ_DATA_ERROR);
-               GET_BIT(BZ_X_CODING_2, uc);
-               if (uc == 0) break;
-               GET_BIT(BZ_X_CODING_3, uc);
-               if (uc == 0) curr++; else curr--;
-            }
-            s->len[t][i] = curr;
-         }
-      }
-
-      /*--- Create the Huffman decoding tables ---*/
-      for (t = 0; t < nGroups; t++) {
-         minLen = 32;
-         maxLen = 0;
-         for (i = 0; i < alphaSize; i++) {
-            if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
-            if (s->len[t][i] < minLen) minLen = s->len[t][i];
-         }
-         BZ2_hbCreateDecodeTables ( 
-            &(s->limit[t][0]), 
-            &(s->base[t][0]), 
-            &(s->perm[t][0]), 
-            &(s->len[t][0]),
-            minLen, maxLen, alphaSize
-         );
-         s->minLens[t] = minLen;
-      }
-
-      /*--- Now the MTF values ---*/
-
-      EOB      = s->nInUse+1;
-      nblockMAX = 100000 * s->blockSize100k;
-      groupNo  = -1;
-      groupPos = 0;
-
-      for (i = 0; i <= 255; i++) s->unzftab[i] = 0;
-
-      /*-- MTF init --*/
-      {
-         Int32 ii, jj, kk;
-         kk = MTFA_SIZE-1;
-         for (ii = 256 / MTFL_SIZE - 1; ii >= 0; ii--) {
-            for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
-               s->mtfa[kk] = (UChar)(ii * MTFL_SIZE + jj);
-               kk--;
-            }
-            s->mtfbase[ii] = kk + 1;
-         }
-      }
-      /*-- end MTF init --*/
-
-      nblock = 0;
-      GET_MTF_VAL(BZ_X_MTF_1, BZ_X_MTF_2, nextSym);
-
-      while (True) {
-
-         if (nextSym == EOB) break;
-
-         if (nextSym == BZ_RUNA || nextSym == BZ_RUNB) {
-
-            es = -1;
-            N = 1;
-            do {
-               if (nextSym == BZ_RUNA) es = es + (0+1) * N; else
-               if (nextSym == BZ_RUNB) es = es + (1+1) * N;
-               N = N * 2;
-               GET_MTF_VAL(BZ_X_MTF_3, BZ_X_MTF_4, nextSym);
-            }
-               while (nextSym == BZ_RUNA || nextSym == BZ_RUNB);
-
-            es++;
-            uc = s->seqToUnseq[ s->mtfa[s->mtfbase[0]] ];
-            s->unzftab[uc] += es;
-
-            if (s->smallDecompress)
-               while (es > 0) {
-                  if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
-                  s->ll16[nblock] = (UInt16)uc;
-                  nblock++;
-                  es--;
-               }
-            else
-               while (es > 0) {
-                  if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
-                  s->tt[nblock] = (UInt32)uc;
-                  nblock++;
-                  es--;
-               };
-
-            continue;
-
-         } else {
-
-            if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
-
-            /*-- uc = MTF ( nextSym-1 ) --*/
-            {
-               Int32 ii, jj, kk, pp, lno, off;
-               UInt32 nn;
-               nn = (UInt32)(nextSym - 1);
-
-               if (nn < MTFL_SIZE) {
-                  /* avoid general-case expense */
-                  pp = s->mtfbase[0];
-                  uc = s->mtfa[pp+nn];
-                  while (nn > 3) {
-                     Int32 z = pp+nn;
-                     s->mtfa[(z)  ] = s->mtfa[(z)-1];
-                     s->mtfa[(z)-1] = s->mtfa[(z)-2];
-                     s->mtfa[(z)-2] = s->mtfa[(z)-3];
-                     s->mtfa[(z)-3] = s->mtfa[(z)-4];
-                     nn -= 4;
-                  }
-                  while (nn > 0) { 
-                     s->mtfa[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--; 
-                  };
-                  s->mtfa[pp] = uc;
-               } else { 
-                  /* general case */
-                  lno = nn / MTFL_SIZE;
-                  off = nn % MTFL_SIZE;
-                  pp = s->mtfbase[lno] + off;
-                  uc = s->mtfa[pp];
-                  while (pp > s->mtfbase[lno]) { 
-                     s->mtfa[pp] = s->mtfa[pp-1]; pp--; 
-                  };
-                  s->mtfbase[lno]++;
-                  while (lno > 0) {
-                     s->mtfbase[lno]--;
-                     s->mtfa[s->mtfbase[lno]] 
-                        = s->mtfa[s->mtfbase[lno-1] + MTFL_SIZE - 1];
-                     lno--;
-                  }
-                  s->mtfbase[0]--;
-                  s->mtfa[s->mtfbase[0]] = uc;
-                  if (s->mtfbase[0] == 0) {
-                     kk = MTFA_SIZE-1;
-                     for (ii = 256 / MTFL_SIZE-1; ii >= 0; ii--) {
-                        for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
-                           s->mtfa[kk] = s->mtfa[s->mtfbase[ii] + jj];
-                           kk--;
-                        }
-                        s->mtfbase[ii] = kk + 1;
-                     }
-                  }
-               }
-            }
-            /*-- end uc = MTF ( nextSym-1 ) --*/
-
-            s->unzftab[s->seqToUnseq[uc]]++;
-            if (s->smallDecompress)
-               s->ll16[nblock] = (UInt16)(s->seqToUnseq[uc]); else
-               s->tt[nblock]   = (UInt32)(s->seqToUnseq[uc]);
-            nblock++;
-
-            GET_MTF_VAL(BZ_X_MTF_5, BZ_X_MTF_6, nextSym);
-            continue;
-         }
-      }
-
-      /* Now we know what nblock is, we can do a better sanity
-         check on s->origPtr.
-      */
-      if (s->origPtr < 0 || s->origPtr >= nblock)
-         RETURN(BZ_DATA_ERROR);
-
-      s->state_out_len = 0;
-      s->state_out_ch  = 0;
-      BZ_INITIALISE_CRC ( s->calculatedBlockCRC );
-      s->state = BZ_X_OUTPUT;
-      if (s->verbosity >= 2) VPrintf0 ( "rt+rld" );
-
-      /*-- Set up cftab to facilitate generation of T^(-1) --*/
-      s->cftab[0] = 0;
-      for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1];
-      for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1];
-
-      if (s->smallDecompress) {
-
-         /*-- Make a copy of cftab, used in generation of T --*/
-         for (i = 0; i <= 256; i++) s->cftabCopy[i] = s->cftab[i];
-
-         /*-- compute the T vector --*/
-         for (i = 0; i < nblock; i++) {
-            uc = (UChar)(s->ll16[i]);
-            SET_LL(i, s->cftabCopy[uc]);
-            s->cftabCopy[uc]++;
-         }
-
-         /*-- Compute T^(-1) by pointer reversal on T --*/
-         i = s->origPtr;
-         j = GET_LL(i);
-         do {
-            Int32 tmp = GET_LL(j);
-            SET_LL(j, i);
-            i = j;
-            j = tmp;
-         }
-            while (i != s->origPtr);
-
-         s->tPos = s->origPtr;
-         s->nblock_used = 0;
-         if (s->blockRandomised) {
-            BZ_RAND_INIT_MASK;
-            BZ_GET_SMALL(s->k0); s->nblock_used++;
-            BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; 
-         } else {
-            BZ_GET_SMALL(s->k0); s->nblock_used++;
-         }
-
-      } else {
-
-         /*-- compute the T^(-1) vector --*/
-         for (i = 0; i < nblock; i++) {
-            uc = (UChar)(s->tt[i] & 0xff);
-            s->tt[s->cftab[uc]] |= (i << 8);
-            s->cftab[uc]++;
-         }
-
-         s->tPos = s->tt[s->origPtr] >> 8;
-         s->nblock_used = 0;
-         if (s->blockRandomised) {
-            BZ_RAND_INIT_MASK;
-            BZ_GET_FAST(s->k0); s->nblock_used++;
-            BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; 
-         } else {
-            BZ_GET_FAST(s->k0); s->nblock_used++;
-         }
-
-      }
-
-      RETURN(BZ_OK);
-
-
-
-    endhdr_2:
-
-      GET_UCHAR(BZ_X_ENDHDR_2, uc);
-      if (uc != 0x72) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_3, uc);
-      if (uc != 0x45) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_4, uc);
-      if (uc != 0x38) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_5, uc);
-      if (uc != 0x50) RETURN(BZ_DATA_ERROR);
-      GET_UCHAR(BZ_X_ENDHDR_6, uc);
-      if (uc != 0x90) RETURN(BZ_DATA_ERROR);
-
-      s->storedCombinedCRC = 0;
-      GET_UCHAR(BZ_X_CCRC_1, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_CCRC_2, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_CCRC_3, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-      GET_UCHAR(BZ_X_CCRC_4, uc);
-      s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
-
-      s->state = BZ_X_IDLE;
-      RETURN(BZ_STREAM_END);
-
-      default: AssertH ( False, 4001 );
-   }
-
-   AssertH ( False, 4002 );
-
-   save_state_and_return:
-
-   s->save_i           = i;
-   s->save_j           = j;
-   s->save_t           = t;
-   s->save_alphaSize   = alphaSize;
-   s->save_nGroups     = nGroups;
-   s->save_nSelectors  = nSelectors;
-   s->save_EOB         = EOB;
-   s->save_groupNo     = groupNo;
-   s->save_groupPos    = groupPos;
-   s->save_nextSym     = nextSym;
-   s->save_nblockMAX   = nblockMAX;
-   s->save_nblock      = nblock;
-   s->save_es          = es;
-   s->save_N           = N;
-   s->save_curr        = curr;
-   s->save_zt          = zt;
-   s->save_zn          = zn;
-   s->save_zvec        = zvec;
-   s->save_zj          = zj;
-   s->save_gSel        = gSel;
-   s->save_gMinlen     = gMinlen;
-   s->save_gLimit      = gLimit;
-   s->save_gBase       = gBase;
-   s->save_gPerm       = gPerm;
-
-   return retVal;   
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                      decompress.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/winsup/bz2lib/dlltest.c b/winsup/bz2lib/dlltest.c
deleted file mode 100644
index f79279cef..000000000
--- a/winsup/bz2lib/dlltest.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*

-   minibz2

-      libbz2.dll test program.

-      by Yoshioka Tsuneo(QWF00133@nifty.ne.jp/tsuneo-y@is.aist-nara.ac.jp)

-      This file is Public Domain.

-      welcome any email to me.

-

-   usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]

-*/

-

-#define BZ_IMPORT

-#include <stdio.h>

-#include <stdlib.h>

-#include "bzlib.h"

-#ifdef _WIN32

-#include <io.h>

-#endif

-

-

-#ifdef _WIN32

-

-#define BZ2_LIBNAME "libbz2-1.0.0.DLL" 

-

-#include <windows.h>

-static int BZ2DLLLoaded = 0;

-static HINSTANCE BZ2DLLhLib;

-int BZ2DLLLoadLibrary(void)

-{

-   HINSTANCE hLib;

-

-   if(BZ2DLLLoaded==1){return 0;}

-   hLib=LoadLibrary(BZ2_LIBNAME);

-   if(hLib == NULL){

-      fprintf(stderr,"Can't load %s\n",BZ2_LIBNAME);

-      return -1;

-   }

-   BZ2_bzlibVersion=GetProcAddress(hLib,"BZ2_bzlibVersion");

-   BZ2_bzopen=GetProcAddress(hLib,"BZ2_bzopen");

-   BZ2_bzdopen=GetProcAddress(hLib,"BZ2_bzdopen");

-   BZ2_bzread=GetProcAddress(hLib,"BZ2_bzread");

-   BZ2_bzwrite=GetProcAddress(hLib,"BZ2_bzwrite");

-   BZ2_bzflush=GetProcAddress(hLib,"BZ2_bzflush");

-   BZ2_bzclose=GetProcAddress(hLib,"BZ2_bzclose");

-   BZ2_bzerror=GetProcAddress(hLib,"BZ2_bzerror");

-

-   if (!BZ2_bzlibVersion || !BZ2_bzopen || !BZ2_bzdopen

-       || !BZ2_bzread || !BZ2_bzwrite || !BZ2_bzflush

-       || !BZ2_bzclose || !BZ2_bzerror) {

-      fprintf(stderr,"GetProcAddress failed.\n");

-      return -1;

-   }

-   BZ2DLLLoaded=1;

-   BZ2DLLhLib=hLib;

-   return 0;

-

-}

-int BZ2DLLFreeLibrary(void)

-{

-   if(BZ2DLLLoaded==0){return 0;}

-   FreeLibrary(BZ2DLLhLib);

-   BZ2DLLLoaded=0;

-}

-#endif /* WIN32 */

-

-void usage(void)

-{

-   puts("usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]");

-}

-

-int main(int argc,char *argv[])

-{

-   int decompress = 0;

-   int level = 9;

-   char *fn_r = NULL;

-   char *fn_w = NULL;

-

-#ifdef _WIN32

-   if(BZ2DLLLoadLibrary()<0){

-      fprintf(stderr,"Loading of %s failed.  Giving up.\n", BZ2_LIBNAME);

-      exit(1);

-   }

-   printf("Loading of %s succeeded.  Library version is %s.\n",

-          BZ2_LIBNAME, BZ2_bzlibVersion() );

-#endif

-   while(++argv,--argc){

-      if(**argv =='-' || **argv=='/'){

-         char *p;

-

-         for(p=*argv+1;*p;p++){

-            if(*p=='d'){

-               decompress = 1;

-            }else if('1'<=*p && *p<='9'){

-               level = *p - '0';

-            }else{

-               usage();

-               exit(1);

-            }

-         }

-      }else{

-         break;

-      }

-   }

-   if(argc>=1){

-      fn_r = *argv;

-      argc--;argv++;

-   }else{

-      fn_r = NULL;

-   }

-   if(argc>=1){

-      fn_w = *argv;

-      argc--;argv++;

-   }else{

-      fn_w = NULL;

-   }

-   {

-      int len;

-      char buff[0x1000];

-      char mode[10];

-

-      if(decompress){

-         BZFILE *BZ2fp_r = NULL;

-         FILE *fp_w = NULL;

-

-         if(fn_w){

-            if((fp_w = fopen(fn_w,"wb"))==NULL){

-               printf("can't open [%s]\n",fn_w);

-               perror("reason:");

-               exit(1);

-            }

-         }else{

-            fp_w = stdout;

-         }

-         if((BZ2fp_r == NULL && (BZ2fp_r = BZ2_bzdopen(fileno(stdin),"rb"))==NULL)

-            || (BZ2fp_r != NULL && (BZ2fp_r = BZ2_bzopen(fn_r,"rb"))==NULL)){

-            printf("can't bz2openstream\n");

-            exit(1);

-         }

-         while((len=BZ2_bzread(BZ2fp_r,buff,0x1000))>0){

-            fwrite(buff,1,len,fp_w);

-         }

-         BZ2_bzclose(BZ2fp_r);

-         if(fp_w != stdout) fclose(fp_w);

-      }else{

-         BZFILE *BZ2fp_w = NULL;

-         FILE *fp_r = NULL;

-

-         if(fn_r){

-            if((fp_r = fopen(fn_r,"rb"))==NULL){

-               printf("can't open [%s]\n",fn_r);

-               perror("reason:");

-               exit(1);

-            }

-         }else{

-            fp_r = stdin;

-         }

-         mode[0]='w';

-         mode[1] = '0' + level;

-         mode[2] = '\0';

-

-         if((fn_w == NULL && (BZ2fp_w = BZ2_bzdopen(fileno(stdout),mode))==NULL)

-            || (fn_w !=NULL && (BZ2fp_w = BZ2_bzopen(fn_w,mode))==NULL)){

-            printf("can't bz2openstream\n");

-            exit(1);

-         }

-         while((len=fread(buff,1,0x1000,fp_r))>0){

-            BZ2_bzwrite(BZ2fp_w,buff,len);

-         }

-         BZ2_bzclose(BZ2fp_w);

-         if(fp_r!=stdin)fclose(fp_r);

-      }

-   }

-#ifdef _WIN32

-   BZ2DLLFreeLibrary();

-#endif

-   return 0;

-}

diff --git a/winsup/bz2lib/dlltest.dsp b/winsup/bz2lib/dlltest.dsp
deleted file mode 100644
index 4b1615edc..000000000
--- a/winsup/bz2lib/dlltest.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="dlltest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** �ҏW���Ȃ��ł������� **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=dlltest - Win32 Debug

-!MESSAGE ����͗L����Ҳ�̧�قł͂���܂���B ������ۼު�Ă�����ނ��邽�߂ɂ� NMAKE ���g�p���Ă��������B

-!MESSAGE [Ҳ�̧�ق̴���߰�] ����ނ��g�p���Ď��s���Ă�������

-!MESSAGE 

-!MESSAGE NMAKE /f "dlltest.mak".

-!MESSAGE 

-!MESSAGE NMAKE �̎��s���ɍ\�����w��ł��܂�

-!MESSAGE ����� ײݏ��ϸۂ̐ݒ���`���܂��B��:

-!MESSAGE 

-!MESSAGE NMAKE /f "dlltest.mak" CFG="dlltest - Win32 Debug"

-!MESSAGE 

-!MESSAGE �I���”\������� Ӱ��:

-!MESSAGE 

-!MESSAGE "dlltest - Win32 Release" ("Win32 (x86) Console Application" �p)

-!MESSAGE "dlltest - Win32 Debug" ("Win32 (x86) Console Application" �p)

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "dlltest - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x411 /d "NDEBUG"

-# ADD RSC /l 0x411 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"minibz2.exe"

-

-!ELSEIF  "$(CFG)" == "dlltest - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "dlltest_"

-# PROP BASE Intermediate_Dir "dlltest_"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "dlltest_"

-# PROP Intermediate_Dir "dlltest_"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x411 /d "_DEBUG"

-# ADD RSC /l 0x411 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"minibz2.exe" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "dlltest - Win32 Release"

-# Name "dlltest - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\bzlib.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\dlltest.c

-# End Source File

-# End Target

-# End Project

diff --git a/winsup/bz2lib/huffman.c b/winsup/bz2lib/huffman.c
deleted file mode 100644
index 9b446c4b3..000000000
--- a/winsup/bz2lib/huffman.c
+++ /dev/null
@@ -1,228 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Huffman coding low-level stuff                        ---*/
-/*---                                             huffman.c ---*/
-/*-------------------------------------------------------------*/
-
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
---*/
-
-
-#include "bzlib_private.h"
-
-/*---------------------------------------------------*/
-#define WEIGHTOF(zz0)  ((zz0) & 0xffffff00)
-#define DEPTHOF(zz1)   ((zz1) & 0x000000ff)
-#define MYMAX(zz2,zz3) ((zz2) > (zz3) ? (zz2) : (zz3))
-
-#define ADDWEIGHTS(zw1,zw2)                           \
-   (WEIGHTOF(zw1)+WEIGHTOF(zw2)) |                    \
-   (1 + MYMAX(DEPTHOF(zw1),DEPTHOF(zw2)))
-
-#define UPHEAP(z)                                     \
-{                                                     \
-   Int32 zz, tmp;                                     \
-   zz = z; tmp = heap[zz];                            \
-   while (weight[tmp] < weight[heap[zz >> 1]]) {      \
-      heap[zz] = heap[zz >> 1];                       \
-      zz >>= 1;                                       \
-   }                                                  \
-   heap[zz] = tmp;                                    \
-}
-
-#define DOWNHEAP(z)                                   \
-{                                                     \
-   Int32 zz, yy, tmp;                                 \
-   zz = z; tmp = heap[zz];                            \
-   while (True) {                                     \
-      yy = zz << 1;                                   \
-      if (yy > nHeap) break;                          \
-      if (yy < nHeap &&                               \
-          weight[heap[yy+1]] < weight[heap[yy]])      \
-         yy++;                                        \
-      if (weight[tmp] < weight[heap[yy]]) break;      \
-      heap[zz] = heap[yy];                            \
-      zz = yy;                                        \
-   }                                                  \
-   heap[zz] = tmp;                                    \
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_hbMakeCodeLengths ( UChar *len, 
-                             Int32 *freq,
-                             Int32 alphaSize,
-                             Int32 maxLen )
-{
-   /*--
-      Nodes and heap entries run from 1.  Entry 0
-      for both the heap and nodes is a sentinel.
-   --*/
-   Int32 nNodes, nHeap, n1, n2, i, j, k;
-   Bool  tooLong;
-
-   Int32 heap   [ BZ_MAX_ALPHA_SIZE + 2 ];
-   Int32 weight [ BZ_MAX_ALPHA_SIZE * 2 ];
-   Int32 parent [ BZ_MAX_ALPHA_SIZE * 2 ]; 
-
-   for (i = 0; i < alphaSize; i++)
-      weight[i+1] = (freq[i] == 0 ? 1 : freq[i]) << 8;
-
-   while (True) {
-
-      nNodes = alphaSize;
-      nHeap = 0;
-
-      heap[0] = 0;
-      weight[0] = 0;
-      parent[0] = -2;
-
-      for (i = 1; i <= alphaSize; i++) {
-         parent[i] = -1;
-         nHeap++;
-         heap[nHeap] = i;
-         UPHEAP(nHeap);
-      }
-
-      AssertH( nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001 );
-   
-      while (nHeap > 1) {
-         n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
-         n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
-         nNodes++;
-         parent[n1] = parent[n2] = nNodes;
-         weight[nNodes] = ADDWEIGHTS(weight[n1], weight[n2]);
-         parent[nNodes] = -1;
-         nHeap++;
-         heap[nHeap] = nNodes;
-         UPHEAP(nHeap);
-      }
-
-      AssertH( nNodes < (BZ_MAX_ALPHA_SIZE * 2), 2002 );
-
-      tooLong = False;
-      for (i = 1; i <= alphaSize; i++) {
-         j = 0;
-         k = i;
-         while (parent[k] >= 0) { k = parent[k]; j++; }
-         len[i-1] = j;
-         if (j > maxLen) tooLong = True;
-      }
-      
-      if (! tooLong) break;
-
-      for (i = 1; i < alphaSize; i++) {
-         j = weight[i] >> 8;
-         j = 1 + (j / 2);
-         weight[i] = j << 8;
-      }
-   }
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_hbAssignCodes ( Int32 *code,
-                         UChar *length,
-                         Int32 minLen,
-                         Int32 maxLen,
-                         Int32 alphaSize )
-{
-   Int32 n, vec, i;
-
-   vec = 0;
-   for (n = minLen; n <= maxLen; n++) {
-      for (i = 0; i < alphaSize; i++)
-         if (length[i] == n) { code[i] = vec; vec++; };
-      vec <<= 1;
-   }
-}
-
-
-/*---------------------------------------------------*/
-void BZ2_hbCreateDecodeTables ( Int32 *limit,
-                                Int32 *base,
-                                Int32 *perm,
-                                UChar *length,
-                                Int32 minLen,
-                                Int32 maxLen,
-                                Int32 alphaSize )
-{
-   Int32 pp, i, j, vec;
-
-   pp = 0;
-   for (i = minLen; i <= maxLen; i++)
-      for (j = 0; j < alphaSize; j++)
-         if (length[j] == i) { perm[pp] = j; pp++; };
-
-   for (i = 0; i < BZ_MAX_CODE_LEN; i++) base[i] = 0;
-   for (i = 0; i < alphaSize; i++) base[length[i]+1]++;
-
-   for (i = 1; i < BZ_MAX_CODE_LEN; i++) base[i] += base[i-1];
-
-   for (i = 0; i < BZ_MAX_CODE_LEN; i++) limit[i] = 0;
-   vec = 0;
-
-   for (i = minLen; i <= maxLen; i++) {
-      vec += (base[i+1] - base[i]);
-      limit[i] = vec-1;
-      vec <<= 1;
-   }
-   for (i = minLen + 1; i <= maxLen; i++)
-      base[i] = ((limit[i-1] + 1) << 1) - base[i];
-}
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                         huffman.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/winsup/bz2lib/libbz2.def b/winsup/bz2lib/libbz2.def
deleted file mode 100644
index 2dc0dd891..000000000
--- a/winsup/bz2lib/libbz2.def
+++ /dev/null
@@ -1,27 +0,0 @@
-LIBRARY			LIBBZ2

-DESCRIPTION		"libbzip2: library for data compression"

-EXPORTS

-	BZ2_bzCompressInit

-	BZ2_bzCompress

-	BZ2_bzCompressEnd

-	BZ2_bzDecompressInit

-	BZ2_bzDecompress

-	BZ2_bzDecompressEnd

-	BZ2_bzReadOpen

-	BZ2_bzReadClose

-	BZ2_bzReadGetUnused

-	BZ2_bzRead

-	BZ2_bzWriteOpen

-	BZ2_bzWrite

-	BZ2_bzWriteClose

-	BZ2_bzWriteClose64

-	BZ2_bzBuffToBuffCompress

-	BZ2_bzBuffToBuffDecompress

-	BZ2_bzlibVersion

-	BZ2_bzopen

-	BZ2_bzdopen

-	BZ2_bzread

-	BZ2_bzwrite

-	BZ2_bzflush

-	BZ2_bzclose

-	BZ2_bzerror

diff --git a/winsup/bz2lib/libbz2.dsp b/winsup/bz2lib/libbz2.dsp
deleted file mode 100644
index a21a20f75..000000000
--- a/winsup/bz2lib/libbz2.dsp
+++ /dev/null
@@ -1,130 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libbz2" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** �ҏW���Ȃ��ł������� **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=libbz2 - Win32 Debug

-!MESSAGE ����͗L����Ҳ�̧�قł͂���܂���B ������ۼު�Ă�����ނ��邽�߂ɂ� NMAKE ���g�p���Ă��������B

-!MESSAGE [Ҳ�̧�ق̴���߰�] ����ނ��g�p���Ď��s���Ă�������

-!MESSAGE 

-!MESSAGE NMAKE /f "libbz2.mak".

-!MESSAGE 

-!MESSAGE NMAKE �̎��s���ɍ\�����w��ł��܂�

-!MESSAGE ����� ײݏ��ϸۂ̐ݒ���`���܂��B��:

-!MESSAGE 

-!MESSAGE NMAKE /f "libbz2.mak" CFG="libbz2 - Win32 Debug"

-!MESSAGE 

-!MESSAGE �I���”\������� Ӱ��:

-!MESSAGE 

-!MESSAGE "libbz2 - Win32 Release" ("Win32 (x86) Dynamic-Link Library" �p)

-!MESSAGE "libbz2 - Win32 Debug" ("Win32 (x86) Dynamic-Link Library" �p)

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libbz2 - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD BASE RSC /l 0x411 /d "NDEBUG"

-# ADD RSC /l 0x411 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"libbz2.dll"

-

-!ELSEIF  "$(CFG)" == "libbz2 - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD BASE RSC /l 0x411 /d "_DEBUG"

-# ADD RSC /l 0x411 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"libbz2.dll" /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libbz2 - Win32 Release"

-# Name "libbz2 - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\blocksort.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\bzlib.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\bzlib.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\bzlib_private.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\compress.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\crctable.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\decompress.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\huffman.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\libbz2.def

-# End Source File

-# Begin Source File

-

-SOURCE=.\randtable.c

-# End Source File

-# End Target

-# End Project

diff --git a/winsup/bz2lib/makefile.msc b/winsup/bz2lib/makefile.msc
deleted file mode 100644
index 3fe42324a..000000000
--- a/winsup/bz2lib/makefile.msc
+++ /dev/null
@@ -1,63 +0,0 @@
-# Makefile for Microsoft Visual C++ 6.0

-# usage: nmake -f makefile.msc

-# K.M. Syring (syring@gsf.de)

-# Fixed up by JRS for bzip2-0.9.5d release.

-

-CC=cl

-CFLAGS= -DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64

-

-OBJS= blocksort.obj  \

-      huffman.obj    \

-      crctable.obj   \

-      randtable.obj  \

-      compress.obj   \

-      decompress.obj \

-      bzlib.obj

-

-all: lib bzip2 test

-

-bzip2: lib

-	$(CC) $(CFLAGS) -o bzip2 bzip2.c libbz2.lib setargv.obj

-	$(CC) $(CFLAGS) -o bzip2recover bzip2recover.c

-

-lib: $(OBJS)

-	lib /out:libbz2.lib $(OBJS)

-

-test: bzip2

-	type words1

-	.\\bzip2 -1  < sample1.ref > sample1.rb2

-	.\\bzip2 -2  < sample2.ref > sample2.rb2

-	.\\bzip2 -3  < sample3.ref > sample3.rb2

-	.\\bzip2 -d  < sample1.bz2 > sample1.tst

-	.\\bzip2 -d  < sample2.bz2 > sample2.tst

-	.\\bzip2 -ds < sample3.bz2 > sample3.tst

-	@echo All six of the fc's should find no differences.

-	@echo If fc finds an error on sample3.bz2, this could be

-	@echo because WinZip's 'TAR file smart CR/LF conversion'

-	@echo is too clever for its own good.  Disable this option.

-	@echo The correct size for sample3.ref is 120,244.  If it

-	@echo is 150,251, WinZip has messed it up.

-	fc sample1.bz2 sample1.rb2 

-	fc sample2.bz2 sample2.rb2

-	fc sample3.bz2 sample3.rb2

-	fc sample1.tst sample1.ref

-	fc sample2.tst sample2.ref

-	fc sample3.tst sample3.ref

-

-

-

-clean: 

-	del *.obj

-	del libbz2.lib 

-	del bzip2.exe

-	del bzip2recover.exe

-	del sample1.rb2 

-	del sample2.rb2 

-	del sample3.rb2

-	del sample1.tst 

-	del sample2.tst

-	del sample3.tst

-

-.c.obj: 

-	$(CC) $(CFLAGS) -c $*.c -o $*.obj

-

diff --git a/winsup/bz2lib/manual.ps b/winsup/bz2lib/manual.ps
deleted file mode 100644
index 1a7dbac85..000000000
--- a/winsup/bz2lib/manual.ps
+++ /dev/null
@@ -1,3808 +0,0 @@
-%!PS-Adobe-2.0
-%%Creator: dvips(k) 5.78 Copyright 1998 Radical Eye Software (www.radicaleye.com)
-%%Title: manual.dvi
-%%Pages: 39
-%%PageOrder: Ascend
-%%BoundingBox: 0 0 596 842
-%%EndComments
-%DVIPSCommandLine: dvips -o manual.ps manual.dvi
-%DVIPSParameters: dpi=600, compressed
-%DVIPSSource:  TeX output 2000.03.23:2343
-%%BeginProcSet: texc.pro
-%!
-/TeXDict 300 dict def TeXDict begin /N{def}def /B{bind def}N /S{exch}N
-/X{S N}B /TR{translate}N /isls false N /vsize 11 72 mul N /hsize 8.5 72
-mul N /landplus90{false}def /@rigin{isls{[0 landplus90{1 -1}{-1 1}
-ifelse 0 0 0]concat}if 72 Resolution div 72 VResolution div neg scale
-isls{landplus90{VResolution 72 div vsize mul 0 exch}{Resolution -72 div
-hsize mul 0}ifelse TR}if Resolution VResolution vsize -72 div 1 add mul
-TR[matrix currentmatrix{dup dup round sub abs 0.00001 lt{round}if}
-forall round exch round exch]setmatrix}N /@landscape{/isls true N}B
-/@manualfeed{statusdict /manualfeed true put}B /@copies{/#copies X}B
-/FMat[1 0 0 -1 0 0]N /FBB[0 0 0 0]N /nn 0 N /IE 0 N /ctr 0 N /df-tail{
-/nn 8 dict N nn begin /FontType 3 N /FontMatrix fntrx N /FontBBox FBB N
-string /base X array /BitMaps X /BuildChar{CharBuilder}N /Encoding IE N
-end dup{/foo setfont}2 array copy cvx N load 0 nn put /ctr 0 N[}B /df{
-/sf 1 N /fntrx FMat N df-tail}B /dfs{div /sf X /fntrx[sf 0 0 sf neg 0 0]
-N df-tail}B /E{pop nn dup definefont setfont}B /ch-width{ch-data dup
-length 5 sub get}B /ch-height{ch-data dup length 4 sub get}B /ch-xoff{
-128 ch-data dup length 3 sub get sub}B /ch-yoff{ch-data dup length 2 sub
-get 127 sub}B /ch-dx{ch-data dup length 1 sub get}B /ch-image{ch-data
-dup type /stringtype ne{ctr get /ctr ctr 1 add N}if}B /id 0 N /rw 0 N
-/rc 0 N /gp 0 N /cp 0 N /G 0 N /sf 0 N /CharBuilder{save 3 1 roll S dup
-/base get 2 index get S /BitMaps get S get /ch-data X pop /ctr 0 N ch-dx
-0 ch-xoff ch-yoff ch-height sub ch-xoff ch-width add ch-yoff
-setcachedevice ch-width ch-height true[1 0 0 -1 -.1 ch-xoff sub ch-yoff
-.1 sub]/id ch-image N /rw ch-width 7 add 8 idiv string N /rc 0 N /gp 0 N
-/cp 0 N{rc 0 ne{rc 1 sub /rc X rw}{G}ifelse}imagemask restore}B /G{{id
-gp get /gp gp 1 add N dup 18 mod S 18 idiv pl S get exec}loop}B /adv{cp
-add /cp X}B /chg{rw cp id gp 4 index getinterval putinterval dup gp add
-/gp X adv}B /nd{/cp 0 N rw exit}B /lsh{rw cp 2 copy get dup 0 eq{pop 1}{
-dup 255 eq{pop 254}{dup dup add 255 and S 1 and or}ifelse}ifelse put 1
-adv}B /rsh{rw cp 2 copy get dup 0 eq{pop 128}{dup 255 eq{pop 127}{dup 2
-idiv S 128 and or}ifelse}ifelse put 1 adv}B /clr{rw cp 2 index string
-putinterval adv}B /set{rw cp fillstr 0 4 index getinterval putinterval
-adv}B /fillstr 18 string 0 1 17{2 copy 255 put pop}for N /pl[{adv 1 chg}
-{adv 1 chg nd}{1 add chg}{1 add chg nd}{adv lsh}{adv lsh nd}{adv rsh}{
-adv rsh nd}{1 add adv}{/rc X nd}{1 add set}{1 add clr}{adv 2 chg}{adv 2
-chg nd}{pop nd}]dup{bind pop}forall N /D{/cc X dup type /stringtype ne{]
-}if nn /base get cc ctr put nn /BitMaps get S ctr S sf 1 ne{dup dup
-length 1 sub dup 2 index S get sf div put}if put /ctr ctr 1 add N}B /I{
-cc 1 add D}B /bop{userdict /bop-hook known{bop-hook}if /SI save N @rigin
-0 0 moveto /V matrix currentmatrix dup 1 get dup mul exch 0 get dup mul
-add .99 lt{/QV}{/RV}ifelse load def pop pop}N /eop{SI restore userdict
-/eop-hook known{eop-hook}if showpage}N /@start{userdict /start-hook
-known{start-hook}if pop /VResolution X /Resolution X 1000 div /DVImag X
-/IE 256 array N 2 string 0 1 255{IE S dup 360 add 36 4 index cvrs cvn
-put}for pop 65781.76 div /vsize X 65781.76 div /hsize X}N /p{show}N
-/RMat[1 0 0 -1 0 0]N /BDot 260 string N /rulex 0 N /ruley 0 N /v{/ruley
-X /rulex X V}B /V{}B /RV statusdict begin /product where{pop false[
-(Display)(NeXT)(LaserWriter 16/600)]{dup length product length le{dup
-length product exch 0 exch getinterval eq{pop true exit}if}{pop}ifelse}
-forall}{false}ifelse end{{gsave TR -.1 .1 TR 1 1 scale rulex ruley false
-RMat{BDot}imagemask grestore}}{{gsave TR -.1 .1 TR rulex ruley scale 1 1
-false RMat{BDot}imagemask grestore}}ifelse B /QV{gsave newpath transform
-round exch round exch itransform moveto rulex 0 rlineto 0 ruley neg
-rlineto rulex neg 0 rlineto fill grestore}B /a{moveto}B /delta 0 N /tail
-{dup /delta X 0 rmoveto}B /M{S p delta add tail}B /b{S p tail}B /c{-4 M}
-B /d{-3 M}B /e{-2 M}B /f{-1 M}B /g{0 M}B /h{1 M}B /i{2 M}B /j{3 M}B /k{
-4 M}B /w{0 rmoveto}B /l{p -4 w}B /m{p -3 w}B /n{p -2 w}B /o{p -1 w}B /q{
-p 1 w}B /r{p 2 w}B /s{p 3 w}B /t{p 4 w}B /x{0 S rmoveto}B /y{3 2 roll p
-a}B /bos{/SS save N}B /eos{SS restore}B end
-
-%%EndProcSet
-TeXDict begin 39158280 55380996 1000 600 600 (manual.dvi)
-@start
-%DVIPSBitmapFont: Fa cmti10 10.95 1
-/Fa 1 47 df<120FEA3FC0127FA212FFA31380EA7F00123C0A0A77891C>46
-D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fb cmbxti10 14.4 1
-/Fb 1 47 df<13FCEA03FF000F13804813C05AA25AA2B5FCA31480A214006C5A6C5A6C5A
-EA0FE0121271912B>46 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fc cmsl10 10.95 25
-/Fc 25 122 df<D901F8160CD907FE161ED91F07163E90263E0380157E017C6D15FC496C
-6CEC03F8D801F06DEC07F00003D900FCEC1FE04901EFEC7FC00007913AE3E007EF804901
-E0B5129F000F913A701FF83F0093C7127E48485E604D5A03F01303003F4A495A90C74A5A
-4D5A4DC7FC0201143E4B5B17FC4C5A003E4948485A4C5A003F01075C6C4A485A020E131F
-021E49C8FC6C6C48137E02385B3A07C0F001F82603E1E05B3A00FF8003E090263E000714
-7E90C73A0FC001FF80923A1F8007C1C0923A3F000F80E0033E90381F00F04B013E137003
-FC4913784A4801FC13384A485B913807E001DA0FC05BDB8003141CEC1F004A495A147E5C
-4948163C4948010F14384A5C495A130F4948167849C71570137E017C17F0494B13E01201
-4848EDC0014848020714C04848EE03804848160790C83903E00F00003E170E007E923801
-F03C486F6C5A48EE3FE00070EE0F803F4975C34C>37 D<EA0780EA0FE0EA1FF0123FA512
-1FEA0F301200A213701360A213E013C0120113801203EA07001206120E5A5A5A5A5A0C1C
-7A8919>44 D<EC07F8EC3FFF9138FC0FC0903903F003E0903907C001F0D90F8013F849C7
-FC013E14FC017E147C017C147E13FC485AA20003157F5B1207A2120F5BA2121F16FF5BA2
-123FA44848EB01FEA648C7EA03FCA5ED07F8A25A16F0A2150F16E0A3ED1FC0A21680007E
-143F1600157E123E003F5C4A5AD81F805B000FEB07E06C6C485A2603F03FC7FC3800FFFC
-EB1FE0283F79BC2D>48 D<157015F014011407143F903803FFE0137FEBFFCFEBF80F1300
-141F15C0A5143F1580A5147F1500A55C5CA513015CA513035CA513075CA5130F5CA3131F
-497EB612F8A31D3D78BC2D>I<133C137F5B481380A31400A26C5A137890C7FCB3EA0780
-EA0FE0121F123FA5121FEA0F601200A213E05BA212015B120390C7FC5A1206120E5A5A12
-3012705A5A11397AA619>59 D<EC7FC0903803FFF890380FC07E90383E003F496D7E01FF
-6D7E82A248140782A26C5A137890C7120FA25EA2EC03FF147F903807FF1FEB1FE0D97F80
-5B3801FE00EA03F8485A4848133F485A003F5D49EC81C048C7FCA2157F48ED03804814FF
-A2007F5B913903BF0700903880073F3A3FC00E1F8E260FE03C13FC3A03FFF00FF83A007F
-C003E02A2A7CA82D>97 D<EB3F80EA1FFFA3C6FC137FA291C9FCA55B5BA512015BA4EC07
-F80003EB3FFF9039F8F80FC09039FBE003E09039FF8001F891C77E5B4848147E49147F5B
-821780A2120F5B17C0A3167F001F16805BA4EEFF00123F5B4B5AA24B5A5E007F4A5AA24B
-5A6D495A4BC7FCD87CE0137E39F87001F839F03C07E039E00FFF80260003FCC8FC2A4077
-BE33>I<EC1FF0ECFFFE903903F01F8090390FC003C0D93F0013E0017E130F49131F0001
-15F04848EB3FE0485AA24848EB1FC0001FEC0F004990C7FC123FA2485AA412FF90C9FCA9
-6CEC0380150716006C6C5B151E001F5C6C6C5B6C6C5B6C6C485A3901F80F8026007FFEC7
-FCEB0FF0242A7AA828>I<EE03F8ED01FFA3ED000F1607A217F0A4160FA217E0A4161FA2
-17C0A491380FF03FECFFFC902603F81F138090390FC007BF90391F8003FF90387E000149
-7F0001157F48481500485A120F5B001F5D485A5E5B127FA2150112FF90C75BA41503A25E
-A37E1507A26C4A5A7F001F141F6C6C133F6C6CEBFFF83B03F001EFFFC03900F80F8F9038
-3FFE0FD90FF0EBE0002D407ABE33>I<EC3FE0903801FFF8903807E07E90380F801F9039
-3F000F80017E14C049EB07E0485A12034848EB03F0485AA2121F5B123FA248481307A290
-B6FCA2D8FF80C8FC90C9FCA87EED01C015036C15806D1307001FEC0F006D131E000F5C6C
-6C5B6C6C485A3900FC07C0D93FFFC7FCEB07F8242A7BA828>I<ED07F0ED3FFCEDFC1E91
-3803F03F4A48B4FC4A481380141FEC3F81DA7F0113008102FE137C93C7FCA213015CA513
-035CA50007B512F8A3260007F0C8FCA3130F5CA5131F5CA5133F5CA5137F91C9FCA55B5B
-A4EA03FF007F13FEB5FCA229407DBF1C>I<147FEB3FFFA313017FA25CA513015CA51303
-5CA4ED07F80107EB1FFF9139F0781FC09138F1E00F9139F38007E0ECF70002FE14F0495A
-5CA25CA24A130F131F4A14E0A4161F133F4A14C0A4163F137F91C71380A4167F5B491500
-A300015D486C491380B5D8F87F13FCA32E3F7DBE33>104 D<1478EB01FE130314FFA25B
-14FE130314FCEB00F01400ACEB03F8EA01FF14F0A2EA001F130FA314E0A5131F14C0A513
-3F1480A5137F1400A55B5BA4EA03FF007F13F0A2B5FC183E7DBD1A>I<143FEB1FFF5BA2
-13017FA214FEA5130114FCA5130314F8A5130714F0A5130F14E0A5131F14C0A5133F1480
-A5137F1400A55B5BA4EA03FF007F13F8A2B5FC183F7DBE1A>108
-D<902707F007F8EB03FCD803FFD91FFF90380FFF80913CE0781FC03C0FE09126E1E00FEB
-F0073E001FE38007E1C003F090260FE700EBE38002EEDAF70013F802FC14FE02D85C14F8
-4A5CA24A5C011F020F14074A4A14F0A5013F021F140F4A4A14E0A5017F023F141F91C749
-14C0A549027F143F4992C71380A300014B147F486C496DEBFFC0B5D8F87FD9FC3F13FEA3
-47287DA74C>I<903907F007F8D803FFEB1FFF9139E0781FC09138E1E00F3B001FE38007
-E090380FE70002EE14F014FC14D814F85CA24A130F131F4A14E0A4161F133F4A14C0A416
-3F137F91C71380A4167F5B491500A300015D486C491380B5D8F87F13FCA32E287DA733>
-I<EC0FF0ECFFFE903903F01F8090390FC007C049C66C7E013E6D7E01FC6D7E4848804914
-7C0003157E485A000F157F5B121FA2485AA2007F1680A2170048C85AA54B5AA25E5A6C4A
-5A7E4B5A5E6C140F6C6C5C4B5A6C6C013EC7FC6C6C5B6C6C485A3900FC0FE090383FFF80
-D90FF8C8FC292A7BA82D>I<91387F01FE903A7FFF0FFFC09139FE3E03F09238F801F890
-3A01FFE000FE4B137F6D497F4990C713804A15C04A141FA218E0A20103150F5C18F0A317
-1F010716E05CA3173F18C0130F4A147F1880A2EFFF004C5A011F5D16034C5A6E495AEE1F
-C06E495AD93FDC017EC7FC91388F01F8913883FFE0028090C8FC92C9FC137FA291CAFCA4
-5BA25BA31201487EB512F8A3343A81A733>I<903907F01F80D803FFEB7FE09138E1E1F0
-9138E387F839001FE707EB0FE614EE02FC13F002D813E09138F801804AC7FCA25C131FA2
-5CA4133F5CA5137F91C8FCA55B5BA31201487EB512FEA325287EA724>114
-D<9138FF81C0010713E390381F807F90397C003F8049131F4848130F5B00031407A24848
-1400A27FA27F6D90C7FCEBFF8014FC6C13FF6C14C015F06C6C7F011F7F13079038007FFE
-1403140100381300157EA2123C153E157E007C147CA2007E147815F8007F495A4A5A486C
-485A26F9E01FC7FC38E0FFFC38C01FE0222A7DA824>I<EB0380A4130791C7FCA25BA25B
-A2133EA2137E13FE12011207001FB512C0B6FCA2D801FCC7FCA312035BA512075BA5120F
-5BA41407001F130E13C0A4141E141C1380A26D5AA2000F5B14F03807E1E03801FF80D800
-7EC7FC1A3978B723>I<01FE147F00FFEC7FFF4914FEA20007140300031401A34914FCA4
-150312074914F8A41507120F4914F0A4150F121F4914E0A2151FA3153F4914C0157F15FF
-EC01DF3A0FC003BFE09138073FFF3803F01E3801FFF826003FE01380282977A733>I<B5
-39E007FFF05D17E02707FE000313006C48EB01FC6F5A5E00014A5A5EA24B5A6D13070000
-92C7FC5D150E6D5B7F5DA25D1480013F5B14815D14C3011F5B02C7C8FCA214CE14EEEB0F
-FCA25CA26D5A5CA25CA26D5A2C2878A630>I<B500C3B53803FFFCA204FE14F8290FFE00
-3FE00013C0D807F86D48EB7F000003173E183C150F18386D5E0001141F705B153F4D5A15
-776D4B5A0000ECE7F04DC7FCEC01C3170E9038FF0383017F5D91380703F85FEC0E01021E
-5CD93F9C14F002BC6D5A02B813FDDAF8005B4A13FF5F6D5A94C8FC5C4A137E167C6DC7FC
-1678010E14383E2878A642>I<90B539E007FFF05E18E0902707FE000313006D48EB01FC
-705A5F01014A5A5F16036E5C0100140794C7FC160E805E805E1678ED8070023F13F05EED
-81C015C191381FC38015C793C8FC15EF15EEEC0FFCA25DA26E5AA25DA26E5A5DA24AC9FC
-5C140E141E141C5C121C003F5B5A485B495A130300FE5B4848CAFCEA701EEA783CEA3FF0
-EA0FC0343A80A630>121 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fd cmtt12 14.4 10
-/Fd 10 123 df<EC3FF80103B57E010F14E0013F14F84914FE48B7FC4816C048D9C01F7F
-270FFE00017F49EB007FD81FF0EC1FF848486E7E160748486E7E4914018300FF81A26D16
-80177FA36C5AA26CC9FCCAFCA217FF1800A25E5F16035F16075F160F4C5A163F4C5A5F4C
-5A4B90C7FCED07FE4B5A4B5A4B5A4B5A4B5A4A5B4A90C8FCEC0FFE4A5AEC3FF04A5A4A5A
-495B4990C9FCEB0FFC495A495A495A4948143F485B4890C8EA7F80EA0FFC485A48B8FC5A
-B9FCA36C17007E314A7AC93E>50 D<383FFF805AB57EA37E7EEA003FAEED07FC92383FFF
-8092B512E002C314F802CF8002DF8091B7FCDBF80F1380DBC00113C092C713E04A143F4A
-EC1FF04A15F84A140F4AEC07FCA217034A15FE1701A318FF83A95F18FEA280170318FC6E
-140718F86E140FEF1FF06E143F6EEC7FE06EECFFC0DBC0031380EDF01F92B6120002DF14
-FC02CF5C02C35CD91F8114C090260F807F90C7FC90C7EA0FF8384A7FC83E>98
-D<923803FFF85D4B7FA38181ED0003AEEC1FF0ECFFFE0103EBFF83010F14E34914F3017F
-14FB90B7FC48EBF80F48EBC00191C7FC4848143F4848141F5B4848140F491407123F4914
-03127F5BA312FF90C8FCA97F127FA216077F123F6D140FA26C6C141F6D143F000F157F6C
-6C14FF01FF5B6C6D5A6CD9F01FEBFFFC6C90B500FB13FE6D02F313FF6D14E3010F14C36D
-020113FE010101FC14FC9026003FE0C8FC384A7CC83E>100 D<143E147F4A7E497FA56D
-5B6EC8FC143E91C9FCAC003FB57E5A81A47EC7123FB3B3007FB71280B812C0A56C16802A
-4A76C93E>105 D<007FB512C0B6FC81A47EC7121FB3B3B3A5007FB712F8B812FCA56C16
-F82E4978C83E>108 D<EC1FF0ECFFFE01036D7E010F14E04980017F14FC90B67E489038
-F01FFFECC00748D90001138048486D13C04848EC7FE049143F4848EC1FF049140F003F16
-F8491407A24848EC03FCA448C8EA01FEAA6D1403007F16FCA26D1407A2003F16F86D140F
-6C6CEC1FF0A26C6CEC3FE06D147F6C6CECFFC06D5B6CD9C00713806CD9F01F13006C90B5
-5A6D5C6D5C010F14E001031480010049C7FCEC1FF02F3679B43E>111
-D<ED07FC3B3FFF803FFF804891B512E0B500C314F802CF8002DF806C90B7FC6CDAF80F13
-80D8003FD9C00113C092C713E04A143F4AEC1FF04A15F84A140F4AEC07FCA217034A15FE
-1701A318FF83A95F18FEA280170318FC6E140718F86E140FEF1FF06E143F6EEC7FE06EEC
-FFC0DBC0031380EDF01F92B6120002DF14FC02CF5C02C35C02C114C0DAC07F90C7FCED0F
-F892C9FCB3003FB512C04880B67EA36C5C6C5C384F7FB33E>I<903901FFF00F011F9038
-FE1F8090B612BF000315FF5A5A5A393FFE003F01F01307D87FC0130190C8FC5A48157FA4
-7EEE3F00D87FC091C7FC13F0EA3FFE381FFFF06CEBFFC06C14FE6C6E7EC615E0013F14F8
-010780D9003F7F02007F03071380030013C0003EED3FE0007F151F48150F17F06D1407A3
-7FA26D140F6D15E0161F01FCEC3FC06D14FF9026FFC00F138091B612005E485D013F5C6D
-14E0D8FC0714802778007FF8C7FC2C3677B43E>115 D<147C14FC497EAD003FB712FC5A
-B87EA36C5EA2260001FEC9FCB3A6173FA2EF7F80A76E14FF6D16006F5A9238C007FE9138
-7FF01F92B55A6E5C6E5C6E5C6E1480020149C7FC9138003FF031437DC13E>I<000FB812
-804817C04817E0A418C001C0C712014C13804C1300EE1FFE4C5AEE7FF06C484A5A4B5BC8
-485B4B90C7FC4B5A4B5A4B5A4B5A4B5A4A5B4A5B4A90C8FC4A5A4A5A4A5A4A5A4A5A495B
-495B4990C9FC495A495A4948EC0FC0495A4948EC1FE0485B00075B4890C8FCEA1FFC485A
-485A90B8FCB9FCA46C17C07E33337CB23E>122 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fe cmtt12 13.14 31
-/Fe 31 123 df<ECFFE0010713FC011FEBFF80017F14E048B67E48814815FE489038007F
-FF01F8130748480101138048489038007FC049EC3FE04848141F90C8120F17F048150717
-F87F1603A36CC8FC123EC9FCA2160717F0A2160F17E0161F17C0163FEE7F80A2EEFF004B
-5A15034B5A4B5A4B5AED7FE04B5A4A5B4A90C7FC4A5AEC1FF84A5A4A5A4A5A495BD907FE
-C8FC495A495A495A495A2601FF80EB01F04890C7EA03F8485A485A485A48B7FC5AB8FCA3
-7E6C16F02D447BC338>50 D<003FB6FC4815E0B712F882826C816C16802701FC000113C0
-9238007FE0161FEE0FF0A2160717F81603A6160717F0A2160FEE1FE0163FEE7FC0923801
-FF80030F130090B65A5E16F08216FEEEFF8017C001FCC7EA7FE0EE1FF0EE07F8160317FC
-EE01FE1600A217FF177FA717FF17FE16011603EE07FC160FEE3FF8EEFFF0003FB7FC4816
-E0B812C01780EEFE006C15F86C15C030437DC238>66 D<DA07FC133C91393FFF807E91B5
-12E00103ECF8FE4914FC4914FF5B90383FFE0390387FF000D9FFC0133F4849131F91C712
-0F48481407485A49140348481401A2485AA248481400A25BA2007F167C90CAFCA35A5AAD
-7E7EA37F003F167C17FE7FA26C7EA26C6C140117FC6C7E6D14036C6C15F86C6C14076EEB
-0FF06C6D131FD97FF0EB7FE0903A3FFE03FFC06DB612806D15006D5C6D5C010014F0023F
-13C0DA07FCC7FC2F457CC338>I<007FB512F8B7FC16C08216F8826C813A03F8001FFF15
-07030113806F13C0167FEE3FE0161FEE0FF0A2EE07F8A2EE03FCA21601A217FE1600A417
-7FAD17FF17FEA4160117FCA2160317F81607A2EE0FF0161FEE3FE0167FEEFFC04B13805D
-031F1300007FB65AB75A5E5E16C093C7FC6C14F830437DC238>I<007FB712FCB87EA57E
-D801FCC8FCA9177C94C7FCA6ED07C04B7EA590B6FCA79038FC000FA56F5A92C9FCA7EF0F
-80EF1FC0AA007FB8FCB9FCA56C178032437DC238>I<91391FF003C091397FFC07E049B5
-FC010714CF4914EF4914FF5B90387FF81F9038FFE00748EB800191C7FC4848147F485A49
-143F485A161F485AA249140F123F5BA2127F90C8EA07C093C7FCA35A5AAA923807FFFC4B
-13FE4B13FF7E7E6F13FE6F13FC9238000FE07F003F151FA27F121F7F163F6C7EA26C6C14
-7F7F6C6C14FF6C6C5B6E5A6C6D5A90387FF81F6DB6FC6D14EF6D14CF6D148F0101140F90
-3A007FFC07C0DA1FF0C7FC30457CC338>71 D<007FB612F0B712F8A56C15F0260001FCC7
-FCB3B3B1007FB612F0B712F8A56C15F0254377C238>73 D<90380FFFFE90B612E0000315
-F8488148814881A2273FFE000F138001F01301497F49147F4848EC3FC0A290C8121FA448
-16E0A248150FB3AC6C151FA36C16C0A36D143FA36C6CEC7F806D14FF6D5B01FE130F6CB7
-1200A26C5D6C5D6C5DC615E0010F49C7FC2B457AC338>79 D<003FB512F04814FEB77E16
-E0826C816C813A01FC003FFEED07FF03017F81707E163F161F83160FA7161F5F163F167F
-4C5A5D030790C7FCED3FFE90B65A5E5E5EA282829038FC001FED07FC6F7E150115008282
-AA18E0EF01F0EF03F8A31783EE3F87263FFFE0ECC7F0486D14FFB56C7F18E07013C06C49
-6D13806C496D1300CA12FC35447EC238>82 D<003FB8FC481780B9FCA53BFE0007F0003F
-A9007CEE1F00C792C7FCB3B3A70107B512F04980A56D5C31437DC238>84
-D<267FFFF090387FFFF0B56C90B512F8A56C496D13F0D801FCC73801FC00B3B3A66D1403
-00005EA36D14076D5D6E130F6D6C495A6E133F6D6C495A6D6C495AECFF076D90B5C7FC6D
-5C6D5C6D5C023F13E0020F1380DA03FEC8FC35447FC238>I<D83FFE913803FFE0486C4A
-13F0B56C4913F8A36C90C76C13F06C486E13E0D80FC09138001F80A36C6CED3F00A86C6C
-157EA86C6C5DEC01FC4A7EA24A7EA4D800FC9038DF01F8020F1381A3158F021F13C1A201
-7C5DA2017E14C31507023F13E3A490263E3E035BA2027E13F3A2EC7C01013F14F7A3011F
-5DEC7800A202F813FFA34A137F010F5DA24A133F6D486DC7FC35447FC238>87
-D<001FB712F04816F85AA417F090C8121F17E0EE3FC0167F1780EEFF00A24B5A4B5A123E
-C8485A4B5AA24B5A4B5AA24B5A4BC7FCA24A5A14035D4A5A140F5D4A5A143F5D4A5A14FF
-92C8FC495A13035C495AA2495A495AA2495A495A17F849C7EA01FC485AA2485A485AA248
-5A121F5B485A127F90B7FCB8FCA56C16F82E437BC238>90 D<003FB712804816C0B812E0
-A46C16C06C16802B087A7D38>95 D<EB1FFF90B512E0000314F84814FE4880824881D9F0
-017F9138003FF0ED0FF815076C486D7E6C481301C87FA21500A4EC03FF147F0107B5FC13
-1F90B6FC5A000714C048EBE0004890C7FCEA3FF813E0EA7F8090C8FC5A5AA415017E6C6C
-13036D13076C6CEB3FFFD9FC01B6FC6CB812807E6C816C4A7E6CECF80F6C6CD9C0031300
-D90FFCC9FC31327AB038>97 D<EA3FFE487EB5FCA37E7EC67EACED3FC0913801FFF80207
-13FE021F7F4A804A8091B67E03C07F9139FE001FF802F86D7E4A13034A6D7E5C707E4A80
-188091C8123FA318C0171FA9173F6E1580A2177FA26EECFF00A26E495A6E13034C5A6E49
-5A02FE133F6E6CB45A92B55A6E5C6E5C6E91C7FC6D6C13FCD91E0313F090C7EA7F803244
-7FC238>I<EC3FFF49B512E0010714F8011F8049805B90B7FC48EBE001481300485AEA0F
-F8496D5A4848147C93C7FC485A5B127F90CAFCA35A5AA97E7EA27F123F6D141F6DEC3F80
-121F6C7E01FC147F6C6CECFF006C6C6C5A6C9038F00FFE91B55A6C6C5C6D5C6D5C010714
-80010149C7FC9038003FF0293278B038>I<ED1FFF4B7F5DA38181ED003FACEC7F809038
-03FFF0010F13FC013F13FF4914BF90B7FC5A48EBC07F48EB000FD80FFC7F497F48487F49
-7F485A167F485A163F90C8FCA25A5AA97E6C157FA36D14FF123F6D5B6C7E5D6C6C5B01FC
-5B6C6C133F2603FFC0B6FC6C90B712806C03BF13C06D143F6D13FC6D01F814800107D9E0
-1F1300010090C9FC32447CC238>I<EC3FE0903801FFFC010713FF011F14C04980498090
-B67E489038E03FFC4890380007FE48481301D80FF86D7E49804848158049143F003F16C0
-49141F127F90C8FC17E0160F5A90B7FCA617C048CAFC7E7EA27FA26C7EEE07C06C6CEC0F
-E07F6C7ED807FE141F6DEC3FC06C01C013FF6CD9FC0713806C90B612006D5C6D5C010F5C
-010314E001001480DA1FFCC7FC2B327AB038>I<ED1FF8ED7FFE4AB5FC020714804A14C0
-5C5C91387FF07F15809139FF003F804AEB1F00010191C7FC5CA9003FB612FE4881B8FCA4
-6C5D260001FCC8FCB3AF003FB612E04881A56C5D2A447CC338>I<14F0497E497E497EA4
-6D5A6D5A6D5A91C8FCAB383FFFFC487FB5FCA37E7EC7FCB3AF007FB612F0B712F816FCA3
-16F86C15F0264476C338>105 D<387FFFFEB6FCA57EC77EB3B3B1007FB7FCB81280A56C
-1600294379C238>108 D<023FEB07E03B3FE0FFC01FF8D87FF39038E07FFCD8FFF76D48
-7E90B500F97F15FB6C91B612806C01C1EBF83F00030100EBE01F4902C013C0A24990387F
-800FA2491400A349137EB3A73C3FFF03FFE07FFC4801879038F0FFFEB500C76D13FFA36C
-01874913FE6C01039038E07FFC383080AF38>I<ED7FC03A3FFE01FFF8267FFF0713FEB5
-001F7F4A805C6C90B67E6CECC07F3B007FFE001FE002F8130F4A805C16075C5CA391C7FC
-B3A6273FFFFE03B512E0486D4814F0B6008F14F8A36C020714F06C496C14E035307FAF38
->I<EC7FC0903803FFF8010F13FE497F017F14C090B67E4881489038C07FF8489038001F
-FC01FC130748486D7E49130148486D7E4980003F168049143F007F16C090C8121FA300FE
-ED0FE0A96C151FA26C16C0A26D143FA26C6CEC7F80A26C6CECFF006D5B6C6C495A6D1307
-6CB4EB1FFC6C9038C07FF86C90B55A6C5D6D5C6D5C010F49C7FC010313F89038007FC02B
-327AB038>I<ED3FC03A3FFE01FFF8267FFF0713FEB5001F7F4A804A806C90B67E6C02C0
-7F3B007FFE001FF802F86D7E4A13034A6D7E5C707E4A80188091C8123FA318C0171FA917
-3F6E1580A2177FA26EECFF00A26E495A6E13034C5A6E495A02FE133F6E6CB45A92B55A6E
-5C6E5C6E91C7FC6E13FC020313F09138007F8092C9FCB0383FFFFE487FB67EA36C91C9FC
-6C5B32487FAF38>I<EEFFC0277FFFC00713F8B5D8E01F13FC037F13FE92B5FC02E114FF
-14E36C01E713813A000FEFFC019139FFF000FE4B137C0380130092C8FCA25C5CA25CA25C
-A45CB2007FB67EB77E82A35E6C5D30307CAF38>114 D<903907FF80F0017FEBF1F848B5
-12FD000714FF5A5A5AEBFC00D87FE0131F0180130F48C71207481403A5007FEC01F001C0
-90C7FCEA3FF013FE381FFFF86CEBFFC0000314F8C614FF013F1480010714E0D9003F13F0
-020013F8ED0FFC1503003CEC01FE007E140000FE15FF167F7EA37F6D14FF16FE01F01303
-6DEB07FC01FF137F91B512F816F016E04815C0D8FC3F1400010F13FCD8780113E0283278
-B038>I<EB01E0497E1307AB003FB712804816C0B8FCA46C1680260007F0C8FCB3A4EE03
-E0EE07F0A66E130F17E06D6C131F6EEB3FC0903901FF81FF92B512806D15006E5B6E5B6E
-13F002075B020190C7FC2C3D7DBB38>I<D83FFE903803FFE0486C497FB55BA36C806C80
-C66CEB0007B3A9160FA2161F163F6E137F6D6C13FFDAF007EBFFE091B712F06D16F87F6D
-14E76D02C713F00100020313E0DA3FF8C8FC35307FAE38>I<000FB712FC4816FE5AA417
-FC0180C7EA1FF8EE3FF0EE7FE0EEFFC04B13804B13006CC7485AC8485A4B5A4B5A4B5A4B
-5A4A5B4A90C7FCEC07FC4A5A4A5A4A5A4A5A49485A4990C8FC495A495A495A495A494814
-7C494814FE485B4890C8FC485A485A485A485A48B7FCB8FCA56C16FC2F2F7DAE38>122
-D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Ff cmbx12 13.14 53
-/Ff 53 122 df<923807FFE092B512FC020714FF021F81027F9038007FC0902601FFF0EB
-0FE04901C0497E4990C7487ED90FFC147F011F824A14FF495AA2137F5CA2715A715A715A
-EF078094C8FCA7EF07FCB9FCA526007FF0C7123F171FB3B3A2003FB5D8E00FB512F8A53D
-4D7ECC44>12 D<B7FCAA200A7F9D29>45 D<EA07E0EA1FF8EA3FFCEA7FFEA2B5FCA6EA7F
-FEA2EA3FFCEA1FF8EA07E01010778F22>I<177817F8EE01FCA21603A2EE07F8A217F016
-0FA217E0161FA2EE3FC0A21780167FA217005EA24B5AA25E1503A24B5AA25E150FA25E15
-1FA24B5AA25E157FA24BC7FCA25D1401A25D1403A24A5AA25D140FA24A5AA25D143FA25D
-147FA24AC8FCA25C1301A25C1303A2495AA25C130FA2495AA25C133FA25C137FA249C9FC
-A25B1201A2485AA25B1207A25B120FA2485AA25B123FA25B127FA248CAFCA25AA2127CA2
-2E6D79D13D>I<15F014011407141F147FEB03FF137FB6FCA313FC1380C7FCB3B3B2007F
-B712E0A52B4777C63D>49 D<ECFFF80107EBFF80013F14F090B612FC4881480101EBFF80
-2707F8003F13C0D80FE0010F13E0D81F806D13F0003F80D87FF06D13F86D15FC6D7F00FF
-16FE6D147FA217FF82A36C5A6C5A6C5A6C5AC95A17FEA3EEFFFCA24B13F817F05D17E04B
-13C017804B13004B5A4B5A5EED7FE04B5A4A5B4A90C7FCEC07FC4A5A4A5A4B131FEC3F80
-4AC7FC14FE4948143E495AEB07E0495A4948147E49C8FC017E15FE90B7FC4816FC5A5A5A
-5A5A5AB8FC17F8A430477AC63D>I<EC3FFE0103B512E0010F14FC013F14FF90267FE01F
-7F9026FF000713E0D801FC6D7FD803F07F486C6D7FD80FFE817F486D80167FA3805C16FF
-7E91C75B6C5A6C5AD80020495B90C75C5D5F4B5B5F031F90C7FCED3FFC4AB45A49B512E0
-168016E016FC90C7EA3FFF030713C06F7F6F7F6F7F83707E83A2701380A318C0EA07E0EA
-1FF8487E487EA2B5FCA31880A25E491600127F494A5A6C485D01E05B001F4A5BD80FFC49
-5B2707FFC03F13C06C90B65AC64BC7FC013F14F8010714E09026007FFEC8FC32487BC63D
->I<EE07E0160FA2161F163F167F16FFA25D5D5DA25D5D5DA2157D15FDEC01F915F1EC03
-E11407EC0FC1EC1F811501143F147E14FC14F8EB01F01303EB07E014C0EB0F80131FEB3F
-00133E5B13FC485A485A5B1207485A485A90C7FC123E127E5AB912FCA5C80003EBE000AD
-023FB612FCA536487DC73D>I<D8038015E001E0140301FC143F9039FFE003FF91B612C0
-17801700A25E5E16F05E5E93C7FC15FC15F001E790C8FC01E0C9FCAAEC1FFC01E1B512C0
-01E714F001EF14FC9039FFE01FFFDA0007138001FC6D13C001F06D13E04915F0497F17F8
-C913FC167F17FEA417FFA3EA0FC0EA3FF0487EA2487EA317FEA34914FF6C4815FC5B0180
-15F86CC74813F07F6C6C4913E0D80FF04913C0D807FC011F13806CB46CB512006C90B512
-FC6C5D013F14C0010F91C7FC010113F030487AC63D>I<ED7FF8913807FFFE021F6D7E02
-7F80903A01FFF01FE0010790388003F04948486C7E49486D7ED93FF013074948130F01FF
-4A7E4849133F5C5A4890C7FCA25A705A48486E5A705A003F92C8FCA3485AA21520913807
-FFE0021F13FC00FF497F4A6D7EDAFC017F9026FDF0007F4A6D7ED9FFC06D7E4A6D7E8391
-C7FC8382491680A318C05BA3127FA6123FA27F001F1780A3000F4B1300A26C6C5DA26C6D
-495A6C6D5C6C6D495A6D6C48485A90263FFC075B6DB65A6D4AC7FC01035C010014F0020F
-90C8FC32487BC63D>I<121F7F7F13FE90B812E0A45A18C0188018005F5FA25F485E90C8
-EA07E0007E4B5A5F007C151F4CC7FC167E5E485D15014B5A4B5AC8485A4B5AA24BC8FC15
-7EA25D1401A24A5A1407A24A5AA2141FA24A5AA2147FA314FFA3495BA45BA55BAA6D5BA2
-6D90C9FCEB007C334B79C93D>I<EC1FFF49B512F0010714FC011F14FF90263FF00713C0
-49C77F01FCEC3FF04848EC0FF848481407000782491403000F821601A2121F7FA27F13FE
-6D140302C05C14F002FC495A6C6D130FDAFF805B9238E01FE06C6E485A9238FCFF806C91
-B5C7FC6C15FC6C5D7F6D14FE6D806D15C06D81011F81017F81D9FFDF804813072603FE01
-8048486C804848133F4848010F1480003F8049130148486D6C13C0161F824848140382A2
-82A2177FA218807F127FEFFF007F6C6C4A5AA2D81FFC4A5A6C6CEC0FF86C6C6CEB3FF06C
-9039F003FFE06C90B612806C6C92C7FC011F14FC010714E09026003FFEC8FC32487BC63D
->I<EC1FFE49B512C0010F14F04914FC90397FFC0FFE903AFFE003FF804849C67F48496D
-7E4890C7FC486F7E484881161F003F825B007F82A28300FF81A31880A518C0A45E127FA3
-003F5D7F121F5E120F6C6C91B5FC6C90388001EF6CEBC0036C9038E00FCF6DB5128F011F
-140F010701FE1480010113F8903800010091C7FCA24C1300A3D803F85D487E487E486C4A
-5AA25F4C5AA24C5A49495B6C485D49010790C7FC01E0495AD807F8EB3FFC6CB448B45A6C
-90B55A6C15C06D91C8FC011F13FC010313C032487BC63D>I<EE01F8A24C7EA34C7EA24C
-7EA34C7FA24C7FA34C7FA293B57EA34B8016F303038016E316E103078016C0030F805E83
-031F814C7E4B81153E83037E81037C7F03FC815D830201824B7F0203825D830207824B7F
-020F825D84021F8392B8FC4A83A34A83027CC8120F02FC835C840101844A810103845C84
-0107844A81010F845C85011F85496C82B600C091B712F0A5544D7CCC5D>65
-D<93261FFF80EB01C00307B500F81303033F02FE13074AB7EAC00F0207EEE03F021F903A
-FE007FF87F027F01E0903807FCFF91B5C70001B5FC010301FC6E7E4901F0151F4901C081
-4949814990C97E494882494882485B48197F4A173F5A4A171F5A5C48190FA2485B1A07A2
-5AA297C7FC91CDFCA2B5FCAD7EA280A2F207C07EA36C7FA26C190F6E18807E6E171F6C1A
-006E5F6C193E6C6D177E6D6C5F6D6C4C5A6D6D15036D6D4B5A6D01F04B5A6D01FCED3FC0
-010001FFEDFF806E01E0D903FEC7FC021F01FEEB3FFC020790B612F002015EDA003F92C8
-FC030714FCDB001F13804A4D79CB59>67 D<B912F0F0FF8019F019FC19FFD8001F902680
-000114C0DD001F7F060713F806017F726C7E737E737F737F737F8587737F8587A2747EA3
-8786A21C80A51CC0A586A462A51C80A51C00A26263A2631AFF636163614F5B634F5B073F
-90C7FC4F5A4F5A06035B061F5B4DB512C0BBC8FC19FC19F0198006F0C9FC524B7CCA5E>
-I<BB12C0A486D8000F01E0C77E18071801F0007F193F191F190F1907861903A31901A3EF
-0F80A2737EA497C7FC171FA2173F177F17FF160392B6FCA5EDE0031600177F173F171FA2
-050FEC0F80A3F21F00A494C8FC621A3EA21A7EA31AFE6219011903A21907190FF13FF819
-FF1803183FBBFCA262A3494A7CC951>I<BBFCA41A80D8001F01C0C7FC181F1803848419
-7F193F191F1AC0190FA31907A4171FF103E0A496C7FCA25FA25F5F5E160792B6FCA5EDC0
-071601828383A283A794C9FCB1B8FCA5434A7CC94D>I<93261FFF80EB01C00307B500F8
-1303033F02FE13074AB7EAC00F0207EEE03F021F903AFE007FF87F027F01E0903807FCFF
-91B5C70001B5FC010301FC6E7E4901F0151F4901C0814949814990C97E49488249488248
-5B48197F4A173F5A4A171F5A5C48190FA2485B1A07A25AA297C8FC91CEFCA2B5FCAD6C04
-0FB712C0A280A36C93C7001FEBC000A2807EA27E807E807E806C7F7E6D7E6D7E6D7F6D01
-E05D6D6D5D6D13FC010001FF4AB5FC6E01E0EB07F9021F01FFEB3FF0020791B5EAE07F02
-01EEC01FDA003FED0007030702F81301DB001F018090C8FC524D79CB61>I<B7D8FC01B7
-12F8A5D8001F01C0C8001FEBC000B3AA92B9FCA503C0C8121FB3AEB7D8FC01B712F8A555
-4B7BCA60>I<B712FEA5D8000FEBE000B3B3B3ABB712FEA5274B7DCA2E>I<B8FCA5D8001F
-01C0C9FCB3B3A4193EA4197E197CA519FCA31801A2F003F8A21807180F181F183F187FEF
-01FF1707173FBA12F0A53F4B7BCA4A>76 D<B600E04DB612806F5FA26F5FA2D8001F09FC
-C7FC6FEF0F7FA2DABFFE171EA2DA9FFF173CA3028F6D1678A202876D16F0A202836DED01
-E0A302816DED03C0A202806DED0780A26F6CED0F00A36F6C151EA26F6C5DA26F6D5CA26F
-6D5CA36F6D495AA26F6D495AA26F6D495AA3706C49C7FCA2706C131EA2706C5BA3706D5A
-A2706D5AA270EBE1E0A370EBF3C0A270EBFF80A27190C8FCA2715AA3715AA2715A497EB6
-00F06D480103B71280A3715A715A694B7BCA74>I<B600E092B612F88181A281D8001F6D
-9239001FE0006F705A82A28202BF7F029F7FA2028F7F02877F02837F8214810280806F7F
-6F7F83816F7F6F7F6F7F83816F80707F707F8482707F707F707FA2707F7014807113C019
-E0837113F07113F87113FC19FE837113FF71148F7213CF1AEF847213FF8484A284848485
-A2858585A285858585497EB600F8167F1A3F1A1F1A0FA2554B7BCA60>I<EEFFF8031FEB
-FFC04AB612FC020715FF021FD9C01F13C091277FFE000313F0902601FFF09038007FFC49
-496E7E490180EC0FFF4990C86C7F49486F7F49486F7F017F8449486F7F4849707EA24849
-707E4885A24849701380A2481AC04A82A2481AE0A34890CA6C13F0A5B519F8AE6C1AF0A2
-6E5EA36C1AE0A26E5E6C1AC0A26C1A806E5E6C1A006E5E6C616E16FF6C616C6D4B5B6D6C
-4B5B6E5D6D6D4A5B6D6D4A5B01076D4A90C7FC6D01F8ECFFFE6D01FE01035B9028007FFF
-C01F13F0021F90B612C0020793C8FC020115FCDA001F14C0030101FCC9FC4D4D79CB5C>
-I<B912C018FCF0FF8019F085D8001F902680000713FE05007F063F1380060F13C07213E0
-1AF0841AF8A27213FCA31AFEA81AFCA34E13F8A21AF0601AE04E13C0063F138095B51200
-050713FC92B75A19E096C7FC18F803C0CAFCB3ABB712FCA5474B7BCA54>I<B9FC18F8F0
-FF8019E019F8D8000F9026C0000713FE9439007FFF80061F7F727F727F727F84868684A2
-86A862A24E5BA2624E5B4E5B4E5B4E5B95B5C8FC050713FC92B712F0198006FCC9FC18FF
-9226C0003F13C0050713F0717F717F717F187F85727FA28486A786A71C3E86A28474137E
-72157C726D13FCB700FC6D9038FE01F872EBFF8373EBFFF0071F14E007031480CD383FFE
-00574C7CCA5C>82 D<DA7FFCEB01C00103B5EAC003011FECF00749ECFC0F90B7121F48D9
-E00F13BF4890C713FFD807FC141F4848804848140382484880177F485A173F171F12FFA2
-170F7FA217077F7F7F6D92C7FC6D7E6C13F014FF15F86CECFF8016F86C15FF6C16C0836C
-826C826C826C82013F816D1680010716C01300020F15E01400030714F0ED007F160F1603
-7013F882177F127800F8163FA3171FA27E18F0A27EA26CEE3FE07F18C001E0157F6DEDFF
-8001FC160001FF140302E0EB0FFED97FFEEB3FFC486CB612F0D8FC0F5DD8F803158048C6
-6C49C7FC48010313F0354D79CB44>I<003FBB12C0A5DA80019038FC001FD9FC001601D8
-7FF09438007FE001C0183F49181F90C7170FA2007E1907A3007C1903A500FC1AF0481901
-A5C894C7FCB3B3A749B812FCA54C4A7CC955>I<B700F8023FB512F8A5D8001F01C0C938
-0FE000745AB3B3AD6D180F63811A1F6D96C7FC626D7F1A7E6D7F6D606E6C4B5A6E6CED07
-F06E6C4B5A6E01C0EC3FC06E01F049B45A020101FF011F90C8FC6E91B55A033F15F80307
-15E0030092C9FC040713F0554C7CCA5E>I<B700F00203B6FCA5D8001F01E0C93803FC00
-745A6D61811A036D6D5F1A076D6D5F1A0F6D616F161FA26D6D94C7FC626E6D153E1A7E6E
-177C7015FC6E5F8219016E6D5D19036E5F7014076E5F82190F6E6D5D191F6E6D92C8FC61
-6F153E83197E6F6D137C19FC6F6D5B18016F5DEFF003A26F01F85B18076F01FC5B180F6F
-5DEFFE1F6F92C9FC17FF607013BE18FE705BA2705BA3705BA2705BA2705BA3705BA27090
-CAFCA2177EA2584C7ECA5D>I<B700F84AB6FCA5D8001F01F0C93803FC006F705A6D4E5A
-6D6D4C5A816D4E5A6D6D4C5A826D4EC7FC6E6D5D70157E6E5F6E7F704A5A6E4C5A6E7F70
-4A5A6E4C5A6E7F71495A6E4CC8FC6F7F71137E6F5D6F7F71485A6F4A5A6F13FC71485A6F
-4A5A6F13FFF09F806F02BFC9FC7013FF60705B8260705B8260B3A7037FB612FEA5584B7E
-CA5D>89 D<ECFFFC010FEBFFC0017F14F090B612FC489038803FFE3B03FC0007FF80486C
-6D7F6D7F486D6C7F83167F83A2707E6C90C7FC6C5A6C5AC9FCA5ED1FFF021FB5FC49B6FC
-130F013FEBC03F9038FFFE00000313F04813C04890C7FC485A485AA2485AA2485AA4167F
-A26D14FF007F15EF6D01017F6C6C903907CFFF806C6CD90F8F13FE6C9038E07F076C9038
-FFFE0300014A7ED8003F9038F0007F0103018090C7FC37347CB23C>97
-D<EB7FC0B5FCA512037EB3ED07FF037F13E002C1B512FC02C714FF9126CFF80F7F9126DF
-C0017F02FFC77F4AEC3FF002F8814A6E7E717E4A81831980A37113C0A319E0AC19C0A35F
-1980A219005F606E141F6E5D4D5A6E4A5A02BF4A5A91261FC0035B9027FE0FF01F5B496C
-B548C7FCD9F80114F8496C6C13E0C8D80FFEC8FC3B4D7CCB44>I<91380FFF8091B512F8
-010314FF010F15804948C613C0D97FF8EB1FE0D9FFE0EB3FF04849137F4849EBFFF84890
-C7FCA2485A121FA24848EC7FF0EE3FE0EE1FC0007F92C7FC5BA212FFAC127FA27FA2123F
-A26C6C153EA26C6C157E177C6C6D14FC6C6D14F86C6D13036C6DEB07F0D97FFCEB1FE06D
-B4EBFFC0010F90B5120001035C010014F0020F13802F347CB237>I<EF1FF0EE3FFFA516
-00177FB3EC0FFF91B512E0010314F8010F14FC013FEB01FF903A7FF8003FFFD9FFE0130F
-48497F48497F4890C77E48815B121F5B123FA2127F5BA312FFAC127FA36C7EA3121F6D5C
-120F6C6C5C6C6D5B6C5D6C01E0013F7F6D6C49EBFFE090393FFE03FE6DB512F801075C01
-00148091261FFC00EBC0003B4D7CCB44>I<EC0FFF91B512F0010314FC010F14FF90263F
-FE077F90267FF0007F49486D7E4801806D7E486F7E4890C7120F484881707E121F491403
-003F82A2127F5B701380A212FFA390B8FCA401F8CAFCA5127FA27FA2123FA26C6CED0F80
-A26C6C151F6C17006E5C6C6D147E6C6D5C6C6D495AD93FFCEB07F0903A1FFF803FE00107
-90B55A010192C7FC6D6C13FC020713C031347DB238>I<ED7FF0913807FFFC023F7F4A7F
-902601FFE0138049018113C049484813E0EB0FFCEB1FF8A2EB3FF0A2017F6D13C04A6C13
-80EE7F00163E93C7FCACB77EA526007FF0C8FCB3B3A3003FB512F8A52B4D7DCC26>I<DA
-7FFCEB0FE00103B538807FF8010F9138E1FFFC013F02FB13FE903A7FF01FFFF39026FFC0
-07138348D90001130348168348486DEBC1FCEFC0F8000FEEE00049147F001F82A9000F5E
-6D14FF00075EA26C6C495B6C93C7FC6C9038C007FE9138F01FFC4890B55A01EF14E0D803
-C314809026C07FFCC8FC000790CAFCA47FA27F13FC90B612FCEEFFC06C16F817FE6C8218
-806C17C06D16E00003B812F0120FD81FFCC7000F13F8D83FF0140049153F4848ED1FFC00
-FF160F491507A56D150F007F17F86D151F6C6CED3FF06C6CED7FE0D80FFE913801FFC06C
-6C6C010713806C01F8017F1300C690B612FC013F15F001071580D9003F01F0C7FC37497D
-B13D>I<EB7FC0B5FCA512037EB3923801FFC0030F13F8033F7F4B13FFDBFE077F9138C1
-F0039126C3E0017FDAC78080ECCF0014DE02DC6D7F14FC5CA25CA35CB3AAB6D8C07FEBFF
-E0A53B4C7BCB44>I<13FCEA03FF487F487FA2487FA66C5BA26C5B6C90C7FCEA00FC90C8
-FCABEB7FC0B5FCA512037EB3B3A2B61280A5194D7BCC22>I<EB7FC0B5FCA512037EB3B3
-B3AAB61280A5194C7BCB22>108 D<90287FC001FFC0EC7FF0B5010F01FC0103B5FC033F
-6D010F804B6D4980DBFE079026803F817F9126C1F801903AC07E007FF00003D9C3E0DAE0
-F8806C9026C78000D9F1E06D7E02CFC7EBF3C002DEEDF780DD7FFF6E7E02FC93C7FC4A5D
-A24A5DA34A5DB3AAB6D8C03FB5D8F00FB512FCA55E327BB167>I<903A7FC001FFC0B501
-0F13F8033F7F4B13FFDBFE077F9138C1F00300039026C3E0017F6CD9C78080ECCF0014DE
-02DC6D7F14FC5CA25CA35CB3AAB6D8C07FEBFFE0A53B327BB144>I<913807FF80027F13
-F80103B6FC010F15C090261FFE017F903A7FF0003FF849486D7E480180EB07FE4890C76C
-7E4817804980000F17C048486E13E0A2003F17F0A249157F007F17F8A400FF17FCAB007F
-17F8A46C6CEDFFF0A2001F17E0A26C6C4A13C0A26C6C4A13806C6D4913006C5E6C01E0EB
-1FFC6D6C495A903A3FFE01FFF0010FB612C0010392C7FCD9007F13F80207138036347DB2
-3D>I<90397FC007FFB5017F13E002C1B512FC02C714FF9126CFF80F7F9126DFC0037F00
-0301FFC77F6C496E7E02F8814A6E7E717E4A81831980A28319C0A37113E0AC19C05FA319
-805F19005F606E143F6E5D4D5A6E4A5A02FF495BDBC0075B9126EFF01F5B02E7B548C7FC
-02E114F8DAE07F13E0DB0FFEC8FC92CAFCAFB612C0A53B477CB144>I<9039FF803FE0B5
-EBFFF8028113FE02837FDA87E11380EC8F830003D99F0713C06C139E14BCA214F8A24A6C
-13806F13006F5A4A90C7FCA45CB3A8B612E0A52A327CB132>114
-D<903907FF8070017FEBF1F048B6FC1207380FFC01391FE0003F4848130F491307127F90
-C71203A2481401A27FA27F01F090C7FC13FCEBFFC06C13FEECFFE06C14FC6C806CECFF80
-6C15C06C15E06C15F06C7E011F14F8010114FCEB000FEC007FED1FFE0078140F00F81407
-15037E1501A27E16FC7E15036D14F86D13076D14F001F8EB1FE001FFEBFFC04890B51280
-486C1400D8F81F13FCD8E00313C027347CB230>I<14F8A51301A41303A21307A2130FA2
-131F133F137F13FF1203000F90B512F0B7FCA426007FF8C7FCB3A7167CAA013F14F880A2
-90391FFE01F0010F1303903907FF87E06DEBFFC06D14806D6C1300EC0FFC26467EC430>
-I<D97FE0EC3FF0B5EC7FFFA5000315016C81B3AC5EA25EA25E7E6EEB0F7F017F021E7F6E
-017CEBFFE090393FFE01F86DB512F0010714E0010114C09027003FFE00EBC0003B337BB1
-44>I<B600C090387FFFF0A5C601F0C73803F8006E5D017F5E801707013F5E6E140F011F
-5E6E141F6D93C7FC6F5B6D153E81177E6D157C6F13FC6D5DEDF0016D5DEDF803027F5CA2
-EDFC07023F5CEDFE0F021F5CEDFF1F6E91C8FC169F16BF6E13BE16FE6E5BA26E5BA26E5B
-A36F5AA26F5AA26F5AA23C327EB041>I<B60081B500FC90387FFFF0A500019026E00003
-90C73801FC006E6F5C6C6F5E6E6F1303017F61A26E6F1307013F4A5E846E49150F011F61
-6E6F131F6D4A93C7FC179F03806E5B6D021F153EEF0FFE6DD9C03F5DEE3E0703E06E13FC
-6D027E5DEE7C0303F015816D4A6C5C03F815C3DA7FF95E4C7E03FD15E7DA3FFF5E4C137F
-19FF6E496D5BA26E94C8FC4C7FA26E5E93C7120FA26E486E5AA202015E4B1403A26E486E
-5A54327EB059>I<007FB500C090387FFFE0A5C601F0C73803F8006E5D017F5E6E140701
-3F5E80170F011F5E6E141F6D93C7FC6F5B6D153E6F137E6D157C6F13FCA26D6D5B16016D
-5DEDF803027F5CEDFC07023F5CEDFE0F021F5C15FF161F6E91C8FC16BF6E13BE16FE6E5B
-A26E5BA36E5BA26F5AA26F5AA26F5AA393C9FC5D153E157E157CD81F8013FC486C5B387F
-E001D8FFF05B14035D14074A5A49485A007F133F4948CAFC383F81FE381FFFF86C5B6C13
-C0C648CBFC3B477EB041>121 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fg cmtt12 17.28 6
-/Fg 6 123 df<913803FFC0023F13FC49B67E010715F04981013F15FE498190B812C048
-8348D9FC0180489026E0001F7F480180130391C87F48486F7E49153F4848ED0FFF834848
-178083496F13C012FF8319E07FA2187FA36C5A6C5A6C5ACBFCA218FFA219C05FA219805F
-A24D13005F604D5A173F4D5A4D5AA24C5B4C5B4C5B041F90C7FC4C5A4C5A4C5A4B5B4B5B
-4B5B031F5B4B90C8FC4B5AEDFFF84A5B4A5B4A5B021F5B4A90C9FCEC7FFC4A5A495B495B
-010F5B495B4948CAFC4948ED1F804948ED3FC04849ED7FE0485B000F5B4890C9FC4890B8
-FC5ABAFCA56C18C06C18803B5A79D94A>50 D<383FFFF0487F80B5FCA37EA27EEA000FB0
-EE0FFC93B57E030714E0031F14F84B14FE92B7FC02FD8291B87E85DCE01F7FEE000703FC
-01017F4B6D7F03E0143F4B6E7E4B140F8592C87E4A6F1380A34A6F13C0A284A21AE0A219
-7FAA19FFA21AC0A26E5DA24E138080606F1600606F4A5A6F143F6F4A5A6F4A5A6F130303
-FF010F5BDCC03F5B93B65A6102FD93C7FC02FC5D6F5C031F14F0902607F80714C0902603
-F00191C8FC90C8EA3FF043597FD74A>98 D<EC01F0EC07FC4A7EA24A7EA56E5AA26E5AEC
-01F091CAFCAE001FB512FC4880815AA37EA27EC71203B3B3A8003FB812C04817E0A2B912
-F0A36C17E0A26C17C0345974D84A>105 D<003FB512FE4880B77EA57E7EC71201B3B3B3
-B0003FB812FC4817FEBAFCA56C17FE6C17FC385877D74A>108 D<EE0FFC263FFFF090B5
-7E48D9F80714E0DAFC1F14F8B54914FE92B7FC02FD826C90B87E856CDBE01F7FD8000FEC
-000703FC01017F4B6D7F03E0143F4B6E7E4B140F8592C87E4A6F1380A34A6F13C0A284A2
-1AE0A2197FAA19FFA21AC0A26E5DA24E138080606F1600606F4A5A6F143F6F4A5A6F4A5A
-6F130303FF010F5BDCC03F5B93B65A6102FD93C7FC02FC5D6F5C031F14F0030714C00301
-91C8FC9238003FF093CAFCB3A4003FB6FC4881A2B77EA36C5DA26C92CAFC435F7FBE4A>
-112 D<000FB912E04818F04818F8A619F001F0C8000313E04D13C04D13804D13004D5A4D
-5A4D5A6C484A5B6C484A5BC9000F5B4C5B4C90C7FC4C5A4C5A4B5B4B5B4B5B4B5B4B5B4B
-90C8FC4B5A4B5A4A5B4A5B4A5B4A5B4A5B4A90C9FC4A5A4A5A495B495B495B4949EC07E0
-4949EC0FF04948C8EA1FF8495A495A485B485B485B485B4890C9FC485A48B9FCBAFCA66C
-18F06C18E03D3E7BBD4A>122 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fh cmbx12 17.28 28
-/Fh 28 120 df<16F04B7E1507151F153FEC01FF1407147F010FB5FCB7FCA41487EBF007
-C7FCB3B3B3B3007FB91280A6395E74DD51>49 D<913801FFF8021FEBFFC091B612F80103
-15FF010F16C0013F8290267FFC0114F89027FFE0003F7F4890C7000F7F48486E7FD807F8
-6E148048486E14C048486E14E048486F13F001FC17F8486C816D17FC6E80B56C16FE8380
-A219FFA283A36C5BA26C5B6C90C8FCD807FC5DEA01F0CA14FEA34D13FCA219F85F19F04D
-13E0A294B512C019804C14004C5B604C5B4C5B604C13804C90C7FC4C5A4C5A4B13F05F4B
-13804B90C8FC4B5AED1FF84B5A4B5A4B48143F4A5B4A48C8FC4A5A4A48157E4A5A4A5AEC
-7F8092C9FC02FE16FE495A495A4948ED01FCD90FC0150749B8FC5B5B90B9FC5A4818F85A
-5A5A5A5ABAFCA219F0A4405E78DD51>I<92B5FC020F14F8023F14FF49B712C04916F001
-0FD9C01F13FC90271FFC00077FD93FE001017F49486D8049C86C7F484883486C6F7F14C0
-486D826E806E82487FA4805CA36C5E4A5E6C5B6C5B6C495E011FC85A90C95CA294B55A61
-4C91C7FC604C5B4C5B4C5B4C5B047F138092260FFFFEC8FC020FB512F817E094C9FC17F8
-17FF91C7003F13E0040713F8040113FE707F717F7113E085717FA2717F85A285831A80A3
-1AC0EA03FCEA0FFF487F487F487FA2B57EA31A80A34D14005C7E4A5E5F6C495E49C8485B
-D81FF85F000F5ED807FE92B55A6C6C6C4914806C01F0010791C7FC6C9026FF803F5B6D90
-B65A011F16F0010716C001014BC8FCD9001F14F0020149C9FC426079DD51>I<F01F804E
-7E187F18FFA25F5F5F5FA25F5F5FA294B5FC5E5E5EA25E5EEE3FBFEE7F3FA216FEED01FC
-ED03F8ED07F0A2ED0FE0ED1FC0ED3F8016005D15FE4A5A4A5AA24A5A4A5A4A5A4A5AA24A
-C7FC14FE495A5C1303495A495A495A5C133F49C8FC13FE485AA2485A485A485A5B121F48
-5A48C9FC12FEBCFCA6CA6CEBC000B1037FB8FCA6485E7CDD51>I<4DB5ED03C0057F02F0
-14070407B600FE140F047FDBFFC0131F4BB800F0133F030F05FC137F033F9127F8007FFE
-13FF92B6C73807FF814A02F0020113C3020702C09138007FE74A91C9001FB5FC023F01FC
-16074A01F08291B54882490280824991CB7E49498449498449498449865D49498490B5FC
-484A84A2484A84A24891CD127FA25A4A1A3F5AA348491A1FA44899C7FCA25CA3B5FCB07E
-A380A27EA2F50FC0A26C7FA37E6E1A1F6C1D80A26C801D3F6C6E1A00A26C6E616D1BFE6D
-7F6F4E5A7F6D6D4E5A6D6D4E5A6D6D4E5A6D6E171F6D02E04D5A6E6DEFFF806E01FC4C90
-C7FC020F01FFEE07FE6E02C0ED1FF8020102F8ED7FF06E02FF913803FFE0033F02F8013F
-1380030F91B648C8FC030117F86F6C16E004071680DC007F02F8C9FC050191CAFC626677
-E375>67 D<B96C90B91280A6D8000102C0C9000102C0C7FCB3B3A293BBFCA604C0C91201
-B3B3A6B96C90B91280A671627AE17E>72 D<B912E0A6C702E0C7FCB3B3B3B3AEB912E0A6
-33627CE13C>I<B700C0083FB612F070627097B7FCA37061D800010DF8C7FC70F103EFA2
-02FD6DF107CFA202FC6DF10F8FA36F6DF01F0FA26F6D183EA26F6D187CA26F6D18F8A36F
-6DEF01F0A26F6DEF03E0A26F6DEF07C0A26F6DEF0F80A3706DEE1F00A2706D163EA2706D
-5EA2706D5EA3706D4B5AA2706D4B5AA2706D4B5AA2706D4B5AA3716D4AC7FCA2716D143E
-A2716D5CA2716D5CA3716D495AA2716D495AA2716D495AA2716D495AA3726D48C8FCA272
-EBC03EA2726D5AA2726D5AA372EBF9F0A272EBFFE0A2725CA2725CA37390C9FCA2735AA2
-735A90381FFFC0B700F86E480207B812F0A3735AA2735A8C627AE199>77
-D<BB7E1AFCF2FFC01BF81BFE757ED800010280C7001F80070114F0736C7F081F7F747F74
-7F7414807414C0A27414E0A21DF0A27513F8A41DFCA91DF8A498B512F0A21DE0A25014C0
-1D8062501400505B505B087F5B4FB512E0071F5C93B9C7FC1BFC1BF01B8008F0C8FC04C0
-CCFCB3B3A2B97EA65E627AE16E>80 D<001FBEFCA64849C79126E0000F148002E0180091
-C8171F498601F81A0349864986A2491B7FA2491B3F007F1DC090C9181FA4007E1C0FA600
-FE1DE0481C07A5CA95C7FCB3B3B3A3021FBAFCA663617AE070>84
-D<913803FFFE027FEBFFF00103B612FE010F6F7E4916E090273FFE001F7FD97FE001077F
-D9FFF801017F486D6D7F717E486D6E7F85717FA2717FA36C496E7FA26C5B6D5AEB1FC090
-C9FCA74BB6FC157F0207B7FC147F49B61207010F14C0013FEBFE004913F048B512C04891
-C7FC485B4813F85A5C485B5A5CA2B55AA45FA25F806C5E806C047D7F6EEB01F96C6DD903
-F1EBFF806C01FED90FE114FF6C9027FFC07FC01580000191B5487E6C6C4B7E011F02FC13
-0F010302F001011400D9001F90CBFC49437CC14E>97 D<903807FF80B6FCA6C6FC7F7FB3
-A8EFFFF8040FEBFF80047F14F00381B612FC038715FF038F010014C0DBBFF0011F7FDBFF
-C001077F93C76C7F4B02007F03F8824B6F7E4B6F13804B17C0851BE0A27313F0A21BF8A3
-7313FCA41BFEAE1BFCA44F13F8A31BF0A24F13E0A24F13C06F17804F1300816F4B5A6F4A
-5B4AB402075B4A6C6C495B9126F83FE0013F13C09127F00FFC03B55A4A6CB648C7FCDAC0
-0115F84A6C15E091C7001F91C8FC90C8000313E04F657BE35A>I<92380FFFF04AB67E02
-0F15F0023F15FC91B77E01039039FE001FFF4901F8010113804901E0010713C049018049
-13E0017F90C7FC49484A13F0A2485B485B5A5C5A7113E0485B7113C048701380943800FE
-0095C7FC485BA4B5FCAE7EA280A27EA2806C18FCA26C6D150119F87E6C6D15036EED07F0
-6C18E06C6D150F6D6DEC1FC06D01E0EC7F806D6DECFF00010701FCEB03FE6D9039FFC03F
-FC010091B512F0023F5D020F1580020102FCC7FCDA000F13C03E437BC148>I<F17FF805
-0FB5FCA6EF000F8484B3A892380FFF804AB512F8020F14FE023FECFF8391B712E3010391
-38807FF3499039F8000FFB011F01E00103B5FC494913004990C87E49488148498148834A
-815A485BA2485BA25AA3485BA4B5FCAE7EA46C7FA37EA26C7FA26C5F806C5F6C6D5D6C6D
-5D017F93B5FC6D6C6C0103806D6D49806D01F0D91FF7EBFFFE6D9039FE01FFE7010190B6
-12876D6CECFE07021F14F8020314E09127003FFE00ECC0004F657BE35A>I<92380FFFC0
-4AB512FC020FECFF80023F15E091B712F80103D9FE037F499039F0007FFF011F01C0011F
-7F49496D7F4990C76C7F49486E7F48498048844A804884485B727E5A5C48717EA35A5C72
-1380A2B5FCA391B9FCA41A0002C0CBFCA67EA380A27EA27E6E160FF11F806C183F6C7FF1
-7F006C7F6C6D16FE6C17016D6C4B5A6D6D4A5A6D01E04A5A6D6DEC3FE0010301FC49B45A
-6D9026FFC01F90C7FC6D6C90B55A021F15F8020715E0020092C8FC030713F041437CC14A
->I<EE3FFC0307B51280033F14C04AB612F0020715F84A9038F03FFC4AEB807F913A7FFE
-00FFFE4A5A4B4813FF4913F05B4913E0A24913C0A27013FE4949EB7FFCEF3FF8EF1FF0EF
-07C094C7FCB0B812C0A6D8001F01C0C8FCB3B3B0007FB612FCA638657CE431>I<F107F8
-DB7FFEEC3FFE020FB5D8F001B5FC027FDAFE03148049B7128F49DCDFFD13C0010FD9F00F
-EBFFC149D9800114014990C7EBFC0349486E6C7E4948EC3FFF48496E0181138007801300
-48F0C03E97C7FC48496E7FA34884A96C60A36C6D4A5BA26C60A26C6D4A90C8FC6D6C4A5A
-6D6C4A5A6D6D485BDBF00F5B4990B612C060D97C7F4AC9FCD9FC0F14F09126007FFECAFC
-92CCFC1201A47FA27F8014F091B77E18FE6CEFFFC019F06D17FC19FF6D846D846D846D84
-013F8490BAFC0003854801E0C712014890C9000F7F484816014848EE007F4848717E8512
-FF5B85A56D5F007F616D173F003F616D177F6C6C4D5A6C01C003035B6C6D4B5B6C01F803
-1F5BC601FF92B5C7FC6D01F8011F5B011F90B712F8010717E0010094C8FC020F15F0DA00
-3F01FCC9FC4A607CC151>I<903807FF80B6FCA6C6FC7F7FB3A8EF1FFF94B512F0040714
-FC041F14FF4C8193267FE07F7F922781FE001F7FDB83F86D7FDB87F07FDB8FC0814C7F03
-9FC78015BE03BC8003FC825DA25DA25DA45DB3B2B7D8F007B71280A651647BE35A>I<EB
-0FE0EB3FF8497E48B5FCA24880A24880A76C5CA26C91C7FCA238007FFC6D5AEB0FE090C9
-FCAF903807FF80007FB5FCA6C6FC7F7FB3B3AEB712C0A622657BE42C>I<903807FF80B6
-FCA6C6FC7F7FB3B3B3B3ADB712E0A623647BE32C>108 D<902607FF80D91FFFEEFFF8B6
-91B500F00207EBFF80040702FC023F14E0041F02FF91B612F84C6F488193267FE07F6D48
-01037F922781FE001F9027E00FF0007FC6DA83F86D9026F01FC06D7F6DD987F06D4A487F
-6DD98FC0DBF87EC7804C6D027C80039FC76E488203BEEEFDF003BC6E4A8003FC04FF834B
-5FA24B5FA24B94C8FCA44B5EB3B2B7D8F007B7D8803FB612FCA67E417BC087>I<902607
-FF80EB1FFFB691B512F0040714FC041F14FF4C8193267FE07F7F922781FE001F7FC6DA83
-F86D7F6DD987F07F6DD98FC0814C7F039FC78015BE03BC8003FC825DA25DA25DA45DB3B2
-B7D8F007B71280A651417BC05A>I<923807FFE092B6FC020715E0021F15F8027F15FE49
-4848C66C6C7E010701F0010F13E04901C001037F49496D7F4990C87F49486F7E49486F7E
-48496F13804819C04A814819E048496F13F0A24819F8A348496F13FCA34819FEA4B518FF
-AD6C19FEA46C6D4B13FCA36C19F8A26C6D4B13F0A26C19E06C6D4B13C0A26C6D4B13806C
-6D4B13006D6C4B5A6D6D495B6D6D495B010701F0010F13E06D01FE017F5B010090B7C7FC
-023F15FC020715E0020092C8FC030713E048437CC151>I<D90FFFEB0FFCB690383FFF80
-93B512E04B14F04B14F8923907FC7FFC92390FE0FFFEC6EC1F806DD93F0113FF6D133E15
-7E157C15F8A215F07013FEA24BEB7FFCEF3FF8EF0FE04B90C7FCA55DB3B0B712F8A63841
-7BC042>114 D<913A3FFF8007800107B5EAF81F011FECFE7F017F91B5FC48B8FC48EBE0
-014890C7121FD80FFC1407D81FF0801600485A007F167F49153FA212FF171FA27F7F7F6D
-92C7FC13FF14E014FF6C14F8EDFFC06C15FC16FF6C16C06C16F06C826C826C826C82013F
-1680010F16C01303D9007F15E0020315F0EC001F1500041F13F81607007C150100FC8117
-7F6C163FA2171F7EA26D16F0A27F173F6D16E06D157F6D16C001FEEDFF806D0203130002
-C0EB0FFE02FCEB7FFC01DFB65A010F5DD8FE0315C026F8007F49C7FC48010F13E035437B
-C140>I<EC07E0A6140FA5141FA3143FA2147FA214FF5BA25B5B5B5B137F48B5FC000F91
-B512FEB8FCA5D8001F01E0C8FCB3AFEF0FC0AC171F6D6D1480A2173F6D16006F5B6D6D13
-7E6D6D5B6DEBFF836EEBFFF86E5C020F14C002035C9126003FFCC7FC325C7DDA3F>I<90
-2607FFC0ED3FFEB60207B5FCA6C6EE00076D826D82B3B3A260A360A2607F60183E6D6D14
-7E4E7F6D6D4948806D6DD907F0ECFF806D01FFEB3FE06D91B55A6E1500021F5C020314F8
-DA003F018002F0C7FC51427BC05A>I<B70081B600FC0103B512FCA6C66C0180C701FCC8
-381FFE006F6FED03F86D047F5F856F6E16076D646F70140F6D705F866F6E161F6D646F4A
-6D143F6D99C7FC4E7F6F616D1B7E6F4A6D14FE6D6395B57E7001FC15016E62DCC0016E13
-036EDBF87F5D05038004E0496C14076E62DCF007ED800F6E4B6C5D050F15C004F8496C14
-1F6E62DCFC1FEDE03F6E4B6C92C8FC053F15F004FE496C5C6E197E7048EDF8FE6E027E6D
-5C05FE15FC4D6D13FD6F601BFF6F496E5BA24D806F60A26F496E5BA24D806F60A26F496E
-90C9FCA294C87E6F5FA26F486F5A047C6F5A6E417DBF75>119 D
-E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fi cmsy10 10.95 1
-/Fi 1 16 df<EB0FFCEB3FFF90B512C0000314F04880488048804880A2481580A3B712C0
-AA6C1580A36C1500A26C5C6C5C6C5C6C5CC614C0013F90C7FCEB0FFC22227BA72D>15
-D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fj cmtt10 10.95 89
-/Fj 89 127 df<121C127FEAFF80B3EA7F00B2123EC7FCA8121C127FA2EAFF80A3EA7F00
-A2121C09396DB830>33 D<00101304007C131F00FEEB3F80A26C137FA248133FB2007E14
-00007C7F003C131E00101304191C75B830>I<903907C007C0A2496C487EA8011F131FA2
-02C05BA3007FB7FCA2B81280A36C16006C5D3A007F807F80A2020090C7FCA9495BA2003F
-90B512FE4881B81280A36C1600A22701FC01FCC7FCA300031303A201F85BA76C486C5AA2
-29387DB730>I<EB07E0EB1FF8497E137F497E803801FC7F497E810003131F13F0A6143F
-92C8FC91387F0FFF9026F87E1F1380000113FEEBF9FC13FB4A6C1300D9FFF013C06C13E0
-151F02C05BEB7F809038FF003F4892C7FC485C48EB807E5A15FE391FDFC0FC383F8FE014
-E1397F07F1F8EB03F300FEEBFBF0EB01FF5D7FEDC006027F130F91393F801F8015C06C13
-7F6CEBFFE049EBF83F018701FC1300263FFFFBB5FC6C01F15B14E06C9038C03FFC000390
-38001FF8D801FCEB07E0293A7DB830>38 D<EA07C0EA0FF0EA1FF8A213FCA213FE120F12
-07EA007EA513FE13FCA2120113F81203EA07F0120FEA1FE0127FEAFFC013801300127C12
-380F1D70B730>I<141E147F14FF5BEB03FEEB07FCEB0FF0EB1FE0EB3FC0EB7F80EBFF00
-485A5B12035B485A120F5BA2485AA2123F5BA2127F90C7FCA412FEAD127FA47F123FA27F
-121FA26C7EA27F12076C7E7F12017F6C7EEB7F80EB3FC0EB1FE0EB0FF0EB07FCEB03FEEB
-01FF7F147F141E184771BE30>I<127812FE7E7F6C7E6C7EEA0FF06C7E6C7E6C7E6C7EEB
-7F80133F14C0131FEB0FE014F01307A2EB03F8A214FC1301A214FE1300A4147FAD14FEA4
-130114FCA2130314F8A2EB07F0A2130F14E0EB1FC0133F1480137FEBFF00485A485A485A
-485AEA3FE0485A485A90C7FC5A1278184778BE30>I<14E0497E497EA60038EC0380007E
-EC0FC0D8FF83EB3FE001C3137F9038F3F9FF267FFBFB13C06CB61280000FECFE00000314
-F86C5C6C6C13C0011F90C7FC017F13C048B512F04880000F14FE003FECFF80267FFBFB13
-C026FFF3F913E09038C3F87F0183133FD87E03EB0FC00038EC0380000091C7FCA66D5A6D
-5A23277AAE30>I<143EA2147FAF007FB7FCA2B81280A36C1600A2C76CC8FCAF143EA229
-297DAF30>I<EA03E0EA0FF0EA1FF813FCEA3FFEA213FFA27EA27E1203EA007FA2137E13
-FEEA01FC1203EA07F8EA3FF0127FEAFFE0EA7F801300123C1019708B30>I<007FB612F0
-A2B712F8A36C15F0A225077B9E30>I<120FEA3FC0EA7FE0A2EAFFF0A4EA7FE0A2EA3FC0
-EA0F000C0C6E8B30>I<16F01501ED03F8A21507A2ED0FF0A2ED1FE0A2ED3FC0A2ED7F80
-A2EDFF00A24A5AA25D1403A24A5AA24A5AA24A5AA24A5AA24A5AA24AC7FCA2495AA25C13
-03A2495AA2495AA2495AA2495AA2495AA249C8FCA2485AA25B1203A2485AA2485AA2485A
-A2485AA2485AA248C9FCA25AA2127CA225477BBE30>I<14FE903807FFC0497F013F13F8
-497F90B57E48EB83FF4848C6138049137F4848EB3FC04848EB1FE049130F001F15F04913
-07A24848EB03F8A290C712014815FCA400FEEC00FEAD6C14016C15FCA36D1303003F15F8
-A26D1307001F15F0A26D130F6C6CEB1FE0A26C6CEB3FC06C6CEB7F806D13FF2601FF8313
-006CEBFFFE6D5B6D5B010F13E06D5BD900FEC7FC273A7CB830>I<EB03C0497EA2130FA2
-131FA2133F137F13FF1203123FB5FCA213EF138FEA7E0F1200B3B0003FB512F84814FCB6
-12FEA26C14FC6C14F81F3977B830>I<EB07FC90383FFFC090B512F00003804814FE4880
-261FF80F1380263FE00113C09038C0007F4848EB3FE090C7121FED0FF04814075A6C15F8
-1503A3127E1218C8FCA2150716F0150F16E0151F16C0153FED7F8015FF4A13005DEC07FC
-4A5A4A5A4A5A4A5A4A5A4990C7FC495A495AEB0FF0EB3FE0495A495A4890C8FC4848EB01
-F04848EB03F8485AEA1FE048B6FCB7FCA37E6C15F025397BB830>I<EB03FF013F13E090
-B512F84814FE4880481580260FFE0113C09038F0007F4848EB1FE0150F16F01507A26C5A
-6C5AC8FC150F16E0A2151FED3FC0157FEDFF8002071300903807FFFE495B5D8115FF6D14
-80D9000113C09138003FE0ED1FF0ED07F8150316FC150116FE1500A21218127EB4FCA215
-0116FC4814036C15F86C6C13076DEB1FF0D83FF0133F3A1FFE01FFE06CB612C06C15806C
-ECFE00C65C013F13F001031380273A7CB830>I<EC03FC4A7E140F141FA2143F147F157E
-14FEA2EB01FCEB03F8A2EB07F0A2EB0FE0EB1FC0A2EB3F80A2EB7F0013FEA2485A485AA2
-485AA2485A485AA2485AA248C7FC12FEB8FC1780A46C1600C8007EC7FCAA91387FFFFE91
-B6FCA46E5B29397DB830>I<000FB612804815C05AA316800180C8FCAEEB83FF019F13C0
-90B512F015FC8181D9FE0313809039F0007FC049133F0180EB1FE06CC7120F000E15F0C8
-1207A216F81503A31218127EA2B4FC150716F048140F6C15E06C141F6DEB3FC06D137F3A
-3FE001FF80261FFC0F13006CB55A6C5C6C5C6C14E06C6C1380D90FFCC7FC25397BB730>
-I<EC0FF8EC7FFF49B51280010714E0131F4914F090387FF80F9039FFC007F84813803803
-FE005B485A4848EB03F0ED01E0484890C7FC5B123F5BA2127FEB000C903803FFE0010F13
-F8D8FF3F13FE48B6FCB7128016C09039FE007FE001F8EB1FF001E0130F49EB07F8ED03FC
-5B90C7120116FE1500A37EA46C7E15016D14FC121F6D1303000FEC07F86D130F6C6CEB1F
-F06DEB3FE03A03FF81FFC06C90B512806C15006D5B011F13F8010713E001011380273A7C
-B830>I<127CB712FC16FEA416FC48C7EA0FF816F0ED1FE0007CEC3FC0C8EA7F80EDFF00
-A24A5A4A5A5D14075D140F5D4A5AA24A5AA24AC7FCA25C5C13015CA213035CA213075CA4
-495AA6131F5CA96D5A6DC8FC273A7CB830>I<49B4FC011F13F0017F13FC90B57E0003EC
-FF804815C048010113E03A1FF8003FF049131FD83FC0EB07F8A24848EB03FC90C71201A5
-6D1303003F15F86D13076C6CEB0FF06C6CEB1FE0D807FCEB7FC03A03FF83FF806C90B512
-006C6C13FC011F13F0497F90B512FE48802607FE0013C0D80FF8EB3FE0D81FE0EB0FF048
-48EB07F8491303007F15FC90C712014815FE481400A66C14016C15FC6D1303003F15F86D
-1307D81FF0EB1FF06D133F3A0FFF01FFE06C90B512C06C1580C6ECFE006D5B011F13F001
-0190C7FC273A7CB830>I<49B4FC010F13E0013F13F890B57E4880488048010113803A0F
-FC007FC0D81FF0EB3FE04848131F49EB0FF048481307A290C7EA03F85A4815FC1501A416
-FEA37E7E6D130315076C7E6C6C130F6D133FD80FFC13FF6CB6FC7E6C14FE6C14F9013FEB
-E1FC010F138190380060011400ED03F8A2150716F0150F000F15E0486C131F486CEB3FC0
-157FEDFF804A1300EC07FE391FF01FFC90B55A6C5C6C5C6C1480C649C7FCEB3FF0273A7C
-B830>I<120FEA3FC0EA7FE0A2EAFFF0A4EA7FE0A2EA3FC0EA0F00C7FCAF120FEA3FC0EA
-7FE0A2EAFFF0A4EA7FE0A2EA3FC0EA0F000C276EA630>I<EA03C0EA0FF0EA1FF8A2EA3F
-FCA4EA1FF8A2EA0FF0EA03C0C7FCAFEA03C0EA0FF0121F13F8123F13FCA3121FA2120F12
-031200120113F8120313F01207EA1FE0123FEA7FC0EAFF80EA7F00127E12380E3470A630
->I<16F01503ED07F8151F157FEDFFF014034A13C0021F138091383FFE00ECFFF8495B01
-0713C0495BD93FFEC7FC495A3801FFF0485B000F13804890C8FCEA7FFC5BEAFFE05B7FEA
-7FF87FEA1FFF6C7F000313E06C7F38007FFC6D7E90380FFF806D7F010113F06D7FEC3FFE
-91381FFF80020713C06E13F01400ED7FF8151F1507ED03F01500252F7BB230>I<007FB7
-FCA2B81280A36C16006C5DCBFCA7003FB612FE4881B81280A36C1600A229157DA530>I<
-1278127EB4FC13C07FEA7FF813FEEA1FFF6C13C000037F6C13F86C6C7EEB1FFF6D7F0103
-13E06D7F9038007FFC6E7E91380FFF806E13C0020113F080ED3FF8151F153FEDFFF05C02
-0713C04A138091383FFE004A5A903801FFF0495B010F13804990C7FCEB7FFC48485A4813
-E0000F5B4890C8FCEA7FFE13F8EAFFE05B90C9FC127E1278252F7BB230>I<EC1FE0ECFF
-F8010313FE010F7F4914804914C090397FF03FE09038FF800F4890380007F0D803FC1303
-3A07F801FBF89038F007FF380FE01F4A13FCEA1FC0495A003FEBFF0F903800FE07903901
-FC03FE007FEBF801EA7E03ECF000A2EAFE0700FC49137EAA00FE6D13FED87E0314FCA2EC
-F801D87F0114F8003FEBFC03903900FE07F0903880FF0F001F90387FFFE06D6C13C0EA0F
-E06E13803A07F007FE009038F801F86C6CC7127C6CB414FE6CEB800390387FF01F6DB512
-FC6D14F86D14E0010314C00100EBFE00EC1FF0273A7CB830>64 D<147F4A7EA2497FA449
-7F14F7A401077F14E3A3010F7FA314C1A2011F7FA490383F80FEA590387F007FA4498049
-133F90B6FCA34881A39038FC001F00038149130FA4000781491307A2D87FFFEB7FFFB56C
-B51280A46C496C130029397DB830>I<007FB512F0B612FE6F7E82826C813A03F8001FF8
-15076F7E1501A26F7EA615015EA24B5A1507ED1FF0ED7FE090B65A5E4BC7FC6F7E16E082
-9039F8000FF8ED03FC6F7E1500167FA3EE3F80A6167F1700A25E4B5A1503ED1FFC007FB6
-FCB75A5E16C05E6C02FCC7FC29387EB730>I<91387F803C903903FFF03E49EBFC7E011F
-13FE49EBFFFE5B9038FFE07F48EB801F3903FE000F484813075B48481303A2484813015B
-123F491300A2127F90C8FC167C16005A5AAC7E7EA2167C6D14FE123FA27F121F6D13016C
-6C14FCA26C6CEB03F86D13076C6CEB0FF03901FF801F6C9038E07FE06DB512C06D14806D
-1400010713FC6D13F09038007FC0273A7CB830>I<003FB512E04814FCB67E6F7E6C816C
-813A03F8007FF0ED1FF8150F6F7E6F7E15016F7EA2EE7F80A2163F17C0161FA4EE0FE0AC
-161F17C0A3163F1780A2167F17005E4B5A15034B5A150F4B5AED7FF0003FB65A485DB75A
-93C7FC6C14FC6C14E02B387FB730>I<007FB7FCB81280A47ED803F8C7123FA8EE1F0093
-C7FCA4157C15FEA490B5FCA6EBF800A4157C92C8FCA5EE07C0EE0FE0A9007FB7FCB8FCA4
-6C16C02B387EB730>I<003FB712804816C0B8FCA27E7ED801FCC7121FA8EE0F8093C7FC
-A5153E157FA490B6FCA69038FC007FA4153E92C8FCAE383FFFF8487FB5FCA27E6C5B2A38
-7EB730>I<02FF13F00103EBC0F8010F13F1013F13FD4913FF90B6FC4813C1EC007F4848
-133F4848131F49130F485A491307121F5B123F491303A2127F90C7FC6F5A92C8FC5A5AA8
-92B5FC4A14805CA26C7F6C6D1400ED03F8A27F003F1407A27F121F6D130F120F7F6C6C13
-1FA2D803FE133F6C6C137FECC1FF6C90B5FC7F6D13FB010F13F30103EBC1F0010090C8FC
-293A7DB830>I<3B3FFF800FFFE0486D4813F0B56C4813F8A26C496C13F06C496C13E0D8
-03F8C7EAFE00B290B6FCA601F8C7FCB3A23B3FFF800FFFE0486D4813F0B56C4813F8A26C
-496C13F06C496C13E02D387FB730>I<007FB6FCB71280A46C1500260007F0C7FCB3B3A8
-007FB6FCB71280A46C1500213879B730>I<49B512F04914F85BA27F6D14F090C7EAFE00
-B3B3123C127EB4FCA24A5A1403EB8007397FF01FF86CB55A5D6C5C00075C000149C7FC38
-003FF025397AB730>I<D83FFF90380FFF80486D4813C0B56C5AA26C497E6C496C1380D8
-03F0903803F8004B5A4B5A151F4B5A5E4BC7FC15FE14014A5A5D4A5A4A5A141F5D4A5A4A
-C8FC5C13F18101F37F13F790B57E14EFECC7F01483EC03F8140101FE7F496C7E5B157F49
-7F82151F82150F826F7EA26F7E1501821500D83FFF903803FFC0486D4813E0B56C5AA26C
-497E6C496C13C02B387FB730>I<383FFFF8487FB57EA26C5B6C5BD801FCC9FCB3B0EE0F
-80EE1FC0A9003FB7FC5AB8FCA27E6C16802A387EB730>I<D83FF8ECFFE0486C4913F048
-6C4913F8A2007F16F06C6C4913E00007160001EF14BFEC800FA39039E7C01F3FA4ECE03F
-01E3133EA2ECF07EA201E1137CA2ECF8FCA201E013F8A214FDEC7DF0A3147FEC3FE0A3EC
-1FC0A2EC070091C7FCADD83FFC903801FFE0486C4913F0B54913F8A26C486D13F06C486D
-13E02D387FB730>I<D83FFC90381FFF80486C4913C0B54913E0A26C6D6C13C06C6E1380
-0003913801F800EBF7C0A3EBF3E0A314F013F1A214F8A213F014FCA2147C147EA2143E14
-3FA2141FA21581A2140F15C1A2140715E1A2140315F1A21401A215F91400A3157DA3153F
-EA3FFF481380B5EAC01FA26CEB800F6C496C5A2B387EB730>I<90383FFFE048B512FC00
-0714FF4815804815C04815E0EBF80001E0133FD87F80EB0FF0A290C71207A44815F84814
-03B3A96C1407A26C15F0A36D130FA26D131F6C6CEB3FE001F813FF90B6FC6C15C06C1580
-6C1500000114FCD8003F13E0253A7BB830>I<007FB512F0B612FE6F7E16E0826C813903
-F8003FED0FFCED03FE15016F7EA2821780163FA6167F17005EA24B5A1503ED0FFCED3FF8
-90B6FC5E5E16804BC7FC15F001F8C9FCB0387FFFC0B57EA46C5B29387EB730>I<90383F
-FFE048B512FC000714FF4815804815C04815E0EBF80001E0133F4848EB1FF049130F90C7
-1207A44815F8481403B3A8147E14FE6CEBFF076C15F0EC7F87A2EC3FC7018013CF9038C0
-1FFFD83FE014E0EBF80F90B6FC6C15C06C15806C1500000114FCD8003F7FEB00016E7EA2
-1680157F16C0153F16E0151F16F0150FED07E025467BB830>I<003FB57E4814F0B612FC
-15FF6C816C812603F8017F9138003FF0151F6F7E15071503821501A515035E1507150F4B
-5A153F4AB45A90B65A5E93C7FC5D8182D9F8007FED3FE0151F150F821507A817F8EEF1FC
-A53A3FFF8003FB4801C0EBFFF8B56C7E17F06C496C13E06C49EB7FC0C9EA1F002E397FB7
-30>I<90390FF803C0D97FFF13E048B512C74814F74814FF5A381FF80F383FE001497E48
-48137F90C7123F5A48141FA2150FA37EED07C06C91C7FC7F7FEA3FF0EA1FFEEBFFF06C13
-FF6C14E0000114F86C80011F13FF01031480D9003F13C014019138007FE0151FED0FF0A2
-ED07F8A2007C140312FEA56C140716F07F6DEB0FE06D131F01F8EB3FC001FF13FF91B512
-80160000FD5CD8FC7F13F8D8F81F5BD878011380253A7BB830>I<003FB712C04816E0B8
-FCA43AFE003F800FA8007CED07C0C791C7FCB3B1011FB5FC4980A46D91C7FC2B387EB730
->I<3B7FFFC007FFFCB56C4813FEA46C496C13FCD803F8C7EA3F80B3B16D147F00011600
-A36C6C14FE6D13016D5CEC800390393FE00FF890391FF83FF06DB55A6D5C6D5C6D91C7FC
-9038007FFCEC1FF02F3980B730>I<D87FFE90380FFFC0B54913E06E5AA24A7E6C486D13
-C0D807F0903801FC00A26D130300035DA46C6C495AA46C6C495AA46D131F6D5CA3EC803F
-013F5CA46D6C48C7FCA490380FE0FEA401075B14F1A301035BA314FB01015BA314FFA26D
-5BA46E5A6E5A2B397EB730>I<D83FFC903801FFE0486C4913F000FF16F8A2007F16F06C
-486D13E0D81FC09038001FC0000F1680A76D143F00071600A7000390380F803E9039F01F
-C07EEC3FE0A3EC7FF0A2147D0001157CA29039F8FDF8FCA314F8A300005D01F913FCA2EC
-F07CA201FD137DA2017D5CECE03DA3017F133FA2ECC01FA2013F5CA2EC800F6D486C5A2D
-397FB730>I<3A3FFF01FFF84801837F02C77FA202835B6C01015B3A01FC007F806D91C7
-FC00005C6D5BEB7F01EC81FCEB3F8314C3011F5B14E7010F5B14FF6D5BA26D5BA26D5BA2
-6D90C8FCA4497FA2497FA2815B81EB0FE781EB1FC381EB3F8181EB7F0081497F49800001
-143F49800003141F49800007140FD87FFEEB7FFFB590B5128080A25C6C486D130029387D
-B730>I<D87FFF90381FFFC0B56C4813E0A46C496C13C0D803F8903803F8006D1307A26C
-6C495AA26C6C5C151F6D5CEC803F013F5CECC07F011F91C7FCA290380FE0FEA214F10107
-5BA2903803FBF8A201015B14FF6D5BA26E5AA36E5AB1903803FFF8497F497FA26D5B6D5B
-2B387EB730>I<001FB612FC4815FE5AA490C7EA03FCED07F816F0150FED1FE016C0153F
-ED7F80003E1500C85A4A5A5D14034A5A5D140F4A5A5D143F4A5A92C7FC5C495A5C130349
-5A5C130F495A5C133F495A91C8FC5B4848147C4914FE1203485A5B120F485A5B123F485A
-90B6FCB7FCA46C15FC27387CB730>I<007FB5FCB61280A4150048C8FCB3B3B3A5B6FC15
-80A46C140019476DBE30>I<007FB5FCB61280A47EC7123FB3B3B3A5007FB5FCB6FCA46C
-140019477DBE30>93 D<1307EB1FC0EB7FF0497E000313FE000FEBFF80003F14E0D87FFD
-13F039FFF07FF8EBC01FEB800F38FE0003007CEB01F00010EB00401D0E77B730>I<007F
-B612F0A2B712F8A36C15F0A225077B7D30>I<EB3FFC48B57E4814E04880488048809038
-F00FFE9038E001FF806F7E6C48133F6C4880C8121FA491B5FC130F137F48B6FC12075A48
-EBC01F383FFC00EA7FE0138048C7FC5AA46C143FA26C6C137F9038C001FF263FF80FEBFF
-C06CB712E0A2000714F76C14C3C6020013C0D93FF090C7FC2B2A7CA830>97
-D<EA3FFC487E12FFA2127F123F1200AAEC03FE91381FFF80027F13E091B57E90B612FC82
-ECFE079138F001FF4A6C13804A137F4AEB3FC091C7121F4915E0160FA217F01607A8160F
-A217E07F161F6EEB3FC0A26EEB7F806E13FFDAF00313009138FC0FFE91B55A5E495CD97E
-7F13C0D93C1F90C7FC90380003FC2C3980B730>I<ECFFE0010713FC011F7F017F7F90B6
-12804815C048EB807F3907FC003F485A485A49EB1F804848EB0F004990C7FC127F90C9FC
-A25A5AA87E7EA27F003FEC07C06DEB0FE06C7E6D131F6C6C14C0D807FE133F9039FFC0FF
-806C90B5FCC615006D5B011F13F801075B01011380232A7AA830>I<913801FFE04A7F5C
-A28080EC0007AAEB03FE90381FFF874913E790B6FC5A5A481303380FFC00D81FF0133F49
-131F485A150F4848130790C7FCA25AA25AA87E6C140FA27F003F141F6D133F6C7E6D137F
-390FF801FF2607FE07EBFFC06CB712E06C16F06C14F76D01C713E0011F010313C0D907FC
-C8FC2C397DB730>I<49B4FC010713E0011F13F8017F7F90B57E488048018113803A07FC
-007FC04848133FD81FE0EB1FE0150F484814F0491307127F90C7FCED03F85A5AB7FCA516
-F048C9FC7E7EA27F003FEC01F06DEB03F86C7E6C7E6D1307D807FEEB1FF03A03FFC07FE0
-6C90B5FC6C15C0013F14806DEBFE00010713F8010013C0252A7CA830>I<EDFF80020713
-E0021F13F05C4A13F891B5FC491387903803FE079138FC03F0903907F800C04A1300A800
-3FB612C04815E0B7FCA36C15C0260007F0C7FCB3A9003FB512FE4880B71280A26C15006C
-5C25397DB830>I<D903FC13FF90261FFF8713C04913DF90B712E05A5A2607FE07138F90
-3AF801FE07C048486C6CC7FCA2497F001F8149133FA56D137F000F92C7FC6D5BA26C6C48
-5AEBFE0790B55A5D485C15C001DF5BD9C3FCC8FC01C0C9FCA37F7F6CB512F015FF6C15C0
-4815F0488148813A3FE0001FFE0180130148C8127F007E8100FE168048151FA56C153F00
-7FED7F006D5C6C6C495A01F013076CB4EB7FFC6C90B55A6C5D000115C06C6C91C7FC011F
-13FC010113C02B3E7DA730>I<EA3FFC487E12FFA2127F123F1200AAEC01FE91380FFF80
-023F13E091B57E90B67EA29138FE07FCECF8039138E001FE14C0EC8000A291C7FCA25BB3
-A23B3FFFF81FFFF8486D4813FCB500FE14FEA26C01FC14FC6C496C13F82F3880B730>I<
-14E0EB03F8A2497EA36D5AA2EB00E091C8FCA9381FFFF8487F5AA27E7EEA0001B3A9003F
-B612C04815E0B7FCA27E6C15C023397AB830>I<EC01C0EC07F0A2EC0FF8A3EC07F0A2EC
-01C091C7FCA990B512F04814F8A47EEB0003B3B3A5EC07F0A2123C007EEB0FE0B4131FEC
-3FC0147F90B512806C14005C6C5B000F13F0000313C01D4E7CB830>I<EA7FF8487EA412
-7F1200AB0203B512804A14C017E0A217C06E14809139001FE0004B5A4B5A4BC7FC4A5A4A
-5AEC0FF84A5A4A5A4A5A4A5A01FD7F90B57E8114F7ECE3F8ECC1FCEC81FEEC00FF497F49
-6D7E6F7E826F7E15076F7E6F7E3B7FFFF81FFFE0B56C4813F017F8A217F06C496C13E02D
-387FB730>I<387FFFF8B57EA47EEA0001B3B3A8007FB612F0B712F8A46C15F025387BB7
-30>I<02FC137E3B7FC3FF01FF80D8FFEF01877F90B500CF7F15DF92B57E6C010F138726
-07FE07EB03F801FC13FE9039F803FC01A201F013F8A301E013F0B3A23C7FFE0FFF07FF80
-B548018F13C0A46C486C01071380322881A730>I<EC01FE3A3FFC0FFF80267FFE3F13E0
-00FF90B57E90B67E7E6C9038FE07FCC6EBF8039138E001FE14C0EC8000A291C7FCA25BB3
-A23B3FFFF81FFFF8486D4813FCB500FE14FEA26C01FC14FC6C496C13F82F2880A730>I<
-49B4FC010F13E0013F13F8497F90B57E0003ECFF8014013A07FC007FC04848EB3FE0D81F
-E0EB0FF0A24848EB07F8491303007F15FC90C71201A300FEEC00FEA86C14016C15FCA26D
-1303003F15F86D13076D130F6C6CEB1FF06C6CEB3FE06D137F3A07FF01FFC06C90B51280
-6C15006C6C13FC6D5B010F13E0010190C7FC272A7CA830>I<EC03FE3A3FFC1FFF80267F
-FE7F13E000FF90B57E90B612FC6C816CEBFE07C69038F001FF4A6C13804A137F4AEB3FC0
-91C7121F4915E0160FA217F01607A8160FA217E07F161F6EEB3FC0A26EEB7F806E13FFDA
-F00313009138FC0FFE91B55A5E495C6E13C0021F90C7FCEC03FC91C9FCAD383FFFF8487F
-B57EA26C5B6C5B2C3C80A730>I<49B413F8010FEBC1FC013F13F14913FD48B6FC5A4813
-81390FFC007F49131F4848130F491307485A491303127F90C7FC15015A5AA77E7E15037F
-A26C6C1307150F6C6C131F6C6C133F01FC137F3907FF01FF6C90B5FC6C14FD6C14F9013F
-13F1010F13C1903803FE0190C7FCAD92B512F84A14FCA46E14F82E3C7DA730>I<ED07F8
-3A3FFF803FFF486DB51280B512C302CF14C06C13DF6C9038FFFC3FD8001F13E09238801F
-809238000F004A90C7FC5C5C5CA25CA45CAF003FB512FC4880B7FCA26C5C6C5C2A287EA7
-30>I<90381FFC1E48B5129F000714FF5A5A5A387FF007EB800100FEC7FC4880A46C143E
-007F91C7FC13E06CB4FC6C13FC6CEBFF806C14E0000114F86C6C7F01037F9038000FFF02
-001380007C147F00FEEC1FC0A2150F7EA27F151F6DEB3F806D137F9039FC03FF0090B6FC
-5D5D00FC14F0D8F83F13C026780FFEC7FC222A79A830>I<EB0780497E131FA9003FB612
-E04815F0B7FCA36C15E026001FC0C7FCB216F8ED01FCA5ECE003010FEB07F814F09138FC
-1FF06DB512E06D14C016806D14009038007FFCEC1FF026337EB130>I<D83FFCEB3FFC48
-6C497E00FF14FFA2007F147F003F143F00001400B3A41501A2150315076D130F903A7FC0
-7FFFF891B612FC6D15FE7F6D4913FC6D9038F87FF8010001C0C7FC2F2880A630>I<3B3F
-FFC07FFF80486DB512C0B515E0A26C16C06C496C13803B01F80003F000A26D130700005D
-A26D130F017E5CA2017F131F6D5CA2EC803F011F91C7FCA26E5A010F137EA2ECE0FE0107
-5BA214F101035BA3903801FBF0A314FF6D5BA36E5A6E5A2B277EA630>I<3B3FFFC01FFF
-E0486D4813F0B515F8A26C16F06C496C13E0D807E0C7EA3F00A26D5C0003157EA56D14FE
-00015DEC0F80EC1FC0EC3FE0A33A00FC7FF1F8A2147DA2ECFDF9017C5C14F8A3017E13FB
-A290393FF07FE0A3ECE03FA2011F5C90390F800F802D277FA630>I<3A3FFF81FFFC4801
-C37FB580A26C5D6C01815BC648C66CC7FC137FEC80FE90383F81FC90381FC3F8EB0FE3EC
-E7F06DB45A6D5B7F6D5B92C8FC147E147F5C497F81903803F7E0EB07E790380FE3F0ECC1
-F890381F81FC90383F80FE90387F007E017E137F01FE6D7E48486D7E267FFF80B5FCB500
-C1148014E3A214C16C0180140029277DA630>I<3B3FFFC07FFF80486DB512C0B515E0A2
-6C16C06C496C13803B01FC0003F000A2000014076D5C137E150F017F5C7F151FD91F805B
-A214C0010F49C7FCA214E00107137EA2EB03F0157C15FCEB01F85DA2EB00F9ECFDF0147D
-147FA26E5AA36E5AA35DA2143F92C8FCA25C147EA2000F13FE486C5AEA3FC1EBC3F81387
-EB8FF0EBFFE06C5B5C6C90C9FC6C5AEA01F02B3C7EA630>I<001FB612FC4815FE5AA316
-FC90C7EA0FF8ED1FF0ED3FE0ED7FC0EDFF80003E491300C7485A4A5A4A5A4A5A4A5A4A5A
-4A5A4990C7FC495A495A495A495A495A495A4948133E4890C7127F485A485A485A485A48
-5A48B7FCB8FCA46C15FE28277DA630>I<ED3FF0913803FFF8140F5C147F16F09138FFF0
-0092C7FC495A5CB3A21303495A133F383FFFF0B55A5C91C8FC14C080003F7F38003FF813
-076D7E1301B3A2806D7E15F091387FFFF016F8141F8014039138003FF025477BBE30>I<
-127CA212FEB3B3B3AD127CA207476CBE30>I<EA7FE0EAFFFE6D7E8014F07EC66C7E1307
-6D7E1301B3A2806D7E15E091387FFFE06E13F8801407141F5C4A13E09138FFE00092C7FC
-495A5CB3A21303495A137F387FFFF0B5FC14C05C49C8FCEA7FE025477BBE30>I<017C13
-3848B4137C48EB80FE4813C14813C348EBEFFC397FEFFFF0D8FF8713E0010713C0486C13
-80D87C0113003838007C1F0C78B730>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fk cmbx12 14.4 49
-/Fk 49 122 df<EEFFFC031FEBFF804AB612E0020781021F9038C00FF8913A7FFE0003FC
-DAFFF0EB00FE4949EB03FF4901805B4990C7487F49485CA2495A4D7F013F6F5B5CA37190
-C7FC715AEF01F894C9FCA90403B512C0BAFCA526003FFCC7120783B3B3A6003FB5D8FC03
-B612C0A542547DD34B>12 D<B712F0AB240B7F9F2D>45 D<EA07F0487E487E487E487EB5
-1280A76C13006C5A6C5A6C5A6C5A1111769025>I<157815FC14031407141F14FF130F00
-07B5FCB6FCA2147F13F0EAF800C7FCB3B3B3A6007FB712FEA52F4E76CD43>49
-D<EC3FFE0103B512E0010F14FC013F14FF90B712C048D9C07F7F2703FE000F13F8D807F8
-01037FD80FE06D7F48486D7F48488001F01680486C6E13C07F486C6E13E07FA27013F0A5
-6C5AA26C5AEA0FF0EA03C0C914E05EA218C05E1880A24C13005F4C5A4B5B5F4B5B5F4B5B
-4B90C7FC4B5A5E4B5AED7FE04B5A4A5B4A48C8FC4A5A5D4A48EB01F04A5AEC3F804AC7FC
-02FEEC03E0495A495A495A495AD91F80140749C8FC013E150F017FB7FC90B812C05A5A5A
-5A5A5A5AB9FC1880A4344E79CD43>I<91380FFFC091B512FC0107ECFF80011F15E09026
-3FF8077F9026FF800113FC4848C76C7ED803F86E7E491680D807FC8048B416C080486D15
-E0A4805CA36C17C06C5B6C90C75AD801FC1680C9FC4C13005FA24C5A4B5B4B5B4B13C04B
-5BDBFFFEC7FC91B512F816E016FCEEFF80DA000713E0030113F89238007FFE707E701380
-7013C018E07013F0A218F8A27013FCA218FEA2EA03E0EA0FF8487E487E487EB57EA318FC
-A25E18F891C7FC6C17F0495C6C4816E001F04A13C06C484A1380D80FF84A13006CB44A5A
-6CD9F0075BC690B612F06D5D011F1580010302FCC7FCD9001F1380374F7ACD43>I<177C
-17FEA2160116031607160FA2161F163F167FA216FF5D5DA25D5DED1FBFED3F3F153E157C
-15FCEC01F815F0EC03E01407EC0FC01580EC1F005C147E147C5C1301495A495A5C495A13
-1F49C7FC133E5B13FC485A5B485A1207485A485A90C8FC123E127E5ABA12C0A5C96C48C7
-FCAF020FB712C0A53A4F7CCE43>I<D80380150ED807E0157E01FEEC03FED9FFF0137F91
-B65A5F5F5F5F5F94C7FC5E5E16F016C093C8FC15F801E190C9FC01E0CAFCABEC0FFF027F
-13F001E3B512FE01E76E7E9026FFF8077FDAC0017F49C713F8496E7E49143F4981496E7E
-6C481680C9FC18C08218E0A418F0A3EA0FE0487E487E487E487EA418E0A35B6C484A13C0
-5B491680003EC85A003F17006C6C4A5A6D5D6C6C4A5AD807F8495BD803FE01075B2701FF
-C03F5B6C90B65A013F4AC7FC6D14F8010314C09026007FF8C8FC344F79CD43>I<ED0FFF
-92B512E0020780021F14FC91397FFE03FE903A01FFF0007F4901C0EB3F804990C7121F49
-48EC7FC0494814FF49484913E049485B01FF5C485BA2485B5AA2486F13C04A6D1380486F
-1300177E94C7FC5AA291CAFC5AA21508913801FFF8020713FFB54814C04A14F04AC66C7E
-023C6D7E4A6D7E4A6D7E7013804A15C0A24A15E07013F05C18F8A491C714FCA37EA67EA4
-6C17F880A27E18F06C5D18E06C6D15C07E6E4913806C6D15006D6C495A6D6CEB7FFC6DB4
-48485A6D90B55A010315C0010092C7FC023F13FC020713C0364F7ACD43>I<121F7F7FEB
-FF8091B81280A45A1900606060A2606060485F0180C86CC7FC007EC95A4C5A007C4B5A5F
-4C5A160F4C5A484B5A4C5A94C8FC16FEC812014B5A5E4B5A150F4B5AA24B5AA24B5A15FF
-A24A90C9FCA25C5D1407A2140FA25D141FA2143FA4147F5DA314FFA55BAC6D5BA2EC3FC0
-6E5A395279D043>I<913807FFC0027F13FC0103B67E010F15E090261FFC0113F8903A3F
-E0003FFCD97F80EB0FFE49C76C7E48488048486E1380000717C04980120F18E0177FA212
-1F7FA27F7F6E14FF02E015C014F802FE4913806C7FDBC00313009238F007FE6C02F85B92
-38FE1FF86C9138FFBFF06CEDFFE017806C4BC7FC6D806D81010F15E06D81010115FC0107
-81011F81491680EBFFE748018115C048D9007F14E04848011F14F048487F484813030300
-14F8484880161F4848020713FC1601824848157F173FA2171FA2170FA218F8A27F007F17
-F06D151FA26C6CED3FE0001F17C06D157F6C6CEDFF806C6C6C010313006C01E0EB0FFE6C
-01FCEBFFFC6C6CB612F06D5D010F1580010102FCC7FCD9000F13C0364F7ACD43>I<9138
-0FFF8091B512F8010314FE010F6E7E4901037F90267FF8007F4948EB3FF048496D7E4849
-80486F7E484980824817805A91C714C05A7013E0A218F0B5FCA318F8A618FCA46C5DA37E
-A25E6C7F6C5DA26C5D6C7F6C6D137B6C6D13F390387FF803011FB512E36D14C301030283
-13F89039007FFE03EC00401500A218F05EA3D801F816E0487E486C16C0487E486D491380
-A218005E5F4C5A91C7FC6C484A5A494A5A49495B6C48495BD803FC010F5B9027FF807FFE
-C7FC6C90B55A6C6C14F06D14C0010F49C8FC010013F0364F7ACD43>I<91B5FC010F14F8
-017F14FF90B712C00003D9C00F7F2707FC00017FD80FE06D7F48486E7E48C87FD87FE06E
-7E7F7F486C1680A66C5A18006C485C6C5AC9485A5F4B5B4B5B4B5B4B5B4B90C7FC16FC4B
-5A4B5A16C04B5A93C8FC4A5A5D14035D5D14075DA25D140FA25DAB91CAFCAAEC1FC04A7E
-ECFFF8497FA2497FA76D5BA26D5BEC3FE06E5A315479D340>63 D<BA7E19FCF1FF801AF0
-1AFCD8000701F0C7000F13FF060014C0071F7F070713F807017F737F747E747F747F8674
-7F747F8886888688A2757EA31D8087A21DC0A51DE0A387A963A31DC0A51D80A2631D00A3
-515AA2646264505B6264505B505B5090C7FCF2FFFE4F5B07075B071F5B96B512C0060F91
-C8FCBB5A1AF01AC007FCC9FC19805B527CD167>68 D<BC1280A5D8000701F8C7000114C0
-F0001F19071901851A7F1A3F1A1FA2F20FE0A21A07A31A03A318F81BF01A01A497C7FC17
-01A317031707170F177F92B6FCA59238F8007F170F170717031701A317001B3EA31B7CA3
-95C8FCA21BFCA21BF8A21A01A31A031BF01A071A0FA21A1F1A3FF27FE0F101FF1907191F
-0603B5FCBCFCA21BC0A34F517CD058>I<BB12FEA5D8000701F8C700077FF0007F191F19
-0785858586861B80A21A1FA31A0FA41BC006F81307A497C7FCA31701A317031707170F17
-7F92B6FCA59238F8007F170F170717031701A31700A795C9FCB3B812F8A54A517CD055>
-I<B8D8C003B8FCA5D8000701F8C9001FEBE000B3AE92BAFCA503F8C9121FB3B1B8D8C003
-B8FCA560527CD169>72 D<B812C0A5D8000701F8C7FCB3B3B3B2B812C0A52A527CD132>
-I<027FB71280A591C76C90C7FCB3B3B3EA07F0EA1FFC487E487EA2B57EA44C5AA34A485B
-7E49495BD83FF8495BD81FE05DD80FFC011F5B2707FF807F90C8FC000190B512FC6C6C14
-F0011F14C0010101F8C9FC39537DD145>I<B812F8A5D8000701F8CAFCB3B3A91A7CA41A
-FC1AF8A51901A31903A219071AF0190FA2191F193F197F19FF180360183F4DB5FCBB12E0
-A546527CD151>76 D<B600FC073FB512FE6F61A26F96B6FCA2D80007F5C00070EF01EFA2
-02EF6DEF03CFA202E76DEF078FA202E36DEF0F0FA202E16D171EA302E06D173CA26F6C17
-78A26F6C17F0A26F6DED01E0A26F6DED03C0A36F6DED0780A26F6DED0F00A26F6D151EA2
-6F6D5DA3706C5DA2706C5DA2706D495AA2706D495AA2706D495AA3706D49C7FCA2706D13
-1EA2706D5BA2716C5BA3716C5BA271EB81E0A271EBC3C0A271EBE780A27101FFC8FCA371
-5BA2715BA2725AA2725AA2D93FFC6F5AB74DB712FEA2725AA2725A77527CD180>I<BAFC
-19F819FF1AE086D8000701F0C7001F13FC060113FF726C13807313C0070F13E01BF08573
-13F81BFCA27313FEA41BFFA81BFEA31BFC61A21BF84F13F04F13E0614F13C04F13004E48
-5A061F5B92B812F01AC04FC7FC19E003F8CBFCB3AEB812C0A550527CD15C>80
-D<B912F0F0FF8019F819FF1AC0D8000701F0C714F0060F7F060113FE727F737F737F8573
-7F87A2737FA387A863A2616363A24F5B4F5B4F90C8FC4F5A06035B060F13F095B512C092
-B8C9FC19F819E019F89226F0000313FE9439007FFF80727F727F727F727F727F8684A286
-84A787A71D1C75133EA38575137E73157C7513FC731401B86C6D9038F803F807039038FE
-07F07390B512E0736C14C0080F1400CEEA7FFC5F537CD164>82 D<91260FFF80130791B5
-00F85B010702FF5B011FEDC03F49EDF07F9026FFFC006D5A4801E0EB0FFD4801800101B5
-FC4848C87E48488149150F001F824981123F4981007F82A28412FF84A27FA26D82A27F7F
-6D93C7FC14C06C13F014FF15F86CECFF8016FC6CEDFFC017F06C16FC6C16FF6C17C06C83
-6C836D826D82010F821303010082021F16801400030F15C0ED007F040714E01600173F05
-0F13F08383A200788200F882A3187FA27EA219E07EA26CEFFFC0A27F6D4B13806D17006D
-5D01FC4B5A01FF4B5A02C04A5A02F8EC7FF0903B1FFFC003FFE0486C90B65AD8FC0393C7
-FC48C66C14FC48010F14F048D9007F90C8FC3C5479D24B>I<003FBC1280A59126C0003F
-9038C0007F49C71607D87FF8060113C001E08449197F49193F90C8171FA2007E1A0FA300
-7C1A07A500FC1BE0481A03A6C994C7FCB3B3AC91B912F0A553517BD05E>I<B800C00103
-B612FCA5D8000701F8CAEBF000F31F80B3B3B11B3FA26D97C7FC81637F1B7E6D6D17FE50
-5A6E7E505A6E6D15076E4D5A6E6D4B5A6E6D4B5A6E01F84B5A6E6DDA03FFC8FC6E6CB46C
-EB0FFE6F9039F001FFF8030F90B65A030316C0DB007F92C9FC040F14F8DC007F13805E53
-7CD167>I<B700FC017FB600FE91B612F0A5D8003F01C0C8001F01E0C9EBF8006F71EE0F
-C06D7161876F1C1F6D7196C7FC6F8373606D1E3E6F836D7160876F1CFC6D666F4B801F01
-6D66704A806E525A88704A17076E059F5F70021F80080F160F6E6570023F806EDC3E074C
-C8FC8870027E5F6EDC7C03163E7002FC804F6C167E6E1C7C700101814F6C16FC6E745B70
-010317016E4C6D5D060716C00580496D14036F63DDC00F16E04F6D14076F07F05BDDE01F
-170F6F92C76C5D1DF8DDF03E6E141F6F98C9FCDDF87E16FC067C6E5C6FF1FE3EDDFCFC17
-7E6F4A6E147C1DFFDDFFF06E14FC6F62A24E816F62A270496F5BA24E817061A295C97E70
-61A270487090CAFCA37048705AA24D1601040360A27048705A84537DD18B>87
-D<EC7FFF0107B512F0013F14FE90B77E48D9E00F7F2703FE000113F0486C6D7F6EEB3FFC
-48826E131F83707FA36C496D7FA26C90C7FC6C5AC9FCA6037FB5FC020FB6FC91B7FC0107
-1487013FEBF0074913803901FFFC004813F0485B485B485B4890C7FC5A5BA2485AA45EA2
-6D5C007F151D163D6C6C02797F6C6D01F113F86C9026C003E1EBFFE06C9026F81FC014F0
-6C90B5487EC6ED001F011F01FC010713E0010101E090C8FC3C387CB641>97
-D<EB3FF0B5FCA51203C6FCB3A4923801FFE0030F13FE033FEBFFC092B612F002F301017F
-913AF7F8003FFEDAFFE0EB0FFF03806D7F92C76C7F4A6E7F4A824A6E7FA2727EA285A285
-84A31A80AC1A00A44E5AA36118FF616E4A5BA26E4A5B6E4A5B6F495BDACFC04990C7FCDA
-87F0EB7FFC913A03FE03FFF849C6B612E0496D148049011F01FCC8FC90C7000313C04154
-7BD24B>I<913801FFF8021FEBFF8091B612F0010315FC010F9038C00FFE903A1FFE0001
-FFD97FFC491380D9FFF05B4817C048495B5C5A485BA2486F138091C7FC486F1300705A48
-92C8FC5BA312FFAD127F7FA27EA2EF03E06C7F17076C6D15C07E6E140F6CEE1F806C6DEC
-3F006C6D147ED97FFE5C6D6CEB03F8010F9038E01FF0010390B55A01001580023F49C7FC
-020113E033387CB63C>I<4DB47E0407B5FCA5EE001F1707B3A4913801FFE0021F13FC91
-B6FC010315C7010F9038E03FE74990380007F7D97FFC0101B5FC49487F4849143F484980
-485B83485B5A91C8FC5AA3485AA412FFAC127FA36C7EA37EA26C7F5F6C6D5C7E6C6D5C6C
-6D49B5FC6D6C4914E0D93FFED90FEFEBFF80903A0FFFC07FCF6D90B5128F0101ECFE0FD9
-003F13F8020301C049C7FC41547CD24B>I<913803FFC0023F13FC49B6FC010715C04901
-817F903A3FFC007FF849486D7E49486D7E4849130F48496D7E48178048497F18C0488191
-C7FC4817E0A248815B18F0A212FFA490B8FCA318E049CAFCA6127FA27F7EA218E06CEE01
-F06E14037E6C6DEC07E0A26C6DEC0FC06C6D141F6C6DEC3F806D6CECFF00D91FFEEB03FE
-903A0FFFC03FF8010390B55A010015C0021F49C7FC020113F034387CB63D>I<ED3FFC02
-03B5FC020F14C0023F14E09139FFF81FF0499038C03FF849EB807F49903800FFFC495A49
-5AA2495AA2EE7FF8495AEE3FF0EE0FC093C7FCAEB712E0A526007FF8C8FCB3B3A7007FB5
-12FEA52E547CD329>I<DA3FFF14FF0103B5D8F00713C0010FDAFC1F13E0013FECFF7F90
-267FFC0F9038FF9FF09026FFE001EBF83F48496C13E0484990387FF01F4890C7D83FF813
-E0489338FC0FC0F0078048486E6CC7FCA2003F82A9001F5EA26C6C4A5AA26C5E6C6D495A
-6C6D495A6C6D485BDAFC0F5B4890B6C8FCD803EF14FC01C314F02607C03F90C9FC91CBFC
-A2120FA37FA213F813FE90B7FC6C16F817FF18C06C836C836C836D828448B9FC12074848
-C700031480D81FF8EC003F4848150748486F13C083485A83A56D5D007F18806D5D003F18
-006C6C4B5AD80FFEED1FFC6C6C6CEC7FF86C01E049485A6C01FE011F5B6C6CB71280010F
-03FCC7FC010115E0D9000F01FCC8FC3C4F7CB543>I<EB3FF0B5FCA51203C6FCB3A4EE1F
-FC93B512C0030314F0030F8092391FE07FFC92393F001FFE037C8003F07FDAF1E081ECF3
-C0DAF7807F8502FFC7FC5CA25CA45CB3ACB6D8F807B612C0A542537BD24B>I<137F497E
-000313E0487FA2487FA76C5BA26C5BC613806DC7FC90C8FCADEB3FF0B5FCA512017EB3B3
-A6B612E0A51B547BD325>I<EB3FF0B5FCA51203C6FCB3A54CB512F8A59339003FFE00EF
-1FF0EF3FC04D5A4DC7FCEE03FEEE07F84C5A4C5AEE7FC04CC8FC4B5A4B5AED0FF8ED1FE0
-4B7E4B7EECF1FF02F37F02F77F91B6FC83159F030F7F02FE80DAF8077F4A7E6F7F6F7F83
-707E82707F84707F707F82707F84707F177F717E4D13C0B6D8F003B6FCA540537CD247>
-107 D<EB3FF0B5FCA512017EB3B3B3B1B612F0A51C537BD225>I<D93FF0D91FFCEDFFE0
-B591B500C0010713FE030302F0011F6D7E030F6E017F8092271FE07FFCD9FF037F922A3F
-001FFE01F8007F0003027C9126FF03E080C602F06DD90780137FDAF1E0038FC77FDAF3C0
-159EDAF7806D01BC143F07FC8102FFC75C4A5EA24A5EA44A5EB3ACB6D8F807B6D8C03FB5
-12FEA567367BB570>I<D93FF0EB1FFCB591B512C0030314F0030F8092391FE07FFC9239
-3F001FFE0003027C80C602F07FDAF1E081ECF3C0DAF7807F8502FFC7FC5CA25CA45CB3AC
-B6D8F807B612C0A542367BB54B>I<913801FFE0021F13FE91B612C0010315F0010F9038
-807FFC903A1FFC000FFED97FF86D6C7E49486D7F48496D7F48496D7F4A147F48834890C8
-6C7EA24883A248486F7EA3007F1880A400FF18C0AC007F1880A3003F18006D5DA26C5FA2
-6C5F6E147F6C5F6C6D4A5A6C6D495B6C6D495B6D6C495BD93FFE011F90C7FC903A0FFF80
-7FFC6D90B55A010015C0023F91C8FC020113E03A387CB643>I<903A3FF001FFE0B5010F
-13FE033FEBFFC092B612F002F301017F913AF7F8007FFE0003D9FFE0EB1FFFC602806D7F
-92C76C7F4A824A6E7F4A6E7FA2717FA285187F85A4721380AC1A0060A36118FFA2615F61
-6E4A5BA26E4A5B6E4A5B6F495B6F4990C7FC03F0EBFFFC9126FBFE075B02F8B612E06F14
-80031F01FCC8FC030313C092CBFCB1B612F8A5414D7BB54B>I<90397FE003FEB590380F
-FF80033F13E04B13F09238FE1FF89139E1F83FFC0003D9E3E013FEC6ECC07FECE78014EF
-150014EE02FEEB3FFC5CEE1FF8EE0FF04A90C7FCA55CB3AAB612FCA52F367CB537>114
-D<903903FFF00F013FEBFE1F90B7FC120348EB003FD80FF81307D81FE0130148487F4980
-127F90C87EA24881A27FA27F01F091C7FC13FCEBFFC06C13FF15F86C14FF16C06C15F06C
-816C816C81C681013F1580010F15C01300020714E0EC003F030713F015010078EC007F00
-F8153F161F7E160FA27E17E07E6D141F17C07F6DEC3F8001F8EC7F0001FEEB01FE9039FF
-C00FFC6DB55AD8FC1F14E0D8F807148048C601F8C7FC2C387CB635>I<143EA6147EA414
-FEA21301A313031307A2130F131F133F13FF5A000F90B6FCB8FCA426003FFEC8FCB3A9EE
-07C0AB011FEC0F8080A26DEC1F0015806DEBC03E6DEBF0FC6DEBFFF86D6C5B021F5B0203
-13802A4D7ECB34>I<D93FF8913801FFC0B50207B5FCA50003ED001FC61607B3AE5FA35F
-A2017F5D173B177B6D6C14F3DC01E313F06D6CD907C3EBFFC0903A0FFFC03F836D90B512
-03010114FE6D6C13F8020701E091C7FC42377BB54B>I<B600F00107B5FCA5000101F8C8
-EA7FE06C6DED3F00A2017F163E6E157E013F167C6E15FC6D5E6F13016D5E8117036D5E6F
-13076D5E6F130F6D5E6F131F6D93C7FC815F6E6C133E177E023F147C6F13FC6E5C16816E
-5C16C3A26EEBE3E016E76E5C16FF6E5CA26E91C8FCA26F5AA36F5AA26F5AA26F5AA26F5A
-6F5A40367DB447>I<B6D8E07FB5D8C003B512C0A5000101F0C701F0C7381FF8006E027F
-ED07E06C715DA26E023F150F017F705DA26E181F013F4B6C92C7FC6E606D70143E94B5FC
-6F177E6D4A6E137C03C001F315FC6D715B160303E001E114016D020702E05B03F013C06D
-71485A160F03F8D9807F13076D05F85B93381F003F03FC160F027F4902FC5BDBFE3E011F
-131F023F04FE90C8FC167EDBFF7C010F5B6E01FCECFF3E4C6D137E6E5FA24C7F6E5F4C7F
-6E5FA24C7F6E5F4C147FA26E5F93C8123F6F5EA2033E6FC9FC5A367DB461>I<B600F001
-07B5FCA5C601F8C8EA7FE06EED3F00A26D6C153E187E013F167C6E15FC6D5E6F13016D5E
-6F13036D5E8117076D6D5C170F6D6D5C171F6D93C7FC6F5B027F143E6F137E023F147C6F
-13FCA26E6D5A16816EEBC1F016C36E5C16E76E5C16FF6E5CA26E91C8FCA36F5AA26F5AA2
-6F5AA26F5AA26F5AA35E150F5E151F93C9FC5DD81FC0133E486C137E486C137C486C13FC
-5D14015D14034A5A6C48485A49485A263FC07FCAFCEB81FE6CB45A6C13F000035BC690CB
-FC404D7DB447>121 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fl cmr10 10.95 86
-/Fl 86 124 df<4AB4EB0FE0021F9038E03FFC913A7F00F8FC1ED901FC90383FF03FD907
-F090397FE07F80494801FF13FF4948485BD93F805C137F0200ED7F00EF003E01FE6D91C7
-FC82ADB97EA3C648C76CC8FCB3AE486C4A7E007FD9FC3FEBFF80A339407FBF35>11
-D<4AB4FC021F13C091387F01F0903901FC0078D907F0131C4948133E494813FF49485A13
-7F1400A213FE6F5A163893C7FCAA167FB8FCA33900FE00018182B3AC486CECFF80007FD9
-FC3F13FEA32F407FBF33>I<4AB47E021F13F791387F00FFEB01F8903807F001EB0FE0EB
-1FC0EB3F80137F14008101FE80AEB8FCA3C648C77EB3AE486CECFF80007FD9FC3F13FEA3
-2F407FBF33>I<4AB4ECFF80021FD9C00F13E0913B7F01F03F80F8903C01F80078FE003C
-D907F0D93FF8130E49484948131F49484948EB7F804948484913FF137F02005CA201FE92
-C7FC6FED7F0070141C96C7FCAAF13F80BBFCA3C648C76CC7FC197F193FB3AC486C4A6CEB
-7FC0007FD9FC3FD9FE1FB5FCA348407FBF4C>I<121EEA7F80EAFFC0A9EA7F80ACEA3F00
-AC121EAB120CC7FCA8121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A4179C019>33
-D<001E130F397F803FC000FF137F01C013E0A201E013F0A3007F133F391E600F30000013
-00A401E01370491360A3000114E04913C00003130101001380481303000EEB070048130E
-0018130C0038131C003013181C1C7DBE2D>I<013F4C7ED9FFC04B7E2601E0E015072607
-C070150F48486C4B5A023E4BC7FC48486C5D48D90FC0EB01FE003ED90EF0EB07FCDA0F3F
-133E007E903A070FFFF8F8007C0200EBC1F0EE000300FC6D6C495A604D5A171F95C8FC17
-3E177E177C5F16015F007C4948485A1607007E5E003E49495A020E131F003F93C9FC6C49
-133E260F803C137E0238137C6C6C485B3901E0E0016CB448485AD93F0049133F90C74848
-EBFFC0030F903801E0E093398007C0704B4848487E4B153C033E90381F001C4B497F03FC
-133E4B150F4A48017E7F0203147C5D4A4801FCEB0380140F5D4AC7FC5C143E5C14FC5C49
-5A13034948027CEB07005C4948147E011F033E5B91C8140E013E153F017E6F5B017C9238
-0F803C4917380001706C5A49923801E0E0496FB45A6C48043FC7FC41497BC34C>37
-D<EC0FC0EC3FF0ECF878903801F01CEB03E049487E130FEC800F011F7FA2EB3F00A5EC80
-0EA25DA25DA25D6D6C5AECC1C0A2ECC38002E7C7387FFFFCEB0FEE14FC4A020713C06D48
-913801FE006E5DEF00F06D7E4D5A496C5D010F1503D91DFF4A5A013893C7FC496C6C5B01
-E0150E48486C6C131E00036E131C2607801F143C000F6E5B001F6D6C1370263F000714F0
-6F485A48D903FE5B913801FF03486D495A0487C8FCED7FCFED3FFE6F4814386D6D5AA200
-7F6E6C14786D6D6C14704B6C14F06C6C496C6C13E0001F91393E3FC0016C6C903AFC1FF0
-03C03D07FC07F007FC1F800001B5D8C001B512006C6C90C7EA7FFCD90FF8EC0FF03E437C
-C047>I<121EEA7F8012FF13C0A213E0A3127FEA1E601200A413E013C0A3120113801203
-13005A120E5A1218123812300B1C79BE19>I<1430147014E0EB01C0EB03801307EB0F00
-131E133E133C5B13F85B12015B1203A2485AA2120F5BA2121F90C7FCA25AA3123E127EA6
-127C12FCB2127C127EA6123E123FA37EA27F120FA27F1207A26C7EA212017F12007F1378
-7F133E131E7FEB07801303EB01C0EB00E014701430145A77C323>I<12C07E12707E7E12
-1E7E6C7E7F12036C7E7F12007F1378137CA27FA2133F7FA21480130FA214C0A3130714E0
-A6130314F0B214E01307A614C0130FA31480A2131F1400A25B133EA25BA2137813F85B12
-015B485A12075B48C7FC121E121C5A5A5A5A145A7BC323>I<EB03C0A2805CA600F0140F
-00FC143F00FE147F00FF14FF393FC3C3FC390FE187F03903F18FC03900FDBF00EB3FFCEB
-0FF0EB03C0EB0FF0EB3FFCEBFDBF3903F18FC0390FE187F0393FC3C3FC39FF03C0FF00FE
-147F00FC143F00F0140F00001400A6805CA220277AC32D>I<121EEA7F8012FF13C0A213
-E0A3127FEA1E601200A413E013C0A312011380120313005A120E5A1218123812300B1C79
-8919>44 D<B512FEA617067F961E>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A0A79
-8919>I<ED0180ED03C01507A21680150FA216005DA2151E153EA2153C157CA2157815F8
-A25D1401A25D1403A25D1407A25D140FA24AC7FCA2141E143EA2143C147CA2147814F8A2
-5C1301A25C1303A25C1307A25C130FA291C8FC5BA2131E133EA25BA2137813F8A25B1201
-A25B1203A25B1207A25B120FA290C9FC5AA2121E123EA2123C127CA2127812F8A25A1260
-225B7BC32D>I<EB01FE90380FFFC090383F03F090387C00F849137C48487F48487F4848
-EB0F80A2000F15C04848EB07E0A3003F15F0A290C712034815F8A64815FCB3A26C15F8A5
-6C6CEB07F0A3001F15E0A36C6CEB0FC0A26C6CEB1F80000315006C6C133E6C6C5B017C5B
-90383F03F090380FFFC0D901FEC7FC263F7DBC2D>I<EB01C013031307131F137FEA07FF
-B5FC139FEAF81F1200B3B3ACEB7FF0B612F8A31D3D78BC2D>I<EB07FC90383FFF8090B5
-12E03903F01FF83907C007FC390F0001FE001E6D7E001C1580003CEC7FC05AED3FE01270
-B4FC6DEB1FF07FA56C5A6CC7FC120CC813E0153FA216C0157F168015FF16004A5A5D4A5A
-4A5A5D4A5A4A5A4AC7FC147E147C5C495A495A495A495A49C71270133E133C5B4914E048
-5A485A485A48C7120148B6FCA25A4815C0B7FCA3243D7CBC2D>I<EB07FC90383FFF8090
-38F80FE03901E003F839078001FCD80F007F000E6D7E001E1580D81F80137F486C14C07F
-A27F5BA2121F6C5AC8138015FF1600A24A5AA24A5A5DEC07E04A5A023FC7FCEB1FFCECFF
-809038000FE0EC07F86E7E6E7E6E7E1680ED7FC0A216E0153FA216F0A2120C123F487E48
-7EA316E0A249137F6CC713C01278EDFF807E6C4913006C495A3907C007FC3903F80FF0C6
-B55A013F1380D907F8C7FC243F7CBC2D>I<150E151E153EA2157EA215FE1401A21403EC
-077E1406140E141CA214381470A214E0EB01C0A2EB0380EB0700A2130E5BA25B5BA25B5B
-1201485A90C7FC5A120E120C121C5AA25A5AB8FCA3C8EAFE00AC4A7E49B6FCA3283E7EBD
-2D>I<00061403D80780131F01F813FE90B5FC5D5D5D15C092C7FC14FCEB3FE090C9FCAC
-EB01FE90380FFF8090383E03E090387001F8496C7E49137E497F90C713800006141FC813
-C0A216E0150FA316F0A3120C127F7F12FFA416E090C7121F12FC007015C012780038EC3F
-80123C6CEC7F00001F14FE6C6C485A6C6C485A3903F80FE0C6B55A013F90C7FCEB07F824
-3F7CBC2D>I<EC1FE0ECFFF8903803F03E90380FC00F90391F000780133E017EEB1FC049
-133F4848137F12035B12074848EB3F80ED1F00001F91C7FC5BA2123FA3485AA214FE9038
-87FF8039FF8F07E090389C01F09038B800FC01B0137E13F0497F16804914C0A2ED1FE0A3
-4914F0A5127FA6123F6D14E0A2121FED3FC0A26C6C1480A20007EC7F006C6C137E6C6C5B
-6C6C485A90387E07F06DB45A010F1380D903FCC7FC243F7CBC2D>I<1238123C123F90B6
-12FCA316F85A16F016E00078C712010070EC03C0ED078016005D48141E151C153C5DC812
-7015F04A5A5D14034A5A92C7FC5C141EA25CA2147C147814F8A213015C1303A31307A313
-0F5CA2131FA6133FAA6D5A0107C8FC26407BBD2D>I<EB03FC90381FFF8090387C07E090
-38F001F83901E0007C48487F48487F48C7FCED0F80121E16C0003E1407A4123FA26DEB0F
-807F6C6C131F6D140001FC133E6C6C5B9038FF80786C6D5A6CEBF3E06CEBFF806C91C7FC
-133F6D13C06D7F013F13F801787F48486C7E3903E01FFF48486C1380260F800313C04848
-7E489038007FE0003E143F007E141F007CEC0FF01507481403A31501A46C15E0007C1403
-A2007E15C06C14076CEC0F806DEB1F006C6C133ED807F05B3901FC03F86CB512E0011F13
-80D903FCC7FC243F7CBC2D>I<EB03FCEB1FFF90387E07C09038FC03F048486C7E48486C
-7E4848137C000F147E4848137F81003F15805B007F15C0A2151F12FF16E0A516F0A5127F
-153FA36C7EA2001F147F120F6C6C13FF6D13DF000313013900F8039F90387E0F1FD91FFE
-13E0EB07F090C7FCA2ED3FC0A41680157FD80F801400487E486C13FEA24A5A5D49485AEB
-8007391E000FE0001F495A260FC07FC7FC3803FFFE6C13F838003FC0243F7CBC2D>I<12
-1EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121EEA7F80A2EAFFC0A4EA7F80A2EA1E00
-0A2779A619>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121E127FEAFF80A213
-C0A4127F121E1200A412011380A3120313005A1206120E120C121C5A1230A20A3979A619
->I<007FB912E0BA12F0A26C18E0CDFCAE007FB912E0BA12F0A26C18E03C167BA147>61
-D<EB1FF890B5FC3903E01FC0390F0007F0001EEB03F848EB01FC4814FE140000FE14FF7E
-7FA46CC7FC123EC7EA01FEA2EC03FCEC07F815F0EC0FC0EC1F80EC3F00143E5C147814F8
-5C13015CA2495AA25CAB91C7FC90C8FCA8EB0780EB1FE0A2497EA46D5AA2EB078020407B
-BF2B>63 D<15074B7EA34B7EA34B7EA34B7EA34B7E15E7A2913801C7FC15C3A291380381
-FEA34AC67EA3020E6D7EA34A6D7EA34A6D7EA34A6D7EA34A6D7EA349486D7E91B6FCA249
-819138800001A249C87EA24982010E157FA2011E82011C153FA2013C820138151FA20178
-82170F13FC00034C7ED80FFF4B7EB500F0010FB512F8A33D417DC044>65
-D<B712FCEEFF8017F00001903980000FF86C6CC7EA03FE707E701380EF7FC0EF3FE0A2EF
-1FF0A218F8A3170F171FA318F0A2EF3FE0177F18C0EFFF804C1300EE03FCEE0FF8EE7FE0
-91B6C7FC17E091C7EA07FCEE01FE933800FF80EF7FC0EF3FE0EF1FF018F8170F18FC1707
-A218FEA718FC170FA2EF1FF818F0173FEF7FE0EFFFC00403138048486C90380FFE00B85A
-17E094C7FC373E7DBD40>I<DB3FF01306912603FFFE130E020F9038FF801E913A3FF007
-E03E9139FF8000F8D903FEC7EA7C7ED907F8EC1EFE4948140FD93FE0140749481403495A
-91C812014848150012034848167E5B000F173EA24848161EA2123F5B180E127FA3491600
-12FFAC127F7F180EA2123FA27F001F171E181C6C7EA20007173C6D16386C6C1678000117
-706C6C16F06EEC01E06D6C15C06D6C1403D90FF0EC07806D6CEC1F00D903FE143E902600
-FF8013F891393FF007F0020FB512C0020391C7FC9138003FF037427BBF42>I<B712FCEE
-FF8017E000019039C0001FF86C6C48EB03FEEE00FF717E717EEF0FE084717E717E170184
-717EA21980187F19C0A3F03FE0A519F0AB19E0A5F07FC0A21980A218FF19004D5AA24D5A
-6017074D5A4D5AEF7FC04DC7FCEE03FE48486CEB1FF8B85A178004FCC8FC3C3E7DBD45>
-I<B912E0A300019038C000016C6C48EB001FEF0FF01703A217011700A31870A41838161C
-A41800A2163CA2167C16FC150391B5FCA3EC80031500167C163CA2161CA21807A3180E93
-C7FCA4181E181CA2183CA2187CA218F8170117031707171F48486CEB01FFB912F0A3383E
-7DBD3E>I<B91280A300019038C000036C6C48EB007FEF1FC0170F1707A21703A31701A4
-EF00E0A21638A31800A31678A216F81501150791B5FCA3EC8007150115001678A21638A6
-93C8FCAF3801FFE0B612F0A3333E7DBD3B>I<DB3FE0130C912603FFFE131C021F9038FF
-803C913A7FF00FC07C9139FF0001F0D903FC90380078FC4948143DD91FE0141F4948140F
-4948140701FF15034890C8FC491501485A000716005B000F177C5B001F173CA2485AA218
-1C127FA25B95C7FC12FFAB041FB512F0127FA26D9139000FFE00EF03FC123FA27F121FA2
-6C7EA212077F12036C7E7F6C7F6D6C14076D7E6D6C140FD907F8141ED903FEEC3C7C9026
-00FF80EBF83C913A7FF007F01C021FB5EAC00C020391C8FC9138003FF03C427BBF47>I<
-B6D8C01FB512F8A3000101E0C7383FFC0026007F80EC0FF0B3A691B7FCA30280C7120FB3
-A92601FFE0EC3FFCB6D8C01FB512F8A33D3E7DBD44>I<B612F0A3C6EBF000EB3FC0B3B3
-B2EBFFF0B612F0A31C3E7EBD21>I<011FB512FCA3D9000713006E5A1401B3B3A6123FEA
-7F80EAFFC0A44A5A1380D87F005B007C130700385C003C495A6C495A6C495A2603E07EC7
-FC3800FFF8EB3FC026407CBD2F>I<B600C090387FFFFCA3000101E0C7000F138026007F
-80913807FE0018F818E0604D5A4DC7FC173E5F5F4C5A4C5A4C5A4C5A4CC8FC163E5E5E4B
-5A4B5AED07804B7E151F4B7E4B7E15FF913881EFF8913883C7FCEC878791388F03FE9138
-9E01FF14BCDAF8007F4A6D7E5C4A6D7E4A6D7EA2707E707EA2707E707EA2707F717E8417
-3F717E717EA2717E848419802601FFE04A13C0B600C090B6FCA3403E7DBD47>I<B612F8
-A3000101E0C9FC38007F80B3B0EF0380A517071800A45FA35FA25F5F5F4C5A160748486C
-133FB8FCA3313E7DBD39>I<B500C093383FFFF0A300016D93387FF800D8007F18E0D977
-F016EFA3D973F8ED01CFA2D971FCED038FA3D970FEED070FA26E150E80A26E6C141CA36E
-6C1438A26E6C1470A36E6C14E0A26E6CEB01C0A36E6CEB0380A36E6CEB0700A2037F130E
-A36F6C5AA26F6C5AA36F6C5AA25FED07F0A2923803F9C0A36FB45AA26F90C7FCA213F848
-6C147ED807FFEF3FF8B500F8013C011FB512F0A34C3E7DBD53>I<B56C91B512F88080D8
-007F030713006EEC01FC6E6E5A1870EB77FCEB73FEA2EB71FF01707FA26E7E6E7EA26E7E
-6E7EA26E7E6E7EA26E7E6E7FA26F7E6F7EA26F7E6F7EA26F7E6F7EA26F7E6F1380A2EE7F
-C0EE3FE0A2EE1FF0EE0FF8A2EE07FCEE03FEA2EE01FF7013F0A2177F173FA2171F170FA2
-170701F81503487ED807FF1501B500F81400A218703D3E7DBD44>I<ED7FE0913807FFFE
-91391FC03F8091397E0007E04948EB03F8D907F0EB00FE4948147F49486E7E49486E7E49
-C86C7E01FE6F7E00018349150300038348486F7EA248486F7EA2001F188049167F003F18
-C0A3007F18E049163FA300FF18F0AC007F18E06D167FA4003F18C0A26C6CEEFF80A36C6C
-4B1300A26C6C4B5A00035F6D150700015F6C6C4B5A6D5E6D6C4A5A6D6C4A5A6D6C4AC7FC
-6D6C14FED901FCEB03F8D9007FEB0FE091391FC03F80912607FFFEC8FC9138007FE03C42
-7BBF47>I<B712F8EEFF8017E000019039C0003FF86C6C48EB07FCEE01FE707EEF7F80EF
-3FC018E0A2EF1FF0A218F8A818F0A2EF3FE0A218C0EF7F80EFFF004C5AEE07FCEE3FF091
-B612C04CC7FC0280C9FCB3A73801FFE0B612C0A3353E7DBD3E>I<ED7FE0913807FFFE91
-391FC03F8091397F000FE0D901FCEB03F8D907F0EB00FE4948147F49486E7E49486E7E49
-C86C7E498248486F7E49150300038348486F7EA2000F834981001F1880A24848EE7FC0A3
-007F18E0A249163FA200FF18F0AC007F18E0A26D167FA3003F18C0A26C6CEEFF80A3000F
-18006D5D0007DA0F805B6C6C90393FE003FCED70706C6C496C485A6C6C48486C485A017F
-D9800E5BD93F819038061FC0D91FC19038073F80D90FE14AC7FCD907F1EB03FE902601FD
-C013F8903A007EE007E091271FF03FC013180207B5FC9139007FE1E0DB00011438837113
-78A2706C13F0EFFF0318FFA27113E0A37113C0711380711300715AEF01F83D527BBF47>
-I<B712C016FCEEFF800001D9C00013E06C6C48EB1FF0EE07FCEE01FE707E84717EA2717E
-A284A760177F606017FF95C7FCEE01FCEE07F8EE1FE0EEFF8091B500FCC8FC16F0913880
-01FCED003FEE1FC0707E707E83160383160183A383A484A4F0C004190EA28218E0057F13
-1E2601FFE0161CB600C0EB3FF094381FF83805071370CA3801FFE09438003F803F407DBD
-43>I<D907FC130C90391FFF801C017FEBF03C3901FC03F83A03F0007E7CD807C0EB1FFC
-4848130F001F140748C71203003E1401007E1400A2007C157C12FCA2163CA36C151CA27E
-A26C6C14007F7FEA3FF8EBFF806C13F86CEBFF806C14F06C14FC6C14FF6C15C0013F14E0
-010714F0EB007F020713F89138007FFC150FED07FE15031501ED00FFA200E0157FA3163F
-A27EA3163E7E167E6C157C6C15FC6C15F86D13016DEB03F06DEB07E0D8F9FCEB0FC03AF0
-7F803F8090391FFFFE00D8E00713F839C0007FC028427BBF33>I<003FB91280A3903AF0
-007FE001018090393FC0003F48C7ED1FC0007E1707127C00781703A300701701A548EF00
-E0A5C81600B3B14B7E4B7E0107B612FEA33B3D7DBC42>I<B600C090B512F8A3000101E0
-C70007130026007F80EC01FC715A1870B3B3A4013F16F06E5DA21701011F5E80010F1503
-6E4A5A010793C7FC6D6C5C6D6C141E6D6C5C027F14F86E6C485A91390FF00FE00203B512
-80020049C8FCED1FF03D407DBD44>I<B691380FFFFEA3000301E0020113E06C01809138
-007F806CEF3F00017F163E181C6E153C013F1638A26E1578011F1670A26D6C5DA26E1401
-01075EA26E140301035EA26D6C4AC7FCA2806D150EA26F131E027F141CA26F133C023F14
-38A26E6C5BA26F13F0020F5CA2EDF80102075CA26E6C485AA2EDFE07020191C8FCA26F5A
-6E130EA2ED7F9CA216DCED3FF8A36F5AA36F5AA26F5AA36F5A3F407EBD44>I<B500FE01
-7FB5D88007B5FCA3000301C0010101E0C713F86C90C849EC3FE07148EC0F807E7215006E
-143F017F190E84A26D6C60A24D7E6D6C60A2EFE7F86D6C60A2933801C3FC6E18F0010761
-04037F6E0281140101036104077F17006D6C4D5AA2040EEB7F806D6C4DC7FCA24CEB3FC0
-DA7F80160EA24CEB1FE003C0161E023F171C047814F0DBE070010F133C021F173804F014
-F84C1307DA0FF05EA2DBF1C0EB03FCDA07F95EA2DBFB80EB01FEDA03FF6F5AA293C8FCA2
-6E5FA24B157F020094C8FCA24B81037C153EA20378151E0338151C58407EBD5D>I<007F
-B5D8C003B512E0A3C649C7EBFC00D93FF8EC3FE06D48EC1F806D6C92C7FC171E6D6C141C
-6D6C143C5F6D6C14706D6D13F04C5ADA7FC05B023F13036F485ADA1FF090C8FC020F5BED
-F81E913807FC1C163C6E6C5A913801FF7016F06E5B6F5AA26F7E6F7EA28282153FED3BFE
-ED71FF15F103E07F913801C07F0203804B6C7EEC07004A6D7E020E6D7E5C023C6D7E0238
-6D7E14784A6D7E4A6D7F130149486E7E4A6E7E130749C86C7E496F7E497ED9FFC04A7E00
-076DEC7FFFB500FC0103B512FEA33F3E7EBD44>I<B66C0103B51280A3000101F0C8EBF8
-006C6C48ED3FC0725A013F041EC7FC6D7E606D6C15386D6C1578606D6C5D6E14016D5E6D
-6D1303606E6C49C8FC6E6C5B170E6E6C131E171C6E6C5B6E6C137817706E6C13F06F5B6E
-13016EEB83C05FED7FC7DB3FE7C9FC16EFED1FFE5E150F6F5AB3A4ED1FFC020FB512FCA3
-413E7FBD44>I<003FB712F8A391C7EA1FF013F801E0EC3FE00180EC7FC090C8FC003EED
-FF80A2003C4A1300007C4A5A12784B5A4B5AA200704A5AA24B5A4B5AA2C8485A4A90C7FC
-A24A5A4A5AA24A5AA24A5A4A5AA24A5A4A5AA24990C8FCA2495A4948141CA2495A495AA2
-495A495A173C495AA24890C8FC485A1778485A484815F8A24848140116034848140F4848
-143FED01FFB8FCA32E3E7BBD38>I<EAFFFCA4EAF000B3B3B3B3ABEAFFFCA40E5B77C319>
-I<486C13C00003130101001380481303000EEB070048130E0018130C0038131C00301318
-0070133800601330A300E01370481360A400CFEB678039FFC07FE001E013F0A3007F133F
-A2003F131F01C013E0390F0007801C1C73BE2D>I<EAFFFCA4EA003CB3B3B3B3ABEAFFFC
-A40E5B7FC319>I<EB0FF8EBFFFE3903F01F8039078007E0000F6D7E9038E001F8D81FF0
-7F6E7EA3157F6C5AEA0380C8FCA4EC1FFF0103B5FC90381FF87FEB7F803801FC00EA07F8
-EA0FE0485A485AA248C7FCEE038012FEA315FFA3007F5BEC03BF3B3F80071F8700261FC0
-0E13CF3A07F03C0FFE3A01FFF807FC3A003FC001F0292A7DA82D>97
-D<EA01FC12FFA3120712031201B1EC03FC91381FFF8091387C07E09039FDE001F09039FF
-C000FC4A137E91C77E49158049141F17C0EE0FE0A217F0A2160717F8AA17F0A2160FA217
-E0161F17C06D1580EE3F006D5C6E13FE9039F3C001F89039F1E003F09039E0780FC09026
-C03FFFC7FCC7EA07F82D407EBE33>I<49B4FC010F13E090383F00F8017C131E4848131F
-4848137F0007ECFF80485A5B121FA24848EB7F00151C007F91C7FCA290C9FC5AAB6C7EA3
-003FEC01C07F001F140316806C6C13076C6C14000003140E6C6C131E6C6C137890383F01
-F090380FFFC0D901FEC7FC222A7DA828>I<ED01FC15FFA3150715031501B114FF010713
-E190381F80F990387E003D49131FD803F81307485A49130348481301121F123F5B127FA2
-90C7FCA25AAA7E7FA2123FA26C7E000F14037F000714076C6C497E6C6C497ED8007C0179
-13F890383F01F190380FFFC1903A01FE01FC002D407DBE33>I<EB01FE90380FFFC09038
-3F03F09038FC01F848486C7E4848137E48487F000F158049131F001F15C04848130FA212
-7F16E090C7FCA25AA290B6FCA290C9FCA67EA27F123F16E06C7E1501000F15C06C6C1303
-6DEB07806C6C1400C66C131E017E5B90381F80F8903807FFE0010090C7FC232A7EA828>
-I<EC1FC0EC7FF8903801F83C903807E07E90380FC0FFEB1FC1EB3F811401137FEC00FE01
-FE137C1500AEB6FCA3C648C7FCB3AE487E007F13FFA320407EBF1C>I<167C903903F801
-FF903A1FFF078F8090397E0FDE1F9038F803F83803F001A23B07E000FC0600000F6EC7FC
-49137E001F147FA8000F147E6D13FE00075C6C6C485AA23901F803E03903FE0FC026071F
-FFC8FCEB03F80006CAFC120EA3120FA27F7F6CB512E015FE6C6E7E6C15E06C810003813A
-0FC0001FFC48C7EA01FE003E140048157E825A82A46C5D007C153E007E157E6C5D6C6C49
-5A6C6C495AD803F0EB0FC0D800FE017FC7FC90383FFFFC010313C0293D7EA82D>I<EA01
-FC12FFA3120712031201B1EC01FE913807FFC091381E07E091387803F09138E001F8D9FD
-C07F148001FF6D7E91C7FCA25BA25BB3A6486C497EB5D8F87F13FCA32E3F7DBE33>I<EA
-01E0EA07F8A2487EA46C5AA2EA01E0C8FCACEA01FC127FA3120712031201B3AC487EB512
-F0A3143E7DBD1A>I<1478EB01FEA2EB03FFA4EB01FEA2EB00781400AC147FEB7FFFA313
-017F147FB3B3A5123E127F38FF807E14FEA214FCEB81F8EA7F01387C03F0381E07C0380F
-FF803801FC00185185BD1C>I<EA01FC12FFA3120712031201B292B51280A392383FFC00
-16E0168093C7FC153C5D5D4A5AEC07C04A5A4AC8FC143E147F4A7E13FD9038FFDFC0EC9F
-E0140F496C7E01FC7F496C7E1401816E7E81826F7E151F826F7EA282486C14FEB539F07F
-FFE0A32B3F7EBE30>I<EA01FC12FFA3120712031201B3B3B1487EB512F8A3153F7DBE1A>
-I<2701F801FE14FF00FF902707FFC00313E0913B1E07E00F03F0913B7803F03C01F80007
-903BE001F87000FC2603F9C06D487F000101805C01FBD900FF147F91C75B13FF4992C7FC
-A2495CB3A6486C496CECFF80B5D8F87FD9FC3F13FEA347287DA74C>I<3901F801FE00FF
-903807FFC091381E07E091387803F000079038E001F82603F9C07F0001138001FB6D7E91
-C7FC13FF5BA25BB3A6486C497EB5D8F87F13FCA32E287DA733>I<14FF010713E090381F
-81F890387E007E01F8131F4848EB0F804848EB07C04848EB03E0000F15F04848EB01F8A2
-003F15FCA248C812FEA44815FFA96C15FEA36C6CEB01FCA3001F15F86C6CEB03F0A26C6C
-EB07E06C6CEB0FC06C6CEB1F80D8007EEB7E0090383F81FC90380FFFF0010090C7FC282A
-7EA82D>I<3901FC03FC00FF90381FFF8091387C0FE09039FDE003F03A03FFC001FC6C49
-6C7E91C7127F49EC3F805BEE1FC017E0A2EE0FF0A3EE07F8AAEE0FF0A4EE1FE0A2EE3FC0
-6D1580EE7F007F6E13FE9138C001F89039FDE007F09039FC780FC0DA3FFFC7FCEC07F891
-C9FCAD487EB512F8A32D3A7EA733>I<02FF131C0107EBC03C90381F80F090397F00387C
-01FC131CD803F8130E4848EB0FFC150748481303121F485A1501485AA448C7FCAA6C7EA3
-6C7EA2001F14036C7E15076C6C130F6C7E6C6C133DD8007E137990383F81F190380FFFC1
-903801FE0190C7FCAD4B7E92B512F8A32D3A7DA730>I<3901F807E000FFEB1FF8EC787C
-ECE1FE3807F9C100031381EA01FB1401EC00FC01FF1330491300A35BB3A5487EB512FEA3
-1F287EA724>I<90383FC0603901FFF8E03807C03F381F000F003E1307003C1303127C00
-78130112F81400A27E7E7E6D1300EA7FF8EBFFC06C13F86C13FE6C7F6C1480000114C0D8
-003F13E0010313F0EB001FEC0FF800E01303A214017E1400A27E15F07E14016C14E06CEB
-03C0903880078039F3E01F0038E0FFFC38C01FE01D2A7DA824>I<131CA6133CA4137CA2
-13FCA2120112031207001FB512C0B6FCA2D801FCC7FCB3A215E0A912009038FE01C0A2EB
-7F03013F138090381F8700EB07FEEB01F81B397EB723>I<D801FC14FE00FF147FA30007
-14030003140100011400B3A51501A31503120015076DEB06FF017E010E13806D4913FC90
-381FC078903807FFE00100903880FE002E297DA733>I<B539E00FFFE0A32707FE000313
-006C48EB00FC5E00015D7F00005DA26D13016D5CA26D6C485AA2ECC007011F91C7FCA290
-380FE00EA2ECF01E0107131CA26D6C5AA2ECFC7801011370A2ECFEF001005BA2EC7FC0A3
-6E5AA26EC8FCA3140E2B287EA630>I<B53BC3FFFE03FFF8A3290FFE003FE00013C06C48
-6D48EB3F806C4817006D010F141E00016F131C15076D163C00004A6C1338A2017F5E4B7E
-151DD93F805DED3DFC1538D91FC04A5AED78FE9238707E03D90FE0017F5BEDE03F02F014
-0701070387C7FC9138F1C01F02F9148F010315CE9138FB800F02FF14DE6D15FCED00076D
-5DA24A1303027E5CA2027C1301023C5C023813003D287EA642>I<B539F01FFFE0A30003
-D9C00F1300C690388007F8D97F0013E002805BD93FC05B011F49C7FC90380FE00EECF01E
-6D6C5A01035B6D6C5A6E5AEB00FF6E5A6E5A81141F814A7E81147BECF1FC903801E1FEEC
-C0FF01037F49486C7ED90F007F011E6D7E013E130F496D7E01FC80486C80000F4A7EB539
-803FFFF8A32D277FA630>I<B539E00FFFE0A32707FE000313006C48EB01FC6F5A00015D
-7F00005DA2017F495AA2EC8003013F5CA26D6C48C7FCA26E5A010F130EA26D6C5AA2ECF8
-3C01031338A26D6C5AA2ECFEF001005BA2EC7FC0A36E5AA36EC8FCA2140EA2141E141C14
-3C1438A2147800181370127EB45BA2495AA248485AD87E07C9FCEA780EEA3C3CEA1FF8EA
-07E02B3A7EA630>I<001FB61280A2EBE0000180140049485A001E495A121C4A5A003C49
-5A141F00385C4A5A147F5D4AC7FCC6485AA2495A495A130F5C495A90393FC00380A2EB7F
-80EBFF005A5B484813071207491400485A48485BA248485B4848137F00FF495A90B6FCA2
-21277EA628>I<B812F0A22C0280982D>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fm cmbx12 20.736 9
-/Fm 9 123 df<92380FFFE04AB67E020F15F0027F15FE49B87E4917E0010F17F8013F83
-49D9C01F14FF9027FFFC0001814801E06D6C80480180021F804890C86C8048486F804848
-6F8001FF6F804801C06E8002F081486D18806E816E18C0B5821BE06E81A37214F0A56C5B
-A36C5B6C5B6C5B000313C0C690C9FC90CA15E060A34E14C0A21B80601B0060626295B55A
-5F624D5C624D5C4D91C7FC614D5B4D13F04D5B6194B55A4C49C8FC4C5B4C5B4C13E04C5B
-604C90C9FCEE7FFC4C5A4B5B4B5B4B0180EC0FF04B90C8FC4B5A4B5A4B48ED1FE0EDFFE0
-4A5B4A5B4A90C9FC4A48163F4A5ADA3FF017C05D4A48167F4A5A4990CA12FFD903FC1607
-49BAFC5B4919805B5B90BBFC5A5A5A5A481A005A5ABCFCA462A44C7176F061>50
-D<92383FFFF80207B612E0027F15FC49B87E010717E0011F83499026F0007F13FC4948C7
-000F7F90B502036D7E486E6D806F6D80727F486E6E7F8486727FA28684A26C5C72806C5C
-6D90C8FC6D5AEB0FF8EB03E090CAFCA70507B6FC041FB7FC0303B8FC157F0203B9FC021F
-ECFE0391B612800103ECF800010F14C04991C7FC017F13FC90B512F04814C0485C4891C8
-FC485B5A485B5C5A5CA2B5FC5CA360A36E5DA26C5F6E5D187E6C6D846E4A48806C6D4A48
-14FC6C6ED90FF0ECFFFC6C02E090263FE07F14FE00019139FC03FFC06C91B6487E013F4B
-487E010F4B1307010303F01301D9003F0280D9003F13FC020101F8CBFC57507ACE5E>97
-D<903801FFFCB6FCA8C67E131F7FB3ADF0FFFC050FEBFFE0057F14FE0403B77E040F16E0
-043F16F84CD9007F13FE9226FDFFF001077F92B500C001018094C86C13E004FC6F7F4C6F
-7F04E06F7F4C6F7F5E747F93C915804B7014C0A27414E0A21DF087A21DF8A31DFC87A41D
-FEAF1DFCA4631DF8A31DF098B5FC1DE0A25014C0A26F1980501400705D705F704B5B505B
-704B5B04FC4B5BDBE7FE92B55A9226C3FF8001035C038101E0011F49C7FC9226807FFC90
-B55A4B6CB712F04A010F16C04A010393C8FC4A010015F84A023F14C090C9000301F0C9FC
-5F797AF76C>I<97380FFFE00607B6FCA8F00003190086B3AD93383FFF800307B512F803
-3F14FF4AB712C0020716F0021F16FC027F9039FE007FFE91B500F0EB0FFF010302800101
-90B5FC4949C87E49498149498149498149498190B548814884484A8192CAFC5AA2485BA2
-5A5C5AA35A5CA4B5FCAF7EA4807EA37EA2807EA26C7F616C6E5D6C606C80616D6D5D6D6D
-5D6D6D92B67E6D6D4A15FC010301FF0207EDFFFE6D02C0EB3FFE6D6C9039FC01FFF86E90
-B65A020F16C002031600DA007F14FC030F14E09226007FFEC749C7FC5F797AF76C>100
-D<EB01FCEB07FF011F13C0497F497F90B57EA24880A24880A76C5CA26C5CA26D5B6D5B6D
-5B010790C8FCEB01FC90CAFCB2903801FFFC007FB5FCA8C67E131F7FB3B3B3A5B81280A8
-297979F835>105 D<903801FFFCB6FCA8C67E131F7FB3B3B3B3B3ABB812C0A82A7879F7
-35>108 D<902601FFF891380FFFE0B692B512FE05036E7E050F15E0053F15F84D819327
-01FFF01F7F4CD900077FDC07FC6D80C66CDA0FF06D80011FDA1FC07F6D4A48824CC8FC04
-7E6F7F5EEDF9F85E03FB707F5E15FF5EA25EA293C9FCA45DB3B3A6B8D8E003B81280A861
-4E79CD6C>110 D<902601FFFCEC7FFEB6020FB512F0057F14FE4CB712C0040716F0041F
-82047F16FE93B5C66C7F92B500F0010F14C0C66C0380010380011F4AC76C806D4A6E8004
-F06F7F4C6F7F4C6F7F4C8193C915804B7014C0861DE0A27414F0A27414F8A47513FCA575
-13FEAF5113FCA598B512F8A31DF0621DE0621DC0621D806F5E701800704B5B505B704B5B
-7092B55A04FC4A5C704A5C706C010F5C05E0013F49C7FC9227FE7FFC01B55A70B712F004
-0F16C0040393C8FC040015F8053F14C0050301F0C9FC94CCFCB3A6B812E0A85F6F7ACD6C
->112 D<0007BA12FC1AFEA503E0C714FC4AC74814F84801F04A14F05C02804A14E091C8
-4814C04D14805B494B14004D5B4992B55AA24C5C494A5C615E4C5C001F4B5C5B4C91C7FC
-4C5B93B55AA24B5CC8485C4B5CA24B5C4B5C4B91C8FCA24B5B92B55AA24A5C4A5C4A4A14
-FFA24A5C4A5C4A91C8FC614A4915FE91B55A495CA2495C494A14035E5B495C4991C81207
-A24949ED0FFC90B55A484A151FA2484A153F484A157F484A15FF1803484A140F4891C812
-3F48490207B5FC91B9FCBB12F8A57E484D7BCC56>122 D E
-%EndDVIPSBitmapFont
-end
-%%EndProlog
-%%BeginSetup
-%%Feature: *Resolution 600dpi
-TeXDict begin
-%%PaperSize: A4
-
-%%EndSetup
-%%Page: 1 1
-1 0 bop 150 1318 a Fm(bzip2)64 b(and)g(libbzip2)p 150
-1418 3600 34 v 2010 1515 a Fl(a)31 b(program)f(and)g(library)e(for)i
-(data)h(compression)2198 1623 y(cop)m(yrigh)m(t)f(\(C\))h(1996-2000)j
-(Julian)28 b(Sew)m(ard)2605 1731 y(v)m(ersion)i(1.0)h(of)g(21)g(Marc)m
-(h)g(2000)150 5091 y Fk(Julian)46 b(Sew)l(ard)p 150 5141
-3600 17 v eop
-%%Page: 1 2
-1 1 bop 3705 -116 a Fl(1)150 299 y(This)24 b(program,)j
-Fj(bzip2)p Fl(,)e(and)g(asso)s(ciated)i(library)c Fj(libbzip2)p
-Fl(,)i(are)h(Cop)m(yrigh)m(t)g(\(C\))g(1996-2000)j(Julian)150
-408 y(R)h(Sew)m(ard.)40 b(All)29 b(righ)m(ts)h(reserv)m(ed.)150
-565 y(Redistribution)f(and)i(use)h(in)f(source)h(and)g(binary)e(forms,)
-j(with)e(or)h(without)f(mo)s(di\014cation,)g(are)i(p)s(er-)150
-675 y(mitted)d(pro)m(vided)f(that)i(the)f(follo)m(wing)f(conditions)g
-(are)i(met:)225 832 y Fi(\017)60 b Fl(Redistributions)26
-b(of)k(source)g(co)s(de)g(m)m(ust)g(retain)f(the)h(ab)s(o)m(v)m(e)h
-(cop)m(yrigh)m(t)g(notice,)f(this)f(list)f(of)i(con-)330
-941 y(ditions)e(and)i(the)h(follo)m(wing)e(disclaimer.)225
-1076 y Fi(\017)60 b Fl(The)33 b(origin)f(of)h(this)f(soft)m(w)m(are)j
-(m)m(ust)e(not)h(b)s(e)e(misrepresen)m(ted;)i(y)m(ou)g(m)m(ust)f(not)g
-(claim)g(that)h(y)m(ou)330 1185 y(wrote)d(the)h(original)d(soft)m(w)m
-(are.)44 b(If)31 b(y)m(ou)g(use)g(this)f(soft)m(w)m(are)i(in)e(a)h(pro)
-s(duct,)g(an)f(ac)m(kno)m(wledgmen)m(t)330 1295 y(in)f(the)i(pro)s
-(duct)e(do)s(cumen)m(tation)h(w)m(ould)f(b)s(e)h(appreciated)g(but)g
-(is)f(not)i(required.)225 1429 y Fi(\017)60 b Fl(Altered)21
-b(source)g(v)m(ersions)f(m)m(ust)h(b)s(e)f(plainly)e(mark)m(ed)j(as)g
-(suc)m(h,)i(and)d(m)m(ust)h(not)g(b)s(e)f(misrepresen)m(ted)330
-1539 y(as)31 b(b)s(eing)e(the)h(original)f(soft)m(w)m(are.)225
-1674 y Fi(\017)60 b Fl(The)27 b(name)h(of)f(the)h(author)f(ma)m(y)h
-(not)g(b)s(e)f(used)g(to)h(endorse)f(or)h(promote)g(pro)s(ducts)e
-(deriv)m(ed)g(from)330 1783 y(this)j(soft)m(w)m(are)j(without)d(sp)s
-(eci\014c)h(prior)e(written)i(p)s(ermission.)150 1965
-y(THIS)37 b(SOFTW)-10 b(ARE)38 b(IS)f(PR)m(O)m(VIDED)i(BY)g(THE)f(A)m
-(UTHOR)g(\\AS)g(IS")g(AND)h(ANY)f(EXPRESS)150 2074 y(OR)31
-b(IMPLIED)h(W)-10 b(ARRANTIES,)31 b(INCLUDING,)i(BUT)f(NOT)f(LIMITED)g
-(TO,)h(THE)f(IMPLIED)150 2184 y(W)-10 b(ARRANTIES)27
-b(OF)h(MER)m(CHANT)-8 b(ABILITY)28 b(AND)g(FITNESS)f(F)m(OR)g(A)h(P)-8
-b(AR)g(TICULAR)28 b(PUR-)150 2294 y(POSE)37 b(ARE)g(DISCLAIMED.)h(IN)f
-(NO)h(EVENT)f(SHALL)g(THE)g(A)m(UTHOR)h(BE)g(LIABLE)g(F)m(OR)150
-2403 y(ANY)56 b(DIRECT,)f(INDIRECT,)h(INCIDENT)-8 b(AL,)56
-b(SPECIAL,)e(EXEMPLAR)-8 b(Y,)57 b(OR)e(CONSE-)150 2513
-y(QUENTIAL)48 b(D)m(AMA)m(GES)i(\(INCLUDING,)g(BUT)f(NOT)f(LIMITED)g
-(TO,)g(PR)m(OCUREMENT)150 2622 y(OF)35 b(SUBSTITUTE)e(GOODS)i(OR)f(SER)
--10 b(VICES;)34 b(LOSS)f(OF)i(USE,)g(D)m(A)-8 b(T)g(A,)36
-b(OR)f(PR)m(OFITS;)f(OR)150 2732 y(BUSINESS)28 b(INTERR)m(UPTION\))g
-(HO)m(WEVER)i(CA)m(USED)f(AND)g(ON)g(ANY)g(THEOR)-8 b(Y)29
-b(OF)g(LIA-)150 2842 y(BILITY,)36 b(WHETHER)g(IN)g(CONTRA)m(CT,)g
-(STRICT)e(LIABILITY,)i(OR)g(TOR)-8 b(T)35 b(\(INCLUDING)150
-2951 y(NEGLIGENCE)45 b(OR)g(OTHER)-10 b(WISE\))44 b(ARISING)h(IN)g(ANY)
-h(W)-10 b(A)i(Y)46 b(OUT)e(OF)i(THE)e(USE)h(OF)150 3061
-y(THIS)29 b(SOFTW)-10 b(ARE,)31 b(EVEN)f(IF)g(AD)m(VISED)i(OF)e(THE)g
-(POSSIBILITY)e(OF)j(SUCH)f(D)m(AMA)m(GE.)150 3218 y(Julian)e(Sew)m
-(ard,)i(Cam)m(bridge,)g(UK.)150 3374 y Fj(jseward@acm.org)150
-3531 y(http://sourceware.cygnus)o(.com)o(/bzi)o(p2)150
-3688 y(http://www.cacheprof.org)150 3845 y(http://www.muraroa.demon)o
-(.co.)o(uk)150 4002 y(bzip2)p Fl(/)p Fj(libbzip2)d Fl(v)m(ersion)j(1.0)
-i(of)e(21)h(Marc)m(h)g(2000.)150 4159 y(P)-8 b(A)g(TENTS:)40
-b(T)-8 b(o)40 b(the)g(b)s(est)g(of)g(m)m(y)g(kno)m(wledge,)j
-Fj(bzip2)38 b Fl(do)s(es)i(not)g(use)g(an)m(y)g(paten)m(ted)h
-(algorithms.)150 4268 y(Ho)m(w)m(ev)m(er,)33 b(I)e(do)f(not)h(ha)m(v)m
-(e)h(the)f(resources)g(a)m(v)-5 b(ailable)30 b(to)h(carry)g(out)g(a)g
-(full)d(paten)m(t)k(searc)m(h.)42 b(Therefore)150 4378
-y(I)30 b(cannot)h(giv)m(e)g(an)m(y)g(guaran)m(tee)h(of)e(the)h(ab)s(o)m
-(v)m(e)g(statemen)m(t.)p eop
-%%Page: 2 3
-2 2 bop 150 -116 a Fl(Chapter)30 b(1:)41 b(In)m(tro)s(duction)2591
-b(2)150 299 y Fh(1)80 b(In)l(tro)t(duction)150 555 y
-Fj(bzip2)20 b Fl(compresses)h(\014les)f(using)g(the)h(Burro)m
-(ws-Wheeler)g(blo)s(c)m(k-sorting)f(text)j(compression)d(algorithm,)150
-665 y(and)33 b(Hu\013man)g(co)s(ding.)50 b(Compression)32
-b(is)h(generally)g(considerably)f(b)s(etter)i(than)f(that)h(ac)m(hiev)m
-(ed)h(b)m(y)150 775 y(more)f(con)m(v)m(en)m(tional)g(LZ77/LZ78-based)g
-(compressors,)g(and)f(approac)m(hes)h(the)f(p)s(erformance)g(of)h(the)
-150 884 y(PPM)c(family)f(of)i(statistical)f(compressors.)150
-1041 y Fj(bzip2)k Fl(is)h(built)e(on)i(top)h(of)g Fj(libbzip2)p
-Fl(,)e(a)i(\015exible)e(library)f(for)i(handling)e(compressed)i(data)i
-(in)d(the)150 1151 y Fj(bzip2)c Fl(format.)43 b(This)30
-b(man)m(ual)g(describ)s(es)g(b)s(oth)g(ho)m(w)i(to)g(use)f(the)g
-(program)g(and)g(ho)m(w)g(to)h(w)m(ork)f(with)150 1260
-y(the)d(library)d(in)m(terface.)41 b(Most)28 b(of)g(the)g(man)m(ual)f
-(is)g(dev)m(oted)i(to)f(this)f(library)-8 b(,)26 b(not)i(the)g
-(program,)g(whic)m(h)150 1370 y(is)h(go)s(o)s(d)i(news)e(if)h(y)m(our)g
-(in)m(terest)h(is)e(only)g(in)h(the)g(program.)150 1527
-y(Chapter)24 b(2)g(describ)s(es)f(ho)m(w)h(to)h(use)f
-Fj(bzip2)p Fl(;)h(this)e(is)g(the)i(only)e(part)h(y)m(ou)h(need)f(to)h
-(read)f(if)f(y)m(ou)h(just)g(w)m(an)m(t)150 1636 y(to)35
-b(kno)m(w)f(ho)m(w)g(to)g(op)s(erate)h(the)f(program.)51
-b(Chapter)34 b(3)g(describ)s(es)e(the)i(programming)f(in)m(terfaces)h
-(in)150 1746 y(detail,)23 b(and)d(Chapter)h(4)h(records)f(some)h
-(miscellaneous)e(notes)i(whic)m(h)e(I)h(though)m(t)h(ough)m(t)g(to)g(b)
-s(e)f(recorded)150 1855 y(somewhere.)p eop
-%%Page: 3 4
-3 3 bop 150 -116 a Fl(Chapter)30 b(2:)41 b(Ho)m(w)31
-b(to)g(use)f Fj(bzip2)2375 b Fl(3)150 299 y Fh(2)80 b(Ho)l(w)53
-b(to)g(use)g Fg(bzip2)150 566 y Fl(This)29 b(c)m(hapter)i(con)m(tains)f
-(a)h(cop)m(y)g(of)g(the)f Fj(bzip2)f Fl(man)h(page,)h(and)f(nothing)g
-(else.)390 818 y Ff(NAME)570 1004 y Fj(bzip2)p Fl(,)f
-Fj(bunzip2)g Fl(-)h(a)h(blo)s(c)m(k-sorting)f(\014le)f(compressor,)i
-(v1.0)570 1136 y Fj(bzcat)e Fl(-)i(decompresses)f(\014les)f(to)i
-(stdout)570 1267 y Fj(bzip2recover)c Fl(-)k(reco)m(v)m(ers)h(data)f
-(from)f(damaged)g(bzip2)g(\014les)390 1519 y Ff(SYNOPSIS)570
-1706 y Fj(bzip2)f Fl([)h(-cdfkqstvzVL123456789)35 b(])c([)g
-(\014lenames)e(...)41 b(])570 1837 y Fj(bunzip2)28 b
-Fl([)j(-fkvsVL)f(])h([)f(\014lenames)g(...)41 b(])570
-1968 y Fj(bzcat)29 b Fl([)h(-s)h(])g([)f(\014lenames)g(...)41
-b(])570 2100 y Fj(bzip2recover)27 b Fl(\014lename)390
-2352 y Ff(DESCRIPTION)390 2538 y Fj(bzip2)i Fl(compresses)i(\014les)f
-(using)f(the)i(Burro)m(ws-Wheeler)g(blo)s(c)m(k)f(sorting)g(text)i
-(compres-)390 2642 y(sion)40 b(algorithm,)j(and)d(Hu\013man)h(co)s
-(ding.)71 b(Compression)40 b(is)g(generally)g(considerably)390
-2746 y(b)s(etter)25 b(than)g(that)h(ac)m(hiev)m(ed)g(b)m(y)f(more)g
-(con)m(v)m(en)m(tional)h(LZ77/LZ78-based)g(compressors,)390
-2850 y(and)k(approac)m(hes)h(the)f(p)s(erformance)g(of)h(the)f(PPM)g
-(family)f(of)i(statistical)f(compressors.)390 3001 y(The)e
-(command-line)e(options)i(are)h(delib)s(erately)d(v)m(ery)i(similar)e
-(to)j(those)g(of)f(GNU)h Fj(gzip)p Fl(,)390 3104 y(but)h(they)g(are)h
-(not)g(iden)m(tical.)390 3255 y Fj(bzip2)f Fl(exp)s(ects)h(a)g(list)f
-(of)h(\014le)f(names)h(to)h(accompan)m(y)h(the)e(command-line)e
-(\015ags.)43 b(Eac)m(h)390 3359 y(\014le)e(is)h(replaced)g(b)m(y)g(a)h
-(compressed)f(v)m(ersion)g(of)g(itself,)i(with)e(the)g(name)g
-Fj(original_)390 3463 y(name.bz2)p Fl(.)49 b(Eac)m(h)34
-b(compressed)g(\014le)f(has)g(the)h(same)g(mo)s(di\014cation)e(date,)k
-(p)s(ermissions,)390 3567 y(and,)24 b(when)f(p)s(ossible,)f(o)m
-(wnership)f(as)j(the)f(corresp)s(onding)f(original,)h(so)g(that)h
-(these)g(prop-)390 3671 y(erties)34 b(can)g(b)s(e)f(correctly)i
-(restored)f(at)g(decompression)f(time.)51 b(File)34 b(name)g(handling)d
-(is)390 3774 y(naiv)m(e)26 b(in)f(the)i(sense)f(that)h(there)f(is)f(no)
-i(mec)m(hanism)e(for)h(preserving)f(original)f(\014le)i(names,)390
-3878 y(p)s(ermissions,)37 b(o)m(wnerships)f(or)h(dates)i(in)d
-(\014lesystems)h(whic)m(h)g(lac)m(k)h(these)g(concepts,)j(or)390
-3982 y(ha)m(v)m(e)32 b(serious)d(\014le)g(name)i(length)f
-(restrictions,)f(suc)m(h)h(as)h(MS-DOS.)390 4133 y Fj(bzip2)26
-b Fl(and)h Fj(bunzip2)e Fl(will)f(b)m(y)k(default)e(not)i(o)m(v)m
-(erwrite)g(existing)e(\014les.)38 b(If)27 b(y)m(ou)h(w)m(an)m(t)g(this)
-390 4237 y(to)j(happ)s(en,)e(sp)s(ecify)g(the)i Fj(-f)e
-Fl(\015ag.)390 4388 y(If)34 b(no)h(\014le)f(names)g(are)i(sp)s
-(eci\014ed,)e Fj(bzip2)f Fl(compresses)i(from)f(standard)g(input)f(to)j
-(stan-)390 4491 y(dard)c(output.)49 b(In)32 b(this)g(case,)k
-Fj(bzip2)31 b Fl(will)g(decline)h(to)i(write)e(compressed)h(output)g
-(to)h(a)390 4595 y(terminal,)29 b(as)i(this)e(w)m(ould)g(b)s(e)h(en)m
-(tirely)f(incomprehensible)e(and)j(therefore)h(p)s(oin)m(tless.)390
-4746 y Fj(bunzip2)36 b Fl(\(or)j Fj(bzip2)29 b(-d)p Fl(\))37
-b(decompresses)i(all)e(sp)s(eci\014ed)f(\014les.)63 b(Files)37
-b(whic)m(h)g(w)m(ere)i(not)390 4850 y(created)e(b)m(y)f
-Fj(bzip2)f Fl(will)e(b)s(e)i(detected)j(and)d(ignored,)i(and)e(a)i(w)m
-(arning)d(issued.)56 b Fj(bzip2)390 4954 y Fl(attempts)31
-b(to)f(guess)g(the)g(\014lename)f(for)h(the)g(decompressed)f(\014le)g
-(from)h(that)g(of)g(the)g(com-)390 5058 y(pressed)f(\014le)h(as)h
-(follo)m(ws:)570 5209 y Fj(filename.bz2)57 b Fl(b)s(ecomes)31
-b Fj(filename)570 5340 y(filename.bz)58 b Fl(b)s(ecomes)30
-b Fj(filename)p eop
-%%Page: 4 5
-4 4 bop 150 -116 a Fl(Chapter)30 b(2:)41 b(Ho)m(w)31
-b(to)g(use)f Fj(bzip2)2375 b Fl(4)570 299 y Fj(filename.tbz2)27
-b Fl(b)s(ecomes)j Fj(filename.tar)570 470 y(filename.tbz)57
-b Fl(b)s(ecomes)31 b Fj(filename.tar)570 641 y(anyothername)57
-b Fl(b)s(ecomes)31 b Fj(anyothername.out)390 859 y Fl(If)j(the)h
-(\014le)e(do)s(es)i(not)f(end)g(in)f(one)i(of)g(the)g(recognised)f
-(endings,)g Fj(.bz2)p Fl(,)h Fj(.bz)p Fl(,)g Fj(.tbz2)e
-Fl(or)390 963 y Fj(.tbz)p Fl(,)h Fj(bzip2)f Fl(complains)f(that)j(it)e
-(cannot)i(guess)f(the)g(name)h(of)f(the)g(original)e(\014le,)j(and)390
-1067 y(uses)30 b(the)g(original)f(name)h(with)g Fj(.out)f
-Fl(app)s(ended.)390 1218 y(As)j(with)f(compression,)h(supplying)c(no)k
-(\014lenames)f(causes)i(decompression)e(from)h(stan-)390
-1321 y(dard)d(input)g(to)i(standard)e(output.)390 1472
-y Fj(bunzip2)k Fl(will)g(correctly)j(decompress)e(a)i(\014le)e(whic)m
-(h)g(is)h(the)g(concatenation)i(of)e(t)m(w)m(o)i(or)390
-1576 y(more)j(compressed)f(\014les.)67 b(The)39 b(result)g(is)g(the)g
-(concatenation)i(of)f(the)g(corresp)s(onding)390 1680
-y(uncompressed)c(\014les.)59 b(In)m(tegrit)m(y)38 b(testing)f(\()p
-Fj(-t)p Fl(\))g(of)g(concatenated)i(compressed)e(\014les)f(is)390
-1784 y(also)30 b(supp)s(orted.)390 1935 y(Y)-8 b(ou)40
-b(can)g(also)f(compress)g(or)g(decompress)g(\014les)g(to)h(the)f
-(standard)g(output)g(b)m(y)g(giving)390 2039 y(the)30
-b Fj(-c)g Fl(\015ag.)40 b(Multiple)28 b(\014les)h(ma)m(y)i(b)s(e)e
-(compressed)h(and)f(decompressed)h(lik)m(e)f(this.)39
-b(The)390 2142 y(resulting)31 b(outputs)i(are)h(fed)f(sequen)m(tially)f
-(to)i(stdout.)49 b(Compression)32 b(of)h(m)m(ultiple)e(\014les)390
-2246 y(in)24 b(this)g(manner)h(generates)h(a)g(stream)f(con)m(taining)g
-(m)m(ultiple)e(compressed)i(\014le)f(represen-)390 2350
-y(tations.)58 b(Suc)m(h)36 b(a)g(stream)g(can)h(b)s(e)e(decompressed)h
-(correctly)h(only)e(b)m(y)h Fj(bzip2)e Fl(v)m(ersion)390
-2454 y(0.9.0)g(or)e(later.)47 b(Earlier)30 b(v)m(ersions)i(of)g
-Fj(bzip2)f Fl(will)f(stop)i(after)h(decompressing)e(the)i(\014rst)390
-2558 y(\014le)c(in)h(the)g(stream.)390 2709 y Fj(bzcat)f
-Fl(\(or)i Fj(bzip2)e(-dc)p Fl(\))g(decompresses)i(all)e(sp)s(eci\014ed)
-g(\014les)g(to)i(the)g(standard)e(output.)390 2860 y
-Fj(bzip2)f Fl(will)g(read)i(argumen)m(ts)g(from)f(the)h(en)m(vironmen)m
-(t)g(v)-5 b(ariables)28 b Fj(BZIP2)h Fl(and)g Fj(BZIP)p
-Fl(,)g(in)390 2963 y(that)24 b(order,)g(and)f(will)e(pro)s(cess)i(them)
-g(b)s(efore)g(an)m(y)h(argumen)m(ts)f(read)h(from)f(the)g(command)390
-3067 y(line.)39 b(This)29 b(giv)m(es)h(a)h(con)m(v)m(enien)m(t)h(w)m(a)
-m(y)f(to)g(supply)d(default)i(argumen)m(ts.)390 3218
-y(Compression)h(is)h(alw)m(a)m(ys)i(p)s(erformed,)e(ev)m(en)h(if)f(the)
-h(compressed)g(\014le)f(is)g(sligh)m(tly)f(larger)390
-3322 y(than)26 b(the)g(original.)38 b(Files)25 b(of)h(less)g(than)g(ab)
-s(out)g(one)g(h)m(undred)e(b)m(ytes)j(tend)f(to)h(get)g(larger,)390
-3426 y(since)34 b(the)g(compression)f(mec)m(hanism)h(has)f(a)i(constan)
-m(t)g(o)m(v)m(erhead)h(in)d(the)h(region)g(of)g(50)390
-3529 y(b)m(ytes.)54 b(Random)34 b(data)h(\(including)d(the)i(output)h
-(of)f(most)h(\014le)f(compressors\))h(is)e(co)s(ded)390
-3633 y(at)e(ab)s(out)f(8.05)i(bits)d(p)s(er)h(b)m(yte,)h(giving)e(an)h
-(expansion)g(of)g(around)g(0.5\045.)390 3784 y(As)h(a)g(self-c)m(hec)m
-(k)h(for)e(y)m(our)h(protection,)g Fj(bzip2)f Fl(uses)g(32-bit)h(CR)m
-(Cs)f(to)i(mak)m(e)f(sure)f(that)390 3888 y(the)45 b(decompressed)f(v)m
-(ersion)g(of)g(a)h(\014le)e(is)h(iden)m(tical)f(to)i(the)g(original.)81
-b(This)43 b(guards)390 3992 y(against)i(corruption)e(of)h(the)h
-(compressed)f(data,)49 b(and)44 b(against)h(undetected)g(bugs)e(in)390
-4096 y Fj(bzip2)35 b Fl(\(hop)s(efully)e(v)m(ery)k(unlik)m(ely\).)56
-b(The)36 b(c)m(hances)h(of)f(data)h(corruption)e(going)h(unde-)390
-4199 y(tected)g(is)e(microscopic,)h(ab)s(out)f(one)h(c)m(hance)g(in)f
-(four)g(billion)d(for)j(eac)m(h)i(\014le)d(pro)s(cessed.)390
-4303 y(Be)38 b(a)m(w)m(are,)k(though,)d(that)f(the)g(c)m(hec)m(k)i(o)s
-(ccurs)d(up)s(on)f(decompression,)j(so)f(it)f(can)h(only)390
-4407 y(tell)28 b(y)m(ou)g(that)i(something)d(is)h(wrong.)40
-b(It)28 b(can't)i(help)d(y)m(ou)i(reco)m(v)m(er)h(the)e(original)f
-(uncom-)390 4511 y(pressed)h(data.)41 b(Y)-8 b(ou)30
-b(can)f(use)g Fj(bzip2recover)d Fl(to)k(try)f(to)h(reco)m(v)m(er)h
-(data)f(from)e(damaged)390 4614 y(\014les.)390 4766 y(Return)22
-b(v)-5 b(alues:)37 b(0)23 b(for)g(a)g(normal)f(exit,)j(1)e(for)g(en)m
-(vironmen)m(tal)f(problems)f(\(\014le)i(not)g(found,)390
-4869 y(in)m(v)-5 b(alid)30 b(\015ags,)k(I/O)f(errors,)g(&c\),)h(2)f(to)
-g(indicate)f(a)h(corrupt)f(compressed)h(\014le,)f(3)i(for)e(an)390
-4973 y(in)m(ternal)d(consistency)h(error)g(\(eg,)i(bug\))e(whic)m(h)f
-(caused)i Fj(bzip2)e Fl(to)i(panic.)390 5304 y Ff(OPTIONS)p
-eop
-%%Page: 5 6
-5 5 bop 150 -116 a Fl(Chapter)30 b(2:)41 b(Ho)m(w)31
-b(to)g(use)f Fj(bzip2)2375 b Fl(5)390 299 y Fj(-c)30
-b(--stdout)870 403 y Fl(Compress)f(or)i(decompress)f(to)h(standard)e
-(output.)390 557 y Fj(-d)h(--decompress)870 661 y Fl(F)-8
-b(orce)44 b(decompression.)77 b Fj(bzip2)p Fl(,)44 b
-Fj(bunzip2)d Fl(and)h Fj(bzcat)f Fl(are)i(really)f(the)870
-764 y(same)27 b(program,)h(and)e(the)i(decision)d(ab)s(out)i(what)g
-(actions)g(to)h(tak)m(e)g(is)e(done)870 868 y(on)k(the)h(basis)e(of)i
-(whic)m(h)e(name)h(is)g(used.)40 b(This)28 b(\015ag)j(o)m(v)m(errides)f
-(that)h(mec)m(h-)870 972 y(anism,)e(and)h(forces)h(bzip2)e(to)i
-(decompress.)390 1126 y Fj(-z)f(--compress)870 1230 y
-Fl(The)39 b(complemen)m(t)h(to)g Fj(-d)p Fl(:)59 b(forces)40
-b(compression,)h(regardless)d(of)i(the)g(in-)870 1334
-y(v)m(ok)-5 b(ation)31 b(name.)390 1488 y Fj(-t)f(--test)8
-b Fl(Chec)m(k)33 b(in)m(tegrit)m(y)j(of)f(the)g(sp)s(eci\014ed)e
-(\014le\(s\),)k(but)d(don't)h(decompress)g(them.)870
-1591 y(This)40 b(really)g(p)s(erforms)g(a)i(trial)e(decompression)h
-(and)g(thro)m(ws)g(a)m(w)m(a)m(y)j(the)870 1695 y(result.)390
-1849 y Fj(-f)30 b(--force)870 1953 y Fl(F)-8 b(orce)31
-b(o)m(v)m(erwrite)f(of)g(output)f(\014les.)40 b(Normally)-8
-b(,)29 b Fj(bzip2)f Fl(will)f(not)j(o)m(v)m(erwrite)870
-2057 y(existing)e(output)g(\014les.)39 b(Also)28 b(forces)h
-Fj(bzip2)e Fl(to)i(break)g(hard)e(links)f(to)k(\014les,)870
-2161 y(whic)m(h)f(it)h(otherwise)g(w)m(ouldn't)f(do.)390
-2315 y Fj(-k)h(--keep)8 b Fl(Keep)24 b(\(don't)i(delete\))h(input)d
-(\014les)g(during)g(compression)h(or)h(decompression.)390
-2469 y Fj(-s)k(--small)870 2573 y Fl(Reduce)23 b(memory)f(usage,)j(for)
-d(compression,)h(decompression)f(and)g(testing.)870 2676
-y(Files)f(are)i(decompressed)e(and)h(tested)h(using)e(a)h(mo)s
-(di\014ed)e(algorithm)h(whic)m(h)870 2780 y(only)30 b(requires)g(2.5)j
-(b)m(ytes)f(p)s(er)e(blo)s(c)m(k)h(b)m(yte.)44 b(This)30
-b(means)h(an)m(y)h(\014le)e(can)i(b)s(e)870 2884 y(decompressed)d(in)f
-(2300k)j(of)e(memory)-8 b(,)30 b(alb)s(eit)e(at)i(ab)s(out)f(half)g
-(the)g(normal)870 2988 y(sp)s(eed.)870 3117 y(During)42
-b(compression,)k Fj(-s)d Fl(selects)h(a)g(blo)s(c)m(k)g(size)f(of)h
-(200k,)k(whic)m(h)42 b(lim-)870 3220 y(its)33 b(memory)g(use)g(to)h
-(around)e(the)i(same)f(\014gure,)h(at)g(the)g(exp)s(ense)f(of)g(y)m
-(our)870 3324 y(compression)g(ratio.)50 b(In)33 b(short,)i(if)d(y)m
-(our)i(mac)m(hine)f(is)g(lo)m(w)g(on)h(memory)f(\(8)870
-3428 y(megab)m(ytes)42 b(or)e(less\),)j(use)d(-s)g(for)g(ev)m
-(erything.)71 b(See)40 b(MEMOR)-8 b(Y)41 b(MAN-)870 3532
-y(A)m(GEMENT)31 b(b)s(elo)m(w.)390 3686 y Fj(-q)f(--quiet)870
-3790 y Fl(Suppress)j(non-essen)m(tial)j(w)m(arning)e(messages.)58
-b(Messages)38 b(p)s(ertaining)33 b(to)870 3893 y(I/O)d(errors)g(and)g
-(other)h(critical)e(ev)m(en)m(ts)j(will)27 b(not)k(b)s(e)f(suppressed.)
-390 4047 y Fj(-v)g(--verbose)870 4151 y Fl(V)-8 b(erb)s(ose)28
-b(mo)s(de)f({)i(sho)m(w)e(the)h(compression)f(ratio)h(for)f(eac)m(h)i
-(\014le)e(pro)s(cessed.)870 4255 y(F)-8 b(urther)30 b
-Fj(-v)p Fl('s)g(increase)g(the)g(v)m(erb)s(osit)m(y)g(lev)m(el,)h(sp)s
-(ewing)d(out)j(lots)f(of)g(infor-)870 4359 y(mation)g(whic)m(h)f(is)h
-(primarily)d(of)j(in)m(terest)h(for)f(diagnostic)g(purp)s(oses.)390
-4513 y Fj(-L)g(--license)e(-V)h(--version)870 4617 y
-Fl(Displa)m(y)h(the)g(soft)m(w)m(are)i(v)m(ersion,)e(license)f(terms)i
-(and)e(conditions.)390 4771 y Fj(-1)h(to)g(-9)72 b Fl(Set)35
-b(the)g(blo)s(c)m(k)f(size)h(to)g(100)h(k,)g(200)g(k)f(..)53
-b(900)36 b(k)f(when)f(compressing.)53 b(Has)870 4875
-y(no)41 b(e\013ect)h(when)d(decompressing.)71 b(See)41
-b(MEMOR)-8 b(Y)41 b(MANA)m(GEMENT)870 4978 y(b)s(elo)m(w.)390
-5132 y Fj(--)324 b Fl(T)-8 b(reats)25 b(all)e(subsequen)m(t)g(argumen)m
-(ts)i(as)f(\014le)g(names,)h(ev)m(en)g(if)e(they)i(start)f(with)870
-5236 y(a)32 b(dash.)43 b(This)29 b(is)h(so)i(y)m(ou)g(can)f(handle)f
-(\014les)g(with)g(names)i(b)s(eginning)c(with)870 5340
-y(a)j(dash,)f(for)g(example:)40 b Fj(bzip2)29 b(--)h(-myfilename)p
-Fl(.)p eop
-%%Page: 6 7
-6 6 bop 150 -116 a Fl(Chapter)30 b(2:)41 b(Ho)m(w)31
-b(to)g(use)f Fj(bzip2)2375 b Fl(6)390 299 y Fj(--repetitive-fast)390
-427 y(--repetitive-best)870 530 y Fl(These)34 b(\015ags)g(are)h
-(redundan)m(t)e(in)g(v)m(ersions)g(0.9.5)j(and)e(ab)s(o)m(v)m(e.)53
-b(They)34 b(pro-)870 634 y(vided)h(some)i(coarse)g(con)m(trol)g(o)m(v)m
-(er)g(the)g(b)s(eha)m(viour)e(of)h(the)g(sorting)g(algo-)870
-738 y(rithm)h(in)h(earlier)g(v)m(ersions,)j(whic)m(h)d(w)m(as)h
-(sometimes)h(useful.)65 b(0.9.5)41 b(and)870 842 y(ab)s(o)m(v)m(e)34
-b(ha)m(v)m(e)g(an)f(impro)m(v)m(ed)g(algorithm)f(whic)m(h)f(renders)h
-(these)h(\015ags)h(irrel-)870 946 y(ev)-5 b(an)m(t.)390
-1190 y Ff(MEMOR)-10 b(Y)40 b(MANA)m(GEMENT)390 1377 y
-Fj(bzip2)25 b Fl(compresses)i(large)g(\014les)e(in)g(blo)s(c)m(ks.)39
-b(The)26 b(blo)s(c)m(k)h(size)f(a\013ects)i(b)s(oth)e(the)h(compres-)
-390 1481 y(sion)39 b(ratio)g(ac)m(hiev)m(ed,)k(and)d(the)f(amoun)m(t)i
-(of)e(memory)h(needed)f(for)h(compression)f(and)390 1585
-y(decompression.)59 b(The)36 b(\015ags)h Fj(-1)f Fl(through)h
-Fj(-9)f Fl(sp)s(ecify)f(the)i(blo)s(c)m(k)g(size)f(to)i(b)s(e)e
-(100,000)390 1688 y(b)m(ytes)29 b(through)e(900,000)k(b)m(ytes)d(\(the)
-h(default\))e(resp)s(ectiv)m(ely)-8 b(.)40 b(A)m(t)29
-b(decompression)e(time,)390 1792 y(the)32 b(blo)s(c)m(k)g(size)g(used)g
-(for)g(compression)f(is)g(read)h(from)g(the)g(header)g(of)h(the)f
-(compressed)390 1896 y(\014le,)j(and)f Fj(bunzip2)e Fl(then)i(allo)s
-(cates)h(itself)e(just)h(enough)g(memory)g(to)i(decompress)e(the)390
-2000 y(\014le.)39 b(Since)29 b(blo)s(c)m(k)g(sizes)g(are)h(stored)f(in)
-f(compressed)h(\014les,)g(it)g(follo)m(ws)f(that)i(the)g(\015ags)g
-Fj(-1)390 2103 y Fl(to)h Fj(-9)f Fl(are)h(irrelev)-5
-b(an)m(t)29 b(to)i(and)f(so)h(ignored)e(during)f(decompression.)390
-2255 y(Compression)h(and)g(decompression)h(requiremen)m(ts,)f(in)g(b)m
-(ytes,)j(can)e(b)s(e)g(estimated)h(as:)869 2406 y Fj(Compression:)140
-b(400k)46 b(+)i(\()f(8)h(x)f(block)f(size)h(\))869 2613
-y(Decompression:)d(100k)i(+)i(\()f(4)h(x)f(block)f(size)h(\),)g(or)1585
-2717 y(100k)f(+)i(\()f(2.5)g(x)g(block)g(size)f(\))390
-2868 y Fl(Larger)29 b(blo)s(c)m(k)f(sizes)h(giv)m(e)g(rapidly)d
-(diminishing)e(marginal)k(returns.)39 b(Most)29 b(of)g(the)g(com-)390
-2972 y(pression)d(comes)j(from)f(the)g(\014rst)g(t)m(w)m(o)h(or)f
-(three)h(h)m(undred)d(k)i(of)g(blo)s(c)m(k)g(size,)g(a)h(fact)g(w)m
-(orth)390 3075 y(b)s(earing)j(in)f(mind)g(when)h(using)f
-Fj(bzip2)h Fl(on)g(small)g(mac)m(hines.)47 b(It)33 b(is)f(also)h(imp)s
-(ortan)m(t)f(to)390 3179 y(appreciate)j(that)h(the)f(decompression)f
-(memory)h(requiremen)m(t)f(is)h(set)g(at)h(compression)390
-3283 y(time)30 b(b)m(y)g(the)h(c)m(hoice)g(of)g(blo)s(c)m(k)f(size.)390
-3434 y(F)-8 b(or)45 b(\014les)f(compressed)g(with)g(the)g(default)g
-(900k)i(blo)s(c)m(k)e(size,)49 b Fj(bunzip2)42 b Fl(will)g(require)390
-3538 y(ab)s(out)29 b(3700)j(kb)m(ytes)e(to)h(decompress.)40
-b(T)-8 b(o)30 b(supp)s(ort)e(decompression)h(of)h(an)m(y)g(\014le)f(on)
-g(a)i(4)390 3642 y(megab)m(yte)h(mac)m(hine,)d Fj(bunzip2)f
-Fl(has)i(an)g(option)f(to)i(decompress)e(using)g(appro)m(ximately)390
-3745 y(half)k(this)g(amoun)m(t)i(of)f(memory)-8 b(,)36
-b(ab)s(out)e(2300)i(kb)m(ytes.)53 b(Decompression)34
-b(sp)s(eed)g(is)f(also)390 3849 y(halv)m(ed,)i(so)f(y)m(ou)h(should)d
-(use)h(this)g(option)h(only)f(where)h(necessary)-8 b(.)53
-b(The)33 b(relev)-5 b(an)m(t)35 b(\015ag)390 3953 y(is)29
-b Fj(-s)p Fl(.)390 4104 y(In)34 b(general,)i(try)f(and)f(use)g(the)h
-(largest)h(blo)s(c)m(k)e(size)h(memory)f(constrain)m(ts)h(allo)m(w,)h
-(since)390 4208 y(that)45 b(maximises)f(the)h(compression)f(ac)m(hiev)m
-(ed.)85 b(Compression)43 b(and)h(decompression)390 4311
-y(sp)s(eed)30 b(are)g(virtually)e(una\013ected)j(b)m(y)f(blo)s(c)m(k)g
-(size.)390 4463 y(Another)25 b(signi\014can)m(t)f(p)s(oin)m(t)g
-(applies)f(to)j(\014les)e(whic)m(h)g(\014t)h(in)e(a)j(single)d(blo)s(c)
-m(k)i({)g(that)h(means)390 4566 y(most)g(\014les)g(y)m(ou'd)g(encoun)m
-(ter)h(using)d(a)j(large)f(blo)s(c)m(k)g(size.)39 b(The)25
-b(amoun)m(t)i(of)f(real)g(memory)390 4670 y(touc)m(hed)38
-b(is)e(prop)s(ortional)f(to)j(the)f(size)g(of)h(the)f(\014le,)h(since)f
-(the)g(\014le)g(is)f(smaller)g(than)h(a)390 4774 y(blo)s(c)m(k.)49
-b(F)-8 b(or)35 b(example,)f(compressing)e(a)i(\014le)e(20,000)k(b)m
-(ytes)e(long)f(with)f(the)i(\015ag)g Fj(-9)f Fl(will)390
-4878 y(cause)28 b(the)f(compressor)g(to)h(allo)s(cate)f(around)f(7600k)
-j(of)e(memory)-8 b(,)28 b(but)f(only)f(touc)m(h)i(400k)390
-4981 y Fj(+)h Fl(20000)j(*)e(8)g(=)f(560)i(kb)m(ytes)f(of)g(it.)40
-b(Similarly)-8 b(,)26 b(the)k(decompressor)f(will)e(allo)s(cate)j
-(3700k)390 5085 y(but)g(only)f(touc)m(h)i(100k)h Fj(+)e
-Fl(20000)i(*)f(4)g(=)f(180)i(kb)m(ytes.)390 5236 y(Here)41
-b(is)f(a)i(table)f(whic)m(h)e(summarises)g(the)j(maxim)m(um)d(memory)i
-(usage)h(for)e(di\013eren)m(t)390 5340 y(blo)s(c)m(k)25
-b(sizes.)38 b(Also)25 b(recorded)g(is)f(the)i(total)g(compressed)e
-(size)h(for)g(14)h(\014les)e(of)i(the)f(Calgary)p eop
-%%Page: 7 8
-7 7 bop 150 -116 a Fl(Chapter)30 b(2:)41 b(Ho)m(w)31
-b(to)g(use)f Fj(bzip2)2375 b Fl(7)390 299 y(T)-8 b(ext)38
-b(Compression)d(Corpus)h(totalling)h(3,141,622)k(b)m(ytes.)61
-b(This)36 b(column)g(giv)m(es)i(some)390 403 y(feel)23
-b(for)f(ho)m(w)h(compression)f(v)-5 b(aries)23 b(with)e(blo)s(c)m(k)i
-(size.)38 b(These)23 b(\014gures)f(tend)g(to)i(understate)390
-506 y(the)g(adv)-5 b(an)m(tage)26 b(of)e(larger)f(blo)s(c)m(k)h(sizes)f
-(for)h(larger)f(\014les,)h(since)g(the)g(Corpus)e(is)h(dominated)390
-610 y(b)m(y)30 b(smaller)f(\014les.)1107 761 y Fj(Compress)141
-b(Decompress)g(Decompress)f(Corpus)773 865 y(Flag)238
-b(usage)285 b(usage)332 b(-s)48 b(usage)237 b(Size)821
-1073 y(-1)286 b(1200k)332 b(500k)429 b(350k)285 b(914704)821
-1176 y(-2)h(2000k)332 b(900k)429 b(600k)285 b(877703)821
-1280 y(-3)h(2800k)f(1300k)428 b(850k)285 b(860338)821
-1384 y(-4)h(3600k)f(1700k)380 b(1100k)285 b(846899)821
-1488 y(-5)h(4400k)f(2100k)380 b(1350k)285 b(845160)821
-1591 y(-6)h(5200k)f(2500k)380 b(1600k)285 b(838626)821
-1695 y(-7)h(6100k)f(2900k)380 b(1850k)285 b(834096)821
-1799 y(-8)h(6800k)f(3300k)380 b(2100k)285 b(828642)821
-1903 y(-9)h(7600k)f(3700k)380 b(2350k)285 b(828642)390
-2147 y Ff(RECO)m(VERING)37 b(D)m(A)-10 b(T)g(A)40 b(FR)m(OM)h(D)m(AMA)m
-(GED)e(FILES)390 2333 y Fj(bzip2)25 b Fl(compresses)h(\014les)g(in)f
-(blo)s(c)m(ks,)h(usually)e(900kb)m(ytes)29 b(long.)39
-b(Eac)m(h)27 b(blo)s(c)m(k)e(is)h(handled)390 2437 y(indep)s(enden)m
-(tly)-8 b(.)47 b(If)32 b(a)i(media)e(or)h(transmission)e(error)i
-(causes)h(a)f(m)m(ulti-blo)s(c)m(k)f Fj(.bz2)g Fl(\014le)390
-2541 y(to)k(b)s(ecome)h(damaged,)g(it)e(ma)m(y)i(b)s(e)e(p)s(ossible)e
-(to)k(reco)m(v)m(er)g(data)f(from)g(the)f(undamaged)390
-2645 y(blo)s(c)m(ks)30 b(in)f(the)h(\014le.)390 2796
-y(The)j(compressed)h(represen)m(tation)f(of)h(eac)m(h)h(blo)s(c)m(k)e
-(is)g(delimited)e(b)m(y)j(a)g(48-bit)g(pattern,)390 2900
-y(whic)m(h)27 b(mak)m(es)j(it)e(p)s(ossible)e(to)j(\014nd)e(the)i(blo)s
-(c)m(k)f(b)s(oundaries)e(with)i(reasonable)g(certain)m(t)m(y)-8
-b(.)390 3003 y(Eac)m(h)34 b(blo)s(c)m(k)f(also)g(carries)g(its)g(o)m
-(wn)g(32-bit)g(CR)m(C,)h(so)f(damaged)h(blo)s(c)m(ks)f(can)g(b)s(e)g
-(distin-)390 3107 y(guished)c(from)h(undamaged)g(ones.)390
-3258 y Fj(bzip2recover)37 b Fl(is)j(a)h(simple)e(program)h(whose)g
-(purp)s(ose)f(is)h(to)i(searc)m(h)f(for)f(blo)s(c)m(ks)g(in)390
-3362 y Fj(.bz2)34 b Fl(\014les,)i(and)f(write)f(eac)m(h)j(blo)s(c)m(k)d
-(out)i(in)m(to)f(its)g(o)m(wn)g Fj(.bz2)f Fl(\014le.)55
-b(Y)-8 b(ou)36 b(can)f(then)g(use)390 3466 y Fj(bzip2)29
-b(-t)c Fl(to)i(test)f(the)g(in)m(tegrit)m(y)g(of)g(the)g(resulting)e
-(\014les,)i(and)f(decompress)h(those)g(whic)m(h)390 3569
-y(are)31 b(undamaged.)390 3721 y Fj(bzip2recover)41 b
-Fl(tak)m(es)46 b(a)f(single)e(argumen)m(t,)49 b(the)44
-b(name)h(of)g(the)f(damaged)h(\014le,)j(and)390 3824
-y(writes)33 b(a)i(n)m(um)m(b)s(er)d(of)j(\014les)e Fj(rec0001file.bz2)p
-Fl(,)e Fj(rec0002file.bz2)p Fl(,)g(etc,)36 b(con)m(taining)390
-3928 y(the)42 b(extracted)g(blo)s(c)m(ks.)74 b(The)41
-b(output)g(\014lenames)f(are)i(designed)e(so)i(that)g(the)g(use)f(of)
-390 4032 y(wildcards)30 b(in)h(subsequen)m(t)h(pro)s(cessing)f({)i(for)
-g(example,)g Fj(bzip2)c(-dc)g(rec*file.bz2)e(>)390 4136
-y(recovered_data)f Fl({)31 b(lists)e(the)i(\014les)e(in)g(the)i
-(correct)g(order.)390 4287 y Fj(bzip2recover)38 b Fl(should)i(b)s(e)g
-(of)i(most)g(use)f(dealing)f(with)g(large)i Fj(.bz2)e
-Fl(\014les,)k(as)d(these)390 4390 y(will)29 b(con)m(tain)j(man)m(y)g
-(blo)s(c)m(ks.)45 b(It)32 b(is)f(clearly)g(futile)f(to)i(use)g(it)f(on)
-h(damaged)g(single-blo)s(c)m(k)390 4494 y(\014les,)g(since)f(a)h
-(damaged)h(blo)s(c)m(k)e(cannot)i(b)s(e)e(reco)m(v)m(ered.)47
-b(If)32 b(y)m(ou)g(wish)e(to)j(minimise)c(an)m(y)390
-4598 y(p)s(oten)m(tial)36 b(data)i(loss)e(through)g(media)h(or)f
-(transmission)f(errors,)j(y)m(ou)f(migh)m(t)g(consider)390
-4702 y(compressing)29 b(with)g(a)i(smaller)e(blo)s(c)m(k)h(size.)390
-4946 y Ff(PERF)m(ORMANCE)39 b(NOTES)390 5132 y Fl(The)f(sorting)f
-(phase)h(of)h(compression)e(gathers)i(together)h(similar)35
-b(strings)i(in)g(the)i(\014le.)390 5236 y(Because)54
-b(of)f(this,)58 b(\014les)52 b(con)m(taining)g(v)m(ery)h(long)g(runs)e
-(of)i(rep)s(eated)g(sym)m(b)s(ols,)58 b(lik)m(e)390 5340
-y Fj(")p Fl(aabaabaabaab)e(...)p Fj(")g Fl(\(rep)s(eated)g(sev)m(eral)f
-(h)m(undred)e(times\))i(ma)m(y)h(compress)f(more)p eop
-%%Page: 8 9
-8 8 bop 150 -116 a Fl(Chapter)30 b(2:)41 b(Ho)m(w)31
-b(to)g(use)f Fj(bzip2)2375 b Fl(8)390 299 y(slo)m(wly)33
-b(than)g(normal.)50 b(V)-8 b(ersions)33 b(0.9.5)i(and)f(ab)s(o)m(v)m(e)
-h(fare)e(m)m(uc)m(h)h(b)s(etter)g(than)f(previous)390
-403 y(v)m(ersions)i(in)g(this)f(resp)s(ect.)57 b(The)35
-b(ratio)h(b)s(et)m(w)m(een)h(w)m(orst-case)g(and)e(a)m(v)m(erage-case)
-40 b(com-)390 506 y(pression)e(time)h(is)f(in)g(the)h(region)g(of)h
-(10:1.)69 b(F)-8 b(or)40 b(previous)e(v)m(ersions,)j(this)d(\014gure)h
-(w)m(as)390 610 y(more)f(lik)m(e)g(100:1.)66 b(Y)-8 b(ou)38
-b(can)h(use)e(the)i Fj(-vvvv)d Fl(option)i(to)h(monitor)e(progress)h
-(in)f(great)390 714 y(detail,)30 b(if)f(y)m(ou)i(w)m(an)m(t.)390
-865 y(Decompression)f(sp)s(eed)g(is)f(una\013ected)i(b)m(y)f(these)h
-(phenomena.)390 1016 y Fj(bzip2)i Fl(usually)g(allo)s(cates)i(sev)m
-(eral)f(megab)m(ytes)j(of)d(memory)h(to)g(op)s(erate)h(in,)e(and)g
-(then)390 1120 y(c)m(harges)k(all)d(o)m(v)m(er)j(it)f(in)e(a)i(fairly)e
-(random)h(fashion.)59 b(This)34 b(means)j(that)g(p)s(erformance,)390
-1224 y(b)s(oth)27 b(for)h(compressing)f(and)g(decompressing,)h(is)f
-(largely)g(determined)g(b)m(y)h(the)g(sp)s(eed)f(at)390
-1327 y(whic)m(h)35 b(y)m(our)h(mac)m(hine)g(can)g(service)g(cac)m(he)i
-(misses.)57 b(Because)37 b(of)g(this,)f(small)f(c)m(hanges)390
-1431 y(to)f(the)f(co)s(de)h(to)f(reduce)g(the)h(miss)d(rate)j(ha)m(v)m
-(e)h(b)s(een)d(observ)m(ed)h(to)h(giv)m(e)g(disprop)s(ortion-)390
-1535 y(ately)i(large)f(p)s(erformance)f(impro)m(v)m(emen)m(ts.)56
-b(I)35 b(imagine)f Fj(bzip2)g Fl(will)e(p)s(erform)i(b)s(est)h(on)390
-1639 y(mac)m(hines)30 b(with)f(v)m(ery)i(large)f(cac)m(hes.)390
-1885 y Ff(CA)-14 b(VEA)k(TS)390 2072 y Fl(I/O)38 b(error)g(messages)h
-(are)f(not)h(as)f(helpful)e(as)i(they)g(could)f(b)s(e.)64
-b Fj(bzip2)37 b Fl(tries)g(hard)g(to)390 2176 y(detect)29
-b(I/O)e(errors)g(and)f(exit)i(cleanly)-8 b(,)27 b(but)g(the)h(details)e
-(of)h(what)h(the)f(problem)f(is)g(some-)390 2280 y(times)k(seem)h
-(rather)f(misleading.)390 2431 y(This)j(man)m(ual)g(page)i(p)s(ertains)
-e(to)i(v)m(ersion)f(1.0)i(of)e Fj(bzip2)p Fl(.)51 b(Compressed)34
-b(data)h(created)390 2534 y(b)m(y)25 b(this)e(v)m(ersion)i(is)e(en)m
-(tirely)h(forw)m(ards)h(and)f(bac)m(kw)m(ards)h(compatible)f(with)f
-(the)i(previous)390 2638 y(public)18 b(releases,)24 b(v)m(ersions)c
-(0.1pl2,)k(0.9.0)e(and)f(0.9.5,)k(but)20 b(with)g(the)h(follo)m(wing)e
-(exception:)390 2742 y(0.9.0)43 b(and)e(ab)s(o)m(v)m(e)h(can)g
-(correctly)f(decompress)g(m)m(ultiple)e(concatenated)k(compressed)390
-2846 y(\014les.)c(0.1pl2)30 b(cannot)g(do)f(this;)f(it)h(will)e(stop)i
-(after)h(decompressing)e(just)g(the)i(\014rst)e(\014le)g(in)390
-2949 y(the)j(stream.)390 3100 y Fj(bzip2recover)20 b
-Fl(uses)k(32-bit)g(in)m(tegers)f(to)i(represen)m(t)f(bit)e(p)s
-(ositions)g(in)g(compressed)i(\014les,)390 3204 y(so)j(it)f(cannot)i
-(handle)d(compressed)i(\014les)f(more)h(than)f(512)i(megab)m(ytes)h
-(long.)39 b(This)25 b(could)390 3308 y(easily)30 b(b)s(e)f(\014xed.)390
-3555 y Ff(A)m(UTHOR)390 3741 y Fl(Julian)f(Sew)m(ard,)i
-Fj(jseward@acm.org)p Fl(.)390 3892 y(The)24 b(ideas)f(em)m(b)s(o)s
-(died)f(in)h Fj(bzip2)f Fl(are)j(due)e(to)i(\(at)g(least\))g(the)f
-(follo)m(wing)e(p)s(eople:)37 b(Mic)m(hael)390 3996 y(Burro)m(ws)48
-b(and)g(Da)m(vid)h(Wheeler)f(\(for)h(the)g(blo)s(c)m(k)f(sorting)g
-(transformation\),)53 b(Da)m(vid)390 4100 y(Wheeler)45
-b(\(again,)50 b(for)45 b(the)g(Hu\013man)g(co)s(der\),)k(P)m(eter)d(F)
--8 b(en)m(wic)m(k)46 b(\(for)g(the)f(structured)390 4204
-y(co)s(ding)26 b(mo)s(del)g(in)f(the)i(original)e Fj(bzip)p
-Fl(,)i(and)f(man)m(y)h(re\014nemen)m(ts\),)h(and)e(Alistair)f
-(Mo\013at,)390 4307 y(Radford)34 b(Neal)h(and)f(Ian)h(Witten)g(\(for)f
-(the)h(arithmetic)g(co)s(der)f(in)g(the)h(original)d
-Fj(bzip)p Fl(\).)390 4411 y(I)41 b(am)g(m)m(uc)m(h)h(indebted)e(for)h
-(their)f(help,)j(supp)s(ort)c(and)i(advice.)74 b(See)41
-b(the)h(man)m(ual)e(in)390 4515 y(the)28 b(source)g(distribution)23
-b(for)28 b(p)s(oin)m(ters)e(to)j(sources)e(of)h(do)s(cumen)m(tation.)40
-b(Christian)25 b(v)m(on)390 4619 y(Ro)s(ques)31 b(encouraged)h(me)g(to)
-g(lo)s(ok)f(for)h(faster)g(sorting)f(algorithms,)f(so)i(as)g(to)g(sp)s
-(eed)f(up)390 4723 y(compression.)47 b(Bela)34 b(Lubkin)c(encouraged)k
-(me)f(to)g(impro)m(v)m(e)g(the)g(w)m(orst-case)i(compres-)390
-4826 y(sion)25 b(p)s(erformance.)38 b(Man)m(y)26 b(p)s(eople)f(sen)m(t)
-h(patc)m(hes,)h(help)s(ed)d(with)g(p)s(ortabilit)m(y)f(problems,)390
-4930 y(len)m(t)30 b(mac)m(hines,)g(ga)m(v)m(e)j(advice)d(and)g(w)m(ere)
-h(generally)f(helpful.)p eop
-%%Page: 9 10
-9 9 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1927 b Fl(9)150 299 y Fh(3)80 b(Programming)53
-b(with)h Fg(libbzip2)150 568 y Fl(This)29 b(c)m(hapter)i(describ)s(es)d
-(the)j(programming)e(in)m(terface)i(to)g Fj(libbzip2)p
-Fl(.)150 725 y(F)-8 b(or)36 b(general)e(bac)m(kground)h(information,)f
-(particularly)f(ab)s(out)h(memory)h(use)f(and)g(p)s(erformance)g(as-)
-150 834 y(p)s(ects,)d(y)m(ou'd)f(b)s(e)g(w)m(ell)f(advised)g(to)j(read)
-e(Chapter)g(2)g(as)h(w)m(ell.)150 1124 y Fk(3.1)68 b(T)-11
-b(op-lev)l(el)46 b(structure)150 1316 y Fj(libbzip2)33
-b Fl(is)i(a)h(\015exible)e(library)f(for)j(compressing)f(and)g
-(decompressing)f(data)j(in)d(the)i Fj(bzip2)e Fl(data)150
-1426 y(format.)39 b(Although)24 b(pac)m(k)-5 b(aged)26
-b(as)e(a)h(single)e(en)m(tit)m(y)-8 b(,)27 b(it)d(helps)f(to)i(regard)g
-(the)g(library)d(as)i(three)h(separate)150 1535 y(parts:)40
-b(the)31 b(lo)m(w)f(lev)m(el)g(in)m(terface,)h(and)f(the)h(high)e(lev)m
-(el)h(in)m(terface,)h(and)f(some)h(utilit)m(y)d(functions.)150
-1692 y(The)38 b(structure)g(of)g Fj(libbzip2)p Fl('s)e(in)m(terfaces)j
-(is)e(similar)f(to)j(that)g(of)g(Jean-loup)e(Gailly's)g(and)h(Mark)150
-1802 y(Adler's)29 b(excellen)m(t)i Fj(zlib)e Fl(library)-8
-b(.)150 1959 y(All)29 b(externally)g(visible)f(sym)m(b)s(ols)h(ha)m(v)m
-(e)i(names)f(b)s(eginning)e Fj(BZ2_)p Fl(.)39 b(This)29
-b(is)g(new)h(in)f(v)m(ersion)h(1.0.)41 b(The)150 2068
-y(in)m(ten)m(tion)30 b(is)f(to)i(minimise)d(p)s(ollution)f(of)k(the)f
-(namespaces)h(of)g(library)d(clien)m(ts.)150 2321 y Ff(3.1.1)63
-b(Lo)m(w-lev)m(el)39 b(summary)150 2514 y Fl(This)21
-b(in)m(terface)h(pro)m(vides)g(services)g(for)g(compressing)f(and)h
-(decompressing)f(data)i(in)e(memory)-8 b(.)38 b(There's)150
-2623 y(no)43 b(pro)m(vision)e(for)h(dealing)g(with)f(\014les,)k
-(streams)e(or)g(an)m(y)g(other)g(I/O)g(mec)m(hanisms,)i(just)e(straigh)
-m(t)150 2733 y(memory-to-memory)25 b(w)m(ork.)38 b(In)23
-b(fact,)k(this)22 b(part)i(of)f(the)h(library)d(can)j(b)s(e)f(compiled)
-f(without)h(inclusion)150 2843 y(of)31 b Fj(stdio.h)p
-Fl(,)d(whic)m(h)h(ma)m(y)i(b)s(e)f(helpful)d(for)k(em)m(b)s(edded)e
-(applications.)150 2999 y(The)h(lo)m(w-lev)m(el)g(part)g(of)h(the)f
-(library)e(has)i(no)h(global)e(v)-5 b(ariables)29 b(and)h(is)g
-(therefore)g(thread-safe.)150 3156 y(Six)d(routines)g(mak)m(e)j(up)d
-(the)i(lo)m(w)f(lev)m(el)g(in)m(terface:)41 b Fj(BZ2_bzCompressInit)p
-Fl(,)24 b Fj(BZ2_bzCompress)p Fl(,)h(and)150 3266 y Fj
-(BZ2_bzCompressEnd)h Fl(for)k(compression,)f(and)h(a)h(corresp)s
-(onding)d(trio)i Fj(BZ2_bzDecompressInit)p Fl(,)150 3375
-y Fj(BZ2_bzDecompress)37 b Fl(and)j Fj(BZ2_bzDecompressEnd)c
-Fl(for)42 b(decompression.)72 b(The)41 b Fj(*Init)e Fl(functions)150
-3485 y(allo)s(cate)44 b(memory)g(for)f(compression/decompression)f(and)
-h(do)h(other)g(initialisations,)f(whilst)f(the)150 3595
-y Fj(*End)29 b Fl(functions)g(close)i(do)m(wn)f(op)s(erations)f(and)h
-(release)h(memory)-8 b(.)150 3751 y(The)36 b(real)f(w)m(ork)i(is)e
-(done)h(b)m(y)g Fj(BZ2_bzCompress)c Fl(and)j Fj(BZ2_bzDecompress)p
-Fl(.)54 b(These)36 b(compress)g(and)150 3861 y(decompress)30
-b(data)h(from)f(a)h(user-supplied)c(input)i(bu\013er)g(to)i(a)g
-(user-supplied)c(output)j(bu\013er.)40 b(These)150 3971
-y(bu\013ers)32 b(can)i(b)s(e)e(an)m(y)i(size;)g(arbitrary)e(quan)m
-(tities)h(of)g(data)h(are)g(handled)d(b)m(y)i(making)f(rep)s(eated)i
-(calls)150 4080 y(to)f(these)f(functions.)44 b(This)30
-b(is)h(a)h(\015exible)e(mec)m(hanism)i(allo)m(wing)e(a)i(consumer-pull)
-e(st)m(yle)i(of)g(activit)m(y)-8 b(,)150 4190 y(or)30
-b(pro)s(ducer-push,)e(or)i(a)h(mixture)e(of)i(b)s(oth.)150
-4443 y Ff(3.1.2)63 b(High-lev)m(el)41 b(summary)150 4635
-y Fl(This)d(in)m(terface)j(pro)m(vides)e(some)h(handy)f(wrapp)s(ers)f
-(around)h(the)i(lo)m(w-lev)m(el)f(in)m(terface)g(to)h(facilitate)150
-4745 y(reading)26 b(and)g(writing)f Fj(bzip2)g Fl(format)i(\014les)f
-(\()p Fj(.bz2)g Fl(\014les\).)38 b(The)27 b(routines)e(pro)m(vide)h(ho)
-s(oks)h(to)g(facilitate)150 4854 y(reading)43 b(\014les)f(in)h(whic)m
-(h)f(the)i Fj(bzip2)f Fl(data)h(stream)g(is)f(em)m(b)s(edded)f(within)g
-(some)i(larger-scale)g(\014le)150 4964 y(structure,)30
-b(or)h(where)e(there)i(are)g(m)m(ultiple)d Fj(bzip2)h
-Fl(data)i(streams)f(concatenated)j(end-to-end.)150 5121
-y(F)-8 b(or)31 b(reading)f(\014les,)f Fj(BZ2_bzReadOpen)p
-Fl(,)e Fj(BZ2_bzRead)p Fl(,)h Fj(BZ2_bzReadClose)e Fl(and)150
-5230 y Fj(BZ2_bzReadGetUnused)19 b Fl(are)25 b(supplied.)36
-b(F)-8 b(or)25 b(writing)d(\014les,)j Fj(BZ2_bzWriteOpen)p
-Fl(,)d Fj(BZ2_bzWrite)g Fl(and)150 5340 y Fj(BZ2_bzWriteFinish)k
-Fl(are)k(a)m(v)-5 b(ailable.)p eop
-%%Page: 10 11
-10 10 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(10)150 299 y(As)24 b(with)f(the)h(lo)m
-(w-lev)m(el)h(library)-8 b(,)23 b(no)h(global)g(v)-5
-b(ariables)23 b(are)h(used)g(so)g(the)h(library)c(is)j(p)s(er)f(se)h
-(thread-safe.)150 408 y(Ho)m(w)m(ev)m(er,)32 b(if)c(I/O)h(errors)g(o)s
-(ccur)g(whilst)e(reading)i(or)g(writing)e(the)j(underlying)c
-(compressed)j(\014les,)g(y)m(ou)150 518 y(ma)m(y)j(ha)m(v)m(e)g(to)g
-(consult)e Fj(errno)g Fl(to)h(determine)g(the)g(cause)g(of)h(the)f
-(error.)42 b(In)30 b(that)i(case,)h(y)m(ou'd)e(need)g(a)150
-628 y(C)f(library)e(whic)m(h)h(correctly)i(supp)s(orts)d
-Fj(errno)h Fl(in)g(a)i(m)m(ultithreaded)e(en)m(vironmen)m(t.)150
-784 y(T)-8 b(o)56 b(mak)m(e)g(the)g(library)d(a)j(little)e(simpler)f
-(and)i(more)h(p)s(ortable,)61 b Fj(BZ2_bzReadOpen)51
-b Fl(and)k Fj(BZ2_)150 894 y(bzWriteOpen)34 b Fl(require)j(y)m(ou)g(to)
-i(pass)e(them)g(\014le)g(handles)f(\()p Fj(FILE*)p Fl(s\))g(whic)m(h)h
-(ha)m(v)m(e)h(previously)e(b)s(een)150 1004 y(op)s(ened)41
-b(for)g(reading)f(or)h(writing)f(resp)s(ectiv)m(ely)-8
-b(.)73 b(That)41 b(a)m(v)m(oids)h(p)s(ortabilit)m(y)d(problems)g(asso)s
-(ciated)150 1113 y(with)j(\014le)h(op)s(erations)g(and)g(\014le)g
-(attributes,)j(whilst)c(not)i(b)s(eing)e(m)m(uc)m(h)h(of)h(an)g(imp)s
-(osition)c(on)k(the)150 1223 y(programmer.)150 1474 y
-Ff(3.1.3)63 b(Utilit)m(y)40 b(functions)h(summary)150
-1666 y Fl(F)-8 b(or)45 b(v)m(ery)g(simple)d(needs,)48
-b Fj(BZ2_bzBuffToBuffCompres)o(s)38 b Fl(and)44 b Fj
-(BZ2_bzBuffToBuffDecompres)o(s)150 1776 y Fl(are)29 b(pro)m(vided.)38
-b(These)28 b(compress)g(data)h(in)e(memory)h(from)g(one)h(bu\013er)e
-(to)i(another)f(bu\013er)g(in)f(a)h(single)150 1885 y(function)38
-b(call.)67 b(Y)-8 b(ou)40 b(should)d(assess)j(whether)f(these)h
-(functions)d(ful\014ll)f(y)m(our)k(memory-to-memory)150
-1995 y(compression/decompression)26 b(requiremen)m(ts)h(b)s(efore)g(in)
-m(v)m(esting)g(e\013ort)i(in)d(understanding)f(the)j(more)150
-2105 y(general)i(but)g(more)h(complex)f(lo)m(w-lev)m(el)g(in)m
-(terface.)150 2261 y(Y)-8 b(oshiok)j(a)47 b(Tsuneo)e(\()p
-Fj(QWF00133@niftyserve.or.jp)40 b Fl(/)46 b Fj
-(tsuneo-y@is.aist-nara.ac.)o(jp)p Fl(\))40 b(has)150
-2371 y(con)m(tributed)f(some)h(functions)e(to)j(giv)m(e)f(b)s(etter)g
-Fj(zlib)f Fl(compatibilit)m(y)-8 b(.)67 b(These)40 b(functions)e(are)i
-Fj(BZ2_)150 2481 y(bzopen)p Fl(,)e Fj(BZ2_bzread)p Fl(,)f
-Fj(BZ2_bzwrite)p Fl(,)g Fj(BZ2_bzflush)p Fl(,)g Fj(BZ2_bzclose)p
-Fl(,)f Fj(BZ2_bzerror)f Fl(and)i Fj(BZ2_)150 2590 y(bzlibVersion)p
-Fl(.)49 b(Y)-8 b(ou)35 b(ma)m(y)g(\014nd)e(these)i(functions)d(more)j
-(con)m(v)m(enien)m(t)g(for)f(simple)f(\014le)g(reading)h(and)150
-2700 y(writing,)c(than)h(those)h(in)e(the)i(high-lev)m(el)e(in)m
-(terface.)45 b(These)31 b(functions)f(are)i(not)g(\(y)m(et\))h
-(o\016cially)d(part)150 2809 y(of)k(the)g(library)-8
-b(,)33 b(and)g(are)h(minimally)c(do)s(cumen)m(ted)k(here.)51
-b(If)33 b(they)h(break,)h(y)m(ou)f(get)h(to)g(k)m(eep)f(all)f(the)150
-2919 y(pieces.)40 b(I)31 b(hop)s(e)e(to)i(do)s(cumen)m(t)g(them)f(prop)
-s(erly)e(when)h(time)i(p)s(ermits.)150 3076 y(Y)-8 b(oshiok)j(a)27
-b(also)g(con)m(tributed)f(mo)s(di\014cations)f(to)i(allo)m(w)f(the)h
-(library)e(to)i(b)s(e)f(built)f(as)i(a)g(Windo)m(ws)f(DLL.)150
-3362 y Fk(3.2)68 b(Error)45 b(handling)150 3554 y Fl(The)23
-b(library)f(is)h(designed)g(to)i(reco)m(v)m(er)g(cleanly)f(in)e(all)h
-(situations,)h(including)d(the)j(w)m(orst-case)i(situation)150
-3664 y(of)j(decompressing)e(random)g(data.)41 b(I'm)28
-b(not)h(100\045)g(sure)f(that)h(it)f(can)h(alw)m(a)m(ys)g(do)f(this,)g
-(so)g(y)m(ou)h(migh)m(t)150 3774 y(w)m(an)m(t)i(to)g(add)e(a)i(signal)d
-(handler)g(to)j(catc)m(h)h(segmen)m(tation)f(violations)e(during)f
-(decompression)h(if)g(y)m(ou)150 3883 y(are)g(feeling)f(esp)s(ecially)f
-(paranoid.)39 b(I)28 b(w)m(ould)g(b)s(e)g(in)m(terested)h(in)e(hearing)
-h(more)h(ab)s(out)f(the)h(robustness)150 3993 y(of)i(the)f(library)e
-(to)j(corrupted)f(compressed)g(data.)150 4150 y(V)-8
-b(ersion)39 b(1.0)h(is)f(m)m(uc)m(h)g(more)h(robust)e(in)g(this)g(resp)
-s(ect)i(than)f(0.9.0)i(or)e(0.9.5.)70 b(In)m(v)m(estigations)39
-b(with)150 4259 y(Chec)m(k)m(er)21 b(\(a)g(to)s(ol)g(for)f(detecting)h
-(problems)d(with)h(memory)h(managemen)m(t,)k(similar)18
-b(to)j(Purify\))e(indicate)150 4369 y(that,)40 b(at)e(least)f(for)g
-(the)h(few)e(\014les)h(I)g(tested,)j(all)c(single-bit)f(errors)i(in)e
-(the)j(decompressed)f(data)h(are)150 4478 y(caugh)m(t)c(prop)s(erly)-8
-b(,)31 b(with)g(no)i(segmen)m(tation)h(faults,)e(no)g(reads)h(of)g
-(uninitialised)27 b(data)34 b(and)e(no)g(out)h(of)150
-4588 y(range)f(reads)g(or)f(writes.)44 b(So)32 b(it's)f(certainly)g(m)m
-(uc)m(h)h(impro)m(v)m(ed,)g(although)f(I)g(w)m(ouldn't)g(claim)g(it)g
-(to)i(b)s(e)150 4698 y(totally)d(b)s(om)m(bpro)s(of.)150
-4854 y(The)25 b(\014le)g Fj(bzlib.h)f Fl(con)m(tains)i(all)f
-(de\014nitions)e(needed)i(to)i(use)e(the)h(library)-8
-b(.)37 b(In)26 b(particular,)f(y)m(ou)h(should)150 4964
-y(de\014nitely)i(not)j(include)d Fj(bzlib_private.h)p
-Fl(.)150 5121 y(In)39 b Fj(bzlib.h)p Fl(,)h(the)g(v)-5
-b(arious)39 b(return)f(v)-5 b(alues)39 b(are)h(de\014ned.)68
-b(The)39 b(follo)m(wing)f(list)h(is)f(not)i(in)m(tended)f(as)150
-5230 y(an)c(exhaustiv)m(e)h(description)d(of)i(the)h(circumstances)f
-(in)f(whic)m(h)g(a)i(giv)m(en)f(v)-5 b(alue)35 b(ma)m(y)h(b)s(e)e
-(returned)h({)150 5340 y(those)h(descriptions)d(are)j(giv)m(en)f
-(later.)56 b(Rather,)37 b(it)d(is)h(in)m(tended)f(to)i(con)m(v)m(ey)h
-(the)e(rough)g(meaning)g(of)p eop
-%%Page: 11 12
-11 11 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(11)150 299 y(eac)m(h)38
-b(return)d(v)-5 b(alue.)59 b(The)36 b(\014rst)g(\014v)m(e)g(actions)h
-(are)g(normal)f(and)f(not)i(in)m(tended)f(to)h(denote)g(an)f(error)150
-408 y(situation.)150 592 y Fj(BZ_OK)180 b Fl(The)30 b(requested)g
-(action)h(w)m(as)g(completed)f(successfully)-8 b(.)150
-756 y Fj(BZ_RUN_OK)150 866 y(BZ_FLUSH_OK)150 975 y(BZ_FINISH_OK)630
-1085 y Fl(In)24 b Fj(BZ2_bzCompress)p Fl(,)e(the)i(requested)g
-(\015ush/\014nish/nothing-sp)s(ecial)c(action)k(w)m(as)h(com-)630
-1194 y(pleted)30 b(successfully)-8 b(.)150 1358 y Fj(BZ_STREAM_END)630
-1468 y Fl(Compression)38 b(of)j(data)f(w)m(as)h(completed,)h(or)f(the)f
-(logical)f(stream)i(end)e(w)m(as)i(detected)630 1577
-y(during)28 b(decompression.)150 1761 y(The)i(follo)m(wing)f(return)g
-(v)-5 b(alues)30 b(indicate)f(an)h(error)g(of)h(some)g(kind.)150
-1945 y Fj(BZ_CONFIG_ERROR)630 2055 y Fl(Indicates)48
-b(that)h(the)g(library)e(has)h(b)s(een)g(improp)s(erly)d(compiled)j(on)
-g(y)m(our)h(platform)630 2164 y({)j(a)g(ma)5 b(jor)51
-b(con\014guration)g(error.)104 b(Sp)s(eci\014cally)-8
-b(,)55 b(it)c(means)g(that)h Fj(sizeof\(char\))p Fl(,)630
-2274 y Fj(sizeof\(short\))44 b Fl(and)i Fj(sizeof\(int\))f
-Fl(are)j(not)f(1,)52 b(2)c(and)f(4)h(resp)s(ectiv)m(ely)-8
-b(,)51 b(as)d(they)630 2384 y(should)27 b(b)s(e.)40 b(Note)30
-b(that)g(the)f(library)e(should)g(still)g(w)m(ork)i(prop)s(erly)e(on)i
-(64-bit)g(platforms)630 2493 y(whic)m(h)d(follo)m(w)h(the)g(LP64)h
-(programming)e(mo)s(del)h({)g(that)h(is,)g(where)e Fj(sizeof\(long\))f
-Fl(and)630 2603 y Fj(sizeof\(void*\))e Fl(are)k(8.)40
-b(Under)25 b(LP64,)j Fj(sizeof\(int\))c Fl(is)h(still)f(4,)k(so)f
-Fj(libbzip2)p Fl(,)e(whic)m(h)630 2712 y(do)s(esn't)30
-b(use)g(the)h Fj(long)e Fl(t)m(yp)s(e,)i(is)e(OK.)150
-2876 y Fj(BZ_SEQUENCE_ERROR)630 2986 y Fl(When)43 b(using)f(the)i
-(library)-8 b(,)45 b(it)e(is)f(imp)s(ortan)m(t)h(to)h(call)e(the)i
-(functions)e(in)g(the)i(correct)630 3095 y(sequence)28
-b(and)f(with)f(data)j(structures)e(\(bu\013ers)f(etc\))j(in)e(the)g
-(correct)i(states.)41 b Fj(libbzip2)630 3205 y Fl(c)m(hec)m(ks)26
-b(as)e(m)m(uc)m(h)h(as)f(it)g(can)g(to)h(ensure)f(this)f(is)g(happ)s
-(ening,)h(and)f(returns)g Fj(BZ_SEQUENCE_)630 3314 y(ERROR)36
-b Fl(if)h(not.)62 b(Co)s(de)37 b(whic)m(h)g(complies)f(precisely)g
-(with)h(the)g(function)g(seman)m(tics,)j(as)630 3424
-y(detailed)d(b)s(elo)m(w,)i(should)d(nev)m(er)i(receiv)m(e)h(this)d(v)
--5 b(alue;)41 b(suc)m(h)d(an)g(ev)m(en)m(t)h(denotes)f(buggy)630
-3534 y(co)s(de)31 b(whic)m(h)e(y)m(ou)h(should)f(in)m(v)m(estigate.)150
-3697 y Fj(BZ_PARAM_ERROR)630 3807 y Fl(Returned)43 b(when)f(a)i
-(parameter)g(to)h(a)f(function)e(call)h(is)f(out)i(of)g(range)g(or)g
-(otherwise)630 3917 y(manifestly)34 b(incorrect.)57 b(As)36
-b(with)e Fj(BZ_SEQUENCE_ERROR)p Fl(,)f(this)i(denotes)h(a)g(bug)f(in)g
-(the)630 4026 y(clien)m(t)23 b(co)s(de.)39 b(The)22 b(distinction)f(b)s
-(et)m(w)m(een)j Fj(BZ_PARAM_ERROR)c Fl(and)j Fj(BZ_SEQUENCE_ERROR)630
-4136 y Fl(is)29 b(a)i(bit)f(hazy)-8 b(,)31 b(but)f(still)e(w)m(orth)i
-(making.)150 4300 y Fj(BZ_MEM_ERROR)630 4409 y Fl(Returned)g(when)f(a)i
-(request)f(to)i(allo)s(cate)f(memory)f(failed.)40 b(Note)31
-b(that)g(the)g(quan)m(tit)m(y)g(of)630 4519 y(memory)21
-b(needed)g(to)i(decompress)e(a)g(stream)h(cannot)g(b)s(e)f(determined)f
-(un)m(til)g(the)h(stream's)630 4628 y(header)29 b(has)g(b)s(een)g
-(read.)40 b(So)29 b Fj(BZ2_bzDecompress)c Fl(and)j Fj(BZ2_bzRead)f
-Fl(ma)m(y)j(return)e Fj(BZ_)630 4738 y(MEM_ERROR)d Fl(ev)m(en)k(though)
-e(some)h(of)g(the)g(compressed)g(data)g(has)g(b)s(een)f(read.)39
-b(The)28 b(same)630 4847 y(is)38 b(not)i(true)f(for)g(compression;)k
-(once)d Fj(BZ2_bzCompressInit)34 b Fl(or)39 b Fj(BZ2_bzWriteOpen)630
-4957 y Fl(ha)m(v)m(e)32 b(successfully)c(completed,)j
-Fj(BZ_MEM_ERROR)c Fl(cannot)k(o)s(ccur.)150 5121 y Fj(BZ_DATA_ERROR)630
-5230 y Fl(Returned)h(when)g(a)h(data)g(in)m(tegrit)m(y)g(error)g(is)e
-(detected)k(during)30 b(decompression.)47 b(Most)630
-5340 y(imp)s(ortan)m(tly)-8 b(,)31 b(this)f(means)i(when)f(stored)g
-(and)g(computed)h(CR)m(Cs)f(for)g(the)h(data)g(do)g(not)p
-eop
-%%Page: 12 13
-12 12 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(12)630 299 y(matc)m(h.)41
-b(This)28 b(v)-5 b(alue)29 b(is)f(also)i(returned)e(up)s(on)g
-(detection)i(of)g(an)m(y)g(other)f(anomaly)h(in)e(the)630
-408 y(compressed)i(data.)150 560 y Fj(BZ_DATA_ERROR_MAGIC)630
-670 y Fl(As)k(a)g(sp)s(ecial)f(case)i(of)f Fj(BZ_DATA_ERROR)p
-Fl(,)d(it)i(is)g(sometimes)h(useful)e(to)j(kno)m(w)f(when)f(the)630
-779 y(compressed)d(stream)h(do)s(es)f(not)g(start)h(with)e(the)i
-(correct)h(magic)e(b)m(ytes)h(\()p Fj('B')f('Z')f('h')p
-Fl(\).)150 931 y Fj(BZ_IO_ERROR)630 1040 y Fl(Returned)k(b)m(y)h
-Fj(BZ2_bzRead)d Fl(and)i Fj(BZ2_bzWrite)e Fl(when)i(there)h(is)f(an)g
-(error)h(reading)f(or)630 1150 y(writing)28 b(in)h(the)h(compressed)g
-(\014le,)f(and)h(b)m(y)g Fj(BZ2_bzReadOpen)c Fl(and)j
-Fj(BZ2_bzWriteOpen)630 1259 y Fl(for)i(attempts)i(to)f(use)f(a)h
-(\014le)e(for)i(whic)m(h)e(the)h(error)g(indicator)g(\(viz,)g
-Fj(ferror\(f\))p Fl(\))f(is)g(set.)630 1369 y(On)h(receipt)g(of)h
-Fj(BZ_IO_ERROR)p Fl(,)e(the)h(caller)h(should)d(consult)i
-Fj(errno)g Fl(and/or)g Fj(perror)f Fl(to)630 1479 y(acquire)g(op)s
-(erating-system)g(sp)s(eci\014c)f(information)g(ab)s(out)h(the)h
-(problem.)150 1630 y Fj(BZ_UNEXPECTED_EOF)630 1740 y
-Fl(Returned)36 b(b)m(y)g Fj(BZ2_bzRead)e Fl(when)i(the)h(compressed)f
-(\014le)g(\014nishes)e(b)s(efore)j(the)f(logical)630
-1849 y(end)30 b(of)g(stream)h(is)e(detected.)150 2001
-y Fj(BZ_OUTBUFF_FULL)630 2110 y Fl(Returned)g(b)m(y)i
-Fj(BZ2_bzBuffToBuffCompres)o(s)24 b Fl(and)30 b Fj
-(BZ2_bzBuffToBuffDecompres)o(s)630 2220 y Fl(to)h(indicate)f(that)h
-(the)f(output)g(data)h(will)d(not)i(\014t)h(in)m(to)f(the)h(output)f
-(bu\013er)f(pro)m(vided.)150 2492 y Fk(3.3)68 b(Lo)l(w-lev)l(el)47
-b(in)l(terface)150 2766 y Ff(3.3.1)63 b Fe(BZ2_bzCompressInit)390
-2953 y Fj(typedef)533 3057 y(struct)46 b({)676 3161 y(char)h(*next_in;)
-676 3264 y(unsigned)f(int)h(avail_in;)676 3368 y(unsigned)f(int)h
-(total_in_lo32;)676 3472 y(unsigned)f(int)h(total_in_hi32;)676
-3680 y(char)g(*next_out;)676 3783 y(unsigned)f(int)h(avail_out;)676
-3887 y(unsigned)f(int)h(total_out_lo32;)676 3991 y(unsigned)f(int)h
-(total_out_hi32;)676 4198 y(void)g(*state;)676 4406 y(void)g
-(*\(*bzalloc\)\(void)c(*,int,int\);)676 4510 y(void)k
-(\(*bzfree\)\(void)d(*,void)i(*\);)676 4614 y(void)h(*opaque;)533
-4717 y(})533 4821 y(bz_stream;)390 5029 y(int)g(BZ2_bzCompressInit)c
-(\()k(bz_stream)e(*strm,)1583 5132 y(int)i(blockSize100k,)1583
-5236 y(int)g(verbosity,)1583 5340 y(int)g(workFactor)e(\);)p
-eop
-%%Page: 13 14
-13 13 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(13)150 456 y(Prepares)32
-b(for)h(compression.)47 b(The)32 b Fj(bz_stream)e Fl(structure)j(holds)
-e(all)h(data)h(p)s(ertaining)e(to)i(the)g(com-)150 565
-y(pression)i(activit)m(y)-8 b(.)62 b(A)37 b Fj(bz_stream)e
-Fl(structure)h(should)f(b)s(e)i(allo)s(cated)g(and)f(initialised)e
-(prior)h(to)j(the)150 675 y(call.)67 b(The)39 b(\014elds)e(of)j
-Fj(bz_stream)d Fl(comprise)h(the)i(en)m(tiret)m(y)g(of)f(the)h
-(user-visible)c(data.)68 b Fj(state)38 b Fl(is)h(a)150
-784 y(p)s(oin)m(ter)29 b(to)i(the)g(priv)-5 b(ate)30
-b(data)h(structures)f(required)e(for)i(compression.)150
-941 y(Custom)37 b(memory)g(allo)s(cators)g(are)h(supp)s(orted,)f(via)g
-(\014elds)f Fj(bzalloc)p Fl(,)h Fj(bzfree)p Fl(,)g(and)g
-Fj(opaque)p Fl(.)59 b(The)150 1051 y(v)-5 b(alue)32 b
-Fj(opaque)e Fl(is)i(passed)f(to)i(as)g(the)f(\014rst)g(argumen)m(t)h
-(to)g(all)e(calls)g(to)i Fj(bzalloc)d Fl(and)i Fj(bzfree)p
-Fl(,)f(but)h(is)150 1160 y(otherwise)d(ignored)g(b)m(y)h(the)g(library)
--8 b(.)38 b(The)29 b(call)h Fj(bzalloc)e(\()i(opaque,)e(n,)i(m)g(\))g
-Fl(is)e(exp)s(ected)j(to)f(return)150 1270 y(a)g(p)s(oin)m(ter)e
-Fj(p)h Fl(to)h Fj(n)g(*)g(m)f Fl(b)m(ytes)h(of)g(memory)-8
-b(,)30 b(and)e Fj(bzfree)h(\()h(opaque,)f(p)h(\))f Fl(should)e(free)i
-(that)h(memory)-8 b(.)150 1427 y(If)33 b(y)m(ou)g(don't)h(w)m(an)m(t)g
-(to)g(use)f(a)g(custom)h(memory)f(allo)s(cator,)h(set)g
-Fj(bzalloc)p Fl(,)e Fj(bzfree)g Fl(and)h Fj(opaque)e
-Fl(to)150 1537 y Fj(NULL)p Fl(,)e(and)h(the)h(library)d(will)f(then)k
-(use)f(the)g(standard)g Fj(malloc)p Fl(/)p Fj(free)e
-Fl(routines.)150 1693 y(Before)39 b(calling)d Fj(BZ2_bzCompressInit)p
-Fl(,)f(\014elds)h Fj(bzalloc)p Fl(,)h Fj(bzfree)f Fl(and)h
-Fj(opaque)f Fl(should)g(b)s(e)h(\014lled)150 1803 y(appropriately)-8
-b(,)35 b(as)h(just)f(describ)s(ed.)53 b(Up)s(on)34 b(return,)i(the)g
-(in)m(ternal)e(state)i(will)d(ha)m(v)m(e)j(b)s(een)f(allo)s(cated)150
-1913 y(and)43 b(initialised,)g(and)g Fj(total_in_lo32)p
-Fl(,)h Fj(total_in_hi32)p Fl(,)f Fj(total_out_lo32)d
-Fl(and)j Fj(total_out_)150 2022 y(hi32)37 b Fl(will)f(ha)m(v)m(e)j(b)s
-(een)f(set)h(to)g(zero.)65 b(These)38 b(four)g(\014elds)e(are)j(used)f
-(b)m(y)g(the)g(library)e(to)j(inform)e(the)150 2132 y(caller)j(of)g
-(the)h(total)g(amoun)m(t)g(of)g(data)g(passed)f(in)m(to)g(and)g(out)g
-(of)h(the)g(library)-8 b(,)41 b(resp)s(ectiv)m(ely)-8
-b(.)70 b(Y)-8 b(ou)150 2241 y(should)34 b(not)j(try)f(to)h(c)m(hange)g
-(them.)58 b(As)36 b(of)h(v)m(ersion)f(1.0,)j(64-bit)d(coun)m(ts)h(are)f
-(main)m(tained,)h(ev)m(en)g(on)150 2351 y(32-bit)i(platforms,)h(using)d
-(the)i Fj(_hi32)e Fl(\014elds)g(to)j(store)f(the)g(upp)s(er)d(32)k
-(bits)d(of)i(the)g(coun)m(t.)66 b(So,)41 b(for)150 2460
-y(example,)30 b(the)h(total)g(amoun)m(t)g(of)f(data)h(in)f(is)f
-Fj(\(total_in_hi32)d(<<)k(32\))g(+)g(total_in_lo32)p
-Fl(.)150 2617 y(P)m(arameter)g Fj(blockSize100k)25 b
-Fl(sp)s(eci\014es)i(the)h(blo)s(c)m(k)g(size)h(to)g(b)s(e)f(used)f(for)
-h(compression.)40 b(It)28 b(should)f(b)s(e)150 2727 y(a)k(v)-5
-b(alue)30 b(b)s(et)m(w)m(een)i(1)f(and)f(9)h(inclusiv)m(e,)e(and)h(the)
-h(actual)g(blo)s(c)m(k)f(size)g(used)g(is)g(100000)j(x)e(this)e
-(\014gure.)42 b(9)150 2836 y(giv)m(es)31 b(the)f(b)s(est)g(compression)
-g(but)f(tak)m(es)j(most)f(memory)-8 b(.)150 2993 y(P)m(arameter)29
-b Fj(verbosity)c Fl(should)h(b)s(e)h(set)i(to)f(a)h(n)m(um)m(b)s(er)d
-(b)s(et)m(w)m(een)j(0)f(and)f(4)h(inclusiv)m(e.)38 b(0)28
-b(is)f(silen)m(t,)h(and)150 3103 y(greater)j(n)m(um)m(b)s(ers)c(giv)m
-(e)j(increasingly)d(v)m(erb)s(ose)j(monitoring/debugging)d(output.)40
-b(If)29 b(the)g(library)e(has)150 3212 y(b)s(een)j(compiled)e(with)i
-Fj(-DBZ_NO_STDIO)p Fl(,)d(no)j(suc)m(h)g(output)g(will)e(app)s(ear)h
-(for)h(an)m(y)h(v)m(erb)s(osit)m(y)f(setting.)150 3369
-y(P)m(arameter)35 b Fj(workFactor)d Fl(con)m(trols)i(ho)m(w)g(the)g
-(compression)f(phase)h(b)s(eha)m(v)m(es)g(when)f(presen)m(ted)h(with)
-150 3479 y(w)m(orst)40 b(case,)j(highly)37 b(rep)s(etitiv)m(e,)k(input)
-d(data.)68 b(If)39 b(compression)g(runs)e(in)m(to)j(di\016culties)d
-(caused)i(b)m(y)150 3588 y(rep)s(etitiv)m(e)34 b(data,)j(the)e(library)
-d(switc)m(hes)j(from)f(the)h(standard)f(sorting)g(algorithm)g(to)i(a)f
-(fallbac)m(k)f(al-)150 3698 y(gorithm.)47 b(The)32 b(fallbac)m(k)g(is)g
-(slo)m(w)m(er)g(than)h(the)f(standard)g(algorithm)g(b)m(y)g(p)s(erhaps)
-f(a)i(factor)h(of)e(three,)150 3808 y(but)e(alw)m(a)m(ys)h(b)s(eha)m(v)
-m(es)f(reasonably)-8 b(,)31 b(no)f(matter)h(ho)m(w)g(bad)f(the)g
-(input.)150 3965 y(Lo)m(w)m(er)25 b(v)-5 b(alues)24 b(of)h
-Fj(workFactor)d Fl(reduce)i(the)h(amoun)m(t)g(of)g(e\013ort)g(the)g
-(standard)f(algorithm)f(will)f(exp)s(end)150 4074 y(b)s(efore)j
-(resorting)h(to)g(the)g(fallbac)m(k.)39 b(Y)-8 b(ou)27
-b(should)c(set)k(this)e(parameter)h(carefully;)g(to)s(o)h(lo)m(w,)g
-(and)e(man)m(y)150 4184 y(inputs)32 b(will)f(b)s(e)i(handled)f(b)m(y)i
-(the)g(fallbac)m(k)g(algorithm)f(and)g(so)h(compress)g(rather)g(slo)m
-(wly)-8 b(,)34 b(to)s(o)h(high,)150 4293 y(and)24 b(y)m(our)h(a)m(v)m
-(erage-to-w)m(orst)30 b(case)c(compression)e(times)h(can)g(b)s(ecome)g
-(v)m(ery)h(large.)39 b(The)24 b(default)g(v)-5 b(alue)150
-4403 y(of)31 b(30)g(giv)m(es)f(reasonable)h(b)s(eha)m(viour)e(o)m(v)m
-(er)i(a)g(wide)e(range)i(of)f(circumstances.)150 4560
-y(Allo)m(w)m(able)h(v)-5 b(alues)31 b(range)i(from)e(0)i(to)f(250)h
-(inclusiv)m(e.)44 b(0)32 b(is)f(a)h(sp)s(ecial)f(case,)i(equiv)-5
-b(alen)m(t)32 b(to)g(using)f(the)150 4669 y(default)f(v)-5
-b(alue)29 b(of)i(30.)150 4826 y(Note)38 b(that)f(the)g(compressed)f
-(output)g(generated)h(is)f(the)g(same)h(regardless)f(of)h(whether)f(or)
-g(not)h(the)150 4936 y(fallbac)m(k)30 b(algorithm)f(is)h(used.)150
-5093 y(Be)23 b(a)m(w)m(are)h(also)f(that)g(this)f(parameter)h(ma)m(y)g
-(disapp)s(ear)e(en)m(tirely)h(in)f(future)h(v)m(ersions)g(of)h(the)g
-(library)-8 b(.)36 b(In)150 5202 y(principle)20 b(it)j(should)e(b)s(e)h
-(p)s(ossible)f(to)j(devise)f(a)g(go)s(o)s(d)g(w)m(a)m(y)i(to)f
-(automatically)f(c)m(ho)s(ose)h(whic)m(h)e(algorithm)150
-5312 y(to)31 b(use.)41 b(Suc)m(h)29 b(a)i(mec)m(hanism)f(w)m(ould)f
-(render)g(the)i(parameter)g(obsolete.)p eop
-%%Page: 14 15
-14 14 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(14)150 299 y(P)m(ossible)29
-b(return)h(v)-5 b(alues:)572 450 y Fj(BZ_CONFIG_ERROR)663
-554 y Fl(if)29 b(the)i(library)d(has)i(b)s(een)f(mis-compiled)572
-657 y Fj(BZ_PARAM_ERROR)663 761 y Fl(if)g Fj(strm)g Fl(is)h
-Fj(NULL)663 865 y Fl(or)g Fj(blockSize)e(<)i Fl(1)h(or)f
-Fj(blockSize)e(>)i Fl(9)663 969 y(or)g Fj(verbosity)e(<)i
-Fl(0)h(or)f Fj(verbosity)e(>)i Fl(4)663 1073 y(or)g Fj(workFactor)e(<)i
-Fl(0)g(or)h Fj(workFactor)c(>)j Fl(250)572 1176 y Fj(BZ_MEM_ERROR)663
-1280 y Fl(if)f(not)i(enough)f(memory)g(is)f(a)m(v)-5
-b(ailable)572 1384 y Fj(BZ_OK)663 1488 y Fl(otherwise)150
-1645 y(Allo)m(w)m(able)30 b(next)g(actions:)572 1796
-y Fj(BZ2_bzCompress)663 1899 y Fl(if)f Fj(BZ_OK)g Fl(is)g(returned)572
-2003 y(no)h(sp)s(eci\014c)f(action)i(needed)f(in)f(case)i(of)g(error)
-150 2255 y Ff(3.3.2)63 b Fe(BZ2_bzCompress)533 2441 y
-Fj(int)47 b(BZ2_bzCompress)d(\()j(bz_stream)f(*strm,)g(int)h(action)f
-(\);)150 2598 y Fl(Pro)m(vides)28 b(more)g(input)f(and/or)h(output)g
-(bu\013er)g(space)h(for)f(the)h(library)-8 b(.)38 b(The)28
-b(caller)g(main)m(tains)f(input)150 2708 y(and)j(output)g(bu\013ers,)f
-(and)h(calls)g Fj(BZ2_bzCompress)c Fl(to)31 b(transfer)f(data)h(b)s(et)
-m(w)m(een)g(them.)150 2865 y(Before)j(eac)m(h)g(call)e(to)i
-Fj(BZ2_bzCompress)p Fl(,)c Fj(next_in)h Fl(should)g(p)s(oin)m(t)h(at)h
-(the)g(data)h(to)g(b)s(e)e(compressed,)150 2974 y(and)41
-b Fj(avail_in)f Fl(should)g(indicate)h(ho)m(w)h(man)m(y)f(b)m(ytes)i
-(the)f(library)d(ma)m(y)k(read.)75 b Fj(BZ2_bzCompress)150
-3084 y Fl(up)s(dates)29 b Fj(next_in)p Fl(,)g Fj(avail_in)f
-Fl(and)i Fj(total_in)e Fl(to)j(re\015ect)g(the)g(n)m(um)m(b)s(er)e(of)h
-(b)m(ytes)h(it)f(has)g(read.)150 3241 y(Similarly)-8
-b(,)27 b Fj(next_out)h Fl(should)g(p)s(oin)m(t)h(to)i(a)f(bu\013er)f
-(in)g(whic)m(h)g(the)h(compressed)g(data)h(is)e(to)i(b)s(e)e(placed,)
-150 3350 y(with)i Fj(avail_out)f Fl(indicating)h(ho)m(w)h(m)m(uc)m(h)h
-(output)f(space)h(is)f(a)m(v)-5 b(ailable.)46 b Fj(BZ2_bzCompress)29
-b Fl(up)s(dates)150 3460 y Fj(next_out)p Fl(,)f Fj(avail_out)g
-Fl(and)i Fj(total_out)e Fl(to)j(re\015ect)g(the)f(n)m(um)m(b)s(er)g(of)
-g(b)m(ytes)h(output.)150 3617 y(Y)-8 b(ou)40 b(ma)m(y)g(pro)m(vide)e
-(and)h(remo)m(v)m(e)i(as)f(little)e(or)h(as)h(m)m(uc)m(h)f(data)h(as)g
-(y)m(ou)f(lik)m(e)g(on)g(eac)m(h)i(call)e(of)g Fj(BZ2_)150
-3726 y(bzCompress)p Fl(.)48 b(In)33 b(the)h(limit,)f(it)h(is)f
-(acceptable)h(to)h(supply)c(and)j(remo)m(v)m(e)h(data)g(one)f(b)m(yte)g
-(at)h(a)f(time,)150 3836 y(although)28 b(this)f(w)m(ould)g(b)s(e)h
-(terribly)e(ine\016cien)m(t.)39 b(Y)-8 b(ou)29 b(should)e(alw)m(a)m(ys)
-h(ensure)g(that)h(at)g(least)g(one)f(b)m(yte)150 3946
-y(of)j(output)f(space)g(is)g(a)m(v)-5 b(ailable)30 b(at)h(eac)m(h)g
-(call.)150 4102 y(A)38 b(second)h(purp)s(ose)d(of)j Fj(BZ2_bzCompress)
-34 b Fl(is)j(to)i(request)f(a)h(c)m(hange)g(of)g(mo)s(de)e(of)i(the)f
-(compressed)150 4212 y(stream.)150 4369 y(Conceptually)-8
-b(,)24 b(a)g(compressed)g(stream)g(can)f(b)s(e)g(in)g(one)h(of)f(four)g
-(states:)39 b(IDLE,)24 b(R)m(UNNING,)h(FLUSH-)150 4478
-y(ING)37 b(and)g(FINISHING.)g(Before)i(initialisation)33
-b(\()p Fj(BZ2_bzCompressInit)p Fl(\))g(and)j(after)i(termination)150
-4588 y(\()p Fj(BZ2_bzCompressEnd)p Fl(\),)27 b(a)j(stream)h(is)f
-(regarded)g(as)g(IDLE.)150 4745 y(Up)s(on)35 b(initialisation)e(\()p
-Fj(BZ2_bzCompressInit)p Fl(\),)h(the)i(stream)h(is)e(placed)h(in)e(the)
-j(R)m(UNNING)g(state.)150 4854 y(Subsequen)m(t)j(calls)g(to)i
-Fj(BZ2_bzCompress)37 b Fl(should)j(pass)g Fj(BZ_RUN)g
-Fl(as)h(the)g(requested)h(action;)47 b(other)150 4964
-y(actions)31 b(are)f(illegal)f(and)h(will)d(result)j(in)f
-Fj(BZ_SEQUENCE_ERROR)p Fl(.)150 5121 y(A)m(t)38 b(some)f(p)s(oin)m(t,)h
-(the)f(calling)e(program)i(will)d(ha)m(v)m(e)k(pro)m(vided)e(all)f(the)
-i(input)e(data)j(it)e(w)m(an)m(ts)i(to.)61 b(It)150 5230
-y(will)28 b(then)h(w)m(an)m(t)i(to)g(\014nish)d(up)h({)i(in)d
-(e\013ect,)k(asking)e(the)g(library)e(to)j(pro)s(cess)f(an)m(y)g(data)h
-(it)f(migh)m(t)g(ha)m(v)m(e)150 5340 y(bu\013ered)25
-b(in)m(ternally)-8 b(.)38 b(In)25 b(this)g(state,)k Fj(BZ2_bzCompress)
-22 b Fl(will)i(no)i(longer)g(attempt)h(to)g(read)f(data)h(from)p
-eop
-%%Page: 15 16
-15 15 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(15)150 299 y Fj(next_in)p
-Fl(,)33 b(but)g(it)h(will)d(w)m(an)m(t)k(to)g(write)e(data)h(to)h
-Fj(next_out)p Fl(.)49 b(Because)36 b(the)e(output)f(bu\013er)g
-(supplied)150 408 y(b)m(y)e(the)h(user)e(can)i(b)s(e)f(arbitrarily)d
-(small,)j(the)g(\014nishing-up)d(op)s(eration)i(cannot)i(necessarily)e
-(b)s(e)h(done)150 518 y(with)e(a)i(single)e(call)h(of)g
-Fj(BZ2_bzCompress)p Fl(.)150 675 y(Instead,)47 b(the)d(calling)f
-(program)g(passes)h Fj(BZ_FINISH)d Fl(as)j(an)g(action)g(to)h
-Fj(BZ2_bzCompress)p Fl(.)77 b(This)150 784 y(c)m(hanges)30
-b(the)f(stream's)g(state)h(to)f(FINISHING.)g(An)m(y)g(remaining)e
-(input)g(\(ie,)i Fj(next_in[0)f(..)i(avail_)150 894 y(in-1])p
-Fl(\))36 b(is)f(compressed)i(and)f(transferred)g(to)h(the)g(output)g
-(bu\013er.)58 b(T)-8 b(o)38 b(do)e(this,)i Fj(BZ2_bzCompress)150
-1004 y Fl(m)m(ust)h(b)s(e)f(called)g(rep)s(eatedly)h(un)m(til)e(all)h
-(the)h(output)f(has)h(b)s(een)f(consumed.)66 b(A)m(t)40
-b(that)g(p)s(oin)m(t,)g Fj(BZ2_)150 1113 y(bzCompress)h
-Fl(returns)h Fj(BZ_STREAM_END)p Fl(,)i(and)f(the)h(stream's)g(state)h
-(is)d(set)j(bac)m(k)f(to)g(IDLE.)g Fj(BZ2_)150 1223 y(bzCompressEnd)27
-b Fl(should)h(then)i(b)s(e)g(called.)150 1380 y(Just)25
-b(to)i(mak)m(e)g(sure)e(the)i(calling)d(program)i(do)s(es)g(not)g(c)m
-(heat,)i(the)f(library)c(mak)m(es)k(a)f(note)h(of)f Fj(avail_in)150
-1489 y Fl(at)g(the)g(time)f(of)g(the)g(\014rst)g(call)g(to)h
-Fj(BZ2_bzCompress)21 b Fl(whic)m(h)j(has)h Fj(BZ_FINISH)e
-Fl(as)i(an)h(action)f(\(ie,)i(at)f(the)150 1599 y(time)d(the)h(program)
-g(has)f(announced)g(its)h(in)m(ten)m(tion)f(to)h(not)g(supply)e(an)m(y)
-i(more)g(input\).)37 b(By)24 b(comparing)150 1708 y(this)k(v)-5
-b(alue)28 b(with)g(that)h(of)h Fj(avail_in)c Fl(o)m(v)m(er)k(subsequen)
-m(t)f(calls)f(to)h Fj(BZ2_bzCompress)p Fl(,)d(the)j(library)e(can)150
-1818 y(detect)33 b(an)m(y)e(attempts)i(to)f(slip)d(in)h(more)h(data)h
-(to)h(compress.)43 b(An)m(y)31 b(calls)g(for)g(whic)m(h)f(this)g(is)h
-(detected)150 1928 y(will)j(return)h Fj(BZ_SEQUENCE_ERROR)p
-Fl(.)55 b(This)34 b(indicates)i(a)h(programming)e(mistak)m(e)i(whic)m
-(h)e(should)g(b)s(e)150 2037 y(corrected.)150 2194 y(Instead)i(of)g
-(asking)f(to)h(\014nish,)f(the)h(calling)f(program)g(ma)m(y)h(ask)g
-Fj(BZ2_bzCompress)c Fl(to)38 b(tak)m(e)g(all)e(the)150
-2304 y(remaining)j(input,)i(compress)f(it)g(and)g(terminate)h(the)g
-(curren)m(t)f(\(Burro)m(ws-Wheeler\))h(compression)150
-2413 y(blo)s(c)m(k.)e(This)26 b(could)h(b)s(e)g(useful)f(for)h(error)h
-(con)m(trol)g(purp)s(oses.)38 b(The)27 b(mec)m(hanism)g(is)g(analogous)
-h(to)g(that)150 2523 y(for)35 b(\014nishing:)46 b(call)35
-b Fj(BZ2_bzCompress)c Fl(with)i(an)i(action)g(of)g Fj(BZ_FLUSH)p
-Fl(,)g(remo)m(v)m(e)h(output)f(data,)i(and)150 2632 y(p)s(ersist)h
-(with)g(the)i Fj(BZ_FLUSH)e Fl(action)i(un)m(til)e(the)i(v)-5
-b(alue)39 b Fj(BZ_RUN)f Fl(is)h(returned.)68 b(As)39
-b(with)g(\014nishing,)150 2742 y Fj(BZ2_bzCompress)23
-b Fl(detects)28 b(an)m(y)f(attempt)h(to)f(pro)m(vide)f(more)h(input)e
-(data)i(once)g(the)g(\015ush)e(has)i(b)s(egun.)150 2899
-y(Once)j(the)h(\015ush)e(is)g(complete,)i(the)g(stream)f(returns)g(to)h
-(the)f(normal)g(R)m(UNNING)h(state.)150 3056 y(This)f(all)h(sounds)g
-(prett)m(y)h(complex,)h(but)e(isn't)g(really)-8 b(.)45
-b(Here's)33 b(a)f(table)g(whic)m(h)f(sho)m(ws)h(whic)m(h)f(actions)150
-3165 y(are)e(allo)m(w)m(able)f(in)f(eac)m(h)j(state,)g(what)f(action)g
-(will)c(b)s(e)j(tak)m(en,)j(what)d(the)h(next)f(state)i(is,)e(and)g
-(what)h(the)150 3275 y(non-error)h(return)f(v)-5 b(alues)29
-b(are.)41 b(Note)32 b(that)e(y)m(ou)h(can't)g(explicitly)d(ask)i(what)g
-(state)i(the)e(stream)h(is)e(in,)150 3384 y(but)h(nor)g(do)g(y)m(ou)h
-(need)f(to)h({)g(it)e(can)i(b)s(e)f(inferred)e(from)i(the)h(v)-5
-b(alues)29 b(returned)h(b)m(y)g Fj(BZ2_bzCompress)p Fl(.)390
-3535 y(IDLE/)p Fj(any)572 3639 y Fl(Illegal.)60 b(IDLE)30
-b(state)i(only)d(exists)h(after)h Fj(BZ2_bzCompressEnd)26
-b Fl(or)572 3743 y(b)s(efore)k Fj(BZ2_bzCompressInit)p
-Fl(.)572 3847 y(Return)f(v)-5 b(alue)30 b(=)g Fj(BZ_SEQUENCE_ERROR)390
-4054 y Fl(R)m(UNNING/)p Fj(BZ_RUN)572 4158 y Fl(Compress)f(from)h
-Fj(next_in)f Fl(to)i Fj(next_out)d Fl(as)i(m)m(uc)m(h)h(as)f(p)s
-(ossible.)572 4262 y(Next)h(state)h(=)e(R)m(UNNING)572
-4366 y(Return)f(v)-5 b(alue)30 b(=)g Fj(BZ_RUN_OK)390
-4573 y Fl(R)m(UNNING/)p Fj(BZ_FLUSH)572 4677 y Fl(Remem)m(b)s(er)g
-(curren)m(t)g(v)-5 b(alue)30 b(of)g Fj(next_in)p Fl(.)59
-b(Compress)30 b(from)g Fj(next_in)572 4781 y Fl(to)h
-Fj(next_out)d Fl(as)j(m)m(uc)m(h)f(as)h(p)s(ossible,)d(but)i(do)g(not)g
-(accept)i(an)m(y)f(more)f(input.)572 4885 y(Next)h(state)h(=)e
-(FLUSHING)572 4988 y(Return)f(v)-5 b(alue)30 b(=)g Fj(BZ_FLUSH_OK)390
-5196 y Fl(R)m(UNNING/)p Fj(BZ_FINISH)572 5300 y Fl(Remem)m(b)s(er)g
-(curren)m(t)g(v)-5 b(alue)30 b(of)g Fj(next_in)p Fl(.)59
-b(Compress)30 b(from)g Fj(next_in)p eop
-%%Page: 16 17
-16 16 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(16)572 299 y(to)31 b Fj(next_out)d
-Fl(as)j(m)m(uc)m(h)f(as)h(p)s(ossible,)d(but)i(do)g(not)g(accept)i(an)m
-(y)f(more)f(input.)572 403 y(Next)h(state)h(=)e(FINISHING)572
-506 y(Return)f(v)-5 b(alue)30 b(=)g Fj(BZ_FINISH_OK)390
-714 y Fl(FLUSHING/)p Fj(BZ_FLUSH)572 818 y Fl(Compress)f(from)h
-Fj(next_in)f Fl(to)i Fj(next_out)d Fl(as)i(m)m(uc)m(h)h(as)f(p)s
-(ossible,)572 922 y(but)f(do)i(not)f(accept)i(an)m(y)f(more)f(input.)
-572 1025 y(If)g(all)f(the)i(existing)e(input)f(has)i(b)s(een)g(used)g
-(up)f(and)h(all)f(compressed)572 1129 y(output)h(has)g(b)s(een)g(remo)m
-(v)m(ed)663 1233 y(Next)h(state)h(=)e(R)m(UNNING;)i(Return)d(v)-5
-b(alue)30 b(=)g Fj(BZ_RUN_OK)572 1337 y Fl(else)663 1440
-y(Next)h(state)h(=)e(FLUSHING;)h(Return)e(v)-5 b(alue)30
-b(=)g Fj(BZ_FLUSH_OK)390 1648 y Fl(FLUSHING/other)572
-1752 y(Illegal.)572 1856 y(Return)f(v)-5 b(alue)30 b(=)g
-Fj(BZ_SEQUENCE_ERROR)390 2063 y Fl(FINISHING/)p Fj(BZ_FINISH)572
-2167 y Fl(Compress)f(from)h Fj(next_in)f Fl(to)i Fj(next_out)d
-Fl(as)i(m)m(uc)m(h)h(as)f(p)s(ossible,)572 2271 y(but)f(to)j(not)e
-(accept)i(an)m(y)f(more)f(input.)572 2374 y(If)g(all)f(the)i(existing)e
-(input)f(has)i(b)s(een)g(used)g(up)f(and)h(all)f(compressed)572
-2478 y(output)h(has)g(b)s(een)g(remo)m(v)m(ed)663 2582
-y(Next)h(state)h(=)e(IDLE;)g(Return)g(v)-5 b(alue)30
-b(=)g Fj(BZ_STREAM_END)572 2686 y Fl(else)663 2790 y(Next)h(state)h(=)e
-(FINISHING;)g(Return)g(v)-5 b(alue)30 b(=)g Fj(BZ_FINISHING)390
-2997 y Fl(FINISHING/other)572 3101 y(Illegal.)572 3205
-y(Return)f(v)-5 b(alue)30 b(=)g Fj(BZ_SEQUENCE_ERROR)150
-3361 y Fl(That)24 b(still)f(lo)s(oks)g(complicated?)39
-b(W)-8 b(ell,)25 b(fair)f(enough.)38 b(The)24 b(usual)f(sequence)i(of)f
-(calls)g(for)g(compressing)150 3471 y(a)31 b(load)f(of)g(data)h(is:)225
-3628 y Fi(\017)60 b Fl(Get)31 b(started)g(with)e Fj(BZ2_bzCompressInit)
-p Fl(.)225 3774 y Fi(\017)60 b Fl(Sho)m(v)m(el)38 b(data)h(in)e(and)g
-(shlurp)e(out)k(its)e(compressed)h(form)g(using)e(zero)j(or)f(more)h
-(calls)e(of)h Fj(BZ2_)330 3884 y(bzCompress)28 b Fl(with)h(action)h(=)g
-Fj(BZ_RUN)p Fl(.)225 4030 y Fi(\017)60 b Fl(Finish)23
-b(up.)38 b(Rep)s(eatedly)25 b(call)f Fj(BZ2_bzCompress)e
-Fl(with)i(action)h(=)g Fj(BZ_FINISH)p Fl(,)f(cop)m(ying)h(out)h(the)330
-4139 y(compressed)k(output,)g(un)m(til)f Fj(BZ_STREAM_END)e
-Fl(is)i(returned.)225 4285 y Fi(\017)60 b Fl(Close)30
-b(up)f(and)h(go)h(home.)41 b(Call)29 b Fj(BZ2_bzCompressEnd)p
-Fl(.)150 4478 y(If)23 b(the)h(data)h(y)m(ou)f(w)m(an)m(t)h(to)f
-(compress)g(\014ts)f(in)m(to)h(y)m(our)g(input)e(bu\013er)h(all)f(at)j
-(once,)h(y)m(ou)e(can)g(skip)f(the)h(calls)150 4588 y(of)37
-b Fj(BZ2_bzCompress)26 b(\()k(...,)f(BZ_RUN)g(\))36 b
-Fl(and)g(just)g(do)h(the)g Fj(BZ2_bzCompress)26 b(\()k(...,)f
-(BZ_FINISH)150 4698 y(\))h Fl(calls.)150 4854 y(All)36
-b(required)g(memory)h(is)f(allo)s(cated)i(b)m(y)f Fj
-(BZ2_bzCompressInit)p Fl(.)56 b(The)37 b(compression)g(library)e(can)
-150 4964 y(accept)g(an)m(y)f(data)h(at)g(all)d(\(ob)m(viously\).)51
-b(So)34 b(y)m(ou)g(shouldn't)e(get)j(an)m(y)f(error)f(return)g(v)-5
-b(alues)33 b(from)h(the)150 5074 y Fj(BZ2_bzCompress)29
-b Fl(calls.)46 b(If)32 b(y)m(ou)h(do,)g(they)g(will)d(b)s(e)i
-Fj(BZ_SEQUENCE_ERROR)p Fl(,)d(and)j(indicate)f(a)i(bug)f(in)150
-5183 y(y)m(our)e(programming.)150 5340 y(T)-8 b(rivial)28
-b(other)j(p)s(ossible)d(return)h(v)-5 b(alues:)p eop
-%%Page: 17 18
-17 17 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(17)572 299 y Fj(BZ_PARAM_ERROR)663
-403 y Fl(if)29 b Fj(strm)g Fl(is)h Fj(NULL)p Fl(,)f(or)i
-Fj(strm->s)d Fl(is)h Fj(NULL)150 652 y Ff(3.3.3)63 b
-Fe(BZ2_bzCompressEnd)390 839 y Fj(int)47 b(BZ2_bzCompressEnd)c(\()k
-(bz_stream)f(*strm)g(\);)150 996 y Fl(Releases)31 b(all)e(memory)h
-(asso)s(ciated)h(with)e(a)i(compression)e(stream.)150
-1153 y(P)m(ossible)g(return)h(v)-5 b(alues:)481 1304
-y Fj(BZ_PARAM_ERROR)117 b Fl(if)30 b Fj(strm)f Fl(is)g
-Fj(NULL)g Fl(or)i Fj(strm->s)d Fl(is)i Fj(NULL)481 1408
-y(BZ_OK)120 b Fl(otherwise)150 1657 y Ff(3.3.4)63 b Fe
-(BZ2_bzDecompressInit)390 1844 y Fj(int)47 b(BZ2_bzDecompressInit)42
-b(\()48 b(bz_stream)d(*strm,)h(int)h(verbosity,)e(int)i(small)f(\);)150
-2001 y Fl(Prepares)30 b(for)f(decompression.)40 b(As)29
-b(with)g Fj(BZ2_bzCompressInit)p Fl(,)c(a)31 b Fj(bz_stream)c
-Fl(record)j(should)e(b)s(e)150 2110 y(allo)s(cated)c(and)f(initialised)
-e(b)s(efore)i(the)i(call.)38 b(Fields)22 b Fj(bzalloc)p
-Fl(,)i Fj(bzfree)e Fl(and)i Fj(opaque)e Fl(should)g(b)s(e)h(set)i(if)
-150 2220 y(a)h(custom)f(memory)g(allo)s(cator)g(is)g(required,)f(or)h
-(made)h Fj(NULL)e Fl(for)h(the)g(normal)f Fj(malloc)p
-Fl(/)p Fj(free)f Fl(routines.)150 2330 y(Up)s(on)h(return,)h(the)g(in)m
-(ternal)f(state)i(will)c(ha)m(v)m(e)k(b)s(een)f(initialised,)d(and)i
-Fj(total_in)f Fl(and)h Fj(total_out)f Fl(will)150 2439
-y(b)s(e)30 b(zero.)150 2596 y(F)-8 b(or)31 b(the)g(meaning)e(of)i
-(parameter)g Fj(verbosity)p Fl(,)d(see)j Fj(BZ2_bzCompressInit)p
-Fl(.)150 2753 y(If)e Fj(small)e Fl(is)h(nonzero,)i(the)f(library)e
-(will)f(use)j(an)g(alternativ)m(e)h(decompression)e(algorithm)g(whic)m
-(h)f(uses)150 2862 y(less)c(memory)g(but)g(at)h(the)g(cost)h(of)e
-(decompressing)g(more)g(slo)m(wly)g(\(roughly)f(sp)s(eaking,)i(half)f
-(the)h(sp)s(eed,)150 2972 y(but)34 b(the)i(maxim)m(um)d(memory)i
-(requiremen)m(t)g(drops)e(to)j(around)e(2300k\).)57 b(See)35
-b(Chapter)g(2)g(for)g(more)150 3082 y(information)29
-b(on)h(memory)g(managemen)m(t.)150 3238 y(Note)40 b(that)f(the)f(amoun)
-m(t)h(of)g(memory)f(needed)g(to)i(decompress)e(a)h(stream)f(cannot)h(b)
-s(e)f(determined)150 3348 y(un)m(til)j(the)h(stream's)h(header)f(has)g
-(b)s(een)g(read,)j(so)e(ev)m(en)g(if)e Fj(BZ2_bzDecompressInit)c
-Fl(succeeds,)46 b(a)150 3458 y(subsequen)m(t)30 b Fj(BZ2_bzDecompress)c
-Fl(could)j(fail)g(with)g Fj(BZ_MEM_ERROR)p Fl(.)150 3614
-y(P)m(ossible)g(return)h(v)-5 b(alues:)572 3765 y Fj(BZ_CONFIG_ERROR)
-663 3869 y Fl(if)29 b(the)i(library)d(has)i(b)s(een)f(mis-compiled)572
-3973 y Fj(BZ_PARAM_ERROR)663 4077 y Fl(if)g Fj(\(small)46
-b(!=)h(0)h(&&)f(small)f(!=)h(1\))663 4181 y Fl(or)30
-b Fj(\(verbosity)45 b(<)j(0)f(||)g(verbosity)e(>)j(4\))572
-4284 y(BZ_MEM_ERROR)663 4388 y Fl(if)29 b(insu\016cien)m(t)g(memory)h
-(is)f(a)m(v)-5 b(ailable)150 4545 y(Allo)m(w)m(able)30
-b(next)g(actions:)572 4696 y Fj(BZ2_bzDecompress)663
-4800 y Fl(if)f Fj(BZ_OK)g Fl(w)m(as)i(returned)572 4904
-y(no)f(sp)s(eci\014c)f(action)i(required)e(in)g(case)i(of)g(error)150
-5153 y Ff(3.3.5)63 b Fe(BZ2_bzDecompress)390 5340 y Fj(int)47
-b(BZ2_bzDecompress)c(\()48 b(bz_stream)d(*strm)h(\);)p
-eop
-%%Page: 18 19
-18 18 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(18)150 299 y(Pro)m(vides)24
-b(more)g(input)f(and/out)h(output)g(bu\013er)g(space)h(for)f(the)g
-(library)-8 b(.)37 b(The)24 b(caller)g(main)m(tains)f(input)150
-408 y(and)30 b(output)g(bu\013ers,)f(and)h(uses)g Fj(BZ2_bzDecompress)c
-Fl(to)31 b(transfer)f(data)h(b)s(et)m(w)m(een)g(them.)150
-565 y(Before)g(eac)m(h)g(call)f(to)g Fj(BZ2_bzDecompress)p
-Fl(,)c Fj(next_in)i Fl(should)h(p)s(oin)m(t)g(at)h(the)h(compressed)e
-(data,)j(and)150 675 y Fj(avail_in)h Fl(should)h(indicate)h(ho)m(w)h
-(man)m(y)f(b)m(ytes)i(the)e(library)f(ma)m(y)i(read.)56
-b Fj(BZ2_bzDecompress)32 b Fl(up-)150 784 y(dates)f Fj(next_in)p
-Fl(,)e Fj(avail_in)f Fl(and)h Fj(total_in)g Fl(to)i(re\015ect)g(the)f
-(n)m(um)m(b)s(er)f(of)i(b)m(ytes)g(it)f(has)g(read.)150
-941 y(Similarly)-8 b(,)37 b Fj(next_out)f Fl(should)g(p)s(oin)m(t)i(to)
-g(a)h(bu\013er)e(in)g(whic)m(h)g(the)i(uncompressed)e(output)g(is)h(to)
-h(b)s(e)150 1051 y(placed,)d(with)e Fj(avail_out)f Fl(indicating)g(ho)m
-(w)i(m)m(uc)m(h)g(output)g(space)h(is)e(a)m(v)-5 b(ailable.)55
-b Fj(BZ2_bzCompress)150 1160 y Fl(up)s(dates)29 b Fj(next_out)p
-Fl(,)g Fj(avail_out)f Fl(and)h Fj(total_out)f Fl(to)j(re\015ect)g(the)g
-(n)m(um)m(b)s(er)e(of)h(b)m(ytes)h(output.)150 1317 y(Y)-8
-b(ou)40 b(ma)m(y)g(pro)m(vide)e(and)h(remo)m(v)m(e)i(as)f(little)e(or)h
-(as)h(m)m(uc)m(h)f(data)h(as)g(y)m(ou)f(lik)m(e)g(on)g(eac)m(h)i(call)e
-(of)g Fj(BZ2_)150 1427 y(bzDecompress)p Fl(.)e(In)27
-b(the)i(limit,)d(it)i(is)f(acceptable)j(to)f(supply)d(and)h(remo)m(v)m
-(e)j(data)f(one)f(b)m(yte)h(at)g(a)g(time,)150 1537 y(although)f(this)f
-(w)m(ould)g(b)s(e)h(terribly)e(ine\016cien)m(t.)39 b(Y)-8
-b(ou)29 b(should)e(alw)m(a)m(ys)h(ensure)g(that)h(at)g(least)g(one)f(b)
-m(yte)150 1646 y(of)j(output)f(space)g(is)g(a)m(v)-5
-b(ailable)30 b(at)h(eac)m(h)g(call.)150 1803 y(Use)g(of)f
-Fj(BZ2_bzDecompress)c Fl(is)k(simpler)e(than)i Fj(BZ2_bzCompress)p
-Fl(.)150 1960 y(Y)-8 b(ou)31 b(should)d(pro)m(vide)h(input)f(and)i
-(remo)m(v)m(e)i(output)d(as)i(describ)s(ed)d(ab)s(o)m(v)m(e,)k(and)d
-(rep)s(eatedly)h(call)f Fj(BZ2_)150 2069 y(bzDecompress)35
-b Fl(un)m(til)i Fj(BZ_STREAM_END)e Fl(is)j(returned.)64
-b(App)s(earance)39 b(of)g Fj(BZ_STREAM_END)c Fl(denotes)150
-2179 y(that)47 b Fj(BZ2_bzDecompress)42 b Fl(has)k(detected)h(the)f
-(logical)g(end)g(of)g(the)h(compressed)e(stream.)89 b
-Fj(BZ2_)150 2289 y(bzDecompress)28 b Fl(will)g(not)j(pro)s(duce)f
-Fj(BZ_STREAM_END)d Fl(un)m(til)j(all)f(output)i(data)h(has)e(b)s(een)h
-(placed)f(in)m(to)150 2398 y(the)36 b(output)g(bu\013er,)h(so)g(once)g
-Fj(BZ_STREAM_END)32 b Fl(app)s(ears,)38 b(y)m(ou)e(are)h(guaran)m(teed)
-g(to)g(ha)m(v)m(e)h(a)m(v)-5 b(ailable)150 2508 y(all)29
-b(the)i(decompressed)f(output,)g(and)g Fj(BZ2_bzDecompressEnd)25
-b Fl(can)31 b(safely)f(b)s(e)f(called.)150 2665 y(If)40
-b(case)h(of)f(an)h(error)e(return)h(v)-5 b(alue,)42 b(y)m(ou)f(should)d
-(call)h Fj(BZ2_bzDecompressEnd)c Fl(to)41 b(clean)f(up)g(and)150
-2774 y(release)31 b(memory)-8 b(.)150 2931 y(P)m(ossible)29
-b(return)h(v)-5 b(alues:)572 3082 y Fj(BZ_PARAM_ERROR)663
-3186 y Fl(if)29 b Fj(strm)g Fl(is)h Fj(NULL)f Fl(or)h
-Fj(strm->s)f Fl(is)g Fj(NULL)663 3290 y Fl(or)h Fj(strm->avail_out)44
-b(<)j(1)572 3393 y(BZ_DATA_ERROR)663 3497 y Fl(if)29
-b(a)i(data)g(in)m(tegrit)m(y)f(error)g(is)g(detected)h(in)e(the)i
-(compressed)f(stream)572 3601 y Fj(BZ_DATA_ERROR_MAGIC)663
-3705 y Fl(if)f(the)i(compressed)f(stream)g(do)s(esn't)h(b)s(egin)e
-(with)g(the)h(righ)m(t)g(magic)h(b)m(ytes)572 3808 y
-Fj(BZ_MEM_ERROR)663 3912 y Fl(if)e(there)i(w)m(asn't)f(enough)h(memory)
-f(a)m(v)-5 b(ailable)572 4016 y Fj(BZ_STREAM_END)663
-4120 y Fl(if)29 b(the)i(logical)e(end)h(of)h(the)f(data)h(stream)g(w)m
-(as)g(detected)g(and)f(all)663 4224 y(output)g(in)f(has)h(b)s(een)g
-(consumed,)f(eg)j Fj(s->avail_out)44 b(>)k(0)572 4327
-y(BZ_OK)663 4431 y Fl(otherwise)150 4588 y(Allo)m(w)m(able)30
-b(next)g(actions:)572 4739 y Fj(BZ2_bzDecompress)663
-4843 y Fl(if)f Fj(BZ_OK)g Fl(w)m(as)i(returned)572 4946
-y Fj(BZ2_bzDecompressEnd)663 5050 y Fl(otherwise)p eop
-%%Page: 19 20
-19 19 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(19)150 299 y Ff(3.3.6)63
-b Fe(BZ2_bzDecompressEnd)390 486 y Fj(int)47 b(BZ2_bzDecompressEnd)42
-b(\()48 b(bz_stream)d(*strm)i(\);)150 643 y Fl(Releases)31
-b(all)e(memory)h(asso)s(ciated)h(with)e(a)i(decompression)e(stream.)150
-799 y(P)m(ossible)g(return)h(v)-5 b(alues:)572 950 y
-Fj(BZ_PARAM_ERROR)663 1054 y Fl(if)29 b Fj(strm)g Fl(is)h
-Fj(NULL)f Fl(or)h Fj(strm->s)f Fl(is)g Fj(NULL)572 1158
-y(BZ_OK)663 1262 y Fl(otherwise)150 1419 y(Allo)m(w)m(able)h(next)g
-(actions:)572 1570 y(None.)150 1857 y Fk(3.4)68 b(High-lev)l(el)47
-b(in)l(terface)150 2050 y Fl(This)35 b(in)m(terface)j(pro)m(vides)d
-(functions)h(for)g(reading)g(and)h(writing)e Fj(bzip2)g
-Fl(format)i(\014les.)59 b(First,)39 b(some)150 2159 y(general)30
-b(p)s(oin)m(ts.)225 2316 y Fi(\017)60 b Fl(All)35 b(of)h(the)g
-(functions)e(tak)m(e)k(an)e Fj(int*)f Fl(\014rst)g(argumen)m(t,)j
-Fj(bzerror)p Fl(.)56 b(After)36 b(eac)m(h)h(call,)g Fj(bzerror)330
-2426 y Fl(should)23 b(b)s(e)i(consulted)g(\014rst)g(to)h(determine)e
-(the)i(outcome)h(of)e(the)h(call.)38 b(If)25 b Fj(bzerror)f
-Fl(is)g Fj(BZ_OK)p Fl(,)i(the)330 2535 y(call)35 b(completed)g
-(successfully)-8 b(,)36 b(and)f(only)g(then)g(should)f(the)h(return)g
-(v)-5 b(alue)35 b(of)h(the)f(function)g(\(if)330 2645
-y(an)m(y\))30 b(b)s(e)f(consulted.)39 b(If)29 b Fj(bzerror)e
-Fl(is)h Fj(BZ_IO_ERROR)p Fl(,)f(there)i(w)m(as)h(an)f(error)g
-(reading/writing)e(the)330 2754 y(underlying)32 b(compressed)j(\014le,)
-h(and)f(y)m(ou)h(should)d(then)i(consult)g Fj(errno)p
-Fl(/)p Fj(perror)e Fl(to)j(determine)330 2864 y(the)i(cause)g(of)g(the)
-g(di\016cult)m(y)-8 b(.)61 b Fj(bzerror)36 b Fl(ma)m(y)i(also)g(b)s(e)f
-(set)h(to)g(v)-5 b(arious)37 b(other)h(v)-5 b(alues;)41
-b(precise)330 2974 y(details)29 b(are)i(giv)m(en)g(on)f(a)h(p)s
-(er-function)d(basis)h(b)s(elo)m(w.)225 3111 y Fi(\017)60
-b Fl(If)40 b Fj(bzerror)f Fl(indicates)g(an)i(error)f(\(ie,)j(an)m
-(ything)d(except)h Fj(BZ_OK)f Fl(and)g Fj(BZ_STREAM_END)p
-Fl(\),)g(y)m(ou)330 3220 y(should)56 b(immediately)h(call)g
-Fj(BZ2_bzReadClose)e Fl(\(or)j Fj(BZ2_bzWriteClose)p
-Fl(,)j(dep)s(ending)56 b(on)330 3330 y(whether)50 b(y)m(ou)g(are)h
-(attempting)g(to)g(read)f(or)g(to)i(write\))d(to)j(free)e(up)f(all)h
-(resources)g(asso)s(ci-)330 3439 y(ated)33 b(with)e(the)i(stream.)47
-b(Once)32 b(an)h(error)f(has)g(b)s(een)g(indicated,)f(b)s(eha)m(viour)g
-(of)i(all)e(calls)h(except)330 3549 y Fj(BZ2_bzReadClose)46
-b Fl(\()p Fj(BZ2_bzWriteClose)p Fl(\))h(is)j(unde\014ned.)99
-b(The)50 b(implication)e(is)i(that)h(\(1\))330 3659 y
-Fj(bzerror)44 b Fl(should)g(b)s(e)h(c)m(hec)m(k)m(ed)j(after)e(eac)m(h)
-h(call,)i(and)c(\(2\))i(if)e Fj(bzerror)f Fl(indicates)g(an)i(error,)
-330 3768 y Fj(BZ2_bzReadClose)26 b Fl(\()p Fj(BZ2_bzWriteClose)p
-Fl(\))h(should)h(then)i(b)s(e)g(called)g(to)h(clean)f(up.)225
-3905 y Fi(\017)60 b Fl(The)33 b Fj(FILE*)f Fl(argumen)m(ts)h(passed)g
-(to)h Fj(BZ2_bzReadOpen)p Fl(/)p Fj(BZ2_bzWriteOp)o(en)27
-b Fl(should)32 b(b)s(e)g(set)i(to)330 4015 y(binary)23
-b(mo)s(de.)38 b(Most)26 b(Unix)d(systems)i(will)d(do)i(this)g(b)m(y)g
-(default,)i(but)e(other)g(platforms,)h(including)330
-4124 y(Windo)m(ws)20 b(and)g(Mac,)k(will)19 b(not.)38
-b(If)20 b(y)m(ou)h(omit)g(this,)h(y)m(ou)f(ma)m(y)h(encoun)m(ter)f
-(problems)e(when)h(mo)m(ving)330 4234 y(co)s(de)31 b(to)g(new)f
-(platforms.)225 4371 y Fi(\017)60 b Fl(Memory)23 b(allo)s(cation)f
-(requests)h(are)g(handled)e(b)m(y)i Fj(malloc)p Fl(/)p
-Fj(free)p Fl(.)36 b(A)m(t)23 b(presen)m(t)g(there)g(is)f(no)h(facilit)m
-(y)330 4481 y(for)40 b(user-de\014ned)e(memory)i(allo)s(cators)g(in)f
-(the)h(\014le)g(I/O)g(functions)e(\(could)i(easily)f(b)s(e)g(added,)330
-4590 y(though\).)150 4842 y Ff(3.4.1)63 b Fe(BZ2_bzReadOpen)533
-5029 y Fj(typedef)46 b(void)h(BZFILE;)533 5236 y(BZFILE)f
-(*BZ2_bzReadOpen)e(\()j(int)g(*bzerror,)f(FILE)g(*f,)1726
-5340 y(int)h(small,)f(int)h(verbosity,)p eop
-%%Page: 20 21
-20 20 bop 150 -116 a Fl(Chapter)30 b(3:)h(Programming)e(with)g
-Fj(libbzip2)1891 b Fl(20)1726 299 y Fj(void)47 b(*unused,)f(int)g
-(nUnused)g(\);)150 456 y Fl(Prepare)29 b(to)g(read)g(compressed)f(data)
-i(from)e(\014le)g(handle)f Fj(f)p Fl(.)40 b Fj(f)29 b
-Fl(should)d(refer)j(to)h(a)f(\014le)f(whic)m(h)f(has)i(b)s(een)150
-565 y(op)s(ened)h(for)h(reading,)f(and)h(for)f(whic)m(h)g(the)h(error)g
-(indicator)e(\()p Fj(ferror\(f\))p Fl(\)is)f(not)k(set.)42
-b(If)31 b Fj(small)e Fl(is)h(1,)150 675 y(the)h(library)d(will)f(try)j
-(to)i(decompress)e(using)f(less)g(memory)-8 b(,)31 b(at)g(the)g(exp)s
-(ense)f(of)g(sp)s(eed.)150 832 y(F)-8 b(or)39 b(reasons)f(explained)f
-(b)s(elo)m(w,)j Fj(BZ2_bzRead)35 b Fl(will)h(decompress)i(the)g
-Fj(nUnused)e Fl(b)m(ytes)j(starting)f(at)150 941 y Fj(unused)p
-Fl(,)k(b)s(efore)e(starting)h(to)g(read)g(from)f(the)h(\014le)f
-Fj(f)p Fl(.)71 b(A)m(t)42 b(most)f Fj(BZ_MAX_UNUSED)c
-Fl(b)m(ytes)k(ma)m(y)h(b)s(e)150 1051 y(supplied)32 b(lik)m(e)k(this.)
-55 b(If)36 b(this)e(facilit)m(y)h(is)g(not)h(required,)g(y)m(ou)g
-(should)e(pass)h Fj(NULL)g Fl(and)g Fj(0)g Fl(for)h Fj(unused)150
-1160 y Fl(and)30 b(n)p Fj(Unused)e Fl(resp)s(ectiv)m(ely)-8
-b(.)150 1317 y(F)g(or)31 b(the)g(meaning)e(of)i(parameters)g
-Fj(small)e Fl(and)g Fj(verbosity)p Fl(,)f(see)j Fj
-(BZ2_bzDecompressInit)p Fl(.)150 1474 y(The)k(amoun)m(t)g(of)g(memory)g
-(needed)g(to)g(decompress)g(a)h(\014le)e(cannot)h(b)s(e)g(determined)e
-(un)m(til)h(the)h(\014le's)150 1584 y(header)22 b(has)f(b)s(een)g
-(read.)38 b(So)22 b(it)f(is)g(p)s(ossible)e(that)k Fj(BZ2_bzReadOpen)17
-b Fl(returns)k Fj(BZ_OK)f Fl(but)h(a)i(subsequen)m(t)150
-1693 y(call)30 b(of)g Fj(BZ2_bzRead)e Fl(will)f(return)j
-Fj(BZ_MEM_ERROR)p Fl(.)150 1850 y(P)m(ossible)f(assignmen)m(ts)h(to)h
-Fj(bzerror)p Fl(:)572 2001 y Fj(BZ_CONFIG_ERROR)663 2105
-y Fl(if)e(the)i(library)d(has)i(b)s(een)f(mis-compiled)572
-2209 y Fj(BZ_PARAM_ERROR)663 2313 y Fl(if)g Fj(f)h Fl(is)g
-Fj(NULL)663 2416 y Fl(or)g Fj(small)f Fl(is)g(neither)h
-Fj(0)g Fl(nor)g Fj(1)663 2520 y Fl(or)g Fj(\(unused)46
-b(==)h(NULL)g(&&)g(nUnused)f(!=)h(0\))663 2624 y Fl(or)30
-b Fj(\(unused)46 b(!=)h(NULL)g(&&)g(!\(0)g(<=)g(nUnused)f(<=)h
-(BZ_MAX_UNUSED\)\))572 2728 y(BZ_IO_ERROR)663 2831 y
-Fl(if)29 b Fj(ferror\(f\))f Fl(is)h(nonzero)572 2935
-y Fj(BZ_MEM_ERROR)663 3039 y Fl(if)g(insu\016cien)m(t)g(memory)h(is)f
-(a)m(v)-5 b(ailable)572 3143 y Fj(BZ_OK)663 3247 y Fl(otherwise.)150
-3403 y(P)m(ossible)29 b(return)h(v)-5 b(alues:)572 3554
-y(P)m(oin)m(ter)31 b(to)g(an)f(abstract)h Fj(BZFILE)663
-3658 y Fl(if)e Fj(bzerror)f Fl(is)i Fj(BZ_OK)572 3762
-y(NULL)663 3866 y Fl(otherwise)150 4023 y(Allo)m(w)m(able)g(next)g
-(actions:)572 4174 y Fj(BZ2_bzRead)663 4277 y Fl(if)f
-Fj(bzerror)f Fl(is)i Fj(BZ_OK)572 4381 y(BZ2_bzClose)663
-4485 y Fl(otherwise)150 4887 y Ff(3.4.2)63 b Fe(BZ2_bzRead)533
-5074 y Fj(int)47 b(BZ2_bzRead)e(\()j(int)e(*bzerror,)g(BZFILE)g(*b,)h
-(void)f(*buf,)h(int)g(len)g(\);)150 5230 y Fl(Reads)35
-b(up)f(to)h Fj(len)f Fl(\(uncompressed\))h(b)m(ytes)g(from)f(the)h
-(compressed)g(\014le)f Fj(b)g Fl(in)m(to)h(the)g(bu\013er)f
-Fj(buf)p Fl(.)53 b(If)150 5340 y(the)30 b(read)f(w)m(as)h(successful,)f
-Fj(bzerror)e Fl(is)i(set)h(to)g Fj(BZ_OK)e Fl(and)h(the)h(n)m(um)m(b)s
-(er)e(of)i(b)m(ytes)g(read)f(is)g(returned.)p eop
-%%Page: 21 22
-21 21 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(21)150 299 y(If)33 b(the)g(logical)g
-(end-of-stream)h(w)m(as)g(detected,)i Fj(bzerror)31 b
-Fl(will)g(b)s(e)h(set)i(to)g Fj(BZ_STREAM_END)p Fl(,)d(and)i(the)150
-408 y(n)m(um)m(b)s(er)c(of)i(b)m(ytes)f(read)h(is)e(returned.)40
-b(All)29 b(other)h Fj(bzerror)f Fl(v)-5 b(alues)29 b(denote)i(an)g
-(error.)150 565 y Fj(BZ2_bzRead)37 b Fl(will)f(supply)h
-Fj(len)i Fl(b)m(ytes,)j(unless)c(the)i(logical)f(stream)h(end)e(is)h
-(detected)i(or)e(an)g(error)150 675 y(o)s(ccurs.)75 b(Because)43
-b(of)f(this,)i(it)d(is)g(p)s(ossible)e(to)k(detect)g(the)f(stream)g
-(end)f(b)m(y)h(observing)f(when)g(the)150 784 y(n)m(um)m(b)s(er)29
-b(of)h(b)m(ytes)g(returned)f(is)g(less)g(than)h(the)g(n)m(um)m(b)s(er)f
-(requested.)40 b(Nev)m(ertheless,)31 b(this)e(is)g(regarded)150
-894 y(as)38 b(inadvisable;)g(y)m(ou)g(should)d(instead)i(c)m(hec)m(k)i
-Fj(bzerror)d Fl(after)i(ev)m(ery)g(call)e(and)h(w)m(atc)m(h)i(out)f
-(for)f Fj(BZ_)150 1004 y(STREAM_END)p Fl(.)150 1160 y(In)m(ternally)-8
-b(,)47 b Fj(BZ2_bzRead)41 b Fl(copies)j(data)g(from)g(the)g(compressed)
-g(\014le)f(in)f(c)m(h)m(unks)i(of)g(size)g Fj(BZ_MAX_)150
-1270 y(UNUSED)31 b Fl(b)m(ytes)i(b)s(efore)f(decompressing)f(it.)47
-b(If)32 b(the)h(\014le)e(con)m(tains)i(more)g(b)m(ytes)g(than)f
-(strictly)f(needed)150 1380 y(to)48 b(reac)m(h)f(the)g(logical)f
-(end-of-stream,)52 b Fj(BZ2_bzRead)44 b Fl(will)g(almost)j(certainly)f
-(read)h(some)g(of)g(the)150 1489 y(trailing)c(data)j(b)s(efore)e
-(signalling)f Fj(BZ_SEQUENCE_END)p Fl(.)80 b(T)-8 b(o)46
-b(collect)f(the)g(read)g(but)g(un)m(used)e(data)150 1599
-y(once)29 b Fj(BZ_SEQUENCE_END)24 b Fl(has)k(app)s(eared,)g(call)f
-Fj(BZ2_bzReadGetUnused)c Fl(immediately)j(b)s(efore)i
-Fj(BZ2_)150 1708 y(bzReadClose)p Fl(.)150 1865 y(P)m(ossible)h
-(assignmen)m(ts)h(to)h Fj(bzerror)p Fl(:)572 2016 y Fj(BZ_PARAM_ERROR)
-663 2120 y Fl(if)e Fj(b)h Fl(is)g Fj(NULL)f Fl(or)h Fj(buf)g
-Fl(is)f Fj(NULL)g Fl(or)i Fj(len)46 b(<)i(0)572 2224
-y(BZ_SEQUENCE_ERROR)663 2328 y Fl(if)29 b Fj(b)h Fl(w)m(as)h(op)s(ened)
-e(with)h Fj(BZ2_bzWriteOpen)572 2431 y(BZ_IO_ERROR)663
-2535 y Fl(if)f(there)i(is)e(an)h(error)g(reading)g(from)g(the)g
-(compressed)g(\014le)572 2639 y Fj(BZ_UNEXPECTED_EOF)663
-2743 y Fl(if)f(the)i(compressed)f(\014le)f(ended)h(b)s(efore)g(the)g
-(logical)g(end-of-stream)h(w)m(as)g(detected)572 2847
-y Fj(BZ_DATA_ERROR)663 2950 y Fl(if)e(a)i(data)g(in)m(tegrit)m(y)f
-(error)g(w)m(as)h(detected)h(in)d(the)h(compressed)g(stream)572
-3054 y Fj(BZ_DATA_ERROR_MAGIC)663 3158 y Fl(if)f(the)i(stream)f(do)s
-(es)g(not)h(b)s(egin)e(with)g(the)i(requisite)e(header)h(b)m(ytes)h
-(\(ie,)f(is)g(not)663 3262 y(a)g Fj(bzip2)f Fl(data)i(\014le\).)61
-b(This)28 b(is)i(really)f(a)i(sp)s(ecial)e(case)i(of)g
-Fj(BZ_DATA_ERROR)p Fl(.)572 3365 y Fj(BZ_MEM_ERROR)663
-3469 y Fl(if)e(insu\016cien)m(t)g(memory)h(w)m(as)h(a)m(v)-5
-b(ailable)572 3573 y Fj(BZ_STREAM_END)663 3677 y Fl(if)29
-b(the)i(logical)e(end)h(of)h(stream)f(w)m(as)h(detected.)572
-3781 y Fj(BZ_OK)663 3884 y Fl(otherwise.)150 4041 y(P)m(ossible)e
-(return)h(v)-5 b(alues:)572 4192 y(n)m(um)m(b)s(er)29
-b(of)h(b)m(ytes)h(read)663 4296 y(if)e Fj(bzerror)f Fl(is)i
-Fj(BZ_OK)f Fl(or)h Fj(BZ_STREAM_END)572 4400 y Fl(unde\014ned)663
-4503 y(otherwise)150 4660 y(Allo)m(w)m(able)g(next)g(actions:)572
-4811 y(collect)h(data)g(from)f Fj(buf)p Fl(,)f(then)h
-Fj(BZ2_bzRead)e Fl(or)i Fj(BZ2_bzReadClose)663 4915 y
-Fl(if)f Fj(bzerror)f Fl(is)i Fj(BZ_OK)572 5019 y Fl(collect)h(data)g
-(from)f Fj(buf)p Fl(,)f(then)h Fj(BZ2_bzReadClose)d Fl(or)j
-Fj(BZ2_bzReadGetUnused)663 5123 y Fl(if)f Fj(bzerror)f
-Fl(is)i Fj(BZ_SEQUENCE_END)572 5226 y(BZ2_bzReadClose)663
-5330 y Fl(otherwise)p eop
-%%Page: 22 23
-22 22 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(22)150 299 y Ff(3.4.3)63
-b Fe(BZ2_bzReadGetUnused)533 486 y Fj(void)47 b(BZ2_bzReadGetUnused)42
-b(\()48 b(int*)e(bzerror,)g(BZFILE)g(*b,)1822 589 y(void**)g(unused,)g
-(int*)g(nUnused)g(\);)150 746 y Fl(Returns)36 b(data)i(whic)m(h)d(w)m
-(as)j(read)f(from)f(the)h(compressed)g(\014le)f(but)g(w)m(as)h(not)h
-(needed)e(to)i(get)g(to)g(the)150 856 y(logical)k(end-of-stream.)78
-b Fj(*unused)41 b Fl(is)h(set)h(to)g(the)g(address)f(of)g(the)h(data,)k
-(and)42 b Fj(*nUnused)e Fl(to)k(the)150 965 y(n)m(um)m(b)s(er)29
-b(of)i(b)m(ytes.)41 b Fj(*nUnused)28 b Fl(will)g(b)s(e)h(set)i(to)g(a)g
-(v)-5 b(alue)30 b(b)s(et)m(w)m(een)h Fj(0)f Fl(and)g
-Fj(BZ_MAX_UNUSED)d Fl(inclusiv)m(e.)150 1122 y(This)d(function)h(ma)m
-(y)h(only)g(b)s(e)f(called)g(once)i Fj(BZ2_bzRead)c Fl(has)j(signalled)
-e Fj(BZ_STREAM_END)e Fl(but)j(b)s(efore)150 1232 y Fj(BZ2_bzReadClose)p
-Fl(.)150 1389 y(P)m(ossible)k(assignmen)m(ts)h(to)h Fj(bzerror)p
-Fl(:)572 1540 y Fj(BZ_PARAM_ERROR)663 1644 y Fl(if)e
-Fj(b)h Fl(is)g Fj(NULL)663 1747 y Fl(or)g Fj(unused)f
-Fl(is)g Fj(NULL)g Fl(or)i Fj(nUnused)d Fl(is)i Fj(NULL)572
-1851 y(BZ_SEQUENCE_ERROR)663 1955 y Fl(if)f Fj(BZ_STREAM_END)e
-Fl(has)j(not)h(b)s(een)e(signalled)663 2059 y(or)h(if)f
-Fj(b)h Fl(w)m(as)h(op)s(ened)f(with)f Fj(BZ2_bzWriteOpen)542
-2162 y(BZ_OK)663 2266 y Fl(otherwise)150 2423 y(Allo)m(w)m(able)h(next)
-g(actions:)572 2574 y Fj(BZ2_bzReadClose)150 2882 y Ff(3.4.4)63
-b Fe(BZ2_bzReadClose)533 3068 y Fj(void)47 b(BZ2_bzReadClose)c(\()48
-b(int)f(*bzerror,)e(BZFILE)h(*b)h(\);)150 3225 y Fl(Releases)36
-b(all)e(memory)h(p)s(ertaining)e(to)i(the)h(compressed)f(\014le)f
-Fj(b)p Fl(.)54 b Fj(BZ2_bzReadClose)31 b Fl(do)s(es)k(not)h(call)150
-3335 y Fj(fclose)c Fl(on)h(the)h(underlying)d(\014le)h(handle,)h(so)h
-(y)m(ou)g(should)e(do)h(that)h(y)m(ourself)f(if)g(appropriate.)49
-b Fj(BZ2_)150 3445 y(bzReadClose)27 b Fl(should)i(b)s(e)g(called)h(to)h
-(clean)f(up)g(after)h(all)e(error)h(situations.)150 3601
-y(P)m(ossible)f(assignmen)m(ts)h(to)h Fj(bzerror)p Fl(:)572
-3752 y Fj(BZ_SEQUENCE_ERROR)663 3856 y Fl(if)e Fj(b)h
-Fl(w)m(as)h(op)s(ened)e(with)h Fj(BZ2_bzOpenWrite)572
-3960 y(BZ_OK)663 4064 y Fl(otherwise)150 4221 y(Allo)m(w)m(able)g(next)
-g(actions:)572 4372 y(none)150 4679 y Ff(3.4.5)63 b Fe(BZ2_bzWriteOpen)
-533 4866 y Fj(BZFILE)46 b(*BZ2_bzWriteOpen)e(\()j(int)g(*bzerror,)e
-(FILE)i(*f,)1774 4970 y(int)g(blockSize100k,)d(int)j(verbosity,)1774
-5074 y(int)g(workFactor)e(\);)150 5230 y Fl(Prepare)33
-b(to)g(write)f(compressed)h(data)h(to)f(\014le)f(handle)g
-Fj(f)p Fl(.)47 b Fj(f)33 b Fl(should)e(refer)i(to)g(a)g(\014le)f(whic)m
-(h)g(has)h(b)s(een)150 5340 y(op)s(ened)d(for)g(writing,)e(and)i(for)g
-(whic)m(h)f(the)i(error)f(indicator)f(\()p Fj(ferror\(f\))p
-Fl(\)is)f(not)i(set.)p eop
-%%Page: 23 24
-23 23 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(23)150 299 y(F)-8 b(or)31
-b(the)g(meaning)e(of)i(parameters)g Fj(blockSize100k)p
-Fl(,)c Fj(verbosity)g Fl(and)j Fj(workFactor)p Fl(,)e(see)150
-408 y Fj(BZ2_bzCompressInit)p Fl(.)150 565 y(All)d(required)f(memory)i
-(is)f(allo)s(cated)i(at)g(this)e(stage,)j(so)f(if)e(the)h(call)g
-(completes)g(successfully)-8 b(,)26 b Fj(BZ_MEM_)150
-675 y(ERROR)j Fl(cannot)i(b)s(e)f(signalled)e(b)m(y)i(a)h(subsequen)m
-(t)f(call)f(to)i Fj(BZ2_bzWrite)p Fl(.)150 832 y(P)m(ossible)e
-(assignmen)m(ts)h(to)h Fj(bzerror)p Fl(:)572 983 y Fj(BZ_CONFIG_ERROR)
-663 1087 y Fl(if)e(the)i(library)d(has)i(b)s(een)f(mis-compiled)572
-1190 y Fj(BZ_PARAM_ERROR)663 1294 y Fl(if)g Fj(f)h Fl(is)g
-Fj(NULL)663 1398 y Fl(or)g Fj(blockSize100k)44 b(<)k(1)30
-b Fl(or)g Fj(blockSize100k)44 b(>)k(9)572 1502 y(BZ_IO_ERROR)663
-1605 y Fl(if)29 b Fj(ferror\(f\))f Fl(is)h(nonzero)572
-1709 y Fj(BZ_MEM_ERROR)663 1813 y Fl(if)g(insu\016cien)m(t)g(memory)h
-(is)f(a)m(v)-5 b(ailable)572 1917 y Fj(BZ_OK)663 2021
-y Fl(otherwise)150 2177 y(P)m(ossible)29 b(return)h(v)-5
-b(alues:)572 2328 y(P)m(oin)m(ter)31 b(to)g(an)f(abstract)h
-Fj(BZFILE)663 2432 y Fl(if)e Fj(bzerror)f Fl(is)i Fj(BZ_OK)572
-2536 y(NULL)663 2640 y Fl(otherwise)150 2797 y(Allo)m(w)m(able)g(next)g
-(actions:)572 2948 y Fj(BZ2_bzWrite)663 3051 y Fl(if)f
-Fj(bzerror)f Fl(is)i Fj(BZ_OK)604 3155 y Fl(\(y)m(ou)25
-b(could)e(go)h(directly)f(to)h Fj(BZ2_bzWriteClose)p
-Fl(,)c(but)j(this)g(w)m(ould)g(b)s(e)g(prett)m(y)h(p)s(oin)m(tless\))
-572 3259 y Fj(BZ2_bzWriteClose)663 3363 y Fl(otherwise)150
-3639 y Ff(3.4.6)63 b Fe(BZ2_bzWrite)533 3826 y Fj(void)47
-b(BZ2_bzWrite)e(\()i(int)g(*bzerror,)e(BZFILE)h(*b,)h(void)g(*buf,)f
-(int)h(len)g(\);)150 3983 y Fl(Absorbs)26 b Fj(len)g
-Fl(b)m(ytes)i(from)e(the)i(bu\013er)e Fj(buf)p Fl(,)h(ev)m(en)m(tually)
-g(to)h(b)s(e)e(compressed)h(and)f(written)g(to)i(the)g(\014le.)150
-4140 y(P)m(ossible)h(assignmen)m(ts)h(to)h Fj(bzerror)p
-Fl(:)572 4291 y Fj(BZ_PARAM_ERROR)663 4395 y Fl(if)e
-Fj(b)h Fl(is)g Fj(NULL)f Fl(or)h Fj(buf)g Fl(is)f Fj(NULL)g
-Fl(or)i Fj(len)46 b(<)i(0)572 4498 y(BZ_SEQUENCE_ERROR)663
-4602 y Fl(if)29 b(b)h(w)m(as)h(op)s(ened)e(with)g Fj(BZ2_bzReadOpen)572
-4706 y(BZ_IO_ERROR)663 4810 y Fl(if)g(there)i(is)e(an)h(error)g
-(writing)f(the)h(compressed)g(\014le.)572 4914 y Fj(BZ_OK)663
-5017 y Fl(otherwise)150 5294 y Ff(3.4.7)63 b Fe(BZ2_bzWriteClose)p
-eop
-%%Page: 24 25
-24 24 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(24)533 299 y Fj(void)47
-b(BZ2_bzWriteClose)c(\()48 b(int)f(*bzerror,)e(BZFILE*)h(f,)1679
-403 y(int)h(abandon,)1679 506 y(unsigned)e(int*)i(nbytes_in,)1679
-610 y(unsigned)e(int*)i(nbytes_out)e(\);)533 818 y(void)i
-(BZ2_bzWriteClose64)c(\()k(int)g(*bzerror,)e(BZFILE*)h(f,)1774
-922 y(int)h(abandon,)1774 1025 y(unsigned)f(int*)g(nbytes_in_lo32,)1774
-1129 y(unsigned)g(int*)g(nbytes_in_hi32,)1774 1233 y(unsigned)g(int*)g
-(nbytes_out_lo32,)1774 1337 y(unsigned)g(int*)g(nbytes_out_hi32)e(\);)
-150 1493 y Fl(Compresses)39 b(and)g(\015ushes)g(to)h(the)g(compressed)g
-(\014le)f(all)f(data)j(so)f(far)g(supplied)c(b)m(y)k
-Fj(BZ2_bzWrite)p Fl(.)150 1603 y(The)27 b(logical)g(end-of-stream)h
-(mark)m(ers)g(are)g(also)f(written,)h(so)f(subsequen)m(t)g(calls)g(to)h
-Fj(BZ2_bzWrite)d Fl(are)150 1713 y(illegal.)50 b(All)33
-b(memory)h(asso)s(ciated)g(with)f(the)i(compressed)e(\014le)h
-Fj(b)f Fl(is)g(released.)52 b Fj(fflush)33 b Fl(is)g(called)g(on)150
-1822 y(the)e(compressed)f(\014le,)f(but)h(it)g(is)f(not)i
-Fj(fclose)p Fl('d.)150 1979 y(If)i Fj(BZ2_bzWriteClose)c
-Fl(is)k(called)f(to)j(clean)e(up)f(after)i(an)g(error,)g(the)g(only)e
-(action)i(is)f(to)h(release)g(the)150 2089 y(memory)-8
-b(.)42 b(The)30 b(library)e(records)j(the)g(error)f(co)s(des)h(issued)e
-(b)m(y)h(previous)f(calls,)i(so)f(this)g(situation)g(will)150
-2198 y(b)s(e)c(detected)h(automatically)-8 b(.)40 b(There)26
-b(is)g(no)g(attempt)h(to)h(complete)e(the)h(compression)f(op)s
-(eration,)g(nor)150 2308 y(to)32 b Fj(fflush)d Fl(the)i(compressed)g
-(\014le.)42 b(Y)-8 b(ou)32 b(can)f(force)h(this)e(b)s(eha)m(viour)g(to)
-h(happ)s(en)f(ev)m(en)i(in)d(the)j(case)g(of)150 2417
-y(no)e(error,)g(b)m(y)h(passing)e(a)i(nonzero)f(v)-5
-b(alue)30 b(to)h Fj(abandon)p Fl(.)150 2574 y(If)j Fj(nbytes_in)d
-Fl(is)j(non-n)m(ull,)f Fj(*nbytes_in)e Fl(will)h(b)s(e)h(set)i(to)g(b)s
-(e)f(the)g(total)h(v)m(olume)f(of)g(uncompressed)150
-2684 y(data)k(handled.)60 b(Similarly)-8 b(,)35 b Fj(nbytes_out)g
-Fl(will)g(b)s(e)h(set)i(to)g(the)g(total)g(v)m(olume)f(of)g(compressed)
-g(data)150 2793 y(written.)h(F)-8 b(or)27 b(compatibilit)m(y)d(with)h
-(older)g(v)m(ersions)h(of)g(the)g(library)-8 b(,)25 b
-Fj(BZ2_bzWriteClose)d Fl(only)j(yields)150 2903 y(the)40
-b(lo)m(w)m(er)g(32)h(bits)d(of)i(these)h(coun)m(ts.)69
-b(Use)40 b Fj(BZ2_bzWriteClose64)35 b Fl(if)k(y)m(ou)h(w)m(an)m(t)h
-(the)f(full)d(64)k(bit)150 3013 y(coun)m(ts.)g(These)30
-b(t)m(w)m(o)i(functions)d(are)i(otherwise)f(absolutely)f(iden)m(tical.)
-150 3169 y(P)m(ossible)g(assignmen)m(ts)h(to)h Fj(bzerror)p
-Fl(:)572 3320 y Fj(BZ_SEQUENCE_ERROR)663 3424 y Fl(if)e
-Fj(b)h Fl(w)m(as)h(op)s(ened)e(with)h Fj(BZ2_bzReadOpen)572
-3528 y(BZ_IO_ERROR)663 3632 y Fl(if)f(there)i(is)e(an)h(error)g
-(writing)f(the)h(compressed)g(\014le)572 3736 y Fj(BZ_OK)663
-3839 y Fl(otherwise)150 4161 y Ff(3.4.8)63 b(Handling)41
-b(em)m(b)s(edded)g(compressed)h(data)e(streams)150 4354
-y Fl(The)i(high-lev)m(el)g(library)f(facilitates)h(use)h(of)g
-Fj(bzip2)e Fl(data)j(streams)f(whic)m(h)f(form)g(some)i(part)e(of)i(a)
-150 4463 y(surrounding,)27 b(larger)j(data)h(stream.)225
-4620 y Fi(\017)60 b Fl(F)-8 b(or)22 b(writing,)f(the)g(library)e(tak)m
-(es)k(an)e(op)s(en)f(\014le)g(handle,)i(writes)e(compressed)h(data)h
-(to)g(it,)g Fj(fflush)p Fl(es)330 4730 y(it)34 b(but)f(do)s(es)h(not)h
-Fj(fclose)d Fl(it.)52 b(The)34 b(calling)f(application)g(can)h(write)g
-(its)f(o)m(wn)i(data)g(b)s(efore)f(and)330 4839 y(after)d(the)f
-(compressed)h(data)g(stream,)g(using)d(that)j(same)g(\014le)f(handle.)
-225 5011 y Fi(\017)60 b Fl(Reading)34 b(is)f(more)i(complex,)g(and)f
-(the)h(facilities)d(are)j(not)g(as)g(general)f(as)h(they)f(could)g(b)s
-(e)g(since)330 5121 y(generalit)m(y)e(is)f(hard)f(to)j(reconcile)e
-(with)f(e\016ciency)-8 b(.)46 b Fj(BZ2_bzRead)29 b Fl(reads)i(from)g
-(the)h(compressed)330 5230 y(\014le)39 b(in)g(blo)s(c)m(ks)g(of)h(size)
-g Fj(BZ_MAX_UNUSED)c Fl(b)m(ytes,)44 b(and)39 b(in)g(doing)g(so)h
-(probably)e(will)f(o)m(v)m(ersho)s(ot)330 5340 y(the)i(logical)g(end)f
-(of)h(compressed)f(stream.)67 b(T)-8 b(o)40 b(reco)m(v)m(er)g(this)e
-(data)i(once)f(decompression)f(has)p eop
-%%Page: 25 26
-25 25 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(25)330 299 y(ended,)28
-b(call)g Fj(BZ2_bzReadGetUnused)23 b Fl(after)29 b(the)g(last)f(call)g
-(of)g Fj(BZ2_bzRead)e Fl(\(the)j(one)g(returning)330
-408 y Fj(BZ_STREAM_END)p Fl(\))e(but)j(b)s(efore)g(calling)f
-Fj(BZ2_bzReadClose)p Fl(.)150 596 y(This)51 b(mec)m(hanism)g(mak)m(es)j
-(it)e(easy)h(to)g(decompress)f(m)m(ultiple)e Fj(bzip2)i
-Fl(streams)g(placed)g(end-to-)150 706 y(end.)90 b(As)48
-b(the)f(end)f(of)i(one)f(stream,)52 b(when)46 b Fj(BZ2_bzRead)f
-Fl(returns)h Fj(BZ_STREAM_END)p Fl(,)i(call)e Fj(BZ2_)150
-816 y(bzReadGetUnused)36 b Fl(to)41 b(collect)g(the)g(un)m(used)e(data)
-i(\(cop)m(y)g(it)f(in)m(to)g(y)m(our)h(o)m(wn)f(bu\013er)f
-(somewhere\).)150 925 y(That)25 b(data)g(forms)f(the)h(start)h(of)e
-(the)h(next)g(compressed)g(stream.)39 b(T)-8 b(o)25 b(start)h
-(uncompressing)c(that)k(next)150 1035 y(stream,)40 b(call)d
-Fj(BZ2_bzReadOpen)d Fl(again,)40 b(feeding)d(in)g(the)h(un)m(used)e
-(data)j(via)e(the)h Fj(unused)p Fl(/)p Fj(nUnused)150
-1144 y Fl(parameters.)54 b(Keep)34 b(doing)g(this)f(un)m(til)g
-Fj(BZ_STREAM_END)e Fl(return)j(coincides)f(with)h(the)g(ph)m(ysical)g
-(end)150 1254 y(of)d(\014le)e(\()p Fj(feof\(f\))p Fl(\).)39
-b(In)30 b(this)f(situation)h Fj(BZ2_bzReadGetUnused)25
-b Fl(will)i(of)k(course)g(return)e(no)h(data.)150 1411
-y(This)c(should)f(giv)m(e)j(some)g(feel)f(for)g(ho)m(w)h(the)g
-(high-lev)m(el)e(in)m(terface)i(can)f(b)s(e)g(used.)39
-b(If)27 b(y)m(ou)h(require)e(extra)150 1520 y(\015exibilit)m(y)-8
-b(,)28 b(y)m(ou'll)i(ha)m(v)m(e)h(to)g(bite)f(the)h(bullet)d(and)i(get)
-i(to)f(grips)e(with)g(the)h(lo)m(w-lev)m(el)h(in)m(terface.)150
-1779 y Ff(3.4.9)63 b(Standard)40 b(\014le-reading/writing)j(co)s(de)150
-1972 y Fl(Here's)31 b(ho)m(w)f(y)m(ou'd)h(write)e(data)j(to)f(a)f
-(compressed)g(\014le:)390 2330 y Fj(FILE*)142 b(f;)390
-2434 y(BZFILE*)46 b(b;)390 2538 y(int)238 b(nBuf;)390
-2642 y(char)190 b(buf[)46 b(/*)i(whatever)d(size)i(you)g(like)f(*/)i
-(];)390 2746 y(int)238 b(bzerror;)390 2849 y(int)g(nWritten;)390
-3057 y(f)47 b(=)h(fopen)e(\()i("myfile.bz2",)c("w")j(\);)390
-3161 y(if)g(\(!f\))g({)533 3264 y(/*)g(handle)f(error)h(*/)390
-3368 y(})390 3472 y(b)g(=)h(BZ2_bzWriteOpen)c(\()j(&bzerror,)e(f,)i(9)h
-(\);)390 3576 y(if)f(\(bzerror)f(!=)h(BZ_OK\))f({)533
-3680 y(BZ2_bzWriteClose)e(\()j(b)g(\);)533 3783 y(/*)g(handle)f(error)h
-(*/)390 3887 y(})390 4095 y(while)f(\()i(/*)f(condition)e(*/)i(\))h({)
-533 4198 y(/*)f(get)g(data)g(to)g(write)f(into)h(buf,)g(and)g(set)g
-(nBuf)f(appropriately)e(*/)533 4302 y(nWritten)i(=)h(BZ2_bzWrite)e(\()i
-(&bzerror,)f(b,)h(buf,)f(nBuf)h(\);)533 4406 y(if)g(\(bzerror)f(==)h
-(BZ_IO_ERROR\))e({)676 4510 y(BZ2_bzWriteClose)f(\()j(&bzerror,)e(b)j
-(\);)676 4614 y(/*)g(handle)e(error)g(*/)533 4717 y(})390
-4821 y(})390 5029 y(BZ2_bzWriteClose)d(\()48 b(&bzerror,)d(b)j(\);)390
-5132 y(if)f(\(bzerror)f(==)h(BZ_IO_ERROR\))d({)533 5236
-y(/*)j(handle)f(error)h(*/)390 5340 y(})p eop
-%%Page: 26 27
-26 26 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(26)150 299 y(And)29 b(to)j(read)e(from)g
-(a)h(compressed)f(\014le:)390 450 y Fj(FILE*)142 b(f;)390
-554 y(BZFILE*)46 b(b;)390 657 y(int)238 b(nBuf;)390 761
-y(char)190 b(buf[)46 b(/*)i(whatever)d(size)i(you)g(like)f(*/)i(];)390
-865 y(int)238 b(bzerror;)390 969 y(int)g(nWritten;)390
-1176 y(f)47 b(=)h(fopen)e(\()i("myfile.bz2",)c("r")j(\);)390
-1280 y(if)g(\(!f\))g({)533 1384 y(/*)g(handle)f(error)h(*/)390
-1488 y(})390 1591 y(b)g(=)h(BZ2_bzReadOpen)c(\()j(&bzerror,)f(f,)h(0,)g
-(NULL,)f(0)i(\);)390 1695 y(if)f(\(bzerror)f(!=)h(BZ_OK\))f({)533
-1799 y(BZ2_bzReadClose)e(\()j(&bzerror,)f(b)h(\);)533
-1903 y(/*)g(handle)f(error)h(*/)390 2007 y(})390 2214
-y(bzerror)f(=)h(BZ_OK;)390 2318 y(while)f(\(bzerror)g(==)h(BZ_OK)f(&&)i
-(/*)f(arbitrary)e(other)h(conditions)f(*/\))i({)533 2422
-y(nBuf)g(=)g(BZ2_bzRead)e(\()j(&bzerror,)d(b,)i(buf,)g(/*)g(size)g(of)g
-(buf)g(*/)g(\);)533 2525 y(if)g(\(bzerror)f(==)h(BZ_OK\))f({)676
-2629 y(/*)i(do)f(something)e(with)i(buf[0)f(..)h(nBuf-1])f(*/)533
-2733 y(})390 2837 y(})390 2941 y(if)h(\(bzerror)f(!=)h(BZ_STREAM_END\))
-d({)533 3044 y(BZ2_bzReadClose)g(\()j(&bzerror,)f(b)h(\);)533
-3148 y(/*)g(handle)f(error)h(*/)390 3252 y(})g(else)g({)533
-3356 y(BZ2_bzReadClose)d(\()j(&bzerror)f(\);)390 3459
-y(})150 3753 y Fk(3.5)68 b(Utilit)l(y)47 b(functions)150
-4045 y Ff(3.5.1)63 b Fe(BZ2_bzBuffToBuffCompress)533
-4232 y Fj(int)47 b(BZ2_bzBuffToBuffCompress\()41 b(char*)428
-b(dest,)1965 4335 y(unsigned)46 b(int*)g(destLen,)1965
-4439 y(char*)428 b(source,)1965 4543 y(unsigned)46 b(int)94
-b(sourceLen,)1965 4647 y(int)524 b(blockSize100k,)1965
-4751 y(int)g(verbosity,)1965 4854 y(int)g(workFactor)45
-b(\);)150 5011 y Fl(A)m(ttempts)33 b(to)g(compress)f(the)g(data)h(in)e
-Fj(source[0)d(..)i(sourceLen-1])e Fl(in)m(to)k(the)h(destination)e
-(bu\013er,)150 5121 y Fj(dest[0)e(..)g(*destLen-1])p
-Fl(.)37 b(If)26 b(the)g(destination)g(bu\013er)f(is)h(big)f(enough,)j
-Fj(*destLen)c Fl(is)h(set)i(to)g(the)g(size)150 5230
-y(of)i(the)f(compressed)h(data,)g(and)f Fj(BZ_OK)f Fl(is)h(returned.)39
-b(If)28 b(the)h(compressed)f(data)h(w)m(on't)g(\014t,)g
-Fj(*destLen)150 5340 y Fl(is)g(unc)m(hanged,)i(and)e
-Fj(BZ_OUTBUFF_FULL)e Fl(is)i(returned.)p eop
-%%Page: 27 28
-27 27 bop 150 -116 a Fl(Chapter)30 b(3:)h(Programming)e(with)g
-Fj(libbzip2)1891 b Fl(27)150 299 y(Compression)22 b(in)g(this)h(manner)
-g(is)g(a)h(one-shot)g(ev)m(en)m(t,)j(done)c(with)g(a)h(single)e(call)h
-(to)i(this)d(function.)37 b(The)150 408 y(resulting)25
-b(compressed)i(data)i(is)d(a)i(complete)f Fj(bzip2)f
-Fl(format)i(data)g(stream.)40 b(There)27 b(is)f(no)i(mec)m(hanism)150
-518 y(for)23 b(making)g(additional)e(calls)i(to)h(pro)m(vide)f(extra)h
-(input)e(data.)39 b(If)23 b(y)m(ou)h(w)m(an)m(t)g(that)g(kind)e(of)h
-(mec)m(hanism,)150 628 y(use)30 b(the)h(lo)m(w-lev)m(el)f(in)m
-(terface.)150 784 y(F)-8 b(or)31 b(the)g(meaning)e(of)i(parameters)g
-Fj(blockSize100k)p Fl(,)c Fj(verbosity)g Fl(and)j Fj(workFactor)p
-Fl(,)150 894 y(see)h Fj(BZ2_bzCompressInit)p Fl(.)150
-1051 y(T)-8 b(o)27 b(guaran)m(tee)h(that)e(the)h(compressed)f(data)h
-(will)d(\014t)i(in)f(its)g(bu\013er,)i(allo)s(cate)f(an)g(output)g
-(bu\013er)g(of)g(size)150 1160 y(1\045)31 b(larger)f(than)g(the)g
-(uncompressed)f(data,)j(plus)c(six)h(h)m(undred)g(extra)i(b)m(ytes.)150
-1317 y Fj(BZ2_bzBuffToBuffDecompre)o(ss)25 b Fl(will)k(not)j(write)e
-(data)j(at)f(or)f(b)s(ey)m(ond)g Fj(dest[*destLen])p
-Fl(,)d(ev)m(en)k(in)150 1427 y(case)f(of)g(bu\013er)e(o)m(v)m(er\015o)m
-(w.)150 1584 y(P)m(ossible)g(return)h(v)-5 b(alues:)572
-1735 y Fj(BZ_CONFIG_ERROR)663 1839 y Fl(if)29 b(the)i(library)d(has)i
-(b)s(een)f(mis-compiled)572 1942 y Fj(BZ_PARAM_ERROR)663
-2046 y Fl(if)g Fj(dest)g Fl(is)h Fj(NULL)f Fl(or)h Fj(destLen)f
-Fl(is)g Fj(NULL)663 2150 y Fl(or)h Fj(blockSize100k)44
-b(<)k(1)30 b Fl(or)g Fj(blockSize100k)44 b(>)k(9)663
-2254 y Fl(or)30 b Fj(verbosity)45 b(<)j(0)30 b Fl(or)g
-Fj(verbosity)45 b(>)j(4)663 2357 y Fl(or)30 b Fj(workFactor)45
-b(<)j(0)30 b Fl(or)g Fj(workFactor)45 b(>)i(250)572 2461
-y(BZ_MEM_ERROR)663 2565 y Fl(if)29 b(insu\016cien)m(t)g(memory)h(is)f
-(a)m(v)-5 b(ailable)572 2669 y Fj(BZ_OUTBUFF_FULL)663
-2773 y Fl(if)29 b(the)i(size)f(of)g(the)h(compressed)f(data)h(exceeds)g
-Fj(*destLen)572 2876 y(BZ_OK)663 2980 y Fl(otherwise)150
-3349 y Ff(3.5.2)63 b Fe(BZ2_bzBuffToBuffDecompress)533
-3536 y Fj(int)47 b(BZ2_bzBuffToBuffDecompres)o(s)42 b(\()47
-b(char*)428 b(dest,)2108 3640 y(unsigned)46 b(int*)g(destLen,)2108
-3744 y(char*)428 b(source,)2108 3848 y(unsigned)46 b(int)94
-b(sourceLen,)2108 3951 y(int)524 b(small,)2108 4055 y(int)g(verbosity)
-46 b(\);)150 4212 y Fl(A)m(ttempts)24 b(to)g(decompress)f(the)g(data)g
-(in)f Fj(source[0)28 b(..)i(sourceLen-1])20 b Fl(in)m(to)j(the)g
-(destination)f(bu\013er,)150 4322 y Fj(dest[0)29 b(..)g(*destLen-1])p
-Fl(.)37 b(If)26 b(the)g(destination)g(bu\013er)f(is)h(big)f(enough,)j
-Fj(*destLen)c Fl(is)h(set)i(to)g(the)g(size)150 4431
-y(of)21 b(the)g(uncompressed)e(data,)24 b(and)c Fj(BZ_OK)f
-Fl(is)h(returned.)36 b(If)20 b(the)h(compressed)g(data)g(w)m(on't)h
-(\014t,)g Fj(*destLen)150 4541 y Fl(is)29 b(unc)m(hanged,)i(and)e
-Fj(BZ_OUTBUFF_FULL)e Fl(is)i(returned.)150 4698 y Fj(source)g
-Fl(is)g(assumed)h(to)h(hold)e(a)i(complete)f Fj(bzip2)f
-Fl(format)i(data)g(stream.)150 4807 y Fj(BZ2_bzBuffToBuffDecompre)o(ss)
-22 b Fl(tries)28 b(to)i(decompress)e(the)h(en)m(tiret)m(y)g(of)g(the)f
-(stream)h(in)m(to)g(the)f(out-)150 4917 y(put)i(bu\013er.)150
-5074 y(F)-8 b(or)31 b(the)g(meaning)e(of)i(parameters)g
-Fj(small)e Fl(and)g Fj(verbosity)p Fl(,)f(see)j Fj
-(BZ2_bzDecompressInit)p Fl(.)150 5230 y(Because)j(the)f(compression)e
-(ratio)i(of)g(the)g(compressed)f(data)h(cannot)g(b)s(e)f(kno)m(wn)g(in)
-g(adv)-5 b(ance,)34 b(there)150 5340 y(is)d(no)h(easy)g(w)m(a)m(y)h(to)
-f(guaran)m(tee)i(that)e(the)g(output)f(bu\013er)g(will)e(b)s(e)i(big)g
-(enough.)45 b(Y)-8 b(ou)32 b(ma)m(y)h(of)f(course)p eop
-%%Page: 28 29
-28 28 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(28)150 299 y(mak)m(e)36
-b(arrangemen)m(ts)f(in)e(y)m(our)i(co)s(de)g(to)g(record)g(the)g(size)f
-(of)h(the)g(uncompressed)f(data,)i(but)e(suc)m(h)h(a)150
-408 y(mec)m(hanism)30 b(is)f(b)s(ey)m(ond)h(the)g(scop)s(e)h(of)f(this)
-g(library)-8 b(.)150 565 y Fj(BZ2_bzBuffToBuffDecompre)o(ss)25
-b Fl(will)k(not)j(write)e(data)j(at)f(or)f(b)s(ey)m(ond)g
-Fj(dest[*destLen])p Fl(,)d(ev)m(en)k(in)150 675 y(case)f(of)g(bu\013er)
-e(o)m(v)m(er\015o)m(w.)150 832 y(P)m(ossible)g(return)h(v)-5
-b(alues:)572 983 y Fj(BZ_CONFIG_ERROR)663 1087 y Fl(if)29
-b(the)i(library)d(has)i(b)s(een)f(mis-compiled)572 1190
-y Fj(BZ_PARAM_ERROR)663 1294 y Fl(if)g Fj(dest)g Fl(is)h
-Fj(NULL)f Fl(or)h Fj(destLen)f Fl(is)g Fj(NULL)663 1398
-y Fl(or)h Fj(small)46 b(!=)i(0)f(&&)g(small)g(!=)g(1)663
-1502 y Fl(or)30 b Fj(verbosity)45 b(<)j(0)30 b Fl(or)g
-Fj(verbosity)45 b(>)j(4)572 1605 y(BZ_MEM_ERROR)663 1709
-y Fl(if)29 b(insu\016cien)m(t)g(memory)h(is)f(a)m(v)-5
-b(ailable)572 1813 y Fj(BZ_OUTBUFF_FULL)663 1917 y Fl(if)29
-b(the)i(size)f(of)g(the)h(compressed)f(data)h(exceeds)g
-Fj(*destLen)572 2021 y(BZ_DATA_ERROR)663 2124 y Fl(if)e(a)i(data)g(in)m
-(tegrit)m(y)f(error)g(w)m(as)h(detected)h(in)d(the)h(compressed)g(data)
-572 2228 y Fj(BZ_DATA_ERROR_MAGIC)663 2332 y Fl(if)f(the)i(compressed)f
-(data)h(do)s(esn't)f(b)s(egin)f(with)g(the)i(righ)m(t)e(magic)i(b)m
-(ytes)572 2436 y Fj(BZ_UNEXPECTED_EOF)663 2539 y Fl(if)e(the)i
-(compressed)f(data)h(ends)e(unexp)s(ectedly)572 2643
-y Fj(BZ_OK)663 2747 y Fl(otherwise)150 3116 y Fk(3.6)68
-b Fd(zlib)43 b Fk(compatibilit)l(y)k(functions)150 3308
-y Fl(Y)-8 b(oshiok)j(a)33 b(Tsuneo)e(has)h(con)m(tributed)g(some)g
-(functions)f(to)i(giv)m(e)g(b)s(etter)f Fj(zlib)f Fl(compatibilit)m(y)
--8 b(.)45 b(These)150 3418 y(functions)36 b(are)i Fj(BZ2_bzopen)p
-Fl(,)e Fj(BZ2_bzread)p Fl(,)h Fj(BZ2_bzwrite)p Fl(,)f
-Fj(BZ2_bzflush)p Fl(,)h Fj(BZ2_bzclose)p Fl(,)f Fj(BZ2_)150
-3527 y(bzerror)23 b Fl(and)h Fj(BZ2_bzlibVersion)p Fl(.)34
-b(These)25 b(functions)e(are)j(not)f(\(y)m(et\))h(o\016cially)e(part)h
-(of)g(the)g(library)-8 b(.)150 3637 y(If)30 b(they)g(break,)h(y)m(ou)g
-(get)g(to)g(k)m(eep)g(all)f(the)g(pieces.)41 b(Nev)m(ertheless,)31
-b(I)f(think)f(they)i(w)m(ork)f(ok.)390 3788 y Fj(typedef)46
-b(void)g(BZFILE;)390 3995 y(const)g(char)h(*)g(BZ2_bzlibVersion)d(\()j
-(void)g(\);)150 4152 y Fl(Returns)29 b(a)i(string)f(indicating)e(the)i
-(library)e(v)m(ersion.)390 4303 y Fj(BZFILE)46 b(*)i(BZ2_bzopen)92
-b(\()48 b(const)e(char)h(*path,)f(const)g(char)h(*mode)f(\);)390
-4407 y(BZFILE)g(*)i(BZ2_bzdopen)c(\()k(int)381 b(fd,)190
-b(const)46 b(char)h(*mode)f(\);)150 4564 y Fl(Op)s(ens)19
-b(a)j Fj(.bz2)e Fl(\014le)g(for)g(reading)g(or)h(writing,)g(using)f
-(either)g(its)h(name)g(or)g(a)g(pre-existing)f(\014le)g(descriptor.)150
-4674 y(Analogous)30 b(to)i Fj(fopen)c Fl(and)i Fj(fdopen)p
-Fl(.)390 4825 y Fj(int)47 b(BZ2_bzread)93 b(\()47 b(BZFILE*)f(b,)h
-(void*)f(buf,)h(int)g(len)g(\);)390 4928 y(int)g(BZ2_bzwrite)e(\()i
-(BZFILE*)f(b,)h(void*)f(buf,)h(int)g(len)g(\);)150 5085
-y Fl(Reads/writes)30 b(data)h(from/to)g(a)g(previously)d(op)s(ened)i
-Fj(BZFILE)p Fl(.)39 b(Analogous)30 b(to)h Fj(fread)e
-Fl(and)h Fj(fwrite)p Fl(.)390 5236 y Fj(int)95 b(BZ2_bzflush)44
-b(\()k(BZFILE*)e(b)h(\);)390 5340 y(void)g(BZ2_bzclose)d(\()k(BZFILE*)e
-(b)h(\);)p eop
-%%Page: 29 30
-29 29 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(29)150 299 y(Flushes/closes)27
-b(a)h Fj(BZFILE)p Fl(.)39 b Fj(BZ2_bzflush)24 b Fl(do)s(esn't)k
-(actually)f(do)h(an)m(ything.)39 b(Analogous)28 b(to)h
-Fj(fflush)150 408 y Fl(and)h Fj(fclose)p Fl(.)390 559
-y Fj(const)46 b(char)h(*)g(BZ2_bzerror)e(\()j(BZFILE)e(*b,)h(int)g
-(*errnum)e(\))150 716 y Fl(Returns)31 b(a)i(string)e(describing)f(the)i
-(more)g(recen)m(t)h(error)f(status)h(of)f Fj(b)p Fl(,)g(and)g(also)g
-(sets)h Fj(*errnum)d Fl(to)j(its)150 826 y(n)m(umerical)c(v)-5
-b(alue.)150 1242 y Fk(3.7)68 b(Using)46 b(the)f(library)g(in)g(a)g
-Fd(stdio)p Fk(-free)f(en)l(vironmen)l(t)150 1615 y Ff(3.7.1)63
-b(Getting)40 b(rid)h(of)g Fe(stdio)150 1807 y Fl(In)i(a)g(deeply)g(em)m
-(b)s(edded)f(application,)j(y)m(ou)f(migh)m(t)f(w)m(an)m(t)h(to)g(use)f
-(just)g(the)h(memory-to-memory)150 1917 y(functions.)39
-b(Y)-8 b(ou)30 b(can)f(do)g(this)g(con)m(v)m(enien)m(tly)g(b)m(y)g
-(compiling)e(the)j(library)d(with)h(prepro)s(cessor)g(sym)m(b)s(ol)150
-2026 y Fj(BZ_NO_STDIO)35 b Fl(de\014ned.)63 b(Doing)39
-b(this)e(giv)m(es)h(y)m(ou)h(a)f(library)e(con)m(taining)i(only)f(the)i
-(follo)m(wing)e(eigh)m(t)150 2136 y(functions:)150 2293
-y Fj(BZ2_bzCompressInit)p Fl(,)26 b Fj(BZ2_bzCompress)p
-Fl(,)g Fj(BZ2_bzCompressEnd)150 2402 y(BZ2_bzDecompressInit)p
-Fl(,)f Fj(BZ2_bzDecompress)p Fl(,)h Fj(BZ2_bzDecompressEnd)150
-2512 y(BZ2_bzBuffToBuffCompress)o Fl(,)f Fj(BZ2_bzBuffToBuffDecompre)o
-(ss)150 2669 y Fl(When)30 b(compiled)f(lik)m(e)h(this,)f(all)g
-(functions)g(will)f(ignore)i Fj(verbosity)e Fl(settings.)150
-3006 y Ff(3.7.2)63 b(Critical)40 b(error)h(handling)150
-3199 y Fj(libbzip2)20 b Fl(con)m(tains)j(a)g(n)m(um)m(b)s(er)f(of)g(in)
-m(ternal)g(assertion)g(c)m(hec)m(ks)i(whic)m(h)d(should,)i(needless)f
-(to)h(sa)m(y)-8 b(,)26 b(nev)m(er)150 3308 y(b)s(e)g(activ)-5
-b(ated.)40 b(Nev)m(ertheless,)28 b(if)d(an)i(assertion)f(should)e
-(fail,)i(b)s(eha)m(viour)f(dep)s(ends)f(on)j(whether)e(or)i(not)150
-3418 y(the)k(library)d(w)m(as)i(compiled)f(with)g Fj(BZ_NO_STDIO)e
-Fl(set.)150 3575 y(F)-8 b(or)31 b(a)g(normal)e(compile,)h(an)g
-(assertion)g(failure)f(yields)f(the)j(message)533 3726
-y Fj(bzip2/libbzip2:)44 b(internal)h(error)i(number)f(N.)533
-3829 y(This)h(is)g(a)g(bug)g(in)h(bzip2/libbzip2,)43
-b(1.0)k(of)g(21-Mar-2000.)533 3933 y(Please)f(report)g(it)i(to)f(me)g
-(at:)g(jseward@acm.org.)91 b(If)47 b(this)g(happened)533
-4037 y(when)g(you)g(were)f(using)h(some)f(program)g(which)h(uses)f
-(libbzip2)g(as)h(a)533 4141 y(component,)e(you)i(should)f(also)h
-(report)f(this)h(bug)f(to)i(the)f(author\(s\))533 4244
-y(of)g(that)g(program.)93 b(Please)46 b(make)h(an)g(effort)f(to)h
-(report)g(this)f(bug;)533 4348 y(timely)g(and)h(accurate)f(bug)h
-(reports)e(eventually)g(lead)i(to)g(higher)533 4452 y(quality)f
-(software.)93 b(Thanks.)h(Julian)46 b(Seward,)f(21)j(March)e(2000.)150
-4609 y Fl(where)30 b Fj(N)g Fl(is)f(some)i(error)f(co)s(de)h(n)m(um)m
-(b)s(er.)39 b Fj(exit\(3\))28 b Fl(is)i(then)g(called.)150
-4766 y(F)-8 b(or)31 b(a)g Fj(stdio)p Fl(-free)e(library)-8
-b(,)29 b(assertion)h(failures)e(result)i(in)f(a)i(call)e(to)i(a)g
-(function)e(declared)h(as:)533 4917 y Fj(extern)46 b(void)h
-(bz_internal_error)c(\()k(int)g(errcode)f(\);)150 5074
-y Fl(The)30 b(relev)-5 b(an)m(t)31 b(co)s(de)f(is)g(passed)f(as)i(a)g
-(parameter.)41 b(Y)-8 b(ou)31 b(should)d(supply)g(suc)m(h)i(a)h
-(function.)150 5230 y(In)g(either)g(case,)j(once)e(an)g(assertion)g
-(failure)e(has)h(o)s(ccurred,)h(an)m(y)g Fj(bz_stream)e
-Fl(records)h(in)m(v)m(olv)m(ed)h(can)150 5340 y(b)s(e)e(regarded)g(as)h
-(in)m(v)-5 b(alid.)38 b(Y)-8 b(ou)31 b(should)d(not)j(attempt)g(to)g
-(resume)f(normal)g(op)s(eration)f(with)g(them.)p eop
-%%Page: 30 31
-30 30 bop 150 -116 a Fl(Chapter)30 b(3:)41 b(Programming)29
-b(with)g Fj(libbzip2)1881 b Fl(30)150 299 y(Y)-8 b(ou)22
-b(ma)m(y)-8 b(,)25 b(of)d(course,)h(c)m(hange)g(critical)e(error)g
-(handling)e(to)j(suit)f(y)m(our)g(needs.)38 b(As)21 b(I)h(said)e(ab)s
-(o)m(v)m(e,)25 b(critical)150 408 y(errors)30 b(indicate)g(bugs)g(in)g
-(the)h(library)d(and)i(should)f(not)i(o)s(ccur.)42 b(All)29
-b Fj(")p Fl(normal)p Fj(")h Fl(error)g(situations)g(are)150
-518 y(indicated)f(via)h(error)g(return)f(co)s(des)i(from)f(functions,)f
-(and)g(can)i(b)s(e)f(reco)m(v)m(ered)i(from.)150 798
-y Fk(3.8)68 b(Making)45 b(a)g(Windo)l(ws)h(DLL)150 990
-y Fl(Ev)m(erything)30 b(related)g(to)h(Windo)m(ws)f(has)g(b)s(een)f
-(con)m(tributed)h(b)m(y)g(Y)-8 b(oshiok)j(a)31 b(Tsuneo)150
-1100 y(\()p Fj(QWF00133@niftyserve.or.jp)46 b Fl(/)52
-b Fj(tsuneo-y@is.aist-nara.ac.j)o(p)p Fl(\),)g(so)h(y)m(ou)f(should)f
-(send)150 1210 y(y)m(our)30 b(queries)g(to)h(him)e(\(but)h(p)s(erhaps)e
-(Cc:)41 b(me,)31 b Fj(jseward@acm.org)p Fl(\).)150 1366
-y(My)43 b(v)-5 b(ague)44 b(understanding)d(of)i(what)g(to)h(do)f(is:)65
-b(using)41 b(Visual)h(C)p Fj(++)g Fl(5.0,)48 b(op)s(en)42
-b(the)h(pro)5 b(ject)44 b(\014le)150 1476 y Fj(libbz2.dsp)p
-Fl(,)28 b(and)i(build.)37 b(That's)31 b(all.)150 1633
-y(If)41 b(y)m(ou)g(can't)h(op)s(en)e(the)h(pro)5 b(ject)42
-b(\014le)e(for)h(some)g(reason,)j(mak)m(e)e(a)g(new)e(one,)k(naming)c
-(these)i(\014les:)150 1742 y Fj(blocksort.c)p Fl(,)28
-b Fj(bzlib.c)p Fl(,)g Fj(compress.c)p Fl(,)g Fj(crctable.c)p
-Fl(,)g Fj(decompress.c)p Fl(,)f Fj(huffman.c)p Fl(,)150
-1852 y Fj(randtable.c)32 b Fl(and)j Fj(libbz2.def)p Fl(.)53
-b(Y)-8 b(ou)36 b(will)d(also)i(need)g(to)h(name)g(the)g(header)f
-(\014les)f Fj(bzlib.h)g Fl(and)150 1962 y Fj(bzlib_private.h)p
-Fl(.)150 2118 y(If)c(y)m(ou)h(don't)f(use)g(V)m(C)p Fj(++)p
-Fl(,)g(y)m(ou)h(ma)m(y)g(need)f(to)h(de\014ne)f(the)h(propro)s(cessor)e
-(sym)m(b)s(ol)g Fj(_WIN32)p Fl(.)150 2275 y(Finally)-8
-b(,)28 b Fj(dlltest.c)e Fl(is)h(a)i(sample)f(program)g(using)g(the)g
-(DLL.)h(It)g(has)f(a)h(pro)5 b(ject)29 b(\014le,)g Fj(dlltest.dsp)p
-Fl(.)150 2432 y(If)h(y)m(ou)h(just)e(w)m(an)m(t)j(a)e(mak)m(e\014le)h
-(for)f(Visual)f(C,)h(ha)m(v)m(e)i(a)e(lo)s(ok)g(at)i
-Fj(makefile.msc)p Fl(.)150 2589 y(Be)k(a)m(w)m(are)g(that)g(if)e(y)m
-(ou)h(compile)f Fj(bzip2)g Fl(itself)g(on)h(Win32,)h(y)m(ou)g(m)m(ust)f
-(set)g Fj(BZ_UNIX)e Fl(to)j(0)f(and)g Fj(BZ_)150 2698
-y(LCCWIN32)27 b Fl(to)j(1,)g(in)f(the)g(\014le)g Fj(bzip2.c)p
-Fl(,)e(b)s(efore)i(compiling.)39 b(Otherwise)28 b(the)h(resulting)f
-(binary)f(w)m(on't)150 2808 y(w)m(ork)j(correctly)-8
-b(.)150 2965 y(I)30 b(ha)m(v)m(en't)i(tried)d(an)m(y)i(of)g(this)e
-(stu\013)h(m)m(yself,)g(but)g(it)f(all)h(lo)s(oks)g(plausible.)p
-eop
-%%Page: 31 32
-31 31 bop 150 -116 a Fl(Chapter)30 b(4:)41 b(Miscellanea)2586
-b(31)150 299 y Fh(4)80 b(Miscellanea)150 583 y Fl(These)30
-b(are)h(just)f(some)g(random)g(though)m(ts)h(of)f(mine.)40
-b(Y)-8 b(our)30 b(mileage)h(ma)m(y)g(v)-5 b(ary)d(.)150
-884 y Fk(4.1)68 b(Limitations)47 b(of)e(the)g(compressed)g(\014le)h
-(format)150 1077 y Fj(bzip2-1.0)p Fl(,)e Fj(0.9.5)e Fl(and)g
-Fj(0.9.0)g Fl(use)h(exactly)h(the)f(same)h(\014le)e(format)i(as)f(the)h
-(previous)d(v)m(ersion,)150 1186 y Fj(bzip2-0.1)p Fl(.)75
-b(This)41 b(decision)g(w)m(as)i(made)g(in)e(the)i(in)m(terests)g(of)g
-(stabilit)m(y)-8 b(.)77 b(Creating)42 b(y)m(et)i(another)150
-1296 y(incompatible)21 b(compressed)i(\014le)f(format)i(w)m(ould)e
-(create)i(further)e(confusion)g(and)h(disruption)d(for)j(users.)150
-1453 y(Nev)m(ertheless,)31 b(this)e(is)g(not)h(a)g(painless)e
-(decision.)39 b(Dev)m(elopmen)m(t)31 b(w)m(ork)f(since)f(the)h(release)
-h(of)f Fj(bzip2-)150 1562 y(0.1)19 b Fl(in)g(August)i(1997)h(has)e(sho)
-m(wn)f(complexities)h(in)f(the)h(\014le)g(format)g(whic)m(h)f(slo)m(w)h
-(do)m(wn)g(decompression)150 1672 y(and,)30 b(in)f(retrosp)s(ect,)i
-(are)g(unnecessary)-8 b(.)40 b(These)31 b(are:)225 1829
-y Fi(\017)60 b Fl(The)20 b(run-length)g(enco)s(der,)i(whic)m(h)e(is)g
-(the)h(\014rst)f(of)h(the)g(compression)f(transformations,)i(is)e(en)m
-(tirely)330 1938 y(irrelev)-5 b(an)m(t.)63 b(The)38 b(original)e(purp)s
-(ose)g(w)m(as)j(to)g(protect)g(the)f(sorting)g(algorithm)f(from)g(the)i
-(v)m(ery)330 2048 y(w)m(orst)h(case)h(input:)58 b(a)41
-b(string)e(of)h(rep)s(eated)g(sym)m(b)s(ols.)68 b(But)40
-b(algorithm)f(steps)h(Q6a)h(and)e(Q6b)330 2157 y(in)30
-b(the)i(original)e(Burro)m(ws-Wheeler)i(tec)m(hnical)g(rep)s(ort)f
-(\(SR)m(C-124\))i(sho)m(w)f(ho)m(w)g(rep)s(eats)g(can)g(b)s(e)330
-2267 y(handled)c(without)i(di\016cult)m(y)f(in)g(blo)s(c)m(k)h
-(sorting.)225 2409 y Fi(\017)60 b Fl(The)30 b(randomisation)e(mec)m
-(hanism)i(do)s(esn't)g(really)f(need)h(to)g(b)s(e)g(there.)41
-b(Udi)29 b(Man)m(b)s(er)h(and)f(Gene)330 2518 y(My)m(ers)j(published)c
-(a)33 b(su\016x)e(arra)m(y)h(construction)f(algorithm)g(a)h(few)g(y)m
-(ears)h(bac)m(k,)g(whic)m(h)d(can)j(b)s(e)330 2628 y(emplo)m(y)m(ed)27
-b(to)h(sort)g(an)m(y)f(blo)s(c)m(k,)h(no)f(matter)h(ho)m(w)f(rep)s
-(etitiv)m(e,)h(in)d(O\(N)j(log)f(N\))h(time.)39 b(Subsequen)m(t)330
-2737 y(w)m(ork)25 b(b)m(y)f(Kunihik)m(o)f(Sadak)-5 b(ane)24
-b(has)h(pro)s(duced)e(a)i(deriv)-5 b(ativ)m(e)24 b(O\(N)h(\(log)g(N\))p
-Fj(^)p Fl(2\))h(algorithm)d(whic)m(h)330 2847 y(usually)28
-b(outp)s(erforms)h(the)i(Man)m(b)s(er-My)m(ers)g(algorithm.)330
-2988 y(I)g(could)g(ha)m(v)m(e)i(c)m(hanged)f(to)g(Sadak)-5
-b(ane's)32 b(algorithm,)f(but)g(I)g(\014nd)f(it)h(to)h(b)s(e)f(slo)m(w)
-m(er)h(than)f Fj(bzip2)p Fl('s)330 3098 y(existing)38
-b(algorithm)g(for)h(most)h(inputs,)f(and)g(the)g(randomisation)f(mec)m
-(hanism)g(protects)i(ade-)330 3208 y(quately)34 b(against)f(bad)g
-(cases.)52 b(I)33 b(didn't)f(think)g(it)i(w)m(as)g(a)g(go)s(o)s(d)f
-(tradeo\013)i(to)f(mak)m(e.)51 b(P)m(artly)34 b(this)330
-3317 y(is)39 b(due)h(to)h(the)f(fact)h(that)g(I)f(w)m(as)g(not)h(\015o)
-s(o)s(ded)e(with)g(email)g(complain)m(ts)g(ab)s(out)h
-Fj(bzip2-0.1)p Fl('s)330 3427 y(p)s(erformance)30 b(on)g(rep)s(etitiv)m
-(e)g(data,)h(so)g(p)s(erhaps)d(it)i(isn't)g(a)h(problem)d(for)j(real)f
-(inputs.)330 3568 y(Probably)i(the)h(b)s(est)g(long-term)g(solution,)g
-(and)g(the)g(one)h(I)f(ha)m(v)m(e)h(incorp)s(orated)e(in)m(to)i(0.9.5)h
-(and)330 3678 y(ab)s(o)m(v)m(e,)42 b(is)c(to)h(use)f(the)h(existing)f
-(sorting)g(algorithm)f(initially)-8 b(,)38 b(and)g(fall)f(bac)m(k)i(to)
-h(a)f(O\(N)f(\(log)330 3787 y(N\))p Fj(^)p Fl(2\))31
-b(algorithm)f(if)f(the)i(standard)e(algorithm)h(gets)h(in)m(to)f
-(di\016culties.)225 3929 y Fi(\017)60 b Fl(The)31 b(compressed)f
-(\014le)g(format)i(w)m(as)f(nev)m(er)h(designed)d(to)j(b)s(e)f(handled)
-e(b)m(y)i(a)g(library)-8 b(,)29 b(and)i(I)g(ha)m(v)m(e)330
-4039 y(had)d(to)i(jump)e(though)g(some)i(ho)s(ops)e(to)i(pro)s(duce)e
-(an)h(e\016cien)m(t)g(implemen)m(tation)f(of)h(decompres-)330
-4148 y(sion.)38 b(It's)26 b(a)h(bit)e(hairy)-8 b(.)38
-b(T)-8 b(ry)26 b(passing)f Fj(decompress.c)d Fl(through)k(the)g(C)f
-(prepro)s(cessor)g(and)h(y)m(ou'll)330 4258 y(see)32
-b(what)g(I)f(mean.)45 b(Muc)m(h)32 b(of)g(this)e(complexit)m(y)i(could)
-f(ha)m(v)m(e)i(b)s(een)e(a)m(v)m(oided)h(if)e(the)i(compressed)330
-4367 y(size)e(of)h(eac)m(h)g(blo)s(c)m(k)f(of)h(data)g(w)m(as)g
-(recorded)f(in)f(the)h(data)h(stream.)225 4509 y Fi(\017)60
-b Fl(An)30 b(Adler-32)g(c)m(hec)m(ksum,)i(rather)e(than)g(a)h(CR)m(C32)
-g(c)m(hec)m(ksum,)g(w)m(ould)e(b)s(e)h(faster)h(to)g(compute.)150
-4698 y(It)e(w)m(ould)f(b)s(e)g(fair)g(to)h(sa)m(y)h(that)g(the)f
-Fj(bzip2)e Fl(format)i(w)m(as)h(frozen)f(b)s(efore)f(I)h(prop)s(erly)d
-(and)j(fully)d(under-)150 4807 y(sto)s(o)s(d)k(the)h(p)s(erformance)e
-(consequences)i(of)g(doing)e(so.)150 4964 y(Impro)m(v)m(emen)m(ts)d
-(whic)m(h)e(I)i(w)m(as)g(able)f(to)h(incorp)s(orate)f(in)m(to)g(0.9.0,)
-k(despite)24 b(using)g(the)i(same)g(\014le)e(format,)150
-5074 y(are:)225 5230 y Fi(\017)60 b Fl(Single)30 b(arra)m(y)i(implemen)
-m(tation)e(of)h(the)h(in)m(v)m(erse)f(BWT.)h(This)e(signi\014can)m(tly)
-f(sp)s(eeds)i(up)f(decom-)330 5340 y(pression,)f(presumably)f(b)s
-(ecause)i(it)g(reduces)g(the)h(n)m(um)m(b)s(er)e(of)i(cac)m(he)h
-(misses.)p eop
-%%Page: 32 33
-32 32 bop 150 -116 a Fl(Chapter)30 b(4:)41 b(Miscellanea)2586
-b(32)225 299 y Fi(\017)60 b Fl(F)-8 b(aster)27 b(in)m(v)m(erse)e(MTF)h
-(transform)f(for)g(large)h(MTF)f(v)-5 b(alues.)39 b(The)25
-b(new)g(implemen)m(tation)f(is)g(based)330 408 y(on)30
-b(the)h(notion)f(of)g(sliding)e(blo)s(c)m(ks)h(of)i(v)-5
-b(alues.)225 544 y Fi(\017)60 b Fj(bzip2-0.9.0)24 b Fl(no)m(w)k(reads)f
-(and)f(writes)h(\014les)f(with)g Fj(fread)g Fl(and)h
-Fj(fwrite)p Fl(;)f(v)m(ersion)h(0.1)i(used)d Fj(putc)330
-653 y Fl(and)k Fj(getc)p Fl(.)39 b(Duh!)h(W)-8 b(ell,)31
-b(y)m(ou)f(liv)m(e)g(and)g(learn.)150 836 y(F)-8 b(urther)30
-b(ahead,)g(it)f(w)m(ould)g(b)s(e)g(nice)h(to)g(b)s(e)g(able)f(to)i(do)e
-(random)g(access)j(in)m(to)d(\014les.)40 b(This)28 b(will)f(require)150
-945 y(some)k(careful)e(design)h(of)g(compressed)g(\014le)g(formats.)150
-1227 y Fk(4.2)68 b(P)l(ortabilit)l(y)47 b(issues)150
-1419 y Fl(After)36 b(some)g(consideration,)g(I)f(ha)m(v)m(e)i(decided)d
-(not)i(to)g(use)g(GNU)g Fj(autoconf)d Fl(to)j(con\014gure)g(0.9.5)h(or)
-150 1529 y(1.0.)150 1686 y Fj(autoconf)p Fl(,)31 b(admirable)g(and)h(w)
-m(onderful)f(though)i(it)f(is,)h(mainly)d(assists)j(with)e(p)s
-(ortabilit)m(y)g(problems)150 1795 y(b)s(et)m(w)m(een)f(Unix-lik)m(e)d
-(platforms.)40 b(But)29 b Fj(bzip2)f Fl(do)s(esn't)h(ha)m(v)m(e)h(m)m
-(uc)m(h)f(in)f(the)h(w)m(a)m(y)h(of)g(p)s(ortabilit)m(y)d(prob-)150
-1905 y(lems)35 b(on)h(Unix;)j(most)d(of)g(the)h(di\016culties)d(app)s
-(ear)h(when)g(p)s(orting)g(to)i(the)f(Mac,)j(or)d(to)h(Microsoft's)150
-2015 y(op)s(erating)26 b(systems.)40 b Fj(autoconf)25
-b Fl(do)s(esn't)h(help)g(in)f(those)j(cases,)h(and)d(brings)f(in)g(a)j
-(whole)e(load)g(of)h(new)150 2124 y(complexit)m(y)-8
-b(.)150 2281 y(Most)28 b(p)s(eople)f(should)f(b)s(e)h(able)g(to)h
-(compile)e(the)i(library)d(and)i(program)h(under)e(Unix)g(straigh)m(t)i
-(out-of-)150 2391 y(the-b)s(o)m(x,)j(so)g(to)g(sp)s(eak,)f(esp)s
-(ecially)f(if)g(y)m(ou)i(ha)m(v)m(e)g(a)g(v)m(ersion)f(of)g(GNU)h(C)f
-(a)m(v)-5 b(ailable.)150 2547 y(There)32 b(are)h(a)g(couple)f(of)h
-Fj(__inline__)d Fl(directiv)m(es)i(in)f(the)i(co)s(de.)48
-b(GNU)33 b(C)f(\()p Fj(gcc)p Fl(\))g(should)f(b)s(e)h(able)g(to)150
-2657 y(handle)24 b(them.)39 b(If)25 b(y)m(ou're)i(not)e(using)g(GNU)h
-(C,)f(y)m(our)h(C)f(compiler)f(shouldn't)g(see)i(them)f(at)i(all.)38
-b(If)25 b(y)m(our)150 2767 y(compiler)k(do)s(es,)i(for)g(some)g
-(reason,)h(see)f(them)g(and)f(do)s(esn't)h(lik)m(e)f(them,)i(just)e
-Fj(#define)f(__inline__)150 2876 y Fl(to)37 b(b)s(e)f
-Fj(/*)30 b(*/)p Fl(.)58 b(One)36 b(easy)h(w)m(a)m(y)g(to)h(do)e(this)f
-(is)h(to)h(compile)e(with)g(the)i(\015ag)g Fj(-D__inline__=)p
-Fl(,)d(whic)m(h)150 2986 y(should)28 b(b)s(e)i(understo)s(o)s(d)f(b)m
-(y)h(most)h(Unix)e(compilers.)150 3143 y(If)35 b(y)m(ou)g(still)e(ha)m
-(v)m(e)j(di\016culties,)e(try)h(compiling)e(with)g(the)j(macro)f
-Fj(BZ_STRICT_ANSI)c Fl(de\014ned.)54 b(This)150 3252
-y(should)28 b(enable)i(y)m(ou)h(to)g(build)d(the)i(library)e(in)h(a)i
-(strictly)f(ANSI)g(complian)m(t)f(en)m(vironmen)m(t.)41
-b(Building)150 3362 y(the)25 b(program)f(itself)f(lik)m(e)g(this)h(is)f
-(dangerous)h(and)g(not)g(supp)s(orted,)g(since)g(y)m(ou)h(remo)m(v)m(e)
-g Fj(bzip2)p Fl('s)e(c)m(hec)m(ks)150 3471 y(against)30
-b(compressing)f(directories,)g(sym)m(b)s(olic)g(links,)f(devices,)i
-(and)f(other)h(not-really-a-\014le)g(en)m(tities.)150
-3581 y(This)f(could)g(cause)i(\014lesystem)f(corruption!)150
-3738 y(One)e(other)i(thing:)39 b(if)27 b(y)m(ou)j(create)g(a)f
-Fj(bzip2)f Fl(binary)f(for)i(public)d(distribution,)g(please)i(try)h
-(and)g(link)d(it)150 3847 y(statically)g(\()p Fj(gcc)k(-s)p
-Fl(\).)39 b(This)25 b(a)m(v)m(oids)i(all)f(sorts)h(of)g(library-v)m
-(ersion)d(issues)h(that)i(others)g(ma)m(y)g(encoun)m(ter)150
-3957 y(later)j(on.)150 4114 y(If)f(y)m(ou)g(build)e Fj(bzip2)h
-Fl(on)h(Win32,)h(y)m(ou)f(m)m(ust)g(set)h Fj(BZ_UNIX)e
-Fl(to)i(0)f(and)g Fj(BZ_LCCWIN32)d Fl(to)k(1,)g(in)e(the)i(\014le)150
-4223 y Fj(bzip2.c)p Fl(,)f(b)s(efore)h(compiling.)38
-b(Otherwise)29 b(the)i(resulting)d(binary)h(w)m(on't)i(w)m(ork)f
-(correctly)-8 b(.)150 4505 y Fk(4.3)68 b(Rep)t(orting)46
-b(bugs)150 4698 y Fl(I)25 b(tried)f(prett)m(y)i(hard)e(to)i(mak)m(e)g
-(sure)f Fj(bzip2)e Fl(is)i(bug)f(free,)j(b)s(oth)d(b)m(y)h(design)f
-(and)h(b)m(y)g(testing.)39 b(Hop)s(efully)150 4807 y(y)m(ou'll)29
-b(nev)m(er)i(need)f(to)h(read)g(this)e(section)h(for)h(real.)150
-4964 y(Nev)m(ertheless,)36 b(if)c Fj(bzip2)h Fl(dies)g(with)f(a)i
-(segmen)m(tation)h(fault,)g(a)f(bus)f(error)g(or)h(an)g(in)m(ternal)e
-(assertion)150 5074 y(failure,)i(it)h(will)d(ask)j(y)m(ou)g(to)g(email)
-f(me)h(a)g(bug)f(rep)s(ort.)54 b(Exp)s(erience)33 b(with)h(v)m(ersion)g
-(0.1)i(sho)m(ws)e(that)150 5183 y(almost)c(all)g(these)h(problems)d
-(can)j(b)s(e)f(traced)h(to)g(either)f(compiler)e(bugs)i(or)g(hardw)m
-(are)g(problems.)225 5340 y Fi(\017)60 b Fl(Recompile)22
-b(the)h(program)g(with)f(no)h(optimisation,)g(and)f(see)i(if)e(it)g(w)m
-(orks.)39 b(And/or)22 b(try)h(a)g(di\013eren)m(t)p eop
-%%Page: 33 34
-33 33 bop 150 -116 a Fl(Chapter)30 b(4:)41 b(Miscellanea)2586
-b(33)330 299 y(compiler.)77 b(I)43 b(heard)f(all)g(sorts)h(of)h
-(stories)e(ab)s(out)h(v)-5 b(arious)42 b(\015a)m(v)m(ours)h(of)h(GNU)f
-(C)g(\(and)g(other)330 408 y(compilers\))20 b(generating)i(bad)e(co)s
-(de)i(for)f Fj(bzip2)p Fl(,)h(and)f(I'v)m(e)h(run)e(across)i(t)m(w)m(o)
-g(suc)m(h)f(examples)g(m)m(yself.)330 606 y(2.7.X)35
-b(v)m(ersions)e(of)g(GNU)h(C)f(are)h(kno)m(wn)f(to)h(generate)h(bad)d
-(co)s(de)i(from)f(time)g(to)h(time,)g(at)g(high)330 716
-y(optimisation)20 b(lev)m(els.)37 b(If)21 b(y)m(ou)g(get)i(problems,)e
-(try)g(using)f(the)i(\015ags)f Fj(-O2)f(-fomit-frame-pointer)330
-825 y(-fno-strength-reduce)p Fl(.)35 b(Y)-8 b(ou)31 b(should)d(sp)s
-(eci\014cally)h Fc(not)j Fl(use)e Fj(-funroll-loops)p
-Fl(.)330 1023 y(Y)-8 b(ou)38 b(ma)m(y)g(notice)g(that)g(the)g(Mak)m
-(e\014le)g(runs)e(six)g(tests)i(as)g(part)f(of)h(the)g(build)c(pro)s
-(cess.)62 b(If)37 b(the)330 1132 y(program)43 b(passes)g(all)f(of)h
-(these,)k(it's)c(a)h(prett)m(y)f(go)s(o)s(d)g(\(but)g(not)g(100\045\))i
-(indication)c(that)j(the)330 1242 y(compiler)29 b(has)h(done)g(its)g
-(job)g(correctly)-8 b(.)225 1440 y Fi(\017)60 b Fl(If)33
-b Fj(bzip2)f Fl(crashes)i(randomly)-8 b(,)33 b(and)g(the)h(crashes)g
-(are)g(not)g(rep)s(eatable,)g(y)m(ou)g(ma)m(y)g(ha)m(v)m(e)h(a)f
-(\015aky)330 1549 y(memory)k(subsystem.)64 b Fj(bzip2)37
-b Fl(really)g(hammers)h(y)m(our)g(memory)g(hierarc)m(h)m(y)-8
-b(,)41 b(and)d(if)f(it's)h(a)h(bit)330 1659 y(marginal,)33
-b(y)m(ou)h(ma)m(y)g(get)h(these)f(problems.)49 b(Ditto)34
-b(if)f(y)m(our)h(disk)e(or)h(I/O)h(subsystem)e(is)h(slo)m(wly)330
-1768 y(failing.)39 b(Y)-8 b(up,)30 b(this)f(really)g(do)s(es)h(happ)s
-(en.)330 1966 y(T)-8 b(ry)28 b(using)f(a)i(di\013eren)m(t)f(mac)m(hine)
-g(of)h(the)g(same)f(t)m(yp)s(e,)i(and)e(see)h(if)e(y)m(ou)i(can)g(rep)s
-(eat)g(the)f(problem.)225 2163 y Fi(\017)60 b Fl(This)21
-b(isn't)i(really)f(a)h(bug,)i(but)d(...)39 b(If)23 b
-Fj(bzip2)f Fl(tells)g(y)m(ou)h(y)m(our)h(\014le)e(is)g(corrupted)h(on)g
-(decompression,)330 2273 y(and)29 b(y)m(ou)g(obtained)f(the)i(\014le)e
-(via)h(FTP)-8 b(,)29 b(there)h(is)e(a)h(p)s(ossibilit)m(y)d(that)k(y)m
-(ou)f(forgot)h(to)g(tell)e(FTP)h(to)330 2383 y(do)23
-b(a)g(binary)e(mo)s(de)i(transfer.)38 b(That)23 b(absolutely)f(will)e
-(cause)j(the)h(\014le)e(to)h(b)s(e)g(non-decompressible.)330
-2492 y(Y)-8 b(ou'll)30 b(ha)m(v)m(e)h(to)g(transfer)f(it)g(again.)150
-2737 y(If)i(y)m(ou'v)m(e)h(incorp)s(orated)e Fj(libbzip2)f
-Fl(in)m(to)i(y)m(our)g(o)m(wn)g(program)g(and)g(are)g(getting)h
-(problems,)e(please,)150 2847 y(please,)d(please,)h(c)m(hec)m(k)g(that)
-f(the)g(parameters)g(y)m(ou)g(are)g(passing)f(in)f(calls)h(to)h(the)g
-(library)-8 b(,)26 b(are)j(correct,)150 2956 y(and)e(in)f(accordance)k
-(with)c(what)i(the)g(do)s(cumen)m(tation)f(sa)m(ys)h(is)f(allo)m(w)m
-(able.)39 b(I)28 b(ha)m(v)m(e)h(tried)e(to)h(mak)m(e)h(the)150
-3066 y(library)f(robust)i(against)g(suc)m(h)g(problems,)f(but)h(I'm)g
-(sure)g(I)g(ha)m(v)m(en't)h(succeeded.)150 3223 y(Finally)-8
-b(,)32 b(if)g(the)h(ab)s(o)m(v)m(e)i(commen)m(ts)e(don't)g(help,)g(y)m
-(ou'll)f(ha)m(v)m(e)i(to)g(send)e(me)h(a)g(bug)g(rep)s(ort.)48
-b(No)m(w,)34 b(it's)150 3332 y(just)c(amazing)g(ho)m(w)h(man)m(y)f(p)s
-(eople)g(will)d(send)j(me)g(a)h(bug)f(rep)s(ort)g(sa)m(ying)g
-(something)g(lik)m(e)481 3483 y(bzip2)f(crashed)h(with)f(segmen)m
-(tation)j(fault)e(on)g(m)m(y)g(mac)m(hine)150 3640 y(and)h(absolutely)f
-(nothing)h(else.)44 b(Needless)32 b(to)g(sa)m(y)-8 b(,)33
-b(a)f(suc)m(h)f(a)h(rep)s(ort)f(is)g Fc(totally)-8 b(,)32
-b(utterly)-8 b(,)32 b(completely)150 3750 y(and)40 b(comprehensiv)m
-(ely)g(100\045)h(useless;)46 b(a)41 b(w)m(aste)g(of)g(y)m(our)g(time,)i
-(m)m(y)e(time,)i(and)e(net)g(bandwidth)p Fl(.)150 3859
-y(With)31 b(no)h(details)f(at)i(all,)e(there's)h(no)g(w)m(a)m(y)h(I)f
-(can)g(p)s(ossibly)d(b)s(egin)h(to)j(\014gure)e(out)i(what)e(the)i
-(problem)150 3969 y(is.)150 4126 y(The)d(rules)e(of)i(the)g(game)h
-(are:)41 b(facts,)32 b(facts,)f(facts.)41 b(Don't)31
-b(omit)f(them)g(b)s(ecause)g Fj(")p Fl(oh,)g(they)g(w)m(on't)h(b)s(e)
-150 4235 y(relev)-5 b(an)m(t)p Fj(")p Fl(.)41 b(A)m(t)31
-b(the)g(bare)f(minim)m(um:)481 4386 y(Mac)m(hine)h(t)m(yp)s(e.)61
-b(Op)s(erating)29 b(system)h(v)m(ersion.)481 4490 y(Exact)h(v)m(ersion)
-f(of)h Fj(bzip2)e Fl(\(do)h Fj(bzip2)47 b(-V)p Fl(\).)481
-4594 y(Exact)31 b(v)m(ersion)f(of)h(the)f(compiler)f(used.)481
-4698 y(Flags)i(passed)e(to)j(the)e(compiler.)150 4854
-y(Ho)m(w)m(ev)m(er,)i(the)d(most)h(imp)s(ortan)m(t)f(single)f(thing)g
-(that)i(will)d(help)h(me)h(is)f(the)i(\014le)e(that)i(y)m(ou)g(w)m(ere)
-g(trying)150 4964 y(to)f(compress)f(or)g(decompress)g(at)h(the)f(time)g
-(the)g(problem)f(happ)s(ened.)38 b(Without)28 b(that,)h(m)m(y)g(abilit)
-m(y)d(to)150 5074 y(do)k(an)m(ything)g(more)h(than)f(sp)s(eculate)g(ab)
-s(out)g(the)g(cause,)i(is)d(limited.)150 5230 y(Please)34
-b(remem)m(b)s(er)f(that)h(I)f(connect)i(to)f(the)g(In)m(ternet)g(with)e
-(a)i(mo)s(dem,)g(so)f(y)m(ou)h(should)e(con)m(tact)k(me)150
-5340 y(b)s(efore)30 b(mailing)e(me)j(h)m(uge)f(\014les.)p
-eop
-%%Page: 34 35
-34 34 bop 150 -116 a Fl(Chapter)30 b(4:)41 b(Miscellanea)2586
-b(34)150 299 y Fk(4.4)68 b(Did)45 b(y)l(ou)g(get)h(the)f(righ)l(t)h
-(pac)l(k)-7 b(age?)150 491 y Fj(bzip2)34 b Fl(is)h(a)h(resource)g(hog.)
-56 b(It)36 b(soaks)g(up)f(large)g(amoun)m(ts)h(of)g(CPU)f(cycles)h(and)
-f(memory)-8 b(.)57 b(Also,)36 b(it)150 601 y(giv)m(es)26
-b(v)m(ery)h(large)f(latencies.)39 b(In)25 b(the)h(w)m(orst)g(case,)i(y)
-m(ou)f(can)f(feed)g(man)m(y)g(megab)m(ytes)h(of)f(uncompressed)150
-711 y(data)45 b(in)m(to)e(the)i(library)c(b)s(efore)j(getting)g(an)m(y)
-g(compressed)g(output,)j(so)d(this)f(probably)f(rules)h(out)150
-820 y(applications)29 b(requiring)e(in)m(teractiv)m(e)32
-b(b)s(eha)m(viour.)150 977 y(These)38 b(aren't)h(faults)e(of)h(m)m(y)g
-(implemen)m(tation,)h(I)f(hop)s(e,)i(but)d(more)h(an)g(in)m(trinsic)e
-(prop)s(ert)m(y)h(of)i(the)150 1087 y(Burro)m(ws-Wheeler)30
-b(transform)g(\(unfortunately\).)40 b(Ma)m(yb)s(e)31
-b(this)e(isn't)h(what)g(y)m(ou)h(w)m(an)m(t.)150 1244
-y(If)h(y)m(ou)h(w)m(an)m(t)g(a)g(compressor)g(and/or)f(library)e(whic)m
-(h)h(is)h(faster,)i(uses)e(less)g(memory)g(but)g(gets)h(prett)m(y)150
-1353 y(go)s(o)s(d)e(compression,)g(and)g(has)h(minimal)c(latency)-8
-b(,)33 b(consider)e(Jean-loup)f(Gailly's)g(and)h(Mark)h(Adler's)150
-1463 y(w)m(ork,)f Fj(zlib-1.1.2)c Fl(and)j Fj(gzip-1.2.4)p
-Fl(.)38 b(Lo)s(ok)31 b(for)f(them)g(at)150 1620 y Fj
-(http://www.cdrom.com/pub)o(/inf)o(ozip)o(/zl)o(ib)24
-b Fl(and)30 b Fj(http://www.gzip.org)25 b Fl(resp)s(ectiv)m(ely)-8
-b(.)150 1776 y(F)g(or)32 b(something)f(faster)i(and)e(ligh)m(ter)f
-(still,)h(y)m(ou)g(migh)m(t)h(try)f(Markus)h(F)g(X)f(J)h(Ob)s(erh)m
-(umer's)d Fj(LZO)i Fl(real-)150 1886 y(time)f
-(compression/decompression)f(library)-8 b(,)28 b(at)150
-1996 y Fj(http://wildsau.idv.uni-l)o(inz.)o(ac.a)o(t/m)o(fx/l)o(zo.h)o
-(tml)o Fl(.)150 2152 y(If)38 b(y)m(ou)h(w)m(an)m(t)g(to)h(use)e(the)g
-Fj(bzip2)g Fl(algorithms)f(to)i(compress)f(small)g(blo)s(c)m(ks)f(of)i
-(data,)j(64k)d(b)m(ytes)g(or)150 2262 y(smaller,)i(for)e(example)g(on)h
-(an)f(on-the-\015y)h(disk)e(compressor,)k(y)m(ou'd)e(b)s(e)f(w)m(ell)g
-(advised)f(not)i(to)g(use)150 2372 y(this)i(library)-8
-b(.)77 b(Instead,)47 b(I'v)m(e)d(made)f(a)h(sp)s(ecial)e(library)f
-(tuned)h(for)h(that)h(kind)d(of)j(use.)79 b(It's)43 b(part)150
-2481 y(of)d Fj(e2compr-0.40)p Fl(,)f(an)g(on-the-\015y)h(disk)e
-(compressor)h(for)h(the)f(Lin)m(ux)f Fj(ext2)h Fl(\014lesystem.)67
-b(Lo)s(ok)40 b(at)150 2591 y Fj(http://www.netspace.net.)o(au/~)o(reit)
-o(er/)o(e2co)o(mpr)p Fl(.)150 2880 y Fk(4.5)68 b(T)-11
-b(esting)150 3072 y Fl(A)30 b(record)h(of)f(the)h(tests)g(I'v)m(e)g
-(done.)150 3229 y(First,)f(some)h(data)g(sets:)225 3386
-y Fi(\017)60 b Fl(B:)32 b(a)f(directory)f(con)m(taining)h(6001)i
-(\014les,)d(one)h(for)g(ev)m(ery)h(length)e(in)g(the)h(range)g(0)h(to)f
-(6000)i(b)m(ytes.)330 3496 y(The)d(\014les)f(con)m(tain)i(random)e(lo)m
-(w)m(ercase)j(letters.)41 b(18.7)32 b(megab)m(ytes.)225
-3633 y Fi(\017)60 b Fl(H:)36 b(m)m(y)f(home)h(directory)f(tree.)56
-b(Do)s(cumen)m(ts,)38 b(source)d(co)s(de,)i(mail)d(\014les,)i
-(compressed)f(data.)57 b(H)330 3743 y(con)m(tains)39
-b(B,)h(and)f(also)g(a)g(directory)g(of)g(\014les)f(designed)g(as)i(b)s
-(oundary)d(cases)j(for)f(the)g(sorting;)330 3853 y(mostly)30
-b(v)m(ery)h(rep)s(etitiv)m(e,)f(nast)m(y)h(\014les.)39
-b(565)32 b(megab)m(ytes.)225 3990 y Fi(\017)60 b Fl(A:)43
-b(directory)f(tree)i(holding)d(v)-5 b(arious)41 b(applications)g(built)
-g(from)h(source:)66 b Fj(egcs)p Fl(,)45 b Fj(gcc-2.8.1)p
-Fl(,)330 4100 y(KDE,)31 b(GTK,)f(Octa)m(v)m(e,)j(etc.)41
-b(2200)33 b(megab)m(ytes.)150 4285 y(The)i(tests)g(conducted)g(are)h
-(as)f(follo)m(ws.)54 b(Eac)m(h)36 b(test)g(means)f(compressing)f(\(a)h
-(cop)m(y)h(of)7 b(\))36 b(eac)m(h)g(\014le)e(in)150 4394
-y(the)d(data)g(set,)g(decompressing)e(it)h(and)g(comparing)f(it)h
-(against)h(the)g(original.)150 4551 y(First,)26 b(a)g(bunc)m(h)f(of)h
-(tests)h(with)d(blo)s(c)m(k)h(sizes)h(and)f(in)m(ternal)g(bu\013er)f
-(sizes)i(set)g(v)m(ery)g(small,)g(to)g(detect)i(an)m(y)150
-4661 y(problems)g(with)g(the)i(blo)s(c)m(king)f(and)g(bu\013ering)e
-(mec)m(hanisms.)40 b(This)28 b(required)g(mo)s(difying)f(the)j(source)
-150 4770 y(co)s(de)h(so)f(as)h(to)g(try)f(to)h(break)g(it.)199
-4927 y(1.)61 b(Data)32 b(set)f(H,)g(with)e(bu\013er)g(size)h(of)h(1)g
-(b)m(yte,)g(and)f(blo)s(c)m(k)g(size)g(of)g(23)i(b)m(ytes.)199
-5065 y(2.)61 b(Data)32 b(set)f(B,)g(bu\013er)e(sizes)h(1)h(b)m(yte,)g
-(blo)s(c)m(k)f(size)g(1)h(b)m(yte.)199 5202 y(3.)61 b(As)30
-b(\(2\))i(but)d(small-mo)s(de)g(decompression.)199 5340
-y(4.)61 b(As)30 b(\(2\))i(with)d(blo)s(c)m(k)h(size)g(2)h(b)m(ytes.)p
-eop
-%%Page: 35 36
-35 35 bop 150 -116 a Fl(Chapter)30 b(4:)41 b(Miscellanea)2586
-b(35)199 299 y(5.)61 b(As)30 b(\(2\))i(with)d(blo)s(c)m(k)h(size)g(3)h
-(b)m(ytes.)199 431 y(6.)61 b(As)30 b(\(2\))i(with)d(blo)s(c)m(k)h(size)
-g(4)h(b)m(ytes.)199 564 y(7.)61 b(As)30 b(\(2\))i(with)d(blo)s(c)m(k)h
-(size)g(5)h(b)m(ytes.)199 697 y(8.)61 b(As)30 b(\(2\))i(with)d(blo)s(c)
-m(k)h(size)g(6)h(b)m(ytes)g(and)e(small-mo)s(de)g(decompression.)199
-829 y(9.)61 b(H)30 b(with)g(bu\013er)f(size)h(of)h(1)f(b)m(yte,)i(but)d
-(normal)h(blo)s(c)m(k)g(size)g(\(up)f(to)j(900000)h(b)m(ytes\).)150
-1009 y(Then)c(some)i(tests)g(with)e(unmo)s(di\014ed)f(source)i(co)s
-(de.)199 1166 y(1.)61 b(H,)31 b(all)e(settings)h(normal.)199
-1299 y(2.)61 b(As)30 b(\(1\),)i(with)d(small-mo)s(de)g(decompress.)199
-1431 y(3.)61 b(H,)31 b(compress)f(with)f(\015ag)i Fj(-1)p
-Fl(.)199 1564 y(4.)61 b(H,)31 b(compress)f(with)f(\015ag)i
-Fj(-s)p Fl(,)f(decompress)g(with)f(\015ag)i Fj(-s)p Fl(.)199
-1697 y(5.)61 b(F)-8 b(orw)m(ards)33 b(compatibilit)m(y:)45
-b(H,)33 b Fj(bzip2-0.1pl2)d Fl(compressing,)j Fj(bzip2-0.9.5)d
-Fl(decompressing,)330 1806 y(all)f(settings)i(normal.)199
-1939 y(6.)61 b(Bac)m(kw)m(ards)23 b(compatibilit)m(y:)35
-b(H,)23 b Fj(bzip2-0.9.5)c Fl(compressing,)k Fj(bzip2-0.1pl2)c
-Fl(decompressing,)330 2048 y(all)29 b(settings)i(normal.)199
-2181 y(7.)61 b(Bigger)31 b(tests:)41 b(A,)31 b(all)e(settings)i
-(normal.)199 2314 y(8.)61 b(As)30 b(\(7\),)i(using)d(the)i(fallbac)m(k)
-e(\(Sadak)-5 b(ane-lik)m(e\))31 b(sorting)f(algorithm.)199
-2446 y(9.)61 b(As)30 b(\(8\),)i(compress)e(with)f(\015ag)i
-Fj(-1)p Fl(,)f(decompress)g(with)f(\015ag)i Fj(-s)p Fl(.)154
-2579 y(10.)61 b(H,)31 b(using)e(the)h(fallbac)m(k)g(sorting)g
-(algorithm.)154 2711 y(11.)61 b(F)-8 b(orw)m(ards)33
-b(compatibilit)m(y:)45 b(A,)33 b Fj(bzip2-0.1pl2)d Fl(compressing,)j
-Fj(bzip2-0.9.5)d Fl(decompressing,)330 2821 y(all)f(settings)i(normal.)
-154 2954 y(12.)61 b(Bac)m(kw)m(ards)23 b(compatibilit)m(y:)35
-b(A,)23 b Fj(bzip2-0.9.5)c Fl(compressing,)k Fj(bzip2-0.1pl2)c
-Fl(decompressing,)330 3063 y(all)29 b(settings)i(normal.)154
-3196 y(13.)61 b(Misc)39 b(test:)58 b(ab)s(out)39 b(400)h(megab)m(ytes)h
-(of)e Fj(.tar)f Fl(\014les)f(with)h Fj(bzip2)f Fl(compiled)h(with)f
-(Chec)m(k)m(er)j(\(a)330 3305 y(memory)30 b(access)i(error)e(detector,)
-i(lik)m(e)e(Purify\).)154 3438 y(14.)61 b(Misc)30 b(tests)h(to)g(mak)m
-(e)h(sure)d(it)h(builds)e(and)h(runs)g(ok)i(on)f(non-Lin)m(ux/x86)g
-(platforms.)150 3618 y(These)35 b(tests)h(w)m(ere)f(conducted)g(on)g(a)
-h(225)g(MHz)g(IDT)f(WinChip)d(mac)m(hine,)k(running)d(Lin)m(ux)g
-(2.0.36.)150 3728 y(They)d(represen)m(t)g(nearly)g(a)h(w)m(eek)g(of)f
-(con)m(tin)m(uous)g(computation.)41 b(All)29 b(tests)i(completed)f
-(successfully)-8 b(.)150 4003 y Fk(4.6)68 b(F)-11 b(urther)44
-b(reading)150 4196 y Fj(bzip2)28 b Fl(is)h(not)h(researc)m(h)g(w)m
-(ork,)g(in)e(the)i(sense)g(that)g(it)f(do)s(esn't)g(presen)m(t)h(an)m
-(y)g(new)f(ideas.)40 b(Rather,)30 b(it's)150 4306 y(an)g(engineering)f
-(exercise)i(based)f(on)g(existing)g(ideas.)150 4463 y(F)-8
-b(our)31 b(do)s(cumen)m(ts)f(describ)s(e)e(essen)m(tially)i(all)f(the)i
-(ideas)e(b)s(ehind)f Fj(bzip2)p Fl(:)390 4614 y Fj(Michael)46
-b(Burrows)g(and)h(D.)g(J.)g(Wheeler:)485 4717 y("A)h(block-sorting)c
-(lossless)h(data)i(compression)e(algorithm")533 4821
-y(10th)i(May)g(1994.)533 4925 y(Digital)f(SRC)h(Research)e(Report)i
-(124.)533 5029 y(ftp://ftp.digital.com/pub)o(/DEC)o(/SR)o(C/re)o(sear)o
-(ch-)o(repo)o(rts/)o(SRC)o(-124)o(.ps.)o(gz)533 5132
-y(If)g(you)g(have)g(trouble)f(finding)g(it,)g(try)h(searching)f(at)h
-(the)533 5236 y(New)g(Zealand)f(Digital)g(Library,)f
-(http://www.nzdl.org.)p eop
-%%Page: 36 37
-36 36 bop 150 -116 a Fl(Chapter)30 b(4:)41 b(Miscellanea)2586
-b(36)390 299 y Fj(Daniel)46 b(S.)h(Hirschberg)e(and)i(Debra)g(A.)g
-(LeLewer)485 403 y("Efficient)e(Decoding)h(of)h(Prefix)f(Codes")533
-506 y(Communications)e(of)j(the)g(ACM,)g(April)f(1990,)h(Vol)f(33,)h
-(Number)f(4.)533 610 y(You)h(might)f(be)i(able)e(to)h(get)g(an)h
-(electronic)d(copy)h(of)h(this)676 714 y(from)g(the)g(ACM)g(Digital)f
-(Library.)390 922 y(David)g(J.)i(Wheeler)533 1025 y(Program)e(bred3.c)g
-(and)h(accompanying)d(document)i(bred3.ps.)533 1129 y(This)h(contains)e
-(the)i(idea)g(behind)f(the)h(multi-table)e(Huffman)533
-1233 y(coding)h(scheme.)533 1337 y(ftp://ftp.cl.cam.ac.uk/us)o(ers/)o
-(djw)o(3/)390 1544 y(Jon)h(L.)g(Bentley)f(and)h(Robert)f(Sedgewick)485
-1648 y("Fast)h(Algorithms)e(for)i(Sorting)f(and)g(Searching)g(Strings")
-533 1752 y(Available)f(from)i(Sedgewick's)e(web)i(page,)533
-1856 y(www.cs.princeton.edu/~rs)150 2012 y Fl(The)29
-b(follo)m(wing)f(pap)s(er)g(giv)m(es)h(v)-5 b(aluable)28
-b(additional)g(insigh)m(ts)f(in)m(to)j(the)f(algorithm,)g(but)g(is)f
-(not)i(imme-)150 2122 y(diately)g(the)g(basis)f(of)i(an)m(y)g(co)s(de)f
-(used)g(in)f(bzip2.)390 2273 y Fj(Peter)46 b(Fenwick:)533
-2377 y(Block)h(Sorting)e(Text)i(Compression)533 2481
-y(Proceedings)e(of)i(the)g(19th)g(Australasian)d(Computer)i(Science)f
-(Conference,)629 2584 y(Melbourne,)g(Australia.)92 b(Jan)47
-b(31)g(-)h(Feb)f(2,)g(1996.)533 2688 y(ftp://ftp.cs.auckland.ac.)o
-(nz/p)o(ub/)o(pete)o(r-f/)o(ACS)o(C96p)o(aper)o(.ps)150
-2845 y Fl(Kunihik)m(o)28 b(Sadak)-5 b(ane's)31 b(sorting)e(algorithm,)h
-(men)m(tioned)g(ab)s(o)m(v)m(e,)i(is)d(a)m(v)-5 b(ailable)30
-b(from:)390 2996 y Fj(http://naomi.is.s.u-toky)o(o.ac)o(.jp/)o(~sa)o
-(da/p)o(aper)o(s/S)o(ada9)o(8b.p)o(s.g)o(z)150 3153 y
-Fl(The)41 b(Man)m(b)s(er-My)m(ers)g(su\016x)g(arra)m(y)g(construction)g
-(algorithm)f(is)g(describ)s(ed)f(in)h(a)i(pap)s(er)e(a)m(v)-5
-b(ailable)150 3262 y(from:)390 3413 y Fj(http://www.cs.arizona.ed)o
-(u/pe)o(ople)o(/ge)o(ne/P)o(APER)o(S/s)o(uffi)o(x.ps)150
-3570 y Fl(Finally)d(,)33 b(the)h(follo)m(wing)e(pap)s(er)h(do)s(cumen)m
-(ts)g(some)h(recen)m(t)h(in)m(v)m(estigations)e(I)h(made)f(in)m(to)h
-(the)g(p)s(erfor-)150 3680 y(mance)d(of)f(sorting)g(algorithms:)390
-3831 y Fj(Julian)46 b(Seward:)533 3935 y(On)h(the)g(Performance)e(of)i
-(BWT)g(Sorting)f(Algorithms)533 4038 y(Proceedings)f(of)i(the)g(IEEE)g
-(Data)f(Compression)f(Conference)g(2000)629 4142 y(Snowbird,)g(Utah.)94
-b(28-30)46 b(March)h(2000.)p eop
-%%Page: -1 38
--1 37 bop 3725 -116 a Fl(i)150 299 y Fh(T)-13 b(able)54
-b(of)g(Con)l(ten)l(ts)150 641 y Fk(1)135 b(In)l(tro)t(duction)15
-b Fb(.)20 b(.)f(.)h(.)f(.)g(.)h(.)f(.)h(.)f(.)h(.)f(.)g(.)h(.)f(.)h(.)f
-(.)h(.)f(.)g(.)h(.)f(.)h(.)f(.)h(.)f(.)g(.)h(.)f(.)h(.)f(.)60
-b Fk(2)150 911 y(2)135 b(Ho)l(w)45 b(to)h(use)f Fd(bzip2)31
-b Fb(.)19 b(.)g(.)h(.)f(.)h(.)f(.)h(.)f(.)g(.)h(.)f(.)h(.)f(.)h(.)f(.)g
-(.)h(.)f(.)h(.)f(.)h(.)f(.)g(.)h(.)f(.)78 b Fk(3)1047
-1048 y Fl(NAME)20 b Fa(.)c(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)50 b Fl(3)1047
-1157 y(SYNOPSIS)21 b Fa(.)13 b(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)h(.)f(.)g(.)50 b Fl(3)1047 1267 y(DESCRIPTION)10
-b Fa(.)j(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)40
-b Fl(3)1047 1377 y(OPTIONS)16 b Fa(.)d(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)45 b Fl(4)1047
-1486 y(MEMOR)-8 b(Y)31 b(MANA)m(GEMENT)14 b Fa(.)j(.)e(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)44
-b Fl(6)1047 1596 y(RECO)m(VERING)30 b(D)m(A)-8 b(T)g(A)32
-b(FR)m(OM)f(D)m(AMA)m(GED)i(FILES)1256 1705 y Fa(.)15
-b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)57 b Fl(7)1047 1815 y(PERF)m(ORMANCE)30
-b(NOTES)9 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)38 b Fl(7)1047 1924
-y(CA)-10 b(VEA)i(TS)10 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)40 b Fl(8)1047 2034
-y(A)m(UTHOR)23 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 b Fl(8)150 2276 y Fk(3)135
-b(Programming)46 b(with)f Fd(libbzip2)29 b Fb(.)16 b(.)j(.)h(.)f(.)h(.)
-f(.)h(.)f(.)g(.)h(.)f(.)h(.)f(.)h(.)f(.)74 b Fk(9)449
-2413 y Fl(3.1)92 b(T)-8 b(op-lev)m(el)30 b(structure)24
-b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h
-(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)54 b Fl(9)748 2523 y(3.1.1)93 b(Lo)m(w-lev)m(el)30
-b(summary)23 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)53
-b Fl(9)748 2633 y(3.1.2)93 b(High-lev)m(el)29 b(summary)12
-b Fa(.)i(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)41 b
-Fl(9)748 2742 y(3.1.3)93 b(Utilit)m(y)29 b(functions)g(summary)12
-b Fa(.)h(.)j(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)41 b Fl(10)449 2852 y(3.2)92 b(Error)29
-b(handling)18 b Fa(.)13 b(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Fl(10)449
-2961 y(3.3)92 b(Lo)m(w-lev)m(el)31 b(in)m(terface)d Fa(.)15
-b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)57 b Fl(12)748 3071 y(3.3.1)93 b Fj(BZ2_bzCompressInit)21
-b Fa(.)9 b(.)15 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)50 b Fl(12)748
-3181 y(3.3.2)93 b Fj(BZ2_bzCompress)9 b Fa(.)h(.)15 b(.)g(.)g(.)g(.)g
-(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)38 b Fl(14)748 3290 y(3.3.3)93
-b Fj(BZ2_bzCompressEnd)23 b Fa(.)10 b(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g
-(.)52 b Fl(17)748 3400 y(3.3.4)93 b Fj(BZ2_bzDecompressInit)16
-b Fa(.)9 b(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h
-(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)45 b Fl(17)748 3509
-y(3.3.5)93 b Fj(BZ2_bzDecompress)21 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)55 b Fl(17)748 3619 y(3.3.6)93 b Fj(BZ2_bzDecompressEnd)18
-b Fa(.)10 b(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Fl(19)449
-3729 y(3.4)92 b(High-lev)m(el)30 b(in)m(terface)16 b
-Fa(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h
-(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)45 b Fl(19)748 3838 y(3.4.1)93 b Fj(BZ2_bzReadOpen)9
-b Fa(.)h(.)15 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)38
-b Fl(19)748 3948 y(3.4.2)93 b Fj(BZ2_bzRead)18 b Fa(.)12
-b(.)j(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)47
-b Fl(20)748 4057 y(3.4.3)93 b Fj(BZ2_bzReadGetUnused)18
-b Fa(.)10 b(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Fl(22)748
-4167 y(3.4.4)93 b Fj(BZ2_bzReadClose)23 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)57 b Fl(22)748 4276 y(3.4.5)93 b
-Fj(BZ2_bzWriteOpen)23 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)57 b Fl(22)748 4386 y(3.4.6)93 b Fj(BZ2_bzWrite)16
-b Fa(.)11 b(.)k(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-45 b Fl(23)748 4496 y(3.4.7)93 b Fj(BZ2_bzWriteClose)21
-b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)55 b Fl(23)748
-4605 y(3.4.8)93 b(Handling)28 b(em)m(b)s(edded)h(compressed)h(data)h
-(streams)17 b Fa(.)f(.)f(.)g(.)46 b Fl(24)748 4715 y(3.4.9)93
-b(Standard)29 b(\014le-reading/writing)e(co)s(de)22 b
-Fa(.)16 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)52
-b Fl(25)449 4824 y(3.5)92 b(Utilit)m(y)29 b(functions)f
-Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)59 b Fl(26)748 4934 y(3.5.1)93 b
-Fj(BZ2_bzBuffToBuffCompres)o(s)22 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)57 b Fl(26)748
-5044 y(3.5.2)93 b Fj(BZ2_bzBuffToBuffDecompr)o(ess)17
-b Fa(.)e(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-53 b Fl(27)449 5153 y(3.6)92 b Fj(zlib)29 b Fl(compatibilit)m(y)g
-(functions)23 b Fa(.)13 b(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h
-(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)52
-b Fl(28)449 5263 y(3.7)92 b(Using)30 b(the)g(library)e(in)h(a)i
-Fj(stdio)p Fl(-free)e(en)m(vironmen)m(t)23 b Fa(.)15
-b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)52 b Fl(29)p
-eop
-%%Page: -2 39
--2 38 bop 3699 -116 a Fl(ii)748 83 y(3.7.1)93 b(Getting)31
-b(rid)d(of)j Fj(stdio)20 b Fa(.)13 b(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)49
-b Fl(29)748 193 y(3.7.2)93 b(Critical)28 b(error)i(handling)22
-b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)54 b Fl(29)449 302
-y(3.8)92 b(Making)30 b(a)h(Windo)m(ws)e(DLL)15 b Fa(.)h(.)f(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)44 b Fl(30)150 545
-y Fk(4)135 b(Miscellanea)11 b Fb(.)21 b(.)f(.)f(.)h(.)f(.)g(.)h(.)f(.)h
-(.)f(.)h(.)f(.)g(.)h(.)f(.)h(.)f(.)h(.)f(.)g(.)h(.)f(.)h(.)f(.)h(.)f(.)
-h(.)f(.)g(.)h(.)56 b Fk(31)449 682 y Fl(4.1)92 b(Limitations)29
-b(of)h(the)h(compressed)f(\014le)f(format)9 b Fa(.)15
-b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)38
-b Fl(31)449 791 y(4.2)92 b(P)m(ortabilit)m(y)30 b(issues)14
-b Fa(.)f(.)j(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)h(.)f(.)g(.)43 b Fl(32)449 901 y(4.3)92 b(Rep)s(orting)29
-b(bugs)f Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)58 b Fl(32)449 1010 y(4.4)92
-b(Did)29 b(y)m(ou)i(get)h(the)e(righ)m(t)g(pac)m(k)-5
-b(age?)22 b Fa(.)17 b(.)e(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h
-(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)51
-b Fl(34)449 1120 y(4.5)92 b(T)-8 b(esting)16 b Fa(.)f(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)45 b Fl(34)449 1230 y(4.6)92
-b(F)-8 b(urther)30 b(reading)22 b Fa(.)14 b(.)h(.)g(.)h(.)f(.)g(.)g(.)g
-(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)
-g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)51
-b Fl(35)p eop
-%%Trailer
-end
-userdict /end-hook known{end-hook}if
-%%EOF
diff --git a/winsup/bz2lib/manual.texi b/winsup/bz2lib/manual.texi
deleted file mode 100644
index 336776ab8..000000000
--- a/winsup/bz2lib/manual.texi
+++ /dev/null
@@ -1,2215 +0,0 @@
-\input texinfo  @c                                  -*- Texinfo -*-
-@setfilename bzip2.info
-
-@ignore
-This file documents bzip2 version 1.0, and associated library
-libbzip2, written by Julian Seward (jseward@acm.org).
-
-Copyright (C) 1996-2000 Julian R Seward
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for verbatim copies.
-@end ignore
-
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Bzip2: (bzip2).		A program and library for data compression.
-END-INFO-DIR-ENTRY
-@end format
-
-@end ifinfo
-
-@iftex
-@c @finalout
-@settitle bzip2 and libbzip2
-@titlepage
-@title bzip2 and libbzip2
-@subtitle a program and library for data compression
-@subtitle copyright (C) 1996-2000 Julian Seward
-@subtitle version 1.0 of 21 March 2000
-@author Julian Seward
-
-@end titlepage
-
-@parindent 0mm
-@parskip 2mm
-
-@end iftex
-@node Top, Overview, (dir), (dir)
-
-This program, @code{bzip2}, 
-and associated library @code{libbzip2}, are
-Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-@itemize @bullet
-@item
-   Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-@item
-   The origin of this software must not be misrepresented; you must 
-   not claim that you wrote the original software.  If you use this 
-   software in a product, an acknowledgment in the product 
-   documentation would be appreciated but is not required.
-@item
-   Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
-@item
-   The name of the author may not be used to endorse or promote 
-   products derived from this software without specific prior written 
-   permission.
-@end itemize
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Julian Seward, Cambridge, UK.
-
-@code{jseward@@acm.org}
-
-@code{http://sourceware.cygnus.com/bzip2}
-
-@code{http://www.cacheprof.org}
-
-@code{http://www.muraroa.demon.co.uk}
-
-@code{bzip2}/@code{libbzip2} version 1.0 of 21 March 2000.
-
-PATENTS: To the best of my knowledge, @code{bzip2} does not use any patented
-algorithms.  However, I do not have the resources available to carry out
-a full patent search.  Therefore I cannot give any guarantee of the
-above statement.
-
-
-
-
-
-
-
-@node Overview, Implementation, Top, Top
-@chapter Introduction
-
-@code{bzip2}  compresses  files  using the Burrows-Wheeler 
-block-sorting text compression algorithm,  and  Huffman  coding.
-Compression  is  generally  considerably  better than that
-achieved by more conventional LZ77/LZ78-based compressors,
-and  approaches  the performance of the PPM family of statistical compressors.
-
-@code{bzip2} is built on top of @code{libbzip2}, a flexible library
-for handling compressed data in the @code{bzip2} format.  This manual
-describes both how to use the program and 
-how to work with the library interface.  Most of the
-manual is devoted to this library, not the program, 
-which is good news if your interest is only in the program.
-
-Chapter 2 describes how to use @code{bzip2}; this is the only part 
-you need to read if you just want to know how to operate the program.
-Chapter 3 describes the programming interfaces in detail, and
-Chapter 4 records some miscellaneous notes which I thought
-ought to be recorded somewhere.
-
-
-@chapter How to use @code{bzip2}
-
-This chapter contains a copy of the @code{bzip2} man page,
-and nothing else.
-
-@quotation
-
-@unnumberedsubsubsec NAME
-@itemize
-@item @code{bzip2}, @code{bunzip2}
-- a block-sorting file compressor, v1.0
-@item @code{bzcat} 
-- decompresses files to stdout
-@item @code{bzip2recover}
-- recovers data from damaged bzip2 files
-@end itemize
-
-@unnumberedsubsubsec SYNOPSIS
-@itemize
-@item @code{bzip2} [ -cdfkqstvzVL123456789 ] [ filenames ...  ]
-@item @code{bunzip2} [ -fkvsVL ] [ filenames ...  ]
-@item @code{bzcat} [ -s ] [ filenames ...  ]
-@item @code{bzip2recover} filename
-@end itemize
-
-@unnumberedsubsubsec DESCRIPTION
-
-@code{bzip2} compresses files using the Burrows-Wheeler block sorting
-text compression algorithm, and Huffman coding.  Compression is
-generally considerably better than that achieved by more conventional
-LZ77/LZ78-based compressors, and approaches the performance of the PPM
-family of statistical compressors.
-
-The command-line options are deliberately very similar to those of GNU
-@code{gzip}, but they are not identical.
-
-@code{bzip2} expects a list of file names to accompany the command-line
-flags.  Each file is replaced by a compressed version of itself, with
-the name @code{original_name.bz2}.  Each compressed file has the same
-modification date, permissions, and, when possible, ownership as the
-corresponding original, so that these properties can be correctly
-restored at decompression time.  File name handling is naive in the
-sense that there is no mechanism for preserving original file names,
-permissions, ownerships or dates in filesystems which lack these
-concepts, or have serious file name length restrictions, such as MS-DOS.
-
-@code{bzip2} and @code{bunzip2} will by default not overwrite existing
-files.  If you want this to happen, specify the @code{-f} flag.
-
-If no file names are specified, @code{bzip2} compresses from standard
-input to standard output.  In this case, @code{bzip2} will decline to
-write compressed output to a terminal, as this would be entirely
-incomprehensible and therefore pointless.
-
-@code{bunzip2} (or @code{bzip2 -d}) decompresses all
-specified files.  Files which were not created by @code{bzip2}
-will be detected and ignored, and a warning issued.  
-@code{bzip2} attempts to guess the filename for the decompressed file 
-from that of the compressed file as follows:
-@itemize
-@item @code{filename.bz2 } becomes @code{filename}
-@item @code{filename.bz  } becomes @code{filename}
-@item @code{filename.tbz2} becomes @code{filename.tar}
-@item @code{filename.tbz } becomes @code{filename.tar}
-@item @code{anyothername } becomes @code{anyothername.out}
-@end itemize
-If the file does not end in one of the recognised endings, 
-@code{.bz2}, @code{.bz}, 
-@code{.tbz2} or @code{.tbz}, @code{bzip2} complains that it cannot
-guess the name of the original file, and uses the original name
-with @code{.out} appended.
-
-As with compression, supplying no
-filenames causes decompression from standard input to standard output.
-
-@code{bunzip2} will correctly decompress a file which is the
-concatenation of two or more compressed files.  The result is the
-concatenation of the corresponding uncompressed files.  Integrity
-testing (@code{-t}) of concatenated compressed files is also supported.
-
-You can also compress or decompress files to the standard output by
-giving the @code{-c} flag.  Multiple files may be compressed and
-decompressed like this.  The resulting outputs are fed sequentially to
-stdout.  Compression of multiple files in this manner generates a stream
-containing multiple compressed file representations.  Such a stream
-can be decompressed correctly only by @code{bzip2} version 0.9.0 or
-later.  Earlier versions of @code{bzip2} will stop after decompressing
-the first file in the stream.
-
-@code{bzcat} (or @code{bzip2 -dc}) decompresses all specified files to
-the standard output.
-
-@code{bzip2} will read arguments from the environment variables
-@code{BZIP2} and @code{BZIP}, in that order, and will process them
-before any arguments read from the command line.  This gives a 
-convenient way to supply default arguments.
-
-Compression is always performed, even if the compressed file is slightly
-larger than the original.  Files of less than about one hundred bytes
-tend to get larger, since the compression mechanism has a constant
-overhead in the region of 50 bytes.  Random data (including the output
-of most file compressors) is coded at about 8.05 bits per byte, giving
-an expansion of around 0.5%.
-
-As a self-check for your protection, @code{bzip2} uses 32-bit CRCs to
-make sure that the decompressed version of a file is identical to the
-original.  This guards against corruption of the compressed data, and
-against undetected bugs in @code{bzip2} (hopefully very unlikely).  The
-chances of data corruption going undetected is microscopic, about one
-chance in four billion for each file processed.  Be aware, though, that
-the check occurs upon decompression, so it can only tell you that
-something is wrong.  It can't help you recover the original uncompressed
-data.  You can use @code{bzip2recover} to try to recover data from
-damaged files.
-
-Return values: 0 for a normal exit, 1 for environmental problems (file
-not found, invalid flags, I/O errors, &c), 2 to indicate a corrupt
-compressed file, 3 for an internal consistency error (eg, bug) which
-caused @code{bzip2} to panic.
-
-
-@unnumberedsubsubsec OPTIONS
-@table @code
-@item -c  --stdout
-Compress or decompress to standard output.
-@item -d  --decompress
-Force decompression.  @code{bzip2}, @code{bunzip2} and @code{bzcat} are
-really the same program, and the decision about what actions to take is
-done on the basis of which name is used.  This flag overrides that
-mechanism, and forces bzip2 to decompress.
-@item -z --compress
-The complement to @code{-d}: forces compression, regardless of the
-invokation name.
-@item -t --test
-Check integrity of the specified file(s), but don't decompress them.
-This really performs a trial decompression and throws away the result.
-@item -f --force
-Force overwrite of output files.  Normally, @code{bzip2} will not overwrite
-existing output files.  Also forces @code{bzip2} to break hard links
-to files, which it otherwise wouldn't do.
-@item -k --keep
-Keep (don't delete) input files during compression
-or decompression.
-@item -s --small
-Reduce memory usage, for compression, decompression and testing.  Files
-are decompressed and tested using a modified algorithm which only
-requires 2.5 bytes per block byte.  This means any file can be
-decompressed in 2300k of memory, albeit at about half the normal speed.
-
-During compression, @code{-s} selects a block size of 200k, which limits
-memory use to around the same figure, at the expense of your compression
-ratio.  In short, if your machine is low on memory (8 megabytes or
-less), use -s for everything.  See MEMORY MANAGEMENT below.
-@item -q --quiet
-Suppress non-essential warning messages.  Messages pertaining to
-I/O errors and other critical events will not be suppressed.
-@item -v --verbose
-Verbose mode -- show the compression ratio for each file processed.
-Further @code{-v}'s increase the verbosity level, spewing out lots of
-information which is primarily of interest for diagnostic purposes.
-@item -L --license -V --version
-Display the software version, license terms and conditions.
-@item -1 to -9
-Set the block size to 100 k, 200 k ..  900 k when compressing.  Has no
-effect when decompressing.  See MEMORY MANAGEMENT below.
-@item --
-Treats all subsequent arguments as file names, even if they start
-with a dash.  This is so you can handle files with names beginning
-with a dash, for example: @code{bzip2 -- -myfilename}.
-@item --repetitive-fast 
-@item --repetitive-best
-These flags are redundant in versions 0.9.5 and above.  They provided
-some coarse control over the behaviour of the sorting algorithm in
-earlier versions, which was sometimes useful.  0.9.5 and above have an
-improved algorithm which renders these flags irrelevant.
-@end table
-
-
-@unnumberedsubsubsec MEMORY MANAGEMENT
-
-@code{bzip2} compresses large files in blocks.  The block size affects
-both the compression ratio achieved, and the amount of memory needed for
-compression and decompression.  The flags @code{-1} through @code{-9}
-specify the block size to be 100,000 bytes through 900,000 bytes (the
-default) respectively.  At decompression time, the block size used for
-compression is read from the header of the compressed file, and
-@code{bunzip2} then allocates itself just enough memory to decompress
-the file.  Since block sizes are stored in compressed files, it follows
-that the flags @code{-1} to @code{-9} are irrelevant to and so ignored
-during decompression.
-
-Compression and decompression requirements, in bytes, can be estimated
-as:
-@example
-     Compression:   400k + ( 8 x block size )
-
-     Decompression: 100k + ( 4 x block size ), or
-                    100k + ( 2.5 x block size )
-@end example
-Larger block sizes give rapidly diminishing marginal returns.  Most of
-the compression comes from the first two or three hundred k of block
-size, a fact worth bearing in mind when using @code{bzip2} on small machines.
-It is also important to appreciate that the decompression memory
-requirement is set at compression time by the choice of block size.
-
-For files compressed with the default 900k block size, @code{bunzip2}
-will require about 3700 kbytes to decompress.  To support decompression
-of any file on a 4 megabyte machine, @code{bunzip2} has an option to
-decompress using approximately half this amount of memory, about 2300
-kbytes.  Decompression speed is also halved, so you should use this
-option only where necessary.  The relevant flag is @code{-s}.
-
-In general, try and use the largest block size memory constraints allow,
-since that maximises the compression achieved.  Compression and
-decompression speed are virtually unaffected by block size.
-
-Another significant point applies to files which fit in a single block
--- that means most files you'd encounter using a large block size.  The
-amount of real memory touched is proportional to the size of the file,
-since the file is smaller than a block.  For example, compressing a file
-20,000 bytes long with the flag @code{-9} will cause the compressor to
-allocate around 7600k of memory, but only touch 400k + 20000 * 8 = 560
-kbytes of it.  Similarly, the decompressor will allocate 3700k but only
-touch 100k + 20000 * 4 = 180 kbytes.
-
-Here is a table which summarises the maximum memory usage for different
-block sizes.  Also recorded is the total compressed size for 14 files of
-the Calgary Text Compression Corpus totalling 3,141,622 bytes.  This
-column gives some feel for how compression varies with block size.
-These figures tend to understate the advantage of larger block sizes for
-larger files, since the Corpus is dominated by smaller files.
-@example
-          Compress   Decompress   Decompress   Corpus
-   Flag     usage      usage       -s usage     Size
-
-    -1      1200k       500k         350k      914704
-    -2      2000k       900k         600k      877703
-    -3      2800k      1300k         850k      860338
-    -4      3600k      1700k        1100k      846899
-    -5      4400k      2100k        1350k      845160
-    -6      5200k      2500k        1600k      838626
-    -7      6100k      2900k        1850k      834096
-    -8      6800k      3300k        2100k      828642
-    -9      7600k      3700k        2350k      828642
-@end example
-
-@unnumberedsubsubsec RECOVERING DATA FROM DAMAGED FILES
-
-@code{bzip2} compresses files in blocks, usually 900kbytes long.  Each
-block is handled independently.  If a media or transmission error causes
-a multi-block @code{.bz2} file to become damaged, it may be possible to
-recover data from the undamaged blocks in the file.
-
-The compressed representation of each block is delimited by a 48-bit
-pattern, which makes it possible to find the block boundaries with
-reasonable certainty.  Each block also carries its own 32-bit CRC, so
-damaged blocks can be distinguished from undamaged ones.
-
-@code{bzip2recover} is a simple program whose purpose is to search for
-blocks in @code{.bz2} files, and write each block out into its own
-@code{.bz2} file.  You can then use @code{bzip2 -t} to test the
-integrity of the resulting files, and decompress those which are
-undamaged.
-
-@code{bzip2recover} 
-takes a single argument, the name of the damaged file, 
-and writes a number of files @code{rec0001file.bz2},
-       @code{rec0002file.bz2}, etc, containing the  extracted  blocks.
-       The  output  filenames  are  designed  so  that the use of
-       wildcards in subsequent processing -- for example,  
-@code{bzip2 -dc  rec*file.bz2 > recovered_data} -- lists the files in
-       the correct order.
-
-@code{bzip2recover} should be of most use dealing with large @code{.bz2}
-       files,  as  these will contain many blocks.  It is clearly
-       futile to use it on damaged single-block  files,  since  a
-       damaged  block  cannot  be recovered.  If you wish to minimise 
-any potential data loss through media  or  transmission errors, 
-you might consider compressing with a smaller
-       block size.
-
-
-@unnumberedsubsubsec PERFORMANCE NOTES
-
-The sorting phase of compression gathers together similar strings in the
-file.  Because of this, files containing very long runs of repeated
-symbols, like "aabaabaabaab ..."  (repeated several hundred times) may
-compress more slowly than normal.  Versions 0.9.5 and above fare much
-better than previous versions in this respect.  The ratio between
-worst-case and average-case compression time is in the region of 10:1.
-For previous versions, this figure was more like 100:1.  You can use the
-@code{-vvvv} option to monitor progress in great detail, if you want.
-
-Decompression speed is unaffected by these phenomena.
-
-@code{bzip2} usually allocates several megabytes of memory to operate
-in, and then charges all over it in a fairly random fashion.  This means
-that performance, both for compressing and decompressing, is largely
-determined by the speed at which your machine can service cache misses.
-Because of this, small changes to the code to reduce the miss rate have
-been observed to give disproportionately large performance improvements.
-I imagine @code{bzip2} will perform best on machines with very large
-caches.
-
-
-@unnumberedsubsubsec CAVEATS
-
-I/O error messages are not as helpful as they could be.  @code{bzip2}
-tries hard to detect I/O errors and exit cleanly, but the details of
-what the problem is sometimes seem rather misleading.
-
-This manual page pertains to version 1.0 of @code{bzip2}.  Compressed
-data created by this version is entirely forwards and backwards
-compatible with the previous public releases, versions 0.1pl2, 0.9.0 and
-0.9.5, but with the following exception: 0.9.0 and above can correctly
-decompress multiple concatenated compressed files.  0.1pl2 cannot do
-this; it will stop after decompressing just the first file in the
-stream.
-
-@code{bzip2recover} uses 32-bit integers to represent bit positions in
-compressed files, so it cannot handle compressed files more than 512
-megabytes long.  This could easily be fixed.
-
-
-@unnumberedsubsubsec AUTHOR
-Julian Seward, @code{jseward@@acm.org}.
-
-The ideas embodied in @code{bzip2} are due to (at least) the following
-people: Michael Burrows and David Wheeler (for the block sorting
-transformation), David Wheeler (again, for the Huffman coder), Peter
-Fenwick (for the structured coding model in the original @code{bzip},
-and many refinements), and Alistair Moffat, Radford Neal and Ian Witten
-(for the arithmetic coder in the original @code{bzip}).  I am much
-indebted for their help, support and advice.  See the manual in the
-source distribution for pointers to sources of documentation.  Christian
-von Roques encouraged me to look for faster sorting algorithms, so as to
-speed up compression.  Bela Lubkin encouraged me to improve the
-worst-case compression performance.  Many people sent patches, helped
-with portability problems, lent machines, gave advice and were generally
-helpful.
-
-@end quotation
-
-
-
-
-@chapter Programming with @code{libbzip2}
-
-This chapter describes the programming interface to @code{libbzip2}.
-
-For general background information, particularly about memory
-use and performance aspects, you'd be well advised to read Chapter 2
-as well.
-
-@section Top-level structure
-
-@code{libbzip2} is a flexible library for compressing and decompressing
-data in the @code{bzip2} data format.  Although packaged as a single
-entity, it helps to regard the library as three separate parts: the low
-level interface, and the high level interface, and some utility
-functions.
-
-The structure of @code{libbzip2}'s interfaces is similar to
-that of Jean-loup Gailly's and Mark Adler's excellent @code{zlib} 
-library.
-
-All externally visible symbols have names beginning @code{BZ2_}.
-This is new in version 1.0.  The intention is to minimise pollution
-of the namespaces of library clients.
-
-@subsection Low-level summary
-
-This interface provides services for compressing and decompressing
-data in memory.  There's no provision for dealing with files, streams
-or any other I/O mechanisms, just straight memory-to-memory work.
-In fact, this part of the library can be compiled without inclusion
-of @code{stdio.h}, which may be helpful for embedded applications.
-
-The low-level part of the library has no global variables and
-is therefore thread-safe.
-
-Six routines make up the low level interface: 
-@code{BZ2_bzCompressInit}, @code{BZ2_bzCompress}, and @* @code{BZ2_bzCompressEnd}
-for compression,
-and a corresponding trio @code{BZ2_bzDecompressInit}, @* @code{BZ2_bzDecompress}
-and @code{BZ2_bzDecompressEnd} for decompression.  
-The @code{*Init} functions allocate
-memory for compression/decompression and do other
-initialisations, whilst the @code{*End} functions close down operations
-and release memory.
-
-The real work is done by @code{BZ2_bzCompress} and @code{BZ2_bzDecompress}.  
-These compress and decompress data from a user-supplied input buffer
-to a user-supplied output buffer.  These buffers can be any size;
-arbitrary quantities of data are handled by making repeated calls
-to these functions.  This is a flexible mechanism allowing a 
-consumer-pull style of activity, or producer-push, or a mixture of
-both.
-
-
-
-@subsection High-level summary
-
-This interface provides some handy wrappers around the low-level
-interface to facilitate reading and writing @code{bzip2} format
-files (@code{.bz2} files).  The routines provide hooks to facilitate
-reading files in which the @code{bzip2} data stream is embedded 
-within some larger-scale file structure, or where there are
-multiple @code{bzip2} data streams concatenated end-to-end.
-
-For reading files, @code{BZ2_bzReadOpen}, @code{BZ2_bzRead},
-@code{BZ2_bzReadClose} and @* @code{BZ2_bzReadGetUnused} are supplied.  For
-writing files, @code{BZ2_bzWriteOpen}, @code{BZ2_bzWrite} and
-@code{BZ2_bzWriteFinish} are available.
-
-As with the low-level library, no global variables are used
-so the library is per se thread-safe.  However, if I/O errors
-occur whilst reading or writing the underlying compressed files,
-you may have to consult @code{errno} to determine the cause of
-the error.  In that case, you'd need a C library which correctly
-supports @code{errno} in a multithreaded environment.
-
-To make the library a little simpler and more portable,
-@code{BZ2_bzReadOpen} and @code{BZ2_bzWriteOpen} require you to pass them file
-handles (@code{FILE*}s) which have previously been opened for reading or
-writing respectively.  That avoids portability problems associated with
-file operations and file attributes, whilst not being much of an
-imposition on the programmer.
-
-
-
-@subsection Utility functions summary
-For very simple needs, @code{BZ2_bzBuffToBuffCompress} and
-@code{BZ2_bzBuffToBuffDecompress} are provided.  These compress
-data in memory from one buffer to another buffer in a single
-function call.  You should assess whether these functions
-fulfill your memory-to-memory compression/decompression
-requirements before investing effort in understanding the more
-general but more complex low-level interface.
-
-Yoshioka Tsuneo (@code{QWF00133@@niftyserve.or.jp} /
-@code{tsuneo-y@@is.aist-nara.ac.jp}) has contributed some functions to
-give better @code{zlib} compatibility.  These functions are
-@code{BZ2_bzopen}, @code{BZ2_bzread}, @code{BZ2_bzwrite}, @code{BZ2_bzflush},
-@code{BZ2_bzclose},
-@code{BZ2_bzerror} and @code{BZ2_bzlibVersion}.  You may find these functions
-more convenient for simple file reading and writing, than those in the
-high-level interface.  These functions are not (yet) officially part of
-the library, and are minimally documented here.  If they break, you
-get to keep all the pieces.  I hope to document them properly when time
-permits.
-
-Yoshioka also contributed modifications to allow the library to be
-built as a Windows DLL.
-
-
-@section Error handling
-
-The library is designed to recover cleanly in all situations, including
-the worst-case situation of decompressing random data.  I'm not 
-100% sure that it can always do this, so you might want to add
-a signal handler to catch segmentation violations during decompression
-if you are feeling especially paranoid.  I would be interested in
-hearing more about the robustness of the library to corrupted
-compressed data.
-
-Version 1.0 is much more robust in this respect than
-0.9.0 or 0.9.5.  Investigations with Checker (a tool for 
-detecting problems with memory management, similar to Purify)
-indicate that, at least for the few files I tested, all single-bit
-errors in the decompressed data are caught properly, with no
-segmentation faults, no reads of uninitialised data and no 
-out of range reads or writes.  So it's certainly much improved,
-although I wouldn't claim it to be totally bombproof.
-
-The file @code{bzlib.h} contains all definitions needed to use
-the library.  In particular, you should definitely not include
-@code{bzlib_private.h}.
-
-In @code{bzlib.h}, the various return values are defined.  The following
-list is not intended as an exhaustive description of the circumstances 
-in which a given value may be returned -- those descriptions are given
-later.  Rather, it is intended to convey the rough meaning of each
-return value.  The first five actions are normal and not intended to 
-denote an error situation.
-@table @code
-@item BZ_OK
-The requested action was completed successfully.
-@item BZ_RUN_OK
-@itemx BZ_FLUSH_OK
-@itemx BZ_FINISH_OK
-In @code{BZ2_bzCompress}, the requested flush/finish/nothing-special action
-was completed successfully.
-@item BZ_STREAM_END
-Compression of data was completed, or the logical stream end was
-detected during decompression.
-@end table
-
-The following return values indicate an error of some kind.
-@table @code
-@item BZ_CONFIG_ERROR
-Indicates that the library has been improperly compiled on your
-platform -- a major configuration error.  Specifically, it means
-that @code{sizeof(char)}, @code{sizeof(short)} and @code{sizeof(int)}
-are not 1, 2 and 4 respectively, as they should be.  Note that the 
-library should still work properly on 64-bit platforms which follow
-the LP64 programming model -- that is, where @code{sizeof(long)}
-and @code{sizeof(void*)} are 8.  Under LP64, @code{sizeof(int)} is
-still 4, so @code{libbzip2}, which doesn't use the @code{long} type,
-is OK.
-@item BZ_SEQUENCE_ERROR
-When using the library, it is important to call the functions in the
-correct sequence and with data structures (buffers etc) in the correct
-states.  @code{libbzip2} checks as much as it can to ensure this is
-happening, and returns @code{BZ_SEQUENCE_ERROR} if not.  Code which
-complies precisely with the function semantics, as detailed below,
-should never receive this value; such an event denotes buggy code
-which you should investigate.
-@item BZ_PARAM_ERROR
-Returned when a parameter to a function call is out of range 
-or otherwise manifestly incorrect.  As with @code{BZ_SEQUENCE_ERROR},
-this denotes a bug in the client code.  The distinction between
-@code{BZ_PARAM_ERROR} and @code{BZ_SEQUENCE_ERROR} is a bit hazy, but still worth
-making.
-@item BZ_MEM_ERROR
-Returned when a request to allocate memory failed.  Note that the
-quantity of memory needed to decompress a stream cannot be determined
-until the stream's header has been read.  So @code{BZ2_bzDecompress} and
-@code{BZ2_bzRead} may return @code{BZ_MEM_ERROR} even though some of
-the compressed data has been read.  The same is not true for
-compression; once @code{BZ2_bzCompressInit} or @code{BZ2_bzWriteOpen} have
-successfully completed, @code{BZ_MEM_ERROR} cannot occur.
-@item BZ_DATA_ERROR
-Returned when a data integrity error is detected during decompression.
-Most importantly, this means when stored and computed CRCs for the
-data do not match.  This value is also returned upon detection of any
-other anomaly in the compressed data.
-@item BZ_DATA_ERROR_MAGIC
-As a special case of @code{BZ_DATA_ERROR}, it is sometimes useful to
-know when the compressed stream does not start with the correct
-magic bytes (@code{'B' 'Z' 'h'}).  
-@item BZ_IO_ERROR
-Returned by @code{BZ2_bzRead} and @code{BZ2_bzWrite} when there is an error
-reading or writing in the compressed file, and by @code{BZ2_bzReadOpen}
-and @code{BZ2_bzWriteOpen} for attempts to use a file for which the
-error indicator (viz, @code{ferror(f)}) is set.
-On receipt of @code{BZ_IO_ERROR}, the caller should consult
-@code{errno} and/or @code{perror} to acquire operating-system
-specific information about the problem.
-@item BZ_UNEXPECTED_EOF
-Returned by @code{BZ2_bzRead} when the compressed file finishes
-before the logical end of stream is detected.
-@item BZ_OUTBUFF_FULL
-Returned by @code{BZ2_bzBuffToBuffCompress} and
-@code{BZ2_bzBuffToBuffDecompress} to indicate that the output data
-will not fit into the output buffer provided.
-@end table
-
-
-
-@section Low-level interface
-
-@subsection @code{BZ2_bzCompressInit}
-@example
-typedef 
-   struct @{
-      char *next_in;
-      unsigned int avail_in;
-      unsigned int total_in_lo32;
-      unsigned int total_in_hi32;
-
-      char *next_out;
-      unsigned int avail_out;
-      unsigned int total_out_lo32;
-      unsigned int total_out_hi32;
-
-      void *state;
-
-      void *(*bzalloc)(void *,int,int);
-      void (*bzfree)(void *,void *);
-      void *opaque;
-   @} 
-   bz_stream;
-
-int BZ2_bzCompressInit ( bz_stream *strm, 
-                         int blockSize100k, 
-                         int verbosity,
-                         int workFactor );
-
-@end example
-
-Prepares for compression.  The @code{bz_stream} structure
-holds all data pertaining to the compression activity.  
-A @code{bz_stream} structure should be allocated and initialised
-prior to the call.
-The fields of @code{bz_stream}
-comprise the entirety of the user-visible data.  @code{state}
-is a pointer to the private data structures required for compression.
-
-Custom memory allocators are supported, via fields @code{bzalloc}, 
-@code{bzfree},
-and @code{opaque}.  The value 
-@code{opaque} is passed to as the first argument to
-all calls to @code{bzalloc} and @code{bzfree}, but is 
-otherwise ignored by the library.
-The call @code{bzalloc ( opaque, n, m )} is expected to return a 
-pointer @code{p} to
-@code{n * m} bytes of memory, and @code{bzfree ( opaque, p )} 
-should free
-that memory.
-
-If you don't want to use a custom memory allocator, set @code{bzalloc}, 
-@code{bzfree} and
-@code{opaque} to @code{NULL}, 
-and the library will then use the standard @code{malloc}/@code{free}
-routines.
-
-Before calling @code{BZ2_bzCompressInit}, fields @code{bzalloc}, 
-@code{bzfree} and @code{opaque} should
-be filled appropriately, as just described.  Upon return, the internal
-state will have been allocated and initialised, and @code{total_in_lo32}, 
-@code{total_in_hi32}, @code{total_out_lo32} and 
-@code{total_out_hi32} will have been set to zero.  
-These four fields are used by the library
-to inform the caller of the total amount of data passed into and out of
-the library, respectively.  You should not try to change them.
-As of version 1.0, 64-bit counts are maintained, even on 32-bit
-platforms, using the @code{_hi32} fields to store the upper 32 bits
-of the count.  So, for example, the total amount of data in
-is @code{(total_in_hi32 << 32) + total_in_lo32}.
-
-Parameter @code{blockSize100k} specifies the block size to be used for
-compression.  It should be a value between 1 and 9 inclusive, and the
-actual block size used is 100000 x this figure.  9 gives the best
-compression but takes most memory.
-
-Parameter @code{verbosity} should be set to a number between 0 and 4
-inclusive.  0 is silent, and greater numbers give increasingly verbose
-monitoring/debugging output.  If the library has been compiled with
-@code{-DBZ_NO_STDIO}, no such output will appear for any verbosity
-setting.
-
-Parameter @code{workFactor} controls how the compression phase behaves
-when presented with worst case, highly repetitive, input data.  If
-compression runs into difficulties caused by repetitive data, the
-library switches from the standard sorting algorithm to a fallback
-algorithm.  The fallback is slower than the standard algorithm by
-perhaps a factor of three, but always behaves reasonably, no matter how
-bad the input.
-
-Lower values of @code{workFactor} reduce the amount of effort the
-standard algorithm will expend before resorting to the fallback.  You
-should set this parameter carefully; too low, and many inputs will be
-handled by the fallback algorithm and so compress rather slowly, too
-high, and your average-to-worst case compression times can become very
-large.  The default value of 30 gives reasonable behaviour over a wide
-range of circumstances.
-
-Allowable values range from 0 to 250 inclusive.  0 is a special case,
-equivalent to using the default value of 30.
-
-Note that the compressed output generated is the same regardless of
-whether or not the fallback algorithm is used.
-
-Be aware also that this parameter may disappear entirely in future
-versions of the library.  In principle it should be possible to devise a
-good way to automatically choose which algorithm to use.  Such a
-mechanism would render the parameter obsolete.
-
-Possible return values:
-@display
-      @code{BZ_CONFIG_ERROR}
-         if the library has been mis-compiled
-      @code{BZ_PARAM_ERROR} 
-         if @code{strm} is @code{NULL} 
-         or @code{blockSize} < 1 or @code{blockSize} > 9
-         or @code{verbosity} < 0 or @code{verbosity} > 4
-         or @code{workFactor} < 0 or @code{workFactor} > 250
-      @code{BZ_MEM_ERROR} 
-         if not enough memory is available
-      @code{BZ_OK} 
-         otherwise
-@end display
-Allowable next actions:
-@display
-      @code{BZ2_bzCompress} 
-         if @code{BZ_OK} is returned
-      no specific action needed in case of error
-@end display
-
-@subsection @code{BZ2_bzCompress}
-@example
-   int BZ2_bzCompress ( bz_stream *strm, int action );
-@end example
-Provides more input and/or output buffer space for the library.  The
-caller maintains input and output buffers, and calls @code{BZ2_bzCompress} to
-transfer data between them.
-
-Before each call to @code{BZ2_bzCompress}, @code{next_in} should point at
-the data to be compressed, and @code{avail_in} should indicate how many
-bytes the library may read.  @code{BZ2_bzCompress} updates @code{next_in},
-@code{avail_in} and @code{total_in} to reflect the number of bytes it
-has read.
-
-Similarly, @code{next_out} should point to a buffer in which the
-compressed data is to be placed, with @code{avail_out} indicating how
-much output space is available.  @code{BZ2_bzCompress} updates
-@code{next_out}, @code{avail_out} and @code{total_out} to reflect the
-number of bytes output.
-
-You may provide and remove as little or as much data as you like on each
-call of @code{BZ2_bzCompress}.  In the limit, it is acceptable to supply and
-remove data one byte at a time, although this would be terribly
-inefficient.  You should always ensure that at least one byte of output
-space is available at each call.
-
-A second purpose of @code{BZ2_bzCompress} is to request a change of mode of the
-compressed stream.  
-
-Conceptually, a compressed stream can be in one of four states: IDLE,
-RUNNING, FLUSHING and FINISHING.  Before initialisation
-(@code{BZ2_bzCompressInit}) and after termination (@code{BZ2_bzCompressEnd}), a
-stream is regarded as IDLE.
-
-Upon initialisation (@code{BZ2_bzCompressInit}), the stream is placed in the
-RUNNING state.  Subsequent calls to @code{BZ2_bzCompress} should pass
-@code{BZ_RUN} as the requested action; other actions are illegal and
-will result in @code{BZ_SEQUENCE_ERROR}.
-
-At some point, the calling program will have provided all the input data
-it wants to.  It will then want to finish up -- in effect, asking the
-library to process any data it might have buffered internally.  In this
-state, @code{BZ2_bzCompress} will no longer attempt to read data from
-@code{next_in}, but it will want to write data to @code{next_out}.
-Because the output buffer supplied by the user can be arbitrarily small,
-the finishing-up operation cannot necessarily be done with a single call
-of @code{BZ2_bzCompress}.
-
-Instead, the calling program passes @code{BZ_FINISH} as an action to
-@code{BZ2_bzCompress}.  This changes the stream's state to FINISHING.  Any
-remaining input (ie, @code{next_in[0 .. avail_in-1]}) is compressed and
-transferred to the output buffer.  To do this, @code{BZ2_bzCompress} must be
-called repeatedly until all the output has been consumed.  At that
-point, @code{BZ2_bzCompress} returns @code{BZ_STREAM_END}, and the stream's
-state is set back to IDLE.  @code{BZ2_bzCompressEnd} should then be
-called.
-
-Just to make sure the calling program does not cheat, the library makes
-a note of @code{avail_in} at the time of the first call to
-@code{BZ2_bzCompress} which has @code{BZ_FINISH} as an action (ie, at the
-time the program has announced its intention to not supply any more
-input).  By comparing this value with that of @code{avail_in} over
-subsequent calls to @code{BZ2_bzCompress}, the library can detect any
-attempts to slip in more data to compress.  Any calls for which this is
-detected will return @code{BZ_SEQUENCE_ERROR}.  This indicates a
-programming mistake which should be corrected.
-
-Instead of asking to finish, the calling program may ask
-@code{BZ2_bzCompress} to take all the remaining input, compress it and
-terminate the current (Burrows-Wheeler) compression block.  This could
-be useful for error control purposes.  The mechanism is analogous to
-that for finishing: call @code{BZ2_bzCompress} with an action of
-@code{BZ_FLUSH}, remove output data, and persist with the
-@code{BZ_FLUSH} action until the value @code{BZ_RUN} is returned.  As
-with finishing, @code{BZ2_bzCompress} detects any attempt to provide more
-input data once the flush has begun.
-
-Once the flush is complete, the stream returns to the normal RUNNING
-state.
-
-This all sounds pretty complex, but isn't really.  Here's a table
-which shows which actions are allowable in each state, what action
-will be taken, what the next state is, and what the non-error return
-values are.  Note that you can't explicitly ask what state the
-stream is in, but nor do you need to -- it can be inferred from the
-values returned by @code{BZ2_bzCompress}.
-@display
-IDLE/@code{any}           
-      Illegal.  IDLE state only exists after @code{BZ2_bzCompressEnd} or
-      before @code{BZ2_bzCompressInit}.
-      Return value = @code{BZ_SEQUENCE_ERROR}
-
-RUNNING/@code{BZ_RUN}     
-      Compress from @code{next_in} to @code{next_out} as much as possible.
-      Next state = RUNNING
-      Return value = @code{BZ_RUN_OK}
-
-RUNNING/@code{BZ_FLUSH}   
-      Remember current value of @code{next_in}.  Compress from @code{next_in}
-      to @code{next_out} as much as possible, but do not accept any more input.  
-      Next state = FLUSHING
-      Return value = @code{BZ_FLUSH_OK}
-
-RUNNING/@code{BZ_FINISH}  
-      Remember current value of @code{next_in}.  Compress from @code{next_in}
-      to @code{next_out} as much as possible, but do not accept any more input.
-      Next state = FINISHING
-      Return value = @code{BZ_FINISH_OK}
-
-FLUSHING/@code{BZ_FLUSH}  
-      Compress from @code{next_in} to @code{next_out} as much as possible, 
-      but do not accept any more input.  
-      If all the existing input has been used up and all compressed
-      output has been removed
-         Next state = RUNNING; Return value = @code{BZ_RUN_OK}
-      else
-         Next state = FLUSHING; Return value = @code{BZ_FLUSH_OK}
-
-FLUSHING/other     
-      Illegal.
-      Return value = @code{BZ_SEQUENCE_ERROR}
-
-FINISHING/@code{BZ_FINISH}  
-      Compress from @code{next_in} to @code{next_out} as much as possible,
-      but to not accept any more input.  
-      If all the existing input has been used up and all compressed
-      output has been removed
-         Next state = IDLE; Return value = @code{BZ_STREAM_END}
-      else
-         Next state = FINISHING; Return value = @code{BZ_FINISHING}
-
-FINISHING/other
-      Illegal.
-      Return value = @code{BZ_SEQUENCE_ERROR}
-@end display
-
-That still looks complicated?  Well, fair enough.  The usual sequence
-of calls for compressing a load of data is:
-@itemize @bullet
-@item Get started with @code{BZ2_bzCompressInit}.
-@item Shovel data in and shlurp out its compressed form using zero or more
-calls of @code{BZ2_bzCompress} with action = @code{BZ_RUN}.
-@item Finish up.  
-Repeatedly call @code{BZ2_bzCompress} with action = @code{BZ_FINISH}, 
-copying out the compressed output, until @code{BZ_STREAM_END} is returned.
-@item Close up and go home.  Call @code{BZ2_bzCompressEnd}.
-@end itemize
-If the data you want to compress fits into your input buffer all
-at once, you can skip the calls of @code{BZ2_bzCompress ( ..., BZ_RUN )} and 
-just do the @code{BZ2_bzCompress ( ..., BZ_FINISH )} calls.
-
-All required memory is allocated by @code{BZ2_bzCompressInit}.  The
-compression library can accept any data at all (obviously).  So you
-shouldn't get any error return values from the @code{BZ2_bzCompress} calls.
-If you do, they will be @code{BZ_SEQUENCE_ERROR}, and indicate a bug in
-your programming.
-
-Trivial other possible return values:
-@display
-      @code{BZ_PARAM_ERROR}   
-         if @code{strm} is @code{NULL}, or @code{strm->s} is @code{NULL}
-@end display
-
-@subsection @code{BZ2_bzCompressEnd}
-@example
-int BZ2_bzCompressEnd ( bz_stream *strm );
-@end example
-Releases all memory associated with a compression stream.
-
-Possible return values:
-@display
-   @code{BZ_PARAM_ERROR}    if @code{strm} is @code{NULL} or @code{strm->s} is @code{NULL}
-   @code{BZ_OK}    otherwise
-@end display
-
-
-@subsection @code{BZ2_bzDecompressInit}
-@example
-int BZ2_bzDecompressInit ( bz_stream *strm, int verbosity, int small );
-@end example
-Prepares for decompression.  As with @code{BZ2_bzCompressInit}, a
-@code{bz_stream} record should be allocated and initialised before the
-call.  Fields @code{bzalloc}, @code{bzfree} and @code{opaque} should be
-set if a custom memory allocator is required, or made @code{NULL} for
-the normal @code{malloc}/@code{free} routines.  Upon return, the internal
-state will have been initialised, and @code{total_in} and
-@code{total_out} will be zero.
-
-For the meaning of parameter @code{verbosity}, see @code{BZ2_bzCompressInit}.
-
-If @code{small} is nonzero, the library will use an alternative
-decompression algorithm which uses less memory but at the cost of
-decompressing more slowly (roughly speaking, half the speed, but the
-maximum memory requirement drops to around 2300k).  See Chapter 2 for
-more information on memory management.
-
-Note that the amount of memory needed to decompress
-a stream cannot be determined until the stream's header has been read,
-so even if @code{BZ2_bzDecompressInit} succeeds, a subsequent
-@code{BZ2_bzDecompress} could fail with @code{BZ_MEM_ERROR}.
-
-Possible return values:
-@display
-      @code{BZ_CONFIG_ERROR}
-         if the library has been mis-compiled
-      @code{BZ_PARAM_ERROR}
-         if @code{(small != 0 && small != 1)}
-         or @code{(verbosity < 0 || verbosity > 4)}
-      @code{BZ_MEM_ERROR}
-         if insufficient memory is available
-@end display
-
-Allowable next actions:
-@display
-      @code{BZ2_bzDecompress}
-         if @code{BZ_OK} was returned
-      no specific action required in case of error
-@end display
-
- 
-
-@subsection @code{BZ2_bzDecompress}
-@example
-int BZ2_bzDecompress ( bz_stream *strm );
-@end example
-Provides more input and/out output buffer space for the library.  The
-caller maintains input and output buffers, and uses @code{BZ2_bzDecompress}
-to transfer data between them.
-
-Before each call to @code{BZ2_bzDecompress}, @code{next_in} 
-should point at the compressed data,
-and @code{avail_in} should indicate how many bytes the library
-may read.  @code{BZ2_bzDecompress} updates @code{next_in}, @code{avail_in} 
-and @code{total_in}
-to reflect the number of bytes it has read.
-
-Similarly, @code{next_out} should point to a buffer in which the uncompressed
-output is to be placed, with @code{avail_out} indicating how much output space
-is available.  @code{BZ2_bzCompress} updates @code{next_out},
-@code{avail_out} and @code{total_out} to reflect
-the number of bytes output.
-
-You may provide and remove as little or as much data as you like on
-each call of @code{BZ2_bzDecompress}.  
-In the limit, it is acceptable to
-supply and remove data one byte at a time, although this would be
-terribly inefficient.  You should always ensure that at least one
-byte of output space is available at each call.
-
-Use of @code{BZ2_bzDecompress} is simpler than @code{BZ2_bzCompress}.
-
-You should provide input and remove output as described above, and
-repeatedly call @code{BZ2_bzDecompress} until @code{BZ_STREAM_END} is
-returned.  Appearance of @code{BZ_STREAM_END} denotes that
-@code{BZ2_bzDecompress} has detected the logical end of the compressed
-stream.  @code{BZ2_bzDecompress} will not produce @code{BZ_STREAM_END} until
-all output data has been placed into the output buffer, so once
-@code{BZ_STREAM_END} appears, you are guaranteed to have available all
-the decompressed output, and @code{BZ2_bzDecompressEnd} can safely be
-called.
-
-If case of an error return value, you should call @code{BZ2_bzDecompressEnd}
-to clean up and release memory.
-
-Possible return values:
-@display
-      @code{BZ_PARAM_ERROR}
-         if @code{strm} is @code{NULL} or @code{strm->s} is @code{NULL}
-         or @code{strm->avail_out < 1}
-      @code{BZ_DATA_ERROR}
-         if a data integrity error is detected in the compressed stream
-      @code{BZ_DATA_ERROR_MAGIC}
-         if the compressed stream doesn't begin with the right magic bytes
-      @code{BZ_MEM_ERROR}
-         if there wasn't enough memory available
-      @code{BZ_STREAM_END}
-         if the logical end of the data stream was detected and all
-         output in has been consumed, eg @code{s->avail_out > 0}
-      @code{BZ_OK}
-         otherwise
-@end display
-Allowable next actions:
-@display
-      @code{BZ2_bzDecompress}
-         if @code{BZ_OK} was returned
-      @code{BZ2_bzDecompressEnd}
-         otherwise
-@end display
-
-
-@subsection @code{BZ2_bzDecompressEnd}
-@example
-int BZ2_bzDecompressEnd ( bz_stream *strm );
-@end example
-Releases all memory associated with a decompression stream.
-
-Possible return values:
-@display
-      @code{BZ_PARAM_ERROR}
-         if @code{strm} is @code{NULL} or @code{strm->s} is @code{NULL}
-      @code{BZ_OK}
-         otherwise
-@end display
-
-Allowable next actions:
-@display
-      None.
-@end display
-
-
-@section High-level interface
-
-This interface provides functions for reading and writing 
-@code{bzip2} format files.  First, some general points.
-
-@itemize @bullet
-@item All of the functions take an @code{int*} first argument,
-  @code{bzerror}.
-  After each call, @code{bzerror} should be consulted first to determine
-  the outcome of the call.  If @code{bzerror} is @code{BZ_OK}, 
-  the call completed
-  successfully, and only then should the return value of the function
-  (if any) be consulted.  If @code{bzerror} is @code{BZ_IO_ERROR}, 
-  there was an error
-  reading/writing the underlying compressed file, and you should
-  then consult @code{errno}/@code{perror} to determine the 
-  cause of the difficulty.
-  @code{bzerror} may also be set to various other values; precise details are
-  given on a per-function basis below.
-@item If @code{bzerror} indicates an error 
-  (ie, anything except @code{BZ_OK} and @code{BZ_STREAM_END}),
-  you should immediately call @code{BZ2_bzReadClose} (or @code{BZ2_bzWriteClose},
-  depending on whether you are attempting to read or to write)
-  to free up all resources associated
-  with the stream.  Once an error has been indicated, behaviour of all calls
-  except @code{BZ2_bzReadClose} (@code{BZ2_bzWriteClose}) is undefined.  
-  The implication is that (1) @code{bzerror} should
-  be checked after each call, and (2) if @code{bzerror} indicates an error, 
-  @code{BZ2_bzReadClose} (@code{BZ2_bzWriteClose}) should then be called to clean up.
-@item The @code{FILE*} arguments passed to
-   @code{BZ2_bzReadOpen}/@code{BZ2_bzWriteOpen}  
-  should be set to binary mode.
-  Most Unix systems will do this by default, but other platforms,
-  including Windows and Mac, will not.  If you omit this, you may
-  encounter problems when moving code to new platforms.
-@item Memory allocation requests are handled by
-  @code{malloc}/@code{free}.  
-  At present
-  there is no facility for user-defined memory allocators in the file I/O
-  functions (could easily be added, though).
-@end itemize
-
-
-
-@subsection @code{BZ2_bzReadOpen}
-@example
-   typedef void BZFILE;
-
-   BZFILE *BZ2_bzReadOpen ( int *bzerror, FILE *f, 
-                            int small, int verbosity,
-                            void *unused, int nUnused );
-@end example
-Prepare to read compressed data from file handle @code{f}.  @code{f}
-should refer to a file which has been opened for reading, and for which
-the error indicator (@code{ferror(f)})is not set.  If @code{small} is 1,
-the library will try to decompress using less memory, at the expense of
-speed.
-
-For reasons explained below, @code{BZ2_bzRead} will decompress the
-@code{nUnused} bytes starting at @code{unused}, before starting to read
-from the file @code{f}.  At most @code{BZ_MAX_UNUSED} bytes may be
-supplied like this.  If this facility is not required, you should pass
-@code{NULL} and @code{0} for @code{unused} and n@code{Unused}
-respectively.
-
-For the meaning of parameters @code{small} and @code{verbosity},
-see @code{BZ2_bzDecompressInit}.
-
-The amount of memory needed to decompress a file cannot be determined
-until the file's header has been read.  So it is possible that
-@code{BZ2_bzReadOpen} returns @code{BZ_OK} but a subsequent call of
-@code{BZ2_bzRead} will return @code{BZ_MEM_ERROR}.
-
-Possible assignments to @code{bzerror}:
-@display
-      @code{BZ_CONFIG_ERROR}
-         if the library has been mis-compiled
-      @code{BZ_PARAM_ERROR}
-         if @code{f} is @code{NULL} 
-         or @code{small} is neither @code{0} nor @code{1}                 
-         or @code{(unused == NULL && nUnused != 0)}
-         or @code{(unused != NULL && !(0 <= nUnused <= BZ_MAX_UNUSED))}
-      @code{BZ_IO_ERROR}    
-         if @code{ferror(f)} is nonzero
-      @code{BZ_MEM_ERROR}   
-         if insufficient memory is available
-      @code{BZ_OK}
-         otherwise.
-@end display
-
-Possible return values:
-@display
-      Pointer to an abstract @code{BZFILE}        
-         if @code{bzerror} is @code{BZ_OK}   
-      @code{NULL}
-         otherwise
-@end display
-
-Allowable next actions:
-@display
-      @code{BZ2_bzRead}
-         if @code{bzerror} is @code{BZ_OK}   
-      @code{BZ2_bzClose} 
-         otherwise
-@end display
-
-
-@subsection @code{BZ2_bzRead}
-@example
-   int BZ2_bzRead ( int *bzerror, BZFILE *b, void *buf, int len );
-@end example
-Reads up to @code{len} (uncompressed) bytes from the compressed file 
-@code{b} into
-the buffer @code{buf}.  If the read was successful, 
-@code{bzerror} is set to @code{BZ_OK}
-and the number of bytes read is returned.  If the logical end-of-stream
-was detected, @code{bzerror} will be set to @code{BZ_STREAM_END}, 
-and the number
-of bytes read is returned.  All other @code{bzerror} values denote an error.
-
-@code{BZ2_bzRead} will supply @code{len} bytes,
-unless the logical stream end is detected
-or an error occurs.  Because of this, it is possible to detect the 
-stream end by observing when the number of bytes returned is 
-less than the number
-requested.  Nevertheless, this is regarded as inadvisable; you should
-instead check @code{bzerror} after every call and watch out for
-@code{BZ_STREAM_END}.
-
-Internally, @code{BZ2_bzRead} copies data from the compressed file in chunks
-of size @code{BZ_MAX_UNUSED} bytes
-before decompressing it.  If the file contains more bytes than strictly
-needed to reach the logical end-of-stream, @code{BZ2_bzRead} will almost certainly
-read some of the trailing data before signalling @code{BZ_SEQUENCE_END}.
-To collect the read but unused data once @code{BZ_SEQUENCE_END} has 
-appeared, call @code{BZ2_bzReadGetUnused} immediately before @code{BZ2_bzReadClose}.
-
-Possible assignments to @code{bzerror}:
-@display
-      @code{BZ_PARAM_ERROR}
-         if @code{b} is @code{NULL} or @code{buf} is @code{NULL} or @code{len < 0}
-      @code{BZ_SEQUENCE_ERROR} 
-         if @code{b} was opened with @code{BZ2_bzWriteOpen}
-      @code{BZ_IO_ERROR} 
-         if there is an error reading from the compressed file
-      @code{BZ_UNEXPECTED_EOF} 
-         if the compressed file ended before the logical end-of-stream was detected
-      @code{BZ_DATA_ERROR} 
-         if a data integrity error was detected in the compressed stream
-      @code{BZ_DATA_ERROR_MAGIC}
-         if the stream does not begin with the requisite header bytes (ie, is not 
-         a @code{bzip2} data file).  This is really a special case of @code{BZ_DATA_ERROR}.
-      @code{BZ_MEM_ERROR} 
-         if insufficient memory was available
-      @code{BZ_STREAM_END} 
-         if the logical end of stream was detected.
-      @code{BZ_OK}
-         otherwise.
-@end display
-
-Possible return values:
-@display
-      number of bytes read
-         if @code{bzerror} is @code{BZ_OK} or @code{BZ_STREAM_END}
-      undefined
-         otherwise
-@end display
-
-Allowable next actions:
-@display
-      collect data from @code{buf}, then @code{BZ2_bzRead} or @code{BZ2_bzReadClose}
-         if @code{bzerror} is @code{BZ_OK} 
-      collect data from @code{buf}, then @code{BZ2_bzReadClose} or @code{BZ2_bzReadGetUnused} 
-         if @code{bzerror} is @code{BZ_SEQUENCE_END}   
-      @code{BZ2_bzReadClose} 
-         otherwise
-@end display
-
-
-
-@subsection @code{BZ2_bzReadGetUnused}
-@example
-   void BZ2_bzReadGetUnused ( int* bzerror, BZFILE *b, 
-                              void** unused, int* nUnused );
-@end example
-Returns data which was read from the compressed file but was not needed
-to get to the logical end-of-stream.  @code{*unused} is set to the address
-of the data, and @code{*nUnused} to the number of bytes.  @code{*nUnused} will
-be set to a value between @code{0} and @code{BZ_MAX_UNUSED} inclusive.
-
-This function may only be called once @code{BZ2_bzRead} has signalled 
-@code{BZ_STREAM_END} but before @code{BZ2_bzReadClose}.
-
-Possible assignments to @code{bzerror}:
-@display
-      @code{BZ_PARAM_ERROR} 
-         if @code{b} is @code{NULL} 
-         or @code{unused} is @code{NULL} or @code{nUnused} is @code{NULL}
-      @code{BZ_SEQUENCE_ERROR} 
-         if @code{BZ_STREAM_END} has not been signalled
-         or if @code{b} was opened with @code{BZ2_bzWriteOpen}
-     @code{BZ_OK}
-         otherwise
-@end display
-
-Allowable next actions:
-@display 
-      @code{BZ2_bzReadClose}
-@end display
-
-
-@subsection @code{BZ2_bzReadClose}
-@example
-   void BZ2_bzReadClose ( int *bzerror, BZFILE *b );
-@end example
-Releases all memory pertaining to the compressed file @code{b}.  
-@code{BZ2_bzReadClose} does not call @code{fclose} on the underlying file
-handle, so you should do that yourself if appropriate.
-@code{BZ2_bzReadClose} should be called to clean up after all error
-situations.
-
-Possible assignments to @code{bzerror}:
-@display
-      @code{BZ_SEQUENCE_ERROR} 
-         if @code{b} was opened with @code{BZ2_bzOpenWrite} 
-      @code{BZ_OK} 
-         otherwise
-@end display
-
-Allowable next actions:
-@display
-      none
-@end display
-
-
-
-@subsection @code{BZ2_bzWriteOpen}
-@example
-   BZFILE *BZ2_bzWriteOpen ( int *bzerror, FILE *f, 
-                             int blockSize100k, int verbosity,
-                             int workFactor );
-@end example
-Prepare to write compressed data to file handle @code{f}.  
-@code{f} should refer to
-a file which has been opened for writing, and for which the error
-indicator (@code{ferror(f)})is not set.  
-
-For the meaning of parameters @code{blockSize100k},
-@code{verbosity} and @code{workFactor}, see
-@* @code{BZ2_bzCompressInit}.
-
-All required memory is allocated at this stage, so if the call
-completes successfully, @code{BZ_MEM_ERROR} cannot be signalled by a
-subsequent call to @code{BZ2_bzWrite}.
-
-Possible assignments to @code{bzerror}:
-@display 
-      @code{BZ_CONFIG_ERROR}
-         if the library has been mis-compiled
-      @code{BZ_PARAM_ERROR} 
-         if @code{f} is @code{NULL} 
-         or @code{blockSize100k < 1} or @code{blockSize100k > 9}
-      @code{BZ_IO_ERROR} 
-         if @code{ferror(f)} is nonzero
-      @code{BZ_MEM_ERROR} 
-         if insufficient memory is available
-      @code{BZ_OK} 
-         otherwise
-@end display
-
-Possible return values:
-@display
-      Pointer to an abstract @code{BZFILE}  
-         if @code{bzerror} is @code{BZ_OK}   
-      @code{NULL} 
-         otherwise
-@end display
-
-Allowable next actions:
-@display
-      @code{BZ2_bzWrite} 
-         if @code{bzerror} is @code{BZ_OK} 
-         (you could go directly to @code{BZ2_bzWriteClose}, but this would be pretty pointless)
-      @code{BZ2_bzWriteClose} 
-         otherwise
-@end display
-
-
-
-@subsection @code{BZ2_bzWrite}
-@example
-   void BZ2_bzWrite ( int *bzerror, BZFILE *b, void *buf, int len );
-@end example
-Absorbs @code{len} bytes from the buffer @code{buf}, eventually to be
-compressed and written to the file.
-
-Possible assignments to @code{bzerror}:
-@display
-      @code{BZ_PARAM_ERROR} 
-         if @code{b} is @code{NULL} or @code{buf} is @code{NULL} or @code{len < 0}
-      @code{BZ_SEQUENCE_ERROR} 
-         if b was opened with @code{BZ2_bzReadOpen}
-      @code{BZ_IO_ERROR} 
-         if there is an error writing the compressed file.
-      @code{BZ_OK} 
-         otherwise
-@end display
-
-
-
-
-@subsection @code{BZ2_bzWriteClose}
-@example
-   void BZ2_bzWriteClose ( int *bzerror, BZFILE* f,
-                           int abandon,
-                           unsigned int* nbytes_in,
-                           unsigned int* nbytes_out );
-
-   void BZ2_bzWriteClose64 ( int *bzerror, BZFILE* f,
-                             int abandon,
-                             unsigned int* nbytes_in_lo32,
-                             unsigned int* nbytes_in_hi32,
-                             unsigned int* nbytes_out_lo32,
-                             unsigned int* nbytes_out_hi32 );
-@end example
-
-Compresses and flushes to the compressed file all data so far supplied
-by @code{BZ2_bzWrite}.  The logical end-of-stream markers are also written, so
-subsequent calls to @code{BZ2_bzWrite} are illegal.  All memory associated 
-with the compressed file @code{b} is released.  
-@code{fflush} is called on the
-compressed file, but it is not @code{fclose}'d.
-
-If @code{BZ2_bzWriteClose} is called to clean up after an error, the only
-action is to release the memory.  The library records the error codes
-issued by previous calls, so this situation will be detected
-automatically.  There is no attempt to complete the compression
-operation, nor to @code{fflush} the compressed file.  You can force this
-behaviour to happen even in the case of no error, by passing a nonzero
-value to @code{abandon}.
-
-If @code{nbytes_in} is non-null, @code{*nbytes_in} will be set to be the
-total volume of uncompressed data handled.  Similarly, @code{nbytes_out}
-will be set to the total volume of compressed data written.  For 
-compatibility with older versions of the library, @code{BZ2_bzWriteClose}
-only yields the lower 32 bits of these counts.  Use
-@code{BZ2_bzWriteClose64} if you want the full 64 bit counts.  These
-two functions are otherwise absolutely identical.
-
-
-Possible assignments to @code{bzerror}:
-@display
-      @code{BZ_SEQUENCE_ERROR} 
-         if @code{b} was opened with @code{BZ2_bzReadOpen}
-      @code{BZ_IO_ERROR} 
-         if there is an error writing the compressed file
-      @code{BZ_OK} 
-         otherwise
-@end display
-
-@subsection Handling embedded compressed data streams
-
-The high-level library facilitates use of
-@code{bzip2} data streams which form some part of a surrounding, larger
-data stream.
-@itemize @bullet
-@item For writing, the library takes an open file handle, writes
-compressed data to it, @code{fflush}es it but does not @code{fclose} it.
-The calling application can write its own data before and after the
-compressed data stream, using that same file handle.
-@item Reading is more complex, and the facilities are not as general
-as they could be since generality is hard to reconcile with efficiency.
-@code{BZ2_bzRead} reads from the compressed file in blocks of size
-@code{BZ_MAX_UNUSED} bytes, and in doing so probably will overshoot
-the logical end of compressed stream.
-To recover this data once decompression has
-ended, call @code{BZ2_bzReadGetUnused} after the last call of @code{BZ2_bzRead}
-(the one returning @code{BZ_STREAM_END}) but before calling
-@code{BZ2_bzReadClose}.
-@end itemize
-
-This mechanism makes it easy to decompress multiple @code{bzip2}
-streams placed end-to-end.  As the end of one stream, when @code{BZ2_bzRead}
-returns @code{BZ_STREAM_END}, call @code{BZ2_bzReadGetUnused} to collect the
-unused data (copy it into your own buffer somewhere).  
-That data forms the start of the next compressed stream.
-To start uncompressing that next stream, call @code{BZ2_bzReadOpen} again,
-feeding in the unused data via the @code{unused}/@code{nUnused}
-parameters.
-Keep doing this until @code{BZ_STREAM_END} return coincides with the
-physical end of file (@code{feof(f)}).  In this situation
-@code{BZ2_bzReadGetUnused}
-will of course return no data.
-
-This should give some feel for how the high-level interface can be used.
-If you require extra flexibility, you'll have to bite the bullet and get
-to grips with the low-level interface.
-
-@subsection Standard file-reading/writing code
-Here's how you'd write data to a compressed file:
-@example @code
-FILE*   f;
-BZFILE* b;
-int     nBuf;
-char    buf[ /* whatever size you like */ ];
-int     bzerror;
-int     nWritten;
-
-f = fopen ( "myfile.bz2", "w" );
-if (!f) @{
-   /* handle error */
-@}
-b = BZ2_bzWriteOpen ( &bzerror, f, 9 );
-if (bzerror != BZ_OK) @{
-   BZ2_bzWriteClose ( b );
-   /* handle error */
-@}
-
-while ( /* condition */ ) @{
-   /* get data to write into buf, and set nBuf appropriately */
-   nWritten = BZ2_bzWrite ( &bzerror, b, buf, nBuf );
-   if (bzerror == BZ_IO_ERROR) @{ 
-      BZ2_bzWriteClose ( &bzerror, b );
-      /* handle error */
-   @}
-@}
-
-BZ2_bzWriteClose ( &bzerror, b );
-if (bzerror == BZ_IO_ERROR) @{
-   /* handle error */
-@}
-@end example
-And to read from a compressed file:
-@example
-FILE*   f;
-BZFILE* b;
-int     nBuf;
-char    buf[ /* whatever size you like */ ];
-int     bzerror;
-int     nWritten;
-
-f = fopen ( "myfile.bz2", "r" );
-if (!f) @{
-   /* handle error */
-@}
-b = BZ2_bzReadOpen ( &bzerror, f, 0, NULL, 0 );
-if (bzerror != BZ_OK) @{
-   BZ2_bzReadClose ( &bzerror, b );
-   /* handle error */
-@}
-
-bzerror = BZ_OK;
-while (bzerror == BZ_OK && /* arbitrary other conditions */) @{
-   nBuf = BZ2_bzRead ( &bzerror, b, buf, /* size of buf */ );
-   if (bzerror == BZ_OK) @{
-      /* do something with buf[0 .. nBuf-1] */
-   @}
-@}
-if (bzerror != BZ_STREAM_END) @{
-   BZ2_bzReadClose ( &bzerror, b );
-   /* handle error */
-@} else @{
-   BZ2_bzReadClose ( &bzerror );
-@}
-@end example
-
-
-
-@section Utility functions
-@subsection @code{BZ2_bzBuffToBuffCompress}
-@example
-   int BZ2_bzBuffToBuffCompress( char*         dest,
-                                 unsigned int* destLen,
-                                 char*         source,
-                                 unsigned int  sourceLen,
-                                 int           blockSize100k,
-                                 int           verbosity,
-                                 int           workFactor );
-@end example
-Attempts to compress the data in @code{source[0 .. sourceLen-1]}
-into the destination buffer, @code{dest[0 .. *destLen-1]}.
-If the destination buffer is big enough, @code{*destLen} is
-set to the size of the compressed data, and @code{BZ_OK} is
-returned.  If the compressed data won't fit, @code{*destLen}
-is unchanged, and @code{BZ_OUTBUFF_FULL} is returned.
-
-Compression in this manner is a one-shot event, done with a single call
-to this function.  The resulting compressed data is a complete
-@code{bzip2} format data stream.  There is no mechanism for making
-additional calls to provide extra input data.  If you want that kind of
-mechanism, use the low-level interface.
-
-For the meaning of parameters @code{blockSize100k}, @code{verbosity}
-and @code{workFactor}, @* see @code{BZ2_bzCompressInit}.
-
-To guarantee that the compressed data will fit in its buffer, allocate
-an output buffer of size 1% larger than the uncompressed data, plus
-six hundred extra bytes.
-
-@code{BZ2_bzBuffToBuffDecompress} will not write data at or
-beyond @code{dest[*destLen]}, even in case of buffer overflow.
-
-Possible return values:
-@display
-      @code{BZ_CONFIG_ERROR}
-         if the library has been mis-compiled
-      @code{BZ_PARAM_ERROR} 
-         if @code{dest} is @code{NULL} or @code{destLen} is @code{NULL}
-         or @code{blockSize100k < 1} or @code{blockSize100k > 9}
-         or @code{verbosity < 0} or @code{verbosity > 4} 
-         or @code{workFactor < 0} or @code{workFactor > 250}
-      @code{BZ_MEM_ERROR}
-         if insufficient memory is available 
-      @code{BZ_OUTBUFF_FULL}
-         if the size of the compressed data exceeds @code{*destLen}
-      @code{BZ_OK} 
-         otherwise
-@end display
-
-
-
-@subsection @code{BZ2_bzBuffToBuffDecompress}
-@example
-   int BZ2_bzBuffToBuffDecompress ( char*         dest,
-                                    unsigned int* destLen,
-                                    char*         source,
-                                    unsigned int  sourceLen,
-                                    int           small,
-                                    int           verbosity );
-@end example
-Attempts to decompress the data in @code{source[0 .. sourceLen-1]}
-into the destination buffer, @code{dest[0 .. *destLen-1]}.
-If the destination buffer is big enough, @code{*destLen} is
-set to the size of the uncompressed data, and @code{BZ_OK} is
-returned.  If the compressed data won't fit, @code{*destLen}
-is unchanged, and @code{BZ_OUTBUFF_FULL} is returned.
-
-@code{source} is assumed to hold a complete @code{bzip2} format
-data stream.  @* @code{BZ2_bzBuffToBuffDecompress} tries to decompress
-the entirety of the stream into the output buffer.
-
-For the meaning of parameters @code{small} and @code{verbosity},
-see @code{BZ2_bzDecompressInit}.
-
-Because the compression ratio of the compressed data cannot be known in
-advance, there is no easy way to guarantee that the output buffer will
-be big enough.  You may of course make arrangements in your code to
-record the size of the uncompressed data, but such a mechanism is beyond
-the scope of this library.
-
-@code{BZ2_bzBuffToBuffDecompress} will not write data at or
-beyond @code{dest[*destLen]}, even in case of buffer overflow.
-
-Possible return values:
-@display
-      @code{BZ_CONFIG_ERROR}
-         if the library has been mis-compiled
-      @code{BZ_PARAM_ERROR} 
-         if @code{dest} is @code{NULL} or @code{destLen} is @code{NULL}
-         or @code{small != 0 && small != 1}
-         or @code{verbosity < 0} or @code{verbosity > 4} 
-      @code{BZ_MEM_ERROR}
-         if insufficient memory is available 
-      @code{BZ_OUTBUFF_FULL}
-         if the size of the compressed data exceeds @code{*destLen}
-      @code{BZ_DATA_ERROR}
-         if a data integrity error was detected in the compressed data
-      @code{BZ_DATA_ERROR_MAGIC}
-         if the compressed data doesn't begin with the right magic bytes
-      @code{BZ_UNEXPECTED_EOF}
-         if the compressed data ends unexpectedly
-      @code{BZ_OK} 
-         otherwise
-@end display
-
-
-
-@section @code{zlib} compatibility functions
-Yoshioka Tsuneo has contributed some functions to
-give better @code{zlib} compatibility.  These functions are
-@code{BZ2_bzopen}, @code{BZ2_bzread}, @code{BZ2_bzwrite}, @code{BZ2_bzflush},
-@code{BZ2_bzclose},
-@code{BZ2_bzerror} and @code{BZ2_bzlibVersion}.
-These functions are not (yet) officially part of
-the library.  If they break, you get to keep all the pieces.
-Nevertheless, I think they work ok.
-@example
-typedef void BZFILE;
-
-const char * BZ2_bzlibVersion ( void );
-@end example
-Returns a string indicating the library version.
-@example
-BZFILE * BZ2_bzopen  ( const char *path, const char *mode );
-BZFILE * BZ2_bzdopen ( int        fd,    const char *mode );
-@end example
-Opens a @code{.bz2} file for reading or writing, using either its name
-or a pre-existing file descriptor. 
-Analogous to @code{fopen} and @code{fdopen}.
-@example         
-int BZ2_bzread  ( BZFILE* b, void* buf, int len );
-int BZ2_bzwrite ( BZFILE* b, void* buf, int len );
-@end example
-Reads/writes data from/to a previously opened @code{BZFILE}.
-Analogous to @code{fread} and @code{fwrite}.
-@example
-int  BZ2_bzflush ( BZFILE* b );
-void BZ2_bzclose ( BZFILE* b );
-@end example
-Flushes/closes a @code{BZFILE}.  @code{BZ2_bzflush} doesn't actually do
-anything.  Analogous to @code{fflush} and @code{fclose}.
-
-@example 
-const char * BZ2_bzerror ( BZFILE *b, int *errnum )
-@end example
-Returns a string describing the more recent error status of
-@code{b}, and also sets @code{*errnum} to its numerical value.
-
-
-@section Using the library in a @code{stdio}-free environment
-
-@subsection Getting rid of @code{stdio}
-
-In a deeply embedded application, you might want to use just
-the memory-to-memory functions.  You can do this conveniently
-by compiling the library with preprocessor symbol @code{BZ_NO_STDIO}
-defined.  Doing this gives you a library containing only the following
-eight functions:
-
-@code{BZ2_bzCompressInit}, @code{BZ2_bzCompress}, @code{BZ2_bzCompressEnd} @*
-@code{BZ2_bzDecompressInit}, @code{BZ2_bzDecompress}, @code{BZ2_bzDecompressEnd} @*
-@code{BZ2_bzBuffToBuffCompress}, @code{BZ2_bzBuffToBuffDecompress}
-
-When compiled like this, all functions will ignore @code{verbosity}
-settings.
-
-@subsection Critical error handling
-@code{libbzip2} contains a number of internal assertion checks which
-should, needless to say, never be activated.  Nevertheless, if an
-assertion should fail, behaviour depends on whether or not the library
-was compiled with @code{BZ_NO_STDIO} set.
-
-For a normal compile, an assertion failure yields the message
-@example
-   bzip2/libbzip2: internal error number N.
-   This is a bug in bzip2/libbzip2, 1.0 of 21-Mar-2000.
-   Please report it to me at: jseward@@acm.org.  If this happened
-   when you were using some program which uses libbzip2 as a
-   component, you should also report this bug to the author(s)
-   of that program.  Please make an effort to report this bug;
-   timely and accurate bug reports eventually lead to higher
-   quality software.  Thanks.  Julian Seward, 21 March 2000.
-@end example
-where @code{N} is some error code number.  @code{exit(3)}
-is then called.
-
-For a @code{stdio}-free library, assertion failures result
-in a call to a function declared as:
-@example
-   extern void bz_internal_error ( int errcode );
-@end example
-The relevant code is passed as a parameter.  You should supply
-such a function.
-
-In either case, once an assertion failure has occurred, any 
-@code{bz_stream} records involved can be regarded as invalid.
-You should not attempt to resume normal operation with them.
-
-You may, of course, change critical error handling to suit
-your needs.  As I said above, critical errors indicate bugs
-in the library and should not occur.  All "normal" error
-situations are indicated via error return codes from functions,
-and can be recovered from.
-
-
-@section Making a Windows DLL
-Everything related to Windows has been contributed by Yoshioka Tsuneo
-@* (@code{QWF00133@@niftyserve.or.jp} /
-@code{tsuneo-y@@is.aist-nara.ac.jp}), so you should send your queries to
-him (but perhaps Cc: me, @code{jseward@@acm.org}).
-
-My vague understanding of what to do is: using Visual C++ 5.0,
-open the project file @code{libbz2.dsp}, and build.  That's all.
-
-If you can't
-open the project file for some reason, make a new one, naming these files:
-@code{blocksort.c}, @code{bzlib.c}, @code{compress.c}, 
-@code{crctable.c}, @code{decompress.c}, @code{huffman.c}, @*
-@code{randtable.c} and @code{libbz2.def}.  You will also need
-to name the header files @code{bzlib.h} and @code{bzlib_private.h}.
-
-If you don't use VC++, you may need to define the proprocessor symbol
-@code{_WIN32}. 
-
-Finally, @code{dlltest.c} is a sample program using the DLL.  It has a
-project file, @code{dlltest.dsp}.
-
-If you just want a makefile for Visual C, have a look at
-@code{makefile.msc}.
-
-Be aware that if you compile @code{bzip2} itself on Win32, you must set
-@code{BZ_UNIX} to 0 and @code{BZ_LCCWIN32} to 1, in the file
-@code{bzip2.c}, before compiling.  Otherwise the resulting binary won't
-work correctly.
-
-I haven't tried any of this stuff myself, but it all looks plausible.
-
-
-
-@chapter Miscellanea
-
-These are just some random thoughts of mine.  Your mileage may
-vary.
-
-@section Limitations of the compressed file format
-@code{bzip2-1.0}, @code{0.9.5} and @code{0.9.0}
-use exactly the same file format as the previous
-version, @code{bzip2-0.1}.  This decision was made in the interests of
-stability.  Creating yet another incompatible compressed file format
-would create further confusion and disruption for users.
-
-Nevertheless, this is not a painless decision.  Development
-work since the release of @code{bzip2-0.1} in August 1997
-has shown complexities in the file format which slow down
-decompression and, in retrospect, are unnecessary.  These are:
-@itemize @bullet
-@item The run-length encoder, which is the first of the 
-      compression transformations, is entirely irrelevant.
-      The original purpose was to protect the sorting algorithm
-      from the very worst case input: a string of repeated
-      symbols.  But algorithm steps Q6a and Q6b in the original
-      Burrows-Wheeler technical report (SRC-124) show how
-      repeats can be handled without difficulty in block
-      sorting.
-@item The randomisation mechanism doesn't really need to be
-      there.  Udi Manber and Gene Myers published a suffix
-      array construction algorithm a few years back, which
-      can be employed to sort any block, no matter how 
-      repetitive, in O(N log N) time.  Subsequent work by
-      Kunihiko Sadakane has produced a derivative O(N (log N)^2) 
-      algorithm which usually outperforms the Manber-Myers
-      algorithm.
-
-      I could have changed to Sadakane's algorithm, but I find
-      it to be slower than @code{bzip2}'s existing algorithm for
-      most inputs, and the randomisation mechanism protects
-      adequately against bad cases.  I didn't think it was
-      a good tradeoff to make.  Partly this is due to the fact
-      that I was not flooded with email complaints about
-      @code{bzip2-0.1}'s performance on repetitive data, so
-      perhaps it isn't a problem for real inputs.
-
-      Probably the best long-term solution,
-      and the one I have incorporated into 0.9.5 and above,
-      is to use the existing sorting
-      algorithm initially, and fall back to a O(N (log N)^2)
-      algorithm if the standard algorithm gets into difficulties.
-@item The compressed file format was never designed to be
-      handled by a library, and I have had to jump though
-      some hoops to produce an efficient implementation of
-      decompression.  It's a bit hairy.  Try passing
-      @code{decompress.c} through the C preprocessor 
-      and you'll see what I mean.  Much of this complexity
-      could have been avoided if the compressed size of
-      each block of data was recorded in the data stream.
-@item An Adler-32 checksum, rather than a CRC32 checksum,
-      would be faster to compute.
-@end itemize
-It would be fair to say that the @code{bzip2} format was frozen
-before I properly and fully understood the performance
-consequences of doing so.
-
-Improvements which I was able to incorporate into
-0.9.0, despite using the same file format, are:
-@itemize @bullet
-@item Single array implementation of the inverse BWT.  This
-      significantly speeds up decompression, presumably
-      because it reduces the number of cache misses.
-@item Faster inverse MTF transform for large MTF values.  The
-      new implementation is based on the notion of sliding blocks
-      of values.
-@item @code{bzip2-0.9.0} now reads and writes files with @code{fread}
-      and @code{fwrite}; version 0.1 used @code{putc} and @code{getc}.
-      Duh!  Well, you live and learn.
-
-@end itemize
-Further ahead, it would be nice 
-to be able to do random access into files.  This will 
-require some careful design of compressed file formats.
-
-
-
-@section Portability issues
-After some consideration, I have decided not to use
-GNU @code{autoconf} to configure 0.9.5 or 1.0.
-
-@code{autoconf}, admirable and wonderful though it is, 
-mainly assists with portability problems between Unix-like
-platforms.  But @code{bzip2} doesn't have much in the way
-of portability problems on Unix; most of the difficulties appear
-when porting to the Mac, or to Microsoft's operating systems.
-@code{autoconf} doesn't help in those cases, and brings in a 
-whole load of new complexity.
-
-Most people should be able to compile the library and program
-under Unix straight out-of-the-box, so to speak, especially 
-if you have a version of GNU C available.
-
-There are a couple of @code{__inline__} directives in the code.  GNU C
-(@code{gcc}) should be able to handle them.  If you're not using
-GNU C, your C compiler shouldn't see them at all.
-If your compiler does, for some reason, see them and doesn't
-like them, just @code{#define} @code{__inline__} to be @code{/* */}.  One
-easy way to do this is to compile with the flag @code{-D__inline__=}, 
-which should be understood by most Unix compilers.
-
-If you still have difficulties, try compiling with the macro
-@code{BZ_STRICT_ANSI} defined.  This should enable you to build the
-library in a strictly ANSI compliant environment.  Building the program
-itself like this is dangerous and not supported, since you remove
-@code{bzip2}'s checks against compressing directories, symbolic links,
-devices, and other not-really-a-file entities.  This could cause
-filesystem corruption!
-
-One other thing: if you create a @code{bzip2} binary for public
-distribution, please try and link it statically (@code{gcc -s}).  This
-avoids all sorts of library-version issues that others may encounter
-later on.
-
-If you build @code{bzip2} on Win32, you must set @code{BZ_UNIX} to 0 and
-@code{BZ_LCCWIN32} to 1, in the file @code{bzip2.c}, before compiling.
-Otherwise the resulting binary won't work correctly.
-
-
-
-@section Reporting bugs
-I tried pretty hard to make sure @code{bzip2} is
-bug free, both by design and by testing.  Hopefully
-you'll never need to read this section for real.
-
-Nevertheless, if @code{bzip2} dies with a segmentation
-fault, a bus error or an internal assertion failure, it
-will ask you to email me a bug report.  Experience with
-version 0.1 shows that almost all these problems can
-be traced to either compiler bugs or hardware problems.
-@itemize @bullet
-@item
-Recompile the program with no optimisation, and see if it
-works.  And/or try a different compiler.
-I heard all sorts of stories about various flavours
-of GNU C (and other compilers) generating bad code for
-@code{bzip2}, and I've run across two such examples myself.
-
-2.7.X versions of GNU C are known to generate bad code from
-time to time, at high optimisation levels.  
-If you get problems, try using the flags
-@code{-O2} @code{-fomit-frame-pointer} @code{-fno-strength-reduce}.
-You should specifically @emph{not} use @code{-funroll-loops}.
-
-You may notice that the Makefile runs six tests as part of
-the build process.  If the program passes all of these, it's
-a pretty good (but not 100%) indication that the compiler has
-done its job correctly.
-@item
-If @code{bzip2} crashes randomly, and the crashes are not
-repeatable, you may have a flaky memory subsystem.  @code{bzip2}
-really hammers your memory hierarchy, and if it's a bit marginal,
-you may get these problems.  Ditto if your disk or I/O subsystem
-is slowly failing.  Yup, this really does happen.
-
-Try using a different machine of the same type, and see if
-you can repeat the problem.
-@item This isn't really a bug, but ... If @code{bzip2} tells
-you your file is corrupted on decompression, and you
-obtained the file via FTP, there is a possibility that you
-forgot to tell FTP to do a binary mode transfer.  That absolutely
-will cause the file to be non-decompressible.  You'll have to transfer
-it again.
-@end itemize
-
-If you've incorporated @code{libbzip2} into your own program
-and are getting problems, please, please, please, check that the 
-parameters you are passing in calls to the library, are
-correct, and in accordance with what the documentation says
-is allowable.  I have tried to make the library robust against
-such problems, but I'm sure I haven't succeeded.
-
-Finally, if the above comments don't help, you'll have to send
-me a bug report.  Now, it's just amazing how many people will 
-send me a bug report saying something like
-@display
-   bzip2 crashed with segmentation fault on my machine
-@end display
-and absolutely nothing else.  Needless to say, a such a report
-is @emph{totally, utterly, completely and comprehensively 100% useless; 
-a waste of your time, my time, and net bandwidth}.
-With no details at all, there's no way I can possibly begin
-to figure out what the problem is.
-
-The rules of the game are: facts, facts, facts.  Don't omit
-them because "oh, they won't be relevant".  At the bare 
-minimum:
-@display
-   Machine type.  Operating system version.  
-   Exact version of @code{bzip2} (do @code{bzip2 -V}).  
-   Exact version of the compiler used.  
-   Flags passed to the compiler.
-@end display
-However, the most important single thing that will help me is
-the file that you were trying to compress or decompress at the
-time the problem happened.  Without that, my ability to do anything
-more than speculate about the cause, is limited.
-
-Please remember that I connect to the Internet with a modem, so
-you should contact me before mailing me huge files.
-
-
-@section Did you get the right package?
-
-@code{bzip2} is a resource hog.  It soaks up large amounts of CPU cycles
-and memory.  Also, it gives very large latencies.  In the worst case, you
-can feed many megabytes of uncompressed data into the library before
-getting any compressed output, so this probably rules out applications
-requiring interactive behaviour.
-
-These aren't faults of my implementation, I hope, but more
-an intrinsic property of the Burrows-Wheeler transform (unfortunately).  
-Maybe this isn't what you want.
-
-If you want a compressor and/or library which is faster, uses less
-memory but gets pretty good compression, and has minimal latency,
-consider Jean-loup
-Gailly's and Mark Adler's work, @code{zlib-1.1.2} and
-@code{gzip-1.2.4}.  Look for them at
-
-@code{http://www.cdrom.com/pub/infozip/zlib} and
-@code{http://www.gzip.org} respectively.
-
-For something faster and lighter still, you might try Markus F X J
-Oberhumer's @code{LZO} real-time compression/decompression library, at
-@* @code{http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html}.
-
-If you want to use the @code{bzip2} algorithms to compress small blocks
-of data, 64k bytes or smaller, for example on an on-the-fly disk
-compressor, you'd be well advised not to use this library.  Instead,
-I've made a special library tuned for that kind of use.  It's part of
-@code{e2compr-0.40}, an on-the-fly disk compressor for the Linux
-@code{ext2} filesystem.  Look at
-@code{http://www.netspace.net.au/~reiter/e2compr}.
-
-
-
-@section Testing
-
-A record of the tests I've done.
-
-First, some data sets:
-@itemize @bullet
-@item B: a directory containing 6001 files, one for every length in the
-      range 0 to 6000 bytes.  The files contain random lowercase
-      letters.  18.7 megabytes.
-@item H: my home directory tree.  Documents, source code, mail files,
-      compressed data.  H contains B, and also a directory of 
-      files designed as boundary cases for the sorting; mostly very
-      repetitive, nasty files.  565 megabytes.
-@item A: directory tree holding various applications built from source:
-      @code{egcs}, @code{gcc-2.8.1}, KDE, GTK, Octave, etc.
-      2200 megabytes.
-@end itemize
-The tests conducted are as follows.  Each test means compressing 
-(a copy of) each file in the data set, decompressing it and
-comparing it against the original.
-
-First, a bunch of tests with block sizes and internal buffer
-sizes set very small, 
-to detect any problems with the
-blocking and buffering mechanisms.  
-This required modifying the source code so as to try to 
-break it.
-@enumerate
-@item Data set H, with
-      buffer size of 1 byte, and block size of 23 bytes.
-@item Data set B, buffer sizes 1 byte, block size 1 byte.
-@item As (2) but small-mode decompression.
-@item As (2) with block size 2 bytes.
-@item As (2) with block size 3 bytes.
-@item As (2) with block size 4 bytes.
-@item As (2) with block size 5 bytes.
-@item As (2) with block size 6 bytes and small-mode decompression.
-@item H with buffer size of 1 byte, but normal block
-      size (up to 900000 bytes).
-@end enumerate
-Then some tests with unmodified source code.
-@enumerate
-@item H, all settings normal.
-@item As (1), with small-mode decompress.
-@item H, compress with flag @code{-1}.
-@item H, compress with flag @code{-s}, decompress with flag @code{-s}.
-@item Forwards compatibility: H, @code{bzip2-0.1pl2} compressing,
-      @code{bzip2-0.9.5} decompressing, all settings normal.
-@item Backwards compatibility:  H, @code{bzip2-0.9.5} compressing,
-      @code{bzip2-0.1pl2} decompressing, all settings normal.
-@item Bigger tests: A, all settings normal.
-@item As (7), using the fallback (Sadakane-like) sorting algorithm.
-@item As (8), compress with flag @code{-1}, decompress with flag
-      @code{-s}.
-@item H, using the fallback sorting algorithm.
-@item Forwards compatibility: A, @code{bzip2-0.1pl2} compressing,
-      @code{bzip2-0.9.5} decompressing, all settings normal.
-@item Backwards compatibility:  A, @code{bzip2-0.9.5} compressing,
-      @code{bzip2-0.1pl2} decompressing, all settings normal.
-@item Misc test: about 400 megabytes of @code{.tar} files with
-      @code{bzip2} compiled with Checker (a memory access error
-       detector, like Purify).
-@item Misc tests to make sure it builds and runs ok on non-Linux/x86
-      platforms.
-@end enumerate
-These tests were conducted on a 225 MHz IDT WinChip machine, running
-Linux 2.0.36.  They represent nearly a week of continuous computation.
-All tests completed successfully.
-
-
-@section Further reading
-@code{bzip2} is not research work, in the sense that it doesn't present
-any new ideas.  Rather, it's an engineering exercise based on existing
-ideas.
-
-Four documents describe essentially all the ideas behind @code{bzip2}:
-@example
-Michael Burrows and D. J. Wheeler:
-  "A block-sorting lossless data compression algorithm"
-   10th May 1994. 
-   Digital SRC Research Report 124.
-   ftp://ftp.digital.com/pub/DEC/SRC/research-reports/SRC-124.ps.gz
-   If you have trouble finding it, try searching at the
-   New Zealand Digital Library, http://www.nzdl.org.
-
-Daniel S. Hirschberg and Debra A. LeLewer
-  "Efficient Decoding of Prefix Codes"
-   Communications of the ACM, April 1990, Vol 33, Number 4.
-   You might be able to get an electronic copy of this
-      from the ACM Digital Library.
-
-David J. Wheeler
-   Program bred3.c and accompanying document bred3.ps.
-   This contains the idea behind the multi-table Huffman
-   coding scheme.
-   ftp://ftp.cl.cam.ac.uk/users/djw3/
-
-Jon L. Bentley and Robert Sedgewick
-  "Fast Algorithms for Sorting and Searching Strings"
-   Available from Sedgewick's web page,
-   www.cs.princeton.edu/~rs
-@end example
-The following paper gives valuable additional insights into the
-algorithm, but is not immediately the basis of any code
-used in bzip2.
-@example
-Peter Fenwick:
-   Block Sorting Text Compression
-   Proceedings of the 19th Australasian Computer Science Conference,
-     Melbourne, Australia.  Jan 31 - Feb 2, 1996.
-   ftp://ftp.cs.auckland.ac.nz/pub/peter-f/ACSC96paper.ps
-@end example
-Kunihiko Sadakane's sorting algorithm, mentioned above,
-is available from:
-@example
-http://naomi.is.s.u-tokyo.ac.jp/~sada/papers/Sada98b.ps.gz
-@end example
-The Manber-Myers suffix array construction
-algorithm is described in a paper
-available from:
-@example
-http://www.cs.arizona.edu/people/gene/PAPERS/suffix.ps
-@end example
-Finally, the following paper documents some recent investigations
-I made into the performance of sorting algorithms:
-@example
-Julian Seward:
-   On the Performance of BWT Sorting Algorithms
-   Proceedings of the IEEE Data Compression Conference 2000
-     Snowbird, Utah.  28-30 March 2000.
-@end example
-
-
-@contents
-
-@bye
-
diff --git a/winsup/bz2lib/manual_1.html b/winsup/bz2lib/manual_1.html
deleted file mode 100644
index 92ba7c6df..000000000
--- a/winsup/bz2lib/manual_1.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<HTML>
-<HEAD>
-<!-- This HTML file has been created by texi2html 1.54
-     from manual.texi on 23 March 2000 -->
-
-<TITLE>bzip2 and libbzip2 - Introduction</TITLE>
-<link href="manual_2.html" rel=Next>
-<link href="manual_toc.html" rel=ToC>
-
-</HEAD>
-<BODY>
-<p>Go to the first, previous, <A HREF="manual_2.html">next</A>, <A HREF="manual_4.html">last</A> section, <A HREF="manual_toc.html">table of contents</A>.
-<P><HR><P>
-
-
-<H1><A NAME="SEC1" HREF="manual_toc.html#TOC1">Introduction</A></H1>
-
-<P>
-<CODE>bzip2</CODE>  compresses  files  using the Burrows-Wheeler 
-block-sorting text compression algorithm,  and  Huffman  coding.
-Compression  is  generally  considerably  better than that
-achieved by more conventional LZ77/LZ78-based compressors,
-and  approaches  the performance of the PPM family of statistical compressors.
-
-</P>
-<P>
-<CODE>bzip2</CODE> is built on top of <CODE>libbzip2</CODE>, a flexible library
-for handling compressed data in the <CODE>bzip2</CODE> format.  This manual
-describes both how to use the program and 
-how to work with the library interface.  Most of the
-manual is devoted to this library, not the program, 
-which is good news if your interest is only in the program.
-
-</P>
-<P>
-Chapter 2 describes how to use <CODE>bzip2</CODE>; this is the only part 
-you need to read if you just want to know how to operate the program.
-Chapter 3 describes the programming interfaces in detail, and
-Chapter 4 records some miscellaneous notes which I thought
-ought to be recorded somewhere.
-
-</P>
-
-<P><HR><P>
-<p>Go to the first, previous, <A HREF="manual_2.html">next</A>, <A HREF="manual_4.html">last</A> section, <A HREF="manual_toc.html">table of contents</A>.
-</BODY>
-</HTML>
diff --git a/winsup/bz2lib/manual_2.html b/winsup/bz2lib/manual_2.html
deleted file mode 100644
index 39453c42d..000000000
--- a/winsup/bz2lib/manual_2.html
+++ /dev/null
@@ -1,484 +0,0 @@
-<HTML>
-<HEAD>
-<!-- This HTML file has been created by texi2html 1.54
-     from manual.texi on 23 March 2000 -->
-
-<TITLE>bzip2 and libbzip2 - How to use bzip2</TITLE>
-<link href="manual_3.html" rel=Next>
-<link href="manual_1.html" rel=Previous>
-<link href="manual_toc.html" rel=ToC>
-
-</HEAD>
-<BODY>
-<p>Go to the <A HREF="manual_1.html">first</A>, <A HREF="manual_1.html">previous</A>, <A HREF="manual_3.html">next</A>, <A HREF="manual_4.html">last</A> section, <A HREF="manual_toc.html">table of contents</A>.
-<P><HR><P>
-
-
-<H1><A NAME="SEC2" HREF="manual_toc.html#TOC2">How to use <CODE>bzip2</CODE></A></H1>
-
-<P>
-This chapter contains a copy of the <CODE>bzip2</CODE> man page,
-and nothing else.
-
-</P>
-
-<BLOCKQUOTE>
-
-
-
-<H4><A NAME="SEC3" HREF="manual_toc.html#TOC3">NAME</A></H4>
-
-<UL>
-<LI><CODE>bzip2</CODE>, <CODE>bunzip2</CODE>
-
-- a block-sorting file compressor, v1.0
-<LI><CODE>bzcat</CODE>
-
-- decompresses files to stdout
-<LI><CODE>bzip2recover</CODE>
-
-- recovers data from damaged bzip2 files
-</UL>
-
-
-
-<H4><A NAME="SEC4" HREF="manual_toc.html#TOC4">SYNOPSIS</A></H4>
-
-<UL>
-<LI><CODE>bzip2</CODE> [ -cdfkqstvzVL123456789 ] [ filenames ...  ]
-
-<LI><CODE>bunzip2</CODE> [ -fkvsVL ] [ filenames ...  ]
-
-<LI><CODE>bzcat</CODE> [ -s ] [ filenames ...  ]
-
-<LI><CODE>bzip2recover</CODE> filename
-
-</UL>
-
-
-
-<H4><A NAME="SEC5" HREF="manual_toc.html#TOC5">DESCRIPTION</A></H4>
-
-<P>
-<CODE>bzip2</CODE> compresses files using the Burrows-Wheeler block sorting
-text compression algorithm, and Huffman coding.  Compression is
-generally considerably better than that achieved by more conventional
-LZ77/LZ78-based compressors, and approaches the performance of the PPM
-family of statistical compressors.
-
-</P>
-<P>
-The command-line options are deliberately very similar to those of GNU
-<CODE>gzip</CODE>, but they are not identical.
-
-</P>
-<P>
-<CODE>bzip2</CODE> expects a list of file names to accompany the command-line
-flags.  Each file is replaced by a compressed version of itself, with
-the name <CODE>original_name.bz2</CODE>.  Each compressed file has the same
-modification date, permissions, and, when possible, ownership as the
-corresponding original, so that these properties can be correctly
-restored at decompression time.  File name handling is naive in the
-sense that there is no mechanism for preserving original file names,
-permissions, ownerships or dates in filesystems which lack these
-concepts, or have serious file name length restrictions, such as MS-DOS.
-
-</P>
-<P>
-<CODE>bzip2</CODE> and <CODE>bunzip2</CODE> will by default not overwrite existing
-files.  If you want this to happen, specify the <CODE>-f</CODE> flag.
-
-</P>
-<P>
-If no file names are specified, <CODE>bzip2</CODE> compresses from standard
-input to standard output.  In this case, <CODE>bzip2</CODE> will decline to
-write compressed output to a terminal, as this would be entirely
-incomprehensible and therefore pointless.
-
-</P>
-<P>
-<CODE>bunzip2</CODE> (or <CODE>bzip2 -d</CODE>) decompresses all
-specified files.  Files which were not created by <CODE>bzip2</CODE>
-will be detected and ignored, and a warning issued.  
-<CODE>bzip2</CODE> attempts to guess the filename for the decompressed file 
-from that of the compressed file as follows:
-
-<UL>
-<LI><CODE>filename.bz2 </CODE> becomes <CODE>filename</CODE>
-
-<LI><CODE>filename.bz  </CODE> becomes <CODE>filename</CODE>
-
-<LI><CODE>filename.tbz2</CODE> becomes <CODE>filename.tar</CODE>
-
-<LI><CODE>filename.tbz </CODE> becomes <CODE>filename.tar</CODE>
-
-<LI><CODE>anyothername </CODE> becomes <CODE>anyothername.out</CODE>
-
-</UL>
-
-<P>
-If the file does not end in one of the recognised endings, 
-<CODE>.bz2</CODE>, <CODE>.bz</CODE>, 
-<CODE>.tbz2</CODE> or <CODE>.tbz</CODE>, <CODE>bzip2</CODE> complains that it cannot
-guess the name of the original file, and uses the original name
-with <CODE>.out</CODE> appended.
-
-</P>
-<P>
-As with compression, supplying no
-filenames causes decompression from standard input to standard output.
-
-</P>
-<P>
-<CODE>bunzip2</CODE> will correctly decompress a file which is the
-concatenation of two or more compressed files.  The result is the
-concatenation of the corresponding uncompressed files.  Integrity
-testing (<CODE>-t</CODE>) of concatenated compressed files is also supported.
-
-</P>
-<P>
-You can also compress or decompress files to the standard output by
-giving the <CODE>-c</CODE> flag.  Multiple files may be compressed and
-decompressed like this.  The resulting outputs are fed sequentially to
-stdout.  Compression of multiple files in this manner generates a stream
-containing multiple compressed file representations.  Such a stream
-can be decompressed correctly only by <CODE>bzip2</CODE> version 0.9.0 or
-later.  Earlier versions of <CODE>bzip2</CODE> will stop after decompressing
-the first file in the stream.
-
-</P>
-<P>
-<CODE>bzcat</CODE> (or <CODE>bzip2 -dc</CODE>) decompresses all specified files to
-the standard output.
-
-</P>
-<P>
-<CODE>bzip2</CODE> will read arguments from the environment variables
-<CODE>BZIP2</CODE> and <CODE>BZIP</CODE>, in that order, and will process them
-before any arguments read from the command line.  This gives a 
-convenient way to supply default arguments.
-
-</P>
-<P>
-Compression is always performed, even if the compressed file is slightly
-larger than the original.  Files of less than about one hundred bytes
-tend to get larger, since the compression mechanism has a constant
-overhead in the region of 50 bytes.  Random data (including the output
-of most file compressors) is coded at about 8.05 bits per byte, giving
-an expansion of around 0.5%.
-
-</P>
-<P>
-As a self-check for your protection, <CODE>bzip2</CODE> uses 32-bit CRCs to
-make sure that the decompressed version of a file is identical to the
-original.  This guards against corruption of the compressed data, and
-against undetected bugs in <CODE>bzip2</CODE> (hopefully very unlikely).  The
-chances of data corruption going undetected is microscopic, about one
-chance in four billion for each file processed.  Be aware, though, that
-the check occurs upon decompression, so it can only tell you that
-something is wrong.  It can't help you recover the original uncompressed
-data.  You can use <CODE>bzip2recover</CODE> to try to recover data from
-damaged files.
-
-</P>
-<P>
-Return values: 0 for a normal exit, 1 for environmental problems (file
-not found, invalid flags, I/O errors, &#38;c), 2 to indicate a corrupt
-compressed file, 3 for an internal consistency error (eg, bug) which
-caused <CODE>bzip2</CODE> to panic.
-
-</P>
-
-
-
-<H4><A NAME="SEC6" HREF="manual_toc.html#TOC6">OPTIONS</A></H4>
-<DL COMPACT>
-
-<DT><CODE>-c  --stdout</CODE>
-<DD>
-Compress or decompress to standard output.
-<DT><CODE>-d  --decompress</CODE>
-<DD>
-Force decompression.  <CODE>bzip2</CODE>, <CODE>bunzip2</CODE> and <CODE>bzcat</CODE> are
-really the same program, and the decision about what actions to take is
-done on the basis of which name is used.  This flag overrides that
-mechanism, and forces bzip2 to decompress.
-<DT><CODE>-z --compress</CODE>
-<DD>
-The complement to <CODE>-d</CODE>: forces compression, regardless of the
-invokation name.
-<DT><CODE>-t --test</CODE>
-<DD>
-Check integrity of the specified file(s), but don't decompress them.
-This really performs a trial decompression and throws away the result.
-<DT><CODE>-f --force</CODE>
-<DD>
-Force overwrite of output files.  Normally, <CODE>bzip2</CODE> will not overwrite
-existing output files.  Also forces <CODE>bzip2</CODE> to break hard links
-to files, which it otherwise wouldn't do.
-<DT><CODE>-k --keep</CODE>
-<DD>
-Keep (don't delete) input files during compression
-or decompression.
-<DT><CODE>-s --small</CODE>
-<DD>
-Reduce memory usage, for compression, decompression and testing.  Files
-are decompressed and tested using a modified algorithm which only
-requires 2.5 bytes per block byte.  This means any file can be
-decompressed in 2300k of memory, albeit at about half the normal speed.
-
-During compression, <CODE>-s</CODE> selects a block size of 200k, which limits
-memory use to around the same figure, at the expense of your compression
-ratio.  In short, if your machine is low on memory (8 megabytes or
-less), use -s for everything.  See MEMORY MANAGEMENT below.
-<DT><CODE>-q --quiet</CODE>
-<DD>
-Suppress non-essential warning messages.  Messages pertaining to
-I/O errors and other critical events will not be suppressed.
-<DT><CODE>-v --verbose</CODE>
-<DD>
-Verbose mode -- show the compression ratio for each file processed.
-Further <CODE>-v</CODE>'s increase the verbosity level, spewing out lots of
-information which is primarily of interest for diagnostic purposes.
-<DT><CODE>-L --license -V --version</CODE>
-<DD>
-Display the software version, license terms and conditions.
-<DT><CODE>-1 to -9</CODE>
-<DD>
-Set the block size to 100 k, 200 k ..  900 k when compressing.  Has no
-effect when decompressing.  See MEMORY MANAGEMENT below.
-<DT><CODE>--</CODE>
-<DD>
-Treats all subsequent arguments as file names, even if they start
-with a dash.  This is so you can handle files with names beginning
-with a dash, for example: <CODE>bzip2 -- -myfilename</CODE>.
-<DT><CODE>--repetitive-fast</CODE>
-<DD>
-<DT><CODE>--repetitive-best</CODE>
-<DD>
-These flags are redundant in versions 0.9.5 and above.  They provided
-some coarse control over the behaviour of the sorting algorithm in
-earlier versions, which was sometimes useful.  0.9.5 and above have an
-improved algorithm which renders these flags irrelevant.
-</DL>
-
-
-
-<H4><A NAME="SEC7" HREF="manual_toc.html#TOC7">MEMORY MANAGEMENT</A></H4>
-
-<P>
-<CODE>bzip2</CODE> compresses large files in blocks.  The block size affects
-both the compression ratio achieved, and the amount of memory needed for
-compression and decompression.  The flags <CODE>-1</CODE> through <CODE>-9</CODE>
-specify the block size to be 100,000 bytes through 900,000 bytes (the
-default) respectively.  At decompression time, the block size used for
-compression is read from the header of the compressed file, and
-<CODE>bunzip2</CODE> then allocates itself just enough memory to decompress
-the file.  Since block sizes are stored in compressed files, it follows
-that the flags <CODE>-1</CODE> to <CODE>-9</CODE> are irrelevant to and so ignored
-during decompression.
-
-</P>
-<P>
-Compression and decompression requirements, in bytes, can be estimated
-as:
-
-<PRE>
-     Compression:   400k + ( 8 x block size )
-
-     Decompression: 100k + ( 4 x block size ), or
-                    100k + ( 2.5 x block size )
-</PRE>
-
-<P>
-Larger block sizes give rapidly diminishing marginal returns.  Most of
-the compression comes from the first two or three hundred k of block
-size, a fact worth bearing in mind when using <CODE>bzip2</CODE> on small machines.
-It is also important to appreciate that the decompression memory
-requirement is set at compression time by the choice of block size.
-
-</P>
-<P>
-For files compressed with the default 900k block size, <CODE>bunzip2</CODE>
-will require about 3700 kbytes to decompress.  To support decompression
-of any file on a 4 megabyte machine, <CODE>bunzip2</CODE> has an option to
-decompress using approximately half this amount of memory, about 2300
-kbytes.  Decompression speed is also halved, so you should use this
-option only where necessary.  The relevant flag is <CODE>-s</CODE>.
-
-</P>
-<P>
-In general, try and use the largest block size memory constraints allow,
-since that maximises the compression achieved.  Compression and
-decompression speed are virtually unaffected by block size.
-
-</P>
-<P>
-Another significant point applies to files which fit in a single block
--- that means most files you'd encounter using a large block size.  The
-amount of real memory touched is proportional to the size of the file,
-since the file is smaller than a block.  For example, compressing a file
-20,000 bytes long with the flag <CODE>-9</CODE> will cause the compressor to
-allocate around 7600k of memory, but only touch 400k + 20000 * 8 = 560
-kbytes of it.  Similarly, the decompressor will allocate 3700k but only
-touch 100k + 20000 * 4 = 180 kbytes.
-
-</P>
-<P>
-Here is a table which summarises the maximum memory usage for different
-block sizes.  Also recorded is the total compressed size for 14 files of
-the Calgary Text Compression Corpus totalling 3,141,622 bytes.  This
-column gives some feel for how compression varies with block size.
-These figures tend to understate the advantage of larger block sizes for
-larger files, since the Corpus is dominated by smaller files.
-
-<PRE>
-          Compress   Decompress   Decompress   Corpus
-   Flag     usage      usage       -s usage     Size
-
-    -1      1200k       500k         350k      914704
-    -2      2000k       900k         600k      877703
-    -3      2800k      1300k         850k      860338
-    -4      3600k      1700k        1100k      846899
-    -5      4400k      2100k        1350k      845160
-    -6      5200k      2500k        1600k      838626
-    -7      6100k      2900k        1850k      834096
-    -8      6800k      3300k        2100k      828642
-    -9      7600k      3700k        2350k      828642
-</PRE>
-
-
-
-<H4><A NAME="SEC8" HREF="manual_toc.html#TOC8">RECOVERING DATA FROM DAMAGED FILES</A></H4>
-
-<P>
-<CODE>bzip2</CODE> compresses files in blocks, usually 900kbytes long.  Each
-block is handled independently.  If a media or transmission error causes
-a multi-block <CODE>.bz2</CODE> file to become damaged, it may be possible to
-recover data from the undamaged blocks in the file.
-
-</P>
-<P>
-The compressed representation of each block is delimited by a 48-bit
-pattern, which makes it possible to find the block boundaries with
-reasonable certainty.  Each block also carries its own 32-bit CRC, so
-damaged blocks can be distinguished from undamaged ones.
-
-</P>
-<P>
-<CODE>bzip2recover</CODE> is a simple program whose purpose is to search for
-blocks in <CODE>.bz2</CODE> files, and write each block out into its own
-<CODE>.bz2</CODE> file.  You can then use <CODE>bzip2 -t</CODE> to test the
-integrity of the resulting files, and decompress those which are
-undamaged.
-
-</P>
-<P>
-<CODE>bzip2recover</CODE> 
-takes a single argument, the name of the damaged file, 
-and writes a number of files <CODE>rec0001file.bz2</CODE>,
-       <CODE>rec0002file.bz2</CODE>, etc, containing the  extracted  blocks.
-       The  output  filenames  are  designed  so  that the use of
-       wildcards in subsequent processing -- for example,  
-<CODE>bzip2 -dc  rec*file.bz2 &#62; recovered_data</CODE> -- lists the files in
-       the correct order.
-
-</P>
-<P>
-<CODE>bzip2recover</CODE> should be of most use dealing with large <CODE>.bz2</CODE>
-       files,  as  these will contain many blocks.  It is clearly
-       futile to use it on damaged single-block  files,  since  a
-       damaged  block  cannot  be recovered.  If you wish to minimise 
-any potential data loss through media  or  transmission errors, 
-you might consider compressing with a smaller
-       block size.
-
-</P>
-
-
-
-<H4><A NAME="SEC9" HREF="manual_toc.html#TOC9">PERFORMANCE NOTES</A></H4>
-
-<P>
-The sorting phase of compression gathers together similar strings in the
-file.  Because of this, files containing very long runs of repeated
-symbols, like "aabaabaabaab ..."  (repeated several hundred times) may
-compress more slowly than normal.  Versions 0.9.5 and above fare much
-better than previous versions in this respect.  The ratio between
-worst-case and average-case compression time is in the region of 10:1.
-For previous versions, this figure was more like 100:1.  You can use the
-<CODE>-vvvv</CODE> option to monitor progress in great detail, if you want.
-
-</P>
-<P>
-Decompression speed is unaffected by these phenomena.
-
-</P>
-<P>
-<CODE>bzip2</CODE> usually allocates several megabytes of memory to operate
-in, and then charges all over it in a fairly random fashion.  This means
-that performance, both for compressing and decompressing, is largely
-determined by the speed at which your machine can service cache misses.
-Because of this, small changes to the code to reduce the miss rate have
-been observed to give disproportionately large performance improvements.
-I imagine <CODE>bzip2</CODE> will perform best on machines with very large
-caches.
-
-</P>
-
-
-
-<H4><A NAME="SEC10" HREF="manual_toc.html#TOC10">CAVEATS</A></H4>
-
-<P>
-I/O error messages are not as helpful as they could be.  <CODE>bzip2</CODE>
-tries hard to detect I/O errors and exit cleanly, but the details of
-what the problem is sometimes seem rather misleading.
-
-</P>
-<P>
-This manual page pertains to version 1.0 of <CODE>bzip2</CODE>.  Compressed
-data created by this version is entirely forwards and backwards
-compatible with the previous public releases, versions 0.1pl2, 0.9.0 and
-0.9.5, but with the following exception: 0.9.0 and above can correctly
-decompress multiple concatenated compressed files.  0.1pl2 cannot do
-this; it will stop after decompressing just the first file in the
-stream.
-
-</P>
-<P>
-<CODE>bzip2recover</CODE> uses 32-bit integers to represent bit positions in
-compressed files, so it cannot handle compressed files more than 512
-megabytes long.  This could easily be fixed.
-
-</P>
-
-
-
-<H4><A NAME="SEC11" HREF="manual_toc.html#TOC11">AUTHOR</A></H4>
-<P>
-Julian Seward, <CODE>jseward@acm.org</CODE>.
-
-</P>
-<P>
-The ideas embodied in <CODE>bzip2</CODE> are due to (at least) the following
-people: Michael Burrows and David Wheeler (for the block sorting
-transformation), David Wheeler (again, for the Huffman coder), Peter
-Fenwick (for the structured coding model in the original <CODE>bzip</CODE>,
-and many refinements), and Alistair Moffat, Radford Neal and Ian Witten
-(for the arithmetic coder in the original <CODE>bzip</CODE>).  I am much
-indebted for their help, support and advice.  See the manual in the
-source distribution for pointers to sources of documentation.  Christian
-von Roques encouraged me to look for faster sorting algorithms, so as to
-speed up compression.  Bela Lubkin encouraged me to improve the
-worst-case compression performance.  Many people sent patches, helped
-with portability problems, lent machines, gave advice and were generally
-helpful.
-
-</P>
-</BLOCKQUOTE>
-
-<P><HR><P>
-<p>Go to the <A HREF="manual_1.html">first</A>, <A HREF="manual_1.html">previous</A>, <A HREF="manual_3.html">next</A>, <A HREF="manual_4.html">last</A> section, <A HREF="manual_toc.html">table of contents</A>.
-</BODY>
-</HTML>
diff --git a/winsup/bz2lib/manual_3.html b/winsup/bz2lib/manual_3.html
deleted file mode 100644
index a8fa7e682..000000000
--- a/winsup/bz2lib/manual_3.html
+++ /dev/null
@@ -1,1773 +0,0 @@
-<HTML>
-<HEAD>
-<!-- This HTML file has been created by texi2html 1.54
-     from manual.texi on 23 March 2000 -->
-
-<TITLE>bzip2 and libbzip2 - Programming with libbzip2</TITLE>
-<link href="manual_4.html" rel=Next>
-<link href="manual_2.html" rel=Previous>
-<link href="manual_toc.html" rel=ToC>
-
-</HEAD>
-<BODY>
-<p>Go to the <A HREF="manual_1.html">first</A>, <A HREF="manual_2.html">previous</A>, <A HREF="manual_4.html">next</A>, <A HREF="manual_4.html">last</A> section, <A HREF="manual_toc.html">table of contents</A>.
-<P><HR><P>
-
-
-<H1><A NAME="SEC12" HREF="manual_toc.html#TOC12">Programming with <CODE>libbzip2</CODE></A></H1>
-
-<P>
-This chapter describes the programming interface to <CODE>libbzip2</CODE>.
-
-</P>
-<P>
-For general background information, particularly about memory
-use and performance aspects, you'd be well advised to read Chapter 2
-as well.
-
-</P>
-
-
-<H2><A NAME="SEC13" HREF="manual_toc.html#TOC13">Top-level structure</A></H2>
-
-<P>
-<CODE>libbzip2</CODE> is a flexible library for compressing and decompressing
-data in the <CODE>bzip2</CODE> data format.  Although packaged as a single
-entity, it helps to regard the library as three separate parts: the low
-level interface, and the high level interface, and some utility
-functions.
-
-</P>
-<P>
-The structure of <CODE>libbzip2</CODE>'s interfaces is similar to
-that of Jean-loup Gailly's and Mark Adler's excellent <CODE>zlib</CODE> 
-library.
-
-</P>
-<P>
-All externally visible symbols have names beginning <CODE>BZ2_</CODE>.
-This is new in version 1.0.  The intention is to minimise pollution
-of the namespaces of library clients.
-
-</P>
-
-
-<H3><A NAME="SEC14" HREF="manual_toc.html#TOC14">Low-level summary</A></H3>
-
-<P>
-This interface provides services for compressing and decompressing
-data in memory.  There's no provision for dealing with files, streams
-or any other I/O mechanisms, just straight memory-to-memory work.
-In fact, this part of the library can be compiled without inclusion
-of <CODE>stdio.h</CODE>, which may be helpful for embedded applications.
-
-</P>
-<P>
-The low-level part of the library has no global variables and
-is therefore thread-safe.
-
-</P>
-<P>
-Six routines make up the low level interface: 
-<CODE>BZ2_bzCompressInit</CODE>, <CODE>BZ2_bzCompress</CODE>, and <BR> <CODE>BZ2_bzCompressEnd</CODE>
-for compression,
-and a corresponding trio <CODE>BZ2_bzDecompressInit</CODE>, <BR> <CODE>BZ2_bzDecompress</CODE>
-and <CODE>BZ2_bzDecompressEnd</CODE> for decompression.  
-The <CODE>*Init</CODE> functions allocate
-memory for compression/decompression and do other
-initialisations, whilst the <CODE>*End</CODE> functions close down operations
-and release memory.
-
-</P>
-<P>
-The real work is done by <CODE>BZ2_bzCompress</CODE> and <CODE>BZ2_bzDecompress</CODE>.  
-These compress and decompress data from a user-supplied input buffer
-to a user-supplied output buffer.  These buffers can be any size;
-arbitrary quantities of data are handled by making repeated calls
-to these functions.  This is a flexible mechanism allowing a 
-consumer-pull style of activity, or producer-push, or a mixture of
-both.
-
-</P>
-
-
-
-<H3><A NAME="SEC15" HREF="manual_toc.html#TOC15">High-level summary</A></H3>
-
-<P>
-This interface provides some handy wrappers around the low-level
-interface to facilitate reading and writing <CODE>bzip2</CODE> format
-files (<CODE>.bz2</CODE> files).  The routines provide hooks to facilitate
-reading files in which the <CODE>bzip2</CODE> data stream is embedded 
-within some larger-scale file structure, or where there are
-multiple <CODE>bzip2</CODE> data streams concatenated end-to-end.
-
-</P>
-<P>
-For reading files, <CODE>BZ2_bzReadOpen</CODE>, <CODE>BZ2_bzRead</CODE>,
-<CODE>BZ2_bzReadClose</CODE> and <BR> <CODE>BZ2_bzReadGetUnused</CODE> are supplied.  For
-writing files, <CODE>BZ2_bzWriteOpen</CODE>, <CODE>BZ2_bzWrite</CODE> and
-<CODE>BZ2_bzWriteFinish</CODE> are available.
-
-</P>
-<P>
-As with the low-level library, no global variables are used
-so the library is per se thread-safe.  However, if I/O errors
-occur whilst reading or writing the underlying compressed files,
-you may have to consult <CODE>errno</CODE> to determine the cause of
-the error.  In that case, you'd need a C library which correctly
-supports <CODE>errno</CODE> in a multithreaded environment.
-
-</P>
-<P>
-To make the library a little simpler and more portable,
-<CODE>BZ2_bzReadOpen</CODE> and <CODE>BZ2_bzWriteOpen</CODE> require you to pass them file
-handles (<CODE>FILE*</CODE>s) which have previously been opened for reading or
-writing respectively.  That avoids portability problems associated with
-file operations and file attributes, whilst not being much of an
-imposition on the programmer.
-
-</P>
-
-
-
-<H3><A NAME="SEC16" HREF="manual_toc.html#TOC16">Utility functions summary</A></H3>
-<P>
-For very simple needs, <CODE>BZ2_bzBuffToBuffCompress</CODE> and
-<CODE>BZ2_bzBuffToBuffDecompress</CODE> are provided.  These compress
-data in memory from one buffer to another buffer in a single
-function call.  You should assess whether these functions
-fulfill your memory-to-memory compression/decompression
-requirements before investing effort in understanding the more
-general but more complex low-level interface.
-
-</P>
-<P>
-Yoshioka Tsuneo (<CODE>QWF00133@niftyserve.or.jp</CODE> /
-<CODE>tsuneo-y@is.aist-nara.ac.jp</CODE>) has contributed some functions to
-give better <CODE>zlib</CODE> compatibility.  These functions are
-<CODE>BZ2_bzopen</CODE>, <CODE>BZ2_bzread</CODE>, <CODE>BZ2_bzwrite</CODE>, <CODE>BZ2_bzflush</CODE>,
-<CODE>BZ2_bzclose</CODE>,
-<CODE>BZ2_bzerror</CODE> and <CODE>BZ2_bzlibVersion</CODE>.  You may find these functions
-more convenient for simple file reading and writing, than those in the
-high-level interface.  These functions are not (yet) officially part of
-the library, and are minimally documented here.  If they break, you
-get to keep all the pieces.  I hope to document them properly when time
-permits.
-
-</P>
-<P>
-Yoshioka also contributed modifications to allow the library to be
-built as a Windows DLL.
-
-</P>
-
-
-
-<H2><A NAME="SEC17" HREF="manual_toc.html#TOC17">Error handling</A></H2>
-
-<P>
-The library is designed to recover cleanly in all situations, including
-the worst-case situation of decompressing random data.  I'm not 
-100% sure that it can always do this, so you might want to add
-a signal handler to catch segmentation violations during decompression
-if you are feeling especially paranoid.  I would be interested in
-hearing more about the robustness of the library to corrupted
-compressed data.
-
-</P>
-<P>
-Version 1.0 is much more robust in this respect than
-0.9.0 or 0.9.5.  Investigations with Checker (a tool for 
-detecting problems with memory management, similar to Purify)
-indicate that, at least for the few files I tested, all single-bit
-errors in the decompressed data are caught properly, with no
-segmentation faults, no reads of uninitialised data and no 
-out of range reads or writes.  So it's certainly much improved,
-although I wouldn't claim it to be totally bombproof.
-
-</P>
-<P>
-The file <CODE>bzlib.h</CODE> contains all definitions needed to use
-the library.  In particular, you should definitely not include
-<CODE>bzlib_private.h</CODE>.
-
-</P>
-<P>
-In <CODE>bzlib.h</CODE>, the various return values are defined.  The following
-list is not intended as an exhaustive description of the circumstances 
-in which a given value may be returned -- those descriptions are given
-later.  Rather, it is intended to convey the rough meaning of each
-return value.  The first five actions are normal and not intended to 
-denote an error situation.
-<DL COMPACT>
-
-<DT><CODE>BZ_OK</CODE>
-<DD>
-The requested action was completed successfully.
-<DT><CODE>BZ_RUN_OK</CODE>
-<DD>
-<DT><CODE>BZ_FLUSH_OK</CODE>
-<DD>
-<DT><CODE>BZ_FINISH_OK</CODE>
-<DD>
-In <CODE>BZ2_bzCompress</CODE>, the requested flush/finish/nothing-special action
-was completed successfully.
-<DT><CODE>BZ_STREAM_END</CODE>
-<DD>
-Compression of data was completed, or the logical stream end was
-detected during decompression.
-</DL>
-
-<P>
-The following return values indicate an error of some kind.
-<DL COMPACT>
-
-<DT><CODE>BZ_CONFIG_ERROR</CODE>
-<DD>
-Indicates that the library has been improperly compiled on your
-platform -- a major configuration error.  Specifically, it means
-that <CODE>sizeof(char)</CODE>, <CODE>sizeof(short)</CODE> and <CODE>sizeof(int)</CODE>
-are not 1, 2 and 4 respectively, as they should be.  Note that the 
-library should still work properly on 64-bit platforms which follow
-the LP64 programming model -- that is, where <CODE>sizeof(long)</CODE>
-and <CODE>sizeof(void*)</CODE> are 8.  Under LP64, <CODE>sizeof(int)</CODE> is
-still 4, so <CODE>libbzip2</CODE>, which doesn't use the <CODE>long</CODE> type,
-is OK.
-<DT><CODE>BZ_SEQUENCE_ERROR</CODE>
-<DD>
-When using the library, it is important to call the functions in the
-correct sequence and with data structures (buffers etc) in the correct
-states.  <CODE>libbzip2</CODE> checks as much as it can to ensure this is
-happening, and returns <CODE>BZ_SEQUENCE_ERROR</CODE> if not.  Code which
-complies precisely with the function semantics, as detailed below,
-should never receive this value; such an event denotes buggy code
-which you should investigate.
-<DT><CODE>BZ_PARAM_ERROR</CODE>
-<DD>
-Returned when a parameter to a function call is out of range 
-or otherwise manifestly incorrect.  As with <CODE>BZ_SEQUENCE_ERROR</CODE>,
-this denotes a bug in the client code.  The distinction between
-<CODE>BZ_PARAM_ERROR</CODE> and <CODE>BZ_SEQUENCE_ERROR</CODE> is a bit hazy, but still worth
-making.
-<DT><CODE>BZ_MEM_ERROR</CODE>
-<DD>
-Returned when a request to allocate memory failed.  Note that the
-quantity of memory needed to decompress a stream cannot be determined
-until the stream's header has been read.  So <CODE>BZ2_bzDecompress</CODE> and
-<CODE>BZ2_bzRead</CODE> may return <CODE>BZ_MEM_ERROR</CODE> even though some of
-the compressed data has been read.  The same is not true for
-compression; once <CODE>BZ2_bzCompressInit</CODE> or <CODE>BZ2_bzWriteOpen</CODE> have
-successfully completed, <CODE>BZ_MEM_ERROR</CODE> cannot occur.
-<DT><CODE>BZ_DATA_ERROR</CODE>
-<DD>
-Returned when a data integrity error is detected during decompression.
-Most importantly, this means when stored and computed CRCs for the
-data do not match.  This value is also returned upon detection of any
-other anomaly in the compressed data.
-<DT><CODE>BZ_DATA_ERROR_MAGIC</CODE>
-<DD>
-As a special case of <CODE>BZ_DATA_ERROR</CODE>, it is sometimes useful to
-know when the compressed stream does not start with the correct
-magic bytes (<CODE>'B' 'Z' 'h'</CODE>).  
-<DT><CODE>BZ_IO_ERROR</CODE>
-<DD>
-Returned by <CODE>BZ2_bzRead</CODE> and <CODE>BZ2_bzWrite</CODE> when there is an error
-reading or writing in the compressed file, and by <CODE>BZ2_bzReadOpen</CODE>
-and <CODE>BZ2_bzWriteOpen</CODE> for attempts to use a file for which the
-error indicator (viz, <CODE>ferror(f)</CODE>) is set.
-On receipt of <CODE>BZ_IO_ERROR</CODE>, the caller should consult
-<CODE>errno</CODE> and/or <CODE>perror</CODE> to acquire operating-system
-specific information about the problem.
-<DT><CODE>BZ_UNEXPECTED_EOF</CODE>
-<DD>
-Returned by <CODE>BZ2_bzRead</CODE> when the compressed file finishes
-before the logical end of stream is detected.
-<DT><CODE>BZ_OUTBUFF_FULL</CODE>
-<DD>
-Returned by <CODE>BZ2_bzBuffToBuffCompress</CODE> and
-<CODE>BZ2_bzBuffToBuffDecompress</CODE> to indicate that the output data
-will not fit into the output buffer provided.
-</DL>
-
-
-
-<H2><A NAME="SEC18" HREF="manual_toc.html#TOC18">Low-level interface</A></H2>
-
-
-
-<H3><A NAME="SEC19" HREF="manual_toc.html#TOC19"><CODE>BZ2_bzCompressInit</CODE></A></H3>
-
-<PRE>
-typedef 
-   struct {
-      char *next_in;
-      unsigned int avail_in;
-      unsigned int total_in_lo32;
-      unsigned int total_in_hi32;
-
-      char *next_out;
-      unsigned int avail_out;
-      unsigned int total_out_lo32;
-      unsigned int total_out_hi32;
-
-      void *state;
-
-      void *(*bzalloc)(void *,int,int);
-      void (*bzfree)(void *,void *);
-      void *opaque;
-   } 
-   bz_stream;
-
-int BZ2_bzCompressInit ( bz_stream *strm, 
-                         int blockSize100k, 
-                         int verbosity,
-                         int workFactor );
-
-</PRE>
-
-<P>
-Prepares for compression.  The <CODE>bz_stream</CODE> structure
-holds all data pertaining to the compression activity.  
-A <CODE>bz_stream</CODE> structure should be allocated and initialised
-prior to the call.
-The fields of <CODE>bz_stream</CODE>
-comprise the entirety of the user-visible data.  <CODE>state</CODE>
-is a pointer to the private data structures required for compression.
-
-</P>
-<P>
-Custom memory allocators are supported, via fields <CODE>bzalloc</CODE>, 
-<CODE>bzfree</CODE>,
-and <CODE>opaque</CODE>.  The value 
-<CODE>opaque</CODE> is passed to as the first argument to
-all calls to <CODE>bzalloc</CODE> and <CODE>bzfree</CODE>, but is 
-otherwise ignored by the library.
-The call <CODE>bzalloc ( opaque, n, m )</CODE> is expected to return a 
-pointer <CODE>p</CODE> to
-<CODE>n * m</CODE> bytes of memory, and <CODE>bzfree ( opaque, p )</CODE> 
-should free
-that memory.
-
-</P>
-<P>
-If you don't want to use a custom memory allocator, set <CODE>bzalloc</CODE>, 
-<CODE>bzfree</CODE> and
-<CODE>opaque</CODE> to <CODE>NULL</CODE>, 
-and the library will then use the standard <CODE>malloc</CODE>/<CODE>free</CODE>
-routines.
-
-</P>
-<P>
-Before calling <CODE>BZ2_bzCompressInit</CODE>, fields <CODE>bzalloc</CODE>, 
-<CODE>bzfree</CODE> and <CODE>opaque</CODE> should
-be filled appropriately, as just described.  Upon return, the internal
-state will have been allocated and initialised, and <CODE>total_in_lo32</CODE>, 
-<CODE>total_in_hi32</CODE>, <CODE>total_out_lo32</CODE> and 
-<CODE>total_out_hi32</CODE> will have been set to zero.  
-These four fields are used by the library
-to inform the caller of the total amount of data passed into and out of
-the library, respectively.  You should not try to change them.
-As of version 1.0, 64-bit counts are maintained, even on 32-bit
-platforms, using the <CODE>_hi32</CODE> fields to store the upper 32 bits
-of the count.  So, for example, the total amount of data in
-is <CODE>(total_in_hi32 &#60;&#60; 32) + total_in_lo32</CODE>.
-
-</P>
-<P>
-Parameter <CODE>blockSize100k</CODE> specifies the block size to be used for
-compression.  It should be a value between 1 and 9 inclusive, and the
-actual block size used is 100000 x this figure.  9 gives the best
-compression but takes most memory.
-
-</P>
-<P>
-Parameter <CODE>verbosity</CODE> should be set to a number between 0 and 4
-inclusive.  0 is silent, and greater numbers give increasingly verbose
-monitoring/debugging output.  If the library has been compiled with
-<CODE>-DBZ_NO_STDIO</CODE>, no such output will appear for any verbosity
-setting.
-
-</P>
-<P>
-Parameter <CODE>workFactor</CODE> controls how the compression phase behaves
-when presented with worst case, highly repetitive, input data.  If
-compression runs into difficulties caused by repetitive data, the
-library switches from the standard sorting algorithm to a fallback
-algorithm.  The fallback is slower than the standard algorithm by
-perhaps a factor of three, but always behaves reasonably, no matter how
-bad the input.
-
-</P>
-<P>
-Lower values of <CODE>workFactor</CODE> reduce the amount of effort the
-standard algorithm will expend before resorting to the fallback.  You
-should set this parameter carefully; too low, and many inputs will be
-handled by the fallback algorithm and so compress rather slowly, too
-high, and your average-to-worst case compression times can become very
-large.  The default value of 30 gives reasonable behaviour over a wide
-range of circumstances.
-
-</P>
-<P>
-Allowable values range from 0 to 250 inclusive.  0 is a special case,
-equivalent to using the default value of 30.
-
-</P>
-<P>
-Note that the compressed output generated is the same regardless of
-whether or not the fallback algorithm is used.
-
-</P>
-<P>
-Be aware also that this parameter may disappear entirely in future
-versions of the library.  In principle it should be possible to devise a
-good way to automatically choose which algorithm to use.  Such a
-mechanism would render the parameter obsolete.
-
-</P>
-<P>
-Possible return values:
-
-<PRE>
-      <CODE>BZ_CONFIG_ERROR</CODE>
-         if the library has been mis-compiled
-      <CODE>BZ_PARAM_ERROR</CODE> 
-         if <CODE>strm</CODE> is <CODE>NULL</CODE> 
-         or <CODE>blockSize</CODE> &#60; 1 or <CODE>blockSize</CODE> &#62; 9
-         or <CODE>verbosity</CODE> &#60; 0 or <CODE>verbosity</CODE> &#62; 4
-         or <CODE>workFactor</CODE> &#60; 0 or <CODE>workFactor</CODE> &#62; 250
-      <CODE>BZ_MEM_ERROR</CODE> 
-         if not enough memory is available
-      <CODE>BZ_OK</CODE> 
-         otherwise
-</PRE>
-
-<P>
-Allowable next actions:
-
-<PRE>
-      <CODE>BZ2_bzCompress</CODE> 
-         if <CODE>BZ_OK</CODE> is returned
-      no specific action needed in case of error
-</PRE>
-
-
-
-<H3><A NAME="SEC20" HREF="manual_toc.html#TOC20"><CODE>BZ2_bzCompress</CODE></A></H3>
-
-<PRE>
-   int BZ2_bzCompress ( bz_stream *strm, int action );
-</PRE>
-
-<P>
-Provides more input and/or output buffer space for the library.  The
-caller maintains input and output buffers, and calls <CODE>BZ2_bzCompress</CODE> to
-transfer data between them.
-
-</P>
-<P>
-Before each call to <CODE>BZ2_bzCompress</CODE>, <CODE>next_in</CODE> should point at
-the data to be compressed, and <CODE>avail_in</CODE> should indicate how many
-bytes the library may read.  <CODE>BZ2_bzCompress</CODE> updates <CODE>next_in</CODE>,
-<CODE>avail_in</CODE> and <CODE>total_in</CODE> to reflect the number of bytes it
-has read.
-
-</P>
-<P>
-Similarly, <CODE>next_out</CODE> should point to a buffer in which the
-compressed data is to be placed, with <CODE>avail_out</CODE> indicating how
-much output space is available.  <CODE>BZ2_bzCompress</CODE> updates
-<CODE>next_out</CODE>, <CODE>avail_out</CODE> and <CODE>total_out</CODE> to reflect the
-number of bytes output.
-
-</P>
-<P>
-You may provide and remove as little or as much data as you like on each
-call of <CODE>BZ2_bzCompress</CODE>.  In the limit, it is acceptable to supply and
-remove data one byte at a time, although this would be terribly
-inefficient.  You should always ensure that at least one byte of output
-space is available at each call.
-
-</P>
-<P>
-A second purpose of <CODE>BZ2_bzCompress</CODE> is to request a change of mode of the
-compressed stream.  
-
-</P>
-<P>
-Conceptually, a compressed stream can be in one of four states: IDLE,
-RUNNING, FLUSHING and FINISHING.  Before initialisation
-(<CODE>BZ2_bzCompressInit</CODE>) and after termination (<CODE>BZ2_bzCompressEnd</CODE>), a
-stream is regarded as IDLE.
-
-</P>
-<P>
-Upon initialisation (<CODE>BZ2_bzCompressInit</CODE>), the stream is placed in the
-RUNNING state.  Subsequent calls to <CODE>BZ2_bzCompress</CODE> should pass
-<CODE>BZ_RUN</CODE> as the requested action; other actions are illegal and
-will result in <CODE>BZ_SEQUENCE_ERROR</CODE>.
-
-</P>
-<P>
-At some point, the calling program will have provided all the input data
-it wants to.  It will then want to finish up -- in effect, asking the
-library to process any data it might have buffered internally.  In this
-state, <CODE>BZ2_bzCompress</CODE> will no longer attempt to read data from
-<CODE>next_in</CODE>, but it will want to write data to <CODE>next_out</CODE>.
-Because the output buffer supplied by the user can be arbitrarily small,
-the finishing-up operation cannot necessarily be done with a single call
-of <CODE>BZ2_bzCompress</CODE>.
-
-</P>
-<P>
-Instead, the calling program passes <CODE>BZ_FINISH</CODE> as an action to
-<CODE>BZ2_bzCompress</CODE>.  This changes the stream's state to FINISHING.  Any
-remaining input (ie, <CODE>next_in[0 .. avail_in-1]</CODE>) is compressed and
-transferred to the output buffer.  To do this, <CODE>BZ2_bzCompress</CODE> must be
-called repeatedly until all the output has been consumed.  At that
-point, <CODE>BZ2_bzCompress</CODE> returns <CODE>BZ_STREAM_END</CODE>, and the stream's
-state is set back to IDLE.  <CODE>BZ2_bzCompressEnd</CODE> should then be
-called.
-
-</P>
-<P>
-Just to make sure the calling program does not cheat, the library makes
-a note of <CODE>avail_in</CODE> at the time of the first call to
-<CODE>BZ2_bzCompress</CODE> which has <CODE>BZ_FINISH</CODE> as an action (ie, at the
-time the program has announced its intention to not supply any more
-input).  By comparing this value with that of <CODE>avail_in</CODE> over
-subsequent calls to <CODE>BZ2_bzCompress</CODE>, the library can detect any
-attempts to slip in more data to compress.  Any calls for which this is
-detected will return <CODE>BZ_SEQUENCE_ERROR</CODE>.  This indicates a
-programming mistake which should be corrected.
-
-</P>
-<P>
-Instead of asking to finish, the calling program may ask
-<CODE>BZ2_bzCompress</CODE> to take all the remaining input, compress it and
-terminate the current (Burrows-Wheeler) compression block.  This could
-be useful for error control purposes.  The mechanism is analogous to
-that for finishing: call <CODE>BZ2_bzCompress</CODE> with an action of
-<CODE>BZ_FLUSH</CODE>, remove output data, and persist with the
-<CODE>BZ_FLUSH</CODE> action until the value <CODE>BZ_RUN</CODE> is returned.  As
-with finishing, <CODE>BZ2_bzCompress</CODE> detects any attempt to provide more
-input data once the flush has begun.
-
-</P>
-<P>
-Once the flush is complete, the stream returns to the normal RUNNING
-state.
-
-</P>
-<P>
-This all sounds pretty complex, but isn't really.  Here's a table
-which shows which actions are allowable in each state, what action
-will be taken, what the next state is, and what the non-error return
-values are.  Note that you can't explicitly ask what state the
-stream is in, but nor do you need to -- it can be inferred from the
-values returned by <CODE>BZ2_bzCompress</CODE>.
-
-<PRE>
-IDLE/<CODE>any</CODE>           
-      Illegal.  IDLE state only exists after <CODE>BZ2_bzCompressEnd</CODE> or
-      before <CODE>BZ2_bzCompressInit</CODE>.
-      Return value = <CODE>BZ_SEQUENCE_ERROR</CODE>
-
-RUNNING/<CODE>BZ_RUN</CODE>     
-      Compress from <CODE>next_in</CODE> to <CODE>next_out</CODE> as much as possible.
-      Next state = RUNNING
-      Return value = <CODE>BZ_RUN_OK</CODE>
-
-RUNNING/<CODE>BZ_FLUSH</CODE>   
-      Remember current value of <CODE>next_in</CODE>.  Compress from <CODE>next_in</CODE>
-      to <CODE>next_out</CODE> as much as possible, but do not accept any more input.  
-      Next state = FLUSHING
-      Return value = <CODE>BZ_FLUSH_OK</CODE>
-
-RUNNING/<CODE>BZ_FINISH</CODE>  
-      Remember current value of <CODE>next_in</CODE>.  Compress from <CODE>next_in</CODE>
-      to <CODE>next_out</CODE> as much as possible, but do not accept any more input.
-      Next state = FINISHING
-      Return value = <CODE>BZ_FINISH_OK</CODE>
-
-FLUSHING/<CODE>BZ_FLUSH</CODE>  
-      Compress from <CODE>next_in</CODE> to <CODE>next_out</CODE> as much as possible, 
-      but do not accept any more input.  
-      If all the existing input has been used up and all compressed
-      output has been removed
-         Next state = RUNNING; Return value = <CODE>BZ_RUN_OK</CODE>
-      else
-         Next state = FLUSHING; Return value = <CODE>BZ_FLUSH_OK</CODE>
-
-FLUSHING/other     
-      Illegal.
-      Return value = <CODE>BZ_SEQUENCE_ERROR</CODE>
-
-FINISHING/<CODE>BZ_FINISH</CODE>  
-      Compress from <CODE>next_in</CODE> to <CODE>next_out</CODE> as much as possible,
-      but to not accept any more input.  
-      If all the existing input has been used up and all compressed
-      output has been removed
-         Next state = IDLE; Return value = <CODE>BZ_STREAM_END</CODE>
-      else
-         Next state = FINISHING; Return value = <CODE>BZ_FINISHING</CODE>
-
-FINISHING/other
-      Illegal.
-      Return value = <CODE>BZ_SEQUENCE_ERROR</CODE>
-</PRE>
-
-<P>
-That still looks complicated?  Well, fair enough.  The usual sequence
-of calls for compressing a load of data is:
-
-<UL>
-<LI>Get started with <CODE>BZ2_bzCompressInit</CODE>.
-
-<LI>Shovel data in and shlurp out its compressed form using zero or more
-
-calls of <CODE>BZ2_bzCompress</CODE> with action = <CODE>BZ_RUN</CODE>.
-<LI>Finish up.
-
-Repeatedly call <CODE>BZ2_bzCompress</CODE> with action = <CODE>BZ_FINISH</CODE>, 
-copying out the compressed output, until <CODE>BZ_STREAM_END</CODE> is returned.
-<LI>Close up and go home.  Call <CODE>BZ2_bzCompressEnd</CODE>.
-
-</UL>
-
-<P>
-If the data you want to compress fits into your input buffer all
-at once, you can skip the calls of <CODE>BZ2_bzCompress ( ..., BZ_RUN )</CODE> and 
-just do the <CODE>BZ2_bzCompress ( ..., BZ_FINISH )</CODE> calls.
-
-</P>
-<P>
-All required memory is allocated by <CODE>BZ2_bzCompressInit</CODE>.  The
-compression library can accept any data at all (obviously).  So you
-shouldn't get any error return values from the <CODE>BZ2_bzCompress</CODE> calls.
-If you do, they will be <CODE>BZ_SEQUENCE_ERROR</CODE>, and indicate a bug in
-your programming.
-
-</P>
-<P>
-Trivial other possible return values:
-
-<PRE>
-      <CODE>BZ_PARAM_ERROR</CODE>   
-         if <CODE>strm</CODE> is <CODE>NULL</CODE>, or <CODE>strm-&#62;s</CODE> is <CODE>NULL</CODE>
-</PRE>
-
-
-
-<H3><A NAME="SEC21" HREF="manual_toc.html#TOC21"><CODE>BZ2_bzCompressEnd</CODE></A></H3>
-
-<PRE>
-int BZ2_bzCompressEnd ( bz_stream *strm );
-</PRE>
-
-<P>
-Releases all memory associated with a compression stream.
-
-</P>
-<P>
-Possible return values:
-
-<PRE>
-   <CODE>BZ_PARAM_ERROR</CODE>    if <CODE>strm</CODE> is <CODE>NULL</CODE> or <CODE>strm-&#62;s</CODE> is <CODE>NULL</CODE>
-   <CODE>BZ_OK</CODE>    otherwise
-</PRE>
-
-
-
-<H3><A NAME="SEC22" HREF="manual_toc.html#TOC22"><CODE>BZ2_bzDecompressInit</CODE></A></H3>
-
-<PRE>
-int BZ2_bzDecompressInit ( bz_stream *strm, int verbosity, int small );
-</PRE>
-
-<P>
-Prepares for decompression.  As with <CODE>BZ2_bzCompressInit</CODE>, a
-<CODE>bz_stream</CODE> record should be allocated and initialised before the
-call.  Fields <CODE>bzalloc</CODE>, <CODE>bzfree</CODE> and <CODE>opaque</CODE> should be
-set if a custom memory allocator is required, or made <CODE>NULL</CODE> for
-the normal <CODE>malloc</CODE>/<CODE>free</CODE> routines.  Upon return, the internal
-state will have been initialised, and <CODE>total_in</CODE> and
-<CODE>total_out</CODE> will be zero.
-
-</P>
-<P>
-For the meaning of parameter <CODE>verbosity</CODE>, see <CODE>BZ2_bzCompressInit</CODE>.
-
-</P>
-<P>
-If <CODE>small</CODE> is nonzero, the library will use an alternative
-decompression algorithm which uses less memory but at the cost of
-decompressing more slowly (roughly speaking, half the speed, but the
-maximum memory requirement drops to around 2300k).  See Chapter 2 for
-more information on memory management.
-
-</P>
-<P>
-Note that the amount of memory needed to decompress
-a stream cannot be determined until the stream's header has been read,
-so even if <CODE>BZ2_bzDecompressInit</CODE> succeeds, a subsequent
-<CODE>BZ2_bzDecompress</CODE> could fail with <CODE>BZ_MEM_ERROR</CODE>.
-
-</P>
-<P>
-Possible return values:
-
-<PRE>
-      <CODE>BZ_CONFIG_ERROR</CODE>
-         if the library has been mis-compiled
-      <CODE>BZ_PARAM_ERROR</CODE>
-         if <CODE>(small != 0 &#38;&#38; small != 1)</CODE>
-         or <CODE>(verbosity &#60; 0 || verbosity &#62; 4)</CODE>
-      <CODE>BZ_MEM_ERROR</CODE>
-         if insufficient memory is available
-</PRE>
-
-<P>
-Allowable next actions:
-
-<PRE>
-      <CODE>BZ2_bzDecompress</CODE>
-         if <CODE>BZ_OK</CODE> was returned
-      no specific action required in case of error
-</PRE>
-
-<P>
- 
-
-</P>
-
-
-<H3><A NAME="SEC23" HREF="manual_toc.html#TOC23"><CODE>BZ2_bzDecompress</CODE></A></H3>
-
-<PRE>
-int BZ2_bzDecompress ( bz_stream *strm );
-</PRE>
-
-<P>
-Provides more input and/out output buffer space for the library.  The
-caller maintains input and output buffers, and uses <CODE>BZ2_bzDecompress</CODE>
-to transfer data between them.
-
-</P>
-<P>
-Before each call to <CODE>BZ2_bzDecompress</CODE>, <CODE>next_in</CODE> 
-should point at the compressed data,
-and <CODE>avail_in</CODE> should indicate how many bytes the library
-may read.  <CODE>BZ2_bzDecompress</CODE> updates <CODE>next_in</CODE>, <CODE>avail_in</CODE> 
-and <CODE>total_in</CODE>
-to reflect the number of bytes it has read.
-
-</P>
-<P>
-Similarly, <CODE>next_out</CODE> should point to a buffer in which the uncompressed
-output is to be placed, with <CODE>avail_out</CODE> indicating how much output space
-is available.  <CODE>BZ2_bzCompress</CODE> updates <CODE>next_out</CODE>,
-<CODE>avail_out</CODE> and <CODE>total_out</CODE> to reflect
-the number of bytes output.
-
-</P>
-<P>
-You may provide and remove as little or as much data as you like on
-each call of <CODE>BZ2_bzDecompress</CODE>.  
-In the limit, it is acceptable to
-supply and remove data one byte at a time, although this would be
-terribly inefficient.  You should always ensure that at least one
-byte of output space is available at each call.
-
-</P>
-<P>
-Use of <CODE>BZ2_bzDecompress</CODE> is simpler than <CODE>BZ2_bzCompress</CODE>.
-
-</P>
-<P>
-You should provide input and remove output as described above, and
-repeatedly call <CODE>BZ2_bzDecompress</CODE> until <CODE>BZ_STREAM_END</CODE> is
-returned.  Appearance of <CODE>BZ_STREAM_END</CODE> denotes that
-<CODE>BZ2_bzDecompress</CODE> has detected the logical end of the compressed
-stream.  <CODE>BZ2_bzDecompress</CODE> will not produce <CODE>BZ_STREAM_END</CODE> until
-all output data has been placed into the output buffer, so once
-<CODE>BZ_STREAM_END</CODE> appears, you are guaranteed to have available all
-the decompressed output, and <CODE>BZ2_bzDecompressEnd</CODE> can safely be
-called.
-
-</P>
-<P>
-If case of an error return value, you should call <CODE>BZ2_bzDecompressEnd</CODE>
-to clean up and release memory.
-
-</P>
-<P>
-Possible return values:
-
-<PRE>
-      <CODE>BZ_PARAM_ERROR</CODE>
-         if <CODE>strm</CODE> is <CODE>NULL</CODE> or <CODE>strm-&#62;s</CODE> is <CODE>NULL</CODE>
-         or <CODE>strm-&#62;avail_out &#60; 1</CODE>
-      <CODE>BZ_DATA_ERROR</CODE>
-         if a data integrity error is detected in the compressed stream
-      <CODE>BZ_DATA_ERROR_MAGIC</CODE>
-         if the compressed stream doesn't begin with the right magic bytes
-      <CODE>BZ_MEM_ERROR</CODE>
-         if there wasn't enough memory available
-      <CODE>BZ_STREAM_END</CODE>
-         if the logical end of the data stream was detected and all
-         output in has been consumed, eg <CODE>s-&#62;avail_out &#62; 0</CODE>
-      <CODE>BZ_OK</CODE>
-         otherwise
-</PRE>
-
-<P>
-Allowable next actions:
-
-<PRE>
-      <CODE>BZ2_bzDecompress</CODE>
-         if <CODE>BZ_OK</CODE> was returned
-      <CODE>BZ2_bzDecompressEnd</CODE>
-         otherwise
-</PRE>
-
-
-
-<H3><A NAME="SEC24" HREF="manual_toc.html#TOC24"><CODE>BZ2_bzDecompressEnd</CODE></A></H3>
-
-<PRE>
-int BZ2_bzDecompressEnd ( bz_stream *strm );
-</PRE>
-
-<P>
-Releases all memory associated with a decompression stream.
-
-</P>
-<P>
-Possible return values:
-
-<PRE>
-      <CODE>BZ_PARAM_ERROR</CODE>
-         if <CODE>strm</CODE> is <CODE>NULL</CODE> or <CODE>strm-&#62;s</CODE> is <CODE>NULL</CODE>
-      <CODE>BZ_OK</CODE>
-         otherwise
-</PRE>
-
-<P>
-Allowable next actions:
-
-<PRE>
-      None.
-</PRE>
-
-
-
-<H2><A NAME="SEC25" HREF="manual_toc.html#TOC25">High-level interface</A></H2>
-
-<P>
-This interface provides functions for reading and writing 
-<CODE>bzip2</CODE> format files.  First, some general points.
-
-</P>
-
-<UL>
-<LI>All of the functions take an <CODE>int*</CODE> first argument,
-
-  <CODE>bzerror</CODE>.
-  After each call, <CODE>bzerror</CODE> should be consulted first to determine
-  the outcome of the call.  If <CODE>bzerror</CODE> is <CODE>BZ_OK</CODE>, 
-  the call completed
-  successfully, and only then should the return value of the function
-  (if any) be consulted.  If <CODE>bzerror</CODE> is <CODE>BZ_IO_ERROR</CODE>, 
-  there was an error
-  reading/writing the underlying compressed file, and you should
-  then consult <CODE>errno</CODE>/<CODE>perror</CODE> to determine the 
-  cause of the difficulty.
-  <CODE>bzerror</CODE> may also be set to various other values; precise details are
-  given on a per-function basis below.
-<LI>If <CODE>bzerror</CODE> indicates an error
-
-  (ie, anything except <CODE>BZ_OK</CODE> and <CODE>BZ_STREAM_END</CODE>),
-  you should immediately call <CODE>BZ2_bzReadClose</CODE> (or <CODE>BZ2_bzWriteClose</CODE>,
-  depending on whether you are attempting to read or to write)
-  to free up all resources associated
-  with the stream.  Once an error has been indicated, behaviour of all calls
-  except <CODE>BZ2_bzReadClose</CODE> (<CODE>BZ2_bzWriteClose</CODE>) is undefined.  
-  The implication is that (1) <CODE>bzerror</CODE> should
-  be checked after each call, and (2) if <CODE>bzerror</CODE> indicates an error, 
-  <CODE>BZ2_bzReadClose</CODE> (<CODE>BZ2_bzWriteClose</CODE>) should then be called to clean up.
-<LI>The <CODE>FILE*</CODE> arguments passed to
-
-   <CODE>BZ2_bzReadOpen</CODE>/<CODE>BZ2_bzWriteOpen</CODE>  
-  should be set to binary mode.
-  Most Unix systems will do this by default, but other platforms,
-  including Windows and Mac, will not.  If you omit this, you may
-  encounter problems when moving code to new platforms.
-<LI>Memory allocation requests are handled by
-
-  <CODE>malloc</CODE>/<CODE>free</CODE>.  
-  At present
-  there is no facility for user-defined memory allocators in the file I/O
-  functions (could easily be added, though).
-</UL>
-
-
-
-<H3><A NAME="SEC26" HREF="manual_toc.html#TOC26"><CODE>BZ2_bzReadOpen</CODE></A></H3>
-
-<PRE>
-   typedef void BZFILE;
-
-   BZFILE *BZ2_bzReadOpen ( int *bzerror, FILE *f, 
-                            int small, int verbosity,
-                            void *unused, int nUnused );
-</PRE>
-
-<P>
-Prepare to read compressed data from file handle <CODE>f</CODE>.  <CODE>f</CODE>
-should refer to a file which has been opened for reading, and for which
-the error indicator (<CODE>ferror(f)</CODE>)is not set.  If <CODE>small</CODE> is 1,
-the library will try to decompress using less memory, at the expense of
-speed.
-
-</P>
-<P>
-For reasons explained below, <CODE>BZ2_bzRead</CODE> will decompress the
-<CODE>nUnused</CODE> bytes starting at <CODE>unused</CODE>, before starting to read
-from the file <CODE>f</CODE>.  At most <CODE>BZ_MAX_UNUSED</CODE> bytes may be
-supplied like this.  If this facility is not required, you should pass
-<CODE>NULL</CODE> and <CODE>0</CODE> for <CODE>unused</CODE> and n<CODE>Unused</CODE>
-respectively.
-
-</P>
-<P>
-For the meaning of parameters <CODE>small</CODE> and <CODE>verbosity</CODE>,
-see <CODE>BZ2_bzDecompressInit</CODE>.
-
-</P>
-<P>
-The amount of memory needed to decompress a file cannot be determined
-until the file's header has been read.  So it is possible that
-<CODE>BZ2_bzReadOpen</CODE> returns <CODE>BZ_OK</CODE> but a subsequent call of
-<CODE>BZ2_bzRead</CODE> will return <CODE>BZ_MEM_ERROR</CODE>.
-
-</P>
-<P>
-Possible assignments to <CODE>bzerror</CODE>:
-
-<PRE>
-      <CODE>BZ_CONFIG_ERROR</CODE>
-         if the library has been mis-compiled
-      <CODE>BZ_PARAM_ERROR</CODE>
-         if <CODE>f</CODE> is <CODE>NULL</CODE> 
-         or <CODE>small</CODE> is neither <CODE>0</CODE> nor <CODE>1</CODE>                 
-         or <CODE>(unused == NULL &#38;&#38; nUnused != 0)</CODE>
-         or <CODE>(unused != NULL &#38;&#38; !(0 &#60;= nUnused &#60;= BZ_MAX_UNUSED))</CODE>
-      <CODE>BZ_IO_ERROR</CODE>    
-         if <CODE>ferror(f)</CODE> is nonzero
-      <CODE>BZ_MEM_ERROR</CODE>   
-         if insufficient memory is available
-      <CODE>BZ_OK</CODE>
-         otherwise.
-</PRE>
-
-<P>
-Possible return values:
-
-<PRE>
-      Pointer to an abstract <CODE>BZFILE</CODE>        
-         if <CODE>bzerror</CODE> is <CODE>BZ_OK</CODE>   
-      <CODE>NULL</CODE>
-         otherwise
-</PRE>
-
-<P>
-Allowable next actions:
-
-<PRE>
-      <CODE>BZ2_bzRead</CODE>
-         if <CODE>bzerror</CODE> is <CODE>BZ_OK</CODE>   
-      <CODE>BZ2_bzClose</CODE> 
-         otherwise
-</PRE>
-
-
-
-<H3><A NAME="SEC27" HREF="manual_toc.html#TOC27"><CODE>BZ2_bzRead</CODE></A></H3>
-
-<PRE>
-   int BZ2_bzRead ( int *bzerror, BZFILE *b, void *buf, int len );
-</PRE>
-
-<P>
-Reads up to <CODE>len</CODE> (uncompressed) bytes from the compressed file 
-<CODE>b</CODE> into
-the buffer <CODE>buf</CODE>.  If the read was successful, 
-<CODE>bzerror</CODE> is set to <CODE>BZ_OK</CODE>
-and the number of bytes read is returned.  If the logical end-of-stream
-was detected, <CODE>bzerror</CODE> will be set to <CODE>BZ_STREAM_END</CODE>, 
-and the number
-of bytes read is returned.  All other <CODE>bzerror</CODE> values denote an error.
-
-</P>
-<P>
-<CODE>BZ2_bzRead</CODE> will supply <CODE>len</CODE> bytes,
-unless the logical stream end is detected
-or an error occurs.  Because of this, it is possible to detect the 
-stream end by observing when the number of bytes returned is 
-less than the number
-requested.  Nevertheless, this is regarded as inadvisable; you should
-instead check <CODE>bzerror</CODE> after every call and watch out for
-<CODE>BZ_STREAM_END</CODE>.
-
-</P>
-<P>
-Internally, <CODE>BZ2_bzRead</CODE> copies data from the compressed file in chunks
-of size <CODE>BZ_MAX_UNUSED</CODE> bytes
-before decompressing it.  If the file contains more bytes than strictly
-needed to reach the logical end-of-stream, <CODE>BZ2_bzRead</CODE> will almost certainly
-read some of the trailing data before signalling <CODE>BZ_SEQUENCE_END</CODE>.
-To collect the read but unused data once <CODE>BZ_SEQUENCE_END</CODE> has 
-appeared, call <CODE>BZ2_bzReadGetUnused</CODE> immediately before <CODE>BZ2_bzReadClose</CODE>.
-
-</P>
-<P>
-Possible assignments to <CODE>bzerror</CODE>:
-
-<PRE>
-      <CODE>BZ_PARAM_ERROR</CODE>
-         if <CODE>b</CODE> is <CODE>NULL</CODE> or <CODE>buf</CODE> is <CODE>NULL</CODE> or <CODE>len &#60; 0</CODE>
-      <CODE>BZ_SEQUENCE_ERROR</CODE> 
-         if <CODE>b</CODE> was opened with <CODE>BZ2_bzWriteOpen</CODE>
-      <CODE>BZ_IO_ERROR</CODE> 
-         if there is an error reading from the compressed file
-      <CODE>BZ_UNEXPECTED_EOF</CODE> 
-         if the compressed file ended before the logical end-of-stream was detected
-      <CODE>BZ_DATA_ERROR</CODE> 
-         if a data integrity error was detected in the compressed stream
-      <CODE>BZ_DATA_ERROR_MAGIC</CODE>
-         if the stream does not begin with the requisite header bytes (ie, is not 
-         a <CODE>bzip2</CODE> data file).  This is really a special case of <CODE>BZ_DATA_ERROR</CODE>.
-      <CODE>BZ_MEM_ERROR</CODE> 
-         if insufficient memory was available
-      <CODE>BZ_STREAM_END</CODE> 
-         if the logical end of stream was detected.
-      <CODE>BZ_OK</CODE>
-         otherwise.
-</PRE>
-
-<P>
-Possible return values:
-
-<PRE>
-      number of bytes read
-         if <CODE>bzerror</CODE> is <CODE>BZ_OK</CODE> or <CODE>BZ_STREAM_END</CODE>
-      undefined
-         otherwise
-</PRE>
-
-<P>
-Allowable next actions:
-
-<PRE>
-      collect data from <CODE>buf</CODE>, then <CODE>BZ2_bzRead</CODE> or <CODE>BZ2_bzReadClose</CODE>
-         if <CODE>bzerror</CODE> is <CODE>BZ_OK</CODE> 
-      collect data from <CODE>buf</CODE>, then <CODE>BZ2_bzReadClose</CODE> or <CODE>BZ2_bzReadGetUnused</CODE> 
-         if <CODE>bzerror</CODE> is <CODE>BZ_SEQUENCE_END</CODE>   
-      <CODE>BZ2_bzReadClose</CODE> 
-         otherwise
-</PRE>
-
-
-
-<H3><A NAME="SEC28" HREF="manual_toc.html#TOC28"><CODE>BZ2_bzReadGetUnused</CODE></A></H3>
-
-<PRE>
-   void BZ2_bzReadGetUnused ( int* bzerror, BZFILE *b, 
-                              void** unused, int* nUnused );
-</PRE>
-
-<P>
-Returns data which was read from the compressed file but was not needed
-to get to the logical end-of-stream.  <CODE>*unused</CODE> is set to the address
-of the data, and <CODE>*nUnused</CODE> to the number of bytes.  <CODE>*nUnused</CODE> will
-be set to a value between <CODE>0</CODE> and <CODE>BZ_MAX_UNUSED</CODE> inclusive.
-
-</P>
-<P>
-This function may only be called once <CODE>BZ2_bzRead</CODE> has signalled 
-<CODE>BZ_STREAM_END</CODE> but before <CODE>BZ2_bzReadClose</CODE>.
-
-</P>
-<P>
-Possible assignments to <CODE>bzerror</CODE>:
-
-<PRE>
-      <CODE>BZ_PARAM_ERROR</CODE> 
-         if <CODE>b</CODE> is <CODE>NULL</CODE> 
-         or <CODE>unused</CODE> is <CODE>NULL</CODE> or <CODE>nUnused</CODE> is <CODE>NULL</CODE>
-      <CODE>BZ_SEQUENCE_ERROR</CODE> 
-         if <CODE>BZ_STREAM_END</CODE> has not been signalled
-         or if <CODE>b</CODE> was opened with <CODE>BZ2_bzWriteOpen</CODE>
-     <CODE>BZ_OK</CODE>
-         otherwise
-</PRE>
-
-<P>
-Allowable next actions:
-
-<PRE>
-      <CODE>BZ2_bzReadClose</CODE>
-</PRE>
-
-
-
-<H3><A NAME="SEC29" HREF="manual_toc.html#TOC29"><CODE>BZ2_bzReadClose</CODE></A></H3>
-
-<PRE>
-   void BZ2_bzReadClose ( int *bzerror, BZFILE *b );
-</PRE>
-
-<P>
-Releases all memory pertaining to the compressed file <CODE>b</CODE>.  
-<CODE>BZ2_bzReadClose</CODE> does not call <CODE>fclose</CODE> on the underlying file
-handle, so you should do that yourself if appropriate.
-<CODE>BZ2_bzReadClose</CODE> should be called to clean up after all error
-situations.
-
-</P>
-<P>
-Possible assignments to <CODE>bzerror</CODE>:
-
-<PRE>
-      <CODE>BZ_SEQUENCE_ERROR</CODE> 
-         if <CODE>b</CODE> was opened with <CODE>BZ2_bzOpenWrite</CODE> 
-      <CODE>BZ_OK</CODE> 
-         otherwise
-</PRE>
-
-<P>
-Allowable next actions:
-
-<PRE>
-      none
-</PRE>
-
-
-
-<H3><A NAME="SEC30" HREF="manual_toc.html#TOC30"><CODE>BZ2_bzWriteOpen</CODE></A></H3>
-
-<PRE>
-   BZFILE *BZ2_bzWriteOpen ( int *bzerror, FILE *f, 
-                             int blockSize100k, int verbosity,
-                             int workFactor );
-</PRE>
-
-<P>
-Prepare to write compressed data to file handle <CODE>f</CODE>.  
-<CODE>f</CODE> should refer to
-a file which has been opened for writing, and for which the error
-indicator (<CODE>ferror(f)</CODE>)is not set.  
-
-</P>
-<P>
-For the meaning of parameters <CODE>blockSize100k</CODE>,
-<CODE>verbosity</CODE> and <CODE>workFactor</CODE>, see
-<BR> <CODE>BZ2_bzCompressInit</CODE>.
-
-</P>
-<P>
-All required memory is allocated at this stage, so if the call
-completes successfully, <CODE>BZ_MEM_ERROR</CODE> cannot be signalled by a
-subsequent call to <CODE>BZ2_bzWrite</CODE>.
-
-</P>
-<P>
-Possible assignments to <CODE>bzerror</CODE>:
-
-<PRE>
-      <CODE>BZ_CONFIG_ERROR</CODE>
-         if the library has been mis-compiled
-      <CODE>BZ_PARAM_ERROR</CODE> 
-         if <CODE>f</CODE> is <CODE>NULL</CODE> 
-         or <CODE>blockSize100k &#60; 1</CODE> or <CODE>blockSize100k &#62; 9</CODE>
-      <CODE>BZ_IO_ERROR</CODE> 
-         if <CODE>ferror(f)</CODE> is nonzero
-      <CODE>BZ_MEM_ERROR</CODE> 
-         if insufficient memory is available
-      <CODE>BZ_OK</CODE> 
-         otherwise
-</PRE>
-
-<P>
-Possible return values:
-
-<PRE>
-      Pointer to an abstract <CODE>BZFILE</CODE>  
-         if <CODE>bzerror</CODE> is <CODE>BZ_OK</CODE>   
-      <CODE>NULL</CODE> 
-         otherwise
-</PRE>
-
-<P>
-Allowable next actions:
-
-<PRE>
-      <CODE>BZ2_bzWrite</CODE> 
-         if <CODE>bzerror</CODE> is <CODE>BZ_OK</CODE> 
-         (you could go directly to <CODE>BZ2_bzWriteClose</CODE>, but this would be pretty pointless)
-      <CODE>BZ2_bzWriteClose</CODE> 
-         otherwise
-</PRE>
-
-
-
-<H3><A NAME="SEC31" HREF="manual_toc.html#TOC31"><CODE>BZ2_bzWrite</CODE></A></H3>
-
-<PRE>
-   void BZ2_bzWrite ( int *bzerror, BZFILE *b, void *buf, int len );
-</PRE>
-
-<P>
-Absorbs <CODE>len</CODE> bytes from the buffer <CODE>buf</CODE>, eventually to be
-compressed and written to the file.
-
-</P>
-<P>
-Possible assignments to <CODE>bzerror</CODE>:
-
-<PRE>
-      <CODE>BZ_PARAM_ERROR</CODE> 
-         if <CODE>b</CODE> is <CODE>NULL</CODE> or <CODE>buf</CODE> is <CODE>NULL</CODE> or <CODE>len &#60; 0</CODE>
-      <CODE>BZ_SEQUENCE_ERROR</CODE> 
-         if b was opened with <CODE>BZ2_bzReadOpen</CODE>
-      <CODE>BZ_IO_ERROR</CODE> 
-         if there is an error writing the compressed file.
-      <CODE>BZ_OK</CODE> 
-         otherwise
-</PRE>
-
-
-
-<H3><A NAME="SEC32" HREF="manual_toc.html#TOC32"><CODE>BZ2_bzWriteClose</CODE></A></H3>
-
-<PRE>
-   void BZ2_bzWriteClose ( int *bzerror, BZFILE* f,
-                           int abandon,
-                           unsigned int* nbytes_in,
-                           unsigned int* nbytes_out );
-
-   void BZ2_bzWriteClose64 ( int *bzerror, BZFILE* f,
-                             int abandon,
-                             unsigned int* nbytes_in_lo32,
-                             unsigned int* nbytes_in_hi32,
-                             unsigned int* nbytes_out_lo32,
-                             unsigned int* nbytes_out_hi32 );
-</PRE>
-
-<P>
-Compresses and flushes to the compressed file all data so far supplied
-by <CODE>BZ2_bzWrite</CODE>.  The logical end-of-stream markers are also written, so
-subsequent calls to <CODE>BZ2_bzWrite</CODE> are illegal.  All memory associated 
-with the compressed file <CODE>b</CODE> is released.  
-<CODE>fflush</CODE> is called on the
-compressed file, but it is not <CODE>fclose</CODE>'d.
-
-</P>
-<P>
-If <CODE>BZ2_bzWriteClose</CODE> is called to clean up after an error, the only
-action is to release the memory.  The library records the error codes
-issued by previous calls, so this situation will be detected
-automatically.  There is no attempt to complete the compression
-operation, nor to <CODE>fflush</CODE> the compressed file.  You can force this
-behaviour to happen even in the case of no error, by passing a nonzero
-value to <CODE>abandon</CODE>.
-
-</P>
-<P>
-If <CODE>nbytes_in</CODE> is non-null, <CODE>*nbytes_in</CODE> will be set to be the
-total volume of uncompressed data handled.  Similarly, <CODE>nbytes_out</CODE>
-will be set to the total volume of compressed data written.  For 
-compatibility with older versions of the library, <CODE>BZ2_bzWriteClose</CODE>
-only yields the lower 32 bits of these counts.  Use
-<CODE>BZ2_bzWriteClose64</CODE> if you want the full 64 bit counts.  These
-two functions are otherwise absolutely identical.
-
-</P>
-
-<P>
-Possible assignments to <CODE>bzerror</CODE>:
-
-<PRE>
-      <CODE>BZ_SEQUENCE_ERROR</CODE> 
-         if <CODE>b</CODE> was opened with <CODE>BZ2_bzReadOpen</CODE>
-      <CODE>BZ_IO_ERROR</CODE> 
-         if there is an error writing the compressed file
-      <CODE>BZ_OK</CODE> 
-         otherwise
-</PRE>
-
-
-
-<H3><A NAME="SEC33" HREF="manual_toc.html#TOC33">Handling embedded compressed data streams</A></H3>
-
-<P>
-The high-level library facilitates use of
-<CODE>bzip2</CODE> data streams which form some part of a surrounding, larger
-data stream.
-
-<UL>
-<LI>For writing, the library takes an open file handle, writes
-
-compressed data to it, <CODE>fflush</CODE>es it but does not <CODE>fclose</CODE> it.
-The calling application can write its own data before and after the
-compressed data stream, using that same file handle.
-<LI>Reading is more complex, and the facilities are not as general
-
-as they could be since generality is hard to reconcile with efficiency.
-<CODE>BZ2_bzRead</CODE> reads from the compressed file in blocks of size
-<CODE>BZ_MAX_UNUSED</CODE> bytes, and in doing so probably will overshoot
-the logical end of compressed stream.
-To recover this data once decompression has
-ended, call <CODE>BZ2_bzReadGetUnused</CODE> after the last call of <CODE>BZ2_bzRead</CODE>
-(the one returning <CODE>BZ_STREAM_END</CODE>) but before calling
-<CODE>BZ2_bzReadClose</CODE>.
-</UL>
-
-<P>
-This mechanism makes it easy to decompress multiple <CODE>bzip2</CODE>
-streams placed end-to-end.  As the end of one stream, when <CODE>BZ2_bzRead</CODE>
-returns <CODE>BZ_STREAM_END</CODE>, call <CODE>BZ2_bzReadGetUnused</CODE> to collect the
-unused data (copy it into your own buffer somewhere).  
-That data forms the start of the next compressed stream.
-To start uncompressing that next stream, call <CODE>BZ2_bzReadOpen</CODE> again,
-feeding in the unused data via the <CODE>unused</CODE>/<CODE>nUnused</CODE>
-parameters.
-Keep doing this until <CODE>BZ_STREAM_END</CODE> return coincides with the
-physical end of file (<CODE>feof(f)</CODE>).  In this situation
-<CODE>BZ2_bzReadGetUnused</CODE>
-will of course return no data.
-
-</P>
-<P>
-This should give some feel for how the high-level interface can be used.
-If you require extra flexibility, you'll have to bite the bullet and get
-to grips with the low-level interface.
-
-</P>
-
-
-<H3><A NAME="SEC34" HREF="manual_toc.html#TOC34">Standard file-reading/writing code</A></H3>
-<P>
-Here's how you'd write data to a compressed file:
-
-<PRE>
-FILE*   f;
-BZFILE* b;
-int     nBuf;
-char    buf[ /* whatever size you like */ ];
-int     bzerror;
-int     nWritten;
-
-f = fopen ( "myfile.bz2", "w" );
-if (!f) {
-   /* handle error */
-}
-b = BZ2_bzWriteOpen ( &#38;bzerror, f, 9 );
-if (bzerror != BZ_OK) {
-   BZ2_bzWriteClose ( b );
-   /* handle error */
-}
-
-while ( /* condition */ ) {
-   /* get data to write into buf, and set nBuf appropriately */
-   nWritten = BZ2_bzWrite ( &#38;bzerror, b, buf, nBuf );
-   if (bzerror == BZ_IO_ERROR) { 
-      BZ2_bzWriteClose ( &#38;bzerror, b );
-      /* handle error */
-   }
-}
-
-BZ2_bzWriteClose ( &#38;bzerror, b );
-if (bzerror == BZ_IO_ERROR) {
-   /* handle error */
-}
-</PRE>
-
-<P>
-And to read from a compressed file:
-
-<PRE>
-FILE*   f;
-BZFILE* b;
-int     nBuf;
-char    buf[ /* whatever size you like */ ];
-int     bzerror;
-int     nWritten;
-
-f = fopen ( "myfile.bz2", "r" );
-if (!f) {
-   /* handle error */
-}
-b = BZ2_bzReadOpen ( &#38;bzerror, f, 0, NULL, 0 );
-if (bzerror != BZ_OK) {
-   BZ2_bzReadClose ( &#38;bzerror, b );
-   /* handle error */
-}
-
-bzerror = BZ_OK;
-while (bzerror == BZ_OK &#38;&#38; /* arbitrary other conditions */) {
-   nBuf = BZ2_bzRead ( &#38;bzerror, b, buf, /* size of buf */ );
-   if (bzerror == BZ_OK) {
-      /* do something with buf[0 .. nBuf-1] */
-   }
-}
-if (bzerror != BZ_STREAM_END) {
-   BZ2_bzReadClose ( &#38;bzerror, b );
-   /* handle error */
-} else {
-   BZ2_bzReadClose ( &#38;bzerror );
-}
-</PRE>
-
-
-
-<H2><A NAME="SEC35" HREF="manual_toc.html#TOC35">Utility functions</A></H2>
-
-
-<H3><A NAME="SEC36" HREF="manual_toc.html#TOC36"><CODE>BZ2_bzBuffToBuffCompress</CODE></A></H3>
-
-<PRE>
-   int BZ2_bzBuffToBuffCompress( char*         dest,
-                                 unsigned int* destLen,
-                                 char*         source,
-                                 unsigned int  sourceLen,
-                                 int           blockSize100k,
-                                 int           verbosity,
-                                 int           workFactor );
-</PRE>
-
-<P>
-Attempts to compress the data in <CODE>source[0 .. sourceLen-1]</CODE>
-into the destination buffer, <CODE>dest[0 .. *destLen-1]</CODE>.
-If the destination buffer is big enough, <CODE>*destLen</CODE> is
-set to the size of the compressed data, and <CODE>BZ_OK</CODE> is
-returned.  If the compressed data won't fit, <CODE>*destLen</CODE>
-is unchanged, and <CODE>BZ_OUTBUFF_FULL</CODE> is returned.
-
-</P>
-<P>
-Compression in this manner is a one-shot event, done with a single call
-to this function.  The resulting compressed data is a complete
-<CODE>bzip2</CODE> format data stream.  There is no mechanism for making
-additional calls to provide extra input data.  If you want that kind of
-mechanism, use the low-level interface.
-
-</P>
-<P>
-For the meaning of parameters <CODE>blockSize100k</CODE>, <CODE>verbosity</CODE>
-and <CODE>workFactor</CODE>, <BR> see <CODE>BZ2_bzCompressInit</CODE>.
-
-</P>
-<P>
-To guarantee that the compressed data will fit in its buffer, allocate
-an output buffer of size 1% larger than the uncompressed data, plus
-six hundred extra bytes.
-
-</P>
-<P>
-<CODE>BZ2_bzBuffToBuffDecompress</CODE> will not write data at or
-beyond <CODE>dest[*destLen]</CODE>, even in case of buffer overflow.
-
-</P>
-<P>
-Possible return values:
-
-<PRE>
-      <CODE>BZ_CONFIG_ERROR</CODE>
-         if the library has been mis-compiled
-      <CODE>BZ_PARAM_ERROR</CODE> 
-         if <CODE>dest</CODE> is <CODE>NULL</CODE> or <CODE>destLen</CODE> is <CODE>NULL</CODE>
-         or <CODE>blockSize100k &#60; 1</CODE> or <CODE>blockSize100k &#62; 9</CODE>
-         or <CODE>verbosity &#60; 0</CODE> or <CODE>verbosity &#62; 4</CODE> 
-         or <CODE>workFactor &#60; 0</CODE> or <CODE>workFactor &#62; 250</CODE>
-      <CODE>BZ_MEM_ERROR</CODE>
-         if insufficient memory is available 
-      <CODE>BZ_OUTBUFF_FULL</CODE>
-         if the size of the compressed data exceeds <CODE>*destLen</CODE>
-      <CODE>BZ_OK</CODE> 
-         otherwise
-</PRE>
-
-
-
-<H3><A NAME="SEC37" HREF="manual_toc.html#TOC37"><CODE>BZ2_bzBuffToBuffDecompress</CODE></A></H3>
-
-<PRE>
-   int BZ2_bzBuffToBuffDecompress ( char*         dest,
-                                    unsigned int* destLen,
-                                    char*         source,
-                                    unsigned int  sourceLen,
-                                    int           small,
-                                    int           verbosity );
-</PRE>
-
-<P>
-Attempts to decompress the data in <CODE>source[0 .. sourceLen-1]</CODE>
-into the destination buffer, <CODE>dest[0 .. *destLen-1]</CODE>.
-If the destination buffer is big enough, <CODE>*destLen</CODE> is
-set to the size of the uncompressed data, and <CODE>BZ_OK</CODE> is
-returned.  If the compressed data won't fit, <CODE>*destLen</CODE>
-is unchanged, and <CODE>BZ_OUTBUFF_FULL</CODE> is returned.
-
-</P>
-<P>
-<CODE>source</CODE> is assumed to hold a complete <CODE>bzip2</CODE> format
-data stream.  <BR> <CODE>BZ2_bzBuffToBuffDecompress</CODE> tries to decompress
-the entirety of the stream into the output buffer.
-
-</P>
-<P>
-For the meaning of parameters <CODE>small</CODE> and <CODE>verbosity</CODE>,
-see <CODE>BZ2_bzDecompressInit</CODE>.
-
-</P>
-<P>
-Because the compression ratio of the compressed data cannot be known in
-advance, there is no easy way to guarantee that the output buffer will
-be big enough.  You may of course make arrangements in your code to
-record the size of the uncompressed data, but such a mechanism is beyond
-the scope of this library.
-
-</P>
-<P>
-<CODE>BZ2_bzBuffToBuffDecompress</CODE> will not write data at or
-beyond <CODE>dest[*destLen]</CODE>, even in case of buffer overflow.
-
-</P>
-<P>
-Possible return values:
-
-<PRE>
-      <CODE>BZ_CONFIG_ERROR</CODE>
-         if the library has been mis-compiled
-      <CODE>BZ_PARAM_ERROR</CODE> 
-         if <CODE>dest</CODE> is <CODE>NULL</CODE> or <CODE>destLen</CODE> is <CODE>NULL</CODE>
-         or <CODE>small != 0 &#38;&#38; small != 1</CODE>
-         or <CODE>verbosity &#60; 0</CODE> or <CODE>verbosity &#62; 4</CODE> 
-      <CODE>BZ_MEM_ERROR</CODE>
-         if insufficient memory is available 
-      <CODE>BZ_OUTBUFF_FULL</CODE>
-         if the size of the compressed data exceeds <CODE>*destLen</CODE>
-      <CODE>BZ_DATA_ERROR</CODE>
-         if a data integrity error was detected in the compressed data
-      <CODE>BZ_DATA_ERROR_MAGIC</CODE>
-         if the compressed data doesn't begin with the right magic bytes
-      <CODE>BZ_UNEXPECTED_EOF</CODE>
-         if the compressed data ends unexpectedly
-      <CODE>BZ_OK</CODE> 
-         otherwise
-</PRE>
-
-
-
-<H2><A NAME="SEC38" HREF="manual_toc.html#TOC38"><CODE>zlib</CODE> compatibility functions</A></H2>
-<P>
-Yoshioka Tsuneo has contributed some functions to
-give better <CODE>zlib</CODE> compatibility.  These functions are
-<CODE>BZ2_bzopen</CODE>, <CODE>BZ2_bzread</CODE>, <CODE>BZ2_bzwrite</CODE>, <CODE>BZ2_bzflush</CODE>,
-<CODE>BZ2_bzclose</CODE>,
-<CODE>BZ2_bzerror</CODE> and <CODE>BZ2_bzlibVersion</CODE>.
-These functions are not (yet) officially part of
-the library.  If they break, you get to keep all the pieces.
-Nevertheless, I think they work ok.
-
-<PRE>
-typedef void BZFILE;
-
-const char * BZ2_bzlibVersion ( void );
-</PRE>
-
-<P>
-Returns a string indicating the library version.
-
-<PRE>
-BZFILE * BZ2_bzopen  ( const char *path, const char *mode );
-BZFILE * BZ2_bzdopen ( int        fd,    const char *mode );
-</PRE>
-
-<P>
-Opens a <CODE>.bz2</CODE> file for reading or writing, using either its name
-or a pre-existing file descriptor. 
-Analogous to <CODE>fopen</CODE> and <CODE>fdopen</CODE>.
-
-<PRE>
-int BZ2_bzread  ( BZFILE* b, void* buf, int len );
-int BZ2_bzwrite ( BZFILE* b, void* buf, int len );
-</PRE>
-
-<P>
-Reads/writes data from/to a previously opened <CODE>BZFILE</CODE>.
-Analogous to <CODE>fread</CODE> and <CODE>fwrite</CODE>.
-
-<PRE>
-int  BZ2_bzflush ( BZFILE* b );
-void BZ2_bzclose ( BZFILE* b );
-</PRE>
-
-<P>
-Flushes/closes a <CODE>BZFILE</CODE>.  <CODE>BZ2_bzflush</CODE> doesn't actually do
-anything.  Analogous to <CODE>fflush</CODE> and <CODE>fclose</CODE>.
-
-</P>
-
-<PRE>
-const char * BZ2_bzerror ( BZFILE *b, int *errnum )
-</PRE>
-
-<P>
-Returns a string describing the more recent error status of
-<CODE>b</CODE>, and also sets <CODE>*errnum</CODE> to its numerical value.
-
-</P>
-
-
-
-<H2><A NAME="SEC39" HREF="manual_toc.html#TOC39">Using the library in a <CODE>stdio</CODE>-free environment</A></H2>
-
-
-
-<H3><A NAME="SEC40" HREF="manual_toc.html#TOC40">Getting rid of <CODE>stdio</CODE></A></H3>
-
-<P>
-In a deeply embedded application, you might want to use just
-the memory-to-memory functions.  You can do this conveniently
-by compiling the library with preprocessor symbol <CODE>BZ_NO_STDIO</CODE>
-defined.  Doing this gives you a library containing only the following
-eight functions:
-
-</P>
-<P>
-<CODE>BZ2_bzCompressInit</CODE>, <CODE>BZ2_bzCompress</CODE>, <CODE>BZ2_bzCompressEnd</CODE> <BR>
-<CODE>BZ2_bzDecompressInit</CODE>, <CODE>BZ2_bzDecompress</CODE>, <CODE>BZ2_bzDecompressEnd</CODE> <BR>
-<CODE>BZ2_bzBuffToBuffCompress</CODE>, <CODE>BZ2_bzBuffToBuffDecompress</CODE>
-
-</P>
-<P>
-When compiled like this, all functions will ignore <CODE>verbosity</CODE>
-settings.
-
-</P>
-
-
-<H3><A NAME="SEC41" HREF="manual_toc.html#TOC41">Critical error handling</A></H3>
-<P>
-<CODE>libbzip2</CODE> contains a number of internal assertion checks which
-should, needless to say, never be activated.  Nevertheless, if an
-assertion should fail, behaviour depends on whether or not the library
-was compiled with <CODE>BZ_NO_STDIO</CODE> set.
-
-</P>
-<P>
-For a normal compile, an assertion failure yields the message
-
-<PRE>
-   bzip2/libbzip2: internal error number N.
-   This is a bug in bzip2/libbzip2, 1.0 of 21-Mar-2000.
-   Please report it to me at: jseward@acm.org.  If this happened
-   when you were using some program which uses libbzip2 as a
-   component, you should also report this bug to the author(s)
-   of that program.  Please make an effort to report this bug;
-   timely and accurate bug reports eventually lead to higher
-   quality software.  Thanks.  Julian Seward, 21 March 2000.
-</PRE>
-
-<P>
-where <CODE>N</CODE> is some error code number.  <CODE>exit(3)</CODE>
-is then called.
-
-</P>
-<P>
-For a <CODE>stdio</CODE>-free library, assertion failures result
-in a call to a function declared as:
-
-<PRE>
-   extern void bz_internal_error ( int errcode );
-</PRE>
-
-<P>
-The relevant code is passed as a parameter.  You should supply
-such a function.
-
-</P>
-<P>
-In either case, once an assertion failure has occurred, any 
-<CODE>bz_stream</CODE> records involved can be regarded as invalid.
-You should not attempt to resume normal operation with them.
-
-</P>
-<P>
-You may, of course, change critical error handling to suit
-your needs.  As I said above, critical errors indicate bugs
-in the library and should not occur.  All "normal" error
-situations are indicated via error return codes from functions,
-and can be recovered from.
-
-</P>
-
-
-
-<H2><A NAME="SEC42" HREF="manual_toc.html#TOC42">Making a Windows DLL</A></H2>
-<P>
-Everything related to Windows has been contributed by Yoshioka Tsuneo
-<BR> (<CODE>QWF00133@niftyserve.or.jp</CODE> /
-<CODE>tsuneo-y@is.aist-nara.ac.jp</CODE>), so you should send your queries to
-him (but perhaps Cc: me, <CODE>jseward@acm.org</CODE>).
-
-</P>
-<P>
-My vague understanding of what to do is: using Visual C++ 5.0,
-open the project file <CODE>libbz2.dsp</CODE>, and build.  That's all.
-
-</P>
-<P>
-If you can't
-open the project file for some reason, make a new one, naming these files:
-<CODE>blocksort.c</CODE>, <CODE>bzlib.c</CODE>, <CODE>compress.c</CODE>, 
-<CODE>crctable.c</CODE>, <CODE>decompress.c</CODE>, <CODE>huffman.c</CODE>, <BR>
-<CODE>randtable.c</CODE> and <CODE>libbz2.def</CODE>.  You will also need
-to name the header files <CODE>bzlib.h</CODE> and <CODE>bzlib_private.h</CODE>.
-
-</P>
-<P>
-If you don't use VC++, you may need to define the proprocessor symbol
-<CODE>_WIN32</CODE>. 
-
-</P>
-<P>
-Finally, <CODE>dlltest.c</CODE> is a sample program using the DLL.  It has a
-project file, <CODE>dlltest.dsp</CODE>.
-
-</P>
-<P>
-If you just want a makefile for Visual C, have a look at
-<CODE>makefile.msc</CODE>.
-
-</P>
-<P>
-Be aware that if you compile <CODE>bzip2</CODE> itself on Win32, you must set
-<CODE>BZ_UNIX</CODE> to 0 and <CODE>BZ_LCCWIN32</CODE> to 1, in the file
-<CODE>bzip2.c</CODE>, before compiling.  Otherwise the resulting binary won't
-work correctly.
-
-</P>
-<P>
-I haven't tried any of this stuff myself, but it all looks plausible.
-
-</P>
-
-<P><HR><P>
-<p>Go to the <A HREF="manual_1.html">first</A>, <A HREF="manual_2.html">previous</A>, <A HREF="manual_4.html">next</A>, <A HREF="manual_4.html">last</A> section, <A HREF="manual_toc.html">table of contents</A>.
-</BODY>
-</HTML>
diff --git a/winsup/bz2lib/manual_4.html b/winsup/bz2lib/manual_4.html
deleted file mode 100644
index 9ab7fb24f..000000000
--- a/winsup/bz2lib/manual_4.html
+++ /dev/null
@@ -1,528 +0,0 @@
-<HTML>
-<HEAD>
-<!-- This HTML file has been created by texi2html 1.54
-     from manual.texi on 23 March 2000 -->
-
-<TITLE>bzip2 and libbzip2 - Miscellanea</TITLE>
-<link href="manual_3.html" rel=Previous>
-<link href="manual_toc.html" rel=ToC>
-
-</HEAD>
-<BODY>
-<p>Go to the <A HREF="manual_1.html">first</A>, <A HREF="manual_3.html">previous</A>, next, last section, <A HREF="manual_toc.html">table of contents</A>.
-<P><HR><P>
-
-
-<H1><A NAME="SEC43" HREF="manual_toc.html#TOC43">Miscellanea</A></H1>
-
-<P>
-These are just some random thoughts of mine.  Your mileage may
-vary.
-
-</P>
-
-
-<H2><A NAME="SEC44" HREF="manual_toc.html#TOC44">Limitations of the compressed file format</A></H2>
-<P>
-<CODE>bzip2-1.0</CODE>, <CODE>0.9.5</CODE> and <CODE>0.9.0</CODE>
-use exactly the same file format as the previous
-version, <CODE>bzip2-0.1</CODE>.  This decision was made in the interests of
-stability.  Creating yet another incompatible compressed file format
-would create further confusion and disruption for users.
-
-</P>
-<P>
-Nevertheless, this is not a painless decision.  Development
-work since the release of <CODE>bzip2-0.1</CODE> in August 1997
-has shown complexities in the file format which slow down
-decompression and, in retrospect, are unnecessary.  These are:
-
-<UL>
-<LI>The run-length encoder, which is the first of the
-
-      compression transformations, is entirely irrelevant.
-      The original purpose was to protect the sorting algorithm
-      from the very worst case input: a string of repeated
-      symbols.  But algorithm steps Q6a and Q6b in the original
-      Burrows-Wheeler technical report (SRC-124) show how
-      repeats can be handled without difficulty in block
-      sorting.
-<LI>The randomisation mechanism doesn't really need to be
-
-      there.  Udi Manber and Gene Myers published a suffix
-      array construction algorithm a few years back, which
-      can be employed to sort any block, no matter how 
-      repetitive, in O(N log N) time.  Subsequent work by
-      Kunihiko Sadakane has produced a derivative O(N (log N)^2) 
-      algorithm which usually outperforms the Manber-Myers
-      algorithm.
-
-      I could have changed to Sadakane's algorithm, but I find
-      it to be slower than <CODE>bzip2</CODE>'s existing algorithm for
-      most inputs, and the randomisation mechanism protects
-      adequately against bad cases.  I didn't think it was
-      a good tradeoff to make.  Partly this is due to the fact
-      that I was not flooded with email complaints about
-      <CODE>bzip2-0.1</CODE>'s performance on repetitive data, so
-      perhaps it isn't a problem for real inputs.
-
-      Probably the best long-term solution,
-      and the one I have incorporated into 0.9.5 and above,
-      is to use the existing sorting
-      algorithm initially, and fall back to a O(N (log N)^2)
-      algorithm if the standard algorithm gets into difficulties.
-<LI>The compressed file format was never designed to be
-
-      handled by a library, and I have had to jump though
-      some hoops to produce an efficient implementation of
-      decompression.  It's a bit hairy.  Try passing
-      <CODE>decompress.c</CODE> through the C preprocessor 
-      and you'll see what I mean.  Much of this complexity
-      could have been avoided if the compressed size of
-      each block of data was recorded in the data stream.
-<LI>An Adler-32 checksum, rather than a CRC32 checksum,
-
-      would be faster to compute.
-</UL>
-
-<P>
-It would be fair to say that the <CODE>bzip2</CODE> format was frozen
-before I properly and fully understood the performance
-consequences of doing so.
-
-</P>
-<P>
-Improvements which I was able to incorporate into
-0.9.0, despite using the same file format, are:
-
-<UL>
-<LI>Single array implementation of the inverse BWT.  This
-
-      significantly speeds up decompression, presumably
-      because it reduces the number of cache misses.
-<LI>Faster inverse MTF transform for large MTF values.  The
-
-      new implementation is based on the notion of sliding blocks
-      of values.
-<LI><CODE>bzip2-0.9.0</CODE> now reads and writes files with <CODE>fread</CODE>
-
-      and <CODE>fwrite</CODE>; version 0.1 used <CODE>putc</CODE> and <CODE>getc</CODE>.
-      Duh!  Well, you live and learn.
-
-</UL>
-
-<P>
-Further ahead, it would be nice 
-to be able to do random access into files.  This will 
-require some careful design of compressed file formats.
-
-</P>
-
-
-
-<H2><A NAME="SEC45" HREF="manual_toc.html#TOC45">Portability issues</A></H2>
-<P>
-After some consideration, I have decided not to use
-GNU <CODE>autoconf</CODE> to configure 0.9.5 or 1.0.
-
-</P>
-<P>
-<CODE>autoconf</CODE>, admirable and wonderful though it is, 
-mainly assists with portability problems between Unix-like
-platforms.  But <CODE>bzip2</CODE> doesn't have much in the way
-of portability problems on Unix; most of the difficulties appear
-when porting to the Mac, or to Microsoft's operating systems.
-<CODE>autoconf</CODE> doesn't help in those cases, and brings in a 
-whole load of new complexity.
-
-</P>
-<P>
-Most people should be able to compile the library and program
-under Unix straight out-of-the-box, so to speak, especially 
-if you have a version of GNU C available.
-
-</P>
-<P>
-There are a couple of <CODE>__inline__</CODE> directives in the code.  GNU C
-(<CODE>gcc</CODE>) should be able to handle them.  If you're not using
-GNU C, your C compiler shouldn't see them at all.
-If your compiler does, for some reason, see them and doesn't
-like them, just <CODE>#define</CODE> <CODE>__inline__</CODE> to be <CODE>/* */</CODE>.  One
-easy way to do this is to compile with the flag <CODE>-D__inline__=</CODE>, 
-which should be understood by most Unix compilers.
-
-</P>
-<P>
-If you still have difficulties, try compiling with the macro
-<CODE>BZ_STRICT_ANSI</CODE> defined.  This should enable you to build the
-library in a strictly ANSI compliant environment.  Building the program
-itself like this is dangerous and not supported, since you remove
-<CODE>bzip2</CODE>'s checks against compressing directories, symbolic links,
-devices, and other not-really-a-file entities.  This could cause
-filesystem corruption!
-
-</P>
-<P>
-One other thing: if you create a <CODE>bzip2</CODE> binary for public
-distribution, please try and link it statically (<CODE>gcc -s</CODE>).  This
-avoids all sorts of library-version issues that others may encounter
-later on.
-
-</P>
-<P>
-If you build <CODE>bzip2</CODE> on Win32, you must set <CODE>BZ_UNIX</CODE> to 0 and
-<CODE>BZ_LCCWIN32</CODE> to 1, in the file <CODE>bzip2.c</CODE>, before compiling.
-Otherwise the resulting binary won't work correctly.
-
-</P>
-
-
-
-<H2><A NAME="SEC46" HREF="manual_toc.html#TOC46">Reporting bugs</A></H2>
-<P>
-I tried pretty hard to make sure <CODE>bzip2</CODE> is
-bug free, both by design and by testing.  Hopefully
-you'll never need to read this section for real.
-
-</P>
-<P>
-Nevertheless, if <CODE>bzip2</CODE> dies with a segmentation
-fault, a bus error or an internal assertion failure, it
-will ask you to email me a bug report.  Experience with
-version 0.1 shows that almost all these problems can
-be traced to either compiler bugs or hardware problems.
-
-<UL>
-<LI>
-
-Recompile the program with no optimisation, and see if it
-works.  And/or try a different compiler.
-I heard all sorts of stories about various flavours
-of GNU C (and other compilers) generating bad code for
-<CODE>bzip2</CODE>, and I've run across two such examples myself.
-
-2.7.X versions of GNU C are known to generate bad code from
-time to time, at high optimisation levels.  
-If you get problems, try using the flags
-<CODE>-O2</CODE> <CODE>-fomit-frame-pointer</CODE> <CODE>-fno-strength-reduce</CODE>.
-You should specifically <EM>not</EM> use <CODE>-funroll-loops</CODE>.
-
-You may notice that the Makefile runs six tests as part of
-the build process.  If the program passes all of these, it's
-a pretty good (but not 100%) indication that the compiler has
-done its job correctly.
-<LI>
-
-If <CODE>bzip2</CODE> crashes randomly, and the crashes are not
-repeatable, you may have a flaky memory subsystem.  <CODE>bzip2</CODE>
-really hammers your memory hierarchy, and if it's a bit marginal,
-you may get these problems.  Ditto if your disk or I/O subsystem
-is slowly failing.  Yup, this really does happen.
-
-Try using a different machine of the same type, and see if
-you can repeat the problem.
-<LI>This isn't really a bug, but ... If <CODE>bzip2</CODE> tells
-
-you your file is corrupted on decompression, and you
-obtained the file via FTP, there is a possibility that you
-forgot to tell FTP to do a binary mode transfer.  That absolutely
-will cause the file to be non-decompressible.  You'll have to transfer
-it again.
-</UL>
-
-<P>
-If you've incorporated <CODE>libbzip2</CODE> into your own program
-and are getting problems, please, please, please, check that the 
-parameters you are passing in calls to the library, are
-correct, and in accordance with what the documentation says
-is allowable.  I have tried to make the library robust against
-such problems, but I'm sure I haven't succeeded.
-
-</P>
-<P>
-Finally, if the above comments don't help, you'll have to send
-me a bug report.  Now, it's just amazing how many people will 
-send me a bug report saying something like
-
-<PRE>
-   bzip2 crashed with segmentation fault on my machine
-</PRE>
-
-<P>
-and absolutely nothing else.  Needless to say, a such a report
-is <EM>totally, utterly, completely and comprehensively 100% useless; 
-a waste of your time, my time, and net bandwidth</EM>.
-With no details at all, there's no way I can possibly begin
-to figure out what the problem is.
-
-</P>
-<P>
-The rules of the game are: facts, facts, facts.  Don't omit
-them because "oh, they won't be relevant".  At the bare 
-minimum:
-
-<PRE>
-   Machine type.  Operating system version.  
-   Exact version of <CODE>bzip2</CODE> (do <CODE>bzip2 -V</CODE>).  
-   Exact version of the compiler used.  
-   Flags passed to the compiler.
-</PRE>
-
-<P>
-However, the most important single thing that will help me is
-the file that you were trying to compress or decompress at the
-time the problem happened.  Without that, my ability to do anything
-more than speculate about the cause, is limited.
-
-</P>
-<P>
-Please remember that I connect to the Internet with a modem, so
-you should contact me before mailing me huge files.
-
-</P>
-
-
-
-<H2><A NAME="SEC47" HREF="manual_toc.html#TOC47">Did you get the right package?</A></H2>
-
-<P>
-<CODE>bzip2</CODE> is a resource hog.  It soaks up large amounts of CPU cycles
-and memory.  Also, it gives very large latencies.  In the worst case, you
-can feed many megabytes of uncompressed data into the library before
-getting any compressed output, so this probably rules out applications
-requiring interactive behaviour.
-
-</P>
-<P>
-These aren't faults of my implementation, I hope, but more
-an intrinsic property of the Burrows-Wheeler transform (unfortunately).  
-Maybe this isn't what you want.
-
-</P>
-<P>
-If you want a compressor and/or library which is faster, uses less
-memory but gets pretty good compression, and has minimal latency,
-consider Jean-loup
-Gailly's and Mark Adler's work, <CODE>zlib-1.1.2</CODE> and
-<CODE>gzip-1.2.4</CODE>.  Look for them at
-
-</P>
-<P>
-<CODE>http://www.cdrom.com/pub/infozip/zlib</CODE> and
-<CODE>http://www.gzip.org</CODE> respectively.
-
-</P>
-<P>
-For something faster and lighter still, you might try Markus F X J
-Oberhumer's <CODE>LZO</CODE> real-time compression/decompression library, at
-<BR> <CODE>http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html</CODE>.
-
-</P>
-<P>
-If you want to use the <CODE>bzip2</CODE> algorithms to compress small blocks
-of data, 64k bytes or smaller, for example on an on-the-fly disk
-compressor, you'd be well advised not to use this library.  Instead,
-I've made a special library tuned for that kind of use.  It's part of
-<CODE>e2compr-0.40</CODE>, an on-the-fly disk compressor for the Linux
-<CODE>ext2</CODE> filesystem.  Look at
-<CODE>http://www.netspace.net.au/~reiter/e2compr</CODE>.
-
-</P>
-
-
-
-<H2><A NAME="SEC48" HREF="manual_toc.html#TOC48">Testing</A></H2>
-
-<P>
-A record of the tests I've done.
-
-</P>
-<P>
-First, some data sets:
-
-<UL>
-<LI>B: a directory containing 6001 files, one for every length in the
-
-      range 0 to 6000 bytes.  The files contain random lowercase
-      letters.  18.7 megabytes.
-<LI>H: my home directory tree.  Documents, source code, mail files,
-
-      compressed data.  H contains B, and also a directory of 
-      files designed as boundary cases for the sorting; mostly very
-      repetitive, nasty files.  565 megabytes.
-<LI>A: directory tree holding various applications built from source:
-
-      <CODE>egcs</CODE>, <CODE>gcc-2.8.1</CODE>, KDE, GTK, Octave, etc.
-      2200 megabytes.
-</UL>
-
-<P>
-The tests conducted are as follows.  Each test means compressing 
-(a copy of) each file in the data set, decompressing it and
-comparing it against the original.
-
-</P>
-<P>
-First, a bunch of tests with block sizes and internal buffer
-sizes set very small, 
-to detect any problems with the
-blocking and buffering mechanisms.  
-This required modifying the source code so as to try to 
-break it.
-
-<OL>
-<LI>Data set H, with
-
-      buffer size of 1 byte, and block size of 23 bytes.
-<LI>Data set B, buffer sizes 1 byte, block size 1 byte.
-
-<LI>As (2) but small-mode decompression.
-
-<LI>As (2) with block size 2 bytes.
-
-<LI>As (2) with block size 3 bytes.
-
-<LI>As (2) with block size 4 bytes.
-
-<LI>As (2) with block size 5 bytes.
-
-<LI>As (2) with block size 6 bytes and small-mode decompression.
-
-<LI>H with buffer size of 1 byte, but normal block
-
-      size (up to 900000 bytes).
-</OL>
-
-<P>
-Then some tests with unmodified source code.
-
-<OL>
-<LI>H, all settings normal.
-
-<LI>As (1), with small-mode decompress.
-
-<LI>H, compress with flag <CODE>-1</CODE>.
-
-<LI>H, compress with flag <CODE>-s</CODE>, decompress with flag <CODE>-s</CODE>.
-
-<LI>Forwards compatibility: H, <CODE>bzip2-0.1pl2</CODE> compressing,
-
-      <CODE>bzip2-0.9.5</CODE> decompressing, all settings normal.
-<LI>Backwards compatibility:  H, <CODE>bzip2-0.9.5</CODE> compressing,
-
-      <CODE>bzip2-0.1pl2</CODE> decompressing, all settings normal.
-<LI>Bigger tests: A, all settings normal.
-
-<LI>As (7), using the fallback (Sadakane-like) sorting algorithm.
-
-<LI>As (8), compress with flag <CODE>-1</CODE>, decompress with flag
-
-      <CODE>-s</CODE>.
-<LI>H, using the fallback sorting algorithm.
-
-<LI>Forwards compatibility: A, <CODE>bzip2-0.1pl2</CODE> compressing,
-
-      <CODE>bzip2-0.9.5</CODE> decompressing, all settings normal.
-<LI>Backwards compatibility:  A, <CODE>bzip2-0.9.5</CODE> compressing,
-
-      <CODE>bzip2-0.1pl2</CODE> decompressing, all settings normal.
-<LI>Misc test: about 400 megabytes of <CODE>.tar</CODE> files with
-
-      <CODE>bzip2</CODE> compiled with Checker (a memory access error
-       detector, like Purify).
-<LI>Misc tests to make sure it builds and runs ok on non-Linux/x86
-
-      platforms.
-</OL>
-
-<P>
-These tests were conducted on a 225 MHz IDT WinChip machine, running
-Linux 2.0.36.  They represent nearly a week of continuous computation.
-All tests completed successfully.
-
-</P>
-
-
-
-<H2><A NAME="SEC49" HREF="manual_toc.html#TOC49">Further reading</A></H2>
-<P>
-<CODE>bzip2</CODE> is not research work, in the sense that it doesn't present
-any new ideas.  Rather, it's an engineering exercise based on existing
-ideas.
-
-</P>
-<P>
-Four documents describe essentially all the ideas behind <CODE>bzip2</CODE>:
-
-<PRE>
-Michael Burrows and D. J. Wheeler:
-  "A block-sorting lossless data compression algorithm"
-   10th May 1994. 
-   Digital SRC Research Report 124.
-   ftp://ftp.digital.com/pub/DEC/SRC/research-reports/SRC-124.ps.gz
-   If you have trouble finding it, try searching at the
-   New Zealand Digital Library, http://www.nzdl.org.
-
-Daniel S. Hirschberg and Debra A. LeLewer
-  "Efficient Decoding of Prefix Codes"
-   Communications of the ACM, April 1990, Vol 33, Number 4.
-   You might be able to get an electronic copy of this
-      from the ACM Digital Library.
-
-David J. Wheeler
-   Program bred3.c and accompanying document bred3.ps.
-   This contains the idea behind the multi-table Huffman
-   coding scheme.
-   ftp://ftp.cl.cam.ac.uk/users/djw3/
-
-Jon L. Bentley and Robert Sedgewick
-  "Fast Algorithms for Sorting and Searching Strings"
-   Available from Sedgewick's web page,
-   www.cs.princeton.edu/~rs
-</PRE>
-
-<P>
-The following paper gives valuable additional insights into the
-algorithm, but is not immediately the basis of any code
-used in bzip2.
-
-<PRE>
-Peter Fenwick:
-   Block Sorting Text Compression
-   Proceedings of the 19th Australasian Computer Science Conference,
-     Melbourne, Australia.  Jan 31 - Feb 2, 1996.
-   ftp://ftp.cs.auckland.ac.nz/pub/peter-f/ACSC96paper.ps
-</PRE>
-
-<P>
-Kunihiko Sadakane's sorting algorithm, mentioned above,
-is available from:
-
-<PRE>
-http://naomi.is.s.u-tokyo.ac.jp/~sada/papers/Sada98b.ps.gz
-</PRE>
-
-<P>
-The Manber-Myers suffix array construction
-algorithm is described in a paper
-available from:
-
-<PRE>
-http://www.cs.arizona.edu/people/gene/PAPERS/suffix.ps
-</PRE>
-
-<P>
-Finally, the following paper documents some recent investigations
-I made into the performance of sorting algorithms:
-
-<PRE>
-Julian Seward:
-   On the Performance of BWT Sorting Algorithms
-   Proceedings of the IEEE Data Compression Conference 2000
-     Snowbird, Utah.  28-30 March 2000.
-</PRE>
-
-<P><HR><P>
-<p>Go to the <A HREF="manual_1.html">first</A>, <A HREF="manual_3.html">previous</A>, next, last section, <A HREF="manual_toc.html">table of contents</A>.
-</BODY>
-</HTML>
diff --git a/winsup/bz2lib/manual_toc.html b/winsup/bz2lib/manual_toc.html
deleted file mode 100644
index d4132c435..000000000
--- a/winsup/bz2lib/manual_toc.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<HTML>
-<HEAD>
-<!-- This HTML file has been created by texi2html 1.54
-     from manual.texi on 23 March 2000 -->
-
-<TITLE>bzip2 and libbzip2 - Table of Contents</TITLE>
-
-</HEAD>
-<BODY>
-<H1>bzip2 and libbzip2</H1>
-<H2>a program and library for data compression</H2>
-<H2>copyright (C) 1996-2000 Julian Seward</H2>
-<H2>version 1.0 of 21 March 2000</H2>
-<ADDRESS>Julian Seward</ADDRESS>
-<P>
-<P><HR><P>
-
-<P>
-This program, <CODE>bzip2</CODE>, 
-and associated library <CODE>libbzip2</CODE>, are
-Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-</P>
-<P>
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-<UL>
-<LI>
-
-   Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-<LI>
-
-   The origin of this software must not be misrepresented; you must 
-   not claim that you wrote the original software.  If you use this 
-   software in a product, an acknowledgment in the product 
-   documentation would be appreciated but is not required.
-<LI>
-
-   Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
-<LI>
-
-   The name of the author may not be used to endorse or promote 
-   products derived from this software without specific prior written 
-   permission.
-</UL>
-
-<P>
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-</P>
-<P>
-Julian Seward, Cambridge, UK.
-
-</P>
-<P>
-<CODE>jseward@acm.org</CODE>
-
-</P>
-<P>
-<CODE>http://sourceware.cygnus.com/bzip2</CODE>
-
-</P>
-<P>
-<CODE>http://www.cacheprof.org</CODE>
-
-</P>
-<P>
-<CODE>http://www.muraroa.demon.co.uk</CODE>
-
-</P>
-<P>
-<CODE>bzip2</CODE>/<CODE>libbzip2</CODE> version 1.0 of 21 March 2000.
-
-</P>
-<P>
-PATENTS: To the best of my knowledge, <CODE>bzip2</CODE> does not use any patented
-algorithms.  However, I do not have the resources available to carry out
-a full patent search.  Therefore I cannot give any guarantee of the
-above statement.
-
-</P>
-
-<UL>
-<LI><A NAME="TOC1" HREF="manual_1.html#SEC1">Introduction</A>
-<LI><A NAME="TOC2" HREF="manual_2.html#SEC2">How to use <CODE>bzip2</CODE></A>
-<UL>
-<UL>
-<UL>
-<LI><A NAME="TOC3" HREF="manual_2.html#SEC3">NAME</A>
-<LI><A NAME="TOC4" HREF="manual_2.html#SEC4">SYNOPSIS</A>
-<LI><A NAME="TOC5" HREF="manual_2.html#SEC5">DESCRIPTION</A>
-<LI><A NAME="TOC6" HREF="manual_2.html#SEC6">OPTIONS</A>
-<LI><A NAME="TOC7" HREF="manual_2.html#SEC7">MEMORY MANAGEMENT</A>
-<LI><A NAME="TOC8" HREF="manual_2.html#SEC8">RECOVERING DATA FROM DAMAGED FILES</A>
-<LI><A NAME="TOC9" HREF="manual_2.html#SEC9">PERFORMANCE NOTES</A>
-<LI><A NAME="TOC10" HREF="manual_2.html#SEC10">CAVEATS</A>
-<LI><A NAME="TOC11" HREF="manual_2.html#SEC11">AUTHOR</A>
-</UL>
-</UL>
-</UL>
-<LI><A NAME="TOC12" HREF="manual_3.html#SEC12">Programming with <CODE>libbzip2</CODE></A>
-<UL>
-<LI><A NAME="TOC13" HREF="manual_3.html#SEC13">Top-level structure</A>
-<UL>
-<LI><A NAME="TOC14" HREF="manual_3.html#SEC14">Low-level summary</A>
-<LI><A NAME="TOC15" HREF="manual_3.html#SEC15">High-level summary</A>
-<LI><A NAME="TOC16" HREF="manual_3.html#SEC16">Utility functions summary</A>
-</UL>
-<LI><A NAME="TOC17" HREF="manual_3.html#SEC17">Error handling</A>
-<LI><A NAME="TOC18" HREF="manual_3.html#SEC18">Low-level interface</A>
-<UL>
-<LI><A NAME="TOC19" HREF="manual_3.html#SEC19"><CODE>BZ2_bzCompressInit</CODE></A>
-<LI><A NAME="TOC20" HREF="manual_3.html#SEC20"><CODE>BZ2_bzCompress</CODE></A>
-<LI><A NAME="TOC21" HREF="manual_3.html#SEC21"><CODE>BZ2_bzCompressEnd</CODE></A>
-<LI><A NAME="TOC22" HREF="manual_3.html#SEC22"><CODE>BZ2_bzDecompressInit</CODE></A>
-<LI><A NAME="TOC23" HREF="manual_3.html#SEC23"><CODE>BZ2_bzDecompress</CODE></A>
-<LI><A NAME="TOC24" HREF="manual_3.html#SEC24"><CODE>BZ2_bzDecompressEnd</CODE></A>
-</UL>
-<LI><A NAME="TOC25" HREF="manual_3.html#SEC25">High-level interface</A>
-<UL>
-<LI><A NAME="TOC26" HREF="manual_3.html#SEC26"><CODE>BZ2_bzReadOpen</CODE></A>
-<LI><A NAME="TOC27" HREF="manual_3.html#SEC27"><CODE>BZ2_bzRead</CODE></A>
-<LI><A NAME="TOC28" HREF="manual_3.html#SEC28"><CODE>BZ2_bzReadGetUnused</CODE></A>
-<LI><A NAME="TOC29" HREF="manual_3.html#SEC29"><CODE>BZ2_bzReadClose</CODE></A>
-<LI><A NAME="TOC30" HREF="manual_3.html#SEC30"><CODE>BZ2_bzWriteOpen</CODE></A>
-<LI><A NAME="TOC31" HREF="manual_3.html#SEC31"><CODE>BZ2_bzWrite</CODE></A>
-<LI><A NAME="TOC32" HREF="manual_3.html#SEC32"><CODE>BZ2_bzWriteClose</CODE></A>
-<LI><A NAME="TOC33" HREF="manual_3.html#SEC33">Handling embedded compressed data streams</A>
-<LI><A NAME="TOC34" HREF="manual_3.html#SEC34">Standard file-reading/writing code</A>
-</UL>
-<LI><A NAME="TOC35" HREF="manual_3.html#SEC35">Utility functions</A>
-<UL>
-<LI><A NAME="TOC36" HREF="manual_3.html#SEC36"><CODE>BZ2_bzBuffToBuffCompress</CODE></A>
-<LI><A NAME="TOC37" HREF="manual_3.html#SEC37"><CODE>BZ2_bzBuffToBuffDecompress</CODE></A>
-</UL>
-<LI><A NAME="TOC38" HREF="manual_3.html#SEC38"><CODE>zlib</CODE> compatibility functions</A>
-<LI><A NAME="TOC39" HREF="manual_3.html#SEC39">Using the library in a <CODE>stdio</CODE>-free environment</A>
-<UL>
-<LI><A NAME="TOC40" HREF="manual_3.html#SEC40">Getting rid of <CODE>stdio</CODE></A>
-<LI><A NAME="TOC41" HREF="manual_3.html#SEC41">Critical error handling</A>
-</UL>
-<LI><A NAME="TOC42" HREF="manual_3.html#SEC42">Making a Windows DLL</A>
-</UL>
-<LI><A NAME="TOC43" HREF="manual_4.html#SEC43">Miscellanea</A>
-<UL>
-<LI><A NAME="TOC44" HREF="manual_4.html#SEC44">Limitations of the compressed file format</A>
-<LI><A NAME="TOC45" HREF="manual_4.html#SEC45">Portability issues</A>
-<LI><A NAME="TOC46" HREF="manual_4.html#SEC46">Reporting bugs</A>
-<LI><A NAME="TOC47" HREF="manual_4.html#SEC47">Did you get the right package?</A>
-<LI><A NAME="TOC48" HREF="manual_4.html#SEC48">Testing</A>
-<LI><A NAME="TOC49" HREF="manual_4.html#SEC49">Further reading</A>
-</UL>
-</UL>
-<P><HR><P>
-This document was generated on 23 March 2000 using the
-<A HREF="http://wwwcn.cern.ch/dci/texi2html/">texi2html</A>
-translator version 1.51a.</P>
-</BODY>
-</HTML>
diff --git a/winsup/bz2lib/randtable.c b/winsup/bz2lib/randtable.c
deleted file mode 100644
index 983089d46..000000000
--- a/winsup/bz2lib/randtable.c
+++ /dev/null
@@ -1,124 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Table for randomising repetitive blocks               ---*/
-/*---                                           randtable.c ---*/
-/*-------------------------------------------------------------*/
-
-/*--
-  This file is a part of bzip2 and/or libbzip2, a program and
-  library for lossless, block-sorting data compression.
-
-  Copyright (C) 1996-2000 Julian R Seward.  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions
-  are met:
-
-  1. Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
-     documentation would be appreciated but is not required.
-
-  3. Altered source versions must be plainly marked as such, and must
-     not be misrepresented as being the original software.
-
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
-     permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-  Julian Seward, Cambridge, UK.
-  jseward@acm.org
-  bzip2/libbzip2 version 1.0 of 21 March 2000
-
-  This program is based on (at least) the work of:
-     Mike Burrows
-     David Wheeler
-     Peter Fenwick
-     Alistair Moffat
-     Radford Neal
-     Ian H. Witten
-     Robert Sedgewick
-     Jon L. Bentley
-
-  For more information on these sources, see the manual.
---*/
-
-
-#include "bzlib_private.h"
-
-
-/*---------------------------------------------*/
-Int32 BZ2_rNums[512] = { 
-   619, 720, 127, 481, 931, 816, 813, 233, 566, 247, 
-   985, 724, 205, 454, 863, 491, 741, 242, 949, 214, 
-   733, 859, 335, 708, 621, 574, 73, 654, 730, 472, 
-   419, 436, 278, 496, 867, 210, 399, 680, 480, 51, 
-   878, 465, 811, 169, 869, 675, 611, 697, 867, 561, 
-   862, 687, 507, 283, 482, 129, 807, 591, 733, 623, 
-   150, 238, 59, 379, 684, 877, 625, 169, 643, 105, 
-   170, 607, 520, 932, 727, 476, 693, 425, 174, 647, 
-   73, 122, 335, 530, 442, 853, 695, 249, 445, 515, 
-   909, 545, 703, 919, 874, 474, 882, 500, 594, 612, 
-   641, 801, 220, 162, 819, 984, 589, 513, 495, 799, 
-   161, 604, 958, 533, 221, 400, 386, 867, 600, 782, 
-   382, 596, 414, 171, 516, 375, 682, 485, 911, 276, 
-   98, 553, 163, 354, 666, 933, 424, 341, 533, 870, 
-   227, 730, 475, 186, 263, 647, 537, 686, 600, 224, 
-   469, 68, 770, 919, 190, 373, 294, 822, 808, 206, 
-   184, 943, 795, 384, 383, 461, 404, 758, 839, 887, 
-   715, 67, 618, 276, 204, 918, 873, 777, 604, 560, 
-   951, 160, 578, 722, 79, 804, 96, 409, 713, 940, 
-   652, 934, 970, 447, 318, 353, 859, 672, 112, 785, 
-   645, 863, 803, 350, 139, 93, 354, 99, 820, 908, 
-   609, 772, 154, 274, 580, 184, 79, 626, 630, 742, 
-   653, 282, 762, 623, 680, 81, 927, 626, 789, 125, 
-   411, 521, 938, 300, 821, 78, 343, 175, 128, 250, 
-   170, 774, 972, 275, 999, 639, 495, 78, 352, 126, 
-   857, 956, 358, 619, 580, 124, 737, 594, 701, 612, 
-   669, 112, 134, 694, 363, 992, 809, 743, 168, 974, 
-   944, 375, 748, 52, 600, 747, 642, 182, 862, 81, 
-   344, 805, 988, 739, 511, 655, 814, 334, 249, 515, 
-   897, 955, 664, 981, 649, 113, 974, 459, 893, 228, 
-   433, 837, 553, 268, 926, 240, 102, 654, 459, 51, 
-   686, 754, 806, 760, 493, 403, 415, 394, 687, 700, 
-   946, 670, 656, 610, 738, 392, 760, 799, 887, 653, 
-   978, 321, 576, 617, 626, 502, 894, 679, 243, 440, 
-   680, 879, 194, 572, 640, 724, 926, 56, 204, 700, 
-   707, 151, 457, 449, 797, 195, 791, 558, 945, 679, 
-   297, 59, 87, 824, 713, 663, 412, 693, 342, 606, 
-   134, 108, 571, 364, 631, 212, 174, 643, 304, 329, 
-   343, 97, 430, 751, 497, 314, 983, 374, 822, 928, 
-   140, 206, 73, 263, 980, 736, 876, 478, 430, 305, 
-   170, 514, 364, 692, 829, 82, 855, 953, 676, 246, 
-   369, 970, 294, 750, 807, 827, 150, 790, 288, 923, 
-   804, 378, 215, 828, 592, 281, 565, 555, 710, 82, 
-   896, 831, 547, 261, 524, 462, 293, 465, 502, 56, 
-   661, 821, 976, 991, 658, 869, 905, 758, 745, 193, 
-   768, 550, 608, 933, 378, 286, 215, 979, 792, 961, 
-   61, 688, 793, 644, 986, 403, 106, 366, 905, 644, 
-   372, 567, 466, 434, 645, 210, 389, 550, 919, 135, 
-   780, 773, 635, 389, 707, 100, 626, 958, 165, 504, 
-   920, 176, 193, 713, 857, 265, 203, 50, 668, 108, 
-   645, 990, 626, 197, 510, 357, 358, 850, 858, 364, 
-   936, 638
-};
-
-
-/*-------------------------------------------------------------*/
-/*--- end                                       randtable.c ---*/
-/*-------------------------------------------------------------*/
diff --git a/winsup/bz2lib/sample1.bz2 b/winsup/bz2lib/sample1.bz2
deleted file mode 100644
index 18dea6004..000000000
--- a/winsup/bz2lib/sample1.bz2
+++ /dev/null
diff --git a/winsup/bz2lib/sample1.ref b/winsup/bz2lib/sample1.ref
deleted file mode 100644
index a56e52b77..000000000
--- a/winsup/bz2lib/sample1.ref
+++ /dev/null
diff --git a/winsup/bz2lib/sample2.bz2 b/winsup/bz2lib/sample2.bz2
deleted file mode 100644
index d5a6160ba..000000000
--- a/winsup/bz2lib/sample2.bz2
+++ /dev/null
diff --git a/winsup/bz2lib/sample2.ref b/winsup/bz2lib/sample2.ref
deleted file mode 100644
index 34af95839..000000000
--- a/winsup/bz2lib/sample2.ref
+++ /dev/null
diff --git a/winsup/bz2lib/sample3.bz2 b/winsup/bz2lib/sample3.bz2
deleted file mode 100644
index d90cff920..000000000
--- a/winsup/bz2lib/sample3.bz2
+++ /dev/null
diff --git a/winsup/bz2lib/sample3.ref b/winsup/bz2lib/sample3.ref
deleted file mode 100644
index 775a2f68e..000000000
--- a/winsup/bz2lib/sample3.ref
+++ /dev/null
@@ -1,30007 +0,0 @@
-This file is exceedingly boring.  If you find yourself
-reading it, please (1) take it from me that you can safely
-guess what the rest of the file says, and (2) seek professional
-help.
-
-ps.  there are no further sarcastic remarks in this file.
-
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
-ugh
diff --git a/winsup/bz2lib/spewG.c b/winsup/bz2lib/spewG.c
deleted file mode 100644
index 7934e7658..000000000
--- a/winsup/bz2lib/spewG.c
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/* spew out a thoroughly gigantic file designed so that bzip2
-   can compress it reasonably rapidly.  This is to help test
-   support for large files (> 2GB) in a reasonable amount of time.
-   I suggest you use the undocumented --exponential option to
-   bzip2 when compressing the resulting file; this saves a bit of
-   time.  Note: *don't* bother with --exponential when compressing 
-   Real Files; it'll just waste a lot of CPU time :-)
-   (but is otherwise harmless).
-*/
-
-#define _FILE_OFFSET_BITS 64
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/* The number of megabytes of junk to spew out (roughly) */
-#define MEGABYTES 5000
-
-#define N_BUF 1000000
-char buf[N_BUF];
-
-int main ( int argc, char** argv )
-{
-   int ii, kk, p;
-   srandom(1);
-   setbuffer ( stdout, buf, N_BUF );
-   for (kk = 0; kk < MEGABYTES * 515; kk+=3) {
-      p = 25+random()%50;
-      for (ii = 0; ii < p; ii++)
-         printf ( "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" );
-      for (ii = 0; ii < p-1; ii++)
-         printf ( "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" );
-      for (ii = 0; ii < p+1; ii++)
-         printf ( "ccccccccccccccccccccccccccccccccccccc" );
-   }
-   fflush(stdout);
-   return 0;
-}
diff --git a/winsup/bz2lib/unzcrash.c b/winsup/bz2lib/unzcrash.c
deleted file mode 100644
index f0f17fcca..000000000
--- a/winsup/bz2lib/unzcrash.c
+++ /dev/null
@@ -1,126 +0,0 @@
-
-/* A test program written to test robustness to decompression of
-   corrupted data.  Usage is 
-       unzcrash filename
-   and the program will read the specified file, compress it (in memory),
-   and then repeatedly decompress it, each time with a different bit of
-   the compressed data inverted, so as to test all possible one-bit errors.
-   This should not cause any invalid memory accesses.  If it does, 
-   I want to know about it!
-
-   p.s.  As you can see from the above description, the process is
-   incredibly slow.  A file of size eg 5KB will cause it to run for
-   many hours.
-*/
-
-#include <stdio.h>
-#include <assert.h>
-#include "bzlib.h"
-
-#define M_BLOCK 1000000
-
-typedef unsigned char uchar;
-
-#define M_BLOCK_OUT (M_BLOCK + 1000000)
-uchar inbuf[M_BLOCK];
-uchar outbuf[M_BLOCK_OUT];
-uchar zbuf[M_BLOCK + 600 + (M_BLOCK / 100)];
-
-int nIn, nOut, nZ;
-
-static char *bzerrorstrings[] = {
-       "OK"
-      ,"SEQUENCE_ERROR"
-      ,"PARAM_ERROR"
-      ,"MEM_ERROR"
-      ,"DATA_ERROR"
-      ,"DATA_ERROR_MAGIC"
-      ,"IO_ERROR"
-      ,"UNEXPECTED_EOF"
-      ,"OUTBUFF_FULL"
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-      ,"???"   /* for future */
-};
-
-void flip_bit ( int bit )
-{
-   int byteno = bit / 8;
-   int bitno  = bit % 8;
-   uchar mask = 1 << bitno;
-   //fprintf ( stderr, "(byte %d  bit %d  mask %d)",
-   //          byteno, bitno, (int)mask );
-   zbuf[byteno] ^= mask;
-}
-
-int main ( int argc, char** argv )
-{
-   FILE* f;
-   int   r;
-   int   bit;
-   int   i;
-
-   if (argc != 2) {
-      fprintf ( stderr, "usage: unzcrash filename\n" );
-      return 1;
-   }
-
-   f = fopen ( argv[1], "r" );
-   if (!f) {
-      fprintf ( stderr, "unzcrash: can't open %s\n", argv[1] );
-      return 1;
-   }
-
-   nIn = fread ( inbuf, 1, M_BLOCK, f );
-   fprintf ( stderr, "%d bytes read\n", nIn );
-
-   nZ = M_BLOCK;
-   r = BZ2_bzBuffToBuffCompress (
-         zbuf, &nZ, inbuf, nIn, 9, 0, 30 );
-
-   assert (r == BZ_OK);
-   fprintf ( stderr, "%d after compression\n", nZ );
-
-   for (bit = 0; bit < nZ*8; bit++) {
-      fprintf ( stderr, "bit %d  ", bit );
-      flip_bit ( bit );
-      nOut = M_BLOCK_OUT;
-      r = BZ2_bzBuffToBuffDecompress (
-            outbuf, &nOut, zbuf, nZ, 0, 0 );
-      fprintf ( stderr, " %d  %s ", r, bzerrorstrings[-r] );
-
-      if (r != BZ_OK) {
-         fprintf ( stderr, "\n" );
-      } else {
-         if (nOut != nIn) {
-           fprintf(stderr, "nIn/nOut mismatch %d %d\n", nIn, nOut );
-           return 1;
-         } else {
-           for (i = 0; i < nOut; i++)
-             if (inbuf[i] != outbuf[i]) { 
-                fprintf(stderr, "mismatch at %d\n", i ); 
-                return 1; 
-           }
-           if (i == nOut) fprintf(stderr, "really ok!\n" );
-         }
-      }
-
-      flip_bit ( bit );
-   }
-
-#if 0
-   assert (nOut == nIn);
-   for (i = 0; i < nOut; i++) {
-     if (inbuf[i] != outbuf[i]) {
-        fprintf ( stderr, "difference at %d !\n", i );
-        return 1;
-     }
-   }
-#endif
-
-   fprintf ( stderr, "all ok\n" );
-   return 0;
-}
diff --git a/winsup/bz2lib/words0 b/winsup/bz2lib/words0
deleted file mode 100644
index 164a8ed28..000000000
--- a/winsup/bz2lib/words0
+++ /dev/null
@@ -1,5 +0,0 @@
-
-If compilation produces errors, or a large number of warnings, 
-please read README.COMPILATION.PROBLEMS -- you might be able to
-adjust the flags in this Makefile to improve matters.
-
diff --git a/winsup/bz2lib/words1 b/winsup/bz2lib/words1
deleted file mode 100644
index 2e83de9f0..000000000
--- a/winsup/bz2lib/words1
+++ /dev/null
@@ -1,4 +0,0 @@
-
-Doing 6 tests (3 compress, 3 uncompress) ...
-If there's a problem, things might stop at this point.
- 
diff --git a/winsup/bz2lib/words2 b/winsup/bz2lib/words2
deleted file mode 100644
index 203ee39c4..000000000
--- a/winsup/bz2lib/words2
+++ /dev/null
@@ -1,5 +0,0 @@
-
-Checking test results.  If any of the four "cmp"s which follow
-report any differences, something is wrong.  If you can't easily
-figure out what, please let me know (jseward@acm.org).
-
diff --git a/winsup/bz2lib/words3 b/winsup/bz2lib/words3
deleted file mode 100644
index 8486a84c8..000000000
--- a/winsup/bz2lib/words3
+++ /dev/null
@@ -1,23 +0,0 @@
-
-If you got this far and the "cmp"s didn't complain, it looks
-like you're in business.  
-
-To install in /usr/bin, /usr/lib, /usr/man and /usr/include, type
-   make install
-To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type 
-   make install PREFIX=/xxx/yyy
-If you are (justifiably) paranoid and want to see what 'make install'
-is going to do, you can first do
-   make -n install                      or
-   make -n install PREFIX=/xxx/yyy      respectively.
-The -n instructs make to show the commands it would execute, but
-not actually execute them.
-
-Instructions for use are in the preformatted manual page, in the file
-bzip2.txt.  For more detailed documentation, read the full manual.  
-It is available in Postscript form (manual.ps) and HTML form
-(manual_toc.html).
-
-You can also do "bzip2 --help" to see some helpful information. 
-"bzip2 -L" displays the software license.
-
diff --git a/winsup/configure b/winsup/configure
deleted file mode 100755
index 5dee7e399..000000000
--- a/winsup/configure
+++ /dev/null
@@ -1,1341 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
- --enable-server		Build a cygwin DLL which can communicate with cygserver"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.in
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:580: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:601: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:619: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:651: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CC"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:683: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CC="gcc"
-fi
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:719: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:768: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:792: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
-set dummy ${ac_tool_prefix}g++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:822: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="${ac_tool_prefix}g++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CXX"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "g++", so it can be a program name with args.
-set dummy g++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:854: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="g++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CXX" && ac_cv_prog_CXX="g++"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CXX="g++"
-fi
-fi
-
-if test -z "$CXX"; then
-  # Extract the first word of "c++", so it can be a program name with args.
-set dummy c++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:890: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="c++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-CXXFLAGS='$(CFLAGS)'
-
-
-use_cygserver='yes'
-# Check whether --enable-server or --disable-server was given.
-if test "${enable_server+set}" = set; then
-  enableval="$enable_server"
-  case "${enableval}" in
-yes)	;;
-no)	use_cygserver=;;
-esac
-
-fi
-
-
-SUBDIRS='cygwin w32api'
-test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
-
-case "$with_cross_host" in
-  ""|*cygwin*)
-    # test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
-    # test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
-    # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
-    test -n "$use_cygserver" -a -d $srcdir/cygserver && SUBDIRS="$SUBDIRS cygserver"
-    SUBDIRS="$SUBDIRS utils doc"
-    ;;
-esac
-
-subdirs="$SUBDIRS"
-
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:951: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CC@%$CC%g
-s%@CXX@%$CXX%g
-s%@subdirs@%$subdirs%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@SUBDIRS@%$SUBDIRS%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case "$ac_arg" in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  for ac_config_dir in $SUBDIRS; do
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    if test ! -d $srcdir/$ac_config_dir; then
-      continue
-    fi
-
-    echo configuring in $ac_config_dir
-
-    case "$srcdir" in
-    .) ;;
-    *)
-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-      else
-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
-      fi
-      ;;
-    esac
-
-    ac_popdir=`pwd`
-    cd $ac_config_dir
-
-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-
-    case "$srcdir" in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure=$ac_sub_srcdir/configure
-    elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-
-      # Make the cache file name correct relative to the subdirectory.
-      case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file="$ac_dots$cache_file" ;;
-      esac
-
-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-      # The eval makes quoting arguments work.
-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
-      fi
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
diff --git a/winsup/configure.in b/winsup/configure.in
deleted file mode 100755
index 18766ba8c..000000000
--- a/winsup/configure.in
+++ /dev/null
@@ -1,96 +0,0 @@
-dnl Autoconf configure script for Cygwin.
-dnl Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-dnl
-dnl This file is part of Cygwin.
-dnl
-dnl This software is a copyrighted work licensed under the terms of the
-dnl Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-dnl details.
-dnl
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.12)dnl
-AC_INIT(Makefile.in)
-
-dnl FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-dnl copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-dnl are probably using a cross compiler, which will not be able to fully
-dnl link an executable.  This should really be fixed in autoconf
-dnl itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-AC_DEFUN(LIB_AC_PROG_CXX,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CXX, g++, g++)
-if test -z "$CXX"; then
-  AC_CHECK_PROG(CXX, c++, c++, , , )
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-CXXFLAGS='$(CFLAGS)'
-])
-
-AC_CANONICAL_SYSTEM
-
-LIB_AC_PROG_CC
-LIB_AC_PROG_CXX
-
-use_cygserver='yes'
-AC_ARG_ENABLE(server,
-[ --enable-server		Build a cygwin DLL which can communicate with cygserver],
-[case "${enableval}" in
-yes)	;;
-no)	use_cygserver=;;
-esac
-])
-
-SUBDIRS='cygwin w32api'
-test -d $srcdir/mingw && SUBDIRS="mingw $SUBDIRS"
-
-case "$with_cross_host" in
-  ""|*cygwin*)
-    # test -d $srcdir/bz2lib && SUBDIRS="$SUBDIRS bz2lib"
-    # test -d $srcdir/zlib && SUBDIRS="$SUBDIRS zlib"
-    # test -d $srcdir/subauth && SUBDIRS="$SUBDIRS subauth"
-    test -n "$use_cygserver" -a -d $srcdir/cygserver && SUBDIRS="$SUBDIRS cygserver"
-    SUBDIRS="$SUBDIRS utils doc"
-    ;;
-esac
-
-AC_CONFIG_SUBDIRS($SUBDIRS)
-
-AC_PROG_MAKE_SET
-
-AC_SUBST(SUBDIRS)
-AC_OUTPUT(Makefile)
diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
deleted file mode 100644
index 8a0803781..000000000
--- a/winsup/cygserver/ChangeLog
+++ /dev/null
@@ -1,172 +0,0 @@
-2003-12-16  Corinna Vinschen  <corinna@vinschen.de>
-
-	* bsd_helper.cc (tunable_params): Add entries for kern.ipc.msgmnb and
-	kern.ipc.msgtql.  Raise max value for kern.ipc.msgseg to 65535.
-	* cygserver.conf: Add kern.ipc.msgmnb and kern.ipc.msgtql.
-	* sysv_msg.cc (msginit): Add TUNABLE_INT_FETCH call for
-	kern.ipc.msgmnb and kern.ipc.msgtql.
-
-2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygserver.cc (main): Move call to ipcinit() up before installing
-	any threads.
-	* sysv_sem.cc: Update to FreeBSD version 1.67.
-	(seminit): Initialize semaphore sequence numbers to 0.
-
-2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (CYGWIN_LIB): Variable pointing to libcygwin.a in
-	the parallel cygwin dir.
-	(cygserver.exe): Depend on and link against $CYGWIN_LIB.
-
-2003-11-25  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (CXXFLAGS): Remove duplicate options handled in
-	Makefile.common.
-
-2003-11-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* msg.cc (client_request_msg::serve): Add default case to msgop switch.
-	* sem.cc (client_request_sem::serve): Add default case to semop switch.
-	* shm.cc (client_request_shm::serve): Add default case to shmop switch.
-
-2003-11-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (install): Explicitely create directories.  Install
-	README to $(prefix)/share/doc/Cygwin.
-	* README: New file.
-
-2003-11-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygserver.cc (print_usage): Fix scrambled output.
-
-2003-11-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygserver-config: Slightly modify printed message.
-
-2003-11-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (install): Install cygserver-config script to bindir.
-	* cygserver-config: New script.
-
-2003-11-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	Don't use safe_new but new throughout.  Fix copyright dates
-	throughout.
-	* Makefile.in: Accomodate all new files and name changes.
-	Add a *.d dependency.
-	(sbindir): Add.
-	(etcdir): Drop in favor of more appropriate sysconfdir definition.
-	(sysconfdir): Add.
-	(CXXFLAGS): Add -MMD flag. Add SYSCONFDIR definition.
-	(.SUFFIXES): Add.
-	(install): Add action items.
-	(libclean): New target.
-	(fullclean): Ditto.
-	* bsd_helper.cc: New file.
-	* bsd_helper.h: Ditto.
-	* bsd_log.cc: Ditto.
-	* bsd_log.h: Ditto.
-	* bsd_mutex.cc: Ditto.
-	* bsd_mutex.h: Ditto.
-	* client.cc: Rearrange to build as less as possible if
-	__INSIDE_CYGWIN__.
-	(client_request::handle_request): Add Message Queue and Semaphore
-	handling.
-	* cygserver.cc: Rearrange to build as less as possible if
-	__INSIDE_CYGWIN__. Use new debug/log/panic logging functions.
-	(DEF_CONFIG_FILE): New definition for configuration file.  Use
-	throughout.
-	(getfunc): Remove.
-	(__cygserver__printf): Remove.
-	(client_request_attach_tty::serve): Return error if impersonation
-	fails.
-	(print_usage): Pump up help message.
-	(print_version): Add output of default configuration file.
-	(main): Accommodate new options.  Allow overwrite of threading options
-	from config file.  Call several new initialization functions.  Drop
-	printing dots.  Don't define SIGHANDLE inline.
-	* cygserver.conf: New file.
-	* cygserver_process.h: Rename to process.h.
-	* cygserver_transport.h: Rename to transport.h.
-	* cygserver_transport_pipes.h: Rename to transport_pipes.h.
-	* cygserver_transport_sockets.h: Rename to transport_sockets.h.
-	* msg.cc: Rewrite.
-	* sem.cc: Rewrite.
-	* shm.cc: Rewrite.
-	* sysv_msg.cc: New file, derived from FreeBSD version 1.52.
-	* sysv_sem.cc: New file, derived from FreeBSD version 1.66.
-	* sysv_shm.cc: New file, derived from FreeBSD version 1.89.
-	* threaded_queue.cc: Rearrange to build as less as possible if
-	__INSIDE_CYGWIN__.
-	* transport.cc (transport_layer_base::impersonate_client): Define bool.
-	(transport_layer_base::revert_to_self): Ditto.
-	* transport.h (transport_layer_base::impersonate_client): Declare bool.
-	(transport_layer_base::revert_to_self): Ditto.
-	* transport_pipes.cc (transport_layer_pipes::transport_layer_pipes):
-	Don't call init_security.
-	(init_security): Remove.
-	(transport_layer_pipes::accept): Use global sec_all_nih.
-	(transport_layer_pipes::connect): Ditto.
-	(transport_layer_pipes::impersonate_client): Define bool.
-	(transport_layer_pipes::revert_to_self): Ditt.
-	* transport_pipes.h (transport_layer_pipes::impersonate_client): Declare
-	bool.
-	(transport_layer_pipes::revert_to_self): Ditto.
-	* woutsup.h: Include bsd compatibility headers.
-	(SIGHANDLE): Add definition.
-	(__cygserver__printf): Remove definition.
-	(__noop_printf): Ditto.
-	(debug_printf): Define using debug.
-	(syscall_printf): Define using log.
-	(system_printf): Ditto.
-	Drop all other _printf definitions.
-
-2003-10-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	Accomodate moving cygserver header files from cygwin/include/cygwin
-	to here and cygwin dir.
-	* Makefile.in (EXEEXT): Drop as unused.
-	(EXEEXT_FOR_BUILD): Ditto.
-	(all): Don't build libcygserver.a.
-	* cygserver_process.h: Moved from cygwin/include/cygwin to here.
-	* cygserver_transport.h: Ditto.
-	* cygserver_transport_pipes.h: Ditto.
-	* cygserver_transport_sockets.h: Ditto.
-	* ipc.h: Moved to ../cygwin and renamed to cygserver_ipc.h.
-	* shm.h: Moved to ../cygwin and renamed to cygserver_shm.h.
-
-2003-08-30  Christopher Faylor  <cgf@redhat.com>
-
-	* msg.cc: New file.
-	* sem.cc: Ditto.
-
-2003-08-30  Christopher Faylor  <cgf@redhat.com>
-
-	* threaded_queue.h: New file.
-
-2003-08-25  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Build libcygserver.a.
-	* client.cc: Rename allow_daemon to allow_server.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Use 'install-sh -c'.
-	* configure: Regenerate.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Always use install-sh.
-	* configure: Regenerate.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (OBJS): Move some more files from cygwin directory.
-	* woutsup.h: Define _MT_SAFE.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: First pass.
-	* Makefile.in: Ditto.
-	* configure: Generate.
diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
deleted file mode 100644
index 333fcb92b..000000000
--- a/winsup/cygserver/Makefile.in
+++ /dev/null
@@ -1,91 +0,0 @@
-# Makefile for Cygwin server
-# Copyright 2003 Red Hat, Inc.
-
-# This file is part of Cygwin.
-
-# This software is a copyrighted work licensed under the terms of the
-# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-# details.
-
-SHELL:=@SHELL@
-
-srcdir:=@srcdir@
-VPATH:=@srcdir@
-prefix:=@prefix@
-exec_prefix:=@exec_prefix@
-
-bindir:=@bindir@
-sbindir:=@sbindir@
-sysconfdir:=@sysconfdir@
-program_transform_name:=@program_transform_name@
-
-INSTALL:=@INSTALL@
-INSTALL_PROGRAM:=@INSTALL_PROGRAM@
-INSTALL_DATA:=@INSTALL_DATA@
-
-CC:=@CC@
-CC_FOR_TARGET:=$(CC)
-CXX:=@CXX@
-CXX_FOR_TARGET:=$(CXX)
-AR:=@AR@
-
-include $(srcdir)/../Makefile.common
-
-CFLAGS:=@CFLAGS@ -I$(cygwin_source)
-CXXFLAGS:=@CXXFLAGS@ -I$(cygwin_source)
-override CXXFLAGS+=-MMD -DHAVE_DECL_GETOPT=0 -D__OUTSIDE_CYGWIN__ -DSYSCONFDIR="\"$(sysconfdir)\""
-
-.SUFFIXES: .c .cc .a .o .d
-
-OBJS:=	cygserver.o client.o process.o msg.o sem.o shm.o threaded_queue.o \
-	transport.o transport_pipes.o transport_sockets.o \
-	bsd_helper.o bsd_log.o bsd_mutex.o \
-	sysv_msg.o sysv_sem.o sysv_shm.o
-LIBOBJS:=${patsubst %.o,lib%.o,$(OBJS)}
-
-CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/version.o \
-	$(cygwin_build)/wincap.o
-
-CYGWIN_LIB:=$(cygwin_build)/libcygwin.a
-
-all: cygserver.exe
-
-install: all $(updir1)/mkinstalldirs cygserver.conf cygserver-config README
-	$(updir1)/mkinstalldirs $(sbindir)
-	$(updir1)/mkinstalldirs $(bindir)
-	$(updir1)/mkinstalldirs $(sysconfdir)/defaults/etc
-	$(updir1)/mkinstalldirs $(prefix)/share/doc/Cygwin
-	$(INSTALL_PROGRAM) cygserver.exe $(sbindir)/cygserver.exe
-	$(INSTALL_PROGRAM) $(srcdir)/cygserver-config $(bindir)/cygserver-config
-	$(INSTALL_DATA) $(srcdir)/cygserver.conf $(sysconfdir)/defaults/etc/cygserver.conf
-	$(INSTALL_DATA) $(srcdir)/README $(prefix)/share/doc/Cygwin/cygserver.README
-
-clean:
-	rm -f $(OBJS) ${patsubst %.o,%.d,$(OBJS)} cygserver.exe
-
-libclean:
-	rm -f $(LIBOBJS) ${patsubst %.o,%.d,$(LIBOBJS)} libcygserver.a
-
-fullclean: clean libclean
-
-cygserver.exe: $(OBJS) $(CYGWIN_OBJS) $(CYGWIN_LIB)
-	$(CXX) -o $@ $^
-
-$(cygwin_build)/%.o: $(cygwin_source)/%.cc
-	@$(MAKE) -C $(@D) $(@F)
-
-$(cygwin_build)/%.o: $(cygwin_source)/%.c
-	@$(MAKE) -C $(@D) $(@F)
-
-Makefile: Makefile.in configure
-
-lib%.o: %.cc
-	${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE_CXX)} -I$(updir)/cygwin -o $(@D)/${basename $(@F)}$o $<
-
-libcygserver.a: $(LIBOBJS)
-	$(AR) crus $@ $?
-
-deps:=${wildcard *.d}
-ifneq (,$(deps))
-include $(deps)
-endif
diff --git a/winsup/cygserver/README b/winsup/cygserver/README
deleted file mode 100644
index 209953147..000000000
--- a/winsup/cygserver/README
+++ /dev/null
@@ -1,210 +0,0 @@
-What is Cygserver?
-
-  Cygserver is a program which is designed to run as a background service.
-  It provides Cygwin applications with services which require security
-  arbitration or which need to persist while no other cygwin application
-  is running.
-
-  The implemented services so far are:
-
-  - Control slave tty/pty handle dispersal from tty owner to other
-    processes without compromising the owner processes' security.
-  - XSI IPC Message Queues.
-  - XSI IPC Semaphores.
-  - XSI IPC Shared Memory.
-
-
-Cygserver command line options:
-
-  Options to Cygserver take the normal UNIX-style `-X' or `--longoption' form.
-  Nearly all options have a counterpart in the configuration file (see below)
-  so setting them on the command line isn't really necessary.  Command line
-  options override settings from the Cygserver configuration file.
-
-  The one-character options are prepended by a single dash, the long variants
-  are prepended with two dashes.  Arguments to options are marked in angle
-  brackets below.  These are not part of the actual syntax but are used only to
-  denote the arguments.  Note that all arguments are required.  Cygserver
-  has no options with optional arguments.
-  
-  The options recognized are:
-
-  -f, --config-file <file>
-  
-    Use <file> as configuration file instead of the default configuration
-    line.  The default configuration file is /etc/cygserver.conf, typically. 
-    The --help and --version options will print the default configuration
-    pathname.
-
-    This option has no counterpart in the configuration file, for obvious
-   reasons.
-
-  -c, --cleanup-threads <num>  
-  
-    Number of threads started to perform cleanup tasks.  Default is 2.
-    Configuration file option:  kern.srv.cleanup_threads
-
-  -r, --request-threads <num>  
-  
-    Number of threads started to serve application requests.  Default is 10.
-    The -c and -r options can be used to play with Cygserver's performance
-    under heavy load conditions or on slow machines.
-    Configuration file option:  kern.srv.request_threads
-
-  -d, --debug
-  
-    Log debug messages to stderr.  These will clutter your stderr output with
-    a lot of information, typically only useful to developers.
-
-  -e, --stderr
-  
-    Force logging to stderr.  This is the default if stderr is connected to
-    a tty.  Otherwise, the default is logging to the system log.  By using
-    the -e, -E, -y, -Y options (or the appropriate settings in the
-    configuration file), you can explicitely set the logging output as you
-    like, even to both, stderr and syslog.
-    Configuration file option:  kern.log.stderr
-
-  -E, --no-stderr
-  
-    Don't log to stderr.  Configuration file option:  kern.log.stderr
-
-  -y, --syslog
-  
-    Force logging to the system log.  This is the default, if stderr is not
-    connected to a tty, e. g. redirected to a file.  Note, that on 9x/Me
-    systems the syslog is faked by a file C:\CYGWIN_SYSLOG.TXT.
-    Configuration file option:  kern.log.syslog
-
-  -Y, --no-syslog
-  
-    Don't log to syslog.  Configuration file option:  kern.log.syslog
-
-  -l, --log-level <level>
-  
-    Set the verbosity level of the logging output.  Valid values are between
-    1 and 7.  The default level is 6, which is relatively chatty.  If you set
-    it to 1, you will get only messages which are printed under severe conditions,
-    which will result in stopping Cygserver itself.
-    Configuration file option:  kern.log.level
-
-  -m, --no-sharedmem
-  
-    Don't start XSI IPC Shared Memory support.  If you don't need XSI IPC
-    Shared Memory support, you can switch it off here.
-    Configuration file option:  kern.srv.sharedmem
-
-  -q, --no-msgqueues
-  
-    Don't start XSI IPC Message Queues. 
-    Configuration file option:  kern.srv.msgqueues
-
-  -s, --no-semaphores
-  
-    Don't start XSI IPC Semaphores.
-    Configuration file option:  kern.srv.semaphores
-
-  -S, --shutdown
-  
-    Shutdown a running daemon and exit.  Other methods are sending a SIGHUP
-    to the Cygserver PID or, if running as service under NT, calling
-    `net stop cygserver' or `cygrunsrv -E cygserver'.
-
-  -h, --help
-  
-    Output usage information and exit.
-
-  -v, --version
-  
-    Output version information and exit.
-
-
-How to start Cygserver:
-
-  Before you run Cygserver for the first time, you should run the
-  /usr/bin/cygserver-config script once.  It creates the default
-  configuration file and, upon request, installs Cygserver as service
-  when running under NT.  The script only performs a default install,
-  with no further options given to Cygserver when running as service.
-  Due to the wide configurability by changing the configuration file,
-  that's typically not necessary.
-
-  On Windows 9x/Me, just start Cygserver in any console window.  It's
-  advisable to redirect stderr to a file of choice (e. g.
-  /var/log/cygserver.log) and to use the -e and -Y options or the
-  set the appropriate settings in the configuration file (see below).
-
-  On Windows NT/2000/XP or 2003, you should always run Cygserver as a
-  service under LocalSystem account.  This is the way it is installed
-  for you by the /usr/bin/cygserver-config script.
-
-
-How to use the Cygserver services:
-
-  The Cygserver services are used by Cygwin applications only if you
-  set the environment variable CYGWIN to contain the string "server".
-  You must do this before starting the application.
-
-  Typically, you don't need any other option, so it's ok to set CYGWIN
-  just to "server".  It is not necessary to set the CYGWIN environment
-  variable prior to starting the Cygserver process itself, but it won't
-  hurt to do so.
-
-  The easiest way is to set the environment variable CYGWIN to the values
-  you want in the Windows system environment and to reboot the machine.
-  This is advisable, since it allows you to set the variable once and
-  then forget about it.  It also ensures that services as well as desktop
-  applications have the same setting.
-
-  If you don't want that for whatever reason, you can set the
-  variable in the /cygwin.bat file which is used in the net distribution,
-  to start a Cygwin bash from the desktop.  In that file, you can set
-  the CYGWIN variable using Windows command line interpreter syntax, e. g.:
-
-    set CYGWIN=server
-
-  If you don't set CYGWIN in the system environment, but you're running
-  other Cygwin services, these services need to get that CYGWIN value by
-  setting the environment using the appropriate cygrunsrv option '-e' when
-  installing the service.  Example installing a service 'foo':
-
-    cygrunsrv -I foo -p /usr/sbin/foo -e "CYGWIN=server"
-
-
-The Cygserver configuration file:
-
-  Cygserver has many options, which allow to customize the server
-  to your needs.  Customization is accomplished by editing the configuration
-  file, which is by default /etc/cygserver.conf.  This file is read only
-  once on startup of Cygserver.  There's no option to re-read the file on
-  runtime by, say, sending a signal to Cygserver.
-
-  The configuration file determines how Cygserver operates.  There are
-  options which set the number of threads running in parallel, options
-  for setting how and what to log and options to set various maximum
-  values for the IPC services.
-
-  The default configuration file delivered with Cygserver is installed
-  to /etc/defaults/etc.  The /usr/bin/cygserver-config script copies it to
-  /etc, giving you the option to overwrite an already existing file or to
-  leave it alone.  Therefore, the /etc file is safe to be changed by you,
-  since it will not be overwritten by a later update installation.
-
-  The default configuration file contains many comments which describe
-  everything needed to understand the settings.  A comment at the start of the
-  file describes the syntax rules for the file.  The default options are shown
-  in the file but are commented out.
-
-  It is generally a good idea to uncomment only options which you intend to
-  change from the default values.  Since reading the options file on Cygserver
-  startup doesn't take much time, it's also considered good practice to keep
-  all other comments in the file.  This keeps you from searching for clues
-  in other sources.
-
-
-If you have problems with Cygserver, or you have found a bug, or you
-think you have found a bug, or you don't understand configuration file
-options, the mailing list <cygwin@cygwin.com> is the right place to ask
-questions.
-
-Have fun!
diff --git a/winsup/cygserver/bsd_helper.cc b/winsup/cygserver/bsd_helper.cc
deleted file mode 100644
index 0fa59c1d3..000000000
--- a/winsup/cygserver/bsd_helper.cc
+++ /dev/null
@@ -1,696 +0,0 @@
-/* bsd_helper.cc
-
-   Copyright 2003 Red Hat Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-#include "cygerrno.h"
-#define _KERNEL 1
-#define __BSD_VISIBLE 1
-#include <sys/smallprint.h>
-#include <sys/cygwin.h>
-#include <sys/ipc.h>
-#include <sys/param.h>
-#include <sys/msg.h>
-#include <sys/queue.h>
-#include <malloc.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "security.h"
-#include "cygserver.h"
-#include "process.h"
-#include "cygserver_ipc.h"
-#include "cygserver_msg.h"
-#include "cygserver_sem.h"
-#include "cygserver_shm.h"
-
-/*
- * Copy a piece of memory from the client process into the server process.
- * Returns an error code.
- */
-int
-win_copyin (struct thread *td, const void *client_src,
-	    void *server_tgt, size_t len)
-{
-  if (!ReadProcessMemory (td->client->handle (), client_src, server_tgt,
-			  len, NULL))
-    return cygwin_internal (CW_GET_ERRNO_FROM_WINERROR,
-			    GetLastError (), EINVAL);
-  return 0;
-}
-
-/*
- * Copy a piece of memory from the server process into the client process.
- * Returns an error code.
- */
-int
-win_copyout (struct thread *td, const void *server_src,
-	     void *client_tgt, size_t len)
-{
-  if (!WriteProcessMemory (td->client->handle (), client_tgt, server_src,
-			   len, NULL))
-    return cygwin_internal (CW_GET_ERRNO_FROM_WINERROR,
-			    GetLastError (), EINVAL);
-  return 0;
-}
-
-#define enter_critical_section(c) _enter_critical_section((c),__FILE__,__LINE__)
-static void
-_enter_critical_section (LPCRITICAL_SECTION pcs, const char *file, int line)
-{
-  _log (file, line, LOG_DEBUG, "Try enter critical section(%p)", pcs);
-  EnterCriticalSection (pcs);
-  _log (file, line, LOG_DEBUG, "Entered   critical section(%p)", pcs);
-}
-
-#define leave_critical_section(c) _leave_critical_section((c),__FILE__,__LINE__)
-static void
-_leave_critical_section (LPCRITICAL_SECTION pcs, const char *file, int line)
-{
-  LeaveCriticalSection (pcs);
-  _log (file, line, LOG_DEBUG, "Left      critical section(%p)", pcs);
-}
-
-CRITICAL_SECTION ipcht_cs;
-
-struct ipc_hookthread_storage {
-  HANDLE process_hdl;
-  proc ipcblk;
-};
-
-struct ipc_hookthread {
-  SLIST_ENTRY(ipc_hookthread) sht_next;
-  HANDLE thread;
-  DWORD  winpid;
-  struct vmspace vmspace;
-};
-static SLIST_HEAD(, ipc_hookthread) ipcht_list; /* list of hook threads */
-
-static HANDLE ipcexit_event;
-
-struct vmspace *
-ipc_p_vmspace (struct proc *proc)
-{
-  struct vmspace *ret = NULL;
-  ipc_hookthread *ipcht_entry;
-  enter_critical_section (&ipcht_cs);
-  SLIST_FOREACH (ipcht_entry, &ipcht_list, sht_next)
-    {
-      if (ipcht_entry->winpid == proc->winpid)
-        {
-	  ret = proc->p_vmspace = &ipcht_entry->vmspace;
-	  break;
-	}
-    }
-  leave_critical_section (&ipcht_cs);
-  return ret;
-}
-
-static DWORD WINAPI
-ipcexit_hookthread(const LPVOID param)
-{
-  ipc_hookthread_storage *shs = (ipc_hookthread_storage *) param;
-  HANDLE obj[2] = { ipcexit_event, shs->process_hdl };
-  switch (WaitForMultipleObjects (2, obj, FALSE, INFINITE))
-    {
-      case WAIT_OBJECT_0:
-        /* Cygserver shutdown. */
-	/*FALLTHRU*/
-      case WAIT_OBJECT_0 + 1:
-        /* Process exited.  Call semexit_myhook to handle SEM_UNDOs for the
-	   exiting process and shmexit_myhook to keep track of shared
-	   memory. */
-	if (Giant.owner == shs->ipcblk.winpid)
-		mtx_unlock (&Giant);
-	if (support_semaphores == TUN_TRUE)
-	  semexit_myhook (NULL, &shs->ipcblk);
-	if (support_sharedmem == TUN_TRUE)
-	  {
-	    _mtx_lock (&Giant, shs->ipcblk.winpid, __FILE__, __LINE__);
-	    ipc_p_vmspace (&shs->ipcblk);
-	    shmexit_myhook (shs->ipcblk.p_vmspace);
-	    mtx_unlock (&Giant);
-	  }
-	break;
-      default:
-        /* FIXME: Panic? */
-	break;
-    }
-  CloseHandle (shs->process_hdl);
-  ipc_hookthread *ipcht_entry, *sav_entry;
-  enter_critical_section (&ipcht_cs);
-  SLIST_FOREACH_SAFE (ipcht_entry, &ipcht_list, sht_next, sav_entry)
-    {
-      if (ipcht_entry->winpid == shs->ipcblk.winpid)
-        {
-	  SLIST_REMOVE (&ipcht_list, ipcht_entry, ipc_hookthread, sht_next);
-	  delete ipcht_entry;
-	}
-    }
-  leave_critical_section (&ipcht_cs);
-  delete shs;
-  return 0;
-}
-
-/* Deletes all pending hook threads.  Called by ipcunload() which in turn
-   is called by the cygserver main routine. */
-static void
-ipcexit_dispose_hookthreads(void)
-{
-  SetEvent (ipcexit_event);
-  ipc_hookthread *ipcht_entry;
-  enter_critical_section (&ipcht_cs);
-  SLIST_FOREACH (ipcht_entry, &ipcht_list, sht_next)
-    {
-      WaitForSingleObject (ipcht_entry->thread, 1000);
-      /* Don't bother removing the linked list on cygserver shutdown. */
-      /* FIXME: Error handling? */
-    }
-  leave_critical_section (&ipcht_cs);
-}
-
-/* Creates the per process wait thread.  Called by semget() under locked
-   Giant mutex condition. */
-int
-ipcexit_creat_hookthread(struct thread *td)
-{
-  ipc_hookthread *ipcht_entry;
-  int ret = -1;
-  enter_critical_section (&ipcht_cs);
-  SLIST_FOREACH (ipcht_entry, &ipcht_list, sht_next)
-    {
-      if (ipcht_entry->winpid == td->ipcblk->winpid)
-	ret = 0;
-    }
-  leave_critical_section (&ipcht_cs);
-  if (!ret)
-    return 0;
-
-  DWORD tid;
-  ipc_hookthread_storage *shs = new ipc_hookthread_storage;
-  if (!DuplicateHandle (GetCurrentProcess (), td->client->handle (),
-			GetCurrentProcess (), &shs->process_hdl,
-			0, FALSE, DUPLICATE_SAME_ACCESS))
-    {
-      log (LOG_CRIT, "failed to duplicate process handle, error = %lu",
-		      GetLastError ());
-      return cygwin_internal (CW_GET_ERRNO_FROM_WINERROR,
-			      GetLastError (), ENOMEM);
-    }
-  shs->ipcblk = *td->ipcblk;
-  HANDLE thread = CreateThread (NULL, 0, ipcexit_hookthread, shs, 0, &tid);
-  if (!thread)
-    {
-      log (LOG_CRIT, "failed to create thread, error = %lu", GetLastError ());
-      return cygwin_internal (CW_GET_ERRNO_FROM_WINERROR,
-			      GetLastError (), ENOMEM);
-    }
-  ipcht_entry = new ipc_hookthread;
-  ipcht_entry->thread = thread;
-  ipcht_entry->winpid = td->ipcblk->winpid;
-  ipcht_entry->vmspace.vm_map = NULL;
-  ipcht_entry->vmspace.vm_shm = NULL;
-  enter_critical_section (&ipcht_cs);
-  SLIST_INSERT_HEAD (&ipcht_list, ipcht_entry, sht_next);
-  leave_critical_section (&ipcht_cs);
-  return 0;
-}
-
-/*
- * Need the admins group SID to compare with groups in client token.
- */
-PSID admininstrator_group_sid;
-
-static void
-init_admin_sid (void)
-{
-  if (wincap.has_security ())
-    {
-      SID_IDENTIFIER_AUTHORITY nt_auth = {SECURITY_NT_AUTHORITY};
-      if (! AllocateAndInitializeSid (&nt_auth, 2, 32, 544, 0, 0, 0, 0, 0, 0,
-				      &admininstrator_group_sid))
-	panic ("failed to create well known sids, error = %lu",
-	       GetLastError ());
-    }
-}
-
-SECURITY_DESCRIPTOR sec_all_nih_sd;
-SECURITY_ATTRIBUTES sec_all_nih = { sizeof (SECURITY_ATTRIBUTES),
-				    &sec_all_nih_sd,
-				    FALSE };
-
-/* Global vars, determining whether the IPC stuff should be started or not. */
-tun_bool_t support_sharedmem = TUN_UNDEF;
-tun_bool_t support_msgqueues = TUN_UNDEF;
-tun_bool_t support_semaphores = TUN_UNDEF;
-
-void
-ipcinit ()
-{
-  InitializeSecurityDescriptor (&sec_all_nih_sd, SECURITY_DESCRIPTOR_REVISION);
-  SetSecurityDescriptorDacl (&sec_all_nih_sd, TRUE, 0, FALSE);
-
-  init_admin_sid ();
-  mtx_init(&Giant, "Giant", NULL, MTX_DEF);
-  msleep_init ();
-  ipcexit_event = CreateEvent (NULL, TRUE, FALSE, NULL);
-  if (!ipcexit_event)
-    panic ("Failed to create ipcexit event object");
-  InitializeCriticalSection (&ipcht_cs);
-  if (support_msgqueues == TUN_TRUE)
-    msginit ();
-  if (support_semaphores == TUN_TRUE)
-    seminit ();
-  if (support_sharedmem == TUN_TRUE)
-    shminit ();
-}
-
-int
-ipcunload ()
-{
-  ipcexit_dispose_hookthreads();
-  CloseHandle (ipcexit_event);
-  wakeup_all ();
-  if (support_semaphores == TUN_TRUE)
-    semunload ();
-  if (support_sharedmem == TUN_TRUE)
-    shmunload ();
-  if (support_msgqueues == TUN_TRUE)
-    msgunload();
-  mtx_destroy(&Giant);
-  return 0;
-}
-
-/*
- * Helper function to find a gid in a list of gids.
- */
-static bool
-is_grp_member (gid_t grp, gid_t *grplist, int listsize)
-{
-  if (grplist)
-    for (; listsize > 0; --listsize)
-      if (grp == grplist[listsize - 1])
-	return true;
-  return false;
-}
-
-/*
- * Helper function to get a specific token information from a token.
- * This function mallocs the necessary buffer spcae by itself.  It
- * must be free'd by the calling function.
- */
-static void *
-get_token_info (HANDLE tok, TOKEN_INFORMATION_CLASS tic)
-{
-  void *buf;
-  DWORD size;
-
-  if (!GetTokenInformation (tok, tic, NULL, 0, &size)
-      && GetLastError () != ERROR_INSUFFICIENT_BUFFER)
-    return NULL;
-  if (!(buf = malloc (size)))
-    return NULL;
-  if (!GetTokenInformation (tok, tic, buf, size, &size))
-    {
-      free (buf);
-      return NULL;
-    }
-  return buf;
-}
-
-/*
- * Check if client user helds "mode" permission when accessing object
- * associated with "perm" permission record.
- * Returns an error code.
- */
-int
-ipcperm (struct thread *td, ipc_perm *perm, unsigned int mode)
-{
-  proc *p = td->ipcblk;
-
-  if (!suser (td))
-    return 0;
-  if (mode & IPC_M)
-    {
-      return (p->uid != perm->cuid && p->uid != perm->uid)
-	     ? EACCES : 0;
-    }
-  if (p->uid != perm->cuid && p->uid != perm->uid)
-    {
-      /* If the user is a member of the creator or owner group, test
-      	 against group bits, otherwise against other bits. */
-      mode >>= p->gid != perm->gid && p->gid != perm->cgid
-	       && !is_grp_member (perm->gid, p->gidlist, p->gidcnt)
-	       && !is_grp_member (perm->cgid, p->gidlist, p->gidcnt)
-	       ? 6 : 3;
-    }
-  return (mode & perm->mode) != mode ? EACCES : 0;
-}
-
-/*
- * Check for client user being superuser.
- * Returns an error code.
- */
-int
-suser (struct thread *td)
-{
-  /* Always superuser on 9x. */
-  if (!wincap.has_security ())
-    return 0;
-
-  /* This value has been set at ImpersonateNamedPipeClient() time
-     using the token information.  See adjust_identity_info() below. */
-  return td->ipcblk->is_admin ? 0 : EACCES;
-}
-
-/*
- * Retrieves user and group info from impersonated token and creates the
- * correct uid, gid, gidlist and is_admin entries in p from that.
- */
-bool
-adjust_identity_info (struct proc *p)
-{
-  HANDLE tok;
-
-  /* No access tokens on 9x. */
-  if (!wincap.has_security ())
-    return true;
-
-  if (!OpenThreadToken (GetCurrentThread (), TOKEN_READ, TRUE, &tok))
-    {
-      debug ("Failed to open worker thread access token for pid %d, winpid %d",
-	     p->cygpid, p->winpid);
-      return false;
-    }
-
-  /* Get uid from user SID in token. */
-  PTOKEN_USER user;
-  if (!(user = (PTOKEN_USER)get_token_info (tok, TokenUser)))
-    goto faulty;
-  p->uid = cygwin_internal (CW_GET_UID_FROM_SID, user->User.Sid);
-  free (user);
-  if (p->uid == (uid_t)-1)
-    log (LOG_WARNING, "WARNING: User not found in /etc/passwd! Using uid -1!");
-
-  /* Get gid from primary group SID in token. */
-  PTOKEN_PRIMARY_GROUP pgrp;
-  if (!(pgrp = (PTOKEN_PRIMARY_GROUP)get_token_info (tok, TokenPrimaryGroup)))
-    goto faulty;
-  p->gid = cygwin_internal (CW_GET_GID_FROM_SID, pgrp->PrimaryGroup);
-  free (pgrp);
-  if (p->gid == (gid_t)-1)
-    log (LOG_WARNING,"WARNING: Group not found in /etc/passwd! Using gid -1!");
-
-  /* Generate gid list from token group's SID list.  Also look if the token
-     has an enabled admin group SID.  That means, the process has admin
-     privileges.  That knowledge is used in suser(). */
-  PTOKEN_GROUPS gsids;
-  if (!(gsids = (PTOKEN_GROUPS)get_token_info (tok, TokenGroups)))
-    goto faulty;
-  if (gsids->GroupCount)
-    {
-      p->gidlist = (gid_t *) calloc (gsids->GroupCount, sizeof (gid_t));
-      if (p->gidlist)
-        p->gidcnt = gsids->GroupCount;
-    }
-  for (DWORD i = 0; i < gsids->GroupCount; ++i)
-    {
-      if (p->gidlist)
-	p->gidlist[i] = cygwin_internal (CW_GET_GID_FROM_SID,
-					 gsids->Groups[i].Sid);
-      if (EqualSid (gsids->Groups[i].Sid, admininstrator_group_sid)
-      	  && (gsids->Groups[i].Attributes & SE_GROUP_ENABLED))
-	p->is_admin = true;
-    }
-  free (gsids);
-
-  CloseHandle (tok);
-  return true;
-
-faulty:
-  CloseHandle (tok);
-  log (LOG_CRIT, "Failed to get token information for pid %d, winpid %d",
-		  p->cygpid, p->winpid);
-  return false;
-}
-
-/*
- * Windows wrapper implementation of the VM functions called by sysv_shm.cc.
- */
-
-vm_object_t
-_vm_pager_allocate (int size, int shmflg)
-{
-  /* Create the file mapping object with full access for everyone.  This is
-     necessary to allow later calls to shmctl(..., IPC_SET,...) to
-     change the access rights and ownership of a shared memory region.
-     The access rights are tested at the beginning of every shm... function.
-     Note that this does not influence the actual read or write access
-     defined in a call to shmat. */
-  vm_object_t object = CreateFileMapping (INVALID_HANDLE_VALUE, &sec_all_nih,
-					  PAGE_READWRITE, 0, size, NULL);
-  if (!object)
-    panic ("CreateFileMapping in _vm_pager_allocate failed, %E");
-  return object;
-}
-
-vm_object_t
-vm_object_duplicate (struct thread *td, vm_object_t object)
-{
-  vm_object_t dup_object;
-  if (!DuplicateHandle(GetCurrentProcess (), object,
-		       td->client->handle (), &dup_object,
-		       0, TRUE, DUPLICATE_SAME_ACCESS))
-    panic ("!DuplicateHandle in vm_object_duplicate failed, %E");
-  return dup_object;
-}
-
-void
-vm_object_deallocate (vm_object_t object)
-{
-  if (object)
-    CloseHandle (object);
-}
-
-/*
- * Tunable parameters are read from a system wide cygserver.conf file.
- * On the first call to tunable_int_fetch, the file is read and the
- * parameters are set accordingly.  Each parameter has default, max and
- * min settings.
- */
-
-enum tun_params_type {
-  TUN_NULL,
-  TUN_INT,
-  TUN_BOOL
-};
-
-union tun_value {
-  long ival;
-  tun_bool_t bval;
-};
-
-struct tun_struct {
-  const char *name;
-  tun_params_type type;
-  union tun_value value;
-  union tun_value min;
-  union tun_value max;
-  void (*check_func)(tun_struct *, char *, const char *);
-};
-
-static void
-default_tun_check (tun_struct *that, char *value, const char *fname)
-{
-  char *c = NULL;
-  tun_value val;
-  switch (that->type)
-    {
-      case TUN_INT:
-	val.ival = strtoul (value, &c, 10);
-	if (!val.ival || (c && *c))
-	  panic ("Error in config file %s: Value of parameter %s malformed",
-		 fname, that->name);
-        if (val.ival < that->min.ival || val.ival > that->max.ival)
-	  panic ("Error in config file %s: Value of parameter %s must be "
-		 "between %lu and %lu",
-		 fname, that->name, that->min.ival, that->max.ival);
-	if (that->value.ival)
-	  panic ("Error in config file %s: Parameter %s set twice.\n",
-		 fname, that->name);
-	that->value.ival = val.ival;
-	break;
-      case TUN_BOOL:
-        if (!strcasecmp (value, "no") || !strcasecmp (value, "n")
-	    || !strcasecmp (value, "false") || !strcasecmp (value, "f")
-	    || !strcasecmp (value, "0"))
-	  val.bval = TUN_FALSE;
-	else if (!strcasecmp (value, "yes") || !strcasecmp (value, "y")
-		 || !strcasecmp (value, "true") || !strcasecmp (value, "t")
-		 || !strcasecmp (value, "1"))
-	  val.bval = TUN_TRUE;
-	else
-	  panic ("Error in config file %s: Value of parameter %s malformed\n"
-	  	 "Allowed values: \"yes\", \"no\", \"y\", \"n\", \"true\", \"false\", \"t\", \"f\", \"1\" and \"0\"", fname, that->name);
-	that->value.bval = val.bval;
-        break;
-      default:
-	/* Shouldn't happen. */
-        panic ("Internal error: Wrong type of tunable parameter");
-	break;
-    }
-}
-
-static tun_struct tunable_params[] =
-{
-  /* SRV */
-  { "kern.srv.cleanup_threads", TUN_INT, {0}, {1}, {16}, default_tun_check},
-  { "kern.srv.request_threads", TUN_INT, {0}, {1}, {64}, default_tun_check},
-  { "kern.srv.sharedmem", TUN_BOOL, {TUN_UNDEF}, {TUN_FALSE}, {TUN_TRUE}, default_tun_check},
-  { "kern.srv.msgqueues", TUN_BOOL, {TUN_UNDEF}, {TUN_FALSE}, {TUN_TRUE}, default_tun_check},
-  { "kern.srv.semaphores", TUN_BOOL, {TUN_UNDEF}, {TUN_FALSE}, {TUN_TRUE}, default_tun_check},
-
-  /* LOG */
-  { "kern.log.syslog", TUN_BOOL, {TUN_UNDEF}, {TUN_FALSE}, {TUN_TRUE}, default_tun_check},
-  { "kern.log.stderr", TUN_BOOL, {TUN_UNDEF}, {TUN_FALSE}, {TUN_TRUE}, default_tun_check},
-  { "kern.log.debug", TUN_BOOL, {TUN_UNDEF}, {TUN_FALSE}, {TUN_TRUE}, default_tun_check},
-  { "kern.log.level", TUN_INT, {0}, {1}, {7}, default_tun_check},
-
-  /* MSG */
-  { "kern.ipc.msgseg", TUN_INT, {0}, {256}, {65535}, default_tun_check},
-  { "kern.ipc.msgssz", TUN_INT, {0}, {8}, {1024}, default_tun_check},
-  { "kern.ipc.msgmnb", TUN_INT, {0}, {1}, {65535}, default_tun_check},
-  { "kern.ipc.msgmni", TUN_INT, {0}, {1}, {1024}, default_tun_check},
-  { "kern.ipc.msgtql", TUN_INT, {0}, {1}, {1024}, default_tun_check},
-
-  /* SEM */
-  //{ "kern.ipc.semmap", TUN_INT, {0}, {1}, {1024}, default_tun_check},
-  { "kern.ipc.semmni", TUN_INT, {0}, {1}, {1024}, default_tun_check},
-  { "kern.ipc.semmns", TUN_INT, {0}, {1}, {1024}, default_tun_check},
-  { "kern.ipc.semmnu", TUN_INT, {0}, {1}, {1024}, default_tun_check},
-  { "kern.ipc.semmsl", TUN_INT, {0}, {1}, {1024}, default_tun_check},
-  { "kern.ipc.semopm", TUN_INT, {0}, {1}, {1024}, default_tun_check},
-  { "kern.ipc.semume", TUN_INT, {0}, {1}, {1024}, default_tun_check},
-  //{ "kern.ipc.semusz", TUN_INT, {0}, {1}, {1024}, default_tun_check},
-  { "kern.ipc.semvmx", TUN_INT, {0}, {1}, {32767}, default_tun_check},
-  { "kern.ipc.semaem", TUN_INT, {0}, {1}, {32767}, default_tun_check},
-
-  /* SHM */
-  { "kern.ipc.shmmaxpgs", TUN_INT, {0}, {1}, {32767}, default_tun_check},
-  //{ "kern.ipc.shmmin", TUN_INT, {0}, {1}, {32767}, default_tun_check},
-  { "kern.ipc.shmmni", TUN_INT, {0}, {1}, {32767}, default_tun_check},
-  { "kern.ipc.shmseg", TUN_INT, {0}, {1}, {32767}, default_tun_check},
-  //{ "kern.ipc.shm_use_phys", TUN_INT, {0}, {1}, {32767}, default_tun_check},
-  { NULL, TUN_NULL, {0}, {0}, {0}, NULL}
-};
-
-#define skip_whitespace(c)	while (*(c) && isspace (*(c))) ++(c)
-#define skip_nonwhitespace(c)	while (*(c) && !isspace (*(c)) && *(c) != '#') ++(c)
-#define end_of_content(c)	(!*(c) || *(c) == '#')
-
-void
-tunable_param_init (const char *config_file, bool force)
-{
-  FILE *fp = fopen (config_file, "rt");
-  if (!fp)
-    {
-      if (force)
-        panic ("can't open config file %s\n", config_file);
-      return;
-    }
-  char line[1024];
-  while (fgets (line, 1024, fp))
-    {
-      char *c = strrchr (line, '\n');
-      if (!c)
-        panic ("Line too long in confg file %s\n", config_file);
-      /* Overwrite trailing NL. */
-      *c = '\0';
-      c = line;
-      skip_whitespace (c);
-      if (end_of_content (c))
-        continue;
-      /* So we are on the first character of a parameter name. */
-      char *name = c;
-      /* Find end of name. */
-      skip_nonwhitespace (c);
-      if (end_of_content (c))
-	{
-	  *c++ = '\0';
-	  panic ("Error in config file %s: Parameter %s has no value.\n",
-		 config_file, name);
-	}
-      /* Mark end of name. */
-      *c++ = '\0';
-      skip_whitespace (c);
-      if (end_of_content (c))
-        panic ("Error in config file %s: Parameter %s has no value.\n",
-	       config_file, name);
-      /* Now we are on the first character of a parameter's value. */
-      char *value = c;
-      /* This only works for simple parameters.  If complex string parameters
-         are added at one point, the scanning routine must be changed here. */
-      /* Find end of value. */
-      skip_nonwhitespace (c);
-      /* Mark end of value. */
-      *c++ = '\0';
-      /* Now look if name is one from our list. */
-      tun_struct *s;
-      for (s = &tunable_params[0]; s->name; ++s)
-	if (!strcmp (name, s->name))
-	  {
-	    /* Now read value and check for validity.  check_func doesn't
-	       return on error. */
-	    s->check_func (s, value, config_file);
-	    break;
-	  }
-      if (!s->name)
-        panic ("Error in config file %s: Unknown parameter %s.\n",
-	       config_file, name);
-    }
-  fclose (fp);
-}
-
-void
-tunable_int_fetch (const char *name, long *tunable_target)
-{
-  tun_struct *s;
-  for (s = &tunable_params[0]; s->name; ++s)
-    if (!strcmp (name, s->name))
-      break;
-  if (!s)			/* Not found */
-    return;
-  if (s->type != TUN_INT)	/* Wrong type */
-    return;
-  if (!s->value.ival)		/* Not set in config file */
-    return;
-  *tunable_target = s->value.ival;
-  debug ("\nSet %s to %lu\n", name, *tunable_target);
-}
-
-void
-tunable_bool_fetch (const char *name, tun_bool_t *tunable_target)
-{
-  tun_struct *s;
-  const char *tun_bool_val_string[] = { "undefined", "no", "yes" };
-  for (s = &tunable_params[0]; s->name; ++s)
-    if (!strcmp (name, s->name))
-      break;
-  if (!s)			/* Not found */
-    return;
-  if (s->type != TUN_BOOL)	/* Wrong type */
-    return;
-  if (!s->value.ival)		/* Not set in config file */
-    return;
-  *tunable_target = s->value.bval;
-  debug ("\nSet %s to %s\n", name, tun_bool_val_string[*tunable_target]);
-}
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/bsd_helper.h b/winsup/cygserver/bsd_helper.h
deleted file mode 100644
index 14849e918..000000000
--- a/winsup/cygserver/bsd_helper.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* bsd_helper.h: Helps integrating BSD kernel code
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-#ifndef _BSD_HELPER_H
-#define _BSD_HELPER_H
-
-#include <sys/types.h>
-#include <sys/syslog.h>
-
-enum tun_bool_t {
-  TUN_UNDEF = 0,
-  TUN_FALSE = 1,
-  TUN_TRUE  = 2
-};
-
-#define TUNABLE_INT_FETCH(a,b)	tunable_int_fetch((a),(b))
-#define TUNABLE_BOOL_FETCH(a,b)	tunable_bool_fetch((a),(b))
-
-#define sys_malloc(a,b,c) (malloc(a)?:(panic("malloc failed in %s, line %d"),(void*)NULL))
-#define sys_free(a,b) free(a)
-
-#define jail_sysvipc_allowed true
-#define jailed(a) false
-
-extern const char *__progname;
-
-/* Global vars, determining whether the IPC stuff should be started or not. */
-extern tun_bool_t support_sharedmem;
-extern tun_bool_t support_msgqueues;
-extern tun_bool_t support_semaphores;
-
-extern SECURITY_ATTRIBUTES sec_all_nih;
-
-int win_copyin (struct thread *, const void *, void *, size_t);
-int win_copyout (struct thread *, const void *, void *, size_t);
-#define copyin(a,b,c) win_copyin((td),(a),(b),(c))
-#define copyout(a,b,c) win_copyout((td),(a),(b),(c))
-
-int ipcperm (struct thread *, struct ipc_perm *, unsigned int);
-int suser (struct thread *);
-bool adjust_identity_info (struct proc *p);
-
-struct vmspace *ipc_p_vmspace (struct proc *);
-int ipcexit_creat_hookthread(struct thread *);
-void ipcinit (void);
-int ipcunload (void);
-
-vm_object_t _vm_pager_allocate (int, int);
-#define vm_pager_allocate(a,b,s,c,d) _vm_pager_allocate((s),(mode))
-vm_object_t vm_object_duplicate (struct thread *td, vm_object_t object);
-void vm_object_deallocate (vm_object_t object);
-
-void tunable_param_init (const char *, bool);
-void tunable_int_fetch (const char *, long *);
-void tunable_bool_fetch (const char *, tun_bool_t *);
-
-#endif /* _BSD_HELPER_H */
diff --git a/winsup/cygserver/bsd_log.cc b/winsup/cygserver/bsd_log.cc
deleted file mode 100644
index 5cf1c848e..000000000
--- a/winsup/cygserver/bsd_log.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-/* bsd_log.cc
-
-   Copyright 2003 Red Hat Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-#define _KERNEL 1
-#define __BSD_VISIBLE 1
-#include <sys/smallprint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-long log_level = 8; /* Illegal value.  Don't change! */
-tun_bool_t log_debug = TUN_UNDEF;
-tun_bool_t log_syslog = TUN_UNDEF;
-tun_bool_t log_stderr = TUN_UNDEF;
-
-void
-loginit (tun_bool_t opt_stderr, tun_bool_t opt_syslog)
-{
-  if (log_debug == TUN_UNDEF)
-    TUNABLE_BOOL_FETCH ("kern.log.debug", &log_debug);
-  if (log_debug == TUN_UNDEF)
-    log_debug = TUN_FALSE;
-
-  if (opt_stderr != TUN_UNDEF)
-    log_stderr = opt_stderr;
-  else
-    TUNABLE_BOOL_FETCH ("kern.log.stderr", &log_stderr);
-  if (log_stderr == TUN_UNDEF)
-    log_stderr = TUN_FALSE;
-
-  if (opt_syslog != TUN_UNDEF)
-    log_syslog = opt_syslog;
-  else
-    TUNABLE_BOOL_FETCH ("kern.log.syslog", &log_syslog);
-  if (log_syslog == TUN_UNDEF)
-    log_syslog = TUN_FALSE;
-
-  if (log_level == 8)
-    TUNABLE_INT_FETCH ("kern.log.level", &log_level);
-  if (log_level == 8)
-    log_level = 6;
-}
-
-void
-_vlog (const char *file, int line, int level,
-	const char *fmt, va_list ap)
-{
-  char buf[16384];
-
-  if ((level == LOG_DEBUG && log_debug != TUN_TRUE)
-      || (level != LOG_DEBUG && level >= log_level))
-    return;
-  strcpy (buf, "cygserver: ");
-  if (file && log_debug == TUN_TRUE)
-    __small_sprintf (strchr (buf, '\0'), "%s, line %d: ", file, line);
-  __small_vsprintf (strchr (buf, '\0'), fmt, ap);
-  if (log_syslog == TUN_TRUE && level != LOG_DEBUG)
-    syslog (level, buf);
-  if (log_stderr == TUN_TRUE || level == LOG_DEBUG)
-    {
-      fputs (buf, stderr);
-      fputc ('\n', stderr);
-    }
-}
-
-void
-_log (const char *file, int line, int level, const char *fmt, ...)
-{
-  va_list ap;
-  va_start (ap, fmt);
-  _vlog (file, line, level, fmt, ap);
-}
-
-void
-_vpanic (const char *file, int line, const char *fmt, va_list ap)
-{
-  _vlog (file, line, LOG_EMERG, fmt, ap);
-  exit (1);
-}
-
-void
-_panic (const char *file, int line, const char *fmt, ...)
-{
-  va_list ap;
-  va_start (ap, fmt);
-  _vpanic (file, line, fmt, ap);
-}
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/bsd_log.h b/winsup/cygserver/bsd_log.h
deleted file mode 100644
index 48573182a..000000000
--- a/winsup/cygserver/bsd_log.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* bsd_log.h: Helps integrating BSD kernel code
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-#ifndef _BSD_LOG_H
-#define _BSD_LOG_H
-
-#include <sys/types.h>
-#include <sys/syslog.h>
-
-extern long log_level;
-extern tun_bool_t log_debug;
-extern tun_bool_t log_syslog;
-extern tun_bool_t log_stderr;
-
-void loginit (tun_bool_t, tun_bool_t);
-void _vlog (const char *, int, int, const char *, va_list);
-void _log (const char *, int, int, const char *, ...);
-void _vpanic (const char *, int, const char *, va_list) __attribute__ ((noreturn));
-void _panic (const char *, int, const char *, ...) __attribute__ ((noreturn));
-#define vlog(l,f,a) _vlog(NULL,0,(l),(f),(a))
-#define log(l,f,...) _log(NULL,0,(l),(f),##__VA_ARGS__)
-#define vdebug(f,a) _vlog(__FILE__,__LINE__,LOG_DEBUG,(f),(a))
-#define debug(f,...) _log(__FILE__,__LINE__,LOG_DEBUG,(f),##__VA_ARGS__)
-#define vpanic(f,a) _vpanic(__FILE__,__LINE__,(f),(a))
-#define panic(f,...) _panic(__FILE__,__LINE__,(f),##__VA_ARGS__)
-
-#endif /* _BSD_LOG_H */
diff --git a/winsup/cygserver/bsd_mutex.cc b/winsup/cygserver/bsd_mutex.cc
deleted file mode 100644
index 9c7485b7f..000000000
--- a/winsup/cygserver/bsd_mutex.cc
+++ /dev/null
@@ -1,253 +0,0 @@
-/* bsd_mutex.cc
-
-   Copyright 2003 Red Hat Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-#include "cygerrno.h"
-#define _KERNEL 1
-#define __BSD_VISIBLE 1
-#include <sys/smallprint.h>
-
-#include "process.h"
-#include "cygserver_ipc.h"
-
-/* A BSD kernel global mutex. */
-struct mtx Giant;
-
-void
-mtx_init (mtx *m, const char *name, const void *, int)
-{
-  m->name = name;
-  m->owner = 0;
-  /* Can't use Windows Mutexes here since Windows Mutexes are only
-     unlockable by the lock owner. */
-  m->h = CreateSemaphore (NULL, 1, 1, NULL);
-  if (!m->h)
-    panic ("couldn't allocate %s mutex, %E\n", name);
-}
-
-void
-_mtx_lock (mtx *m, DWORD winpid, const char *file, int line)
-{
-  _log (file, line, LOG_DEBUG, "Try locking mutex %s", m->name);
-  if (WaitForSingleObject (m->h, INFINITE) != WAIT_OBJECT_0)
-    _panic (file, line, "wait for %s in %d failed, %E", m->name, winpid);
-  m->owner = winpid;
-  _log (file, line, LOG_DEBUG, "Locked      mutex %s", m->name);
-}
-
-int
-mtx_owned (mtx *m)
-{
-  return m->owner > 0;
-}
-
-void
-_mtx_assert(mtx *m, int what, const char *file, int line)
-{
-  switch (what)
-    {
-      case MA_OWNED:
-        if (!mtx_owned (m))
-	  _panic(file, line, "Mutex %s not owned", m->name);
-	break;
-      case MA_NOTOWNED:
-        if (mtx_owned (m))
-	  _panic(file, line, "Mutex %s is owned", m->name);
-        break;
-      default:
-        break;
-    }
-}
-
-void
-_mtx_unlock (mtx *m, const char *file, int line)
-{
-  m->owner = 0;
-  /* Cautiously check if mtx_destroy has been called (shutdown).
-     In that case, m->h is NULL. */
-  if (m->h && !ReleaseSemaphore (m->h, 1, NULL))
-    {
-      /* Check if the semaphore was already on it's max value.  In this case,
-         ReleaseSemaphore returns FALSE with an error code which *sic* depends
-	 on the OS. */
-      if (  (!wincap.is_winnt () && GetLastError () != ERROR_INVALID_PARAMETER)
-          || (wincap.is_winnt () && GetLastError () != ERROR_TOO_MANY_POSTS))
-	_panic (file, line, "release of mutex %s failed, %E", m->name);
-    }
-  _log (file, line, LOG_DEBUG, "Unlocked    mutex %s", m->name);
-}
-
-void
-mtx_destroy (mtx *m)
-{
-  HANDLE tmp = m->h;
-  m->h = NULL;
-  if (tmp)
-    CloseHandle (tmp);
-}
-
-/*
- * Helper functions for msleep/wakeup.
- */
-static char *
-msleep_event_name (void *ident, char *name)
-{
-  if (wincap.has_terminal_services ())
-    __small_sprintf (name, "Global\\cygserver.msleep.evt.%08x", ident);
-  else
-    __small_sprintf (name, "cygserver.msleep.evt.%08x", ident);
-  return name;
-}
-
-/*
- * Original description from BSD code:
- *
- * General sleep call.  Suspends the current process until a wakeup is
- * performed on the specified identifier.  The process will then be made
- * runnable with the specified priority.  Sleeps at most timo/hz seconds
- * (0 means no timeout).  If pri includes PCATCH flag, signals are checked
- * before and after sleeping, else signals are not checked.  Returns 0 if
- * awakened, EWOULDBLOCK if the timeout expires.  If PCATCH is set and a
- * signal needs to be delivered, ERESTART is returned if the current system
- * call should be restarted if possible, and EINTR is returned if the system
- * call should be interrupted by the signal (return EINTR).
- *
- * The mutex argument is exited before the caller is suspended, and
- * entered before msleep returns.  If priority includes the PDROP
- * flag the mutex is not entered before returning.
- */
-static HANDLE msleep_glob_evt;
-
-void
-msleep_init (void)
-{
-  msleep_glob_evt = CreateEvent (NULL, TRUE, FALSE, NULL);
-  if (!msleep_glob_evt)
-    panic ("CreateEvent in msleep_init failed: %E");
-}
-
-static int
-win_priority (int priority)
-{
-  int p = (int)((p) & PRIO_MASK) - PZERO;
-  /* Generating a valid priority value is a bit tricky.  The only valid
-     values on 9x and NT4 are -15, -2, -1, 0, 1, 2, 15. */
-  switch (p)
-    {
-      case -15: case -14: case -13: case -12: case -11:
-        return THREAD_PRIORITY_IDLE;
-      case -10: case -9: case -8: case -7: case -6:
-        return THREAD_PRIORITY_LOWEST;
-      case -5: case -4: case -3: case -2: case -1:
-        return THREAD_PRIORITY_BELOW_NORMAL;
-      case 0:
-        return THREAD_PRIORITY_NORMAL;
-      case 1: case 2: case 3: case 4: case 5:
-        return THREAD_PRIORITY_ABOVE_NORMAL;
-      case 6: case 7: case 8: case 9: case 10:
-      	return THREAD_PRIORITY_HIGHEST;
-      case 11: case 12: case 13: case 14: case 15:
-        return THREAD_PRIORITY_TIME_CRITICAL;
-    }
-  return THREAD_PRIORITY_NORMAL;
-}
-
-/*
- * Sets the thread priority, returns the old priority.
- */
-static int
-set_priority (int priority)
-{
-  int old_prio = GetThreadPriority (GetCurrentThread ());
-  if (!SetThreadPriority (GetCurrentThread (), win_priority(priority)))
-    log (LOG_WARNING,
-    	  "Warning: Setting thread priority to %d failed with error %lu\n",
-	  win_priority(priority), GetLastError ());
-  return old_prio;
-}
-
-int
-_msleep (void *ident, struct mtx *mtx, int priority,
-	const char *wmesg, int timo, struct thread *td)
-{
-  int ret = -1;
-  char name[64];
-  msleep_event_name (ident, name);
-  HANDLE evt = OpenEvent (EVENT_ALL_ACCESS, FALSE, name);
-  if (!evt)
-    evt = CreateEvent (NULL, TRUE, FALSE, name);
-  if (!evt)
-    panic ("CreateEvent in msleep (%s) failed: %E", wmesg);
-  if (mtx)
-    mtx_unlock (mtx);
-  int old_priority = set_priority (priority);
-  /* PCATCH can't be handled here. */
-  HANDLE obj[3] = { evt, td->client->handle (), msleep_glob_evt };
-  switch (WaitForMultipleObjects (3, obj, FALSE, timo ?: INFINITE))
-    {
-      case WAIT_OBJECT_0:	/* wakeup() has been called. */
-	ret = 0;
-        break;
-      case WAIT_OBJECT_0 + 2:	/* Shutdown event (triggered by wakeup_all). */
-        priority |= PDROP;
-	/*FALLTHRU*/
-      case WAIT_OBJECT_0 + 1:	/* The dependent process has exited. */
-	ret = EIDRM;
-        break;
-      case WAIT_TIMEOUT:
-        ret = EWOULDBLOCK;
-        break;
-      default:
-	panic ("wait in msleep (%s) failed, %E", wmesg);
-	break;
-    }
-  set_priority (old_priority);
-  if (!(priority & PDROP) && mtx)
-    mtx_lock (mtx);
-  CloseHandle (evt);
-  return ret;
-}
-
-/*
- * Make all threads sleeping on the specified identifier runnable.
- */
-int
-wakeup (void *ident)
-{
-  char name[64];
-  msleep_event_name (ident, name);
-  HANDLE evt = OpenEvent (EVENT_MODIFY_STATE, FALSE, name);
-  if (!evt)
-    {
-      /* Another round of different error codes returned by 9x and NT
-         systems. Oh boy... */
-      if (  (!wincap.is_winnt () && GetLastError () != ERROR_INVALID_NAME)
-	  || (wincap.is_winnt () && GetLastError () != ERROR_FILE_NOT_FOUND))
-	panic ("OpenEvent (%s) in wakeup failed: %E", name);
-    }
-  if (evt)
-    {
-      if (!SetEvent (evt))
-	panic ("SetEvent (%s) in wakeup failed, %E", name);
-      CloseHandle (evt);
-    }
-  return 0;
-}
-
-/*
- * Wakeup all sleeping threads.  Only called in the context of cygserver
- * shutdown.
- */
-void
-wakeup_all (void)
-{
-    SetEvent (msleep_glob_evt);
-}
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/bsd_mutex.h b/winsup/cygserver/bsd_mutex.h
deleted file mode 100644
index 3b07bf3c6..000000000
--- a/winsup/cygserver/bsd_mutex.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* bsd_mutex.h: BSD Mutex helper
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-#ifndef _BSD_MUTEX_H
-#define _BSD_MUTEX_H
-
-#define MTX_DEF 0
-
-#define MA_OWNED 1
-#define MA_NOTOWNED 2
-
-#define PZERO	  (0x20)
-#define PRIO_MASK (0x1f)
-#define PDROP  0x1000
-#define PCATCH 0x2000
-#define PLOCK  0x3000
-
-struct mtx {
-  HANDLE h;
-  const char *name;
-  DWORD owner;
-};
-
-/* Some BSD kernel global mutex. */
-extern struct mtx Giant;
-
-void mtx_init (mtx *, const char *, const void *, int);
-void _mtx_lock (mtx *, DWORD winpid, const char *, int);
-#define mtx_lock(m) _mtx_lock((m), (td->ipcblk->winpid), __FILE__, __LINE__)
-int mtx_owned (mtx *);
-void _mtx_assert(mtx *, int, const char *, int);
-#define mtx_assert(m,w) _mtx_assert((m),(w),__FILE__,__LINE__)
-void _mtx_unlock (mtx *, const char *, int);
-#define mtx_unlock(m) _mtx_unlock((m),__FILE__,__LINE__)
-
-void mtx_destroy (mtx *);
-
-void msleep_init (void);
-int _msleep (void *, struct mtx *, int, const char *, int, struct thread *);
-#define msleep(i,m,p,w,t) _msleep((i),(m),(p),(w),(t),(td))
-#define tsleep(i,p,w,t)   _msleep((i),NULL,(p),(w),(t),(td))
-int wakeup (void *);
-void wakeup_all (void);
-
-#endif /* _BSD_MUTEX_H */
diff --git a/winsup/cygserver/client.cc b/winsup/cygserver/client.cc
deleted file mode 100644
index d8f7ac55a..000000000
--- a/winsup/cygserver/client.cc
+++ /dev/null
@@ -1,541 +0,0 @@
-/* client.cc
-
-   Copyright 2001, 2002, 2003 Red Hat Inc.
-
-   Written by Egor Duda <deo@logos-m.ru>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* to allow this to link into cygwin and the .dll, a little magic is needed. */
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-#else
-#include "winsup.h"
-#endif
-
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "cygerrno.h"
-#include "cygserver_msg.h"
-#include "cygserver_sem.h"
-#include "cygserver_shm.h"
-
-#include "cygserver.h"
-#include "transport.h"
-
-int cygserver_running = CYGSERVER_UNKNOWN; // Nb: inherited by children.
-
-bool allow_server = false;	// Nb: inherited by children.
-
-client_request_get_version::client_request_get_version ()
-  : client_request (CYGSERVER_REQUEST_GET_VERSION, &version, sizeof (version))
-{
-  msglen (0);			// No parameters for request.
-
-  // verbose: syscall_printf ("created");
-}
-
-/*
- * client_request_get_version::check_version ()
- *
- * The major version and API version numbers must match exactly.  An
- * older than expected minor version number is accepted (as long as
- * the first numbers match, that is).
- */
-
-#ifdef __INSIDE_CYGWIN__
-
-bool
-client_request_get_version::check_version () const
-{
-  const bool ok = (version.major == CYGWIN_SERVER_VERSION_MAJOR
-		   && version.api == CYGWIN_SERVER_VERSION_API
-		   && version.minor <= CYGWIN_SERVER_VERSION_MINOR);
-
-  if (!ok)
-    syscall_printf (("incompatible version of cygwin server: "
-		     "client version %d.%d.%d.%d, "
-		     "server version %ld.%ld.%ld.%ld"),
-		    CYGWIN_SERVER_VERSION_MAJOR,
-		    CYGWIN_SERVER_VERSION_API,
-		    CYGWIN_SERVER_VERSION_MINOR,
-		    CYGWIN_SERVER_VERSION_PATCH,
-		    version.major,
-		    version.api,
-		    version.minor,
-		    version.patch);
-
-  return ok;
-}
-
-client_request_attach_tty::client_request_attach_tty (DWORD nmaster_pid,
-						      HANDLE nfrom_master,
-						      HANDLE nto_master)
-  : client_request (CYGSERVER_REQUEST_ATTACH_TTY, &req, sizeof (req))
-{
-  req.pid = GetCurrentProcessId ();
-  req.master_pid = nmaster_pid;
-  req.from_master = nfrom_master;
-  req.to_master = nto_master;
-
-  syscall_printf (("created: pid = %lu, master_pid = %lu, "
-		   "from_master = %lu, to_master = %lu"),
-		  req.pid, req.master_pid, req.from_master, req.to_master);
-}
-#endif /* __INSIDE_CYGWIN__ */
-
-/*
- * client_request_attach_tty::send ()
- *
- * Wraps the base method to provide error handling support.  If the
- * reply contains a body but is flagged as an error, close any handles
- * that have been returned by cygserver and then discard the message
- * body, i.e. the client either sees a successful result with handles
- * or an unsuccessful result with no handles.
- */
-
-void
-client_request_attach_tty::send (transport_layer_base * const conn)
-{
-  client_request::send (conn);
-
-  if (msglen () && error_code ())
-    {
-      if (from_master ())
-	CloseHandle (from_master ());
-      if (to_master ())
-	CloseHandle (to_master ());
-      msglen (0);
-    }
-}
-
-client_request::header_t::header_t (const request_code_t request_code,
-				    const size_t msglen)
-  : msglen (msglen),
-    request_code (request_code)
-{
-  assert (request_code >= 0 && request_code < CYGSERVER_REQUEST_LAST);
-}
-
-// FIXME: also check write and read result for -1.
-
-void
-client_request::send (transport_layer_base * const conn)
-{
-  assert (conn);
-  assert (!(msglen () && !_buf)); // i.e., msglen () implies _buf
-  assert (msglen () <= _buflen);
-
-  {
-    const ssize_t count = conn->write (&_header, sizeof (_header));
-
-    if (count != sizeof (_header))
-      {
-	assert (errno);
-	error_code (errno);
-	syscall_printf (("request header write failure: "
-			 "only %ld bytes sent of %ld, "
-			 "error = %d(%lu)"),
-			count, sizeof (_header),
-			errno, GetLastError ());
-	return;
-      }
-  }
-
-  if (msglen ())
-    {
-      const ssize_t count = conn->write (_buf, msglen ());
-
-      if (count == -1 || (size_t) count != msglen ())
-	{
-	  assert (errno);
-	  error_code (errno);
-	  syscall_printf (("request body write failure: "
-			   "only %ld bytes sent of %ld, "
-			   "error = %d(%lu)"),
-			  count, msglen (),
-			  errno, GetLastError ());
-	  return;
-	}
-    }
-
-  // verbose: syscall_printf ("request sent (%ld + %ld bytes)",
-  //			      sizeof (_header), msglen ());
-
-  {
-    const ssize_t count = conn->read (&_header, sizeof (_header));
-
-    if (count != sizeof (_header))
-      {
-	assert (errno);
-	error_code (errno);
-	syscall_printf (("reply header read failure: "
-			 "only %ld bytes received of %ld, "
-			 "error = %d(%lu)"),
-			count, sizeof (_header),
-			errno, GetLastError ());
-	return;
-      }
-  }
-
-  if (msglen () && !_buf)
-    {
-      system_printf ("no client buffer for reply body: %ld bytes needed",
-		     msglen ());
-      error_code (EINVAL);
-      return;
-    }
-
-  if (msglen () > _buflen)
-    {
-      system_printf (("client buffer too small for reply body: "
-		      "have %ld bytes and need %ld"),
-		     _buflen, msglen ());
-      error_code (EINVAL);
-      return;
-    }
-
-  if (msglen ())
-    {
-      const ssize_t count = conn->read (_buf, msglen ());
-
-      if (count == -1 || (size_t) count != msglen ())
-	{
-	  assert (errno);
-	  error_code (errno);
-	  syscall_printf (("reply body read failure: "
-			   "only %ld bytes received of %ld, "
-			   "error = %d(%lu)"),
-			  count, msglen (),
-			  errno, GetLastError ());
-	  return;
-	}
-    }
-
-  // verbose: syscall_printf ("reply received (%ld + %ld bytes)",
-  //			      sizeof (_header), msglen ());
-}
-
-#ifdef __OUTSIDE_CYGWIN__
-
-client_request_attach_tty::client_request_attach_tty ()
-  : client_request (CYGSERVER_REQUEST_ATTACH_TTY, &req, sizeof (req))
-{
-}
-
-/*
- * client_request::handle_request ()
- *
- * A server-side method.
- *
- * This is a factory method for the client_request subclasses.  It
- * reads the incoming request header and, based on its request code,
- * creates an instance of the appropriate class.
- *
- * FIXME: If the incoming packet is malformed, the server drops it on
- * the floor.  Should it try and generate some sort of reply for the
- * client?  As it is, the client will simply get a broken connection.
- *
- * FIXME: also check write and read result for -1.
- */
-
-/* static */ void
-client_request::handle_request (transport_layer_base *const conn,
-				process_cache *const cache)
-{
-  // verbose: debug_printf ("about to read");
-
-  header_t header;
-
-  {
-    const ssize_t count = conn->read (&header, sizeof (header));
-
-    if (count != sizeof (header))
-      {
-	syscall_printf (("request header read failure: "
-			 "only %ld bytes received of %ld, "
-			 "error = %d(%lu)"),
-			count, sizeof (header),
-			errno, GetLastError ());
-	return;
-      }
-
-      // verbose: debug_printf ("got header (%ld)", count);
-  }
-
-  client_request *req = NULL;
-
-  switch (header.request_code)
-    {
-    case CYGSERVER_REQUEST_GET_VERSION:
-      req = new client_request_get_version;
-      break;
-    case CYGSERVER_REQUEST_SHUTDOWN:
-      req = new client_request_shutdown;
-      break;
-    case CYGSERVER_REQUEST_ATTACH_TTY:
-      req = new client_request_attach_tty;
-      break;
-    case CYGSERVER_REQUEST_MSG:
-      req = new client_request_msg;
-      break;
-    case CYGSERVER_REQUEST_SEM:
-      req = new client_request_sem;
-      break;
-    case CYGSERVER_REQUEST_SHM:
-      req = new client_request_shm;
-      break;
-    default:
-      syscall_printf ("unknown request code %d received: request ignored",
-		      header.request_code);
-      return;
-    }
-
-  assert (req);
-
-  req->msglen (header.msglen);
-  req->handle (conn, cache);
-
-  delete req;
-}
-
-/*
- * client_request::handle ()
- *
- * A server-side method.
- *
- * At this point, the header of an incoming request has been read and
- * an appropriate client_request object constructed.  This method has
- * to read the request body into its buffer, if there is such a body,
- * then perform the request and send back the results to the client.
- *
- * FIXME: If the incoming packet is malformed, the server drops it on
- * the floor.  Should it try and generate some sort of reply for the
- * client?  As it is, the client will simply get a broken connection.
- *
- * FIXME: also check write and read result for -1.
- */
-
-void
-client_request::handle (transport_layer_base *const conn,
-			process_cache *const cache)
-{
-  if (msglen () && !_buf)
-    {
-      system_printf ("no buffer for request body: %ld bytes needed",
-		     msglen ());
-      error_code (EINVAL);
-      return;
-    }
-
-  if (msglen () > _buflen)
-    {
-      system_printf (("buffer too small for request body: "
-		      "have %ld bytes and need %ld"),
-		     _buflen, msglen ());
-      error_code (EINVAL);
-      return;
-    }
-
-  if (msglen ())
-    {
-      const ssize_t count = conn->read (_buf, msglen ());
-
-      if (count == -1 || (size_t) count != msglen ())
-	{
-	  assert (errno);
-	  error_code (errno);
-	  syscall_printf (("request body read failure: "
-			   "only %ld bytes received of %ld, "
-			   "error = %d(%lu)"),
-			  count, msglen (),
-			  errno, GetLastError ());
-	  return;
-	}
-    }
-
-  // verbose: syscall_printf ("request received (%ld + %ld bytes)",
-  //			      sizeof (_header), msglen ());
-
-  error_code (0);		// Overwrites the _header.request_code field.
-
-  /*
-   * This is not allowed to fail. We must return ENOSYS at a minimum
-   * to the client.
-   */
-  serve (conn, cache);
-
-  {
-    const ssize_t count = conn->write (&_header, sizeof (_header));
-
-    if (count != sizeof (_header))
-      {
-	assert (errno);
-	error_code (errno);
-	syscall_printf (("reply header write failure: "
-			 "only %ld bytes sent of %ld, "
-			 "error = %d(%lu)"),
-			count, sizeof (_header),
-			errno, GetLastError ());
-	return;
-      }
-  }
-
-  if (msglen ())
-    {
-      const ssize_t count = conn->write (_buf, msglen ());
-
-      if (count == -1 || (size_t) count != msglen ())
-	{
-	  assert (errno);
-	  error_code (errno);
-	  syscall_printf (("reply body write failure: "
-			   "only %ld bytes sent of %ld, "
-			   "error = %d(%lu)"),
-			  count, msglen (),
-			  errno, GetLastError ());
-	  return;
-	}
-    }
-
-  // verbose: syscall_printf ("reply sent (%ld + %ld bytes)",
-  //			      sizeof (_header), msglen ());
-}
-
-/* The server side implementation of make_request.  Very simple. */
-int
-client_request::make_request ()
-{
-  transport_layer_base *const transport = create_server_transport ();
-  assert (transport);
-  if (transport->connect () == -1)
-    {
-      if (errno)
-	error_code (errno);
-      else
-	error_code (ENOSYS);
-      delete transport;
-      return -1;
-    }
-  send (transport);
-  delete transport;
-  return 0;
-}
-#endif /* __OUTSIDE_CYGWIN__ */
-
-client_request::client_request (request_code_t const id,
-				void * const buf,
-				size_t const buflen)
-  : _header (id, buflen),
-    _buf (buf),
-    _buflen (buflen)
-{
-  assert ((!_buf && !_buflen) || (_buf && _buflen));
-}
-
-client_request::~client_request ()
-{}
-
-#ifdef __INSIDE_CYGWIN__
-int
-client_request::make_request ()
-{
-  assert (cygserver_running == CYGSERVER_UNKNOWN	\
-	  || cygserver_running == CYGSERVER_OK		\
-	  || cygserver_running == CYGSERVER_UNAVAIL);
-
-  if (cygserver_running == CYGSERVER_UNKNOWN)
-    cygserver_init ();
-
-  assert (cygserver_running == CYGSERVER_OK		\
-	  || cygserver_running == CYGSERVER_UNAVAIL);
-
-  /* Don't retry every request if the server's not there */
-  if (cygserver_running == CYGSERVER_UNAVAIL)
-    {
-      syscall_printf ("cygserver un-available");
-      error_code (ENOSYS);
-      return -1;
-    }
-
-  transport_layer_base *const transport = create_server_transport ();
-
-  assert (transport);
-
-  if (transport->connect () == -1)
-    {
-      if (errno)
-	error_code (errno);
-      else
-	error_code (ENOSYS);
-      delete transport;
-      return -1;
-    }
-
-  // verbose: debug_printf ("connected to server %p", transport);
-
-  send (transport);
-
-  delete transport;
-
-  return 0;
-}
-
-bool
-check_cygserver_available ()
-{
-  assert (cygserver_running == CYGSERVER_UNKNOWN	\
-	  || cygserver_running == CYGSERVER_UNAVAIL);
-
-  cygserver_running = CYGSERVER_OK; // For make_request ().
-
-  client_request_get_version req;
-
-  /* This indicates that we failed to connect to cygserver at all but
-   * that's fine as cygwin doesn't need it to be running.
-   */
-  if (req.make_request () == -1)
-    return false;
-
-  /* We connected to the server but something went wrong after that
-   * (in sending the message, in cygserver itself, or in receiving the
-   * reply).
-   */
-  if (req.error_code ())
-    {
-      syscall_printf ("failure in cygserver version request: %d",
-		      req.error_code ());
-      syscall_printf ("process will continue without cygserver support");
-      return false;
-    }
-
-  return req.check_version ();
-}
-
-void
-cygserver_init ()
-{
-  if (!allow_server)
-    {
-      syscall_printf ("cygserver use disabled in client");
-      cygserver_running = CYGSERVER_UNAVAIL;
-      return;
-    }
-
-  assert (cygserver_running == CYGSERVER_UNKNOWN	\
-	  || cygserver_running == CYGSERVER_OK		\
-	  || cygserver_running == CYGSERVER_UNAVAIL);
-
-  if (cygserver_running == CYGSERVER_OK)
-    return;
-
-  if (!check_cygserver_available ())
-    cygserver_running = CYGSERVER_UNAVAIL;
-}
-#endif /* __INSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/configure b/winsup/cygserver/configure
deleted file mode 100755
index 6eb065e99..000000000
--- a/winsup/cygserver/configure
+++ /dev/null
@@ -1,2163 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
- --enable-debugging		Build a cygwin DLL which has more consistency checking for debugging"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=cygserver.cc
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-INSTALL=`cd $srcdir/../..; echo $(pwd)/install-sh -c`
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:561: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-
-
-
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:647: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:668: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:686: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:718: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CC"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:750: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CC="gcc"
-fi
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:786: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:835: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:859: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-gstabs+ -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
-set dummy ${ac_tool_prefix}g++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:889: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="${ac_tool_prefix}g++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CXX"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "g++", so it can be a program name with args.
-set dummy g++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:921: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="g++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CXX" && ac_cv_prog_CXX="g++"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CXX="g++"
-fi
-fi
-
-if test -z "$CXX"; then
-  # Extract the first word of "c++", so it can be a program name with args.
-set dummy c++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:957: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="c++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-CXXFLAGS='$(CFLAGS)'
-
-
-case "$with_cross_host" in
-  ""|*cygwin*)
-    all_host="all_host"
-    install_host="install_host"
-    ;;
-  *)
-    all_host=
-    install_host=
-    ;;
-esac
-
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1006: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AR"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1038: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AR="ar"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1073: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1105: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="as"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1140: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1172: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB="ranlib"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB="ranlib"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ld; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1207: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="${ac_tool_prefix}ld"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_LD"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ld", so it can be a program name with args.
-set dummy ld; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1239: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="ld"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LD" && ac_cv_prog_LD="ld"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  LD="ld"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1274: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="${ac_tool_prefix}nm"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_NM"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "nm", so it can be a program name with args.
-set dummy nm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1306: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="nm"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_NM" && ac_cv_prog_NM="nm"
-fi
-fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  NM="nm"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1341: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1373: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="dlltool"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="dlltool"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
-set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1408: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-WINDRES="$ac_cv_prog_WINDRES"
-if test -n "$WINDRES"; then
-  echo "$ac_t""$WINDRES" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_WINDRES"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1440: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES="windres"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_WINDRES" && ac_cv_prog_WINDRES="windres"
-fi
-fi
-WINDRES="$ac_cv_prog_WINDRES"
-if test -n "$WINDRES"; then
-  echo "$ac_t""$WINDRES" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  WINDRES="windres"
-fi
-fi
-
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1474: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1489 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1506 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1523 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1556: checking for working alloca.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1561 "configure"
-#include "confdefs.h"
-#include <alloca.h>
-int main() {
-char *p = alloca(2 * sizeof(int));
-; return 0; }
-EOF
-if { (eval echo configure:1568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_header_alloca_h=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_alloca_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
-if test $ac_cv_header_alloca_h = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA_H 1
-EOF
-
-fi
-
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1589: checking for alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1594 "configure"
-#include "confdefs.h"
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int main() {
-char *p = (char *) alloca(1);
-; return 0; }
-EOF
-if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_func_alloca_works=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_alloca_works=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
-if test $ac_cv_func_alloca_works = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA 1
-EOF
-
-fi
-
-if test $ac_cv_func_alloca_works = no; then
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-  # that cause trouble.  Some versions do not even contain alloca or
-  # contain a buggy version.  If you still want to use their alloca,
-  # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.${ac_objext}
-  cat >> confdefs.h <<\EOF
-#define C_ALLOCA 1
-EOF
-
-
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1654: checking whether alloca needs Cray hooks" >&5
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1659 "configure"
-#include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "webecray" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_os_cray=yes
-else
-  rm -rf conftest*
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_os_cray" 1>&6
-if test $ac_cv_os_cray = yes; then
-for ac_func in _getb67 GETB67 getb67; do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1684: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1689 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<EOF
-#define CRAY_STACKSEG_END $ac_func
-EOF
-
-  break
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-done
-fi
-
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:1739: checking stack direction for C alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1747 "configure"
-#include "confdefs.h"
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-main ()
-{
-  exit (find_stack_direction() < 0);
-}
-EOF
-if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_stack_direction=1
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_stack_direction=-1
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
-cat >> confdefs.h <<EOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-EOF
-
-fi
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1788: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-# Test for builtin mem* functions.
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-cat > conftest.$ac_ext <<EOF
-#line 1825 "configure"
-#include "confdefs.h"
-
-#include <string.h>
-void foo(char *s, int c, size_t n)
-{
-  __builtin_memset(s, c, n);
-}
-
-int main() {
- 
-; return 0; }
-EOF
-if { (eval echo configure:1838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  use_builtin_memset=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  use_builtin_memset=no
-fi
-rm -f conftest*
-if test $use_builtin_memset = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_BUILTIN_MEMSET 1
-EOF
-
-fi
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-
-# Check whether --enable-debugging or --disable-debugging was given.
-if test "${enable_debugging+set}" = set; then
-  enableval="$enable_debugging"
-  case "${enableval}" in
-yes)	 cat >> confdefs.h <<\EOF
-#define DEBUGGING 1
-EOF
- ;;
-no)	 ;;
-esac
-
-fi
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CC@%$CC%g
-s%@CXX@%$CXX%g
-s%@all_host@%$all_host%g
-s%@install_host@%$install_host%g
-s%@AR@%$AR%g
-s%@AS@%$AS%g
-s%@RANLIB@%$RANLIB%g
-s%@LD@%$LD%g
-s%@NM@%$NM%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@WINDRES@%$WINDRES%g
-s%@CPP@%$CPP%g
-s%@ALLOCA@%$ALLOCA%g
-s%@SET_MAKE@%$SET_MAKE%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/winsup/cygserver/configure.in b/winsup/cygserver/configure.in
deleted file mode 100644
index 16cbd84bd..000000000
--- a/winsup/cygserver/configure.in
+++ /dev/null
@@ -1,123 +0,0 @@
-dnl Autoconf configure script for Cygwin.
-dnl Copyright 2003 Red Hat, Inc.
-dnl
-dnl This file is part of Cygwin.
-dnl
-dnl This software is a copyrighted work licensed under the terms of the
-dnl Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-dnl details.
-dnl
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.12)dnl
-AC_INIT(cygserver.cc)
-
-INSTALL=`cd $srcdir/../..; echo $(pwd)/install-sh -c`
-
-AC_PROG_INSTALL
-
-dnl FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-dnl copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-dnl are probably using a cross compiler, which will not be able to fully
-dnl link an executable.  This should really be fixed in autoconf
-dnl itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-gstabs+ -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-AC_DEFUN(LIB_AC_PROG_CXX,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CXX, g++, g++)
-if test -z "$CXX"; then
-  AC_CHECK_PROG(CXX, c++, c++, , , )
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-CXXFLAGS='$(CFLAGS)'
-])
-
-AC_CANONICAL_SYSTEM
-
-LIB_AC_PROG_CC
-LIB_AC_PROG_CXX
-
-case "$with_cross_host" in
-  ""|*cygwin*)
-    all_host="all_host"
-    install_host="install_host"
-    ;;
-  *)
-    all_host=
-    install_host=
-    ;;
-esac
-
-AC_SUBST(all_host)
-AC_SUBST(install_host)
-
-AC_CHECK_TOOL(AR, ar, ar)
-AC_CHECK_TOOL(AS, as, as)
-AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
-AC_CHECK_TOOL(LD, ld, ld)
-AC_CHECK_TOOL(NM, nm, nm)
-AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
-AC_CHECK_TOOL(WINDRES, windres, windres)
-
-AC_ALLOCA
-AC_PROG_MAKE_SET
-
-dnl check whether gcc supports __builtin_memset.
-# Test for builtin mem* functions.
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE([
-#include <string.h>
-void foo(char *s, int c, size_t n)
-{
-  __builtin_memset(s, c, n);
-}
-], [ ],
-use_builtin_memset=yes, use_builtin_memset=no)
-if test $use_builtin_memset = "yes"; then
-  AC_DEFINE(HAVE_BUILTIN_MEMSET)
-fi
-AC_LANG_RESTORE
-
-AC_ARG_ENABLE(debugging,
-[ --enable-debugging		Build a cygwin DLL which has more consistency checking for debugging],
-[case "${enableval}" in
-yes)	 AC_DEFINE(DEBUGGING) ;;
-no)	 ;;
-esac
-])
-
-AC_OUTPUT(Makefile)
diff --git a/winsup/cygserver/cygserver-config b/winsup/cygserver/cygserver-config
deleted file mode 100755
index 54440c3e9..000000000
--- a/winsup/cygserver/cygserver-config
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/bin/bash
-#
-# cygserver-config, Copyright 2003 Red Hat Inc.
-#
-# This file is part of the Cygwin DLL.
-
-# Directory where the config files are stored
-SYSCONFDIR=/etc
-LOCALSTATEDIR=/var
-
-progname=$0
-auto_answer=""
-
-request()
-{
-  if [ "${auto_answer}" = "yes" ]
-  then
-    echo "$1 (yes/no) yes"
-    return 0
-  elif [ "${auto_answer}" = "no" ]
-  then
-    echo "$1 (yes/no) no"
-    return 1
-  fi
-
-  answer=""
-  while [ "X${answer}" != "Xyes" -a "X${answer}" != "Xno" ]
-  do
-    echo -n "$1 (yes/no) "
-    read -e answer
-  done
-  if [ "X${answer}" = "Xyes" ]
-  then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# Check options
-
-while :
-do
-  case $# in
-  0)
-    break
-    ;;
-  esac
-
-  option=$1
-  shift
-
-  case "${option}" in
-  -d | --debug )
-    set -x
-    ;;
-
-  -y | --yes )
-    auto_answer=yes
-    ;;
-
-  -n | --no )
-    auto_answer=no
-    ;;
-
-  *)
-    echo "usage: ${progname} [OPTION]..."
-    echo
-    echo "This script creates an Cygserver service configuration."
-    echo
-    echo "Options:"
-    echo "  --debug  -d            Enable shell's debug output."
-    echo "  --yes    -y            Answer all questions with \"yes\" automatically."
-    echo "  --no     -n            Answer all questions with \"no\" automatically."
-    echo
-    exit 1
-    ;;
-
-  esac
-done
-
-# Check if running on NT
-_sys="`uname`"
-_nt=`expr "${_sys}" : "CYGWIN_NT"`
-
-# Check for running cygserver processes first.
-if ps -ef | grep -v grep | grep -q cygserver
-then
-  echo
-  echo "There is a cygserver already running. Nothing to do, apparently."
-  echo
-  exit 1
-fi
-
-# Check for ${SYSCONFDIR} directory
-if [ -e "${SYSCONFDIR}" -a ! -d "${SYSCONFDIR}" ]
-then
-  echo
-  echo "${SYSCONFDIR} is existant but not a directory."
-  echo "Cannot create global configuration file."
-  echo
-  exit 1
-fi
-
-# Create it if necessary
-if [ ! -e "${SYSCONFDIR}" ]
-then
-  mkdir "${SYSCONFDIR}"
-  if [ ! -e "${SYSCONFDIR}" ]
-  then
-    echo
-    echo "Creating ${SYSCONFDIR} directory failed"
-    echo
-    exit 1
-  fi
-fi
-
-# Create /var/log if not already existing
-if [ -f ${LOCALSTATEDIR}/log ]
-then
-  echo "Creating ${LOCALSTATEDIR}/log failed!"
-else
-  if [ ! -d ${LOCALSTATEDIR}/log ]
-  then
-    mkdir -p ${LOCALSTATEDIR}/log
-  fi
-fi
-
-# Check if cygserver.conf exists. If yes, ask for overwriting
-if [ -f "${SYSCONFDIR}/cygserver.conf" ]
-then
-  if request "Overwrite existing ${SYSCONFDIR}/cygserver.conf file?"
-  then
-    rm -f "${SYSCONFDIR}/cygserver.conf"
-    if [ -f "${SYSCONFDIR}/cygserver.conf" ]
-    then
-      echo
-      echo "Can't overwrite. ${SYSCONFDIR}/cygserver.conf is write protected."
-      echo
-      exit 1
-    fi
-  fi
-fi
-
-# Create default cygserver.conf from skeleton files in /etc/defaults/etc
-if [ ! -f "${SYSCONFDIR}/cygserver.conf" ]
-then
-  echo "Generating ${SYSCONFDIR}/cygserver.conf file"
-  cp "${SYSCONFDIR}/defaults/etc/cygserver.conf" "${SYSCONFDIR}/cygserver.conf"
-  if [ ! -f "${SYSCONFDIR}/cygserver.conf" ]
-  then
-    echo
-    echo "Couldn't create ${SYSCONFDIR}/cygserver.conf."
-    echo "Perhaps there's no default file in ${SYSCONFDIR}/defaults/etc?"
-    echo "Reinstalling Cygwin might help."
-    echo
-    exit 1
-  fi
-  chmod 664 "${SYSCONFDIR}/cygserver.conf"
-  chown system.544 "${SYSCONFDIR}/cygserver.conf"
-fi
-
-# On NT ask if cygserver should be installed as service
-if [ ${_nt} -gt 0 ]
-then
-  # But only if it is not already installed
-  if ! cygrunsrv -Q cygserver > /dev/null 2>&1
-  then
-    echo
-    echo
-    echo "Warning: The following function requires administrator privileges!"
-    echo
-    echo "Do you want to install cygserver as service?"
-    if request "(Say \"no\" if it's already installed as service)"
-    then
-      if ! cygrunsrv -I cygserver -d "CYGWIN cygserver" -p /usr/sbin/cygserver
-      then
-        echo
-	echo "Installation of cygserver as service failed.  Please check the"
-	echo "error messages you got.  They might give a clue why it failed."
-	echo
-	echo "A good start is either you don't have administrator privileges"
-	echo "or a missing cygrunsrv binary.  Please check for both."
-	echo
-	exit 1
-      fi
-      echo
-      echo "The service has been installed under LocalSystem account."
-      echo "To start it, call \`net start cygserver' or \`cygrunsrv -S cygserver'."
-    fi
-    touch "${LOCALSTATEDIR}/log/cygserver.log"
-    chown system.544 "${LOCALSTATEDIR}/log/cygserver.log"
-  fi
-fi
-
-echo
-echo "Further configuration options are available by editing the configuration"
-echo "file ${SYSCONFDIR}/cygserver.conf.  Please read the inline information in that"
-echo "file carefully. The best option for the start is to just leave it alone."
-echo
-echo "Please keep in mind, that a client application which wants to use"
-echo "the services provided by cygserver *must* have the environment variable"
-echo "CYGWIN set so that it contains the word \"server\".  So, if you don't"
-echo "need any other special CYGWIN setting, just set it to \"server\"".
-echo
-echo "It is advisable to add this setting to the Windows system environment."
-echo
-echo "Basic Cygserver configuration finished. Have fun!"
-echo
diff --git a/winsup/cygserver/cygserver.cc b/winsup/cygserver/cygserver.cc
deleted file mode 100644
index 0cc6244ad..000000000
--- a/winsup/cygserver/cygserver.cc
+++ /dev/null
@@ -1,786 +0,0 @@
-/* cygserver.cc
-
-   Copyright 2001, 2002, 2003 Red Hat Inc.
-
-   Written by Egor Duda <deo@logos-m.ru>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "cygerrno.h"
-#include "cygwin_version.h"
-
-#include "cygserver.h"
-#include "process.h"
-#include "transport.h"
-
-#include "cygserver_ipc.h"
-#include "cygserver_msg.h"
-#include "cygserver_sem.h"
-
-#define DEF_CONFIG_FILE	"" SYSCONFDIR "/cygserver.conf"
-
-// Version string.
-static const char version[] = "$Revision$";
-
-GENERIC_MAPPING access_mapping;
-
-static bool
-setup_privileges ()
-{
-  BOOL rc, ret_val;
-  HANDLE hToken = NULL;
-  TOKEN_PRIVILEGES sPrivileges;
-
-  rc = OpenProcessToken (GetCurrentProcess () , TOKEN_ALL_ACCESS , &hToken) ;
-  if (!rc)
-    {
-      debug ("error opening process token (%lu)", GetLastError ());
-      return false;
-    }
-  rc = LookupPrivilegeValue (NULL, SE_DEBUG_NAME, &sPrivileges.Privileges[0].Luid);
-  if (!rc)
-    {
-      debug ("error getting privilege luid (%lu)", GetLastError ());
-      ret_val = false;
-      goto out;
-    }
-  sPrivileges.PrivilegeCount = 1 ;
-  sPrivileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED ;
-  rc = AdjustTokenPrivileges (hToken, FALSE, &sPrivileges, 0, NULL, NULL) ;
-  if (!rc)
-    {
-      debug ("error adjusting privilege level. (%lu)", GetLastError ());
-      ret_val = false;
-      goto out;
-    }
-
-  access_mapping.GenericRead = FILE_READ_DATA;
-  access_mapping.GenericWrite = FILE_WRITE_DATA;
-  access_mapping.GenericExecute = 0;
-  access_mapping.GenericAll = FILE_READ_DATA | FILE_WRITE_DATA;
-
-  ret_val = true;
-
-out:
-  CloseHandle (hToken);
-  return ret_val;
-}
-
-int
-check_and_dup_handle (HANDLE from_process, HANDLE to_process,
-		      HANDLE from_process_token,
-		      DWORD access,
-		      HANDLE from_handle,
-		      HANDLE *to_handle_ptr, BOOL bInheritHandle = FALSE)
-{
-  HANDLE local_handle = NULL;
-  int ret_val = EACCES;
-
-  if (from_process != GetCurrentProcess ())
-    {
-      if (!DuplicateHandle (from_process, from_handle,
-			    GetCurrentProcess (), &local_handle,
-			    0, bInheritHandle,
-			    DUPLICATE_SAME_ACCESS))
-	{
-	  log (LOG_ERR, "error getting handle(%u) to server (%lu)",
-			 (unsigned int)from_handle, GetLastError ());
-	  goto out;
-	}
-    } else
-      local_handle = from_handle;
-
-  if (!wincap.has_security ())
-    assert (!from_process_token);
-  else
-    {
-      char sd_buf [1024];
-      PSECURITY_DESCRIPTOR sd = (PSECURITY_DESCRIPTOR) &sd_buf;
-      DWORD bytes_needed;
-      PRIVILEGE_SET ps;
-      DWORD ps_len = sizeof (ps);
-      BOOL status;
-
-      if (!GetKernelObjectSecurity (local_handle,
-				    (OWNER_SECURITY_INFORMATION
-				     | GROUP_SECURITY_INFORMATION
-				     | DACL_SECURITY_INFORMATION),
-				    sd, sizeof (sd_buf), &bytes_needed))
-	{
-	  log (LOG_ERR, "error getting handle SD (%lu)", GetLastError ());
-	  goto out;
-	}
-
-      MapGenericMask (&access, &access_mapping);
-
-      if (!AccessCheck (sd, from_process_token, access, &access_mapping,
-			&ps, &ps_len, &access, &status))
-	{
-	  log (LOG_ERR, "error checking access rights (%lu)",
-			 GetLastError ());
-	  goto out;
-	}
-
-      if (!status)
-	{
-	  log (LOG_ERR, "access to object denied");
-	  goto out;
-	}
-    }
-
-  if (!DuplicateHandle (from_process, from_handle,
-			to_process, to_handle_ptr,
-			access, bInheritHandle, 0))
-    {
-      log (LOG_ERR, "error getting handle to client (%lu)", GetLastError ());
-      goto out;
-    }
-
-  debug ("Duplicated %p to %p", from_handle, *to_handle_ptr);
-
-  ret_val = 0;
-
- out:
-  if (local_handle && from_process != GetCurrentProcess ())
-    CloseHandle (local_handle);
-
-  return (ret_val);
-}
-
-/*
- * client_request_attach_tty::serve ()
- */
-
-void
-client_request_attach_tty::serve (transport_layer_base *const conn,
-				  process_cache *)
-{
-  assert (conn);
-
-  assert (!error_code ());
-
-  if (!wincap.has_security ())
-    {
-      log (LOG_NOTICE, "operation only supported on systems with security");
-      error_code (EINVAL);
-      msglen (0);
-      return;
-    }
-
-  if (msglen () != sizeof (req))
-    {
-      log (LOG_ERR, "bad request body length: expecting %lu bytes, got %lu",
-		      sizeof (req), msglen ());
-      error_code (EINVAL);
-      msglen (0);
-      return;
-    }
-
-  msglen (0);			// Until we fill in some fields.
-
-  debug ("pid %ld:(%p,%p) -> pid %ld", req.master_pid, req.from_master,
-				       req.to_master, req.pid);
-
-  debug ("opening process %ld", req.master_pid);
-
-  const HANDLE from_process_handle =
-    OpenProcess (PROCESS_DUP_HANDLE, FALSE, req.master_pid);
-
-  if (!from_process_handle)
-    {
-      log (LOG_ERR, "error opening `from' process, error = %lu",
-		     GetLastError ());
-      error_code (EACCES);
-      return;
-    }
-
-  debug ("opening process %ld", req.pid);
-
-  const HANDLE to_process_handle =
-    OpenProcess (PROCESS_DUP_HANDLE, FALSE, req.pid);
-
-  if (!to_process_handle)
-    {
-      log (LOG_ERR, "error opening `to' process, error = %lu",
-		     GetLastError ());
-      CloseHandle (from_process_handle);
-      error_code (EACCES);
-      return;
-    }
-
-  debug ("Impersonating client");
-  if (!conn->impersonate_client ())
-    {
-      CloseHandle (from_process_handle);
-      CloseHandle (to_process_handle);
-      error_code (EACCES);
-      return;
-    }
-
-  HANDLE token_handle = NULL;
-
-  debug ("about to open thread token");
-  const DWORD rc = OpenThreadToken (GetCurrentThread (),
-				    TOKEN_QUERY,
-				    TRUE,
-				    &token_handle);
-
-  debug ("opened thread token, rc=%lu", rc);
-  if (!conn->revert_to_self ())
-    {
-      CloseHandle (from_process_handle);
-      CloseHandle (to_process_handle);
-      error_code (EACCES);
-      return;
-    }
-
-  if (!rc)
-    {
-      log (LOG_ERR, "error opening thread token, error = %lu",
-		     GetLastError ());
-      CloseHandle (from_process_handle);
-      CloseHandle (to_process_handle);
-      error_code (EACCES);
-      return;
-    }
-
-  // From this point on, a reply body is returned to the client.
-
-  const HANDLE from_master = req.from_master;
-  const HANDLE to_master = req.to_master;
-
-  req.from_master = NULL;
-  req.to_master = NULL;
-
-  msglen (sizeof (req));
-
-  if (from_master)
-    if (check_and_dup_handle (from_process_handle, to_process_handle,
-			      token_handle,
-			      GENERIC_READ,
-			      from_master,
-			      &req.from_master, TRUE) != 0)
-      {
-	log (LOG_ERR, "error duplicating from_master handle, error = %lu",
-		       GetLastError ());
-	error_code (EACCES);
-      }
-
-  if (to_master)
-    if (check_and_dup_handle (from_process_handle, to_process_handle,
-			      token_handle,
-			      GENERIC_WRITE,
-			      to_master,
-			      &req.to_master, TRUE) != 0)
-      {
-	log (LOG_ERR, "error duplicating to_master handle, error = %lu",
-		       GetLastError ());
-	error_code (EACCES);
-      }
-
-  CloseHandle (from_process_handle);
-  CloseHandle (to_process_handle);
-  CloseHandle (token_handle);
-
-  debug ("%lu(%lu, %lu) -> %lu(%lu,%lu)",
-		req.master_pid, from_master, to_master,
-		req.pid, req.from_master, req.to_master);
-
-  return;
-}
-
-void
-client_request_get_version::serve (transport_layer_base *, process_cache *)
-{
-  assert (!error_code ());
-
-  if (msglen ())
-    log (LOG_ERR, "unexpected request body ignored: %lu bytes", msglen ());
-
-  msglen (sizeof (version));
-
-  version.major = CYGWIN_SERVER_VERSION_MAJOR;
-  version.api   = CYGWIN_SERVER_VERSION_API;
-  version.minor = CYGWIN_SERVER_VERSION_MINOR;
-  version.patch = CYGWIN_SERVER_VERSION_PATCH;
-}
-
-class server_request : public queue_request
-{
-public:
-  server_request (transport_layer_base *const conn, process_cache *const cache)
-    : _conn (conn), _cache (cache)
-  {}
-
-  virtual ~server_request ()
-  {
-    delete _conn;
-  }
-
-  virtual void process ()
-  {
-    client_request::handle_request (_conn, _cache);
-  }
-
-private:
-  transport_layer_base *const _conn;
-  process_cache *const _cache;
-};
-
-class server_submission_loop : public queue_submission_loop
-{
-public:
-  server_submission_loop (threaded_queue *const queue,
-			  transport_layer_base *const transport,
-			  process_cache *const cache)
-    : queue_submission_loop (queue, false),
-      _transport (transport),
-      _cache (cache)
-  {
-    assert (_transport);
-    assert (_cache);
-  }
-
-private:
-  transport_layer_base *const _transport;
-  process_cache *const _cache;
-
-  virtual void request_loop ();
-};
-
-/* FIXME: this is a little ugly.  What we really want is to wait on
- * two objects: one for the pipe/socket, and one for being told to
- * shutdown.  Otherwise this will stay a problem (we won't actually
- * shutdown until the request _AFTER_ the shutdown request.  And
- * sending ourselves a request is ugly
- */
-void
-server_submission_loop::request_loop ()
-{
-  /* I'd like the accepting thread's priority to be above any "normal"
-   * thread in the system to avoid overflowing the listen queue (for
-   * sockets; similar issues exist for named pipes); but, for example,
-   * a normal priority thread in a foregrounded process is boosted to
-   * THREAD_PRIORITY_HIGHEST (AFAICT).  Thus try to set the current
-   * thread's priority to a level one above that.  This fails on
-   * win9x/ME so assume any failure in that call is due to that and
-   * simply call again at one priority level lower.
-   */
-  if (!SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_HIGHEST + 1))
-    if (!SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_HIGHEST))
-      debug ("failed to raise accept thread priority, error = %lu",
-	     GetLastError ());
-
-  while (_running)
-    {
-      bool recoverable = false;
-      transport_layer_base *const conn = _transport->accept (&recoverable);
-      if (!conn && !recoverable)
-	{
-	  log (LOG_ERR, "fatal error on IPC transport: closing down");
-	  return;
-	}
-      // EINTR probably implies a shutdown request; so back off for a
-      // moment to let the main thread take control, otherwise the
-      // server spins here receiving EINTR repeatedly since the signal
-      // handler in the main thread doesn't get a chance to be called.
-      if (!conn && errno == EINTR)
-	{
-	  if (!SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_NORMAL))
-	    debug ("failed to reset thread priority, error = %lu",
-		   GetLastError ());
-
-	  Sleep (0);
-	  if (!SetThreadPriority (GetCurrentThread (),
-				  THREAD_PRIORITY_HIGHEST + 1))
-	    if (!SetThreadPriority (GetCurrentThread (),
-				    THREAD_PRIORITY_HIGHEST))
-	      debug ("failed to raise thread priority, error = %lu",
-		     GetLastError ());
-	}
-      if (conn)
-	_queue->add (new server_request (conn, _cache));
-    }
-}
-
-client_request_shutdown::client_request_shutdown ()
-  : client_request (CYGSERVER_REQUEST_SHUTDOWN)
-{
-}
-
-void
-client_request_shutdown::serve (transport_layer_base *, process_cache *)
-{
-  assert (!error_code ());
-
-  if (msglen ())
-    log (LOG_ERR, "unexpected request body ignored: %lu bytes", msglen ());
-
-  /* FIXME: link upwards, and then this becomes a trivial method call to
-   * only shutdown _this queue_
-   */
-
-  kill (getpid (), SIGINT);
-
-  msglen (0);
-}
-
-static sig_atomic_t shutdown_server = false;
-
-static void
-handle_signal (const int signum)
-{
-  /* any signal makes us die :} */
-
-  shutdown_server = true;
-}
-
-/*
- * print_usage ()
- */
-
-static void
-print_usage (const char *const pgm)
-{
-  log (LOG_NOTICE, "Usage: %s [OPTIONS]\n"
-"Configuration option:\n"
-"  -f, --config-file <file>      Use <file> as config file.  Default is\n"
-"                                " DEF_CONFIG_FILE "\n"
-"\n"
-"Performance options:\n"
-"  -c, --cleanup-threads <num>   Number of cleanup threads to use.\n"
-"  -r, --request-threads <num>   Number of request threads to use.\n"
-"\n"
-"Logging options:\n"
-"  -d, --debug                   Log debug messages to stderr.\n"
-"  -e, --stderr                  Log to stderr (default if stderr is a tty).\n"
-"  -E, --no-stderr               Don't log to stderr (see -y, -Y options).\n"
-"  -l, --log-level <level>       Verbosity of logging (1..7).  Default: 6\n"
-"  -y, --syslog                  Log to syslog (default if stderr is no tty).\n"
-"  -Y, --no-syslog               Don't log to syslog (See -e, -E options).\n"
-"\n"
-"Support options:\n"
-"  -m, --no-sharedmem            Don't start XSI Shared Memory support.\n"
-"  -q, --no-msgqueues            Don't start XSI Message Queue support.\n"
-"  -s, --no-semaphores           Don't start XSI Semaphore support.\n"
-"\n"
-"Miscellaneous:\n"
-"  -S, --shutdown                Shutdown the daemon.\n"
-"  -h, --help                    Output usage information and exit.\n"
-"  -v, --version                 Output version information and exit."
-, pgm);
-}
-
-/*
- * print_version ()
- */
-
-static void
-print_version ()
-{
-  char *vn = NULL;
-
-  const char *const colon = strchr (version, ':');
-
-  if (!colon)
-    {
-      vn = strdup ("?");
-    }
-  else
-    {
-      vn = strdup (colon + 2);	// Skip ": "
-
-      char *const spc = strchr (vn, ' ');
-
-      if (spc)
-	*spc = '\0';
-    }
-
-  char buf[200];
-  snprintf (buf, sizeof (buf), "%d.%d.%d(%d.%d/%d/%d)-(%d.%d.%d.%d) %s",
-	    cygwin_version.dll_major / 1000,
-	    cygwin_version.dll_major % 1000,
-	    cygwin_version.dll_minor,
-	    cygwin_version.api_major,
-	    cygwin_version.api_minor,
-	    cygwin_version.shared_data,
-	    CYGWIN_SERVER_VERSION_MAJOR,
-	    CYGWIN_SERVER_VERSION_API,
-	    CYGWIN_SERVER_VERSION_MINOR,
-	    CYGWIN_SERVER_VERSION_PATCH,
-	    cygwin_version.mount_registry,
-	    cygwin_version.dll_build_date);
-
-  log (LOG_INFO, "(cygwin) %s\n"
-		  "API version %s\n"
-		  "Copyright 2001, 2002, 2003 Red Hat, Inc.\n"
-		  "Compiled on %s\n"
-		  "Default configuration file is %s",
-		  vn, buf, __DATE__, DEF_CONFIG_FILE);
-
-  free (vn);
-}
-
-/*
- * main ()
- */
-
-int
-main (const int argc, char *argv[])
-{
-  const struct option longopts[] = {
-    {"cleanup-threads", required_argument, NULL, 'c'},
-    {"debug", no_argument, NULL, 'd'},
-    {"stderr", no_argument, NULL, 'e'},
-    {"no-stderr", no_argument, NULL, 'E'},
-    {"config-file", required_argument, NULL, 'f'},
-    {"help", no_argument, NULL, 'h'},
-    {"log-level", required_argument, NULL, 'l'},
-    {"no-sharedmem", no_argument, NULL, 'm'},
-    {"no-msgqueues", no_argument, NULL, 'q'},
-    {"request-threads", required_argument, NULL, 'r'},
-    {"no-semaphores", no_argument, NULL, 's'},
-    {"shutdown", no_argument, NULL, 'S'},
-    {"version", no_argument, NULL, 'v'},
-    {"syslog", no_argument, NULL, 'y'},
-    {"no-syslog", no_argument, NULL, 'Y'},
-    {0, no_argument, NULL, 0}
-  };
-
-  const char opts[] = "c:deEf:hl:mqr:sSvyY";
-
-  long cleanup_threads = 0;
-  long request_threads = 0;
-  bool shutdown = false;
-  const char *config_file = DEF_CONFIG_FILE;
-  bool force_config_file = false;
-  tun_bool_t option_log_stderr = TUN_UNDEF;
-  tun_bool_t option_log_syslog = TUN_UNDEF;
-
-  char *c = NULL;
-
-  /* Check if we have a terminal.  If so, default to stderr logging,
-     otherwise default to syslog logging.  This must be done early
-     to allow default logging already in option processing state. */
-  openlog ("cygserver", LOG_PID, LOG_KERN);
-  if (isatty (2))
-    log_stderr = TUN_TRUE;
-  else
-    log_syslog = TUN_TRUE;
-
-  int opt;
-
-  opterr = 0;
-  while ((opt = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
-    switch (opt)
-      {
-      case 'c':
-	c = NULL;
-	cleanup_threads = strtol (optarg, &c, 10);
-	if (cleanup_threads <= 0 || cleanup_threads > 16 || (c && *c))
-	  panic ("Number of cleanup threads must be between 1 and 16");
-	break;
-
-      case 'd':
-        log_debug = TUN_TRUE;
-	break;
-
-      case 'e':
-        option_log_stderr = TUN_TRUE;
-	break;
-
-      case 'E':
-        option_log_stderr = TUN_FALSE;
-	break;
-
-      case 'f':
-	config_file = optarg;
-	force_config_file = true;
-        break;
-
-      case 'h':
-	print_usage (getprogname ());
-	return 0;
-
-      case 'l':
-        c = NULL;
-	log_level = strtoul (optarg, &c, 10);
-	if (!log_level || log_level > 7 || (c && *c))
-	  panic ("Log level must be between 1 and 7");
-	break;
-        
-      case 'm':
-        support_sharedmem = TUN_FALSE;
-	break;
-
-      case 'q':
-        support_msgqueues = TUN_FALSE;
-	break;
-
-      case 'r':
-	c = NULL;
-	request_threads = strtol (optarg, &c, 10);
-	if (request_threads <= 0 || request_threads > 64 || (c && *c))
-	  panic ("Number of request threads must be between 1 and 64");
-	break;
-
-      case 's':
-        support_semaphores = TUN_FALSE;
-	break;
-
-      case 'S':
-	shutdown = true;
-	break;
-
-      case 'v':
-	print_version ();
-	return 0;
-
-      case 'y':
-        option_log_syslog = TUN_TRUE;
-	break;
-
-      case 'Y':
-        option_log_syslog = TUN_FALSE;
-	break;
-
-      case '?':
-	panic ("unknown option -- %c\n"
-	       "Try `%s --help' for more information.", optopt, getprogname ());
-      }
-
-  if (optind != argc)
-    panic ("Too many arguments");
-
-  if (shutdown)
-    {
-      /* Setting `cygserver_running' stops the request code making a
-       * version request, which is not much to the point.
-       */
-      cygserver_running = CYGSERVER_OK;
-
-      client_request_shutdown req;
-
-      if (req.make_request () == -1 || req.error_code ())
-	panic("Shutdown request failed: %s", strerror (req.error_code ()));
-
-      // FIXME: It would be nice to wait here for the daemon to exit.
-
-      return 0;
-    }
-
-  SIGHANDLE (SIGHUP);
-  SIGHANDLE (SIGINT);
-  SIGHANDLE (SIGTERM);
-
-  tunable_param_init (config_file, force_config_file);
-
-  loginit (option_log_stderr, option_log_syslog);
-
-  log (LOG_INFO, "daemon starting up");
-
-  if (!cleanup_threads)
-    TUNABLE_INT_FETCH ("kern.srv.cleanup_threads", &cleanup_threads);
-  if (!cleanup_threads)
-    cleanup_threads = 2;
-
-  if (!request_threads)
-    TUNABLE_INT_FETCH ("kern.srv.request_threads", &request_threads);
-  if (!request_threads)
-    request_threads = 10;
-
-  if (support_sharedmem == TUN_UNDEF)
-    TUNABLE_BOOL_FETCH ("kern.srv.sharedmem", &support_sharedmem);
-  if (support_sharedmem == TUN_UNDEF)
-    support_sharedmem = TUN_TRUE;
-
-  if (support_msgqueues == TUN_UNDEF)
-    TUNABLE_BOOL_FETCH ("kern.srv.msgqueues", &support_msgqueues);
-  if (support_msgqueues == TUN_UNDEF)
-    support_msgqueues = TUN_TRUE;
-
-  if (support_semaphores == TUN_UNDEF)
-    TUNABLE_BOOL_FETCH ("kern.srv.semaphores", &support_semaphores);
-  if (support_semaphores == TUN_UNDEF)
-    support_semaphores = TUN_TRUE;
-
-  wincap.init ();
-  if (wincap.has_security () && !setup_privileges ())
-    panic ("Setting process privileges failed.");
-
-  ipcinit ();
-
-  /*XXXXX*/
-  threaded_queue request_queue (request_threads);
-
-  transport_layer_base *const transport = create_server_transport ();
-  assert (transport);
-
-  process_cache cache (cleanup_threads);
-
-  server_submission_loop submission_loop (&request_queue, transport, &cache);
-
-  request_queue.add_submission_loop (&submission_loop);
-
-  if (transport->listen () == -1)
-    return 1;
-
-  cache.start ();
-
-  request_queue.start ();
-
-  log (LOG_NOTICE, "Initialization complete.  Waiting for requests.");
-
-  /* TODO: wait on multiple objects - the thread handle for each
-   * request loop + all the process handles. This should be done by
-   * querying the request_queue and the process cache for all their
-   * handles, and then waiting for (say) 30 seconds.  after that we
-   * recreate the list of handles to wait on, and wait again.  the
-   * point of all this abstraction is that we can trivially server
-   * both sockets and pipes simply by making a new transport, and then
-   * calling request_queue.process_requests (transport2);
-   */
-  /* WaitForMultipleObjects abort && request_queue && process_queue && signal
-     -- if signal event then retrigger it
-  */
-  while (!shutdown_server && request_queue.running () && cache.running ())
-    {
-      pause ();
-      if (ipcunload ())
-	{
-	  shutdown_server = false;
-	  log (LOG_WARNING, "Shutdown request received but ignored.  "
-			     "Dependent processes still running.");
-	}
-    }
-
-  log (LOG_INFO, "Shutdown request received - new requests will be denied");
-  request_queue.stop ();
-  log (LOG_INFO, "All pending requests processed");
-  delete transport;
-  log (LOG_INFO, "No longer accepting requests - cygwin will operate in daemonless mode");
-  cache.stop ();
-  log (LOG_INFO, "All outstanding process-cache activities completed");
-  log (LOG_NOTICE, "Shutdown finished.");
-
-  return 0;
-}
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/cygserver.conf b/winsup/cygserver/cygserver.conf
deleted file mode 100644
index 1369e1100..000000000
--- a/winsup/cygserver/cygserver.conf
+++ /dev/null
@@ -1,134 +0,0 @@
-# cygserver.conf, Copyright(C) 2003 Red Hat Inc.
-#
-# Contains configurable parameters for the cygserver.
-#
-# The format of this file is easy.  Lines beginning with a hash `#' are
-# comments and ignored.  Lines consisting of only whitespaces are ignored.
-# Any other line is a setting for cygserver.
-# A setting consists of a name/value pair, separated by whitespace.
-# Each line must only consist of one name/value pair.
-# Lines must not be longer than 1023 characters.
-#
-# Some settings can be overridden by a command line switch.  If so, it's
-# mentioned below.
-#
-# Settings which are commented out will use the default values.  These are
-# mentioned below, too.
-
-# kern.srv.cleanup_threads: No. of cygserver threads used for cleanup tasks.
-# Default: 2, Min: 1, Max: 16, command line option -c, --cleanup-threads
-#kern.srv.cleanup_threads 2
-
-# kern.srv.request_threads: No. of cygserver threads used to serve
-#                           application requests.
-# Default: 10, Min: 1, Max: 64, command line option -r, --request-threads
-#kern.srv.request_threads 10
-
-# kern.srv.msgqueues: Determines whether XSI Message Queue support should be
-# started, "yes" (or "true", "y", "t", "1") or "no" (or "false", "n", "f", "0").
-# These values are valid for all binary type options.
-# Default is "yes".  Command line option -q, --no-msgqueues
-#kern.srv.msgqueues yes
-
-# kern.srv.semaphores: Determines whether XSI Semaphore support should be
-# started.  Default is "yes".  Command line option -s, --no-semaphores
-#kern.srv.semaphores yes
-
-# kern.srv.sharedmem: Determines whether XSI Shared Memory support should be
-# started.  Default is "yes".  Command line option -m, --no-sharedmem
-#kern.srv.sharedmem yes
-
-# LOGGING
-
-# kern.log.syslog: Determines whether logging should go to the syslog,
-# Default is "yes", if stderr is no tty, "no" otherwise.
-# Command line option -y, --syslog or -Y, --no-syslog.
-#kern.log.syslog no
-
-# kern.log.stderr: Determines whether logging should go to stderr,
-# Default is "yes", if stderr is a tty, "no" otherwise.
-# Command line option -e, --stderr or -E, --no-stderr.
-#kern.log.stderr no
-
-# kern.log.level: Logging level.  Valid values are 1 to 7 with a bigger
-# value emitting more logging output.  Default level is 6.
-# Command line option -l, --log-level.
-#kern.log.level 6
-
-# kern.log.debug: Determines whether debug output should be printed to stderr.
-# Default is "no".  Command line option -d, --debug
-#kern.log.debug no
-
-# XSI message queue parameters.
-#
-# Each message is broken up and stored in segments that are msgssz bytes
-# long.  For efficiency reasons, this should be a power of two.  Also,
-# it doesn't make sense if it is less than 8 or greater than about 256.
-
-# kern.ipc.msgseg: Maximum no. of message queue segments hold concurrently.
-# Default: 2048, Min: 256, Max: 65535
-#kern.ipc.msgseg 2048
-
-# kern.ipc.msgssz: Size of segment in bytes.  Must be a power of 2 value.
-# Default: 8, Min: 8, Max: 1024
-#kern.ipc.msgssz 8
-
-# kern.ipc.msgmnb: Maximum no. of bytes in a single message queue.
-# Default: 2048, Min: 1, Max: 65535
-#kern.ipc.msgmnb 2048
-
-# kern.ipc.msgmni: Maximum no. of message queue identifiers hold concurrently.
-# Default: 40, Min: 1, Max: 1024
-#kern.ipc.msgmni 40
-
-# kern.ipc.msgtql: Maximum no. of messages hold concurrently.
-# Default: 40, Min: 1, Max: 1024
-#kern.ipc.msgtql 40
-
-# XSI semaphore parameters
-
-# kern.ipc.semmni: Maximum no. of semaphore identifiers hold concurrently.
-# Default: 10, Min: 1, Max: 1024
-#kern.ipc.semmni 10
-
-# kern.ipc.semmns: Maximum no. of semaphores hold concurrently.
-# Default: 60, Min: 1, Max: 1024
-#kern.ipc.semmns 60
-
-# kern.ipc.semmnu: Total no. of undo structures hold by server.
-# Default: 30, Min: 1, Max: 1024
-#kern.ipc.semmnu 30
-
-# kern.ipc.semmsl: Maximum no. of semaphores per semaphore id.
-# Default: 60, Min: 1, Max: 1024
-#kern.ipc.semmsl 60
-
-# kern.ipc.semopm: Maximum no. of operations per semop call.
-# Default: 100, Min: 1, Max: 1024
-#kern.ipc.semopm 100
-
-# kern.ipc.semume: Maximum no. of undo entries per process.
-# Default: 10, Min: 1, Max: 1024
-#kern.ipc.semume 10
-
-# kern.ipc.semvmx: Maximum value of a semaphore.
-# Default: 32767, Min: 1, Max: 32767
-#kern.ipc.semvmx 32767
-
-# kern.ipc.semaem: Maximum value to adjust on process exit.
-# Default: 16384, Min: 1, Max: 32767
-#kern.ipc.semaem 16384
-
-# XSI shared memory parameters
-
-# kern.ipc.shmmaxpgs: Maximum pages available for XSI shared memory.
-# Default: 8192, Min: 1, Max: 32767
-#kern.ipc.shmmaxpgs 8192
-
-# kern.ipc.shmmni: Maximum number of shared memory segments, system wide.
-# Default: 192, Min: 1, Max: 32767
-#kern.ipc.shmmni 192
-
-# kern.ipc.shmseg: Maximum number of shared memory segments per process.
-# Default: 128, Min: 1, Max: 32767
-#kern.ipc.shmseg 128
diff --git a/winsup/cygserver/msg.cc b/winsup/cygserver/msg.cc
deleted file mode 100644
index 52fdcd07e..000000000
--- a/winsup/cygserver/msg.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-/* msg.cc: Single unix specification IPC interface for Cygwin.
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "cygserver.h"
-#include "process.h"
-#include "transport.h"
-
-#include "cygserver_ipc.h"
-#include "cygserver_msg.h"
-
-client_request_msg::client_request_msg ()
-  : client_request (CYGSERVER_REQUEST_MSG,
-		    &_parameters, sizeof (_parameters))
-{ 
-}
-
-void
-client_request_msg::serve (transport_layer_base *const conn,
-                           process_cache *const cache)
-{
-  if (msglen () != sizeof (_parameters.in))
-    {
-      syscall_printf ("bad request body length: expecting %lu bytes, got %lu",
-		      sizeof (_parameters), msglen ());
-      error_code (EINVAL);
-      msglen (0);
-      return;
-    }
-  if (support_msgqueues == TUN_FALSE)
-    {
-      syscall_printf ("Message queue support not started");
-      error_code (ENOSYS);
-      if (_parameters.in.msgop == MSGOP_msgrcv)
-	_parameters.out.rcv = -1;
-      else
-	_parameters.out.ret = -1;
-      msglen (sizeof (_parameters.out));
-      return;
-    }
-  process *const client = cache->process (_parameters.in.ipcblk.cygpid,
-					  _parameters.in.ipcblk.winpid);
-  if (!client)
-    {
-      error_code (EAGAIN);
-      msglen (0);
-      return;
-    }
-  if (!conn->impersonate_client ())
-    {
-      client->release ();
-      error_code (EACCES);
-      msglen (0);
-      return;
-    }
-  if (!adjust_identity_info (&_parameters.in.ipcblk))
-    {
-      conn->revert_to_self ();
-      error_code (EACCES);
-      msglen (0);
-      return;
-    }
-  /* Early revert_to_self since IPC code runs in kernel mode. */
-  conn->revert_to_self ();
-  thread td = { client, &_parameters.in.ipcblk, {-1, -1} };
-  int res;
-  msgop_t msgop = _parameters.in.msgop; /* Get's overwritten otherwise. */
-  switch (msgop)
-    {
-      case MSGOP_msgctl:
-	res = msgctl (&td, &_parameters.in.ctlargs);
-        break;
-      case MSGOP_msgget:
-	res = msgget (&td, &_parameters.in.getargs);
-        break;
-      case MSGOP_msgrcv:
-	res = msgrcv (&td, &_parameters.in.rcvargs);
-        break;
-      case MSGOP_msgsnd:
-	res = msgsnd (&td, &_parameters.in.sndargs);
-        break;
-      default:
-	res = ENOSYS;
-        td.td_retval[0] = -1;
-	break;
-    }
-  /* Allocated by the call to adjust_identity_info(). */
-  if (_parameters.in.ipcblk.gidlist)
-    free (_parameters.in.ipcblk.gidlist);
-  client->release ();
-  error_code (res);
-  if (msgop == MSGOP_msgrcv)
-    _parameters.out.rcv = td.td_retval[0];
-  else
-    _parameters.out.ret = td.td_retval[0];
-  msglen (sizeof (_parameters.out));
-}
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/process.cc b/winsup/cygserver/process.cc
deleted file mode 100644
index 0f6e0cb5f..000000000
--- a/winsup/cygserver/process.cc
+++ /dev/null
@@ -1,431 +0,0 @@
-/* process.cc
-
-   Copyright 2001, 2002 Red Hat Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "woutsup.h"
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "cygerrno.h"
-
-#include "process.h"
-
-/*****************************************************************************/
-
-#define elements(ARRAY) (sizeof (ARRAY) / sizeof (*ARRAY))
-
-/*****************************************************************************/
-
-process_cleanup::~process_cleanup ()
-{
-  delete _process;
-}
-
-void
-process_cleanup::process ()
-{
-  _process->cleanup ();
-}
-
-/*****************************************************************************/
-
-/* cleanup_routine */
-cleanup_routine::~cleanup_routine ()
-{
-}
-
-/*****************************************************************************/
-
-process::process (const pid_t cygpid, const DWORD winpid)
-  : _cygpid (cygpid),
-    _winpid (winpid),
-    _hProcess (NULL),
-    _cleaning_up (false),
-    _exit_status (STILL_ACTIVE),
-    _routines_head (NULL),
-    _next (NULL)
-{
-  _hProcess = OpenProcess (PROCESS_ALL_ACCESS, FALSE, winpid);
-  if (!_hProcess)
-    {
-      system_printf ("unable to obtain handle for new cache process %d(%lu)",
-		     _cygpid, _winpid);
-      _hProcess = INVALID_HANDLE_VALUE;
-      _exit_status = 0;
-    }
-  else
-    debug_printf ("got handle %p for new cache process %d(%lu)",
-		  _hProcess, _cygpid, _winpid);
-  InitializeCriticalSection (&_access);
-}
-
-process::~process ()
-{
-  DeleteCriticalSection (&_access);
-  (void) CloseHandle (_hProcess);
-}
-
-/* No need to be thread-safe as this is only ever called by
- * process_cache::remove_process ().  If it has to be made thread-safe
- * later on, it should not use the `access' critical section as that
- * is held by the client request handlers for an arbitrary length of
- * time, i.e. while they do whatever processing is required for a
- * client request.
- */
-DWORD
-process::check_exit_code ()
-{
-  if (_hProcess && _hProcess != INVALID_HANDLE_VALUE
-      && _exit_status == STILL_ACTIVE
-      && !GetExitCodeProcess (_hProcess, &_exit_status))
-    {
-      system_printf ("failed to retrieve exit code for %d(%lu), error = %lu",
-		     _cygpid, _winpid, GetLastError ());
-      _hProcess = INVALID_HANDLE_VALUE;
-    }
-  return _exit_status;
-}
-
-bool
-process::add (cleanup_routine *const entry)
-{
-  assert (entry);
-
-  bool res = false;
-  EnterCriticalSection (&_access);
-
-  if (!_cleaning_up)
-    {
-      entry->_next = _routines_head;
-      _routines_head = entry;
-      res = true;
-    }
-
-  LeaveCriticalSection (&_access);
-  return res;
-}
-
-bool
-process::remove (const cleanup_routine *const entry)
-{
-  assert (entry);
-
-  bool res = false;
-  EnterCriticalSection (&_access);
-
-  if (!_cleaning_up)
-    {
-      cleanup_routine *previous = NULL;
-
-      for (cleanup_routine *ptr = _routines_head;
-	   ptr;
-	   previous = ptr, ptr = ptr->_next)
-	{
-	  if (*ptr == *entry)
-	    {
-	      if (previous)
-		previous->_next = ptr->_next;
-	      else
-		_routines_head = ptr->_next;
-
-	      delete ptr;
-	      res = true;
-	      break;
-	    }
-	}
-    }
-
-  LeaveCriticalSection (&_access);
-  return res;
-}
-
-/* This is single threaded. It's called after the process is removed
- * from the cache, but inserts may be attemped by worker threads that
- * have a pointer to it.
- */
-void
-process::cleanup ()
-{
-  EnterCriticalSection (&_access);
-  assert (!is_active ());
-  assert (!_cleaning_up);
-  InterlockedExchange (&_cleaning_up, true);
-  cleanup_routine *entry = _routines_head;
-  _routines_head = NULL;
-  LeaveCriticalSection (&_access);
-
-  while (entry)
-    {
-      cleanup_routine *const ptr = entry;
-      entry = entry->_next;
-      ptr->cleanup (this);
-      delete ptr;
-    }
-}
-
-/*****************************************************************************/
-
-void
-process_cache::submission_loop::request_loop ()
-{
-  assert (this);
-  assert (_cache);
-  assert (_interrupt_event);
-
-  while (_running)
-    _cache->wait_for_processes (_interrupt_event);
-}
-
-/*****************************************************************************/
-
-process_cache::process_cache (const unsigned int initial_workers)
-  : _queue (initial_workers),
-    _submitter (this, &_queue),	// true == interruptible
-    _processes_count (0),
-    _processes_head (NULL),
-    _cache_add_trigger (NULL)
-{
-  /* there can only be one */
-  InitializeCriticalSection (&_cache_write_access);
-
-  _cache_add_trigger = CreateEvent (NULL,  // SECURITY_ATTRIBUTES
-				    FALSE, // Auto-reset
-				    FALSE, // Initially non-signalled
-				    NULL); // Anonymous
-
-  if (!_cache_add_trigger)
-    {
-      system_printf ("failed to create cache add trigger, error = %lu",
-		     GetLastError ());
-      abort ();
-    }
-
-  _queue.add_submission_loop (&_submitter);
-}
-
-process_cache::~process_cache ()
-{
-  (void) CloseHandle (_cache_add_trigger);
-  DeleteCriticalSection (&_cache_write_access);
-}
-
-/* This returns the process object to the caller already locked, that
- * is, with the object's `access' critical region entered.  Thus the
- * caller must unlock the object when it's finished with it (via
- * process::release ()).  It must then not try to access the object
- * afterwards, except by going through this routine again, as it may
- * have been deleted once it has been unlocked.
- */
-class process *
-process_cache::process (const pid_t cygpid, const DWORD winpid)
-{
-  /* TODO: make this more granular, so a search doesn't involve the
-   * write lock.
-   */
-  EnterCriticalSection (&_cache_write_access);
-  class process *previous = NULL;
-  class process *entry = find (winpid, &previous);
-
-  if (!entry)
-    {
-      if (_processes_count + SPECIALS_COUNT >= MAXIMUM_WAIT_OBJECTS)
-	{
-	  LeaveCriticalSection (&_cache_write_access);
-	  system_printf (("process limit (%d processes) reached; "
-			  "new connection refused for %d(%lu)"),
-			 MAXIMUM_WAIT_OBJECTS - SPECIALS_COUNT,
-			 cygpid, winpid);
-	  set_errno (EAGAIN);
-	  return NULL;
-	}
-
-      entry = new class process (cygpid, winpid);
-      if (!entry->is_active ())
-	{
-	  LeaveCriticalSection (&_cache_write_access);
-	  delete entry;
-	  set_errno (ESRCH);
-	  return NULL;
-	}
-
-      if (previous)
-	{
-	  entry->_next = previous->_next;
-	  previous->_next = entry;
-	}
-      else
-	{
-	  entry->_next = _processes_head;
-	  _processes_head = entry;
-	}
-
-      _processes_count += 1;
-      SetEvent (_cache_add_trigger);
-    }
-
-  EnterCriticalSection (&entry->_access); // To be released by the caller.
-  LeaveCriticalSection (&_cache_write_access);
-  assert (entry);
-  assert (entry->_winpid == winpid);
-  return entry;
-}
-
-void
-process_cache::wait_for_processes (const HANDLE interrupt_event)
-{
-  // Update `_wait_array' with handles of all current processes.
-  const size_t count = sync_wait_array (interrupt_event);
-
-  debug_printf ("waiting on %u objects in total (%u processes)",
-		count, _processes_count);
-
-  const DWORD rc = WaitForMultipleObjects (count, _wait_array,
-					   FALSE, INFINITE);
-
-  if (rc == WAIT_FAILED)
-    {
-      system_printf ("could not wait on the process handles, error = %lu",
-		     GetLastError ());
-      abort ();
-    }
-
-  const size_t start = rc - WAIT_OBJECT_0;
-
-  if (rc < WAIT_OBJECT_0 || start > count)
-    {
-      system_printf (("unexpected return code %rc "
-		      "from WaitForMultipleObjects: "
-		      "expected [%u .. %u)"),
-		     rc, WAIT_OBJECT_0, WAIT_OBJECT_0 + count);
-      abort ();
-    }
-
-  // Tell all the processes, from the signalled point up, the bad news.
-  for (size_t index = start; index != count; index++)
-    if (_process_array[index])
-      check_and_remove_process (index);
-}
-
-/*
- * process_cache::sync_wait_array ()
- *
- * Fill-in the wait array with the handles that the cache needs to wait on.
- * These handles are:
- *  - the process_process_param's interrupt event
- *  - the process_cache's cache_add_trigger event
- *  - the handle for each live process in the cache.
- *
- * Return value: the number of live handles in the array.
- */
-
-size_t
-process_cache::sync_wait_array (const HANDLE interrupt_event)
-{
-  assert (this);
-  assert (_cache_add_trigger && _cache_add_trigger != INVALID_HANDLE_VALUE);
-  assert (interrupt_event && interrupt_event != INVALID_HANDLE_VALUE);
-
-  EnterCriticalSection (&_cache_write_access);
-
-  assert (_processes_count + SPECIALS_COUNT <= elements (_wait_array));
-
-  size_t index = 0;
-
-  for (class process *ptr = _processes_head; ptr; ptr = ptr->_next)
-    {
-      assert (ptr->_hProcess && ptr->_hProcess != INVALID_HANDLE_VALUE);
-      assert (ptr->is_active ());
-
-      _wait_array[index] = ptr->handle ();
-      _process_array[index++] = ptr;
-
-      assert (index <= elements (_wait_array));
-    }
-
-  /* Sorry for shouting, but THESE MUST BE ADDED AT THE END! */
-  /* Well, not strictly `must', but it's more efficient if they are :-) */
-
-  _wait_array[index] = interrupt_event;
-  _process_array[index++] = NULL;
-
-  _wait_array[index] = _cache_add_trigger;
-  _process_array[index++] = NULL;
-
-  /* Phew, back to normal volume now. */
-
-  assert (index <= elements (_wait_array));
-
-  LeaveCriticalSection (&_cache_write_access);
-
-  return index;
-}
-
-void
-process_cache::check_and_remove_process (const size_t index)
-{
-  assert (this);
-  assert (index < elements (_wait_array) - SPECIALS_COUNT);
-
-  class process *const process = _process_array[index];
-
-  assert (process);
-  assert (process->handle () == _wait_array[index]);
-
-  if (process->check_exit_code () == STILL_ACTIVE)
-    return;
-
-  debug_printf ("process %d(%lu) has left the building ($? = %lu)",
-		process->_cygpid, process->_winpid, process->_exit_status);
-
-  /* Unlink the process object from the process list. */
-
-  EnterCriticalSection (&_cache_write_access);
-
-  class process *previous = NULL;
-
-  const class process *const tmp = find (process->_winpid, &previous);
-
-  assert (tmp == process);
-  assert (previous ? previous->_next == process : _processes_head == process);
-
-  if (previous)
-    previous->_next = process->_next;
-  else
-    _processes_head = process->_next;
-
-  _processes_count -= 1;
-  LeaveCriticalSection (&_cache_write_access);
-
-  /* Schedule any cleanup tasks for this process. */
-  _queue.add (new process_cleanup (process));
-}
-
-class process *
-process_cache::find (const DWORD winpid, class process **previous)
-{
-  if (previous)
-    *previous = NULL;
-
-  for (class process *ptr = _processes_head; ptr; ptr = ptr->_next)
-    if (ptr->_winpid == winpid)
-      return ptr;
-    else if (ptr->_winpid > winpid) // The list is sorted by winpid.
-      return NULL;
-    else if (previous)
-      *previous = ptr;
-
-  return NULL;
-}
-
-/*****************************************************************************/
diff --git a/winsup/cygserver/process.h b/winsup/cygserver/process.h
deleted file mode 100644
index 142b3634c..000000000
--- a/winsup/cygserver/process.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/* process.h
-
-   Copyright 2001, 2002 Red Hat Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _PROCESS_H
-#define _PROCESS_H
-
-#include <assert.h>
-
-#include "threaded_queue.h"
-
-class process_cleanup : public queue_request
-{
-public:
-  process_cleanup (class process *const theprocess)
-    : _process (theprocess)
-  {
-    assert (_process);
-  }
-
-  virtual ~process_cleanup ();
-
-  virtual void process ();
-
-private:
-  class process *const _process;
-};
-
-class process;
-
-class cleanup_routine
-{
-  friend class process;
-
-public:
-  cleanup_routine (void *const key)
-    : _key (key),
-      _next (NULL)
-  {}
-
-  virtual ~cleanup_routine ();
-
-  bool operator== (const cleanup_routine &rhs) const
-  {
-    return _key == rhs._key;
-  }
-
-  void *key () const { return _key; }
-
-  /* MUST BE SYNCHRONOUS */
-  virtual void cleanup (class process *) = 0;
-
-private:
-  void *const _key;
-  cleanup_routine *_next;
-};
-
-class process_cache;
-
-class process
-{
-  friend class process_cache;
-  friend class process_cleanup;
-
-public:
-  process (pid_t cygpid, DWORD winpid);
-  ~process ();
-
-  pid_t cygpid () const { return _cygpid; }
-  DWORD winpid () const { return _winpid; }
-  HANDLE handle () const { return _hProcess; }
-
-  bool is_active () const { return _exit_status == STILL_ACTIVE; }
-
-  void hold () { EnterCriticalSection (&_access); }
-  void release () { LeaveCriticalSection (&_access); }
-
-  bool add (cleanup_routine *);
-  bool remove (const cleanup_routine *);
-
-private:
-  const pid_t _cygpid;
-  const DWORD _winpid;
-  HANDLE _hProcess;
-  long _cleaning_up;
-  DWORD _exit_status;		// Set in the constructor and in exit_code ().
-  cleanup_routine *_routines_head;
-  /* used to prevent races-on-delete */
-  CRITICAL_SECTION _access;
-  class process *_next;
-
-  DWORD check_exit_code ();
-  void cleanup ();
-};
-
-class process_cache
-{
-  // Number of special (i.e., non-process) handles in _wait_array.
-  // See wait_for_processes () and sync_wait_array () for details.
-  enum {
-    SPECIALS_COUNT = 2
-  };
-
-  class submission_loop : public queue_submission_loop
-  {
-  public:
-    submission_loop (process_cache *const cache, threaded_queue *const queue)
-      : queue_submission_loop (queue, true),
-	_cache (cache)
-    {
-      assert (_cache);
-    }
-
-  private:
-    process_cache *const _cache;
-
-    virtual void request_loop ();
-  };
-
-  friend class submission_loop;
-
-public:
-  process_cache (unsigned int initial_workers);
-  ~process_cache ();
-
-  class process *process (pid_t cygpid, DWORD winpid);
-
-  bool running () const { return _queue.running (); }
-
-  bool start () { return _queue.start (); }
-  bool stop () { return _queue.stop (); }
-
-private:
-  threaded_queue _queue;
-  submission_loop _submitter;
-
-  size_t _processes_count;
-  class process *_processes_head; // A list sorted by winpid.
-
-  // Access to the _wait_array and related fields is not thread-safe,
-  // since they are used solely by wait_for_processes () and its callees.
-
-  HANDLE _wait_array[MAXIMUM_WAIT_OBJECTS];
-  class process *_process_array[MAXIMUM_WAIT_OBJECTS];
-
-  HANDLE _cache_add_trigger;	// Actually both add and remove.
-  CRITICAL_SECTION _cache_write_access; // Actually both read and write access.
-
-  void wait_for_processes (HANDLE interrupt);
-  size_t sync_wait_array (HANDLE interrupt);
-  void check_and_remove_process (const size_t index);
-
-  class process *find (DWORD winpid, class process **previous = NULL);
-};
-
-#endif /* _PROCESS_H */
diff --git a/winsup/cygserver/sem.cc b/winsup/cygserver/sem.cc
deleted file mode 100644
index dd48123d2..000000000
--- a/winsup/cygserver/sem.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-/* sem.cc: Single unix specification IPC interface for Cygwin.
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "cygserver.h"
-#include "process.h"
-#include "transport.h"
-
-#include "cygserver_ipc.h"
-#include "cygserver_sem.h"
-
-client_request_sem::client_request_sem ()
-  : client_request (CYGSERVER_REQUEST_SEM,
-		    &_parameters, sizeof (_parameters))
-{ 
-}
-
-void
-client_request_sem::serve (transport_layer_base *const conn,
-                           process_cache *const cache)
-{
-  if (msglen () != sizeof (_parameters.in))
-    {
-      syscall_printf ("bad request body length: expecting %lu bytes, got %lu",
-		      sizeof (_parameters), msglen ());
-      error_code (EINVAL);
-      msglen (0);
-      return;
-    }
-  if (support_semaphores == TUN_FALSE)
-    {
-      syscall_printf ("Semaphore support not started");
-      error_code (ENOSYS);
-      _parameters.out.ret = -1;
-      msglen (sizeof (_parameters.out));
-      return;
-    }
-  process *const client = cache->process (_parameters.in.ipcblk.cygpid,
-					  _parameters.in.ipcblk.winpid);
-  if (!client)
-    {
-      error_code (EAGAIN);
-      msglen (0);
-      return;
-    }
-  if (!conn->impersonate_client ())
-    {
-      client->release ();
-      error_code (EACCES);
-      msglen (0);
-      return;
-    }
-  if (!adjust_identity_info (&_parameters.in.ipcblk))
-    {
-      client->release ();
-      conn->revert_to_self ();
-      error_code (EACCES);
-      msglen (0);
-      return;
-    }
-  /* Early revert_to_self since IPC code runs in kernel mode. */
-  conn->revert_to_self ();
-  thread td = { client, &_parameters.in.ipcblk, {-1, -1} };
-  int res;
-  switch (_parameters.in.semop)
-    {
-      case SEMOP_semctl:
-	res = semctl (&td, &_parameters.in.ctlargs);
-        break;
-      case SEMOP_semget:
-	res = semget (&td, &_parameters.in.getargs);
-        break;
-      case SEMOP_semop:
-	res = semop (&td, &_parameters.in.opargs);
-        break;
-      default:
-	res = ENOSYS;
-        td.td_retval[0] = -1;
-	break;
-    }
-  /* Allocated by the call to adjust_identity_info(). */
-  if (_parameters.in.ipcblk.gidlist)
-    free (_parameters.in.ipcblk.gidlist);
-  client->release ();
-  error_code (res);
-  _parameters.out.ret = td.td_retval[0];
-  msglen (sizeof (_parameters.out));
-}
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/shm.cc b/winsup/cygserver/shm.cc
deleted file mode 100644
index d8284cd44..000000000
--- a/winsup/cygserver/shm.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-/* shm.cc: Single unix specification IPC interface for Cygwin.
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "cygserver.h"
-#include "process.h"
-#include "transport.h"
-
-#include "cygserver_ipc.h"
-#include "cygserver_shm.h"
-
-client_request_shm::client_request_shm ()
-  : client_request (CYGSERVER_REQUEST_SHM,
-		    &_parameters, sizeof (_parameters))
-{ 
-}
-
-void
-client_request_shm::serve (transport_layer_base *const conn,
-                           process_cache *const cache)
-{
-  if (msglen () != sizeof (_parameters.in))
-    {
-      syscall_printf ("bad request body length: expecting %lu bytes, got %lu",
-		      sizeof (_parameters), msglen ());
-      error_code (EINVAL);
-      msglen (0);
-      return;
-    }
-  if (support_sharedmem == TUN_FALSE)
-    {
-      syscall_printf ("Shared memory support not started");
-      error_code (ENOSYS);
-      if (_parameters.in.shmop == SHMOP_shmat)
-	_parameters.out.ptr = (vm_offset_t)0;
-      else
-	_parameters.out.ret = -1;
-      msglen (sizeof (_parameters.out));
-      return;
-    }
-  process *const client = cache->process (_parameters.in.ipcblk.cygpid,
-					  _parameters.in.ipcblk.winpid);
-  if (!client)
-    {
-      error_code (EAGAIN);
-      msglen (0);
-      return;
-    }
-  if (!conn->impersonate_client ())
-    {
-      client->release ();
-      error_code (EACCES);
-      msglen (0);
-      return;
-    }
-  if (!adjust_identity_info (&_parameters.in.ipcblk))
-    {
-      client->release ();
-      conn->revert_to_self ();
-      error_code (EACCES);
-      msglen (0);
-      return;
-    }
-  /* Early revert_to_self since IPC code runs in kernel mode. */
-  conn->revert_to_self ();
-  thread td = { client, &_parameters.in.ipcblk, {0, 0} };
-  int res;
-  shmop_t shmop = _parameters.in.shmop; /* Get's overwritten otherwise. */
-  switch (shmop)
-    {
-      case SHMOP_shmat:
-	ipc_p_vmspace (td.ipcblk);
-	res = shmat (&td, &_parameters.in.atargs);
-        break;
-      case SHMOP_shmctl:
-	res = shmctl (&td, &_parameters.in.ctlargs);
-        break;
-      case SHMOP_shmdt:
-	ipc_p_vmspace (td.ipcblk);
-	res = shmdt (&td, &_parameters.in.dtargs);
-        break;
-      case SHMOP_shmget:
-	res = shmget (&td, &_parameters.in.getargs);
-        break;
-      case SHMOP_shmfork:
-        res = cygwin_shmfork_myhook (&td, &_parameters.in.forkargs);
-	break;
-      default:
-	res = ENOSYS;
-        td.td_retval[0] = -1;
-	break;
-    }
-  /* Allocated by the call to adjust_identity_info(). */
-  if (_parameters.in.ipcblk.gidlist)
-    free (_parameters.in.ipcblk.gidlist);
-  client->release ();
-  error_code (res);
-  if (shmop == SHMOP_shmat)
-    _parameters.out.ptr = td.td_retval[0];
-  else
-    _parameters.out.ret = td.td_retval[0];
-  if (shmop == SHMOP_shmget)
-    _parameters.out.obj = td.td_retval[1];
-  msglen (sizeof (_parameters.out));
-}
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/sysv_msg.cc b/winsup/cygserver/sysv_msg.cc
deleted file mode 100644
index 90ea95325..000000000
--- a/winsup/cygserver/sysv_msg.cc
+++ /dev/null
@@ -1,1210 +0,0 @@
-/*
- * Implementation of SVID messages
- *
- * Author:  Daniel Boulet
- *
- * Copyright 1993 Daniel Boulet and RTMX Inc.
- *
- * This system call was implemented by Daniel Boulet under contract from RTMX.
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- */
-
-/*
- * This file is heavily changed to become part of Cygwin's cygserver.
- */
-
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-#include <sys/cdefs.h>
-#ifndef __FBSDID
-#define __FBSDID(s)	const char version[] = (s)
-#endif
-__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/kern/sysv_msg.c,v 1.52 2003/11/07 04:47:14 rwatson Exp $");
-
-#define _KERNEL 1
-#define __BSD_VISIBLE 1
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#include <sys/ipc.h>
-#include <sys/param.h>
-#include <sys/msg.h>
-#include <malloc.h>
-#include <errno.h>
-#include <time.h>
-#include "cygserver.h"
-#include "process.h"
-#include "cygserver_ipc.h"
-
-#ifdef __CYGWIN__
-#define MSG_DEBUG
-#endif /* __CYGWIN__ */
-
-#ifdef MSG_DEBUG
-#define DPRINTF(a)	debug_printf a
-#else
-#define DPRINTF(a)
-#endif
-
-static void msg_freehdr(struct msg *msghdr);
-
-#ifndef __CYGWIN__
-int msgctl(struct thread *, struct msgctl_args *);
-int msgget(struct thread *, struct msgget_args *);
-int msgsnd(struct thread *, struct msgsnd_args *);
-int msgrcv(struct thread *, struct msgrcv_args *);
-
-static sy_call_t *msgcalls[] = {
-	(sy_call_t *)msgctl, (sy_call_t *)msgget,
-	(sy_call_t *)msgsnd, (sy_call_t *)msgrcv
-};
-#endif /* __CYGWIN__ */
-
-
-struct msg {
-	struct	msg *msg_next;	/* next msg in the chain */
-	long	msg_type;	/* type of this message */
-    				/* >0 -> type of this message */
-    				/* 0 -> free header */
-	u_short	msg_ts;		/* size of this message */
-	short	msg_spot;	/* location of start of msg in buffer */
-};
-
-
-#ifndef MSGSSZ
-#define MSGSSZ	8		/* Each segment must be 2^N long */
-#endif
-#ifndef MSGSEG
-#define MSGSEG	2048		/* must be less than 32767 */
-#endif
-#define MSGMAX	(MSGSSZ*MSGSEG)
-#ifndef MSGMNB
-#define MSGMNB	2048		/* max # of bytes in a queue */
-#endif
-#ifndef MSGMNI
-#define MSGMNI	40
-#endif
-#ifndef MSGTQL
-#define MSGTQL	40
-#endif
-
-/*
- * Based on the configuration parameters described in an SVR2 (yes, two)
- * config(1m) man page.
- *
- * Each message is broken up and stored in segments that are msgssz bytes
- * long.  For efficiency reasons, this should be a power of two.  Also,
- * it doesn't make sense if it is less than 8 or greater than about 256.
- * Consequently, msginit in kern/sysv_msg.c checks that msgssz is a power of
- * two between 8 and 1024 inclusive (and panic's if it isn't).
- */
-struct msginfo msginfo = {
-                MSGMAX,         /* max chars in a message */
-                MSGMNB,         /* max chars in a queue */
-                MSGMNI,         /* # of message queue identifiers */
-                MSGTQL,         /* max messages in system */
-                MSGSSZ,         /* size of a message segment */
-                		/* (must be small power of 2 greater than 4) */
-                MSGSEG          /* number of message segments */
-};
-
-/*
- * macros to convert between msqid_ds's and msqid's.
- * (specific to this implementation)
- */
-#define MSQID(ix,ds)	((ix) & 0xffff | (((ds).msg_perm.seq << 16) & 0xffff0000))
-#define MSQID_IX(id)	((id) & 0xffff)
-#define MSQID_SEQ(id)	(((id) >> 16) & 0xffff)
-
-/*
- * The rest of this file is specific to this particular implementation.
- */
-
-struct msgmap {
-	short	next;		/* next segment in buffer */
-    				/* -1 -> available */
-    				/* 0..(MSGSEG-1) -> index of next segment */
-};
-
-#define MSG_LOCKED	01000	/* Is this msqid_ds locked? */
-
-static int nfree_msgmaps;	/* # of free map entries */
-static short free_msgmaps;	/* head of linked list of free map entries */
-static struct msg *free_msghdrs;/* list of free msg headers */
-static char *msgpool;		/* MSGMAX byte long msg buffer pool */
-static struct msgmap *msgmaps;	/* MSGSEG msgmap structures */
-static struct msg *msghdrs;	/* MSGTQL msg headers */
-static struct msqid_ds *msqids;	/* MSGMNI msqid_ds struct's */
-static struct mtx msq_mtx;	/* global mutex for message queues. */
-
-#ifdef __CYGWIN__
-static struct msg_info msg_info;
-#endif /* __CYGWIN__ */
-
-void
-msginit()
-{
-	int i;
-
-	TUNABLE_INT_FETCH("kern.ipc.msgseg", &msginfo.msgseg);
-	TUNABLE_INT_FETCH("kern.ipc.msgssz", &msginfo.msgssz);
-	msginfo.msgmax = msginfo.msgseg * msginfo.msgssz;
-	TUNABLE_INT_FETCH("kern.ipc.msgmnb", &msginfo.msgmnb);
-	TUNABLE_INT_FETCH("kern.ipc.msgmni", &msginfo.msgmni);
-	TUNABLE_INT_FETCH("kern.ipc.msgtql", &msginfo.msgtql);
-
-	msgpool = (char *) sys_malloc(msginfo.msgmax, M_MSG, M_WAITOK);
-	if (msgpool == NULL)
-		panic("msgpool is NULL");
-	msgmaps = (msgmap *) sys_malloc(sizeof(struct msgmap) * msginfo.msgseg, M_MSG, M_WAITOK);
-	if (msgmaps == NULL)
-		panic("msgmaps is NULL");
-	msghdrs = (msg *) sys_malloc(sizeof(struct msg) * msginfo.msgtql, M_MSG, M_WAITOK);
-	if (msghdrs == NULL)
-		panic("msghdrs is NULL");
-	msqids = (msqid_ds *) sys_malloc(sizeof(struct msqid_ds) * msginfo.msgmni, M_MSG, M_WAITOK);
-	if (msqids == NULL)
-		panic("msqids is NULL");
-
-	/*
-	 * msginfo.msgssz should be a power of two for efficiency reasons.
-	 * It is also pretty silly if msginfo.msgssz is less than 8
-	 * or greater than about 256 so ...
-	 */
-
-	i = 8;
-	while (i < 1024 && i != msginfo.msgssz)
-		i <<= 1;
-    	if (i != msginfo.msgssz) {
-		DPRINTF(("msginfo.msgssz=%d (0x%x)\n", msginfo.msgssz,
-		    msginfo.msgssz));
-		panic("msginfo.msgssz not a small power of 2");
-	}
-
-	if (msginfo.msgseg > 32767) {
-		DPRINTF(("msginfo.msgseg=%d\n", msginfo.msgseg));
-		panic("msginfo.msgseg > 32767");
-	}
-
-	if (msgmaps == NULL)
-		panic("msgmaps is NULL");
-
-	for (i = 0; i < msginfo.msgseg; i++) {
-		if (i > 0)
-			msgmaps[i-1].next = i;
-		msgmaps[i].next = -1;	/* implies entry is available */
-	}
-	free_msgmaps = 0;
-	nfree_msgmaps = msginfo.msgseg;
-
-	if (msghdrs == NULL)
-		panic("msghdrs is NULL");
-
-	for (i = 0; i < msginfo.msgtql; i++) {
-		msghdrs[i].msg_type = 0;
-		if (i > 0)
-			msghdrs[i-1].msg_next = &msghdrs[i];
-		msghdrs[i].msg_next = NULL;
-    	}
-	free_msghdrs = &msghdrs[0];
-
-	if (msqids == NULL)
-		panic("msqids is NULL");
-
-	for (i = 0; i < msginfo.msgmni; i++) {
-		msqids[i].msg_qbytes = 0;	/* implies entry is available */
-		msqids[i].msg_perm.seq = 0;	/* reset to a known value */
-		msqids[i].msg_perm.mode = 0;
-	}
-	mtx_init(&msq_mtx, "msq", NULL, MTX_DEF);
-}
-
-int
-msgunload()
-{
-	struct msqid_ds *msqptr;
-	int msqid;
-
-	for (msqid = 0; msqid < msginfo.msgmni; msqid++) {
-		/*
-		 * Look for an unallocated and unlocked msqid_ds.
-		 * msqid_ds's can be locked by msgsnd or msgrcv while
-		 * they are copying the message in/out.  We can't
-		 * re-use the entry until they release it.
-		 */
-		msqptr = &msqids[msqid];
-		if (msqptr->msg_qbytes != 0 ||
-		    (msqptr->msg_perm.mode & MSG_LOCKED) != 0)
-			break;
-	}
-#ifndef __CYGWIN__
-	if (msqid != msginfo.msgmni)
-		return (EBUSY);
-#endif /* __CYGWIN__ */
-
-	sys_free(msgpool, M_MSG);
-	sys_free(msgmaps, M_MSG);
-	sys_free(msghdrs, M_MSG);
-	sys_free(msqids, M_MSG);
-	mtx_destroy(&msq_mtx);
-	return (0);
-}
-
-
-#ifndef __CYGWIN__
-static int
-sysvmsg_modload(struct module *module, int cmd, void *arg)
-{
-	int error = 0;
-
-	switch (cmd) {
-	case MOD_LOAD:
-		msginit();
-		break;
-	case MOD_UNLOAD:
-		error = msgunload();
-		break;
-	case MOD_SHUTDOWN:
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-	return (error);
-}
-
-static moduledata_t sysvmsg_mod = {
-	"sysvmsg",
-	&sysvmsg_modload,
-	NULL
-};
-
-SYSCALL_MODULE_HELPER(msgsys);
-SYSCALL_MODULE_HELPER(msgctl);
-SYSCALL_MODULE_HELPER(msgget);
-SYSCALL_MODULE_HELPER(msgsnd);
-SYSCALL_MODULE_HELPER(msgrcv);
-
-DECLARE_MODULE(sysvmsg, sysvmsg_mod,
-	SI_SUB_SYSV_MSG, SI_ORDER_FIRST);
-MODULE_VERSION(sysvmsg, 1);
-
-/*
- * Entry point for all MSG calls
- *
- * MPSAFE
- */
-int
-msgsys(thread *td, struct msgsys_args *uap)
-{
-	int error;
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-	if (uap->which < 0 ||
-	    (unsigned) uap->which >= sizeof(msgcalls)/sizeof(msgcalls[0]))
-		return (EINVAL);
-	error = (*msgcalls[uap->which])(td, &uap->a2);
-	return (error);
-}
-#endif
-
-static void
-msg_freehdr(struct msg *msghdr)
-{
-	while (msghdr->msg_ts > 0) {
-		short next;
-		if (msghdr->msg_spot < 0 || msghdr->msg_spot >= msginfo.msgseg)
-			panic("msghdr->msg_spot out of range");
-		next = msgmaps[msghdr->msg_spot].next;
-		msgmaps[msghdr->msg_spot].next = free_msgmaps;
-		free_msgmaps = msghdr->msg_spot;
-		nfree_msgmaps++;
-		msghdr->msg_spot = next;
-		if (msghdr->msg_ts >= msginfo.msgssz)
-			msghdr->msg_ts -= msginfo.msgssz;
-		else
-			msghdr->msg_ts = 0;
-	}
-	if (msghdr->msg_spot != -1)
-		panic("msghdr->msg_spot != -1");
-	msghdr->msg_next = free_msghdrs;
-	free_msghdrs = msghdr;
-}
-
-#ifndef _SYS_SYSPROTO_H_
-struct msgctl_args {
-	int	msqid;
-	int	cmd;
-	struct	msqid_ds *buf;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-msgctl(struct thread *td, struct msgctl_args *uap)
-{
-	int msqid = uap->msqid;
-	int cmd = uap->cmd;
-	struct msqid_ds *user_msqptr = uap->buf;
-	int rval, error;
-	struct msqid_ds msqbuf;
-	register struct msqid_ds *msqptr;
-
-	DPRINTF(("call to msgctl(%d, %d, 0x%x)\n", msqid, cmd, user_msqptr));
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-
-#ifdef __CYGWIN__
-	if (cmd == IPC_INFO) {
-		if (!msqid) {
-			error = copyout(&msginfo, user_msqptr,
-					sizeof(struct msginfo));
-			td->td_retval[0] = error ? -1 : 0;
-			return (error);
-		}
-		if (msqid > msginfo.msgmni)
-			msqid = msginfo.msgmni;
-		error = copyout(msqids, user_msqptr,
-				msqid * sizeof(struct msqid_ds));
-		td->td_retval[0] = error ? -1 : 0;
-		return (error);
-	} else if (cmd == MSG_INFO) {
-		mtx_lock(&msq_mtx);
-		error = copyout(&msg_info, user_msqptr,
-				sizeof(struct msg_info));
-		td->td_retval[0] = error ? -1 : 0;
-		mtx_unlock(&msq_mtx);
-		return (error);
-	}
-#endif /* __CYGWIN__ */
-	msqid = IPCID_TO_IX(msqid);
-
-	if (msqid < 0 || msqid >= msginfo.msgmni) {
-		DPRINTF(("msqid (%d) out of range (0<=msqid<%d)\n", msqid,
-		    msginfo.msgmni));
-		return (EINVAL);
-	}
-	if (cmd == IPC_SET &&
-	    (error = copyin(user_msqptr, &msqbuf, sizeof(msqbuf))) != 0)
-		return (error);
-
-	msqptr = &msqids[msqid];
-
-	mtx_lock(&msq_mtx);
-	if (msqptr->msg_qbytes == 0) {
-		DPRINTF(("no such msqid\n"));
-		error = EINVAL;
-		goto done2;
-	}
-	if (msqptr->msg_perm.seq != IPCID_TO_SEQ(uap->msqid)) {
-		DPRINTF(("wrong sequence number\n"));
-		error = EINVAL;
-		goto done2;
-	}
-
-	error = 0;
-	rval = 0;
-
-	switch (cmd) {
-
-	case IPC_RMID:
-	{
-		struct msg *msghdr;
-		if ((error = ipcperm(td, &msqptr->msg_perm, IPC_M)))
-			goto done2;
-		/* Free the message headers */
-		msghdr = msqptr->msg_first;
-		while (msghdr != NULL) {
-			struct msg *msghdr_tmp;
-
-			/* Free the segments of each message */
-			msqptr->msg_cbytes -= msghdr->msg_ts;
-			msqptr->msg_qnum--;
-			msghdr_tmp = msghdr;
-			msghdr = msghdr->msg_next;
-			msg_freehdr(msghdr_tmp);
-		}
-
-		if (msqptr->msg_cbytes != 0)
-			panic("msg_cbytes is screwed up");
-		if (msqptr->msg_qnum != 0)
-			panic("msg_qnum is screwed up");
-
-		msqptr->msg_qbytes = 0;	/* Mark it as free */
-#ifdef __CYGWIN__
-		msg_info.msg_ids--;
-#endif /* __CYGWIN__ */
-
-		wakeup(msqptr);
-	}
-
-		break;
-
-	case IPC_SET:
-		if ((error = ipcperm(td, &msqptr->msg_perm, IPC_M)))
-			goto done2;
-		if (msqbuf.msg_qbytes > msqptr->msg_qbytes) {
-			error = suser(td);
-			if (error)
-				goto done2;
-		}
-		if (msqbuf.msg_qbytes > (unsigned long) msginfo.msgmnb) {
-			DPRINTF(("can't increase msg_qbytes beyond %d"
-			    "(truncating)\n", msginfo.msgmnb));
-			msqbuf.msg_qbytes = msginfo.msgmnb;	/* silently restrict qbytes to system limit */
-		}
-		if (msqbuf.msg_qbytes == 0) {
-			DPRINTF(("can't reduce msg_qbytes to 0\n"));
-			error = EINVAL;		/* non-standard errno! */
-			goto done2;
-		}
-		msqptr->msg_perm.uid = msqbuf.msg_perm.uid;	/* change the owner */
-		msqptr->msg_perm.gid = msqbuf.msg_perm.gid;	/* change the owner */
-		msqptr->msg_perm.mode = (msqptr->msg_perm.mode & ~0777) |
-		    (msqbuf.msg_perm.mode & 0777);
-		msqptr->msg_qbytes = msqbuf.msg_qbytes;
-		msqptr->msg_ctime = time (NULL);
-		break;
-
-	case IPC_STAT:
-		if ((error = ipcperm(td, &msqptr->msg_perm, IPC_R))) {
-			DPRINTF(("requester doesn't have read access\n"));
-			goto done2;
-		}
-		break;
-
-	default:
-		DPRINTF(("invalid command %d\n", cmd));
-		error = EINVAL;
-		goto done2;
-	}
-
-	if (error == 0)
-		td->td_retval[0] = rval;
-done2:
-	mtx_unlock(&msq_mtx);
-	if (cmd == IPC_STAT && error == 0)
-		error = copyout(msqptr, user_msqptr, sizeof(struct msqid_ds));
-	return(error);
-}
-
-#ifndef _SYS_SYSPROTO_H_
-struct msgget_args {
-	key_t	key;
-	int	msgflg;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-msgget(struct thread *td, struct msgget_args *uap)
-{
-	int msqid, error = 0;
-	key_t key = uap->key;
-	unsigned msgflg = uap->msgflg;
-	register struct msqid_ds *msqptr = NULL;
-
-	DPRINTF(("msgget(0x%x, 0%o)\n", key, msgflg));
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-
-	mtx_lock(&msq_mtx);
-	if (key != IPC_PRIVATE) {
-		for (msqid = 0; msqid < msginfo.msgmni; msqid++) {
-			msqptr = &msqids[msqid];
-			if (msqptr->msg_qbytes != 0 &&
-			    msqptr->msg_perm.key == key)
-				break;
-		}
-		if (msqid < msginfo.msgmni) {
-			DPRINTF(("found public key\n"));
-			if ((msgflg & IPC_CREAT) && (msgflg & IPC_EXCL)) {
-				DPRINTF(("not exclusive\n"));
-				error = EEXIST;
-				goto done2;
-			}
-			if ((error = ipcperm(td, &msqptr->msg_perm, msgflg & 0700))) {
-				DPRINTF(("requester doesn't have 0%o access\n",
-				    msgflg & 0700));
-				goto done2;
-			}
-			goto found;
-		}
-	}
-
-	DPRINTF(("need to allocate the msqid_ds\n"));
-	if (key == IPC_PRIVATE || (msgflg & IPC_CREAT)) {
-		for (msqid = 0; msqid < msginfo.msgmni; msqid++) {
-			/*
-			 * Look for an unallocated and unlocked msqid_ds.
-			 * msqid_ds's can be locked by msgsnd or msgrcv while
-			 * they are copying the message in/out.  We can't
-			 * re-use the entry until they release it.
-			 */
-			msqptr = &msqids[msqid];
-			if (msqptr->msg_qbytes == 0 &&
-			    (msqptr->msg_perm.mode & MSG_LOCKED) == 0)
-				break;
-		}
-		if (msqid == msginfo.msgmni) {
-			DPRINTF(("no more msqid_ds's available\n"));
-			error = ENOSPC;
-			goto done2;
-		}
-		DPRINTF(("msqid %d is available\n", msqid));
-		msqptr->msg_perm.key = key;
-#ifdef __CYGWIN__
-		msqptr->msg_perm.cuid = td->ipcblk->uid;
-		msqptr->msg_perm.uid = td->ipcblk->uid;
-		msqptr->msg_perm.cgid = td->ipcblk->gid;
-		msqptr->msg_perm.gid = td->ipcblk->gid;
-#else
-		msqptr->msg_perm.cuid = cred->cr_uid;
-		msqptr->msg_perm.uid = cred->cr_uid;
-		msqptr->msg_perm.cgid = cred->cr_gid;
-		msqptr->msg_perm.gid = cred->cr_gid;
-#endif /* __CYGWIN__ */
-		msqptr->msg_perm.mode = (msgflg & 0777);
-		/* Make sure that the returned msqid is unique */
-		msqptr->msg_perm.seq = (msqptr->msg_perm.seq + 1) & 0x7fff;
-		msqptr->msg_first = NULL;
-		msqptr->msg_last = NULL;
-		msqptr->msg_cbytes = 0;
-		msqptr->msg_qnum = 0;
-		msqptr->msg_qbytes = msginfo.msgmnb;
-		msqptr->msg_lspid = 0;
-		msqptr->msg_lrpid = 0;
-		msqptr->msg_stime = 0;
-		msqptr->msg_rtime = 0;
-		msqptr->msg_ctime = time (NULL);
-#ifdef __CYGWIN__
-		msg_info.msg_ids++;
-#endif /* __CYGWIN__ */
-	} else {
-		DPRINTF(("didn't find it and wasn't asked to create it\n"));
-		error = ENOENT;
-		goto done2;
-	}
-
-found:
-	/* Construct the unique msqid */
-	td->td_retval[0] = IXSEQ_TO_IPCID(msqid, msqptr->msg_perm);
-done2:
-	mtx_unlock(&msq_mtx);
-	return (error);
-}
-
-#ifndef _SYS_SYSPROTO_H_
-struct msgsnd_args {
-	int	msqid;
-	const void	*msgp;
-	size_t	msgsz;
-	int	msgflg;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-msgsnd(struct thread *td, struct msgsnd_args *uap)
-{
-	int msqid = uap->msqid;
-	const void *user_msgp = uap->msgp;
-	size_t msgsz = uap->msgsz;
-	int msgflg = uap->msgflg;
-	int segs_needed, error = 0;
-	register struct msqid_ds *msqptr;
-	register struct msg *msghdr;
-	short next;
-
-	DPRINTF(("call to msgsnd(%d, 0x%x, %d, %d)\n", msqid, user_msgp, msgsz,
-	    msgflg));
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-
-	mtx_lock(&msq_mtx);
-	msqid = IPCID_TO_IX(msqid);
-
-	if (msqid < 0 || msqid >= msginfo.msgmni) {
-		DPRINTF(("msqid (%d) out of range (0<=msqid<%d)\n", msqid,
-		    msginfo.msgmni));
-		error = EINVAL;
-		goto done2;
-	}
-
-	msqptr = &msqids[msqid];
-	if (msqptr->msg_qbytes == 0) {
-		DPRINTF(("no such message queue id\n"));
-		error = EINVAL;
-		goto done2;
-	}
-	if (msqptr->msg_perm.seq != IPCID_TO_SEQ(uap->msqid)) {
-		DPRINTF(("wrong sequence number\n"));
-		error = EINVAL;
-		goto done2;
-	}
-
-	if ((error = ipcperm(td, &msqptr->msg_perm, IPC_W))) {
-		DPRINTF(("requester doesn't have write access\n"));
-		goto done2;
-	}
-
-	segs_needed = (msgsz + msginfo.msgssz - 1) / msginfo.msgssz;
-	DPRINTF(("msgsz=%d, msgssz=%d, segs_needed=%d\n", msgsz, msginfo.msgssz,
-	    segs_needed));
-	for (;;) {
-		int need_more_resources = 0;
-
-		/*
-		 * check msgsz
-		 * (inside this loop in case msg_qbytes changes while we sleep)
-		 */
-
-		if (msgsz > msqptr->msg_qbytes) {
-			DPRINTF(("msgsz > msqptr->msg_qbytes\n"));
-			error = EINVAL;
-			goto done2;
-		}
-
-		if (msqptr->msg_perm.mode & MSG_LOCKED) {
-			DPRINTF(("msqid is locked\n"));
-			need_more_resources = 1;
-		}
-		if (msgsz + msqptr->msg_cbytes > msqptr->msg_qbytes) {
-			DPRINTF(("msgsz + msg_cbytes > msg_qbytes\n"));
-			need_more_resources = 1;
-		}
-		if (segs_needed > nfree_msgmaps) {
-			DPRINTF(("segs_needed > nfree_msgmaps\n"));
-			need_more_resources = 1;
-		}
-		if (free_msghdrs == NULL) {
-			DPRINTF(("no more msghdrs\n"));
-			need_more_resources = 1;
-		}
-
-		if (need_more_resources) {
-			int we_own_it;
-
-			if ((msgflg & IPC_NOWAIT) != 0) {
-				DPRINTF(("need more resources but caller "
-				    "doesn't want to wait\n"));
-				error = EAGAIN;
-				goto done2;
-			}
-
-			if ((msqptr->msg_perm.mode & MSG_LOCKED) != 0) {
-				DPRINTF(("we don't own the msqid_ds\n"));
-				we_own_it = 0;
-			} else {
-				/* Force later arrivals to wait for our
-				   request */
-				DPRINTF(("we own the msqid_ds\n"));
-				msqptr->msg_perm.mode |= MSG_LOCKED;
-				we_own_it = 1;
-			}
-			DPRINTF(("goodnight\n"));
-			error = msleep(msqptr, &msq_mtx, (PZERO - 4) | PCATCH,
-			    "msgwait", 0);
-			DPRINTF(("good morning, error=%d\n", error));
-			if (we_own_it)
-				msqptr->msg_perm.mode &= ~MSG_LOCKED;
-			if (error != 0) {
-				DPRINTF(("msgsnd:  interrupted system call\n"));
-#ifdef __CYGWIN__
-			  if (error != EIDRM)
-#endif /* __CYGWIN__ */
-				error = EINTR;
-				goto done2;
-			}
-
-			/*
-			 * Make sure that the msq queue still exists
-			 */
-
-			if (msqptr->msg_qbytes == 0) {
-				DPRINTF(("msqid deleted\n"));
-				error = EIDRM;
-				goto done2;
-			}
-
-		} else {
-			DPRINTF(("got all the resources that we need\n"));
-			break;
-		}
-	}
-
-	/*
-	 * We have the resources that we need.
-	 * Make sure!
-	 */
-
-	if (msqptr->msg_perm.mode & MSG_LOCKED)
-		panic("msg_perm.mode & MSG_LOCKED");
-	if (segs_needed > nfree_msgmaps)
-		panic("segs_needed > nfree_msgmaps");
-	if (msgsz + msqptr->msg_cbytes > msqptr->msg_qbytes)
-		panic("msgsz + msg_cbytes > msg_qbytes");
-	if (free_msghdrs == NULL)
-		panic("no more msghdrs");
-
-	/*
-	 * Re-lock the msqid_ds in case we page-fault when copying in the
-	 * message
-	 */
-
-	if ((msqptr->msg_perm.mode & MSG_LOCKED) != 0)
-		panic("msqid_ds is already locked");
-	msqptr->msg_perm.mode |= MSG_LOCKED;
-
-	/*
-	 * Allocate a message header
-	 */
-
-	msghdr = free_msghdrs;
-	free_msghdrs = msghdr->msg_next;
-	msghdr->msg_spot = -1;
-	msghdr->msg_ts = msgsz;
-
-	/*
-	 * Allocate space for the message
-	 */
-
-	while (segs_needed > 0) {
-		if (nfree_msgmaps <= 0)
-			panic("not enough msgmaps");
-		if (free_msgmaps == -1)
-			panic("nil free_msgmaps");
-		next = free_msgmaps;
-		if (next <= -1)
-			panic("next too low #1");
-		if (next >= msginfo.msgseg)
-			panic("next out of range #1");
-		DPRINTF(("allocating segment %d to message\n", next));
-		free_msgmaps = msgmaps[next].next;
-		nfree_msgmaps--;
-		msgmaps[next].next = msghdr->msg_spot;
-		msghdr->msg_spot = next;
-		segs_needed--;
-	}
-
-	/*
-	 * Copy in the message type
-	 */
-
-	mtx_unlock(&msq_mtx);
-	if ((error = copyin(user_msgp, &msghdr->msg_type,
-	    sizeof(msghdr->msg_type))) != 0) {
-		mtx_lock(&msq_mtx);
-		DPRINTF(("error %d copying the message type\n", error));
-		msg_freehdr(msghdr);
-		msqptr->msg_perm.mode &= ~MSG_LOCKED;
-		wakeup(msqptr);
-		goto done2;
-	}
-	mtx_lock(&msq_mtx);
-	user_msgp = (const char *)user_msgp + sizeof(msghdr->msg_type);
-
-	/*
-	 * Validate the message type
-	 */
-
-	if (msghdr->msg_type < 1) {
-		msg_freehdr(msghdr);
-		msqptr->msg_perm.mode &= ~MSG_LOCKED;
-		wakeup(msqptr);
-		DPRINTF(("mtype (%d) < 1\n", msghdr->msg_type));
-		error = EINVAL;
-		goto done2;
-	}
-
-	/*
-	 * Copy in the message body
-	 */
-
-	next = msghdr->msg_spot;
-	while (msgsz > 0) {
-		size_t tlen;
-		if (msgsz > (unsigned long) msginfo.msgssz)
-			tlen = msginfo.msgssz;
-		else
-			tlen = msgsz;
-		if (next <= -1)
-			panic("next too low #2");
-		if (next >= msginfo.msgseg)
-			panic("next out of range #2");
-		mtx_unlock(&msq_mtx);
-		if ((error = copyin(user_msgp, &msgpool[next * msginfo.msgssz],
-		    tlen)) != 0) {
-			mtx_lock(&msq_mtx);
-			DPRINTF(("error %d copying in message segment\n",
-			    error));
-			msg_freehdr(msghdr);
-			msqptr->msg_perm.mode &= ~MSG_LOCKED;
-			wakeup(msqptr);
-			goto done2;
-		}
-		mtx_lock(&msq_mtx);
-		msgsz -= tlen;
-		user_msgp = (const char *)user_msgp + tlen;
-		next = msgmaps[next].next;
-	}
-	if (next != -1)
-		panic("didn't use all the msg segments");
-
-	/*
-	 * We've got the message.  Unlock the msqid_ds.
-	 */
-
-	msqptr->msg_perm.mode &= ~MSG_LOCKED;
-
-	/*
-	 * Make sure that the msqid_ds is still allocated.
-	 */
-
-	if (msqptr->msg_qbytes == 0) {
-		msg_freehdr(msghdr);
-		wakeup(msqptr);
-		error = EIDRM;
-		goto done2;
-	}
-
-	/*
-	 * Put the message into the queue
-	 */
-
-	if (msqptr->msg_first == NULL) {
-		msqptr->msg_first = msghdr;
-		msqptr->msg_last = msghdr;
-	} else {
-		msqptr->msg_last->msg_next = msghdr;
-		msqptr->msg_last = msghdr;
-	}
-	msqptr->msg_last->msg_next = NULL;
-
-	msqptr->msg_cbytes += msghdr->msg_ts;
-	msqptr->msg_qnum++;
-	msqptr->msg_lspid = td->td_proc->p_pid;
-	msqptr->msg_stime = time (NULL);
-
-#ifdef __CYGWIN__
-	msg_info.msg_num++;
-	msg_info.msg_tot += uap->msgsz;
-#endif /* __CYGWIN__ */
-
-	wakeup(msqptr);
-	td->td_retval[0] = 0;
-done2:
-	mtx_unlock(&msq_mtx);
-	return (error);
-}
-
-#ifndef _SYS_SYSPROTO_H_
-struct msgrcv_args {
-	int	msqid;
-	void	*msgp;
-	size_t	msgsz;
-	long	msgtyp;
-	int	msgflg;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-msgrcv(struct thread *td, struct msgrcv_args *uap)
-{
-	int msqid = uap->msqid;
-	void *user_msgp = uap->msgp;
-	size_t msgsz = uap->msgsz;
-	long msgtyp = uap->msgtyp;
-	int msgflg = uap->msgflg;
-	size_t len;
-	register struct msqid_ds *msqptr;
-	register struct msg *msghdr;
-	int error = 0;
-	short next;
-
-	DPRINTF(("call to msgrcv(%d, 0x%x, %d, %ld, %d)\n", msqid, user_msgp,
-	    msgsz, msgtyp, msgflg));
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-
-	msqid = IPCID_TO_IX(msqid);
-
-	if (msqid < 0 || msqid >= msginfo.msgmni) {
-		DPRINTF(("msqid (%d) out of range (0<=msqid<%d)\n", msqid,
-		    msginfo.msgmni));
-		return (EINVAL);
-	}
-
-	msqptr = &msqids[msqid];
-	mtx_lock(&msq_mtx);
-	if (msqptr->msg_qbytes == 0) {
-		DPRINTF(("no such message queue id\n"));
-		error = EINVAL;
-		goto done2;
-	}
-	if (msqptr->msg_perm.seq != IPCID_TO_SEQ(uap->msqid)) {
-		DPRINTF(("wrong sequence number\n"));
-		error = EINVAL;
-		goto done2;
-	}
-
-	if ((error = ipcperm(td, &msqptr->msg_perm, IPC_R))) {
-		DPRINTF(("requester doesn't have read access\n"));
-		goto done2;
-	}
-
-	msghdr = NULL;
-	while (msghdr == NULL) {
-		if (msgtyp == 0) {
-			msghdr = msqptr->msg_first;
-			if (msghdr != NULL) {
-				if (msgsz < msghdr->msg_ts &&
-				    (msgflg & MSG_NOERROR) == 0) {
-					DPRINTF(("first message on the queue "
-					    "is too big (want %d, got %d)\n",
-					    msgsz, msghdr->msg_ts));
-					error = E2BIG;
-					goto done2;
-				}
-				if (msqptr->msg_first == msqptr->msg_last) {
-					msqptr->msg_first = NULL;
-					msqptr->msg_last = NULL;
-				} else {
-					msqptr->msg_first = msghdr->msg_next;
-					if (msqptr->msg_first == NULL)
-						panic("msg_first/last screwed up #1");
-				}
-			}
-		} else {
-			struct msg *previous;
-			struct msg **prev;
-
-			previous = NULL;
-			prev = &(msqptr->msg_first);
-			while ((msghdr = *prev) != NULL) {
-				/*
-				 * Is this message's type an exact match or is
-				 * this message's type less than or equal to
-				 * the absolute value of a negative msgtyp?
-				 * Note that the second half of this test can
-				 * NEVER be true if msgtyp is positive since
-				 * msg_type is always positive!
-				 */
-
-				if (msgtyp == msghdr->msg_type ||
-				    msghdr->msg_type <= -msgtyp) {
-					DPRINTF(("found message type %d, "
-					    "requested %d\n",
-					    msghdr->msg_type, msgtyp));
-					if (msgsz < msghdr->msg_ts &&
-					    (msgflg & MSG_NOERROR) == 0) {
-						DPRINTF(("requested message "
-						    "on the queue is too big "
-						    "(want %d, got %d)\n",
-						    msgsz, msghdr->msg_ts));
-						error = E2BIG;
-						goto done2;
-					}
-					*prev = msghdr->msg_next;
-					if (msghdr == msqptr->msg_last) {
-						if (previous == NULL) {
-							if (prev !=
-							    &msqptr->msg_first)
-								panic("msg_first/last screwed up #2");
-							msqptr->msg_first =
-							    NULL;
-							msqptr->msg_last =
-							    NULL;
-						} else {
-							if (prev ==
-							    &msqptr->msg_first)
-								panic("msg_first/last screwed up #3");
-							msqptr->msg_last =
-							    previous;
-						}
-					}
-					break;
-				}
-				previous = msghdr;
-				prev = &(msghdr->msg_next);
-			}
-		}
-
-		/*
-		 * We've either extracted the msghdr for the appropriate
-		 * message or there isn't one.
-		 * If there is one then bail out of this loop.
-		 */
-
-		if (msghdr != NULL)
-			break;
-
-		/*
-		 * Hmph!  No message found.  Does the user want to wait?
-		 */
-
-		if ((msgflg & IPC_NOWAIT) != 0) {
-			DPRINTF(("no appropriate message found (msgtyp=%d)\n",
-			    msgtyp));
-			/* The SVID says to return ENOMSG. */
-			error = ENOMSG;
-			goto done2;
-		}
-
-		/*
-		 * Wait for something to happen
-		 */
-
-		DPRINTF(("msgrcv:  goodnight\n"));
-		error = msleep(msqptr, &msq_mtx, (PZERO - 4) | PCATCH,
-		    "msgwait", 0);
-		DPRINTF(("msgrcv:  good morning (error=%d)\n", error));
-
-		if (error != 0) {
-			DPRINTF(("msgsnd:  interrupted system call\n"));
-#ifdef __CYGWIN__
-		    if (error != EIDRM)
-#endif /* __CYGWIN__ */
-			error = EINTR;
-			goto done2;
-		}
-
-		/*
-		 * Make sure that the msq queue still exists
-		 */
-
-		if (msqptr->msg_qbytes == 0 ||
-		    msqptr->msg_perm.seq != IPCID_TO_SEQ(uap->msqid)) {
-			DPRINTF(("msqid deleted\n"));
-			error = EIDRM;
-			goto done2;
-		}
-	}
-
-	/*
-	 * Return the message to the user.
-	 *
-	 * First, do the bookkeeping (before we risk being interrupted).
-	 */
-
-	msqptr->msg_cbytes -= msghdr->msg_ts;
-	msqptr->msg_qnum--;
-	msqptr->msg_lrpid = td->td_proc->p_pid;
-	msqptr->msg_rtime = time (NULL);
-
-	/*
-	 * Make msgsz the actual amount that we'll be returning.
-	 * Note that this effectively truncates the message if it is too long
-	 * (since msgsz is never increased).
-	 */
-
-	DPRINTF(("found a message, msgsz=%d, msg_ts=%d\n", msgsz,
-	    msghdr->msg_ts));
-	if (msgsz > msghdr->msg_ts)
-		msgsz = msghdr->msg_ts;
-
-	/*
-	 * Return the type to the user.
-	 */
-
-	mtx_unlock(&msq_mtx);
-	error = copyout(&(msghdr->msg_type), user_msgp,
-	    sizeof(msghdr->msg_type));
-	mtx_lock(&msq_mtx);
-	if (error != 0) {
-		DPRINTF(("error (%d) copying out message type\n", error));
-		msg_freehdr(msghdr);
-		wakeup(msqptr);
-		goto done2;
-	}
-	user_msgp = (char *)user_msgp + sizeof(msghdr->msg_type);
-
-	/*
-	 * Return the segments to the user
-	 */
-
-	next = msghdr->msg_spot;
-	for (len = 0; len < msgsz; len += msginfo.msgssz) {
-		size_t tlen;
-
-		if (msgsz - len > (unsigned long) msginfo.msgssz)
-			tlen = msginfo.msgssz;
-		else
-			tlen = msgsz - len;
-		if (next <= -1)
-			panic("next too low #3");
-		if (next >= msginfo.msgseg)
-			panic("next out of range #3");
-		mtx_unlock(&msq_mtx);
-		error = copyout(&msgpool[next * msginfo.msgssz],
-		    user_msgp, tlen);
-		mtx_lock(&msq_mtx);
-		if (error != 0) {
-			DPRINTF(("error (%d) copying out message segment\n",
-			    error));
-			msg_freehdr(msghdr);
-			wakeup(msqptr);
-			goto done2;
-		}
-		user_msgp = (char *)user_msgp + tlen;
-		next = msgmaps[next].next;
-	}
-
-	/*
-	 * Done, return the actual number of bytes copied out.
-	 */
-
-#ifdef __CYGWIN__
-	msg_info.msg_num--;
-	msg_info.msg_tot -= msgsz;
-#endif /* __CYGWIN__ */
-
-	msg_freehdr(msghdr);
-	wakeup(msqptr);
-	td->td_retval[0] = msgsz;
-done2:
-	mtx_unlock(&msq_mtx);
-	return (error);
-}
-
-#ifndef __CYGWIN__
-static int
-sysctl_msqids(SYSCTL_HANDLER_ARGS)
-{
-
-	return (SYSCTL_OUT(req, msqids,
-	    sizeof(struct msqid_ds) * msginfo.msgmni));
-}
-
-SYSCTL_DECL(_kern_ipc);
-SYSCTL_INT(_kern_ipc, OID_AUTO, msgmax, CTLFLAG_RD, &msginfo.msgmax, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, msgmni, CTLFLAG_RDTUN, &msginfo.msgmni, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, msgmnb, CTLFLAG_RD, &msginfo.msgmnb, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, msgtql, CTLFLAG_RD, &msginfo.msgtql, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, msgssz, CTLFLAG_RDTUN, &msginfo.msgssz, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, msgseg, CTLFLAG_RDTUN, &msginfo.msgseg, 0, "");
-SYSCTL_PROC(_kern_ipc, OID_AUTO, msqids, CTLFLAG_RD,
-    NULL, 0, sysctl_msqids, "", "Message queue IDs");
-#endif /* __CYGWIN__ */
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/sysv_sem.cc b/winsup/cygserver/sysv_sem.cc
deleted file mode 100644
index ccb7a1246..000000000
--- a/winsup/cygserver/sysv_sem.cc
+++ /dev/null
@@ -1,1324 +0,0 @@
-/*
- * Implementation of SVID semaphores
- *
- * Author:  Daniel Boulet
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- */
-
-/*
- * This file is heavily changed to become part of Cygwin's cygserver.
- */
-
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-#include <sys/cygwin.h>
-#include <sys/cdefs.h>
-#ifndef __FBSDID
-#define __FBSDID(s)	const char version[] = (s)
-#endif
-__FBSDID("$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/kern/sysv_sem.c,v 1.67 2003/11/15 11:56:53 tjr Exp $");
-
-#define _KERNEL 1
-#define __BSD_VISIBLE 1
-#include <sys/types.h>
-#include <sys/ipc.h>
-
-#include <sys/param.h>
-#include <sys/sysproto.h>
-#include <sys/lock.h>
-#include <sys/sem.h>
-#include <sys/queue.h>
-#include <malloc.h>
-#include <errno.h>
-#include <time.h>
-#include "cygserver.h"
-#include "process.h"
-#include "cygserver_ipc.h"
-
-#ifdef __CYGWIN__
-#define __semctl semctl
-#define __semctl_args semctl_args
-#define SEM_DEBUG
-#endif /* __CYGWIN__ */
-
-#ifdef SEM_DEBUG
-#define DPRINTF(a)	debug_printf a
-#else
-#define DPRINTF(a)
-#endif
-
-static int semvalid(int semid, struct semid_ds *semaptr);
-
-static struct sem_undo *semu_alloc(struct thread *td);
-static int semundo_adjust(struct thread *td, struct sem_undo **supptr,
-		int semid, int semnum, int adjval);
-static void semundo_clear(int semid, int semnum);
-
-#ifndef _SYS_SYSPROTO_H_
-struct __semctl_args;
-int __semctl(struct thread *td, struct __semctl_args *uap);
-struct semget_args;
-int semget(struct thread *td, struct semget_args *uap);
-struct semop_args;
-int semop(struct thread *td, struct semop_args *uap);
-#endif
-
-#ifndef __CYGWIN__
-/* XXX casting to (sy_call_t *) is bogus, as usual. */
-static sy_call_t *semcalls[] = {
-	(sy_call_t *)__semctl, (sy_call_t *)semget,
-	(sy_call_t *)semop
-};
-#endif
-
-static struct mtx	sem_mtx;	/* semaphore global lock */
-static int	semtots = 0;
-static int	semtot = 0;
-static struct semid_ds *sema;	/* semaphore id pool */
-static struct mtx *sema_mtx;	/* semaphore id pool mutexes*/
-static struct sem *sem;		/* semaphore pool */
-SLIST_HEAD(, sem_undo) semu_list;	/* list of active undo structures */
-static int	*semu;		/* undo structure pool */
-#ifndef __CYGWIN__
-static eventhandler_tag semexit_tag;
-#endif /* __CYGWIN__ */
-
-#define SEMUNDO_MTX		sem_mtx
-#define SEMUNDO_LOCK()		mtx_lock(&SEMUNDO_MTX);
-#define SEMUNDO_HOOKLOCK()	_mtx_lock(&SEMUNDO_MTX, p->winpid, __FILE__, __LINE__);
-#define SEMUNDO_UNLOCK()	mtx_unlock(&SEMUNDO_MTX);
-#define SEMUNDO_LOCKASSERT(how)	mtx_assert(&SEMUNDO_MTX, (how));
-
-struct sem {
-	u_short	semval;		/* semaphore value */
-	pid_t	sempid;		/* pid of last operation */
-	u_short	semncnt;	/* # awaiting semval > cval */
-	u_short	semzcnt;	/* # awaiting semval = 0 */
-};
-
-/*
- * Undo structure (one per process)
- */
-struct undo {
-	short	un_adjval;	/* adjust on exit values */
-	short	un_num;		/* semaphore # */
-	int	un_id;		/* semid */
-} un_ent[1];			/* undo entries */
-
-struct sem_undo {
-	SLIST_ENTRY(sem_undo) un_next;	/* ptr to next active undo structure */
-	struct	proc *un_proc;		/* owner of this structure */
-	short	un_cnt;			/* # of active entries */
-	struct undo un_ent[1];		/* undo entries */
-};
-
-/*
- * Configuration parameters
- */
-#ifndef SEMMNI
-#define SEMMNI	10		/* # of semaphore identifiers */
-#endif
-#ifndef SEMMNS
-#define SEMMNS	60		/* # of semaphores in system */
-#endif
-#ifndef SEMUME
-#define SEMUME	10		/* max # of undo entries per process */
-#endif
-#ifndef SEMMNU
-#define SEMMNU	30		/* # of undo structures in system */
-#endif
-
-/* shouldn't need tuning */
-#ifndef SEMMAP
-#define SEMMAP	30		/* # of entries in semaphore map */
-#endif
-#ifndef SEMMSL
-#define SEMMSL	SEMMNS		/* max # of semaphores per id */
-#endif
-#ifndef SEMOPM
-#define SEMOPM	100		/* max # of operations per semop call */
-#endif
-
-#ifndef SEMVMX
-#define SEMVMX	32767		/* semaphore maximum value */
-#endif
-#ifndef SEMAEM
-#define SEMAEM	16384		/* adjust on exit max value */
-#endif
-
-/*
- * Due to the way semaphore memory is allocated, we have to ensure that
- * SEMUSZ is properly aligned.
- */
-
-#define SEM_ALIGN(bytes) (((bytes) + (sizeof(long) - 1)) & ~(sizeof(long) - 1))
-
-/* actual size of an undo structure */
-#define SEMUSZ	SEM_ALIGN(offsetof(struct sem_undo, un_ent[SEMUME]))
-
-/*
- * Macro to find a particular sem_undo vector
- */
-#define SEMU(ix) \
-	((struct sem_undo *)(((intptr_t)semu)+ix * seminfo.semusz))
-
-/*
- * semaphore info struct
- */
-struct seminfo seminfo = {
-                SEMMNI,         /* # of semaphore identifiers */
-                SEMMNS,         /* # of semaphores in system */
-                SEMMSL,         /* max # of semaphores per id */
-                SEMOPM,         /* max # of operations per semop call */
-                SEMMNU,         /* # of undo structures in system */
-                SEMUME,         /* max # of undo entries per process */
-                SEMVMX,         /* semaphore maximum value */
-                SEMAEM,         /* adjust on exit max value */
-                SEMMAP,         /* # of entries in semaphore map */
-                SEMUSZ          /* size in bytes of undo structure */
-};
-
-#ifndef __CYGWIN__
-SYSCTL_DECL(_kern_ipc);
-SYSCTL_INT(_kern_ipc, OID_AUTO, semmap, CTLFLAG_RW, &seminfo.semmap, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semmni, CTLFLAG_RDTUN, &seminfo.semmni, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semmns, CTLFLAG_RDTUN, &seminfo.semmns, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semmnu, CTLFLAG_RDTUN, &seminfo.semmnu, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semmsl, CTLFLAG_RW, &seminfo.semmsl, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semopm, CTLFLAG_RDTUN, &seminfo.semopm, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semume, CTLFLAG_RDTUN, &seminfo.semume, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semusz, CTLFLAG_RDTUN, &seminfo.semusz, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semvmx, CTLFLAG_RW, &seminfo.semvmx, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semaem, CTLFLAG_RW, &seminfo.semaem, 0, "");
-SYSCTL_PROC(_kern_ipc, OID_AUTO, sema, CTLFLAG_RD,
-    NULL, 0, sysctl_sema, "", "");
-#endif /* __CYGWIN__ */
-
-void
-seminit(void)
-{
-	int i;
-
-	TUNABLE_INT_FETCH("kern.ipc.semmap", &seminfo.semmap);
-	TUNABLE_INT_FETCH("kern.ipc.semmni", &seminfo.semmni);
-	TUNABLE_INT_FETCH("kern.ipc.semmns", &seminfo.semmns);
-	TUNABLE_INT_FETCH("kern.ipc.semmnu", &seminfo.semmnu);
-	TUNABLE_INT_FETCH("kern.ipc.semmsl", &seminfo.semmsl);
-	TUNABLE_INT_FETCH("kern.ipc.semopm", &seminfo.semopm);
-	TUNABLE_INT_FETCH("kern.ipc.semume", &seminfo.semume);
-	TUNABLE_INT_FETCH("kern.ipc.semusz", &seminfo.semusz);
-	TUNABLE_INT_FETCH("kern.ipc.semvmx", &seminfo.semvmx);
-	TUNABLE_INT_FETCH("kern.ipc.semaem", &seminfo.semaem);
-
-#ifdef __CYGWIN__
-	/* It's too dangerous a setting to leave it alone. 
-	   Keep that clean here. */
-	seminfo.semusz = SEM_ALIGN(offsetof(struct sem_undo,
-					    un_ent[seminfo.semume]));
-#endif /* __CYGWIN__ */
-
-	sem = (struct sem *) sys_malloc(sizeof(struct sem) * seminfo.semmns, M_SEM, M_WAITOK);
-	sema = (struct semid_ds *) sys_malloc(sizeof(struct semid_ds) * seminfo.semmni, M_SEM,
-	    M_WAITOK);
-	sema_mtx = (struct mtx *) sys_malloc(sizeof(struct mtx) * seminfo.semmni, M_SEM,
-	    M_WAITOK | M_ZERO);
-	semu = (int *) sys_malloc(seminfo.semmnu * seminfo.semusz, M_SEM, M_WAITOK);
-
-	for (i = 0; i < seminfo.semmni; i++) {
-		sema[i].sem_base = 0;
-		sema[i].sem_perm.mode = 0;
-		sema[i].sem_perm.seq = 0;
-	}
-	for (i = 0; i < seminfo.semmni; i++)
-		mtx_init(&sema_mtx[i], "semid", NULL, MTX_DEF);
-	for (i = 0; i < seminfo.semmnu; i++) {
-		struct sem_undo *suptr = SEMU(i);
-		suptr->un_proc = NULL;
-	}
-	SLIST_INIT(&semu_list);
-	mtx_init(&sem_mtx, "sem", NULL, MTX_DEF);
-#ifndef __CYGWIN__
-	semexit_tag = EVENTHANDLER_REGISTER(process_exit, semexit_myhook, NULL,
-	    EVENTHANDLER_PRI_ANY);
-#endif /* __CYGWIN__ */
-}
-
-int
-semunload(void)
-{
-#ifndef __CYGWIN__	/* Would result in being unable to shutdown the
-			   server gracefully. */
-	if (semtot != 0)
-		return (EBUSY);
-
-	EVENTHANDLER_DEREGISTER(process_exit, semexit_tag);
-#endif /* __CYGWIN__ */
-	sys_free(sem, M_SEM);
-	sys_free(sema, M_SEM);
-	sys_free(semu, M_SEM);
-	for (int i = 0; i < seminfo.semmni; i++)
-		mtx_destroy(&sema_mtx[i]);
-	mtx_destroy(&sem_mtx);
-	return (0);
-}
-
-#ifndef __CYGWIN__
-static int
-sysvsem_modload(struct module *module, int cmd, void *arg)
-{
-	int error = 0;
-
-	switch (cmd) {
-	case MOD_LOAD:
-		seminit();
-		break;
-	case MOD_UNLOAD:
-		error = semunload();
-		break;
-	case MOD_SHUTDOWN:
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-	return (error);
-}
-
-static moduledata_t sysvsem_mod = {
-	"sysvsem",
-	&sysvsem_modload,
-	NULL
-};
-
-SYSCALL_MODULE_HELPER(semsys);
-SYSCALL_MODULE_HELPER(__semctl);
-SYSCALL_MODULE_HELPER(semget);
-SYSCALL_MODULE_HELPER(semop);
-
-DECLARE_MODULE(sysvsem, sysvsem_mod,
-	SI_SUB_SYSV_SEM, SI_ORDER_FIRST);
-MODULE_VERSION(sysvsem, 1);
-
-/*
- * Entry point for all SEM calls
- *
- * MPSAFE
- */
-int
-semsys(td, uap)
-	struct thread *td;
-	/* XXX actually varargs. */
-	struct semsys_args /* {
-		int	which;
-		int	a2;
-		int	a3;
-		int	a4;
-		int	a5;
-	} */ *uap;
-{
-	int error;
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-	if (uap->which < 0 ||
-	    uap->which >= sizeof(semcalls)/sizeof(semcalls[0]))
-		return (EINVAL);
-	error = (*semcalls[uap->which])(td, &uap->a2);
-	return (error);
-}
-#endif /* __CYGWIN__ */
-
-/*
- * Allocate a new sem_undo structure for a process
- * (returns ptr to structure or NULL if no more room)
- */
-
-static struct sem_undo *
-semu_alloc(struct thread *td)
-{
-	int i;
-	struct sem_undo *suptr;
-	struct sem_undo **supptr;
-	int attempt;
-
-	SEMUNDO_LOCKASSERT(MA_OWNED);
-	/*
-	 * Try twice to allocate something.
-	 * (we'll purge an empty structure after the first pass so
-	 * two passes are always enough)
-	 */
-
-	for (attempt = 0; attempt < 2; attempt++) {
-		/*
-		 * Look for a free structure.
-		 * Fill it in and return it if we find one.
-		 */
-
-		for (i = 0; i < seminfo.semmnu; i++) {
-			suptr = SEMU(i);
-			if (suptr->un_proc == NULL) {
-				SLIST_INSERT_HEAD(&semu_list, suptr, un_next);
-				suptr->un_cnt = 0;
-				suptr->un_proc = td->td_proc;
-				return(suptr);
-			}
-		}
-
-		/*
-		 * We didn't find a free one, if this is the first attempt
-		 * then try to free a structure.
-		 */
-
-		if (attempt == 0) {
-			/* All the structures are in use - try to free one */
-			int did_something = 0;
-
-			SLIST_FOREACH_PREVPTR(suptr, supptr, &semu_list,
-			    un_next) {
-				if (suptr->un_cnt == 0) {
-					suptr->un_proc = NULL;
-					did_something = 1;
-					*supptr = SLIST_NEXT(suptr, un_next);
-					break;
-				}
-			}
-
-			/* If we didn't free anything then just give-up */
-			if (!did_something)
-				return(NULL);
-		} else {
-			/*
-			 * The second pass failed even though we freed
-			 * something after the first pass!
-			 * This is IMPOSSIBLE!
-			 */
-			panic("semu_alloc - second attempt failed");
-		}
-	}
-	return (NULL);
-}
-
-/*
- * Adjust a particular entry for a particular proc
- */
-
-static int
-semundo_adjust(struct thread *td, struct sem_undo **supptr, int semid,
-	       int semnum, int adjval)
-{
-	struct proc *p = td->td_proc;
-	struct sem_undo *suptr;
-	struct undo *sunptr;
-	int i;
-
-	SEMUNDO_LOCKASSERT(MA_OWNED);
-	/* Look for and remember the sem_undo if the caller doesn't provide
-	   it */
-
-	suptr = *supptr;
-	if (suptr == NULL) {
-		SLIST_FOREACH(suptr, &semu_list, un_next) {
-			if (suptr->un_proc == p) {
-				*supptr = suptr;
-				break;
-			}
-		}
-		if (suptr == NULL) {
-			if (adjval == 0)
-				return(0);
-			suptr = semu_alloc(td);
-			if (suptr == NULL)
-				return(ENOSPC);
-			*supptr = suptr;
-		}
-	}
-
-	/*
-	 * Look for the requested entry and adjust it (delete if adjval becomes
-	 * 0).
-	 */
-	sunptr = &suptr->un_ent[0];
-	for (i = 0; i < suptr->un_cnt; i++, sunptr++) {
-		if (sunptr->un_id != semid || sunptr->un_num != semnum)
-			continue;
-		if (adjval != 0) {
-			adjval += sunptr->un_adjval;
-			if (adjval > seminfo.semaem || adjval < -seminfo.semaem)
-				return (ERANGE);
-		}
-		sunptr->un_adjval = adjval;
-		if (sunptr->un_adjval == 0) {
-			suptr->un_cnt--;
-			if (i < suptr->un_cnt)
-				suptr->un_ent[i] =
-				    suptr->un_ent[suptr->un_cnt];
-		}
-		return(0);
-	}
-
-	/* Didn't find the right entry - create it */
-	if (adjval == 0)
-		return(0);
-	if (adjval > seminfo.semaem || adjval < -seminfo.semaem)
-		return (ERANGE);
-	if (suptr->un_cnt != seminfo.semume) {
-		sunptr = &suptr->un_ent[suptr->un_cnt];
-		suptr->un_cnt++;
-		sunptr->un_adjval = adjval;
-		sunptr->un_id = semid; sunptr->un_num = semnum;
-	} else
-		return(EINVAL);
-	return(0);
-}
-
-static void
-semundo_clear(int semid, int semnum)
-{
-	struct sem_undo *suptr;
-
-	SEMUNDO_LOCKASSERT(MA_OWNED);
-	SLIST_FOREACH(suptr, &semu_list, un_next) {
-		struct undo *sunptr = &suptr->un_ent[0];
-		int i = 0;
-
-		while (i < suptr->un_cnt) {
-			if (sunptr->un_id == semid) {
-				if (semnum == -1 || sunptr->un_num == semnum) {
-					suptr->un_cnt--;
-					if (i < suptr->un_cnt) {
-						suptr->un_ent[i] =
-						  suptr->un_ent[suptr->un_cnt];
-						continue;
-					}
-				}
-				if (semnum != -1)
-					break;
-			}
-			i++, sunptr++;
-		}
-	}
-}
-
-static int
-semvalid(int semid, struct semid_ds *semaptr)
-{
-
-	return ((semaptr->sem_perm.mode & SEM_ALLOC) == 0 ||
-	    semaptr->sem_perm.seq != IPCID_TO_SEQ(semid) ? EINVAL : 0);
-}
-
-/*
- * Note that the user-mode half of this passes a union, not a pointer
- */
-#ifndef _SYS_SYSPROTO_H_
-struct __semctl_args {
-	int	semid;
-	int	semnum;
-	int	cmd;
-	union	semun *arg;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-__semctl(struct thread *td, struct __semctl_args *uap)
-{
-	int semid = uap->semid;
-	int semnum = uap->semnum;
-	int cmd = uap->cmd;
-	u_short *array;
-	union semun *arg = uap->arg;
-	union semun real_arg;
-#ifndef __CYGWIN__
-	struct ucred *cred = td->td_ucred;
-#endif
-	int i, rval, error;
-	struct semid_ds sbuf;
-	struct semid_ds *semaptr;
-	struct mtx *sema_mtxp;
-	u_short usval, count;
-
-	DPRINTF(("call to semctl(%d, %d, %d, 0x%x)\n",
-	    semid, semnum, cmd, arg));
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-
-	array = NULL;
-
-	switch(cmd) {
-#ifdef __CYGWIN__
-	case IPC_INFO:
-		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
-			return (error);
-		if (!semid) {
-			error = copyout(&seminfo, real_arg.buf,
-					sizeof(struct seminfo));
-			td->td_retval[0] = error ? -1 : 0;
-			return (error);
-		}
-		if (semid > seminfo.semmni)
-			semid = seminfo.semmni;
-		error = copyout(sema, real_arg.buf,
-				semid * sizeof(struct semid_ds));
-		td->td_retval[0] = error ? -1 : 0;
-		return (error);
-	case SEM_INFO:
-		if (!(error = copyin(arg, &real_arg, sizeof(real_arg)))) {
-			struct sem_info sem_info;
-			sem_info.sem_ids = semtots;
-			sem_info.sem_num = semtot;
-			error = copyout(&sem_info, real_arg.buf,
-					sizeof(struct sem_info));
-		}
-		td->td_retval[0] = error ? -1 : 0;
-		return (error);
-
-#endif /* __CYGWIN__ */
-	case SEM_STAT:
-		if (semid < 0 || semid >= seminfo.semmni)
-			return (EINVAL);
-		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
-			return (error);
-		semaptr = &sema[semid];
-		sema_mtxp = &sema_mtx[semid];
-		mtx_lock(sema_mtxp);
-		if ((semaptr->sem_perm.mode & SEM_ALLOC) == 0) {
-			error = EINVAL;
-			goto done2;
-		}
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_R)))
-			goto done2;
-		mtx_unlock(sema_mtxp);
-		error = copyout(semaptr, real_arg.buf, sizeof(struct semid_ds));
-		rval = IXSEQ_TO_IPCID(semid,semaptr->sem_perm);
-		if (error == 0)
-			td->td_retval[0] = rval;
-		return (error);
-	}
-
-	semid = IPCID_TO_IX(semid);
-	if (semid < 0 || semid >= seminfo.semmni)
-		return (EINVAL);
-
-	semaptr = &sema[semid];
-	sema_mtxp = &sema_mtx[semid];
-		
-	error = 0;
-	rval = 0;
-
-	switch (cmd) {
-	case IPC_RMID:
-		mtx_lock(sema_mtxp);
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_M)))
-			goto done2;
-#ifdef __CYGWIN__
-		semaptr->sem_perm.cuid = td->ipcblk->uid;
-		semaptr->sem_perm.uid = td->ipcblk->uid;
-#else
-		semaptr->sem_perm.cuid = cred->cr_uid;
-		semaptr->sem_perm.uid = cred->cr_uid;
-#endif
-		semtot -= semaptr->sem_nsems;
-		semtots--;
-		for (i = semaptr->sem_base - sem; i < semtot; i++)
-			sem[i] = sem[i + semaptr->sem_nsems];
-		for (i = 0; i < seminfo.semmni; i++) {
-			if ((sema[i].sem_perm.mode & SEM_ALLOC) &&
-			    sema[i].sem_base > semaptr->sem_base)
-				sema[i].sem_base -= semaptr->sem_nsems;
-		}
-		semaptr->sem_perm.mode = 0;
-		SEMUNDO_LOCK();
-		semundo_clear(semid, -1);
-		SEMUNDO_UNLOCK();
-		wakeup(semaptr);
-		break;
-
-	case IPC_SET:
-		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
-			goto done2;
-		if ((error = copyin(real_arg.buf, &sbuf, sizeof(sbuf))) != 0)
-			goto done2;
-		mtx_lock(sema_mtxp);
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_M)))
-			goto done2;
-		semaptr->sem_perm.uid = sbuf.sem_perm.uid;
-		semaptr->sem_perm.gid = sbuf.sem_perm.gid;
-		semaptr->sem_perm.mode = (semaptr->sem_perm.mode & ~0777) |
-		    (sbuf.sem_perm.mode & 0777);
-		semaptr->sem_ctime = time (NULL);
-		break;
-
-	case IPC_STAT:
-		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
-			goto done2;
-		mtx_lock(sema_mtxp);
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_R)))
-			goto done2;
-		sbuf = *semaptr;
-		mtx_unlock(sema_mtxp);
-		error = copyout(semaptr, real_arg.buf,
-				sizeof(struct semid_ds));
-		break;
-
-	case GETNCNT:
-		mtx_lock(sema_mtxp);
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_R)))
-			goto done2;
-		if (semnum < 0 || semnum >= semaptr->sem_nsems) {
-			error = EINVAL;
-			goto done2;
-		}
-		rval = semaptr->sem_base[semnum].semncnt;
-		break;
-
-	case GETPID:
-		mtx_lock(sema_mtxp);
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_R)))
-			goto done2;
-		if (semnum < 0 || semnum >= semaptr->sem_nsems) {
-			error = EINVAL;
-			goto done2;
-		}
-		rval = semaptr->sem_base[semnum].sempid;
-		break;
-
-	case GETVAL:
-		mtx_lock(sema_mtxp);
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_R)))
-			goto done2;
-		if (semnum < 0 || semnum >= semaptr->sem_nsems) {
-			error = EINVAL;
-			goto done2;
-		}
-		rval = semaptr->sem_base[semnum].semval;
-		break;
-
-	case GETALL:
-		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
-			goto done2;
-		array = (u_short *) sys_malloc(sizeof(*array) * semaptr->sem_nsems, M_TEMP,
-		    M_WAITOK);
-		mtx_lock(sema_mtxp);
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_R)))
-			goto done2;
-		for (i = 0; i < semaptr->sem_nsems; i++)
-			array[i] = semaptr->sem_base[i].semval;
-		mtx_unlock(sema_mtxp);
-		error = copyout(array, real_arg.array,
-		    i * sizeof(real_arg.array[0]));
-		break;
-
-	case GETZCNT:
-		mtx_lock(sema_mtxp);
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_R)))
-			goto done2;
-		if (semnum < 0 || semnum >= semaptr->sem_nsems) {
-			error = EINVAL;
-			goto done2;
-		}
-		rval = semaptr->sem_base[semnum].semzcnt;
-		break;
-
-	case SETVAL:
-		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
-			goto done2;
-		mtx_lock(sema_mtxp);
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_W)))
-			goto done2;
-		if (semnum < 0 || semnum >= semaptr->sem_nsems) {
-			error = EINVAL;
-			goto done2;
-		}
-		if (real_arg.val < 0 || real_arg.val > seminfo.semvmx) {
-			error = ERANGE;
-			goto done2;
-		}
-		semaptr->sem_base[semnum].semval = real_arg.val;
-		SEMUNDO_LOCK();
-		semundo_clear(semid, semnum);
-		SEMUNDO_UNLOCK();
-		wakeup(semaptr);
-		break;
-
-	case SETALL:
-		mtx_lock(sema_mtxp);
-raced:
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		count = semaptr->sem_nsems;
-		mtx_unlock(sema_mtxp);
-		if ((error = copyin(arg, &real_arg, sizeof(real_arg))) != 0)
-			goto done2;
-		array = (u_short *) sys_malloc(sizeof(*array) * count, M_TEMP, M_WAITOK);
-		copyin(real_arg.array, array, count * sizeof(*array));
-		if (error)
-			break;
-		mtx_lock(sema_mtxp);
-		if ((error = semvalid(uap->semid, semaptr)) != 0)
-			goto done2;
-		/* we could have raced? */
-		if (count != semaptr->sem_nsems) {
-			sys_free(array, M_TEMP);
-			array = NULL;
-			goto raced;
-		}
-		if ((error = ipcperm(td, &semaptr->sem_perm, IPC_W)))
-			goto done2;
-		for (i = 0; i < semaptr->sem_nsems; i++) {
-			usval = array[i];
-			if (usval > seminfo.semvmx) {
-				error = ERANGE;
-				break;
-			}
-			semaptr->sem_base[i].semval = usval;
-		}
-		SEMUNDO_LOCK();
-		semundo_clear(semid, -1);
-		SEMUNDO_UNLOCK();
-		wakeup(semaptr);
-		break;
-
-	default:
-		error = EINVAL;
-		break;
-	}
-
-	if (error == 0)
-		td->td_retval[0] = rval;
-done2:
-	if (mtx_owned(sema_mtxp))
-		mtx_unlock(sema_mtxp);
-	if (array != NULL)
-		sys_free(array, M_TEMP);
-	return(error);
-}
-
-#ifndef _SYS_SYSPROTO_H_
-struct semget_args {
-	key_t	key;
-	int	nsems;
-	int	semflg;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-semget(struct thread *td, struct semget_args *uap)
-{
-	int semid, error = 0;
-	key_t key = uap->key;
-	int nsems = uap->nsems;
-	int semflg = uap->semflg;
-#ifndef __CYGWIN__
-	struct ucred *cred = td->td_ucred;
-#endif
-
-	DPRINTF(("semget(0x%x, %d, 0%o)\n", key, nsems, semflg));
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-
-	mtx_lock(&Giant);
-	if (key != IPC_PRIVATE) {
-		for (semid = 0; semid < seminfo.semmni; semid++) {
-			if ((sema[semid].sem_perm.mode & SEM_ALLOC) &&
-			    sema[semid].sem_perm.key == key)
-				break;
-		}
-		if (semid < seminfo.semmni) {
-			DPRINTF(("found public key\n"));
-			if ((error = ipcperm(td, &sema[semid].sem_perm,
-			    semflg & 0700))) {
-				goto done2;
-			}
-			if (nsems > 0 && sema[semid].sem_nsems < nsems) {
-				DPRINTF(("too small\n"));
-				error = EINVAL;
-				goto done2;
-			}
-			if ((semflg & IPC_CREAT) && (semflg & IPC_EXCL)) {
-				DPRINTF(("not exclusive\n"));
-				error = EEXIST;
-				goto done2;
-			}
-			goto found;
-		}
-	}
-
-	DPRINTF(("need to allocate the semid_ds\n"));
-	if (key == IPC_PRIVATE || (semflg & IPC_CREAT)) {
-		if (nsems <= 0 || nsems > seminfo.semmsl) {
-			DPRINTF(("nsems out of range (0<%d<=%d)\n", nsems,
-			    seminfo.semmsl));
-			error = EINVAL;
-			goto done2;
-		}
-		if (nsems > seminfo.semmns - semtot) {
-			DPRINTF((
-			    "not enough semaphores left (need %d, got %d)\n",
-			    nsems, seminfo.semmns - semtot));
-			error = ENOSPC;
-			goto done2;
-		}
-		for (semid = 0; semid < seminfo.semmni; semid++) {
-			if ((sema[semid].sem_perm.mode & SEM_ALLOC) == 0)
-				break;
-		}
-		if (semid == seminfo.semmni) {
-			DPRINTF(("no more semid_ds's available\n"));
-			error = ENOSPC;
-			goto done2;
-		}
-		DPRINTF(("semid %d is available\n", semid));
-		sema[semid].sem_perm.key = key;
-#ifdef __CYGWIN__
-		sema[semid].sem_perm.cuid = td->ipcblk->uid;
-		sema[semid].sem_perm.uid = td->ipcblk->uid;
-		sema[semid].sem_perm.cgid = td->ipcblk->gid;
-		sema[semid].sem_perm.gid = td->ipcblk->gid;
-#else
-		sema[semid].sem_perm.cuid = cred->cr_uid;
-		sema[semid].sem_perm.uid = cred->cr_uid;
-		sema[semid].sem_perm.cgid = cred->cr_gid;
-		sema[semid].sem_perm.gid = cred->cr_gid;
-#endif
-		sema[semid].sem_perm.mode = (semflg & 0777) | SEM_ALLOC;
-		sema[semid].sem_perm.seq =
-		    (sema[semid].sem_perm.seq + 1) & 0x7fff;
-		sema[semid].sem_nsems = nsems;
-		sema[semid].sem_otime = 0;
-		sema[semid].sem_ctime = time (NULL);
-		sema[semid].sem_base = &sem[semtot];
-		semtot += nsems;
-		semtots++;
-		bzero(sema[semid].sem_base,
-		    sizeof(sema[semid].sem_base[0])*nsems);
-		DPRINTF(("sembase = 0x%x, next = 0x%x\n", sema[semid].sem_base,
-		    &sem[semtot]));
-	} else {
-		DPRINTF(("didn't find it and wasn't asked to create it\n"));
-		error = ENOENT;
-		goto done2;
-	}
-
-found:
-	td->td_retval[0] = IXSEQ_TO_IPCID(semid, sema[semid].sem_perm);
-done2:
-#ifdef __CYGWIN__
-	if (!error)
-		ipcexit_creat_hookthread (td);
-#endif
-	mtx_unlock(&Giant);
-	return (error);
-}
-
-#ifndef _SYS_SYSPROTO_H_
-struct semop_args {
-	int	semid;
-	struct	sembuf *sops;
-	size_t	nsops;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-semop(struct thread *td, struct semop_args *uap)
-{
-	int semid = uap->semid;
-	size_t nsops = uap->nsops;
-	struct sembuf *sops;
-	struct semid_ds *semaptr;
-	struct sembuf *sopptr = 0;
-	struct sem *semptr = 0;
-	struct sem_undo *suptr;
-	struct mtx *sema_mtxp;
-	size_t i, j, k;
-	int error;
-	int do_wakeup, do_undos;
-
-	DPRINTF(("call to semop(%d, 0x%x, %u)\n", semid, uap->sops, nsops));
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-
-	semid = IPCID_TO_IX(semid);	/* Convert back to zero origin */
-
-	if (semid < 0 || semid >= seminfo.semmni)
-		return (EINVAL);
-
-	/* Allocate memory for sem_ops */
-	if (nsops > (unsigned long) seminfo.semopm) {
-		DPRINTF(("too many sops (max=%d, nsops=%d)\n", seminfo.semopm,
-		    nsops));
-		return (E2BIG);
-	}
-	sops = (struct sembuf *) sys_malloc(nsops * sizeof(sops[0]), M_SEM, M_WAITOK);
-	if ((error = copyin(uap->sops, sops, nsops * sizeof(sops[0]))) != 0) {
-		DPRINTF(("error = %d from copyin(%08x, %08x, %d)\n", error,
-		    uap->sops, sops, nsops * sizeof(sops[0])));
-		sys_free(sops, M_SEM);
-		return (error);
-	}
-
-	semaptr = &sema[semid];
-	sema_mtxp = &sema_mtx[semid];
-	mtx_lock(sema_mtxp);
-	if ((semaptr->sem_perm.mode & SEM_ALLOC) == 0) {
-		error = EINVAL;
-		goto done2;
-	}
-	if (semaptr->sem_perm.seq != IPCID_TO_SEQ(uap->semid)) {
-		error = EINVAL;
-		goto done2;
-	}
-	/*
-	 * Initial pass thru sops to see what permissions are needed.
-	 * Also perform any checks that don't need repeating on each
-	 * attempt to satisfy the request vector.
-	 */
-	j = 0;		/* permission needed */
-	do_undos = 0;
-	for (i = 0; i < nsops; i++) {
-		sopptr = &sops[i];
-		if (sopptr->sem_num >= semaptr->sem_nsems) {
-			error = EFBIG;
-			goto done2;
-		}
-		if (sopptr->sem_flg & SEM_UNDO && sopptr->sem_op != 0)
-			do_undos = 1;
-		j |= (sopptr->sem_op == 0) ? SEM_R : SEM_A;
-	}
-
-	if ((error = ipcperm(td, &semaptr->sem_perm, j))) {
-		DPRINTF(("error = %d from ipaccess\n", error));
-		goto done2;
-	}
-
-	/*
-	 * Loop trying to satisfy the vector of requests.
-	 * If we reach a point where we must wait, any requests already
-	 * performed are rolled back and we go to sleep until some other
-	 * process wakes us up.  At this point, we start all over again.
-	 *
-	 * This ensures that from the perspective of other tasks, a set
-	 * of requests is atomic (never partially satisfied).
-	 */
-	for (;;) {
-		do_wakeup = 0;
-		error = 0;	/* error return if necessary */
-
-		for (i = 0; i < nsops; i++) {
-			sopptr = &sops[i];
-			semptr = &semaptr->sem_base[sopptr->sem_num];
-
-			DPRINTF((
-			    "semop:  semaptr=%x, sem_base=%x, "
-			    "semptr=%x, sem[%d]=%d : op=%d, flag=%s\n",
-			    semaptr, semaptr->sem_base, semptr,
-			    sopptr->sem_num, semptr->semval, sopptr->sem_op,
-			    (sopptr->sem_flg & IPC_NOWAIT) ?
-			    "nowait" : "wait"));
-
-			if (sopptr->sem_op < 0) {
-				if (semptr->semval + sopptr->sem_op < 0) {
-					DPRINTF(("semop:  can't do it now\n"));
-					break;
-				} else {
-					semptr->semval += sopptr->sem_op;
-					if (semptr->semval == 0 &&
-					    semptr->semzcnt > 0)
-						do_wakeup = 1;
-				}
-			} else if (sopptr->sem_op == 0) {
-				if (semptr->semval != 0) {
-					DPRINTF(("semop:  not zero now\n"));
-					break;
-				}
-			} else if (semptr->semval + sopptr->sem_op >
-			    seminfo.semvmx) {
-				error = ERANGE;
-				break;
-			} else {
-				if (semptr->semncnt > 0)
-					do_wakeup = 1;
-				semptr->semval += sopptr->sem_op;
-			}
-		}
-
-		/*
-		 * Did we get through the entire vector?
-		 */
-		if (i >= nsops)
-			goto done;
-
-		/*
-		 * No ... rollback anything that we've already done
-		 */
-		DPRINTF(("semop:  rollback 0 through %d\n", i-1));
-		for (j = 0; j < i; j++)
-			semaptr->sem_base[sops[j].sem_num].semval -=
-			    sops[j].sem_op;
-
-		/* If we detected an error, return it */
-		if (error != 0)
-			goto done2;
-
-		/*
-		 * If the request that we couldn't satisfy has the
-		 * NOWAIT flag set then return with EAGAIN.
-		 */
-		if (sopptr->sem_flg & IPC_NOWAIT) {
-			error = EAGAIN;
-			goto done2;
-		}
-
-		if (sopptr->sem_op == 0)
-			semptr->semzcnt++;
-		else
-			semptr->semncnt++;
-
-		DPRINTF(("semop:  good night!\n"));
-		error = msleep(semaptr, sema_mtxp, (PZERO - 4) | PCATCH,
-		    "semwait", 0);
-		DPRINTF(("semop:  good morning (error=%d)!\n", error));
-
-		if (error != 0) {
-#ifdef __CYGWIN__
-		    if (error != EIDRM)
-#endif /* __CYGWIN__ */
-			error = EINTR;
-			goto done2;
-		}
-		DPRINTF(("semop:  good morning!\n"));
-
-		/*
-		 * Make sure that the semaphore still exists
-		 */
-		if ((semaptr->sem_perm.mode & SEM_ALLOC) == 0 ||
-		    semaptr->sem_perm.seq != IPCID_TO_SEQ(uap->semid)) {
-			error = EIDRM;
-			goto done2;
-		}
-
-		/*
-		 * The semaphore is still alive.  Readjust the count of
-		 * waiting processes.
-		 */
-		if (sopptr->sem_op == 0)
-			semptr->semzcnt--;
-		else
-			semptr->semncnt--;
-	}
-
-done:
-	/*
-	 * Process any SEM_UNDO requests.
-	 */
-	if (do_undos) {
-		SEMUNDO_LOCK();
-		suptr = NULL;
-		for (i = 0; i < nsops; i++) {
-			/*
-			 * We only need to deal with SEM_UNDO's for non-zero
-			 * op's.
-			 */
-			int adjval;
-
-			if ((sops[i].sem_flg & SEM_UNDO) == 0)
-				continue;
-			adjval = sops[i].sem_op;
-			if (adjval == 0)
-				continue;
-			error = semundo_adjust(td, &suptr, semid,
-			    sops[i].sem_num, -adjval);
-			if (error == 0)
-				continue;
-
-			/*
-			 * Oh-Oh!  We ran out of either sem_undo's or undo's.
-			 * Rollback the adjustments to this point and then
-			 * rollback the semaphore ups and down so we can return
-			 * with an error with all structures restored.  We
-			 * rollback the undo's in the exact reverse order that
-			 * we applied them.  This guarantees that we won't run
-			 * out of space as we roll things back out.
-			 */
-			for (j = 0; j < i; j++) {
-				k = i - j - 1;
-				if ((sops[k].sem_flg & SEM_UNDO) == 0)
-					continue;
-				adjval = sops[k].sem_op;
-				if (adjval == 0)
-					continue;
-				if (semundo_adjust(td, &suptr, semid,
-				    sops[k].sem_num, adjval) != 0)
-					panic("semop - can't undo undos");
-			}
-
-			for (j = 0; j < nsops; j++)
-				semaptr->sem_base[sops[j].sem_num].semval -=
-				    sops[j].sem_op;
-
-			DPRINTF(("error = %d from semundo_adjust\n", error));
-			SEMUNDO_UNLOCK();
-			goto done2;
-		} /* loop through the sops */
-		SEMUNDO_UNLOCK();
-	} /* if (do_undos) */
-
-	/* We're definitely done - set the sempid's and time */
-	for (i = 0; i < nsops; i++) {
-		sopptr = &sops[i];
-		semptr = &semaptr->sem_base[sopptr->sem_num];
-		semptr->sempid = td->td_proc->p_pid;
-	}
-	semaptr->sem_otime = time (NULL);
-
-	/*
-	 * Do a wakeup if any semaphore was up'd whilst something was
-	 * sleeping on it.
-	 */
-	if (do_wakeup) {
-		DPRINTF(("semop:  doing wakeup\n"));
-		wakeup(semaptr);
-		DPRINTF(("semop:  back from wakeup\n"));
-	}
-	DPRINTF(("semop:  done\n"));
-	td->td_retval[0] = 0;
-done2:
-	mtx_unlock(sema_mtxp);
-	sys_free(sops, M_SEM);
-	return (error);
-}
-
-/*
- * Go through the undo structures for this process and apply the adjustments to
- * semaphores.
- */
-void
-semexit_myhook(void *arg, struct proc *p)
-{
-	struct sem_undo *suptr;
-	struct sem_undo **supptr;
-
-#ifdef __CYGWIN__
-	/*
-	 * Search all mutexes, if some of them are still owned by the
-	 * leaving process.  If so, unlock them.
-	 */
-	if (sem_mtx.owner == p->winpid)
-		mtx_unlock(&sem_mtx);
-	for (int i = 0; i < seminfo.semmni; i++)
-		if (sema_mtx[i].owner == p->winpid)
-			mtx_unlock(&sema_mtx[i]);
-#endif /* __CYGWIN__ */
-
-	/*
-	 * Go through the chain of undo vectors looking for one
-	 * associated with this process.
-	 */
-	SEMUNDO_HOOKLOCK();
-	SLIST_FOREACH_PREVPTR(suptr, supptr, &semu_list, un_next) {
-		if (suptr->un_proc == p)
-			break;
-	}
-	SEMUNDO_UNLOCK();
-
-	if (suptr == NULL)
-		return;
-
-	DPRINTF(("proc @%08x has undo structure with %d entries\n", p,
-	    suptr->un_cnt));
-
-	/*
-	 * If there are any active undo elements then process them.
-	 */
-	if (suptr->un_cnt > 0) {
-		int ix;
-
-		for (ix = 0; ix < suptr->un_cnt; ix++) {
-			int semid = suptr->un_ent[ix].un_id;
-			int semnum = suptr->un_ent[ix].un_num;
-			int adjval = suptr->un_ent[ix].un_adjval;
-			struct semid_ds *semaptr;
-			struct mtx *sema_mtxp;
-
-			semaptr = &sema[semid];
-			sema_mtxp = &sema_mtx[semid];
-#ifdef __CYGWIN__
-			_mtx_lock(sema_mtxp, p->winpid, __FILE__, __LINE__);
-#else
-			mtx_lock(sema_mtxp);
-#endif
-			SEMUNDO_HOOKLOCK();
-			if ((semaptr->sem_perm.mode & SEM_ALLOC) == 0)
-				panic("semexit - semid not allocated");
-			if (semnum >= semaptr->sem_nsems)
-				panic("semexit - semnum out of range");
-
-			DPRINTF((
-			    "semexit:  %08x id=%d num=%d(adj=%d) ; sem=%d\n",
-			    suptr->un_proc, suptr->un_ent[ix].un_id,
-			    suptr->un_ent[ix].un_num,
-			    suptr->un_ent[ix].un_adjval,
-			    semaptr->sem_base[semnum].semval));
-
-			if (adjval < 0) {
-				if (semaptr->sem_base[semnum].semval < -adjval)
-					semaptr->sem_base[semnum].semval = 0;
-				else
-					semaptr->sem_base[semnum].semval +=
-					    adjval;
-			} else
-				semaptr->sem_base[semnum].semval += adjval;
-
-			wakeup(semaptr);
-			DPRINTF(("semexit:  back from wakeup\n"));
-			mtx_unlock(sema_mtxp);
-			SEMUNDO_UNLOCK();
-		}
-	}
-
-	/*
-	 * Deallocate the undo vector.
-	 */
-	DPRINTF(("removing vector\n"));
-	suptr->un_proc = NULL;
-	*supptr = SLIST_NEXT(suptr, un_next);
-}
-
-#ifndef __CYGWIN__
-static int
-sysctl_sema(SYSCTL_HANDLER_ARGS)
-{
-
-	return (SYSCTL_OUT(req, sema,
-	    sizeof(struct semid_ds) * seminfo.semmni));
-}
-#endif /* __CYGWIN__ */
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/sysv_shm.cc b/winsup/cygserver/sysv_shm.cc
deleted file mode 100644
index 70ed1a3d4..000000000
--- a/winsup/cygserver/sysv_shm.cc
+++ /dev/null
@@ -1,1025 +0,0 @@
-/*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
-/*
- * Copyright (c) 1994 Adam Glass and Charles Hannum.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Adam Glass and Charles
- *	Hannum.
- * 4. The names of the authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * This file is heavily changed to become part of Cygwin's cygserver.
- */
-
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-#include <sys/cdefs.h>
-#ifndef __FBSDID
-#define __FBSDID(s)	const char version[] = (s)
-#endif
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/kern/sysv_shm.c,v 1.89 2003/11/07 04:47:14 rwatson Exp $");
-
-#define _KERNEL 1
-#define __BSD_VISIBLE 1
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/shm.h>
-#include <malloc.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/sysproto.h>
-
-#include <errno.h>
-#include <time.h>
-#include <unistd.h>
-#include "cygserver.h"
-#include "process.h"
-#include "cygserver_ipc.h"
-
-#ifdef __CYGWIN__
-#ifndef PAGE_SIZE
-#define PAGE_SIZE (getpagesize ())
-#endif
-#ifndef PAGE_MASK
-#define PAGE_MASK (PAGE_SIZE - 1)
-#endif
-#define btoc(b)	(((b) + PAGE_MASK) / PAGE_SIZE)
-#define round_page(p) ((((unsigned long)(p)) + PAGE_MASK) & ~(PAGE_MASK))
-#define ACCESSPERMS (0777)
-#define GIANT_REQUIRED mtx_assert(&Giant, MA_OWNED)
-#define KERN_SUCCESS 0
-#define VM_PROT_READ	PROT_READ
-#define VM_PROT_WRITE	PROT_WRITE
-#define VM_INHERIT_SHARE 0
-#define OBJT_PHYS  0
-#define OBJT_SWAP  0
-#define VM_PROT_DEFAULT 0
-#define VM_OBJECT_LOCK(a)
-#define vm_object_clear_flag(a,b)
-#define vm_object_set_flag(a,b)
-#define VM_OBJECT_UNLOCK(a)
-#define vm_object_reference(a)
-#define vm_map_remove(a,b,c) KERN_SUCCESS
-#define vm_map_find(a,b,c,d,e,f,g,h,i) KERN_SUCCESS
-#define vm_map_inherit(a,b,c,d)
-typedef int vm_prot_t;
-#endif /* __CYGWIN__ */
-
-#ifndef __CYGWIN__
-static MALLOC_DEFINE(M_SHM, "shm", "SVID compatible shared memory segments");
-
-struct oshmctl_args;
-static int oshmctl(struct thread *td, struct oshmctl_args *uap);
-#endif /* __CYGWIN__ */
-
-static int shmget_allocate_segment(struct thread *td,
-    struct shmget_args *uap, int mode);
-static int shmget_existing(struct thread *td, struct shmget_args *uap,
-    int mode, int segnum);
-
-#ifndef __CYGWIN__
-/* XXX casting to (sy_call_t *) is bogus, as usual. */
-static sy_call_t *shmcalls[] = {
-	(sy_call_t *)shmat, (sy_call_t *)oshmctl,
-	(sy_call_t *)shmdt, (sy_call_t *)shmget,
-	(sy_call_t *)shmctl
-};
-#endif /* __CYGWIN__ */
-
-#define	SHMSEG_FREE     	0x0200
-#define	SHMSEG_REMOVED  	0x0400
-#define	SHMSEG_ALLOCATED	0x0800
-#define	SHMSEG_WANTED		0x1000
-
-static int shm_last_free, shm_nused, shm_committed, shmalloced, shm_nattch;
-static struct shmid_ds	*shmsegs;
-
-struct shm_handle {
-	/* vm_offset_t kva; */
-	vm_object_t shm_object;
-};
-
-struct shmmap_state {
-	vm_offset_t va;
-	int shmid;
-};
-
-static void shm_deallocate_segment(struct shmid_ds *);
-static int shm_find_segment_by_key(key_t);
-static struct shmid_ds *shm_find_segment_by_shmid(int);
-static struct shmid_ds *shm_find_segment_by_shmidx(int);
-static int shm_delete_mapping(struct vmspace *vm, struct shmmap_state *);
-static void shmrealloc(void);
-
-/*
- * Tuneable values.
- */
-#ifndef SHMMAXPGS
-#define	SHMMAXPGS	8192	/* Note: sysv shared memory is swap backed. */
-#endif
-#ifndef SHMMAX
-#define	SHMMAX	(SHMMAXPGS*PAGE_SIZE)
-#endif
-#ifndef SHMMIN
-#define	SHMMIN	1
-#endif
-#ifndef SHMMNI
-#define	SHMMNI	192
-#endif
-#ifndef SHMSEG
-#define	SHMSEG	128
-#endif
-#ifndef SHMALL
-#define	SHMALL	(SHMMAXPGS)
-#endif
-
-struct	shminfo shminfo = {
-	SHMMAX,
-	SHMMIN,
-	SHMMNI,
-	SHMSEG,
-	SHMALL
-};
-
-#ifndef __CYGWIN__
-static int shm_use_phys;
-#else
-static long shm_use_phys;
-static long shm_allow_removed;
-#endif /* __CYGWIN__ */
-
-#ifndef __CYGWIN__
-struct shm_info shm_info;
-#endif /* __CYGWIN__ */
-
-#ifndef __CYGWIN__
-SYSCTL_DECL(_kern_ipc);
-SYSCTL_INT(_kern_ipc, OID_AUTO, shmmax, CTLFLAG_RW, &shminfo.shmmax, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, shmmin, CTLFLAG_RW, &shminfo.shmmin, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, shmmni, CTLFLAG_RDTUN, &shminfo.shmmni, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, shmseg, CTLFLAG_RDTUN, &shminfo.shmseg, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, shmall, CTLFLAG_RW, &shminfo.shmall, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, shm_use_phys, CTLFLAG_RW,
-    &shm_use_phys, 0, "");
-SYSCTL_INT(_kern_ipc, OID_AUTO, shm_allow_removed, CTLFLAG_RW,
-    &shm_allow_removed, 0, "");
-SYSCTL_PROC(_kern_ipc, OID_AUTO, shmsegs, CTLFLAG_RD,
-    NULL, 0, sysctl_shmsegs, "", "");
-#endif /* __CYGWIN__ */
-
-static int
-shm_find_segment_by_key(key_t key)
-{
-	int i;
-
-	for (i = 0; i < shmalloced; i++)
-		if ((shmsegs[i].shm_perm.mode & SHMSEG_ALLOCATED) &&
-		    shmsegs[i].shm_perm.key == key)
-			return (i);
-	return (-1);
-}
-
-static struct shmid_ds *
-shm_find_segment_by_shmid(int shmid)
-{
-	int segnum;
-	struct shmid_ds *shmseg;
-
-	segnum = IPCID_TO_IX(shmid);
-	if (segnum < 0 || segnum >= shmalloced)
-		return (NULL);
-	shmseg = &shmsegs[segnum];
-	if ((shmseg->shm_perm.mode & SHMSEG_ALLOCATED) == 0 ||
-	    (!shm_allow_removed &&
-	     (shmseg->shm_perm.mode & SHMSEG_REMOVED) != 0) ||
-	    shmseg->shm_perm.seq != IPCID_TO_SEQ(shmid))
-		return (NULL);
-	return (shmseg);
-}
-
-static struct shmid_ds *
-shm_find_segment_by_shmidx(int segnum)
-{
-	struct shmid_ds *shmseg;
-
-	if (segnum < 0 || segnum >= shmalloced)
-		return (NULL);
-	shmseg = &shmsegs[segnum];
-	if ((shmseg->shm_perm.mode & SHMSEG_ALLOCATED) == 0 ||
-	    (!shm_allow_removed &&
-	     (shmseg->shm_perm.mode & SHMSEG_REMOVED) != 0))
-		return (NULL);
-	return (shmseg);
-}
-
-static void
-shm_deallocate_segment(struct shmid_ds *shmseg)
-{
-	struct shm_handle *shm_handle;
-	size_t size;
-
-	GIANT_REQUIRED;
-
-	shm_handle = shmseg->shm_internal;
-	vm_object_deallocate(shm_handle->shm_object);
-	sys_free(shm_handle, M_SHM);
-	shmseg->shm_internal = NULL;
-	size = round_page(shmseg->shm_segsz);
-	shm_committed -= btoc(size);
-	shm_nused--;
-	shmseg->shm_perm.mode = SHMSEG_FREE;
-}
-
-static int
-shm_delete_mapping(struct vmspace *vm, struct shmmap_state *shmmap_s)
-{
-	struct shmid_ds *shmseg;
-	int segnum, result;
-	size_t size;
-
-	GIANT_REQUIRED;
-
-	segnum = IPCID_TO_IX(shmmap_s->shmid);
-	shmseg = &shmsegs[segnum];
-	size = round_page(shmseg->shm_segsz);
-	result = vm_map_remove(&vm->vm_map, shmmap_s->va, shmmap_s->va + size);
-	if (result != KERN_SUCCESS)
-		return (EINVAL);
-	shmmap_s->shmid = -1;
-	shmseg->shm_dtime = time (NULL);
-	--shm_nattch;
-	if ((--shmseg->shm_nattch <= 0) &&
-	    (shmseg->shm_perm.mode & SHMSEG_REMOVED)) {
-		shm_deallocate_segment(shmseg);
-		shm_last_free = segnum;
-	}
-	return (0);
-}
-
-#ifndef _SYS_SYSPROTO_H_
-struct shmdt_args {
-	const void *shmaddr;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-shmdt(struct thread *td, struct shmdt_args *uap)
-{
-	struct proc *p = td->td_proc;
-	struct shmmap_state *shmmap_s;
-	int i;
-	int error = 0;
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-	mtx_lock(&Giant);
-	shmmap_s = p->p_vmspace->vm_shm;
- 	if (shmmap_s == NULL) {
-		error = EINVAL;
-		goto done2;
-	}
-	for (i = 0; i < shminfo.shmseg; i++, shmmap_s++) {
-		if (shmmap_s->shmid != -1 &&
-		    shmmap_s->va == (vm_offset_t)uap->shmaddr) {
-			break;
-		}
-	}
-	if (i == shminfo.shmseg) {
-		error = EINVAL;
-		goto done2;
-	}
-	error = shm_delete_mapping(p->p_vmspace, shmmap_s);
-done2:
-	mtx_unlock(&Giant);
-	return (error);
-}
-
-#ifndef _SYS_SYSPROTO_H_
-struct shmat_args {
-	int shmid;
-	const void *shmaddr;
-	int shmflg;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-kern_shmat(struct thread *td, int shmid, const void *shmaddr, int shmflg)
-{
-	struct proc *p = td->td_proc;
-	int i, flags;
-	struct shmid_ds *shmseg;
-	struct shmmap_state *shmmap_s = NULL;
-	struct shm_handle *shm_handle;
-	vm_offset_t attach_va;
-	vm_prot_t prot;
-	vm_size_t size;
-	int rv;
-	int error = 0;
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-	mtx_lock(&Giant);
-	shmmap_s = p->p_vmspace->vm_shm;
-	if (shmmap_s == NULL) {
-		size = shminfo.shmseg * sizeof(struct shmmap_state);
-		shmmap_s = (struct shmmap_state *) sys_malloc(size, M_SHM, M_WAITOK);
-		for (i = 0; i < shminfo.shmseg; i++)
-			shmmap_s[i].shmid = -1;
-		p->p_vmspace->vm_shm = shmmap_s;
-	}
-	shmseg = shm_find_segment_by_shmid(shmid);
-	if (shmseg == NULL) {
-		error = EINVAL;
-		goto done2;
-	}
-	error = ipcperm(td, &shmseg->shm_perm,
-	    (shmflg & SHM_RDONLY) ? IPC_R : IPC_R|IPC_W);
-	if (error)
-		goto done2;
-	for (i = 0; i < shminfo.shmseg; i++) {
-		if (shmmap_s->shmid == -1)
-			break;
-		shmmap_s++;
-	}
-	if (i >= shminfo.shmseg) {
-		error = EMFILE;
-		goto done2;
-	}
-	size = round_page(shmseg->shm_segsz);
-#ifdef VM_PROT_READ_IS_EXEC
-	prot = VM_PROT_READ | VM_PROT_EXECUTE;
-#else
-	prot = VM_PROT_READ;
-#endif
-	if ((shmflg & SHM_RDONLY) == 0)
-		prot |= VM_PROT_WRITE;
-	flags = MAP_ANON | MAP_SHARED;
-	if (shmaddr) {
-		flags |= MAP_FIXED;
-		if (shmflg & SHM_RND) {
-			attach_va = (vm_offset_t)shmaddr & ~(SHMLBA-1);
-		} else if (((vm_offset_t)shmaddr & (SHMLBA-1)) == 0) {
-			attach_va = (vm_offset_t)shmaddr;
-		} else {
-			error = EINVAL;
-			goto done2;
-		}
-	} else {
-		/*
-		 * This is just a hint to vm_map_find() about where to
-		 * put it.
-		 */
-#ifdef __CYGWIN__
-		attach_va = 0;
-#else
-		attach_va = round_page((vm_offset_t)p->p_vmspace->vm_taddr
-		    + maxtsiz + maxdsiz);
-#endif
-	}
-
-	shm_handle = shmseg->shm_internal;
-	vm_object_reference(shm_handle->shm_object);
-	rv = vm_map_find(&p->p_vmspace->vm_map, shm_handle->shm_object,
-		0, &attach_va, size, (flags & MAP_FIXED)?0:1, prot, prot, 0);
-	if (rv != KERN_SUCCESS) {
-		error = ENOMEM;
-		goto done2;
-	}
-	vm_map_inherit(&p->p_vmspace->vm_map,
-		attach_va, attach_va + size, VM_INHERIT_SHARE);
-
-	shmmap_s->va = attach_va;
-	shmmap_s->shmid = shmid;
-	shmseg->shm_lpid = p->p_pid;
-	shmseg->shm_atime = time (NULL);
-	shmseg->shm_nattch++;
-	shm_nattch++;
-	td->td_retval[0] = attach_va;
-done2:
-	mtx_unlock(&Giant);
-	return (error);
-}
-
-int
-shmat(struct thread *td, struct shmat_args *uap)
-{
-	return kern_shmat(td, uap->shmid, uap->shmaddr, uap->shmflg);
-}
-
-#ifndef __CYGWIN__
-struct oshmid_ds {
-	struct	ipc_perm shm_perm;	/* operation perms */
-	int	shm_segsz;		/* size of segment (bytes) */
-	u_short	shm_cpid;		/* pid, creator */
-	u_short	shm_lpid;		/* pid, last operation */
-	short	shm_nattch;		/* no. of current attaches */
-	time_t	shm_atime;		/* last attach time */
-	time_t	shm_dtime;		/* last detach time */
-	time_t	shm_ctime;		/* last change time */
-	void	*shm_handle;		/* internal handle for shm segment */
-};
-
-struct oshmctl_args {
-	int shmid;
-	int cmd;
-	struct oshmid_ds *ubuf;
-};
-
-/*
- * MPSAFE
- */
-static int
-oshmctl(struct thread *td, struct oshmctl_args *uap)
-{
-#ifdef COMPAT_43
-	int error = 0;
-	struct shmid_ds *shmseg;
-	struct oshmid_ds outbuf;
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-	mtx_lock(&Giant);
-	shmseg = shm_find_segment_by_shmid(uap->shmid);
-	if (shmseg == NULL) {
-		error = EINVAL;
-		goto done2;
-	}
-	switch (uap->cmd) {
-	case IPC_STAT:
-		error = ipcperm(td, &shmseg->shm_perm, IPC_R);
-		if (error)
-			goto done2;
-		outbuf.shm_perm = shmseg->shm_perm;
-		outbuf.shm_segsz = shmseg->shm_segsz;
-		outbuf.shm_cpid = shmseg->shm_cpid;
-		outbuf.shm_lpid = shmseg->shm_lpid;
-		outbuf.shm_nattch = shmseg->shm_nattch;
-		outbuf.shm_atime = shmseg->shm_atime;
-		outbuf.shm_dtime = shmseg->shm_dtime;
-		outbuf.shm_ctime = shmseg->shm_ctime;
-		outbuf.shm_handle = shmseg->shm_internal;
-		error = copyout(&outbuf, uap->ubuf, sizeof(outbuf));
-		if (error)
-			goto done2;
-		break;
-	default:
-		/* XXX casting to (sy_call_t *) is bogus, as usual. */
-		error = ((sy_call_t *)shmctl)(td, uap);
-		break;
-	}
-done2:
-	mtx_unlock(&Giant);
-	return (error);
-#else
-	return (EINVAL);
-#endif
-}
-#endif /* __CYGWIN__ */
-
-#ifndef _SYS_SYSPROTO_H_
-struct shmctl_args {
-	int shmid;
-	int cmd;
-	struct shmid_ds *buf;
-};
-#endif
-
-/*
- * MPSAFE
- */
-int
-kern_shmctl(struct thread *td, int shmid, int cmd, void *buf, size_t *bufsz)
-{
-	int error = 0;
-	struct shmid_ds *shmseg;
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-
-	mtx_lock(&Giant);
-	switch (cmd) {
-	case IPC_INFO:
-		memcpy(buf, &shminfo, sizeof(shminfo));
-		if (bufsz)
-			*bufsz = sizeof(shminfo);
-		td->td_retval[0] = shmalloced;
-		goto done2;
-	case SHM_INFO: {
-		struct shm_info shm_info;
-		shm_info.used_ids = shm_nused;
-		shm_info.shm_tot = shm_committed * PAGE_SIZE;
-#ifdef __CYGWIN__
-		shm_info.shm_atts = shm_nattch;
-#else
-		shm_info.shm_rss = 0;	/*XXX where to get from ? */
-		shm_info.shm_swp = 0;	/*XXX where to get from ? */
-		shm_info.swap_attempts = 0;	/*XXX where to get from ? */
-		shm_info.swap_successes = 0;	/*XXX where to get from ? */
-#endif /* __CYGWIN__ */
-		memcpy(buf, &shm_info, sizeof(shm_info));
-		if (bufsz)
-			*bufsz = sizeof(shm_info);
-		td->td_retval[0] = shmalloced;
-		goto done2;
-	}
-	}
-	if (cmd == SHM_STAT)
-		shmseg = shm_find_segment_by_shmidx(shmid);
-	else
-		shmseg = shm_find_segment_by_shmid(shmid);
-	if (shmseg == NULL) {
-		error = EINVAL;
-		goto done2;
-	}
-	switch (cmd) {
-	case SHM_STAT:
-	case IPC_STAT:
-		error = ipcperm(td, &shmseg->shm_perm, IPC_R);
-		if (error)
-			goto done2;
-		memcpy(buf, shmseg, sizeof(struct shmid_ds));
-		if (bufsz)
-			*bufsz = sizeof(struct shmid_ds);
-		if (cmd == SHM_STAT)
-			td->td_retval[0] = IXSEQ_TO_IPCID(shmid, shmseg->shm_perm);
-		break;
-	case IPC_SET: {
-		struct shmid_ds *shmid;
-
-		shmid = (struct shmid_ds *)buf;
-		error = ipcperm(td, &shmseg->shm_perm, IPC_M);
-		if (error)
-			goto done2;
-		shmseg->shm_perm.uid = shmid->shm_perm.uid;
-		shmseg->shm_perm.gid = shmid->shm_perm.gid;
-		shmseg->shm_perm.mode =
-		    (shmseg->shm_perm.mode & ~ACCESSPERMS) |
-		    (shmid->shm_perm.mode & ACCESSPERMS);
-		shmseg->shm_ctime = time (NULL);
-		break;
-	}
-	case IPC_RMID:
-		error = ipcperm(td, &shmseg->shm_perm, IPC_M);
-		if (error)
-			goto done2;
-		shmseg->shm_perm.key = IPC_PRIVATE;
-		shmseg->shm_perm.mode |= SHMSEG_REMOVED;
-		if (shmseg->shm_nattch <= 0) {
-			shm_deallocate_segment(shmseg);
-			shm_last_free = IPCID_TO_IX(shmid);
-		}
-		break;
-#if 0
-	case SHM_LOCK:
-	case SHM_UNLOCK:
-#endif
-	default:
-		error = EINVAL;
-		break;
-	}
-done2:
-	mtx_unlock(&Giant);
-	return (error);
-}
-
-int
-shmctl(struct thread *td, struct shmctl_args *uap)
-{
-	int error = 0;
-	struct shmid_ds buf;
-	size_t bufsz;
-	
-	/* IPC_SET needs to copyin the buffer before calling kern_shmctl */
-	if (uap->cmd == IPC_SET) {
-		if ((error = copyin(uap->buf, &buf, sizeof(struct shmid_ds))))
-			goto done;
-	}
-#ifdef __CYGWIN__
-	if (uap->cmd == IPC_INFO && uap->shmid > 0) {
-		/* Can't use the default kern_shmctl interface. */
-		int shmid = uap->shmid;
-		if (shmid > shminfo.shmmni)
-			shmid = shminfo.shmmni;
-		error = copyout(shmsegs, uap->buf,
-				shmid * sizeof(struct shmid_ds));
-		td->td_retval[0] = error ? -1 : 0;
-		return (error);
-	}
-#endif /* __CYGWIN__ */
-	
-	error = kern_shmctl(td, uap->shmid, uap->cmd, (void *)&buf, &bufsz);
-	if (error)
-		goto done;
-	
-	/* Cases in which we need to copyout */
-	switch (uap->cmd) {
-	case IPC_INFO:
-	case SHM_INFO:
-	case SHM_STAT:
-	case IPC_STAT:
-		error = copyout(&buf, uap->buf, bufsz);
-		break;
-	}
-
-done:
-	if (error) {
-		/* Invalidate the return value */
-		td->td_retval[0] = -1;
-	}
-	return (error);
-}
-
-
-#ifndef _SYS_SYSPROTO_H_
-struct shmget_args {
-	key_t key;
-	size_t size;
-	int shmflg;
-};
-#endif
-
-static int
-shmget_existing(struct thread *td, struct shmget_args *uap, int mode, int segnum)
-{
-	struct shmid_ds *shmseg;
-	int error;
-
-	shmseg = &shmsegs[segnum];
-	if (shmseg->shm_perm.mode & SHMSEG_REMOVED) {
-		/*
-		 * This segment is in the process of being allocated.  Wait
-		 * until it's done, and look the key up again (in case the
-		 * allocation failed or it was freed).
-		 */
-		shmseg->shm_perm.mode |= SHMSEG_WANTED;
-		error = tsleep(shmseg, PLOCK | PCATCH, "shmget", 0);
-		if (error)
-			return (error);
-		return (EAGAIN);
-	}
-	if ((uap->shmflg & (IPC_CREAT | IPC_EXCL)) == (IPC_CREAT | IPC_EXCL))
-		return (EEXIST);
-	error = ipcperm(td, &shmseg->shm_perm, mode);
-	if (error)
-		return (error);
-	if (uap->size && uap->size > shmseg->shm_segsz)
-		return (EINVAL);
-	td->td_retval[0] = IXSEQ_TO_IPCID(segnum, shmseg->shm_perm);
-#ifdef __CYGWIN__
-	td->td_retval[1] =
-		vm_object_duplicate(td, shmseg->shm_internal->shm_object);
-#endif /* __CYGWIN__ */
-	return (0);
-}
-
-static int
-shmget_allocate_segment(struct thread *td, struct shmget_args *uap, int mode)
-{
-	int i, segnum, shmid, size;
-#ifndef __CYGWIN__
-	struct ucred *cred = td->td_ucred;
-#endif /* __CYGWIN__ */
-	struct shmid_ds *shmseg;
-	struct shm_handle *shm_handle;
-
-	GIANT_REQUIRED;
-
-	if (uap->size < (unsigned long) shminfo.shmmin ||
-	    uap->size > (unsigned long) shminfo.shmmax)
-		return (EINVAL);
-	if (shm_nused >= shminfo.shmmni) /* Any shmids left? */
-		return (ENOSPC);
-	size = round_page(uap->size);
-	if (shm_committed + btoc(size) > (unsigned long) shminfo.shmall)
-		return (ENOMEM);
-	if (shm_last_free < 0) {
-		shmrealloc();	/* Maybe expand the shmsegs[] array. */
-		for (i = 0; i < shmalloced; i++)
-			if (shmsegs[i].shm_perm.mode & SHMSEG_FREE)
-				break;
-		if (i == shmalloced)
-			return (ENOSPC);
-		segnum = i;
-	} else  {
-		segnum = shm_last_free;
-		shm_last_free = -1;
-	}
-	shmseg = &shmsegs[segnum];
-	/*
-	 * In case we sleep in malloc(), mark the segment present but deleted
-	 * so that noone else tries to create the same key.
-	 */
-	shmseg->shm_perm.mode = SHMSEG_ALLOCATED | SHMSEG_REMOVED;
-	shmseg->shm_perm.key = uap->key;
-	shmseg->shm_perm.seq = (shmseg->shm_perm.seq + 1) & 0x7fff;
-	shm_handle = (struct shm_handle *)
-	    sys_malloc(sizeof(struct shm_handle), M_SHM, M_WAITOK);
-	shmid = IXSEQ_TO_IPCID(segnum, shmseg->shm_perm);
-	
-	/*
-	 * We make sure that we have allocated a pager before we need
-	 * to.
-	 */
-	if (shm_use_phys) {
-		shm_handle->shm_object =
-		    vm_pager_allocate(OBJT_PHYS, 0, size, VM_PROT_DEFAULT, 0);
-	} else {
-		shm_handle->shm_object =
-		    vm_pager_allocate(OBJT_SWAP, 0, size, VM_PROT_DEFAULT, 0);
-	}
-	VM_OBJECT_LOCK(shm_handle->shm_object);
-	vm_object_clear_flag(shm_handle->shm_object, OBJ_ONEMAPPING);
-	vm_object_set_flag(shm_handle->shm_object, OBJ_NOSPLIT);
-	VM_OBJECT_UNLOCK(shm_handle->shm_object);
-
-	shmseg->shm_internal = shm_handle;
-#ifdef __CYGWIN__
-	shmseg->shm_perm.cuid = shmseg->shm_perm.uid = td->ipcblk->uid;
-	shmseg->shm_perm.cgid = shmseg->shm_perm.gid = td->ipcblk->gid;
-#else
-	shmseg->shm_perm.cuid = shmseg->shm_perm.uid = cred->cr_uid;
-	shmseg->shm_perm.cgid = shmseg->shm_perm.gid = cred->cr_gid;
-#endif /* __CYGWIN__ */
-	shmseg->shm_perm.mode = (shmseg->shm_perm.mode & SHMSEG_WANTED) |
-	    (mode & ACCESSPERMS) | SHMSEG_ALLOCATED;
-	shmseg->shm_segsz = uap->size;
-	shmseg->shm_cpid = td->td_proc->p_pid;
-	shmseg->shm_lpid = shmseg->shm_nattch = 0;
-	shmseg->shm_atime = shmseg->shm_dtime = 0;
-	shmseg->shm_ctime = time (NULL);
-	shm_committed += btoc(size);
-	shm_nused++;
-	if (shmseg->shm_perm.mode & SHMSEG_WANTED) {
-		/*
-		 * Somebody else wanted this key while we were asleep.  Wake
-		 * them up now.
-		 */
-		shmseg->shm_perm.mode &= ~SHMSEG_WANTED;
-		wakeup(shmseg);
-	}
-	td->td_retval[0] = shmid;
-#ifdef __CYGWIN__
-	td->td_retval[1] =
-		vm_object_duplicate(td, shmseg->shm_internal->shm_object);
-#endif /* __CYGWIN__ */
-	return (0);
-}
-
-/*
- * MPSAFE
- */
-int
-shmget(struct thread *td, struct shmget_args *uap)
-{
-	int segnum, mode;
-	int error;
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-	mtx_lock(&Giant);
-	mode = uap->shmflg & ACCESSPERMS;
-	if (uap->key != IPC_PRIVATE) {
-	again:
-		segnum = shm_find_segment_by_key(uap->key);
-		if (segnum >= 0) {
-			error = shmget_existing(td, uap, mode, segnum);
-			if (error == EAGAIN)
-				goto again;
-			goto done2;
-		}
-		if ((uap->shmflg & IPC_CREAT) == 0) {
-			error = ENOENT;
-			goto done2;
-		}
-	}
-	error = shmget_allocate_segment(td, uap, mode);
-done2:
-#ifdef __CYGWIN__
-	if (!error)
-		ipcexit_creat_hookthread (td);
-#endif
-	mtx_unlock(&Giant);
-	return (error);
-}
-
-#ifndef __CYGWIN__
-/*
- * MPSAFE
- */
-int
-shmsys(td, uap)
-	struct thread *td;
-	/* XXX actually varargs. */
-	struct shmsys_args /* {
-		int	which;
-		int	a2;
-		int	a3;
-		int	a4;
-	} */ *uap;
-{
-	int error;
-
-	if (!jail_sysvipc_allowed && jailed(td->td_ucred))
-		return (ENOSYS);
-	if (uap->which < 0 ||
-	    uap->which >= sizeof(shmcalls)/sizeof(shmcalls[0]))
-		return (EINVAL);
-	mtx_lock(&Giant);
-	error = (*shmcalls[uap->which])(td, &uap->a2);
-	mtx_unlock(&Giant);
-	return (error);
-}
-#endif /* __CYGWIN__ */
-
-static void
-shmfork_myhook(struct proc *p1, struct proc *p2)
-{
-	struct shmmap_state *shmmap_s;
-	size_t size;
-	int i;
-
-	size = shminfo.shmseg * sizeof(struct shmmap_state);
-	shmmap_s = (struct shmmap_state *) sys_malloc(size, M_SHM, M_WAITOK);
-	bcopy(p1->p_vmspace->vm_shm, shmmap_s, size);
-	p2->p_vmspace->vm_shm = shmmap_s;
-	for (i = 0; i < shminfo.shmseg; i++, shmmap_s++)
-		if (shmmap_s->shmid != -1) {
-			shm_nattch++;
-			shmsegs[IPCID_TO_IX(shmmap_s->shmid)].shm_nattch++;
-		}
-}
-
-#ifdef __CYGWIN__
-int cygwin_shmfork_myhook (struct thread *td, struct proc *parent)
-{
-  ipcexit_creat_hookthread (td);
-  ipc_p_vmspace (td->ipcblk);
-  ipc_p_vmspace (parent);
-  shmfork_myhook (parent, td->ipcblk);
-  return 0;
-}
-#endif
-
-void
-shmexit_myhook(struct vmspace *vm)
-{
-	struct shmmap_state *base, *shm;
-	int i;
-
-	GIANT_REQUIRED;
-
-	if ((base = vm->vm_shm) != NULL) {
-		vm->vm_shm = NULL;
-		for (i = 0, shm = base; i < shminfo.shmseg; i++, shm++) {
-			if (shm->shmid != -1)
-				shm_delete_mapping(vm, shm);
-		}
-		sys_free(base, M_SHM);
-	}
-}
-
-static void
-shmrealloc(void)
-{
-	int i;
-	struct shmid_ds *newsegs;
-
-	if (shmalloced >= shminfo.shmmni)
-		return;
-
-	newsegs = (struct shmid_ds *) sys_malloc(shminfo.shmmni * sizeof(*newsegs), M_SHM, M_WAITOK);
-	if (newsegs == NULL)
-		return;
-	for (i = 0; i < shmalloced; i++)
-		bcopy(&shmsegs[i], &newsegs[i], sizeof(newsegs[0]));
-	for (; i < shminfo.shmmni; i++) {
-		shmsegs[i].shm_perm.mode = SHMSEG_FREE;
-		shmsegs[i].shm_perm.seq = 0;
-	}
-	sys_free(shmsegs, M_SHM);
-	shmsegs = newsegs;
-	shmalloced = shminfo.shmmni;
-}
-
-void
-shminit(void)
-{
-	int i;
-
-	TUNABLE_INT_FETCH("kern.ipc.shmmaxpgs", &shminfo.shmall);
-	for (i = PAGE_SIZE; i > 0; i--) {
-		shminfo.shmmax = shminfo.shmall * PAGE_SIZE;
-		if (shminfo.shmmax >= shminfo.shmall)
-			break;
-	}
-	TUNABLE_INT_FETCH("kern.ipc.shmmin", &shminfo.shmmin);
-	TUNABLE_INT_FETCH("kern.ipc.shmmni", &shminfo.shmmni);
-	TUNABLE_INT_FETCH("kern.ipc.shmseg", &shminfo.shmseg);
-	TUNABLE_INT_FETCH("kern.ipc.shm_use_phys", &shm_use_phys);
-
-	shmalloced = shminfo.shmmni;
-	shmsegs = (struct shmid_ds *) sys_malloc(shmalloced * sizeof(shmsegs[0]), M_SHM, M_WAITOK);
-	if (shmsegs == NULL)
-		panic("cannot allocate initial memory for sysvshm");
-	for (i = 0; i < shmalloced; i++) {
-		shmsegs[i].shm_perm.mode = SHMSEG_FREE;
-		shmsegs[i].shm_perm.seq = 0;
-	}
-	shm_last_free = 0;
-	shm_nused = 0;
-	shm_committed = 0;
-#ifndef __CYGWIN__
-	shmexit_hook = &shmexit_myhook;
-	shmfork_hook = &shmfork_myhook;
-#endif /* __CYGWIN__ */
-}
-
-int
-shmunload(void)
-{
-
-	if (shm_nused > 0)
-		return (EBUSY);
-
-	sys_free(shmsegs, M_SHM);
-#ifndef __CYGWIN__
-	shmexit_hook = NULL;
-	shmfork_hook = NULL;
-#endif /* __CYGWIN__ */
-	return (0);
-}
-
-#ifndef __CYGWIN__
-static int
-sysctl_shmsegs(SYSCTL_HANDLER_ARGS)
-{
-
-	return (SYSCTL_OUT(req, shmsegs, shmalloced * sizeof(shmsegs[0])));
-}
-
-static int
-sysvshm_modload(struct module *module, int cmd, void *arg)
-{
-	int error = 0;
-
-	switch (cmd) {
-	case MOD_LOAD:
-		shminit();
-		break;
-	case MOD_UNLOAD:
-		error = shmunload();
-		break;
-	case MOD_SHUTDOWN:
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-	return (error);
-}
-
-static moduledata_t sysvshm_mod = {
-	"sysvshm",
-	&sysvshm_modload,
-	NULL
-};
-
-SYSCALL_MODULE_HELPER(shmsys);
-SYSCALL_MODULE_HELPER(shmat);
-SYSCALL_MODULE_HELPER(shmctl);
-SYSCALL_MODULE_HELPER(shmdt);
-SYSCALL_MODULE_HELPER(shmget);
-
-DECLARE_MODULE(sysvshm, sysvshm_mod,
-	SI_SUB_SYSV_SHM, SI_ORDER_FIRST);
-MODULE_VERSION(sysvshm, 1);
-#endif /* __CYGWIN__ */
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/threaded_queue.cc b/winsup/cygserver/threaded_queue.cc
deleted file mode 100644
index 53dd6fa11..000000000
--- a/winsup/cygserver/threaded_queue.cc
+++ /dev/null
@@ -1,410 +0,0 @@
-/* threaded_queue.cc
-
-   Copyright 2001, 2002, 2003 Red Hat Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include "threaded_queue.h"
-
-/*****************************************************************************/
-
-/* queue_request */
-
-queue_request::~queue_request ()
-{}
-
-/*****************************************************************************/
-
-/* threaded_queue */
-
-threaded_queue::threaded_queue (const size_t initial_workers)
-  : _workers_count (0),
-    _running (false),
-    _submitters_head (NULL),
-    _requests_count (0),
-    _requests_head (NULL),
-    _requests_sem (NULL)
-{
-  InitializeCriticalSection (&_queue_lock);
-
-  // This semaphore's count is the number of requests on the queue.
-  // The maximum count (129792) is calculated as MAXIMUM_WAIT_OBJECTS
-  // multiplied by max. threads per process (2028?), which is (a few)
-  // more requests than could ever be pending with the current design.
-
-  _requests_sem = CreateSemaphore (NULL,   // SECURITY_ATTRIBUTES
-				   0,	   // Initial count
-				   129792, // Maximum count
-				   NULL);  // Anonymous
-
-  if (!_requests_sem)
-    {
-      system_printf (("failed to create the request queue semaphore, "
-		      "error = %lu"),
-		     GetLastError ());
-      abort ();
-    }
-
-  create_workers (initial_workers);
-}
-
-threaded_queue::~threaded_queue ()
-{
-  if (_running)
-    stop ();
-
-  debug_printf ("deleting all pending queue requests");
-  queue_request *reqptr = _requests_head;
-  while (reqptr)
-    {
-      queue_request *const ptr = reqptr;
-      reqptr = reqptr->_next;
-      delete ptr;
-    }
-
-  DeleteCriticalSection (&_queue_lock);
-  if (_requests_sem)
-    (void) CloseHandle (_requests_sem);
-}
-
-/* FIXME: return success or failure rather than quitting */
-void
-threaded_queue::add_submission_loop (queue_submission_loop *const submitter)
-{
-  assert (this);
-  assert (submitter);
-  assert (submitter->_queue == this);
-  assert (!submitter->_next);
-
-  submitter->_next =
-    TInterlockedExchangePointer (&_submitters_head, submitter);
-
-  if (_running)
-    submitter->start ();
-}
-
-bool
-threaded_queue::start ()
-{
-  EnterCriticalSection (&_queue_lock);
-  const bool was_running = _running;
-  _running = true;
-  queue_submission_loop *loopptr = _submitters_head;
-  LeaveCriticalSection (&_queue_lock);
-
-  if (!was_running)
-    {
-      debug_printf ("starting all queue submission loops");
-
-      while (loopptr)
-	{
-	  queue_submission_loop *const ptr = loopptr;
-	  loopptr = loopptr->_next;
-	  ptr->start ();
-	}
-    }
-
-  return was_running;
-}
-
-bool
-threaded_queue::stop ()
-{
-  EnterCriticalSection (&_queue_lock);
-  const bool was_running = _running;
-  _running = false;
-  queue_submission_loop *loopptr = _submitters_head;
-  LeaveCriticalSection (&_queue_lock);
-
-  if (was_running)
-    {
-      debug_printf ("stopping all queue submission loops");
-      while (loopptr)
-	{
-	  queue_submission_loop *const ptr = loopptr;
-	  loopptr = loopptr->_next;
-	  ptr->stop ();
-	}
-
-      ReleaseSemaphore (_requests_sem, _workers_count, NULL);
-      while (_workers_count)
-	{
-	  debug_printf (("waiting for worker threads to terminate: "
-			 "%lu still running"),
-			_workers_count);
-	  Sleep (1000);
-	}
-      debug_printf ("all worker threads have terminated");
-    }
-
-  return was_running;
-}
-
-/* FIXME: return success or failure */
-void
-threaded_queue::add (queue_request *const therequest)
-{
-  assert (this);
-  assert (therequest);
-  assert (!therequest->_next);
-
-  if (!_workers_count)
-    {
-      system_printf ("warning: no worker threads to handle request!");
-      // FIXME: And then what?
-    }
-
-  EnterCriticalSection (&_queue_lock);
-  if (!_requests_head)
-    _requests_head = therequest;
-  else
-    {
-      /* Add to the queue end. */
-      queue_request *reqptr = _requests_head;
-      for (; reqptr->_next; reqptr = reqptr->_next)
-	{}
-      assert (reqptr);
-      assert (!reqptr->_next);
-      reqptr->_next = therequest;
-    }
-
-  _requests_count += 1;
-  assert (_requests_count > 0);
-  LeaveCriticalSection (&_queue_lock);
-
-  (void) ReleaseSemaphore (_requests_sem, 1, NULL);
-}
-
-/*static*/ DWORD WINAPI
-threaded_queue::start_routine (const LPVOID lpParam)
-{
-  class threaded_queue *const queue = (class threaded_queue *) lpParam;
-  assert (queue);
-
-  queue->worker_loop ();
-
-  const long count = InterlockedDecrement (&queue->_workers_count);
-  assert (count >= 0);
-
-  if (queue->_running)
-    debug_printf ("worker loop has exited; thread about to terminate");
-
-  return 0;
-}
-
-/* Called from the constructor: so no need to be thread-safe until the
- * worker threads start to be created; thus the interlocked increment
- * of the `_workers_count' field.
- */
-
-void
-threaded_queue::create_workers (const size_t initial_workers)
-{
-  assert (initial_workers > 0);
-
-  for (unsigned int i = 0; i != initial_workers; i++)
-    {
-      const long count = InterlockedIncrement (&_workers_count);
-      assert (count > 0);
-
-      DWORD tid;
-      const HANDLE hThread =
-	CreateThread (NULL, 0, start_routine, this, 0, &tid);
-
-      if (!hThread)
-	{
-	  system_printf ("failed to create thread, error = %lu",
-			 GetLastError ());
-	  abort ();
-	}
-
-      (void) CloseHandle (hThread);
-    }
-}
-
-void
-threaded_queue::worker_loop ()
-{
-  while (true)
-    {
-      const DWORD rc = WaitForSingleObject (_requests_sem, INFINITE);
-      if (rc == WAIT_FAILED)
-	{
-	  system_printf ("wait for request semaphore failed, error = %lu",
-			 GetLastError ());
-	  return;
-	}
-      assert (rc == WAIT_OBJECT_0);
-
-      EnterCriticalSection (&_queue_lock);
-      if (!_running)
-	{
-	  LeaveCriticalSection (&_queue_lock);
-	  return;
-	}
-
-      assert (_requests_head);
-      queue_request *const reqptr = _requests_head;
-      _requests_head = reqptr->_next;
-
-      _requests_count -= 1;
-      assert (_requests_count >= 0);
-      LeaveCriticalSection (&_queue_lock);
-
-      assert (reqptr);
-      reqptr->process ();
-      delete reqptr;
-    }
-}
-
-/*****************************************************************************/
-
-/* queue_submission_loop */
-
-queue_submission_loop::queue_submission_loop (threaded_queue *const queue,
-					      const bool ninterruptible)
-  : _running (false),
-    _interrupt_event (NULL),
-    _queue (queue),
-    _interruptible (ninterruptible),
-    _hThread (NULL),
-    _tid (0),
-    _next (NULL)
-{
-  if (_interruptible)
-    {
-      // verbose: debug_printf ("creating an interruptible processing thread");
-
-      _interrupt_event = CreateEvent (NULL,  // SECURITY_ATTRIBUTES
-				      FALSE, // Auto-reset
-				      FALSE, // Initially non-signalled
-				      NULL); // Anonymous
-
-      if (!_interrupt_event)
-	{
-	  system_printf ("failed to create interrupt event, error = %lu",
-			 GetLastError ());
-	  abort ();
-	}
-    }
-}
-
-queue_submission_loop::~queue_submission_loop ()
-{
-  if (_running)
-    stop ();
-  if (_interrupt_event)
-    (void) CloseHandle (_interrupt_event);
-  if (_hThread)
-    (void) CloseHandle (_hThread);
-}
-
-bool
-queue_submission_loop::start ()
-{
-  assert (this);
-  assert (!_hThread);
-
-  const bool was_running = _running;
-
-  if (!was_running)
-    {
-      _running = true;
-
-      _hThread = CreateThread (NULL, 0, start_routine, this, 0, &_tid);
-      if (!_hThread)
-	{
-	  system_printf ("failed to create thread, error = %lu",
-			 GetLastError ());
-	  abort ();
-	}
-    }
-
-  return was_running;
-}
-
-bool
-queue_submission_loop::stop ()
-{
-  assert (this);
-  assert (_hThread && _hThread != INVALID_HANDLE_VALUE);
-
-  const bool was_running = _running;
-
-  if (_running)
-    {
-      _running = false;
-
-      if (_interruptible)
-	{
-	  assert (_interrupt_event
-		  && _interrupt_event != INVALID_HANDLE_VALUE);
-
-	  SetEvent (_interrupt_event);
-
-	  if (WaitForSingleObject (_hThread, 1000) == WAIT_TIMEOUT)
-	    {
-	      system_printf (("request loop thread %lu failed to shutdown "
-			      "when asked politely: about to get heavy"),
-			     _tid);
-
-	      if (!TerminateThread (_hThread, 0))
-		{
-		  system_printf (("failed to kill request loop thread %lu"
-				  ", error = %lu"),
-				 _tid, GetLastError ());
-		  abort ();
-		}
-	    }
-	}
-      else
-	{
-	  // FIXME: could wait to see if the request loop notices that
-	  // the submission loop is no longer running and shuts down
-	  // voluntarily.
-
-	  debug_printf ("killing request loop thread %lu", _tid);
-
-	  if (!TerminateThread (_hThread, 0))
-	    system_printf (("failed to kill request loop thread %lu"
-			    ", error = %lu"),
-			   _tid, GetLastError ());
-	}
-    }
-
-  return was_running;
-}
-
-/*static*/ DWORD WINAPI
-queue_submission_loop::start_routine (const LPVOID lpParam)
-{
-  class queue_submission_loop *const submission_loop =
-    (class queue_submission_loop *) lpParam;
-  assert (submission_loop);
-
-  submission_loop->request_loop ();
-
-  debug_printf ("submission loop has exited; thread about to terminate");
-
-  submission_loop->stop ();
-
-  return 0;
-}
-
-/*****************************************************************************/
-#endif /* __OUTSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/threaded_queue.h b/winsup/cygserver/threaded_queue.h
deleted file mode 100644
index 5b6fddc42..000000000
--- a/winsup/cygserver/threaded_queue.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* threaded_queue.h
-
-   Copyright 2001, 2002 Red Hat Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _THREADED_QUEUE_
-#define _THREADED_QUEUE_
-
-/*****************************************************************************/
-
-/* a specific request */
-
-class queue_request
-{
-public:
-  queue_request *_next;
-
-  queue_request () : _next (NULL) {}
-  virtual ~queue_request ();
-
-  virtual void process () = 0;
-};
-
-/*****************************************************************************/
-
-/* a queue to allocate requests from n submission loops to x worker threads */
-
-class queue_submission_loop;
-
-class threaded_queue
-{
-public:
-  threaded_queue (size_t initial_workers = 1);
-  ~threaded_queue ();
-
-  void add_submission_loop (queue_submission_loop *);
-
-  bool running () const { return _running; }
-
-  bool start ();
-  bool stop ();
-
-  void add (queue_request *);
-
-private:
-  long _workers_count;
-  bool _running;
-
-  queue_submission_loop *_submitters_head;
-
-  long _requests_count;		// Informational only.
-  queue_request *_requests_head;
-
-  CRITICAL_SECTION _queue_lock;
-  HANDLE _requests_sem;		// == _requests_count
-
-  static DWORD WINAPI start_routine (LPVOID /* this */);
-
-  void create_workers (size_t initial_workers);
-  void worker_loop ();
-};
-
-/*****************************************************************************/
-
-/* parameters for a request finding and submitting loop */
-
-class queue_submission_loop
-{
-  friend class threaded_queue;
-
-public:
-  queue_submission_loop (threaded_queue *, bool ninterruptible);
-  virtual ~queue_submission_loop ();
-
-  bool start ();
-  bool stop ();
-
-  threaded_queue *queue () { return _queue; };
-
-protected:
-  bool _running;
-  HANDLE _interrupt_event;
-  threaded_queue *const _queue;
-
-private:
-  bool _interruptible;
-  HANDLE _hThread;
-  DWORD _tid;
-  queue_submission_loop *_next;
-
-  static DWORD WINAPI start_routine (LPVOID /* this */);
-  virtual void request_loop () = 0;
-};
-
-#ifdef __cplusplus
-
-/*---------------------------------------------------------------------------*
- * Some type-safe versions of the various interlocked functions.
- *---------------------------------------------------------------------------*/
-
-template <typename T> T *
-TInterlockedExchangePointer (T **lvalue, T *rvalue)
-{
-  return reinterpret_cast<T *>
-    (InterlockedExchangePointer (reinterpret_cast<void **> (lvalue),
-				 reinterpret_cast<void *> (rvalue)));
-}
-
-template <typename T> T *
-TInterlockedCompareExchangePointer (T **lvalue, T *rvalue1, T *rvalue2)
-{
-  return reinterpret_cast<T *>
-    (InterlockedCompareExchangePointer (reinterpret_cast<void **> (lvalue),
-					reinterpret_cast<void *> (rvalue1),
-					reinterpret_cast<void *> (rvalue2)));
-}
-
-#endif /* __cplusplus */
-
-#endif /* _THREADED_QUEUE_ */
diff --git a/winsup/cygserver/transport.cc b/winsup/cygserver/transport.cc
deleted file mode 100644
index a52bb60e7..000000000
--- a/winsup/cygserver/transport.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-/* transport.cc
-
-   Copyright 2001, 2002, 2003 Red Hat Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* to allow this to link into cygwin and the .dll, a little magic is needed. */
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-#else
-#include "winsup.h"
-#endif
-
-#include <sys/socket.h>
-
-#include "transport.h"
-#include "transport_pipes.h"
-#include "transport_sockets.h"
-
-/* The factory */
-transport_layer_base *
-create_server_transport ()
-{
-  if (wincap.is_winnt ())
-    return new transport_layer_pipes;
-  else
-    return new transport_layer_sockets;
-}
-
-#ifndef __INSIDE_CYGWIN__
-
-bool
-transport_layer_base::impersonate_client ()
-{
-  return true;
-}
-
-bool
-transport_layer_base::revert_to_self ()
-{
-  return true;
-}
-
-#endif /* !__INSIDE_CYGWIN__ */
-
-transport_layer_base::~transport_layer_base ()
-{}
diff --git a/winsup/cygserver/transport.h b/winsup/cygserver/transport.h
deleted file mode 100644
index 76018d20e..000000000
--- a/winsup/cygserver/transport.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* transport.h
-
-   Copyright 2001, 2002, 2003 Red Hat Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _TRANSPORT_H
-#define _TRANSPORT_H
-
-class transport_layer_base *create_server_transport ();
-
-class transport_layer_base
-{
-public:
-#ifndef __INSIDE_CYGWIN__
-  virtual int listen () = 0;
-  virtual class transport_layer_base *accept (bool *recoverable) = 0;
-#endif
-
-  virtual void close () = 0;
-  virtual ssize_t read (void *buf, size_t len) = 0;
-  virtual ssize_t write (void *buf, size_t len) = 0;
-  virtual int connect () = 0;
-
-#ifndef __INSIDE_CYGWIN__
-  virtual bool impersonate_client ();
-  virtual bool revert_to_self ();
-#endif
-
-  virtual ~transport_layer_base ();
-};
-
-#endif /* _TRANSPORT_H */
diff --git a/winsup/cygserver/transport_pipes.cc b/winsup/cygserver/transport_pipes.cc
deleted file mode 100644
index 5f8ceec4d..000000000
--- a/winsup/cygserver/transport_pipes.cc
+++ /dev/null
@@ -1,349 +0,0 @@
-/* transport_pipes.cc
-
-   Copyright 2001, 2002, 2003 Red Hat Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* to allow this to link into cygwin and the .dll, a little magic is needed. */
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-#else
-#include "winsup.h"
-#endif
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <netdb.h>
-#include <pthread.h>
-#include <unistd.h>
-
-#include "cygerrno.h"
-#include "transport.h"
-#include "transport_pipes.h"
-
-#ifndef __INSIDE_CYGWIN__
-#include "cygserver.h"
-#include "cygserver_ipc.h"
-#else
-#include "security.h"
-#endif
-
-enum
-  {
-    MAX_WAIT_NAMED_PIPE_RETRY = 64,
-    WAIT_NAMED_PIPE_TIMEOUT = 10 // milliseconds
-  };
-
-#ifndef __INSIDE_CYGWIN__
-
-static pthread_once_t pipe_instance_lock_once = PTHREAD_ONCE_INIT;
-static CRITICAL_SECTION pipe_instance_lock;
-static long pipe_instance = 0;
-
-static void
-initialise_pipe_instance_lock ()
-{
-  assert (pipe_instance == 0);
-  InitializeCriticalSection (&pipe_instance_lock);
-}
-
-#endif /* !__INSIDE_CYGWIN__ */
-
-#ifndef __INSIDE_CYGWIN__
-
-transport_layer_pipes::transport_layer_pipes (const HANDLE hPipe)
-  : _pipe_name (""),
-    _hPipe (hPipe),
-    _is_accepted_endpoint (true),
-    _is_listening_endpoint (false)
-{
-  assert (_hPipe);
-  assert (_hPipe != INVALID_HANDLE_VALUE);
-
-}
-
-#endif /* !__INSIDE_CYGWIN__ */
-
-transport_layer_pipes::transport_layer_pipes ()
-  : _pipe_name ("\\\\.\\pipe\\cygwin_lpc"),
-    _hPipe (NULL),
-    _is_accepted_endpoint (false),
-    _is_listening_endpoint (false)
-{
-}
-
-transport_layer_pipes::~transport_layer_pipes ()
-{
-  close ();
-}
-
-#ifndef __INSIDE_CYGWIN__
-
-int
-transport_layer_pipes::listen ()
-{
-  assert (!_hPipe);
-  assert (!_is_accepted_endpoint);
-  assert (!_is_listening_endpoint);
-
-  _is_listening_endpoint = true;
-
-  /* no-op */
-  return 0;
-}
-
-class transport_layer_pipes *
-transport_layer_pipes::accept (bool *const recoverable)
-{
-  assert (!_hPipe);
-  assert (!_is_accepted_endpoint);
-  assert (_is_listening_endpoint);
-
-  pthread_once (&pipe_instance_lock_once, &initialise_pipe_instance_lock);
-
-  EnterCriticalSection (&pipe_instance_lock);
-
-  // Read: http://www.securityinternals.com/research/papers/namedpipe.php
-  // See also the Microsoft security bulletins MS00-053 and MS01-031.
-
-  // FIXME: Remove FILE_CREATE_PIPE_INSTANCE.
-
-  const bool first_instance = (pipe_instance == 0);
-
-  const HANDLE accept_pipe =
-    CreateNamedPipe (_pipe_name,
-		     (PIPE_ACCESS_DUPLEX
-		      | (first_instance ? FILE_FLAG_FIRST_PIPE_INSTANCE : 0)),
-		     (PIPE_TYPE_BYTE | PIPE_WAIT),
-		     PIPE_UNLIMITED_INSTANCES,
-		     0, 0, 1000,
-		     &sec_all_nih);
-
-  const bool duplicate = (accept_pipe == INVALID_HANDLE_VALUE
-			  && pipe_instance == 0
-			  && GetLastError () == ERROR_ACCESS_DENIED);
-
-  if (accept_pipe != INVALID_HANDLE_VALUE)
-    InterlockedIncrement (&pipe_instance);
-
-  LeaveCriticalSection (&pipe_instance_lock);
-
-  if (duplicate)
-    {
-      *recoverable = false;
-      system_printf ("failed to create named pipe: "
-		     "is the daemon already running?");
-      return NULL;
-    }
-
-  if (accept_pipe == INVALID_HANDLE_VALUE)
-    {
-      debug_printf ("error creating pipe (%lu).", GetLastError ());
-      *recoverable = true;	// FIXME: case analysis?
-      return NULL;
-    }
-
-  assert (accept_pipe);
-
-  if (!ConnectNamedPipe (accept_pipe, NULL)
-      && GetLastError () != ERROR_PIPE_CONNECTED)
-    {
-      debug_printf ("error connecting to pipe (%lu)", GetLastError ());
-      (void) CloseHandle (accept_pipe);
-      *recoverable = true;	// FIXME: case analysis?
-      return NULL;
-    }
-
-  return new transport_layer_pipes (accept_pipe);
-}
-
-#endif /* !__INSIDE_CYGWIN__ */
-
-void
-transport_layer_pipes::close ()
-{
-  // verbose: debug_printf ("closing pipe %p", _hPipe);
-
-  if (_hPipe)
-    {
-      assert (_hPipe != INVALID_HANDLE_VALUE);
-
-#ifndef __INSIDE_CYGWIN__
-
-      if (_is_accepted_endpoint)
-	{
-	  (void) FlushFileBuffers (_hPipe); // Blocks until client reads.
-	  (void) DisconnectNamedPipe (_hPipe);
-	  EnterCriticalSection (&pipe_instance_lock);
-	  (void) CloseHandle (_hPipe);
-	  assert (pipe_instance > 0);
-	  InterlockedDecrement (&pipe_instance);
-	  LeaveCriticalSection (&pipe_instance_lock);
-	}
-      else
-	(void) CloseHandle (_hPipe);
-
-#else /* __INSIDE_CYGWIN__ */
-
-      assert (!_is_accepted_endpoint);
-      (void) ForceCloseHandle (_hPipe);
-
-#endif /* __INSIDE_CYGWIN__ */
-
-      _hPipe = NULL;
-    }
-}
-
-ssize_t
-transport_layer_pipes::read (void *const buf, const size_t len)
-{
-  // verbose: debug_printf ("reading from pipe %p", _hPipe);
-
-  assert (_hPipe);
-  assert (_hPipe != INVALID_HANDLE_VALUE);
-  assert (!_is_listening_endpoint);
-
-  DWORD count;
-  if (!ReadFile (_hPipe, buf, len, &count, NULL))
-    {
-      debug_printf ("error reading from pipe (%lu)", GetLastError ());
-      set_errno (EINVAL);	// FIXME?
-      return -1;
-    }
-
-  return count;
-}
-
-ssize_t
-transport_layer_pipes::write (void *const buf, const size_t len)
-{
-  // verbose: debug_printf ("writing to pipe %p", _hPipe);
-
-  assert (_hPipe);
-  assert (_hPipe != INVALID_HANDLE_VALUE);
-  assert (!_is_listening_endpoint);
-
-  DWORD count;
-  if (!WriteFile (_hPipe, buf, len, &count, NULL))
-    {
-      debug_printf ("error writing to pipe, error = %lu", GetLastError ());
-      set_errno (EINVAL);	// FIXME?
-      return -1;
-    }
-
-  return count;
-}
-
-/*
- * This routine holds a static variable, assume_cygserver, that is set
- * if the transport has good reason to think that cygserver is
- * running, i.e. if if successfully connected to it with the previous
- * attempt.  If this is set, the code tries a lot harder to get a
- * connection, making the assumption that any failures are just
- * congestion and overloading problems.
- */
-
-int
-transport_layer_pipes::connect ()
-{
-  assert (!_hPipe);
-  assert (!_is_accepted_endpoint);
-  assert (!_is_listening_endpoint);
-
-  static bool assume_cygserver = false;
-
-  BOOL rc = TRUE;
-  int retries = 0;
-
-  while (rc)
-    {
-      _hPipe = CreateFile (_pipe_name,
-			   GENERIC_READ | GENERIC_WRITE,
-			   FILE_SHARE_READ | FILE_SHARE_WRITE,
-			   &sec_all_nih,
-			   OPEN_EXISTING,
-			   SECURITY_IMPERSONATION,
-			   NULL);
-
-      if (_hPipe != INVALID_HANDLE_VALUE)
-	{
-	  assert (_hPipe);
-#ifdef __INSIDE_CYGWIN__
-	  ProtectHandle (_hPipe);
-#endif
-	  assume_cygserver = true;
-	  return 0;
-	}
-
-      _hPipe = NULL;
-
-      if (!assume_cygserver && GetLastError () != ERROR_PIPE_BUSY)
-	{
-	  debug_printf ("Error opening the pipe (%lu)", GetLastError ());
-	  return -1;
-	}
-
-      /* Note: `If no instances of the specified named pipe exist, the
-       * WaitNamedPipe function returns immediately, regardless of the
-       * time-out value.'  Thus the explicit Sleep if the call fails
-       * with ERROR_FILE_NOT_FOUND.
-       */
-      while (retries != MAX_WAIT_NAMED_PIPE_RETRY
-	     && !(rc = WaitNamedPipe (_pipe_name, WAIT_NAMED_PIPE_TIMEOUT)))
-	{
-	  if (GetLastError () == ERROR_FILE_NOT_FOUND)
-	    Sleep (0);		// Give the server a chance.
-
-	  retries += 1;
-	}
-    }
-
-  assert (retries == MAX_WAIT_NAMED_PIPE_RETRY);
-
-  system_printf ("lost connection to cygserver, error = %lu",
-		 GetLastError ());
-
-  assume_cygserver = false;
-
-  return -1;
-}
-
-#ifndef __INSIDE_CYGWIN__
-
-bool
-transport_layer_pipes::impersonate_client ()
-{
-  assert (_hPipe);
-  assert (_hPipe != INVALID_HANDLE_VALUE);
-  assert (_is_accepted_endpoint);
-
-  if (_hPipe && !ImpersonateNamedPipeClient (_hPipe))
-    {
-      debug_printf ("Failed to Impersonate client, (%lu)", GetLastError ());
-      return false;
-    }
-
-  return true;
-}
-
-bool
-transport_layer_pipes::revert_to_self ()
-{
-  assert (_is_accepted_endpoint);
-
-  if (!RevertToSelf ())
-    {
-      debug_printf ("Failed to RevertToSelf, (%lu)", GetLastError ());
-      return false;
-    }
-  return true;
-}
-
-#endif /* !__INSIDE_CYGWIN__ */
diff --git a/winsup/cygserver/transport_pipes.h b/winsup/cygserver/transport_pipes.h
deleted file mode 100644
index 7265a88f8..000000000
--- a/winsup/cygserver/transport_pipes.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* transport_pipes.h
-
-   Copyright 2001, 2002, 2003 Red Hat Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _TRANSPORT_PIPES_H
-#define _TRANSPORT_PIPES_H
-
-/* Named pipes based transport, for security on NT */
-class transport_layer_pipes : public transport_layer_base
-{
-public:
-#ifndef __INSIDE_CYGWIN__
-  virtual int listen ();
-  virtual class transport_layer_pipes *accept (bool *recoverable);
-#endif
-
-  virtual void close ();
-  virtual ssize_t read (void *buf, size_t len);
-  virtual ssize_t write (void *buf, size_t len);
-  virtual int connect ();
-
-#ifndef __INSIDE_CYGWIN__
-  virtual bool impersonate_client ();
-  virtual bool revert_to_self ();
-#endif
-
-  transport_layer_pipes ();
-  virtual ~transport_layer_pipes ();
-
-private:
-  const char *const _pipe_name;
-  HANDLE _hPipe;
-  const bool _is_accepted_endpoint;
-  bool _is_listening_endpoint;
-
-  transport_layer_pipes (HANDLE hPipe);
-};
-
-#endif /* _TRANSPORT_PIPES_H */
diff --git a/winsup/cygserver/transport_sockets.cc b/winsup/cygserver/transport_sockets.cc
deleted file mode 100644
index f3668f6d8..000000000
--- a/winsup/cygserver/transport_sockets.cc
+++ /dev/null
@@ -1,387 +0,0 @@
-/* transport_sockets.cc
-
-   Copyright 2001, 2002 Red Hat Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* to allow this to link into cygwin and the .dll, a little magic is needed. */
-#ifdef __OUTSIDE_CYGWIN__
-#include "woutsup.h"
-#else
-#include "winsup.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "transport.h"
-#include "transport_sockets.h"
-
-/* to allow this to link into cygwin and the .dll, a little magic is needed. */
-#ifndef __OUTSIDE_CYGWIN__
-
-extern "C" int cygwin_accept (int fd, struct sockaddr *, int *len);
-extern "C" int cygwin_bind (int fd, const struct sockaddr *, int len);
-extern "C" int cygwin_connect (int fd, const struct sockaddr *, int len);
-extern "C" int cygwin_listen (int fd, int backlog);
-extern "C" int cygwin_shutdown (int fd, int how);
-extern "C" int cygwin_socket (int af, int type, int protocol);
-
-#else /* __OUTSIDE_CYGWIN__ */
-
-#define cygwin_accept(A,B,C)    ::accept (A,B,C)
-#define cygwin_bind(A,B,C)      ::bind (A,B,C)
-#define cygwin_connect(A,B,C)   ::connect (A,B,C)
-#define cygwin_listen(A,B)      ::listen (A,B)
-#define cygwin_shutdown(A,B)    ::shutdown (A,B)
-#define cygwin_socket(A,B,C)    ::socket (A,B,C)
-
-#endif /* __OUTSIDE_CYGWIN__ */
-
-enum
-  {
-    MAX_CONNECT_RETRY = 64
-  };
-
-transport_layer_sockets::transport_layer_sockets (const int fd)
-  : _fd (fd),
-    _addr_len (0),
-    _is_accepted_endpoint (true),
-    _is_listening_endpoint (false)
-{
-  assert (_fd != -1);
-
-  memset (&_addr, '\0', sizeof (_addr));
-}
-
-transport_layer_sockets::transport_layer_sockets ()
-  : _fd (-1),
-    _addr_len (0),
-    _is_accepted_endpoint (false),
-    _is_listening_endpoint (false)
-{
-  memset (&_addr, '\0', sizeof (_addr));
-
-  _addr.sun_family = AF_UNIX;
-  strcpy (_addr.sun_path, "/tmp/cygdaemo"); // FIXME: $TMP?
-  _addr_len = SUN_LEN (&_addr);
-}
-
-transport_layer_sockets::~transport_layer_sockets ()
-{
-  close ();
-}
-
-#ifndef __INSIDE_CYGWIN__
-
-int
-transport_layer_sockets::listen ()
-{
-  assert (_fd == -1);
-  assert (!_is_accepted_endpoint);
-  assert (!_is_listening_endpoint);
-
-  debug_printf ("listen () [this = %p]", this);
-
-  struct stat sbuf;
-
-  if (stat (_addr.sun_path, &sbuf) == -1)
-    {
-      if (errno != ENOENT)
-	{
-	  system_printf ("cannot access socket file `%s': %s",
-			 _addr.sun_path, strerror (errno));
-	  return -1;
-	}
-    }
-  else if (S_ISSOCK (sbuf.st_mode))
-    {
-      // The socket already exists: is a duplicate cygserver running?
-
-      const int newfd = cygwin_socket (AF_UNIX, SOCK_STREAM, 0);
-
-      if (newfd == -1)
-	{
-	  system_printf ("failed to create UNIX domain socket: %s",
-			 strerror (errno));
-	  return -1;
-	}
-
-      if (cygwin_connect (newfd, (struct sockaddr *) &_addr, _addr_len) == 0)
-	{
-	  system_printf ("the daemon is already running");
-	  (void) cygwin_shutdown (newfd, SHUT_WR);
-	  char buf[BUFSIZ];
-	  while (::read (newfd, buf, sizeof (buf)) > 0)
-	    {}
-	  (void) ::close (newfd);
-	  return -1;
-	}
-
-      if (unlink (_addr.sun_path) == -1)
-	{
-	  system_printf ("failed to remove `%s': %s",
-			 _addr.sun_path, strerror (errno));
-	  (void) ::close (newfd);
-	  return -1;
-	}
-    }
-  else
-    {
-      system_printf ("cannot create socket `%s': File already exists",
-		     _addr.sun_path);
-      return -1;
-    }
-
-  _fd = cygwin_socket (AF_UNIX, SOCK_STREAM, 0);
-
-  if (_fd == -1)
-    {
-      system_printf ("failed to create UNIX domain socket: %s",
-		     strerror (errno));
-      return -1;
-    }
-
-  if (cygwin_bind (_fd, (struct sockaddr *) &_addr, _addr_len) == -1)
-    {
-      const int saved_errno = errno;
-      close ();
-      errno = saved_errno;
-      system_printf ("failed to bind UNIX domain socket `%s': %s",
-		     _addr.sun_path, strerror (errno));
-      return -1;
-    }
-
-  _is_listening_endpoint = true; // i.e. this really means "have bound".
-
-  if (cygwin_listen (_fd, SOMAXCONN) == -1)
-    {
-      const int saved_errno = errno;
-      close ();
-      errno = saved_errno;
-      system_printf ("failed to listen on UNIX domain socket `%s': %s",
-		     _addr.sun_path, strerror (errno));
-      return -1;
-    }
-
-  debug_printf ("0 = listen () [this = %p, fd = %d]", this, _fd);
-
-  return 0;
-}
-
-class transport_layer_sockets *
-transport_layer_sockets::accept (bool *const recoverable)
-{
-  assert (_fd != -1);
-  assert (!_is_accepted_endpoint);
-  assert (_is_listening_endpoint);
-
-  debug_printf ("accept () [this = %p, fd = %d]", this, _fd);
-
-  struct sockaddr_un client_addr;
-  socklen_t client_addr_len = sizeof (client_addr);
-
-  const int accept_fd =
-    cygwin_accept (_fd, (struct sockaddr *) &client_addr, &client_addr_len);
-
-  if (accept_fd == -1)
-    {
-      system_printf ("failed to accept connection: %s", strerror (errno));
-      switch (errno)
-	{
-	case ECONNABORTED:
-	case EINTR:
-	case EMFILE:
-	case ENFILE:
-	case ENOBUFS:
-	case ENOMEM:
-	  *recoverable = true;
-	  break;
-
-	default:
-	  *recoverable = false;
-	  break;
-	}
-      return NULL;
-    }
-
-  debug_printf ("%d = accept () [this = %p, fd = %d]", accept_fd, this, _fd);
-
-  return new transport_layer_sockets (accept_fd);
-}
-
-#endif /* !__INSIDE_CYGWIN__ */
-
-void
-transport_layer_sockets::close ()
-{
-  debug_printf ("close () [this = %p, fd = %d]", this, _fd);
-
-  if (_is_listening_endpoint)
-    (void) unlink (_addr.sun_path);
-
-  if (_fd != -1)
-    {
-      (void) cygwin_shutdown (_fd, SHUT_WR);
-      if (!_is_listening_endpoint)
-	{
-	  char buf[BUFSIZ];
-	  while (::read (_fd, buf, sizeof (buf)) > 0)
-	    {}
-	}
-      (void) ::close (_fd);
-      _fd = -1;
-    }
-
-  _is_listening_endpoint = false;
-}
-
-ssize_t
-transport_layer_sockets::read (void *const buf, const size_t buf_len)
-{
-  assert (_fd != -1);
-  assert (!_is_listening_endpoint);
-
-  assert (buf);
-  assert (buf_len > 0);
-
-  // verbose: debug_printf ("read (buf = %p, len = %u) [this = %p, fd = %d]",
-  //		buf, buf_len, this, _fd);
-
-  char *read_buf = static_cast<char *> (buf);
-  size_t read_buf_len = buf_len;
-  ssize_t res = 0;
-
-  while (read_buf_len != 0
-	 && (res = ::read (_fd, read_buf, read_buf_len)) > 0)
-    {
-      read_buf += res;
-      read_buf_len -= res;
-
-      assert (read_buf_len >= 0);
-    }
-
-  if (res != -1)
-    {
-      if (res == 0)
-	errno = EIO;		// FIXME?
-
-      res = buf_len - read_buf_len;
-    }
-
-  if (res != static_cast<ssize_t> (buf_len))
-    debug_printf ("%d = read (buf = %p, len = %u) [this = %p, fd = %d]: %s",
-		  res, buf, buf_len, this, _fd,
-		  (res == -1 ? strerror (errno) : "EOF"));
-  else
-    {
-      // verbose: debug_printf ("%d = read (buf = %p, len = %u) [this = %p, fd = %d]",
-      //		    res, buf, buf_len, this, _fd);
-    }
-
-  return res;
-}
-
-ssize_t
-transport_layer_sockets::write (void *const buf, const size_t buf_len)
-{
-  assert (_fd != -1);
-  assert (!_is_listening_endpoint);
-
-  assert (buf);
-  assert (buf_len > 0);
-
-  // verbose: debug_printf ("write (buf = %p, len = %u) [this = %p, fd = %d]",
-  //		buf, buf_len, this, _fd);
-
-  char *write_buf = static_cast<char *> (buf);
-  size_t write_buf_len = buf_len;
-  ssize_t res = 0;
-
-  while (write_buf_len != 0
-	 && (res = ::write (_fd, write_buf, write_buf_len)) > 0)
-    {
-      write_buf += res;
-      write_buf_len -= res;
-
-      assert (write_buf_len >= 0);
-    }
-
-  if (res != -1)
-    {
-      if (res == 0)
-	errno = EIO;		// FIXME?
-
-      res = buf_len - write_buf_len;
-    }
-
-  if (res != static_cast<ssize_t> (buf_len))
-    debug_printf ("%d = write (buf = %p, len = %u) [this = %p, fd = %d]: %s",
-		  res, buf, buf_len, this, _fd,
-		  (res == -1 ? strerror (errno) : "EOF"));
-  else
-    {
-      // verbose: debug_printf ("%d = write (buf = %p, len = %u) [this = %p, fd = %d]",
-      //		    res, buf, buf_len, this, _fd);
-    }
-
-  return res;
-}
-
-int
-transport_layer_sockets::connect ()
-{
-  assert (_fd == -1);
-  assert (!_is_accepted_endpoint);
-  assert (!_is_listening_endpoint);
-
-  static bool assume_cygserver = false;
-
-  debug_printf ("connect () [this = %p]", this);
-
-  for (int retries = 0; retries != MAX_CONNECT_RETRY; retries++)
-    {
-      _fd = cygwin_socket (AF_UNIX, SOCK_STREAM, 0);
-
-      if (_fd == -1)
-	{
-	  system_printf ("failed to create UNIX domain socket: %s",
-			 strerror (errno));
-	  return -1;
-	}
-
-      if (cygwin_connect (_fd, (struct sockaddr *) &_addr, _addr_len) == 0)
-	{
-	  assume_cygserver = true;
-	  debug_printf ("0 = connect () [this = %p, fd = %d]", this, _fd);
-	  return 0;
-	}
-
-      if (!assume_cygserver || errno != ECONNREFUSED)
-	{
-	  debug_printf ("failed to connect to server: %s", strerror (errno));
-	  (void) ::close (_fd);
-	  _fd = -1;
-	  return -1;
-	}
-
-      (void) ::close (_fd);
-      _fd = -1;
-      Sleep (0);		// Give the server a chance.
-    }
-
-  debug_printf ("failed to connect to server: %s", strerror (errno));
-  return -1;
-}
diff --git a/winsup/cygserver/transport_sockets.h b/winsup/cygserver/transport_sockets.h
deleted file mode 100644
index d684a87c9..000000000
--- a/winsup/cygserver/transport_sockets.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* transport_sockets.h
-
-   Copyright 2001, 2002 Red Hat Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _TRANSPORT_SOCKETS_H
-#define _TRANSPORT_SOCKETS_H
-
-#include <sys/socket.h>
-#include <sys/un.h>
-
-class transport_layer_sockets : public transport_layer_base
-{
-public:
-#ifndef __INSIDE_CYGWIN__
-  virtual int listen ();
-  virtual class transport_layer_sockets *accept (bool *recoverable);
-#endif
-
-  virtual void close ();
-  virtual ssize_t read (void *buf, size_t len);
-  virtual ssize_t write (void *buf, size_t len);
-  virtual int connect ();
-
-  transport_layer_sockets ();
-  virtual ~transport_layer_sockets ();
-
-private:
-  /* for socket based communications */
-  int _fd;
-  struct sockaddr_un _addr;
-  socklen_t _addr_len;
-  const bool _is_accepted_endpoint;
-  bool _is_listening_endpoint;
-
-  transport_layer_sockets (int fd);
-};
-
-#endif /* _TRANSPORT_SOCKETS_H */
diff --git a/winsup/cygserver/woutsup.h b/winsup/cygserver/woutsup.h
deleted file mode 100644
index 39db63997..000000000
--- a/winsup/cygserver/woutsup.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* woutsup.h: for Cygwin code compiled outside the DLL (i.e. cygserver).
-
-   Copyright 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#define _MT_SAFE 1
-
-#ifdef __INSIDE_CYGWIN__
-#error "woutsup.h is not for code being compiled inside the dll"
-#endif
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
-#endif
-
-#if _WIN32_WINNT < 0x0500
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
-#endif
-
-#define WIN32_LEAN_AND_MEAN 1
-#define _WINGDI_H
-#define _WINUSER_H
-#define _WINNLS_H
-#define _WINVER_H
-#define _WINNETWK_H
-#define _WINSVC_H
-#include <windows.h>
-#include <wincrypt.h>
-#include <lmcons.h>
-#undef _WINGDI_H
-#undef _WINUSER_H
-#undef _WINNLS_H
-#undef _WINVER_H
-#undef _WINNETWK_H
-#undef _WINSVC_H
-
-#include "wincap.h"
-
-#include "bsd_helper.h"
-#include "bsd_log.h"
-#include "bsd_mutex.h"
-
-/* The one function we use from winuser.h most of the time */
-extern "C" DWORD WINAPI GetLastError (void);
-
-extern int cygserver_running;
-
-#define SIGHANDLE(SIG)							\
-  do									\
-    {									\
-      struct sigaction act;						\
-									\
-      act.sa_handler = &handle_signal;					\
-      act.sa_mask = 0;							\
-      act.sa_flags = 0;							\
-									\
-      if (sigaction (SIG, &act, NULL) == -1)				\
-	{								\
-	  panic ("failed to install handler for " #SIG ": %s",		\
-		 strerror (errno));					\
-	  exit (1);							\
-	}								\
-    } while (false)
-
-#define debug_printf(f,...)	debug((f),##__VA_ARGS__)
-#define syscall_printf(f,...)	log(LOG_ERR,(f),##__VA_ARGS__)
-#define system_printf(f,...)	log(LOG_ERR,(f),##__VA_ARGS__)
diff --git a/winsup/cygwin/CYGWIN_LICENSE b/winsup/cygwin/CYGWIN_LICENSE
deleted file mode 100644
index 53369a297..000000000
--- a/winsup/cygwin/CYGWIN_LICENSE
+++ /dev/null
@@ -1,38 +0,0 @@
---------------------------------------------------------------------------
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License (GPL) as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
---------------------------------------------------------------------------
-
-			*** NOTE ***
-
-In accordance with section 10 of the GPL, Red Hat permits programs whose
-sources are distributed under a license that complies with the Open
-Source definition to be linked with libcygwin.a without libcygwin.a
-itself causing the resulting program to be covered by the GNU GPL.
-
-This means that you can port an Open Source(tm) application to cygwin,
-and distribute that executable as if it didn't include a copy of
-libcygwin.a linked into it.  Note that this does not apply to the cygwin
-DLL itself.  If you distribute a (possibly modified) version of the DLL
-you must adhere to the terms of the GPL, i.e., you must provide sources
-for the cygwin DLL.
-
-See http://www.opensource.org/osd.html for the precise Open Source
-Definition referenced above.
-
-Red Hat sells a special Cygwin License for customers who are unable to
-provide their application in open source code form.  For more
-information, please see: http://www.redhat.com/software/tools/cygwin/,
-or call 866-2REDHAT ext.  3007
-
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
deleted file mode 100644
index da333b373..000000000
--- a/winsup/cygwin/ChangeLog
+++ /dev/null
@@ -1,5480 +0,0 @@
-2003-12-17  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (proc_subproc): Simplify code to just remove all zombies
-	if SIGCHLD == SIG_IGN.
-
-2003-12-17  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.h (pinfo::operator ==): Add a way to check for _pinfo types.
-	* sigproc.cc (proc_subproc): Ensure that zombie is removed when SIGCHLD
-	== SIG_IGN but still allow wait()ing threads to wake up.
-
-2003-12-16  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (set_signal_mask): Report on input argument rather than
-	getsigmask.
-
-	* fhandler.h (fhandler_base): Make friends with close_all_files.
-	* pinfo.cc (_pinfo::set_ctty): Add more debugging.
-	* sigproc.cc (proc_can_be_signalled): Detect state when signal handler
-	thread is gone in target process as an EPERM situation.  Set errno to
-	ESRCH if process doesn't exist.
-	(sigproc_terminate): Set sendsig to illegal value when closed.
-	(sig_send): Rely on proc_can_be_signalled setting the proper errno.
-	* syscalls.cc (close_all_files): Detect when all ttys are closed prior
-	to calling close_all_files.  The ctty needs to be closed explicitly in
-	this case.
-
-2003-12-16  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/ipc.h: Include sys/types.h.
-
-2003-12-15  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (pthread::init_main_thread): Make sure that the main thread
-	has valid handles.
-	(pthread::create_cancel_event): Fix error message.
-
-2003-12-14  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.h (access_worker): Declare with added fhandler_base parameter.
-	* syscalls.cc (access_worker): Accommodate extra fhandler_base
-	argument.  Use it instead of stat_worker to determine stat information,
-	when appropriate.
-	* fhandler.cc (fhandler_base::device_access_denied): Pass fhandler
-	pointer to access_worker so that it can use the proper method for
-	determining stat information.
-	* fhandler_disk_file.cc (fhandler_disk_file::opendir): Ditto.
-	* path.cc (path_conv::check): Add read-only attribute to /cygdrive
-	default settings.
-
-2003-12-14  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (ctrl_c_handler): Remove this thread from the signal
-	handler chain.
-
-2003-12-14  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Revert previous change and again
-	subsume cygthread::stub2.  Just return from function now since
-	ExitThread is guaranteed by automatic _threadinfo wrapper.  Define as
-	per ThreadProc convention.
-	(cygthread::stub2): Remove.
-	(cygthread::simplestub): Perform similar operations to cygthread::stub.
-	(cygthread::simplestub2): Remove.
-	* cygthread.h (cygthread::stub): Declare as per ThreadProc convention.
-	(cygthread::stub2): Remove declaration.
-	(cygthread::simplestub): Declare as per ThreadProc convention.
-	(cygthread::simplestub2): Remove declaration.
-	* cygtls.h (_threadinfo::call): Define first argument as per ThreadProc
-	convention.
-	(_threadinfo::call2): Ditto.
-	(_tlsbase): Define as char * pointer.
-	(_tlstop): New definition.
-	(_main_tls): Define here.
-	* dcrt0.cc (alloc_stack): Revert previous change which called
-	init_thread since information would be overwritten by fork later
-	anyway.
-	(dll_crt0_1): Use _tlsbase and _tlstop for setting stack bottom, top.
-	* exceptions.cc: Move _main_tls declaration to cygtls.h.
-	(_threadinfo::call): Define first argument as per ThreadProc
-	convention.
-	(_threadinfo::call2): Call ExitThread with thread function return
-	value.
-	(_threadinfo::init_thread): Don't initialize cygtls to zero if input
-	arg is NULL.
-	* fork.cc (fork_child): Reset _main_tls here.  Reinitialize parts of
-	_my_tls after copying data from parent.
-	* init.cc (threadfunc_fe): New function.  Front-end for all threads
-	created in cygwin processes.
-	(munge_threadfunc): New function.
-	(dll_entry): Call munge_threadfunc to force the call of a thread
-	wrapper.
-	* thread.cc (pthread::thread_init_wrapper): Perform similar operations
-	to cygthread::stub.
-	(pthread::thread_init_wrapper2): Remove.
-	* thread.h (pthread::thread_init_wrapper): Declare as per ThreadProc
-	convention.
-	(pthread::thread_init_wrapper2): Remove declaration.
-	* window.cc (Winmain): Just return from function now since ExitThread
-	is guaranteed by automatic _threadinfo wrapper.
-
-2003-12-12  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::delete_archetype): Add debugging.
-	(dtable::release): Move archetype deletion here.
-	(dtable::vfork_child_dup): Increment ctty usecount to catch later
-	close_all_files case in parent/child.
-	(dtable::vfork_child_fixup): Avoid using cygheap->foo where this should
-	really be using local references.  Call close on archetyped handles
-	since the handles haven't had the noninherit flag set.
-	* fhandler_tty.cc (fhandler_tty_slave::close): Remove archetype
-	deletion code.  Add defensive error message when DEBUGGING.
-	(fhandler_tty_common::set_close_on_exec): Use more robust method for
-	checking whether to set handles into noninherit if there is an
-	archetype associated with the fhandler.
-
-2003-12-12  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (alloc_stack): Move _main_tls if stack is relocated.
-
-2003-12-11  Christopher Faylor  <cgf@redhat.com>
-
-	* miscfuncs.cc (low_priority_sleep): Correct thinko which caused
-	SetPriority to be called unnecessarily.
-	* thread.cc (pthread::init_main_thread): Call new create_cancel_event
-	function.
-	(pthread::precreate): Ditto.
-	(pthread::postcreate): Remove cancel_event creation.
-	(pthread::create_cancel_event): Define new function.
-	* thread.h (pthread::create_cancel_event): Declare new function.
-
-2003-12-11  Brian Ford  <ford@vss.fsi.com>
-
-	* fhandler_serial.cc (fhandler_serial::tcflush): Simplify.  Remove
-	read polling loop to avoid a hang with streaming devices.
-
-2003-12-11  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (_pinfo::set_ctty): Correct stupid typo.
-
-2003-12-11  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.h (cygheap_types): Add HEAP_ARCHETYPES.
-	(init_cheap::ctty): Change to pointer.
-	* dtable.h (dtable::find_archetype): Declare new function.
-	(dtable::add_archetype): Declare new function.
-	(dtable::delete_archetype): Declare new function.
-	(dtable::narchetypes): Declare.
-	(dtable::farchetypes): Declare.
-	(dtable::initial_archetype_size): Declare.
-	(dtable::dtable): Initialize new fields.
-	(dtable::initial_archetype_size): Declare.
-	* dtable.cc (dtable::find_archetype): Define new function.
-	(dtable::add_archetype): Define new function.
-	(dtable::delete_archetype): Define new function.
-	(dtable::initial_archetype_size): Define.
-	* fhandler.h (fhandler_base::archetype): Declare.
-	(fhandler_base::usecount): Declare.
-	* fhandler.cc (fhandler_base::fhandler_base): Initialize new fields.
-	* fhandler_console.cc (fhandler_console::get_tty_stuff): Pass NULL to
-	third argument of set_ctty.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Accommodate new archetype
-	method to create only one instance of a tty.
-	(fhandler_tty_slave::close): Don't close handles unless archetype
-	usecount is zero.  When that happens, close archetype too.
-	(fhandler_tty_slave::dup): Just copy archetype.  Set use count
-	appropriately.  Set ctty, if appropriate.
-	(fhandler_tty_common::dup): Remove slave considerations.
-	(fhandler_tty_common::set_close_on_exec): Remove cygheap->ctty
-	considerations.
-	* pinfo.cc (_pinfo::set_ctty): Accommodate new archetype methods.
-	* pinfo.h (_pinfo::set_ctty): Make third argument explicit.
-	* syscalls.cc (close_all_files): Decrement controlling tty use count
-	before closing all handles to allow controlling tty to be closed.
-	Remove previous controlling tty considerations.
-
-2003-12-09  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_common::dup): Just copy cygheap->ctty
-	to child if duping the current ctty.
-	(fhandler_tty_common::close): Move debugging statement earlier in function.
-	(fhandler_tty_slave::close): Return success when closing ctty.
-	* syscalls.cc (close_all_files): Avoid calling fhandler_tty_slave close
-	method so that open_fhs will not be decremented when closing cygheap
-	ctty.
-	(setsid): Ditto.
-	* dcrt0.cc (do_exit): Reorganize to avoid leaving a critical section
-	active after vfork.
-	* fhandler.h (fhandler_tty_slave::get_unit): Remove regparm parameter
-	since it can't work in a virtualized function.
-
-2003-12-08  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (_pinfo::set_ctty): Don't copy over existing ctty if it is
-	active.
-
-2003-12-08  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.cc (pthread::precreate): Delete duplicate setting of
-	cancel_event.
-
-2003-12-08  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_tty_slave::ttyname): Use name from pc since it
-	is guaranteed to be accurate.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Increment open_fhs
-	appropriate when copying ctty.
-	(fhandler_tty_slave::close): Remove special case handling for
-	exit_state.  Use ctty < 0 check instead.
-	(fhandler_tty_common::close): Set io_handle to NULL after closing.
-	* syscalls.cc (close_all_files): Specifically close cygheap->ctty, if
-	appropriate.
-
-2003-12-07  Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (spawn_guts): Change type back to 'int' after erroneous
-	change below.
-	* wait.cc (wait4): Move sawsig initialization inside loop.
-
-2003-12-07  Christopher Faylor  <cgf@redhat.com>
-
-	Change use of BOOL, TRUE, FALSE to bool, true, false, as appropriate,
-	throughout.
-
-2003-12-07  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* tty.cc (tty::common_init): Remove call to SetKernelObjectSecurity and
-	edit some comments.
-
-2003-12-07  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.h (init_cygheap::ctty): Add new element.
-	* devices.in (device::parse): Remove special handling for /dev/tty.
-	* devices.cc: Regenerate.
-	* dtable.cc (build_fh_pc): Don't reset /dev/tty device.  Let the device
-	opener do that.
-	* fhandler_termios.cc (tty_min::set_ctty): Redefine to _pinfo class.
-	* fhandler_tty.cc (fhandler_tty_common::set_close_on_exec): Avoid
-	setting noninherit flag for ctty.
-	* tty.h: Move BOOLs to bools.
-	(tty_min::set_ctty): Redeclare to _pinfo class.
-	* pinfo.cc (_pinfo::set_ctty): Define new function based on
-	tty_min::set_ctty.  Change first argument from tty number to tty_min
-	class.
-	* pinfo.h (_pinfo::set_ctty): Declare.
-	* fhandler_console.cc (fhandler_console::get_tty_stuff): Reflect move
-	of set_ctty to _pinfo class.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Treat FH_TTY specially.
-	Use saved cygheap value if it exists.  Otherwise convert to real device
-	and save on first time open.
-	(fhandler_tty_common::dup): Potentially set controlling tty if duping a
-	slave tty.
-	* syscalls.cc (setsid): Close controlling tty in cygheap.
-	* tty.cc: Change some BOOLs to bools.
-
-2003-12-07  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* syscalls.cc (locked_append): New.
-	(updwtmp): Remove mutex code and call locked_append.
-	(pututline): Ditto.
-
-2003-12-06  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (_threadinfo::remove): Avoid a linked list walk.
-
-2003-12-06  Christopher Faylor  <cgf@redhat.com>
-
-	* cygtls.h (_threadinfo::find_tls): New function.
-	* exceptions.cc (_threadinfo::find_tls): Rename from find_tls.  Use
-	critical section to protect access to linked list.
-
-2003-12-06  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (_threadinfo::remove): Avoid returning without
-	unlocking critical section in the (hopefully impossible) case of an
-	unrecognized thread.
-
-2003-12-06  Christopher Faylor  <cgf@redhat.com>
-
-	* cygtls.h: Add more "don't parse this" guards.
-	(_threadinfo::init_thread): Rename from 'init'.
-	(_threadinfo::init): Declare new function.
-	(_threadinfo::protect_linked_list): Declare new critical section.
-	* dcrt0.cc (dll_crt0_1): Call init_thread to initialize thread stuff.
-	(_dll_crt0): Call _threadinfo::init prior to invoking dll_crt0_1.
-	* exceptions.cc (_threadinfo::init_thread): Rename from 'init'.
-	(_threadinfo::init): Define new function.  Protect linked list
-	manipulation with new critical section.
-	(_threadinfo::call): Reflect function name change.
-	(_threadinfo::remove): Protect linked list manipulation with new
-	critical section
-	* gentls_offsets: Rework to allow multi-line "don't parse this"
-	protection.
-	* init.cc (dll_entry): Don't remove threads info stuff here since the
-	remove function uses a critical section which can't be used during
-	thread creation or destruction.
-	* thread.cc (pthread::exit): Call _threadinfo remove function here.
-
-2003-12-05  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub2): Remove myself from the list of
-	threads monitored by signals since this thread will never call raise or
-	sigwait.
-	(cygthread::simplestub2): Ditto.  Set ev here.
-	(cygthread::cygthread): Don't set ev here for freerange thread.
-
-2003-12-04  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (slash_unc_prefix_p): Allow '.' as a valid character after
-	'\\' in a UNC path.
-
-2003-12-04  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (setup_handler): Remove ill-advised debugging output.
-
-2003-12-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/types.h (struct __fcntl64): Fix datatype of l_start.
-
-2003-12-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	Substitute 0x7fffffff and 0xffffffff by INT32_MAX and UINT32_MAX
-	throughout, except in assembler code.
-
-2003-12-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::lock): Use UINT32_MAX
-	instead of 0xffffffff.  Accommodate Win 9x bug in evaluating length
-	of area to lock when given length is 0.
-
-2003-12-03  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::lock): Interchange
-	values of off_low and off_high.
-
-2003-12-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fcntl.cc (fcntl_worker): Remove static storage class.
-	* flock.cc (flock): Use struct __flock64. Call fcntl_worker.
-	Use Cygwin errno functions instead of accessing errno directly.
-	* winsup.h: Declare fcntl_worker.
-
-2003-12-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fcntl.cc: Whitespace cleanup.
-
-2003-12-03  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Properly establish _threadinfo
-	environment.
-	(cygthread::stub2): New function.
-	(cygthread::simplestub): Ditto.
-	(cygthread::simplestub2): New function.
-	* cygthread.h (cygthread::stub2): Declare new function.
-	(cygthread::simplestub2): Ditto.
-	* cygtls.h (_threadinfo::call): Declare new function.
-	(_threadinfo::call2): Ditto.
-	* dcrt0.cc (dll_crt0_1): Accommodate new _threadinfo::init which
-	doesn't return pointer to tls.
-	(_dll_crt0): Remove obsolete DECLARE_TLS_STORAGE.
-	(dll_crt0): Ditto.
-	* exceptions.cc (_threadinfo::call): New function.
-	(_threadinfo::call2): Ditto.
-	(_threadinfo::init): Don't return pointer.
-	* thread.cc (pthread::thread_init_wrapper): Properly establish
-	_threadinfo environment.
-	(pthread::thread_init_wrapper2): New function.
-	* thread.h (pthread::thread_init_wrapper): Remove noreturn attribute
-	(pthread::thread_init_wrapper2): Declare new function.
-	* winbase.h: Remove obsolete code.
-
-2003-12-02  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Change the way that -f options are appended to CFLAGS,
-	slightly.
-
-2003-12-02  Christopher Faylor  <cgf@redhat.com>
-
-	* fcntl.cc (_fcntl): Silence a compiler warning.
-
-2003-12-02  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* pinfo.cc (pinfo::init): Use shared_name to construct the mapname.
-
-2003-12-01  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (pthread_rwlock::add_reader): Remove mx parameter for
-	List_insert call.
-	(pthread::prepare): Ensure race safeness when adding function
-	pointers to atfork lists by using List_insert.
-	* thread.h (List_insert): Use InterlockedCompareExchangePointer to
-	ensure race safeness without using a mutex.
-	(List_remove): Use InterlockedCompareExchangePointer to
-	ensure race safeness with List_insert.
-	(List::insert): Remove mx parameter for List_insert call.
-
-2003-12-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (OBSOLETE_FUNCTIONS): Add fcntl.
-	(NEW_FUNCTIONS): Add fcntl64.
-	* cygwin.din: Export fcntl64.  Make fcntl being SIGFE.
-	* fcntl.cc (fcntl_worker): New function.
-	(fcntl64): New function.
-	(_fcntl): Call fcntl_worker.  Convert 32 bit flock structure into
-	64 bit flock structure and vice versa.
-	* fhandler.cc (fhandler_base::lock): Change 2nd parameter to
-	struct __flock64 *.
-	* fhandler_disk_file.cc (fhandler_disk_file::lock): Ditto.  Rework
-	to be 64 bit aware.
-	* fhandler.h: Accommodate above method argument changes.
-	* include/cygwin/types.h: Add struct __flock32 and __flock64.
-	Define struct flock according to setting of __CYGWIN_USE_BIG_TYPES__.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-12-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygheap.cc (cygheap_init): Set cygheap->shared_prefix.
-	* cygheap.h (struct init_cygheap): Add shared_prefix.
-	* shared.cc (shared_name): Use cygheap->shared_prefix.
-
-2003-12-01  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* shared.cc (shared_name): Take into account the SE_CREATE_GLOBAL_NAME
-	privilege when building the name string.
-	(open_shared): Remove the call to OpenFileMapping.
-	(shared_info::initialize): Move cygheap initialization to ...
-	(memory_init): ... here. Suppress now useless shared_h variable.
-	(user_shared_initialize): Make tu a cygpsid.
-
-2003-12-01  Dr. Volker Zell  <Dr.Volker.Zell@oracle.com>
-
-	* include/tzfile.h: Remove duplicate definition of TM_SUNDAY.
-	* localtime.cc: Point TZDIR to the /usr/share/zoneinfo directory used
-	by the tzcode package.
-
-2003-11-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* flock.cc: Renamed from flock.c.
-
-2003-11-29  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.h: Remove global_sigs declaration.
-	* siginfo.h: Move global_sigs declaration here.
-	* Makefile.in: Remove duplicate compiler flag.
-
-2003-11-29  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (_threadinfo::pop): Zero *contents* of popped stack
-	location rather than the actual stack pointer.
-
-2003-11-29  Nicholas Wourms  <nwourms@netscape.net>
-
-	* Makefile.in: (DLL_OFILES): Add flock.o.
-	* cygwin.din: Export flock.
-	* flock.c: New file.
-	* include/sys/file.h: Include sys/cdefs.h.
-	Add function prototype for flock().
-	Add some comments from BSD's header for further clarity.
-	(L_SET, L_CURR, L_INCR, L_XTND): Redefine as the macros
-	SEEK_SET, SEEK_CUR, SEEK_CUR, & SEEK_END respectively.
-	(LOCK_SH,LOCK_EX,LOCK_NB,LOCK_UN): New macros for flock().
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-11-28  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (no_signals_available): Fix so that non-zero exit state is
-	a true condition rather than errnoneously only checking other states
-	when exist_state was zero.
-
-2003-11-28  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.h (_pinfo::getthread2signal): Remove obsolete function.
-	* cygtls.h (_threadinfo): Define tid more precisely.
-	(_threadinfo::operator HANDLE): Define.
-	* exceptions.cc (_threadinfo::interupt_now): Use _threadinfo HANDLE
-	operator to derive thread handle.
-	(setup_handler): Ditto.
-	* sigproc.cc: Reorganize includes.
-
-2003-11-28  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.h (_pinfo::getsig): Remove obsolete function, here and
-	throughout.
-	* exceptions.cc: Ditto.
-	* fhandler_termios.cc: Ditto.
-	* signal.cc: Ditto.
-	* sigproc.cc: Ditto.
-
-	* Makefile.in: Revert previous change which made a cygwin.din newer
-	than a version.h a warning rather than an error.
-
-2003-11-28  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din: Re-add inexplicably missing semaphore/msg functions.
-
-2003-11-28  Christopher Faylor  <cgf@redhat.com>
-
-	* gendevices: Issue error when shilka is missing.
-
-2003-11-28  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/signal.h: New file.
-
-2003-11-28  Christopher Faylor  <cgf@redhat.com>
-
-	Eliminate use of sigframe and sigthread throughout.
-	* Makefile.in (DLL_OFILES): Add sigfe.o.  Remove reliance on cygwin.def
-	from cygwin0.dll dependency since dependence on sigfe.o implies that.
-	Generate def file on the fly using 'gendef'.
-	* configure.in: Don't auto-generate cygwin.def.
-	* configure: Regenerate.
-	* cygwin.din: Add SIGFE stuff where appropriate.
-	* dcrt0.cc (dll_crt0_1): Initialize cygwin tls early in process
-	startup.  Set _main_tls to address of the main thread's cygwin tls.
-	* debug.h: Remove now unneeded WFSO and WFMO declarations.
-	* exceptions.cc (_last_thread): Define.
-	(set_thread_state_for_signals): New function.
-	(reset_thread_exception_for_signals): Ditto.
-	(init_thread_for_signals): Ditto.
-	(delete_thread_for_signals): Ditto.
-	(capture_thread_for_signals): Ditto.
-	(handle_exceptions): Set return address explicitly for exceptions prior
-	to calling sig_send.
-	(interrupt_on_return): Eliminate.
-	(setup_handler): Add preliminary implementation for dealing with
-	thread-specific signals by querying _main_tls.
-	(signal_exit): Use cygthread::main_thread_id instead of mainthread.id.
-	(call_signal_handler_now): For now, just handle the main thread.
-	* fork.cc (vfork): Save and restore main _my_tls.
-	* gendef: New file.  Generates def file and sigfe.s file.
-	* gentls_offsets: New file.  Generates offsets for perl to use in
-	sigfe.s.
-	* how-signals-work.txt: Mention that info is obsolete.
-	* init.cc (dll_entry): Initialize cygwin tls storage here.
-	* miscfuncs.cc (low_priority_sleep): Make a C function for easier
-	calling from asm.
-	* perthread.h (vfork_save::tls): New element.
-	* signal.cc (nanosleep): Replace previous use of
-	sigframe.call_signal_handler_now with straight call to
-	call_signal_handler_now.
-	(abort): Ditto.
-	* syscalls.cc (readv): Ditto.
-	* termios.cc (tcsetattr): Ditto.
-	* wait.cc (wait4): Ditto.
-	* sigproc.cc (sig_dispatch_pending): Ditto.
-	(sig_send): Ditto.
-	* sigproc.h: Declare call_signal_handler_now.
-	* thread.cc (pthread::thread_init_wrapper): Initialize cygwin tls.
-	Remove obsolete and unworking signal stuff.
-	* thread.h (verifyable_object::sigs): Eliminate.
-	(verifyable_object::sigmask): Eliminate.
-	(verifyable_object::sigtodo): Eliminate.
-	(verifyable_object::exit): Make attribute noreturn.
-	(verifyable_object::thread_init_wrapper): Ditto.
-	(pthread_null::exit): Ditto.
-	* winbase.h (__stackbase): Always define.
-	* winsup.h (low_priority_sleep): Declare as a "C" function.
-	* include/cygwin/version.h: Bump API version to reflect sigwait export.
-
-	* include/sys/queue.h: Protect SLIST_ENTRY from previous declaration.
-
-	* signal.cc (sigwait): Implement.
-
-	* select.cc (fhandler_base::ready_for_read): Add debugging output.
-
-	* devices.h: Define more device pointers via their storage.
-	* devices.in: Don't parse things like /dev/inet/tcp, as they really
-	have no meaning.
-	* devices.cc: Regenerate.
-	* gendevices: Set proper protection for output file.
-
-	* cygtls.h: New file.
-	* gendef: New file.
-	* gentls_offsets: New file.
-	* tlsoffsets.h: New file.  Autogenerated.
-	* config/i386/longjmp.c: Remove.  File subsumed by gendef output.
-	* config/i386/makefrag: Remove obsolete file.
-
-	* fhandler.cc: Remove spurious access_worker declaration.
-
-	* spawn.cc (spawnve): Make debugging output more accurate.
-
-	* cygwin-gperf: Remove.
-	* devices.cc: Remove.
-
-2003-11-28  Christopher Faylor  <cgf@redhat.com>
-
-	* speclib: Use correct EOF marker.  Ensure that directory is actually
-	deleted when running under Windows.
-
-2003-11-27  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::readdir): Reorganize to
-	avoid inappropriate .lnk extensions with munged filenames under managed
-	mode.
-
-2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* sec_helper.cc (set_process_privilege): Rename restore_priv to
-	priv_luid.
-
-2003-11-26  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* sec_helper.cc (set_process_privilege): Call LookupPrivilegeValue
-	before opening the token.
-
-2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dir.cc (mkdir): Use local security_descriptor. Call
-	set_security_attribute appropriately.
-	* external.cc (cygwin_internal): Ditto.
-	* fhandler.cc (fhandler_base::open): Ditto.
-	* fhandler_socket.cc (fhandler_socket::bind): Ditto.
-	* path.cc (symlink_worker): Ditto.
-	* sec_acl.cc (setacl): Ditto. Call read_sd appropriately.
-	(getace): Ditto.
-	* sec_helper.cc (security_descriptor::malloc): New method.
-	(security_descriptor::realloc): New method.
-	(security_descriptor::free): New method.
-	* security.cc (read_sd): Get security_descriptor as parameter instead
-	of PSECURITY_DESCRIPTOR and a size. Drop unnecessary parameter check.
-	Allocate the security_descriptor buffer according to size returned by
-	a call to GetFileSecurity. Return buffer size on success.
-	(write_sd): Get security_descriptor as parameter instead of
-	PSECURITY_DESCRIPTOR and a size.
-	(get_nt_attribute): Use local security_descriptor.
-	(get_nt_object_attribute): Ditto in case of type == SE_REGISTRY_KEY.
-	Allocate security_descriptor buffer according to size returned by
-	a call to RegGetKeySecurity.
-	(alloc_sd): Make static. Get security_descriptor as parameter instead
-	of PSECURITY_DESCRIPTOR and a size. Drop unnecessary parameter check.
-	(set_security_attribute): Get security_descriptor as parameter instead
-	of PSECURITY_DESCRIPTOR and a size.
-	(set_nt_attribute): Use local security_descriptor.
-	(check_file_access): Ditto.
-	* security.h: Add class security_descriptor.
-	(read_sd): Change declaration to get security_descriptor as parameter
-	instead of PSECURITY_DESCRIPTOR and a size.
-	(write_sd): Ditto.
-	(set_security_attribute): Ditto.
-	(alloc_sd): Remove declaration.
-	* thread.cc (semaphore::semaphore): Use local security_descriptor. Call
-	set_security_attribute appropriately.
-
-2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* sec_acl.h (getace): Use FILE_*_BITS as permission mask.
-	* security.cc (get_attribute_from_acl): Ditto.
-	* security.h (FILE_READ_BITS): Define to match also GENERIC bits.
-	(FILE_WRITE_BITS): Ditto.
-	(FILE_EXEC_BITS): Ditto.
-
-2003-11-25  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.cc: Minor whitespace cleanup.  Remove some obsolete code.
-
-2003-11-24  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (build_fh_name): Set error in dummy fhandler when one is
-	noted during path_conv.
-	* fhandler.h (fhandler_base::set_error): New method.
-
-2003-11-24  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Avoid using cygserver unless hosting on cygwin.
-
-2003-11-23  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (sig_send): Correct below checkin.  Use
-	thisframe.call_signal_handler.
-
-2003-11-23  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (proc_exists): A zombie process does not exist.
-	(sig_send): Improve debugging output.  Wait for pipe to be created
-	before trying to send to it.  Call call_signal_handler_now if sending a
-	signal to myself.
-
-2003-11-22  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (check_sanity_and_sync): Correct api major version check so
-	that newer dlls will work with older apps but not vice versa.
-
-2003-11-21  Christopher Faylor  <cgf@redhat.com>
-
-	* sem.cc: Always include signal.h to handle SIGSYS raise when
-	!USE_SERVER.
-	* shm.cc: Ditto.
-
-2003-11-21  Christopher Faylor  <cgf@redhat.com>
-
-	* msg.cc: Always include signal.h to handle SIGSYS raise when
-	!USE_SERVER.
-
-2003-11-20  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Make --use-server the default.  Remove powerpc target.
-	* configure: Regenerate.
-
-2003-11-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* msg.cc (msgctl): Raise SIGSYS if call not available.
-	(msgget): Ditto.
-	(msgrcv): Ditto.
-	(msgsnd): Ditto.
-	* sem.cc (semctl): Ditto.
-	(semget): Ditto.
-	(semop): Ditto.
-	* shm.cc (shmat): Ditto.
-	(shmctl): Ditto.
-	(shmget): Ditto.
-	(shmdt): Ditto.
-
-2003-11-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygserver.h (client_request::request_code_t): Add
-	CYGSERVER_REQUEST_MSG and CYGSERVER_REQUEST_SEM.
-	(admininstrator_group_sid): Add extern declaration.
-	* cygserver_ipc.h: Rewrite.
-	* cygserver_msg.h: New file.
-	* cygserver_sem.h: New file.
-	* cygserver_shm.h: More or less rewrite.
-	* cygwin.din: Add msgctl, msgget, msgrcv, msgsnd, semctl, semget and
-	semop.
-	* msg.cc: Rewrite.
-	* safe_memory.h: Remove.
-	* sem.cc: Rewrite.
-	* shm.cc: Rewrite.
-	* include/cygwin/ipc.h: Use appropriate guard.
-	(struct ipc_perm): Add seq.
-	(IPCID_TO_IX): New define from BSD.
-	(IPCID_TO_SEQ): Ditto.
-	(IXSEQ_TO_IPCID): Ditto.
-	(IPC_R): Ditto.
-	(IPC_W): Ditto.
-	(IPC_M): Ditto.
-	* include/cygwin/msg.h: Use appropriate guard. #ifdef _KERNEL all stuff
-	not explicitely defined by SUSv3. Use signed types in structs to match
-	types used in BSD.
-	(msgqnum_t): Define unsigned.
-	(msglen_t): Ditto.
-	(struct msqid_ds): Add msg_first and msg_last.
-	(struct msginfo): Remove msgpool. Add msgssz and msgseg.
-	* include/cygwin/sem.h: Use appropriate guard. #ifdef _KERNEL all stuff
-	not explicitely defined by SUSv3. Use signed types in structs to match
-	types used in BSD.
-	(SEM_UNDO): Define appropriately.
-	(struct semid_ds): Add sem_base.
-	(struct seminfo): Add semmap and semusz.
-	(SEM_A): New define from BSD.
-	(SEM_R): Ditto.
-	(SEM_ALLOC): Ditto.
-	(union semun): Define.
-	* include/cygwin/shm.h: Use appropriate guard. #ifdef _KERNEL all stuff
-	not explicitely defined by SUSv3. Use signed types in structs to match
-	types used in BSD.
-	(SHMLBA): Define using cygwin_internal(CW_GET_SHMLBA) call.
-	(struct shmid_ds): Add shm_internal.
-	(struct shm_info): Rename shm_ids to used_ids as in BSD.  Add define
-	for shm_ids.
-	* include/cygwin/sysproto.h: New file.
-	* include/cygwin/version.h: Bump API minor number.
-	* include/sys/ipc.h: New file.
-	* include/sys/msg.h: New file.
-	* include/sys/queue.h: New file from BSD.
-	* include/sys/sem.h: New file.
-	* include/sys/shm.h: New file.
-	* include/sys/sysproto.h: New file.
-
-2003-11-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dtable.cc (build_fh_pc): Resurrect accidentally removed
-	DEV_CYGDRIVE_MAJOR case.
-
-2003-11-17  Brian Ford  <ford@vss.fsi.com>
-
-	* fhandler.cc (fhandler_base::lseek): Include high order offset
-	bits in return value.
-
-2003-11-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* bsdlib.cc (getprogname): New function.
-	(setprogname): New funtion.
-	* cygwin.din: Export getprogname and setprogname.
-	* include/cygwin/version.h: Bumb API version number.
-
-2003-11-15  Christopher Faylor  <cgf@redhat.com>
-
-	* include/limits.h: Revert unsanctioned changes below.
-	* include/cygwin/config.h: Ditto.
-	* include/sys/param.h: Ditto.
-
-2003-11-14  Robert Collins <rbtcollins@hotmail.com>
-	    Ron Parker <rdparker@butlermfg.com>
-
-	* bsdlib.cc: Update throughout to use CYG_MAX_PATH rather than MAX_PATH.
-	* cygheap.h: Ditto.
-	* dcrt0.cc: Ditto.
-	* delqueue.cc: Ditto.
-	* dlfcn.cc: Ditto.
-	* dll_init.cc: Ditto.
-	* dll_init.h: Ditto.
-	* dtable.cc: Ditto.
-	* environ.cc: Ditto.
-	* environ.h: Ditto.
-	* exceptions.cc: Ditto.
-	* external.cc: Ditto.
-	* fhandler_disk_file.cc: Ditto.
-	* fhandler_proc.cc: Ditto.
-	* fhandler_process.cc: Ditto.
-	* fhandler_raw.cc: Ditto.
-	* fhandler_registry.cc: Ditto.
-	* fhandler_socket.cc: Ditto.
-	* fhandler_virtual.cc: Ditto.
-	* miscfuncs.cc: Ditto.
-	* mmap.cc: Ditto.
-	* netdb.cc: Ditto.
-	* path.cc: Ditto.
-	* path.h: Ditto.
-	* pinfo.cc: Ditto.
-	* pinfo.h: Ditto.
-	* pthread.cc: Ditto.
-	* registry.cc: Ditto.
-	* shared.cc: Ditto.
-	* shared_info.h: Ditto.
-	* smallprint.c: Ditto.
-	* spawn.cc: Ditto.
-	* strace.cc: Ditto.
-	* syscalls.cc: Ditto.
-	* thread.h: Ditto.
-	* uinfo.cc: Ditto.
-	* winsup.h: Ditto.
-	* include/limits.h: Ditto.
-	* include/cygwin/config.h: Ditto.
-	* include/sys/param.h: Ditto.
-
-2003-11-12  Brian Ford  <ford@vss.fsi.com>
-
-	* dtable.cc (build_fh_pc): Use DEV_SERIAL_MAJOR to catch all serial
-	ports.  Remove redundant FH_CYGDRIVE case since it is handled by
-	DEV_CYGDRIVE_MAJOR.
-
-2003-11-11  Christopher Faylor  <cgf@redhat.com>
-	    Thomas Pfaff <tpfaff@gmx.net>
-
-	* thread.cc (pthread::exit): Cleanup on thread exit.
-	(__reent_t::init_clib): Set thread local clib __cleanup var
-	appropriately.
-
-2003-11-10  Christopher Faylor  <cgf@redhat.com>
-
-	* miscfuncs.cc (low_priority_sleep): Make a "C" function.
-	* winsup.h (low_priority_sleep): Revert previous change to declaration.
-
-2003-11-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.h (low_priority_sleep): Fix declaration to avoid linker
-	warning.
-
-2003-11-10  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (__reent_t::init_clib): Set thread local clib
-	__sdidinit var appropriately.
-
-2003-11-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (ftruncate64): Log length as long long.
-	(logout): Erase ut_host.  Don't write wtmp entry.  Return 1 only
-	if matching utmp entry has been found, 0 otherwise.
-
-2003-11-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* external.cc (cygwin_internal): Add CW_GET_UID_FROM_SID and
-	CW_GET_GID_FROM_SID handling.
-	* include/cygwin/version.h: Bump API minor number.
-	* include/sys/cygwin.h (cygwin_getinfo_types): Add
-	CW_GET_UID_FROM_SID and CW_GET_GID_FROM_SID.
-
-2003-11-07  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::opendir): Reorganize to
-	handle freeing of memory on error condition.
-
-2003-11-07  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::freerange): Set inuse count.  Avoid setting
-	ev from h as h would be NULL at this point.
-	(cygthread::operator new): Issue debugging info when overflowing the
-	thread pool.
-	(cygthread::cygthread): Set ev from h here after h has been initialized.
-
-2003-11-06  Corinna Vinschen  <corinna@vinschen.de>
-
-	* bsdlib.cc (_vwarnx): New function.
-	(vwarn): Ditto.
-	(vwarnx): Ditto.
-	(warn): Ditto.
-	(warnx): Ditto.
-	(verr): Ditto.
-	(verrx): Ditto.
-	(err): Ditto.
-	(errx): Ditto.
-	* cygwin.din: Export above functions.
-	* include/err.h: New file.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-11-06  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (getshmlba): New function.
-	* external.cc (cygwin_internal): Add CW_GET_SHMLBA handling.
-	* mmap.cc (mmap64): Call getshmlba to evaluate granularity.
-	* winsup.h (getshmlba): Add declaration.
-	* include/cygwin/version.h: Bump API minor number.
-	* include/sys/cygwin.h (cygwin_getinfo_types): Add CW_GET_SHMLBA.
-
-2003-11-06  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.h: Declare access_worker.
-
-2003-11-05  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/types.h: Fix preprocessor guards for vm_offset_t and
-	vm_size_t.  Add typedef for vm_object_t.
-
-2003-11-05  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::opendir): Detect attempt
-	to open a directory which lacks read privileges.
-
-2003-11-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* external.cc (cygwin_internal): Add CW_GET_POSIX_SECURITY_ATTRIBUTE
-	handling.
-	* include/cygwin/version.h: Bump API minor number.
-	* include/sys/cygwin.h (cygwin_getinfo_types): Add
-	CW_GET_POSIX_SECURITY_ATTRIBUTE.
-
-	* exceptions.cc (init_global_security): Move from here...
-	* sec_helper.cc (init_global_security): ...to here.
-
-2003-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc (dup_ent): Use IsBadStringPtr for alignment checks.  Don't use
-	a known bad pointer.
-
-2003-11-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (dup_ent): Move Win 95 misalignment recogition before
-	trying to evaluate string length.
-
-2003-10-31  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (pthread::thread_init_wrapper): Initialize exception
-	handling.
-
-2003-10-31  Thomas Pfaff  <tpfaff@gmx.net>
-
-	Rename pthread::running to pthread::valid throughout.
-
-	* thread.h: (pthread::suspend_all_except_self): New static method.
-	(pthread::resume_all): Ditto.
-	(pthread::suspend_except_self): New method.
-	(pthread::resume): Ditto.
-	* thread.cc (pthread::suspend_except_self): Implement.
-	(pthread::resume): Ditto.
-
-2003-10-29  Danny Smith  <dannysmith@users.sourceforege.net>
-
-	* include/stdint.h: Prevent signed->unsigned conversion for 32 and
-	64 bit min value constants.
-
-2003-10-28  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-
-	* path.cc (dot_special_chars): New global variable.
-	(special_name): Make files ending in "." special.
-	(fnunmunge): Allow encoded ".".
-	(mount_item::fnmunge): Handle trailing ".".
-
-2003-10-28  Christopher Faylor  <cgf@redhat.com>
-
-	* include/stdint.h: Duplicate below effort for rest of *64_*.
-
-2003-10-28  Christopher Faylor  <cgf@redhat.com>
-
-	* include/stdint.h: Correctly define INT64_MAX.
-
-2003-10-27  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.h (fast_mutex::init): Initialize lock_counter.
-
-2003-10-27  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (OBSOLETE_FUNCTION):  Add tmpfile.
-	(NEW_FUNCTIONS): Add _tmpfile64 -> tmpfile translation.
-	* cygwin.din: Export _tmpfile64
-	* include/cygwin/version.h: Bump api minor number.
-
-2003-10-27  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din: Add sem_close, sem_getvalue, sem_open and sem_timedwait.
-	* pthread.cc (+mangle_sem_name): New function.
-	(sem_open): Ditto.
-	(sem_close: Ditto.
-	(sem_timedwait): Ditto.
-	(sem_getvalue): Ditto.
-	* thread.cc (semaphore::semaphore): Rearrange member initialization.
-	Use appropriate security attribute for process shared semaphores.
-	(semaphore::semaphore): New constructor for named semaphores.
-	(semaphore::~semaphore): Care for semaphore name.
-	(semaphore::_post): Accommodate failing ReleaseSemaphore. Use value
-	returned by ReleaseSemaphore vor currentvalue.
-	(semaphore::_getvalue): New method.
-	(semaphore::_timedwait): Ditto.
-	(semaphore::_fixup_after_fork): Rearrange. Don't fail for process
-	shared semaphores.
-	(semaphore::open): New method.
-	(semaphore::timedwait): Ditto.
-	(semaphore::post): Fix return value.  Set errno appropriately.
-	(semaphore::getvalue): New method.
-	* thread.h (class semaphore): Add prototypes for open, getvalue,
-	timedwait, _getvalue, _timedwait.  Add prototypes for new constructor.
-	Add name member.
-	* include/semaphore.h: Add prototypes for sem_open, sem_close,
-	sem_timedwait and sem_getvalue.
-	include/cygwin/version.h: Bump API minor number.
-
-2003-10-27  Corinna Vinschen  <corinna@vinschen.de>
-
-	* miscfunc.cc (__check_invalid_read_ptr): New function.
-	* winsup.h: Declare.
-
-2003-10-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.h (cygpsid::debug_print): Avoid compiler warnings.
-
-2003-10-25  Corinna Vinschen  <corinna@vinschen.de>
-
-	* path.cc (normalize_posix_path): Test runs of more than two
-	dots for being a run of only dots.  Let it pass if not.
-
-2003-10-25  Brian Ford  <ford@vss.fsi.com>
-
-	* fhandler.cc (fhandler_base::ioctl): Handle FIONBIO.
-
-2003-10-24  Thomas Pfaff  <tpfaff@gmx.net>
-
-	Rename native_mutex to fast_mutex throughout.
-	Rename pthread_key::save_key_to_buffer to
-	pthread_key::_fixup_before_fork throughout.
-	Rename pthread_key::recreate_key_from_buffer to
-	pthread_key::_fixup_after_fork throughout.
-
-	* thread.cc (native_mutex::init): Remove.
-	(native_mutex::lock): Ditto.
-	(native_mutex::unlock): Ditto.
-	(pthread::push_cleanup_handler): InterlockedExchangePointer
-	is not needed here.
-	(pthread_rwlock::pthread_rwlock): Initialize readers list mutex.
-	(pthread_rwlock::add_reader): Add reader via List_insert.
-	(pthread_rwlock::lookup_reader): Lock list while walking through.
-	(pthread_cond::init): Locking the init mutex is now void.
-	(pthread_rwlock::init): Ditto.
-	(pthread_mutex::init): Ditto.
-	* thread.h: Include security.h.
-	(fast_mutex): New class. Replacement for native_mutex.
-	(List_insert): New template function.
-	(List_remove): Ditto.
-	(List::List): Initialize synchronising mutex.
-	(List::fixup_after_fork): New method.
-	(List::insert): Add node via List_insert.
-	(List::remove): Remove node via List_remove.
-	(List::pop): Remove.
-	(List::for_each): Lock list while walking through.
-	(List::mx_init): New method.
-	(pthread_mutex::fixup_after_fork): Fixup mutex list after fork.
-	(pthread::fixup_after_fork): Ditto.
-	(pthread_conds::fixup_after_fork): Ditto.
-	(pthread_rwlock::fixup_after_fork): Ditto.
-	(semaphore::fixup_after_fork): Ditto.
-	(pthread_rwlock::readers_mx): New member.
-
-2003-10-24  Brian Ford  <ford@vss.fsi.com>
-
-	* fhandler.cc (fhandler_base::fcntl): Don't clobber O_APPEND when
-	both O_NONBLOCK/O_NDELAY are set for F_SETFL.
-
-2003-10-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* path.cc (win32_device_name): Fix comment.
-
-2003-10-23  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::ioctl): Properly set return
-	value in FIONBIO case.
-
-2003-10-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_proc.cc (format_proc_partitions): Use new device code
-	to get major and minor device numbers.  Fix size evaluation.
-
-2003-10-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* external.cc (cygwin_internal): Add CW_GET_ERRNO_FROM_WINERROR
-	handling.
-	* include/cygwin/version.h: Bump API minor number.
-	* include/sys/cygwin.h (cygwin_getinfo_types): Add
-	CW_GET_ERRNO_FROM_WINERROR.
-
-2003-10-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in: Add $(LIBSERVER) rule.
-	* cygserver.h: Moved from include/cygwin to here.
-	* cygserver_ipc.h: Moved from ../cygserver to here.
-	* cygserver_shm.h: Ditto.
-	* cygwin.din: Add shmat, shmctl, shmdt and shmget.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Don't warn about handle
-	dup'ing if not build with USE_SERVER.
-	* shm.cc: Include cygerrno.h unconditionally.
-	(shmat): Set errno to ENOSYS and return -1 if not build with
-	USE_SERVER.
-	(shmctl): Ditto.
-	(shmdt): Ditto.
-	(shmget): Ditto.
-	* woutsup.h: Remove.
-	* include/cygwin/cygserver_process.h: Moved to ../cygserver directory.
-	* include/cygwin/cygserver_transport.h: Ditto.
-	* include/cygwin/cygserver_transport_pipes.h: Ditto.
-	* include/cygwin/cygserver_transport_sockets.h: Ditto.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-10-16  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* syscalls.cc (seteuid32): Always construct a default DACL including
-	the new sid, Admins and SYSTEM and copy it to the new thread token.
-	* security.cc (create_token): Use a NULL default DACL in NtCreateToken.
-
-2003-10-14  Micha Nelissen  <M.Nelissen@student.tue.nl>
-
-	* dcrt0.cc: Remove local variable alternate_charset_active.
-	* fhandler.h: Add variable alternate_charset_active, functions
-	str_to_con, con_to_str to dev_console structure.
-	* fhandler_console.cc (con_to_str): Move function into dev_console
-	class.
-	(str_to_con): Ditto.
-	(fhandler_console::read): Call con_to_str on dev_state.
-	(fhandler_console::write_normal): Call str_to_con on dev_state.
-	(fhandler_console::char_command): Change active_charset_active
-	assignment to be on dev_state.
-	* winsup.h: Remove global external variable alternate_charset_active.
-
-2003-10-13  Micha Nelissen  <M.Nelissen@student.tue.nl>
-
-	* fhandler_console.cc (char_command): Add escape sequence for codepage
-	ansi <-> oem switching for ncurses frame drawing capabilities.
-	* dcrt0.cc: Add local variable alternate_charset_active.
-	* winsup.h: Add global external variable alternate_charset_active.
-
-2003-10-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* exceptions.cc (ctrl_c_handler): Don't send SIGHUP on
-	CTRL_LOGOFF_EVENT to processes running in invisible Windows Stations.
-	* window.cc (has_visible_window_station): New function.
-	* winsup.h: Add declaration for has_visible_window_station.
-
-2003-10-10  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::open): Don't create a new window
-	station if one already exists.
-
-2003-10-10  Christopher Faylor  <cgf@redhat.com>
-
-	* shared.cc (shared_info::initialize): Remove myself check since
-	hMainProc initialization will allow user initialization to work.
-
-2003-10-09  Yitzchak Scott-Thoennes <sthoenna@efn.org>
-
-	* include/sys/mman.h (MAP_FAILED): Define as void *.
-
-2003-10-08  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (hMainProc): Initialize to useful value for use when dll is
-	dynamically loaded.
-	* shared.cc (shared_info::initialize): Don't initialize user stuff if
-	myself doesn't exist.
-
-2003-10-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (unlink): Don't even try DELETE_ON_CLOSE technique on
-	systems not supporting it.
-
-2003-10-02  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (dll_crt0_1): Call newlib __sinit routine to ensure that
-	stdio buffers are initialized to avoid thread initialization races.
-
-2003-10-01  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (win32_device_name): Only fill out destination buffer when
-	it's really a device.
-
-2003-09-30  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Add YA method for generating devices.cc.
-	* child_info.h: YA update of another magic number.
-	* gendevices: New file.
-	* devices.in: New file.
-	* devices.cc: Regenerate.
-	* devices.shilka: Remove.
-	* devices.h: Correctly define device pointers.
-	(device): Remove now obsolete fields.
-	(device::native): Renamed from device::fmt.
-	* dtable.cc (build_fh_dev): Simplify in light of new unit parsing
-	scheme.
-	(build_fh_pc): Ditto.
-	* path.cc (win32_device_name): Ditto.
-	* fhandler.h (fhandler_base::get_native_name): Reflect renaming of fmt
-	to native.
-	* fhandler_tty.cc (fhandler_tty_mster::init): Initialize slave device
-	prior to reporting unit.
-
-2003-09-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::fstat): Drop FH_FLOPPY case.
-
-2003-09-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.h (class fhandler_dev_raw): Add method fstat.
-	* fhandler_raw.cc (fhandler_dev_raw::fstat): New method.
-
-2003-09-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* devices.h (enum fh_devices): Remove DEV_RAWDRIVE_MAJOR and
-	FH_RAWDRIVE.
-	* devices.shilka (dev_rawdrive_storage): Remove.
-	(unit_devices): Remove pointer to dev_rawdrive_storage.
-	(uniq_devices): Remove rawdrive entry.
-	* dtable.cc (build_fh_pc): Remove DEV_RAWDRIVE_MAJOR case.
-	* path.cc (win32_device_name): ditto.
-
-2003-09-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syslog.cc (vsyslog): Print debug message if ReportEventA fails.
-
-2003-09-28  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* sigproc.cc (proc_subproc): Restrict permissions on ppid_handle.
-
-2003-09-28  Christopher Faylor  <cgf@redhat.com>
-
-	* devices.shilka (device::parse): Restore check for tty in unit
-	handling, but without the previous typo.
-	* devices.cc: Regenerate.
-	* devices.h (DEV_CYGDRIVE_MAJOR): Change major number to one used by
-	linux for "user-mode virtual block device".
-
-2003-09-28  Corinna Vinschen  <corinna@vinschen.de>
-
-	* devices.h: Move a few device major numbers.  Fix typo of FH_UDP.
-	* device.shilka: Remove /dev/hd device entries, rename all device_hd*
-	to device_sd*.
-	(device::parse): Disallow units outside lower and upper bounds.
-	* dtable.cc (build_fh_pc): Fix typo of FH_UDP.
-	* path.cc (win32_device_name): Fix win32 name creation to match new
-	device handling.
-
-2003-09-27  Christopher Faylor  <cgf@redhat.com>
-
-	* device.shilka (device::parse): Allow units on other than tty.
-
-2003-09-27  Corinna Vinschen  <corinna@vinschen.de>
-
-	* wincap.cc (wincapc::init): Allow requesting server info for NT4 SP6.
-
-2003-09-27  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (symlink_info::check): Use new introducer for mknod'ed files.
-	(parse_device): Ditto.
-	* syscalls.cc (mknod_worker): Ditto.
-
-2003-09-27  Christopher Faylor  <cgf@redhat.com>
-
-	* devices.shilka: Add /dev/sda disk devices.
-	* devices.cc: Regenerate.
-
-2003-09-27  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin-shilka: Remove '#line directives' or suffer debugging oddities.
-	Use -length option so that device prefixes are used.
-	* devices.cc: Regenerate.
-	* syscalls.cc (ttyname): Add debugging output.
-
-2003-09-26  Vaclav Haisman  <V.Haisman@sh.cvut.cz>
-
-	* wincap.h (wincaps::is_server): New flag.
-	(wincapc::version): Change type to OSVERSIONINFOEX.
-	(wincapc::is_server): New function.
-	* wincap.cc (wincap_unknown::is_server): New initializer.
-	(wincap_95): Ditto.
-	(wincap_95osr2): Ditto.
-	(wincap_98): Ditto.
-	(wincap_me): Ditto.
-	(wincap_nt3): Ditto.
-	(wincap_nt4): Ditto.
-	(wincap_nt4sp4): Ditto.
-	(wincap_2000): Ditto.
-	(wincap_xp): Ditto.
-	(wincapc::init): Adapt to OSVERSIONINFOEX.  Add detection of NT server
-	systems.
-	* sched.cc: Include windows.h and registry.h.
-	(sched_rr_get_interval): Re-implement for NT systems.
-
-2003-09-26  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::ioctl): Properly set
-	ioctl_request event when window size changes.  Store failing errno in
-	ioctl_retval (needed?).
-
-2003-09-26  Pavel Tsekov  <ptsekov@gmx.net>
-
-	* fhandler_console.c (fhandler_console::read): Record the state of the
-	SHIFT, CTRL and ALT keys at the time of the last keyboard input event.
-	(fhandler_console::ioctl): Handle requests to retrieve the keyboard
-	modifiers via the TIOCLINUX command.
-	* fhandler_tty.c (fhandler_tty_slave::read): Ditto.
-	* include/sys/termios.h (TIOCLINUX): New macro definition.
-
-2003-09-26  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* pinfo.cc (pinfo::init): Do not give FILE_MAP_WRITE access to Everybody.
-	* exceptions.cc (sig_handle_tty_stop): Do not create pinfo parent with
-	PID_MAP_WRITE.
-	* fhandler_process.cc (fhandler_process::fill_filebuf): Ditto for pinfo p.
-	* signal.cc (kill_worker): Ditto for pinfo dest.
-
-2003-09-26  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* pinfo.h (pinfo::set_acl): Declare.
-	* pinfo.cc (pinfo_fixup_after_fork): Duplicate with no rights.
-	(pinfo::set_acl): New.
-	* spawn.cc (spawn_guts): Call myself.set_acl.
-
-2003-09-26  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* uinfo.cc (cygheap_user::init): Make sure the current user appears
-	in the default DACL. Rearrange to decrease the indentation levels.
-	Initialize the effec_cygsid directly.
-	(internal_getlogin): Do not reinitialize myself->gid. Open the process
-	token with the required access.
-	* cygheap.h (class cygheap_user): Delete members pid and saved_psid.
-	Create members effec_cygsid and saved_cygsid.
-	(cygheap_user::set_sid): Define inline.
-	(cygheap_user::set_saved_sid): Ditto.
-	(cygheap_user::sid): Modify.
-	(cygheap_user::saved_sid): Modify.
-	* cygheap.cc (cygheap_user::set_sid): Delete.
-	(cygheap_user::set_saved_sid): Ditto.
-	* sec_helper.cc (sec_acl): Set the correct acl size.
-	* autoload.cc (FindFirstFreeAce): Add.
-	* security.h: Define ACL_DEFAULT_SIZE.
-
-2003-09-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (munmap): Use correct address and length parameters when
-	calling fhandler's munmap.
-
-2003-09-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* spawn.cc (spawn_guts): Set errno to E2BIG if command line is
-	longer than CreateProcess allows (32K).
-
-2003-09-25  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (build_fh_name): Return pointer to a 'nodevice' rather than
-	a NULL pointer or suffer SEGVs with invalid paths.
-
-2003-09-25  Christopher Faylor  <cgf@redhat.com>
-
-	* fork.cc (fork_parent): Detect failed pinfo constructor.
-	* spawn.cc (spawn_guts): Don't overwrite ENOMEM errno on failed pinfo
-	constructor.
-
-2003-09-25  Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (spawnve): Remove vfork short circuit and let caller deal
-	with error return.
-
-2003-09-25  Pierre Humblet <pierre.humblet@ieee.org>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (spawn_guts): Catch potential error from pinfo.remember.
-	Change debug messages to make sense.  Pass correct value to pinfo
-	constructor.  Ensure cleanup after errors.  Always reimpersonate after
-	errors.
-
-2003-09-25  Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (spawn_guts): Move system signal handling stuff after
-	CreateProcess error check.
-
-2003-09-25  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* shared_info.h: Update CURR_USER_MAGIC, CURR_SHARED_MAGIC and
-	SHARED_INFO_CB.
-	(mount_info::cb): Delete.
-	(mount_info::version): Delete.
-	(shared_info::delqueue): Delete.
-	* Makefile.in: Do magic for USER_MAGIC, class user_info, instead
-	of for mount_info.
-
-2003-09-24  Christopher Faylor  <cgf@redhat.com>
-
-	* include/tzfile.h: Add some missing entries.
-
-2003-09-24  Christopher Faylor  <cgf@redhat.com>
-
-	* include/paths.h: Add some missing entries.
-
-2003-09-24  Christopher Faylor  <cgf@redhat.com>
-
-	* shared_info.h (CURR_MOUNT_MAGIC): Fix.
-
-	* sigproc.cc (sigpacket): New structure.
-	(sig_send): Fill out sigpacket structure to send to signal thread
-	rather than racily sending separate packets.
-	(wait_sig): Use sigpacket structure to receive info from signal sender.
-
-2003-09-24  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* shared_info.h (class user_info): New.
-	(cygwin_user_h): New.
-	(user_shared): New.
-	(enum shared_locations): Replace SH_MOUNT_TABLE by SH_USER_SHARED;
-	(mount_table): Change from variable to macro.
-	* shared.cc: Use sizeof(user_info) in "offsets".
-	(user_shared_initialize): Add "reinit" argument to indicate need
-	to reinitialize the mapping. Replace "mount_table" by "user_shared"
-	throughout. Call user_shared->mountinfo.init and
-	user_shared->delqueue.init.
-	(shared_info::initialize): Do not call delqueue.init.
-	(memory_init): Add argument to user_shared_initialize.
-	* child_info.h (child_info::mount_h): Delete.
-	(child_info::user_h): New.
-	* sigpproc.cc (init_child_info): Use user_h instead of mount_h.
-	* dcrt0.cc (_dll_crt0): Ditto.
-	* fhandler_disk_file.cc (fhandler_disk_file::close): Use
-	user_shared->delqueue instead of cygwin_shared->delqueue.
-	* fhandler_virtual.cc (fhandler_virtual::close): Ditto.
-	* syscalls.cc (close_all_files): Ditto.
-	(unlink): Ditto.
-	(seteuid32): Add argument to user_shared_initialize.
-
-2003-09-24  Christopher Faylor  <cgf@redhat.com>
-
-	* devices.cc: New file.
-	* devices.gperf: New file.
-	* devices.shilka: New file.
-	* cygwin-gperf: New file.
-	* cygwin-shilka: New file.
-	* fhandler_fifo.cc: New file.
-	* fhandler_nodevice.cc : New file.
-
-2003-09-24  Christopher Faylor  <cgf@redhat.com>
-
-	Reorganize headers so that path.h precedes fhandler.h throughout.
-	Remove device argument and unit arguments from fhandler constructors
-	throughout.  Remove pc arguments to fhandler functions and use internal
-	pc element instead, throughout.  Use dev element in pc throughout.  Use
-	major/minor elements rather than units and device numbers previously in
-	fhandler class.  Use correct methods for fhandler file names rather
-	than directly accessing file name variables, throughout.
-	* Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
-	* dcrt0.cc (dll_crt0_1): Call device::init.
-	* devices.h: Renumber devices based on more Linux-like major/minor
-	numbers.  Add more devices.  Declare standard device storage.
-	(device): Declare struct.
-	* dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_*
-	type.
-	* dtable.cc (dtable::get_debugger_info): Ditto.
-	(cygwin_attach_handle_to_fd): Ditto.
-	(dtable::release): Remove special FH_SOCKET case in favor of generic
-	"need_fixup_before" test.
-	(dtable::init_std_file_from_handle): Use either build_fh_dev or
-	build_fh_name to build standard fhandler.
-	(dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name.
-	Move out of dtable class.  Don't accept a path_conv argument.  Just
-	build it here and pass it to:
-	(build_fh_pc): Renamed from dtable::build_fhandler.  Move out of dtable
-	class.  Use intrinsic device type in path_conv to create new fhandler.
-	(build_fh_dev): Renamed from dtable::build_fhandler.  Move out of
-	dtable class.  Simplify arguments to just take new 'device' type and a
-	name.  Just return pointer to fhandler rather than trying to insert
-	into dtable.
-	(dtable::dup_worker): Accommodate above build_fh name changes.
-	(dtable::find_fifo): New (currently broken) function.
-	(handle_to_fn): Use strechr for efficiency.
-	* dtable.h: Reflect above build_fh name changes and argument
-	differences.
-	(fhandler_base *&operator []): Return self rather than copy of self.
-	* fhandler.cc (fhandler_base::operator =): Use pc element to set
-	normalized path.
-	(fhandler_base::set_name): Ditto.
-	(fhandler_base::raw_read): Use method to access name.
-	(fhandler_base::write): Correctly use get_output_handle rather than
-	get_handle.
-	(handler_base::device_access_denied): New function.
-	(fhandler_base::open): Eliminate pc argument and use pc element of
-	fhandler_base throughout.
-	(fhandler_base::fstat): Detect if device is based in filesystem and use
-	fstat_fs to calculate stat, if so.
-	(fhandler_base::fhandler_base): Eliminate handling of file names and,
-	instead, just free appropriate component from pc.
-	(fhandler_base::opendir): Remove path_conv parameter.
-	* fhandler.h: Remove all device flags.
-	(fhandler_base::pc): New element.
-	(fhandler_base::set_name): Change argument to path_conv.
-	(fhandler_base::error): New function.
-	(fhandler_base::exists): New function.
-	(fhandler_base::pc_binmode): New function.
-	(fhandler_base::dev): New function.
-	(fhandler_base::open_fs): New function.
-	(fhandler_base::fstat_fs): New function.
-	(fhandler_base::fstat_by_name): New function.
-	(fhandler_base::fstat_by_handle): New function.
-	(fhandler_base::isfifo): New function.
-	(fhandler_base::is_slow): New function.
-	(fhandler_base::is_auto_device): New function.
-	(fhandler_base::is_fs_special): New function.
-	(fhandler_base::device_access_denied): New function.
-	(fhandler_base::operator DWORD&): New operator.
-	(fhandler_base::get_name): Return normalized path from pc.
-	(fhandler_base::get_win32_name): Return windows path from pc.
-	(fhandler_base::isdevice): Renamed from is_device.
-	(fhandler_base::get_native_name): Return device format.
-	(fhandler_fifo): New class.
-	(fhandler_nodevice): New class.
-	(select_stuff::device_specific): Remove array.
-	(select_stuff::device_specific_pipe): New class element.
-	(select_stuff::device_specific_socket): New class element.
-	(select_stuff::device_specific_serial): New class element.
-	(select_stuff::select_stuff): Initialize new elements.
-	* fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base
-	class from fhandler_disk_file.
-	(fhandler_base::fstat_by_name): Ditto.
-	(fhandler_base::fstat_by_name): Ditto.
-	(fhandler_disk_file::open): Move most functionality into
-	fhandler_base::open_fs.
-	(fhandler_base::open_fs): New function.
-	(fhandler_disk_file::close): Move most functionality into
-	fhandler_base::close_fs.
-	(fhandler_base::close_fs): New function.
-	* fhandler_mem.cc (fhandler_dev_mem::open): Use device name in
-	debugging output.
-	* fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy
-	standard urandom device into appropriate place.
-	(fhandler_socket::accept): Reflect change in fdsock return value.
-	* fhandler_tty.cc: See "throughouts" above.
-	* net.cc: Accommodate fdsock change throughout.
-	(fdsock): Return success or failure, accept fd argument and device
-	argument.
-	* path.cc (symlink_info::major): New element.
-	(symlink_info::minor): New element.
-	(symlink_info::parse_device): Declare new function.
-	(fs_info::update): Accommodate changes in path_conv class.
-	(path_conv::fillin): Ditto.
-	(path_conv::return_and_clear_normalized_path): Eliminate.
-	(path_conv::set_normalized_path): New function.
-	(path_conv::path_conv): Set info in dev element.  Use path_conv methods
-	Check for FH_FS rather than FH_BAD to indicate when to fill in
-	filesystem stuff.  where appropriate rather than direct access.  Use
-	set_normalized_path to set normalized path.
-	(windows_device_names): Eliminate.
-	(get_dev): Ditto.
-	(get_raw_device_number): Ditto.
-	(get_device_number): Ditto.
-	(win32_device_name): Call new device name parser to do most of the
-	heavy lifting.
-	(mount_info::conv_to_win32_path): Fill in dev field as appropriate.
-	(symlink_worker): Handle new device files.
-	(symlink_info::check): Ditto.
-	(symlink_info::parse_device): Define new function.
-	* path.h (executable_states): Move here from fhandler.h.
-	(fs_info): Rename variables to *_storage and create methods for
-	accessing same.
-	(path_conv): Add dev element, remove devn and unit and adjust inline
-	methods to accommodate.
-	(set_normalized_path): Declare new function.
-	* pinfo.cc (_pinfo::commune_recv): Add broken support for handling
-	fifos.
-	(_pinfo::commune_send): Ditto.
-	* pipe.cc (fhandler_pipe::close): check for existence of handle before
-	closing it.
-	(handler_pipe::create): Rename from make_pipe.  Change arguments to
-	accept fhandler_pipe array.  Accommodate fifos.
-	(pipe): Rework to deal with fhandler_pipe::create changes.
-	(_pipe): Ditto.
-	* select.cc: Use individual device_specific types throughout rather
-	than indexing with obsolete device number.
-	(set_bits): Use is_socket call rather than checking device number.
-	* shared_info.h (CURR_MOUNT_MAGIC): Update.
-	(conv_to_win32_path): Reflect addition of device argument.
-	* syscalls.cc (mknod_worker): New function.
-	(open): Use build_fh_name to build fhandler.
-	(chown_worker): Detect if this is an 'auto' device rather than an
-	on-filesystem device and handle appropriately.
-	(chmod_device): New function.
-	(chmod): Detect if this is an 'auto' device rather than an
-	on-filesystem device and handle appropriately.  Use chmod_device to set
-	mode of in-filesystem devices.
-	(stat_worker): Eliminate path_conv argument.  Call build_fh_name to
-	construct fhandler.  Use fh->error() rather than pc->error to detect
-	errors in fhandler construction.
-	(access_worker): New function pulled from access.  Accommodate
-	in-filesystem devices.
-	(access): Use access_worker.
-	(fpathconf): Detect if this is an 'auto' device rather than an
-	on-filesystem device and handle appropriately.
-	(mknod_worker): New function.
-	(mknod32): New function.
-	(chroot): Free normalized path -- assuming it was actually cmalloced.
-	* tty.cc (create_tty_master): Tweak for new device class.
-	(tty::common_init): Ditto.
-	* winsup.h (stat_worker): Remove.
-	(symlink_worker): Declare.
-
-	* exceptions.cc (set_process_mask): Just call sig_dispatch_pending and
-	don't worry about pending_signals since sig_dispatch_pending should
-	always do the right thing now.
-	(sig_handle): Reorganize SIGCONT handling to more closely conform to
-	SUSv3.
-	* pinfo.h: Move __SIG enum to sigproc.h.
-	(PICOM_FIFO): New enum element.
-	(_pinfo): Remove 'thread2signal' stuff throughout class.
-	(_pinfo::commune_send): Make varargs.
-	(_pinfo::sigtodo): Eliminate.
-	(_pinfo::thread2signal): Ditto.
-	* signal.cc (kill_worker): Eliminate call to setthread2signal.
-	* sigproc.cc (local_sigtodo): Eliminate.
-	(getlocal_sigtodo): Ditto.
-	(sigelem): New class.
-	(pending_signals): New class.
-	(sigqueue): New variable, start of sigqueue linked list.
-	(sigcatch_nonmain): Eliminate.
-	(sigcatch_main): Eliminate.
-	(sigcatch_nosync): Eliminate.
-	(sigcomplete_nonmain): Eliminate.
-	(pending_signals): Eliminate.
-	(sig_clear): Call signal thread to clear pending signals, unless
-	already in signal thread.
-	(sigpending): Call signal thread to get pending signals.
-	(sig_dispatch_pending): Eliminate use of pending_signals and just check
-	sigqueue.
-	(sigproc_terminate): Eliminate all of the obsolete semaphore stuff.
-	Close signal pipe handle.
-	(sig_send): Eliminate all of the obsolete semaphore stuff and use pipe
-	to send signals.
-	(getevent): Eliminate.
-	(pending_signals::add): New function.
-	(pending_signals::del): New function.
-	(pending_signals::next): New function.
-	(wait_sig): Eliminate all of the obsolete semaphore stuff.  Use pipe to
-	communicate and maintain a linked list of signals.
-	* sigproc.h: Move __SIG defines here.  Add __SIGPENDING.
-	(sig_dispatch_pending): Remove "C" specifier.
-	(sig_handle): Accept a mask argument.
-	* thread.cc: Remove signal handling considerations throughout.
-
-2003-09-22  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (do_exit): Eliminate "C" linkage.  Call events_terminate
-	early.
-	(exit_states): Move out of source file into header file.
-	* winsup.h: Move exit_states here.  Remove "C" linkage from do_exit
-	declaration.
-	* debug.cc (lock_debug): Remove explicit (and incorrect) external for
-	exit_state.
-	* sigproc.cc (sig_dispatch_pending): Don't flush signals if exiting.
-
-2003-09-20  Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (pthread_cleanup): New struct.
-	(do_cleanup): New function.
-	(spawn_guts): Initialize struct for pthread_cleanup handling to ensure
-	proper restoration of signals if/when thread is cancelled.  Restore
-	settings using pthread_cancel_pop.
-
-2003-09-19  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number to 6.
-
-2003-09-19  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.h (__reent_t::init_clib): Declare new function.
-	* thread.cc (__reent_t::init_clib): Define new function.
-	(pthread::thread_init_wrapper): Use __reent_t::init_clib to init local
-	clib storage and set std{in,out,err} appropriately.
-
-2003-09-19  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (system): Strip signal considerations from here so that
-	they are not inherited by a child process.
-	* spawn.cc (spawn_guts): Handle system() signal stuff here.
-	* winsup.h (_P_SYSTEM): Define.
-
-2003-09-18  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_tty.cc (fhandler_pty_master::process_slave_output):
-	Handle buf == NULL as flushing the buffer.
-	(fhandler_tty_slave::read): Handle ptr == NULL as flushing the buffer.
-	(fhandler_tty_slave::tcflush): Implement input queue flushing by
-	calling read with NULL buffer.
-	(fhandler_pty_master::tcflush): Ditto, calling process_slave_output.
-	* termios.cc (tcflush): Check for legal `queue' value.  Return
-	EINVAL otherwise.
-
-2003-09-16  Brian Ford  <ford@vss.fsi.com>
-
-	* syscalls.cc (gethostid): Add lpFreeBytesAvailable argument to
-	GetDiskFreeSpaceEx call since NT4 requires it.
-
-2003-09-16  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_process.cc (fhandler_process::fill_filebuf): Open pinfo with
-	PID_MAP_RW.
-	* sigproc.cc (talktome): Ditto for winpids.
-
-2003-09-16  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.h (winpids::pid_access): New element.
-	(winpids::winpids): Rejigger to set pinfo_access.
-	* pinfo.cc (winpids::add): Try to open shared memory region with
-	supplied pinfo_access first, then default to readonly.
-	* fhandler_termios.cc (tty_min::kill_pgrp): When getting list of pids
-	to work with, suggest opening with PID_MAP_RW.
-	* signal.cc (kill_pgrp): Ditto.
-	* sigproc.cc (sig_send): Perform a write check on todo prior to
-	attempting to increment it.  Return EACCES if we can't write to it.
-
-2003-09-16  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygheap.cc (cygheap_user::set_saved_sid): Rename from set_orig_sid.
-	* cygheap.h (class cygheap_user): Rename orig_psid, orig_uid and
-	orig_gid to saved_psid, saved_uid and saved_gid respectively.
-	Rename methods orig_sid and set_orig_sid to saved_sid and set_saved_sid
-	respectively.
-	* sec_helper.cc (sec_acl): Accommodate above changes.
-	* spawn.cc (spawn_guts): Ditto.
-	* uinfo.cc (uinfo_init): Ditto.
-
-2003-09-15  Christopher Faylor  <cgf@redhat.com>
-
-	* getopt.c (opterr): Reinstate initialization.
-	(optind): Ditto.
-	(optopt): Ditto.
-	* pinfo.cc: Include cygheap.h or suffer compile error.
-	* shared.h: Reset magic number.
-
-2003-09-15  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (sig_handle_tty_stop): Fix boneheaded mistake by using
-	correct check for parent state rather than inverted check.
-
-2003-09-15  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.h (__sec_user): Add "access2" argument.
-	(sec_acl): Add "original" and "access2" arguments.
-	(sec_user): Add "sid2" and "access2" argument. Remove dependence on
-	allow_ntsec.
-	(sec_user_nih): Ditto.
-	* sec_helper.cc (__sec_user): Add "has_security" test.
-	Call sec_acl with new arguments, letting it handle original_sid.
-	(sec_acl): Add "original" and "access2" arguments. Handle original_sid
-	depending on flag but avoiding duplicates. Use "access2" for sid2.
-	* pinfo.cc (pinfo::init): Use security attributes created by sec_user
-	when creating the mapping.
-	* security.cc (create_token): Adjust arguments in call to sec_acl.
-	Call sec_user instead of __sec_user.
-	* syscall.cc (seteuid32):  Adjust arguments in call to sec_acl. Remove
-	now unnecessary test. Remove useless conversions to psid.
-	* dcrt0.cc (dll_crt0_1): Call cygsid::init before pinfo_init.
-
-2003-09-13  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Make malloc_wrapper -fomit-frame-pointer.
-
-	* cygwin.din: Remove extraneous mallinfo definition.
-
-	* dcrt0.cc (quoted): Use strechr for efficiency.
-
-	* fhandler.cc (fhandler_base::write): Correctly use get_output_handle
-	rather than get_handle.
-	(fhandler_base::lseek): Use method for accessing name in debug output.
-
-2003-09-13  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (path_conv::ndisk_links): Fix potential
-	off-by-one problem when first file in a directory is a directory.
-
-2003-09-13  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* include/sys/cygwin.h: Rename PID_UNUSED to PID_MAP_RW.
-	* pinfo.cc (pinfo_init): Initialize myself->gid.
-	(pinfo::init): Create the "access" variable, set it appropriately and
-	use it to specify the requested access.
-	* exceptions.cc (sig_handle_tty_stop): Add PID_MAP_RW in pinfo parent.
-	* signal.cc (kill_worker): Ditto for pinfo dest.
-	* syscalls.cc (setpgid): Ditto for pinfo p.
-
-2003-09-13  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number to 5.
-
-2003-09-12  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.cc (MTinterface::fixup_after_fork): Remove code which
-	potentially overwrote _impure pointer with contents of thread which
-	invoked fork since this eliminates important information like the
-	pointer to the atexit queue.
-
-2003-09-12  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (path_conv::ndisk_links): Fix problem where
-	search characters overwrote the path instead of being tacked on the
-	end.
-
-2003-09-12  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (_dll_crt0): Accommodate breaking apart of early_stuff_init.
-	* exceptions.cc (early_stuff_init): Delete.
-	(init_console_handler): New function - top half of early_stuff_init.
-	(init_global_security): New function - bottom half of early_stuff_init.
-	(sig_handle): Avoid special hExeced test for SIGINT.  Just terminate
-	the captive process.
-	(signal_exit): Add debugging output.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Don't allocate a console
-	if one already seems to exist.  Properly initialize ctrl-c handling if
-	we do allocate a console.
-	* winsup.h (early_stuff_init): Delete declaration.
-	(init_console_handler): New declaration.
-	(init_global_security): New declaration.
-
-2003-09-11  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (path_conv::ndisk_links): Rename from
-	num_entries.  Accept an argument and calculate any extra links needed
-	based on missing .  and ..  entries.
-	(fhandler_disk_file::fstat_helper): Always call pc->ndisks_links() to
-	calculate the number of links.
-	* path.h (path_conv::ndisk_links): Declare.
-
-2003-09-11  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (normalize_posix_path): Put check for '//' prefix back to
-	denote a UNC path.
-	(slash_unc_prefix_p): Remove vestige of old //c method for accessing
-	drives.
-
-2003-09-11  Christopher Faylor  <cgf@redhat.com>
-
-	* dir.cc (rmdir): Add more samba workarounds.
-
-2003-09-11  Corinna Vinschen  <corinna@vinschen.de>
-
-	* shared.cc (user_shared_initialize): Revert length attribute for name
-	variable to be just UNLEN + 1.
-
-2003-09-10  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* shared_info.h (shared_info::initialize): Remove argument.
-	* cygheap.h (cygheap_user::init): New declaration.
-	* uinfo.cc (cygheap_user::init): New.
-	(internal_getlogin): Move functionality to cygheap_user::init.  Open
-	the process token to update the group sid.
-	* shared.cc (user_shared_initialize): Get the user information from
-	cygheap->user.
-	(shared_info::initialize): Remove argument.  Call cygheap->user.init
-	instead of cygheap->user.set_name.
-	(memory_init): Do not get the user name and do not pass it to
-	shared_info::initialize.
-	* registry.cc (get_registry_hive_path): Make csid a cygpsid.
-	(load_registry_hive): Ditto.
-
-2003-09-10  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (num_entries): Take .  and ..  into account if
-	they do not exist since cygwin simulates them.
-	(fhandler_cygdrive::fstat): Ditto.
-	(fhandler_cygdrive::readdir): Don't do any specific tests on
-	__d_position when seeing if a drive exists.
-
-2003-09-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (DLL_OFILES): Add getopt.o and iruserok.o.
-	* cygwin.din: Export __check_rhosts_file, __rcmd_errstr, optarg,
-	opterr, optind, optopt, optreset, getopt, getopt_long, iruserok
-	and ruserok.
-	* getopt.c: Moved from lib to here.  Define opt* variables as
-	dllexport.
-	* iruserok.c: Moved from lib to here.  Rearrange function order.
-	Prefer using 64/32 bit functions.
-	* syscalls.cc (shell_fp): Define as struct __sFILE64.
-	(getusershell): Use fopen64 instead of fopen.
-	* winsup.h: Add declarations for seteuid32, fopen64,
-	cygwin_gethostbyname and cygwin_inet_addr.
-	* include/getopt.h: Declare opt* variables dllimport.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-09-10  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (sig_handle_tty_stop): Check parent PID_NOCLDSTOP
-	rather than erroneously checking *my own* sigtodo.
-
-2003-09-10  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Add some more -fomit-frame-pointer files.
-
-	* path.cc (conv_path_list_buf_size): Free normalized_path or suffer
-	memory leak.
-	* syscalls.cc (chroot): Ditto.
-
-2003-09-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (DLL_OFILES): Add bsdlib.o.
-	* autoload.cc (RegisterServiceProcess): Add.
-	* bsdlib.cc: New file.
-	(daemon): New function.
-	(login_tty): Ditto.
-	(openpty): Ditto.
-	(forkpty): Ditto.
-	* cygwin.din: Export daemon, forkpty, login_tty, logwtmp, updwtmp,
-	openpty and revoke.
-	* syscalls.cc (updwtmp): New function, writing to wtmp exclusively.
-	(logwtmp): Ditto.
-	(login): Call updwtmp instead of writing to wtmp by itself.
-	(logout): Ditto.
-	* tty.cc (revoke): New funtion.
-	* include/paths.h: Define _PATH_DEVNULL.
-	* include/pty.h: New header.
-	* include/cygwin/version.h: Bump API minor number.
-	* include/sys/utmp.h: Declare logwtmp with const arguments.
-	Declare updwtmp.
-	* lib/iruserok.c: New file.
-	(ruserok): New function.
-	(iruserok): Ditto.
-	(__ivaliduser): Ditto.
-	(__icheckhost): Ditto.
-
-2003-09-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::fstat): Don't use PC_POSIX.
-
-2003-09-09  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* shared_info.h: Include security.h.
-	(open_shared): Add psa argument.
-	(user_shared_initialize): New declaration.
-	* security.h: Add _SECURITY_H guard.
-	(sec_user): Use sec_none in the no ntsec case.
-	* spawn.cc (spawn_guts): Remove call to load_registry_hive.
-	* syscalls (seteuid32): If warranted, call load_registry_hive,
-	user_shared_initialize and RegCloseKey(HKEY_CURRENT_USER).
-	* shared.cc (user_shared_initialize): New.
-	(open_shared): Add and use psa argument.
-	(memory_init): Move mount table initialization to
-	user_shared_initialize. Call it.
-
-2003-09-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (mmap64): Change address types from caddr_t to void *
-	according to SUSv3.
-	(mmap): Ditto.
-	(munmap): Ditto.
-	(msync): Ditto.
-	(mprotect): Ditto.  Move to before the fhandler methods.
-	* include/sys/mman.h: Change prototypes accordingly.
-
-2003-09-08  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (dlL_crt0_1): Set __argc_safe after __argc is absolutely
-	know to be set.
-	* exceptions.cc (sig_handle_tty_stop): Don't reset sigCONT event since
-	it is reset automatically.
-	* fork.cc (fork): Remove obsolete usage of PID_SPLIT_HEAP.
-	* include/sys/cygwin.h: Ditto.
-	* sigproc.cc (sig_send): Use sigframe init method to set frame since it
-	checks for previous ownership of the frame.
-	* sigproc.h (sigframe::init): Accept an "is_exception" argument.
-
-2003-09-08  Christopher Faylor  <cgf@redhat.com>
-
-	* dir.cc (readdir): Reinstate setting of old ino field for legacy
-	applications.
-	* dirent.h (dirent): Rename unused field to __ino32.
-
-2003-09-08  Christopher Faylor  <cgf@redhat.com>
-
-	* passwd.cc (getpwnam_r): Initialize pw_comment field.
-
-2003-09-08  Christopher Faylor  <cgf@redhat.com>
-
-	* passwd.cc (getpwuid_r32): Initialize pw_comment field.
-
-2003-09-08  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (wait_sig_inited): Remove assertion since it is racy.
-
-2003-09-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din: Export endusershell, getusershell and setusershell.
-	* syscalls.cc (getusershell): New function.
-	(setusershell): Ditto.
-	(endusershell): Ditto.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-09-08  Nicholas Wourms  <nwourms@netscape.net>
-
-	* cygwin.din: Export argz_add argz_add_sep argz_append argz_count
-	argz_create argz_create_sep argz_delete argz_extract argz_insert
-	argz_next argz_replace argz_stringify envz_add envz_entry envz_get
-	envz_merge envz_remove envz_strip
-	* include/cygwin/version.h: Bump api minor number.
-
-2003-09-07  Christopher Faylor  <cgf@redhat.com>
-
-	Throughout, remove __d_u.__d_data fields from DIR structure.
-	* include/sys/dirent.h (dirent): Remvoe old_d_ino.
-	(DIR): Make __d_dirhash a 64 bit value.  Remove __d_data and __d_u.
-	Add __flags.
-	* dir.cc (opendir_states): New enum.
-	(opendir): Clear new DIR __flags field.
-	(readdir): Fill in '.' and '..' entries if we hit EOF and we haven't
-	seen them already.  Nuke setting of old_d_ino.
-	(rewinddir): Reset DIR __flags field.
-	(seekdir64): Ditto.
-	* fhandler_disk_file.cc (fhandler_cygdrive::fhandler_cygdrive): Remove
-	special handling of "." and ".." since they are now handled
-	automatically.
-
-2003-09-07  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/in.h: Don't define ipv6 stuff unless we call for it
-	specifically since it isn't really implemented yet.
-
-2003-09-07  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (_csbrk): More left coercion cleanup.
-	* fhandler_tty.cc (fhandler_tty_slave::read): Ditto.
-	(fhandler_tty_slave::write): Ditto.
-	* fhandler_windows.cc (fhandler_windows::read): Ditto.
-	* heap.cc (sbrk): Ditto.
-
-2003-09-07  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* signal.cc (nanosleep): Improve test for valid values.  Round delay up
-	to resolution.  Fix test for negative remainder.  Use timeGetTime
-	through gtod.
-	(sleep): Round up return value.
-
-2003-09-07  Pierre Humblet <pierre.humblet@ieee.org>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* hires.h (HIRES_DELAY_MAX): Define.
-	(hires_ms::minperiod): Declare static.
-	(hires_ms::resolution): New.
-	(hires_ms::dmsecs): New.
-	(hires_ms::prime): Return UINT.
-	(gtod): Declare.
-	* times.cc (hires_ms::prime): Always calculate minperiod and set it to
-	1 in case of failure.  Return minperiod.
-	(hires_ms::resolution): Define.
-	(hires_ms::~hires_ms): Delete.
-	(hires_ms::usecs): Check minperiod to prime.
-	(gtod) Define as global.
-
-2003-09-06  Christopher Faylor  <cgf@redhat.com>
-
-	Remove left coercion throughout.
-
-2003-09-04  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* hires.h (hires_ms::~hires_ms): Delete declaration.
-	* times.cc (hires_ms::~hires_ms): Delete definition..
-
-2003-09-04  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (__argc_safe): New variable.
-	(dll_crt0_1): Store argc in __argc_safe, which will theoretically
-	remain untouched by the user.
-	* fhandler_console.cc (fhandler_console::read): Silence some compiler
-	warnings.
-	* fhandler_raw.cc (fhandler_dev_raw::raw_read): Ditto.
-	* pinfo.cc (_pinfo::commune_recv): Carefully bound argv scan and check
-	for potentially bad pointers since user could have set argv cell to
-	anythinw.
-	* cygheap.h (CYGHEAPSIZE): Bump up size.
-
-2003-09-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* sysconf.cc (sysconf): Return more accurate value for _SC_AVPHYS_PAGES.
-
-2003-09-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc: Restructure. Add, remove and rewrite comments throughout
-	for better readability.  Change function names for better
-	understanding.
-	(MAP_SET): Accommodate name change from map_map_ to page_map_.
-	(MAP_CLR): Ditto.
-	(MAP_ISSET): Ditto.
-	(mmap_record::page_map_): Rename from page_map_.
-	(mmap_record::get_map): Remove.
-	(mmap_record::alloc_page_map): Rename from alloc_map. Return bool
-	indicating success of cygheap memory allocation.
-	(mmap_record::free_page_map): Rename from free_map.
-	(mmap_record::fixup_page_map): Rename from fixup_map.
-	(mmap_record::find_unused_pages): Rename from find_empty.
-	(mmap_record::map_pages): Rename from map_map.
-	(mmap_record::unmap_pages): Rename from unmap_map.
-	(class list): Make all class members private.
-	(list::list): Remove.
-	(list::~list): Remove.
-	(list::get_fd): New attribute reader.
-	(list::get_hash): Ditto.
-	(list::get_record): Ditto.
-	(list::add_record): Manage all allocation for mmap_records.  Check
-	for failed memory allocation and return NULL if so.
-	(list::set): New function.
-	(list::del_record): Rename from erase. Return true if last mmap_record
-	has been deleted, false otherwise. Check for legal incoming index
-	value.
-	(list::erase): Remove erase/0.
-	(list::search_record): Rename from match.
-	(map::map): Remove.
-	(map::~map): Remove.
-	(map::add_list): Manage all allocation for lists.  Check for failed
-	memory allocation and return NULL if so.
-	(map::get_list): New method.
-	(map::del_list): Rename from erase. Check for legal incoming index
-	value.
-	(mmap64): Check for failed mmap_record memory allocation.  Return
-	with MAP_FAILED and errno set to ENOMEM if so.
-	(munmap): Rearrange loop using new list and mmap_record accessor
-	functions.  Rename loop index variables for better understanding.
-	Check if list can be deleted after last mmap_record in it has been
-	deleted.
-	(msync): Rearrange loop using new list and mmap_record accessor
-	functions.  Rename loop index variables for better understanding.
-	(fixup_mmaps_after_fork): Ditto.
-
-2003-09-03  Christopher Faylor  <cgf@redhat.com>
-
-	* cxx.cc (new): Fix formatting.  Just return result of ccalloc rather
-	than calling memset explicitly.
-
-2003-09-03  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (set_process_mask): Set pending signals only when
-	signals become unmasked.
-	* sigproc.cc (pending_signals): Flip back to a global.
-	(wait_sig): Don't set pending signals when there is an armed semaphore
-	or signal is blocked.
-
-	* shared.cc (shared_info::initialize): Add a username parameter for
-	user-mode mounts.  Reorganize to try to avoid startup race.
-	(memory_init): Move some stuff into shared_info::initialize.
-	* shared_info.h (shared_info::initialize): Change declaration.
-	(CURR_SHARED_MAGIC): Update.
-
-2003-09-01  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number to 4.
-
-2003-09-01  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc (dup_ent): Restore check for NULL input.
-
-2003-08-31  Christopher Faylor  <cgf@redhat.com>
-
-	* include/sys/cygwin.h: Don't define cygwin-specific things if
-	!__CYGWIN__.
-
-2003-08-31  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (cygheap_init): Allocate space for sigaction array in
-	cygheap.
-	* cygheap.h (cygheap_types): Add HEAP_SIGS.
-	* exceptions.cc (signal_fixup_after_exec): Remove from this file.
-	* pinfo.h (pinfo::getsig): Just return global_sigs array.
-	(pinfo::sigs): Delete.
-	* sigproc.cc (signal_fixup_after_exec): Move it here.
-	(global_sigs): New global array, moved from pinfo structure.
-	(sigalloc): New function.  Allocate global sigaction array here.
-	(proc_subproc): Remove copysigs call.  It's automatic now.
-	* include/sys/cygwin.h (PID_NOCLDSTOP): New value.
-	* signal.cc (sigaction): Set myself->PID_NODCLDSTOP when appropriate.
-	* sigproc.h (sigalloc): Declare.
-
-	* fnmatch.c (fnmatch): Use C90 parameters.
-	(rangematch): Ditto.
-
-	* fhandler.cc (fhandler_base::raw_read): Use right coercion to avoid a
-	compiler warning.
-
-2003-08-31  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc (dup_ent): Make debugging output consistent.
-
-2003-08-31  Christopher Faylor  <cgf@redhat.com>
-
-	Use dup_ent rather than specific dup_*_ptr functions throughout.
-	* (gen_ent): Delete.
-	(dup_ent): Subsume gen_ent functionality.
-	(dup_host_ptr): Delete.
-	(dup_proto_ptr): Ditto.
-	(dup_servent_ptr): Ditto.
-
-2003-08-31  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc (gen_ent): Invert sense of null check so that debug output
-	makes sense.
-
-2003-08-31  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc (free_char_list): Delete.
-	(dup_addr_list): Delete.
-	(dup_char_list): Delete.
-	(free_hostent_ptr): Delete.
-	(free_protoent_ptr): Delete.
-	(free_servent_ptr): Delete.
-	(DWORD_round): New function.
-	(strlen_round): New function.  Returns strlen rounded up to word size.
-	(dup_ent): New, generic function to duplicate a {host,proto,serv}ent
-	structure.
-	(gen_ent): New macro.  Generates a generic dup_{host,proto,serv}ent_ptr
-	function.
-	(cygwin_getservbyname): Remove call to free_servent_ptr, pass
-	servent_buf to dup_servent_ptr.
-	(cygwin_getservbyport): Ditto.
-	(cygwin_gethostbyname): Ditto for hostent.
-	(cygwin_gethostbyaddr): Ditto.
-	(cygwin_getprotobyname): Ditto for protoent.
-	(cygwin_getprotobynumber): Ditto.
-
-2003-08-31  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (MALLOC_OFILES): Always fill in with correct malloc
-	object.
-	* configure.in: Fill in MALLOC_OFILES with either debugging or regular
-	malloc.
-	* configure: Regenerate.
-	* dlmalloc.c: Make various fruitless changes to attempt to get to work.
-	* dlmalloc.h: Ditto.
-	* malloc.cc (free): Check malloc pool when debugging.
-
-	* path.cc (win32_device_name): Eliminate compiler warning.
-
-	* sigproc.cc (sig_dispatch_pending): Remove use of was_pending.  Let
-	thisframe.call_signal_handler decide if handler should be called rather
-	than using bogus was_pending check.
-
-	* exceptions.cc (interrupt_setup): Remove accidentally checked in
-	debugging code.
-
-2003-08-30  Christopher Faylor  <cgf@redhat.com>
-
-	* heap.cc (sbrk): Save rounded addess in user_heap_max.
-
-2003-08-30  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (sig_dispatch_pending): Remove explicit call to
-	thisframe.call_signal_handler.
-
-2003-08-30  Christopher Faylor  <cgf@redhat.com>
-
-	Remove some cygserver files.
-
-2003-08-28  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.h: Make some functions regparm.
-	* sigproc.cc (checkstate): Make regparm.
-	(getevent): Change parameters in declaration, rename from getsem, make regparm.
-	(sig_send): Recognize that nosync is now an event.  Remove some old
-	cruft from previous interrupt anywhere signal handler.
-	(getevent): Change parameters in definition, rename from getsem.
-	Allocate event rather than semaphore.
-	(wait_sig): Treat sigcatch_nosync as an event.
-
-2003-08-28  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (sigreturn): Fix problem where old return address was
-	not properly restored for a nested signal.
-
-2003-08-27  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload.cc (SwitchToThread): Declare as autoload function.
-	* cygthread.h (cygthread::main_thread_id): Make public.
-	* exceptions.cc (setup_handler): Remove unneeded priority stuff.
-	Rename label to reflect what it does.  Add debugging for idiotic
-	Windows NT problem.  Change debugging output to include signal number.
-	* miscfuncs.cc (low_priority_sleep): If available, use SwitchToThread
-	function to give time slice to other threads.
-	* wincap.cc: Properly define have_switch_to_thread throughout.
-	* wincap.h (wincap::switch_to_thread): New element.
-
-2003-08-27  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (mount): Don't check win32_path when doing cygdrive
-	mount.
-
-2003-08-27  Christopher Faylor  <cgf@redhat.com>
-
-	* specdir: Correctly remove temporary directory prior to use.
-
-2003-08-27  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (wait_sig): Count number of iterations through
-	'more_signals' loop and issue a warning if DEBUGGING and excessive.
-	(WFSO): When debugging and infinite timeout, loop.
-
-2003-08-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/stat.h: Allow definition of internal stat structures
-	also when compiling newlib.
-
-2003-08-25  Christopher Faylor  <cgf@redhat.com>
-
-	Throughout, change USE_CYGSERVER to USE_SERVER.
-	* Makefile.in (LIBSERVER): Define and use.
-	* configure.in: Set LIBSERVER as appropriate.
-	* configure: Regenerate.
-	* acconfig.h: Regenerate.
-	* environ.cc: Rename allow_daemon to allow_server.  Only recognize when
-	USE_SERVER is defined.
-
-2003-08-23  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (_remove_r): Define.
-
-2003-08-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygheap.h (enum cygheap_types): Add HEAP_MMAP.
-	(CYGHEAPSIZE): Add another 64K.
-	* mmap.cc: Use cmalloc, ccalloc and crealloc with HEAP_MMAP type
-	throughout.
-
-2003-08-22  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (user_heap_info::max): New field.
-	* heap.cc (heap_init): Save pointer to end of heap reserved memory.
-	(sbrk): Don't attempt to commit memory beyond end of heap reserved
-	memory.  Attempt to honor comment and reserve commitbytes if heapchunk
-	fails.
-
-2003-08-20  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* exceptions.cc (sigreturn): Don't clobber ebp in recursive signal
-	calls.
-
-2003-08-22  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (sig_handle): Change so that default signals indicate
-	success.
-
-2003-08-21  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (wait_sig): Remove redundant test in do/while.
-
-2003-08-21  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (wait_sig): Avoid infinite loop.
-
-2003-08-20  Christopher Faylor  <cgf@redhat.com>
-
-	* speclib: Reenable removal of temp files.
-
-2003-08-20  Christopher Faylor  <cgf@redhat.com>
-
-	* miscfuncs.cc (low_priority_sleep): Sleep at same priority as main
-	thread.
-	* sigproc.cc (wait_sig): Keep looping if there are more signals to
-	consider and we are flushing signals.
-	(sig_send): Put nonsync signals in the correct bucket.
-
-2003-08-20  Christopher Faylor  <cgf@redhat.com>
-
-	* speclib: Fix created lib to avoid "File truncated" problems.
-
-2003-08-20  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* exceptions.cc (interrupt_setup): Set sigsave.sig last to avoid a
-	race.
-
-2003-08-20  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (wait_sig): Ensure that myself->getsigtodo array is
-	flushed on a __SIGFLUSH.
-
-2003-08-20  Pierre Humblet  <pierre.humblet@ieee.org>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (_sigreturn): Handle nested signals without growing the
-	stack.
-
-2003-08-19  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (pending_signals): Remove unneeded declaration.
-	* sigproc.cc (pending_signals): Make static.
-	(wait_sig): Use defined values rather than integers for rc.  Never scan
-	both todo arrays as this could cause hangs if signals arrive from two
-	different sources.  Rename saw_pending_signals to saw_failed_interrupt.
-	Exit loop when signal found.  Enter low-priority sleep, if necessary,
-	after finished signalling completion.  Set pending_signals when blocked
-	(from Pierre Humblet).
-
-2003-08-19  Christopher Faylor  <cgf@redhat.com>
-
-	* signal.cc (sigpending): Move.
-	* sigproc.cc (sigpending): To here.
-	(getlocal_sigtodo): Return process-local signal array.
-	(sigpending): Accommodate new process-local signal array.
-	(sig_send): Ditto.
-	(sig_set_pending): Ditto.
-	(wait_sig): Ditto.
-
-2003-08-19  Christopher Faylor  <cgf@redhat.com>
-
-	Throughout, eliminate argument to sig_dispatch_pending.
-	* exceptions.cc (setup_handler): Move non-interruptible condition
-	handling (back) to wait_sig.
-	(set_process_mask): Don't worry about calling sig_dispatch_pending from
-	sigthread since it is detected in the function anyway.
-	(sig_handle): Eliminate thisproc arg.  Don't call sig_dispatch_pending
-	on SIGCONT since that should happen automatically.
-	* sigproc.cc (sig_dispatch_pending): Eliminate justwake argument.  Just
-	return when called from sigthread.
-	(wait_sig): Change some variables to bool.  Change inner while to an
-	if.  Move uninterruptible signal handling here.
-	(sigproc_terminate): Don't call sig_dispatch_pending.  Just increment
-	semaphore on exit.
-
-	* speclib: Use slightly different (but still flawed) method for
-	determining symbols to extract from libraries.
-
-2003-08-18  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (sigdelayed): Fix race where signal handler could get
-	the wrong mask (as suggested by Pierre Humblet).
-
-2003-08-18  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (mount): Add null/empty check for input parameters.
-	(umount): Add null/empty check for input parameters.
-
-2003-08-17  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* grp.cc (read_group): Revert previous change.
-	* uinfo.cc (pwdgrp::load): Always reset curr_lines.
-
-2003-08-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* errno.cc (errmap): Map ERROR_INVALID_BLOCK_LENGTH to EIO.
-	* fhandler_raw.cc (fhandler_dev_raw::raw_read): Set more accurate
-	errnos instead of EACCES.
-	(fhandler_dev_raw::raw_write): Ditto.
-
-2003-08-17  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (special_name): Accommodate all special names with
-	extensions.
-
-2003-08-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (mmap64): Avoid crash if file size is less than requested
-	map length.
-
-2003-08-13  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-
-	* path.cc (special_name): Add checks for some specials followed by
-	a "." and a FIXME comment.
-
-2003-08-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din: Accommodate change from cygwin_lstat to lstat.
-	* syscalls.cc: Add defines to avoid declaration issues when
-	renaming cygwin_lstat back to lstat.
-	(lstat): Reverted name change from cygwin_lstat.
-
-2003-08-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/sys/param.h (NBBY): Define if not defined.
-
-2003-08-12  Nicholas Wourms  <nwourms@netscape.net>
-
-	* include/sys/param.h (setbit): Add new bitmap related macro.
-	(clrbit): Likewise.
-	(isset): Likewise.
-	(isclr): Likewise.
-	(howmany): Add new counting/rounding macro.
-	(rounddown): Likewise.
-	(roundup): Likewise.
-	(roundup2): Likewise.
-	(powerof2): Likewise
-	(MIN): Add macro for calculating min.
-	(MAX): Add macro for calculating max.
-
-2003-08-09  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number to 3.
-
-2003-08-08  Gerrit P. Haase  <gp@familiehaase.de>
-
-	* include/stdint.h: Correctly define INT32_MIN.
-
-2003-08-08  David Rothenberger  <daveroth@acm.org>
-
-	* grp.cc (read_group): Set __group32.gr_mem pointer back to &null_ptr
-	after free() is called.
-
-2003-08-05  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Rework to accommodate new speclib arguments.
-	* speclib: Rework to extract everything from libcygwin.a rather than
-	building things from existing object files.
-
-2003-08-05  Pavel Tsekov  <ptsekov@gmx.net>
-
-	* path.cc (cygdrive_getmntent): Do not skip over drives of type
-	DRIVE_REMOVABLE.
-
-2003-08-05  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::lseek): Be more paranoid when
-	constructing offsets from 64 bit value.
-	* syscalls.cc (logout): Avoid temp buffer memcpy since new scheme does
-	not require it.
-	(utmp_data): Rework as a macro which returns a pointer into a buffer.
-	(getutent): Use new buffer allocation mechanism to grab a utmp buffer.
-	(getutid): Ditto.
-	(pututline): Ditto.
-
-2003-08-05  Pavel Tsekov  <ptsekov@gmx.net>
-
-	* fhandler_disk_file.cc (fhandler_cygdrive::readdir): Do not change
-	'errno' if end of directory condition is encountered as per SUSv2.
-	* fhandler_proc.cc (fhandler_proc::readdir): Ditto.
-	* fhandler_process (fhandler_process::readdir): Ditto.
-	* fhandler_registry (fhandler_registry::readdir): Ditto.
-
-2003-07-30  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (_dll_crt0): Move strace.microseconds initialization to
-	after pthread initialization.
-	(dll_crt0_1): i.e., here.
-
-2003-07-28  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_base.cc (fhandler_base::readv): Rework to properly return
-	number of bytes from read.
-
-2003-07-28  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number to 2.
-
-2003-07-26  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (ctrl_c_handler): Send SIGHUP when events occur only if
-	there is a tty associated with the process.  Send SIGHUP on
-	CTRL_LOGOFF_EVENT.
-
-	* fhandler_tty.cc (fhandler_tty_slave::open): Adjust console open
-	handle counter regardless of whether this is a pty or tty.
-	(fhandler_tty_slave::open): Ditto.
-	(fhandler_tty_slave::dup): Ditto.
-	(fhandler_tty_common::set_close_on_exec): Ditto.
-	(fhandler_tty_master::init_console): Decrement console open handle
-	counter after init since it will now be handled by all tty open.
-	* syscalls.cc (setsid): Rework debugging output slightly.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Use 'install-sh -c'.
-	* configure: Regenerate.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Always use install-sh.
-	* configure: Regenerate.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/socket.h: Conditionalize [AP]F_INET6 define.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (OBSOLETE_FUNCTION):  Add fdopen.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din: Export _fdopen64
-	* Makefile.in (NEW_FUNCTIONS): Add _fdopen64 -> fdopen translation.
-	* include/cygwin/version.h: Bump api minor number.
-
-	* ntdll.h: Remove (now) duplicate FILE_SYNCHRONOUS_IO_NONALERT
-	definition.
-
-2003-07-24  Christopher Faylor  <cgf@redhat.com>
-
-	* environ.cc (check_case_init): Use strncasematch.
-
-	* cygwin.din: Export __mempcpy.
-	* cygwin/version.h: Bump api minor number.
-
-2003-07-21  Pavel Tsekov  <ptsekov@gmx.net>
-
-	* mmap.cc: Use proper format specifiers for _off64_t and size_t in
-	format strings passed to syscall_printf () and debug_printf ()
-	throughout.
-
-2003-07-18  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* security.cc (verify_token): Fix white space and style.
-	Use type bool instead of BOOL and char. Use alloca
-	instead of malloc and free for my_grps.
-
-2003-07-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* sysconf.cc (sysconf): Fix OPEN_MAX patch.  Return page size on
-	_SC_PAGESIZE again.
-
-2003-07-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygheap.h (class cygheap_user): Use INVALID_HANDLE_VALUE as invalid
-	value for tokens.
-	* syscalls.cc (seteuid32): Ditto.  Set new_token to process token if
-	process token is suitable.
-	* uinfo.cc (uinfo_init): Initialize tokens in cygheap user info
-	to INVALID_HANDLE_VALUE.
-
-2003-07-14  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* cygheap.h (enum impersonation): Delete.
-	(cygheap_user::impersonation_state): Delete.
-	(cygheap_user::current_token): New.
-	(cygheap_user::issetuid): Modify to use current_token.
-	(cygheap_user::token): Ditto.
-	(cygheap_user::deimpersonate): Ditto.
-	(cygheap_user::reimpersonate): Ditto.
-	(cygheap_user::has_impersonation_tokens): Ditto.
-	(cygheap_user::close_impersonation_tokens): Ditto.
-	* security.cc (cygwin_set_impersonation_token): Always set the token.
-	(verify_token): Change type of gsid to cygpsid.
-	(get_file_attribute): Use the effective ids.
-	* syscalls.cc (seteuid32): Modify to use cygheap_user::current_token.
-	* uinfo.cc (uinfo_init) Do not set cygheap->user.impersonation_state.
-
-2003-07-12  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (_pinfo::commune_send): Fix bounds test so that poll of
-	communicating pid actually stops eventually.
-
-2003-07-10  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (get_device_number): Remove special com?  consideration.
-	(special_chars): Make static.
-	(special_introducers): New.
-	(special_char): Allow specified valid_chars args.
-	(fnunmunge): Handle aux-like filenames correctly.
-	(special_name): Add con, conin$, conout$.
-	(mount_item::fnmunge): Use __small_sprintf return value to calculate
-	increments.
-
-2003-07-09  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number to 1.
-
-2003-07-09  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_proc.cc (format_proc_stat): Use correctly sized constants
-	for filling in zeros on 98.
-
-2003-07-09  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_proc.cc (fhandler_proc::fill_filebuf): Allocate more space
-	for stat buffer.
-	(format_proc_stat): Reorganize to accumulate and report on all cpus.
-
-2003-07-09  Christopher Faylor  <cgf@redhat.com>
-
-	* sysconf.cc (sysconf): Return processors online rather than bitmask
-	for _SC_NPROCESSORS_ONLN.
-
-2003-07-08  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (creturn): Set appropriate errno when out of memory.
-	(ccalloc): Only issue system_printf when debugging.
-	* dtable.cc (dtable::extend): Only allocate 100 * the incremental growth
-	size max.  Set errno appropriately.
-	(dtable::build_fhandler): Check for error from set_name.
-	* fhandler.cc (fhandler_base::set_name): Set errno and return error on OOM.
-	* fhandler.h (fhandler_base::set_name): Change to bool.
-	* fhandler_process.cc (format_process_stat): Fix formatting.
-	* resource.cc (getrlimit): Return greater of OPEN_MAX or fd table size.
-	* sysconf.cc (sysconf): Ditto.
-
-2003-07-07  Christopher Faylor  <cgf@redhat.com>
-
-	* rmsym: Don't use ranlib.
-
-2003-07-07  Christopher Faylor  <cgf@redhat.com>
-
-	* newsym: Reenable removal of tmp directory.  Just use ar to generate
-	archive index.
-	* Makefile.in: Don't send ranlib to newsym or rmsym.
-
-2003-07-07  Christopher Faylor  <cgf@redhat.com>
-
-	* newsym: Create objects that are closer to those created by dlltool so
-	as not to confuse --export-all-symbols.
-	* rmsym: Be a little more accepting of object filenames now that
-	dlltool can create different format files.
-
-2003-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* newsym: Oops.  Revert below change.
-
-2003-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* newsym: Use correct prefix for generating imports.
-	* pinfo.cc (_pinfo::commune_send): Don't wait forever for a response
-	from another process.
-
-2003-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (gethostid): Set thread affinity so that results are
-	predictable.
-
-2003-07-05  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (list::match): Add parameters to return valid address and
-	length back to munmap().  Evaluate intersection between given
-	area and mapped area and return it, if any.
-	(mmap64): On regular files, don't allow mappings beginning beyond
-	EOF.  Return with errno set to ENXIO instead.
-	(munmap): Rewrite SUSv3 conformant.  Check if given memory area is
-	valid.  Unmap all maps inside given memory area.  Don't return error
-	if no mapping has been unmapped.
-
-2003-07-05  N Stephens  <nigel@mips.com>
-
-	* fhandler.h (fhandler_socket::get_connect_state): New method to
-	return socket connection state.
-	* fhandler_socket.cc (dup): Copy socket connect state to new file
-	handle.
-	* net.cc (cygwin_rcmd): Mark file handles of sockets returned by
-	rcmd() as CONNECTED state.
-	(cygwin_rexec): Similarly for rexec().
-	(socketpair): Mark both ends of a new socket pair as CONNECTED.
-
-2003-07-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (fhandler_disk_file::mmap): Fix address test.
-
-2003-07-03  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (fillout_mntent): Change "posix" to "managed".
-
-2003-07-02  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (FH_ENC): New enum.
-	(fhandler_base::get_encoded): New function.
-	(fhandler_base::set_encoded): Ditto.
-	* fhandler_disk_file.cc (fhandler_disk_file::opendir): Set encoded flag
-	in fhandler, as appropriate.
-	(fhandler_disk_file::readdir): Unmunge filename as appropriate based on
-	new encoding flag.
-	* path.cc (normalize_posix_path): Don't punt on files with colons.
-	(special_char): New function.
-	(mount_item::fnmunge): Ditto.
-	(fnunmunge): Ditto.
-	(special_name): Ditto.
-	(mount_item::build_win32): Avoid drive considerations when file is
-	encoded.
-	(mount_info::conv_to_win32_path): Handle encoded filenames.
-	(mount_info::conv_to_posix_path): Ditto.
-	(fillout_mntent): Add posix string when directory is encoded.
-	* path.h (fnunmunge): Declare.
-	(path_conv::is_encoded): Declare.
-
-2003-07-03  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::open): Conditionalize a little
-	more of the cygserver stuff so that ttys actually work.
-
-2003-07-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (mmap64): Allow MAP_FIXED with pagesize granularity (4K).
-	If a non-zero addr is given, align it to the next lower 64K boundary.
-	(fhandler_disk_file::mmap): If a non-zero address is given, try
-	mapping using the given address first.  If it fails and flags is not
-	MAP_FIXED, try again with NULL address.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.cc: Remove _MT_SAFE conditional.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Fix --enable-server option.
-	* configure: Regenerate.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Remove cygserver stuff.
-	* acconfig.h: Add USE_CYGSERVER define.
-	* config.h.in: Regenerate.
-	* configure.in: Add --enable-server setting.
-	* configure: Regenerate.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Conditionalize
-	compilation of cygserver stuff.
-	* fork.cc (fork_child): Ditto.
-	* shm.cc: Ditto.
-	* tty.cc (tty::common_init): Ditto.
-
-	* dcrt0.cc: Use bool rather than BOOL for CYGWIN environment variable
-	definitions.
-	* environ.cc: Ditto.
-	* ntea.cc: Ditto.
-	* security.cc: Ditto.
-	* security.h: Ditto.
-	* syscalls.cc (check_posix_perm): Remove externs that were already
-	declared in a header.
-	* winsup.h: Ditto.  Declare _MT_SAFE here.  Delete it someday since
-	cygwin should always be _MT_SAFE.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.cc: Remove _MT_SAFE conditional.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Fix --enable-server option.
-	* configure: Regenerate.
-
-2003-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Remove cygserver stuff.
-	* acconfig.h: Add USE_CYGSERVER define.
-	* config.h.in: Regenerate.
-	* configure.in: Add --enable-server setting.
-	* configure: Regenerate.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Conditionalize
-	compilation of cygserver stuff.
-	* fork.cc (fork_child): Ditto.
-	* shm.cc: Ditto.
-	* tty.cc (tty::common_init): Ditto.
-
-	* dcrt0.cc: Use bool rather than BOOL for CYGWIN environment variable
-	definitions.
-	* environ.cc: Ditto.
-	* ntea.cc: Ditto.
-	* security.cc: Ditto.
-	* security.h: Ditto.
-	* syscalls.cc (check_posix_perm): Remove externs that were already
-	declared in a header.
-	* winsup.h: Ditto.  Declare _MT_SAFE here.  Delete it someday since
-	cygwin should always be _MT_SAFE.
-
-2003-06-30  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* cygheap.h (enum impersonation): New enum.
-	(cygheap_user::token): Delete.
-	(cygheap_user::impersonated): Delete.
-	(cygheap_user::external_token): New member.
-	(cygheap_user::internal_token): New member.
-	(cygheap_user::impersonation_state): New member.
-	(cygheap_user::issetuid): Modify.
-	(cygheap_user::token): New method.
-	(cygheap_user::deimpersonate): New method.
-	(cygheap_user::reimpersonate): New method.
-	(cygheap_user::has_impersonation_tokens): New method.
-	(cygheap_user::close_impersonation_tokens): New method.
-	* dtable.cc (dtable::vfork_child_dup): Use new cygheap_user methods.
-	* fhandler_socket.cc (fhandler_socket::dup): Ditto.
-	* fork.cc (fork_child): Ditto.
-	(fork_parent): Ditto.
-	* grp.cc (internal_getgroups): Ditto.
-	* security.cc (verify_token): Ditto.
-	(check_file_access): Ditto.
-	(cygwin_set_impersonation_token): Detect conflicts. Set
-	user.external_token.
-	* spawn.cc (spawn_guts): Use new cygheap_user methods.
-	* syscalls.cc (seteuid32): Rearrange to use the two tokens
-	in cygheap_user.
-	(setegid32): Use new cygheap_user methods.
-	* uinfo.cc: (internal_getlogin): Ditto.
-
-2003-06-25  Doru Carastan  <doru.carastan@mvista.com>
-
-	* Makefile.in: Use INSTALL_PROGRAM to install the cygwin DLL.
-
-2003-06-24  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (MTinterface::fixup_after_fork): Fix thread list after
-	fork.
-	(pthread::threads): Instantiate.
-	(pthread::pthread): Initialize running and suspendend.
-	Initialize next with NULL.
-	Add thread to thread list if it is not the null_pthread.
-	(pthread::~pthread): Remove thread from thread list if it is
-	not the null_pthread.
-	(pthread::postcreate): Set running flag.
-	(pthread::exit): Reset running flag.
-	(pthread::cancel): Try to cancel thread only if still running.
-	(pthread::_fixup_after_fork): Implement.
-	(pthread::detach): Check if thread is still running before detach.
-	* thread.h (pthread::running): New member.
-	(pthread::next): Ditto.
-	(pthread::fixup_after_fork): New static method.
-	(pthread::threads): New static method.
-	(pthread::_fixup_after_fork): New method.
-
-2003-06-20  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (_pinfo::commune_send): Don't attempt to communicate with a
-	pure windows process.
-
-2003-06-18  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* autoload.cc (GetNetworkParams): Add.
-	* net.cc (getdomainname): Call GetNetworkParams and read the
-	DhcpDomain registry value if warranted.
-
-2003-06-17  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (mount): Do more strict checking on posix path arguments.
-
-2003-06-15  Christopher Faylor  <cgf@redhat.com>
-
-	Throughout, remove "include <errno.h>" from files which already include
-	cygerrno.h.
-
-2003-06-15  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* include/cygwin/config.h (__DYNAMIC_REENT__): Define.
-	* include/cygwin/version.h: Bump API minor version.
-	* cygwin.din: Export __getreent
-	* cygerrno.h: Include errno.h.  Fix places where _impure_ptr is used
-	directly to store the errno value.
-	* debug.cc (__set_errno): Ditto.
-	* errno.cc: Remove _RRENT_ONLY define to get errno.cc compiled.
-	* signal.cc: Rename _reent_clib to _REENT throughout.
-	* thread.h (reent_clib): Remove prototype.
-	* thread.cc (reent_clib): Rename reent_clib to __getreent.  Return
-	_impure_ptr until MTinterface is initialized.
-	(reent_winsup): Fix a possible SEGV when _r == NULL.  Return NULL
-	instead.
-	* MTinterface::fixup_after_fork: Switch reent back to _impure_ptr to
-	keep signal handling running when fork is called from a thread other
-	than the mainthread.
-
-2003-06-12  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (pthread_attr_init): Revert change from 2003-06-11
-	to return 0 if attribute is already initialized back to EBUSY.
-	(pthread_condattr_init): Ditto.
-	(pthread_rwlockattr_init): Ditto.
-	(pthread_mutexattr_init): Ditto.
-
-2003-06-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* exceptions.cc (ctrl_c_handler): Don't send a signal on
-	CTRL_SHUTDOWN_EVENT.  Add a comment to rationalize the patch.
-
-2003-06-11  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (pthread_attr_init): Return 0 if attribute is already
-	initialized.
-	Fix return code if out of memory.
-	(pthread_condattr_init): Ditto.
-	(pthread_rwlockattr_init): Ditto.
-	(pthread_mutexattr_init): Return 0 if attribute is already
-	initialized.
-
-2003-06-09  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* spawn.cc (spawn_guts): Call CreateProcess while impersonated,
-	when the real {u,g}ids and the groups are original.
-	Move RevertToSelf and ImpersonateLoggedOnUser to the main line.
-	* uinfo.cc (uinfo_init): Reorganize. If CreateProcess was called
-	while impersonated, preserve the uids and gids and call
-	ImpersonateLoggedOnUser. Preserve the uids and gids on Win9X.
-
-	* exceptions.cc (error_start_init): Quote the pgm in the command.
-
-2003-06-07  Christopher Faylor  <cgf@redhat.com>
-
-	* poll.cc: Define FD_SETSIZE to ridiculously large number so that there
-	will be no artificially small limits.
-
-2003-06-07  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::close): Free the console when
-	last tty closes.
-
-2003-06-07  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* fhandler_socket.cc (fhandler_socket::connect): Change error
-	handling for nonblocking connects to return EALREADY when
-	connect is called more than once for the same socket.
-
-2003-06-06  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din: Add vsyslog.
-	* fhandler.cc (fhandler_base::write): Only make file sparse if the
-	seeked area is >= 128K.
-	* syslog.cc (vsyslog): New function, overtaking functionality from
-	syslog.
-	(syslog): Just call vsyslog.
-	* include/cygwin/version.h: Bump API minor.
-	* include/sys/syslog.h: Add vsyslog declaration.
-
-2003-06-05  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::terminate_thread): Change system_printf to
-	debug_printf.
-
-2003-06-04  Christopher Faylor  <cgf@redhat.com>
-
-	* shared.cc (shared_info::heap_chunk_size): Be really defensive about
-	making sure that heap_chunk is set.
-
-2003-06-04  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (conv_path_list): Use correct value when calculating length
-	to avoid a potential SEGV.
-
-2003-06-03  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat): Mark the pc
-	as non-executable if the file cannot be opened for read. Retry query
-	open only if errno is EACCES. Never change the mode, even if it is 000
-	when query open() fails.
-
-2003-06-03  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Allow any i?86 variant.
-	* configure: Regenerate.
-
-2003-06-03  Corinna Vinschen  <corinna@vinschen.de>
-	    Thomas Pfaff <tpfaff@gmx.net>
-
-	* fhandler_socket.cc (connect_thread): Remove.
-	(accept_thread): Remove.
-	(fhandler_socket::connect): Remove all special blocking handling.
-	(fhandler_socket::accept): Ditto.
-	* net.cc (cygwin_connect): Make blocking sockets temporarily
-	non-blocking and call cygwin_select on them to be interruptible.
-	(cygwin_accept):  Ditto.
-
-2003-06-02  Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (spawn_guts): Don't hang around if the parent doesn't exist.
-
-2003-06-02  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.h (cygthread::terminate_thread): Mark private.
-	* cygthread.cc (cygthread::terminate_thread): Deallocate free_range
-	thread stuff.
-
-2003-06-02  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::accept): Rename `signalled'
-	to `interrupted' as used in fhandler_socket::connect.
-
-2003-06-02  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::connect): Simplify previous
-	patch.
-	(fhandler_socket::accept): Ditto.
-
-2003-06-02  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc: Include cygthread.h.
-	(class sock_event): Remove.
-	(thread_connect): New function.
-	(thread_accept): Ditto.
-	(fhandler_socket::connect): Use cygthread instead of socket event
-	handling for blocking sockets.
-	(fhandler_socket::accept): Ditto.
-
-2003-06-02  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::write): Correct minor printf formatting
-	style glitch.
-
-2003-06-01  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_by_name): Assume
-	an existing directory is a root if FindFirstFile fails.
-
-2003-05-30  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (mount_info::conv_to_win32_path): gcc warning about chroot_ok
-	was actually valid.  Fix it.
-
-2003-05-30  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (init_cheap): Temporarily remove inline that newer gcc's
-	have problems with.
-
-	* path.cc (path_conv::check): Rework has_acls logic slightly.  Uncouple
-	exec tests away from filesystem tests.
-
-2003-05-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/sys/param.h: Add DEV_BSIZE.
-
-2003-05-29  Pierre Humblet  <pierre.humblet@ieee.org>
-	    Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::dup): Rearrange.  Fix
-	conditional.
-
-2003-05-28  Christopher Faylor  <cgf@redhat.com>
-
-	* mkvers.sh: Avoid "-dontuse" tags.
-
-	* path.cc (path_conv::check): Set exec state based on known situations.
-
-	* path.cc (mount_item::fnmunge): New function.
-	(mount_item::build_win32): New function.
-	(mount_info::conv_to_win32_path): Use build_win32 to build windows
-	path.
-	* path.h (mount_item::fnmunge): Declare new function.
-	(mount_item::build_win32): Ditto.
-	* sys/mount.h (MOUNT_ENC): Define.
-
-2003-05-28  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::dup): If running impersonated,
-	revert to original account before calling fixup_before_fork_exec
-	and impersonate again afterwards.  Change comment accordingly.
-	Clean up error handling and debug output.
-
-2003-05-27  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* fhandler_socket.cc (sock_event::~sock_event): New method.
-	(sock_event::load): Change to void. Check if winsock2 is available.
-	(socke_event::wait): Return 0 if interruptible mode is not available.
-	(fhandler_socket::connect): Remove checks for winsock2 availability.
-	(fhandler_socket::accept): Ditto.
-
-2003-05-27  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::dup): First try duplicating
-	using WSADuplicateSocket/WSASocket, if that fails, try DuplicateHandle.
-
-2003-05-27  Bill C. Riemers  <cygwin@docbill.net>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Filter
-	permissions through umask on FAT or if ntsec is off.
-
-2003-05-26  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* syscalls.cc (statfs): Call GetDiskFreeSpaceEx before GetDiskFreeSpace.
-
-2003-05-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.cc (is_at_eof): Fix conditional.  Use INVALID_FILE_SIZE
-	instead of numeric constant.
-
-2003-05-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::connect): Guard calls to
-	sock_event methods by a check for WinSock2 availability.
-	(fhandler_socket::accept): Ditto.
-
-2003-05-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.h: Rename FH_W95LSBUG flag to FH_LSEEKED.
-	(fhandler_base::set_did_lseek): Rename from set_check_win95_lseek_bug.
-	(fhandler_base::get_did_lseek): Rename from get_check_win95_lseek_bug.
-	(fhandler_base::set_fs_flags): New method.
-	(fhandler_base::get_fs_flags): Ditto.
-	* fhandler.cc (fhandler_base::write): Make 64 bit clean.  Convert file
-	to a "sparse" file when writing after a long lseek (>64K) beyond EOF.
-	(fhandler_base::lseek): Call set_did_lseek() instead of
-	set_check_win95_lseek_bug().
-	(fhandler_base::fhandler_base): Initialize fs_flags to 0.
-	* fhandler_disk_file.cc (fhandler_disk_file::open): Don't create files
-	as "sparse" unconditionally.  Set fs_flags member.
-
-2003-05-25  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* autoload.cc (GetDiskFreeSpaceEx): Add.
-	* syscalls.cc (statfs): Call full_path.root_dir() instead of
-	rootdir(full_path). Use GetDiskFreeSpaceEx when available and
-	report space available in addition to free space.
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_by_name):
-	Do not call FindFirstFile for disk root directories.
-
-2003-05-24  Joe Buehler  <jhpb@draco.hekimian.com>
-
-	* fhandler_process.cc (format_process_stat): Use PagefileUsage
-	instead of VirtualSize.
-	(get_mem_values): Ditto.
-
-2003-05-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* shared_info.h: Match shared_name declaration with below change.
-	* shared.cc (shared_name): Use incoming char * parameter instead of
-	local static buffer.
-	(open_shared): Accommodate new calling convention for shared_name.
-	* exceptions.cc (events_init): Ditto.
-	* sigproc.cc (getsem): Ditto.
-	* syscalls.cc (login): Ditto.
-	(logout): Ditto.
-	(pututline): Ditto.
-
-2003-05-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (secret_event_name): Return void.  Use incoming
-	char * parameter instead of local static buffer.
-	(fhandler_socket::create_secret_event): Accommodate new calling
-	convention for secret_event_name.
-	(fhandler_socket::close_secret_event): Ditto.
-
-2003-05-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (SECRET_EVENT_NAME): Remove.
-	(ENTROPY_SOURCE_NAME): Ditto.
-	(secret_event_name): New static function.  Create shared event name
-	with "Global\" prefix on systems supporting terminal services.
-	(fhandler_socket::set_connect_secret): Fix conditional.
-	(fhandler_socket::create_secret_event): Create secret event using
-	secret_event_name().
-	(fhandler_socket::close_secret_event): Ditto.
-	* shared.cc (shared_name): Create shared object name with "Global\"
-	prefix on systems supporting terminal services.
-	* wincap.cc: Set has_terminal_services capability throughout.
-	(wincap_2003): New global object representing Windows 2003 Server
-	capabilities.
-	(wincapc::init): Accommodate Windows 2003 Server.
-	* wincap.h (struct wincaps): Add has_terminal_services capability.
-
-2003-05-20  Charles Wilson  <cygwin@cwilson.fastmail.fm>
-
-	* winsup/cygwin/include/cygwin/version.h: Bump API minor version.
-	* winsup/cygwin/include/cygwin/types.h: Define key_t as long long.
-	* winsup/cygwin/cygwin.din: Add ftok, _ftok.
-	* winsup/cygwin/ipc.cc (ftok): Rework implementation.
-
-2003-05-18  Joe Buehler  <jhpb@hekimian.com>
-
-	* spawn.cc (spawn_guts): Show more of command line in strace output.
-
-2003-05-15  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.h (pthread::init_mainthread): Remove function parameter.
-	(MTinterface::Init): Ditto.
-	* thread.cc (MTinterface::Init): Remove function parameter.
-	Always initialize reent_key.
-	(pthread::init_mainthread): Remove function parameter.
-	(MTinterface::fixup_after_fork): Fix pthread::init_mainthread call.
-	* dcrt0.cc (dll_crt_0_1) Fix calls to MTinterface::Init and
-	pthread::init_mainthread.
-	Call pthread::init_mainthread only when not forked.
-
-2003-05-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_proc.cc (format_proc_meminfo): Make swap memory output
-	Linux style values.
-
-2003-05-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/config.h: Define __USE_INTERNAL_STAT64 appropriately.
-
-2003-05-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (CYGWIN_START): Define as crt0.o.  Add to TARGET_LIBS.
-	* fhandler.h (fhandler_virtual::fstat): Remove useless declaration.
-	* fhandler_virtual.cc: Remove _COMPILING_NEWLIB define.
-	* ipc.cc (ftok): Use stat64.
-	* syscalls.cc (_fstat64): Remove alias.
-	(_fstat): Ditto.
-	(_stat): Ditto.
-	(_fstat64_r): New function.
-	(_fstat_r): Ditto.
-	(_stat64_r): Ditto.
-	(stat_r): Ditto.
-	* crt0.o: New file, moved from newlib.
-	* include/sys/param.h: Ditto.
-	* include/sys/utime.h: Ditto.
-	* include/sys/utmp.h: Ditto.
-	* include/sys/dirent.h: Ditto.  Expose different struct dirent,
-	dependening of the environment.
-
-2003-05-11  Corinna Vinschen  <corinna@vinschen.de>
-
-	Replace ino_t by __ino64_t throughout.
-
-2003-05-11  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/types.h: Add key_t typedef.
-
-2003-05-10  Christopher Faylor  <cgf@redhat.com>
-
-	* dir.cc (readdir): Fill out new old_d_ino field.
-	* fhandler.h (fhandler_base::namehash): Define as ino_t.
-	(fhandler_base::get_namehash): Ditto.
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Accommodate
-	new 64 bit st_ino.
-	* fhandler_socket.cc (fhandler_socket::fstat): Ditto.
-	* path.cc (hash_path_name): Return ino_t.
-	* syscalls.cc (stat64_to_stat32): Convert 64 bit inode to 32 bit.
-	* winsup.h (hash_path_name): Declare as returning ino_t.
-	* include/cygwin/stat.h (__stat32): Use 32 bit st_ino.
-	(__stat64): Use 64 bit st_ino.
-	* include/cygwin/types.h (__ino64_t): Define.
-	(__ino32_t): Ditto.
-	(ino_t): Define appropriately.
-
-2003-05-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (NEW_FUNCTIONS): All 32/64 from 0.79 API get
-	leading underscore.
-	* cygwin.din: Ditto.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-05-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/config.h: New file.
-
-2003-05-09  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::detach): Prioritize waiting for I/O
-	completion over waiting for signal delivery.
-
-2003-05-06  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* signal.cc (nanosleep): Do not wait twice for signal arrival.
-
-2003-05-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/types.h: Fix erroneous definition of ino_t from
-	2003-04-28.
-
-2003-05-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (chown_worker): Allow chown'ing of socket files.
-
-2003-04-30  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* Makefile.in: Revert patch from 2003-04-17.
-
-2003-04-28  Brian Ford  <ford@vss.fsi.com>
-
-	* profil.h (PROFADDR): Prevent overflow when text segments are larger
-	than 256k.
-	* profil.c (profthr_func): Raise thread priority for more accurate
-	sampling.
-
-2003-04-26  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (hash_path_name): Use ino_t as type.
-
-2003-04-26  Christopher Faylor  <cgf@redhat.com>
-
-	* errno.cc (_sys_nerr): Fix compile error erroneously checked in on
-	2003-04-23.
-
-2003-04-25  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/netinet/ip.h: Include netinet/in_systm.h and netinet/in.h
-	to allow standalone usage (autoconf).
-
-2003-04-23  Christopher Faylor  <cgf@redhat.com>
-
-	* fork.cc: Change SLOW_PID_REUSE to NO_SLOW_PID_REUSE and invert ifdef
-	sense throughout.
-
-2003-04-22  Christopher Faylor  <cgf@redhat.com>
-
-	* select.cc (fhandler_pipe::ready_for_read): Assure that get_guard is
-	called for successful non-blocking pipe reads.
-
-2003-04-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/inttypes.h: New file.
-	* include/stdint.h: New file.
-	* include/cygwin/in.h: Include stdint.h instead of sys/types.h.
-	* include/cygwin/types.h: Include stdint.h.  Remove typedefs for
-	intN_t and uintN_t since these are defined in stdint.h now.
-
-2003-04-21  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL major number to 1005.  Change DLL
-	minor number to 0.  Bump API minor number.
-
-2003-04-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* autoload.cc (CreateWindowStationA): Add.
-	(SetProcessWindowStation): Add.
-
-2003-04-19  Christopher Faylor  <cgf@redhat.com>
-
-	* wincap.h (wincaps:pty_needs_alloc_console): New element.
-	(wincapc:pty_needs_alloc_console): New function.
-	* wincap.cc: Add pty_needs_alloc_console throughout.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Open an "invisible"
-	console on first pty allocation.
-
-2003-04-18  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::open): Allocate a console
-	whenever a pty is allocated.
-
-2003-04-18  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Use ${nostdlib} variable.
-
-2003-04-18  Diego Biurrun  <diego@biurrun.de>
-
-	* fhandler_proc.cc (format_proc_cpuinfo): Change /proc/cpuinfo "vendor
-	id" string to "vendor_id" to conform with Linux systems.
-
-2003-04-17  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (setsid): Don't call FreeConsole if ctty is already < 0.
-
-2003-04-17  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* Makefile.in: Add finline-functions optimization to CXXFLAGS.
-	* autoload.cc (LoadDLLprime): Rename std_dll_init to
-	_std_dll_init.
-	(std_dll_init): Remove name mangling prototype. Add attributes
-	used and noinline.
-	(wsock_init): Ditto.
-	Change wsock_init to _wsock_init in wsock32 and ws2_32
-	LoadDLLprime.
-	* exceptions.cc (unused_sig_wrapper): Remove prototype. Add
-	attributes used and noinline.
-	* pwdgrp.h ((pwdgrp (passwd *&)): Remove inline code.
-	(pwdgrp (__group32 *&)): Ditto.
-	* grp.cc (pwdgrp (passwd *&)): Outline constructor.
-	(pwdgrp (__group32 *&)): Ditto.
-
-2003-04-17  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.h (pthread::equal): New static method.
-	* thread.cc: Rename pthread_equal to pthread::equal throughout.
-	(pthread_equal): Use pthread::equal to compare threads ids.
-
-2003-04-15  Christopher Faylor  <cgf@redhat.com>
-
-	* termios.cc (setspeed): New function.
-	(cfsetospeed): Use setspeed to set speed.
-	(cfsetispeed): Use setspeed to set speed.
-
-2003-04-15  Chris January <chris@atomice.net>
-
-	* autoload.cc: Add load statement for UuidCreate, and
-	UuidCreateSequential.
-	* cpuid.h: New file.
-	* cygwin.din: Export gethostid.
-	* fhandler_proc.cc (cpuid): Move to cpuid.h.
-	(can_set_flag): Move to cpuid.h.
-	* syscalls.cc (gethostid): New function.
-	* version.h: Bump api minor version number to 83.
-
-2003-04-15  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.h (pthread_rwlock::release): New method.
-	* thread.cc (pthread_rwlock::unlock): Use release to signal waiting
-	threads.
-	(pthread_rwlock::rdlock_cleanup): Signal waiting threads after a
-	cancelation.
-	(pthread_rwlock::wrlock_cleanup): Ditto.
-
-2003-04-13  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* mkvers.sh: Prefix day with 0 in date only when day < 10.
-
-2003-04-11  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* security.cc (get_info_from_sd): New function.
-	(get_nt_attribute): Only call read_sd and get_info_from_sd.
-	Return void.
-	(get_file_attribute): Move sd error handling to get_info_from_sd.
-	and symlink handling to fhandler_disk_file::fstat_helper.
-	(get_nt_object_attribute): Only call read_sd and get_info_from_sd.
-	Return void.
-	(get_object_attribute): Remove symlink handling and simply return -1
-	when ntsec is off.
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): For
-	symlinks set the attribute, call get_file_attribute to get the ids
-	and return.  In the normal case call get_file_attribute with the
-	addresses of the buffer ids and do not recheck if the file is a socket.
-
-2003-04-10  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Initialize stack pointer earlier.
-	(cygthread::simplestub): Initialize stack pointer.
-	(cygthread::terminate_thread): Account for possibility that stack
-	pointer has not been set.  Issue warnings for unusual conditions.
-
-2003-04-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* regex/regex.h: Define regoff_t as _off_t.
-	* regex/regex2.h: Ditto.
-
-2003-04-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din: Export wcscoll, wcswidth and wcwidth.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-04-10  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.h: Change 'avail' cygthread element to 'inuse' throughout.
-	* cygthread.cc: Ditto.
-	(cygthread::stub): Don't initialize already initialized events.
-	(cygthread::freerange): Don't create thread here.
-	(cygthread::cygthread): Create thread here.  Die if thread not created.
-	(cygthread::operator new): Simplify.  Just grab a thread structure from
-	the pool.  Don't try to start the thread.
-	(cygthread::terminate_thread): Don't close event handles.  Just reuse
-	them.  Call MEM_RELEASE rather than MEM_DECOMMIT (from Joe uehler).
-
-2003-04-08  Bob Cassels <bcassels@abinitio.com>
-
-	* fhandler_console.cc (fhandler_console::read) Handle certain key up
-	events, to allow pasting accented characters and typing them using the
-	"alt + numerics" sequences.
-
-2003-04-07  Christopher Faylor  <cgf@redhat.com>
-
-	* include/limits.h (IOV_MAX): Set to a number which is small enough to
-	use in an array.
-
-2003-04-04  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.h (cygthread::avail): Make LONG for easier use with
-	Interlocked* functions.
-	* cygthread.cc (cygthread::init): Eliminate unneeded muto.
-	(cygthread::operator new): Don't lock.  Instead change use of avail
-	variable into tri-state: available (1), not available (-1),
-	uninitialized (0).
-	(cygthread::terminate_thread): Set avail to uninitialized.
-	(cygthread::detach): Eliminate local 'avail'.  Always set avail to 1
-	unless signalled.
-
-2003-04-04  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::operator new): Be more defensive when messing with
-	threads that are marked "unavailable".
-
-2003-04-03  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (CONVERT_LIMIT): Use a size for the 21st century.
-
-2003-04-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* external.cc (check_ntsec): Return general ntsec state on NULL
-	filename.  Check wincap.is_security() additionally.
-
-2003-04-02  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (EXTRA_OFILES): Remove debugging object.
-
-2003-04-02  Jason Tishler <jason@tishler.net>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* external.cc (check_ntsec): New function.
-	(cygwin_internal): Add CW_CHECK_NTSEC handling to call check_ntsec()
-	from applications.
-	* include/cygwin/version.h: Bump API minor number.
-	* include/sys/cygwin.h (cygwin_getinfo_types): Add CW_CHECK_NTSEC.
-
-2003-04-02  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::new): Add more defensive debugging.
-
-2003-04-01  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* fhandler.cc (fhandler_base::fstat): Set the uid and gid fields
-	from the current effective ids.
-	* fhandler_socket.cc (fhandler_socket::fstat): Keep the uid and gid set
-	by fhandler_base::fstat.
-	* security.cc (get_nt_attribute): Do not test wincap.has_security ().
-	(get_nt_object_attribute): Ditto.
-	(get_file_attribute): Add test for wincap.has_security ().
-	(get_object_attribute): Ditto.
-
-2003-04-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dir.cc: Change __off32_t to _off_t and __off64_t to _off64_t
-	throughout.
-	* fhandler.cc: Ditto.
-	* fhandler.h: Ditto.
-	* fhandler_clipboard.cc: Ditto.
-	* fhandler_disk_file.cc: Ditto.
-	* fhandler_dsp.cc: Ditto.
-	* fhandler_floppy.cc: Ditto.
-	* fhandler_mem.cc: Ditto.
-	* fhandler_proc.cc: Ditto.
-	* fhandler_process.cc: Ditto.
-	* fhandler_random.cc: Ditto.
-	* fhandler_registry.cc: Ditto.
-	* fhandler_tape.cc: Ditto.
-	* fhandler_termios.cc: Ditto.
-	* fhandler_virtual.cc: Ditto.
-	* fhandler_zero.cc: Ditto.
-	* mmap.cc: Ditto.
-	* pipe.cc: Ditto.
-	* syscalls.cc: Ditto.
-	* winsup.h: Ditto.
-	* include/cygwin/stat.h: Ditto.
-	* include/cygwin/types.h: Ditto.  Remove definition of __off32_t
-	and __off64_t.
-
-2003-03-31  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (setup_handler): Make sure winapi lock is released when
-	exiting loop.
-
-2003-03-30  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/fs.h: Remove unneeded include.
-	* include/cygwin/in.h: Include sys/types.h rather than cygwin/types.h.
-
-2003-03-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (login): Fix comment.
-	(logout): Ditto.
-
-2003-03-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc: Slightly cleanup all utmp functions.
-	(login): Use mutex to secure against concurrent access to wtmp file.
-	(logout): Rewrite using POSIX calls.
-	(utmp_fd): Initialized to -1 now.  Any value < 0 is treated as closed
-	in subsequent functions.
-	(utmp_readonly): New variable, indicating utmp file open for reading
-	only.
-	(internal_setutent): New function implementing setutent().
-	(setutent): Call internal_setutent now.
-	(endutent): Reset utmp_readonly.
-	(getutent): Return immediately if utmp file can't be opened.
-	(getutid): Ditto.
-	(getutline): Ditto.
-	(pututline): Ditto. Use mutex to secure against concurrent access to
-	utmp file.
-
-2003-03-28  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Remove EXE_LDFLAGS.  Fix fhandler_CFLAGS typo.  Recognize .s suffix.
-	* configure.in: Remove EXE_LDFLAGS.
-	* configure: Regenerate.
-
-2003-03-28  Christopher Faylor  <cgf@redhat.com>
-
-	* include/sys/cygwin.h: Declare cygwin_internal as unsigned long.
-	* external.cc (cygwin_internal): Define as unsigned long.
-
-2003-03-27  Christopher Faylor  <cgf@redhat.com>
-
-	* include/sys/cygwin.h: Move cygwin_internal outside of WINVER
-	conditional.
-
-2003-03-27  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc: Change 1==foo equations to foo==1 throughout.
-
-2003-03-27  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.h: Change class names, methods, members and local vars
-	according to the GNU coding style.
-	* thread.cc: Ditto.
-	* dcrt0.cc (dll_crt0_1): Rename pthread::initMainThread call to
-	pthread::init_mainthread.
-	* pthread.cc (pthead_getsequence_np): Rename pthread::isGoodObject
-	call to pthread::is_good_object.
-
-2003-03-27  Joe Buehler  <jhpb@draco.hekimian.com>
-
-	* autoload.cc: Add RegGetKeySecurity().
-	* security.cc (get_nt_object_attribute): Use RegGetKeySecurity() for
-	performance.
-
-2003-03-25  Christopher Faylor  <cgf@redhat.com>
-	    Joe Buehler  <jhpb@draco.hekimian.com>
-
-	* fork.cc (fork_parent): Don't copy signals from parent to child here.
-	* sigproc.cc (proc_subproc): Copy signals from parent to child pinfo
-	here.
-
-2003-03-23  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.h (class List): Move inline code inside class declaration.
-	(List::forEach): Change callback parameter to template class member
-	function pointer.
-	(pthread_keys::fixup_before_fork): Change to inline.  Use List::forEach
-	to fixup keys.
-	(pthread_keys::fixup_after_fork): Ditto.
-	(pthread_keys::runAllDestructors): Ditto.
-	(pthread_key::saveAKey): Remove.
-	(pthread_key::restoreAKey): Ditto.
-	(pthread_key::destroyAKey): Ditto.
-	(pthread_key::run_destructor): Rename to runDestructor.
-	(pthread_mutex::fixup_after_fork): Change to inline.  Use List::forEach
-	to fixup mutexes after a fork.
-	(pthread_mutex::FixupAfterFork): New method.
-	(pthread_mutex::mutexes): New member.
-	(pthread_cond::fixup_after_fork): Change to inline.  Use List::forEach
-	to fixup conds after a fork.
-	(pthread_cond::FixupAfterFork): New method.
-	(pthread_cond::conds): New member.
-	(pthread_rwlock::fixup_after_fork): Change to inline.  Use
-	List::forEach to fixup rwlocks after a fork.
-	(pthread_rwlock::FixupAfterFork): New method.
-	(pthread_rwlock::rwlocks): New member.
-	(semaphore::fixup_after_fork): Change to inline.  Use List::forEach to
-	fixup mutexes after a fork.
-	(semaphore::FixupAfterFork): New method.
-	(semaphore::semaphores): New member.
-	(MTinterface::mutexs): Remove.
-	(MTinterface::conds): Ditto.
-	(MTinterface::rwlocks): Ditto.
-	(MTinterface::semaphores): Ditto.
-	(pthread_equal): Add extern "C".
-	(pthread_mutex_lock): Ditto.
-
-	* thread.cc (MTinterface::fixup_after_fork): Change fixup_after_fork
-	calls for pthread objects.
-	(semaphore::conds): Instantiate.
-	(pthread_cond::pthread_cond): Use List::Insert rather than custom list
-	code.
-	(pthread_cond::~pthread_cond): Use List::Remove rather than custom list
-	code.
-	(pthread_cond::fixup_after_fork): Rename to FixupAfterFork.
-	(pthread_rwlock::rwlocks): Instantiate.
-	(pthread_rwlock::pthread_crwlock): Use List::Insert rather than custom
-	list code.
-	(pthread_rwlock::~pthread_rwlock): Use List::Remove rather than custom
-	list code.
-	(pthread_rwlock::fixup_after_fork): Rename to FixupAfterFork.
-	(pthread_key::saveAKey): Remove.
-	(pthread_key::fixup_before_fork): Ditto.
-	(pthread_key::restoreAKey): Ditto.
-	(pthread_key::fixup_after_fork): Ditto.
-	(pthread_key::destroyAKey): Ditto.
-	(pthread_key::runAllDestructors): Ditto.
-	(pthread_key::run_destructor): Rename to runDestructor.
-	(pthread_mutex::mutexes): Instantiate.
-	(pthread_mutex::pthread_mutex): Use List::Insert rather than custom
-	list code.
-	(pthread_mutex::~pthread_mutex): Use List::Remove rather than custom
-	list code.
-	(pthread_mutex::fixup_after_fork): Rename to FixupAfterFork.
-	(semaphore::conds): Instantiate.
-	(semaphore::semaphore): Use List::Insert rather than custom list code.
-	(semaphores::~semaphore): Use List::Remove rather than custom list
-	code.
-	(semaphore::fixup_after_fork): Rename to FixupAfterFork.
-
-2003-03-22  Christopher Faylor  <cgf@redhat.com>
-
-	* pipe.cc (fhandler_pipe::dup): Don't dup input_handle if it doesn't
-	exist.
-
-2003-03-22  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (unlink): Be more defensive when SetFileAttributes is
-	called.  Fix typo in debugging output.
-
-2003-03-21  Christopher Faylor  <cgf@redhat.com>
-
-	* fork.cc: Conditionalize use of slow_pid_reuse throughout.  It's not
-	necessary for newer versions of bash.
-
-2003-03-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::sendto): Restrict EPIPE and
-	SIGPIPE handling to connection oriented sockets.  Add comment.
-
-2003-03-19  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.h (signal_fixup_after_exec): Eliminate argument in declaration.
-	* exceptions.cc (signal_fixup_after_exec): Eliminate argument in
-	definition.  Don't reset signal handlers after spawm.  Just treat like
-	fork/exec.
-	* dcrt0.cc (dll_crt0_1): Don't pass PROC_SPAWN argument to
-	signal_fixup_after_exec.
-	* syscalls.cc (unlink): Don't change attributes of file if not readonly/system.
-	Ditto for resetting of arguments.
-
-2003-03-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* glob.c: Eliminate __INSIDE_CYGWIN__ preprocessor conditionals
-	throughout.
-
-2003-03-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Fix
-	wrong usage of S_IFDIR.
-	* security.cc (get_attribute_from_acl): Ditto.
-	(get_file_attribute): Fix wrong usage of S_IFLNK.
-	(get_object_attribute): Ditto.
-	(alloc_sd): Fix wrong usage of S_IFDIR.
-	* syscalls.cc (chmod): Allow chmod'ing of socket files.
-
-2003-03-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/version.h (CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES):
-	Define.
-	* glob.c (g_lstat): Use CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES
-	instead of numerical constants.
-	(g_stat): Ditto.
-
-2003-03-18  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* pthread.cc (pthread_attr_init): Remove
-	(pthread_attr_destroy): Ditto.
-	(pthread_attr_setdetachstate): Ditto.
-	(pthread_attr_getdetachstate): Ditto.
-	(pthread_attr_setstacksize): Ditto.
-	(pthread_attr_getstacksize): Ditto.
-	(pthread_attr_setinheritsched): Ditto.
-	(pthread_attr_getinheritsched): Ditto.
-	(pthread_attr_setschedparam): Ditto.
-	(pthread_attr_getschedparam): Ditto.
-	(pthread_attr_setschedpolicy): Ditto.
-	(pthread_attr_getschedpolicy): Ditto.
-	(pthread_attr_setscope): Ditto.
-	(pthread_attr_getscope): Ditto.
-	(pthread_attr_setstackaddr): Ditto.
-	(pthread_attr_getstackaddr): Ditto.
-	(pthread_key_create): Ditto.
-	(pthread_key_delete): Ditto.
-	(pthread_setspecific): Ditto.
-	(pthread_getspecific): Ditto.
-	(pthread_kill): Ditto.
-	(pthread_sigmask): Ditto.
-	(pthread_equal): Ditto.
-	(pthread_mutex_lock): Ditto.
-	(pthread_mutex_trylock): Ditto.
-	(pthread_mutex_unlock): Ditto.
-	(pthread_mutex_destroy): Ditto.
-	(pthread_mutex_setprioceiling): Ditto.
-	(pthread_mutex_getprioceiling): Ditto.
-	(pthread_mutexattr_destroy): Ditto.
-	(pthread_mutexattr_getprioceiling): Ditto.
-	(pthread_mutexattr_getprotocol): Ditto.
-	(pthread_mutexattr_getpshared): Ditto.
-	(pthread_mutexattr_gettype): Ditto.
-	(pthread_mutexattr_init): Ditto.
-	(pthread_mutexattr_setprioceiling): Ditto.
-	(pthread_mutexattr_setprotocol): Ditto.
-	(pthread_mutexattr_setpshared): Ditto.
-	(pthread_mutexattr_settype): Ditto.
-	(pthread_cond_destroy): Ditto.
-	(pthread_cond_signal): Ditto.
-	(pthread_cond_broadcast): Ditto.
-	(pthread_condattr_init): Ditto.
-	(pthread_condattr_destroy): Ditto.
-	(pthread_condattr_getpshared): Ditto.
-	(pthread_condattr_setpshared): Ditto.
-	(pthread_rwlock_destroy): Ditto.
-	(pthread_rwlock_rdlock): Ditto.
-	(pthread_rwlock_tryrdlock): Ditto.
-	(pthread_rwlock_wrlock): Ditto.
-	(pthread_rwlock_trywrlock): Ditto.
-	(pthread_rwlock_unlock): Ditto.
-	(pthread_rwlockattr_init): Ditto.
-	(pthread_rwlockattr_getpshared): Ditto.
-	(pthread_rwlockattr_setpshared): Ditto.
-	(pthread_rwlockattr_destroy): Ditto.
-	(pthread_getconcurrency): Ditto.
-	(pthread_setconcurrency): Ditto.
-	(pthread_getschedparam): Ditto.
-	(pthread_setschedparam): Ditto.
-
-	* thread.h (__pthread_attr_init): Remove prototype.
-	(__pthread_attr_destroy): Ditto.
-	(__pthread_attr_setdetachstate): Ditto.
-	(__pthread_attr_getdetachstate): Ditto.
-	(__pthread_attr_setstacksize): Ditto.
-	(__pthread_attr_getstacksize): Ditto.
-	(__pthread_attr_setinheritsched): Ditto.
-	(__pthread_attr_getinheritsched): Ditto.
-	(__pthread_attr_setschedparam): Ditto.
-	(__pthread_attr_getschedparam): Ditto.
-	(__pthread_attr_setschedpolicy): Ditto.
-	(__pthread_attr_getschedpolicy): Ditto.
-	(__pthread_attr_setscope): Ditto.
-	(__pthread_attr_getscope): Ditto.
-	(__pthread_attr_setstackaddr): Ditto.
-	(__pthread_attr_getstackaddr): Ditto.
-	(__pthread_key_create): Ditto.
-	(__pthread_key_delete): Ditto.
-	(__pthread_setspecific): Ditto.
-	(__pthread_getspecific): Ditto.
-	(__pthread_kill): Ditto.
-	(__pthread_sigmask): Ditto.
-	(__pthread_equal): Ditto.
-	(__pthread_mutex_lock): Ditto.
-	(__pthread_mutex_trylock): Ditto.
-	(__pthread_mutex_unlock): Ditto.
-	(__pthread_mutex_destroy): Ditto.
-	(__pthread_mutex_setprioceiling): Ditto.
-	(__pthread_mutex_getprioceiling): Ditto.
-	(__pthread_mutexattr_destroy): Ditto.
-	(__pthread_mutexattr_getprioceiling): Ditto.
-	(__pthread_mutexattr_getprotocol): Ditto.
-	(__pthread_mutexattr_getpshared): Ditto.
-	(__pthread_mutexattr_gettype): Ditto.
-	(__pthread_mutexattr_init): Ditto.
-	(__pthread_mutexattr_setprioceiling): Ditto.
-	(__pthread_mutexattr_setprotocol): Ditto.
-	(__pthread_mutexattr_setpshared): Ditto.
-	(__pthread_mutexattr_settype): Ditto.
-	(__pthread_cond_destroy): Ditto.
-	(__pthread_cond_signal): Ditto.
-	(__pthread_cond_broadcast): Ditto.
-	(__pthread_condattr_init): Ditto.
-	(__pthread_condattr_destroy): Ditto.
-	(__pthread_condattr_getpshared): Ditto.
-	(__pthread_condattr_setpshared): Ditto.
-	(__pthread_rwlock_destroy): Ditto.
-	(__pthread_rwlock_rdlock): Ditto.
-	(__pthread_rwlock_tryrdlock): Ditto.
-	(__pthread_rwlock_wrlock): Ditto.
-	(__pthread_rwlock_trywrlock): Ditto.
-	(__pthread_rwlock_unlock): Ditto.
-	(__pthread_rwlockattr_init): Ditto.
-	(__pthread_rwlockattr_getpshared): Ditto.
-	(__pthread_rwlockattr_setpshared): Ditto.
-	(__pthread_rwlockattr_destroy): Ditto.
-	(__pthread_getconcurrency): Ditto.
-	(__pthread_setconcurrency): Ditto.
-	(__pthread_getschedparam): Ditto.
-	(__pthread_setschedparam): Ditto.
-
-	* thread.cc: Rename __pthread_equal to pthread_equal throughout.
-	Change pthread_self parameter appropriate.
-	(__pthread_attr_init): Remove __ prefix. Change to extern "C".
-	(__pthread_attr_destroy): Ditto.
-	(__pthread_attr_setdetachstate): Ditto.
-	(__pthread_attr_getdetachstate): Ditto.
-	(__pthread_attr_setstacksize): Ditto.
-	(__pthread_attr_getstacksize): Ditto.
-	(__pthread_attr_setinheritsched): Ditto.
-	(__pthread_attr_getinheritsched): Ditto.
-	(__pthread_attr_setschedparam): Ditto.
-	(__pthread_attr_getschedparam): Ditto.
-	(__pthread_attr_setschedpolicy): Ditto.
-	(__pthread_attr_getschedpolicy): Ditto.
-	(__pthread_attr_setscope): Ditto.
-	(__pthread_attr_getscope): Ditto.
-	(__pthread_attr_setstackaddr): Ditto.
-	(__pthread_attr_getstackaddr): Ditto.
-	(__pthread_key_create): Ditto.
-	(__pthread_key_delete): Ditto.
-	(__pthread_setspecific): Ditto.
-	(__pthread_getspecific): Ditto.
-	(__pthread_kill): Ditto.
-	(__pthread_sigmask): Ditto.
-	(__pthread_equal): Ditto.
-	(__pthread_mutex_lock): Ditto.
-	(__pthread_mutex_trylock): Ditto.
-	(__pthread_mutex_unlock): Ditto.
-	(__pthread_mutex_destroy): Ditto.
-	(__pthread_mutex_setprioceiling): Ditto.
-	(__pthread_mutex_getprioceiling): Ditto.
-	(__pthread_mutexattr_destroy): Ditto.
-	(__pthread_mutexattr_getprioceiling): Ditto.
-	(__pthread_mutexattr_getprotocol): Ditto.
-	(__pthread_mutexattr_getpshared): Ditto.
-	(__pthread_mutexattr_gettype): Ditto.
-	(__pthread_mutexattr_init): Ditto.
-	(__pthread_mutexattr_setprioceiling): Ditto.
-	(__pthread_mutexattr_setprotocol): Ditto.
-	(__pthread_mutexattr_setpshared): Ditto.
-	(__pthread_mutexattr_settype): Ditto.
-	(__pthread_cond_destroy): Ditto.
-	(__pthread_cond_signal): Ditto.
-	(__pthread_cond_broadcast): Ditto.
-	(__pthread_condattr_init): Ditto.
-	(__pthread_condattr_destroy): Ditto.
-	(__pthread_condattr_getpshared): Ditto.
-	(__pthread_condattr_setpshared): Ditto.
-	(__pthread_rwlock_destroy): Ditto.
-	(__pthread_rwlock_rdlock): Ditto.
-	(__pthread_rwlock_tryrdlock): Ditto.
-	(__pthread_rwlock_wrlock): Ditto.
-	(__pthread_rwlock_trywrlock): Ditto.
-	(__pthread_rwlock_unlock): Ditto.
-	(__pthread_rwlockattr_init): Ditto.
-	(__pthread_rwlockattr_getpshared): Ditto.
-	(__pthread_rwlockattr_setpshared): Ditto.
-	(__pthread_rwlockattr_destroy): Ditto.
-	(__pthread_getconcurrency): Ditto.
-	(__pthread_setconcurrency): Ditto.
-	(__pthread_getschedparam): Ditto.
-	(__pthread_setschedparam): Ditto.
-
-2003-03-18  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* cygwin.din: Add pthread_rwlock_destroy, pthread_rwlock_init,
-	pthread_rwlock_rdlock, pthread_rwlock_tryrdlock,
-	pthread_rwlock_wrlock, pthread_rwlock_trywrlock,
-	pthread_rwlock_unlock, pthread_rwlockattr_init,
-	pthread_rwlockattr_getpshared, pthread_rwlockattr_setpshared,
-	and pthread_rwlockattr_destroy.
-	* include/cygwin/version.h: Bump API minor number.
-	* include/pthread.h (PTHREAD_RWLOCK_INITIALIZER): Define a
-	reasonable value.
-	Add prototypes for pthread_rwlock_destroy, pthread_rwlock_init,
-	pthread_rwlock_rdlock, pthread_rwlock_tryrdlock,
-	pthread_rwlock_wrlock, pthread_rwlock_trywrlock,
-	pthread_rwlock_unlock, pthread_rwlockattr_init,
-	pthread_rwlockattr_getpshared, pthread_rwlockattr_setpshared,
-	and pthread_rwlockattr_destroy.
-	* thread.h (PTHREAD_ONCE_MAGIC): Remove superflous semicolon.
-	(PTHREAD_RWLOCK_MAGIC): New define.
-	(PTHREAD_RWLOCKATTR_MAGIC): Ditto.
-	(pthread_rwlockattr): New class.
-	(pthread_rwlock): Ditto.
-	(MTinterface::rwlocks): New member.
-	(MTinterface::MTinterface): Initialize rwlocks.
-	Add prototypes for __pthread_rwlock_destroy,
-	__pthread_rwlock_wrlock, __pthread_rwlock_trywrlock,
-	__pthread_rwlock_unlock, __pthread_rwlockattr_init,
-	__pthread_rwlockattr_getpshared, __pthread_rwlockattr_setpshared,
-	and __pthread_rwlockattr_destroy.
-	* thread.cc (MTinterface::Init): Initialize rwlock internal mutex.
-	(MTinterface::fixup_after_fork): Fixup rwlocks after fork.
-	(pthread_rwlockattr::isGoodObject): Implement.
-	(pthread_rwlockattr::pthread_rwlockattr): Ditto.
-	(pthread_rwlockattr::~pthread_rwlockattr): Ditto.
-	(pthread_rwlock::initMutex): Ditto.
-	(pthread_rwlock::pthread_rwlock): Ditto.
-	(pthread_rwlock::~pthread_rwlock): Ditto.
-	(pthread_rwlock::RdLock): Ditto.
-	(pthread_rwlock::TryRdLock): Ditto.
-	(pthread_rwlock::WrLock): Ditto.
-	(pthread_rwlock::TryWrLock): Ditto.
-	(pthread_rwlock::UnLock): Ditto.
-	(pthread_rwlock::addReader): Ditto.
-	(pthread_rwlock::removeReader): Ditto.
-	(pthread_rwlock::lookupReader): Ditto.
-	(pthread_rwlock::RdLockCleanup): Ditto.
-	(pthread_rwlock::WrLockCleanup): Ditto.
-	(pthread_rwlock::fixup_after_fork): Ditto.
-	(pthread_rwlock::isGoodObject): Ditto.
-	(pthread_rwlock::isGoodInitializer): Ditto.
-	(pthread_rwlock::isGoodInitializerOrObject): Ditto.
-	(pthread_rwlock::isGoodInitializerOrBadObject): Ditto.
-	(__pthread_rwlock_destroy): Ditto.
-	(pthread_rwlock::init): Ditto.
-	(__pthread_rwlock_rdlock): Ditto.
-	(__pthread_rwlock_tryrdlock): Ditto.
-	(__pthread_rwlock_wrlock): Ditto.
-	(__pthread_rwlock_trywrlock): Ditto.
-
-2003-03-18  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.h (pthread_cond::ExitingWait): Remove.
-	(pthread_cond::mutex): Ditto.
-	(pthread_cond::cond_access): Ditto.
-	(pthread_cond::win32_obj_id): Ditto.
-	(pthread_cond::TimedWait): Ditto.
-	(pthread_cond::BroadCast): Ditto.
-	(pthread_cond::Signal): Ditto.
-	(pthread_cond::waiting): Change type to unsigned long.
-	(pthread_cond::pending): New member.
-	(pthread_cond::semWait): Ditto.
-	(pthread_cond::mtxIn): Ditto.
-	(pthread_cond::mtxOut): Ditto.
-	(pthread_cond::mtxCond): Ditto.
-	(pthread_cond::UnBlock): New method.
-	(pthread_cond::Wait): Ditto.
-	* thread.cc: Update list of cancellation points.
-	(pthread_cond::pthread_cond): Rewrite.
-	(pthread_cond::~pthread_cond): Ditto.
-	(pthread_cond::TimedWait): Remove.
-	(pthread_cond::BroadCast): Ditto.
-	(pthread_cond::Signal): Ditto.
-	(pthread_cond::UnBlock): Implement.
-	(pthread_cond::Wait): Ditto.
-	(pthread_cond::fixup_after_fork): Rewrite.
-	(pthread_mutex::fixup_after_fork): Remove DETECT_BAD_APP
-	conditional.
-	(__pthread_cond_broadcast): Just return 0 if the condition is
-	not initialized. Call pthread_cond::UnBlock to release blocked
-	threads.
-	(__pthread_cond_signal): Ditto.
-	(__pthread_cond__dowait): Rewrite.
-	(pthread_cond_timedwait): Add pthread_testcancel call. Fix
-	waitlength calculation.
-	(pthread_cond_wait): Add pthread_testcancel call.
-
-2003-03-18  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* include/pthread.h (PTHREAD_MUTEX_NORMAL): New define.
-	* thread.cc: Remove errno.h include.
-	(pthread::precreate): Change internal mutex type to normal.
-	(pthread_mutex::canBeUnlocked): Implement.
-	(pthread_mutex::pthread_mutex): Initialize lock_counter with 0.
-	(pthread_mutex::Lock): Rename to _Lock. Add self parameter.
-	Change lock_counter logic. Update SetOwner call.
-	(pthread_mutex::TryLock): Rename to _TryLock. Add self parameter.
-	Change lock_counter logic. Update SetOwner call.
-	(pthread_mutex::UnLock): Rename to _UnLock. Add self parameter.
-	Change lock_counter logic.
-	(pthread_mutex::Destroy): Rename to _Destroy. Update TryLock call.
-	(pthread_mutex::SetOwner): Move to thread.h as inline.
-	(pthread_mutex::LockRecursive): Ditto.
-	(pthread_mutex::fixup_after_fork): Change lock_counter logic.
-	(__pthread_mutexattr_settype): Add PTHREAD_MUTEX_NORMAL to valid
-	types check.
-	* thread.h: Include errno.h and limits.h.
-	(MUTEX_LOCK_COUNTER_INITIAL): Remove.
-	(MUTEX_OWNER_ANONYMOUS): New define.
-	(pthread_mutex::canBeUnlocked): New static method.
-	(pthread_mutex::lock_counter): Change type to unsigned long.
-	(pthread_mutex::GetPthreadSelf): New method.
-	(pthread_mutex::Lock): Call _Lock with pthread_self pointer.
-	(pthread_mutex::TryLock): Call _TryLock with pthread_self pointer.
-	(pthread_mutex::UnLock): Call _UnLock with pthread_self pointer.
-	(pthread_mutex::Destroy): Call _Destroy with pthread_self pointer.
-	(pthread_mutex::SetOwner): Moved from thread.cc as inline.
-	(pthread_mutex::LockRecursive): Ditto.
-	(pthread_mutex::_Lock): New method.
-	(pthread_mutex::_TryLock): New method.
-	(pthread_mutex::_UnLock): New method.
-	(pthread_mutex::_Destroy): New method.
-
-2003-03-18  Christopher January  <chris@atomice.net>
-
-	* fhandler_proc.cc (format_proc_cpuinfo): Use IsProcessorFeaturePresent
-	only on Windows NT. Read CPU Mhz value only on NT. Revert previous
-	change so cpuid instruction is called even on non-NT systems.
-
-2003-03-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* glob.c (g_lstat): Change API minor test to match API minor number
-	change in previous patch.
-	(g_stat): Ditto.
-
-2003-03-17  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Reorganize last two api versions so that
-	btowc and trunc exports show up before previous bump since there has
-	been no exported version of the DLL with the 64 bit changes yet but
-	1.3.22 will have the btowc and trunc.
-
-2003-03-17  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din: Export btowc, trunc.
-	* include/cygwin/version.h: Reflect new exports.
-	* syscalls.cc (_stat): Rename to stat to avoid newlib wrapper.
-	* syscalls.cc (_fstat): Ditto.
-
-2003-03-16  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (fhandler_console::close): Correct check for
-	current tty.  Add debugging output when console is freed.
-	(set_console_state_for_spawn): Add debugging output.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Don't decrement console
-	open flag when vforking.
-	* sigproc.cc (sigproc_terminate): Fix debugging output.
-	* spawn.cc (handle): Eliminate second argument.
-	(spawn_guts): Reflect elimination of argument change to handle.
-	* syscalls.cc (setsid): Add debugging output when console is freed.
-
-2003-03-14  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (rename): Revert assumption that DELETE_ON_CLOSE works on
-	Win9x.
-
-2003-03-13  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number to 23.
-
-2003-03-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* autoload.cc (IsProcessorFeaturePresent): Add.
-	* fhandler_proc.cc (format_proc_cpuinfo): Add case for 9x systems.
-
-2003-03-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_proc.cc (format_proc_cpuinfo): Fix vendor id in cpuid case.
-
-2003-03-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (cygwin_rcmd): Use correct file descriptor in call to fdsock.
-	(cygwin_rexec): Ditto.
-
-2003-03-13  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::close): Fix typo in debug
-	output.
-
-	* syscalls.cc (rename): Assume that DELETE_ON_CLOSE works on Win9x.
-
-2003-03-11  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::dup): Don't call
-	fhandler_base::dup() but call DuplicateHandle directly instead to have
-	control over socket inheritence.
-
-2003-03-11  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::dup): On NT systems avoid
-	using WinSock2 socket duplication methods.  Add comment.
-
-2003-03-11  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* fhandler_socket.cc (fhandler_socket::fixup_after_fork):
-	Set io_handle to INVALID_SOCKET in case of failure.
-	(fhandler_socket::dup): Return 0 if the io_handle is valid.
-
-2003-03-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* sec_acl.cc (setacl): Don't handle DELETE flag specially.
-	* security.cc (alloc_sd): Ditto.
-
-2003-03-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winver.rc: Change Copyright hint to include 2003.
-
-2003-03-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	Switch to 32/64 datatypes:
-	* Makefile.in (OBSOLETE_FUNCTIONS): Add open acl aclcheck aclfrommode
-	aclfrompbits aclfromtext aclsort acltomode acltopbits acltotext chown
-	facl fchown fgetpos fopen freopen fseeko fsetpos fstat ftello
-	ftruncate getegid geteuid getgid getgrent getgrgid getgrnam getgroups
-	getpwuid getpwuid_r getuid initgroups lchown lseek lstat mknod mmap
-	seekdir setegid seteuid setgid setgroups setregid setreuid setuid stat
-	telldir truncate.
-	(NEW_FUNCTIONS): Add _open64 acl32 aclcheck32 aclfrommode32
-	aclfrompbits32 aclfromtext32 aclsort32 acltomode32 acltopbits32
-	acltotext32 chown32 facl32 fchown32 fgetpos64 fopen64 freopen64
-	fseeko64 fsetpos64 fstat64 ftello64 ftruncate64 getegid32 geteuid32
-	getgid32 getgrent32 getgrgid32 getgrnam32 getgroups32 getpwuid32
-	getpwuid_r32 getuid32 initgroups32 lchown32 lseek64 lstat64 mknod32
-	mmap64 seekdir64 setegid32 seteuid32 setgid32 setgroups32 setregid32
-	setreuid32 setuid32 stat64 telldir64 truncate64 to substitute the
-	above.
-	* cygserver_shm.h (class client_request_shm): Change uid_t and gid_t
-	members to __uid32_t and __gid32_t.
-	* cygwin.din: Add symbols acl32 aclcheck32 aclfrommode32
-	aclfrompbits32 aclfromtext32 aclsort32 acltomode32 acltopbits32
-	acltotext32 facl32 fgetpos64 fopen64 freopen64 fseeko64 fsetpos64
-	_fstat64 ftello64 _lseek64 mknod32 _open64.
-	* glob.c: Include perprocess.h.
-	(globtilde): Call getpwuid32 and getuid32 instead of getpwuid and
-	getuid.
-	(g_lstat): Check for applications API version to call the appropriate
-	typed gl_lstat function.
-	(g_stat): Ditto for gl_stat.
-	* shm.cc (client_request_shm::client_request_shm): Call geteuid32
-	and getegid32 instead of geteuid and getegid throughout.
-	* syscalls.cc (_open64): New alias for open.
-	(_lseek64): New alias for lseek64.
-	(_fstat64): New alias for fseek64.
-	(mknod32): New function.
-	(mknod): Calls mknod32 now.
-	* winsup.h: Make function declarations for getuid32, geteuid32,
-	and getpwuid32 accessible for plain C sources.  Add declarations
-	for getegid32 and getpwnam.
-	* include/cygwin/version.h: Bum API minor number to 78.
-	* include/sys/cygwin.h: Guard C++ specific members of struct
-	per_process against inclusion in plain C sources.
-	* include/sys/mman.h (mman): Add guard to avoid type clash when
-	compiling Cygwin.
-
-2003-03-09  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number to 22.
-
-2003-03-09  Christopher Faylor  <cgf@redhat.com>
-
-	Do some minor reformatting of 'extern "C"' use throughout.
-
-2003-03-06  Christopher January  <chris@atomice.net>
-
-	* autoload.cc (GetSystemTimes): Define new autoload function.
-	* fhandler_proc.cc (proc_listing): Add cpuinfo and partitions entries.
-	(fhandler_proc::fill_filebuf): Add PROC_CPUINFO and PROC_PARTITIONS
-	cases.
-	(format_proc_uptime): Use GetSystemTimes if available.
-	(read_value): New macro.
-	(print): New macro.
-	(cpuid): New function.
-	(can_set_flag): New function.
-	(format_proc_cpuinfo): New function.
-	(format_proc_partitions): New function.
-
-2003-03-09  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (unlink): Attempt to be more clever about setting
-	attributes of file.  Only open file in query mode to avoid having to
-	mess with security stuff for reading.
-
-2003-03-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* rmsym: Fix regular expression.
-
-2003-03-09  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Change from using new-* to cygwin0 for temporary
-	targets.
-
-2003-03-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/socket.h: Set SOMAXCONN to Winsock2 value.
-
-2003-03-08  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (unlink): Always attempt to use FILE_FLAG_CLOSE_ON_DELETE
-	to delete files since this allows us to preserve the protection of hard
-	linked files.
-	(link): Generate full path for potentially recalculated .lnk target.
-
-2003-03-08  Christopher Faylor  <cgf@redhat.com>
-
-	Revert below changes regarding _pinfo::cmdline.
-
-2003-03-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* external.cc (cygwin_internal): Change n to __off64_t to match change
-	of _pinfo::cmdline.
-	* fhandler.h (class fhandler_virtual): Change filesize member to
-	__off64_t.
-	* fhandler_proc.cc (format_proc_meminfo): Change to return __off64_t.
-	(format_proc_stat): Ditto.
-	(format_proc_uptime): Ditto.
-	* fhandler_process.cc (format_process_stat): Ditto.
-	(format_process_status): Ditto.
-	(format_process_statm): Ditto.
-	* pinfo.cc (_pinfo::cmdline): Expect __off64_t parameter.
-	* pinfo.h (class _pinfo): Change declaration of cmdline accordingly.
-
-2003-03-07  Christopher Faylor  <cgf@redhat.com>
-
-	* path.h (PATH_LNK): New enum val.
-	(path_conv::is_lnk_symlink): New function.  True if path represents
-	.lnk style symlink.
-	* path.cc (check_shortcut): Set PATH_LNK in pflags when appropriate.
-	(symlink_info::check): Ditto.  Remove PATH_LNK from pflags initially.
-	* syscalls.cc (unlink): Always remove readonly attribute from a symlink
-	regardless of type.
-	(link): (from Corinna Vinschen) Allow links to symlinks.  Reset
-	attributes on a symlink after successful link creation.
-	(chmod): Use is_lnk_symlink where appropriate.
-	(rename): Ditto.
-
-2003-03-07  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* tty.cc (create_tty_master): Call GetComputerName instead of
-	cygwin_gethostname.  Set ut_id.
-	* syscalls.cc (login): Call endutent.
-	(setutent): Do not seek after a fresh open.
-
-2003-03-07  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (seteuid32): Fix formatting.
-
-2003-03-04  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (MTinterface::fixup_after_fork): Initialize mainthread
-	prior to pthread objects.
-
-2003-03-04  Jason Tishler <jason@tishler.net>
-
-	* fhandler_socket.cc (fhandler_socket::dup): Initialize type.
-
-2003-03-03  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_tty_slave::close): Declare new function.
-	(fhandler_tty_slave::dup): Declare new function.
-	(fhandler_tty_slave::fixup_after_function): Declare new function.
-	* fhandler_tty.cc (fhandler_tty_slave_open): Only increment
-	fhandler_console::open_fhs when associated with a pty.
-	(fhandler_tty_slave::close): Define new function.  Decrement
-	fhandler_console::open_fhs when associated with a pty.
-	(fhandler_tty_slave::dup): Define new function.  Increment
-	fhandler_console::open_fhs when associated with a pty.
-	(fhandler_tty_slave::fixup_after_fork): Define new function.  Increment
-	fhandler_console::open_fhs when associated with a pty.
-
-2003-03-03  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_pty_slave::open): Grudgingly increment
-	fhandler_console::open_fhs here.
-	(fhandler_pty_slave::close): Ditto for close.
-
-2003-03-02  Christopher Faylor  <cgf@redhat.com>
-
-	* lib/getopt.c: Refresh from NetBSD sources.
-
-2003-03-02  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (fhandler_console::close): Don't decrement
-	in use counter if in vfork fixup stage.
-
-2003-03-02  Christopher Faylor  <cgf@redhat.com>
-
-	* lib/getopt.c: Nuke use of unneeded BSDisms.
-
-2003-03-02  Christopher Faylor  <cgf@redhat.com>
-
-	* dll_init.cc (dll_list::load_after_fork): Don't revert to LoadLibrary
-	if LoadLibraryEx fails.
-	* dtable.cc (dtable::dec_console_fds): Eliminate.
-	(dtable::release): Don't treat console specially.
-	(dtable::build_fhandler): Ditto.
-	* dtable.h (console_fds): Eliminate.
-	(dtable::dec_console_fds): Eliminate.
-	(dtable::inc_console_fds): Eliminate.
-	* fhandler.h (fhandler_console::open_fhs): New static element.
-	* fhandler_console.cc (fhandler_console::open): Increment open_fs.
-	(fhandler_console::close): Call FreeConsole if no more open consoles
-	and ctty is not associated with the console.
-	* syscalls.cc (setsid): Simplify check for when to call FreeConsole.
-	(check_pty_fds): Eliminate definition.
-	* winsup.h (check_pty_fds): Eliminate declaration.
-
-2003-03-02  Christopher Faylor  <cgf@redhat.com>
-
-	* dll_init.cc (dll_list::load_after_fork): Fix typo where result of
-	LoadLibrary was ignored.
-
-2003-03-01  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::bind): Open and write socket
-	file using Win32 calls.
-
-2003-03-01  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_socket.cc (get_inet_addr): Open and read socket file using
-	Win32 calls.
-
-2003-02-28  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din: Wrap atexit and exit with cygwin, thread-safe functions.
-	* dcrt0.cc (cygwin_atexit): New function.
-	(cygwin_exit): Ditto.
-
-2003-02-28  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* syscalls.cc (fstat64): Pass get_name () to pc.
-	(access): Pass fn to stat_worker.
-
-2003-03-27  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_socket.cc (class sock_event): New class managing Winsock
-	events for interruptible socket calls.
-	(fhandler_socket::connect): Move support for interruptible call to
-	class sock_event.  Use class object instead.
-	(fhandler_socket::accept): Ditto.  Remove useless casts.
-
-2003-03-27  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* fhandler_socket.cc (fhandler_socket::connect): Add support for
-	an interruptable connect.
-
-2003-02-27  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* uinfo.cc (internal_getlogin): Only update user.groups.pgsid
-	if the call to set the primary group succeeds.
-
-2003-02-27  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread::detach: Improve error message.
-
-2003-02-26  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* sec_helper.cc (get_sids_info): debug_print owner_sid and group_sid.
-
-2003-02-25  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (mmap64): Fix returned address by taking the granularity
-	into account.
-
-2003-02-23  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* syslog.cc (syslog): Do not unlock the file before closing it
-	and remove debug_printf about stream errors.
-
-2003-02-22  Christopher Faylor  <cgf@redhat.com>
-
-	* cygmalloc.h: Remove MORECORE_CANNOT_TRIM.  It's not true.
-	# cygwin.din: Export mallinfo.
-	# malloc_wrapper.cc (mallinfo): New function.
-
-2003-02-22  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* syslog.cc (syslog): Do not print the Windows pid.  Print the Cygwin
-	pid as an unsigned decimal.  On Win95 print a timestamp and attempt to
-	lock the file up to four times in 3 ms.
-
-2003-02-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::fhandler_socket): Fix compiler
-	warning.
-	(fhandler_socket::fstat): Simplify.  Set st_uid/st_gid to effective
-	uid/gid of current process in case of open sockets.
-
-2003-02-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dtable.cc (dtable::build_fhandler_from_name): Set some fhandler
-	data on sockets to evaluate AF_LOCAL sockets correctly.
-	(dtable::build_fhandler): Set unit number on sockets.
-	* fhandler.h (fhandler_socket): Add unit number.
-	(fhandler_socket::get_unit): New method.
-	* fhandler_socket.cc (fhandler_socket::fhandler_socket): Set unit
-	number.
-	(fhandler_socket::fstat): Reorganize to return more Linux-like
-	values.
-	* net.cc: include ctype.h.
-	(fdsock): Set unit number when building fhandler.
-	* path.cc (path_conv::check): Set device type to FH_SOCKET if file
-	is a AF_UNIX socket.
-	(get_devn): Evaluate unit for virtual socket devices.
-	(win32_device_name): Set windows path for sockets to unix_path with
-	just backslashes to keep the different names.
-	* syscalls.cc (fstat64): Don't override st_ino, st_dev and st_rdev
-	for sockets.
-	(stat_worker): Ditto.
-
-2003-02-21  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* autoload.cc (AccessCheck): Add.
-	(DuplicateToken): Add.
-	* security.h (check_file_access): Declare.
-	* syscalls.cc (access): Convert path to Windows, check existence
-	and readonly attribute. Call check_file_access instead of acl_access.
-	* security.cc (check_file_access): Create.
-	* sec_acl (acl_access): Delete.
-
-2003-02-19  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::open): Move some filesystem specific
-	stuff.
-	(fhandler_disk_file::open): Accept some filesystem specific stuff.
-	* sigproc.cc (wait_for_sigthread): Become slightly more thread safe.
-	(sig_send): Don't assume that signal thread is ready.
-
-2003-02-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* wincap.h (wincap): Remove unnecessary definition of
-	supports_sparse_files.
-	* wincap.cc: Ditto.
-
-2003-02-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::opendir): Check descriptor
-	created by cygheap_fdnew constructor.
-	* fhandler_virtual.cc (fhandler_virtual::opendir): Ditto.
-	* fhandler_socket.cc (fhandler_socket::accept): Ditto and move
-	creation of file descriptor behind blocking OS call.
-	* net.cc (cygwin_socket): Ditto.
-	(cygwin_rcmd): Ditto.
-	(cygwin_rresvport): Ditto.
-	(cygwin_rexec): Ditto.
-	(socketpair): Ditto.
-
-2003-02-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* autoload.cc (GetCompressedFileSize): Add.
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Compute
-	st_blocks value from GetCompressedFileSize() if available.
-
-2003-02-18  Vaclav Haisman  <V.Haisman@sh.cvut.cz>
-
-	* wincap.h (wincaps::supports_sparse_files): New flag.
-	(wincapc::supports_sparse_files): New method.
-	* wincap.cc (wincap_unknown): Define value for the new flag.
-	(wincap_95): Ditto.
-	(wincap_95osr2): Ditto.
-	(wincap_98): Ditto.
-	(wincap_98se): Ditto.
-	(wincap_me): Ditto.
-	(wincap_nt3): Ditto.
-	(wincap_nt4): Ditto.
-	(wincap_nt4sp4): Ditto.
-	(wincap_2000): Ditto.
-	(wincap_xp): Ditto.
-	* path.h (path_conv::fs_flags): New method.
-	* fhandler_disk_file.cc: Include winioctl.h for DeviceIoControl.
-	(fhandler_disk_file::open): Set newly created and truncated files as
-	sparse on platforms that support it.
-
-2003-02-17  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* grp.cc (internal_getgroups): Handle properly tokens with
-	no groups. Fix bug introduced on 2003-02-04.
-
-2003-02-16  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din: Export all appropriate newlib libm functions.  Sort.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-02-15  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din: Export all appropriate newlib libc functions.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-02-14  Jason Tishler  <jason@tishler.net>
-
-	* mmap.cc (mprotect): Add missing break.
-
-2003-02-13  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (try_to_debug): Don't reset priority when returning
-	from non-waitloop call.
-
-2003-02-13  Vaclav Haisman  <V.Haisman@sh.cvut.cz>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (fhandler_console::write_normal): Use MessageBeep
-	for bell sound.
-	* autoload.cc (MessageBeep): Add.
-
-2003-02-13  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/types.h: Use correct ifdef guard for u_ definitions.
-
-2003-02-13  Christopher Faylor  <cgf@redhat.com>
-
-	* environ.cc (environ_init): Use strechr.
-
-2003-02-13  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/in.h (sockaddr_in): Fix typo.
-
-2003-02-12  Christopher Faylor  <cgf@redhat.com>
-
-	* path.h (path_conv): Reorganize slightly.
-
-2003-02-12  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (process_input): Add sanity check to ensure that
-	console typeahead is cleared on signal.
-
-2003-02-12  Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (linebuf::~linebuf): Resurrect commented out (for
-	debugging?) code.
-
-2003-02-10  Ralf Habacker <ralf.habacker@freenet.de>
-
-	* include/cygwin/in.h (in_attr_t): Define new type.
-	* include/arpa/inet.h (inet_addr): Change return type to in_addr_t.
-	(inet_lnaof): Ditto.
-	(inet_netof): Ditto.
-	(inet_network): Ditto.
-
-2003-02-10  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/types.h: Move many *_t typedefs here.  Protect them
-	with ifdefs.
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat): Change ntsec_atts to mode_t.
-	* security.cc (get_attribute_from_acl): Accept mode_t attribute.
-	(get_nt_attribute): Ditto.
-	(get_file_attribute): Ditto.
-	(get_nt_object_attribute): Ditto.
-	(get_object_attribute): Ditto.
-	* security.h: Reflect above changes.
-	* syscalls.cc (chown_worker): Change attrib to mode_t.
-
-2003-02-08  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number to 21.
-
-2003-02-07  Christopher Faylor  <cgf@redhat.com>
-
-	* malloc.cc (DEFAULT_MMAP_THRESHOLD): Bump down to 16MB thanks to below
-	changes.
-
-2003-02-07  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (mmap_record::alloc_map): De-inline.  Add offset and length
-	parameter.  Only protect pages actually unused currently.  Do job
-	of map_map() when initializing a map.
-	(mmap_record::map_map): Reduce functionality for the reuse case
-	of private anonymous mapping.
-	(mmap_record::fixup_map): Format change.
-	(list::add_record): Add offset and length parameter to call
-	mmap_record::alloc_map() correctly.
-	(mmap64): Rename `l' variable to `map_list'.  Accommodate above changes.
-	(munmap): Rename `l' variable to `map_list'.
-	(msync): Ditto.
-	(fhandler_disk_file::mmap): Streamline code.
-	(mprotect): Ditto.
-	(fixup_mmaps_after_fork): Rename `l' variable to `map_list'.
-
-2003-02-07  Vaclav Haisman  <V.Haisman@sh.cvut.cz>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (try_to_debug): Set priority of current thread rather
-	than the main thread.  Make busy waiting loop less busy.  Restore
-	priority when function returns.
-
-2003-02-07  Christopher Faylor  <cgf@redhat.com>
-
-	* malloc.cc (DEFAULT_MMAP_THRESHOLD): Set high to avoid mmaps.
-
-2003-02-07  Christopher Faylor  <cgf@redhat.com>
-
-	* pipe.cc (fhandler_pipe::close): Avoid extraneous this->.
-
-2003-02-06  Christopher Faylor  <cgf@redhat.com>
-
-	* heap.cc (heap_init): Remove debugging code.
-
-2003-02-06  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* security.h: Introduce names UNKNOWN_UID and UNKNOWN_GID and delete
-	declaration of is_grp_member.
-	* uinfo.cc (internal_getlogin): Use UNKNOWN_GID.
-	* passwd.cc (pwdgrp::read_passwd): Use UNKNOWN_UID.
-	* grp.cc (pwdgrp::read_group): Change group name to provide better
-	feedback.
-	(getgrgid): Use gid16togid32.
-	* sec_helper.cc (is_grp_member): Delete.
-
-2003-02-05  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc: Change 'to_posix_p' to 'to_posix' throughout.
-	(conv_path_list_buf_size): Accommodate relative paths.
-
-2003-02-05  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (etc::dir_changed): Fix debug printf.
-
-2003-02-05  Corinna Vinschen  <corinna@vinschen.de>
-
-	* sec_acl.cc (setacl): Move all permission settings to beginning of
-	loop.  Set default rights to same values as in alloc_sd().  Set DELETE
-	for owner and default owner only if S_IWOTH is given.
-
-2003-02-05  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* sec_acl.cc: Change all  __aclent16_t to  __aclent32_t except in
-	wrapper function definitions. Replace call to the aclXYZ functions by
-	calls aclXYZ32.
-	(searchace): Change type of third argument to __uid32_t and use
-	ILLEGAL_UID instead of -1;
-	(setacl): Remove some initializations. Only give STANDARD_RIGHTS_WRITE
-	for S_IWOTH. Replace -1 by ILLEGAL_UID.
-	(getacl): Change type of owner_sid, group_sid and ace_sid to cygpsid.
-	In last else clause, suppress second call to ace_sid.get_id and use
-	TRUE in first call. Replace EqualSid by ==.
-	(acl_access): Call internal_getgroups in USER and GROUP cases.
-	(acecmp: Define static.
-	(acl32): Create from 16 bit type.
-	(facl32): Ditto.
-	(lacl32): Ditto.
-	(aclcheck32): Ditto.
-	(aclsort32): Ditto.
-	(acltomode32): Ditto.
-	(aclfrommode32): Ditto.
-	(acltopbits32): Ditto.
-	(aclfrompbits32): Ditto.
-	(acltotext32): Ditto.
-	(aclfromtext32): Ditto, and use strechr.
-	(acl16to32): Create.
-	(acl): Make it a wrapper function.
-	(facl): Ditto.
-	(lacl): Ditto.
-	(aclcheck): Ditto.
-	(aclsort): Ditto.
-	(acltomode): Ditto.
-	(aclfrommode): Ditto.
-	(acltopbits): Ditto.
-	(aclfrompbits): Ditto.
-	(acltotext): Ditto.
-	(aclfromtext): Ditto.
-	* security.cc (write_sd): Call set_process_privilege and check
-	ownership.
-	(alloc_sd): Remove call to set_process_privilege and the owner check.
-
-2003-02-05  Christopher Faylor  <cgf@redhat.com>
-
-	* include/sys/cygwin.h: Use C-style comments.
-
-2003-02-05  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* sec_helper.cc (get_sids_info): New function.
-	* security.cc (extract_nt_dom_user): Simplify with strechr.
-	(get_user_groups): Initialize glen to MAX_SID_LEN.
-	(get_user_local_groups): Ditto.
-	(get_attribute_from_acl): Define ace_sid as cygpsid.
-	(get_nt_attribute): Define owner_sid and group_sid as cygpsid.
-	Call get_sids_info instead of cygsid.get_{u,g}id and is_grp_member.
-	(get_nt_object_attribute): Ditto.
-	(alloc_sd): Define ace_sid as cygpsid.
-
-2003-02-04  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* syscalls.cc (struct system_cleanup_args): New struct.
-	(system_cleanup): New function.
-	(system): Use pthread_cleanup_push and _pop to save and restore
-	signal handlers and sigprocmask.
-
-2003-02-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* path.cc (symlink): Create security attributes so that only the
-	user can modify the symlink.
-	* security.cc (set_security_attribute): Remove symlink special
-	handling.
-
-2003-02-04  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* grp.cc (internal_getgroups): Do not return without closing
-	the process handle.
-
-2003-02-04  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* security.h (class cygpsid): New class.
-	(class cygsid): Use cygpsid as base. Remove members psid, get_id,
-	get_uid, get_gid, string, debug_printf and the == and != operators.
-	(cygsidlist::clear_supp): Only do work if setgroups has been called.
-	* sec_helper.cc: Define sid_auth NO_COPY.
-	(cygpsid::operator==): New operator.
-	(cygpsid::get_id): New function.
-	(cygpsid::string): New function.
-	(cygsid::string): Delete.
-	(cygsid::get_id): Delete.
-	* pwdgrp.h: Change arguments of internal_getpwsid,
-	internal_getgrsid and internal_getgroups to cygpsid.
-	* passwd.cc (internal_getpwsid): Change argument from cygsid to cygpsid.
-	* grp.cc (internal_getgrsid): Ditto.
-	(internal_getgroups): Ditto.
-
-2003-02-03  Christopher Faylor  <cgf@redhat.com>
-
-	Eliminate most unneeded this-> pointers throughout.
-
-2003-02-03  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* security.h: Add third argument to set_process_privilege.
-	* autoload.cc: Add OpenThreadToken.
-	* sec_helper.cc (set_process_privilege): Add and use use_thread
-	argument.
-	* security.cc (alloc_sd): Modify call to set_process_privilege.
-	Remember the result in each process. If failed and file owner is not
-	the user, fail.
-
-2003-02-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::recvfrom): Return buffer
-	length and don't set errno in case of WSAEMSGSIZE error.
-	(fhandler_socket::recvmsg): Ditto.
-
-2003-02-01  Christopher Faylor  <cgf@redhat.com>
-
-	* grp.cc (getgrent32): Only refresh group entries when at beginning.
-	(internal_getgrsid): Only refresh if uninitialized.
-	(internal_getgrent): Ditto.
-	* passwd.cc (getpwent): Only refresh passwd entries when at beginning.
-	(pwdgrp::read_passwd): linebuf *cannot* be NO_COPY.
-	(internal_getpwsid): Only refresh if uninitialized.
-	(getpass): No need to refresh passwd data here.
-	* pwdgrp.h (refresh): Eliminate default.
-
-2003-01-31  Christopher Faylor  <cgf@redhat.com>
-
-	* dlfcn.cc (dlerror): Only report load errors once per error.
-
-2003-01-31  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_serial.cc (fhandler_serial::open): Avoid extraneous setting
-	of res.
-
-	* termios.cc (tcsetattr): Correctly record errno after tcsetattr call.
-
-2003-01-31  Troy Curtiss  <troyc@usa.net>
-
-	* fhandler_serial.cc (fhandler_serial::tcsetattr): Add error-checking
-	so that if any Win32 SetComm*() calls fail, errno gets set to EINVAL
-	and tcsetattr() returns -1.  Catch invalid bitrates, mostly.  If baud
-	rate setting is B0, just drop DTR and leave Win32 DCB bitrate as-is
-	since 0 is not a valid Win32 setting.
-	(fhandler_serial::tcgetattr): If DTR is low, populate the bitrate as
-	B0, otherwise get it from the DCB.
-
-2003-01-31  Christopher Faylor  <cgf@redhat.com>
-
-	* passwd.cc (pwdgrp::read_passwd): linebuf *must* be static (from
-	Pierre Humblet).
-	* pwdgrp.h (pwdgrp::refresh): Avoid calling read function if we already
-	have lock since that means we are in the process of reading the file.
-
-2003-01-31  Jason Tishler  <jason@tishler.net>
-
-	* shared.cc (shared_info::heap_chunk_size): Use correct variable when
-	reading HKLM.
-
-2003-01-30  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_registry.cc (fhandler_registry::exists): Fix off-by-one
-	error when inspecting path.
-
-2003-01-29  Christopher Faylor  <cgf@redhat.com>
-
-	* lib/getopt.c: Allow environment variable control of POSIXLY_INCORRECT
-	behavior.
-
-2003-01-28 Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::accept): On successful execution
-	set connection state of returned socket to CONNECTED.
-
-2003-01-27  Christopher Faylor  <cgf@redhat.com>
-
-	* passwd.cc (pwdgrp::parse_passwd): Be more unforgiving about
-	non-numeric fields.
-
-2003-01-26  Christopher Faylor  <cgf@redhat.com>
-
-	* uinfo.cc (pwdgrp::next_num): Remove check for NULL since it is no
-	longer a valid return from next_str.
-	(pwdgrp::add_line): Duh. Revert to use strchr.
-
-2003-01-26  Christopher Faylor  <cgf@redhat.com>
-
-	* string.h (strechr): New function.
-	* uinfo.cc (pwdgrp::next_str): Search only for input char in string.
-	Return EOS on failure.  Don't check for NULL since it shouldn't be
-	possible.
-	(pwdgrp::add_line): Revert to replacing '\n' in input line with '\0'.
-	(pwdgrp::next_num): Pass explicit separator character to next_str.
-	* grp.cc (pwdgrp::parse_group): Ditto.
-	* passwd.cc (pwdgrp::parse_passwd): Ditto.  Revamp test for garbage
-	input.
-	* pwdgrp.h (pwdgrp::next_str): Don't use default parameter.
-
-2003-01-26  Christopher Faylor  <cgf@redhat.com>
-
-	* uinfo.cc (pwdgrp::load): Regularize strace output.  Add warning for
-	CreateFile failure.
-
-2003-01-26  Christopher Faylor  <cgf@redhat.com>
-
-	* passwd.cc (pwdgrp::parse_passwd): Eliminate use of memset.  The
-	structure should always be completely filled out.
-	* grp.cc (pwdgrp::parse_group): Ditto.
-
-2003-01-26  Christopher Faylor  <cgf@redhat.com>
-
-	* grp.cc (pwdgrp::parse_group): Fix off-by-one problem in allocating
-	gr_mem.
-
-2003-01-26  Christopher Faylor  <cgf@redhat.com>
-
-	* include/sys/strace.h (paranoid_printf): Define as not being part of
-	"all" output.
-
-2003-01-25  Christopher Faylor  <cgf@redhat.com>
-
-	* pwdgrp.h (pwdgrp::next_num): Rename from next_int.  Returns
-	true/false if parse operation succeeded.
-	(pwdgrp::reparse): Remove.
-	(pwdgrp::raw_ptr): New function.  Returns pointer in line.
-	(pwdgrp::next_num): New functions for parsing other than unsigned long.
-	* grp.cc (pwdgrp::parse_group): Reinstate previous parsing behavior.
-	Don't fill in fields with NULL and assign empty gr_mem to known pointer
-	rather than doing a pointless calloc.  Streamline gr_mem parsing.
-	Don't increment curr_lines here.
-	* passwd.cc (pwdgrp::parse_passwd): Use new behavior of next_num.
-	Don't increment curr_lines here.
-	* uinfo.cc (pwdgrp::next_str): Keep returning EOL if out of data.
-	(pwdgrp::reparse): Remove.
-	(pwdgrp::next_num): Rename from next_int.  Return bool indicating
-	success of parse, argument returns value parsed.
-	(pwdgrp::add_line): Increment curr_lines here on successful parse.
-	(pwdgrp::load): (from Pierre Humblet) Don't return status.  Just report
-	it here.
-
-2003-01-25  Christopher Faylor  <cgf@redhat.com>
-
-	* pwdgrp.cc (pwdgrp::reparse): Declare.
-	* uinfo.cc (pwdgrp::reparse): Define.
-	* grp.cc (pwdgrp::parse_group): Use reparse.
-
-2003-01-25  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* syscalls.cc (seteuid32): On Win95 get the pw entry. If it exists
-	update the euid and call cygheap->user.set_name. Remove special
-	handling of ILLEGAL_UID.
-	(setgid32): Add a debug_printf. On Win95, always set the egid.
-	Remove special handling of ILLEGAL_GID. Do not compare gid and gr_gid.
-	* child_info.h (class cygheap_exec_info): Remove uid.
-	* spawn.cc (spawn_guts): Do not set ciresrv.moreinfo->uid.
-	* dcrto.cc (dll_crt0_1): Always call uinfo_init.
-	* uinfo.cc (uinfo_init): Reorganize and close handle if needed.
-	(cygheap_user::ontherange): Do not call internal_getpwnam if pw is NULL.
-
-2003-01-24  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (fhandler_console::send_winch_maybe): Reset
-	scroll region if size changes.
-
-2003-01-24  Pierre Humblet <pierre.humblet@ieee.org>
-	    Jason Tishler  <jason@tishler.net>
-
-	* cygwin.din: Export setreuid32, setreuid, setregid32, setregid.
-	* syscalls.cc (setreuid32): New function.
-	(setreuid): Ditto.
-	(setregid32): Ditto.
-	(setregid): Ditto.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	* pwdrp.h (pwdgrp::refresh): Lock entire test prior to reading.
-
-2003-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	* grp.cc (pwdgrp::parse_group): Eliminate arg and use class member
-	instead.  Use next_str and next_int to parse arguments.
-	* passwd.cc (pwdgrp::parse_passwd): Ditto.
-	(grab_string): Eliminate.
-	(grab_int): Ditto.
-	* pwdgrp.h (pwdgrp::parse): Eliminate input arg.
-	(pwdgrp::parse_passwd): Reflect above change.
-	(pwdgrp::parse_group): Reflect above change.
-	(pwdgrp::next_str): New function.
-	(pwdgrp::next_int): Ditto.
-	(pwdgrp::gets): Eliminate.
-	* uinfo.cc (pwdgrp::next_str): New function.
-	(pwdgrp::next_int): Ditto.
-	(pwdgrp::add_line): Subsume gets.
-	(pwdgrp::gets): Eliminate.
-	(pwdgrp::load): Just call add_line to parse input buffer.
-
-2003-01-22  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* include/pthread.h (PTHREAD_MUTEX_RECURSIVE): Revert changes from
-	2003-01-09 mutex patch.
-	(PTHREAD_MUTEX_ERRORCHECK): Ditto.
-
-2003-01-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygrun.c: Move from here to ../testsuite.
-	* Makefile.in: Remove cygrun.exe dependencies.
-
-2003-01-21  Jason Tishler  <jason@tishler.net>
-
-	* cygwin.din: Export nanosleep().
-	* signal.cc (nanosleep): New function.
-	(sleep): Move old functionality to nanosleep().  Call nanosleep().
-	(usleep): Remove old functionality.  Call nanosleep().
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-01-21  Christopher Faylor  <cgf@redhat.com>
-
-	* grp.cc: Call gr.refresh() rather than doing isunitialized tests
-	throughout.
-	(gr): Use constructor (sigh).
-	(pwdgrp::parse_group): Rename from parse_grp.
-	(pwdgrp::read_group): Rename from read_etc_group.  Just call gr.load
-	with a single argument.
-	* passwd.cc: Call pr.refresh() rather than doing isunitialized tests
-	throughout.
-	(pr): Use constructor (sigh).
-	(pwdgrp::parse_passwd): Rename from "parse_pwd".
-	(pwdgrp::read_passwd): Rename from read_etc_passwd.  Just call pr.load
-	with a single argument.
-	* pwdgrp.h (pwdgrp_state): Eliminate.
-	(pwdgrp): Reflect above renamings.
-	(pwdgrp::etc_ix): Rename from pwd_ix.
-	(pwdgrp::read): New element.
-	(pwdgrp::lock): New element.
-	(pwdgrp::refresh): New function.
-	(pwdgrp::load): Eliminate variations which take buffer arguments.
-	(pwdgrp::pwdgrp): New constructors.  Initialize mutex here.
-	* uinfo.cc (pwdgrp::load): Accommodate pwd_ix -> etc_ix renaming.
-	(pwdgrp::load): Set initialized state to true rather than setting state
-	to loaded.
-
-2003-01-21  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2003-01-21  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* path.h (etc::change_possible): Revert the type to bool.
-	(etc::set_last_modified): Remove obsolete function.
-	* path.cc (etc::change_possible): Revert type to bool.
-	(etc::test_file_change): Do not test for negative values of
-	change_possible and do not set it to -res.
-	(etc::dir_changed): When the handle is NULL, call memset instead of
-	test_file_changed.  When the handle is invalid, return true.  Detect
-	filename change in /etc.
-	(etc::file_changed): Remove unneeded check for !fn[n].
-	* uinfo.cc (pwdgrp::load): Eliminate spurious setting of fh to NULL.
-	* pwdgrp.h (pwdgrp::operator =): Eliminate.
-
-2003-01-19  Christopher Faylor  <cgf@redhat.com>
-
-	* pwdgrp.h (etc): Move to path.h.
-	(pwdgrp::max_lines): New field.
-	(pwdgrp::curr_lines): New field.
-	(pwdgrp::pwdgrp_buf): Ditto.
-	(pwdgrp_buf_elem_size): Ditto.
-	(pwdgrp_parse): Ditto.
-	(pwdgrp::gets): Just declare here.
-	(pwdgrp::load): Ditto.  Just take one argument.
-	(pwdgrp::load): Define overloaded function accepting passwd buf.
-	(pwdgrp::load): Define overloaded function accepting group buf.
-	* grp.cc: Use pwdgrp elements rather than standalone static variables
-	throughout.
-	(curr_lines): Eliminate.
-	(max_lines): Ditto.
-	(add_grp_line): Ditto.
-	(parse_grp): Define as returning boolean.  Accept void * arg and line
-	count.  Coerce first argument into __group32 buf reference.  Increment
-	curr_line as appropriate.
-	(read_etc_group): Pass pwdgrp buffer to gr.load.
-	* passwd.cc: Use pwdgrp elements rather than standalone static variables
-	throughout.
-	(curr_lines): Eliminate.
-	(max_lines): Ditto.
-	(add_grp_line): Ditto.
-	(parse_passwd): Define as returning boolean.  Accept void * arg and line
-	count.  Coerce first argument into passwd buf reference.  Increment
-	curr_line as appropriate.
-	(read_etc_group): Pass pwdgrp buffer to pr.load.
-	* path.cc (etc::fn): Extend buffer size to allow index by 1 rather than
-	zero.
-	(etc::last_modified): Ditto.
-	(etc::change_possible): Ditto.  Renamed from sawchange.  Change to
-	signed char since elements are now tri-state.
-	(etc::init): Assume "handle" is 1 based rather than 0.
-	(etc::test_file_change): New function.  Sets change_possible based on
-	file date comparison.
-	(etc::dir_changed): Check file states immediately after changed_h is
-	initialized to avoid a race.
-	(etc::file_changed): Use test_file_change to detect if file needs to be
-	updated.
-	* path.h (etc): Move class here from pwdgrp.h.
-	* uinfo.cc: Move etc:: functions to path.cc.  Move pwdgrp functions
-	here.
-	(pwdgrp::gets): Eliminate buf checks.  Just check eptr and set lptr.
-	(pwdgrp::add_line): New function.
-	(pwdgrp::load): Call generic add_line function which will call correct
-	parser.
-
-2003-01-17  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc: Change most 'int's to 'unsigned's.
-	(_cmalloc): Only check for size of malloced region when calculating
-	bucket.  Add overhead when performing the sbrk.  Previous change broke
-	_crealloc.
-
-2003-01-17  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (initialize_env): Use colon for CYGWIN_DEBUG separator.
-	* grp.cc: Change most statics to NO_COPY throughout.
-	* passwd.cc: Ditto.
-
-2003-01-17  Christopher Faylor  <cgf@redhat.com>
-
-	* pwdgrp.h: Change some BOOLs to bools.
-	(pwdgrp::pwdgrp): Remove unneeded constructor.
-	* passwd.cc: Change BOOL to bool throughout.
-
-2003-01-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din: Add strerror_r.
-	* include/cygwin/version.h: Bump API minor number.
-
-2003-01-17  Christopher Faylor  <cgf@redhat.com>
-
-	* uinfo.cc (etc::dir_changed): Don't print a warning if can't open
-	/etc, unless debugging.
-
-2003-01-17  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* grp.cc (read_etc_group): On NT, add a line for gid = -1.  Change name
-	"unknown" to "mkgroup".
-	(internal_getgrgid): Do not return default in nontsec case.
-	(internal_getgroups): Add argument srchsid and look for it in groups if
-	not NULL.
-	* passwd.cc (read_etc_passwd): On NT, add a line for uid = -1.  Use
-	same default uid for Win95 and NT.  Call cygheap_user::ontherange to
-	initialize HOME.
-
-2003-01-16  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (init_cygheap::etc_changed): Move to uinfo.cc.
-	* cygheap.h (init_cygheap::etc_changed_h): Remove.
-	(init_cygheap::etc_changed): Ditto.
-	* grp.cc (group_state): Remove.  Use gr instead throughout.
-	(gr): Define as class pwdgrp.
-	(read_etc_group): Remove gr definition.  Remove calls to
-	set_last_modified and close.  Pass add_grp to gr.load to load file.
-	* passwd.cc (passwd_state): Remove.  Use pr instead, throughout.
-	(pr): Define as class pwdgrp.
-	(read_etc_passwd): Remove pr definition.  Remove calls to
-	set_last_modified and close.  Pass add_pwd_line to pr.load to load
-	file.
-	* pwdgrp.h (etc): New helper class for pwdgrp.
-	(pwdgrp): Combine pwdgrp_check and pwdgrp_read into one class.  Remove
-	file_w32 and last_modified fields.
-	(pwdgrp::set_last_modified): Remove.
-	(pwdgrp::isinitializing): Remove FindFirstFile stuff.  Move to
-	etc::file_changed.
-	(pwdgrp::load): Rename from 'open'.  Call etc::init to initialize etc
-	scanning.  Close file handle after reading buffer into memory.  Parse
-	buffer by calling second argument.
-	(pwdgrp::gets): Reorganize slightly to rely on eptr starting at
-	beginning of buffer.
-	(pwdgrp::close): Remove.
-	* uinfo.cc (etc::dir_changed): New function.
-	(etc::init): Ditto.
-	(etc::file_changed): Ditto.
-	(etc::set_last_modified): Ditto.
-
-2003-01-16  Jason Tishler  <jason@tishler.net>
-
-	* mmap.cc (fixup_mmaps_after_fork): Add ERROR_NOACCESS to the list of
-	ReadProcessMemory() error codes that trigger a retry with temporary
-	PAGE_READONLY access.  Note that this can occur on NT 4.0.
-
-2003-01-15  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (normalize_posix_path): Convert win32 path separators to
-	slashes when full path is specified.
-
-2003-01-15  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* cmalloc.cc (_cmalloc): Fix memory leak.
-
-2003-01-15  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: Fix copyright date.
-	* fhandler_dsp.cc: Ditto.
-	* mmap.cc: Ditto.
-	* net.cc: Ditto.
-	* ntdll.h: Ditto.
-	* signal.cc: Ditto.
-	* syscalls.cc: Ditto.
-	* uname.cc: Ditto.
-	* wait.cc: Ditto.
-
-2003-01-14  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (fixup_mmaps_after_fork): Copy protection to child process.
-	Change ambiguous debug output.
-
-2003-01-14  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap_record::access): Change argument type to caddr_t
-	for strictness.
-	(mprotect): Protect against calling VirtualProtect() for shared
-	pages on 9x/Me.
-	(fixup_mmaps_after_fork): If ReadProcessMemory() fails, try to
-	change protection of parent page to PAGE_READONLY, then try again.
-	Revert protection afterwards.
-
-2003-01-14  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* syscalls.cc (system): Add pthread_testcancel call.
-	* thread.cc: Update list of cancellation points.
-
-2003-01-14  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* wait.cc: Include thread.h
-	(wait4): Add pthread_testcancel call.
-	Wait for child process and cancellation event.
-	* thread.cc: Update list of cancellation points.
-
-2003-01-14  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* signal.cc (sleep): Add pthread_testcancel call.
-	Wait for signal and cancellation event.
-	(usleep): Ditto.
-
-2003-01-14  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* exceptions.cc (handle_sigsuspend): Add pthread_testcancel call.
-	Wait for signal and cancellation event.
-	* thread.cc: Update list of cancellation points.
-
-2003-01-14  David Huang  <davehzhr@hotmail.com>
-
-	* fhandler_dsp.cc (fhandler_dsp::ioctl): Add limited support for
-	SNDCTL_DSP_GETFMTS.
-
-2003-01-12  Christopher Faylor  <cgf@redhat.com>
-
-	* ntdll.h: Fix typo.
-
-2003-01-12  Corinna Vinschen <corinna@vinschen.de>
-
-	* uname.cc (uname): Use cygwin_gethostname() to retrieve hostname.
-
-2003-01-12  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* sec_acl.cc (search_ace): Use id == -1, instead of < 0, as wildcard.
-	(setacl): Start the search for a matching default at the next entry.
-	Invalidate the type of merged entries instead of clearing it.
-	Use well_known_creator for default owner and owning group and do
-	not try to merge non-default and default entries in these cases.
-	(getacl): Recognize well_known_creator for default owner and group.
-	(acl_worker): Improve errno settings and streamline the nontsec case.
-	* security.cc (write_sd): Remove the call to set_process_privilege.
-	(alloc_sd): If the owner changes, call set_process_privilege and return
-	immediately on failure. Change inheritance rules: on new directories add
-	inherit only allow ACEs for creator_owner, creator_group and everyone.
-	Preserve all inheritances through chmod and chown calls. Introduce
-	isownergroup to implement the uid == gid case, to keep the inheritance
-	code simple. Do not initialize owner_sid and group_sid and stop using
-	the variable psd.
-
-2003-01-10  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc: Use gethostname define from winsock2.h.
-
-2003-01-10  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc: Unrevert below reversion except for
-	mount_info::conv_to_posix_path part.
-
-2003-01-10  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc: Revert patch from 2003-01-09 to normalize a windows path
-	rather than converting to posix.
-
-2003-01-10  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc (gethostname): Make call optional, return 1 if function
-	can't get loaded.
-	* net.cc (cygwin_gethostname): Call GetComputerName if return value
-	of gethostname is non-zero.
-
-2003-01-10  Charles Wilson  <cwilson@ece.gatech.edu>
-
-	* cygwin.din: Add asprintf and vasprintf, as well as the reentrant
-	versions and underscore variants.
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR.
-
-2003-01-10  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (cygwin_gethostname): Fix call to wsock function gethostname.
-
-2003-01-09  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::cygthread): Be more noisy about odd
-	condition.
-	* miscfuncs.cc (low_priority_sleep): Sleep in regular priority if
-	that's what we're currently running at.
-
-2003-01-09  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* include/semaphore.h: Modify typedef for sem_t.
-	* include/cygwin/types.h: Modify typedefs for pthread_t,
-	pthread_mutex_t, pthread_key_t, pthread_attr_t,
-	pthread_mutexattr_t, pthread_condattr_t, pthread_cond_t,
-	pthread_rwlock_t and pthread_rwlockattr_t.
-
-2003-01-09  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.h (WAIT_CANCELED): New define.
-	(pthread::cancelable_wait): New static method.
-	* thread.cc (pthread::cancelable_wait): Implement.
-	(semaphore::Wait): Wait on semaphore and thread cancellation.
-	(pthread::join): Wait on joined thread and thread cancellation.
-	(semaphore::wait): Add testcancel to check for thread
-	cancellation even if the semaphore is available.
-
-2003-01-09  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* include/pthread.h: Add define for errorchecking mutexes.
-	Change default mutex type.
-	* thread.cc (pthread_cond::TimedWait): Update mutex unlock
-	calls.
-	(pthread_mutex::pthread_mutex): New implement.
-	(pthread_mutex::~pthread_mutex): Ditto.
-	(pthread_mutex::Lock): Ditto.
-	(pthread_mutex::TryLock): Ditto.
-	(pthread_mutex::UnLock): Ditto.
-	(pthread_mutex::Destroy): Implement new method.
-	(pthread_mutex::SetOwner): Ditto.
-	(pthread_mutex::LockRecursive): Ditto.
-	(pthread_mutex::fixup_after_fork): Restore locking state after
-	fork.
-	(__pthread_mutex_lock): Return pthread_mutex::Lock errorcode.
-	(__pthread_mutex_trylock): Return pthread_mutex::TryLock
-	errorcode.
-	(__pthread_mutex_unlock): Return pthread_mutex::UnLock
-	errorcode.
-	(__pthread_mutex_destroy): Call pthread_mutex::Destroy to
-	destroy mutex.
-	(__pthread_mutexattr_settype): Allow errorchecking and recursive
-	types.
-	* thread.h (MUTEX_LOCK_COUNTER_INITIAL): New define.
-	(pthread_mutex::criticalsection): Remove.
-	(pthread_mutex::lock_counter): New member.
-	(pthread_mutex::recursion_counter): Ditto.
-	(pthread_mutex::owner): Ditto.
-	(pthread_mutex::type): Ditto.
-	(pthread_mutex::Destroy): New method.
-	(pthread_mutex::SetOwner): Ditto.
-	(pthread_mutex::LockRecursive): Ditto.
-
-2003-01-09  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* pthread.cc (pthread_cond_init): Use new pthread_cond::init.
-	* thread.cc: Some white spaces cleanups.
-	Change __pthread_cond_init to pthread_cond::init throughout.
-	(nativeMutex): Move class methods outside pthread_mutex.
-	(MTinterface::Init): Initialize pthread_cond init lock.
-	(pthread_cond::condInitializationLock): Instantiate.
-	(pthread_cond::initMutex): New Method.
-	(pthread_cond::isGoodInitializerOrBadObject): Ditto.
-	* thread.h: Some white spaces cleanups.
-	(nativeMutex): Move class declaration outside pthread_mutex.
-	(pthread_cond::condInitializationLock): New static member.
-	(pthread_cond::initMutex): New Method.
-	(pthread_cond::isGoodInitializerOrBadObject): Ditto.
-	(__pthread_cond_init): Remove prototype.
-
-2003-01-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_disk_file.cc (num_entries): Return 2 as link count if
-	directory unreadable.
-
-2003-01-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (get_nt_attribute): Always return -1 when read_sd()
-	fails.
-	(get_file_attribute): Set permissions to 0 and owner/group to -1
-	if security descriptor is unreadable.
-
-2003-01-09  Christopher Faylor  <cgf@redhat.com>
-
-	Use isdirsep rather than SLASH_P throughout.
-	* path.cc (iscygdrive): Disallow /cygdrive\x.
-	(normalize_posix_path): "Normalize" a windows path, if detected, rather
-	than converting to posix.
-
-2003-01-06  Troy Curtiss <troyc@usa.net>
-
-	* fhandler_serial.cc (fhandler_serial::tcsetattr): Add support and
-	capability checking for B230400 bitrate.
-	(fhandler_serial::tcgetattr): Add support for B230400 bitrate.
-	* include/sys/termios.h: Add B230400 definition for Posix support of
-	230.4Kbps.
-
-2003-01-05  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (_pinfo::commune_send): Use myself->lock rather than just
-	lock when leaving.
-
-2003-01-03  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.h (dtable::in_vfork_cleanup): New function.  True if vfork
-	cleanup needed.
-	* dtable.cc (dtable::vfork_parent_restore): Remove assertion.
-	* pipe.cc (fhandler_pipe::close): Don't close read_state during
-	fork_fixup since it wasn't inherited.
-
-2003-01-01  Christopher Faylor  <cgf@redhat.com>
-
-	* passwd.cc (getpwuid_r32): Revert previous change.
-
-2003-01-01  Christopher Faylor  <cgf@redhat.com>
-
-	* sysconf.cc (sysconf): Return arbitrary values for
-	_SC_GETGR_R_SIZE_MAX, _SC_LOGIN_NAME_MAX, _SC_GETPW_R_SIZE_MAX.
-
-	* passwd.cc (getpwuid_r32): Add uid/gid fields to size check
-	calculation.
diff --git a/winsup/cygwin/ChangeLog-1995 b/winsup/cygwin/ChangeLog-1995
deleted file mode 100644
index 462a61336..000000000
--- a/winsup/cygwin/ChangeLog-1995
+++ /dev/null
@@ -1,177 +0,0 @@
-Mon Dec 18 16:44:38 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* configure.in (target_cpu): specify valid Intel x86 architectures
-	explicitly.
-
-Mon Dec 18 15:04:29 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* sysdef/*.def: moved to sysdef/i386/.
-
-Mon Dec 18 15:00:56 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* configure.in: Set DLL_ENTRY and SYSDEF_DIR for i386 and powerpc.
-	* configure: Regenerated with autoconf 2.7.
-
-	* Makefile.in: Use DLL_ENTRY and SYSDEF_DIR.
-
-Sat Dec 16 18:36:44 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	Changed the way that file handles are inherited.  Now
-	all files are opened with the inheriting turned on, and they're
-	closed when necessary.  
-
-	Changed the way that children are waited for.  Now
-	you can exec a non-gnuwin32 program and wait for its
-	result.
-	
-	* Makefile.in: Turn off frame-pointer.
-	* dcrt0.cc (environ_init): Lint.
-	* dirsearch.cc (opendir): Use new path_conv mechanism.
-	* exceptions.cc (ctrl_c_handler): Exit with correct status
-	* exec.cc (file_exists): Moved to paths.cc
-	(_execve): Moved most of the work into spawn.cc.
-	* fhandler.cc (*): Much.
-	* libccrt0.c (foo): Deleted.
-	(cygwin_crt0): Lint.
-	* path.cc (readlink): Initialize the SECURITY_ATTRIBUTES struct.
-	* pipe.cc (pipe, dup*): Reorganized.
-	* registry.cc (read_in): Create the key in CURRENT_USER.
-	* wait.cc, spawn.cc (*): Much.
-	* sysconf.cc (sysconf): Understand SC_PAGESIZE.
-	* times.cc (utime): New function.
-	* uname.cc (uname): Dig out more info.
-	
-Wed Dec 13 05:54:55 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* dcrt0.cc (environ_init): Cast alloca return to appropriate type.
-	* spawn.cc (spawn_guts): Ditto.
-
-	* strace.cc (__small_{v,}sprintf): Add appropriate prototypes.
-
-	* exceptions.cc (_except_list): Only use segments for 386 systems.
-	(__stack_trace): Add PowerPC support, and do nothing for systems
-	that are not supported except print stack tracing is not yet
-	support.
-
-	* sdata.cc (import_term): Only use __attribute__((section)) on 386
-	systems.
-
-	* shared.cc (shared_init): Use MARK macro instead of calling mark
-	directly with incorrect type arguments.
-
-	* fhandler.cc (fhandler_dev_null::{read,write}): Use size_t in
-	prototype, not unsigned int.
-
-	* fork.cc (find_exec): Fix type errors.
-	* path.cc (path_to_real_path_keep_rel): Ditto.
-	* syscalls.h (PATH_TO_REAL_PATH): Ditto.
-
-	* {longjmp,setjmp}.c: #ifdef i386 code.
-
-	* include/wintypes.h (ExitProcess): Add
-	__attribute__((__noreturn__)) so exit compiles without warnings.
-
-Tue Dec 12 18:25:05 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* include/wintypes.h (WINAPI): Only define WINAPI for x86 systems.
-
-Tue Dec  5 16:00:05 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* Makefile.in (all): Only build documentation for info target.
-	Expect texi2html to not be found most of the time.
-
-Tue Dec  5 08:08:08 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	Release-B10
-	
-	* cygwin.dll (__assert, wait, spawnv, spawnvp): Deleted.
-	* dcrt0.c: Quoting rewritten.
-	* exec.cc (file_exists): Use new path_conv mechanism.
-	(_execve): Close open child process handles.
-	* fhandler.cc (fhandler_normal::open): Follow symlinks.
-	(fhandler_normal::read): Keep track of logical file posision.
-	(fhandler_normal::lseek): Seek in text files correctly.
-	(fhandler_normal::fstat): Set IFLNK bit if its a symlink.
-	(fhandler_normal::init): Maintain is_pipe.
-	(fhandler_dev_null::fstat): New.
-	(fhandler_dev_null::get_handle): Return INVALID_HANDLE.
-	* fork.cc: Use new event mechanism.
-	* libccrt0.cc: Keep track of _fmode variable.
-	* misc.c (readlink): Delete.
-	* path.cc (__path_to_real_path_1): Allow /d<letter> mechanism.
-	(path_to_real_path_keep_rel): New
-	(link_cookie:*): Support for symbolic links.
-	* spawn.cc (spawn_guts): Quoting rewritten.
-	* times.cc: New.
-	* syscalls.cc (_stat_worker): New.
-	(_stat, _lstat): Use _stat_worker.
-	* sysconf.cc (sysconf): Support _SC_CLK_TCK.
-
-Tue Nov 28 15:29:38 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* loads of stuff. When I make < 100k of diffs in a day, 
-	the ChangeLog will be usefull.
-
-Tue Nov 21 18:01:39 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* Makefile.in: Build the doc.
-	* exceptions.cc: lint.
-	* fork.cc: lint.
-	* shared.cc (shared_init): If MapViewOfFileEx fails, then try
-	again, but get the OS to select the address (for win95)
-	* strace.cc (__sysprintf): Print pid and state in hex.
-	* syscalls.cc (_unlink): Translate path to realpath.
-
-Wed Nov 15 23:47:43 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* spawn.cc (_exit): set return value's lower byte to 0 by default.
-
-	Tue Oct 3 10:23:14 1995 Anders Blomdell (anders.blomdell@control.lth.se)
-
-	* spawn.cc (spawn_guts): quote doublequotes correctly 
-	
-Tue Nov 14 15:05:33 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* configure.in: comment out call to cfg-ml-com.in.
-
-Tue Oct 31 11:19:18 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* libcerr.cc: New file.
-	* dcrt0.cc (environ_init): Initialize PATH and friends nicely.
-	* exceptions.cc (ctrl_c_handler): Default case is to exit.
-	* fork.cc (__suffixy, find_exec): translate between paths and
-	real_paths.
-	* shared.cc (shared_init): Hard wire shared memory at 0xa0000000.
-	* syscalls.c (__path_to_real_path, real_path_to_path): Always
-	translate '/' <> '\'
-
-Mon Oct 30 17:36:10 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* syscalls.cc (_rename): Fix for win95.
-
-Fri Oct 27 20:53:47 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* Everything changed.
-
-Thu Oct 19 10:47:52 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* registry.cc, uinfo.cc: New files.
-	* crt0.c (*uinfo*, *_exe_suffix*): Delete.
-	(dll_crt0): Call shared_init.
-	* getlogin.c: deleted.
-	* shared.cc: Fill in.
-	* spawn.c (_spawn): Use __exe_suffix function.
-	* syscalls.c (getuid, getgid): Moved into uinfo.cc
-	* syscalls.h (*uinfo, __exe_suffix): Deleted
-	* Makefile.in: Cope with target configury.
-	* termios.c: Fix stub prototypes.
-	* win.h: Deleted.
-	* include/winadvapi.h: Fill in some REG prototypes.
-
-Thu Oct 19 10:47:52 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* Makefile.in: Cope with target configury.
-
-Wed Oct 18 15:34:49 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* Moved from newlib.
diff --git a/winsup/cygwin/ChangeLog-1996 b/winsup/cygwin/ChangeLog-1996
deleted file mode 100644
index b0c88d97b..000000000
--- a/winsup/cygwin/ChangeLog-1996
+++ /dev/null
@@ -1,2031 +0,0 @@
-Mon Dec 23 13:35:27 1996  Jeremy Allison <jra@cygnus.com>
-
-	* Makefile.in: Added $(srcdir)/../libstdc++/stl -I$(srcdir)/../libio
-	to the include path. As mmap uses STL then this is needed
-	to build the cross compiler. Also added mmap.o file.
-	* cygwin.din: Added mmap, mprotect, msync, munmap.
-	* dcrt0.cc: Added code to get the module pathname from
-	a previously unused field in the u area so fork() calls
-	don't have to search the path. Forwards compatible with 
-	earlier releases as they set this field to zero.
-	* fork.cc: Added call to recreate_mmaps_after_fork() in
-	child code. Ensures child has same view of mmap'ed areas
-	as parent.
-	* libccrt0.cc: (See dcrt0.cc change). Setup the module 
-	handle so fork can get the path name.
-	* mmap.cc: New file. Implements mmap, mprotect, msync, munmap,
-	recreate_mmaps_after_fork. Uses STL.
-	* select.cc: Added code to set errno to EINVAL if select done
-	on handles and sockets. Must fix this soon.
-	* spawn.cc: Set new variable hmodule in u area to zero for child.
-	* syscalls.cc: Added fsync functionality. No longer a dummy call.
-	* winsup.h: Decremented internal_reserved array by one to add
-	hmodule in u area. Added prototype for recreate_mmaps_after_fork().
-	* include/sys/mman.h: Fixed include file for mmap calls.
-	
-Tue Dec 17 16:20:52 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc (_rename): fix code so we really do
-	return -1 if _rename fails.
-
-Tue Dec 17 12:12:29 1996  Jeremy Allison <jra@cygnus.com>
-
-	* fhandler.cc: Added Sergeys patch for FakeReadFile.
-	* cygwin.din: Re-ordered network calls.
-
-Mon Dec 16 16:47:26 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* configure.in: remove AC_C_CROSS (now part of AC_PROG_CC)
-	* utils/configure.in: ditto
-	* configure: regenerate
-	* utils/configure: regenerate
-
-Mon Dec 16 14:50:46 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: export cygwin32_getsockopt
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* spawn.cc: don't assume all scripts should be run in
-	bash -- run the shell specified after the #!
-
-Fri Dec 13 16:18:22 1996  Jeremy Allison <jra@cygnus.com>
-
-	* path.cc: Added support for UNC paths.
-
-Fri Dec 13 10:56:21 1996  Jeremy Allison <jra@cygnus.com>
-
-        * cygwin.din: Added h_errno, seteuid, _seteuid.
-        * exceptions.cc: Made init_exceptions extern "C".
-        * exceptions.h: Added cplusplus wrappers to enable this to
-        be used from C.
-        * net.cc: Added error numbers, fixed gethostbyaddr, added h_errno
-        fixes.
-        * stubs.cc: Added seteuid.
-        * include/mywinsock.h: Added HOST error entries for DNS lookups.
-
-Tue Dec 10 15:38:46 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* version.h: bump CYGWIN_DLL_VERSION_MINOR to 4
-
-	patch from Marcus Daniels <marcus@sysc.pdx.edu>:
-	* fhandler.cc: add fhandler_dev_null::dup (fhandler_base *child)
-	* fhandler.h: add matching header
-
-	gnu-win32 beta 17.1 release made
-
-Thu Dec  5 14:03:08 1996  Geoffrey Noer  <noer@cygnus.com>
-
-        * select.cc: add missing end comment at about line 933.
-	gnu-win32 beta 17 release made
-
-Wed Dec  4 15:53:11 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* version.h: increment minor dll number in conjunction
-	with gnu-win32 beta 17 release
-
-Tue Dec  3 15:05:57 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* strsep.cc: new file containing Berkeley-copyrighted strsep
-	code previously in misc.cc.
-	* misc.cc: strsep moved to strsep.cc, stop including
-	unistd.h, strings.h, sys/types.h, stddef.h, and stdarg.h
-	* Makefile.in: appropriate adjustments to add strsep.cc
-
-Tue Dec  3 13:50:59 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/sys/copying.dj: new file whose presence is
-	required by include/sys/file.h
-
-Tue Dec  3 13:37:27 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	Throughout all Cygnus-developped source files: put all
-	code under GPL
-
-Tue Dec  3 10:54:01 1996  Jeremy Allison <jra@cygnus.com>
-
-	* fork.cc: Changed code to delete [] saved child_hinfo
-	after allocate_pid called. Needed as child changes this
-	value in the shared area when it de-linearizes fd array.
-	Needed to stop race condition with earlier fix.
-	* winsup.h: Changed definition of item in hinfo to be
-	a char array rather than fhandler_console. Stops
-	destructor being called when fork delete [] of
-	hinfo array called.
-	* hinfo.cc: Changes (casts) to support winsup.h changes.
-
-Mon Dec  2 17:22:13 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/utime.h: add ifdef _UTIME_U wrapper around header
-
-Mon Dec  2 15:45:46 1996  Jeremy Allison <jra@cygnus.com>
-
-	* fork.cc: Fixed file descriptor resource leak in parent.
-	* registry.cc: Removed fatal error if registry key cannot
-	be opened. Causes errors in service code.
-
-Wed Nov 27 15:40:15 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: for MS compatibility, also export functions
-	as _funcname = funcname
-	* include/netdb:
-	* include/sys/socket.h:
-	Do the equivalent thing for functions exported as cygwin32_funcname
-
-Wed Nov 27 15:14:30 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: remove exported helper functions that shouldn't
-	need to be exported (_read et al)
-	* glob/Makefile.in: add SHELL definition
-	* utils/Makefile.in: add SHELL definition
-
-Mon Nov 25 14:24:52 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/commdlg.h, ddeml.h, winadvapi.h, winbase.h, wincon.h,
-	windef.h, windowsx.h, winerror.h, wingdi.h, winkernel.h, winnt.h,
-	wintypes.h, winuser.h, winversion.h:
-	Add MS-style header files back, each of which now includes our
-	windows.h.  This should allow compilation of Windows code
-	that expects normal MS-named headers as long as the information
-	is in our windows.h somewhere.  The appropriate wrappers have
-	been added to each file so windows.h isn't included more than
-	once.
-	* include/windows.h: add paranoia wrapper so it can be included
-	more than once.
-
-Mon Nov 18 22:19:40 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: change rules around so new-cygwin.dll is
-	only rebuilt when necessary 
-	* spawn.cc: include <stdlib.h>
-
-Mon Nov 18 21:08:15 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* net.cc: remove extern "C"s that shouldn't be there
-	(get_win95_ifconf, get_winnt_ifconf, get_if_flags)
-	* syscalls.cc: remove extern "C"s from num_entries, _stat_worker
-	* winsup.h: add extern "C"s for syscalls protos
-
-Mon Nov 18 20:35:39 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* winsup.h: include version.h
-	* Makefile.in: remove dependencies involving version.h, but add
-	version.h to winsup.h dependency line and also add others that
-	should also be there.
-	* dcrt0.cc:
-	* libccrt0.cc:
-	* registry.cc:
-	* shared.cc: delete includes of version.h
-
-Mon Nov 18 20:16:37 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* stubs.c -> stubs.cc, add extern "C"s
-	* uname.c -> uname.cc, add extern "C"s
-	* console.cc: add extern "C"s, remove include windows.h
-	since its already included in winsup.h
-	* dirsearch.cc: add extern "C"s
-	* fcntl.cc: add extern "C"s
-	* winsup.h: remove LEAN_AND_MEAN define since that's no longer
-	relevant with new windows headers, include version.h
-	* malloc.cc: fix typos
-
-Mon Nov 18 18:02:31 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* grp.c renamed to grp.cc, add extern "C"s
-	* misc.c renamed to misc.cc, add extern "C"s
-
-Mon Nov 18 16:08:26 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc: extern "C"'d function calls
-	* net.cc: extern "C"'d function calls, some respacing
-	* hinfo.cc: extern "C"'d function calls, some respacing
-	* syscalls.h: removed defines for MIN, errno, alloca(x),
-	DEFAULT_GID/UID, NOT_OPEN_FD(fd), STD_RBITS et al,
-	O_NOSYMLINK
-	* winsup.h: added what was just deleted from syscalls.h
-
-Mon Nov 18 15:56:22 1996  Jeremy Allison <jra@cygnus.com>
-
-	* cygwin.din: Added readv
-	* syscalls.cc: Added readv code.
-	* syscalls.h: Added readv prototype.
-
-Wed Nov 13 15:55:14 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: added C++-related exports for stuff in
-	libgcc.a (from new.o, tinfo.o, tinfo2.o, exception.o).
-
-Mon Nov 11 15:50:26 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* dcrt0.cc
-	* dirsearch.cc
-	* malloc.cc
-	* passwd.cc
-	* path.cc,
-	* pinfo.cc
-	* syslog.cc
-	* utils/kill.cc
-	* utils/cygwin.cc:
-	need to #include <stdlib.h> which used to be included
-	automatically in windows.h included by winsup.h.
-	* shared.cc: UnmapViewOfFile takes a void *, not a 
-	const void *
-	* malloc.cc: formatting fixes
-
-Fri Nov  8 17:31:55 1996  Jeremy Allison <jra@cygnus.com>
-
-	* select.cc: Added fix for HANDLE select sent by
-	Sergey Okhapkin.
-	* fhandler.h: Changed dup to return int. Can now
-	return error to dup2.
-	* fhandler.cc: Changed dup to return error code.
-	Corrected fhandler_console::close to return
-	error code.
-	* hinfo.cc (dup2): Check return code from
-	fhandler->dup.
-	* times.cc: Changed DST calculation as tm struct
-	month starts at zero, NT wMonth starts at 1.
-	* TODO: Added the things i'd like to do.
-
-Wed Nov  6 17:42:31 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: Changed name of base file for cygwin.dll from
-	base to cygwin.base.  Changed name of exp file for cygwin.dll 
-	from win.exp to cygwin.exp.  Updated dependency list, removing
-	recently removed files like libcfork.cc, added missing files,
-	and added all missing header dependencies.  Small formatting
-	fixes.
-
-Fri Nov  1 16:38:48 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* TODO: deleted old stuff from a long time ago, added some
-	new stuff
-
-	* added public domain disclaimers to all files missing them,
-	reformatting of non-imported code to conform to GNU standards.
-	Changes to:
-	delqueue.h, exceptions.h, fcntl.cc, fhandler.h, grp.c,
-	init.cc, ioctl.cc, key.cc, libcctype.c, libcerr.cc, libcmain.cc,
-	misc.c, path.h, pold.c, resource.cc, smallprint.c, strerror.cc,
-	syslog.cc, termios.cc, test.c, version.h, wait.cc
-
-Fri Nov  1 14:44:29 1996 Jeremy Allison <jra@cygnus.com>
-
-	* fhandler.h: Added is_console() method needed by
-	new select code.
-	* fhandler.cc (fhandler_console::init): Added c_oflag setting
-	dependent on bin parameter.
-	* select.cc: Added code to implement select from console
-	handles. Ignores keyup events and still blocks.
-
-Wed Oct 30 16:35:41 1996 Jeremy Allison <jra@cygnus.com>
-
-	* fhandler.h: Removed fhandler_console_in, fhandler_console_out
-	and integrated them both into fhandler_console. Added output_handle_
-	so fhandler console has two handles. 
-	* fhandler.cc: Updated to support changes in fhandler.h. It is now
-	possible to open("/dev/tty") and read/write to the same fd.
-	* hinfo.cc(build_fhandler): Removed references to obsolete classes.
-	* spawn.cc: Changed to get correct reference to output_handle_ for
-	fhandler_console class.
-	* console.cc: Changed to get output handle rather than input handle.
-	* winsup.h: Changed definition of prototypes for functions changed
-	in console.cc
-
-Wed Oct 30 13:05:33 1996  Geoffrey Noer  <noer@cygnus.com>
-
-        * include/custcntl.h
-        * include/features.h
-        * include/icmp.h
-        * include/wchar.h
-        * include/cygwin32/icmp.h
-        * include/cygwin32/ip.h
-        * include/cygwin32/sockios.h
-        * include/cygwin32/types.h
-        * include/cygwin32/uio.h
-        * include/sys/ttychars.h
-        Added comment with name of header to each so that these are no
-        longer empty files (some unzip programs won't create
-        zero-length files which is a problem for headers)
-
-Sun Oct 27 17:30:03 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: also export "_execl = execl" and the same
-	for _execle and _execlp
-
-Thu Oct 24 01:43:29 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/windows.h: rewritten to include headers from
-	the include/Windows32 subdirectory
-	* winsup.h: no longer define MAX_PATH here since it's defined
-	in header files dragged in by windows.h
-	* dirsearch.cc (readdir): change WIN32_FIND_DATAA to WIN32_FIND_DATA
-	* libccrt0.cc: #include <stdlib.h>
-	* syscalls.cc (_unlink): chmod file to be unlinked to be
-	writable and try to delete it again if first delete failed
-	with permission denied error (rm will now work on read-only files)
-	(num_entries): change WIN32_FIND_DATAA to WIN32_FIND_DATA
-	* include/commdlg.h: delete
-	* include/ddeml.h: delete
-	* include/winadvapi.h: delete
-	* include/winbase.h: delete
-	* include/wincon.h: delete
-	* include/windef.h: delete
-	* include/windowsx.h: delete
-	* include/winerror.h: delete
-	* include/wingdi.h: delete
-	* include/winkernel.h: delete
-	* include/winnt.h: delete
-	* include/wintypes.h: delete
-	* include/winuser.h: delete
-	* include/winversion.h: delete
-
-Wed Oct 23 10:43:05 1996  Jeremy Allison <jra@cygnus.com>
-
-	* dcrt0.cc (api_fatal): Changed locking clear of
-	process table to unlocking clear. Needed as lock code calls
-	api_fatal.
-	* exceptions.cc: Added debug_printfs to follow exceptions in
-	strace mode.
-	* pinfo.cc: Added code to ensure fd table is cleared when new
-	pid entry allocated. Fixed bug when process is terminated
-	violently by TerminateProcess and leaves fd table non-zero.
-	* termios.cc: Changed stubbed out syscalls to syscall_printf
-	rather than small_printf. Stops annoying tcdrain message.
-	* winsup.h: Made get_empty_pinfo call private to pinfo_list.
-	Should never be called external to this class.
-
-Tue Oct 22 16:14:23 1996  Jeremy Allison <jra@cygnus.com>
-
-	* hinfo.cc: Removed previous change. This is not the
-	correct place to flush input events.
-
-Tue Oct 22 09:25:32 1996  Jeremy Allison <jra@cygnus.com>
-
-	* dcrt0.cc: Fixed up exit code to clean up pinfo array.
-	* exceptions.cc: Fixed up exit code to clean up pinfo array.
-	* fork.cc: Tidied up access to inuse_p entry. Added flags
-	to allow different states to be represented.
-	* hinfo.cc: Added code to flush pending events if
-	stdin is a console.
-	* pinfo.cc (pinfo::record_death): Added code to clean
-	the pinfo array if we are an exiting parent.
-	* spawn.cc: Removed erroneous code to clean childs
-	pinfo entry.
-	* wait.cc: Changed WAIT_ERROR_RC to Win32 WAIT_FAILED.
-	Tidied up access to pinfo array.
-	* winsup.h: Added record_death_nolock to pinfo class.
-	Added PID_XXX types for inuse_p.
-
-Tue Oct 22 01:26:52 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/Windows32/Base.h:
-	* include/Windows32/Functions.h:
-	* include/Windows32/Structures.h:
-	* include/Windows32/UnicodeFunctions.h:
-	Fixes to just commited changes
-
-Mon Oct 21 19:58:50 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/Windows32/ASCIIFunctions.h:
-	* include/Windows32/Base.h:
-	* include/Windows32/Defines.h:
-	* include/Windows32/Functions.h:
-	* include/Windows32/Structures.h:
-	* include/Windows32/UnicodeFunctions.h:
-
-	Add back items in old include files (commdlg.h, ddeml.h,
-	shellapi.h, winadvapi.h, winbase.h, wincon.h, windef.h,
-	windowsx.h, winerror.h, wingdi.h, winkernel.h, winnt.h,
-	wintypes.h, winuser.h, winversion.h) which should now be able
-	to be erased and windows.h modified to point to the new headers
-	without anything nasty happening. 
-
-	* include/WINREADME: deleted
-	* include/mywinsock.h: removed many blank lines
-
-Mon Oct 21 09:48:00 1996  Jeremy Allison <jra@cygnus.com>
-
-	* select.cc: Re-written from scratch. Take account of
-	the following cases. (1). All sockets [written&works]
-        (2). Handles, sockets and always readies [written,not tested]
-        (3). All handles [written,not tested]. (4). Handles & sockets
-        with timeout [not yet written,returns -1]. Correctly blocks
-	and doesn't spin cpu.
-        * pinfo.cc: Changed to add global lock around pinfo array.
-	* fork.cc: Changed to use global pinfo lock.
-	* shared.cc: Fixed bug with fork()->exec()->exec() code.
-	* net.cc: Removed select_init() call (no longer used).
-	* spawn.cc: Implemented suggestion that spawn creates
-	process suspended, then sets up it's dwProcessId entry
-	in the shared pinfo array.
-	* wait.cc: Changed to use global pinfo lock.
-	* winsup.h: Added missing windows_95() call.
-	* fhandler.h: Changed ifdefs to select new always_ready
-	methods.
-	* fhandler.cc (fhandler_console::write): Fixed bug
-	where return of write_normal was being ignored.
-	* dcrt0.cc: Added code to use global pinfo lock.
-	Ensure that process records it's own death.
-	* exceptions.cc: Added code to clear our entry in pinfo
-	array when we are exiting. Should reduce dead processes in
-	pinfo array.
-	* include/winbase.h: Added MAXIMUM_WAIT_OBJECTS define.
-
-Mon Oct 21 00:52:17 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: install headers from new Windows32 dir
-
-Sat Oct 19 00:47:58 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/Windows32/Base.h: change DWORD to unsigned int from
-	unsigned long, change __WIN32__ checks to _WIN32, change
-	// comments to /* */
-
-Fri Oct 18 17:33:07 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/Windows32/Defines.h: change INFINITE to 0xFFFFFFFF,
-	add back definitions present in old winsup headers missing from
-	this file (STATUS_WAIT_0 et al, CONTEXT stuff, FAR, PACKED,
-	ASCIICHAR)
-	* include/Windows32/Functions.h: change // comments to /* */
-	* include/Windows32/Messages.h: add definitions for WM_NULL,
-	WM_PENWINFIRST, WM_PENWINLAST
-	* include/Windows32/Sockets.h: change __WIN32__ checks to _WIN32
-	* include/Windows32/Structures.h: add ppc case for CONTEXT
-	structure, change // comments to /* */
-
-Fri Oct 18 17:25:09 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/Windows32: new directory for Windows headers
-	* include/Windows32/ASCIIFunctions.h:
-	* include/Windows32/Base.h:
-	* include/Windows32/Defines.h:
-	* include/Windows32/Errors.h:
-	* include/Windows32/Functions.h:
-	* include/Windows32/Messages.h:
-	* include/Windows32/Sockets.h:
-	* include/Windows32/Structures.h:
-	* include/Windows32/UnicodeFunctions.h:
-	New Win32 headers from Scott Christley's windows32api-0.1.2 package
-	with no local modifications.
-
-Wed Oct 16 17:16:33 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* key.cc: remove extra blank lines, change ASCIICHAR to AsciiChar
-	* registry.cc: remove #include <winbase.h> since it's already
-	included in windows.h
-
-Tue Oct 15 09:51:48 1996  Jeremy Allison <jra@cygnus.com>
-
-	* fhandler.h: Many changes to support moving fhandler array out of
-        shared area into locally allocated memory. Removed fhandler class,
-        fhandler_base is now root of class tree. Re-arranged class definitions
-        to make it clear what functions are virtual and can be overridden.
-	Inlined may accessor functions.
-        * fhandler.cc: Many changes to support moving fhandler array out of
-        shared area into locally allocated memory. unix_path_name_ is now
-	always set (all fhandler_base classes have a name).
-	* hinfo.cc: Many changes to support moving fhandler array out of
-        shared area into locally allocated memory. Added linearization and
-	de-linearization functions.
-	* net.cc(socket): Added code to keep name for fhandler_socket.
-	* pinfo.cc : Changed allocation of fhandler_base array to be in local
-        memory rather than in shared area. (modified functions are pinfo_init,
-	pinfo_list::get_empty_pinfo, pinfo_list::allocate_pid,
-	pinfo::record_death).
-	* shared.cc: Added functions to copy fd area for spawned process.
-	Changed name of shared area to include master version number of
-	Cygwin32.
-	* spawn.cc (spawn_guts): Added code to initialize new shared area
-	for fds.
-	* syscalls.cc: Changed all code depending on NOFILE to use
-	getdtablesize(). Added internal setdtablesize() call for exec'ed 
-	processes.
-	* syscalls.h: Added getdtablesize().
-	* sysconf.cc (sysconf): Changed SC_OPEN_MAX to return getdtablesize().
-	* winsup.h: Moved fhandler array out of shared area. Changed from
-	fhandler to fhandler_base (new root of class tree).
-	* include/mywinsock.h: Updated #endif to make end of
-	__INSIDE_CYGWIN32__ clear.
-	* include/winkernel.h: Added UnmapViewOfFile call.
-
-Mon Oct 14 14:59:16 1996  Geoffrey Noer  <noer@cygnus.com>
-
-        * sysdef/i386: replace all files with ones from Scott
-	Christley's windows32api-0.1.2 package.  Still need to
-	integrate new headers.
-
-Mon Oct 14 13:41:14 1996  Geoffrey Noer  <noer@cygnus.com>
-
-        * syscalls.cc (_unlink): need to fchmod file to writable
-	before attempting to delete.  This change still needs more
-	work (fchmod isn't written yet).
-	* (fchmod): change comment
-
-Fri Oct 11 22:27:17 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler.cc, fhandler.h: minor fixes to console
-	support functions (remove missed reference to gotarg2,
-	definition in fhandler.h)
-
-Wed Oct  9 17:55:00 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* delqueue.cc: added copyright notice, reformatted file
-
-	from sos@prospect.com.ru (Sergey Okhapkin):
-	* fhandler.cc, fhandler.h: add/fix ansi/vt100 console support,
-	and fix a tab bug
-	(modified functions are fhandler_console_out::clear_screen,
-	fhandler_console_out::clear_to_eol,
-	fhandler_console_out::char_command,
-	fhandler_console_out::write,
-	FakeReadFile)
-
-Wed Oct  9 17:32:17 1996  Jeremy Allison <jra@cygnus.com>
-
-	* times.cc: Swapped gmtime and localtime (they were
-	incorrectly reversed).
-	Added is_dst determination to them both.
-	* misc.c: Added swab, ffs.
-	* fcntl.cc(fcntl): Added capability for lock calls.
-	* fhandler.h: Added lock method into fhandler class.
-	* fhandler.cc: Added NT/Win95 semantics locks into ::lock
-	made them pretend they are POSIX locks.
-	* syscalls.cc (writev): Fixed return value bug.
-	* net.cc: Added WSAEOPNOTSUPP error.
-	* cygwin.din: Added ffs and swab.
-	* include/strings.h: Added file (just include string.h).
-	* include/winbase.h: Added defines LOCKFILE_FAIL_IMMEDIATELY
-	and LOCKFILE_EXCLUSIVE_LOCK.
-	* include/winerror.h: Added define ERROR_LOCK_FAILED.
-
-Thu Oct  3 16:19:23 1996  Jeremy Allison <jra@cygnus.com>
-
-	* fhandler.h: Many changes - removed all public variables
-	from classes, replaced with accessor functions. Renamed all
-	class variables to add a trailing '_'. This makes reading
-	and understanding which variables are class variables much simpler.
-	Changed name member to unix_path_name_ and made dynamic rather
-	than a fixed 31 byte buffer per entry.
-        * fhandler.cc: Updated varable access for above.
-	* fcntl.cc: Updated varable access for above.
-	* hinfo.cc: Updated varable access for above.
-	* spawn.cc: Updated varable access for above.
-	* syscalls.cc: Added fsync (null call) and fchmod(null
-	call at present).
-	* net.cc: Added ioctls for SIOCGIFCONF and SIOCGIFFLAGS.
-	Added ntohs, ntohl, static functions get_winnt_ifconf,
-	get_win95_ifconf and get_if_flags.
-	* include/cygwin32/if.h: Added structs for new ioctls.
-	* include/cygwin32/socket.h: Added iovec include.
-	* include/asm/socket.h: Added defines for above ioctls.
-	* cygwin.din: Added ntohs, ntohl, fsync, fchmod.
-
-Wed Oct  2 17:34:21 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/configure.in: add call to AC_CANONICAL_SYSTEM
-	* utils/configure: regenerate
-	* Makefile.in: build cygwin.dll as new-cygwin.dll and install as
-	cygwin.dll to prevent confusion when building winsup natively
-
-Tue Oct 1 17:27:34 1996  Jeremy Allison (jra@cygnus.com)
-
-	* include/regex.h: Added.
-	* net.cc: Added WSAECONNRESET, WSAEPFNOSUPPORT to
-	errmap array.
-
-Tue Oct 1 15:40:39 1996  Jeremy Allison (jra@cygnus.com)
-
-	* fork.cc (cygwin_fork_helper1): Fixed resource leak of process
-	handles, added cleanup code. Also fixed timout problem when child
-	cannot be initialized.
-	* dirsearch.cc (readdir): Changed comparison to explicitly check for
-	INVALID_HANDLE_VALUE. Test < 0 fails with void *.
-	* syscalls.cc (num_entries): Changed comparison to explicitly check for
-	INVALID_HANDLE_VALUE. Test < 0 fails with void *.
-	* cygwin.din: Added regcomp, regexec, regerror, regfree.
-	* Makefile.in: Added EXTRA_OFILES containing ../librx/rx.o. Added
-	comment to explain makefrag. Added ../newlib/libc/include to include
-	path.
-
-Mon Sep 30 16:10:56 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* cygwin.din:  Remove getopt and friends.
-
-Fri Sep 27 18:31:28 1996  Jeremy Allison <jra@cygnus.com>
-
-	* dcrt0.cc (dll_crt_1): Moved initialization of _reent to correct
-	position.
-
-Fri Sep 27 14:24:05 1996  Jeremy Allison <jra@cygnus.com>
-
-	* dcrt0.cc (dll_crt_1): Fixed fork bug with _impure_ptr not being
-	initialized correctly in a forked child. This should fix
-	the bash echo in a sub-shell bug.
-	* include/sys/uio.h: Created file. Contains definitions for writev
-	* include/limits.h: Added IOV_MAX and SSIZE_MAX.
-	* syscalls.cc: Added writev, changed read and write to return ssize_t.
-	* syscalls.h: Added writev, changed read and write to return ssize_t.
-	* cygwin.din: Added writev call.
-
-Wed Sep 20 13:09:00 1996  Jeremy Allison <jra@cygnus.com>
-
-	* include/mntent.h: Added MOUNTED definition, needed by
-	some code.
-	* dcrt0.cc : Added __progname for getopt code.
-	* misc.c: Added getw code.
-	* cygwin.din: Added getopt, optarg, opterr, optind
-	optopt, putw, getw calls.
-
-Fri Sep 20 03:03:17 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* select.cc: change long millisec to unsigned int,
-	respaced file
-
-	patch from Sergey Okhapkin <sos@prospect.com.ru>:
-	* select.cc (polled): fix for select to get keyboard input
-	working properly (check EventType != KEY_EVENT instead
-	of checking for KeyEvent.AsciiChar == 0)
-	* select.cc (cygwin32_select): make int i unsigned int so NULL is
-	a valid timeout argument for loop 
-
-Fri Sep 13 18:21:52 1996  Jeremy Allison <jra@cygnus.com>
-
-	* fhandler.cc (fhandler_base::read): rewrite text mode read
-
-Fri Sep 13 14:58:17 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* exceptions.cc (call_handler): fix control-C not working
-	problem by setting rethere variable before the old value is
-	clobbered.
-
-Thu Sep 12 16:27:00 1996  Jeremy Allison <jra@cygnus.com>
-
-	* syslog.cc (pass_handler) : Removed duplicate code
-	in pass_handler::print(). Added get_win95_event_log_path()
-	to facilitate moving to registry configuration.
-
-Thu Sep 12 12:56:00 1996  Jeremy Allison <jra@cygnus.com>
-
-	* syslog.cc : Added real openlog, syslog, logmask, closelog
-	calls. syslog logs to event log on NT, file on Win95.
-	* include/winnt.h : added EVENTLOG_xx_TYPE definitions.
-	* include/winadvapi.h : added ReportEventA, RegisterEventSourceA
-	DeregisterEventSourceA declarations.
-	* include/winkernel.h : added LockFile, UnlockFile, LockFileEx,
-	UnlockFileEx declarations.
-	* include/wintypes.h : added PSID typedef.
-	* include/sys/syslog.h : added options flag definitions for openlog.
-
-Wed Sep 11 15:34:09 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler.cc (popen): delete stub in favor of newlib's
-	(pclose): delete stub in favor of newlib's
-
-Tue Sep 10 17:20:56 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* configure.in: don't transform names (the only time this might
-	be a good idea is for unix x cygwin32)
-	* configure: regenerated with autoconf
-
-Tue Sep 10 17:20:56 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from Sergey Okhapkin <sos@prospect.com.ru>:
-	* fhandler.cc (FakeReadFile): support arrow keys, stop treating
-	bringing window to front as a key down (resulting in random
-	characters being printed in bash).
-
-Mon Sep  9 19:09:36 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc (system): fix system call
-
-Fri Sep  6 09:33:13 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* fhandler.h (fhandler_base): Make execable_p public char, not
-	private signed char.  Delete get_execable.
-	* fhandler.cc (fhandler_base::get_execable): Renamed to
-	check_execable_p.
-	(fhandler_base::open): Restore symlink support.
-	Set execable_p, symlink_p.
-	(fhandler_base::fstat): Replace call to get_execable with reference
-	to execable_p.
-	(fhandler_base::fhandler_base): Set execable_p to 0.
-	* path.h (symlink_check): Declare it.
-	* path.cc (symlink_check): New function.
-	(readlink): Call it.
-	(symlink_follow): Likewise.  New arg EXEC, callers updated.
-	* syscalls.cc (_stat_worker): New arg CALLER, callers updated.
-
-	* syscalls.cc: Delete all occurences of in/out and MARK.
-
-Thu Sep  5 18:51:01 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* fork.cc: Don't include <ctype.h>.  Delete find_exec and support.
-	* spawn.cc: Include <ctype.h>.  Move find_exec and support here.
-	(perhaps_suffix): New argument report_failure_p, callers updated.
-	(find_exec_1): Use perhaps_suffix when scanning PATH.
-	(spawn_guts): Replace code to translate posix to win32 path lists
-	with calls to utility fns that do the job.
-
-Wed Sep  4 13:30:57 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* path.cc (readlink): Make more bulletproof.
-
-Wed Aug 28 16:44:24 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc (system): use execlp
-	* public release beta 16 made
-
-Tue Aug 27 09:58:14 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* version.h (CYGWIN_DLL_VERSION_MINOR): Bump up to 2.
-
-Mon Aug 26 15:12:44 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc (system): added basic system() call.
-
-Mon Aug 26 13:46:30 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* cygwin.din (cygwin_fork_helper__FPvN30): Delete.
-	(vfork,select): Add.
-	* fork.cc (prepare_child): Delete, contents moved into
-	cygwin_fork_helper1.
-	(cygwin_fork_helper): Delete, contents moved into __fork.
-	* winsup.h (cygwin_fork_helper): Delete.
-
-	* path.cc: #include <fcntl.h>.
-	(symlink,readlink): Reenable, rewrite.
-	(symlink_follow): New function.
-	* path.h (symlink): Delete.
-	(SYMLINK_COOKIE, MAX_LINK_DEPTH): Define.
-	(symlink_follow): Declare.
-	* spawn.cc (spawn_guts): Rewrite symlink support.
-
-	* syscalls.cc (_unlink): Make arg a const char *.
-	* winsup.h (_unlink): Likewise.
-
-	* spawn.cc (spawn_guts): Fix allocation of stack space for sh.exe path.
-
-	* include/sys/errno.h: Deleted.  Use newlib's.
-
-Fri Aug 23 16:00:00 1996  Jeremy Allison <jra@cygnus.com>
-
-	* net.cc (getdomainname): Changed win95 code to open
-	"System" key rather than "SYSTEM". I think the registry
-	is case-sensitive.
- 
-Thu Aug 22 17:04:09 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	move fork into the dll:
-	* libcfork.cc: deleted
-	* fork.cc (vfork): used to be in libcfork.cc
-	* (__fork): used to be in libcfork.cc
-	* (fork): used to be in libcfork.cc	
-	* Makefile.in: don't build libcfork.cc any more
-	* libccrt0.cc: set data_start, etc. from dll structure
-	* winsup.h: add data_start, etc. to public vars in dll
-	* cygwin.din: list fork
-
-Thu Aug 22 01:36:53 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* registry.cc: fix new registry code
-	* syscalls.cc: make Windows95 check function extern "C"
-
-Wed Aug 21 16:15:47 1996  Geoffrey Noer  <noer@cygnus.com>
-
-        * cygwin.din: list vfork
-        * dirsearch.cc: fix errno setting in readdir that caused
-        diff to not function on directories
-        * pipe.cc: reformatted
-
-Wed Aug 21 15:12:47 1996  Jeremy Allison <jra@cygnus.com>
-
-	* net.cc (domainname): Changed getdomainname to get the 
-	information from the registry.
-	* registry.h:  Modified interface to reg_key.
-	* registry.cc: Added open(),close() calls, made 
-	get/set string values return error indication, added trailing 
-	underscore to hkey member so it can be seen to 
-	be a class member.
-	* include/winadvapi.h: Added KEY_READ and KEY write
-	defines for registry access.
-
-Mon Aug 19 09:22:35 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* path.cc (split_path): New function.
-	* path.h (split_path): Declare it.
-	* cygwin.din (cygwin32_split_path): Export it.
-
-	* include/winkernel.h (FILE_SHARE_DELETE): Define.
-
-	* syscalls.cc (__do_global_[cd]tors], __main): Move from here.
-	* dcrt0.cc: To here.
-
-	* dcrt0.cc (recur): Restore (now that we know WHY it was needed).
-	(dll_crt0_1): Probe forked child's stack out.
-
-	* fork.cc (FORK_WAIT_TIMEOUT): Bump up to two minutes.
-	
-	* fork.cc (dump_jmp_buf): New function.
-	(cygwin_fork_helper1): Call it.
-	* dcrt0.cc (dll_crt0:1): Call it.
-	* winsup.h (dump_jmp_buf): Declare it.
-
-	* fork.cc (cygwin_fork_helper1): Reenable child suspend before
-	stack copy code.
-
-Sat Aug 17 04:06:36 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* dirsearch.cc: reformatted, removed a couple of gotos
-
-Thu Aug 15 17:56:08 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: added __eprintf, a newlib function needed by assert.
-	* times.cc: swap gmtime and localtime (gmtime really was localtime
-	and vice versa).
-
-Tue Aug 13 03:46:22 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* signal.cc: renamed all signal variables "sig",
-	fixed signal range error checking in all relevant functions,
-	(sigaddset): new
-	(sigismember): new
-	(sigfillset): new
-	(sigemptyset): new
-	* cygwin.din: added corresponding entries for new signal functions.
-	* cygwin.h: added protos for them 
-	* fhandler.cc, fhandler.h: major reformat of code
-	* net.cc (cygwin32_socket): call checkinit() at start to
-	initialize WinSock in case it isn't already.
-	* syscalls.cc (access): set errno appropriately when no
-	write access
-	* fcntl.cc: reformatting
-
-Sat Aug 10 16:30:14 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* signal.cc (_raise): rewrite to shorten code, corrected
-	return values.  
-	* fcntl.cc, net.cc, signal.cc, stubs.c: reformatted, added
-	public domain notice at the tops if they were missing.   
-
-Fri Aug  9 18:19:12 1996  Geoffrey Noer  <noer@cygnus.com>
-
-        * syscalls.cc (_rename): return -1 if file to be renamed
-        doesn't exist.  Reformatted whole file.
-	* fork.cc: increase timeout value to 60 sec from 30 sec
-
-Thu Aug  8 17:44:39 1996  Jim Wilson  <wilson@cygnus.com>
-
-	* config/i386/longjmp.c: Increment %eax if it is zero.
-
-Wed Aug  7 15:51:04 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/sys/mman.h: fixed defines for PROT_READ et al to
-	match what's more normally there in unix
-	* sysdef/i386/*: removed the extra underscores present in most
-	of these files that shouldn't have been there
-	* net.cc: cleaned up whitespace, formatting
-
-Tue Jul 16 12:43:16 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* libccrt0.cc (__version): Deleted, unused.
-
-	* uname.c (uname): Print CYGWIN_DLL_VERSION is version field.
-
-Mon Jul 15 16:48:29 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* version.h (CYGWIN_DLL_VERSION_MINOR): Bump up to 1.
-
-	Path handling clean up, pass 2 (use //<letter>, not /.<letter>.).
-	* path.cc (SLASH_DRIVE_PREFIX_LEN): Delete.
-	(slash_drive_to_win32_path): New function.
-	(mount_info::posix_path_p): Delete support for $CYGWIN,
-	always return 1.
-	(path_conv::path_conv): Call slash_drive_to_win32_path.
-	(mount_info::conv_to_win32_path): Renamed from
-	posix_path_to_win32_path.  All callers updated.
-	(mount_info::conv_to_posix_path): Renamed from
-	win32_path_to_posix_path.  All callers updated.
-	(normalize_posix_path): Keep two leading /'s (or \'s).
-	(normalize_win32_path): Likewise.
-	(conv_to_{win32,posix}_path): Renamed from
-	{posix,win32}_path_to_{win32,posix}_path_keep_rel.
-	(conv_to_full_{win32,posix}_path): Renamed from
-	{posix,win32}_path_to_full_{win32,posix}_path.
-	(posix_path_list_p): New function.
-	(cygwin32_{unix,dos}_path_to_{dos,unix}_path_keep_rel): Delete.
-	({unix,dos}_path_to_{dos,unix}_path): Delete.
-	({win32,posix}_to_{posix,win32}_path_list_buf_size): Renamed from
-	cygwin32_{win32,posix}_to_{posix,win32}_path_list_buf_size.
-	({win32,posix}_to_{posix,win32}_path_list): Renamed from
-	cygwin32_{win32,posix}_to_{posix,win32}_path_list.
-	(slash_drive_prefix_p): Recognize //<letter>, not /.<letter>.
-	(build_slash_drive_prefix): Update.
-	* path.h: Update.
-	* cygwin.din ({dos,unix}_path_to_{unix,dos}_path): Delete.
-	(cygwin32_{dos,unix}_path_to_{unix,dos}_path_keep_rel): Delete.
-	(cygwin32_conv_to_{posix,win32}_path): Renamed from
-	(cygwin32_{win32,posix}_path_to_{posix,win32}_path_keep_rel.
-	(cygwin32_conv_to_full_{posix,win32}): New exports.
-	(cygwin32_posix_path_list_p): New export.
-	* dcrt0.cc (path_len): Delete.
-	(PATH_ENV_BUF_SIZE): Delete.
-	(conv_path_names): Delete all but PATH.
-	(dll_crt0_1): Rewrite environment variable conversion code.
-	* fork.cc (find_exec_1): Delete _SC_PATH_RULES support.  Determine
-	path delimiter by calling posix_path_list_p.
-	* shared.cc (shared_info::initialize): Delete `path_rules'.
-	* sysconf.cc (sysconf): Delete _SC_PATH_RULES.
-	* winsup.h (shared_info): Delete `path_rules'.
-
-	* fork.cc (cygwin_fork_helper1): Reset u->forkee after child has
-	started.
-
-	* pinfo.cc (pinfo::init_from_fork): Delete.  Empty function.
-	* fork.cc (cygwin_fork_helper1): Delete call to it.
-
-	* utils/kill.cc (usage): New function.
-	(main): Allow multiple pids to be passed.  Call usage.
-
-Mon Jul 15 13:07:23 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* Makefile.in (install): If cross compiling, install the
-	cygwin.dll file as $target_alias-cygwin.dll in the bin directory,
-	instead of plain cygin.dll.
-	Install the cygwin.dll file in the library directory as well.
-
-	* configure.in: Test for cross compiling, and if cross compiling,
-	transform name of cygwin.dll file in the binary directory.
-
-	* configure: Regenerate.
-
-	* utils/Makefile.in (Makefile): Rebuild Makefile if configure.in
-	changes.
-	(install): Use the toplevel install.sh to install the utilities,
-	and transform the name if cross compiling.
-
-	* utils/configure.in: Test for cross compiling, and if cross
-	compiling, tranform mount, umount, ps, etc.  Do not call
-	AC_PROG_INSTALL anymore.
-
-	* utils/configure: Regenerate.
-
-Fri Jul 12 16:25:09 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	*  Makefile.in: also make install in utils subdir so "mount"
-	et al gets installed.
-
-Thu Jul 11 17:53:31 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/sys/param.h: fixed value of HZ (now 1000 instead of 100).
-	caused bug that showed up as "time sleep 5" returning 50.
-
-Thu Jul 11 14:08:09 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler.cc: correct typo in comment
-	* exceptions.cc: remove definition of sig_func_ptr, replace
-	occurances with newlib-defined _sig_func_ptr.
-
-Wed Jul 10 19:12:18 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* version.h (CYGWIN_DLL_VERSION_{MAJOR,MINOR}): Bump up to 17.0.
-	* winsup.h (class per_process): New members {public,internal}_reserved.
-	(SIZEOF_PER_PROCESS): Define.
-	* dcrt0.cc (dll_crt0_1): Add sanity check of per_process size.
-	Don't call checkout for forkee.
-	* libccrt0.cc (cygwin_crt0): Set magic_biscuit to sizeof per_process
-	again.
-
-	* utils/ps.cc (main): Print uid.
-
-	* hinfo.h: Deleted.  Contents moved to winsup.h.
-	* Makefile.in (WINSUP_H): Update.
-
-	* dcrt0.cc (u, environ): Moved here.
-	* shared.cc: From here.
-
-	* pinfo.cc (pinfo_init): Renamed from pinfo_init_per_process.
-	All callers updated.
-	* hinfo.cc (hmap_init): Renamed from hmap_init_per_process.
-	All callers updated.
-	* winsup.h (cygwin_parent_p): Renamed from invoked_by_cygwin_p.
-	All uses updated.
-
-	* fork.cc (prepare_child): Add debug message.
-
-	* uinfo.cc (uinfo_init): Renamed from uinfo::init.
-	All callers updated.  Call getlogin instead of GetUserName.
-	(getlogin): Call GetUserName.
-	* winsup.h (class uinfo): Delete.  Members uid,gid moved ...
-	(class pinfo): To here.  All uses updated.
-	(class shared_info): Delete member `u'.
-	* fork.cc (cygwin_fork_helper1): Set child's uid,gid.
-
-	* pinfo.cc (pinfo::clearout): Reset strace_mask_ptr.
-
-	* shared.cc (open_shared_file_map): Add debugging message.
-
-Fri Jul  5 15:36:48 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* exceptions.cc (sig_func_ptr): New typedef.
-	(__stack_trace): Make i386 and ppc formats the same.
-	(sigfunc): Use sig_func_ptr.
-	(call_handler): Likewise.  All callers updated.
-	(__cygwin_exception_handler): Handle exceptions before dll has
-	fully initialized.  Only call dump_status once, like __stack_trace.
-	(really_exit): Call _exit, not exit.
-
-	* hinfo.cc: Add copyright.
-	* uinfo.cc: Likewise.
-
-	* passwd.c: Whitespace cleanup.
-	(search_for): Make static.
-
-	* pinfo.cc (pinfo_list::init): Delete call to clearout vec[0].
-	(pinfo::clearout): Reset more fields.
-	(pinfo_list::get_empty_pinfo): Delete printing of error messages
-	if table is full.
-
-	* shared.cc (open_shared_file_map): Mark shared map as not inherited.
-
-	* signal.cc (signal): Delete (void *) coersion of result.
-	(usleep): Convert microseconds to milliseconds.  Delete second copy.
-	(_raise): Use _sig_func_ptr.
-
-	* syscalls.h: Delete #include mntent.h, sys/types.h, string.h,
-	stdio.h, setjmp.h, stdlib.h, signal.h, sys/strace.h, unistd.h,
-	ctype.h, fcntl.h.
-	* winsup.h: #include sys/types.h, sys/strace.h, setjmp.h, signal.h,
-	string.h, windows.h.
-	* All necessary files updated.
-
-	* winsup.h (class pinfo): Delete member localtime_buf.
-	* times.cc (corelocaltime): Use static local for localtime_buf.
-
-	* winsup.h (class pinfo): Rename the_pid to pid.  All uses updated.
-	Delete handle_valid_p, unused. Rename __sig_mask to sig_mask.
-
-Thu Jul  4 14:36:01 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* shared.h: Deleted.  All files updated.
-	* winsup.h: shared.h contents moved here.
-	* Makefile.in (WINSUP_H): Update.
-
-	* heap.cc: Renamed from pproc.cc.
-	(heap_init): Renamed from per_process::init.
-	In forkee initialization, ensure memory being reserved is at same
-	address as parent's.  Commit forkee memory in one chunk.
-	(_sbrk): Moved here,
-	* syscalls.cc (_sbrk): From here.
-	* Makefile.in (DLL_OFILES): Update.
-	* dcrt0.cc (dll_crt0_1): Call heap_init instead of u->init.
-	* winsup.h (class per_process): Delete member `init'.
-
-	* dcrt0.cc (recur): Delete.
-	(dos_argv_to_unix_argv): Delete.
-
-	* delqueue.cc: Delete #include of delqueue.h, winerror.h
-	* winsup.h: #include delqueue.h.
-
-	* exceptions.cc (ctrl_c_handler): Only require 13 ^c's to quit task.
-
-	* fork.cc (fork_mutex,forkee_stopped,forker_stopped): New static
-	globals, were in class_shared info.
-	(fork_init,fork_terminate): New functions.
-	(prepare_child,cygwin_fork_helper1): Update.
-	(cygwin_fork_helper1): If fork disabled, return EAGAIN.
-	Delete unnecessary resetting of forkee_stopped event.
-	* winsup.h (fork_init,fork_terminate): Declare them.
-	* dcrt0.cc (dll_crt0_1): Call fork_init.
-	(_exit): Call fork_terminate.
-	* shared.c (shared_info::initialize): Delete init of fork stuff.
-
-	* shared.c (h): New static global, was in class shared_info.
-	(shared_info::terminate): Delete, move contents into shared_terminate.
-
-	* strace.cc (flush_p): New static global.
-	(strace_init): Don't clobber u->strace_mask if _STRACE_INHERIT set.
-	(__sys_printf): Only flush buffers if _STRACE_FLUSH.
-	* include/sys/strace.h (_STRACE_FLUSH,_STRACE_INHERIT): Define.
-	Reorganize bitmasks.
-
-	* utils/ps.cc (main): Make output prettier.
-
-Wed Jul  3 12:30:24 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* utils/Makefile.in (mount,umount,ps,kill): Rewrite rules.
-	(PROGS): Add cygwin.
-	(cygwin): New target.
-	(install): Install all of $(PROGS).
-	* utils/cygwin.cc: New file.
-
-	* pinfo.cc (pinfo_init_per_process): PID environment variable handling
-	moved here.  Delete setting of u->parent.  Set strace_mask_ptr.
-	Set invoked_by_cygwin_p appropriately.
-	(vfork_init): Delete, unused.
-	(pinfo::init_self): Delete setting of root_p.
-	(pinfo::terminate): root_p renamed to invoked_by_cygwin_p.
-	* winsup.h (class per_process): Delete initial_pid, no longer used.
-	(class pinfo): Add strace_mask_ptr.
-	* fork.cc (cygwin_fork_helper1): Update.
-
-	* winsup.h (class per_process): Delete trace_file, trace_mutex.
-	Rename estrace to strace_mask.
-	(system_printf): Declare.
-	* strace.cc (strace_init): Renamed from per_process::strace_init.
-	Don't open trace file unless strace environment variable set.
-	Open trace file with FILE_SHARE_READ so others can read trace file
-	while tracing in progress.  Print error if $strace too big.
-	(strace_file, strace_mutex): New static globals.
-	(__sys_printf): Don't do anything if strace file not opened.
-	(system_printf): New function.
-	* pproc.cc (per_process::init): Delete call to strace_init.
-	* dcrt0 (dll_crt0_1): Call strace_init as soon as possible.
-	
-	* dcrt0 (dll_crt0_1): Delete local can_glob, use
-	u->self->invoked_by_cygwin_p instead.
-	Move PID environment variable handling into pinfo_init_per_process.
-	Delete setting of u->self->in_bash.
-	Delete watching for bash.
-	* winsup.h (class pinfo): Delete in_bash.
-
-	* exceptions.cc (*): Call system_printf, not __sys_printf.
-
-	* shared.h (class shared_info): Delete pp, unused.
-
-	* syscalls.cc (isatty): Replace ttyname with is_tty.
-
-	* winsup.h (registry_init_once_only): Delete, unused.
-	(stdout_handle,file_handle_from_fd): Likewise.
-	(CHILD_P,child_p,ALL_FS,loadup_dll,cygwin_s): Likewise.
-	(unmixedcaseify): Prototype moved to path.h.
-	* path.h (unmixedcaseify): Declare.
-
-	* fork.cc (FORK_WAIT_TIMEOUT, WAIT_ERROR_RC): Define.
-	(find_exec_1): Don't search PATH if directory present (not only if
-	absolute path).  Search "." before searching PATH.
-	(copy): Return boolean indicating success.  All callers updated.
-	(prepare_child): Simplify.  Check return code of WaitForSingleObject.
-	Don't wait an infinite amount of time.
-	(cygwin_fork_helper1): Simplify.
-	Check return code of WaitForSingleObject.
-	Don't wait an infinite amount of time.
-	Check return code of copy.
-	Disable code to Suspend/Resume child thread a second time.
-
-	* winsup.h (class per_process): Make initial_sp a char *.
-	* libccrt0.cc (cygwin_crt0): Update.
-
-	* path.cc (path_conv): If name too long, set path to bogus value.
-
-	* include/winkernel.h (WriteProcessMemory): Fix prototype.
-
-	* include/sys/strace.h: Add extern "C" ifdef __cplusplus.
-	(_STRACE): Delete.
-	* dirsearch.cc (rewinddir): Use syscall_printf.
-
-Tue Jul  2 14:44:18 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* wait.cc (WAIT_ERROR_RC): Use it instead of ALL_FS.
-	(wait_found): New argument `options'.  If GetExitCodeProcess fails,
-	ensure `result' contains something reasonable.
-	(wait_for_single): Check whether `c' is NULL before dereferencing it.
-	(wait_for_any): Add some comments.  Delete unnecessary gotos.
-	(waitpid): Print message if called with intpid == 0.
-
-Sat Jun 29 10:49:28 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* dirsearch.cc (readdir): Clean up syscall tracing.
-	Mixed case handling temporarily disabled.
-
-Wed Jun 26 11:54:27 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-	* Makefile.in (bindir, libdir, datadir, infodir, includedir):
-	Use autoconf-set values.
-	(docdir): Removed.
-	(install-info): Add.
-	* configure.in (AC_PREREQ): autoconf 2.5 or higher.
-	* configure: Rebuilt.
-	* glob/configure.in (AC_PREREQ): autoconf 2.5 or higher.
-	* glob/configure: Rebuilt.
-	* utils/Makefile.in (bindir, exec_prefix): Use autoconf-set values.
-	* utils/configure.in (AC_PREREQ): autoconf 2.5 or higher.
-	* utils/configure: Rebuilt.
-
-Tue Jun 25 17:48:56 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* include/sys/param.h (PATH_MAX,MAXPATHLEN): Change from 1024 to 259.
-	(BIG_ENDIAN,LITTLE_ENDIAN,BYTE_ORDER): Define.
-
-Mon Jun 24 16:35:48 1996  Mark Eichin  <eichin@cygnus.com>
-
-	* fhandler.cc (read): Replace the old broken igncr code (which has
-	been disabled for a while anyway) with code that checks for
-	ENABLE_LINE_INPUT and replace only \r\n with \n.
-
-Mon Jun 24 00:12:22 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Convert argv[0] to posix style if necessary.
-
-Sun Jun 23 17:21:41 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* version.h (CYGWIN_DLL_VERSION_MINOR): Bump up to 2.
-
-	* fork.cc (perhaps_suffix): Simplify.
-	(find_exec_1): Likewise.  Always try appending .exe first.
-	(cygwin_fork_helper1): Clean up (lots more needed still).
-	Test for split heap before calling CreateProcess.
-	No longer call find_exec, now done at start up.
-	* dcrt0.cc (dll_crt0_1): Call find_exec to expand argv[0].
-
-	* path.cc (conv_path_list_buf_size): New function.
-	(cygwin32_{win32,posix}_to_{posix,win32}_path_list_buf_size): Ditto.
-	(conv_path_list): Ditto.
-	(cygwin32_{win32,posix}_to_{posix,win32}_path_list): Ditto.
-	* cygwin.din: Export them.
-
-	* misc.c (small_printf): Delete.
-	(vhangup): Set errno.
-
-	* syscalls.cc (isatty): Print syscall trace message even if error.
-
-	* console.cc (*): Check return codes of win32 api calls.
-
-	* syscalls.cc (chmod): Set errno of SetFileAttributes fails.
-	Fix call to syscall_printf.
-
-Thu Jun 20 00:43:52 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Save full program name.
-	* fork.cc (cygwin_fork_helper1): Always call find_exec.
-
-	* path.cc (normalize_{posix,win32}_path): Fix edge case handling.
-	(path_conv::path_conv): Ensure path is \-ified if win32 path rules.
-
-	* spawn.cc (spawn_guts): Set errno if CreateProcess fails.
-
-Wed Jun 19 00:18:03 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* path.h (PATH_RULES macros): Delete.  Use ones in unistd.h.
-	(enum path_rules_enum): Deleted.  All uses updated.
-	(path_conv): Rename member get_native to get_win32.  All uses updated.
-	(*win32_path*): Renamed from *native_path*.
-	* path.cc (*win32_path*): Renamed from *native_path*.
-	(mount_info::posix_path_p): Prepend '_' to PATH_RULES.
-	Fix returning of cached value.
-	(slash_drive_prefix_p, build_slash_drive_prefix): New functions.
-	(mount_info::posix_path_to_win32_path): /.<letter>. is a drive spec.
-	(path_conv::path_conv): Likewise.
-	(mount_info::win32_path_to_posix_path): Convert unknown drives to
-	/.<letter>.  Normalize win32_path.
-	(normalize_win32_path): New functions.
-	(getcwd_inner): New arg `posix_p'.  All callers updated.
-	* shared.cc (shared_info::initialize): Prepend '_' to PATH_RULES.
-	_PATH_RULES_NATIVE -> _PATH_RULES_WIN32.
-	* spawn.cc (*win32_path*): Renamed from *native_path*.
-	* dcrt0.cc: Likewise.
-	* cygwin.din: Likewise.
-
-	* Makefile.in (WINSUP_H): Add shared.h
-
-	* smallprint.c (rn): Make static.
-
-	* sysconf.cc: Renamed from sysconf.c.
-	(sysconf): Support _SC_PATH_RULES.
-
-	* screen.c: Deleted.
-	* Makefile.in (DLL_OFILES): Delete screen.o.
-
-	* fork.cc (cygwin_fork_helper): Don't pass 0 from longjmp to setjmp.
-
-	* path.h (class mount_info): Update posix_path_to_native_path member.
-	* path.cc (path_prefix_p): Rewrite.
-	New arg `len'.  All callers updated.
-	(mount_info::binary_native_path_p): Call path_prefix_p.
-	(path_conv::path_conv): Pass full_path to binary_native_path_p.
-	(mount_info::posix_path_to_native_path): Delete arg keep_rel_p.
-	New arg full_native_path.  All callers updated.  Don't call
-	getcwd_inner if unnecessary.  Rewrite relative path handling.
-	(mount_info::native_path_to_posix_path): Call path_prefix_p.
-	Call slashify on `pathbuf', not original argument.
-
-	* syscalls.cc (chdir): Fix lifetime of converted path.
-
-Tue Jun 18 11:48:51 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* configure.in (EXE_LDFLAGS): Explicitly link with newlib if necessary.
-	* configure: Regenerated.
-	* Makefile.in (EXE_LDFLAGS): Define.
-	(FLAGS_TO_PASS): Add EXE_LDFLAGS.
-	(config.status): New target.
-	(utils-all): Depend on $(LIBNAME).
-	* utils/Makefile.in (EXE_LDFLAGS): Define.
-	(mount,umount,ps,kill): Link with $(EXE_LDFLAGS).
-
-	* version.h (CYGWIN_DLL_VERSION_MINOR): Bump up to 1.
-
-Mon Jun 17 18:29:54 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	Improve pathname handling, first pass.
-	* path.h (symlink): Renamed from link_cookie.
-	(class path_conv): New member error.
-	(path_conv::get_native): Renamed from get_dos, all uses updated.
-	(path_conv::get_binary): Delete.
-	(mount_info::{mangle,reverse_mangle}): Delete.
-	(mount_item::posix_path_to_native_path): Renamed from mangle.
-	(mount_info::native_path_to_posix_path): Renamed from reverse_mangle.
-	(path_rules_enum): Define.
-	* path.cc: Temporarily disable mixed-case and symlink handling.
-	(mount_info::posix_path_p): New function.
-	(mount_info::binary_native_path_p): Renamed from binary_dos_path_p.
-	(path_conv::path_conv): Handle native path rules.
-	(mount_item::{mangle,reverse_mangle}): Delete.
-	(mount_info::posix_path_to_native_path): Renamed from mangle.
-	(mount_info::native_path_to_posix_path): Renamed from reverse_mangle.
-	(mount_info::from_registry): Set nmounts.  Use MAX_PATH.
-	(mount_info::{add,del}_item): Rewrite.
-	(slashify): Renamed from flip_slash.
-	(getcwd_inner): Make static.  Don't convert to posix path if using
-	native path rules.
-	(file_exists): Delete.
-	(addmntent,hasmntopt): Delete.
-	(mount): Only update registry if mount succeeded.
-	(umount): Only update registry if umount succeeded.
-	(normalize_posix_path): Renamed from normalize_path.  Pass in cwd.
-	(cygwin32_{posix,native}_path_to_{native,posix}_path_keep_rel): Renamed
-	from ...{unix/dos}....
-	* dcrt0.cc (dos_argv_to_unix_argv): #ifdef out.
-	(dll_crt0_1): Don't call it.
-	* fhandler.cc (fhandler_base::open): Temporarily disable symlinks.
-	* shared.cc (open_shared_file_map): New function.
-	(shared_init): Call it.
-	(shared_info::initialize): Fetch `path_rules' from registry.
-	* shared.h (inited): Make private.
-	(path_rules): New member.
-	* spawn.cc: #include "shared.h".
-	(spawn_guts, env var translation): Don't translate path names if
-	using native path rules.
-	* syscalls.cc (symlink): Delete (moved to path.cc).
-	* cygwin.din (dump__5pinfo): Delete.
-	(cygwin32_{posix,native}_path_to_{native,posix}_path_keep_rel): Renamed
-	from ...{unix/dos}....
-
-	* smallout.cc: Delete.
-	* sdata.cc: Delete.
-	* shared.cc (u,s,environ): Define here.
-	* Makefile.in (glob/libglob.a): Depend on glob/glob.c, glob/fnmatch.c.
-	(utils-all): New target.
-	(DLL_OFILES): Delete smallout.o, sdata.o.
-	(Makefile): Depend on cygwin.din.
-	(WINSUP_H): Depend on syscalls.h.
-
-	* configure.in (AC_CONFIG_SUBDIRS): Add bin.
-	(AC_PROG_INSTALL): Call.
-	* configure: Regenerated.
-	* utils/{Makefile.in,configure.in,configure}: New files.
-	* utils/{kill.cc,mount.cc,ps.cc,umount.cc,termcap}: New files.
-	* Makefile.in (UTILS_ALL): Define.
-	(all): Depend on $(UTILS_ALL).
-	(utils-all): New target.
-
-	* dcrt0.cc (recur): Make no-op to see what happens.
-	(globify): Don't call glob if unnecessary.
-	Check return code from glob.
-	(api_fatal): New function.
-	* fhandler.cc (fhandler_base::read): Dump first few chars read.
-	(fhandler_base::get_execable): New function.
-	(fhandler_base::fstat): Use it.
-	(fhandler_base::fhandler_base): Init execable_p.
-	(fhandler_disk_file::fhandler_disk_file): Delete execable_p.
-	(fhandler::{get,set}_execable_bit): Delete.
-	(fhandler_disk_file::{get,set}_execable_bit): Delete.
-	* fhandler.h (class fhandler): Delete {get,set}_execable_bit.
-	(class fhandler_base): New member execable_p.
-	New member fn get_execable.
-	* fork.cc: Simplify/cleanup.
-	(cygwin_fork_helper1): Use MAX_PATH, not MAXPATHLEN.
-	* pinfo.cc (pinfo::dump): Delete.
-	* pproc.cc (per_process::set_envname): Delete.
-	* strace.cc (smallout::do_pline): Delete.
-	* syscalls.h (readlink): Third arg is an int.
-	* winsup.h (class pinfo, member progname): Use MAX_PATH.
-	(class pinfo, member dump): Delete.
-	(class smallout): Delete.
-	(smallout): Delete.
-	(class per_process, member set_envname): Delete.
-	(file_exists): Delete.
-	(api_fatal): Declare.
-	* Makefile.in (LIB{C,CXX}FLAGS_FOR_TARGET): Delete, use {C,CXX}FLAGS.
-	(FLAGS_TO_PASS): Define.
-	(glob/libglob.a): Delete duplicate entry.
-
-	* syscalls.cc (_sbrk): Update u->size when heap is grown.
-
-	* hinfo.cc (hmap_init_per_process): Ensure stdout's handle != stderr's.
-
-Fri Jun 14 06:32:13 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* register.h, registry.cc: Whitespace cleanup.
-
-Thu Jun 13 20:57:28 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* Makefile.in (install): Install cygwin.dll in $(bindir).
-
-Tue Jun 11 13:46:17 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler.cc: lseek is now only binary mode, interpret control
-	z characters as EOF when reading from a file.  Reformatted some
-	of the code (cleaned up line spacing, etc.)
-
-Tue Jun 11 09:50:09 1996  Jason Molenda  (crash@kyriath.cygnus.com)
-
-	* path.cc (nofinalslash): move it so it is next to its friends
-	flip_slash and backslashify.
-
-Mon Jun 10 18:57:03 1996  Jason Molenda  (crash@kyriath.cygnus.com)
-
-	* path.cc (*): Pretty printing.
-	(unix_path_to_dos_path_with_rel): use "dosnamein" and "unixnameout"
-	instead of "path" & "real_path".
-	(dos_path_to_unix_path_keep_rel): delete obsolete code.
-	(mount_item::mangle): use "unixnamein" and "dosnameout" instead of
-	"unixname" and "dosname".
-	(mount_info::mangle): use "unixnamein" and "dosnameout".  Remove
-	obsolete code.
-	* path.h (mount_item): Update prototypes, add comment.
-	(mount_info): Update prototypes.
-
-Mon Jun 10 17:05:23 1996  Jason Molenda  (crash@kyriath.cygnus.com)
-
-	* path.cc (mount_item::reverse_mangle): Pretty printing,
-	add a bit to the comment.
-	(getcwd_inner): use MAX_PATH not MAXPATHLEN.
-	(normalize_path): use MAX_PATH not MAXPATHLEN.
-	(link_cookie::follow): use MAX_PATH not MAXPATHLEN.
-
-Mon Jun 10 15:36:32 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: changed $(DOC) so it doesn't include html
-	files; made a new info-html target that does the html
-	versions of the docs.  Since most customers don't have texi2html
-	installed, the make shouldn't fail because of this.
-	* configure: regenerated with autoconf 2.8
-
-Sun Jun  9 17:10:37 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* version.c: Deleted.
-	* version.h: New file.
-	* winsup.h (VERSION): Deleted.
-	(class per_process): Add version_major, version_minor.  Delete version.
-	* registry.cc: #include "version.h".
-	(reg_session::reg_session): Update.
-	* libccrt0.cc: #include "version.h"
-	(cygwin_crt0): Delete setting of version, set magic_biscuit to 0.
-	Set version_major, version_minor.
-	* dcrt0.cc: #include "version.h".
-	(cygwin_dll_version_{major,minor}): New static locals.
-	(dll_crt0_1): Rewrite app/dll compatibility test.
-	* Makefile.in (LIBCOS): Delete version.o.
-	(DLL_OFILES): Delete version.o.
-	(dcrt0.o,libccrt0.o,registry.o): Depend on version.h.
-
-	* exceptions.h: New file.
-	* exceptions.cc: Massive cleanups (still lots more to go).
-	#include "exceptions.h".
-	(init_exceptions): Renamed from __init_exceptions.  New argument of
-	pointer to exception handler list entry.
-	(init_exception_handler): Renamed from init_thread_exceptions.
-	Rewrite based on info from Onno Hovers <onno@stack.urc.tue.nl>.
-	(ppc descriptor_to_{function,gotattr}): Make static.
-	(i386 __stack_trace): Fix test for top of stack.
-	* dcrt0.cc: #include "exceptions.h".
-	(dll_crt0_1): Exception handler list entry must live on stack.
-	* winsup.h (class pinfo): Delete member myp.
-	* syscalls.h (struct exception_list): Delete.
-	(__really_exit, __init_exceptions): Delete.
-	* Makefile.in (dcrt0.o,exceptions.o): Depend on exceptions.h.
-
-Fri Jun  7 17:49:28 1996  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* dcrt0.cc (conv_path_names): Add GCC_EXEC_PREFIX.
-
-Fri Jun  7 14:38:05 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* Makefile.in (CC_FOR_TARGET,LD,DLLTOOL): Define.
-	(AR,RANLIB): Set via configure.
-	* configure.in (AR,LD,DLLTOOL): Set.
-	(AC_PROG_RANLIB): Call.
-	* configure: Regenerated.
-
-Thu Jun  6 12:11:23 1996  Kim Knuttila  <krk@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Removed reference to reent_data._next.
-
-Tue Jun  4 15:52:29 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/winkernel.h: fixed typo
-
-Tue May 28 13:08:25 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* syscalls.cc (_sbrk): Fix test of return value from VirtualAlloc.
-	Delete lincr, make incr signed, and use only it.  Misc. minor cleanup.
-
-Thu May 23 17:31:57 1996  Geoffrey Noer  <noer@cygnus.com>
-
-	sac diffs applied:
-	* path.h: change MAXMOUNTS to 30 instead of 20
-	* sysdef/i386/rpcndr.def: add "none" to end of file
-	* fhandler.cc: fix memset call to say sizeof (*buf) instead
-	of sizeof (buf).
-	* include/winuser.h: define MDIS_ALLCHILDSTYLES
-	* Makefile.in: entry to build glob/libglob.a:
-
-Thu May 23 10:38:43 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* fhandler.h (class fhandler_base): Make `name' private and shrink
-	to 32 bytes.
-	(set_name): Declare.
-	* fhandler.cc (fhandler::set_name): New function.
-	(fhander_base::open): Call it.
-	(fhander_base::init): Call it.
-	(fhandler_tty::ttyname): Call get_name instead of accessing `name'
-	directly.
-
-	* dcrt0.cc (dll_crt0_1): Call ExitProcess instead of exit if
-	DLL and APP are out of sync.
-
-Thu May 16 03:07:18 1996  Mark Eichin  <eichin@cygnus.com>
-
-	* fhandler.cc (FakeReadFile): new function. Interface like
-	ReadFile, only called from fhandler_console_in::read, calls
-	ReadFile unless we're really reading from STD_INPUT_HANDLE and
-	with ENABLE_LINE_INPUT turned off, in which case we use
-	ReadConsoleInput instead. When using ReadConsoleInput, always read
-	all available events, but only block if we don't get at least one
-	actual character. This would be the place to implement FIONBIO on
-	the console tty, which doesn't actually exist yet.
-	(dbg_input_event): copied from select.cc, debugging code to show
-	detail of what events we're actually getting.
-	(ioctl): off-by-one on window size.
-
-Wed May 15 18:11:16 1996  Jim Wilson  <wilson@chestnut.cygnus.com>
-
-	* fhandler.h (class fhandler_base): Use MAXPATHLEN not 100 for size
-	of array name.
-
-Wed May 15 11:14:46 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* fork.cc (cygwin_fork_helper1): More debugging printf's.
-
-	* dcrt0.cc (num_ms_env_vars): Renamed from ms_env_arity.
-	(build_argv): Renamed from fill.
-	(compute_argc): Renamed from prepare.
-	* libccrt0.cc (cygwin_statu): Make static.
-	* pproc.cc (per_process::init): Move strace initialization from here,
-	* strace.cc (per_process::strace_init): To here.
-	Pass FILE_SHARE_WRITE to CreateFileA.  Print error message if open
-	of log file fails.  Create mutex for trace messages.
-	(__sys_printf): Always write to end of disk files.  Use mutex.
-	(d): Delete.
-	* winsup.h (class per_process): Add strace_init.  Reorganize.
-	`run_ctors' renamed to `run_ctors_p'.  New member `trace_mutex'.
-	(d): Delete.
-	(PATH_MAX): Delete.
-
-	* Makefile.in: Add header file dependencies.
-
-	* dcrt0.cc (_exit): Add debugging printf.
-	* shared.h (class shared_info): Rename member mutex_a to fork_mutex.
-	* fork.cc (cygwin_fork_helper1): Update.
-	Return with error if process slot unavailable.
-	Set errno and release fork_mutex if failed because of split heap.
-	* shared.cc (shared_info::terminate): Update.
-	(shared_info::initialize): Update.
-
-Tue May 14 14:59:32 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* fork.cc (cygwin_fork_helper1): Avoid SIGSEGV if allocate_pid fails.
-
-	* pproc.cc (per_process::init): Fix test.
-
-	* winsup.h (): Rename member `parent' to `ppid'.
-	* fork.cc (prepare_child): Update.
-	(cygwin_fork_helper1): Likewise.
-	* hinfo.cc (hmap_init_per_process): Likewise.
-	(hinfo_vec::dup_for_fork): Fix message.
-	(hinfo_vec::dup2): Fix args to debug_printf.  Delete extra printf's.
-	* pinfo.cc (pinfo_init_per_process): Update.
-	(pinfo::dump): Likewise.
-	(pinfo::init_self): Likewise.
-	* pproc.cc (per_process::init): Open strace file in append mode.
-	* smallprintf.c (__small_vsprintf): Support %p.
-	* syscalls.cc (getppid): Update.
-	* wait.cc (wait_for_any): Likewise.
-	
-Mon May 13 13:45:36 1996  Mark Eichin  <eichin@cygnus.com>
-
-	* fhandler.cc (ioctl): fix TIOCGWINSZ handling: (1) check the
-	error return (2) if we're trying on STD_INPUT_HANDLE, substitute
-	STD_OUTPUT_HANDLE since GetConsoleScreenBufferInfo only works on
-	console output (3) check srWindow for the *screen* size, instead
-	of checking dwSize for the scroll buffer size.
-
-	* include/sys/errno.h (ECONNABORTED): add another errno value.
-	* net.cc (errmap): add ECONNABORTED case.
-
-	* fhandler.cc (fstat): clear the *entire* stat buf, not just the
-	first four bytes.
-
-Fri May 10 17:59:09 1996  Mark Eichin  <eichin@cygnus.com>
-
-	* select.cc: change most debugging statements to select_printf.
- 	(dbg_input_event): new function, prints an INPUT_RECORD via select
- 	printf.
-	(polled): Don't sleep around WaitForMultipleObjects; let it have a
- 	10ms timeout until we have time to test it with 0.  If
- 	WaitForMultipleObjects says that STD_INPUT_HANDLE has data, use
- 	PeekConsoleInput to scan the available events. If the first one is
- 	not a *bKeyDown* with a non-zero *AsciiChar* then use
- 	ReadConsoleInput to rip it off the queue, and pretend it wasn't
- 	there, so that later calls to read (and thus ReadFile) don't block
- 	because they can't find any *real* input. (This could be optimized
-	later to check the whole queue, and if there are *no* real input
-	events, nuke them all.)
-
-	* include/sys/strace.h (_STRACE_SELECT, select_printf): new printf
-	category, because select needs a *lot* of work. STRACE=256 to use it.
-
-	* fhandler.cc (fhandler_console_in::init): IGNCR can't work
- 	without major changes to deal with the interaction with select
- 	(which shouldn't wake up if IGNCR causes the whole input to be
- 	deleted...) so don't make it the default.
-	(fhandler_console_out::tcgetattr, fhandler_tty::tcgetattr): don't
- 	set IGNCR based on get_r_binary either.
-
-Wed May  8 20:20:05 1996  Mark Eichin  <eichin@cygnus.com>
-
-	* times.cc (__to_clock_t): must cast dwLowDateTime to *unsigned*
-	before adding it -- otherwise we may subtract it!
-	(to_time_t): same.
-
-Wed May  8 18:21:28 1996  Mark Eichin  <eichin@cygnus.com>
-
-	* times.cc (corelocaltime): new function. Basic localtime from
-	newlib, with no conversions.
-	(gmtime): just calls corelocaltime.
-	(localtime): uses GetTimeZoneInformation, biases to standard time
-	first, then uses DaylightDate and StandardDate to figure out if
-	we're in DST -- and calls corelocaltime a second time with the
-	rebiased seconds, if we are.
-	(times): add debug_printf statements which work around apparent
-	compiler bug and 7+ minute error.
-
-	* select.cc: revert to <sac>'s changes of 4/20 which were
-	accidentally backed out on 4/24.
-
-Tue May  7 05:29:42 1996  Mark Eichin  <eichin@cygnus.com>
-
-	* times.cc (__to_clock_t): subtract out FACTOR, the difference
-	between 1601 and 1970, just like to_time_t() does.
-
-Tue May  7 01:55:06 1996  Mark Eichin  <eichin@cygnus.com>
-
-	* times.cc (gmtime): new function. Use GetTimeZoneInformation to
-	compensate ahead before calling localtime (since the newlib
-	version doesn't know what timezone we're in.)
-	(localtime): use SECSPERMIN, not 60, to show that we know what
-	we're talking about.
-
-	* net.cc (errmap): add WSAEADDRINUSE, WSAECONNREFUSED mappings.
-
-Sun May  5 00:45:59 1996  Mark Eichin  <eichin@cygnus.com>
-
-	* include/sys/socket.h: add recvfrom macro and cygwin32_recvfrom
-	declaration. Remove htons/htonl misdeclarations as they collide
-	with the macros in asm/byteorder.h.
-
-	* include/asm/byteorder.h: enable the ntohl/ntohs declarations so
-	we at least get the macro versions when we optimize, even if the
-	library hooks aren't there.
-
-Wed Apr 24 23:42:49 1996  Steve Chamberlain  <sac@dilithium.transmeta.com>
-
-	* winsup.h (pinfo, pinfo_list): Remove dummy item.	
-	* fork.cc (*): Revert changes of Apr 2.
-
-Sun Apr 21 17:00:14 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* wait.cc (wait_for_any): Fix the wait heuristic.
-
-Sat Apr 20 13:22:03 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* Makefile.in (.cc.o): Pass -fno-rtti.
-	* dcrt0.cc (globify): A single match is ok.
-	* exceptions.cc (i386 call_handler): optimize.
-	* fhandler.cc (fhandler_console_in::read): Handle ICRNL right.
-	(*:get_name *:always_ready): New.
-	* select.cc: Understand that console output doesn't signal when it's
-	ready.
-
-Fri Apr 12 14:49:34 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* Makefile.in (glob/libglob.a): Pass -I so glob.c finds right dirent.h.
-
-Wed Apr 10 16:13:30 1996  steve chamberlain  <sac@slash.cygnus.com>
-
-	* Makefile.in (glob/libglob.a): Call glob makefile correctly.
-	* winsup.h (pinfo, pinfo_list): Reorder elements to avoid
-	alignment bug in PPC gcc.
-	
-Tue Apr  9 17:23:57 1996  steve chamberlain  <sac@slash.cygnus.com>
-
-	* dcrt0.cc (globify): Expand command line wildcards if
-	run from dos prompt.
-
-	* exceptions.cc (386 call_handler): More fumblings.
-	* fhandler.cc (fhandler_base::stat): Initialize ino.
-	(fhandler_console::open): Fix test for RDONLY.
-	(fhandler_tty::stat): Set ino.
-	(fhandler_console_out::vt100 stuff): More.
-	* fork.cc: Lint.
-	* pinfo.cc (pinfo::init_self): Don't bother to DuplicateHandles
-	to get process info.
-	* signal.cc (usleep): Get correct order of magnitude.
-	* spawn.cc (spawn_guts): Turn of exception handling in 
-	parent of thing which execs.
-	* syscalls.cc (stat): Look for <file> and <file.exe>.
-	* wait.cc (wait_for_any): Keep waiting if WaitForMultipleObject
-	returns invalid result.
-
-Tue Apr  2 12:45:35 1996  steve chamberlain  <sac@slash.cygnus.com>
-
-	* dcrt0.cc (conv_path_names): Add HOME.
-	(dll_crt0_1): Use u->self->head_sp.
-	* exceptions.cc (i386 call_handler): Rewritten, now almost works
-	on win95.
-	* fhandler.cc (fhandler_base::open): Calculate namehash.
-	(fhandler_base::fstat): ^ name hash with file index low.
-	* fork.cc (*): forkee/forkerr events moved from sinfo
-	into pinfo.
-
-Fri Mar 29 16:35:02 1996  steve chamberlain  <sac@slash.cygnus.com>
-
-	* libcmain.cc: New.
-	* winsup.h: restore and myp moved from per_process to pinfo class.
-	* dcrt0.cc (dll_crt0_1): Cope with move.
-	* exceptions.cc (init_thread_exceptions): Ditto.
-	* signal.cc (sigprocmask): Ditto.
-	* fork.cc (cygwin_fork_helper1): Don't fork if split_heap_p.
-	* pinfo.cc (pinfo::clearout): Zero split_heap_p.
-	* syscalls.cc (_sbrk): Cope with not being able to
-	allocate contiguous chunks.
-	
-
-Tue Mar 26 09:14:32 1996  steve chamberlain  <sac@slash.cygnus.com>
-
-	* exceptions.cc (__cygwin_exception_handler): re-export.
-
-Fri Mar 22 16:49:29 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* cygwin.din (__stack_trace): Export.
-	(__cygwin_exception_handler): Ditto.
-
-	* exceptions.cc (i386 exception handling): Move under appropriate
-	x86 #ifdefs.  Use the macro HAVE_INIT_THREAD_EXCEPTIONS to be
-	whatever a machine needs to do to initialize exceptions in this
-	thread.  Nop for the PowerPC right now.
-	(__stack_trace): Make it a "C" function so there is no name
-	mangling, and export it.
-	(call_handler): Split by architecture before the function, rather
-	than inside it.  First stab at PowerPC exception handling.
-	(__cygwin_exception_handler): Rename from ehandler3, and export
-	it.  Add more status -> signal mappings.
-	(ctrl_c_handler, CTRL_LOGOFF_EVENT): Map to SIGHUP, not SIGQUIT.
-	(__stack_trace): Split into separate machine dependent functions,
-	rather than #ifdef'ing inside of a common function.  Make the
-	PowerPC messages clearer.
-
-Mon Mar 18 13:27:05 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* include/winkernel.h (CreateThread): Correctly declare function
-	pointer argument.
-
-	* misc.c (wprintf): Convert to use vprintf and fix warnings.
-	(tgetent): Declare to return int to fix warnings.
-	(vhangup): Declare to return int to fix warnings.  Return -1 also.
-
-	* include/winbase.h (UnhandledExceptionFilter): Declare.
-
-Tue Mar 12 12:56:28 1996  Doug Evans  <dje@charmed.cygnus.com>
-
-	* include/winkernel.h (FlushFileBuffers): Declare.
-
-Tue Mar 12 11:16:32 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* exceptions.cc (dump_status): Make columns line up for PowerPC.
-	(call_handler): Right now, call exit(255) for the PowerPC.
-
-	* strace.cc (__sys_printf): Call FlushFileBuffers after writing
-	out the file to make sure it really gets flushed.
-
-	* include/winkernel.h (PowerPC CONTEXT): Add fields returned if
-	CONTEXT_DEBUG_REGISTERS is set.
-
-Sun Mar 10 15:31:17 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* strerror.cc, syslog.cc, net.cc: New files.
-	* cygwin.din: Add new net functions.
-	* dcrt0.cc (dll_crt0_1): Fix call to build argv[0].
-	* fhandler.cc (fhandler_base::open): Tidy.
-	* fhandler.h: Add net classes.
-	* hinfo.cc (hinfo_vec::build_fhandler): Add tape stuff.
-	* path.cc (*::mangle, *::reverse_mangle): Fix.
-	(mount_info::init): No trailing / now.
-	* select.cc (*): Rewrite.
-	* spawn.cc (spawn_guts): Fix leak.
-	* syscalls.cc (_sbrk): Keep working until memory really fills up.
-
-Tue Feb 20 16:53:24 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Get version from the header.
-	* fhandler.cc (CHUNK_SIZE): New.
-	(fhandler_base::read, fhandler_base::write): CRLF conversion
-	rewritten.
-	path.cc (path_conv::path_conv): Initialize mixed, binary and silent.
-	* smallprint.c (__small_vsprintf): Add 'c' option.
-	* wait.cc (wait_found): Close child handles.
-	
-Mon Feb 19 09:11:57 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* Makefile.in (real-headers): Eliminate real-headers dependency on
-	mspatches/*.patch, since you can't be guaranteed that it exists.
-
-Fri Feb 16 14:24:47 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* exceptions.cc (dump_status): On the PowerPC, dump all of the
-	integer registers.
-
-	* uname.c (uname): Don't assume that the only two NT systems are
-	i386 and PowerPC.
-	* exceptions.cc (call_handler): Ditto.
-	(dump_status): Ditto.
-
-Thu Feb 15 18:20:33 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* cygwin.din (__empty): Add.
-	* dcrt0.cc (dos_argv_to_unix_argv): New.
-	(check, onetimecheck): New.
-	* exceptions.cc (ehandler3): Always show backtrace
-	if exception failed.
-	* fhandler.cc (*::open): Removed dos_path argument.  
-	(fhandler_base::fstat): Use nFileIndexLow as the inode
-	value.
-	* hinfo.cc (init_std_file_from_handle): Don't default
-	to binary.
-	* paths.cc (*): Use new registry classes.
-	* registry.cc (*): Rewritten.
-	* syscalls.cc (open): Call fhandler->open without
-	the dos filename arg.
-
-Sat Feb 10 08:18:45 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* configure.in (ALLOCA for powerpc): Add __allocate_stack.
-
-Wed Feb  7 16:41:18 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	Release-B13
-
-	* malloc.cc (export_*): New.  Changed the way that malloc
-	stubs are used.
-	* cygwin.din: Export the export_* stuff as malloc, realloc and free.
-	* path.cc (link_cookie::create): Keep cookie filenames in unix
-	format.
-	(reverse_mangle): Clean up.
-	(readlink): Ditto.
-	(qfunc): Sort by name too.
-	* spawn.cc (spawn_guts): Handle zero length arg.
-	Only set errno when it's not 0.
-	* Makefile.in: Build new doc.
-	* fhandler.cc (fhandler_base::fstat): Round up block used.
-	* path.cc (escape_char): Now it's ^.
-	* syscalls.cc (errmap): ERROR_INVALID_NAME yields ENOENT.
-	(chown): Returns 0.
-	(sbrk): Clean up.
-	(_unlink): Only try and DeleteFile once.
-	
-Mon Feb  5 19:15:44 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* dcrt0.cc  (dll_crt0_1): Build env string into static buffer.
-	* dirsearch.c (opendir): Stat on unix pathname.
-	* paths.cc (*): Support for mixed case filenames.
-
-Sun Feb  4 15:55:58 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* *.cc: Lint.
-	(conv_path_names): New.
-	(dll_crt0_1): Use conv_path_names list.
-	* fctnl.cc (F_DUPFD): Look from the fd forward.
-	* fhandler.cc (fhandler_base::open): Understand binary modes.
-	(fhandler_console_in::init): Call tcsetattr with reasonable start
-	values.
-	* spawn.cc (spawn_guts): Use conv_path_names.
-	(queue_file_deletion): Deleted.
-	(unlink): Use new queue file stuff.
-	* delqueue.cc, delqueue.h: New files.
-	* shared.h: New file.
-
-Wed Jan 31 11:12:24 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* crt0.cc: Hacks to probe out ppc stack.
-	* exceptions.cc (ehander3): Don't use 386 context info on the ppc.
-	* path.cc (mount_info::mangle): Turn /usi or /usp into /usr.
-	* uname.c (uname): Change sysname and get ppc name right.
-
-Fri Jan 26 15:47:31 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* pproc.cc (per_process::init): Cope when no memory is needed.
-	* Makefile.in, configure.in: Cope with config directory.
-	* setjmp.c, longjmp.c: Moved into config/i386.
-	* config/ppc/setjmp.S, config/ppc/longjmp.S: New.
-	
-Fri Jan 26 14:57:33 1996  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* Makefile.in (DLL_OFILES): removed ppc-stub.o
-	ppc-stub.c: Removed.
-	configure: regenerated with autoconf 2.7.
-
-Fri Jan 26 11:18:07 1996  Kim Knuttila  <krk@cygnus.com>
-
-	* Makefile.in (DLL_OFILES): added ppc-stub.o
-
-Thu Jan 25 09:33:24 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* malloc.cc (malloc, free, realloc): Hack for ppc.
-
-Wed Jan 24 20:22:42 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* cygwin.dll (loadup_dll): Remove.
-	* dcrt0.cc: lint.
-	* fhandler.* (*): Move to new class structure.
-	* hinfo.cc: Use new fhandler glue.
-	* libcfork.cc: Cope with ppc naming convention.
-
-Mon Jan 22 10:33:53 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* fhandler.h, hinfo.h: New files.
-	* winsup.h: Split from here.
-	* configure.in: Set i386 entry point correctly.
-	* fhandler.cc (fhandler_normal:open): .com files
-	are executable too.
-	* hinfo.cc (init_std_file_from_handle): Inspect
-	master_fmode_binary.
-	* misc.cc (wcscmp,  wcslen): New.
-	* dcrt0.cc (probe): Change way a forkee's stack is allocated.
-	* pproc.cc (per_process::init): Initialize using heap chunk.
-	* shared.cc (shared_info::initialize): Initialize heap chunk.
-	* syscalls.cc (_sbrk): If current chunk is used, allocate another.
-	* wait.cc (wait_found): Fix exit code.
-	
-Thu Jan 18 10:09:45 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* fhandler.cc (fhandler_normal::open) Don't test a
-	com port to see if it's executable.
-	* configure.in, cygwin.din: More powerpc configury.
-
-Wed Jan 17 16:25:36 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* configure.in, Makefile.in: Build powerpc stuff.
-	* hinfo.cc (build_fhandler): Use new with placement.
-	(fhandler::operator new): New.
-
-Wed Jan  3 18:18:57 1996  steve chamberlain  <sac@slash.cygnus.com>
-
-	* select.cc: New file.
-	* Makefile.in: Cope with it.
-
-Tue Jan  2 08:58:58 1996  steve chamberlain  <sac@slash.cygnus.com>
-
-	* version.c: New file.
-	* Makefile.in: Cope with it.
-	* cygwin.def (setgrent, cuserid, setpgrp, mount, setmntent, endmntent, umount): New.
-	* dcrt0.cc:  Remove obsolete vfork stuff.
-	(dll_crt0): Change way environ is built.  Check that app is built
-	with correct version of dll.
-	* dirsearch.cc, exceptions.cc: Lint.
-	* fhandler.cc: Lint. Most of termios.c moved into here.
-	(fhandler_console:*): New.
-	* hinfo.cc (hinfo_vec::init_std_file_from_handle):  Open stdfiles as consoles
-	if possible.
-	* libccrt0.cc: Lint.
-	* malloc.cc: More comments.
-	* path.cc (*):  Cope with mount handling.
-	* registry.cc: Lint. 
-	(reg_session): New.
-	* shared.cc: Lint.
-	* signal.cc (usleep): New.
-	* spawn.cc: Lint.  Removed vfork stuff.
-	* stubs.c (getmntent, endgrent): Deleted.
-	* syscalls.c (__seterrno): Now takes arguments.
-	* termios.c: Much moved info fhandler.c	
-	* times.cc (utime, utimes): New.
-	* uinfo.c (cuserid): New.
diff --git a/winsup/cygwin/ChangeLog-1997 b/winsup/cygwin/ChangeLog-1997
deleted file mode 100644
index 7a5c0b3a4..000000000
--- a/winsup/cygwin/ChangeLog-1997
+++ /dev/null
@@ -1,2800 +0,0 @@
-Wed Dec 31 15:00:32 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* hinfo.cc (hinfo_vec::find_unused_handle): correct
-	previous patch -- need to fix up vec[i].h pointers
-
-Wed Dec 31 14:13:22 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* regexp/Makefile.in (tooldir): New variable.
-	(install): Install regexp.h.
-
-Tue Dec 30 19:52:46 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* net.cc (inet_netof): New function.
-	(inet_makeaddr): New function.
-	* cygwin.din: Export inet_netof and inet_makeaddr.
-
-Tue Dec 23 17:45:07 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* path.cc (current_directory_name): New static variable.
-	(current_directory_posix_name): New static variable.
-	(getcwd_inner): Cache the directory name.
-	(chdir): Move here from syscalls.cc.  Clear directory cache
-	variables.
-	* syscalls.cc (chdir): Remove; now in path.cc.
-
-	* environ.cc (setenv): Add cast to avoid warning.
-
-	* security.cc (get_file_attribute): Make file parameter a pointer
-	to const char.
-	(set_file_attribute): Likewise.
-	* winsup.c (get_file_attribute): Update declaration.
-	(set_file_attribute): Likewise.
-
-	* path.cc (path_conv): Don't pass the root directory to
-	symlink_check_one.
-
-Mon Dec 22 16:34:40 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* path.cc (realpath): Use path_conv to resolve symlinks.
-
-	* path.cc (path_conv::path_conv): Rewrite completely to convert to
-	win32 path first and then check for symlinks element by element.
-	(symlink_check_one): New static function based on old
-	symlink_check_worker, but without path conversion.
-	(path_prefix_p): Move definition before all uses.
- 	(skip_n_slashes, symlink_expand, symlink_follow): Remove.
-	(symlink_check_worker, symlink_check): Remove.
-	(readlink): Rewrite to use new symlink_check_one.
-	(unmixedcaseify, mixedcaseify): Comment out.
-	* path.h (symlink_check, symlink_follow): Don't declare.
-	* fhandler.cc (open): Don't pass O_NOSYMLINK to path_conv.  Set
-	errno from path_conv if it fails.
-	* dirsearch.cc (opendir): Check errors from path_conv, and set
-	errno appropriately.
-	* times.cc (utimes): Likewise.
-	* syscalls.cc (_unlink, _link, mkdir, rmdir, chdir): Likewise.
-	(chmod, _rename): Likewise.
-	(_stat_worker): Don't just pass nofollow to _open, but base
-	whether to pass O_NOSYMLINK on whether nofollow is set.
-	(lstat): Pass 1, not O_NOSYMLINK, to _stat_worker.
-	* strerror.cc (strerror): Add ELOOP.
-
-Thu Dec 18 12:30:47 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* fhandler.h (class fhandler_base): Remove inline definitions of
-	tcflush, tcsendbreak, tcdrain, tcflow, tcsetattr, tcgetattr,
-	tcsetpgrp, and tcgetpgrp, so that we can set proper errno values.
-	(class fhandler_tty): Add pgrp_ field, and virtual tcgetpgrp and
-	tcsetpgrp functions.
-	* fhandler.cc (fhandler_base::tcflush): New function.
-	(fhandler_base::tcsendbreak): New function.
-	(fhandler_base::tcdrain): New function.
-	(fhandler_base::tcflow): New function.
-	(fhandler_base::tcsetattr): New function.
-	(fhandler_base::tcgetattr): New function.
-	(fhandler_base::tcsetpgrp): New function.
-	(fhandler_base::tcgetpgrp): New function.
-	(fhandler_tty::fhandler_tty): Initialize pgrp_.
-
-	* tty.cc (tcsetpgrp): Set errno correctly on failure.
-
-	* include/sys/termios.h (CBAUD): Change to 037.
-	(B57600, B115200): Change to values that can fit in a speed_t.
-
-	* spawn.cc (spawn_guts): Set errno correctly if we can't find the
-	executable.
-
-Mon Dec 15 16:40:07 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from msnyder@cygnus.com (Michael Snyder):
-	* heap.cc (_sbrk): handle situation where newalloc < incr
-
-Mon Dec 15 16:40:07 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	Allow Cygwin32 to terminate process even when in a blocking
-	winsock call.
-	* exceptions.cc (call_handler): call to WSACancelBlockingCall()
-	removed.
-	(sighandle): call WSACleanup() before exiting the process to
-	cancel blocking winsock calls.
-	* include/mywinsock.h: add proto for WSACleanup().
-
-Mon Dec 15 16:40:07 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: compile .cc files with -fno-exceptions to
-	decrease dll size and increase execution speed a little.
-
-Mon Dec 15 16:40:07 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* tty.cc (do_input):  Detect CTRL-T as a special case when
-	STRACE_CACHE is active.  Dumps the strace cache to disk.
-	* console.cc (fhandler_console::read):  Detect CTRL-T as a special
-	case when STRACE_CACHE is active.  Dumps the strace cache to disk.
-
-Sat Dec 13 15:12:53 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-        * fork.cc: Include <malloc.h>.
-        (cygwin_fork_helper1): Call __malloc_copy after copying the stack
-        and heap to the child.
-
-Thu Dec 11 15:14:40 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* sigproc.cc (proc_subproc): Remove over-enthusiastic test for
-	process handling readiness or proc_wait will loop attempting to
-	handle a dying subprocess when signal handlers are not ready.
-	* fork.cc (cygwin_fork_helper1): Reorganize to ensure that a
-	forked process is capable of receiving signals when fork()
-	returns.
-
-Wed Dec 10 15:43:37 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* include/sys/termios.h (IXANY): Correct value.
-	(PARMRK): Define again.
-
-Wed Dec 10 00:05:23 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-        * dcrt0.cc (dll_crt0_1): Move start time initialization to a more
-	logical place (pinfo_init).
-        (do_exit): Reorganize to attempt to solve races when a cygwin
-	process occupies two windows pids (i.e., an execed process).
-	* exceptions.cc (lock_cs): Fix erroneous WFSO logic.
-	(sighandle): Use new method for determining if process was
-	initiated via fork.
-	(events_terminate): Do not close pinfo_mutex.  Allow automatic
-	close by ExitProcess to lengthen the time that the pinfo structure
-	is locked, minimizing races between an exiting child and a
-	potentially exiting parent.
-	* hinfo.cc (hmap_init): Use new method for determining if process
-	was initiated via fork.
-	(hinfo_vec::de_linearize_fd_array): Fix a typo in a comment.
-	* pinfo.cc (clearout): Remove this function.  Handled in
-	allocate_pid.
-	(pinfo_init): Move start_time setting here from dll_crt0_1.
-	Remove call to init_self in favor of adding three additional lines
-	of code.
-	(pinfo_list::operator []): Implement a very simple hashing
-	scheme for pid lookup.
-	(lpfu): New routine controlled by DEBUGGING conditional.  When
-	DEBUGGING is activated, lpfu returns more information about the
-	state of a timed out pinfo_mutex.
-	(pinfo_list::get_empty_pinfo): Remove function.  Move
-	functionality to allocate_pid.
-	(allocate_pid): Implement a (very) simple hashing scheme for
-	finding an available pid.  Take advantage of reorganized pinfo
-	structure to zero all pertinent fields with one memset.
-	(pinfo::record_death_nolock): Don't bothering zeroing
-	inconsequential stuff.
-	(pinfo::record_death): Leave pinfo_mutex locked with the
-	understanding that this function will be called just prior to
-	exiting the process.  This minimizes a race between a child which
-	is exiting at nearly the same time as its parent.
-	* sigproc.cc: Reformat function calls.
-	(sigproc_init): Clear new PID_INITIALIZING flag to indicate that
-	a (possibly execed) process is now capable of receiving signals.
-	(sig_send): Be more defensive in determining if a signal can be
-	sent to myself or suffer problems with execed processes.
-	(sigproc_terminate): Wait for sig_proc to exit to ensure that
-	all pending signals have been handled.  Use new 'proc_terminate'
-	function to terminate the subprocess handling thread.
-	(allow_sig_dispatch): Don't bother blocking signals if signal
-	handling isn't active in this process yet.
-	(block_sig_dispatch): Don't bother blocking signals if signal
-	handling isn't active in this process yet.
-	(sig_proc): Use sig_loop_wait variable to control wait time for
-	signal semaphores.  Uncouples this wait from wait_subproc.
-	Perform signal cleanup here on thread termination.
-	(proc_exists): More accurate tests to determine if a process
-	really exists.
-	(proc_register): Remove this function in favor of a macro.
-	(proc_subproc): More stringent test for being "ready" to process
-	subprocesses.  Add more common initialization to PROC_ADDCHILD.
-	Remove PROC_EXIT in favor of a separate function.
-	(proc_terminate): New function.  Replaces PROC_EXIT functionality
-	in proc_subproc.  Terminates subproc handler thread.
-	(stopped_or_terminated): use lock_pinfo_for_update when modifying
-	child stopsig status or suffer a race.
-	(wait_subproc): Save sig_proc thread handle away for
-	synchronization when exiting.  Set up 'i_am_alive' mutex inherited
-	by childen.  Child's inability to lock this mutex means that the
-	parent is still alive and processing children.  Use proc_loop_wait
-	to control WFMO.  Clean up events queue on thread exit.
-	(zap_subproc): Clear out pinfo structure for a child.
-	* sigproc.h: Remove PROC_EXIT constant.  Remove obsolete
-	proc_register declaration.
-	(alive_parent): New macro to determine if a parent is still alive.
-	* spawn.cc (spawn_guts):  Fix a comment typo.  Use proc_terminate
-	to terminate all subprocess handling prior to an exec.  Use new
-	method for determining if this process was started via a fork.
-	Attempt to clean up races between execed process, its parent, and
-	the execed child.
-	* winsup.h (pinfo): Add a new handle indicating that a parent is
-	alive.  This should be a foolproof way of determining if a parent
-	has gone away so that a child will know whether to remove itself
-	from the pinfo table.
-	Reorganize the structure in such a way that items to be zeroed
-	are grouped together at the beginning for more efficient zeroing
-	in allocate_pid.
-	Add a new PID_* constant.
-	New lock_pinfo_for_update macro for use when debugging cygwin.
-
-Wed Dec 10 00:05:23 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	Change the way to inherit fd table on spawn/exec calls.
-	Use STARTUPINFO structure to pass an fd table to a child process
-	instead of shared memory area.  This is undocumented, but is used
-	by MSVC runtime.  The desktop inheritance code added again,
-	otherwise user32.dll will fail to initialize after sexec calls.
-	* pinfo.cc (pinfo_init): delinearize fd array from STARTUPINFO
-	structure instead of call to copy_shared_fd_table.
-	* shared.cc (create_shared_fd_mapping_name): remove
-	(create/copy_shared_fd_table): remove
-	* spawn.cc (spawn_guts): use lp(cb)Reserved2 fields of STARTUPINFO
-	to pass fd table to a child.  Remove call to
-	create_shared_fd_table.  Inherit window station/desktop on sexec
-	calls.
-	* winsup.h: remove prototypes for create/copy_shared_fd_table.
-
-Fri Dec  5 18:57:42 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* kill.cc (main):  Report error if kill() fails.  Minor reformat.
-        * ps.cc (main):  Only use month/day in start time when starting
-        time is > 24 hours in the past, not when it occurs yesterday.
-
-Fri Dec  5 15:54:41 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* fcntl.cc (_fcntl): reformat
-	* fhandler.cc (fhandler_tty::open): new, need special open for
-	ttys.  In addition to calling fhandler_base::open, check
-	flags to handle blocking vs. non-blocking I/O.  Should
-	initialize tty to standard state (9600 bits/sec - 8 - 1 with
-	no flow control) but this code needs more work still.  Ifdef
-	out for now.
-	(fhandler_tty::tcsendbreak): new
-	(fhandler_tty::tcdrain): new
-	(fhandler_tty::tcflow): new
-	(fhandler_tty::tcsetattr): add support for action arg.  Use
-	a DCB struct to hold the values we will set.  First call
-	GetCommState to get the current state, then reassign values
-	based on the contents of the termios struct.  Handle the
-	case where t->c_ospeed is set to B0, otherwise set state.BaudRate.
-        Set all the other DCB struct values appropriately, based on
-        the contents of the termios struct.
-	(fhandler_tty::tcgetattr): do the inverse of tcsetattr.
-        Call GetCommState to get the current state and use this to set
-        the appropriate termios struct values.
-	* termios.cc: reformat
-	(tcsendbreak): implement -- add duration arg,
-	call fhandler tcsendbreak as appropriate
-	(tcdrain): implement -- call fhandler tcdrain as appropriate
-	(tcflow): implement -- call fhandler tcflow as appropriate
-	* fhandler.h: add new tc* protos
-	* include/sys/termios.h: correct values of iflag bits,
-	define CRTSXOFF and CRTSCTS, CBAUD, B57600 and B115200.
-	Add protos for tc* functions.
-
-Wed Nov 26 17:06:17 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* spawn.cc (perhaps_suffix): resolve symlinks to .exes.
-
-Mon Nov 24 17:10:49 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: remove crypt
-	* syscalls.cc (crypt): remove crypt stub
-
-Sun Nov 23 17:34:42 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* spawn.cc (spawn_guts): save the path of the script itself,
-	use the saved path while building the command line to execute.
-
-Thu Nov 20 22:58:23 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* stubs.cc: delete file, move unimplemented stubs to the
-	files in which they would normally belong.
-	* grp.cc (setgrent): implement (was in stubs.cc)
-	* syscalls.cc: move regfree, mknod, setgid, set(e)uid, sync,
-	crypt, and PPC __chkstk/_alloca/dll_entry stubs here from stubs.cc
-	(sync): just return zero for now instead of -1
-	(crypt): return -1 instead of 0
-
-Thu Nov 20 22:41:57 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-        * spawn.cc (spawn_guts): A premature close of the spawned filehandle    
-        was possible when reparenting an exited process.  Fix this.
-        * dcrt0.cc (do_exit): Only do minimal cleanup if "pid focus"
-        has moved to another windows process or the other process will
-        become confused.
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* sigproc.cc (getsem): set errno to EPERM if existing semaphore
-	cannot be opened.
-	(wait_subproc): allow access to signal semaphores to process's
-	owner only except for SIGCHLD (needed for SIGCHLD delivery after
-	sexecXX calls).
-
-Thu Nov 20 00:52:58 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* syscalls.cc (hash_path_name): Ignore trailing backslash when
-        calculating pathname hash.
-        * hinfo.cc (hinfo_vec::de_linearize_fd_array): Set use_tty
-        if /dev/ttyn is detected in the shared_fd_table.  Before this
-	change, executing "set CYGWIN_TTY=1", "bash", "unset CYGWIN_TTY",
-	"/bin/pwd" would result in pwd printing nothing because
-	the de_linearize code would use the wrong fhandler_xxx when
-	reading from the buffer inherited from the parent process.
-        * cygwin.din: Add new ctermid function for export.
-        * syscalls.cc (ctermid): New function
-	* exceptions.cc (call_handler): If called during a P_OVERLAY
-	spawn, merely set appropriate flags and return.  The spawn
-	code will then clean up and exit.
-	* sigproc.cc (proc_exists): Reorganize to better detect defunct
-	processes.  Don't clean up pinfo if process has a parent since the
-	parent should clean up eventually.
-	* spawn.cc: New global exec_exit.  Set by signal handler to
-	value which should be used on exit from aborted spawn.
-	(spawn_guts): Try harder to let the child terminate (if it is
-	going to) before exiting on a signal.  Remove obsolete code.
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* exec.cc (file_exists): Removed
-	* spawn.cc (spawn_guts): call perhaps_suffix to convert filename
-	to win32 form and to check file existance; prog variable
-	removed, all references changed to real_path variable.
-	Do not inherit parent's window station/desktop on sexecXX calls.
-	They are no longer needed with the new signal handling.
-	(_spawnve): extra file existance check removed
-	* winsup.h: file_exists prototype removed
-
-Wed Nov 19 16:23:47 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* cygwin.din: add missing exports for random -- initstate
-	and setstate (accessed by gawk among others?)
-
-Tue Nov 18 22:27:10 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: Add spaces after colons in rules for make
-
-Mon Nov 17 22:35:25 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from proven@cygnus.com (Chris Provenzano):
-        * Makefile.in: set SHELL = @SHELL@, set VPATH to only @srcdir@.
-	Remove mingw from directories to build for now, adapt rules
-	for building sysdef files without fancy VPATH
-        * configure: regenerate
-	* config/i386/makefrag: add rules to build setjmp/longjmp
-	* regexp/Makefile.in: set SHELL = @SHELL@
-	* regexp/configure: regenerate
-	* utils/Makefile.in: set SHELL = @SHELL@
-	* utils/configure: regenerate
-
-Mon Nov 17 18:36:50 1997  Geoffrey Noer  <noer@rtl.cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* fhandler.cc (fhandler_disk_file::open): calls to symlink_XXX
-	replaced with path_conv class calls.
-	* path.cc (path_conv::path_conv): comments added, O_NOSYMLINK case
-	added.
-	* path.h (class path_conv): symlink_p, exec_p - new class members.
-	* spawn.cc (spawn_guts): call path_conv instead of symlink_follow.
-
-Sun Nov 16 15:54:27 1997  Geoffrey Noer  <noer@rtl.cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* dcrt0.cc (do_exit): Use new pinfo element in debug statement.
-	* pinfo.cc (pinfo_init): Eliminate use of "PID" environment
-	variable in favor of scanning the process table for a
-	SpawnedProcessId field matching current windows process id.
-	Should speed up spawned process startup slightly.  Delay setting
-	of dwProcessId until process is capable of processing signals
-	since this field is used to build signal semaphores.
-	* signal.cc (kill_worker): Perform a `proc_exists' on the pid
-	in question if signal == 0.  This will verify that the process
-	actually exists and was not abnormally terminated.
-	* sigproc.cc (sigproc_init): Initialize dwProcessId field after
-	signal processing has been initialized.
-	(sigproc_terminate): Remove events[0] close.
-	(getsem): Use GetCurrentProcessId to find the windows pid since
-	this dwProcessId field is not yet set up.  Use proc_exists to
-	determine if error should be printed on OpenSemaphore error.
-	(proc_exists): New function.  Makes more exhaustive test of
-	process existence.  Determines if process died without going
-	through normal shutdown.
-	(wait_subproc): Close wakeup event only on thread exit.
-	* spawn.cc: Remove pExeced.  Use new field in pinfo.
-	(spawn_guts): Initialize dwSpawnedProcessId field.
-	* utils/ps.cc (main): Perform a kill(pid, 0) on any pids that
-	appear to be active.  This will clear out pids that have died
-	abnormally.  'ps -f' bypasses this.
-	* winsup.h (class pinfo): Add dwSpawnedProcessId field.
-	
-Sun Nov 16 15:54:27 1997  Geoffrey Noer  <noer@rtl.cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* pinfo.cc ((pinfo_init): use dwProcessId for execed/spawned
-	check, set subproc_ready event only if the process is exec'ed.
-	* spawn.cc (spawn_guts): initialize hProcess and dwProcessId
-	fields of pinfo on exec, keep progname field on spawn.
-
-Sun Nov 16 15:54:27 1997  Geoffrey Noer  <noer@rtl.cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* dcrt0.cc: remove commented out code
-	* spawn.cc: fix misapplied patch problem
-
-Sun Nov 16 15:54:27 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* fhandler.cc (fhandler_dev_null::open): Open Windows 'nul'
-	device rather than "faking" a real open.
-	(fhandler_dev_null::close): delete.
-	(fhandler_dev_null::fstat): delete.
-	(fhandler_dev_null::ioctl): delete.
-	(fhandler_dev_null::read): delete.
-	(fhandler_dev_null::write): delete.
-	(fhandler_dev_null::lseek): delete.
-	(fhandler_dev_null::dup): delete.
-	* fhandler.h (class fhandler_base): delete above methods from
-	class.
-	* hinfo.cc (hinfo_vec::build_fhandler): Use new fhandler_dev_null
-	class which opens 'nul' device.  Treat /dev/null similarly to
-	other Windows devices.  This allows redirection of /dev/null to
-	non-cygwin processes.
-
-Sun Nov 16 15:54:27 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* dcrt0.cc (do_exit): Use EXIT_* flags to determine how exit
-	should proceed.  Honor new EXIT_NOCLOSEALL to avoid
-	close_all_files.
-	* exceptions.cc (__cygwin32_exception_handler): Use new
-	EXIT_SIGNAL define to indicate exiting due to signal.
-	* signal.cc (sigprocmask): Slightly more defensive check against
-	being called prior to complete cygwin setup.
-	(_raise): Defensive check to guard against being called prior to
-	complete cygwin setup.
-	* sigproc.cc (stopped_or_terminated): Use new EXIT_SIGNAL define
-	to detect exiting due to signal.
-	* sigproc.h: Define flags to be used during exit process as
-	EXIT_*.
-	* spawn.cc (spawn_guts): Use EXIT_* constants to control how
-	do_exit proceeds after _P_OVERLAY.
-
-Sun Nov 16 15:54:27 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* sysconf.cc (sysconf): return 1048576 for ARG_MAX until
-	we figure out the right value (_POSIX_ARG_MAX is only 4K
-	which is too small).
-
-Sun Nov 16 15:54:27 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-        * dcrt0.cc (dll_crt0_1): call winsock_init if neccesary.
-        * fhandler.cc ((fhandler_socket::fhandler_socket): moved to net.cc
-        * fhandler.h (class fhandler_socket): destructor prototype added.
-        * fork.cc (cygwin_fork_helper1): set PID_SOCKETS_USED in the
-        child's pinfo if parent has open socket descriptors; call
-        winsock_init in child code if necessary.
-        * net.cc: static variable winsock_init_p removed;
-        number_of_sockets is new global variable containing number of
-        opened sockets.
-        (winsock_init): made global, save "winsock inited" flag in process
-        state field.
-        (cygwin32_winsock calls): condition for winsock initialisation
-        changed
-        (fhandler_socket::fhandler_socket): new, moved from fhandler.cc;
-        increment number_of_sockets on constructor call.
-        (fhandler_socket::~fhandler_socket): new.  Decrement
-        number_of_sockets on destructor call, check for negative value.
-        (fhandler_socket::ioctl): check for winsock initialisation added.
-        * spawn.cc (spawn_guts): handle PID_SOCKETS_USED in child's pinfo.
-        * winsup.h: PID_SOCKETS_USED - new enum value; number_of_sockets
-	and winsock_init() prototypes added.
-
-Wed Nov 12 23:02:34 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-        * exceptions.cc: Substitute do_exit for _exit as appropriate.
-        do_exit allows full 32 bits of exit value.  The upper 16 bits
-        are used for special cygwin operations.
-        * winsup.h: Change definition of do_exit to allow calling from
-        signal handler.
-        * dcrt0.cc (do_exit): Change to allow calling from signal handler
-        in place of _exit.  This is necessary to ensure that only cygwin
-        internal applications can exit with the upper order 16 bits set
-        to non-zero.
-
-Wed Nov 12 23:02:34 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-        * dcrt0.cc (do_exit): New function.  Subsumes functionality of
-	_exit but takes a DWORD argument.  Changed to avoid some shutdown
-	activities when called with REPARENTING bit set in argument.  Also
-	explicitly kills any executing non-cygwin subprocess from a
-	spawn(P_OVERLAY)...
-        (_exit): Use do_exit for exiting.  Ensure that only low order 1
-        bits of status are used or confusion will result if exiting with
-        some higher order bits set.
-        * exceptions.cc (set_process_mask): Reflect new method for
-	sig_send to send signals to self.
-        (handle_sigsuspend): Reflect new method for sig_send to send
-	signals to self.
-        * fork.cc: A handle name was changed in the pinfo structure to
-        be more reflective of its use.  Change forkee_stopped to
-        subproc_ready everywhere.
-        * pinfo.cc (pinfo::clearout): Change forkee_stopped to
-	subproc_ready.
-        (pinfo_init): Use PID_EXECED flag to determine if this process has
-        been execed.  If so, signal the remaining stub in the process
-	which invoked us so that the stub can terminate and let us take
-	over as this pid.
-        * sigproc.cc (sig_send): Change method for determining if sending
-        signals to myself.  A NULL pointer means communicate with my
-        signal handler.  This is necessary to allow communication with
-        our own signal processors after reparenting an execed process.
-        Also, add an additional test to detect if a process goes away in
-        the middle of attempting to send it a signal.
-        (allow_sig_dispatch): Reflect new method for sig_send to send
-	signals to self.
-        (getsem): Use dwProcessId in names for signal semaphores.  Allows
-        communicating with both parts of a process that is temporarily
-        "split in two" while execing.
-        (sig_proc): Avoid printing an error if WAIT_FAILED and exiting
-        anyway.  Process requests even if loop_wait == 0.
-        (proc_subproc): Defensive check for manipulating processes prior
-        to initialization or after terminating sigproc.
-        Use different check for subprocesses that have been reparented.
-        Hopefully this will eliminate WFSO, error 6 problems.
-        (wait_subproc): Only exit when loop_wait == 0 and not dealing with
-        a process.
-        * spawn.cc: Set up two global variables, used on exit when
-        execing a non-cygwin process: hExeced - handle of non-cygwin
-	process which is being waited for by a stub, pExeced - windows pid
-	of the process.
-        (spawn_guts): Reorganize to always (temporarily) wait for the new
-        process when P_OVERLAY.  If a cygwin process is invoked, then the
-        wait will return when an event is signalled and the new process
-	will be "reparented" in the ppid.  If a non-cygwin process is
-	invoked, wait until the process exits or a signal is received
-	which terminates the process.  In this case, the do_exit function
-	will terminate the non-cygwin process.
-        * winsup.h: Rename forkee_stopped to subproc_ready since this
-	event now has a dual role which is better defined by this new
-	name.  Add a new flag (PID_EXECED) for process_state.  Define a
-	new function `do_exit' which operates similarly to _exit
-        but takes > 16 quantities with the high order bit signifying
-	different exit actions.
-
-Mon Nov 10 17:11:08 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * include/utime.h: remove (moved to newlib/libc/sys/cygwin32/sys)
-        so as not to conflict with the one in newlib/libc/include.
-
-Mon Nov 10 15:11:42 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* exceptions.cc (__cygwin32_exception_handler): exit with
-	"core dumped" exit code after writing "core" file.
-
-Mon Nov 10 15:11:42 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from cgf@bbc.com (Chris Faylor):
-        * console.cc: Add convenience macros and structures for handling
-        scrolling.
-        (fhandler_console::fillin_info): New function to fill in the `info'
-        struct.
-        (fhandler_console::scroll_screen): Change to scroll only the visible
-        portion of the screen.  Honor scroll regions more stringently.
-        (fhandler_console::open): Use new fillin_info function.
-        (fhandler_console::ioctl): Use new fillin_info function which
-        automatically calculates screen size.
-        (fhandler_console::clear_screen): Use new fillin_info function.
-        Only clear visible portion of screen.
-        (fhandler_console::cursor_set): Add a flag to indicate whether
-        cursor positioning is absolute within buffer or is screen relative.
-        Use new fillin_info function to get screen information.
-        (fhandler_console::cursor_rel): Use new fillin_info function.
-        Change for new cursor_set parameter.
-        (fhandler_console::cursor_get): Use new fillin_info function.
-        (fhandler_console::char_command): Use new fillin_info function
-        where appropriate.  Change for new cursor set parameter where
-        appropriate.  Scroll only visible portion of screen when required.
-        * fhandler.h (class fhandler_console): Add fillin_info, change
-        cursor_set to reflect additional argument.
-
-Mon Nov 10 15:11:42 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-        * dcrt0.cc (dll_crt0_1): Register process start time.
-        * fork.cc (cygwin_fork_helper1): Register process start time.
-        * utils/ps.cc (main): Report process start time.
-        (start_time): New function to format time similarly to UNIX ps.
-        A time from today shows as HH:MM, times from previous days just
-        show the month and day.
-        * winsup.h (class pinfo): Add start_time field.
-
-Mon Nov 10 11:54:27 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-        * include/Windows32/Defines.h (TIME_ZONE_ID_INVALID): Define.
-        * times.cc (gettimeofday): The error return from
-        GetTimeZoneInformation is TIME_ZONE_ID_INVALID, not
-        TIME_ZONE_ID_UNKNOWN.
-
-Sun Nov  9 17:08:30 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* Makefile.in: add ../libiberty/strsignal.o
-	* cygwin.din: add exports for strsignal, strtosigno
-	* utils/kill.cc: changes to allow accepting signal name
-	as argument
-
-Sun Nov  9 17:08:30 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/limits.h: define PATH_MAX here instead of
-	include/sys/param.h, define _POSIX_NGROUPS_MAX as 0 not 1
-	(system invariant value, not implementation-specific)
-	* include/sys/param.h: remove PATH_MAX, change NOFILE from 64
-	to 8192, delete PATHSIZE, remove safety wrapper around
-	MAXHOSTNAMELEN, add comments
-	* sysconf.cc (sysconf): return NGROUPS_MAX not zero,
-	return _POSIX_SAVED_IDS not zero.  Return _POSIX_CHILD_MAX
-	not 4096.  Return _POSIX_CHILD_MAX, not 8.
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* winsup.h: add proto for setdtablesize, define NOFILE_INIT
-	and NOFILE_INCR
-	* hinfo.cc (hmap_init, hinfo_vec::find_unused_handle): change to
-	support virtually unlimited numbers of fds.  Remove setdtablesize
-	proto
-	* syscalls.cc: initialize dtable_size to NOFILE_INIT instead of
-	NOFILE
-
-Thu Nov  6 13:14:09 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* exceptions.cc (__cygwin32_exception_handler): don't
-	print "In cygwin32_except_handler" for exceptions Cygwin32
-	isn't going to handle.  Print "(progname PID) Exception: <type>"
-	to console.  Redirect all detailed information including the
-	stack trace to <progname>.core.  This should reduce confusion
-	about what's causing the exception (a lot of people would see "In
-	cygwin32..." and think the problem was in Cygwin32 when most of
-	the time it was in some other program).
-	* syscalls.cc: add fixme
-	* times.cc: add fixme
-
-Wed Nov  5 19:23:10 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* Makefile.in: force .c.os and .cc.os to be built in same
-	directories as source
-
-Wed Nov  5 19:23:10 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* drct0.cc (dll_crt0_1): stop initializing winsock on process
-	startup since that slows down startup time of all processes, even
-	ones that don't end up making Winsock calls.
-	* fork.cc (cygwin_fork_helper1): don't need to call uinfo_init
-	or socket_checkinit after fork -- the appropriate functions will
-	do the necessary initialization if they are ever called.
-	* net.cc: init winsock_init_p to zero and make it static
-	(all exported functions): call winsock_init before making
-	any WinSock calls since this no longer happens in dcrt0.cc
-	startup code.  Only do this if !winsock_init_p.
-	(winsock_init): checkinit renamed.  Now just inits winsock
-	without checking whether it has been already initialized.
-	Make it static.
-	* uinfo.cc (uinfo_init): after we call getpwnam, we know
-	the passwd file has been read in so don't check initialization
-	of it.  However, we do need to read_etc_group() if group_in_memory
-	isn't set.
-	* passwd.cc: rename global i variable to pw_pos, rename
-	passwd_in_memory to passwd_in_memory_p to match net.cc scheme.
-	Add comments.
-	(read_etc_passwd): make static
-	(various): make sure to read_etc_passwd() if passwd_in_memory
-	isn't set
-	* grp.cc: add comments, rename idx global to grp_pos,
-	rename group_in_memory to group_in_memory_p to match net.cc
-	scheme, group_in_memory_p no longer static (needs to be accessed
-	by uinfo_init)
-	* winsup.h: remove proto for socket_checkinit since that's
-	renamed and static within net.cc
-
-Tue Nov  4 01:02:20 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* signal.cc (sigprocmask): Newer versions of gcc will call
-	sigprocmask when a builtin constructor is activated.  If this
-	happens prior to the setup of u->self, then a NULL dereference
-	will occur.  Guard against this.
-
-Mon Nov  3 17:00:45 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* hinfo.cc (hinfo_vec::build_fhandler): Open a console for
-	/dev/tty when !use_tty.
-
-Thu Oct 30 10:28:15 1997  Tom Tromey  <tromey@cygnus.com>
-
-        * include/mapi.h: New file.
-        * sysdef/i386/mapi32.def (MAPISendMail@20): New export.
-
-Thu Oct 30 15:08:13 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * times.cc: add comments listing standards funcs are defined in
-	(dump_filetime): remove unused local func
-        * net.cc (fail): remove local func, replace one reference with
-        equivalent debug_printf, add standards comments, reformat a little
-        (fhandler_socket::close): simplify handling of res
-        (fhandler_socket::fstat): set ENOSYS (unimplemented)
-        * stubs.cc: set ENOSYS in unimplemented funcs
-        * uname.cc: add standards comment
-	* ntea.cc: reformat
-
-Wed Oct 29 22:43:57 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* times.cc (settimeofday): set ENOSYS instead of EPERM
-	since ENOSYS maps to "Function not implemented" which is the
-	case here.
-	* syscalls.cc (seterrno): on failure, set EACCES instead of EPERM
-	which is better for the unknown error case
-
-Fri Oct 24 01:24:07 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from green@cygnus.com (Anthony Green):
-	* dcrt0.cc: new host_dependent_constants object with a global
-	instance of it which allows constants that are different in Win 95
-	and NT to be saved here instead of having forks in the code and
-	having to check the OS type each time.  Add two constants for
-	fhandler, one for sharing attributes and one for upper word value
-	for locking files.
-	(dll_crt0_1): call host_dependent init function
-	* fhandler.cc (fhandler_base::open): use above object for
-	setting shared attributes
-	(fhandler_disk_file::lock): get upper word for locking from
-	host_dependent_constants
-	* winsup.h: define host_dependent_constants class and add extern
-	for global instance of it
-
-Wed Oct 22 02:27:53 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* cygwin.din: Export getenv, putenv, setenv and unsetenv instead
-	of cygwin32_ wrappers
-	* dcrt0.cc: External variable environ removed
-	(dll_crt0_1): strip executable's path on console title if
-	environment variable CYGWIN_TITLE set to "strip", references to
-	environ removed.
-	* environ.cc: New file. Code derived from newlib sources.
-	* exec.cc: include stdlib.h
-	(execl, execv): new (derived from newlib sources).
-	(sexecve): reference to environ removed.
-	(sexecvpe): call getenv instead of cygwin32_getenv.
-	* grp.cc: new static variable group_in_memory
-	(read_etc_group): skip blank lines
-	(getgrgid, getgrnam, getgrent): call read_etc_group when necessary.
-	* misc.cc (cygwin32_getenv/putenv/setenv/unsetenv): remove
-	wrappers.
-	* passwd.cc: new static variable passwd_in_memory
-	(read_etc_passwd): skip blank lines
-	(search_for, getpwent): call read_etc_passwd when necessary.
-	(setpwent): fixed incorrect initialization of i var.
-	* pinfo.cc (pinfo_init): initialize uid with illegal value to
-	force read of /etc/passwd and /etc/group.
-	* spawn.cc: call getenv instead cygwin32_getenv
-	(spawn_guts): force read of /etc/passwd and /etc/group on sexec
-	calls.
-	* uinfo.cc (uinfo_init): read /etc/passwd and /etc/group only if
-	uid is undefined.
-	* winsup.h: remove protos for environ, cygwin32_getenv,
-	cygwin32_putenv
-
-Wed Oct 22 02:08:54 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/aclocal.m4: new file.  Define autoconf macros for
-	determining whether we're compiling for the cygwin32 environment
-	or not and determine the executable suffix
-	* utils/configure.in: call AM_CYGWIN32 and AM_EXEEXT
-	* utils/configure: regenerate
-	* utils/Makefile.in: add $(exeext) after executable names so
-	programs will be built with the .exe suffix
-
-Wed Oct 22 00:50:27 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	Now that it is possible to use gdb using a stable
-	cygwin.dll to debug a program using a newer, potentially buggy
-	cygwin.dll, the strace mechanism will probably end up being
-	used more and more for debugging timing/race-condition bugs that
-	aren't easily exposed in a gdb session.  The following changes
-	make the strace facility better for debugging timing issues by
-	storing the last few commands in a buffer instead of writing
-	to disk each function call.
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* dcrt0.cc (dll_crt0_1): Change to strace_init call to take
-        an argument (for planned future registry changes).
-        (_exit): Call strace_dump when appropriate.  Add a debugging
-	printf.
-        * include/sys/strace.h: Add _STRACE_CACHE, _STRACE_EXITDUMP,
-	strace_dump ().
-        * strace.c (strace_init): Allow hexadecimal, octal setting of
-        strace flags in environment variable.  Handle new cache option.
-        (strace_printf): Display number of seconds from last message.
-        Handle _STRACE_CACHE.
-        (strace_dump): New function.  Dump cached messages to disk.
-
-Wed Oct 22 00:08:40 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: export socket calls without cygwin32_ prefix
-	* net.cc: remove unused herror function in favor of
-	cygwin32_herror	which is exported as herror
-	* include/netdb.h: we are now exporting the socket calls without
-	the cygwin32_ prefix so we don't need the nasty remapping in
-	header files
-	* include/arpa/inet.h: ditto
-	* include/sys/socket.h: ditto
-	* select.cc (select): make extern C
-
-Tue Oct 21 22:52:29 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* sigproc.cc (sigproc_terminate): Fix flawed attempt to signal
-        any processes waiting for signal notification success when the
-        process receiving the signal is terminating.
-        (wait_subproc): Report on errors when opening the
-	sync_proc_subproc mutex.  Move initialization of events[0]
-	"wakeup" signal prior to wait_subproc_inited or risk a (miniscule)
-	chance for a reference to a NULL handle.
-        * strace.cc (ta[]): Change WM_ASYNCIO entry to reflect previous
-        changes to WM_ASYNCIO constant.
-
-Tue Oct 21 14:30:14 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* sigproc.cc (proc_subproc): fix minor error output problem
-
-Mon Oct 20 20:19:02 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: change DLL_NAME to cygwin97r2.dll
-
-Mon Oct 20 20:16:47 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* window.cc (alarm): When there is a previous alarm() request
-	with less than one second remaining, then the return from a call
-	to alarm() is supposed to return 1.
-
-Mon Oct 20 20:16:47 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* Makefile.in: Add sigproc.o target.  Add sigproc.h dependency
-	where appropriate.  Add -s to intermediate ld of cygwin.dll to
-	speed up the process of building the .dll.
-	* dcrt0.cc: Add new sigproc.h include.
-	(dll_crt0_1): Replace window_init with sigproc_init for
-	initialization of signal/sub process handling.  Change to use new
-	process_state field in pinfo.
-	(_exit): Remove spurious debugging statement.  Terminate sigproc
-	processing.  Remove signal blocking obviated by previous signal
-	termination.  Remove SIGCHLD notification of parent as it is now
-	handled automatically in the parent.
-	(api_fatal): Terminate sigproc processing.
-	* exceptions.cc: Add new sigproc.h include.  Change name of
-	ourhThread.
-	(ctrl_c_handler): Change to static as this is no longer called
-	outside of this module.
-	(lock_cs): Change to a function which will optionally grab new
-	signal dispatch mutex.  Don't wait forever for cs mutex.
-	(unlock_cs): Change to a function which will optionally release
-	new signal dispatch mutex.
-	(init_exceptions): Detect errors from SetConsoleCtrlHandler.
-	Initialize new sig_dispatch mutex.  This mutex is used to
-	control dispatching to a function on signal receipt.
-	(sig_dispatch_pending): New function.  Called from signal
-	processing thread to dispatch pending signals.
-	(set_process_mask): Block signal dispatch during setting of new
-	mask, if possible.  Contact signal thread to dispatch pending
-	signals.
-	(handle_sigsuspend): New function.  Attempts to implement a
-	sigsuspend which will not lose signal notification.  Called from
-	sigsuspend.
-	(call_handler): Use sigproc_printf where appropriate.
-	(ctrl_c_handler): Use _raise to invoke the correct signal.
-	(sighandle): New function.  Subsumes most of ctrl_c_handler.
-	Change to mark as suspended signals which would dispatch for which
-	the sig_dispatch mutex is unavailable.  Use sigproc_printf where
-	appropriate.
-	(events_init): Remove application_stopped mutex made obsolete by
-	new sigproc handling.
-	(events_terminate):  Remove application_stopped mutex made
-	obsolete by new sigproc handling.
-	* fork.cc: Add new sigproc.h include.
-	(cygwin_fork_helper1): Use process_state field in pinfo (replaces
-	inuse_p).  Call proc_register to add a new subproc to sigproc
-	handling.  Call sigproc_init for new subprocess.  Remove obsolete
-	window_init.
-	* heap.cc (_sbrk): Use process_state field in pinfo (replaces
-	split_heap_p).
-	* hinfo.cc (hmap_init): Use process_state field in pinfo (replaces
-	cygwin_parent_p).
-	* include/sys/strace.h: Add tracing for signal/subprocesses.
-	* init.cc:  Add new sigproc.h include.  Add waitq_storage global
-	for new sigproc handling.
-	(dll_entry): Add initialization, destruction of structures needed
-	by new sigproc handling.
-	* net.cc (fhandler_socket::ioctl): Use gethwnd() function to find
-	hwnd of hidden window.
-	* pinfo.cc: Add new sigproc.h include.
-	(pinfo::clearout): Use process_state field in pinfo (replaces
-	split_heap_p).  Explicitly initialize various handles to NULL.
-	(pinfo_init): Use process_state field in pinfo (replaces
-	cygwin_parent_p).
-	(pinfo_list::operator): Use process_state field in pinfo (replaces
-	inuse_p).
-	(pinfo_list::alocate_pid): Initialize process_state field.
-	(pinfo::init_self): Remove obsolete initialization of hProcess.
-	(pinfo::record_death_nolock): Changes for new sigproc handling.
-	(pinfo::record_death): Move bulk of this code to sigproc.cc.
-	(pinfo::terminate): Remove function made obsolete by sigproc
-	handling.
-	(pinfo::init_from_exec): Use process_state field (replaces
-	inuse_p).
-	* signal.cc: Add new sigproc.h include.
-	(kill_worker): Call new sig_send function to send signals to
-	cygwin processes.
-	(_kill): Use process_state field in pinfo (replaces inuse_p).
-	(sigsuspend): Call handle_sigsuspend in exceptions.cc to handle
-	sigsuspend in a non-raceable way.
-	* sigproc.cc: New signal/subprocess handling module.  Replaces
-	SendMessage method for signals with a method using semaphores.
-	Also detects changes in the state of child processes.
-	* sigproc.h: New header file defining constants and functions for
-	signal/subprocess handling.
-	* spawn.cc: Add new sigproc.h include.  Clean up trailing spaces.
-	(spawn_guts): Reorganize to use new sigproc handling.
-	Use new pinfo process_state field (replaces inuse_p).
-	* syscalls.cc (_read): Use new pinfo process_state field (replaces
-	inuse_p).
-	(_write): ditto.
-	* tty.cc (tty_init): Use new pinfo process_state field (replaces
-	cygwin_parent_p).
-	* utils/ps.cc (main): Use new pinfo process_state field (replaces
-	inuse_p).  Detect "zombie" processes similarly to UNIX ps.
-	* wait.cc: Add required includes.
-	(wait_found): Function obsoleted by new sigproc handling.
-	(wait4): Reorganize to use new sigproc handling.
-	* window.cc: Changes for new sigproc handling.
-	(WndProc): Remove SIGNAL handling obsoleted by new sigproc
-	handling.  Use static window handle since the field has been
-	removed from pinfo.  Use _raise where appropriate to send signals.
-	(Winmain): Replace global window handle with static since the
-	field has been removed from pinfo.
-	(window_init): Remove obsolete function.
-	(gethwnd): New function to allocate hidden window on demand rather
-	than at startup.
-	(window_terminate): Kill hidden window only if allocated.
-	(setitimer): Use gethwnd function to retrieve hidden window
-	handle.
-	* winsup.h: Remove stuff made obsolete by sigproc handling.  Move
-	some constants to new sigproc.h header file.  Remove inuse_p,
-	cygin_parent_p, split_heap_p.  Replace with a single process_state
-	field.  Define bit fields for process_state in an enum for easier
-	debugging.
-
-Mon Oct 20 19:17:33 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* sysdef/i386/winserve.def: remove ancient version of cygwin.din
-	* include/sgtty.h: remove since Cygwin32's tty handling doesn't
-	support bsd syntax/semantics
-	* include/sys/termios.h: change winsize struct to include
-	ws_xpixel and ws_ypixel members
-	* cygwin.din: remove export of ScreenCols, ScreenGetCursor,
-	ScreenRows, ScreenSetCursor, get_pid__5pinfo, getkey, _getkey,
-	kbhit, _kbhit, __small_printf = small_printf__FPCce
-	* key.cc: remove.  Similar functionality exists in ncurses
-	which can be compiled for Cygwin32
-	* console.cc (ScreenCols, ScreenGetCursor, ScreenSetCursor,
-	ScreenRows): delete and delete SCREEN_ROWS/COLS defines
-	* pold.c: remove old pipe-related code that's no longer used
-	* include/regex.h: remove, it's not a part of cygwin.dll
-	* syscalls.cc: started to add comments including standards
-	information
-	(truncate): new
-	(ftruncate): length is an off_t, not a size_t.  Add missing 
-	return value to debug printf
-	* syscalls.h: ftruncate length is an off_t, add proto for truncate
-
-        patch from cgf@bbc.com (Chris Faylor):
-	* console.cc (fhandler_console::write): Recognize '@' as a valid
-	character to follow a '\e[' sequence or get 'Bad escape' errors.
-
-Wed Oct 15 18:44:25 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: restore __main as an export
-
-Mon Oct 13 18:41:09 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: revert renaming of __assert since that's
-	actually what it's supposed to be called
-	* assert.cc: ditto
-
-Fri Oct 10 19:25:49 1997  Tom Tromey  <tromey@cygnus.com>
-
-        * include/Windows32/Base.h: Moved typedefs of CHAR, SHORT, etc,
-        before all other uses in file.
-
-Fri Oct 10 17:50:12 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-        * include/Windows32/Base.h: Only typedef CHAR, SHORT, and LONG if
-        VOID is not defined
-
-Thu Oct  9 00:46:40 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: remove all libgcc.a exports.  They don't
-	belong here since libgcc.a doesn't really relate to the
-	purpose of cygwin.dll, and (to make things worse) the contents
-	change over time.
-	* assert.cc: rename __assert to __cygwin32_assert
-	* exceptions.cc: rename __stack_trace to __cygwin32_stack_trace,
-	__cygwin_except_handler to __cygwin32_except_handler
-	* version.h: increment major and minor numbers
-
-Tue Oct  7 12:52:25 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* dcrt0.cc (_exit): under Win 95, don't send SIGCHLD
-	unless special env variable is set.  This works around a
-	problem where exiting a process can hang under Win 95.
-
-Mon Oct  6 23:41:34 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* regexp: new directory containing free regexp code by
-	Henry Spencer.  Taken from the most recent release of NetBSD.
-	Write configure.in and Makefile.in, based on files from
-	winsup/utils.
-	* Makefile.in: build regexp directory and include objs in
-	cygwin.dll.
-	* stubs.cc: remove all reg* stubs except for regfree which
-	isn't provided by above code.
-
-Mon Oct  6 13:35:48 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* dcrt0.cc: remove asm idata3 terminator, now that ld is fixed
-	such that this is no longer necessary.
-	* libccrt0.cc: ditto
-
-Mon Oct  6 13:14:00 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* spawn.cc (spawn_guts): return child's PID on
-	spawn (_P_NOWAIT,...) instead of child's handle.
-	(cwait): rewritten as a wrapper to waitpid.
-
-Mon Oct  6 13:02:01 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* net.cc (socketpair): new
-	* cygwin.din: add socketpair export
-
-Mon Oct  6 13:01:51 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* dcrt0.cc: Remove obsolete call to fork_terminate.
-        * exceptions.cc: Respace, remove extraneous trailing whitespace.
-        Change critical section to mutex since there are supposedly
-        multi-processor problems with critical sections under NT.
-        Use "lock_cs" and "unlock_cs" macros to lock/unlock critical
-	regions.
-        (init_exceptions): Change critical section initialization to mutex
-        initialization.
-        (set_process_mask): Use locking macros to control access to
-	sig_mask.
-        (ctrl_c_handler): Use lock_cs/unlock_cs to control access.
-        (events_init): Use standard cygname function to create names for
-        shareable objects.
-        (events_init): Close cs mutex.
-        * fork.cc: Use event flags which are specific to the child being
-        forked.  This prevents one process from prematurely activating
-        another.  It also makes fork slightly more thread-safe.
-        (fork_init): Remove event initialization.
-        (fork_terminate): Remove function.
-        (cygwin_fork_helper1): Initialize events on a per-fork basis.
-        Events are inherited in child's pinfo structure.
-        Remove child->hThread initialization as it not needed.  Use
-        pi.hThread where child->hThread is used.
-        Work around Windows 95 bug where a WaitForSingleObjects will
-        sometimes return ERROR_INVALID_HANDLE when it is resumed after
-        a suspend.
-        * pinfo.cc: Remove references to hThread field whereever it occurs.
-        * strace.cc: Use standard cygname function to create name for
-        strace_mutex.  Prevents confusion between different .dll versions.
-        * wait.cc (wait_found): Remove reference to hThread.
-        * winsup.h (class pinfo): Remove reference to hThread.  Add
-        per-process fork control event handles.
-	* include/limits.h:  Increase NGROUPS_MAX from 0 to 1 to reflect
-	recent change to getgroups.
-
-Mon Oct  6 11:06:22 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	Oops.  ../libio refers to objdir and is not the same
-	as $(srcdir)/../libio.
-
-Thu Oct  2 23:12:19 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	Revert patches to sources applied after Sept 16.  Removed
-	relevant portions of ChangeLog entries.  Some of those changes
-	may reappear later (removing the entries makes this log easier
-	to understand).
-
-Thu Oct  2 15:34:03 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: remove hardcoding of SHELL to /bin/sh, remove
-	../libio from INCLUDES since $(srcdir)/../libio is already
-	included.
-	* glob/Makefile.in: remove hardcoding of SHELL to /bin/sh
-
-Mon Sep 29 14:06:24 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* cygwin.din: add exports for rcmd, rresvport, rexec
-	* net.cc (cygwin32_rcmd): new
-	(cygwin32_rresvport): new
-	(cygwin32_rexec): new
-	* include/mywinsock.h: add protos for Winsock calls associated
-	with functions called by the above.
-
-Mon Sep 29 13:26:24 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* grp.cc (getgrent): Change overlooked comment to reflect new
-	behavior.
-
-Thu Sep 25 18:35:49 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: remove debugdll defs since the shared memory
-	overlap problem is solved by the timestamp addition of Sept 23
-	* version.h: rework explanations of version numbers
-
-Thu Sep 25 16:21:49 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* spawn.cc: add missing cast to debug printf
-
-Thu Sep 25 16:14:17 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-        * path.cc (conv_to_win32_path): Call backslashify on a win32
-        path.
-
-Tue Sep 23 17:58:17 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	Fixes for things that were causing compile-time warnings:
-	* exec.cc (_execve): add missing const to args to match def
-	of execve in newlib which this calls.
-	(sexecve): add missing const to def
-	(sexeclpe): don't need to cast argv in sexecvpe call
-	(sexecvpe): add missing const to def
-	* winsup.h: correct _execve proto, add protos for login/logout
-	* syscalls.h: correct sexecve, sexecvpe protos
-	* include/Windows32/Base.h: NULL should be defined differently
-	for C++
-	* init.cc: respacing
-
-Tue Sep 23 17:05:50 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* dcrt0.cc (dll_crt0_1): don't use alloca for allocating storage
-	for environment blocks because setenv() uses realloc!
-
-Tue Sep 23 17:05:50 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* Makefile.in (LD_STUFF): Add datestamp.o after DLL_OFILES.
-        (datestamp.o): New target.  datestamp.c is generated whenever .o
-        files change.  It creates a file containing a "date stamp"
-        which is used by the function "cygname" to create named
-	shared memory, events, mutexes, and semaphores used by
-	cygwin.dll.  The unique datestamp allows multiple loading of
-	different cygwin.dll's even when they have incompatible use
-	of shared memory areas.
-	* init.cc (dll_entry): Create the name string used by cygname
-        from the name of the invoking .dll + the datestamp of the
-        .dll from the auto-generated datestamp.c
-        * misc.cc (cygname): New function.  Creates a standard Cygnus
-        shared resource name given a prefix, a name (e.g., pinfo_mutex),
-        and a numeric suffix (e.g., a pid).  Replaces custom code in
-        several files.  Uses cygwin_dlldate from datestamp.c to construct
-        names that are unique for a given cygwin load.
-        * shared.cc (open_shared_file_map): Use standard cygname function
-        to create names for sharable objects.  Use static handle 'h'
-        so that it can be closed later by shared_terminate.
-        (shared_terminate): Guard against calling CloseHandle with a
-        NULL handle.
-        (create_shared_fd_mapping_name): Use cygname function to generate
-        the name for the "fd_map".
-
-Tue Sep 16 23:34:36 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* fcntl.cc (_fcntl): correct errno value (EBADF instead of
-	EBADFD).
-
-Tue Sep 16 17:22:28 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* include/Windows32/Defines.h: add missing defines needed
-	for NTEA usage.
-	* ntea.cc: remove them from here
-	* syscalls.cc (_link): call CreateFile with FILE_WRITE_ATTRIBUTES
-	flag instead of GENERIC_WRITE
-
-Tue Sep 16 17:22:28 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* pinfo.cc (pinfo_init): Fix a NULL pointer dereference when PID
-	environment variable contains garbage.
-
-Thu Sep 11 16:51:40 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc (ftruncate): read file pointer location at
-	beginning of function and restore it at the end
-
-Thu Sep 11 15:35:10 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-        * path.cc (backslashify): Don't turn a single trailing slash into
-        a double trailing slash.
-
-Wed Sep 10 11:40:55 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-        * include/Windows32/Structures.h: Add PACKED to PRINTDLG.
-        * include/Windows32/Functions.h: Add STDCALL to a few function
-        declarations.
-
-Tue Sep  9 02:12:18 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* syscalls.cc (_link): Implement hard links under NT with NTFS
-	using the backup API.  Default to copying the file (what we did
-	before).
-
-Mon Sep  8 20:19:09 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	Merge in the following changes:
-
-        Thu Aug 21 13:30:12 1997  Ian Lance Taylor  <ian@cygnus.com>
-        * assert.cc: New file.
-        * Makefile.in (DLL_OFILES): Add assert.o.
-        (assert.o): New target.
-        * pinfo.cc (cygwin32_winpid_to_pid): New C function.
-        * cygwin.din: Add cygwin32_winpid_to_pid.
-        * include/sys/cygwin.h: Include <sys/types.h>.
-        (cygwin32_winpid_to_pid): Declare.
-        * pinfo.cc (pinfo_init): Add debug_printf showing pid and pgid.
-
-        Wed Aug 20 13:24:30 1997  Ian Lance Taylor  <ian@cygnus.com>
-        * spawn.cc (env_sort): New static function.
-        (spawn_guts): Sort the environment before passing it to
-	CreateProcess.
-        * exceptions.cc (exit_already): New file static variable.
-        (__cygwin_exception_handler): If exit_already is set, just
-        return.  If we get an exception we don't recognize, let the next
-        exception handler handle it.  Just ignore the INVALID_HANDLE
-        exception.
-        (really_exit): Remove file static exit_already variable; use the
-        global one.
-        (events_terminate): Set exit_already.
-        * include/Windows32/Defines.h (EXCEPTION_INVALID_HANDLE): Define.
-        (STATUS_INVALID_HANDLE): Define.
-        * include/Windows32/Functions.h: Declare some shell functions.
-
-Mon Sep  8 17:40:46 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):	
-	* dcrt0.cc (_exit): Kill the foreground process group on session
-	leader exit only if job control is in progress.
-	* exceptions.cc (ctrl_c_handler): protect the code with critical
-	section.  This helps stability under Win 95.
-	* include/sys/strace.h: add new wm_printf macro
-	* signal.cc (kill_worker): window message number changed (window
-	messages WM_USER-WM_USER+0x100 reserved for common controls on
-	windows95).  Debug print added.
-	* spawn.cc (spawn_guts): removed unneeded flag DETACHED_PROCESS.
-	* strace.cc: defines for SIGNAL and ASYNCIO messages added.
-	* tty.cc (create_tty_master): initialize speed fields of termios
-	structure.
-	(fhandler_pty_master::open): likewise.
-	* window.cc (WndProc): debug print added, window message number
-	changed.
-	* winsup.h: WM_ASYNCIO number changed.
-
-Mon Sep  8 16:40:46 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* fhandler.h: set_w_binary/set_r_binary now defined to
-	return void
-	* grp.cc (getgroups): always return an array of length 1 where
-	the element is the user's gid.
-	* pinfo.cc (pinfo_init): verify that we haven't exceeded the
-	maximum number of processes
-	(pinfo_list::allocate_pid): ditto
-	* include/Windows32/Functions.h: add noreturn attrib to ExitProcess
-	* include/sys/strace.h: change strace defs so strace-related
-	printfs will automatically add __FUNCTION__: to the beginning,
-	rename __sys_printf to strace_printf.
-	* *.cc: remove function names from debug printfs in favor of the
-	new scheme where they are automatically added, change __sys_printf
-	references (now strace_printf).
-	* smallprint.c (__small_vsprintf): new function displayer code
-	to support the above changes
-
-Wed Sep  3 12:44:45 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: split subdir_do into subdir_dobefore and
-	subdir_doafter to reflect whether the subdir in question
-	should be built before or after the top level is built
-	(e.g. glob needs to be built before libcygwin.a but libcygwin.a
-	needs to be built before utils).
-
-Thu Aug 28 12:09:39 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* configure.in: when setting up EXE_LDFLAGS, correct the
-	location of crt0.o to ../../newlib since EXE_LDFLAGS is used
-	by Cygwin32 subdirectories where newlib is two directories up
-	instead of one.
-	* configure: regenerate with autoconf
-
-Thu Aug 28 00:13:11 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	Replace all licensing-related headers in all Cygnus-owned
-	files.  Instead of listing terms at the top of each file, now
-	we simply refer to:
-	* CYGWIN32_LICENSE: new file listing Cygwin32 licensing terms
-
-Wed Aug 27 17:40:16 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: export random, srandom
-
-Wed Aug 20 16:56:39 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: remove unused winsock-related build rules
-	that were commented out, minor comment changes, remove
-	test.exe build rule.
-
-Wed Aug 20 14:45:17 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: link cygwin.dll with -lm -lgcc -lc -lgcc instead
-	of -lc -lm -lm -lgcc so lgcc finds abort().  Add definitions that
-	will eventually be used to build a cygwindebug.dll used by gdb
-	so gdb can debug a buggy cygwin.dll.  Change some variable names
-	to have underscores in them (DLL_NAME, LIB_NAME, DEF_FILE, etc.).
-	Comment out text.exe build rule. 
-
-Tue Aug 19 20:41:51 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* dcrt0.cc: respace, modify some comments slightly
-
-Tue Aug 19 16:17:57 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: include ../libiberty/random.o, stop including
-	librx since it is LGPL'd code.
-	* stubs.cc: add stubs for regcomp, regexec, regerror, regfree
-	* dcrt0.cc (dll_crt0_1): default to not support tty/pty devs,
-	default to not displaying the running process in the title bar.
-
-Fri Aug 15 18:23:43 1997  Rob Savoye  <rob@cygnus.com>
-
-	Add mingw directory for the minimalist cygwin environment.
-	See mingw/ChangeLog for changes specific to that directory
-
-	* configure.in: Add mingw to AC_CONFIG_SUBDIR.
-	* configure: Regenerated from autoconf 2.12 with Cygnus	patches.
-	* Makefile.in: Use subdir_do which uses the value of $SUBDIRS
-	rather than having seperate target for each directory.
-	* glob/Makefile.in: Add a phony target for install.
-	* configure.in: Add mingw to AC_CONFIG_SUBDIR.
-
-Fri Aug 15 01:12:19 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* times.cc: add missing extern "C"s around exported functions
-
-Thu Aug 14 17:00:32 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* console.cc (fhandler_console::input_tcsetattr): clear iflag_ and
-	lflag_ when tty support enabled.
-	(FakeReadFile): do not interrupt read when tty support enabled.
-	Do not reset signal_arrived event.
-	* cygwin.din: add exports - cf(g)set(i)ospeed, login, logout, ttyslot
-	* dcrt0.cc (_exit): kill orphaned childs with SIGHUP and SIGCONT
-	on group leader exit, kill foreground process group on session
-	leader exit.
-	* dirsearch.cc (closedir): check for FindFirst() was called
-	* exceptions.cc: include mywinsock.h.
-	(call_handler): call WSACancelBlockingCall to try to interrupt
-	blocking winsock call, do PulseEvent() instead of SetEvent().
-	(ctrl_c_handler): clear pending SIGCONT on stop signals, clear all
-	pending stop signals on SIGCONT, suspend the thread before resuming
-	to avoid W95 bug, process pending signals on SIGCONT, add signals to
-	pending if the process is stopped.
-	* fcntl.cc (fcntl): some code rearrangement to always do debug printfs
-	on call exit.
-	* hinfo.cc: include stdio.h
-	(hinfo_vec::build_fhandler): always add ttynum to tty's filename
-	(hinfo_vec::dup2): fix return value initialization and errno setting.
-	* include/netdb.h: typedef for sig_t removed
-	* include/sys/termios.h: octal constants changed to hexadecimals
-	to simplify debugging.
-	* misc.cc: include unistd.h and utmp.h
-	(login): new
-	(logout): new
-	* pinfo.cc (lock_pinfo_for_update): debug printf added
-	(pinfo::record_death): mark processes as orphaned on group leader
-	exit.
-	* select.cc (cygwin32_select): ResetEvent() removed
-	* signal.cc: unneeded ResetEvents removed
-	(_kill): ignore stop signals from a member of orphaned process group,
-	kill self process the last on group kill.
-	(sigaction): reset pending SIGCHLD when the disposition is set to
-	default.
-	* spawn.cc (spawn_guts): ResetEvent removed
-	(cwait): do not interrupt the call
-	* strerror.cc: include stdio.h, reenable disabled cases, remove
-	duplicated cases, return decimal error value in the default case.
-	* syscalls.cc (setsid): set process group id to process id when setsid
-	called.
-	(setpgid): check for negative pgid
-	* syslog.cc (syslog): %m macro support added
-	* termios.cc (cfg(s)eti(o)speed): new fuctions needed to support
-	NIST PCTS requirements.
-	* tty.cc: include utmp.h.
-	(ttyslot): new
-	(tty_list::terminate): fill in utmp on tty master exit
-	(tty_list::allocate_tty): check for tty master pocess alive
-	(create_tty_master): fill in utmp
-	(do_input): restart tty output on interrupt
-	(fhandler_tty_slave::fhndler_tty_slave): ttynum logic moved to
-	build_fhandler.
-	(fhandler_tty_slave::open): set tty's session id to sid of the calling
-	process.
-	(fhandler_tty_slave::write): check for TOSTOP bit
-	(fhandler_tty_slave::fstat): allow access to tty to everyone
-	(fhandler_tty_slave::ioctl): check for TOSTOP bit
-	* tty.h: ttyslot prototype added
-	* wait.cc (wait4): check for valid value of option argument added
-	* winsup.h: define PID_ORPHANED, move tty_list array to the end
-	of shared area.
-
-Thu Aug 14 11:42:59 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* path.cc (slash_unc_prefix_p): Correct check of path[3].  Permit
-	numbers after the host name.
-
-	* include/Windows32/Defines.h: Correct value for SM_CMETRICS,
-	SM_CXDRAG, SM_CYDRAG, SM_CXEDGE, SM_CYEDGE, SM_CXFIXEDFRAME,
-	SM_CYFIXEDFRAME, and add SM_MOUSEWHEELPRESENT.
-
-Wed Aug 13 20:11:52 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* fork.cc (cygwin_fork_helper1): If we don't have a console, pass
-	DETACHED_PROCESS to CreateProcess.
-	* spawn.cc (spawn_guts): Likewise.
-
-Tue Aug 12 19:51:32 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* include/Windows32/Structures.h (IMAGE_DOS_HEADER): Remove
-	dos_message and nt_signature fields; they aren't present in the
-	Windows header file.
-
-Wed Aug  6 16:27:13 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* include/Windows32/Structures.h: Define LPMEASUREITEMSTRUCT as a
-	pointer to MEASUREITEMSTRUCT.
-
-	* syscalls.cc (_stat_worker): In directory case, only set
- 	STD_WBITS in st_mode if FILE_ATTRIBUTE_READONLY is clear.
-	(access): Remove special case for directory.
-
-	* include/Windows32/Defines.h (HKEY_DYN_DATA): Define.
-	(REG_FULL_RESOURCE_DESCRIPTOR): Define.
-	(REG_RESOURCE_REQUIREMENTS_LIST): Define.
-
-Mon Aug  4 21:15:05 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* glob/Makefile.in: Add include of newlib/libc/sys/cygwin32 to
- 	explicit .c.o rule so that dirent.h is found.
-
-Thu Jul 24 02:14:24 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* cygwin.din: fpathconf, initgroups - new exports
-	* console.cc: new static variable CONSOLE_SCREEN_BUFFER_INFO info
-	(fhandler_console::scroll_screen): local variable info removed
-	(fhandler_console::open): likewise
-	(fhandler_console::ioctl): likewise
-	(fhandler_console::clear_screen): likewise
-	(fhandler_console::cursor_set): likewise
-	(fhandler_console::cursor_rel): likewise
-	(fhandler_console::cursor_get): likewise
-	(fhandler_console::write_normal): fixed scroll region bug, termcap
-	"cs" entry works now
-	* dcrt0.cc (dll_crt0_1): set file API to use OEM charset, convert
-	command line from ANSI to OEM charset.
-	(_exit): clear stopsig value on process exit
-	* exceptions.cc (call_handler): add one millisecond delay before
-	SetEvent()
-	(ctrl_c_handler): clear pending stop signals on SIGCONT, do not send
-	SIGCHLD to parent on process resuming; some debug printfs added; do
-	not call _exit() in a context of signal handling thread (would cause
-	more harm than good); fixed a bug with SA_NOCLDSTOP flag.
-	* fhandler.cc (fhandler_base::open): use full win32 path name to
-	generate inode number namehash instead of unix filename.
-	* fork.cc (cygwin_fork_helper1): block all signals while child and
-	parent are in fork() code
-	* grp.cc (initgroups): new stub added
-	* include/limits.h: new posix defines added
-	* include/sys/termios.h: typedef speed_t as unsigned char
-	* path.cc (mount_info::conv_to_posix_path) bugfix
-	* pinfo.cc (pinfo_list::operator []): PID_NOT_IN_USE check added
-	(pinfo::record_death): set child's ppid to 1 on parent exit
-	* signal.cc (sleep): correct return value if sleep call was
-	interrupted
-	(_kill): correct return value if killed pid was not found.
-	(sigaction): correct return value on handling non-handlable
-	signals, clear pending ignored signals
-	(sigsuspend): sigsuspend call should always return -1 and set errno
-	to EINTR.
-	* spawn.cc: respace
-	* syscalls.cc: map ERROR_NO_DATA to EPIPE instead of ENODATA
-	(isatty): fixed return value
-	(fpathconf): new
-	(pathconf): rewritten
-	(ttyname): fixed return value
-	* sysconf.cc (sysconf): misc fixes
-	* termios.cc (tcsendbreak): corrected errno set
-	(tcdrain): likewise
-	(tcflush): likewise
-	(tcflow): likewise
-	(tcsetattr): likewise
-	(tcgetattr): likewise
-	(tcgetpgrp): likewise
-	(tcsetpgrp): likewise
-	* tty.cc (fhandler_tty_slave::ioctl): TCGETA/TCSETA support added
-	* wait.cc (_wait): wait() syscall should do not terminate if
-	a child is stopped.
-	(wait4): wait calls should wait childs only; fixed a bug with
-	nprocinfo count; fixed signal handling.
-	
-Thu Jul 24 02:10:25 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* uname.cc: uname now outputs Cygwin32_NT or Cygwin32_95
-	instead of Cygwin32/NT or Cygwin32/95.
-
-Thu Jul 24 02:10:25 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* cygwin.din: sexecve, sexecl, sexecle, sexeclp, sexeclpe,
-	sexecv, sexecp, sexecvpe - new exports
-	* exceptions.cc (ctrl_c_handler): do not raise SIGHUP on
-	CTRL_LOGOFF_EVENT to prevent termination of cygwin application
-	run as NT service on user logoff, raise SIGHUP instead of SIGQUIT
-	on system shutdown, clear stopped status in inuse_p on SIGCONT,
-	set stopped status on stop signals, call _exit() on process
-	termination in a context of signal thread to terminate while
-	in a blocking win32 syscall.
-	* exec.cc: include unistd.h and ctype.h.
-	(_execve): code moved to sexecve, call sexecve with a NULL hToken
-	handle.
-	(sexecve): new, check path, argv[0] and envp to null values,
-	pass nToken handle to spawn_guts().
-	(sexecl): new (code derived from spawn family of functions in
-	spawn.cc)
-	(sexecle): new
-	(sexeclp): new
-	(sexeclpe): new
-	(sexecv): new
-	(sexecp): new
-	(strccopy): new
-	(sexecvpe): new
-	* fhandler.cc (fhandler_base::fstat): add STD_RBITS and STD_WBITS
-	to st_mode of non-file handles.
-	(fhandler_dev_floppy::open): clear O_TRUNC bit.
-	(fhandler_dev_tape::open): likewise
-	* fhandler.h (fhandler_pty_master): new member pktmode (flag to
-	indicate pty's packet mode)
-	* fork.cc (cygwin_fork_helper1): call uinfo_init () in a child code
-	to read /etc/passwd, /etc/group into memory.
-	* hinfo.cc (hinfo_vec::build_fhandler): check socket names for right 
-	inheritance on exec().
-	* include/Windows32/Defines.h: fixed a typo in LPSTR_TEXTCALLBACKA
-	definition
-	* include/Windows32/Functions.h: added prototype for
-	ImpersonateLoggedOnUser() API call.
-	* net.cc (cygwin32_socket): duplicate socket handle as inheritable
-	to avoid Windows95 socket inheritance bug, close the original socket.
-	(cygwin32_accept): likewise.
-	* path.cc (mount_info::conv_to_win32_path): do not add trailing
-	backslash to UNC device names like "\\.\a:", "\\.\tape0:" etc.
-	* pinfo.cc (pinfo::record_death_nolock) set PID_WAITING_FOR_PARENT
-	bit to inuse_p instead of assignment - inuse_p is a bit set now.
-	(pinfo::record_death): check PID_WAITING_FOR_PARENT bit instead of
-	comparison.
-	* select.cc (fd_pipe_map::convert_to_unix_fdset): deal with pipe
-	errors.
-	(pipethread): likewise
-	* shared.cc (create_shared_fd_table): allow any process to access
-	shared arg, needed for sexec() family implementation
-	* signal.cc (kill_worker): fixed a typo in debug printf
-	* spawn.cc (spawn_guts): new hToken argument (security token of
-	logged on user for sexec() calls implementation), added checks for
-	zero prog_arg and argv[0], if hToken is not NULL run
-	CreateProcessAsUser() on the current window station/desktop, or
-	just CreateProcess() otherwise, close hToken after the process is
-	created.
-	(_spawnve): pass NULL hToken to spawn_guts().
-	* syscalls.cc (_read): set process's read status while in a read call
-	(_write): set process's write status while in a write call
-	(stat_worker): if GetFileAttributes() fails, try to call fstat to
-	support raw devices
-	* syscalls.h: include windows.h, added sexec() family functions
-	prototypes.
-	* sysdef/i386/kernel32.def: ImpersonateLoggedOnUser - new export
-	* tty.cc: tty attachment logic changed - tty_list::count field
-	counts now number of tty opens, but not a number of processes,
-	attached to a tty.
-	(tty_init): do not call attach_tty() in a exec'ed process
-	(attach_tty): correct return value if !use_tty.
-	(tty::init): initialize pgid and hwnd fields.
-	(tty_list::terminate): clearout tty on master exit.
-	(tty_list::allocate_tty): fixed a bug in a tty allocation.
-	(fhandler_tty_master::init): on NT allow any process to open
-	tty-master process for handle duplication, create synchronisation
-	events with a world-wide access, initialize winsize structure with
-	a default values.
-	(fhandler_tty_slave::open): if a tty doesn't have process group set,
-	set it to a process group of current process.
-	(fhandler_tty_slave::write): added missed \n to debug print, tty
-	write synchronization moved to a more correct place.
-	(fhandler_tty_slave::read): Sleep time changed for conformance with
-	other sleeps.
-	(fhandler_tty_slave::tcsetattr): synchronization added
-	(fhandler_tty_slave::ioctl): initialize arg.winsize with a tty-stored
-	value, copy the result of ioctl call to winsize.
-	(fhandler_pty_master::fstat): small fix
-	(fhandler_pty_master::open): on NT allow any process to open
-	pty-master process for handle duplication, initialize winsize
-	structure with a default values.
-	(fhandler_pty_master::read): check for pipe errors, changes to support
-	packet mode
-	(fhandler_pty_master::ioctl): rewritten, no longer a stub.
-	(fhandler_pty_master::linearize/de_linearize): save/restore pktmode
-	value.
-	* tty.h (class tty): winsize - new member
-	* utils/ps.cc: show process status just after tty number field
-	* winsup.h: defines for new bits in inuse_p added, spawn_guts()
-	prototype changed. 
-
-Thu Jul 24 02:10:25 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* Makefile.in: Add tty.o to link and dependency lists, add
-	tty.h to headers list
-	* console.cc (fhandler_console::open): save open call flags
-	(fhandler_console::input_tcsetattr): clear all console modes if
-	tty support enabled
-	(FakeReadFile): restart read on signal delivering, changed CTRL
-	macro to CONTROL to avoid conflict with sys/termios.h, copy as
-	much as possible chars to output buffer instead of call to
-	undo_input after every char to prevent timeouts problem.
-	* cygwin.din: srandom, ptsname, grantpt, unlockpt - new exports.
-	* dcrt0.cc: include tty.h, new use_tty global variable.
-	(dll_crt0_1): call events_init() on application startup, set
-	use_tty to FALSE if CYGWIN_NOTTY environment variable is defined,
-	do not change console title if CYGWIN_NOTITLE environment
-	variable set, call tty_init().
-	(_exit): call tty_terminate(), events_terminate() and others
-	in the right order.  All modifications of console title are
-	mutexed to allow tty code to obtain console window handle right.
-	* exceptions.cc (exception_init): initialization of signal_arrived
-	event moved to events_init().
-	(call_handler): raise signal arrived event after resuming main
-	thread.
-	(__cygwin_exception_handler): raise signal instead of calling
-	ctrl_c_handler, because exception handler is called in a context
-	of the thread, caused exception, and SuspendThread in call_handler
-	blocks itself :-)
-	(ctrl_c_handler): clear stopsig on SIGCONT delivery, call
-	ResumeThread until suspend count > 1, notify parent about child's
-	status changed.  Care about handling SIGCONT signal. On stop
-	signals release vital mutexes used by stopped thread, save
-	signal number for wait(WUNTRACED) calls, notify parent about child's
-	status change.  Do not stop processes running without job control
-	(when pgid == 0).  Ensure that main thread is unblocked before
-	call _exit().
-	(events_init): new
-	(events_terminate): new
-	* fcntl.cc (_fcntl): use saved open flags on F_GETFL/F_SETFL instead
-	of game with access_ variable.  Is this variable longer needed?
-	* fhandler.cc (fhandler_base::linearize/de_linearize): save/restore
-	openflags_ variable.
-	(fhandler_base::open): save file open flags.
-	* fhandler.h (fhandler_base): new openflags_ member, new member
-	functions get_flags/set_flags, new virtual functions ptsname,
-	dup_for_fork, tcget(set)pgrp
-	(fhandler_pipe): remove always_write/except_ready because pipes
-	are always write ready (not true...) and selectable on read.
-	new classes fhandler_tty_slave, fhandler_pty_master,
-	fhandler_tty_master
-	* fork.cc (cygwin_fork_helper1): inherit control tty number on fork,
-	call tty_init on child startup.
-	* hinfo.cc: include stdlib.h and ctype.h.
-	(hmap_init): take care on exec'ed processes.
-	(init_std_file_from_handle): open /dev/tty for standard handles if
-	tty usage enabled.
-	(build_fhandler): check for tty slave and pty master devices.
-	* include/exceptions.h: exception handler returns "int" (exception
-	handling code), not "void".
-	* include/termios.h: new defines, struct winsize must contain
-	ws_xpixel and ws_ypixel members (commented now to avoid
-	incompabilities with existing binaries.  Should be uncommented in
-	next release.
-	* net.cc (gethostbyaddr): corrected return value
-	* passwd.cc (parse): remove trailing newline from password
-	lines (user's shell was reported with trailing newline before).
-	* pinfo.cc (lock_pinfo_for_update): open mutex code moved to
-	events_init() in exceptions.cc.
-	(destroy_pinfo_lock): removed, pinfo_mutex is now closed in
-	events_terminate() in exceptions.cc.
-	(init_self): the initial value for pgid must be 0 (no job-controlled
-	process).
-	* select.cc: all debug_printf's changed to select_printf.
-	(fd_pipe_map): new class to implement (polling...) select on pipes.
-	(pipethread): new
-	(cygwin32_select): comment out socket only case since generic
-	code (select on different types of handles) works for sockets too
-	but is interruptable.  The case for always_ready_used is used now
-	and for polling select (zero timevalue).  Changes to support
-	select on pipes.
-	* shared.cc (shared_info::initialize): initialize tty table.
-	* signal.cc (sleep/usleep/sigsuspend/pause): signal_arrived moved
-	from u area to dll's address space, signal_arrived is manual reset
-	event now.
-	(_raise): implemented as kill (self, sig).
-	(kill_worker): new.  Use SendMessage instead of PostMessage to avoid
-	some timing problems.
-	* spawn.cc: include tty.h.
-	(spawn_guts) call close_all_files() on exec, call tty_terminate()
-	before process exit.  Some changes due to moving signal_arrived to
-	dll's address space.
-	(_spawnve): inherit control tty number on spawn.
-	* syscalls.cc (close_all_files): reenabled.  The code is ok after
-	all! The troubles were due to incorrect usage on exec() calls.
-	(setsid): no longer a stub
-	(ptsname): new
-	* termios.cc: all syscall_printf's changed to termios_printf.
-	(tcget(set)pgrp): rewritten, no longer a stub.
-	* times.cc (utimes): It looks like Win32 does not allow changing
-	times of directories, so just return success in this case.
-	* tty.cc: new file
-	(tty_init): new
-	(tty_terminate): new
-	(attach_tty): new
-	(detach_tty): new
-	(tty::init): new
-	(tty_list::terminate): new
-	(tty_list::connect_tty): new
-	(tty_list::free_tty): new
-	(tty_list::init): new
-	(tty_list::allocate_tty): new
-	(fhandler_tty_master::fhandler_tty_master): new
-	(create_tty_master): new
-	(fhandler_tty_master::init): new
-	(doecho): new
-	(do_input): new
-	(process_input): new
-	(do_output): new
-	(process_output): new
-	(process_ioctl): new
-	(fhandler_tty_slave::fhandler_tty_slave): new
-	(fhandler_tty_slave::open): new
-	(fhandler_tty_slave::init): new
-	(fhandler_tty_slave::close): new
-	(fhandler_tty_slave::write): new
-	(fhandler_tty_slave::read): new
-	(fhandler_tty_slave::linearize): new
-	(fhandler_tty_slave::de_linearize): new
-	(fhandler_tty_slave::dup): new
-	(fhandler_tty_slave::dup_for_fork): new
-	(fhandler_tty_slave::fstat): new
-	(fhandler_tty_slave::tcgetattr): new
-	(fhandler_tty_slave::tcsetattr): new
-	(fhandler_tty_slave::tcflush): new
-	(fhandler_tty_slave::tcsetpgrp): new
-	(fhandler_tty_slave::tcgetpgrp): new
-	(fhandler_tty_slave::send_ioctl_request): new
-	(fhandler_tty_slave::ioctl): new
-	(fhandler_pty_master::fhandler_pty_master): new
-	(fhandler_pty_master::fstat): new
-	(fhandler_pty_master::open): new
-	(fhandler_pty_master::close): new
-	(fhandler_pty_master::write): new
-	(fhandler_pty_master::read): new
-	(fhandler_pty_master::tcgetattr): new
-	(fhandler_pty_master::tcsetattr): new
-	(fhandler_pty_master::tcflush): new
-	(fhandler_pty_master::ioctl): new
-	(fhandler_pty_master::ptsname): new
-	(fhandler_pty_master::linearize): new
-	(fhandler_pty_master::de_linearize): new
-	(fhandler_pty_master::dup_for_fork): new
-	(grantpt): new
-	(unlockpt): new
-	* tty.h: new
-	* utils/ps.cc: display process's control tty number.
-	* wait.cc (wait_for_single): removed.
-	(wait_for_any): all code moved to wait4().
-	(wait4): rescan process table on child status changes, support for
-	WUNTRACED flag, avoid time races on child exit, correct return
-	value on timeout.
-	* window.cc: misc changes to wait creation of process's hidden
-	window to avoid race conditions on multiprocessor systems.
-	* winsup.h: misc changes to support all of the above.
-
-Thu Jul 24 02:10:25 1997  Geoffrey Noer  <noer@cygnus.com>	
-
-	* net.cc (cygwin32_shutdown): New implementation to replace
-	stub previously present
-
-Tue Jul 22 14:59:22 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * cygwin.din: remove random, srandom
-        * Makefile.in: remove random/srandom-related lines
-
-Tue Jul 22 14:10:32 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-        * path.cc (realpath): New C function.
-        * cygwin.din: Export realpath.
-
-        * cygwin.din: Export srandom.
-
-Wed Jul  9 12:26:03 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: libiberty random.o ends up in winsup, link
-	in that obj for now
-
-Tue Jul  8 14:02:41 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libcmain.cc (main): Pass wShowWindow field from startup info to
-	WinMain.
-
-Mon Jul  7 17:47:48 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc: respace, reword comments
-	* times.cc (utimes): add FIXME
-
-Tue Jun 24 18:31:27 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* winsup.h: adjust protos to reflect the above, add enum os_type
-	which contains {winNT, win95, win32s, unknown}
-	* security.cc (is_nt): Delete
-	* syscalls.cc (windows_95): Delete
-	(get_os_type): New local function which returns os_type.  Replaces
-	windows_95() and is_nt().
-
-	* fhandler.cc: Reformat. Call get_os_type() instead of
-	windows_95() and/or is_nt(), reorder so NT cases are first.
-	* mmap.cc: ditto
-	* net.cc: ditto
-	* syscalls.cc: ditto 
-	* syslog.cc: ditto
-	
-	* uname.cc (uname): call get_os_type to fill new our_os local
-	variable, check that when filling out utsname struct, default
-	to i386 when we can't find out the specific Intel processor
-	variant.
-	* fhandler.cc (get_file_owner): remove doit variable
-	(get_file_group): ditto
-	* mmap.cc: extern "C" individual functions instead of wrapper
-	around most of file.
-	* misc.cc: minor reformat
-	* heap.cc (_sbrk): split a = b = c statement into two to
-	make code clearer and avoid invalid C++ casting warning during
-	compile.
-	* path.cc (symlink_follow): initialize syml_p and exec_p to zero
-	* select.cc: respace
-	(selectthread): cast first arg of WINSOCK_FD_SET
-	* ntea.cc (NTReadEARaw): add missing casts in front of malloc calls
-	* utils/mount.cc: remove mixed option since that hasn't been
-	supported for quite some time
-
-Sun Jun 22 17:27:03 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* include/windows.h: If RC_INVOKED is defined, don't include
-	limits.h, stdarg.h, Structures.h, Functions.h or Sockets.h, and
-	don't typedef BOOL.
-	* include/Windows32/Base.h: Don't do any typedefs if RC_INVOKED is
-	defined.
-
-	* include/Windows32/Sockets.h (MAXHOSTNAMELEN): Don't define if
-	already defined.
-	* include/sys/param.h (MAXHOSTNAMELEN): Likewise.
-
-Fri Jun 20 11:06:09 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* include/sys/wait.h: correct operator precidence bug
-	in WIFSIGNALED
-
-Thu Jun 19 12:58:45 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	Handle unblocked pending signals on sig_mask changes
-	* exceptions.cc (return_handler): renamed to set_process_mask
- 	(set_process_mask): new; use to set process mask instead of direct
-	u->self->sig_mask manipulations.
-	* winsup.h: rename return_handler proto to set_process_mask	
-	* signal.cc: throughout file, call set_process_mask() instead of
-	direct manipulations of u->self->sig_mask.
-	(pause): new
-	* cygwin.din: add pause() export
-	* syscalls.cc (system): correct return value
-
-Wed Jun 18 22:01:56 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: add $(srcdir)/../newlib/libc/sys/cygwin32 to
-	the list of includes since that's where sys/dirent.h is
-	supposed to live
-	* include/sys/dirent.h: moved to newlib/libc/sys/cygwin32/sys
-
-Wed Jun 18 13:56:47 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* signal.cc (sigsuspend): deal with pending unblocked signals	
-	* winsup.h: add proto for return_handler (sigset_t)
-
-Wed Jun 18 02:02:13 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	respaced console.cc, fhandler.cc, syscalls.cc, pinfo.cc,
-	fork.cc, spawn.cc
-
-Tue Jun 17 14:57:09 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):	
-	* cygwin.din: add getpgid, killpg exports, delete duplicate
-	random export
-	* fork.cc (cygwin_fork_helper1): inherit pgid and sid on fork
-	* misc.cc (cygwin32_*env): save environ value in __cygwin_environ
-	too.  Is __cygwin_environ variable really neccessary?  Why not
-	export cygwin.dll's environ variable with "__cygwin_environ" name?
-	* pinfo.cc (pinfo::init_self): initialize pgid and sid
-	* signal.cc (kill_worker): new
-	(_kill): rewritten to support process groups
-	(killpg): new
-	* spawn.cc (_spawnwe): inherit pgid and sid on spawn family calls
-	* stubs.cc (setpgrp, getpgrp): remove stubs
-	* syscalls.cc (setpgid, getpgid, setpgrp, getpgrp): new
-	* termios.cc (setpgid): remove stub
-	* utils/ps.cc (main): add pgid to output, change output
-	format
-	* wait.cc (wait_for_any): add intpid argument, arrays ctable and
-	ptable have now fixed MAXIMUM_WAIT_OBJECTS size to avoid extra
-	scan of process table, changes for process groups support.
-	(wait4): misc changes to support process groups
-	* winsup.h (pinfo class): add new variables pgid, sid.
-	Define __cygwin_environ.
-
-Mon Jun 16 18:30:21 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* spawn.cc (spawn_guts): set child->hProcess and child->hThread,
-	CloseHandle on pi.hThread at end of spawn_guts instead of right
-	after starting the child process,
-	_P_WAIT needs to be handled separately from _P_OVERLAY
-
-Sun Jun 15 23:51:10 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* cygwin.din: remove setenv/getenv-related exports,
-	export cygwin32_ equivalents
-	* exec.cc: check ?
-	* misc.cc (cygwin32_getenv): new
-	(cygwin32_putenv): new
-	cygwin32_setenv): new
-	(cygwin32_unsetenv): new
-	* spawn.cc: call cygwin32_getenv instead of getenv,
-	call spawn with *u->envptr instead of environ
-	* winsup.h: define **environ as extern, define *cygwin32_getenv
-
-Sun Jun 15 20:51:09 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* Makefile.in: add ../libiberty/random.o to EXTRA_OFILES
-	* cygwin.din: remove exports of tgetent and _tgetent, added random
-	* exception.cc (exceptions_init): make OurThread handle
-	noniherittable, remove unused buf array.
-	(return_handler): add restmask argument (sig_mask value before
-	calling signal handler)
-	(call_handler): save sig_mask in user's stack before calling signal
-	handler, change PulseEvent() call to SetEvent() -- there were
-	losses of signal_arrived events if main thread was not in wait
-	state.
-	(ctrl_c_handler): add support for SIGIO signal.
-	* fhandler.cc (fhandler_base::linearize/delinearize):
-	save/restore async_ flag
-	(fhandler_base::fhandler_base): clear async_ flag
-	* fhandler.h: add async_ as new variable in fhandler_base,
-	add get_async/set_async functions
-	* misc.cc (tgetent): remove stub
-	* net.cc (fhandler_socket::write): raise SIGPIPE if write to
-	disconnected socket.
-	(cygwin32_accept): check the result of find_unused_handle() before
-	accept() call, set errno if no more file descriptors available.
-	(fhandler_socket::ioctl): add support for async I/O on sockets
-	* pinfo.cc (pinfo::clearout): clear sig_pending mask
-	* syscalls.cc (readv, writev): rewrite
-	* window.cc (WndProc): add support for async I/O
-	* winsup.h: define WM_ASYNCIO
-
-Mon Jun  9 18:51:09 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/winsock.h: fix protection wrapper name
-
-Fri Jun  6 12:41:09 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* include/Windows32/Defines.h: Define CommonDlgExtendedError
-	return values (CDERR_*, PDERR_*, CFERR_*, FNERR_*).  Define
-	TEXTMETRIC tmPitchAndFamily values (TMPF_*).
-
-	* include/dlgs.h: New file; just includes windows.h.
-	* include/cderr.h: Likewise.
-
-	* libcmain.cc (main): Don't pass the program name to WinMain.
-
-	* cygwin.din: Export strlwr and strupr.
-
-	* include/winreg.h: New file; just includes windows.h.
-	* include/winsock.h: New file; just includes windows.h and
-	Windows32/Sockets.h.
-	* include/Windows32/Sockets.h: Don't define u_char, et. al. if
-	_SYS_TYPES_H is defined.  Undefine fd_set if it is defined.
-
-	* include/Windows32/Functions.h: Define MoveMemory, FillMemory,
-	and ZeroMemory as macros.
-
-	* times.cc (_timezone, _daylight, _tzname): New global variables.
-	(tzset): New function.
-	* cygwin.din: Don't set _timezone to timezone.  Export tzset and
-	_tzset.  Export _timezone, _daylight, and _tzname.
-
-	* dcrt0.cc (__cygwin_environ): New global variable.
-	(dll_crt0_1): Set __cygwin_environ to environ.
-	* cygwin.din: Export __cygwin_environ.
-
-Thu Jun  5 17:52:02 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* times.cc (gettimeofday): Check return values and set tz_dsttime
-	correctly.
-
-Wed Jun  4 00:04:33 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler.cc (fhandler_pipe::lseek): new virtual function
-	* fhandler.h: add lseek to fhandler_pipe class
-
-Tue Jun  3 19:20:47 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* include/Windows32/Defines.h (IMAGE_DOS_SIGNATURE): Define.
-	(IMAGE_NT_SIGNATURE): Define.
-	* include/Windows32/Structures.h (IMAGE_DOS_HEADER): Define.
-
-Tue Jun  3 13:05:26 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* console.cc: respace
-	* fhandler.h: add virtual off_t lseek to fhandler_socket and
-	fhandler_tty defs, respacing
-
-Mon Jun  3 12:21:20 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-        * cygwin.din: export wait3, wait4
-        * dcrt0.cc (_exit): call fill_rusage
-	* exceptions.cc (ctrl_c_handler): increment rusage_self.ru_nsignals++
-	* fhandler.cc (fhandler_pipe::fhandler_pipe): new stub
-	* fhandler.h: add fhandler_pipe class
-	* hinfo.cc (hinfo_vec::build_fhandler): call
-	GetNumberOfConsoleInputEvents instead of GetConsoleScreenBufferInfo,
-	handle fhandler_pipe class
-	* pinfo.cc: include sys/resource.h,
-	(pinfo::clearout): erase memory associated with rusage_self
-	and rusage_children
-	* resource.cc (getrusage): rewrite
-	(add_timeval): new helper function
-	(add_rusage): new helper function
-	(fill_rusage): new helper function
-	* shared.cc (create_shared_fd_table): pass file mapping handle to
-	children letting them close it
-	* spawn.cc (spawn_guts): call fill_rusage and add_rusage as
-	appropriate
-	(cwait): ditto
-	* times.cc (__to_clock_t): add flag arg which says whether or not
-	to substract FACTOR from total
-	(times): also fill in tms_cstime and tms_cutime, add flag arg to
-	__to_clock_t calls
-	(totimeval): add extra flag passed on to __to_clock_t
-	(gettimeofday): add extra flag passed on to totimeval
-	* wait.cc (wait_for_single): add extra rusage arg, change 
-	wait_found calls to account for extra arg
-	(wait_for_any): ditto
-	(_wait): call wait4 instead of waitpid
-	(wait_found): add rusage arg, deal with it calling add_rusage as
-	appropriate
-	(wait_pid): now just calls wait4
-	(wait4): was wait_pid but adds extra rusage arg and deals with it
-	(wait3): new, calls wait4
-	* winsup.h: include sys/resource.h, add rusage_self and
-	rusage_children to pinfo class, fix totimeval proto, add protos
-	for fill_rusage and add_rusage
-	* passwd.cc: include termios.h
-	(getpass): new
-	* stubs.cc (getpass): delete old stub
-	
-Tue Jun  3 14:51:47 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* times.cc (ftime): New function.
-	* cygwin.din: Export ftime.
-
-Mon Jun  2 14:34:00 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* include/limits.h: NGROUPS_MAX should be 0
-	* include/asm/socket.h: add missing additional options
-	including SO_SNDBUF, SO_RCVBUF, et al
-	* include/sys/wait.h: include sys/resource.h, add protos for
-	wait3() and wait4().
-
-Mon Jun  2 15:26:35 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* utils/configure.in: Call AC_PROG_INSTALL.
-	* utils/configure: Rebuild.
-
-Mon Jun  2 11:44:14 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* grp.cc (getgroups): new
-	* cygwin.din: export getgroups
-
-Fri May 30 16:47:38 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* uname.cc (uname): completely rewrite, using more of the
-	SYSTEM_INFO struct to figure out information (now x86 type is
-	set correctly in Windows 95.
-	* version.h: increment CYGWIN_DLL_VERSION_MINOR
-	* include/Windows32/Structures.h: SYSTEM_INFO struct's first
-	member is dwOemId, not dwOemID according to MS docs
-
-Fri May 30 16:47:38 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* window.cc: new file
-	* Makefile.in: add window.cc to lists of source, object files,
-	and dependencies.
-	* console.cc: include <stdlib.h>, scroll_screen() added to
-	fhandler_console class,
-	add support for default screen attributes,
-	(open): set default_color on tty open
-	(linearize/delinearize): pass default_color to the child process
-	(clear_screen): fix Win95-specific bug, add support for
-	default_color.
-	(clear_to_eol): remove
-	(fhandler_console::fhandler_console): set default_color to
-	white on black
-	(char_command): add invisible screen attribute, misc changes
-	(FakeReadFile): do not convert AltGr-char to ESC-char sequence
-	to support international keyboards.
-	* cygwin.din: export setitimer, getitimer
-	* dcrt0.cc (dll_crt0_1): add call to window_init(), uppercase
-	environment vars only if started by a win32 process.
-	(_exit): add call to window_terminate()
-	* fhandler.cc: add mode argument to open() calls,
-	(fhandler_base::open): do not check for symlink in path_conv
-	calls, calls to set/get_file_attribute() instead of NTRead/WriteEA.
-	(fhandler_base::fstat): use get_file_attribute if possible
-	(fhandler_disk_file::open): remove unneeded unixattr checks
-	* fhandler.h: changes to support above.
-	* fork.cc (cygwin_fork_helper_1): pass umask value to the child,
-	call window_init() in child
-	* ntea.cc: enable EA calls, add FILE_FLAG_BACKUP_SEMANTICS
-	to CreateFile calls to support EA of directories.
-	* path.cc (symlink): add mode argument to _open call, remove
-	unneeded stuff
-	(symlink_check_worker): add checks for "system" attribute and EA.
-	* security.cc (get/set_file_attribute): new.  Calls EA code now,
-	placeholders for NTFS security support.
-	* signal.cc (alarm): remove in favor of new implementation in
-	window.cc
-	(RemoteThread): remove
-	(_kill): use window messages to emulate signals on both NT and Win95
-	* spawn.cc (spawn_guts): call window_terminate on exec()
-	(cwait): correct return result code
-	(_spawnve): add umask inheritance, some bug fixes
-	* syscalls.cc (_open): add mode argument, umask support
-	(umask): rewritten
-	(chmod): try to set file attributes, set system bit on symlinks
-	(stat_worker): fix nlinks of directories, add mode argument
-	to _open() call.
-	* syscalls.h: add mode argument to _open() prototype
-	* winsup.h: changes to support above
-
-Tue May 27 12:22:19 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* times.cc (gettimeofday): return 0 on success instead of 1
-	(utimes): init res to 0
-
-Wed May 21 11:29:24 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/limits.h: define NGROUPS_MAX
-
-Tue May 20 14:13:59 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* passwd.cc: rename function setpwend to setpwent (typo) 
-	* cygwin.din: ditto, also remove name__C9type_info from
-	exports list.
-
-Wed May 14 17:38:39 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* signal.cc (sleep): call WaitForSingleObject instead of Sleep
-	(usleep): ditto
-
-Wed May  7 15:34:07 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	Public gnu-win32 beta 18 release made
-
-Sun May  4 15:34:07 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from Mikey <jeffdb@netzone.com>:
-        * console.cc (FakeReadFile): FlushConsoleInputBuffer if
-        flags & ENABLE_LINE_INPUT and then return ReadFile
-
-Fri May  2 10:53:10 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * signal.cc: make exported functions extern "C"
-        * include/cygwin32/socket.h: replace values assigned to
-        IP_ definitions with ones suitable for use with WinSock.
-        * cygwin.din: add exports for sigpending, sigsuspend, remove
-        exports for __9type_infoPCc and before__9type_infoRC9type_info
-        * winsup.h: remove signal-related protos from winsup.h in favor
-        of newlib/libc/include/sys/signal.h
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-        * signal.cc: (sigpending) new
-        (sigsuspend): new
-        * utils/termcap: replace with one from Linux
-
-Tue Apr 29 19:03:29 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * utils/ps.cc: print Win32 pid as unsigned int so Windows 95
-        pids don't show up as negative values
-
-Tue Apr 29 17:20:57 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-        * spawn.cc (spawn_guts): allocate new cygwin PID for a child
-        created with spawn(!_P_OVERLAY)
-
-Tue Apr 29 13:24:59 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-        * console.cc: assorted console fixes
-        * select.cc (fd_socket_map::convert_to_unix_fdset): only
-        do full debug_printf if used_ valid
-        * exceptions.cc: correct constants used for checking size of
-        stack (should be negated)
-        * fhandler.cc (fhandler_base::open): fix syscall_printf typo
-
-        patch from marcus@cathcart.sysc.pdx.edu (Marcus Daniels):
-        * include/sys/mman.h: define MAP_ANON MAP_ANONYMOUS (typo fix)
-
-Mon Apr 28 15:19:44 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * cygwin.din: remove libgcc2.a internal functions
-
-Mon Apr 28 14:57:04 1997  Michael Meissner  <meissner@cygnus.com>
-
-	* cygwin.din (before__9type_infoRC9type_info): Remove, the
-	type_info::before(type_info const &) function no longer seems to
-	exist.
-
-Mon Apr 28 14:19:44 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-        * console.cc (undo_input): new
-        (scroll_screen): new
-        (fhandler_console::output_tcsetattr): fix debug printf
-        (fhandler_console::input_tcsetattr): no longer call set_w_binary
-        (fhandler_console::cursor_get): fix base_chars
-        (fhandler_console::char_command): make savex, savey globals,
-        add char buf, add code to handle clears better, many other
-        additions
-        (fhandler_console::write_normal): assorted fixes
-        (fhandler_console::write): move screen scroll code to
-        scroll_screen(), support Reset Linux terminal, Restore cursor
-        position, Save cursor position, Skip orig_colors
-        (FakeReadFile): enlarge keytable to include shift/control/alt
-        values
-        Command set still missing set pelette, character sets, and
-        UTF codes.
-
-Mon Apr 28 12:19:44 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * fhandler.cc (fhandler_base::open): only include
-        FILE_SHARE_DELETE in shared when running NT (Win 95 doesn't
-        support it).
-
-Thu Apr 24 18:57:21 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        patch from Jeremy Allison <jra@cygnus.com>:
-        Correct problem caused by setting /dev/null fd to -1 which is
-        same as INVALID_HANDLE_VALUE.
-        * fhandler.h: set DEV_NULL_HANDLE_VALUE to -2
-        * fhandler.cc (fhandler_dev_null::open): set handle to
-        DEV_NULL_HANDLE_VALUE instead of INVALID_HANDLE_VALUE
-        * hinfo.cc (hinfo_vec::build_fhandler): add case for
-        handle == (HANDLE) DEV_NULL_HANDLE_VALUE
-
-Thu Apr 24 15:12:13 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * fhandler.cc (fhandler_base::write): catch return of raw_write
-        and return -1 if it failed
-
-Thu Apr 24 10:42:01 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        path.cc (symlink): restore chmod call for now since the NTEA code
-        isn't quite up to the task yet.
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-        * exceptions.cc (ctrl_c_handler): corrections to Apr 18 patch
-        * fhandler.cc: ditto
-        * dcrt0.cc (dll_crt0_1): move console title setting code,
-        set up default signal handlers
-        * fork.cc (cygwin_fork_helper1): also set child->sigs and
-        child->sig_mask
-        * spawn.cc (spawn_guts): if mode _P_OVERLAY, set up child
-        signal handlers.
-
-Mon Apr 21 22:29:49 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * include/Windows32/ASCIIFunctions.h: remove old def of
-        GetEnvironmentStringsA, add new one based on def from Functions.h
-        * include/Windows32/Functions.h: define GetEnvironmentStrings as
-        GetEnvironmentStringsA when not unicode, remove definition of
-        GetEnvironmentStrings in favor of ones in ASCIIFunctions.h and
-        UnicodeFunctions.h
-        * include/Windows32/Defines.h: add missing XTYP_ definitions,
-        change value of XTYPF_NOBLOCK to 0x0002 from 0x2
-        * include/Windows32/Sockets.h: comment out redefinitions of
-        errno.h-type constants since MS doesn't define them and we
-        have our own in errno.h
-
-Fri Apr 18 10:40:30 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * include/Windows32/Structures.h: add typedefs for
-        LPDLGITEMTEMPLATE, PDLGITEMTEMPLATE.
-        * include/Windows32/Defines.h: define FW_REGULAR FW_NORMAL
-
-        patch from sos@prospect.com.ru (Sergey Okhapkin):
-        * exceptions.cc (ctrl_c_handler): do not reset signal
-        handler to SIG_DFL while processing the signal, instead
-        block the signal while handler executes.
-        * signal.cc (_raise): fixes related to the above
-
-Thu Apr 17 23:50:50 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.h: increase path length in mount table to MAX_PATH
-	in size instad of 30.  This will increase cygwin.dll memory
-	usage by 20K.  We need to remove static allocations from
-	path code.
-	
-Thu Apr 17 10:11:50 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* exceptions.cc (ctrl_c_handler): CTRL_CLOSE_EVENT should
-	generate SIGHUP instead of SIGQUIT
-	* signal.cc (_raise): rewrite
-
-Wed Apr 16 10:42:46 1997  Geoffrey Noer  <noer@cygnus.com>	
-
-	* version.h: increment CYGWIN_DLL_VERSION_MINOR
-	* syscalls.cc (system): use spawnvp instead of fork/exec
-	* ntea.cc: make all functions return false for now; they
-	were causing an obscene performance hit
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):	
-	* console.cc (FakeReadFile): patch to support EINTR, EIO
-	* exceptions.cc: add support for return_handler, remove
-	control-C counter
-	(return_handler): new
-	(ctrl_c_handler): handle SIGCHLD, other assorted fixes
-	* fhandler.cc (fstat): reset errno to 0
-	* passwd.cc (search_for): correct location of a debug printf
-	* select.cc: patches to handle signals better, respacing
-	* signal.cc (_raise): misc fixes
-	(_kill): call OpenProcess with PROCESS_ALL_ACCESS instead of
-	PROCESS_TERMINATE
-	* spawn.cc: more signal fixes
-	* syscalls.cc: add two new errors to errmap[]
-	(_stat_worker): fill out buf struct when stating directories
-	* wait.cc (wait_for_single): use INFINITE instead of large value
-	for timeouts
-	(wait_for_any): init nprocinfo to 1, not 0, other small fixes
-	* winsup.h: add signal_arrived to per_process class, reduce
-	amount of reserved space, add sig_pending to pinfo class
-	
-Tue Apr 15 17:01:34 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/mkpasswd.c: change default shell to /bin/sh
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* utils/kill.cc: support sending numbered signals using
-	signal code instead of just calling TerminateProcess
-
-Tue Apr 15 15:24:55 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-        * utils/Makefile.in (INSTALL): Set to @INSTALL@.
-        (INSTALL_PROGRAM): Set to @INSTALL_PROGRAM@.
-        (INSTALL_DATA): Set to @INSTALL_DATA@.
-        (INSTALL_XFORM): Remove.
-        (install): Depend upon installdirs.  Use $(program_transform_name)
-        directly, rather than using $(INSTALL_XFORM).
-        (installdirs): New target.
-
-Mon Apr 14 16:32:05 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* utils/Makefile.in (INSTALL): Change install.sh to install-sh.
-
-Mon Apr 14 12:33:22 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* registry.cc: change key name to "Cygnus Solutions" instead
-	of "Cygnus Support"
-	* security.cc: don't include windows.h, already in winsup.h
-	* Makefile.in: add dependencies section entries for security.cc
-	and ntea.cc
-
-Fri Apr 11 00:03:49 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* dcrt0.cc: add harmless cast to FreeEnvironmentStrings call
-	* registry.cc: added more presumed-harmless casts
-	* shared.cc: and another, and respacing
-	* utils/Makefile.in: don't need to link with -lkernel32 since it's
-	included automatically
-	* fhandler.cc: fhandler_console and FakeReadFile moved to
-	console.cc, stop including sys/stat.h, sys/param.h, sys/types.h,
-	stdio.h, ctype.h, pwd.h, grp.h, stdlib.h
-	reordered/respaced code so now we have all of fhandler_base, then
-	all of fhandler_disk_file, then all of fhandler_tty, etc...
-	(fhandler_base::ioctl): delete unused switch statement
-	* console.cc: added fhandler_console and FakeReadFile from
-	fhandler.cc, add includes necessary for this code
-	* grp.cc, Makefile.in: fix copyright dates
-	* ntea.cc: include string.h
-	
-Thu Apr 10 22:00:43 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* path.cc (symlink): do NTWriteEA instead of chmod using same
-	flags
-
-Thu Apr 10 17:36:43 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from gunther.ebert@ixos-leipzig.de (Gunther Ebert):
-	* Makefile.in: add libnetapi32.a to DLL_IMPORTS list, build security.o
-	* fhandler.cc (get_file_owner): new
-	(get_file_group): new
-	(fhandler_base::fstat): do another path_conv and check for error,
-	use get_file_owner and get_file_group to set buf->st_uid and
-	buf->st_gid
-	* fhandler.h: add protos for get_file_owner() and get_file_group()
-	* grp.cc (add_grp_line): new helper function
-	(read_etc_group): new helper function
-	(getgrgid): rewritten, no longer a stub
-	(getgrnam): rewritten, no longer a stub
-	(endgrent): rewritten, no longer a stub
-	(getgrent): rewritten, no longer a stub
-	* include/Windows32/ASCIIFunctions.h, include/Windows32/Base.h,
-	include/Windows32/Functions.h, include/Windows32/Defines.h,
-	include/Windows32/Structures.h, include/Windows32/UnicodeFunctions.h:
-	misc security/uid-related additions
-	* passwd.cc (add_pwd_line): new
-	(read_etc_passwd): new
-	(search_for): rewrite
-	(setpwend): rewritten, no longer a stub
-	(getpwent): rewritten, no longer a stub
-	(endpwent): rewritten, no longer a stub
-	* security.cc: new file
-	(get_world_sid): new
-	(world_full_access): new
-	(get_id_from_sid): new
-	(is_nt): new
-	* stubs.cc (endgrent): remove
-	(getgrent): remove
-	* syscalls.cc (rel2abssd): new
-	(set_process_privileges): new
-	(chown): now implemented for real for NT, still a stub in Win95
-	(_stat_worker): use get_file_owner and get_file_group to set
-	buf->st_uid and buf->st_gid
-	* uinfo.cc: add protos for read_etc_passwd, read_etc_group
-	(uinfo_init): call read_etc_passwd(), read_etc_group()
-	* utils/Makefile.in: build mkpasswd, mkgroup
-	* utils/mkgroup.c: new, use to make an /etc/group file
-	* utils/mkpasswd.c: new, use to make an /etc/passwd file
-	* winsup.h: add protos for is_nt(), get_id_from_sid()
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* Makefile.in: build ntea.o
-	* dcrt0.cc (dll_crt0_1): move console title code here from spawn_guts
-	* exceptions.cc (ctrl_c_handler): small signal fixes, prepare
-	things so we can eventually reset the signal handler to SIG_DFL
-	* fhandler.cc (fhandler_disk_file::open): first check for EA info
-	about exec/symlink status before doing it the hard way
-	(fhandler_make_pipe): u->self->hmap.build_fhandler takes extra arg
-	(fhandler_base::open): make use of NTEA
-	* fhandler.h: remove init_std_file_from_handle, build_fhandler
-	protos
-	* hinfo.cc: include mywinsock.h and sys/socket.h, define
-	__INSIDE_CYGWIN_NET__, __INSIDE_CYGWIN32__
-	(hinfo_vec::build_fhandler): takes an additional handle arg,
-	call GetConsoleScreenBufferInfo with it to see if are
-	fhandler_console, call GetCommState with it to see if we're
-	an fhandler_tty, call getpeername with it to see if we wamt
-	fhandler_socket.  Old determining methods still work too.
-	* path.cc (symlink): chmod file to ((S_IFLNK) | (STD_RBITS) |
-	(STD_WBITS) | (STD_XBITS)) permissions
-	* select.cc: include stdio.h
-	(cygwin32_select): fix typo (missing an &),
-	assorted fixes for mixed socket/handles case
-	* shared.cc (create_shared_fd_table): set sa.bInheritHandle to 1
-	to support reparenting
-	* signal.cc (_kill): add FIXME, cleanup return codes
-	* spawn.cc (spawn_guts): remove console title code, add code
-	to support reparenting of child processes
-	* syscalls.cc: add new third arg to hmap.build_fhandler calls
-	(chmod): make use of NTWriteEA
-	* ntea.cc: new file, NTEA handling routines
-	* times.cc: fix value of NSPERSEC
-	(utimes): fix return value
-	* wait.cc: changes to support reparenting, change INFINITE to
-	constant 500 to avoid "blocking win32 syscalls and signals"
-	problem
-	* winsup.h: add NTReadEA, NTWriteEA protos, define REPARENTING,
-	fix build_fhandler proto to add new arg, add handles hrProcess and
-	hrThread
-
-Tue Apr  9 00:25:33 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* libcerr.cc: remove fixed size of sys_errlist array, figure out
-	sys_nerr from the sizeof the array rather than hard coding it.
-	* shared.cc (open_shared_file_map): add typecast
-	* signal.cc (_kill): SIGKILL should avoid exception handler
-	* fork.cc (cygwin_fork_helper1): don't call ExitProcess with a
-	negative arg on recreate_mmaps_after_fork failure
-	* include/Windows32/Defines.h: define VER_PLATFORM_WIN32_WINDOWS
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* dcrt0.cc: move reent_data from private address space to cygwin.dll
-	* fork.cc: copy parent's reent_data to the child
-	* cygwin.din: export reent_data
-	* winsup.h: add as public struct _reent reent_save to pinfo class
-
-	another patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* winsup.h: add ctrl_c_handler prototype
-	* exceptions.cc (init_exceptions): don't use u->self->hThread
-	since for a spawned process, this contains thread id of parent
-	Win32 process, not the child's.  Instead use GetCurrent* funcs
-	to get thread handle.
-	(ctrl_c_handler): add more signal support, especially for kill
-	* signal.cc (_kill): more signal support, using CreateRemoteThread
-	under NT.  Win95 only supports SIGKILL since it doesn't have this
-	call.
-	* syscalls.cc (windows_95): first version check should be an &
-	of 0x80000000 instead of 0x8000000
-	(close_all_files): hmap[i] doesn't always exist, for now comment
-	out code
-
-	patch from marcus@sysc.pdx.edu (Marcus Daniels):
-	* path.cc (skip_n_slashes): new local function
-	(symlink_check_worker): new local function, used to be symlink_check
-	(symlink_check): calls symlink_check_worker and returns
-	whether path is a symlink or not.
-	(symlink_expand): new local function, expand a symlink into
-	a file or directory path using symlink_check_worker
-	(path_conv::path_conv): takes extra follow_mode arg
-	(symlink_follow): call symlink_expand
-	* fhandler.cc, syscalls.cc: fix path_conv references
-	* path.h: fix path_conv prototype
-
-Mon Mar 24 19:44:28 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* select.cc: fix Feb 19 patch to select
-	* syscalls.cc: add statfs() and fstatfs() calls
-	* include/sys/vfs.h: new header file to support these
-	* cygwin.din: add them to dll export list
-
-Tue Mar 18 18:10:24 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* dcrt0.cc: change idata3 asm section to have five null fields
-	instead of eight to conform to how MS does this section.
-
-Sun Mar  9 13:10:55 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/sys/resource.h: add missing struct members to rusage struct
-	* resource.cc: added setting of missing fields, mostly to 0 until
-	we investigate how to set correct values.  
-
-Wed Feb 19 17:44:06 1997  Jeremy Allison <jra@cygnus.com>
-
-	* select.cc: Added fixes from sos@prospect.com.ru (Sergey Okhapkin)
-	to implement blocking select on sockets/handles. This isn't
-	the way I finally want to do this, but I won't get chance
-	to do the re-write for a month or two so...
-	* include/Windows32/Defines.h: Added defines for NT ACL
-	stuff.
-
-Tue Feb 18 12:28:11 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* fhandler.cc: support reverse index escapes in console code
-
-Fri Feb 14 18:55:01 1997  Jeremy Allison <jra@cygnus.com>
-
-	* path.cc: Fixed normalize_posix_path() so that double slashes
-	are removed, except for those starting a UNC path. The command
-	ls .///////FILE_IN_DIRECTORY works now.
-
-Thu Feb 13 14:06:04 1997  Geoffrey Noer  <noer@cygnus.com>
-
-        * path.cc: remove SLASH_P define and
-        * winsup.h: define it here instead
-        patch from scottk@utig.ig.utexas.edu (Scott Kempf):
-        dirsearch.cc (opendir): fix problem with accessing "/"
-
-Mon Feb 10 13:57:11 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* misc.cc: replace nice () stub with Win32 implementation
-	* spawn.cc
-	* fork.cc: use priority returned by GetPriorityClass
-
-Wed Feb  5 16:56:23 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler.cc, syscalls.cc: minor reformat
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* spawn.cc: set console title to reflect what's running
-	* winsup.h: TITLESIZE define added
-
-Mon Feb  3 16:53:10 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler.h: fix typo
-	* fhandler.cc: check_execable_p should only take one arg now
-
-Mon Feb  3 16:16:39 1997  Jeremy Allison <jra@cygnus.com>
-
-	* fhandler.cc: Removed open_helper, turned it into
-	fhandler_base::open and added fhandler_disk_file::open. More
-	correct C++.
-        fhandler_disk_file: Moved check_execable_p into fhandler_disk_file.
-	tty ports are now closed correctly.
-	* fhandler.h: Changes to support the above.
-
-Fri Jan 31 19:14:34 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler.cc (fhandler_base::open_helper): new function
-	containing the common open() code.  symlink and executable
-	status defaults to 0.
-	(fhandler_tty::open): new function that calls
-	fhandler_base::open_helper
-	(fhandler_base::open): remove common code now in open_helper,
-	leaving symlink checking and executable checking
-	* fhandler.h: changes for the above, open_helper is protected
-
-Thu Jan 30 15:23:15 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* hinfo.cc: also treat com3 and com4 as special files
-	* spawn.cc (spawn_guts): check return of WaitForSingleObject
-	in _P_WAIT case, some reformatting
-
-Tue Jan 28 10:46:16 1997  Jeremy Allison <jra@cygnus.com>
-
-	* net.cc: Added errors "WSAEINVAL", "WSAEFAULT" as these
-	can be returned for net calls.
-	* fhandler.cc: Added FILE_SHARE_DELETE to open share modes.
-	Much closer to POSIX on NT now (ignored on '95).
-
-Fri Jan 17 13:32:26 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* configure.in:
-	* utils/configure.in: define LIB_AC_PROG_CC to get around
-	autoconf 1.12 problem.  Invoke it instead of AC_PROG_CC.
-	* configure:
-	* utils/configure: regenerate
-
-Thu Jan 16 12:35:41 1997  Geoffrey Noer  <noer@cygnus.com>
-
-	* mmap.cc: added missing copyright notice
-
-Tue Jan 14 12:51:12 1997  Jeremy Allison <jra@cygnus.com>
-
-	* cygwin.din: Added get_osfhandle, cwait and all the 
-	spawn functions.
-	* exec.cc: Added include of process.h. Changed call to
-	spawn_guts to add extra parameter.
-	* libcerr.cc: Added extra error messages. Ensured
-	messages start at zero.
-	* spawn.cc: Changed spawn_guts to do wait and nowait
-	calls. Added all spawn functions.
-	* syscalls.cc: Added get_osfhandle.
-	* winsup.h: Removed incorrect spawn definitions,
-	corrected prototypes for spawn_guts and file_exists
-	calls.
-	* include/io.h: New file. Added for get_osfhandle.
-
-Thu Jan  9 14:20:01 1997  Jeremy Allison <jra@cygnus.com>
-
-	* exceptions.h: Moved from winsup to winsup/include.
-	* include/mywinsock.h: Added getprotobynumber and
-	getservbyport.
-	* Makefile.in: Moved exceptions.h dependency.
-	* cygwin.din: Added cygwin32_getprotobynumber and
-	cygwin32_getservbyport.
-	* net.cc: Added cygwin32_getprotobynumber and
-        cygwin32_getservbyport.
-
-Wed Jan  8 14:15:35 1997  Jeremy Allison <jra@cygnus.com>
-
-	* fhandler.cc: Fix from Scott Kempf (scottk@rimu.ig.utexas.edu)
-	to ensure creation_disposition is set correctly in open.
-
-Fri Jan  3 12:10:22 1997  Jeremy Allison <jra@cygnus.com>
-
-	* fork.cc: Added parameter to recreate_mmaps_after_fork
-	in child, and added set_child_mmap_ptr() call in parent.
-	Needed as cygwin.dll statics are not copied accros a fork.
-	* mmap.cc: Added parameter to recreate_mmaps_after_fork,
-	added set_child_mmap_ptr() call.
-	* winsup.h: Added mmap_ptr to pinfo struct. Removed obsolete
-	comments.
-	* Makefile.in: Added -I../libio, needed to rebuild source
-	using STL. Also added -nostdinc++ on recommendation of
-	Mike Stump (mrs@cygnus.com).
-
-Thu Jan  2 17:23:10 1997  Jeremy Allison <jra@cygnus.com>
-
-	* dcrt0.cc: Added a call to initialize winsock on app
-	init.
-	* fork.cc: Added call so child initializes winsock before
-	returning from the fork. This makes many network daemons
-	run correctly that did not before (apache soon...).
-	* net.cc: Removed calls to checkinit, this is now done on
-	app startup. Renamed checkinit to socket_checkinit and
-	removed static scope.
-	* winsup.h: Added prototype for socket_checkinit().
-
-Thu Jan  2 12:25:06 1997  Jeremy Allison <jra@cygnus.com>
-
-	* dcrt0.cc (api_fatal): Check that u and u->self are
-	not zero before indirecting through them.
-	* fork.cc: Changed security descriptor for fork
-	mutexes to allow access by all.
-	* pinfo.cc: Changed security descriptor for shared
-	area to allow access by all.
-	* shared.cc: Added get_null_sd() call to return
-	security descriptor allowing access by all. Needed
-	when a cygwin32 service is running and also interactive
-	cygwin32 apps by the current logged in user.
-	* winsup.h: Added prototype for get_null_sd().
diff --git a/winsup/cygwin/ChangeLog-1998 b/winsup/cygwin/ChangeLog-1998
deleted file mode 100644
index aa657e01e..000000000
--- a/winsup/cygwin/ChangeLog-1998
+++ /dev/null
@@ -1,4490 +0,0 @@
-Thu Dec 31 16:50:32 1998  DJ Delorie  <dj@cygnus.com>
-
-	* mmap.cc: replaced all references to libstdc++ templates with
-	inline classes to remove build dependency on libstdc++
-
-Thu Dec 31 00:02:40 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* sysdef/uuid.def: remove useless stub.
-	* sysdef/oldnames.def: ditto.
-	* sysdef/largeint.def: ditto.
-	* sysdef/rpcndr.def: ditto.
-
-Wed Dec 30 20:33:09 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/cygcheck.cc: clean up misc. warnings relating to
-	signed vs. unsigned, char * vs. const char *, etc...
-
-Wed Dec 30 21:41:25 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_exit): Remove previous dwProcessId
-	change as it presumes too much knowledge about signalling
-	in the wrong place in the code.
-	* sigproc.cc (sigproc_terminate): Move the dwProcessId
-	assignment here but only do it when it is necessary or
-	programs will die abnormally.
-	* fhandler.h: Add raw_write method to fhandler_serial.
-	* fhandler_serial.cc (raw_write): New method.  Accommodates
-	overlapped I/O that now must be used with serial.
-	* utils/kill.cc (main): Allow `0' signal.  Just checks
-	for existence of process.
-
-Wed Dec 30 00:01:18 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin/version.h: bump API_MINOR to 8 to mark
-	recently exported _ctype_, _sys_errlist, _sys_nerr.  Briefly
-	describe all API_MINOR changes to date.
-
-Wed Dec 30 01:31:34 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_exit): Set myself->dwProcessId so that
-	some exit routines will not falsely believe that this
-	process has been execed.
-	* select.cc (peek_serial): Remove debugging statements.
-	* sigproc.cc (sigproc_terminate): Detect state where
-	myself->dwProcessId == 0 as indicative of not being
-	an exec stub.
-
-Tue Dec 29 21:13:33 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (alloc_stack_hard_way): Fix a couple of thinkos
-	in calculating size of the new stack.  Just use the size
-	passed from the parent.
-	(dll_crt0_1): Set up new frame pointers here, if appropriate.
-	* fork.cc (fork): Move frame pointer setup into dll_crt0_1.
-
-Tue Dec 29 12:57:38 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/mkpasswd.c: Include wchar.h.
-	* utils/mkgroup.c: Ditto.
-
-Tue Dec 29 12:53:23 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: remove dep for libcerr.o
-
-Mon Dec 28 22:02:15 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h: Make fhandler_serial io_status public since
-	select needs it.  Add 'saw_error' field to select_record so
-	that select can detect error conditions.
-	* fhandler_serial.cc (fhandler_serial::raw_read): Detect
-	"operation aborted" error and retry.  This seems to indicate
-	an attempt to retry an overlapped operation.
-	* select.cc (select_stuff::wait): Honor saw_error field when
-	appropriate.
-	(peek_serial): Rewrite to operate similarly to
-	fhandler_serial::raw_read.
-	* include/sys/termios.h: CBAUD mask was still not right.
-
-Mon Dec 28 09:09:27 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* libcerr.cc: Make obsolete.  Move into errno.cc
-	* libctype.c: Make obsolete.  Use newlib table.
-	* Makefile.in: Remove obsolete entries from LIBCOS.  Define
-	__INSIDE_CYGWIN__ explicitly for .c -> .o compilation.
-	* cygwin.din: New exports: _ctype_, _sys_errlist, _sys_nerr.
-	* errno.cc: Move _sys_errlist and _sys_nerr here.
-	* dlfcn.cc: Reorganize includes to put ctype.h after winsup.h
-	so that __INSIDE_CYGWIN__ will be defined for use in ctype.h.
-	* fhandler_console.cc: Ditto.
-	* fhandler_tty.cc: Ditto.
-	* path.cc: Ditto.
-	* spawn.cc: Ditto.
-
-Sat Dec 26 00:20:48 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* include/Windows32/CommonFunction.h: Added proto for
-	NetUserChangePassword().
-
-Thu Dec 24 16:15:40 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Add more debugging output.
-	* ioctl.cc (ioctl): Can't use TC[GS]ET ioctls for pty master as
-	it conflicts with TIOCPKT.
-	* passwd.cc (passwd): Bypass tc[gs]etattr call in favor of appropriate
-	method or conversion confusion will result due to attempts to
-	appropriately convert to old-style termios structures in tc[gs]etattr.
-	* strace.cc (strace_vsprintf): Define t explicitly.
-	* termios.cc (tcsetattr): Reorganize to allow meaningful debugging
-	output.
-	(tcgetattr): Ditto.
-
-Wed Dec 23 15:02:11 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.h: Reorganize include order to allow thread-safe build.
-
-Wed Dec 23 11:45:33 1998 DJ Delorie  <dj@cygnus.com>
-
-	* strace.cc (strace_microseconds): new function; returns elapsed
-	time in microseconds, using performance counters if available.
-	(strace_vsprintf): print timestamps and deltas as microseconds,
-	not seconds.
-
-Wed Dec 23 11:35:02 1998 DJ Delorie  <dj@cygnus.com>
-
-	* times.cc (__to_clock_t): Change return value to unsigned long
-	long to prevent overflow.
-
-Tue Dec 22 19:37:55 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h: Reflect fhandler_*::init argument reordering.
-	Add dup and init methods to fhandler_serial.
-	* fhandler.cc (fhandler_base::init): Reorder arguments to mirror
-	open().
-	* fhandler_console.cc (fhandler_console::init): Ditto.  Initialize
-	using fhandler_base rather than fhandler_serial as console is
-	now being slowly uncouple from fhandler_serial.
-	* fhandler_serial.cc (fhandler_serial::fhandler_serial): Set size
-	of data structure or suffer strange behavior on exec().
-	(raw_read): Add debugging output.
-	(fhandler_serial::init): New method.
-	(fhandler_serial::open): Detect call from init method and avoid
-	calling fhandler_base::open.  Don't worry about non-blocking reads
-	since they are now handled correctly by _read().
-	(fhandler_serial::tcsetattr): Honor ICANON in a kludgey sort of way.
-	(fhandler_serial::tcgetattr): Ditto.
-	(fhandler_serial::dup): New method.  Ensures duplication of all
-	elements of fhandler_serial class.
-	* fhandler_tty.cc (fhandler_tty_master::init): Reflect init argument
-	reordering.
-	(fhandler_tty_slave::init): Ditto.
-	* hinfo.cc (hinfo::init_std_file_from_handle): Remove unnecessary
-	argument.
-	(hinfo_init): Reflect change to init_std_file_from_handle.
-	(cygwin_attach_handle_to_fd): Use more appropriate types for
-	arguments.
-	(hinfo::build_fhandler): Add some slop to allocated buffer just
-	for paranoia's sake.
-	(hinfo::dup2): Avoid dereferencing a NULL pointer when oldfd==newfd.
-	* pipe.cc (make_pipe): Reflect init argument change.
-	* shared.h: Another immigrant from winsup.h
-	* winsup.h: Reflect change to init_std_file_from_handle.  Relocate
-	a declaration to shared.h so that it can be used in fhandler.h.
-	* include/sys/cygwin.h: Reflect change to cygwin_attach_handle_to_fd.
-
-Mon Dec 21 16:22:48 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::open): Detect serial device as a special
-	case requiring an overlapped open.
-	* fhandler.h (fhandler_serial): Add several methods.  Add new 'fixup after
-	fork required' field.
-	* fhandler_serial.cc (raw_read): Rewrite to come closer to handling VMIN
-	VTIME parameters and to allow EINTR.
-	(fhandler_serial::open): Initialize overlapped event here.  Make error
-	messages more explicit.
-	(fhandler_serial::close): Close status event.
-	(fhandler_serial::tcsetattr): Store vtime_ as milliseconds.  Attempt to
-	handle VMIN > 0, VTIME == 0 better.
-	(fhandler_serial::fixup_after_fork): Initialize a new event handle after
-	a fork.
-	(fhandler_serial::de_linearize): Ditto.
-	* hinfo.cc (hinfo::fixup_after_fork): Call fork fixer upper if close_on_exec
-	of need_fork_fixup set.
-
-Sun Dec 20 16:05:25 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/shellapi.h: replace with stub that includes windows.h
-	like similar headers already do.
-	* scandir.cc (scandir): add parens around assignment used as truth
-	value.
-
-Sat Dec 19 00:42:44 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* thread.cc: Fix copyright info.
-	* thread.h: Ditto.
-	* libcmain.cc: gcc is now more picky about requiring a type
-	for main(), so add one.
-	* include/pthread.h: Add attribution for net contributor.
-
-Fri Dec 18 19:21:30 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* pthread.cc: fix copyright header.
-	* shared.h: ditto.
-
-Fri Dec 18 19:21:30 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* cygwin.din: export scandir and alphasort.
-	* Makefile.in: add scandir.o to deps
-	* scandir.cc: New file with scandir and alphasort implementations.
-	* include/cygwin/version.h: bump API_MINOR to 7.
-
-Fri Dec 18 16:44:07 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/pthread.h: clean up, remove C++-style comments,
-	remove pthread_getsequence_np proto.
-
-Fri Dec 18 15:26:33 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, prepend cygwin_ to functions that are exported
-	as cygwin_* which previously needed to be aliased.
-
-	* path.cc (cygwin_conv_to_win32_path): Resolve symbolic links.
-	Return success or failure value.
-	(cygwin_conv_to_full_win32_path): Ditto.
-	(cygwin_conv_to_posix_path): Return success or failure value.
-	(cygwin_win32_to_posix_path_list): Ditto.
-	(cygwin_posix_to_win32_path_list): Ditto.
-	* shared.h: New include file that incorporates parts of
-	winsup.h, fhandler_tty.h, path.h, and delqueue.h.
-	* Makefile.in: Remove old include files.
-	* cygwin.din: cygwin_* aliases are no longer required.
-	* libccrt0.cc: Store api_minor in per_process structure.
-	* select.cc: Change meaning of second argument to ready_for_read
-	to indicate whether read_ahead should be ignored.
-	* fhandler.h: Reflect change in second argument to ready_for_read.
-	* syscalls.cc (_read): Ditto.
-	* termios.cc: Throughout, detect attempt to use old style termios
-	structure and convert as appropriate.
-	* ioctl.cc (ioctl): Detect use of ioctl requiring termios field
-	and call appropriate tc[gs]et* function to handle it.
-	* fhandler_console.cc (fhandler_console::ioctl): Remove TC* calls
-	that are now handled in main ioctl.
-	* fhandler_tty.cc (fhandler_tty_slave::ioctl): Ditto.
-	* include/cygwin/version.h: Added TERMIOS defines.  Bump API_MINOR
-	to 6.
-	* include/sys/cygwin.h: Reflect change in return value for some
-	cygwin_conv_* calls.
-	* include/sys/termios.h: Reformat slightly.  Add conversion macros
-	for dealing with old style termios structure.
-	* include/pthread.h: add
-
-Fri Dec 18 15:03:33 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Cleanup pthread usage.
-
-Fri Dec 18 14:35:59 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Remove obsolete header dependency for
-	thread-safe build.
-
-Fri Dec 18 14:16:04 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sig_handle): Avoid suspending top-level
-	processes.
-	* trace.cc: Remove unneeded include.
-
-Thu Dec 17 19:19:53 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: remove pthread_getsequence_np, _reent_clib
-
-Thu Dec 17 16:48:15 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin/version.h: correct two typos in comments
-
-Thu Dec 17 19:11:31 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* include/Windows32/Defines.h: Add values for using Windows
-	function `DeviceIoControl()'.
-
-Thu Dec 17 18:00:34 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): exception_list is not a struct.
-	* debug.cc (thread_stub): Ditto.
-
-Thu Dec 17 08:24:37 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Remove leading underscores from pthread functions.
-	* include/cygwin/version.h: Bump DLL major version to 21, DLL minor
-	version to 0, and API_MINOR to 5.
-
-Wed Dec 16 22:54:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Merge in thread-safe branch changes.
-
-Wed Dec 16 22:54:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* pthread.cc: Include winsup.h.
-
-Wed Dec 16 22:54:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* thread.cc: Reformat.
-	* pthread.cc: New file.
-	* cygwin.din: Add pthread interface functions
-
-Wed Dec 16 22:54:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Add some --enable options.
-	* configure: Regenerate.
-	* Makefile.in: Reorganize CFLAGS to recognize new --enable options.
-
-Wed Dec 16 22:54:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (stack_base): Store slightly different information
-	in child_info_fork structure for later use in alloc_stack_hard_way.
-	(fork): Set frame pointer information if stack has been reallocated.
-	* dcrt0.cc (alloc_stack_hard_way): Reflect change in
-	child_info_fork structure.
-	(dll_crt0_1): Make thread initializers "static" and NO_COPY or death
-	of the main thread causes death of other threads.
-	* winsup.h (child_info_fork): Change structure.
-
-Wed Dec 16 22:54:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* thread.h: Remove extraneous declaration.
-	* include/sys/strace.h: Make a new thread_printf function
-	for use by new thread-safe code.
-	* thread.cc: Use thread_printf throughout.
-
-Wed Dec 16 22:54:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from Marco Fuykschot (marco@ddi.nl)
-	* Throughout sources add locking control for preliminary
-	thread-safe cygwin operation.
-
-Wed Dec 16 22:54:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (getprogname): Should be a static.
-	(alloc_stack): Extend to allow forking from another
-	thread.
-	(alloc_stack_hard_way): New function used by alloc_stack.
-	(dll_crt0_1); Don't pass parameters since stack may be
-	"funny".  Use statics instead.  Move fork/spawn checking
-	into dll_crt0.
-	(dll_crt0): Do fork spawn checking here.  alloc_stack()
-	will call dll_crt0_1 if forked from a non-main thread.
-	* fork.cc (stack_base): New function determines base
-	(and other values) of this thread's stack.
-	(fork): Use new PROC_FORK1 method for forking.  Provides
-	more data to forkee.  Use stack_base to set stack
-	values.
-	* winsup.h (child_info_fork): Changes for PROC_FORK1.
-
-Wed Dec 16 16:15:29 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/shellapi.h: fix typo in DragQueryPoint proto.
-
-Mon Dec 14 12:37:43 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* net.cc: minor respacing
-	(get_ifconf): new local function, combines get_winnt_ifconf and
-	get_win95_ifconf.
-	(get_win95_ifconf): delete
-	(get_winnt_ifconf): delete
-	(fhandler_socket::ioctl): adjust ifconf calls in light of above,
-	check returned value for safety.
-	* include/cygwin/version.h: bump CYGWIN_VERSION_API_MINOR to 4
-	in honor of newly supported socket ioctls.
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* include/asm/socket.h: Added defines for ioctl() calls
-	SIOCGIFADDR, SIOCGIFBRDADDR and SIOCGIFNETMASK.
-	* net.cc (get_winnt_ifconf): Check the registry entries
-	instead of just calling get_win95_ifconf(). Added what argument
-	to support the new ioctl() calls.
-	(get_win95_ifconf): Check the Windows 9x registry entries as
-	described by Tim Newsham.
-	(fhandler_socket::ioctl): Support the ioctl() commands
-	SIOCGIFADDR, SIOCGIFBRDADDR and SIOCGIFNETMASK.
-	(get_if_flags): Check for a down interface.
-
-Wed Dec  9 18:11:31 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler.cc (fhandler_disk_file::open): check for shell scripts
-	regardless of Win32 OS type.
-
-Sun Dec  6 19:38:11 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* fhandler_console.cc (fhandler_console::tcgetattr): Fix typo.
-	ISIG should be ored with c_lflag.
-
-Tue Dec  1 16:28:56 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/utmp.h: delete, moved to newlib/libc/sys/cygwin/sys.
-
-Thu Dec  3 15:41:51 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Released 20.1 update.
-
-Thu Dec  3 22:24:18 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (set_process_mask): Add `sync' parameter
-	to control whether signals should be synched on exit.
-	(handle_sigsuspend): Provide second argument to set_process_mask -
-	don't sync.
-	(call_handler): Ditto for asm handler.
-	* signal.cc (sigprocmask): Ensure that signals are synchronized
-	by calling set_process_mask with sync == 1.
-	* sigproc.cc (__release_signal_mutex): Third argument is not
-	strictly a BOOL, so change it.
-	* sigproc.h: Reflect above parameter changes.
-
-Thu Dec  3 15:30:44 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (peek_console): Work around NT bug that
-	caused strange behavior with ReadFile after this
-	function was invoked.
-
-Tue Dec  1 14:43:35 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (sigproc_init): Set maintid and signal_mutex early
-	to avoid races in wait_sig initialization.
-	(__get_signal_mutex): Improve debug output.
-	(__release_signal_mutex): Ditto.
-	* spawn.cc (spawn_guts): Allocate more space for string when building
-	up from #! and absolute path is not known.  Otherwise weird stuff
-	like infinite recursion or unknown file errors occur.
-
-Tue Dec  1 08:34:18 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh: Accommodate lack of timezone in date output so that
-	year shows up correctly.
-
-Mon Nov 30 14:30:51 1998  Jeff Johnston  <jjohnstn@cygnus.com>
-
-	* times.cc (times): Altered function so that on non-Windows-NT systems
-	it does not use the GetProcessTimes() API which is not supported.
-
-Mon Nov 30 00:38:54 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc: Fix incorrect use of struct on exception_list
-	typedef.
-	* debug.cc (thread_stub): Ditto.
-	* dll_init.cc: Ditto.
-	* include/Windows32/Structures.h: Correct typo where
-	typedef SYSTEM_POWER_STATUS was being used as a struct.
-
-Sun Nov 29 22:03:17 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* fhandler_console.cc (fhandler_console::ioctl):
-	Added ioctl commands TCGETA, TCSETA, TCSETAW, TCSETAF.
-
-Fri Nov 27 22:30:58 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h: Set aside NOEINTR bit.  When this is set
-	cygwin will not allow the read on this device to be
-	interrupted by a signal.
-	* pipe (_pipe): Set NOEINTR bit for read end of pipes
-	created using this method.  The vague rationale for this
-	is that these pipes are supposed to be more like Windows
-	pipes than UNIX pipes.
-	* syscalls.cc (_pipe): Honor NOEINTR flag.
-	* getopt.c: Clean up some gcc warnings.
-	* libcerr.c: Ditto.
-
-Fri Nov 27 21:56:03 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (SIG_NONMASKABLE): Update for new signal
-	mask method.
-	(handle_sigsuspend): Release of signal mutex must be
-	synchronous -- the signal must be delivered before the
-	function returns.  Otherwise, there will be races in
-	the caller code.
-	* sigproc.cc (sigproc_terminate): Minor cleanup.
-
-Thu Nov 26 20:26:17 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_handler): Attempt to work around
-	potential race when setting signal_arrived.  This
-	particularly affects sigsuspend.
-	(handle_sigsuspend): Reset signal_arrived prior to
-	grabbing the mutex.  This should reduce the probability
-	of a race.
-	* sigproc.cc (sig_send): Don't reset signal_arrived in
-	the SIGSUSPEND case since this could introduce a race.
-
-Thu Nov 26 12:19:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* select.cc (MAKEready): Don't wait for signal prior to
-	testing for read.  That introduces an unnecessary delay.
-
-Wed Nov 25 23:03:47 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.h: Make `isdirsep' an alias for SLASH_P.
-	Implement isabspath convenience macro.
-	Change sigprotect to a macro since it appears to
-	be impossible to send __FILE__ type macros to a
-	constructor.  Change use of sig_protect throughout.
-	* dcrt0.cc (dll_crt0_1): Use new path macro.
-	* dlfcn.cc (get_full_path_of_dll): Ditto.
-	* path.cc (path_conv::path_conv): Ditto.
-	(normalize_posix_path): Ditto.
-	(slashify): Ditto.
-	(backslashify): Ditto.
-	* syscalls.cc (num_entries): Ditto.
-	* lock.cc: Redefine lock methods to pass debug info to
-	{get,release}_signal_mutex.
-	* environ.cc (environ_init): Correct strncmp test for
-	TERM=, otherwise it's impossible to set TERM.
-	* exceptions.cc: Eliminate lock_cs and unlock_cs macros.
-	Use {get,release}_signal_mutex throughout.
-	(signal_init): Don't initialize signal_mutex here.
-	(set_process_mask): Remove vestiges of old mutex code.
-	(handle_sigsuspend): Ditto.
-	(call_handler): Move signal_arrived SetEvent back here.
-	It was being triggered too often before.
-	Detect when the signal thread is exiting.
-	(sig_handle): Remove inappropriate SetEvent(signal_arrived).
-	(events_terminate): Move close of signal_mutex elsewhere.
-	* glob.cc: Increase "MAXPATHLEN" size for arguments that
-	are not necessarily pathnames.
-	* pinfo.cc (lpfu): Lower timeout for reporting possible
-	problem with INFINITE wait.
-	* sigproc.cc (wake_wait_subproc): Make this a macro with
-	no arguments so that its use in the code is a little
-	clearer.
-	(proc_terminate): Eliminate signal blocking here since
-	this should already be handled by the caller.
-	(sigproc_init): It makes sense to initialize signal_mutex
-	here, so do so.
-	(__allow_sig_dispatch): Rename.  Take debugging arguments.
-	Pass arguments on to release_signal_mutex.
-	(__block_sig_dispatch): Rename.  Take debugging arguments.
-	Pass arguments on to get_signal_mutex.  Detect signal
-	thread exiting confition.
-	(__get_signal_mutex): Take debugging arguments.  Maintain
-	a stack of nested mutex calls for later display in
-	__release_signal_mutex.  Detect signal thread exit
-	condition.  Don't bother with locking if signal thread is
-	executing or if just an exec stub.
-	(__release_signal_mutex): Don't bother with locking if signal
-	thread is executing or if just an exec stub.
-	* sigproc.h: Reflect renamed functions above.  Provide
-	wrappers to pass in diagnostic information.
-	* spawn.cc (spawn_guts): More fixes to deal with nested
-	#! and to properly report posix argv[0] when invoked as a
-	script.
-
-Wed Nov 25 12:41:12 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Reinstate libwinspool.a/winspool.drv creation.
-
-Tue Nov 24 18:48:56 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: add CFLAGS_COMMON and CFLAGS_CONFIG to CFLAGS
-	and CXXFLAGS in FLAGS_TO_PASS.
-
-	* include/sys/select.h: new file with select proto.  Avoid
-	potential conflict with Winsock inclusion by Cygwin internals.
-	* include/sys/socket.h: remove select proto.
-	* winsup.h: define __INSIDE_CYGWIN__.  Include windows.h after
-	Unix include files.
-	* include/mywinsock.h: delete file
-	* include/Windows32/Sockets.h: add ndef __INSIDE_CYGWIN__s
-	around portions that conflict with Unix definitions.  This
-	yields what used to be mywinsock.h which is a blend of Unix
-	sockets and Winsock needed by Cygwin internals.
-	* exceptions.cc: define Win32_Winsock to include
-	Windows32/Sockets.h.  No longer define __INSIDE_CYGWIN__.
-	* hinfo.cc: ditto
-	* net.cc: ditto
-	* select.cc: ditto
-
-	* include/exceptions.h: change wrapper define to _EXCEPTIONS_H.
-	* include/sys/resource.h: move includes outside __cplusplus check.
-	* include/sys/wait.h: ditto.
-
-Sun Nov 22 23:33:19 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* sigproc.cc (__release_signal_mutex): revert Nov 3d change.
-
-Sun Nov 22 17:04:44 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* regexp/Makefile.in: Add additional bits necessary to
-	allow correct installation of include file.
-
-Fri Nov 20 17:04:48 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Set "Warn about writable strings" option in CFLAGS.
-	* fhandler_tty.h: Fix for writable strings detection.
-	* grp.cc (add_grp_line): Ditto.
-	* mkvers.sh: Ditto.
-	* path.h: Ditto.
-	* registry.cc: (reg_key::reg_key): Ditto.
-	* smallprint.c (__small_vsprintf): Ditto.
-	* tty.cc (tty::get_event): Ditto.
-	* winsup.h: Give up on read_ready_thread.  Move sig_protect
-	here since it needs to use information set up after the sigproc.h
-	include.
-	* dcrt0.cc: Ditto.
-	* debug.cc (WFSO): New function.  Used to ensure that
-	function shows up on stack trace.
-	(WFMO): Ditto.
-	* debug.h: Define the above.
-	* exceptions.cc (ctrl_c_handler): Record last signal
-	for signal handler.
-	* select.cc (MAKEready): New macro for constructing
-	fhandler_*::ready_for_read function.
-	(fhandler_*::ready_for_read): Use macro to construct this
-	method throughout.
-	* sigproc.cc (sig_send): Work around race on process termination
-	where the event being waited for may disappear.
-	(sigproc_terminate): #ifdef code here that attempted to deal with
-	the above condition in sig_send.
-	* sigproc.h: Move sig_protect to winsup.h.
-	* spawn.cc (perhaps_suffix): Don't return pointer into an
-	automatic variable.
-	(find_exec): Always point known_suffix to something.
-	* syscalls.cc (read_handler): Refine debug output.
-	(read_ready_thread): Delete.
-	(_read): Eliminate use of read_ready_thread.  Call ready_for_read
-	directly as appropriate.
-
-Thu Nov 19 15:26:40 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: remove -Wunused since that's already in -Wall
-	* dlfcn.cc (check_path_access): rename winenv arg to mywinenv
-	* path.cc (symlink): change save_errno var to saved_errno
-	* spawn.cc (find_exec): rename winenv arg to mywinenv
-	(spawn_guts): rename sigprotect handle to starting_here
-	* winsup.h: remove trailing comma from process_state flags
-	enum
-	* utils/aclocal.m4: regenerate
-	* utils/configure: regenerate
-
-Thu Nov 19 11:16:38 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Use correct libpthread.a target when
-	thread-safe is enabled.
-
-Thu Nov 19 10:49:27 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv): Correct error reporting.
-
-Wed Nov 18 20:07:50 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/Makefile.in: remove termcap file install rule
-
-Wed Nov 18 18:14:18 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	More minor cleanup:
-	* environ.cc (winenv): don't define len twice.
-	* fork.cc (sync_with_parent): should NOT use rc since
-	this is a macro and that could have interfered with rc in
-	the calling function.  Renamed to psync_rc.
-	* fhandler_serial.cc (fhandler_serial::open): change
-	access to myaccess since it shadows global decl.
-	* hinfo.cc: ditto throughout
-	* path.cc: ditto throughout
-	(path_conv::path_conv): change error to err.
-
-Wed Nov 18 16:17:58 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* profil.c: include stdio.h
-	(print_prof): comment out unused func
-	(profile_ctl): should return an int
-
-Wed Nov 18 16:17:58 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/ps.cc: include sys/cygwin.h, make pname buf
-	MAXPATH in size.
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* utils/ps.cc (main): converting windows paths to posix
-	paths in output.
-
-Wed Nov 18 15:34:46 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/wchar.h: include stddef.h.
-
-Wed Nov 18 17:39:15 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (environ_init): Fix incorrect TERM= detection.
-
-Tue Nov 17 17:28:09 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* gcrt0.c: include stdlib.h, add proto for monstartup.
-
-Tue Nov 17 16:47:42 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/wchar.h: add protos for wcslen and wcscmp.
-	* syscalls.cc: minor reformat.
-
-Tue Nov 17 15:38:45 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::fhandler_base): Default non-disk
-	devices to binary mode.
-	* fhandler.h: Reformat slightly.
-
-Tue Nov 17 11:19:23 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* external.cc (fillout_pinfo): Copy progname using strcpy to
-	save on time.
-	* path.h: Add new enums for more fine-grained control
-	of path_conv.
-	* dir.cc (opendir): Use enum argument to path_conv.
-	(mkdir): Ditto.
-	(rmdir): Ditto.
-	* dlfcn.cc (get_full_path_of_dll): Ditto.
-	* fhandler.h: Add new set_readahead_valid to set actual
-	readahead.
-	* fhandler.cc (raw_read): Remove extraneous variable.
-	(fhandler_base::read): Rework to allow readahead when
-	not text mode.
-	(fhandler_disk_file::fstat): get_symlink_p() only returns
-	true/false now.
-	(fhandler_disk_file::fhandler_disk_file): Use enum argument
-	to path_conv.
-	(fhandler_disk_file::open): Ditto.
-	* spawn.cc (perhaps_suffix): Ditto.
-	* syscalls.cc (_unlink): Ditto.
-	(_link): Ditto.
-	(stat_worker): Ditto.
-	(_rename): Ditto.
-	* fhandler_serial.cc (fhandler_serial::open): Always reset timeouts.
-	* path.cc (path_conv::path_conv): Honor new enum arguments.
-	Specifically, use SYMLINK_CONTENTS for readlink interface.
-	(readlink): Use SYMLINK_CONTENTS argument to path_conv.
-	* select.cc: Rework serial support which has apparently never
-	worked.
-
-Mon Nov 16 16:15:20 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: FLAGS_TO_PASS should pass CFLAGS and CXXFLAGS
-	not ALL_CFLAGS and ALL_CXXFLAGS.  Rework handling of CFLAGS
-	variables to remove duplication and make it possible to
-	build mingw directory.
-
-Mon Nov 16 09:40:21 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_open): Use new macro to check for
-	NULL or empty pathname and return appropriate error.
-	* path.cc (check_null_empty_path*): Move macro to
-	path.h.
-	* path.h: Move macros here.
-
-Sun Nov 15 20:23:10 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin/version.h: bump API_MINOR to 3 to mark
-	addition of dll_noncygwin_dllcrt0 to exports list.
-
-Sun Nov 15 23:05:21 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (check_null_empty_path): New macro.
-	(check_null_empty_path_errno): Ditto.
-	(path_conv::path_conv): Check for NULL and empty
-	path names here and set appropriate error.
-	(conv_to_win32_path): Ditto.
-	(conv_to_full_win32_path): Ditto.
-	(conv_to_posix_path): Ditto.
-	(conv_to_full_posix_path): Ditto.
-	(mount_info::conv_wo_win32_path): Back out previous
-	change.
-	(mount_info::conv_to_posix_path): Ditto.
-
-Sun Nov 15 19:29:19 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/limits.h: define CHILD_MAX to be 63.
-	* sysconf.cc (sysconf): return CHILD_MAX when asked for
-	instead of _POSIX_CHILD_MAX.
-
-Sun Nov 15 18:25:22 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from Mumit Khan  <khan@xraylith.wisc.edu>:
-	* path.cc (mount_info::conv_to_posix_path): Handle NULL and
-	empty pathnames.
-	(mount_info::conv_to_win32_path): Likewise.
-
-Sun Nov 15 18:09:06 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: export dll_noncygwin_dllcrt0.
-	* {libccrt0.cc, winsup.h}: minor reformat.
-
-Sat Nov 14 22:14:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (environ_init): Use sizeof for string lengths
-	rather than hard-coded values.
-
-	patch from Mumit Khan <khan@xraylith.wisc.edu>:
-	* dll_init.cc (dll_foreign_dllcrt0): Rename to
-	dll_noncygwin_dllcrt0.
-	* winsup.h: Ditto.
-	* include/cygwin/cygwin_dll.h: Ditto.
-
-Sat Nov 14 14:09:33 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (hinfo::de_linearize_fd_array): Reset first fd
-	for open to zero after an exec.
-
-Sat Nov 14 01:29:23 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (fork): No need for intermediate jmp_buf variable.
-
-	patch from Mumit Khan <khan@xraylith.wisc.edu>:
-	* libccrt0.cc (cygwin_attach_foreign_dll): New function.
-	* dll_init.cc (dll_foreign_dllcrt0): New function to initialize
-	DLLs loaded by non-cygwin apps.
-	(dll_dllcrt0_1): Initialize process table entry.
-	(dll_dllcrt0): Revert last change to do partial initialization.
-	* winsup.h (dll_foreign_dllcrt0): Prototype.
-	* include/cygwin/cygwin_dll.h (_cygwin_foreign_dll_entry): New
-	entry point that does partial initialization for non-cygwin apps.
-
-Fri Nov 13 16:17:28 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Assorted -Wall cleanup:
-	* utils/mount.cc (show_mounts): remove unused var i.
-	* utils/cygcheck.cc (dll_info): comment out unused var ofs.
-	(dump_sysinfo): return a void, not an int.  Comment out unused
-	var len in two places.  Add parens around assignment used as
-	truth value.
-	* utils/kill.cc (main): remove unused var i
-	* utils/mkpasswd: include <ctype.h> and <stdlib.h>.
-	(enum_users): remove unused var rc.
-	(enum_local_groups): ditto.
-	* utils/ps.cc (main): Add parens around assignments used as
-	truth values.
-	* utils/mkgroup.c: include <ctype.h> and <stdlib.h>.
-	(enum_groups): return void, not int.  Remove unused var rc.
-	* gmon.c: include <stdio.h> and <unistd.h>.
-	(_mcleanup): remove unused vars buf and profdir.
-
-Fri Nov 13 16:17:28 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* include/sys/sysmacros.h: new file, define major, minor, makedev
-
-Fri Nov 13 17:03:52 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc: Reflect a variable name change.
-	* fhandler.h: *::ready_for read takes an additional argument.
-	* fhandler_console.cc (get_non_ascii_key): New function derived
-	from fhandler_console::read1.
-	(fhandler_console::read1): Use new function.
-	* select.cc (*::ready_for_read): Add new "nonblocking" argument.
-	(peek_console): Be more diligent in detecting when a usable
-	character has been entered or false positives will be returned.
-	(fhandler_tty_common::ready_for_read): Detect attempt to perform
-	a "background" read.
-	* syscalls.cc (read_handler): Remove code for dealing with slow
-	devices.  Just deal with non-blocking here.
-	(read_ready_thread): Renamed function.  Rewritten to only detect
-	when an fd has data ready to be read.  Actual reads happen in
-	the main thread.
-	(_read): Rely on read_handler to read data for everything.  Use
-	the read_ready_thread to indicate when data is ready to be read.
-	Gut the read_thread_info class since it no longer needs to return
-	much information.
-	* winsup.h: Reflect above changes to read_thread_info.  Rename
-	to read_ready_thread_info.
-
-Fri Nov 13 15:09:26 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de> and
-	Ron Parker <rdparker@butlermfg.org>:
-	* path.cc (mount_info::conv_to_win32_path): Refined recognition of
-	UNC devices.
-
-Fri Nov 13 12:37:00 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Fix a typo.
-
-Fri Nov 13 10:59:43 1998  DJ Delorie  <dj@cygnus.com>
-
-	* Makefile.in: "make" uses new "ld -shared" by default internally.
-
-Fri Nov 13 00:58:38 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (find_exec): Make sure that return value is correct
-	in all cases.  Document.
-	* fhandler.h (fhandler_tty_common): Give unit number to constructor.
-	* fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Give
-	unit number to descriptor.  Create correct UNIX path name for
-	tty so that ttyname() will work correctly.
-	* select.cc (fhandler_tty_common::ready_for_read): Don't worry
-	about read_for_read since the tty read routines are already
-	interruptible.
-	* syscalls.cc (_read): Reset read thread events on signal.
-
-	patch from Mumit Khan <khan@xraylith.wisc.edu>:
-	* dlfcn.cc (ctype.h): Include.
-	(check_access): Document.
-	(check_path_access): Document.
-	(get_full_path_to_dll): Rework to handle general filenames and
-	symlinks.
-
-Thu Nov 12 17:01:52 1998  DJ Delorie  <dj@cygnus.com>
-
-	* Makefile.in (shared): "make shared" uses the new "ld -shared"
-	* cygwin.din: add LIBRARY and BASE tags for "ld -shared"
-
-Wed Nov 11 17:16:17 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Add --enable options for various cygwin defines
-	including preliminary thread-safe defines.
-	* configure: Regenerate
-	* Makefile.in: Honor new --enable options.
-	* glob.h: Move BSD defines to sys/cdefs.h.
-	* include/sys/cdefs.h: Move __P definition here.
-
-Wed Nov 11 14:00:45 1998  DJ Delorie  <dj@cygnus.com>
-
-	* cygwin.din (getpwnam): remove duplicates
-
-Tue Nov 10 18:27:09 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/aclocal.m4: regenerate with aclocal
-	* utils/configure.in: don't call AM_CYGWIN32
-	* utils/configure: regenerate
-
-Tue Nov 10 15:56:03 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from Gary V. Vaughan <gvaughan@oranda.demon.co.uk>:
-	* dlfcn.cc (dlopen): return an introspective handle to the
-	current module if name arg is NULL.  The Single UNIX
-	Specification, Version 2 has this as a requirement.
-
-Mon Nov  9 16:29:27 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* errno.cc (strerror): all errnos in
-	newlib/libc/include/sys/errno.h are now listed here.
-
-Mon Nov  9 16:29:27 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin/version.h: up DLL version, bump API_MINOR to 2
-	to mark following change.
-
-	patch from Mumit Khan <khan@xraylith.wisc.edu>:
-	* cygwin.din: add exports for some of the newlib bessel
-	functions (j1, jn, y1, yn).
-
-Mon Nov  9 15:10:06 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc (_link): rewrite FIXME.
-
-Mon Nov  9 14:51:03 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* errno.cc (strerror): add string for EDEADLOCK.
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* errno.cc (errmap[]): add END_OF_MEDIA and additional Win32
-	error codes.
-
-Sun Nov  8 21:28:01 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h: fhandler_pipe cannot be is_slow under
-	Windows9[58].  There is no way to check for EOF on a pipe
-	without performing a read on that system.
-	* syscalls.cc (read_handler): Don't check for ready_for_read
-	unless this is a "slow" device.
-	* winsup.h: Reorganize to accomdate fhandler.h requirement
-	for os_type.
-
-Sat Nov  7 23:27:05 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_console): Add a new function declaration.
-	* fhandler_console.cc (fhandler_console::read1): New function
-	renamed from console_read to allow use of class fields.
-	Detect readahead situation when doing line buffering and
-	buffer does not contain \n.
-	(fhandler_console::read): Reflect function name change.
-	* select.cc (cygwin_select): Changes for better handling
-	of < 1000 usec timeouts.
-	(select_stuff::wait): Perform a poll on timeout to
-	set any fd's that may have become active.
-	(peek_pipe): More debugging.  Honor write_ready if set.
-	(peek_console): Can't always use WaitForSingleObject.
-	Detect readahead conditions set in fhandler_console::read1.
-	Honor write_ready if set.
-	(peek_windows): Honor write_ready if set.
-	* times.cc (__to_clock_t): Return clock_t value.
-	(times): Add some debugging printfs.
-
-Fri Nov  6 20:15:20 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* spawn.cc (spawn_guts): find_exec() argument mismatch
-	resulted in inability to run !# scripts which did not
-	begin with '/'.
-
-Tue Nov  3 16:12:59 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_exceptions): Don't wait for signal
-	completion.
-	(ctrl_c_handler): Ditto.
-	* fhandler.h (fhandler_*): Declare new ready_for_read functions.
-	* select.cc: Reorganize all methods into a peek_*, a poll_*,
-	and a fhandler_*::ready_for_read.  This is to allow the _read
-	function to query the state of an fd without starting a thread.
-	* signal.cc (kill_worker): If sending a signal from a non-main thread
-	don't wait for completion.
-	* sigproc.h (myself_nowait_nonmain): New define for use by sig_send.
-	* sigproc.cc (sig_send): Honor myself_nowait_nonmain.  Don't wait
-	if not in main thread.
-	(__release_signal_mutex): Revert to calling ReleaseMutex only
-	once or mutex is released prematurely.
-	* syscalls.cc (read_handler): Use new ready_for_read method to
-	determine if an fd has data for reading.  This function optionally
-	blocks until there is data to read.
-	(read_helper): Add debugging statement.
-	(_read): Move signal_arrived reset to before sig_protect to avoid
-	a race.  Force read_handler thread to longjmp back to read_handler
-	function on signal.
-
-Tue Nov  3 12:18:31 1998  DJ Delorie  <dj@cygnus.com>
-
-	* utils/cygcheck.cc (dump_sysinfo): Note when not finding a
-	program (like cpp) on the path is a good thing.
-
-Tue Nov  3 01:26:08 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from Kazuhiro Fujieda <fujieda@jaist.ac.jp>:
-	* environ.cc (environ_init): correct size arg to parse_options
-
-Mon Nov  2 21:40:32 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* regexp/regexp.c (regatom): Respond to compiler warning.
-
-Mon Nov  2 21:36:48 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_exceptions): cygwin should not
-	print exception information if the exception is trapped
-	via signal().
-	Also use consistent timings for lock_cs() throughout.
-
-Mon Nov  2 16:46:28 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: For now, also include newlib/libc/sys/cygwin.
-	Eventually will stop including newlib/libc/sys/cygwin32.
-
-Mon Nov  2 19:38:30 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* syscall.cc (gethostname): function deleted
-	* net.cc (gethostname): new function 'gethostname' which
-	first calls wsock32::gethostname and only if it fails,
-	calls GetComputerNameA.
-
-Wed Oct 28 17:57:53 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin/version.h: up DLL version to 20.0 in honor
-	of new Net release.
-
-Wed Oct 28 17:57:53 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from Mumit Khan <khan@xraylith.wisc.edu>:
-	* dll_init.cc (doGlobalCTORS): Fix invocation order.
-	(doGlobalDTORS): Likewise.
-
-Wed Oct 28 17:57:53 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: add include/exceptions.h to dll_init.cc deps.
-
-	patch from Mumit Khan <khan@xraylith.wisc.edu>:
-	* dll_init.cc (exceptions.h): Include.
-	(dll_dllcrt0_1): New function to initialize Cygwin DLL guts
-	properly when a non-Cygwin app uses the Cygwin DLL.
-	(dll_dllcrt0): Call dll_dllcrt0_1 when user_data is NULL.
-
-Tue Oct 27 17:35:00 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* syslog.cc: drop "32" from CYGWIN32_LOG_NAME
-
-Tue Oct 27 16:09:09 1998  DJ Delorie  <dj@cygnus.com>
-
-	* utils/cygcheck.cc (usage): cygwhich->cygcheck
-
-Mon Oct 26 17:47:10 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: fix deps for dll_entry.o and dll_main.o,
-	add dep for glob.o.
-
-	patch from Mumit Khan <khan@xraylith.wisc.edu>:
-	* dll_entry.cc: New file for user DLL entry point.
-	* dll_main.cc: New file for user DLL main.
-	* Makefile.in (LIBCOS): Add dll_entry.o and dll_main.o.
-
-Mon Oct 26 13:47:10 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: add back install of include/net which was
-	removed by accident.
-
-Mon Oct 26 15:25:22 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* strace.cc (get_strace_mutex): Don't reset last windows
-	error.
-	(strace_printf): Preserve last windows error.
-
-Mon Oct 26 11:01:46 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* uname.cc (uname): Remove slash from system name.
-
-Mon Oct 26 02:11:44 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/asm/byteorder.h: add missing __cplusplus wrapper.
-
-Mon Oct 26 00:46:33 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* uname.cc (uname): Remove space from the system name.
-
-Sun Oct 25 23:47:56 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (console_read): Several typos caused flaky
-	behavior when \r or \n detected under ENABLE_LINE_INPUT.  Also ignore
-	first \n detected under ENABLE_LINE_INPUT if it isn't preceded by a \r.
-	This avoids problems when switching from "raw" mode into "cooked mode.
-
-Sun Oct 25 12:28:21 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: remove unnecessary __cygwin32_stack_trace and
-	__cygwin_stack_trace exports.
-
-Sat Oct 24 21:18:46 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* path.cc (symlink): Standard protection for symlink should
-	be 0777.
-	* syscalls.cc (num_entries): Calculated links for directory
-	entry should only include directories.
-
-Sat Oct 24 20:51:08 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh: Modify check for CVS/Tag to work around ash bug.
-	* sigproc.cc (wait_sig): Fix detection of non-blockable signals.
-
-Fri Oct 23 18:24:43 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* environ.cc: CYGWIN32 environment variable is now called CYGWIN
-	* window.cc: lose "32" in Cygwin32WndClass
-	* syslog.cc: lose "32" in WIN95_EVENT_LOG_PATH and
-	CYGWIN32_LOG_NAME.
-
-Fri Oct 23 16:32:59 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/cygcheck.cc: reformat, add copyright notice
-
-Fri Oct 23 18:15:28 1998  DJ Delorie  <dj@cygnus.com>
-
-	* utils/cygcheck.cc: new file
-	* utils/Makefile.in: build cygcheck.exe
-
-Fri Oct 23 16:48:41 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (signals_init): Add error to api_fatal.
-	(events_init): Ditto.  Collapse printfs into one.
-	(winsock_init): Ditto.
-	* net.cc (winsock_init): Remove "Cygwin" from error message.
-
-Fri Oct 23 13:48:10 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: install include/cygwin headers, losing the "32".
-	* include/cygwin32: remove
-
-Fri Oct 23 14:36:31 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (environ_init): Avoid reallocating environ array.
-	* exec.cc: Increase number of arguments to 1024 throughout.
-	* fhandler.cc (fhandler_disk_file::open): Revert to checking
-	a file for '#!' to find out if it is executable but add
-	extra check for NTEA which, if set, eliminates the need for
-	the read.
-	* sigproc.cc (sigproc_terminate): Close hwait_sig and set it
-	to NULL prior to closing other handles since this flags some
-	routines that the process is going down.
-
-Fri Oct 23 00:31:27 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/*: remove "32"s from cygwin32_foo function calls
-
-Fri Oct 23 00:24:27 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin/version.h: increment CYGWIN_VERSION_DLL_MINOR
-	and CYGWIN_VERSION_API_MINOR since I'm changing the API in a
-	meaningful but backwards-compatible fashion.
-
-	* exceptions.cc: strip "32" from cygwin32_exception_handler
-	debug printfs
-
-	* net.cc: strip "32" from all net functions
-	* select.cc, syscalls.cc, winsup.h: lose "32" from cygwin32_select
-	* cygwin.din: adjust for these changes (no backwards
-	compatability issues here).
-
-	* cygwin.din: rename all cygwin32_foo functions, aliasing as
-	cygwin_foo for backwards compat. for now but intend to lose them
-	at a later date.
-	* include/sys/cygwin.h: copy all cygwin32_ protos and make them
-	usable without the "32".  We will remove the cygwin32_ ones at a
-	later date.
-	* external.cc, external.h: lose "32" from cygwin32_internal
-	* shared.cc, winsup.h: lose "32" in cygwin32_getshared
-	* path.cc, path.h: lose "32" in cygwin32_foo comments
-	* dll_init.cc: lose "32" in cygwin32_detach_dll
-	* hinfo.cc: lose "32" in cygwin32_attach_handle_to_fd
-	* libccrt0.cc: lose "32" in refs to cygwin32_attach_dll
-	* pinfo.cc: lose "32" in cygwin32_winpid_to_pid
-
-	* include/cygwin32: remove all files except cygwin32_dll.h which
-	some people may already be including.  Aim to remove this
-	remaining file at a later date.
-	* include/cygwin: move all include/cygwin32 files here.
-	* cygwin/cygwin_dll.h: change protos to reflect loss of "32"s
-	* include/net/if.h, include/netinet/in.h, include/netinet/ip.h,
-	include/netinet/ip_icmp.h, include/asm/socket.h:
-	include/sys/socket.h: include the headers in include/cygwin
-	* Makefile.in, winsup.h: fix references to
-	include/cygwin32/version.h
-
-	* libcctype.c, smallprint.c, test.c: lose "32" in Cygwin32 refs in
-	comments
-	* include/dlfcn.h, include/exceptions.h, include/mapi.h,
-	include/winsock.h, include/mywinsock.h: ditto
-	* config/*: ditto
-	* profil.c: ditto, and respace
-
-Thu Oct 22 22:52:40 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* net.cc, exceptions.cc, hinfo.cc, select.cc,
-	include/mywinsock.h: rename __INSIDE_CYGWIN32__ to
-	__INSIDE_CYGWIN__
-
-Thu Oct 22 17:39:06 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	First round of Cygwin32 -> Cygwin renaming.  In all files,
-	rename Cygwin32 to Cygwin in comments.
-	* CYGWIN32_LICENSE: delete and
-	* CYGWIN_LICENSE: add it back under this name
-
-Thu Oct 22 20:10:24 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc:  Eliminate cs mutex.  Just use signal_mutex
-	throughout.  Rename sig_dispatch_mutex to signal_mutex throughout.
-	(lock_cs): Rewrite to be a front-end for get_signal_mutex.
-	(unlock_cs): Rewrite to be a front-end for release_signal_mutex.
-	(set_process_mask): Synchronize signals after resetting mask.
-	* sigproc.cc (release_signal_mutex): Report on success or
-	failure of signal_mutex release.
-	* include/Windows32/Defines.h (FILE_FLAG_WRITE_THROUGH): Make
-	unsigned to avoid a compiler warning.
-
-Thu Oct 22 14:23:49 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/Makefile.in: disable building cygwin.exe.
-
-Thu Oct 22 14:16:10 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sig_handle): Minimize life of cs lock during
-	handling of signals to reduce the potential for a race.
-
-Thu Oct 22 10:23:19 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sys/strace.h: Minor addition from threadsafe-branch.
-
-Thu Oct 22 09:03:18 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc (close_handle): Error condition needs a return value.
-	* environ.cc (parse_thing): char pointers should all be constant.
-	(add): Ditto.
-	* heap.cc (heap_init): Provide a little more information in
-	fatal printf.  Use api_fatal to print errors.
-	* sigproc.cc (sigproc_terminate): Move code executed on
-	thread termination here from wait_sig since this function
-	may actually be executing in the signal thread.
-	* strace.cc (strace_open): Argument should be const.
-	(strace_init): Ditto.
-	* winsup.h: Ditto.
-	* include/cygwin32/version.h: Note that original shared memory
-	version was 0 for 98r2.
-
-Wed Oct 21 08:41:39 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (__api_fatal): Remove "cygwin" identifier.
-	* fhandler.cc (fhandler_disk_file::open): Set symlink flag
-	appropriately for previous change.
-	* shared.cc (shared_name): Initialize static buffer to
-	(hopefully) force it into NO_COPY segment.
-	* mkvers.sh: Reorganize, add cvs tag detection, and output
-	cygwin "info" defines.
-
-Tue Oct 20 18:42:50 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin32/version.h: rewrite versioning comments,
-	updating for new scheme but keeping historical information.
-
-Mon Oct 19 23:45:24 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/windows.h: remove Objective-C BOOL ifdef, now taken
-	care of within the include/Windows32 header files.
-	* fhandler_console.cc: fix KeyEvent references in light of
-	changes to the KeyEvent struct in the Windows32 headers.
-
-	Update include/Windows32 header files.  Changes from
-	Mumit Khan <khan@xraylith.wisc.edu>, Corinna Vinschen
-	<corinna.vinschen@cityweb.de>, and me.
-	* include/Windows32/CommonFunctions.h: new file, contents from
-	Functions.h.
-	* include/Windows32/*.h: Misc updates.
-
-Mon Oct 19 20:26:15 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc: Throughout, avoid calling *_printf while lock
-	is active.  Previous lock count was not thread-safe.
-	* fhandler_console.cc (console_read): Avoid sending a
-	\r to caller if ENABLE_LINE_INPUT.
-	(fhandler_console::read): Rely on console_read to handle
-	\r\n conversion.
-
-Mon Oct 19 12:10:09 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh: Use more portable constructs to allow running
-	this with /bin/sh, bash, and ksh.
-
-Mon Oct 19 11:19:58 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::from_registry): Missed "b15.0" part
-	for writing mount information back to registry.
-	(mount_info::init): Remove obsolete stuff.
-
-Mon Oct 19 10:42:17 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Avoid newer GNU make construction when building
-	version.cc.
-
-Mon Oct 19 00:09:06 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: invoke mkvers.sh with $(SHELL)
-
-Sun Oct 18 15:19:17 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (set_name): Accept unit argument for generating
-	win32_name.
-	(fhandler_base::fhandler_base): Ditto.
-	(fhandler_dev_floppy::fhandler_dev_floppy): Ditto.
-	(fhandler_dev_tape::fhandler_dev_tape): Ditto.
-	(fstat): Set symlink bit only if symlink_p is positive.
-	* fhandler.h: Reflect unit argument changes.
-	* fhandler_serial.cc (fhandler_serial::fhandler_serial): Accept
-	unit argument for generating win32_name.
-	* hinfo.cc (hinfo::build_fhandler): Pass unit argument to constructor
-	where apropriate.
-	* path.cc (path_conv::path_conv): Set symlink_p to a positive
-	value if !nofollow, negative otherwise.
-	(windows_device_names): Can't default to \dev\comx.  \dev part
-	doesn't work.
-	(get_device_number): Accept just "comN" for backwards compatibility.
-
-Sat Oct 17 01:58:15 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (globify): Fix problem with argument corruption
-	due to use of pointer freed by realloc.
-
-Sat Oct 17 00:10:53 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Change NOT_OPEN_FD to dtable.not_open throughout.
-	* Makefile.in: Change .dll name to cygwin1.dll.  Increment
-	the '1' when there are API/shared memory changes.  Make
-	version.cc file every time .dll is linked.  Remove datestamp
-	stuff.
-	* mkvers.sh: New file.  Creates version.cc.
-	* cygwin.din: Export setdtablesize.
-	* dcrt0.cc: Remove obsolete version variables.
-	(build_argv): Use issep() macro rather than isspace since
-	isspace includes whitespace that the shell does not consider
-	a command separator.
-	(check_sanity_and_sync): Use new cygwin version defines and
-	structures for compatibility checking.
-	(dll_crt0_1): Ditto.
-	(__api_fatal): Renamed from api_fatal.  Now always called from
-	macro which tacks program name to beginning of fmt.  Increase
-	size of buffer.
-	* environ.cc (regopt): Use new reg_key class constructor
-	functionality.
-	* net.cc (getdomainname): Ditto.
-	* path.cc (read_mounts): Ditto.
-	(mount_info::from_registry): Ditto.
-	(mount_info::to_registry): Ditto.
-	(hash_path_name): No need for this to be a "C" function.
-	* external.cc (cygwin32_internal): Export version info strings.
-	* external.h: Add CW_GETVERSIONINFO.
-	* fhandler.cc (fhandler_base::write): Eliminate use of MIN macro.
-	* init.cc (set_dllname): Obsolete function.  Handled in version.cc.
-	(dll_entry): Remove reference to set_dllname.
-	* libccrt0.cc (this_proc): Renamed from cygwin_statu.
-	(cygwin_crt0_common): Record api version in this_proc.
-	* mmap.cc (recreate_mmaps_after_fork): No need for this to be
-	a "C" function.
-	* syscalls.cc (close_all_files): Ditto.
-	* pinfo.cc (lock_pinfo_for_update): Eliminate a compiler warning.
-	* registry.cc: Eliminate reg_session class. Augment reg_key to handle
-	functionality of reg_session.
-	* registry.h: Ditto.
-	* shared.cc (shared_name): No need for this to be a "C" function.
-	Use new cygwin version structure.
-	(shared_info::initialize): Use new reg_key class constructor
-	functionality.
-	* smallprint.c (__small_vsprintf): Accept %P as a format specifier.
-	Signifies the program name.
-	* spawn.cc (spawn_guts): Quote *all* of the stuff the dcrt0.c considers
-	special.
-	* tty.cc (tty::inuse_event_exists): Remove debugging printf.  It results
-	in too much output to strace log.
-	* uinfo.cc: Add a needed include.
-	* uname.cc (uname): Use new cygwin version structure to fill in utsname
-	fields.
-	* winsup.h: Regroup into sections.  Add new version structure.
-	* include/utmp.h: Move login/logout function declarations here.
-	* include/cygwin32/version.h: Define new CYGWIN version/info
-	stuff here.
-
-Fri Oct 16 00:13:35 1998  Geoffrey Noer <noer@cygnus.com>
-
-	* Makefile.in: enable building mingw subdir by default
-
-Thu Oct 15 12:01:08 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Set all security attributes
-	for CreateProcess so that sexec will work properly.
-
-Thu Oct 15 08:49:12 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (hinfo::dup2): Avoid a null pointer dereference
-	in a debugging printf.
-
-Wed Oct 14 18:06:51 1998  Geoffrey Noer <noer@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* fhandler_console.cc (fhandler_console::dup): reset
-	default_color since the console fhandler forgets its default
-	colorizing when it's `dup'ed.
-	(fhandler_console::fhandler_console): remove unnecessary
-	erasing in constructor of fhandler_console.
-
-Mon Oct 12 22:20:59 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fcntl.cc (fcntl): According to the "Single UNIX Specification",
-	F_DUPFD should *not* close its argument.  Revert to previous
-	behavior.
-	* hinfo.cc (dup2): Guard against closing target fd too early.
-	* pinfo.cc: Always initialize myself to a dummy value so that
-	myself != NULL checks are avoided.
-	* include/sys/strace.h (strace): Remove NULL check for myself.
-	* dcrt0.cc (api_fatal): Ditto.
-	* exceptions.cc (handle_exceptions): Ditto.
-	* signal.cc (sigprocmask): Ditto.
-	(_raise): Ditto.
-	* strace.cc (get_strace_mutex): Ditto.
-
-Mon Oct 12 15:19:47 1998  DJ Delorie  <dj@cygnus.com>
-
-	* utils/ps.cc (main): use const char *pname
-
-Fri Oct  9 12:32:23 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (getw): Simplify.
-
-Thu Oct  8 23:09:34 1998  Geoffrey Noer <noer@cygnus.com>
-
-	* times.cc: add missing syscall_printfs to time functions,
-	slight reformatting.
-
-Thu Oct  8 21:56:37 1998 DJ Delorie <dj@cygnus.com>
-
-	* hinfo.cc (cygwin32_attach_handle_to_fd): allow to pass -1
-	for dup() simulation; return allocated fd.
-	* pinfo.cc (lock_pinfo_for_update): if the mutex is broken,
-	fail instead of looping.  If you do loop, don't use 100% CPU.
-
-Thu Oct  8 18:33:02 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc: Add another per-thread object for strace.
-	(quoted): Fix misconception of method used to quote
-	quotes.
-	(globify): Optionally output arguments.
-	(build_argv): Ditto.
-	(dll_crt0_1): Fix typo in line reassignment.
-	* debug.cc (class locker): Avoid calling lock multiple times.
-	* exceptions.cc (call_handler): Set strace recursion flag
-	to zero when invoking a signal handler.
-	* fcntl.cc (_fcntl): F_DUPFD should close its argument.
-	* fork.cc (fork): Move determination of parent process to
-	a safer place.
-	* sigproc.cc (get_sig_dispatch_mutex):  Rename.  Use macro
-	interface to provide the name of the caller for strace output.
-	(release_sig_dispatch_mutex): Ditto.
-	* sigproc.h: Define *_dispatch_mutex wrappers.
-	* strace.cc (strace_printf): Use new per-thread object to
-	guard against recursion.
-	* winsup.h: Define per_thread_strace_protect.  Redo per_thread
-	base class for a little more clarity.
-
-Wed Oct  7 22:30:43 1998  Geoffrey Noer <noer@cygnus.com>
-
-	* fhandler_tty.h: up NTTYs from 16 to 128
-
-Wed Oct  7 09:15:55 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (console_read): Distinguish between
-	0 byte return from CTRL-C and EOF condition.
-
-Tue Oct  6 22:31:44 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (build_argv): Rewrite. Now: 1) allocates argv on
-	the fly, 2) inserts '@' files as they are found, 3) uses
-	sh-style quoting using either " or ' which may be embedded
-	in an argument.
-	(insert_file): Don't scan command line.  Accept already
-	parsed arguments from build_argv.
-	(quoted): New function for parsing quoted strings.
-	(globify): Don't scan argv list.  Accept element from
-	build_argv which will be tacked to end of argv as it
-	is being built.  Extend quoting options to allow
-	tilde, braces, and quotes.
-	(dcrt0_dll_1): Simplify argv processing.  Just call
-	build_argv, which handles everything.
-
-Tue Oct  6 11:04:43 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Change Create[A-Z]* calls throughout to use sec_none_nih
-	to avoid subprocesses accidentally inheriting handles.
-	* grp.cc: Hold group structures in group_buf rather than
-	an image of the /etc/group file.
-	(parse_grp): New function to parse a group line into a
-	struct group.
-	(add_grp_line): Use parse_grp to add line from /etc/group
-	into internal cache.
-	(read_etc_group): Avoid redundant feof call.  Set up
-	default group.
-	(getgrgid): Just return appropriate entry from group_buf
-	rather than reparsing internal representation.
-	(getgrnam): Ditto.
-	(getgrent): Ditto.
-	* hinfo.cc (hinfo::select_*): Set errno value when attempt
-	is made to use an unopened fd.
-	* passwd.cc: Hold passwd structures in passwd_buf rather than
-	an image of the /etc/passwd file.
-	(parse_pw): New function to parse a passwd line into a
-	struct passwd.
-	(add_pw_line): Use parse_pw to add line from /etc/passwd
-	into internal cache.
-	(read_etc_passwd): Avoid redundant feof call.
-	(search_for): Just scan passwd_buf for matching entries.
-	(getpwent): Just return appropriate entry from passwd_buf
-	rather than reparsing internal representation.
-
-Mon Oct  5 18:06:31 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* sysdef/kernel32.def: add missing GetDiskFreeSpaceEx lines
-
-Sat Oct  3 23:52:23 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (si): Initialize so that NO_COPY will work.
-	* debug.cc (class locker): Fix previous change.  Critical
-	sections are still required, so protect them if operating
-	in main thread to avoid signal problems.
-	Make any previously static use of locker global since that
-	appears to be the only foolproof way of marking the variable
-	NO_COPY.  Rename these variables to something that is not
-	likely to be collided with.
-	* exceptions.cc (call_handler): Signal arrival of a dispatched
-	signal here and wait a long time for the mutex before giving
-	up.  Should increase performance slightly.
-	* sigproc.cc (maintid): New external symbol.
-	* sigproc.cc (maintid): Make this global since it is used
-	in other places now.
-	(sig_dispatch_pending): Don't wait for wait_sig to complete
-	if there are no pending signals.  Avoids a race and should
-	be faster.
-	(wait_sig): Don't set signal_arrived event here.  Do it in
-	call_handler.
-	* strace.cc (strace_printf): Remove previous recursion check
-	since it is not signal safe.
-	* syscalls.cc (_read): Remove duplicate CreateEvent typo.
-
-Fri Oct  2 09:54:42 1998  DJ Delorie  <dj@cygnus.com>
-
-	* strace.cc (strace_printf): protect against recursion
-
-Thu Oct  1 17:08:47 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/ps.cc (main): add more detailed usage printfs
-
-Thu Oct  1 11:05:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Fix typo in debug.o dependency.
-	* debug.cc (class locker): Give up on using critical sections
-	since they are not safe to use in the main thread due to signals.
-
-Wed Sep 30 22:34:42 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (fork): Close parent's parent_alive handle
-	if there is one or suffer a handle leak.
-	* syscalls.cc (_read): Make all events no access and
-	non-inheritable or suffer potential handle leak.
-	* windows.cc (gethwnd): Ditto.
-
-Wed Sep 30 17:22:29 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/io.h: add missing setmode proto
-
-Tue Sep 29 23:33:11 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (fhandler_pty_master::close): Make sure
-	both sides of both pipes associated with a tty master are
-	closed or suffer handle leaks.
-
-Tue Sep 29 16:55:00 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc (mount_info::init): remove default mounts for
-	raw devices.
-	* utils/mount.cc (reset_mounts): ditto
-	(main, usage): new -f flag disables warning messages about
-	missing mount point directories.  Two new flags, disabled for
-	now: -c will create missing mount point directory, -g will
-	select adding the mount point to the global registry location.
-	* include/sys/mount.h: add MOUNT_GLOBAL define, for future use.
-
-Tue Sep 29 14:20:30 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (exception): Use %p to denote some hex
-	values.
-	* winsup.h (read_info): Add jmp_buf to structure.  Required
-	for syscalls.cc change below.
-
-Mon Sep 28 19:36:41 1998  Syd Polk  <spolk@cygnus.com>
-
-	* include/{tchar.h, direct.h}: Added so that
-	tcl8.1a2 can be compiled with cygwin.
-
-Mon Sep 28 19:36:41 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (thread_reset): Yet another method for
-	handling interruptible reads.
-	(_read): Use thread_reset to reset reads after a signal.
-
-Sun Sep 27 21:11:46 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: New alias for __cygwin32_stack_trace.
-	* debug.cc (find_handle): Avoid leaving function without
-	unlocking.
-	(newh): Ditto.
-	* exceptions.cc (__cygwin32_stack_trace): Rename to just
-	`stack'.  Shortens stack trace output.
-	(exception): Use %p to distinguish register values.
-	* fhandler_console.cc (fhandler_console::init): Remove
-	debugging sig_protect.
-	* init.cc (dll_entry): Move definition to avoid a
-	compiler warning.
-	* path.cc (mount_info::conv_to_win32_path): Detect
-	case of root directory when setting win32 relative
-	path.
-	(mount): Remove obsolete label.
-	* syscalls.cc (thread_sync): New function for exiting
-	the read helper thread.
-	(_read): Use new method for exiting the read helper
-	thread.
-
-Sun Sep 27 11:25:06 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* delqueue.cc (delqueue_list::process_queue): Clear queue
-	entry if file cannot be deleted for a reason other than
-	sharing violation.
-
-Fri Sep 25 08:52:50 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc: locker variables should all be static.
-	* syscalls.cc (_read): Call ForceCloseHandle on
-	thread handle since it is protected.
-
-Thu Sep 24 18:59:25 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc (mount): don't verify that path is an existing
-	directory.  Instead
-	* utils/mount.cc: verify that path is an existing directory
-	and print warning if it's not.  Still do the mount.
-
-Thu Sep 24 11:45:04 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc: locker class variables must be NO_COPY since
-	they contain data that should not be precisely duplicated
-	after a fork.  This hopefully fixes a "SIGSEGV" problem.
-	* select.cc (peek_pipe): Pipes apparently should set both
-	"read" and "exception" flags on EOF.
-
-Wed Sep 23 18:26:31 1998  DJ Delorie  <dj@cygnus.com>
-
-	* doc/doctool.c (main): typo checking for --help
-
-Wed Sep 23 17:46:06 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (symlink_check_one):  Try much harder to ensure that
-	CloseHandle is called on the file which was opened to check
-	for a symlink.  Avoid obsolete check for NULL buf.
-
-Wed Sep 23 17:11:50 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_read): Close thread handle or suffer a leak.
-	* dir.cc (opendir): Simplify logic.
-	(readdir): Ditto.  Close handle explicitly when hit end
-	of files.
-	(rewinddir): Close directory handle or suffer leak.
-	(closedir): Simplify logic.
-
-Wed Sep 23 14:42:12 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from DJ Delorie <dj@cygnus.com>:
-	* path.cc (symlink_check_one):  Don't re-define res or symlinks
-	will be undetectable.
-
-Wed Sep 23 12:02:39 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Change calls to api_fatal throughout to avoid need for \n
-	(see below).
-	Adapt some *_printf()/ExitProcess combinations to use api_fatal.
-	* winsup.h (SIGTOMASK): Generate signal mask correctly for
-	programs linked with newer cygwins.
-	* dcrt0.cc (check_sanity_and_check): Set subtract constant for
-	signal mask calculation based on whether binary was linked with
-	"older" or "newer" cygwin.
-	(do_global_ctors): Accept a second argument indicating whether
-	the ctors should always be run.  Necessary in forked processes
-	for cygwin constructors which may do more than just allocate memory.
-	(checkout): Remove obsolete function.
-	(dll_crt0_1): Remove obsolete function call.  Call do_global_ctors
-	with second argument TRUE.
-	(api_fatal): Change to a print-style function, allowing arguments.
-	Always emit a "\n" after a message.
-	(__main): Do not force running of constructors in forked processes.
-	* exceptions.cc (call_handler): Simplify arguments passed to this
-	function.  Eliminate potential race by setting signal masks here.
-	(sig_handle): Just calculate current sigaction pointer once.
-	Change call_handler arguments.
-	* fhandler_console.cc (fhandler_console::write_normal): Output
-	unknown characters to screen.
-	(fhandler_console::write): Make signal protection synchronous.
-	* fork.cc (fork): Reorganize slightly to eliminate a compiler warning.
-	* init.cc (dll_entry): Temporarily remove freeing of waitq_storage
-	on thread detach until a more robust scheme is developed.
-	* signal.cc (signal): Make signal protection synchronous.
-	(sigaction): Ditto.
-	* sigproc.cc (get_sig_dispatch_mutex): More debug info.
-	(release_sig_dispatch_mutex): Work around potential bug in windows
-	with double allocation of a mutex when WaitForSingleObject is
-	interrupted.  Save errno here only if about to call sig_send
-	where it may be changed.
-	(wait_sig): Remove unnecessary sig_sign stuff.  Add some debugging
-	output.
-	* termios.cc (tcflow): Signal protection.
-	(tcgetattr): Ditto.
-	(tcsetattr): Make signal protection synchronous.
-	* winsup.h: Add new extern for SIGTOMASK macro.  Use it in SIGTOMASK
-	macro.  Move errno stuff to end so that it can benefit from previous
-	declarations.
-	* configure.in: Move AC_CANONICAL_SYSTEM up a little to avoid having
-	configure generate some code (like the check for host type) twice.
-	* configure: Regenerate.
-
-Wed Sep 23 11:49:55 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (symlink_check_one): Fix handle leak resulting
-	from open of file to check for symlink magic.  Suggested
-	by Corinna Vinschen <corinna.vinschen@cityweb.de> .
-
-Wed Sep 23 08:33:26 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* fhandler_tty.cc (process_ioctl): Use console handle
-	for ioctl operations.
-
-Tue Sep 22 23:58:20 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	based on patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* utils/ps.cc (main): rewrite ps to give it more options,
-	including a, e, f, l, and u.
-
-Tue Sep 22 15:18:41 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc (umount): remove initial system_printf
-	(mount): stat path, verify that it's an existing directory,
-	otherwise fail.
-	(strncasematch, strcasematch): return 0 instead of FALSE
-	* utils/mount.cc (reset_mounts): reset / to System drive,
-	not C: as was done in the old days.
-
-Mon Sep 21 18:18:18 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc (mount, umount, setmntent, getmntent, endmntent):
-	make extern "C"
-
-Mon Sep 21 20:37:16 1998  DJ Delorie  <dj@cygnus.com>
-
-	* doc/configure.in: don't try to find cc until we can correctly
-	configure it for a native cc in a cross build.
-
-Mon Sep 21 17:17:14 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler.cc (fhandler_disk_file::check_execable_p):
-	don't check for .shc since that's non-standard.  Check for
-	.exe first.
-
-Mon Sep 21 14:57:50 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* doc/Makefile.in: reference -db2html in case docbook
-	tools aren't installed.
-
-Mon Sep 21 14:43:40 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from DJ Delorie <dj@cygnus.com>:
-	* doc/doctool.c (scan_file): correct off by one error in
-	malloc
-
-Mon Sep 21 14:28:38 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (select_record): Clear memory in constructor.
-
-Mon Sep 21 08:49:22 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* select.h: Use unsigned int to hold count in fd_set
-	structure or suffer alignment problems.
-	(WINSOCK_FD_ZERO): Back out previous change as it
-	is no longer needed due to the above.
-
-Sat Sep 19 22:58:18 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (console_read): Keep looping in
-	ENABLE_LINE_INPUT mode when no characters are read.
-	This apparently means that a CTRL-C has been hit.
-	* select.cc (select_record::operator new): Remove.
-	(setlect_stuff::~select_stuff): Use delete to remove
-	record.
-	(pipe_cleanup): Remove unneeded statement.
-	(poll_socket): Add debugging statement.
-	(start_thread_socket): Add debugging statements.
-	* fhandler.h: Remove new operator from select_record.
-	* select.h: Make WINSOCK_FD_ZERO more aggressive.
-	* sigproc.cc (allow_sig_dispatch): Use new errno
-	saving method.
-	* syscalls.cc (_read): Reorganize stack freeing
-	code to avoid overhead when it's not needed and
-	to actually decommit stack memory.
-
-Sat Sep 19 19:16:32 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* select.cc (socket_cleanup): Avoid using a pointer
-	after it has been deleted.
-
-Fri Sep 18 13:57:37 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* Makefile.in: Really remove extra slash in INCLUDES.
-	Previous change didn't work.
-	pipe.cc (make_pipe): set close-on-exec flag for non-inheritable
-	pipes.
-
-Thu Sep 17 15:26:14 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* doc/Makefile.in: Add dummy install target.
-
-Thu Sep 17 12:30:49 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.h (per_thread*): New classes for storing and
-	manipulating per_thread information.
-	(threadstuff): New array of per_thread objects which are
-	manipulated after a fork.
-	(read_helper_thread_info): read() thread local storage.
-	(waitq_storage): wait() thread local storage.
-	* debug.cc (class locker): New class for generic locking
-	of debug table manipulation.  Use this throughout for
-	locking access to thread/debug tables.
-	(debug_init): Remove in favor of automatic constructor.
-	* debug.h: Ditto.
-	* fork.cc (fork): Iterate through threadstuff looking
-	for thread information to clear out.  Should solve some
-	problems for Windows 95/98.
-	* init.cc (dll_entry): Remove thread storage initialization.
-	Use per_thread class for DLL_THREAD_DETEACH.
-	* sigproc.cc:  Use system_printf rather than alert_printf
-	throughout since system_printf now has the same functionality.
-	(sigproc_init): Use method to initialize per-thread storage.
-	* sigproc.h: Remove waitq_storage declaration.
-	* syscalls.cc (_read): Use per_thread class to manipulate
-	per-thread information.
-	* wait.cc (wait4): Ditto.
-
-Wed Sep 16 12:58:49 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.c (_read): Lower timeout for signal detection after
-	EOF on device.  Should fix recent configure performance problems.
-	* Makefile.in: Extend clean target into regexp directory.
-
-Wed Sep 16 11:44:14 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::set_name): Honor no_free_names().
-	(fhandler_base::linearize): Remove unneeded check for NULL
-	get_win32_name().
-	(fhandler_disk_file::fhandler_disk_file): Set path names
-	to a standard constant.  They should eventually be filled
-	out by fhandler_disk_file::open.
-	(fhandler_disk_file::open): Detect if win32_path_name_ is
-	a dummy path.  Fill it out from real_path, if so.
-	* hinfo.cc (hinfo::init_std_file_from_handle): Improve debugging
-	statement.
-	(hinfo::linearize_fd_array): Remove unneeded check for NULL
-	get*_name ().
-	* path.cc (path_conv::path_conv): Correct problem with
-	symlinks found at places like E:\.
-
-Wed Sep 16 02:25:33 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* fhandler.cc (fhandler_disk_file::open): fix typo.
-
-Tue Sep 15 23:52:44 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.h: Remove side effects from SLASH_P.
-
-Tue Sep 15 18:36:08 1998  Ben Elliston  <bje@cygnus.com>
-
-	* sysdef/kernel32.def: Add definition for the Win32 API function
-	`TryEnterCriticalSection'.
-
-Tue Sep 15 12:26:48 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Remove extra slash in INCLUDES.
-	* hinfo.cc (hinfo::dup2): Always clear close-on-exec
-	flag for duplicated handle (problem and fix determined
-	by Sergey Okhapkin, sos@prospect.com.ru).
-	* fhandler.cc (fhandler_base::set_name): Avoid use of empty
-	path names.
-	(fhandler_base::raw_read): Show error code on failure.
-	(fhandler_base::linearize): Avoid copying NULL names.
-	(fhandler_base::open): Use NULL detection in small_printf.
-	(fhandler_base::dup): Move set_close_on_exec_flag to dup2
-	so it is caught in all cases.
-	(fhandler_disk_file::fhandler_disk_file): Set "no free names"
-	flag.
-	(fhandler_disk_file::open): Clear "no free names" flag since
-	names have been allocated to the fhandler structure at this point.
-	* fhandler.h (set_no_free_names): Newconditional "no free names"
-	function.
-	* hinfo.cc (hinfo::dup2): Clear close on exec here.
-	(hinfo::linearize_fd_array): Avoid copying NULL names.
-	* path.cc (normalize_posix_path): Avoid copying trailing slash
-	if root.
-	(nofinalslash): Rename variable.
-	* path.h: Add flag for future use.
-	* regexp/regerror.c: Avoid including RCS strings in product.
-	* regexp/regsub.c: Ditto.
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* select.cc (thread_pipe): Sleep for 10ms on every iteration.
-	(start_thread_pipe): Set the handle in the select structure
-	so that it will be properly identified in select_stuff::wait.
-
-Tue Sep 15 12:28:30 1998  DJ Delorie  <dj@cygnus.com>
-
-	* added documentation and doctool.c
-
-Tue Sep 15 08:37:26 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Fix LIBGCC definition for native builds.
-	Remove CFCOMMON in favor of configure solution.
-	* configure.in: Default CXXFLAGS to be == CFLAGS.
-	* configure: regenerate.
-
-Sun Sep 13 19:52:04 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: include ../libio when building
-
-Sun Sep 13 19:30:58 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin32/version.h: bump version minor now that
-	we've merged in all that new code...
-
-Sun Sep 13 21:34:33 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_global_ctors): Reverse call order
-	of constructors thanks to insight from Mumit Khan
-	(hkan@xraylith.wisc.edu).
-	(do_global_dtors): Reflect above change: invoke destructors
-	in the proper order.
-	* smallprint.c (__small_vsprintf): Gracefully detect a
-	null pointer for '%s' format.
-	* syscalls.cc (_read): Set correct flags to retrieve stack
-	information or suffer sporadic failures due to uninitialized
-	flag.
-	* regexp/regexp.c: Comment out RCS string.  This provides
-	no useful information in the .dll.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Merge in experimental-980602 branch changes.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (symlink_check_one): known_suffix needs to be
-	determined here in some cases, so deal with it here.
-	(path_conv::path_conv): More effort needed to propagate
-	the known_suffix back to caller in every case.
-	(has_suffix): Return suffix found.
-	(readlink): Avoid two passes through symlink_check_one.
-	* spawn.cc (find_exec): Propagate known_suffix from
-	perhaps_suffix back to caller, if appropriate.
-	(spawn_guts): Use suffix returned from find_exec to
-	determine if file should be scanned as a script when
-	a #! file is found.  Avoids a duplicate call to
-	perhaps_suffix.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.h (suffix_info): New struct for dealing with standard
-	suffix (.exe, .bat, etc.) information.
-	(path_conv): Constructor now takes a suffix_info argument.
-	(std_suffixes) Standard array of suffixes to consider "special".
-	* path.cc (path_conv): Constructor now takes a suffix_info
-	argument.  Record any known suffix in path_conv known_suffix
-	field.
-	(has_suffix): New function for determining if a path already
-	has a known suffix.
-	(next_suffix): New function for returning the next suffix from
-	a list of suffixes.
-	(symlink_check_one): Take an optional suffix_info argument
-	for suffixes to consider or tack on.
-	* spawn.cc (std_suffixes): Standard list of executable suffixes.
-	(perhaps_suffix): Pass std_suffixes to path_conv.  Use
-	new known_suffix field in path_conv to determine if a
-	suffix has been detected.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Substitute new str{,n}casematch for strcasecmp throughout.
-	This implementation is faster since it only tests equality.
-
-	Change fhandler*::open throughout to return true/false
-	since the pointer returned was never used for anything.
-
-	* Use strcasestr throughout for case insensitive matches for
-	filenames.
-	* Makefile.in: Use GNU make construct for determining gcc lib.
-	* dcrt0.cc (check_sanity_and_sync): Make error message more
-	explicit.
-	* debug.h: Better defines for dummy functions when !DEBUGGING.
-	* fhandler.cc (fhandler_base::fstat): Don't bother zeroing buf
-	here since it is always done in the caller.
-	(fhandler_base::~fhandler_base): Recognize cases where *_path_name_
-	should not be freed.
-	(fhandler_disk_file::open): Split into two functions.  First
-	function performs a path_conv and does testing on same.  This
-	calls new fhandler_disk_file::open with path_conv data.  New
-	function is called by stat_worker to avoid extra path tests and
-	mallocs.
-	Also, fix long standing off-by-one typo looking for #! magic.
-	Also, reapply test for != WinNT when checking files for magic.
-	Otherwise there is a tremendous slowdown in file opening, especially
-	for stat().
-	* fhandler.h: Add support for setting/detecting when *_path_name
-	should not be freed.
-	Add new fhandler_disk_file::open declaration.
-	* hinfo.cc (digits): Remove obsolete function.
-	(hinfo::build_fhandler): Add default name for FH_DISK.
-	* path.cc (path_prefix_p_): Don't check beyond len1 for leading
-	slash.  Responsible for reported performance problems?
-	(path_conv::path_conv): Ensure that fileattr is filled out
-	correctly in all cases.  Return immediately when a file
-	is detected in !follow_mode.
-	(nofinalslash): Simplify.
-	(strncasematch): New function similar to strncasecmp except
-	that it only checks for =/!= and benchmarks faster than same.
-	(strcasematch): Ditto, re. strcasecmp.
-	(strcasestr): New function which does a case-insensitive strstr.
-	Needed for filename matching.
-	* smallprint.c (__small_vsprintf): Fix off-by-one in %.ns processing.
-	* spawn.cc (exe_exts): Make global for eventual use by other modules.
-	* syscalls.cc (_fstat): Zero buf prior to use.
-	(stat_worker): Rename from _stat_worker. Reorganize to minimize
-	mallocs and path name conversions.  Should now perform only one
-	path conversion and 0 malloc/frees.
-	* winsup.h: Declare new functions.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Clean up error messages throughout using new strace_printf
-	options.
-	* smallprint.c (__small_vsprintf): Add %E option for printing
-	error code.  Understand %.n syntax.
-	* strace.cc (strace_vsprintf): Common routine for formatting
-	strace output.  Default to always ending with \n unless
-	string ends with \b.
-	(strace_write): Common routine for writing to strace output.
-	(strace_printf): Use above two routines.
-	(system_printf): Ditto.
-	* path.cc (path_conv): Scan path to be converted from right
-	to left for efficiency.  Implement extension searching
-	which is passed from spawn to symlink_check_one to minimize
-	overhead.
-	(symlink_check_one): Check extensions for existence for use
-	with spawn.
-	(readlink): Accommodate changes to symlink_check_one.
-	* spawn.cc (perhaps_suffix): Use new extension checking
-	capabilities of path_conv.
-	(find_exec_1): Delete.
-	(find_exec): Generalize to allow searching on any PATH like
-	environment variable.
-	* dllfcn.cc (check_path_access): Use find_exec to find a path.
-	This also ensures that paths are in Windows format which was
-	not the case before.
-	* environ.cc (conv_envvars): Add LD_LIBRARY_PATH.
-	* fork.cc (fork): Clean up dll loading slightly.
-	* Makefile.in: Turn on compiler warnings.
-	* winsup.h (save_errno): New class for saving errno from
-	being clobbered.
-	* include/sys/strace.h: Make system_printf a macro similar
-	to strace_printf_wrapper.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (sig_send): Attempt to work around Windows strangeness
-	when thread interrupted while waiting for completion event.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc: Remove debugging function DELETEME ().
-	* fhandler.cc (fhandler_base::fstat): Respond to compiler warning.
-	* signal.cc (sleep): Reset signal_arrived event before using it or
-	we could wake up immediately.
-	(usleep): Ditto.
-	(pause): Ditto.
-	* spawn.cc (spawn_guts): Ditto.  Respond to compiler warning.
-	* sigproc.cc (sig_send): More debugging info.
-	(sig_dispatch_mutex): Only ping wait_sig when needed.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (socket_cleanup): Close thread handle or suffer
-	handle leak.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (verify_true): New function.
-	(fhandler_socket::select_*): Use verify_true for verification
-	function to avoid multiple calls to socket select.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (select_stuff::wait): Scan entire list of fds
-	when WFMO wakes up.
-	(set_bits): Add some strace debugging output.
-	(thread_socket): Ditto.
-	(verify_ok): Return result of set_bits rather than always 1.
-	(start_thread_socket): Set the handle in the select structure
-	so that it will be properly identified in select_stuff::wait.
-	(fhandler_windows::select_read): Verification routine should
-	be `poll_windows'.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc: Change some sigproc_printfs to only occur when
-	#ifdef DEBUGGING.
-	* spawn.cc (perhaps_suffix): Search for (PROG is the pathname to
-	the executable file)  PROG.exe, PROG.com, PROG.bat, PROG.cmd, and
-	PROG and return extension found or NULL if no matching file.
-	(spawn_guts): If the file name of the executable ends in either
-	.exe, .com, .bat, or .cmd we assume that it is not a script file
-	and therefore do not open the file to determine if it is.
-	Fix "wait_failed" error when exec() called and non-cygwin parent.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dir.cc (rmdir): Set correct errno when non-empty directory and
-	Windows9x.
-	* pipe.cc (pipe): Use binary mode by default for pipes.
-	* syscalls.cc (_read): Wait for terminated thread to exit before
-	clearing its stack memory.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (hinfo::fixup_after_fork): Start initial fd search
-	to zero forked processes so that a close(0)/dup(fd) will work.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_windows::set_close_on_exec: Deal with possible
-	NULL handle.
-	(fhandler_windows::fixup_after_fork): Ditto.
-	* select.cc (select_stuff:wait): Handle return from
-	MsgWaitForMultipleObjects correctly for windows case.
-	* sigproc.cc (sig_send): Reset completion event for main thread.
-	* syscalls.cc (_read): Better handling of stack free condition.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_handler): Exit earlier if just running
-	in an exec'ed stub since the stub may own the sig_dispatch mutex,
-	but we still want to exit.
-	* select.cc (select_stuff::wait): Fix check for window activity
-	from MsgWaitForMultipleObjects.  Handle infinite wait correctly.
-	(poll_windows): Add debugging output.
-	* spawn.cc (spawn_guts): Protect against signals interrupting
-	at an inopportune moment.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (select_stuff:test_and_set): Take appropriate action
-	when a select record uses a window_handle.
-	(fhandler_windows::select_read): Set handle and windows_handle
-	appropriately.
-	(fhandler_windows::select_write): Ditto.
-	(fhandler_windows::select_except): Ditto.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (cygwin32_select): Need to reset signal_arrived before
-	testing it or suffer loop.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (resume_child): Give up on SuspendThread synchronization
-	and use subproc_ready/forker_finished events.
-	(sync_with_parent): Ditto.
-	* sigproc.cc (wait_sig): Make sigcomplete_main manual reset to
-	allow handling of nested interrupts.
-	(wait_sig): Fix stupid typo on exit that would cause a
-	loop to run for a long time.  Are exits faster now?
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (unlock_cs): Leave decision to release
-	sig_dispatch_mutex to the caller.
-	(set_process_mask): Call release_sig_dispatch_mutex explicitly
-	if needed.
-	(handle_sigsuspend): unlock_cs no longer takes an argument.
-	(call_handler): Try to acquire the strace mutex prior to
-	suspending the main thread to ensure that the mutex is always
-	released.
-	(sig_handle): Call release_sig_dispatch_mutex explicitly.
-	* fhandler_console.cc (fhandler_console::write): Protect against
-	signals while writing.
-	* signal.cc (signal): Protect against signal dispatch.
-	(sigaction): Ditto.
-	* sigproc.cc (sig_dispatch_pending): Return status no longer needed.
-	(sig_send): Assume pending_signals if sending signal to self.
-	(allow_sig_dispatch): Accept synchronize argument to control whether
-	to wait for wait_sig to do its thing.
-	(release_sig_dispatch_mutex): Just awaken wait_sig loop and wait
-	for acknowledgement if waitfor is TRUE.
-	(wait_sig): Don't ever zero pending_signals to avoid a possible race.
-	Set pending_signals for blocked signals, too.
-	* sigproc.h: Add __SIGFLUSH signal.
-	(class sig_protect): Allow destructor to wait for signal dispatch,
-	or not given constructor argument.
-	* strace.cc (get_strace_mutex): Renamed from waitfor_strace_mutex.
-	(release_strace_mutex): External function for use by call_handler.
-	This replaces raw calls to ReleaseMutex throughout.
-	* syscalls.cc (_read): Use sig_protect to protect against signals.
-	Other cosmetic cleanups.
-	(_close): Protect function with sig_protect.
-	* termios.cc (tcsetattr): Protect function with sig_protect.
-
-Thu Sep 10 21:09:51 1998  DJ Delorie  <dj@cygnus.com>
-
-	* syscalls.cc (_read): typo in matching printf format to args.
-
-	* fhandler.cc (write): Switch to the Microsoft/DJGPP way of
-	writing out text files: pass \r but prepend \r to \n.
-	(read): Don't collapse multiple \r's.
-
-	* delqueue.cc: rewritten for speed.  Don't check *every* entry in
-	the list if we know the list is empty, plus check for duplicates.
-	* delqueue.h: ditto.
-	* path.cc (path_conv): If a path component is missing, short-
-	circuit the symlink check.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h: Reorder fhandler status field so that device is
-	in lower bits.  This allows gcc to optimize access to the device.
-	* hinfo.cc: Inline not_open().
-	* winsup.h: Inline hinfo::not_open().  Make hinfo::[] operator a
-	simple array reference.
-	* strace.cc: Change strace() to a macro.
-	* include/sys/strace.h: Ditto.
-	* syscalls.cc (read_handler): New function.  Called directly from
-	_read for "non-slow" devices or via read_handler for slow devices.
-	(_read): Use read_handler for reading.
-	(read_helper): Ditto.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_exit): Don't ignore signals if reparenting.
-	Besides being a race, this screws up the process which is
-	actually executing.
-	* fork.cc (fork): Don't create a new process group when
-	forking or subprocesses won't respond to CTRL-C.
-	* syscalls.cc (_read): Ensure correct setting of EINTR errno.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (sync_with_child): Consider it a success if the child
-	has set the subproc_ready signal regardless of whether it has
-	exited or not.
-	* init.cc (dll_entry): Set read_helper_thread_info stuff to 0
-	on dll initialization.  Windows 95 seems to keep garbage here,
-	despite documentation to the contrary.
-	* syscalls.cc (_read): Report on errors to create read_helper
-	events.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (compute_argc): Limit debug_printf string argument size
-	or suffer a buffer overrun.
-	(do_exit): Add debugging statement.
-	* exceptions.cc (call_handler): Remove extraneous sigproc_printf.
-	Consolidate signal_arrived event with sig_was_dispatched.
-	(events_terminate): Consolidate signal_arrived event with
-	sig_was_dispatched.
-	* fhandler.h: Rename a field to something more mnemonic.
-	* fhandler_tty.cc: Throughout: Only set up fhandler_tty_master when
-	actually using ttys.  Change tty_master `f' field to `console'.
-	* tty.cc: Ditto.
-	* fork.cc (sync_with_child): Add more information to "child died"
-	error.
-	* hinfo.cc (hinfo::build_fhandler): Call tty master constructor
-	when appropriate.
-	* select.cc (select_stuff::wait): Consolidate signal_arrived event
-	with sig_was_dispatched.
-	* sigproc.h: Ditto.
-	* syscalls.cc (_read): Ditto.
-	* winsup.h: Ditto.
-	* sigproc.cc:  Ditto, throughout.
-	(block_sig_dispatch): Don't reset signal_arrived.  Causes races.
-	* spawn.cc (spawn_guts): Limit debug_printf string argument size
-	or suffer a buffer overrun.
-	* include/sys/strace.h:  Implement strace_minimal for very minimal
-	output which, hopefully, will not affect the behavior of traced
-	programs as much.
-
-Thu Sep 10 21:09:51 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: build libwinspool.a with the dll name winspool.drv
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (build_argv):  Remove verbose debug_printf.
-	(dll_crt0_1): Use shared data handle passed in from parent process
-	when appropriate.  Remove extraneous debug_printf.
-	* environ.cc (getwinenv): New function.  Returns (possibly cached)
-	native version of an environment variable.
-	(win_env::add_cache): Add cached version of posix and win env
-	variables to local table.
-	(posify): Modify for use with native caching.
-	(setenv): Convert special environment variables to native here,
-	when they are set.
-	(struct parse_thing): Simplify struct.
-	(struct parse_things): Extend table to accommodate "envcache"
-	setting.
-	(parse_options): Add "envcache" option to control whether special
-	environment variables are cached.  Simplify handling of remembered
-	parameters.
-	(winenv): Modify for use with getwinenv.
-	* exceptions.cc (unlock_cs): release_sig_dispatch takes an argument
-	now.
-	(set_process_mask): unlock_cs now wakens wait_sig when appropriate.
-	(handle_sigsuspend): Reorganize to take advantage of new behavior
-	of release_sig_dispatch_mutex and hopefully avoid a race.
-	(handle_sig): Avoid waking wait_sig if we couldn't get the dispatch
-	mutex.
-	* exec.cc (strccpy): Change to modify second argument to point
-	to position where "parse" stopped so that it doesn't have to be
-	recalculated by the caller.
-	(sexecvpe): Use find_exec () to find program to run.  If you've
-	got a function for this, you might as well use it.
-	* fhandler_tty.cc (fhandler_pty_master::process_input_to_slave):
-	Report on signal being sent in termios_printf.  Use kill_pgrp
-	interface.
-	* fork.cc (fork_copy): Just copy everything at once rather than
-	in individual pieces.
-	(fork): Potentially move up sbrk() when DEBUGGING so that parent
-	and child heaps are in sync.  Pass cygwin_shared_h to child.
-	* path.cc (path_conv::path_conv): Make sure that a file is not
-	a symlink when returning immediately.
-	* sigproc.cc (sig_dispatch_pending): Return TRUE if signals were
-	pending.
-	(sigproc_init): Move sig_was_dispatched initialization here so
-	that it will always be available to other functions which rely
-	on it.  Otherwise these functions would have to wait for wait_sig
-	to complete its initialization.
-	(sig_send): Rework SIGSUSPEND handling.
-	(release_sig_dispatch_mutex): Wait for signal to be dispatched
-	after releasing mutex if argument is TRUE.
-	(wait_sig): Remove sig_was_dispatched initialization from here.
-	* sigproc.h: release_sig_dispatch takes an argument.
-	* spawn.cc (perhaps_suffix): Take an optional argument indicating
-	whether the path has already been converted to win32.
-	(find_exec_1): Use getwinenv to get windows version of PATH.  Use
-	windows version of individual directories to avoid posix lookups.
-	(spawn_guts): Call strace_dump here to cause strace output to
-	be slightly more synced when using strace caching.
-	(spawnvpe): Use find_exec () to find program to run.  If you've
-	got a function for this, you might as well use it.
-	* syscalls.cc (_read): Only block signals for "slow" devices.
-	* winsup.h: Changes needed for previous checkin and getwinenv.
-
-Thu Sep 10 21:09:51 1998  DJ Delorie  <dj@cygnus.com>
-
-	* path.cc (path_conv): bug fix when path ends in slash
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::set_name): Use fhandler
-	method for determining native name.  Avoid path_conv
-	when possible.
-	(fhandler_disk_file::get_native): New function, returns
-	windows name of disk file.
-	* fhandler.h: Add get_native() method to fhandler_*
-	classes.
-	* fhandler_serial.cc (fhandler_serial::get_native): Return
-	windows name of serial port.
-	* fhandler_tty.cc (fhandler_tty_master::init): Use consistent
-	name for tty master.
-	* fork.cc (fork_copy): Experimental change to avoid loop.
-	* grp.cc (add_grp_line): Use realloc to extend group buffer.
-	* hinfo.cc (hinfo::release): fd object should be deleted,
-	not freed or suffer a memory leak.
-	(init_std_file_from_handle): Reset first_fd_for_open to
-	signal that std* locations have been opened.  Avoids use
-	of these locations prior to full dtable setup.
-	* passwd.cc (add_pwd_line): Use realloc to extend passwd buffer.
-	* path.cc (path_conv::path_conv): Avoid checking for symlinks on
-	network shares.  Check for existence of file prior to taking
-	it apart for symlink checking (this needs more work).
-	(windows_device_names): Make global.
-	(get_device_number): Detect tty master.
-	* sigproc.cc (wait_sig): Maintain a flag which indicates when
-	signals are queued due to the wait_sig's inability to get a
-	sig_dispatch mutex.
-	(sig_dispatch_pending): Don't wake up the wait_sig thread if
-	unless there are signals queued (see above) or force argument.
-	(allow_sig_dispatch): Only wait for signal dispatch if something
-	is queued.
-	* sigproc.h: allow_sig_dispatch takes a (defaulted) argument now.
-	* syscalls.cc (_open): Use default hinfo::find_unused_handle call.
-	* net.cc:  Ditto, throughout.
-	* pipe.cc: Ditto.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_exit): Ignore user initiated signals here.
-	* fhandler.cc (fhandler_disk_file::open): Detect error condition
-	on fhandler_base::open.
-	* fhandler_console.cc (undo_input): Respond to compiler warnings.
-	* grp.cc (getgrgid): Ditto.
-	* times.cc (_tzname): Ditto.
-	* fhandler_tty.cc (fhandler_Tty_slave::open): Cosmetic changes.
-	* fork.cc: Clean up debugging output.
-	* pinfo.cc (pinfo_init): Set pgid and sid to different values
-	initially.  Let user program set sid appropriately if it is
-	to be the owner of a tty.
-	* sigproc.cc (allow_sig_dispatch): Try harder to detect when we
-	should wait for a signal dispatch.
-	* strace.cc (strace_open): Revert to previous mutex behavior.
-	* include/sys/strace.h: Ditto.
-	* syscalls.cc (_open): Detect error from fhandler open.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Global changes:
-	Store win32 name in fhandler structure to avoid multiple translations.
-	Support close_on_exec at the Win32 level for all but sockets.
-	Respond to gcc warnings.
-	Use single fstat() call for devices.
-	*::set_close_on_exec modified.
-	* dir.cc (opendir): Use win32 name in stat to speed things
-	up a little.
-	* debug.cc: New file.  Provides routines for extra debugging
-	when -DDEBUGGING is specified.
-	* debug.h: New file. Definitions for debug.cc.
-	* exceptions.cc (signals_init): Break out signal initialization
-	from exceptions.
-	(dump_status): Add thread name to stack dump output.
-	(handle_exceptions): Renamed.
-	(set_process_mask): Don't ever mask non-maskable signals.
-	(ctrl_c_handler): Preliminary change to allow propagation of
-	cygwin signals back to gdb.
-	(sig_handle): Call do_exit directly from signal thread rather than
-	attempting to redirect the main thread.
-	* fhandler.cc (set_name): Store win32 name in fhandler structure.
-	(*::open) name field is extraneous now. Use get_win32_name () to
-	retrieve stored win32 name.
-	(fhandler_base::fstat): Default to performing fstat on a device.
-	(fhandler_disk_file::fstat): Renamed from fhandler_base::fstat.
-	Operate only on disk files.
-	(fhandler_base::set_close_on_exec_flag): New function sets flag
-	without touching the handle.
-	(fhandler_base::~fhandler_base): Free unix/win32 path names.
-	(fhandler_disk_file::close): Only call delqueue.process_queue from
-	this function since disk files are the only things that can
-	be unlinked, currently.
-	(fhandler_dev_null::open): Delete.
-	(set_inheritence): New function.  Set handle inheritence.
-	(fhandler_*::fork_fixup): New functions.  Inherit fhandler data
-	after a fork.
-	fhandler.h: *::set_output_handle - new method.
-	Setup methods for use by select().
-	fork.cc (fork): Call fixup_after_fork in child to inherit
-	handles marked as non-inheritable on CreateProcess.
-	hinfo.cc (hinfo::build_fhandler): Use new function to detect
-	devices.
-	(dup_for_exec): Delete obsolete function.
-	(hinfo::dup2): Remove extraneous tests.
-	(hinfo::select_*): Interfaces into select().
-	(hinfo::release): Free fd in dtable.
-	(hinfo::fixup_after_fork): New function.  Inherit close-on-exec
-	handles from parent after fork.
-	path.cc (mount_info::posix_path_p): Make inline.
-	(path_conv::path_conv): Short circuit when path resolves to a device.
-	(digits): Move here from hinfo.cc.
-	(windows_device_names): Win32 names for Cygwin devices.
-	(get_device_number): New function.  Return devie number given device
-	name.
-	(win32_device_name): New function.  Decode a windows device name
-	and an optional "unit".
-	(mount_info::conv_to_win32_path): Short circuit when path resolves to
-	a device.
-	* path.h: add device and unit fields to path_conv class.
-	* select.cc: Rewrite for more structure, more OO.
-	* sigproc.cc: (get_sig_dispatch_mutex): New function.
-	(release_sig_dispatch_mutex): New function.
-	* sigproc.h: sig_protect class.  Automatic protection from signals
-	when used.
-	* syscalls.cc (stat_dev): New function.
-	(stat_worker): Short-circuit when a cygwin device is detected.
-	* utils/ps.cc: Don't lock_pinfo when -f.  Compress format to fit
-	more on a line.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Register name for main thread.
-	* exceptions.cc (dump_status): Add thread name to diagnostic output.
-	(__cygwin32_exception_handler): Rename to handle_exceptions.  Avoid
-	creating a .core file.
-	* exec.cc (sexecve): Reflect spawn_guts argument change.
-	* fhandler_tty.cc (fhandler_tty_master::init): Use makethread to
-	create a new thread.
-	* select.cc: Create pipe/socket threads each time select is called.
-	Use thread termination as indication of fd readiness.
-	* sigproc.cc (sigproc_init): Use makethread to create a new thread.
-	(wait_sig): Simplify default signal call slightly.
-	* spawn.cc (spawn_guts): Accept child pinfo pointer rather than
-	pid.  Reorganize so that common initialization is handled once.
-	* strace.cc: Set strace_mutex to NULL initially to catch CreateMutex
-	errors.
-	* window.cc (gethwnd): Use makethread to create a new thread.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add debug.o target.
-	* cygwin.din: Separate pipe from _pipe.
-	* dcrt0.cc (alloc_stack):  New, more precise method for allocating
-	stack space after a fork.
-	(dll_crt0_1): Use new child_proc_info class to retrieve information
-	from possible parent process.  Remove #ifdef erroneously checked in.
-	Remove extraneous syscall_printf.
-	* exceptions.cc (signals_init): New function.
-	* fhandler.cc (fhandler_make_pipe): Move to pipe.cc.
-	* fhandler.h (fhandler_base): New = operator preserves unix_path_name_.
-	* fhandler_tty.cc: Strip some tty functions from here into tty.cc.
-	* fork.cc: Remove obsolete ifdefs.  Reorganize, streamline with new
-	fork.
-	* hinfo.cc: Speed up build_fhandler.
-	* libccrt0.cc: Remove obsolete ifdefs.
-	* pinfo.cc (pinfo_init): Simplified by new fork/spawn info passing
-	method.
-	* pipe.cc (make_pipe): Moved from fhandler.cc.  Handles MS-style
-	_pipe.
-	(pipe): Use new arguments to make_pipe.
-	(_pipe): New MS-compatible function.
-	* shared.cc: cygwin_shared_h make global so that it can be inherited
-	via new fork/spawn info passing method.
-	(open_shared_file_map): Detect if shared info is already set up from
-	fork/spawn.
-	* sigproc.cc (sigproc_init): Initialize signals with signals_init here.
-	Use new fork/spawn info passing method.
-	* spawn.cc (spawn_guts): Pass information in a structure to spawned
-	process.  Identify structure type with a "magic number".
-	* strace.cc (strace_printf): Only print program full path spec once
-	to save space and clutter.  Preserve any windows error.
-	* syscalls.cc (_open): Detect and avoid error return from
-	build_fhandler.
-	* tty.cc: Accept some non-fhandler functions formerly found in
-	fhandler_tty.cc
-	* winsup.h (pinfo): Remove some fields obsoleted by new fork/spawn
-	info passing method.
-	(child_info*): New classes for passing information to forked/spawned
-	process.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add debug.o target.
-	* console.cc (fhandler_console::char_command): Fix failed merge.
-	* dcrt0.cc (alloc_stack):  New, more precise method for allocating
-	stack space after a fork.
-	(dll_crt0_1): Use new child_proc_info class to retrieve information
-	from possible parent process.  Remove #ifdef erroneously checked in.
-	Remove extraneous syscall_printf.
-
-Thu Sep 10 21:09:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Global changes:
-	Replace pinfo hmap entry with "dtable" reference.
-	Replace cygwin_shared .t field with '.tty' and allow indexing via
-	tty into this array.
-	Make fhandler_ constructors set the size of the structure into any
-	created class.
-	Change fhandler settings into a bit mask.  Use methods to access.
-	Record device type in fhandler class.
-	Remove old linearize/de_linearize code in favor of newer method
-	uses more bullet-proof method for determing device type of inherited
-	files.
-	Protect various important handles from closing when operating
-	under -DDEBUGGING.
-	* dcrt0.cc (do_global_ctors): Renamed, made static and reused
-	for calling from dll_crt0_1 to initialize cygwin.dll constructors.
-	(do_global_dtors): Renamed.
-	(dll_crt0_1): mark noreturn.  Use new do_global_ctors function.
-	Call debug_init to initialize features turned on by -DDEBUGGING.
-	Call dtable_init to initialize dtable, hinfo_init to initialize
-	standard fds.
-	(dll_crt0): Mark noreturn.  Move constructor calls to dll_crt0_1.
-	(__main): Use new do_global_ctors ().
-	Remove OLDWAY and _PPC_ conditionals.
-	* environ.cc (environ_init): Use appropriate strace printf.
-	* exceptions.cc (set_process_mask): Don't ever mask out unmaskable
-	signals.
-	* init.cc (dll_entry): Initialize storage for read_helper.
-	* pinfo.cc (init_from_exec): Delete obsolete function.
-	* sigproc.cc (sig_send): Implement myself_nowait to allow
-	sending a signal to myself without waiting for synchronization.
-	(wait_sig): Change method for determining whether signal should
-	be examined slightly.
-	* strace.cc (strace_printf):  Add ability to report on thread from
-	which message originated.
-	(threadname): New function
-	* syscalls.cc (read_helper): New function.  Invoked in separate thread
-	from _read.
-	(_read): Use a separate thread for reads that can be interrupted
-	with a TerminateThread().  Allows EINTR.
-	(setdtablesize): Use new method for extending the size.  Callable
-	from anywhere.
-	(getdtablesize): Use new method for getting the current dtable size.
-	* tty.cc: Remove use count in favor of a method which checks tty
-	availability via an event.  Some code cleanup.
-	(tty::inuse): New function for determining if a tty is
-	in use by any process.
-	(tty_list::terminate): Use new method for determining if a tty is in
-	use.  Should avoid hangs waiting for non-existent processes to
-	free up a tty.
-	(tty::common_init): Common initialization for tty/pty master.
-	(fhandler_tty_master::init): New function.
-	(do_output): Use new method for determining if a tty is in use.
-	(fhandler_pty_master::open): Use comon initialization code.
-	(fhandler_pty_master::ptsname): static buffer is ok now.
-	* tty.h: Reflect inuse changes and tty.cc cleanup.
-	* winsup.h: Include debug.h for use when -DDEBUGGING.  Remove
-	stuff previously here which was conditionally compiled with -DDEBUGGING.
-	(hinfo_vec): Rename to hinfo.  Maintain argv style list of pointers
-	to open fds.  Add methods to deal with above changes.
-	(pinfo): Removals due to above changes.
-	(shared_info): Rename t to tty.
-	Add common defines to extern "C" section.
-
-Wed Sep  9 22:24:50 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_prefix_p_): Rewrite to avoid false match
-	against root when remote path or \\x style disk device.
-	* include/sys/strace.h: Implement new macro for use by
-	malloc_printf which does not default to "on" if STRACE=1.
-	This avoids massive strace logs.
-
-Tue Sep  8 11:31:42 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Remove ill-advised ifdef NEEDOEM.
-
-Thu Sep  3 17:54:18 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Speed up dll links.
-	* path.cc (chdir): Fix previous change.
-
-Mon Aug 31 12:23:33 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (chdir): Protect free from potential signal race.
-
-Fri Aug 28 15:59:27 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* dlfcn.h: delete, move it
-	* include/dlfcn.h: here
-
-Thu Aug 27 14:20:38 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* path.cc (path_conv::path_conv): remove trailing backslash from
-	full win32 name, otherwise the last component of the path isn't
-	checked for symlink.
-
-Wed Aug 26 14:15:22 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_base): Make set_name() public and implement
-	clear_name() to accommodate dup2.
-	* hinfo.cc (dup2): Previous change exposed problem with dup2.
-	Same unix_path_name_ ptr was being used in two separate fds.
-	Fix this.
-
-Wed Aug 26 12:10:27 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* malloc.cc: Use malloc_printf throughout.
-	* path.cc (getcwd_inner): Allocate buffer with realloc to
-	avoid a memory leak.
-	* syscalls.cc (_close): delete unix_path_name_ explicitly since
-	destructor is never called.
-	* include/sys/strace.h: Add strace_malloc stuff.
-
-Mon Aug 24 15:45:59 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/sys/ioctl.h: variable names in protos should start
-	with two leading underscores.
-	* include/sys/mman.h: ditto.
-	* include/sys/mount.h: ditto.
-	* include/sys/resource.h: ditto.
-	* include/sys/smallprint.h: ditto.
-	* include/sys/socket.h: ditto.
-	* include/sys/strace.h: ditto.
-	* include/sys/vfs.h: ditto.
-	* include/sys/wait.h: ditto.
-	* include/mntent.h: ditto.
-
-Tue Aug 18 17:00:20 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from Trevor Yann (TYann@vet.com.au):
-	* uname.cc (uname): report processor type for win98
-
-Tue Aug 18 16:09:13 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (cygwin_fork_helper1): Start initial fd search
-	to zero forked processes so that a close(0)/dup(fd) will work.
-
-Mon Aug 17 16:58:09 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.h (hinfo): Remember initial fd to start searching
-	for new fds.  This avoid assigning std/in/out/err to
-	files opened early in initialization.
-	(hinfo_vec::find_unused_handle): New default way to search
-	for a new handle.  Avoids using std/in/out/err until the
-	proper time in the initialization.
-	* fhandler.cc (fhandler_make_pipe): Use default method for
-	finding unused handle.
-	* net.cc:  Ditto throughout.
-	* pipe.cc (dup): Ditto.
-	* syscalls.cc (_open): Ditto.
-	* hinfo.cc (hinfo_vec::init_std_file): Set initial fd for open
-	search to include std/in/out/err.
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* spawn.cc (perhaps_suffix): Use translated win32 path when
-	determining if a .exe extension should be added or suffer adding
-	a .exe extension twice.
-
-Mon Aug 10 15:08:49 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin32/version.h: up minor version number
-
-Mon Aug 10 07:04:13 1998  DJ Delorie  <dj@cygnus.com>
-
-	* delqueue.cc: rewritten for speed.  Don't check *every* entry in
-	the list if we know the list is empty, plus check for duplicates.
-	* delqueue.h: ditto.
-
-Sat Aug  8 14:03:52 1998  Eric Bachalo  <ebachalo@cygnus.com>
-
-	* spawn.cc (perhaps_suffix): If report_failure_p is non-zero this
-	function will search for (PROG is the pathname to the executable
-	file)  PROG.exe, PROG, PROG.com, PROG.bat, and PROG.cmd and return
-	either the full path name if found or NULL if not.
-	(spawn_guts): If the file name of the executable end in either
-	.exe, .com, .bat, or .cmd we assume that it is not a script file
-	and therefore do not open the file to determine if it is.
-
-Thu Aug  6 22:25:38 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv): If a path component is missing, short-
-	circuit the symlink check.  Bug fix for case where path ends
-	in a slash.
-	(path_conv::path_conv): Make sure that a file is not
-	a symlink when returning immediately.  Avoid checking for
-	symlinks on network shares.  Check for existence of file prior
-	to taking it apart for symlink checking (this needs more work).
-
-Sun Aug  2 19:17:59 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (cleanup_pipe_thread): Cleanup thread handle or suffer
-	handle leak.
-	(cleanup_socket_thread): Ditto.
-	* sigproc.cc (proc_subproc): Make wait thread manual reset to
-	solve problem with nested waits not waiting correctly.
-	* fhandler_tty (fhandler_tty_slave::open): Don't create the output
-	mutex, just open it.  If it can't be opened, its an error.
-
-Wed Jul 29 12:08:19 1998  Eric Bachalo  <ebachalo@loony.cygnus.com>
-
-	* include/Windows32/Defines.h: Added Virtual-Key Code defines
-	for the Win95 keys - VK_LWIN, VK_RWIN, and VK_APPS.
-
-Tue Jul 21 14:47:59 1998  DJ Delorie  <dj@cygnus.com>
-
-	* path.cc (path_prefix_p): optimize calls by comparing first
-	characters inline.
-	(path_conv): optimize by not checking both foo and foo/ for
-	symbolic links.
-
-Tue Jul 21 14:39:03 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (pinfo_init): Set myself->sid to 1 so that
-	a program started up outside of cygwin will not trump
-	other opens of ttys.  Fixes problem with pgid change below.
-
-Tue Jul 21 12:59:21 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (chdir): Force chdir to disk device to go to the root
-	directory.
-
-Tue Jul 21 09:32:23 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (pinfo_init): 0 is a very bad value for a default pgid.
-
-Fri Jul 16 15:09:50 1998  Stan Cox  <scox@cygnus.com>
-
-	* (gcrt0.c, gmon.c, profil.c, mcount.c, gmon.h, profil.h,
-	   config/i386/profile.h): New files for gprof cygwin support.
-	  Some code contributed by Tim Newsham for Secure Networks, Inc.
-	* Makefile.in (LIBGMON_A, GMON_START, GMON_OFILES): New for gprof.
-
-Mon Jul 13 19:29:00 1998  Eric Bachalo  <ebachalo@loony.cygnus.com>
-
-	* dcrt0.cc (insert_files): Now both -@file and @file work as
-	command line file insertion options.
-	* fhandler_serial.cc (fhandler_serial::open): Enabled RTS Control
-	Line by default to make full handshaking cables work for the
-	D10V board. (CDB.fRtsControl)
-	(fhandler_serial::tcsetattr): same as above
-
-Wed Jul  8 15:53:35 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Avoid redundant strace_printf.
-
-Wed Jul  8 15:05:10 1998  DJ Delorie  <dj@cygnus.com>
-
-	* fhandler.cc (fhandler_base::lseek): Note lseek so that next
-	write() can check for the Win95 "gap" bug.
-	(fhandler_base::write): If Win95 and lseek past eof
-	followed by write, use WriteFile to force the "gap" to be filled
-	with zeros rather than left to the "undefined" data Win32 specifies.
-	(fhandler_base::fhandler_base): initialize check_win95_lseek_bug_.
-	* fhandler.h (class fhandler_base): Add check_win95_lseek_bug_
-	for bug: when seek past EOF and write, win95 fills with random
-	data (security hole).
-
-Thu Jul  2 10:45:15 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (winenv): Be more paranoid when restoring special
-	win32 environment variables beginning with '='.
-
-Thu Jul  2 09:19:32 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc:  Previous change was not rigorous enough.
-	Track environment variables to convert in a structure which
-	records the correct function for converting the environment
-	variable from/to POSIX format.
-	(isspecial): New function.
-	(parse_options): Use template to initialize parse array.
-	(posify): Use new conversion function.
-	(winenv): Ditto.  Also restore special win32 environment variables
-	beginning with '='.
-	* path.cc (conv_path_list): Source argument should be const.
-	(win32_to_posix_path_list): Ditto.
-	(posix_to_win32_path_list): Ditto.
-	* path.h: Reflect changes to path.cc.
-
-Tue Jun 30 14:00:32 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (winenv): Avoid converting environment variables to
-	windows style if they begin with something like a 'C:'.
-
-Sun Jun 28 20:59:16 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* include/Windows32/Structures.h (MINMAXINFO): Add a missing
-	*LP...
-
-Thu Jun 25 10:45:38 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* signal.cc (sigpending): Stop from always reporting pending signals
-	when no signals are actually pending.
-
-Tue Jun 23 15:38:45 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in:  Add a new target.
-	* cygwin.din: Add cygwin32_internal interface.
-	* dcrt0.cc (dll_crt0_1): Don't call main if no main set.  Allows
-	initialization from a .dll.
-	* utils/ps.cc: Use new internal/external interface to cygwin to
-	provide an unchanging interface to some cygwin internals.
-	* external.h: Preliminary stab at an interface to cygwin32 for
-	getting at the "naughty bits".
-	* external.cc: External interfaces to some cygwin internal stuff.
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* exceptions.cc (sig_handle): When abnormally terminating,
-	close_all_files in signal thread context to prevent socket hangs.
-
-Thu Jun 18 15:17:06 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (pinfo_list::allocate_pid): Wrap pids at SHRT_MAX
-	or ash complains.
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* window.cc (WndProc): Always kill timer before starting up
-	a new one or eventually suffer a timer proliferation.
-
-Mon Jun 15 09:40:30 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc: Cosmetic change.
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* syscalls.cc (system): Ignore SIGINT, SIGQUIT and SIGCHLD while
-	in a system() call.
-
-Thu Jun 11 18:37:02 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/sys/syslog.h: add missing LOG_LOCALn bits
-
-Tue Jun  9 22:29:26 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dll_init.cc (DllNameIterator::operator const char* ()): Add
-	a missing \n to a *_printf.
-	* fhandler_tty.cc (fhandler_tty_slave::dup): Ditto.
-	(fhandler_tty_slave::ioctl): Ditto.
-	* errno.cc (errmap): Add an unrepresented windows error.
-	Simplify table.
-
-Tue Jun  9 17:21:44 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* errno.cc (errmap): Make sure that errmap array is
-	terminated with a NULL or suffer a SIGSEGV.
-
-Tue Jun  9 10:30:02 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Change `sprintf' to `__small_sprintf' throughout cygwin.
-	* cygwin.din: Don't export exception handler.
-	* exceptions.cc (__cygwin32_exception_handler): Rename to
-	handle_exceptions.  Make static.  Redo core file generation
-	slightly so that __small_sprintf can be used.
-	(call_handler): Remove use of `rethere' in asm code.  Don't
-	probe stack as this is potentially dangerous unless done
-	meticulously.
-	* select.cc (select): Redo to create thread whenever needed
-	for pipe/socket.  Thread termination denotes fd readiness.
-
-Mon Jun  8 14:31:11 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (set_std_handle): New function to set windows
-	"standard" handles from cygwin handles.
-	(hinfo_vec::dup2): Set windows standard handle if appropriate.
-	* syscalls.cc (_open): Set windows standard handle if appropriate.
-
-Sun Jun  7 16:34:00 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* fhandler_console.cc (fhandler_console::scroll_screen): Add a
-	workaround for Win95 ScrollConsoleScreenBuffer bug which allowed
-	scrolling to work correctly in both directions.
-	(fhandler_console::char_command): Simulate underscore with cyan
-	instead of magenta like on a real linux console.
-
-Sat Jun  6 00:01:18 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc: Remove obsolete PPC and OLDWAY defines.
-	* exceptions.cc: Remove obsolete PPC defines.
-
-Fri Jun  5 22:18:01 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* utils/Makefile.in: install should build products if necessary.
-
-Fri Jun  5 17:47:11 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* errno.cc (seterrno): shouldn't & against 0xff since there
-	are error codes above 255.
-
-Fri Jun  5 14:35:36 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (ctrl_c_handler): Ignore CTRL_LOGOFF_EVENT or
-	everybody gets signalled when a user logs off.  Allow program
-	to clean up when receiving a CTRL_CLOSE_EVENT or CTRL_SHUTDOWN_EVENT.
-	* spawn.cc (_spawnve): Delete hmap.vec from created child since
-	it just gets overwritten in the child anyway.
-	* pinfo.cc (lpfu): u -> user_data.
-
-Thu Jun  4 22:45:12 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* mmap.cc (mprotect): 3rd arg to VirtualProtect call should
-	be new_prot, not prot.  Also, fix check for PROT_NONE (==,
-	not &).
-
-Wed Jun  3 16:37:43 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* exceptions.cc: Fix typo in comment
-	(ctrl_c_handler): Add comments, return FALSE on CTRL_CLOSE_EVENT,
-	CTRL_LOGOFF_EVENT, and CTRL_SHUTDOWN_EVENT events.  Otherwise,
-	we handle the console event ourselves, send a SIGINT, and return
-	TRUE.
-
-Wed Jun  3 14:36:08 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* path.cc (conv_to_win32_path, conv_to_full_win32_path): resolve
-	symlinks before converting.
-
-Wed Jun  3 02:11:23 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* exceptions.cc (ctrl_c_handler): return zero when a
-	CTRL_LOGOFF_EVENT occurs.
-
-Wed Jun  3 01:01:17 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Reorganize fhandler-related file layout.
-	* Makefile.in: Remove console.o, add fhandler_console.o.  Add
-	fhandler_serial.o.  Remove tty.o, add fhandler_tty.o.
-	* fhandler_console.cc: Was console.cc.
-	* console.cc: Delete.
-	* fhandler_serial.cc: Was code in fhandler.cc.
-	* fhandler.cc: Delete fhandler_serial routines.
-	* fhandler.h: Fix comments describing fhandler file layout.
-	* fhandler_tty.cc: Was code in tty.cc.
-	* tty.h: Delete.
-	* fhandler_tty.h: Was tty.h.
-	* tty.cc: Delete code moved to fhandler_tty.cc.
-	* winsup.h: Include fhandler_tty.h instead of tty.h.
-
-Tue Jun  2 23:34:42 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Don't need processor-specific sysdef directories:
-	* sysdef/powerpc: remove all files
-	* sysdef/i386: move all files to top of sysdef directory
-	* configure.in: stop setting processor-specific sysdef variable
-	* configure: regenerate
-	* Makefile.in: build .a files from top-level sysdef files.
-
-Tue Jun  2 16:52:18 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from lhall@rfk.com (Larry Hall):
-	* console.cc (fhandler_console::fhandler_console): call
-	fillin_info() to check if console attributes have already been
-	set.  If so, set the default foreground color to be the default
-	for the console, otherwise set it to white.
-	(fhandler_console::char_command): use the default color to set fg,
-	bg, and bold for all cases.
-
-Mon Jun  1 14:05:01 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dir.cc (writable_directory):  Avoid a malloc.
-	(opendir): Convert to fully qualified path spec.  Use inode from
-	stat as hash instead of recalculating.
-	(readdir): Try hard to generate the same inode for filenames
-	as inodes returned from stat().  Handle '.' and '..' inodes
-	differently than normal files.  Note that '..' will still fail
-	in certain pathological conditions.
-	* fhandler.cc (fstat): Preserve errno around path conversion.
-	* path.cc (path_conf::path_conv): Add an extra argument signifying
-	whether caller wants a fully qualified Windows spec.
-	(get_current_directory_name): New function.  Retrieves current
-	directory name into internal buffer.
-	(getcwd_inner): Reorganize.  Use get_current_directory_name()
-	to retrieve a (possibly cached) directory name.
-	(hash_path_name): Move function here from syscalls.cc.  Rewrite to
-	deal (simplistically) with non-absolute path specs.  Use
-	get_current_directory_name to absolutize path.
-	* path.h: Reflect additional argument for path_conv.
-	* select.cc (cygwin32_select): Remove newline from select_printf().
-	* syscalls.cc (hash_path_name): Move to path.cc.
-	(stat_worker): Always use full path spec so that inodes are
-	calculated correctly.
-	* uinfo.cc (getlogin): Make extern "C".
-	* include/sys/resource.h: Put extern "C" around this file.
-
-Mon Jun  1 13:16:03 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* console.cc: Comment out small_printfs which issue errors
-	on things like invalid escape sequences.  This is very much
-	unlike a normal terminal, or even like linux which console.cc
-	purports to emulate.
-	(console_read): Renamed from FakeReadConsole.  Streamline
-	slightly.
-	(fhandler_console::read): Ditto.
-
-Fri May 29 22:41:18 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* hinfo.cc: Include unistd.h, not fcntl.h.
-
-Fri May 29 21:38:10 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::binary_win32_path_p): Don't allow
-	the root mount to replace a //drive or //host specification.
-
-Fri May 29 08:20:28 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* winsup.h: Remove exports section in favor of external
-	include files.  Fix some comments.
-	* {console.cc, fcntl.cc, pipe.cc}: Include unistd.h.
-	* dcrt0.cc (__main): Make extern "C".
-	* strace.cc: Include time.h.
-	* wait.cc (_wait): Make extern "C".
-	* version.h: Bump minor version to 3 in honor of /dev/windows
-	support.
-
-Fri May 29 03:11:28 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* Makefile.in: Add fhandler_windows.o target
-	* fhandler.h: Include <sys/ioctl.h>.  fhandler_windows: new
-	fhandler class that handles access to Windows message queue.
-	(fhandler_base::is_windows): new virtual member function
-	* fhandler_windows.cc: New file, fhandler_windows class
-	implementation.
-	* hinfo.cc (hinfo_vec::build_fhandler): build fhandler_windows
-	class for "/dev/windows".  Include <sys/ioctl.h>.
-	* select.cc: New fd_windows_map class
-	(fd_windows_map::convert_to_unix_fdset): New, check for Windows
-	messages in a queue.
-	(cygwin32_select): check for windows fd is passed to select call,
-	increase size of harray by one to support windows pseudo-handle,
-	do MsgWaitForMultipleObjects if windows fd passed to select call.
-
-Thu May 28 18:22:24 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* utils/cygpath.cc: New file.
-	* utils/Makefile.in (PROGS): Add cygpath$(EXEEXT).
-	(cygpath$(EXEEXT)): Ne target.
-
-	* include/sys/cygwin.h: Declare more path conversion functions.
-
-Thu May 28 15:56:26 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/sys/ioctl.h: need to include <sys/cdefs.h>
-	* syscalls.h: remove ioctl proto
-
-Wed May 27 01:34:06 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: add sethostent/endhostent exports
-	* net.cc (sethostent, endhostent): new stubs
-
-Fri May 22 17:31:50 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin32/in.h: correct typo in IPPORT_WHOIS define
-
-Fri May 22 17:00:48 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/sys/ioctl.h: add ioctl proto
-
-Wed May 20 18:52:31 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/sys/param.h: delete, file overlaps with newlib's.
-	Move it to newlib/libc/sys/cygwin32/sys where such files
-	are supposed to go.
-
-Wed May 20 18:20:35 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* select.cc (auto_del_fd_set_map::auto_del_fd_set_map): correct
-	C++ problem -- can't use parens in call to new.
-
-Wed May 20 17:03:25 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	based on patch from newsham@lava.net (Tim Newsham):
-	* select.cc: FIXMEs added/adjusted
-	(select_sleep): new static select helper function
-	(cleanup_sockthread): ditto
-	(cleanup_pipethread): ditto
-	(cygwin32_select): remove degenerate goto in favor of calling
-	select_sleep, call cleanup_sockthread and cleanup_pipethread
-	instead of previously duplicated code.
-
-Wed May 20 02:21:37 1998  Geoffrey Noer <noer@cygnus.com>
-
-	patch from Christopher Faylor <cgf@cygnus.com>
-	* fhandler.cc (fhandler_serial::raw_read): When
-	vmin_ == 0, vtime_ > 0, don't force only one char at a time
-	to be read.
-	(fhandler_serial::tcsetattr): set to.ReadIntervalTimeout
-	and to.ReadTotalTimeoutMultiplier appropriately so reads
-	will time out properly when vmin_ == 0, vtime_ > 0.
-
-Tue May 19 09:05:46 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* init.cc (set_dllname): Use consistent "cygwin32" name for dll
-	if the name of the dll is actually cygwin.  This will allow
-	better interoperability between dlls which have been renamed,
-	i.e., cygwindevo.dll -> cygwin98r1.dll.
-
-Mon May 18 22:39:35 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.h: Remove sig* undefs since this is now done in newlib.
-	Define SIGTOMASK define for use by signal mask operations.
-	* exceptions.cc (__cygwin32_exception_handler): Use SIGTOMASK.
-	(sig_handle): Ditto
-	* signal.cc (sigpending): Ditto.
-	(sigaddset):  Use SIGTOMASK.  Disallow signal 0.
-	(sigdelset): Ditto.
-	(sigismember): Ditto.
-	* strace.cc (strace_printf):  It is possible for strace_mutex to
-	be an invalid handle.  Open the mutex if so.  Call ReleaseMutex
-	until exhausted since a signal may have interrupted an strace_printf.
-	(strace_dump):  Call ReleaseMutex until exhausted.
-	* tty.cc (do_output): Remove strace printf to avoid filling up strace
-	output.
-	(fhandler_tty_slave::read): Use SIGTOMASK.
-
-Mon May 18 09:11:38 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Clear errno before calling main.
-
-Thu May 14 00:37:01 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* dcrt0.cc: add comments, reformatting
-
-Wed May 13 17:47:23 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* times.cc (to_time_t): prevent stat from returning incorrect
-	file modification time (one second less) on fat partitions due
-	to round-up error.
-
-Wed May 13 16:03:07 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* select.cc: add comments, FIXMEs, respace, delete old
-	sockets-only case that was previously commented out.
-	(cygwin32_select): in case where handles and sockets are
-	set, don't check that always_ready_used is zero (that case is
-	covered before).
-	* syscalls.cc: delete unused file_queue struct.
-
-Tue May 12 18:36:25 1998  Geoffrey Noer <noer@cygnus.com>
-
-	* syscalls.cc (get_os_type): add FIXME
-
-Tue May  5 14:02:12 1998  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout Cygwin replace use of "sa" SECURITY_ATTRIBUTE variables
-	with appropriate global variables.
-	* shared.cc (shared_init): Initialize global security attribute
-	variables for use in various places around cygwin.
-	* fork.cc (fork_init): Remove. Functionality replaced by above.
-	* dcrt0.cc (dll_crt0_1): Remove obsolete fork_init() call.
-
-Sat May  2 17:40:51 1998  Christopher Faylor <cgf@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* tty.cc (create_tty_master): Fill in ut_host utmp field with
-	local host name instead of "local" to avoid "who" command timeouts.
-
-Fri May  1 22:38:20 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc:  Add a global to control com port reset behavior.
-	(parse_options): Recognize "reset_com" as a CYGWIN32 option.
-	* fhandler.cc (fhandler_serial::raw_read): Handle vmin and vtime
-	more like UNIX.
-	(fhandler_serial::open): Revive code to reset com port on open.
-	Only reset the port if reset_com global is not set and if this
-	function is being called explicitly by open.
-	(fhandler_serial::tcsetattr): Make CRTSCTS flow control more
-	like UNIX -- it should turn on hardware handshaking in both
-	directions.  Handle vmin and vtime in a manner more consistent
-	with UNIX.
-	(fhandler_serial::tcgetattr): Reflect CRTSCTS changes above when
-	reporting this state.
-	* include/sys/termios.h: Move CRTSCTS and CRTSXOFF (sic) into
-	16 bits or they will never be capable of being set.
-
-Thu Apr 30 15:05:45 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* console.cc (fhandler_console::init): If resetting stdin,
-	make sure to reset the ConsoleCtrlHandler.
-	* exceptions.cc (set_console_handler): New function broken out
-	of init_exceptions().  Sets the function responsible for handling
-	CTRL-C.
-	(init_exceptions): Snipped out set_console_handler.
-
-Thu Apr 30 14:11:30 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sys/cygwin.h: Remove cygnus-specific declaration.
-	* winsup.h: Move cygnus-specific cygwin32_attach_handle_to_fd
-	declaration here.  This function may eventually be replaced by
-	an osf_* function.
-
-Tue Apr 28 17:07:46 1998  Geoffrey Noer <noer@cygnus.com>
-
-	* passwd.cc (parse, getpass): remove unneeded uses of NO_COPY
-	* grp.cc (getgrgid, getgrnam): ditto
-
-Tue Apr 28 16:18:03 1998  Geoffrey Noer <noer@cygnus.com>
-
-	* version.h: bump minor version to 2
-	* errno.cc: add FIXME
-
-Wed Apr 22 15:43:56 1998  Geoffrey Noer <noer@cygnus.com>
-
-	* syscalls.cc (cygname): delete
-	* shared.cc (shared_name): new, was cygname
-	* strace.cc, exceptions.cc, sigproc.cc, shared.cc: fix
-	cygname references in light of above
-
-Wed Apr 22 14:12:09 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (fd_set_map::remove_pair_by_handle): minor optimization
-	* strace.cc (strace_printf): change format for consistency
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* dcrt0.cc (dll_crt0): Call global constructors explicitly
-	* tty.cc (create_tty_master): Remove code which attempted to
-	invoke tty constructor
-
-Tue Apr 21 16:18:27 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (ucenv): inline
-	(posify): Ditto
-	(environ_init): remove obsolete function use
-	* path.cc (symlink_check_one): Set errno here where appropriate.
-	(readlink): Rely on errno set by symlink_check_one rather than
-	defaulting to EINVAL.  Should fix problems with RCS.
-
-Tue Apr 21 15:36:41 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* Implement a NOSTRACE preprocessor define to allow building
-	Cygwin32 without any STRACE code.
-	* configure.in: Add entries for architecture specific programs
-	to allow easier cross-compile builds
-	* configure: Ditto
-	* Makefile.in: Ditto
-	* console.cc (fhandler_console::char_command): Fix two problems
-	with cursor position report:  1) it reported position relative
-	to beginning of buffer rather than beginning of screen,  2) it
-	reported y, x in reversed order
-	* dcrt0.cc: Remove NO_COPY from variables that don't need it.
-	Remove variables obsoleted by NO_COPY.
-	(dll_crt0_1): strace settings are now inherited.  Don't try
-	to initialize strace early.  Remove initialization of variables
-	which are now handled automatically by NO_COPY.  Set error mode
-	for Cygwin32 to fail on critical errors rather than popping up
-	a dialog box.
-	* spawn.cc (spawn_guts): Always use default error mode when
-	spawning a new process.  Move error message to more generally
-	useful location.  Terminate signal handling in a cygwin parent
-	process or two processes will be handling signals.
-	(_spawnve): Inherit strace stuff
-	* exceptions.cc (events_init): Provide more information on
-	"Catastrophic failure".  Change error message wording slightly.
-	* fork.cc: Remove obsolete structure
-	(cygwin_fork_helper1): Remove use of obsolete structure.  Inherit
-	strace settings in child processes.
-	* sigproc.cc (sigproc_init): Set wait_sig priority immediately
-	after thread creation.
-	* smallprint.c: Remove unneeded include
-	* strace.cc: Reorganize to handle NOSTRACE
-	(strace_open): Use strace entries in pinfo structure which are
-	now inherited
-	(strace_dump): ditto
-	(strace_init): preprocessor define STRACE_HHMMSS causes strace
-	output to use alternate log file format.
-	(strace_printf): ditto
-	* syscalls.cc (access): Remove SetErrorMode in favor of global
-	cygwin32 setting in dll_crt0_1.
-	* fhandler.cc: Handle NOSTRACE
-	* tty.cc: Ditto
-	* window.cc: Ditto
-	* include/sys/strace.h: Ditto
-	* winsup.h: Move strace_file handle from per_process to pinfo so
-	that it can be inherited.  Remove obsolete pinfo entry.
-
-Tue Apr 21 14:30:52 1998  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (cygwin32_attach_handle_to_fd): New function
-	* include/sys/cygwin.h: Ditto.
-	* cygwin.din: Export new cygwin-specific function
-
-Tue Apr 21 02:32:08 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc: comment out file_queue struct that doesn't
-	seem to be used for anything anymore.  Don't need to include
-	stdarg.h or sys/socket.h.  Include utmp.h.  Minor respacing.
-	Move all functions from misc.cc here.
-	(_read): change strace debug printf function name to _read
-	(logout): rename success to res
-	* misc.cc: delete file
-	* Makefile.in: adjust for above change
-
-Tue Apr 21 01:45:05 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* dir.cc: new file for directory-related functions, was
-	dirsearch.cc.
-	(mkdir, rmdir, writable_directory): move here from syscalls.cc,
-	writable_directory no longer static
-	* dirsearch.cc: delete file
-	* winsup.h: add proto for writable_directory.
-	* errno.cc: new file for errno-related functions, move errmap
-	struct here from syscalls.cc
-	(seterrno): move from syscalls.cc
-	(strerror): move from strerror.cc
-	* strerror.cc: delete file
-	* syscalls.cc: delete everything moved to any of the above files
-	* Makefile.in: adjustments for above
-
-Thu Apr 17 16:43:23 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* termios.cc: add comments, add extern "C" in front of exported
-	calls, move debugging local functions to end of file
-	* winsup.h: remove fork_terminate proto for function that is no
-	longer with us.  Add strccpy proto.
-	* spawn.cc (_spawnve): make static
-	(strccpy): remove in favor of identical function in exec.cc
-	* exec.cc (strccpy): no longer static
-
-	patch from newsham@lava.net (Tim Newsham):
-	* select.cc (cygwin32_select): fix off by one error, stop
-	using memcpy to copy memory over itself
-
-Thu Apr 16 16:23:00 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* net.cc: respace, put all fhandler_socket functions together
-	(getsockopt): fix case statement bug resulting in faulty strace
-	output
-	(setsockopt): ditto
-	* shared.cc: throughout, rename global h to cygwin_shared_h
-	* strerror.cc: make error global a local variable
-	* fhandler.h: add comments, add virtual function always_read_ready
-	to fhandler_serial which should return zero to allow non-blocking
-	serial I/O.
-	* Makefile.in: select.cc should depend on select.h
-
-Wed Apr 15 16:14:01 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* select.h: new file, containing macros used by select.cc.
-	* select.cc: remove them from here, include select.h
-
-Wed Apr 15 15:23:55 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* ntea.cc (NTReadEARaw): mark as static, don't check allow_ntea
-	since this is only accessed by functions that have already checked
-	it.
-
-Tue Apr 14 14:07:54 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: export truncate call
-
-Mon Apr 13 23:15:13 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Throughout Cygwin32, rename *u for per_process data *user_data.
-	Likewise, rename *s for shared memory data *cygwin_shared.
-	Respace where necessary.
-	* registry.cc: minor respace
-	* registry.h: ditto
-	* net.cc: ditto
-	* fhandler.cc (fhandler_base::read): don't redeclare int len
-	* syslog.cc: add FIXME, reformatting, remove extern "C" around
-	whole file, add before exported functions
-	(syslog): rename second cp char pointer cp2
-	(setlogmask): comment out unused function
-
-Mon Apr 13 17:55:43 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* environ.cc (parse_options): add "ntea" setting to CYGWIN32
-	env variable.  Setting determines whether NTEA is used or not.
-	* ntea.cc: Add allow_ntea global which is inited to FALSE.
-	Now instead of immediately returning FALSE, make all
-	functions check allow_ntea variable and use or not use NTEA
-	based on its value.
-	* ps.cc (main): widen Win32_pid field by one to better handle
-	Win 95 pids.
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* shared.cc (shared_info::initialize): increase default
-	heap_chunk_size to 128 mb to get around the problem that
-	Cygwin32 still can't cope with a split heap properly.
-
-Wed Apr  8 18:04:07 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* net.cc (cygwin32_bind, cygwin32_getsockname, cygwin32_listen,
-	cygwin32_shutdown): if should check sock, not s.
-
-Wed Apr  8 15:00:46 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Eliminate warnings revealed by -Wshadow -Wall:
-	* console.cc (FakeReadFile): fix aggregate with partly bracketed
-	initializer (add missing brackets).
-	* tty.cc (fhandler_tty_slave::close): remove unused variable tty
-	(fhandler_tty_slave::dup): ditto
-	(fhandler_tty_slave::send_ioctl_request): ditto
-
-Wed Apr  8 03:04:11 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Eliminate warnings revealed by -Wshadow -Wall:
-	* console.cc (FakeReadFile): change variable name index to
-	modifier_index.
-	(fhandler_console::read): remove second definition of flags
-	* dcrt0.cc (build_argv): rename s to start, e to end
-	(insert_files): reformat, add parens around assign used as truth
-	value, make i a DWORD, remove dup def of i.
-	* dlfcn.cc (set_dl_error): rename s to str
-	(checkAccess): rename to check_access
-	(checkPathAccess): rename to check_path_access
-	(getFullPathOfDll): rename to get_full_path_of_dll, don't
-	redeclare len
-	* dll_init.cc (DllList::detachDll): rename index to dll_index
-	* fork.cc (cygwin_fork_helper1): rename index to dll_index,
-	reformat slightly, rename res in dll load section to loadres,
-	don't redeclare rc two additional times
-	(dump_jmp_buf): rename s to sbuf
-	* grp.cc (initgroups): rename group arg to grp
-	* hinfo.cc (digits): rename s to str
-	(hinfo_vec::build_fhandler): rename first buf variable to
-	buf_info, the second to buff.
-	(hinfo_vec::linearize_fd_array): cast sizeof return to int,
-	declare i in for loop
-	(hinfo_vec::de_linearize_fd_array): declare i in for loop
-	* misc.cc (nice): rename pri to priority, index to curr
-	(cygname): rename s to str
-	(login): rename tty to currtty
-	(logout) put missing parens around arg to sizeof calls
-	* net.cc (DuplicateSocket): rename function to duplicate_socket,
-	rename s arg to sock
-	(fhandler_socket::fhandler_socket): rename s arg to sock
-	(socketpair): rename sin to sock_in
-	(cygwin32_rexec): rename passwd arg to password
-	* passwd.cc (parse): rename stat array to tmpbuf
-	* resource.cc (fill_rusage): rename creation to creation_time,
-	exit to exit_time, kernel to kernel_time, user to user_time
-	(getrusage): rename rusage arg to rusage_in
-	* sigproc.cc (proc_terminate): move i declaration outside of
-	loop, get rid of extra declaration
-	(getsem): rename s to str
-	(proc_strace): declare i at top of function, remove extra two
-	declarations of it later
-	* smallprint.c: include ctype.h for isalnum proto
-	(__small_vsprintf): put parens around assign used as truth value
-	* spawn.cc (spawn_guts): rename both s variables to str, remove
-	redeclarations of i
-	* strace.cc (mark): rename s arg to str
-	* syscalls.cc (chown): remove unused vars group, passwd
-	(access): rename s to st
-	(ctermid): rename s to str
-	* termios.cc (cfsetospeed, cfsetispeed): rename s to speed
-	* times.cc (times): rename creation to creation_time,
-	exit to exit_time, kernel to kernel_time, user to user_time
-	(time_t_to_filetime, timeval_to_filetime): rename time to time_in
-	* tty.cc (create_tty_master): rename utmp variable our_utmp
-	(fhandler_tty_master::init): rename ttynum arg ttynum_in
-
-Tue Apr  7 17:18:05 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc (seterrno): add FIXME
-	* path.cc (symlink_check_one): change comment wording
-
-	patch from Tom Tromey (tromey@cygnus.com)
-	* syscalls.cc (access): Call SetErrorMode to turn off critical
-	errors dialog.
-
-	patch from Mikey (jeffdb@netzone.com):
-	* fhandler.cc (fhandler_disk_file::open): under Win95, set
-	S_IXOTH|S_IXGRP|S_IXGRP if the first two bytes of a file contain
-	a '#!'.
-	(fhandler_disk_file::check_execable_p): consider shell scripts
-	execable
-
-Mon Apr  6 20:55:06 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/sys/cygwin.h: add protos for cygwin32 path conversion
-	functions.
-
-Wed Apr  1 16:12:58 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* {fhandler.cc, fhandler.h, hinfo.cc, console.cc}: Rename
-	fhandler_tty class to fhandler_serial
-
-Tue Mar 31 16:27:36 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* ntea.cc: temporarily disable reading/writing NTEA information
-	due to the large penalty incurred on NT fat partitions.
-
-Fri Mar 27 13:35:30 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* environ.cc (parse_options): change struct to union to avoid
-	references to uninitialized fields.
-
-Thu Mar 26 19:03:00 1998  Eric Bachalo  <ebachalo@cygnus.com>
-
-	* dcrt0.cc (insert_files): added this function to replace
-	-@file in the command line with the contents of the file
-	(dll_crt0_1): calls insert_files before building argv
-
-Wed Mar 25 15:25:26 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	And more:
-	* {fhandler.cc, fhandler.h, tty.cc, net.cc, console.cc}: make
-	ioctl calls' cmd arg unsigned, ditto for access arg of init calls.
-	* console.cc (fhandler_console::fillin_info): add parens around
-	assignment used as truth value.
-	(FakeReadFile): make copied_chars a size_t
-	(fhandler_console::read): make i in loop unsigned
-	* environ.cc (setenv): make l_value unsigned, add parens around
-	assignments used as truth values.
-	* exceptions.cc (call_handler): supposed to return an int and
-	wasn't at the end of control flow.  Now returns 1 there.
-	* fhandler.h (~fhandler_base): destructor should be marked virtual
-	* misc.cc (login): add parens around assignment used as truth
-	value.
-	* net.cc: cast INVALID_SOCKET to int in comparisons
-	(fhandler_socket::ioctl): remove int cast to FIONBIO since cmd
-	is now unsigned
-	(get_win95_ifconf): add cast to signed vs unsigned int comparison.
-	* ntea.cc (NTReadEA): add cast to signed vs unsigned int
-	comparison.
-	* path.cc (getcwd_inner): make len a size_t
-	* pinfo.cc (cygwin32_winpid_to_pid): add comment
-	* select.cc (cygwin32_select): make wait_ret an int
-	* signal.cc (kill_worker): add parens around assignments used as
-	truth values.
-	* sigproc.cc (wait_sig): make rc a DWORD
-	(sig_send): add parens around assignment used as truth value.
-	* strace.cc: make inqueue global a static DWORD
-	* tty.cc (do_output): add cast to signed vs unsigned int
-	comparison.
-	(fhandler_pty_master::open): remove unused handle nh
-
-Tue Mar 24 18:03:59 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	More spring cleaning:
-	* net.cc: move LOAD macro definition out of winsock_init,
-	correction to make it valid ANSI C++.
-	* grp.cc (read_etc_group): pass default line directly to
-	add_grp_line call
-
-Mon Mar 23 19:21:00 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Christopher Faylor):
-	* spawn.cc (spawn_guts): Don't call close_all_files if a cygwin
-	process has been spawned.  Otherwise, we close tty handles twice.
-
-Fri Mar 20 23:01:24 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* pinfo.cc (pinfo_list::init): Initialize next_pid to PBASE.
-	(pinfo_list::operator []): Now index is given by pid mod size().
-	(pinfo_list::allocate_pid): Allow more pid numbers than spaces in
-	the process table.  Pids now can range from PBASE (1000) to
-	INT_MAX.  At that point they wrap to 1000 again.  For speed, use
-	modular arithmetic to map pids into table.
-	* winsup.h: move PBASE to pinfo.cc, rename next_pid_index to
-	next_pid
-	* utils/ps.cc (main): reorg of what's printed where, listing pid
-	first.
-
-Thu Mar 19 15:05:07 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* winsup.h: Change section name in NO_COPY definition.  We were
-	using a .data$nocopy section to avoid copying certain data on
-	fork.  The linker used to include this between __data_start__ and
-	__data_end__, but that broke building the cygwin32 dll.  The fix
-	is to rename the section ".data_cygwin_nocopy" and explictly
-	include it after __data_end__.
-
-Wed Mar 18 15:03:51 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* tty.h: fix ttyslot proto; it returns an int
-	* glob.h: fix glob proto; it returns an int
-
-Mon Mar 16 16:16:40 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: stop installing the dll in the lib directory as
-	well as the bindir.
-	* environ.cc (parse_options): don't need to call malloc
-
-Mon Mar 16 11:56:23 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Christopher Faylor):
-	* tty.cc (fhandler_tty_slave::dup): Don't set flags to 0.  Flags
-	have already been set in wrapper.
-	* net.cc: Rename `s' variable which shadows global `s'.
-	* termios.cc: ditto
-	* time.cc: ditto
-
-Tue Mar 10 15:54:04 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* version.h: up CYGWIN_DLL_VERSION_MINOR
-
-Tue Mar 10 15:41:29 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Christopher Faylor):
-	* spawn.cc (spawn_guts):  Make argument handling after `#! pgm'
-	handle spaces similarly to UNIX.  Close "linearized" file handles
-	when a non-cygwin32 binary is executed or suffer hangs on exit.
-	Reorganize lpReserved2 buffer to avoid conflicts with Microsoft
-	usage which resulted in incorrect stdin/stdout operation with
-	programs compiled using MSVC.
-	* pinfo.cc (pinfo_init):  Accommodate change to lpReserved2
-	organization.
-
-Mon Mar  9 19:27:17 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc (_open): modify to take a variable number of
-	arguments to match newlib's fcntl.h.
-	* environ.cc (parse_options): rewrite struct known to conform
-	to ANSI standards.  Can't statically initialize, so do so
-	dynamically at the beginning of the function instead.
-
-	patch from jeffdb@netzone.com (Mikey):
-	* dcrt0.cc (build_argv, compute_argc): need to escape quotes
-
-Sat Feb 28 16:41:54 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* fhandler.cc (fhandler_base::init): call set_flags based on
-	access arg.
-	* net.cc: include fcntl.h
-	(fhandler_socket::fhandler_socket): made sockets O_RDWR
-
-Thu Feb 26 23:41:54 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Beta 19 release made.
-
-Sun Feb 22 23:46:31 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* Makefile.in: Do not link cygwinb19.dll with libwsock32.a
-	* exceptions.cc: add proto for i_WSACleanup.
-	(sig_handle): call *i_WSACleanup if winsock was inited.
-	* hinfo.cc: add proto for i_getpeername.
-	(hinfo_vec::build_fhandler): call *i_getpeername if winsock
-	was inited
-	* net.cc: wsock32, i_wsockimports - new globals.  Throughout
-	file, call winsock functions via indirect pointers.
-	(winsock_init): dynamically load wsock32.dll and resolve addresses
-	of exports.
-	(cygwin32_rcmd, cygwin32_rexec, cygwin32_rresvport): resolve
-	addresses of exports.
-	* select.cc: add protos for i___WSAFDIsSet, i_WSAGetLastError,
-	i_select, i_socket, i_closesocket.  WINSOCK_FD_ISSET changed to
-	use indirect pointer.  Direct winsock calls changed to indirect.
-	(cygwin32_select): initialize winsock before calling select in
-	degenerate case.
-	* winsup.h: remove protos for ScreenRows, ScreenCols,
-	ScreenGetCursor, ScreenSetCursor.
-
-Sun Feb 22 17:44:55 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* environ.cc (parse_options): comment out -- no longer
-	compiles with egcs.  Will rewrite/enable later.
-
-Sun Feb 22 13:49:10 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.h: remove protos for _open, _read, _write since
-	they are in newlib headers that are already included
-	* syscalls.cc (_read): return int, not ssize_t
-	(_write): ditto
-
-Sat Feb 21 14:21:17 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: rename dll to cygwindevo.dll
-
-Sat Feb 21 01:33:56 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: remove dup definition of endpwent
-
-Thu Feb 19 14:20:21 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin32/cygwin_dll.h: Correct protection wrapper
-
-Tue Feb 17 20:21:24 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/Windows32/Structures.h: tagBITMAPFILEHEADER should
-	be packed.
-
-Tue Feb 17 19:34:41 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Christopher Faylor):
-	* cygwin.din: export sigpause
-	* signal.cc (sigpause): New "compatibility interface" to
-	sigsuspend function.  Used currently by inetutils.
-
-Tue Feb 17 11:43:27 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* tty.h (class tty): Add slave_opened field.
-	* tty.cc (fhandler_tty_master::init): Initialize slave_opened.
-	(do_output): Only return with EOF if the slave has been opened.
-	(fhandler_tty_slave::open): Set slave_opened.
-	(fhandler_pty_master::open): Initialize slave_opened.
-
-	* tty.cc (fhandler_pty_master::read): Change type of n to DWORD.
-	If there are no characters to read, and the descriptor is in
-	nonblocking mode, just return EGAIN.
-
-Mon Feb 16 15:11:25 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* tty.h (class tty): Remove handle_pid and slave_handles fields.
-	(class tty_list): Add getcount method.
-	* tty.cc (tty::init): Initialize input_handle and output_handle.
-	(tty_list::free_tty): If we just freed the last reference to this
-	tty, close input_handle and output_handle.
-	(fhandler_tty_master::init): Don't initialize handle_pid and
-	slave_handles.
-	(do_output): Instead of just calling ReadFile, loop using
-	PeekNamedPipe and check whether the tty has been closed.  Return 0
-	on EOF and -1 on error.
-	(process_output): Only print debugging error message if error
-	occurs in do_output.
-	(fhandler_tty_slave::open): Always duplicate handles from master.
-	Never close handles in source.  Don't change slave_handles.
-	(fhandler_tty_slave::close): Don't change slave_handles, and don't
-	close tty handles.
-	(fhandler_tty_slave::linearize): Call attach_tty.
-	(fhandler_tty_slave::de_linearize): Don't call attach_tty.
-	(fhandler_tty_slave::dup): Don't increment slave handles.
-	(fhandler_pty_master::open): Don't initialize handle_pid and
-	slave_handles.
-	(fhandler_pty_master::close): Don't check slave_handles, and don't
-	close tty handles.
-	(fhandler_pty_master::read): Handle EOF return value from
-	do_output.
-	(fhandler_pty_master::linearize): Call attach_tty.
-	(fhandler_pty_master::de_linearize): Don't call attach_tty.
-
-	* fork.cc (cygwin_fork_helper1): Copy strace_mask from parent to
-	child.
-
-Thu Feb 12 20:33:57 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Christopher Faylor):
-	* utils/cygwin.cc: Modify -s option to use new strace_mask entry
-	in pinfo.  Prepare for future ability to specify an strace file.
-
-Thu Feb 12 11:57:26 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* grp.cc (read_etc_group): add a default /etc/group in memory
-	if /etc/group isn't found
-	(getgrnam): return NULL if requested group isn't found instead
-	of returning a default group
-
-Wed Feb 11 15:59:10 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* strace.cc (strace_open): do not close u->strace_file if it
-	points to stderr.
-	* malloc.cc (malloc_init): do not check for application's malloc
-	in a forkee, this breaks memory coherency in a forkee and forker.
-	use_internal_malloc flag now copies on fork.
-
-Tue Feb 10 18:11:30 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Christopher Faylor)
-	Throughout sources, mark statics and globals as NO_COPY where
-	appropriate.
-	* fork.cc (cygwin_fork_helper1): Remove #if 0 around fork_copy of
-	cygwin data/bss.  Remove __malloc_copy since it is no longer
-	necessary.
-
-Tue Feb 10 15:30:19 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Christopher Faylor)
-	* console.cc (fhandler_console::write): Implement xterm style
-	escape sequences for setting title in the console title bar.
-	* fhandler.h: Define constants for console title escape sequence.
-
-Tue Feb 10 14:16:17 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/a.out.h: remove junk chars introduced by mailer
-	when this header was sent to us
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* libccrt0.cc: rename cygwin_attach_dll to cygwin32_attach_dll
-
-	patch from cgf@bbc.com (Christopher Faylor):
-	* environ.cc: fix off by one problem
-
-Mon Feb  9 14:56:00 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: add registry.h to environ.o deps
-
-Mon Feb  9 14:42:24 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (DLL_OFILES): Rename dllinit.o to dll_init.o.
-
-	* tty.cc (fhandler_tty_slave::close): Don't close the tty handles
-	if the slave and the master are the same process.
-
-	* path.cc (read_mounts): Change key parameter to reference, to
-	avoiding running the destructor.
-
-Mon Feb  9 13:53:50 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Christopher Faylor):
-	Moves all environment manipulation into environ.cc.
-	Switches to CYGWIN32 for settings:
-	  set CYGWIN32=[no]title [no]strip_title [no]binmode [no]glob
-		       strace=mask:cache,file [no]tty
-	(set STRACE=whatever is still honored).
-	Propagates tty settings to all subprocesses regardless of
-	unsetting of environment variable.
-	Moves strace mask into pinfo structure for easier future
-	manipulation by external program.  Moves strace_file into the
-	vacated position for automatic use in forked processes.
-	Propagates old title to execed processes so that they can
-	correctly restore the correct title when they exit.
-	* console.cc:  Use PID_USETTY setting in process_state so that
-	tty state can be easily inherited.
-	(set_console_title):  New function to set console title.
-	* syscalls.cc:  Use PID_USETTY setting in process_state so that
-	tty state can be easily inherited.
-	* tty.cc: Ditto.
-	* hinfo.cc: Ditto.
-	(hinfo_vec::de_linearize_fd_array): Return last location in buffer
-	for further potential processing.
-	* dcrt0.cc:  Add global variables for control of glob and title,
-	set by environ_init.  Mark some variables as NO_COPY.
-	Remove routines and variables for dealing with environment.
-	(dll_crt0_1): Move environment initialization into separate
-	function.  Honor 'noglob' CYGWIN32 setting.
-	* environ.cc (environ_init): New function to initialize the
-	environ table.  Also scans for CYGWIN32 environment variable,
-	setting appropriate values.
-	(ucenv): New function.  Upper cases an environment variable.
-	(parse_options): New function.  Parse CYGWIN_* environment
-	variable.
-	(posify): New function.  Convert a Windows env path spec to
-	cygwin.
-	(env_sort): New function.  Sort an environ block.
-	(winenv): New function.  Returns a windows style environment
-	block.
-	* fhandler.cc (fhandler_base::read): Reflect change to location of
-	strace_mask.
-	* fork.cc (cygwin_fork_helper1): Remove save/restore of some
-	settings since this is automatic now with new dll data copy.  Save
-	PID_USETTY setting in child process_state.
-	* strace.h: Cosmetic change.
-	* pinfo.cc (pinfo_init):  Call environ_init here since it may
-	affect further processing in this function.  Use old console title
-	from "parent" process if execed process.  Reflect change to
-	location of strace_mask.
-	* spawn.cc (spawn_guts): Remove environment manipulation code.
-	Use new winenv function call instead.  Save old title in block of
-	memory copied to newly execed process if title is being displayed.
-	* strace.cc:  Changes to reflect new location for strace_mask and
-	strace_file.  These are now automatically inherited on fork.
-	* winsup.h:  Move strace_mask into pinfo to allow possible
-	manipulation by other processes.  Put u->strace_file in uptr
-	structure so that it will be automatically duplicated on fork,
-	removing the necessity of initializing strace in a forked
-	process.  Add functions/variables associated with environment
-	manipulation and console title setting.
-
-Mon Feb  9 03:06:56 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Extensive reformatting in new files from next patch.
-	Rename dllinit.h file to dll_init.h and likewise for dll_init.cc.
-	Rename cygwin_detach_dll to cygwin32_detach_dll throughout.
-	Similarly, rename cygwin_attach_dll and _cygwin_dll_entry.
-	And rename sanityAndSyncCheck to check_sanity_and_sync.
-	Also:
-	* dll_init.h: don't include winsup.h
-	* dll_init.cc: include winsup.h here instead
-	* dlfcn.cc: include winsup.h, don't include windows.h
-	* cygwin.din: rename cygwin_detach_dll to cygwin32_detach_dll.
-
-	patch from giac@dalim.de (Philippe Giacinti):
-	Copy data areas of cygwin-compiled dlls on fork(),
-	implement dlopen/dlsym/dlclose/dlerror calls.
-	* Makefile.in: add dlfcn.o and dllinit.o to DLL_OFILES, add
-	dllinit.h dependencies
-	* cygwin.din: dll_dllcrt0, cygwin_detach_dll, dlopen, dlclose,
-	dlsym, dlerror, dlfork -- new exports.
-	* dcrt0.cc: include dllinit.h, mark u pointer as NO_COPY.
-	(sanityAndSyncCheck): new, code moved from dll_crt0_1.
-	Initialize all linked dlls before calling main().
-	* dlfcn.cc: new file.
-	* dllinit.cc: new file.
-	* dllinit.h: new file.
-	* exceptions.cc: mark some variables with NO_COPY.
-	* fork.cc: include dllinit.h; declare cygwin.dll data/bss
-	start/end.
-	(cygwin_fork_helper1): copy data/bss of cygwin.dll itself to child
-	process (the code is disabled now); copy data areas of
-	linked/loaded dlls (if any); free loaded dll list on cleanup.
-	* include/cygwin32/cygwin_dll.h: new file.
-	* include/dlfcn.h: new file.
-	* libccrt0.cc (cygwin_crt0_common): new, code derived from
-	cygwin_crt0, MainFunc parameter added.
-	(cygwin_crt0): call cygwin_crt0_common.
-	(cygwin_attach_dll): new.
-	* shared.cc: mark some data as NO_COPY
-	* strace.cc: mark some data as NO_COPY
-	* winsup.h: add dll_dllcrt0 proto, NO_COPY macro.
-
-Sun Feb  8 17:51:26 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* getopt.c: new.  Import Berkeley getopt code modified for use
-	in Cygnus' kerberos implementation (including the writing of
-	getopt_long by Chris Provenzano (proven@cygnus.com)) then modified
-	a bit more to get it working in Cygwin32.  Although we were
-	going to remove getopt, it appears that too many programs would
-	need fixing to remove it completely.  Whether getopt should be
-	included in Cygwin32 should be decided at a later time.
-	* include/getopt.h: new.  Import Berkeley getopt.h.
-	* Makefile.in: add getopt.o to LIBCOS
-	* utils/Makefile.in: remove include of ../../include since
-	getopt.h is now in winsup/include, also revert recent change
-	of addition of GETOPT_OBJS.
-
-Fri Feb  6 16:28:19 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* cygwin.din: remove set_new_handler and cygwin_set_attributes
-	exports
-	* version.h: up major version number
-	* Makefile.in: rename dll to cygwinb19.dll
-	* syscalls.cc (cygwin_set_attributes): axe
-
-Thu Feb  5 18:28:37 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/Windows32/Functions.h: add protos for
-	DdeCmpStringHandles and DdeCreateDataHandle
-	* Makefile.in: stop including ../libiberty/getopt* since
-	we aren't exporting or using them
-	* utils/Makefile.in: add new variable for libiberty getopt objs
-	which is linked in for cygwin.exe
-
-Thu Feb  5 17:59:12 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	syscalls.cc: move ppc dll_entry asm code to...
-	dcrt0.cc: ...here
-
-	Import new globbing code from NetBSD 1.3
-	* glob: delete subdirectory
-	* glob.c: new file
-	* glob.h: new file
-	* Makefile.in: remove glob from submakes, remove glob/libglob.a
-	from DLL_IMPORTS, fix dcrt0 glob.h dependency
-	* configure.in: don't configure glob subdirectory
-	* configure: regenerate
-	* dcrt0.cc: include glob.h, not glob/glob.h.
-	(globify): don't call glob with GLOB_NOESCAPE which isn't a valid
-	flag with this glob
-
-Wed Feb  4 16:14:13 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	Allow system administrator to enter into the HKLM registry tree
-	a predefined mount table inherittable by all cygwin users.  The
-	predefined mounts are non-mandatory so the user's mount table has
-	a higher priority than the default one.  Cygwin reads HKLM tree
-	in read-only mode.
-	* path.cc (read_mounts): new, code derived from
-	mount_info::from_registry().
-	(mount_info::from_registry): call read_mounts from user's table,
-	then from system-wide mount table.
-	* registry.cc (reg_session::reg_session): key and access arguments
-	added.
-	(reg_key::init): access argument added.
-	(reg_key::reg_key): access argument added.
-	* registry.h (class reg_key): init prototype changed, default
-	argument of reg_key added.
-	(class reg_session): default arguments of constructor added.
-
-Wed Feb  4 15:38:59 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/a.out.h: new coff header file
-
-Wed Feb  4 01:55:18 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* uinfo.cc: define DEFAULT_UID/GID here
-	* winsup.h: removed DEFAULT_UID/GID defs and unused
-	set_console_title proto.  Did some major reorganizing,
-	and a little reformatting, commenting.
-
-Tue Feb  3 23:59:23 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	Replace u->self and this_procinfo () with new `myself' pointer
-	wherever appropriate.  Also replace get_pid() calls with a
-	simple ->pid reference.
-
-Mon Feb  2 12:34:49 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from sos@prospect.com.ru (Sergey Okhapkin):
-	* console.cc (FakeReadFile): limit bytes to read to 30000 due to
-	Win NT 4.0 SP3 bug.  Kill foreground process group with SIGWINCH
-	on console buffer size change if tty support enabled.
-	* include/sys/termios.h: define more constants.
-	* tty.cc (fhandler_pty_master::ioctl): kill foreground process
-	group with SIGWINCH on window resizing.
-
-Mon Feb  2 12:14:49 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* dcrt0.cc (dll_crt0_1):  Initialize u->self here, early in a
-	forked process so the correct pid is used in strace output and so
-	signals do not end up being erroneously sent to the parent.
-	* exceptions.cc:  Make a global variable static.  Some minor
-	optimizations.
-	(call_handler): Make sure that the signal mask is restored when
-	sig_dispatch mutex is unavailable.
-	Reorder asm statements to prevent clobbering of flags register by
-	preceding ors or risk random inexplicable behavior when returning
-	from a signal handler.
-	* fork.cc (cygwin_fork_helper1): Put setjmp restore in child's
-	pinfo.  Have the child figure out its pid earlier in the
-	initialization process.  Don't print a "child failed" error if the
-	child failed during initialization due to a CTRL-C.  This is still
-	not quite right (see comment).
-	* sigproc.cc (sig_send): Remove unlock/lock_pinfo or suffer
-	consistent hangs in zsh.  Make {allow,block}_sig_dispatch globally
-	available.
-	(wait_sig): Fix problem where blocked signals would still be
-	processed if queued.  Add debugging SIGNOQUEUE conditional to turn
-	off signal queueing, making cygwin more like traditional UNIX.
-	* sigproc.h:  Add {allow,block}_sig_dispatch functions.
-
-Mon Jan 26 17:33:57 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc (mount_info::init): don't hardcode C: as the default
-	slash mount.  Instead, use the drive letter that the OS is loaded
-	on.
-
-Mon Jan 26 13:33:57 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* fork.cc (cygwin_fork_helper): Move setting PID_INITIALIZING
-	process_state here to avoid erroneously setting it permanently
-	via proc_register().
-	* pinfo.cc (pinfo_init): Delay notifying "parent" when execing
-	until this process is ready to receive signals or risk a race
-	condition if exec parent calls sigproc_terminate prior to
-	the child exec.
-	* sigproc.cc (proc_subproc): Don't set PID_INITIALIZING here.
-	It is too late in the process creation.
-	(sig_send): Reset sigsuspend mutex prior to use to avoid a race.
-	(wait_sig): Create sigsuspend mutex as an auto reset to attempt
-	to avoid a race condition.  Notify parent that this process is
-	ready if we were execed (code moved from pinfo_init).  Change
-	PulseEvents to SetEvents to avoid races
-	* spawn.cc (spawn_guts): Move setting PID_INITIALIZING
-	process_state here to help avoid race.
-
-Fri Jan 23 12:31:37 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* malloc.cc (malloc_critical_section): New static variable.
-	(malloc_init): New function.
-	(__malloc_lock, __malloc_unlock): New functions.
-	* winsup.h (malloc_init): Declare.
-	* heap.cc (heap_init): Call malloc_init.
-
-Thu Jan 22 18:46:40 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* tty.h (class tty): Change slave_handles to int.
-	* tty.cc (fhandler_tty_slave::open): Check for invalid tty
-	handles.  If this is the first slave, set slave_handles to 2;
-	otherwise, increment slave_handles.
-	(fhandler_tty_slave::close): Only close the tty handles if the
-	slave_handles field drops to 1.
-	(fhandler_tty_slave::write): Add a debugging message if WriteFile
-	fails.
-	(fhandler_tty_slave::dup): Set ttynum of new fhandler.  Increment
-	slave_handles if appropriate.
-	(fhandler_pty_master::close): Only close the tty handles if the
-	tty is no longer allocated.
-
-	* tty.h (class tty): Add handle_pid and slave_handles fields.
-	* tty.cc (attach_tty): Call connect_tty even if use_tty is not
-	set.
-	(detach_tty): Don't check use_tty.
-	(fhandler_tty_master::init): Initialize handle_pid and
-	slave_handles of tty.
-	(do_input): Treat \r as end of line character.
-	(do_output): Only set output_done_event if it is not NULL.
-	(fhandler_tty_slave::open): Don't worry if we can't open
-	output_done_event.  Check slave_handles field of tty to decide
-	from where to duplicate the handles.  Call detach_tty on error.
-	If we are now the owner of the slave handles, mark the tty
-	appropriately.
-	(fhandler_tty_slave::close): Only close output_done_event if it is
-	not NULL.  Check for errors from CloseHandle.  Close the tty
-	handles if we own them.
-	(fhandler_tty_slave::write): Only wait for output_done_event if it
-	is not NULL.
-	(fhandler_tty_slave::read): If nobody owns the tty, return EOF.
-	(fhandler_tty_slave::dup): Attach the tty.  Don't duplicate
-	output_done_event if it is NULL.  Detach the tty on error.
-	(fhandler_pty_master::open): Initialize handle_pid and
-	slave_handles of tty.  Don't create output_done_event.
-	(fhandler_pty_master::close): Only close output_done_event if it
-	is not NULL.  Check for errors from CloseHandle.  Only close the
-	tty handles if we own them.
-	(fhandler_pty_master::read): Only set output_done_event if it is
-	not NULL.
-	* hinfo.cc (de_linearize_fd_array): Don't set use_tty just because
-	we find a tty to delinearize.
-
-Wed Jan 21 21:58:27 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* sigproc.cc: Changes in wait_sig/sig_send semaphore/event
-	signaling to attempt to eliminate races.
-
-Tue Jan 20 16:11:05 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Remove last remnants of the mixed case handling support.
-	* path.cc (path_conv::path_conv): remove mixed_p init
-	(mount_info::from_registry): don't check for fmixed
-	(mount_info::to_registry): ditto
-	(mount_item::getmntent): when setting ret.mnt_opts, only consider
-	text vs binary flag
-	(mount_item::init): remove init of mixed
-	* path.h: remove mixed_p, mixed from path_conv class.  Remove
-	unmixedcaseify proto.
-	* include/sys/mount.h: comment out MOUNT_MIXED define, protect
-	header against multiple inclusion
-
-	A little header file cleanup.  Mostly to protect headers against
-	multiple inclusion.  Some aren't strictly speaking necessary but...
-	* include/sys/cygwin.h: protect header against multiple inclusion
-	* include/sys/smallprint.h: ditto, also add cplusplus wrapper
-	* include/sys/strace.h: comment last endif
-	* include/cygwin32/in.h: change _LINUX_IN_H protect defines
-	to _CYGWIN32_IN_H
-	* include/arpa/inet.h: protect header against multiple inclusion
-	* include/asm/types.h: ditto
-	* include/net/if.h: ditto
-	* include/netinet/ip.h: ditto
-	* include/netinet/ip_icmp.h: ditto
-	* include/netinet/in.h: ditto, remove commented out real header
-	file
-	* include/fcntl.h: protect header against multiple inclusion
-	* include/memory.h: ditto
-	* include/mntent.h: ditto
-	* include/strings.h: ditto
-	* include/syslog.h: ditto
-	* include/termio.h: ditto
-
-Tue Jan 20 12:51:59 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* strace.cc (strace_stderr): New static variable.
-	(strace_init): Set strace_stderr.
-	(system_printf): If not strace_stderr, use debug_printf to put the
-	message in a trace file.
-
-	* fhandler.h (fhandler_pty_master): Add neednl_ field.
-	* tty.h (RESTART_OUTPUT_EVENT): Change to be different from
-	IOCTL_DONE_EVENT.
-	* tty.cc (fhandler_tty_master::init): Initialize neednl_.
-	(do_output): Handle a length of one by using neednl_ to record an
-	expansion of \n to \r\n which doesn't fit.  Never expand \r to
-	\r\n.  Correct order of \r\n.
-	(fhandler_tty_slave::open): Improve error handling.  Use
-	DUPLICATE_CLOSE_SOURCE to close the pipes in the master process.
-	(fhandler_tty_slave::dup): Duplicate the handles, rather than
-	calling fhandler_tty_slave::open.
-	(fhandler_pty_master::open): Initialize neednl_.
-	(fhandler_pty_master::read): Return EOF for ERROR_BROKEN_PIPE,
-	rather than error.  Set errno correctly.
-	* hinfo.cc (digits): New static function.
-	(build_fhandler): Always accept /dev/ptmx and /dev/ttyDDD, even if
-	use_tty is not set.  use_tty now only controls the interpretation
-	of /dev/tty.
-
-Mon Jan 19 14:49:45 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* sigproc.cc (sig_send): lock_pinfo_for_update during this
-	function
-
-Fri Jan 16 18:09:59 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* sigproc.cc (sigproc_init): if we can't create a signal
-	thread or can't create sync_proc_subproc mutex, fail with
-	an api_fatal call rather than just returning
-
-Fri Jan 16 18:08:49 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	Changed signal handling to use one semaphore and one shared
-	memory array which is manipulated via Interlocked*() functions.
-	* exceptions.cc (lock_cs): Comment.  Report on error.
-	(unlock_cs): Add debugging statement.
-	(sig_dispatch_pending): Remove obsolete function.
-	(set_process_mask): Adapt to new signal method.
-	(call_handler): Clear wait()ing threads here while main thread is
-	suspended to avoid timing screwups.  Avoid calling the handler if
-	can't get dispatch mutex (code moved from sig_handle).  Return
-	status of acquiring the sig_dispatch mutex.
-	(sighandle): Adapt to new signal method.  Reorganize to *always*
-	honor sig_dispatch mutex or suffer deadlock on fatal signals when
-	someone else has the mutex and we're attempting to cleanup.
-	(events_init): Reflect change in cygname() arguments.
-	* fork.cc (stack_dummy): New function.  Returns address of
-	argument to determine bounds for eventual stack copy.
-	(cygwin_fork_helper1): Call subproc_init to start up subproc
-	thread if it is not alreay started.  Ensure that signals are
-	blocked while forked process is initializing.  Change method of
-	calculation for lower stack bounds to slightly more foolproof
-	method.  Preserve some global settings in forked process.
-	* misc.cc (cygname): Remove an unused argument.
-	* pinfo.cc (pinfo_list::allocate_pid): Add a useful debugging
-	statement.
-	* shared.cc (open_shared_file_map): Reflect change in cygname()
-	arguments.
-	* signal.cc (kill_pgrp): Avoid killing dead processes.  Don't
-	kill processes in my pgrp if not also in my ctty.
-	(sigaction): Adapt to new signal method.
-	(sigpending): Adapt to new signal method.
-	* sigproc.cc: Many changes to adapt to new signal method.  Also
-	delay waits for thread initialization until the thread needs to be
-	contacted.
-	* sigproc.h: Ditto.
-	* spawn.cc (spawn_guts): Fix potential off-by-one error(?) in
-	transcribing the argument list and add paranoid code to detect
-	future overruns.  Change priority to highest so that waiting
-	process will clear out quickly.
-	(_spawnve): Call subproc_init() to start up subproc thread if is
-	not already started.
-	* strace.cc (strace_printf): Increase size of internal buffer so
-	that long argument lists printed from spawn_guts do not overrun it
-	so easily.
-	* wait.cc (wait4): Set status flag to -1 prior to exit.  This will
-	cause previous wait that was interrupted by a signal which
-	dispatched to another wait to return the correct error value.
-	* winsup.h (pinfo): Add _sigtodo array for new signal method.
-	Remove obsolete field.  Reflect change in cygname arguments.
-
-Thu Jan 15 13:07:07 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* syscalls.cc (mkdir): Don't permit the directory to be created if
-	the parent directory is not writable.
-
-	* syscalls.cc (fchmod): Call chmod with the path name, rather than
-	just returning zero.
-
-	* syscalls.cc (writable_directory): New static function.
-	(_unlink): Don't permit the file to be removed if the directory is
-	not writable.
-	(rename): Don't permit the rename if either the source or
-	destination directory is not writable.
-
-	* syscalls.cc (chown): Set username and groupname lengths to UNLEN
-	+ 1, rather than 100.  If getpwuid fails, try to look up the real
-	user name to see if it is the same.  Don't report an error if
-	there is no security mapping.
-
-Wed Jan 14 15:34:20 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* syscalls.cc (setegid): New function which just returns ENOSYS.
-	(chroot): Likewise.
-	* cygwin.din: Export setegid, _setegid, chroot, and _chroot.
-
-	* syscalls.cc (setmode): Rename from _setmode.  Change to return
-	the old mode.  Remove old setmode function.
-	* cygwin.din: Make _setmode an alias for setmode.
-
-Wed Jan 14 14:46:00 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: don't strip cygwin.dll by default
-	* winsup.h: minor reformatting, removed/reworded some comments
-
-Mon Jan 12 13:53:03 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	Speed up cygwin pid calculation by staying in the range
-	1000 through (1000 + PSIZE - 1).
-	* pinfo.cc (pinfo_list::init): Change to reflect new pid
-	calculation method.
-	(pinfo_list::operator []): Ditto.
-	(pinfo_list::allocate_pid): Ditto.
-	* winsup.h (pinfo): Move pid and ppid into non-zeroed region since
-	they are always set by allocate_pid.
-	(pinfo_list): Change pid_base to next_pid_index to reflect new pid
-	calculation method.
-	(PBASE): New constant for new pid calcuation method.
-
-Sat Jan 10 12:06:38 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* syscalls.cc (process_deletion_queue): remove wrapper function
-	(close_all_files): call s->delqueue.process_queue instead of
-	going through wrapper.
-	* fhandler.cc (fhandler_base::close): call
-	s->delqueue.process_queue instead of using above wrapper.
-	* winsup.h: remove process_deletion_queue proto
-	* delqueue.h: up MAX_DELQUEUES_PENDING to 100 for now.  Rename
-	v to dqueue for clarity.
-	* delqueue.cc: v renamed to dqueue throughout.  Add FIXME
-	describing why this whole delqueue system needs rewriting.
-
-Fri Jan  9 13:18:44 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Remove some historical baggage:
-	* syscalls.cc (cygwin_set_attributes): remove commented-out code,
-	add FIXME since this function should go away next time an
-	incompatible change to cygwin.din is made.  Stop including
-	include/sys/cygwin.h.
-	* include/sys/cygwin.h: remove cygwin_set_attributes proto.
-	Remove CYGWIN_FMODE_ALL_BINARY define.
-	* hinfo (hinfo_vec::init_std_file_from_handle): remove old
-	commented-out code
-	* path.cc (unmixedcaseify): delete commented-out function
-	(mixedcaseify): ditto
-	* strerror.cc (strerror): delete commented-out code section
-
-Tue Jan  6 18:51:40 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	Conform to POSIX method for sending SIGHUP to stopped processes.
-	* dcrt0.cc (do_exit): Use new kill_pgrp function to kill orphaned
-	children on group leader exit iff the children are stopped (per
-	POSIX).
-	* signal.cc (kill_worker): Negative signal now means to send
-	a SIGCONT after the signal, to wake up the target process.
-	(_kill): Break out pgrp handling into separate function.
-	(kill_pgrp): New function pulled from _kill to send signals
-	to processes in a given pgrp.
-
-Tue Jan  6 14:37:43 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* fhandler.cc (fhandler_base::open): include
-	FILE_FLAG_BACKUP_SEMANTICS in file_attributes when file is
-	a directory.  Allows opening of directory as a file.  Allows
-	use of handle to perform some operations on both directories and
-	files.
-	(fhandler_base::fstat): Loop when attempting to get volume serial
-	number.  Works around an apparent Windows NT 3.51 bug.
-	* times.cc (utimes): use FILE_FLAG_BACKUP_SEMANTICS flag
-	to allow accessing directory times (may only work under NT;
-	until now it didn't work under either OS).
-	* winsup.h: Add O_DIROPEN constant.
-
-Mon Jan  5 19:18:01 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: make winsup.h depend on winsup.h in accordance
-	with below
-
-	patch from cgf@bbc.com (Chris Faylor):
-	* {*.cc, *.h}: Remove include files already present in winsup.h.
-	Change empty function parameter	lists to (void) where appropriate.
-
-	* fork.cc: Clean up include files.  Minor change to CreateProcess
-	parameter list.
-	* signal.cc: Remove ifdef'ed stuff.
-	* smallprint.c: Add a necessary include file.
-	* winsup.h: Add a common include file.  Add a function declaration
-	for kill_pgrp.
-
-Mon Jan  5 18:30:37 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	Fix spoofing of directory inodes.
-	* syscalls.cc (hash_path_name): instead of initializing the
-	hash to zero, take the value of the initial hash as a new
-	argument.
-	(_stat_worker): fix up hash_path_name reference in light of above
-	* dirsearch.cc (opendir): initialize dir->__d_dirhash to the
-	hash of the full directory name so readdir can make use of it.
-	(readdir): compute d_ino by combining the directory hash
-	calculated by opendir with the hash of the filename.
-	* fhandler.cc: fix up hash_path_name reference in light of above
-
-	* winsup.h: remove unnecessary protos for getkey, kbhit.  Adjust
-	hash_path_name proto.
diff --git a/winsup/cygwin/ChangeLog-1999 b/winsup/cygwin/ChangeLog-1999
deleted file mode 100644
index f2da41f51..000000000
--- a/winsup/cygwin/ChangeLog-1999
+++ /dev/null
@@ -1,3562 +0,0 @@
-Sat Dec 25 12:46:25 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dlfcn.cc (dlsym): Use correct HANDLE type for GetProcAddress.
-	(dlclose): Ditto for FreeLibrary.
-	* fhandler_windows.cc (fhandler_windows::set_close_on_exec): Properly
-	coerce arguments to set_inheritance.
-	(fhandler_windows::fixup_after_fork): Ditto for fork_fixup.
-	* libcmain.cc (main): Simplify.
-	* select.cc (peek_windows): Properly coerce argument to PeekMessage.
-
-Sat Dec 25 12:30:25 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Eliminate unneeded .y SUFFIX.
-	* dcrt0.cc (__api_fatal): Make "C".
-	(do_global_ctors): Make __stdcall.
-	(getprogname): Ditto.
-	(insert_file): Ditto.
-	(globify): Ditto.
-	(build_argv): Ditto.
-	(do_exit): Ditto.
-	* debug.cc (regthread): Ditto.
-	(makethread): Ditto.
-	(threadname): Ditto.
-	(find_handle): Ditto.
-	(handle_list): Ditto.
-	(add_handle): Ditto.
-	* debug.h: Reflect changes to __stdcall.
-	* shared.h: Ditto.
-	* winsup.h: Ditto.
-
-Sat Dec 25 12:09:10 1999  Kazuhiro Fujieda <fujieda@jaist.ac.jp>
-
-	* path.cc (symlink): Don't return error if target is a symlink to a
-	nonexistent file.
-
-1999-12-23  DJ Delorie  <dj@cygnus.com
-
-	* Makefile.in: add support for "make check"
-	* shared.cc: if $CYGWIN_TESTING is set, use a private shared area
-	* cygrun.c: new, used to isolate dll-in-test
-	* testsuite/*: new, rudimentary testsuite framework
-
-Wed Dec 22 01:05:44 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (globify): Properly handle embedded tildes in variable
-	names.  Treat a c:\foo style path spec as "special", i.e., don't
-	interpret the backslashes as quoting characters.
-
-Fri Dec 17 10:49:13 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (symlink): Return error if the target exists.
-
-Thu Dec 16 22:36:45 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc: Change method for accessing com in windows_device_names to
-	allow > 2 com ports.
-
-Thu Dec 16 00:49:30 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Only build winver.o and version.o when required.
-
-Sat Dec 11 11:06:45 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* path.cc (path_conv::path_conv): Ensure that a trailing slash is added
-	to "x:" specifications.
-
-Fri Dec 10 20:22:41 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc (WFSO): Make __stdcall.
-	(WFMO): Ditto.
-	* debug.h: Reflect above changes.
-	* exceptions.cc (sig_set_errno): Set errno to be in effect after a
-	signal handler.
-	(handle_sigsuspend): Use set_sig_errno to ensure that the correct errno
-	is set after a signal handler.
-	(interrupt_now): Accommodate default errno field in stack.
-	(intterupt_on_return): Ditto.
-	(sigreturn): Pop, test, and possibly restore saved errno on return from
-	signal handler.
-	* fhandler_console.cc (fhandler_console::read): Set errno to be in
-	effect after a signal handler.
-	* fhandler_serial.cc (fhandler_serial::raw_read): Ditto.
-	* select.cc (cygwin_select): Ditto.
-	(select_stuff:wait): Ditto.
-	(peek_serial): Ditto.
-	* syscalls.cc (_read): Ditto.
-	* wait.cc (wait4): Ditto.
-	* winsup.h (signal_dispatch): Add "saved_errno" field.
-
-Thu Dec  9 23:35:45 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc (threadname_init): Use new_muto macro to set up a static
-	buffer for a muto.
-	(debug_init): Ditto.
-	(WFSO): Reinstate wrapper for WaitForSingleObject.
-	(WFMO): Reinstate wrapper for WaitForMultipleObject.
-	* debug.h: Declare the above two wrappers.
-	* exceptions.cc (events_init): Use new_muto macro to set up a static
-	buffer for a muto.
-	* sigproc.cc (sigproc_init): Ditto.
-	* sync.cc (muto::acquire): Don't bump waiters if we already own the
-	muto.
-	* sync.h (new): New operator.
-	(delete): Ditto.
-	(new_muto): New macro.
-
-Dec 08 23:50:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (get_nt_attribute): Add debug output.  Correct behaviour
-	in case of NULL ACL.
-	* syscalls.cc (stat_worker): Allow remote drives to get stat info from
-	fh.fstat().
-	* include/winnt.h: Add defines for W2K ACL control flags.
-	* include/cygwin/socket.h: Add missing PF_NETBIOS.
-
-Wed Dec  8 23:06:07 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Ensure that winver.o is a dependency for building the
-	dll.
-	* mkvers.sh: Attempt to call windres in a fashion that accommodates
-	older and newer versions.
-	* winver.c: Reorganize slightly to accommodate older versions of
-	windres.
-	* fhandler.cc (fhandler_disk_file::fstat): Avoid using Windows "inodes"
-	on disks which do not support them.
-
-Tue Dec  7 21:15:11 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dll_init.cc (DllList::forkeeLoadDlls): Reverse order of Free/Load
-	Library calls to ensure that references are resolved.
-	* path.cc (mount_info::conv_to_win32_path): Ensure that returned
-	windows paths are always normalized regardless of whether they were in
-	windows format to begin with.
-
-Tue Dec  7 08:48:22 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (parse_options): Properly detect end of known array.
-
-Mon Dec  6 22:32:04 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh: Generate winver.o from winver.rc and various other things
-	from include/cygwin/version.h
-	* winver.rc: New file (adapted from donation by Mumit Khan
-	<khan@xraylith.wisc.edu>).
-	* configure.in: Find windres.
-	* configure: Regenerate.
-	* Makefile.in: Link winver.o into cygwin1.dll.
-
-Mon Dec  6 13:04:47 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* init.cc (dynamically_loaded): New global variable.
-	(dll_entry): Use.
-	* winsup.h (dynamically_loaded): Declare.
-	* dcrt0.cc (do_global_ctors): Likewise.
-	(set_os_type): Make static again.
-	(dll_crt0_1): Handle dynamically_loaded case.
-	* dll_init.cc (dll_dllcrt0_1): Delete.
-	(dll_dllcrt0): Handle dynamically_loaded case.
-	(dll_noncygwin_dllcrt0): Mark obsolescent.
-	* libccrt0.cc (cygwin_attach_noncygwin_dll): Delete.
-	* pinfo.cc (pinfo_init): Don't inherit parent fds if dynamically
-	loaded.
-	* include/cygwin/cygwin_dll.h (cygwin_attach_noncygwin_dll): Delete
-	prototype.
-	(_cygwin_noncygwin_dll_entry): Mark obsolescent.
-
-Mon Dec  6 11:09:41 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Make threadsafe the default.
-	* configure: regenerate.
-	* utils/strace.cc: Fix a compiler warning.
-
-Sun Dec  5 15:49:43 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (parse_options): Reinstate unions in parse_things, to
-	save space.
-
-Fri Dec  3 22:52:05 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Implement new signal-handling scheme which ensures that a program will
-	not be interrupted while in a system or cygwin DLL.
-	* Makefile.in: Add sync.o and dll_ofiles target.
-	* dcrt0.cc (alloc_stack_hard_way): Add more defensive code to ensure
-	that the stack is really grown.
-	(alloc_stack): Ditto.
-	(dll_crt0_1): Reorganize some initialization routines to ensure that
-	they occur after the heap has been initialized.
-	* debug.cc: Use muto for locks.  Eliminate attempts to avoid being
-	interrupted by signals.
-	(threadname_init): New function.
-	(debug_init): Ditto.
-	* debug.h: Declare debug_init and threadname_init.
-	* exceptions.cc (stack_info::stack_info): Don't check for previous use
-	of get().
-	(handle_sigsuspend): Simply using new signal-handling scheme.
-	(interruptible): New function.  Determines if PC should be interrupted.
-	(interrupt_now): New function.  Causes immediate signal dispatch.
-	(interrupt_on_return): New function.  Causes signal dispatch on return
-	from cygwin or system routine.
-	(call_handler): Simplify to use new signal-handling scheme.
-	(set_process_mask): Use mask_sync muto to synchronize setting of
-	process signal mask.
-	(sig_handle_tty_stop): New function.  Called when have to stop process
-	now.
-	(sig_handle): Simplify to use new signal-handling scheme.
-	(set_process_mask): Ditto.
-	(events_init): Allocate mask_sync muto.
-	(unused_sig_wrapper): New function.  Encapsulates assembly language
-	signal handling support.
-	* fhandler.h (class select_stuff): Accommodate new signal-handling
-	scheme.
-	* fhandler_console.cc (fhandler_console): Simplify to use new
-	signal-handling scheme.
-	* fhandler_serial.cc (fhandler_serial::raw_read): Ditto.
-	* fhandler_termios.cc (bg_check): Ditto.
-	* fhandler_tty.cc (process_input): Ditto.
-	(fhandler_tty_slave::open): Ditto.
-	(fhandler_tty_slave::send_ioctl_request): Ditto.
-	* fork.cc: Ditto.
-	* path.cc (chdir): Ditto.
-	* select.cc: Ditto, throughout.
-	* shared.h: Eliminate unneeded signal enum.
-	* signal.cc (signal): Simplify to use new signal-handling scheme.
-	(sleep): Ditto.
-	(usleep): Ditto.
-	(sigprocmask): Ditto.
-	(sigaction): Ditto.
-	(pause): Use handle_sigsuspend to pause for signal.
-	* sigproc.cc: Change signal_arrived handle to global_signal_arrived
-	class.  Change various mutex handles to mutos.
-	(proc_subproc): Simplify to use new signal-handling scheme.  Use muto
-	for locking.
-	(get_proc_lock): Ditto.
-	(proc_terminate): Ditto.
-	(sig_dispatch_pending): Make a "C" function.  Return status of pending
-	signals.
-	(sigproc_init): Initialize global_signal_arrived.  Simplify to use new
-	signal-handling scheme.  Initialize sync_proc_subproc muto.
-	(sig_send): Eliminate __SIGSUSPEND considerations.  Simplify to use new
-	signal-handling scheme.
-	(__allow_sig_dispatch): Delete.
-	(__block_sig_dispatch): Delete.
-	(__get_signal_mutex): Delete.
-	(__release_signal_mutex): Delete.
-	(__have_signal_mutex): Delete.
-	(wait_sig): Simplify to use new signal-handling scheme.
-	* sigproc.h: Implement signal_arrived classes.
-	* smallprint.c (__small_vsprintf): Avoid printing a leading '*' in
-	function name with %F format.
-	* spawn.cc (spawn_guts): Simplify to use new signal-handling scheme.
-	(iscmd): Don't consider a filename to be a "command" unless it contains
-	a ':'.
-	* syscalls.cc (_read): Ditto.
-	(_open): Ditto.
-	(_close): Ditto.
-	* termios.cc (tcsendbreak): Ditto.
-	(tcdrain): Ditto.
-	(tcflush): Ditto.
-	(tcflow): Ditto.
-	(tcsetattr): Ditto.
-	(tcgetattr): Ditto.
-	* winsup.h: Reorganize include files.  Add preliminary __sig_protect
-	implementation.
-	* cygwin/version.h: Bump current version to 1.1.0.
-
-Thu Dec  2 22:19:40 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sync.cc (muto::muto): Use an event rather than a semaphore for wait
-	synchronization.
-	(muto::acquire): Rewrite to use an event and try to remove races.
-	(muto::release): Ditto.
-
-1999-12-02  DJ Delorie  <dj@cygnus.com>
-
-	* environ.cc (parse_options): switch to a static initializer;
-	templates are sensitive to g++ bugs.
-
-Fri Nov 26 12:04:23 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* net.cc (cygwin_bind): Ensure that non-Unix domain socket operations
-	return success correctly.
-
-Wed Nov 24 21:37:58 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* net.cc (cygwin_bind): Guard against incorrectly setting res to zero
-	when there is an error condition.
-
-Tue Nov 23 17:49:55 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::fhandler_base): Use better initialization
-	scheme.
-	* fork.cc (stack_base): Eliminate unneeded asm stuff.
-	* select.cc: Sprinkle in some comments.
-	* include/winnt.h: Add more CONTEXT.
-
-Nov 23 20:51:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (cygwin_bind): Use struct sockaddr_un in AF_UNIX code.  Set
-	errno to ENAMETOOLONG if length of pathname exceeds limit in AF_UNIX
-	code.  Sets errno to EADDRINUSE in AF_UNIX code if file system socket
-	object already exists.
-	* syscalls.cc (setsid): Set errno to EPERM if current process is
-	already process group leader.
-	* uinfo.cc (internal_getlogin): Rearrange for better debug output.  Set
-	pi->psid to NULL if SID can't be determined.
-	* include/cygwin/socket.h: Add AF_LOCAL and PF_LOCAL
-	(same as AF_UNIX) for POSIX compatibility.
-	* include/sys/un.h: Add UNIX_PATH_LEN define.  Added SUN_LEN macro for
-	POSIX compatibility.
-
-Sun Nov 21 22:55:04 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (parse_options): Return immediately after dealing with
-	NULL argument.  Don't try to process it.
-
-Tue Nov 16 23:29:17 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* signal.cc (kill_worker): Guard against NULL dereference when thread
-	safe.
-
-Sat Oct 30 00:59:38 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Some general cleanup.
-	* smallprint.c (__small_vsprintf): Accommodate new format for
-	__PRETTY_FUNCTION__.
-
-Wed Oct 27 16:13:36 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::from_registry): Don't allow the same posix path
-	into the mount table more than once.
-	* utils/mount.cc (main): Add some orthogonality to the options.
-
-Tue Oct 26 21:55:49 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (environ_init): Turn off ntsec by default.
-
-Wed Oct 27 00:14:11 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
-
-	* fhandler.cc (fhandler_base::lseek): Take readahead into account.
-
-Tue Oct 26 16:46:54 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_unlink): Return EISDIR when attempting to unlink a
-	directory.
-
-Mon Oct 25 18:05:23 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::read): Fix previous fix.
-
-Mon Oct 25 13:46:44 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dll_init.cc (add): Avoid allocating name for "LINK"ed DLLs.
-	(DllList::forkeeLoadDlls): Only reload DLLs if they have been
-	dlopen'ed.
-	* grp.cc (parse_grp): Assign gr_mem when it is determined.
-
-Sun Oct 24 21:55:48 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dll_init.cc (struct dll): Add module name.
-	(add): Add additional 'name' parameter for recording in dll structure.
-	(reserve_upto): New function.
-	(release_upto): Ditto.
-	(DllList::forkeeLoadedDlls): Ditto.
-	(DllList::forkeeStartLoadDlls): Remove.
-	(DllList::forkeeEndLoadedDlls): Ditto.
-	(DllNameIterator::*): Eliminate class.
-	(LinkedDllNameIterator::*): Ditto.
-	* dll_init.h: Reflect above changes.
-	* fork.cc (fork): Don't generate a list of dlls to load in the parent.
-	Let the child do it.  Use new DllList::forkeeLoadDlls to load DLLs.
-	* smallprint.c (__small_vsprintf): No need for a sign on a Win32 error.
-	(small_printf): Move function here from strace().
-	* strace.cc (small_printf): Move to smallprint.c
-	* include/sys/strace.h: Always declare small_printf.
-
-Sun Oct 24 02:22:13 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::read): Work around C bug.
-
-Tue Oct 19 22:10:21 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dll_init.cc: Add some external symbols to allow thread-safe
-	compilation.
-
-Tue Oct 19 21:09:42 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Make minor changes throughout to accommodate new gcc merge.
-	* Makefile.in: Remvoe -fpermissive option when compiling using g++.
-	* dcrt0.cc (noload): Mark as "unused" to avoid a compiler warning.
-	* exceptions.cc (sigreturn): Make this "extern" since it essentially
-	*is* extern.
-	* fork.cc (sync_with_parent): Modify to cause the macro to be
-	considered void.
-	* heap.cc (sbrk): Remove debugging code.
-	* passwd.cc (getpass): Don't use fprintf to print the prompt.
-	* path.cc (mount_info::conv_to_win32_path): Accommodate compiler
-	warning.
-	* select.cc (cygwin_select): Experimental version of select which
-	handles fd_sets with non-standard FD_SETSIZE.
-	(select_stuff::wait): Ditto.
-	* termios.cc (tcgetattr): Avoid a compiler warning.
-	(cftospeed): Ditto.
-	(cftispeed): Ditto.
-	* uinfo.cc (netapi32_init): Ditto.
-	* winsup.h (api_fatal): Simplify and avoid a compiler warning.
-	* include/sys/strace.h (system_printf): Ditto.
-	(strace_printf_wrap): Modify to cause the macro to be considered void.
-	(strace_printf_wrap1): Ditto.
-
-1999-10-19  DJ Delorie  <dj@cygnus.com>
-
-	* Makefile.in (.cc.o): add -fpermissive to avoid g++'s conformance
-	madness.
-	* environ.cc (_findenv): rename to my_findenv to avoid newlib
-	prototype.
-	* syscalls.cc (logout): remove braces around _PATH_UTMP
-
-Sat Oct 16 22:53:02 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::cygdrive_posix_path): Properly terminate string
-	after Oct 11 change below.
-
-Fri Oct 15 23:02:39 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (stack_info): Reimplement stack handling routines in
-	new stack_info class.
-	(stack_info::brute_force): Just fill out the same structure as
-	StackWalk.
-	(stack_info::walk): Just fill out stack info.
-	(stack): Use stack_info class stuff to iterate over and display the
-	stack.
-
-Fri Oct 15 00:32:13 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump some versions.
-
-Oct 5 11:45:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dcrt0.cc (dll_crt0_1): Delete calls to get_WHOEVER_sid.  Move call to
-	uinfo_init() to the end of the function.
-	* fhandler.cc (get_file_owner): Substitute call to get_id_from_sid()
-	with call to get_uid_from_sid().
-	(get_file_group): Substitute call to get_id_from_sid() with call to
-	get_gid_from_sid().
-	* fork.cc (fork): Copy new pinfo members to child.
-	* grp.cc (parse_grp): Rewritten.  Saves gr_passwd and all user names in
-	gr_mem.
-	(read_etc_group): Variable `group_sem' avoids endless loop.
-	* passwd.cc (read_etc_passwd): Variable `passwd_sem' avoids endless
-	loop.
-	* security.cc (get_sid): New function to generate SID from int values.
-	(get_ssid): New function to generate SID from string.
-	(get_pw_sid): New function to generate SID from pw_gecos entry.
-	(get_gr_sid): New function to generate SID from gr_passwd entry.
-	(get_admin_sid): Rewritten to avoid using heap space.
-	(get_system_sid): Ditto.
-	(get_creator_owner_sid): Ditto.
-	(get_world_sid): Ditto.
-	(get_id_from_sid): Try to read SIDs from /etc/passwd or /etc/group
-	files before using RID or Lookup...  function.
-	(legal_sid_type): New function.
-	(lookup_name): Rewritten to use the logon server info, if any.
-	(alloc_sd): Try to use SID from /etc/passwd and /etc/group files before
-	call to lookup_name().
-	(alloc_sd): New parameter for logon server.
-	(set_nt_attribute): Ditto.
-	(set_file_attribute): Ditto.
-	* shared.cc (sec_user): If SID is saved in myself, use it instead of
-	calling lookup_name().
-	* shared.h: struct pinfo got extended user information.
-	* spawn.cc (spawn_guts): method for forcing reread /etc files changed.
-	(_spawnve): Copy new pinfo members to child.
-	* syscalls.cc (chown): Change call to set_file_attribute().
-	(chmod): Ditto.
-	* uinfo.cc (internal_getlogin): New function.
-	(uinfo_init): Calls internal_getlogin() now.
-	(getlogin): Uses myself->username now.
-	* winsup.h: extern HANDLE netapi32_handle; Change prototypes for
-	set_file_attribute(), lookup_name(), get_id_from_sid().  New inline
-	functions get_uid_from_sid() and get_gid_from_sid().
-	* utils/mkgroup.c: Adapt to the new ntsec features.
-	* utils/mkpasswd.c: Ditto.
-
-Thu Oct 14 23:46:03 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Replace calls to GetCurrentProcess() with hMainProc throughout.
-	* autoload.h: Implement LoadDLLinitnow() function to force the loading
-	of a DLL.
-	* cygwin.din: Export cygwin_stackdump.
-	* dcrt0.cc (dll_crt0): Set up hMainProc and hMainThread here.
-	* dll_init.cc (dll_dllcrt0_1): Ditto.
-	* environ.cc (parse_options): New "oldstack" option for forcing the use
-	of the old stack walking code.
-	* exceptions.cc (signals_init): Remove.
-	(err_printf): Remove.  Use small_printf throughout.
-	(sfta): New helper function for StackWalk.
-	(sgmb): Ditto.
-	(stack_brute_force): Renamed from old stack walk function.  Now uses
-	frame pointer from context handler.
-	(stack_walk): New function.  Uses Windows API to walk the stack.
-	(stack): Reimplement to attempt to load imagehlp.dll.  If this succeeds
-	use stack_walk() to display stack info, otherwise use
-	stack_brute_force.
-	(cygwin_stackdump): Temporary (?) function for displaying a stack dump
-	from the called location.
-	(stackdump): Accept new parameters for passing to stack().
-	(handle_exceptions): Call stackdump with new parameters needed to walk
-	the stack.
-	* fhandler.cc (fhandler_base::read): Fix potential buffer overrun.  Fix
-	end of buffer problems when \r is not followed by a \n.
-	(fhandler_base::lseek): Avoid flushing read ahead when not moving the
-	file pointer.
-	* fhandler_termios.cc (fhandler_termios::set_ctty): Add a debugging
-	statement.
-	* sigproc.cc (sigproc_init): Eliminate obsolete signals_init function.
-	* winsup.h: Add some declarations.
-
-Wed Oct 13 09:02:32 1999  Kazuhiro Fujieda <fujieda@jaist.ac.jp>
-
-	* path.cc (readlink): Return errno correctly when it can't find the
-	target symlink.
-
-Tue Oct 12 13:02:08 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (setsid): Only reset sid/pgid when NOT process group
-	leader.
-	* tty.cc (tty_list::allocate_tty): Don't set sid to myself.  The first
-	tty open should do that.
-
-Mon Oct 11 23:13:29 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (noload): Issue appropriate Windows error.
-	* fhandler_termios.cc (fhandler_termios::ctty): Don't automatically set
-	sid, etc., unless the current pid associated with the tty's sid does
-	not exist.
-	* path.cc (mount_info::cygdrive_posix_path): Avoid copying beyond the
-	end of buffer or suffer garbage.
-	* pinfo.cc (pinfo_init): Restore sid behavior of a year ago.  The sid
-	should be the same as the pid to be equivalent to UNIX.
-	(pinfo_list::operator []): Add more bounds checking.
-
-Sun Oct 10 14:08:30 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (select): Return error if n > FD_SETSIZE.  This is a
-	temporary fix.
-
-Sun Oct 10 13:56:14 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (iscygdrive_device): Be more precise in detecting when a
-	"cygdrive" device.  This should allow 'mkdir -p' to work correctly.
-
-Fri Oct 08 08:55:31 1999  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* path.cc (symlink_check_one): set errno to EINVAL on socket files
-	same as normal files.
-
-1999-10-06  DJ Delorie  <dj@cygnus.com>
-
-	* include/oaidl.h (IDispatch.GetIDsOfNames): Use DISPID* not DISPID
-
-1999-10-06  DJ Delorie  <dj@cygnus.com>
-
-	* exceptions.cc (err_printf): new function; print to stderr
-	without strace's clutter.  The stacktrace functions use this, so
-	the stacktrace files should be cleaner.
-	(exception): Print segment registers also
-	(stack): include a peek at the function's arguments
-
-Tue Oct  5 16:33:17 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (hinfo::extend): Eliminate inappropriate test for boundary
-	condition.
-
-1999-10-04  DJ Delorie  <dj@cygnus.com>
-
-	* config/i386/longjmp.c: don't restore %fs (Paul Sokolovsky
-	<paul-ml@is.lg.ua>)
-
-1999-10-04  DJ Delorie  <dj@cygnus.com>
-
-	* localtime.c (tzsetwall): Handle Asian Windows strings correctly
-	(from Kazuhiro Fujieda <fujieda@jaist.ac.jp>).
-
-Sat Oct 2 23:00:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/lm*.h:  Correct multiple problems in lan manager
-	header files.
-
-Sun Oct  3 14:29:53 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sysdef/imagehlp.def: New file. Definitions for imagehlp.dll.
-	* include/imagehlp.h: Ditto.
-	* include/winbase.h: YA missing structure.
-
-Fri Oct 1 11:16:00  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (alloc_sd): Correct setting of FILE_DELETE_CHILD.
-	(get_file_attribute): Read ntea attributes only if ntsec is disabled.
-	* syscalls.cc (_unlink): Don't queue file into delqueue if DeleteFile
-	returns ERROR_ACCESS_DENIED.
-
-1999-09-30  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* init.cc (dll_entry): Remove static_load case.
-	* dcrt0.c (set_os_type): Make it externally visible.
-	* dll_init.cc (dll_dllcrt0_1): Update noncygwin initialization for
-	post-b20.1 code.
-
-1999-09-30  DJ Delorie  <dj@cygnus.com>
-
-	* times.cc: declare _timezone and _daylight properly
-
-Wed Sep 29 23:57:40 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_exit): Remove EXIT_SIGNAL mask when exiting.  It is not
-	correct given changes to really_exit.
-	* select.cc (peek_serial): Work around apparent Windows bug.
-
-1999-09-29  Norbert Schulze  <Norbert.Schulze@rhein-neckar.de>
-
-	* times.cc (timezone): revert 'return TZ if set' patch.
-	* times.cc (timezone): uses now tzset() and _timezone.
-	* times.cc (gettimeofday): ditto.
-	* localtime.c (tzsetwall): no negative minutes if offset is negativ.
-	* localtime.c (tzsetwall): minutes place holder was missing if
-	minutes == 0 and seconds !=0 (h:0:s).
-	* localtime.c (tzsetwall): if timezone has no daylight saving
-	(tz.StandardDate.wMonth==0) generate no daylight saving parameters.
-
-Sat Sep 25 15:11:04 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_termios.cc (fhandler_termios::bg_check): Accept a new
-	argument to control whether we should worry about blocking signals.
-	* fhandler.h: Ditto.
-	* syscalls.cc (read_handler): Accept a new argument for passing to
-	bg_check.
-	(read): Inform read_handler if signals are blocked or not.
-	* termios.cc: Throughout, reorganize to always block signals before
-	calling bg_check.
-
-Sat Sep 25 13:36:06 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_termios::line_edit): Add an extra argument.
-	* fhandler_serial.cc (fhandler_serial::open): Maintain consisten
-	fAbortOnError state.
-	* fhandler_termios.cc (fhandler_termios::line_edit): Use new
-	"always_accept" argument to control whether input_done is set
-	regardless of canonical state.
-	* fork.cc (vfork): Duplicate "parent's" fd table.
-	* hinfo.cc (hinfo::dup_worker): New method.
-	(dup2): Use new dup_worker method.
-	(hinfo::fixup_after_fork): Lock dtable prior to operating on it.
-	(hinfo::vfork_child_dup): New method.  Duplicates dtable for vfork.
-	(hinfo::vfork_parent_restore): New method.  Restores dtable when vfork
-	exits.
-	* net.cc (set_winsock_errno): Make global.
-	* pipe.cc (pipe): Default mode to binary unless *explicitly* set to
-	text.
-	* select.cc (set_bits): Test that {read,write,except}_selected are
-	active before setting a bit.
-	(peek_pipe): Short circuit tests if we're not checking for readable
-	or "except"able handles.
-	(thread_socket): Use read check for exitsock as old method relied on
-	undocumented, unreliable behavior.
-	(start_thread_socket): Perform more setup on exitsock to improve thread
-	exit signalling.
-	(socket_cleanup): Connect to the exitsock to force thread_socket thread
-	exit.
-	* winsup.h (hinfo): Add preliminary vfork stuff.
-	* include/winsock.h: Add shutdown() how types.
-	* include/sys/socket.h: Add socketpair declaration.
-
-1999-09-22  DJ Delorie  <dj@cygnus.com>
-
-	* syscalls.cc (chown): never return ENOSYS - just pretend it
-	works.
-
-Wed Sep 22 00:47:56 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (MAKEready): Need to initialize 'fd' or open tests in
-	peek fail.
-
-Mon Sep 20 17:07:37 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* smallprint.c (__small_vsprintf): Fix '%+' handling.
-
-Thu Sep 16 21:48:13 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* utils/cygcheck.cc (dump_sysinfo): Deal with a new compiler error.
-	* utils/strace.cc (make_command_line): Change to a void * argument, as
-	is required for SetConsoleCtrlHandler.
-
-Thu Sep 16 20:47:12 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (__api_fatal): Rearrange slightly.
-	* fhandler.h (set_ctty): Change to void.
-	* fhandler_termios.cc (fhandler_termios::set_ctty): Ditto.
-	* select.cc (thread_pipe): Change to a void * argument, as is required
-	for thread functions.
-	(thread_socket): Ditto.
-	(thread_serial): Ditto.
-	* include/winbase.h: Mark ExitProcess as noexit.
-
-Thu Sep 16 18:32:12 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (ctrl_c_handler): Make WINAPI, as required by
-	SetConsoleCtrlHandler.
-
-Thu Sep 16 17:48:05 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc (thread_stub): Make WINAPI, as required by CreateThread.
-	* fhandler_tty.cc (process_input): Ditto.
-	(process_output): Ditto.
-	(process_ioctl): Ditto.
-	* select.cc (thread_pipe): Ditto.
-	(thread_serial): Ditto.
-	(thread_socket): Ditto.
-	* sigproc.cc (wait_proc): Ditto.
-	(wait_sig): Ditto.
-	* window.cc (winMain): Ditto.
-
-Wed Sep 15 20:58:37 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_handler): Let fatal signals through regardless of
-	signal_mutex.
-	* fhandler.h (fhandler_base): Make bg_check virtual.
-	(fhandler_termios::bg_check): Eliminate the second argument.
-	* fhandler_console.cc (fhandler_console::ioctl): Check for background
-	operation.
-	* fhandler_termios.cc (fhandler_termios::bg_check): Eliminate the
-	second argument.  A negative arg 1 means the same thing.
-	* ioctl.cc (ioctl): Add debugging output.
-	* syscalls.cc (_write): Eliminate second argument to bg_check.
-	* termios.cc (tcsendbreak): Check for background operation.
-	(tcdrain): Ditto.
-	(tcflush): Ditto.
-	(tcflow): Ditto.
-	(tcsetattr): Reorganize on similar lines to above routine.
-
-Wed Sep 15 15:25:04 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (peek_pipe): Only set read_ready if bg_check returns <= 0.
-	(peek_console): Ditto.  Correct PeekConsole conditional so that the for
-	loop breaks eventually.
-
-Wed Sep 15 00:21:40 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (set_console_handler): Allocate security stuff here
-	since it is needed earlier in the process now.  Allocate a shared event
-	for use in synchronizing CTRL-C events that happen while the process is
-	still initializing.
-	(ctrl_c_handler): Use the above event to synchronize with the cygwin
-	startup process, waiting for the signal thread to come alive before
-	trying to send a signal.
-	(signals_init): Don't call set_console_handler() here, since it is now
-	handled much earlier in cygwin initialization.
-	* shared.cc (shared_init): Move out security setup.
-	* sigproc.cc (wait_sig): Activate the console_handler_thread_waiter so
-	that any waiting thread which is handling ctrl-c's will wake up and
-	send a signal, if appropriate.
-
-Tue Sep 14 23:49:39 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (ctrl_c_handler): Handle ctrl-c events ourself, using
-	the "UNIX way".
-	* fhandler_console (tty_list::get_tty): New function.
-	* shared.h: Add some additional things to tty_min class for handling
-	ctrl-c.
-
-1999-09-14  DJ Delorie  <dj@cygnus.com>
-
-	* dir.cc (rmdir): return ENOTDIR for regular files on 9x
-
-Tue Sep 14 00:01:59 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.h (ForceCloseHandle2): New macro.
-	* fhandler.cc (set_inheritance): Accept name of handle as optional
-	third argument.  Use this in ForceCloseHandle2/ProtecHandle2.
-	* fhandler.h: Implement bg_check() method.
-	* fhandler_console.cc (get_tty_stuff): Initialize more tty stuff.
-	(fhandler_console::read): Check for background read.
-	* fhandler_termios.cc (fhandler_termios::bg_check): New function.
-	Performs appropriate action given background read or write.
-	* fhandler_tty.cc (fhandler_tty_slave::write): Replace background check
-	code with new method.
-	(fhandler_tty_slave::read): Ditto.
-	(fhandler_tty_common::set_close_on_exec): Pass output_mutex name to
-	set_inheritance.
-	* select.cc: Throughout check that the fd is still open before polling.
-	(peek_pipe): Check for background read.
-	(peek_console): Ditto.
-	* shared.h: Move ntty from tty into tty_min.
-	* syscalls.cc (read_handler): Check for background read.
-	(_write): Check for background write.
-
-Sat Sep 11 16:24:21 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (iscygdrive_device): New macro.
-	(mount_info::conv_to_win32_path): Only attempt "cygdrive" translation
-	when passed /cygdrive/something.
-	(mount_info::write_cygdrive_info_to_registry): Store in-memory copy of
-	cygdrive prefix automatically.
-	(mount_info::read_cygdrive_info_from_registry): Reorganize for new
-	write_cygdrive_info_to_registry functionality.
-	(mount): Ditto.
-
-Fri Sep 10 15:44:11 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (pathconf): Make first arg 'const'.
-
-1999-09-10  DJ Delorie  <dj@cygnus.com>
-
-	* exec.cc (_execve): check for an empty environment
-
-Wed Sep  8 10:24:12 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Generalize test for initial zeroes in
-	exec/fork block.
-	* fhandler.cc (fhandler_disk_file::open): Don't attempt #! detection on
-	non-disk files.
-	* fhandler.h: Use generic status bit set/clear macros.  Use bitmask for
-	fhandler_termios state.
-	* fhandler_console.cc: Rename "tty_stuff" to more descriptive
-	"shared_console_info".
-	(fhandler_console::read): Reset console state before a read if
-	appropriate.
-	(fhandler_console::open): Improve check for setting console state.
-	(fhandler_console::fixup_after_fork): Ditto.
-	(set_console_state_for_spawn): New function.
-	* fhandler_termios.cc (fhandler_termios::tcinit): Use new method for
-	determining if initialized.
-	* fhandler_tty.cc (fhandler_tty::init_console): Avoid sending handle to
-	init or it will be closed.
-	* fork.cc (per_thread::set): Make this method non-inline, temporarily.
-	* select.cc (peek_console): Call set_input_state to ensure that the
-	console is in the correct state.
-	* shared.h (child_info): Make zero element an array for future
-	tweaking.
-	(tty_min): Change initialized element to a bit field.  Define bit field
-	macros for manipulating it.
-	* sigproc.cc (wait_sig): Wake up every half second in a (vain?) attempt
-	to work around Windows 98 hanging problem.
-	(wait_subproc): Ditto.
-	* spawn.cc (spawn_guts): Use new "set_console_state_for_spawn" prior to
-	starting a process.
-	* winsup.h: Define generic macros for manipulating a method's status
-	field.
-	(per_thread): Move inline method to fork.
-
-Mon Sep  6 13:36:34 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (fhandler_tty_master::init_console): Remove retrieval
-	of stderr handle since it is not required for correct init operation.
-	* hinfo.cc (hinfo_init): Reorganize to accommodate potential closing of
-	console handles by fhandler_console::init.
-	(init_std_file_from_handle): Set standard handle as appropriate.
-	(hinfo::de_linearize_fd_arry): Ditto.
-	* fhandler_console.cc (fhandler_console::init): Conditionally close
-	handle only if it is valid.
-
-Sun Sep  5 22:43:21 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* utils/cygcheck.cc: Make sure that GetDiskFreeSpaceExA is defined as a
-	__stdcall function or the stack will suffer.  For now, don't sort mount
-	output as more work copying the individual mntent elements is required.
-
-Sat Sep  4 19:01:00 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/glob.h: Ensure that glob*() functions can be properly accessed by
-	programs using the DLL.
-
-Sat Sep  4 18:49:04 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* heap.cc (heap_init): Tweak debugging output.
-	* sigproc.cc (sig_send): Catch obvious impossible values from
-	GetLastError.
-
-Sat Sep  4 18:43:49 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::open): Protect against signal
-	dispatch.
-	(fhandler_tty_slave::write): Only wait a fixed amount of time to
-	receive a an output_done_event.
-	(fhandler_tty_slave::tcflush): Protect against signal dispatch.
-
-Sat Sep  4 18:30:42 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_sig): Temporarily remove OutputDebugString.  It
-	seemed to be causing sporadic hangs.
-	(call_handler): Save and restore di and si.
-	(sigreturn): Ditto.
-
-Fri Sep  3 23:07:44 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_termios.cc (fhandler_termios::line_edit): Properly deal with
-	sending characters to slave when !iscanon.
-
-Fri Sep 3 18:15:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_raw.cc (fhandler_dev_raw::fstat): Add S_ISCHR to mode bits.
-	* fhandler_tape.cc (fhandler_dev_tape::fstat): Erase setting of S_ISCHR
-	since it's set in fhandler_dev_raw::fstat now.
-
-Thu Sep  2 22:11:03 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::conv_to_win32_path): Fix problem with
-	calculating relative path at root.
-
-Wed Sep  1 23:24:43 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::fhandler_base): Don't use default binmode
-	for console.
-
-Wed Sep  1 20:51:05 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* smallprint.c (__small_vsprintf): Allow field width argument with 'l'
-	modifier.  Consolidate processing of field width.
-	* uname.cc (uname): Eliminate space in "release" field.
-
-Tue Aug 24 10:46:24 1999  Kazuhiro Fujieda <fujieda@jaist.ac.jp>
-
-	* fhandler_console.cc (write_normal):  Write '\n' corresponding to
-	DWN if the cursor is out of the window.
-
-Wed Aug 25 22:16:46 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* smallprint.c (rn): Deal with positive as well as negative signs.
-	(__small_vprintf): Handle '+', 'l', and '%' format types.
-
-Wed Aug 25 00:38:49 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Zero heap information in user_data to
-	work around mutant startup code.
-
-Tue Aug 24 00:03:22 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (sig_send): One more end-of-process race detection.
-
-Mon Aug 23 21:37:07 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, remove malloc.h.
-	* debug.cc: Initialize handle list so that it will not be copied on
-	fork.
-	* exceptions.cc (_sigreturn): Zero windows error on exit.  It's
-	meaningless after a signal dispatch.
-	* fhandler_console.cc (fhandler_console::de_linearize): Improve error
-	messages.
-	* shared.h: Increment fork magic number.
-	* sigproc.cc (sigproc_terminate): Close all handles prior to calling
-	proc_terminate if running in signal thread.
-	(sig_send): Eliminate bogus ResetEvent on a semaphore.  Add code for
-	potentially dealing with problems when this code is interrupted via a
-	signal dispatch.
-	* times.cc (timezone): Use __small_sprintf.
-	* uname.cc (uname): Ditto.  Also use strcpy instead of sprintf where
-	appropriate.
-
-1999-08-23  DJ Delorie  <dj@envy.delorie.com>
-
-	* localtime.c: export timezone, daylight, tzname as _*
-	* times.cc: don't export timezone, daylight, tzname
-	(timezone): return TZ if set.
-	(cygwin_tzset): not needed.
-
-Thu Aug 19 13:46:47 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (fork): Remove pinfo lock.  It is in allocate_pid, now.
-	* spawn.cc (_spawnve): Ditto.
-	* pinfo.cc (pinfo_init): Ditto.
-	(lock_pinfo_for_update): Impreove debug output.
-	(pinfo_list::allocate_pid): Lock pinfo mutex here.
-
-1999-08-19  DJ Delorie  <dj@cygnus.com>
-
-	* Makefile.in (tooldir): If we're building natively, drop the
-	$(target_alias) on include and lib's install (i.e. /usr/include
-	instead of /usr/include/i686-cygwin).
-
-Thu Aug 19 01:11:25 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (sig_send): Avoid a race with proc thread when executing
-	due to a signal.
-
-Wed Aug 18 16:37:59 1999  Kazuhiro Fujieda <fujieda@jaist.ac.jp>
-
-	* fhandler_console (fhandler_console::fillin_info): Avoid setting
-	scroll_region.Bottom when it is not known.
-	(fhandler_console::write_normal): Add various fixes for console
-	scrolling.
-
-Wed Aug 18 16:18:22 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc: Add more precise end-of-process detection.
-
-Wed Aug 18 00:03:47 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (sig_send): Work around apparent Windows bug which
-	occasionally results in bogus error messages when a signal is
-	dispatched.
-
-1999-08-17  DJ Delorie  <dj@cygnus.com>
-
-	* localtime.c (tzsetwall): Deduce TZ more accurately.
-
-Tue Aug 17 18:00:03 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (peek_pipe): Correct detection of process group for
-	backgrounded processes.
-
-Tue Aug 17 10:24:49 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winnt.h: Fix typo in IMAGE_FIRST_SECTION definition.
-
-Sun Aug 15 19:11:49 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* gcrt0.c (__eprol): Avoid namespace pollution.
-	(_monstartup): Turn into a constructor function and prevent multiple
-	invocations.
-
-Mon Aug 16 10:03:00  Corinna Vinschen  <corinna@vinschen.de>
-
-	* utils/mkgroup.c: Correct call to LookupAccountSid for retrieval of
-	'None'.
-
-Mon Aug 16 00:24:29 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc (locker): Improve signal mutex locking.
-	* exceptions.cc (sig_handle): Pass STOP signals to call_handler to
-	ensure honoring of signal_mutex.
-	(call_handler): Move STOP code here after acquistion of signal_mutex.
-	* fhandler_tty.cc (fhandler_tty_common::__acquire_output_mutex): Track
-	lockers for debugging.
-	(fhandler_tty_common::__release_output_mutex): Ditto.
-	(fhandler_slave::write): Fix faulty signal blocking code.
-	* fork.cc (fork_copy): Remove ancient if 0.
-	(fork): Conditionalize "FORKDEBUG" under DEBUGGING.
-	* sigproc.cc (proc_terminate): Reduce pinfo lock time.
-	(sigproc_terminate): Set sig_loop_wait after getting signal_mutex.
-	(__get_signal_mutex): Reorganize for less strace output when not
-	DEBUGGING.
-	(__release_signal_mutex): Ditto.  Reorganize case where !sig_loop_wait.
-	(have_signal_mutex): Returns true if current thread has the mutex.
-	* wait.cc (wait4): Change debugging message.
-
-Sat Aug 14 0:10:00  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::raw_read): Set correct errno from Win32
-	error when ReadFile fails.
-	(fhandler_base::raw_write): In case of ERROR_DISK_FULL, return
-	bytes_written only if bytes_written > 0.
-	* errno.cc: Map ERROR_DISK_FULL to ENOSPC.
-
-Fri Aug 13 14:22:12 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (peek_pipe): Honor ignra argument.
-
-Fri Aug 13 00:45:00 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Ensure that hExeced is set to proper state
-	when parent has exited.
-
-Thu Aug 12 14:09:30 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (getsem): Fix typo which prevented sending signals to
-	other processes.
-
-Wed Aug 11 22:06:33 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Export glob and globfree.
-	* glob.h: Move to include.
-	* Makefile.in: Correct glob.h dependencies.
-
-Wed Aug 11 19:41:04 1999  Sergey Okhapkin  <sos@prospect.com.ru>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Check if the file is unix
-	domain socket.
-	(fhandler_disk_file::open): Call set_socket_p().
-	* fhandler.h: Add new fhandler type flags (FH_LOCAL, FH_FIFO).
-	(fhandler_base): get/set_socket_p - new member functions.
-	(fhandler_socket::addr_family): Add new member, currently unused.
-	(fhandler_socket::get/set_addr_family): Add new functions to access
-	addr_family.
-	* include/sys/un.h: New file.
-	* net.cc: Include <sys/un.h>
-	(cygwin_socket): Always create socket of AF_INET family, store
-	argument's family.
-	(get_inet_addr): New static function.  Converts AF_UNIX requests into
-	corresponding AF_INET requests.
-	(cygwin_sendto): Use get_inet_addr().
-	(cygwin_connect): Likewise.
-	(cygwin_accept): Check for sockaddr length.
-	(cygwin_bind): Implement AF_UNIX.
-	* path.h (PATH_SOCKET): Add new enum value.
-	(path_conv::issocket): Add new member function.
-	(SOCKET_COOKIE): Add new define.
-	* syscalls.cc (chmod): Mark socket files with system file attribute.
-
-Wed Aug 11 17:22:46 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* utils/mkgroup.c (main): Generate "None" group when
-	invoked via mkgroup -l.
-
-Tue Aug 10 21:30:31 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (peek_pipe): Handle type ahead where appropriate.
-	* sigproc.cc (proc_can_be_signalled): Revert to previous method for
-	determining signalability.
-	(getsem): Move PID_INITIALIZING test here.
-	* wait.cc (wait4): Improve debug output slightly.
-
-Mon Aug  9 23:27:44 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_exit): Add additional check for valid hExeced.
-	* exceptions.cc (call_handler): Implement a raceless way to track
-	pending_signals.
-	* signal.cc (kill_worker): Make calls from non-main threads synchronous
-	or signals from a tty thread don't work right.
-	* sigproc.cc (sig_send): Localize pending_signals assignment to only
-	the wait_sig thread.
-	(__get_signal_mutex): Don't attempt to grab a mutex if signal_mutex
-	hasn't been assigned yet.  Add more strace debugging information when
-	-DDEBUGGING.
-	(__release_signal_mutex): Don't attempt to release a mutex if
-	signal_mutex hasn't been assigned yet.  Add more strace debugging
-	output.
-	(wait_sig): Attempt to eliminate race in setting of pending_signals.
-	* spawn.cc (spawn_guts): Set hExeced to INVALID_HANDLE_VALUE so that it
-	will be obvious when a process is actually just an execed stub.
-	* strace.cc (strace_vsprintf): Output a "!" after the pid when
-	executing in an execed stub.
-
-Mon Aug  9 17:17:13 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, eliminate in() and out() macros.
-	* winsup.h (tty_attached): Accept an argument indicating the pinfo
-	structure to query.
-	* exceptions.cc (really_exit): Cosmetic change.
-	* external.cc (fillout_pinfo): Use queried pinfo structure for
-	determining tty number, not *our* number.
-	* net.cc: More workarounds.
-	* path.cc (get_device_number): Supply argument to tty_attached.
-	* syscalls.cc (ctermid): Ditto.
-	* strace.cc (strace_dump): Remove.
-	* include/sys/strace.h: Eliminate obsolete stuff.
-
-Sun Aug  8 22:54:45 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_handler): Process all signals on return from a
-	signal dispatch.
-	* sigproc.cc (proc_can_be_signalled): Guard against waiting too long
-	when exiting.
-	(proc_exists): Don't report an exited process as "existing".
-	(proc_terminate): Close handle prior to testing for existence so that
-	proc_exists will not always return TRUE.  Eliminate use of zap_subproc.
-	(stopped_or_terminated): Eliminate use of zap_subproc.
-	(zap_subproc): Delete.
-
-Sun Aug  8 22:17:36 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (fhandler_tty_master::init): hThread must remain
-	open.  Previous change to close it was wrong.
-
-Sun Aug  8 20:35:33 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc: Initalize NO_COPY variables.
-	* pinfo.cc (record_death): Don't be so insistent about getting
-	the pinfo lock.
-	* sigproc.cc (proc_terminate): Tighten the region protected by
-	the pinfo lock.
-	* spawn.cc (spawn_guts): Eliminate the pinfo lock when reparenting
-	as it is no longer required.
-	(_spawnve): Tighten the region protected by the pinfo lock.
-
-Sun Aug  8 18:26:51 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (sig_send): Add more unfortunate guards against a
-	system call being interrupted by a signal dispatch.
-
-Sat Aug  7 15:38:42 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* security.cc (get_admin_sid): Ensure that returned buf is not copied
-	on a fork.
-	(get_system_sid): Ditto.
-	(get_create_owner_sid): Ditto.
-	(get_world_sid): Ditto.
-
-Sat Aug  7 15:17:25 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (process_input): Reset signal_arrived event prior to
-	calling console read as this is now a requirement for functions which
-	detect signal_arrived.
-	(fhandler_tty_master::write): Allow signals to operate prior to raising
-	SIGTTOU.
-	(fhandler_tty_master::read): Allow signals to operate prior to raising
-	SIGTTIN.
-	* select.cc (peek_pipe): Detect attempt to read from tty not in our
-	process group as a "read_ready" event.
-	* include/shellapi.h: Add missing defines.
-	* utils/ps.cc: Output windows pid as unsigned for Windows 9x.
-
-Sat Aug 7 14:30:00  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (get_creator_owner_sid): New function.
-	* shared.cc (sec_user): calls `get_creator_owner_sid' in creation
-	of the security attributes structure additionally.
-
-Fri Aug  6 13:04:40 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Allow failure from OpenProcess.  The parent
-	may have exited due to 7/31 change.
-
-Thu Aug  5 22:54:07 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (wait_for_me): Break out as a common function to check
-	that the current process is ready to handle signals.
-	(proc_can_be_signalled): Treat myself differently.
-
-Thu Aug  5 21:24:20 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (fhandler_console): Don't call tcinit here.
-	(fhandler_console::read): Don't reset signal_arrived here.
-	* syscalls.cc (_read): Set it here instead.
-	* fhandler_termios.cc (fhandler_termios::line_edit): Only call
-	accept_input when input is ready.  Ignore iscanon in this case.
-	* fhandler_tty.cc (fhandler_tty_slave::init): Don't call tcinit here.
-
-Thu Aug  5 16:02:25 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* strace.cc (handle_output_debug_string): Ignore errors reading
-	from child memory as they seem to occur due to a process exiting.
-	(close_handle): New, defensive code.
-
-Thu Aug  5 13:32:43 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* strace.cc (remove_handle): New function.
-	(add_child): Speed up slightly.
-	(proc_child): Use output of remove_child in CloseHandle.
-
-Thu Aug  5 12:38:50 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Don't protect subproc_ready if it is NULL.
-	(do_exit): Avoid calling close_all_files if exiting from exec stub.
-	* net.cc: Reorganize to work around some compiler bugs.
-	* spawn.cc (spawn_guts): Set hExeced only after child stuff has been
-	completely initialized.
-	* syscalls.cc (_open): Protect against signals.
-	* utils/strace.cc (warn): New function.
-	(add_child): Issue warning when can't duplicate child process handle.
-
-Wed Aug  4 21:35:28 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* psapi.h: New file.
-
-Thu Aug 4 10:28:00  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc: Eliminate MALLOC_CHECK calls.
-	(lookup_name): New function simplifies the retrieval of user and group
-	names.
-	(alloc_sd): Call `lookup_name' instead of `LookupAccountName'.
-	* shared.cc (sec_user): Call `lookup_name' instead of
-	`LookupAccountName'.  Eliminate 'free' call on stack space.
-	* winsup.h: Declare `lookup_name'.
-
-Wed Aug  4 16:24:02 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* a.out.h: Fix cut and paste from mime email typos.
-
-Mon Aug  2 19:08:48 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Fix utils dependency.  Make clean more assertive.
-	* path.cc (mount_info::conv_to_win32_path): Fill in correct destination
-	when a device name is detected.
-	* syscalls.cc (chown): Always succeed when referencing a cygwin device.
-	(chmod): Ditto.
-	* net.cc (get_ifconf): Eliminate holdover from previous change.
-
-Mon Aug  2 13:07:44 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_global_ctors): Remove previous change.  It was just
-	wrong.
-
-Sun Aug  1 23:21:28 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout rename 'slave_alive' handle to 'inuse'.
-	* shared.h: Implement tty_attached() macro to determine when an actual
-	tty is associated with the process.
-	(class tty): Add some methods for manipulating an "inuse" event that is
-	common to both master and slave parts of a tty.
-	* dcrt0.cc (do_exit): Use tty_attached() to determine if signal should
-	be sent to process group.
-	* external.cc (fillout_pinfo): Return -1 if tty is not attached (i.e,
-	attached to a console).
-	* fhandler.h: Move more stuff into fhandler_tty_common and out from sub
-	classes.
-	* fhandler_console.cc (fhandler_console::read): Send SIGWINCH signal to
-	*correct* process group.
-	(fhandler_console::open): Fix incorrect argument ordering in set_ctty.
-	(fhandler_console::de_linearize): Remove unneeded handle resets.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Fix incorrect argument
-	ordering in set_ctty.  Use tty create_inuse method to create inuse
-	event.
-	(fhandler_tty_slave::close): Delete.
-	(fhandler_tty_slave::dup): Delete.
-	(fhandler_tty_slave::write): Minor cleanup of flow of control.
-	(fhandler_tty_common::dup): Subsume fhandler_tty_slave dup method.
-	(fhandler_pty_master::fhandler_pty_master): Zero inuse field.
-	(fhandler_pty_master::open): Set inuse field.
-	(fhandler_tty_common::close): New, superclass method.
-	(fhandler_tty_common::set_close_on_exec): Handle inuse field.
-	(fhandler_tty_common::fixup_after_fork): Ditto.
-	(fhandler_tty_slave::set_close_on_exec): Delete.
-	(fhandler_tty_slave::fixup_after_fork): Delete.
-	* path.cc (get_device_number): Use tty_attached() to figure out
-	/dev/tty.
-	* select.cc (peek_console): Send SIGWINCH signal to *correct* process
-	group.
-	* tty.cc (tty::master_alive): New method.
-	(tty::create_inuse): New method.
-
-Sun Aug  1 16:23:22 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* net.cc (get_ifconf): Use alloca for temporary buffer.
-
-Sun Aug  1 01:38:20 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Modify de_linearize methods throughout to set unix and msdos path
-	names.
-	* dcrt0.cc (do_exit): Only remove shared memory when we're done with
-	it.
-	* exceptions.cc (try_to_debug): Move static variable outside of the
-	function so that it can more easily be set with gdb.
-	* fhandler_console.cc (fhandler_console::open): Handles are typically
-	hexadecimal in debugging output.
-	(fhandler_console::open): Do not open inherit console handles by
-	default.
-	(fhandler_console::dup): Just use open method to "duplicate" a console
-	handle.
-	(fhandler_console::fixup_after_fork): Do *not* close handles here since
-	they have not been inherited.
-	(fhandler_console::de_linearize): Ditto.
-	* utils/strace.cc (create_child): Correct debugging flags when not
-	tracking forked processes.
-
-Sat Jul 31 20:10:58 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_global_ctors): Ensure that ctors are not called more
-	than once per session.
-	* fork.cc (fork): Use sig_protect to protect against signals during
-	fork.
-	* pinfo.cc (lpfu): Show windows pid in debugging message as this is
-	generally more useful.
-	* pinfo.cc (unlock_pinfo): Issue an error if ReleaseMutex fails.
-	(pinfo::record_death): Actually unlock pinfo on exit rather than allow
-	ExitProcess to do this since ExitProcess can sometimes take a *long*
-	time.
-	* spawn.cc (spawn_guts): Ensure that pinfo is always unlocked.
-
-Thu Jul 29 23:43:24 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, consolidate pgid processing for console and tty into
-	fhandler_termios and tty_min.
-	* debug.h: Make WF?O functions the defaults for dealing with Waits.
-	These functions attempt to work around signal interrupt problems.
-	* debug.cc: Ditto.
-	* exceptions.cc (call_handler): Don't wait a long time for second
-	attempt to get signal mutex.
-	* fhandler_console.cc (fhandler_console::open): Set the "controlling
-	tty".
-	* fhandler_termios.cc: Move the ctty and pgid functions here.
-	(fhandler_termios::line_edit): Fix debug output.
-	* fhandler_tty.cc (fhandler_tty_slave_write): Use sig_protect to
-	protect against output_mutex deadlock.
-	* fork.cc (get_vfork_val): Conditionalize with NEWVFORK.
-	* syscalls.cc (setsid): Add debugging output.
-	(setpgid): Reorganize and add debugging output.
-	* tty.cc (tty::init): Use a method to clear the sid.
-
-Thu Jul 29 23:42:53 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Patch from Egor Duda <deo@logos-m.ru>:
-	* grp.cc (read_etc_group): Use a default /etc/group entry when one
-	doesn't exist.
-	(getgrgid): Ditto.
-	* passwd.cc (read_etc_passwd): Use a default /etc/passwd entry when one
-	doesn't exist.
-	(search_for): Ditto.
-	* uinfo.cc (read_etc_group): Remove some defines.
-	* winsup.h: Move them here.
-
-1999-07-29  Bernd Schmidt  <bernds@cygnus.co.uk>
-
-	* Makefile.in (SUBDIRS_AFTER): Build mingw before utils.
-	* utils/Makefile.in (MINGW_LDFLAGS): Add "-B../mingw/"
-
-
-Tue Jul 27 23:31:28 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc: Add experimental vfork_storage initialization.
-	(do_exit): Ditto.
-	* exec.cc: Use _spawnve throughout as a common interface for execing a
-	program.
-	* fork.cc (vfork): Add beginnings of true vfork support.
-	* path.cc (sort_by_posix_name): Remove special casing of zero length
-	names since they should now be eliminated earlier on.
-	(sort_by_native_name): Ditto.
-	(mount_info::del_item): Remove hole from mount table specifically, here
-	or suffer weird behavior.  Suggested by Andrew Dalgleish
-	<andrewd@axonet.com.au>.
-	* shared.cc: Make SHAREDVER "unsigned" to avoid a compiler warning.
-	* spawn.cc : Accommodate additional argument to _spawnve, throughout.
-	(_spawnve): Make this a global function and take an hToken argument so
-	that it can be used by sexecve.  Accommodate experimental vfork
-	functionality.
-	* winsup.h: Add initial support for per-thread vfork stuff.
-	* include/cygwin/version.h: Bump shared memory version number.
-
-Mon Jul 26 20:59:58 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (sort_by_posix_name): Report two zero length strings as being
-	equal or suffer an infinite loop.
-	(sort_by_native_name): Ditto.
-	* shared.cc (shared_info::initialize): Refuse to use a different DLL's
-	shared memory.
-	* shared.h: Fix mask for child_info sanity test.
-
-Sun Jul 18 16:30:31 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* security.cc: Various changes from Corinna.
-
-Sat Jul 17 22:33:45 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (fork): Change DuplicateHandle slightly.
-	* security.cc (get_nt_attribute): Ignore error return from
-	set_process_privileges.
-	(set_nt_attribute): Ditto.
-
-Sat Jul 17 00:45:34 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.h: Fix ForceCloseHandle1 in non-debug case.
-
-Fri Jul 16 23:47:31 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (proc_can_be_signalled): Accommodate different flavors of
-	myself.
-	* include/ddeml.h: Add missing struct.
-	* include/wingdi.h: Add missing defines.
-
-Fri Jul 16 23:01:30 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Attempt to cope when srcdir is a relative pathname.
-	* fork.cc (fork): Pass handle to parent process to fixup_after_fork.
-	Eliminate excess unlock_pinfos.
-	* hinfo.cc (hinfo::fixup_after_fork): Use inherited parent handle
-	rather than try to open the parent process explicitly.
-	* pinfo.cc (record_death): Cosmetic change.
-	* sigproc.cc (wait_sig): Add a debugging statement.
-	* winsup.h: Reflect change of argument for fixup_after_fork.
-
-Fri Jul 16 11:07:55 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* shared.h: Eliminate record_death_nolock.  Just pass an argument to
-	record_death.
-	* pinfo.cc (record_death_nolock): Ditto.
-	* dcrt0.cc (__api_fatal): Use record_death with FALSE argument rather
-	than record_death_nolock.
-	* exceptions.cc (really_exit): Ditto.
-	* fork.cc (fork): Remove debugging statement.
-
-Wed Jul 14 22:08:52 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, make parent_alive a local variable.  Rename 'alive_parent'
-	to 'my_parent_is_alive'.
-	* autoload.h: Improve the description of the autoload mechanism.
-	* dcrt0.cc: Define parent_alive here.
-	(dll_crt0_1): When debugging, rotect handles inherited from fork/exec.
-	Force signal thread to finish initializing prior to calling main.
-	(dll_crt0): Reorganize child_info stuff to allow common initialization.
-	Accept parent_alive handle from invoker and ensure that this is not
-	inherited by other processes.
-	(do_exit): Ensure that exit_state is not duplicated by a fork.
-	(__api_fatal): Call 'try_to_debug' directly.
-	* debug.cc: Increase the size of the handle list.
-	(threadname): Add an optional argument to control locking.
-	* exceptions.cc (error_start_init): Make this a "C" function.
-	(try_to_debug): Ditto.  Also, use Sleep rather than pause and loop so
-	that gdb can get in to interrupt things.
-	(sig_handle):
-	* external.cc (fillout_pinfo): Reorganize slightly and plan for the
-	future.
-	* fhandler.h: Add an argument to show the name of the handle for error
-	messages to fork_fixup.
-	* fhandler.cc (fhandler_base::fork_fixup): Ditto.
-	(set_inheriting): Rename a variable for clarity.
-	(fhandler_base::fixup_after_fork): Pass in the name of the handle to
-	fork_fixup.
-	* fhandler_tty (fhandler_tty_common:fixup_after_fork): Ditto.
-	(fhandler_tty_slave:fixup_after_fork): Ditto.
-	(fhandler_tty_master:fixup_after_fork): Ditto.
-	* fhandler_windows.cc (fhandler_windows::fixup_after_fork): Ditto.
-	* fhandler_console.cc (fhandler_console::open): Specifically open
-	console with ENABLE_PROCESSED_INPUT.
-	* fork.cc (sync_with_child): Call abort when DEBUGGING and there's an
-	error.
-	(resume_child): Ditto.  Also, allow an ERROR_INVALID_HANDLE error if it
-	can't be duplicated as they seem to occur occasionally when the parent
-	copies the stack.
-	(fork): Use init_child_info to initialize structure passed to child.
-	Remove start time setting in favor of common function.  Don't mess with
-	parent's parent_alive.
-	* heap.cc (sbrk): Simply code slightly.
-	* hinfo.cc (hinfo::dup2): Improve error handling.
-	* pinfo.cc (set_myself): Set start time here since it is called by
-	everything which sets myself.
-	(pinfo_init): Remove start_time setting in favor of common function.
-	* shared.h (pinfo): Reorganize so that signal stuff falls into section
-	of pinfo which is automatically zeroed when a new pid is initialized.
-	(PROC_MAGIC): Increment to detect cygwin1.dll's memory passing
-	disparities.
-	* sigproc.cc (proc_alive): Make this a function.  Wait for target pid
-	to initialize.
-	(my_parent_is_alive): Rename from alive_parent.
-	(proc_can_be_signalled): Renamed from proc_alive macro.
-	(proc_exits): Use proc_can_be_signaleed().
-	(proc_subproc): Don't put parent_alive in child.
-	(proc_terminate): Close hwait_subproc in a race-safe way.  Ditto
-	sync_proc_subproc.
-	(sigproc_terminate): Always terminate proc_subproc thread first or it
-	may try to use signal thread as it is going away.  Wait for signal
-	thread to exit.
-	(sig_send): Use proc_can_be_signalled().
-	(init_child_info): New function.  Initializes memory block passed by
-	spawn/fork.
-	(mutex_stack): Add thread name field.
-	(sig_wait): Set active state after all handles have been set up and
-	before protecting the handles.  Use ForceCloseHandle to close
-	subproc_ready as it is now protected.  Close signal_mutex here.
-	* sigproc.h: Accommodate alive_parent rename.
-	* spawn.cc Use init_child_info to initilize memory block passed to
-	subprocess.
-	* strace.cc (__system_printf): Write to screen before writing to strace
-	log.  Only write to strace log if we're actually stracing.
-	* winsup.h: Declare the 'action on error' functions.
-	* utils/Makefile.in: (Patch from Egor Duda <deo@logos-m.ru>) Compile
-	strace using -mno-cygwin.
-	* utils/strace.cc: Allow ingw concession from Egor Duda.  Attempt to
-	allow CTRL-C when stracing.
-
-Thu Jul 14 0:39:00  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (alloc_sd): Delete special handling of uid/gid 513.
-
-Thu Jul 13 15:01:00  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.cc (get_file_owner): Fix typo.
-	* path.cc (path_conv::path_conv) : Change `return' to `goto end' in
-	case of SYMLINK_IGNORE is set.
-
-Mon Jul 5 21:33:00  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (WriteSD): Doesn't set errno if BackupWrite()
-	returns ERROR_INVALID_SECURITY_DESCR (which happens on FAT).
-
-Sat Jul 10 13:17:20 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* utils/strace.cc (error): Actually output error message.
-	(add_child): Duplicate inherited child process handle with all of the
-	privileges that we need.
-
-Fri Jul  9 01:37:23 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 14
-	in honor of snprintf and vnsprintf additions.
-
-Fri Jul  9 00:04:03 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::path_conv): Correct buffer overflow condition.
-	* fhandler_console.cc (fhandler_console::open): *Need* to enable
-	processed input or CTRL-C won't stop anything unless it's at a prompt.
-	(fhandler_console::input_tcsetattr): Ditto.
-
-Thu Jul  8 18:27:49 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add malloc debugging options.
-	* dcrt0.cc (api_fatal): Call abort when debugging so that the debugger
-	will pop up.
-	* debug.cc (close_handle): Unlock in pathological case.
-	* fhandler_console.cc (fhandler_console::read): Always respond to
-	windows size changes.
-	(fhandler_console::open): Always set things to ~ENABLE_PROCESSED_INPUT
-	so that we can control INTR character.  Don't set pgid here.
-	(fhandler_console::input_tcsetattr): Turn on windows event so that we
-	can see screen resizes.
-	(fhandler_console::init): Don't set pgid here.
-	* fhandler_termios (fhandler_termios::tcinit): Set pgid here.
-	* fhandler.h: Fix set_has_acls method return.
-	* utils/strace.h: Pass CTRL-Cs to child process.
-
-Wed Jul  7 23:59:50 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Improve dependencies.
-	* autoload.h: Work around "function unused" messages for autoload init
-	functions.
-	* configure.in: Use CHECK_TOOL to find CC so that it will get the
-	proper host alias.
-	* configure: Regenerate.
-	* dcrt0.cc (do_exit): Minor reorganization of termination function
-	calls.
-	* debug.cc (close_handle): Issue an error when an attempt is makde to
-	close a handle with a name different from the one used to record it
-	previously.
-	* debug.h: Implement new macros for storing arbitrary handle names.
-	* exceptions.cc (handle_signal): Terminate the main thread when exiting
-	due to signal in signal thread.
-	* fhandler.h: Add an extra 'fd' argument to all ready_for_read methods.
-	* select.cc: Ditto, throughout.
-	* fhandler_console (get_tty_stuff): Protect the tty_stuff handle here.
-	* fhandler_termios.cc (fhandler_termios::line_edit): Accommodate fd
-	argument to ready_for_read.
-	* fhandler_tty.cc (fhandler_tty_master::init): Close an unneeded thread
-	handle.
-	* fork.cc (fork): Use standard name when protecting process handle.
-	* spawn.cc (spawn_guts): Ditto.
-	* shared.cc (open_shared_file_map): Protect cygwin_shared handle here.
-	* sigproc.cc: Throughout, close child process handle using standard
-	name.
-	* syscalls.cc (read_handler): Check that fd is still open prior to
-	performing an operation.  Supply fd argument for ready_for_read.
-	* (_read): Supply fd argument for read_for_read.
-	* tty.cc (tty_list::terminate): Close unneeded handles as tty is
-	closing down.
-	(tty_list::allocate): Protect against signals.
-
-Mon Jul  5 14:52:40 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Export new snprintf and vnsprintf functions courtesy of
-	Egor Duda <deo@logos-m.ru>.
-
-Sun Jul  4 23:54:43 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sigbegin): New function.  Called prior to dispatching
-	to signal handler.
-	(sigreturn): New function.  Called after signal handler returns.
-	(set_process_mask): Make stdcall.
-	(call_handler): Remove sigwrap asm stuff in favor of new
-	sigbegin/sigreturn scheme.
-	* winsup.h: Change set_process_mask declaration.
-
-Sun Jul  4 22:00:14 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (stat_worker): Previous change to check for extension
-	found dots not in the filename part.  Fix this.
-
-Sat Jul  3 23:22:55 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/wincon.h: Add some missing defines.
-	* environ.cc: Remove extern which is now in winsup.h.
-	* fhandler.cc (get_file_owner): Rename argument.  Test for allow_ntsec.
-	(get_file_group): Ditto.
-	(fhandler_disk_file::fstat): Use new method inode checking.
-	* fhandler.h: Rename a method.
-	* security.cc (set_file_attribute): Take an additional argument to
-	determine if ntsec security setting should be used.
-	* dir.cc (mkdir): Pass acl info to set_file_attribute.
-	* syscalls.cc (chown): Ditto.
-	(chmod): Ditto.
-	* winsup.h: Define allow_ntsec here.
-
-Sat Jul  3 15:09:34 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_disk_file:;fstat): Move check of disk volume to
-	path_conv.  Use new methods for determining if file system is ACL
-	capable.
-	(fhandler_disk_file::open): Set "has acls" flag here.
-	* fhandler.h: Store acl information in fhandler base class.
-	* path.cc (path_conv): Set acl information on successful return.
-	* path.h: Add acl info to path_conv class.
-	* security.cc (get_file_attribute): Set ENOSYS if can't get extended
-	attributes.
-	* syscalls.cc (chown): Pass acl information from path_conv to
-	get_file_attributes.
-	(chmod): Ditto.
-	(stat_worker): Ditto.
-	* uinfo.cc: Make all exported functions extern "C".
-	* winsup.h: Add rootdir() declaration.
-
-Fri Jul  2 15:13:08 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* autoload.h: New file.
-
-Thu Jul  1 23:16:34 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* net.cc (cygwin_gethostname): Use new win32_gethostname to
-	disambiguate between cygwin and winsock version.
-	* tty.cc (creat_tty_master): Disambiguate by using cygwin_gethostname
-	to find the hostname.
-	* winsup.h: Declare cygwin_gethostname.
-
-Thu Jul  1 22:36:31 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, remove check for winsock initialization and indirect
-	references to winsock functions in favor of new dynamic DLL loading
-	method.
-
-	* Makefile.in: Remove unneeded libraries.
-	* cygwin.din: Make gethostname == cygwin_gethostname like other network
-	functions.
-	* dcrt0.cc: Implement new "autoload" functionality for loading DLLs and
-	functions as they are needed.  Add autoload functions for user32.dll.
-	(cygwin_dll_func_load): New function.
-	(dll_crt0): Issue a fatal error message if attempt to mix different
-	version DLLs is detected.
-	(api_fatal): Correct inexplicable use of buf + 8 when printing error
-	message into a buffer.
-	* fhandler.h: Cosmetic fixes.
-	* fhandler_tty.cc (fhandler_tty::close): Temporarily "if 0" out code
-	which sends EOF pulse to children.  This should only happen when last
-	parent fd closes.
-	* heap.cc (sbrk): Implement new sbrk mechanism which returns memory to
-	Windows when top of heap decreases beyond a page boundary.
-	(getpagesize): New function.
-	* fork.cc (fork): Save new heap values in stuff passed to child.
-	* hinfo.cc (hinfo::build_fhandler): Don't do any checking on a handle
-	if the handle is NULL.  Assume that it is a disk file.
-	* net.cc: Redo winsock functions to use dynamic loading scheme.
-	* shared.cc (shared_info::initialize): Cosmetic change.
-	* shared.h: Change magic number for memory block sent to child
-	processes.  Accommodate new heap information in child_info.
-	* sigproc.cc (sig_dispatch_pending): Remove some memory debugging checks.
-	(__release_signal_mutex): Ditto.
-	* syscalls.cc (stat_worker): Don't attempt the .exe hack unless the
-	previous attempt to open the file resulted in an "ERROR_FILE_NOT_FOUND"
-	and the file did not already contain an extension.
-	* times.cc: Initialize static NO_COPY variables throughout or they will
-	not actually be NO_COPY.
-	* winsup.h: Rename heap fields in per_process to accommodate new sbrk.
-	Eliminate winsock stuff invalidated by dynamic loading change.
-	* include/winsock.h: Make this file C++ safe.
-
-Sun Jun 27 17:07:34 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.h: Don't define MALLOC_DEBUG by default.
-	* fhandler.cc (fhandler_base::set_name): Always set names to NULL.  Add
-	more slop to end of win32_path_name.
-	(fhandler_base::de_linearize): Set names to NULL.  They'll be assigned
-	by the caller.
-	(fhandler_disk_file::get_native): Delete.
-	* fhandler.h: Ditto.
-	* hinfo.cc (hinfo::de_linearize_fd_array): Set path names after the
-	structure has been "delinearized".
-	* malloc.cc: Add debugging versions of malloc functions.
-	* syscalls.cc (stat_worker): Eliminate static buffer for thread safety.
-
-Wed Jun 23 22:53:00  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::fstat): If get_file_attribute()
-	signals a nonexistant acl, fstat sets default attributes now.
-
-Wed Jun 23 10:22:56 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 13.
-
-Wed Jun 23 10:39:07 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* cygwin.din (gamma, gammaf, lgamma, lgammaf): Export.
-	(j0,j0f,j1,j1f,jn,jnf): Export underscore versions as well.
-
-Mon Jun 21 21:34:06 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Sprinkle MALLOC_CHECK macro throughout.  When turned on, this will give
-	a slightly better idea of where memory corruption occurs.  Add slightly
-	modified versions of "error_start" code from Egor Duda
-	<deo@logos-m.ru>.
-	* Makefile.in: Add `utils' target.
-	* dcrt0.cc (do_exit): Attempt to detect loop conditions where do_exit
-	is called reentrantly and avoid the previously executed code in this
-	case.
-	* debug.h: Define MALLOC_CHECK macro for use with malloc debugging.
-	* environ.cc (environ_init): Add more slop at end of environ string
-	just to work around buggy programs.
-	(parse_options): Add error_start option to control core dumping or gdb
-	invocation.
-	* exceptions.cc (stackdump): New function.  Dumps stack to stderr.
-	(error_start_init): New function.  Initialize action on "core dumping"
-	error.
-	(handle_exceptions.cc): Use stackdump command to dump stack.  Call
-	try_to_debug.
-	(set_process_mask): Must be __stdcall or compiler get's confused.
-	(sig_handle): Detect SIGQUIT and SIGABRT.  Do a "stackdump" for these.
-	* fhandler.cc (get_file_owner): Add an argument to determine if
-	function should check for NT security.
-	(get_file_group): Ditto.
-	(fhandler_base::set_name): Don't free "fhandler_disk_dummy_name" path
-	names.
-	(rootdir): New function, pulled from the pages of syscalls.cc.
-	Determines the root dir of a given path.
-	(fhandler_disk_file::fstat): Get volume information of file in question
-	to determine if inodes are permanent and acls are available.  This
-	replaces previous WinNT test.
-	(fhandler_base::~fhandler_base): free "fhandler_disk_dummy_name" path
-	names.
-	* fhandler.h: Change get_file_* declarations.
-	* fhandler_console.cc: Back out most of scroll fixes from April 17.
-	They caused weird scrolling behavior.
-	* fhandler_tty.cc (fhandler_pty_master::accept_input): Add debugging
-	message.
-	* security.cc (get_file_attribute): Add additional "check for ACL"
-	argument.
-	* path.cc (symlink_check_one): Use new argument to get_file_attribute.
-	* sigproc.cc (wait_subproc): Don't exit wait loop if WaitForMultipleObject
-	returns an error.  Instead, loop for a while in case this is an expected
-	error.
-	* sigproc.h: Remove __stdcall from set_process_mask.
-	* spawn.cc (linebuf): Use initializers to set initial values.
-	(linebuf::append): Be defensive and ensure that enough space is
-	allocated for the new argument.
-	(linebuf::prepend): Ditto.
-	(spawn_guts): Correct logic which broke up program argument in a #!
-	script.
-	* syscalls.cc (chown): Use new argument to get_file_attribute.
-	(chmod): Use new argument to get_file_owner and get_file_group.
-	(stat_worker): Ditto.
-	(statfs): Break out code that determined the root directory of a given
-	path.  Use new rootdir function instead.
-	* winsup.h: Reflect new get_file_attribute argument.
-	* include/sys/strace.h: Add "NOTALL" flag so that voluminous debugging
-	output can be avoided.
-	* utils/strace.cc: Honor NOTALL flag.  Run at a higher priority.
-
-Mon Jun 14 18:33:08 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.c (stat_worker): Consolidate calls to fh.fstat for both
-	directories and normal files.
-	* fhandler_tty.cc (fhandler_pty_master::close): Ensure that an "EOF
-	pulse" is sent to any executing child processes.
-	* path.cc (symlink_check_one): Check for ':\n' as well as '#!' to
-	determine if a file is executable.
-
-Mon Jun 14 16:04:00 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (fhandler_pty_master::accept_input): Set read_retval
-	prior to performing a write to avoid a potential race condition.
-	* fhandler_termios.cc (fhandler_termios::line_edit): Don't set
-	read_retval here.  It has to be set in an fhandler_tty accept_input.
-	* select.cc (peek_pipe): Fix typo which caused read_selected to be
-	tested twice rather than except_selected.
-	* shared.h (class tty_min): Remove read_retval from here.
-	(class tty) Put it here.
-
-Mon Jun 14 13:08:58 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* utils/Makefile.in: Consolidate and simplify.
-
-Mon Jun 14 12:43:32 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, remove reliance on strace_* fields in pinfo class.  Use
-	global instead.  Remove STRACE_DUMP and STRACE_CACHE logic.
-	* pinfo.cc (set_myself): New function.
-	* dcrt0.cc (dll_crt0_1): Use the new function.
-	* environ.cc (parse_options): Remove strace environment variable logic.
-	(environ_init): Ditto.
-	* exceptions.cc (call_handler): Remove strace mutex considerations.
-	* fhandler_termios (fhandler_termios::line_edit): Remove STRACE_CACHE
-	logic.
-	* localtime.cc: Define 'lint' to eliminate warnings.
-	* smallprint.c (__small_vsprintf): Remove text formatting of windowss
-	errors.  This is now done in the 'strace' program.
-	* strace.cc: Define 'strace_active' variable to control whether strace
-	should be carried out.
-	(strace_open): Delete.
-	(strace_init): Delete.
-	(get_strace_mutex): Delete.
-	(release_strace_mutex): Delete.
-	(strace_vsprintf): Preserve last error.
-	(strace_write): Communicate with strace program using
-	OutputDebugString.
-	(strace_dump): Delete.
-	(mark): Gut.
-	* winsup.h: Remove a declaration.  Add a new one.
-	* include/sys/strace.h: Modify to accommodate new strace scheme.
-	* utils/Makefile.in: Build strace.exe
-	* utils/strace.cc: New file.
-
-Sat Jun 12 22:22:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Must compute i-node numbers
-	via `get_namehash' for Windows 9x.
-
-Sat Jun 12 10:54:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::read): Returns correct value
-	if raw_read fails.
-	* fhandler_raw.cc: More trace output.
-	* fhandler_floppy.cc: Ditto.
-	* fhandler_tape.cc: Ditto.
-
-Thu Jun 10 14:01:05 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.c (handle_exceptions): Use ".stackdump"
-	extension instead of ".core".
-	* path.cc (mount_info::read_mounts): Prescan the mount lists
-	for /cygdrive stuff to delete rather than attempting to
-	delete it in the main "add mount loop".
-	(mount_item::getmntent): Fix "system"/"user" determination.
-	* winsup.h: Use void methods in thread classes where
-	appropriate.
-
-Wed Jun  9 23:16:04 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh:  Issue error if can't find version information.
-
-1999-06-09  DJ Delorie  <dj@cygnus.com>
-
-	* localtime.c: new file; public domain timezone handling routines.
-	* tz_posixrules.h: new file; POSIX default timezone data
-	* times.cc: comment out localtime, gmtime, replace tzset with
-	cygwin_tzset
-	* Makefile.in: add localtime.c
-
-Wed Jun  9 00:49:04 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Correctly handle #! processing when line
-	ends with white space.  Also correctly handle scripts that do not
-	begin with #!.
-
-Mon Jun  7 17:04:36 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (fhandler_console::open): Need to initialize
-	tc here, too.
-	(fhandler_console::init):  Initialize tc earlier.
-
-Mon Jun  7 00:02:51 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_termios): Move tc initialization
-	into init method, etc.
-	(fhandler_tty_common):  Ditto.
-	* fhandler_console.cc (fhandler_console::fhandler_console):
-	Move tc initialization to init method.
-	(fhandler_console::init): Initialize tc stuff here.
-	(fhandler_console::dup): Ditto.
-	(fhandler_console::fixup_after_fork): Ditto.
-	(fhandler_console::de_linearize): Ditto.
-	* fhandler_termios (tcinit):  Rename constructor.
-	Accept force argument to force termios initialization.
-	* fhandler_tty.cc (fhandler_tty_master::init):  Move tc initialization
-	to common_init.
-	(fhandler_tty_common::dup): Use tcinit () to initialize tc field.
-	* tty.cc (tty::common_init): Ditto.
-
-Sun Jun  6 22:19:09 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* tty.cc (tty_list::terminate): Add \n to output message.
-	(tty::init):  Clear slave_opened field or we can't reopen
-	ttys.
-
-Fri Jun  4 23:58:17 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::open): Reorganize
-	slightly to avoid a race with get_ttyp()->was_opened.
-
-1999-06-04  DJ Delorie  <dj@cygnus.com>
-
-	* times.cc (totimeval): scale sub properly.
-	(gettimeofday): don't bias by timezone.
-
-Thu Jun  3 13:24:17 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_tty_common): Add two new methods.
-	* fhandler_tty.cc: Use new {acquire,release}_output_mutex
-	methods throughout for output_mutex.
-	(fhandler_tty_common::__acquire_output_mutex): New method.
-	(fhandler_tty_common::__release_output_mutex): New method.
-	* shared.h (get_output_mutex): Rename to open_output_mutex.
-
-Wed Jun  2 16:06:26 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/mkpasswd.c (main): account for long int args to printfs.
-
-Wed Jun  2 16:08:08 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* smallprint.c (__small_vsprintf): Conditionalize display of
-	textual messages under CYGWIN_TEXT_ERROR.
-	* ntea.cc: Remove debugging code.
-
-Wed Jun 2 16:04:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dcrt0.cc (dll_crt0_1): Call the functions `get_admin_sid',
-	`get_system_sid' and `get_world_sid' before heap initialization
-	to avoid heap fragmentation.
-	* security.cc (get_nt_attribute): Don't allocate memory
-	anymore. All memory is taken from stack.
-	(set_nt_attribute): Ditto.
-	(alloc_sd): Ditto. Change parameters to get a pointer to a
-	preallocated security descriptor and a pointer to it's length.
-	* shared.cc (sec_user): Don't allocate memory anymore. All
-	memory is taken from stack. Change parameters to receive a
-	pointer to a preallocated security buffer.
-	* shared.h: Change prototype for `sec_user' and `sec_user_nih'.
-	* sigproc.cc (getsem): Change call to `sec_user'. Additonally
-	buffer for `sec_user'.
-	* spawn.cc (spawn_guts): Ditto.
-	Change all error output in function `sec_user' and in module
-	`security.cc' from error text to error number output.
-
-Tue Jun  2 21:54:21 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (get_if_flags): Change the UP and RUNNING state
-	of disconnected RAS interfaces to true.
-
-Thu Jun 1 22:47:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (get_system_sid): New function to create
-	a SID for the well known group of local system.
-	(alloc_sd): New function.
-	(alloc_sd): Give ALL permissions to `system'.
-	* shared.cc (sec_user): Give ALL permissions to `system'.
-	(sec_user): Provide additionalparameter for a second SID.
-	This is used for `CreateProcessAsUser' call.
-	(sec_user_nih): Ditto.
-	* shared.h: Change prototypes for `sec_user' and
-	`sec_user_nih'.
-	* spawn.cc (spawn_guts): Now using `sec_user' in
-	`CreateProcessAsUser' call, if ntsec is set.
-
-Thu Jun 1 14:17:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* utils/mkpasswd.c: Change to output native names of
-	well known groups `Everyone' (SID 0) and `system' (SID 18).
-	* utils/mkgroup.c: Ditto plus output of native name of
-	well known group `None' (SID 513).
-
-Mon May 31 22:10:57 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.h: Use bit mask flags in path_conv to save exec,
-	symlink, binary status.  Use methods to access and set
-	these flags.
-	* fhandler.cc: Use methods to access path_conv flags
-	throughout.
-	* path.cc: (symlink-check_one): Accept a bitmask flags
-	variable to accommodate path_conv changes.
-	(path_conv::path_conv): Propagate path_flags from mount
-	table to path_conv class.  Avoid walking the mount table
-	twice to find "binary" info.
-	(mount_info::conv_to_win32_path): Accept additional flags
-	argument.  Don't add trailing slash if not required.
-	Fill out both paths when cygdrive.
-	(mount_info::cygdrive_win32_path): Change debugging output
-	slightly.
-	(mount_info::set_flags_from_win32_path): Generalize from
-	mount_info::binary_win32_path_p.
-	(mount_item::getmntent): Honor MOUNT_EXEC flag.
-	* shared.h: Add new method to mount_info class.
-	* include/sys/mount.h: Add a comment.
-	* utils/mount.cc: Accept -x to force a mountpoint to default
-	to executable permission.  Rename automount stuff to cygdrive.
-
-Mon May 31 19:00:00 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* environ.cc (environ_init): Set ntsec option by default
-	if running under NT.
-	* security.cc (set_nt_attribute): Delete superfluoues code.
-	* shared.cc (sec_user): Don't set owner in created security
-	descriptor.
-	* sigproc.cc (getsem): Use `sec_user' instead of `sec_user_nih'.
-	* spawn.cc (spawn_guts): Set security attribute of
-	`CreateProcess' to `sec_user' if ntsec is set, `sec_all_nih'
-	otherwise.
-
-Mon May 31 19:27:36 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, change "automount" to cygdrive.
-	Throughout, change mount flags from signed to unsigned.
-
-	* path.cc (iscygdrive): New macro.
-	(normalize_posix_path): Tack a '/' on the end of constructed
-	path only if there isn't one there already.
-	(mount_info::init): Simplify slightly.
-	(mount_info::conv_to_win32_path): Don't search for automount
-	stuff in the mount table.  Instead special case the cygdrive
-	handling so that it will always be acceptable to use /cygdrive
-	regardless of other mounts.
-	(mount_info::cygdrive_posix_path): Rename from
-	build_automount_mountpoint_path.  Fully build a posix path
-	given inputs.
-	(mount_info::cygdrive_win32_path): New function.
-	(mount_info::conv_to_posix_path): Precalculate the length
-	of the pathbuf for multiple uses.  Just use cygdrive_posix_path
-	to derive a /cygdrive/x/foo style path.
-	(mount_info::read_mounts): Don't read /cygdrive/x mounts from
-	the registry.  Delete them.
-	(mount_info::from_registry): Read cygdrive info earlier for
-	subsequent use by other mount routines.
-	(mount_info::add_reg_mount): Cosmetic changes.
-	(mount_info::read_cygdrive_info_from_registry): Always add
-	trailing slash to cygdrive.  Precalculate the length of the
-	cygdrive.
-	(mount_item::getmntent): Cosmetic changes.
-	(mount): Return EINVAL on attempt to add a mount point which
-	begins with the current cygdrive.
-	* path.h: Remove unused script_p from path_conv class.
-	* shared.h:  Add cygdrive_length to mount_list.  Add new
-	cygdrive_win32_path method.
-	* include/sys/mount.h: Use enums for MOUNT_ constants.
-
-1999-05-29  Keith Seitz  <keiths@cygnus.com>
-
-	* errno.cc (errmap): Map ERROR_NEGATIVE_SEEK to EINVAL.
-
-Fri May 28 21:43:56 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* times.cc (to_time_t): Rewrite slightly to avoid compiler
-	overoptimization.
-
-Fri May 28 21:10:33 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* sigproc.cc (getsem): Set security attribute of process
-	semaphore to `sec_user_nih()', if ntsec is set, `sec_none_nih'
-	otherwise.
-
-Wed May 26 22:56:51 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Rename inuse_event and inuse_event_exists to "slave_alive"
-	throughout.
-	* shared.h: Eliminate inuse_event.  Replace with a boolean.
-	Elminate slave_opened.
-	Add some function declarations used by new methods.
-	* fhandler_tty.cc (fhandler_pty_master::hit_eof): Use better
-	method for determining EOF for pty master.
-	(fhandler_tty_slave::open): Use method to acquire output_mutex.
-	Always create "inuse_event".  Delete call to slave_opened.
-	(fhandler_tty_slave::write): Reorganize debugging output
-	slightly.
-	(fhandler_tty_master::close): Eliminate reference to inuse_event.
-	* tty.cc (tty_list::terminate): Eliminate call to slave_opened.
-	(tty_list::connect_tty): Use new exists() method to find out if
-	a tty exists.
-	(tty_list::allocate_tty): Rename argument for clarity.  Use
-	new exists method to determine tty existence.
-	(tty::inuse): Delete.
-	(tty::init): Remove reference to inuse_event.
-	(tty::common_init): Ditto.
-	(tty::slave_opened): Delete.
-	* winsup.h: Move some function declarations to shared.h.
-
-Mon May 24 22:10:34 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (WriteSD): Don't set errno, if BackupWrite()
-	returns ERROR_NOT_SUPPORTED.
-	* security.cc (set_nt_attribute): Change condition for
-	calling LookupAccountName() with domain name again.
-	* shared.cc (sec_user): Ditto.
-
-Mon May 24 22:10:34 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/winnt.h: Temporary erased definitions of QuadPart
-	in LARGE_INTEGER and ULARGE_INTEGER.
-	* security.cc (set_nt_attribute): Set standard attributes so
-	that reading and writing attributes for user and administrators
-	isn't hindered.
-
-Mon May 24 22:10:34 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (ReadSD): New function.
-	* security.cc (WriteSD): Ditto.
-	* security.cc (get_admin_sid): Moved from shared.cc.
-	* security.cc (set_process_privileges): Moved from syscalls.cc,
-	shortened, changed return typ to int. Sets errno now.
-	* security.cc (set_file_attributes): Return type changed to int.
-	* security.cc (get_file_attributes): Ditto.
-	* security.cc (set_nt_attributes): Ditto. Cares for setting
-	of S_ISVTX now.
-	* security.cc (get_nt_attributes): Ditto.
-	* syscalls.cc (rel2abssd): #if 0'ed.
-	* syscalls.cc (set_process_privileges): Moved to security.cc.
-	* syscalls.cc (chown): Rewritten.
-	* syscalls.cc (chmod): Change call order of the functions
-	set_file_attributes() and SetFileAttributesA().
-	* fhandler.cc (fhandler_base::fstat): Change check for
-	return value of get_file_attributes().
-	* ntea.cc (NTReadEA): returns TRUE now, if allow_ntea is unset.
-	* ntea.cc (NTWriteEA): returns TRUE now, if allow_ntea is unset.
-	* shared.cc (get_admin_sid): Moved to security.cc.
-	* path.cc (symlink_check_one): Change check for return value
-	of get_file_attributes().
-
-Mon May 24 22:10:34 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (get_world_sid): Rewrite.
-	* security.cc (world_full_access): Delete.
-	* grp.cc: Use gid 0 as default gid.
-	* grp.cc (read_etc_group): Look for account name of world group.
-	* fhandler.cc (fhandler_base::open): Call `set_file_attribute'
-	only in case of disk file.
-
-Mon May 24 22:10:34 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (get_file_attribute): Patched incorrect test
-	for symlink.
-	* security.cc (set_file_attribute): ditto.
-
-Mon May 24 22:10:34 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc: Special handling for user and/or administrators
-	permissions to write (extended) attributes.
-
-Mon May 24 22:10:34 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc: Don't allow 513(none) as user or group.
-
-Mon May 24 22:10:34 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc: new functions `set_nt_attribute()', `get_nt_attribute()'
-	and `set_file_attribute()' with additional parameters `uid' and `gid',
-	to support real NT security.
-	* winsup.h: Prototype for `set_file_attribute()' with four
-	parameters.
-	* dir.cc (mkdir): Calls `set_file_attribute()' now.
-	* syscalls.cc (chown): ditto.
-	* syscalls.cc (chmod): ditto, with correct uid/gid.
-
-Mon May 24 22:10:34 1999  Corinna Vinschen  <corinna@vinschen.de>
-
-	* shared.cc: New function `get_admin_sid()' to get a SID
-	of the administrators group or of administrator.
-	New functions `sec_user()' and `sec_user_nih()' to get
-	SECURITY_ATTRIBUTES with all permissions for the user and
-	the administtrator group.
-	* shared.h: Prototypes for the above new functions `sec_user()'
-	and `sec_user_nih()'.
-	* sigproc.cc (getsem): Create process semaphore with
-	permissions set by `sec_user()'.
-
-Mon May 24 20:29:29 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (fhandler_console::output_tcsetattr):
-	ONLRET was erroneously used in place of ONLCR.
-	(fhandler_console::read): Honor get_r_no_interrupt () so
-	that interrupts don't screw up tty reading.
-	* fhandler.h: Add some methods to fhandler_tty_master.
-	* fhandler_termios.cc (fhandler_termios::fhandler_termios):
-	ONLRET was erroneously used in place of ONLCR.
-	* fhandler_tty.cc (fhandler_tty_master::init):  Associating
-	console capabilities with the tty capabilities is a bad
-	idea.  Go back to using the console's own.
-	(fhandler_tty_master::fixup_after_fork):  New method.
-	(fhandler_tty_master::de_linearize): New method.
-	(fhandler_tty_master::init_console): New method.
-
-Mon May 24 09:58:02 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/rapi.h: Add some more definitions.
-
-Sat May 22 21:45:01 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* scandir.cc (scandir): Handle errno correctly.  Do preallocation to
-	reduce realloc calls.
-	(alphasort): Use strcoll, not strcmp.
-
-Sat May 22 19:03:47 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* dll_init.cc (DllList::recordDll): Forkee must reload dlopened
-	DLLs. Also use strcasematch, not strcmp to compare file name.
-
-Wed May 19 14:38:57 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (linebuf::prepend): Fix possible reference to
-	uninitialized memory.
-	* winsup.h: Remove WINSUP_NO_CLASS_DEFS workaround.
-	* libccrt0.cc: Ditto.
-	* utils/cygwin.cc: Ditto.
-	* utils/mount.cc: Ditto.
-	* utils/ps.cc: Ditto.
-
-Sun May 16 17:22:50 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winnt.h: Revert the previous reversion.  The problem
-	with this include file was completely misdiagnosed.
-
-Sun May 16 16:05:07 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* sysdef/rapi.def: New definition file for RAPI.DLL.
-	* include/rapi.h: Preliminary RAPI declarations.
-
-Sun May 16 15:37:15 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Remove more obsolete code.
-
-Fri May 14 19:30:53 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winbase.h: Change conditional to correctly refer
-	to UNDER_CE rather than UNICODE.
-	* include/winnt.h: Update MIPS and SHx CONTEXT definitions.
-
-Tue May 11 21:19:59 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_handler): Restore previously removed
-	'leave' command as its absence causes programs to crash.  It
-	should never have been deleted.
-
-Tue May 11 12:04:02 1999  Norbert Schulze <Norbert.Schulze@rhein-neckar.de>
-
-	* times.cc (timezone): Properly adjust for daylight savings time.
-	(gettimeofday): Ditto.
-	(localtime): Ditto.
-	(tzset): Ditto.
-
-Mon May 10 23:31:36 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winnt.h: Revert to previous version.  There are problems
-	with the previous checkin.
-	* fhandler_console.cc (fhandler_console::de_linearize): Add defensive
-	code to ensure that console handles are opened correctly.
-
-Sun May  9 22:31:31 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Forgot to remove a reference to the deleted targets
-	below.
-
-Fri May  7 17:28:12 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Remove obsolete code.
-	* exceptions.cc (set_process_mask): Make this a __stdcall.
-	* sigproc.h: Fix declaration of set_process_mask.
-	* include/winnls.h: Add new code page defines.
-	* include/winnt.h: Various fixes from Anders Norlander
-	<anorland@hem2.passagen.se>.
-
-Tue May  4 22:20:05 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winnt.h: Fix CONTEXT pointer typedefs.
-
-Mon May  3 11:32:32 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* smallprint.c (__small_vsprintf): Display textual messages
-	for "%E" format type.
-	* dlfcn.cc (set_dl_error): Lose the "Win32 ".
-
-Sun May  2 12:22:17 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* utils/Makefile.in (EXE_LDFLAGS): Provide default.
-
-1999-04-30  DJ Delorie  <dj@cygnus.com>
-
-	* winsup.h (WINSUP_NO_CLASS_DEFS): if defined, don't include class
-	definitions (work around gcc bug)
-	* libccrt0.cc (WINSUP_NO_CLASS_DEFS): define
-	* utils/cygwin.cc (WINSUP_NO_CLASS_DEFS): define
-	* utils/mount.cc (WINSUP_NO_CLASS_DEFS): define
-	* utils/ps.cc (WINSUP_NO_CLASS_DEFS): define
-
-Thu Apr 29 13:55:57 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* shared.h (read_mounts): Change prototype to accept a reference
-	to reg_key, not a copy.
-	* path.cc (read_mounts): Likewise.
-
-Thu Apr 29 11:06:37 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* configure.in (EXE_LDFLAGS): Always add newlib if part of the
-	build tree.
-	* configure: Regenerate.
-
-	* utils/Makefile.in (INCLUDES): Add newlib include directories.
-	(LDFLAGS): Replace this with
-	(ALL_LDFLAGS): this to avoid being overridden from higher level
-	Makefiles.
-
-Wed Apr 28 17:01:12 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winnt.h: Add some handheld support.
-	* shared.cc (open_shared): Don't call OpenFileMapping with
-	a null name pointer.  If the name is NULL it can't be opened.
-
-Fri Apr 23 00:28:38 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.h: Always clear memory in thread .create method or
-	suffer uninitialized pointers, etc.
-
-Wed Apr 21 03:56:54 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (fhandler_console::fhandler_console):
-	Set fork_fixup flag to ensure that shared info is duplicated.
-	(get_tty_stuff): Ensure that tty_stuff is initialized.
-	(fhandler_console::fixup_after_fork): Really force tc and
-	tty_stuff initialization.  Close console handles or suffer
-	handle leak.  (needs to be fixed)
-	(fhandler_console::de_linearize): Force tc and tty_stuff
-	initialization.
-
-Mon Apr 19 14:54:46 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 12.
-
-Sat Apr 17 15:35:34 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console (fhandler_console::fixup_after_fork): Make sure
-	that new shared memory for console is initialized.
-	(fhandler_console::scroll_screen): Set region bottom correctly.
-	(fhandler_console::write_normal): Fix win95 problem where attribute
-	was propagated to scrolled region.
-	* include/wingdi.h: Fix GOBJENUMPROC prototype.
-
-Wed Apr 7 20:00:00 1999  John Fortin (fortinj@ibm.net)
-
-	* pthread.cc (pthread_suspend): New function.
-	(pthread_continue): Ditto.
-	* include/pthread.h: added pthread_suspend and pthread_continue
-	prototypes.
-	* cygwin.din: added above functions.
-	* thread.h: Add 'bool suspended' to class MTitem.  Prototype
-	__pthread_suspend __pthread_continue.
-	* thread.cc (__pthread_suspend): New function.
-	(__pthread_continue): New function.
-
-Sun Apr 4 23:00:00 1999  John Fortin (fortinj@ibm.net)
-
-	* pthread.cc (pthread_join): New function.
-	(pthread_detach): New function.
-	* include/pthread.h: added pthread_join and pthread_detach prototypes.
-	* cygwin.din: added above functions for exports.
-	* thread.h: Added char joinable to MTitem class.  Add void *
-	return_ptr to ThreadItem class to receive pointer from pthread_exit
-	and pthread_join.  Add __pthread_join and __pthread_detach prototypes.
-	* thread.cc: Change thread_init_wrapper to set item->return_ptr=ret
-	and comment out item->used = false.  Need to look at this more.
-	(__pthread_join): New function.
-	(__pthread_detach): New function.
-	(__pthread_exit): Implement ( was NOT_IMP ).
-	* thread.cc (MTinterface::FindNextUnused) : Use joinable != 'Y' as
-	an additional conditional.  We may need to use this info in
-	pthread_join.
-
-Mon Apr  5 23:09:06 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_exit): Change a variable name to minimize confusion.
-	* fhandler.h (fhandler_tty): Remove ttyp field in favor of get_ttyp
-	method.
-	* fhandler_tty.cc: Use get_ttyp () method to retrieve pointer to
-	tty device throughout.
-	(fhandler_tty_master::init): Point console tc at tty's tc so
-	that they share the same termios structure.
-	* select.cc (fhandler_tty_common::ready_for_read): Use get_ttyp
-	method.
-	* tty.cc (tty::common_init): Ditto.
-
-Mon Apr  5 00:22:30 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (fhandler_console::char_command): Make
-	setting of scrolling region cause the cursor to be placed at
-	the beginning of the scrolling region.
-	* thread.cc (__pthread_kill): Defend against item->sigs being
-	uninitialized.
-	(__pthread_sigmask): Defened against item->sigs being uninitialized.
-
-Wed Mar 31 22:52:18 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0): Restore pointer to shared console
-	terminfo structure.  This allows subprocesses to set
-	sticky console attributes.
-	* fhandler_console.cc (get_tty_styff): New function.  Returns
-	pointer to shared console terminfo structure, allocating shared
-	memory if required.
-	(fhandler_console::fhandler_console): Use get_tty_stuff().
-	(fhandler_console::de_linearize): Ditto.
-	* fork.cc (fork): Save shared console handle for export to
-	subprocesses.
-	* spawn.cc (spawn_guts): Ditto.
-	* shared.cc (open_shared_file_map): Rewrite to use generic
-	open_shared() function.
-	(open_shared): New function. Generic shared memory open
-	used by console and cygwin shared memory.
-	* shared.h: Define new stuff used by above.
-
-Wed Mar 31 01:46:23 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_tty): Set tc = ttyp.
-	* fhandler_tty.cc (fhandler_tty_master::init): Ditto.
-	(fhandler_tty_common::dup): Ditto.
-	* tty.cc (tty::common_init): Ditto.
-
-Wed Mar 31 01:43:06 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::conv_to_win32_path): Reorganize to
-	correctly handle //x syntax.
-
-Tue Mar 30 14:42:05 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* strace.cc (strace_vsprintf): Fix incorrect buffer reference.
-
-Mon Mar 29 22:46:16 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc (__lock): Return value for gcc bug workaround.
-	(__unlock): Ditto.
-	* fhandler_tty.cc (fhandler_tty_master::init): Remove extraneous
-	console initialization.  Set termios to sensical values before
-	initializing the console.
-	(fhandler_tty_slave): Add some debugging output.
-	* strace.cc: Conditionalize stuff not required by STRACE_HHMMSS.
-	(strace_vsprintf): Remove dependency on time() for STRACE_HHMMSS.
-
-Mon Mar 29 10:50:00  Corinna Vinschen  <corinna.vinschen@cityweb.de>
-
-	* utils/passwd.c (GetPW): Correct cast in call to `NetUserGetInfo'.
-
-Sun Mar 28 16:54:57 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h: Remove tty_stuff field from fhandler_console
-	class.  Use global instead to allow all console opens to
-	use same settings.
-	* fhandler_console.cc: Add new global.
-	(fhandler_console::tcgetattr): Use new global for initialization.
-	(fhandler_console::de_linearize): Ditto.
-	* fhandler_termios.cc (fhandler_termios::fhandler_termios): Don't
-	reinitialize an already initialized termios.  Do not honor
-	CYGWIN=binmode for console output.  It's too confusing.
-	* shared.h: Add `initialized' field to tty_min.
-
-Sun Mar 28 01:55:32 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_prefix_p_): Add defensive code.
-	(slash_drive_prefix_p): Use macro to detect whether a character
-	is a path separator.
-	(mount_info::conv_to_win32_path): Rewrite to correctly handle
-	relative paths.
-	* strace.cc (strace_printf): Remove extraneous save of LastError.
-	* winsup.h (per_thread):  Return TlsSetValue value.  This seems
-	to work around a g++ bug.
-
-Thu Mar 25 13:00:00  Corinna Vinschen  <corinna.vinschen@cityweb.de>
-
-	* fhandler_raw.cc (fhandler_dev_raw::dup): New method.
-	* fhandler_tape.cc (fhandler_dev_tape::dup(): Ditto.
-	* fhandler.h: Added prototypes for the formentioned methods.
-
-Wed Mar 24 23:00:00  Corinna Vinschen  <corinna.vinschen@cityweb.de>
-
-	* fhandler_raw.cc (fhandler_dev_raw::linearize):
-	Only calling base class implementation now.
-	* fhandler_raw.cc (fhandler_dev_raw::de_linearize):
-	Only calling base class implementation and allocating devbuf now.
-	* fhandler_tape.cc (fhandler_dev_tape::linearize): Erased.
-	* fhandler_tape.cc (fhandler_dev_tape::de_linearize): Erased.
-	* fhandler_tape.cc (fhandler_dev_tape::fhandler_dev_tape):
-	Additional call to `set_cb()'.
-	* fhandler_floppy.cc (fhandler_dev_floppy::fhandler_dev_floppy):
-	Ditto.
-	* fhandler.h: Erased prototypes for linearize and de_linearize
-	methods of class fhandler_dev_tape.
-
-Thu Mar 25 14:05:57 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* signal.cc (pause): Make sure that signal has been dispatched
-	prior to pause returning.
-
-Wed Mar 24 20:04:21 1999  Christopher Faylor <cgf@cygnus.com>
-
-	Change get_input_handle to get_io_handle throughout.
-	Change output_handle_ to output_handle throughout.
-	Use sys/termios.h only where needed.
-	* Makefile.in: Add new object.
-	* fhandler.cc (fhandler_base::puts_readahead): New function.
-	Adds a string to the read ahead buffer.
-	(fhandler_base::put_readahead): New function.  Adds a character
-	to the read ahead buffer.
-	(fhandler_base::get_readahead): New function.  Gets a character
-	from the read ahead buffer.
-	(fhandler_base::peek_readahead): New function.  Returns character
-	at beginning or end of read ahead buffer.
-	(fhandler_base::set_readahead_valid): Augmented from fhandler.h.
-	(fhandler_base::eat_readahead): Eat a character from the read
-	ahead buffer.
-	(fhandler_base::de_linearize): Reset read ahead info.
-	(fhandler_base::read): Honor new read ahead mechanism.
-	(fhandler_base::fhandler_base): Don't set binmode to default
-	if it has already been explicitly set.
-	* fhandler.h: Add *BINSET flags to track whether the binary
-	mode has been turned on or off explicitly.
-	(fhandler_base): Add elements for new read ahead method.  Remove
-	old `readahead_'.
-	(fhandler_termios): New base class.
-	(fhandler_console): Use fhandler_termios base class.
-	Add new de_linearize method.
-	(fhandler_tty_common): Rewrite to use fhandler_termios base class.
-	(fhandler_pty_master): Ditto.
-	(fhandler_tty_master): Ditto.
-	* fhandler_console (fhandler_console::read): Rewrite to use functions
-	from fhandler_termios and read ahead for line editing.
-	(fhandler_console::read1): Remove.
-	(fhandler_console::open): Interruptible I/O is now handled in the
-	read function.  Mark this.
-	(fhandler_console::output_tcsetattr): Use ONLRET to control
-	binary behavior since it is more closely analgous.
-	(fhandler_console::input_tcsetattr): Don't set console flags if
-	there is no change or Windows 95 will eat input.
-	(fhandler_console::tcsetattr): Use ONLRET to control binary behavior
-	since it is more closely analgous.
-	(fhandler_console::fhandler_console): Accommodate fhandler_termios
-	base class.
-	(fhandler_console::init): Ditto.
-	(fhandler_console::igncr_enabled): Ditto.
-	(fhandler_console::char_command): Use new read ahead method.
-	(fhandler_console::de_linearize): New function.
-	* fhandler_serial.cc: Need additional include.
-	* fhandler_tty.cc (fhandler_tty_master::fhandler_tty_master):
-	Accommodate fhandler_termios base class.
-	(fhandler_tty_master::init): Ditto.
-	(fhandler_tty_master::accept_input): New function.  Sends
-	(possibly line-edited) input to slave.
-	(process_input): Use line editing capabilities of fhandler_termios
-	base class when processing input.
-	(fhandler_tty_slave::open): Accommodate fhandler_termios base class.
-	(fhandler_tty_slave::tcgetattr): Ditto.
-	(fhandler_tty_slave::ioctl): Ditto.
-	(fhandler_pty_master::fhandler_pty_master): Ditto.
-	(fhandler_pty_master::read): Ditto.
-	(fhandler_tty_slave::dup): Be more paranoid about setting output
-	handle in case of error.
-	* fhandler_tty.h: Accommodate new tty_min base class in tty class.
-	* hinfo.cc (hinfo::build_fhandler): Send tty 'unit' to constructor.
-	* select.cc (peek_console): Send resize event to window regardless
-	of tty setting.  Eliminate ReadFile kludge.
-	* shared.h (tty_min): Rename termios field to avoid conflict.
-	* tty.cc (create_tty_master): Send tty number to build_fhandler.
-	(tty::common_init): Remove termios initialization.  It's handled
-	via fhandler_termios, now.
-	* fhandler_termios: New file.  Contains methods for dealing with
-	fhandler_termios class.
-
-Wed Mar 24 19:22:04 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_handler): Reorder to work around
-	gcc bug.
-
-Sun Mar 21 21:26:43 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_serial.cc (fhandler_serial::raw_read): Protect
-	against uninitialized variable.  Output debug info  if
-	ClearCommError fails.  Clear overlapped I/O on error or
-	signal.
-	(fhandler_serial::tcflow): Output debug info at start of
-	routine.
-	(fhandler_serial::tcsetattr): Add more debugging output.
-	Avoid re-setting parameters if there has been no change.
-	Setting parameters via SetCommState seems to cause loss of
-	input on Windows 9[58].
-
-Wed Mar 17 12:56:25 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/winbase.h: Fix AllocateAndInitializeSid proto.
-
-Tue Mar 16 21:55:12 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_exceptions): Always wait for sig_send
-	to exit or races can result.
-
-Tue Mar 16 13:04:34 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 11.
-
-Tue Mar 16 15:44:10 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Export telldir/seekdir.
-
-Tue Mar 16 13:50:51 1999  Corinna Vinschen  <corinna.vinschen@cityweb.de>
-
-	* dir.cc: Change unused struct member __d_find_first_called to
-	__d_position for use in new functions.
-	(telldir):  New function.  Returns current position in DIR stream.
-	(seekdir):  New function.  Seeks to new position in DIR stream.
-
-Mon Mar 15 19:17:23 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* sysdef/comctl32.def: Add InitCommonControlsEx.
-
-Mon Mar 15 19:45:10 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dir.cc (mkdir): Remove final slash from a directory if
-	appropriate or windwows won't create the directory.
-	* errno.cc: Change text for EAGAIN to something a little
-	more sensical.
-	* exceptions.cc (call_handler): Add a debug message.
-	* fhandler.cc (fhandler_base::open): Don't attempt to set
-	the position of a com device.
-	* fhandler_serial.cc (fhandler_serial::raw_read): Reset
-	overlapped event if not armed.  Don't attempt to find out
-	if characters are available if vmin_.
-	(fhandler_serial::raw_write): Clear pending I/O when
-	necessary.
-	(fhandler_serial::open): Set comm state to current rather
-	than zeroing.
-	(fhandler_serial::tcflush): Don't use "queue" as a flag.
-	TCI* defines are not bit masks.
-	* select.cc (peek_serial): Add debugging output.
-	* sigproc.cc (wait_sig): Minor cleanup.
-	* path.cc (nofinalslash): Make global.
-	* winsup.h: Ditto.
-
-Mon Mar 15 16:31:29 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/winnt.h: Add RID defs/protos from MSDN docs.
-	(SECURITY_*_RID, DOMAIN_*_RID*, etc.)
-	* include/richedit.h: Add missing SCF_* defines.
-	* include/commctrl.h: Add missing PBM_ defines, PBRANGE struct.
-
-Mon Mar 15 12:54:48 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* Makefile.in: Don't install include/Windows32 since it doesn't
-	exist any more.
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 10.
-
-1999-03-12  DJ Delorie  <dj@cygnus.com>
-
-	* net.cc (gethostbyname): support a.b.c.d notation internally,
-	in case there's no DNS at least partial support is there.
-
-Thu Mar 11 21:27:41 1999  Jeff Johnston  <jjohnstn@cygnus.com>
-
-	* cygwin.din: Added references to new fast-math routines.
-
-Wed Mar 10 19:22:46 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/commdlg.h: Add missing PageSetupDlg defines.
-
-Tue Mar  9 14:28:14 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/*.h: Switch Win32 API header file set to the one written
-	by Anders Norlander <anorland@hem2.passagen.se>.  Headers now
-	fit the standard Win32 API header layout and are more complete.
-	These correspond to Anders' headers, version 0.1.5.  Please read
-	sysdef/README for more information.
-	* include/Windows32/*.h: Delete in favor of above definitions.
-
-	Changes to support the above:
-	* fhandler_console.cc (fhandler_console::char_command): Add newly
-	needed cast to DWORD *.
-	* fhandler_serial.cc (fhandler_serial::raw_read): Make n, minchars
-	DWORDs.
-	* fhandler_tty.cc: Include limits.h.
-	(fhandler_pty_master::doecho): Second arg is now DWORD.
-	(fhandler_pty_master::process_input_to_sl): Make n, written DWORD.
-	(fhandler_pty_master::process_slave_outpu): Make n DWORD.
-	(fhandler_tty_slave::close): Make towrite, n DWORDs.
-	(fhandler_tty_slave::write): Make n DWORD.
-	* fhandler.h: Adjust fhandler_pty_master::doecho proto.
-	* hinfo.cc: Include file reordering.
-	* malloc.cc: Ditto.
-	* net.cc: Ditto.
-	* fhandler_tape.cc (get_ll): Need to reference .u in
-	LARGE_INTEGER usages.
-	* ntea.cc: Ditto.
-	* pinfo.cc: Include limits.h.
-	* spawn.cc: Ditto.
-	* uinfo.cc: Ditto.
-	* uname.cc (uname): sysinfo struct now has anon union.
-	Adjust sprintf for dwProcessorType being a long now.
-	* syscalls.cc: Include limits.h and lmcons.h.  Throughout,
-	reference .u in LARGE_INTEGER usages.
-	(logout): Make rd a DWORD.
-
-	* utils/mkgroup.c: Always include lmaccess.h and lmapibuf.h.
-	Include stdio.h.
-	(enum_groups): Adjust for longs in fprintfs.
-	(main): Ditto.
-	* utils/mkpasswd.c: Include lmaccess.h and lmapibuf.h.
-	(enum_users): Adjust for longs in fprintfs.
-	(main): Ditto.
-	(enum_local_groups): Ditto.
-	* utils/passwd.c: Remove many Win32 API defines now in new
-	Win32 headers.  Include lmaccess.h, lmerr.h, lmcons.h,
-	lmapibuf.h.
-	(PrintPW): Adjust for longs in fprintfs.
-
-Wed Mar  3 21:14:45 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (environ_init): Fix off-by-one error in initial
-	environment allocation.
-	* fhandler_serial.cc (fhandler_serial::tcflush): Use different
-	method for flushing since serial handles are now opened for
-	overlapped I/O.
-	* select.cc (cygwin_select): Make degenerate case interruptible.
-	* sigproc.cc (proc_exists): Recognize all kinds of myself pointers
-	as "existing".
-
-Tue Feb 16 23:00:48 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/Windows32/Functions.h: Correct two #ifndefs that were
-	switched.
-
-Mon Feb 15 22:41:54 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Fix incorrect arg length when
-	constructing new arguments for #!.
-
-Fri Feb 12 13:25:50 1999  Drew Moseley  <dmoseley@cygnus.com>
-
-	* Makefile.in (install-info): Test for file existence before installing.
-
-Fri Feb 12 13:17:49 1999  Corinna Vinschen  <corinna.vinschen@cityweb.de>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Handles directories,
-	returns unique i-node number.
-	* syscalls.cc (stat_worker): On WinNT, stat_worker calls
-	fhandler_disk_file::fstat for directories, too.
-
-1999-02-10  DJ Delorie  <dj@cygnus.com>
-
-	* doc/doctool.c (scan_directory): check for opendir failing,
-	add closedir.
-
-Tue Feb  9 13:02:25 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* utils/mount.cc: Add fixme.
-	* doc/doctool.c: Correct typo in comment.
-
-Mon Feb  8 17:29:58 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* include/Windows32/UnicodeFunctions.h: Fix incorrect use of
-	BOOL -> WINBOOL.
-	* Windows32/ASCIIFunctions.h: Ditto.
-
-Fri Feb  5 09:38:25 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::add_item): Ensure that drive names
-	are added using X: notation.
-
-Thu Feb  4 00:28:58 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_prefix_p_): Recognize ':' as a path separator.
-	(mount_info::conv_to_posix_path): Detect case where a '/' has
-	to be added to a path being constructed.
-	(realpath): Ensure that the full path name is returned.
-
-Wed Feb  3 22:57:42 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* shared.h (mount_info): Add two separate arrays to track
-	reverse sorting of win32/posix paths.
-	* path.cc (sort_by_posix_name): New function.  Sorts by
-	posix path.
-	(sort_by_native_name): Rename from sort_by_name.
-	(mount_info::conv_to_win32_path): Use native sort order
-	when iterating through mount table.
-	(mount_info::binary_win32_path_p): Ditto.
-	(mount_info::getmntent): Ditto.
-	(mount_info::conv_to_posix_path): Use posix sort order
-	when iterating through mount table.
-	(sort): Use two arrays to track sorting of mount table.
-	(mount_info::add_item): Simplify slightly.
-
-Wed Feb  3 15:17:54 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Remove DATA attribute which was erroneously
-	added to __errno.
-
-Tue Feb  2 23:10:18 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc: Fix comment regarding UNC paths in mount table.
-	(mount_info::conv_to_win32_path): Add back code to handle
-	//<drive> paths for now.  The plan is still to remove it again at
-	a later date.
-	(mount_info::slash_drive_to_win32_path): New.  Convert a //<drive>
-	path to a Win32 path.  Bring back from among the recently departed
-	path functions.
-	* shared.h: Add mount_info proto for slash_drive_to_win32_path.
-
-Tue Feb  2 22:52:43 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/lmaccess.h: Add stub.
-	* include/shlobj.h: Add stub.
-
-Tue Feb  2 22:34:06 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* shared.h: Change magic number associated with fork/exec
-	information as a temporary measure to eliminate strange
-	core dumps with multiple versions of cygwin1.dll.
-
-1999-02-02  Brendan Kehoe  <brendan@cygnus.com>
-
-	* Makefile.in (readme.txt): Add missing -I$(srcdir)/doc.
-
-Tue Feb  2 01:10:31 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* sysdef/*: Replace all files with new ones by Anders
-	Norlander <anorland@hem2.passagen.se>.  Please read sysdef/README
-	for more information.
-
-Mon Feb  1 14:55:11 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (sort_by_name): Sort based on length of native_path
-	to ensure maximal match when converting from native -> UNIX.
-	* cygwin.din: Make more data variables DATA.
-
-Mon Feb  1 13:31:43 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler_tape.cc: Change all fhandler_tape private functions
-	to be named foo_bar_baz-style instead of FooBarBaz.  Add some
-	parens around logical ors/ands for clarity.  Respace.
-	* fhandler.h: Change protos here in light of above.
-
-Thu Jan 28 11:00:00  Corinna Vinschen  <corinna.vinschen@cityweb.de>
-
-	* errno.cc: Support for Windows errors ERROR_CRC and ERROR_NO_READY
-	and for error ENOMEDIUM.
-
-Wed Jan 27 01:05:39 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* dir.cc (rmdir): Correct errno setting when attempting to rmdir
-	a non-directory.
-
-Tue Jan 26 17:36:12 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* registry.cc (reg_key::build_reg): Add FIXME.
-
-Tue Jan 26 01:30:48 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc (mount_info::from_registry):  Import old v1 mounts
-	only if current mount layout doesn't exist yet in both user
-	and system areas (when had_to_create_mount_areas == 2).
-	(mount_info::import_v1_mounts): New, was upgrade_v1_mounts.
-	(mount_info::from_v1_registry): Add missing comma in reg_key
-	creation call.
-	(mount_info::init): Init had_to_create_mount_areas to zero.
-	* external.cc (cygwin_internal): Fix reference to
-	upgrade_v1_mounts.
-	* shared.h: Change upgrade_v1_mounts proto to import_v1_mounts.
-	Add new had_to_create_mount_areas variable in mount_info class.
-	* registry.cc (reg_key::build_reg): Increment
-	had_to_create_mount_areas whenever we create a new mount area.
-
-	* include/sys/mount.h: Don't define MOUNT_EXEC until we actually
-	implement this functionality.
-
-	* utils/mount.cc (do_mount): Print warning messages after the
-	actual mount attempt so we don't see warnings when mount fails.
-	(usage): Change name of --upgrade-old-mounts flag to
-	--import-old-mounts.
-	(main): Ditto.
-
-Mon Jan 25 23:56:50 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* errno.cc (seterrno_from_win_error): New.  Given a Windows
-	error code, set errno accordingly.
-	(seterrno): Just call seterrno_from_win_error with the
-	error code returned by a call to GetLastError.
-	* winsup.h: Define __seterrno_from_win_error.
-	* path.cc: Clean up more function description comments.
-	(mount_info::add_reg_mount): Don't need res, just return the
-	right values.
-	(del_reg_mount): Return int, not void.  If we're deleting a
-	system mount, set errno to EACCES and return -1 if we don't
-	have a valid key handle.  If mount delete fails, set errno
-	accordingly and return -1.  Otherwise, return zero for success.
-	(cygwin_umount): Delete mount from registry first, only remove
-	from internal table if successful.
-	* shared.h: Make del_reg_mount proto return int.
-
-Mon Jan 25 22:40:15 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc (mount_info::mount_slash): Add mount to registry
-	first, only add to internal table if successful.
-	(mount_info::conv_to_posix_path): Ditto.
-	(mount): Ditto.
-	(mount_info::add_reg_mount): Return int, not void.  If we're
-	writing a system mount, first check if we have a valid key handle.
-	If we don't, set errno to EACCES and return -1.  Otherwise return
-	zero for success.
-	* shared.h: Make add_reg_mount proto return int.
-
-Mon Jan 25 20:40:26 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc (mount_info::init): Don't read automount info here.
-	(mount_info::from_registry): Read it here instead.  Also, read
-	system registry info in KEY_READ mode.
-	(mount_info::read_mounts): Read mount info with KEY_READ access
-	permissions.
-
-Mon Jan 25 19:12:31 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc: Improve several function description comments.
-	(mount_info::init): Read automount information from the
-	registry before potentially automounting slash.
-	(mount_info::conv_to_posix_path): Create automount with
-	automount_flags flags.
-	(mount): Now flags is more than just a toggle so we
-	must check it in a different manner.  And simply check
-	MOUNT_AUTO as the indicator.  If we want to change the
-	automount_prefix, also change automount_flags as appropriate.
-	Fix args to syscall_printf.
-	(write_automount_info_to_registry): New.  Was
-	write_automount_prefix_to_registry.
-	(read_automount_info_from_registry): New.  Was
-	read_automount_prefix_from_registry.
-	* shared.h: Adjust protos for function renames just mentioned.
-	* include/sys/mount.h: Delete MOUNT_CHANGE_AUTOMOUNT_PREFIX
-	since we don't really need it.
-	* utils.cc (mount): Pass MOUNT_AUTO as indicator of desire to
-	change automount prefix.
-	(show_mounts): Change spacing so there's room for "system,auto"
-	in Type column.
-
-Mon Jan 25 13:17:40 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc: Change all references from "automount root" to
-	"automount prefix", avoiding potential nomenclature confusion
-	with the root of the file system.
-	(read_automount_prefix_from_registry): New.  Was
-	read_automount_root_from_registry.
-	(read_automount_prefix_from_registry): New.  Was
-	read_automount_root_from_registry.  Also read the default
-	flags for automounts from registry at the same time.
-	(write_automount_prefix_to_registry): New.  Was
-	write_automount_root_to_registry.  Also set automount flags
-	in registry using new auto_flags arg.
-	(mount): Add flags arg to write_automount_prefix_to_registry call.
-	* shared.h: Add automount_flags variable to mount_info class.
-	Adjust protos for function renames listed above.
-
-	* include/sys/mount.h: Comment out MOUNT_MIXED and MOUNT_SILENT
-	whose values could be reused now that we're using a new mount
-	layout.  Change MOUNT_CHANGE_AUTOROOT to
-	MOUNT_CHANGE_AUTOMOUNT_PREFIX.
-
-	* utils/mount.cc (change_automount_prefix): New.  Was
-	change_automount_root.  Add new flags argument so it's possible
-	to change the default automount flags.
-	(main): Option name change from --change-automount-root to
-	--change-automount-prefix.
-	(usage): Update in light of option changes.
-	* utils/umount.cc (remove_all_automounts): Also need to check
-	for mnt_type looking like "system,auto" now that it's possible
-	for automounts to be located in the system registry.
-
-Mon Jan 25 08:59:04 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (linebuf::add): Ensure that there is always
-	enough space for line being added.  Always null terminate.
-	(linebuf::prepend): Ditto.
-
-Sat Jan 23 01:30:16 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	Make mount.exe able to upgrade mounts:
-	* external.cc: Fix file description.
-	(cygwin_internal): Handle CW_READ_V1_MOUNT_TABLES case, in
-	which case call upgrade_v1_mounts to upgrade old registry
-	area mounts.
-	* external.h: Add CW_READ_V1_MOUNT_TABLES to enum.
-	* shared.h: Make upgrade_v1_mounts public.
-
-	* utils/mount.cc: Include winsup.h, external.h, undef errno since
-	it's defined by winsup.h.
-	(usage): Add --upgrade-old-mounts option to usage info.
-	(main): Handle --upgrade-old-mounts flag by calling
-	cygwin_internal with the right constant.
-
-Sat Jan 23 00:40:17 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	First pass at mount table backwards compatibility with v1
-	mounts:
-	* path.cc (mount_info::from_registry): For now, upgrade from
-	old v1 mount registry area if nmounts==0 after reading new mount
-	areas.
-	(mount_info::read_v1_mounts): New function.  Given a regkey, read
-	the mounts in the old v1 registry layout corresponding to the key.
-	A "which" arg tells us which registry we're reading so that we
-	can include MOUNT_SYSTEM when reading old system mounts.
-	(mount_info::from_v1_registry): New function.  Retrieve old v1
-	mount table area mounts.
-	(mount_info::upgrade_v1_mounts): New function.  Retrieve old
-	v1 mounts, add them to the current registry mount location.
-	(mount_info::to_registry): New function.  For every mount in
-	the internal mount table, add it to the correct registry.
-	* shared.h: Add protos for new mount_info functions --
-	from_v1_registry, read_v1_mounts, upgrade_v1_mounts, to_registry.
-	Don't need class name in protos for
-	build_automount_mountpoint_path, write_automount_root_to_registry,
-	and read_automount_root_from_registry.
-
-Fri Jan 22 22:45:07 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Arg 2 missing from special case
-	command/cmd handling.
-
-Fri Jan 22 22:40:32 1998  Corinna Vinschen  <corinna.vinsche@cityweb.de>
-
-	* fhandler_raw.cc (fhandler_dev_raw::raw_read): bytes_to_read
-	corrected to multiple of 512 bytes instead of multiple to
-	devbufsiz.  Insert break on ReadFile returned 0 Bytes.
-
-Fri Jan 22 15:50:49 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh: Fix handling of CVS tag output.
-	* errno.cc: Mark exported data as __declspec(dllexport).
-	* times.cc: Ditto.
-	* fhandler.cc (fhandler_base::open): Yet another stab
-	at correcting handling of binmode/textmode ramifications.
-	* path.cc (hash_path_name): Make /. == '' for purposes
-	of generating a hash.
-
-Fri Jan 22 11:45:28 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (slash_unc_prefix_p): Generalize to allow
-	either type of slash.
-	(mount_info::add_item): Don't disallow UNC specs in
-	the mount table.
-	* utils/Makefile.in:  Always use current stub library.
-
-Fri Jan 22 08:52:36 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (regopt): Use correct registry key for Program
-	Options given new mount layout.
-	* cygwin.din: export __mb_cur_max from newlib.
-
-Thu Jan 21 16:52:20 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc (cygwin_split_path): Adjust two FIXMEs.
-	(mount_info::write_automount_root_to_registry): Return int,
-	0 on success, -1 if path is problematic.
-	(mount): Check return of write_automount_root_to_registry
-	and act appropriately.  Do syscall_printf when adjusting automount
-	as well as regular mount.
-	* shared.h: mount_info::write_automount_root_to_registry now
-	returns an int.
-	* utils/mount.cc (main): don't sanity-check automount path
-	here, instead let the DLL take care of that.
-
-Thu Jan 21 17:12:26 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Rewrite argument handling for
-	cleaner, one-pass operation.
-	(linebuf::add): New method for adding arguments to end
-	of the argument list.
-	(linebuf::prepend): New method for pushing arguments on
-	the front of the argument list.
-
-Wed Jan 20 19:06:30 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc (mount_info::mount_slash): only call add_reg_mount if
-	add_item succeeded.
-	(mount_info::add_item): Fail if native path doesn't start with
-	<drive letter>: or if posix path doesn't start with a slash.
-
-Wed Jan 20 19:06:30 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* fhandler_raw.cc: Correct copyright date, reformat.
-	* fhandler_floppy.cc: Ditto.
-	* fhandler_tape.cc: Ditto.
-
-Wed Jan 20 17:54:02 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	Remove //<drive>/ support.  Add support for automounts in
-	user registry area.
-	* path.cc: Rewrite, reformat docs at top in light of removing
-	//<drive>/ support and new automount support.  Add more function
-	description comments.
-	(slash_drive_prefix_p): Remove function.
-	(build_slash_drive_prefix): Ditto.
-	(slash_drive_to_win32_path): Ditto.
-	(mount_info::init): After everything else, read the automount_root
-	by calling read_automount_root_from_registry().
-	(mount_info::mount_slash): Automount slash with MOUNT_AUTO.
-	(mount_info::conv_to_win32_path): Remove //<drive>/ support code.
-	(mount_info::build_automount_mountpoint_path): Construct the name
-	of an automount POSIX path, given automount_root and the Win32
-	path that needs to be automounted.
-	(mount_info::conv_to_posix_path): Automount missing drive letter
-	and call conv_to_posix_path again if path isn't covered by the
-	mount table but starts with "<letter>:".
-	(mount_info::read_automount_root_from_registry): New function.
-	Read in the value of automount_root from the current_user
-	registry mount area.  If there isn't one, use default of
-	"/cygdrive" and write that to the registry by calling
-	write_automount_root_to_registry().
-	(write_automount_root_to_registry): Write a value of
-	automount_root to the user registry area.
-	(mount_info::del_item): Add new flags arg to specify which
-	registry to delete the mount from.
-	(mount_info::del_reg_mount): Ditto.
-	(mount_item::getmntent): Use mount_info mnt_foo strings to store
-	strings passed back in the mntent struct.  Otherwise if you
-	delete a mount item while using getmntent, the pointer may
-	change on the user.  Add ",auto" to mnt_type if	MOUNT_AUTO flag is
-	set.
-	(mount): Add support to set auto_root to path if flags is set
-	to the special MOUNT_CHANGE_AUTOROOT flag otherwise do the normal
-	thing.
-	(umount): Call cygwin_umount with flags value of 0.
-	(cygwin_umount): New exported function.  Same as umount but
-	takes an additional flag argument that specifies which registry
-	area from which umount should remove the mount point.
-	* cygwin.din: Export the cygwin_umount call.
-	* shared.h (mount_info): Add public automount_root string.
-	Add public proto for write_automount_root_to_registry().
-	Add private protos for build_automount_mountpoint_path() and
-	read_automount_root_from_registry().  Add flags arg to del_item
-	and del_reg_mount protos.  Add strings used by getmntent et al
-	including mnt_type, mnt_opts, mnt_fsname, mnt_dir.  (Can't just
-	pass back pointers to mount paths because they may change as
-	a result of a umount call.
-
-	* include/sys/mount.h: Add new MOUNT_AUTO and
-	MOUNT_CHANGE_AUTOROOT flags.  Add proto for cygwin_umount
-	function.
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 9.
-
-	* utils/mount.cc: Change missing_dir_warning flag to force
-	and init to FALSE instead of TRUE.  Throughout swap names and
-	setting as appropriate.  Include errno.h.
-	(usage): Remove info about --reset.  Add info for new
-	--change-automount-root option.
-	(main): Don't check the --reset flag.  Call change_automount_root
-	if invoked with --change-automount-root.  Only call do_mount
-	if !mount_already_exists unless force flag is TRUE.  Otherwise
-	fail.
-	(mount_already_exists): New helper function.  Returns 1
-	if the mount point of the same registry location is already
-	mounted.
-	(reset_mounts): Remove function.
-	(change_automount_root): New function that changes the
-	automount root in the registry via Cygwin by passing the new
-	path to mount() with the special MOUNT_CHANGE_AUTOROOT flag.
-	* utils/umount.cc: Add progname, set to argv[0].  Include string.h.
-	(usage): New function to print out usage info.
-	(main): Loop through argcs.  Handle new flags to remove all mounts
-	of a specific type including --remove-all-mounts,
-	--remove-user-mounts, --remove-system-mounts, and
-	--remove-auto-mounts.  New flag to specify removing a system
-	mount.  Call cygwin_umount instead of umount, providing flags
-	as appropriate.
-	(remove_all_mounts): New function.  Remove all mounts in
-	both tables.
-	(remove_all_automounts): Remove all mounts marked auto.
-	(remove_all_user_mounts): Remove all user mounts, including auto
-	mounts.
-	(remove_all_system_mounts): Remove all system mounts.
-
-	* registry.cc (reg_key::get_string): Fix description comment.
-	* strace.cc: Minor reformatting.
-
-Wed Jan 20 17:49:20 1999  DJ Delorie  <dj@cygnus.com>
-
-	* fhandler.cc (raw_write): Make sure that a disk full error
-	is properly signalled.
-	(fhandler_base::open): Only tapes are read/write, cd-roms may be
-	read-only (from Corinna).
-
-Wed Jan 20 10:46:48  Corinna Vinschen  <corinna.vinschen@cityweb.de>
-
-	[applied by DJ Delorie <dj@cygnus.com>]
-
-	* fhandler_raw.cc (fhandler_dev_raw::writebuf): Writes only
-	as much bytes as needed, instead of full buffer size.
-
-	* fhandler_tape.cc (fhandler_dev_tape::close): Corrected error
-	handling in case of error while writing buffer content to dev.
-
-	* fhandler_floppy.cc (fhandler_dev_floppy::close): Ditto.
-
-	* fhandler_tape.cc (fhandler_dev_tape::writebuf): Delete function
-
-	* fhandler_floppy.cc (fhandler_dev_floppy::writebuf): Ditto.
-
-	Patch suggested by Ron Parker <rdparker@butlermfg.org>
-	* path.cc (mount_info::conv_to_win32_path): Change the
-	recognition of UNC devices, to support also paths of type
-	`\\.\UNC\'.
-
-	* fhandler_tape.cc (fhandler_dev_tape::close): Fixed rewind
-	to block 1 instead of block 0 on rewind tapes in case of
-	uncaught signal (e.g. Ctrl-C).
-
-	* path.cc (get_raw_device_number): New static function,
-	checks path for windows raw device.
-
-	* path.cc (get_device_number): Change for recognition of
-	windows raw device paths by calling `get_raw_device_number()'.
-
-	* path.h: Change prototype for `get_device_number()'.
-
-	* Makefile.in: Added file 'fhandler_raw.o' to dependencies.
-
-	* include/cygwin/rdevio.h: New file to support ioctl commands
-	on random access raw devices. At the time only get/set buffersize
-	for raw_read/raw_write.
-
-	* fhandler.h: Change class hierarchy. 'fhandler_dev_floppy'
-	and 'fhandler_dev_tape' are now derived classes of
-	'fhandler_dev_raw', which is derived from 'fhandler_base'.
-
-	* fhandler_raw.cc: New file for implementation of class
-	'fhandler_dev_raw' which is now base class for support of
-	mass storage raw devices.
-
-	* fhandler_dev_tape.cc: Rewritten.
-
-	* fhandler_dev_floppy.cc: Rewritten. Now supporting correct
-	lseek (seeking only to positions on 512 byte boundaries,
-	like supported from WinNT).
-
-	* Makefile.in: Added file 'fhandler_floppy.o' to dependencies.
-
-	* fhandler_floppy.cc: New file to support raw devices
-	including multi volume operations.
-
-	* fhandler.cc: Delete 'fhandler_dev_floppy' implementation.
-
-	* fhandler.h: Extend class fhandler_dev_floppy.
-
-	* fhandler_tape.cc: Rewrite for correct support
-	of multi volume operations. Supports Setmarks now.
-
-	* fhandler.h: Add private method `clear()' to class
-	fhandler_dev_tape.
-
-	* Makefile.in: Add file 'fhandler_tape.o' to dependencies.
-
-	* path.cc (mount_info::conv_to_win32_path): Change the
-	recognition of UNC devices, to support devices, which
-	are not partitions, too.
-
-	* fhandler.h: Extend struct 'fhandler_dev_tape' for tape support.
-	Add method 'fstat' to fhandler_dev_floppy to get S_ISBLK().
-
-	* fhandler.cc (fhandler_base::open): In any case 'access_' has to
-	be GENERIC_READ | GENERIC_WRITE for tapes, to allow tape control.
-	No 'SetFilePointer' for tapes.
-
-	* fhandler_tape.cc: New file to support rewind (/dev/stX) and
-	norewind (/dev/nstX) tapes.  Supports ioctl() calls, described
-	in...
-
-	* include/sys/mtio.h, include/cygwin/mtio.h: New header files
-	for tape support.
-
-Sat Jan 16 21:59:36 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* registry.h: Delete; move contents into shared.h except for
-	posix_path_p() routine which disappears.
-	* {Makefile.in, environ.cc, net.cc, path.cc, registry.cc,
-	shared.cc}: No longer include registry.h.
-	* dcrt0.cc (dll_crt0_1): don't check posix_path_p()
-
-	* include/mntent.h (struct mntent): Drop const from strings.
-	* include/sys/mount.h: Change MOUNT_GLOBAL flag that nobody has
-	used yet to MOUNT_SYSTEM.  Add MOUNT_EXEC flag.
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_MOUNT_REGISTRY to
-	2.  Change CYGWIN_INFO_CYGWIN_REGISTRY_NAME to "Cygwin".
-	Change CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME to "mounts v2".
-
-	* registry.cc (reg_key::reg_key): Default key doesn't end in
-	"mounts" any more.
-	(reg_key::kill): Return error code from RegDeleteKeyA.
-	* path.cc: Reformat, reorder functionality, add comments
-	throughout.
-	(mount_info::init): Automount slash if it's not already mounted.
-	(mount_info::mount_slash): New private helper function.
-	(mount_info::binary_win32_path_p): Check flags to determine
-	if mount is binary or not, not binary_p.
-	(mount_info::read_mounts): Remove unneeded access argument.  Use
-	RegEnumKeyEx to enumerate mount points in current registry
-	location where each key name returned is a posix_path mount
-	location.  Use a subkey reg_key to read the posix_path's
-	corresponding native_path and flags.
-	(mount_info::from_registry): Access HKEY_LOCAL_MACHINE registry
-	with full access privs (which will fail if not administrator).
-	Fix registry path used to initialize HKEY_LOCAL_MACHINE reg_key.
-	(mount_info::to_registry): Delete function.  Replaced by
-	add_reg_mount.
-	(mount_info::add_reg_mount): New function which adds a specified
-	mount point to the registry.
-	(mount_info::del_reg_mount): New function which deletes the
-	posix_path argument from the highest priority registry table it
-	can (first user, than system-wide).
-	(sort_by_name): If the two posix_paths are the same, then
-	differentiate between them looking at MOUNT_SYSTEM in their flags.
-	(mount_info::add_item): Also make sure that neither path is NULL.
-	Never claim mount point is busy: replace an existing posix_path
-	as long as it came from the same registry location.
-	(mount_info::del_item): Also make sure that neither path is NULL.
-	(mount_item::getmntent): Use mnt_type field to store user vs.
-	system registry location string.  Cast all strings to char *.
-	Handle flags instead of binary_p.  Change names of strings
-	returned in mnt_opts field.
-	(mount_item::init): Set flags, instead of dealing with binary_p
-	and silent_p.
-	(mount): Call add_reg_mount instead of to_registry.
-	(umount): Call del_reg_mount instead of to_registry.
-	(path_conv::path_conv): Remove reference to silent_p.
-	* path.h (path_conv): Remove silent_p.
-
-	* utils/mount.cc: Add -s to usage (was a commented-out -g).
-	Or in MOUNT_SYSTEM if -s flag given.  Add similar commented-out
-	support for future MOUNT_EXEC flag that will be added with -e.
-	(reset_mounts): Automount slash with zero for flags, not
-	MOUNT_SILENT which we no longer use for anything.
-	* utils/umount.cc: Also print out usage if the first argument
-	starts with a dash.
-
-Fri Jan 15 11:27:51 1999  DJ Delorie  <dj@cygnus.com>
-
-	* strace.cc: add macros to protect against buffer overruns
-	(strace_printf): increase buffer from 6000 to 1000 to build devo
-	* include/sys/strace.h: allow -DNOSTRACE again
-
-Fri Jan 15 11:27:51 1999  DJ Delorie  <dj@cygnus.com>
-
-	* dcrt0.cc (alloc_stack): add 16384 to work around Win95 page
-	fault during builds
-	* fork.cc (fork): try various things to avoid page faults during
-	win95 builds.
-
-Fri Jan 15 11:18:23 1999  DJ Delorie  <dj@cygnus.com>
-
-	* fhandler.cc (raw_write): check for disk full.
-
-Fri Jan 15 11:18:23 1999  DJ Delorie  <dj@cygnus.com>
-
-	* init.cc (dll_entry): if the DLL is being LoadLibrary'd,
-	initialize some things.
-	* heap.cc (_sbrk): detect uninitialized heap and initialize
-	* dcrt0.cc (user_data): initialize to something useful.
-	(do_global_ctors): make global for init.cc
-
-Thu Jan 14 02:16:44 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* dll_init.cc: Add missing FIXME in comment.
-	* fhandler_console: Ditto.
-
-Thu Jan 14 00:53:25 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (iscmd): New function.
-	(spawn_guts): Treat command /c and cmd /c as special
-	cases.  Don't quote arguments to these programs if
-	there are exactly three arguments.
-	* dcrt0.cc (dll_crt0_1): Initialize exceptions prior
-	to fork to allow forked processes to "dump core".
-	* errno.cc (seterrno): No need for this to be extern "C".
-	* winsup.h: Ditto.
-
-Wed Jan 13 19:06:08 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* registry.cc: Add comments corresponding to various reg_key
-	functions, minor reformatting.
-	(reg_key::reg_key): Delete already-commented-out function
-
-Wed Jan 13 15:41:34 1999  DJ Delorie  <dj@cygnus.com>
-
-	* errno.cc (_sys_errlist): Add "extern" to work around new gcc
-	restrictions.
-
-Mon Jan 11 14:56:27 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Fix problem with #! and relative
-	directories.
-
-Mon Jan 11 09:00:29 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (fhandler_console::read1): Handle EOF as a
-	specific case.
-
-Sun Jan 10 23:44:22 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h: Define __fmode for convenience.  Use throughout.
-	* environ.cc (parse_options): Use O_TEXT when nobinmode.
-	* fhandler.cc (fhandler_base::open): Don't honor __fmode
-	when disk file.  Default to O_TEXT if no mode is specified.
-	(fhandler_base::fhandler_base): Don't honor __fmode when disk
-	file.  Otherwise default to O_BINARY.
-	* pipe.cc (make_pipe): Default to O_BINARY if no mode specified.
-
-Sat Jan  9 20:58:34 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Correct previously messed up patch.
-	* thread.h: Add back a needed include.
-	* sigproc.cc (sigproc_init): Work around problem with older
-	compilers.
-	* wait.cc (wait4): Ditto.
-	* winsup.h (per_thread_waitq): Ditto.
-	* include/Windows32/CommonFunctions.h: Temporary change to
-	work around problems with older compilers.
-
-Fri Jan  8 12:53:53 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (parse_options): Add "forkchunk" debug setting.
-	Takes a value which is used to limit the size of individual memory
-	copies in a fork.
-	* fork.cc (fork_copy): Rewrite slightly to allow copying of
-	individual chunks of memory rather than all in one gulp.
-	Controlled by chunksize global variable.
-
-Thu Jan  7 22:02:18 1999  Christopher Faylor <cgf@cygnus.com>
-
-	patch from Corinna Vinschen <corinna.vinschen@cityweb.de>:
-	* utils/passwd.c: New file.
-	* utils/Makefile.in: Add dependencies for passwd.
-	* syscalls.cc (chmod): Change permission checking in case
-	of readonly test.
-	(stat_dev): Change default permission bits to allow writing
-	for all users.
-	(chown): Retry LookupAccountName with username set to domain\\username,
-	if returned SID-Type is not SidTypeUser.
-
-
-Thu Jan  7 17:50:49 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::set_name): Fix bug which
-	disallowed '%' in a file name.
-
-Thu Jan  7 00:21:41 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	* path.cc: Add comments.
-	* path.h: Correct file description comment.
-
-Tue Jan  5 16:07:15 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_serial.cc (fhandler_serial::raw_read): Be more defensive
-	about not calling problematic functions when the overlapped I/O is
-	armed.  Reset the overlapped event prior to calling read or suffer
-	an "operation aborted".
-	* select.cc (peek_serial): Ditto.
-
-Mon Jan  4 15:16:22 1999  Geoffrey Noer  <noer@cygnus.com>
-
-	Eliminate warnings:
-	* utils/mount.cc (show_mounts): make format a const char *.
-	* utils/ps.cc (main): make literal strings const char *s.
-	* utils/cygpath.cc (long_options): cast literal strings to char *s.
-	(main):
-
-Sun Jan  3 20:46:12 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (peek_console): Remove #if 0 around NT code workaround.
-
-Sat Jan  2 00:04:01 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Remove include directories made obsolete by
-	recent changes to mmap.cc.  Also remove libraries that appear
-	to be unnecessary for linking.
-	* mkvers.sh: Put contents of .snapshot-date, if available, into
-	the DLL.
-
-Fri Jan  1 22:44:49 1999  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_serial): Add flag to track state of
-	overlapped serial I/O.  Add overlapped_setup method for common
-	setup of overlapped structure.
-	* fhandler_serial.cc (fhandler_serial::overlapped_setup): New
-	method.  Sets up the overlapped structure for overlapped serial I/O.
-	(fhandler_serial::raw_read): Use overlapped_armed flag to avoid
-	calling functions which perform overlapped operations if overlapped
-	I/O is in already progress.  This should only be the case if a
-	previous operation was interrupted or select has detected serial I/O.
-	(fhandler_serial::open): Use overlapped_setup.
-	(fhandler_serial::fixup_after_fork): Ditto.
-	(fhandler_serial::de_linearize): Ditto.
-	(fhandler_serial::dup): Ditto.
-	(fhandler_serial::tcsetattr): Fix typo which caused IGNPAR
-	to be ignored.
-	* hinfo.cc (hinfo::select_read): Set saw_error to zero explicitly
-	to avoid spurious reporting of select errors.
-	(hinfo::select_write): Ditto.
-	(hinfo::select_except): Ditto.
-	* select.cc (peek_serial): Use overlapped_armed to avoid calling
-	functions which perform overlapped operations if overlapped I/O
-	is already in progress.
diff --git a/winsup/cygwin/ChangeLog-2000 b/winsup/cygwin/ChangeLog-2000
deleted file mode 100644
index 54494e610..000000000
--- a/winsup/cygwin/ChangeLog-2000
+++ /dev/null
@@ -1,4150 +0,0 @@
-Tue Dec 27  1:08:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygwin.din: Add symbols for `getrlimit' and `setrlimit'.
-	* exceptions.cc (stackdump): Avoid creating stackdump when
-	`rlim_core' is 0.
-	* resource.cc: New global variable `rlim_core'.
-	(getrlimit): New function.
-	(setrlimit): Ditto.
-	include/cygwin/version.h: Bump minor API version to 32 due to
-	adding `getrlimit' and `setrlimit'.
-	include/sys/resource.h: Add defines, types and prototypes for
-	`getrlimit' and `setrlimit'.
-
-Mon Dec 25 22:18:42 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* autoload.h: Make DLL initializers global to avoid inlining.
-	* exceptions.cc (interrupt_setup): Reorganize arguments to allow use of
-	regparm.
-	(interrupt_now): Ditto.
-	(interrupt_on_return): Ditto.
-	(call_handler): Ditto.
-
-Mon Dec 25 13:36:44 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump DLL minor version number to 8.
-
-Wed Dec 20 13:37:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: Add load statement for SetSecurityDescriptorControl.
-	* security.cc (alloc_sd): Always set SE_DACL_PROTECTED flag on
-	Win2K and higher.
-
-Wed Dec 20 01:02:13 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (reset_signal_arrived): Make global to avoid inlining.
-
-Wed Dec 20 00:57:10 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_serial.cc (fhandler_serial::raw_read): Always find number of
-	bytes ready to be read whether overlapped_armed or not.
-
-Tue Dec 19 21:39:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (remove): New function, overriding the newlib
-	implementation.
-
-Tue Dec 19 16:26:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* environ.cc (struct parse_thing): Add entry for new CYGWIN option
-	`smbntsec'.
-	* path.cc (path_conv::check): Check path for being a remote path.
-	If so and `allow_smbntsec' is set to FALSE, set has_acls to FALSE.
-	* security.cc: Add global definition for `allow_smbntsec'.
-	* security.h: Add extern declaration for `allow_smbntsec'.
-	* fhandler.cc (fhandler_disk_file::open): Eliminate extern declaration
-	of `allow_ntsec'.
-	* syscalls.cc: Ditto.
-
-Fri Dec 15 18:54:42 2000 Bradley A. Town <townba@pobox.com>
-
-	* fhandler_console.cc (read): Add support for xterm-style mouse event
-	reporting.
-	(fhandler_console::char_command): Honor mouse events.
-	(fhandler_console::open): Enable mouse input events.
-	(fhandler_console::input_tcsetattr): Ditto.
-	* select.cc (peek_console): Add check for mouse events.
-
-Fri Dec 15 17:23:17 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_posix_path): Calculate path name length overruns
-	more dynamically.
-	(normalize_win32_path): Ditto.
-	* Makefile.in: Avoid scanning the directory twice for *.d files.
-
-Thu Dec 14 23:37:51 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_console): Add additional argument to
-	char_command method.
-	* fhandler_console.cc (fhandler_console::read): Revert previously
-	misapplied patch.
-	(fhandler_console::char_command): Add a second argument.
-	(fhandler_console::write): Recognize when a '?' is found after a
-	<esc>[.
-
-Tue Dec  5 17:06:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (cygwin_rexec): Eliminate superfluous call to
-	`set_socket_inheritance'.
-	* include/sys/socket.h: Add SUS defines for option values to `shutdown'.
-
-Sun Dec 10 17:19:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sysexits: New file.
-
-2000-12-09  Egor Duda <deo@logos-m.ru>
-
-	* autoload.cc: Autoload CharToOemA.
-	* dcrt0.cc (dll_crt0_1): Translate command line to OEM if current
-	codepage is OEM.
-	* environ.cc: Add new option 'codepage' to CYGWIN environment variable.
-	* fhandler_clipboard.cc (fhandler_clipboard::read): Read clipboard in
-	OEM mode if current codepage is OEM.
-	* fhandler_console.cc (fhandler_console::read): Only translate console
-	input if current codepage is ANSI.
-	* fhandler_console.cc (fhandler_console::write_normal): Translate
-	output data if current codepage is ANSI.
-	* pinfo.cc (codepage_init): New function.  Setup current codepage from
-	CYGWIN environment variable and set codepage for file APIs.
-	* security.cc (read_sd): Translate file name to it if current codepage
-	is OEM.
-	* winsup.h: (sys_wcstombs,sys_mbstowcs): Use current codepage for
-	translations between multibyte and widechar string and vice versa.
-
-Sat Dec  9 16:29:45 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_win32_path): Check for explicit use of two slashes
-	at the beginning of a path.  These should be treated specially
-	regardless of whether they are UNC paths or old-style //a paths.  Avoid
-	adding cwd to a path if the path already begins with '/'.
-
-Fri Dec  8 22:21:01 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_win32_path): Reorganize logic to accommodate
-	chroot.  Always check for MAX_PATH overrun.  Avoid adding one too many
-	backslashes when src path begins with a slash.  From Corinna Vinschen.
-	* winsup.h: Force demangling for dll_crt0 for newer compilers.
-
-Thu Dec 7 12:10:00 2000  Edward M. Lee  <tailbert@yahoo.com>
-
-	* cygwin.din: Declare strtok_r for the import lib. Already in the DLL.
-
-Wed Dec 6 15:39:18 2000  Earnie Boyd  <earnie_boyd@yahoo.com>
-
-	* include/sys/uio.h (readv): Correct prototype.
-	(writev): Ditto.
-
-Tue Dec  5 17:06:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/sys/uio.h: Include <sys/cdefs.h>. Use __BEGIN_DECL and
-	__END_DECL.
-	Add declarations for `readv' and `writev'.
-
-Mon Dec  4 20:49:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* Makefile.in: Change `-nostartfiles' to `-nostdlib' to avoid
-	automatic linking with default libraries when linking new-cygwin1.dll.
-	Link with libgcc.a and libstdc++.a explicitly.
-
-Sun Dec  3 01:20:25 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_win32_path): Handle UNC paths better.
-	(slash_unc_prefix_p): Allow backslash UNC paths.
-
-Sun Dec  3 00:20:25 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Remove some extra cruft.
-
-Sun Dec  3 00:13:26 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Use CXX to build the DLL.
-	* configure.in: Find correct c++ compiler.
-	* configure: Regenerate.
-	* path.cc (normalize_posix_path): Put correct drive at beginning of \foo style paths.
-	(chdir): Don't send non-posix path to cygcwd.set.
-
-Sat Dec  2 22:26:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (get_inet_addr ): Close AF_UNIX socket file after reading.
-
-Wed Nov 29 18:25:53 2000  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* cygheap.cc (chgheap_root::operator =): Check root dir properly.
-
-Thu Nov 29 18:11:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (cygwin_inet_aton): Return nonzero if the address
-	is valid, zero if not according to Linux man page.
-
-Mon Nov 27 21:09:50 2000  Kelley Cook <kelley.cook@home.com>
-
-	* mmap.cc (munmap): Check that mmap and munmap length match.
-
-Tue Nov 28 18:08:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::open): Check for buggy CreateFile
-	condition.
-	* path.cc (path_conv::check): Get file system type in call to
-	GetVolumeInformation to check for file systems with buggy CreateFile.
-	* path.h (enum path_types): Add PATH_HASBUGGYOPEN.
-	(class path_conv): Add methods `has_buggy_open' and
-	`set_has_buggy_open'.
-
-Sun Nov 26 16:26:14 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (is_at_eof): New function.
-	(fhandler_base::raw_read): Detect special case where last error ==
-	ERROR_NOACCESS but the file is at EOF.  Most UNIXes do not consider
-	this to be an error.
-
-Sun Nov 26 14:37:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump DLL minor version number to 7.
-
-Sat Nov 25 11:27:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/cygwin/version.h: Bump minor API version due to adding
-	inet_aton.
-
-Sat Nov 25 11:07:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (cygwin_inet_aton): New function.
-	* cygwin.din: Export cygwin_inet_aton as inet_aton.
-
-Sat Nov 25 01:57:42 2000  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* path.cc (mount_info::read_cygdrive_info_from_registry): Read system
-	cygdrive prefix with KEY_READ.
-	(mount_info::get_cygdrive_info): Ditto.
-
-Wed Nov 22 11:18:02 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: new-temp.a -> new-templib.a
-
-Mon Nov 20 17:04:43 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Quoting was still wrong.  Keep trying to
-	fix it.
-
-Mon Nov 20 14:26:38 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): YA tweak for dealing with arcane rules of
-	quoting in "normal" Microsoft programs.
-	* child_info.h: Bump fork magic number.
-	* include/sys/mount.h: Add an entry for mixed mode.
-
-Fri Nov 17 12:28:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (normalize_posix_path): Special care for root directory
-	in case of files beginning with a dot.
-
-Fri Nov 17 12:28:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syslog.cc (syslog): Add users SID to NT syslog entry.
-
-Thu Nov 16 15:59:58 2000 Bradley A. Town <townba@pobox.com>
-
-	* fhandler_console.cc: New member variable `dwBufferSize' for `info'.
-	(fillin_info): Set `dwBufferSize' to the size of the console buffer.
-	(clear_screen): Use width of console buffer to calculate how many
-	spaces to clear.
-
-Thu Nov 16 15:24:45 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Make import library creation 'make -j2' friendly.
-
-Thu Nov 16 10:28:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* uinfo.cc (uinfo_init): Call `cygwin_set_impersonation_token' to
-	reset `cygheap->user.token' to INVALID_HANDLE_VALUE.
-
-Thu Nov 16 00:18:15 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interrupt_setup): Don't set signal mask here or races
-	occur with main thread.  Set it in sigdelayed instead.
-	(sigreturn): Reflect change in stack order of ebp and flags.
-	(sigdelayed): Set stack frame correctly.  Call set_process_mask here
-	with flags for last trapped signal.
-	(signal_dispatch): Add newmask.
-	* sigproc.cc (wait_sig): Eliminate ill-considered attempt to halt
-	looping signal processors.
-	* perthread.h (signal_dispatch): Add newmask field.
-
-Wed Nov 15 22:08:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* uinfo.cc (internal_getlogin): Change parameter list to reflect
-	that `token' is member of cygheap_user now.
-	(uinfo_init): Use modified internal_getlogin.
-	* syscalls.cc (seteuid): Ditto.
-
-Wed Nov 15 21:56:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygheap.h: Move `token' and `impersonated' from class _pinfo
-	to class cygheap_user.
-	* pinfo.h: Ditto.
-	* fork.cc (fork_child): Change usage of `token' and `impersonated'
-	accordingly.
-	(fork_parent): Ditto.
-	* security.cc (cygwin_set_impersonation_token): Ditto.
-	* sigproc.cc (proc_subproc): Ditto.
-	* spawn.cc (spawn_guts): Ditto.
-	* syscalls.cc (seteuid): Ditto.
-	* uinfo.cc (uinfo_init): Ditto.
-
-Wed Nov 15  9:59:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* spawn.cc (spawn_guts): Revert patch to ignore chroot settings
-	on creating native Win32 environment.
-
-Wed Nov 15 01:44:37 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (slow_pid_reuse): Off-by-one.
-
-Wed Nov 15 01:20:24 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout use myself->ppid_handle rather than parent_alive.
-	* child_info.h (child_info): Eliminate parent_alive.
-	* dcrt0.cc (dll_crt0_1): Call fork_init for debugging pid creation.
-	* fork.cc (fork_child): Reflect change to fixup_mmaps_after_fork
-	arguments.
-	(slow_pid_reuse): New function to grab last 'n' pids to prevent pid
-	reuse.
-	(fork_parent): Move last_fork_proc into slow_pid_reuse.
-	fork_pids debugging.  Eliminate unnecessary call to set_child_mmap_ptr.
-	(fork_init): New debugging function.
-	* mmap.cc (fixup_mmaps_after_fork): Renamed from
-	recreate_mmaps_after_fork.  Rely on copied data after a fork.
-	(set_child_mmap_ptr): Eliminate.
-	* pinfo.h (_pinfo): Eliminate parent_alive, mmap_ptr and reflect above
-	changes.
-	* spawn.cc (spawn_guts): Eliminate vestiges of "old way" of sending new
-	hProc to parent process.
-
-Wed Nov 15  0:51:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygheap.cc (cygheap_root::cygheap_root): New function.
-	(cygheap_root::~cygheap_root): Ditto.
-	(cygheap_root::operator=): Ditto.
-	(cygheap_user::~cygheap_user): Ditto.
-	(cygheap_user::set_name): Ditto.
-	(cygheap_user::set_logsrv): Ditto.
-	(cygheap_user::set_domain): Ditto.
-	(cygheap_user::set_sid): Ditto.
-	* cygheap.h (cygheap_root): New class.
-	(cygheap_user): Ditto.
-	(init_cygheap): Change type of `root' member to cygheap_root.
-	Add `user' member.
-	* dir.cc (opendir): Use new `cygheap_root' class.
-	* dcrt0.cc (dll_crt0_1): Use new `cygheap_user' class.
-	* fork.cc (fork_parent): Ditto.
-	* grp.cc (getgroups): Ditto.
-	* passwd.cc (search_for): Ditto.
-	* path.cc: Use new `cygheap_root' class throughout.
-	* pinfo.h (_pinfo): Remove `use_psid'. Move `username', `psid',
-	`logsrv', `domain', `orig_{uid,gid}' and `real_{uid,gid}' to
-	cygheap_user class.
-	* security.cc: Use new `cygheap_user' class throughout.
-	* shared.cc (sec_user): Ditto.
-	* sigproc.cc (proc_subproc): Remove copy statements for user
-	related information moved to `cygheap_user' class.
-	* spawn.cc (spawn_guts): Invalidate current chroot settings
-	when creating Windows environment. Use new `cygheap_user' class.
-	* syscalls.cc: Use new `cygheap_user' class throughout.
-	* uinfo.cc: Ditto.
-	(internal_getlogin): Change parameters to reflect the
-	move of user information to cygheap.
-
-Tue Nov 14 17:05:00 2000  Eric Fifer <efifer@dircon.co.uk>
-
-	* dir.cc (rewinddir): Always set __d_position = 0, so next
-	call to readdir() will restart the directory scan.
-
-Tue Nov 14 00:51:28 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.h (init_cygheap): New struct holding values that live in the
-	Cygwin heap.
-	* child_info.h (child_info): Change pointer type of cygheap to
-	init_cygheap.
-	* cygheap.cc (init_cheap): Point cygheap_max after contents of cygheap.
-	Move some stuff into cygheap.h.
-	* dir.cc (opendir): Change to use root and rootlen in cygheap rather
-	than in myself.
-	(mkdir): Change to use umask in cygheap rather than in myself.
-	* path.cc: Ditto, throughout.
-	* syscalls.cc (_open): Ditto.  Change to use umask in cygheap rather
-	than in myself.
-	(chroot): Change to allocate root dir on the cygwin heap.
-	(umask): Change to use umask in cygheap rather than in myself.
-	(cygwin_bind): Ditto.
-	* sigproc.cc (proc_subproc): Don't copy umask or root stuff as this
-	happens automatically now.
-	* pinfo.h (_pinfo): Migrate stuff out of here and into init_cheap.
-	* dcrt0.cc (dll_crt0_1): Call cygheap_init later in startup for first
-	cygwin process.
-
-Sun Nov 12 23:01:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (get_device_number): Allow /dev/ttySn to designate a com
-	port.
-
-Sat Nov 11 23:55:19 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.h: Add __attribute__ ((regparm(x))) to commonly used functions.
-	* pinfo.h: Ditto.
-	* sigproc.h: Ditto.
-	* sync.h: Ditto.
-
-Fri Nov 10 13:48:44 2000 Bradley A. Town <townba@pobox.com>
-
-	* dcrt0.cc: New global variable `ignore_case_with_glob'.
-	(dll_crt0_1): Disable case-insensitive globbing before calling `main'.
-	* environ.cc (glob_init): New static function to set or clear
-	`ignore_case_with_glob'.
-	(known): Changed "glob" entry to call `glob_init'.
-	* glob.c (match): Use case-insensitive globbing if needed.
-
-Thu Nov  9 14:30:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* dir.cc (readdir): Avoid reading from the beginning when
-	readdir is called after a previous call has returned NULL.
-
-Wed Nov  8 21:00:31 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (peek_pipe): Deal with pending newline in pty_master.
-
-Wed Nov  8 15:35:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (_addenv): malloc space for setenv if cygwin1.dll is used
-	in conjunction with older binaries.
-	(environ_init): Ditto.
-
-Wed Nov  8 08:49:27 2000 Jason Tishler <jt@dothill.com>
-
-	* external.cc (get_cygdrive_info): New function.
-	* external.cc (get_cygdrive_prefixes): Change to use get_cygdrive_info
-	but toss the user and system flags.
-	* external.cc (cygwin_internal): Add new CW_GET_CYGDRIVE_INFO case.
-	* path.cc (mount_info::get_cygdrive_prefixes): Remove method.
-	* path.cc (mount_info::get_cygdrive_info): New method.  Actually,
-	get_cygdrive_info is really an enhanced version of
-	get_cygdrive_prefixes renamed to get_cygdrive_info that also gets the
-	user and system flags.
-	* shared_info.h (get_cygdrive_prefixes): Remove method.
-	* shared_info.h (get_cygdrive_info): New method.
-	* include/cygwin/version.h: Bump minor API version due to adding
-	CW_GET_CYGDRIVE_INFO to cygwin_internal.
-	* include/sys/cygwin.h (cygwin_getinfo_types): Add
-	CW_GET_CYGDRIVE_INFO.
-
-Tue Nov  7 20:58:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: Add autoload statement for `WSASetLastError'.
-	* net.cc (cygwin_connect): Change error code to WSAEINPROGRESS
-	when connect returns WSAEWOULDBLOCK.
-
-Mon Nov  6 15:11:57 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (sigthread::init): Reinstitute sigthread lock as a critical
-	section.
-	(dll_crt0_1): Move sigthread lock initialization to earlier in startup.
-	* exceptions.cc (interrupt_on_return): Remove previous kludgy attempt
-	to detect an invalid frame.
-	(call_handler): Eliminate inner for loop.  Grab signal critical section
-	lock where appropriate.
-	* sigproc.cc (proc_subproc): Restore uid setting.
-	* sigproc.h (sigthread): Reinstitute sigthread lock as a critical
-	section.
-	(sigframe): Grab the sigthread lock before clearing frame to avoid
-	having the signal thread use an invalid frame.
-
-Mon Nov  6 11:11:42 2000 Jason Tishler <jt@dothill.com>
-
-	* path.cc (mount_info::read_cygdrive_info_from_registry): Use
-	CYGWIN_INFO_CYGDRIVE_PREFIX, CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX, and
-	CYGWIN_INFO_CYGDRIVE_FLAGS.
-	* path.cc (mount_info::write_cygdrive_info_to_registry): Use
-	CYGWIN_INFO_CYGDRIVE_PREFIX and CYGWIN_INFO_CYGDRIVE_FLAGS.
-	* path.cc (mount_info::remove_cygdrive_info_from_registry): Ditto.
-	* path.cc (mount_info::get_cygdrive_prefixes): Use
-	CYGWIN_INFO_CYGDRIVE_PREFIX.
-	* include/cygwin/version.h: Add CYGWIN_INFO_CYGDRIVE_FLAGS,
-	CYGWIN_INFO_CYGDRIVE_PREFIX, and CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX.
-
-Mon Nov  6 11:10:44 2000  Jason Tishler <jt@dothill.com>
-
-	* errno.cc (strerror): Change EAGAIN case to return "Resource
-	temporarily unavailable" instead of "No more processes".
-
-Mon Nov  6 01:04:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* child_info.h (child_info): Add pppid_handle for closing the parent's
-	parent handle.
-	* dcrt0.cc (_dll_crt0): Close parent's parent handle when spawned or
-	forked.
-	* debug.cc (add_handle): Correct erroneous reference to handle
-	structure when printing warning.
-	* exceptions.cc (interrupt_now): Always return 1.
-	(interrupt_on_return): Accept a sigthread argument.  Check to see if
-	this argument has been trashed prior to setting up the stack return.
-	(call_handler): Add a loop around attempts to dispatch signals to
-	detect case where interrupt_on_return fails.
-	(_sigdelayed): Set up a temporary frame pointer prior to calling stuff
-	that could trigger an interrupt or the stack walking code will be very
-	confused.
-	* fork.cc (fork_parent): Move a lot of the setup of the child process
-	into proc_subproc.
-	* spawn.cc (spawn_guts): Ditto.  Use ppid_handle to contact logical
-	parent when reparenting execed process.
-	* pinfo.h (_pinfo): Remember the logical handle of the parent process.
-	* sigproc.cc (proc_subproc): Record most stuff necessary for the _pinfo
-	structure that is inferrable from myself when adding children.
-	(wait_sig): Always set 'pending_signals' flag when about to kick off
-	the signal scanning loop.  Reset it only if there are no pending
-	signals.
-
-Sun Nov  5 13:46:23 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo (wait_subproc): Son of neverending debug tweaking.
-
-Sun Nov  5 11:45:15 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo (wait_subproc): Neverending debug tweaking.
-
-Sun Nov  5 01:34:51 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (winpids:add): New method.
-	(winpids::enumNT): New method renamed from EnumProcessesNT.
-	Use add method to add elements to the lists.
-	(winpids::enum9x): New method renamed from EnumProcesses9x.
-	Use add method to add elements to the lists.
-	(winpids::enum_init): Accept 'winpid' parameter to control whether
-	to add all windows pids to the list.
-	(winpids::release): New method.
-	* pinfo.h (winpids): Reflect above changes.
-	* signal.cc (kill_pgrp): Ditto.
-	* external.cc (fillout_pinfo): Ditto.
-
-Sat Nov  4 22:07:03 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_sigsuspend): Record frame here for signalling.
-	(set_process_mask): Ditto.
-
-Sat Nov  4 14:24:10 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (wait_subproc): Still more debugging cleanup.
-
-Sat Nov  4 00:51:38 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (EnumProcessesNT): Avoid 0 pids.
-	(EnumProcesses9x): Ditto.
-	* sigproc.cc (remove_child): Eliminate.
-	(proc_subproc): Move remove_child stuff here.
-	(wait_subproc): Synchronize with proc_subproc when error occurs.  Add
-	more debugging info.
-	* sigproc.h (procstuff): Add an entry.
-	* spawn.cc (spawn_guts): Add sigframe here.
-
-Fri Nov  3 20:07:14 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (wait_subproc): Refine debug output.
-
-Thu Nov  2 23:01:20 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (pinfo::init): Reverse order of setting status and pid info
-	in an execed process to avoid a race.
-	* sigproc.cc (wait_subproc): Print more info when a WFSO error occurs.
-	* automode.c: New file.
-	* syscalls.cc (close_all_files): Streamline slightly.
-	* cygheap.cc (ccalloc): Clear *entire* allocated array.
-
-Thu Nov  2 01:58:03 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* ntdll.h: Remove IO_COUNTERS definition since it is now in winnt.h.
-
-Thu Nov  2 00:10:23 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (EnumProcessesNT): New function.  Eliminates dependence on
-	psapi.h.
-	(EnumProcesses9x): Rename from EnumProcessesW95.  Change arguments to
-	be more useful for cygwin.
-	(winpids::init): Accommodate argument changes.
-	(enum_init): Ditto.
-	* pinfo.h (winpids): Make pidlist dynamically extendable by storing it
-	as a pointer and remembering the size.
-	* ntdll.h: Add extra definitions needed for EnumProcessesNT.  Reformat
-	via 'indent'.
-
-Wed Nov  1 21:08:23 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interruptible): Remove obsolete tests.
-	(sigreturn): Construct pseudo-frame-pointer so that signal handler can
-	figure out where to put return address when signals are coming in
-	quickly.
-	* path.cc (cwdstuff::get): Allow length 0 buffer length when buffer
-	when NULL.
-
-Tue Oct 31 18:12:56 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.h (has_exec_chars): Standard function for checking for
-	executable magic numbers.
-	* path.cc (symlink_info::check): Use the above function.
-	* fhandler.cc (fhandler_disk_file::open): Ditto.
-
-Tue Oct 31 17:57:52 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (_readlink): Return ENOENT when file does not exist.
-
-Tue Oct 31 23:35:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (fhandler_dev_raw): Add method `fixup_after_exec'.
-
-Tue Oct 31 22:39:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (fhandler_dev_raw): Add definition for method
-	`fixup_after_fork'.
-	* fhandler_raw.cc (fhandler_dev_raw::fhandler_dev_raw): Add
-	`set_need_fixup_after_fork' call.
-	(fhandler_dev_raw::~fhandler_dev_raw): Revert to user space
-	allocation.
-	(fhandler_dev_raw::open): Ditto.
-	(fhandler_dev_raw::dup): Ditto. Reset buffer pointer.
-	(fhandler_dev_raw::fixup_after_fork): New function.
-	* fhandler_tape.cc (fhandler_dev_tape::open): Revert to user space
-	memory allocation.
-	(fhandler_dev_tape::ioctl): Ditto. Change behaviour on MTSETBLK when
-	new size is 1.
-
-Tue Oct 31 20:56:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_tape.cc (fhandler_dev_tape::open): Fix memory allocation.
-	Use Cygwin heap instead of user heap.
-	(fhandler_dev_tape::ioctl): Ditto.
-
-Tue Oct 31 12:00:06 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (enum_init): Don't suffer silently if we can't load the
-	process enumerators.
-
-Mon Oct 30 16:54:26 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* signal.cc (kill_pgrp): Revert 25-Oct change.
-	(kill_worker): Ditto.
-
-Sun Oct 29 20:52:31 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump DLL minor version number to 6.
-
-Sat Oct 28 01:39:53 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Eliminate subdir stuff.
-	* configure: Regenerate.
-	* include/getopt.h (option): Make name field 'const'.
-
-Fri Oct 27 20:51:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: New file keeping all autoload stuff.
-	* Makefile.in: Add autoload.o to dependencies.
-	* dcrt0.cc: Move all autoload stuff to autoload.cc.
-	* fhandler_mem.cc: Ditto.
-	* net.cc: Ditto.
-	* uinfo.cc: Ditto.
-
-Fri Oct 27 11:37:20 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (wait_sig): Add braces to avoid confusion.
-
-Fri Oct 27 11:48:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_socket.cc: New file.
-	* Makefile.in: Add fhandler_socket.o to dependencies.
-	* fhandler.h: Change comment.
-	* net.cc Move all fhandler_socket methods to fhandler_socket.cc.
-	* winsup.h: Add declaration for `ws2_32_handle'.
-
-Thu Oct 26 11:51:59 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* dtable.cc (dtable::release): Check for socket. Change
-	cnt_need_fixup_before accordingly.
-	(dtable::dup2): Ditto.
-	(dtable::fixup_before_fork): New method.
-	(dtable::fixup_before_exec): Ditto.
-	* dtable.h (class dtable): Add member `cnt_need_fixup_before'. Add
-	definition for methods `dec_need_fixup_before', `inc_need_fixup_before',
-	`need_fixup_before', `fixup_before_exec' and `fixup_before_fork'.
-	* fhandler.h (class fhandler_base): Slight rearrangements. Add
-	definitions for methods `fixup_before_fork_exec'.
-	(class fhandler_socket): Eliminate superfluous constructor.
-	Add member `prot_info_ptr'. Add destructor. Add definitions for
-	methods `dup', `fixup_before_fork_exec', `fixup_after_fork' and
-	`fixup_after_exec'.
-	* fork.cc (fork_parent): Care for file types which need a fixup
-	before fork. Start child in suspended state then.
-	* net.cc: New global variable `ws2_32_handle' and `wsadata'.
-	(fdsock): Check for Winsock version. Call `set_socket_inheritance'
-	only if Winsock version < 2.0. Care for `need_fixup' count in fdtab.
-	(cygwin_socket): Eliminate call to `set_socket_inheritance'.
-	(cygwin_accept): Ditto.
-	(cygwin_rcmd): Ditto.
-	(cygwin_rresvport): Ditto.
-	(cygwin_rexec): Ditto.
-	(socketpair): Ditto.
-	(fhandler_socket::fhandler_socket): Set `need_fork_fixup'. Allocate
-	space for the WSAPROTOCOL_INFOA struct used in fixup.
-	(fhandler_socket::~fhandler_socket): New destructor.
-	(fhandler_socket::fixup_before_fork_exec): New method.
-	(fhandler_socket::fixup_after_fork): Ditto.
-	(fhandler_socket::dup): Ditto.
-	(wsock_init): New static function.
-	(LoadDLLinitfunc (wsock32)): Rearranged.
-	(LoadDLLinitfunc (ws2_32)): New function.
-	(dummy_autoload): Add autoload statemants for `WSADuplicateSocketA'
-	and `WSASocketA'.
-	* spawn.cc (spawn_guts): Care for file types which need a fixup
-	before exec. Start child in suspended state then.
-
-Wed Oct 25 20:49:59 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* signal.cc (kill_pgrp): Don't limit sending of signals to stopped
-	processes when sig < 0.
-	(kill_worker): Only send SIGCONT to stopped processes when sendSIGCONT.
-
-Wed Oct 25 13:56:39 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sig_handle): Just make sure that wait_sig loops when
-	receiving a SIGCONT.  Don't block waiting for completion that will
-	never occur.
-
-Wed Oct 25 09:59:14 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dtable.cc (dtable::fixup_after_exec): Use variable rather than
-	constantly indexing into fds array.
-	(dtable::fixup_after_fork): Ditto.
-
-Wed Oct 25 10:43:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::fcntl): Treat O_NONBLOCK and OLD_O_NDELAY
-	as exactly the same. If one is set, both are set.
-	* net.cc (fhandler_socket::fcntl): Ditto.
-
-Tue Oct 24 23:58:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_exit): Remove debugging statement.
-
-Tue Oct 24 23:45:09 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (do_exit): Don't bother looking for pgrp children to send
-	SIGHUP if process has never created any children.
-	* fork.cc (fork): Set flag indicating that there is another process
-	with our process group.
-	* spawn.cc (spawn_guts): Ditto.
-	* pinfo.h (set_has_pgid_children): New methods for setting when process
-	has children in its process group.
-	* syscalls.cc (setpgid): Clear has_gid_children if pgid changes.
-
-Tue Oct 24 20:38:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* ntdll.h: New file.
-	* fhandler_mem.cc: Move ntdll.dll specific definitions and
-	declarations to ntdll.h.
-	* sysconf.cc (sysconf): Add support for _SC_NPROCESSORS_CONF,
-	_SC_NPROCESSORS_ONLN, _SC_PHYS_PAGES and _SC_AVPHYS_PAGES.
-
-Tue Oct 24 20:00:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::fcntl): Behave properly when passed
-	previous version of O_NDELAY.
-	* syscalls.cc: Move OLD_O_NDELAY to winsup.h.
-	* winsup.h: Define OLD_O_NDELAY now.
-
-Mon Oct 23 21:47:55 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (signal_exit): Kill any executing child process if
-	we're dying.
-	* path.h: Remove unneeded extern.
-	* spawn.cc (std_suffixes): Make static.  Don't set dwProcessId here
-	since it makes the process unsignalable.  Set strace flag that this is
-	an execed process stub.
-	* strace.cc (strace::vsprntf): Use strace flag to indicate when to
-	visually flag that this is an exec stub.
-	* include/sys/strace.h (strace): Add 'execing' flag.
-
-Mon Oct 23 16:43:33 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (proc_subproc): Don't send a false positive if WNOHANG and
-	no processes are available for waiting.
-
-Mon Oct 23 22:27:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::fcntl): Setting flags in F_SETFL
-	branch according to Linux documentation.
-
-Mon Oct 23 21:43:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fcntl.cc (_fcntl): Rearrange as wrapper function. Move all
-	functionality except F_DUPFD to fhandler classes.
-	* fhandler.cc (fhandler_base::fcntl): New method.
-	* net.cc (fhandler_socket::fcntl): Ditto.
-	* fhandler.h (class fhandler_base): Add method prototype for fcntl().
-	(class fhandler_socket): Ditto.
-
-Mon Oct 23 12:44:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (proc_subproc): Correctly handle flags for WNOHANG case.
-
-Mon Oct 23 10:00:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc: Eliminate C++ comments throughout.
-
-Sun Oct 22 23:33:00 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (fork): Set sigframe here, since it can pause for a
-	considerable amount of time.
-	* environ.cc (_addenv): Add debugging.
-	* fhandler.cc: Eliminate unneeded include.
-	* smallprint.c: Ditto.
-
-Sun Oct 22 12:07:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* pinfo.cc (pinfo_init): Eliminate call to `set_process_privileges'.
-	* security.cc (write_sd): Call `set_process_privileges' on the first
-	call to `write_sd'.
-	(set_process_privileges): Eliminate adjusting SE_BACKUP_NAME privilege.
-
-Sat Oct 21 16:57:23 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (pinfo::init): Make PID_EXECED signal creation as well as
-	PID_IN_USE.
-
-Sat Oct 21 01:52:54 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Don't do the reparenting step if we notice
-	that the child has exited prior to sending the subprocess_ready signal
-	(?).
-
-Sat Oct 21 00:46:36 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_console): Remove tcsetpgrp.
-	* fhandler_console.cc (fhandler_console::tcsetpgrp): Eliminate.
-	* fork.cc (fork_parent): Avoid returning same pid twice in a row
-	regardless of OS.
-	* pinfo.cc (pinfo::init): Rename create argument to flags and treat it
-	as such.
-	* signal.cc (set_sigcatchers): New function.
-	(signal): Use set_sigcatchers to increment or decrement sigcatcher
-	tracker.
-	(sigaction): Ditto.  Add debugging output.
-	* spawn.cc (spawn_guts): Always quote first argv[0] argument when it's
-	a COMSPEC shell.
-
-2000-10-20  DJ Delorie  <dj@redhat.com>
-
-	* times.cc (to_time_t): pass zero time as epoch
-	* fhandler.cc (fstat): copy atime/ctime from mtime if they're zero
-
-Thu Oct 19 23:31:41 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* external.cc (fillout_pinfo): Pass PID_NOREDIR flag to pinfo init to
-	avoid finding execed processes twice.
-	* signal.cc (kill_pgrp): Ditto.
-	* spawn.cc (spawn_guts): Avoid passing first argument to CreateProcess
-	when running a windows shell so that CreateProcess will locate the
-	shell.  Reorganize so that correct error is returned when CreateProcess
-	fails.
-
-Thu Oct 19 13:55:31 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (sigthread::init): Correct overzealous ifdef.
-	* exceptions.cc (call_handler): Avoid calling sigthread acquire lock.
-	* sigproc.h (sigthread): Comment out lock for now.
-	* sync.cc (muto::acquire): Add a minor optimization.
-
-2000-10-18  DJ Delorie  <dj@redhat.com>
-
-	* Makefile.in: add miscfuncs.cc
-	* miscfuncs.cc: new, miscellaneous functions
-	* winsup.h: define table-driven tolower/toupper
-	* environ.cc: use them
-	* fhandler_console.cc: ditto
-	* fhandler_termios: ditto
-	* path.cc: ditto
-	(strncasematch, strcasematch, strcasestr): move to miscfuncs.cc
-
-Wed Oct 18 20:50:27 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.h (sigthread): Eliminate locking for now since per thread
-	signalling is not available.
-	* dcrt0.cc (sigthread::init): Ditto.
-	(dll_crt0_1): Move set_process_privileges call (temporarily?) to
-	pinfo_init.
-	(pinfo_init): Only call set_process_privileges when allow_ntsec.
-
-2000-10-18  DJ Delorie  <dj@redhat.com>
-
-	* dcrt0.cc (dll_crt0_1): init cygcwd before forkee branch
-
-	* environ.cc (conv_start_chars): Cache a table of "first
-	characters" for environment variables needing conversion.
-	(getwinenv): Use it.
-	(environ_init): Create it, also check first chars for TERM and
-	CYGWIN.
-
-	* path.cc: Use lookup table for case insensitive comparisons.
-
-Wed Oct 18 00:48:49 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_handler): Make signal pending if sigsave.sig is
-	still active.
-	* syscalls.cc (_read): Don't clear errno.
-	* sigproc.cc (wait_sig): Don't scan the waiting process list after a
-	SIGCHLD if there are no zombies to reap.
-	* winsup.h: Use __builtin_strcmp.
-	* environ.cc (posify): Don't initialize len unless it is required
-	(from DJ Delorie <dj@redhat.com>).
-
-Tue Oct 17 14:50:31 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (proc_subproc): Remove unneeded test for correct process
-	in PROC_ADDCHILD.  Return 0 when terminated child has just been
-	reparented.
-	(wait_subproc): Only send SIGCHLD when proc_subproc returns != 0.
-	* strace.cc (strace::vsprntf): Only strip .exe extension from program
-	name.
-
-2000-10-16  Charles Wilson  <cwilson@ece.gatech.edu>
-
-	* fhandler_clipboard.cc: new file
-	* Makefile.in: include fhandler_clipboard.o in DLL_OFILES list.
-	* fhandler.h: add FH_CLIPBOARD to the devices enum.
-	(fhandler_dev_clipboard): new
-	* path.cc (windows_device_names): add "\\dev\\clipboard"
-	(get_device_number): check for "clipboard"
-	* dcrt0.cc: declare a few more functions from winuser.h
-	* dtable.cc (dtable::build_fhandler): check for FH_CLIPBOARD in
-	switch().
-
-Mon Oct 16 21:36:57 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc (add_handle): Issue warning on attempts to add the same
-	handle more than once.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Protect some handles.
-	(fhandler_tty_common::close): Use proper name when closing handles.
-	(fhandler_pty_master::close): Don't close to_slave or from_slave since
-	they've already been closed earlier in the function.
-	* sigproc.cc (proc_subproc): Don't protect vchild->hProcess.  Expect
-	that the caller will do this, instead.
-	* tty.cc (tty_list::terminate): Use proper name when closing handles.
-	(tty::make_pipes): Protect some handles.
-
-Mon Oct 16 18:37:22 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Remove some obsolete stuff.
-	* dcrt0.cc (dll_crt0_1): Call signal_fixup_after_exec where appropriate.
-	Set myself->uid from parent version.
-	Just use ThreadItem Init method.  Close or store hexec_proc as appropriate.
-	(_dll_crt0): Store user_data->forkee here so that proper tests can be made
-	subsequently.
-	(do_exit): Remove hExeced stuff.
-	* environ.cc (environ_init): Accept environ count as well as environ pointer.
-	* environ.h: Reflect above change.
-	* pinfo.cc (pinfo_init): Ditto.  Accept environ count.
-	(fixup_in_spawned_child): Remove.
-	* spawn.cc (spawn_guts): Move signal code to dll_crt0_1.  Don't suspend
-	execing process since it is no longer necessary.  Store envc.
-	* exceptions.cc (signal_fixup_after_exec): New function.
-	(call_handler): Remove hExeced test.
-	* child_info.h (cygheap_exec_info): Store envc as well as envp.
-	(child_info_spawn): Store hexec_proc so that it can be closed in child.
-	* path.cc (normalize_posix_path): Avoid intermediate use of temporary cwd buf.
-	(normalize_win32_path): Ditto.
-	(cwdstuff::get_initial): Always set lock.
-	* sigproc.h: Remove hExeced.
-	* strace.cc (strace::vsprntf): Modify to accommodate for lack of hExeced.
-	* thread.cc (MTinterface::Init): Merge Init1 and ClearReent into this method.
-	(MTinterface::Init1): Eliminate.
-	(MTinterface::ClearReent): Eliminate.
-	* thread.h: Reflect above changes.
-	* include/sys/strace.h (strace): Make microseconds() public.
-
-Sun Oct 15 21:54:52 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Make various functions 'regparm', throughout.
-	* pinfo.h (_pinfo): Inline simple signal manipulation functions.
-	Requires inclusion of thread.h which was removed from .cc files, where
-	appropriate.  throughout.
-	* pinfo.cc: Eliminate signal manipulation functions.
-	(_pinfo::exit): Calculate total rusage for exiting process here.
-	* cygheap.cc (size2bucket): Eliminate.
-	(init_buckets): Ditto.
-	(_cmalloc): Calculate size and bits in a loop rather than going through
-	a function call.
-	(_crealloc): Use stored array index to calculate allocated size.
-	* spawn.cc (spawn_guts): Use _pinfo exit method to exit, calculating
-	cpu usage.
-
-Sat Oct 14 21:24:16 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (set_console_handler): Don't allocate
-	console_handler_thread_waiter.  It is obsolete.
-	(ctrl_c_handler): Don't use console_handler_thread_waiter.
-	* path.cc (hash_path_name): Fix handling of relative names.  Make case
-	insensitive.
-	* path.h (suffix_info): Use initializers.
-	* pinfo.h (_pinfo): Avoid initializers for null case.
-	* resource.cc (fill_rusage): Zero rest of rusage structure.
-	* security.cc (set_process_privileges): Don't reopen parent process.
-	Just use hMainProc.
-	* signal.cc (signal): Track when a signal handler has been used.
-	(sigaction): Ditto.
-	* sigproc.cc (pchildren): Use default initializer.
-	(zombies): Ditto.
-	(sigproc_terminate): Avoid closing handles that will be closed on exit
-	anyway.
-	(wait_sig): Send signal to "parent" on EXECing, not FORKing.
-	(wait_subproc): Send SIGCHLD here rather than in proc_wait to avoid
-	potential muto conflicts.
-	* sigproc.h (sigthread): Don't initialize to zero.  It's the default.
-	* spawn.cc (spawn_guts): Fill in resources from exec parent prior to
-	termination.
-	* sync.h (muto): Don't initialize to zero.
-	* syscalls.cc (close_all_files): Use one lock around entire loop and
-	call fhandler close/release stuff directly.
-	(_read): Don't use ready_for_read if there are not signal handlers
-	active.
-
-Sat Oct 14 12:24:24 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Fix display of "title".
-	(do_exit): Use pinfo exit method to exit.
-	(__api_fatal): Ditto.
-	* exceptions.cc (signal_exit): Ditto.
-	* fork.cc (fork_child): Remove debugging stuff.  Use pinfo_fixup_after
-	fork in place of exec_fixup_after_fork.
-	* pinfo.cc (pinfo_fixup_after_fork): New method.
-	(pinfo_fixup_in_spawned_child): Ditto.
-	(_pinfo::exit): New method.
-	(_pinfo::init): Remove recursion.  Detect pathological case where pinfo
-	structure already exists for new pid.
-	* pinfo.h (_pinfo): Reorganize slightly.  Add new method and new
-	function declarations.
-	* sigproc.cc (proc_exists): Previous simplification was a little to
-	simple.  Try harder to detect if a process exists.
-	(proc_terminate): Use PID_EXITED setting to determine if process is
-	still around.
-	(WFSO): Remove debugging statement.
-	(WFMO): Ditto.
-	* spawn.cc (exec_fixup_after_fork): Eliminate.
-	(spawn_guts): Always set old_title to NULL.  Is it really needed?  Move
-	hexec_proc to pinfo.cc.  Call pinfo_fixup_in_spawned_child to eliminate
-	handle link after a spawn.
-	* include/sys/cygwin.h: Remove PID_NOT_IN_USE.  Add PID_EXITED.
-
-Sat Oct 14 10:54:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygwin.din: Add symbol hstrerror.
-	* net.cc: Change meaning of member `s' of struct host_errmap.
-	(set_host_errno): Fix error in loop condition.
-	(hstrerror): Ditto.
-	(herror): Add appropriate functionality.
-	* include/netdb.h: Add declaration of hstrerror.
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 29.
-
-Sat Oct 14 01:45:25 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (cygheap_fixup_in_child): Don't page round cygheap copied
-	from parent.
-	* dcrt0.cc (do_exit): Don't cleanup pinfo on exit.  That happens
-	automatically now.
-	* exceptions.cc (signal_exit): Ditto.
-	* fork.cc (fork_parent): Use stack_here value passed in from fork().
-	(fork): Figure out top of stack here and pass it to fork_parent.
-	* pinfo.cc (_pinfo::record_death): Eliminate.
-	* pinfo.h (_pinfo): Ditto.
-	* sigproc.cc (proc_exists): Simplify.
-	(proc_terminate): Ditto.
-	(remove_zombie): Don't cleanup pinfo stuff.
-	(wait_sig): Send subproc_ready signal whether execed or spawned.
-	* spawn.cc (spawn_guts): Always create subproc_ready event.  Use it for
-	both exec and spawn.
-	(_spawnve): Send proper mode to spawn_guts when mode != _P_OVERLAY.
-
-Thu Oct 12 23:11:05 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dtable.cc (dtable::fixup_after_fork): Revert thinko below.
-	* pinfo.cc (set_myself): Show pid in initial strace line.
-
-Thu Oct 12 17:58:03 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* child_info: Bump child_info "version".
-	(child_info): Move some fields from child_info_spawn to here.
-	* cygheap.cc: Make cygheap pointers NOCOPY.
-	* dcrt0.cc (dll_crt0_1): Copy cygwin heap here regardless of whether
-	we've been forked or execed.
-	* dtable.cc (dtable::fixup_after_fork): Just release close-on-exec fds.
-	* exceptions.cc (stackdump): Respond to C warning.
-	* fork.cc: Reorganize to minimize stack copying.
-	(fork_child): New function.
-	(fork_parent): Ditto.
-	(sync_with_child): Don't suspend the forkee.
-	(sync_with_parent): Ditto.  Make into a function.
-	* heap.cc (heap_init): Add some debugging output.
-	* path.cc (path_conv::check): Add an assertion.
-	(has_suffix): Ditto.
-	* security.cc (get_pw_sid): Defend against NULL.
-	* sigproc.cc (proc_subproc): Fix debugging output.
-	(wait_sig): Ditto.
-	* strace.cc: Make statics NO_COPY throughout.
-	(strace::vsprntf): Defend against NULL.
-
-Thu Oct 12 00:25:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* errno.cc (seterrno_from_win_error): Fix debugging output.
-	* fhandler.cc (fhandler_base::fstat): Move to inline method in
-	fhandler.h.
-	(fhandler_base::set_io_handle): Ditto.
-	* fhandler.h (fhandler_base): Make some methods inline.
-	* fhandler_console.cc (fhandler_console::write_normal): Make buffer
-	larger.
-	* sigproc.h (sigframe::sigframe): Actually use set ebp parameter
-	correctly.
-	* spawn.cc (spawn_guts): Set dwProcessId when exec'ing.  Just exit
-	immediately after reparenting.
-	* syscalls.cc: Sprinkle sigframe stuff throughout.
-	* wait.cc (wait4): Set signal frame here.
-
-Tue Oct 10 19:54:06 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (__api_fatal): Don't rely on small_printf to display errors.
-	Always display problems to the console, if possible.
-
-Tue Oct 10 15:21:10 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (cwdstuff::get): Set EINVAL when length is zero.
-
-Mon Oct  9 14:07:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::cygdrive_posix_path): Handle e:foo construction
-	correctly.
-
-Mon Oct  9 16:44:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_mem.cc (fhandler_dev_mem::fhandler_dev_mem):
-	Fix debug output.
-
-Mon Oct  9 15:58:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_mem.cc: Eliminate unused include statements.
-	(fhandler_dev_mem::fhandler_dev_mem): Check for 9X/ME.
-
-Mon Oct  9 15:11:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (fhandler_dev_mem): Erase member `init_phase' and
-	member function `init'.
-	* fhandler_mem.cc: Add typedefs for NT internal data types
-	`SYSTEM_INFORMATION_CLASS' and `SYSTEM_BASIC_INFORMATION'.
-	Add prototype for `NtQuerySystemInformation' function.
-	(fhandler_dev_mem::fhandler_dev_mem): Takes over initialization task
-	from `init'. Use `NtQuerySystemInformation' function to evaluate the
-	size of physical memory instead of interval search.
-	(fhandler_dev_mem::init): Eliminated.
-	(fhandler_dev_mem::open): Don't call `init'.
-	(fhandler_dev_mem::read): Eliminate check for `init_phase'.
-	(dummy_autoload): Add load statement for `NtQuerySystemInformation'.
-
-Sun Oct  8 22:38:40 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dtable.cc (set_std_handle): Use std_consts array to control
-	SetStdHandle settings.
-	(dtable::fixup_after_fork): Ditto.
-	* exceptions.cc (set_sig_errno): Remove some debugging output.
-	* path.cc (path_conv::check): Don't OR need_directory with flags sent
-	to symlink_info::check.
-	(symlink_info::check): Use PATH_ALL_EXEC to determine when a file is
-	executable.
-	* path.h (path_types): Add PATH_ALL_EXEC.
-	(isexec): Use PATH_ALL_EXEC so that cygexec types will be considered
-	executable.
-	* pinfo.h (_pinfo): Add a process handle that is kept open throughout
-	the life of a cygwin pid.
-	* sigproc.cc (proc_exists): Remove hopefully obsolete stuff.
-	(proc_subproc): Set up process handle that is kept open throughout the
-	life of a cygwin pid.  Reorganize PROC_WAIT stuff to use common code.
-	(proc_terminate): Close pid lifetime process handle.
-	(checkstate): Cleanup.
-	(stopped_or_terminated): Move zombie cleanup.
-	(remove_zombie): To here.
-	* spawn.cc (spawn_guts): Reorganize reparenting code for 1247th time.
-
-Sat Oct  7 13:59:15 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_base): Remove obsolete _rpos and _rsize
-	elements.
-	* fhandler.cc (fhandler_base::open): Ditto.
-	* fhandler.cc (fhandler_base::fhandler_base): Ditto.
-	(fhandler_base::read): Ditto.  Add more debugging output.  Don't issue
-	a \r when \r\n detected.
-	* pipe.cc (make_pipe): Streamline slightly.  Make debug output more
-	interesting.
-	* strace.cc (strace::vsprintf): Use __progname where appropriate to
-	distinguish strace output when exec'ing.
-
-Sat Oct  7 19:25:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (fhandler_dev_mem): Add methods mmap, munmap and msync.
-	Add `unit' member.
-	* fhandler_mem.cc (fhandler_dev_mem): Initialize `unit' as well.
-	(init): Care for differences between /dev/mem, /dev/kmem (not
-	implemented yet) and /dev/port.
-	(open): Change debug message to reflect the device.
-	(mmap): New function.
-	(munmap): Ditto.
-	(msync): Ditto.
-	(fstat): Use unit when setting st_dev in stat structure.
-	* mmap.cc (mmap): Handle MAP_ANONYMOUS flag.
-	Change error handling slightly.
-	* path.cc (get_device_number): Handle /dev/port.
-
-Fri Oct  6 23:21:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_read): Behave properly when passed previous version of
-	O_NDELAY.  Fix up debugging output.
-
-Thu Oct  5 20:34:48 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* net.cc (set_socket_inheritance): Rename from duplicate_socket.  Use
-	NT specific call when appropriate.
-	(__set_winsock_errno): Rename from set_winsock_errno.  Accept function
-	and line as arguments.
-	* path.cc (path_conv::check): Continue the neverending battle to make
-	cygwin properly understand that path specs ending in a slash require
-	that the path refer to a directory.  Windows does not do this by
-	default.
-	(symlink_info::check): Remove ENOTDIR test.  Move it to
-	path_conv::check.
-	* path.h: Remove obsolete constant.
-	* winsup.h (set_winsock_errno): New macro.
-
-Thu Oct  5 14:58:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h: Add mmap(), munmap() and msync() to fhandler_base
-	and fhandler_disk_file.
-	* mmem.cc (mmap): Eliminated device dependent implementation details.
-	These are moved to the appropriate fhandler class.
-	(munmap): Ditto.
-	(msync): Ditto.
-	(fhandler_base::mmap): New method.
-	(fhandler_base::munmap): Ditto.
-	(fhandler_base::msync): Ditto.
-	(fhandler_disk_file::mmap): Ditto.
-	(fhandler_disk_file::munmap): Ditto.
-	(fhandler_disk_file::msync): Ditto.
-
-Thu Oct  5 01:52:43 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* net.cc: General cleanup.
-	(fdsock): Return pointer to created fhandler_socket.
-	(cygwin_socket): Use pointer returned by fdsock.  Return correct errno
-	when fd < 0.
-
-Thu Oct  5 00:48:40 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interruptible): Add extra debugging.
-	* sigproc.h (wait_sig): Fill in frame pointer, by default, prior to
-	calling or suffer confusion due to September 7 change below.
-
-Wed Oct  4 23:10:27 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/netinet/tcp.h: Remove winsock.h include.
-	* include/sys/cygwin.h: Move windows specific reference within
-	conditional.
-
-Thu Oct  5  1:13:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/sys/mman.h: Add missing MAP_FAILED macro.
-
-Wed Oct  4 18:48:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (fhandler_dev_mem): Add method `init'. Add members
-	`mem_size' and `init_phase'.
-	* fhandler_mem.cc (init): New function to figure out the size of
-	the physical memory.
-	(open): Add checking for illegal flags. Change usage of access mode.
-	(write): Add intended functionality.
-	(read): Add parameter checking. Eliminate page size constant. Use
-	getpagesize() instead. Don't touch errno and don't create debug output
-	while init() is running.
-	(lseek): Add bounds checking. Fix SEEK_END.
-	(fstat): Eliminate page size constant. Use getpagesize() instead.
-	(dup): Add intended functionality.
-
-Mon Oct  2 22:15:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* dcrt0.cc: Add LoadDLLFunc statement for RegEnumValueA().
-	* net.cc: Change comments related to get_ifconf.
-	(get_2k_ifconf): Eliminate `type' variable. Eliminate `sa' parameter.
-	(get_nt_ifconf): Ditto.
-	(get_9x_ifconf): Ditto. Rewritten.
-	(get_ifconf): Change calls to OS specific functions.
-
-Mon Oct  2 15:15:01 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* signal.cc (sigaction): Allow new action == oldaction.
-
-Mon Oct  2 11:05:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_mem.cc: Load ntdll functions via autoload method.
-	(load_ntdll_funcs): Eliminated.
-
-Sun Oct  1 16:36:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_mem.cc (load_ntdll_funcs): Add missing __stdcall qualifiers.
-
-Sun Oct  1 22:20:39 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (cygheap_init): Born again function.
-	(_cmalloc): Reorganize to accommodate muto locking.
-	(_cfree): Use muto lock to avoid multi-thread problems.
-	* cygheap.h (incygheap): Just use cygheap_max to find upper cygwin heap
-	bounds.
-	* dcrt0.cc (dll_crt0_1): Reinstitute cygheap_init call.
-	* path.cc (getcwd): Just return cwdstuff::get result, allowing correct
-	handling of negative length.
-	(cwdstuff::get): Malloc a buffer if one is not available.
-
-Sun Oct  1  2:56:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* Makefile.in: Add fhandler_mem.o to the dependencies.
-	* dtable.cc (dtable::build_fhandler): Add case for FH_MEM.
-	* fhandler.h: Add FH_MEM device type.  Add class fhandler_dev_mem.
-	* fhandler_mem.cc: New file. Implementation of class fhandler_dev_mem.
-	* path.cc: Add /dev/mem to windows_device_names.
-	(get_device_number): Add FH_MEM type.
-
-Sat Sep 30 00:43:42 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (init_cheap): Set aside space for heap walk pointer.
-	(_csbrk): Make logic for detecting when to alloc cognizant of
-	initialization condition.
-	(_cmalloc): Use a structure to hold bucket size and heap chain pointer.
-	Store pointer to next freed block in bucket size location so that it
-	will be easy to see if a block is allocated.
-	(_cfree): Store pointer to next freed block in bucket size location.
-	(_crealloc): Use macro to retrieve bucket size.
-	(cygheap_init): Eliminate.
-	(cygheap_fixup_in_child): Add second argument to determine if we were
-	execed or not.  In execed case, walk the heap, cleaning up any orphaned
-	blocks.
-	* cygheap.h: Add a "MAX" value to cygheap_types.  Remove cygheap_init
-	declaration.  Accommodate new argument to cygheap_fixup_in child.
-	* fork.cc (fork): Accommodate extra argument to cygheap_fixup_in_child.
-	* dcrt0.cc (dll_crt0_1): Ditto.  Remove call to cygheap_init.
-
-Fri Sep 29 21:49:27 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (symlink_info::check): Set executable bit for a file if the
-	first two characters are 'MZ' to mirror spawn_guts check.
-
-Sat Sep 30 03:34:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* winsup.h: Add `winME' to os_type symbols.
-	* dcrt0.cc (set_os_type): Identify Windows ME systems.
-	* (host_dependent_constants::init): Care for winME.
-	* uname.cc (uname): Ditto.
-
-Thu Sep 28 01:46:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (get_ifconf): Code cleanup. Split. Call os dependent
-	subfunctions instead.
-	(get_9x_ifconf): New function for 9X systems, called by get_ifconf.
-	(get_nt_ifconf): New function for NT systems, called by get_ifconf.
-	(get_2k_ifconf): New function for W2K systems, called by get_ifconf.
-
-Wed Sep 27 01:10:07 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Attempt to accommodate archaic windows quoting
-	mechanism when dealing with '\' and '"'.
-
-Mon Sep 25 20:47:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (quoted): Fix problem where ' quoted strings were skipped.
-	* fhandler.h (fhandler_socket::~fhandler_socket): Delete declaration.
-	* net.cc: Remove unnecessary "number_of_sockets" usage.
-	(fhandler_socket::fhandler_socket): Ditto.
-	(fhandler_socket::~fhandler_socket): Delete definition.
-	* spawn.cc (spawn_guts): Force first argument passed to CreateProcess
-	as a command line to be windows style.
-
-2000-09-25  Christopher Faylor  <cgf@cygnus.com>
-
-	* spawn.cc (av::dup_maybe): Make function void rather than void *.
-	* environ.cc (environ_init): Remember to reparse CYGWIN if envp is
-	supplied.
-	* heap.cc (_sbrk): Remember frame for signal handling.
-	* syscalls.cc (read_handler): Eliminate.
-	(_read): Move read_handler code here.  Reorganize for one path through
-	'ready_for_read'.
-
-Tue Sep 19 09:46:36 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Use actual program argument passed in for
-	argv[0] as originally suggested by Kazuhiro Fujieda
-	<fujieda@jaist.ac.jp>.
-
-Mon Sep 18 23:17:19 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.h: Create new input path flag PATH_NEEDDIR.
-	* path.cc (path::check): Detect trailing slash before converting to
-	windows path.  Tell symlink_info::check to check for directory if one is
-	found.
-	(symlink_info::check): Set errno when path is not a directory if
-	pflags & PATH_NEEDDIR.
-
-Mon Sep 18 19:44:08 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::write): Correct typo which
-	caused resetting of windows error to ERROR_IO_DEVICE to be ignored.
-
-Mon Sep 18 17:15:37 2000  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* path.cc (mount_info::read_mounts): Don't delete mount entries of
-	which mount points have the cygdrive prefix.
-	* (mount_info::add_reg_mount): Properly catch errors on registry
-	operations.
-	* (mount_info::write_cygdrive_info_to_registry): Ditto.
-	* (mount_info::del_reg_mount): Cosmetic changes to be consistent
-	with other methods.
-	* (mount_info::add_item): Check arguments more precisely.
-	Increment nmounts only when registry operations succeed.
-
-Sun Sep 17 22:18:39 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interruptible): Return 0 if given an address in
-	uncommitted memory.
-
-2000-09-16  Egor Duda  <deo@logos-m.ru>
-
-	* signal.cc (sleep): If interrupted by signal, return the
-	requested time minus the time actually slept.
-
-Fri Sep 15 22:30:40 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_exceptions): Just "core dump" if SIGSEGV in
-	signal thread.
-	* external.cc (fillout_pinfo): Fix compiler warning.
-	* sigproc.h: Eliminate special asm naming for sig_dispatch_pending.
-	* sigproc.cc (sig_send): Remove debugging statements.
-
-Wed Sep 13 14:56:47 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (av): Hide 'calloced' field and limit cstrduping to class
-	methods only.
-	(spawn_guts): Use methods for manipulating most newargv stuff.
-
-2000-09-13  Egor Duda  <deo@logos-m.ru>
-
-	* child_info.h (child_info_spawn::~child_info_spawn): Avoid
-	memory leaks in cygheap.
-	* spawn.cc (spawn_guts): Ditto.
-
-Wed Sep 13 14:28:03 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (quoted): Return next character after a quoted string when
-	not doing special quote processing.  Also ensure that non-NULL is
-	returned in all circumstances.
-
-Wed Sep 13 10:26:16 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Ensure that argv[0] is correctly set to the
-	full path when a script is detected.  Suggested by Kazuhiro Fujieda
-	<fujieda@jaist.ac.jp>.
-
-Tue Sep 12 22:33:30 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* external.cc (fillout_pinfo): Handle explicit pids correctly.
-
-Tue Sep 12 14:37:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_posix_path): Fix more slashdot madness.
-
-Tue Sep 12 12:29:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Make clean target remove *.d.
-
-Mon Sep 11 13:19:15 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_posix_path): Correctly deal with a "." parameter.
-
-Sun Sep 10 20:23:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (init_cheap): Just use any old address for the cygwin
-	heap.
-	* exceptions.cc (signal_exit): Don't terminate the main thread.  Just
-	try to exit in this thread really quickly.
-	* signal.cc (kill_pgrp): Fix typo which caused pinfo structure to be
-	assigned incorrectly.
-
-Sun Sep 10 12:40:49 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Initialize thread and debug stuff before
-	handling exec/fork.
-	* dtable.cc (dtable::fixup_after_exec): Always clear out the read ahead
-	buffer whether closing or adjusting.
-	* path.cc (chdir): Avoid a compiler warning.
-
-Sat Sep  9 23:29:17 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (chdir): Use the full path for cwd_win32.  Consider attempts
-	to chdir to strings of dots > 2 to be an error.  Pass 'dir' argument to
-	cygcwd.set.
-	(cwdstuff::set): Need to treat arguments from chdir differently.
-	* path.h (cwdstuff): Add an argument to set.
-
-Fri Sep  8 11:50:09 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* lib/_cygwin_crt0_common.cc: Add missing header files.
-
-Thu Sep  7 23:07:21 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.h (sigframe::set): Eliminate second argument.  Default bp to
-	current frame pointer rather than using this within the function, which
-	is unstable when this method is not inlined.
-	* net.cc: Eliminate use of second argument to sigframe.set throughout.
-	* select.cc (cygwin_select): Ditto.
-	* sigproc.cc (sig_send): Ditto.
-
-Thu Sep  7 22:45:16 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Break out more header info into separate files.  Use appropriate
-	header files throughout.
-	* shared.h: Remove.
-	* cygwin_version.h: New file.
-	* delqueue.h: New file.
-	* environ.h: New file.
-	* host_dependent.h: New file.
-	* perprocess.h: New file.
-	* registry.h: New file.
-	* security.h: New file.
-
-Thu Sep  7 12:14:43 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Split out tty and shared_info stuff into their own headers and use
-	throughout.  Include sys/termios.h for files which need it.
-	* tty.h: New file.
-	* shared_info.h: New file.
-	* fhandler.h: Move inline methods that rely on tty stuff to
-	fhandler_console.cc.
-	* fhandler_tty.cc (fhandler_pty_master::process_slave_output): Set
-	output_done_event immediately after reading data to speed up tty output
-	processing.
-	(process_output): Set write_error to errno or zero.
-	(fhandler_tty_slave::write): Check previous write error prior to
-	writing to slave end of pipe.  This allows tty output to be slightly
-	less synchronous.
-	* fhandler_console.cc (fhandler_console::tcsetpgrp): Moved here from
-	fhandler.h.
-	(fhandler_console::set_input_state): Ditto.
-
-Wed Sep  6 21:11:13 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (signal_exit): Reset all mutos owned by the main
-	thread.
-	* fhandler.h: Define *_output_mutex macros for serializing tty output.
-	(fhandler_termios): Remove restart_output_event.  Define dummy output
-	mutex methods.
-	(fhandler_pty_master): Remove unneeded fixup_after_fork method.
-	* fhandler_termios.cc (fhandler_termios::line_edit): Acquire
-	output_mutex when CTRL-S is hit.  Release it on CTRL-Q.
-	* fhandler_tty.cc (fhandler_pty_master::process_slave_output): Remove
-	inappropriate OutputStopped test here.  Just use the output mutex.
-	(fhandler_pty_master::fhandler_pty_master): Remove obsolete reference
-	to restart_output_event.
-	(fhandler_tty_common::close): Ditto.
-	(fhandler_pty_master::set_close_on_exec): Ditto.
-	(fhandler_pty_master::fixup_after_fork): Delete.
-	* tty.cc (tty::common_init): Ditto.
-	* sync.cc (muto::reset): New method.
-	* sync.h: Declare above method.
-
-Wed Sep  6 16:56:38 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc: Add include file for proper definitions.
-	* spawn.cc: Ditto.
-	* winsup.h: Define cfree to avoid newlib pollution.
-
-Wed Sep  6 14:11:51 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in (CFLAGS): Ensure that -MD is always added even when
-	CFLAGS is overwritten.
-
-Wed Sep  6 02:40:12 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (cwdstuff::get_initial): Keep caching alive.
-	(mount_info::conv_to_win32_path): Fill out relative path in failing
-	case.
-
-Tue Sep  5 21:36:15 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_posix_path): Deal with error return from cygcwd.get.
-	(normalize_win32_path): Ditto.
-	(mount_info::conv_to_win32_path): Ditto.
-	(cwdstuff::get): Set buf to NULL on error.
-
-Tue Sep  5 17:49:34 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (readlink): 'max' should be a 'min' or we'll suffer
-	buffer overflow.
-
-Mon Sep  4 22:53:58 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (cwd_win32): Eliminate.
-	(cwd_posix): Eliminate.
-	(cwd_hash): Eliminate.
-	(cwdstuff::init): Rename from cwd_init.
-	(cwdstuff::fixup_after_exec): Rename from cwd_fixup_after_exec.
-	(cwdstuff::get): Rename from get_cwd_inner.
-	(normalize_posix_path): Eliminate cwd argument.  Just calculate when
-	necessary.
-	(normalize_win32_path): Ditto.
-	(mount_info::conv_to_win32_path): Eliminate cwd retrieval here.
-	(mount_info::conv_to_posix_path): Ditto.
-	(hash_path_name): Accommodate additional methods in cwdstuff.
-	(get_cwd_win32): Eliminate.
-	(getcwd): Use cwdstuff methods.  Properly handle case where buf == NULL
-	and len < 0.
-	(cwdstuff::get_hash): New method.
-	(cwdstuff::get_initial): New method.
-	(cwdstuff::set): New method.
-	(cwdstuff::get): New method.
-	(cwdstuff::copy): New method.
-	* path.h: Move cwdstuff struct here.  Add a bunch of stuff to cwdstuff.
-	Make cygcwd an extern.
-	* spawn.cc (spawn_guts): Use copy method to get copies of cwd info to
-	pass to execed process.
-	* dcrt0.cc (dll_crt0_1): Use cygcwd methods for cwd initialization.
-
-2000-09-03  Egor Duda  <deo@logos-m.ru>
-
-	* path.cc (readlink): Check if buffer length is positive.
-	Truncate output to buffer length. Don't terminate buffer
-	with '\0'.
-
-Sun Sep  3 00:38:40 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (environ_init): Don't free the new environment table after
-	we've just copied stuff to it.
-
-Sun Sep  3 00:07:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add cygheap.o.
-	* child_info.h: Add specific exec class.
-	* cygheap.h: New file.  Contains declarations for cygwin heap.
-	* cygheap.cc: New file.  Implements cygwin heap functions.
-	* dcrt0.cc (quoted): Simplify due to new method for passing arguments
-	between cygwin programs.
-	(alloc_stack_hard_way): Attempt to handle overlapped stack.
-	(dll_crt0_1): Move child_info processing here.  Accommodate new method
-	for passing arguments between cygwin programs.  Initialize cygwin heap.
-	Establish __argc and __argv variables.
-	(_dll_crt0): Move most of child_info processing to dll_crt0_1.
-	(cygwin_dll_init): Remove duplication.
-	* dtable.cc (dtable::extend): Allocate dtable using cygwin heap.
-	(dtable::build_fhandler): Ditto for fhandler type being constructed.
-	(dtable::dup_worker): Free new fhandler from cygwin heap on error.
-	(dtable::select_*): Don't assume that this == fdtab.
-	(dtable::linearize_fd_array): Delete.
-	(dtable::delinearize_fd_array): Delete.
-	(dtable::fixup_after_exec): New file.
-	(dtable::vfork_child_dup): Use cygwin heap.
-	(dtable::vfork_parent_restore): Ditto.
-	* dtable.h: Remove obsolete methods.  Add new method.
-	* environ.cc (posify): Eliminate already_posix parameter and logic.
-	(envsize): New function.
-	(_addenv): Use envsize.
-	(environ_init): Accept an argument pointing to an existing environment
-	list.  If supplied, allocate space for this in the the program's heap.
-	* fhandler.cc (fhandler_base::operator =): Move here from fhandler.h.
-	Use cygwin heap to allocate filenames.
-	(fhandler_base::set_name): Allocate/free names from cygwin heap.
-	(fhandler_base::linearize): Delete.
-	(fhandler_base::de_linearize): Delete.
-	(fhandler_base::operator delete): Free from cygwin heap.
-	(fhandler_base::~fhandler_base): Ditto.
-	* fhandler.h: Accommodate elimination of *linearize and other changes
-	above.
-	* fhandler_console.cc (fhandler_console::fixup_after_exec): Rename from
-	de_linearize.
-	* heap.h: New file.
-	* fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Use cygwin
-	heap for name.  fhandler_tty::fixup_after_exec): Rename from
-	de_linearize.
-	* fork.cc (fork): Call cygheap_fixup_in_child.
-	* heap.cc: Use declarations in heap.h.
-	* malloc.cc: Sprinkle assertions throughout to catch attempts to
-	free/realloc something from the cygwin heap.
-	* path.cc: Throughout, eliminate use of per-thread cache for cwd.  Use
-	cwd_* functions rather than cwd_* variables to access cwd_win32 and
-	cwd_posix.
-	(cwd_win32): New function.
-	(cwd_posix): New function.
-	(cwd_hash): New function.
-	(cwd_fixup_after_exec): New function.
-	* path.h: Accommodate path.cc changes.
-	* pinfo.cc (pinfo_init): Accept a pointer to an environment table.
-	Pass this to environ_init.  Eliminate old 'title' tests.
-	* pinfo.h: Accommodate above change in argument.
-	* spawn.cc (struct av): New method for building argv list.
-	(av::unshift): New method.
-	(spawn_guts): Allocate everything that the child process needs in the
-	cygwin heap and pass a pointer to this to the child.  Build argv list
-	using new method.  Eliminate delinearize stuff.
-	* thread.h: Eliminate _cwd_win32 and _cwd_posix buffers.
-	* winsup.h: Eliminate obsolete functions.  Add envsize() declaration.
-
-2000-09-02  Egor Duda  <deo@logos-m.ru>
-
-	* Makefile.in: Remove "make check" support. It is now in
-	winsup/Makefile.in.
-
-Fri Sep  1 21:17:03 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (mychild): New function.
-	(proc_subproc): Use mychild() to determine if a specific pid is valid
-	for wait()ing.
-
-Fri Sep  1 16:57:44 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (sigproc_init): Create wait_sig_inited without auto-reset
-	to avoid potential races.
-	(init_child_info): Avoid unneeded test.
-
-Fri Sep  1 16:51:26 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (proc_info): Rename proc_exists which takes a pid to
-	"pid_exists".
-	* shared.h: Split out "child_info" stuff into a new header file and
-	use where necessary.
-	Declare pid_exists.
-	* child_info.h: New file.
-
-Thu Aug 31 16:06:21 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* errno.cc (set_errno_from_win_error): Actually use arguments to
-	strace_printf.
-
-2000-08-30  DJ Delorie  <dj@redhat.com>
-
-	* times.cc (gettimeofday): use GetSystemTimeAsFileTime to avoid a
-	conversion
-	(FACTOR): correct value
-	(genf): set milliseconds to zero, DOW to 4.
-
-2000-08-29  Egor Duda  <deo@logos-m.ru>
-
-	* grp.cc (getgroups): fail with EINVAL if array is not large
-	enough to hold all supplementary group IDs.
-
-Mon Aug 28 22:03:21 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* signal.cc (_raise): New function.
-	* exceptions.cc (unused_sig_wrapper): Remove _raise.
-	* sigproc.h (class sigframe): Default frames to skip to zero or suffer
-	from exuberant optimization.
-	* fhandler_tty.cc (fhandler_tty::write): Set appropriate errno when
-	WriteFile to pipe fails.
-
-Fri Aug 25 23:44:48 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.h (pinfo): Un-inline release.
-	* pinfo.cc (pinfo::release): Move here from pinfo.h.
-	* sigproc.cc (proc_terminate): Remove bogus 'pinfo child' which caused
-	strange destruction of random regions of memory when destructor was
-	invoked.
-
-Fri Aug 25 21:25:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Move set_os_type.
-	(_dll_crt0): To here.
-	(cygwin_dll_init): And here.
-	* external.cc (fillout_pinfo): Use more foolproof method for scanning
-	for pids.
-	* pinfo.cc (set_myself): Eliminate myself_identity.init.
-	* sigproc.cc (wait_sig): Do it here instead to reduce the amount of
-	time where there could potentially be two processes with the same pid.
-	* spawn.cc (spawn_guts): Eliminate duplicate initialization.
-	* include/sys/cygwin.h: Mark unused PID_* elements.
-
-Fri Aug 25 21:49:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* exec.cc (_execve): Change definition according to declaration in
-	newlib/libc/include/sys/unistd.h.
-
-Thu Aug 24 22:17:19 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* external.cc (cygwin_internal): Add CW_INIT_EXCEPTIONS to allow cygwin
-	exception handling on threads not created by cygwin.
-	* sigproc.cc (proc_terminate): Don't release pinfo structs since we are
-	exiting.
-	* include/sys/cygwin.h: Add CW_INIT_EXCEPTIONS.
-
-Thu Aug 24 17:16:14 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (cygwin_select): Correct logic for "always_ready" fds or
-	when there is no wait specified.
-	* syslog.cc (pass_handler::set_message): Zero the buffer prior to
-	setting it.
-
-2000-08-24  Egor Duda  <deo@logos-m.ru>
-
-	* include/cygwin/core_dump.h: New file, contains structures used in
-	cygwin core core files.
-	* include/sys/procfs.h: New file, needed to autoconfigure cygwin core
-	dumps support in bfd.
-
-Thu Aug 24 13:50:15 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (parse_thing): nobinmode should force O_TEXT.
-	(regopt): Use correct path to find LOCAL_MACHINE registry options.
-	* fhandler.cc (fhandler_base::open): Set binary mode only when binmode
-	== O_BINARY.
-	* pipe.cc (pipe): Pipe handling should rely on binmode not _fmode now
-	that the two are different.
-
-Thu Aug 24 13:21:09 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sys/cygwin.h (strace_printf_wrap): Force printing when
-	_STRACE_SYSTEM.
-	(strace_printf_wrap1): Ditto.
-
-Thu Aug 24 12:30:17 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.h: Allow some debug defines for use in header files.
-
-Wed Aug 23 23:00:24 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Move exception list and constructor stuff
-	earlier in the process.  Use new second argument to set_myself.
-	(cygwin_dll_init): Initialize exception list and constructor stuff
-	here.
-	(_dll_crt0): And here.  Also, deal with inherited pinfo shared memory
-	region from parent.
-	* pinfo.cc (set_myself): Accept a second argument signifying the a
-	shared memory region, passed from an execing parent.
-	(pinfo_init): Ditto.
-	* pinfo.h: Ditto.
-	* shared.h (child_info): Add a handle field to pass to child.
-	* spawn.cc (spawn_guts): Create a shared handle to pass to an execed
-	child.
-	* winsup.h: Remove extraneous declaration.
-
-Wed Aug 23 10:51:57 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sys/cygwin.h: Protect class definitions.
-
-Tue Aug 22 13:57:36 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (symlink_info::check): Clear error on each iteration of
-	extension check.
-
-Tue Aug 22 11:23:59 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Don't include '.d' file if there are none generated yet.
-
-Tue Aug 22 11:08:11 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sys/cygwin.h: Declare some thread classes.
-	* include/mntent.h: Avoid declaring functions.
-
-Tue Aug 22 01:08:01 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.h: Eliminate inclusion of most of the cygwin .h files.  Use .h
-	files only in sources which require them.
-	* Makefile.in: Generate dependencies with -MD option.
-
-Mon Aug 21 23:49:05 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygerrno.h: New file.  Use this throughout whenever errno
-	manipulation is required.
-	* errno.cc: Use DWORD to hold Windows errors.
-	(geterrno_from_win_error): New function.
-	(seterrno_from_win_error): Use geterrno_from_win_error to convert
-	supplied windows error (suggested by Corinna Vinschen).
-	* path.cc (symlink_info): Add error element.
-	* path.cc (path_conv::check): Remove errno setting.  Use new
-	symlink_info errno element to set path_conv error, where appropriate.
-	(symlink_info::check): Set error element rather than attempting to
-	manipulate errno.  Add more checks for trailing / and /..  even though
-	they are currently useless.  Avoid setting EINVAL.
-
-Mon Aug 21 23:49:05 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (normalize_posix_path): Correct check for trailing /.
-
-2000-08-21  DJ Delorie  <dj@redhat.com>
-
-	* include/cygwin/cygwin_dll.h (DECLARE_CYGWIN_DLL): hinstance,
-	not handle.
-
-Fri Aug 18 11:11:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* dtable.cc (dtable::dup2): Extend fdtab if newfd is out of current
-	allocated bounds.
-
-Sat Aug 12 01:47:28 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh: Properly trap exit removal of temp file.  Remove debugging
-	statement.
-
-Sat Aug 12 01:37:56 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* poll.cc: Make winsup.h the first include file, re 2000-08-02 change.
-
-Sat Aug 12 01:33:12 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.h: Split out dtable definitions into separate header file.
-	* dtable.h: New file.
-	* sigproc.h: Eliminate pinfo.h usage here.  Use it in source files that
-	need it.
-
-Sat Aug 12 01:08:11 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Use dtable.o rather than hinfo.o.
-
-Sat Aug 12 00:47:11 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Rename hinfo -> dtable.  Name the former dtable array 'fdtab'.
-
-Fri Aug 11 14:47:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* poll.cc: Allow any descriptor and any number of descriptors.
-	Allocate fd_set struct sdynamically.
-
-Fri Aug 11 14:47:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* poll.cc: Add bounds checking for file descriptors. Return POLLNVAL
-	if fd is invalid. Return POLLERR for each valid fd if cygwin_select
-	returned with error.
-	include/sys/poll.h: Change POLLERR comment according to above change.
-
-Thu Aug 10 21:54:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* syslog.cc (syslog): Use a less malloc-intensive method for allocating
-	the buffer.  Also fix a buffer overrun.
-
-Thu Aug 10 15:31:39 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.h: Change strchr inline for strange gcc problem.
-	* select.cc (select_stuff::wait): Bounds check w4 array.
-
-Thu Aug 10 15:17:53 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dir.cc (readdir): Ensure that errno is *only* set when we've run out
-	of filenames.
-	* fhandler.cc (fhandler_disk_file::fstat): Use modern method for saving
-	errno, making it effective for the whole function.
-
-Tue Aug  8 22:25:39 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (allocfd_set): Zero allocated fd_set.
-	(cygwin_select): Move fd_set copying logic from ::wait to here.  Use
-	common return through sell.poll.
-	(select_stuff::wait): Just return success or failure and let caller
-	fill in fd_set.
-	* pinfo.h (pinfo): Eliminate self-referential pointer to sidbuf since
-	pinfo structure exists at random locations now.
-	* fork.cc (fork): Use 'use_psid' element to control when the psid is
-	relevant.
-	* shared.cc (sec_user): Ditto.
-	* spawn.cc (spawn_guts): Ditto.
-	* uinfo.cc (internal_getlogin): Ditto.
-	* syscall.cc (seteuid): Ditto.  Set use_psid element.
-
-Tue Aug  8 13:20:00 2000  Bob Wilson  <bwilson@tensilica.com>
-
-	* fhandler_serial.cc (tcsendbreak): "sleeptime" argument to usleep()
-	must be in units of microseconds, not milliseconds.
-
-Mon Aug  7 00:11:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/cygwin_dll.h: Remove extraneous (and incorrect)
-	declarations.
-
-Fri Aug  4 00:00:46 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (hinfo::find_unused_handle): Just check for table entry ==
-	NULL since we are already bounds checked by default.
-	* thread.cc (ResourceLocks::Lock): Streamline this function since it is
-	called a lot.
-	(ReleaseResourceLock): Ditto.
-
-Thu Aug  3 20:44:39 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (fhandler_console::select_read): Call set_cursor_maybe
-	since select may block and cursor may not be visible.
-	* select.cc (fhandler_console::select_write): Ditto.
-	* select.cc (fhandler_console::select_except): Ditto.
-
-Thu Aug  3 09:01:14 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (fhandler_pty_master::process_slave_output): Set
-	length field correctly when "need_nl".
-
-Wed Aug  2 22:58:07 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (vfork): Store complete stack frame in vfork_save structure
-	for later recovery.
-	* spawn.cc (spawn_guts): Reorganize slightly to consolidate handling
-	when there is a CreateProcess error.
-	(_spawnve): Only longjmp back to vfork handling when a process has been
-	successfuly started.
-	* winsup.h (vfork_save): Extend to include frame info.  Remove obsolete
-	cpplus conditionals.
-
-Wed Aug  2 15:14:51 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* strace.cc (strace::prntf): Make second argument the function name,
-	rather than use special format options.
-	(strace::vprntf): Ditto.
-	(getfunc): New function.
-	* include/sys/strace.h: Reflect above changes.
-	* smallprint.c (__small_vsprintf): Eliminate '%F' formatting.
-	* pinfo.cc (set_myself): Modify for new strace::prntf parameter.
-	* errno.cc (seterrno_from_win_error): Ditto.
-	* fhandler_tty.cc (fhandler_tty_common::__acquire_output_mutex): Ditto.
-	* fhandler_tty.cc (fhandler_tty_common::__release_output_mutex): Ditto.
-
-Wed Aug  2 13:20:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* regexp/regexp.c: Add winsup.h.
-
-2000-08-02  DJ Delorie  <dj@redhat.com>
-
-	* winsup.h: take out protections of environ, errno, allow C use
-	* *.cc: put winsup.h before other headers (for __INSIDE_CYGWIN__);
-	use cur_environ() instead of just environ
-	* times.cc: remove import protections
-	* glob.c: add winsup.h
-	* localtime.c: ditto
-	* smallprint.c: ditto
-	* Makefile.in: don't __INSIDE_CYGWIN__ as it messes up profiling.
-
-Wed Aug  2 11:22:53 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sys/strace.h: Fix strace definition.
-
-Tue Aug  1 23:37:08 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* strace.h: Add kludgy workarounds to avoid using deprecated methods
-	for variable argument macros when possible.
-	* sigproc.cc: Throughout, use sigproc_printf rather than sip_printf.
-	* strace.cc (strace::prntf): Remove 'active' check, since callers are
-	supposed to ensure this.
-	(__system_printf): Remove.  Subsumed by strace::prntf.
-	* winsup.h: Define "NEW_MACRO_VARARGS" to indicate when to use new
-	macro varargs capability.
-
-Sun Jul 30 13:54:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc: Remove VK_DIVIDE detection.
-	(get_nonascii_key): Simplify previous patch to return ascii char if it
-	is non-zero.  Add a second "temporary buffer" argument to help with
-	thread safety.
-	* select.cc (peek_console): Pass a temporary buffer argument to
-	get_nonascii_key.
-
-Sat Jul 29 14:32:12 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc: Add VK_DIVIDE detection.  Return virtual keycode
-	if it is not detected and it is less than ' '.
-
-Sat Jul 29 13:33:49 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (chdir): Avoid trailing dot calculation when chdir == '/'
-	or we end up with an empty string.
-
-Sat Jul 29 12:11:33 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump DLL minor version number to 5 due
-	to all of the changes below.
-
-Sat Jul 29 12:01:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Redefine process structure to avoid a fixed size table.  Redefine
-	pinfo/_pinfo classes.  Use these throughout.
-	* dcrt0.cc (dll_crt0_1): Accommodate set_myself argument change.
-	(__api_fatal): Accommodate _pinfo::record_death argument change.
-	* exceptions.cc (really_exit): Ditto.
-	(sig_handle_tty_stop): Use pinfo constructor to access process info.
-	(events_init): Don't create pinfo_mutex since it is no longer required.
-	* external.cc (fillout_pinfo): Use winpids class to iterate over all
-	system pids.
-	(cygwin_internal): lock_pinfo_for_update and unlock_pinfo are now
-	noops.
-	* fhandler_termios.cc (fhandler_termios::set_ctty): Use pinfo
-	constructor to access process info.
-	* fork.cc (fork): Reorganize to initialize child info after the child
-	has started since that is when we know the child's winpid, which is
-	necessary to allocate the pinfo shared memory.
-	* mmap.cc (recreate_mmaps_after_fork): Change arg type to _pinfo.
-	* pinfo.cc: Rename pinfo methods to _pinfo throughout.  Eliminate
-	pinfo_list stuff.
-	(set_myself): Accept a pid argument now.  Call pinfo initializer to
-	initialize myself.  Detect when this is an "execed" process and create
-	an "indirect" pid block.
-	(pinfo_init): Accommodate set_myself arg change.
-	(procinfo): Remove.
-	(pinfo::lock_pinfo): Remove.
-	(pinfo::unlock_pinfo): Remove.
-	(pinfo::init): New method.  Allocates shared memory space for process
-	pinfo structure.
-	(pinfo::record_death): Don't call locking functions.
-	(cygwin_winpid_to_pid): Simplify by using new pinfo constructor.
-	(EnumProcessesW95): New function for iterating over processes on
-	Windows 95.
-	(winpids::winpids): New constructor for winpids class.  Sets up a list
-	of process ids.
-	(enum_init): Initialize w95/wnt pid enumerators.
-	* shared.cc (shared-info::initialize): Remove pid initialization.
-	* shared.h: Move pinfo stuff into pinfo.h.
-	(class shared_info): Remove pinfo_list element.
-	* signal.cc (kill_worker): Use pinfo constructor to access process
-	info.
-	(kill_pgrp): Ditto.  Use winpids methods to access list of processes.
-	* sigproc.cc: Throughout, modify to use _pinfo where appropriate.
-	(proc_exists (pid_t)): New function.  Determines if a process exists
-	based on the pid.
-	(proc_exists (_pinfo *p): Use new proc_exists function above.
-	(proc_subproc): Copy pinfo stuff around rather than _pinfo pointers.
-	Try to be careful about releasing shared memory when we don't need it
-	anymore.  Remove pinfo locks.
-	(remove_zombies): Remove pinfo memory when zombie is going away.
-	* sigproc.h: Reflect _pinfo/pinfo changes in sigproc.cc.
-	* spawn.cc (spawn_guts): Eliminate pinfo *child argument.  Reorganize
-	to only initialize child pinfo after process has been started and we
-	know the windows pid.
-	(_spawnve): Reflect spawn_guts changes.
-	* syscalls.cc (setpgid): Use pinfo constructor to access process info.
-	(getpgid): Ditto.
-	(internal_getlogin): Use _pinfo.
-	* winsup.h: Eliminate pinfo_mutex.  Eliminate spawn_guts declaration
-	since it is static now.  Reflect set_myself argument change.
-	* include/sys/cygwin.h: Add some PID_* enums to accommodate new pinfo
-	stuff.
-
-Sat Jul 29 12:13:27 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Update minor version for cygdrive changes
-	below.
-
-Sat Jul 29 11:59:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (parse_thing): Make binmode a DWORD.
-	* hinfo.cc (hinfo::init_std_file_from_handle): Use 'binmode' to
-	determine default open mode.
-	* winsup.h: Declare binmode.
-
-Sat Jul 29 00:16:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/cygwin_dll.h: Update for modern compilers.
-	* lib/cygwin_crt0.c: Inexplicably need to define alloca for newer
-	compilers.
-	* fhandler.h (fhandler_console): Add new method.
-	* fhandler.cc (fhandler_console::set_cursor_maybe): New method.
-	(fhandler_console::read): Set cursor if it has moved to make it
-	visible.
-
-Thu Jul 27 22:54:28 2000  Jason Tishler <jt@dothill.com>
-
-	* dcrt0.cc (dummy_autoload): Add load statement for RegDeleteValueA.
-	* external.cc (get_cygdrive_prefixes): New function.
-	(cygwin_internal): Add CW_GET_CYGDRIVE_PREFIXES case.
-	* path.cc (mount_info::read_cygdrive_info_from_registry): Read system
-	cygdrive prefix if user one is undefined.
-	(mount_info::write_cygdrive_info_to_registry): Write cygdrive prefix to
-	the appropriate registry hive.  Overwrite in-memory copy of cygdrive,
-	if appropriate.
-	(mount_info::remove_cygdrive_info_from_registry): New method.
-	(mount_info::get_cygdrive_prefixes): New method.
-	(cygwin_umount): Remove cygdrive prefix, if appropriate.
-	* registry.cc (reg_key::killvalue): New method.
-	* shared.h (class reg_key): Add killvalue,
-	remove_cygdrive_info_to_registry, and get_cygdrive_prefixes
-	declarations.
-	* include/sys/cygwin.h (cygwin_getinfo_types): Add
-	CW_GET_CYGDRIVE_PREFIXES.
-
-Thu Jul 27 23:33:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump DLL minor version number to 4.
-
-2000-07-27  DJ Delorie  <dj@redhat.com>
-
-	* testsuite/winsup.api/winsup.exp: ignore stdout by default
-	* testsuite/winsup.api/crlf.c: non-verbose by default
-
-	* winsup.h: prune out windows headers we don't normally need
-	* assert.cc: add wingdi.h and winuser.h
-	* fhandler_console.cc: ditto
-	* fhandler_windows.cc: ditto
-	* select.cc: ditto
-	* spawn.cc: ditto
-	* strace.cc: ditto
-	* tty.cc: ditto
-	* window.cc: ditto
-	* hinfo.cc: add winsock.h
-	* syscalls.cc: add winnls.h
-	* uinfo.cc: ditto
-
-Thu Jul 27 10:24:36 2000  Egor Duda <deo@logos-m.ru>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Allow block calculation to
-	succeed for files >= 2GB and <= 4GB.
-
-Wed Jul 26 16:05:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (signal_exit): Renamed from "really_exit".  Always sets
-	EXIT_SIGNAL bit and reorganizes exit value for backwards cygwin
-	handling.
-	(handle_exceptions): Call signal_exit.  Set "core dumped" bit.
-	(sig_handle): Call signal_exit.  Set "core dumped" bit appropriately.
-
-Wed Jul 26 20:44:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* environ.cc (posify): Revert previous patch.
-	(_addenv): Remove check_null_empty_path from here.
-	(putenv): Call check_nullempty_path.
-	(setenv): Call check_nullempty_path for name as well here.
-	Don't report an error if value is empty string.
-	(environ_init): Revert usage of newp.
-
-Wed Jul 26 14:32:38 2000  Egor Duda <deo@logos-m.ru>
-
-	* syscalls.cc (stat_worker): Make stat return correct st_blocks for
-	files with size bigger than 2Gb and less than 4Gb
-
-Wed Jul 26 17:43:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (lookup_name): Search on local machine first if
-	myself->domain is not empty.
-
-2000-07-26  DJ Delorie  <dj@cygnus.com>
-
-	* fhandler_console.cc (fhandler_console::read): Explicitly set cursor
-	to make it visible while waiting in WaitForMultipleObjects.
-
-Wed Jul 26 10:59:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* passwd.cc: Change name of passwd_in_memory_p to passwd_state.
-	Change type to enum. Change storage class to static. Adjust comments.
-	(read_etc_passwd): Set passwd_state to different values when loaded
-	from file in contrast to being emulated.
-	(search_for): Return default passwd entry if passwd is emulated or
-	it's a request for the current user. Otherwise return NULL.
-
-Tue Jul 25 21:50:42 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (statfs): Use path_conv method to convert input path.
-
-Tue Jul 25 21:40:51 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_link): Avoid extraneous call to
-	cygwin_conv_to_win32_path.
-
-Tue Jul 25 21:11:15 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (_addenv): New function.  Subsumes functionality of
-	putenv/setenv.  Does not allocate space for putenv case.
-	(putenv): Use _addenv to add a value to the environment.
-	(setenv): Ditto.
-	(environ_init): Don't malloc space for each entry in the environment
-	table.  Just use the space from GetEnvironmentStrings.
-	(posify): Don't free the src argument since it is no longer malloced.
-
-Mon Jul 24 21:10:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (_link): Corrected previous patch.
-
-Mon Jul 24 13:26:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (class fhandler_dev_random): Add members for managing
-	pseudo randomness.
-	* fhandler_random.cc: Rearrange. Use pseudo random number generator
-	as entropy source if system entropy isn't available and if device is
-	used as /dev/urandom. Allow initializing device by calling write().
-
-Sun Jul 23 23:11:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h: Add comment.
-
-Sun Jul 23 20:00:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (class fhandler_dev_raw): Add private member `varblkop'
-	to be set when variable blocksize mode is on.
-	* fhandler_raw.cc: Eliminate `\n' from trace output.
-	(clear): Set `varblkop' to 0.
-	(dup): Copy varblkop as well.
-	(writebuf): Care for variable blocksize.
-	(open): Ditto.
-	(raw_read): Ditto.
-	(raw_write): Ditto.
-	* fhandler_tape.cc (open): Ditto.
-	(ioctl): Ditto. Some cleanups.
-
-Sat Jul 22 18:40:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	Patch suggested by Kazuhiro Fujieda  <fujieda@jaist.ac.jp>.
-	* winsup.h: Add new macros sys_wcstombs and sys_mbstowcs.
-	* syscalls.cc (_link): Replace calls to mbstowcs by call to
-	sys_mbstowcs.
-	* uinfo.cc (internal_getlogin): Replace calls to wcstombs and
-	mbstowcs by calls to sys_wcstombs and sys_mbstowcs. Replace
-	usage of constants by meaningful defines. Use result of
-	GetSystemDirectory for HOMEPATH and HOMEDRIVE as a last resort.
-
-Fri Jul 21 21:33:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* spawn.cc (span_guts): Retrieve security attributes before setting
-	psid to NULL.
-
-Fri Jul 21 12:03:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (acl_worker): Use stat_suffixes in call to path_conv
-	just as in `stat_worker'.
-
-Wed Jul 19 22:24:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* spawn.cc (spawn_guts): Don't restore impersonation in case
-	of _P_OVERLAY. Clean up slightly. Accommodate comments.
-
-Wed Jul 19 22:11:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* shared.h (class pinfo): New members `root' and `rootlen'.
-	* syscalls.cc (chroot): Set new root for process.
-	* path.cc (getcwd_inner): Add parameter to force use of
-	new root from chroot() call.
-	(ischrootpath): New macro.
-	(normalize_posix_path): Care for changed root dir.
-	(normalize_win32_path): Ditto.
-	(getcwd_inner): Ditto.
-	(chdir): Eliminate trailing path component consisting
-	entirely of dots.
-	* fork.cc (fork): Copy pinfo members regarding chroot().
-	* spawn.cc (_spawnve): Ditto.
-	* dir.cc (opendir): Don't use computed win32 path if
-	chroot() took place.
-
-Mon Jul 17 22:21:34 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dll_init.cc (dll_list::alloc): Fix debugging output.
-
-Mon Jul 17 14:57:53 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, eliminate third argument to path_conv and use new PC_*
-	constants for second argument.
-	* dcrt0.cc (dll_crt0_1): Reorganize to allow more initialization prior
-	to returning due to dynamic loading.
-	* path.h: Generalize SYMLINK_* constants to PC_*.
-	(path_conv): Create a new method.  Fold third argument into second.
-	* dll_init.cc (dll_list::alloc): Try harder to find space to allocate
-	dll struct.
-	(dll_dllcrt0): Don't check sanity if we've already called dll_crt0.
-	* path.cc (path_conv::check): Don't check for a null or empty path
-	unless specifically told with a flag setting.
-	(check_null_empty_path): New function, adapted from macro.
-	* syscalls.cc (_rename): Use already-determined file attributes rather
-	than checking again.
-	* lib/cygwin/cygwin_attach.dll.c (cygwin_attach_dll): Use a static
-	per_process structure since this is apparently supposed to be zeroed.
-	* lib/cygwin_crt0.c (cygwin_crt0): Zero per_process structure sent to
-	older DLLs.
-
-Mon Jul 17 19:39:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	Patch suggested by Eric Fifer <EFifer@sanwaint.com>
-	* poll.cc (poll): Fix erroneous negations.
-
-Mon Jul 17 17:56:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* environ.cc (setenv): Use __cygwin_environ instead of
-	environ after reallocating environment space.
-
-Sun Jul 16 20:23:21 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* _cygwin_crt0_common.cc: Undef 'environ' or suffer compiler error.
-
-Sun Jul 16 16:03:00 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc: Use new definition of "environ" throughout.
-	(environ_init): Explicitly initialize __cygwin_environ.
-	(cur_environ): New function.  Detects when user has updated
-	their environment.
-	* exec.cc: Use 'environ' define throughout rather than __cygwin_environ.
-	* spawn.cc: Ditto.
-	* winsup.h: Declare cur_environ, main_environ, environ.
-
-Sun Jul 16 13:23:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* acconfig.h: Add support for NEWVFORK.
-	* config.h.in: Ditto.
-	* configure.in: Add --enable-vfork option.
-	* configure: Regenerate.
-	* dcrt0.cc (quoted): Detect and fix up quoted backslashes.
-	* sigproc.cc (proc_subproc): Correctly name handle of newly added child
-	process to avoid erroneous debugging messages about closing the wrong
-	handle.
-
-Sun Jul 16 02:30:09 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Use \ for quoting '"'.
-	* dcrt0.cc (quoted): Understand \ quoting for '"'.
-
-Sun Jul 16 00:32:58 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (build_argv): Strip quotes from argv[0] since it should
-	never be globified.
-
-Sat Jul 15 00:32:41 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dll_init.cc (dll_list::alloc): Round correctly.  Use VirtualAlloc
-	since shared file mapping is unnecessary.
-	(dll_list::detach): Release memory via VirtualFree since there we no
-	longer use shared file mapping.
-
-Fri Jul 14 22:40:22 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (hinfo::linearize_fd_array): Make max_used_fd an int so that
-	we can detect when there are no fds to pass.
-	* dcrt0.cc (host_dependent_constants::init): Revert Sat Mar 18 01:32:04
-	2000 change.
-	(dll_crt0_1): Set "cygwin_finished_initializing" flag.
-	(dll_crt0): Don't perform memcpy if uptr is already set to internal
-	structure.
-	(_dll_crt0): Remember location of programs envptr.
-	* dll_init.h (per_module, dll, dll_list): Revamp.
-	* dll_init.cc: Revamp.  Use new classes.
-	* fork.cc (fork): Use new revamped dll, dll_list, and per_module stuff.
-	* environ.cc: Use __cygwin_environ throughout rather than the
-	user_data->envptr.
-	* exec.cc: Ditto.
-	* spawn.cc: Ditto.
-	* winsup.h: Declare update_envptrs, cygwin_finished_initializing.
-	* lib/_cygwin_crt0_common.cc (_cygwin_crt0_common): Revert previous
-	change.
-	* lib/cygwin_attach_dll.cc (cygwin_attach_dll): Always pass in own
-	per_process structure or we end up overwriting information from the
-	main program.
-
-Wed Jul 12 00:46:00 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc (thread_stub): Use impure_ptr in place of reent_data.
-	* dll_init.cc (dll_dllcrt0): Replace erroneous use of local symbol with
-	correct __cygwin_user_data->impure_ptr.
-
-Wed Jul 12 00:01:03 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* lib/_cygwin_crt0_common.cc (_cygwin_crt0_common): Don't reset
-	environ if already set.
-
-Mon Jul 10 19:07:03 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (fhandler_console::read): Unicode interface
-	to ReadConsoleInput only exists on W2K, so use workaround from
-	Kazuhiro Fujieda  <fujieda@jaist.ac.jp>.
-
-Mon Jul 10 11:30:00 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in (install): Install textmode.o as well as binmode.o.
-	* fhandler_console.cc (fhandler_console::read): Use UNICODE when
-	reading from the console and translate to ASCII from that.
-
-Sun Jul  9 21:52:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* spawn.cc (spawn_guts): Close handle `hToken' only if it's not
-	copied from myself->token.
-	* syscalls.cc (seteuid): Replace CopySid by memcpy which is foolproof
-	here.
-
-Sun Jul  9 01:19:06 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Export _getmode and getmode to allow querying of binary
-	state of an fd.
-	* external.cc (cygwin_internal): Add handling of perfile_table setting.
-	* fhandler.cc (perfile_table): New global.
-	(fhandler_base::get_default_fmode): New method to return a file's
-	default mode based on its name.
-	(fhandler_base::open): Use get_default_mode method to determine a
-	file's mode.  Record file mode in file flags.
-	* fhandler.h (fhandler_base): Declare get_default_fmode
-	* syscalls.cc (getmode): New function.
-	* sys/cygwin.h (__cygwin_perfile): New structure.
-	(cygwin_getinfo_types): Move outside of WINVER conditional.
-	(per_process): Move inside of WINVER conditional.
-
-Sat Jul  8 00:15:01 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* external.cc (cygwin_internal): Export __cygwin_user_data.
-	* include/sys/cygwin.h: Allow definition of per_process even when not
-	compiling with C++.
-	(cygwin_getinfo_types): Add CW_USER_DATA.
-	* lib/_cygwin_crt0_common.cc (_cygwin_crt0_common): Get
-	__cygwin_user_data pointer from cygwin_internal.  If it doesn't exist,
-	return failure.  Use either this pointer or passed in pointer
-	throughout.  Clear forkee.
-	* lib/crt0.h: Accommodate argument changes to _cygwin_crt0_common.
-	* lib/cygwin_attach_dll.c (cygwin_attach_dll): Reorganize to allow use
-	of newer binaries with older DLLs.  Detect older DLLs when
-	_cygwin_crt0_common returns 0 and allocate space for a per_process
-	structure on the stack.
-	* lib/cygwin_crt0.c (cygwin_crt0): Ditto.
-
-Fri Jul  7 10:31:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/sys/cygwin.h: Hide internal data types in per_process
-	when not __INSIDE_CYGWIN__.
-
-Wed Jul  5 18:56:58 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (__cygwin_user_data): Initialize.
-	(dll_crt0_1): Eliminate user_data initialization.
-	(dll_crt0): Set up impure_ptr_ptr for older executables.
-	(cygwin_dll_init): Eliminate user_data initializations.
-	(__api_fatal): Don't check for user_data initialization.
-	* dll_init.cc (struct dll): Store entire contents of per_process rather
-	than just a pointer.
-	(add): Ditto.
-	(initOneDll): Don't check for user_data initialization.
-	(DllList::recordDll): Store contents of per_process argument.
-	(DllList::detachDll): Pass address of per_process field.
-	(DllList::initAll): Ditto.
-	(DllList::doGlobalDestructorsOfDlls): Ditto.
-	(DllListIterator::operator *): Ditto.
-	(dll_dllcrt0): Default to __cygwin_user_data if arg is NULL.
-	* include/sys/cygwin.h: Reorganize per_process to eliminate obsolete
-	fields and accommodate new way of initializing.
-	* lib/_cygwin_crt0_common: Initialize _impure_ptr from
-	__cygwin_user_data.impure_ptr.
-
-2000-07-04  Vadim Egorov  <egorovv@mailandnews.com>
-
-	* exceptions.cc (try_to_debug): Prevent recursive spawning of JIT
-	debugger.  Treat special event from debugger as command to continue.
-
-Mon Jul  4 19:29:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* poll.cc (poll): Zero out `open_fds' as well.
-
-Mon Jul  4 1:22:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/version.h: Bump API minor version to 24.
-
-2000-07-04  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* security.cc (read_sd): Eliminate OemToChar.
-
-Mon Jul  4 18:57:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* poll.cc: New file. Implement `poll' system call.
-	* include/poll.h: Ditto.
-	* include/sys/poll.h: Ditto.
-	* Makefile.in: Add poll.o as dependency.
-	* cygwin.din: Add poll and _poll symbols.
-
-2000-07-04  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* dcrt0.cc (dll_crt0_1): Eliminate SetFileApisToOEM and CharToOem.
-	* (dummy_autoload): Add functions used in fhandler_console.
-	* fhandler_console.cc (fhandler_console::read): Use ENCHANCED_KEY flag
-	to distinguish extended keys.  Translate an input character from the
-	OEM code page to the ANSI code page.
-	* (fhandler_console::write_normal): Translate output characters from
-	the ANSI code page to the OEM code page.
-	* syscalls.cc (_link): Use MultiByteToWideChar instead of OemToCharW.
-
-Mon Jul  3 16:09:16 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (stack_info::walk): Use method to find offset.
-	(handle_exceptions): Be more assertive in finding ebp for use under
-	W2K.  Create a dummy stack frame for cases where program is dying and a
-	stack dump is being output.
-	(sig_handle): Fill out a GetThreadContext for use with a user-generated
-	"core dump".
-
-Mon Jul  3 10:53:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/socket.h: Remove SOCK_PACKET define since it's
-	not supported by Windows sockets.
-
-Sun Jul  2 21:50:48 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (user32_init): Add primitive guard against concurrent
-	attempts to call this function.  Also add temporary debugging code to
-	display a message if the function is called multiple times.
-	(api32_init): Ditto.
-
-Sun Jul  2 10:39:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.h: Define MAX_SID_LEN and new MAX_HOST_NAME.
-	* fork.cc (fork): Use above defines instead of numerical constants.
-	* shared.cc (sec_user): Ditto.
-	* shared.h (class pinfo): Ditto.
-	* syscall.cc (seteuid): Ditto.
-	* spawn.cc (_spawnve): Ditto. Eliminate conditional.
-	(spawn_guts): Set child->uid = USHRT_MAX when user context will be
-	changed in child process.
-	* uinfo.cc (uinfo_init): Check for myself->uid instead of myself->psid
-	to avoid reloading of /etc/passwd on process startup if ntsec is off.
-	Use above defines instead of numerical constants.
-	* security.cc: Move define for MAX_SID_LEN to winsup.h.
-
-Sun Jul  2  1:57:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* uinfo.cc (uinfo_init): Eliminate calls to read_etc_group()
-	and read_etc_passwd().
-
-2000-06-28  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* assert.cc (__assert): Reduce dependency on newlib.
-	* exec.cc: Eliminate unnecessary inclusion of ctype.h.
-	* glob.c: Ditto.
-	* hinfo.cc: Ditto.
-	* init.cc: Ditto.
-	* strace.cc: Ditto.
-	* tty.cc: Ditto.
-	* grp.cc (parse_grp): Eliminate atoi.
-	* passwd.cc (grab_int): Ditto.
-	* grp.cc (getgroups): Eliminate str{n,}casecmp.
-	* path.cc (get_raw_device_number): Ditto.
-	* path.cc (sort_by_native_name): Ditto.
-	* spawn.cc (iscmd): Ditto.
-	* uinfo.cc (internal_getlogin): Ditto.
-
-Sat Jul  1 11:43:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* binmode.c (cygwin_premain0): Fix erroneous clearing of bit.
-	* textmode.c (cygwin_premain0): Ditto.
-
-Sat Jul  1 00:24:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (_dll_crt0): Renamed from dll_crt0 ().
-	* winsup.h: Accommodate above change.
-	* cygwin.din: Ditto.
-	* lib/cygwin_crt0.c: Ditto.
-
-Fri Jun 30 23:21:40 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Use variables rather than configure constructs where
-	appropriate.
-	(LIBCOS): Find additional stub library stuff in their own subdirectory.
-	* dcrt0.cc: Convert user_data pointer to static __cygwin_user_data
-	area.
-	(do_global_ctors): Check magic_bisquit for initialization.
-	(dll_crt0_1): First group of premain functions prior to fd
-	initialization.  Run second group before calling main.
-	(dll_crt0 ()): New function, called from new initialization code.
-	(dll_crt0 (per_process *uptr)): Call new dll_crt0 () function on
-	initialization.
-	* debug.cc (thread_stub): Initialize bottom of stack with per-thread
-	info.
-	* environ.cc (parse_thing): Use binmode global to control
-	CYGWIN=binmode behavior.
-	* fhandler.cc (fhandler_base::open): Allow explicit setting of __fmode
-	to O_BINARY or O_TEXT to override disk mount settings.
-	* libcmain.cc: Move to lib subdirectory.
-	* libccrt0.cc: Ditto.
-	* dll_main.cc: Ditto.
-	* dll_entry.cc: Ditto.
-	* getopt.c: Ditto.
-	* thread.cc (thread_init_wrapper): Call ExitThread explicitly rather
-	than returning, as a preliminary step towards placing per thread info
-	at the bottom of the stack.
-	* winsup.h: Move per_process class to include/sys/cygwin.h.  Declare
-	new dll_crt0().
-	* include/cygwin/version.h: Bump API minor version.
-	* binmode.c: New file.
-	* textmode.c: Ditto.
-	* perthread.h: Ditto.
-	* lib/_cygwin_crt0_common.cc: Ditto.
-	* lib/crt0.h: Ditto.
-	* lib/cygwin_attach_dll.c: Ditto.
-	* lib/cygwin_crt0.c: Ditto.
-	* lib/dll_entry.cc: Ditto.
-	* lib/dll_main.cc: Ditto.
-	* lib/getopt.c: Ditto.
-	* lib/libcmain.c: Ditto.
-	* lib/premain0.c: Ditto.
-	* lib/premain1.c: Ditto.
-	* lib/premain2.c: Ditto.
-	* lib/premain3.c: Ditto.
-
-Wed Jun 28 19:36:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (seteuid): Initialize pi.token before calling
-	internal_getlogin().
-	* uinfo.cc (internal_getlogin): Use impersonation token instead
-	of process token in case of active impersonation. Add some comments.
-	(uinfo_init): Initializing myself->token and myself->impersonated
-	before calling internal_getlogin(). Add some comments.
-
-Mon Jun 26 18:32:41 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* windows.cc (setitimer): Round up when < 1000 usecs.
-
-Mon Jun 26 17:34:54 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (hinfo::dup2): Eliminate compiler warning.
-
-Mon Jun 26 11:25:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (hinfo::dup2): Guard against out of bounds newfd.
-
-Sat Jun 24 23:43:06 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* grp.cc (read_etc_group): Open file in text mode.
-	* pwd.cc (read_etc_passwd): Ditto.
-	* shared.h: Bump PROC_MAGIC.
-
-Sat Jun 24 19:30:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fork.cc (fork): Fix error in copying SID pointer.
-	* spawn.cc (_spawnve): Ditto.
-	* passwd.cc: Remove static from `passwd_in_memory_p'.
-	(read_etc_passwd): Remove static.
-	* uinfo.cc: Move global declaration of `read_etc_group' and
-	`group_in_memory_p' into `uinfo_init'.
-	(internal_getlogin): Try to get SID from current process first.
-	(uinfo_init): Don't set uid and gid if `myself' has a valid SID.
-	Only load /etc/passwd and /etc/group in that case.
-
-Sat Jun 24 12:29:59 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* shared.cc (shared_info::initialize): Improve error message clarity.
-	* mkvers.sh: Eliminate debugging output.
-
-Thu Jun 22 17:50:59 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Autogenerate cygwin.def when appropriate.
-	* include/sys/cygwin.h: Correct prototype.
-
-Thu Jun 22 17:05:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sys/cygwin.h: Don't define parts of this file that rely on
-	Windows headers unless the Windows header was previously included.
-
-Thu Jun 22 20:45:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* registry.cc (load_registry_hive): Use HKEY_USERS when checking
-	for existing user hive.
-	Use MAX_PATH instead of numerical constant for array size.
-	Use return code of RegLoadKeyA instead of GetLastError for error output.
-
-Thu Jun 22 14:27:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add new-libcygwin.a back to all_host target.
-
-Wed Jun 21 14:32:42 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add *.def to clean operation.
-
-Wed Jun 21 13:18:23 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add *.exe to clean operation.
-
-Wed Jun 21 01:02:38 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh: Fix sed usage for older seds.
-
-Tue Jun 20 20:46:28 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Don't touch winver_stamp if mkvers.sh was unsuccessful.
-
-Tue Jun 20 17:41:30 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh: Fix problem with handling of CVS tags causing .rc syntax
-	errors.
-
-Tue Jun 20 13:38:12 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Change to build the DLL during a cross-compiler build.
-
-Mon Jun 19 20:46:33 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (socket_cleanup): Shutdown I/O on dummy sockets prior to
-	closing them.
-
-Mon Jun 19 19:35:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* dcrt0.cc: Add load statements for `GetSidIdentifierAuthority'
-	and `RegLoadKeyA'.
-	* registry.cc (get_registry_hive_path): New function.
-	(load_registry_hive): Ditto.
-	* security.cc (convert_sid_to_string_sid): New function.
-	(get_ssid): Renamed to `convert_string_sid_to_sid'.
-	(get_pw_sid): Call `convert_string_sid_to_sid' instead of `get_ssid'.
-	(get_gr_sid): Ditto.
-	(get_admin_sid): Ditto.
-	(get_system_sid): Ditto.
-	(get_creator_owner_sid): Ditto.
-	(get_world_sid): Ditto.
-	* shared.h: New prototypes for `get_registry_hive_path' and
-	`load_registry_hive'.
-	* spawn.cc (spawn_guts): Set child->psid to NULL to force calling
-	`internal_getlogin' from child process in case of changing user context.
-	Call `load_registry_hive' in case of changing user context.
-	(_spawnve): Copy user infos only if user context remains the same.
-	* uinfo.cc: Add load statement for `NetUserGetInfo'.
-	Remove load statement for `NetGetDCName'.
-	(internal_getlogin): Rewrite to speed up process startup
-	and to correct user environment in case user context changes.
-	(uinfo_init): Call internal_getlogin only if myself->psid is NULL,
-	that is user context changes.
-	* winsup.h: Add prototypes for `convert_sid_to_string_sid',
-	`convert_string_sid_to_sid' and `get_pw_sid'.
-
-Sun Jun 18 13:42:50 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (set_name): Don't use 'unix' as name since this is defined
-	by gcc now.
-	* fhandler.cc (set_name): Ditto.
-
-2000-06-17  Kazuhiro Fujieda <fujieda@jaist.ac.jp>
-
-	* winsup.h (isabspath): Don't report `C:foo' as an absolute path.
-
-Sat Jun 17 13:51:48 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Detect "cross-hosting" situation and set appropriate
-	variables in Makefile to avoid building excess stuff.
-	* configure: Regenerate.
-	* Makefile.in: Accommodate above change.
-
-Sat Jun 17 19:52:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* pinfo.cc (pinfo_init): Revert previous patch.
-
-Sat Jun 17 13:29:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* pinfo.cc (pinfo_init): Add missing initializers.
-	* uinfo.cc (internal_getlogin): Request domain infos only
-	when ntsec is ON.
-
-Fri Jun 16 19:27:27 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Just use library files from this tree when building
-	cygrun.exe.
-	* path.cc (chdir): Don't set cache to offending chdir.  Change comment
-	to reflect current reality.
-
-Fri Jun 16 20:55:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygwin.din: Define symbols for `cygwin_logon_user' and
-	`cygwin_set_impersonation_token'.
-	* dcrt0.cc (dll_crt0_1): Eliminate superfluous conditional
-	statements.
-	Add load statements for `ImpersonateLoggedOnUser', `LogonUserA'
-	and `RevertToSelf'.
-	* fork.cc (fork): Care for correct impersonation of parent
-	and child process.
-	* security.cc (cygwin_set_impersonation_token): New function.
-	(cygwin_logon_user): Ditto.
-	shared.h (class pinfo): New members `orig_uid', `orig_gid',
-	`real_uid' nad `real_gid'.
-	spawn.cc (spawn_guts): Care for impersonation when starting
-	child process in a different user context.
-	* syscalls.cc (setgid): Call `setegid' now. Set real_gid.
-	(setuid): Call `seteuid' now. Set real_uid.
-	(seteuid): Functionality moved from setuid to here. Care for
-	correct impersonation.
-	(setegid): Functionality moved from setgid to here.
-	* uinfo.cc (uinfo_init): Initialization of additional pinfo
-	members.
-	(getuid): Return real uid.
-	(getgid): Return real gid.
-	(geteuid): Return effective uid.
-	(getegid): Return effective gid.
-	include/sys/cygwin.h: Add prototypes for `cygwin_logon_user' and
-	`cygwin_set_impersonation_token'.
-	include/cygwin/version.h: Bump API minor version to 22.
-
-Thu Jun 15 15:43:50 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_posix_path): Convert path to POSIX if it seems to
-	be a Windows path.
-
-2000-06-15 Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* path.cc (mount_info::add_item): Eliminate a trailing backslash
-	included in a native path starting with '//[A-Za-z]/...'.
-	* path.cc (mount_info::del_item): Accept a native path as its target.
-
-Wed Jun 14 23:47:19 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (conv_envvars): Detect and convert all environment
-	variables used by libiberty's choose-temp.c
-
-Tue Jun 13 12:41:41 2000  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* path.cc (mount_info::add_item): The previous patch can't handle
-	the case of overwriting a mount entry.
-
-Tue Jun 13 00:17:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* thread.h: Shorten "current_directory" variables to "cwd_*"
-	throughout.
-	* path.cc: Ditto.
-	(normalize_posix_path): Add some extra debugging info.
-	(chdir): Ditto.  Store chdir'ed posix and MS-DOS directory names in
-	"cache" here rather than trying to derive them later.
-
-Sun Jun 11 15:57:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_random.cc (read): Call CryptAquireContext with
-	CRYPT_VERIFYCONTEXT.
-
-Thu Jun  8 22:49:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (path_conv::check): Erase two lines checked in
-	by mistake.
-
-Thu Jun  8 15:53:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::open): Check for directory
-	to set O_DIROPEN on directories anyway.
-
-2000-06-07  Kazuhiro Fujieda <fujieda@jaist.ac.jp>
-
-	* path.cc (mount_info::init): Eliminate the mount_slash feature.
-	(mount_slash): Eliminated.
-	(mount_info::read_mounts): Eliminate looking up existing entries. The
-	loop for deleting cygpath entries is done only when such entries exist.
-	(mount_info::from_registry): Eliminate sorting.
-	(mount_info::add_item): Call add_reg_mount if necessary. Check nmounts
-	more precisely. Use strcasematch in looking up existing entries.
-	(mount_info::del_item): Call del_reg_mount if necessary. Use
-	strcasematch. Use memmove instead of memcpy.
-	(mount_info::import_v1_registry): Everything is done in this method.
-	(mount_info::to_registry): Eliminated.
-	(mount_info::from_v1_registry): Eliminated.
-	(cygwin_umount): Simply call del_item.
-	* shared.h: Modify the declaration of add_item and del_item. Remove the
-	declaration of from_v1_registry.
-
-Wed Jun  7 23:56:10 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump DLL minor version number to 3.
-
-2000-06-07  DJ Delorie  <dj@cygnus.com>
-
-	* cygwin.din: add cygwin_dll_init
-	* dcrt0.cc (cygwin_dll_init): new
-	(dll_crt0_1): short circuit if manually loaded
-	* path.cc (mount_info::init): don't init if manually loaded
-
-Wed Jun  7 13:47:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/netinet/in_systm.h: New file.
-	* include/cygwin/in_systm.h: Ditto.
-
-Thu Jun  1 01:55:45 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc: Remove unneeded include.
-	* dcrt0.cc: Wrap LoadDLLfunc stuff in dummy function.
-	* init.cc: Ditto.
-	* uinfo.cc: Ditto.
-
-2000-05-31  DJ Delorie  <dj@cygnus.com>
-
-	* include/cygwin/version.h: use decimal, NOT octal
-
-Wed May 31 16:40:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::open): Check for executable
-	even if ntsec is on if filesystem doesn't support ACLs.
-
-Wed May 31 15:57:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* dcrt0.cc: Use LoadDLLfuncEx for loading Crypto API functions
-	with parameter `notimp' set to 1.
-
-Tue May 30 16:58:33 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::conv_to_win32_path): Previous patch was too
-	aggressive in adding a trailing slash.
-
-Mon May 29 20:31:01 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Remove libadvapi32.a.
-	* autoload.h: Add additional field to autoload block for handling
-	unimplemented functions.
-	(LoadDLLfuncEx): New function which accepts additional parameter for
-	controlling unimplemented function behavior.
-	(LoadDLLfunc): Use LoadDLLfuncEx.
-	* dcrt0.cc: Use new arguments for LoadDLLfunc.  Add advapi32 routines.
-	(noload): Rewrite in assembler.  Handle new unimplemented function
-	type.
-	* exceptions.cc: Eliminate another vestige of StackWalk stuff.
-	* net.cc: Use new arguments for LoadDLLfunc.
-	* uinfo.cc: Ditto.
-
-Mon May 29 20:18:47 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* config.h.in: Remove obsolete define.
-	* path.h (isdrive): New macro.
-	* dcrt0.cc (globify): Use new macro to determine if a string refers to
-	an MS-DOS drive.
-	* environ.cc (winenv): Ditto.
-	* spawn.cc (find_exec): Ditto.
-	* path.cc (get_raw_device_number): Ditto.
-	(mount_info::conv_to_posix_path): Ditto.
-	(chdir): Ditto.
-	(cygwin_posix_path_list_p): Ditto.
-	(cygwin_split_path): Ditto.
-	(path_conv::check): Move tmp_buf to beginning of function since it can
-	be used earlier in the loop.  Use tmp_buf rather than 'root' to hold
-	root information.
-	(mount_info::conv_to_win32_path): Add trailing slash to end of mount
-	path when it translates to a drive.  Add defensive code to avoid
-	writing beyond the end of 'dst'.
-
-Sat May 27 15:57:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_random.cc (read): Use CRYPT_MACHINE_KEYSET in
-	call to CryptAcquireContext() to serve users that did not
-	log in interactively.
-
-Fri May 26 11:16:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* errno.cc (errmap): Map ERROR_BAD_NET_NAME to errno ENOSHARE.
-
-Fri May 26 02:23:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.h (sigframe::set): Accept a default frame pointer.
-	* sigproc.cc (sig_send): Use passed in frame pointer, if appropriate.
-
-Thu May 25 17:44:25 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dir.cc (rmdir): Use file attributes that have already been discovered
-	by path_conv.
-
-2000-05-25  Kazuhiro Fujieda <fujieda@jaist.ac.jp>
-
-	* dir.cc (rmdir): Correct the manner in checking the target directory.
-
-Wed May 24 21:59:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* dir.cc (writable_directory): Comment out previous code,
-	return always 1 for now.
-	(mkdir): Call set_file_attribute explicitely with S_IFDIR mode bit.
-	* syscalls.cc (chown_worker): Ditto.
-	(chmod): Ditto.
-	* security.cc (get_nt_attribute): Fix error in debug output.
-	Never set FILE_DELETE_CHILD for files.
-	Construct appropriate inherit attribute according to file type.
-
-2000-05-23  DJ Delorie  <dj@cygnus.com>
-
-	* syscalls.cc (_cygwin_istext_for_stdio): New, for newlib
-	* include/cygwin/version.h: Bump API number for detect old
-	programs using old getc/putc macros
-
-2000-05-23  DJ Delorie  <dj@cygnus.com>
-
-	* dir.cc (writable_directory): handle root directories
-
-Tue May 23 10:09:26 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* uname.cc (uname): Use a "s" to denote a snapshot to avoid confusion
-	with the number "5".
-
-Tue May 23 10:01:07 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::conv_to_posix_path): Avoid putting a trailing
-	slash on a directory name when the ms-dos path spec is a root directory
-	of a device.
-	* registry.cc (reg_key::build_reg): Set 'key_is_invalid' flag rather
-	than using an INVALID_HANDLE_KEY.
-	(reg_key::get_int): Test for key validity before performing registry
-	operations.
-	(reg_key::set_int): Ditto.
-	(reg_key::get_string): Ditto.
-	(reg_key::set_string): Ditto.
-	(reg_key::kill): Ditto.
-	(reg_key::~reg_key): Ditto.
-
-Tue May 23 01:13:33 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh: Use snapshot date as build date since it is more
-	interesting.
-	* uname.cc (uname): Detect if this is a snapshot build and add an "S"
-	to the version number.  Report the snapshot date as the release date.
-
-Mon May 22 17:11:25 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (regopt): Scan HKLM if HKCU scan fails.
-
-Mon May 16 23:39:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* dir.cc (rmdir): Care for misleading error messages
-	when trying to remove a directory on a samba share.
-	Eliminate superfluous else branch.
-	* syscalls.cc (_rename): Additional check for ERROR_FILE_EXISTS
-	if MoveFile fails.
-
-Sun May 21 20:51:44 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Move uinfo_init call to before sigproc_init to
-	avoid a race.
-	(noload): Add an extra argument for debugging.
-	* uinfo.cc (uinfo_init): Eliminate test for multiple calls.
-	(getlogin): Assume that uinfo_init has already been called.
-
-Sat May 20 01:34:57 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interruptible): Add an argument to control whether
-	function just checks for validity.  Flag module handle == 0 as
-	noninterrupible.
-	(call_handler): Always acquire and release ebp lock.  Loop for only a
-	fixed amount of time attempting to grab mutos and find an interruptible
-	PC.
-
-2000-05-19  DJ Delorie  <dj@cygnus.com>
-
-	* syscalls.cc (setmode): change mode of any matching FILE* also.
-
-Thu May 18 17:28:19 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Remove external.h dependency.
-	* dcrt0.cc (sigthread::init): Move here from sigproc.h.
-	* sigproc.h (sigthread): Move init to dcrt0.cc.
-
-Thu May 18 01:28:02 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (thread_pipe): Add paranoid check to ensure thread
-	termination.
-	* external.cc: Eliminate obsolete include.
-	* getopt.c (getopt_long): Fix compiler warning.
-	* shared.h: Moved PID_ definitions to include/sys/cygwin so that they
-	can be used by external programs.
-	* include/sys/cygwin.h: Move external definitions here.  Include
-	sys/resource.h to avoid having to do this everywhere.
-
-Thu May 18 01:04:02 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.h (sigframe): Don't set frame info unless tid matches this
-	thread id.
-
-Wed May 17 23:13:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Initialize mainthread stuff here before
-	anything needs it.
-	* sigproc.cc (sigproc_init): Move mainthread initialization out of
-	here.
-	* sigproc.h (sigthread): Add init() method.
-	(sigframe): Don't try to initialize muto.
-	* sync.cc: Undef WaitForSingleObject to avoid recursion.
-
-2000-05-17  DJ Delorie  <dj@cygnus.com>
-
-	* testsuite/winsup.api/crlf.c: New
-	* testsuite/winsup.api/iospeed.c: New
-
-Wed May 17 01:05:52 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::cygdrive_posix_path): Don't add trailing slash
-	if referring to something like c:\.
-	* dcrt0.cc (dll_crt0_1): Move uinfo initialization prior to sig_send
-	initialization to give signal thread a chance to finish.
-	* debug.cc (WFSO): Move to sigproc.cc
-	(WFMO): Ditto.
-	* exceptions.cc (interruptible): Allocate slightly more space for
-	directory just for paranoia's sake.
-	(call_handler): Eliminate nonmain argument.  Determine if main thread
-	has set a frame pointer and use it if so.
-	(sig_handle): Eliminate nonmain argument.
-	* net.cc: Record frame information in appropriate routines throughout.
-	* select.cc (select): Ditto.
-	* sigproc.cc: Use sigthread structure to record mainthread id
-	throughout.
-	(sig_send): Record frame information for signal handler.
-	(wait_sig): Reflect argument change in sig_handle.
-	(WFSO): Move here and record frame information for signal handler.
-	(WFMO): Ditto.
-	* sigproc.h: Implement new "sigthread" class.  Implement "sigframe"
-	class for manipulating signal frame info.
-	* thread.cc (__pthread_kill): Use standard _kill() function rather than
-	calling sig_send directly.
-	* winsup.h: Eliminate ebp element from signal_dispatch class.
-
-Tue May 16 23:39:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	Patch suggested by John Rowley <wjr@bgs.ac.uk>
-	* fhandler_tape.cc (fhandler_dev_tape::ioctl): Check
-	for filemark feature on MTWEOF operation.
-
-Tue May 16 11:49:13 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/in.h (AF_INET6): Use correct in6_addr struct.
-
-Mon May 15 00:35:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump DLL minor version number to 2.
-
-Sun May 14 23:41:24 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* shared.h: Bump PROC_MAGIC.
-	* include/cygwin/version.h: Bump API minor to accommodate two recent
-	exports.
-
-2000-05-13  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/cygwin/socket.h (AF_INET6): Use same value as winsock2.
-
-2000-05-12  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/cygwin/in.h (struct in6_addr): Fix spelling.
-	* include/cygwin/socket.h (AF_INET6, PF_INET6): Define macros.
-	(AF_MAX, PF_MAX): Bump to 32 to leave room for future expansion.
-
-Fri May 12 21:35:54 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (build_argv): Remove unneeded variable.
-	* select.cc (peek_pipe): Don't check for "ready" if it's already set.
-	(peek_console): Ditto.
-	(peek_serial): Ditto.
-	(peek_socket): Ditto.
-	(peek_windows): Ditto.
-
-Fri May 12 20:31:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_raw.cc (write_file, read_file): New wrapper functions
-	for WriteFile and ReadFile to get rid of ERROR_MEDIA_CHANGED
-	and ERROR_BUS_RESET in case of first access to tape.
-	(fhandler_dev_raw::raw_write): Use write_file instead of WriteFile.
-	(fhandler_dev_raw::raw_read): Use read_file instead of ReadFile.
-
-Fri May 12 01:04:57 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in (DLL_OFILES): Sort.
-	* fhandler_tty.cc (fhandler_tty_slave::send_ioctl_request): Eliminate.
-	(fhandler_tty_slave::ioctl): Rewrite to avoid races.
-
-2000-05-11  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* mmap.cc (list::erase): Increment loop counter.
-	(map::erase): Likewise.
-
-Thu May 11 00:54:00 2000  Charles Wilson <cwilson@ece.gatech.edu>
-
-	* cygwin.din: insure that regsub() is included in
-	cygwin1.dll
-
-Tue May  9 18:59:41 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Use appropriate VARIABLE to refer to cygwin.def in load
-	line.
-
-Thu May  9  23:53:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::puts_readahead): Change
-	while condition to disallow wild runs.
-
-Thu May  9  15:24:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	Patch suggested by <lha@stacken.kth.se>
-	* window.cc (setitimer): Check for overflow condition
-	in tv_sec.
-
-Thu May  9  0:47:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	Patch suggested by Eric Fifer <EFifer@sanwaint.com>
-	* errno.cc: Change mapping of ERROR_BAD_PATHNAME to ENOENT.
-
-Thu May  9  0:47:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (symlink::info): Treat non readable files
-	as normal non symlink files.
-
-2000-05-08  Paul K. Fisher  <pfisher@plexware.com>
-
-	* include/pthread.h (pthread_detach): Add missing prototype.
-	(pthread_join): same.
-
-2000-05-08  DJ Delorie  <dj@cygnus.com>
-
-	* fhandler.cc (lock): use signed math to allow checking ranges
-	properly.
-
-Sat May  6 23:22:25 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (insert_file): Eliminate unused parameter.
-	(build_argv): Ditto.
-	* exceptions.cc (stack): Eliminate unused parameters.
-	(stackdump): Ditto.
-	(cygwin_stackdump): Reflect above changes.
-	(sig_handle): Ditto.
-	* fhandler.cc (fhandler_base::set_inheritance): Use kludge to avoid
-	unused parameter warning.
-
-2000-05-06  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/wchar.h (wcscmp, wcslen): Fix prototypes.
-	* syscalls.cc (wcslen, wcscmp): Adjust.
-
-Fri May  5 23:32:07 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* errno.cc (errmap): Correct DIRECTORY mapping to ENOTDIR.
-
-2000-05-04  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Makefile.in (install): Install profile startup and library.
-
-Wed May  3 21:54:11 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Use -gstabs+ as compile debug option.  This seems to
-	promote better handling of symbols.
-	* configure: Regenerate.
-	* delqueue.cc (delqueue_list::process_queue): Allow ERROR_ACCESS_DENIED
-	to indicate that a file is being shared under Windows 95.
-	* syscalls.cc (_unlink): Use full path name.  Take special action for
-	Windows 95.  Assume that an ERROR_ACCESS_DENIED indicates a sharing
-	violation unless it's on a remote drive.  Punt if there is an
-	ERROR_ACCESS_DENIED on a remote drive.
-
-Wed May  3 18:07:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* errno.cc (errmap): Map ERROR_BAD_NETPATH to new errno ENOSHARE.
-	(_sys_errlist): Add entry for ENOSHARE.
-	(strerror): Add case for ENOSHARE.
-	* syscalls.cc (stat_worker): Check for errno ENOSHARE.
-
-Wed May  3 17:28:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* Makefile.in: Add dependencies for fhandler_random.o
-	* fhandler.h: Add device type FH_RANDOM. Add class
-	fhandler_dev_random.
-	* fhandler_random.cc: New file. Implementation of
-	fhandler_dev_random.
-	* hinfo.cc (build_fhandler): Add case for FH_RANDOM.
-	* path.cc: Add device names for random devices to
-	windows_device_names.
-	(get_device_number): Add if branch for random devices.
-	(win32_device_name): Add device name generation for
-	random devices.
-	winsup.h: Include <wincrypt.h>.
-
-2000-05-02  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* path.cc (mount_info::conv_to_win32_path): Previous patch
-	failed to set flags on a win32 path.
-
-Tue May  2 11:34:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (read_sd): Return 1 on success because we
-	can't rely on the returned SD size from GetFileSecurity.
-
-Tue May  2  2:22:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* dcrt0.cc: Add dynamic load code for `OemToCharA' from user32.dll.
-	* security.cc (read_sd): Call `OemToCharA' to make
-	`GetFileSecurity' happy on filenames with umlauts.
-
-Wed Apr 26 23:23:23 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_win32_path): Don't add a trailing slash when one
-	already exists.
-	(mount_info::conv_to_win32_path): Use existing code for dealing with
-	relative path names when input is already a win32 path.
-
-2000-04-26  DJ Delorie  <dj@cygnus.com>
-
-	* Makefile.in (install): install regexp.h
-
-Wed Apr 26 16:20:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (stat_worker): Previous patch could succeed
-	in stating a non-existant file.
-
-Wed Apr 26 01:07:16 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interruptible): Allocate slightly more space for
-	directory name check.  Windows 95 seems to null-terminate the directory
-	otherwise.
-	(interrupt_on_return): Issue a fatal error if we can't find the
-	caller's stack.
-
-Tue Apr 25 16:50:54 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (find_exec): Accept a path_conv argument rather than a
-	buffer so that the caller can find things out about a translated path.
-	(perhaps_suffix): Ditto.
-	(spawn_guts): Allocate path_conv stuff here so that we can find out
-	stuff about the translated path (this is work in progress).
-	* environ.cc (environ_init): Accept an as-yet unused argument
-	indicating whether we were invoked from a cygwin parent or not.
-	(winenv): Ditto.
-	(posify): Accept an argument indicating whether the path has already
-	been translated.
-	* dlfcn.cc (check_access): Provide a path_conv buffer to find_exec.
-	* exec.cc (sexecvpe): Ditto.
-	* path.cc (path_conv::check): Rename from path_conv::path_conv.
-	(mount_item::getmntent): Recognize "Cygwin executable" bit.
-	(symlink_info::check): Remove debugging statements.
-	* path.h (class path_conv): Add iscygexec method.  Rewrite constructor
-	to call "check" method to allow multiple operations on a path_conv
-	variable.
-	* pinfo.cc (pinfo_init): Pass argument to environ_init.
-	* shared.h: Bump PROC_MAGIC.
-	* winsup.h: Reflect above changes to function arguments.
-	* include/sys/mount.h: Add MOUNT_CYGWIN_EXEC type.
-
-Thu Apr 25 21:35:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (stat_worker): Previous patch failed to stat
-	each drives root dir on 9X.
-
-Thu Apr 25 16:37:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::open): Check for allow_ntsec
-	when determining exec flag.
-	* path.cc (symlink_info::check): Remove call to get_file_attribute().
-	* security.cc (read_sd): Rename, ditto for variables to conform
-	to common naming convention. Use GetFileSecurity() instead of
-	BackupRead() to avoid permission problems when reading ACLs.
-	(write_sd): Same renaming as for read_sd().
-	(alloc_sd): Change default permissions according to Linux permissions
-	for group and world when write permission is set.
-	* syscalls.cc (stat_worker): Avoid different permission problems
-	when requesting file informations.
-
-Thu Apr 25 10:50:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc: Avoid a warning in declaration inet_network.
-
-Mon Apr 24 17:38:25 2000  Thorsten Otto <t.otto@germanynet.de>
-
-	* fhandler_console.cc (fhandler_console::read): Detect extended keycode
-	information for Windows 9x so that function keys will work correctly.
-
-2000-04-24  Vadim Egorov  <egorovv@mailandnews.com>
-
-	* net.cc (cygwin_inet_network): new function.
-	* cygwin.din (inet_network): new export
-
-Fri Apr 21 10:37:08 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_posix_path): Previous two patches were still
-	incorrect so rewrite this function to deal with trailing dots.
-	(mount_info::conv_to_win32_path): Just check for '/' where appropriate.
-	Eliminate nofinalslash call since it is handled in normalize_posix_path
-	now.
-
-Thu Apr 20 17:32:42 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_exceptions): Search further for stack info to
-	accommodate Windows 95.
-
-Thu Apr 20 16:39:18 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_posix_path): Previous change failed to take root
-	access into account.
-
-Thu Apr 20 11:26:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (_link): Check new link path for trailing dot.
-
-Thu Apr 20 00:32:03 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_base::hclose): New virtual method.
-	(fhandler_base::set_inheritance): Make this a method so that we can use
-	the appropriate close methods.
-	* fhandler.cc (fhandler_base::set_inheritance): Ditto.
-	* path.cc (normalize_posix_path): Eliminate /.  trailing path
-	component.
-
-Wed Apr 20  0:19:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (setuid): Allow switching user context after
-	successful call to ImpersonateLogedOnUser (NT only).
-	(setgid): Ditto.
-	(seteuid): Call setuid.
-	(setegid): Call setgid.
-
-Wed Apr 19 22:00:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* uinfo.cc (internal_getlogin): Use NetGetDCName() instead
-	of NetGetAnyDCName().
-
-Mon Apr 17 12:08:47 2000  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* syscalls.cc (_rename): Try MoveFile() at first before
-	MoveFileEx(..., MOVEFILE_REPLACE_EXISTING).
-
-Tue Apr 18 19:15:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (globify): Don't use \ quoting when apparently quoting a DOS
-	path spec, even within a quoted string.
-
-Sun Apr 16 18:54:21 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* init.cc (dll_entry): Use better check for determining when to set
-	thread specific stuff.
-	* syscalls.cc (_unlink): Continue with chmod'ing file even if
-	DELETE_ON_CLOSE succeeds, if file still exists.
-
-Fri Apr 14 23:51:15 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (keytable): Add support for keypad 5 key, which
-	MS seems to think is equivalent to VK_CLEAR.
-	* debug.cc (thread_stub): Eliminate initialization of reent stuff.
-	* init.cc (dll_entry): Move it here.
-
-Thu Apr 13 18:32:26 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (insert_file): Avoid freeing previously allocated argument
-	list.
-	* path.cc (symlink_info::check): Rename from symlink_check_one.  Use
-	new symlink_info struct for communication.
-	(path_conv::path_conv): Use symlink_info structure for communication
-	with symlink_info::check.  Fix typo which resulted in symbolic links
-	always being resolved.
-	(readlink): Use stat_suffixes array when resolving a link.
-	* syscalls.cc (stat_suffixes): Make global.
-
-Thu Apr 13 20:50:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/cygwin/version.h: Bump minor api to reflect export change.
-
-Thu Apr 13  8:48:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (conv_to_win32_path): Detect a win32 path
-	if path contains backslashes.
-	* cygwin.din: Add symbol for `lacl'.
-	* security.cc (ReadSD): Add debug output.
-	(acl_worker):  New static function.
-	(acl): Call acl_worker now.
-	(lacl): New function.
-	(facl): Call acl_worker now.
-	* include/cygwin/acl.h: Add prototype for `lacl'.
-
-Wed Apr 12 18:48:33 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::path_conv): Ensure that suffix is correctly
-	copied to path when we've found a symlink but aren't following
-	symlinks.
-
-Sat Apr  8 00:46:14 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Allocate enough space for
-	root dir determination or overflow an array.
-
-Sat Apr  8 00:08:53 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sigsave): Copy on fork so that we can restore correct
-	behavior in forked process.
-	(interruptible): Flag as interruptible when running in main process
-	module.
-	(interrupt_setup): Save return address and address of return address.
-	(signal_fixup_after_fork): New function.  Uses above two values to
-	restore proper behavior to forked process.
-	(interrupt_on_return): Pass return address address to interupt_setup.
-	(interrupt_now): Pass NULL for return address address to
-	interrupt_setup.
-	* fork.cc (fork): Call signal_fixup_after_fork.
-	* shared.h: Lint cleanups.
-	* winsup.h: Ditto.
-
-Mon Apr  3 14:10:44 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (select_stuff): Eliminate use of 'total'.
-	* select.cc (cygwin_select): Ditto.
-	(select_stuff::wait): Use maximum size for w4 rather than calculating
-	what will fit.
-
-Mon Apr 03 13:58:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* grp.cc (parse_grp): Save empty array instead of
-	NULL in gr_mem if no supplementary group is given.
-
-Sun Apr 02 16:02:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (chown_worker): Use previous uid/gid if
-	new uid/gid is -1.
-
-Fry Mar 31 22:55:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (chown_worker): New static function with
-	chown functionality.
-	(chown): Call chown_worker with SYMLINK_FOLLOW.
-	(fchown): New function. Call chown_worker with SYMLINK_FOLLOW.
-	(lchown): New function. Call chown_worker with SYMLINK_IGNORE.
-	* cygwin.din: Add symbols for fchown, lchown.
-
-Fry Mar 31 11:18:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (symlink): Call `set_file_attribute()' and
-	`SetFileAttributeA()' instead of `chmod()' to set
-	uid/gid correct.
-
-Wed Mar 29 22:49:56 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (select_record): Explicitly zero elements of this class.
-	(select_stuff): Ditto.
-	* select.cc (cygwin_select): Eliminate memset zero of sel.
-
-Tue Mar 28 16:45:42 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Use default rules when compiling cygrun.o.
-	* dcrt0.cc (host_dependent_constants::init): Limit non-NT platforms to
-	32K chunks when copying regions during a fork.
-	* path.cc (symlink_check_one): Add temporary debugging output.
-	Simplify PATH_EXEC test.
-	* syscalls.cc (stat_suffixes): Null terminate this list.
-
-Sat Mar 25 20:46:39 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (symlink_check_one): Recognize symlink settings from the
-	mount table.
-	* path.h: Make PATH_SYMLINK an alias for MOUNT_SYMLINK.
-	* syscalls.cc (stat_worker): Use extension search mechanism in
-	path_conv to look for .exe rather than trying to special case it here.
-	* mount.h: Make MOUNT_SYMLINK a real option.
-
-Sat Mar 25 00:22:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc: Add TMPDIR to the list of environment variables which are
-	converted to POSIX format.
-	* sigproc.cc (proc_terminate): Don't attempt to delete when a muto
-	pointer is NULL.
-
-Sun Mar 19 12:01:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (stat_worker): Set st_nlink to 1 on remote drives.
-
-Sat Mar 18 23:04:27 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* times.cc: Fix extern declarations for variables that are exported but
-	used by this modules.
-
-Sat Mar 18 01:32:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (host_dependent_constants::init): Eliminate DELETE flag
-	from shared constant.
-
-Sat Mar 18 01:24:25 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* delqueue.cc (delqueue_list::queue_file): Add some debugging.
-	* path.h (class path_conv): Add a char * operator for the most common
-	case.
-	* syscalls.cc (_unlink): Rewrite to use FILE_FLAG_DELETE_ON_CLOSE when
-	possible (i.e., on NT).
-
-Fri Mar 17 18:16:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	Patch suggested by Eric Fifer <EFifer@sanwaint.com>
-	* fhandler.cc (fhandler_base::open): Call set_file_attribute()
-	only if a file is really created.
-
-Thu Mar 16 14:15:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (set_process_privileges): Remove `static'.
-	(get_nt_attribute): Returns uid and gid additionally. Remove call
-	to set_process_privileges().
-	(get_file_attribute): Returns uid and gid additionally. Don't
-	call ntea if ntsec is ON.
-	(set_nt_attribute): Remove call to set_process_privileges().
-	Don't call ntea if ntsec is ON.
-	(acl): Remove call to set_process_privileges().
-	* dcrt0.cc (dll_crt0_1): Call set_process_privileges().
-	* winsup.h: New prototype for set_process_privileges(),
-	changed prototype for get_file_attribute().
-	* fhandler.cc (get_file_owner): Discard function.
-	(get_file_group): Ditto.
-	(fhandler_disk_file::fstat): Discard calls to get_file_owner() and
-	get_file_group().
-	* path.cc (path_conv::path_conv): New debugging output for result
-	of GetVolumeInformation().
-	(mount_info::conv_to_win32_path): Call backslashify() with pathbuf
-	instead of src_path.
-	* syscalls.cc (chown): Reformat slightly.
-	(chmod): Replace get_file_owner() and get_file_group() calls
-	by a call to get_file_attribute(). Discard local variable has_acls.
-	Reformat slightly.
-	(stat_worker): Root dir check now done by a call to rootdir().
-	Don't call num_entries() on remote drives.
-	Discard local variable has_acls.
-
-Wed Mar 15 20:38:06 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* errno.cc: Map ERROR_NOACCESS to EFAULT.
-
-Wed Mar 15 14:25:38 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Restore dependency on signal_arrived.  It's
-	needed to wake up the WaitForSingleObject.
-
-Tue Mar 14 23:41:16 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Pipe changes throughout suggested by Eric Fifer <EFifer@sanwaint.com>
-	* debug.cc (threadname_init): Pass name of lock as arg 2 of new_muto.
-	* malloc.cc (malloc_init): Ditto.
-	* sigproc.cc (sigproc_init): Ditto.
-	* exceptions.cc (events_init): Ditto.
-	(call_handler): Eliminate special case for hExeced.  Report locked
-	thread in debugging output.
-	* fhandler.cc (fhandker_pipe::fhandler_pipe): Propagate device type to
-	base class.
-	* fhandler.h (fhandler_pipe): Ditto.
-	* hinfo.cc (hinfo::build_fhandler): Pass specific type of pipe to
-	constructor.
-	* spawn.cc (spawn_guts): Eliminate dependency on signal when waiting
-	for subprocess.
-	* strace.cc: Remove obsolete #ifdef.
-	* sync.cc (muto::muto): Save the name of the muto.
-	(muto:~muto): Also release the muto.
-	* sync.h: Add a muto name field.
-	* select.cc (peek_pipe): Avoid doing a PeekNamedPipe on the write end
-	of a pipe.
-
-Sun Mar 12 01:14:33 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::get_readahead_into_buffer): New function.
-	* fhandler.h: Declare new function.  Add extra argument to
-	process_slave_output.
-	* fhandler_console.cc (fhandler_console::read): Move read ahead code to
-	new function.
-	* fhandler_tty.cc (fhandler_pty_master::process_slave_output): Move
-	common code here.
-	(fhandler_tty_slave::read): Understand readahead.
-	(fhandler_pty_master::read): Move code to process_slave_output.
-	* select.cc (peek_pipe): Avoid performing certain checks when non-read
-	and on inappropriate fh types.
-
-Sat Mar 11 22:47:43 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (fhandler_console::read): Don't even think about
-	breaking on interrupt if executing in a "cygwin" thread.
-	* fhandler_tty.cc (fhandler_pty_master::process_slave_output):
-	Streamline, simplify code.
-	* sigproc.cc (sig_send): Remove debugging statement.
-
-Fri Mar 10 13:20:50 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc: Set wait_sig priority to normal.
-
-Fri Mar 10 13:03:06 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (wait_sig): Add addtional debugging output.
-
-Thu Mar  9 15:25:01 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc: Eliminate oldstack CYGWIN option.
-	* exceptions.cc (sfta): Eliminate obsolete function.
-	(sgmb): Eliminate obsolete function.
-	(class stack_info): Remove MS method for walking the stack.
-	(stack_info::init): Just initialize required fields.
-	(stack_info::brute_force): Rename to stack_info::walk.
-	(handle_exceptions): Pass derived frame pointer to sig_send.
-	(interrupt_setup): Clear saved frame pointer here.
-	(interrupt_on_return): thestack is no longer a pointer.
-	(call_handler): Accept a flag to indicate when a signal was sent from
-	other than the main thread.  Use saved frame pointer for determining
-	where to place signal handler call.
-	(sig_handle): Accept "nonmain" argument.  Pass it to call_handler.
-	* fhandler_tty.cc (fhandler_tty_common::__acquire_output_mutex): Change
-	debugging output slightly.
-	* (fhandler_tty_common::__release_output_mutex): Ditto.
-	(fhandler_tty_slave::read): Fix a comment, remove a goto.
-	* sigproc.cc (sig_send): Accept an optional frame pointer argument for
-	use when suspending the main process.  sigcomplete_main is an autoreset
-	event now.  Save frame pointer for non-main operation.
-	(wait_sig): Make sigcomplete_main an autoreset event.  Eliminate
-	NOSIGQUEUE.  Pass rc to sig_handle to signify if this was a nonmain
-	process.
-	* sigproc.h: Reflect change to sig_send argument.
-	* syscalls.cc (swab): Eliminate swab function since it is now available
-	in newlib.
-	* winsup.h (signal_dispatch): Change CONTEXT cx to DWORD ebp.
-
-Tue Mar  7 13:31:10 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (sig_send): Eliminate sync_sig_send synchronization since
-	it didn't seem to affect the "bash hangs" problem.
-
-Tue Mar  7 13:17:56 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* mcount.c: Remove strace.h include.
-
-Tue Mar  7 00:29:34 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout use strace class in place of individual functions and
-	variables.
-	* cygwin.din: Eliminate _strace_wm.
-	* sigproc.cc (wait_sig): Temporarily add more debugging output.
-	* include/cygwin/version.h: Bump minor api to reflect export change.
-
-Sun Mar  5 01:17:05 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_handler): Streamline to use only one call to
-	ResumeThread.
-	* sigproc.cc (sig_send): Use a muto around the ReleaseSemaphore.
-	Remove priority setting since it didn't solve anything.
-
-Tue Feb 29 00:46:09 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (sig_send): Temporarily set priority to highest while
-	sending a signal.
-
-Mon Feb 28 11:23:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (set_myself): Add build date to strace output.
-
-Mon Feb 28 11:17:30 2000  Eric Fifer <EFifer@sanwaint.com>
-
-	* sigproc.cc (proc_subproc): Only clear wait event when not attending
-	to a signal.
-
-Mon Feb 28 00:08:09 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Remove --enable-strace-hhmmss option.
-	* configure: Regenerate.
-
-Sun Feb 27 23:11:57 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (set_os_type): Record OS name string.
-	(getprogname): Eliminate obsolete function.
-	(dll_crt0_1): Move initial strace initialization output to set_myself.
-	* exceptions.cc (interruptible): Add debugging output.
-	(interrupt_setup): New function.
-	(interrupt_now): Use interrupt_setup to set up common interrupt handler
-	stuff.
-	(interrupt_on_return): Ditto.
-	(call_handler): Move signal_arrived arm and clear threads to region
-	where signalled thread is suspended or suffer races.
-	* pinfo.cc (set_myself): Output interesting information when strace is
-	first initialized.  Initialize progname here.
-	* sigproc.cc (sig_dispatch_pending): Modify to ensure that flush signal
-	are sent synchronously.
-	* strace.cc (strace_vsprintf): Move code into strace program.
-	* uname.cc (uname): Use 'osname' global to construct cygwin name +
-	Windows type + version.
-
-Fri Feb 25 19:26:42 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interruptible): Make a little more structured.
-	(call_handler): Allow signals to be sent even if signalled thread is
-	stopped.  Change order of signal_arrived arming/waiting threads
-	clearing to eliminate a race.
-	(reset_signal_arrived): New helper function.
-	* malloc.cc (malloc_init): Use mutos so that signal handler can keep
-	track of who owns the lock.
-	(__malloc_lock): Ditto.
-	(__malloc_unlock): Ditto.
-	* sync.h (new_muto): Actually use a muto for the "buffer".
-	* Makefile.in: Fix a dependency.
-
-2000-02-25  DJ Delorie  <dj@cygnus.com>
-
-	* Makefile.in: fix "make check" support and cygrun.
-
-Thu Feb 24 15:56:00 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.c (_read): Clear errno before doing any read operation.
-
-Thu Feb 24 14:45:06 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_handler): Use new muto linked list to look for
-	all potential mutos owned by suspended thread.  Clear waiting threads
-	while thread is stopped.
-	(proc_subproc): Clarify debugging output.
-	* sync.h (class muto): Add 'next' field.
-	(new_muto): Keep linked list alive.
-
-Thu Feb 24 00:59:15 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Fix final round of gcc warnings relating to unused parameters.
-	* debug.cc (iscygthread): New function.
-	* debug.h: Declare it.
-	* exceptions.cc (set_process_mask): Flush pending signals.
-	(handle_sigsuspend): No need to flush pending signals.
-	(call_handler): Refine previous tests of muto ownership.  Only clear
-	wait()'s when we have definitely responded to a signal.
-	* fhandler_console.cc (fhandler_console::read): Don't set EINTR if
-	executing in a "cygwin" thread.
-	* sigproc.cc (proc_subproc): Use second argument to control whether
-	CLEARWAIT actually sets "signalled" flag.
-	* sync.h (muto): Add 'unstable' method.
-
-Wed Feb 23 21:59:44 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* hinfo.cc (hinfo::extend): Clean up debugging output.
-
-Wed Feb 23 21:34:58 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interruptible): Change method for determining if
-	something is interruptible.
-	(call_handler): Avoid suspending a thread if it owns a muto.  Only set
-	signal_arrived if the thread was actually interrupted.
-	(events_init): Initialize module information needed by interruptible().
-	* init.cc (dll_entry): Record module handle of main for use by
-	interruptible().
-	(proc_subproc): Reorganize handling of terminated child so that the
-	bulk of the processing comes from the signal thread.
-	(wait_sig): Force processing of waiting threads if SIGCHLD is not
-	processed.
-
-Tue Feb 22 23:06:01 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Respond to more g++ warnings relating to initializing structures.
-
-Mon Feb 21 18:36:37 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (set_inheritance): Revert previous patch which got rid of
-	'name' parameter.
-
-Mon Feb 21 00:19:40 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Respond to a multitude of new g++ warnings.
-
-Sun Feb 20 22:10:21 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (getwinenv): Make __stdcall.
-	(winenv): Ditto.
-	* malloc.cc (strdup): New function.  Occludes newlib version.
-	(_strdup_r): Ditto.
-	* winsup.h: Reflect above __stdcall changes.
-
-Sun Feb 20 21:31:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Modify get_file_attribute
-	return value if FILE_ATTRIBUTE_READONLY is set.
-
-Thu Feb 17 11:00:23 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (environ_init): Cosmetic change.
-
-Mon Feb  7 16:50:44 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: cygrun needs libshell32.a.
-
-Sun Feb  6 22:17:58 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (proc_subproc): Simplify case for when a child process is
-	stopped since new signal handler ensures the desired behavior.
-
-Sun Feb  6 21:52:33 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Fix install target so that directories will be created
-	when necessary.
-
-Sun Feb  6 18:12:17 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: exceptions.cc should depend on autoload.h.
-	* exceptions.cc: Undef DECLSPEC_IMPORT prior to including imagehlp.h to
-	avoid defining StackWalk as "import".
-	(call_handler): Minor optimizations.
-	(sig_handle_tty_stop): Fix typo in previous checkin.
-	* sigproc.cc (sigproc_init): Ditto, for signal_arrived initialization.
-
-Sat Feb  5 15:37:37 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (isquote): Convert to inline function.
-
-Sat Feb  5 00:26:01 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, rename global_signal_arrived to signal_arrived.
-	Throughout, eliminate use of arm_signals and __signal_arrived.
-	Throughout, revert to use of simple call to WaitForSingleObject or
-	WaitForMultipleObjects.
-	* debug.h: Eliminate obsolete function declaration.
-	* exceptions.cc (sigWaitForSingleObject): Eliminate obsolete function
-	definition.
-	* fhandler.h: Reflect change to select_stuff wait method.
-	* fhandler_tape.cc (get_ll): Accommodate new w32api LARGE_INTEGER
-	definition.
-	* ntea.c (NTReadEARaw): Ditto.
-	(NTWriteEA): Ditto.
-	* security.cc (ReadSD): Ditto.
-	(WriteSD): Ditto.
-	* syscalls.cc (_link): Ditto.
-	* uname.cc (uname): Eliminate PPC switch.
-
-2000-02-01  Salvador Eduardo Tropea  <salvador@inti.gov.ar>
-
-	* include/io.h: add return type to setmode()
-
-2000-01-27  DJ Delorie  <dj@cygnus.com>
-
-	* include/netdb.h (h_errno): change __imp_ to dllimport
-	* cygwin.din (reent_data): add DATA
-
-Thu Jan 27 01:07:14 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_handler): Add debugging output.
-	* select.cc (MAKEready): Arm signals earlier.
-	* sigproc.cc (__signal_arrived:arm): Move debugging version of this
-	method here.
-	(__signal_arrived::release): Ditto.
-	* sigproc.h: Recognize debugging versions of above two methods.
-	(arm_signals::WaitForMultipleObjects): Don't release signal lock unless
-	signal arrived.
-	(arm_signals::WaitForMultipleSingleObject): Ditto.
-	(arm_signals::MsgWaitForMultipleObjects): Ditto.
-
-Thu Jan 27 00:19:26 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* sync.h (new_muto): Workaround change in gcc behavior.
-
-Wed Jan 26 12:57:13 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Ensure that all required libraries are built prior
-	to linking cygrun.exe.
-
-Tue Jan 25 21:26:57 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sig_handle): Crudely work around potential problem
-	when main thread has a lock but is killed by a fatal signal.
-	* fhandler_tty.cc (fhandler_pty_master::write): Don't perform line
-	editing on the pty master (so why do we need the second argument to
-	line_edit, then?)
-	* thread.cc: Reformat to GNU standards.
-
-2000-01-11  DJ Delorie  <dj@cygnus.com>
-
-	* ROADMAP: new
-
-2000-01-11  DJ Delorie  <dj@cygnus.com>
-
-	* fhandler_zero.cc: new, emulate /dev/zero
-	* testsuite/winsup.api/devzero.c: new, test /dev/zero
-	* Makefile.in: build fhandler_zero.o
-	* fhandler.h: add support for /dev/zero
-	* hinfo.cc: ditto
-	* path.cc: ditto
-
-2000-01-11  DJ Delorie  <dj@cygnus.com>
-
-	* mmap.cc (mmap): MSDN says *one* of FILE_MAP_*, fix flags for
-	MAP_PRIVATE.
-
-Mon Jan 10 01:11:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (acl_access): New function.
-	* syscalls.cc (access): Call acl_access if ntsec is on.
-
-Mon Jan 10 01:11:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.cc (get_file_owner): Use of ReadSD() instead of
-	GetFileSecurity().
-	(get_file_group): Ditto.
-
-Sun Jan  9 15:43:07 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc (struct thread_start): Add a flag to determine whether a
-	field is in use.  Eliminate thread_start_ix since it was not
-	thread-safe.
-	(thread_stub): Use notavail flag to control whether the entry in
-	start_buf can be reused.
-	(makethread): Ditto.
-
-Sun Jan  9 20:18:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (alloc_sd): Rearrange order of ACE creation.
-	(setacl): Optimize creation of ACEs related to inheritance.  Code
-	cleanup.
-	(aclcheck): Disable check for existance of DEF_)CLASS_OBJ.
-
-Sat Jan  8 18:42:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.h: Reorg fix.
-
-Sat Jan  8 20:00:00 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din: Add new acl API calls.
-	* grp.cc (getgroups): Change to work for any username.
-	* security.cc (get_id_from_sid): Change to work with acl API.
-	(is_grp_member): New function.
-	(get_nt_attribute): Rewritten.
-	(add_access_allowed_ace): New function.
-	(add_access_denied_ace): Ditto.
-	(alloc_sd): Rewritten.
-	(setacl): New function.
-	(getace): Ditto.
-	(searchace): Ditto.
-	(getacl): Ditto.
-	(acl): Ditto.
-	(facl): Ditto.
-	(aclcheck): Ditto.
-	(acecmp): Ditto.
-	(aclsort): Ditto.
-	(acltomode): Ditto.
-	(aclfrommode): Ditto.
-	(acltopbits): Ditto.
-	(aclfrompbits): Ditto.
-	(permtostr): Ditto.
-	(acltotext): Ditto.
-	(permfromstr): Ditto.
-	(aclfromtext): Ditto.
-	* syscalls.cc (access): Set errno again when needed.
-	* include/cygwin/acl.h: New file.
-	* include/sys/acl.h: Ditto.
-
-Sat Jan  8 14:46:19 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add cygwin DLL specific CFLAGS define.
-
-Fri Jan  7 21:01:57 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interrupt_on_return): Properly coerce assignment of
-	sigsave.func.
-
-2000-01-07  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* acconfig.h: New file.
-	* configure.in Add check for memset builtin.
-	(AC_CONFIG_HEADER): Use.
-	(STRACE_HHMMSS): Define instead of substituting.
-	(_MT_SAFE): Likewise.
-	(_CYG_THREAD_FAILSAFE): Likewise.
-	(DEBUGGING): Likewise.
-	(MT_SAFE): Substitute as a yes/no variable.
-	* Makefile.in: Remove DEBUGGING, STRACE_HHMMSS, and THREAD_FAILSAFE
-	variables and add DEFS. Update usage of MT_SAFE to reflect yes/no
-	values. Add config.h to winsup.h dependency.
-	(CFLAGS_CONFIG): Update.
-	(INCLUDES): Prepend `-I.'.
-	* utils/Makefile.in (INCLUDES): Likewise.
-	* winsup.h: Conditionally include config.h.
-	* thread.cc: Likewise.
-	* config.h.in: Generate new file.
-	* configure: Regenerate.
-
-
-Fri Jan  7 16:21:01 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0): Allow signal handling for dynamically loaded
-	case.
-
-Thu Jan  6 00:30:12 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* path.cc (symlink_check_one): Initialize local variable `unixattr'
-	before calling `get_file_attribute'.
-	* syscalls.cc (chown): Ditto.
-	* security.cc (get_nt_attribute): Eliminate attribute copying from
-	world to user/group in case of missing ACEs.
-	(alloc_sd): Set special rights for administrators group only if it's
-	neither owner nor group.
-	* utils/mkpasswd.c: Create entry for local group administrators (SID
-	544).
-
-Thu Jan 6 00:21:31 2000 Christopher Faylor <cgf@cygnus.com>
-
-	Change function calls to __stdcall throughout.
-	* exceptions.cc (handle_exceptions): Probe stack for return address to
-	use with new signal method.  Fill out sigsave.cx with this information.
-	(call_handler): Use sigsave.cx if it is available, rather than trying
-	to find the context of the main thread.
-	(interrupt_on_return): Use address of context rather than
-	pass-by-reference.
-	(interrupt_now): Ditto.
-
-Thu Jan  6 00:21:31 2000  Corinna Vinschen  <corinna@vinschen.de>
-
-	* grp.cc (getgroups): Return supplementary groups now.
-	* include/limits.h: Define NGROUP_MAX as 16 now.
diff --git a/winsup/cygwin/ChangeLog-2001 b/winsup/cygwin/ChangeLog-2001
deleted file mode 100644
index 140b2a9e9..000000000
--- a/winsup/cygwin/ChangeLog-2001
+++ /dev/null
@@ -1,5337 +0,0 @@
-2001-12-31  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Strip path when installing library.
-
-2001-12-30  Christopher Faylor  <cgf@redhat.com>
-
-	* include/getopt.h: Fix define.
-
-2001-12-30  Christopher Faylor  <cgf@redhat.com>
-	    Ralf Habacker  <Ralf.Habacker@freenet.de>
-
-	* speclib: New file.
-	* Makefile.in: Create library versions of automode.o, textmode.o, and
-	binmode.o for easier use on command line.  Create libpthread.a, libm.a,
-	and libc.a with subsets of exports found in libcygwin.a.
-
-2001-12-30  Ralf Habacker  <Ralf.Habacker@freenet.de>
-
-	* cygmagic: Eliminate unneeded use of 'tr' and 'bc'.
-
-2001-12-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (open_local_policy): Use POLICY_EXECUTE instead of
-	enumerating user rights.
-
-2001-12-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (open_local_policy): Initialize lsa handle to NULL.
-	Request only needed access rights in call to LsaOpenPolicy().
-	(create_token): Check for NULL lsa pointer.
-
-2001-12-28  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din: Add symbols for endutent(), getutent(), getutid(),
-	getutline(), setutent() and utmpname().
-	* syscalls.cc (setutent): New function.
-	(endutent): Ditto.
-	(utmpname): Ditto.
-	(getutent): Ditto.
-	(getutid): Ditto.
-	(getutline): Ditto.
-	* include/cygwin/version.h: Bump API minor version.
-
-2001-12-26  Christopher Faylor  <cgf@redhat.com>
-
-	* cygmagic: Add define name to warning.
-	* dcrt0.cc (_dll_crt0): Check for changes in child_info size.
-	(multiple_cygwin_problem): Avoid "proc" errors when testing.  Just
-	assume new cygwin proc.
-	* shared_info.h (mount_info): Add 'cb' element for sanity checks.
-	(shared_info): Ditto.
-	* child_info.h (child_info): Add fhandler_union_size element for sanity
-	checking.
-	* shared.cc (open_shared): Detect shared region size mismatch between
-	parent and child.
-	(shared_info::initialize): Detect shared region size mismatch with
-	expectation.
-	(memory_Init): Ditto.
-	* sigproc.cc (init_child_info): Correctly set cb in passed structure.
-	* shared.cc (open_shared):
-
-2001-12-26  Christopher Faylor  <cgf@redhat.com>
-
-	* include/getopt.h: Protect a declaratin.
-
-2001-12-26  Robert Collins  <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_cond::Signal): Use a separate flag for signal
-	detection and broadcast semantics.
-	(__pthread_cond_dowait): Ditto.
-	* thread.h (pthread_cond): New flag for testing when a waiter has
-	woken.
-
-2001-12-26  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Quote arguments to shell scripts.
-	(clean): Remove new *_magic.h autogenerated files.
-
-2001-12-25  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Autogenerate some header files which provide magic
-	numbers.  Force dependencies for files which depend on autogenerated
-	headers to ensure that they are always built.
-	* child_info.h (child_info): Add new fields to accommodate new magic
-	number header stuff.
-	* dcrt0.cc: Rely on "child_info_magic.h" to ensure that correct
-	child_info magic numbers are used.
-	(dll_crt0_1): Temporarily remove _cygwin_testing_magic test.
-	(_dll_crt0): Do more testing on magic numbers from fork_info structure.
-	Call "multiple_cygwin_problem" where appropriate.
-	(multiple_cygwin_problem): Rename from multiple_cygwin_die.  Issue a
-	warning or die, as appropriate based on cygwin version/magic number
-	mismatch.
-	* pinfo.cc (pinfo::exit): Don't attempt to dereference `this' if it
-	doesn't exist.  This can happen when a fatal error occurs early in
-	process initialization.
-	* shared.cc: Rely on "shared_info_magic.h" to accommodate that new
-	magic number header stuff.
-	(shared_info::initialize): Use new magic number stuff, for shared
-	region.
-	(memory_init): Ditto, for mount table.
-	* shared_info.h: Accomodate new magic number stuff for shared region
-	and mount table.
-	* sigproc.cc: Rely on "child_info_magic.h" to accommodate new magic
-	number header stuff.
-	(init_child_info): Initialize new fields in child_info) to accomodate
-	magic numbers.
-	* winsup.h: Rename multiple_cygwin_die to multiple_cygwin_problem.
-	* include/cygwin/version.h: Define macros for manipulating version
-	magic.
-	* cygmagic: New shell script for generating magic numbers.
-
-2001-12-20  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump API minor version for below changes.
-
-2001-12-19  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (VPATH): Add regex directory.
-	(NM): new variable.
-	(OBSOLETE_FUNCTIONS): Ditto.
-	(NEW_FUNCTIONS): Ditto.
-	(install-headers): Install regex.h.
-	(install-man): New target.
-	(install): Use new target.
-	(DLL_OFILES): Add v8_reg* stuff.
-	(new-cygwin1.dll): Eliminate stamp-cygwin-lib creation.
-	(libcygwin.a): Remove obsolete functions from import lib.  Add new functions.
-	* configure.in: Detect 'nm' tool.
-	* configure: Regenerate.
-	* cygwin.din: Export posix_reg* functions.  Eliminate export of v8 reg* functions.
-	This is now handled in object files themselves.
-	* regex/*: New files.
-	* regexp/v8_*.c: New files, renamed from non v8_ equivalents.
-
-2001-12-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/getopt.h: Don't define getopt_long() and friends when
-	included through unistd.h.
-
-2001-12-17  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::init_std_file_from_handle): Avoid initializing
-	using an invalid handle.
-
-2001-12-16  David Billinghurst <David.Billinghurst@riotinto.com>
-
-	* include/limits.h: Define LLONG_MIN, LLONG_MAX, ULLONG_MAX.
-
-2001-12-11  Christopher Faylor  <cgf@redhat.com>
-
-	* include/getopt.h: Add HAVE_DECL_GETOPT to save pain elsewhere.
-
-2001-12-10  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_serial::ev): New class member.
-	* fhandler_serial.cc (fhandler_serial::raw_read): Use class member for
-	event status.
-	* select.cc (peek_serial): Ditto.
-
-2001-12-07  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (path_conv::check): Use full path name for determining
-	attributes when /cygdrive/x/foo.
-
-2001-12-06  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (path_conv::check): Reset FH_CYGDRIVE if iterating through
-	path.
-
-2001-12-06  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (path_conv::check): Don't complain if /dev/x/foo when x
-	doesn't exist.
-	(mount_info::conv_to_win32_path): Keep translating when a /cygdrive is
-	found.  Don't attempt to translate to a device name when devn ==
-	FH_CYGDRIVE.
-	(cygwin_conv_to_win32_path): Set buffer to empty on error.
-	(cygwin_conv_to_full_win32_path): Ditto.
-
-	* window.cc: Include unistd.h to verify definitions.
-
-2001-12-05  Christopher Faylor  <cgf@redhat.com>
-
-	* dir.cc (opendir): Detect error return from build_fhandler_from_name.
-
-2001-12-04  David Rothenberger  <daveroth@acm.org>
-
-	* net.cc (cygwin_getsockopt): Dereference optlen pointer when passing
-	to __check_null_invalid_struct_errno.
-
-2001-12-03  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc (cygwin_getsockopt): Allow NULL optval.
-	(cygwin_setsockopt): Ditto.
-	(cygwin_recvfrom): Allow NULL from.
-
-	* path.cc (mount_info::read_cygdrive_info_from_registry): Don't write
-	cygdrive to registry if it doesn't exist.
-
-2001-12-03  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (mount_info::conv_to_win32_path): Avoid returning error if
-	cygdrive == '/'.
-	(mount_info::cygdrive_win32_path): Return 0 if invalid cygdrive path.
-
-2001-11-30  Christopher Faylor  <cgf@redhat.com>
-
-	* debug.cc (makethread): Eliminate unneeded function call.
-	* miscfuncs.cc (tls_ix): Predefine.
-	* perthread.h (set_reent): Eliminate.
-	(get_reent): Ditto.
-	* winbase.h (my_tlsalloc): Use global stack base pointer.  Set newly
-	allocated location to NULL.
-	(my_tlssetvalue): Use global stack base pointer.
-	(my_tlsgetvalue): Ditto.
-
-2001-11-27  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.h: Reorganize to avoid use of experimental stuff.
-	* shortcut.cc: Move winsup.h first in include order.
-
-2001-11-27  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din (ualarm): New export.
-	* dcrt0.cc (_dll_crt0): Add experimental tls storage declaration.
-	(dll_crt0): Ditto.
-	* debug.cc (thread_stub): Ditto.
-	* thread.cc: Minor cleanup.
-	(__pthread_create): Add experimental tls storage declaration.
-	* miscfuncs.cc: Define tls index.
-	* winsup.h: Declare experimental tls storage.
-
-	* window.cc (alarm): Use old timer return from setitimer.
-	(ualarm): New function.  From Alexandr V. Shutko.
-
-2001-11-26  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (libcygwin.a): Use ar commands to build libcygwin.a since
-	adding an archive doesn't work the way we want it to.
-
-2001-11-24  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_cygdrive::readdir): Avoid reporting
-	inaccessible drives.
-
-2001-11-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (cygwin_hstrerror): Allow s == NULL.
-	(cygwin_rcmd): Add parameter checking.
-	(cygwin_rexec): Ditto.
-
-2001-11-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (cygwin_inet_ntoa): Add parameter checking.
-	(cygwin_inet_network): Return INADDR_NONE instead of 0 in case of
-	EFAULT.
-	(cygwin_hstrerror): Add parameter checking.
-	(cygwin_rresvport): Ditto.
-	(socketpair): Ditto.
-	* winsup.h (check_null_str): Add extern declaration.
-
-2001-11-24  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (path_conv::check): Tighten FH_CYGDRIVE check to avoid
-	matching trailing component, like other devices.
-
-2001-11-24  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload.cc (IsDebuggerPresent): Make conditional load since it is
-	not available everywhere.
-
-	* path.cc (mount_info::conv_to_win32_path): Only consider /cygdrive to
-	be FH_CYGDRIVE, not /cygdrive/x.
-
-2001-11-24  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc (inet_makeaddr): Revert previous change.
-
-2001-11-23  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (chdir): Allow 'cd /cygdrive'.
-
-2001-11-23  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::vfork_parent_restore): Add debugging statement.
-
-	* exceptions.cc (try_to_debug): Spin only as long as we don't have a
-	debugger attached.
-
-	* fhandler.h (fhandler_base::set_nohandle): New method.
-	(fhandler_base::get_nohandle): New method.
-	* fhandler.cc (fhandler_base::dup): Avoid duplicating handle if there
-	is no handle.
-	* fhandler_disk_file.cc (fhandler_disk_file::opendir): Set nohandle
-	flag on dummy fd.
-
-2001-11-23  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Make intermediate library for eventual inclusion in
-	libcygwin.a
-
-	* fhandler.h (fhandler_pipe::fhandler_pipe): Remove default argument
-	setting since it is no longer used.
-
-	* miscfuncs.cc (check_null_str): New function.
-	(check_null_str_errno): Ditto.
-	* net.cc: Add defensive buffer checking throughout.
-	(cygwin_sendto): Protect against invalid fd.
-	(cygwin_recvfrom): Ditto.
-	(cygwin_getpeername): Ditto.
-	(cygwin_recv): Ditto.
-	(cygwin_send): Ditto.
-	* winsup.h: Declare a new function.
-
-2001-11-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* select.cc (set_bits): Fix conditional for setting fd in exceptfds.
-	* dtable.cc (dtable::build_fhandler): Create fhandler_pipe using
-	correct device type.
-	* path.cc (get_devn): Set correct pipe device type from device name.
-
-2001-11-22  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (conv_path_list): Fix wild indexing into path due to
-	conflicting methods for setting src pointer.
-
-	* dir.cc (opendir): Only pass path_conv argument to opendir, since name
-	is already part of the fhandler.
-	* dtable.cc (dtable::build_fhandler): Accomodate new FH_CYGDRIVE type.
-	* fhandler.cc (fhandler_base::opendir): Nuke name argument.
-	* fhandler.h: Add FH_CYGDRIVE to "device" enum.
-	(fhandler_base::opendir): Nuke name argument.
-	(fhandler_disk_file::opendir): Ditto.
-	(fhandler_disk_file::fhandler_disk_file): Declare new method which
-	passes devtype through.
-	(fhandler_cygdrive): Add elements for tracking drives.
-	(fhandler_cygdrive::set_drives): Declare new method.
-	(fhandler_cygdrive::iscygdrive_root): Declare new method.
-	(fhandler_cygdrive::opendir): Declare new method.
-	(fhandler_cygdrive::readdir): Declare new method.
-	(fhandler_cygdrive::telldir): Declare new method.
-	(fhandler_cygdrive::seekdir): Declare new method.
-	(fhandler_cygdrive::rewinddir): Declare new method.
-	(fhandler_cygdrive::closedir): Declare new method.
-	(fhandler_cygdrive::fstat): Declare new method.
-	* fhandler_disk_file.cc (fhandler_disk_file::fhandler_disk_file):
-	Define new method which passes devtype through.
-	(fhandler_disk_file::open): Tweak debug output.
-	(fhandler_disk_file::opendir): Nuke first argument.  Use info from
-	path_conv and class rather than calling fstat.
-	(fhandler_cygdrive::set_drives): New method.
-	(fhandler_cygdrive::iscygdrive_root): New method.
-	(fhandler_cygdrive::opendir): New method.
-	(fhandler_cygdrive::readdir): New method.
-	(fhandler_cygdrive::telldir): New method.
-	(fhandler_cygdrive::seekdir): New method.
-	(fhandler_cygdrive::rewinddir): New method.
-	(fhandler_cygdrive::closedir): New method.
-	(fhandler_cygdrive::fstat): New method.
-	* path.cc (iscygdrive_device): Assume cygdriveness is already verified.
-	(path_conv::check): Treat FH_CYGDRIVE "method" as a special case,
-	setting file attributes as needed.
-	(mount_info::conv_to_win32_path): Allow stand-alone /cygdrive, meaning
-	"the directory which contains all of the drives on the system".
-	(fillout_mntent): Use cyg_tolower for conversions.
-	(mount_info::cygdrive_win32_path): Replace unused argument with unit
-	number.
-	* shared_info.h (mount_info::cygdrive_win32_path): Reflect argument
-	change.
-
-2001-11-21  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (DLL_OFILES): Add fhandler_disk_file.o.
-	* cygheap.h (cygheap_fdnew::operator =): New operator.
-	* dir.cc: Add invalid struct checking throughout.  Use methods for all
-	directory manipulation throughout.
-	* fhandler.cc: Move fhandler_disk_file stuff to own file.
-	(fhandler_base::opendir): New method.
-	(fhandler_base::readdir): New method.
-	(fhandler_base::telldir): New method.
-	(fhandler_base::seekdir): New method.
-	(fhandler_base::rewinddir): New method.
-	(fhandler_base::closedir): New method.
-	* fhandler_disk_file.cc: New file.
-	* fhandler.h (fhandler_base): Declare new virtual methods.
-	(fhandler_disk_file): Ditto.
-	(fhandler_cygdrive): New class.
-
-	* path.cc (conv_path_list): Use strccpy to break apart path.
-
-2001-11-17  Nick Duffek  <nick@duffek.com>
-
-	* path.cc (conv_path_list): Copy source paths before modifying them.
-
-2001-11-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_raw.cc (fhandler_dev_raw::clear): Don't reset unit.
-	* fhandler_tape.cc (fhandler_dev_tape::fhandler_dev_tape): Add debug
-	output.
-
-2001-11-15  Egor Duda  <deo@logos-m.ru>
-
-	* include/pthread.h (PTHREAD_COND_INITIALIZER): Define.
-	* thread.cc (__pthread_cond_destroy): Add support for
-	PTHREAD_COND_INITIALIZER.
-	(__pthread_cond_init): Ditto.
-	(__pthread_cond_broadcast): Ditto.
-	(__pthread_cond_signal): Ditto.
-	(__pthread_cond_dowait): Ditto.
-	(__pthread_mutex_init): Handle PTHREAD_MUTEX_INITIALIZER correctly,
-	don't return error when it's passed as parameter.
-	* winsup.h (check_null_invalid_struct): Call correct function.
-
-2001-11-14  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc: Add stdlib.h include for alloca declaration.
-	* poll.cc: Ditto.
-	* termios.cc: Ditto.
-
-2001-11-14  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (_write): Only allow zero length when fd is valid.
-
-2001-11-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Add setting access time
-	and creation time to last modification time for files on filesystems
-	not supporting multiple timestamps.
-	(fhandler_disk_file::fstat_helper): Set access time and creation
-	time in incoming Windows structure instead of in stat buf to avoid
-	incorrectly overwriting Epoch timestamp.
-
-2001-11-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.h: Remove alloca definition since it's now defined through
-	inclusion of stdlib.h.
-	* lib/cygwin_crt0.c: Ditto.
-
-2001-11-13  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (_write): Allow zero length as per SUSv2.
-
-2001-11-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dir.cc (mkdir): Add HIDDEN file attribute if file has leading dot
-	and HIDDEN_DOT_FILES is defined.
-	* fhandler.cc (fhandler_base::open): Ditto.
-	* path.cc (symlink): Ditto.
-	* syscalls.cc (_rename): Ditto and remove HIDDEN file attribute if
-	new filename does not begin with a dot.
-
-2001-11-12  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (fhandler_console::read): Revert 2001-10-23
-	change to only honor keydown events.
-
-2001-11-11  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump version to 1.3.6.
-
-2001-11-10  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::build_fhandler): Don't increment console fd count
-	if new operation fails.  Increment fork_fixup field here.
-	(dtable::dup2): Don't increment fork_fixup field here.
-	* net.cc (fdsock): Ditto.
-
-2001-11-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* select.cc: Set errno using set_sig_errno() throughout.
-	* signal.cc (signal): Always set SA_RESTART flag.
-	* syscalls.cc (_read): Revert previous patch.
-
-2001-11-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* select.cc (fhandler_tty_slave::ready_for_read):  Return 0 on EBADF.
-	* syscalls.cc (_read): If ready_for_read() failed, save errno from
-	being overwritten by signal handler call.
-
-2001-11-07  Corinna Vinschen  <corinna@vinschen.de>
-
-	* lib/getopt.c (getopt_internal): Reset optind to 1 only if optreset
-	is not set.
-
-2001-11-06  Christopher Faylor  <cgf@redhat.com>
-
-	* select.cc (fhandler_tty_slave::ready_for_read): Correct inverted
-	not_open test.
-
-2001-11-05  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump version to 1.3.5.
-
-2001-11-05  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (mmap_record::find_empty): Add input parameter check.
-
-2001-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::build_fhandler): Fix debug_printf to avoid SEGV
-	due to incorrect parameter placement.
-
-2001-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_pipe::broken_pipe): Renamed from saweof.
-	(fhandler_pipe::set_eof): Reflect above change.
-	* pipe.cc (fhandler_pipe::fhandler_pipe): Ditto.
-	(fhandler_pipe::read): Ditto.
-	(fhandler_pipe::hiteof): Ditto.
-
-2001-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* pipe.cc (fhandler_pipe::read): Narrow eof return to just the "broken
-	pipe" test.
-
-2001-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* select.cc: Add more comments throughout.  Use bool 'true' where
-	appropriate throughout.
-	(fhandler_socket::select_read): Remove duplicate setting for *_ready
-	which inadvertently overrode previous, correct setting.
-	(fhandler_socket::select_write): Ditto.
-
-2001-11-03  Christopher Faylor  <cgf@redhat.com>
-
-	* select.cc (verify_console): New function.
-	(verify_windows): Ditto.
-	(fhandler_console::select_read): Really do need to verify that there is
-	something to read.
-	(fhandler_console::select_windows): Ditto.
-
-2001-11-03  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_base::ready_for_read): Remove unused argument.
-	(fhandler_tty_slave::ready_for_read): Ditto.
-	(select_record): Remove poll, initialize peek.
-	* select.cc: Remove all poll functions, throughout.  Change second
-	argument of peek_* functions to 'bool' throughout.  Specifically
-	initialize *_ready variables throughout.
-	(select_stuff::poll): Subsume previous poll functionality.
-	(peek_pipe): Don't grab guard mutex when in select loop.
-	select()/read() is racy by design so there is no need to worry about a
-	race in select().
-	(fhandler_base::ready_for_read): Remove unused argument.
-	(fhandler_tty_slave::ready_for_read): Ditto.
-	* syscalls.cc (_read): Eliminate third argument in ready_for_read call.
-
-2001-11-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (get_supplementary_group_sidlist): New function.
-	(get_group_sidlist): Call get_supplementary_group_sidlist() to
-	retrieve list of supplementary groups SIDs from /etc/group and
-	add them to the user's group list.
-
-2001-11-03  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::read): Return just read ahead characters
-	if slow device.
-	* fhandler.h (fhandler_base::set_eof): New virtual method.
-	(fhandler_pipe::set_eof): New method.
-	* pipe.cc (fhandler_pipe::fhandler_pipe): Clear saweof flag.
-	(fhandler_pipe::read): Return immediately if hit eof.
-	(fhandler_pipe::hit_eof): Return true if saweof flag is set.
-	* select.cc (peek_pipe): Don't call PeekNamedPipe if we couldn't grab
-	the guard mutex.
-
-2001-11-02  Egor Duda  <deo@logos-m.ru>
-
-	* dll_init.h (class dll_list): Reorder functions to avoid compiler
-	"can't inline" warnings.
-	* security.h (class cygsid): Ditto.
-	* sigproc.cc (get_proc_lock): Ditto.
-	* sigproc.h (class sigframe): Ditto.
-	* sync.h (class muto): Ditto.
-
-2001-11-02  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_base::get_guard): Actually MAKE virtual as
-	previously indicated.
-	* pipe.cc (make_pipe): Remove extraneous set_errno.
-	* syscalls.cc (_open): Ditto.
-	* select.cc (peek_pipe): Need to check that there is still something to
-	read from the pipe after acquiring the mutex since another
-	process/thread could have eaten the input before we got to acquiring
-	the lock.  (Thanks to Nick Duffek for this inspiration.)
-
-2001-11-01  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h: Change Windows 'BOOL's to c++ 'bool's for all variables.
-	* select.cc (fhandler_base::ready_for_read): Set read_ready to zero
-	prior to testing it or it will be uninitialized.
-
-	* Makefile.in (CFLAGS): Move setting to Makefile.common.
-
-2001-11-01  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.h (cygheap_fdmanip::isopen): Set appropriate errno if fd not
-	open.
-	* select.cc (fhandler_base::ready_for_read): Release an open guard
-	mutex when exiting with an error condition.
-	* syscalls.cc (_read): Check frequently for closed fd as a kludge until
-	something better is invented.
-
-2001-11-01  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::build_fhandler): Issue internal error on unknown
-	device.
-	* fhandler.cc (fhandler_base::close): Show both name and handle in
-	debugging output.
-
-	* fhandler.h (fhandler_base::get_guard): New virtual method.
-	(fhandler_pipe::get_guard): New method.
-	(fhandler_socket::ready_for_read): Delete declaration.
-	(fhandler_pipe::ready_for_read): Ditto.
-	(fhandler_serial::ready_for_read): Ditto.
-	(fhandler_console::ready_for_read): Ditto.
-	(fhandler_tty_common::ready_for_read): Ditto.
-	(fhandler_windows::ready_for_read): Ditto.
-	(struct select_record::peek): Declare new method.
-	* select.cc (MAKEready): Delete.
-	(peek_pipe): Use get_guard method to retrieve potential guard mutex
-	handle.
-	(fhandler_base::ready_for_read): Rewrite as generic ready-for-read
-	handler.  Should only be called for "slow" devices.
-	(fhandler_socket::ready_for_read): Delete definition.
-	(fhandler_pipe::ready_for_read): Ditto.
-	(fhandler_serial::ready_for_read): Ditto.
-	(fhandler_console::ready_for_read): Ditto.
-	(fhandler_tty_common::ready_for_read): Ditto.
-	(fhandler_windows::ready_for_read): Ditto.
-	(fhandler_pipe::select_read): Fill in new peek record in select_record
-	structure.
-	(fhandler_console::select_read): Ditto.
-	(fhandler_tty_common::select_read): Ditto.
-	(fhandler_serial::select_read): Ditto.
-	(fhandler_socket::select_read): Ditto.
-	(fhandler_socket::select_read): Ditto.
-	(fhandler_tty_slave::ready_for_read): Check for tty not open.  Set
-	errnos appropriately.
-	* syscalls.cc (_read): Allow ready_for_read to set errno.
-
-	* pinfo.cc (pinfo::init): Return spawn/NO_WAIT process as valid if it
-	is initializing.
-	* sigproc.cc (getsem): Adjust wait for process to initialize downward
-	to avoid huge waits.
-
-2001-10-31  Christopher Faylor  <cgf@redhat.com>
-
-	* environ.cc: Set reset_com to false to mimic linux behavior more
-	closely.
-
-2001-10-31  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dtable.cc (dtable::vfork_child_dup): Revert impersonation
-	before duplicating fhandler.
-
-2001-10-30  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (signal_exit): Weight the odds against the main thread
-	running when signal thread is exiting.
-
-2001-10-30  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (sigproc_terminate): Don't signal main thread when exiting.
-	* sigproc.h (sigframe): Decorate some methods with `inline'.
-	(new_muto): Coerce pointer to new to void *.
-
-2001-10-30  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::fork_fixup): Pass old handle to
-	setclexec_pid.
-
-2001-10-30  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.h (cygheap_fdmanip::cygheap_fdmanip): Clear fh.
-	(cygheap_fdmanip::isopen): New method.
-	* syscalls.cc (_read): Avoid accessing closed fd.
-
-	* path.h (fe_types): New enum.
-	(path_conv::set_path): New method.
-	(find_exec): Change null_if_not_found argument to something more
-	generic.
-	* spawn.cc (find_exec): Default to returning the POSIX path rather than
-	the windows path, unless instructed otherwise.
-	(spawn_guts): Force call to find_exec to use native paths.
-	* dlfcn.cc (check_path_access): Accommodate new find_exec arguments.
-	* environ.h (win_env::get_posix): New method.
-
-2001-10-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::close): Add error handling.
-
-2001-10-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::dup): Revert previous change.
-
-2001-10-30  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::dup2): Add some debugging.  Use methods from
-	passed in class rather than cygheap->fdtab.
-	* fhandler_socket.cc (fhandler_socket::fixup_before_fork_exec): Add
-	more debugging output.
-	(fhandler_socket::dup): Allocate new space for prot_info_ptr for
-	duplicated entry.
-	(fhandler_socket::close): Loop closesocket() as long as WSAEWOULDBLOCK
-	is returned.
-	* syscalls.cc (stat_worker): Always delete fh if it has been created.
-
-2001-10-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (is_group_member): Call NetLocalGroupGetMembers() for
-	local machine only.
-	(get_user_local_groups): Ditto for NetLocalGroupEnum().
-
-2001-10-29  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::set_name): Set namehash here to catch
-	name changes.
-	(fhandler_base::open): Remove namehash setting.
-	(fhandler_base::fstat): Subtract 1 from arbitrary time setting to avoid
-	strange ls -l granularity problem.
-
-2001-10-29  Christopher Faylor  <cgf@redhat.com>
-
-	* select.cc (MAKEready): Remove extraneous select_read.
-
-2001-10-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* uinfo.cc (internal_getlogin): Set environment variable $HOME
-	from either /etc/passwd or $HOMEDRIVE/$HOMEPATH if necessary.
-
-2001-10-29  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_serial::fhandler_serial): Change to only accept
-	unit argument.
-	* fhandler_serial.cc (fhandler_serial::fhandler_serial): Ditto.
-	(fhandler_serial::open): Avoid else when previous clause is a return().
-	* path.cc (get_devn): Alias /dev/ttyS0 -> /dev/com1, etc.
-	(get_device_number): Reallow standalone "com1" as a valid name for
-	/dev/com1.
-
-2001-10-26  Christopher Faylor  <cgf@redhat.com>
-
-	* select.cc (MAKEready): Check for read_ready in loop since select_read
-	could set it.
-	(peek_socket): Check ready/write/except specifically since they could
-	have been set even prior to peek_socket call.
-
-2001-10-24  Christopher Faylor  <cgf@redhat.com>
-
-	* shared_info.h (MOUNT_VERSION): Change to a smaller, still arbitrary
-	number.
-	* shared.cc (open_shared): Accept a number to denote the shared memory
-	region.
-	(memory_init): Use shared memory version as part of the object name of
-	the shared region.  Ditto for the mount table.
-	* path.cc (CYGWIN_REGNAME): New define used in place of
-	CYGWIN_INFO_CYGWIN_REGISTRY_NAME throughout.
-	* external.cc (cygwin_internal): Implement CW_[GS]ET_CYGWIN_REGISTRY_NAME.
-	* cygheap.h (init_cygheap::cygwin_regname): New element.
-
-2001-10-23  Christopher Faylor  <cgf@redhat.com>
-
-	Ensure that all fhandler_*::read definitions are __stdcall throughout.
-	* fhandler.cc (fhandler_base::set_inheritance): Be more defensive in
-	debugging code.
-	* fhandler.h: Adjust regparms throughout to reflect passing 'this'
-	parameter.
-	* fhandler_console.cc (fhandler_console::read): Remove unneeded test.
-	Only honor "key down" events.
-	* miscfuncs.cc (strcasestr): Reorganize for efficient code use.
-	(check_null_empty_str_errno): Ditto.
-	(__check_null_invalid_struct_errno): Ditto.
-	(__check_invalid_read_ptr_errno): Ditto.
-	* syscalls.cc (_read): Return 0 when length == 0, as per Single UNIX
-	Specification.
-
-2001-10-22  Christopher Faylor  <cgf@redhat.com>
-
-	* debug.cc (set_errno): Return value of errno that was set, just like
-	the macro.
-	(setclexec_pid): Replace old handle with new handle.
-	* debug.h: Reflect change in arguments for setclexec_pid.
-	* fhandler.cc (fhandler_base::set_inheritance): Ditto.
-	(fhandler_base::fork_fixup): Ditto.
-	* cygerrno.h: Reflect return value change for set_errno.
-
-2001-10-22  Christopher Faylor  <cgf@redhat.com>
-
-	Remove 'cb' parameter and modify fhandler_* constructors throughout.
-	* dtable.cc (dtable::build_fhandler): Remove debugging output which
-	uses 'cb'.
-	* exec.cc (execvp): New function.
-	(execvpe): Ditto.
-	* fhandler.cc (fhandler_base::fhandler_base): Use constructor
-	initialization.
-	* fhandler.h (fhandler_tty_common::fhandler_tty_common): Ditto.
-	* fhandler_clipboard.cc (fhandler_dev_clipboard::fhandler_dev_clipboard):
-	Ditto.
-	* fhandler_console.cc (fhandler_console::fhandler_console): Ditto.
-	* fhandler_raw.cc (fhandler_dev_raw::fhandler_dev_raw): Ditto.
-	* fhandler_serial.cc (fhandler_serial::fhandler_serial): Ditto.
-	* fhandler_tty.cc (fhandler_tty_master::fhandler_tty_master): Ditto.
-	(fhandler_tty_slave::fhandler_tty_slave): Ditto.
-	(fhandler_pty_master::fhandler_pty_master): Ditto.
-	* fhandler_windows.cc (fhandler_windows::fhandler_windows): Ditto.
-
-2001-10-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	Patch suggested by Ian Ray <ian.ray@nokia.com>:
-	* syscalls.cc (seteuid): Unset environment variables HOMEDRIVE and
-	HOMEPATH before calling internal_getlogin().
-	* uinfo.cc (internal_getlogin): Use default HOMEPATH and HOMEDRIVE
-	from environment if both are present, else query NetUserGetInfo().
-
-2001-10-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (get_2k_ifconf): Change multiple IP address naming scheme
-	to Linux style.
-
-Sun Oct 21 19:04:37 2001 Alexander Gottwald <ago@informatik.tu-chemnitz.de>
-
-	* net.cc (get_2k_ifconf): Added support for multiple IP addresses on
-	one interface.
-
-2001-10-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* miscfuncs.cc (__check_invalid_read_ptr_errno): Return error, if any.
-
-2001-10-21  Christopher Faylor  <cgf@redhat.com>
-
-	* resource.cc (fill_rusage): Perform paranoid zero structure passed to
-	GetProcessMemoryInfo.
-
-2001-10-22  Robert Collins  <rbtcollins@hotmail.com>
-
-	* autoload.cc: Autoload GetProcessMemoryInfo.
-	* resource.cc (fill_rusage): Calculate ru_maxrss and ru_majflt entries.
-	(Bug report on this from Guido Serassio in the squid project).
-	This requires including psapi.h.
-
-2001-10-20  Christopher Faylor  <cgf@redhat.com>
-
-	* dll_init.cc (dll_list::alloc): Increase retry count to 1000.
-
-2001-10-20  Christopher Faylor  <cgf@redhat.com>
-
-	* miscfuncs.cc (__check_invalid_read_ptr_errno): New function.
-	* syscalls.c (_write): Validate that write buffer is accessible for
-	reading, not writing.
-	* winsup.h: Declare new function, increase regparmization of check_*
-	functions.
-
-2001-10-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* path.cc (getcwd): Allow len == 0 when buf == NULL.
-
-2001-10-18  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (_read): Validate input pointer.
-	(_write): Ditto.
-	(system): Ditto.
-
-2001-10-16  Frederic Devernay  <Frederic.Devernay@sophia.inria.fr>
-
-	* poll.cc (poll): Call cygwin_select() if any fd is valid.
-
-2001-10-16  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_raw.cc (fhandler_dev_raw::open): Eliminate compatibility
-	code since no Win32 device names are used anymore.
-	* fhandler_tape.cc (fhandler_dev_tape::tape_set_blocksize): Allow
-	0 as blocksize to indicate variable blocksize.
-	* path.cc (win32_device_name): Generate NT internal device names
-	using upper/lower case names for readability.
-	Generate \DosDevices\<letter>: device name for mount table
-	compatibility devices.
-
-2001-10-16  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_tape.cc (fhandler_dev_tape::tape_status): Report
-	EOTWarningZoneSize in get->mt_eotwarningzonesize.
-	* include/cygwin/mtio.h: Define DEFTAPE.
-	(struct mtget): Add member `mt_eotwarningzonesize'. Add a comment.
-	* include/cygwin/version.h: Bump API minor version to 47.
-
-2001-10-16  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::fork_fixup): Guard against compiler
-	warning.
-
-2001-10-16  Corinna Vinschen  <corinna@vinschen.de>
-
-	* autoload.cc: Add load statement for `NtOpenFile'.
-	* fhandler.h (fhandler_dev_raw::get_unit): New method.
-	(fhandler_dev_tape::norewind): Eliminate.
-	(fhandler_dev_tape::is_rewind_device): New method.
-	* fhandler_raw.cc (fhandler_dev_raw::open): Open new
-	fixed device name devices using NT internal method.
-	Keep calling fhandler_base::open() for old mount table
-	device mapping compatibility devices.
-	(fhandler_dev_raw::fstat): Eliminate.  Settings are done
-	by fhandler_base::fstat() already.
-	* fhandler_tape.cc: Remove `norewind' usage throughout.
-	* ntdll.h: Define FILE_SYNCHRONOUS_IO_NONALERT.
-	Define struct _IO_STATUS_BLOCK.
-	Declare NtOpenFile().
-	* path.cc (get_raw_device_number): Add new approach for
-	using fixed device names.
-	(win32_device_name): Ditto.
-	(get_device_number): Ditto.  Require POSIX path to begin
-	with "/dev/".
-	(mount_info::conv_to_win32_path): Call win32_device_name()
-	instead of get_device_number() after evaluating mount points
-	to allow changing the win32 destination path again.
-	* security.cc (str2buf2uni): Remove `static' to be able to
-	call function from fhandler_dev_raw::open().
-	* wincap.cc: Set flag has_raw_devices appropriately.
-	* wincap.h: Add flag has_raw_devices.
-
-2001-10-16  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.h (cygheap_fdget::cygheap_fdget): Remove debugging operation
-	from set_errno.
-
-2001-10-16  Christopher Faylor  <cgf@redhat.com>
-
-	* mmap.cc (mmap): Assign 'fh' from cygheap_fdget.  Use 'fh' everywhere.
-
-2001-10-15  Christopher Faylor  <cgf@redhat.com>
-
-	* cygerrno.h (set_errno): Define more informative version of this
-	function for debugging.
-	(__set_errno): Declare when DEBUGGING.
-	* cygheap.h (cygheap_fdget::cygheap_fdget): Add a flag to control when
-	errno is set.
-	* debug.cc (__set_errno): New function.
-	* fcntl.cc (_fcntl): Fix so that correct fd is used for second argument
-	to dup2.
-	* syscalls.cc (_cygwin_istext_for_stdio): Don't set errno here when
-	using cygheap_fdget.
-
-2001-10-15  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::fork_fixup): Don't protect handle.
-
-	* dlfcn.cc: Fix to confirm to coding standards.
-
-	Reorganize includes throughout to accommodate new cygheap.h usage.
-	* cygheap.h (cygheap_fdmanip): New class: simplifies locking and
-	retrieval of fds from cygheap->fdtab.
-	(cygheap_fdget): Ditto.
-	(cygheap_fdnew): Ditto.
-	* fcntl.cc (_fcntl): Use new method to lock fdtab and retrieve info.
-	* ioctl.cc (ioctl): Ditto.
-	* mmap.cc (mmap): Ditto.
-	* net.cc: Ditto, throughout.
-	* passwd.cc (getpass): Ditto.
-	* path.cc (fchdir): Ditto.
-	* pipe.cc (make_pipe): Ditto.
-	* sec_acl.cc (facl): Ditto.
-	* syscalls.cc: Ditto, throughout.
-	* termios.cc: Ditto, throughout.
-
-2001-10-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* uname.cc (uname):  Use `wProcessorLevel' unless OS sets it wrong.
-	Use `dwProcessorType' then instead.
-	* wincap.cc: Set flag has_valid_processorlevel appropriately.
-	* wincap.h: Add flag has_valid_processorlevel.
-
-2001-10-14  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::build_fhandler_from_name): Use PC_FULL to
-	determine path name.
-	* path.cc (fchdir): Remove rel -> abs path conversion.
-
-Sun Oct 14 08:10:12 2001  Gary R. Van Sickle
-
-	* fork.cc (fork_parent): Correct the "unable to allocate
-	forker_finished event" error message.  It named the wrong event before.
-
-2001-10-13  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload.cc (load_wsock32): Declare dummy function to force loading
-	of winsock.
-	* fhandler.cc (fhandler_base::set_inheritance): Make debugging output
-	more verbose.
-	* fhandler_socket.cc (fhandler_socket::fixup_after_fork): Force loading
-	of winsock32 if winsock2 not available.
-	* net.cc (set_socket_inheritance): Use DuplicateHandle in all cases to
-	set inheritance correctly.
-	(fdsock): Use winsock2_active macro to determine when to set socket
-	inheritance.  Remove fdtab resource locking since this function should
-	already be protected.
-	(cygwin_accept): Simplify logic.  Ensure that fdtab unlock is not
-	called inappropriately.
-	(cygwin_rcmd): Use fdtab locking.
-	(cygwin_rresvport): Ditto.
-	(cygwin_rexec): Ditto.
-	* select.cc (peek_socket): Set errno appropriately if winsock select
-	fails.
-
-2001-10-13  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* winsup.h: Declare check_pty_fds.
-	* syscalls.cc (check_pty_fds): Rename from check_ttys_fds.  Also check
-	pty master.
-	(setsid): Use check_pty_fds.
-	* dtable.cc (dtable::dec_console_fds): Add check on pty fds.
-
-2001-10-13  Ralf Habacker  <Ralf.Habacker@freenet.de>
-
-	* fhandler_dsp.cc (fhandler_dsp::ioctl): Return 0 for successful
-	SNDCTL_DSP_GETBLKSIZE operation.
-
-2001-10-13  Christopher Faylor  <cgf@redhat.com>
-
-	Remove obsolete 'name' arg from fhandler_* constructors throughout.
-	* winsup.h (winsock_active): New macro.
-	(winsock2_active): Ditto.
-	* autoload.cc (wsock_init): Use new macros to decide if winsock or
-	winsock2 is loaded.
-	(nonexist_wsock32): Dummy function to force winsock load.
-	(nonexist_ws2_32): Dummy function to force winsock2 load.
-	* fhandler.h (fhandler_socket::fstat): Declare new method.  Currently
-	unused.
-	* fhandler_socket.cc (fhandler_socket::fixup_before_fork_exec): Check
-	that winsock2 is active before trying WSADuplicateSocketA.
-	(fhandler_socket::fixup_after_fork): Add extra check for
-	winsock2_active.  Otherwise use iffy procedures for Windows 95.
-	(fhandler_socket::fixup_after_exec): Add debugging.
-	(fhandler_socket::dup): Add debugging.
-	(fhandler_socket::fstat): New method.
-	(fhandler_socket::set_close_on_exec): Attempt to perform iffy stuff on
-	Windows 95.
-
-	* errno.cc (_sys_nerr): Work around compiler strangeness.
-
-	* pinfo.cc (winpids::add): Add extra element at end of allocated array
-	for setting to NULL.
-	(winpids::enumNT): Ditto.
-	(winpids::init): Don't modify pidlist if it hasn't been allocated
-	(possibly due to malloc problem).
-
-2001-10-12  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload.cc (wsock_init): Reorganize slightly to accommodate a new
-	compiler.
-
-2001-10-11  Egor Duda  <deo@logos-m.ru>
-
-	* net.cc (cygwin_sendto): Use correct socket address when sending
-	data to AF_UNIX socket.
-
-Wed Oct 10 16:10:41 2001  Alexander Gottwald <ago@informatik.tu-chemnitz.de>
-
-	* net.cc (get_95_ifconf): Using other registry values pointing to
-	correct networkdevice identification for Windows95.
-
-Tue Oct  9 22:22:45 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, rename PROC_FORK1 to PROC_FORK.
-	* child_info.h: Rename PROC_* to _PROC_*.  Define PROC_* with
-	additional testing magic.  Eliminate old PROC_FORK and rename
-	PROC_FORK1 to PROC_FORK.
-	* dcrt0.cc (_cygwin_testing_magic): New variable.  Added to magic
-	number in proc_info.
-	(alloc_stack): Eliminate old PROC_FORK test.
-	(dll_crt0_1): Ditto.  Use _PROC_* enums for test.  Subtract
-	_cygwin_testing_magic from child_proc_info->type so that normal cygwin
-	programs invoked by test suite programs do not consider themselves to
-	be in a cygwin environment.
-	(_dll_crt0): Ditto.  Move environment checks to initial_env function to
-	conserve on stack space.
-	(initial_env): New function.  Checks for testing and debugging
-	environment variables.
-	* init.cc (cygwin_hmodule): Move declaration.
-	* winsup.h: Declare variables used for cygwin testing.
-
-Tue Oct  9 19:17:53 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* uinfo.cc (internal_getlogin): Reorganize slightly to minimize work in
-	default condition.
-
-Tue Oct  9 18:53:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::open): Add missing case clash check.
-
-Mon Oct  8 01:47:27 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dtable.cc (dtable::build_fhandler): Allocate correct amount for given
-	fhandler class.
-	* fhandler.h (fhandler_union): Properly define rather than relying on
-	fhandler_console being "big enough".
-
-Mon Oct  8 00:25:18 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* external.cc (fillout_pinfo): Reset counter whenever we initialize the
-	pid list.
-
-Sun Oct  7 17:16:05 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_posix_path): Don't eat a '.' after a '\\' since it
-	has special meaning on NT.
-
-	* syscalls.cc (access): Use stat_worker.
-
-Fri Oct  5 21:01:14 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::fork_fixup): Protect dup'ed handle and
-	record it as non-inheritable for debugging purposes in case there is a
-	subsequent fork or exec.
-	* fhandler_tty.cc (fhandler_tty_common::fixup_after_fork): Allow
-	fork_fixup to call ProtectHandle.
-
-Fri Oct  5 14:22:47 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (get_raw_device_number): Correct length arguments for
-	wdeveqn.
-
-Fri Oct  5 11:05:32 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (getcwd): Allow NULL first argument.
-
-Fri Oct  5 00:31:35 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* heap.h (inheap): Check for NULL.
-
-Thu Oct  4 23:17:49 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Add second path_conv * argument to fstat()s throughout.
-	* fhandler.h: Change read and fstat to regparm/stdcall throughout.
-	(fhandler_base::fstat): Just declare.  Don't define.
-	(fhandler_disk_file::fstat_helper): Declare.
-	* fhandler.cc (fhandler_base::fstat): Move here from fhandler.h, adapt
-	from former stat_dev().
-	(fhandler_disk_file::fstat): Move most of the disk-file-specific logic
-	from stat_worker to here.  Use fstat_helper to derive final fstat
-	output.
-	(fhandler_disk_file::fstat_helper): New method, renamed from former
-	fstat method.
-	(num_entries): Moved here from syscalls.cc.
-	* fhandler_mem.cc (fhandler_dev_mem::fstat): Use base class to
-	initialize most stuff.  Invert has_physical_mem_access test for
-	establishing permissions.
-	* fhandler_raw.cc (fhandler_dev_raw::fstat): Eliminate unneed test and
-	memory clearing.  Use base class to initialize most stuff.
-	* syscalls.cc (stat_dev): Eliminate.
-	(stat_worker): Simply call fstat method to generate fstat output.  Move
-	all device specific code to appropriate fstats.
-
-	* dir.cc (opendir): Pass correct arg to stat_worker to allow following
-	symlinks.
-
-Thu Oct  4 21:37:57 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (perhaps_suffix): Return NULL on non-existence of file as
-	well as "directoryness".  Previous code modified on 2001/09/30 actually
-	had an arguable bug which was unmasked by the change on that day.
-
-Thu Oct  4 20:52:42 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::check): Return ENOTDIR when leading device and
-	trailing component.
-
-Thu Oct  4 18:49:23 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (stat_worker): Make global.  Accept path_conv parameter
-	for passing information back to caller.
-	* winsup.h: Declare stat_worker.
-	* dir.cc (opendir): Use stat_worker rather than stat and pass path_conv
-	parameter to stat_worker for later inspection.
-
-2001-10-04 Karellen (karellen@boreworms.com)
-
-	* syslog.cc (syslog): Teach syslog about syslog priorities other than
-	LOG_ERR, LOG_WARNING and LOG_INFO
-
-Thu Oct  4 15:50:03 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::check): Don't perform file system or rootdir
-	checks on devices.
-
-Wed Oct  3 19:40:36 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Don't close hexec_proc if it is NULL.
-
-	* fork.cc (vfork): Add debugging statements.
-
-	* path.cc (get_device_number): Make static.  Rewrite to inspect both unix
-	and windows paths.
-	(get_raw_device_number): Just check for parts of raw device that we
-	care about.
-	(get_devn): New function, pulled from get_device_number.
-	(win32_device_name): Accommodate arg changes to get_device_number.
-	(mount_info::get_device_number): Call get_device_number on translated
-	Windows path.
-
-	* spawn.cc (spawn_guts): Don't treat P_VFORK differently from P_NOWAIT.
-	Add handle to child's shared region to child so that it will be
-	preserved if the parent goes away.
-	* fhandler.h: Throughout, simplify to one open method for all fhandler
-	classes, requiring a path_conv first element.
-	* fhandler.cc (fhandler_base::open): Remove obsolete method.
-	Generalize to require path_conv * as first argument.
-	(fhandler_disk_file::open): Remove obsolete method.
-	(fhandler_disk_file::open): Use path_conv pointer rather than
-	reference.
-	* fhandler_clipboard.cc (fhandler_dev_clipboard::dup): Use new open
-	method.
-	(fhandler_dev_clipboard::open): Accommodate new argument for open
-	methods.
-	* fhandler_console.cc (fhandler_console::open): Ditto.
-	(fhandler_console::dup): Use new open method.
-	(fhandler_console::fixup_after_fork): Ditto.
-	(fhandler_console::fixup_after_exec): Ditto.
-	* fhandler_dsp.cc (fhandler_dev_dsp::open): Accommodate new argument for
-	open methods.
-	* fhandler_floppy.cc (fhandler_dev_floppy::open): Ditto.
-	* fhandler_mem.cc (fhandler_dev_mem::open): Ditto.
-	* fhandler_random (fhandler_dev_random::open): Ditto.
-	* fhandler_raw.cc (fhandler_dev_raw::open): Ditto.
-	* fhandler_serial.cc (fhandler_serial::open): Ditto.
-	* fhandler_tape.cc (fhandler_dev_tape::open): Ditto.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Ditto.
-	(fhandler_pty_master::open): Ditto.
-	* fhandler_windows.cc (fhandler_windows::open): Ditto.
-	* fhandler_zero.cc (fhandler_dev_zero::open): Ditto.
-	* fhandler_socket.cc (fhandler_socket::set_connect_secret): Accommodate
-	new argument for open methods.
-	* syscalls.cc (_open): Ditto.
-	(stat_worker): Ditto.
-
-Tue Oct  2 23:49:18 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (cfree): Remove malloc debugging probe.
-	* dlmalloc.c (errprint): Remove abort() call which causes interesting
-	error message printing to abort prematurely.
-	* environ.cc: Sprinkle MALLOC_CHECKs liberally throughout.
-	(_addenv): Allocate two empty elements at end of environ to
-	(apparently) work around problems with some buggy applications.
-	(winenv): Avoid calling alloca if no forced environment variable is
-	present.
-
-	* exceptions.cc (open_stackdumpfile): Don't print "Dumping stack trace
-	to..." when running in a cygwin environment (i.e., the parent is a
-	cygwin process).
-
-	* dtable.cc (dtable::init_std_file_from_handle): Move device type
-	detection code from build_fhandler here since it is only used by this
-	function.
-	(dtable::build_fhandler_from_name): New method.  Renamed from
-	dtable::build_fhandler.
-	(dtable::build_fhandler): Use build_fhandler_from_name.
-	(cygwin_attach_handle_to_fd): Ditto.
-	* syscalls.cc (_open): Ditto.
-	(stat_worker): Ditto.
-	* dtable.h (dtable::build_fhandler_from_name): Rename declaration from
-	dtable::build_fhandler.
-
-Mon Oct  1 16:52:23 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dtable.h (dtable::build_fhandler): Make path_conv parameter
-	non-optional.
-	(dtable::init_std_file_from_handle): Eliminate name parameter.
-	* dtable.cc (stdio_init): Don't pass bogus name to
-	init_std_file_from_handle.  The function will figure out the name
-	itself.
-	(dtable::init_std_file_from_handle): Eliminate name parameter.  Assume
-	that we're always called with an appropriate fd.  Pass name as NULL if
-	we can't simply figure it out from context.
-	(cygwin_attach_handle_to_fd): Pass path_conv argument to
-	build_fhandler.
-	(dtable::build_fhandler): Make path_conv argument mandatory.  Eliminate
-	specific call to get_device_number.  With unknown device names, set
-	name from handle context for parsing by path_conv.
-	(dtable::build_fhandler): Pass path_conv argument to build_fhandler.
-	* path.h (path_conv::set_isdisk): Set disk device type.
-	(path_conv::is_device): Don't consider FH_DISK a "device".
-	* syscalls.cc (_open): Pass path_conv argument by reference.
-	(stat_worker): Ditto.
-	(_rename): Use path_conv operators.  Add bounds to DeleteFile/MoveFile
-	for loop.
-
-Mon Oct 1 14:25:00 2001  Charles Wilson  <cwilson@ece.gatech.edu>
-
-	* cygwin.din: export strtoll and strtoull
-
-Sun Sep 30 22:51:41 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Add "path.h" include throughout, where needed.  Use new path_conv
-	methods and operators to simplify testing for directory and attributes,
-	throughout.
-	* path.h (path_conv::exists): New method.
-	(path_conv::has_attribute): Ditto.
-	(path_conv::isdir): Ditto.
-	(path_conv::DWORD &): New operator.
-	(path_conv::int &): Ditto.
-	* dir.cc (rmdir): Eliminate a goto.
-	* dtable.cc (dtable::build_fhandler): Accept opt and suffix info for
-	path_conv.check.  Return fh == NULL on path_conv error.  Pass unit to
-	set_name as appropriate.
-	(dtable::reset_unix_path_name): New method.
-	* dtable.h (dtable): Declare new method.  Reflect arg changes to
-	build_fhandler.
-	* fhandler.cc (fhandler_disk_dummy_name): Eliminate.
-	(fhandler_base::set_name): Expect paths to be NULL.  Build
-	unix_path_name from win32_path_name when it is a device.
-	(fhandler_base::reset_unix_path_name): New method.
-	(fhandler_base::raw_read): Report EISDIR when ERROR_INVALID_FUNCTION
-	or ERROR_INVALID_PARAMETER and reading a directory.
-	(fhandler_disk_file::fstat): Don't call stat_dev since we should now
-	never be calling fhandler_disk_file methods with devices.
-	(fhandler_base::fhandler_base): Clear {unix,win32}_path_name.
-	(fhandler_base::~fhandler_base): Always free {unix,win32}_path_name.
-	(fhandler_disk_file::fhandler_disk_file): Remove set_no_free_names
-	kludge.
-	(fhandler_disk_file::open): Ditto.
-	* fhandler.h (fhandler_base::no_free_names): Eliminate.
-	(fhandler_base::set_no_free_names): Ditto.
-	* fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Don't set
-	unix_path_name here.
-	* path.cc (fchdir): Lock fd table throughout.  Use new
-	dtable::reset_unix_path_name method to reset path.
-	* syscalls.cc (stat_worker): Reorganize to always call fstat method.
-	Pass path_conv method to fhandler_*::open.
-	(chroot): Elminate a goto.
-
-Sun Sep 30 17:37:43 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* environ.cc (winenv): Allocate exact amount of space needed for forced
-	windows environment variable rather than just using MAX_PATH.
-
-Sun Sep 30 17:10:18 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Depend on stamp to ensure rebuilding.  Remove stamp file
-	when we've just built the DLL.
-
-Mon Oct  1 00:34:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_cond_dowait): Hopefully eliminate a race on multiple thread
-	wakeups.
-
-Sat Sep 29 18:26:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* pthread.cc (pthread_cond_timedwait): Deleted - exported from thread.cc.
-	(pthread_cond_wait): Deleted - exported from thread.cc.
-	* thread.cc (pthread_cond::BroadCast): Update to use the new syntax for
-	verifyable_object_isvalid ().
-	(pthread_cond::Signal): Ditto. Also attempt to fix the lost signal race
-	with pthread_cond::TimedWait().
-	(check_valid_pointer): Change definiton to void const *.
-	(verifyable_object_isvalid): Add new parameter to allow identification of
-	static initializers, and return a enum rather than magic numbers.
-	(__pthread_create): Ditto.
-	(__pthread_cleanup): Ditto.
-	(__pthread_attr_init): Ditto.
-	(__pthread_attr_getinheritsched): Ditto.
-	(__pthread_attr_getschedparam): Ditto.
-	(__pthread_attr_getschedpolicy): Ditto.
-	(__pthread_attr_getscope): Ditto.
-	(__pthread_attr_setdetachstate): Ditto.
-	(__pthread_attr_getdetachstate): Ditto.
-	(__pthread_attr_setinheritsched): Ditto.
-	(__pthread_attr_setschedparam): Ditto.
-	(__pthread_attr_setschedpolicy): Ditto.
-	(__pthread_attr_setscope): Ditto.
-	(__pthread_attr_setstacksize): Ditto.
-	(__pthread_attr_getstacksize): Ditto.
-	(__pthread_attr_destroy): Ditto.
-	(__pthread_join): Ditto.
-	(__pthread_detach): Ditto.
-	(__pthread_suspend): Ditto.
-	(__pthread_continue): Ditto.
-	(__pthread_getschedparam): Ditto.
-	(__pthread_getsequence_np): Ditto.
-	(__pthread_key_create): Ditto.
-	(__pthread_key_delete): Ditto.
-	(__pthread_setschedparam): Ditto.
-	(__pthread_setspecific): Ditto.
-	(__pthread_getspecific): Ditto.
-	(__pthread_cond_destroy): Ditto.
-	(__pthread_cond_init): Ditto.
-	(__pthread_cond_broadcast): Ditto.
-	(__pthread_cond_signal): Ditto.
-	(__pthread_condattr_init): Ditto.
-	(__pthread_condattr_getpshared): Ditto.
-	(__pthread_condattr_setpshared): Ditto.
-	(__pthread_condattr_destroy): Ditto.
-	(__pthread_kill): Ditto.
-	(__pthread_mutex_init): Ditto.
-	(__pthread_mutex_getprioceiling): Ditto.
-	(__pthread_mutex_lock): Ditto.
-	(__pthread_mutex_trylock): Ditto.
-	(__pthread_mutex_unlock): Ditto.
-	(__pthread_mutex_destroy): Ditto.
-	(__pthread_mutex_setprioceiling): Ditto.
-	(__pthread_mutexattr_getprotocol): Ditto.
-	(__pthread_mutexattr_getpshared): Ditto.
-	(__pthread_mutexattr_gettype): Ditto.
-	(__pthread_mutexattr_init): Ditto.
-	(__pthread_mutexattr_destroy): Ditto.
-	(__pthread_mutexattr_setprotocol): Ditto.
-	(__pthread_mutexattr_setprioceiling): Ditto.
-	(__pthread_mutexattr_getprioceiling): Ditto.
-	(__pthread_mutexattr_setpshared): Ditto.
-	(__pthread_mutexattr_settype): Ditto.
-	(__sem_init): Ditto.
-	(__sem_destroy): Ditto.
-	(__sem_wait): Ditto.
-	(__sem_trywait): Ditto.
-	(__sem_post): Ditto.
-	(__pthread_cond_dowait): New function, contains core logic from
-	__pthread_cond_wait and __pthread_cond_timedwait. Decrement (*cond)->waiting
-	before reentering the cond access mutex to allow detection of lost signals.
-	(__pthread_cond_timedwait): Rename to pthread_cond_timedwait, and call
-	__pthread_cond_dowait after calculating the wait length.
-	(__pthread_cond_wait): Rename to pthread_cond_wait, and call
-	__pthread_cond_dowait.
-	* thread.h: New enum for use with verifyable_object_isvalid.
-	Remove the extern exporting of __pthread_cond_timedwait and __pthread_cond_wait.
-
-Fri Sep 28 21:18:50 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* pipe.cc (fhandler_pipe::fixup_after_fork): New method.
-	* fhandler.h (fhandler_pipe::fixup_after_fork): Declare new method.
-
-Fri Sep 28 03:23:04 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* passwd.cc (read_etc_passwd): Bother with unlocking when not
-	in cygwin initialization.
-	* grp.cc (read_etc_group): Ditto.
-
-Fri Sep 28 02:57:03 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* passwd.cc (read_etc_passwd): Don't bother with locking when
-	in cygwin initialization since there is only one thread.
-	* grp.cc (read_etc_group): Ditto.
-
-Fri Sep 28 01:50:09 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* pipe.cc (fhandler_pipe::hit_eof): Return correct value when there is
-	no EOF event available.
-
-Sat Sep 28 00:34:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap): Move setting the access after evaluating fd.
-	Remove useless comment.  Explain copy-on-write problem of 9x
-	more detailed.  Don't set access to FILE_MAP_COPY on 9x only
-	when anonymous mapping is requested.
-	(fhandler_disk_file::mmap): Remove useless device check.
-	Add debug output.
-
-Fri Sep 27 07:35:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* Makefile.in: Only stamp winver_stamp on success.
-
-Wed Sep 26 16:02:35 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (peek_pipe): REALLY only grab mutex when we actually got
-	something from the pipe.
-
-Tue Sep 25 21:25:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_cond::BroadCast): Use address with verifyable_object_isvalid().
-	(pthread_cond::Signal): Ditto.
-	(__pthread_create): Ditto.
-	(__pthread_cleanup): Ditto.
-	(__pthread_attr_init): Ditto.
-	(__pthread_attr_getinheritsched): Ditto.
-	(__pthread_attr_getschedparam): Ditto.
-	(__pthread_attr_getschedpolicy): Ditto.
-	(__pthread_attr_getscope): Ditto.
-	(__pthread_attr_setdetachstate): Ditto.
-	(__pthread_attr_getdetachstate): Ditto.
-	(__pthread_attr_setinheritsched): Ditto.
-	(__pthread_attr_setschedparam): Ditto.
-	(__pthread_attr_setschedpolicy): Ditto.
-	(__pthread_attr_setscope): Ditto.
-	(__pthread_attr_setstacksize): Ditto.
-	(__pthread_attr_getstacksize): Ditto.
-	(__pthread_attr_destroy): Ditto.
-	(__pthread_join): Ditto.
-	(__pthread_detach): Ditto.
-	(__pthread_suspend): Ditto.
-	(__pthread_continue): Ditto.
-	(__pthread_getschedparam): Ditto.
-	(__pthread_getsequence_np): Ditto.
-	(__pthread_key_create): Ditto.
-	(__pthread_key_delete): Ditto.
-	(__pthread_setschedparam): Ditto.
-	(__pthread_setspecific): Ditto.
-	(__pthread_getspecific): Ditto.
-	(__pthread_cond_destroy): Ditto.
-	(__pthread_cond_init): Ditto.
-	(__pthread_cond_broadcast): Ditto.
-	(__pthread_cond_signal): Ditto.
-	(__pthread_cond_timedwait): Ditto.
-	(__pthread_cond_wait): Ditto.
-	(__pthread_condattr_init): Ditto.
-	(__pthread_condattr_getpshared): Ditto.
-	(__pthread_condattr_setpshared): Ditto.
-	(__pthread_condattr_destroy): Ditto.
-	(__pthread_kill): Ditto.
-	(__pthread_mutex_init): Ditto.
-	(__pthread_mutex_getprioceiling): Ditto.
-	(__pthread_mutex_lock): Ditto.
-	(__pthread_mutex_trylock): Ditto.
-	(__pthread_mutex_unlock): Ditto.
-	(__pthread_mutex_destroy): Ditto.
-	(__pthread_mutex_setprioceiling): Ditto.
-	(__pthread_mutexattr_getprotocol): Ditto.
-	(__pthread_mutexattr_getpshared): Ditto.
-	(__pthread_mutexattr_gettype): Ditto.
-	(__pthread_mutexattr_init): Ditto.
-	(__pthread_mutexattr_destroy): Ditto.
-	(__pthread_mutexattr_setprotocol): Ditto.
-	(__pthread_mutexattr_setprioceiling): Ditto.
-	(__pthread_mutexattr_getprioceiling): Ditto.
-	(__pthread_mutexattr_setpshared): Ditto.
-	(__pthread_mutexattr_settype): Ditto.
-	(__sem_init): Ditto.
-	(__sem_destroy): Ditto.
-	(__sem_wait): Ditto.
-	(__sem_trywait): Ditto.
-	(__sem_post): Ditto.
-	(verifyable_object_isvalid): Recieve a pointer to a pointer for verification.
-	(__pthread_mutexattr_getprotocol): Fix typo in magic number.
-	(__pthread_mutexattr_getpshared): Ditto.
-	(__pthread_mutexattr_gettype): Ditto.
-	* thread.h (verifyable_object_isvalid): Change prototype to recieve a pointer to a
-	pointer for verification.
-	* include/pthread.h: Fix typo for __cleanup_routine_type typedef. (Contrib from Net).
-
-Tue Sep 25 02:09:42 2001  Christopher Faylor <cgf@redhat.com>
-
-	* select.cc (fhandler_tty_common::ready_for_read): Rewrite to correctly
-	call peek_pipe.
-
-Mon Sep 24 18:46:39 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (peek_pipe): Only grab mutex when we actually got something
-	from the pipe.
-
-Mon Sep 24 17:41:03 2001  Christopher Faylor <cgf@redhat.com>
-
-	* fhandler.h (fhandler_pipe::hit_eof): New method.
-	(writepipe_exists): New class element.
-	(orig_pid): Ditto.
-	(id): Ditto.
-	(is_slow): Eliminate.
-	* pipe.cc (fhandler_pipe::set_close_on_exec): Set inheritance on
-	writepipe_exists, if it exists.
-	(fhandler_pipe::hit_eof): New method, modelled after tty.
-	(fhandler_pipe::dup): Duplicate writepipe_exists, if it exists.
-	(make_pipe): Set up a dummy event for pipes on windows 9x.  The
-	nonexistence of this event means that the write side of the
-	pipe has closed.
-	(_dup): Move to syscalls.cc
-	(_dup2): Ditto.
-
-	* dtable.cc (dtable::build_fhandler): Fill out set_names here, if
-	appropriate.
-	* syscalls.cc (_open): Call set_names in build_fhandler.
-
-Sun Sep 23 16:55:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (_open): Set name in fhandler object after successful
-	creation.
-	(stat_dev): Set device type to block device in FH_FLOPPY case.
-
-Sun Sep 23 11:15:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* dtable.cc (dtable::build_fhandler): Initialize unit when using
-	optional path_conv argument.
-
-Sat Sep 22 17:33:45 2001  Christopher Faylor <cgf@cygnus.com>
-			  Corinna Vinschen <corinna@vinschen.de>
-
-	* dtable.cc (dtable::build_fhandler): Accept an optional path_conv
-	argument.  If available, use this to calculate path name and device
-	number.
-	* dtable.h (dtable): Reflect above change.
-	* fhandler.h (fhandler_base): Declare virtual method which accepts
-	path_conv rather than path string as first argument.
-	* fhandler.cc (fhandler_base::open): Define above new method.
-	* syscalls.cc (_open): Set aside a path_conv variable for use in
-	build_fhandler and subsequent call to open.
-
-Sat Sep 22 12:44:57 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (setup_handler): Always relinquish lock after we've
-	interrupted.
-	* fhandler.cc: Move pipe methods to pipe.cc.
-	* fhandler.h (fhandler_pipe): Add new methods.
-	* fork.cc (sync_with_parent): Make error messages more informative.
-	* pipe.cc (fhandler_pipe::fhandler_pipe): Move here from fhandler.cc.
-	(fhandler_pipe::lseek): Ditto.
-	(fhandler_pipe::set_close_on_exec): New method.
-	(fhandler_pipe::read): Ditto.
-	(fhandler_pipe::close): Ditto.
-	(fhandler_pipe::dup): Ditto.
-	(make_pipe): Create the guard mutex on the read side of the pipe.
-	* select.cc (peek_pipe): Use guard_mutex to discover if we have the
-	right to read on this pipe.
-	(fhandler_pipe::readh_for_read): Pass the read pipe guard mutex to
-	peek_pipe.
-	* syscalls.cc (_read): Always detect signal catchers, for now.
-
-	* debug.cc (makethread): Eliminate hack to make thread inheritable.
-	* sigproc.cc (subproc_init): Don't use hack to make thread inheritable.
-
-Thu Sep 20 16:48:44 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::set_inheritance): Just use
-	DUPLICATE_CLOSE_SOURCE to change inheritance.  Eliminate all other
-	logic dealing with closed handles.
-	* fhandler.h (fhandler_base::set_inheritance): Reflect above change.
-	* fhandler_tty.cc (fhandler_tty_common::set_close_on_exec): Ditto.
-
-Thu Sep 20 13:34:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::fixup_after_exec): Close
-	socket only when not using Winsock2.
-
-Thu Sep 20 13:20:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (fhandler_socket::fixup_after_exec): Remove inline
-	implementation.
-	(fhandler_dev_raw::fixup_after_exec): Ditto.
-	* fhandler_raw.cc (fhandler_dev_raw::fixup_after_fork): Don't
-	duplicate buffer on fork to avoid memory leak.
-	(fhandler_dev_raw::fixup_after_exec): New implementation equal to
-	former fixup_after_fork() implementation.
-	* fhandler_socket.cc (fhandler_socket::fixup_after_fork): Do
-	nothing when not using Winsock2.
-	(fhandler_socket::fixup_after_exec): New implementation.
-	(fhandler_socket::set_close_on_exec): Never call set_inheritance().
-
-Thu Sep 20  9:55:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::set_inheritance): If available,
-	use SetHandleInformation() to set inheritance.
-	* wincap.cc: Set flag has_set_handle_information_on_console_handles
-	appropriately.
-	* wincap.h: Add flag has_set_handle_information_on_console_handles.
-
-Wed Sep 19 12:24:09 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* lib/getopt.c (__progname): Don't declare if not compiling for cygwin.
-
-Wed Sep 19 18:07:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* lib/getopt.c (getopt_long): Avoid compiler warning.
-
-Wed Sep 19 11:52:42 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* lib/getopt.c: Use __progname==__argv[0] when not compiling for cygwin.
-
-	* scandir.cc (scandir): Use correct default when compar == NULL.
-
-Wed Sep 19 17:49:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::fhandler_socket): Revert
-	memory allocation to use cmalloc again.
-
-Tue Sep 18 21:04:26 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din (__argv): Export.
-	(__argc): Ditto.
-	(__progname): Ditto.
-	* include/getopt.h (getopt_long): constify arguments.
-	* lib/getopt.c: Import new file from NetBSD.
-
-Tue Sep 18 18:21:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap): Don't reuse anonymous memory in MAP_FIXED case.
-
-Mon Sep 17 17:29:25 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/io.h: Add access declaration.
-
-Mon Sep 17 14:04:27 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (rmdir): Set cwd to some other location if attempting to
-	rmdir current working directory.
-
-Sun Sep 16 23:04:31 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dtable.h (not_open): Assure inline.
-	* fhandler.h (operator []): Make const.
-
-Sun Sep 16 23:02:57 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* sync.cc (muto::~muto): Fix typo which stopped muto event handle from
-	ever being closed.
-
-2001-09-16  Egor Duda  <deo@logos-m.ru>
-
-	* path.cc (symlink): Check arguments for validity.
-	(getcwd): Ditto.
-	* syscalls.cc (ftruncate): Ditto.
-	* times.cc (times): Ditto.
-	* uname.cc (uname): Ditto.
-
-Sat Sep 15 22:54:49 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* net.cc (dup_servent_ptr): Detect old Windows 95 misaligned structure
-	and realign appropriately.
-
-Sat Sep 15 00:28:40 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Generate libcygwin.a during the link pass rather than as
-	a separate dlltool step.
-	* dcrt0.cc (_dll_crt0): pppid_handle could be NULL.  Don't close it if
-	so.
-
-Fri Sep 14 20:48:18 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (dll_crt0_1): Create vfork main storage here so that it can
-	be queried in waitsig later.
-	* sigproc.cc (wait_sig): Don't deliver a signal if in a vfork.
-	* sigproc.h (sigframe::init): New method.
-	(sigframe): Use init.
-	* perthread.h: Declare main_vfork.
-	* fork.cc (vfork): Deliver all signals on parent return from vfork.
-
-Fri Sep 14 10:21:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* dcrt0.cc (_dll_crt0()): Don't call wincap.init() here.
-
-Fri Sep 14 00:37:54 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (vfork): Avoid recursive vforks.
-
-Fri Sep 14 00:18:52 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_pipe::is_slow): Return true only if pipes are
-	reliable (i.e., not Win9x).
-	* wincap.cc: Make statics NO_COPY to avoid fork overhead.
-
-Thu Sep 13 23:01:00 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* grp.cc (read_etc_group): Just reuse group_buf storage for subsequent
-	reread of /etc/group.
-	* passwd.cc (read_etc_passwd): Just reuse passwd_buf storage for
-	subsequent reread of /etc/passwd.
-
-Thu Sep 13 20:46:05 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (dup_now): New function.
-	(cygheap_setup_for_child): Accept new argument controlling whether to
-	delay copying of cygheap to shared memory region.
-	(cygheap_setup_for_child_cleanup): Accept new arguments controlling
-	whether to copy cygheap at this point.
-	* cygheap.h: Reflect above changes.
-	* fork.cc (fork_parent): Break copying of cygheap into two parts when
-	fork_fixup is required so that the child can see the parent's changes.
-	(vfork): Do stack cleanup prior to forcing a fork error.
-	* spawn.cc (spawn_guts): Ditto.
-
-Thu Sep 13 17:14:59 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (ccalloc): Pass correct length to creturn so that
-	cygheap_max is correctly calculated.
-
-Wed Sep 12 21:06:38 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* sync.cc (muto::acquire): Fix while/if typo.
-
-Wed Sep 12 23:06:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* wincap.cc (wincapc::init): Simplify W2K/XP case.
-
-Wed Sep 12 23:02:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* wincap.cc (wincapc::init): Set os name to "NT" on XP, too.
-
-Wed Sep 12 19:00:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* Makefile.in: Build wincap.o.
-	* wincap.cc: New file.
-	* wincap.h: Ditto.
-	* autoload.cc: Add dynamic load statement for `CreateHardLinkA'.
-	* dcrt0.cc (os_being_run): Eliminated.
-	(osname): Ditto.
-	(iswinnt): Ditto.
-	(set_os_type): Ditto.
-	(dll_crt0_1): Call wincap.init() instead of set_os_type().
-	(_dll_crt0): Ditto.
-	* environ.cc (set_chunksize): New function.
-	(parse_thing): `forkchunk' setting now invokes function `set_chunksize'.
-	* fork.cc (chunksize): Eliminated. Moved to be member of wincap.
-	* host_dependent.h: Removed.
-	* syscalls.cc (_link): Try using `CreateHardLinkA' first, if available.
-	* cygheap.cc, dcrt0.cc, delqueue.cc, dir.cc,
-	environ.cc, fhandler.cc, fhandler.h, fhandler_console.cc,
-	fhandler_mem.cc, fork.cc, mmap.cc, net.cc, pinfo.cc, pinfo.h,
-	security.cc, syscalls.cc, sysconf.cc, syslog.cc, thread.cc,
-	times.cc, tty.cc, uinfo.cc, uname.cc, winsup.h: Use new wincap
-	capability check throughout.
-	* winsup.h: Include wincap.h. Eliminate extern declarations of
-	`os_being_run' and `iswinnt'. Eliminate `os_type" definition.
-	* include/cygwin/version.h: Bump version to 1.3.4.
-
-Wed Sep 12 01:03:36 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_signal_handler_now): Add additional guard against
-	inappropriately calling signal handler.
-	* syscalls.cc (_read): Reset errno if not exiting due to signal.
-
-Wed Sep 12 13:03:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* autoload.cc (LoadDLLfuncEx): Auto load TryEnterCriticalSection - it's
-	an NT only call.
-	* thread.cc (pthread_cond::TimedWait): Use critical sections for NT.
-	(pthread_cond::fixup_after_fork): Don't detect bad apps.
-	(pthread_mutex::pthread_mutex): Use critical sections for NT.
-	(pthread_mutex::~pthread_mutex): Ditto.
-	(pthread_mutex::Lock): Ditto.
-	(pthread_mutex::TryLock): Ditto.
-	(pthread_mutex::UnLock): Ditto.
-	(pthread_mutex::fixup_after_fork): Ditto.  Also do not detect bad apps.
-	(__pthread_mutex_trylock): Move WIN32 specific test into the class
-	method.
-	(__pthread_mutex_destroy): Prevent dereferencing passed pointer without
-	valid address.
-	* thread.h (pthread_mutex): Use critical sections for NT.
-
-Tue Sep 11 21:55:37 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.h (sigframe::unregister): Return true/false whether this
-	frame is capable of responding to signals.
-	* exceptions.cc (sigframe::call_signal_handler): Don't call signal
-	handler if it is not armed for this thread.
-
-Tue Sep 11 11:23:10 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Remove cygwin_getshared.
-	* shared.cc: Ditto.
-	* include/cygwin/version.h: Bump API minor number.
-
-Tue Sep 11 11:14:11 2001  Dmitry Timoshkov  <dmitry@baikal.ru>
-
-	* dtable.cc (dtable::build_fhandler): Fix incorrect test for socket.
-
-Tue Sep 11 21:22:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_cond::~pthread_cond): Fix incorrect use of
-	InterlockExchangePointer.
-	(pthread_mutex::~pthread_mutex): Ditto.
-	(semaphore::~semaphore): Ditto.
-
-Tue Sep 11 18:15:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* dcrt0.cc (cygwin_finished_initializing): Copy _mtinterf on fork.
-	* fork.cc (fork_child): Fixup thread-related structures after fork.
-	* thread.cc (MTinterface::Init): Initialise the new mutex, condition
-	and semaphore lists.
-	(MTinterface::fixup_after_fork): Iterate through each list and fixup
-	the objects.
-	(pthread_cond::pthread_cond): Add this to the condition list.
-	(pthread_cond::~pthread_cond): Remove this from the condition list.
-	(pthread_cond::fixup_after_fork): Recreate as best we can the pre-fork
-	state.
-	(pthread_mutex::pthread_mutex): Add this to the mutex list.
-	(pthread_mutex::~pthread_mutex): Remove this from the mutex list.
-	(pthread_mutex::fixup_after_fork): Recreate as best we can the pre-fork
-	state.
-	(semaphore::semaphore): Store the initial value, and add this to the
-	semaphore list.
-	(semaphore::~semaphore): Remove this from the semaphore list.
-	(semaphore::Post): Increment the current semaphore value.
-	(semaphore::TryWait): Decrement the current semaphore value.
-	(semaphore::Wait): Ditto.
-	(semaphore::fixup_after_fork): Recreate the pre-fork state as best we
-	can.
-	* thread.h (pthread_mutex): New members to allow fixup_after_fork.
-	(pthread_cond): Ditto.
-	(semaphore): Ditto.
-	(MTinterface): New list heads for tracking conds and semaphores.
-
-Sun Sep  9 22:11:27 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dtable.cc (dtable::fixup_after_fork): Use SetStdHandle appropriately
-	on inherited fds.
-
-Sun Sep  9 20:09:11 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.cc (NZOMBIES): Reduce substantially to minimize memory use.
-
-Mon Sep 10 08:28:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.h (MT_Interface): Remove pshared mutex array.  Add a
-	threadsafe list for mutex tracking (for fixup after fork).
-	* thread.cc (MTInterface::Init): Remove pshared mutex array.
-	(pthread_mutex::pthread_mutex): Remove pshared mutex functionality.
-	Fail with EINVAL on attempts to use pshared functionality.
-	(__pthread_mutex_getpshared): Remove.
-	(__pthread_cond_timedwait): Remove pshared mutex functionality.
-	(__pthread_cond_wait): Ditto.
-	(__pthread_mutex_init): Ditto.
-	(__pthread_mutex_getprioceiling): Ditto.
-	(__pthread_mutex_lock): Ditto.
-	(__pthread_mutex_trylock): Ditto.
-	(__pthread_mutex_unlock): Ditto.
-	(__pthread_mutex_destroy): Ditto.
-	(__pthread_mutex_setprioceiling): Ditto.
-	(__pthread_mutexattr_setpshared): Ditto.
-
-Sun Sep 9 23:09:00 2001 Corinna Vinschen <corinna@vinschen.de>
-
-	* pwdgrp.h (pwdgrp_check::set_last_modified): Call GetFileTime()
-	instead of GetFileInformationByHandle().
-
-Sun Sep  9 15:59:53 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* heap.h (inheap): Rewrite macro to accommodate removal of brk macros
-	below.
-
-Sun Sep  9 15:02:44 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (cygheap_fixup_in_child): Clear cygheap->base so that heap
-	is not forced to start at the same place in execed process.
-	* heap.cc: Remove brk* macros for clarity throughout.
-	* heap.h: Ditto.
-	* shared.cc (shared_info::initialize): Move heap_chunk test into
-	heap_chunk_size().
-	(heap_chunk_size): Check for chunk size here.  Don't go to registry if
-	heap_chunk_in_mb is already set.
-
-	* smallprint.c (console_printf): Add Windows 95 concessions.
-
-Sun Sep  9 13:01:06 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* child_info.h (PROC_MAGIC): Bump magic number.
-
-Sun Sep  9 18:36:00 2001  Corinna Vinschen <corinna@vinschen.de>
-			  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (init_cygheap::etc_changed): New method to signal
-	a change in /etc.
-	* cygheap.h (struct init_cygheap): Add member `etc_changed_h'
-	and method `etc_changed'.
-	* grp.cc (enum grp_state): Eliminate.
-	(class grp_check): Ditto.
-	(group_state): Define as `class pwdgrp_check'.
-	(parse_grp): Remeber path and modification time of /etc/group file.
-	* passwd.cc (enum_pwd_state): Eliminate.
-	(class pwd_check): Ditto.
-	(passwd_state): Define as `class pwdgrp_check'.
-	(read_etc_passwd): Remember path and modification time of /etc/passwd
-	file.
-	* pwdgrp.h: New file.
-	(enum pwdgrp_state): Substitutes `pwd_state' and `grp_state'.
-	(class pwdgrp_check): Substitutes `pwd_check' and `grp_check'.
-
-Sun Sep  9 14:31:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/cygwin/version.h: Bump API minor version to 45 according
-	to adding the gamm*_r functions.
-
-Sat Sep  8 23:32:18 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (fork_parent): Stop malloc activity while fork is in control
-	of the heap.
-	* sigproc.cc (NZOMBIES): Rename from ZOMBIEMAX for clarity.
-	(zombies): Revert to original behavior.  Allocating zombie array
-	resulted in performance hit.
-	* winsup.h: Declare malloc lock routines.
-
-Fri Sep  7 21:35:35 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Add gamm*_r function exports.
-
-Fri Sep  7 17:11:11 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.h (init_cygheap): Move heap pointers here.
-	* include/sys/cygwin.h (perprocess): Remove heap pointers.
-	* dcrt0.cc (__cygwin_user_data): Reflect obsolete perprocess stuff.
-	(_dll_crt0): Don't initialize heap pointers.
-	(cygwin_dll_init): Ditto.
-	(release_upto): Use heap pointers from cygheap.
-	* heap.h: Ditto.
-	* fork.cc (fork_parent): Ditto.  Don't set heap pointers in ch.
-	(fork_child): Remove obsolete sigproc_fixup_after_fork.
-	* shared.cc (memory_init): Reorganize so that cygheap initialization is
-	called prior to regular heap since regular heap uses cygheap now.
-	* sigproc.cc (proc_subproc): Eliminate zombies allocation.
-	(sigproc_init): Move zombies alloation here.  Don't free up array on
-	fork, just reuse it.
-	(sigproc_fixup_after_fork): Eliminate.
-	* sigproc.h: Ditto.
-	* include/cygwin/version.h: Reflect change to perprocess structure.
-
-Fri Sep  7 10:53:34 2001  Jason Tishler <jason@tishler.net>
-
-	* poll.cc (poll): Change implementation to only call select() when no
-	invalid file descriptors are specified.
-
-Fri Sep  7 10:27:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/limits.h: Define PIPE_BUF.
-	* syscalls.cc (fpathconf): Use PIPE_BUF instead of numerical constant.
-	(pathconf): Ditto.
-
-Thu Sep  6 20:04:05 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_socket.cc (fhandler_socket::fhandler_socket): Ensure that
-	prot_info_ptr is zeroed for later use.
-
-Thu Sep  6 14:03:49 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (cygheap_fixup_in_child): Don't consider a NULL bucket as
-	a candidate for deletion.  It is actually the end of a linked list
-	chain.
-
-	* exceptions.cc (open_stackdumpfile): Default to "unknown" program name
-	if myself->progname hasn't been filled out yet.
-
-Thu Sep  6 01:16:44 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Move appropriate variables to NO_COPY segment, throughout.
-
-Thu Sep  6 00:40:35 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Remove initialization of static or global values to zero, throughout.
-	This just needlessly grows the size of the DLL.
-	* tty.cc (tty::alive): Make inuse handle non-inheriting on open, just
-	for thread safety.
-
-Wed Sep  5 23:36:03 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.h (init_cygheap): Move bucket array here from cygheap.cc.
-	* cygheap.cc: Throughout use bucket array from cygheap.
-
-	* sigproc.cc (proc_subproc): Dynamically allocate zombie buffer to save
-	DLL space.
-	(sigproc_fixup_after_fork): Free zombie array after a fork.
-	* sigproc.h (sigproc_fixup_after_fork): Declare.
-
-2001-09-06  Egor Duda  <deo@logos-m.ru>
-
-	* dir.cc (mkdir): Expand buffer for security descriptor to 4K to avoid
-	stack corruption.
-	* fhandler.cc (fhandler_base::open): Ditto.
-	* path.cc (symlink): Ditto.
-
-Wed Sep  5 21:35:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* winver.rc: Change copyright to include 2001.
-
-Wed Sep  5 12:12:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_floppy.cc (fhandler_floppy::lseek): Remove iswinnt check.
-
-Wed Sep  5 11:34:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::close): Change 2MSL value
-	according to MSDN.
-
-Wed Sep  5 10:14:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (cygwin_connect): Add WSAEALREADY and WSAEINVAL handling
-	for non-blocking sockets.
-
-Tue Sep  4 22:42:13 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (ctrl_c_handler): Only send SIGINT when we have a
-	controlling terminal and we are the head of the process group.
-
-Tue Sep  4 16:48:14 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* thread.cc (InterlockedExchangePointer): Don't define if it already
-	exists.
-
-Tue Sep  4 22:14:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* uname.cc (uname): Eliminate os specific retrieving of x86
-	processor type.
-
-2001-09-04  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* fhandler_console.cc (fhandler_console::char_command): Save the cursor
-	position relative to the top of the window.
-	* fhandler_cc (fhandler_console::write): Ditto.
-
-Mon Sep  3 21:06:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* dir.cc (opendir): Write version information to __d_dirent->d_version.
-
-Mon Sep  3 18:34:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygwin.din: Add `dirfd'.
-	* dir.cc (dirfd): New function.
-	(opendir): Open a directory file descriptor and save it in
-	__d_dirent->d_fd.
-	(closedir): Close directory file descriptor.
-	* include/cygwin/version.h: Bump API minor version to 44.
-
-Sun Sep  2 22:09:31 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* child_info.h: Modify magic number.
-	* dcrt0.cc (_cygwin_testing): Define.
-	(_dll_crt0): Set _cygwin_testing if CYGWIN_TESTING environment variable
-	exists.  Don't issue "conflicting versions" error if _cygwin_testing is
-	true.
-	* shared.cc (shared_name): Use _cygwin_testing global rather than
-	testing the environment.
-	* syscalls.cc (_write): Remove debugging info.
-
-Sat Sep  1 01:37:13 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* tty.cc (tty::create_inuse): Eliminate unneeded argument.
-	* tty.h: Reflect above change.
-	* fhandler_tty.cc: Reflect argument reduction in tty::create_inuse,
-	throughout.  Always make inuse inheritable.
-
-Sat Sep  1 01:10:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.cc (mark_closed): Rename from debug_mark_closed and make
-	static.
-	(setclexec_pid): New function for marking saved handle as
-	close-on-exec.
-	(delete_handle): New function.
-	(debug_fixup_after_fork): New function.
-	* debug.h: Declare new functions, remove obsolete ones.
-	* fork.cc (debug_fixup_after_fork): Call to cleanup close-on-exec
-	handles.
-
-	* fhandler.cc (fhandler_disk_file::close): Minor reorg.
-	(fhandler_base::set_inheritance): Set flag appropriately for debugging
-	when close-on-exec so forked process can delete closed handles.
-	* tty.h (open_output_mutex): Eliminate unneeded argument.
-	(open_input_mutex): Ditto.
-	* fhandler_tty.cc (fhandler_tty_slave::open): reflect open_*_mutex
-	argument changes.
-	* fhandler.h (fhandler_socket): Make saw_shutdown_* functions type
-	bool.
-	* tty.cc (tty::get_event): Eliminate unneeded argument.
-	(tty::common_init): Reflect change to get_event.  Events should always
-	be inherited.
-
-Fri Aug 31 21:39:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (create_token): Change initialization of `exp' to comply
-	with new LARGE_INTEGER definition in winnt.h.
-
-Fri Aug 31 13:58:51 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.sc: Revert to previous NO_COPY behavior.
-	* winsup.h: Ditto.
-	* sigproc.cc: Ditto.
-	* autoload.cc: Ditto.
-
-Fri Aug 31 00:56:26 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.sc: New file -- linker script for building cygwin DLL.
-	* Makefile.in: Use linker script to control location of cygheap.
-	* cygheap.cc (buckets): Make static.
-	(init_cheap): Remove special iswinnt handling.  Allocate cygheap at a
-	fixed location.  Display more info when allocation fails.
-	(cygheap_fixup_in_child): Try harder to move cygheap to correct
-	location.  Display more info when allocation fails.
-	* fhandler.h (fhandler_socket): Add macros for tracking socket shutdown
-	state.
-	* net.cc (cygwin_shutdown): Set appropriate shutdown value for future
-	use.
-	* select.cc (select_stuff::cleanup): New method.
-	(cygwin_select): Call cleanup explicitly to avoid a race.
-	(select_stuff:~select_stuff): Call cleanup chain via cleanup method.
-	(fhandler_socket::select_read): Set *_ready when shutdown has been
-	called on the socket.
-	(fhandler_socket::select_write): Ditto.
-	(fhandler_socket::select_except): Ditto.
-
-	* winsup.h: Move NO_COPY to "COMMON" section.
-	* autoload.cc (wsock_started): Avoid initializing NO_COPY value.
-	* sigproc.cc: Remove initialization from NO_COPY variables.
-	(sigproc_init): Initialize sig_loop_wait here, rather than via
-	initialization.
-	(subproc_init): Initialize proc_loop_wait here, rather than via
-	initialization.
-
-Thu Aug 30 10:19:00 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (select_read): Add setting read_ready flag.
-	(select_write): Add setting write_ready flag.
-
-Wed Aug 29 00:40:42 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::check): Avoid splitting off leading '/' in path
-	component when building a symlink.
-
-Wed Aug 29  0:45:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* resource.cc (getrlimit): Return actual values on RLIMIT_STACK.
-
-Tue Aug 28 16:37:17 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dir.cc (rmdir): Report ENOENT when file doesn't exist rather than
-	ENOTDIR.
-
-Mon Aug 27 11:58:19 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (cygwin_select): Ensure that arguments are zeroed on
-	timeout.
-	(select_stuff::wait): Ditto.
-
-2001-08-24  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* syscalls.cc (check_tty_fds): New function.  Check whether there is a
-	fd referring to pty slave.
-	(setsid): Don't detach console if the process has a pty slave.
-
-Fri Aug 24  8:54:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (free_addr_list): Add define for symmetry.
-	(free_hostent_ptr): Use free_addr_list to free h_addr_list element.
-
-Thu Aug 23 16:00:09 2001  Jason Tishler <jason@tishler.net>
-
-	* net.cc (dup_addr_list): New static function.
-	(dup_hostent_ptr): Use dup_addr_list instead of dup_char_list in order
-	to handle embedded null characters.
-
-Wed Aug 22 22:23:14 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dtable.cc (dtable::dup2): Allow extension of fd table by dup2.
-	* syscalls.cc: Minor code cleanup.
-	(fpathconf): Check for bad fd before doing anything else.
-	* termios.cc (tcsetattr): Don't convert to new termios if bad fd.
-	(tcgetattr): Minor debugging tweak.
-
-Wed Aug 22 23:41:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (cygwin_inet_ntoa): Rearrange previous patch to use
-	thread local buffer space when compiled thread safe.
-	(cygwin_getprotobyname): Ditto.
-	(cygwin_getprotobynumber): Ditto.
-	(cygwin_getservbyname): Ditto.
-	(cygwin_getservbyport): Ditto.
-	(cygwin_gethostbyname): Ditto.
-	(cygwin_gethostbyaddr): Ditto. Move near to cygwin_gethostbyname.
-	* thread.h (struct _winsup_t): Add pointers for above used buffer space.
-	* passwd.cc (getpwduid): Remove initializing passwd.
-	(setpwent): Ditto.
-	(endpwent): Ditto.
-	(setpassent): Ditto.
-
-Wed Aug 22 13:41:09 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* smallprint.c (console_printf): New function.
-	* dcrt0.cc (dll_crt0_1): Use console_printf for debugging output.
-	* debug.cc (debug_mark_closed): New function.
-	(close_handle): Use debug_mark_closed.
-	* debug.h: Declare new functions.
-	* dtable.cc (dtable::build_fhandler): Remove unneeded extern.
-	* spawn.cc: Cosmetic changes.
-	* winsup.h: Define NO_COPY for C files, too.  Declare a global.
-
-Wed Aug 22 17:31:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (free_char_list): New static function.
-	(dup_char_list): Ditto.
-	(free_protoent_ptr): Ditto.
-	(dup_protoent_ptr): Ditto.
-	(free_servent_ptr): Ditto.
-	(dup_servent_ptr): Ditto.
-	(free_hostent_ptr): Ditto.
-	(dup_hostent_ptr): Ditto.
-	(cygwin_inet_ntoa): Use local static buffer to allow propagating of
-	the result to child processes.
-	(cygwin_getprotobyname): Ditto.
-	(cygwin_getprotobynumber): Ditto.
-	(cygwin_getservbyname): Ditto.
-	(cygwin_getservbyport): Ditto.
-	(cygwin_gethostbyname): Ditto.
-	(cygwin_gethostbyaddr): Ditto.
-
-Mon Aug 20 11:56:19 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (init_cheap): Allocate cygheap in shared memory for Windows NT.
-
-Thu Aug 16 09:38:59 2001  Jason Tishler <jason@tishler.net>
-
-	* fhandler_socket.cc (fhandler_socket::create_secret_event): Relax
-	security of secret_event so AF_UNIX socket clients can connect to
-	servers even if running under a different user account.
-	(fhandler_socket::check_peer_secret_event): Ditto.
-
-Thu Aug 16 16:26:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* resource.cc (getrlimit): Return getdtablesize () as current limit
-	on RLIMIT_NOFILE.
-	* syscalls.cc (getdtablesize): Return OPEN_MAX if current dtable size
-	is less than OPEN_MAX, the current dtable size otherwise.
-	* sysconf.cc (sysconf): Return getdtablesize () on _SC_OPEN_MAX.
-
-Thu Aug 16 16:17:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* resource.cc (getrlimit): Return OPEN_MAX as current limit
-	on RLIMIT_NOFILE.
-	* syscalls.cc (getdtablesize): Return OPEN_MAX.
-	* sysconf.cc (sysconf): Return OPEN_MAX on _SC_OPEN_MAX.
-	* include/limits.h (OPEN_MAX): Define as 256.
-
-Wed Aug 15 12:43:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* times.cc (utimes): Revert previous change. Just open the
-	file using FILE_WRITE_ATTRIBUTES instead of GENERIC_WRITE
-	on NT/W2K.
-
-Wed Aug 15 12:18:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (set_nt_attribute): Return always -1 in case of
-	a failure.
-	* times.cc (utimes): On NTFS with ntsec ON, change the file's
-	security descriptor temporarily to acquire write access if
-	opening the file failed.
-
-Wed Aug 15  9:42:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::is_nonblocking): New method.
-	(fhandler_base::set_nonblocking): Ditto.
-	* fhandler.h (fhandler_base): Declare new methods `is_nonblocking' and
-	`set_nonblocking'.
-	* fhandler_socket.cc (fhandler_socket::ioctl): Use `set_nonblocking'.
-	* fhandler_tty.cc (fhandler_pty_master::process_slave_output):
-	Use `is_nonblocking'.
-	(fhandler_tty_slave::read): Ditto.
-	(fhandler_tty_slave::ioctl): Use `set_nonblocking'.
-	(fhandler_pty_master::ioctl): Ditto.
-	* net.cc (cygwin_sendto): Fallback to winsock 1 functionality
-	in case of nonblocking IO.
-	(cygwin_recvfrom): Ditto.
-	(cygwin_recv): Ditto.
-	(cygwin_send): Ditto.
-	* syscalls.cc (_read): Use `is_nonblocking'.
-
-Tue Aug 14 11:05:26 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump API version.
-
-2001-08-14  Egor Duda  <deo@logos-m.ru>
-
-	* spawn.cc (spawn_guts): Enable appropriate privilege before
-	loading user's registry hive.
-
-Mon Aug 13 22:34:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::fcntl): Use new O_NONBLOCK_MASK define.
-	* fhandler.h: Move definitions of O_NOSYMLINK, O_DIROPEN and
-	OLD_O_NDELAY from winsup.h to here. Add O_NONBLOCK_MASK define.
-	* fhandler_socket.cc (fhandler_socket::close): Add hack to allow
-	a graceful shutdown even if shutdown() hasn't been called by the
-	application. Add debug output.
-	(fhandler_socket::ioctl): Set fhandler's NONBLOCK flag according
-	to FIONBIO setting.
-	(fhandler_socket::fcntl): Use new O_NONBLOCK_MASK define. Actually
-	set `request' before using it.
-	* fhandler_tty.cc: Use new O_NONBLOCK_MASK define throughout.
-	(fhandler_tty_slave::ioctl): Set fhandler's NONBLOCK flag according
-	to FIONBIO setting.
-	(fhandler_pty_master::ioctl): Ditto.
-	* net.cc (wsock_event::prepare): Compare WSACreateEvent return code
-	with `WSA_INVALID_EVENT' according to MSDN.
-	* syscalls.cc (_read): Use new O_NONBLOCK_MASK define.
-
-Wed Aug  8 15:24:59 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/wchar.h: Define __need_wint_t.
-
-Wed Aug  8 11:46:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (alloc_sd): Revert to setting inheritance attribute for
-	permissions given to directories. Never set inheritance on NULL ACE.
-
-Tue Aug  7 18:11:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (alloc_sd): Don't set FILE_DELETE_CHILD for group
-	if S_ISVTX attribute is given.
-	* dir.cc (mkdir): Allow immediate setting of S_ISUID, S_ISGID and
-	S_ISVTX attribute.
-	* syscalls.cc (_open): Ditto.
-
-Tue Aug  7 16:24:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* dir.cc (mkdir): Set security attributes correctly for
-	CreateDirectoryA () call if ntsec is on. Don't call
-	set_file_attributes () then.
-	* fhandler.cc (fhandler_base::open): Ditto for CreateFileA () call.
-	* path.cc (symlink): Ditto.
-	* security.cc (set_security_attribute): New function.
-	* security.h: Add declaration for `allow_ntea' and
-	`set_security_attribute'.
-
-Tue Aug  7 10:54:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* grp.cc (class grp_check): New class. Make `group_state'
-	a member of class grp_check.
-	(read_etc_group): Free former allocated memory on reread.
-	* passwd.cc (class pwd_check): New class Make `passwd_state'
-	a member of class pwd_check.
-	(read_etc_passwd): Free former allocated memory on reread.
-
-Tue Aug  7 01:13:58 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (get_tty_stuff): Don't initialize shared memory
-	console area if it is already initialized.
-
-	* fhandler_termios.cc (fhandler_termios::tcsetpgrp): Augment debugging
-	info.
-
-Mon Aug  6 19:58:43 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (cygheap_root::set): Avoid treating '/' specially.
-
-	* fhandler.cc (fhandler_base::fcntl): Only set specific O_NDELAY style
-	flag passed in from application.
-	* fhandler_socket.cc (fhandler_socket::fcntl): Ditto.
-	* fhandler.h: Set constant for future use.
-	* winsup.h: Define OLD_O_NDELAY only for old programs.
-	* include/cygwin/version.h: Define
-	CYGWIN_VERSION_CHECK_FOR_OLD_O_NONBLOCK.
-
-Sat Aug  4 16:52:03 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, change check for running under Windows NT to 'iswinnt'.
-	* dcrt0.cc (set_os_type): Set 'iswinnt' appropriately.
-	* cygheap.cc (init_cheap): Revert to using VirtualAlloc for allocating
-	cygheap.
-	(cygheap_setup_for_child_cleanup): New function.  Standard function to
-	call after calling CreateProcess to cleanup cygheap info passed to
-	child.
-	(cygheap_fixup_in_child): Copy cygheap from shared memory into
-	allocated space under Windows 9x or if can't relocate shared space
-	under NT.
-	* cygheap.h: Declare new function.
-	* spawn.cc (spawn_guts): Use cygheap_fixup_in_child.
-	* fork.cc (fork_parent): Ditto.
-	* winsup.h: Declare iswinnt.
-
-2001-08-04  Egor Duda  <deo@logos-m.ru>
-
-	* dtable.cc (dtable::release): Avoid messing with console when
-	closing socket.
-
-Fri Aug  3 14:02:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (cygwin_accept): Allow NULL peer and len parameters.
-	* include/cygwin/socket.h: Define socklen_t as int.
-
-Fri Aug  3 13:04:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (fchdir): Set the fhandler's path to absolute value to ensure
-	changing to the correct directory even if the fhandler originally
-	points to a relative path.
-
-Thu Aug  2 17:59:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (set_file_attribute): Clean up. Don't call
-	`set_nt_attribute' when ntsec isn't set.
-
-Sat Jul 28 22:30:55 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (alloc_stack_hard_way): Make half-hearted attempt to deal
-	with growing stack under Windows 95.
-
-Fri Jul 27 12:36:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Add install-lib and install-headers.
-
-Fri Jul 27 12:28:12 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Export sys_errlist, sys_nerr.
-	* include/cygwin/version.h: Bump minor version number.
-
-Fri 27 Jul 2001 10:29:00  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (get_user_primary_group): Fix compiler warning.
-	(alloc_sd): Add DELETE permission for user when S_IWUSR is given.
-
-Thu Jul 26 16:43:39 2001  Pieter de Visser <pieterdv@knoware.nl>
-
-	* thread.cc (__pthread_equal): Invert return value so that true is
-	returned when threads are equal.
-
-Thu Jul 26 15:50:38 2001  Charles Wilson <cwilson@ece.gatech.edu>
-			  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Export __signgam.
-	* include/cygwin/version.h: Bump minor version number.
-
-Thu Jul 26 15:19:50 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, reorganize header file inclusion to put security.h prior to
-	fhandler.h.
-	* fhandler.h (fhandler_base::get_inheritance): New method.
-	* fhandler_socket.cc (fhandler_socket::create_secret_event): Use proper
-	close-on-exec inheritance when creating.
-	(fhandler_socket::check_peer_secret_event): Create handle as
-	non-inheritable.
-
-2001-07-25  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* syscalls.cc (setsid): Detach process from its console if the current
-	controlling tty is the console and already closed.
-	* dtable.h (class dtable): Add members to count descriptors referring
-	to the console.
-	* dtable.cc (dtable::dec_console_fds): New function to detach process
-	from its console.
-	(dtable::release): Decrement the counter of console descriptors.
-	(dtable::build_fhandler): Increment it.
-	* exception.cc (ctrl_c_handler): Send SIGTERM to myself when catch
-	CTRL_SHUTDOWN_EVENT.
-
-Tue 24 Jul 2001 02:28:00 PM  Trevor Forbes <t4bs@hotmail.com>
-
-	* thread.cc (verifyable_object_isvalid): Don't validate
-	PTHREAD_MUTEX_INITIALIZER pointer as it will cause an exception
-	in IsBadWritePtr() when running GDB.
-
-Wed 25 Jul 2001 23:46:00  Corinna Vinschen <corinna@vinschen.de>
-
-	* localtime.c: Changed whole file to become C++ clean. Rename to
-	localtime.cc.
-	* localtime.cc (tzload): Preserve errno.
-
-Fri 20 Jul 2001 11:15:50 PM EDT  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (cygheap_fixup_in_child): Attempt Win95 workaround.
-	* dtable.cc (dtable::dup_worker): Add debugging output.
-	(dtable::vfork_child_dup): Correctly set close_on_exec.
-	* fhandler.cc (fhandler_base::fork_fixup): Don't mess with handle if
-	there is no need to get it from the parent.
-	* fhandler_tty.cc (fhandler_tty_common::close): Add debugging output.
-
-Fri 20 Jul 2001 09:15:00  Mark Bradshaw <bradshaw@staff.crosswalk.com>
-
-	* dir.cc (readdir): Protect FindNextFileA against INVALID_HANDLE_VALUE.
-
-Wed 18 Jul 2001 01:00:47 PM EDT  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (_cmalloc): Use correct constants for size calculation.
-	* dcrt0.cc (dll_crt0_1): Move uid initialization earlier.
-	* fork.cc (fork_parent): Move cygheap_setup_in_child to just prior to
-	CreateProcess so that all contents of cygheap are copied.
-	* spawn.cc (spawn_guts): Ditto.
-
-Wed 18 Jul 2001 12:54:17  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (get_user_groups): Call Net function with NULL server
-	name under specific error conditions.
-	(is_group_member): Ditto.
-	(get_user_local_groups): Ditto.
-	(get_user_primary_group): Ditto.
-
-Wed 18 Jul 2001 11:56:00  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (_unlink): Explicitly check for non-existant file.
-
-Tue 17 Jul 2001 10:19:00  Corinna Vinschen <corinna@vinschen.de>
-
-	* delqueue.h: Remove obsolete file.
-
-Mon 16 Jul 2001 10:47:17 PM EDT  Christopher Faylor <cgf@cygnus.com>
-
-	* child_info.h: Bump magic number.
-	(class child_info): Add an element.
-	* cygheap.cc (init_cheap): Allocate cygwin heap in shared memory area.
-	(cygheap_fixup_in_child): Map cygwin heap, passed from parent via
-	shared memory into correct address.
-	(cygheap_setup_for_child): New function.
-	* cygheap.h: Declare new functions.
-	* dcrt0.cc (dll_crt0_1): Accommodate new cygheap_fixup_in_child
-	arguments.  Avoid protecting subproc_ready unless it is spawn/nowait.
-	* fork.cc (fork_parent): Use new cygheap_setup_for_child function to
-	setup cygwin heap info.  Close passed cygheap shared memory handle.
-	* spawn.cc (spawn_guts): Ditto.  Also, reorganize to avoid
-	synchronization between parent and child in non-P_OVERLAY case.
-	* sigproc.cc (wait_sig): Only signal subproc_ready when execing.
-
-Mon 16 Jul 2001 15:21:00  Corinna Vinschen <corinna@vinschen.de>
-
-	* grp.cc: Add missing Copyright date 2001.
-
-Mon 16 Jul 2001 00:11:00  Corinna Vinschen <corinna@vinschen.de>
-
-	Change well_known_admin_sid to well_known_admins_sid throughout.
-	* sec_acl.cc (setacl): Never set DELETE permission. Set
-	FILE_DELETE_CHILD only on readable and executable directories.
-	* sec_helper.cc: Add constructor for `well_known_null_sid'.
-	* security.cc (get_nt_attribute): Set S_ISVTX for directories if
-	FILE_WRITE_DATA and FILE_EXECUTE but not FILE_DELETE_CHILD is set.
-	Add evaluation of S_ISVTX, S_ISGID and S_ISUID from NULL ACE.
-	(alloc_sd): Never set DELETE permission. Set FILE_DELETE_CHILD
-	only on readable and executable directories.
-	Add creation of NULL ACE for S_ISVTX, S_ISGID and S_ISUID permissions.
-	* security.h: Add extern declaration for `well_known_null_sid'.
-
-Fri 13 Jul 2001 08:08:49 PM EDT  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (stat_worker): Simplify previous change.
-
-Fri Jul 13 13:13:09 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_unlink): Correct (?) logic which determines when
-	to report an access violation and when to queue file for eventual
-	deletion.
-	(stat_worker): Check for invalid buf argument.
-
-Tue Jul 10 23:01:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (fhandler_disk_file::mmap): Try to open file mappings
-	by a unified name when running under 9x/ME. If that failes, create
-	the file mapping using the unified name.
-
-Mon Jul  9 10:43:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* uinfo.cc (internal_getlogin): Add pointer check.
-
-Mon Jul  9 10:05:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (alloc_sd): Don't set inheritance attribute for
-	permissions given to directories.
-
-Thu Jun 28 22:19:08 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_dsp.cc (fhandler_dev_dsp::ioctl): Return 0 for success.
-
-Wed Jun 27 22:19:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::check): Add signal protection here since
-	retrieving info about remote shares can take some time.
-
-Wed Jun 27 23:30:00 2001  Robert Collins <rbtcollins@hotmail.com>
-			  Christopher Faylor <cgf@cygnus.com>
-
-	Change check_null_empty_path* to check_null_empty_str* throughout.
-	* path.h (check_null_empty_str_errno): Convert to a function prototype.
-	* path.cc (check_null_empty_str): Move to miscfuncs.cc.
-	* miscfuncs.cc (check_null_empty_str_errno): New function.
-	(__check_null_invalid_struct): Ditto.
-	(__check_null_invalid_struct_errno): Ditto.
-	(check_null_empty_str): Change from VirtualQuery to IsBadWritePtr.
-	* thread.cc (check_valid_pointer): Ditto.
-	* resource.cc (getrlimit): Use check_null_invalid_struct macro for
-	checking validity of pointer.
-	(setrlimit): Ditto.
-
-Tue Jun 26 16:59:16 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Don't rely on exactly 3
-	characters being read for executable test since we could be checking
-	for less than that.
-	* syscalls.cc (stat_worker): Try opening the file the "correct" way
-	first so that #! processing can potentially happen.  If that fails,
-	then use "query open" method.
-
-	* spawn.cc (spawn_guts): Delay processing of signal until after we've
-	notified parent about reparenting.
-
-Tue Jun 26 10:47:24 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* mmap.cc: Clean up *ResourceLock calls throughout.
-
-Tue Jun 26 22:10:00 2001  Robert Collins rbtcollins@hotmail.com
-
-	* thread.cc (pthread_cond::TimedWait): Check for WAIT_TIMEOUT as well
-	as WAIT_ABANDONED.
-	(__pthread_cond_timedwait): Calculate a relative wait from the abstime
-	parameter.
-
-Sun Jun 24 17:38:19 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interrupt_setup): Move actions from setup_handler to
-	here.
-	(setup_handler): Move actions after a successful interrupt to
-	interrupt_setup.
-	* fork.cc (vfork): Augment debugging output.
-	* sigproc.cc (proc_subproc): Ditto.
-	* spawn.cc (spawn_guts): Ditto.  Correctly fill out progname when spawn
-	NO_WAIT.  Call signal handler when a signal arrives.
-	* sigproc.h: Declare a function.
-
-Fri Jun 22 16:50:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h class fhandler_socket): Declare new method
-	`set_close_on_exec'.
-	* fhandler_socket.cc (fhandler_socket::set_close_on_exec):
-	New method.
-
-Fri Jun 22 16:12:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_tape.cc (fhandler_dev_tape::tape_erase): Set size
-	parameter to value expected by GetTapeParameters().
-
-Thu Jun 21 22:01:39 2001  Marius Gedminas <mgedmin@delfi.lt>
-
-	* fhandler_console.cc (fhandler_console::read): Detect AltGr more
-	robustly on WinNT.
-
-2001-06-22  Robert Collins  <rbbtcollins@hotmail.com>
-
-	* thread.cc (__pthread_cond_timedwait): Lock the waiting mutex before
-	the condition protect mutex to avoid deadlocking. (Found by Greg Smith).
-	(__pthread_cond_wait): Ditto.
-
-2001-06-30  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler.cc (fhandler_base::open): Work around windows bug when
-	CreateFile() with dwDesiredAccess == 0 called on remote share returns
-	valid handle even if file doesn't exist.
-
-2001-06-20  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler_socket.cc (fhandler_socket::signal_secret_event): New
-	function.
-	* fhandler.h: Declare it.
-	* fhandler_socket.cc (fhandler_socket::create_secret_event): Don't
-	signal secret event immediately.
-	(fhandler_socket::check_peer_secret_event): Do it after peer event
-	was opened.
-	* net.cc (cygwin_connect): Or if socket is non-blocking.
-	(cygwin_accept): Ditto.
-
-Mon Jun 18 17:09:25 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::init): Revert 2001-06-16 change.
-
-	* fork.cc (fork_copy): Print more debugging info.
-	(fork_parent): Change order of arguments to accomdate buggy gcc.
-	(fork): Ditto.
-
-Sun Jun 17 18:54:46 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_unlink): Reorganize to try harder to delete file with
-	DeleteFile and to recover more gracefully if FILE_FLAG_DELETE_ON_CLOSE
-	doesn't work properly.
-
-Sat Jun 16 13:06:49 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sig_handle_tty_stop): Reset PID_STOPPED if not
-	actually stopping.
-	* fhandler_console.cc (fhandler_console::fixup_after_fork): Don't set
-	controlling terminal if just inheriting a handle.
-	(fhandler_console::fixup_after_exec): Ditto.
-	* fhandler_tty.cc (fhandler_tty_slave::init): Ditto.
-	* signal.cc (kill_worker): Set appropriate errno if proc_exists
-	determines that process does not really exist.
-
-Fri Jun 15 14:34:19 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::check): Deal more robustly with foo/ behavior.
-
-Fri Jun 15 11:15:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_tape.cc (fhandler_dev_tape::tape_status): Set size
-	parameter to value expected by GetTapeParameters().
-
-Thu Jun 14 20:19:46 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Properly set executable bits
-	for directory when !ntsec && !ntea.  Also move common code prior to
-	call to get_attributes.
-
-Fri June 15 09:25:00  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_cond::Signal): Release the condition access
-	variable correctly.
-
-2001-06-14  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler.cc (fhandler_base::open): Set win32 access flags to 0, when
-	requested.
-	* fhandler.h: New status flag FH_QUERYOPEN.
-	(fhandler::get_query_open): New function.
-	(fhandler::set_query_open): Ditto.
-	* syscalls.cc (stat_worker): Request query-only open mode.
-
-2001-06-12  Egor Duda  <deo@logos-m.ru>
-
-	* environ.cc (set_file_api_mode): New function. Move setting
-	of file APIs mode (OEM/ANSI) here.
-	(codepage_init): From here.
-	* winsup.h (set_file_api_mode): Declare it.
-	* fork.cc (fork_child): Set file APIs mode in forkee.
-
-Mon Jun 11 14:19:49 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc: Use autoloaded ToolHelp functions throughout for Win9x.
-	* autoload.cc: Autoload ToolHelp functions.
-
-	* sigproc.cc (proc_subproc): Incorporate SIGCHLD == SIG_IGN special
-	handling of zombie processes.  Ensure that zombie processes which are
-	at the end of the zombie array are properly cleaned up.
-
-Mon Jun 11 11:18:56 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (chdir): Fix call to path_conv constructor so that it REALLY
-	doesn't check for the null/non-empty path.
-
-Sun Jun 10 23:34:09 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::update_fs_info): Don't consider remote drives to
-	be NTFS.  Set root_dir before invoking GetDriveType (from Kazuhiro
-	Fujieda <fujieda@jaist.ac.jp>).  Eliminate extra checks for rootdir.
-
-Sun Jun 10 20:19:47 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (chdir): Pre-check path for validity before eating trailing
-	space.  Then, ensure that path_conv doesn't check the path for validity
-	again.
-
-Sun Jun 10 12:56:00 2001  Christopher Faylor <cgf@redhat.com>
-
-	* exceptions.cc (sigdelayed): Ensure that signal is cleared as
-	the last operation or suffer races.
-	* sigproc.cc (proc_subproc): Deal with zombie array overflow.
-
-Sun Jun 10 11:56:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	 * cygwin.din: Add fchdir symbols.
-	 * path.cc (chdir): Guard against invalid parameter.
-	 (fchdir): New function.
-	 * include/cygwin/version.h: Bump API minor version to 40.
-	 * uinfo.cc (internal_getlogin): Remove unused variable.
-
-Sat Jun  9 23:20:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (seteuid): Set environment variables USERNAME and
-	USERDOMAIN before impersonation to workaround a LookupAccountSid()
-	misbehaviour.
-	* uinfo.cc (internal_getlogin): Revert most of the previous change.
-	Don't set environment variables USERNAME and USERDOMAIN. That's
-	the job of seteuid() now. Try to get logon server from Lsa
-	only if logon server isn't already known.
-
-Thu Jun  7 15:54:32 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_cond::Broadcast): Don't print error messages on
-	invalid mutexs - user programs are allowed to call
-	pthread_cond_broadcast like that.
-	(__pthread_cond_timedwait): Initialise themutex properly.
-	(__pthread_cond_wait): Initialise themutex properly.
-
-Tue Jun  5 19:56:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_console.cc (fhandler_console::dup): Allocate space for
-	savebuf on Cygwin heap.
-	(fhandler_console::char_command): Ditto. Use correct values for size.
-
-2001-06-05  Egor Duda  <deo@logos-m.ru>
-
-	* security.h (NTWriteEA): Change prototype.
-	* ntea.cc (NTReadEA): Don't check for global ntea setting, now
-	it's caller responsibility.
-	(NTWriteEA): Ditto.
-	* security.cc (get_file_attribute): Read attribute from EA only
-	if 'ntea' is enabled.
-	(set_file_attribute): Ditto.
-	* path.h: (class path_conv): Add members to store file system
-	information.
-	(path_conv::get_drive_type): New function.
-	* syscalls.cc (stat_worker): Use it.
-	* path.cc (path_conv::update_fs_info): New functions.
-	(path_conv::check): Get file system information from device where
-	file resides. On NTFS, try to read symlink contents from EA.
-	(get_symlink_ea): New function.
-	(set_symlink_ea): Ditto.
-	(symlink): Store symlink in extended attribute, if possible.
-
-Tue Jun  5 11:18:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Always reset file position
-	to original value after checking for executable magic.
-
-Mon Jun  4 16:21:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygheap.h (cygheap_user::cygheap_user): Initialize token to
-	INVALID_HANDLE_VALUE.
-	* uinfo.cc (uinfo_init): Close token handle if needed.
-
-Sun Jun  3 20:52:13 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (normalize_posix_path): Revert ..  check removed by previous
-	changes.
-	* cygheap.h: Temporarily declare path_prefix_p here.
-
-Mon Jun  4  0:14:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (wsock_event): Add destructor.
-
-Sun Jun  3 09:49:55 2001  Robert Collins  <rbtcollins@hotmail.com>
-
-	* dlfcn.cc (dlclose): Do not call FreeLibrary if the symbol to close
-	was obtained by dlopen(NULL,...).
-
-Sat Jun  2 23:11:52 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (sleep): Try to be a little more accomodating of signal
-	arrival.  Ensure that the signal handler is called.
-
-Sat Jun  2 14:07:28 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (cygheap_root::cygheap_root): Remove constructor.
-	(cygheap_root::~cygheap_root): Remove destructor.
-	(cygheap_root::operator =): Remove.
-	(cygheap_root::set): New method.
-	* cygheap.h (cygheap_root): Reflect above changes.  Store root info in
-	mount-like structure.
-	(cygheap_root:posix_ok): New method.
-	(cygheap_root::ischroot_native): Ditto.
-	(cygheap_root::unchroot): Ditto.
-	(cygheap_root::exists): Ditto.
-	(cygheap_root::posix_length): Ditto.
-	(cygheap_root::posix_path): Ditto.
-	(cygheap_root::native_length): Ditto.
-	(cygheap_root::native_path): Ditto.
-	* dir.cc (opendir): Remove special chroot test.
-	* path.cc (path_prefix_p): Remove front end.
-	(normalize_posix_path): Reorganize chroot tests to accommodate new
-	convention of allowing paths using posix chroot prefix.
-	(path_conv::check): Pass a "already ran normalize" option to
-	conv_to_win32_path.  Return if there is an error from this function.
-	(mount_info::conv_to_win32_path): Add extra argument.  Don't call
-	normalize_posix_path if caller has already done so.  Substitute chroot
-	setting, if any, for root translation.  Add chroot checking to final
-	output step.
-	* shared_info (mount_info): Accommodate additional argument to
-	conv_to_win32_path.
-	* syscalls.cc (chroot): Store both normalized posix path and native
-	path in chroot.
-
-Fri Jun  1 10:57:19 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (chdir): Really make sure that isspace gets only an unsigned
-	char.
-
-Fri Jun  1 13:45:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (_rename): Handle the case that `foo' is renamed to
-	`bar' while `bar.lnk' is an existing shortcut-symlink.
-
-Thu May 31 15:57:57 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Avoid clearing S_IFMT bits
-	since we've already pre-cleared everything anyway.
-
-Wed May 30 23:51:32 2001  Earnie Boyd  <earnie_boyd@yahoo.com>
-
-	* path.cc (chdir): Always send unsigned chars to isspace since newlib's
-	isspace doesn't deal well with "negative" chars.
-
-Wed May 30 23:51:32 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_disk_file::open): Propagate remote status of
-	file garnered from path_conv.  Move #! checking to fstat.
-	(fhandler_disk_file::fstat): Reorganize st_mode setting to eliminate
-	duplication.  Move check for #! here from fhandler::open.
-
-	* fhandler.h (fhandler_base::isremote): New method.
-	(fhandler_base::set_isremote): Ditto.
-	(fhandler_base::set_execable_p): Also record "don't care if executable
-	state".
-	(fhandler_base::dont_care_if_execable): New method.
-	* path.cc (path_conv::check): Clear new flags.  Appropriately set
-	vol_flags, drive_type, and is_remote_drive.
-	* path.h: Add new flags and methods for manipulating them.
-	* syscalls.cc (_unlink): Use isremote() to determine if a path is
-	remote rather than calling GetDriveType.
-	(stat_worker): Ditto.
-	* security.cc (get_file_attribute): Or attribute with result of
-	NTReadEA to be consistent with get_nt_attribute.
-
-Tue May 29 19:02:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* sec_helper.cc (cygsid::getfrompw): Change parameter to `const'.
-	(cygsid::getfromgr): Ditto.
-	* security.cc: Use `sys_mbstowcs' and `sys_wcstombs' throughout.
-	(extract_nt_dom_user): Try to get user and domain from SID in
-	pw->pw_gecos first.
-	* security.h (class cygsid): Change parameter of getfrompw() and
-	getfromgr() to `const'.
-	* uinfo.cc (internal_getlogin): Change order for evaluating user
-	information in winNT case. Drop usage of NetWkstaUserGetInfo().
-
-Mon May 28 21:34:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* shortcut.c (check_shortcut): Treat only Cygwin shortcuts as symlinks.
-
-Fri May 25 11:07:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (symlink_info::check): Correctly set 'ext_tacked_on'.  Use
-	this to determine if user specified 'foo.lnk' explicitly.  Reorganize
-	slightly to get rid of one goto.
-
-Fri May 25 10:15:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (symlink_info::check): Add a check to return correctly
-	if incoming `*.lnk' file is not a symlink.
-
-Thu May 24 15:46:50 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (slash_drive_prefix_p): Remove.
-	(mount_info::slash_drive_to_win32_path): Ditto.
-	(mount_info::conv_to_win32_path): Remove slash drive prefix check.
-	(mount_info::add_item): Ditto.
-	(mount_info::del_item): Ditto.
-	* shared_info.h (mount_info): Remove slash_drive_to_win32_path
-	declaration.
-
-Thu May 24 01:17:33 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_exceptions): Bump repeat count for debugging
-	kick out.
-
-	* fhandler.h (fhandler_dev_dsp): Add a fixup_after_exec.
-	* fhandler_dsp.cc (class Audio): Add TOT_BLOCK_SIZE to enum.
-	(operator new): New.
-	(bigwavebuffer): Declare using TOT_BLOCK_SIZE to avoid buffer overruns.
-	(Audio::Audio): Optimize slightly.
-	(fhandler_dev_dsp::open): Allocate s_audio using static buffer.
-	(fhandler_dev_dsp::fixup_after_exec): New function.  Ditto.
-
-Wed May 23 17:45:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (seteuid): Restrict overriding external provided
-	user tokens to ntsec. Don't test external tokens for primary
-	group to evaluate if it should be overridden. Restrict creating
-	internal tokens to ntsec.
-
-Wed May 23 10:11:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (chown_worker): Don't check for ENOSYS.
-
-Tue May 22 12:20:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* signal.cc (sleep): Protect with sigframe.
-
-Tue May 22 17:58:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (get_file_attribute): Don't set errno.
-
-Mon May 21 15:08:00 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Allow --enable-newvfork to turn NEWVFORK on and off.
-	* configure: Regenerate.
-
-Mon May 21 11:46:01 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump minor version number.
-
-Sun May 20 13:26:25 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_dsp.cc: Reformat to GNU standards.
-	(s_audio): Change to a pointer throughout.
-	(fhandler_dev_dsp::open): Initialize s_audio, if required.
-
-Sat May 19 23:40:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: Add load statements for `LookupAccountNameW',
-	`LsaClose', `LsaEnumerateAccountRights', `LsaFreeMemory',
-	`LsaOpenPolicy', `LsaQueryInformationPolicy', `NetLocalGroupEnum',
-	`NetLocalGroupGetMembers', `NetServerEnum', `NetUserGetGroups' and
-	`NtCreateToken'.
-	* ntdll.h: Add declaration for `NtCreateToken'.
-	* sec_helper.cc: Add `well_known_local_sid', `well_known_dialup_sid',
-	`well_known_network_sid', `well_known_batch_sid',
-	`well_known_interactive_sid', `well_known_service_sid' and
-	`well_known_authenticated_users_sid'.
-	(cygsid::string): Define as const method.
-	(cygsid::get_sid): Set psid to NO_SID on error.
-	(cygsid::getfromstr): Ditto.
-	(cygsid::getfrompw): Simplify.
-	(cygsid::getfromgr): Check for gr == NULL.
-	(legal_sid_type): Move to security.h.
-	(set_process_privilege): Return -1 on error, otherwise 0 or 1 related
-	to previous privilege setting.
-	* security.cc (extract_nt_dom_user): Remove `static'.
-	(lsa2wchar): New function.
-	(open_local_policy): Ditto.
-	(close_local_policy): Ditto.
-	(get_lsa_srv_inf): Ditto.
-	(get_logon_server): Ditto.
-	(get_logon_server_and_user_domain): Ditto.
-	(get_user_groups): Ditto.
-	(is_group_member): Ditto.
-	(get_user_local_groups): Ditto.
-	(sid_in_token_groups): Ditto.
-	(get_user_primary_group): Ditto.
-	(get_group_sidlist): Ditto.
-	(get_system_priv_list): Ditto.
-	(get_priv_list): Ditto.
-	(get_dacl): Ditto.
-	(create_token): Ditto.
-	(subauth): Return immediately if SE_TCB_NAME can't be assigned.
-	Change all return statements in case of error to jumps to `out'
-	label. Add `out' label to support cleanup.
-	* security.h: Add extern declarations for `well_known_local_sid',
-	`well_known_dialup_sid', `well_known_network_sid',
-	`well_known_batch_sid', `well_known_interactive_sid',
-	`well_known_service_sid' and `well_known_authenticated_users_sid'.
-	Add extern declarations for functions `create_token',
-	`extract_nt_dom_user' and `get_logon_server_and_user_domain'.
-	(class cygsid): Add method `assign'. Change operator= to call new
-	`assign' method. Add `debug_print' method.
-	(class cygsidlist): New class.
-	(legal_sid_type): Moved from sec_helper.cc to here.
-	* spawn.cc (spawn_guts) Revert reversion of previous patch.
-	Call `RevertToSelf' and `ImpersonateLoggedOnUser' instead of `seteuid'
-	again.
-	* syscalls.cc (seteuid): Rearranged. Call `create_token' now when
-	needed. Call `subauth' if `create_token' fails. Try setting token
-	owner and primary group only if token was not explicitely created
-	by `create_token'.
-	* uinfo.cc (internal_getlogin): Try harder to generate correct user
-	information. Especially don't trust return value of `GetUserName'.
-
-Sat May 19 21:16:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (fork_parent): Move atforkprepare call here.
-	(fork): From here.
-
-Sat May 19 18:35:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: Add missing load statement for `CancelIo'.
-
-Sat May 19 01:22:43 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* grp.cc (read_etc_group): Don't copy mutex on fork.
-	* pwd.cc (read_etc_passwd): Ditto.
-	* autoload.cc (LoadDLLfuncEx): Use LoadDLLprime to initialize DLL
-	specific area.
-
-Fri May 18 10:31:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (wsock_event::wait): Explicitely cancel IO when a signal
-	arrived to avoid data loss. Fallback to blocking IO when canceling
-	fails.
-
-Thu May 17 15:29:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (cygwin_set_impersonation_token): Never destroy
-	previous token object.
-	(subauth): Create token source with well defined identifier.
-
-Wed May 16 23:27:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* uinfo.cc (uinfo_init): Just set user token to INVALID_HANDLE_VALUE.
-	Token value is already invalid at that point.
-
-Wed May 16 21:34:00 2001  Fred Yankowski <fred@ontosys.com>
-
-	* net.cc (errmap): Add missing mapping from WSAEINTR to EINTR.
-
-Wed May 16 09:20:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* sec_helper.cc (legal_sid_type): Fix conditional. Change to
-	inline function.
-
-Wed May 16 01:01:48 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* autoload.h: Eliminate.
-	* autoload.cc: Pull in autoload.h.  Eliminate many macros.  Rewrite to
-	avoid necessity of initialization routines.  Just use a standard one.
-	(wsock_init): New function.  Moved from net.cc.
-	* net.cc (wsock_init): Move to autoload.cc.
-	(wsadata): Make global.
-	* dtable.cc (dtable::build_fhandler): Use more reliable method for
-	checking if net stuff has been loaded.
-
-Tue May 15 19:52:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fork.cc (fork): Eliminate superfluous call to getuid().
-	* security.h: New define `NO_SID'. Remove declarations of functions
-	moved to methods into class cygsid.
-	(class cygsid): Declare new methods `getfromstr', `get_sid',
-	`getfrompw', `getfromgr', `get_rid', `get_uid', `get_gid', `string'
-	and new constructors and operators =, == and !=.
-	Declare new global cygsids `well_known_XXX_sid' substituting the
-	corresponding `get_XXX_sid' functions. Remove declarations of
-	these functions.
-	* sec_helper.cc (well_known_admin_sid): New global variable.
-	(well_known_system_sid): Ditto
-	(well_known_creator_owner_sid): Ditto
-	(well_known_world_sid): Ditto
-	(cygsid::string): New method, substituting `convert_sid_to_string_sid'.
-	(cygsid::get_sid): New method, substituting `get_sid'.
-	(cygsid::getfromstr): New method, substituting
-	`convert_string_sid_to_sid'.
-	(cygsid::getfrompw): New method, substituting `get_pw_sid'.
-	(cygsid::getfromgr): New method, substituting `get_gr_sid'.
-	(cygsid::get_id): New method, substituting `get_id_from_sid'.
-	(get_admin_sid): Eliminated.
-	(get_system_sid): Ditto.
-	(get_creator_owner_sid): Ditto.
-	(get_world_sid): Ditto.
-	* grp.cc: Use new cygsid methods and well known sids throughout.
-	* registry.cc: Ditto.
-	* sec_acl.cc: Ditto.
-	* security.cc: Ditto.
-	* shared.cc: Ditto.
-	* syscalls.cc (seteuid): Ditto. Eliminate redundant conditional.
-	* uinfo.cc (internal_getlogin): Ditto.
-	* spawn.cc (spawn_guts) Revert previous patch.
-
-Tue May 15 10:20:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::ioctl): Convert s_addr
-	field to host byte order before comparing with INADDR_LOOPBACK.
-
-Tue May 15  9:03:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: Add autoload statements for ws2_32 functions
-	`WSACloseEvent', `WSACreateEvent', `WSAGetOverlappedResult',
-	`WSARecv', `WSARecvFrom', `WSASend', `WSASendTo' and `WSASetEvent',
-	`WSAWaitForMultipleEvents'.
-	* net.cc: Define wsock_evt.
-	(wsock_event): New class.
-	(cygwin_sendto): Use overlapped socket io if available.
-	(cygwin_recvfrom): Ditto.
-	(cygwin_recv): Ditto.
-	(cygwin_send): Ditto.
-	* security.cc (subauth): Set Win32 error to 0 to safely ask for the
-	error code of dynamically loaded function `LsaRegisterLogonProcess'.
-
-Mon May 14 15:37:29 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* errno.cc (_sys_errlist): Add missing commas.
-
-Mon May 14 16:13:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (subauth): Check if Secur32.dll could be loaded.
-
-Sun May 13 22:49:04 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::check): Revert allow_ntsec check so that volume
-	info is always retrieved and isdisk setting is properly set.
-
-Sun May 13 14:02:36 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_tty.cc (fhandler_tty_common::dup): Preserve O_NOCTTY when
-	duping a filehandle.
-
-Sat May 12 18:19:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* dir.cc (rmdir): Rearrange slightly to allow removing directories
-	even when R/O attribute is set.
-
-Fri May 11 16:53:38 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* external.cc (fillout_pinfo): Use correct pids.
-	* path.cc (mount_info::conv_to_win32_path): Correct test for whether to
-	include a slash.
-
-Fri May 11 01:04:17 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_exceptions): Don't print message when executing
-	from a cygwin program.
-
-2001-05-10  Egor Duda  <deo@logos-m.ru>
-	    Christopher Faylor <cgf@redhat.com>
-
-	* environ.cc (winenv): Always add SYSTEMDRIVE and SYSYEMROOT to
-	win32-style environment if they don't already exist.
-
-2001-05-10  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* path.cc (mount_info::conv_to_win32_path): Treat UNC paths the same as
-	paths including `:' or `\'.
-
-Wed May  9 14:46:32 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_termios::echo_erase): Declare new method.
-	* fhandler_termios.cc (fhandler_termios::echo_erase): New method for
-	echoing erase characters.
-	(fhandler_termios::line_edit): Check the echo flag before echoing
-	control characters (from Kazuhiro Fujieda <fujieda@jaist.ac.jp>).
-
-Wed May  9 10:43:30 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/pthread.h: Remove C++ comment.
-
-Tue May  8 11:09:59 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (_cfree): Add regparm attribute.
-	(_crealloc): Ditto.
-
-	* dcrt0.cc (dll_crt0_1): Default to always checking for executable for now.
-
-	* dtable.cc (dtable::not_open): Move method.
-	* dtable.h (dtable): Here.
-
-	* exceptions.cc (ctrl_c_handler): Don't expect process group leader to
-	handle a signal if it doesn't exist.
-
-	* fhandler.h (fhandler_base): Make openflags protected.
-
-	* localtime.c (tzsetwall): Check for __CYGWIN__ as well as __WIN32__.
-
-	* path.cc (path_conv::check): Add some comments. Change strcat to assignment.
-
-	* lib/_cygwin_S_IEXEC.cc (_cygwin_bob__): Eliminate.
-
-	* fhandler_tty.cc (fhandler_console::dup): Set controlling terminal if necessary.
-	* fhandler_tty.cc (fhandler_tty_slave::dup): Ditto.
-
-Mon May  7 21:33:17 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sys/file.h: Revert special X_OK usage.  Just make it a
-	constant.
-
-Sun May  6 17:05:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.h (pthread_cond): New element cond_access to allow atomic
-	broadcasts.
-	* thread.cc (pthread_cond::pthread_cond): Initialise cond_access.
-	(pthread_cond::~pthread_cond): Destroy cond_access.
-	(pthread_cond::Broadcast): Use cond_access.
-	(pthread_cond::Signal): Use cond_access.
-	(pthread_cond_wait): Use cond_access.
-	(pthread_cond_timedwait): Use cond_access.
-
-Sun May  6 11:55:40 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* string.h (cygwin_strchr): Make 'static inline' so that things will
-	still work when optimized.
-
-Sat May  5 01:04:11 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_exceptions): Vastly increase test for exception
-	loop guard variable.
-
-Fri May  4 22:23:33 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (stack_info): Add some controls.
-	(stack_info::init): Add extra arguments to control method of
-	initialization..  If we have a known good frame, set things up so that
-	this frame is not skipped the first time through.  Record whether
-	caller cares about arguments or not.
-	(stack_info::walk): Don't store arguments if they're unwanted.
-	(stackdump): Add isexception parameter for use when called by exception
-	handler.
-	(cygwin_stackdump): Accommodate extra argument to stackdump.
-	(handle_exceptions): Ditto.
-	(sig_handle): Ditto.
-	(interrupt_on_return): Accommodate extra arguments to stack walk
-	initialization.
-
-Fri May  4 21:05:20 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* localtime.c: Revert exclusion of windows.h.
-
-Fri May  4 17:03:16 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* string.h: Fix last-minute typo.
-
-Fri May  4 16:49:34 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.h: Correctly set __SIGOFFSET.
-
-	* path.cc (hash_path_name): Avoid calling library functions for simple
-	copying of characters.
-
-	* shortcut.c: Use WIN32_LEAN_AND_MEAN.
-	* smallprint.c: Ditto.
-
-	* environ.cc (getwinenv): Minor clarity fix.
-
-	* localtime.c: No need to include windows.h
-
-	* string.h: New file.
-
-Fri May  4 16:37:30 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (ctrl_c_handler): Always send signal to process if it
-	has no tty.
-
-2001-05-04  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler_socket.cc (set_connect_secret): Use /dev/urandom to
-	generate secret cookie.
-
-Thu May  3 16:37:55 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/pthread.h (pthread_cleanup_push): Eliminate space preceding
-	arguments.
-	(pthread_cleanup_pop): Ditto.
-
-Thu May  3 18:16:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (wsock_init): Rename `was_in_progress' to `wsock_started'
-	for clearness.
-
-Thu May  3 10:44:16 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (handle_exceptions): Break out of "loop" if the
-	debugger doesn't seem to be attaching to our process.
-
-Wed May  2 20:18:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: Use new definition of LoadDLLinitfunc throughout.
-	Redefine wrapper for wsock32.dll and ws2_32.dll.
-	(std_dll_init): New function.
-	* autoload.h: Rename LoadDLLinitfunc to LoadDLLinitfuncdef.
-	Add new defines LoadDLLinitfunc and LoadDLLstdfunc.
-	* net.cc (wsock_init): Add guard variable handling. Take care
-	to call WSAStartup only once. Load WSAStartup without using
-	autoload wrapper to eliminate recursion.  Eliminate FIONBIO
-	and srandom stuff.
-
-Tue May  1 01:26:15 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::conv_to_win32_path): More path tweaking.
-
-Tue May  1 00:34:46 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mount_info::conv_to_win32_path): Fix debugging output to
-	avoid a SIGSEGV.  Avoid double backslashes in middle of filename.
-
-Mon Apr 30 21:51:14 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (mkrelpath): New function.
-	(mount_info::conv_to_win32_path): Eliminate now-unneeded relative path
-	name arg and processing.
-	(path_conv::check): Accommodate relative path names again.  Accommodate
-	one extra argument in mount_info::conv_to_win32_path.  Tack trailing
-	slash on end of relative path as a side effect, like before.
-	* shared_info.h (mount_info::conv_to_win32_path): Reflect new argument
-	ordering.
-
-Mon Apr 30 22:09:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: Add LoadDLLinitfunc for secur32.dll.
-	Add LoadDLLfuncEx statements for AllocateLocallyUniqueId@4,
-	DuplicateTokenEx@24, LsaNtStatusToWinError@4,
-	LsaDeregisterLogonProcess@4, LsaFreeReturnBuffer@4,
-	LsaLogonUser@56, LsaLookupAuthenticationPackage@12,
-	LsaRegisterLogonProcess@12,
-	* environ.cc: Add extern declaration for `subauth_id'.
-	(subauth_id_init): New function for setting `subauth_id'.
-	(struct parse_thing): Add entry for `subauth_id'.
-	* fork.cc (fork_parent): Call `RevertToSelf' and
-	`ImpersonateLoggedOnUser' instead of `seteuid'.
-	* security.cc: Define global variable `subauth_id'.
-	(extract_nt_dom_user): New function.
-	(cygwin_logon_user): Call `extract_nt_dom_user' now.
-	(str2lsa): New static function.
-	(str2buf2lsa): Ditto.
-	(str2buf2uni): Ditto.
-	(subauth): Ditto.
-	* security.h: Add prototype for `subauth'.
-	* spawn.cc (spawn_guts): Use cygheap->user.token only if impersonated.
-	Use `cygsid' type. Remove impersonation before allowing access to
-	workstation/desktop to everyone. Call `RevertToSelf' and
-	`ImpersonateLoggedOnUser' instead of `seteuid'.
-	* syscalls.cc (seteuid): Rearranged to allow using subauthentication
-	to retrieve user tokens when needed.
-
-Mon Apr 30 20:26:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* uinfo.cc (internal_getlogin): Formatting change.
-
-Mon Apr 30 19:58:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* grp.cc: Eliminate MAX_DOMAIN_NAME define.
-	(read_etc_group): Substitute MAX_DOMAIN_NAME by
-	INTERNET_MAX_HOST_NAME_LENGTH.
-	* passwd.cc (parse_pwd): Don't force pw_name to be lower case.
-	* sec_helper.cc: Substitute MAX_USER_NAME by UNLEN,
-	MAX_COMPUTERNAME_LENGTH by INTERNET_MAX_HOST_NAME_LENGTH throughout.
-	(lookup_name): Slight cleanup.
-	* security.cc (alloc_sd): Substitute MAX_USER_NAME by UNLEN.
-	* security.h: Define DEFAULT_UID as DOMAIN_USER_RID_ADMIN and
-	DEFAULT_GID as DOMAIN_ALIAS_RID_ADMINS.
-	* shared.cc (memory_init): Substitute MAX_USER_NAME by UNLEN.
-	* thread.h: Ditto.
-	* uinfo.cc (internal_getlogin): Substitute MAX_USER_NAME by UNLEN.
-	Substitute MAX_COMPUTERNAME_LENGTH and MAX_HOST_NAME by
-	INTERNET_MAX_HOST_NAME_LENGTH.
-	* winsup.h: Include lmcons.h. Eliminate MAX_USER_NAME and
-	MAX_HOST_NAME. Move DEFAULT_UID and DEFAULT_GID to security.h.
-
-Mon Apr 30 12:35:40 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::check): Don't use path_flags when converting to
-	MS-DOS syntax unless parsing tail of path component.  Stop parsing path
-	when we reach the 'root' of the path.  Correctly copy tail to path
-	component.
-
-Sun Apr 29 22:28:06 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (INIT_EXCEPTION_HANDLER): Eliminate.
-	(init_exceptions): Just use init_exception_handler.
-	(open_stackdumpfile): New function.
-	(stack_info::first_time): Eliminate.
-	(stack_info::init): Set up fields to avoid "first_time" consideration.
-	(stack_info::walk): Remove "first_time" consideration.
-	(stackdump): Change arguments to accept initial frame pointer and open
-	stack file flag.
-	(stack): Eliminate.
-	(cygwin_stackdump): Use stackdump() rather than stack().
-	(try_to_debug): Remove all synchronization logic.  Just keep looping in
-	exception handler until debugger notices us.  Return 1 if successfully
-	started debugger.
-	(handle_exceptions): Just return if we know that we're debugging.
-	Reorganize to avoid creating a stackdump file if we are starting a
-	debugger.  Return from exception handler if debugger started
-	successfully.
-	(sig_handle): Create a stackdump only if debugger wasn't started.
-	* winsup.h (try_to_debug): Add an argument.
-
-Sun Apr 29 21:41:25 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (symlink_info::check): Remove extra arguments, move
-	functionality back to path_conv::check.  Clear symlink bit from pflags
-	argument before detecting if this is a symlink.
-	(path_conv::check): Convert posix path here instead of
-	symlink_info::check.  Only grab volflags when using ntsec.
-	(symlink_info::check_case): Just replace appropriate part of input
-	path.
-
-Sat Apr 28 19:36:13 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, change 'tty_attached' to 'real_tty_attached', for clarity.
-	Throughout, change 'OutputStopped' to 'output_stopped', for
-	consistency.
-	* dtable.cc (stdio_init): Set controlling tty if not set by stdio
-	opens.
-	* exceptions.cc (ctrl_c_handler): Avoid special pgid checking if no tty
-	is associated with the process.
-	(Suggested by Tim Baker <dbaker@direct.ca>)
-	* external.cc (fillout_pinfo): Return actual tty number for ctty.
-	* fhandler_console.cc (get_tty_stuff): Set ctty when shared memory is
-	allocated.  Accept flags input from open().
-	(set_console_ctty): New function.
-	(fhandler_console::open): Pass flags to get_tty_stuff and rely on this
-	function to set the ctty, if appropriate.
-	* fhandler_termios.cc (fhandler_termios::set_ctty): Move to tty_min
-	class.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Use tc field to access
-	set_ctty().
-	* tty.h (TTY_CONSOLE): Move to include/sys/cygwin.h.
-	(tty_min): Add set_ctty class here.
-	* include/sys/cygwin.h (TTY_CONSOLE): New home here.
-
-	* path.cc (symlink_info): Make contents an actual buffer.  Pass more
-	flags to case_check.
-	(path_conv::check): Reorganize to do parsing based on posix path rather
-	than native path.
-	(symlink_info::check): Expect posix path as input.  Translate to native
-	path here.  Accept path_conv flags.  Stop parsing if not a symlink
-	regardless of whether previous path was a symlink.
-
-2001-04-27  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* thread.cc (thread_init_wrapper): Use _REENT_INIT to initialize the
-	reent structure of newlib.
-
-Fri Apr 27 14:02:24 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.h (sig_send): Add exception parameter to sig_send.
-	* sigproc.cc (sig_send): Ditto.  Use it when setting frame info.
-	* exceptions.cc (handle_exceptions): Use exception flag when calling
-	sig_send.
-
-2001-04-27  Egor Duda  <deo@logos-m.ru>
-
-	* tty.cc (tty::make_pipes): Set to_slave pipe mode to nonblocking.
-	* fhandler_tty.cc (fhandler_pty_master::accept_input): If pipe buffer
-	is full, give slave a chance to read data.
-
-2001-04-26  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* security.cc (alloc_sd): Add unrelated ACCESS_ALLOWED_ACE behind
-	the `everyone' ACE.
-
-Wed Apr 25 15:07:37 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.h [sigthread]: Add exception field.
-	[sigframe::~sigframe]: Clear exception field.
-	[sigframe::set]: Set exception field from caller.
-	* sigproc.cc (sig_send): Set exception field when frame pointer is
-	passed in.
-	* exceptions.cc (interrupt_on_return): Always treat exception as
-	interruptible.
-
-2001-04-25  Egor Duda  <deo@logos-m.ru>
-
-	* cygwin.din: Export asctime_r, ctime_r, gmtime_r, localtime_r
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 39
-
-Wed Apr 25 10:57:36 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump minor version number.
-	* childinfo.h: Bump child structure magic number.
-
-2001-04-25  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* uinfo.cc (internal_getlogin): Return pointer to struct passwd.
-	(uinfo_init): Accommodate the above change.
-	* syscalls.cc (seteuid): Ditto.
-
-Tue Apr 25 11:08:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: Add LoadDLLfunc statements for SetTokenInformation@16.
-	* cygheap.cc: Include security.h.
-	* grp.cc (internal_getgrent): New function.
-	(getgroups): Rearranged using `internal_getgrent' and the new
-	`cygsid' class.
-	* passwd.cc (internal_getpwent): New function.
-	* sec_acl.cc: Use new `cygsid' class throughout.
-	(acl_access): Use `internal_getgrent' instead of `getgrent'.
-	* sec_helper.cc: Use new `cygsid' class throughout.
-	(get_id_from_sid): Use `internal_getgrent' instead of `getgrent'.
-	Use `internal_getpwent' instead of `getpwent'.
-	* security.cc: Use new `cygsid' class throughout.
-	* security.h: Move `MAX_SID_LEN' from winsup.h to here.
-	Add extern declarations for `internal_getgrent' and `internal_getpwent'.
-	(class cygsid): New class.
-	* shared.cc (sec_user): Use new `cygsid' class.
-	* syscalls.cc (seteuid): Try to set owner to user and primary group to
-	current group in impersonation token before performing impersonation.
-	(setegid): Try to set primary group in process token to the new group
-	if ntsec is on.
-	* uinfo.cc (internal_getlogin): Use new `cygsid' class.
-	Try to set owner to user and primary group to current group in process
-	token if the process has been started from a non cygwin process.
-	(uinfo_init): Set primary group only if the process has been started
-	from a non cygwin process.
-	* winsup.h: Move define for `MAX_SID_LEN' to security.h.
-
-Mon Apr 16 23:20:00 2001  Andy Younger <andylyounger@hotmail.com>
-
-	* fhandler_dsp.cc: Improved handling of 8 bit playback modes.
-	Put in mock support for SNDCTL_DSP_SETFRAGMENT.
-
-Tue Apr 24 23:51:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* passwd.cc (getpwnam_r): Add pw_passwd handling as well.
-	(getpwuid_r): Ditto.
-
-Tue Apr 24 23:43:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* passwd.cc (getpwnam_r): Use correct offsets into buffer.
-	Copy pw_gecos field as well.
-	(getpwuid_r): Ditto.
-
-2001-04-24  Egor Duda  <deo@logos-m.ru>
-
-	* dlmalloc.c: New file. Port of Doug Lea's malloc
-	* dlmalloc.h: Ditto.
-	* Makefile.in: Add support for MALLOC_DEBUG
-	* config.h.in: Ditto.
-	* winsup.h: Ditto.
-	* configure.in: Add --enable-malloc-debugging option.
-	* configure: Regenerate.
-	* debug.h: Include declarations for debugging malloc.
-	* tty.cc (grantpt): Fix definition.
-	(unlockpt): Ditto.
-
-Mon Apr 23 22:00:29 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Remove trailing underscore from fhandler_base and friends, throughout.
-	* fhandler.h (fhandler_base::set_open_status): New method.  Stores
-	original open status.
-	(fhandler_base::get_open_status): New method.  Retrieves original open
-	status.
-	(fhandler_base::reset_to_open_binmode): New method.
-	* fhandler.cc (fhandler_base::open): Save open status.
-	(fhandler_base::init): Ditto.
-	* fhandler_clipboard.cc (fhandler_clipboard::open): Ditto.
-	* fhandler_console.cc (fhandler_console::open): Ditto.
-	* fhandler_dsp.cc (fhandler_dsp::open): Ditto.
-	* fhandler_dev_mem.cc (fhandler_dev_mem::open): Ditto.
-	* fhandler_dev_random.cc (fhandler_dev_random::open): Ditto.
-	* fhandler_serial.cc (fhandler_serial::open): Ditto.
-	* fhandler_tty_slave.cc (fhandler_tty_slave::open): Ditto.
-	* fhandler_tty_master.cc (fhandler_tty_master::open): Ditto.
-	* fhandler_dev_zero.cc (fhandler_dev_zero::open): Ditto.
-	* syscalls.cc (setmode): Rework so that 0 mode value causes reversion
-	to open state.
-
-	* fhandler_tty_slave.cc (fhandler_tty_slave::read): Use correct
-	multiplier when converting from deciseconds to milliseconds.
-
-Mon Apr 23 13:28:35 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.h (fhandler_base::clear_r_binary): New method.
-	(fhandler_base::clear_w_binary): New method.
-	* syscalls.cc (setmode): Accept 0 as mode value.  Resets text/binary
-	behavior for fd to default.
-
-Mon Apr 23 12:46:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* net.cc [errmap]: Add '0' condition.
-	(find_winsock_errno): Don't translate no error to EPERM.
-
-Sun Apr 22 20:48:24 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump Cygwin version and API version.
-
-Mon Apr 23  9:27:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (MTinterface::Init): Always initialise per process variables.
-
-Sun Apr 22 19:18:18 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* features.h: Reinstate as wrapper for sys/features.h.
-
-Mon Apr 23  0:10:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (alloc_sd): Reformat comment.
-	* shared.cc: Drop function declarations already in security.h.
-
-Sun Apr 22 12:17:57 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* shortcut.c (check_shortcut): Close input file handle before
-	returning.
-	* path.cc (check_sysfile): Ditto.
-	(symlink_info::check): Rely on opened file handle being closed by
-	symlink checking routines.  Set ext_tacked_on when .lnk is detected.
-
-Sat Apr 21 19:26:05 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* thread.cc (MTinterface::Init): Remove accidentally checked in code.
-
-Sun Apr 22 00:22:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* passwd.cc (getpwuid): Check for thread cancellation.
-	(getpwuid_r): Ditto.
-	(getpwname): Ditto.
-	(getpwnam_r): Ditto.
-	* thread.h (pthread_mutex): New constructors for pshared operation.
-	(MTinterface): Associative array for pshared mutex's.
-	* thread.cc (MTinterface::Init): Initailize pshared mutex array.
-	(pthread_cond::BroadCast): Implementation notes.
-	(pthread_cond::TimedWait): Remove use of SignalObjectAndWait on non-NT systems.
-	(pthread_mutex::pthread_mutex(unsigned short)): New function.
-	(pthread_mutex::pthread_mutex (pthread_mutex_t *, pthread_mutexattr *)):New function.
-	(pthread_mutex::pthread_mutex(pthread_mutexattr *)): Fail on pshared mutex's.
-	(__pthread_mutex_getpshared): New function.
-	(__pthread_join): Check for thread cancellation.
-	(__pthread_cond_timedwait): Support pshared mutex's.
-	(__pthread_cond_wait): Ditto.
-	(__pthread_condattr_setpshared): Error on PROCESS_SHARED requests.
-	(__pthread_mutex_init): Support pshared mutex's.
-	(__pthread_mutex_getprioceiling): Ditto.
-	(__pthread_mutex_lock): Ditto.
-	(__pthread_mutex_trylock): Ditto.
-	(__pthread_mutex_unlock): Ditto.
-	(__pthread_mutex_destroy): Ditto.
-	(__pthread_mutex_setprioceiling): Ditto.
-	(__pthread_mutexattr_setpshared): Support PTHREAD_PROCESS_PSHARED requests.
-
-Fri Apr 20 19:38:29 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwin.din: Add *scanf and *scan_r functions.
-
-Fri Apr 20 22:25:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* security.cc (set_process_privileges): Swap out.
-	* sec_helper.cc (set_process_privilege): Rename from
-	`set_process_privileges'. Takes the privilege to enable or disable
-	as parameter now.
-	* security.h: Add prototype for `set_process_privileges'.
-
-2001-04-19  Egor Duda  <deo@logos-m.ru>
-
-	* path.cc (path_conv::check): Always initialize member variables.
-
-Fri Apr 20 12:27:49 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sys/file.h: More cleanup for X_OK.
-
-Fri Apr 20 11:48:45 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/sys/file.h: Move X_OK protection earlier.
-
-	* dtable.cc (dtable::vfork_child_fixup): Avoid closing already closed
-	handles.
-
-Fri Apr 20 16:29:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* grp.cc (getgroups): Change so that SIDs get compared instead
-	of strings to SIDs.
-
-Fri Apr 20 14:50:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* Makefile.in: Add object files `sec_helper.cc' and `sec_acl.cc'.
-	* security.cc: Swap out several functions.
-	* sec_acl.cc: New file. Move Sun compatibel ACL functions from
-	`security.cc' to here.
-	* sec_helper.cc: New file. Move security helper functions from
-	`security.cc' to here.
-	* security.h: Changed to accommodate the above changes.
-
-Fri Apr 20 14:12:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* grp.cc: Replace `group_in_memory_p' by `group_state'.
-	Eliminate group_sem throughout.
-	(enum grp_state): New enumeration type.
-	(read_etc_group): Make race safe.
-	* security.cc: Eliminate group_sem throughout.
-
-Thu Apr 19  9:40:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap): Drop usage of the same memory area if the same
-	region of the same file is mapped twice.
-
-Wed Apr 18 16:53:54 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, change fdtab references to cygheap->fdtab.
-	* child_info.h (cygheap_exec_info): Eliminate special fdtab stuff.
-	* spawn.cc (spawn_guts): Ditto.
-	* cygheap.cc (cygheap_init): Initialize fdtab, if appropriate.
-	* cygheap.h (CYGHEAPSIZE): Include size of init_cygheap.
-	(_cmalloc_entry): Include fdtab here.
-	* dtable.h (dtable): Declare/define new methods.
-	* dtable.cc (dtable::vfork_child_fixup): New method.
-	(dtable::fixup_after_exec): Remove unneeded extra arguments.
-	* dcrt0.cc (dll_crt0_1): Ditto.
-
-	* environ.cc (getwinenv): Use case sensitive comparison.
-	(winenv): Make a copy of environment cache to avoid realloc problems
-	when duplicate environment variables exist in the environment.  (From
-	Egor Duda)
-
-	* net.cc (cygwin_socket): Revert Apr 14 change.
-
-	* include/sys/file.h: Protect against previous X_OK definition.
-
-Tue Apr 17 12:18:28 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* passwd.cc: Eliminate passwd_sem throughout.
-	* security.cc: Ditto.
-
-Tue Apr 17 12:18:28 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* cygwin.din: Export New functions.
-	* passwd.cc (read_etc_passwd): Make race safe.
-	(getpwuid_r): New function.
-	(getpwnam_r): New function.
-
-2001-04-18  Egor Duda  <deo@logos-m.ru>
-
-	* grp.cc (getgroups): Avoid crash if passwd field if /etc/group is
-	empty.
-
-Tue Apr 17 19:05:44 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.h (path_conv::add_ext_from_sym): Declare.
-	* path.cc (path_conv::add_ext_from_sym): Convert to pure inline method.
-
-Tue Apr 17 18:50:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (windows_device_names): Add missing NULL element.
-
-Tue Apr 17 12:14:54 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (windows_device_names): Move dsp to proper location.
-
-Tue Apr 17 13:44:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (path_conv::check): Set case_clash even if pcheck_case
-	is set to PCHECK_ADJUST when a case clash is given for the last
-	component in path.
-	(symlink_info::case_check): Ditto.
-	* syscalls.cc (_rename): Avoid overwriting an already existing file
-	if a case clash is given even if pcheck_case is set to PCHECK_ADJUST.
-
-Tue Apr 17  2:07:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* config.h.in: Turn off VFORK again.
-
-Mon Apr 16 23:45:24 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.h (cwdstuff): Move class.
-	* cygheap.h (cwdstuff): To here.
-	(init_cygheap): Add cwd field.
-	* child_info.h (cygheap_exec_info): Eliminate cwd stuff.
-	(child_info_spawn): Ditto.
-	* dcrt0.cc (dll_crt0_1): Remove cygcwd.fixup_after_exec call.  Convert
-	cygcwd reference to cygheap->cwd.
-	* path.cc: Ditto, throughout.
-	(cwdstuff::copy): Eliminate.
-	(cwdstuff::fixup_after_exec): Ditto.
-	* spawn.cc (spawn_guts): Eliminate call to cygcwd.copy.
-
-	* fhandler.h (FH_OSS_DSP): Move into "fast" device category.
-
-Mon Apr 16 19:19:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc: Move fh_paging_file from some functions to be
-	a global static variable.
-	(class mmap_record): Add `devtype_' member to remember
-	the device type of the file. Add declaration for methods
-	`get_device', `alloc_fh' and `free_fh'.
-	(mmap_record::mmap_record): Initialize `devtype_' correctly.
-	(mmap_record::alloc_fh): New method.
-	(mmap_record::free_fh): Ditto.
-	(munmap): Use new mmap_record::alloc_fh and mmap_record::free_fh
-	methods to create a correct fhandler.
-	(msync): Ditto.
-	(fixup_mmaps_after_fork): Ditto.
-
-Mon Apr 16 16:01:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* grp.cc (getgroups): If `allow_ntsec' is set, use the process token
-	information to evaluate the groups list.
-
-Mon Apr 16 00:08:02 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* features.h: Remove this file as it is now being supplied by newlib.
-
-Sun Apr 15 23:23:29 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* autoload.cc: Add winmm functions needed by fhandler_dsp.cc.
-
-Sun Apr 15 22:53:52 2001  Andy Younger <andylyounger@hotmail.com>
-
-	* fhandler_dsp.cc: New file.  Implements OSS like /dev/dsp.
-	* include/sys/soundcard.h: New file.  User land includes for OSS
-	/dev/dsp.
-	* fhandler.h: Add new class fhandler_dev_dsp and a FH_OSS_DSP
-	definition.
-	* dtable.cc (dtable::build_fhandler): Allow creation of the /dev/dsp
-	device.
-	* path.cc (windows_device_names): Add /dev/dsp into list of device
-	names.
-	* Makefile.in (DLL_OFILES): Add fhandler_dsp.o.
-
-Sun Apr 15 16:36:27 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* uname.c (uname): Default n in in86 to 6 if Windows returns > 6.
-
-Sun Apr 15 15:56:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (add_ext_from_sym): Redefine to call `add_ext_from_sym_'.
-	(add_ext_from_sym_): New inline function.
-
-Sat Apr 14 19:23:52 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* config.h.in: Turn on VFORK by default.
-
-Sat Apr 14 18:04:35 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* net.cc (cygwin_socket): Set SO_LINGER to small value so closed UNIX
-	domain sockets will not stay around.
-
-Sat Apr 14 18:01:43 2001  Pierre A. Humblet  <Pierre.Humblet@ieee.org>
-
-	* select.cc (socket_cleanup): Set SO_LINGER to small value so closed
-	dummy sockets do not stay around.  Use correct value for second argument
-	to shutdown.
-
-Sat Apr 14 17:04:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.h (MTinterface): Add threadcount.
-	* thread.cc (MTinterface::Init): Set threadcount to 1.
-	(__pthread_create): Increment threadcount.
-	(__pthread_exit): Decrement threadcount and call exit() from the last thread.
-
-Fri Apr 13 11:34:24 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* fork.cc (fork_child): Call the __pthread_atforkchild function.
-	(fork_parent): Call the __pthread_atforkparent function.
-	* cygwin.din: Export pthread_atfork.
-	* thread.h (callback): New class.
-	(MTinterface): Use it.
-	* thread.cc (__pthread_atforkprepare): New function.
-	(__pthread_atforkparent): New function.
-	(__pthread_atforkchild): New function.
-	(__pthread_atfork): New function.
-	* pthread.cc (pthread_atfork): New function.
-
-Fri Apr 13  9:52:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (add_ext_from_sym): New define evaluating `known'suffix'.
-	(path_conv::check): Use add_ext_from_sym throughout.
-
-Thu Apr 12 23:19:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* dir.cc (mkdir): Check for case clash.
-	* environ.cc: Add extern declaration for `pcheck_case'.
-	(check_case_init): New function.
-	(struct parse_thing): Add "check_case" option.
-	* errno.cc (_sys_nerrlist): Add text for ECASECLASH.
-	(strerror): Add case branch for ECASECLASH.
-	* fhandler.cc (fhandler_disk_file::open): Check for case clash.
-	* path.cc: Add global variable `pcheck_case'.
-	(struct symlink_info): Add member `case_clash' and method `case_check'.
-	(path_prefix_p_): Call `pathnmatch' instead of `strncasematch'.
-	(pathnmatch): New funtion.
-	(pathmatch): Ditto.
-	(path_conv::check): Add handling for case checking.
-	(symlink): Check for case clash.
-	(symlink_info::check): Add parameter for case checking.
-	Handle case checking.
-	(symlink_info::case_check): New method.
-	(chdir): Don't use unconverted path if pcheck_case==PCHECK_STRICT.
-	* path.h: Add extern declarations for `pathmatch' and
-	`pathnmatch'.
-	(enum case_checking): New enumeration type describing
-	the case checking behaviour of path conversion routines.
-	(class path_conv): Add member `case_clash'.
-	* syscalls.cc (_link): Check for case clash.
-
-Thu Apr 12 12:49:53 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (mkfifo): New function stub.
-
-2001-04-12   Robert Collins <rbtcollins@hotmail.com>
-
-	* configure.in: Remove PTH_ALLOW.
-	* cygwin.din: Remove @PTH_ALLOW@ prefixes to pthread functions.  Add
-	new pthread exports.
-	* pthread.cc: New wrapper functions for the above new exports.
-	* sched.cc (valid_sched_parameters): New function.
-	(sched_setparam): Use it.
-	(sched_set_thread_priority): New function.  Used by pthread_sched*.
-	* thread.cc (pthread_key_destructor::InsertAfter): New function.
-	(pthread_key_destructor::UnlinkNext): New function.
-	(pthread_key_destructor::Next): New function.
-	(pthread_key_destructor_list::Insert): New function.
-	(pthread_key_destructor_list::Remove): New function.
-	(pthread_key_destructor_list::Pop): New function.
-	(pthread_key_destructor::pthread_key_destructor): New function.
-	(pthread_key_destructor_list::IterateNull): New function.
-	(MTinterface::Init): Initialise new member.
-	(pthread::pthread): Initialise new members.
-	(pthread::create): Copy new attributes.  Set the new thread priority.
-	(pthread_attr::pthread_attr): Initialise new members.
-	(pthread_key::pthread_key): Setup destructor function.
-	(pthread_key::~pthread_key): Remove destructor function.
-	(pthread_mutexattr::pthread_mutexattr): New function.
-	(pthread_mutexattr::~pthread_mutexattr): New function.
-	(__pthread_once): New function.
-	(__pthread_cleanup): New function.
-	(__pthread_cancel): New function.
-	(__pthread_setcancelstate): New function.
-	(__pthread_setcanceltype): New function.
-	(__pthread_testcancel): New function.
-	(__pthread_attr_getinheritsched): New function.
-	(__pthread_attr_getschedparam): New function.
-	(__pthread_attr_getschedpolicy): New function.
-	(__pthread_attr_getscope): New function.
-	(__pthread_attr_setinheritsched): New function.
-	(__pthread_attr_setschedparam): New function.
-	(__pthread_attr_setschedpolicy): New function.
-	(__pthread_attr_setscope): New function.
-	(__pthread_exit): Call any key destructors on thread exit.
-	(__pthread_join): Use the embedded attr values.
-	(__pthread_detach): Use the embedded attr values.
-	(__pthread_getconcurrency): New function.
-	(__pthread_getschedparam): New function.
-	(__pthread_key_create): Pass the destructor on object creation.
-	(__pthread_key_delete): Correct incorrect prototype.
-	(__pthread_setconcurrency): New function.
-	(__pthread_setschedparam): New function.
-	(__pthread_cond_timedwait): Support static mutex initialisers.
-	(__pthread_cond_wait): Ditto.
-	(__pthread_mutex_getprioceiling): New function.
-	(__pthread_mutex_lock): Support static mutex initialisers.
-	(__pthread_mutex_trylock): Ditto.
-	(__pthread_mutex_unlock): Ditto.
-	(__pthread_mutex_destroy): Ditto.
-	(__pthread_mutex_setprioceiling): New function.
-	(__pthread_mutexattr_getprotocol): New function.
-	(__pthread_mutexattr_getpshared): New function.
-	(__pthread_mutexattr_gettype): New function.
-	(__pthread_mutexattr_init): New function.
-	(__pthread_mutexattr_destroy): New function.
-	(__pthread_mutexattr_setprotocol): New function.
-	(__pthread_mutexattr_setprioceiling): New function.
-	(__pthread_mutexattr_getprioceiling): New function.
-	(__pthread_mutexattr_setpshared): New function.
-	(__pthread_mutexattr_settype): New function.  Remove stubs for non
-	MT_SAFE compilation.
-	* thread.h: Remove duplicate #defines.  Add prototypes for new
-	functions in thread.cc.
-	(pthread_key_destructor): New class.
-	(pthread_key_destructor_list): New class.
-	(pthread_attr): Add new members.
-	(pthread): Remove members that are duplicated in the pthread_attr
-	class.
-	(pthread_mutex_attr): Add new members.
-	(pthread_once): New class.
-	* include/pthread.h: Add prototypes for new functions exported from
-	cygwin1.dll.  Remove typedefs.
-	* include/sched.h: Add prototypes for new functions in sched.cc.
-	* include/cygwin/types.h: Add typedefs from pthread.h
-
-Tue Apr 10 22:02:53 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (struct symlink_info): Add extn and ext_tacked_on fields.
-	(path_conv::check): Only tack on extension if a known one didn't
-	already exist.
-	(suffix_scan::has): Return pointer to known extension.
-	(symlink_info::check): Record location of extension, if any.
-
-2001-04-09  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler.h (class fhandler_socket): Add members and methods to
-	support secure connections on AF_UNIX sockets.
-	* fhandler_socket.cc (fhandler_socket::set_connect_secret): New method.
-	(fhandler_socket::get_connect_secret): Ditto.
-	(fhandler_socket::create_secret_event): Ditto.
-	(fhandler_socket::close_secret_event): Ditto.
-	(fhandler_socket::check_peer_secret_event): Ditto.
-	(fhandler_socket::fixup_after_fork): Duplicate secret event to child.
-	(fhandler_socket::dup): Copy address family.
-	(fhandler_socket::close): Close secret event.
-	* net.cc (get_inet_addr): Read secret cookie.
-	(cygwin_connect): Check if peer knows secret cookie value.
-	(cygwin_accept): Ditto. Copy address family to newly created socket.
-	(cygwin_bind): Generate and write secret cookie.
-	(wsock_init): Initialize random number generator.
-
-Sun Apr  8 20:40:58 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Put -lgcc last in list of libraries, since stdc++
-	library needs it.
-	* cygwin.din: Remove obsolete "__empty" export.
-	* exceptions.cc (call_signal_handler_now): Force inclusion of function
-	even when -finline-functions is specified.
-	* sigproc.h: Remove obsolete call_signal_handler declaration.
-
-Sun Apr  8 20:36:55 2001  Benjamin Riefenstahl  <Benjamin.Riefenstahl@epost.de>
-
-	* fhandler_console.cc (cp_get_internal): New function.
-	(cp_convert): New function.
-	(con_to_str): New function.
-	(str_to_con): New function.
-	(fhandler_console::read): Replace OemToCharBuff with con_to_str.
-	(fhandler_console::write_normal): Replace CharToOemBuff with str_to_con.
-
-Thu Apr  5 22:41:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (stat_worker): Fix conditional which still allowed
-	successful stat'ing of non-existant files.
-
-Wed Apr  4 10:37:44 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* child_info.h: Bump magic number for fork/exec/spawn.
-
-Tue Apr  3 20:06:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* errno.cc (errmap): Map ERROR_FILE_INVALID to ENXIO.
-
-Mon Apr  2 22:48:58 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygrun.c (main): Fix compiler warning.
-	* gmon.c (_mcleanup): Ditto.
-	* profil.c (profile_off): Ditto.
-
-	* net.cc (find_winsock_errno): New function.
-	(__set_winsock_errno): Use find_winsock_errno.
-	(cygwin_setsockopt): Detect SO_ERROR for debugging.
-	(cygwin_getsockopt): Ditto.  Translate error when getsockopt returns
-	SO_ERROR.
-	* winsup.h: regparmize __set_winsock_errno.
-	* include/sys/strace.h: Document that strace functions can't use
-	regparm.
-
-2001-04-02  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* fhandler.cc (fhandler_disk_file::open): Avoid checking a magic
-	number of a directory.
-
-Mon Apr  2 00:24:08 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* shared_info.h (mount_info): Remove mnt_ elements.
-	* thread.h (struct _winsup_t): Add mnt_ elements.
-	* path.cc (fillout_mntent): Use mnt_ elements from reent_winsup ().
-
-Sun Apr  1 20:10:34 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sigframe::call_signal_handler): Return value of
-	call_signal_handler_now.
-	* sigproc.h (sigframe): Use constructor.
-	* syscalls.cc (_read): Correct errno test prior to calling signal
-	handler.
-
-Sun Apr  1 00:38:06 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sigframe::call_signal_handler): Move outside of "C"
-	block or some compilers will complain.
-
-Sun Apr  1 00:24:14 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (call_signal_handler_now): Rename from
-	call_signal_handler to avoid C++ confusion.
-
-Sun Apr  1 00:08:15 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (fillout_mntent): Always remove drive root directories from
-	future consideration by "/cygdrive" reporting.
-	(cygdrive_getmnt): Avoid reporting removable drives or drives with no
-	media mounted.
-
-Sat Mar 31 21:56:19 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* thread.h (struct _winsup_t): Remove obsolete elements.  Add
-	available_drives element.
-	* path.cc (mount_info::getmntent): Report "/cygdrive" drives when
-	mounted drives are exhausted.
-	(fillout_mntent): New function.
-	(mount_item::getmntent): Use fillout_mntent.
-	(cygdrives_mntent): New function.  Returns next available "/cygdrive".
-	(setmntent): Initialize available "/cygdrives".
-	* syscalls.cc: Remove some if 0'ed code.
-	* times.cc (timezone): Use more descriptive variable name.
-
-Sat Mar 31 18:59:52 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.h (class sigframe): Implement 'unregister()' method.
-	(sigframe::~sigframe): Use unregister method.
-	(sigframe::call_signal_handler): Declare new method.
-	* exceptions.cc (sigframe::call_signal_handler): New method.
-	Unregisters current sigframe before calling signal handler.
-	(setup_handler): Clear waiting threads prior to arming signal_arrived.
-	* syscalls.cc (_read): Change goto to loop.  Recalculate sigframe
-	inside of loop so that constructor is called when appropriate.
-	* wait.cc (wait4): Ditto.
-
-	* signal.cc: Change "sig" to "signal" in debugging messages throughout.
-	* sigproc.cc: Ditto.
-
-Sat Mar 31 17:12:08 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_serial.cc (fhandler_serial::raw_write): Close protected
-	handles with ForceCloseHandle or suffer spurious warnings.
-
-Sat Mar 31 16:23:32 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler.cc (fhandler_base::read): Remove special handling of CTRL-Z.
-
-Sat Mar 31 11:09:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (class fhandler_console): Add members `insert_mode'.
-	* fhandler_console.cc (fhandler_console::dup): Duplicate `insert_mode'.
-	(fhandler_console::fhandler_console): Initialize `insert_mode'.
-	(fhandler_console::char_command): Add terminal capabilities
-	"enter insert mode" = \E[4h and "exit insert mode" = \E[4l.
-	Care for insert mode on terminal capability "repeat char" = \E[x;yb.
-	(fhandler_console::write_normal): Care for insert mode before writing
-	to the console.
-	(array keytable): Add keymapping for modified cursor and control
-	block keys (xterm like).
-
-Fri Mar 30 13:02:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (class fhandler_console): Add members `savebufsiz' and
-	`savebuf' to allow save/restore of screen.
-	* fhandler_console.cc (fhandler_console::dup): Duplicate `savebufsiz'
-	and `savebuf'.
-	(fhandler_console::fhandler_console): Initialize `savebufsiz' and
-	`savebuf'.
-	(fhandler_console::char_command): Add terminal capabilities
-	"save screen content" = \E[?47h and "restore screen content" = \E[?47l.
-
-Wed Mar 28 19:28:50 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (chdir): Eat trailing whitespace on input path.
-
-Tue Mar 27 22:38:42 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* lib/_cygwin_S_IEXEC.c: Remove "const" from globals or they never seem
-	to be defined.  Wrap definitions in extern "C".  Include winsup.h to
-	assure proper definitions.
-
-	* dcrt0.cc (dll_crt0_1): Call stdio_init after premain run so that
-	binmode.o, etc., will control default stdio settings.
-	* dtable.cc (dtable::init_std_file_from_handle): Allow __fmode to force
-	binmode/textmode settings.  Default pipes to binmode.
-
-Tue Mar 27 11:31:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap): Fix conditional for previous patch.
-
-Mon Mar 26 18:48:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap): Outflank copy-on-write problem on 9x by
-	setting access mode to FILE_MAP_READ when read access is requested.
-
-Sun Mar 25 20:12:21 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dlfcn.cc (check_access): Eliminate.
-	(check_path_access): Use passed in path_conv buf.
-	(get_full_path_of_dll): Use passed in name buf to avoid a static.  Rip
-	out most of the path checking since LoadLibrary will do all of this
-	automatically.
-	(dlopen): Set errno when appropriate (may not be compliant?).
-	* environ.cc (posify): Don't pass in "native" path if it seems to
-	actually be posix.
-
-Thursday Mar 22 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* fhandler.h (fhandler_dev_clipboard): Extend to support writing.
-	* fhandler_clipboard.cc (fhandler_dev_clipboard::fhandler_dev_clipboard):
-	Initialize new fields.  Open clipboard here.
-	(fhandler_dev_clipboard::dup): New method.
-	(fhandler_dev_clipboard::open): Accommodate new fields.  Register
-	clipboard here, if appropriate.
-	(set_clipboard): New function.  Moves buffer to clipboard.
-	(fhandler_dev_clipboard::write): Truly implement clipboard writing.
-	(fhandler_dev_clipboard::read): Reimplement to allow successive reads.
-	(fhandler_dev_clipboard::lseek): Truly implement seeks in clipboard.
-	(fhandler_dev_clipboard::close): Clear out new fields.  Support
-	sequential reads and sequential writes.  Support for binary data via a
-	native clipboard format.
-
-2001-03-22  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler_console.cc (fhandler_console::set_default_attr): Update
-	console color attributes on tty reset.
-
-Wed Mar 21 22:12:36 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* autoload.cc (kernel32_init): New function for kernel32 autoload
-	initialization.
-	(SignalObjectAndWait): Add conditional load of this function when it is
-	available.
-
-2001-03-21 Robert Collins <rbtcollins@hotmail.com>
-
-	* sched.cc: New file.  Implement sched*.
-	* include/sched.h: New file.  User land includes for sched*.
-	* Makefile.in: Add sched.o
-	* cygwin.din: Add exports for sched*.
-
-Tue Mar 20 14:48:46 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dtable.cc: Guard against new winsock.h/winsock2.h warnings when
-	mixing winsock*.h and sys/types.h.
-	* fhandler_socket.cc: Ditto.
-	* net.cc: Ditto.
-	* select.cc: Ditto.
-	* exceptions.cc: Remove unneeded define.
-
-Mon Mar 19 17:43:29 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (interruptible): Update debugging output.
-	(setup_handler): Ensure that wait_sig loop wakes up when we punt on
-	sending a signal.
-	* poll.cc (poll): Add signal guard here.
-
-2001-03-19  Egor Duda  <deo@logos-m.ru>
-
-	* tty.h (tty::create_inuse): Add new parameter to allow non-
-	inheritable 'inuse' events.
-	* tty.cc (tty::create_inuse): Use new parameter.
-	* fhandler_tty.cc (fhandler_tty_master::init): Ditto.
-	* fhandler_tty.cc (fhandler_pty_master::open): Ditto.
-	* fhandler_tty.cc (fhandler_tty_master::init): Create master_alive
-	event.
-	* tty.cc (tty_list::terminate): Close master_alive event.
-	* fhandler_tty.cc (fhandler_tty_common::close): Send EOF to slaves
-	when master side is closed.
-
-Mon Mar 19 14:32:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (map::get_list_by_fd): Avoid calling `get_namehash' when
-	file descriptor is -1.
-
-Sat Mar 17 18:30:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (check_posix_perm): New static function.
-	(fpathconf): Add _PC_POSIX_PERMISSIONS and _PC_POSIX_SECURITY
-	support.
-	(pathconf): Ditto.
-	* include/cygwin/version.h: Bump API minor number to 37.
-
-2001-03-18  Egor Duda <deo@logos-m.ru>
-
-	* fhandler.h (fhandler_tty_slave): Declare new methods.
-	* select.cc (fhandler_tty_slave::select_read): New method.
-	* select.cc (fhandler_tty_slave::ready_for_read): Ditto.
-	* select.cc (verify_tty_slave): New function.
-	* fhandler_termios.cc (fhandler_termios::line_edit): Empty input
-	buffer on signal.
-	* fhandler_tty.cc (fhandler_tty_slave::read): Check for input data
-	after reading from pipe. Reset event if input pipe is empty.
-	* tty.h (class tty): Allow creating events with manual reset.
-	* tty.cc (tty::get_event): Use manual_reset flag.
-	* tty.cc (tty::common_init): Create input_available_event with
-	manual reset.
-
-Sat Mar 17 21:48:03 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* external.cc (fillout_pinfo): Match windows pid, as well as cygwin pid
-	when passed in pid.  Don't prematurely break when searching for a pid.
-
-	* thread.h (_winsup_t): Eliminate unneeded field.
-
-Sat Mar 17 20:46:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (get_95_ifconf): Use strcasematch instead of strcasecmp.
-	* syscalls.cc (_unlink): Ditto.
-	(_rename): Ditto.
-
-Sat Mar 17 12:43:15 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (suffix_scan::next): Avoid searching for foo.lnk twice when
-	input is "foo".
-
-Sat Mar 17 18:10:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* net.cc (cygwin_socket): Set protocol to 0 when address family is
-	AF_UNIX to avoid WSAEPROTONOSUPPORT error.
-
-Sat Mar 17 09:51:32 2001  Mathew Brozowski <brozow@tavve.com>
-
-	* net.cc (cygwin_socket): Pass protocol parameter to socket call.
-
-Sat Mar 17 02:05:38 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dir.cc (readdir): Use strcasematch for consistency.
-	* path.cc (symlink_info): Eliminate known_suffix.
-	(path_conv::check): Always copy ext_here to end of buffer, if found.
-	(suffix_scan): Eliminate ext_here, add suffixes_start.
-	(suffix_scan::has): Eliminate an argument.  Reorganize.  Always return
-	pointer to end of input path.
-	(suffix_scan::next): Take a second pass through the suffix list looking
-	for .lnk.
-	(symlink_info::check): Eliminate known_suffix usage.
-
-Sat Mar 17 00:10:52 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (stat_dev): Give devices full read/write by default.
-
-Saturday Mar 17 3:45 2001 Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (MTinterface::CreateCond): Check for null attr pointer.
-
-Fri Mar 16 21:13:23 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_termios.cc (fhandler_termios::line_edit): Don't accept input
-	when a signal is sent or we'll end up in an EOF/signal race.
-
-Fri Mar 16 20:25:40 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc: Translate scan states from defines to enums.
-	(suffix_scan): Rename state to nextstate for clarity.
-	(lnk_match): Change to allow multiple states to indicate that a .lnk
-	has been matched.
-	(suffix_scan::has): Eliminate a goto.  Handle .lnk as a special case,
-	since a .lnk may also need to be tacked on the end of a .lnk.
-	(suffix_scan::next): Don't increment next state.  Set it specifically.
-	Recognize new .lnk states.
-
-Saturday Mar 17 01:19 2001 Robert Collins rbtcollins@hotmail.com
-
-	* cygwin.din: Export the new functions.
-	* pthread.cc (pthread_cond_*): Add wrapper functions that call
-	__pthread_cond* functions.
-	* thread.cc (__pthread_cond_*): Implement the pthread_cond* functions.
-	* thread.h: Add new class entries and prototypes for __pthread_cond*
-	functions.
-	* include/pthread.h: user land header prototypes for pthread_cond*
-	functions and related defines.
-
-Wed Mar 14 16:30:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* environ.cc (parse_options): Use strtok_r instead of strtok.
-	* security.cc (convert_string_sid_to_sid): Ditto.
-	(aclfromtext): Ditto. Fix buffer usage.
-
-Wed Mar 14 10:11:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (lnk_suffixes): Remove.
-	(class suffix_scan): Add `lnk_state' flag.
-	(suffix_scan::lnk_match): Return state of `lnk_state' now.
-	(suffix_scan::has): Changed behaviour if file has `.lnk' suffix.
-	(suffix_scan::next): Set `lnk_state' where appropriate.
-	(symlink_info::check): Fix a wrong `break'.
-	* syscalls.cc (chown_worker): Change debug statement to reflect
-	lchown fix.
-	(lchown): Call chown_worker with `PC_SYM_NOFOLLOW' instead of
-	`PC_SYM_IGNORE'.
-
-Tue Mar 13 13:52:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::fstat): Add correct modes to
-	symlinks when stat'ing on FAT or FAT32 file systems.
-
-2001-03-12  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler.h (fhandler_termios::fixup_after_exec): New function.
-	* fhandler_termios.cc (fhandler_termios::fixup_after_fork): New
-	function. Fixup output handle.
-	* fhandler_tty.cc (fhandler_tty_common::fixup_after_fork): Output
-	handle is now fixed up in fhandler_termios::fixup_after_fork().
-
-2001-03-12  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler.h (fhandler_termios::fhandler_termios): Enable fixup
-	after fork.
-	* fhandler_console.cc (fhandler_console::fhandler_console): Fixup
-	after fork is now enabled in the base class constructor.
-
-Mon Mar 12 11:19:41 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* mkvers.sh: Include config.h so that DEBUGGING is correctly defined.
-
-Mon Mar 12 09:47:55 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* spawn.cc (spawn_guts): Don't set EXIT_REPARENTING if parent process
-	is not a cygwin process (suggested by Jason Gouger
-	<cygwin@jason-gouger.com>).
-
-Sun Mar 11 16:00:58 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* child_info.h: Bump magic number for fork/exec/spawn.
-
-Sat Mar 10 20:54:47 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* autoload.cc (noload): Use proper method for multiline strings or
-	newer gcc's complain.
-	* exceptions.cc (unused_sig_wrapper): Ditto.
-	* fhandler.h (fhandler_base): Make get_io_handle and friends return
-	self.
-	* fhandler_tty.cc (fhandler_pty_common::close_on_exec): Accommodate
-	DEBUGGING flag to avoid spurious warnings when inheritance is set.
-
-Sat Mar 10 16:52:12 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* shortcut.c (PATH_ALL_EXEC): Add parentheses to avoid a compiler
-	warning.
-
-	* exceptions.cc (setup_handler): Clarify debugging message.
-	* sigproc.cc (proc_subproc): Remove PROC_CHILDSTOPPED test.  It is
-	handled by normal PROC_CLEARWAIT case.
-	(wait_sig): Eliminate "dispatched" tracking.  Remove __SIGCHILDSTOPPED
-	test.  Decrement counter again before jumping out of
-	InterlockedDecrement loop so that subsequent InterlockedIncrement will
-	keep the counter at the correctly decremented value and also detect
-	when there are pending signals.
-	* sigproc.h: Remove __SIGCHILDSTOPPED element.
-	(procstuff): Remove PROC_CHILDSTOPPED element.
-
-Sat Mar 10 15:22:44 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_rename): Set errno to ENOENT when an old path doesn't
-	exist (from Kazuhiro Fujieda <fujieda@jaist.ac.jp>).  Also set EACCES
-	when directory is not writable.
-
-Wed Mar  7 15:49:47 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_read): Change definition to return ssize_t to be
-	consistent with read.
-	(_write): Change definition to return ssize_t to be consistent with
-	write.
-
-Wed Mar  7 01:08:21 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* sigproc.h (sigthread): Declare new methods.  Create new winapi_lock
-	field.
-	(sigframe:;set): Call get_winapi_lock after frame is set so that signal
-	handler thread knows not to call SuspendThread.
-	(sigframe::~sigframe): Release winapi_lock.
-	* exceptions.cc (sigthread::get_winapi_lock): New method.
-	(sigthread::release_winapi_lock): New method.
-	(setup_handler): Use get_winapi_lock to ensure that signalled thread is
-	not blocked in a Windows API.
-
-	* path.h (path_types): Avoid broken GCC warning.
-
-Tue Mar  6 14:02:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (suffix_scan::has): Change order of conditionals
-	to allow checking for .lnk suffixes even if in_suffixes is empty.
-
-Tue Mar  6 13:02:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.c (cygwin_premain0): Add missing parameter.
-	* binmode.c (cygwin_premain0): Ditto.
-	* textmode.c (cygwin_premain0): Ditto.
-
-Tue Mar  6 12:04:00 2001  Jason Tiller <jtiller@sjm.com>
-
-	* auto_load.cc: Add "GetKeyboardLayout" entry in the list of
-	Win32 User32.DLL exports to provide.
-	* fhandler.h (class fhandler_console): Add meta_mask private
-	member to remember which keystroke modifiers should generate
-	META.
-	* fhandler_console.cc (fhandler_console::read): Modify code that
-	tests a keystroke for a META-escaped key to use the 'meta_mask'
-	variable.
-	(fhandler_console::fhandler_console): Add definition for
-	variable "meta_mask" used to determine if a keystroke should be
-	preceded by META in the client console stream.  Set meta_mask
-	based on whether or not user's keyboard language is English -
-	non-English keyboards pass AltGr (right <ALT>) unmolested,
-	whereas English keyboards now interpret left- and right-<ALT>
-	as META.
-
-Mon Mar  5 20:15:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/a.out.h: Add copyright hint.
-	* include/fcntl.h: Ditto.
-	* include/lastlog.h: Ditto.
-	* include/memory.h: Ditto.
-	* include/mntent.h: Ditto.
-	* include/paths.h: Ditto.
-	* include/poll.h: Ditto.
-	* include/syslog.h: Ditto.
-	* include/termio.h: Ditto.
-	* include/tzfile.h: Ditto.
-	* include/arpa/inet.h: Ditto.
-	* include/asm/byteorder.h: Ditto.
-	* include/asm/socket.h: Ditto.
-	* include/asm/types.h: Ditto.
-	* include/cygwin/if.h: Ditto.
-	* include/cygwin/mtio.h: Ditto.
-	* include/cygwin/rdevio.h: Ditto.
-	* include/cygwin/socket.h: Ditto.
-	* include/net/if.h: Ditto.
-	* include/netinet/in.h: Ditto.
-	* include/netinet/in_systm.h: Ditto.
-	* include/netinet/ip.h: Ditto.
-	* include/netinet/ip_icmp.h: Ditto.
-	* include/netinet/tcp.h: Ditto.
-	* include/sys/cdefs.h: Ditto.
-	* include/sys/cygwin.h: Ditto.
-	* include/sys/ioctl.h: Ditto.
-	* include/sys/mman.h: Ditto.
-	* include/sys/mount.h: Ditto.
-	* include/sys/mtio.h: Ditto.
-	* include/sys/procfs.h: Ditto.
-	* include/sys/resource.h: Ditto.
-	* include/sys/smallprint.h: Ditto.
-	* include/sys/socket.h: Ditto.
-	* include/sys/strace.h: Ditto.
-	* include/sys/syslog.h: Ditto.
-	* include/sys/sysmacros.h: Ditto.
-	* include/sys/termio.h: Ditto.
-	* include/sys/termios.h: Ditto.
-	* include/sys/uio.h: Ditto.
-	* include/sys/un.h: Ditto.
-	* include/sys/utsname.h: Ditto.
-	* include/sys/vfs.h: Ditto.
-	* include/sys/wait.h: Ditto.
-	* regexp/regerror.c: Ditto.
-	* regexp/regexp.h: Ditto.
-	* regexp/regmagic.h: Ditto.
-
-Mon Mar  5 01:25:03 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dlopen.c (dlopen): Return NULL when name is NULL (suggested by
-	chrisiasci@aol.com).
-
-	* cygwin.din: Add a new, internally used export -
-	_check_for_executable.
-	* dcrt0.cc (dll_crt0_1): Set _check_for_executable for older binaries.
-	Pass user_data to premain functions.
-	* fhandler.cc (fhandler_disk_file::open): Only check for executable if
-	the linked program is interested in the executable bit.
-	(fhandler_disk_file::check_execable_p): Delete.
-	* fhandler.h (executable_states): New enumeration of various states of
-	executable bit caring.
-	(fhandler_base::set_execable_p): New method.
-
-	* fhandler_termios.cc (fhandler_termios::line_edit): Flag when a signal
-	has been sent to the tty.  Return -1 when this is so.
-	* fhandler_console.cc (fhandler_console::read): Return -1 when signal
-	sending character encountered.
-
-	* path.cc (path_conv::check): Record when path refers to a disk device.
-	Move executable extension check here.
-	(check_sysfile): Accommodate new EXEC path states.
-	(has_suffix): Remove.
-	(next_suffix): Remove.
-	(class suffix_scan): New clas.
-	(suffix_scan::has): New method.
-	(suffix_scan:next): New method.
-	(symlink_info::check): Use suffix_scan method to control for scanning
-	for suffixes.
-	* path.h (path_conv::exec_state): New method.
-	* perprocess.h: Make "C" friendly.
-	* include/cygwin/version.h: Define CYGWIN_VERSION_CHECK_FOR_S_IEXEC.
-	Bump CYGWIN_VERSION_API_MINOR.
-	* include/sys/cygwin.h: Change premain declarations.
-
-	* winsup.h: Move __cplusplus test to after builtin defines.
-
-2001-03-04  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler.h (class fhandler_tty_common): New mutex and event to
-	syncronize input on master tty with slave tty.
-	* fhandler_tty.cc (fhandler_pty_master::accept_input): Use them to
-	syncronize with slave.
-	* fhandler_tty.cc (fhandler_tty_slave::read): Use input mutex and
-	event to syncronize with master. Do not limit amount of data read
-	from master to vmin value. Interrupt on signal and return already
-	read data, if any.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Handle input mutex and
-	event.
-	* fhandler_tty.cc (fhandler_tty_common::close): Ditto.
-	* fhandler_tty.cc (fhandler_tty_common::set_close_on_exec): Ditto.
-	* fhandler_tty.cc (fhandler_tty_common::fixup_after_fork): Ditto.
-	* fhandler_tty.cc (fhandler_tty_common::dup): Ditto.
-	* tty.h (tty::open_input_mutex): New function.
-	* tty.cc (tty::common_init): Create input mutex and event.
-
-Fri Mar  2 13:32:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* dir.cc (readdir): Fix creating path in symlink check.
-
-Fri Mar  2 12:33:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* dir.cc (readdir): Fix shortcut==symlink condition.
-	* environ.cc: Add extern decl for `allow_winsymlinks'.
-	(struct parse_thing): Add entry for `[no]winsymlinks'.
-	* path.cc (symlink): Change to be able to create both,
-	symlink==shortcut and symlink==systemfile, dependent of
-	the setting of `allow_winsymlinks'.
-	* security.cc (cygwin_logon_user): Add debug output.
-	* shortcut.c: Add defines from path.h.
-	(has_exec_chars): Copy from path.h.
-	(check_shortcut): Check for executable file condition if not a
-	shortcut.
-
-Thu Mar  1 21:06:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sig_handle_tty_stop): Ignore attempts to suspend a
-	process if started by non-cygwin parent.
-
-Thu Mar  1 20:48:11 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* select.cc (peek_console): Don't report read_ready on mouse events
-	unless we are looking for mouse events.
-	* fhandler.h (fhandler_console::mouse_aware): New method.
-
-Wed Feb 28 15:10:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* uinfo.cc: Eliminate `#include <wchar.h>'.
-
-2001-02-28  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler_floppy.cc (fhandler_dev_floppy::lseek): Determine
-	drive geometry or partition size to allow seeking from the end of
-	raw floppy device. Don't allow positioning past the end of media or
-	to offsets bigger then max off_t.
-
-2001-02-27  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler.h (class fhandler_console): Make all variables that
-	describe "state" of console to be members of fhandler_console.
-	default_color is now the color which is set when console recieves
-	reset command.
-	* fhandler_console.cc (fhandler_console::fhandler_console): Turn
-	mouse handling and raw keyboard mode off by default. Initialize
-	state information.
-	* fhandler.cc (fhandler_console::set_raw_win32_keyboard_mode): New
-	function.
-	* fhandler_console.cc (fhandler_console::set_default_attr): New
-	function. Reset console attributes to default values.
-	* fhandler_console.cc (fhandler_console::open): Reset attributes.
-	* fhandler_console.cc (fhandler_console::get_win32_attr): New function.
-	Calculate win32-style console attribute based on terminal attributes.
-	* fhandler_console.cc (fhandler_console::set_cursor_maybe): Use
-	member variable.
-	* fhandler_console.cc (fhandler_console::read): If in raw-win32
-	keyboard mode, encode win32 keyboard events in \033{x;y;z;t;u;wK
-	sequences.
-	* fhandler_console.cc (fhandler_console::dup): Copy all state
-	information to the dup()ed handle.
-	* fhandler_console.cc (fhandler_console::scroll_screen): Use current
-	fill-in	attribute.
-	* fhandler_console.cc (fhandler_console::clear_screen): Ditto.
-	* fhandler_console.cc (fhandler_console::char_command): Check if we
-	saw '?' symbol by member variable. Set terminal	attributes on \033[Xm
-	commands. \033[24m - turn off underline mode, \033[27m - turn off
-	reverse mode, \033[39m - restore default foreground color.
-	\033[49m - restore default background color. \033[2000h - turn on raw
-	keyboard mode, \033[2000l - turn off raw keyboard mode.
-	* fhandler_console.cc (fhandler_console::write): Set attribues to
-	default values on reset command.
-
-2001-02-26  Mike Simons  <msimons@moria.simons-clan.com>
-
-	* times.cc (settimeofday): Replace function stub with working code.
-
-Mon Feb 26 10:42:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* strace.cc (strace::vprntf): Move prntf functionality to this function
-	adding an va_list interface to strace.
-	(strace::printf): Calls strace::vprntf now.
-	(strace_printf): New function providing an extern "C" interface to
-	trace output.
-	* include/sys/strace.h: Make plain C clean.
-	(class strace): Add `vprntf' method.
-
-Mon Feb 26  0:10:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* shortcut.c: Remove #include <sys/strace.h>.
-
-Sun Feb 25 10:32:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (symlink): Add a ".lnk" suffix regardless. Add a comment.
-
-Sun Feb 25 10:18:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* shortcut.c (check_shortcut): Change symlink condition.
-
-Fri Feb 23 10:42:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (fhandler_disk_file::mmap): Use `addr' correctly.
-	* fhandler_mem.cc (fhandler_dev_mem::mmap): Ditto.
-
-Thu Feb 22 17:09:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* path.cc (symlink): Keep relative paths relative in the DOS
-	path inside of a shortcut. If that's impossible or the target
-	path is already absolute save an absolute path.
-
-Thu Feb 22 15:33:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygerrno.h: Revert previous patch.
-	* errno.cc: Ditto.
-	* dir.cc: Eliminate `dir_suffixes'.
-	(opendir): Remove usage of `dir_suffixes'.
-	(rmdir): Ditto.
-	* fhandler.cc (fhandler_disk_file::open): Remove usage of
-	`inner_suffixes'.
-	* path.cc: Rename `inner_suffixes' to `lnk_suffixes'.
-	(path_conv::check): Remove usage of `inner_suffixes'.
-	(symlink): Ditto.
-	(symlink_info::check): Handle checking for `.lnk' in path_conv
-	exclusively here.
-	(chdir): Remove usage of `dir_suffixes'.
-	* shortcut.c: Eliminate debug_printf lines.
-	(check_shortcut): Don't set error except on failing ReadFile.
-	* spawn.cc: Remove ".lnk" from `std_suffixes'.
-	* syscalls.cc (_unlink): Remove usage of `inner_suffixes'.
-	Remove ".lnk" from `stat_suffixes'.
-	(_rename): Add check for renaming a symlink to keep the ".lnk"
-	suffix after renaming.
-
-Thu Feb 22 13:38:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* shortcut.c: New file. Provides a C interface to reading of
-	Windows shortcuts to avoid compiler flag `-fvtable-thunks'.
-	* shortcut.h: Ditto.
-	* Makefile.in: Add shortcut.o to DLL_OFILES.
-	* cygerrno.h: Provide a C interface to `geterrno_from_win_error' for
-	using in shortcut.c.
-	* errno.cc (geterrno_from_win_error): Define as extern "C".
-	* path.cc (struct symlink_info): Remove methods `check_shortcut' and
-	`check_sysfile'.
-	(shortcut_header): Move to shortcut.c.
-	(shortcut_initalized): Ditto.
-	(create_shortcut_header): Ditto.
-	(cmp_shortcut_header): Ditto.
-	(symlink_info::check_shortcut): Ditto. Reorganize as a plain C function.
-	(symlink_info::check_sysfile): Redefine as a global function using the
-	same parameter list as `check_shortcut' for clearness.
-	(symlink_info::check): Change parameter list for calls to
-	`check_shortcut' and `check_sysfile'.
-
-Thu Feb 22 12:04:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_disk_file::open): Use `inner_suffixes' when
-	resolving real_path.
-	* path.cc (symlink): Ditto for win32_topath.
-
-Wed Feb 21 22:41:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* Makefile.in: Add `-lshell32 -luuid' to link pass for new-cygwin1.dll.
-	* autoload.cc: Add LoadDLLinitfunc for ole32.dll.
-	Add LoadDLLfuncEx statements for CoInitialize@4, CoUninitialize@0
-	and CoCreateInstance@20.
-	* dir.cc (dir_suffixes): New datastructure.
-	(readdir): Check for R/O *.lnk files to hide the suffix.
-	(opendir): Use `dir_suffixes' in path conversion.
-	(rmdir): Ditto.
-	* fhandler.cc (fhandler_disk_file::fstat): Add S_IFLNK flag
-	before calling `get_file_attribute'. Take FILE_ATTRIBUTE_READONLY
-	into account only if the file is no symlink.
-	* path.cc (inner_suffixes): New datastructure.
-	(SYMLINKATTR): Eliminated.
-	(path_conv::check): Use `inner_suffixes' on inner path components.
-	(shortcut_header): New global static variable.
-	(shortcut_initalized): Ditto.
-	(create_shortcut_header): New function.
-	(cmp_shortcut_header): Ditto.
-	(symlink): Create symlinks by creating windows shortcuts. Preserve
-	the old code.
-	(symlink_info::check_shortcut): New method.
-	(symlink_info::check_sysfile): Ditto.
-	(symlink_info::check): Check for shortcuts. Move code reading
-	old system attribute symlinks into symlink_info::check_sysfile().
-	(chdir): Use `dir_suffixes' in path conversion.
-	* security.cc (get_file_attribute): Check for S_IFLNK flag.
-	Force 0777 permissions then.
-	* spawn.cc (std_suffixes): Add ".lnk" suffix.
-	* syscalls.cc (_unlink): Use `inner_suffixes' in path conversion.
-	Check for shortcut symlinks to eliminate R/O attribute before
-	calling DeleteFile().
-	(stat_suffixes): Add ".lnk" suffix.
-	(stat_worker): Force 0777 permissions if file is a symlink.
-
-2001-02-21  Egor Duda  <deo@logos-m.ru>
-
-	* sigproc.cc (getsem): Make semaphore always non-inheritable.
-
-Mon Feb 19 22:25:53 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* dcrt0.cc (locale_init): Remove.
-
-2001-02-15  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* cygwin.din: Export rand48 functions.
-	* thread.cc (MTinterface::Init): Remove the initialization of
-	`reent_data'.
-	* dcrt0.cc: Add the initalizer to the declaration of `reent_data'.
-	* include/cygwin/version.h: Bump CYGWIN_VERSION_API_MINOR to 35.
-
-2001-02-16  Egor Duda  <deo@logos-m.ru>
-
-	* signal.cc (signal): Prohibit setting handlers for SIGKILL and
-	SIGSTOP
-	* signal.cc (sigaction): Ditto
-	* syscalls.cc (_lseek): Return EINVAL on invalid input
-
-Wed Feb 14 14:54:40 2001 Christophe Iasci <chrisiasci@aol.com>
-
-	* dlfcn.cc (dlopen): Do not call LoadLibrary with a NULL pointer, when
-	the library is not found
-
-2001-02-14  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler_console.cc (fhandler_console::char_command): Ignore unknown
-	rendition codes in \033[xx;yym control sequences
-
-Fri Feb  9 23:19:01 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fork.cc (fork_parent): Return EAGAIN when can't record pid.
-	* pinfo.h (pinfo::remember): Return value of call to proc_subproc.
-	* sigproc.cc (proc_subproc): Return error if can't record pid.
-
-Fri Feb  9 12:17:27 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (mknod): Add valid parameters.
-
-Thu Feb  8 22:09:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap): Check for reusing a mapping only on MAP_SHARED
-	and on MAP_PRIVATE|MAP_ANON in the special case of offset 0.
-
-Thu Feb  8 21:57:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (class list): Add member `hash'.
-	(list::list): Initialize `hash'.
-	(list::get_list_by_fd): Use filepath hash value to get the correct
-	mapping list if it's not an anonymous mapping.
-	(map::add_list): Initialize `hash' with filepath hash value.
-	(mmap): Check for reusing a mapping only on MAP_SHARED.
-
-Wed Feb  7 18:47:36 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* signal.cc (killpg): Correct first argument.
-
-Wed Feb  7 22:22:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* autoload.cc: Add LoadDLLinitfunc for iphlpapi.dll.
-	Add LoadDLLfuncEx statements for GetIfTable@12 and GetIpAddrTable@12.
-	* fhandler_socket.cc (fhandler_socket::ioctl): Move variable
-	definitions to the beginning of the function to allow better debugging.
-	Add handling for SIOCGIFHWADDR, SIOCGIFMETRIC and SIOCGIFMTU.
-	* net.cc: Include iphlpapi.h.
-	(get_2k_ifconf): Rewritten. Uses IP Helper API now.
-	(get_nt_ifconf): Add handling for SIOCGIFHWADDR, SIOCGIFMETRIC
-	and SIOCGIFMTU.
-	(get_95_ifconf): Ditto. Renamed from `get_9x_ifconf'.
-	(get_ifconf): Name loopback `lo' instead of `lo0' as in Linux.
-	Add handling for SIOCGIFHWADDR, SIOCGIFMETRIC and SIOCGIFMTU.
-	Call `get_95_ifconf' only on Windows 95, `get_nt_ifconf' only
-	on Windows NT < Service Pack 3, `get_2k_ifconf otherwise.
-	* include/asm/socket.h: Add defines for SIOCGIFHWADDR, SIOCGIFMETRIC
-	and SIOCGIFMTU.
-	* include/cygwin/if.h: Add `ifr_hwaddr', `ifr_metric' and `ifr_mtu'.
-	(struct ifreq): Add `ifru_hwaddr'.
-
-Tue Feb  6 15:04:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (stat_worker): Add a check for the special case when
-	a process creates a file using mode 000 using ntsec.
-
-Mon Feb  5 17:00:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::open): Always add GENERIC_READ access
-	when opening raw disk devices.
-	* fhandler_floppy.cc (fhandler_dev_floppy::lseek): Implement bytewise
-	access.
-	* fhandler_raw.cc (fhandler_dev_raw::open): Always open raw disk device
-	binary.
-	(fhandler_dev_raw::raw_write): Don't drop read buffer content when
-	writing after read.
-
-Mon Feb  5 13:30:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap_record::fixup_map): New method to duplicate
-	the memory protection in a just forked child.
-	(mmap): Realign gran_len to page boundary only on anonymous
-	mapping before saving in the mmap_record.
-	(munmap): Cleanup code.
-	(msync): Ditto.
-	(fixup_mmaps_after_fork): Ditto. Call mmap_record::fixup_map now.
-
-Thu Feb  1 23:08:29 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (creturn): Correctly calculate cygheap_max.
-
-Wed Jan 31 10:04:58 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* shared.cc (shared_info::initialize): Reduce size of heap.
-
-Wed Jan 31 13:22:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/sys/resource.h: Fix typo.
-
-Wed Jan 31 13:20:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/sys/resource.h: Add RLIMIT_NLIMITS and RLIM_NLIMITS.
-
-Tue Jan 30 18:15:23 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump version to 1.3.0.
-
-Tue Jan 30  8:55:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* pinfo.cc (pinfo::init): Use INVALID_HANDLE_VALUE instead of
-	explicit cast (HANDLE) 0xffffffff.
-	* shared.cc (open_shared): Ditto.
-
-Mon Jan 29 17:15:22 2001  Bill Hegardt <bill@troyxcd.com>
-
-	* fhandler_serial.cc (raw_write): Use local copy of OVERLAPPED
-	structure instead of shared structure to fix a race condition between
-	read/write.
-
-Mon Jan 29 14:30:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap): Remove obsolete check for MAP_SHARED|MAP_ANON as
-	being invalid.
-
-Mon Jan 29 10:23:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap_record::find_empty): Fix loop condition.
-
-Sun Jan 28 19:40:40 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_link): Make sure that newpath does not exist.  Set
-	errno if it does.
-
-Sun Jan 28 19:29:08 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (init_cheap): Don't specify a load address for the heap.
-	It doesn't work on #!*& Windows 9x.
-	(cygheap_init): Move GetUserName to memory_init.
-	* dcrt0.cc (dll_crt0_1): Call new memory_init functin, eliminate call
-	to heap_init.
-	* heap.cc (heap_init): Improve error output.
-	* heap.h: Correct some declarations.
-	* shared.cc (mount_table_init): Remove.
-	(memory_init): Renamed from shared_init.  Reorganize to accommodate
-	strange Windows 9x problems with cygheap/heap interaction.
-	* shared_info.h: Rename shared_init to memory_init.
-
-Sun Jan 28 01:25:33 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump API version.
-
-Sun Jan 28 01:18:22 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* cygheap.cc (init_cheap): Move username initialization.
-	(cygheap_init): Here.
-	* shared_info.h (mount_info): Add a sys_mount_table_counter field.
-	(shared_info): Ditto.
-	* path.cc (mount_info::conv_to_win32_path): Check that our mount table
-	is in sync with the system mount table and reinitialize it if not.
-	(mount_info::add_reg_mount): Bump sys_mount_table counters if the
-	system mount table changes.
-	(mount_info::del_reg_mount): Ditto.
-	(mount_info::write_cygdrive_info_to_registry): Ditto.
-	(mount_info::remove_cygdrive_info_from_registry): Ditto.
-
-Sun Jan 28 00:28:30 2001  Christopher Faylor <cgf@cygnus.com>
-
-	Throughout, change 'cygwin_shared.mount' to 'mount_table'.
-	* child_info.h (child_info): Move shared_h, console_h to cygheap.  Add
-	mount_h.
-	* cygheap.h (init_cygheap): Add shared_h, console_h.
-	* cygheap.cc (init_cheap): Initialize heap at a fixed location after
-	the shared memory regions.  Initialize cygheap->user name here.
-	* dcrt0.cc (dll_crt0_1): Call getpagesize () to initialize constants.
-	Remove cygheap_init since it is done in shared_init now.
-	(_dll_crt0): Initialize mount_h, remove shared_h and console_h
-	initialization.
-	* fhandler_console.cc (console_shared_h): Eliminate.
-	(get_tty_stuff): Use cygheap->console_h rather than console_shared_h.
-	* heap.cc (heap_init): Use page size constant calculated earlier in
-	initialization.
-	* shared.cc: Eliminate cygwin_shared_h.  Add cygwin_mount_h.
-	(mount_table_init): New function for initializing a user mount table.
-	(open_shared_file_map): Use constant for shared memory region.
-	Initialize cygheap and mount table here.
-	(open_shared): Improve debugging output.
-	(shared_info::initialize): Eliminate call to mount.init.
-	(shared_terminate): Use cygheap->shared_h.  Close cygwin_mount_h.
-	(open_shared_file_map): Eliminate.
-	* shared_info.h (mount_info): Add a version field.
-	(shared_align_past): New macro for calculating location for shared
-	memory regions.
-	* sigproc.cc (init_child_info): Eliminate shared_h, console_h.
-	* spawn.cc (spawn_guts): Pass on cygwin_mount_h iff not a different
-	user.
-	* syscalls.cc (system_info): New global holding system memory defaults.
-	(getpagesize): Use system_info.
-	* uinfo.cc (internal_getlogin): Only fill in user name if nonexistent.
-	* winsup.h: Declare system_info.
-
-	* passwd.cc (read_etc_passwd): Use cygheap->user.name () rather than
-	retrieving the name again.
-
-Sat Jan 27 10:18:02 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (path_conv::check): Detect when path has symlinks.
-	(symlink_info::check): Remove debugging stuff.
-	(chdir): Use posix'ized win32 path if cd'ed to a path using symlinks.
-
-Fri Jan 26 21:20:28 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* exceptions.cc (sigreturn): Call any pending signals prior to
-	resetting the signal mask so that stacked signals behave correctly.
-	(sigdelayed): Avoid a race where a signal could end up calling an
-	incorrect signal handler if two signals come in close together.
-
-Tue Jan 23 21:56:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (fhandler_disk_file::mmap): Call CreateFileMapping with
-	len != 0 only when performing an anonymous mapping.
-
-Mon Jan 22 15:35:28 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* path.h: Add a new constant.
-	* syscalls.cc (_read): Oscillate errno check.
-
-Mon Jan 22 15:27:12 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/cygwin/version.h: Bump API to reflect setlogmask.
-
-Sun Jan 21 22:40:25 2001  Jason Tishler <jt@dothill.com>
-
-	* cygwin.din: Add export for setlogmask().
-	* syslog.cc (setlogmask): New function.
-
-Thu Jan 18 10:27:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* resource.cc (setrlimit): Support RLIMIT_NOFILE.
-
-Wed Jan 17 23:23:12 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (setdtablesize): Call with amount to increment not total
-	amount.  Return success or failure error code.
-
-Wed Jan 17 09:47:13 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* autoload.cc (LoadDLLinitfunc): Remove debugging statement.
-
-	* exceptions.cc (sig_handle_tty_stop): Move setting of PID_STOPPED to
-	earlier in interrupt.
-	(interrupt_setup): i.e., here.
-	(sig_handle): Don't queue multiple SIGSTOPS.
-	* fhandler.h (bg_check_types): Enumerate return value of bg_check for
-	clarity.
-	* signal.cc (kill_pgrp): Minor cleanup.
-	* fhandler_termios.cc (fhandler_termios::bg_check): Use enumerated type
-	for function return.  Don't raise signal if a signal is already queued.
-	* fhandler_console.cc (fhandler_console::read): Use enumerated return
-	type for bg_check.
-	* select.cc: Ditto, throughout.
-	* read.cc: Ditto, throughout.
-	* termios.cc: Ditto, throughout.
-	(_read): YA interrupt detect simplification.
-	* wait.cc (wait4): Ditto.
-
-Wed Jan 17 10:56:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygheap.cc (cygheap_user::~cygheap_user): Temporarily
-	disable free'ing memory.
-
-Tue Jan 16 18:01:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap): Initialize fh to avoid compiler warnings.
-
-Mon Jan 15 21:07:00 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* wait.cc (wait4): Rename variable for consistency.  Allow restartable
-	signal behavior.
-
-Mon Jan 15 23:15:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc (mmap): Add more parameter checking. Change error output
-	in case of EINVAL. Treat mmapping /dev/zero like MAP_ANONYMOUS.
-
-Mon Jan 15 20:34:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* mmap.cc: include <unistd.h>. Define some bit operations for
-	the new page map.
-	(mmap_record): Change type of base_address_ to caddr_t.
-	Add map_map_ member. Add several methods to manipulate map_map_.
-	(mmap_record::alloc_map): New method.
-	(mmap_record::free_map): Ditto.
-	(mmap_record::find_empty): Ditto.
-	(mmap_record::map_map): Ditto.
-	(mmap_record::unmap_map): Ditto.
-	(list::add_record): Change return type to `mmap_record *'.
-	Allocate page map.
-	(list::match): New method.
-	(mmap): Partly rewritten to take care for the new page map. Add some
-	parameter checking.
-	(munmap): Ditto.
-
-Mon Jan 15 13:50:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* heap.cc (heap_init): Fix extern declaration of getpagesize.
-	* syscalls.cc (getpagesize): Fix another typo.
-
-Mon Jan 15 12:48:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* syscalls.cc (getpagesize): Save pagesize in global variable to
-	avoid calling GetSystemInfo too often.
-	* heap.cc (getpagesize): Eliminate.
-	(heap_init): Use getpagesize function from syscalls.cc.
-
-Mon Jan 15 11:56:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* sysconf.cc (sysconf): return `getpagesize ()' on _SC_PAGESIZE
-	request to avoid implementing the same twice.
-
-Sun Jan 14 14:07:50 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* syscalls.cc (_read): Use more lightweight method for determining if
-	read has been interrupted by a signal.
-
-Fri Jan 12 00:35:15 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* debug.h: Add regparm attributes to some functions.
-
-	* signal.cc (sigaction): Don't treat SIGCONT specially.
-
-	* exceptions.cc (interrupt_setup): Save sa_flags of interrupted signal
-	for later use.
-	(sig_handler): Default any stopping signal to SIGSTOP.
-	(call_signal_handler): New function.
-	(sigdelayed0): New function.
-	* sigproc.cc (sigproc_init): Initialize SIGSTOP sigaction for special
-	behavior.
-	* sigproc.h: Define call_signal_handler.
-	* syscalls.cc (_read): Allow restartable signal behavior.
-
-Thu Jan 11 13:17:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* fhandler.h (fhandler_base): New method `fixup_mmap_after_fork'.
-	(fhandler_disk_file: Ditto.
-	(fhandler_dev_mem): Ditto.
-	* fhandler_mem.cc (fhandler_dev_mem::open): Set OBJ_INHERIT attribute
-	for device\physicalmemory handle.
-	(fhandler_dev_mem::mmap): Ditto.
-	* fhandler_mem.cc (fhandler_dev_mem::fixup_mmap_after_fork): New
-	method.
-	* mmap.cc (mmap_record): Add private `fdesc_' member.  Change
-	constructor accordingly.
-	(get_fd): New method.
-	(mmap): Use new mmap_record constructor.
-	(fhandler_base::fixup_mmap_after_fork): New method.
-	(fhandler_disk_file::fixup_mmap_after_fork): Ditto.
-	(fixup_mmaps_after_fork): Call `fixup_mmap_after_fork' of appropriate
-	fhandler class.
-
-Wed Jan 10 22:08:30 2001  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* sigproc.cc (wait_sig): Allow SIGCONT when stopped.
-
-Tue Jan  9 16:55:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	Patch suggested by Ren� M�ller Fonseca <fonseca@mip.sdu.dk>
-	* include/sys/socket.h: Change prototype to have 2nd parameter `const'.
-	* net.cc (cygwin_bind): Change 2nd parameter to `const'.
-
-Sun Jan  7 22:59:37 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* pinfo.cc (codepage_init): Move function.
-	* environ.cc (codepage_init): To here.
-	* exceptoins.cc (SIG_NONMASKABLE): Remove SIGCONT from consideration
-	since it is supposed to be maskable.
-	* signal.cc (sigaction): Ditto.
-	* sigproc.cc (wait_sig): Ditto.
-	* winsup.h: Eliminate global declaration of codepage_init.
-
-Thu Jan  5  9:33:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* resource.cc (getrlimit): Set errno on EFAULT instead of returning
-	it.
-	(setrlimit): Ditto.
-
-Thu Jan  5  3:38:00  2001  David Sainty <David.Sainty@optimation.co.nz>
-
-	* resource.cc (setrlimit): Prevent failing with an error when the
-	operation would not have changed anything.
-
-Thu Jan  4 10:29:54  2001  Earnie Boyd  <earnie_boyd@yahoo.com>
-
-	* thread.cc: Need LONG_MAX definition.
-
-Wed Jan  3 13:47:23 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* thread.cc (MTinterface::CreateSemaphore): Correctly set semaphore
-	max.
-
-Wed Jan  3 09:44:51 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler_console.cc (fhandler_console::read): Restore missing test
-	for code page before doing OemToCharBuff.
-
-Wed Jan  3 09:20:20 2001  Jason Tishler <jt@dothill.com>
-
-	* include/cygwin/version.h: Fix typo in CYGWIN_VERSION_DLL_COMBINED
-	macro.
diff --git a/winsup/cygwin/ChangeLog-2002 b/winsup/cygwin/ChangeLog-2002
deleted file mode 100644
index 68cf38059..000000000
--- a/winsup/cygwin/ChangeLog-2002
+++ /dev/null
@@ -1,6655 +0,0 @@
-2002-12-30  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (events_init): Display name of mutex on failure.
-
-2002-12-30  Christopher Faylor  <cgf@redhat.com>
-
-	* windows.cc (setitimer): Return ENOSYS on invalid argument.
-
-2002-12-28  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_termios.cc (fhandler_termios::line_edit): Perform echo
-	before input is accepted or suffer a "race".
-
-2002-12-27  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_tty_master::set_winsize): Declare new function.
-	* fhandler_console.cc (fhandler_console::send_winch_maybe): If
-	appropriate, call tty master function to handle screen size change.
-	* fhandler_tty.cc (fhandler_tty_master::set_winsize): New function.
-	(fhandler_tty_master::init): Call set_winsize to set initial screen
-	size.
-
-2002-12-26  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_master::init): Set initial size of tty
-	to that of console in which tty is operating.
-	(process_input): Semi-revert previous change.  Need to just use current
-	terminfo settings since this function is running in a thread, blocked
-	when the terminfo changes.
-
-2002-12-26  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_termios::line_edit): Replace third argument with
-	passed-in termios struct.
-	* fhandler_console.cc (fhandler_console::read): Prior to loop, make a
-	copy of current termios for passing to line_edit prior so that all
-	characters are processed consistently.
-	* fhandler_tty.cc (fhandler_pty_master::write): Ditto.
-	(process_input): Make a copy of curent termios prior to read for use in
-	subsequent line_edit.
-	* fhandler_termios.cc (fhandler_termios::line_edit): Replace third
-	parameter with passed-in termios struct and use it throughout rather
-	than the data from the current fhandler_termios class.
-
-2002-12-25  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-12-25  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (events_init): Initialize critical section to control
-	exiting via signal.
-	(signal_exit): Enter critical section early to avoid exit races with
-	main thread.
-	* dcrt0.cc (do_exit): Use exit_lock critical section to avoid races.
-
-2002-12-25  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::detach): Set errno with set_sig_errno so
-	that EINTR is properly restored after signal.
-
-2002-12-21  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Default fhandler objects to -fomit-frame-pointer.
-	Eliminate redundant CFLAGS settings.
-
-2002-12-20  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (line_edit_status): Reorganize so that tests for error
-	condition can be < or >.
-	* fhandler_tty.cc (fhandler_pty_master::write): Don't return after
-	sending a signal.
-
-	* fhandler_termios.cc (fhandler_termios::line_edit): Trivial change to
-	use built-in bool types.
-
-2002-12-19  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* localtime.cc (tzsetwall): Set lcl_is_set and lcl_TZname
-	in the Cygwin specific part of the routine.
-
-2002-12-19  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* fhandler.cc (fhandler_base::open): Use "flags" rather than "mode"
-	in Win9X directory code.
-
-2002-12-19  Steve Osborn  <bub@io.com>
-
-	* fhandler.h (line_edit_status): Add a new element.
-	* fhandler_termios.cc (fhandler_termios::line_edit): After
-	accept_input, handle both potential error condition and pipe full
-	conditions.
-	* fhandler_tty.cc (fhandler_pty_master::accept_input): Return -1 on
-	error.
-	(fhandler_pty_master::write): Handle pipe full condition.
-
-2002-12-16  Steve Osborn  <bub@io.com>
-	    Christopher Faylor <cgf@redhat.com>
-
-	* fhandler_termios.cc (fhandler_termios::line_edit): Return
-	line_edit_error and remove last char from readahead buffer if
-	accept_input() fails.
-	* fhandler_tty.cc (fhandler_pty_master::accept_input): Return 0 and
-	restore readahead buffer when tty slave pipe is full.
-
-2002-12-16  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (_pinfo::cmdline): Allocate sufficient space for myself
-	command line args.
-
-2002-12-14  Steve Osborn  <bub@io.com>
-
-	* fhandler_termios.cc (fhandler_termios::line_edit): Call
-	accept_input() in character processing loop.  Set return value
-	independently of input_done.
-
-2002-12-14  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::read): Signal event, if necessary, and
-	raw_read hasn't done so.
-
-2002-12-14  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::raw_read): Reset priorities to minimize
-	window where thread termination may cause data loss.
-	(fhandler_base::read): Always return at end of function.  Just set len
-	to copied_chars when len is zero.  Return immediately after raw_read if
-	len <= 0.  Remove in_len setting and just check end instead.  Fix CRLF
-	handling at end of buffer.
-
-2002-12-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dcrt0.cc (dll_crt0_1): Call well known SID initializer function.
-	* security.h (cygsid::init): Declare new static method.
-	* sec_helper.cc (cygsid::init): New method for initializing well
-	known SIDs.
-
-2002-12-14  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* security.h: Declare well_known_creator_group_sid.
-	* sec_helper.cc: Define and initialize well_known_creator_group_sid.
-
-2002-12-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* netdb.cc: Remove strtok_r comment.
-
-2002-12-14  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* security.cc (get_user_local_groups): Use LookupAccountSid to find the
-	local equivalent of BUILTIN.
-
-2002-12-14  Christopher Faylor  <cgf@redhat.com>
-
-	* pipe.cc (make_pipe): Set fork fixup flag for read pipe.
-
-2002-12-14  Christopher Faylor  <cgf@redhat.com>
-
-	* winbase.h: Turn on inline versions of Interlocked* by default.
-
-2002-12-14  Gary R. Van Sickle <g.r.vansickle@worldnet.att.net>
-
-	* winbase.h: Fixup inline asm functions.  Add ilockcmpexch.
-
-2002-12-13  Christopher Faylor  <cgf@redhat.com>
-
-	Throughout, change fhandler_*::read and fhandler_*::raw_read to void
-	functions whose second arguments are both the length and the return
-	value.
-	* fhandler.cc (fhandler_base::read): Rework slightly to use second
-	argument as input/output.  Tweak CRLF stuff.
-	(fhandler_base::readv): Accommodate fhandler_*::read changes.
-	* cygthread.h (cygthread::detach): Declare as taking optional handle
-	argument.
-	(cygthread::detach): When given a handle argument, wait for the handle
-	to be signalled before waiting for thread to detach.  Return true when
-	signal detected.
-
-2002-12-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in: Add MINGW_LDFLAGS when linking cygrun.exe.
-
-2002-12-10  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.h (cygthread::stack_ptr): New element.
-	(cygthread::detach): Accept a "wait_for_signal" argument.
-	(cygthread::terminate_thread): New function.
-	* cygthread.cc (cygthread::stub): Set stack pointer argument.
-	(cygthread::terminate_thread): New function.  Forcibly terminate
-	thread.
-	(cygthread::detach): Optionally wait for signals and kill thread when
-	signal arrives.
-	* exceptions.cc (signal_exit): Set signal_arrived prior to exiting to
-	wake up anything blocking on signals.
-	* fhandler.h (fhandler_base::set_r_no_interrupt): Change to accept bool
-	argument.
-	(fhandler_pipe::ready_for_read): Declare.
-	* pipe.cc (pipeargs): New structure.
-	(read_pipe): New thread stub wrapper for normal pipe read.
-	(fhandler_pipe::read): Modify to call reader in a cygthread,
-	terminating on signal, as appropriate.
-	* select.cc (fhandler_pipe::ready_for_read): Define new function.
-
-2002-12-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (free_protoent_ptr): Add missing free() for base structure.
-	(free_servent_pt): Ditto.
-	(free_hostent_pt): Ditto.
-
-2002-12-10 Craig McGeachie <slapdau@yahoo.com.au>
-
-	* netdb.cc (parse_alias_list): Change strtok calls to strtok_r.
-	(parse_services_line): Ditto.
-	(parse_protocol_line): Ditto.
-
-2002-12-10  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* pwdgrp.h (pwdgrp_check::pwdgrp_state): Replace by
-	pwdgrp_check::isinitializing ().
-	(pwdgrp_check::isinitializing): Create.
-	* passwd.cc (grab_int): Change type to unsigned, use strtoul and set
-	the pointer content to 0 if the field is invalid.
-	(parse_pwd): Move validity test after getting pw_gid.
-	(read_etc_passwd): Replace "passwd_state <= " by
-	passwd_state::isinitializing ().
-	(internal_getpwuid): Ditto.
-	(internal_getpwnam): Ditto.
-	(getpwent): Ditto.
-	(getpass): Ditto.
-	* grp.cc (parse_grp): Use strtoul for gr_gid and verify the validity.
-	(read_etc_group): Replace "group_state <= " by
-	group_state::isinitializing ().
-	(internal_getgrgid): Ditto.
-	(getgrent32): Ditto.
-	(internal_getgrent): Ditto.
-
-2002-12-10  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.h: Move declarations of internal_getgrent,
-	internal_getpwsid and internal_getgrsid to pwdgrp.h.
-	* pwdgrp.h: Declare internal_getpwsid, internal_getpwnam,
-	internal_getpwuid, internal_getgrsid, internal_getgrgid,
-	internal_getgrnam, internal_getgrent and internal_getgroups.
-	Delete "emulated" from enum pwdgrp_state.
-	(pwdgrp_check::isuninitialized): Create.
-	(pwdgrp_check::pwdgrp_state): Change state to initializing
-	rather than to uninitialized.
-	(pwdgrp_read::gets): Remove trailing CRs.
-	* passwd.cc (grab_string): Don't look for NLs.
-	(grab_int): Ditto.
-	(parse_pwd): Don't look for CRs. Return 0 if entry is too short.
-	(search_for): Delete.
-	(read_etc_passwd): Simplify tests to actually read the file.
-	Set state to loaded before making internal_getpwXX calls.
-	Replace search_for calls by equivalent internal_pwgetXX calls.
-	(internal_getpwsid): Use passwd_state.isuninitialized to decide
-	to call read_etc_passwd.
-	(internal_getpwuid): Create.
-	(internal_getpwnam): Create.
-	(getpwuid32): Simply call internal_getpwuid.
-	(getpwuid_r32): Call internal_getpwuid.
-	(getpwnam): Simply call internal_getpwnam.
-	(getpwnam_r): Call internal_getpwnam.
-	* grp.cc (parse_grp): Don't look for CRs. Adjust blank space.
-	(add_grp_line): Adjust blank space.
-	(class group_lock): Ditto.
-	(read_etc_group): Simplify tests to actually read the file.
-	Set state to loaded before making internal_getgrXX calls.
-	Replace getgrXX calls by equivalent internal calls.
-	(internal_getgrsid): Use group_state.isuninitialized to decide
-	to call read_etc_group.
-	(internal_getgrgid): Create.
-	(internal_getgrnam): Create.
-	(getgroups32): Simply call internal_getgrgid.
-	(getgrnam32): Simply call internal_getgrnam.
-	(internal_getgrent): Call group_state.isuninitialized.
-	(internal_getgroups): Create from the former getgroups32, using
-	two of the four arguments. Set gid to myself->gid and username
-	to cygheap->user.name ().
-	(getgroups32): Simply call internal_getgroup.
-	(getgroups): Call internal_getgroup instead of getgroups32.
-	(setgroups32): Call internal versions of get{pw,gr}XX.
-	* sec_helper.cc: Include pwdgrp.h.
-	(is_grp_member): Call internal versions of get{pw,gr}XX.
-	* security.cc: Include pwdgrp.h.
-	(alloc_sd): Call internal versions of get{pw,gr}XX.
-	* syscalls.cc: Include pwdgrp.h.
-	(seteuid32): Call internal versions of get{pw,gr}XX.
-	(setegid32): Ditto.
-	* uinfo.cc: Include pwdgrp.h.
-	(internal_getlogin): Call internal versions of get{pw,gr}XX.
-	(cygheap_user::ontherange): Ditto.
-	* sec_acl.cc: Include pwdgrp.h.
-	(setacl): Call internal versions of get{pw,gr}XX.
-	(acl_access): Ditto and simplify logic.
-	(aclfromtext): Ditto.
-
-2002-12-09  2002-12-02  Egor Duda <deo@logos-m.ru>
-
-	* lib/pseudo-reloc.c: New file.
-	* lib/_cygwin_crt0_common.cc: Perform pseudo-relocs during
-	initialization of cygwin binary (.exe or .dll).
-
-2002-12-06  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din: Reflect name change from strtodf to strtof.  Export
-	strtof.
-	* include/cygwin/version.h: Bump API minor number.
-
-2002-12-04  Steve Osborn  <bub@io.com>
-
-	* fhandler.h (fhandler_termios::line_edit): Change return from an int
-	to an enum to allow the function to return an error.
-	* fhandler_console.cc (fhandler_console::read): Update the line_edit
-	call to use the new enum.
-	* fhandler_termios.cc (fhandler_termios::line_edit): Change return from
-	an int to an enum to allow the function to return an error.  Put
-	put_readahead call before doecho for future patch.
-	* fhandler_tty.cc (fhandler_pty_master::write): Change to call
-	line_edit one character at a time, and stop if an error occurs.
-
-2002-12-04  Craig McGeachie  <slapdau@yahoo.com.au>
-
-	* netdb.cc: New file.
-	* Makeile.in (DLL_OFILES): Add reference to the new netdb.cc file.
-	* cygwin.din : Add new aliased exports for service and protocol
-	enumerations in netdb.cc.
-
-2002-12-04  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* cxx.cc: New file. Implement new, new[], delete and delete[]
-	operators and  __cxa_pure_virtual if compiled by gcc >=3.
-	* Makefile.in (DLL_OFILES): Add cxx.o.
-	Remove libstdc++.a from cygwin1.dll link step.
-
-2002-11-29  Steve Osborn  <bub@io.com>
-
-	* fhandler_tty.cc (fhandler_pty_master::accept_input): Move
-	read_retval assignment to prevent race condition.  Remove read_retval
-	from return statement.
-
-2002-11-29  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.h (winpids::set): Renamed from init.
-	(winpids::init): New declaration.
-	(winpids::cs): Ditto.
-	(winpids::winpids): Use set rather than init.
-	* external.cc (fillout_pinfo): Ditto.
-	* dcrt0.cc (dll_crt0_1): Call winpids::init.
-	* pinfo.cc (winpids::set): Renamed from init.  Wrap calls in critical
-	section.
-	(winpids::init): New function.
-	(winpids::cs): Define.
-
-2002-11-28  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (sig_dispatch_pending): Remove assertion.
-
-2002-11-27  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-11-27  Mikael Ylikoski  <my@post.utfors.se>
-
-	* fhandler_socket.cc (fhandler_socket::sendto): Fix potential
-	unitialized value return.
-
-2002-11-27  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din: Export pthread_getsequence_np.
-	* include/cygwin/version.h: Bump API minor version.
-
-2002-11-26  Jason Tishler  <jason@tishler.net>
-
-	* cygwin.din: Export nl_langinfo().
-	* include/cygwin/version.h: Bump API minor version.
-
-2002-11-26  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_pty_master::accept_input): Just use a
-	normal Sleep or suffer amazing pauses when other tty apps are running.
-	(fhandler_pty_master::process_slave_output): Ditto.
-
-2002-11-25  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* passwd.cc (read_etc_passwd): Never add an entry when starting
-	on Win95/98/ME if a default entry is present.
-	* uinfo.cc (internal_getlogin): Look for the default uid if needed.
-	Always call user.set_name ().
-
-2002-11-25  Corinna Vinschen  <corinna@vinschen.de>
-
-	* sec_acl.cc (getacl): Set errno to ENOSPC if command is GETACL and
-	nentries is less than the number of entries in the file's ACL.
-
-2002-11-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* sec_acl.cc: Fix some formatting.  Only set and check `other' bits in
-	a_perm throughout.  Use ILLEGAL_GID id for all entries having no id.
-	(setacl): Fix inheritance condition.
-	(getacl): Set all permission bits in CLASS_OBJ and DEF_CLASS_OBJ
-	entries.  Remove DENY bits before returning to calling function.
-	(acltomode): Fix usage of searchace().  If available, use CLASS_OBJ
-	to mask GROUP_OBJ permissions.
-	(aclfrommode): Fix usage of searchace().  If available, set CLASS_OBJ
-	permissions to same value as GROUP_OBJ permissions.
-
-2002-11-24  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* sec_acl.cc (getace): Fix the behavior when allow and
-	deny entries are present in arbitrary order.
-	(getacl): Report the actual number of entries when
-	aclbufp is NULL, even if nentries is zero. Fix the mask
-	reporting, handle the case where the owner and group sids
-	are equal and streamline the code.
-	(acl_worker): Take allow_ntsec into account.
-
-2002-11-05  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* dcrt0.cc (dll_crt0_1): Add call to pthread::initMainThread to
-	initialize mainthread when it is safe to call new.
-	* init.cc (dll_entry): Change call to store reents in tls key.
-	* thread.cc (_reent_clib) : Change call to get reents from tls
-	key.
-	(_reent_winsup): Ditto.
-	(MTinterface::Init): Key handling changed. Remove initialization
-	of member variables.
-	(MTinterface::fixup_after_fork): Reinitialize mainthread object
-	after fork. Reset threadount to 1.
-	(pthread::initMainThread): Create mainthread object dynamically.
-	and initialize with valid handles.
-	(pthread::self): Remove calls to create thread objects.
-	(pthread::setTlsSelfPointer): Change call to store thread self
-	handle in tls key.
-	(pthread::getTlsSelfPointer): New static method.
-	(pthread::exit): Remove setTlsSelfPointer call.
-	(pthread::initCurrentThread): New method.
-	(pthread::thread_init_wrapper): Change call to store thread self
-	handle in tls key.
-	(pthread::join): Check for a valid joiner.
-	(pthreadNull::pthreadNull): Mark Null object as detached.
-	(pthreadNull::exit): Terminate thread via ExitThread.
-	* thread.h (pthread::initMainThread): Change parameter in function
-	call.
-	(pthread::getTlsSelfPointer): New static method.
-	(pthread::initCurrentThread): New method.
-	(MTinterface::reent_key): Remove.
-	(MTinterface::thread_self_dwTlsIndex): Ditto..
-	(MTinterface::indexallocated): Ditto.
-	(MTinterface::mainthread): Ditto.
-	(MTinterface::reent_key): New member.
-	(MTinterface::thread_self_key): Ditto.
-	(MTinterface::MTinterface): Initialize all members.
-
-2002-11-23  Christopher Faylor  <cgf@redhat.com>
-
-	* wait.cc (wait4): Force pending signal delivery before waiting for
-	process completion.
-
-2002-11-23  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-11-22  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (handle_sigsuspend): Force pending signal delivery
-	before waiting for signals to happen.
-	* signal.cc (sleep): Force pending signal delivery before sleeping.
-	(usleep): Ditto.
-	(signal): Force pending signal delivery before manipulating signal
-	stuff.
-	(sigprocmask): Ditto.
-	(kill_worker): Ditto.
-	(abort): Ditto.
-	(sigaction): Ditto.
-	* syscalls.cc (readv): Force pending signal delivery before I/O.
-	(writev): Ditto.
-	(open): Ditto.
-	* net.cc: Ditto, throughout.
-	* sigproc.cc (sig_dispatch_pending): Deliver any pending signals prior
-	to returning.
-
-	* tty.cc (tty::make_pipes): Increase pipe buffer size.
-
-2002-11-22  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Fix comment.
-
-2002-11-21  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-
-	* external.cc (cygwin_internal): Fix va_arg references.
-
-2002-11-21  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (sigthread::get_winapi_lock): Just do standard 'give up
-	timeslice' wait.
-	(setup_handler): Revamp YA to attempt to deliver signal multiple times
-	on failure rather than punting to wait_sig.
-	* miscfuncs.cc (low_priority_sleep): Accept INFINITE sleep to mean
-	"don't reset the priority after setting it to idle".  Return previous
-	priority.
-	* winsup.h (SLEEP_0_STAY_LOW): Define.
-	(low_priority_sleep): Return an int.
-	* sigproc.h: Define WAIT_SIG_PRIORITY here.
-	* sigproc.cc: Remove WAIT_SIG_PRIORITY definition.
-
-2002-11-20  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.h: Declare internal_getpwsid and internal_getgrsid.
-	Undeclare internal_getpwent.  Define DEFAULT_UID_NT.  Change
-	DEFAULT_GID.
-	* passwd.cc (internal_getpwsid): New function.
-	(internal_getpwent): Suppress.
-	(read_etc_passwd): Make static.  Rewrite the code for the completion
-	line.  Set curr_lines to 0.
-	(parse_pwd): Change type to static int.  Return 0 for short lines.
-	(add_pwd_line): Pay attention to the value of parse_pwd.
-	(search_for): Do not look for nor return the DEFAULT_UID.
-	* grp.cc (read_etc_group): Make static.  Free gr_mem and set
-	curr_lines to 0.  Always call add_pwd_line.  Rewrite the code for the
-	completion line.
-	(internal_getgrsid): New function.
-	(parse_grp): If grp.gr_mem is empty, set it to &null_ptr.
-	Never NULL gr_passwd.
-	(getgrgid32): Only return the default if ntsec is off and the gid is
-	ILLEGAL_GID.
-	* sec_helper.cc (cygsid::get_id): Use getpwsid and getgrsid.
-	(cygsid_getfrompw): Clean up last line.
-	(cygsid_getfromgr): Ditto.
-	(is_grp_member): Use getpwuid32 and getgrgid32.
-	* uinfo.cc (internal_getlogin): Set DEFAULT_GID at start.
-	Use getpwsid. Move the read of /etc/group after the second access
-	to /etc/passwd.  Change some debug_printf.
-
-2002-11-20  Steven O'Brien  <steven.obrien2@ntlworld.com>
-
-	* poll.cc (poll): ...but set POLLIN instead.
-
-2002-11-20  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.cc (get_attribute_from_acl): Always test "anti",
-	just in case an access_denied ACE follows an access_allowed.
-	Handle the case owner_sid == group_sid, with a FIXME.
-	Remove unnecessary tests for non-NULL PSIDs.
-	(alloc_sd): Use existing owner and group sids if {ug}id == -1.
-	Handle case where owner_sid == group_sid.
-	Do not call is_grp_member. Try to preserve canonical ACE order.
-	Remove unnecessary tests for non-NULL PSIDs. Reorganize
-	debug_printf's.
-	(get_initgroups_sidlist): Put well_known_system_sid on left
-	side of ==.
-	(add_access_denied_ace): Only call GetAce if inherit != 0.
-	(add_access_allowed_ace): Ditto. Use appropriate sizeof.
-	* syscalls.cc (chown_worker): Pass {ug}id equal to -1 to
-	alloc_sd, which removes the need to obtain old_{ug}id.
-	(chmod): Remove call to get_file_attribute (), simply pass
-	{ug}id equal to -1 to alloc_sd.
-
-2002-11-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* poll.cc (poll): Don't set POLLERR if a listening socket has a
-	pending connect.  Don't use errno value from call to
-	fhandler_socket::recvfrom().
-
-2002-11-19  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc: Sprinkle sigframes throughout.
-
-2002-11-16  Christopher Faylor  <cgf@redhat.com>
-
-	* tty.cc (tty::make_pipes): Make pipe buffer larger.
-
-2002-11-15  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* grp.cc (getgroups32): Protect against closing cygheap->user.token.
-
-2002-11-15  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump API_MINOR to accommodate below
-	changes.
-
-002-11-14  Sergey Okhapkin  <sos@prospect.com.ru>
-
-	* cygwin.din (siginterrupt): New export.
-	* signal.cc (siginterrupt): New.
-
-2002-11-15  Sergey Okhapkin  <sos@prospect.com.ru>
-
-	* select.cc (peek_serial): Don't call PurgeComm() to avoid characters
-	loss.
-
-2002-11-14  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (setup_handler): Add debugging output.  Set thread
-	priority to idle if pending signals to allow other threads to get into
-	interruptible state.
-	* miscfuncs.cc (sys_mbstowcs): Save current thread in variable to avoid
-	an OS call.
-	* wait.cc (wait_sig): Reset thread priority each time through loop
-	since the priority may have been set down to deal with pending signals.
-
-2002-11-14  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_serial.cc (fhandler_serial::tcgetattr): Don't take any
-	special action when vmin_ == 0.
-
-2002-11-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* grp.cc (getgroups32): Revert previous patch.  Use impersonation
-	token if process is in impersonated state.
-	* sec_helper.cc (is_grp_member): Rewrite.  Call getgroups32 only
-	for current user.  Scan passwd and group info otherwise.
-
-2002-11-14  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (fhandler_console::write): Allow characters >=
-	0177 to be displayed in the title bar.
-
-2002-11-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* grp.cc (getgroups32): Don't use access token of current user when
-	retrieving group info for another user.
-
-2002-11-13  Christopher Faylor  <cgf@redhat.com>
-
-	* dll_init.cc (dll_list::detach): Eliminate reliance on passed in dll
-	address.  Infer from module of caller instead.
-	(cygwin_detach_dll): Ignore dll_index argument.
-	* dll_init.h (dll_list::detach): Reflect argument change above.
-
-2002-11-13  Christopher Faylor  <cgf@redhat.com>
-
-	* ioctl.cc (ioctl): Always print ioctl results, even when it's a tty.
-
-2002-11-13  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.h (low_priority_sleep): Declare.
-
-2002-11-13  Christopher Faylor  <cgf@redhat.com>
-
-	* miscfuncs.cc (low_priority_sleep): New function.  Use throughout
-	where code is supposed to be giving up time slice.
-
-	* fhandler_console.cc (fhandler_console::read): Switch button 2/3
-	output escape sequences to be consistent with xterm.
-
-2002-11-12  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* syscalls.cc (chmod): Simplify conditional.
-	* sec_helper (cygsid::getfromstr): Reorganize to remove
-	calls to strcpy and strtok_r.
-	(cygsid::getfromgr): Change type to __uid32_t instead of int.
-	Keep only the allow_ntsec branch. Never call LookupAccountSid
-	which calls PDCs, simply return -1 in case of failure.
-	Use cygsid == instead of calling EqualSid and remove test
-	for NULL psid.
-	* security.h: Declare cygsid::getfromgr as __uid32_t.
-
-2002-11-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc: Run indent.
-
-2002-11-10  Alexander Gottwald <Alexander.Gottwald@s1999.tu-chemnitz.de>
-
-	* autoload.cc (GetIfEntry): Add symbol.
-	* net.cc (get_2k_ifconf): Get the interface entries with the GetIfEntry
-	call intead of the GetIfTable call. Clean-up multiple IP address naming.
-
-2002-11-09  Sergey Okhapkin  <sos@prospect.com.ru>
-
-	* fhandler.h (class fhandler_pipe): New ioctl() method.
-	* pipe.cc (fhandler_pipe::ioctl): New.
-
-2002-11-07  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_serial.cc (fhandler_serial::ioctl): Fix typo.
-
-2002-11-07  Christopher January  <chris@atomice.net>
-
-	* include/cygwin/fs.h: New file.
-	* include/cygwin/hdreg.h: New file.
-	* fhandler_floppy.cc (fhandler_floppy::ioctl): Add implementation for
-	HDIO_GETGEO, BLKGETSIZE, BLKGETSIZE64, BLKRRPART and BLKSSZGET ioctls.
-
-2002-11-07  Gilles Courcoux  <Gilles.Courcoux@col.bsf.alcatel.fr>
-
-	* fhandler_socket.cc (fhandler_socket::ioctl): Return correct flags
-	for loopback interface when name is given on input instead of address.
-
-2002-11-07  Jason Tishler  <jason@tishler.net>
-
-	* cygwin.din: Export fseeko() and ftello().
-	* include/cygwin/version.h: Bump API minor version.
-
-2002-11-06  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (keytable[]): Revert previous change.  It would
-	break too many things.
-
-2002-11-06  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (keytable[]): Redefine F1 - F5 to something a
-	little more sensical.
-
-2002-11-06  Sergey Okhapkin  <sos@prospect.com.ru>
-
-	* syscalls.cc (getutid): Use UT_IDLEN where appropriate.
-
-2002-11-06  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump API minor number for below export.
-
-2002-11-06  Sergey Okhapkin  <sos@prospect.com.ru>
-
-	* cygwin.din (pututline): New exported function.
-	* syscalls.cc (login): Use pututiline().
-	(setutent): Open utmp as read/write.
-	(endutent): Check if utmp file is open.
-	(utmpname): call endutent() to close current utmp file.
-	(getutid): Enable all cases, use strncmp() to compare ut_id fields.
-	(pututline): New.
-	* tty.cc (create_tty_master): Set ut_pid to current pid.
-
-2002-11-05  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_serial.cc (fhandler_serial::ioctl): Don't try to figure out
-	if OS has the capability to retrieve RTS/CTS.  Just set default values
-	if DeviceIoControl fails.  (suggested by Sergey Okhapkin)
-
-2002-11-05  Sergey Okhapkin  <sos@prospect.com.ru>
-
-	* fhandler_serial.cc (fhandler_serial::raw_read): Use correct type for
-	minchars.
-	(fhandler_serial::ioctl): Set errno if the ClearCommError fails.
-	(fhandler_serial::tcsetattr): Use correct value for vmin_.
-	(fhandler_serial::tcgetattr): Ditto.
-
-2002-11-05  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* fhandler_socket.cc (fhandler_socket::recvmsg): Call if from == NULL
-	WSARecvFrom with fromlen = NULL.
-
-2002-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (_pinfo::commune_send): Fix thinko in previous checkin.
-
-2002-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (_pinfo::commune_send): Set priority low when sleeping,
-	waiting for commune completion so that we don't spin waiting for lower
-	priority processes.
-
-2002-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (WAIT_SIG_PRIORITY): Bump to THREAD_PRIORITY_TIME_CRITICAL.
-
-2002-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (_pinfo::commune_send): Initialize buffer or suffer random
-	crashes.
-
-2002-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_process.cc (fhandler_process::fill_filebuf): Deal with error
-	condition from cmdline retrieval.
-
-2002-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (WAIT_SIG_PRIORITY): Bump to highest priority.
-
-2002-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-11-03  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_serial.cc (fhandler_serial::ioctl): Reformat.  Set errno
-	appropriately.  Exit from the bottom.  Correctly deal with third
-	argument for TCFLSH.  (Suggested by Sergey Okhapkin)
-
-2003-11-03  Sergey Okhapkin  <sos@prospect.com.ru>
-
-	* fhandler_tty.cc (fhandler_tty_slave::ioctl): Do nothing if the new
-	window size is equal to the old one.  Send SIGWINCH if slave connected
-	to a pseudo tty.
-	(fhandler_pty_master::ioctl): Do nothing if the new window size is
-	equal to the old one.
-
-2002-10-31  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* fhandler.cc (fhandler_base::open): Verify pc isn't NULL.
-
-2002-10-30  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-10-30  Christopher Faylor  <cgf@redhat.com>
-
-	* external.cc (cygwin_internal): Implement CW_CMDLINE.
-	* pinfo.h (SIGCOMMUNE): New signal type.
-	(commune_result): New structure for commune functions.
-	(picom): New enum for commune functions.
-	(_pinfo::hello_pid): New.  Pid who's communicating with me.
-	(_pinfo::tothem): New.  Handle of communicating pipe.
-	(_pinfo::fromthem): Ditto.
-	(_pinfo::commune_recv): Declare.
-	(_pinfo::commune_send): Declare.
-	(_pinfo::alive): Declare.
-	(_pinfo::cmdline): Declare.
-	(_pinfo::lock): Declare.
-	* pinfo.cc (set_myself): Initialize new _pinfo lock.
-	(_pinfo::alive): Define. Determines if process still exists.
-	(_pinfo::commune_recv): Define.  Receive info from another cooperating process.
-	(_pinfo::commune_send): Define.  Send info to another cooperating process.
-	(_pinfo::cmdline): Define.  Determine command line of a given process.
-	* include/sys/cygwin.h (CW_CMDLINE): Define.
-
-	*sigproc.cc (talktome): Communicate with any processes who want to talk
-	to me.
-	(wait_sig): Honor __SIGCOMMUNE.
-
-	* fhandler.cc (fhandler_virtual::fixup_after_exec): Declare.
-	* fhandler_proc.cc: Use malloc/free/realloc throughout rather than
-	cmalloc since buffers don't need to be propagated to subprocesses.
-	* fhandler_registry.cc: Ditto.
-	* fhandler_virtual.cc: Ditto.
-	(fhandler_virtual::fixup_after_exec): Define.
-	* fhandler_process.cc: Ditto for malloc/free/realloc.
-	(process_listin): Add "cmdline".
-	(fhandler_process::fill_filebuf): Implement PROCESS_CMDLINE.
-
-	* miscfuncs.cc (isalpha_array): New array populated with xor values for
-	alpha characters to switch from one case to another.
-	* string.h (cygwin_strcasematch): New asm implementation of case match.
-	* string.h (cygwin_nstrcasematch): New asm implementation of counted
-	case match.
-
-2002-10-24  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* pwdgrp.h (pwdgrp_read::open): Compare fh to INVALID_HANDLE_VALUE.
-
-2002-10-22  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Nevermind.
-	Revert everything to previous state wrt ntsec and exec bits.
-
-2002-10-22  Christopher Faylor  <cgf@redhat.com>
-
-	* shared.cc (shared_info::initialize): Use correct value for version
-	comparison.
-	* include/cygwin/version.h (CYGWIN_VERSION_MAGIC): Use all of a DWORD
-	for magic calculation.
-
-2002-10-22  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Oops.  Only
-	do the executable thing for #! scripts since .exe files wouldn't be
-	executable in ntsec case regardless.
-
-2002-10-22  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Always
-	consider .exe files and '#!' shell scripts to be executable.
-
-2002-10-22  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::exiting): New variable.
-	(cygthread::initialized): Delete.
-	(cygthread::stub): Use exiting variable to determine when to exit.
-	(cygthread::runner): Delete.
-	(cygthread_protect): New variable.
-	(cygthread::init): Don't start runner thread.  Initialize muto for list
-	protection.
-	(cygthread::freerange): Return pointer to cygthread.
-	(cygthread::operator new): Change logic to start threads on an
-	as-needed basis.
-	(cygthread::detach): Don't zero id.
-	(cygthread::terminate): Don't kill any executing threads.  Just set
-	exiting flag.
-	* cygthread.h (cygthread): Reflect above changes.
-	* dcrt0.cc (dll_crt0_1): Move cygthread initialization later.
-
-	* fork.cc (fork_child): Do fdtab fixup after dll fixup or (apparently)
-	winsock may allocate memory in dll load address.
-
-2002-10-22  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* sec_helper.cc (cygsid::get_id): If the sid matches a sid stored in
-	cygheap->user, return the uid or gid from myself.
-	* security.cc (alloc_sd): If gid == myself->gid, return the group sid
-	from cygheap->user.  Remove the test for uid == original_uid, which is
-	counter-productive.
-
-2002-10-22  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (cygheap_fixup_in_child): Use user_heap element in
-	cygheap.
-	(init_cheap): Ditto for declaration.
-	* fork.cc (fork_parent): Use user_heap element in cygheap.
-	* heap.h (inheap): Ditto.
-	* heap.cc (sbrk): Ditto.
-	(heap_init): Ditto.  Reorganize to shrink heap chunk as required and
-	record new value in cygheap.
-	* dcrt0.cc (dll_crt0_1): More "move the cygthread init" games.
-	* shared.cc (open_shared): Rework memory protection to properly deal
-	with relocated shared segment.
-	(shared_info::heap_chunk_size): Rename element to 'heap_chunk'.
-	* shared_info.h (shared_info): Ditto for declaration.
-	* strace.cc (strace::hello): Report on heap chunk size from cygheap
-	since it may shrink.
-
-2002-10-20  Christopher Faylor  <cgf@redhat.com>
-
-	Change _function() to function() throughout.
-	* cygwin.din: Remove last vestiges (?) of newlib wrappers.
-
-2002-10-20  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::detach): Always wait for event or suffer an
-	apparently inavoidable race.
-	* dcrt0.cc (dll_crt0_1): Allocate threads after stack has been
-	relocated.
-	* debub.cc (lock_debug): Don't acquire lock on exit.
-	* fork.cc (fork_child): Recreate mmaps before doing anything else since
-	Windows has a habit of using blocks of memory in the child that could
-	previously have been occupied by shared memory in the parent.
-	* mmap.cc (fhandler_disk_file::fixup_mmap_after_fork): Issue error here
-	and provide some details about what went wrong.
-	(fixup_mmaps_after_fork): Remove error message.
-	* shared.cc (open_shared): Move warning message so that more detail is
-	possible.
-	* sigproc.cc (sigproc_init): Initialize sync_proc_subproc to avoid a
-	race.
-	(sigproc_terminate): Specifically wait for process thread to terminate.
-
-2002-10-20  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Fix typo.
-	(cygthread::terminate): Don't zero thread handle prior to using it.
-
-2002-10-20  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (wait_sig): Remove obsolete sigchld logic.
-
-2002-10-20  Christopher Faylor  <cgf@redhat.com>
-
-	Rename _kill() to kill() throughout.  Rename _raise() to raise()
-	throughout.  Rename _pid() to pid() throughout.
-	* Makefile.in: Compile some objects with -fomit-frame-pointer.
-	* cygwin.din: Reverse aliasing for _kill.
-	* syscalls.cc (_getpid_r): New function, implemented for newlib
-	compatibility.
-
-	* shared.cc (open_shared): Remove reserving of memory since previous
-	change eliminate the need for this hack.
-
-2002-10-19  Christopher Faylor  <cgf@redhat.com>
-
-	* fork.cc (fork_child): Move pinfo fixup later to attempt some minor
-	gains from concurrency with cythread::init.
-
-2002-10-18  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (dll_crt0_1): Initialize cygwin threads here only when not
-	forking.
-	* fork.cc (fork_child): Initialize cygwin thread later in process to
-	avoid allocating memory for thread stacks.
-	* shared.cc (open_shared): Issue warning if NT and shared segment is
-	relocated.
-
-2002-10-18  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc: Bump number of cygthreads up to accommodate
-	applications which use ttys.
-
-2002-10-18  Christopher Faylor  <cgf@redhat.com>
-
-	* fork.cc (fork_child): Move mmap initialization.
-	* shared.cc (shared_info::heap_chunk_size): Store info as megabytes.
-	Search HKEY_LOCAL_MACHINE as well as HKEY_CURRENT_USER.
-	* shared_info.h (shared_info::initial_heap_size): Change element name
-	to reflect new functionality.
-	* strace.cc (strace::hello): Report on initial heap size.
-
-2002-10-18  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (verifyable_object_isvalid): Test for a valid object
-	pointer before testing for static ptr.
-
-2002-10-17  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::init_std_file_from_handle): Force "devices" to
-	always be in binary mode.  Temporary fix until ssh is rebuilt?
-
-2002-10-17  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::set_file_pointers_for_exec): New function.
-	* dtable.h (dtable::set_file_pointers_for_exec): Declare new function.
-	* spawn.cc (spawn_guts): Call dtable::set_file_pointers_for_exec to set
-	pointers to EOF when execing non-cygwin applications.
-
-2002-10-17  Robert Collins  <rbtcollins@hotmail.com>
-
-	* thread.h (pthread_mutex::isGoodInitializerOrBadObject): Declare.
-	* thread.cc (pthread_mutex::isGoodInitializerOrBadObject): Implement.
-	(pthread_mutex::init): Use isGoodInitializerOrBadObject to avoid
-	unneeded SEGV's during debugging.
-
-2002-10-17  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (verifyable_object_isvalid): Test for static object first.
-
-2002-10-16  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::read): Attempt #527 to properly
-	implement VMIN/VTIME.
-
-2002-10-15  Christopher Faylor  <cgf@redhat.com>
-
-	* shared.cc (open_shared): Revert to "old" method for shared memory
-	location if !wincap.needs_memory_protection.
-	* wincap.cc: Implement needs_memory_protection throughout.
-	* wincap.h: Ditto.
-
-2002-10-15  Christopher Faylor  <cgf@redhat.com>
-
-	* child_info.h (CURR_CHILD_INFO_MAGIC): Reset.
-	(child_info_fork::mount_table): Remove.
-	(child_info_fork::myself_addr): Remove.
-	* fork.cc (fork_child): Don't set either of the above.
-	* dcrt0.cc (dll_crt0_1): Call memory_init as early as possible.
-	* fhandler_console.cc (console_state): Move to shared_info.h.
-	(fhandler_console::get_tty_stuff): Reflect open_shared arg change.
-	* pinfo.cc (myself_addr): Remove definition.
-	(pinfo::init): Get myself address from open_shared.
-	* pinfo.h (myself_addr): Remove declaration.
-	* shared.cc (open_shared): Rework so that known shared memory locations
-	are protected.  Take shared memory type as fifth argument.
-	(memory_init): Reflect open_shared arg change.
-	* shared_info.h (shared_locations): New enum.
-	(console_state): Move here.
-	(open_shared): Reflect open_shared arg change in declaration.
-
-2002-10-14  Christopher Faylor  <cgf@redhat.com>
-
-	* child_info.h (CURR_CHILD_INFO_MAGIC): Reset.
-	(child_info_fork::heaptop): Remove obsolete element.
-	(child_info_fork::heabbase): Ditto.
-	(child_info_fork::heapptr): Ditto.
-	(child_info_fork::mount_table): New element.
-	(child_info_fork::myself_addr): Ditto.
-	* dcrt0.cc (dll_crt0_1): Set mount_table and myself_addr when forking.
-	(initial_env): Add newline to "sleeping" message.
-	* dll_init.cc (reserve_upto): Accommodate cygwin heap when freeing
-	memory.  Make debugging output a little more descriptive.
-	* fork.cc (fork_parent): Save mount_table and myself_addr.
-	* pinfo.cc (myself_addr): New variable.
-	(set_myself): Pass PID_MYSELF flag to init.
-	(pinfo::init): Honor PID_MYSELF.  Save address where myself shared
-	memory resides in myself_addr, for fork.
-	* pinfo.h (myself_addr): Declare.
-	* shared.cc (memory_init): On fork, use previously saved address for
-	location of mount table.
-	* include/sys/cygwin.h (PID_MYSELF): New value.
-
-	* dtable.cc (dtable::stdio_init): Don't pass access type to
-	init_std_file_from_handle.  It's always the same.
-	(dtable::init_std_file_from_handle): Remove access type argument.
-	Assume read/write.
-	* dtable.h (dtable::init_std_file_from_handle): Ditto for declaration.
-
-	* exceptions.cc (try_to_debug): Don't try to debug if already being
-	debugged.
-
-	* fhandler_console.cc (shared_console_info_save): New variable.
-	(fhandler_console::get_tty_stuff): Save address of shared console stuff
-	for fork.
-
-2002-10-13  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Reintroduce clearing of __name but do
-	it before SetEvent to eliminate a race.
-	(cygthread::terminate): Accumulate list of threads to check for
-	termination and call WaitForMultipleObjects on list rather than waiting
-	for each thread individually.
-	* sigproc.cc (subproc_init): Zap hwait_subproc thread handle since it
-	is no longer used.
-
-2002-10-13  Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (spawn_guts): Fix so that cygthread::terminate is *really*
-	called only for exec.
-
-2002-10-13  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Don't zero __name here.  That
-	introduces a race.
-
-2002-10-13  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-10-13  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Don't create event for long-running
-	threads.  Initialize thread_sync event here which is used to Suspend
-	using an event rather than relying on SuspendThread/ResumeThread.
-	(cygthread::init): Save handle to runner thread for future termination.
-	(cygthread::cygthread): Only resume thread when it is actually
-	suspended.  Otherwise signal thread completion event.
-	(cygthread::terminate): Forcibly terminate runner thread and any helper
-	threads.  Call DisableThreadLibrary calls if execing.
-	* cygthread.h (cygthread::thread_sync): Declare.
-	* dcrt0.cc (do_exit): Eliminate calls to obsolete window_terminate and
-	shared_terminate.
-	* exceptions.cc (events_terminate): Don't bother closing title_mutex
-	since it is going away anyway.
-	* pinfo.cc (_pinfo::exit): Call cygthread::terminate to ensure that
-	threads are shut down before process exit or otherwise strange races
-	seem to occur.
-	* shared.cc (shared_terminate): Eliminate.
-	* shared.h (shared_terminate): Eliminate declaration.
-	* winsup.h (window_terminate): Eliminate declaration.
-	* spawn.cc (spawn_guts): Call cygthread::terminate early in process if
-	execing.  Call DisableThreadLibrary calls if execing.
-	* window.cc (Winmain): Call ExitThread to force exit.
-	(window_terminate): Eliminate.
-
-	* dcrt0.cc (do_exit): Track exit state more closely.
-
-2002-10-10  Christopher Faylor  <cgf@redhat.com>
-
-	* window.cc (gethwnd): Use SetThreadPriority method.
-
-2002-10-10  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (new-cygwin1.dll): Reorganize library order.
-
-	* dcrt0.cc (do_exit): Move thread stuff after vfork stuff or threads
-	are terminated during vfork.
-	* sigproc.cc (proc_terminate): Grab proc lock prior to signalling
-	subproc thread exit to avoid an extra "wait-for-thread-to-exit".
-
-2002-10-09  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Don't create an event for "cygself"
-	threads.  Assume that they exit via an ExitThread call.
-	* cygthread.h (cygthread::SetThreadPriority): New function.
-	(cygthread::zap_h): New function.
-	* dcrt0.cc (do_exit): Move cygthread::terminate earlier and establish
-	exit_state guard.
-	* fhandler.h (fhandler_tty_master::output_thread): Delete.
-	* fhandler_tty.cc (fhandler_tty_master::init): Set priority for threads
-	via method.  Zap handles when done.  Don't treat process_output
-	specially.
-	(process_output): Call ExitThread directly.
-	(fhandler_tty_master::fixup_after_fork): Don't worry about
-	output_thread.
-	(fhandler_tty_master::fixup_after_exec): Ditto.
-	* sigproc.cc (proc_terminate): Don't detach from hwait_subproc.  Just
-	let it exit.
-	(sigproc_init): Close thread handle after initialization.
-	(wait_sig): Use GetCurrentThread() as SetThreadPriority call rather
-	than *event* handle.  Call ExitThread directly on termination.
-	(wait_subproc): Call ExitThread directly on termination.
-	* tty.cc (tty_list::terminate): Don't attempt to detach from
-	output_thread.
-
-2002-10-08  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (dup_now): Make fatal error a little more informative.
-	(cygheap_setup_for_child): Detect when default size of shared region is
-	less than the current size and allocate that much.
-	(_cbrk): Just return NULL on inability to allocate.
-	(_cmalloc): Ditto.
-	* cygheap.h (CYGHEAPSIZE): Change size to reflect newer, tinier
-	fhandler sizes.
-	* spawn.cc (av::error): New element, reflects potential errno from cmalloc.
-	(av::~av): Don't free NULL pointers.
-	(av::replace0_maybe): Detect out-of-memory conditions.
-	(av::dup_maybe): Ditto.
-	(av::dup_all): Ditto.
-	(av::unshift): Ditto.
-	(spawn_guts): Set errno and return if argv creation ran into problems.
-
-	* fhandler.h (fhandler_union): Change member names to something safer.
-
-	* fhandler_console.cc (fhandler_console::get_tty_stuff): Always set
-	fhandler_console::dev_state regardless of whether shared region is
-	initialized.
-
-	* cygthread.cc (cygthread::runner): Use ExitThread rather than return
-	(planning for future).
-
-2002-10-08  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (dev_console): New class.
-	(fhandler_console::dev_state): New class element.
-	(fhandler_console::mouse_aware): Use dev_state element.
-	(fhandler_console::get_tty_stuff): Declare new function.
-	* fhandler_console.cc: Use dev_state fhandler_console element,
-	throughout.
-	(fhandler_console::get_tty_stuff): Move to fhandler_console class.
-	Incorporate dev_console information.  Move constructor stuff here.
-
-2002-10-07  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::init_std_file_from_handle): Try to mimic standard
-	open behavior with files redirected from stdin/stdout/stderr, i.e.,
-	fmode settings take precedence over mount settings.
-
-2002-10-07  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (unknown_file): New variable.
-	(dtable::init_std_file_from_handle): Don't set binmode if we couldn't
-	determine the actual file name on stdin/stdout/stderr.
-	(handle_to_fn): Return unknown_file when can't determine filename.
-
-2002-10-07  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (do_exit): Call DisableThreadLibraryCalls since we don't
-	need to track thread detaches.
-	* init.cc (dll_entry): Reorganize slightly.  Fix api_fatal message.
-
-2002-10-05  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Very minor cleanup.
-	(cygthread::stub): Report overflows in cygwin thread pool when
-	DEBUGGING is on and special environment variable is not set.
-	(cygthread::terminate): Set event only when event actually exists.
-	* exceptions.cc (signal_exit): Set priority of main thread to low
-	before setting current thread to high.
-
-2002-10-01  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_key::keys): Copy on fork. Add a comment explaining
-	why.
-	(pthreadNull::_instance): Copy on fork. Absolutely no state exists
-	in pthreadNull.
-
-2002-09-30  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_transport_pipes.cc (transport_layer_pipes::accept):
-	Remove trailing \n from debug_printf.
-
-2002-09-30  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.cc (pthread_mutex::initMutex): Remove \n from api_fatal.
-
-2002-09-30  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.cc (pthread::precreate): Use explicit "no inherit" option when
-	creating mutex.
-	(pthread_mutex::nativeMutex::init): Ditto.
-
-2002-09-30  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.cc (pthread_key::keys): Do not copy on fork.
-	(pthread_mutex::mutexInitializationLock): Ditto.
-	(pthreadNull::_instance): Ditto.
-
-2002-09-30  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (unused_sig_wrapper): Still need additional level of
-	indirection when setting errno.
-
-2002-09-30  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_mutex::initMutex): Use the wrapper init call.
-	(pthread_mutex::nativeMutex::init): Implement.
-	(pthread_mutex::nativeMutex::lock): Ditto.
-	(pthread_mutex::nativeMutex::unlock): Ditto.
-	(pthread_mutex::init): Use the wrapper lock and unlockcalls.
-	* thread.h (pthread_mutex): Move mutexInitializationLock into a
-	nativeMutex wrapper class.
-
-2002-09-30  Christopher Faylor  <cgf@redhat.com>
-
-	Remove \n from calls to strace class printfs throughout.
-
-2002-09-30  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (unused_sig_wrapper): Accommodate newer compilers.
-
-2002-09-29  Christopher Faylor  <cgf@redhat.com>
-
-	* security.cc (allow_ntsec): Default to zero.
-	* environ.cc (environ_init): Set allow_ntsec to TRUE by default,
-	assuming OS allows it.
-
-2002-09-29  Christopher Faylor  <cgf@redhat.com>
-
-	* environ.cc (environ_init): Avoid a compiler warning.
-	* path.cc (path_conv::check): Ditto.
-	* path.h (path_conv::operator int): Ditto.
-	* regex/engine.c: Ditto throughout.
-	* regex/regcomp.c: Ditto throughout.
-	* regex/regexec.c: Ditto throughout.
-
-2002-09-29  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.cc: Use "%E" in *_printf throughout rather than calling
-	GetLastError.  GNUify comments.
-	(__pthread_mutex_lock): Don't return error on EBUSY since that just
-	means that the mutex has already been initialized.
-
-2002-09-30  Robert Collins <rbtcollins@hotmail.com>
-
-	* pthread.cc (pthread_mutex_init): Use new pthread_mutex::init.
-	* thread.cc: Change __pthread_mutex_init to pthread_mutex::init
-	throughout.
-	(MTinterface::Init): Initialise pthread_mutex support.
-	(pthread_mutex::mutexInitializationLock): Instantiate.
-	(pthread_mutex::initMutex): New method.
-	(__pthread_cond_dowait): Don't dereference untrusted pointers.
-	Use the new pthread_mutex::init method.
-	(__pthread_condattr_init): Don't dereference untrusted pointers.
-	(__pthread_mutex_init): Rename to pthread_mutex::init.
-	Lock and release mutexInitializationLock to prevent races on
-	mutex initialisation.
-	* thread.h (pthread_mutex::initMutex): New method, initialise
-	pthread_mutex supporting state on process initialisation.
-	(pthread_mutex::init): Initialise a single mutex.
-	(pthread_mutex::mutexInitializationLock): A win32 mutex for
-	syncronising pthread mutex initialisation.
-	(__pthread_mutex_init): Remove this.
-
-2002-09-28  Christopher Faylor  <cgf@redhat.com>
-
-	* thread.h (verifyable_object:~verifyable_object): Make virtual.
-
-2002-09-28  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.h (cygthread::terminate): Declare new function.
-	(cygthread::initialized): Change to 'int'.
-	* cygthread.cc (cygthread::stub): Exit thread if initialized < 0.
-	(cygthread::new): Ditto.
-	(cygthread::runner): Ditto.  Set initialized using xor to preserve
-	sign.
-	(cygthread::terminate): New function.
-	* dcrt0.cc (do_exit): Call cygthread::terminate.
-
-2002-09-27  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_key::run_destructor): Run_destructor is not
-	const as it needs to set the key value.
-	* thread.h (pthread_key::run_destructor): Ditto.
-
-2002-09-27  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_key::run_destructor): Follow opengroup algorithm.
-	I.e. only run the destructor NON-NULL key values, and reset the key
-	to NULL before running the destructor. Reported by Thomas Pfaff.
-
-2002-09-25  Christopher Faylor  <cgf@redhat.com>
-
-	* cygrun.c (main): Fix setting of CYGWIN environment variable.
-
-	* Makefile.in: Remove linking of unnecessary libraries.
-
-2002-09-24  Christopher January <chris@atomice.net>
-
-	* fhandler_proc.cc (format_process_stat): make ctty a real device
-	number.
-	(format_process_status): use effective uid/gid as real and saved
-	uid/gid.
-
-2002-09-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* errno.cc (errmap): Map ERROR_INVALID_ADDRESS to new errno code
-	EOVERFLOW.
-	(_sys_errlist): Add entries for EILSEQ and EOVERFLOW.
-	(strerror): Ditto.
-	* mmap.cc (map_map): Set errno in case of error.
-	(mmap64): Remove setting errno explicitely to ENOMEM.
-
-2002-09-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (map_map): Add debug output.
-	(mmap64): Evaluate gran_len correctly even if offset isn't 0.
-
-2002-09-22  Christopher Faylor  <cgf@redhat.com>
-
-	More GNUify non-GNU formatted functions calls throughout.
-
-2002-09-22  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (DLL_O_FILES): Restore formatting.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	GNUify non-GNU formatted functions calls throughout.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.cc (with_strerr): Remove macro.
-	(server_shmmgr::segment_t::~segment_t): Remove calls to with_strerr.
-	(server_shmmgr::segment_t::attach): Ditto.
-	(server_shmmgr::new_segment): Ditto.
-	* shm.cc (with_strerr): Remove macro.
-	(client_shmmgr::shmdt): Remove calls to with_strerr.
-	(client_shmmgr::attach): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/sys/ipc.h: Move to "include/cygwin/ipc.h".
-	* include/sys/msg.h: Move to "include/cygwin/msg.h".
-	* include/sys/sem.h: Move to "include/cygwin/sem.h".
-	* include/sys/shm.h: Move to "include/cygwin/shm.h".
-	* include/cygwin/ipc.h: New file.
-	* include/cygwin/msg.h: Ditto.
-	* include/cygwin/sem.h: Ditto.
-	* include/cygwin/shm.h: Ditto.
-	* cygserver_shm.h: Update includes.
-	* msg.cc: Ditto.
-	* sem.cc: Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* safe_memory.h (safe_delete): Make a templated function.
-	* cygserver.cc (~server_request): Update use of safe_delete.
-	(main): Ditto.
-	* cygserver_client.cc (client_request::handle_request): Ditto.
-	(client_request::make_request): Ditto.
-	* cygserver_process.cc (~process_cleanup): Ditto.
-	(process::remove): Ditto.
-	(process::cleanup): Ditto.
-	(process_cache::process): Ditto.
-	* cygserver_shm.cc (server_shmmgr::segment_t::detach): Ditto.
-	(server_shmmgr::delete_segment): Ditto.
-	* shm.cc (client_shmmgr::shmdt): Ditto.
-	* threaded_queue.cc (~threaded_queue): Ditto.
-	(threaded_queue::worker_loop): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* safe_memory.h: Replace #include <new> with an explicit
-	definition of the placement new operator.
-	(safe_delete): Remove unnecessary ## operator.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.cc (class server_shmmgr): Remove `cleanup_t'
-	friend declaration.
-	(cleanup_t::cleanup_t): Use the segment's shmid as the key rather
-	than the segment pointer itself.
-	(cleanup_t::segptr): Remove method.
-	(cleanup_t::shmid): New method.
-	(cleanup_t::cleanup): Update for new key value.
-	(server_shmmgr::find (segment_t *)): Remove method.
-	* include/cygwin/cygserver_process.h (cleanup_routine::key): Make
-	method const.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/cygwin/cygserver_process.h
-	(cleanup_routine::_key): New field.
-	(cleanup_routine::cleanup_routine): Initialise new field with new
-	argument.
-	(cleanup_routine::operator==): New method.
-	(cleanup_routine::key): New method.
-	(cleanup_routine::cleanup): Make argument non-const.
-	(process::is_active): New method.
-	(process::remove): Ditto.
-	(process::check_exit_code): Rename method.
-	* cygserver_process.cc (process::add): Reorganize code.
-	(process::remove): New method.
-	(process::check_exit_code): Rename method.
-	(process::cleanup): Use new `process::is_active' method.
-	(process_cache::process): Ditto.
-	(process_cache::sync_wait_array): Ditto.
-	(process_cache::check_and_remove_process): Ditto.
-	* cygserver_shm.cc (server_shmmgr): Make `cleanup_t' a friend.
-	(segment_t::detach): Make argument non-const.  Remove cleanup
-	object from client if appropriate.
-	(cleanup_t::_segptr): Remove field.
-	(cleanup_t::cleanup_t): Initialise parent explicitly.  Remove
-	field.
-	(cleanup_t::segptr): New method.
-	(cleanup_t::cleanup): Add error checking and reporting.
-	(server_shmmgr::shmdt): Make argument non-const.
-	(server_shmmgr::find (segment_t *)): New method.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver.cc (client_request_shutdown::client_request_shutdown):
-	Comment out verbose tracing statement.
-	* cygserver_client.cc
-	(client_request_get_version::client_request_get_version): Ditto.
-	(client_request_attach_tty::client_request_attach_tty): Ditto.
-	* cygserver_shm.cc (client_request_shm::client_request_shm):
-	Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_transport_pipes.cc (transport_layer_pipes::listen):
-	Set `_is_listening_endpoint' appropriately.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/cygwin/cygserver_transport.h
-	(transport_layer_base::listen): Change return type.
-	(transport_layer_base::connect): Ditto.
-	* include/cygwin/cygserver_transport_pipes.h
-	(transport_layer_pipes::listen): Change return type.
-	(transport_layer_pipes::connect): Ditto.
-	(transport_layer_pipes::_sec_none_nih): Remove unused field.
-	(transport_layer_pipes::_is_listening_endpoint): New field.
-	* cygserver_transport_pipes.cc: Synchronize with sockets code.
-	(transport_layer_pipes::transport_layer_pipes): Initialise new
-	field.  Separate out asserts.
-	(transport_layer_pipes::listen): Change return type.  Add asserts.
-	(transport_layer_pipes::accept): Add asserts.
-	(transport_layer_pipes::read): Change conditional to an assert.
-	Add assert.
-	(transport_layer_pipes::write): Ditto.
-	(transport_layer_pipes::connect): Change return type.  Change
-	conditional to an assert.  Add asserts.  Rationalize error code
-	slightly.
-	(transport_layer_pipes::impersonate_client): Add asserts.
-	* include/cygwin/cygserver_transport_sockets.h
-	(transport_layer_sockets::listen): Change return type.
-	(transport_layer_sockets::connect): Ditto.
-	(transport_layer_sockets::_addr): Change type of field.
-	(transport_layer_sockets::_addr_len): Ditto.
-	(transport_layer_sockets::_is_accepted_endpoint): New field.
-	(transport_layer_sockets::_is_listening_endpoint): Ditto.
-	* cygserver_transport_sockets.cc
-	(MAX_CONNECT_RETRY): New constant.
-	(transport_layer_sockets::transport_layer_sockets): Initialise new
-	fields.  Only initialise the socket address where necessary.
-	(transport_layer_sockets::listen): Change return type.  Rewrite.
-	(transport_layer_sockets::accept): Add asserts.  Add tracing
-	statements.  Use a local variable to hold the accepted address.
-	(transport_layer_sockets::close): Add tracing statements.  Unlink
-	the UNIX domain socket file as appropriate.  Close the socket
-	cleanly.
-	(transport_layer_sockets::read): Rewrite method.
-	(transport_layer_sockets::write): Ditto.
-	(transport_layer_sockets::connect): Change return type.  Rewrite.
-	* cygserver.cc (server_submission_loop::request_loop): Run the
-	listening thread at high priority with special handling for
-	shutdown.
-	(main): Print the request error code rather than errno in shutdown
-	request code.  Install signal handlers with sigaction(2) to avoid
-	setting SA_RESTART.  Check value of the listen method call, now it
-	has one.
-	* cygserver_client.cc (client_request::make_request): Check new
-	return value on connect method call.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/cygwin/cygserver_transport_pipes.h
-	(cygserver_transport_pipes::_sd): Rename field.
-	(cygserver_transport_pipes::_sec_none_nih): Ditto.
-	(cygserver_transport_pipes::_sec_all_nih): Ditto.
-	(cygserver_transport_pipes::_pipe_name): Ditto.
-	(cygserver_transport_pipes::_hPipe): Ditto.
-	(cygserver_transport_pipes::_is_accepted_endpoint): Ditto.
-	* cygserver_transport_pipes.cc
-	(transport_layer_pipes::transport_layer_pipes): Rename fields.
-	(transport_layer_pipes::init_security): Ditto.
-	(transport_layer_pipes::listen): Ditto.
-	(transport_layer_pipes::accept): Ditto.
-	(transport_layer_pipes::close): Ditto.
-	(transport_layer_pipes::read): Ditto.
-	(transport_layer_pipes::write): Ditto.
-	(transport_layer_pipes::connect): Ditto.
-	(transport_layer_pipes::impersonate_client): Ditto.
-	(transport_layer_pipes::revert_to_self): Ditto.
-	* include/cygwin/cygserver_transport_sockets.h
-	(cygserver_transport_sockets::_fd): Rename field.
-	(cygserver_transport_sockets::_addr): Ditto.
-	(cygserver_transport_sockets::_addr_len): Ditto.
-	* cygserver_transport_sockets.cc
-	(transport_layer_sockets::transport_layer_sockets): Rename fields.
-	(transport_layer_sockets::listen): Ditto.
-	(transport_layer_sockets::accept): Ditto.
-	(transport_layer_sockets::close): Ditto.
-	(transport_layer_sockets::read): Ditto.
-	(transport_layer_sockets::write): Ditto.
-	(transport_layer_sockets::connect): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.cc (with_strerr): Fix use of %p format.
-	* shm.cc (client_shmmgr::shmat): Ditto.
-	(client_shmmgr::shmctl): Ditto.
-	(client_shmmgr::shmdt): Ditto.
-	(client_shmmgr::attach): Ditto.
-
-2002-09-22  Christopher Faylor  <cgf@redhat.com>
-
-	* woutsup.h (system_printf): Remove extraneous semicolon from macro
-	definition.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_transport_pipes.cc
-	(transport_layer_pipes::connect): Use ProtectHandle in DLL code.
-	(transport_layer_pipes::close): Use ForceCloseHandle in DLL code.
-
-2002-09-22  Nicholas Wourms  <nwourms@netscape.com>
-
-	* threaded_queue.h (class queue_submission_loop): Correct friend
-	declaration for GCC 3.1.1.
-	* include/cygwin/cygserver_process.h (class process): Ditto.
-	(class process_cache): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.cc (server_shmmgr::shmdt): Only call
-	delete_segment if the segment exists [sic].
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* safe_memory.h: Include <new> rather than <new.h> for gcc 3.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* safe_memory.h: New file extracted from "woutsup.h".
-	* woutsup.h: Move the "safe" new/delete macros into the new
-	"safe_memory.h" header file and include that here.
-	* cygserver_client.cc: Explicitly include "safe_memory.h" for
-	client-side code.
-	(client_request::make_request): Use the "safe" new/delete macros
-	unconditionally, i.e. use them on the client side as well as on
-	the server side.
-	* cygserver_transport.cc: Explicitly include "safe_memory.h" for
-	client-side code.
-	(create_server_transport): Use the "safe" new/delete macros
-	unconditionally, i.e. use them on the client side as well as on
-	the server side.
-	* shm.cc: Include "safe_memory.h".
-	(client_shmmgr::instance): Use the "safe" new/delete macros.
-	(client_shmmgr::shmdt): Ditto.
-	(client_shmmgr::new_segment): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_process (process::process): Add the client's cygpid
-	and winpid to all tracing statements as appropriate.
-	(process::exit_code): Ditto.
-	(process_cache::check_and_remove_process): Ditto.
-	* cygserver_shm.cc (server_shmmgr::shmat): Ditto.
-	(server_shmmgr::shmdt): Ditto.
-	(server_shmmgr::shmctl): Add a process object argument and remove
-	the explicit cygpid argument.  Add the client's cygpid and winpid
-	to all tracing statements as appropriate.
-	(server_shmmgr::shmget): Ditto.
-	(client_request_shm::serve): Update for the new signature of the
-	shmctl and shmget methods.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver.cc (client_request_shutdown::serve): Don't set the
-	shutdown flag directly, but send a SIGINT, as the signal handler
-	sets the flag and the signal breaks the pause(2) in the main loop.
-	(print_usage): Add new options.
-	(main): Add new --cleanup-threads and --request-threads options to
-	set the number of threads used by the daemon.  Use pause(2) rather
-	the win32 Sleep in the main loop.
-	* shm.cc (shmat): Add sigframe.
-	(shmctl): Ditto.
-	(shmdt): Ditto.
-	(shmget): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.cc: Automatically detach processes from any
-	segments they are attached to at exit.
-	(class server_shmmgr::attach_t): New class.
-	(server_shmmgr::segment_t::IS_DELETED): Rename and make private.
-	(server_shmmgr::segment_t::_sequence): Make private.
-	(server_shmmgr::segment_t::_flg): Ditto.
-	(server_shmmgr::segment_t::_hFileMap): Ditto.
-	(server_shmmgr::segment_t::_attach_head): New private field.
-	(server_shmmgr::segment_t::segment_t): Initialise new fields.
-	Make non-inline.
-	(server_shmmgr::segment_t::~segment_t): New method.
-	(server_shmmgr::segment_t::is_deleted): Ditto.
-	(server_shmmgr::segment_t::is_pending_delete): Ditto.
-	(server_shmmgr::segment_t::mark_deleted): Ditto.
-	(server_shmmgr::segment_t::attach): Ditto.
-	(server_shmmgr::segment_t::detach): Ditto.
-	(server_shmmgr::segment_t::find): Ditto.
-	(class server_shmmgr::cleanup_t): New class.
-	(server_shmmgr::_shm_atts): New private field.
-	(server_shmmgr::shmat): Add a process object argument to replace
-	the removed process_cache, cygpid and winpid arguments.  Remove
-	the process_cache manipulations.  Move body of code to the
-	segment_t::attach method.  Increment _shm_atts when required.
-	Update tracing statements.
-	(server_shmmgr::shmdt): Add a process object argument to replace
-	the removed cygpid argument.  Move body of code to the
-	segment_t::detach method.  Decrement _shm_atts when required.
-	Update tracing statements.
-	(server_shmmgr::shmget): Use the new segment_t::is_deleted method.
-	(server_shmmgr::server_shmmgr): Initialise the new _shm_atts
-	field.
-	(server_shmmgr::delete_segment): Remove the CloseHandle code, as
-	this is now done in the segment_t destructor.
-	(client_request_shm::serve): Look up the client's process object
-	and pass to the server_shmmgr::shmat and server_shmmgr::shmdt
-	methods rather than passing the cache, winpid and cygpid.
-	* cygserver_process.h: Add a cygpid to the process object to make
-	it more useful and then pass process objects rather than winpids
-	where possible.
-	(cleanup_routine::cleanup): Change argument to be a pointer to a
-	process object.
-	(class process): Re-order fields for no discernible reason.
-	(process::_cygpid): New field.
-	(process::process): Add a cygpid argument.
-	(process::winpid): New method.
-	(process::cygpid): Ditto.
-	(process::add): Make public, as it always should have been.
-	(process_cache::process): Add a cygpid argument.
-	* cygserver_process.cc (process::process): Add a cygpid argument
-	and use it to initialise the `_cygpid' field.  Re-order
-	initialisers to match new field order.
-	(process::cleanup): Pass `this' rather than just the winpid to
-	cleanup_routine::cleanup.
-	(process_cache::process): Add a cygpid argument and pass it to the
-	process object constructor.
-	* include/sys/shm.h (shmatt_t): Make unsigned as per SUSv3.
-	(shm_info::shm_atts): New field.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.cc (class server_shmmgr::segment_t): Add `_'
-	prefix to the names of all fields.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* msg.cc: New file of stub functions, no functionality.
-	* sem.cc: Ditto.
-	* shm.cc (client_shmmgr::shmctl): Add support for an out shm_info
-	buffer for the SHM_INFO command.
-	(client_shmmgr::shmget): Use %X to print keys.
-	* include/sys/ipc.h: Comment all fields and values.
-	(IPC_PRIVATE): Change to be non-negative.
-	* include/sys/msg.h: New file with SUSv3 and ipcs(8) interfaces.
-	* include/sys/sem.h: Ditto.
-	* include/sys/shm.h: Comment all fields and values.
-	(struct shm_info): New struct.
-	* cygserver_shm.h (client_request_shm::shminfo): Rename.
-	(client_request_shm::shm_info): New method.
-	(client_request_shm::_parameters.out.hFileMap): Move into union.
-	(client_request_shm::_parameters.out.shminfo): Rename.
-	(client_request_shm::_parameters.out.shm_info): New field.
-	* cygserver_shm.cc (server_shmmgr::_shm_ids): Rename.
-	(server_shmmgr::_shm_tot): New field.
-	(server_shmmgr::shmctl): Rename `out_shminfo' argument.  Add
-	`out_shm_info' argument.  Fill in the `out_shm_info' argument in
-	the SHM_INFO command.
-	(server_shmmgr::shmget): Check `shmflg' against the mode of
-	existing segments as per Stevens 1990, p. 123.
-	(server_shmmgr::server_shmmgr): Initialise the new `_shm_tot'
-	field.
-	(server_shmmgr::new_segment): Set ENOMEM if CreateFileMapping
-	fails.  Pass `size' to new_segment.
-	(server_shmmgr::new_segment): Add size argument and use it to
-	check against and update the new `_shm_tot' field.
-	(server_shmmgr::delete_segment): Update the new `_shm_tot' field.
-	* Makefile.in (DLL_OFILES): Add new DLL object files.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_transport_pipes.cc: The main change is to make the
-	client try harder to connect to the server if it's previously
-	connected, and so has good grounds for believing that the server
-	is running.
-	(MAX_WAIT_NAMED_PIPE_RETRY): Change to be an enumerator.
-	(WAIT_NAMED_PIPE_TIMEOUT): Ditto.
-	(transport_layer_pipes::accept): Use interlocked operators on
-	`pipe_instance'.
-	(transport_layer_pipes::close): Rearrange so that FlushFileBuffers
-	and DisconnectNamedPipe are only called for accepted endpoints.
-	Use interlocked operators on `pipe_instance'.
-	(transport_layer_pipes::read): Use set_errno where required.
-	(transport_layer_pipes::write): Ditto.
-	(transport_layer_pipes::connect): Add local static variable
-	`assume_cygserver'.  Set it if a connection is made to cygserver,
-	clear it if a connection is not made even after retrying.  If set,
-	ignore all errors from CreateFile and retry the connection.  Catch
-	the situation where WaitNamedPipe fails to wait [sic] and add a
-	`Sleep (0)' so that the server gets a chance to run.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* dcrt0.cc: Only check for cygserver if and when required.
-	(dll_crt0_1): Remove call to `cygserver_init ()'.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Change the cygserver
-	logic to allow for the fact that `cygserver_init ()' may not yet
-	have been called.
-	(fhandler_tty_slave::cygserver_attach_tty): Tweak the cygserver
-	request logic to conform to the practice elsewhere in the code.
-	* tty.cc (tty::common_init): Add an explicit call to
-	`cygserver_init ()' if it hasn't already been called.
-	* include/cygwin/cygserver.h (CYGSERVER_UNAVAIL): Rename from
-	`CYGSERVER_DEAD'.
-	(client_request_get_version::check_version): Make available in
-	cygserver as well the DLL.
-	(check_cygserver_available): Ditto.  Remove `check_version_too'
-	argument.
-	(cygserver_init): Ditto.  And likewise.
-	* cygserver_client.cc (client_request_get_version::check_version):
-	Make available in cygserver as well the DLL.
-	(client_request::make_request): This may now be called without
-	`cygserver_init ()' having been called first.  Detect this and
-	call it as required.  Add tracing.
-	(check_cygserver_available): Make available in cygserver as well
-	the DLL.  Remove `check_version_too' argument and always check the
-	version information.  And since this is called from within
-	`cygserver_init ()', force `cygserver_running' before calling
-	`client_request::make_request ()'.
-	(cygserver_init): Make available in cygserver as well the DLL.
-	Remove `check_version_too' argument.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.cc: Implement the ipcs(8) interfaces, IPC_INFO,
-	SHM_STAT and SHM_INFO.
-	(server_shmmgr::segment_t::sequence): New static field.
-	(server_shmmgr::segment_t::key): Remove field, use the new
-	ds.shm_perm.key field instead.
-	(server_shmmgr::segment_t::shmid): Remove field.
-	(server_shmmgr::segment_t::intid): New field.
-	(server_shmmgr::segment_t::segment_t): Use the `key' argument to
-	initialise `ds.shm_perm.key'.  Change from using `shmid' to
-	`intid'.
-	(server_shmmgr::_shmseg_cnt): Renamed from `_shmid_cnt'.
-	(server_shmmgr::_intid_max): Renamed from `_shmid_max.
-	(server_shmmgr::shmat): Move the out arguments to the start of the
-	argument list.  Rename the `pid' argument as `cygpid'.  Add
-	tracing.  Pass an intid to `find ()', not a shmid.
-	(server_shmmgr::shmctl): Add separate out arguments.  Rename the
-	`pid' argument as `cygpid'.  Add support for the ipcs(8)
-	interfaces.  Add tracing.  Pass an intid to `find ()', not a
-	shmid.
-	(server_shmmgr::shmdt): Rename the `pid' argument as `cygpid'.
-	Add tracing.  Pass an intid to `find ()', not a shmid.
-	(server_shmmgr::shmget): Add a separate out arguments.  Rename the
-	`pid' argument as `cygpid'.  Add tracing.
-	(server_shmmgr::server_shmmgr): Update for new field names.
-	(server_shmmgr::find_by_key): Update for the new `ds.shm_perm.key'
-	field.
-	(server_shmmgr::find): Update to use the new `segment_t::intid'
-	field.
-	(server_shmmgr::new_segment): Rename the `pid' argument as
-	`cygpid'.  Check that the requested size is within bounds.  Handle
-	new error result from `new_segment (key, HANDLE)'.
-	(server_shmmgr::new_segment): Work with intids, not shmids.  Check
-	that the new intid is within bounds.  Update for new field names.
-	(server_shmmgr::delete_segment): Pass an intid to `find ()', not a
-	shmid.  Update for new field names.
-	(client_request_shm::serve): Check that the incoming message
-	length is the size of the `_parameters.in' struct, not of the
-	whole in/out parameter union.  Likewise, set the outgoing message
-	length to the size of the `_parameters.out' struct.  Update for
-	the new server_shmmgr interfaces.
-	* include/sys/ipc.h (ipc_perm::key): New field.
-	* include/sys/shm.h (SHM_INFO): New constant.
-	* cygserver_ipc.h (IPCMNI): New constant.
-	(ipc_int2ext): Add `sequence' argument and munge this into the
-	external ipc id.
-	(ipc_ext2int_subsys): Unmunge the sequence number from the
-	external ipc id.
-	(ipc_ext2int): Ditto.
-	(ipc_inc_id): Remove.
-	(ipc_dec_id): Remove.
-	* cygserver_shm.h (SHMMAX): New constant.
-	(SHMMIN): Ditto.
-	(SHMMNI): Ditto.
-	(SHMSEG): Ditto.
-	(SHMALL): Ditto.
-	(client_request_shm::_parameters): Re-arrange as a union of two
-	separate structs, one for in arguments, the other for out.
-	(client_request_shm::shmid): Update for the new parameter layout.
-	(client_request_shm::ds): Ditto.
-	(client_request_shm::info): New method.
-	* shm.cc (client_shmmgr::_shmat_cnt): New static field.
-	(client_shmmgr::shmat): Add locking.  Add tracing.
-	(client_shmmgr::shmctl): Update for ipcs(8) commands.  Add
-	tracing.  Add more argument checking.
-	(client_shmmgr::shmdt): Add locking.  Add tracing.  Update the new
-	`_shmat_cnt' field.
-	(client_shmmgr::shmget): Add tracing.
-	(client_shmmgr::fixup_shms_after_fork): Add tracing.  Add
-	consistency checking.
-	(client_shmmgr::attach): Add more tracing.
-	(client_shmmgr::new_segment): Update the new `_shmat_cnt' field.
-	(client_request_shm::client_request_shm): Update for the new
-	parameter layout.  Set the outgoing message length to the size of
-	the `_parameters.in' struct, not of the whole in/out parameter
-	union.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* shm.cc: Remove the use of a static client_shmmgr object.
-	(client_shmmgr::_instance): New static variable.
-	(client_shmmgr::instance): Allocate a new shmmgr on the heap,
-	rather than using a local static object.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_transport.cc (create_server_transport): Fix
-	cut-and-paste error.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_client.cc (client_request::handle_request): Don't
-	bother with the client request activity marker when compiled with
-	debugging output.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_transport_pipes.cc
-	(MAX_WAIT_NAMED_PIPE_RETRY): New constant.
-	(WAIT_NAMED_PIPE_TIMEOUT): Ditto.
-	(transport_layer_pipes::close): The `pipe' field is now either
-	NULL or a valid handle, and it should never have the value
-	`INVALID_HANDLE_VALUE'.
-	(transport_layer_pipes::read): Ditto.
-	(transport_layer_pipes::write): Ditto.
-	(transport_layer_pipes::connect): Ditto.
-	(transport_layer_pipes::impersonate_client): Ditto.
-	(transport_layer_pipes::connect): Ditto.  New, but still bogus,
-	retry logic.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.cc (server_shmmgr::server_shmmgr): All fields have
-	to be initialized now that the singleton is no longer static.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.cc (server_shmmgr::_instance): New static field.
-	(server_shmmgr::_instance_once): Ditto.
-	(server_shmmgr::initialise_instance): New static method.
-	(server_shmmgr::instance): Use a pthread_once_t rather than
-	relying on a local static variable.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* woutsup.h: Remove all uses of the C++ new and delete operators
-	throughout cygserver until they are fully thread-safe.
-	(safe_new0): New macro to replace the C++ new operator.
-	(safe_new): Ditto.
-	(safe_delete): New macro to replace the C++ delete operator.
-	* cygserver_client.cc (client_request::handle_request): Replace
-	all uses of the C++ new and delete operators with the new macros
-	from "woutsup.h".
-	(client_request::make_request): Ditto.
-	* cygserver_process.cc (~process_cleanup): Ditto.
-	(process::cleanup): Ditto.
-	(process_cache::process): Ditto.
-	(process_cache::check_and_remove_process): Ditto.
-	* cygserver_shm.cc (server_shmmgr::new_segment): Ditto.
-	(server_shmmgr::delete_segment): Ditto.
-	* cygserver_transport.cc (create_server_transport): Ditto.
-	* cygserver_transport_pipes.cc
-	(transport_layer_pipes::accept): Ditto.
-	* cygserver_transport_sockets.cc
-	(transport_layer_sockets::accept): Ditto.
-	* threaded_queue.cc (~threaded_queue): Ditto.
-	(threaded_queue::worker_loop): Ditto.
-	(threaded_queue::stop): Replace sleep(3) with win32 Sleep.
-	* cygserver.cc (~server_request): Replace all uses of the C++ new
-	and delete operators with the new macros from "woutsup.h".
-	(server_submission_loop::request_loop): Ditto.
-	(main): Ditto.  Replace sleep(3) with win32 Sleep.  Replace
-	iostreams with FILEs.
-	(print_usage): Replace iostreams with FILEs.
-	(print_version): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_transport_sockets.cc
-	(transport_layer_sockets::accept): Rename local variable
-	`accept_fd' to avoid shadowing the `fd' field.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygwin_ipc.h: Moved (back) to "include/sys/ipc.h".
-	* cygwin_shm.h: Moved (back) to "include/sys/shm.h".
-	* include/sys/ipc.h: New file.
-	* include/sys/shm.h: New file.
-	* cygserver_shm.h: Update for new header file locations.
-	* ipc.cc: Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_client.cc (client_request::make_request): Comment out
-	a verbose tracing statement.
-	* cygserver_process.cc (process_cache::sync_wait_array): Fix
-	broken assert.
-	* include/cygwin/cygserver.h (class client_request): Remove excess
-	use of `class' qualifier in declarations.
-	(class client_request_get_version): Ditto.
-	(class client_request_shutdown): Ditto.
-	(class client_request_attach_tty): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_ipc.h: New file.
-	* cygserver_shm.h: Re-written from scratch.
-	* cygserver_shm.cc: Ditto.
-	* shm.cc: Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* threaded_queue.h (class queue_request): Re-write.
-	(threaded_queue_thread_function): Remove.
-	(class queue_process_param): Remove.
-	(class threaded_queue): Re-write.
-	(class queue_submission_loop): New version of the old
-	`queue_process_param' class.
-	(TInterlockedExchangePointer): New templated function.
-	(TInterlockedCompareExchangePointer): Ditto.
-	* threaded_queue.cc (worker_function): Remove.
-	(class threaded_queue): Re-write.
-	(class queue_process_param): Remove.
-	(class queue_submission_loop): New version of the old
-	`queue_process_param' class.
-	* include/cygwin/cygserver_process.h (process_cleanup): Re-write.
-	(class process_process_param): Remove.
-	(class cleanup_routine): Re-write.
-	(class process): Re-write.
-	(class process_cache): Re-write.
-	* cygserver_process.cc (process_cleanup): Re-write.
-	(class process_process_param): Remove.
-	(class cleanup_routine): Re-write.
-	(class process): Re-write.
-	(class process_cache): Re-write.
-	* cygserver.cc (request_count): Remove unused variable.
-	(class server_request): Move methods inline.
-	(class server_process_param): Remove.
-	(class server_request_queue): Remove.
-	(request_queue): Move into `main ()' and change type to
-	`threaded_queue'.
-	(request_loop): Remove.
-	(class server_submission_loop): New version of the old
-	`server_process_param' class.
-	(shutdown_server): New variable.
-	(client_request_shutdown::serve): Set `shutdown_server' to trigger
-	shutdown.
-	(handle_signal): Ditto.
-	(main): Install signal handler for SIGINT rather than SIGQUIT.
-	Use new interfaces for the `request_queue' and the `cache'.
-	Create a `server_submission_loop' and add to the `request_queue'.
-	Add check for the `shutdown_server' variable to the main loop.
-	* cygserver_shm.cc (client_request_shm::serve): Release the
-	process object after use.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_client.cc (client_request::handle_request): Correct
-	tracing statement.
-	* cygserver_transport_pipes.cc: Remove local definition of
-	FILE_FLAG_FIRST_PIPE_INSTANCE constant.
-	* cygwin_ipc.h: Update copyright notice.
-	* cygwin_shm.h: Ditto.
-	* woutsup.h: Add definition of _WIN32_WINNT.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_client (client_request::make_request): Replace my
-	inappropriate use of set_errno () with error_code () throughout.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/cygwin/cygserver.h: Add forward declarations of class
-	transport_layer_base and class process_cache to reduce
-	dependencies between header files.
-	* include/cygwin/cygserver_process.h: Add include of
-	"threaded_queue.h".
-	* cygserver.cc: Remove unnecessary cygserver header files.
-	* cygserver_client.cc: Ditto.
-	* cygserver_process.cc: Ditto.
-	* cygserver_shm.cc: Ditto.
-	* cygserver_shm.h: Ditto.
-	* cygserver_transport_pipes.cc: Ditto.
-	* dcrt0.cc: Ditto.
-	* fhandler_tty.cc: Ditto.
-	* tty.cc: Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.h: Replace <sys/shm.h> with "cygwin_shm.h" after
-	merge from HEAD.
-	* cygwin_ipc.h: Update with changes to include/sys/ipc.h lost in
-	merge from HEAD.
-	* cygwin_shm.h: Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver.cc: The tests for a duplicate server instance are now
-	the responsibility of the transport layer.
-	(request_loop): Use new `recoverable' flag in call to
-	`cygserver_transport::accept ()' and shutdown on an unrecoverable
-	error.
-	(main): Never call `cygserver_init ()'.  Fake `cygserver_running'
-	just for sending a shutdown request.
-	* cygserver_client.cc (client_request::send): Comment out
-	message-size tracing statements as verbose.
-	(client_request::handle): Ditto.
-	(client_request_get_version::check_version): #ifdef as DLL-only.
-	(check_cygserver_available): Ditto.
-	(cygserver_init): Ditto.
-	* include/cygwin/cygserver.h
-	(client_request_get_version::check_version): #ifdef as DLL-only.
-	(check_cygserver_available): Ditto.
-	(cygserver_init): Ditto.
-	* include/cygwin/cygserver_transport.h
-	(transport_layer_base::impersonate_client): #ifdef as
-	cygserver-only.
-	(transport_layer_base::revert_to_self): Ditto.
-	(transport_layer_base::listen): Ditto.
-	(transport_layer_base::accept): Ditto.  Add a `recoverable' out
-	flag for error handling.
-	* include/cygwin/cygserver_transport_sockets.h: Ditto.
-	* include/cygwin/cygserver_transport_pipes.h: Ditto.
-	(transport_layer_pipes): Change type of the `pipe_name' field.
-	Remove the `inited' field, as unnecessary.  Add new
-	`is_accepted_endpoint' field.
-	* include/cygwin/cygserver_transport.cc
-	(transport_layer_base::impersonate_client): #ifdef as
-	cygserver-only.
-	(transport_layer_base::revert_to_self): Ditto.
-	* include/cygwin/cygserver_transport_sockets.cc
-	(transport_layer_sockets::listen): #ifdef as cygserver-only.
-	(transport_layer_sockets::accept): #ifdef as cygserver-only.
-	Analyse any errno from `accept ()' and set `recoverable' as
-	appropriate.
-	* cygserver_transport_pipes.cc: Add local #define of
-	`FILE_FLAG_FIRST_PIPE_INSTANCE'.
-	(pipe_instance_lock_once): New variable.
-	(pipe_instance_lock): Ditto.
-	(pipe_instance): Ditto.
-	(initialise_pipe_instance_lock): New function.
-	(transport_layer_pipes::transport_layer_pipes): Change
-	initialization of `pipe_name'.  Initialize `is_accepted_endpoint'
-	as appropriate.  Remove use of `inited'.
-	(transport_layer_pipes::impersonate_client): #ifdef as
-	cygserver-only.
-	(transport_layer_pipes::revert_to_self): Ditto.
-	(transport_layer_pipes::listen): Ditto.
-	(transport_layer_pipes::accept): Ditto.  Keep track of how often
-	many named pipes have been created, in the `pipe_instance'
-	variable, and pass the `FILE_FLAG_FIRST_PIPE_INSTANCE' flag on the
-	open of the first instance.  Analyse the error code from
-	`CreateNamedPipe ()' and set the `recoverable' flag as
-	appropriate.
-	(transport_layer_pipes::close): Update the `pipe_instance' count.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* woutsup.h (cygserver_running): Add declaration.
-	(api_fatal): Eliminate.
-	* include/cygwin/cygserver.h
-	(client_request_get_version::check_version): Change return type to
-	bool.
-	(check_cygserver_available): New function.
-	(cygserver_init): Add check_version_too argument.
-	* cygserver_client.cc (allow_daemon): Make a bool.
-	(client_request_get_version::make_request): See errno on error.
-	Remove special case for CYGSERVER_REQUEST_GET_VERSION; this is now
-	handled in cygserver_init().
-	(client_request_get_version::check_version): Use syscall_printf()
-	instead of api_fatal(). Return true if cygserver version is
-	compatible.
-	(check_cygserver_available): New function; code moved here from
-	cygserver_init().
-	(cygserver_init): Move some code into check_cygserver_available().
-	* cygserver.cc (__set_errno): Copy from debug.cc so that
-	set_errno() can be used when __OUTSIDE_CYGWIN__.
-	(main): Call cygserver_init() to set up cygserver_running and add
-	checks against this to (try and) prevent multiple copies of
-	cygserver running simultaneously.  Remember to delete all
-	transport connections so that (one day) the transport classes can
-	tidy up on cygserver shutdown.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver.cc (main): Adjust tracing output for a cleaner display
-	when compiled without --enable-debugging.
-	* threaded_queue.cc (threaded_queue::cleanup): Ditto.
-	(queue_process_param::stop): Ditto.
-	* include/cygwin/cygserver.h
-	(client_request::make_request): Make non-virtual.
-	(client_request::send): Make virtual and protected, not private.
-	(client_request_attach_tty::send): New virtual method.
-	* cygserver_client.cc: Use the `msglen()' accessor rather than
-	`_header.msglen' throughout.
-	(client_request_attach_tty::send): New method.
-	(client_request::make_request): Remove the explicit close of
-	`transport' as it is closed on deletion.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/cygwin/cygserver.h: Change the client_request classes to
-	give greater encapsulation and to allow variable length requests
-	and replies.
-	(enum cygserver_request_code): Now client_request::request_code_t.
-	(class request_header): Now client_request::header_t.  Make a
-	union of the request_code and the error_code.  The `cb' field,
-	which was the buffer length, is now the `size_t msglen' field.
-	(struct request_get_version): Now
-	client_request_get_version::request_get_version.
-	(struct request_shutdown): Remove unused type.
-	(struct request_attach_tty): Now
-	client_request_attach_tty::request_attach_tty.
-	(client_request::_buf): Make field const.
-	(client_request::_buflen): New const private field.
-	(client_request::request_code): New accessor.
-	(client_request::error_code): Ditto.
-	(client_request::msglen): Ditto.
-	(client_request::handle_request): New static method.
-	(client_request::make_request): New virtual method.
-	(client_request::handle): New method.
-	(client_request::send): Make private.
-	(client_request_get_version::check_version): New method.
-	(client_request_get_version::serve): Make private.
-	(client_request_get_version::version): Ditto.
-	(client_request_shutdown::serve): Ditto.
-	(client_request_attach_tty::req): Ditto.
-	(client_request_attach_tty::serve): Ditto.
-	(client_request_attach_tty::from_master): Make method const.
-	(client_request_attach_tty::from_master): Ditto.
-	* cygserver_client.cc
-	(client_request_get_version::client_request_get_version): Track
-	changes to the client_request classes.
-	(client_request_attach_tty::client_request_attach_tty): Ditto.
-	(client_request_get_version::check_version): New method to
-	encapsulate code from cygserver_init().
-	(client_request_shutdown::client_request_shutdown): Move into
-	"cygserver.cc".
-	(client_request::send): Track changes to the client_request
-	classes.  Add more error checking.
-	(client_request::handle_request): New static method containing the
-	first half of the old server_request::process() code.
-	(client_request::make_request): New method to replace the old
-	cygserver_request() function.
-	(client_request::handle): New method containing the second half of
-	the old server_request::process() code.
-	(cygserver_init): Track changes to the client_request classes.  In
-	particular, some code moved into the
-	client_request_get_version::check_version() method.
-	* cygserver.cc (client_request_attach_tty::serve): Track changes
-	to the client_request classes.  In particular, only return a reply
-	body if some handles are successfully duplicated for the client.
-	And remove goto's.
-	(client_request_get_version::serve): Track changes to the
-	client_request classes.
-	(client_request_shutdown::serve): Ditto.
-	(class client_request_invalid): Dead, and so young too.
-	(server_request::request_buffer): Remove unnecessary field.
-	(client_request_shutdown::client_request_shutdown): Moved here
-	from "cygserver_client.cc".
-	(server_request::process): Implementation moved into the new
-	client_request::handle_request() and client_request::handle()
-	methods.
-	* cygserver_shm.h (class client_request_shm): Put client- and
-	server-specific interfaces inside #ifdef/#ifndef __INSIDE_CYGWIN__
-	guards.
-	(client_request_shm::serve): Make private.
-	* cygserver_shm.cc
-	(client_request_shm::client_request_shm): Track changes to the
-	client_request classes.
-	(client_request_shm::serve): Ditto
-	* shm.cc (client_request_shm::client_request_shm): Ditto.  Use
-	alloc_sd() rather than set_security_attribute() to get access to
-	the SECURITY_DESCRIPTOR length, so that we can use it to set the
-	request body length.
-	(shmat): Track changes to the client_request classes. In
-	particular, allocate client_request objects on the stack rather
-	than on the heap, and use the client_request::make_request()
-	method rather than the old cygserver_request() function.
-	(shmdt): Ditto.
-	(shmctl): Ditto.
-	(shmget): Ditto.
-	* fhandler_tty.cc (fhandler_tty_slave::cygserver_attach_tty): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/cygwin/cygserver_transport.h
-	(cygserver_transport::read): Change buffer type to void *.
-	(cygserver_transport::write): Ditto.
-	* include/cygwin/cygserver_transport_sockets.h
-	(cygserver_transport_sockets::read): Ditto.
-	(cygserver_transport_sockets::write): Ditto.
-	* include/cygwin/cygserver_transport_pipes.h
-	(cygserver_transport_pipes::read): Ditto.
-	(cygserver_transport_pipes::write): Ditto.
-	* cygserver_transport_sockets.cc
-	(cygserver_transport_sockets::read): Ditto.
-	(cygserver_transport_sockets::write): Ditto.
-	* cygserver_transport_pipes.cc
-	(cygserver_transport_pipes::read): Ditto. Set errno on error, to
-	match behaviour of cygserver_transport_sockets class.
-	(cygserver_transport_pipes::write): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver.cc (version): New static variable.
-	(server_request_queue::add_connection): Remove my gratuitous use
-	of studly caps.
-	(setup_privileges): Declare static.
-	(handle_signal): Ditto.
-	(longopts): Make a local variable of main().
-	(opts): Ditto.
-	(print_usage): New function.
-	(print_version): Ditto (tip of the hat to Joshua Daniel Franklin
-	for inspiration here).
-	(main): More argument checking.  Add --help and --version options.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/cygwin/cygserver.h (client_request::serve): Make pure
-	virtual.
-	* cygserver.cc (client_request::serve): Remove definition of pure
-	virtual method.
-	(class client_request_invalid): New class.
-	(server_request::process): Use new client_request_invalid
-	class. And remove goto's.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver.cc (class server_request): Add virtual destructor.
-	(server_request_queue::addConnection): New method to replace bad
-	virtual add() method.
-	(request_loop): Replace call to queue->add() with call to
-	queue->addConnection().
-	(server_request::server_request): Use field initialization.
-	(server_request::~server_request): New virtual destructor.
-	(server_request::process): Remove close and delete of
-	transport_layer_base object. It is deleted by the server_request's
-	own destructor and closed by its own destructor.
-	* include/cygwin/cygserver.h
-	(client_request::operator request_header): Remove unused method.
-	* cygserver_client.cc: Ditto.
-	* include/cygwin/cygserver_process.h
-	(class cleanup_routine): Add virtual destructor.
-	(cleanup_routine::cleanup): Make pure virtual.
-	(class process_cache): Make destructor non-virtual.
-	(process_cache::add): Ditto.
-	* cygserver_process.cc
-	(cleanup_routine::~cleanup_routine): New virtual destructor.
-	* include/cygwin/cygserver_transport.h
-	(class transport_layer_base): Add virtual destructor.
-	* cygserver_transport.cc
-	(transport_layer_base::~transport_layer_base): New virtual
-	destructor.
-	* include/cygwin/cygserver_transport_pipes.h
-	(class transport_layer_pipes): Add virtual destructor.
-	* cygserver_transport_pipes.cc
-	(transport_layer_pipes::~transport_layer_pipes): New virtual
-	destructor.
-	(transport_layer_pipes::close): Null out handle after closing.
-	* include/cygwin/cygserver_transport_sockets.h
-	(class transport_layer_sockets): Add virtual destructor.
-	* cygserver_transport_sockets.cc
-	(transport_layer_sockets::~transport_layer_sockets): New virtual
-	destructor.
-	(transport_layer_sockets::close): Null out fd after closing.
-	* threaded_queue.h (class queue_request): Add virtual destructor.
-	(queue_request::process): Make pure virtual.
-	* threaded_queue.cc (~queue_request): New virtual destructor.
-	(queue_request::process): Remove definition of pure virtual
-	method.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/cygwin/cygserver.h (client_request::send): Make
-	non-virtual.
-	(class client_request_attach_tty): Put client- and server-specific
-	interfaces inside #ifdef/#ifndef __INSIDE_CYGWIN__ guards.
-	* cygserver_client.cc: Ditto.
-	(cygserver_init): Fix error handling.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver.cc: Throughout the code, check and correct level of
-	the XXX_printf() functions used. Comment out several of the
-	debug_printf() calls with "// verbose:".  Reformat and correct
-	typos of some of the XXX_printf() formats.
-	* cygserver_process.cc: Ditto.
-	* cygserver_shm.cc: Ditto.
-	* cygserver_transport_pipes.cc: Ditto.
-	* cygserver_transport_sockets.cc: Ditto.
-	* shm.cc (hi_ulong): New function to allow printing of a 64-bit
-	key with current small_printf implementation.
-	(lo_ulong): Ditto.
-	(client_request_shm::client_request_shm): Use hi_ulong() and
-	lo_ulong() in call to debug_printf().
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver_shm.cc: Remove #define __INSIDE_CYGWIN__ from around
-	<sys/shm.h> as it no longer contains any internal code.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/sys/ipc.h (IPC_PRIVATE): Add cast to key_t.
-	(IPC_INFO): New flag for ipcs(8).
-	(IPC_RMID IPC_SET IPC_STAT): Renumber.
-	* include/sys/shm.h (SHM_RDONLY SHM_RND): Renumber with distinct
-	values [sic].
-	(class _shmattach): Internal type moved to "cygserver_shm.h".
-	(class shmnode): Ditto.
-	(class shmid_ds): Ditto.
-	(struct shmid_ds): Add spare fields.
-	(struct shminfo): New type for IPC_INFO interface.
-	* cygserver_shm.h: Remove obsolete #if 0 ... #endif block.
-	(class shm_cleanup): Remove unused class.
-	(struct _shmattach): Internal type moved from <sys/shm.h>.
-	(struct shmnode): Ditto.
-	(struct int_shmid_ds): Ditto. Renamed to avoid name clash with
-	public interface struct shmid_ds. Use the shmid_bs structure as a
-	field.
-	* cygserver_shm.cc: Remove obsolete #if 0 ... #endif block.
-	(client_request_shm::serve): Update for redefinition of
-	int_shmid_ds structure.
-	* shm.cc (build_inprocess_shmds): Ditto.
-	(fixup_shms_after_fork): Ditto.
-	(shmctl): Ditto.
-	(shmget): Ditto. Remove obsolete #if 0 ... #endif code.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/cygwin/cygserver_transport.h
-	(transport_layer_base::transport_layer_base): Remove since it is
-	now redundant.
-	(transport_layer_base::listen): Make a pure virtual method.
-	(transport_layer_base::accept): Ditto.
-	(transport_layer_base::close): Ditto.
-	(transport_layer_base::read): Ditto.
-	(transport_layer_base::write): Ditto.
-	(transport_layer_base::connect): Ditto.
-	* cygserver_transport.cc
-	(transport_layer_base::transport_layer_base): Remove since it is
-	now redundant.
-	(transport_layer_base::listen): Remove since it is now a pure
-	virtual method.
-	(transport_layer_base::accept): Ditto.
-	(transport_layer_base::close): Ditto.
-	(transport_layer_base::read): Ditto.
-	(transport_layer_base::write): Ditto.
-	(transport_layer_base::connect): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygserver.cc (check_and_dup_handle): Only use security code if
-	running on NT, i.e. if wincap.has_security().
-	(client_request_attach_tty::serve): Add check for has_security().
-	* cygserver_process.cc (process_cache::process): Use DWORD winpid
-	throughout to avoid win32 vs. cygwin pid confusion.
-	(process::process): Ditto.
-	* cygserver_shm.cc (client_request_shm::serve): Only use security
-	code if running on NT, i.e. if wincap.has_security().
-	* cygserver_shm.h (client_request_shm::parameters.in): Replace the
-	ambiguous pid field with cygpid and winpid fields.
-	(client_request_shm::client_request_shm): Reduce to only two
-	client-side constructors: one for SHM_CREATE, another for all the
-	other requests.
-	* shm.cc (client_request_shm::client_request_shm):
-	Ditto. Initialize cygpid and winpid fields here. On NT initialize
-	sd_buf here using set_security_attribute() to make use of the euid
-	and egid.
-	(shmat): Use new client_request_shm constructor.
-	(shmdt): Ditto.
-	(shmctl): Ditto.
-	(shmget): Ditto. Remove security code, now performed in the
-	relevant client_request_shm constructor.
-	* include/cygwin/cygserver_process.h: (class cleanup_routine):
-	Change winpid type to DWORD.
-	(class process): Ditto.
-
-2002-09-22  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* woutsup.h: New file.
-	* cygserver.cc: Use "woutsup.h" and new XXX_printf macros.
-	(getfunc): New function, copied verbatim from "strace.cc".
-	(__cygserver__printf): New function.
-	* cygserver_client.cc: Use "woutsup.h" and new XXX_printf macros.
-	* cygserver_process.cc: Ditto.
-	* cygserver_shm.cc: Ditto.
-	* cygserver_transport.cc: Ditto.
-	* cygserver_transport_pipes.cc: Ditto.
-	* cygserver_transport_sockets.cc: Ditto.
-	* threaded_queue.cc: Ditto.
-	* shm.cc: Remove trailing \n from XXX_printf format strings.
-	* Makefile.in: Remove special __OUTSIDE_CYGWIN__ case for
-	cygserver_shm.cc.
-
-2002-09-21  Christopher Faylor  <cgf@redhat.com>
-
-	* init.cc (dll_entry): Temporarily disable thread detach code.
-
-2002-09-21  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::dup): Don't set handle on failure.
-	Caller has already taken care of that.
-	* fhandler_console.cc (fhandler_console::open): Initialize handles to
-	NULL.
-	(fhandler_console::close): Ditto.
-
-2002-09-21  Christopher Faylor  <cgf@redhat.com>
-
-	GNUify non-GNU formatted functions calls throughout.
-
-2002-09-21  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* cygwin_ipc.h: Move to "include/cygwin/ipc.h".
-	* cygwin_shm.h: Move to "include/cygwin/shm.h".
-	* include/cygwin/ipc.h: New file.
-	* include/cygwin/shm.h: New file.
-	* ipc.c:c Update <cygwin/ipc.h> include.
-	* cygserver_shm.cc: Update <cygwin/shm.h> include.
-	* shm.cc: Ditto.
-
-2002-09-21  Robert Collins <rbtcollins@hotmail.com>
-
-	* pthread.cc: Use class::call for converted pthread and semaphore
-	calls.
-	* thread.cc: Convert various __pthread_call and __sem_call to
-	pthread::call and sem::call throughout.
-	* pthread.h (__pthread_cancel): Convert to pthread::cancel.
-	(__pthread_join): Convert to pthread::join.
-	(__pthread_detach): Convert to pthread::detach.
-	(__pthread_create): Convert to pthread::create.
-	(__pthread_once): Convert to pthread::once.
-	(__pthread_atfork): Convert to pthread::atfork.
-	(__pthread_suspend): Convert to pthread::suspend.
-	(__pthread_continue): Convert to pthread::resume.
-	(__sem_init): Convert to semaphore::init.
-	(__sem_destroy): Convert to semaphore::destroy.
-	(__sem_wait): Convert to semaphore::wait.
-	(__sem_trywait): Convert to semaphore::trywait.
-	(__sem_post): Convert to semaphore::post.
-
-2002-09-21  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc: Finish the removal of the separate pthread_key
-	destructor list.
-	Remove all pthread_key_destructor and pthread_key_destructor_list
-	references throughout.
-	(pthread::exit): Call the new pthread_key interface to activate
-	destructors.
-	(pthread_key::keys): Change into a list.
-	(pthread_key::saveAKey): New method, used via forEach.
-	(pthread_key::restoreAKey): Ditto.
-	(pthread_key::destroyAKey): Ditto.
-	(pthread_key::fixup_before_fork): Use the List::forEach functionality.
-	(pthread_key::fixup_after_fork): Ditto.
-	(pthread_key::runAllDestructors): New method implementation.
-	(pthread_key::pthread_key): Use List::Insert rather than custom list
-	code.
-	(pthread_key::~pthread_key): Use List::Remove for the same reason.
-	* thread.h: Remove all pthread_key_destructor and
-	pthread_key_destructor_list references throughout.
-	(List): Move the interface above pthread_key in the header.
-	Use atomic operations during insert and delete.
-	(List::forEach): A generic interface for doing something on each node.
-	(pthread_key::runAllDestructors): New method, run all destructors.
-	(pthread_key::fork_buf): Make private.
-	(pthread_key::run_destructor): Ditto.
-	(pthread_key::saveAKey): New method for clearer source.
-	(pthread_key::restoreAKey): Ditto.
-	(pthread_key::destroyAKey): Ditto.
-	(MTinterface::destructors): Remove.
-
-2002-09-21  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc: Partial refactoring of pthread_key destructor
-	handling. Loosely based on Thomas Pfaff's work.
-	(pthread_key_destructor_list::Insert): Remove.
-	(pthread_key_destructor_list::Pop): Remove.
-	(pthread_key_destructor_list::IterateNull): Call the key's
-	run_destructor method.
-	(pthread_key::pthread_key): Initialize new member.
-	(pthread_key::get): Mark as const for correctness.
-	(pthread_key::run_destructor): Implement.
-	* thread.h (pthread_key::get): Mark as const for correctness.
-	(pthread_key::run_destructor): Declare.
-	(List): New template class that implements a generic list.
-	(pthread_key_destructor_list): Inherit from List, and remove
-	now duplicate functions.
-
-2002-09-21  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc: Change verifyable_object_isvalid calls with
-	PTHREAD_CONDATTR_MAGIC, PTHREAD_MUTEXATTR_MAGIC, PTHREAD_COND_MAGIC,
-	SEM_MAGIC to objecttype::isGoodObject() calls throughout.
-	(pthread_condattr::isGoodObject): Implement.
-	(pthread_mutex::isGoodInitializer): Implement.
-	(pthread_mutex::isGoodInitializerOrObject): Minor bugfix in the
-	check for verifyable_object_isvalid result.
-	(pthread_mutexattr::isGoodObject): Implement.
-	(pthread_cond::isGoodObject): Ditto.
-	(pthread_cond::isGoodInitializer): Ditto.
-	(pthread_cond::isGoodInitializerOrObject): Ditto.
-	(semaphore::isGoodObject): Ditto.
-	* thread.h (pthread_mutex::isGoodInitializer): Declare.
-	(pthread_condattr::isGoodObject): Ditto.
-	(pthread_cond::isGoodObject): Const correctness.
-	(pthread_cond::isGoodInitializer): Declare.
-	(pthread_cond::isGoodInitializerOrObject): Ditto.
-	(semaphore::isGoodObject): Const correctness.
-
-2002-09-21  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc: Change verifyable_object_isvalid calls with
-	PTHREAD_MUTEX_MAGIC and PTHREAD_KEY_MAGIC and PTHREAD_ATTR_MAGIC to
-	::isGoodObject() calls throughout.
-	(MTinterface::Init): Remove dead code.
-	(pthread_attr::isGoodObject): Implement.
-	(pthread_key::isGoodObject): Implement.
-	(pthread_mutex::isGoodObject): Implement.
-	(pthread_mutex::isGoodInitializerOrObject): Implement.
-	(pthread::isGoodObject): Update signature.
-	* thread.h (pthread_key::isGoodObject): Declare.
-	(pthread_attr::isGoodObject): Ditto.
-	(pthread_mutex::isGoodObject): Ditto.
-	(pthread_mutex::isGoodInitializerOrObject): Ditto.
-	(pthread::isGoodObject): Change to a const parameter for const
-	correctness.
-	(pthread_mutexattr::isGoodObject): Declare.
-	(pthread_condattr::isGoodObject): Ditto.
-	(pthread_cond::isGoodObject): Ditto.
-	(semaphore::isGoodObject): Ditto.
-
-2002-09-19  Christopher Faylor  <cgf@redhat.com>
-
-	Cleanup calls to CreateFile throughout.
-	* dcrt0.cc (__api_fatal): Correctly check for failing return from CreateFile.
-	* assert.cc (__assert): Don't check return value from CreateFile for NULL.
-	* fhandler_console.cc (set_console_state_for_spawn): Ditto.
-	* fork.cc (fork_parent): Ditto.
-
-2002-09-18  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::initialized): Avoid copying on fork or some
-	threads may not end up in the pool.
-	(cygthread::new): Avoid race when checking for initialized.  Add
-	debugging code.
-
-2002-09-18  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* fhandler.cc (fhandler_base::raw_read): Add case for
-	ERROR_INVALID_HANDLE due to Win95 directories.
-	(fhandler_base::open): Handle errors due to Win95 directories.
-	(fhandler_base::close): Add get_nohandle () test.
-	(fhandler_base::set_close_on_exec): Ditto.
-	(fhandler_base::fork_fixup): Ditto.
-	(fhandler_base::lock): Change error code to Posix EINVAL.
-	(fhandler_base::dup): If get_nohandle (), set new value to
-	INVALID_HANDLE_VALUE instead of NULL.
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat): Call fstat_by_name
-	if get_nohandle ().  Remove extraneous element from strpbrk.
-	(fhandler_disk_file::open): Remove test for Win95 directory.
-
-	* fhandler_random.cc (fhandler_dev_random::open): Add set_nohandle ().
-	* fhandler_clipboard.cc (fhandler_dev_clipboard::open): Ditto.
-	* fhandler_zero.cc (fhandler_dev_zero::open): Ditto.
-	(fhandler_dev_zero::close): Delete.
-	* fhandler.h (class fhandler_dev_zero): Ditto.
-
-2002-09-17  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (pthread_key::set): Preserve GetLastError(). Reported
-	by Thomas Pffaf.
-
-2002-09-17  Robert Collins  <rbtcollins@hotmail.com>
-
-	This work inspires by Thomas Pfaff's pthread_fork patch (1).
-	* fork.cc (fork_child): Remove MTinterface fixup call, it's
-	adsorbed by pthread::atforkchild.
-	Rename __pthread_atforkchild to pthread::atforkchild to give
-	access to private members.
-	(fork_parent): Rename __pthread_atforkparent to
-	pthread::atforkparent to give it access to private members.
-	Ditto for __pthread_atforkprepare.
-	* thread.cc: Fix some formatting problems throughout.
-	(MTinterface::fixup_before_fork): Implement.
-	(MTinterface::fixup_after_fork): Fix pthread_keys.
-	(pthread_key::keys): Implement.
-	(pthread_key::fixup_before_fork): Ditto.
-	(pthread_key::fixup_after_fork): Ditto.
-	(pthread_key::pthread_key): Add to pthread_key::keys.
-	(pthread_key::~pthread_key): Remove from pthread_key::keys.
-	(pthread_key::saveKeyToBuffer): Implement.
-	(pthread_key::recreateKeyFromBuffer): Ditto.
-	(pthread::atforkprepare): Prepare all MT classes for fork.
-	(pthread::atforkchild): And fix them up afterwards.
-	* thread.h (pthread_key): Buffer the key value during
-	fork in fork_buf.
-	List the keys needing to be fixed up in a linked list with
-	head pthread_key::keys.
-	(pthread): Move atfork cygwin internal calls into the class.
-	(MTInterface): Provide a fixup_before_fork for objecst that
-	need to save state.
-	(__pthread_atforkprepare): Remove.
-	(__pthread_atforkparent): Remove.
-	(__pthread_atforkchild): Remove.
-
-2002-09-16  Christopher Faylor  <cgf@redhat.com>
-
-	* init.cc: Cleanup slightly and remove obsolete code.
-
-2002-09-11  Robert Collins  <rbtcollins@hotmail.com>
-
-	* init.cc (dll_entry): On thread detach, if the thread hasn't
-	exit()ed, do so.
-	* pthread.cc (pthread_getsequence_np): Remove the
-	__pthread_getsequence_np wrapper. This requires errno.h.
-	* thread.cc (pthread::self): Instantiate a new pthread object
-	when called and none exists. return a NULL object if instantiation
-	fails.
-	(pthread::precreate): Factor out common code.
-	(pthread::postcreate): Ditto.
-	(pthread::create): Ditto.
-	(pthread::exit): Remove the TLS value when we exit to prevent
-	double exits.
-	(MTinterface::Init): Bugfix - don't mark the TLS index as created
-	if one was not allocated.
-	Apply Extract Method to move pthread specific initialisation into
-	pthread.
-	(pthread::initMainThread): Extracted method from MTinterface::Init.
-	(pthread::setTlsSelfPointer): Extracted method from various pthread
-	calls, to make reading those functions easier.
-	(pthread::setThreadIdtoCurrent): Ditto.
-	(pthread::cancel_self): Bring into the .cc file, it's only used
-	within the class.
-	(pthread::getThreadId): Ditto.
-	(pthread::thread_init_wrapper): Apply Extract Method to the TLS
-	setting logic.
-	(pthread::isGoodObject): Extracted method from various pthread
-	wrapper calls, for clarity of reading.
-	(pthread::getsequence_np): Converted from __pthread_getsquence_np.
-	(__pthread_create): Apply Extract Method to the object validation.
-	(__pthread_cancel): Ditto.
-	(__pthread_join): Ditto.
-	(__pthread_detach): Ditto.
-	(__pthread_suspend): Ditto.
-	(__pthread_continue): Ditto.
-	(__pthread_getschedparam): Ditto.
-	(__pthread_getsequence_np): Remove.
-	(__pthread_setschedparam): Apply Extract Method to the object
-	validation.
-	(pthreadNull::getNullpthread): New method, return the pthreadNull
-	object.
-	(pthreadNull::pthreadNull): Private constructor to prevent accidental
-	use.
-	(pthreadNull::~pthreadNull): Prevent compile warnings.
-	(pthreadNull::create): Override pthread behaviour.
-	(pthreadNull::exit): Ditto.
-	(pthreadNull::cancel): Ditto.
-	(pthreadNull::testcancel): Ditto.
-	(pthreadNull::setcancelstate): Ditto.
-	(pthreadNull::setcanceltype): Ditto.
-	(pthreadNull::push_cleanup_handler): Ditto.
-	(pthreadNull::pop_cleanup_handler): Ditto.
-	(pthreadNull::getsequence_np): Ditto.
-	(pthreadNull::_instance): Ditto.
-	* thread.h (pthread): Declare pre- and post-create.
-	Move GetThreadId to private scope and rename to getThreadId.
-	Move setThreadIdtoCurrent to private scope.
-	Make create virtual.
-	Make ~pthread virtual.
-	Declare initMainThread.
-	Declare isGoodObject.
-	Make exit virtual.
-	Make cancel virtual.
-	Make testcancel virtual.
-	Make setcancelstate virtual.
-	Make setcanceltype virtual.
-	Make push_cleanup_handler virtual.
-	Make pop_cleanup_handler virtual.
-	Declare getsequence_np.
-	Declare setTlsSelfPointer.
-	(pthreadNull): New null object class for pthread.
-	(__pthread_getsequence_np): Remove.
-
-2002-09-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (seteuid32): Treat ILLEGAL_UID invalid.
-	(setegid32): Treat ILLEGAL_GID invalid.
-
-2002-09-10  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* grp.cc (initgroups): Call groups::clear_supp to free the
-	supplementary group sids that may have been set by setgroups.
-	* security.cc (cygsidlist::free_sids): Also zero the class members.
-	* security.h (groups::clear_supp): New.
-	Rename cygsidlist_unknown to cygsidlist_empty.
-
-2002-09-08  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::open): Don't protect
-	input/output handles since they are not properly manipulated later.
-	* tty.cc (tty::make_pipes): Ditto.
-
-2002-09-06  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.h (_WIN32_WINNT): Protect.
-
-2002-09-06  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.h (_WIN32_WINNT): Define.
-
-2002-09-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (DLL_OFILES): Drop shortcut.o.
-	* path.cc: Move all shortcut functions from shortcut.c to here.
-	(check_shortcut): Implement without using COM interface.
-	* path.h: Move definition of SHORTCUT_HDR_SIZE to here.
-	* shortcut.c: Remove.
-	* shortcut.h: Ditto.
-
-2002-09-03  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* fhandler.h (fhandler_socket::read): Remove method.
-	(fhandler_socket::write): Ditto.
-	(fhandler_socket::readv): New method.
-	(fhandler_socket::writev): Ditto.
-	(fhandler_socket::recvmsg): Add new optional argument.
-	(fhandler_socket::sendmsg): Ditto.
-	* fhandler.cc (fhandler_socket::read): Remove method.
-	(fhandler_socket::write): Ditto.
-	(fhandler_socket::readv): New method.
-	(fhandler_socket::writev): Ditto.
-	(fhandler_socket::recvmsg): Use win32's scatter/gather IO where
-	possible.
-	(fhandler_socket::sendmsg): Ditto.
-	* net.cc (cygwin_recvmsg): Check the msghdr's iovec fields.
-	(cygwin_sendmsg): Ditto.  Add omitted sigframe.
-
-2002-09-02  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* cygwin.din: Revert exporting new wchar functions.
-	* include/cygwin/version.h: Change comment for API minor 62.
-
-2002-09-02  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (dll_crt0_1): Remove getpagesize() call.
-	* shared.cc (memory_init): Move it here.
-
-2002-08-31  Christopher January  <chris@atomice.net>
-
-	* fhandler_proc.cc: Add <sys/param.h> include.
-	(format_proc_uptime): Use KernelTime and UserTime only as they include
-	the other counters.
-	(format_proc_stat): KernelTime includes IdleTime, so subtract IdleTime
-	from KernelTime. Make number of 'jiffies' per second same as HZ define.
-	* fhandler_process.cc: Add <sys/param.h> include.
-	(format_process_stat): Make number of 'jiffies' per second same as
-	HZ define. Use KernelTime and UserTime only to calculate start_time.
-
-2002-08-30  Christopher Faylor  <cgf@redhat.com>
-
-	(inspired by a patch from Egor Duda)
-	* select.cc (fhandler_tty_slave::ready_for_read): Remove.
-	* fhandler.h (fhandler_tty_slave::ready_for_read): Remove declaration.
-	* fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Set "don't
-	need ready for read" flag.
-	(fhandler_tty_slave::read): Don't do anything special with vtime when
-	vmin == 0.
-
-2002-08-30  Egor Duda  <deo@logos-m.ru>
-
-	* autoload.cc (GetConsoleWindow): Correct parameter count.
-
-2002-08-30  Christopher January  <chris@atomice.net>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* tty.cc (tty_list::allocate_tty): Use GetConsoleWindow, if available.
-	Call FindWindow in a loop.
-	* autoload.cc (GetConsoleWindow): Export
-
-2002-08-30  Christopher Faylor  <cgf@redhat.com>
-
-	* miscfuncs.cc (check_iovec_for_read): Don't check buffer when zero
-	length iov_len.
-	(check_iovec_for_write): Ditto.
-
-2002-08-27  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* fhandler.h (fhandler_base::readv): New method.
-	(fhandler_base::writev): Ditto.
-	* fhandler.cc (fhandler_base::readv): New method.
-	(fhandler_base::writev): Ditto.
-	* syscalls.cc (_read): Delegate to readv(2).
-	(_write): Ditto, mutatis mutandi.
-	(readv): Rewrite, based on the old _read code, to use the new
-	fhandler_base::readv method.  Improve access mode handling and ensure
-	all calls reach the final strace statement.
-	(writev): Ditto, mutatis mutandi.
-	* include/sys/uio.h (struct iovec): Change field types to match SUSv3.
-	* winsup.h (check_iovec_for_read): New function.
-	(check_iovec_for_write): Ditto.
-	* miscfuncs.cc (check_iovec_for_read): Ditto.
-	(check_iovec_for_write): Ditto.
-
-2002-08-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din: Add more prototypes for new wchar functions in newlib.
-
-2002-08-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din: Add prototypes for new wchar functions in newlib.
-	* include/cygwin/version.h: Bump API minor number.
-
-2002-08-29  Boris Schaeling  <boriss@web.de>
-	    Corinna Vinschen  <corinna@vinschen.de>
-
-	* poll.cc (poll): Peek sockets ready for read to see if there's
-	actually data.
-
-2002-08-28  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (hthreads): Remove unneeded global.
-	(cygthread::simplestub): New static member function.
-	(cygthread::runner): Don't set hthreads.
-	(cygthread::freerange): New member function.
-	(cygthread::operator new): Call freerange if all cygwin slots are used
-	up.
-	(cygthread::exit_thread): Don't mess with event if freerange thread.
-	(cygthread::detach): Ditto.
-	* cygthread.h (class cygthread): Declare new member functions and
-	variables.
-
-2002-08-28  Christopher Faylor  <cgf@redhat.com>
-
-	* malloc.cc: Protect some definitions to avoid a compile time warning.
-
-2002-08-27  Nicholas Wourms  <nwourms@netscape.net>
-
-	* cygwin.din: Export getc_unlocked, getchar_unlocked,
-	putc_unlocked, putchar_unlocked functions.
-	* include/cygwin/version.h: Bump api minor.
-
-2002-08-28  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::recvfrom): Eliminate flags
-	not understood by WinSock.
-	(fhandler_socket::sendto): Ditto.  If WinSock sendto() returns
-	WSAESHUTDOWN, change errno to EPIPE and raise SIGPIPE if MSG_NOSIGNAL
-	isn't set in flags.
-	* include/cygwin/socket.h: Define MSG_WINMASK and MSG_NOSIGNAL.
-	* include/cygwin/version.h: Bump API minor number.
-
-2002-08-28  Corinna Vinschen  <corinna@vinschen.de>
-
-	* poll.cc (poll): Eliminate erroneous POLLERR conditional.
-
-2002-08-26  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* fhandler_socket.cc (fhandler_socket::check_peer_secret_event):
-	Fix strace message.
-	(fhandler_socket::connect): Remove sigframe.
-	(fhandler_socket::accept): Ditto.
-	(fhandler_socket::getsockname): Ditto.
-	(fhandler_socket::getpeername): Ditto.
-	(fhandler_socket::recvfrom): Ditto.
-	(fhandler_socket::recvmsg): Ditto.
-	(fhandler_socket::sendto): Ditto.
-	(fhandler_socket::sendmsg): Ditto.
-	(fhandler_socket::close): Ditto.
-	(fhandler_socket::ioctl): Ditto.
-	* ioctl.cc (ioctl): Add sigframe.
-	* net.cc (cygwin_sendto): Ditto.
-	(cygwin_recvfrom): Ditto.
-	(cygwin_recvfrom): Ditto.
-	(cygwin_connect): Ditto.
-	(cygwin_shutdown): Ditto.
-	(cygwin_getpeername): Ditto.
-	(cygwin_accept): Ditto.  Improve strace message.
-	(cygwin_getsockname): Ditto.  Ditto.
-	(cygwin_recvmsg): Ditto.  Ditto.
-	(cygwin_sendmsg): Fix strace message.
-
-2002-08-27  Christopher Faylor  <cgf@redhat.com>
-
-	* child_info.h: Add _PROC_WHOOPS enum value.
-	(CURR_CHILD_INFO_MAGIC): Update.
-	(child_info::magic): Make 'long'.
-	* cygheap.h: Export _cygheap_start.
-	* cygheap.cc: Don't declare _cygheap_start.
-	* cygmagic: Use cksum to produce checksums.  Append 'U' to end of
-	checksum.
-	* dcrt0.cc (initial_env): Calculate sleep ms before reusing buffer.
-	(_dll_crt0): Detect cygheap mismatch as indicative of different cygwin
-	version.  Set child_proc_info to NULL when _PROC_WHOOPS.
-	(multiple_cygwin_problem): If child_info specific problem, then set
-	child_proc_info type to _PROC_WHOOPS.
-	* shared_info.h (CURR_MOUNT_MAGIC): Update.
-	(CURR_SHARED_MAGIC): Ditto.
-
-2002-08-25  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* fhandler.h (fhandler_socket::recvfrom): Fix prototype.
-	(fhandler_socket::sendto): Ditto.
-	* fhandler_socket.cc (fhandler_socket::recvfrom): Ditto.
-	(fhandler_socket::sendto): Ditto.
-	* include/sys/socket.h (recv): Fix prototype.
-	(recvfrom): Ditto.
-	(send): Ditto.
-	(sendto): Ditto.
-	* net.cc (cygwin_sendto): Ditto. Improve strace message
-	(cygwin_recvfrom): Ditto.  Ditto.
-	(cygwin_setsockopt): Improve strace message.
-	(cygwin_getsockopt): Ditto.
-	(cygwin_connect): Ditto.
-	(cygwin_accept): Ditto.
-	(cygwin_bind): Ditto.
-	(cygwin_getsockname): Ditto.
-	(cygwin_getpeername): Ditto.
-	(cygwin_recv): Fix prototype.
-	(cygwin_send): Ditto.
-	(cygwin_recvmsg): Improve strace message.
-	(cygwin_sendmsg): Ditto.
-
-2002-08-25 Pierre Humblet <Pierre.Humblet@ieee.org>
-
-	* sec_acl.cc (getacl): Check ace_sid == well_known_world_sid
-	before owner_sid and group_sid so that well_known_world_sid
-	means "other" even when owner_sid and/or group_sid are Everyone.
-	* security.cc (get_attribute_from_acl): Created from code common
-	to get_nt_attribute() and get_nt_object_attribute(), with same
-	reordering as in getacl() above.
-	(get_nt_attribute): Call get_attribute_from_acl().
-	(get_nt_object_attribute): Ditto.
-
-2002-08-26  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (cygrunk.exe): Make a -mno-cygwin program.
-	* cygrun.c (main): Export CYGWIN=ntsec unless otherwise set.
-
-	* shared.cc (shared_name): Only add build date to shared name when
-	*testing*.
-
-2002-08-24  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (DLL_IMPORTS): Move libuuid.a and libshell32.a to list
-	rather than referring to them via -l.  Add DLL imports last in link
-	line for new-cygwin.dll and cygrun.exe.
-
-2002-08-19  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.h (pinfo::remember): Arrange for destructor call if
-	proc_subproc returns error.
-	* sigproc.cc (zombies): Store 1 + total zombies since proc_subproc uses
-	NZOMBIES element.
-
-2002-08-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* pwdgrp.h (pwdgrp_read::pwdgrp_read): Remove.
-	(pwdgrp_read::~pwdgrp_read): Ditto.
-	(pwdgrp_read::open): Reset fh to NULL instead of INVALID_HANDLE_VALUE.
-	(pwdgrp_read::close): Ditto.
-
-2002-08-19  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_console::send_winch_maybe): New method.
-	* fhandler_console.cc (set_console_state_for_spawn): Remove if 0'ed
-	code.
-	(fhandler_console::send_winch_maybe): Define new method.
-	(fhandler_console::read): Use send_winch_maybe where appropriate.
-	(fhandler_console::init): Just call all tcsetattr rather than
-	output_tcsetattr.
-	* select.cc (peek_console): Reorganize so that send_winch_maybe is
-	called for everything but keyboard input.
-
-2002-08-18  Christopher Faylor  <cgf@redhat.com>
-
-	* perthread.h (vfork_save): Add ctty, sid, pgid, exitval fields.
-	(vfork_save::restore_pid): New method.
-	(vfork_save::restore_exit): New method.
-	* fork.cc (vfork): Save ctty, sid, pgid and restore them when returning
-	to "parent".  Use exitval field if exiting but never created a new
-	process.
-	* syscalls.cc (setsid): Detect when in "vfork" and force an actual fork
-	so that pid will be allocated (UGLY!).
-	(getsid): New function.
-	* dcrt0.cc (do_exit): Use vfork_save::restore_exit method for returning
-	from a vfork.
-	* spawn.cc (spawnve): Use vfork_save::{restore_pid,restore_exit}
-	methods for returning from vfork.
-	* cygwin.din: Export getsid.
-	* include/cygwin/version.h: Bump api minor number.
-
-	* malloc.cc: #ifdef sYSTRIm for when MORECORE_CANNOT_TRIM is true.
-
-2002-08-18  Christopher Faylor  <cgf@redhat.com>
-
-	* cygmalloc.h (MORECORE_CANNOT_TRIM): Define.
-
-2002-08-18  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (sigCONT): Define.
-	* sigproc.h (sigCONT): Declare.
-	(wait_sig): Create sigCONT event here.
-	* exceptions.cc (sig_handle_tty_stop): Wait for sigCONT event rather
-	than stopping thread.
-	(sig_handle): Set sigCONT event as appropriate on SIGCONT rather than
-	calling ResumeThread.
-
-2002-08-17  Christopher Faylor  <cgf@redhat.com>
-
-	* malloc.cc: Update to 2.7.2.
-	* malloc_wrapper.cc (malloc_init): Call user level mallocs to determine
-	if the malloc routines have been overridden.
-
-2002-08-16  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.h: Remove malloc_*lock functions.
-
-2002-08-16  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Add support for new malloc.o and renamed
-	malloc_wrapper.o.  Use -fomit-frame-pointer for malloc.o compilation.
-	* malloc_wrapper.cc: New file.  Rename from malloc.cc.  Add support for
-	more malloc functions.  Eliminate export_* calls.  Just use straight
-	malloc names.  Remove unused argument from malloc lock functions.
-	* cygwin.din: Just export straight malloc names.  Add malloc_stats,
-	malloc_trim, malloc_usable_size, mallopt, memalign, valloc.
-	* dcrt0.cc (__cygwin_user): Eliminate export_* malloc entries.
-	* fork.cc (fork_parent): Remove unused argument from malloc_lock
-	argument.
-	* malloc.cc: New file.  Doug Lea's malloc v2.7.1.
-	* cygmalloc.h: New file.
-	* include/cygwin/version.h: Bump API_MINOR.
-
-	* sync.h (muto::acquire): Use appropriate number for regparm attribute.
-	(muto::reset): Ditto.
-	(muto::release): Ditto.
-
-2002-08-16  Pavel Tsekov  <ptsekov@gmx.net>
-
-	* exceptions.cc (interrupt_setup): Ensure that the previous signal mask
-	is properly saved.
-
-2002-08-15  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* dcrt0.cc: Modify define for CYGWIN_GUARD.
-	(alloc_stack_hard_way): Just use CYGWIN_GUARD in VirtualAlloc call.
-
-2002-08-11  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* fhandler.h (fhandler_socket::recv): Remove method.
-	(fhandler_socket::send): Ditto.
-	* fhandler_socket.cc (fhandler_socket::recv): Ditto.
-	(fhandler_socket::send): Ditto.
-	(fhandler_socket::read): Delegate to fhandler_socket::recvfrom.
-	(fhandler_socket::write): Delegate to fhandler_socket::sendto.
-	(fhandler_socket::sendto): Check for null `to' address.
-	* net.cc (cygwin_sendto): Check for zero request length.
-	(cygwin_recvfrom): Ditto.  Fix signature, use void *buf.
-	(cygwin_recv): Delegate to cygwin_recvfrom.
-	(cygwin_send): Delegate to cygwin_sendto.
-
-2002-08-11  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::cygthread): Close another race.
-
-2002-08-11  Christopher Faylor  <cgf@redhat.com>
-
-	* assert.cc (__assert): Call debugger on assertion failure if
-	debugging.
-	* dcrt0.cc (dll_crt0_1): Just wait for signal thread to go live rather
-	than going through the overhead of invoking it.
-	* fork.cc (fork_child): Ditto.
-	* exceptions.cc (signal_fixup_after_fork): Call sigproc_init here.
-	* sigproc.cc (proc_can_be_signalled): Assume that the signal thread is
-	live.
-	(sig_dispatch): Ditto.
-	(sig_send): Ditto.
-	(wait_for_sigthread): Rename from "wait_for_me".  Assume that
-	wait_sig_inited has been set and that this function is only called from
-	the main thread.
-	* sigproc.h (wait_for_sigthread): Declare new function.
-
-2002-08-08  Christopher Faylor  <cgf@redhat.com>
-
-	* environ.cc (parse_options): Remember the "no" part of any options for
-	later export.
-
-2002-08-07  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* winsup.h (__check_null_invalid_struct): Make ptr argument non-const.
-	(__check_null_invalid_struct_errno): Ditto.
-	* miscfuncs.cc (__check_null_invalid_struct): Ditto.
-	(__check_null_invalid_struct_errno): Ditto.
-	(__check_invalid_read_ptr_errno): Remove superfluous cast.
-	* net.cc (get): Set appropriate errno if fd is not a socket.
-	(cygwin_sendto): Fix parameter checking.
-	(cygwin_recvfrom): Ditto.
-	(cygwin_setsockopt): Ditto.
-	(cygwin_getsockopt): Ditto.
-	(cygwin_connect): Ditto.
-	(cygwin_gethostbyaddr): Ditto.
-	(cygwin_accept): Ditto.
-	(cygwin_bind): Ditto.
-	(cygwin_getsockname): Ditto.
-	(cygwin_listen): Ditto.
-	(cygwin_getpeername): Ditto.
-	(cygwin_send): Ditto.
-	(cygwin_shutdown): Ditto.  Move sigframe to fhandler_socket.
-	(cygwin_recvmsg): Fix parameter checking.  Add tracing.
-	(cygwin_sendmsg): Ditto.
-	* fhandler_socket.cc (fhandler_socket::shutdown): Add sigframe.
-	* resource.cc (setrlimit): Fix parameter checking.
-
-2002-08-08  Joe Buehler  <jbuehler@hekimian.com
-
-	* sec_helper.cc (sec_acl): remove extraneous arg to debug_printf.
-
-2002-08-07  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* fhandler_socket.cc (fhandler_socket::accept): Fix FIONBIO call.
-
-2002-08-06  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (_csbrk): Avoid !cygheap considerations.
-	(cygheap_init): Deal with unintialized cygheap issues here.
-	(cheap_init): Move cygheap_max setting here.
-
-2002-08-06  Christopher Faylor  <cgf@redhat.com>
-	    Conrad Scott  <conrad.scott@dsl.pipex.com
-
-	* cygheap.cc (_csbrk): Allocate some slop initially.  Don't erroneously
-	add sbrk amount to returned value in initial case.
-
-2002-08-06  Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (spawn_guts): Don't set mount_h here.
-	* sigproc.cc (init_child_info): Set it here instead.
-	* shared.cc (cygwin_mount_h): Make NO_COPY.
-
-2002-08-06  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Accept flag to pass info structure to
-	thread function.
-	(cygthread::operator new): Add defensive debugging output.
-	(cygthread::cygthread): Add debugging output.  Set name after thread
-	has been awakened to avoid a race.
-	(cygthread::exit_thread): Use handle operator rather than using ev
-	directly.
-	(cygthread::exit_thread): Reorganize to provide debugging.  Set __name
-	to NULL.
-	* cygthread.h (cygself): Define.
-	* fhandler_tty.cc (fhandler_tty_master::init): Use cygself as argument
-	so that invoked thread can access its own info.
-	(process_output): Derive cygthread info of thread from thread argument.
-	* sigproc.cc (sigproc_init): Use cygself as argument so that invoked
-	thread can access its own info.
-	(wait_sig): Derive cygthread info of thread from thread argument.
-
-2002-08-06  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* debug.h (handle_list::allocated): Remove field.
-	* debug.cc (newh): Don't malloc extra entries.
-	(add_handle): Downgrade strace message level.
-	(delete_handle): Remove case for `allocated' entries.
-
-2002-08-05  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::stub): Change event creation to manual
-	reset.  Set __name after calling SetEvent to prevent races.
-	(cygthread::detach): Always reset event here to prevent races.
-
-2002-08-03  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* debug.h (WaitForMultipleObjects): Correct typo.
-
-2002-08-01 Pierre Humblet <Pierre.Humblet@ieee.org>
-
-	* security.cc (verify_token): Do not reject a token just because
-	the supplementary group list is missing Everyone or a groupsid
-	equal to usersid, or because the primary group is not in the token,
-	as long as it is equal to the usersid.
-	* syscalls.cc (seteuid32): Use common code for all successful returns.
-	* grp.cc (getgroups32): Never includes Everyone in the output.
-
-2002-08-01  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc (cygthread::exit_thread): Define new method.
-	* cygthread.h (cygthread::exit_thread): Declare new method.
-	* fhandler.h (fhandler_tty_master::hThread): Delete.
-	(fhandler_tty_master::output_thread): Define.
-	* fhandler_tty.cc (fhandler_tty_master::fhandler_tty_master): Adjust
-	constructor.
-	(fhandler_tty_master::init): Use cygthread rather than handle.
-	(process_output): Use cygthread method to exit.
-	(fhandler_tty_master::fixup_after_fork): Set output_thread to NULL
-	after fork.
-	(fhandler_tty_master::fixup_after_exec): Set output_thread to NULL
-	after spawn/exec.
-	* tty.cc (tty_list::terminate): Detach from output_thread using
-	cygthread method.
-
-2002-08-01  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (_link): Revert previous change and just always
-	dereference the oldpath.
-
-2002-08-01  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (link): Properly deal with a link to a symlink.
-
-2002-08-01  Christopher Faylor  <cgf@redhat.com>
-
-	* cygthread.cc: Remove cruft.
-
-2002-08-01  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (DLL_OFILES): Add cygthread.o.
-	* dcrt0.cc (dll_crt0_1): Eliminate various thread initialization
-	functions in favor of new cygthread class.
-	* debug.cc: Remove thread manipulation functions.
-	* debug.h: Ditto.
-	* external.cc (cygwin_internal): Use cygthread method for determining
-	thread name.  Remove capability for setting thread name.
-	* fhandler_console.cc (fhandler_console::read): Use cygthread method
-	rather than iscygthread function.
-	* fhandler_tty.cc (fhandler_tty_master::fhandler_tty_master): Use
-	cygthread methods to create threads.
-	(fhandler_tty_common::__acquire_output_mutex): Use cygthread method to
-	retrieve thread name.
-	* select.cc (pipeinf): Use cygthread pointer rather than handle.
-	(start_thread_pipe): Ditto.
-	(pipe_cleanup): Ditto.
-	(serialinf): Ditto.
-	(start_thread_serial): Ditto.
-	(serial_cleanup): Ditto.
-	(socketinf): Ditto.
-	(start_thread_socket): Ditto.
-	(socket_cleanup): Ditto.
-	* sigproc.cc (hwait_sig): Ditto.
-	(hwait_subproc): Ditto.
-	(proc_terminate): Ditto.
-	(sigproc_terminate): Ditto.
-	(sigproc_init): Initialize cygthread hwait_sig pointer.
-	(subproc_init): Initialize cygthread hwait_subproc pointer.
-	(wait_sig): Rely on cygthread HANDLE operator.
-	* strace.cc (strace::vsprntf): Use cygthread::name rather than threadname.
-	* window.cc (gethwnd): Use cygthread method to initialize thread.
-
-2002-07-31  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* fhandler.h (fhandler_base::get_r_no_interrupt): Make non-virtual.
-	* net.cc (fdsock): Call set_r_no_interrupt.
-
-2002-07-30  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (_read): Clarify debugging output.
-
-2002-07-30  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_base::get_r_no_interrupt): Make virtual.
-
-2002-07-30  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_cygdrive::set_drives): Incorporate .
-	and ..  processing here.
-	(fhandler_cygdrive::readdir): Assume . and .. are already in pdrive.
-	(fhandler_cygdrive::seekdir): Ditto.
-
-2002-07-29  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (dll_crt0_1): Move debug_fixup_after_fork_exec.
-	* cygheap.cc (cygheap_fixup_in_child): Call debug_fixup_after_fork_exec
-	immediately after cygheap has been set up.
-
-2002-07-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc: Change some formatting.
-	* include/cygwin/version.h: Bump API minor version.
-
-2002-07-28 Pierre Humblet <Pierre.Humblet@ieee.org>
-
-	* cygheap.h (class cygheap_user): Add member groups.
-	* security.h (class cygsidlist): Add members type and maxcount, methods
-	position, addfromgr, alloc_sids and free_sids and operator+= (const
-	PSID psid).  Modify contains () to call position () and optimize add ()
-	to use maxcount.
-	(class user_groups): Create.  Update declarations of verify_token and
-	create_token.
-	* security.cc (cygsidlist::alloc_sids): New.
-	(cygsidlist::free_sids): New.
-	(get_token_group_sidlist): Create from get_group_sidlist.
-	(get_initgroups_sidlist): Create from get_group_sidlist.
-	(get_group_sidlist): Suppress.
-	(get_setgroups_sidlist): Create.
-	(verify_token): Modify arguments.  Add setgroups case.
-	(create_token): Modify arguments.  Call get_initgroups_sidlist and
-	get_setgroups_sidlist as needed.  Set SE_GROUP_LOGON_ID from auth_pos
-	outside of the loop.  Rename the various group sid lists consistently.
-	* syscalls.cc (seteuid32): Modify to use cygheap->user.groups.
-	(setegid32): Call cygheap->user.groups.update_pgrp.
-	* grp.cc (setgroups): Create.
-	(setgroups32): Create.
-	* uinfo.cc (internal_getlogin): Initialize and update
-	user.groups.pgsid.
-	* cygwin.din: Add setgroups and setgroups32.
-
-2002-07-28  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (fhandler_console::read): Use appropriate
-	kill_pgrp method.
-	* select.cc (peek_console): Ditto.
-	* fhandler_termios.cc (fhandler_termios::bg_check): Send "stopped"
-	signal to entire process group as dictated by SUSv3.
-	* termios.cc (tcsetattr): Detect when stopped signal sent and force a
-	stop before setting anything.
-
-2002-07-26  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump API version to indicate that ntsec is
-	on by default now.
-
-2002-07-26  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* fhandler_registry.cc (fhandler_registry::close): Return any error
-	result to the caller.
-	* syscalls.cc (_close): Return result of fhandler::close to the caller.
-
-2002-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* security.cc (allow_ntsec): Default to on.
-	(allow_smbntsec): Default to off.
-
-2002-07-24  David MacMahon  <davidm@smartsc.com>
-
-	* times.cc (to_time_t): Always round time_t down to nearest second.
-
-2002-07-25  Egor Duda  <deo@logos-m.ru>
-
-	* Makefile.in: Check if API version is updated when exports are
-	changed and stop if not so.
-
-2002-07-24  Egor Duda  <deo@logos-m.ru>
-
-	* include/cygwin/version.h: Bump minor API version.
-
-2002-07-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_serial.cc: Change 'must_init_serial_line capability'
-	to 'supports_reading_modem_output_lines' throughout (negated meaning).
-	* wincap.cc: Ditto.
-	* wincap.h: Ditto.
-
-2002-07-23  Nicholas Wourms  <nwourms@netscape.net>
-
-	* cygwin.din (fcloseall): Add symbol for export.
-	(fcloseall_r): Ditto.
-
-2002-07-24  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (path_conv::check): Always set fileattr when component == 0.
-	(readlink): Use path_conv method rather than field.
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Ditto,
-	throughout.
-	* path.h (path_conv): Make fileattr private.
-	* exceptions.cc (try_to_debug): Default to idle priority when looping.
-
-2002-07-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_serial.cc: Use must_init_serial_line capability throughout.
-	* wincap.cc: Set flag must_init_serial_line appropriately.
-	* wincap.h: Add flag must_init_serial_line.
-
-2002-07-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (get_group_sidlist): Create group list from /etc files
-	even if DC is available but access fails.
-
-2002-07-22  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_serial.cc: Fix formatting problems introduced by below
-	changes.
-
-2002-07-22  Jacek Trzcinski <jacek@certum.pl>
-
-	* fhandler.h (class fhandler_serial): Add new members of the class -
-	rts,dtr and method ioctl().  Variables rts and dtr important for Win 9x
-	only.
-	* fhandler_serial.cc (fhandler_serial::open): Add initial setting of
-	dtr and rts.  Important for Win 9x only.
-	(fhandler_serial::ioctl): New function.  Implements commands TIOCMGET,
-	TIOCMSET and TIOCINQ.
-	(fhandler_serial::tcflush): Fix found error.
-	(fhandler_serial::tcsetattr): Add settings of rts and dtr.  Important
-	for Win 9x only.
-	* termios.h: Add new defines as a support for ioctl() function on
-	serial device.
-
-2002-07-20  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload.cc (LoadDLLprime): Add jmp call to allow streamlining of
-	later jmp rewrite.
-	(doit): Avoid use of cx register.  Just change one word to avoid races.
-
-2002-07-18  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.cc (get_unix_group_sidlist): Create.
-	(get_supplementary_group_sidlist): Evolve into get_unix_group_sidlist.
-	(get_user_local_groups): Add check for duplicates.
-	(get_user_primary_group): Suppress.
-	(get_group_sidlist): Silently ignore PDC unavailability.
-	Call get_unix_group_sidlist() before get_user_local_groups().
-	Remove call to get_supplementary_group_sidlist(). Never call
-	get_user_primary_group() as the passwd group is always included.
-	Add well_known_authenticated_users_sid in only one statement.
-
-2002-07-19  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_serial.cc (fhandler_serial::tcflush): Fix typo.
-
-2002-07-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (get_group_sidlist): Fix formatting.
-
-2002-07-14  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (initial_env): Force path and CYGWIN_DEBUG contents to lower
-	case.
-	* exceptions.cc (error_start_init): Use the name derived from
-	GetModuleName rather than myself->progname.
-
-2002-07-14  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (dll_crt0_1): Move debug_init call back to here.  Avoid a
-	compiler warning.
-	* shared.cc (memory_init): Remove debug_init call.
-	* debug.h (handle_list): Change "clexec" to "inherited".
-	* debug.cc: Remove a spurious declaration.
-	(setclexec): Conditionalize away since it is currently unused.
-	(add_handle): Use inherited field rather than clexec.
-	(debug_fixup_after_fork_exec): Ditto.  Move debugging output to
-	delete_handle.
-	(delete_handle): Add debugging output.
-	* fhandler.cc (fhandler_base::set_inheritance): Don't bother setting
-	inheritance in debugging table since the handle was never protected
-	anyway.
-	(fhandler_base::fork_fixup): Ditto.
-
-	* exceptions.cc (debugger_command): Revert.
-
-2002-07-14  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* debug.cc (clexec): Add missing `hl = hl->next'.
-
-2002-07-14  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (cygrun.exe): Add a -lcygwin on the end.
-
-2002-07-14  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (cygserver.exe): Add -lstdc++.
-	(cygrun.exe): Move -lgcc last.
-
-2002-07-13  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (dll_crt0_1): Delay closing of some handles until cygheap
-	has been set up.
-	(break_here): New function, for debugging.
-	(initial_env): Add program name to "Sleeping" message.  Implement new
-	"CYGWIN_DEBUG" environment variable option.
-	* exceptions.cc (debugger_command): Add argument to dumper call.
-	* strace.cc (strace::hello): Use winpid if cygwin pid is unavailable.
-	(strace::vsprntf): Ditto.
-
-2002-07-13  Christopher Faylor  <cgf@redhat.com>
-
-	* debug.h (handle_list): Move here from debug.cc.  Add "inherit" flag
-	functionality.
-	* cygheap.cc (init_cheap): Move cygheap_max calculation to _csbrk.
-	(_csbrk): Reorganize to not assume first allocation is <= 1 page.
-	(cygheap_setup_for_child): Mark protected handle as inheritable.
-	* cygheap.h (cygheap_debug): New struct.
-	(init_cygheap): Add new structure when debugging.
-	* dcrt0.cc (dll_crt0_1): Remove call to debug_init.  Close ppid_handle
-	here, if appropriate.  Don't protect subproc_ready, since it is already
-	protected in the parent.  Call memory_init prior to ProtectHandle to
-	ensure that cygheap is set up.  Call debug_fixup_after_fork_exec when
-	appropriate.
-	(_dll_crt0): Don't close ppid_handle here.
-	* debug.cc: Use cygheap debug structure rather than static elements
-	throughout.
-	(add_handle): Don't issue a warning if attempt to protect handle in
-	exactly the same way from exactly the same place.  Add pid info to
-	warning output.  Accept additional argument controlling whether handle
-	is to be inherited.  Add pid to stored information.
-	(debug_fixup_after_fork_exec): Renamed from debug_fixup_after_fork.
-	Reorganize to avoid erroneously skipping handles.
-	(mark_closed): Add pid info to warning output.
-	(setclexec): Rename from setclexec_pid.
-	* fhandler.cc (fhandler_base::get_default_fmode): Minor reorg.
-	(fhandler_base::fstat): Add debugging output.
-	(fhandler_base::set_inheritance): Call setclexec rather than
-	setclexec_pid.
-	(fhandler_base::fork_fixup): Ditto.
-	* fhandler_console.cc (get_tty_stuff): Mark protected handle as
-	inheritable.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Ditto.
-	* tty.cc (tty::make_pipes): Ditto.
-	(tty::common_init): Ditto.
-	* fork.cc (fork_parent): Ditto.
-	(fork_child): Close protected handles with correct name.  Remove
-	debug_fixup_after_fork call.
-	* fhandler_socket.cc (fhandler_socket::create_secret_event): Mark
-	protected handle as inheritable/non-inheritable, as appropriate.
-	* shared.cc (memory_init): Mark protected handle as inheritable.
-	Call debug_init here.
-	* sigproc.cc (wait_sig): Close protected handle with correct name.
-	* spawn.cc (spawn_guts): Rename spr to subproc_ready and mark it as
-	inheritable.
-
-	* exceptions.cc (debugger_command): Try to run dumper.exe, if found.
-
-	* syscalls.cc (fstat64): Don't follow symlinks for path_conv lookup
-	since path is already resolved.
-
-2002-07-12  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din: Change erroneous entries.
-
-2002-07-11  Pavel Tsekov  <ptsekov@gmx.net>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::open): Don't
-	move the file pointer to the end of file if O_APPEND is
-	specified in the open flags.
-
-2002-07-09  Christopher Faylor  <cgf@redhat.com>
-
-	* debug.cc: Avoid explicit zeroing of globals.
-	(lock_debug): Make locker a static member.  Avoid unlocking when
-	already unlocked (from Conrad Scott).
-	(debug_init): Initialize lock_debug::locker here.
-	* fork.cc (fork_child): Fix up fdtab earlier to avoid some (but not
-	all) confusion with close-on-exec craziness.
-
-2002-07-05  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.h (fhandler_socket::is_unconnected): Constify.
-	(fhandler_socket::is_connect_pending): Ditto.
-	(fhandler_socket::is_connected): Ditto.
-	(fhandler_socket::set_connect_state): New method.
-	(struct select_record): Add member `except_on_write'.
-	(select_record::select_record): Initialize all bool values to `false'.
-	* fhandler_socket.cc: Use set_connect_state() method throughout.
-	(fhandler_socket::connect): Set state always to connected if connection
-	isn't pending.
-	* net.cc (cygwin_getsockopt): Revert erroneous previous patch.
-	* select.cc (set_bits): Check for `except_on_write'.  Set fd in
-	write_fds if set.  Set connect state to connected if fd has been
-	returned by WINSOCK_SELECT.
-	(peek_socket): Check for `except_on_write'.
-	(start_thread_socket): Ditto.
-	(fhandler_socket::select_write): Don't set `write_ready' if connect
-	is pending.  Set `except_on_write' if connect is pending.
-
-2002-07-05  Christopher Faylor  <cgf@redhat.com>
-
-	* ntdll.h (_SYSTEM_PROCESSOR_TIMES): Force eight byte alignment.
-	(_SYSTEM_TIME_OF_DAY_INFORMATION): Ditto.
-
-	* path.cc (suffix_scan::has): Reorganize to eliminate double scanning
-	for for .exe (in the typical case).
-
-2002-07-05  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.h (UNCONNECTED): New define.
-	(CONNECT_PENDING): Ditto.
-	(CONNECTED): Ditto.
-	(class fhandler_socket): Add member `had_connect_or_listen'.
-	Add member functions `is_unconnected', `is_connect_pending' and
-	`is_connected'.
-	* fhandler_socket.cc (fhandler_socket::connect): Set member
-	`had_connect_or_listen' according to return code of WinSock
-	call.
-	(fhandler_socket::listen): Ditto.
-	* net.cc (cygwin_getsockopt): Modify SO_ERROR return value in
-	case of socket with pending connect().
-	* select.cc (peek_socket): Only add socket to matching fd_set
-	if it's not "ready".  Call WINSOCK_SELECT only if at least one
-	socket is in one of the fd_sets.
-	(start_thread_socket): Only add socket to matching fd_set
-	if it's not "ready".
-	(fhandler_socket::select_write): Set write_ready to true also
-	if socket isn't connected or listening.
-
-2002-07-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::set_sun_path): Don't free
-	memory here.  Allow NULL parameter.
-
-2002-07-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_socket.cc (fhandler_socket::dup): Add missing copy operation
-	on sun_path.
-
-2002-07-03  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-07-03  Christopher Faylor  <cgf@redhat.com>
-
-	* include/sys/statfs.h: New header file.
-
-2002-07-03  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (cygwin_attach_handle_to_fd): Default to implicit bin mode
-	if none specified.
-	* fhandler.cc (fhandler_base::init): Make bin argument a guarantee
-	rather than a suggestion.
-	* path.cc (path_conv::check): Load flag returned from
-	cygwin_conv_to_win32_path into path_flags.
-
-2002-07-03  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* tty.cc (tty::common_init): Reverse logic of cygserver check in
-	call to SetKernelObjectSecurity.
-
-2002-07-03  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* autoload.cc (WSAEventSelect): Define new autoload function.
-	(WSAEnumNetworkEvents): Ditto.
-	* fhandler_socket.cc (fhandler_socket::accept): If socket is
-	in blocking mode wait for incoming connection and signal.
-
-2002-07-02  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (init_cheap): Rearrange error message.
-	(cygheap_fixup_in_child): Ditto.
-	* dtable.cc: Remove if 0'ed code.
-	* fhandler_dsp.cc (fhandler_dev_dsp::open): Force binmode.
-	* sec_helper.cc (cygsid::get_id): Use system_printf for error message.
-	* tty.cc (tty::common_init): Ditto.
-
-2002-07-02  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc (cygwin_getpeername): Defend against NULL pointer dereference.
-
-2002-07-02  Egor Duda <deo@logos-m.ru>
-
-	* include/cygwin/version.h: Bump API minor version.
-
-2002-07-01  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.cc (get_logon_server): Interpret a zero length
-	domain as the local domain.
-	(get_group_sidlist): Add authenticated users SID to SYSTEM's group
-	list instead of SYSTEM itself.
-	(verify_token): Accept the primary group sid if it equals
-	the token user sid.
-
-2002-07-02  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din (__fpclassifyd): Add symbol.
-	(__fpclassifyf): Ditto.
-	(__signbitd): Ditto.
-	(__signbitf): Ditto.
-
-2002-07-02  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.h (DONT_INHERIT): Eliminate definition.
-	(INHERIT_ALL): Ditto.
-	(INHERIT_ONLY): Ditto.
-	* sec_acl.cc: Use appropriate defines from accctrl.h instead of the
-	above throughout.
-	* security.cc: Ditto.
-
-2002-07-01  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* syscalls.c (seteuid32): Return immediately if the program is not
-	impersonated and both uid and gid are original.
-	(setegid32): Return immediately if the new gid is the current egid.
-
-2002-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (seteuid32): Fix incorrect placement of Pierre's patch
-	below.
-
-2002-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (seteuid32): Fix incorrect use of system_printf.
-
-2002-07-02  Christopher January  <chris@atomice.net>
-
-	* autoload.cc (GetSecurityInfo): Define new autoload function.
-	(RegQueryInfoKeyA): Ditto.
-	* fhandler.h (fhandler_virtual::fill_filebuf): Change return type to
-	bool.
-	(fhandler_proc::fill_filebuf): Ditto.
-	(fhandler_registry::fill_filebuf): Ditto.
-	(fhandler_process::fill_filebuf): Ditto.
-	(fhandler_registry::value_name): Add new member.
-	(fhandler_registry::close): Add new method.
-	(fhandler_process::p): Remove member.
-	* fhandler_proc.cc (fhandler_proc::open): Add set_nohandle after
-	calling superclass method.  Check return value of fill_filebuf.
-	(fhandler_proc::fill_filebuf): Change return type to bool.  Add return
-	statement.
-	* fhandler_process.cc (fhandler_process::open): Add set_nohandle after
-	calling superclass method.  Remove references to p.  Check return value
-	of fill_filebuf.
-	(fhandler_process::fill_filebuf): Change return type to bool.  Don't
-	use dereference operator on p.  Add return statement.
-	(fhandler_process::format_process_stat): Fix typo.
-	* fhandler_registry.cc: Add static open_key declaration.
-	(fhandler_registry::exists): Assume path is already normalised.  Try
-	opening the path as a key in its own right first, before reverting to
-	enumerating subkeys and values of the parent key.
-	(fhandler_registry::fstat): Add additional code to return more relevant
-	information about the registry key/value.
-	(fhandler_registry::readdir): Explicitly set desired access when
-	opening registry key.  Remove output of buf from debug_printf format
-	string.
-	(fhandler_registry::open): Use set_io_handle to store registry key
-	handle.  Set value_name member.  Move code to read a value from the
-	registry to fill_filebuf.  Add call to fill_filebuf.
-	(fhandler_registry::close): New method.
-	(fhandler_registry::fill_filebuf): Change return type to bool.  Add
-	code to read a value from registry.
-	(fhandler_registry::open_key): Make function static.  Use KEY_READ as
-	desired access unless this is the last path component.  Check the
-	return value of RegOpenKeyEx for an error instead of hKey.
-	* fhandler_virtual.cc (fhandler_virtual::lseek): Check the return value
-	of fill_filebuf.
-	(fhandler_virtual::open): Remove call to set_nohandle.
-	(fhandler_virtual::fill_filebuf): Change return type to bool.  Add
-	return statement.
-	* security.cc (get_nt_object_attribute): New function.
-	(get_object_attribute): New function.
-	* security.h (get_object_attribute): New function declaration.
-
-2002-07-01  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* syscalls.c (seteuid32): Do not return an error when the token cannot
-	be created only because of a problem with the gid.
-
-2002-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_clipboard.c (fhandler_dev_clipboard::open): Force text mode.
-	* fhandler_console.cc (fhandler_console::open): *Really* force binary
-	mode rather than make it optional.
-	* fhandler_proc.cc (fhandler_proc::open): Ditto.
-	* fhandler_process.cc (fhandler_process::open): Ditto.
-	* fhandler_random.cc (fhandler_dev_random::fhandler_dev_random): Ditto.
-	* fhandler_raw.cc (fhandler_dev_raw::open): Ditto.
-	* fhandler_registry.cc (fhandler_registry::open): Ditto.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Ditto.
-	* fhandler_virtual.cc (fhandler_virtual::open): Ditto.
-	* fhandler_windows.cc (fhandler_windows::open): Ditto.
-	* fhandler_zero.cc (fhandler_dev_zero::open): Ditto.
-	* net.cc (fdsock): Ditto.
-	* path.cc (set_flags): Add more debugging.
-
-2002-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* debug.cc (threads): Avoid initialization.
-	* uinfo.cc (cygheap_user::ontherange): (from Corinna Vinschen) Actually
-	make below changes work.
-
-2002-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* uinfo.cc (cygheap_user::ontherange): Make cygwin root the last resort
-	for HOMEPATH/HOMEDRIVE for consistency with HOME.
-
-2002-07-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* shared.cc (sec_none): Move to sec_helper.cc.
-	(sec_none_nih): Ditto.
-	(sec_all): Ditto.
-	(sec_all_nih): Ditto.
-	(get_null_sd): Ditto.
-	(sec_acl): Ditto.
-	(__sec_user): Ditto.
-	* sec_helper.cc (sec_none): Move from shared.cc to here.
-	(sec_none_nih): Ditto.
-	(sec_all): Ditto.
-	(sec_all_nih): Ditto.
-	(get_null_sd): Ditto.
-	(sec_acl): Ditto.
-	(__sec_user): Ditto.
-
-2002-06-30  Christopher Faylor  <cgf@redhat.com>
-
-	* uinfo.cc (cygheap_user::ontherange): Potentially set HOME from
-	existing homepath and homedrive cygheap_user fields (not currently used
-	yet).  Set HOME to / if no other alternative.
-	(cygheap_user::test_uid): Simplify.
-
-2002-06-30  Christopher Faylor  <cgf@redhat.com>
-
-	* environ.cc (parse_options): Use setenv to potentially replace CYGWIN
-	value on export.  Fixes broken behavior since November 2000 changes.
-	(regopt): Return indication of whether or not something has been parsed
-	from the registry.
-	(environ_init): Only attempt to export CYGWIN variable when values were
-	set from the registry.  It is exported automatically otherwise.
-
-2002-06-30  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_process::pid): New field.
-	(fhandler_process::fstat): Remove unneeded array.  Set pid element.
-	(fhandler_process::open): Ditto.
-	(fhandler_process::fill_filebuf): Handle case where 'p' field is NULL.
-
-2002-06-30  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_process::p): New field.
-	(fhandler_process:fill_filebuf): Revert to same definition as virtual
-	in parent class.
-	(fhandler_process::open): Fill out p field rather than passing as an
-	argument.
-	(fhandler_process::fill_filebuf): Use p pointer rather than argument.
-
-2002-06-29  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.cc (extract_nt_dom_user): Check for all buffer overflows.
-	Call LookupAccountSid after trying to get domain & user from passwd.
-	(get_group_sidlist): Obtain the domain and user by calling
-	extract_nt_dom_user instead of LookupAccountSid.
-
-2002-06-29  Christopher Faylor  <cgf@redhat.com>
-
-	* uinfo.cc (cygheap_user::test_uid): Use standard issetuid test.
-
-2002-06-29  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload.cc (NetGetDCName): Change to make this an optional load
-	function.
-	* cygheap.h (cygheap_user::logsrv): Return NULL when operation fails.
-	(cygheap_user::winname): Ditto.
-	(cygheap_user::domain): Ditto.
-	* uinfo.cc (cygheap_user::env_logsrv): Save results in temp variable.
-	(cygheap_user::env_userprofile): Ditto.
-
-2002-06-29  Christopher Faylor  <cgf@redhat.com>
-
-	* environ.cc (spenv::retrieve): Detect return of env_dontadd from
-	cygheap_user methods.
-	(build_env): Avoid incrementing environment pointer if not actually
-	adding to the environment.  That could result in garbage in the
-	environment table.  Be more defensive when reallocing envblock.
-
-2002-06-29  Christopher Faylor  <cgf@redhat.com>
-
-	* uinfo.cc (cygheap_user::test_uid): Return NULL or further tests are
-	sorta useless.
-	(cygheap_user::env_domain): Recalculate if name is missing.
-
-2002-06-29  Christopher Faylor  <cgf@redhat.com>
-
-	* environ.cc (spenv::from_cygheap): Still need to take setuid into
-	consideration.
-
-2002-06-28  Christopher Faylor  <cgf@redhat.com>
-
-	* uinfo.cc (cygheap_user::env_logsrv): Return "almost_null" in case
-	where no domain or username is "SYSTEM".
-
-2002-06-28  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.h (cygheap_user): Reorg to accommodate environment caching.
-	(cygheap_user::logsrv): New method.
-	(cygheap_user::winname): Ditto.
-	(cygheap_user::domain): Ditto.
-	(cygheap_user::test_uid): Ditto.
-	* cygheap.cc (cygheap_user::set_name): Reflect name "pwinname" name
-	change.
-	* environ.cc (getwinenveq): New function.
-	(penv::from_cygheap): penv::from_cygheap): Change arguments.
-	(spenv::retrieve): Ditto for call.  Use getwinenveq to retrieve info
-	from environment.  Always return value from cygwin environment, if it
-	exists.
-	* environ.h (getwinenveq): Declare.
-	* uinfo.cc (cygheap_user::ontherange): Use logsrv() rather than
-	env_logsrv().
-	(cygheap_user::test_uid): Define new method.
-	(cygheap_user::env_logsrv): Accept environment arguments.  Use test_uid
-	to find info.
-	(cygheap_user::env_domain): Ditto.
-	(cygheap_user::env_userprofile): Ditto.
-	(cygheap_user::env_homepath): Ditto.
-	(cygheap_user::env_homedrive): Ditto.
-	(cygheap_user::env_name): Ditto.
-
-2002-06-27  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (cfree_and_set): New function.
-	(cygheap_user::set_name): Use cfree_and_set to reset members.
-	* cygheap.h (cygheap_user): Delete static members.
-	(cygheap_user::puserprof): New member.
-	(cfree_and_set): Declare.
-	* dcrt0.cc (almost_null): Define.
-	* environ.cc (env_dontadd): Redefine as "almost_null".
-	* winsup.h (almost_null): Declare.
-	* syscalls.cc (cfree_and_set): Remove unused variable.
-	* uinfo.cc (cygheap_user::homepath_env_buf): Eliminate.
-	(cygheap_user::homedrive_env_buf): Ditto.
-	(cygheap_user::userprofile_env_buf): Ditto.
-	(cygheap_user::ontherange): YA change to try to preserve existing
-	HOMEPATH and HOMEDRIVE.  Return almost_null values when variables
-	should not actually exist.
-	(cygheap_user::env_logsrv): Ditto.
-	(cygheap_user::env_domain): Ditto.
-	(cygheap_user::env_userprofile): Ditto.
-
-2002-06-27  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dcrt0.cc (dll_crt0_1): Let __progname point to the applications
-	basename.  Move eliminating ".exe" suffix from argv[0] so that it
-	always also affects __progname.
-
-2002-06-27  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (pthread::create): Add trace printf to get CreateThread
-	LastError.
-
-2002-06-27  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (list::match): Check using pagesize aligned size.
-
-2002-06-26  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_by_name): Force
-	FindFirstFile on first file of directory when asking for x:\ .
-
-2002-06-26  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (cygheap_user::set_name): Correct thinko in below change.
-
-2002-06-26  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (cygheap_user::set_name): Avoid clearing things when just
-	setting name to itself or during first time initialization.
-
-	* environ.cc (check_case_init): Make case insensitive.
-
-2002-06-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.h (fhandler_socket::bind): Add method definition.
-	(fhandler_socket::connect): Ditto.
-	(fhandler_socket::listen): Ditto.
-	(fhandler_socket::accept): Ditto.
-	(fhandler_socket::getsockname): Ditto.
-	(fhandler_socket::getpeername): Ditto.
-	(fhandler_socket::recvfrom): Ditto.
-	(fhandler_socket::recvmsg): Ditto.
-	(fhandler_socket::sendto): Ditto.
-	(fhandler_socket::sendmsg): Ditto.
-	(fhandler_socket::shutdown): Ditto.
-	* fhandler_socket.cc (get_inet_addr): Move here from net.cc.
-	(fhandler_socket::bind): New method.
-	(fhandler_socket::connect): Ditto.
-	(fhandler_socket::listen): Ditto.
-	(fhandler_socket::accept): Ditto.
-	(fhandler_socket::getsockname): Ditto.
-	(fhandler_socket::getpeername): Ditto.
-	(fhandler_socket::recvfrom): Ditto.
-	(fhandler_socket::recvmsg): Ditto.
-	(fhandler_socket::sendto): Ditto.
-	(fhandler_socket::sendmsg): Ditto.
-	(fhandler_socket::shutdown): Ditto.
-	* net.cc: Various formatting cleanups throughout.
-	(get_inet_addr): Move to fhandler_socket.cc.
-	(cygwin_bind): Move base functionality to appropriate fhandler_socket
-	method.
-	(cygwin_connect): Ditto.
-	(cygwin_listen): Ditto.
-	(cygwin_accept): Ditto.
-	(cygwin_getsockname): Ditto.
-	(cygwin_getpeername): Ditto.
-	(cygwin_recvfrom): Ditto.
-	(cygwin_recvmsg): Ditto.
-	(cygwin_sendto): Ditto.
-	(cygwin_sendmsg): Ditto.
-	(cygwin_shutdown): Ditto.
-
-2002-06-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* pwdgrp.h (pwdgrp_read::~pwdgrp_read): Avoid compiler warning.
-
-2002-06-26  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (_dcrt0): Be more defensive when reserved block is used and
-	it's not cygwin info.
-
-2002-06-26  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload (noload): Avoid clobbering bx register.
-
-	* environ.cc (codepage_init): Use case insensitive match.
-
-	* fhandler_console.cc (cp_get_internal): Delete.
-	(con_to_str): Use get_cp to derive code page.
-	(str_to_con): Ditto.
-	* miscfuncs.cc (get_cp): New function.
-	(sys_wcstombs): New function.  Converted from macro.
-	(sys_mbstowcs): Ditto.
-	* winsup.h: Reflect above changes.
-
-2002-06-26  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.h: Minor cleanup.
-	* path.h (path_conv::[]): New operator.
-	* syscalls.cc (_link): Use path_conv operators rather than methods,
-	where appropriate.  Minor white space cleanup.
-
-2002-06-26  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-06-25  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* include/pthread.h (PTHREAD_CANCELED): Define a reasonable value.
-	* pthread.cc (pthread_exit): Call method instead of function.
-	(pthread_setcancelstate): Ditto.
-	(pthread_setcanceltype): Ditto.
-	(pthread_testcancel): Ditto.
-	* thread.h (pthread::cancel_event): New member.
-	(__pthread_cancel_self): New prototype.
-	(pthread::exit): New Method.
-	(pthread::cancel): Ditto.
-	(pthread::testcancel): Ditto.
-	(pthread::cancel_self): Ditto.
-	(pthread::static_cancel_self): Ditto.
-	(pthread::setcancelstate): Ditto.
-	(pthread::setcanceltype): Ditto.
-	(__pthread_cancel): Give c++ linkage.
-	(__pthread_exit): Remove.
-	(__pthread_setcancelstate): Ditto.
-	(__pthread_setcanceltype): Ditto.
-	(__pthread_testcancel): Ditto.
-	* thread.cc (pthread::pthread): Inititialize cancel_event.
-	(pthread::~pthread): Close cancel_event if needed.
-	(pthread::create): Create cancel_event.
-	(pthread::exit): New method.  Replacement for __pthread_exit.
-	(pthread::cancel): New method.
-	(pthread::testcancel): Ditto.
-	(pthread::static_cancel_self); New static method.
-	(pthread::setcancelstate): New method.  Replacement for
-	__pthread_setcancelstate.
-	(pthread::setcanceltype): New method.  Replacement for
-	__pthread_setcanceltype.
-	(pthread::pop_cleanup_handler): Add lock for async cancel safe
-	cancellation.
-	(pthread::thread_init_wrapper): Change __pthread_exit to
-	thread->exit().
-	(__pthread_cancel): Call method thread->cancel().
-	(__pthread_exit): Remove.
-	(__pthread_setcancelstate): Ditto.
-	(__pthread_setcanceltype): Ditto.
-	(__pthread_testcancel): Ditto.
-
-2002-06-25  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (sm): Make NO_COPY.
-
-2002-06-25  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (chown): Convert uid to 32 bit.
-	(lchown): Ditto.
-	(fchown): Ditto.
-
-2002-06-24  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::find_unused_handle): Avoid coercion.
-
-2002-06-24  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (fhandler_base::dup2): Cleanup.  Ensure that lock is turned
-	off in error condition.
-
-2002-06-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* uinfo.cc (internal_getlogin): Set myself->uid and myself->gid instead
-	of user.real_uid and user.real_gid.
-	(uinfo_init): Evaluate orig_uid and real_uid from myself->uid.  Ditto
-	for gid.
-
-2002-06-23  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.cc (get_group_sidlist): Add pw argument and use pw->pw_name
-	in call to get_supplementary_group_sidlist.
-	(create_token): Add pw argument and use it in call to
-	get_group_sidlist.
-	* security.h: Add pw argument in declaration of create_token.
-	* syscalls.cc (seteuid32): Add pw argument in call to create_token.
-
-2002-06-23  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* fhandler.cc (fhandler_base::fstat): Set S_IFIFO for pipes.
-	* fhandler_socket.cc (fhandler_socket.cc::fstat): Set S_IFSOCK.
-
-2002-06-23  Christopher Faylor  <cgf@redhat.com>
-
-	* lib/_cygwin_S_IEXEC.cc: Remove obsolete file.
-
-2002-06-23  Christopher Faylor  <cgf@redhat.com>
-
-	Use cygwin_{shm,ipc}.h instead of /sys/{shm,ipc}.h throughout.
-	* sys/ipc.h: Remove.
-	* sys/shm.h: Remove.
-	* cygwin_ipc.h: New file.
-	* cygwin_shm.h: New file.
-
-2002-06-23  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.sc: Add recent changes from ld sources.
-
-2002-06-23  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* winsup.h: Move #ifdef EXPCGF code into "winbase.h".
-	* winbase.h: #ifdef EXPCGF code moved here from "winsup.h".
-
-2002-06-12  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.h (pthread::cleanup_stack): Rename cleanup_handlers to
-	cleanup_stack.
-	* thread.cc (pthread::pthread): Ditto.
-	(pthread::create): Fix mutex verification.
-	(pthread::push_cleanup_handler): Renam cleanup_handlers to
-	cleanup_stack.  Remvoe Mutex calls, use InterlockedExchangePointer
-	instead.
-	(pthread::pop_cleanup_handler): Rename cleanup_handlers to
-	cleanup_stack.
-	(pthread::pop_all_cleanup_handlers): Ditto.
-	(__pthread_once): Check state first and return if already done.
-	(__pthread_join): Revert DEADLOCK test to __pthread_equal call.
-	(__pthread_detach): Unlock mutex before deletion.
-
-2002-06-21  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (cygrun.exe): Move -lgcc where it will do some good.
-
-2002-06-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (stat64_to_stat32): Correctly evaluate st_rdev.
-	(fstat64): Set st_rdev to same value as st_dev.
-	(stat_worker): Ditto.
-
-2002-06-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (alloc_sd): Carefully check owner_sid again after trying
-	SIDs from cygheap.
-
-2002-06-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (alloc_sd): Remove unnecessary retrieval of owner name.
-	Check uid for current user first and use SIDs from cygheap if so.
-	Set errno to EINVAL if user SID isn't retrievable.  Just print user SID
-	as debug output.
-	Don't bail out if group SID isn't retrievable.  Change debug output
-	appropriately.
-
-2002-06-21  Christopher Faylor  <cgf@redhat.com>
-
-	* errno.cc: Change text description for EBADF throughout.
-
-2002-06-20  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* uinfo.cc (cygheap_user::ontherange): Use env_name for NetUserGetInfo.
-	(cygheap_user::env_logsrv): Verify env_domain is valid.
-	* environ.cc: Include child_info.h and keep spenvs[] sorted.
-	(environ_init): Check child_proc_info instead of myself->ppid_handle.
-
-2002-06-19  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::set_flags): Change priority of "linked
-	in" default binmode setting so that it has priority over optional
-	setting.
-
-2002-06-19  Christopher Faylor  <cgf@redhat.com>
-
-	Use hMainProc where appropriate, throughout.
-	* environ.cc (spenv::retrieve): Add debugging statements.
-
-	* pinfo.cc (set_myself): Don't call strace.hello if already stracing.
-	* strace.cc (strace): Move NO_COPY keyword so that it will actually
-	take effect.
-
-2002-06-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* uinfo.cc (cygheap_user::ontherange): Call NetUserGetInfo() only with
-	non-NULL logserver parameter.
-
-2002-06-16  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.h (cygheap_user::issetuid): New method.
-	* dtable.cc (dtable::vfork_child_dup): Use new method to determine if
-	we are in "setuid mode."
-	* fork.cc (fork_parent): Ditto.
-	* spawn.cc (spawn_guts): Ditto.
-	* syscalls.cc (seteuid32): Ditto.
-	(setegid32): Ditto.
-	* environ.cc (spenv::retrieve): (Suggested by Pierre Humblet) Do
-	potential recalculation of cygheap_user stuff when in setuid mode.
-	Return special value when environment variable should be calculated but
-	not added.
-	(build_env): Don't add retrieved value to dstp if it is 'dont_add'.
-
-2002-06-16  Christopher Faylor  <cgf@redhat.com>
-
-	Changes suggested by Pierre Humblet.
-	* environ.cc (NL): New macro.
-	(conv_envvars): Use NL macro to fill in name and namelen.
-	(spenv::namelen): New field.
-	(spenvs): Use NL to fill in name and namelen.
-	(spenv::retrieve): Eliminate length argument.  Instead, use namelen
-	throughout.
-	(build_env): Don't calculate length of initial FOO= part of
-	environment.  Accommodate spenv::retrive argument change.
-
-2002-06-16  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.h (cygheap_user::winname): New field.
-	* cygheap.cc (cygheap_user::set_name): Clear winname when name changes.
-	* uinfo.cc (cygheap_user::env_logsrv): Avoid calculating server when
-	Windows user == SYSTEM.
-	(cygheap_user::env_domain): Set winname here too.
-	(cygheap_user::env_userprofile): Eliminate superfluous tests.
-	(cygheap_user::env_name): Seed winname by calling env_domain().
-
-2002-06-12  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* spawn.cc (spawn_guts): Revert removal of ciresrv.moreinfo->uid =
-	ILLEGAL_UID.
-
-2002-06-15  Christopher Faylor  <cgf@redhat.com>
-
-	* child_info.h (child_proc_info): Declare as base class.
-	(spawn_info): Declare as alias of child_proc_info to aid debugging.
-	(fork_info): Ditto.
-	* cygheap.cc (cygheap_fixup_in_child): Use child_proc_info global
-	rather than parameter.
-	* cygheap.h (cygheap_fixup_in_child): Reflect above change in
-	declaration.
-	* dcrt0.cc (_dll_crt0): Move 'si' definition here.  Assign
-	child_proc_info.
-	(dll_crt0_1): Accommodate cygheap_fixup_in_child and *_info changes.
-	* environ.cc (spenv::retrieve): Make regparm.
-	* environ.h (environ_init): Ditto.
-	(win_env::add_cache): Ditto.
-	(build_env): Ditto.
-	(getwinenv): Ditto.
-	* fork.cc (sync_with_parent): Use fork_info global.
-	(fork_child): Ditto.
-
-2002-06-14  Christopher Faylor  <cgf@redhat.com>
-
-	* uinfo.cc (cygheap_user::ontherange): Don't set HOMEDRIVE or HOMEPATH
-	unless one or the other is specified.
-
-2002-06-14  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.h (cygheap_user::userprofile_env_buf): New static member.
-	* environ.cc (build_env): Add debugging statement.
-	(spenvs): Switch functions for USERDOMAIN and USERNAME.
-	* spawn.cc (spawn_guts): Move environment initialization prior to
-	cygheap_setup_for_child or environment info will never be copied to
-	child.
-
-2002-06-14  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.h (cygheap_user): Add static members to hold home{drive,path}
-	info.
-	* uinfo.cc (cygheap_user::ontherange): Use static class members for
-	local HOME* storage.
-
-2002-06-14  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (cygheap_user::set_logsrv): Remove.
-	(cygheap_user::set_domain): Ditto.
-	* cygheap.h (cygheap_user::set_logsrv): Remove declaration.
-	(cygheap_user::set_domain): Ditto.
-	(cygheap_user::env_domain): Declare new method.
-	(cygheap_user::env_name): Ditto.
-	* environ.cc (spenvs): Add two environment variables.
-	* spawn.cc (spawn_guts): Call build_env after RevertToSelf.  Always set
-	ciresrv.mount_h.
-	(cygheap_user::ontherange): Recalculate homedrive/homepath if they are
-	empty.  Use env_logsrv to get logon server.
-	(cygheap_user::env_logsrv): Calculate server name here rather than
-	relying on it having been previously calculated.
-	(cygheap_user::env_domain): Ditto for domain name.
-	(cygheap-user::env_name): New method.
-
-2002-06-12  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* syscalls.cc (seteuid32): Do not get or set the environment.  Do not
-	call LookupAccountSid nor internal_getlogin.  Set cygheap->user name
-	and sid from the passwd entry.
-	* uinfo.cc (uinfo_init): Only call internal_getlogin when starting from
-	a non Cygwin process and use the values returned in user.
-	(internal_getlogin): Simplify to case where starting from a non Cygwin
-	process.  Store return values in user and return void.  Do not set the
-	Windows default environment.
-	* dcrt0.cc (dll_crt0_1): Call uinfo_init only when needed.  Do not set
-	myself->uid nor reset user.sid.
-	* spawn.cc (spawn_guts): Get the sid from cygheap->user.  Always
-	RevertToSelf().  Don't set uid in impersonated case.
-	* cygheap.cc (cygheap_user::set_sid): Do not set orig_sig.
-	(cygheap_user::set_orig_sid): New.
-	* cygheap.h: Declare cygheap_user::set_sid.
-	* winsup.h: Add argument to uinfo_init().
-
-2002-06-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* environ.cc (build_env): If realloc moves envblock, move s with it.
-
-2002-06-13  Nicholas S. Wourms  <nwourms@netscape.net>
-
-	* winver.rc: Add more words to copyright.
-
-2002-06-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygheap.cc (cygheap_user::set_name): Revert previous change.
-	* environ.cc (spenv::retrieve): Check return value of call to
-	cygheap->user.*from_cygheap().
-
-2002-06-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygheap.cc (cygheap_user::set_name): Remove setting homedrive and
-	homepath to NULL.
-	(cygheap_user::set_logsrv):  Fix free'ing of plogsrv.
-	* cygheap.h (cygheap_user::cygheap_user): Initialize homedrive and
-	homepath to NULL.
-
-2002-06-13  Christopher Faylor  <cgf@redhat.com>
-
-	* security.cc (get_logon_server): Use strcasematch rather than
-	strcasecmp.
-
-2002-06-12  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (chdir): Minor cleanup.
-
-2002-06-12  Christopher Faylor  <cgf@redhat.com>
-
-	* environ.cc (build_env): Correctly fill out windows environment block
-	with win32 paths rather than posix paths.
-
-2002-06-12  Christopher Faylor  <cgf@redhat.com>
-
-	* cygheap.cc (cygheap_user::set_name): Set homedrive and homepath to
-	NULL on user name change.
-	(cygheap_user::set_logsrv): Allocate enough space for leading \\ so
-	that we can put this in the environment, if needed.
-	* cygheap.h (homebodies): New enum.
-	(cygheap_user::homedrive): New field.
-	(cygheap_user::homepath): Ditto.
-	(cygheap_user::env_logsrv): New method.
-	(cygheap_user::env_homepath): New method.
-	(cygheap_user::env_homedrive): New method.
-	(cygheap_user::env_userprofile): New method.
-	(cygheap_user::ontherange): New method.
-	* environ.cc (envsize): Eliminate debugging argument.
-	(environ_init): Assume that envc counts number of elments not total
-	size.
-	(spenv): New class.
-	(spenvs): New array, rename from forced_winenv_vars, using spenv.
-	(spenv::retrieve): New method.
-	(build_env): Rename from 'winenv' -- one stop shopping for building new
-	environment blocks for both windows and "unix".
-	* environ.h (build_env: Declare.
-	(winenv): Delete declaration.
-	(envsize): Ditto.
-	* spawn.cc (spawn_guts): Use build_env to build windows and cygwin
-	environment blocks.
-	* uinfo.cc (internal_getlogin): Eliminate environment manipulation.
-	Default to info from GetUserName if it exists.  Move HOMEPATH and
-	HOMEDRIVE stuff elsewhere.  Move HOME setting elsewhere.  Only set HOME
-	environment variable in processes that are not parented by a cygwin
-	process.
-	(cygheap_user::ontherange): Define new method.
-	(cygheap_user::env_logsrv): Ditto.
-	(cygheap_user::env_homepath): Ditto.
-	(cygheap_user::env_homedrive): Ditto.
-	(cygheap_user::env_userprofile): Ditto.
-
-2002-06-11  Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (spawn_guts): More hToken removal cleanup.
-
-2002-06-09  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* spawn.cc (spawn_guts): Define sec_attribs and call sec_user_nih()
-	only once.
-
-2002-06-10  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Ensure that -MD gets added to CFLAGS regardless of
-	CFLAGS command-line setting.
-
-	* cygwin.din: Export sexec* functions as function which returns ENOSYS
-	(i.e., sexec* is deprecated).
-	* dtable.cc (dtable::vfork_child_dup): Ensure that impersonation is
-	restored even on failure.
-	* exec.cc: Throughout, remove references to sexec* and _spawnve.
-	* pinfo.h: Remove _spawnve declaration.
-	* spawn.cc: Rename _spawnve to spawnve and use throughout.
-	(spawn_guts): Eliminate hToken argument and processing of same.  Just
-	perform special actions if impersonating.
-	(spawnve): Rename from _spawnve.
-
-2002-06-10  Christopher Faylor  <cgf@redhat.com>
-
-	* include/sys/strace.h (strace): Avoid use of constructor.
-
-2002-06-10  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (dll_crt0_1): Initialize wincap and check for sanity before
-	running global ctors.
-	* wincap.h (wincap): Eliminate constructor.  Default is to zero memory,
-	anyway.
-	* wincap.cc (wincap): Copy this on fork to avoid initialization in
-	forked processes.
-
-2002-06-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.h (fhandler_socket::fixup_after_fork): Revert patch from
-	2002-06-04.
-	* fhandler_socket.cc (fhandler_socket::fixup_after_fork): Ditto.
-	(fhandler_socket::dup): Ditto.
-	* net.cc (fdsock): Make sockets explicitely noninheritable on NT.
-
-2002-06-09  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Correctly
-	set number of links for directory, if appropriate.
-
-2002-06-10  Robert Collins  <rbtcollins@hotmail.com>
-
-	* thread.cc: Variation of a patch from Thomas Pffaf.
-	(__pthread_detach): Cleanup thread object if the thread has terminated.
-	(__pthread_join): Change order of error checks, and lock against
-	join/detach/exit races.
-	(__pthread_exit): Lock object against join/detach/exit races.
-	(pthread::thread_init_wrapper): Ditto.
-	(thread_init_wrapper): Rename to pthread::thread_init_wrapper.
-	(pthread::create): Check that the mutex initialized correctly.
-	(pthread::push_cleanup_handler): Lock against potential cancellation
-	race. NB: this may not be required if pthread_cleanup_push is non-
-	cancelable.
-	* thread.h (pthread::mutex): New member.
-	(thread_init_wrapper): Rename to pthread::thread_init_wrapper.
-	(pthread::thread_init_wrapper_: New static member.
-
-2002-06-10  Robert Collins  <rbtcollins@hotmail.com>
-
-	* cygwin.din: Add _pthread_cleanup_push and _pthread_cleanup_pop.
-	* pthread.cc: Change __pthread_self to pthread::self() thruoghout.
-	(_pthread_cleanup_push): New function.
-	(_pthread_cleanup_pop): Ditto.
-	* thread.cc: Thanks to Thomas Pfaff for the pthread cleanup_push,_pop
-	patch, this work is derived from that.
-	Change __pthread_self to pthread::self() thruoghout.
-	(__pthread_self): Rename to pthread::self.
-	(pthread::self): New method.
-	(pthread::pthread): Initialize new member.
-	(pthread::push_cleanup_handler): New method.
-	(pthread::pop_cleanup_handler): New method.
-	(pthread::pop_all_cleanup_handlers): New method.
-	(__pthread_exit): Pop all cleanup handlers.
-	* thread.h (pthread::push_cleanup_handler): Declare.
-	(pthread::pop_cleanup_handler): Ditto.
-	(pthread::pop_all_cleanup_handlers): Ditto.
-	(pthread::self): New static method.
-	(__pthread_exit): Give C++ linkage.
-	(__pthread_join): Ditto.
-	(__pthread_detach): Ditto.
-	(__pthread_self): Remove.
-
-2002-04-24  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* include/pthread.h (__pthread_cleanup_handler): New structure.
-	(pthread_cleanup_push): Rewritten.
-	(pthread_cleanup_pop): Ditto.
-	(_pthread_cleanup_push): New prototype.
-	(_pthread_cleanup_pop): Ditto.
-
-2002-04-24  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.cc (thread_init_wrapper): Check if thread is already joined.
-	(__pthread_join): Set joiner first.
-	(__pthread_detach): Ditto.
-
-2002-06-10  Robert Collins  <rbtcollins@hotmail.com>
-
-	* cygserver_transport.cc (create_server_transport): Finish the split
-	out of sockets code from transport_layer_base. Thanks to Nicholas
-	Wourms and Conrad Scott for catching this.
-
-2002-06-08  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (pinfo_dummy): Initialize to correct size.
-
-2002-06-08  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc: Change MOUNT_AUTO to MOUNT_CYGDRIVE throughout.
-	* shared_info.h (CURR_MOUNT_MAGIC): Update.
-
-2002-06-08  Christopher Faylor  <cgf@redhat.com>
-
-	* external.cc (cygwin_internal): Make v1 mount table access invalid.
-	* path.cc (mount_info::init): Remove had_to_create_mount_areas initialization.
-	(mount_info::from_registry): Remove v1 table import.
-	(mount_info::read_v1_mounts): Eliminate.
-	(mount_info::import_v1_mounts): Ditto.
-	* shared_info.h (mount_info): Ditto for both of above.
-	* sys/mount.h (MOUNT_DEVFS): New enum.
-	(MOUNT_PROC): Ditto.
-
-2002-06-08  Christopher Faylor  <cgf@redhat.com>
-
-	* include/wchar.h: Define __need_size_t.
-
-2002-06-07  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_socket.cc (fhandler_socket::fstat): Don't assume that socket
-	is unix-domain socket.
-
-2002-06-07  Christopher Faylor  <cgf@redhat.com>
-
-	* times.cc (hires_ms::prime): Set init flag.
-
-2002-06-07  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* times.cc (hires_ms::prime): Adjust epoch of initime_us from 1601 to
-	1970.
-
-2002-06-06  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload.cc (timeGetDevCaps): Define new autoload function.
-	(timeGetTime): Ditto.
-	(timeBeginPeriod): Ditto.
-	(timeEndPeriod): Ditto.
-	* hires.h (hires_base): New class.  Rename from hires.
-	(hires_us): New class.
-	(hires_ms): New class.
-	* strace.cc (strace::microseconds): Use hires_us class.
-	* times.cc (gettimeofday): Use hires-ms class.
-	(hires_us::prime): Rename from hires::prime.
-	(hires_us::usecs): Rename from hires:usecs.
-	(hires_ms::prime): New method.
-	(hires_ms::usecs): New method.
-	(hires_ms::~hires_ms): New destructor.
-
-2002-06-06  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload.cc (noload): Correctly save argument count register.
-
-2002-06-05  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* fhandler.cc (fhandler_base::fstat): Initialise tv_nsec member of
-	st_atim, st_mtim, and st_ctim fields.
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Ditto.
-	* fhandler_process.cc (fhandler_process::fstat): Ditto.
-	* glob.c (stat32_to_STAT): Copy across the whole st_atim, st_mtime, and
-	st_ctim fields.
-	* syscalls.cc (stat64_to_stat32): Ditto.
-	* times.cc (to_timestruc_t): New function.
-	(time_as_timestruc_t): New function.
-	* winsup.h: Add to_timestruc_t and time_as_timestruc_t functions.
-	* include/cygwin/stat.h: Replace time_t with timestruc_t throughout for
-	all file times, removing the st_spare1, st_spare2, and st_spare3 fields
-	in the process.  Add macros to access tv_sec fields by old names.
-	* include/cygwin/types.h: Typedef timespec_t and timestruc_t as struct
-	timespec.
-
-2002-06-03  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* sec_helper.cc (lookup_name): Suppress.
-	* security.cc (alloc_sd): Remove logsrv argument.
-	Remove two calls to lookup_name.
-	(set_security_attribute): Remove logsrv argument.
-	Remove logsrv argument in call to alloc_sd.
-	(set_nt_attribute): Remove logsrv argument.
-	Remove logsrv argument in call to set_security_attribute.
-	(set_file_attribute): Remove logsrv argument.
-	Remove logsrv argument in call to set_nt_attribute.
-	(set_file_attribute): Remove logsrv argument.
-	Remove logsrv argument in call to set_file_attribute.
-	* syscalls.cc (chown_worker): Remove logserver argument in
-	call to set_file_attribute.
-	(chmod): Ditto.
-	* shm.cc (shmget): Remove logsrv argument in call to alloc_sd.
-	* uinfo.cc (internal_getlogin): Replace calls to
-	lookup_name by call to LookupAccountName.
-	* security.h: Remove logsrv in declarations of set_file_attribute
-	and alloc_sd. Remove declaration of lookup_name.
-
-2002-06-05  Christopher Faylor  <cgf@redhat.com>
-
-	* child_info.h (CHILD_INFO_MAGIC): Oops.  Revert previous change.  gcc
-	3.1 bug?
-
-2002-06-05  Christopher Faylor  <cgf@redhat.com>
-
-	* child_info.h (CHILD_INFO_MAGIC): Update.
-
-2002-06-05  Christopher Faylor  <cgf@redhat.com>
-
-	* strace.cc (strace::hello): Set inited, when appropriate.
-
-2002-06-05  Christopher Faylor  <cgf@redhat.com>
-
-	* cygwin.din: Eliminate some newlib wrappers.
-	* path.cc (get_devn): Only consider first 99 potential com devices.
-	(get_device_number): Ditto.
-	* times.cc (_times): Eliminate.
-	(_times): Rename from times().
-
-2002-06-05  Christopher Faylor  <cgf@redhat.com>
-
-	* dir.cc (rmdir): Streamline.  Detect attempts to remove directories
-	from "read-only" virtual devices. (Suggested by Pavel Tsekov)
-	* syscalls.cc (unlink): Detect attempts to remove directories from
-	"read-only" virtual devices.  (From Pavel Tsekov)
-
-2002-06-05  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (handle_to_fn): Check error return value from NtQueryObject
-	first before seeing if name buffer is NULL.
-
-	* grp.cc (read_etc_group): Fix gcc warning regarding snprintf format.
-	* passwd.cc (read_etc_passwd): Ditto.
-
-2002-04-18  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* thread.h (pthread::joiner): New member.
-	* thread.cc (pthread::pthread): Initialize joiner to NULL
-	(pthread::create): Increment of thread counter moved from
-	__pthread_create to this location.
-	(__pthread_create): Increment thread counter removed.
-	(thread_init_wrapper): Set joiner to self when thread was created
-	detached.
-	(__pthread_exit): delete thread when it is detached and not
-	joined.
-	(__pthread_join): Check for deadlock and delete thread when it has
-	terminated.
-	(__pthread_detach): Set joiner to self when thread state
-	changed to detached.
-
-2002-06-05  Corinna Vinschen  <corinna@vinschen.de>
-
-	* grp.cc (read_etc_group): When emulating nonexisting group file on
-	NT systems, read primary group SID from process token.  Use that info
-	to create correct group entry.  On error or on 9x systems fallback
-	to emulating Administrators group as before.
-	* passwd.cc (read_etc_passwd): When emulating nonexisting passwd file
-	on NT systems, read user and primary group SID from process token.
-	Use that info to create correct passwd entry.  On error or on 9x
-	systems fallback to emulating user with Administrator user id and
-	Administrators group as before.
-
-2002-06-05  Corinna Vinschen  <corinna@vinschen.de>
-
-	* grp.cc (etc_group): Removed.
-	(parse_grp): Make line parameter nonconst.  Don't copy data into new
-	allocated memory.  Check for CR instead of LF to accomodate new
-	read method.
-	(add_grp_line): Make line parameter nonconst.
-	(read_etc_group): Rearrange using new pwdgrp_read class.
-	* passwd.cc (parse_pwd): Don't copy data into new allocated memory.
-	Check for CR instead of LF to accomodate new read method.
-	(read_etc_passwd): Rearrange using new pwdgrp_read class.
-	* pwdgrp.h (pwdgrp_check::set_last_modified):  Use different
-	parameters.
-	(class pwdgrp_read): New class for opening and reading passwd and
-	group files.
-
-2002-06-04  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (handle_to_fn): Attempt to handle "raw" accesses to remote
-	shares.
-	* path.cc (mount_info::conv_to_win32_path): Set flags to binary when
-	mount entry is not found.
-	(mount_info::set_flags_from_win32_path): Ditto.
-
-2002-06-04  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (handle_to_fn): Correct placement and length of name
-	buffer.  (Suggested by Pavel Tsekov)
-
-2002-06-04  Christopher Faylor  <cgf@redhat.com>
-
-	Remove fcntl.h includes throughout.
-	* fhandler.h: Move fcntl.h include here.
-	(fhandler_base::set_flags): Accept supplied_bin argument.  Make
-	non-inlined.
-	* dtable.cc (dtable::init_std_file_from_handle): Just use binmode from
-	pc.
-	(reset_to_open_binmode): Use set_flags.
-	* cygwin.din (open): Avoid newlib wrapper.
-	(read): Ditto.
-	(unlink): Ditto.
-	(write): Ditto.
-	* fhandler.cc (fhandler_base::set_flags): Accept supplied_bin argument.
-	Make binmode decisions here.
-	(fhandler_base::open): Avoid using pc if it is NULL.  Eliminate binmode
-	logic.  Just call set_flags with binmode argument.
-	(fhandler_base::init): Call set_flags with binmode argument.
-	* fhandler_clipboard.cc (fhandler_dev_clipboard::open): Ditto.
-	* fhandler_console.cc (fhandler_console::open): Ditto.
-	(fhandler_console::init): Force binary on open.
-	* fhandler_disk_file.cc (fhandler_disk_file::open): Don't set binmode
-	here.  Let it happen in base class.
-	* fhandler_dsp.cc (fhandler_dev_dsp::open): Force binmode open.  Set
-	return value appropriately if unable to open.
-	* fhandler_proc.cc (fhandler_proc::open): Make sure flags are set
-	before open_status.
-	* fhandler_process.cc (fhandler_process::open): Ditto.
-	* fhandler_registry.cc (fhandler_registry::open): Ditto.
-	* fhandler_random.cc (fhandler_dev_random::fhandler_dev_random): Ditto.
-	* fhandler_raw.cc (fhandler_dev_raw::open): Force O_BINARY by default.
-	* fhandler_serial.cc (fhandler_serial::init): Ditto.
-	* fhandler_tty.cc (fhandler_tty_slave::open): Ditto.
-	(fhandler_pty_master::open): Ditto.
-	* fhandler_virtual.cc (fhandler_virtual::open): Ditto.
-	* fhandler_windows.cc (fhandler_windows::open): Ditto.
-	* fhandler_zero.cc (fhandler_dev_zero::open): Ditto.
-	* net.cc (fdsock): Ditto.
-	* path.cc (path_conv::check): Avoid checking for executable extension
-	when directory. (Suggested by Pavel Tsekov)
-	(set_flags): Set PATH_TEXT explicitly, when appropriate.
-	(mount_info::conv_to_win32_path): Use set_flags() to set path flags.
-	* path.h (PATH_TEXT): New enum.
-	(path_conv::binmode): Return appropriate constant based on binmode.
-	* pipe.cc (make_pipe): Set binmode to O_TEXT xor O_BINARY.
-	* syscalls.cc (setmode_helper): Make debugging message a little
-	clearer.
-	(setmode): Set binmode via set_flags.
-
-2002-06-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.h (class fhandler_socket): Add private method
-	fixup_after_fork (bool, HANDLE).
-	* fhandler_socket.cc (fhandler_socket::fixup_after_fork): Move
-	functionality to new private method.  Add closing parent socket
-	if not called from dup().  Create method new calling private method
-	with appropriate parameter.
-	(fhandler_socket::fixup_after_exec): Call private method
-	fixup_after_fork with appropriate parameter.
-	(fhandler_socket::dup): Ditto.
-
-2002-06-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler_dsp.cc (fhandler_dev_dsp::open): Set errno to EACCES if
-	requested mode isn't supported.
-
-2002-06-03  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::open): Don't set binmode if already set.
-	Don't check for file.  Files should already be set.  Report on binary
-	mode for debugging.
-	(fhandler_base::fhandler_base): Don't set default binmode here.  That's
-	for later.
-	* fhandler_console.cc (fhandler_console::output_tcsetattr): Don't set
-	binmode, ever, for console.
-	* fhandler_disk_file.cc (fhandler_disk_file::open): Always set the
-	binary mode to the value derived from mount table.
-	* path.cc (mount_info::conv_to_win32_path): Default to binmode if path
-	does not translate into anything in the mount table.
-
-2002-06-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* external.cc (cygwin_internal): Add CW_EXTRACT_DOMAIN_AND_USER
-	handling to call extract_nt_dom_user() from applications.
-	* include/sys/cygwin.h (cygwin_getinfo_types): Add
-	CW_EXTRACT_DOMAIN_AND_USER.
-
-2002-06-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (stat64_to_stat32): Transform st_dev correctly.
-	(fstat64): Add evaluating st_ino and st_dev.
-	(stat_worker): Evaluate st_dev as 32 bit value.
-	* include/cygwin/stat.h: Use new dev_t definition throughout.
-	* include/cygwin/types.h: Define __dev16_t and __dev32_t.  Define
-	dev_t according to __CYGWIN_USE_BIG_TYPES__ setting.
-	* include/sys/sysmacros.h: Define major, minor and makedev
-	according to __CYGWIN_USE_BIG_TYPES__ setting.
-
-2002-06-03  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* syscalls.cc (setegid32): Verify the correctness of the gid
-	of the group returned by getgrgid32.
-
-2002-06-03  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.cc (lsa2wchar): Suppressed.
-	(get_lsa_srv_inf): Suppressed.
-	(get_logon_server_and_user_domain): Suppressed.
-	(get_logon_server): Essentially new.
-	(get_user_groups): Add "domain" argument. Only lookup the
-	designated server and use "domain" in LookupAccountName.
-	(is_group_member): Simplify the arguments.
-	(get_user_local_groups): Simplify the arguments. Do only a
-	local lookup. Use "BUILTIN" and local domain in LookupAccountName.
-	(get_user_primary_group). Only lookup the designated server.
-	(get_group_sidlist): Remove logonserver argument. Do not lookup
-	any server for the SYSTEM account.
-	(create_token): Delete logonserver and call to get_logon_server.
-	Adjust arguments of get_group_sidlist, see above.
-	* security.h: Delete declaration of get_logon_server_and_user_domain
-	and add declaration of get_logon_server.
-	* uinfo.cc (internal_get_login): Call get_logon_server instead of
-	get_logon_server_and_user_domain.
-
-2002-06-02  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (handle_to_fn): Use largest match for device.  Correctly
-	(?) deal with remote drive weirdness.
-
-2002-06-02  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_by_name): Check
-	specifically for non-existent file, first.
-	(fhandler_disk_file::fstat): Perform fd open on files with funny
-	characters.
-
-2002-06-02  Christopher January <chris@atomice.net>
-
-	* fhandler_process.cc (fhandler_process::open): Set fileid.
-
-2002-06-02  Christopher Faylor  <cgf@redhat.com>
-
-	Remove unneeded sigproc.h includes throughout.
-	* fhandler.h (fhandler_proc::fill_filebuf): Take a pinfo argument.
-	* fhandler_proc.cc (fhandler_proc::get_proc_fhandler): Simplify search
-	for given pid.
-	(fhandler_proc::readdir): Assume that pid exists if it shows up in the
-	winpid list.
-	* fhandler_process.cc (fhandler_process::open): Simplify search for
-	given pid.  Call fill_filebuf with pinfo argument.
-	(fhandler_process::fill_filebuf): Pass pinfo here and assume that it
-	exists.
-	* pinfo.h (pinfo::remember): Define differently if sigproc.h is not
-	included.
-
-2002-06-02  Christopher Faylor  <cgf@redhat.com>
-
-	* dll_init.cc (dll_list::detach): Don't run destructor on exit.
-
-2002-06-01  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::fstat): Move dev and ino calculation into
-	caller.
-	* syscalls.cc (stat_worker): Calculate dev and ino calculation here, if
-	zero.
-	* fhandler_proc.cc (fhandler_proc::fhandler_proc): Minor reorg for
-	debugging.
-	* fhandler_process.cc (fhandler_process::exists): Return 0 on
-	nonexistence.
-	(fhandler_process::fstat): Simplify pid logic.
-	* fhandler_tape.cc (fhandler_dev_tape::fstat): Minor reformatting.
-
-2002-06-01  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (chdir): Don't allow cd'ing to a non-directory virtual path.
-
-2002-05-31  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (readdir): Move inode calculation into caller.
-	(fhandler_cygdrive::readdir): Add "." and "..".
-	* dir.cc (readdir): Move inode calculation here so that fhandler
-	readdirs can benefit.
-
-2002-05-31  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (fhandler_console::open): Reinstate setting of
-	flags.
-
-	* dtable.cc (dtable::init_std_file_from_handle): Default to using
-	binmode derived from path_conv, when required.
-	* fhandler.h (fhandler_base::get_w_binary): Default to binmode if
-	nothing else is specified.
-	* fhandler.h (fhandler_base::get_r_binary): Ditto.
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_by_handle): Work
-	around g++ warning.
-
-	* path.cc (path_conv::check): Remove a debugging statement.
-
-2002-05-31  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_console.cc (fhandler_console::open): Always default to
-	binmode.
-	(fhandler_console::write_normal): Don't honor binmode setting.  There
-	is already a termios setting for this.
-	(fhandler_console::init): Correct argument order in init call.
-
-2002-05-31  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::open): Make default open mode == binmode.
-	(fhandler_base::init): Set open flags based on derived binmode argument.
-
-2002-05-31  Christopher Faylor  <cgf@redhat.com>
-
-	* dll_init.cc (dll_list::init): Eliminate unneeded debugging statement.
-
-2002-05-31  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_proc.cc (fhandler_proc::readdir): Set errno when no more
-	files.
-	* fhandler_process.cc (fhandler_process::readdir): Ditto.
-	* fhandler_registry.cc (fhandler_registry::readdir): Ditto.
-
-2002-05-30  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (path_conv::check): Set fileattr to INVALID_FILE_ATTRIBUTES
-	for nonexistent virtual device path.
-	(chdir): Set correct errno when attempt is made to cd to nonexistent
-	virtual device path.
-
-2002-05-30  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat): Always call
-	fstat_by_name if fd is not opened to allow fstat_by_name to properly
-	set errno.
-
-2002-05-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* autoload.cc: Replace autoload statments for ZwXXX by NtXXX.
-	Drop ZwQuerySystemInformation since NtQuerySystemInformation was
-	already available.
-	* fhandler_proc.cc (format_proc_uptime): Replace call to
-	ZwQuerySystemInformation by call to NtQuerySystemInformation.
-	(format_proc_stat): Ditto.
-	* fhandler_process.cc (format_process_stat): Replace call to
-	ZwQueryInformationProcess by call to NtQueryInformationProcess.
-	(get_process_state): Ditto.
-	(get_mem_values): Ditto.  Replace call to ZwQueryVirtualMemory by
-	call to NtQueryVirtualMemory.
-	* ntdll.h: Cleanup.  Drop ZwQuerySystemInformation since
-	NtQuerySystemInformation was already available.  Replace declarations
-	of ZwXXX functions by declarations of NtXXX.
-	* pinfo.cc (winpids::enumNT): Replace call to ZwQuerySystemInformation
-	by call to NtQuerySystemInformation.
-
-2002-05-29  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (binmode): Default to binmode when mode is not known.
-
-2002-05-29  Christopher Faylor  <cgf@redhat.com>
-
-	* include/sys/cygwin.h (EXTERNAL_PINFO_VERSION): Reinstate.
-	* external.cc (fillout_pinfo): Use it.
-
-2002-05-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* external.cc (fillout_pinfo): Use new version define.
-	* include/sys/cygwin.h (external_pinfo): Define
-	EXTERNAL_PINFO_VERSION_16_BIT and EXTERNAL_PINFO_VERSION_32_BIT
-	instead of just EXTERNAL_PINFO_VERSION.
-
-2002-05-29  Christopher Faylor  <cgf@redhat.com>
-
-	* external.cc (fillout_pinfo): Set new version field in external_pinfo
-	structure.
-	* include/sys/cygwin.h (external_pinfo): Replace strace_file with
-	version field.
-
-2002-05-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	Change internal uid datatype from __uid16_t to __uid32_t
-	throughout.
-	* cygwin.din: Export new symbols getpwuid32, getpwuid_r32, getuid32,
-	geteuid32, setuid32, seteuid32.
-	* passwd.cc (getpwuid32): New function.
-	(getpwuid_r32): Ditto.
-	* syscalls.cc (seteuid32): Ditto.
-	(setuid32): Ditto.
-	* uinfo.cc (getuid32): Ditto.
-	(geteuid32): Ditto.
-	* winsup.h (uid16touid32): New macro, correct casting from __uid16_t
-	to __uid32_t.
-	(gid16togid32): Ditto fir gids.
-	(getuid32): Declare.
-	(geteuid32): Ditto.
-	(getpwuid32): Ditto.
-	* include/sys/cygwin.h (struct external_pinfo): Add members uid32 and
-	gid32.
-
-2002-05-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/socket.h: Protect some symbols against multiple
-	definition.
-	* include/netinet/ip.h: Ditto.
-	* include/netinet/tcp.h: Ditto.
-
-2002-05-29  Wu Yongwei <adah@netstd.com>
-
-	* include/netinet/ip.h: Replace by BSD derived version of the file.
-	* include/netinet/tcp.h: Ditto.
-	* include/netinet/udp.h: New file.
-	* include/cygwin/ip.h: Remove.
-
-2002-05-29  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::init_std_file_from_handle): Attempt stronger
-	detection of invalid handle.
-	(handle_to_fn): Detect pathological condition where NT resets the
-	buffer pointer to NULL on an invalid handle.
-
-2002-05-28  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Properly
-	check for whether we should be opening the file to search for #!
-	characters.  Set path_conv structure execability, too, when
-	appropriate.
-
-2002-05-28  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (set_security_attribute): Call getegid32() instead of
-	getegid().
-	* include/cygwin/grp.h: Declare getegid32().
-
-2002-05-28  Corinna Vinschen  <corinna@vinschen.de>
-
-	Change internal gid datatype from __gid16_t to __gid32_t
-	throughout.
-	* cygwin.din: Export new symbols chown32, fchown32, getegid32,
-	getgid32, getgrgid32, getgrnam32, getgroups32, initgroups32, lchown32,
-	setgid32, setegid32, getgrent32.
-	* grp.cc (grp32togrp16): New static function.
-	(getgrgid32): New function.
-	(getgrnam32): Ditto.
-	(getgrent32): Ditto.
-	(getgroups32): Change name of internal function from getgroups.
-	(getgroups32): New function.
-	(initgroups32): Ditto.
-	* syscalls.cc (chown32): Ditto.
-	(lchown32): Ditto.
-	(fchown32): Ditto.
-	(setegid32): Ditto.
-	(setgid32): Ditto.
-	* uinfo.cc (getgid32): Ditto.
-	(getegid32): Ditto.
-	* include/cygwin/grp.h: Remove declaration of getgrgid() and getgrnam().
-	Declare getgrgid32() and getgrnam32() instead.  Declare getgid32().
-
-2002-05-27  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload.cc (noload): Properly mask low order word for determining
-	number of bytes to pop.
-
-2002-05-27  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat): Minor logic
-	cleanup.
-
-2002-05-27  Christopher Faylor  <cgf@redhat.com>
-
-	* autoload.cc (LoadFuncEx): Define via new LoadFuncEx2 macro.
-	(LoadFuncEx2): Adapt from LoadFuncEx.  Provides control of return
-	value for nonexistent function.
-	(NtQueryObject): Declare.
-	(IsDebuggerPresent): Declare via LoadFuncEx2 and always return true if
-	not available.
-	* debug.h (being_debugged): Just rely on IsDebuggerPresent return
-	value.
-	* dtable.cc (handle_to_fn): New function.
-	(dtable::init_std_file_from_handle): Attempt to derive std handle's
-	name via handle_to_fn.
-	(dtable::build_fhandler_from_name): Fill in what we can in path_conv
-	structure when given a handle and path doesn't exist.
-	* fhandler.cc (fhandler_base::open): Don't set the file pointer here.
-	Use pc->exists () to determine if file exists rather than calling
-	GetFileAttributes again.
-	* fhandler.h (fhandler_base::exec_state_isknown): New method.
-	(fhandler_base::fstat_helper): Add extra arguments to declaration.
-	(fhandler_base::fstat_by_handle): Declare new method.
-	(fhandler_base::fstat_by_name): Declare new method.
-	* fhandler_disk_file (num_entries): Make __stdcall.
-	(fhandler_base::fstat_by_handle): Define new method.
-	(fhandler_base::fstat_by_name): Define new method.
-	(fhandler_base:fstat): Call fstat_by_{handle,name} as appropriate.
-	(fhandler_disk_file::fstat_helper): Accept extra arguments for filling
-	out stat structure.  Move handle or name specific stuff to new methods
-	above.
-	(fhandler_disk_file::open): Use real_path->exists rather than calling
-	GetFileAttributes again.
-	* ntdll.h (FILE_NAME_INFORMATION): Define new structure.
-	(OBJECT_INFORMATION_CLASS): Partially define new enum.
-	(OBJECT_NAME_INFORMATION): Define new structure.
-	(NtQueryInformationFile): New declaration.
-	(NtQueryObject): New declaration.
-	* path.cc (path_conv::fillin): Define new method.
-	* path.h (path_conv::fillin): Declare new method.
-	(path_conv::drive_thpe): Rename from 'get_drive_type'.
-	(path_conv::volser): Declare new method.
-	(path_conv::volname): Declare new method.
-	(path_conv::root_dir): Declare new method.
-	* syscalls.cc (fstat64): Send real path_conv to fstat as second
-	argument.
-
-2002-05-24  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.cc (lsa2str): New function.
-	(get_priv_list): Call lsa2str instead of sys_wcstombs.
-
-2002-05-22  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* syscalls.cc (seteuid): Do not take allow_ntsec into account.
-	Attempt to use an existing or new token even when the uid
-	matches orig_uid, but the gid is not in the process token.
-	Major reorganization after several incremental changes.
-	(setegid): Do not take allow_ntsec into account. Minor
-	reorganization after several incremental changes.
-
-2002-05-26  Christopher Faylor  <cgf@redhat.com>
-
-	* debug.h (being_debugged): New macro.
-	* dtable.cc (dtable::extend): Use new macro.
-	* exceptions.cc (try_to_debug): Ditto.
-	* strace.cc (strace::hello): Only output debugging info when we think
-	we're being debugged.
-
-2002-05-25  Robert Collins   <rbtcollins@hotmail.com>
-
-	* winsup.h: Remove duplicate declarations of malloc_lock and
-	malloc_unlock.
-
-2002-05-24  Christopher Faylor  <cgf@redhat.com>
-
-	Remove unneeded sync.h, where appropriate, throughout.
-	Remove unneeded heap.h, where appropriate, throughout.
-	Remove unneeded exceptions.h, where appropriate, throughout.
-	Remove unneeded perprocess.h, where appropriate, throughout.
-
-2002-05-22  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.cc (create_token): Call __sec_user() instead of
-	sec_user() to remove dependence on allow_ntsec. Verify that
-	the returned sd is non-null.
-
-2002-05-25  Robert Collins   <rbtcollins@hotmail.com>
-
-	* gmon.c (fake_sbrk): Correctly return -1 on failed malloc's.
-
-2002-05-24  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::build_fhandler_from_name): Just pass posix path
-	along to set_name via return_and_clear_normalized_path.
-	(dtable::build_fhandler): New method with const char * argument.
-	(dtable::reset_unix_path_name): Eliminate.
-	(dtable::dup_worker): Use correct build_fhandler method.
-	* mmap.cc (mmap_record::alloc_fh): Ditto.
-	* dtable.h (dtable::build_fhandler): New method.
-	(dtable::reset_unix_path_name): Eliminate.
-	* fhandler.cc (fhandler_base::set_name): Assume that unix_name has
-	already been cmalloced.
-	(fhandler_base::reset_unix_path_name): Eliminate.
-	(fhandler_base::~fhandler_base): Coercion for cfree.
-	* fhandler.h (fhandler_base::unix_path_name): Make const char *.
-	(fhandler_base::win32_path_name): Ditto.
-	(fhandler_base::reset_unix_path_name): Eliminate.
-	* fhandler_disk_file.cc (fhandler_cygdrive::set_drives): Accommodate
-	const char *ness of win32_path_name.
-	* fhandler_socket.cc (fhandler_socket::fstat): Accommodate new set_name
-	requirements.
-	* path.cc (path_conv::return_and_clear_normalized_path): New method.
-	(path_conv::clear_normalized_path): Eliminate.
-	(path_conv::~path_conv): Ditto.
-	(path_conv::check): Accommodate new build_fhandler method.
-	* path.h (path_conv::~path_conv): Eliminate.
-	(path_conv::clear_normalized_path): Ditto.
-	(path_conv::return_and_clear_normalized_path): Declare new method.
-
-2002-05-23  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (path_conv::check): Make sure any trailing path component is
-	part of potential normalized posix path.
-
-2002-05-23  Christopher Faylor  <cgf@redhat.com>
-
-	* smallprint.c (__small_vsprintf): Implement '%o' after all these
-	years.
-
-2002-05-22  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (fhandler_virtual::exists): Eliminate path argument.
-	(fhandler_proc::exists): Ditto.
-	(fhandler_registry::exists): Ditto.
-	(fhandler_process::exists): Ditto.
-	* fhandler_proc.cc (fhandler_proc::exists): Ditto.  Use built-in name.
-	* fhandler_process.cc (fhandler_process::exists): Ditto.
-	(fstat): Ditto.
-	* fhandler_registry.cc (fhandler_registry::exists): Ditto.
-	(fhandler_registry::fstat): Ditto.
-	* fhandler_virtual.cc (fhandler_virtual::opendir): Ditto.
-	* path.cc (path_conv::check): Ditto.  Add debugging.
-
-2002-05-22  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (dup): Always call dup2 for error handling.
-
-2002-05-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/types.h: Revert previous patch.
-
-2002-05-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/types.h: Define pthread stuff only if _POSIX_THREADS
-	is defined.
-
-2002-05-19  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* security.cc (open_local_policy): Initialize lsa to
-	INVALID_HANDLE_VALUE instead of NULL.
-	(get_logon_server_and_user_domain): Test for INVALID_HANDLE_VALUE
-	instead of NULL.
-	(create_token): Both of the above.
-
-2002-05-18  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat): Make handling of
-	nlink consistent for remote files.
-
-2002-05-18  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (path_conv::check): Always set executable bit for executable
-	extension.
-
-2002-05-17  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::lseek): Avoid calling SetFilePointer with
-	high order part of 64 bit address on OS's which do not support that
-	kind of operation.  Otherwise Windows 95 will become confused.
-
-2002-05-16  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* fhandler_raw.cc (fhandler_dev_raw::open): Replace set_errno()
-	by __seterrno_from_win_error().
-	* security.cc (open_local_policy): Ditto.
-	(get_lsa_srv_inf): Ditto.
-	(get_user_groups): Ditto.
-	(get_user_primary_group): Ditto.
-	(create_token): Ditto.
-	(subauth): Ditto.
-
-2002-05-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* times.cc (utimes): Use FILE_WRITE_ATTRIBUTES even on 9x/Me when
-	opening file for writing timestamp.
-	* wincap.cc: Remove flag has_specific_access_rights.
-	* wincap.h: Ditto.
-
-2002-05-13  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* syscalls.cc (seteuid): Set default dacl in process token.
-	Replace in-line code by call to verify_token().
-	(setegid): Reverse change from 2002-01-21. Add call to
-	RevertToSelf and set primary group in impersonation token.
-	* security.cc (create_token): Store pgrpsid in token security
-	descriptor, except if it already appears in my_grps.
-	Use sec_acl() in place of get_dacl().
-	(verify_token): Create from code in seteuid(), with tighter checks.
-	(get_dacl): Deleted.
-	(get_group_sidlist): Add argument to indicate if pgrpsid is already
-	in the groups.
-	* security.h: Define verify_token().
-	* autoload.cc: Load GetKernelObjectSecurity().
-
-2002-05-13  Mark Bradshaw  <bradshaw@staff.crosswalk.com>
-
-	* cygwin.din: Add strlcat and strlcpy.
-	* include/cygwin/version.h: Increment API minor version number.
-
-2002-05-09  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* shared.cc (__sec_user): Split into sec_acl() and call orig_sid().
-	(sec_acl): Create from part of __sec_user(), except creator/owner.
-	* security.h: Define sec_acl() and MAX_DACL_LEN.
-
-2002-05-12  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::open): Avoid using
-	O_DIROPEN when OS doesn't support it.  Return proper errno in that
-	case.
-
-2002-05-12  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (_read): Change error to EBADF if attempt to read from a
-	non-readable fd.
-
-2002-05-11  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.h (executable_states): For now, make dont_care_if_executable
-	equivalent to not_executable.
-	* sys/mount.h: Define MOUNT_NOTEXEC.
-	* path.h (fs_info): New class.
-	(path_conv): Move fs-specific fields to new 'fs' structure.
-	(path_conv::update_fs_info): Move to fs_info and rename to just 'update'.
-	* path.cc (fs_info::update): Ditto.  Return 'true' if successful.
-	(fillout_mntent): Add ',noexec' to list of reported options.
-
-2002-05-11  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_virtual.cc (fhandler_virtual::close): Quiet a compiler
-	warning.
-
-2002-05-10  Christopher January <chris@atomice.net>
-
-	* autoload.cc: Add dynamic load statements for
-	'ZwQueryInformationProcess' and 'ZwQueryVirtualMemory'.
-	* fhandler.h: Change type of bufalloc and filesize members of
-	fhandler_virtual from int to size_t.  Change type of position member
-	from __off32_t to __off64_t.  Add new fileid member to fhandler_virtual
-	class.  Make seekdir take an __off64_t argument.  Make lseek take an
-	__off64_t argument.  Add fill_filebuf method to fhandler_virtual.  Add
-	fill_filebuf method to fhandler_proc.  Add fill_filebuf method to
-	fhandler_registry.  Add fill_filebuf method to fhandler_process.  Add
-	saved_pid and saved_p members to fhandler_process.
-	* fhandler_proc.cc (proc_listing_array): Add 'loadavg', 'meminfo', and 'stat'.
-	(proc_fhandlers array): Ditto.
-	(fhandler_proc::open): Use fill_filebuf to flesh out the file contents.
-	(fhandler_proc::fill_filebuf): New method.
-	(fhandler_proc::format_proc_meminfo): Ditto.
-	(fhandler_proc::format_proc_stat): Ditto.
-	(fhandler_proc::format_proc_uptime): Ditto.
-	* fhandler_process.cc (process_listing): Add 'stat' and 'statm'.
-	(fhandler_process::fstat): Find the _pinfo structure for the process
-	named in the filename.  Return ENOENT if the process is no longer
-	around.  Set the gid and uid fields of the stat structure.
-	(fhandler_process::open): Store pid and pointer to _pinfo structure in
-	saved_pid and saved_p respectively.  Use fill_filebuf to flesh out file
-	contents.
-	(fhandler_proc::fill_filebuf): New method.
-	(format_process_stat): New function.
-	(format_process_status): Ditto.
-	(format_process_statm): Ditto.
-	(get_process_state): Ditto.
-	(get_mem_values): Ditto.
-	* fhandler_registry.cc (fhandler_registry::seekdir): Change argument
-	type from __off32_t to __off64_t.
-	(fhandler_registry::fill_filebuf): New method.
-	* fhandler_virtual.cc (fhandler_virtual::seekdir): Change argument type
-	from __off32_t to __off64_t.
-	(fhandler_virtual::lseek): Ditto.
-	(fhandler_virtual::fill_filebuf): New method.
-	(fhandler_virtual::fhandler_virtual): Initialise fileid to -1.
-	* wincap.cc: Set flag has_process_io_counters appropriately.
-	* wincap.h: Add flag has_process_io_counters.
-
-2002-05-09 Christopher Faylor <cgf@redhat.com>
-
-	* syscalls.cc (_write): Change error to EBADF if attempt to write to a
-	non-writeable fd.
-
-2002-05-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygheap.h (class cygheap_user): Add member `orig_psid'.
-	Add method `orig_sid()'.
-	* cygheap.cc (cygheap_user::set_sid): Maintain orig_psid.
-
-2002-04-28  Norbert Schulze  <norbert.schulze@web.de>
-
-	* localtime.cc (tzsetwall): Use wildabbr if generated timezone name
-	length < 3.
-
-2002-05-05  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* spawn.cc (spawn_guts): Move call to set_process_privilege()
-	to load_registry_hive().
-	* registry.cc (load_registry_hive): ditto.
-	* fork.cc (fork_parent): Call sec_user_nih() only once.
-
-2002-05-04  Christopher January <chris@atomice.net>
-
-	* path.h (path_conv::path_conv): Initialise normalized_path to NULL.
-
-2002-05-03  Christopher Faylor  <cgf@redhat.com>
-
-	* net.cc (getdomainname): Change second argument of getdomainname to
-	size_t.
-
-2002-05-03  Christopher January <chris@atomice.net>
-
-	* fhandler_proc.cc (proc_listing): Add '.' and '..' to directory
-	listing.
-	(fhandler_proc::open): Change use of mode to flags.  If the file does
-	not exist already, fail with EROFS if O_CREAT flag is set.  Change
-	EROFS error to EACCES error when writing to a file.  Use cmalloc to
-	allocate memory for filebuf.
-	(fhandler_proc::close): Use cfree to free filebuf.
-	(fhandler_proc::get_proc_fhandler): Properly detect attempts to access
-	unknown subdir.
-	* fhandler_process.cc (process_listing): Add '.' and '..' to directory
-	listing.
-	(fhandler_process::open): Use cmalloc to allocate memory for filebuf.
-	(fhandler_process::close): Use cfree to free filebuf.
-	* fhandler_registry.cc (registry_listing): Add .  and '..' to directory
-	listing.
-	(fhandler_registry::open): Move check for open for writing before
-	open_key.  Use cmalloc to allocate memory for filebuf.
-	(fhandler_registry::close): Use cfree to free filebuf.
-	(fhandler_registry::telldir): Use lower 16 bits of __d_position as
-	position in directory.
-	(fhandler_registry::seekdir): Ditto.
-	* fhandler_virtual.cc (fhandler_virtual::write): Change EROFS error to
-	EACCES error.
-	(fhandler_virtual::open): Set the NOHANDLE flag.
-	(fhandler_virtual::dup): Add call to fhandler_base::dup.  Allocate
-	child's filebuf using cmalloc.  Copy filebuf from parent to child.
-	(fhandler_virtual::close): Use cfree to free filebuf.
-	(fhandler_virtual::~fhandler_virtual): Ditto.
-	(from Chris Faylor <cgf@redhat.com>).
-	(fhandler_registry::readdir): Add support for '.' and '..' files in
-	subdirectories of /proc/registry.
-	* path.cc (path_conv::check): Do not return ENOENT if a file is not
-	found in /proc.
-
-2002-05-02  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_proc.cc (fhandler_proc::fstat): Use fhandler name rather
-	than path_conv name.
-	(fhandler_proc::open): Ditto.
-	* fhandler_process.cc (fhandler_process::fstat): Use fhandler name
-	rather than path_conv name.
-	(fhandler_process::open): Ditto.
-	* fhandler_registry.cc (fhandler_registry::fstat): Use fhandler name
-	rather than path_conv name.
-	(fhandler_registry::open): Ditto.
-	* path.cc (path_conv::check): Don't copy posix path when virtual.
-	(mount_info::conv_to_win32_path): Don't zero string when isproc.  Just
-	derive normal windows path.
-
-	* path.h (path_conv::clear_normalized_path): Declare new method.
-	* path.cc (path_conv::clear_normalized_path): Define new method.
-	* dtable.cc (build_fhandler_from_name): Clear normalized path when
-	finished to conserve space.
-
-2002-05-02  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_proc.cc (fhandler_proc::fstat): Prime with information from
-	fhandler_base::fstat.  Use defines rather than constants for permission
-	settings.
-
-2002-04-30  Eric Blake  <ebb9@email.byu.edu>
-
-	* path.cc (hash_path_name): Improve hash function strength.
-
-2002-05-02  Robert Collins <rbtcollins@hotmail.com>
-
-	* thread.cc (__pthread_cond_dowait): Fix a race on signalling from a
-	thread woken by the same condition variable it's signalling on. Thanks
-	to Michael Beach for the report and test case.
-
-2002-05-02  Christopher Faylor  <cgf@redhat.com>
-
-	* path.h (pathconv_arg): Add PC_POSIX.
-	(path_conv): Add normalized_path field.
-	* path.cc (path_conv::~path_conv): New destructor.
-	(path_conv::check): Set normalized_path, where appropriate.
-	* dtable.cc (build_fhandler_from_name): Use normalized path from
-	path_conv.
-	* syscalls.cc (chroot): Ditto.
-
-	* cygheap.h: Remove path_prefix_p declaration.
-
-2002-02-26  Christopher January <chris@atomice.net>
-	    Christopher Faylor <cgf@redhat.com> (minor fixups)
-
-	* Makefile.in: Add fhandler_proc.o, fhandler_registry.o,
-	fhandler_process.o and fhandler_virtual.o.
-	* dtable.cc (dtable::build_fhandler): Add entries for FH_PROC,
-	FH_REGISTRY and FH_PROCESS.  Set unix_name to the normalized posix
-	path.
-	* fhandler.h: Add constants for FH_PROC, FH_REGISTRY and FH_PROCESS.
-	Add class declarations for fhandler_virtual, fhandler_proc,
-	fhandler_registry and fhandler_virtual.  Update fhandler_union
-	accordingly.
-	* fhandler_proc.cc: New file.  Add implementation for fhandler_proc.
-	* fhandler_virtual.cc: New file.  Add implementation for
-	fhandler_virtual.
-	* fhandler_process.cc: New file.  Add implementation for
-	fhandler_process.
-	* fhandler_registry.cc: New file.  Add implementation for
-	fhandler_registry.
-	* path.cc (isproc): New macro.
-	(isvirtual_dev): Ditto.
-	* path.cc (path_conv::check): Add check for virtual devices.
-	* path.cc (mount_info::conv_to_win32_path): Convert paths in /proc to
-	empty Win32 paths.
-	* path.cc (chdir): Replace check for FH_CYGDRIVE with more generic
-	isvirtual_dev macro.  Force setting of posix path for virtual
-	fhandlers.
-	* path.h (path_prefix_p): Declare.
-
-
-Wed May  1 16:06:02 2002  Jason Tishler <jason@tishler.net>
-
-	* include/cygwin/types.h: Include <sys/sysmacros.h>.
-
-Wed Apr 17 11:27:04 2002  Jason Tishler <jason@tishler.net>
-
-	* security.cc (get_lsa_srv_inf): Prevent extraneous backslashes for
-	the NT Domain case.
-
-2002-04-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (cygwin_accept): Set socket type for accepted socket.
-	(socketpair): Set socket type for both sockets.
-
-2002-04-12  Egor Duda  <deo@logos-m.ru>
-
-	* fhandler.h (class fhandler_socket): New member to store socket type.
-	(fhandler_socket::get_socket_type): Access it.
-	(fhandler_socket::set_socket_type): Ditto.
-	* net.cc (cygwin_socket): Store socket type.
-	(cygwin_connect): Disable security checks for connectionless sockets.
-	(cygwin_accept): Ditto.
-
-2002-04-09  Mark Bradshaw  <bradshaw@staff.crosswalk.com>
-
-	* cygwin.din: Add strptime.
-	* include/cygwin/version.h: Increment API version number.
-
-2002-04-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fork.cc (fork_child): Call fixup_mmaps_after_fork() somewhat earlier.
-
-2002-04-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fhandler.cc (fhandler_base::open): Set read-only bit in
-	file_attributes when adequate.
-
-2002-03-28  Christopher Faylor  <cgf@redhat.com>
-
-	* times.cc (gettimeofday): Fix typo in previous patch.
-
-2002-03-27  Wu Yongwei  <adah@netstd.com>
-
-	* times.cc (gettimeofday): Revert to setting timezone info if tz !=
-	NULL.
-
-2002-03-21  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Always set
-	st_[ug]id to value derived from get_file_attributes.
-
-2002-03-21  Christopher Faylor  <cgf@redhat.com>
-
-	* spawn.cc (find_exec): Return input if file not found.
-
-2002-03-19  Boris Schaeling  <boriss@web.de>
-
-	* poll.cc (poll): Add support for invalid descriptors.
-
-2002-03-15  Robert Collins  <rbtcollins@hotmail.com>
-
-	* fhandler.h (fhandler_termios::lseek): Override lseek.
-	* fhandler_termios.cc (fhandler_termios::lseek): Implement this.
-
-2002-03-15  Christopher Faylor  <cgf@redhat.com>
-
-	* cygserver.cc: Include stdlib.h for exit declaration.
-	* threaded_queue.cc: Ditto.
-
-2002-03-15  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (pinfo::init): Use PID_ALLPIDS flag to control when a
-	redirected block should be marked as nonexistent.
-	(winpids::add): Use PID_ALLPIDS when looking for all pids.
-	* cygwin.h (PID_ALLPIDS): New enum element.
-
-2002-03-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* glob.c (stat32_to_STAT): New function.
-	(g_lstat): Call user space functions always with 32 bit struct stat
-	as a workaround.
-	(g_stat): Ditto.
-	* include/glob.h (struct glob): Don't prototype function pointers
-	when compiling Cygwin.
-
-2002-03-14  Christopher Faylor  <cgf@redhat.com>
-
-	* pinfo.cc (pinfo::init): Properly handle execed process stub when
-	PID_NOREDIR is specified.
-
-2002-03-13  Boris Schaeling  <boriss@web.de>
-
-	* poll.cc (poll): Remove variable open_fds.  Rearrange and add code to
-	fix settings of revents.
-
-2002-03-13  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (mmap_record::map_map): Return -1 if VirtualProtect fails.
-	(list::erase): New method with no argument.  Erase latest record
-	added.
-	(mmap64): Fail if map_map() fails.
-
-2002-03-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* sysconf.cc (sysconf): Fix condition.
-
-2002-03-11  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mmap.cc (msync): Check area given by addr and len for being a
-	contigeous mmap'd region.
-
-2002-03-11  Corinna Vinschen  <corinna@vinschen.de>
-
-	* fork.cc (fork_child): Call fixup_mmaps_after_fork() before
-	closing parent process handle.  Call fixup_mmaps_after_fork()
-	with parent process handle as parameter.
-	* mmap.cc (mmap_record::access): New method.
-	(fixup_mmaps_after_fork): Take process handle as parameter.
-	In case of FILE_MAP_COPY access, copy valid memory regions to child.
-	* pinfo.h (fixup_mmaps_after_fork): Change prototype accordingly.
-
-2002-03-07  Corinna Vinschen  <corinna@vinschen.de>
-
-	* autoload.cc (NetGetDCName): Add symbol.
-	(NetServerEnum): Remove symbol.
-	* security.cc (get_lsa_srv_inf): Call NetGetDCName() instead of
-	NetServerEnum() since it's faster.  Don't call it at all if machine
-	is not a domain member.
-
-2002-03-06  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (normalize_posix_path): Avoid runs of '.'s > 2.
-
-2002-03-05  Christopher Faylor  <cgf@redhat.com>
-
-	* errno.cc: Change EPERM associated text to "Operation not permitted"
-	throughout.
-
-2002-03-05  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler_socket.cc (fhandler_socket::close): Respond to signals while
-	looping, waiting for socket to close.  Superstitiously clear last error
-	when WSAEWOULDBLOCK.
-
-2002-03-05  Robert Collins  <rbtcollins@hotmail.com>
-
-	* cygserver_transport_pipes.cc (transport_layer_pipes::transport_layer_pipes):
-	Always init - until static members work correctly.
-	* shm.cc (shmget): Initialize the security descriptor - thanks Corinna!
-	* include/sys/ipc.h: Make the ipc control constants partitioned off from the sem
-	control constants.
-
-2002-03-04  Christian Lestrade  <christian.lestrade@free.fr>
-
-	* include/sys/termios.h: Define _POSIX_VDISABLE.  Define CCEQ macro.
-	* fhandler_termios.cc: Include <sys/termios.h>.
-	(line_edit): Recognize disabled c_cc[] chars.  Ignore VDISCARD when
-	not in ICANON mode.
-
-2002-03-04  Dmitry Timoshkov  <dmitry@baikal.ru>
-
-	* syscalls.cc (truncate64): Use ftruncate64 directly to not lose
-	upper 32 bits.
-
-2002-03-04  Robert Collins  <rbtcollins@hotmail.com>
-
-	* cygserver_shm.cc (delete_shmnode): New function.
-	(client_request_shm::serve): Use it.
-
-2002-03-04  Robert Collins  <rbtcollins@hotmail.com>
-
-	* cygserver_shm.cc (client_request_shm::serve): Implement SHM_DETACH.
-	* shm.cc (shmdt): Implement.
-
-2002-03-04  Robert Collins  <rbtcollins@hotmail.com>
-
-	* cygserver_shm.cc: Run indent.
-	(deleted_head): New global for storing shm id's pending deletion.
-	(client_request_shm::serve): Return ENOSYS for invalid request types.
-	Implement SHM_DEL - delete a shm id.
-	* cygserver_shm.h (SHM_DEL): New type value.
-	* shm.cc (delete_inprocess_shmds): New function, does what it's name implies.
-	(shmctl): Implement shm_rmid control type.
-
-2002-03-04  Robert Collins  <rbtcollins@hotmail.com>
-
-	* Makefile.in (install): Remove install-bin to allow make install to work.
-
-2002-03-03  Robert Collins  <rbtcollins@hotmail.com>
-
-	* shm.cc (shmat): Prevent a compile error.
-	(shmdt): Set errno as this function is incomplete.
-
-2002-02-28  Christopher Faylor  <cgf@redhat.com>
-
-	* times.cc: Remove if 0'd code.  Clean up slightly.
-
-2002-02-28  Robert Collins  <rbtcollins@hotmail.com>
-
-	* Merge cygwin_daemon into head minus the new shm and ipc exports.
-
-2002-02-28  Robert Collins  <rbtcollins@hotmail.com>
-
-	* fhandler_tty.cc (fhandler_tty_slave::open): More debugging.
-	(fhandler_tty_slave::read): Fix printf type for the handle.
-	* tty.cc (tty::common_init): Add a FIXME for security.
-
-2002-01-29  Robert Collins  <rbtcollins@hotmail.com>
-
-	* Makefile.in (OBJS): Remove duplicate localtime.o.
-
-2002-01-17  Robert Collins  <rbtcollins@hotmail.com>
-
-	* cygserver.cc (check_and_dup_handle): Consolidate the two variants for
-	simplicity.
-	Add Some basic debug output.
-	(client_request_attach_tty::serve): Use the new debug_printf for clarity.
-	Mark the duplicated handles as inheritable - fixup_after_fork() doesn't reopen
-	tty's.
-
-2002-01-16  Robert Collins  <rbtcollins@hotmail.com>
-
-	* cygserver.cc (transport): Correct scope.
-	(client_request_attach_tty::serve): Add more debug information.
-	Fix erroneous use of transport instead of conn.
-	* cygserver_transport_pipes.cc (transport_layer_pipes::close): More debug.
-	(transport_layer_pipes::read): Ditto.
-	(transport_layer_pipes::write): Ditto.
-	(transport_layer_pipes::impersonate_client): Ditto.
-
-Mon Oct  8  7:41:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* cygserver.cc (server_request::process): Rename client_request_shm_get to
-	client_request_shm.
-	* cygserver_process.cc (process_cache::add): Rename to add_task.
-	Use process_cleanup instead of process_request.
-	(process_cache::remove_process): New method.
-	(process::process): Initialize new members.
-	(process::~process): New member.
-	(process::cleanup): New method.
-	(process::add_cleanup_routine): New method.
-	(process_request::process): Rename to process_cleanup.
-	Call the process object's cleanup method and then delete it.
-	(process_process_param::request_loop): Remove the signalling process.
-	* cygserver_shm.cc: Globally rename client_request_shm_get to client_request_shm.
-	(client_request_shm_get::serve): Handle attach request counting.
-	* cygserver_shm.h: Globally rename client_request_shm_get to client_request_shm.
-	(class shm_cleanup): New class.
-	* shm.cc: Globally rename client_request_shm_get to client_request_shm.
-	(client_request_shm::client_request_shm): New constructor for attach requests.
-	(shmat): Use it.
-	* include/cygwin/cygserver_process.h (class process_request): Rename to
-	process_cleanup.
-	(class cleanup_routine): New class.
-	(class process): New members and methods to allow calling back when the process
-	terminates.
-
-Thu Oct  4 14:12:00 2001  Robert Collins <rbtcollins@hotmail.com>
-	* cygserver.cc (request_loop): Make static.
-	(main): Use new cache constructor syntax.
-	Start cache worker threads.
-	Cleanup the cache at shutdown.
-	* cygserver_process.cc: Run indent.
-	(process_cache::process_cache): Add a trigger to use when adding a process.
-	(process_cache::process): Move process_entry to process.
-	Insert at the end of the list.
-	Trigger the request loop when new process's inserted.
-	(process_cache::process_requests): Do it.
-	(process_cache::add): New method.
-	(process_cache::handle_snapshot): New method.
-	(process::process): Merge in the process_entry fields.
-	(process::handle): Make a stub function.
-	(process::exit_code): New method.
-	(process_request::process): New method.
-	(process_process_param::request_loop): New method.
-	* cygserver_shm.cc: New header dependency - threaded_queue.h.
-	* threaded_queue.cc (threaded_queue::cleanup): Clearer messages.
-	(queue_process_param::stop): Short spinlock on interruptible threads.
-	* threaded_queue.h (class threaded_queue): New constructor.
-	* include/cygwin/cygserver_process.h (process_request): New class.
-	(process_entry): Remove.
-	(process): Merge in process_entry.
-	(process_cache): Inherit from threaded_queue.
-
-Tue Oct  2 23:24:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* cygserver.cc (class server_process_param): Use new constructor syntax.
-	* cygserver_process.cc (process_cache::~process_cache): New function.
-	* threaded_queue.cc: Define condition debug_printf.
-	Run indent.
-	(threaded_queue::cleanup): Move queue_process_param guts to a method.
-	(threaded_queue::process_requests): Ditto.
-	(queue_process_param::queue_process_param): New method.
-	(queue_process_param::~queue_process_param): Ditto.
-	(queue_process_param::start): Ditto.
-	(queue_process_param::stop): Ditto.
-	* threaded_queue.h (class queue_process_param): Add support for
-	interruptible request loops.
-	* cygwin/include/cygwin/cygserver_process.h (class process_cache): Add
-	destructor.
-
-Tue Oct  2 23:24:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* cygserver_client.cc: New flag allow_daemon to disable the daemon completely.
-	(cygserver_request): Check it.
-	(cygserver_init): Ditto.
-	* environ.cc (parse_thing): Add (no)daemon option.
-
-Tue Oct  2 23:00:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* shm.cc: Update to handle include changes from HEAD.
-
-Tue Oct  2 16:06:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* Makefile.in: Remove cygserver_shm.o from cygwin1.dll.
-	Rename cygserver_shm_outside.o to cygserver_shm.o.
-	* cygserver.cc (server_request::process): Use the new client_request
-	constructor.
-	* cygserver_client.cc: Remove the #ifdef's stubs for the server method
-	within cygwin.
-	(client_request_attach_tty::client_request_attach_tty): Use the new
-	client_request constructor.
-	(client_request_shutdown::client_request_shutdown): Ditto.
-	(client_request::client_request): Ditto.
-	* cygserver_shm.cc (client_request_shm_get::serve): Remove the
-	#ifdef'd stub for in-cygwin builds.
-	(client_request_shm_get::client_request_shm_get): Use the new
-	client_request constructor, and remove the in-cygwin variants.
-	* cygserver_shm.h (class client_request_shm_get): #ifndef test the
-	serve method - it's only used in cygserver.
-	* shm.cc (client_request_shm_get::client_request_shm_get): New function.
-	* include/cygwin/cygserver.h (request_header): New constructor.
-	(class client_request): Use it.
-	New constructor accepting the header size.
-	#ifndef test the server method - it's only used within cygserver.
-	(client_request_get_version): #ifdef test the server method.
-	(client_request_shutdown): Ditto.
-	(client_request_attach_tty): Ditto.
-
-Tue Oct  2  9:57:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* Makefile.in: add threaded_queue.o to cygserver.exe.
-	* cygserver.cc: Include threaded_queue.h
-	(class server_request): Inherit from queue_request.
-	(class server_process_param): Inherit from queue_process_param.
-	(class server_request_queue): Inherit from threaded_queue.
-	(request_loop): Adjust for new types.
-	(server_request_queue::process_requests): Remove guts to
-	threaded_queue::process_requests.
-	(server_request::server_request): Adjust for new types.
-	(worker_function): Delete.
-	(server_request_queue::create_workers): Delete.
-	(server_request_queue::cleanup): Delete.
-	(server_request_queue::add): Move guts to threaded_queue::add.
-	* threaded_queue.cc: New file.
-	* threaded_queue.h: New file.
-
-Mon Oct  1 12:38:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* cygserver.cc (client_request::serve): New function.
-	* cygserver_process.cc: Inlude <pthread.h> for pthread_once.
-	(process_cache::process_cache): Initialise a crtiical section for write access.
-	(process_cache::process): Use the critical section. Also add missing entries to
-	the cache.
-	(do_process_init): New function to initalise class process static variables.
-	(process::process): Ensure that the process access critical section is
-	initialised.
-	(process::handle): Close the handle of old process's when they have terminated
-	and we are returning the handle for a process with the same pid.
-	* cygserver_shm.cc: Run indent.
-	Include cygserver_process.h to allow process cache functionality.
-	(client_request_shm_get::serve): New parameter for process cache support.
-	Use the process cache, not OpenProcess to get a handle to the originating process.
-	Fix a handle leak with token_handle.
-	* cygserver_shm.h (class client_request_shm_get): Update ::serve for process
-	cache support.
-	* cygserver_transport_pipes.cc: Redefine debug_printf to be conditional on DEBUG.
-	* include/cygwin/cygserver.h: Do not implement client_request::serve in the
-	header.
-	* include/cygwin/cygserver_process.h (class process_cache): Add a write access
-	critical section to prevent races when requests from a  multithreaded
-	application arrive.
-
-Sun Sep 30 23:41:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* Makefile.in: Add cygserver_process.o to cygserver.exe.
-	* cygserver.cc: Include signal.h and cygwin_version.h.
-	Define debug_printf as a macro.
-	Define DEBUG to a value.
-	(client_request_attach_tty::serve): Add beginning of process cache support.
-	Change from #ifdef DEBUG to work with new DEBUG style.
-	(client_request_get_version::serve): Add beginning of process cache support.
-	(class server_request): New prototype for support of process cache.
-	(class queue_process_param): New class to allow request loop threading.
-	(class server_request_queue): Add beginning of process cache support.
-	Allow request loop threading.
-	(request_loop): Thread function for request loops.
-	(server_request_queue::process_requests): Initiator for threaded request loops.
-	(client_request_shutdown::serve): Add beginning of process cache support.
-	(server_request::server_request): Ditto.
-	(server_request::process): Use debug_printf. Add beginning of process cache
-	support.
-	(server_request_queue::cleanup): Kill off any request loop threads.
-	(server_request_queue::add): Add beginning of process cache support.
-	(handle_signal): Trigger a shutdown.
-	(main): Print out some useful info at startup - version, date time.
-	Add process cache support.
-	Spawn a separate thread for the transport request loop, thus allowing concurrent
-	support for multiple transports.
-	* cygserver_client.cc (client_request_get_version::serve): Add process cache
-	support.
-	(client_request_attach_tty::serve): Add process cache support.
-	(client_request_shutdown::serve): Add process cache support.
-	* cygsserver_process.cc: New file with the process cache support.
-	* cygserver_shm.cc: Redefine debug_printf to allow conditional output.
-	* cygwin.din: Export shmdt().
-	* shm.cc: Run indent.
-	Update FIXME's.
-	(shmdt): New function.
-	* include/cygwin/cygserver.h (class client_request): Add process cache support.
-	(class client_request_get_version): Ditto.
-	(class client_request_shutdown): Ditto.
-	(class client_request_attach_tty): Ditto.
-	* include/cygwin/cygserver_process.h: New header for process cache support.
-
-Sun Sep 30  8:52:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* include/cygwin/cygserver_transport.h: Add copyright header.
-	* include/cygwin/cygserver_transport_pipes.h: Ditto.
-	* include/cygwin/cygserver_transport_sockets.h: Ditto.
-
-Sat Sep 29 20:40:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* Makefile.in: Add cygserver_transport_sockets.o to DLL_OFILES.
-	Add cygserver_transport_sockets_outside.o to cygserver.exe.
-	* cygserver.cc: Include new include files.
-	* cygserver_client.cc: Ditto.
-	* cygserver_shm.h: No need to include <sys/socket.h> now.
-	* cygerver_transport.cc: Include new include files.
-	(transport_layer_base::transport_layer_base): Strip back to a stub.
-	(transport_layer_base::listen): Ditto.
-	(transport_layer_base::accept): Ditto.
-	(transport_layer_base::close): Ditto.
-	(transport_layer_base::read): Ditto.
-	(transport_layer_base::write): Ditto.
-	(transport_layer_base::connect): Ditto.
-	* cygserver_transport_pipes.cc: Include new header
-	"cygwin/cygserver_transport_pipes.h".
-	* cygserver_transport_sockets.cc: New file.
-	* dcrt0.cc: No need to include <sys/socket.h> now.
-	* fhandler_tty.cc: Ditto.
-	* tty.cc: Ditto.
-	* include/cygwin/cygserver_transport.h: Strip the base class to a stub.
-	Remove the cygserver_transport_pipes class.
-	* include/cygwin/cygserver_transport_pipes.h: New file.
-	* include/cygwin/cygserver_transport_sockets.h: New file.
-
-Tue Sep 25 16:22:00 2001  Robert Collins <rbtcollins@hotmail.com>
-
-	* autoload.cc: Add dynamic load statement for 'ImpersonateNamedPipeClient'.
-	* Makefile.in: Add new object files, and build instructions for cygserver.exe.
-	* cygwin.din: Export ftok, shmat, shmctl and shmget.
-	* dcrt0.cc: Additional includes for cygserver support.
-	(dll_crt0_1): Initialise the cygserver client.
-	* fhandler.h (fhandler_tty): New method cygserver_attach_tty.
-	* fhandler_tty.cc: Additional includes for cygserver support.
-	(fhandler_tty_slave::open): Attempt to use the cygserver when obtaining
-	handles from the parent process. On failure or 9x use the current method.
-	(fhandler_tty_slave::cygserver_attach_tty): New function.
-	* fork.cc (fork_child): Fixup shm memory mapped areas.
-	* pinfo.h: Declare fixup_shms_after_fork().
-	* security.h: Declare alloc_sd().
-	* tty.cc: Additonal includes to support cygserver.
-	(tty::common_init): Don't allow others to open us if the cygserver is running.
-	* winsup.h: Declare cygserver_running.
-	* cygserver.cc: New file.
-	* cygserver_client.cc: New file.
-	* cygserver_shm.cc: New file.
-	* cygserver_shm.h: New file.
-	* cygserver_transport.cc: New file.
-	* cygserver_transport_pipes.cc: New file.
-	* ipc.cc: New file.
-	* shm.cc: New file.
-	* include/cygwin/cygserver.h: New file.
-	* include/cygwin/cygserver_transport.h: New file.
-	* include/sys/ipc.h: New file.
-	* include/sys/shm.h: New file.
-
-2002-02-28  Robert Collins  <rbtcollins@hotmail.com>
-
-	* thread.cc (semaphore::TryWait): Set errno as required by posix 1003.1.
-	(__sem_wait): Ditto.
-	(__sem_trywait): Ditto.
-
-2002-02-27  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-02-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygwin.din (fstat64): New symbol.
-	(ftruncate64): Ditto.
-	(lseek64): Ditto.
-	(lstat64): Ditto.
-	(mmap64): Ditto.
-	(seekdir64): Ditto.
-	(stat64): Ditto.
-	(telldir64): Ditto.
-	(truncate64): Ditto.
-	* dir.cc (telldir64): New function.
-	(telldir): Call telldir64().
-	(seekdir64): New function.
-	(seekdir): Call seekdir64().
-	* fhandler.h: Redefine all methods using __off32_t to use __off64_t.
-	* fhandler.cc: Use __off64_t and struct __stat64 throughout.
-	* fhandler_clipboard.cc: Ditto.
-	* fhandler_disk_file.cc: Ditto.
-	* fhandler_dsp.cc: Ditto.
-	* fhandler_floppy.cc: Ditto.
-	* fhandler_mem.cc: Ditto.
-	* fhandler_random.cc: Ditto.
-	* fhandler_socket.cc: Ditto.
-	* fhandler_tape.cc: Ditto.
-	* fhandler_zero.cc: Ditto.
-	* pipe.cc: Ditto.
-	* glob.c: Ditto, call lstat64 and stat64 in Cygwin.
-	* mmap.cc: Use __off64_t throughout.
-	(mmap64): New function.
-	* sec_acl.cc (acl_worker): Use struct __stat64, call stat64 and lstat64.
-	* syscalls.cc (lseek64): New function.
-	(stat64_to_stat32): Ditto.
-	(fstat64): Ditto.
-	(stat64): Ditto.
-	(lstat64): Ditto.
-	(ftruncate64): Ditto.
-	(truncate64): Ditto.
-	(_fstat): Call fstat64.
-	(_stat): Call stat64.
-	(cygwin_lstat): Rename to avoid declaration problem.  Call lstat64.
-	(stat_worker): Use struct __stat64.
-	(access): Ditto.
-	(ftruncate): Call ftruncate64.
-	(truncate): Call truncate64.
-	* wincap.cc: Set flag has_64bit_file_access appropriately.
-	* wincap.h: Add flag has_64bit_file_access.
-	* winsup.h (ILLEGAL_SEEK): Define as __off64_t.
-	(stat_dev): Declare using struct __stat64.
-	(stat_worker): Ditto.
-	* include/cygwin/stat.h (struct __stat32): Define if compiling Cygwin.
-	(struct __stat64): Ditto.
-	(struct stat): Revert definition with explicitly sized datatypes.
-	Eliminate sized field names.
-	* include/cygwin/types.h (blksize_t): New type.
-	(__blkcnt32_t): Ditto.
-	(__blkcnt64_t): Ditto.
-	(blkcnt_t): Ditto.
-
-2002-02-22  Christopher Faylor  <cgf@redhat.com>
-
-	* sync.h (new_muto): Just accept an argument which denotes the name of
-	the muto.  Use this argument to construct static storage.
-	* cygheap.cc (cygheap_init): Reflect above change.
-	* exceptions.cc (events_init): Ditto.
-	* malloc.cc (malloc_init): Ditto.
-	* path.cc (cwdstuff::init): Ditto.
-	* cygheap.h (cwdstuff): Change name of lock element to make it less
-	generic.
-	* path.cc (cwdstuff::get_hash): Ditto.
-	(cwdstuff::get_initial): Ditto.
-	(cwdstuff::set): Ditto.
-	(cwdstuff::get): Ditto.
-	* sigproc.cc (proc_subproc): Ditto.
-
-	* debug.cc (lock_debug): Change to method.  Use method rather than
-	macro throughout.
-
-	* tty.h (tty_min::kill_pgrp): Declare new method.
-	* fhandler_termios.cc (tty_min::kill_pgrp): New method.
-	(fhandler_termios::line_edit): Use new method for killing process.
-	* dcrt0.cc (do_exit): Ditto.
-
-	* dtable.cc (dtable::get_debugger_info): New method for inheriting
-	dtable info from a debugger.
-	* tty.cc (tty_init): Attempt to grab file handle info from parent
-	debugger, if appropriate.
-
-	# dtable.cc (dtable::stdio_init): Make this a method.
-	(dtable::init_std_file_from_handle): Don't set fd unless it's not open.
-	(dtable::build_fhandler_from_name): Move name setting to
-	dtable::build_fhandler.
-	(dtable::build_fhandler): Add win32 name parameter.
-	* dcrt0.cc (dll_crt0_1): Change to use dtable stdio_init.
-	* dtable.h (dtable): Reflect build_fhandler parameter change.
-	* mmap.cc (mmap_record::alloc_fh): Don't set name parameter in
-	build_fhandler.
-	* net.cc (fdsock): Remove set_name call since it is now handled by
-	build_fhandler.
-
-	* sigproc.cc (proc_subproc): Release muto as early as possible.
-
-2001-02-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* smallprint.c (rn): Allow long long values.
-	(__small_vsprintf): Add 'D', 'U' and 'X' formats for long long
-	parameters.
-
-2002-02-19  Christopher Faylor  <cgf@redhat.com>
-
-	* fhandler.cc (fhandler_base::puts_readahead): Remove default parameter
-	setting.  Newer gcc's complain about this.
-	(fhandler_base::set_readahead_valid): Ditto.
-	* fhandler_dsp.cc (Audio::open): Ditto.
-	(fhandler_dev_dsp::open): Ditto.
-
-2002-02-19  Christopher Faylor  <cgf@redhat.com>
-
-	* fork.cc (fork_parent): Use sec_user_nih to control process/thread
-	inheritance/permission.
-	* spawn.cc (spawn_guts): Ditto.
-	* security.cc (create_token): Initialize token so that it is not tested
-	for bogus value later.  Use sec_user to control process/thread
-	creation.
-	* security.h (__sec_user): Rename declaration from sec_user.
-	(sec_user_nih): Declare here as inline function wrapper for __sec_user.
-	(sec_user): Ditto.
-	* sigproc.cc (czombies): Allocate a character array for zombies to
-	avoid constructor overhead
-	(extremely hackish, I know).
-	(cpchildren): Ditto.
-	(pchildren): New define.
-	(zombies): Ditto.
-	(getsem): Use sec_user_nih to control semaphore inheritance/permission.
-
-2002-02-16  Christopher Faylor  <cgf@redhat.com>
-
-	* times.cc (hires::prime): Restore thread priority on failure
-	condition.
-
-	* uinfo.cc (uinfo_init): Use more robust method for determining if
-	process was invoked from a non-cygwin process.
-
-	* sync.h (muto::init): Eliminate "inheritance" parameter.
-	(new_muto): Reflect removal of parameter.
-	* sync.cc (muto::init): Ditto.
-	* cygheap.cc (cygheap_init): Ditto.
-	* debug.cc (threadname_init): Ditto.
-	* exceptions.cc (events_init): Ditto.
-	* malloc.cc (malloc_init): Ditto.
-	* path.cc (cwdstuff::init): Ditto.
-	* sigproc.cc (sigproc_init): Ditto.
-
-	* grp.cc (group_lock): Use different method for locking with static
-	member.
-	(read_etc_group): REALLY ensure that read lock mutex is released.
-	* passwd.cc (passwd_lock): Use different method for locking with static
-	member.
-	(read_etc_passwd): REALLY ensure that read lock mutex is released.
-
-	* shared.cc (sec_user): Correct reversed inheritance test.
-
-2002-02-15  Christopher Faylor  <cgf@redhat.com>
-
-	* hires.h (hires::usecs): Rename from utime.  Accept an argument.
-	* strace.cc (strace::microseconds): Use hires class for calculating
-	times.
-	* sync.h (new_muto): Use NO_COPY explicitly in declaration.
-	* times.cc (gettimeofday): Reflect change in usecs argument.
-	(hires::usecs): Ditto.  Changed name from utime.
-	* winsup.h (NO_COPY): Add nocommon attribute to force setting aside
-	space for variable.
-	* regcomp.c (REQUIRE): Add a void cast to bypass a warning.
-
-2002-02-15  Christopher Faylor  <cgf@redhat.com>
-
-	* hires.h: New file.
-	* times.cc (gettimeofday): Use hires class for calculating current time.
-	(hires::prime): New method.
-	(hires::utime): Ditto.
-
-2002-02-14  Christopher Faylor  <cgf@redhat.com>
-
-	* include/sys/cygwin.h (cygwin_getinfo_types): New CW_STRACE_ACTIVE.
-	* external.cc (cygwin_internal): Handle CW_STRACE_ACTIVE.
-
-2002-02-14  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (unused_sig_wrapper): Eliminate unused parameter to
-	asm.
-	* external.cc (cygwin_internal): Change CW_STRACE_ON to
-	CW_STRACE_TOGGLE.
-	* strace.cc (strace::hello): Toggle strace on and off.
-	* sync.cc (muto::init): Rename from constructor.
-	* sync.h (muto::new): Delete.
-	(muto::delete): Ditto.
-	(new_muto): Simplify.  Use muto.init for nearly everything.
-	* uinfo.cc (uinfo_init): Avoid closing a NULL handle.
-	* include/sys/cygwin.h (cygwin_getinfo_types): Rename CW_STRACE_OFF to
-	CW_STRACE_TOGGLE.  Delete CW_STRACE_OFF.
-	* include/sys/strace.h (strace): Add "inited" field.
-
-2001-02-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/acl.h: Fix definition of aclent_t.
-
-2002-02-10  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (DLL_OFILES): Consolidate object files.
-
-2002-02-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* child_info.h, cygheap.h, fhandler_clipboard.cc, fhandler_dsp.cc,
-	fhandler_floppy.cc, fhandler_mem.cc, fhandler_random.cc,
-	fhandler_tape.cc, fhandler_zero.cc, grp.cc, mmap.cc, passwd.cc,
-	pinfo.cc, pinfo.h, pipe.cc, sec_acl.cc, sec_helper.cc, security.cc,
-	security.h, thread.h, uinfo.cc, include/cygwin/acl.h: Fix copyright.
-
-2002-02-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* child_info.h, cygheap.h, dcrt0.cc, dir.cc, fhandler.cc, fhandler.h,
-	fhandler_clipboard.cc, fhandler_disk_file.cc, fhandler_dsp.cc,
-	fhandler_floppy.cc, fhandler_mem.cc, fhandler_random.cc,
-	fhandler_tape.cc, fhandler_zero.cc, grp.cc, mmap.cc, passwd.cc,
-	pinfo.cc, pinfo.h, pipe.cc, sec_acl.cc, sec_helper.cc, security.cc,
-	security.h, spawn.cc, syscalls.cc, thread.h, uinfo.cc, winsup.h:
-	Change usage of uid_t to __uid16_t, gid_t to __gid16_t and
-	off_t to __off32_t throughout.  Use INVALID_UID, INVALID_GID and
-	INVALID_SEEK instead casting -1 to the appropriate type.
-	* winsup.h: Define INVALID_UID, INVALID_GID and INVALID_SEEK.
-	* include/cygwin/acl.h: Define internal __aclent16_t and __aclent32_t
-	types.  Don't declare acl functions when compiling Cygwin.
-	* include/cygwin/grp.h: Declare getgrgid() and getgrnam() with
-	correct types for internal usage.
-
-2002-02-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	Patch suggested by Pierre A. Humblet <Pierre.Humblet@ieee.org>:
-	* uinfo.cc (internal_getlogin): Try evaluating user by SID even if
-	ntsec is off.
-	(uinfo_init): Set primary group even if ntsec is off.
-
-2002-02-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/grp.h: New file.
-	* include/cygwin/stat.h: Ditto.
-	* include/cygwin/types.h: Add definitions for __off32_t,
-	__off64_t, off_t, __uid16_t, __uid32_t, uid_t, __gid16_t,
-	__gid32_t and gid_t.
-	* include/sys/cygwin.h: Use correct uid and gid types.
-
-2002-02-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dtable.cc (dtable::dup2): Revert previous patch.
-	* fhandler.h: Ditto.
-	(fhandler_socket::recv): Define new method.
-	(fhandler_socket::send): Ditto.
-	* fhandler_socket.cc (fhandler_socket::recv): New method.
-	(fhandler_socket::send): Ditto.
-	(fhandler_socket::read): Call fhandler_socket::recv() now.
-	(fhandler_socket::write): Call fhandler_socket::send() now.
-	* net.cc (class wsock_event): Move definition to wsock_event.h.
-	(fdsock): Revert previous patch.
-	(cygwin_recv): Move implementation to fhandler_socket::recv().
-	(cygwin_send): Move implementation to fhandler_socket::send().
-	* wsock_event.h: New file.
-
-2002-02-06  Alexander Gottwald <Alexander.Gottwald@s1999.tuchemnitz.de>
-
-	* net.cc (get_2k_ifconf): Create interface entries for tokenring cards.
-
-2002-02-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dtable.cc (dtable::dup2): Store fd for fhandler_socket.
-	* fhandler.h (fhandler_base::set_fd): New virtual method.
-	(fhandler_base::get_fd): Ditto.
-	(fhandler_socket::set_fd): Ditto.
-	(fhandler_socket::get_fd): Ditto.
-	* fhandler_socket.cc (fhandler_socket::read): Call cygwin_recv instead
-	of native Winsock recv.
-	(fhandler_socket::write): Call cygwin_send instead of native Winsock
-	send.
-	* net.cc (fdsock): Store fd in fhandler_socket.
-
-2002-02-07  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (cygwin_getsockname): Fix handling of NULL sun_path.
-
-2002-01-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (getdomainname): Fix registry key for 9x systems, too.
-
-2002-01-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (getdomainname): Fix registry key for NT systems.
-
-2002-01-28  Christopher Faylor  <cgf@redhat.com>
-
-	* external.cc (cygwin_internal): Initialize various internal settings
-	if required to allow use of some things from user loaded DLL.
-	(CW_STRACE_ON): Add new feature.
-	(CW_CYGWIN_PID_TO_WINPID): Ditto.
-	* pinfo.cc (set_myself): Call "strace.hello" to initiate possible
-	strace session.
-	(pinfo::init): Guard against dereferencing uninitialized myself.
-	* sigproc.cc (wait_sig): Call strace.hello() when __SIGTRACE "signal"
-	received.
-	* strace.cc (strace::hello): New method.
-	* wincap.cc (wincapc::init): Avoid initializing if already initialized.
-	* wincap.h (wincapc::wincapc): New method.
-	* include/sys/cygwin.h: Add new CW_ enums.  Kludge typedefs of
-	{g,u}id_t if required.
-	* strace.h (strace::hello): Declare new method.
-
-2002-01-28  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/sys/strace.h (_STRACE_ON): Define.
-	(_STRACE_OFF): Ditto.
-
-2002-01-24  Christopher Faylor  <cgf@redhat.com>
-
-	* speclib: Ensure that temporary def file is removed.
-
-2002-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	* speclib: Use rm -f to remove temp file just to quiet any potential
-	warnings.
-
-2002-01-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (create_token): Use sec_user() to create
-	SECURITY_ATTRIBUTES structure for primary token.  Use
-	MAXIMUM_ALLOWED access rights instead of TOKEN_ALL_ACCESS.
-
-2002-01-23  Corinna Vinschen  <corinna@vinschen.de>
-
-	* path.cc (symlink): Fix check for already existing file.
-
-2002-01-21  Christopher Faylor  <cgf@redhat.com>
-
-	* cygmagic: Suppress error output when figuring out if sum takes an
-	option.
-
-2002-01-21  Christopher Faylor  <cgf@redhat.com>
-
-	* cygmagic: Attempt to figure out if sum takes an option.
-
-2002-01-21  DJ Delorie  <dj@redhat.com>
-
-	* Makefile.in (libpthread.a): Pass the assembler also.
-	(libm.a): Ditto.
-	(libc.a): Ditto.
-	* speclib: Specify the assembler to dlltool.
-
-2002-01-21  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-01-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* grp.cc (getgrgid): Don't return default gid entry when ntsec is on.
-	* syscalls.cc (setegid): Don't set primary group in process token.
-
-2002-01-21  Christopher Faylor  <cgf@redhat.com>
-
-	* speclib: Don't use /dev/null as DLL name.  Just default to what's
-	already in .def file.
-
-2002-01-21  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (sig_handle): Remove last vestiges of SA_NOCLDSTOP code
-	which caused SIGCHLD to be ignored.
-
-2002-01-20  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-01-20  Christopher Faylor  <cgf@redhat.com>
-
-	* syscalls.cc (regfree): Make dll_export.
-
-2002-01-20  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (ctrl_c_handler): Convert windows pid to cygwin pid
-	when detecting if we should actually handle CTRL-C.
-
-2002-01-19  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (new-cygwin1.dll): Revert previous change.  libsupc++.a
-	is only available in libstdc++-v3.
-
-2002-01-19  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (sig_handle_tty_stop): Don't send SIGCHLD if parent
-	doesn't want it.
-	(sig_handle): Don't check for SA_NOCLDSTOP here.  We don't have enough
-	information.
-
-2002-01-19  Christopher Faylor  <cgf@redhat.com>
-
-	* include/cygwin/version.h: Bump DLL minor number.
-
-2002-01-19  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (new-cygwin1.dll): Just use -lsupc++ for link.
-	* sigproc.cc (proc_exists): Change existence criteria.
-	* sync.h (new_muto): Add volatile to definition to avoid gcc
-	optimization problems.
-
-2002-01-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/cygwin/version.h: Bump API minor version to 51.
-
-2002-01-19  Mark Bradshaw  <bradshaw@staff.crosswalk.com>
-
-	* cygwin.din: Add recvmsg and sendmsg.
-	* net.cc: Add cygwin_recvmsg and cygwin_sendmsg.
-	* /usr/include/sys/socket.h: Add recvmsg and sendmsg.
-
-2002-01-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* security.cc (create_token): Close processes token handle as soon
-	as it's not used anymore.
-
-2002-01-17  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in: Add fnmatch.o to DLL_OFILES.
-	* cygwin.din: Add fnmatch export symbol.
-	* fnmatch.c: New file.
-	* include/fnmatch.h: Ditto.
-	* include/cygwin/version.h: Bump API minor version to 50.
-
-2002-01-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* path.cc (fchdir): Call chdir with full windows path.
-
-2002-01-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dir.cc: Use INVALID_FILE_ATTRIBUTES instead of "(DWORD) -1"
-	for file attributes throughout.
-	* fhandler.cc: Ditto.
-	* fhandler_disk_file.cc: Ditto.
-	* path.cc: Ditto.
-	* path.h: Ditto.
-	* syscalls.cc: Ditto.
-	* times.cc (utimes): Use path_conv::isdir() instead of explicit
-	GetFileAttributes() call.
-
-2002-01-13  Christopher Faylor  <cgf@redhat.com>
-
-	* dcrt0.cc (multiple_cygwin_problem): Clarify logic and make
-	CYGWIN_MISMATCH_OK more powerful.
-
-2002-01-10  Christopher Faylor  <cgf@redhat.com>
-
-	* exceptions.cc (sig_handle): Accept a second argument indicating
-	whether the signal came from this process or not.
-	* sigproc.h: Reflect sig_handle arg change.
-	* signal.cc (kill_pgrp): Add sigframe info.
-	(abort): New function.  Eliminates newlib function of same name.
-	* sigproc.cc (wait_sig): Pass "signal from this process" value as arg
-	2.
-
-2002-01-10  Corinna Vinschen  <corinna@vinschen.de>
-
-	* syscalls.cc (pathconf): Guard _PC_PATH_MAX branch against invalid
-	file parameter.
-
-2002-01-09  Christopher Faylor  <cgf@redhat.com>
-	    Robert Collins  <rbtcollins@hotmail.com>
-
-	* exceptions.cc (early_stuff_init): Rename from misnamed
-	set_console_handler.
-	(ctrl_c_handler): Attempt to work around potential signal duplication
-	during process startup.
-	(sig_handle): Ignore SIGINT when we're just an "exec stub".
-	* spawn.cc (spawn_guts): Store pid of spawned process in global for use
-	by ctrl_c_handler.
-	* dcrt0.cc (dll_crt0_1): Call renamed initialization function.
-	* winsup.h: Reflect function name change.
-
-2002-01-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc (cygwin_accept): Set sun_path for newly connected socket.
-
-2002-01-07  Ralf Habacker  <Ralf.Habacker@freenet.de>
-
-	* Makefile.in: Add uninstall target.
-
-2002-01-07  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (getsem): Clean up debugging output.
-
-2002-01-07  Christopher Faylor  <cgf@redhat.com>
-
-	* sigproc.cc (getsem): Set errno when unable to create own semaphore.
-	Reorganize to make clearer that error should only come from initial
-	creation of process semaphore.
-
-2002-01-06  Christopher Faylor  <cgf@redhat.com>
-
-	* dtable.cc (dtable::init_std_file_from_handle): Add some defensive
-	code to invalid handle case.
-
-2002-01-06  Corinna Vinschen  <corinna@vinschen.de>
-
-	* ioctl.cc (ioctl): Make third argument optional.
-	* include/sys/ioctl.h: Ditto in declaration.
-	* dtable.cc (dtable::init_std_file_from_handle): Revert previous
-	bogus patch.
-	* window.cc (WndProc): Raise SIGURG instead of SIGIO in case of FD_OOB
-	message.
-
-2002-01-05  Christopher Faylor  <cgf@redhat.com>
-
-	* dir.cc (opendir): Guarantee release of alloced fhandler structure on
-	error.
-
-2002-01-05  Corinna Vinschen  <corinna@vinschen.de>
-
-	* exceptions.cc (sig_handle): Set default action for SIGURG to SIG_IGN.
-
-2002-01-05  Corinna Vinschen  <corinna@vinschen.de>
-
-	* dtable.cc (dtable::init_std_file_from_handle): Don't treat NULL
-	handle as errorneous.
-
-2002-01-04  Christopher Faylor  <cgf@redhat.com>
-
-	* cygmagic: Change logic for equality test.
-
-2002-01-04  Christopher Faylor  <cgf@redhat.com>
-
-	* dir.cc (opendir): Don't attempt to call sub-opendir if ENOENT.
-
-2002-01-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* net.cc: Replace usage of AF_UNIX by Posix compliant AF_LOCAL
-	throughout.
-	(socketpair): Explicitly allow SOCK_STREAM and SOCK_DGRAM socket types
-	in families AF_UNIX and AF_LOCAL.  Explicitly allow PF_UNSPEC, PF_LOCAL
-	and PF_INET protocols.  Return error otherwise.  Implement datagram
-	socketpairs.
-
-2002-01-01  Christopher Faylor  <cgf@redhat.com>
-
-	* speclib: Remove temp files automatically.
-
-2002-01-01  Corinna Vinschen  <corinna@vinschen.de>
-	* fhandler.h (fhandler_socket::sun_path): New private member.
-	(fhandler_socket::set_sun_path): New method.
-	(fhandler_socket::get_sun_path): Ditto.
-	* fhandler_socket.cc (fhandler_socket::fhandler_socket): Initialize
-	sun_path to NULL.
-	(fhandler_socket::~fhandler_socket): Free sun_path if needed.
-	(fhandler_socket::set_sun_path): New method.
-	* net.cc (cygwin_bind): Set sun_path to path of local socket file.
-	(cygwin_getsockname): Add code to return correct sockaddr for unix
-	domain sockets.
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
deleted file mode 100644
index 502934dd3..000000000
--- a/winsup/cygwin/Makefile.in
+++ /dev/null
@@ -1,443 +0,0 @@
-# Makefile.in for Cygwin.
-# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-#
-# This file is part of Cygwin.
-#
-# This software is a copyrighted work licensed under the terms of the
-# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-# details.
-
-# This makefile requires GNU make.
-
-SHELL:=@SHELL@
-srcdir:=@srcdir@
-objdir:=.
-
-CONFIG_DIR:=$(srcdir)/config/@CONFIG_DIR@
-VPATH:=$(srcdir):$(CONFIG_DIR):$(srcdir)/regex:$(srcdir)/regexp:$(srcdir)/lib
-
-target_alias:=@target_alias@
-build_alias:=@build_alias@
-host_alias:=@host_alias@
-prefix:=@prefix@
-
-program_transform_name:=@program_transform_name@
-exec_prefix:=@exec_prefix@
-bindir:=@bindir@
-libdir:=@libdir@
-ifeq ($(target_alias),$(host_alias))
-ifeq ($(build_alias),$(host_alias))
-tooldir:=$(exec_prefix)
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-datadir:=@datadir@
-infodir:=@infodir@
-includedir:=@includedir@
-
-override INSTALL:=@INSTALL@
-override INSTALL_PROGRAM:=@INSTALL_PROGRAM@
-override INSTALL_DATA:=@INSTALL_DATA@
-
-#
-# --enable options from configure
-#
-MT_SAFE:=@MT_SAFE@
-DEFS:=@DEFS@
-
-CC:=@CC@
-# FIXME: Which is it, CC or CC_FOR_TARGET?
-CC_FOR_TARGET:=$(CC)
-CFLAGS=@CFLAGS@
-override CFLAGS+=-MMD ${$(*F)_CFLAGS} -fmerge-constants -ftracer
-CXX=@CXX@
-CXXFLAGS=@CXXFLAGS@
-
-AR:=@AR@
-AR_FLAGS:=qv
-RANLIB:=@RANLIB@
-LD:=@LD@
-DLLTOOL:=@DLLTOOL@
-WINDRES:=@WINDRES@
-AS:=@AS@
-NM:=@NM@
-LDSCRIPT:=cygwin.sc
-
-#
-# Include common definitions for winsup directory
-#
-include $(srcdir)/../Makefile.common
-
-@SET_MAKE@
-
-# Setup the testing framework, if you have one
-EXPECT = `if [ -f $${rootme}/../../expect/expect$(EXEEXT) ] ; then \
-	    echo $${rootme}/../../expect/expect$(EXEEXT) ; \
-	  else echo expect ; fi`
-
-RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
-	       echo $${srcdir}/../dejagnu/runtest ; \
-	    else echo runtest; fi`
-RUNTESTFLAGS =
-
-# Parameters used in building the cygwin.dll.
-# We build as cygwin0.dll and rename at install time to overcome
-# native rebuilding issues (we don't want the build tools to see a partially
-# built cygwin.dll and attempt to use it instead of the old one).
-
-DLL_NAME:=cygwin1.dll
-TEST_DLL_NAME:=cygwin0.dll
-TEST_LIB_NAME:=libcygwin0.a
-DEF_FILE:=cygwin.def
-DLL_ENTRY:=@DLL_ENTRY@
-
-LIBGMON_A:=libgmon.a
-CYGWIN_START:=crt0.o
-GMON_START:=gcrt0.o
-
-# Some things want these from libc, but they have their own static
-# data which apps can get to, which is a pain in the dll, so we
-# include them directly into the library.
-
-LIBCOS:=${sort ${addsuffix .o,${basename ${notdir ${wildcard $(srcdir)/lib/*.c}}}} \
-	       ${addsuffix .o,${basename ${notdir ${wildcard $(srcdir)/lib/*.cc}}}}}
-
-# Build all source files in the config directory
-
-EXTRA_DLL_OFILES:=${addsuffix .o,${basename ${notdir ${wildcard $(CONFIG_DIR)/*.c}}}}
-
-EXTRA_OFILES=$(bupdir1)/libiberty/random.o $(bupdir1)/libiberty/strsignal.o
-
-MALLOC_OFILES=@MALLOC_OFILES@
-
-DLL_IMPORTS:=$(w32api_lib)/libkernel32.a
-
-MT_SAFE_OBJECTS:=
-# Please maintain this list in sorted order, with maximum files per 80 col line
-#
-DLL_OFILES:=assert.o autoload.o bsdlib.o cxx.o cygheap.o cygthread.o dcrt0.o \
-	debug.o delqueue.o devices.o dir.o dlfcn.o dll_init.o dtable.o environ.o \
-	errno.o exceptions.o exec.o external.o fcntl.o fhandler.o \
-	fhandler_clipboard.o fhandler_console.o fhandler_disk_file.o \
-	fhandler_dsp.o fhandler_fifo.o fhandler_floppy.o fhandler_mem.o \
-	fhandler_nodevice.o fhandler_proc.o fhandler_process.o \
-	fhandler_random.o fhandler_raw.o fhandler_registry.o fhandler_serial.o \
-	fhandler_socket.o fhandler_tape.o fhandler_termios.o \
-	fhandler_tty.o fhandler_virtual.o fhandler_windows.o \
-	fhandler_zero.o flock.o fnmatch.o fork.o getopt.o glob.o grp.o heap.o \
-	init.o ioctl.o ipc.o iruserok.o localtime.o malloc_wrapper.o miscfuncs.o \
-	mmap.o msg.o net.o netdb.o ntea.o passwd.o path.o pinfo.o pipe.o \
-	poll.o pthread.o regcomp.o regerror.o regexec.o regfree.o registry.o \
-	resource.o scandir.o sched.o sec_acl.o sec_helper.o security.o \
-	select.o sem.o shared.o shm.o sigfe.o signal.o sigproc.o smallprint.o \
-	spawn.o strace.o strsep.o sync.o syscalls.o sysconf.o syslog.o \
-	termios.o thread.o times.o tty.o uinfo.o uname.o v8_regexp.o \
-	v8_regerror.o v8_regsub.o wait.o wincap.o window.o \
-	$(EXTRA_DLL_OFILES) $(EXTRA_OFILES) $(MALLOC_OFILES) $(MT_SAFE_OBJECTS)
-
-GMON_OFILES:=gmon.o mcount.o profil.o
-
-OBSOLETE_FUNCTIONS:=regcomp regerror regexec regfree regsub \
-		    open acl aclcheck aclfrommode aclfrompbits \
-		    aclfromtext aclsort acltomode acltopbits \
-		    acltotext chown facl fchown fcntl fdopen fgetpos fopen \
-		    freopen fseeko fsetpos fstat ftello ftruncate \
-		    getegid geteuid getgid getgrent getgrgid getgrnam \
-		    getgroups getpwuid getpwuid_r getuid initgroups \
-		    lchown lseek lstat mknod mmap seekdir setegid seteuid \
-		    setgid setgroups setregid setreuid setuid stat \
-		    telldir tmpfile truncate
-
-NEW_FUNCTIONS:=regcomp posix_regcomp \
-	       regerror posix_regerror \
-	       regexec posix_regexec \
-	       regfree posix_regfree \
-	       open _open64 \
-	       acl _acl32 \
-	       aclcheck _aclcheck32 \
-	       aclfrommode _aclfrommode32 \
-	       aclfrompbits _aclfrompbits32 \
-	       aclfromtext _aclfromtext32 \
-	       aclsort _aclsort32 \
-	       acltomode _acltomode32 \
-	       acltopbits _acltopbits32 \
-	       acltotext _acltotext32 \
-	       chown _chown32 \
-	       facl _facl32 \
-	       fchown _fchown32 \
-	       fcntl _fcntl64 \
-	       fdopen _fdopen64 \
-	       fgetpos _fgetpos64 \
-	       fopen _fopen64 \
-	       freopen _freopen64 \
-	       fseeko _fseeko64 \
-	       fsetpos _fsetpos64 \
-	       fstat _fstat64 \
-	       ftello _ftello64 \
-	       ftruncate _ftruncate64 \
-	       getegid _getegid32 \
-	       geteuid _geteuid32 \
-	       getgid _getgid32 \
-	       getgrent _getgrent32 \
-	       getgrgid _getgrgid32 \
-	       getgrnam _getgrnam32 \
-	       getgroups _getgroups32 \
-	       getpwuid _getpwuid32 \
-	       getpwuid_r _getpwuid_r32 \
-	       getuid _getuid32 \
-	       initgroups _initgroups32 \
-	       lchown _lchown32 \
-	       lseek _lseek64 \
-	       lstat _lstat64 \
-	       mknod _mknod32 \
-	       mmap _mmap64 \
-	       seekdir _seekdir64 \
-	       setegid _setegid32 \
-	       seteuid _seteuid32 \
-	       setgid _setgid32 \
-	       setgroups _setgroups32 \
-	       setregid _setregid32 \
-	       setreuid _setreuid32 \
-	       setuid _setuid32 \
-	       stat _stat64 \
-	       telldir _telldir64 \
-	       tmpfile _tmpfile64 \
-	       truncate _truncate64
-
-API_VER:=$(srcdir)/include/cygwin/version.h
-
-PWD:=${shell pwd}
-LIB_NAME:=$(PWD)/libcygwin.a
-LIBSERVER:=@LIBSERVER@
-SUBLIBS:=$(PWD)/libpthread.a $(PWD)/libm.a $(PWD)/libc.a
-EXTRALIBS:=libautomode.a libbinmode.a libtextmode.a
-INSTOBJS:=automode.o binmode.o textmode.o
-TARGET_LIBS:=$(LIB_NAME) $(CYGWIN_START) $(GMON_START) $(LIBGMON_A) $(SUBLIBS) $(INSTOBJS) $(EXTRALIBS)
-
-ifneq "${filter -O%,$(CFLAGS)}" ""
-cygheap_CFLAGS:=-fomit-frame-pointer
-devices_CFLAGS:=-fomit-frame-pointer -Os
-malloc_CFLAGS:=-fomit-frame-pointer
-malloc_wrapper_CFLAGS:=-fomit-frame-pointer
-shared_CFLAGS:=-fomit-frame-pointer
-cygthread_CFLAGS:=-fomit-frame-pointer
-miscfuncs_CFLAGS:=-fomit-frame-pointer
-fhandler_CFLAGS:=-fomit-frame-pointer
-fhandler_clipboard_CFLAGS:=-fomit-frame-pointer
-fhandler_console_CFLAGS:=-fomit-frame-pointer
-fhandler_disk_file_CFLAGS:=-fomit-frame-pointer
-fhandler_dsp_CFLAGS:=-fomit-frame-pointer
-fhandler_floppy_CFLAGS:=-fomit-frame-pointer
-fhandler_mem_CFLAGS:=-fomit-frame-pointer
-fhandler_proc_CFLAGS:=-fomit-frame-pointer
-fhandler_process_CFLAGS:=-fomit-frame-pointer
-fhandler_random_CFLAGS:=-fomit-frame-pointer
-fhandler_raw_CFLAGS:=-fomit-frame-pointer
-fhandler_registry_CFLAGS:=-fomit-frame-pointer
-fhandler_serial_CFLAGS:=-fomit-frame-pointer
-fhandler_socket_CFLAGS:=-fomit-frame-pointer
-fhandler_tape_CFLAGS:=-fomit-frame-pointer
-fhandler_termios_CFLAGS:=-fomit-frame-pointer
-fhandler_tty_CFLAGS:=-fomit-frame-pointer
-fhandler_virtual_CFLAGS:=-fomit-frame-pointer
-fhandler_windows_CFLAGS:=-fomit-frame-pointer
-fhandler_zero_CFLAGS:=-fomit-frame-pointer
-regcomp_CFLAGS=-fomit-frame-pointer
-regerror_CFLAGS=-fomit-frame-pointer
-regexec_CFLAGS=-fomit-frame-pointer
-regfree_CFLAGS=-fomit-frame-pointer
-endif
-
-.PHONY: all force dll_ofiles install all_target install_target all_host install_host \
-	install install-libs install-headers -lgcc
-
-.SUFFIXES:
-.SUFFIXES: .c .cc .def .a .o .d .s
-
-all_host=@all_host@
-install_host=@install_host@
-
-all: all_target $(all_host)
-
-all_target: $(TARGET_LIBS)
-
-all_host: $(TEST_LIB_NAME)
-
-force:
-
-install: install-libs install-headers install-man install_target \
-	$(install_host) $(install_target)
-
-uninstall: uninstall-libs uninstall-headers uninstall-man
-
-install-libs: $(TARGET_LIBS)
-	$(INSTALL_PROGRAM) $(TEST_DLL_NAME) $(bindir)/$(DLL_NAME); \
-	for i in $^; do \
-	    $(INSTALL_DATA) $$i $(tooldir)/lib/`basename $$i` ; \
-	done
-
-install-headers:
-	cd $(srcdir); \
-	for sub in `find include -name '[a-z]*' -type d -print | sort`; do \
-	    for i in $$sub/*.h ; do \
-	      $(INSTALL_DATA) $$i $(tooldir)/$$sub/`basename $$i` ; \
-	    done ; \
-	done ; \
-	$(INSTALL_DATA) regex/regex.h $(tooldir)/include/regex.h
-
-install-man:
-	cd $(srcdir); \
-	for i in `find . -type f -name '*.2'`; do \
-	    $(INSTALL_DATA) $$i $(tooldir)/man/man2/`basename $$i` ; \
-	done; \
-	for i in `find . -type f -name '*.3'`; do \
-	    $(INSTALL_DATA) $$i $(tooldir)/man/man3/`basename $$i` ; \
-	done; \
-	for i in `find . -type f -name '*.5'`; do \
-	    $(INSTALL_DATA) $$i $(tooldir)/man/man5/`basename $$i` ; \
-	done; \
-	for i in `find . -type f -name '*.7'`; do \
-	    $(INSTALL_DATA) $$i $(tooldir)/man/man7/`basename $$i` ; \
-	done
-
-install_target:
-
-install_host:
-
-uninstall-libs: $(TARGET_LIBS)
-	rm -f $(bindir)/$(DLL_NAME); \
-	for i in $^; do \
-	    rm -f $(tooldir)/lib/$$i ; \
-	done
-
-uninstall-headers:
-	cd $(srcdir); \
-	for sub in `find include -name '[a-z]*' -type d -print | sort`; do \
-	    for i in $$sub/*.h ; do \
-	      rm -f $(tooldir)/$$sub/`basename $$i` ; \
-	    done ; \
-	done ; \
-	rm -f $(tooldir)/include/regex.h
-
-uninstall-man:
-	cd $(srcdir); \
-	for i in `find . -type f -name '*.2'`; do \
-	    rm -f $(tooldir)/man/man2/`basename $$i` ; \
-	done; \
-	for i in `find . -type f -name '*.3'`; do \
-	    rm -f $(tooldir)/man/man3/`basename $$i` ; \
-	done; \
-	for i in `find . -type f -name '*.5'`; do \
-	    rm -f $(tooldir)/man/man5/`basename $$i` ; \
-	done; \
-	for i in `find . -type f -name '*.7'`; do \
-	    rm -f $(tooldir)/man/man7/`basename $$i` ; \
-	done
-
-clean:
-	-rm -f *.o *.dll *.a *.exp junk *.base version.cc regexp/*.o winver_stamp *.exe *.d *stamp* *_magic.h
-
-maintainer-clean realclean: clean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	-rm -fr configure
-
-
-# Rule to build cygwin.dll
-$(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DLL_IMPORTS) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp
-	$(CXX) $(CXXFLAGS) $(nostdlib) -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \
-	-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \
-	$(MALLOC_OBJ) $(LIBSERVER) $(LIBM) $(LIBC) \
-	-lgcc $(DLL_IMPORTS)
-	@ln -f $@ new-$(DLL_NAME)
-
-# Rule to build libcygwin.a
-$(LIB_NAME): rmsym newsym $(TEST_DLL_NAME) $(LIBCOS)
-	/bin/sh ${word 1,$^} ./cygdll.a "$(NM)" "$(AR)" $(OBSOLETE_FUNCTIONS) || exit 0
-	/bin/sh ${word 2,$^} ./cygdll.a "$(AS)" "$(AR)" $(NEW_FUNCTIONS) || exit 0
-	(echo create $(LIB_NAME); echo addmod $(LIBCOS); echo addlib cygdll.a; echo save) | $(AR) -M
-	$(RANLIB) $@
-
-# Rule to make stub library used by testsuite
-# dependency set to $(LIB_NAME) to accommodate make -j2.
-# Otherwise dlltool gets confused. cgf (11-16-2000)
-$(TEST_LIB_NAME): $(LIB_NAME)
-	perl -p -e 'BEGIN{binmode(STDIN); binmode(STDOUT);}; s/cygwin1/cygwin0/g' < $? > $@
-
-$(LIBSERVER): $(bupdir)/cygserver/Makefile
-	$(MAKE) -C $(bupdir)/cygserver libcygserver.a
-
-dll_ofiles: $(DLL_OFILES)
-
-$(LIBGMON_A): $(GMON_OFILES) $(GMON_START)
-	$(AR) rcv $(LIBGMON_A) $(GMON_OFILES)
-
-$(API_VER): $(srcdir)/cygwin.din
-	@echo Error: Version info is older than DLL API!;\
-	false
-
-version.cc winver.o: winver_stamp
-	@ :
-
-shared_info_magic.h: cygmagic shared_info.h
-	/bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} USER_MAGIC 'class user_info' SHARED_MAGIC 'class shared_info'
-
-child_info_magic.h: cygmagic child_info.h
-	/bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info'
-
-dcrt0.o sigproc.o: child_info_magic.h
-
-shared.o: shared_info_magic.h
-
-$(srcdir)/qevices.cc: cygwin-gperf devices.gperf devices.h
-	$^ > $@
-
-$(srcdir)/devices.cc: gendevices devices.in devices.h
-	${wordlist 1,2,$^} $@
-
-$(PWD)/libpthread.a: speclib $(LIB_NAME) pthread.o thread.o
-	/bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^}
-
-$(PWD)/libm.a: speclib $(LIB_NAME) $(LIBM)
-	/bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^}
-
-$(PWD)/libc.a: speclib $(LIB_NAME) $(PWD)/libm.a libpthread.a
-	/bin/sh ${word 1, $^} -v $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^}
-
-lib%.a: %.o
-	$(AR) cru $@ $?
-
-winver_stamp: mkvers.sh include/cygwin/version.h winver.rc $(DLL_OFILES)
-	@echo "Making version.o and winver.o";\
-	$(SHELL) ${word 1,$^} ${word 2,$^} ${word 3,$^} $(WINDRES) && \
-	$(COMPILE_CXX) -o version.o version.cc && \
-	touch $@
-
--lgcc:
-	:
-
-#
-
-Makefile: cygwin.din
-
-$(DEF_FILE): gendef cygwin.din $(srcdir)/tlsoffsets.h
-	$^ $@ sigfe.s
-
-$(srcdir)/tlsoffsets.h: gentls_offsets cygtls.h
-	$^ $@ $(COMPILE_CXX)
-
-sigfe.s: $(DEF_FILE)
-	@touch $@
-
-sigfe.o: sigfe.s
-	$(CC) -c -o $@ $?
-
-winsup.h: config.h
-
-deps:=${wildcard *.d}
-ifneq (,$(deps))
-include $(deps)
-endif
diff --git a/winsup/cygwin/ROADMAP b/winsup/cygwin/ROADMAP
deleted file mode 100644
index fd0387d59..000000000
--- a/winsup/cygwin/ROADMAP
+++ /dev/null
@@ -1,129 +0,0 @@
-
-			    WINSUP ROADMAP
-
-The purpose of this document is to give the briefest overview of how
-the various parts of cygwin work together and where everything can be
-found.  The intended audience is people developing the cygwin dll
-itself.  Comments to dj@cygnus.com.
-
-=== cygwin1.dll source files
-
-- overhead
-.h	winsup autoload debug external shared sync
-.cc	assert dcrt0 debug external init ntea registry security
-	shared smallprint strace sync
-.din	cygwin
-.rc	winver
-.sgml	external shared
-
-- processes
-.h	sigproc
-.cc	exec fork pinfo resource signal sigproc spawn wait
-
-- signals
-.cc	exceptions window
-
-- files and I/O
-.h	delqueue fhandler path select
-.cc	delqueue dir fhandler* dtable path pipe select tty
-.sgml	dtable path
-
-- common unix functions
-.h	dll_init tz_posixrules
-.cc	dlfcn dll_init environ errno fcntl flog grp ioctl localtime
-	malloc passwd scandir strsep syscalls sysconf syslog termios
-.c	longjmp setjmp
-.sgml	dll_init
-
-- unix emulation
-.cc	heap mmap net times unifo uname
-
-
---- if MT_SAFE
-.h	thread
-.cc	pthread thread
-
---- from other places
-regex/*
-../libiberty/{random,strsignal}
-../newlib/* (libc)
-
-=== libcygwin.a source files
-
-libccrt0.cc
-libcmain.cc
-dll_entry.cc
-dll_main.cc
-getopt.c
-
-=== gmon (profiling, -pg)
-
-gcrt0.c
-gmon.c		gmon.h
-mcount.c
-profil.c	profil.h
-
-=== entry points
-
-- normal cygwin program
-
-newlib/libc/sys/cygwin/crt0.c has mainCRTStartup() and calls cygwin_crt0()
-
-libccrt0.cc has cygwin_crt0() and calls dll_crt0()
-
-dcrt0.cc - has dll_crt0()
-
-Note: dll_init.cc has nothing to do with initializing the cygwin dll.
-It initializes the dlls you have dl_open'd.
-
-- cygwin-built dll
-
-dll_entry.cc - has a macro for wrapping your dll startup function
-	(equivalent of DllMain()) in such a way that you get your
-	cygwin environment set up automatically when your dll is
-	loaded.
-
-dll_main.cc - has empty DllMain() in case you don't have your own
-
-- manually loading cygwin1.dll
-
-init.cc - has dll_entry() which is called by the OS when the dll is
-	loaded.  It doesn't do much except note if you linked
-	cygwin1.dll or are manually loading it.
-
-=== About "fhandlers"
-
-An fhandler is a file type handler.  This is where the unix device
-emulation happens.
-
-dtable.cc maps posix file descriptors to a table of file handlers (type
-fhandler) in the dll.  It's mostly concerned with managing the table
-of descriptors (open, dup, fork, select).  Most of the posix I/O
-system calls (syscalls.cc) use the fdtab table to call the right
-fhandler directly.
-
-fhandler.cc is the base class; specific types are derived as
-appropriate (see fhandler.h).  dtable.cc is in charge of selecting and
-creating a suitable fhandler when you open a file.  path.cc handles
-emulated files in /dev (like /dev/null) by returning an FH_* value
-from get_device_number (which dtable.cc calls in dtable::build_fhandler).
-
-Note: if you're looking for read() and write(), they call _read() and
-_write() in syscalls.cc.  The non-underscored ones are in
-newlib/libc/syscalls and just call the underscored ones.
-
-=== How "fork" works
-
-It all starts in fork() in fork.cc.
-
-Set up a pid in the shared memory area for the new child.  Use
-setjmp() to capture state.  First time (parent), set up some stuff and
-use CreateProcess to run a second copy of the same executable.  The
-second copy will note in the shared memory area that it's a fork, and
-do the longjmp.  They sync up and the parent copies all it's program
-memory to the child's address space.  There's also code to reload
-dlls, map shared memory and mmap'd files, etc.
-
-Handling the special startup for the child is done in dcrt0.cc in many
-places.  This case is triggered by a special StartupInfo structure
-that's passed from the parent to the child in CreateProcessA.
diff --git a/winsup/cygwin/acconfig.h b/winsup/cygwin/acconfig.h
deleted file mode 100644
index 36aee469e..000000000
--- a/winsup/cygwin/acconfig.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Define if DEBUGGING support is requested.  */
-#undef DEBUGGING
-
-/* Define if building "extra" thread-safe Cygwin DLL.  */
-#undef _CYG_THREAD_FAILSAFE
-
-/* Define if GCC supports builtin memset.  */
-#undef HAVE_BUILTIN_MEMSET
-
-/* Define if MALLOC_DEBUGGING support is requested.  */
-#undef MALLOC_DEBUG
-
-/* Define if building thread-safe Cygwin DLL.  */
-#undef _MT_SAFE
-
-/* Define if using new vfork functionality. */
-#undef NEWVFORK
-
-/* Define if using cygserver */
-#undef USE_SERVER
diff --git a/winsup/cygwin/ansi.sgml b/winsup/cygwin/ansi.sgml
deleted file mode 100644
index d6a41ab31..000000000
--- a/winsup/cygwin/ansi.sgml
+++ /dev/null
@@ -1,59 +0,0 @@
-<sect1 id="std-ansi">
-<title>Compatibility with ANSI</title>
-
-<para>The following functions are compatible with ANSI:</para>
-
-<sect2><title>stdio</title><para>
-
-clearerr, fclose, feof, ferror, fflush, fgetc, fgetpos, fgets, fopen,
-fprintf, fputc, fputs, fread, freopen, fscanf, fseek, fsetpos, ftell,
-fwrite, getc, getchar, gets, perror, printf, putc, putchar, puts,
-remove, rename, rewind, scanf, setbuf, setvbuf, sprintf, sscanf,
-tmpfile, tmpnam, vfprintf, ungetc, vprintf, vsprintf,
-
-</para></sect2>
-<sect2><title>string</title><para>
-
-memchr, memcmp, memcpy, memmove, memset, strcat, strchr, strcmp,
-strcoll, strcpy, strcspn, strerror, strlen, strncat, strncmp, strncpy,
-strpbrk, strrchr, strspn, strstr, strtok, strxfrm
-
-</para></sect2>
-<sect2><title>stdlib</title><para>
-
-abort, abs, assert, atexit, atof, atoi, atol, bsearch, calloc, div,
-exit, free, getenv, labs, ldiv, longjmp, malloc, mblen, mbstowcs,
-mbtowc, qsort, rand, realloc, setjmp, srand, strtod, strtol, strtoul,
-system, wcstombs, wctomb
-
-</para></sect2>
-<sect2><title>time</title><para>
-
-asctime, gmtime, localtime, time, clock, ctime, difftime, mktime,
-strftime
-
-</para></sect2>
-<sect2><title>signals</title><para>
-
-raise, signal
-
-</para></sect2>
-<sect2><title>ctype</title><para>
-
-isalnum, isalpha, iscntrl, isdigit, isgraph, islower, isprint,
-ispunct, isspace, isupper, isxdigit, tolower, toupper
-
-</para></sect2>
-<sect2><title>math</title><para>
-
-acos, asin, atan, atan2, ceil, cos, cosh, exp, fabs, floor, fmod,
-frexp, ldexp, log, log10, modf, pow, sin, sinh, sqrt, tan, tanh
-
-</para></sect2>
-<sect2><title>misc</title><para>
-
-localeconv, setlocale, va_arg, va_end, va_start
-
-</para></sect2>
-
-</sect1>
\ No newline at end of file
diff --git a/winsup/cygwin/assert.cc b/winsup/cygwin/assert.cc
deleted file mode 100644
index 063c7b852..000000000
--- a/winsup/cygwin/assert.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-/* assert.cc: Handle the assert macro for WIN32.
-
-   Copyright 1997, 1998, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "security.h"
-#include <wingdi.h>
-#include <winuser.h>
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-/* This function is called when the assert macro fails.  This will
-   override the function of the same name in newlib.  */
-
-extern "C" void
-__assert (const char *file, int line, const char *failedexpr)
-{
-  HANDLE h;
-
-  /* If we don't have a console in a Windows program, then bring up a
-     message box for the assertion failure.  */
-
-  h = CreateFile ("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, &sec_none_nih,
-		  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-  if (h == INVALID_HANDLE_VALUE)
-    {
-      char *buf;
-
-      buf = (char *) alloca (100 + strlen (failedexpr));
-      __small_sprintf (buf, "Failed assertion\n\t%s\nat line %d of file %s",
-		failedexpr, line, file);
-      MessageBox (NULL, buf, NULL, MB_OK | MB_ICONERROR | MB_TASKMODAL);
-    }
-  else
-    {
-      CloseHandle (h);
-      small_printf ("assertion \"%s\" failed: file \"%s\", line %d\n",
-		    failedexpr, file, line);
-    }
-
-#ifdef DEBUGGING
-  try_to_debug ();
-#endif
-  abort ();	// FIXME: Someday this should work.
-
-  /* NOTREACHED */
-}
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc
deleted file mode 100644
index 1628480f8..000000000
--- a/winsup/cygwin/autoload.cc
+++ /dev/null
@@ -1,536 +0,0 @@
-/* autoload.cc: all dynamic load stuff.
-
-   Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#define USE_SYS_TYPES_FD_SET
-#include <winsock2.h>
-
-/* Macro for defining "auto-load" functions.
- * Note that this is self-modifying code *gasp*.
- * The first invocation of a routine will trigger the loading of
- * the DLL.  This will then be followed by the discovery of
- * the procedure's entry point, which is placed into the location
- * pointed to by the stack pointer.  This code then changes
- * the "call" operand which invoked it to a "jmp" which will
- * transfer directly to the DLL function on the next invocation.
- *
- * Subsequent calls to routines whose transfer address has not been
- * determined will skip the "load the dll" step, starting at the
- * "discovery of the entry point" step.
- *
- * So, immediately following the the call to one of the above routines
- * we have:
- *  DLL info (4 bytes)	 Pointer to a block of information concerning
- *			 the DLL (see below).
- *  DLL args (4 bytes)	 The number of arguments pushed on the stack by
- *			 the call.  If this is an odd value then this
- *			 is a flag that non-existence of this function
- *			 is not a fatal error
- *  func name (n bytes)	 asciz string containing the name of the function
- *			 to be loaded.
- *
- * The DLL info block consists of the following
- *  load_state (4 bytes) Pointer to a word containing the routine used
- *			 to eventually invoke the function.  Initially
- *			 points to an init function which loads the
- *			 DLL, gets the process's load address,
- *			 changes the contents here to point to the
- *			 function address, and changes the call *(%eax)
- *			 to a jmp func.  If the initialization has been
- *			 done, only the load part is done.
- *  DLL handle (4 bytes) The handle to use when loading the DLL.
- *  DLL locker (4 bytes) Word to use to avoid multi-thread access during
- *			 initialization.
- *  extra init (4 bytes) Extra initialization function.
- *  DLL name (n bytes)	 asciz string containing the name of the DLL.
- */
-
-/* LoadDLLprime is used to prime the DLL info information, providing an
-   additional initialization routine to call prior to calling the first
-   function.  */
-#define LoadDLLprime(dllname, init_also) __asm__ ("	\n\
-  .section	." #dllname "_info,\"w\"		\n\
-  .linkonce						\n\
-  .long		_std_dll_init				\n\
-  .long		0					\n\
-  .long		-1					\n\
-  .long		" #init_also "				\n\
-  .asciz	\"" #dllname "\"			\n\
-  .text							\n\
-");
-
-/* Create a "decorated" name */
-#define mangle(name, n) #name "@" #n
-
-/* Standard DLL load macro.  Invokes a fatal warning if the function isn't
-   found. */
-#define LoadDLLfunc(name, n, dllname) LoadDLLfuncEx (name, n, dllname, 0)
-#define LoadDLLfuncEx(name, n, dllname, notimp) LoadDLLfuncEx2(name, n, dllname, notimp, 0)
-
-/* Main DLL setup stuff. */
-#define LoadDLLfuncEx2(name, n, dllname, notimp, err) \
-  LoadDLLprime (dllname, dll_func_load)			\
-  __asm__ ("						\n\
-  .section	." #dllname "_text,\"wx\"		\n\
-  .global	_" mangle (name, n) "			\n\
-  .global	_win32_" mangle (name, n) "		\n\
-  .align	8					\n\
-_" mangle (name, n) ":					\n\
-_win32_" mangle (name, n) ":				\n\
-  .byte		0xe9					\n\
-  .long		-4 + 1f - .				\n\
-1:movl		(2f),%eax				\n\
-  call		*(%eax)					\n\
-2:.long		." #dllname "_info			\n\
-  .long		(" #n "+" #notimp ") | " #err "<<16	\n\
-  .asciz	\"" #name "\"				\n\
-  .text							\n\
-");
-
-/* DLL loader helper functions used during initialization. */
-
-/* The function which finds the address, given the name and overwrites
-   the call so that future invocations go straight to the function in
-   the DLL. */
-extern "C" void dll_func_load () __asm__ ("dll_func_load");
-
-/* Called by the primary initialization function "init_std_dll" to
-   setup the stack and eliminate future calls to init_std_dll for other
-   functions from this DLL.  */
-extern "C" void dll_chain () __asm__ ("dll_chain");
-
-/* called by the secondary initialization function to call dll_func_load. */
-extern "C" void dll_chain1 () __asm__ ("dll_chain1");
-
-extern "C" {
-
-/* FIXME: This is not thread-safe? */
-__asm__ ("								\n\
-msg1:									\n\
-	.ascii	\"couldn't dynamically determine load address for '%s' (handle %p), %E\\0\"\n\
-									\n\
-	.align	32							\n\
-noload:									\n\
-	popl	%edx		# Get the address of the information block\n\
-	movl	4(%edx),%eax	# Should we 'ignore' the lack		\n\
-	test	$1,%eax		#  of this function?			\n\
-	jz	1f		# Nope.					\n\
-	decl	%eax		# Yes.  This is the # of bytes + 1	\n\
-	popl	%edx		# Caller's caller			\n\
-	addl	%eax,%esp	# Pop off bytes				\n\
-	andl	$0xffff0000,%eax# upper word				\n\
-	subl	%eax,%esp	# adjust for possible return value	\n\
-	pushl	%eax		# Save for later			\n\
-	movl	$127,%eax	# ERROR_PROC_NOT_FOUND			\n\
-	pushl	%eax		# First argument			\n\
-	call	_SetLastError@4	# Set it				\n\
-	popl	%eax		# Get back argument			\n\
-	shrl	$16,%eax	# return value in high order word	\n\
-	jmp	*%edx		# Return				\n\
-1:									\n\
-	movl	(%edx),%eax	# Handle value				\n\
-	pushl	4(%eax)							\n\
-	leal	8(%edx),%eax	# Location of name of function		\n\
-	push	%eax							\n\
-	push	$msg1		# The message				\n\
-	call	___api_fatal	# Print message. Never returns		\n\
-									\n\
-	.globl	dll_func_load						\n\
-dll_func_load:								\n\
-	movl	(%esp),%eax	# 'Return address' contains load info	\n\
-	addl	$8,%eax		# Address of name of function to load	\n\
-	pushl	%eax		# Second argument			\n\
-	movl	-8(%eax),%eax	# Where handle lives			\n\
-	movl	4(%eax),%eax	# Address of Handle to DLL		\n\
-	pushl	%eax		# Handle to DLL				\n\
-	call	_GetProcAddress@8# Load it				\n\
-	test	%eax,%eax	# Success?				\n\
-	jne	gotit		# Yes					\n\
-	jmp	noload		# Issue an error or return		\n\
-gotit:									\n\
-	popl	%edx		# Pointer to 'return address'		\n\
-	subl	%edx,%eax	# Make it relative			\n\
-	addl	$7,%eax		# Tweak					\n\
-	subl	$12,%edx	# Point to jmp				\n\
-	movl	%eax,1(%edx)	# Move relative address after jump	\n\
-	jmp	*%edx		# Jump to actual function		\n\
-									\n\
-	.global	dll_chain						\n\
-dll_chain:								\n\
-	pushl	%eax		# Restore 'return address'		\n\
-	movl	(%eax),%eax	# Get address of DLL info block		\n\
-	movl	$dll_func_load,(%eax) # Just load func now		\n\
-	jmp	*%edx		# Jump to next init function		\n\
-									\n\
-dll_chain1:								\n\
-	pushl	%eax		# Restore 'return address'		\n\
-	jmp	*%edx		# Jump to next init function		\n\
-");
-
-/* C representations of the two info blocks described above.
-   FIXME: These structures confuse gdb for some reason.  GDB can print
-   the whole structure but has problems with the name field? */
-struct dll_info
-{
-  DWORD load_state;
-  HANDLE handle;
-  LONG here;
-  void (*init) ();
-  char name[];
-};
-
-struct func_info
-{
-  struct dll_info *dll;
-  LONG decoration;
-  char name[];
-};
-
-/* Mechanism for setting up info for passing to dll_chain routines. */
-union retchain
-{
-  struct {long high; long low;};
-  long long ll;
-};
-
-/* The standard DLL initialization routine. */
-__attribute__ ((used, noinline)) static long long
-std_dll_init ()
-{
-  HANDLE h;
-  struct func_info *func = (struct func_info *) __builtin_return_address (0);
-  struct dll_info *dll = func->dll;
-  retchain ret;
-
-  if (InterlockedIncrement (&dll->here))
-    do
-      {
-	InterlockedDecrement (&dll->here);
-	low_priority_sleep (0);
-      }
-    while (InterlockedIncrement (&dll->here));
-  else if (!dll->handle)
-    {
-      if ((h = LoadLibrary (dll->name)) != NULL)
-	dll->handle = h;
-      else if (!(func->decoration & 1))
-	api_fatal ("could not load %s, %E", dll->name);
-      else
-	dll->handle = INVALID_HANDLE_VALUE;
-    }
-
-  InterlockedDecrement (&dll->here);
-
-  /* Kludge alert.  Redirects the return address to dll_chain. */
-  __asm__ __volatile__ ("		\n\
-	movl	$dll_chain,4(%ebp)	\n\
-  ");
-
-  /* Set "arguments for dll_chain. */
-  ret.low = (long) dll->init;
-  ret.high = (long) func;
-  return ret.ll;
-}
-
-/* Initialization function for winsock stuff. */
-bool NO_COPY wsock_started = 0;
-__attribute__ ((used, noinline, regparm(1))) static long long
-wsock_init ()
-{
-  static LONG NO_COPY here = -1L;
-  struct func_info *func = (struct func_info *) __builtin_return_address (0);
-  struct dll_info *dll = func->dll;
-
-  __asm__ ("						\n\
-	.section .ws2_32_info				\n\
-	.equ	_ws2_32_handle,.ws2_32_info + 4		\n\
-	.global _ws2_32_handle				\n\
-	.section .wsock32_info				\n\
-	.equ	_wsock32_handle,.wsock32_info + 4	\n\
-	.global	_wsock32_handle				\n\
-	.text						\n\
-  ");
-
-  while (InterlockedIncrement (&here))
-    {
-      InterlockedDecrement (&here);
-      low_priority_sleep (0);
-    }
-
-  if (!wsock_started && (winsock_active || winsock2_active))
-    {
-      /* Don't use autoload to load WSAStartup to eliminate recursion. */
-      int (*wsastartup) (int, WSADATA *);
-
-      wsastartup = (int (*)(int, WSADATA *))
-		   GetProcAddress ((HMODULE) (dll->handle), "WSAStartup");
-      if (wsastartup)
-	{
-	  int res = wsastartup ((2<<8) | 2, &wsadata);
-
-	  debug_printf ("res %d", res);
-	  debug_printf ("wVersion %d", wsadata.wVersion);
-	  debug_printf ("wHighVersion %d", wsadata.wHighVersion);
-	  debug_printf ("szDescription %s", wsadata.szDescription);
-	  debug_printf ("szSystemStatus %s", wsadata.szSystemStatus);
-	  debug_printf ("iMaxSockets %d", wsadata.iMaxSockets);
-	  debug_printf ("iMaxUdpDg %d", wsadata.iMaxUdpDg);
-	  debug_printf ("lpVendorInfo %d", wsadata.lpVendorInfo);
-
-	  wsock_started = 1;
-	}
-    }
-
-  InterlockedDecrement (&here);
-
-  /* Kludge alert.  Redirects the return address to dll_chain1. */
-  __asm__ __volatile__ ("		\n\
-	movl	$dll_chain1,4(%ebp)	\n\
-  ");
-
-  volatile retchain ret;
-  /* Set "arguments for dll_chain1. */
-  ret.low = (long) dll_func_load;
-  ret.high = (long) func;
-  return ret.ll;
-}
-
-LoadDLLprime (wsock32, _wsock_init)
-LoadDLLprime (ws2_32, _wsock_init)
-
-LoadDLLfunc (AccessCheck, 32, advapi32)
-LoadDLLfunc (AddAccessAllowedAce, 16, advapi32)
-LoadDLLfunc (AddAccessDeniedAce, 16, advapi32)
-LoadDLLfunc (AddAce, 20, advapi32)
-LoadDLLfunc (AdjustTokenPrivileges, 24, advapi32)
-LoadDLLfuncEx (AllocateLocallyUniqueId, 4, advapi32, 1)
-LoadDLLfunc (CopySid, 12, advapi32)
-LoadDLLfunc (CreateProcessAsUserA, 44, advapi32)
-LoadDLLfuncEx (CryptAcquireContextA, 20, advapi32, 1)
-LoadDLLfuncEx (CryptGenRandom, 12, advapi32, 1)
-LoadDLLfuncEx (CryptReleaseContext, 8, advapi32, 1)
-LoadDLLfunc (DeregisterEventSource, 4, advapi32)
-LoadDLLfunc (DuplicateToken, 12, advapi32)
-LoadDLLfuncEx (DuplicateTokenEx, 24, advapi32, 1)
-LoadDLLfunc (EqualSid, 8, advapi32)
-LoadDLLfunc (FindFirstFreeAce, 8, advapi32)
-LoadDLLfunc (GetAce, 12, advapi32)
-LoadDLLfunc (GetFileSecurityA, 20, advapi32)
-LoadDLLfunc (GetKernelObjectSecurity, 20, advapi32)
-LoadDLLfunc (GetLengthSid, 4, advapi32)
-LoadDLLfunc (GetSecurityDescriptorDacl, 16, advapi32)
-LoadDLLfunc (GetSecurityDescriptorGroup, 12, advapi32)
-LoadDLLfunc (GetSecurityDescriptorOwner, 12, advapi32)
-LoadDLLfunc (GetSecurityInfo, 32, advapi32)
-LoadDLLfunc (GetSidIdentifierAuthority, 4, advapi32)
-LoadDLLfunc (GetSidSubAuthority, 8, advapi32)
-LoadDLLfunc (GetSidSubAuthorityCount, 4, advapi32)
-LoadDLLfunc (GetTokenInformation, 20, advapi32)
-LoadDLLfunc (GetUserNameA, 8, advapi32)
-LoadDLLfunc (ImpersonateLoggedOnUser, 4, advapi32)
-LoadDLLfunc (ImpersonateNamedPipeClient, 4, advapi32)
-LoadDLLfunc (InitializeAcl, 12, advapi32)
-LoadDLLfunc (InitializeSecurityDescriptor, 8, advapi32)
-LoadDLLfunc (InitializeSid, 12, advapi32)
-LoadDLLfunc (IsValidSid, 4, advapi32)
-LoadDLLfunc (LogonUserA, 24, advapi32)
-LoadDLLfunc (LookupAccountNameA, 28, advapi32)
-LoadDLLfunc (LookupAccountNameW, 28, advapi32)
-LoadDLLfunc (LookupAccountSidA, 28, advapi32)
-LoadDLLfunc (LookupPrivilegeValueA, 12, advapi32)
-LoadDLLfunc (LsaClose, 4, advapi32)
-LoadDLLfunc (LsaEnumerateAccountRights, 16, advapi32)
-LoadDLLfunc (LsaFreeMemory, 4, advapi32)
-LoadDLLfunc (LsaNtStatusToWinError, 4, advapi32)
-LoadDLLfunc (LsaOpenPolicy, 16, advapi32)
-LoadDLLfunc (LsaQueryInformationPolicy, 12, advapi32)
-LoadDLLfunc (MakeSelfRelativeSD, 12, advapi32)
-LoadDLLfunc (OpenProcessToken, 12, advapi32)
-LoadDLLfunc (OpenThreadToken, 16, advapi32)
-LoadDLLfunc (RegCloseKey, 4, advapi32)
-LoadDLLfunc (RegCreateKeyExA, 36, advapi32)
-LoadDLLfunc (RegDeleteKeyA, 8, advapi32)
-LoadDLLfunc (RegDeleteValueA, 8, advapi32)
-LoadDLLfunc (RegLoadKeyA, 12, advapi32)
-LoadDLLfunc (RegEnumKeyExA, 32, advapi32)
-LoadDLLfunc (RegEnumValueA, 32, advapi32)
-LoadDLLfunc (RegOpenKeyExA, 20, advapi32)
-LoadDLLfunc (RegQueryInfoKeyA, 48, advapi32)
-LoadDLLfunc (RegQueryValueExA, 24, advapi32)
-LoadDLLfunc (RegSetValueExA, 24, advapi32)
-LoadDLLfunc (RegisterEventSourceA, 8, advapi32)
-LoadDLLfunc (ReportEventA, 36, advapi32)
-LoadDLLfunc (RevertToSelf, 0, advapi32)
-LoadDLLfunc (SetKernelObjectSecurity, 12, advapi32)
-LoadDLLfunc (SetSecurityDescriptorControl, 12, advapi32)
-LoadDLLfunc (SetSecurityDescriptorDacl, 16, advapi32)
-LoadDLLfunc (SetSecurityDescriptorGroup, 12, advapi32)
-LoadDLLfunc (SetSecurityDescriptorOwner, 12, advapi32)
-LoadDLLfunc (SetTokenInformation, 16, advapi32)
-LoadDLLfunc (RegGetKeySecurity, 16, advapi32)
-
-LoadDLLfunc (NetApiBufferFree, 4, netapi32)
-LoadDLLfuncEx (NetGetDCName, 12, netapi32, 1)
-LoadDLLfunc (NetLocalGroupEnum, 28, netapi32)
-LoadDLLfunc (NetLocalGroupGetMembers, 32, netapi32)
-LoadDLLfunc (NetUserGetGroups, 28, netapi32)
-LoadDLLfunc (NetUserGetInfo, 16, netapi32)
-LoadDLLfunc (NetWkstaUserGetInfo, 12, netapi32)
-
-LoadDLLfuncEx (NtCreateToken, 52, ntdll, 1)
-LoadDLLfuncEx (NtMapViewOfSection, 40, ntdll, 1)
-LoadDLLfuncEx (NtOpenFile, 24, ntdll, 1)
-LoadDLLfuncEx (NtOpenSection, 12, ntdll, 1)
-LoadDLLfuncEx (NtQueryInformationFile, 20, ntdll, 1)
-LoadDLLfuncEx (NtQueryInformationProcess, 20, ntdll, 1)
-LoadDLLfuncEx2 (NtQueryObject, 20, ntdll, 1, 1)
-LoadDLLfuncEx (NtQuerySystemInformation, 16, ntdll, 1)
-LoadDLLfuncEx (NtQueryVirtualMemory, 24, ntdll, 1)
-LoadDLLfuncEx (NtUnmapViewOfSection, 8, ntdll, 1)
-LoadDLLfuncEx (RtlInitUnicodeString, 8, ntdll, 1)
-LoadDLLfuncEx (RtlNtStatusToDosError, 4, ntdll, 1)
-
-LoadDLLfuncEx (GetProcessMemoryInfo, 12, psapi, 1)
-
-LoadDLLfuncEx (LsaDeregisterLogonProcess, 4, secur32, 1)
-LoadDLLfuncEx (LsaFreeReturnBuffer, 4, secur32, 1)
-LoadDLLfuncEx (LsaLogonUser, 56, secur32, 1)
-LoadDLLfuncEx (LsaLookupAuthenticationPackage, 12, secur32, 1)
-LoadDLLfuncEx (LsaRegisterLogonProcess, 12, secur32, 1)
-
-LoadDLLfunc (CharToOemA, 8, user32)
-LoadDLLfunc (CharToOemBuffA, 12, user32)
-LoadDLLfunc (CloseClipboard, 0, user32)
-LoadDLLfunc (CreateWindowExA, 48, user32)
-LoadDLLfunc (CreateWindowStationA, 16, user32)
-LoadDLLfunc (DefWindowProcA, 16, user32)
-LoadDLLfunc (DispatchMessageA, 4, user32)
-LoadDLLfunc (EmptyClipboard, 0, user32)
-LoadDLLfunc (FindWindowA, 8, user32)
-LoadDLLfunc (GetClipboardData, 4, user32)
-LoadDLLfunc (GetForegroundWindow, 0, user32)
-LoadDLLfunc (GetKeyboardLayout, 4, user32)
-LoadDLLfunc (GetMessageA, 16, user32)
-LoadDLLfunc (GetPriorityClipboardFormat, 8, user32)
-LoadDLLfunc (GetProcessWindowStation, 0, user32)
-LoadDLLfunc (GetThreadDesktop, 4, user32)
-LoadDLLfunc (GetWindowThreadProcessId, 8, user32)
-LoadDLLfunc (GetUserObjectInformationA, 20, user32)
-LoadDLLfunc (KillTimer, 8, user32)
-LoadDLLfunc (MessageBeep, 4, user32)
-LoadDLLfunc (MessageBoxA, 16, user32)
-LoadDLLfunc (MsgWaitForMultipleObjects, 20, user32)
-LoadDLLfunc (OemToCharBuffA, 12, user32)
-LoadDLLfunc (OpenClipboard, 4, user32)
-LoadDLLfunc (PeekMessageA, 20, user32)
-LoadDLLfunc (PostMessageA, 16, user32)
-LoadDLLfunc (PostQuitMessage, 4, user32)
-LoadDLLfunc (RegisterClassA, 4, user32)
-LoadDLLfunc (RegisterClipboardFormatA, 4, user32)
-LoadDLLfunc (SendMessageA, 16, user32)
-LoadDLLfunc (SetClipboardData, 8, user32)
-LoadDLLfunc (SetProcessWindowStation, 4, user32)
-LoadDLLfunc (SetTimer, 16, user32)
-LoadDLLfunc (SetUserObjectSecurity, 12, user32)
-
-LoadDLLfuncEx (load_wsock32, 0, wsock32, 1) // non-existent function forces wsock32 load
-LoadDLLfunc (WSAAsyncSelect, 16, wsock32)
-LoadDLLfunc (WSACleanup, 0, wsock32)
-LoadDLLfunc (WSAGetLastError, 0, wsock32)
-LoadDLLfunc (WSASetLastError, 4, wsock32)
-// LoadDLLfunc (WSAStartup, 8, wsock32)
-LoadDLLfunc (__WSAFDIsSet, 8, wsock32)
-LoadDLLfunc (accept, 12, wsock32)
-LoadDLLfunc (bind, 12, wsock32)
-LoadDLLfunc (closesocket, 4, wsock32)
-LoadDLLfunc (connect, 12, wsock32)
-LoadDLLfunc (gethostbyaddr, 12, wsock32)
-LoadDLLfunc (gethostbyname, 4, wsock32)
-LoadDLLfuncEx2 (gethostname, 8, wsock32, 1, 1)
-LoadDLLfunc (getpeername, 12, wsock32)
-LoadDLLfunc (getprotobyname, 4, wsock32)
-LoadDLLfunc (getprotobynumber, 4, wsock32)
-LoadDLLfunc (getservbyname, 8, wsock32)
-LoadDLLfunc (getservbyport, 8, wsock32)
-LoadDLLfunc (getsockname, 12, wsock32)
-LoadDLLfunc (getsockopt, 20, wsock32)
-LoadDLLfunc (inet_addr, 4, wsock32)
-LoadDLLfunc (inet_network, 4, wsock32)
-LoadDLLfunc (inet_ntoa, 4, wsock32)
-LoadDLLfunc (ioctlsocket, 12, wsock32)
-LoadDLLfunc (listen, 8, wsock32)
-LoadDLLfunc (rcmd, 24, wsock32)
-LoadDLLfunc (recv, 16, wsock32)
-LoadDLLfunc (recvfrom, 24, wsock32)
-LoadDLLfunc (rexec, 24, wsock32)
-LoadDLLfunc (rresvport, 4, wsock32)
-LoadDLLfunc (select, 20, wsock32)
-LoadDLLfunc (send, 16, wsock32)
-LoadDLLfunc (sendto, 24, wsock32)
-LoadDLLfunc (setsockopt, 20, wsock32)
-LoadDLLfunc (shutdown, 8, wsock32)
-LoadDLLfunc (socket, 12, wsock32)
-
-LoadDLLfuncEx (WSACloseEvent, 4, ws2_32, 1)
-LoadDLLfuncEx (WSACreateEvent, 0, ws2_32, 1)
-LoadDLLfuncEx (WSADuplicateSocketA, 12, ws2_32, 1)
-LoadDLLfuncEx (WSAGetOverlappedResult, 20, ws2_32, 1)
-LoadDLLfuncEx (WSARecv, 28, ws2_32, 1)
-LoadDLLfuncEx (WSARecvFrom, 36, ws2_32, 1)
-LoadDLLfuncEx (WSASend, 28, ws2_32, 1)
-LoadDLLfuncEx (WSASendTo, 36, ws2_32, 1)
-LoadDLLfuncEx (WSASetEvent, 4, ws2_32, 1)
-LoadDLLfuncEx (WSASocketA, 24, ws2_32, 1)
-LoadDLLfuncEx (WSAWaitForMultipleEvents, 20, ws2_32, 1)
-LoadDLLfuncEx (WSAEventSelect, 12, ws2_32, 1)
-LoadDLLfuncEx (WSAEnumNetworkEvents, 12, ws2_32, 1)
-
-LoadDLLfuncEx (GetIfTable, 12, iphlpapi, 1)
-LoadDLLfuncEx (GetIfEntry, 4, iphlpapi, 1)
-LoadDLLfuncEx (GetIpAddrTable, 12, iphlpapi, 1)
-LoadDLLfuncEx (GetNetworkParams, 8, iphlpapi, 1)
-
-LoadDLLfunc (CoInitialize, 4, ole32)
-LoadDLLfunc (CoUninitialize, 0, ole32)
-LoadDLLfunc (CoCreateInstance, 20, ole32)
-
-LoadDLLfuncEx (CancelIo, 4, kernel32, 1)
-LoadDLLfuncEx (CreateHardLinkA, 12, kernel32, 1)
-LoadDLLfuncEx (CreateToolhelp32Snapshot, 8, kernel32, 1)
-LoadDLLfuncEx2 (GetCompressedFileSizeA, 8, kernel32, 1, 0xffffffff)
-LoadDLLfuncEx (GetConsoleWindow, 0, kernel32, 1)
-LoadDLLfuncEx (GetDiskFreeSpaceEx, 16, kernel32, 1)
-LoadDLLfuncEx (GetSystemTimes, 12, kernel32, 1)
-LoadDLLfuncEx2 (IsDebuggerPresent, 0, kernel32, 1, 1)
-LoadDLLfunc (IsProcessorFeaturePresent, 4, kernel32);
-LoadDLLfuncEx (Process32First, 8, kernel32, 1)
-LoadDLLfuncEx (Process32Next, 8, kernel32, 1)
-LoadDLLfuncEx (RegisterServiceProcess, 8, kernel32, 1)
-LoadDLLfuncEx (SignalObjectAndWait, 16, kernel32, 1)
-LoadDLLfuncEx (SwitchToThread, 0, kernel32, 1)
-LoadDLLfunc (TryEnterCriticalSection, 4, kernel32)
-
-LoadDLLfuncEx (waveOutGetNumDevs, 0, winmm, 1)
-LoadDLLfuncEx (waveOutOpen, 24, winmm, 1)
-LoadDLLfuncEx (waveOutReset, 4, winmm, 1)
-LoadDLLfuncEx (waveOutClose, 4, winmm, 1)
-LoadDLLfuncEx (waveOutGetVolume, 8, winmm, 1)
-LoadDLLfuncEx (waveOutSetVolume, 8, winmm, 1)
-LoadDLLfuncEx (waveOutUnprepareHeader, 12, winmm, 1)
-LoadDLLfuncEx (waveOutPrepareHeader, 12, winmm, 1)
-LoadDLLfuncEx (waveOutWrite, 12, winmm, 1)
-LoadDLLfuncEx (timeGetDevCaps, 8, winmm, 1)
-LoadDLLfuncEx (timeGetTime, 0, winmm, 1)
-LoadDLLfuncEx (timeBeginPeriod, 4, winmm, 1)
-LoadDLLfuncEx (timeEndPeriod, 4, winmm, 1)
-
-LoadDLLfuncEx (UuidCreate, 4, rpcrt4, 1)
-LoadDLLfuncEx (UuidCreateSequential, 4, rpcrt4, 1)
-}
diff --git a/winsup/cygwin/automode.c b/winsup/cygwin/automode.c
deleted file mode 100644
index f7cddfeec..000000000
--- a/winsup/cygwin/automode.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* automode.c
-
-   Copyright 2000 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <windows.h>
-#include <sys/fcntl.h>
-#include <sys/cygwin.h>
-
-extern int _fmode;
-void
-cygwin_premain0 (int argc, char **argv, struct per_process *myself)
-{
-  static struct __cygwin_perfile pf[] =
-  {
-    {"", O_RDONLY | O_TEXT},
-    {"", O_WRONLY | O_BINARY},
-    {NULL, 0}
-  };
-  cygwin_internal (CW_PERFILE, pf);
-}
diff --git a/winsup/cygwin/binmode.c b/winsup/cygwin/binmode.c
deleted file mode 100644
index 50efff46f..000000000
--- a/winsup/cygwin/binmode.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* binmode.c
-
-   Copyright 2000 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <windows.h>
-#include <sys/fcntl.h>
-#include <sys/cygwin.h>
-
-extern int _fmode;
-void
-cygwin_premain0 (int argc, char **argv, struct per_process *myself)
-{
-  _fmode &= ~_O_TEXT;
-  _fmode |= _O_BINARY;
-}
diff --git a/winsup/cygwin/child_info.h b/winsup/cygwin/child_info.h
deleted file mode 100644
index da14cc2b5..000000000
--- a/winsup/cygwin/child_info.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* child_info.h: shared child info for cygwin
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <setjmp.h>
-
-enum
-{
-  _PROC_EXEC,
-  _PROC_SPAWN,
-  _PROC_FORK,
-  _PROC_WHOOPS
-};
-
-#define OPROC_MAGIC_MASK 0xff00ff00
-#define OPROC_MAGIC_GENERIC 0xaf00f000
-
-#define PROC_MAGIC_GENERIC 0xaf00fa00
-
-#define PROC_EXEC (_PROC_EXEC)
-#define PROC_SPAWN (_PROC_SPAWN)
-#define PROC_FORK (_PROC_FORK)
-
-#define EXEC_MAGIC_SIZE sizeof(child_info)
-
-#define CURR_CHILD_INFO_MAGIC 0x1e4c5751U
-
-/* NOTE: Do not make gratuitous changes to the names or organization of the
-   below class.  The layout is checksummed to determine compatibility between
-   different cygwin versions. */
-class child_info
-{
-public:
-  DWORD zero[4];	// must be zeroed
-  DWORD cb;		// size of this record
-  DWORD intro;		// improbable string
-  unsigned long magic;	// magic number unique to child_info
-  unsigned short type;	// type of record, exec, spawn, fork
-  int cygpid;		// cygwin pid of child process
-  HANDLE subproc_ready;	// used for synchronization with parent
-  HANDLE user_h;
-  HANDLE parent;
-  HANDLE pppid_handle;
-  init_cygheap *cygheap;
-  void *cygheap_max;
-  HANDLE cygheap_h;
-  unsigned fhandler_union_cb;
-};
-
-class mount_info;
-class _pinfo;
-
-class child_info_fork: public child_info
-{
-public:
-  HANDLE forker_finished;// for synchronization with child
-  DWORD stacksize;	// size of parent stack
-  jmp_buf jmp;		// where child will jump to
-  void *stacktop;	// location of top of parent stack
-  void *stackbottom;	// location of bottom of parent stack
-};
-
-class fhandler_base;
-
-class cygheap_exec_info
-{
-public:
-  char *old_title;
-  int argc;
-  char **argv;
-  int envc;
-  char **envp;
-  HANDLE myself_pinfo;
-};
-
-class child_info_spawn: public child_info
-{
-public:
-  cygheap_exec_info *moreinfo;
-  HANDLE hexec_proc;
-
-  child_info_spawn (): moreinfo (NULL) {}
-  ~child_info_spawn ()
-  {
-    if (parent)
-      CloseHandle (parent);
-    if (moreinfo)
-      {
-	if (moreinfo->old_title)
-	  cfree (moreinfo->old_title);
-	if (moreinfo->envp)
-	  {
-	    for (char **e = moreinfo->envp; *e; e++)
-	      cfree (*e);
-	    cfree (moreinfo->envp);
-	  }
-	CloseHandle (moreinfo->myself_pinfo);
-	cfree (moreinfo);
-      }
-  }
-};
-
-void __stdcall init_child_info (DWORD, child_info *, int, HANDLE);
-
-extern child_info *child_proc_info;
-extern child_info_spawn *spawn_info __attribute__ ((alias ("child_proc_info")));
-extern child_info_fork *fork_info __attribute__ ((alias ("child_proc_info")));
diff --git a/winsup/cygwin/config.h.in b/winsup/cygwin/config.h.in
deleted file mode 100644
index b4d44672f..000000000
--- a/winsup/cygwin/config.h.in
+++ /dev/null
@@ -1,41 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if DEBUGGING support is requested.  */
-#undef DEBUGGING
-
-/* Define if building "extra" thread-safe Cygwin DLL.  */
-#undef _CYG_THREAD_FAILSAFE
-
-/* Define if GCC supports builtin memset.  */
-#undef HAVE_BUILTIN_MEMSET
-
-/* Define if MALLOC_DEBUGGING support is requested.  */
-#undef MALLOC_DEBUG
-
-/* Define if using new vfork functionality. */
-#undef NEWVFORK
-
-/* Define if using cygserver */
-#undef USE_SERVER
diff --git a/winsup/cygwin/config/i386/profile.h b/winsup/cygwin/config/i386/profile.h
deleted file mode 100644
index ad5f625d0..000000000
--- a/winsup/cygwin/config/i386/profile.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: profile.h,v 1.6 1995/03/28 18:17:08 jtc Exp $	*/
-
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- */
-
-#define	_MCOUNT_DECL static inline void _mcount
-
-#define	MCOUNT \
-void									\
-mcount()								\
-{									\
-	int selfpc, frompcindex;					\
-	/*								\
-	 * find the return address for mcount,				\
-	 * and the return address for mcount's caller.			\
-	 *								\
-	 * selfpc = pc pushed by mcount call				\
-	 */								\
-	__asm("movl 4(%%ebp),%0" : "=r" (selfpc));			\
-	/*								\
-	 * frompcindex = pc pushed by call into self.			\
-	 */								\
-	__asm("movl (%%ebp),%0;movl 4(%0),%0" : "=r" (frompcindex));	\
-	_mcount(frompcindex, selfpc);					\
-}
-
diff --git a/winsup/cygwin/config/i386/setjmp.c b/winsup/cygwin/config/i386/setjmp.c
deleted file mode 100644
index 9104c2c83..000000000
--- a/winsup/cygwin/config/i386/setjmp.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* setjmp.c
-
-   Copyright 1996, 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifdef __i386__
-
-#if 1
-asm("	.globl	_setjmp			\n"
-"_setjmp:				\n"
-"	pushl	%ebp			\n"
-"	movl	%esp,%ebp		\n"
-"	pushl	%edi			\n"
-"	movl	8(%ebp),%edi		\n"
-"	movl	%eax,0(%edi)		\n"
-"	movl	%ebx,4(%edi)		\n"
-"	movl	%ecx,8(%edi)		\n"
-"	movl	%edx,12(%edi)		\n"
-"	movl	%esi,16(%edi)		\n"
-"	movl	-4(%ebp),%eax		\n"
-"	movl	%eax,20(%edi)		\n"
-"	movl	0(%ebp),%eax		\n"
-"	movl	%eax,24(%edi)		\n"
-"	movl	%esp,%eax		\n"
-"	addl	$12,%eax		\n"
-"	movl	%eax,28(%edi)		\n"
-"	movl	4(%ebp),%eax		\n"
-"	movl	%eax,32(%edi)		\n"
-"	movw	%es, %ax		\n"
-"	movw	%ax, 36(%edi)		\n"
-"	movw	%fs, %ax		\n"
-"	movw	%ax, 38(%edi)		\n"
-"	movw	%gs, %ax		\n"
-"	movw	%ax, 40(%edi)		\n"
-"	movw	%ss, %ax		\n"
-"	movw	%ax, 42(%edi)		\n"
-"	popl	%edi			\n"
-"	movl	$0,%eax			\n"
-"	leave				\n"
-"	ret				\n");
-#endif
-
-#endif /* __i386__ */
diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
deleted file mode 100755
index 277353698..000000000
--- a/winsup/cygwin/configure
+++ /dev/null
@@ -1,2358 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
- --enable-extra-threadsafe-checking	Build a cygwin DLL which is thread safe with extra consistency checking"
-ac_help="$ac_help
- --enable-debugging		Build a cygwin DLL which has more consistency checking for debugging"
-ac_help="$ac_help
- --enable-server		Build a cygwin DLL which can communicate with cygserver"
-ac_help="$ac_help
- --enable-malloc-debugging		Build a cygwin DLL with heap sanity checking (this is very slow, use only if you have heap corruption problems)"
-ac_help="$ac_help
- --enable-vfork		Build a cygwin DLL which uses experimental vfork code"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=init.cc
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-INSTALL="/bin/sh "`cd $srcdir/../..; echo $(pwd)/install-sh -c`
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:570: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-
-
-
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:656: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:677: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:695: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:727: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CC"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:759: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CC="gcc"
-fi
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:795: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:844: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:868: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-gstabs+ -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
-set dummy ${ac_tool_prefix}g++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:898: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="${ac_tool_prefix}g++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CXX"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "g++", so it can be a program name with args.
-set dummy g++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:930: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="g++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CXX" && ac_cv_prog_CXX="g++"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CXX="g++"
-fi
-fi
-
-if test -z "$CXX"; then
-  # Extract the first word of "c++", so it can be a program name with args.
-set dummy c++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:966: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="c++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-CXXFLAGS='$(CFLAGS)'
-
-
-case "$with_cross_host" in
-  ""|*cygwin*)
-    all_host="all_host"
-    install_host="install_host"
-    LIBSERVER='$(bupdir)/cygserver/libcygserver.a'
-    ;;
-  *)
-    all_host=
-    install_host=
-    LIBSERVER=
-    ;;
-esac
-
-test -n "$LIBSERVER" && cat >> confdefs.h <<\EOF
-#define USE_SERVER 1
-EOF
-
-
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1022: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AR"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1054: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AR="ar"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1089: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1121: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="as"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1156: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1188: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB="ranlib"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB="ranlib"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ld; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1223: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="${ac_tool_prefix}ld"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_LD"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ld", so it can be a program name with args.
-set dummy ld; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1255: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="ld"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LD" && ac_cv_prog_LD="ld"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  LD="ld"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1290: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="${ac_tool_prefix}nm"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_NM"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "nm", so it can be a program name with args.
-set dummy nm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1322: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  ac_cv_prog_NM="$NM" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_NM="nm"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_NM" && ac_cv_prog_NM="nm"
-fi
-fi
-NM="$ac_cv_prog_NM"
-if test -n "$NM"; then
-  echo "$ac_t""$NM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  NM="nm"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1357: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1389: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="dlltool"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="dlltool"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
-set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1424: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-WINDRES="$ac_cv_prog_WINDRES"
-if test -n "$WINDRES"; then
-  echo "$ac_t""$WINDRES" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_WINDRES"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1456: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES="windres"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_WINDRES" && ac_cv_prog_WINDRES="windres"
-fi
-fi
-WINDRES="$ac_cv_prog_WINDRES"
-if test -n "$WINDRES"; then
-  echo "$ac_t""$WINDRES" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  WINDRES="windres"
-fi
-fi
-
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1490: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1505 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1522 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1539 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1572: checking for working alloca.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1577 "configure"
-#include "confdefs.h"
-#include <alloca.h>
-int main() {
-char *p = alloca(2 * sizeof(int));
-; return 0; }
-EOF
-if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_header_alloca_h=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_alloca_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
-if test $ac_cv_header_alloca_h = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA_H 1
-EOF
-
-fi
-
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1605: checking for alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1610 "configure"
-#include "confdefs.h"
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int main() {
-char *p = (char *) alloca(1);
-; return 0; }
-EOF
-if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_func_alloca_works=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_alloca_works=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
-if test $ac_cv_func_alloca_works = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA 1
-EOF
-
-fi
-
-if test $ac_cv_func_alloca_works = no; then
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-  # that cause trouble.  Some versions do not even contain alloca or
-  # contain a buggy version.  If you still want to use their alloca,
-  # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.${ac_objext}
-  cat >> confdefs.h <<\EOF
-#define C_ALLOCA 1
-EOF
-
-
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1670: checking whether alloca needs Cray hooks" >&5
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1675 "configure"
-#include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "webecray" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_os_cray=yes
-else
-  rm -rf conftest*
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_os_cray" 1>&6
-if test $ac_cv_os_cray = yes; then
-for ac_func in _getb67 GETB67 getb67; do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1700: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1705 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<EOF
-#define CRAY_STACKSEG_END $ac_func
-EOF
-
-  break
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-done
-fi
-
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:1755: checking stack direction for C alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1763 "configure"
-#include "confdefs.h"
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-main ()
-{
-  exit (find_stack_direction() < 0);
-}
-EOF
-if { (eval echo configure:1782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_stack_direction=1
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_stack_direction=-1
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
-cat >> confdefs.h <<EOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-EOF
-
-fi
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1804: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-# Test for builtin mem* functions.
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-cat > conftest.$ac_ext <<EOF
-#line 1841 "configure"
-#include "confdefs.h"
-
-#include <string.h>
-void foo(char *s, int c, size_t n)
-{
-  __builtin_memset(s, c, n);
-}
-
-int main() {
- 
-; return 0; }
-EOF
-if { (eval echo configure:1854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  use_builtin_memset=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  use_builtin_memset=no
-fi
-rm -f conftest*
-if test $use_builtin_memset = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_BUILTIN_MEMSET 1
-EOF
-
-fi
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-
-# Check whether --enable-extra-threadsafe-checking or --disable-extra-threadsafe-checking was given.
-if test "${enable_extra_threadsafe_checking+set}" = set; then
-  enableval="$enable_extra_threadsafe_checking"
-  case "${enableval}" in
-yes)
-  mt_safe_val=1
-  MT_SAFE=yes
-  cat >> confdefs.h <<\EOF
-#define _CYG_THREAD_FAILSAFE 1
-EOF
-
-  ;;
-no)
-    ;;
-esac
-
-fi
-
-
-# Check whether --enable-debugging or --disable-debugging was given.
-if test "${enable_debugging+set}" = set; then
-  enableval="$enable_debugging"
-  case "${enableval}" in
-yes)	 cat >> confdefs.h <<\EOF
-#define DEBUGGING 1
-EOF
- ;;
-no)	 ;;
-esac
-
-fi
-
-
-# Check whether --enable-server or --disable-server was given.
-if test "${enable_server+set}" = set; then
-  enableval="$enable_server"
-  case "${enableval}" in
-yes)	;;
-no)	LIBSERVER=;;
-esac
-
-fi
-
-
-MALLOC_OFILES=malloc.o
-# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given.
-if test "${enable_malloc_debugging+set}" = set; then
-  enableval="$enable_malloc_debugging"
-  case "${enableval}" in
-yes)	 cat >> confdefs.h <<\EOF
-#define MALLOC_DEBUG 1
-EOF
-
-	 MALLOC_OFILES=dlmalloc.o
-	 ;;
-no)	 ;;
-esac
-
-fi
-
-
-# Check whether --enable-vfork or --disable-vfork was given.
-if test "${enable_vfork+set}" = set; then
-  enableval="$enable_vfork"
-  vfork="${enableval}"
-]
-fi
-
-
-case "$vfork" in
-no)	 ;;
-yes|*)	 cat >> confdefs.h <<EOF
-#define NEWVFORK 1
-EOF
- ;;
-esac
-
-
-
-case "$target_cpu" in
-   i?86) DLL_ENTRY="_dll_entry@12"
-		DEF_DLL_ENTRY="dll_entry@12"
-		ALLOCA="_alloca"
-		CONFIG_DIR="i386"  ;;
-   *)		{ echo "configure: error: Invalid target processor \"$target_cpu\"" 1>&2; exit 1; } ;;
-esac
-
-
-
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CC@%$CC%g
-s%@CXX@%$CXX%g
-s%@all_host@%$all_host%g
-s%@install_host@%$install_host%g
-s%@AR@%$AR%g
-s%@AS@%$AS%g
-s%@RANLIB@%$RANLIB%g
-s%@LD@%$LD%g
-s%@NM@%$NM%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@WINDRES@%$WINDRES%g
-s%@CPP@%$CPP%g
-s%@ALLOCA@%$ALLOCA%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@MALLOC_OFILES@%$MALLOC_OFILES%g
-s%@LIBSERVER@%$LIBSERVER%g
-s%@DLL_ENTRY@%$DLL_ENTRY%g
-s%@DEF_DLL_ENTRY@%$DEF_DLL_ENTRY%g
-s%@CONFIG_DIR@%$CONFIG_DIR%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="config.h"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/winsup/cygwin/configure.in b/winsup/cygwin/configure.in
deleted file mode 100644
index 351284ecc..000000000
--- a/winsup/cygwin/configure.in
+++ /dev/null
@@ -1,200 +0,0 @@
-dnl Autoconf configure script for Cygwin.
-dnl Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003 Red Hat, Inc.
-dnl
-dnl This file is part of Cygwin.
-dnl
-dnl This software is a copyrighted work licensed under the terms of the
-dnl Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-dnl details.
-dnl
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.12)dnl
-AC_INIT(init.cc)
-AC_CONFIG_HEADER(config.h)
-
-INSTALL="/bin/sh "`cd $srcdir/../..; echo $(pwd)/install-sh -c`
-
-AC_PROG_INSTALL
-
-dnl FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-dnl copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-dnl are probably using a cross compiler, which will not be able to fully
-dnl link an executable.  This should really be fixed in autoconf
-dnl itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-gstabs+ -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-AC_DEFUN(LIB_AC_PROG_CXX,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CXX, g++, g++)
-if test -z "$CXX"; then
-  AC_CHECK_PROG(CXX, c++, c++, , , )
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-CXXFLAGS='$(CFLAGS)'
-])
-
-AC_CANONICAL_SYSTEM
-
-LIB_AC_PROG_CC
-LIB_AC_PROG_CXX
-
-case "$with_cross_host" in
-  ""|*cygwin*)
-    all_host="all_host"
-    install_host="install_host"
-    LIBSERVER='$(bupdir)/cygserver/libcygserver.a'
-    ;;
-  *)
-    all_host=
-    install_host=
-    LIBSERVER=
-    ;;
-esac
-
-test -n "$LIBSERVER" && AC_DEFINE(USE_SERVER)
-
-AC_SUBST(all_host)
-AC_SUBST(install_host)
-
-AC_CHECK_TOOL(AR, ar, ar)
-AC_CHECK_TOOL(AS, as, as)
-AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
-AC_CHECK_TOOL(LD, ld, ld)
-AC_CHECK_TOOL(NM, nm, nm)
-AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
-AC_CHECK_TOOL(WINDRES, windres, windres)
-
-AC_ALLOCA
-AC_PROG_MAKE_SET
-
-dnl check whether gcc supports __builtin_memset.
-# Test for builtin mem* functions.
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE([
-#include <string.h>
-void foo(char *s, int c, size_t n)
-{
-  __builtin_memset(s, c, n);
-}
-], [ ],
-use_builtin_memset=yes, use_builtin_memset=no)
-if test $use_builtin_memset = "yes"; then
-  AC_DEFINE(HAVE_BUILTIN_MEMSET)
-fi
-AC_LANG_RESTORE
-
-AC_ARG_ENABLE(extra-threadsafe-checking,
-[ --enable-extra-threadsafe-checking	Build a cygwin DLL which is thread safe with extra consistency checking],
-[case "${enableval}" in
-yes)
-  mt_safe_val=1
-  MT_SAFE=yes
-  AC_DEFINE(_CYG_THREAD_FAILSAFE)
-  ;;
-no)
-  dnl Don't do anything here to avoid overriding --enable-threadsafe.
-  ;;
-esac
-])
-
-AC_ARG_ENABLE(debugging,
-[ --enable-debugging		Build a cygwin DLL which has more consistency checking for debugging],
-[case "${enableval}" in
-yes)	 AC_DEFINE(DEBUGGING) ;;
-no)	 ;;
-esac
-])
-
-AC_ARG_ENABLE(server,
-[ --enable-server		Build a cygwin DLL which can communicate with cygserver],
-[case "${enableval}" in
-yes)	;;
-no)	LIBSERVER=;;
-esac
-])
-
-MALLOC_OFILES=malloc.o
-AC_ARG_ENABLE(malloc-debugging,
-[ --enable-malloc-debugging		Build a cygwin DLL with heap sanity checking (this is very slow, use only if you have heap corruption problems)],
-[case "${enableval}" in
-yes)	 AC_DEFINE(MALLOC_DEBUG)
-	 MALLOC_OFILES=dlmalloc.o
-	 ;;
-no)	 ;;
-esac
-])
-
-AC_ARG_ENABLE(vfork,
-[ --enable-vfork		Build a cygwin DLL which uses experimental vfork code],
-vfork="${enableval}"
-])
-
-case "$vfork" in
-no)	 ;;
-yes|*)	 AC_DEFINE_UNQUOTED(NEWVFORK) ;;
-esac
-
-dnl The only time we might want to transform the install names
-dnl is for unix x cygwin.  Otherwise we don't.  For now we don't
-dnl transform names.
-
-dnl if test "x$cross_compiling" = "xno" -a ; then
-dnl   if test "x$program_transform_name" = "xs,x,x,"; then
-dnl     program_transform_name=""
-dnl   fi
-dnl   if test "x$program_transform_name" = "x"; then
-dnl     program_transform_name="s,^,$target_alias-,"
-dnl   else
-dnl     program_transform_name="$program_transform_name -e s,^,$target_alias-,"
-dnl   fi
-dnl fi
-
-case "$target_cpu" in
-   i?86) DLL_ENTRY="_dll_entry@12"
-		DEF_DLL_ENTRY="dll_entry@12"
-		ALLOCA="_alloca"
-		CONFIG_DIR="i386"  ;;
-   *)		AC_MSG_ERROR(Invalid target processor \"$target_cpu\") ;;
-esac
-
-AC_SUBST(MALLOC_OFILES)
-AC_SUBST(LIBSERVER)
-AC_SUBST(DLL_ENTRY)
-AC_SUBST(DEF_DLL_ENTRY)
-AC_SUBST(ALLOCA)
-AC_SUBST(CONFIG_DIR)
-AC_OUTPUT(Makefile)
diff --git a/winsup/cygwin/cpuid.h b/winsup/cygwin/cpuid.h
deleted file mode 100644
index 1f0cc5006..000000000
--- a/winsup/cygwin/cpuid.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef CPUID_H
-#define CPUID_H
-
-extern inline void
-cpuid (unsigned *a, unsigned *b, unsigned *c, unsigned *d, unsigned in)
-{
-  asm ("cpuid"
-       : "=a" (*a),
-         "=b" (*b),
-         "=c" (*c),
-         "=d" (*d)
-       : "a" (in));
-}
-
-extern inline bool
-can_set_flag (unsigned flag)
-{
-  unsigned r1, r2;
-  asm("pushfl\n"
-      "popl %0\n"
-      "movl %0, %1\n"
-      "xorl %2, %0\n"
-      "pushl %0\n"
-      "popfl\n"
-      "pushfl\n"
-      "popl %0\n"
-      "pushl %1\n"
-      "popfl\n"
-      : "=&r" (r1), "=&r" (r2)
-      : "ir" (flag)
-  );
-  return ((r1 ^ r2) & flag) != 0;
-}
-
-#endif // !CPUID_H
diff --git a/winsup/cygwin/crt0.c b/winsup/cygwin/crt0.c
deleted file mode 100644
index 52ba7bd34..000000000
--- a/winsup/cygwin/crt0.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* crt0.c.
-
-   Copyright 2001 Red Hat, Inc.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifdef __PPC__
-/* For the PowerPC, we want to make this function have its structured
-   exception table exception function point to something we control.  */
-
-extern void __cygwin_exception_handler();
-extern void mainCRTStartup(void) __attribute__((__exception__(__cygwin_exception_handler)));
-#endif
-
-/* In the following ifdef'd i386 code, the FPU precision is set to 80 bits
-   and all FPU exceptions are masked.  The former is needed to make long
-   doubles work correctly.  The latter causes the FPU to generate NaNs and
-   Infinities instead of signals for certain operations.
-*/
-
-#ifdef __i386__
-#define FPU_RESERVED 0xF0C0
-#define FPU_DEFAULT  0x033f
-
-/* For debugging on *#!$@ windbg.  bp for breakpoint.  */
-int __cygwin_crt0_bp = 0;
-#endif
-
-extern int main (int argc, char **argv);
-
-void cygwin_crt0 (int (*main) (int, char **));
-
-void
-mainCRTStartup ()
-{
-#ifdef __i386__
-  if (__cygwin_crt0_bp)
-    asm volatile ("int3");
-
-  {
-    volatile unsigned short cw;
-
-    /* Get Control Word */
-    __asm__ volatile ("fnstcw %0" : "=m" (cw) : );
-
-    /* mask in */
-    cw &= FPU_RESERVED;
-    cw |= FPU_DEFAULT;
-
-    /* set cw */
-    __asm__ volatile ("fldcw %0" :: "m" (cw));
-  }
-#endif
-
-  cygwin_crt0 (main);
-}
diff --git a/winsup/cygwin/cxx.cc b/winsup/cygwin/cxx.cc
deleted file mode 100644
index 9cc1342fe..000000000
--- a/winsup/cygwin/cxx.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/* cxx.cc
-
-   Copyright 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#if (__GNUC__ >= 3)
-
-#include "winsup.h"
-#include <stdlib.h>
-
-void *
-operator new (size_t s)
-{
-  void *p = calloc (1, s);
-  return p;
-}
-
-void
-operator delete (void *p)
-{
-  free (p);
-}
-
-void *
-operator new[] (size_t s)
-{
-  return ::operator new (s);
-}
-
-void
-operator delete[] (void *p)
-{
-  ::operator delete (p);
-}
-
-extern "C" void
-__cxa_pure_virtual (void)
-{
-  api_fatal ("pure virtual method called");
-}
-#endif
diff --git a/winsup/cygwin/cygerrno.h b/winsup/cygwin/cygerrno.h
deleted file mode 100644
index fb00f3f1d..000000000
--- a/winsup/cygwin/cygerrno.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* cygerrno.h: main Cygwin header file.
-
-   Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <errno.h>
-
-void __stdcall seterrno_from_win_error (const char *file, int line, DWORD code) __attribute__ ((regparm(3)));
-void __stdcall seterrno (const char *, int line) __attribute__ ((regparm(2)));
-int __stdcall geterrno_from_win_error (DWORD code, int deferrno) __attribute__ ((regparm(2)));
-
-#define __seterrno() seterrno (__FILE__, __LINE__)
-#define __seterrno_from_win_error(val) seterrno_from_win_error (__FILE__, __LINE__, val)
-
-#ifndef DEBUGGING
-#define set_errno(val) (errno = (val))
-#else
-int __stdcall __set_errno (const char *ln, int ln, int val) __attribute ((regparm(3)));
-#define set_errno(val) __set_errno (__PRETTY_FUNCTION__, __LINE__, (val))
-#endif
-#define get_errno()  (errno)
-extern "C" void __stdcall set_sig_errno (int e);
-
-class save_errno
-  {
-    int saved;
-  public:
-    save_errno () {saved = get_errno ();}
-    save_errno (int what) {saved = get_errno (); set_errno (what); }
-    void set (int what) {set_errno (what); saved = what;}
-    void reset () {saved = get_errno ();}
-    ~save_errno () {set_errno (saved);}
-  };
-
-extern const char *__sp_fn;
-extern int __sp_ln;
diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
deleted file mode 100644
index 6859e4335..000000000
--- a/winsup/cygwin/cygheap.cc
+++ /dev/null
@@ -1,452 +0,0 @@
-/* cygheap.cc: Cygwin heap manager.
-
-   Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include "winsup.h"
-#include <string.h>
-#include <assert.h>
-#include <stdlib.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-#include "child_info.h"
-#include "heap.h"
-#include "sync.h"
-#include "shared_info.h"
-#include "sigproc.h"
-
-init_cygheap NO_COPY *cygheap;
-void NO_COPY *cygheap_max;
-
-static NO_COPY muto *cygheap_protect;
-
-struct cygheap_entry
-  {
-    int type;
-    struct cygheap_entry *next;
-    char data[0];
-  };
-
-#define NBUCKETS (sizeof (cygheap->buckets) / sizeof (cygheap->buckets[0]))
-#define N0 ((_cmalloc_entry *) NULL)
-#define to_cmalloc(s) ((_cmalloc_entry *) (((char *) (s)) - (unsigned) (N0->data)))
-
-#define CFMAP_OPTIONS (SEC_RESERVE | PAGE_READWRITE)
-#define MVMAP_OPTIONS (FILE_MAP_WRITE)
-
-extern "C" {
-static void __stdcall _cfree (void *ptr) __attribute__((regparm(1)));
-}
-
-static void
-init_cheap ()
-{
-  cygheap = (init_cygheap *) VirtualAlloc ((void *) &_cygheap_start, CYGHEAPSIZE, MEM_RESERVE, PAGE_NOACCESS);
-  if (!cygheap)
-    {
-      MEMORY_BASIC_INFORMATION m;
-      if (!VirtualQuery ((LPCVOID) &_cygheap_start, &m, sizeof m))
-	system_printf ("couldn't get memory info, %E");
-      system_printf ("Couldn't reserve space for cygwin's heap, %E");
-      api_fatal ("AllocationBase %p, BaseAddress %p, RegionSize %p, State %p\n",
-		 m.AllocationBase, m.BaseAddress, m.RegionSize, m.State);
-    }
-  cygheap_max = cygheap;
-}
-
-static void dup_now (void *, child_info *, unsigned) __attribute__ ((regparm(3)));
-static void
-dup_now (void *newcygheap, child_info *ci, unsigned n)
-{
-  if (!VirtualAlloc (newcygheap, n, MEM_COMMIT, PAGE_READWRITE))
-    api_fatal ("couldn't allocate new cygwin heap %p, %d for child, %E",
-	       newcygheap, n);
-  memcpy (newcygheap, cygheap, n);
-}
-
-void *__stdcall
-cygheap_setup_for_child (child_info *ci, bool dup_later)
-{
-  void *newcygheap;
-  cygheap_protect->acquire ();
-  unsigned n = (char *) cygheap_max - (char *) cygheap;
-  unsigned size = CYGHEAPSIZE;
-  if (size < n)
-    size = n + (128 * 1024);
-  ci->cygheap_h = CreateFileMapping (INVALID_HANDLE_VALUE, &sec_none,
-				     CFMAP_OPTIONS, 0, size, NULL);
-  if (!ci->cygheap_h)
-    api_fatal ("Couldn't create heap for child, size %d, %E", CYGHEAPSIZE);
-  newcygheap = MapViewOfFileEx (ci->cygheap_h, MVMAP_OPTIONS, 0, 0, 0, NULL);
-  ProtectHandle1INH (ci->cygheap_h, passed_cygheap_h);
-  if (!dup_later)
-    dup_now (newcygheap, ci, n);
-  cygheap_protect->release ();
-  ci->cygheap = cygheap;
-  ci->cygheap_max = cygheap_max;
-  return newcygheap;
-}
-
-void __stdcall
-cygheap_setup_for_child_cleanup (void *newcygheap, child_info *ci,
-				 bool dup_it_now)
-{
-  if (dup_it_now)
-    {
-      /* NOTE: There is an assumption here that cygheap_max has not changed
-	 between the time that cygheap_setup_for_child was called and now.
-	 Make sure that this is a correct assumption.  */
-      cygheap_protect->acquire ();
-      dup_now (newcygheap, ci, (char *) cygheap_max - (char *) cygheap);
-      cygheap_protect->release ();
-    }
-  UnmapViewOfFile (newcygheap);
-  ForceCloseHandle1 (ci->cygheap_h, passed_cygheap_h);
-}
-
-/* Called by fork or spawn to reallocate cygwin heap */
-void __stdcall
-cygheap_fixup_in_child (bool execed)
-{
-  cygheap = child_proc_info->cygheap;
-  cygheap_max = child_proc_info->cygheap_max;
-  void *addr = !wincap.map_view_of_file_ex_sucks () ? cygheap : NULL;
-  void *newaddr;
-
-  newaddr = MapViewOfFileEx (child_proc_info->cygheap_h, MVMAP_OPTIONS, 0, 0, 0, addr);
-  if (newaddr != cygheap)
-    {
-      if (!newaddr)
-	newaddr = MapViewOfFileEx (child_proc_info->cygheap_h, MVMAP_OPTIONS, 0, 0, 0, NULL);
-      DWORD n = (DWORD) cygheap_max - (DWORD) cygheap;
-      /* Reserve cygwin heap in same spot as parent */
-      if (!VirtualAlloc (cygheap, CYGHEAPSIZE, MEM_RESERVE, PAGE_NOACCESS))
-	{
-	  MEMORY_BASIC_INFORMATION m;
-	  memset (&m, 0, sizeof m);
-	  if (!VirtualQuery ((LPCVOID) cygheap, &m, sizeof m))
-	    system_printf ("couldn't get memory info, %E");
-
-	  system_printf ("Couldn't reserve space for cygwin's heap (%p <%p>) in child, %E", cygheap, newaddr);
-	  api_fatal ("m.AllocationBase %p, m.BaseAddress %p, m.RegionSize %p, m.State %p\n",
-		     m.AllocationBase, m.BaseAddress, m.RegionSize, m.State);
-	}
-
-      /* Allocate same amount of memory as parent */
-      if (!VirtualAlloc (cygheap, n, MEM_COMMIT, PAGE_READWRITE))
-	api_fatal ("Couldn't allocate space for child's heap %p, size %d, %E",
-		   cygheap, n);
-      memcpy (cygheap, newaddr, n);
-      UnmapViewOfFile (newaddr);
-    }
-
-  ForceCloseHandle1 (child_proc_info->cygheap_h, passed_cygheap_h);
-
-  cygheap_init ();
-  debug_fixup_after_fork_exec ();
-
-  if (execed)
-    {
-      cygheap->user_heap.base = NULL;		/* We can allocate the heap anywhere */
-      /* Walk the allocated memory chain looking for orphaned memory from
-	 previous execs */
-      for (_cmalloc_entry *rvc = cygheap->chain; rvc; rvc = rvc->prev)
-	{
-	  cygheap_entry *ce = (cygheap_entry *) rvc->data;
-	  if (!rvc->ptr || rvc->b >= NBUCKETS || ce->type <= HEAP_1_START)
-	    continue;
-	  else if (ce->type < HEAP_1_MAX)
-	    ce->type += HEAP_1_MAX;	/* Mark for freeing after next exec */
-	  else
-	    _cfree (ce);		/* Marked by parent for freeing in child */
-	}
-    }
-}
-
-#define pagetrunc(x) ((void *) (((DWORD) (x)) & ~(4096 - 1)))
-
-static void *__stdcall
-_csbrk (int sbs)
-{
-  void *prebrk = cygheap_max;
-  void *prebrka = pagetrunc (prebrk);
-  cygheap_max = (char *) cygheap_max + sbs;
-  if (!sbs || (prebrk != prebrka && prebrka == pagetrunc (cygheap_max)))
-    /* nothing to do */;
-  else if (!VirtualAlloc (prebrk, (DWORD) sbs, MEM_COMMIT, PAGE_READWRITE))
-    {
-      malloc_printf ("couldn't commit memory for cygwin heap, %E");
-      __seterrno ();
-      cygheap_max = (char *) cygheap_max - sbs;
-      return NULL;
-    }
-
-  return prebrk;
-}
-
-extern "C" void __stdcall
-cygheap_init ()
-{
-  new_muto (cygheap_protect);
-  if (!cygheap)
-    {
-      init_cheap ();
-      (void) _csbrk (sizeof (*cygheap));
-    }
-  if (!cygheap->fdtab)
-    cygheap->fdtab.init ();
-  if (!cygheap->sigs)
-    sigalloc ();
-  if (!cygheap->shared_prefix)
-    cygheap->shared_prefix = cstrdup (
-	    wincap.has_terminal_services ()
-	    && (set_process_privilege (SE_CREATE_GLOBAL_NAME, true) >= 0
-		|| GetLastError () == ERROR_NO_SUCH_PRIVILEGE)
-	    ? "Global\\" : "");
-}
-
-/* Copyright (C) 1997, 2000 DJ Delorie */
-
-static void *_cmalloc (unsigned size) __attribute ((regparm(1)));
-static void *__stdcall _crealloc (void *ptr, unsigned size) __attribute ((regparm(2)));
-
-static void *__stdcall
-_cmalloc (unsigned size)
-{
-  _cmalloc_entry *rvc;
-  unsigned b, sz;
-
-  /* Calculate "bit bucket" and size as a power of two. */
-  for (b = 3, sz = 8; sz && sz < size; b++, sz <<= 1)
-    continue;
-
-  cygheap_protect->acquire ();
-  if (cygheap->buckets[b])
-    {
-      rvc = (_cmalloc_entry *) cygheap->buckets[b];
-      cygheap->buckets[b] = rvc->ptr;
-      rvc->b = b;
-    }
-  else
-    {
-      rvc = (_cmalloc_entry *) _csbrk (sz + sizeof (_cmalloc_entry));
-      if (!rvc)
-	{
-	  cygheap_protect->release ();
-	  return NULL;
-	}
-
-      rvc->b = b;
-      rvc->prev = cygheap->chain;
-      cygheap->chain = rvc;
-    }
-  cygheap_protect->release ();
-  return rvc->data;
-}
-
-static void __stdcall
-_cfree (void *ptr)
-{
-  cygheap_protect->acquire ();
-  _cmalloc_entry *rvc = to_cmalloc (ptr);
-  DWORD b = rvc->b;
-  rvc->ptr = cygheap->buckets[b];
-  cygheap->buckets[b] = (char *) rvc;
-  cygheap_protect->release ();
-}
-
-static void *__stdcall
-_crealloc (void *ptr, unsigned size)
-{
-  void *newptr;
-  if (ptr == NULL)
-    newptr = _cmalloc (size);
-  else
-    {
-      unsigned oldsize = 1 << to_cmalloc (ptr)->b;
-      if (size <= oldsize)
-	return ptr;
-      newptr = _cmalloc (size);
-      memcpy (newptr, ptr, oldsize);
-      _cfree (ptr);
-    }
-  return newptr;
-}
-
-/* End Copyright (C) 1997 DJ Delorie */
-
-#define sizeof_cygheap(n) ((n) + sizeof (cygheap_entry))
-
-#define N ((cygheap_entry *) NULL)
-#define tocygheap(s) ((cygheap_entry *) (((char *) (s)) - (int) (N->data)))
-
-inline static void *
-creturn (cygheap_types x, cygheap_entry * c, unsigned len)
-{
-  if (!c)
-    {
-      set_errno (ENOMEM);
-      return NULL;
-    }
-  c->type = x;
-  char *cend = ((char *) c + sizeof (*c) + len);
-  if (cygheap_max < cend)
-    cygheap_max = cend;
-  MALLOC_CHECK;
-  return (void *) c->data;
-}
-
-extern "C" void *__stdcall
-cmalloc (cygheap_types x, DWORD n)
-{
-  cygheap_entry *c;
-  MALLOC_CHECK;
-  c = (cygheap_entry *) _cmalloc (sizeof_cygheap (n));
-  if (!c)
-    system_printf ("cmalloc returned NULL");
-  return creturn (x, c, n);
-}
-
-extern "C" void *__stdcall
-crealloc (void *s, DWORD n)
-{
-  MALLOC_CHECK;
-  if (s == NULL)
-    return cmalloc (HEAP_STR, n);	// kludge
-
-  assert (!inheap (s));
-  cygheap_entry *c = tocygheap (s);
-  cygheap_types t = (cygheap_types) c->type;
-  c = (cygheap_entry *) _crealloc (c, sizeof_cygheap (n));
-  if (!c)
-    system_printf ("crealloc returned NULL");
-  return creturn (t, c, n);
-}
-
-extern "C" void __stdcall
-cfree (void *s)
-{
-  assert (!inheap (s));
-  (void) _cfree (tocygheap (s));
-  MALLOC_CHECK;
-}
-
-extern "C" void __stdcall
-cfree_and_set (char *&s, char *what)
-{
-  if (s && s != almost_null)
-    cfree (s);
-  s = what;
-}
-
-extern "C" void *__stdcall
-ccalloc (cygheap_types x, DWORD n, DWORD size)
-{
-  cygheap_entry *c;
-  MALLOC_CHECK;
-  n *= size;
-  c = (cygheap_entry *) _cmalloc (sizeof_cygheap (n));
-  if (c)
-    memset (c->data, 0, n);
-#ifdef DEBUGGING
-  if (!c)
-    system_printf ("ccalloc returned NULL");
-#endif
-  return creturn (x, c, n);
-}
-
-extern "C" char *__stdcall
-cstrdup (const char *s)
-{
-  MALLOC_CHECK;
-  char *p = (char *) cmalloc (HEAP_STR, strlen (s) + 1);
-  if (!p)
-    return NULL;
-  strcpy (p, s);
-  MALLOC_CHECK;
-  return p;
-}
-
-extern "C" char *__stdcall
-cstrdup1 (const char *s)
-{
-  MALLOC_CHECK;
-  char *p = (char *) cmalloc (HEAP_1_STR, strlen (s) + 1);
-  if (!p)
-    return NULL;
-  strcpy (p, s);
-  MALLOC_CHECK;
-  return p;
-}
-
-void
-cygheap_root::set (const char *posix, const char *native)
-{
-  if (*posix == '/' && posix[1] == '\0')
-    {
-      if (m)
-	{
-	  cfree (m);
-	  m = NULL;
-	}
-      return;
-    }
-  if (!m)
-    m = (struct cygheap_root_mount_info *) ccalloc (HEAP_MOUNT, 1, sizeof (*m));
-  strcpy (m->posix_path, posix);
-  m->posix_pathlen = strlen (posix);
-  if (m->posix_pathlen >= 1 && m->posix_path[m->posix_pathlen - 1] == '/')
-    m->posix_path[--m->posix_pathlen] = '\0';
-
-  strcpy (m->native_path, native);
-  m->native_pathlen = strlen (native);
-  if (m->native_pathlen >= 1 && m->native_path[m->native_pathlen - 1] == '\\')
-    m->native_path[--m->native_pathlen] = '\0';
-}
-
-cygheap_user::~cygheap_user ()
-{
-#if 0
-  if (pname)
-    cfree (pname);
-  if (plogsrv)
-    cfree (plogsrv - 2);
-  if (pdomain)
-    cfree (pdomain);
-  if (psid)
-    cfree (psid);
-#endif
-}
-
-void
-cygheap_user::set_name (const char *new_name)
-{
-  bool allocated = !!pname;
-
-  if (allocated)
-    {
-      if (strcasematch (new_name, pname))
-	return;
-      cfree (pname);
-    }
-
-  pname = cstrdup (new_name ? new_name : "");
-  if (!allocated)
-    return;		/* Initializing.  Don't bother with other stuff. */
-
-  cfree_and_set (homedrive);
-  cfree_and_set (homepath);
-  cfree_and_set (plogsrv);
-  cfree_and_set (pdomain);
-  cfree_and_set (pwinname);
-}
-
diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h
deleted file mode 100644
index afe7d01ec..000000000
--- a/winsup/cygwin/cygheap.h
+++ /dev/null
@@ -1,369 +0,0 @@
-/* cygheap.h: Cygwin heap manager.
-
-   Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#undef cfree
-
-enum cygheap_types
-{
-  HEAP_FHANDLER,
-  HEAP_STR,
-  HEAP_ARGV,
-  HEAP_BUF,
-  HEAP_MOUNT,
-  HEAP_SIGS,
-  HEAP_ARCHETYPES,
-  HEAP_1_START,
-  HEAP_1_STR,
-  HEAP_1_ARGV,
-  HEAP_1_BUF,
-  HEAP_1_EXEC,
-  HEAP_1_MAX = 100,
-  HEAP_MMAP = 200
-};
-
-#define incygheap(s) (cygheap && ((char *) (s) >= (char *) cygheap) && ((char *) (s) <= ((char *) cygheap_max)))
-
-struct _cmalloc_entry
-{
-  union
-  {
-    DWORD b;
-    char *ptr;
-  };
-  struct _cmalloc_entry *prev;
-  char data[0];
-};
-
-struct cygheap_root_mount_info
-{
-  char posix_path[CYG_MAX_PATH];
-  unsigned posix_pathlen;
-  char native_path[CYG_MAX_PATH];
-  unsigned native_pathlen;
-};
-
-/* CGF: FIXME This doesn't belong here */
-
-class cygheap_root
-{
-  /* Root directory information.
-     This is used after a chroot is called. */
-  struct cygheap_root_mount_info *m;
-
-public:
-  bool posix_ok (const char *path)
-  {
-    if (!m)
-      return 1;
-    return path_prefix_p (m->posix_path, path, m->posix_pathlen);
-  }
-  bool ischroot_native (const char *path)
-  {
-    if (!m)
-      return 1;
-    return strncasematch (m->native_path, path, m->native_pathlen)
-	    && (path[m->native_pathlen] == '\\' || !path[m->native_pathlen]);
-  }
-  const char *unchroot (const char *path)
-  {
-    if (!m)
-      return path;
-    const char *p = path + m->posix_pathlen;
-    if (!*p)
-      p = "/";
-    return p;
-  }
-  bool exists () {return !!m;}
-  void set (const char *posix, const char *native);
-  size_t posix_length () const { return m->posix_pathlen; }
-  const char *posix_path () const { return m->posix_path; }
-  size_t native_length () const { return m->native_pathlen; }
-  const char *native_path () const { return m->native_path; }
-};
-
-enum homebodies
-{
-  CH_HOMEDRIVE,
-  CH_HOMEPATH,
-  CH_HOME
-};
-
-class cygheap_user
-{
-  /* Extendend user information.
-     The information is derived from the internal_getlogin call
-     when on a NT system. */
-  char  *pname;         /* user's name */
-  char  *plogsrv;       /* Logon server, may be FQDN */
-  char  *pdomain;       /* Logon domain of the user */
-  char  *homedrive;	/* User's home drive */
-  char  *homepath;	/* User's home path */
-  char  *pwinname;	/* User's name as far as Windows knows it */
-  char  *puserprof;	/* User profile */
-  cygsid effec_cygsid;  /* buffer for user's SID */
-  cygsid saved_cygsid;  /* Remains intact even after impersonation */
-public:
-  __uid32_t saved_uid;     /* Remains intact even after impersonation */
-  __gid32_t saved_gid;     /* Ditto */
-  __uid32_t real_uid;      /* Remains intact on seteuid, replaced by setuid */
-  __gid32_t real_gid;      /* Ditto */
-  user_groups groups;      /* Primary and supp SIDs */
-
-  /* token is needed if set(e)uid should be called. It can be set by a call
-     to `set_impersonation_token()'. */
-  HANDLE external_token;
-  HANDLE internal_token;
-  HANDLE current_token;
-
-  /* CGF 2002-06-27.  I removed the initializaton from this constructor
-     since this class is always allocated statically.  That means that everything
-     is zero anyway so there is no need to initialize it to zero.  Since the
-     token initialization is always handled during process startup as well,
-     I've removed the constructor entirely.  Please reinstate this if this
-     situation ever changes.
-  cygheap_user () : pname (NULL), plogsrv (NULL), pdomain (NULL),
-		    homedrive (NULL), homepath (NULL),
-		    token (INVALID_HANDLE_VALUE) {}
-  */
-
-  ~cygheap_user ();
-
-  void init ();
-  void set_name (const char *new_name);
-  const char *name () const { return pname; }
-
-  const char *env_logsrv (const char *, size_t);
-  const char *env_homepath (const char *, size_t);
-  const char *env_homedrive (const char *, size_t);
-  const char *env_userprofile (const char *, size_t);
-  const char *env_domain (const char *, size_t);
-  const char *env_name (const char *, size_t);
-
-  const char *logsrv ()
-  {
-    const char *p = env_logsrv ("LOGONSERVER=", sizeof ("LOGONSERVER=") - 1);
-    return (p == almost_null) ? NULL : p;
-  }
-  const char *winname ()
-  {
-    const char *p = env_name ("USERNAME=", sizeof ("USERNAME=") - 1);
-    return (p == almost_null) ? NULL : p;
-  }
-  const char *domain ()
-  {
-    const char *p = env_domain ("USERDOMAIN=", sizeof ("USERDOMAIN=") - 1);
-    return (p == almost_null) ? NULL : p;
-  }
-  BOOL set_sid (PSID new_sid) {return (BOOL) (effec_cygsid = new_sid);}
-  BOOL set_saved_sid () { return (BOOL) (saved_cygsid = effec_cygsid); }
-  PSID sid () { return effec_cygsid; }
-  PSID saved_sid () { return saved_cygsid; }
-  const char *ontherange (homebodies what, struct passwd * = NULL);
-  bool issetuid () const { return current_token != INVALID_HANDLE_VALUE; }
-  HANDLE token () { return current_token; }
-  void deimpersonate ()
-  {
-    if (issetuid ())
-      RevertToSelf ();
-  }
-  void reimpersonate ()
-  {
-    if (issetuid ()
-	&& !ImpersonateLoggedOnUser (token ()))
-      system_printf ("ImpersonateLoggedOnUser: %E");
-  }
-  bool has_impersonation_tokens ()
-    { return external_token != INVALID_HANDLE_VALUE
-             || internal_token != INVALID_HANDLE_VALUE
-	     || current_token != INVALID_HANDLE_VALUE; }
-  void close_impersonation_tokens ()
-  {
-    if (current_token != INVALID_HANDLE_VALUE)
-      {
-	if( current_token != external_token && current_token != internal_token)
-	  CloseHandle (current_token);
-	current_token = INVALID_HANDLE_VALUE;
-      }
-    if (external_token != INVALID_HANDLE_VALUE)
-      {
-	CloseHandle (external_token);
-	external_token = INVALID_HANDLE_VALUE;
-      }
-    if (internal_token != INVALID_HANDLE_VALUE)
-      {
-	CloseHandle (internal_token);
-	internal_token = INVALID_HANDLE_VALUE;
-      }
-  }
-  const char *cygheap_user::test_uid (char *&, const char *, size_t)
-    __attribute__ ((regparm (3)));
-};
-
-/* cwd cache stuff.  */
-
-class muto;
-
-struct cwdstuff
-{
-  char *posix;
-  char *win32;
-  DWORD hash;
-  muto *cwd_lock;
-  char *get (char *buf, int need_posix = 1, int with_chroot = 0, unsigned ulen = CYG_MAX_PATH);
-  DWORD get_hash ();
-  void init ();
-  void fixup_after_exec (char *win32, char *posix, DWORD hash);
-  bool get_initial ();
-  void set (const char *win32_cwd, const char *posix_cwd = NULL);
-};
-
-#ifdef DEBUGGING
-struct cygheap_debug
-{
-  handle_list starth;
-  handle_list *endh;
-  handle_list freeh[500];
-};
-#endif
-
-struct user_heap_info
-{
-  void *base;
-  void *ptr;
-  void *top;
-  void *max;
-  unsigned chunk;
-};
-
-struct init_cygheap
-{
-  _cmalloc_entry *chain;
-  char *buckets[32];
-  cygheap_root root;
-  cygheap_user user;
-  user_heap_info user_heap;
-  mode_t umask;
-  HANDLE shared_h;
-  HANDLE console_h;
-  char *cygwin_regname;
-  cwdstuff cwd;
-  dtable fdtab;
-  const char *shared_prefix;
-#ifdef DEBUGGING
-  cygheap_debug debug;
-#endif
-  struct sigaction *sigs;
-
-  fhandler_tty_slave *ctty;	/* Current tty */
-};
-
-#define CYGHEAPSIZE (sizeof (init_cygheap) + (20000 * sizeof (fhandler_union)) + (5 * 65536))
-
-extern init_cygheap *cygheap;
-extern void *cygheap_max;
-
-class cygheap_fdmanip
-{
- protected:
-  int fd;
-  fhandler_base **fh;
-  bool locked;
- public:
-  cygheap_fdmanip (): fh (NULL) {}
-  virtual ~cygheap_fdmanip ()
-  {
-    if (locked)
-      ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "cygheap_fdmanip");
-  }
-  void release ()
-  {
-    cygheap->fdtab.release (fd);
-  }
-  operator int &() {return fd;}
-  operator fhandler_base* &() {return *fh;}
-  operator fhandler_socket* () const {return reinterpret_cast<fhandler_socket *> (*fh);}
-  void operator = (fhandler_base *fh) {*this->fh = fh;}
-  fhandler_base *operator -> () const {return *fh;}
-  bool isopen () const
-  {
-    if (*fh)
-      return true;
-    set_errno (EBADF);
-    return false;
-  }
-};
-
-class cygheap_fdnew : public cygheap_fdmanip
-{
- public:
-  cygheap_fdnew (int seed_fd = -1, bool lockit = true)
-  {
-    if (lockit)
-      SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "cygheap_fdnew");
-    if (seed_fd < 0)
-      fd = cygheap->fdtab.find_unused_handle ();
-    else
-      fd = cygheap->fdtab.find_unused_handle (seed_fd + 1);
-    if (fd >= 0)
-      {
-	locked = lockit;
-	fh = cygheap->fdtab + fd;
-      }
-    else
-      {
-	set_errno (EMFILE);
-	if (lockit)
-	  ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "cygheap_fdnew");
-	locked = false;
-      }
-  }
-  void operator = (fhandler_base *fh) {*this->fh = fh;}
-};
-
-class cygheap_fdget : public cygheap_fdmanip
-{
- public:
-  cygheap_fdget (int fd, bool lockit = false, bool do_set_errno = true)
-  {
-    if (lockit)
-      SetResourceLock (LOCK_FD_LIST, READ_LOCK, "cygheap_fdget");
-    if (fd >= 0 && fd < (int) cygheap->fdtab.size
-	&& *(fh = cygheap->fdtab + fd) != NULL)
-      {
-	this->fd = fd;
-	locked = lockit;
-      }
-    else
-      {
-	this->fd = -1;
-	if (do_set_errno)
-	  set_errno (EBADF);
-	if (lockit)
-	  ReleaseResourceLock (LOCK_FD_LIST, READ_LOCK, "cygheap_fdget");
-	locked = false;
-      }
-  }
-};
-
-class child_info;
-void *__stdcall cygheap_setup_for_child (child_info *ci, bool dup_later) __attribute__ ((regparm(2)));
-void __stdcall cygheap_setup_for_child_cleanup (void *, child_info *, bool) __attribute__ ((regparm(3)));
-void __stdcall cygheap_fixup_in_child (bool);
-extern "C" {
-void __stdcall cfree (void *) __attribute__ ((regparm(1)));
-void *__stdcall cmalloc (cygheap_types, DWORD) __attribute__ ((regparm(2)));
-void *__stdcall crealloc (void *, DWORD) __attribute__ ((regparm(2)));
-void *__stdcall ccalloc (cygheap_types, DWORD, DWORD) __attribute__ ((regparm(3)));
-char *__stdcall cstrdup (const char *) __attribute__ ((regparm(1)));
-char *__stdcall cstrdup1 (const char *) __attribute__ ((regparm(1)));
-void __stdcall cfree_and_set (char *&, char * = NULL) __attribute__ ((regparm(2)));
-void __stdcall cygheap_init ();
-extern DWORD _cygheap_start;
-}
diff --git a/winsup/cygwin/cygmagic b/winsup/cygwin/cygmagic
deleted file mode 100755
index a8ccc8c76..000000000
--- a/winsup/cygwin/cygmagic
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-# cygmagic - Generate "magic numbers" from a structure.
-#
-#   Copyright 2001, 2002 Red Hat, Inc.
-#
-# This file is part of Cygwin.
-#
-# This software is a copyrighted work licensed under the terms of the
-# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-# details.
-
-file_magic=$1; shift
-gcc=$1; shift
-file=$1; shift
-trap "rm -f /tmp/$$.magic" 0 1 2 15
-cat <<EOF > $file_magic
-/* autogenerated - do not edit */
-#include "$file"
-EOF
-sumit() {
-    cksum $*
-}
-
-while [ -n "$1" ]; do
-    define=$1; shift
-    struct=$1; shift
-    sum=`$gcc -E $file | sed -n "/^$struct/,/^};/p" | sed -e 's/[ 	]//g' -e '/^$/d' | sumit | awk '{printf "0x%xU", $1}'`
-    echo "#define $define $sum"
-    curr=`sed -n "s/^#[ 	]*define CURR_$define[ 	][ 	]*\([^ 	][^ 	]*\)/\1/p" $file`
-    [ "$curr" != "$sum" ] && echo "*** WARNING WARNING WARNING WARNING WARNING ***
-*** $file: magic number for $define changed old $curr != new $sum
-*** WARNING WARNING WARNING WARNING WARNING ***" 1>&2
-done >> $file_magic
-exit 0
diff --git a/winsup/cygwin/cygmalloc.h b/winsup/cygwin/cygmalloc.h
deleted file mode 100644
index 3d3a0acd5..000000000
--- a/winsup/cygwin/cygmalloc.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* cygmalloc.h: cygwin DLL malloc stuff
-
-   Copyright 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-extern "C" void dlfree (void *p) __attribute__ ((regparm (1)));
-extern "C" void *dlmalloc (unsigned size) __attribute__ ((regparm (1)));
-extern "C" void *dlrealloc (void *p, unsigned size) __attribute__ ((regparm (2)));
-extern "C" void *dlcalloc (size_t nmemb, size_t size) __attribute__ ((regparm (2)));
-extern "C" void *dlmemalign (size_t alignment, size_t bytes) __attribute__ ((regparm (2)));
-extern "C" void *dlvalloc (size_t bytes) __attribute__ ((regparm (1)));
-extern "C" size_t dlmalloc_usable_size (void *p) __attribute__ ((regparm (1)));
-extern "C" int dlmalloc_trim (size_t) __attribute__ ((regparm (1)));
-extern "C" int dlmallopt (int p, int v) __attribute__ ((regparm (2)));
-extern "C" void dlmalloc_stats ();
-
-#ifndef __INSIDE_CYGWIN__
-# define USE_DL_PREFIX 1
-#else
-# define __malloc_lock() mallock->acquire ()
-# define __malloc_unlock() mallock->release ()
-extern muto *mallock;
-#endif
diff --git a/winsup/cygwin/cygserver.h b/winsup/cygwin/cygserver.h
deleted file mode 100644
index a412abf43..000000000
--- a/winsup/cygwin/cygserver.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* cygserver.h
-
-   Copyright 2001, 2002 Red Hat Inc.
-
-   Written by Egor Duda <deo@logos-m.ru>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGSERVER_H_
-#define _CYGSERVER_H_
-
-#ifdef __GNUC__
-#define CYGSERVER_PACKED __attribute__ ((packed))
-#else
-#define CYGSERVER_PACKED
-#endif
-
-#define CYGWIN_SERVER_VERSION_MAJOR	1
-#define CYGWIN_SERVER_VERSION_API	1
-#define CYGWIN_SERVER_VERSION_MINOR	0
-#define CYGWIN_SERVER_VERSION_PATCH	0
-
-typedef enum {
-  CYGSERVER_UNKNOWN = 0,
-  CYGSERVER_OK,
-  CYGSERVER_UNAVAIL
-} cygserver_states;
-
-/*---------------------------------------------------------------------------*
- * class client_request
- *---------------------------------------------------------------------------*/
-
-class transport_layer_base;
-
-#ifndef __INSIDE_CYGWIN__
-class process_cache;
-#endif
-
-class client_request
-{
-protected:
-  typedef enum {
-    CYGSERVER_REQUEST_INVALID,
-    CYGSERVER_REQUEST_GET_VERSION,
-    CYGSERVER_REQUEST_SHUTDOWN,
-    CYGSERVER_REQUEST_ATTACH_TTY,
-    CYGSERVER_REQUEST_MSG,
-    CYGSERVER_REQUEST_SEM,
-    CYGSERVER_REQUEST_SHM,
-    CYGSERVER_REQUEST_LAST
-  } request_code_t;
-
-  struct header_t
-  {
-    size_t msglen;
-    union
-    {
-      request_code_t request_code;
-      ssize_t error_code;
-    };
-
-    header_t () {};
-    header_t (request_code_t, size_t);
-  } CYGSERVER_PACKED;
-
-public:
-#ifndef __INSIDE_CYGWIN__
-  static void handle_request (transport_layer_base *, process_cache *);
-#endif
-
-  client_request (request_code_t request_code,
-		  void *buf = NULL,
-		  size_t bufsiz = 0);
-  virtual ~client_request ();
-
-  request_code_t request_code () const { return _header.request_code; }
-
-  ssize_t error_code () const { return _header.error_code; };
-  void error_code (ssize_t error_code) { _header.error_code = error_code; };
-
-  size_t msglen () const { return _header.msglen; };
-  void msglen (size_t len) { _header.msglen = len; };
-
-  int make_request ();
-
-protected:
-  virtual void send (transport_layer_base *);
-
-private:
-  header_t _header;
-  void * const _buf;
-  const size_t _buflen;
-
-#ifndef __INSIDE_CYGWIN__
-  void handle (transport_layer_base *, process_cache *);
-  virtual void serve (transport_layer_base *, process_cache *) = 0;
-#endif
-};
-
-/*---------------------------------------------------------------------------*
- * class client_request_get_version
- *---------------------------------------------------------------------------*/
-
-class client_request_get_version : public client_request
-{
-private:
-  struct request_get_version
-  {
-    DWORD major, api, minor, patch;
-  } CYGSERVER_PACKED;
-
-public:
-  client_request_get_version ();
-  bool check_version () const;
-
-private:
-  struct request_get_version version;
-
-#ifndef __INSIDE_CYGWIN__
-  virtual void serve (transport_layer_base *, process_cache *);
-#endif
-};
-
-/*---------------------------------------------------------------------------*
- * class client_request_shutdown
- *
- * Nb. This whole class is only !__INSIDE_CYGWIN__ since it is used
- * solely by cygserver itself.
- *---------------------------------------------------------------------------*/
-
-#ifndef __INSIDE_CYGWIN__
-
-class client_request_shutdown : public client_request
-{
-public:
-  client_request_shutdown ();
-
-private:
-  virtual void serve (transport_layer_base *, process_cache *);
-};
-
-#endif /* !__INSIDE_CYGWIN__ */
-
-/*---------------------------------------------------------------------------*
- * class client_request_attach_tty
- *---------------------------------------------------------------------------*/
-
-class client_request_attach_tty : public client_request
-{
-private:
-  struct request_attach_tty
-  {
-    DWORD pid, master_pid;
-    HANDLE from_master, to_master;
-  } CYGSERVER_PACKED;
-
-public:
-#ifdef __INSIDE_CYGWIN__
-  client_request_attach_tty (DWORD nmaster_pid,
-			     HANDLE nfrom_master, HANDLE nto_master);
-#else
-  client_request_attach_tty ();
-#endif
-
-  HANDLE from_master () const { return req.from_master; };
-  HANDLE to_master () const { return req.to_master; };
-
-protected:
-  virtual void send (transport_layer_base *);
-
-private:
-  struct request_attach_tty req;
-
-#ifndef __INSIDE_CYGWIN__
-  virtual void serve (transport_layer_base *, process_cache *);
-#endif
-};
-
-#ifndef __INSIDE_CYGWIN__
-extern PSID admininstrator_group_sid;
-#endif
-
-extern bool check_cygserver_available ();
-extern void cygserver_init ();
-
-#endif /* _CYGSERVER_H_ */
diff --git a/winsup/cygwin/cygserver_ipc.h b/winsup/cygwin/cygserver_ipc.h
deleted file mode 100644
index 37f5730bc..000000000
--- a/winsup/cygwin/cygserver_ipc.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* cygserver_ipc.h
-
-   Copyright 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef __CYGSERVER_IPC_H__
-#define __CYGSERVER_IPC_H__
-
-/*
- * Datastructure which is part of any IPC input parameter block.
- */
-struct vmspace {
-  void *vm_map;			/* UNUSED */
-  struct shmmap_state *vm_shm;
-};
-
-struct proc {
-  pid_t cygpid;
-  DWORD winpid;
-  __uid32_t uid;
-  __gid32_t gid;
-  int gidcnt;
-  __gid32_t *gidlist;
-  bool is_admin;
-  struct vmspace *p_vmspace;
-};
-
-#ifdef __INSIDE_CYGWIN__
-inline void
-ipc_set_proc_info (proc &blk)
-{
-  blk.cygpid = getpid ();
-  blk.winpid = GetCurrentProcessId ();
-  blk.uid = geteuid32 ();
-  blk.gid = getegid32 ();
-  blk.gidcnt = 0;
-  blk.gidlist = NULL;
-  blk.is_admin = false;
-}
-#endif /* __INSIDE_CYGWIN__ */
-
-#ifndef __INSIDE_CYGWIN__
-class ipc_retval {
-private:
-  union {
-    int i;
-    unsigned int u;
-    vm_offset_t off;
-    vm_object_t obj;
-  };
-
-public:
-  ipc_retval (int ni) { i = ni; }
-
-  operator int () const { return i; }
-  int operator = (int ni) { return i = ni; }
-
-  operator unsigned int () const { return u; }
-  unsigned int operator = (unsigned int nu) { return u = nu; }
-
-  operator vm_offset_t () const { return off; }
-  vm_offset_t operator = (vm_offset_t noff) { return off = noff; }
-
-  operator vm_object_t () const { return obj; }
-  vm_object_t operator = (vm_object_t nobj) { return obj = nobj; }
-};
-
-struct thread {
-  class process *client;
-  proc *ipcblk;
-  ipc_retval td_retval[2];
-};
-#define td_proc ipcblk
-#define p_pid cygpid
-#endif
-
-#endif /* __CYGSERVER_IPC_H__ */
diff --git a/winsup/cygwin/cygserver_msg.h b/winsup/cygwin/cygserver_msg.h
deleted file mode 100644
index 116741e2e..000000000
--- a/winsup/cygwin/cygserver_msg.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* cygserver_msg.h: Single unix specification IPC interface for Cygwin.
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef __CYGSERVER_MSG_H__
-#define __CYGSERVER_MSG_H__
-
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#ifndef _KERNEL
-#define _KERNEL 1
-#endif
-#include <cygwin/msg.h>
-
-#include "cygserver.h"
-#include "cygserver_ipc.h"
-
-#ifndef __INSIDE_CYGWIN__
-class transport_layer_base;
-class process_cache;
-#endif
-
-class client_request_msg : public client_request
-{
-  friend class client_request;
-
-public:
-  enum msgop_t
-    {
-      MSGOP_msgctl,
-      MSGOP_msgget,
-      MSGOP_msgrcv,
-      MSGOP_msgsnd
-    };
-
-private:
-  union
-  {
-    struct
-    {
-      msgop_t msgop;
-      proc ipcblk;
-      union
-      {
-        struct msgctl_args ctlargs;
-	struct msgget_args getargs;
-	struct msgrcv_args rcvargs;
-	struct msgsnd_args sndargs;
-      };
-    } in;
-
-    union {
-      int ret;
-      ssize_t rcv;
-    } out;
-  } _parameters;
-
-#ifndef __INSIDE_CYGWIN__
-  client_request_msg ();
-  virtual void serve (transport_layer_base *, process_cache *);
-#endif
-
-public:
-
-#ifdef __INSIDE_CYGWIN__
-  client_request_msg (int, int, struct msqid_ds *);	// msgctl
-  client_request_msg (key_t, int);			// msgget
-  client_request_msg (int, void *, size_t, long, int);	// msgrcv
-  client_request_msg (int, const void *, size_t, int);	// msgsnd
-#endif
-
-  int retval (void) const { return _parameters.out.ret; }
-  ssize_t rcvval (void) const { return _parameters.out.rcv; }
-};
-
-#ifndef __INSIDE_CYGWIN__
-int msginit (void);
-int msgunload (void);
-int msgctl (struct thread *, struct msgctl_args *);
-int msgget (struct thread *, struct msgget_args *);
-int msgsnd (struct thread *, struct msgsnd_args *);
-int msgrcv (struct thread *, struct msgrcv_args *);
-#endif
-
-#endif /* __CYGSERVER_MSG_H__ */
diff --git a/winsup/cygwin/cygserver_sem.h b/winsup/cygwin/cygserver_sem.h
deleted file mode 100644
index 288a05438..000000000
--- a/winsup/cygwin/cygserver_sem.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* cygserver_sem.h: Single unix specification IPC interface for Cygwin.
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef __CYGSERVER_SEM_H__
-#define __CYGSERVER_SEM_H__
-
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#ifndef _KERNEL
-#define _KERNEL 1
-#endif
-#include <cygwin/sem.h>
-
-#include "cygserver.h"
-#include "cygserver_ipc.h"
-
-#ifndef __INSIDE_CYGWIN__
-class transport_layer_base;
-class process_cache;
-#endif
-
-class client_request_sem : public client_request
-{
-  friend class client_request;
-
-public:
-  enum semop_t
-    {
-      SEMOP_semctl,
-      SEMOP_semget,
-      SEMOP_semop
-    };
-
-private:
-  union
-  {
-    struct
-    {
-      semop_t semop;
-      proc ipcblk;
-      union
-      {
-        struct semctl_args ctlargs;
-	struct semget_args getargs;
-	struct semop_args  opargs;
-      };
-    } in;
-
-    union {
-      int ret;
-    } out;
-  } _parameters;
-
-#ifndef __INSIDE_CYGWIN__
-  client_request_sem ();
-  virtual void serve (transport_layer_base *, process_cache *);
-#endif
-
-public:
-
-#ifdef __INSIDE_CYGWIN__
-  client_request_sem (int, int, int, union semun *);	// semctl
-  client_request_sem (key_t, int, int);			// semget
-  client_request_sem (int, struct sembuf *, size_t);	// semop
-#endif
-
-  int retval (void) const { return _parameters.out.ret; }
-};
-
-#ifndef __INSIDE_CYGWIN__
-int seminit (void);
-int semunload (void);
-void semexit_myhook(void *arg, struct proc *p);
-
-int semctl (struct thread *, struct semctl_args *);
-int semget (struct thread *, struct semget_args *);
-int semop (struct thread *, struct semop_args *);
-#endif
-
-#endif /* __CYGSERVER_SEM_H__ */
diff --git a/winsup/cygwin/cygserver_shm.h b/winsup/cygwin/cygserver_shm.h
deleted file mode 100644
index e7d02959e..000000000
--- a/winsup/cygwin/cygserver_shm.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* cygserver_shm.h: Single unix specification IPC interface for Cygwin.
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef __CYGSERVER_SHM_H__
-#define __CYGSERVER_SHM_H__
-
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#ifndef _KERNEL
-#define _KERNEL 1
-#endif
-#include <cygwin/shm.h>
-
-#include "cygserver.h"
-#include "cygserver_ipc.h"
-
-#ifndef __INSIDE_CYGWIN__
-class transport_layer_base;
-class process_cache;
-#endif
-
-class client_request_shm : public client_request
-{
-  friend class client_request;
-
-public:
-  enum shmop_t
-    {
-      SHMOP_shmat,
-      SHMOP_shmctl,
-      SHMOP_shmdt,
-      SHMOP_shmget,
-      SHMOP_shmfork	/* Called on fixup_after_fork */
-    };
-
-private:
-  union
-  {
-    struct
-    {
-      shmop_t shmop;
-      proc ipcblk;
-      struct shmat_args  atargs;
-      struct shmctl_args ctlargs;
-      struct shmdt_args  dtargs;
-      struct shmget_args getargs;
-      struct proc        forkargs;
-    } in;
-
-    struct {
-      union {
-	int ret;
-	vm_offset_t ptr;
-      };
-      vm_object_t obj;
-    } out;
-  } _parameters;
-
-#ifndef __INSIDE_CYGWIN__
-  client_request_shm ();
-  virtual void serve (transport_layer_base *, process_cache *);
-#endif
-
-public:
-
-#ifdef __INSIDE_CYGWIN__
-  client_request_shm (int, const void *, int);		// shmat
-  client_request_shm (int, int, struct shmid_ds *);	// shmctl
-  client_request_shm (const void *);			// shmdt
-  client_request_shm (key_t, size_t, int);		// shmget
-  client_request_shm (proc *);				// shmfork
-#endif
-
-  int retval (void) const { return _parameters.out.ret; }
-  void *ptrval (void) const { return (void *)_parameters.out.ptr; }
-  vm_object_t objval (void) const { return _parameters.out.obj; }
-};
-
-#ifndef __INSIDE_CYGWIN__
-void shminit (void);
-int shmunload (void);
-void shmexit_myhook (struct vmspace *vm);
-int cygwin_shmfork_myhook (struct thread *, struct proc *);
-
-int shmat (struct thread *, struct shmat_args *);
-int shmctl (struct thread *, struct shmctl_args *);
-int shmdt (struct thread *, struct shmdt_args *);
-int shmget (struct thread *, struct shmget_args *);
-#endif
-
-#endif /* __CYGSERVER_SHM_H__ */
diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc
deleted file mode 100644
index 16f629634..000000000
--- a/winsup/cygwin/cygthread.cc
+++ /dev/null
@@ -1,336 +0,0 @@
-/* cygthread.cc
-
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <windows.h>
-#include <stdlib.h>
-#include "exceptions.h"
-#include "security.h"
-#include "cygthread.h"
-#include "sync.h"
-#include "cygerrno.h"
-#include "sigproc.h"
-#include "thread.h"
-#include "cygtls.h"
-
-#undef CloseHandle
-
-static cygthread NO_COPY threads[18];
-#define NTHREADS (sizeof (threads) / sizeof (threads[0]))
-
-DWORD NO_COPY cygthread::main_thread_id;
-bool NO_COPY cygthread::exiting;
-
-/* Initial stub called by cygthread constructor. Performs initial
-   per-thread initialization and loops waiting for new thread functions
-   to execute.  */
-DWORD WINAPI
-cygthread::stub (VOID *arg)
-{
-  exception_list except_entry;
-  /* Initialize this thread's ability to respond to things like
-     SIGSEGV or SIGFPE. */
-  init_exceptions (&except_entry);
-  _my_tls.remove ();	// Remove me from signal chain -- not signalable.
-
-  cygthread *info = (cygthread *) arg;
-  if (info->arg == cygself)
-    {
-      if (info->ev)
-	{
-	  CloseHandle (info->ev);
-	  CloseHandle (info->thread_sync);
-	}
-    info->ev = info->thread_sync = info->stack_ptr = NULL;
-    }
-  else
-    {
-      info->stack_ptr = &arg;
-      if (!info->ev)
-	{
-	  info->ev = CreateEvent (&sec_none_nih, TRUE, FALSE, NULL);
-	  info->thread_sync = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
-	}
-    }
-  while (1)
-    {
-      if (!info->__name)
-	system_printf ("erroneous thread activation");
-      else
-	{
-	  if (!info->func || exiting)
-	    return 0;
-
-	  /* Cygwin threads should not call ExitThread directly */
-	  info->func (info->arg == cygself ? info : info->arg);
-	  /* ...so the above should always return */
-
-#ifdef DEBUGGING
-	  info->func = NULL;	// catch erroneous activation
-#endif
-	  info->__name = NULL;
-	  SetEvent (info->ev);
-	}
-      switch (WaitForSingleObject (info->thread_sync, INFINITE))
-	{
-	case WAIT_OBJECT_0:
-	  continue;
-	default:
-	  api_fatal ("WFSO failed, %E");
-	  break;
-	}
-    }
-}
-
-/* Overflow stub called by cygthread constructor. Calls specified function
-   and then exits the thread.  */
-DWORD WINAPI
-cygthread::simplestub (VOID *arg)
-{
-  exception_list except_entry;
-  /* Initialize this thread's ability to respond to things like
-     SIGSEGV or SIGFPE. */
-  init_exceptions (&except_entry);
-  _my_tls.remove ();	// Remove me from signal chain -- not signalable.
-
-  cygthread *info = (cygthread *) arg;
-  info->stack_ptr = &arg;
-  info->ev = info->h;
-  info->func (info->arg == cygself ? info : info->arg);
-  return 0;
-}
-
-/* Start things going.  Called from dll_crt0_1. */
-void
-cygthread::init ()
-{
-  main_thread_id = GetCurrentThreadId ();
-}
-
-bool
-cygthread::is ()
-{
-  DWORD tid = GetCurrentThreadId ();
-
-  for (DWORD i = 0; i < NTHREADS; i++)
-    if (threads[i].id == tid)
-      return 1;
-
-  return 0;
-}
-
-cygthread *
-cygthread::freerange ()
-{
-  cygthread *self = (cygthread *) calloc (1, sizeof (*self));
-  self->is_freerange = true;
-  self->inuse = 1;
-  return self;
-}
-
-void * cygthread::operator
-new (size_t)
-{
-  cygthread *info;
-
-  /* Search the threads array for an empty slot to use */
-  for (info = threads; info < threads + NTHREADS; info++)
-    if (!InterlockedExchange (&info->inuse, 1))
-      {
-	/* available */
-#ifdef DEBUGGING
-	if (info->__name)
-	  api_fatal ("name not NULL? id %p, i %d", info->id, info - threads);
-#endif
-	goto out;
-      }
-
-#ifdef DEBUGGING
-  char buf[1024];
-  if (!GetEnvironmentVariable ("CYGWIN_FREERANGE_NOCHECK", buf, sizeof (buf)))
-    api_fatal ("Overflowed cygwin thread pool");
-  else
-    thread_printf ("Overflowed cygwin thread pool");
-#endif
-
-  info = freerange ();	/* exhausted thread pool */
-
-out:
-  return info;
-}
-
-cygthread::cygthread (LPTHREAD_START_ROUTINE start, LPVOID param,
-		      const char *name): __name (name),
-					 func (start), arg (param)
-{
-  thread_printf ("name %s, id %p", name, id);
-  if (h)
-    {
-      while (!thread_sync)
-	low_priority_sleep (0);
-      SetEvent (thread_sync);
-      thread_printf ("activated thread_sync %p", thread_sync);
-    }
-  else
-    {
-      stack_ptr = NULL;
-      h = CreateThread (&sec_none_nih, 0, is_freerange ? simplestub : stub,
-			this, 0, &id);
-      if (!h)
-	api_fatal ("thread handle not set - %p<%p>, %E", h, id);
-      thread_printf ("created thread %p", h);
-    }
-}
-
-/* Return the symbolic name of the current thread for debugging.
- */
-const char *
-cygthread::name (DWORD tid)
-{
-  const char *res = NULL;
-  if (!tid)
-    tid = GetCurrentThreadId ();
-
-  if (tid == main_thread_id)
-    return "main";
-
-  for (DWORD i = 0; i < NTHREADS; i++)
-    if (threads[i].id == tid)
-      {
-	res = threads[i].__name ?: "exiting thread";
-	break;
-      }
-
-  if (!res)
-    {
-      static char buf[30] NO_COPY = {0};
-      __small_sprintf (buf, "unknown (%p)", tid);
-      res = buf;
-    }
-
-  return res;
-}
-
-cygthread::operator
-HANDLE ()
-{
-  while (!ev)
-    low_priority_sleep (0);
-  return ev;
-}
-
-/* Should only be called when the process is exiting since it
-   leaves an open thread slot. */
-void
-cygthread::exit_thread ()
-{
-  if (!is_freerange)
-    SetEvent (*this);
-  ExitThread (0);
-}
-
-/* Forcibly terminate a thread. */
-void
-cygthread::terminate_thread ()
-{
-  if (!is_freerange)
-    {
-      ResetEvent (*this);
-      ResetEvent (thread_sync);
-    }
-  (void) TerminateThread (h, 0);
-  (void) WaitForSingleObject (h, INFINITE);
-  CloseHandle (h);
-
-  while (!stack_ptr)
-    low_priority_sleep (0);
-
-  MEMORY_BASIC_INFORMATION m;
-  memset (&m, 0, sizeof (m));
-  (void) VirtualQuery (stack_ptr, &m, sizeof m);
-
-  if (!m.RegionSize)
-    system_printf ("m.RegionSize 0?  stack_ptr %p", stack_ptr);
-  else if (!VirtualFree (m.AllocationBase, 0, MEM_RELEASE))
-    debug_printf ("VirtualFree of allocation base %p<%p> failed, %E",
-		   stack_ptr, m.AllocationBase);
-
-  if (is_freerange)
-    free (this);
-  else
-    {
-      h = NULL;
-      __name = NULL;
-      stack_ptr = NULL;
-      (void) InterlockedExchange (&inuse, 0); /* No longer in use */
-    }
-}
-
-/* Detach the cygthread from the current thread.  Note that the
-   theory is that cygthreads are only associated with one thread.
-   So, there should be never be multiple threads doing waits
-   on the same cygthread. */
-bool
-cygthread::detach (HANDLE sigwait)
-{
-  bool signalled = false;
-  if (!inuse)
-    system_printf ("called detach but inuse %d, thread %p?", inuse, id);
-  else
-    {
-      DWORD res;
-
-      if (!sigwait)
-	res = WaitForSingleObject (*this, INFINITE);
-      else
-	{
-	  HANDLE w4[2];
-	  w4[0] = *this;
-	  w4[1] = signal_arrived;
-	  res = WaitForSingleObject (sigwait, INFINITE);
-	  if (res != WAIT_OBJECT_0)
-	    system_printf ("WFSO sigwait %p failed, res %u, %E", sigwait, res);
-	  res = WaitForMultipleObjects (2, w4, FALSE, INFINITE);
-	  if (res == WAIT_OBJECT_0)
-	    /* nothing */;
-	  else if (WaitForSingleObject (sigwait, 0) == WAIT_OBJECT_0)
-	    res = WaitForSingleObject (*this, INFINITE);
-	  else if ((res = WaitForSingleObject (*this, 0)) != WAIT_OBJECT_0)
-	    {
-	      signalled = true;
-	      terminate_thread ();
-	      set_sig_errno (EINTR);	/* caller should be dealing with return
-					   values. */
-	    }
-	}
-
-      thread_printf ("%s returns %d, id %p", sigwait ? "WFMO" : "WFSO",
-		     res, id);
-
-      if (signalled)
-	/* already handled */;
-      else if (is_freerange)
-	{
-	  CloseHandle (h);
-	  free (this);
-	}
-      else
-	{
-	  ResetEvent (*this);
-	  /* Mark the thread as available by setting inuse to zero */
-	  (void) InterlockedExchange (&inuse, 0);
-	}
-    }
-  return signalled;
-}
-
-void
-cygthread::terminate ()
-{
-  exiting = 1;
-}
diff --git a/winsup/cygwin/cygthread.h b/winsup/cygwin/cygthread.h
deleted file mode 100644
index eb2eb9a8f..000000000
--- a/winsup/cygwin/cygthread.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* cygthread.h
-
-   Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-class cygthread
-{
-  LONG inuse;
-  DWORD id;
-  HANDLE h;
-  HANDLE ev;
-  HANDLE thread_sync;
-  void *stack_ptr;
-  const char *__name;
-  LPTHREAD_START_ROUTINE func;
-  VOID *arg;
-  bool is_freerange;
-  static bool exiting;
-  static void stub2 (void *, void *);
-  static DWORD WINAPI simplestub (VOID *);
-  static void simplestub2 (void *, void *);
-  void terminate_thread ();
- public:
-  static DWORD WINAPI stub (VOID *);
-  static DWORD main_thread_id;
-  static const char * name (DWORD = 0);
-  cygthread (LPTHREAD_START_ROUTINE, LPVOID, const char *);
-  cygthread () {};
-  static void init ();
-  bool detach (HANDLE = NULL);
-  operator HANDLE ();
-  static bool is ();
-  void * operator new (size_t);
-  static cygthread *freerange ();
-  void exit_thread ();
-  static void terminate ();
-  bool SetThreadPriority (int nPriority) {return ::SetThreadPriority (h, nPriority);}
-  void zap_h ()
-  {
-    (void) CloseHandle (h);
-    h = NULL;
-  }
-
-};
-
-#define cygself NULL
diff --git a/winsup/cygwin/cygtls.h b/winsup/cygwin/cygtls.h
deleted file mode 100644
index 29f2103b1..000000000
--- a/winsup/cygwin/cygtls.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* cygtls.h
-
-   Copyright 2003 Red Hat, Inc.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGTLS_H
-#define _CYGTLS_H
-
-#include <cygwin/signal.h>
-
-#define CYGTLS_INITIALIZED 0x43227
-#define CYGTLS_EXCEPTION (0x43227 + true)
-
-/* Please keep this file simple.  Changes to the below structure may require
-   acompanying changes to the very simple parser in the perl script
-   'gentls_offsets' (<<-- start parsing here).  */
-
-#pragma pack(push,4)
-typedef __uint32_t __stack_t;
-struct _threadinfo
-{
-  void (*func) /*gentls_offsets*/(int)/*gentls_offsets*/;
-  int saved_errno;
-  int sa_flags;
-  sigset_t oldmask;
-  sigset_t newmask;
-  HANDLE event;
-  int *errno_addr;
-  unsigned initialized;
-  sigset_t sigmask;
-  sigset_t sigwait_mask;
-  siginfo_t *sigwait_info;
-  siginfo_t infodata;
-  struct pthread *tid;
-  struct _threadinfo *prev, *next;
-  __stack_t stack[8];
-  int sig;
-  __stack_t *stackptr;
-
-  /*gentls_offsets*/
-  static CRITICAL_SECTION protect_linked_list;
-  static void init ();
-  void init_thread (void *);
-  static void call (DWORD (*) (void *, void *), void *);
-  void call2 (DWORD (*) (void *, void *), void *, void *);
-  static struct _threadinfo *find_tls (int sig);
-  void remove ();
-  void push (__stack_t, bool = false);
-  __stack_t pop ();
-  bool isinitialized () {return initialized == CYGTLS_INITIALIZED || initialized == CYGTLS_EXCEPTION;}
-  void set_state (bool);
-  void reset_exception ();
-  bool interrupt_now (CONTEXT *, int, void *, struct sigaction&)
-    __attribute__((regparm(3)));
-  void __stdcall interrupt_setup (int sig, void *handler, struct sigaction& siga, __stack_t retaddr)
-    __attribute__((regparm(3)));
-  operator HANDLE () const {return tid->win32_obj_id;}
-  /*gentls_offsets*/
-};
-#pragma pack(pop)
-
-extern char *_tlsbase __asm__ ("%fs:4");
-extern char *_tlstop __asm__ ("%fs:8");
-#define _my_tls (((_threadinfo *) _tlsbase)[-1])
-extern _threadinfo *_main_tls;
-
-#define CYGTLS_PADSIZE (sizeof (_threadinfo) + 64)
-#endif /*_CYGTLS_H*/
diff --git a/winsup/cygwin/cygwin-shilka b/winsup/cygwin/cygwin-shilka
deleted file mode 100755
index 433d9b5df..000000000
--- a/winsup/cygwin/cygwin-shilka
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-c="$(basename $1 .shilka).c"
-shilka -length -strip -no-definitions $1 && \
-sed -e '1,4d' -e '/KR_reset.*;/d' -e '/KR_output_statistics.*;/d' \
-    -e '/KR_reset.*)/,/}/d' -e '/KR_output_statistics.*)/,/}/d' \
-    -e '/# *line/d' "$c" > $2 &&
-rm -f "$c"
-#    -e "s%$c"'"%'"$2"'"%g' 
diff --git a/winsup/cygwin/cygwin.din b/winsup/cygwin/cygwin.din
deleted file mode 100644
index 0611076fe..000000000
--- a/winsup/cygwin/cygwin.din
+++ /dev/null
@@ -1,1542 +0,0 @@
-LIBRARY "cygwin1.dll" BASE=0x61000000
-
-EXPORTS
-__argc DATA
-__argv DATA
-__check_rhosts_file DATA
-__cygwin_environ DATA
-__cygwin_user_data DATA
-__mb_cur_max DATA
-__progname DATA
-__rcmd_errstr DATA
-_check_for_executable DATA
-_ctype_ DATA
-_daylight DATA
-_sys_errlist DATA
-sys_errlist = _sys_errlist DATA
-_sys_nerr DATA
-sys_nerr = _sys_nerr DATA
-_timezone DATA
-_tzname DATA
-h_errno DATA
-optarg DATA
-opterr DATA
-optind DATA
-optopt DATA
-optreset DATA
-reent_data DATA
-_alloca NOSIGFE
-dll_entry@12 NOSIGFE
-__assert SIGFE
-__assertfail SIGFE
-__eprintf SIGFE
-__errno NOSIGFE
-__fpclassifyd NOSIGFE
-__fpclassifyf NOSIGFE
-__getreent NOSIGFE
-__infinity NOSIGFE
-__main SIGFE
-__signbitd NOSIGFE
-__signbitf NOSIGFE
-__signgam NOSIGFE
-__srget SIGFE
-__swbuf SIGFE
-_asprintf_r SIGFE
-asprintf_r = _asprintf_r SIGFE
-_dll_crt0@0 NOSIGFE
-_exit SIGFE
-_f_atan2 NOSIGFE
-__f_atan2 = _f_atan2 NOSIGFE
-_f_atan2f NOSIGFE
-__f_atan2f = _f_atan2f NOSIGFE
-_f_exp NOSIGFE
-__f_exp = _f_exp NOSIGFE
-_f_expf NOSIGFE
-__f_expf = _f_expf NOSIGFE
-_f_frexp NOSIGFE
-__f_frexp = _f_frexp NOSIGFE
-_f_frexpf NOSIGFE
-__f_frexpf = _f_frexpf NOSIGFE
-_f_ldexp NOSIGFE
-__f_ldexp = _f_ldexp NOSIGFE
-_f_ldexpf NOSIGFE
-__f_ldexpf = _f_ldexpf NOSIGFE
-_f_log NOSIGFE
-__f_log = _f_log NOSIGFE
-_f_log10 NOSIGFE
-__f_log10 = _f_log10 NOSIGFE
-_f_log10f NOSIGFE
-__f_log10f = _f_log10f NOSIGFE
-_f_logf NOSIGFE
-__f_logf = _f_logf NOSIGFE
-_f_pow NOSIGFE
-__f_pow = _f_pow NOSIGFE
-_f_powf NOSIGFE
-__f_powf = _f_powf NOSIGFE
-_f_tan NOSIGFE
-__f_tan = _f_tan NOSIGFE
-_f_tanf NOSIGFE
-__f_tanf = _f_tanf NOSIGFE
-_fcloseall_r SIGFE
-fcloseall_r = _fcloseall_r SIGFE
-_fscanf_r SIGFE
-fscanf_r = _fscanf_r SIGFE
-fstat SIGFE
-_fstat = fstat SIGFE
-_pipe SIGFE
-_pthread_cleanup_pop NOSIGFE
-_pthread_cleanup_push NOSIGFE
-_scanf_r SIGFE
-scanf_r = _scanf_r SIGFE
-_sscanf_r SIGFE
-sscanf_r = _sscanf_r SIGFE
-stat SIGFE
-_stat = stat SIGFE
-_strtold SIGFE
-trunc NOSIGFE
-_vasprintf_r SIGFE
-vasprintf_r = _vasprintf_r SIGFE
-_vfscanf_r NOSIGFE
-vfscanf_r = _vfscanf_r NOSIGFE
-_vscanf_r SIGFE
-vscanf_r = _vscanf_r SIGFE
-_vsscanf_r SIGFE
-vsscanf_r = _vsscanf_r SIGFE
-a64l NOSIGFE
-abort SIGFE
-_abort = abort SIGFE
-abs NOSIGFE
-_abs = abs NOSIGFE
-access SIGFE
-_access = access SIGFE
-acl SIGFE
-_acl = acl SIGFE
-_acl32 = acl32 SIGFE
-aclcheck NOSIGFE
-_aclcheck = aclcheck NOSIGFE
-_aclcheck32 = aclcheck32 NOSIGFE
-aclfrommode SIGFE
-_aclfrommode = aclfrommode SIGFE
-_aclfrommode32 = aclfrommode32 SIGFE
-aclfrompbits SIGFE
-_aclfrompbits = aclfrompbits SIGFE
-_aclfrompbits32 = aclfrompbits32 SIGFE
-aclfromtext SIGFE
-_aclfromtext = aclfromtext SIGFE
-_aclfromtext32 = aclfromtext32 SIGFE
-aclsort SIGFE
-_aclsort = aclsort SIGFE
-_aclsort32 = aclsort32 SIGFE
-acltomode SIGFE
-_acltomode = acltomode SIGFE
-_acltomode32 = acltomode32 SIGFE
-acltopbits SIGFE
-_acltopbits = acltopbits SIGFE
-_acltopbits32 = acltopbits32 SIGFE
-acltotext SIGFE
-_acltotext = acltotext SIGFE
-_acltotext32 = acltotext32 SIGFE
-acos NOSIGFE
-_acos = acos NOSIGFE
-acosf NOSIGFE
-_acosf = acosf NOSIGFE
-acosh NOSIGFE
-_acosh = acosh NOSIGFE
-acoshf NOSIGFE
-_acoshf = acoshf NOSIGFE
-alarm SIGFE
-_alarm = alarm SIGFE
-alphasort NOSIGFE
-_alphasort = alphasort NOSIGFE
-argz_add SIGFE
-__argz_add = argz_add SIGFE
-argz_add_sep SIGFE
-__argz_add_sep = argz_add_sep SIGFE
-argz_append SIGFE
-__argz_append = argz_append SIGFE
-argz_count NOSIGFE
-__argz_count = argz_count NOSIGFE
-argz_create SIGFE
-__argz_create = argz_create SIGFE
-argz_create_sep SIGFE
-__argz_create_sep = argz_create_sep SIGFE
-argz_delete SIGFE
-__argz_delete = argz_delete SIGFE
-argz_extract NOSIGFE
-__argz_extract = argz_extract NOSIGFE
-argz_insert SIGFE
-__argz_insert = argz_insert SIGFE
-argz_next NOSIGFE
-__argz_next = argz_next NOSIGFE
-argz_replace SIGFE
-__argz_replace = argz_replace SIGFE
-argz_stringify NOSIGFE
-__argz_stringify = argz_stringify NOSIGFE
-asctime SIGFE
-_asctime = asctime SIGFE
-asctime_r SIGFE
-_asctime_r = asctime_r SIGFE
-asin NOSIGFE
-_asin = asin NOSIGFE
-asinf NOSIGFE
-_asinf = asinf NOSIGFE
-asinh NOSIGFE
-_asinh = asinh NOSIGFE
-asinhf NOSIGFE
-_asinhf = asinhf NOSIGFE
-asprintf SIGFE
-_asprintf = asprintf SIGFE
-atan NOSIGFE
-_atan = atan NOSIGFE
-atan2 NOSIGFE
-_atan2 = atan2 NOSIGFE
-atan2f NOSIGFE
-_atan2f = atan2f NOSIGFE
-atanf NOSIGFE
-_atanf = atanf NOSIGFE
-atanh NOSIGFE
-_atanh = atanh NOSIGFE
-atanhf NOSIGFE
-_atanhf = atanhf NOSIGFE
-atexit = cygwin_atexit SIGFE
-_atexit = cygwin_atexit SIGFE
-atof SIGFE
-_atof = atof SIGFE
-atoff SIGFE
-_atoff = atoff SIGFE
-atoi NOSIGFE
-_atoi = atoi NOSIGFE
-atol NOSIGFE
-_atol = atol NOSIGFE
-bcmp NOSIGFE
-_bcmp = bcmp NOSIGFE
-bcopy NOSIGFE
-_bcopy = bcopy NOSIGFE
-bsearch NOSIGFE
-_bsearch = bsearch NOSIGFE
-btowc NOSIGFE
-bzero NOSIGFE
-_bzero = bzero NOSIGFE
-cabs NOSIGFE
-_cabs = cabs NOSIGFE
-cabsf NOSIGFE
-_cabsf = cabsf NOSIGFE
-calloc SIGFE
-_calloc = calloc SIGFE
-cbrt NOSIGFE
-_cbrt = cbrt NOSIGFE
-cbrtf NOSIGFE
-_cbrtf = cbrtf NOSIGFE
-ceil NOSIGFE
-_ceil = ceil NOSIGFE
-ceilf NOSIGFE
-_ceilf = ceilf NOSIGFE
-cfgetispeed NOSIGFE
-cfgetospeed NOSIGFE
-cfsetispeed SIGFE
-cfsetospeed SIGFE
-chdir SIGFE
-_chdir = chdir SIGFE
-chmod SIGFE
-_chmod = chmod SIGFE
-chown SIGFE
-_chown = chown SIGFE
-_chown32 = chown32 SIGFE
-chroot SIGFE
-_chroot = chroot SIGFE
-cleanup_glue NOSIGFE
-clearerr NOSIGFE
-_clearerr = clearerr NOSIGFE
-clock NOSIGFE
-_clock = clock NOSIGFE
-close SIGFE
-_close = close SIGFE
-closedir SIGFE
-_closedir = closedir SIGFE
-closelog NOSIGFE
-_closelog = closelog NOSIGFE
-copysign NOSIGFE
-_copysign = copysign NOSIGFE
-copysignf NOSIGFE
-_copysignf = copysignf NOSIGFE
-cos NOSIGFE
-_cos = cos NOSIGFE
-cosf NOSIGFE
-_cosf = cosf NOSIGFE
-cosh NOSIGFE
-_cosh = cosh NOSIGFE
-coshf NOSIGFE
-_coshf = coshf NOSIGFE
-creat SIGFE
-_creat = creat SIGFE
-ctermid NOSIGFE
-ctime SIGFE
-_ctime = ctime SIGFE
-ctime_r SIGFE
-_ctime_r = ctime_r SIGFE
-cuserid NOSIGFE
-_cuserid = cuserid NOSIGFE
-cwait SIGFE
-_cwait = cwait SIGFE
-accept = cygwin_accept SIGFE
-cygwin_attach_handle_to_fd SIGFE
-cygwin32_attach_handle_to_fd = cygwin_attach_handle_to_fd SIGFE
-bind = cygwin_bind SIGFE
-connect = cygwin_connect SIGFE
-cygwin_conv_to_full_posix_path SIGFE
-cygwin32_conv_to_full_posix_path = cygwin_conv_to_full_posix_path SIGFE
-cygwin_conv_to_full_win32_path SIGFE
-cygwin32_conv_to_full_win32_path = cygwin_conv_to_full_win32_path SIGFE
-cygwin_conv_to_posix_path SIGFE
-cygwin32_conv_to_posix_path = cygwin_conv_to_posix_path SIGFE
-cygwin_conv_to_win32_path SIGFE
-cygwin32_conv_to_win32_path = cygwin_conv_to_win32_path SIGFE
-cygwin_detach_dll SIGFE
-cygwin32_detach_dll = cygwin_detach_dll SIGFE
-cygwin_dll_init SIGFE
-endprotoent = cygwin_endprotoent SIGFE
-endservent = cygwin_endservent SIGFE
-endusershell SIGFE
-err SIGFE
-errx SIGFE
-gethostbyaddr = cygwin_gethostbyaddr SIGFE
-gethostbyname = cygwin_gethostbyname SIGFE
-_gethostname = cygwin_gethostname SIGFE
-gethostname = cygwin_gethostname SIGFE
-getpeername = cygwin_getpeername SIGFE
-getprogname NOSIGFE
-getprotobyname = cygwin_getprotobyname SIGFE
-getprotobynumber = cygwin_getprotobynumber SIGFE
-getprotoent = cygwin_getprotoent SIGFE
-getservbyname = cygwin_getservbyname SIGFE
-getservbyport = cygwin_getservbyport SIGFE
-getservent = cygwin_getservent SIGFE
-getsockname = cygwin_getsockname SIGFE
-getsockopt = cygwin_getsockopt SIGFE
-getusershell SIGFE
-herror = cygwin_herror SIGFE
-hstrerror = cygwin_hstrerror NOSIGFE
-inet_addr = cygwin_inet_addr SIGFE
-inet_aton = cygwin_inet_aton SIGFE
-inet_network = cygwin_inet_network SIGFE
-inet_ntoa = cygwin_inet_ntoa SIGFE
-cygwin_internal SIGFE
-cygwin32_internal = cygwin_internal SIGFE
-listen = cygwin_listen SIGFE
-cygwin_logon_user SIGFE
-lstat SIGFE
-_lstat = lstat SIGFE
-cygwin_posix_path_list_p NOSIGFE
-cygwin32_posix_path_list_p = cygwin_posix_path_list_p NOSIGFE
-cygwin_posix_to_win32_path_list NOSIGFE
-cygwin32_posix_to_win32_path_list = cygwin_posix_to_win32_path_list NOSIGFE
-cygwin_posix_to_win32_path_list_buf_size SIGFE
-cygwin32_posix_to_win32_path_list_buf_size = cygwin_posix_to_win32_path_list_buf_size SIGFE
-rcmd = cygwin_rcmd SIGFE
-recv = cygwin_recv SIGFE
-recvfrom = cygwin_recvfrom SIGFE
-recvmsg = cygwin_recvmsg SIGFE
-rexec = cygwin_rexec SIGFE
-rresvport = cygwin_rresvport SIGFE
-_select = cygwin_select SIGFE
-select = cygwin_select SIGFE
-send = cygwin_send SIGFE
-sendmsg = cygwin_sendmsg SIGFE
-sendto = cygwin_sendto SIGFE
-cygwin_set_impersonation_token SIGFE
-setprogname SIGFE
-setprotoent = cygwin_setprotoent SIGFE
-setservent = cygwin_setservent SIGFE
-setsockopt = cygwin_setsockopt SIGFE
-setusershell SIGFE
-shutdown = cygwin_shutdown SIGFE
-socket = cygwin_socket SIGFE
-cygwin_split_path NOSIGFE
-cygwin32_split_path = cygwin_split_path NOSIGFE
-cygwin_stackdump SIGFE
-cygwin_umount SIGFE
-cygwin_win32_to_posix_path_list NOSIGFE
-cygwin32_win32_to_posix_path_list = cygwin_win32_to_posix_path_list NOSIGFE
-cygwin_win32_to_posix_path_list_buf_size SIGFE
-cygwin32_win32_to_posix_path_list_buf_size = cygwin_win32_to_posix_path_list_buf_size SIGFE
-cygwin_winpid_to_pid SIGFE
-cygwin32_winpid_to_pid = cygwin_winpid_to_pid SIGFE
-daemon SIGFE
-difftime NOSIGFE
-_difftime = difftime NOSIGFE
-dirfd SIGFE
-_dirfd = dirfd SIGFE
-div NOSIGFE
-_div = div NOSIGFE
-dlclose SIGFE
-dlerror NOSIGFE
-dlfork NOSIGFE
-dll_crt0__FP11per_process SIGFE
-dll_dllcrt0 SIGFE
-dll_noncygwin_dllcrt0 SIGFE
-dlopen SIGFE
-dlsym SIGFE
-drand48 NOSIGFE
-_drand48 = drand48 NOSIGFE
-drem NOSIGFE
-_drem = drem NOSIGFE
-dremf NOSIGFE
-_dremf = dremf NOSIGFE
-dup SIGFE
-_dup = dup SIGFE
-dup2 SIGFE
-_dup2 = dup2 SIGFE
-ecvt SIGFE
-_ecvt = ecvt SIGFE
-ecvtbuf SIGFE
-_ecvtbuf = ecvtbuf SIGFE
-ecvtf SIGFE
-_ecvtf = ecvtf SIGFE
-endgrent NOSIGFE
-_endgrent = endgrent NOSIGFE
-endhostent NOSIGFE
-endmntent NOSIGFE
-_endmntent = endmntent NOSIGFE
-endpwent NOSIGFE
-_endpwent = endpwent NOSIGFE
-endutent SIGFE
-_endutent = endutent SIGFE
-envz_add SIGFE
-__envz_add = envz_add SIGFE
-envz_entry NOSIGFE
-__envz_entry = envz_entry NOSIGFE
-envz_get NOSIGFE
-__envz_get = envz_get NOSIGFE
-envz_merge SIGFE
-__envz_merge = envz_merge SIGFE
-envz_remove SIGFE
-__envz_remove = envz_remove SIGFE
-envz_strip SIGFE
-__envz_strip = envz_strip SIGFE
-erand48 NOSIGFE
-_erand48 = erand48 NOSIGFE
-erf NOSIGFE
-_erf = erf NOSIGFE
-erfc NOSIGFE
-_erfc = erfc NOSIGFE
-erfcf NOSIGFE
-_erfcf = erfcf NOSIGFE
-erff NOSIGFE
-_erff = erff NOSIGFE
-execl SIGFE
-_execl = execl SIGFE
-execle SIGFE
-_execle = execle SIGFE
-execlp SIGFE
-_execlp = execlp SIGFE
-execv SIGFE
-_execv = execv SIGFE
-execve SIGFE
-_execve = execve SIGFE
-execvp SIGFE
-_execvp = execvp SIGFE
-exit = cygwin_exit SIGFE
-exp NOSIGFE
-_exp = exp NOSIGFE
-exp2 NOSIGFE
-exp2f NOSIGFE
-expf NOSIGFE
-_expf = expf NOSIGFE
-expm1 NOSIGFE
-_expm1 = expm1 NOSIGFE
-expm1f NOSIGFE
-_expm1f = expm1f NOSIGFE
-fabs NOSIGFE
-_fabs = fabs NOSIGFE
-fabsf NOSIGFE
-_fabsf = fabsf NOSIGFE
-facl SIGFE
-_facl = facl SIGFE
-_facl32 = facl32 SIGFE
-fchdir SIGFE
-_fchdir = fchdir SIGFE
-fchmod SIGFE
-_fchmod = fchmod SIGFE
-fchown SIGFE
-_fchown = fchown SIGFE
-_fchown32 = fchown32 SIGFE
-fclose SIGFE
-_fclose = fclose SIGFE
-fcloseall SIGFE
-_fcloseall = fcloseall SIGFE
-fcntl SIGFE
-_fcntl = fcntl SIGFE
-_fcntl64 = fcntl64 SIGFE
-fcvt SIGFE
-_fcvt = fcvt SIGFE
-fcvtbuf SIGFE
-_fcvtbuf = fcvtbuf SIGFE
-fcvtf SIGFE
-_fcvtf = fcvtf SIGFE
-fdim NOSIGFE
-fdimf NOSIGFE
-fdopen SIGFE
-_fdopen = fdopen SIGFE
-_fdopen64 = fdopen64 SIGFE
-feof NOSIGFE
-_feof = feof NOSIGFE
-ferror NOSIGFE
-_ferror = ferror NOSIGFE
-fflush NOSIGFE
-_fflush = fflush NOSIGFE
-ffs NOSIGFE
-_ffs = ffs NOSIGFE
-fgetc SIGFE
-_fgetc = fgetc SIGFE
-fgetpos NOSIGFE
-_fgetpos = fgetpos NOSIGFE
-_fgetpos64 = fgetpos64 NOSIGFE
-fgets SIGFE
-_fgets = fgets SIGFE
-fileno NOSIGFE
-_fileno = fileno NOSIGFE
-finite NOSIGFE
-_finite = finite NOSIGFE
-finitef NOSIGFE
-_finitef = finitef NOSIGFE
-fiprintf SIGFE
-_fiprintf = fiprintf SIGFE
-flock SIGFE
-flock SIGFE
-floor NOSIGFE
-_floor = floor NOSIGFE
-floorf NOSIGFE
-_floorf = floorf NOSIGFE
-fma NOSIGFE
-fmaf NOSIGFE
-fmax NOSIGFE
-fmaxf NOSIGFE
-fmin NOSIGFE
-fminf NOSIGFE
-fmod NOSIGFE
-_fmod = fmod NOSIGFE
-fmodf NOSIGFE
-_fmodf = fmodf NOSIGFE
-fnmatch NOSIGFE
-_fnmatch = fnmatch NOSIGFE
-fopen SIGFE
-_fopen = fopen SIGFE
-_fopen64 = fopen64 SIGFE
-fork SIGFE
-_fork = fork SIGFE
-forkpty SIGFE
-fpathconf SIGFE
-fprintf SIGFE
-_fprintf = fprintf SIGFE
-fputc NOSIGFE
-_fputc = fputc NOSIGFE
-fputs SIGFE
-_fputs = fputs SIGFE
-fread SIGFE
-_fread = fread SIGFE
-free SIGFE
-_free = free SIGFE
-freopen SIGFE
-_freopen = freopen SIGFE
-_freopen64 = freopen64 SIGFE
-frexp NOSIGFE
-_frexp = frexp NOSIGFE
-frexpf NOSIGFE
-_frexpf = frexpf NOSIGFE
-fscanf SIGFE
-_fscanf = fscanf SIGFE
-fseek SIGFE
-_fseek = fseek SIGFE
-fseeko SIGFE
-_fseeko = fseeko SIGFE
-_fseeko64 = fseeko64 SIGFE
-fsetpos SIGFE
-_fsetpos = fsetpos SIGFE
-_fsetpos64 = fsetpos64 SIGFE
-_fstat64 = fstat64 SIGFE
-fstatfs SIGFE
-_fstatfs = fstatfs SIGFE
-fsync SIGFE
-_fsync = fsync SIGFE
-ftell NOSIGFE
-_ftell = ftell NOSIGFE
-ftello NOSIGFE
-_ftello = ftello NOSIGFE
-_ftello64 = ftello64 NOSIGFE
-ftime SIGFE
-_ftime = ftime SIGFE
-ftok SIGFE
-_ftok = ftok SIGFE
-ftruncate SIGFE
-_ftruncate = ftruncate SIGFE
-_ftruncate64 = ftruncate64 SIGFE
-fwrite SIGFE
-_fwrite = fwrite SIGFE
-gamma NOSIGFE
-_gamma = gamma NOSIGFE
-gamma_r NOSIGFE
-_gamma_r = gamma_r NOSIGFE
-gammaf NOSIGFE
-_gammaf = gammaf NOSIGFE
-gammaf_r NOSIGFE
-_gammaf_r = gammaf_r NOSIGFE
-gcvt SIGFE
-_gcvt = gcvt SIGFE
-gcvtf SIGFE
-_gcvtf = gcvtf SIGFE
-get_osfhandle SIGFE
-_get_osfhandle = get_osfhandle SIGFE
-getc SIGFE
-_getc = getc SIGFE
-getc_unlocked SIGFE
-_getc_unlocked = getc_unlocked SIGFE
-getchar NOSIGFE
-_getchar = getchar NOSIGFE
-getchar_unlocked NOSIGFE
-_getchar_unlocked = getchar_unlocked NOSIGFE
-getcwd SIGFE
-_getcwd = getcwd SIGFE
-getdomainname SIGFE
-_getdomainname = getdomainname SIGFE
-getdtablesize NOSIGFE
-_getdtablesize = getdtablesize NOSIGFE
-getegid NOSIGFE
-_getegid = getegid NOSIGFE
-_getegid32 = getegid32 NOSIGFE
-getenv NOSIGFE
-_getenv = getenv NOSIGFE
-geteuid NOSIGFE
-_geteuid = geteuid NOSIGFE
-_geteuid32 = geteuid32 NOSIGFE
-getgid NOSIGFE
-_getgid = getgid NOSIGFE
-_getgid32 = getgid32 NOSIGFE
-getgrent SIGFE
-_getgrent = getgrent SIGFE
-_getgrent32 = getgrent32 SIGFE
-getgrgid SIGFE
-_getgrgid = getgrgid SIGFE
-_getgrgid32 = getgrgid32 SIGFE
-getgrnam SIGFE
-_getgrnam = getgrnam SIGFE
-_getgrnam32 = getgrnam32 SIGFE
-getgroups SIGFE
-_getgroups = getgroups SIGFE
-_getgroups32 = getgroups32 SIGFE
-gethostid SIGFE
-getitimer SIGFE
-getlogin NOSIGFE
-_getlogin = getlogin NOSIGFE
-getmntent SIGFE
-_getmntent = getmntent SIGFE
-getmode SIGFE
-_getmode = getmode SIGFE
-getopt SIGFE
-getopt_long SIGFE
-getpagesize SIGFE
-_getpagesize = getpagesize SIGFE
-getpass SIGFE
-_getpass = getpass SIGFE
-getpgid SIGFE
-getpgrp SIGFE
-_getpgrp = getpgrp SIGFE
-getpid NOSIGFE
-_getpid = getpid NOSIGFE
-getppid NOSIGFE
-_getppid = getppid NOSIGFE
-getpwduid NOSIGFE
-_getpwduid = getpwduid NOSIGFE
-getpwent SIGFE
-_getpwent = getpwent SIGFE
-getpwnam SIGFE
-_getpwnam = getpwnam SIGFE
-getpwnam_r SIGFE
-getpwuid SIGFE
-_getpwuid = getpwuid SIGFE
-_getpwuid32 = getpwuid32 SIGFE
-getpwuid_r SIGFE
-_getpwuid_r32 = getpwuid_r32 SIGFE
-getrlimit SIGFE
-_getrlimit = getrlimit SIGFE
-getrusage SIGFE
-_getrusage = getrusage SIGFE
-gets NOSIGFE
-_gets = gets NOSIGFE
-getsid SIGFE
-gettimeofday SIGFE
-_gettimeofday = gettimeofday SIGFE
-getuid NOSIGFE
-_getuid = getuid NOSIGFE
-_getuid32 = getuid32 NOSIGFE
-getutent SIGFE
-_getutent = getutent SIGFE
-getutid SIGFE
-_getutid = getutid SIGFE
-getutline SIGFE
-_getutline = getutline SIGFE
-getw SIGFE
-_getw = getw SIGFE
-getwd SIGFE
-_getwd = getwd SIGFE
-glob SIGFE
-_glob = glob SIGFE
-globfree SIGFE
-_globfree = globfree SIGFE
-gmtime SIGFE
-_gmtime = gmtime SIGFE
-gmtime_r SIGFE
-_gmtime_r = gmtime_r SIGFE
-grantpt NOSIGFE
-hcreate SIGFE
-hcreate_r SIGFE
-hdestroy SIGFE
-hdestroy_r SIGFE
-hsearch SIGFE
-hsearch_r SIGFE
-htonl NOSIGFE
-_htonl = htonl NOSIGFE
-htons NOSIGFE
-_htons = htons NOSIGFE
-hypot NOSIGFE
-_hypot = hypot NOSIGFE
-hypotf NOSIGFE
-_hypotf = hypotf NOSIGFE
-ilogb NOSIGFE
-_ilogb = ilogb NOSIGFE
-ilogbf NOSIGFE
-_ilogbf = ilogbf NOSIGFE
-index NOSIGFE
-_index = index NOSIGFE
-inet_makeaddr NOSIGFE
-inet_netof NOSIGFE
-infinity NOSIGFE
-_infinity = infinity NOSIGFE
-infinityf NOSIGFE
-_infinityf = infinityf NOSIGFE
-initgroups SIGFE
-_initgroups32 = initgroups32 SIGFE
-initstate NOSIGFE
-ioctl SIGFE
-_ioctl = ioctl SIGFE
-iprintf SIGFE
-_iprintf = iprintf SIGFE
-iruserok SIGFE
-ruserok SIGFE
-isalnum NOSIGFE
-_isalnum = isalnum NOSIGFE
-isalpha NOSIGFE
-_isalpha = isalpha NOSIGFE
-isascii NOSIGFE
-_isascii = isascii NOSIGFE
-isatty SIGFE
-_isatty = isatty SIGFE
-isblank NOSIGFE
-iscntrl NOSIGFE
-_iscntrl = iscntrl NOSIGFE
-isdigit NOSIGFE
-_isdigit = isdigit NOSIGFE
-isgraph NOSIGFE
-_isgraph = isgraph NOSIGFE
-isinf NOSIGFE
-_isinf = isinf NOSIGFE
-isinff NOSIGFE
-_isinff = isinff NOSIGFE
-islower NOSIGFE
-_islower = islower NOSIGFE
-isnan NOSIGFE
-_isnan = isnan NOSIGFE
-isnanf NOSIGFE
-_isnanf = isnanf NOSIGFE
-isprint NOSIGFE
-_isprint = isprint NOSIGFE
-ispunct NOSIGFE
-_ispunct = ispunct NOSIGFE
-isspace NOSIGFE
-_isspace = isspace NOSIGFE
-isupper NOSIGFE
-_isupper = isupper NOSIGFE
-iswalnum NOSIGFE
-iswalpha NOSIGFE
-iswblank NOSIGFE
-iswcntrl NOSIGFE
-iswctype NOSIGFE
-iswdigit NOSIGFE
-iswgraph NOSIGFE
-iswlower NOSIGFE
-iswprint NOSIGFE
-iswpunct NOSIGFE
-iswspace NOSIGFE
-iswupper NOSIGFE
-iswxdigit NOSIGFE
-isxdigit NOSIGFE
-_isxdigit = isxdigit NOSIGFE
-j0 NOSIGFE
-_j0 = j0 NOSIGFE
-j0f NOSIGFE
-_j0f = j0f NOSIGFE
-j1 NOSIGFE
-_j1 = j1 NOSIGFE
-j1f NOSIGFE
-_j1f = j1f NOSIGFE
-jn NOSIGFE
-_jn = jn NOSIGFE
-jnf NOSIGFE
-_jnf = jnf NOSIGFE
-jrand48 NOSIGFE
-_jrand48 = jrand48 NOSIGFE
-kill SIGFE
-_kill = kill SIGFE
-killpg SIGFE
-l64a NOSIGFE
-labs NOSIGFE
-_labs = labs NOSIGFE
-lacl SIGFE
-_lacl = lacl SIGFE
-lchown SIGFE
-_lchown = lchown SIGFE
-_lchown32 = lchown32 SIGFE
-lcong48 NOSIGFE
-_lcong48 = lcong48 NOSIGFE
-ldexp NOSIGFE
-_ldexp = ldexp NOSIGFE
-ldexpf NOSIGFE
-_ldexpf = ldexpf NOSIGFE
-ldiv NOSIGFE
-_ldiv = ldiv NOSIGFE
-lgamma NOSIGFE
-_lgamma = lgamma NOSIGFE
-lgamma_r NOSIGFE
-_lgamma_r = lgamma_r NOSIGFE
-lgammaf NOSIGFE
-_lgammaf = lgammaf NOSIGFE
-lgammaf_r NOSIGFE
-_lgammaf_r = lgammaf_r NOSIGFE
-link SIGFE
-_link = link SIGFE
-localeconv NOSIGFE
-_localeconv = localeconv NOSIGFE
-localtime SIGFE
-_localtime = localtime SIGFE
-localtime_r NOSIGFE
-_localtime_r = localtime_r NOSIGFE
-log NOSIGFE
-_log = log NOSIGFE
-log10 NOSIGFE
-_log10 = log10 NOSIGFE
-log10f NOSIGFE
-_log10f = log10f NOSIGFE
-log1p NOSIGFE
-_log1p = log1p NOSIGFE
-log1pf NOSIGFE
-_log1pf = log1pf NOSIGFE
-logb NOSIGFE
-_logb = logb NOSIGFE
-logbf NOSIGFE
-_logbf = logbf NOSIGFE
-logf NOSIGFE
-_logf = logf NOSIGFE
-login SIGFE
-login_tty SIGFE
-logout SIGFE
-logwtmp SIGFE
-updwtmp SIGFE
-longjmp NOSIGFE
-_longjmp = longjmp NOSIGFE
-lrand48 NOSIGFE
-_lrand48 = lrand48 NOSIGFE
-lrint NOSIGFE
-lrintf NOSIGFE
-lround NOSIGFE
-lroundf NOSIGFE
-lseek SIGFE
-_lseek = lseek SIGFE
-_lseek64 = lseek64 SIGFE
-_lstat64 = lstat64 SIGFE
-mallinfo SIGFE
-malloc SIGFE
-_malloc = malloc SIGFE
-malloc_stats SIGFE
-malloc_trim SIGFE
-malloc_usable_size SIGFE
-mallopt SIGFE
-matherr NOSIGFE
-_matherr = matherr NOSIGFE
-mblen NOSIGFE
-_mblen = mblen NOSIGFE
-mbrlen NOSIGFE
-mbrtowc NOSIGFE
-mbsinit NOSIGFE
-mbsrtowcs NOSIGFE
-mbstowcs NOSIGFE
-_mbstowcs = mbstowcs NOSIGFE
-mbtowc NOSIGFE
-_mbtowc = mbtowc NOSIGFE
-memalign SIGFE
-memccpy NOSIGFE
-_memccpy = memccpy NOSIGFE
-memchr NOSIGFE
-_memchr = memchr NOSIGFE
-memcmp NOSIGFE
-_memcmp = memcmp NOSIGFE
-memcpy NOSIGFE
-_memcpy = memcpy NOSIGFE
-memmove NOSIGFE
-_memmove = memmove NOSIGFE
-mempcpy NOSIGFE
-__mempcpy = mempcpy NOSIGFE
-memset NOSIGFE
-_memset = memset NOSIGFE
-mkdir SIGFE
-_mkdir = mkdir SIGFE
-mkfifo SIGFE
-mknod SIGFE
-_mknod = mknod SIGFE
-_mknod32 = mknod32 SIGFE
-mkstemp SIGFE
-_mkstemp = mkstemp SIGFE
-mktemp SIGFE
-_mktemp = mktemp SIGFE
-mktime SIGFE
-_mktime = mktime SIGFE
-mmap SIGFE
-_mmap64 = mmap64 SIGFE
-modf NOSIGFE
-_modf = modf NOSIGFE
-modff NOSIGFE
-_modff = modff NOSIGFE
-mount SIGFE
-_mount = mount SIGFE
-mprotect SIGFE
-mrand48 NOSIGFE
-msgctl SIGFE
-msgget SIGFE
-msgrcv SIGFE
-msgsnd SIGFE
-msync SIGFE
-munmap SIGFE
-nan NOSIGFE
-_nan = nan NOSIGFE
-nanf NOSIGFE
-_nanf = nanf NOSIGFE
-nanosleep SIGFE
-_nanosleep = nanosleep SIGFE
-nearbyint NOSIGFE
-nearbyintf NOSIGFE
-nextafter NOSIGFE
-_nextafter = nextafter NOSIGFE
-nextafterf NOSIGFE
-_nextafterf = nextafterf NOSIGFE
-nice SIGFE
-_nice = nice SIGFE
-nl_langinfo SIGFE
-_nl_langinfo = nl_langinfo SIGFE
-nrand48 NOSIGFE
-_nrand48 = nrand48 NOSIGFE
-ntohl NOSIGFE
-_ntohl = ntohl NOSIGFE
-ntohs NOSIGFE
-_ntohs = ntohs NOSIGFE
-on_exit SIGFE
-open SIGFE
-_open = open SIGFE
-_open64
-opendir SIGFE
-_opendir = opendir SIGFE
-openlog SIGFE
-_openlog = openlog SIGFE
-openpty SIGFE
-pathconf SIGFE
-_pathconf = pathconf SIGFE
-pause SIGFE
-pclose SIGFE
-_pclose = pclose SIGFE
-perror SIGFE
-_perror = perror SIGFE
-pipe SIGFE
-poll SIGFE
-_poll = poll SIGFE
-popen SIGFE
-_popen = popen SIGFE
-posix_regcomp SIGFE
-posix_regerror SIGFE
-posix_regexec SIGFE
-posix_regfree SIGFE
-pow NOSIGFE
-_pow = pow NOSIGFE
-powf NOSIGFE
-_powf = powf NOSIGFE
-printf SIGFE
-_printf = printf SIGFE
-pthread_atfork SIGFE
-pthread_attr_destroy NOSIGFE
-pthread_attr_getdetachstate NOSIGFE
-pthread_attr_getinheritsched NOSIGFE
-pthread_attr_getschedparam NOSIGFE
-pthread_attr_getschedpolicy NOSIGFE
-pthread_attr_getscope NOSIGFE
-pthread_attr_getstacksize NOSIGFE
-pthread_attr_init SIGFE
-pthread_attr_setdetachstate NOSIGFE
-pthread_attr_setinheritsched NOSIGFE
-pthread_attr_setschedparam NOSIGFE
-pthread_attr_setschedpolicy NOSIGFE
-pthread_attr_setscope NOSIGFE
-pthread_attr_setstacksize NOSIGFE
-pthread_cancel NOSIGFE
-pthread_cond_broadcast SIGFE
-pthread_cond_destroy NOSIGFE
-pthread_cond_init SIGFE
-pthread_cond_signal SIGFE
-pthread_cond_timedwait SIGFE
-pthread_cond_wait SIGFE
-pthread_condattr_destroy NOSIGFE
-pthread_condattr_getpshared NOSIGFE
-pthread_condattr_init SIGFE
-pthread_condattr_setpshared NOSIGFE
-pthread_continue SIGFE
-pthread_create SIGFE
-pthread_detach SIGFE
-pthread_equal NOSIGFE
-pthread_exit NOSIGFE
-pthread_getconcurrency NOSIGFE
-pthread_getschedparam NOSIGFE
-pthread_getsequence_np NOSIGFE
-pthread_getspecific NOSIGFE
-pthread_join SIGFE
-pthread_key_create SIGFE
-pthread_key_delete NOSIGFE
-pthread_kill SIGFE
-pthread_mutex_destroy NOSIGFE
-pthread_mutex_getprioceiling SIGFE
-pthread_mutex_init SIGFE
-pthread_mutex_lock SIGFE
-pthread_mutex_setprioceiling SIGFE
-pthread_mutex_trylock SIGFE
-pthread_mutex_unlock SIGFE
-pthread_mutexattr_destroy NOSIGFE
-pthread_mutexattr_getprioceiling NOSIGFE
-pthread_mutexattr_getprotocol NOSIGFE
-pthread_mutexattr_getpshared NOSIGFE
-pthread_mutexattr_gettype NOSIGFE
-pthread_mutexattr_init SIGFE
-pthread_mutexattr_setprioceiling NOSIGFE
-pthread_mutexattr_setprotocol NOSIGFE
-pthread_mutexattr_setpshared NOSIGFE
-pthread_mutexattr_settype NOSIGFE
-pthread_once SIGFE
-pthread_rwlock_destroy NOSIGFE
-pthread_rwlock_init SIGFE
-pthread_rwlock_rdlock SIGFE
-pthread_rwlock_tryrdlock SIGFE
-pthread_rwlock_wrlock SIGFE
-pthread_rwlock_trywrlock SIGFE
-pthread_rwlock_unlock SIGFE
-pthread_rwlockattr_init SIGFE
-pthread_rwlockattr_getpshared NOSIGFE
-pthread_rwlockattr_setpshared NOSIGFE
-pthread_rwlockattr_destroy NOSIGFE
-pthread_self NOSIGFE
-pthread_setcancelstate NOSIGFE
-pthread_setcanceltype NOSIGFE
-pthread_setconcurrency NOSIGFE
-pthread_setschedparam SIGFE
-pthread_setspecific NOSIGFE
-pthread_sigmask SIGFE
-pthread_suspend SIGFE
-pthread_testcancel NOSIGFE
-ptsname SIGFE
-putc SIGFE
-_putc = putc SIGFE
-putc_unlocked SIGFE
-_putc_unlocked = putc_unlocked SIGFE
-putchar NOSIGFE
-_putchar = putchar NOSIGFE
-putchar_unlocked NOSIGFE
-_putchar_unlocked = putchar_unlocked NOSIGFE
-putenv SIGFE
-_putenv = putenv SIGFE
-puts SIGFE
-_puts = puts SIGFE
-pututline SIGFE
-_pututline = pututline SIGFE
-putw SIGFE
-_putw = putw SIGFE
-qsort NOSIGFE
-_qsort = qsort NOSIGFE
-raise SIGFE
-_raise = raise SIGFE
-rand NOSIGFE
-_rand = rand NOSIGFE
-random NOSIGFE
-read SIGFE
-_read = read SIGFE
-readdir SIGFE
-_readdir = readdir SIGFE
-readlink SIGFE
-_readlink = readlink SIGFE
-readv SIGFE
-_readv = readv SIGFE
-realloc SIGFE
-_realloc = realloc SIGFE
-realpath SIGFE
-remainder NOSIGFE
-_remainder = remainder NOSIGFE
-remainderf NOSIGFE
-_remainderf = remainderf NOSIGFE
-remove SIGFE
-_remove = remove SIGFE
-remquo NOSIGFE
-remquof NOSIGFE
-rename SIGFE
-_rename = rename SIGFE
-revoke SIGFE
-rewind SIGFE
-_rewind = rewind SIGFE
-rewinddir SIGFE
-_rewinddir = rewinddir SIGFE
-rindex NOSIGFE
-_rindex = rindex NOSIGFE
-rint NOSIGFE
-_rint = rint NOSIGFE
-rintf NOSIGFE
-_rintf = rintf NOSIGFE
-rmdir SIGFE
-_rmdir = rmdir SIGFE
-round NOSIGFE
-roundf NOSIGFE
-sbrk SIGFE
-_sbrk = sbrk SIGFE
-scalb NOSIGFE
-_scalb = scalb NOSIGFE
-scalbf NOSIGFE
-_scalbf = scalbf NOSIGFE
-scalbln NOSIGFE
-scalblnf NOSIGFE
-scalbn NOSIGFE
-_scalbn = scalbn NOSIGFE
-scalbnf NOSIGFE
-_scalbnf = scalbnf NOSIGFE
-scandir SIGFE
-_scandir = scandir SIGFE
-scanf SIGFE
-_scanf = scanf SIGFE
-sched_get_priority_max SIGFE
-sched_get_priority_min SIGFE
-sched_getparam SIGFE
-sched_getscheduler NOSIGFE
-sched_rr_get_interval SIGFE
-sched_setparam SIGFE
-sched_setscheduler SIGFE
-sched_yield SIGFE
-seed48 NOSIGFE
-_seed48 = seed48 NOSIGFE
-seekdir SIGFE
-_seekdir = seekdir SIGFE
-_seekdir64 = seekdir64 SIGFE
-sem_close SIGFE
-sem_destroy NOSIGFE
-sem_getvalue SIGFE
-sem_init SIGFE
-sem_open SIGFE
-sem_post SIGFE
-sem_timedwait SIGFE
-sem_trywait SIGFE
-sem_wait SIGFE
-semctl SIGFE
-semget SIGFE
-semop SIGFE
-setbuf SIGFE
-_setbuf = setbuf SIGFE
-setbuffer SIGFE
-setdtablesize SIGFE
-_setdtablesize = setdtablesize SIGFE
-setegid SIGFE
-_setegid = setegid SIGFE
-_setegid32 = setegid32 SIGFE
-setenv SIGFE
-_setenv = setenv SIGFE
-seteuid SIGFE
-_seteuid = seteuid SIGFE
-_seteuid32 = seteuid32 SIGFE
-setgid SIGFE
-_setgid = setgid SIGFE
-_setgid32 = setgid32 SIGFE
-setgrent NOSIGFE
-_setgrent = setgrent NOSIGFE
-setgroups SIGFE
-_setgroups = setgroups SIGFE
-_setgroups32 = setgroups32 SIGFE
-sethostent NOSIGFE
-setitimer SIGFE
-setjmp NOSIGFE
-_setjmp = setjmp NOSIGFE
-setlinebuf SIGFE
-setlocale NOSIGFE
-_setlocale = setlocale NOSIGFE
-setlogmask NOSIGFE
-setmntent SIGFE
-_setmntent = setmntent SIGFE
-setmode SIGFE
-_setmode = setmode SIGFE
-setpassent NOSIGFE
-_setpassent = setpassent NOSIGFE
-setpgid SIGFE
-_setpgid = setpgid SIGFE
-setpgrp SIGFE
-_setpgrp = setpgrp SIGFE
-setpwent NOSIGFE
-_setpwent = setpwent NOSIGFE
-setregid SIGFE
-_setregid = setregid SIGFE
-setregid32 SIGFE
-_setregid32 = setregid32 SIGFE
-setreuid SIGFE
-_setreuid = setreuid SIGFE
-setreuid32 SIGFE
-_setreuid32 = setreuid32 SIGFE
-setrlimit SIGFE
-_setrlimit = setrlimit SIGFE
-setsid SIGFE
-_setsid = setsid SIGFE
-setstate NOSIGFE
-settimeofday SIGFE
-_settimeofday = settimeofday SIGFE
-setuid SIGFE
-_setuid = setuid SIGFE
-_setuid32 = setuid32 SIGFE
-setutent SIGFE
-_setutent = setutent SIGFE
-setvbuf SIGFE
-_setvbuf = setvbuf SIGFE
-sexecl = sexecve_is_bad SIGFE
-sexecle = sexecve_is_bad SIGFE
-sexeclp = sexecve_is_bad SIGFE
-sexeclpe = sexecve_is_bad SIGFE
-sexecp = sexecve_is_bad SIGFE
-sexecv = sexecve_is_bad SIGFE
-sexecve = sexecve_is_bad SIGFE
-sexecvpe = sexecve_is_bad SIGFE
-shmat SIGFE
-shmctl SIGFE
-shmdt SIGFE
-shmget SIGFE
-sigaction SIGFE
-sigaddset SIGFE
-sigdelset SIGFE
-sigemptyset NOSIGFE
-sigfillset NOSIGFE
-siginterrupt SIGFE
-sigismember SIGFE
-signal SIGFE
-significand NOSIGFE
-significandf NOSIGFE
-sigpause SIGFE
-sigpending SIGFE
-sigprocmask SIGFE
-sigsuspend SIGFE
-sigwait SIGFE
-sin NOSIGFE
-_sin = sin NOSIGFE
-sincos NOSIGFE
-sincosf NOSIGFE
-sinf NOSIGFE
-_sinf = sinf NOSIGFE
-sinh NOSIGFE
-_sinh = sinh NOSIGFE
-sinhf NOSIGFE
-_sinhf = sinhf NOSIGFE
-siprintf SIGFE
-_siprintf = siprintf SIGFE
-sleep SIGFE
-_sleep = sleep SIGFE
-snprintf SIGFE
-_snprintf = snprintf SIGFE
-socketpair SIGFE
-spawnl SIGFE
-_spawnl = spawnl SIGFE
-spawnle SIGFE
-_spawnle = spawnle SIGFE
-spawnlp SIGFE
-_spawnlp = spawnlp SIGFE
-spawnlpe SIGFE
-_spawnlpe = spawnlpe SIGFE
-spawnv SIGFE
-_spawnv = spawnv SIGFE
-spawnve SIGFE
-_spawnve = spawnve SIGFE
-spawnvp SIGFE
-_spawnvp = spawnvp SIGFE
-spawnvpe SIGFE
-_spawnvpe = spawnvpe SIGFE
-sprintf SIGFE
-_sprintf = sprintf SIGFE
-sqrt NOSIGFE
-_sqrt = sqrt NOSIGFE
-sqrtf NOSIGFE
-_sqrtf = sqrtf NOSIGFE
-srand NOSIGFE
-_srand = srand NOSIGFE
-srand48 NOSIGFE
-_srand48 = srand48 NOSIGFE
-srandom NOSIGFE
-sscanf SIGFE
-_sscanf = sscanf SIGFE
-_stat64 = stat64 SIGFE
-statfs SIGFE
-_statfs = statfs SIGFE
-strcasecmp NOSIGFE
-_strcasecmp = strcasecmp NOSIGFE
-strcat NOSIGFE
-_strcat = strcat NOSIGFE
-strchr NOSIGFE
-_strchr = strchr NOSIGFE
-strcmp NOSIGFE
-_strcmp = strcmp NOSIGFE
-strcoll NOSIGFE
-_strcoll = strcoll NOSIGFE
-strcpy NOSIGFE
-_strcpy = strcpy NOSIGFE
-strcspn NOSIGFE
-_strcspn = strcspn NOSIGFE
-strdup SIGFE
-_strdup = strdup SIGFE
-strerror NOSIGFE
-_strerror = strerror NOSIGFE
-strerror_r NOSIGFE
-_strerror_r = strerror_r NOSIGFE
-strftime SIGFE
-_strftime = strftime SIGFE
-strlcat NOSIGFE
-_strlcat = strlcat NOSIGFE
-strlcpy NOSIGFE
-_strlcpy = strlcpy NOSIGFE
-strlen NOSIGFE
-_strlen = strlen NOSIGFE
-strlwr NOSIGFE
-_strlwr = strlwr NOSIGFE
-strncasecmp NOSIGFE
-_strncasecmp = strncasecmp NOSIGFE
-strncat NOSIGFE
-_strncat = strncat NOSIGFE
-strncmp NOSIGFE
-_strncmp = strncmp NOSIGFE
-strncpy NOSIGFE
-_strncpy = strncpy NOSIGFE
-strndup SIGFE
-strnlen NOSIGFE
-strpbrk NOSIGFE
-_strpbrk = strpbrk NOSIGFE
-strptime SIGFE
-_strptime = strptime SIGFE
-strrchr NOSIGFE
-_strrchr = strrchr NOSIGFE
-strsep NOSIGFE
-_strsep = strsep NOSIGFE
-strsignal SIGFE
-strspn NOSIGFE
-_strspn = strspn NOSIGFE
-strstr NOSIGFE
-_strstr = strstr NOSIGFE
-strtod SIGFE
-_strtod = strtod SIGFE
-strtof SIGFE
-_strtodf = strtof SIGFE
-strtodf = strtof SIGFE
-strtok NOSIGFE
-_strtok = strtok NOSIGFE
-strtok_r NOSIGFE
-_strtok_r = strtok_r NOSIGFE
-strtol NOSIGFE
-_strtol = strtol NOSIGFE
-strtoll NOSIGFE
-_strtoll = strtoll NOSIGFE
-strtosigno SIGFE
-strtoul NOSIGFE
-_strtoul = strtoul NOSIGFE
-strtoull NOSIGFE
-_strtoull = strtoull NOSIGFE
-strupr NOSIGFE
-_strupr = strupr NOSIGFE
-strxfrm NOSIGFE
-_strxfrm = strxfrm NOSIGFE
-swab NOSIGFE
-_swab = swab NOSIGFE
-symlink SIGFE
-_symlink = symlink SIGFE
-sync NOSIGFE
-_sync = sync NOSIGFE
-sysconf SIGFE
-_sysconf = sysconf SIGFE
-syslog SIGFE
-_syslog = syslog SIGFE
-vsyslog SIGFE
-system SIGFE
-_system = system SIGFE
-tan NOSIGFE
-_tan = tan NOSIGFE
-tanf NOSIGFE
-_tanf = tanf NOSIGFE
-tanh NOSIGFE
-_tanh = tanh NOSIGFE
-tanhf NOSIGFE
-_tanhf = tanhf NOSIGFE
-tcdrain SIGFE
-_tcdrain = tcdrain SIGFE
-tcflow SIGFE
-_tcflow = tcflow SIGFE
-tcflush SIGFE
-_tcflush = tcflush SIGFE
-tcgetattr SIGFE
-_tcgetattr = tcgetattr SIGFE
-tcgetpgrp SIGFE
-_tcgetpgrp = tcgetpgrp SIGFE
-tcsendbreak SIGFE
-_tcsendbreak = tcsendbreak SIGFE
-tcsetattr SIGFE
-_tcsetattr = tcsetattr SIGFE
-tcsetpgrp SIGFE
-_tcsetpgrp = tcsetpgrp SIGFE
-tdelete SIGFE
-tdestroy NOSIGFE
-telldir SIGFE
-_telldir = telldir SIGFE
-_telldir64 = telldir64 SIGFE
-tempnam SIGFE
-_tempnam = tempnam SIGFE
-tfind NOSIGFE
-tgamma NOSIGFE
-tgammaf NOSIGFE
-time SIGFE
-_time = time SIGFE
-times SIGFE
-_times = times SIGFE
-timezone SIGFE
-tmpfile SIGFE
-_tmpfile = tmpfile SIGFE
-_tmpfile64 = tmpfile64 SIGFE
-tmpnam SIGFE
-_tmpnam = tmpnam SIGFE
-toascii NOSIGFE
-_toascii = toascii NOSIGFE
-tolower NOSIGFE
-_tolower = tolower NOSIGFE
-toupper NOSIGFE
-_toupper = toupper NOSIGFE
-towctrans NOSIGFE
-towlower NOSIGFE
-towupper NOSIGFE
-truncate SIGFE
-_truncate = truncate SIGFE
-_truncate64 = truncate64 SIGFE
-truncf NOSIGFE
-tsearch SIGFE
-ttyname SIGFE
-_ttyname = ttyname SIGFE
-ttyslot NOSIGFE
-twalk NOSIGFE
-tzset SIGFE
-_tzset = tzset SIGFE
-ualarm SIGFE
-_ualarm = ualarm SIGFE
-umask NOSIGFE
-_umask = umask NOSIGFE
-umount SIGFE
-_umount = umount SIGFE
-uname SIGFE
-_uname = uname SIGFE
-ungetc SIGFE
-_ungetc = ungetc SIGFE
-unlink SIGFE
-_unlink = unlink SIGFE
-unlockpt NOSIGFE
-unsetenv NOSIGFE
-_unsetenv = unsetenv NOSIGFE
-usleep SIGFE
-_usleep = usleep SIGFE
-utime SIGFE
-_utime = utime SIGFE
-utimes SIGFE
-_utimes = utimes SIGFE
-utmpname SIGFE
-_utmpname = utmpname SIGFE
-valloc SIGFE
-vasprintf SIGFE
-_vasprintf = vasprintf SIGFE
-verr SIGFE
-verrx SIGFE
-vwarn SIGFE
-vwarnx SIGFE
-vfiprintf SIGFE
-_vfiprintf = vfiprintf SIGFE
-vfork SIGFE
-_vfork = vfork SIGFE
-vfprintf SIGFE
-_vfprintf = vfprintf SIGFE
-vfscanf SIGFE
-_vfscanf = vfscanf SIGFE
-vhangup SIGFE
-_vhangup = vhangup SIGFE
-vprintf SIGFE
-_vprintf = vprintf SIGFE
-vscanf SIGFE
-_vscanf = vscanf SIGFE
-vsnprintf SIGFE
-_vsnprintf = vsnprintf SIGFE
-vsprintf SIGFE
-_vsprintf = vsprintf SIGFE
-vsscanf SIGFE
-_vsscanf = vsscanf SIGFE
-wait SIGFE
-_wait = wait SIGFE
-wait3 SIGFE
-wait4 SIGFE
-waitpid SIGFE
-_waitpid = waitpid SIGFE
-warn SIGFE
-warnx SIGFE
-wcrtomb NOSIGFE
-wcscat NOSIGFE
-wcschr NOSIGFE
-wcscmp NOSIGFE
-_wcscmp = wcscmp NOSIGFE
-wcscoll NOSIGFE
-wcscpy NOSIGFE
-wcscspn NOSIGFE
-wcslcat NOSIGFE
-wcslcpy NOSIGFE
-wcslen NOSIGFE
-_wcslen = wcslen NOSIGFE
-wcsncat NOSIGFE
-wcsncmp NOSIGFE
-wcsncpy NOSIGFE
-wcspbrk NOSIGFE
-wcsrchr NOSIGFE
-wcsrtombs NOSIGFE
-wcsspn NOSIGFE
-wcsstr NOSIGFE
-wcstombs NOSIGFE
-_wcstombs = wcstombs NOSIGFE
-wcswidth NOSIGFE
-wctob NOSIGFE
-wctomb NOSIGFE
-_wctomb = wctomb NOSIGFE
-wctrans NOSIGFE
-wctype NOSIGFE
-wcwidth NOSIGFE
-wmemchr NOSIGFE
-wmemcmp NOSIGFE
-wmemcpy NOSIGFE
-wmemmove NOSIGFE
-wmemset NOSIGFE
-wprintf SIGFE
-_wprintf = wprintf SIGFE
-write SIGFE
-_write = write SIGFE
-writev SIGFE
-_writev = writev SIGFE
-y0 NOSIGFE
-y0f NOSIGFE
-y1 NOSIGFE
-y1f NOSIGFE
-yn NOSIGFE
-ynf NOSIGFE
diff --git a/winsup/cygwin/cygwin.sc b/winsup/cygwin/cygwin.sc
deleted file mode 100644
index fe00e2bd4..000000000
--- a/winsup/cygwin/cygwin.sc
+++ /dev/null
@@ -1,111 +0,0 @@
-OUTPUT_FORMAT(pei-i386)
-SEARCH_DIR(/cygnus/i686-pc-cygwin/lib/w32api); SEARCH_DIR(/cygnus/i686-pc-cygwin/lib);
-ENTRY(_mainCRTStartup)
-SECTIONS
-{
-  .text  __image_base__ + __section_alignment__  :
-  {
-     *(.init)
-    *(.text)
-    *(SORT(.text$*))
-    *(.glue_7t)
-    *(.glue_7)
-     ___CTOR_LIST__ = .; __CTOR_LIST__ = . ;
-			LONG (-1); *(SORT(.ctors.*)); *(.ctors); *(.ctor); LONG (0);
-     ___DTOR_LIST__ = .; __DTOR_LIST__ = . ;
-			LONG (-1); *(SORT(.dtors.*)); *(.dtors); *(.dtor);  LONG (0);
-     *(.fini)
-    /* ??? Why is .gcc_exc here?  */
-     *(.gcc_exc)
-     etext = .;
-    *(.gcc_except_table)
-  }
-  /* The Cygwin DLL uses a section to avoid copying certain data
-     on fork.  This used to be named ".data".  The linker used
-     to include this between __data_start__ and __data_end__, but that
-     breaks building the cygwin32 dll.  Instead, we name the section
-     ".data_cygwin_nocopy" and explictly include it after __data_end__. */
-  .data BLOCK(__section_alignment__) :
-  {
-    __data_start__ = . ;
-    *(.data)
-    *(.data2)
-    *(SORT(.data$*))
-    __data_end__ = . ;
-    *(.data_cygwin_nocopy)
-  }
-  .rdata BLOCK(__section_alignment__) :
-  {
-    *(.rdata)
-    *(SORT(.rdata$*))
-    *(.eh_frame)
-  }
-  .pdata BLOCK(__section_alignment__) :
-  {
-    *(.pdata)
-  }
-  .bss BLOCK(__section_alignment__) :
-  {
-    __bss_start__ = . ;
-    *(.bss)
-    *(COMMON)
-    __bss_end__ = . ;
-  }
-  .edata BLOCK(__section_alignment__) :
-  {
-    *(.edata)
-  }
-  /DISCARD/ :
-  {
-    *(.debug$S)
-    *(.debug$T)
-    *(.debug$F)
-    *(.drectve)
-  }
-  .idata BLOCK(__section_alignment__) :
-  {
-    /* This cannot currently be handled with grouped sections.
-	See pe.em:sort_sections.  */
-    SORT(*)(.idata$2)
-    SORT(*)(.idata$3)
-    /* These zeroes mark the end of the import list.  */
-    LONG (0); LONG (0); LONG (0); LONG (0); LONG (0);
-    SORT(*)(.idata$4)
-    SORT(*)(.idata$5)
-    SORT(*)(.idata$6)
-    SORT(*)(.idata$7)
-  }
-  .CRT BLOCK(__section_alignment__) :
-  {
-    *(SORT(.CRT$*))
-  }
-  .endjunk BLOCK(__section_alignment__) :
-  {
-    /* end is deprecated, don't use it */
-     end = .;
-     _end = .;
-     __end__ = .;
-  }
-  .rsrc BLOCK(__section_alignment__) :
-  {
-    *(.rsrc)
-    *(SORT(.rsrc$*))
-  }
-  .reloc BLOCK(__section_alignment__) :
-  {
-    *(.reloc)
-  }
-  .stab BLOCK(__section_alignment__) (NOLOAD) :
-  {
-    [ .stab ]
-  }
-  .stabstr BLOCK(__section_alignment__) (NOLOAD) :
-  {
-    [ .stabstr ]
-  }
-  .cygheap BLOCK(64 * 1024) :
-  {
-    __system_dlls__ = ABSOLUTE(.) ;
-    __cygheap_start = ABSOLUTE(.) ;
-  }
-}
diff --git a/winsup/cygwin/cygwin_version.h b/winsup/cygwin/cygwin_version.h
deleted file mode 100644
index 18bdf2416..000000000
--- a/winsup/cygwin/cygwin_version.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* cygwin_version.h: shared info for cygwin
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <cygwin/version.h>
-
-extern "C" {
-/* This is for programs that want to access the shared data. */
-class shared_info *cygwin_getshared (void);
-
-struct cygwin_version_info
-{
-  unsigned short api_major;
-  unsigned short api_minor;
-  unsigned short dll_major;
-  unsigned short dll_minor;
-  unsigned short shared_data;
-  unsigned short mount_registry;
-  const char *dll_build_date;
-  char shared_id[sizeof (CYGWIN_VERSION_DLL_IDENTIFIER) + 64];
-};
-
-extern cygwin_version_info cygwin_version;
-extern const char *cygwin_version_strings;
-}
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
deleted file mode 100644
index 72161f91e..000000000
--- a/winsup/cygwin/dcrt0.cc
+++ /dev/null
@@ -1,1144 +0,0 @@
-/* dcrt0.cc -- essentially the main() for the Cygwin dll
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include "glob.h"
-#include "exceptions.h"
-#include <ctype.h>
-#include <limits.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include "sigproc.h"
-#include "pinfo.h"
-#include "cygerrno.h"
-#define NEED_VFORK
-#include "perprocess.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "child_info_magic.h"
-#include "perthread.h"
-#include "shared_info.h"
-#include "cygwin_version.h"
-#include "dll_init.h"
-#include "cygthread.h"
-#include "sync.h"
-
-#define MAX_AT_FILE_LEVEL 10
-
-#define PREMAIN_LEN (sizeof (user_data->premain) / sizeof (user_data->premain[0]))
-
-HANDLE NO_COPY hMainProc = (HANDLE) -1;
-HANDLE NO_COPY hMainThread;
-
-per_thread_waitq NO_COPY waitq_storage;
-per_thread_vfork NO_COPY vfork_storage;
-
-per_thread NO_COPY *threadstuff[] = {&waitq_storage,
-				     &vfork_storage,
-				     NULL};
-
-bool display_title;
-bool strip_title_path;
-bool allow_glob = true;
-codepage_type current_codepage = ansi_cp;
-
-static NO_COPY int mypid = 0;
-int __argc_safe;
-int _declspec(dllexport) __argc;
-char _declspec(dllexport) **__argv;
-vfork_save NO_COPY *main_vfork = NULL;
-
-extern "C" void __sinit (_reent *);
-
-_threadinfo NO_COPY *_main_tls;
-
-int cygwin_finished_initializing;
-
-/* Used in SIGTOMASK for generating a bit for insertion into a sigset_t.
-   This is subtracted from the signal number prior to shifting the bit.
-   In older versions of cygwin, the signal was used as-is to shift the
-   bit for masking.  So, we'll temporarily detect this and set it to zero
-   for programs that are linked using older cygwins.  This is just a stopgap
-   measure to allow an orderly transfer to the new, correct sigmask method. */
-unsigned NO_COPY int signal_shift_subtract = 1;
-
-ResourceLocks _reslock NO_COPY;
-MTinterface _mtinterf;
-
-bool NO_COPY _cygwin_testing;
-
-char NO_COPY almost_null[1];
-
-extern "C"
-{
-  /* This is an exported copy of environ which can be used by DLLs
-     which use cygwin.dll.  */
-  char **__cygwin_environ;
-  char ***main_environ;
-  /* __progname used in getopt error message */
-  char *__progname;
-  struct _reent reent_data = _REENT_INIT(reent_data);
-  struct per_process __cygwin_user_data =
-  {/* initial_sp */ 0, /* magic_biscuit */ 0,
-   /* dll_major */ CYGWIN_VERSION_DLL_MAJOR,
-   /* dll_major */ CYGWIN_VERSION_DLL_MINOR,
-   /* impure_ptr_ptr */ NULL, /* envptr */ NULL,
-   /* malloc */ malloc, /* free */ free,
-   /* realloc */ realloc,
-   /* fmode_ptr */ NULL, /* main */ NULL, /* ctors */ NULL,
-   /* dtors */ NULL, /* data_start */ NULL, /* data_end */ NULL,
-   /* bss_start */ NULL, /* bss_end */ NULL,
-   /* calloc */ calloc,
-   /* premain */ {NULL, NULL, NULL, NULL},
-   /* run_ctors_p */ 0,
-   /* unused */ {0, 0, 0, 0, 0, 0, 0},
-   /* forkee */ 0,
-   /* hmodule */ NULL,
-   /* api_major */ CYGWIN_VERSION_API_MAJOR,
-   /* api_minor */ CYGWIN_VERSION_API_MINOR,
-   /* unused2 */ {0, 0, 0, 0, 0},
-   /* resourcelocks */ &_reslock, /* threadinterface */ &_mtinterf,
-   /* impure_ptr */ &reent_data,
-  };
-  bool ignore_case_with_glob;
-  int __declspec (dllexport) _check_for_executable = true;
-#ifdef DEBUGGING
-  int pinger;
-#endif
-};
-
-char *old_title;
-char title_buf[TITLESIZE + 1];
-
-static void
-do_global_dtors (void)
-{
-  if (user_data->dtors)
-    {
-      void (**pfunc)() = user_data->dtors;
-      while (*++pfunc)
-	(*pfunc) ();
-    }
-}
-
-static void __stdcall
-do_global_ctors (void (**in_pfunc)(), int force)
-{
-  if (!force)
-    {
-      if (user_data->forkee || user_data->run_ctors_p)
-	return;		// inherit constructed stuff from parent pid
-      user_data->run_ctors_p = 1;
-    }
-
-  /* Run ctors backwards, so skip the first entry and find how many
-     there are, then run them. */
-
-  void (**pfunc)() = in_pfunc;
-
-  while (*++pfunc)
-    ;
-  while (--pfunc > in_pfunc)
-    (*pfunc) ();
-
-  if (user_data->magic_biscuit == SIZEOF_PER_PROCESS)
-    atexit (do_global_dtors);
-}
-
-/*
- * Replaces @file in the command line with the contents of the file.
- * There may be multiple @file's in a single command line
- * A \@file is replaced with @file so that echo \@foo would print
- * @foo and not the contents of foo.
- */
-static bool __stdcall
-insert_file (char *name, char *&cmd)
-{
-  HANDLE f;
-  DWORD size;
-
-  f = CreateFile (name + 1,
-		  GENERIC_READ,		 /* open for reading	*/
-		  FILE_SHARE_READ,       /* share for reading	*/
-		  &sec_none_nih,	 /* no security		*/
-		  OPEN_EXISTING,	 /* existing file only	*/
-		  FILE_ATTRIBUTE_NORMAL, /* normal file		*/
-		  NULL);		 /* no attr. template	*/
-
-  if (f == INVALID_HANDLE_VALUE)
-    {
-      debug_printf ("couldn't open file '%s', %E", name);
-      return false;
-    }
-
-  /* This only supports files up to about 4 billion bytes in
-     size.  I am making the bold assumption that this is big
-     enough for this feature */
-  size = GetFileSize (f, NULL);
-  if (size == 0xFFFFFFFF)
-    {
-      debug_printf ("couldn't get file size for '%s', %E", name);
-      return false;
-    }
-
-  int new_size = strlen (cmd) + size + 2;
-  char *tmp = (char *) malloc (new_size);
-  if (!tmp)
-    {
-      debug_printf ("malloc failed, %E");
-      return false;
-    }
-
-  /* realloc passed as it should */
-  DWORD rf_read;
-  BOOL rf_result;
-  rf_result = ReadFile (f, tmp, size, &rf_read, NULL);
-  CloseHandle (f);
-  if (!rf_result || (rf_read != size))
-    {
-      debug_printf ("ReadFile failed, %E");
-      return false;
-    }
-
-  tmp[size++] = ' ';
-  strcpy (tmp + size, cmd);
-  cmd = tmp;
-  return true;
-}
-
-static inline int
-isquote (char c)
-{
-  char ch = c;
-  return ch == '"' || ch == '\'';
-}
-
-/* Step over a run of characters delimited by quotes */
-static /*__inline*/ char *
-quoted (char *cmd, int winshell)
-{
-  char *p;
-  char quote = *cmd;
-
-  if (!winshell)
-    {
-      char *p;
-      strcpy (cmd, cmd + 1);
-      if (*(p = strechr (cmd, quote)))
-	strcpy (p, p + 1);
-      return p;
-    }
-
-  const char *s = quote == '\'' ? "'" : "\\\"";
-  /* This must have been run from a Windows shell, so preserve
-     quotes for globify to play with later. */
-  while (*cmd && *++cmd)
-    if ((p = strpbrk (cmd, s)) == NULL)
-      {
-	cmd = strchr (cmd, '\0');	// no closing quote
-	break;
-      }
-    else if (*p == '\\')
-      cmd = ++p;
-    else if (quote == '"' && p[1] == '"')
-      {
-	*p = '\\';
-	cmd = ++p;			// a quoted quote
-      }
-    else
-      {
-	cmd = p + 1;		// point to after end
-	break;
-      }
-  return cmd;
-}
-
-/* Perform a glob on word if it contains wildcard characters.
-   Also quote every character between quotes to force glob to
-   treat the characters literally. */
-static int __stdcall
-globify (char *word, char **&argv, int &argc, int &argvlen)
-{
-  if (*word != '~' && strpbrk (word, "?*[\"\'(){}") == NULL)
-    return 0;
-
-  int n = 0;
-  char *p, *s;
-  int dos_spec = isdrive (word);
-  if (!dos_spec && isquote (*word) && word[1] && word[2])
-    dos_spec = isdrive (word + 1);
-
-  /* We'll need more space if there are quoting characters in
-     word.  If that is the case, doubling the size of the
-     string should provide more than enough space. */
-  if (strpbrk (word, "'\""))
-    n = strlen (word);
-  char pattern[strlen (word) + ((dos_spec + 1) * n) + 1];
-
-  /* Fill pattern with characters from word, quoting any
-     characters found within quotes. */
-  for (p = pattern, s = word; *s != '\000'; s++, p++)
-    if (!isquote (*s))
-      {
-	if (dos_spec && *s == '\\')
-	  *p++ = '\\';
-	*p = *s;
-      }
-    else
-      {
-	char quote = *s;
-	while (*++s && *s != quote)
-	  {
-	    if (dos_spec || *s != '\\')
-	      /* nothing */;
-	    else if (s[1] == quote || s[1] == '\\')
-	      s++;
-	    *p++ = '\\';
-	    *p++ = *s;
-	  }
-	if (*s == quote)
-	  p--;
-	if (*s == '\0')
-	    break;
-      }
-
-  *p = '\0';
-
-  glob_t gl;
-  gl.gl_offs = 0;
-
-  /* Attempt to match the argument.  Return just word (minus quoting) if no match. */
-  if (glob (pattern, GLOB_TILDE | GLOB_NOCHECK | GLOB_BRACE | GLOB_QUOTE, NULL, &gl) || !gl.gl_pathc)
-    return 0;
-
-  /* Allocate enough space in argv for the matched filenames. */
-  n = argc;
-  if ((argc += gl.gl_pathc) > argvlen)
-    {
-      argvlen = argc + 10;
-      argv = (char **) realloc (argv, (1 + argvlen) * sizeof (argv[0]));
-    }
-
-  /* Copy the matched filenames to argv. */
-  char **gv = gl.gl_pathv;
-  char **av = argv + n;
-  while (*gv)
-    {
-      debug_printf ("argv[%d] = '%s'", n++, *gv);
-      *av++ = *gv++;
-    }
-
-  /* Clean up after glob. */
-  free (gl.gl_pathv);
-  return 1;
-}
-
-/* Build argv, argc from string passed from Windows.  */
-
-static void __stdcall
-build_argv (char *cmd, char **&argv, int &argc, int winshell)
-{
-  int argvlen = 0;
-  int nesting = 0;		// monitor "nesting" from insert_file
-
-  argc = 0;
-  argvlen = 0;
-  argv = NULL;
-
-  /* Scan command line until there is nothing left. */
-  while (*cmd)
-    {
-      /* Ignore spaces */
-      if (issep (*cmd))
-	{
-	  cmd++;
-	  continue;
-	}
-
-      /* Found the beginning of an argument. */
-      char *word = cmd;
-      char *sawquote = NULL;
-      while (*cmd)
-	{
-	  if (*cmd != '"' && (!winshell || *cmd != '\''))
-	    cmd++;		// Skip over this character
-	  else
-	    /* Skip over characters until the closing quote */
-	    {
-	      sawquote = cmd;
-	      cmd = quoted (cmd, winshell && argc > 0);
-	    }
-	  if (issep (*cmd))	// End of argument if space
-	    break;
-	}
-      if (*cmd)
-	*cmd++ = '\0';		// Terminate `word'
-
-      /* Possibly look for @file construction assuming that this isn't
-	 the very first argument and the @ wasn't quoted */
-      if (argc && sawquote != word && *word == '@')
-	{
-	  if (++nesting > MAX_AT_FILE_LEVEL)
-	    api_fatal ("Too many levels of nesting for %s", word);
-	  if (insert_file (word, cmd))
-	      continue;			// There's new stuff in cmd now
-	}
-
-      /* See if we need to allocate more space for argv */
-      if (argc >= argvlen)
-	{
-	  argvlen = argc + 10;
-	  argv = (char **) realloc (argv, (1 + argvlen) * sizeof (argv[0]));
-	}
-
-      /* Add word to argv file after (optional) wildcard expansion. */
-      if (!winshell || !argc || !globify (word, argv, argc, argvlen))
-	{
-	  debug_printf ("argv[%d] = '%s'", argc, word);
-	  argv[argc++] = word;
-	}
-    }
-
-  argv[argc] = NULL;
-
-  debug_printf ("argc %d", argc);
-}
-
-/* sanity and sync check */
-void __stdcall
-check_sanity_and_sync (per_process *p)
-{
-  /* Sanity check to make sure developers didn't change the per_process    */
-  /* struct without updating SIZEOF_PER_PROCESS [it makes them think twice */
-  /* about changing it].						   */
-  if (sizeof (per_process) != SIZEOF_PER_PROCESS)
-    {
-      api_fatal ("per_process sanity check failed");
-    }
-
-  /* Make sure that the app and the dll are in sync. */
-
-  /* Complain if older than last incompatible change */
-  if (p->dll_major < CYGWIN_VERSION_DLL_EPOCH)
-    api_fatal ("cygwin DLL and APP are out of sync -- DLL version mismatch %d < %d",
-	       p->dll_major, CYGWIN_VERSION_DLL_EPOCH);
-
-  /* magic_biscuit != 0 if using the old style version numbering scheme.  */
-  if (p->magic_biscuit != SIZEOF_PER_PROCESS)
-    api_fatal ("Incompatible cygwin .dll -- incompatible per_process info %d != %d",
-	       p->magic_biscuit, SIZEOF_PER_PROCESS);
-
-  /* Complain if incompatible API changes made */
-  if (p->api_major > cygwin_version.api_major)
-    api_fatal ("cygwin DLL and APP are out of sync -- API version mismatch %d > %d",
-	       p->api_major, cygwin_version.api_major);
-
-  if (CYGWIN_VERSION_DLL_MAKE_COMBINED (p->dll_major, p->dll_minor) <=
-      CYGWIN_VERSION_DLL_BAD_SIGNAL_MASK)
-    signal_shift_subtract = 0;
-}
-
-child_info NO_COPY *child_proc_info = NULL;
-static MEMORY_BASIC_INFORMATION NO_COPY sm;
-
-#define CYGWIN_GUARD ((wincap.has_page_guard ()) ? \
-		     PAGE_EXECUTE_READWRITE|PAGE_GUARD : PAGE_NOACCESS)
-
-// __inline__ void
-extern void
-alloc_stack_hard_way (child_info_fork *ci, volatile char *b)
-{
-  void *new_stack_pointer;
-  MEMORY_BASIC_INFORMATION m;
-  void *newbase;
-  int newlen;
-  LPBYTE curbot = (LPBYTE) sm.BaseAddress + sm.RegionSize;
-  bool noguard;
-
-  if (ci->stacktop > (LPBYTE) sm.AllocationBase && ci->stacktop < curbot)
-    {
-      newbase = curbot;
-      newlen = (LPBYTE) ci->stackbottom - (LPBYTE) curbot;
-      noguard = 1;
-    }
-  else
-    {
-      newbase = ci->stacktop;
-      newlen = (DWORD) ci->stackbottom - (DWORD) ci->stacktop;
-      noguard = 0;
-    }
-  if (!VirtualAlloc (newbase, newlen, MEM_RESERVE, PAGE_NOACCESS))
-    api_fatal ("fork: can't reserve memory for stack %p - %p, %E",
-		ci->stacktop, ci->stackbottom);
-
-  new_stack_pointer = (void *) ((LPBYTE) ci->stackbottom - ci->stacksize);
-
-  if (!VirtualAlloc (new_stack_pointer, ci->stacksize, MEM_COMMIT,
-		     PAGE_EXECUTE_READWRITE))
-    api_fatal ("fork: can't commit memory for stack %p(%d), %E",
-	       new_stack_pointer, ci->stacksize);
-  if (!VirtualQuery ((LPCVOID) new_stack_pointer, &m, sizeof m))
-    api_fatal ("fork: couldn't get new stack info, %E");
-  if (!noguard)
-    {
-      m.BaseAddress = (LPVOID)((DWORD)m.BaseAddress - 1);
-      if (!VirtualAlloc ((LPVOID) m.BaseAddress, 1, MEM_COMMIT,
-			 CYGWIN_GUARD))
-	api_fatal ("fork: couldn't allocate new stack guard page %p, %E",
-		   m.BaseAddress);
-    }
-  if (!VirtualQuery ((LPCVOID) m.BaseAddress, &m, sizeof m))
-    api_fatal ("fork: couldn't get new stack info, %E");
-  ci->stacktop = m.BaseAddress;
-  *b = 0;
-}
-
-/* extend the stack prior to fork longjmp */
-
-static void
-alloc_stack (child_info_fork *ci)
-{
-  /* FIXME: adding 16384 seems to avoid a stack copy problem during
-     fork on Win95, but I don't know exactly why yet. DJ */
-  volatile char b[ci->stacksize + 16384];
-
-  if (!VirtualQuery ((LPCVOID) &b, &sm, sizeof sm))
-    api_fatal ("fork: couldn't get stack info, %E");
-
-  if (sm.AllocationBase == ci->stacktop)
-    ci->stacksize = 0;
-  else
-    alloc_stack_hard_way (ci, b + sizeof (b) - 1);
-
-  return;
-}
-
-/* Take over from libc's crt0.o and start the application. Note the
-   various special cases when Cygwin DLL is being runtime loaded (as
-   opposed to being link-time loaded by Cygwin apps) from a non
-   cygwin app via LoadLibrary.  */
-static void
-dll_crt0_1 ()
-{
-  char padding[CYGTLS_PADSIZE];
-  _main_tls = &_my_tls;
-  _main_tls->init_thread (padding);
-
-  /* According to onno@stack.urc.tue.nl, the exception handler record must
-     be on the stack.  */
-  /* FIXME: Verify forked children get their exception handler set up ok. */
-  exception_list cygwin_except_entry;
-
-  /* Initialize SIGSEGV handling, etc. */
-  init_exceptions (&cygwin_except_entry);
-
-  /* Set the os_being_run global. */
-  wincap.init ();
-  device::init ();
-  check_sanity_and_sync (user_data);
-
-  do_global_ctors (&__CTOR_LIST__, 1);
-
-  /* Nasty static stuff needed by newlib -- point to a local copy of
-     the reent stuff.
-     Note: this MUST be done here (before the forkee code) as the
-     fork copy code doesn't copy the data in libccrt0.cc (that's why we
-     pass in the per_process struct into the .dll from libccrt0). */
-
-  _impure_ptr = &reent_data;
-
-  user_data->resourcelocks->Init ();
-  user_data->threadinterface->Init ();
-
-  winpids::init ();
-
-  int envc = 0;
-  char **envp = NULL;
-
-  if (!child_proc_info)
-    memory_init ();
-  else
-    {
-      bool close_ppid_handle = false;
-      bool close_hexec_proc = false;
-      switch (child_proc_info->type)
-	{
-	  case _PROC_FORK:
-	    alloc_stack (fork_info);
-	    cygheap_fixup_in_child (0);
-	    memory_init ();
-	    set_myself (mypid);
-	    close_ppid_handle = !!child_proc_info->pppid_handle;
-	    break;
-	  case _PROC_SPAWN:
-	    /* Have to delay closes until after cygheap is setup */
-	    close_hexec_proc = !!spawn_info->hexec_proc;
-	    close_ppid_handle = !!child_proc_info->pppid_handle;
-	    goto around;
-	  case _PROC_EXEC:
-	    hexec_proc = spawn_info->hexec_proc;
-	  around:
-	    HANDLE h;
-	    cygheap_fixup_in_child (1);
-	    memory_init ();
-	    if (!spawn_info->moreinfo->myself_pinfo ||
-		!DuplicateHandle (hMainProc, spawn_info->moreinfo->myself_pinfo,
-				  hMainProc, &h, 0, 0,
-				  DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE))
-	      h = NULL;
-	    set_myself (mypid, h);
-	    __argc = spawn_info->moreinfo->argc;
-	    __argv = spawn_info->moreinfo->argv;
-	    envp = spawn_info->moreinfo->envp;
-	    envc = spawn_info->moreinfo->envc;
-	    cygheap->fdtab.fixup_after_exec (spawn_info->parent);
-	    signal_fixup_after_exec ();
-	    CloseHandle (spawn_info->parent);
-	    if (spawn_info->moreinfo->old_title)
-	      {
-		old_title = strcpy (title_buf, spawn_info->moreinfo->old_title);
-		cfree (spawn_info->moreinfo->old_title);
-	      }
-	    break;
-	}
-      if (close_hexec_proc)
-	CloseHandle (spawn_info->hexec_proc);
-      if (close_ppid_handle)
-	CloseHandle (child_proc_info->pppid_handle);
-    }
-
-  ProtectHandle (hMainProc);
-  ProtectHandle (hMainThread);
-  cygthread::init ();
-
-  /* Initialize pthread mainthread when not forked and it is safe to call new,
-     otherwise it is reinitalized in fixup_after_fork */
-  if (!user_data->forkee)
-    {
-      __sinit (_impure_ptr);
-      pthread::init_mainthread ();
-    }
-
-#ifdef DEBUGGING
-  strace.microseconds ();
-#endif
-
-  /* Initialize debug muto, if DLL is built with --enable-debugging.
-     Need to do this before any helper threads start. */
-  debug_init ();
-
-  cygheap->fdtab.vfork_child_fixup ();
-
-  (void) SetErrorMode (SEM_FAILCRITICALERRORS);
-
-  /* Initialize events. */
-  events_init ();
-
-  cygheap->cwd.init ();
-  main_vfork = vfork_storage.create ();
-
-  cygbench ("pre-forkee");
-  if (user_data->forkee)
-    {
-      /* If we've played with the stack, stacksize != 0.  That means that
-	 fork() was invoked from other than the main thread.  Make sure that
-	 frame pointer is referencing the new stack so that the OS knows what
-	 to do when it needs to increase the size of the stack.
-
-	 NOTE: Don't do anything that involves the stack until you've completed
-	 this step. */
-      if (fork_info->stacksize)
-	{
-	  _tlsbase = (char *) fork_info->stackbottom;
-	  _tlstop = (char *) fork_info->stacktop;
-	}
-
-      longjmp (fork_info->jmp, fork_info->cygpid);
-    }
-
-#ifdef DEBUGGING
-  {
-  extern void fork_init ();
-  fork_init ();
-  }
-#endif
-
-  /* Init global well known SID objects */
-  cygsid::init ();
-
-  /* Initialize our process table entry. */
-  pinfo_init (envp, envc);
-
-  if (!old_title && GetConsoleTitle (title_buf, TITLESIZE))
-      old_title = title_buf;
-
-  /* Allocate cygheap->fdtab */
-  dtable_init ();
-
-  /* Initialize user info. */
-  uinfo_init ();
-
-  /* Initialize signal/subprocess handling. */
-  sigproc_init ();
-
-  /* Connect to tty. */
-  tty_init ();
-
-  if (!__argc)
-    {
-      char *line = GetCommandLineA ();
-      line = strcpy ((char *) alloca (strlen (line) + 1), line);
-
-      if (current_codepage == oem_cp)
-	CharToOemA (line, line);
-
-      /* Scan the command line and build argv.  Expand wildcards if not
-	 called from another cygwin process. */
-      build_argv (line, __argv, __argc,
-		  NOTSTATE (myself, PID_CYGPARENT) && allow_glob);
-
-      /* Convert argv[0] to posix rules if it's currently blatantly
-	 win32 style. */
-      if ((strchr (__argv[0], ':')) || (strchr (__argv[0], '\\')))
-	{
-	  char *new_argv0 = (char *) alloca (CYG_MAX_PATH);
-	  cygwin_conv_to_posix_path (__argv[0], new_argv0);
-	  __argv[0] = new_argv0;
-	}
-    }
-
-  __argc_safe = __argc;
-  if (user_data->premain[0])
-    for (unsigned int i = 0; i < PREMAIN_LEN / 2; i++)
-      user_data->premain[i] (__argc, __argv, user_data);
-
-  /* Set up standard fds in file descriptor table. */
-  cygheap->fdtab.stdio_init ();
-
-  /* Set up __progname for getopt error call. */
-  if (__argv[0] && (__progname = strrchr (__argv[0], '/')))
-    ++__progname;
-  else
-    __progname = __argv[0];
-  if (__progname)
-    {
-      char *cp = strchr (__progname, '\0') - 4;
-      if (cp > __progname && strcasematch (cp, ".exe"))
-	*cp = '\0';
-    }
-
-  /* Set new console title if appropriate. */
-
-  if (display_title && !dynamically_loaded)
-    {
-      char *cp = __progname;
-      if (strip_title_path)
-	for (char *ptr = cp; *ptr && *ptr != ' '; ptr++)
-	  if (isdirsep (*ptr))
-	    cp = ptr + 1;
-      set_console_title (cp);
-    }
-
-  cygwin_finished_initializing = 1;
-  /* Call init of loaded dlls. */
-  dlls.init ();
-
-  /* Execute any specified "premain" functions */
-  if (user_data->premain[PREMAIN_LEN / 2])
-    for (unsigned int i = PREMAIN_LEN / 2; i < PREMAIN_LEN; i++)
-      user_data->premain[i] (__argc, __argv, user_data);
-
-  debug_printf ("user_data->main %p", user_data->main);
-
-  if (dynamically_loaded)
-    {
-      set_errno (0);
-      return;
-    }
-
-  /* Disable case-insensitive globbing */
-  ignore_case_with_glob = false;
-
-  /* Flush signals and ensure that signal thread is up and running. Can't
-     do this for noncygwin case since the signal thread is blocked due to
-     LoadLibrary serialization. */
-  wait_for_sigthread ();
-
-  set_errno (0);
-
-  MALLOC_CHECK;
-  cygbench (__progname);
-  if (user_data->main)
-    exit (user_data->main (__argc, __argv, *user_data->envptr));
-}
-
-#ifdef DEBUGGING
-void
-break_here ()
-{
-  debug_printf ("break here");
-}
-#endif
-
-void
-initial_env ()
-{
-  char buf[CYG_MAX_PATH + 1];
-#ifdef DEBUGGING
-  DWORD len;
-  if (GetEnvironmentVariable ("CYGWIN_SLEEP", buf, sizeof (buf) - 1))
-    {
-      DWORD ms = atoi (buf);
-      buf[0] = '\0';
-      len = GetModuleFileName (NULL, buf, CYG_MAX_PATH);
-      console_printf ("Sleeping %d, pid %u %s\n", ms, GetCurrentProcessId (), buf);
-      Sleep (ms);
-    }
-  if (GetEnvironmentVariable ("CYGWIN_DEBUG", buf, sizeof (buf) - 1))
-    {
-      char buf1[CYG_MAX_PATH + 1];
-      len = GetModuleFileName (NULL, buf1, CYG_MAX_PATH);
-      strlwr (buf1);
-      strlwr (buf);
-      char *p = strchr (buf, ':');
-      if (!p)
-	p = (char *) "gdb.exe -nw";
-      else
-	*p++ = '\0';
-      if (strstr (buf1, buf))
-	{
-	  error_start_init (p);
-	  try_to_debug ();
-	  break_here ();
-	}
-    }
-#endif
-
-  if (GetEnvironmentVariable ("CYGWIN_TESTING", buf, sizeof (buf) - 1))
-    _cygwin_testing = 1;
-}
-
-/* Wrap the real one, otherwise gdb gets confused about
-   two symbols with the same name, but different addresses.
-
-   UPTR is a pointer to global data that lives on the libc side of the
-   line [if one distinguishes the application from the dll].  */
-
-extern "C" void __stdcall
-_dll_crt0 ()
-{
-  initial_env ();
-  char zeros[sizeof (fork_info->zero)] = {0};
-  static NO_COPY STARTUPINFO si;
-
-  main_environ = user_data->envptr;
-  *main_environ = NULL;
-
-  init_console_handler ();
-  init_global_security ();
-  if (!DuplicateHandle (GetCurrentProcess (), GetCurrentProcess (),
-		       GetCurrentProcess (), &hMainProc, 0, FALSE,
-			DUPLICATE_SAME_ACCESS))
-    hMainProc = GetCurrentProcess ();
-
-  DuplicateHandle (hMainProc, GetCurrentThread (), hMainProc,
-		   &hMainThread, 0, false, DUPLICATE_SAME_ACCESS);
-
-  GetStartupInfo (&si);
-  child_proc_info = (child_info *) si.lpReserved2;
-  if (si.cbReserved2 < EXEC_MAGIC_SIZE || !child_proc_info
-      || memcmp (child_proc_info->zero, zeros, sizeof (zeros)) != 0)
-    child_proc_info = NULL;
-  else
-    {
-      if ((child_proc_info->intro & OPROC_MAGIC_MASK) == OPROC_MAGIC_GENERIC)
-	multiple_cygwin_problem ("proc", child_proc_info->intro, 0);
-      else if (child_proc_info->intro == PROC_MAGIC_GENERIC
-	       && child_proc_info->magic != CHILD_INFO_MAGIC)
-	multiple_cygwin_problem ("proc", child_proc_info->magic,
-				 CHILD_INFO_MAGIC);
-      else if (child_proc_info->cygheap != (void *) &_cygheap_start)
-	multiple_cygwin_problem ("cygheap", (DWORD) child_proc_info->cygheap,
-				 (DWORD) &_cygheap_start);
-      unsigned should_be_cb = 0;
-      switch (child_proc_info->type)
-	{
-	  case _PROC_FORK:
-	    user_data->forkee = child_proc_info->cygpid;
-	    should_be_cb = sizeof (child_info_fork);
-	    /* fall through */;
-	  case _PROC_SPAWN:
-	  case _PROC_EXEC:
-	    if (!should_be_cb)
-	      should_be_cb = sizeof (child_info);
-	    if (should_be_cb != child_proc_info->cb)
-	      multiple_cygwin_problem ("proc size", child_proc_info->cb, should_be_cb);
-	    else if (sizeof (fhandler_union) != child_proc_info->fhandler_union_cb)
-	      multiple_cygwin_problem ("fhandler size", child_proc_info->fhandler_union_cb, sizeof (fhandler_union));
-	    else
-	      {
-		cygwin_user_h = child_proc_info->user_h;
-		mypid = child_proc_info->cygpid;
-		break;
-	      }
-	  default:
-	    system_printf ("unknown exec type %d", child_proc_info->type);
-	    /* intentionally fall through */
-	  case _PROC_WHOOPS:
-	    child_proc_info = NULL;
-	    break;
-	}
-    }
-
-  _threadinfo::init ();
-  dll_crt0_1 ();
-}
-
-void
-dll_crt0 (per_process *uptr)
-{
-  /* Set the local copy of the pointer into the user space. */
-  if (uptr && uptr != user_data)
-    {
-      memcpy (user_data, uptr, per_process_overwrite);
-      *(user_data->impure_ptr_ptr) = &reent_data;
-    }
-  _dll_crt0 ();
-}
-
-/* This must be called by anyone who uses LoadLibrary to load cygwin1.dll */
-extern "C" void
-cygwin_dll_init ()
-{
-  static char **envp;
-  static int _fmode;
-
-  if (!DuplicateHandle (GetCurrentProcess (), GetCurrentProcess (),
-		       GetCurrentProcess (), &hMainProc, 0, FALSE,
-			DUPLICATE_SAME_ACCESS))
-    hMainProc = GetCurrentProcess ();
-
-  DuplicateHandle (hMainProc, GetCurrentThread (), hMainProc,
-		   &hMainThread, 0, FALSE, DUPLICATE_SAME_ACCESS);
-  user_data->magic_biscuit = sizeof (per_process);
-
-  user_data->envptr = &envp;
-  user_data->fmode_ptr = &_fmode;
-
-  dll_crt0_1 ();
-}
-
-extern "C" void
-__main (void)
-{
-  do_global_ctors (user_data->ctors, false);
-}
-
-exit_states NO_COPY exit_state;
-extern CRITICAL_SECTION exit_lock;
-
-void __stdcall
-do_exit (int status)
-{
-  syscall_printf ("do_exit (%d), exit_state %d", status, exit_state);
-
-  vfork_save *vf = vfork_storage.val ();
-  if (vf != NULL && vf->pid < 0)
-    {
-      exit_state = ES_NOT_EXITING;
-      vf->restore_exit (status);
-    }
-
-  EnterCriticalSection (&exit_lock);
-  if (exit_state < ES_EVENTS_TERMINATE)
-    {
-      exit_state = ES_EVENTS_TERMINATE;
-      events_terminate ();
-    }
-
-  UINT n = (UINT) status;
-  if (exit_state < ES_THREADTERM)
-    {
-      exit_state = ES_THREADTERM;
-      cygthread::terminate ();
-    }
-
-  if (exit_state < ES_SIGNAL)
-    {
-      exit_state = ES_SIGNAL;
-      if (!(n & EXIT_REPARENTING))
-	{
-	  signal (SIGCHLD, SIG_IGN);
-	  signal (SIGHUP, SIG_IGN);
-	  signal (SIGINT, SIG_IGN);
-	  signal (SIGQUIT, SIG_IGN);
-	}
-    }
-
-  if (exit_state < ES_CLOSEALL)
-    {
-      exit_state = ES_CLOSEALL;
-      close_all_files ();
-    }
-
-  if (exit_state < ES_SIGPROCTERMINATE)
-    {
-      exit_state = ES_SIGPROCTERMINATE;
-      sigproc_terminate ();
-    }
-
-  myself->stopsig = 0;
-  if (exit_state < ES_TITLE)
-    {
-      exit_state = ES_TITLE;
-      /* restore console title */
-      if (old_title && display_title)
-	set_console_title (old_title);
-    }
-
-  if (exit_state < ES_HUP_PGRP)
-    {
-      exit_state = ES_HUP_PGRP;
-      /* Kill orphaned children on group leader exit */
-      if (myself->has_pgid_children && myself->pid == myself->pgid)
-	{
-	  sigproc_printf ("%d == pgrp %d, send SIG{HUP,CONT} to stopped children",
-			  myself->pid, myself->pgid);
-	  kill_pgrp (myself->pgid, -SIGHUP);
-	}
-    }
-
-  if (exit_state < ES_HUP_SID)
-    {
-      exit_state = ES_HUP_SID;
-      /* Kill the foreground process group on session leader exit */
-      if (getpgrp () > 0 && myself->pid == myself->sid && real_tty_attached (myself))
-	{
-	  tty *tp = cygwin_shared->tty[myself->ctty];
-	  sigproc_printf ("%d == sid %d, send SIGHUP to children",
-			  myself->pid, myself->sid);
-
-	/* CGF FIXME: This can't be right. */
-	  if (tp->getsid () == myself->sid)
-	    tp->kill_pgrp (SIGHUP);
-	}
-
-    }
-
-  if (exit_state < ES_TTY_TERMINATE)
-    {
-      exit_state = ES_TTY_TERMINATE;
-      tty_terminate ();
-    }
-
-  minimal_printf ("winpid %d, exit %d", GetCurrentProcessId (), n);
-  myself->exit (n);
-}
-
-static muto *atexit_lock;
-
-extern "C" int
-cygwin_atexit (void (*function)(void))
-{
-  int res;
-  if (!atexit_lock)
-    new_muto (atexit_lock);
-  atexit_lock->acquire ();
-  res = atexit (function);
-  atexit_lock->release ();
-  return res;
-}
-
-extern "C" void
-cygwin_exit (int n)
-{
-  if (atexit_lock)
-    atexit_lock->acquire ();
-  exit (n);
-}
-
-extern "C" void
-_exit (int n)
-{
-  do_exit ((DWORD) n & 0xffff);
-}
-
-extern "C" void
-__api_fatal (const char *fmt, ...)
-{
-  char buf[4096];
-  va_list ap;
-
-  va_start (ap, fmt);
-  __small_vsprintf (buf, fmt, ap);
-  va_end (ap);
-  strcat (buf, "\n");
-  int len = strlen (buf);
-  DWORD done;
-  (void) WriteFile (GetStdHandle (STD_ERROR_HANDLE), buf, len, &done, 0);
-
-  /* Make sure that the message shows up on the screen, too, since this is
-     a serious error. */
-  if (GetFileType (GetStdHandle (STD_ERROR_HANDLE)) != FILE_TYPE_CHAR)
-    {
-      HANDLE h = CreateFile ("CONOUT$", GENERIC_READ | GENERIC_WRITE,
-			     FILE_SHARE_WRITE | FILE_SHARE_WRITE,
-			     &sec_none, OPEN_EXISTING, 0, 0);
-      if (h != INVALID_HANDLE_VALUE)
-	(void) WriteFile (h, buf, len, &done, 0);
-    }
-
-  /* We are going down without mercy.  Make sure we reset
-     our process_state. */
-  sigproc_terminate ();
-#ifdef DEBUGGING
-  (void) try_to_debug ();
-#endif
-  myself->exit (1);
-}
-
-void
-multiple_cygwin_problem (const char *what, unsigned magic_version, unsigned version)
-{
-  if (_cygwin_testing && (strstr (what, "proc") || strstr (what, "cygheap")))
-    {
-      child_proc_info->type = _PROC_WHOOPS;
-      return;
-    }
-
-  char buf[1024];
-  if (GetEnvironmentVariable ("CYGWIN_MISMATCH_OK", buf, sizeof (buf)))
-    return;
-
-  if (CYGWIN_VERSION_MAGIC_VERSION (magic_version) == version)
-    system_printf ("%s magic number mismatch detected - %p/%p", what, magic_version, version);
-  else
-    api_fatal ("%s version mismatch detected - %p/%p.\n\
-You have multiple copies of cygwin1.dll on your system.\n\
-Search for cygwin1.dll using the Windows Start->Find/Search facility\n\
-and delete all but the most recent version.  The most recent version *should*\n\
-reside in x:\\cygwin\\bin, where 'x' is the drive on which you have\n\
-installed the cygwin distribution.", what, magic_version, version);
-}
-
-#ifdef DEBUGGING
-void __stdcall
-cygbench (const char *s)
-{
-  char buf[1024];
-  if (GetEnvironmentVariable ("CYGWIN_BENCH", buf, sizeof (buf)))
-    small_printf ("%05d ***** %s : %10d\n", GetCurrentProcessId (), s, strace.microseconds ());
-}
-#endif
diff --git a/winsup/cygwin/debug.cc b/winsup/cygwin/debug.cc
deleted file mode 100644
index 4f1d6dfa3..000000000
--- a/winsup/cygwin/debug.cc
+++ /dev/null
@@ -1,225 +0,0 @@
-/* debug.cc
-
-   Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "sync.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include "perthread.h"
-#include "perprocess.h"
-#include "security.h"
-#include "cygerrno.h"
-#ifdef DEBUGGING
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#endif
-
-#undef CloseHandle
-
-#ifdef DEBUGGING
-/* Here lies extra debugging routines which help track down internal
-   Cygwin problems when compiled with -DDEBUGGING . */
-#include <stdlib.h>
-#define NFREEH (sizeof (cygheap->debug.freeh) / sizeof (cygheap->debug.freeh[0]))
-
-class lock_debug
-{
-  static muto *locker;
-  bool acquired;
- public:
-  lock_debug () : acquired (0)
-  {
-    if (locker && !exit_state)
-      acquired = !!locker->acquire (INFINITE);
-  }
-  void unlock ()
-  {
-    if (locker && acquired)
-      {
-	locker->release ();
-	acquired = false;
-      }
-  }
-  ~lock_debug () {unlock ();}
-  friend void debug_init ();
-};
-
-muto NO_COPY *lock_debug::locker = NULL;
-
-static bool __stdcall mark_closed (const char *, int, HANDLE, const char *, bool);
-
-void
-debug_init ()
-{
-  muto *debug_lock_muto;
-  lock_debug::locker = new_muto (debug_lock_muto);
-}
-
-/* Find a registered handle in the linked list of handles. */
-static handle_list * __stdcall
-find_handle (HANDLE h)
-{
-  handle_list *hl;
-  for (hl = &cygheap->debug.starth; hl->next != NULL; hl = hl->next)
-    if (hl->next->h == h)
-      goto out;
-  cygheap->debug.endh = hl;
-  hl = NULL;
-
-out:
-  return hl;
-}
-
-#ifdef DEBUGGING_AND_FDS_PROTECTED
-void
-setclexec (HANDLE oh, HANDLE nh, bool not_inheriting)
-{
-  handle_list *hl = find_handle (oh);
-  if (hl)
-    {
-      hl = hl->next;
-      hl->inherited = !not_inheriting;
-      hl->h = nh;
-    }
-}
-#endif
-
-/* Create a new handle record */
-static handle_list * __stdcall
-newh ()
-{
-  handle_list *hl;
-  lock_debug here;
-
-  for (hl = cygheap->debug.freeh; hl < cygheap->debug.freeh + NFREEH; hl++)
-    if (hl->name == NULL)
-      return hl;
-
-  return NULL;
-}
-
-/* Add a handle to the linked list of known handles. */
-void __stdcall
-add_handle (const char *func, int ln, HANDLE h, const char *name, bool inh)
-{
-  handle_list *hl;
-  lock_debug here;
-
-  if ((hl = find_handle (h)))
-    {
-      hl = hl->next;
-      if (hl->name == name && hl->func == func && hl->ln == ln)
-	return;
-      system_printf ("%s:%d - multiple attempts to add handle %s<%p>", func,
-		     ln, name, h);
-      system_printf (" previously allocated by %s:%d(%s<%p>) winpid %d",
-		     hl->func, hl->ln, hl->name, hl->h, hl->pid);
-      return;
-    }
-
-  if ((hl = newh ()) == NULL)
-    {
-      here.unlock ();
-      debug_printf ("couldn't allocate memory for %s(%d): %s(%p)",
-		    func, ln, name, h);
-      return;
-    }
-  hl->h = h;
-  hl->name = name;
-  hl->func = func;
-  hl->ln = ln;
-  hl->next = NULL;
-  hl->inherited = inh;
-  hl->pid = GetCurrentProcessId ();
-  cygheap->debug.endh->next = hl;
-  cygheap->debug.endh = hl;
-  debug_printf ("protecting handle '%s', inherited flag %d", hl->name, hl->inherited);
-
-  return;
-}
-
-static void __stdcall
-delete_handle (handle_list *hl)
-{
-  handle_list *hnuke = hl->next;
-  debug_printf ("nuking handle '%s'", hnuke->name);
-  hl->next = hl->next->next;
-  memset (hnuke, 0, sizeof (*hnuke));
-}
-
-void
-debug_fixup_after_fork_exec ()
-{
-  /* No lock needed at this point */
-  handle_list *hl;
-  for (hl = &cygheap->debug.starth; hl->next != NULL; /* nothing */)
-    if (hl->next->inherited)
-      hl = hl->next;
-    else
-      delete_handle (hl);	// removes hl->next
-}
-
-static bool __stdcall
-mark_closed (const char *func, int ln, HANDLE h, const char *name, bool force)
-{
-  handle_list *hl;
-  lock_debug here;
-
-  if ((hl = find_handle (h)) && !force)
-    {
-      hl = hl->next;
-      here.unlock ();	// race here
-      system_printf ("attempt to close protected handle %s:%d(%s<%p>) winpid %d",
-		     hl->func, hl->ln, hl->name, hl->h, hl->pid);
-      system_printf (" by %s:%d(%s<%p>)", func, ln, name, h);
-      return false;
-    }
-
-  handle_list *hln;
-  if (hl && (hln = hl->next) && strcmp (name, hln->name))
-    {
-      system_printf ("closing protected handle %s:%d(%s<%p>)",
-		     hln->func, hln->ln, hln->name, hln->h);
-      system_printf (" by %s:%d(%s<%p>)", func, ln, name, h);
-    }
-
-  if (hl)
-    delete_handle (hl);
-
-  return true;
-}
-
-/* Close a known handle.  Complain if !force and closing a known handle or
-   if the name of the handle being closed does not match the registered name. */
-bool __stdcall
-close_handle (const char *func, int ln, HANDLE h, const char *name, bool force)
-{
-  bool ret;
-  lock_debug here;
-
-  if (!mark_closed (func, ln, h, name, force))
-    return false;
-
-  ret = CloseHandle (h);
-
-#if 0 /* Uncomment to see CloseHandle failures */
-  if (!ret)
-    small_printf ("CloseHandle(%s) failed %s:%d\n", name, func, ln);
-#endif
-  return ret;
-}
-
-int __stdcall
-__set_errno (const char *func, int ln, int val)
-{
-  debug_printf ("%s:%d val %d", func, ln, val);
-  return errno = val;
-}
-#endif /*DEBUGGING*/
diff --git a/winsup/cygwin/debug.h b/winsup/cygwin/debug.h
deleted file mode 100644
index 8941bae75..000000000
--- a/winsup/cygwin/debug.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* debug.h
-
-   Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef MALLOC_DEBUG
-#define MALLOC_CHECK do {} while (0)
-#else
-#include <stdlib.h>
-#include "dlmalloc.h"
-#define MALLOC_CHECK ({\
-  debug_printf ("checking malloc pool");\
-  (void) mallinfo ();\
-})
-#endif
-
-#if !defined(_DEBUG_H_)
-#define _DEBUG_H_
-
-#define being_debugged() \
-  (IsDebuggerPresent () /* || GetLastError () == ERROR_PROC_NOT_FOUND*/)
-
-#ifndef DEBUGGING
-# define cygbench(s)
-# define ForceCloseHandle CloseHandle
-# define ForceCloseHandle1(h, n) CloseHandle (h)
-# define ForceCloseHandle2(h, n) CloseHandle (h)
-# define ProtectHandle(h) do {} while (0)
-# define ProtectHandle1(h,n) do {} while (0)
-# define ProtectHandle2(h,n) do {} while (0)
-# define ProtectHandleINH(h) do {} while (0)
-# define ProtectHandle1INH(h,n) do {} while (0)
-# define ProtectHandle2INH(h,n) do {} while (0)
-# define debug_init() do {} while (0)
-# define setclexec(h, nh, b) do {} while (0)
-# define debug_fixup_after_fork_exec() do {} while (0)
-
-#else
-
-# ifdef NO_DEBUG_DEFINES
-#   undef NO_DEBUG_DEFINES
-# else
-#   define CloseHandle(h) \
-	close_handle (__PRETTY_FUNCTION__, __LINE__, (h), #h, FALSE)
-#   define ForceCloseHandle(h) \
-	close_handle (__PRETTY_FUNCTION__, __LINE__, (h), #h, TRUE)
-#   define ForceCloseHandle1(h,n) \
-	close_handle (__PRETTY_FUNCTION__, __LINE__, (h), #n, TRUE)
-#   define ForceCloseHandle2(h,n) \
-	close_handle (__PRETTY_FUNCTION__, __LINE__, (h), n, TRUE)
-# endif
-
-# define ProtectHandle(h) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), #h)
-# define ProtectHandle1(h, n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), #n)
-# define ProtectHandle2(h, n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), n)
-# define ProtectHandleINH(h) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), #h, 1)
-# define ProtectHandle1INH(h, n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), #n, 1)
-# define ProtectHandle2INH(h, n) add_handle (__PRETTY_FUNCTION__, __LINE__, (h), n, 1)
-
-void debug_init ();
-void __stdcall add_handle (const char *, int, HANDLE, const char *, bool = false)
-  __attribute__ ((regparm (3)));
-bool __stdcall close_handle (const char *, int, HANDLE, const char *, bool)
-  __attribute__ ((regparm (3)));
-void __stdcall cygbench (const char *s) __attribute__ ((regparm (1)));
-extern "C" void console_printf (const char *fmt,...);
-void setclexec (HANDLE, HANDLE, bool);
-void debug_fixup_after_fork_exec ();
-extern int pinger;
-
-struct handle_list
-  {
-    HANDLE h;
-    const char *name;
-    const char *func;
-    int ln;
-    bool inherited;
-    DWORD pid;
-    struct handle_list *next;
-  };
-
-#endif /*DEBUGGING*/
-#endif /*_DEBUG_H_*/
diff --git a/winsup/cygwin/delqueue.cc b/winsup/cygwin/delqueue.cc
deleted file mode 100644
index 76f2d6d19..000000000
--- a/winsup/cygwin/delqueue.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-/* delqueue.cc
-
-   Copyright 1996, 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "shared_info.h"
-
-/* FIXME: this delqueue module is very flawed and should be rewritten.
-	First, having an array of a fixed size for keeping track of the
-	unlinked but not yet deleted files is bad.  Second, some programs
-	will unlink files and then create a new one in the same location
-	and this behavior is not supported in the current code.  Probably
-	we should find a move/rename function that will work on open files,
-	and move delqueue files to some special location or some such
-	hack... */
-
-void
-delqueue_list::init ()
-{
-  empty = 1;
-  memset (inuse, 0, MAX_DELQUEUES_PENDING);
-}
-
-void
-delqueue_list::queue_file (const char *dosname)
-{
-  char temp[CYG_MAX_PATH], *end;
-  GetFullPathName (dosname, sizeof (temp), temp, &end);
-
-  /* Note about race conditions: The only time we get to this point is
-     when a delete fails because someone's holding the descriptor open.
-     In those cases, other programs will be unable to delete the file
-     also, so any entries referring to that file will not be removed
-     from the queue while we're here. */
-
-  if (!empty)
-  {
-    /* check for duplicates */
-    for (int i=0; i < MAX_DELQUEUES_PENDING; i++)
-      if (inuse[i] && strcmp (name[i], temp) == 0)
-	return;
-  }
-
-  for (int i = 0; i < MAX_DELQUEUES_PENDING; i++)
-    if (!inuse[i])
-      {
-	/* set the name first, in case someone else is running the
-	   queue they'll get a valid name */
-	strcpy (name[i], temp);
-	inuse[i] = 1;
-	empty = 0;
-	debug_printf ("adding '%s' to queue %d", temp, i);
-	return;
-      }
-
-  system_printf ("Out of queue slots");
-}
-
-void
-delqueue_list::process_queue ()
-{
-  if (empty)
-    return;
-  /* We set empty to 1 here, rather than later, to avoid a race
-     condition - some other program might queue up a file while we're
-     processing, and it will zero out empty also. */
-  empty = 1; /* but might get set to zero again, below */
-
-  syscall_printf ("Running delqueue");
-
-  for (int i = 0; i < MAX_DELQUEUES_PENDING; i++)
-    if (inuse[i])
-      {
-	if (DeleteFileA (name[i]))
-	  {
-	    syscall_printf ("Deleted %s", name[i]);
-	    inuse[i] = 0;
-	  }
-	else
-	  {
-	    int res = GetLastError ();
-	    empty = 0;
-	    if (res == ERROR_SHARING_VIOLATION ||
-		(wincap.access_denied_on_delete ()
-		 && res == ERROR_ACCESS_DENIED))
-	      {
-		/* File still inuse, that's ok */
-		syscall_printf ("Still using %s", name[i]);
-	      }
-	    else
-	      {
-		syscall_printf ("Hmm, don't know what to do with '%s', %E", name[i]);
-		inuse[i] = 0;
-	      }
-	  }
-      }
-}
diff --git a/winsup/cygwin/devices.cc b/winsup/cygwin/devices.cc
deleted file mode 100644
index b0193d09a..000000000
--- a/winsup/cygwin/devices.cc
+++ /dev/null
@@ -1,14870 +0,0 @@
-
-
-#include "winsup.h"
-#include <sys/types.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include "devices.h"
-#include "sys/cygwin.h"
-#include "tty.h"
-#include "pinfo.h"
-typedef const device *KR_device_t;
-
-
-static KR_device_t KR_find_keyword (const char *KR_keyword, int KR_length);
-
-
-
-const device dev_cygdrive_storage =
-  {"/cygdrive", FH_CYGDRIVE, "/cygdrive"};
-
-const device dev_fs_storage =
-  {"", FH_FS, ""};
-
-const device dev_proc_storage =
-  {"", FH_PROC, ""};
-
-const device dev_registry_storage =
-  {"", FH_REGISTRY, ""};
-
-const device dev_piper_storage =
-  {"", FH_PIPER, ""};
-
-const device dev_pipew_storage =
-  {"", FH_PIPEW, ""};
-
-const device dev_tcp_storage =
-  {"", FH_TCP, ""};
-
-const device dev_udp_storage =
-  {"", FH_UDP, ""};
-
-const device dev_stream_storage =
-  {"", FH_STREAM, ""};
-
-const device dev_dgram_storage =
-  {"", FH_DGRAM, ""};
-
-const device dev_bad_storage =
-  {"", FH_BAD, ""};
-
-static const device dev_storage[] =
-{
-  {"/dev/clipboard", FH_CLIPBOARD, "\\dev\\clipboard"},
-  {"/dev/com0", FHDEV(DEV_SERIAL_MAJOR, 0), "\\.\\com0"},
-  {"/dev/com1", FHDEV(DEV_SERIAL_MAJOR, 1), "\\.\\com1"},
-  {"/dev/com2", FHDEV(DEV_SERIAL_MAJOR, 2), "\\.\\com2"},
-  {"/dev/com3", FHDEV(DEV_SERIAL_MAJOR, 3), "\\.\\com3"},
-  {"/dev/com4", FHDEV(DEV_SERIAL_MAJOR, 4), "\\.\\com4"},
-  {"/dev/com5", FHDEV(DEV_SERIAL_MAJOR, 5), "\\.\\com5"},
-  {"/dev/com6", FHDEV(DEV_SERIAL_MAJOR, 6), "\\.\\com6"},
-  {"/dev/com7", FHDEV(DEV_SERIAL_MAJOR, 7), "\\.\\com7"},
-  {"/dev/com8", FHDEV(DEV_SERIAL_MAJOR, 8), "\\.\\com8"},
-  {"/dev/com9", FHDEV(DEV_SERIAL_MAJOR, 9), "\\.\\com9"},
-  {"/dev/com10", FHDEV(DEV_SERIAL_MAJOR, 10), "\\.\\com10"},
-  {"/dev/com11", FHDEV(DEV_SERIAL_MAJOR, 11), "\\.\\com11"},
-  {"/dev/com12", FHDEV(DEV_SERIAL_MAJOR, 12), "\\.\\com12"},
-  {"/dev/com13", FHDEV(DEV_SERIAL_MAJOR, 13), "\\.\\com13"},
-  {"/dev/com14", FHDEV(DEV_SERIAL_MAJOR, 14), "\\.\\com14"},
-  {"/dev/com15", FHDEV(DEV_SERIAL_MAJOR, 15), "\\.\\com15"},
-  {"/dev/com16", FHDEV(DEV_SERIAL_MAJOR, 16), "\\.\\com16"},
-  {"/dev/conin", FH_CONIN, "conin"},
-  {"/dev/conout", FH_CONOUT, "conout"},
-  {"/dev/console", FH_CONSOLE, "\\dev\\console"},
-  {"/dev/dsp", FH_OSS_DSP, "\\dev\\dsp"},
-  {"/dev/fd0", FHDEV(DEV_FLOPPY_MAJOR, 0), "\\Device\\Floppy0"},
-  {"/dev/fd1", FHDEV(DEV_FLOPPY_MAJOR, 1), "\\Device\\Floppy1"},
-  {"/dev/fd2", FHDEV(DEV_FLOPPY_MAJOR, 2), "\\Device\\Floppy2"},
-  {"/dev/fd3", FHDEV(DEV_FLOPPY_MAJOR, 3), "\\Device\\Floppy3"},
-  {"/dev/fd4", FHDEV(DEV_FLOPPY_MAJOR, 4), "\\Device\\Floppy4"},
-  {"/dev/fd5", FHDEV(DEV_FLOPPY_MAJOR, 5), "\\Device\\Floppy5"},
-  {"/dev/fd6", FHDEV(DEV_FLOPPY_MAJOR, 6), "\\Device\\Floppy6"},
-  {"/dev/fd7", FHDEV(DEV_FLOPPY_MAJOR, 7), "\\Device\\Floppy7"},
-  {"/dev/fd8", FHDEV(DEV_FLOPPY_MAJOR, 8), "\\Device\\Floppy8"},
-  {"/dev/fd9", FHDEV(DEV_FLOPPY_MAJOR, 9), "\\Device\\Floppy9"},
-  {"/dev/fd10", FHDEV(DEV_FLOPPY_MAJOR, 10), "\\Device\\Floppy10"},
-  {"/dev/fd11", FHDEV(DEV_FLOPPY_MAJOR, 11), "\\Device\\Floppy11"},
-  {"/dev/fd12", FHDEV(DEV_FLOPPY_MAJOR, 12), "\\Device\\Floppy12"},
-  {"/dev/fd13", FHDEV(DEV_FLOPPY_MAJOR, 13), "\\Device\\Floppy13"},
-  {"/dev/fd14", FHDEV(DEV_FLOPPY_MAJOR, 14), "\\Device\\Floppy14"},
-  {"/dev/fd15", FHDEV(DEV_FLOPPY_MAJOR, 15), "\\Device\\Floppy15"},
-  {"/dev/fifo", FH_FIFO, "\\dev\\fifo"},
-  {"/dev/kmem", FH_KMEM, "\\dev\\mem"},
-  {"/dev/mem", FH_MEM, "\\dev\\mem"},
-  {"/dev/nst0", FHDEV(DEV_TAPE_MAJOR, 128), "\\Device\\Tape0"},
-  {"/dev/nst1", FHDEV(DEV_TAPE_MAJOR, 129), "\\Device\\Tape1"},
-  {"/dev/nst2", FHDEV(DEV_TAPE_MAJOR, 130), "\\Device\\Tape2"},
-  {"/dev/nst3", FHDEV(DEV_TAPE_MAJOR, 131), "\\Device\\Tape3"},
-  {"/dev/nst4", FHDEV(DEV_TAPE_MAJOR, 132), "\\Device\\Tape4"},
-  {"/dev/nst5", FHDEV(DEV_TAPE_MAJOR, 133), "\\Device\\Tape5"},
-  {"/dev/nst6", FHDEV(DEV_TAPE_MAJOR, 134), "\\Device\\Tape6"},
-  {"/dev/nst7", FHDEV(DEV_TAPE_MAJOR, 135), "\\Device\\Tape7"},
-  {"/dev/nst8", FHDEV(DEV_TAPE_MAJOR, 136), "\\Device\\Tape8"},
-  {"/dev/nst9", FHDEV(DEV_TAPE_MAJOR, 137), "\\Device\\Tape9"},
-  {"/dev/nst10", FHDEV(DEV_TAPE_MAJOR, 138), "\\Device\\Tape10"},
-  {"/dev/nst11", FHDEV(DEV_TAPE_MAJOR, 139), "\\Device\\Tape11"},
-  {"/dev/nst12", FHDEV(DEV_TAPE_MAJOR, 140), "\\Device\\Tape12"},
-  {"/dev/nst13", FHDEV(DEV_TAPE_MAJOR, 141), "\\Device\\Tape13"},
-  {"/dev/nst14", FHDEV(DEV_TAPE_MAJOR, 142), "\\Device\\Tape14"},
-  {"/dev/nst15", FHDEV(DEV_TAPE_MAJOR, 143), "\\Device\\Tape15"},
-  {"/dev/nst16", FHDEV(DEV_TAPE_MAJOR, 144), "\\Device\\Tape16"},
-  {"/dev/nst17", FHDEV(DEV_TAPE_MAJOR, 145), "\\Device\\Tape17"},
-  {"/dev/nst18", FHDEV(DEV_TAPE_MAJOR, 146), "\\Device\\Tape18"},
-  {"/dev/nst19", FHDEV(DEV_TAPE_MAJOR, 147), "\\Device\\Tape19"},
-  {"/dev/nst20", FHDEV(DEV_TAPE_MAJOR, 148), "\\Device\\Tape20"},
-  {"/dev/nst21", FHDEV(DEV_TAPE_MAJOR, 149), "\\Device\\Tape21"},
-  {"/dev/nst22", FHDEV(DEV_TAPE_MAJOR, 150), "\\Device\\Tape22"},
-  {"/dev/nst23", FHDEV(DEV_TAPE_MAJOR, 151), "\\Device\\Tape23"},
-  {"/dev/nst24", FHDEV(DEV_TAPE_MAJOR, 152), "\\Device\\Tape24"},
-  {"/dev/nst25", FHDEV(DEV_TAPE_MAJOR, 153), "\\Device\\Tape25"},
-  {"/dev/nst26", FHDEV(DEV_TAPE_MAJOR, 154), "\\Device\\Tape26"},
-  {"/dev/nst27", FHDEV(DEV_TAPE_MAJOR, 155), "\\Device\\Tape27"},
-  {"/dev/nst28", FHDEV(DEV_TAPE_MAJOR, 156), "\\Device\\Tape28"},
-  {"/dev/nst29", FHDEV(DEV_TAPE_MAJOR, 157), "\\Device\\Tape29"},
-  {"/dev/nst30", FHDEV(DEV_TAPE_MAJOR, 158), "\\Device\\Tape30"},
-  {"/dev/nst31", FHDEV(DEV_TAPE_MAJOR, 159), "\\Device\\Tape31"},
-  {"/dev/nst32", FHDEV(DEV_TAPE_MAJOR, 160), "\\Device\\Tape32"},
-  {"/dev/nst33", FHDEV(DEV_TAPE_MAJOR, 161), "\\Device\\Tape33"},
-  {"/dev/nst34", FHDEV(DEV_TAPE_MAJOR, 162), "\\Device\\Tape34"},
-  {"/dev/nst35", FHDEV(DEV_TAPE_MAJOR, 163), "\\Device\\Tape35"},
-  {"/dev/nst36", FHDEV(DEV_TAPE_MAJOR, 164), "\\Device\\Tape36"},
-  {"/dev/nst37", FHDEV(DEV_TAPE_MAJOR, 165), "\\Device\\Tape37"},
-  {"/dev/nst38", FHDEV(DEV_TAPE_MAJOR, 166), "\\Device\\Tape38"},
-  {"/dev/nst39", FHDEV(DEV_TAPE_MAJOR, 167), "\\Device\\Tape39"},
-  {"/dev/nst40", FHDEV(DEV_TAPE_MAJOR, 168), "\\Device\\Tape40"},
-  {"/dev/nst41", FHDEV(DEV_TAPE_MAJOR, 169), "\\Device\\Tape41"},
-  {"/dev/nst42", FHDEV(DEV_TAPE_MAJOR, 170), "\\Device\\Tape42"},
-  {"/dev/nst43", FHDEV(DEV_TAPE_MAJOR, 171), "\\Device\\Tape43"},
-  {"/dev/nst44", FHDEV(DEV_TAPE_MAJOR, 172), "\\Device\\Tape44"},
-  {"/dev/nst45", FHDEV(DEV_TAPE_MAJOR, 173), "\\Device\\Tape45"},
-  {"/dev/nst46", FHDEV(DEV_TAPE_MAJOR, 174), "\\Device\\Tape46"},
-  {"/dev/nst47", FHDEV(DEV_TAPE_MAJOR, 175), "\\Device\\Tape47"},
-  {"/dev/nst48", FHDEV(DEV_TAPE_MAJOR, 176), "\\Device\\Tape48"},
-  {"/dev/nst49", FHDEV(DEV_TAPE_MAJOR, 177), "\\Device\\Tape49"},
-  {"/dev/nst50", FHDEV(DEV_TAPE_MAJOR, 178), "\\Device\\Tape50"},
-  {"/dev/nst51", FHDEV(DEV_TAPE_MAJOR, 179), "\\Device\\Tape51"},
-  {"/dev/nst52", FHDEV(DEV_TAPE_MAJOR, 180), "\\Device\\Tape52"},
-  {"/dev/nst53", FHDEV(DEV_TAPE_MAJOR, 181), "\\Device\\Tape53"},
-  {"/dev/nst54", FHDEV(DEV_TAPE_MAJOR, 182), "\\Device\\Tape54"},
-  {"/dev/nst55", FHDEV(DEV_TAPE_MAJOR, 183), "\\Device\\Tape55"},
-  {"/dev/nst56", FHDEV(DEV_TAPE_MAJOR, 184), "\\Device\\Tape56"},
-  {"/dev/nst57", FHDEV(DEV_TAPE_MAJOR, 185), "\\Device\\Tape57"},
-  {"/dev/nst58", FHDEV(DEV_TAPE_MAJOR, 186), "\\Device\\Tape58"},
-  {"/dev/nst59", FHDEV(DEV_TAPE_MAJOR, 187), "\\Device\\Tape59"},
-  {"/dev/nst60", FHDEV(DEV_TAPE_MAJOR, 188), "\\Device\\Tape60"},
-  {"/dev/nst61", FHDEV(DEV_TAPE_MAJOR, 189), "\\Device\\Tape61"},
-  {"/dev/nst62", FHDEV(DEV_TAPE_MAJOR, 190), "\\Device\\Tape62"},
-  {"/dev/nst63", FHDEV(DEV_TAPE_MAJOR, 191), "\\Device\\Tape63"},
-  {"/dev/nst64", FHDEV(DEV_TAPE_MAJOR, 192), "\\Device\\Tape64"},
-  {"/dev/nst65", FHDEV(DEV_TAPE_MAJOR, 193), "\\Device\\Tape65"},
-  {"/dev/nst66", FHDEV(DEV_TAPE_MAJOR, 194), "\\Device\\Tape66"},
-  {"/dev/nst67", FHDEV(DEV_TAPE_MAJOR, 195), "\\Device\\Tape67"},
-  {"/dev/nst68", FHDEV(DEV_TAPE_MAJOR, 196), "\\Device\\Tape68"},
-  {"/dev/nst69", FHDEV(DEV_TAPE_MAJOR, 197), "\\Device\\Tape69"},
-  {"/dev/nst70", FHDEV(DEV_TAPE_MAJOR, 198), "\\Device\\Tape70"},
-  {"/dev/nst71", FHDEV(DEV_TAPE_MAJOR, 199), "\\Device\\Tape71"},
-  {"/dev/nst72", FHDEV(DEV_TAPE_MAJOR, 200), "\\Device\\Tape72"},
-  {"/dev/nst73", FHDEV(DEV_TAPE_MAJOR, 201), "\\Device\\Tape73"},
-  {"/dev/nst74", FHDEV(DEV_TAPE_MAJOR, 202), "\\Device\\Tape74"},
-  {"/dev/nst75", FHDEV(DEV_TAPE_MAJOR, 203), "\\Device\\Tape75"},
-  {"/dev/nst76", FHDEV(DEV_TAPE_MAJOR, 204), "\\Device\\Tape76"},
-  {"/dev/nst77", FHDEV(DEV_TAPE_MAJOR, 205), "\\Device\\Tape77"},
-  {"/dev/nst78", FHDEV(DEV_TAPE_MAJOR, 206), "\\Device\\Tape78"},
-  {"/dev/nst79", FHDEV(DEV_TAPE_MAJOR, 207), "\\Device\\Tape79"},
-  {"/dev/nst80", FHDEV(DEV_TAPE_MAJOR, 208), "\\Device\\Tape80"},
-  {"/dev/nst81", FHDEV(DEV_TAPE_MAJOR, 209), "\\Device\\Tape81"},
-  {"/dev/nst82", FHDEV(DEV_TAPE_MAJOR, 210), "\\Device\\Tape82"},
-  {"/dev/nst83", FHDEV(DEV_TAPE_MAJOR, 211), "\\Device\\Tape83"},
-  {"/dev/nst84", FHDEV(DEV_TAPE_MAJOR, 212), "\\Device\\Tape84"},
-  {"/dev/nst85", FHDEV(DEV_TAPE_MAJOR, 213), "\\Device\\Tape85"},
-  {"/dev/nst86", FHDEV(DEV_TAPE_MAJOR, 214), "\\Device\\Tape86"},
-  {"/dev/nst87", FHDEV(DEV_TAPE_MAJOR, 215), "\\Device\\Tape87"},
-  {"/dev/nst88", FHDEV(DEV_TAPE_MAJOR, 216), "\\Device\\Tape88"},
-  {"/dev/nst89", FHDEV(DEV_TAPE_MAJOR, 217), "\\Device\\Tape89"},
-  {"/dev/nst90", FHDEV(DEV_TAPE_MAJOR, 218), "\\Device\\Tape90"},
-  {"/dev/nst91", FHDEV(DEV_TAPE_MAJOR, 219), "\\Device\\Tape91"},
-  {"/dev/nst92", FHDEV(DEV_TAPE_MAJOR, 220), "\\Device\\Tape92"},
-  {"/dev/nst93", FHDEV(DEV_TAPE_MAJOR, 221), "\\Device\\Tape93"},
-  {"/dev/nst94", FHDEV(DEV_TAPE_MAJOR, 222), "\\Device\\Tape94"},
-  {"/dev/nst95", FHDEV(DEV_TAPE_MAJOR, 223), "\\Device\\Tape95"},
-  {"/dev/nst96", FHDEV(DEV_TAPE_MAJOR, 224), "\\Device\\Tape96"},
-  {"/dev/nst97", FHDEV(DEV_TAPE_MAJOR, 225), "\\Device\\Tape97"},
-  {"/dev/nst98", FHDEV(DEV_TAPE_MAJOR, 226), "\\Device\\Tape98"},
-  {"/dev/nst99", FHDEV(DEV_TAPE_MAJOR, 227), "\\Device\\Tape99"},
-  {"/dev/nst100", FHDEV(DEV_TAPE_MAJOR, 228), "\\Device\\Tape100"},
-  {"/dev/nst101", FHDEV(DEV_TAPE_MAJOR, 229), "\\Device\\Tape101"},
-  {"/dev/nst102", FHDEV(DEV_TAPE_MAJOR, 230), "\\Device\\Tape102"},
-  {"/dev/nst103", FHDEV(DEV_TAPE_MAJOR, 231), "\\Device\\Tape103"},
-  {"/dev/nst104", FHDEV(DEV_TAPE_MAJOR, 232), "\\Device\\Tape104"},
-  {"/dev/nst105", FHDEV(DEV_TAPE_MAJOR, 233), "\\Device\\Tape105"},
-  {"/dev/nst106", FHDEV(DEV_TAPE_MAJOR, 234), "\\Device\\Tape106"},
-  {"/dev/nst107", FHDEV(DEV_TAPE_MAJOR, 235), "\\Device\\Tape107"},
-  {"/dev/nst108", FHDEV(DEV_TAPE_MAJOR, 236), "\\Device\\Tape108"},
-  {"/dev/nst109", FHDEV(DEV_TAPE_MAJOR, 237), "\\Device\\Tape109"},
-  {"/dev/nst110", FHDEV(DEV_TAPE_MAJOR, 238), "\\Device\\Tape110"},
-  {"/dev/nst111", FHDEV(DEV_TAPE_MAJOR, 239), "\\Device\\Tape111"},
-  {"/dev/nst112", FHDEV(DEV_TAPE_MAJOR, 240), "\\Device\\Tape112"},
-  {"/dev/nst113", FHDEV(DEV_TAPE_MAJOR, 241), "\\Device\\Tape113"},
-  {"/dev/nst114", FHDEV(DEV_TAPE_MAJOR, 242), "\\Device\\Tape114"},
-  {"/dev/nst115", FHDEV(DEV_TAPE_MAJOR, 243), "\\Device\\Tape115"},
-  {"/dev/nst116", FHDEV(DEV_TAPE_MAJOR, 244), "\\Device\\Tape116"},
-  {"/dev/nst117", FHDEV(DEV_TAPE_MAJOR, 245), "\\Device\\Tape117"},
-  {"/dev/nst118", FHDEV(DEV_TAPE_MAJOR, 246), "\\Device\\Tape118"},
-  {"/dev/nst119", FHDEV(DEV_TAPE_MAJOR, 247), "\\Device\\Tape119"},
-  {"/dev/nst120", FHDEV(DEV_TAPE_MAJOR, 248), "\\Device\\Tape120"},
-  {"/dev/nst121", FHDEV(DEV_TAPE_MAJOR, 249), "\\Device\\Tape121"},
-  {"/dev/nst122", FHDEV(DEV_TAPE_MAJOR, 250), "\\Device\\Tape122"},
-  {"/dev/nst123", FHDEV(DEV_TAPE_MAJOR, 251), "\\Device\\Tape123"},
-  {"/dev/nst124", FHDEV(DEV_TAPE_MAJOR, 252), "\\Device\\Tape124"},
-  {"/dev/nst125", FHDEV(DEV_TAPE_MAJOR, 253), "\\Device\\Tape125"},
-  {"/dev/nst126", FHDEV(DEV_TAPE_MAJOR, 254), "\\Device\\Tape126"},
-  {"/dev/nst127", FHDEV(DEV_TAPE_MAJOR, 255), "\\Device\\Tape127"},
-  {"/dev/null", FH_NULL, "nul"},
-  {"/dev/pipe", FH_PIPE, "\\dev\\pipe"},
-  {"/dev/port", FH_PORT, "\\dev\\port"},
-  {"/dev/ptmx", FH_PTYM, "\\dev\\ptmx"},
-  {"/dev/random", FH_RANDOM, "\\dev\\random"},
-  {"/dev/scd0", FHDEV(DEV_CDROM_MAJOR, 0), "\\Device\\CdRom0"},
-  {"/dev/scd1", FHDEV(DEV_CDROM_MAJOR, 1), "\\Device\\CdRom1"},
-  {"/dev/scd2", FHDEV(DEV_CDROM_MAJOR, 2), "\\Device\\CdRom2"},
-  {"/dev/scd3", FHDEV(DEV_CDROM_MAJOR, 3), "\\Device\\CdRom3"},
-  {"/dev/scd4", FHDEV(DEV_CDROM_MAJOR, 4), "\\Device\\CdRom4"},
-  {"/dev/scd5", FHDEV(DEV_CDROM_MAJOR, 5), "\\Device\\CdRom5"},
-  {"/dev/scd6", FHDEV(DEV_CDROM_MAJOR, 6), "\\Device\\CdRom6"},
-  {"/dev/scd7", FHDEV(DEV_CDROM_MAJOR, 7), "\\Device\\CdRom7"},
-  {"/dev/scd8", FHDEV(DEV_CDROM_MAJOR, 8), "\\Device\\CdRom8"},
-  {"/dev/scd9", FHDEV(DEV_CDROM_MAJOR, 9), "\\Device\\CdRom9"},
-  {"/dev/scd10", FHDEV(DEV_CDROM_MAJOR, 10), "\\Device\\CdRom10"},
-  {"/dev/scd11", FHDEV(DEV_CDROM_MAJOR, 11), "\\Device\\CdRom11"},
-  {"/dev/scd12", FHDEV(DEV_CDROM_MAJOR, 12), "\\Device\\CdRom12"},
-  {"/dev/scd13", FHDEV(DEV_CDROM_MAJOR, 13), "\\Device\\CdRom13"},
-  {"/dev/scd14", FHDEV(DEV_CDROM_MAJOR, 14), "\\Device\\CdRom14"},
-  {"/dev/scd15", FHDEV(DEV_CDROM_MAJOR, 15), "\\Device\\CdRom15"},
-  {"/dev/sda", FH_SDA, "\\Device\\Harddisk0\\Partition0"},
-  {"/dev/sdb", FH_SDB, "\\Device\\Harddisk1\\Partition0"},
-  {"/dev/sdc", FH_SDC, "\\Device\\Harddisk2\\Partition0"},
-  {"/dev/sdd", FH_SDD, "\\Device\\Harddisk3\\Partition0"},
-  {"/dev/sde", FH_SDE, "\\Device\\Harddisk4\\Partition0"},
-  {"/dev/sdf", FH_SDF, "\\Device\\Harddisk5\\Partition0"},
-  {"/dev/sdg", FH_SDG, "\\Device\\Harddisk6\\Partition0"},
-  {"/dev/sdh", FH_SDH, "\\Device\\Harddisk7\\Partition0"},
-  {"/dev/sdi", FH_SDI, "\\Device\\Harddisk8\\Partition0"},
-  {"/dev/sdj", FH_SDJ, "\\Device\\Harddisk9\\Partition0"},
-  {"/dev/sdk", FH_SDK, "\\Device\\Harddisk10\\Partition0"},
-  {"/dev/sdl", FH_SDL, "\\Device\\Harddisk11\\Partition0"},
-  {"/dev/sdm", FH_SDM, "\\Device\\Harddisk12\\Partition0"},
-  {"/dev/sdn", FH_SDN, "\\Device\\Harddisk13\\Partition0"},
-  {"/dev/sdo", FH_SDO, "\\Device\\Harddisk14\\Partition0"},
-  {"/dev/sdp", FH_SDP, "\\Device\\Harddisk15\\Partition0"},
-  {"/dev/sdq", FH_SDQ, "\\Device\\Harddisk16\\Partition0"},
-  {"/dev/sdr", FH_SDR, "\\Device\\Harddisk17\\Partition0"},
-  {"/dev/sds", FH_SDS, "\\Device\\Harddisk18\\Partition0"},
-  {"/dev/sdt", FH_SDT, "\\Device\\Harddisk19\\Partition0"},
-  {"/dev/sdu", FH_SDU, "\\Device\\Harddisk20\\Partition0"},
-  {"/dev/sdv", FH_SDV, "\\Device\\Harddisk21\\Partition0"},
-  {"/dev/sdw", FH_SDW, "\\Device\\Harddisk22\\Partition0"},
-  {"/dev/sdx", FH_SDX, "\\Device\\Harddisk23\\Partition0"},
-  {"/dev/sdy", FH_SDY, "\\Device\\Harddisk24\\Partition0"},
-  {"/dev/sdz", FH_SDZ, "\\Device\\Harddisk25\\Partition0"},
-  {"/dev/sda1", FH_SDA | 1, "\\Device\\Harddisk0\\Partition1"},
-  {"/dev/sda2", FH_SDA | 2, "\\Device\\Harddisk0\\Partition2"},
-  {"/dev/sda3", FH_SDA | 3, "\\Device\\Harddisk0\\Partition3"},
-  {"/dev/sda4", FH_SDA | 4, "\\Device\\Harddisk0\\Partition4"},
-  {"/dev/sda5", FH_SDA | 5, "\\Device\\Harddisk0\\Partition5"},
-  {"/dev/sda6", FH_SDA | 6, "\\Device\\Harddisk0\\Partition6"},
-  {"/dev/sda7", FH_SDA | 7, "\\Device\\Harddisk0\\Partition7"},
-  {"/dev/sda8", FH_SDA | 8, "\\Device\\Harddisk0\\Partition8"},
-  {"/dev/sda9", FH_SDA | 9, "\\Device\\Harddisk0\\Partition9"},
-  {"/dev/sda10", FH_SDA | 10, "\\Device\\Harddisk0\\Partition10"},
-  {"/dev/sda11", FH_SDA | 11, "\\Device\\Harddisk0\\Partition11"},
-  {"/dev/sda12", FH_SDA | 12, "\\Device\\Harddisk0\\Partition12"},
-  {"/dev/sda13", FH_SDA | 13, "\\Device\\Harddisk0\\Partition13"},
-  {"/dev/sda14", FH_SDA | 14, "\\Device\\Harddisk0\\Partition14"},
-  {"/dev/sda15", FH_SDA | 15, "\\Device\\Harddisk0\\Partition15"},
-  {"/dev/sdb1", FH_SDB | 1, "\\Device\\Harddisk1\\Partition1"},
-  {"/dev/sdb2", FH_SDB | 2, "\\Device\\Harddisk1\\Partition2"},
-  {"/dev/sdb3", FH_SDB | 3, "\\Device\\Harddisk1\\Partition3"},
-  {"/dev/sdb4", FH_SDB | 4, "\\Device\\Harddisk1\\Partition4"},
-  {"/dev/sdb5", FH_SDB | 5, "\\Device\\Harddisk1\\Partition5"},
-  {"/dev/sdb6", FH_SDB | 6, "\\Device\\Harddisk1\\Partition6"},
-  {"/dev/sdb7", FH_SDB | 7, "\\Device\\Harddisk1\\Partition7"},
-  {"/dev/sdb8", FH_SDB | 8, "\\Device\\Harddisk1\\Partition8"},
-  {"/dev/sdb9", FH_SDB | 9, "\\Device\\Harddisk1\\Partition9"},
-  {"/dev/sdb10", FH_SDB | 10, "\\Device\\Harddisk1\\Partition10"},
-  {"/dev/sdb11", FH_SDB | 11, "\\Device\\Harddisk1\\Partition11"},
-  {"/dev/sdb12", FH_SDB | 12, "\\Device\\Harddisk1\\Partition12"},
-  {"/dev/sdb13", FH_SDB | 13, "\\Device\\Harddisk1\\Partition13"},
-  {"/dev/sdb14", FH_SDB | 14, "\\Device\\Harddisk1\\Partition14"},
-  {"/dev/sdb15", FH_SDB | 15, "\\Device\\Harddisk1\\Partition15"},
-  {"/dev/sdc1", FH_SDC | 1, "\\Device\\Harddisk2\\Partition1"},
-  {"/dev/sdc2", FH_SDC | 2, "\\Device\\Harddisk2\\Partition2"},
-  {"/dev/sdc3", FH_SDC | 3, "\\Device\\Harddisk2\\Partition3"},
-  {"/dev/sdc4", FH_SDC | 4, "\\Device\\Harddisk2\\Partition4"},
-  {"/dev/sdc5", FH_SDC | 5, "\\Device\\Harddisk2\\Partition5"},
-  {"/dev/sdc6", FH_SDC | 6, "\\Device\\Harddisk2\\Partition6"},
-  {"/dev/sdc7", FH_SDC | 7, "\\Device\\Harddisk2\\Partition7"},
-  {"/dev/sdc8", FH_SDC | 8, "\\Device\\Harddisk2\\Partition8"},
-  {"/dev/sdc9", FH_SDC | 9, "\\Device\\Harddisk2\\Partition9"},
-  {"/dev/sdc10", FH_SDC | 10, "\\Device\\Harddisk2\\Partition10"},
-  {"/dev/sdc11", FH_SDC | 11, "\\Device\\Harddisk2\\Partition11"},
-  {"/dev/sdc12", FH_SDC | 12, "\\Device\\Harddisk2\\Partition12"},
-  {"/dev/sdc13", FH_SDC | 13, "\\Device\\Harddisk2\\Partition13"},
-  {"/dev/sdc14", FH_SDC | 14, "\\Device\\Harddisk2\\Partition14"},
-  {"/dev/sdc15", FH_SDC | 15, "\\Device\\Harddisk2\\Partition15"},
-  {"/dev/sdd1", FH_SDD | 1, "\\Device\\Harddisk3\\Partition1"},
-  {"/dev/sdd2", FH_SDD | 2, "\\Device\\Harddisk3\\Partition2"},
-  {"/dev/sdd3", FH_SDD | 3, "\\Device\\Harddisk3\\Partition3"},
-  {"/dev/sdd4", FH_SDD | 4, "\\Device\\Harddisk3\\Partition4"},
-  {"/dev/sdd5", FH_SDD | 5, "\\Device\\Harddisk3\\Partition5"},
-  {"/dev/sdd6", FH_SDD | 6, "\\Device\\Harddisk3\\Partition6"},
-  {"/dev/sdd7", FH_SDD | 7, "\\Device\\Harddisk3\\Partition7"},
-  {"/dev/sdd8", FH_SDD | 8, "\\Device\\Harddisk3\\Partition8"},
-  {"/dev/sdd9", FH_SDD | 9, "\\Device\\Harddisk3\\Partition9"},
-  {"/dev/sdd10", FH_SDD | 10, "\\Device\\Harddisk3\\Partition10"},
-  {"/dev/sdd11", FH_SDD | 11, "\\Device\\Harddisk3\\Partition11"},
-  {"/dev/sdd12", FH_SDD | 12, "\\Device\\Harddisk3\\Partition12"},
-  {"/dev/sdd13", FH_SDD | 13, "\\Device\\Harddisk3\\Partition13"},
-  {"/dev/sdd14", FH_SDD | 14, "\\Device\\Harddisk3\\Partition14"},
-  {"/dev/sdd15", FH_SDD | 15, "\\Device\\Harddisk3\\Partition15"},
-  {"/dev/sde1", FH_SDE | 1, "\\Device\\Harddisk4\\Partition1"},
-  {"/dev/sde2", FH_SDE | 2, "\\Device\\Harddisk4\\Partition2"},
-  {"/dev/sde3", FH_SDE | 3, "\\Device\\Harddisk4\\Partition3"},
-  {"/dev/sde4", FH_SDE | 4, "\\Device\\Harddisk4\\Partition4"},
-  {"/dev/sde5", FH_SDE | 5, "\\Device\\Harddisk4\\Partition5"},
-  {"/dev/sde6", FH_SDE | 6, "\\Device\\Harddisk4\\Partition6"},
-  {"/dev/sde7", FH_SDE | 7, "\\Device\\Harddisk4\\Partition7"},
-  {"/dev/sde8", FH_SDE | 8, "\\Device\\Harddisk4\\Partition8"},
-  {"/dev/sde9", FH_SDE | 9, "\\Device\\Harddisk4\\Partition9"},
-  {"/dev/sde10", FH_SDE | 10, "\\Device\\Harddisk4\\Partition10"},
-  {"/dev/sde11", FH_SDE | 11, "\\Device\\Harddisk4\\Partition11"},
-  {"/dev/sde12", FH_SDE | 12, "\\Device\\Harddisk4\\Partition12"},
-  {"/dev/sde13", FH_SDE | 13, "\\Device\\Harddisk4\\Partition13"},
-  {"/dev/sde14", FH_SDE | 14, "\\Device\\Harddisk4\\Partition14"},
-  {"/dev/sde15", FH_SDE | 15, "\\Device\\Harddisk4\\Partition15"},
-  {"/dev/sdf1", FH_SDF | 1, "\\Device\\Harddisk5\\Partition1"},
-  {"/dev/sdf2", FH_SDF | 2, "\\Device\\Harddisk5\\Partition2"},
-  {"/dev/sdf3", FH_SDF | 3, "\\Device\\Harddisk5\\Partition3"},
-  {"/dev/sdf4", FH_SDF | 4, "\\Device\\Harddisk5\\Partition4"},
-  {"/dev/sdf5", FH_SDF | 5, "\\Device\\Harddisk5\\Partition5"},
-  {"/dev/sdf6", FH_SDF | 6, "\\Device\\Harddisk5\\Partition6"},
-  {"/dev/sdf7", FH_SDF | 7, "\\Device\\Harddisk5\\Partition7"},
-  {"/dev/sdf8", FH_SDF | 8, "\\Device\\Harddisk5\\Partition8"},
-  {"/dev/sdf9", FH_SDF | 9, "\\Device\\Harddisk5\\Partition9"},
-  {"/dev/sdf10", FH_SDF | 10, "\\Device\\Harddisk5\\Partition10"},
-  {"/dev/sdf11", FH_SDF | 11, "\\Device\\Harddisk5\\Partition11"},
-  {"/dev/sdf12", FH_SDF | 12, "\\Device\\Harddisk5\\Partition12"},
-  {"/dev/sdf13", FH_SDF | 13, "\\Device\\Harddisk5\\Partition13"},
-  {"/dev/sdf14", FH_SDF | 14, "\\Device\\Harddisk5\\Partition14"},
-  {"/dev/sdf15", FH_SDF | 15, "\\Device\\Harddisk5\\Partition15"},
-  {"/dev/sdg1", FH_SDG | 1, "\\Device\\Harddisk6\\Partition1"},
-  {"/dev/sdg2", FH_SDG | 2, "\\Device\\Harddisk6\\Partition2"},
-  {"/dev/sdg3", FH_SDG | 3, "\\Device\\Harddisk6\\Partition3"},
-  {"/dev/sdg4", FH_SDG | 4, "\\Device\\Harddisk6\\Partition4"},
-  {"/dev/sdg5", FH_SDG | 5, "\\Device\\Harddisk6\\Partition5"},
-  {"/dev/sdg6", FH_SDG | 6, "\\Device\\Harddisk6\\Partition6"},
-  {"/dev/sdg7", FH_SDG | 7, "\\Device\\Harddisk6\\Partition7"},
-  {"/dev/sdg8", FH_SDG | 8, "\\Device\\Harddisk6\\Partition8"},
-  {"/dev/sdg9", FH_SDG | 9, "\\Device\\Harddisk6\\Partition9"},
-  {"/dev/sdg10", FH_SDG | 10, "\\Device\\Harddisk6\\Partition10"},
-  {"/dev/sdg11", FH_SDG | 11, "\\Device\\Harddisk6\\Partition11"},
-  {"/dev/sdg12", FH_SDG | 12, "\\Device\\Harddisk6\\Partition12"},
-  {"/dev/sdg13", FH_SDG | 13, "\\Device\\Harddisk6\\Partition13"},
-  {"/dev/sdg14", FH_SDG | 14, "\\Device\\Harddisk6\\Partition14"},
-  {"/dev/sdg15", FH_SDG | 15, "\\Device\\Harddisk6\\Partition15"},
-  {"/dev/sdh1", FH_SDH | 1, "\\Device\\Harddisk7\\Partition1"},
-  {"/dev/sdh2", FH_SDH | 2, "\\Device\\Harddisk7\\Partition2"},
-  {"/dev/sdh3", FH_SDH | 3, "\\Device\\Harddisk7\\Partition3"},
-  {"/dev/sdh4", FH_SDH | 4, "\\Device\\Harddisk7\\Partition4"},
-  {"/dev/sdh5", FH_SDH | 5, "\\Device\\Harddisk7\\Partition5"},
-  {"/dev/sdh6", FH_SDH | 6, "\\Device\\Harddisk7\\Partition6"},
-  {"/dev/sdh7", FH_SDH | 7, "\\Device\\Harddisk7\\Partition7"},
-  {"/dev/sdh8", FH_SDH | 8, "\\Device\\Harddisk7\\Partition8"},
-  {"/dev/sdh9", FH_SDH | 9, "\\Device\\Harddisk7\\Partition9"},
-  {"/dev/sdh10", FH_SDH | 10, "\\Device\\Harddisk7\\Partition10"},
-  {"/dev/sdh11", FH_SDH | 11, "\\Device\\Harddisk7\\Partition11"},
-  {"/dev/sdh12", FH_SDH | 12, "\\Device\\Harddisk7\\Partition12"},
-  {"/dev/sdh13", FH_SDH | 13, "\\Device\\Harddisk7\\Partition13"},
-  {"/dev/sdh14", FH_SDH | 14, "\\Device\\Harddisk7\\Partition14"},
-  {"/dev/sdh15", FH_SDH | 15, "\\Device\\Harddisk7\\Partition15"},
-  {"/dev/sdi1", FH_SDI | 1, "\\Device\\Harddisk8\\Partition1"},
-  {"/dev/sdi2", FH_SDI | 2, "\\Device\\Harddisk8\\Partition2"},
-  {"/dev/sdi3", FH_SDI | 3, "\\Device\\Harddisk8\\Partition3"},
-  {"/dev/sdi4", FH_SDI | 4, "\\Device\\Harddisk8\\Partition4"},
-  {"/dev/sdi5", FH_SDI | 5, "\\Device\\Harddisk8\\Partition5"},
-  {"/dev/sdi6", FH_SDI | 6, "\\Device\\Harddisk8\\Partition6"},
-  {"/dev/sdi7", FH_SDI | 7, "\\Device\\Harddisk8\\Partition7"},
-  {"/dev/sdi8", FH_SDI | 8, "\\Device\\Harddisk8\\Partition8"},
-  {"/dev/sdi9", FH_SDI | 9, "\\Device\\Harddisk8\\Partition9"},
-  {"/dev/sdi10", FH_SDI | 10, "\\Device\\Harddisk8\\Partition10"},
-  {"/dev/sdi11", FH_SDI | 11, "\\Device\\Harddisk8\\Partition11"},
-  {"/dev/sdi12", FH_SDI | 12, "\\Device\\Harddisk8\\Partition12"},
-  {"/dev/sdi13", FH_SDI | 13, "\\Device\\Harddisk8\\Partition13"},
-  {"/dev/sdi14", FH_SDI | 14, "\\Device\\Harddisk8\\Partition14"},
-  {"/dev/sdi15", FH_SDI | 15, "\\Device\\Harddisk8\\Partition15"},
-  {"/dev/sdj1", FH_SDJ | 1, "\\Device\\Harddisk9\\Partition1"},
-  {"/dev/sdj2", FH_SDJ | 2, "\\Device\\Harddisk9\\Partition2"},
-  {"/dev/sdj3", FH_SDJ | 3, "\\Device\\Harddisk9\\Partition3"},
-  {"/dev/sdj4", FH_SDJ | 4, "\\Device\\Harddisk9\\Partition4"},
-  {"/dev/sdj5", FH_SDJ | 5, "\\Device\\Harddisk9\\Partition5"},
-  {"/dev/sdj6", FH_SDJ | 6, "\\Device\\Harddisk9\\Partition6"},
-  {"/dev/sdj7", FH_SDJ | 7, "\\Device\\Harddisk9\\Partition7"},
-  {"/dev/sdj8", FH_SDJ | 8, "\\Device\\Harddisk9\\Partition8"},
-  {"/dev/sdj9", FH_SDJ | 9, "\\Device\\Harddisk9\\Partition9"},
-  {"/dev/sdj10", FH_SDJ | 10, "\\Device\\Harddisk9\\Partition10"},
-  {"/dev/sdj11", FH_SDJ | 11, "\\Device\\Harddisk9\\Partition11"},
-  {"/dev/sdj12", FH_SDJ | 12, "\\Device\\Harddisk9\\Partition12"},
-  {"/dev/sdj13", FH_SDJ | 13, "\\Device\\Harddisk9\\Partition13"},
-  {"/dev/sdj14", FH_SDJ | 14, "\\Device\\Harddisk9\\Partition14"},
-  {"/dev/sdj15", FH_SDJ | 15, "\\Device\\Harddisk9\\Partition15"},
-  {"/dev/sdk1", FH_SDK | 1, "\\Device\\Harddisk10\\Partition1"},
-  {"/dev/sdk2", FH_SDK | 2, "\\Device\\Harddisk10\\Partition2"},
-  {"/dev/sdk3", FH_SDK | 3, "\\Device\\Harddisk10\\Partition3"},
-  {"/dev/sdk4", FH_SDK | 4, "\\Device\\Harddisk10\\Partition4"},
-  {"/dev/sdk5", FH_SDK | 5, "\\Device\\Harddisk10\\Partition5"},
-  {"/dev/sdk6", FH_SDK | 6, "\\Device\\Harddisk10\\Partition6"},
-  {"/dev/sdk7", FH_SDK | 7, "\\Device\\Harddisk10\\Partition7"},
-  {"/dev/sdk8", FH_SDK | 8, "\\Device\\Harddisk10\\Partition8"},
-  {"/dev/sdk9", FH_SDK | 9, "\\Device\\Harddisk10\\Partition9"},
-  {"/dev/sdk10", FH_SDK | 10, "\\Device\\Harddisk10\\Partition10"},
-  {"/dev/sdk11", FH_SDK | 11, "\\Device\\Harddisk10\\Partition11"},
-  {"/dev/sdk12", FH_SDK | 12, "\\Device\\Harddisk10\\Partition12"},
-  {"/dev/sdk13", FH_SDK | 13, "\\Device\\Harddisk10\\Partition13"},
-  {"/dev/sdk14", FH_SDK | 14, "\\Device\\Harddisk10\\Partition14"},
-  {"/dev/sdk15", FH_SDK | 15, "\\Device\\Harddisk10\\Partition15"},
-  {"/dev/sdl1", FH_SDL | 1, "\\Device\\Harddisk11\\Partition1"},
-  {"/dev/sdl2", FH_SDL | 2, "\\Device\\Harddisk11\\Partition2"},
-  {"/dev/sdl3", FH_SDL | 3, "\\Device\\Harddisk11\\Partition3"},
-  {"/dev/sdl4", FH_SDL | 4, "\\Device\\Harddisk11\\Partition4"},
-  {"/dev/sdl5", FH_SDL | 5, "\\Device\\Harddisk11\\Partition5"},
-  {"/dev/sdl6", FH_SDL | 6, "\\Device\\Harddisk11\\Partition6"},
-  {"/dev/sdl7", FH_SDL | 7, "\\Device\\Harddisk11\\Partition7"},
-  {"/dev/sdl8", FH_SDL | 8, "\\Device\\Harddisk11\\Partition8"},
-  {"/dev/sdl9", FH_SDL | 9, "\\Device\\Harddisk11\\Partition9"},
-  {"/dev/sdl10", FH_SDL | 10, "\\Device\\Harddisk11\\Partition10"},
-  {"/dev/sdl11", FH_SDL | 11, "\\Device\\Harddisk11\\Partition11"},
-  {"/dev/sdl12", FH_SDL | 12, "\\Device\\Harddisk11\\Partition12"},
-  {"/dev/sdl13", FH_SDL | 13, "\\Device\\Harddisk11\\Partition13"},
-  {"/dev/sdl14", FH_SDL | 14, "\\Device\\Harddisk11\\Partition14"},
-  {"/dev/sdl15", FH_SDL | 15, "\\Device\\Harddisk11\\Partition15"},
-  {"/dev/sdm1", FH_SDM | 1, "\\Device\\Harddisk12\\Partition1"},
-  {"/dev/sdm2", FH_SDM | 2, "\\Device\\Harddisk12\\Partition2"},
-  {"/dev/sdm3", FH_SDM | 3, "\\Device\\Harddisk12\\Partition3"},
-  {"/dev/sdm4", FH_SDM | 4, "\\Device\\Harddisk12\\Partition4"},
-  {"/dev/sdm5", FH_SDM | 5, "\\Device\\Harddisk12\\Partition5"},
-  {"/dev/sdm6", FH_SDM | 6, "\\Device\\Harddisk12\\Partition6"},
-  {"/dev/sdm7", FH_SDM | 7, "\\Device\\Harddisk12\\Partition7"},
-  {"/dev/sdm8", FH_SDM | 8, "\\Device\\Harddisk12\\Partition8"},
-  {"/dev/sdm9", FH_SDM | 9, "\\Device\\Harddisk12\\Partition9"},
-  {"/dev/sdm10", FH_SDM | 10, "\\Device\\Harddisk12\\Partition10"},
-  {"/dev/sdm11", FH_SDM | 11, "\\Device\\Harddisk12\\Partition11"},
-  {"/dev/sdm12", FH_SDM | 12, "\\Device\\Harddisk12\\Partition12"},
-  {"/dev/sdm13", FH_SDM | 13, "\\Device\\Harddisk12\\Partition13"},
-  {"/dev/sdm14", FH_SDM | 14, "\\Device\\Harddisk12\\Partition14"},
-  {"/dev/sdm15", FH_SDM | 15, "\\Device\\Harddisk12\\Partition15"},
-  {"/dev/sdn1", FH_SDN | 1, "\\Device\\Harddisk13\\Partition1"},
-  {"/dev/sdn2", FH_SDN | 2, "\\Device\\Harddisk13\\Partition2"},
-  {"/dev/sdn3", FH_SDN | 3, "\\Device\\Harddisk13\\Partition3"},
-  {"/dev/sdn4", FH_SDN | 4, "\\Device\\Harddisk13\\Partition4"},
-  {"/dev/sdn5", FH_SDN | 5, "\\Device\\Harddisk13\\Partition5"},
-  {"/dev/sdn6", FH_SDN | 6, "\\Device\\Harddisk13\\Partition6"},
-  {"/dev/sdn7", FH_SDN | 7, "\\Device\\Harddisk13\\Partition7"},
-  {"/dev/sdn8", FH_SDN | 8, "\\Device\\Harddisk13\\Partition8"},
-  {"/dev/sdn9", FH_SDN | 9, "\\Device\\Harddisk13\\Partition9"},
-  {"/dev/sdn10", FH_SDN | 10, "\\Device\\Harddisk13\\Partition10"},
-  {"/dev/sdn11", FH_SDN | 11, "\\Device\\Harddisk13\\Partition11"},
-  {"/dev/sdn12", FH_SDN | 12, "\\Device\\Harddisk13\\Partition12"},
-  {"/dev/sdn13", FH_SDN | 13, "\\Device\\Harddisk13\\Partition13"},
-  {"/dev/sdn14", FH_SDN | 14, "\\Device\\Harddisk13\\Partition14"},
-  {"/dev/sdn15", FH_SDN | 15, "\\Device\\Harddisk13\\Partition15"},
-  {"/dev/sdo1", FH_SDO | 1, "\\Device\\Harddisk14\\Partition1"},
-  {"/dev/sdo2", FH_SDO | 2, "\\Device\\Harddisk14\\Partition2"},
-  {"/dev/sdo3", FH_SDO | 3, "\\Device\\Harddisk14\\Partition3"},
-  {"/dev/sdo4", FH_SDO | 4, "\\Device\\Harddisk14\\Partition4"},
-  {"/dev/sdo5", FH_SDO | 5, "\\Device\\Harddisk14\\Partition5"},
-  {"/dev/sdo6", FH_SDO | 6, "\\Device\\Harddisk14\\Partition6"},
-  {"/dev/sdo7", FH_SDO | 7, "\\Device\\Harddisk14\\Partition7"},
-  {"/dev/sdo8", FH_SDO | 8, "\\Device\\Harddisk14\\Partition8"},
-  {"/dev/sdo9", FH_SDO | 9, "\\Device\\Harddisk14\\Partition9"},
-  {"/dev/sdo10", FH_SDO | 10, "\\Device\\Harddisk14\\Partition10"},
-  {"/dev/sdo11", FH_SDO | 11, "\\Device\\Harddisk14\\Partition11"},
-  {"/dev/sdo12", FH_SDO | 12, "\\Device\\Harddisk14\\Partition12"},
-  {"/dev/sdo13", FH_SDO | 13, "\\Device\\Harddisk14\\Partition13"},
-  {"/dev/sdo14", FH_SDO | 14, "\\Device\\Harddisk14\\Partition14"},
-  {"/dev/sdo15", FH_SDO | 15, "\\Device\\Harddisk14\\Partition15"},
-  {"/dev/sdp1", FH_SDP | 1, "\\Device\\Harddisk15\\Partition1"},
-  {"/dev/sdp2", FH_SDP | 2, "\\Device\\Harddisk15\\Partition2"},
-  {"/dev/sdp3", FH_SDP | 3, "\\Device\\Harddisk15\\Partition3"},
-  {"/dev/sdp4", FH_SDP | 4, "\\Device\\Harddisk15\\Partition4"},
-  {"/dev/sdp5", FH_SDP | 5, "\\Device\\Harddisk15\\Partition5"},
-  {"/dev/sdp6", FH_SDP | 6, "\\Device\\Harddisk15\\Partition6"},
-  {"/dev/sdp7", FH_SDP | 7, "\\Device\\Harddisk15\\Partition7"},
-  {"/dev/sdp8", FH_SDP | 8, "\\Device\\Harddisk15\\Partition8"},
-  {"/dev/sdp9", FH_SDP | 9, "\\Device\\Harddisk15\\Partition9"},
-  {"/dev/sdp10", FH_SDP | 10, "\\Device\\Harddisk15\\Partition10"},
-  {"/dev/sdp11", FH_SDP | 11, "\\Device\\Harddisk15\\Partition11"},
-  {"/dev/sdp12", FH_SDP | 12, "\\Device\\Harddisk15\\Partition12"},
-  {"/dev/sdp13", FH_SDP | 13, "\\Device\\Harddisk15\\Partition13"},
-  {"/dev/sdp14", FH_SDP | 14, "\\Device\\Harddisk15\\Partition14"},
-  {"/dev/sdp15", FH_SDP | 15, "\\Device\\Harddisk15\\Partition15"},
-  {"/dev/sdq1", FH_SDQ | 1, "\\Device\\Harddisk16\\Partition1"},
-  {"/dev/sdq2", FH_SDQ | 2, "\\Device\\Harddisk16\\Partition2"},
-  {"/dev/sdq3", FH_SDQ | 3, "\\Device\\Harddisk16\\Partition3"},
-  {"/dev/sdq4", FH_SDQ | 4, "\\Device\\Harddisk16\\Partition4"},
-  {"/dev/sdq5", FH_SDQ | 5, "\\Device\\Harddisk16\\Partition5"},
-  {"/dev/sdq6", FH_SDQ | 6, "\\Device\\Harddisk16\\Partition6"},
-  {"/dev/sdq7", FH_SDQ | 7, "\\Device\\Harddisk16\\Partition7"},
-  {"/dev/sdq8", FH_SDQ | 8, "\\Device\\Harddisk16\\Partition8"},
-  {"/dev/sdq9", FH_SDQ | 9, "\\Device\\Harddisk16\\Partition9"},
-  {"/dev/sdq10", FH_SDQ | 10, "\\Device\\Harddisk16\\Partition10"},
-  {"/dev/sdq11", FH_SDQ | 11, "\\Device\\Harddisk16\\Partition11"},
-  {"/dev/sdq12", FH_SDQ | 12, "\\Device\\Harddisk16\\Partition12"},
-  {"/dev/sdq13", FH_SDQ | 13, "\\Device\\Harddisk16\\Partition13"},
-  {"/dev/sdq14", FH_SDQ | 14, "\\Device\\Harddisk16\\Partition14"},
-  {"/dev/sdq15", FH_SDQ | 15, "\\Device\\Harddisk16\\Partition15"},
-  {"/dev/sdr1", FH_SDR | 1, "\\Device\\Harddisk17\\Partition1"},
-  {"/dev/sdr2", FH_SDR | 2, "\\Device\\Harddisk17\\Partition2"},
-  {"/dev/sdr3", FH_SDR | 3, "\\Device\\Harddisk17\\Partition3"},
-  {"/dev/sdr4", FH_SDR | 4, "\\Device\\Harddisk17\\Partition4"},
-  {"/dev/sdr5", FH_SDR | 5, "\\Device\\Harddisk17\\Partition5"},
-  {"/dev/sdr6", FH_SDR | 6, "\\Device\\Harddisk17\\Partition6"},
-  {"/dev/sdr7", FH_SDR | 7, "\\Device\\Harddisk17\\Partition7"},
-  {"/dev/sdr8", FH_SDR | 8, "\\Device\\Harddisk17\\Partition8"},
-  {"/dev/sdr9", FH_SDR | 9, "\\Device\\Harddisk17\\Partition9"},
-  {"/dev/sdr10", FH_SDR | 10, "\\Device\\Harddisk17\\Partition10"},
-  {"/dev/sdr11", FH_SDR | 11, "\\Device\\Harddisk17\\Partition11"},
-  {"/dev/sdr12", FH_SDR | 12, "\\Device\\Harddisk17\\Partition12"},
-  {"/dev/sdr13", FH_SDR | 13, "\\Device\\Harddisk17\\Partition13"},
-  {"/dev/sdr14", FH_SDR | 14, "\\Device\\Harddisk17\\Partition14"},
-  {"/dev/sdr15", FH_SDR | 15, "\\Device\\Harddisk17\\Partition15"},
-  {"/dev/sds1", FH_SDS | 1, "\\Device\\Harddisk18\\Partition1"},
-  {"/dev/sds2", FH_SDS | 2, "\\Device\\Harddisk18\\Partition2"},
-  {"/dev/sds3", FH_SDS | 3, "\\Device\\Harddisk18\\Partition3"},
-  {"/dev/sds4", FH_SDS | 4, "\\Device\\Harddisk18\\Partition4"},
-  {"/dev/sds5", FH_SDS | 5, "\\Device\\Harddisk18\\Partition5"},
-  {"/dev/sds6", FH_SDS | 6, "\\Device\\Harddisk18\\Partition6"},
-  {"/dev/sds7", FH_SDS | 7, "\\Device\\Harddisk18\\Partition7"},
-  {"/dev/sds8", FH_SDS | 8, "\\Device\\Harddisk18\\Partition8"},
-  {"/dev/sds9", FH_SDS | 9, "\\Device\\Harddisk18\\Partition9"},
-  {"/dev/sds10", FH_SDS | 10, "\\Device\\Harddisk18\\Partition10"},
-  {"/dev/sds11", FH_SDS | 11, "\\Device\\Harddisk18\\Partition11"},
-  {"/dev/sds12", FH_SDS | 12, "\\Device\\Harddisk18\\Partition12"},
-  {"/dev/sds13", FH_SDS | 13, "\\Device\\Harddisk18\\Partition13"},
-  {"/dev/sds14", FH_SDS | 14, "\\Device\\Harddisk18\\Partition14"},
-  {"/dev/sds15", FH_SDS | 15, "\\Device\\Harddisk18\\Partition15"},
-  {"/dev/sdt1", FH_SDT | 1, "\\Device\\Harddisk19\\Partition1"},
-  {"/dev/sdt2", FH_SDT | 2, "\\Device\\Harddisk19\\Partition2"},
-  {"/dev/sdt3", FH_SDT | 3, "\\Device\\Harddisk19\\Partition3"},
-  {"/dev/sdt4", FH_SDT | 4, "\\Device\\Harddisk19\\Partition4"},
-  {"/dev/sdt5", FH_SDT | 5, "\\Device\\Harddisk19\\Partition5"},
-  {"/dev/sdt6", FH_SDT | 6, "\\Device\\Harddisk19\\Partition6"},
-  {"/dev/sdt7", FH_SDT | 7, "\\Device\\Harddisk19\\Partition7"},
-  {"/dev/sdt8", FH_SDT | 8, "\\Device\\Harddisk19\\Partition8"},
-  {"/dev/sdt9", FH_SDT | 9, "\\Device\\Harddisk19\\Partition9"},
-  {"/dev/sdt10", FH_SDT | 10, "\\Device\\Harddisk19\\Partition10"},
-  {"/dev/sdt11", FH_SDT | 11, "\\Device\\Harddisk19\\Partition11"},
-  {"/dev/sdt12", FH_SDT | 12, "\\Device\\Harddisk19\\Partition12"},
-  {"/dev/sdt13", FH_SDT | 13, "\\Device\\Harddisk19\\Partition13"},
-  {"/dev/sdt14", FH_SDT | 14, "\\Device\\Harddisk19\\Partition14"},
-  {"/dev/sdt15", FH_SDT | 15, "\\Device\\Harddisk19\\Partition15"},
-  {"/dev/sdu1", FH_SDU | 1, "\\Device\\Harddisk20\\Partition1"},
-  {"/dev/sdu2", FH_SDU | 2, "\\Device\\Harddisk20\\Partition2"},
-  {"/dev/sdu3", FH_SDU | 3, "\\Device\\Harddisk20\\Partition3"},
-  {"/dev/sdu4", FH_SDU | 4, "\\Device\\Harddisk20\\Partition4"},
-  {"/dev/sdu5", FH_SDU | 5, "\\Device\\Harddisk20\\Partition5"},
-  {"/dev/sdu6", FH_SDU | 6, "\\Device\\Harddisk20\\Partition6"},
-  {"/dev/sdu7", FH_SDU | 7, "\\Device\\Harddisk20\\Partition7"},
-  {"/dev/sdu8", FH_SDU | 8, "\\Device\\Harddisk20\\Partition8"},
-  {"/dev/sdu9", FH_SDU | 9, "\\Device\\Harddisk20\\Partition9"},
-  {"/dev/sdu10", FH_SDU | 10, "\\Device\\Harddisk20\\Partition10"},
-  {"/dev/sdu11", FH_SDU | 11, "\\Device\\Harddisk20\\Partition11"},
-  {"/dev/sdu12", FH_SDU | 12, "\\Device\\Harddisk20\\Partition12"},
-  {"/dev/sdu13", FH_SDU | 13, "\\Device\\Harddisk20\\Partition13"},
-  {"/dev/sdu14", FH_SDU | 14, "\\Device\\Harddisk20\\Partition14"},
-  {"/dev/sdu15", FH_SDU | 15, "\\Device\\Harddisk20\\Partition15"},
-  {"/dev/sdv1", FH_SDV | 1, "\\Device\\Harddisk21\\Partition1"},
-  {"/dev/sdv2", FH_SDV | 2, "\\Device\\Harddisk21\\Partition2"},
-  {"/dev/sdv3", FH_SDV | 3, "\\Device\\Harddisk21\\Partition3"},
-  {"/dev/sdv4", FH_SDV | 4, "\\Device\\Harddisk21\\Partition4"},
-  {"/dev/sdv5", FH_SDV | 5, "\\Device\\Harddisk21\\Partition5"},
-  {"/dev/sdv6", FH_SDV | 6, "\\Device\\Harddisk21\\Partition6"},
-  {"/dev/sdv7", FH_SDV | 7, "\\Device\\Harddisk21\\Partition7"},
-  {"/dev/sdv8", FH_SDV | 8, "\\Device\\Harddisk21\\Partition8"},
-  {"/dev/sdv9", FH_SDV | 9, "\\Device\\Harddisk21\\Partition9"},
-  {"/dev/sdv10", FH_SDV | 10, "\\Device\\Harddisk21\\Partition10"},
-  {"/dev/sdv11", FH_SDV | 11, "\\Device\\Harddisk21\\Partition11"},
-  {"/dev/sdv12", FH_SDV | 12, "\\Device\\Harddisk21\\Partition12"},
-  {"/dev/sdv13", FH_SDV | 13, "\\Device\\Harddisk21\\Partition13"},
-  {"/dev/sdv14", FH_SDV | 14, "\\Device\\Harddisk21\\Partition14"},
-  {"/dev/sdv15", FH_SDV | 15, "\\Device\\Harddisk21\\Partition15"},
-  {"/dev/sdw1", FH_SDW | 1, "\\Device\\Harddisk22\\Partition1"},
-  {"/dev/sdw2", FH_SDW | 2, "\\Device\\Harddisk22\\Partition2"},
-  {"/dev/sdw3", FH_SDW | 3, "\\Device\\Harddisk22\\Partition3"},
-  {"/dev/sdw4", FH_SDW | 4, "\\Device\\Harddisk22\\Partition4"},
-  {"/dev/sdw5", FH_SDW | 5, "\\Device\\Harddisk22\\Partition5"},
-  {"/dev/sdw6", FH_SDW | 6, "\\Device\\Harddisk22\\Partition6"},
-  {"/dev/sdw7", FH_SDW | 7, "\\Device\\Harddisk22\\Partition7"},
-  {"/dev/sdw8", FH_SDW | 8, "\\Device\\Harddisk22\\Partition8"},
-  {"/dev/sdw9", FH_SDW | 9, "\\Device\\Harddisk22\\Partition9"},
-  {"/dev/sdw10", FH_SDW | 10, "\\Device\\Harddisk22\\Partition10"},
-  {"/dev/sdw11", FH_SDW | 11, "\\Device\\Harddisk22\\Partition11"},
-  {"/dev/sdw12", FH_SDW | 12, "\\Device\\Harddisk22\\Partition12"},
-  {"/dev/sdw13", FH_SDW | 13, "\\Device\\Harddisk22\\Partition13"},
-  {"/dev/sdw14", FH_SDW | 14, "\\Device\\Harddisk22\\Partition14"},
-  {"/dev/sdw15", FH_SDW | 15, "\\Device\\Harddisk22\\Partition15"},
-  {"/dev/sdx1", FH_SDX | 1, "\\Device\\Harddisk23\\Partition1"},
-  {"/dev/sdx2", FH_SDX | 2, "\\Device\\Harddisk23\\Partition2"},
-  {"/dev/sdx3", FH_SDX | 3, "\\Device\\Harddisk23\\Partition3"},
-  {"/dev/sdx4", FH_SDX | 4, "\\Device\\Harddisk23\\Partition4"},
-  {"/dev/sdx5", FH_SDX | 5, "\\Device\\Harddisk23\\Partition5"},
-  {"/dev/sdx6", FH_SDX | 6, "\\Device\\Harddisk23\\Partition6"},
-  {"/dev/sdx7", FH_SDX | 7, "\\Device\\Harddisk23\\Partition7"},
-  {"/dev/sdx8", FH_SDX | 8, "\\Device\\Harddisk23\\Partition8"},
-  {"/dev/sdx9", FH_SDX | 9, "\\Device\\Harddisk23\\Partition9"},
-  {"/dev/sdx10", FH_SDX | 10, "\\Device\\Harddisk23\\Partition10"},
-  {"/dev/sdx11", FH_SDX | 11, "\\Device\\Harddisk23\\Partition11"},
-  {"/dev/sdx12", FH_SDX | 12, "\\Device\\Harddisk23\\Partition12"},
-  {"/dev/sdx13", FH_SDX | 13, "\\Device\\Harddisk23\\Partition13"},
-  {"/dev/sdx14", FH_SDX | 14, "\\Device\\Harddisk23\\Partition14"},
-  {"/dev/sdx15", FH_SDX | 15, "\\Device\\Harddisk23\\Partition15"},
-  {"/dev/sdy1", FH_SDY | 1, "\\Device\\Harddisk24\\Partition1"},
-  {"/dev/sdy2", FH_SDY | 2, "\\Device\\Harddisk24\\Partition2"},
-  {"/dev/sdy3", FH_SDY | 3, "\\Device\\Harddisk24\\Partition3"},
-  {"/dev/sdy4", FH_SDY | 4, "\\Device\\Harddisk24\\Partition4"},
-  {"/dev/sdy5", FH_SDY | 5, "\\Device\\Harddisk24\\Partition5"},
-  {"/dev/sdy6", FH_SDY | 6, "\\Device\\Harddisk24\\Partition6"},
-  {"/dev/sdy7", FH_SDY | 7, "\\Device\\Harddisk24\\Partition7"},
-  {"/dev/sdy8", FH_SDY | 8, "\\Device\\Harddisk24\\Partition8"},
-  {"/dev/sdy9", FH_SDY | 9, "\\Device\\Harddisk24\\Partition9"},
-  {"/dev/sdy10", FH_SDY | 10, "\\Device\\Harddisk24\\Partition10"},
-  {"/dev/sdy11", FH_SDY | 11, "\\Device\\Harddisk24\\Partition11"},
-  {"/dev/sdy12", FH_SDY | 12, "\\Device\\Harddisk24\\Partition12"},
-  {"/dev/sdy13", FH_SDY | 13, "\\Device\\Harddisk24\\Partition13"},
-  {"/dev/sdy14", FH_SDY | 14, "\\Device\\Harddisk24\\Partition14"},
-  {"/dev/sdy15", FH_SDY | 15, "\\Device\\Harddisk24\\Partition15"},
-  {"/dev/sdz1", FH_SDZ | 1, "\\Device\\Harddisk25\\Partition1"},
-  {"/dev/sdz2", FH_SDZ | 2, "\\Device\\Harddisk25\\Partition2"},
-  {"/dev/sdz3", FH_SDZ | 3, "\\Device\\Harddisk25\\Partition3"},
-  {"/dev/sdz4", FH_SDZ | 4, "\\Device\\Harddisk25\\Partition4"},
-  {"/dev/sdz5", FH_SDZ | 5, "\\Device\\Harddisk25\\Partition5"},
-  {"/dev/sdz6", FH_SDZ | 6, "\\Device\\Harddisk25\\Partition6"},
-  {"/dev/sdz7", FH_SDZ | 7, "\\Device\\Harddisk25\\Partition7"},
-  {"/dev/sdz8", FH_SDZ | 8, "\\Device\\Harddisk25\\Partition8"},
-  {"/dev/sdz9", FH_SDZ | 9, "\\Device\\Harddisk25\\Partition9"},
-  {"/dev/sdz10", FH_SDZ | 10, "\\Device\\Harddisk25\\Partition10"},
-  {"/dev/sdz11", FH_SDZ | 11, "\\Device\\Harddisk25\\Partition11"},
-  {"/dev/sdz12", FH_SDZ | 12, "\\Device\\Harddisk25\\Partition12"},
-  {"/dev/sdz13", FH_SDZ | 13, "\\Device\\Harddisk25\\Partition13"},
-  {"/dev/sdz14", FH_SDZ | 14, "\\Device\\Harddisk25\\Partition14"},
-  {"/dev/sdz15", FH_SDZ | 15, "\\Device\\Harddisk25\\Partition15"},
-  {"/dev/sr0", FHDEV(DEV_CDROM_MAJOR, 0), "\\Device\\CdRom0"},
-  {"/dev/sr1", FHDEV(DEV_CDROM_MAJOR, 1), "\\Device\\CdRom1"},
-  {"/dev/sr2", FHDEV(DEV_CDROM_MAJOR, 2), "\\Device\\CdRom2"},
-  {"/dev/sr3", FHDEV(DEV_CDROM_MAJOR, 3), "\\Device\\CdRom3"},
-  {"/dev/sr4", FHDEV(DEV_CDROM_MAJOR, 4), "\\Device\\CdRom4"},
-  {"/dev/sr5", FHDEV(DEV_CDROM_MAJOR, 5), "\\Device\\CdRom5"},
-  {"/dev/sr6", FHDEV(DEV_CDROM_MAJOR, 6), "\\Device\\CdRom6"},
-  {"/dev/sr7", FHDEV(DEV_CDROM_MAJOR, 7), "\\Device\\CdRom7"},
-  {"/dev/sr8", FHDEV(DEV_CDROM_MAJOR, 8), "\\Device\\CdRom8"},
-  {"/dev/sr9", FHDEV(DEV_CDROM_MAJOR, 9), "\\Device\\CdRom9"},
-  {"/dev/sr10", FHDEV(DEV_CDROM_MAJOR, 10), "\\Device\\CdRom10"},
-  {"/dev/sr11", FHDEV(DEV_CDROM_MAJOR, 11), "\\Device\\CdRom11"},
-  {"/dev/sr12", FHDEV(DEV_CDROM_MAJOR, 12), "\\Device\\CdRom12"},
-  {"/dev/sr13", FHDEV(DEV_CDROM_MAJOR, 13), "\\Device\\CdRom13"},
-  {"/dev/sr14", FHDEV(DEV_CDROM_MAJOR, 14), "\\Device\\CdRom14"},
-  {"/dev/sr15", FHDEV(DEV_CDROM_MAJOR, 15), "\\Device\\CdRom15"},
-  {"/dev/st0", FHDEV(DEV_TAPE_MAJOR, 0), "\\Device\\Tape0"},
-  {"/dev/st1", FHDEV(DEV_TAPE_MAJOR, 1), "\\Device\\Tape1"},
-  {"/dev/st2", FHDEV(DEV_TAPE_MAJOR, 2), "\\Device\\Tape2"},
-  {"/dev/st3", FHDEV(DEV_TAPE_MAJOR, 3), "\\Device\\Tape3"},
-  {"/dev/st4", FHDEV(DEV_TAPE_MAJOR, 4), "\\Device\\Tape4"},
-  {"/dev/st5", FHDEV(DEV_TAPE_MAJOR, 5), "\\Device\\Tape5"},
-  {"/dev/st6", FHDEV(DEV_TAPE_MAJOR, 6), "\\Device\\Tape6"},
-  {"/dev/st7", FHDEV(DEV_TAPE_MAJOR, 7), "\\Device\\Tape7"},
-  {"/dev/st8", FHDEV(DEV_TAPE_MAJOR, 8), "\\Device\\Tape8"},
-  {"/dev/st9", FHDEV(DEV_TAPE_MAJOR, 9), "\\Device\\Tape9"},
-  {"/dev/st10", FHDEV(DEV_TAPE_MAJOR, 10), "\\Device\\Tape10"},
-  {"/dev/st11", FHDEV(DEV_TAPE_MAJOR, 11), "\\Device\\Tape11"},
-  {"/dev/st12", FHDEV(DEV_TAPE_MAJOR, 12), "\\Device\\Tape12"},
-  {"/dev/st13", FHDEV(DEV_TAPE_MAJOR, 13), "\\Device\\Tape13"},
-  {"/dev/st14", FHDEV(DEV_TAPE_MAJOR, 14), "\\Device\\Tape14"},
-  {"/dev/st15", FHDEV(DEV_TAPE_MAJOR, 15), "\\Device\\Tape15"},
-  {"/dev/st16", FHDEV(DEV_TAPE_MAJOR, 16), "\\Device\\Tape16"},
-  {"/dev/st17", FHDEV(DEV_TAPE_MAJOR, 17), "\\Device\\Tape17"},
-  {"/dev/st18", FHDEV(DEV_TAPE_MAJOR, 18), "\\Device\\Tape18"},
-  {"/dev/st19", FHDEV(DEV_TAPE_MAJOR, 19), "\\Device\\Tape19"},
-  {"/dev/st20", FHDEV(DEV_TAPE_MAJOR, 20), "\\Device\\Tape20"},
-  {"/dev/st21", FHDEV(DEV_TAPE_MAJOR, 21), "\\Device\\Tape21"},
-  {"/dev/st22", FHDEV(DEV_TAPE_MAJOR, 22), "\\Device\\Tape22"},
-  {"/dev/st23", FHDEV(DEV_TAPE_MAJOR, 23), "\\Device\\Tape23"},
-  {"/dev/st24", FHDEV(DEV_TAPE_MAJOR, 24), "\\Device\\Tape24"},
-  {"/dev/st25", FHDEV(DEV_TAPE_MAJOR, 25), "\\Device\\Tape25"},
-  {"/dev/st26", FHDEV(DEV_TAPE_MAJOR, 26), "\\Device\\Tape26"},
-  {"/dev/st27", FHDEV(DEV_TAPE_MAJOR, 27), "\\Device\\Tape27"},
-  {"/dev/st28", FHDEV(DEV_TAPE_MAJOR, 28), "\\Device\\Tape28"},
-  {"/dev/st29", FHDEV(DEV_TAPE_MAJOR, 29), "\\Device\\Tape29"},
-  {"/dev/st30", FHDEV(DEV_TAPE_MAJOR, 30), "\\Device\\Tape30"},
-  {"/dev/st31", FHDEV(DEV_TAPE_MAJOR, 31), "\\Device\\Tape31"},
-  {"/dev/st32", FHDEV(DEV_TAPE_MAJOR, 32), "\\Device\\Tape32"},
-  {"/dev/st33", FHDEV(DEV_TAPE_MAJOR, 33), "\\Device\\Tape33"},
-  {"/dev/st34", FHDEV(DEV_TAPE_MAJOR, 34), "\\Device\\Tape34"},
-  {"/dev/st35", FHDEV(DEV_TAPE_MAJOR, 35), "\\Device\\Tape35"},
-  {"/dev/st36", FHDEV(DEV_TAPE_MAJOR, 36), "\\Device\\Tape36"},
-  {"/dev/st37", FHDEV(DEV_TAPE_MAJOR, 37), "\\Device\\Tape37"},
-  {"/dev/st38", FHDEV(DEV_TAPE_MAJOR, 38), "\\Device\\Tape38"},
-  {"/dev/st39", FHDEV(DEV_TAPE_MAJOR, 39), "\\Device\\Tape39"},
-  {"/dev/st40", FHDEV(DEV_TAPE_MAJOR, 40), "\\Device\\Tape40"},
-  {"/dev/st41", FHDEV(DEV_TAPE_MAJOR, 41), "\\Device\\Tape41"},
-  {"/dev/st42", FHDEV(DEV_TAPE_MAJOR, 42), "\\Device\\Tape42"},
-  {"/dev/st43", FHDEV(DEV_TAPE_MAJOR, 43), "\\Device\\Tape43"},
-  {"/dev/st44", FHDEV(DEV_TAPE_MAJOR, 44), "\\Device\\Tape44"},
-  {"/dev/st45", FHDEV(DEV_TAPE_MAJOR, 45), "\\Device\\Tape45"},
-  {"/dev/st46", FHDEV(DEV_TAPE_MAJOR, 46), "\\Device\\Tape46"},
-  {"/dev/st47", FHDEV(DEV_TAPE_MAJOR, 47), "\\Device\\Tape47"},
-  {"/dev/st48", FHDEV(DEV_TAPE_MAJOR, 48), "\\Device\\Tape48"},
-  {"/dev/st49", FHDEV(DEV_TAPE_MAJOR, 49), "\\Device\\Tape49"},
-  {"/dev/st50", FHDEV(DEV_TAPE_MAJOR, 50), "\\Device\\Tape50"},
-  {"/dev/st51", FHDEV(DEV_TAPE_MAJOR, 51), "\\Device\\Tape51"},
-  {"/dev/st52", FHDEV(DEV_TAPE_MAJOR, 52), "\\Device\\Tape52"},
-  {"/dev/st53", FHDEV(DEV_TAPE_MAJOR, 53), "\\Device\\Tape53"},
-  {"/dev/st54", FHDEV(DEV_TAPE_MAJOR, 54), "\\Device\\Tape54"},
-  {"/dev/st55", FHDEV(DEV_TAPE_MAJOR, 55), "\\Device\\Tape55"},
-  {"/dev/st56", FHDEV(DEV_TAPE_MAJOR, 56), "\\Device\\Tape56"},
-  {"/dev/st57", FHDEV(DEV_TAPE_MAJOR, 57), "\\Device\\Tape57"},
-  {"/dev/st58", FHDEV(DEV_TAPE_MAJOR, 58), "\\Device\\Tape58"},
-  {"/dev/st59", FHDEV(DEV_TAPE_MAJOR, 59), "\\Device\\Tape59"},
-  {"/dev/st60", FHDEV(DEV_TAPE_MAJOR, 60), "\\Device\\Tape60"},
-  {"/dev/st61", FHDEV(DEV_TAPE_MAJOR, 61), "\\Device\\Tape61"},
-  {"/dev/st62", FHDEV(DEV_TAPE_MAJOR, 62), "\\Device\\Tape62"},
-  {"/dev/st63", FHDEV(DEV_TAPE_MAJOR, 63), "\\Device\\Tape63"},
-  {"/dev/st64", FHDEV(DEV_TAPE_MAJOR, 64), "\\Device\\Tape64"},
-  {"/dev/st65", FHDEV(DEV_TAPE_MAJOR, 65), "\\Device\\Tape65"},
-  {"/dev/st66", FHDEV(DEV_TAPE_MAJOR, 66), "\\Device\\Tape66"},
-  {"/dev/st67", FHDEV(DEV_TAPE_MAJOR, 67), "\\Device\\Tape67"},
-  {"/dev/st68", FHDEV(DEV_TAPE_MAJOR, 68), "\\Device\\Tape68"},
-  {"/dev/st69", FHDEV(DEV_TAPE_MAJOR, 69), "\\Device\\Tape69"},
-  {"/dev/st70", FHDEV(DEV_TAPE_MAJOR, 70), "\\Device\\Tape70"},
-  {"/dev/st71", FHDEV(DEV_TAPE_MAJOR, 71), "\\Device\\Tape71"},
-  {"/dev/st72", FHDEV(DEV_TAPE_MAJOR, 72), "\\Device\\Tape72"},
-  {"/dev/st73", FHDEV(DEV_TAPE_MAJOR, 73), "\\Device\\Tape73"},
-  {"/dev/st74", FHDEV(DEV_TAPE_MAJOR, 74), "\\Device\\Tape74"},
-  {"/dev/st75", FHDEV(DEV_TAPE_MAJOR, 75), "\\Device\\Tape75"},
-  {"/dev/st76", FHDEV(DEV_TAPE_MAJOR, 76), "\\Device\\Tape76"},
-  {"/dev/st77", FHDEV(DEV_TAPE_MAJOR, 77), "\\Device\\Tape77"},
-  {"/dev/st78", FHDEV(DEV_TAPE_MAJOR, 78), "\\Device\\Tape78"},
-  {"/dev/st79", FHDEV(DEV_TAPE_MAJOR, 79), "\\Device\\Tape79"},
-  {"/dev/st80", FHDEV(DEV_TAPE_MAJOR, 80), "\\Device\\Tape80"},
-  {"/dev/st81", FHDEV(DEV_TAPE_MAJOR, 81), "\\Device\\Tape81"},
-  {"/dev/st82", FHDEV(DEV_TAPE_MAJOR, 82), "\\Device\\Tape82"},
-  {"/dev/st83", FHDEV(DEV_TAPE_MAJOR, 83), "\\Device\\Tape83"},
-  {"/dev/st84", FHDEV(DEV_TAPE_MAJOR, 84), "\\Device\\Tape84"},
-  {"/dev/st85", FHDEV(DEV_TAPE_MAJOR, 85), "\\Device\\Tape85"},
-  {"/dev/st86", FHDEV(DEV_TAPE_MAJOR, 86), "\\Device\\Tape86"},
-  {"/dev/st87", FHDEV(DEV_TAPE_MAJOR, 87), "\\Device\\Tape87"},
-  {"/dev/st88", FHDEV(DEV_TAPE_MAJOR, 88), "\\Device\\Tape88"},
-  {"/dev/st89", FHDEV(DEV_TAPE_MAJOR, 89), "\\Device\\Tape89"},
-  {"/dev/st90", FHDEV(DEV_TAPE_MAJOR, 90), "\\Device\\Tape90"},
-  {"/dev/st91", FHDEV(DEV_TAPE_MAJOR, 91), "\\Device\\Tape91"},
-  {"/dev/st92", FHDEV(DEV_TAPE_MAJOR, 92), "\\Device\\Tape92"},
-  {"/dev/st93", FHDEV(DEV_TAPE_MAJOR, 93), "\\Device\\Tape93"},
-  {"/dev/st94", FHDEV(DEV_TAPE_MAJOR, 94), "\\Device\\Tape94"},
-  {"/dev/st95", FHDEV(DEV_TAPE_MAJOR, 95), "\\Device\\Tape95"},
-  {"/dev/st96", FHDEV(DEV_TAPE_MAJOR, 96), "\\Device\\Tape96"},
-  {"/dev/st97", FHDEV(DEV_TAPE_MAJOR, 97), "\\Device\\Tape97"},
-  {"/dev/st98", FHDEV(DEV_TAPE_MAJOR, 98), "\\Device\\Tape98"},
-  {"/dev/st99", FHDEV(DEV_TAPE_MAJOR, 99), "\\Device\\Tape99"},
-  {"/dev/st100", FHDEV(DEV_TAPE_MAJOR, 100), "\\Device\\Tape100"},
-  {"/dev/st101", FHDEV(DEV_TAPE_MAJOR, 101), "\\Device\\Tape101"},
-  {"/dev/st102", FHDEV(DEV_TAPE_MAJOR, 102), "\\Device\\Tape102"},
-  {"/dev/st103", FHDEV(DEV_TAPE_MAJOR, 103), "\\Device\\Tape103"},
-  {"/dev/st104", FHDEV(DEV_TAPE_MAJOR, 104), "\\Device\\Tape104"},
-  {"/dev/st105", FHDEV(DEV_TAPE_MAJOR, 105), "\\Device\\Tape105"},
-  {"/dev/st106", FHDEV(DEV_TAPE_MAJOR, 106), "\\Device\\Tape106"},
-  {"/dev/st107", FHDEV(DEV_TAPE_MAJOR, 107), "\\Device\\Tape107"},
-  {"/dev/st108", FHDEV(DEV_TAPE_MAJOR, 108), "\\Device\\Tape108"},
-  {"/dev/st109", FHDEV(DEV_TAPE_MAJOR, 109), "\\Device\\Tape109"},
-  {"/dev/st110", FHDEV(DEV_TAPE_MAJOR, 110), "\\Device\\Tape110"},
-  {"/dev/st111", FHDEV(DEV_TAPE_MAJOR, 111), "\\Device\\Tape111"},
-  {"/dev/st112", FHDEV(DEV_TAPE_MAJOR, 112), "\\Device\\Tape112"},
-  {"/dev/st113", FHDEV(DEV_TAPE_MAJOR, 113), "\\Device\\Tape113"},
-  {"/dev/st114", FHDEV(DEV_TAPE_MAJOR, 114), "\\Device\\Tape114"},
-  {"/dev/st115", FHDEV(DEV_TAPE_MAJOR, 115), "\\Device\\Tape115"},
-  {"/dev/st116", FHDEV(DEV_TAPE_MAJOR, 116), "\\Device\\Tape116"},
-  {"/dev/st117", FHDEV(DEV_TAPE_MAJOR, 117), "\\Device\\Tape117"},
-  {"/dev/st118", FHDEV(DEV_TAPE_MAJOR, 118), "\\Device\\Tape118"},
-  {"/dev/st119", FHDEV(DEV_TAPE_MAJOR, 119), "\\Device\\Tape119"},
-  {"/dev/st120", FHDEV(DEV_TAPE_MAJOR, 120), "\\Device\\Tape120"},
-  {"/dev/st121", FHDEV(DEV_TAPE_MAJOR, 121), "\\Device\\Tape121"},
-  {"/dev/st122", FHDEV(DEV_TAPE_MAJOR, 122), "\\Device\\Tape122"},
-  {"/dev/st123", FHDEV(DEV_TAPE_MAJOR, 123), "\\Device\\Tape123"},
-  {"/dev/st124", FHDEV(DEV_TAPE_MAJOR, 124), "\\Device\\Tape124"},
-  {"/dev/st125", FHDEV(DEV_TAPE_MAJOR, 125), "\\Device\\Tape125"},
-  {"/dev/st126", FHDEV(DEV_TAPE_MAJOR, 126), "\\Device\\Tape126"},
-  {"/dev/st127", FHDEV(DEV_TAPE_MAJOR, 127), "\\Device\\Tape127"},
-  {"/dev/tty", FH_TTY, "\\dev\\tty"},
-  {"/dev/tty0", FHDEV(DEV_TTYS_MAJOR, 0), "\\dev\\tty0"},
-  {"/dev/tty1", FHDEV(DEV_TTYS_MAJOR, 1), "\\dev\\tty1"},
-  {"/dev/tty2", FHDEV(DEV_TTYS_MAJOR, 2), "\\dev\\tty2"},
-  {"/dev/tty3", FHDEV(DEV_TTYS_MAJOR, 3), "\\dev\\tty3"},
-  {"/dev/tty4", FHDEV(DEV_TTYS_MAJOR, 4), "\\dev\\tty4"},
-  {"/dev/tty5", FHDEV(DEV_TTYS_MAJOR, 5), "\\dev\\tty5"},
-  {"/dev/tty6", FHDEV(DEV_TTYS_MAJOR, 6), "\\dev\\tty6"},
-  {"/dev/tty7", FHDEV(DEV_TTYS_MAJOR, 7), "\\dev\\tty7"},
-  {"/dev/tty8", FHDEV(DEV_TTYS_MAJOR, 8), "\\dev\\tty8"},
-  {"/dev/tty9", FHDEV(DEV_TTYS_MAJOR, 9), "\\dev\\tty9"},
-  {"/dev/tty10", FHDEV(DEV_TTYS_MAJOR, 10), "\\dev\\tty10"},
-  {"/dev/tty11", FHDEV(DEV_TTYS_MAJOR, 11), "\\dev\\tty11"},
-  {"/dev/tty12", FHDEV(DEV_TTYS_MAJOR, 12), "\\dev\\tty12"},
-  {"/dev/tty13", FHDEV(DEV_TTYS_MAJOR, 13), "\\dev\\tty13"},
-  {"/dev/tty14", FHDEV(DEV_TTYS_MAJOR, 14), "\\dev\\tty14"},
-  {"/dev/tty15", FHDEV(DEV_TTYS_MAJOR, 15), "\\dev\\tty15"},
-  {"/dev/tty16", FHDEV(DEV_TTYS_MAJOR, 16), "\\dev\\tty16"},
-  {"/dev/tty17", FHDEV(DEV_TTYS_MAJOR, 17), "\\dev\\tty17"},
-  {"/dev/tty18", FHDEV(DEV_TTYS_MAJOR, 18), "\\dev\\tty18"},
-  {"/dev/tty19", FHDEV(DEV_TTYS_MAJOR, 19), "\\dev\\tty19"},
-  {"/dev/tty20", FHDEV(DEV_TTYS_MAJOR, 20), "\\dev\\tty20"},
-  {"/dev/tty21", FHDEV(DEV_TTYS_MAJOR, 21), "\\dev\\tty21"},
-  {"/dev/tty22", FHDEV(DEV_TTYS_MAJOR, 22), "\\dev\\tty22"},
-  {"/dev/tty23", FHDEV(DEV_TTYS_MAJOR, 23), "\\dev\\tty23"},
-  {"/dev/tty24", FHDEV(DEV_TTYS_MAJOR, 24), "\\dev\\tty24"},
-  {"/dev/tty25", FHDEV(DEV_TTYS_MAJOR, 25), "\\dev\\tty25"},
-  {"/dev/tty26", FHDEV(DEV_TTYS_MAJOR, 26), "\\dev\\tty26"},
-  {"/dev/tty27", FHDEV(DEV_TTYS_MAJOR, 27), "\\dev\\tty27"},
-  {"/dev/tty28", FHDEV(DEV_TTYS_MAJOR, 28), "\\dev\\tty28"},
-  {"/dev/tty29", FHDEV(DEV_TTYS_MAJOR, 29), "\\dev\\tty29"},
-  {"/dev/tty30", FHDEV(DEV_TTYS_MAJOR, 30), "\\dev\\tty30"},
-  {"/dev/tty31", FHDEV(DEV_TTYS_MAJOR, 31), "\\dev\\tty31"},
-  {"/dev/tty32", FHDEV(DEV_TTYS_MAJOR, 32), "\\dev\\tty32"},
-  {"/dev/tty33", FHDEV(DEV_TTYS_MAJOR, 33), "\\dev\\tty33"},
-  {"/dev/tty34", FHDEV(DEV_TTYS_MAJOR, 34), "\\dev\\tty34"},
-  {"/dev/tty35", FHDEV(DEV_TTYS_MAJOR, 35), "\\dev\\tty35"},
-  {"/dev/tty36", FHDEV(DEV_TTYS_MAJOR, 36), "\\dev\\tty36"},
-  {"/dev/tty37", FHDEV(DEV_TTYS_MAJOR, 37), "\\dev\\tty37"},
-  {"/dev/tty38", FHDEV(DEV_TTYS_MAJOR, 38), "\\dev\\tty38"},
-  {"/dev/tty39", FHDEV(DEV_TTYS_MAJOR, 39), "\\dev\\tty39"},
-  {"/dev/tty40", FHDEV(DEV_TTYS_MAJOR, 40), "\\dev\\tty40"},
-  {"/dev/tty41", FHDEV(DEV_TTYS_MAJOR, 41), "\\dev\\tty41"},
-  {"/dev/tty42", FHDEV(DEV_TTYS_MAJOR, 42), "\\dev\\tty42"},
-  {"/dev/tty43", FHDEV(DEV_TTYS_MAJOR, 43), "\\dev\\tty43"},
-  {"/dev/tty44", FHDEV(DEV_TTYS_MAJOR, 44), "\\dev\\tty44"},
-  {"/dev/tty45", FHDEV(DEV_TTYS_MAJOR, 45), "\\dev\\tty45"},
-  {"/dev/tty46", FHDEV(DEV_TTYS_MAJOR, 46), "\\dev\\tty46"},
-  {"/dev/tty47", FHDEV(DEV_TTYS_MAJOR, 47), "\\dev\\tty47"},
-  {"/dev/tty48", FHDEV(DEV_TTYS_MAJOR, 48), "\\dev\\tty48"},
-  {"/dev/tty49", FHDEV(DEV_TTYS_MAJOR, 49), "\\dev\\tty49"},
-  {"/dev/tty50", FHDEV(DEV_TTYS_MAJOR, 50), "\\dev\\tty50"},
-  {"/dev/tty51", FHDEV(DEV_TTYS_MAJOR, 51), "\\dev\\tty51"},
-  {"/dev/tty52", FHDEV(DEV_TTYS_MAJOR, 52), "\\dev\\tty52"},
-  {"/dev/tty53", FHDEV(DEV_TTYS_MAJOR, 53), "\\dev\\tty53"},
-  {"/dev/tty54", FHDEV(DEV_TTYS_MAJOR, 54), "\\dev\\tty54"},
-  {"/dev/tty55", FHDEV(DEV_TTYS_MAJOR, 55), "\\dev\\tty55"},
-  {"/dev/tty56", FHDEV(DEV_TTYS_MAJOR, 56), "\\dev\\tty56"},
-  {"/dev/tty57", FHDEV(DEV_TTYS_MAJOR, 57), "\\dev\\tty57"},
-  {"/dev/tty58", FHDEV(DEV_TTYS_MAJOR, 58), "\\dev\\tty58"},
-  {"/dev/tty59", FHDEV(DEV_TTYS_MAJOR, 59), "\\dev\\tty59"},
-  {"/dev/tty60", FHDEV(DEV_TTYS_MAJOR, 60), "\\dev\\tty60"},
-  {"/dev/tty61", FHDEV(DEV_TTYS_MAJOR, 61), "\\dev\\tty61"},
-  {"/dev/tty62", FHDEV(DEV_TTYS_MAJOR, 62), "\\dev\\tty62"},
-  {"/dev/tty63", FHDEV(DEV_TTYS_MAJOR, 63), "\\dev\\tty63"},
-  {"/dev/ttyS0", FHDEV(DEV_SERIAL_MAJOR, 1), "\\.\\com1"},
-  {"/dev/ttyS1", FHDEV(DEV_SERIAL_MAJOR, 2), "\\.\\com2"},
-  {"/dev/ttyS2", FHDEV(DEV_SERIAL_MAJOR, 3), "\\.\\com3"},
-  {"/dev/ttyS3", FHDEV(DEV_SERIAL_MAJOR, 4), "\\.\\com4"},
-  {"/dev/ttyS4", FHDEV(DEV_SERIAL_MAJOR, 5), "\\.\\com5"},
-  {"/dev/ttyS5", FHDEV(DEV_SERIAL_MAJOR, 6), "\\.\\com6"},
-  {"/dev/ttyS6", FHDEV(DEV_SERIAL_MAJOR, 7), "\\.\\com7"},
-  {"/dev/ttyS7", FHDEV(DEV_SERIAL_MAJOR, 8), "\\.\\com8"},
-  {"/dev/ttyS8", FHDEV(DEV_SERIAL_MAJOR, 9), "\\.\\com9"},
-  {"/dev/ttyS9", FHDEV(DEV_SERIAL_MAJOR, 10), "\\.\\com10"},
-  {"/dev/ttyS10", FHDEV(DEV_SERIAL_MAJOR, 11), "\\.\\com11"},
-  {"/dev/ttyS11", FHDEV(DEV_SERIAL_MAJOR, 12), "\\.\\com12"},
-  {"/dev/ttyS12", FHDEV(DEV_SERIAL_MAJOR, 13), "\\.\\com13"},
-  {"/dev/ttyS13", FHDEV(DEV_SERIAL_MAJOR, 14), "\\.\\com14"},
-  {"/dev/ttyS14", FHDEV(DEV_SERIAL_MAJOR, 15), "\\.\\com15"},
-  {"/dev/ttyS15", FHDEV(DEV_SERIAL_MAJOR, 16), "\\.\\com16"},
-  {"/dev/ttym", FH_TTYM, "\\dev\\ttym"},
-  {"/dev/urandom", FH_URANDOM, "\\dev\\urandom"},
-  {"/dev/windows", FH_WINDOWS, "\\dev\\windows"},
-  {"/dev/zero", FH_ZERO, "\\dev\\zero"}
-};
-
-const device *console_dev = dev_storage + 20;
-const device *ttym_dev = dev_storage + 831;
-const device *ttys_dev = dev_storage + 751;
-const device *urandom_dev = dev_storage + 832;
-
-
-static KR_device_t KR_find_keyword (const char *KR_keyword, int KR_length)
-{
-
-  switch (KR_length)
-    {
-    case 8:
-      switch (KR_keyword [7])
-        {
-        case 'z':
-          if (strncmp (KR_keyword, "/dev/sdz", 8) == 0)
-            {
-{
-return dev_storage + 215;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'y':
-          switch (KR_keyword [5])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/tty", 8) == 0)
-                {
-{
-return dev_storage + 750;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sdy", 8) == 0)
-                {
-{
-return dev_storage + 214;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case 'x':
-          if (strncmp (KR_keyword, "/dev/sdx", 8) == 0)
-            {
-{
-return dev_storage + 213;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'w':
-          if (strncmp (KR_keyword, "/dev/sdw", 8) == 0)
-            {
-{
-return dev_storage + 212;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'v':
-          if (strncmp (KR_keyword, "/dev/sdv", 8) == 0)
-            {
-{
-return dev_storage + 211;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'u':
-          if (strncmp (KR_keyword, "/dev/sdu", 8) == 0)
-            {
-{
-return dev_storage + 210;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 't':
-          if (strncmp (KR_keyword, "/dev/sdt", 8) == 0)
-            {
-{
-return dev_storage + 209;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 's':
-          if (strncmp (KR_keyword, "/dev/sds", 8) == 0)
-            {
-{
-return dev_storage + 208;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'r':
-          if (strncmp (KR_keyword, "/dev/sdr", 8) == 0)
-            {
-{
-return dev_storage + 207;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'q':
-          if (strncmp (KR_keyword, "/dev/sdq", 8) == 0)
-            {
-{
-return dev_storage + 206;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'p':
-          switch (KR_keyword [5])
-            {
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sdp", 8) == 0)
-                {
-{
-return dev_storage + 205;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/dsp", 8) == 0)
-                {
-{
-return dev_storage + 21;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case 'o':
-          if (strncmp (KR_keyword, "/dev/sdo", 8) == 0)
-            {
-{
-return dev_storage + 204;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'n':
-          if (strncmp (KR_keyword, "/dev/sdn", 8) == 0)
-            {
-{
-return dev_storage + 203;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'm':
-          switch (KR_keyword [5])
-            {
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sdm", 8) == 0)
-                {
-{
-return dev_storage + 202;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              if (strncmp (KR_keyword, "/dev/mem", 8) == 0)
-                {
-{
-return dev_storage + 40;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case 'l':
-          if (strncmp (KR_keyword, "/dev/sdl", 8) == 0)
-            {
-{
-return dev_storage + 201;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'k':
-          if (strncmp (KR_keyword, "/dev/sdk", 8) == 0)
-            {
-{
-return dev_storage + 200;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'j':
-          if (strncmp (KR_keyword, "/dev/sdj", 8) == 0)
-            {
-{
-return dev_storage + 199;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'i':
-          if (strncmp (KR_keyword, "/dev/sdi", 8) == 0)
-            {
-{
-return dev_storage + 198;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'h':
-          if (strncmp (KR_keyword, "/dev/sdh", 8) == 0)
-            {
-{
-return dev_storage + 197;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'g':
-          if (strncmp (KR_keyword, "/dev/sdg", 8) == 0)
-            {
-{
-return dev_storage + 196;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'f':
-          if (strncmp (KR_keyword, "/dev/sdf", 8) == 0)
-            {
-{
-return dev_storage + 195;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'e':
-          if (strncmp (KR_keyword, "/dev/sde", 8) == 0)
-            {
-{
-return dev_storage + 194;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'd':
-          if (strncmp (KR_keyword, "/dev/sdd", 8) == 0)
-            {
-{
-return dev_storage + 193;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'c':
-          if (strncmp (KR_keyword, "/dev/sdc", 8) == 0)
-            {
-{
-return dev_storage + 192;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'b':
-          if (strncmp (KR_keyword, "/dev/sdb", 8) == 0)
-            {
-{
-return dev_storage + 191;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'a':
-          if (strncmp (KR_keyword, "/dev/sda", 8) == 0)
-            {
-{
-return dev_storage + 190;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case '9':
-          switch (KR_keyword [6])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/st9", 8) == 0)
-                {
-{
-return dev_storage + 631;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sr9", 8) == 0)
-                {
-{
-return dev_storage + 615;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/fd9", 8) == 0)
-                {
-{
-return dev_storage + 31;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '8':
-          switch (KR_keyword [6])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/st8", 8) == 0)
-                {
-{
-return dev_storage + 630;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sr8", 8) == 0)
-                {
-{
-return dev_storage + 614;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/fd8", 8) == 0)
-                {
-{
-return dev_storage + 30;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '7':
-          switch (KR_keyword [6])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/st7", 8) == 0)
-                {
-{
-return dev_storage + 629;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sr7", 8) == 0)
-                {
-{
-return dev_storage + 613;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/fd7", 8) == 0)
-                {
-{
-return dev_storage + 29;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '6':
-          switch (KR_keyword [6])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/st6", 8) == 0)
-                {
-{
-return dev_storage + 628;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sr6", 8) == 0)
-                {
-{
-return dev_storage + 612;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/fd6", 8) == 0)
-                {
-{
-return dev_storage + 28;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '5':
-          switch (KR_keyword [6])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/st5", 8) == 0)
-                {
-{
-return dev_storage + 627;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sr5", 8) == 0)
-                {
-{
-return dev_storage + 611;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/fd5", 8) == 0)
-                {
-{
-return dev_storage + 27;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '4':
-          switch (KR_keyword [6])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/st4", 8) == 0)
-                {
-{
-return dev_storage + 626;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sr4", 8) == 0)
-                {
-{
-return dev_storage + 610;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/fd4", 8) == 0)
-                {
-{
-return dev_storage + 26;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '3':
-          switch (KR_keyword [6])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/st3", 8) == 0)
-                {
-{
-return dev_storage + 625;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sr3", 8) == 0)
-                {
-{
-return dev_storage + 609;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/fd3", 8) == 0)
-                {
-{
-return dev_storage + 25;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '2':
-          switch (KR_keyword [6])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/st2", 8) == 0)
-                {
-{
-return dev_storage + 624;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sr2", 8) == 0)
-                {
-{
-return dev_storage + 608;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/fd2", 8) == 0)
-                {
-{
-return dev_storage + 24;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '1':
-          switch (KR_keyword [6])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/st1", 8) == 0)
-                {
-{
-return dev_storage + 623;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sr1", 8) == 0)
-                {
-{
-return dev_storage + 607;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/fd1", 8) == 0)
-                {
-{
-return dev_storage + 23;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '0':
-          switch (KR_keyword [6])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/st0", 8) == 0)
-                {
-{
-return dev_storage + 622;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sr0", 8) == 0)
-                {
-{
-return dev_storage + 606;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/fd0", 8) == 0)
-                {
-{
-return dev_storage + 22;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        default:
-{
-return	NULL;
-
-}
-        }
-    case 9:
-      switch (KR_keyword [8])
-        {
-        case 'x':
-          if (strncmp (KR_keyword, "/dev/ptmx", 9) == 0)
-            {
-{
-return dev_storage + 172;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 't':
-          if (strncmp (KR_keyword, "/dev/port", 9) == 0)
-            {
-{
-return dev_storage + 171;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'o':
-          switch (KR_keyword [5])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/zero", 9) == 0)
-                {
-{
-return dev_storage + 834;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/fifo", 9) == 0)
-                {
-{
-return dev_storage + 38;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case 'm':
-          switch (KR_keyword [5])
-            {
-            case 't':
-              if (strncmp (KR_keyword, "/dev/ttym", 9) == 0)
-                {
-{
-return dev_storage + 831;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/kmem", 9) == 0)
-                {
-{
-return dev_storage + 39;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case 'l':
-          if (strncmp (KR_keyword, "/dev/null", 9) == 0)
-            {
-{
-return dev_storage + 169;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'e':
-          if (strncmp (KR_keyword, "/dev/pipe", 9) == 0)
-            {
-{
-return dev_storage + 170;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case '9':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz9", 9) == 0)
-                {
-{
-return dev_storage + 599;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty9", 9) == 0)
-                    {
-{
-return dev_storage + 760;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdy9", 9) == 0)
-                    {
-{
-return dev_storage + 584;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx9", 9) == 0)
-                {
-{
-return dev_storage + 569;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw9", 9) == 0)
-                {
-{
-return dev_storage + 554;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv9", 9) == 0)
-                {
-{
-return dev_storage + 539;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu9", 9) == 0)
-                {
-{
-return dev_storage + 524;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdt9", 9) == 0)
-                    {
-{
-return dev_storage + 509;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst9", 9) == 0)
-                    {
-{
-return dev_storage + 50;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds9", 9) == 0)
-                {
-{
-return dev_storage + 494;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr9", 9) == 0)
-                {
-{
-return dev_storage + 479;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq9", 9) == 0)
-                {
-{
-return dev_storage + 464;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp9", 9) == 0)
-                {
-{
-return dev_storage + 449;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo9", 9) == 0)
-                {
-{
-return dev_storage + 434;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn9", 9) == 0)
-                {
-{
-return dev_storage + 419;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm9", 9) == 0)
-                    {
-{
-return dev_storage + 404;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com9", 9) == 0)
-                    {
-{
-return dev_storage + 10;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl9", 9) == 0)
-                {
-{
-return dev_storage + 389;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk9", 9) == 0)
-                {
-{
-return dev_storage + 374;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj9", 9) == 0)
-                {
-{
-return dev_storage + 359;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi9", 9) == 0)
-                {
-{
-return dev_storage + 344;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh9", 9) == 0)
-                {
-{
-return dev_storage + 329;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg9", 9) == 0)
-                {
-{
-return dev_storage + 314;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf9", 9) == 0)
-                {
-{
-return dev_storage + 299;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde9", 9) == 0)
-                {
-{
-return dev_storage + 284;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd9", 9) == 0)
-                    {
-{
-return dev_storage + 269;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd9", 9) == 0)
-                    {
-{
-return dev_storage + 183;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc9", 9) == 0)
-                {
-{
-return dev_storage + 254;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb9", 9) == 0)
-                {
-{
-return dev_storage + 239;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda9", 9) == 0)
-                {
-{
-return dev_storage + 224;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/st99", 9) == 0)
-                {
-{
-return dev_storage + 721;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/st89", 9) == 0)
-                {
-{
-return dev_storage + 711;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/st79", 9) == 0)
-                {
-{
-return dev_storage + 701;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/st69", 9) == 0)
-                {
-{
-return dev_storage + 691;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/st59", 9) == 0)
-                {
-{
-return dev_storage + 681;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/st49", 9) == 0)
-                {
-{
-return dev_storage + 671;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/st39", 9) == 0)
-                {
-{
-return dev_storage + 661;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/st29", 9) == 0)
-                {
-{
-return dev_storage + 651;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              if (strncmp (KR_keyword, "/dev/st19", 9) == 0)
-                {
-{
-return dev_storage + 641;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '8':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz8", 9) == 0)
-                {
-{
-return dev_storage + 598;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty8", 9) == 0)
-                    {
-{
-return dev_storage + 759;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdy8", 9) == 0)
-                    {
-{
-return dev_storage + 583;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx8", 9) == 0)
-                {
-{
-return dev_storage + 568;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw8", 9) == 0)
-                {
-{
-return dev_storage + 553;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv8", 9) == 0)
-                {
-{
-return dev_storage + 538;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu8", 9) == 0)
-                {
-{
-return dev_storage + 523;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdt8", 9) == 0)
-                    {
-{
-return dev_storage + 508;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst8", 9) == 0)
-                    {
-{
-return dev_storage + 49;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds8", 9) == 0)
-                {
-{
-return dev_storage + 493;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr8", 9) == 0)
-                {
-{
-return dev_storage + 478;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq8", 9) == 0)
-                {
-{
-return dev_storage + 463;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp8", 9) == 0)
-                {
-{
-return dev_storage + 448;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo8", 9) == 0)
-                {
-{
-return dev_storage + 433;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn8", 9) == 0)
-                {
-{
-return dev_storage + 418;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm8", 9) == 0)
-                    {
-{
-return dev_storage + 403;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com8", 9) == 0)
-                    {
-{
-return dev_storage + 9;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl8", 9) == 0)
-                {
-{
-return dev_storage + 388;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk8", 9) == 0)
-                {
-{
-return dev_storage + 373;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj8", 9) == 0)
-                {
-{
-return dev_storage + 358;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi8", 9) == 0)
-                {
-{
-return dev_storage + 343;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh8", 9) == 0)
-                {
-{
-return dev_storage + 328;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg8", 9) == 0)
-                {
-{
-return dev_storage + 313;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf8", 9) == 0)
-                {
-{
-return dev_storage + 298;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde8", 9) == 0)
-                {
-{
-return dev_storage + 283;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd8", 9) == 0)
-                    {
-{
-return dev_storage + 268;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd8", 9) == 0)
-                    {
-{
-return dev_storage + 182;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc8", 9) == 0)
-                {
-{
-return dev_storage + 253;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb8", 9) == 0)
-                {
-{
-return dev_storage + 238;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda8", 9) == 0)
-                {
-{
-return dev_storage + 223;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/st98", 9) == 0)
-                {
-{
-return dev_storage + 720;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/st88", 9) == 0)
-                {
-{
-return dev_storage + 710;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/st78", 9) == 0)
-                {
-{
-return dev_storage + 700;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/st68", 9) == 0)
-                {
-{
-return dev_storage + 690;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/st58", 9) == 0)
-                {
-{
-return dev_storage + 680;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/st48", 9) == 0)
-                {
-{
-return dev_storage + 670;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/st38", 9) == 0)
-                {
-{
-return dev_storage + 660;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/st28", 9) == 0)
-                {
-{
-return dev_storage + 650;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              if (strncmp (KR_keyword, "/dev/st18", 9) == 0)
-                {
-{
-return dev_storage + 640;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '7':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz7", 9) == 0)
-                {
-{
-return dev_storage + 597;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty7", 9) == 0)
-                    {
-{
-return dev_storage + 758;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdy7", 9) == 0)
-                    {
-{
-return dev_storage + 582;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx7", 9) == 0)
-                {
-{
-return dev_storage + 567;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw7", 9) == 0)
-                {
-{
-return dev_storage + 552;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv7", 9) == 0)
-                {
-{
-return dev_storage + 537;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu7", 9) == 0)
-                {
-{
-return dev_storage + 522;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdt7", 9) == 0)
-                    {
-{
-return dev_storage + 507;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst7", 9) == 0)
-                    {
-{
-return dev_storage + 48;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds7", 9) == 0)
-                {
-{
-return dev_storage + 492;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr7", 9) == 0)
-                {
-{
-return dev_storage + 477;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq7", 9) == 0)
-                {
-{
-return dev_storage + 462;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp7", 9) == 0)
-                {
-{
-return dev_storage + 447;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo7", 9) == 0)
-                {
-{
-return dev_storage + 432;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn7", 9) == 0)
-                {
-{
-return dev_storage + 417;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm7", 9) == 0)
-                    {
-{
-return dev_storage + 402;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com7", 9) == 0)
-                    {
-{
-return dev_storage + 8;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl7", 9) == 0)
-                {
-{
-return dev_storage + 387;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk7", 9) == 0)
-                {
-{
-return dev_storage + 372;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj7", 9) == 0)
-                {
-{
-return dev_storage + 357;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi7", 9) == 0)
-                {
-{
-return dev_storage + 342;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh7", 9) == 0)
-                {
-{
-return dev_storage + 327;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg7", 9) == 0)
-                {
-{
-return dev_storage + 312;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf7", 9) == 0)
-                {
-{
-return dev_storage + 297;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde7", 9) == 0)
-                {
-{
-return dev_storage + 282;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd7", 9) == 0)
-                    {
-{
-return dev_storage + 267;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd7", 9) == 0)
-                    {
-{
-return dev_storage + 181;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc7", 9) == 0)
-                {
-{
-return dev_storage + 252;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb7", 9) == 0)
-                {
-{
-return dev_storage + 237;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda7", 9) == 0)
-                {
-{
-return dev_storage + 222;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/st97", 9) == 0)
-                {
-{
-return dev_storage + 719;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/st87", 9) == 0)
-                {
-{
-return dev_storage + 709;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/st77", 9) == 0)
-                {
-{
-return dev_storage + 699;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/st67", 9) == 0)
-                {
-{
-return dev_storage + 689;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/st57", 9) == 0)
-                {
-{
-return dev_storage + 679;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/st47", 9) == 0)
-                {
-{
-return dev_storage + 669;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/st37", 9) == 0)
-                {
-{
-return dev_storage + 659;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/st27", 9) == 0)
-                {
-{
-return dev_storage + 649;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              if (strncmp (KR_keyword, "/dev/st17", 9) == 0)
-                {
-{
-return dev_storage + 639;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '6':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz6", 9) == 0)
-                {
-{
-return dev_storage + 596;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty6", 9) == 0)
-                    {
-{
-return dev_storage + 757;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdy6", 9) == 0)
-                    {
-{
-return dev_storage + 581;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx6", 9) == 0)
-                {
-{
-return dev_storage + 566;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw6", 9) == 0)
-                {
-{
-return dev_storage + 551;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv6", 9) == 0)
-                {
-{
-return dev_storage + 536;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu6", 9) == 0)
-                {
-{
-return dev_storage + 521;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdt6", 9) == 0)
-                    {
-{
-return dev_storage + 506;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst6", 9) == 0)
-                    {
-{
-return dev_storage + 47;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds6", 9) == 0)
-                {
-{
-return dev_storage + 491;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr6", 9) == 0)
-                {
-{
-return dev_storage + 476;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq6", 9) == 0)
-                {
-{
-return dev_storage + 461;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp6", 9) == 0)
-                {
-{
-return dev_storage + 446;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo6", 9) == 0)
-                {
-{
-return dev_storage + 431;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn6", 9) == 0)
-                {
-{
-return dev_storage + 416;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm6", 9) == 0)
-                    {
-{
-return dev_storage + 401;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com6", 9) == 0)
-                    {
-{
-return dev_storage + 7;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl6", 9) == 0)
-                {
-{
-return dev_storage + 386;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk6", 9) == 0)
-                {
-{
-return dev_storage + 371;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj6", 9) == 0)
-                {
-{
-return dev_storage + 356;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi6", 9) == 0)
-                {
-{
-return dev_storage + 341;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh6", 9) == 0)
-                {
-{
-return dev_storage + 326;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg6", 9) == 0)
-                {
-{
-return dev_storage + 311;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf6", 9) == 0)
-                {
-{
-return dev_storage + 296;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde6", 9) == 0)
-                {
-{
-return dev_storage + 281;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd6", 9) == 0)
-                    {
-{
-return dev_storage + 266;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd6", 9) == 0)
-                    {
-{
-return dev_storage + 180;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc6", 9) == 0)
-                {
-{
-return dev_storage + 251;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb6", 9) == 0)
-                {
-{
-return dev_storage + 236;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda6", 9) == 0)
-                {
-{
-return dev_storage + 221;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/st96", 9) == 0)
-                {
-{
-return dev_storage + 718;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/st86", 9) == 0)
-                {
-{
-return dev_storage + 708;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/st76", 9) == 0)
-                {
-{
-return dev_storage + 698;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/st66", 9) == 0)
-                {
-{
-return dev_storage + 688;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/st56", 9) == 0)
-                {
-{
-return dev_storage + 678;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/st46", 9) == 0)
-                {
-{
-return dev_storage + 668;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/st36", 9) == 0)
-                {
-{
-return dev_storage + 658;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/st26", 9) == 0)
-                {
-{
-return dev_storage + 648;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              if (strncmp (KR_keyword, "/dev/st16", 9) == 0)
-                {
-{
-return dev_storage + 638;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '5':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz5", 9) == 0)
-                {
-{
-return dev_storage + 595;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty5", 9) == 0)
-                    {
-{
-return dev_storage + 756;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdy5", 9) == 0)
-                    {
-{
-return dev_storage + 580;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx5", 9) == 0)
-                {
-{
-return dev_storage + 565;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw5", 9) == 0)
-                {
-{
-return dev_storage + 550;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv5", 9) == 0)
-                {
-{
-return dev_storage + 535;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu5", 9) == 0)
-                {
-{
-return dev_storage + 520;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdt5", 9) == 0)
-                    {
-{
-return dev_storage + 505;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst5", 9) == 0)
-                    {
-{
-return dev_storage + 46;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds5", 9) == 0)
-                {
-{
-return dev_storage + 490;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr5", 9) == 0)
-                {
-{
-return dev_storage + 475;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq5", 9) == 0)
-                {
-{
-return dev_storage + 460;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp5", 9) == 0)
-                {
-{
-return dev_storage + 445;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo5", 9) == 0)
-                {
-{
-return dev_storage + 430;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn5", 9) == 0)
-                {
-{
-return dev_storage + 415;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm5", 9) == 0)
-                    {
-{
-return dev_storage + 400;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com5", 9) == 0)
-                    {
-{
-return dev_storage + 6;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl5", 9) == 0)
-                {
-{
-return dev_storage + 385;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk5", 9) == 0)
-                {
-{
-return dev_storage + 370;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj5", 9) == 0)
-                {
-{
-return dev_storage + 355;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi5", 9) == 0)
-                {
-{
-return dev_storage + 340;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh5", 9) == 0)
-                {
-{
-return dev_storage + 325;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg5", 9) == 0)
-                {
-{
-return dev_storage + 310;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf5", 9) == 0)
-                {
-{
-return dev_storage + 295;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde5", 9) == 0)
-                {
-{
-return dev_storage + 280;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd5", 9) == 0)
-                    {
-{
-return dev_storage + 265;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd5", 9) == 0)
-                    {
-{
-return dev_storage + 179;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc5", 9) == 0)
-                {
-{
-return dev_storage + 250;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb5", 9) == 0)
-                {
-{
-return dev_storage + 235;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda5", 9) == 0)
-                {
-{
-return dev_storage + 220;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/st95", 9) == 0)
-                {
-{
-return dev_storage + 717;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/st85", 9) == 0)
-                {
-{
-return dev_storage + 707;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/st75", 9) == 0)
-                {
-{
-return dev_storage + 697;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/st65", 9) == 0)
-                {
-{
-return dev_storage + 687;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/st55", 9) == 0)
-                {
-{
-return dev_storage + 677;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/st45", 9) == 0)
-                {
-{
-return dev_storage + 667;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/st35", 9) == 0)
-                {
-{
-return dev_storage + 657;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/st25", 9) == 0)
-                {
-{
-return dev_storage + 647;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [6])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/st15", 9) == 0)
-                    {
-{
-return dev_storage + 637;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'r':
-                  if (strncmp (KR_keyword, "/dev/sr15", 9) == 0)
-                    {
-{
-return dev_storage + 621;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/fd15", 9) == 0)
-                    {
-{
-return dev_storage + 37;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '4':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz4", 9) == 0)
-                {
-{
-return dev_storage + 594;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty4", 9) == 0)
-                    {
-{
-return dev_storage + 755;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdy4", 9) == 0)
-                    {
-{
-return dev_storage + 579;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx4", 9) == 0)
-                {
-{
-return dev_storage + 564;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw4", 9) == 0)
-                {
-{
-return dev_storage + 549;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv4", 9) == 0)
-                {
-{
-return dev_storage + 534;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu4", 9) == 0)
-                {
-{
-return dev_storage + 519;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdt4", 9) == 0)
-                    {
-{
-return dev_storage + 504;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst4", 9) == 0)
-                    {
-{
-return dev_storage + 45;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds4", 9) == 0)
-                {
-{
-return dev_storage + 489;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr4", 9) == 0)
-                {
-{
-return dev_storage + 474;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq4", 9) == 0)
-                {
-{
-return dev_storage + 459;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp4", 9) == 0)
-                {
-{
-return dev_storage + 444;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo4", 9) == 0)
-                {
-{
-return dev_storage + 429;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn4", 9) == 0)
-                {
-{
-return dev_storage + 414;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm4", 9) == 0)
-                    {
-{
-return dev_storage + 399;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com4", 9) == 0)
-                    {
-{
-return dev_storage + 5;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl4", 9) == 0)
-                {
-{
-return dev_storage + 384;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk4", 9) == 0)
-                {
-{
-return dev_storage + 369;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj4", 9) == 0)
-                {
-{
-return dev_storage + 354;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi4", 9) == 0)
-                {
-{
-return dev_storage + 339;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh4", 9) == 0)
-                {
-{
-return dev_storage + 324;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg4", 9) == 0)
-                {
-{
-return dev_storage + 309;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf4", 9) == 0)
-                {
-{
-return dev_storage + 294;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde4", 9) == 0)
-                {
-{
-return dev_storage + 279;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd4", 9) == 0)
-                    {
-{
-return dev_storage + 264;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd4", 9) == 0)
-                    {
-{
-return dev_storage + 178;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc4", 9) == 0)
-                {
-{
-return dev_storage + 249;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb4", 9) == 0)
-                {
-{
-return dev_storage + 234;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda4", 9) == 0)
-                {
-{
-return dev_storage + 219;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/st94", 9) == 0)
-                {
-{
-return dev_storage + 716;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/st84", 9) == 0)
-                {
-{
-return dev_storage + 706;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/st74", 9) == 0)
-                {
-{
-return dev_storage + 696;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/st64", 9) == 0)
-                {
-{
-return dev_storage + 686;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/st54", 9) == 0)
-                {
-{
-return dev_storage + 676;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/st44", 9) == 0)
-                {
-{
-return dev_storage + 666;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/st34", 9) == 0)
-                {
-{
-return dev_storage + 656;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/st24", 9) == 0)
-                {
-{
-return dev_storage + 646;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [6])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/st14", 9) == 0)
-                    {
-{
-return dev_storage + 636;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'r':
-                  if (strncmp (KR_keyword, "/dev/sr14", 9) == 0)
-                    {
-{
-return dev_storage + 620;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/fd14", 9) == 0)
-                    {
-{
-return dev_storage + 36;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '3':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz3", 9) == 0)
-                {
-{
-return dev_storage + 593;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty3", 9) == 0)
-                    {
-{
-return dev_storage + 754;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdy3", 9) == 0)
-                    {
-{
-return dev_storage + 578;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx3", 9) == 0)
-                {
-{
-return dev_storage + 563;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw3", 9) == 0)
-                {
-{
-return dev_storage + 548;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv3", 9) == 0)
-                {
-{
-return dev_storage + 533;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu3", 9) == 0)
-                {
-{
-return dev_storage + 518;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdt3", 9) == 0)
-                    {
-{
-return dev_storage + 503;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst3", 9) == 0)
-                    {
-{
-return dev_storage + 44;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds3", 9) == 0)
-                {
-{
-return dev_storage + 488;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr3", 9) == 0)
-                {
-{
-return dev_storage + 473;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq3", 9) == 0)
-                {
-{
-return dev_storage + 458;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp3", 9) == 0)
-                {
-{
-return dev_storage + 443;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo3", 9) == 0)
-                {
-{
-return dev_storage + 428;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn3", 9) == 0)
-                {
-{
-return dev_storage + 413;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm3", 9) == 0)
-                    {
-{
-return dev_storage + 398;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com3", 9) == 0)
-                    {
-{
-return dev_storage + 4;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl3", 9) == 0)
-                {
-{
-return dev_storage + 383;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk3", 9) == 0)
-                {
-{
-return dev_storage + 368;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj3", 9) == 0)
-                {
-{
-return dev_storage + 353;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi3", 9) == 0)
-                {
-{
-return dev_storage + 338;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh3", 9) == 0)
-                {
-{
-return dev_storage + 323;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg3", 9) == 0)
-                {
-{
-return dev_storage + 308;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf3", 9) == 0)
-                {
-{
-return dev_storage + 293;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde3", 9) == 0)
-                {
-{
-return dev_storage + 278;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd3", 9) == 0)
-                    {
-{
-return dev_storage + 263;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd3", 9) == 0)
-                    {
-{
-return dev_storage + 177;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc3", 9) == 0)
-                {
-{
-return dev_storage + 248;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb3", 9) == 0)
-                {
-{
-return dev_storage + 233;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda3", 9) == 0)
-                {
-{
-return dev_storage + 218;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/st93", 9) == 0)
-                {
-{
-return dev_storage + 715;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/st83", 9) == 0)
-                {
-{
-return dev_storage + 705;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/st73", 9) == 0)
-                {
-{
-return dev_storage + 695;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/st63", 9) == 0)
-                {
-{
-return dev_storage + 685;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/st53", 9) == 0)
-                {
-{
-return dev_storage + 675;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/st43", 9) == 0)
-                {
-{
-return dev_storage + 665;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/st33", 9) == 0)
-                {
-{
-return dev_storage + 655;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/st23", 9) == 0)
-                {
-{
-return dev_storage + 645;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [6])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/st13", 9) == 0)
-                    {
-{
-return dev_storage + 635;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'r':
-                  if (strncmp (KR_keyword, "/dev/sr13", 9) == 0)
-                    {
-{
-return dev_storage + 619;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/fd13", 9) == 0)
-                    {
-{
-return dev_storage + 35;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '2':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz2", 9) == 0)
-                {
-{
-return dev_storage + 592;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty2", 9) == 0)
-                    {
-{
-return dev_storage + 753;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdy2", 9) == 0)
-                    {
-{
-return dev_storage + 577;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx2", 9) == 0)
-                {
-{
-return dev_storage + 562;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw2", 9) == 0)
-                {
-{
-return dev_storage + 547;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv2", 9) == 0)
-                {
-{
-return dev_storage + 532;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu2", 9) == 0)
-                {
-{
-return dev_storage + 517;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdt2", 9) == 0)
-                    {
-{
-return dev_storage + 502;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst2", 9) == 0)
-                    {
-{
-return dev_storage + 43;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds2", 9) == 0)
-                {
-{
-return dev_storage + 487;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr2", 9) == 0)
-                {
-{
-return dev_storage + 472;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq2", 9) == 0)
-                {
-{
-return dev_storage + 457;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp2", 9) == 0)
-                {
-{
-return dev_storage + 442;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo2", 9) == 0)
-                {
-{
-return dev_storage + 427;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn2", 9) == 0)
-                {
-{
-return dev_storage + 412;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm2", 9) == 0)
-                    {
-{
-return dev_storage + 397;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com2", 9) == 0)
-                    {
-{
-return dev_storage + 3;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl2", 9) == 0)
-                {
-{
-return dev_storage + 382;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk2", 9) == 0)
-                {
-{
-return dev_storage + 367;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj2", 9) == 0)
-                {
-{
-return dev_storage + 352;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi2", 9) == 0)
-                {
-{
-return dev_storage + 337;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh2", 9) == 0)
-                {
-{
-return dev_storage + 322;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg2", 9) == 0)
-                {
-{
-return dev_storage + 307;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf2", 9) == 0)
-                {
-{
-return dev_storage + 292;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde2", 9) == 0)
-                {
-{
-return dev_storage + 277;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd2", 9) == 0)
-                    {
-{
-return dev_storage + 262;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd2", 9) == 0)
-                    {
-{
-return dev_storage + 176;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc2", 9) == 0)
-                {
-{
-return dev_storage + 247;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb2", 9) == 0)
-                {
-{
-return dev_storage + 232;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda2", 9) == 0)
-                {
-{
-return dev_storage + 217;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/st92", 9) == 0)
-                {
-{
-return dev_storage + 714;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/st82", 9) == 0)
-                {
-{
-return dev_storage + 704;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/st72", 9) == 0)
-                {
-{
-return dev_storage + 694;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/st62", 9) == 0)
-                {
-{
-return dev_storage + 684;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/st52", 9) == 0)
-                {
-{
-return dev_storage + 674;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/st42", 9) == 0)
-                {
-{
-return dev_storage + 664;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/st32", 9) == 0)
-                {
-{
-return dev_storage + 654;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/st22", 9) == 0)
-                {
-{
-return dev_storage + 644;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [6])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/st12", 9) == 0)
-                    {
-{
-return dev_storage + 634;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'r':
-                  if (strncmp (KR_keyword, "/dev/sr12", 9) == 0)
-                    {
-{
-return dev_storage + 618;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/fd12", 9) == 0)
-                    {
-{
-return dev_storage + 34;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '1':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz1", 9) == 0)
-                {
-{
-return dev_storage + 591;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty1", 9) == 0)
-                    {
-{
-return dev_storage + 752;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdy1", 9) == 0)
-                    {
-{
-return dev_storage + 576;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx1", 9) == 0)
-                {
-{
-return dev_storage + 561;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw1", 9) == 0)
-                {
-{
-return dev_storage + 546;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv1", 9) == 0)
-                {
-{
-return dev_storage + 531;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu1", 9) == 0)
-                {
-{
-return dev_storage + 516;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdt1", 9) == 0)
-                    {
-{
-return dev_storage + 501;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst1", 9) == 0)
-                    {
-{
-return dev_storage + 42;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds1", 9) == 0)
-                {
-{
-return dev_storage + 486;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr1", 9) == 0)
-                {
-{
-return dev_storage + 471;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq1", 9) == 0)
-                {
-{
-return dev_storage + 456;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp1", 9) == 0)
-                {
-{
-return dev_storage + 441;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo1", 9) == 0)
-                {
-{
-return dev_storage + 426;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn1", 9) == 0)
-                {
-{
-return dev_storage + 411;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm1", 9) == 0)
-                    {
-{
-return dev_storage + 396;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com1", 9) == 0)
-                    {
-{
-return dev_storage + 2;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl1", 9) == 0)
-                {
-{
-return dev_storage + 381;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk1", 9) == 0)
-                {
-{
-return dev_storage + 366;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj1", 9) == 0)
-                {
-{
-return dev_storage + 351;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi1", 9) == 0)
-                {
-{
-return dev_storage + 336;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh1", 9) == 0)
-                {
-{
-return dev_storage + 321;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg1", 9) == 0)
-                {
-{
-return dev_storage + 306;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf1", 9) == 0)
-                {
-{
-return dev_storage + 291;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde1", 9) == 0)
-                {
-{
-return dev_storage + 276;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd1", 9) == 0)
-                    {
-{
-return dev_storage + 261;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd1", 9) == 0)
-                    {
-{
-return dev_storage + 175;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc1", 9) == 0)
-                {
-{
-return dev_storage + 246;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb1", 9) == 0)
-                {
-{
-return dev_storage + 231;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda1", 9) == 0)
-                {
-{
-return dev_storage + 216;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/st91", 9) == 0)
-                {
-{
-return dev_storage + 713;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/st81", 9) == 0)
-                {
-{
-return dev_storage + 703;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/st71", 9) == 0)
-                {
-{
-return dev_storage + 693;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/st61", 9) == 0)
-                {
-{
-return dev_storage + 683;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/st51", 9) == 0)
-                {
-{
-return dev_storage + 673;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/st41", 9) == 0)
-                {
-{
-return dev_storage + 663;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/st31", 9) == 0)
-                {
-{
-return dev_storage + 653;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/st21", 9) == 0)
-                {
-{
-return dev_storage + 643;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [6])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/st11", 9) == 0)
-                    {
-{
-return dev_storage + 633;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'r':
-                  if (strncmp (KR_keyword, "/dev/sr11", 9) == 0)
-                    {
-{
-return dev_storage + 617;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/fd11", 9) == 0)
-                    {
-{
-return dev_storage + 33;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '0':
-          switch (KR_keyword [7])
-            {
-            case 'y':
-              if (strncmp (KR_keyword, "/dev/tty0", 9) == 0)
-                {
-{
-return dev_storage + 751;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              if (strncmp (KR_keyword, "/dev/nst0", 9) == 0)
-                {
-{
-return dev_storage + 41;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              if (strncmp (KR_keyword, "/dev/com0", 9) == 0)
-                {
-{
-return dev_storage + 1;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              if (strncmp (KR_keyword, "/dev/scd0", 9) == 0)
-                {
-{
-return dev_storage + 174;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/st90", 9) == 0)
-                {
-{
-return dev_storage + 712;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/st80", 9) == 0)
-                {
-{
-return dev_storage + 702;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/st70", 9) == 0)
-                {
-{
-return dev_storage + 692;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/st60", 9) == 0)
-                {
-{
-return dev_storage + 682;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/st50", 9) == 0)
-                {
-{
-return dev_storage + 672;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/st40", 9) == 0)
-                {
-{
-return dev_storage + 662;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/st30", 9) == 0)
-                {
-{
-return dev_storage + 652;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/st20", 9) == 0)
-                {
-{
-return dev_storage + 642;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [6])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/st10", 9) == 0)
-                    {
-{
-return dev_storage + 632;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'r':
-                  if (strncmp (KR_keyword, "/dev/sr10", 9) == 0)
-                    {
-{
-return dev_storage + 616;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/fd10", 9) == 0)
-                    {
-{
-return dev_storage + 32;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        default:
-{
-return	NULL;
-
-}
-        }
-    case 10:
-      switch (KR_keyword [9])
-        {
-        case 'n':
-          if (strncmp (KR_keyword, "/dev/conin", 10) == 0)
-            {
-{
-return dev_storage + 18;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case '9':
-          switch (KR_keyword [8])
-            {
-            case 'S':
-              if (strncmp (KR_keyword, "/dev/ttyS9", 10) == 0)
-                {
-{
-return dev_storage + 824;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/nst99", 10) == 0)
-                {
-{
-return dev_storage + 140;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/nst89", 10) == 0)
-                {
-{
-return dev_storage + 130;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/nst79", 10) == 0)
-                {
-{
-return dev_storage + 120;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/nst69", 10) == 0)
-                {
-{
-return dev_storage + 110;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty59", 10) == 0)
-                    {
-{
-return dev_storage + 810;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst59", 10) == 0)
-                    {
-{
-return dev_storage + 100;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty49", 10) == 0)
-                    {
-{
-return dev_storage + 800;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst49", 10) == 0)
-                    {
-{
-return dev_storage + 90;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty39", 10) == 0)
-                    {
-{
-return dev_storage + 790;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst39", 10) == 0)
-                    {
-{
-return dev_storage + 80;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty29", 10) == 0)
-                    {
-{
-return dev_storage + 780;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst29", 10) == 0)
-                    {
-{
-return dev_storage + 70;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty19", 10) == 0)
-                    {
-{
-return dev_storage + 770;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/st119", 10) == 0)
-                    {
-{
-return dev_storage + 741;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst19", 10) == 0)
-                    {
-{
-return dev_storage + 60;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '0':
-              if (strncmp (KR_keyword, "/dev/st109", 10) == 0)
-                {
-{
-return dev_storage + 731;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '8':
-          switch (KR_keyword [8])
-            {
-            case 'S':
-              if (strncmp (KR_keyword, "/dev/ttyS8", 10) == 0)
-                {
-{
-return dev_storage + 823;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/nst98", 10) == 0)
-                {
-{
-return dev_storage + 139;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/nst88", 10) == 0)
-                {
-{
-return dev_storage + 129;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/nst78", 10) == 0)
-                {
-{
-return dev_storage + 119;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/nst68", 10) == 0)
-                {
-{
-return dev_storage + 109;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty58", 10) == 0)
-                    {
-{
-return dev_storage + 809;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst58", 10) == 0)
-                    {
-{
-return dev_storage + 99;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty48", 10) == 0)
-                    {
-{
-return dev_storage + 799;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst48", 10) == 0)
-                    {
-{
-return dev_storage + 89;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty38", 10) == 0)
-                    {
-{
-return dev_storage + 789;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst38", 10) == 0)
-                    {
-{
-return dev_storage + 79;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty28", 10) == 0)
-                    {
-{
-return dev_storage + 779;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst28", 10) == 0)
-                    {
-{
-return dev_storage + 69;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty18", 10) == 0)
-                    {
-{
-return dev_storage + 769;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/st118", 10) == 0)
-                    {
-{
-return dev_storage + 740;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst18", 10) == 0)
-                    {
-{
-return dev_storage + 59;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '0':
-              if (strncmp (KR_keyword, "/dev/st108", 10) == 0)
-                {
-{
-return dev_storage + 730;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '7':
-          switch (KR_keyword [8])
-            {
-            case 'S':
-              if (strncmp (KR_keyword, "/dev/ttyS7", 10) == 0)
-                {
-{
-return dev_storage + 822;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/nst97", 10) == 0)
-                {
-{
-return dev_storage + 138;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/nst87", 10) == 0)
-                {
-{
-return dev_storage + 128;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/nst77", 10) == 0)
-                {
-{
-return dev_storage + 118;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/nst67", 10) == 0)
-                {
-{
-return dev_storage + 108;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty57", 10) == 0)
-                    {
-{
-return dev_storage + 808;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst57", 10) == 0)
-                    {
-{
-return dev_storage + 98;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty47", 10) == 0)
-                    {
-{
-return dev_storage + 798;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst47", 10) == 0)
-                    {
-{
-return dev_storage + 88;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty37", 10) == 0)
-                    {
-{
-return dev_storage + 788;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst37", 10) == 0)
-                    {
-{
-return dev_storage + 78;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty27", 10) == 0)
-                    {
-{
-return dev_storage + 778;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/st127", 10) == 0)
-                    {
-{
-return dev_storage + 749;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst27", 10) == 0)
-                    {
-{
-return dev_storage + 68;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty17", 10) == 0)
-                    {
-{
-return dev_storage + 768;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/st117", 10) == 0)
-                    {
-{
-return dev_storage + 739;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst17", 10) == 0)
-                    {
-{
-return dev_storage + 58;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '0':
-              if (strncmp (KR_keyword, "/dev/st107", 10) == 0)
-                {
-{
-return dev_storage + 729;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '6':
-          switch (KR_keyword [8])
-            {
-            case 'S':
-              if (strncmp (KR_keyword, "/dev/ttyS6", 10) == 0)
-                {
-{
-return dev_storage + 821;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '9':
-              if (strncmp (KR_keyword, "/dev/nst96", 10) == 0)
-                {
-{
-return dev_storage + 137;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/nst86", 10) == 0)
-                {
-{
-return dev_storage + 127;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/nst76", 10) == 0)
-                {
-{
-return dev_storage + 117;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/nst66", 10) == 0)
-                {
-{
-return dev_storage + 107;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty56", 10) == 0)
-                    {
-{
-return dev_storage + 807;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst56", 10) == 0)
-                    {
-{
-return dev_storage + 97;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty46", 10) == 0)
-                    {
-{
-return dev_storage + 797;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst46", 10) == 0)
-                    {
-{
-return dev_storage + 87;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty36", 10) == 0)
-                    {
-{
-return dev_storage + 787;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst36", 10) == 0)
-                    {
-{
-return dev_storage + 77;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty26", 10) == 0)
-                    {
-{
-return dev_storage + 777;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/st126", 10) == 0)
-                    {
-{
-return dev_storage + 748;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst26", 10) == 0)
-                    {
-{
-return dev_storage + 67;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/tty16", 10) == 0)
-                    {
-{
-return dev_storage + 767;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/st116", 10) == 0)
-                    {
-{
-return dev_storage + 738;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst16", 10) == 0)
-                    {
-{
-return dev_storage + 57;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com16", 10) == 0)
-                    {
-{
-return dev_storage + 17;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '0':
-              if (strncmp (KR_keyword, "/dev/st106", 10) == 0)
-                {
-{
-return dev_storage + 728;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '5':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz15", 10) == 0)
-                {
-{
-return dev_storage + 605;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [8])
-                {
-                case 'S':
-                  if (strncmp (KR_keyword, "/dev/ttyS5", 10) == 0)
-                    {
-{
-return dev_storage + 820;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/tty55", 10) == 0)
-                    {
-{
-return dev_storage + 806;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/tty45", 10) == 0)
-                    {
-{
-return dev_storage + 796;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/tty35", 10) == 0)
-                    {
-{
-return dev_storage + 786;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/tty25", 10) == 0)
-                    {
-{
-return dev_storage + 776;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 't':
-                      if (strncmp (KR_keyword, "/dev/tty15", 10) == 0)
-                        {
-{
-return dev_storage + 766;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdy15", 10) == 0)
-                        {
-{
-return dev_storage + 590;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx15", 10) == 0)
-                {
-{
-return dev_storage + 575;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw15", 10) == 0)
-                {
-{
-return dev_storage + 560;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv15", 10) == 0)
-                {
-{
-return dev_storage + 545;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu15", 10) == 0)
-                {
-{
-return dev_storage + 530;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [8])
-                {
-                case '9':
-                  if (strncmp (KR_keyword, "/dev/nst95", 10) == 0)
-                    {
-{
-return dev_storage + 136;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '8':
-                  if (strncmp (KR_keyword, "/dev/nst85", 10) == 0)
-                    {
-{
-return dev_storage + 126;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '7':
-                  if (strncmp (KR_keyword, "/dev/nst75", 10) == 0)
-                    {
-{
-return dev_storage + 116;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '6':
-                  if (strncmp (KR_keyword, "/dev/nst65", 10) == 0)
-                    {
-{
-return dev_storage + 106;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/nst55", 10) == 0)
-                    {
-{
-return dev_storage + 96;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/nst45", 10) == 0)
-                    {
-{
-return dev_storage + 86;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/nst35", 10) == 0)
-                    {
-{
-return dev_storage + 76;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/nst25", 10) == 0)
-                    {
-{
-return dev_storage + 66;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdt15", 10) == 0)
-                        {
-{
-return dev_storage + 515;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 'n':
-                      if (strncmp (KR_keyword, "/dev/nst15", 10) == 0)
-                        {
-{
-return dev_storage + 56;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds15", 10) == 0)
-                {
-{
-return dev_storage + 500;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr15", 10) == 0)
-                {
-{
-return dev_storage + 485;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq15", 10) == 0)
-                {
-{
-return dev_storage + 470;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp15", 10) == 0)
-                {
-{
-return dev_storage + 455;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo15", 10) == 0)
-                {
-{
-return dev_storage + 440;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn15", 10) == 0)
-                {
-{
-return dev_storage + 425;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm15", 10) == 0)
-                    {
-{
-return dev_storage + 410;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com15", 10) == 0)
-                    {
-{
-return dev_storage + 16;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl15", 10) == 0)
-                {
-{
-return dev_storage + 395;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk15", 10) == 0)
-                {
-{
-return dev_storage + 380;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj15", 10) == 0)
-                {
-{
-return dev_storage + 365;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi15", 10) == 0)
-                {
-{
-return dev_storage + 350;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh15", 10) == 0)
-                {
-{
-return dev_storage + 335;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg15", 10) == 0)
-                {
-{
-return dev_storage + 320;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf15", 10) == 0)
-                {
-{
-return dev_storage + 305;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde15", 10) == 0)
-                {
-{
-return dev_storage + 290;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd15", 10) == 0)
-                    {
-{
-return dev_storage + 275;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd15", 10) == 0)
-                    {
-{
-return dev_storage + 189;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc15", 10) == 0)
-                {
-{
-return dev_storage + 260;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb15", 10) == 0)
-                {
-{
-return dev_storage + 245;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda15", 10) == 0)
-                {
-{
-return dev_storage + 230;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [8])
-                {
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/st125", 10) == 0)
-                    {
-{
-return dev_storage + 747;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  if (strncmp (KR_keyword, "/dev/st115", 10) == 0)
-                    {
-{
-return dev_storage + 737;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '0':
-                  if (strncmp (KR_keyword, "/dev/st105", 10) == 0)
-                    {
-{
-return dev_storage + 727;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '4':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz14", 10) == 0)
-                {
-{
-return dev_storage + 604;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [8])
-                {
-                case 'S':
-                  if (strncmp (KR_keyword, "/dev/ttyS4", 10) == 0)
-                    {
-{
-return dev_storage + 819;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/tty54", 10) == 0)
-                    {
-{
-return dev_storage + 805;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/tty44", 10) == 0)
-                    {
-{
-return dev_storage + 795;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/tty34", 10) == 0)
-                    {
-{
-return dev_storage + 785;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/tty24", 10) == 0)
-                    {
-{
-return dev_storage + 775;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 't':
-                      if (strncmp (KR_keyword, "/dev/tty14", 10) == 0)
-                        {
-{
-return dev_storage + 765;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdy14", 10) == 0)
-                        {
-{
-return dev_storage + 589;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx14", 10) == 0)
-                {
-{
-return dev_storage + 574;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw14", 10) == 0)
-                {
-{
-return dev_storage + 559;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv14", 10) == 0)
-                {
-{
-return dev_storage + 544;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu14", 10) == 0)
-                {
-{
-return dev_storage + 529;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [8])
-                {
-                case '9':
-                  if (strncmp (KR_keyword, "/dev/nst94", 10) == 0)
-                    {
-{
-return dev_storage + 135;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '8':
-                  if (strncmp (KR_keyword, "/dev/nst84", 10) == 0)
-                    {
-{
-return dev_storage + 125;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '7':
-                  if (strncmp (KR_keyword, "/dev/nst74", 10) == 0)
-                    {
-{
-return dev_storage + 115;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '6':
-                  if (strncmp (KR_keyword, "/dev/nst64", 10) == 0)
-                    {
-{
-return dev_storage + 105;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/nst54", 10) == 0)
-                    {
-{
-return dev_storage + 95;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/nst44", 10) == 0)
-                    {
-{
-return dev_storage + 85;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/nst34", 10) == 0)
-                    {
-{
-return dev_storage + 75;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/nst24", 10) == 0)
-                    {
-{
-return dev_storage + 65;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdt14", 10) == 0)
-                        {
-{
-return dev_storage + 514;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 'n':
-                      if (strncmp (KR_keyword, "/dev/nst14", 10) == 0)
-                        {
-{
-return dev_storage + 55;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds14", 10) == 0)
-                {
-{
-return dev_storage + 499;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr14", 10) == 0)
-                {
-{
-return dev_storage + 484;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq14", 10) == 0)
-                {
-{
-return dev_storage + 469;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp14", 10) == 0)
-                {
-{
-return dev_storage + 454;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo14", 10) == 0)
-                {
-{
-return dev_storage + 439;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn14", 10) == 0)
-                {
-{
-return dev_storage + 424;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm14", 10) == 0)
-                    {
-{
-return dev_storage + 409;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com14", 10) == 0)
-                    {
-{
-return dev_storage + 15;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl14", 10) == 0)
-                {
-{
-return dev_storage + 394;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk14", 10) == 0)
-                {
-{
-return dev_storage + 379;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj14", 10) == 0)
-                {
-{
-return dev_storage + 364;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi14", 10) == 0)
-                {
-{
-return dev_storage + 349;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh14", 10) == 0)
-                {
-{
-return dev_storage + 334;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg14", 10) == 0)
-                {
-{
-return dev_storage + 319;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf14", 10) == 0)
-                {
-{
-return dev_storage + 304;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde14", 10) == 0)
-                {
-{
-return dev_storage + 289;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd14", 10) == 0)
-                    {
-{
-return dev_storage + 274;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd14", 10) == 0)
-                    {
-{
-return dev_storage + 188;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc14", 10) == 0)
-                {
-{
-return dev_storage + 259;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb14", 10) == 0)
-                {
-{
-return dev_storage + 244;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda14", 10) == 0)
-                {
-{
-return dev_storage + 229;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [8])
-                {
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/st124", 10) == 0)
-                    {
-{
-return dev_storage + 746;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  if (strncmp (KR_keyword, "/dev/st114", 10) == 0)
-                    {
-{
-return dev_storage + 736;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '0':
-                  if (strncmp (KR_keyword, "/dev/st104", 10) == 0)
-                    {
-{
-return dev_storage + 726;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '3':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz13", 10) == 0)
-                {
-{
-return dev_storage + 603;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [8])
-                {
-                case 'S':
-                  if (strncmp (KR_keyword, "/dev/ttyS3", 10) == 0)
-                    {
-{
-return dev_storage + 818;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '6':
-                  if (strncmp (KR_keyword, "/dev/tty63", 10) == 0)
-                    {
-{
-return dev_storage + 814;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/tty53", 10) == 0)
-                    {
-{
-return dev_storage + 804;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/tty43", 10) == 0)
-                    {
-{
-return dev_storage + 794;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/tty33", 10) == 0)
-                    {
-{
-return dev_storage + 784;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/tty23", 10) == 0)
-                    {
-{
-return dev_storage + 774;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 't':
-                      if (strncmp (KR_keyword, "/dev/tty13", 10) == 0)
-                        {
-{
-return dev_storage + 764;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdy13", 10) == 0)
-                        {
-{
-return dev_storage + 588;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx13", 10) == 0)
-                {
-{
-return dev_storage + 573;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw13", 10) == 0)
-                {
-{
-return dev_storage + 558;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv13", 10) == 0)
-                {
-{
-return dev_storage + 543;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu13", 10) == 0)
-                {
-{
-return dev_storage + 528;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [8])
-                {
-                case '9':
-                  if (strncmp (KR_keyword, "/dev/nst93", 10) == 0)
-                    {
-{
-return dev_storage + 134;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '8':
-                  if (strncmp (KR_keyword, "/dev/nst83", 10) == 0)
-                    {
-{
-return dev_storage + 124;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '7':
-                  if (strncmp (KR_keyword, "/dev/nst73", 10) == 0)
-                    {
-{
-return dev_storage + 114;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '6':
-                  if (strncmp (KR_keyword, "/dev/nst63", 10) == 0)
-                    {
-{
-return dev_storage + 104;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/nst53", 10) == 0)
-                    {
-{
-return dev_storage + 94;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/nst43", 10) == 0)
-                    {
-{
-return dev_storage + 84;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/nst33", 10) == 0)
-                    {
-{
-return dev_storage + 74;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/nst23", 10) == 0)
-                    {
-{
-return dev_storage + 64;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdt13", 10) == 0)
-                        {
-{
-return dev_storage + 513;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 'n':
-                      if (strncmp (KR_keyword, "/dev/nst13", 10) == 0)
-                        {
-{
-return dev_storage + 54;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds13", 10) == 0)
-                {
-{
-return dev_storage + 498;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr13", 10) == 0)
-                {
-{
-return dev_storage + 483;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq13", 10) == 0)
-                {
-{
-return dev_storage + 468;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp13", 10) == 0)
-                {
-{
-return dev_storage + 453;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo13", 10) == 0)
-                {
-{
-return dev_storage + 438;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn13", 10) == 0)
-                {
-{
-return dev_storage + 423;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm13", 10) == 0)
-                    {
-{
-return dev_storage + 408;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com13", 10) == 0)
-                    {
-{
-return dev_storage + 14;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl13", 10) == 0)
-                {
-{
-return dev_storage + 393;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk13", 10) == 0)
-                {
-{
-return dev_storage + 378;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj13", 10) == 0)
-                {
-{
-return dev_storage + 363;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi13", 10) == 0)
-                {
-{
-return dev_storage + 348;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh13", 10) == 0)
-                {
-{
-return dev_storage + 333;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg13", 10) == 0)
-                {
-{
-return dev_storage + 318;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf13", 10) == 0)
-                {
-{
-return dev_storage + 303;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde13", 10) == 0)
-                {
-{
-return dev_storage + 288;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd13", 10) == 0)
-                    {
-{
-return dev_storage + 273;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd13", 10) == 0)
-                    {
-{
-return dev_storage + 187;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc13", 10) == 0)
-                {
-{
-return dev_storage + 258;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb13", 10) == 0)
-                {
-{
-return dev_storage + 243;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda13", 10) == 0)
-                {
-{
-return dev_storage + 228;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [8])
-                {
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/st123", 10) == 0)
-                    {
-{
-return dev_storage + 745;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  if (strncmp (KR_keyword, "/dev/st113", 10) == 0)
-                    {
-{
-return dev_storage + 735;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '0':
-                  if (strncmp (KR_keyword, "/dev/st103", 10) == 0)
-                    {
-{
-return dev_storage + 725;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '2':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz12", 10) == 0)
-                {
-{
-return dev_storage + 602;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [8])
-                {
-                case 'S':
-                  if (strncmp (KR_keyword, "/dev/ttyS2", 10) == 0)
-                    {
-{
-return dev_storage + 817;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '6':
-                  if (strncmp (KR_keyword, "/dev/tty62", 10) == 0)
-                    {
-{
-return dev_storage + 813;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/tty52", 10) == 0)
-                    {
-{
-return dev_storage + 803;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/tty42", 10) == 0)
-                    {
-{
-return dev_storage + 793;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/tty32", 10) == 0)
-                    {
-{
-return dev_storage + 783;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/tty22", 10) == 0)
-                    {
-{
-return dev_storage + 773;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 't':
-                      if (strncmp (KR_keyword, "/dev/tty12", 10) == 0)
-                        {
-{
-return dev_storage + 763;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdy12", 10) == 0)
-                        {
-{
-return dev_storage + 587;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx12", 10) == 0)
-                {
-{
-return dev_storage + 572;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw12", 10) == 0)
-                {
-{
-return dev_storage + 557;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv12", 10) == 0)
-                {
-{
-return dev_storage + 542;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu12", 10) == 0)
-                {
-{
-return dev_storage + 527;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [8])
-                {
-                case '9':
-                  if (strncmp (KR_keyword, "/dev/nst92", 10) == 0)
-                    {
-{
-return dev_storage + 133;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '8':
-                  if (strncmp (KR_keyword, "/dev/nst82", 10) == 0)
-                    {
-{
-return dev_storage + 123;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '7':
-                  if (strncmp (KR_keyword, "/dev/nst72", 10) == 0)
-                    {
-{
-return dev_storage + 113;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '6':
-                  if (strncmp (KR_keyword, "/dev/nst62", 10) == 0)
-                    {
-{
-return dev_storage + 103;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/nst52", 10) == 0)
-                    {
-{
-return dev_storage + 93;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/nst42", 10) == 0)
-                    {
-{
-return dev_storage + 83;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/nst32", 10) == 0)
-                    {
-{
-return dev_storage + 73;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/nst22", 10) == 0)
-                    {
-{
-return dev_storage + 63;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdt12", 10) == 0)
-                        {
-{
-return dev_storage + 512;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 'n':
-                      if (strncmp (KR_keyword, "/dev/nst12", 10) == 0)
-                        {
-{
-return dev_storage + 53;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds12", 10) == 0)
-                {
-{
-return dev_storage + 497;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr12", 10) == 0)
-                {
-{
-return dev_storage + 482;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq12", 10) == 0)
-                {
-{
-return dev_storage + 467;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp12", 10) == 0)
-                {
-{
-return dev_storage + 452;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo12", 10) == 0)
-                {
-{
-return dev_storage + 437;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn12", 10) == 0)
-                {
-{
-return dev_storage + 422;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm12", 10) == 0)
-                    {
-{
-return dev_storage + 407;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com12", 10) == 0)
-                    {
-{
-return dev_storage + 13;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl12", 10) == 0)
-                {
-{
-return dev_storage + 392;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk12", 10) == 0)
-                {
-{
-return dev_storage + 377;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj12", 10) == 0)
-                {
-{
-return dev_storage + 362;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi12", 10) == 0)
-                {
-{
-return dev_storage + 347;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh12", 10) == 0)
-                {
-{
-return dev_storage + 332;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg12", 10) == 0)
-                {
-{
-return dev_storage + 317;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf12", 10) == 0)
-                {
-{
-return dev_storage + 302;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde12", 10) == 0)
-                {
-{
-return dev_storage + 287;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd12", 10) == 0)
-                    {
-{
-return dev_storage + 272;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd12", 10) == 0)
-                    {
-{
-return dev_storage + 186;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc12", 10) == 0)
-                {
-{
-return dev_storage + 257;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb12", 10) == 0)
-                {
-{
-return dev_storage + 242;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda12", 10) == 0)
-                {
-{
-return dev_storage + 227;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [8])
-                {
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/st122", 10) == 0)
-                    {
-{
-return dev_storage + 744;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  if (strncmp (KR_keyword, "/dev/st112", 10) == 0)
-                    {
-{
-return dev_storage + 734;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '0':
-                  if (strncmp (KR_keyword, "/dev/st102", 10) == 0)
-                    {
-{
-return dev_storage + 724;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '1':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz11", 10) == 0)
-                {
-{
-return dev_storage + 601;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [8])
-                {
-                case 'S':
-                  if (strncmp (KR_keyword, "/dev/ttyS1", 10) == 0)
-                    {
-{
-return dev_storage + 816;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '6':
-                  if (strncmp (KR_keyword, "/dev/tty61", 10) == 0)
-                    {
-{
-return dev_storage + 812;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/tty51", 10) == 0)
-                    {
-{
-return dev_storage + 802;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/tty41", 10) == 0)
-                    {
-{
-return dev_storage + 792;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/tty31", 10) == 0)
-                    {
-{
-return dev_storage + 782;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/tty21", 10) == 0)
-                    {
-{
-return dev_storage + 772;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 't':
-                      if (strncmp (KR_keyword, "/dev/tty11", 10) == 0)
-                        {
-{
-return dev_storage + 762;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdy11", 10) == 0)
-                        {
-{
-return dev_storage + 586;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx11", 10) == 0)
-                {
-{
-return dev_storage + 571;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw11", 10) == 0)
-                {
-{
-return dev_storage + 556;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv11", 10) == 0)
-                {
-{
-return dev_storage + 541;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu11", 10) == 0)
-                {
-{
-return dev_storage + 526;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [8])
-                {
-                case '9':
-                  if (strncmp (KR_keyword, "/dev/nst91", 10) == 0)
-                    {
-{
-return dev_storage + 132;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '8':
-                  if (strncmp (KR_keyword, "/dev/nst81", 10) == 0)
-                    {
-{
-return dev_storage + 122;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '7':
-                  if (strncmp (KR_keyword, "/dev/nst71", 10) == 0)
-                    {
-{
-return dev_storage + 112;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '6':
-                  if (strncmp (KR_keyword, "/dev/nst61", 10) == 0)
-                    {
-{
-return dev_storage + 102;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/nst51", 10) == 0)
-                    {
-{
-return dev_storage + 92;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/nst41", 10) == 0)
-                    {
-{
-return dev_storage + 82;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/nst31", 10) == 0)
-                    {
-{
-return dev_storage + 72;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/nst21", 10) == 0)
-                    {
-{
-return dev_storage + 62;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdt11", 10) == 0)
-                        {
-{
-return dev_storage + 511;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 'n':
-                      if (strncmp (KR_keyword, "/dev/nst11", 10) == 0)
-                        {
-{
-return dev_storage + 52;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds11", 10) == 0)
-                {
-{
-return dev_storage + 496;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr11", 10) == 0)
-                {
-{
-return dev_storage + 481;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq11", 10) == 0)
-                {
-{
-return dev_storage + 466;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp11", 10) == 0)
-                {
-{
-return dev_storage + 451;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo11", 10) == 0)
-                {
-{
-return dev_storage + 436;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn11", 10) == 0)
-                {
-{
-return dev_storage + 421;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm11", 10) == 0)
-                    {
-{
-return dev_storage + 406;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com11", 10) == 0)
-                    {
-{
-return dev_storage + 12;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl11", 10) == 0)
-                {
-{
-return dev_storage + 391;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk11", 10) == 0)
-                {
-{
-return dev_storage + 376;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj11", 10) == 0)
-                {
-{
-return dev_storage + 361;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi11", 10) == 0)
-                {
-{
-return dev_storage + 346;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh11", 10) == 0)
-                {
-{
-return dev_storage + 331;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg11", 10) == 0)
-                {
-{
-return dev_storage + 316;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf11", 10) == 0)
-                {
-{
-return dev_storage + 301;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde11", 10) == 0)
-                {
-{
-return dev_storage + 286;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd11", 10) == 0)
-                    {
-{
-return dev_storage + 271;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd11", 10) == 0)
-                    {
-{
-return dev_storage + 185;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc11", 10) == 0)
-                {
-{
-return dev_storage + 256;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb11", 10) == 0)
-                {
-{
-return dev_storage + 241;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda11", 10) == 0)
-                {
-{
-return dev_storage + 226;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [8])
-                {
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/st121", 10) == 0)
-                    {
-{
-return dev_storage + 743;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  if (strncmp (KR_keyword, "/dev/st111", 10) == 0)
-                    {
-{
-return dev_storage + 733;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '0':
-                  if (strncmp (KR_keyword, "/dev/st101", 10) == 0)
-                    {
-{
-return dev_storage + 723;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '0':
-          switch (KR_keyword [7])
-            {
-            case 'z':
-              if (strncmp (KR_keyword, "/dev/sdz10", 10) == 0)
-                {
-{
-return dev_storage + 600;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'y':
-              switch (KR_keyword [8])
-                {
-                case 'S':
-                  if (strncmp (KR_keyword, "/dev/ttyS0", 10) == 0)
-                    {
-{
-return dev_storage + 815;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '6':
-                  if (strncmp (KR_keyword, "/dev/tty60", 10) == 0)
-                    {
-{
-return dev_storage + 811;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/tty50", 10) == 0)
-                    {
-{
-return dev_storage + 801;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/tty40", 10) == 0)
-                    {
-{
-return dev_storage + 791;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/tty30", 10) == 0)
-                    {
-{
-return dev_storage + 781;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/tty20", 10) == 0)
-                    {
-{
-return dev_storage + 771;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 't':
-                      if (strncmp (KR_keyword, "/dev/tty10", 10) == 0)
-                        {
-{
-return dev_storage + 761;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdy10", 10) == 0)
-                        {
-{
-return dev_storage + 585;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'x':
-              if (strncmp (KR_keyword, "/dev/sdx10", 10) == 0)
-                {
-{
-return dev_storage + 570;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'w':
-              if (strncmp (KR_keyword, "/dev/sdw10", 10) == 0)
-                {
-{
-return dev_storage + 555;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'v':
-              if (strncmp (KR_keyword, "/dev/sdv10", 10) == 0)
-                {
-{
-return dev_storage + 540;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'u':
-              if (strncmp (KR_keyword, "/dev/sdu10", 10) == 0)
-                {
-{
-return dev_storage + 525;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 't':
-              switch (KR_keyword [8])
-                {
-                case '9':
-                  if (strncmp (KR_keyword, "/dev/nst90", 10) == 0)
-                    {
-{
-return dev_storage + 131;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '8':
-                  if (strncmp (KR_keyword, "/dev/nst80", 10) == 0)
-                    {
-{
-return dev_storage + 121;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '7':
-                  if (strncmp (KR_keyword, "/dev/nst70", 10) == 0)
-                    {
-{
-return dev_storage + 111;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '6':
-                  if (strncmp (KR_keyword, "/dev/nst60", 10) == 0)
-                    {
-{
-return dev_storage + 101;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '5':
-                  if (strncmp (KR_keyword, "/dev/nst50", 10) == 0)
-                    {
-{
-return dev_storage + 91;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '4':
-                  if (strncmp (KR_keyword, "/dev/nst40", 10) == 0)
-                    {
-{
-return dev_storage + 81;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '3':
-                  if (strncmp (KR_keyword, "/dev/nst30", 10) == 0)
-                    {
-{
-return dev_storage + 71;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/nst20", 10) == 0)
-                    {
-{
-return dev_storage + 61;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  switch (KR_keyword [5])
-                    {
-                    case 's':
-                      if (strncmp (KR_keyword, "/dev/sdt10", 10) == 0)
-                        {
-{
-return dev_storage + 510;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    case 'n':
-                      if (strncmp (KR_keyword, "/dev/nst10", 10) == 0)
-                        {
-{
-return dev_storage + 51;
-
-}
-                        }
-                      else
-                        {
-{
-return	NULL;
-
-}
-                        }
-                    default:
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 's':
-              if (strncmp (KR_keyword, "/dev/sds10", 10) == 0)
-                {
-{
-return dev_storage + 495;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'r':
-              if (strncmp (KR_keyword, "/dev/sdr10", 10) == 0)
-                {
-{
-return dev_storage + 480;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'q':
-              if (strncmp (KR_keyword, "/dev/sdq10", 10) == 0)
-                {
-{
-return dev_storage + 465;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'p':
-              if (strncmp (KR_keyword, "/dev/sdp10", 10) == 0)
-                {
-{
-return dev_storage + 450;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'o':
-              if (strncmp (KR_keyword, "/dev/sdo10", 10) == 0)
-                {
-{
-return dev_storage + 435;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'n':
-              if (strncmp (KR_keyword, "/dev/sdn10", 10) == 0)
-                {
-{
-return dev_storage + 420;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'm':
-              switch (KR_keyword [5])
-                {
-                case 's':
-                  if (strncmp (KR_keyword, "/dev/sdm10", 10) == 0)
-                    {
-{
-return dev_storage + 405;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/com10", 10) == 0)
-                    {
-{
-return dev_storage + 11;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'l':
-              if (strncmp (KR_keyword, "/dev/sdl10", 10) == 0)
-                {
-{
-return dev_storage + 390;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'k':
-              if (strncmp (KR_keyword, "/dev/sdk10", 10) == 0)
-                {
-{
-return dev_storage + 375;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'j':
-              if (strncmp (KR_keyword, "/dev/sdj10", 10) == 0)
-                {
-{
-return dev_storage + 360;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'i':
-              if (strncmp (KR_keyword, "/dev/sdi10", 10) == 0)
-                {
-{
-return dev_storage + 345;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'h':
-              if (strncmp (KR_keyword, "/dev/sdh10", 10) == 0)
-                {
-{
-return dev_storage + 330;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'g':
-              if (strncmp (KR_keyword, "/dev/sdg10", 10) == 0)
-                {
-{
-return dev_storage + 315;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'f':
-              if (strncmp (KR_keyword, "/dev/sdf10", 10) == 0)
-                {
-{
-return dev_storage + 300;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'e':
-              if (strncmp (KR_keyword, "/dev/sde10", 10) == 0)
-                {
-{
-return dev_storage + 285;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'd':
-              switch (KR_keyword [6])
-                {
-                case 'd':
-                  if (strncmp (KR_keyword, "/dev/sdd10", 10) == 0)
-                    {
-{
-return dev_storage + 270;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'c':
-                  if (strncmp (KR_keyword, "/dev/scd10", 10) == 0)
-                    {
-{
-return dev_storage + 184;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case 'c':
-              if (strncmp (KR_keyword, "/dev/sdc10", 10) == 0)
-                {
-{
-return dev_storage + 255;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'b':
-              if (strncmp (KR_keyword, "/dev/sdb10", 10) == 0)
-                {
-{
-return dev_storage + 240;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case 'a':
-              if (strncmp (KR_keyword, "/dev/sda10", 10) == 0)
-                {
-{
-return dev_storage + 225;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [8])
-                {
-                case '2':
-                  if (strncmp (KR_keyword, "/dev/st120", 10) == 0)
-                    {
-{
-return dev_storage + 742;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '1':
-                  if (strncmp (KR_keyword, "/dev/st110", 10) == 0)
-                    {
-{
-return dev_storage + 732;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case '0':
-                  if (strncmp (KR_keyword, "/dev/st100", 10) == 0)
-                    {
-{
-return dev_storage + 722;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        default:
-{
-return	NULL;
-
-}
-        }
-    case 11:
-      switch (KR_keyword [9])
-        {
-        case 'u':
-          if (strncmp (KR_keyword, "/dev/conout", 11) == 0)
-            {
-{
-return dev_storage + 19;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'o':
-          if (strncmp (KR_keyword, "/dev/random", 11) == 0)
-            {
-{
-return dev_storage + 173;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case '2':
-          switch (KR_keyword [10])
-            {
-            case '7':
-              if (strncmp (KR_keyword, "/dev/nst127", 11) == 0)
-                {
-{
-return dev_storage + 168;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/nst126", 11) == 0)
-                {
-{
-return dev_storage + 167;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/nst125", 11) == 0)
-                {
-{
-return dev_storage + 166;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/nst124", 11) == 0)
-                {
-{
-return dev_storage + 165;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/nst123", 11) == 0)
-                {
-{
-return dev_storage + 164;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/nst122", 11) == 0)
-                {
-{
-return dev_storage + 163;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              if (strncmp (KR_keyword, "/dev/nst121", 11) == 0)
-                {
-{
-return dev_storage + 162;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '0':
-              if (strncmp (KR_keyword, "/dev/nst120", 11) == 0)
-                {
-{
-return dev_storage + 161;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '1':
-          switch (KR_keyword [10])
-            {
-            case '9':
-              if (strncmp (KR_keyword, "/dev/nst119", 11) == 0)
-                {
-{
-return dev_storage + 160;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/nst118", 11) == 0)
-                {
-{
-return dev_storage + 159;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/nst117", 11) == 0)
-                {
-{
-return dev_storage + 158;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/nst116", 11) == 0)
-                {
-{
-return dev_storage + 157;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/ttyS15", 11) == 0)
-                    {
-{
-return dev_storage + 830;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst115", 11) == 0)
-                    {
-{
-return dev_storage + 156;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/ttyS14", 11) == 0)
-                    {
-{
-return dev_storage + 829;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst114", 11) == 0)
-                    {
-{
-return dev_storage + 155;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/ttyS13", 11) == 0)
-                    {
-{
-return dev_storage + 828;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst113", 11) == 0)
-                    {
-{
-return dev_storage + 154;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/ttyS12", 11) == 0)
-                    {
-{
-return dev_storage + 827;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst112", 11) == 0)
-                    {
-{
-return dev_storage + 153;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/ttyS11", 11) == 0)
-                    {
-{
-return dev_storage + 826;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst111", 11) == 0)
-                    {
-{
-return dev_storage + 152;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            case '0':
-              switch (KR_keyword [5])
-                {
-                case 't':
-                  if (strncmp (KR_keyword, "/dev/ttyS10", 11) == 0)
-                    {
-{
-return dev_storage + 825;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                case 'n':
-                  if (strncmp (KR_keyword, "/dev/nst110", 11) == 0)
-                    {
-{
-return dev_storage + 151;
-
-}
-                    }
-                  else
-                    {
-{
-return	NULL;
-
-}
-                    }
-                default:
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        case '0':
-          switch (KR_keyword [10])
-            {
-            case '9':
-              if (strncmp (KR_keyword, "/dev/nst109", 11) == 0)
-                {
-{
-return dev_storage + 150;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '8':
-              if (strncmp (KR_keyword, "/dev/nst108", 11) == 0)
-                {
-{
-return dev_storage + 149;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '7':
-              if (strncmp (KR_keyword, "/dev/nst107", 11) == 0)
-                {
-{
-return dev_storage + 148;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '6':
-              if (strncmp (KR_keyword, "/dev/nst106", 11) == 0)
-                {
-{
-return dev_storage + 147;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '5':
-              if (strncmp (KR_keyword, "/dev/nst105", 11) == 0)
-                {
-{
-return dev_storage + 146;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '4':
-              if (strncmp (KR_keyword, "/dev/nst104", 11) == 0)
-                {
-{
-return dev_storage + 145;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '3':
-              if (strncmp (KR_keyword, "/dev/nst103", 11) == 0)
-                {
-{
-return dev_storage + 144;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '2':
-              if (strncmp (KR_keyword, "/dev/nst102", 11) == 0)
-                {
-{
-return dev_storage + 143;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '1':
-              if (strncmp (KR_keyword, "/dev/nst101", 11) == 0)
-                {
-{
-return dev_storage + 142;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            case '0':
-              if (strncmp (KR_keyword, "/dev/nst100", 11) == 0)
-                {
-{
-return dev_storage + 141;
-
-}
-                }
-              else
-                {
-{
-return	NULL;
-
-}
-                }
-            default:
-{
-return	NULL;
-
-}
-            }
-        default:
-{
-return	NULL;
-
-}
-        }
-    case 12:
-      switch (KR_keyword [5])
-        {
-        case 'w':
-          if (strncmp (KR_keyword, "/dev/windows", 12) == 0)
-            {
-{
-return dev_storage + 833;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'u':
-          if (strncmp (KR_keyword, "/dev/urandom", 12) == 0)
-            {
-{
-return dev_storage + 832;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        case 'c':
-          if (strncmp (KR_keyword, "/dev/console", 12) == 0)
-            {
-{
-return dev_storage + 20;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-        default:
-{
-return	NULL;
-
-}
-        }
-    case 14:
-          if (strncmp (KR_keyword, "/dev/clipboard", 14) == 0)
-            {
-{
-return dev_storage + 0;
-
-}
-            }
-          else
-            {
-{
-return	NULL;
-
-}
-            }
-    default:
-{
-return	NULL;
-
-}
-    }
-}
-
-
-
-
-
-
-void
-device::parse (const char *s)
-{
-  size_t len = strlen (s);
-  const device *dev = KR_find_keyword (s, len);
-
-  if (!dev)
-    *this = *fs_dev;
-  else
-    *this = *dev;
-}
-
-void
-device::init ()
-{
-  /* nothing to do... yet */
-}
-
-void
-device::parse (_major_t major, _minor_t minor)
-{
-  _dev_t dev = FHDEV (major, minor);
-
-  devn = 0;
-
-  for (unsigned i = 0; i < (sizeof (dev_storage) / sizeof (dev_storage[0])); i++)
-    if (dev_storage[i].devn == dev)
-      {
-	*this = dev_storage[i];
-	break;
-      }
-
-  if (!*this)
-    devn = FHDEV (major, minor);
-  return;
-}
-
-void
-device::parse (_dev_t dev)
-{
-  parse (_major (dev), _minor (dev));
-}
-
-void
-device::tty_to_real_device ()
-{
-  if (!real_tty_attached (myself))
-    *this = myself->ctty < 0 ? dev_bad_storage : *console_dev;
-  else
-    parse (DEV_TTYS_MAJOR, myself->ctty);
-}
-
-
-
diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/devices.h
deleted file mode 100644
index c01e2306f..000000000
--- a/winsup/cygwin/devices.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* devices.h
-
-   Copyright 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-typedef unsigned short _major_t;
-typedef unsigned short _minor_t;
-typedef mode_t _mode_t;
-typedef __dev32_t _dev_t;
-
-#define FHDEV(maj, min) ((((unsigned) (maj)) << (sizeof (_major_t) * 8)) | (unsigned) (min))
-#define _minor(dev) ((dev) & ((1 << (sizeof (_minor_t) * 8)) - 1))
-#define _major(dev) ((dev) >> (sizeof (_major_t) * 8))
-
-enum fh_devices
-{
-  FH_TTY     = FHDEV (5, 0),
-  FH_CONSOLE = FHDEV (5, 1),
-  FH_PTYM    = FHDEV (5, 2),	/* /dev/ptmx */
-  FH_CONIN   = FHDEV (5, 255),
-  FH_CONOUT  = FHDEV (5, 254),
-
-  DEV_TTYM_MAJOR = 128,
-  FH_TTYM    = FHDEV (DEV_TTYM_MAJOR, 0),
-  FH_TTYM_MAX= FHDEV (DEV_TTYM_MAJOR, 255),
-
-  DEV_TTYS_MAJOR = 136,
-  FH_TTYS    = FHDEV (DEV_TTYS_MAJOR, 0),	/* FIXME: Should separate ttys and ptys */
-  FH_TTYS_MAX= FHDEV (DEV_TTYS_MAJOR, 255),	/* FIXME: Should separate ttys and ptys */
-
-  DEV_SERIAL_MAJOR = 117,
-  FH_SERIAL  = FHDEV (117, 0),	/* /dev/ttyS? */
-
-  FH_WINDOWS = FHDEV (13, 255),
-  FH_CLIPBOARD=FHDEV (13, 254),
-
-  FH_PIPE    = FHDEV (0, 255),
-  FH_PIPER   = FHDEV (0, 254),
-  FH_PIPEW   = FHDEV (0, 253),
-  FH_FIFO    = FHDEV (0, 252),
-  FH_PROC    = FHDEV (0, 250),
-  FH_REGISTRY= FHDEV (0, 249),
-  FH_PROCESS = FHDEV (0, 248),
-
-  FH_FS      = FHDEV (0, 247),	/* filesystem based device */
-
-  DEV_FLOPPY_MAJOR = 2,
-  FH_FLOPPY  = FHDEV (DEV_FLOPPY_MAJOR, 0),
-
-  DEV_CDROM_MAJOR = 11,
-  FH_CDROM   = FHDEV (DEV_CDROM_MAJOR, 0),
-
-  DEV_TAPE_MAJOR = 9,
-  FH_TAPE    = FHDEV (DEV_TAPE_MAJOR, 0),
-  FH_NTAPE   = FHDEV (DEV_TAPE_MAJOR, 128),
-  FH_MAXNTAPE= FHDEV (DEV_TAPE_MAJOR, 255),
-
-  DEV_SD_MAJOR = 8,
-  DEV_SD1_MAJOR = 65,
-  FH_SD      = FHDEV (DEV_SD_MAJOR, 0),
-  FH_SD1     = FHDEV (DEV_SD1_MAJOR, 0),
-  FH_SDA     = FHDEV (DEV_SD_MAJOR, 0),
-  FH_SDB     = FHDEV (DEV_SD_MAJOR, 16),
-  FH_SDC     = FHDEV (DEV_SD_MAJOR, 32),
-  FH_SDD     = FHDEV (DEV_SD_MAJOR, 48),
-  FH_SDE     = FHDEV (DEV_SD_MAJOR, 64),
-  FH_SDF     = FHDEV (DEV_SD_MAJOR, 80),
-  FH_SDG     = FHDEV (DEV_SD_MAJOR, 96),
-  FH_SDH     = FHDEV (DEV_SD_MAJOR, 112),
-  FH_SDI     = FHDEV (DEV_SD_MAJOR, 128),
-  FH_SDJ     = FHDEV (DEV_SD_MAJOR, 144),
-  FH_SDK     = FHDEV (DEV_SD_MAJOR, 160),
-  FH_SDL     = FHDEV (DEV_SD_MAJOR, 176),
-  FH_SDM     = FHDEV (DEV_SD_MAJOR, 192),
-  FH_SDN     = FHDEV (DEV_SD_MAJOR, 208),
-  FH_SDO     = FHDEV (DEV_SD_MAJOR, 224),
-  FH_SDP     = FHDEV (DEV_SD_MAJOR, 240),
-  FH_SDQ     = FHDEV (DEV_SD1_MAJOR, 0),
-  FH_SDR     = FHDEV (DEV_SD1_MAJOR, 16),
-  FH_SDS     = FHDEV (DEV_SD1_MAJOR, 32),
-  FH_SDT     = FHDEV (DEV_SD1_MAJOR, 48),
-  FH_SDU     = FHDEV (DEV_SD1_MAJOR, 64),
-  FH_SDV     = FHDEV (DEV_SD1_MAJOR, 80),
-  FH_SDW     = FHDEV (DEV_SD1_MAJOR, 96),
-  FH_SDX     = FHDEV (DEV_SD1_MAJOR, 112),
-  FH_SDY     = FHDEV (DEV_SD1_MAJOR, 128),
-  FH_SDZ     = FHDEV (DEV_SD1_MAJOR, 144),
-
-  FH_MEM     = FHDEV (1, 1),
-  FH_KMEM    = FHDEV (1, 2),	/* not implemented yet */
-  FH_NULL    = FHDEV (1, 3),
-  FH_ZERO    = FHDEV (1, 4),
-  FH_PORT    = FHDEV (1, 5),
-  FH_RANDOM  = FHDEV (1, 8),
-  FH_URANDOM = FHDEV (1, 9),
-  FH_OSS_DSP = FHDEV (14, 3),
-
-  DEV_CYGDRIVE_MAJOR = 98,
-  FH_CYGDRIVE= FHDEV (DEV_CYGDRIVE_MAJOR, 0),
-  FH_CYGDRIVE_A= FHDEV (DEV_CYGDRIVE_MAJOR, 'a'),
-  FH_CYGDRIVE_Z= FHDEV (DEV_CYGDRIVE_MAJOR, 'z'),
-
-  DEV_TCP_MAJOR = 30,
-  FH_TCP = FHDEV (DEV_TCP_MAJOR, 36),
-  FH_UDP = FHDEV (DEV_TCP_MAJOR, 39),
-  FH_ICMP = FHDEV (DEV_TCP_MAJOR, 33),
-  FH_UNIX = FHDEV (DEV_TCP_MAJOR, 120),
-  FH_STREAM = FHDEV (DEV_TCP_MAJOR, 121),
-  FH_DGRAM = FHDEV (DEV_TCP_MAJOR, 122),
-
-  FH_BAD     = FHDEV (0, 0)
-};
-
-struct device
-{
-  const char *name;
-  union
-  {
-    _dev_t devn;
-    struct
-    {
-      _minor_t minor;
-      _major_t major;
-    };
-  };
-  const char *native;
-  _mode_t mode;
-  bool dev_on_fs;
-  static const device *lookup (const char *, unsigned int = UINT32_MAX);
-  void parse (const char *);
-  void parse (_major_t major, _minor_t minor);
-  void parse (_dev_t dev);
-  inline bool setunit (unsigned n)
-  {
-    minor = n;
-    return true;
-  }
-  static void init ();
-  void tty_to_real_device ();
-  inline operator int () const {return devn;}
-  inline void setfs (bool x) {dev_on_fs = x;}
-  inline bool isfs () const {return dev_on_fs;}
-};
-
-extern const device *console_dev;
-extern const device *ttym_dev;
-extern const device *ttys_dev;
-extern const device *urandom_dev;
-
-extern const device dev_dgram_storage;
-#define dgram_dev (&dev_dgram_storage)
-extern const device dev_stream_storage;
-#define stream_dev (&dev_stream_storage)
-extern const device dev_tcp_storage;
-#define tcp_dev (&dev_tcp_storage)
-extern const device dev_udp_storage;
-#define udp_dev (&dev_udp_storage)
-
-extern const device dev_piper_storage;
-#define piper_dev (&dev_piper_storage)
-extern const device dev_pipew_storage;
-#define pipew_dev (&dev_pipew_storage)
-extern const device dev_proc_storage;
-#define proc_dev (&dev_proc_storage)
-extern const device dev_cygdrive_storage;
-#define cygdrive_dev (&dev_cygdrive_storage)
-extern const device dev_fh_storage;
-#define fh_dev (&dev_fh_storage)
-extern const device dev_fs_storage;
-#define fs_dev (&dev_fs_storage)
diff --git a/winsup/cygwin/devices.in b/winsup/cygwin/devices.in
deleted file mode 100644
index b55418f97..000000000
--- a/winsup/cygwin/devices.in
+++ /dev/null
@@ -1,132 +0,0 @@
-%import {
-#include "winsup.h"
-#include <sys/types.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include "devices.h"
-#include "sys/cygwin.h"
-#include "tty.h"
-#include "pinfo.h"
-typedef const device *KR_device_t;
-}
-%type KR_device_t
-%local {
-const device dev_cygdrive_storage =
-  {"/cygdrive", FH_CYGDRIVE, "/cygdrive"};
-
-const device dev_fs_storage =
-  {"", FH_FS, ""};
-
-const device dev_proc_storage =
-  {"", FH_PROC, ""};
-
-const device dev_registry_storage =
-  {"", FH_REGISTRY, ""};
-
-const device dev_piper_storage =
-  {"", FH_PIPER, ""};
-
-const device dev_pipew_storage =
-  {"", FH_PIPEW, ""};
-
-const device dev_tcp_storage =
-  {"", FH_TCP, ""};
-
-const device dev_udp_storage =
-  {"", FH_UDP, ""};
-
-const device dev_stream_storage =
-  {"", FH_STREAM, ""};
-
-const device dev_dgram_storage =
-  {"", FH_DGRAM, ""};
-
-const device dev_bad_storage =
-  {"", FH_BAD, ""};
-
-%storage_here
-}
-%%
-"/dev/tty", FH_TTY, "\\dev\\tty"
-"/dev/tty%(0-63)d", FHDEV(DEV_TTYS_MAJOR, {$1}), "\\dev\\tty{$1}", ttys_dev
-"/dev/console", FH_CONSOLE, "\\dev\\console", console_dev
-"/dev/ttym", FH_TTYM, "\\dev\\ttym", ttym_dev
-"/dev/ptmx", FH_PTYM, "\\dev\\ptmx"
-"/dev/windows", FH_WINDOWS, "\\dev\\windows"
-"/dev/dsp", FH_OSS_DSP, "\\dev\\dsp"
-"/dev/conin", FH_CONIN, "conin"
-"/dev/conout", FH_CONOUT, "conout"
-"/dev/null", FH_NULL, "nul"
-"/dev/zero", FH_ZERO, "\\dev\\zero"
-"/dev/random", FH_RANDOM, "\\dev\\random"
-"/dev/urandom", FH_URANDOM, "\\dev\\urandom", urandom_dev
-"/dev/mem", FH_MEM, "\\dev\\mem"
-"/dev/kmem", FH_KMEM, "\\dev\\mem"
-"/dev/clipboard", FH_CLIPBOARD, "\\dev\\clipboard"
-"/dev/port", FH_PORT, "\\dev\\port"
-"/dev/com%(0-16)d", FHDEV(DEV_SERIAL_MAJOR, {$1}), "\\.\\com{$1}"
-"/dev/ttyS%(0-15)d", FHDEV(DEV_SERIAL_MAJOR, {$1 + 1}), "\\.\\com{$1 + 1}"
-"/dev/pipe", FH_PIPE, "\\dev\\pipe"
-"/dev/fifo", FH_FIFO, "\\dev\\fifo"
-"/dev/st%(0-127)d", FHDEV(DEV_TAPE_MAJOR, {$1}), "\\Device\\Tape{$1}"
-"/dev/nst%(0-127)d", FHDEV(DEV_TAPE_MAJOR, {$1 + 128}), "\\Device\\Tape{$1}"
-"/dev/fd%(0-15)d", FHDEV(DEV_FLOPPY_MAJOR, {$1}), "\\Device\\Floppy{$1}"
-"/dev/scd%(0-15)d", FHDEV(DEV_CDROM_MAJOR, {$1}), "\\Device\\CdRom{$1}"
-"/dev/sr%(0-15)d", FHDEV(DEV_CDROM_MAJOR, {$1}), "\\Device\\CdRom{$1}"
-"/dev/sd%{a-z}s", FH_SD{uc $1}, "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition0"
-"/dev/sd%{a-z}s%(1-15)d", FH_SD{uc $1} | {$2}, "\\Device\\Harddisk{ord($1) - ord('a')}\\Partition{$2 % 16}"
-%other	{return	NULL;}
-%%
-void
-device::parse (const char *s)
-{
-  size_t len = strlen (s);
-  const device *dev = KR_find_keyword (s, len);
-
-  if (!dev)
-    *this = *fs_dev;
-  else
-    *this = *dev;
-}
-
-void
-device::init ()
-{
-  /* nothing to do... yet */
-}
-
-void
-device::parse (_major_t major, _minor_t minor)
-{
-  _dev_t dev = FHDEV (major, minor);
-
-  devn = 0;
-
-  for (unsigned i = 0; i < (sizeof (dev_storage) / sizeof (dev_storage[0])); i++)
-    if (dev_storage[i].devn == dev)
-      {
-	*this = dev_storage[i];
-	break;
-      }
-
-  if (!*this)
-    devn = FHDEV (major, minor);
-  return;
-}
-
-void
-device::parse (_dev_t dev)
-{
-  parse (_major (dev), _minor (dev));
-}
-
-void
-device::tty_to_real_device ()
-{
-  if (!real_tty_attached (myself))
-    *this = myself->ctty < 0 ? dev_bad_storage : *console_dev;
-  else
-    parse (DEV_TTYS_MAJOR, myself->ctty);
-}
-
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
deleted file mode 100644
index 90ca1cab4..000000000
--- a/winsup/cygwin/dir.cc
+++ /dev/null
@@ -1,385 +0,0 @@
-/* dir.cc: Posix directory-related routines
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#define _COMPILING_NEWLIB
-#include <dirent.h>
-
-#include "pinfo.h"
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-
-/* Cygwin internal */
-/* Return whether the directory of a file is writable.  Return 1 if it
-   is.  Otherwise, return 0, and set errno appropriately.  */
-int __stdcall
-writable_directory (const char *file)
-{
-#if 0
-  char dir[strlen (file) + 1];
-
-  strcpy (dir, file);
-
-  const char *usedir;
-  char *slash = strrchr (dir, '\\');
-  if (slash == NULL)
-    usedir = ".";
-  else if (slash == dir)
-    {
-      usedir = "\\";
-    }
-  else
-    {
-      *slash = '\0';
-      usedir = dir;
-    }
-
-  int acc = access (usedir, W_OK);
-
-  return acc == 0;
-#else
-  return 1;
-#endif
-}
-
-extern "C" int
-dirfd (DIR *dir)
-{
-  if (check_null_invalid_struct_errno (dir))
-    return -1;
-  if (dir->__d_cookie != __DIRENT_COOKIE)
-    {
-      set_errno (EBADF);
-      syscall_printf ("-1 = dirfd (%p)", dir);
-      return -1;
-    }
-  return dir->__d_dirent->d_fd;
-}
-
-enum opendir_states
-{
-  opendir_ok = 0,
-  opendir_saw_dot = 1,
-  opendir_saw_dot_dot = 2,
-  opendir_saw_eof = 4
-};
-
-/* opendir: POSIX 5.1.2.1 */
-extern "C" DIR *
-opendir (const char *name)
-{
-  fhandler_base *fh;
-  DIR *res;
-
-  fh = build_fh_name (name, NULL, PC_SYM_FOLLOW | PC_FULL);
-  if (!fh)
-    res = NULL;
-  else if (fh->exists ())
-      res = fh->opendir ();
-  else
-    {
-      set_errno (ENOENT);
-      res = NULL;
-    }
-
-  if (res)
-    res->__flags = 0;
-  else if (fh)
-    delete fh;
-  return res;
-}
-
-/* readdir: POSIX 5.1.2.1 */
-extern "C" struct dirent *
-readdir (DIR *dir)
-{
-  if (check_null_invalid_struct_errno (dir))
-    return NULL;
-
-  if (dir->__d_cookie != __DIRENT_COOKIE)
-    {
-      set_errno (EBADF);
-      syscall_printf ("%p = readdir (%p)", NULL, dir);
-      return NULL;
-    }
-
-  dirent *res = ((fhandler_base *) dir->__fh)->readdir (dir);
-
-  if (!res)
-    {
-      if (!(dir->__flags & opendir_saw_dot))
-	{
-	  res = dir->__d_dirent;
-	  strcpy (res->d_name, ".");
-	  dir->__flags |= opendir_saw_dot;
-	  dir->__d_position++;
-	}
-      else if (!(dir->__flags & opendir_saw_dot_dot))
-	{
-	  res = dir->__d_dirent;
-	  strcpy (res->d_name, "..");
-	  dir->__flags |= opendir_saw_dot_dot;
-	  dir->__d_position++;
-	}
-    }
-
-  if (res)
-    {
-      /* Compute d_ino by combining filename hash with the directory hash
-	 (which was stored in dir->__d_dirhash when opendir was called). */
-      if (res->d_name[0] == '.')
-	{
-	  if (res->d_name[1] == '\0')
-	    {
-	      dir->__d_dirent->d_ino = dir->__d_dirhash;
-	      dir->__flags |= opendir_saw_dot;
-	    }
-	  else if (res->d_name[1] != '.' || res->d_name[2] != '\0')
-	    goto hashit;
-	  else
-	    {
-	      dir->__flags |= opendir_saw_dot_dot;
-	      char *p, up[strlen (dir->__d_dirname) + 1];
-	      strcpy (up, dir->__d_dirname);
-	      if (!(p = strrchr (up, '\\')))
-		goto hashit;
-	      *p = '\0';
-	      if (!(p = strrchr (up, '\\')))
-		dir->__d_dirent->d_ino = hash_path_name (0, ".");
-	      else
-		{
-		  *p = '\0';
-		  dir->__d_dirent->d_ino = hash_path_name (0, up);
-		}
-	    }
-	}
-      else
-	{
-      hashit:
-	  __ino64_t dino = hash_path_name (dir->__d_dirhash, "\\");
-	  dir->__d_dirent->d_ino = hash_path_name (dino, res->d_name);
-	}
-      res->__ino32 = dir->__d_dirent->d_ino;	// for legacy applications
-    }
-  return res;
-}
-
-extern "C" _off64_t
-telldir64 (DIR *dir)
-{
-  if (check_null_invalid_struct_errno (dir))
-    return -1;
-
-  if (dir->__d_cookie != __DIRENT_COOKIE)
-    return 0;
-  return ((fhandler_base *) dir->__fh)->telldir (dir);
-}
-
-/* telldir */
-extern "C" _off_t
-telldir (DIR *dir)
-{
-  return telldir64 (dir);
-}
-
-extern "C" void
-seekdir64 (DIR *dir, _off64_t loc)
-{
-  if (check_null_invalid_struct_errno (dir))
-    return;
-
-  if (dir->__d_cookie != __DIRENT_COOKIE)
-    return;
-  dir->__flags = 0;
-  return ((fhandler_base *) dir->__fh)->seekdir (dir, loc);
-}
-
-/* seekdir */
-extern "C" void
-seekdir (DIR *dir, _off_t loc)
-{
-  seekdir64 (dir, (_off64_t)loc);
-}
-
-/* rewinddir: POSIX 5.1.2.1 */
-extern "C" void
-rewinddir (DIR *dir)
-{
-  if (check_null_invalid_struct_errno (dir))
-    return;
-
-  if (dir->__d_cookie != __DIRENT_COOKIE)
-    return;
-  dir->__flags = 0;
-  return ((fhandler_base *) dir->__fh)->rewinddir (dir);
-}
-
-/* closedir: POSIX 5.1.2.1 */
-extern "C" int
-closedir (DIR *dir)
-{
-  if (check_null_invalid_struct_errno (dir))
-    return -1;
-
-  if (dir->__d_cookie != __DIRENT_COOKIE)
-    {
-      set_errno (EBADF);
-      syscall_printf ("-1 = closedir (%p)", dir);
-      return -1;
-    }
-
-  /* Reset the marker in case the caller tries to use `dir' again.  */
-  dir->__d_cookie = 0;
-
-  int res = ((fhandler_base *) dir->__fh)->closedir (dir);
-
-  cygheap->fdtab.release (dir->__d_dirent->d_fd);
-
-  free (dir->__d_dirname);
-  free (dir->__d_dirent);
-  free (dir);
-  syscall_printf ("%d = closedir (%p)", res);
-  return res;
-}
-
-/* mkdir: POSIX 5.4.1.1 */
-extern "C" int
-mkdir (const char *dir, mode_t mode)
-{
-  int res = -1;
-  SECURITY_ATTRIBUTES sa = sec_none_nih;
-  security_descriptor sd;
-
-  path_conv real_dir (dir, PC_SYM_NOFOLLOW);
-
-  if (real_dir.error)
-    {
-      set_errno (real_dir.case_clash ? ECASECLASH : real_dir.error);
-      goto done;
-    }
-
-  nofinalslash (real_dir.get_win32 (), real_dir.get_win32 ());
-  if (! writable_directory (real_dir.get_win32 ()))
-    goto done;
-
-  if (allow_ntsec && real_dir.has_acls ())
-    set_security_attribute (S_IFDIR | ((mode & 07777) & ~cygheap->umask),
-			    &sa, sd);
-
-  if (CreateDirectoryA (real_dir.get_win32 (), &sa))
-    {
-      if (!allow_ntsec && allow_ntea)
-	set_file_attribute (real_dir.has_acls (), real_dir.get_win32 (),
-			    S_IFDIR | ((mode & 07777) & ~cygheap->umask));
-#ifdef HIDDEN_DOT_FILES
-      char *c = strrchr (real_dir.get_win32 (), '\\');
-      if ((c && c[1] == '.') || *real_dir.get_win32 () == '.')
-	SetFileAttributes (real_dir.get_win32 (), FILE_ATTRIBUTE_HIDDEN);
-#endif
-      res = 0;
-    }
-  else
-    __seterrno ();
-
-done:
-  syscall_printf ("%d = mkdir (%s, %d)", res, dir, mode);
-  return res;
-}
-
-/* rmdir: POSIX 5.5.2.1 */
-extern "C" int
-rmdir (const char *dir)
-{
-  int res = -1;
-  DWORD devn;
-
-  path_conv real_dir (dir, PC_SYM_NOFOLLOW);
-
-  if (real_dir.error)
-    set_errno (real_dir.error);
-  else if ((devn = real_dir.get_devn ()) == FH_PROC || devn == FH_REGISTRY
-	   || devn == FH_PROCESS)
-    set_errno (EROFS);
-  else if (!real_dir.exists ())
-    set_errno (ENOENT);
-  else if  (!real_dir.isdir ())
-    set_errno (ENOTDIR);
-  else
-    {
-      /* Even own directories can't be removed if R/O attribute is set. */
-      if (real_dir.has_attribute (FILE_ATTRIBUTE_READONLY))
-	SetFileAttributes (real_dir,
-			   (DWORD) real_dir & ~FILE_ATTRIBUTE_READONLY);
-
-      int rc = RemoveDirectory (real_dir);
-      DWORD att = GetFileAttributes (real_dir);
-
-      /* Sometimes smb indicates failure when it really succeeds, so check for
-	 this case specifically. */
-      if (rc || att == INVALID_FILE_ATTRIBUTES)
-	{
-	  /* RemoveDirectory on a samba drive doesn't return an error if the
-	     directory can't be removed because it's not empty. Checking for
-	     existence afterwards keeps us informed about success. */
-	  if (att != INVALID_FILE_ATTRIBUTES)
-	    set_errno (ENOTEMPTY);
-	  else
-	    res = 0;
-	}
-      else
-	{
-	  /* This kludge detects if we are attempting to remove the current working
-	     directory.  If so, we will move elsewhere to potentially allow the
-	     rmdir to succeed.  This means that cygwin's concept of the current working
-	     directory != Windows concept but, hey, whaddaregonnado?
-	     Note that this will not cause something like the following to work:
-		     $ cd foo
-		     $ rmdir .
-	     since the shell will have foo "open" in the above case and so Windows will
-	     not allow the deletion.
-	     FIXME: A potential workaround for this is for cygwin apps to *never* call
-	     SetCurrentDirectory. */
-	  if (strcasematch (real_dir, cygheap->cwd.win32)
-	      && !strcasematch ("c:\\", cygheap->cwd.win32))
-	    {
-	      DWORD err = GetLastError ();
-	      if (!SetCurrentDirectory ("c:\\"))
-		SetLastError (err);
-	      else if ((res = rmdir (dir)))
-		SetCurrentDirectory (cygheap->cwd.win32);
-	    }
-	  if (res)
-	    {
-	      if (GetLastError () != ERROR_ACCESS_DENIED
-		  || !wincap.access_denied_on_delete ())
-		__seterrno ();
-	      else
-		set_errno (ENOTEMPTY);	/* On 9X ERROR_ACCESS_DENIED is
-					       returned if you try to remove a
-					       non-empty directory. */
-
-	      /* If directory still exists, restore R/O attribute. */
-	      if (real_dir.has_attribute (FILE_ATTRIBUTE_READONLY))
-		SetFileAttributes (real_dir, real_dir);
-	    }
-	}
-    }
-
-  syscall_printf ("%d = rmdir (%s)", res, dir);
-  return res;
-}
diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc
deleted file mode 100644
index 3032cc454..000000000
--- a/winsup/cygwin/dlfcn.cc
+++ /dev/null
@@ -1,156 +0,0 @@
-/* dlfcn.cc
-
-   Copyright 1998, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <ctype.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "perprocess.h"
-#include "thread.h"
-#include "dlfcn.h"
-#include "dll_init.h"
-#include "cygerrno.h"
-
-#define _dl_error _reent_winsup ()->_dl_error
-#define _dl_buffer _reent_winsup ()->_dl_buffer
-
-static void __stdcall
-set_dl_error (const char *str)
-{
-  __small_sprintf (_dl_buffer, "%s: %E", str);
-  _dl_error = 1;
-}
-
-/* Look for an executable file given the name and the environment
-   variable to use for searching (eg., PATH); returns the full
-   pathname (static buffer) if found or NULL if not. */
-inline const char * __stdcall
-check_path_access (const char *mywinenv, const char *name, path_conv& buf)
-{
-  return find_exec (name, buf, mywinenv, FE_NNF | FE_NATIVE | FE_CWD);
-}
-
-/* Search LD_LIBRARY_PATH for dll, if it exists.
-   Return Windows version of given path. */
-static const char * __stdcall
-get_full_path_of_dll (const char* str, char *name)
-{
-  int len = strlen (str);
-
-  /* empty string or too long to be legal win32 pathname? */
-  if (len == 0 || len >= CYG_MAX_PATH - 1)
-    return str;		/* Yes.  Let caller deal with it. */
-
-  const char *ret;
-
-  strcpy (name, str);	/* Put it somewhere where we can manipulate it. */
-
-  /* Add extension if necessary */
-  if (str[len - 1] != '.')
-    {
-      /* Add .dll only if no extension provided. */
-      const char *p = strrchr (str, '.');
-      if (!p || strpbrk (p, "\\/"))
-	strcat (name, ".dll");
-    }
-
-  path_conv real_filename;
-
-  if (isabspath (name) ||
-      (ret = check_path_access ("LD_LIBRARY_PATH=", name, real_filename)) == NULL)
-    real_filename.check (name);	/* Convert */
-
-  if (!real_filename.error)
-    ret = strcpy (name, real_filename);
-  else
-    {
-      set_errno (real_filename.error);
-      ret = NULL;
-    }
-
-  return ret;
-}
-
-void *
-dlopen (const char *name, int)
-{
-  SetResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlopen");
-
-  void *ret;
-
-  if (name == NULL)
-    ret = (void *) GetModuleHandle (NULL); /* handle for the current module */
-  else
-    {
-      char buf[CYG_MAX_PATH];
-      /* handle for the named library */
-      const char *fullpath = get_full_path_of_dll (name, buf);
-      if (!fullpath)
-	ret = NULL;
-      else
-	{
-	  ret = (void *) LoadLibrary (fullpath);
-	  if (ret == NULL)
-	    __seterrno ();
-	}
-    }
-
-  if (!ret)
-    set_dl_error ("dlopen");
-  debug_printf ("ret %p", ret);
-
-  ReleaseResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlopen");
-  return ret;
-}
-
-void *
-dlsym (void *handle, const char *name)
-{
-  void *ret = (void *) GetProcAddress ((HMODULE) handle, name);
-  if (!ret)
-    set_dl_error ("dlsym");
-  debug_printf ("ret %p", ret);
-  return ret;
-}
-
-int
-dlclose (void *handle)
-{
-  SetResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlclose");
-
-  int ret = -1;
-  void *temphandle = (void *) GetModuleHandle (NULL);
-  if (temphandle == handle || FreeLibrary ((HMODULE) handle))
-    ret = 0;
-  if (ret)
-    set_dl_error ("dlclose");
-  CloseHandle ((HMODULE) temphandle);
-
-  ReleaseResourceLock (LOCK_DLL_LIST, READ_LOCK | WRITE_LOCK, "dlclose");
-  return ret;
-}
-
-char *
-dlerror ()
-{
-  char *res;
-  if (!_dl_error)
-    res = NULL;
-  else
-    {
-      _dl_error = 0;
-      res = _dl_buffer;
-    }
-  return res;
-}
diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc
deleted file mode 100644
index 1bfd61cf9..000000000
--- a/winsup/cygwin/dll_init.cc
+++ /dev/null
@@ -1,430 +0,0 @@
-/* dll_init.cc
-
-   Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include "cygerrno.h"
-#include "perprocess.h"
-#include "dll_init.h"
-#include "environ.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "pinfo.h"
-
-extern void __stdcall check_sanity_and_sync (per_process *);
-
-dll_list NO_COPY dlls;
-
-static NO_COPY int in_forkee = 0;
-static int dll_global_dtors_recorded;
-
-/* Run destructors for all DLLs on exit. */
-static void
-dll_global_dtors ()
-{
-  for (dll *d = dlls.istart (DLL_ANY); d; d = dlls.inext ())
-    d->p.run_dtors ();
-}
-
-/* Run all constructors associated with a dll */
-void
-per_module::run_ctors ()
-{
-  void (**pfunc)() = ctors;
-
-  /* Run ctors backwards, so skip the first entry and find how many
-    there are, then run them.  */
-
-  if (pfunc)
-    {
-      int i;
-      for (i = 1; pfunc[i]; i++);
-
-      for (int j = i - 1; j > 0; j--)
-	(pfunc[j]) ();
-    }
-}
-
-/* Run all destructors associated with a dll */
-void
-per_module::run_dtors ()
-{
-  void (**pfunc)() = dtors;
-  for (int i = 1; pfunc[i]; i++)
-    (pfunc[i]) ();
-}
-
-/* Initialize an individual DLL */
-int
-dll::init ()
-{
-  int ret = 1;
-
-  /* Why didn't we just import this variable? */
-  *(p.envptr) = __cygwin_environ;
-
-  /* Don't run constructors or the "main" if we've forked. */
-  if (!in_forkee)
-    {
-      /* global contructors */
-      p.run_ctors ();
-
-      /* entry point of dll (use main of per_process with null args...) */
-      if (p.main)
-	ret = (*(p.main)) (0, 0, 0);
-    }
-
-  return ret;
-}
-
-/* Look for a dll based on name */
-dll *
-dll_list::operator[] (const char *name)
-{
-  dll *d = &start;
-  while ((d = d->next) != NULL)
-    if (strcasematch (name, d->name))
-      return d;
-
-  return NULL;
-}
-
-#define RETRIES 1000
-
-/* Allocate space for a dll struct contiguous with the just-loaded dll. */
-dll *
-dll_list::alloc (HINSTANCE h, per_process *p, dll_type type)
-{
-  char name[CYG_MAX_PATH + 1];
-  DWORD namelen = GetModuleFileName (h, name, sizeof (name));
-
-  /* Already loaded? */
-  dll *d = dlls[name];
-  if (d)
-    {
-      d->count++;	/* Yes.  Bump the usage count. */
-      return d;		/* Return previously allocated pointer. */
-    }
-
-  SYSTEM_INFO s1;
-  GetSystemInfo (&s1);
-
-  int i;
-  void *s = p->bss_end;
-  DWORD n;
-  MEMORY_BASIC_INFORMATION m;
-  /* Search for space after the DLL */
-  for (i = 0; i <= RETRIES; i++, s = (char *) m.BaseAddress + m.RegionSize)
-    {
-      if (!VirtualQuery (s, &m, sizeof (m)))
-	return NULL;	/* Can't do it. */
-      if (m.State == MEM_FREE)
-	{
-	  /* Couldn't find any.  Uh oh.  FIXME: Issue an error? */
-	  if (i == RETRIES)
-	    return NULL;	/* Oh well.  Couldn't locate free space. */
-
-	  /* Ensure that this is rounded to the nearest page boundary.
-	     FIXME: Should this be ensured by VirtualQuery? */
-	  n = (DWORD) m.BaseAddress;
-	  DWORD r = n % s1.dwAllocationGranularity;
-
-	  if (r)
-	    n = ((n - r) + s1.dwAllocationGranularity);
-
-	  /* First reserve the area of memory, then commit it. */
-	  if (VirtualAlloc ((void *) n, sizeof (dll), MEM_RESERVE, PAGE_READWRITE))
-	    d = (dll *) VirtualAlloc ((void *) n, sizeof (dll), MEM_COMMIT,
-				      PAGE_READWRITE);
-	  if (d)
-	    break;
-	}
-    }
-
-  /* Did we succeed? */
-  if (d == NULL)
-    {			/* Nope. */
-#ifdef DEBUGGING
-      system_printf ("VirtualAlloc failed, %E");
-#endif
-      __seterrno ();
-      return NULL;
-    }
-
-  /* Now we've allocated a block of information.  Fill it in with the supplied
-     info about this DLL. */
-  d->count = 1;
-  d->namelen = namelen;
-  strcpy (d->name, name);
-  d->handle = h;
-  d->p = p;
-  d->type = type;
-  if (end == NULL)
-    end = &start;	/* Point to "end" of dll chain. */
-  end->next = d;	/* Standard linked list stuff. */
-  d->next = NULL;
-  d->prev = end;
-  end = d;
-  tot++;
-  if (type == DLL_LOAD)
-    loaded_dlls++;
-  return d;
-}
-
-/* Detach a DLL from the chain. */
-void
-dll_list::detach (void *retaddr)
-{
-  if (!myself || myself->process_state == PID_EXITED)
-    return;
-  MEMORY_BASIC_INFORMATION m;
-  if (!VirtualQuery (retaddr, &m, sizeof m))
-    return;
-  HMODULE h = (HMODULE) m.AllocationBase;
-
-  dll *d = &start;
-  while ((d = d->next))
-    if (d->handle != h)
-      continue;
-    else if (d->count <= 0)
-      system_printf ("WARNING: try to detach an already detached dll ...");
-    else if (--d->count == 0)
-      {
-	d->p.run_dtors ();
-	d->prev->next = d->next;
-	if (d->next)
-	  d->next->prev = d->prev;
-	if (d->type == DLL_LOAD)
-	  loaded_dlls--;
-	if (end == d)
-	  end = d->prev;
-	VirtualFree (d, 0, MEM_RELEASE);
-	break;
-      }
-}
-
-/* Initialization for all linked DLLs, called by dll_crt0_1. */
-void
-dll_list::init ()
-{
-  /* Make sure that destructors are called on exit. */
-  if (!dll_global_dtors_recorded)
-    {
-      atexit (dll_global_dtors);
-      dll_global_dtors_recorded = 1;
-    }
-
-  /* Walk the dll chain, initializing each dll */
-  dll *d = &start;
-  while ((d = d->next))
-    d->init ();
-}
-
-#define A64K (64 * 1024)
-
-/* Mark every memory address up to "here" as reserved.  This may force
-   Windows NT to load a DLL in the next available, lowest slot. */
-static void
-reserve_upto (const char *name, DWORD here)
-{
-  DWORD size;
-  MEMORY_BASIC_INFORMATION mb;
-  for (DWORD start = 0x10000; start < here; start += size)
-    if (!VirtualQuery ((void *) start, &mb, sizeof (mb)))
-      size = A64K;
-    else
-      {
-	size = A64K * ((mb.RegionSize + A64K - 1) / A64K);
-	start = A64K * (((DWORD) mb.BaseAddress + A64K - 1) / A64K);
-
-	if (start + size > here)
-	  size = here - start;
-	if (mb.State == MEM_FREE &&
-	    !VirtualAlloc ((void *) start, size, MEM_RESERVE, PAGE_NOACCESS))
-	  api_fatal ("couldn't allocate memory %p(%d) for '%s' alignment, %E\n",
-		     start, size, name);
-      }
-}
-
-/* Release all of the memory previously allocated by "upto" above.
-   Note that this may also free otherwise reserved memory.  If that becomes
-   a problem, we'll have to keep track of the memory that we reserve above. */
-static void
-release_upto (const char *name, DWORD here)
-{
-  DWORD size;
-  MEMORY_BASIC_INFORMATION mb;
-  for (DWORD start = 0x10000; start < here; start += size)
-    if (!VirtualQuery ((void *) start, &mb, sizeof (mb)))
-      size = 64 * 1024;
-    else
-      {
-	size = mb.RegionSize;
-	if (!(mb.State == MEM_RESERVE && mb.AllocationProtect == PAGE_NOACCESS &&
-	    (((void *) start < cygheap->user_heap.base
-	      || (void *) start > cygheap->user_heap.top) &&
-	     ((void *) start < (void *) cygheap
-	      | (void *) start > (void *) ((char *) cygheap + CYGHEAPSIZE)))))
-	  continue;
-	if (!VirtualFree ((void *) start, 0, MEM_RELEASE))
-	  api_fatal ("couldn't release memory %p(%d) for '%s' alignment, %E\n",
-		     start, size, name);
-      }
-}
-
-/* Reload DLLs after a fork.  Iterates over the list of dynamically loaded DLLs
-   and attempts to load them in the same place as they were loaded in the parent. */
-void
-dll_list::load_after_fork (HANDLE parent, dll *first)
-{
-  in_forkee = 1;
-  int try2 = 0;
-  dll d;
-
-  void *next = first;
-  while (next)
-    {
-      DWORD nb;
-      /* Read the dll structure from the parent. */
-      if (!ReadProcessMemory (parent, next, &d, sizeof (dll), &nb) ||
-	  nb != sizeof (dll))
-	return;
-
-      /* We're only interested in dynamically loaded dlls.
-	 Hopefully, this function wouldn't even have been called unless
-	 the parent had some of those. */
-      if (d.type == DLL_LOAD)
-	{
-	  bool unload = true;
-	  HMODULE h = LoadLibraryEx (d.name, NULL, DONT_RESOLVE_DLL_REFERENCES);
-
-	  if (!h)
-	    system_printf ("can't reload %s", d.name);
-	  /* See if DLL will load in proper place.  If so, free it and reload
-	     it the right way.
-	     It sort of stinks that we can't invert the order of the FreeLibrary
-	     and LoadLibrary since Microsoft documentation seems to imply that that
-	     should do what we want.  However, since the library was loaded above,
-	     the second LoadLibrary does not execute it's startup code unless it
-	     is first unloaded. */
-	  else if (h == d.handle)
-	    {
-	      if (unload)
-		{
-		  FreeLibrary (h);
-		  LoadLibrary (d.name);
-		}
-	    }
-	  else if (try2)
-	    api_fatal ("unable to remap %s to same address as parent(%p) != %p",
-		       d.name, d.handle, h);
-	  else
-	    {
-	      /* It loaded in the wrong place.  Dunno why this happens but it always
-		 seems to happen when there are multiple DLLs attempting to load into
-		 the same address space.  In the "forked" process, the second DLL always
-		 loads into a different location. */
-	      FreeLibrary (h);
-	      /* Block all of the memory up to the new load address. */
-	      reserve_upto (d.name, (DWORD) d.handle);
-	      try2 = 1;		/* And try */
-	      continue;		/*  again. */
-	    }
-	  /* If we reached here, and try2 is set, then there is a lot of memory to
-	     release. */
-	  if (try2)
-	    {
-	      release_upto (d.name, (DWORD) d.handle);
-	      try2 = 0;
-	    }
-	}
-      next = d.next;	/* Get the address of the next DLL. */
-    }
-  in_forkee = 0;
-}
-
-extern "C" int
-dll_dllcrt0 (HMODULE h, per_process *p)
-{
-  if (p == NULL)
-    p = &__cygwin_user_data;
-  else
-    *(p->impure_ptr_ptr) = __cygwin_user_data.impure_ptr;
-
-  /* Partially initialize Cygwin guts for non-cygwin apps. */
-  if (dynamically_loaded && user_data->magic_biscuit == 0)
-    dll_crt0 (p);
-  else
-    check_sanity_and_sync (p);
-
-  dll_type type;
-
-  /* If this function is called before cygwin has finished
-     initializing, then the DLL must be a cygwin-aware DLL
-     that was explicitly linked into the program rather than
-     a dlopened DLL. */
-  if (!cygwin_finished_initializing)
-    type = DLL_LINK;
-  else
-    {
-      type = DLL_LOAD;
-      dlls.reload_on_fork = 1;
-    }
-
-  /* Allocate and initialize space for the DLL. */
-  dll *d = dlls.alloc (h, p, type);
-
-  /* If d == NULL, then something is broken.
-     Otherwise, if we've finished initializing, it's ok to
-     initialize the DLL.  If we haven't finished initializing,
-     it may not be safe to call the dll's "main" since not
-     all of cygwin's internal structures may have been set up. */
-  if (!d || (cygwin_finished_initializing && !d->init ()))
-    return -1;
-
-  return (DWORD) d;
-}
-
-/* OBSOLETE: This function is obsolescent and will go away in the
-   future.  Cygwin can now handle being loaded from a noncygwin app
-   using the same entry point. */
-
-extern "C" int
-dll_noncygwin_dllcrt0 (HMODULE h, per_process *p)
-{
-  return dll_dllcrt0 (h, p);
-}
-
-extern "C" void
-cygwin_detach_dll (dll *)
-{
-  dlls.detach (__builtin_return_address (0));
-}
-
-extern "C" void
-dlfork (int val)
-{
-  dlls.reload_on_fork = val;
-}
-
-/* Called from various places to update all of the individual
-   ideas of the environ block.  Explain to me again why we didn't
-   just import __cygwin_environ? */
-void __stdcall
-update_envptrs ()
-{
-  extern char ***main_environ;
-  for (dll *d = dlls.istart (DLL_ANY); d; d = dlls.inext ())
-    {
-	*(d->p.envptr) = __cygwin_environ;
-    }
-  *main_environ = __cygwin_environ;
-}
diff --git a/winsup/cygwin/dll_init.h b/winsup/cygwin/dll_init.h
deleted file mode 100644
index 5d6c6ab03..000000000
--- a/winsup/cygwin/dll_init.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* dll_init.h
-
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-struct per_module
-{
-  char ***envptr;
-  void (**ctors)(void);
-  void (**dtors)(void);
-  void *data_start;
-  void *data_end;
-  void *bss_start;
-  void *bss_end;
-  int (*main)(int, char **, char **);
-  per_module &operator = (per_process *p)
-  {
-    envptr = p->envptr;
-    ctors = p->ctors;
-    dtors = p->dtors;
-    data_start = p->data_start;
-    data_end = p->data_end;
-    bss_start = p->bss_start;
-    bss_end = p->bss_end;
-    main = p->main;
-    return *this;
-  }
-  void run_ctors ();
-  void run_dtors ();
-};
-
-
-typedef enum
-{
-  DLL_NONE,
-  DLL_LINK,
-  DLL_LOAD,
-  DLL_ANY
-} dll_type;
-
-struct dll
-{
-  struct dll *next, *prev;
-  per_module p;
-  HMODULE handle;
-  int count;
-  dll_type type;
-  int namelen;
-  char name[CYG_MAX_PATH + 1];
-  void detach ();
-  int init ();
-};
-
-#define MAX_DLL_BEFORE_INIT     100
-
-class dll_list
-{
-  dll *end;
-  dll *hold;
-  dll_type hold_type;
-public:
-  dll start;
-  int tot;
-  int loaded_dlls;
-  int reload_on_fork;
-  dll *operator [] (const char *name);
-  dll *alloc (HINSTANCE, per_process *, dll_type);
-  void detach (void *);
-  void init ();
-  void load_after_fork (HANDLE, dll *);
-  dll *inext ()
-  {
-    while ((hold = hold->next))
-      if (hold_type == DLL_ANY || hold->type == hold_type)
-	break;
-    return hold;
-  }
-  dll *istart (dll_type t)
-  {
-    hold_type = t;
-    hold = &start;
-    return inext ();
-  }
-};
-
-extern dll_list dlls;
diff --git a/winsup/cygwin/dll_init.sgml b/winsup/cygwin/dll_init.sgml
deleted file mode 100644
index 38070390c..000000000
--- a/winsup/cygwin/dll_init.sgml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<sect1 id="func-cygwin-detach-dll">
-<title>cygwin_detach_dll</title>
-
-<funcsynopsis>
-<funcdef>extern "C" void
-<function>cygwin_detach_dll</function></funcdef>
-<paramdef>int <parameter>dll_index</parameter></paramdef>
-</funcsynopsis>
-
-</sect1>
diff --git a/winsup/cygwin/dlmalloc.c b/winsup/cygwin/dlmalloc.c
deleted file mode 100644
index a79a72513..000000000
--- a/winsup/cygwin/dlmalloc.c
+++ /dev/null
@@ -1,4095 +0,0 @@
-/*
- * To do:
- *  - strdup?  maybe shouldn't bother yet, it seems difficult to get includes
- *    right using dlmalloc.h
- *  - add STD_C prototyping
- *  - adhere to comment conventions
- *  - maybe fix ALLOCFILL vs. MOATFILL in do_init_realloced_chunk()
- *  - keep a list of mmaped regions for checking in malloc_update_mallinfo()
- *  - I think memalign() is wrong: it aligns the chunk rather than the memory
- *    portion of the chunk.
- *  - "& -alignment" in memalign() is suspect: should use "& ~alignment"
- *    instead?
- *  - malloc.h doesn't need malloc_COPY or probably a bunch of other stuff
- *  - add mallopt options for e.g. fill?
- *  - come up with a non-BBC version of M_C
- *  - document necessity of checking chunk address in do_check_chunk prior to
- *    accessing any of its fields
- * Done:
- *  minor speedup due to extend check before mremap
- *  minor speedup due to returning malloc() result in memalign() if aligned
- *  made malloc_update_mallinfo() check alloced regions at start of sbrk area
- *  fixed bug: After discovering foreign sbrk, if old_top was MINSIZE, would
- *    reduce old_top_size to 0, thus making inuse(old_top) return 0; other
- *    functions would consequently attempt to access old_top->{fd,bk}, which
- *    were invalid.  This is in malloc_extend_top(), in the "double
- *    fencepost" section.
- * Documentation:
- *  malloc_usable_size(P) is equivalent to realloc(P, malloc_usable_size(P))
- *
- * $Log$
- * Revision 1.7  2003/09/25 00:37:16  cgf
- * * devices.cc: New file.
- * * devices.gperf: New file.
- * * devices.shilka: New file.
- * * cygwin-gperf: New file.
- * * cygwin-shilka: New file.
- * * fhandler_fifo.cc: New file.
- * * fhandler_nodevice.cc : New file.  Reorganize headers so that path.h precedes
- * fhandler.h throughout.  Remove device argument and unit arguments from fhandler
- * constructors throughout.  Remove pc arguments to fhandler functions and use
- * internal pc element instead, throughout.  Use dev element in pc throughout.
- * Use major/minor elements rather than units and device numbers previously in
- * fhandler class.  Use correct methods for fhandler file names rather than
- * directly accessing file name variables, throughout.
- * * Makefile.in (DLL_OFILES): Add devices.o, fhandler_fifo.o
- * * dcrt0.cc (dll_crt0_1): Call device::init.
- * * devices.h: Renumber devices based on more Linux-like major/minor numbers.
- * Add more devices.  Declare standard device storage.
- * (device): Declare struct.
- * * dir.cc (opendir): Use new 'build_fh_name' to construct a fhandler_* type.
- * * dtable.cc (dtable::get_debugger_info): Ditto.
- * (cygwin_attach_handle_to_fd): Ditto.
- * (dtable::release): Remove special FH_SOCKET case in favor of generic
- * "need_fixup_before" test.
- * (dtable::init_std_file_from_handle): Use either build_fh_dev or build_fh_name
- * to build standard fhandler.
- * (dtable::build_fh_name): Renamed from dtable::build_fhandler_from_name.  Move
- * out of dtable class.  Don't accept a path_conv argument.  Just build it here
- * and pass it to:
- * (build_fh_pc): Renamed from dtable::build_fhandler.  Move out of dtable class.
- * Use intrinsic device type in path_conv to create new fhandler.
- * (build_fh_dev): Renamed from dtable::build_fhandler.  Move out of dtable class.
- * Simplify arguments to just take new 'device' type and a name.  Just return
- * pointer to fhandler rather than trying to insert into dtable.
- * (dtable::dup_worker): Accommodate above build_fh name changes.
- * (dtable::find_fifo): New (currently broken) function.
- * (handle_to_fn): Use strechr for efficiency.
- * * dtable.h: Reflect above build_fh name changes and argument differences.
- * (fhandler_base *&operator []): Return self rather than copy of self.
- * * fhandler.cc (fhandler_base::operator =): Use pc element to set normalized
- * path.
- * (fhandler_base::set_name): Ditto.
- * (fhandler_base::raw_read): Use method to access name.
- * (fhandler_base::write): Correctly use get_output_handle rather than get_handle.
- * (handler_base::device_access_denied): New function.
- * (fhandler_base::open): Eliminate pc argument and use pc element of
- * fhandler_base throughout.
- * (fhandler_base::fstat): Detect if device is based in filesystem and use
- * fstat_fs to calculate stat, if so.
- * (fhandler_base::fhandler_base): Eliminate handling of file names and, instead,
- * just free appropriate component from pc.
- * (fhandler_base::opendir): Remove path_conv parameter.
- * * fhandler.h: Remove all device flags.
- * (fhandler_base::pc): New element.
- * (fhandler_base::set_name): Change argument to path_conv.
- * (fhandler_base::error): New function.
- * (fhandler_base::exists): New function.
- * (fhandler_base::pc_binmode): New function.
- * (fhandler_base::dev): New function.
- * (fhandler_base::open_fs): New function.
- * (fhandler_base::fstat_fs): New function.
- * (fhandler_base::fstat_by_name): New function.
- * (fhandler_base::fstat_by_handle): New function.
- * (fhandler_base::isfifo): New function.
- * (fhandler_base::is_slow): New function.
- * (fhandler_base::is_auto_device): New function.
- * (fhandler_base::is_fs_special): New function.
- * (fhandler_base::device_access_denied): New function.
- * (fhandler_base::operator DWORD&): New operator.
- * (fhandler_base::get_name): Return normalized path from pc.
- * (fhandler_base::get_win32_name): Return windows path from pc.
- * (fhandler_base::isdevice): Renamed from is_device.
- * (fhandler_base::get_native_name): Return device format.
- * (fhandler_fifo): New class.
- * (fhandler_nodevice): New class.
- * (select_stuff::device_specific): Remove array.
- * (select_stuff::device_specific_pipe): New class element.
- * (select_stuff::device_specific_socket): New class element.
- * (select_stuff::device_specific_serial): New class element.
- * (select_stuff::select_stuff): Initialize new elements.
- * * fhandler_disk_file.cc (fhandler_base::fstat_by_handle): Move to base class
- * from fhandler_disk_file.
- * (fhandler_base::fstat_by_name): Ditto.
- * (fhandler_base::fstat_by_name): Ditto.
- * (fhandler_disk_file::open): Move most functionality into
- * fhandler_base::open_fs.
- * (fhandler_base::open_fs): New function.
- * (fhandler_disk_file::close): Move most functionality into
- * fhandler_base::close_fs.
- * (fhandler_base::close_fs): New function.
- * * fhandler_mem.cc (fhandler_dev_mem::open): Use device name in debugging
- * output.
- * * fhandler_socket.cc (fhandler_socket::set_connect_secret): Copy standard
- * urandom device into appropriate place.
- * (fhandler_socket::accept): Reflect change in fdsock return value.
- * * fhandler_tty.cc: See "throughouts" above.
- * * net.cc: Accommodate fdsock change throughout.
- * (fdsock): Return success or failure, accept fd argument and device argument.
- * * path.cc (symlink_info::major): New element.
- * (symlink_info::minor): New element.
- * (symlink_info::parse_device): Declare new function.
- * (fs_info::update): Accommodate changes in path_conv class.
- * (path_conv::fillin): Ditto.
- * (path_conv::return_and_clear_normalized_path): Eliminate.
- * (path_conv::set_normalized_path): New function.
- * (path_conv::path_conv): Set info in dev element.  Use path_conv methods Check
- * for FH_FS rather than FH_BAD to indicate when to fill in filesystem stuff.
- * where appropriate rather than direct access.  Use set_normalized_path to set
- * normalized path.
- * (windows_device_names): Eliminate.
- * (get_dev): Ditto.
- * (get_raw_device_number): Ditto.
- * (get_device_number): Ditto.
- * (win32_device_name): Call new device name parser to do most of the heavy
- * lifting.
- * (mount_info::conv_to_win32_path): Fill in dev field as appropriate.
- * (symlink_worker): Handle new device files.
- * (symlink_info::check): Ditto.
- * (symlink_info::parse_device): Define new function.
- * * path.h (executable_states): Move here from fhandler.h.
- * (fs_info): Rename variables to *_storage and create methods for accessing same.
- * (path_conv): Add dev element, remove devn and unit and adjust inline methods to
- * accommodate.
- * (set_normalized_path): Declare new function.
- * * pinfo.cc (_pinfo::commune_recv): Add broken support for handling fifos.
- * (_pinfo::commune_send): Ditto.
- * * pipe.cc (fhandler_pipe::close): check for existence of handle before closing
- * it.
- * (handler_pipe::create): Rename from make_pipe.  Change arguments to accept
- * fhandler_pipe array.  Accommodate fifos.
- * (pipe): Rework to deal with fhandler_pipe::create changes.
- * (_pipe): Ditto.
- * * select.cc: Use individual device_specific types throughout rather than
- * indexing with obsolete device number.
- * (set_bits): Use is_socket call rather than checking device number.
- * * shared_info.h (CURR_MOUNT_MAGIC): Update.
- * (conv_to_win32_path): Reflect addition of device argument.
- * * syscalls.cc (mknod_worker): New function.
- * (open): Use build_fh_name to build fhandler.
- * (chown_worker): Detect if this is an 'auto' device rather than an on-filesystem
- * device and handle appropriately.
- * (chmod_device): New function.
- * (chmod): Detect if this is an 'auto' device rather than an on-filesystem device
- * and handle appropriately.  Use chmod_device to set mode of in-filesystem
- * devices.
- * (stat_worker): Eliminate path_conv argument.  Call build_fh_name to construct
- * fhandler.  Use fh->error() rather than pc->error to detect errors in fhandler
- * construction.
- * (access_worker): New function pulled from access.  Accommodate in-filesystem
- * devices.
- * (access): Use access_worker.
- * (fpathconf): Detect if this is an 'auto' device rather than an on-filesystem
- * device and handle appropriately.
- * (mknod_worker): New function.
- * (mknod32): New function.
- * (chroot): Free normalized path -- assuming it was actually cmalloced.
- * * tty.cc (create_tty_master): Tweak for new device class.
- * (tty::common_init): Ditto.
- * * winsup.h (stat_worker): Remove.
- * (symlink_worker): Declare.
- * * exceptions.cc (set_process_mask): Just call sig_dispatch_pending and don't
- * worry about pending_signals since sig_dispatch_pending should always do the
- * right thing now.
- * (sig_handle): Reorganize SIGCONT handling to more closely conform to SUSv3.
- * * pinfo.h: Move __SIG enum to sigproc.h.
- * (PICOM_FIFO): New enum element.
- * (_pinfo): Remove 'thread2signal' stuff throughout class.
- * (_pinfo::commune_send): Make varargs.
- * (_pinfo::sigtodo): Eliminate.
- * (_pinfo::thread2signal): Ditto.
- * * signal.cc (kill_worker): Eliminate call to setthread2signal.
- * * sigproc.cc (local_sigtodo): Eliminate.
- * (getlocal_sigtodo): Ditto.
- * (sigelem): New class.
- * (pending_signals): New class.
- * (sigqueue): New variable, start of sigqueue linked list.
- * (sigcatch_nonmain): Eliminate.
- * (sigcatch_main): Eliminate.
- * (sigcatch_nosync): Eliminate.
- * (sigcomplete_nonmain): Eliminate.
- * (pending_signals): Eliminate.
- * (sig_clear): Call signal thread to clear pending signals, unless already in
- * signal thread.
- * (sigpending): Call signal thread to get pending signals.
- * (sig_dispatch_pending): Eliminate use of pending_signals and just check
- * sigqueue.
- * (sigproc_terminate): Eliminate all of the obsolete semaphore stuff.  Close
- * signal pipe handle.
- * (sig_send): Eliminate all of the obsolete semaphore stuff and use pipe to send
- * signals.
- * (getevent): Eliminate.
- * (pending_signals::add): New function.
- * (pending_signals::del): New function.
- * (pending_signals::next): New function.
- * (wait_sig): Eliminate all of the obsolete semaphore stuff.  Use pipe to
- * communicate and maintain a linked list of signals.
- * * sigproc.h: Move __SIG defines here.  Add __SIGPENDING.
- * (sig_dispatch_pending): Remove "C" specifier.
- * (sig_handle): Accept a mask argument.
- * * thread.cc: Remove signal handling considerations throughout.
- *
- * Revision 1.5.52.1  2003/09/02 02:31:08  cgf
- * merge from trunk
- *
- * Revision 1.6  2003/08/31 18:26:58  cgf
- * * Makefile.in (MALLOC_OFILES): Always fill in with correct malloc object.
- * * configure.in: Fill in MALLOC_OFILES with either debugging or regular malloc.
- * * configure: Regenerate.
- * * dlmalloc.c: Make various fruitless changes to attempt to get to work.
- * * dlmalloc.h: Ditto.
- * * malloc.cc (free): Check malloc pool when debugging.
- * * path.cc (win32_device_name): Eliminate compiler warning.
- * * sigproc.cc (sig_dispatch_pending): Remove use of was_pending.  Let
- * thisframe.call_signal_handler decide if handler should be called rather than
- * using bogus was_pending check.
- * * exceptions.cc (interrupt_setup): Remove accidentally checked in debugging
- * code.
- * * heap.cc (sbrk): Save rounded addess in user_heap_max.
- *
- * Revision 1.5  2001/10/03 03:49:25  cgf
- * * cygheap.cc (cfree): Remove malloc debugging probe.
- * * dlmalloc.c (errprint): Remove abort() call which causes interesting error
- * message printing to abort prematurely.
- * * environ.cc: Sprinkle MALLOC_CHECKs liberally throughout.
- * (_addenv): Allocate two empty elements at end of environ to
- * (apparently) work around problems with some buggy applications.
- * (winenv): Avoid calling alloca if no forced environment variable is present.
- *
- * * exceptions.cc (open_stackdumpfile): Don't print "Dumping stack trace to..."
- * when running in a cygwin environment (i.e., the parent is a cygwin process).
- *
- * * dtable.cc (dtable::init_std_file_from_handle): Move device type detection
- * code from build_fhandler here since it is only used by this function.
- * (dtable::build_fhandler_from_name): New method.  Renamed from
- * dtable::build_fhandler.
- * (dtable::build_fhandler): Use build_fhandler_from_name.
- * (cygwin_attach_handle_to_fd): Ditto.
- * * syscalls.cc (_open): Ditto.
- * (stat_worker): Ditto.
- * * dtable.h (dtable::build_fhandler_from_name): Rename declaration from
- * dtable::build_fhandler.
- *
- * Revision 1.4  2001/09/07 21:32:04  cgf
- * * cygheap.h (init_cygheap): Move heap pointers here.
- * * include/sys/cygwin.h (perprocess): Remove heap pointers.
- * * dcrt0.cc (__cygwin_user_data): Reflect obsolete perprocess stuff.
- * (_dll_crt0): Don't initialize heap pointers.
- * (cygwin_dll_init): Ditto.
- * (release_upto): Use heap pointers from cygheap.
- * * heap.h: Ditto.
- * * fork.cc (fork_parent): Ditto.  Don't set heap pointers in ch.
- * (fork_child): Remove obsolete sigproc_fixup_after_fork.
- * * shared.cc (memory_init): Reorganize so that cygheap initialization is called
- * prior to regular heap since regular heap uses cygheap now.
- * * sigproc.cc (proc_subproc): Eliminate zombies allocation.
- * (sigproc_init): Move zombies alloation here.  Don't free up array on fork, just
- * reuse it.
- * (sigproc_fixup_after_fork): Eliminate.
- * * sigproc.h: Ditto.
- * * include/cygwin/version.h: Reflect change to perprocess structure.
- *
- * Revision 1.3  2001/06/26 14:47:48  cgf
- * * mmap.cc: Clean up *ResourceLock calls throughout.
- * * thread.cc (pthread_cond::TimedWait): Check for WAIT_TIMEOUT as well as
- * WAIT_ABANDONED.
- * (__pthread_cond_timedwait): Calculate a relative wait from the abstime
- * parameter.
- *
- * Revision 1.2  2001/06/24 22:26:49  cgf
- * forced commit
- *
- * Revision 1.1  2001/04/24 15:25:30  duda
- * * dlmalloc.c: New file. Port of Doug Lea's malloc
- * * dlmalloc.h: Ditto.
- * * Makefile.in: Add support for MALLOC_DEBUG
- * * config.h.in: Ditto.
- * * winsup.h: Ditto.
- * * configure.in: Add --enable-malloc-debugging option.
- * * configure: Regenerate.
- * * debug.h: Include declarations for debugging malloc.
- * * tty.cc (grantpt): Fix definition.
- * (unlockpt): Ditto.
- *
- * Revision 1.1  1997/12/24 18:34:47  nsd
- * Initial revision
- *
- */
-/* ---------- To make a malloc.h, start cutting here ------------ */
-
-/*
-  A version of malloc/free/realloc written by Doug Lea and released to the
-  public domain.  Send questions/comments/complaints/performance data
-  to dl@cs.oswego.edu
-
-* VERSION 2.6.4  Thu Nov 28 07:54:55 1996  Doug Lea  (dl at gee)
-
-   Note: There may be an updated version of this malloc obtainable at
-	   ftp://g.oswego.edu/pub/misc/malloc.c
-	 Check before installing!
-
-* Why use this malloc?
-
-  This is not the fastest, most space-conserving, most portable, or
-  most tunable malloc ever written. However it is among the fastest
-  while also being among the most space-conserving, portable and tunable.
-  Consistent balance across these factors results in a good general-purpose
-  allocator. For a high-level description, see
-     http://g.oswego.edu/dl/html/malloc.html
-
-* Synopsis of public routines
-
-  (Much fuller descriptions are contained in the program documentation below.)
-
-  malloc(size_t n);
-     Return a pointer to a newly allocated chunk of at least n bytes, or null
-     if no space is available.
-  free(Void_t* p);
-     Release the chunk of memory pointed to by p, or no effect if p is null.
-  realloc(Void_t* p, size_t n);
-     Return a pointer to a chunk of size n that contains the same data
-     as does chunk p up to the minimum of (n, p's size) bytes, or null
-     if no space is available. The returned pointer may or may not be
-     the same as p. If p is null, equivalent to malloc.  Unless the
-     #define realloc_ZERO_BYTES_FREES below is set, realloc with a
-     size argument of zero (re)allocates a minimum-sized chunk.
-  memalign(size_t alignment, size_t n);
-     Return a pointer to a newly allocated chunk of n bytes, aligned
-     in accord with the alignment argument, which must be a power of
-     two.
-  valloc(size_t n);
-     Equivalent to memalign(pagesize, n), where pagesize is the page
-     size of the system (or as near to this as can be figured out from
-     all the includes/defines below.)
-  pvalloc(size_t n);
-     Equivalent to valloc(minimum-page-that-holds(n)), that is,
-     round up n to nearest pagesize.
-  calloc(size_t unit, size_t quantity);
-     Returns a pointer to quantity * unit bytes, with all locations
-     set to zero.
-  cfree(Void_t* p);
-     Equivalent to free(p).
-  malloc_trim(size_t pad);
-     Release all but pad bytes of freed top-most memory back
-     to the system. Return 1 if successful, else 0.
-  malloc_usable_size(Void_t* p);
-     Report the number usable allocated bytes associated with allocated
-     chunk p. This may or may not report more bytes than were requested,
-     due to alignment and minimum size constraints.
-  malloc_stats();
-     Prints brief summary statistics on stderr.
-  mallinfo()
-     Returns (by copy) a struct containing various summary statistics.
-  mallopt(int parameter_number, int parameter_value)
-     Changes one of the tunable parameters described below. Returns
-     1 if successful in changing the parameter, else 0.
-
-* Vital statistics:
-
-  Alignment:                            8-byte
-       8 byte alignment is currently hardwired into the design.  This
-       seems to suffice for all current machines and C compilers.
-
-  Assumed pointer representation:       4 or 8 bytes
-       Code for 8-byte pointers is untested by me but has worked
-       reliably by Wolfram Gloger, who contributed most of the
-       changes supporting this.
-
-  Assumed size_t  representation:       4 or 8 bytes
-       Note that size_t is allowed to be 4 bytes even if pointers are 8.
-
-  Minimum overhead per allocated chunk: 4 or 8 bytes
-       Each malloced chunk has a hidden overhead of 4 bytes holding size
-       and status information.
-
-  Minimum allocated size: 4-byte ptrs:  16 bytes    (including 4 overhead)
-			  8-byte ptrs:  24/32 bytes (including, 4/8 overhead)
-
-       When a chunk is freed, 12 (for 4byte ptrs) or 20 (for 8 byte
-       ptrs but 4 byte size) or 24 (for 8/8) additional bytes are
-       needed; 4 (8) for a trailing size field
-       and 8 (16) bytes for free list pointers. Thus, the minimum
-       allocatable size is 16/24/32 bytes.
-
-       Even a request for zero bytes (i.e., malloc(0)) returns a
-       pointer to something of the minimum allocatable size.
-
-  Maximum allocated size: 4-byte size_t: 2^31 -  8 bytes
-			  8-byte size_t: 2^63 - 16 bytes
-
-       It is assumed that (possibly signed) size_t bit values suffice to
-       represent chunk sizes. `Possibly signed' is due to the fact
-       that `size_t' may be defined on a system as either a signed or
-       an unsigned type. To be conservative, values that would appear
-       as negative numbers are avoided.
-       Requests for sizes with a negative sign bit will return a
-       minimum-sized chunk.
-
-  Maximum overhead wastage per allocated chunk: normally 15 bytes
-
-       Alignnment demands, plus the minimum allocatable size restriction
-       make the normal worst-case wastage 15 bytes (i.e., up to 15
-       more bytes will be allocated than were requested in malloc), with
-       two exceptions:
-	 1. Because requests for zero bytes allocate non-zero space,
-	    the worst case wastage for a request of zero bytes is 24 bytes.
-	 2. For requests >= mmap_threshold that are serviced via
-	    mmap(), the worst case wastage is 8 bytes plus the remainder
-	    from a system page (the minimal mmap unit); typically 4096 bytes.
-
-* Limitations
-
-    Here are some features that are NOT currently supported
-
-    * No user-definable hooks for callbacks and the like.
-    * No automated mechanism for fully checking that all accesses
-      to malloced memory stay within their bounds.
-    * No support for compaction.
-
-* Synopsis of compile-time options:
-
-    People have reported using previous versions of this malloc on all
-    versions of Unix, sometimes by tweaking some of the defines
-    below. It has been tested most extensively on Solaris and
-    Linux. It is also reported to work on WIN32 platforms.
-    People have also reported adapting this malloc for use in
-    stand-alone embedded systems.
-
-    The implementation is in straight, hand-tuned ANSI C.  Among other
-    consequences, it uses a lot of macros.  Because of this, to be at
-    all usable, this code should be compiled using an optimizing compiler
-    (for example gcc -O2) that can simplify expressions and control
-    paths.
-
-  __STD_C                  (default: derived from C compiler defines)
-     Nonzero if using ANSI-standard C compiler, a C++ compiler, or
-     a C compiler sufficiently close to ANSI to get away with it.
-  DEBUG                    (default: NOT defined)
-     Define to enable debugging. Adds fairly extensive assertion-based
-     checking to help track down memory errors, but noticeably slows down
-     execution.
-  realloc_ZERO_BYTES_FREES (default: NOT defined)
-     Define this if you think that realloc(p, 0) should be equivalent
-     to free(p). Otherwise, since malloc returns a unique pointer for
-     malloc(0), so does realloc(p, 0).
-  HAVE_memcpy               (default: defined)
-     Define if you are not otherwise using ANSI STD C, but still
-     have memcpy and memset in your C library and want to use them.
-     Otherwise, simple internal versions are supplied.
-  USE_memcpy               (default: 1 if HAVE_memcpy is defined, 0 otherwise)
-     Define as 1 if you want the C library versions of memset and
-     memcpy called in realloc and calloc (otherwise macro versions are used).
-     At least on some platforms, the simple macro versions usually
-     outperform libc versions.
-  HAVE_MMAP                 (default: defined as 1)
-     Define to non-zero to optionally make malloc() use mmap() to
-     allocate very large blocks.
-  HAVE_MREMAP                 (default: defined as 0 unless Linux libc set)
-     Define to non-zero to optionally make realloc() use mremap() to
-     reallocate very large blocks.
-  malloc_getpagesize        (default: derived from system #includes)
-     Either a constant or routine call returning the system page size.
-  HAVE_USR_INCLUDE_malloc_H (default: NOT defined)
-     Optionally define if you are on a system with a /usr/include/malloc.h
-     that declares struct mallinfo. It is not at all necessary to
-     define this even if you do, but will ensure consistency.
-  INTERNAL_SIZE_T           (default: size_t)
-     Define to a 32-bit type (probably `unsigned int') if you are on a
-     64-bit machine, yet do not want or need to allow malloc requests of
-     greater than 2^31 to be handled. This saves space, especially for
-     very small chunks.
-  INTERNAL_LINUX_C_LIB      (default: NOT defined)
-     Defined only when compiled as part of Linux libc.
-     Also note that there is some odd internal name-mangling via defines
-     (for example, internally, `malloc' is named `mALLOc') needed
-     when compiling in this case. These look funny but don't otherwise
-     affect anything.
-  WIN32                     (default: undefined)
-     Define this on MS win (95, nt) platforms to compile in sbrk emulation.
-  LACKS_UNISTD_H            (default: undefined)
-     Define this if your system does not have a <unistd.h>.
-  MORECORE                  (default: sbrk)
-     The name of the routine to call to obtain more memory from the system.
-  MORECORE_FAILURE          (default: -1)
-     The value returned upon failure of MORECORE.
-  MORECORE_CLEARS           (default 0)
-     True (1) if the routine mapped to MORECORE zeroes out memory (which
-     holds for sbrk).
-  DEFAULT_TRIM_THRESHOLD
-  DEFAULT_TOP_PAD
-  DEFAULT_MMAP_THRESHOLD
-  DEFAULT_MMAP_MAX
-     Default values of tunable parameters (described in detail below)
-     controlling interaction with host system routines (sbrk, mmap, etc).
-     These values may also be changed dynamically via mallopt(). The
-     preset defaults are those that give best performance for typical
-     programs/systems.
-
-
-*/
-
-
-
-
-/* Preliminaries */
-
-#include "winsup.h"
-
-#ifndef __STD_C
-#ifdef __STDC__
-#define __STD_C     1
-#else
-#if __cplusplus
-#define __STD_C     1
-#else
-#define __STD_C     0
-#endif /*__cplusplus*/
-#endif /*__STDC__*/
-#endif /*__STD_C*/
-
-#ifndef Void_t
-#if __STD_C
-#define Void_t      void
-#else
-#define Void_t      char
-#endif
-#endif /*Void_t*/
-
-#define __MALLOC_H_INCLUDED
-
-#if __STD_C
-#include <stddef.h>   /* for size_t */
-#else
-#include <sys/types.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>    /* needed for malloc_stats */
-
-
-/*
-  Compile-time options
-*/
-
-
-/*
-    Debugging:
-
-    Because freed chunks may be overwritten with link fields, this
-    malloc will often die when freed memory is overwritten by user
-    programs.  This can be very effective (albeit in an annoying way)
-    in helping track down dangling pointers.
-
-    If you compile with -DDEBUG, a number of assertion checks are
-    enabled that will catch more memory errors. You probably won't be
-    able to make much sense of the actual assertion errors, but they
-    should help you locate incorrectly overwritten memory.  The
-    checking is fairly extensive, and will slow down execution
-    noticeably. Calling malloc_stats or mallinfo with DEBUG set will
-    attempt to check every non-mmapped allocated and free chunk in the
-    course of computing the summmaries. (By nature, mmapped regions
-    cannot be checked very much automatically.)
-
-    Setting DEBUG may also be helpful if you are trying to modify
-    this code. The assertions in the check routines spell out in more
-    detail the assumptions and invariants underlying the algorithms.
-
-*/
-
-#ifdef MALLOC_DEBUG
-#define DEBUG	1
-#define DEBUG1	1
-#define DEBUG2	1
-#define DEBUG3	1
-#endif
-
-#if DEBUG
-#include <assert.h>
-#else
-#define assert(x) ((void)0)
-#endif
-
-/*
-  INTERNAL_SIZE_T is the word-size used for internal bookkeeping
-  of chunk sizes. On a 64-bit machine, you can reduce malloc
-  overhead by defining INTERNAL_SIZE_T to be a 32 bit `unsigned int'
-  at the expense of not being able to handle requests greater than
-  2^31. This limitation is hardly ever a concern; you are encouraged
-  to set this. However, the default version is the same as size_t.
-*/
-
-#ifndef INTERNAL_SIZE_T
-#define INTERNAL_SIZE_T size_t
-#endif
-
-/*
-  realloc_ZERO_BYTES_FREES should be set if a call to
-  realloc with zero bytes should be the same as a call to free.
-  Some people think it should. Otherwise, since this malloc
-  returns a unique pointer for malloc(0), so does realloc(p, 0).
-*/
-
-
-/*   #define realloc_ZERO_BYTES_FREES */
-
-
-/*
-  WIN32 causes an emulation of sbrk to be compiled in
-  mmap-based options are not currently supported in WIN32.
-*/
-
-/* #define WIN32 */
-#ifdef WIN32
-#define MORECORE wsbrk
-#define HAVE_MMAP 0
-#endif
-
-
-/*
-  HAVE_memcpy should be defined if you are not otherwise using
-  ANSI STD C, but still have memcpy and memset in your C library
-  and want to use them in calloc and realloc. Otherwise simple
-  macro versions are defined here.
-
-  USE_memcpy should be defined as 1 if you actually want to
-  have memset and memcpy called. People report that the macro
-  versions are often enough faster than libc versions on many
-  systems that it is better to use them.
-
-*/
-
-#define HAVE_memcpy
-
-#ifndef USE_memcpy
-#ifdef HAVE_memcpy
-#define USE_memcpy 1
-#else
-#define USE_memcpy 0
-#endif
-#endif
-
-#if (__STD_C || defined(HAVE_memcpy))
-
-#if __STD_C
-void* memset(void*, int, size_t);
-void* memcpy(void*, const void*, size_t);
-#else
-Void_t* memset();
-Void_t* memcpy();
-#endif
-#endif
-
-#ifndef DEBUG3
-
-#if USE_memcpy
-
-/* The following macros are only invoked with (2n+1)-multiples of
-   INTERNAL_SIZE_T units, with a positive integer n. This is exploited
-   for fast inline execution when n is small. */
-
-#define malloc_ZERO(charp, nbytes)                                            \
-do {                                                                          \
-  INTERNAL_SIZE_T mzsz = (nbytes);                                            \
-  if(mzsz <= 9*sizeof(mzsz)) {                                                \
-    INTERNAL_SIZE_T* mz = (INTERNAL_SIZE_T*) (charp);                         \
-    if(mzsz >= 5*sizeof(mzsz)) {     *mz++ = 0;                               \
-				     *mz++ = 0;                               \
-      if(mzsz >= 7*sizeof(mzsz)) {   *mz++ = 0;                               \
-				     *mz++ = 0;                               \
-	if(mzsz >= 9*sizeof(mzsz)) { *mz++ = 0;                               \
-				     *mz++ = 0; }}}                           \
-				     *mz++ = 0;                               \
-				     *mz++ = 0;                               \
-				     *mz   = 0;                               \
-  } else memset((charp), 0, mzsz);                                            \
-} while(0)
-
-#define malloc_COPY(dest,src,nbytes)                                          \
-do {                                                                          \
-  INTERNAL_SIZE_T mcsz = (nbytes);                                            \
-  if(mcsz <= 9*sizeof(mcsz)) {                                                \
-    INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) (src);                        \
-    INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) (dest);                       \
-    if(mcsz >= 5*sizeof(mcsz)) {     *mcdst++ = *mcsrc++;                     \
-				     *mcdst++ = *mcsrc++;                     \
-      if(mcsz >= 7*sizeof(mcsz)) {   *mcdst++ = *mcsrc++;                     \
-				     *mcdst++ = *mcsrc++;                     \
-	if(mcsz >= 9*sizeof(mcsz)) { *mcdst++ = *mcsrc++;                     \
-				     *mcdst++ = *mcsrc++; }}}                 \
-				     *mcdst++ = *mcsrc++;                     \
-				     *mcdst++ = *mcsrc++;                     \
-				     *mcdst   = *mcsrc  ;                     \
-  } else memcpy(dest, src, mcsz);                                             \
-} while(0)
-
-#else /* !USE_memcpy */
-
-/* Use Duff's device for good zeroing/copying performance. */
-
-#define malloc_ZERO(charp, nbytes)                                            \
-do {                                                                          \
-  INTERNAL_SIZE_T* mzp = (INTERNAL_SIZE_T*)(charp);                           \
-  long mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T), mcn;                         \
-  if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; }             \
-  switch (mctmp) {                                                            \
-    case 0: for(;;) { *mzp++ = 0;                                             \
-    case 7:           *mzp++ = 0;                                             \
-    case 6:           *mzp++ = 0;                                             \
-    case 5:           *mzp++ = 0;                                             \
-    case 4:           *mzp++ = 0;                                             \
-    case 3:           *mzp++ = 0;                                             \
-    case 2:           *mzp++ = 0;                                             \
-    case 1:           *mzp++ = 0; if(mcn <= 0) break; mcn--; }                \
-  }                                                                           \
-} while(0)
-
-#define malloc_COPY(dest,src,nbytes)                                          \
-do {                                                                          \
-  INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) src;                            \
-  INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) dest;                           \
-  long mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T), mcn;                         \
-  if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; }             \
-  switch (mctmp) {                                                            \
-    case 0: for(;;) { *mcdst++ = *mcsrc++;                                    \
-    case 7:           *mcdst++ = *mcsrc++;                                    \
-    case 6:           *mcdst++ = *mcsrc++;                                    \
-    case 5:           *mcdst++ = *mcsrc++;                                    \
-    case 4:           *mcdst++ = *mcsrc++;                                    \
-    case 3:           *mcdst++ = *mcsrc++;                                    \
-    case 2:           *mcdst++ = *mcsrc++;                                    \
-    case 1:           *mcdst++ = *mcsrc++; if(mcn <= 0) break; mcn--; }       \
-  }                                                                           \
-} while(0)
-
-#endif
-
-#else   /* DEBUG3 */
-
-/* The trailing moat invalidates the above prediction about the nbytes
-   parameter to malloc_ZERO and malloc_COPY. */
-
-#define malloc_ZERO(charp, nbytes)					      \
-do {									      \
-  char *mzp = (char *)(charp);						      \
-  long mzn = (nbytes);							      \
-  while (mzn--)								      \
-    *mzp++ = '\0';							      \
-} while(0)
-
-#define malloc_COPY(dest,src,nbytes)					      \
-do {									      \
-  char *mcsrc = (char *)(src);						      \
-  char *mcdst = (char *)(dest);						      \
-  long mcn = (nbytes);							      \
-  while (mcn--)								      \
-    *mcdst++ = *mcsrc++;						      \
-} while(0)
-
-#endif   /* DEBUG3 */
-
-/*
-  Define HAVE_MMAP to optionally make malloc() use mmap() to
-  allocate very large blocks.  These will be returned to the
-  operating system immediately after a free().
-*/
-
-#ifndef HAVE_MMAP
-#define HAVE_MMAP 1
-#endif
-
-/*
-  Define HAVE_MREMAP to make realloc() use mremap() to re-allocate
-  large blocks.  This is currently only possible on Linux with
-  kernel versions newer than 1.3.77.
-*/
-
-#ifndef HAVE_MREMAP
-#ifdef INTERNAL_LINUX_C_LIB
-#define HAVE_MREMAP 1
-#else
-#define HAVE_MREMAP 0
-#endif
-#endif
-
-#if HAVE_MMAP
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
-#define MAP_ANONYMOUS MAP_ANON
-#endif
-
-#endif /* HAVE_MMAP */
-
-/*
-  Access to system page size. To the extent possible, this malloc
-  manages memory from the system in page-size units.
-
-  The following mechanics for getpagesize were adapted from
-  bsd/gnu getpagesize.h
-*/
-
-#ifndef LACKS_UNISTD_H
-#  include <unistd.h>
-#endif
-
-#ifndef malloc_getpagesize
-#  ifdef _SC_PAGESIZE         /* some SVR4 systems omit an underscore */
-#    ifndef _SC_PAGE_SIZE
-#      define _SC_PAGE_SIZE _SC_PAGESIZE
-#    endif
-#  endif
-#  ifdef _SC_PAGE_SIZE
-#    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
-#  else
-#    if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE)
-#      if __STD_C
-	 extern size_t getpagesize(void);
-#      else
-	 extern size_t getpagesize();
-#      endif
-#      define malloc_getpagesize getpagesize()
-#    else
-#      include <sys/param.h>
-#      ifdef EXEC_PAGESIZE
-#        define malloc_getpagesize EXEC_PAGESIZE
-#      else
-#        ifdef NBPG
-#          ifndef CLSIZE
-#            define malloc_getpagesize NBPG
-#          else
-#            define malloc_getpagesize (NBPG * CLSIZE)
-#          endif
-#        else
-#          ifdef NBPC
-#            define malloc_getpagesize NBPC
-#          else
-#            ifdef PAGESIZE
-#              define malloc_getpagesize PAGESIZE
-#            else
-#              define malloc_getpagesize (4096) /* just guess */
-#            endif
-#          endif
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-
-
-/*
-
-  This version of malloc supports the standard SVID/XPG mallinfo
-  routine that returns a struct containing the same kind of
-  information you can get from malloc_stats. It should work on
-  any SVID/XPG compliant system that has a /usr/include/malloc.h
-  defining struct mallinfo. (If you'd like to install such a thing
-  yourself, cut out the preliminary declarations as described above
-  and below and save them in a malloc.h file. But there's no
-  compelling reason to bother to do this.)
-
-  The main declaration needed is the mallinfo struct that is returned
-  (by-copy) by mallinfo().  The SVID/XPG malloinfo struct contains a
-  bunch of fields, most of which are not even meaningful in this
-  version of malloc. Some of these fields are are instead filled by
-  mallinfo() with other numbers that might possibly be of interest.
-
-  HAVE_USR_INCLUDE_malloc_H should be set if you have a
-  /usr/include/malloc.h file that includes a declaration of struct
-  mallinfo.  If so, it is included; else an SVID2/XPG2 compliant
-  version is declared below.  These must be precisely the same for
-  mallinfo() to work.
-
-*/
-
-/* #define HAVE_USR_INCLUDE_malloc_H */
-
-#if HAVE_USR_INCLUDE_malloc_H
-#include "/usr/include/malloc.h"
-#else
-
-/* SVID2/XPG mallinfo structure */
-
-struct mallinfo {
-  int arena;    /* total space allocated from system */
-  int ordblks;  /* number of non-inuse chunks */
-  int smblks;   /* unused -- always zero */
-  int hblks;    /* number of mmapped regions */
-  int hblkhd;   /* total space in mmapped regions */
-  int usmblks;  /* unused -- always zero */
-  int fsmblks;  /* unused -- always zero */
-  int uordblks; /* total allocated space */
-  int fordblks; /* total non-inuse space */
-  int keepcost; /* top-most, releasable (via malloc_trim) space */
-};
-
-/* SVID2/XPG mallopt options */
-
-#define M_MXFAST  1    /* UNUSED in this malloc */
-#define M_NLBLKS  2    /* UNUSED in this malloc */
-#define M_GRAIN   3    /* UNUSED in this malloc */
-#define M_KEEP    4    /* UNUSED in this malloc */
-
-#endif
-
-/* mallopt options that actually do something */
-
-#define M_TRIM_THRESHOLD    -1
-#define M_TOP_PAD           -2
-#define M_MMAP_THRESHOLD    -3
-#define M_MMAP_MAX          -4
-#define M_SCANHEAP	    -5
-#define M_FILL
-
-
-
-#ifndef DEFAULT_TRIM_THRESHOLD
-#define DEFAULT_TRIM_THRESHOLD (128 * 1024)
-#endif
-
-/*
-    M_TRIM_THRESHOLD is the maximum amount of unused top-most memory
-      to keep before releasing via malloc_trim in free().
-
-      Automatic trimming is mainly useful in long-lived programs.
-      Because trimming via sbrk can be slow on some systems, and can
-      sometimes be wasteful (in cases where programs immediately
-      afterward allocate more large chunks) the value should be high
-      enough so that your overall system performance would improve by
-      releasing.
-
-      The trim threshold and the mmap control parameters (see below)
-      can be traded off with one another. Trimming and mmapping are
-      two different ways of releasing unused memory back to the
-      system. Between these two, it is often possible to keep
-      system-level demands of a long-lived program down to a bare
-      minimum. For example, in one test suite of sessions measuring
-      the XF86 X server on Linux, using a trim threshold of 128K and a
-      mmap threshold of 192K led to near-minimal long term resource
-      consumption.
-
-      If you are using this malloc in a long-lived program, it should
-      pay to experiment with these values.  As a rough guide, you
-      might set to a value close to the average size of a process
-      (program) running on your system.  Releasing this much memory
-      would allow such a process to run in memory.  Generally, it's
-      worth it to tune for trimming rather tham memory mapping when a
-      program undergoes phases where several large chunks are
-      allocated and released in ways that can reuse each other's
-      storage, perhaps mixed with phases where there are no such
-      chunks at all.  And in well-behaved long-lived programs,
-      controlling release of large blocks via trimming versus mapping
-      is usually faster.
-
-      However, in most programs, these parameters serve mainly as
-      protection against the system-level effects of carrying around
-      massive amounts of unneeded memory. Since frequent calls to
-      sbrk, mmap, and munmap otherwise degrade performance, the default
-      parameters are set to relatively high values that serve only as
-      safeguards.
-
-      The default trim value is high enough to cause trimming only in
-      fairly extreme (by current memory consumption standards) cases.
-      It must be greater than page size to have any useful effect.  To
-      disable trimming completely, you can set to (unsigned long)(-1);
-
-
-*/
-
-
-#ifndef DEFAULT_TOP_PAD
-#define DEFAULT_TOP_PAD        (0)
-#endif
-
-/*
-    M_TOP_PAD is the amount of extra `padding' space to allocate or
-      retain whenever sbrk is called. It is used in two ways internally:
-
-      * When sbrk is called to extend the top of the arena to satisfy
-	a new malloc request, this much padding is added to the sbrk
-	request.
-
-      * When malloc_trim is called automatically from free(),
-	it is used as the `pad' argument.
-
-      In both cases, the actual amount of padding is rounded
-      so that the end of the arena is always a system page boundary.
-
-      The main reason for using padding is to avoid calling sbrk so
-      often. Having even a small pad greatly reduces the likelihood
-      that nearly every malloc request during program start-up (or
-      after trimming) will invoke sbrk, which needlessly wastes
-      time.
-
-      Automatic rounding-up to page-size units is normally sufficient
-      to avoid measurable overhead, so the default is 0.  However, in
-      systems where sbrk is relatively slow, it can pay to increase
-      this value, at the expense of carrying around more memory than
-      the program needs.
-
-*/
-
-
-#ifndef DEFAULT_MMAP_THRESHOLD
-#define DEFAULT_MMAP_THRESHOLD (128 * 1024)
-#endif
-
-/*
-
-    M_MMAP_THRESHOLD is the request size threshold for using mmap()
-      to service a request. Requests of at least this size that cannot
-      be allocated using already-existing space will be serviced via mmap.
-      (If enough normal freed space already exists it is used instead.)
-
-      Using mmap segregates relatively large chunks of memory so that
-      they can be individually obtained and released from the host
-      system. A request serviced through mmap is never reused by any
-      other request (at least not directly; the system may just so
-      happen to remap successive requests to the same locations).
-
-      Segregating space in this way has the benefit that mmapped space
-      can ALWAYS be individually released back to the system, which
-      helps keep the system level memory demands of a long-lived
-      program low. Mapped memory can never become `locked' between
-      other chunks, as can happen with normally allocated chunks, which
-      menas that even trimming via malloc_trim would not release them.
-
-      However, it has the disadvantages that:
-
-	 1. The space cannot be reclaimed, consolidated, and then
-	    used to service later requests, as happens with normal chunks.
-	 2. It can lead to more wastage because of mmap page alignment
-	    requirements
-	 3. It causes malloc performance to be more dependent on host
-	    system memory management support routines which may vary in
-	    implementation quality and may impose arbitrary
-	    limitations. Generally, servicing a request via normal
-	    malloc steps is faster than going through a system's mmap.
-
-      All together, these considerations should lead you to use mmap
-      only for relatively large requests.
-
-
-*/
-
-
-
-#ifndef DEFAULT_MMAP_MAX
-#if HAVE_MMAP
-#define DEFAULT_MMAP_MAX       (64)
-#else
-#define DEFAULT_MMAP_MAX       (0)
-#endif
-#endif
-
-/*
-    M_MMAP_MAX is the maximum number of requests to simultaneously
-      service using mmap. This parameter exists because:
-
-	 1. Some systems have a limited number of internal tables for
-	    use by mmap.
-	 2. In most systems, overreliance on mmap can degrade overall
-	    performance.
-	 3. If a program allocates many large regions, it is probably
-	    better off using normal sbrk-based allocation routines that
-	    can reclaim and reallocate normal heap memory. Using a
-	    small value allows transition into this mode after the
-	    first few allocations.
-
-      Setting to 0 disables all use of mmap.  If HAVE_MMAP is not set,
-      the default value is 0, and attempts to set it to non-zero values
-      in mallopt will fail.
-*/
-
-
-
-
-/*
-
-  Special defines for linux libc
-
-  Except when compiled using these special defines for Linux libc
-  using weak aliases, this malloc is NOT designed to work in
-  multithreaded applications.  No semaphores or other concurrency
-  control are provided to ensure that multiple malloc or free calls
-  don't run at the same time, which could be disasterous. A single
-  semaphore could be used across malloc, realloc, and free (which is
-  essentially the effect of the linux weak alias approach). It would
-  be hard to obtain finer granularity.
-
-*/
-
-
-#ifdef INTERNAL_LINUX_C_LIB
-
-#if __STD_C
-
-Void_t * __default_morecore_init (ptrdiff_t);
-Void_t *(*__morecore)(ptrdiff_t) = __default_morecore_init;
-
-#else
-
-Void_t * __default_morecore_init ();
-Void_t *(*__morecore)() = __default_morecore_init;
-
-#endif
-
-#define MORECORE (*__morecore)
-#define MORECORE_FAILURE 0
-#define MORECORE_CLEARS 1
-
-#else /* INTERNAL_LINUX_C_LIB */
-
-#if __STD_C
-/* extern Void_t*     sbrk(ptrdiff_t);*/
-#else
-extern Void_t*     sbrk();
-#endif
-
-#ifndef MORECORE
-#define MORECORE sbrk
-#endif
-
-#ifndef MORECORE_FAILURE
-#define MORECORE_FAILURE -1
-#endif
-
-#ifndef MORECORE_CLEARS
-#define MORECORE_CLEARS 0
-#endif
-
-#endif /* INTERNAL_LINUX_C_LIB */
-
-#if defined(INTERNAL_LINUX_C_LIB) && defined(__ELF__)
-
-#define cALLOc		__libc_calloc
-#define fREe		__libc_free
-#define mALLOc		__libc_malloc
-#define mEMALIGn	__libc_memalign
-#define rEALLOc		__libc_realloc
-#define vALLOc		__libc_valloc
-#define pvALLOc		__libc_pvalloc
-#define mALLINFo	__libc_mallinfo
-#define mALLOPt		__libc_mallopt
-
-#pragma weak calloc = __libc_calloc
-#pragma weak free = __libc_free
-#pragma weak cfree = __libc_free
-#pragma weak malloc = __libc_malloc
-#pragma weak memalign = __libc_memalign
-#pragma weak realloc = __libc_realloc
-#pragma weak valloc = __libc_valloc
-#pragma weak pvalloc = __libc_pvalloc
-#pragma weak mallinfo = __libc_mallinfo
-#pragma weak mallopt = __libc_mallopt
-
-#else
-
-#ifndef cALLOc
-#define cALLOc		dlcalloc
-#endif
-#ifndef fREe
-#define fREe		dlfree
-#endif
-#ifndef mALLOc
-#define mALLOc		dlmalloc
-#endif
-#ifndef mEMALIGn
-#define mEMALIGn	dlmemalign
-#endif
-#ifndef rEALLOc
-#define rEALLOc		dlrealloc
-#endif
-#ifndef vALLOc
-#define vALLOc		dlvalloc
-#endif
-#ifndef pvALLOc
-#define pvALLOc		dlpvalloc
-#endif
-#ifndef mALLINFo
-#define mALLINFo	dlmallinfo
-#endif
-#ifndef mALLOPt
-#define mALLOPt		dlmallopt
-#endif
-
-#endif
-
-/* Public routines */
-
-#ifdef DEBUG2
-#define malloc(size)		malloc_dbg(size, __FILE__, __LINE__)
-#define free(p)			free_dbg(p, __FILE__, __LINE__)
-#define realloc(p, size)	realloc_dbg(p, size, __FILE__, __LINE__)
-#define calloc(n, size)		calloc_dbg(n, size, __FILE__, __LINE__)
-#define memalign(align, size)	memalign_dbg(align, size, __FILE__, __LINE__)
-#define valloc(size)		valloc_dbg(size, __FILE__, __LINE__)
-#define pvalloc(size)		pvalloc_dbg(size, __FILE__, __LINE__)
-#define malloc_trim(pad)	malloc_trim_dbg(pad, __FILE__, __LINE__)
-#define malloc_usable_size(p)	malloc_usable_size_dbg(p, __FILE__, __LINE__)
-#define malloc_stats(void)	malloc_stats_dbg(__FILE__, __LINE__)
-#define mallopt(flag, val)	mallopt_dbg(flag, val, __FILE__, __LINE__)
-#define mallinfo(void)		mallinfo_dbg(__FILE__, __LINE__)
-
-#if __STD_C
-Void_t* malloc_dbg(size_t, const char *, int);
-void    free_dbg(Void_t*, const char *, int);
-Void_t* realloc_dbg(Void_t*, size_t, const char *, int);
-Void_t* calloc_dbg(size_t, size_t, const char *, int);
-Void_t* memalign_dbg(size_t, size_t, const char *, int);
-Void_t* valloc_dbg(size_t, const char *, int);
-Void_t* pvalloc_dbg(size_t, const char *, int);
-int     malloc_trim_dbg(size_t, const char *, int);
-size_t  malloc_usable_size_dbg(Void_t*, const char *, int);
-void    malloc_stats_dbg(const char *, int);
-int     mallopt_dbg(int, int, const char *, int);
-struct mallinfo mallinfo_dbg(const char *, int);
-#else
-Void_t* malloc_dbg();
-void    free_dbg();
-Void_t* realloc_dbg();
-Void_t* calloc_dbg();
-Void_t* memalign_dbg();
-Void_t* valloc_dbg();
-Void_t* pvalloc_dbg();
-int     malloc_trim_dbg();
-size_t  malloc_usable_size_dbg();
-void    malloc_stats_dbg();
-int     mallopt_dbg();
-struct mallinfo mallinfo_dbg();
-#endif   /* !__STD_C */
-
-#else   /* !DEBUG2 */
-
-#if __STD_C
-
-Void_t* mALLOc(size_t);
-void    fREe(Void_t*);
-Void_t* rEALLOc(Void_t*, size_t);
-Void_t* cALLOc(size_t, size_t);
-Void_t* mEMALIGn(size_t, size_t);
-Void_t* vALLOc(size_t);
-Void_t* pvALLOc(size_t);
-int     malloc_trim(size_t);
-size_t  malloc_usable_size(Void_t*);
-void    malloc_stats(void);
-int     mALLOPt(int, int);
-struct mallinfo mALLINFo(void);
-#else
-Void_t* mALLOc();
-void    fREe();
-Void_t* rEALLOc();
-Void_t* cALLOc();
-Void_t* mEMALIGn();
-Void_t* vALLOc();
-Void_t* pvALLOc();
-int     malloc_trim();
-size_t  malloc_usable_size();
-void    malloc_stats();
-int     mALLOPt();
-struct mallinfo mALLINFo();
-#endif
-#endif   /* !DEBUG2 */
-
-#ifdef __cplusplus
-};  /* end of extern "C" */
-#endif
-
-/* ---------- To make a malloc.h, end cutting here ------------ */
-
-#ifdef DEBUG2
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef malloc
-#undef free
-#undef realloc
-#undef calloc
-#undef memalign
-#undef valloc
-#undef pvalloc
-#undef malloc_trim
-#undef malloc_usable_size
-#undef malloc_stats
-#undef mallopt
-#undef mallinfo
-
-#if __STD_C
-Void_t* mALLOc(size_t);
-void    fREe(Void_t*);
-Void_t* rEALLOc(Void_t*, size_t);
-Void_t* cALLOc(size_t, size_t);
-Void_t* mEMALIGn(size_t, size_t);
-Void_t* vALLOc(size_t);
-Void_t* pvALLOc(size_t);
-int     malloc_trim(size_t);
-size_t  malloc_usable_size(Void_t*);
-void    malloc_stats(void);
-int     mALLOPt(int, int);
-struct mallinfo mALLINFo(void);
-#else
-Void_t* mALLOc();
-void    fREe();
-Void_t* rEALLOc();
-Void_t* cALLOc();
-Void_t* mEMALIGn();
-Void_t* vALLOc();
-Void_t* pvALLOc();
-int     malloc_trim();
-size_t  malloc_usable_size();
-void    malloc_stats();
-int     mALLOPt();
-struct mallinfo mALLINFo();
-#endif
-
-#include <ctype.h>			/* isprint() */
-#ifdef DEBUG3
-#include <stdlib.h>			/* atexit() */
-#endif
-
-#ifdef __cplusplus
-};  /* end of extern "C" */
-#endif
-
-#endif   /* DEBUG2 */
-
-/*
-  Emulation of sbrk for WIN32
-  All code within the ifdef WIN32 is untested by me.
-*/
-
-
-#ifdef WIN32
-
-#define AlignPage(add) (((add) + (malloc_getpagesize-1)) & \
-			~(malloc_getpagesize-1))
-
-/* resrve 64MB to insure large contiguous space */
-#define RESERVED_SIZE (1024*1024*64)
-#define NEXT_SIZE (2048*1024)
-#define TOP_MEMORY ((unsigned long)2*1024*1024*1024)
-
-struct GmListElement;
-typedef struct GmListElement GmListElement;
-
-struct GmListElement
-{
-	GmListElement* next;
-	void* base;
-};
-
-static GmListElement* head = 0;
-static unsigned int gNextAddress = 0;
-static unsigned int gAddressBase = 0;
-static unsigned int gAllocatedSize = 0;
-
-static
-GmListElement* makeGmListElement (void* bas)
-{
-	GmListElement* this;
-	this = (GmListElement*)(void*)LocalAlloc (0, sizeof (GmListElement));
-	ASSERT (this);
-	if (this)
-	{
-		this->base = bas;
-		this->next = head;
-		head = this;
-	}
-	return this;
-}
-
-void gcleanup ()
-{
-	BOOL rval;
-	ASSERT ( (head == NULL) || (head->base == (void*)gAddressBase));
-	if (gAddressBase && (gNextAddress - gAddressBase))
-	{
-		rval = VirtualFree ((void*)gAddressBase,
-							gNextAddress - gAddressBase,
-							MEM_DECOMMIT);
-	ASSERT (rval);
-	}
-	while (head)
-	{
-		GmListElement* next = head->next;
-		rval = VirtualFree (head->base, 0, MEM_RELEASE);
-		ASSERT (rval);
-		LocalFree (head);
-		head = next;
-	}
-}
-
-static
-void* findRegion (void* start_address, unsigned long size)
-{
-	MEMORY_BASIC_INFORMATION info;
-	while ((unsigned long)start_address < TOP_MEMORY)
-	{
-		VirtualQuery (start_address, &info, sizeof (info));
-		if (info.State != MEM_FREE)
-			start_address = (char*)info.BaseAddress + info.RegionSize;
-		else if (info.RegionSize >= size)
-			return start_address;
-		else
-			start_address = (char*)info.BaseAddress + info.RegionSize;
-	}
-	return NULL;
-
-}
-
-
-void* wsbrk (long size)
-{
-	void* tmp;
-	if (size > 0)
-	{
-		if (gAddressBase == 0)
-		{
-			gAllocatedSize = max (RESERVED_SIZE, AlignPage (size));
-			gNextAddress = gAddressBase =
-				(unsigned int)VirtualAlloc (NULL, gAllocatedSize,
-											MEM_RESERVE, PAGE_NOACCESS);
-		} else if (AlignPage (gNextAddress + size) > (gAddressBase +
-gAllocatedSize))
-		{
-			long new_size = max (NEXT_SIZE, AlignPage (size));
-			void* new_address = (void*)(gAddressBase+gAllocatedSize);
-			do
-			{
-				new_address = findRegion (new_address, new_size);
-
-				if (new_address == 0)
-					return (void*)-1;
-
-				gAddressBase = gNextAddress =
-					(unsigned int)VirtualAlloc (new_address, new_size,
-												MEM_RESERVE, PAGE_NOACCESS);
-				// repeat in case of race condition
-				// The region that we found has been snagged
-				// by another thread
-			}
-			while (gAddressBase == 0);
-
-			ASSERT (new_address == (void*)gAddressBase);
-
-			gAllocatedSize = new_size;
-
-			if (!makeGmListElement ((void*)gAddressBase))
-				return (void*)-1;
-		}
-		if ((size + gNextAddress) > AlignPage (gNextAddress))
-		{
-			void* res;
-			res = VirtualAlloc ((void*)AlignPage (gNextAddress),
-								(size + gNextAddress -
-								 AlignPage (gNextAddress)),
-								MEM_COMMIT, PAGE_READWRITE);
-			if (res == 0)
-				return (void*)-1;
-		}
-		tmp = (void*)gNextAddress;
-		gNextAddress = (unsigned int)tmp + size;
-		return tmp;
-	}
-	else if (size < 0)
-	{
-		unsigned int alignedGoal = AlignPage (gNextAddress + size);
-		/* Trim by releasing the virtual memory */
-		if (alignedGoal >= gAddressBase)
-		{
-			VirtualFree ((void*)alignedGoal, gNextAddress - alignedGoal,
-						 MEM_DECOMMIT);
-			gNextAddress = gNextAddress + size;
-			return (void*)gNextAddress;
-		}
-		else
-		{
-			VirtualFree ((void*)gAddressBase, gNextAddress - gAddressBase,
-						 MEM_DECOMMIT);
-			gNextAddress = gAddressBase;
-			return (void*)-1;
-		}
-	}
-	else
-	{
-		return (void*)gNextAddress;
-	}
-}
-
-#endif
-
-
-
-/*
-  Type declarations
-*/
-
-#ifdef DEBUG3
-# define MOATWIDTH	4	/* number of guard bytes at each end of
-				   allocated region */
-# define MOATFILL	5	/* moat fill character */
-# define ALLOCFILL	1	/* fill char for allocated */
-# define FREEFILL	2	/*  and freed regions */
-#endif
-
-typedef struct malloc_chunk
-{
-  INTERNAL_SIZE_T prev_size; /* Size of previous chunk (if free). */
-  INTERNAL_SIZE_T size;      /* Size in bytes, including overhead. */
-  struct malloc_chunk* fd;   /* double links -- used only if free. */
-  struct malloc_chunk* bk;
-#ifdef DEBUG3
-  const char *file;	     /* file and */
-  int line;		     /*  line number of [re]allocation */
-  size_t pad;		     /* nr pad bytes at mem end, excluding moat */
-  int alloced;		     /* whether the chunk is allocated -- less prone
-				to segv than inuse(chunk) */
-  char moat[MOATWIDTH];      /* actual leading moat is last MOATWIDTH bytes
-				of chunk header; those bytes may follow this
-				field due to header alignment padding */
-#endif
-} Chunk;
-
-typedef Chunk* mchunkptr;
-
-/*
-
-   malloc_chunk details:
-
-    (The following includes lightly edited explanations by Colin Plumb.)
-
-    Chunks of memory are maintained using a `boundary tag' method as
-    described in e.g., Knuth or Standish.  (See the paper by Paul
-    Wilson ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a
-    survey of such techniques.)  Sizes of free chunks are stored both
-    in the front of each chunk and at the end.  This makes
-    consolidating fragmented chunks into bigger chunks very fast.  The
-    size fields also hold bits representing whether chunks are free or
-    in use.
-
-    An allocated chunk looks like this:
-
-
-    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Size of previous chunk, if allocated            | |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Size of chunk, in bytes                         |P|
-      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             User data starts here...                          .
-	    .                                                               .
-	    .             (malloc_usable_space() bytes)                     .
-	    .                                                               |
-nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Size of chunk                                     |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-    Where "chunk" is the front of the chunk for the purpose of most of
-    the malloc code, but "mem" is the pointer that is returned to the
-    user.  "Nextchunk" is the beginning of the next contiguous chunk.
-
-    Chunks always begin on even word boundries, so the mem portion
-    (which is returned to the user) is also on an even word boundary, and
-    thus double-word aligned.
-
-    Free chunks are stored in circular doubly-linked lists, and look like this:
-
-    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Size of previous chunk                            |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    `head:' |             Size of chunk, in bytes                         |P|
-      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Forward pointer to next chunk in list             |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Back pointer to previous chunk in list            |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Unused space (may be 0 bytes long)                .
-	    .                                                               .
-	    .                                                               |
-nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    `foot:' |             Size of chunk, in bytes                           |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-    The P (PREV_INUSE) bit, stored in the unused low-order bit of the
-    chunk size (which is always a multiple of two words), is an in-use
-    bit for the *previous* chunk.  If that bit is *clear*, then the
-    word before the current chunk size contains the previous chunk
-    size, and can be used to find the front of the previous chunk.
-    (The very first chunk allocated always has this bit set,
-    preventing access to non-existent (or non-owned) memory.)
-
-    Note that the `foot' of the current chunk is actually represented
-    as the prev_size of the NEXT chunk. (This makes it easier to
-    deal with alignments etc).
-
-    The two exceptions to all this are
-
-     1. The special chunk `top', which doesn't bother using the
-	trailing size field since there is no
-	next contiguous chunk that would have to index off it. (After
-	initialization, `top' is forced to always exist.  If it would
-	become less than MINSIZE bytes long, it is replenished via
-	malloc_extend_top.)
-
-     2. Chunks allocated via mmap, which have the second-lowest-order
-	bit (IS_MMAPPED) set in their size fields.  Because they are
-	never merged or traversed from any other chunk, they have no
-	foot size or inuse information.
-
-    Available chunks are kept in any of several places (all declared below):
-
-    * `av': An array of chunks serving as bin headers for consolidated
-       chunks. Each bin is doubly linked.  The bins are approximately
-       proportionally (log) spaced.  There are a lot of these bins
-       (128). This may look excessive, but works very well in
-       practice.  All procedures maintain the invariant that no
-       consolidated chunk physically borders another one. Chunks in
-       bins are kept in size order, with ties going to the
-       approximately least recently used chunk.
-
-       The chunks in each bin are maintained in decreasing sorted order by
-       size.  This is irrelevant for the small bins, which all contain
-       the same-sized chunks, but facilitates best-fit allocation for
-       larger chunks. (These lists are just sequential. Keeping them in
-       order almost never requires enough traversal to warrant using
-       fancier ordered data structures.)  Chunks of the same size are
-       linked with the most recently freed at the front, and allocations
-       are taken from the back.  This results in LRU or FIFO allocation
-       order, which tends to give each chunk an equal opportunity to be
-       consolidated with adjacent freed chunks, resulting in larger free
-       chunks and less fragmentation.
-
-    * `top': The top-most available chunk (i.e., the one bordering the
-       end of available memory) is treated specially. It is never
-       included in any bin, is used only if no other chunk is
-       available, and is released back to the system if it is very
-       large (see M_TRIM_THRESHOLD).
-
-    * `last_remainder': A bin holding only the remainder of the
-       most recently split (non-top) chunk. This bin is checked
-       before other non-fitting chunks, so as to provide better
-       locality for runs of sequentially allocated chunks.
-
-    *  Implicitly, through the host system's memory mapping tables.
-       If supported, requests greater than a threshold are usually
-       serviced via calls to mmap, and then later released via munmap.
-
-*/
-
-
-
-
-
-
-/*  sizes, alignments */
-
-#define SIZE_SZ			sizeof(INTERNAL_SIZE_T)
-#define ALIGNMENT		(SIZE_SZ + SIZE_SZ)
-#define ALIGN_MASK		(ALIGNMENT - 1)
-#ifndef DEBUG3
-# define MEMOFFSET		(2*SIZE_SZ)
-# define OVERHEAD		SIZE_SZ
-# define MMAP_EXTRA		SIZE_SZ		/* for correct alignment */
-# define MINSIZE		sizeof(Chunk)
-#else
-typedef union {
-  char strut[(sizeof(Chunk) - 1) / ALIGNMENT + 1][ALIGNMENT];
-  Chunk chunk;
-} PaddedChunk;
-# define MEMOFFSET		sizeof(PaddedChunk)
-# define OVERHEAD		(MEMOFFSET + MOATWIDTH)
-# define MMAP_EXTRA		0
-# define MINSIZE		((OVERHEAD + ALIGN_MASK) & ~ALIGN_MASK)
-#endif
-
-/* conversion from malloc headers to user pointers, and back */
-
-#define chunk2mem(p)   ((Void_t*)((char*)(p) + MEMOFFSET))
-#define mem2chunk(mem) ((mchunkptr)((char*)(mem) - MEMOFFSET))
-
-/* pad request bytes into a usable size, including overhead */
-
-#define request2size(req) \
- ((long)((req) + OVERHEAD) < (long)MINSIZE ? MINSIZE : \
-  ((req) + OVERHEAD + ALIGN_MASK) & ~ALIGN_MASK)
-
-/* Check if m has acceptable alignment */
-
-#define aligned_OK(m)    (((unsigned long)((m)) & ALIGN_MASK) == 0)
-
-
-
-
-/*
-  Physical chunk operations
-*/
-
-
-/* size field is or'ed with PREV_INUSE when previous adjacent chunk in use */
-
-#define PREV_INUSE 0x1
-
-/* size field is or'ed with IS_MMAPPED if the chunk was obtained with mmap() */
-
-#define IS_MMAPPED 0x2
-
-/* Bits to mask off when extracting size */
-
-#define SIZE_BITS (PREV_INUSE|IS_MMAPPED)
-
-
-/* Ptr to next physical malloc_chunk. */
-
-#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->size & ~PREV_INUSE) ))
-
-/* Ptr to previous physical malloc_chunk */
-
-#define prev_chunk(p)\
-   ((mchunkptr)( ((char*)(p)) - ((p)->prev_size) ))
-
-
-/* Treat space at ptr + offset as a chunk */
-
-#define chunk_at_offset(p, s)  ((mchunkptr)(((char*)(p)) + (s)))
-
-
-
-
-/*
-  Dealing with use bits
-*/
-
-/* extract p's inuse bit */
-
-#define inuse(p)\
-((((mchunkptr)(((char*)(p))+((p)->size & ~PREV_INUSE)))->size) & PREV_INUSE)
-
-/* extract inuse bit of previous chunk */
-
-#define prev_inuse(p)  ((p)->size & PREV_INUSE)
-
-/* check for mmap()'ed chunk */
-
-#if HAVE_MMAP
-# define chunk_is_mmapped(p) ((p)->size & IS_MMAPPED)
-#else
-# define chunk_is_mmapped(p) 0
-#endif
-
-/* set/clear chunk as in use without otherwise disturbing */
-
-#define set_inuse(p)\
-((mchunkptr)(((char*)(p)) + ((p)->size & ~PREV_INUSE)))->size |= PREV_INUSE
-
-#define clear_inuse(p)\
-((mchunkptr)(((char*)(p)) + ((p)->size & ~PREV_INUSE)))->size &= ~(PREV_INUSE)
-
-/* check/set/clear inuse bits in known places */
-
-#define inuse_bit_at_offset(p, s)\
- (((mchunkptr)(((char*)(p)) + (s)))->size & PREV_INUSE)
-
-#define set_inuse_bit_at_offset(p, s)\
- (((mchunkptr)(((char*)(p)) + (s)))->size |= PREV_INUSE)
-
-#define clear_inuse_bit_at_offset(p, s)\
- (((mchunkptr)(((char*)(p)) + (s)))->size &= ~(PREV_INUSE))
-
-
-
-
-/*
-  Dealing with size fields
-*/
-
-/* Get size, ignoring use bits */
-
-#define chunksize(p)          ((p)->size & ~(SIZE_BITS))
-
-/* Set size at head, without disturbing its use bit */
-
-#define set_head_size(p, s)   ((p)->size = (((p)->size & PREV_INUSE) | (s)))
-
-/* Set size/use ignoring previous bits in header */
-
-#define set_head(p, s)        ((p)->size = (s))
-
-/* Set size at footer (only when chunk is not in use) */
-
-#define set_foot(p, s)   (((mchunkptr)((char*)(p) + (s)))->prev_size = (s))
-
-
-
-
-
-/*
-   Bins
-
-    The bins, `av_' are an array of pairs of pointers serving as the
-    heads of (initially empty) doubly-linked lists of chunks, laid out
-    in a way so that each pair can be treated as if it were in a
-    malloc_chunk. (This way, the fd/bk offsets for linking bin heads
-    and chunks are the same).
-
-    Bins for sizes < 512 bytes contain chunks of all the same size, spaced
-    8 bytes apart. Larger bins are approximately logarithmically
-    spaced. (See the table below.) The `av_' array is never mentioned
-    directly in the code, but instead via bin access macros.
-
-    Bin layout:
-
-    64 bins of size       8
-    32 bins of size      64
-    16 bins of size     512
-     8 bins of size    4096
-     4 bins of size   32768
-     2 bins of size  262144
-     1 bin  of size what's left
-
-    There is actually a little bit of slop in the numbers in bin_index
-    for the sake of speed. This makes no difference elsewhere.
-
-    The special chunks `top' and `last_remainder' get their own bins,
-    (this is implemented via yet more trickery with the av_ array),
-    although `top' is never properly linked to its bin since it is
-    always handled specially.
-
-*/
-
-#define NAV             128   /* number of bins */
-
-typedef Chunk* mbinptr;
-
-/* access macros */
-
-#define bin_at(i)      ((mbinptr)((char*)&(av_[2*(i) + 2]) - 2*SIZE_SZ))
-#define next_bin(b)    ((mbinptr)((char*)(b) + 2 * sizeof(mbinptr)))
-#define prev_bin(b)    ((mbinptr)((char*)(b) - 2 * sizeof(mbinptr)))
-
-/*
-   The first 2 bins are never indexed. The corresponding av_ cells are instead
-   used for bookkeeping. This is not to save space, but to simplify
-   indexing, maintain locality, and avoid some initialization tests.
-*/
-
-#define top            (bin_at(0)->fd)   /* The topmost chunk */
-#define last_remainder (bin_at(1))       /* remainder from last split */
-
-
-/*
-   Because top initially points to its own bin with initial
-   zero size, thus forcing extension on the first malloc request,
-   we avoid having any special code in malloc to check whether
-   it even exists yet. But we still need to in malloc_extend_top.
-*/
-
-#define initial_top    ((mchunkptr)(bin_at(0)))
-
-/* Helper macro to initialize bins */
-
-#define IAV(i)  bin_at(i), bin_at(i)
-
-static mbinptr av_[NAV * 2 + 2] = {
- 0, 0,
- IAV(0),   IAV(1),   IAV(2),   IAV(3),   IAV(4),   IAV(5),   IAV(6),   IAV(7),
- IAV(8),   IAV(9),   IAV(10),  IAV(11),  IAV(12),  IAV(13),  IAV(14),  IAV(15),
- IAV(16),  IAV(17),  IAV(18),  IAV(19),  IAV(20),  IAV(21),  IAV(22),  IAV(23),
- IAV(24),  IAV(25),  IAV(26),  IAV(27),  IAV(28),  IAV(29),  IAV(30),  IAV(31),
- IAV(32),  IAV(33),  IAV(34),  IAV(35),  IAV(36),  IAV(37),  IAV(38),  IAV(39),
- IAV(40),  IAV(41),  IAV(42),  IAV(43),  IAV(44),  IAV(45),  IAV(46),  IAV(47),
- IAV(48),  IAV(49),  IAV(50),  IAV(51),  IAV(52),  IAV(53),  IAV(54),  IAV(55),
- IAV(56),  IAV(57),  IAV(58),  IAV(59),  IAV(60),  IAV(61),  IAV(62),  IAV(63),
- IAV(64),  IAV(65),  IAV(66),  IAV(67),  IAV(68),  IAV(69),  IAV(70),  IAV(71),
- IAV(72),  IAV(73),  IAV(74),  IAV(75),  IAV(76),  IAV(77),  IAV(78),  IAV(79),
- IAV(80),  IAV(81),  IAV(82),  IAV(83),  IAV(84),  IAV(85),  IAV(86),  IAV(87),
- IAV(88),  IAV(89),  IAV(90),  IAV(91),  IAV(92),  IAV(93),  IAV(94),  IAV(95),
- IAV(96),  IAV(97),  IAV(98),  IAV(99),  IAV(100), IAV(101), IAV(102), IAV(103),
- IAV(104), IAV(105), IAV(106), IAV(107), IAV(108), IAV(109), IAV(110), IAV(111),
- IAV(112), IAV(113), IAV(114), IAV(115), IAV(116), IAV(117), IAV(118), IAV(119),
- IAV(120), IAV(121), IAV(122), IAV(123), IAV(124), IAV(125), IAV(126), IAV(127)
-};
-
-
-
-/* field-extraction macros */
-
-#define first(b) ((b)->fd)
-#define last(b)  ((b)->bk)
-
-/*
-  Indexing into bins
-*/
-
-#define bin_index(sz)                                                          \
-(((((unsigned long)(sz)) >> 9) ==    0) ?       (((unsigned long)(sz)) >>  3): \
- ((((unsigned long)(sz)) >> 9) <=    4) ?  56 + (((unsigned long)(sz)) >>  6): \
- ((((unsigned long)(sz)) >> 9) <=   20) ?  91 + (((unsigned long)(sz)) >>  9): \
- ((((unsigned long)(sz)) >> 9) <=   84) ? 110 + (((unsigned long)(sz)) >> 12): \
- ((((unsigned long)(sz)) >> 9) <=  340) ? 119 + (((unsigned long)(sz)) >> 15): \
- ((((unsigned long)(sz)) >> 9) <= 1364) ? 124 + (((unsigned long)(sz)) >> 18): \
-					  126)
-/*
-  bins for chunks < 512 are all spaced 8 bytes apart, and hold
-  identically sized chunks. This is exploited in malloc.
-*/
-
-#define MAX_SMALLBIN         63
-#define MAX_SMALLBIN_SIZE   512
-#define SMALLBIN_WIDTH        8
-
-#define smallbin_index(sz)  (((unsigned long)(sz)) >> 3)
-
-/*
-   Requests are `small' if both the corresponding and the next bin are small
-*/
-
-#define is_small_request(nb) (nb < MAX_SMALLBIN_SIZE - SMALLBIN_WIDTH)
-
-
-
-/*
-    To help compensate for the large number of bins, a one-level index
-    structure is used for bin-by-bin searching.  `binblocks' is a
-    one-word bitvector recording whether groups of BINBLOCKWIDTH bins
-    have any (possibly) non-empty bins, so they can be skipped over
-    all at once during during traversals. The bits are NOT always
-    cleared as soon as all bins in a block are empty, but instead only
-    when all are noticed to be empty during traversal in malloc.
-*/
-
-#define BINBLOCKWIDTH     4   /* bins per block */
-
-#define binblocks      (bin_at(0)->size) /* bitvector of nonempty blocks */
-
-/* bin<->block macros */
-
-#define idx2binblock(ix)    ((unsigned)1 << (ix / BINBLOCKWIDTH))
-#define mark_binblock(ii)   (binblocks |= idx2binblock(ii))
-#define clear_binblock(ii)  (binblocks &= ~(idx2binblock(ii)))
-
-
-
-
-
-/*  Other static bookkeeping data */
-
-/* variables holding tunable values */
-
-static unsigned long trim_threshold   = DEFAULT_TRIM_THRESHOLD;
-static unsigned long top_pad          = DEFAULT_TOP_PAD;
-static unsigned int  n_mmaps_max      = DEFAULT_MMAP_MAX;
-static unsigned long mmap_threshold   = DEFAULT_MMAP_THRESHOLD;
-#ifdef DEBUG2
-static int scanheap		      = 1;
-#endif
-
-/* The first value returned from sbrk */
-static char* sbrk_base = (char*)(-1);
-
-/* The maximum memory obtained from system via sbrk */
-static unsigned long max_sbrked_mem = 0;
-
-/* The maximum via either sbrk or mmap */
-static unsigned long max_total_mem = 0;
-
-/* internal working copy of mallinfo */
-static struct mallinfo current_mallinfo = {  0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
-/* The total memory obtained from system via sbrk */
-#define sbrked_mem  (current_mallinfo.arena)
-
-/* Tracking mmaps */
-
-static unsigned int n_mmaps = 0;
-static unsigned long mmapped_mem = 0;
-#if HAVE_MMAP
-static unsigned int max_n_mmaps = 0;
-static unsigned long max_mmapped_mem = 0;
-#endif
-
-
-
-/*
-  Debugging support
-*/
-
-#if DEBUG
-
-#ifndef DEBUG2
-#  define unless(cond, err, p)	assert(cond)
-#else
-#  define unless(cond, err, p)	do { if (!(cond)) malloc_err(err, p); } while (0)
-
-/*
- * When debug_file is non-null, it and debug_line respectively contain the
- * file and line number of the current invocation of malloc(), calloc(),
- * realloc(), or free().
- */
-static const char *debug_file = NULL;
-static int debug_line;
-
-/*
- * Avoid dereferencing invalid chunk.file pointers by tracking the range of
- * valid ones.  Could add an "unallocated" flag to init_freed_chunk() for
- * more protection, but that's probably not necessary.
- */
-static const char *debug_file_min = (char *)~0;
-static const char *debug_file_max = NULL;
-
-static char *itos(int n)
-{
-#define NDIGITS	(sizeof(int) * 3)
-  static char s[NDIGITS + 1];
-  int i = NDIGITS;
-  do {
-    s[--i] = '0' + n % 10;
-    n /= 10;
-  } while (n);
-  return s + i;
-#undef NDIGITS
-}
-
-static int recurs = 0;
-
-static void errprint(const char *file, int line, const char *err)
-{
-  if (recurs++) {
-    recurs--;
-    return;
-  }
-
-  if (file) {
-    write(2, file, strlen(file));
-    if (line) {
-      write(2, ":", 1);
-      write(2, itos(line), strlen(itos(line)));
-    }
-    write(2, ": ", 2);
-  }
-  write(2, err, strlen(err));
-  write(2, "\n", 1);
-  recurs--;
-}
-
-static void malloc_err(const char *err, mchunkptr p)
-{
-  /*
-   * Display ERR on stderr, accompanying it with the caller's file and line
-   * number if available.  If P is non-null, also attempt to display the file
-   * and line number at which P was most recently [re]allocated.
-   *
-   * This function's name begins with "malloc_" to make setting debugger
-   * breakpoints here more convenient.
-   */
-  errprint(debug_file, debug_line, err);
-
-# ifndef DEBUG3
-  p = 0;				/* avoid "unused param" warning */
-# else
-  if (p && p->file &&
-      /* avoid invalid pointers */
-      debug_file_min &&
-      p->file >= debug_file_min &&
-      p->file <= debug_file_max &&
-      /* try to avoid garbage file names */
-      isprint(*p->file))
-    errprint(p->file, p->line, "in block allocated here");
-# endif
-}
-
-#undef malloc
-#undef free
-#undef realloc
-#undef memalign
-#undef valloc
-#undef pvalloc
-#undef calloc
-#undef malloc_trim
-#undef malloc_usable_size
-#undef malloc_stats
-#undef mallopt
-#undef mallinfo
-
-static void malloc_update_mallinfo(void);
-
-/*
- * Define front-end functions for all user-visible entry points that may
- * trigger error().
- */
-#define skel(retdecl, retassign, call, retstmt)				     \
-  retdecl								     \
-  debug_file = file;							     \
-  debug_line = line;							     \
-  if (debug_file < debug_file_min)					     \
-    debug_file_min = debug_file;					     \
-  if (debug_file > debug_file_max)					     \
-    debug_file_max = debug_file;					     \
-  if (scanheap)								     \
-    malloc_update_mallinfo();						     \
-  retassign call;							     \
-  if (scanheap)								     \
-    malloc_update_mallinfo();						     \
-  debug_file = NULL;							     \
-  retstmt
-
-/*
- * The final letter of the names of the following macros is either r or v,
- * indicating that the macro handles functions with or without a return value,
- * respectively.
- */
-# define skelr(rettype, call)						     \
-  skel(rettype ret;, ret = , call, return ret)
-/*
- * AIX's xlc compiler doesn't like empty macro args, so specify useless but
- * compilable retdecl, retassign, and retstmt args:
- */
-#define skelv(call)							     \
-  skel(line += 0;, if (1), call, return)
-
-#define dbgargs			const char *file, int line
-
-/*
- * Front-end function definitions:
- */
-Void_t* malloc_dbg(size_t bytes, dbgargs) {
-  skelr(Void_t*, malloc(bytes));
-}
-void free_dbg(Void_t *mem, dbgargs) {
-  skelv(free(mem));
-}
-Void_t* realloc_dbg(Void_t *oldmem, size_t bytes, dbgargs) {
-  skelr(Void_t*, realloc(oldmem, bytes));
-}
-Void_t* memalign_dbg(size_t alignment, size_t bytes, dbgargs) {
-  skelr(Void_t*, dlmemalign(alignment, bytes));
-}
-Void_t* valloc_dbg(size_t bytes, dbgargs) {
-  skelr(Void_t*, dlvalloc(bytes));
-}
-Void_t* pvalloc_dbg(size_t bytes, dbgargs) {
-  skelr(Void_t*, dlpvalloc(bytes));
-}
-Void_t* calloc_dbg(size_t n, size_t elem_size, dbgargs) {
-  skelr(Void_t*, calloc(n, elem_size));
-}
-int malloc_trim_dbg(size_t pad, dbgargs) {
-  skelr(int, malloc_trim(pad));
-}
-size_t malloc_usable_size_dbg(Void_t *mem, dbgargs) {
-  skelr(size_t, malloc_usable_size(mem));
-}
-void malloc_stats_dbg(dbgargs) {
-  skelv(malloc_stats());
-}
-int mallopt_dbg(int flag, int value, dbgargs) {
-  skelr(int, dlmallopt(flag, value));
-}
-struct mallinfo mallinfo_dbg(dbgargs) {
-  skelr(struct mallinfo, dlmallinfo());
-}
-
-#undef skel
-#undef skelr
-#undef skelv
-#undef dbgargs
-
-#endif   /* DEBUG2 */
-
-/*
-  These routines make a number of assertions about the states
-  of data structures that should be true at all times. If any
-  are not true, it's very likely that a user program has somehow
-  trashed memory. (It's also possible that there is a coding error
-  in malloc. In which case, please report it!)
-*/
-
-#ifdef DEBUG3
-static int memtest(void *s, int c, size_t n)
-{
-  /*
-   * Return whether the N-byte memory region starting at S consists
-   * entirely of bytes with value C.
-   */
-  unsigned char *p = (unsigned char *)s;
-  size_t i;
-  for (i = 0; i < n; i++)
-    if (p[i] != (unsigned char)c)
-      return 0;
-  return 1;
-}
-#endif   /* DEBUG3 */
-
-#ifndef DEBUG3
-#define check_moats(P)
-#else
-#define check_moats  do_check_moats
-static void do_check_moats(mchunkptr p)
-{
-  INTERNAL_SIZE_T sz = chunksize(p);
-  unless(memtest((char *)chunk2mem(p) - MOATWIDTH, MOATFILL,
-		 MOATWIDTH), "region underflow", p);
-  unless(memtest((char *)p + sz - MOATWIDTH - p->pad, MOATFILL,
-		 MOATWIDTH + p->pad), "region overflow", p);
-}
-#endif   /* DEBUG3 */
-
-#if __STD_C
-static void do_check_chunk(mchunkptr p)
-#else
-static void do_check_chunk(p) mchunkptr p;
-#endif
-{
-  /* Try to ensure legal addresses before accessing any chunk fields, in the
-   * hope of issuing an informative message rather than causing a segv.
-   *
-   * The following chunk_is_mmapped() call accesses p->size #if HAVE_MMAP.
-   * This is unavoidable without maintaining a record of mmapped regions.
-   */
-  if (!chunk_is_mmapped(p))
-  {
-    INTERNAL_SIZE_T sz;
-
-    unless((char*)p >= sbrk_base, "chunk precedes sbrk_base", p);
-    unless((char*)p + MINSIZE <= (char*)top + chunksize(top),
-	   "chunk past sbrk area", p);
-
-    sz = chunksize(p);
-    if (p != top)
-      unless((char*)p + sz <= (char*)top, "chunk extends beyond top", p);
-    else
-      unless((char*)p + sz <= sbrk_base + sbrked_mem,
-	     "chunk extends past sbrk area", p);
-  }
-  check_moats(p);
-}
-
-#if __STD_C
-static void do_check_free_chunk(mchunkptr p)
-#else
-static void do_check_free_chunk(p) mchunkptr p;
-#endif
-{
-  INTERNAL_SIZE_T sz = chunksize(p);
-  mchunkptr next = chunk_at_offset(p, sz);
-
-  do_check_chunk(p);
-
-  /* Check whether it claims to be free ... */
-  unless(!inuse(p), "free chunk marked inuse", p);
-
-  /* Unless a special marker, must have OK fields */
-  if ((long)sz >= (long)MINSIZE)
-  {
-    unless((sz & ALIGN_MASK) == 0, "freed size defies alignment", p);
-    unless(aligned_OK(chunk2mem(p)), "misaligned freed region", p);
-    /* ... matching footer field */
-    unless(next->prev_size == sz, "chunk size mismatch", p);
-    /* ... and is fully consolidated */
-    unless(prev_inuse(p), "free chunk not joined with prev", p);
-    unless(next == top || inuse(next), "free chunk not joined with next", p);
-
-    /* ... and has minimally sane links */
-    unless(p->fd->bk == p, "broken forward link", p);
-    unless(p->bk->fd == p, "broken backward link", p);
-  }
-  else /* markers are always of size SIZE_SZ */
-    unless(sz == SIZE_SZ, "invalid small chunk size", p);
-}
-
-#if __STD_C
-static void do_check_inuse_chunk(mchunkptr p)
-#else
-static void do_check_inuse_chunk(p) mchunkptr p;
-#endif
-{
-  mchunkptr next;
-  do_check_chunk(p);
-
-  if (chunk_is_mmapped(p))
-    return;
-
-  /* Check whether it claims to be in use ... */
-#ifdef DEBUG3
-  unless(p->alloced, "memory not allocated", p);
-#endif
-  unless(inuse(p), "memory not allocated", p);
-
-  /* ... and is surrounded by OK chunks.
-    Since more things can be checked with free chunks than inuse ones,
-    if an inuse chunk borders them and debug is on, it's worth doing them.
-  */
-  if (!prev_inuse(p))
-  {
-    mchunkptr prv = prev_chunk(p);
-    unless(next_chunk(prv) == p, "prev link scrambled", p);
-    do_check_free_chunk(prv);
-  }
-  next = next_chunk(p);
-  if (next == top)
-  {
-    unless(prev_inuse(next), "top chunk wrongly thinks prev is unused", p);
-    unless(chunksize(next) >= MINSIZE, "top chunk too small", p);
-  }
-  else if (!inuse(next))
-    do_check_free_chunk(next);
-}
-
-#if __STD_C
-static void do_check_malloced_chunk(mchunkptr p, INTERNAL_SIZE_T s)
-#else
-static void do_check_malloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s;
-#endif
-{
-  INTERNAL_SIZE_T sz = chunksize(p);
-  long room = sz - s;
-
-  do_check_inuse_chunk(p);
-
-  /* Legal size ... */
-  unless((long)sz >= (long)MINSIZE, "chunk size too small", p);
-  unless((sz & ALIGN_MASK) == 0, "malloced size defies alignment", p);
-  unless(room >= 0, "chunk size too small for contents", p);
-  unless(room < (long)MINSIZE, "chunk size leaves too much spare room", p);
-
-  /* ... and alignment */
-  unless(aligned_OK(chunk2mem(p)), "misaligned malloced region", p);
-
-
-  /* ... and was allocated at front of an available chunk */
-  unless(prev_inuse(p), "malloced from the middle of a free chunk", p);
-}
-
-#ifdef DEBUG3
-static void init_alloced_chunk(mchunkptr p, size_t bytes)
-{
-  Void_t* mem = chunk2mem(p);
-  p->file = debug_file;
-  p->line = debug_line;
-  p->pad = chunksize(p) - OVERHEAD - bytes;
-  p->alloced = 1;
-  memset((char *)mem + bytes, MOATFILL, p->pad + MOATWIDTH);
-}
-
-static void do_init_malloced_chunk(mchunkptr p, size_t bytes)
-{
-  Void_t* mem = chunk2mem(p);
-  init_alloced_chunk(p, bytes);
-  memset((char *)mem - MOATWIDTH, MOATFILL, MOATWIDTH);
-  memset(mem, ALLOCFILL, bytes);
-}
-
-static void do_init_realloced_chunk(mchunkptr p, size_t bytes,
-				    INTERNAL_SIZE_T oldsize)
-{
-  Void_t* mem = chunk2mem(p);
-  INTERNAL_SIZE_T newsize = chunksize(p);
-  init_alloced_chunk(p, bytes);
-  if (oldsize < newsize)
-    /* This incorrectly leaves the leading pad area of the old trailing moat
-     * set to MOATFILL rather than ALLOCFILL.  An alternative is to save the
-     * old p->pad in rEALLOc() below and pass it to this function.
-     */
-    memset((char *)mem + oldsize - OVERHEAD, ALLOCFILL,
-	   bytes - (oldsize - OVERHEAD));
-}
-
-static void do_check_freefill(mchunkptr p, long newsize,
-			      INTERNAL_SIZE_T oldsize)
-{
-  /* The first newsize bytes of oldsize-byte chunk p are about to be
-   * allocated.  Issue a warning if any freefill locations in p that are about
-   * to be overwritten do not contain the character FREEFILL.
-   */
-  size_t bytes, maxbytes;
-  if (newsize <= 0)
-    return;
-  bytes = newsize - MEMOFFSET		/* don't check p's header */
-    + MEMOFFSET;			/* header of split-off remainder */
-  maxbytes = oldsize - OVERHEAD;
-  if (bytes > maxbytes)
-    bytes = maxbytes;
-  unless(memtest(chunk2mem(p), FREEFILL, bytes),
-	 "detected write to freed region", p);
-}
-
-static void do_init_freed_chunk(mchunkptr p, INTERNAL_SIZE_T freehead,
-				INTERNAL_SIZE_T freetail)
-{
-  /* freehead and freetail are the number of bytes at the beginning of p and
-   * end of p respectively that should already be initialized as free regions.
-   */
-  Void_t* mem = chunk2mem(p);
-  size_t size = chunksize(p);
-  size_t bytes = size - OVERHEAD;
-  p->pad = 0;
-  p->alloced = 0;
-  memset((char *)mem - MOATWIDTH, MOATFILL, MOATWIDTH);
-  memset((char *)mem + bytes, MOATFILL, MOATWIDTH);
-
-  /* To avoid terrible O(n^2) performance when free() repeatedly grows a free
-   * chunk, it's important not to free-fill regions that are already
-   * free-filled.
-   */
-  if (freehead + freetail < size) {
-    Void_t* start = !freehead ? mem : (char *)p + freehead - MOATWIDTH;
-    size_t len = (char *)p + size - (char *)start -
-      (!freetail ? MOATWIDTH : freetail - OVERHEAD);
-    memset(start, FREEFILL, len);
-  }
-}
-
-static void do_init_freeable_chunk(mchunkptr p)
-{
-  /* Arrange for the subsequent fREe(p) not to generate any warnings. */
-  init_alloced_chunk(p, chunksize(p) - OVERHEAD);
-  memset((char *)chunk2mem(p) - MOATWIDTH, MOATFILL, MOATWIDTH);
-}
-
-static void do_maximize_chunk(mchunkptr p)
-{
-  if (p->pad) {
-    Void_t* mem = chunk2mem(p);
-    size_t bytes = chunksize(p) - OVERHEAD - p->pad;
-    memset((char *)mem + bytes, ALLOCFILL, p->pad);
-    p->pad = 0;
-  }
-}
-
-static int do_check_init(void)
-{
-  /* Called from the first invocation of malloc_extend_top(), as detected by
-   * sbrk_base == -1.  Return whether this function allocated any memory.
-   */
-  static int state = 0;		/* 1 => initializing, 2 => initialized */
-  if (state == 1)
-    return 0;
-  unless(state == 0, "multiple calls to check_init", NULL);
-  state++;
-  atexit(malloc_update_mallinfo);	/* calls malloc on WinNT */
-  return sbrk_base != (char *)-1;
-}
-#endif   /* DEBUG3 */
-
-static mchunkptr lowest_chunk;
-
-#define check_free_chunk(P)  do_check_free_chunk(P)
-#define check_inuse_chunk(P) do_check_inuse_chunk(P)
-#define check_chunk(P) do_check_chunk(P)
-#define check_malloced_chunk(P,N) do_check_malloced_chunk(P,N)
-#else   /* !DEBUG */
-#define check_free_chunk(P)
-#define check_inuse_chunk(P)
-#define check_chunk(P)
-#define check_malloced_chunk(P,N)
-#endif   /* !DEBUG */
-
-#ifdef DEBUG3
-#define check_init            do_check_init
-#define init_malloced_chunk   do_init_malloced_chunk
-#define init_realloced_chunk  do_init_realloced_chunk
-#define check_freefill        do_check_freefill
-#define init_freed_chunk      do_init_freed_chunk
-#define init_freeable_chunk   do_init_freeable_chunk
-#define maximize_chunk        do_maximize_chunk
-#else
-#define check_init()          0
-#define init_malloced_chunk(P,B)
-#define init_realloced_chunk(P,B,O)
-#define check_freefill(P,N,O)
-#define init_freed_chunk(P,H,T)
-#define init_freeable_chunk(P)
-#define maximize_chunk(P)
-#endif   /* !DEBUG3 */
-
-
-
-/*
-  Macro-based internal utilities
-*/
-
-
-/*
-  Linking chunks in bin lists.
-  Call these only with variables, not arbitrary expressions, as arguments.
-*/
-
-/*
-  Place chunk p of size s in its bin, in size order,
-  putting it ahead of others of same size.
-*/
-
-
-#define frontlink(P, S, IDX, BK, FD)                                          \
-{                                                                             \
-  if (S < MAX_SMALLBIN_SIZE)                                                  \
-  {                                                                           \
-    IDX = smallbin_index(S);                                                  \
-    mark_binblock(IDX);                                                       \
-    BK = bin_at(IDX);                                                         \
-    FD = BK->fd;                                                              \
-    P->bk = BK;                                                               \
-    P->fd = FD;                                                               \
-    FD->bk = BK->fd = P;                                                      \
-  }                                                                           \
-  else                                                                        \
-  {                                                                           \
-    IDX = bin_index(S);                                                       \
-    BK = bin_at(IDX);                                                         \
-    FD = BK->fd;                                                              \
-    if (FD == BK) mark_binblock(IDX);                                         \
-    else                                                                      \
-    {                                                                         \
-      while (FD != BK && S < chunksize(FD)) FD = FD->fd;                      \
-      BK = FD->bk;                                                            \
-    }                                                                         \
-    P->bk = BK;                                                               \
-    P->fd = FD;                                                               \
-    FD->bk = BK->fd = P;                                                      \
-  }                                                                           \
-}
-
-
-/* take a chunk off a list */
-
-#define unlink(P, BK, FD)                                                     \
-{                                                                             \
-  BK = P->bk;                                                                 \
-  FD = P->fd;                                                                 \
-  FD->bk = BK;                                                                \
-  BK->fd = FD;                                                                \
-}                                                                             \
-
-/* Place p as the last remainder */
-
-#define link_last_remainder(P)                                                \
-{                                                                             \
-  last_remainder->fd = last_remainder->bk =  P;                               \
-  P->fd = P->bk = last_remainder;                                             \
-}
-
-/* Clear the last_remainder bin */
-
-#define clear_last_remainder \
-  (last_remainder->fd = last_remainder->bk = last_remainder)
-
-
-
-
-
-
-/* Routines dealing with mmap(). */
-
-#if HAVE_MMAP
-
-#if __STD_C
-static mchunkptr mmap_chunk(size_t size)
-#else
-static mchunkptr mmap_chunk(size) size_t size;
-#endif
-{
-  size_t page_mask = malloc_getpagesize - 1;
-  mchunkptr p;
-
-#ifndef MAP_ANONYMOUS
-  static int fd = -1;
-#endif
-
-  if(n_mmaps >= n_mmaps_max) return 0; /* too many regions */
-
-  size = (size + MMAP_EXTRA + page_mask) & ~page_mask;
-
-#ifdef MAP_ANONYMOUS
-  p = (mchunkptr)mmap(0, size, PROT_READ|PROT_WRITE,
-		      MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-#else /* !MAP_ANONYMOUS */
-  if (fd < 0)
-  {
-    fd = open("/dev/zero", O_RDWR);
-    if(fd < 0) return 0;
-  }
-  p = (mchunkptr)mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
-#endif
-
-  if(p == (mchunkptr)-1) return 0;
-
-  n_mmaps++;
-  if (n_mmaps > max_n_mmaps) max_n_mmaps = n_mmaps;
-
-  /* We demand that eight bytes into a page must be 8-byte aligned. */
-  assert(aligned_OK(chunk2mem(p)));
-
-  /* The offset to the start of the mmapped region is stored
-   * in the prev_size field of the chunk; normally it is zero,
-   * but that can be changed in memalign().
-   */
-  p->prev_size = 0;
-  set_head(p, size|IS_MMAPPED);
-
-  mmapped_mem += size;
-  if ((unsigned long)mmapped_mem > (unsigned long)max_mmapped_mem)
-    max_mmapped_mem = mmapped_mem;
-  if ((unsigned long)(mmapped_mem + sbrked_mem) > (unsigned long)max_total_mem)
-    max_total_mem = mmapped_mem + sbrked_mem;
-  return p;
-}
-
-#if __STD_C
-static void munmap_chunk(mchunkptr p)
-#else
-static void munmap_chunk(p) mchunkptr p;
-#endif
-{
-  INTERNAL_SIZE_T size = chunksize(p);
-  int ret;
-
-  assert (chunk_is_mmapped(p));
-  assert(! ((char*)p >= sbrk_base && (char*)p < sbrk_base + sbrked_mem));
-  assert((n_mmaps > 0));
-  assert(((p->prev_size + size) & (malloc_getpagesize-1)) == 0);
-
-  n_mmaps--;
-  mmapped_mem -= (size + p->prev_size);
-
-  ret = munmap((char *)p - p->prev_size, size + p->prev_size);
-
-  /* munmap returns non-zero on failure */
-  assert(ret == 0);
-}
-
-#if HAVE_MREMAP
-
-#if __STD_C
-static mchunkptr mremap_chunk(mchunkptr p, size_t new_size)
-#else
-static mchunkptr mremap_chunk(p, new_size) mchunkptr p; size_t new_size;
-#endif
-{
-  size_t page_mask = malloc_getpagesize - 1;
-  INTERNAL_SIZE_T offset = p->prev_size;
-  INTERNAL_SIZE_T size = chunksize(p);
-  char *cp;
-
-  assert (chunk_is_mmapped(p));
-  assert(! ((char*)p >= sbrk_base && (char*)p < sbrk_base + sbrked_mem));
-  assert((n_mmaps > 0));
-  assert(((size + offset) & (malloc_getpagesize-1)) == 0);
-
-  new_size = (new_size + offset + MMAP_EXTRA + page_mask) & ~page_mask;
-
-  cp = (char *)mremap((char *)p - offset, size + offset, new_size, 1);
-
-  if (cp == (char *)-1) return 0;
-
-  p = (mchunkptr)(cp + offset);
-
-  assert(aligned_OK(chunk2mem(p)));
-
-  assert(p->prev_size == offset);
-  set_head(p, (new_size - offset)|IS_MMAPPED);
-
-  mmapped_mem -= size + offset;
-  mmapped_mem += new_size;
-  if ((unsigned long)mmapped_mem > (unsigned long)max_mmapped_mem)
-    max_mmapped_mem = mmapped_mem;
-  if ((unsigned long)(mmapped_mem + sbrked_mem) > (unsigned long)max_total_mem)
-    max_total_mem = mmapped_mem + sbrked_mem;
-  return p;
-}
-
-#endif /* HAVE_MREMAP */
-
-#endif /* HAVE_MMAP */
-
-
-
-
-/*
-  Extend the top-most chunk by obtaining memory from system.
-  Main interface to sbrk (but see also malloc_trim).
-*/
-
-#if __STD_C
-static void malloc_extend_top(INTERNAL_SIZE_T nb)
-#else
-static void malloc_extend_top(nb) INTERNAL_SIZE_T nb;
-#endif
-{
-  char*     lim;                  /* return value from sbrk */
-  INTERNAL_SIZE_T front_misalign; /* unusable bytes at front of sbrked space */
-  INTERNAL_SIZE_T correction;     /* bytes for 2nd sbrk call */
-  char*     new_lim;              /* return of 2nd sbrk call */
-  INTERNAL_SIZE_T top_size;       /* new size of top chunk */
-
-  mchunkptr old_top     = top;  /* Record state of old top */
-  INTERNAL_SIZE_T old_top_size = chunksize(old_top);
-  char*     old_end      = (char*)(chunk_at_offset(old_top, old_top_size));
-
-  /* Pad request with top_pad plus minimal overhead */
-
-  INTERNAL_SIZE_T    sbrk_size     = nb + top_pad + MINSIZE;
-  unsigned long pagesz    = malloc_getpagesize;
-
-  /* If not the first time through, round to preserve page boundary */
-  /* Otherwise, we need to correct to a page size below anyway. */
-  /* (We also correct below if an intervening foreign sbrk call.) */
-
-  if (sbrk_base != (char*)(-1))
-    sbrk_size = (sbrk_size + (pagesz - 1)) & ~(pagesz - 1);
-
-  else if (check_init()) {
-    if (chunksize(top) - nb < (long)MINSIZE)
-      malloc_extend_top(nb);
-    return;
-  }
-
-  lim = (char*)(MORECORE (sbrk_size));
-
-  /* Fail if sbrk failed or if a foreign sbrk call killed our space */
-  if (lim == (char*)(MORECORE_FAILURE) ||
-      (lim < old_end && old_top != initial_top))
-    return;
-
-  sbrked_mem += sbrk_size;
-
-  if (lim == old_end) /* can just add bytes to current top */
-  {
-    top_size = sbrk_size + old_top_size;
-    set_head(top, top_size | PREV_INUSE);
-  }
-  else
-  {
-#ifdef SBRKDBG
-    INTERNAL_SIZE_T padding = (char *)sbrk (0) - (lim + sbrk_size);
-    sbrk_size += padding;
-    sbrked_mem += padding;
-#endif
-
-    if (sbrk_base == (char*)(-1))  /* First time through. Record base */
-      sbrk_base = lim;
-    else  /* Someone else called sbrk().  Count those bytes as sbrked_mem. */
-      sbrked_mem += lim - (char*)old_end;
-
-    /* Guarantee alignment of first new chunk made from this space */
-    front_misalign = (unsigned long)chunk2mem(lim) & ALIGN_MASK;
-    if (front_misalign > 0)
-    {
-      correction = (ALIGNMENT) - front_misalign;
-      lim += correction;
-    }
-    else
-      correction = 0;
-
-    /* Guarantee the next brk will be at a page boundary */
-    correction += pagesz - ((unsigned long)(lim + sbrk_size) & (pagesz - 1));
-
-    /* Allocate correction */
-    new_lim = (char*)(MORECORE (correction));
-    if (new_lim == (char*)(MORECORE_FAILURE)) return;
-
-    sbrked_mem += correction;
-
-    top = (mchunkptr)lim;
-    top_size = new_lim - lim + correction;
-    set_head(top, top_size | PREV_INUSE);
-#if DEBUG
-    lowest_chunk = top;
-#endif
-
-#ifdef OTHER_SBRKS
-    if (old_top != initial_top)
-    {
-
-      /* There must have been an intervening foreign sbrk call. */
-      /* A double fencepost is necessary to prevent consolidation */
-
-      /* If not enough space to do this, then user did something very wrong */
-      if (old_top_size < MINSIZE)
-      {
-	set_head(top, PREV_INUSE); /* will force null return from malloc */
-	return;
-      }
-
-      old_top_size -= 2*SIZE_SZ;
-      chunk_at_offset(old_top, old_top_size          )->size =
-	SIZE_SZ|PREV_INUSE;
-      chunk_at_offset(old_top, old_top_size + SIZE_SZ)->size =
-	SIZE_SZ|PREV_INUSE;
-      set_head_size(old_top, old_top_size);
-      /* If possible, release the rest. */
-      if (old_top_size >= MINSIZE) {
-	init_freeable_chunk(old_top);
-	fREe(chunk2mem(old_top));
-      }
-    }
-#endif   /* OTHER_SBRKS */
-  }
-
-  init_freed_chunk(top, old_top == initial_top ? old_top_size : 0, 0);
-
-  if ((unsigned long)sbrked_mem > (unsigned long)max_sbrked_mem)
-    max_sbrked_mem = sbrked_mem;
-  if ((unsigned long)(mmapped_mem + sbrked_mem) > (unsigned long)max_total_mem)
-    max_total_mem = mmapped_mem + sbrked_mem;
-
-  /* We always land on a page boundary */
-  assert(((unsigned long)((char*)top + top_size) & (pagesz - 1)) == 0);
-}
-
-
-
-
-/* Main public routines */
-
-
-/*
-  Malloc Algorthim:
-
-    The requested size is first converted into a usable form, `nb'.
-    This currently means to add 4 bytes overhead plus possibly more to
-    obtain 8-byte alignment and/or to obtain a size of at least
-    MINSIZE (currently 16 bytes), the smallest allocatable size.
-    (All fits are considered `exact' if they are within MINSIZE bytes.)
-
-    From there, the first successful of the following steps is taken:
-
-      1. The bin corresponding to the request size is scanned, and if
-	 a chunk of exactly the right size is found, it is taken.
-
-      2. The most recently remaindered chunk is used if it is big
-	 enough.  This is a form of (roving) first fit, used only in
-	 the absence of exact fits. Runs of consecutive requests use
-	 the remainder of the chunk used for the previous such request
-	 whenever possible. This limited use of a first-fit style
-	 allocation strategy tends to give contiguous chunks
-	 coextensive lifetimes, which improves locality and can reduce
-	 fragmentation in the long run.
-
-      3. Other bins are scanned in increasing size order, using a
-	 chunk big enough to fulfill the request, and splitting off
-	 any remainder.  This search is strictly by best-fit; i.e.,
-	 the smallest (with ties going to approximately the least
-	 recently used) chunk that fits is selected.
-
-      4. If large enough, the chunk bordering the end of memory
-	 (`top') is split off. (This use of `top' is in accord with
-	 the best-fit search rule.  In effect, `top' is treated as
-	 larger (and thus less well fitting) than any other available
-	 chunk since it can be extended to be as large as necessary
-	 (up to system limitations).
-
-      5. If the request size meets the mmap threshold and the
-	 system supports mmap, and there are few enough currently
-	 allocated mmapped regions, and a call to mmap succeeds,
-	 the request is allocated via direct memory mapping.
-
-      6. Otherwise, the top of memory is extended by
-	 obtaining more space from the system (normally using sbrk,
-	 but definable to anything else via the MORECORE macro).
-	 Memory is gathered from the system (in system page-sized
-	 units) in a way that allows chunks obtained across different
-	 sbrk calls to be consolidated, but does not require
-	 contiguous memory. Thus, it should be safe to intersperse
-	 mallocs with other sbrk calls.
-
-
-      All allocations are made from the the `lowest' part of any found
-      chunk. (The implementation invariant is that prev_inuse is
-      always true of any allocated chunk; i.e., that each allocated
-      chunk borders either a previously allocated and still in-use chunk,
-      or the base of its memory arena.)
-
-*/
-
-#if __STD_C
-Void_t* mALLOc(size_t bytes)
-#else
-Void_t* mALLOc(bytes) size_t bytes;
-#endif
-{
-  mchunkptr victim;                  /* inspected/selected chunk */
-  INTERNAL_SIZE_T victim_size;       /* its size */
-  int       idx;                     /* index for bin traversal */
-  mbinptr   bin;                     /* associated bin */
-  mchunkptr remainder;               /* remainder from a split */
-  long      remainder_size;          /* its size */
-  int       remainder_index;         /* its bin index */
-  unsigned long block;               /* block traverser bit */
-  int       startidx;                /* first bin of a traversed block */
-  mchunkptr fwd;                     /* misc temp for linking */
-  mchunkptr bck;                     /* misc temp for linking */
-  mbinptr q;                         /* misc temp */
-
-  INTERNAL_SIZE_T nb  = request2size(bytes);  /* padded request size; */
-
-  /* Check for exact match in a bin */
-
-  if (is_small_request(nb))  /* Faster version for small requests */
-  {
-    idx = smallbin_index(nb);
-
-    /* No traversal or size check necessary for small bins.  */
-
-    q = bin_at(idx);
-    victim = last(q);
-
-    /* Also scan the next one, since it would have a remainder < MINSIZE */
-    if (victim == q)
-    {
-      q = next_bin(q);
-      victim = last(q);
-    }
-    if (victim != q)
-    {
-      victim_size = chunksize(victim);
-      unlink(victim, bck, fwd);
-      set_inuse_bit_at_offset(victim, victim_size);
-      check_freefill(victim, victim_size, victim_size);
-      init_malloced_chunk(victim, bytes);
-      check_malloced_chunk(victim, nb);
-
-      return chunk2mem(victim);
-    }
-
-    idx += 2; /* Set for bin scan below. We've already scanned 2 bins. */
-
-  }
-  else
-  {
-    idx = bin_index(nb);
-    bin = bin_at(idx);
-
-    for (victim = last(bin); victim != bin; victim = victim->bk)
-    {
-      victim_size = chunksize(victim);
-      remainder_size = victim_size - nb;
-
-      if (remainder_size >= (long)MINSIZE) /* too big */
-      {
-	--idx; /* adjust to rescan below after checking last remainder */
-	break;
-      }
-
-      else if (remainder_size >= 0) /* exact fit */
-      {
-	unlink(victim, bck, fwd);
-	set_inuse_bit_at_offset(victim, victim_size);
-	check_freefill(victim, victim_size, victim_size);
-	init_malloced_chunk(victim, bytes);
-	check_malloced_chunk(victim, nb);
-	return chunk2mem(victim);
-      }
-    }
-
-    ++idx;
-
-  }
-
-  /* Try to use the last split-off remainder */
-
-  if ( (victim = last_remainder->fd) != last_remainder)
-  {
-    victim_size = chunksize(victim);
-    remainder_size = victim_size - nb;
-
-    if (remainder_size >= (long)MINSIZE) /* re-split */
-    {
-      remainder = chunk_at_offset(victim, nb);
-      set_head(victim, nb | PREV_INUSE);
-      check_freefill(victim, nb, victim_size);
-      init_malloced_chunk(victim, bytes);
-      link_last_remainder(remainder);
-      set_head(remainder, remainder_size | PREV_INUSE);
-      set_foot(remainder, remainder_size);
-      init_freed_chunk(remainder, remainder_size, 0);
-      check_malloced_chunk(victim, nb);
-      return chunk2mem(victim);
-    }
-
-    clear_last_remainder;
-
-    if (remainder_size >= 0)  /* exhaust */
-    {
-      set_inuse_bit_at_offset(victim, victim_size);
-      check_freefill(victim, victim_size, victim_size);
-      init_malloced_chunk(victim, bytes);
-      check_malloced_chunk(victim, nb);
-      return chunk2mem(victim);
-    }
-
-    /* Else place in bin */
-
-    frontlink(victim, victim_size, remainder_index, bck, fwd);
-  }
-
-  /*
-     If there are any possibly nonempty big-enough blocks,
-     search for best fitting chunk by scanning bins in blockwidth units.
-  */
-
-  if ( (block = idx2binblock(idx)) <= binblocks)
-  {
-
-    /* Get to the first marked block */
-
-    if ( (block & binblocks) == 0)
-    {
-      /* force to an even block boundary */
-      idx = (idx & ~(BINBLOCKWIDTH - 1)) + BINBLOCKWIDTH;
-      block <<= 1;
-      while ((block & binblocks) == 0)
-      {
-	idx += BINBLOCKWIDTH;
-	block <<= 1;
-      }
-    }
-
-    /* For each possibly nonempty block ... */
-    for (;;)
-    {
-      startidx = idx;          /* (track incomplete blocks) */
-      q = bin = bin_at(idx);
-
-      /* For each bin in this block ... */
-      do
-      {
-	/* Find and use first big enough chunk ... */
-
-	for (victim = last(bin); victim != bin; victim = victim->bk)
-	{
-	  victim_size = chunksize(victim);
-	  remainder_size = victim_size - nb;
-
-	  if (remainder_size >= (long)MINSIZE) /* split */
-	  {
-	    remainder = chunk_at_offset(victim, nb);
-	    set_head(victim, nb | PREV_INUSE);
-	    check_freefill(victim, nb, victim_size);
-	    unlink(victim, bck, fwd);
-	    init_malloced_chunk(victim, bytes);
-	    link_last_remainder(remainder);
-	    set_head(remainder, remainder_size | PREV_INUSE);
-	    set_foot(remainder, remainder_size);
-	    init_freed_chunk(remainder, remainder_size, 0);
-	    check_malloced_chunk(victim, nb);
-	    return chunk2mem(victim);
-	  }
-
-	  else if (remainder_size >= 0)  /* take */
-	  {
-	    check_freefill(victim, victim_size, victim_size);
-	    set_inuse_bit_at_offset(victim, victim_size);
-	    unlink(victim, bck, fwd);
-	    init_malloced_chunk(victim, bytes);
-	    check_malloced_chunk(victim, nb);
-	    return chunk2mem(victim);
-	  }
-
-	}
-
-       bin = next_bin(bin);
-
-      } while ((++idx & (BINBLOCKWIDTH - 1)) != 0);
-
-      /* Clear out the block bit. */
-
-      do   /* Possibly backtrack to try to clear a partial block */
-      {
-	if ((startidx & (BINBLOCKWIDTH - 1)) == 0)
-	{
-	  binblocks &= ~block;
-	  break;
-	}
-	--startidx;
-       q = prev_bin(q);
-      } while (first(q) == q);
-
-      /* Get to the next possibly nonempty block */
-
-      if ( (block <<= 1) <= binblocks && (block != 0) )
-      {
-	while ((block & binblocks) == 0)
-	{
-	  idx += BINBLOCKWIDTH;
-	  block <<= 1;
-	}
-      }
-      else
-	break;
-    }
-  }
-
-
-  /* Try to use top chunk */
-
-  /* Require that there be a remainder, ensuring top always exists  */
-  if ( (remainder_size = chunksize(top) - nb) < (long)MINSIZE)
-  {
-
-#if HAVE_MMAP
-    /* If big and would otherwise need to extend, try to use mmap instead */
-    if ((unsigned long)nb >= (unsigned long)mmap_threshold &&
-	(victim = mmap_chunk(nb)) != 0) {
-      init_malloced_chunk(victim, bytes);
-      return chunk2mem(victim);
-    }
-#endif
-
-    /* Try to extend */
-    malloc_extend_top(nb);
-    if ( (remainder_size = chunksize(top) - nb) < (long)MINSIZE)
-      return 0; /* propagate failure */
-  }
-
-  victim = top;
-  set_head(victim, nb | PREV_INUSE);
-  check_freefill(victim, nb, nb + remainder_size);
-  init_malloced_chunk(victim, bytes);
-  top = chunk_at_offset(victim, nb);
-  set_head(top, remainder_size | PREV_INUSE);
-  init_freed_chunk(top, remainder_size, 0);
-  check_malloced_chunk(victim, nb);
-  return chunk2mem(victim);
-
-}
-
-
-
-
-/*
-
-  free() algorithm :
-
-    cases:
-
-       1. free(0) has no effect.
-
-       2. If the chunk was allocated via mmap, it is release via munmap().
-
-       3. If a returned chunk borders the current high end of memory,
-	  it is consolidated into the top, and if the total unused
-	  topmost memory exceeds the trim threshold, malloc_trim is
-	  called.
-
-       4. Other chunks are consolidated as they arrive, and
-	  placed in corresponding bins. (This includes the case of
-	  consolidating with the current `last_remainder').
-
-*/
-
-
-#if __STD_C
-void fREe(Void_t* mem)
-#else
-void fREe(mem) Void_t* mem;
-#endif
-{
-  mchunkptr p;         /* chunk corresponding to mem */
-  INTERNAL_SIZE_T hd;  /* its head field */
-  INTERNAL_SIZE_T sz;  /* its size */
-  int       idx;       /* its bin index */
-  mchunkptr next;      /* next contiguous chunk */
-  INTERNAL_SIZE_T nextsz; /* its size */
-  INTERNAL_SIZE_T prevsz; /* size of previous contiguous chunk */
-  mchunkptr bck;       /* misc temp for linking */
-  mchunkptr fwd;       /* misc temp for linking */
-  int       islr;      /* track whether merging with last_remainder */
-
-  if (mem == 0)                              /* free(0) has no effect */
-    return;
-
-  p = mem2chunk(mem);
-  check_inuse_chunk(p);
-
-  hd = p->size;
-
-#if HAVE_MMAP
-  if (hd & IS_MMAPPED)                       /* release mmapped memory. */
-  {
-    munmap_chunk(p);
-    return;
-  }
-#endif
-
-  sz = hd & ~PREV_INUSE;
-  next = chunk_at_offset(p, sz);
-  nextsz = chunksize(next);
-  prevsz = 0;                                 /* avoid compiler warnings */
-
-  if (next == top)                            /* merge with top */
-  {
-    sz += nextsz;
-
-    if (!(hd & PREV_INUSE))                    /* consolidate backward */
-    {
-      prevsz = p->prev_size;
-      p = chunk_at_offset(p, -(long)prevsz);
-      sz += prevsz;
-      unlink(p, bck, fwd);
-    }
-
-    set_head(p, sz | PREV_INUSE);
-    top = p;
-    init_freed_chunk(top, !(hd & PREV_INUSE) ? prevsz : 0, nextsz);
-    if ((unsigned long)(sz) >= trim_threshold)
-      malloc_trim(top_pad);
-    return;
-  }
-
-  set_head(next, nextsz);                    /* clear inuse bit */
-
-  islr = 0;
-
-  if (!(hd & PREV_INUSE))                    /* consolidate backward */
-  {
-    prevsz = p->prev_size;
-    p = chunk_at_offset(p, -(long)prevsz);
-    sz += prevsz;
-
-    if (p->fd == last_remainder)             /* keep as last_remainder */
-      islr = 1;
-    else
-      unlink(p, bck, fwd);
-  }
-
-  if (!(inuse_bit_at_offset(next, nextsz)))   /* consolidate forward */
-  {
-    sz += nextsz;
-
-    if (!islr && next->fd == last_remainder)  /* re-insert last_remainder */
-    {
-      islr = 1;
-      link_last_remainder(p);
-    }
-    else
-      unlink(next, bck, fwd);
-  }
-
-
-  set_head(p, sz | PREV_INUSE);
-  set_foot(p, sz);
-  if (!islr)
-    frontlink(p, sz, idx, bck, fwd);
-  init_freed_chunk(p, !(hd & PREV_INUSE) ? prevsz : 0,
-		   !inuse_bit_at_offset(next, nextsz) ? nextsz : 0);
-}
-
-
-
-
-
-/*
-
-  Realloc algorithm:
-
-    Chunks that were obtained via mmap cannot be extended or shrunk
-    unless HAVE_MREMAP is defined, in which case mremap is used.
-    Otherwise, if their reallocation is for additional space, they are
-    copied.  If for less, they are just left alone.
-
-    Otherwise, if the reallocation is for additional space, and the
-    chunk can be extended, it is, else a malloc-copy-free sequence is
-    taken.  There are several different ways that a chunk could be
-    extended. All are tried:
-
-       * Extending forward into following adjacent free chunk.
-       * Shifting backwards, joining preceding adjacent space
-       * Both shifting backwards and extending forward.
-       * Extending into newly sbrked space
-
-    Unless the #define realloc_ZERO_BYTES_FREES is set, realloc with a
-    size argument of zero (re)allocates a minimum-sized chunk.
-
-    If the reallocation is for less space, and the new request is for
-    a `small' (<512 bytes) size, then the newly unused space is lopped
-    off and freed.
-
-    The old unix realloc convention of allowing the last-free'd chunk
-    to be used as an argument to realloc is no longer supported.
-    I don't know of any programs still relying on this feature,
-    and allowing it would also allow too many other incorrect
-    usages of realloc to be sensible.
-
-
-*/
-
-
-#if __STD_C
-Void_t* rEALLOc(Void_t* oldmem, size_t bytes)
-#else
-Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
-#endif
-{
-  INTERNAL_SIZE_T    nb;      /* padded request size */
-
-  mchunkptr oldp;             /* chunk corresponding to oldmem */
-  INTERNAL_SIZE_T    oldsize; /* its size */
-
-  mchunkptr newp;             /* chunk to return */
-  INTERNAL_SIZE_T    newsize; /* its size */
-  Void_t*   newmem;           /* corresponding user mem */
-
-  mchunkptr next;             /* next contiguous chunk after oldp */
-  INTERNAL_SIZE_T  nextsize;  /* its size */
-
-  mchunkptr prev;             /* previous contiguous chunk before oldp */
-  INTERNAL_SIZE_T  prevsize;  /* its size */
-
-  mchunkptr remainder;        /* holds split off extra space from newp */
-  INTERNAL_SIZE_T  remainder_size;   /* its size */
-
-  mchunkptr bck;              /* misc temp for linking */
-  mchunkptr fwd;              /* misc temp for linking */
-
-#ifdef realloc_ZERO_BYTES_FREES
-  if (bytes == 0) { fREe(oldmem); return 0; }
-#endif
-
-
-  /* realloc of null is supposed to be same as malloc */
-  if (oldmem == 0) return mALLOc(bytes);
-
-  newp    = oldp    = mem2chunk(oldmem);
-  newsize = oldsize = chunksize(oldp);
-
-
-  nb = request2size(bytes);
-
-  check_inuse_chunk(oldp);
-
-#if HAVE_MMAP
-  if (chunk_is_mmapped(oldp))
-  {
-    if (oldsize - MMAP_EXTRA >= nb) {
-      init_realloced_chunk(oldp, bytes, oldsize);
-      return oldmem; /* do nothing */
-    }
-#if HAVE_MREMAP
-    newp = mremap_chunk(oldp, nb);
-    if (newp) {
-      init_realloced_chunk(newp, bytes, oldsize);
-      return chunk2mem(newp);
-    }
-#endif
-    /* Must alloc, copy, free. */
-    newmem = mALLOc(bytes);
-    if (newmem == 0) return 0; /* propagate failure */
-    malloc_COPY(newmem, oldmem, oldsize - OVERHEAD - MMAP_EXTRA);
-    munmap_chunk(oldp);
-    return newmem;
-  }
-#endif
-
-  if (oldsize < nb)
-  {
-
-    /* Try expanding forward */
-
-    next = chunk_at_offset(oldp, oldsize);
-    if (next == top || !inuse(next))
-    {
-      nextsize = chunksize(next);
-
-      /* Forward into top only if a remainder */
-      if (next == top)
-      {
-	if ((long)(nextsize + newsize) >= (long)(nb + MINSIZE))
-	{
-	  check_freefill(next, nb - oldsize, nextsize);
-	  newsize += nextsize;
-	  top = chunk_at_offset(oldp, nb);
-	  set_head(top, (newsize - nb) | PREV_INUSE);
-	  init_freed_chunk(top, newsize - nb, 0);
-	  set_head_size(oldp, nb);
-	  init_realloced_chunk(oldp, bytes, oldsize);
-	  return chunk2mem(oldp);
-	}
-      }
-
-      /* Forward into next chunk */
-      else if (((long)(nextsize + newsize) >= (long)nb))
-      {
-	check_freefill(next, nb - oldsize, nextsize);
-	unlink(next, bck, fwd);
-	newsize  += nextsize;
-	goto split;
-      }
-    }
-    else
-    {
-      next = 0;
-      nextsize = 0;
-    }
-
-    /* Try shifting backwards. */
-
-    if (!prev_inuse(oldp))
-    {
-      prev = prev_chunk(oldp);
-      prevsize = chunksize(prev);
-
-      /* try forward + backward first to save a later consolidation */
-
-      if (next != 0)
-      {
-	/* into top */
-	if (next == top)
-	{
-	  if ((long)(nextsize + prevsize + newsize) >= (long)(nb + MINSIZE))
-	  {
-	    check_freefill(prev, nb, prevsize);
-	    check_freefill(next, nb - (prevsize + newsize), nextsize);
-	    unlink(prev, bck, fwd);
-	    newp = prev;
-	    newsize += prevsize + nextsize;
-	    newmem = chunk2mem(newp);
-	    malloc_COPY(newmem, oldmem, oldsize - OVERHEAD);
-	    top = chunk_at_offset(newp, nb);
-	    set_head(top, (newsize - nb) | PREV_INUSE);
-	    init_freed_chunk(top, newsize - nb, 0);
-	    set_head_size(newp, nb);
-	    init_realloced_chunk(newp, bytes, oldsize);
-	    return newmem;
-	  }
-	}
-
-	/* into next chunk */
-	else if (((long)(nextsize + prevsize + newsize) >= (long)(nb)))
-	{
-	  check_freefill(prev, nb, prevsize);
-	  check_freefill(next, nb - (prevsize + newsize), nextsize);
-	  unlink(next, bck, fwd);
-	  unlink(prev, bck, fwd);
-	  newp = prev;
-	  newsize += nextsize + prevsize;
-	  newmem = chunk2mem(newp);
-	  malloc_COPY(newmem, oldmem, oldsize - OVERHEAD);
-	  goto split;
-	}
-      }
-
-      /* backward only */
-      if (prev != 0 && (long)(prevsize + newsize) >= (long)nb)
-      {
-	check_freefill(prev, nb, prevsize);
-	unlink(prev, bck, fwd);
-	newp = prev;
-	newsize += prevsize;
-	newmem = chunk2mem(newp);
-	malloc_COPY(newmem, oldmem, oldsize - OVERHEAD);
-	goto split;
-      }
-    }
-
-    /* Must allocate */
-
-    newmem = mALLOc (bytes);
-
-    if (newmem == 0)  /* propagate failure */
-      return 0;
-
-    /* Avoid copy if newp is next chunk after oldp. */
-    /* (This can only happen when new chunk is sbrk'ed.) */
-
-    if ( (newp = mem2chunk(newmem)) == next_chunk(oldp))
-    {
-      newsize += chunksize(newp);
-      newp = oldp;
-      goto split;
-    }
-
-    /* Otherwise copy, free, and exit */
-    malloc_COPY(newmem, oldmem, oldsize - OVERHEAD);
-    fREe(oldmem);
-    return newmem;
-  }
-
-
- split:  /* split off extra room in old or expanded chunk */
-
-  if (newsize - nb >= MINSIZE) /* split off remainder */
-  {
-    remainder = chunk_at_offset(newp, nb);
-    remainder_size = newsize - nb;
-    set_head_size(newp, nb);
-    set_head(remainder, remainder_size | PREV_INUSE);
-    set_inuse_bit_at_offset(remainder, remainder_size);
-    init_malloced_chunk(remainder, remainder_size - OVERHEAD);
-    fREe(chunk2mem(remainder)); /* let free() deal with it */
-  }
-  else
-  {
-    set_head_size(newp, newsize);
-    set_inuse_bit_at_offset(newp, newsize);
-  }
-
-  init_realloced_chunk(newp, bytes, oldsize);
-  check_inuse_chunk(newp);
-  return chunk2mem(newp);
-}
-
-
-
-
-/*
-
-  memalign algorithm:
-
-    memalign requests more than enough space from malloc, finds a spot
-    within that chunk that meets the alignment request, and then
-    possibly frees the leading and trailing space.
-
-    The alignment argument must be a power of two. This property is not
-    checked by memalign, so misuse may result in random runtime errors.
-
-    8-byte alignment is guaranteed by normal malloc calls, so don't
-    bother calling memalign with an argument of 8 or less.
-
-    Overreliance on memalign is a sure way to fragment space.
-
-*/
-
-
-#if __STD_C
-Void_t* mEMALIGn(size_t alignment, size_t bytes)
-#else
-Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes;
-#endif
-{
-  INTERNAL_SIZE_T    nb;      /* padded  request size */
-  char*     m;                /* memory returned by malloc call */
-  mchunkptr p;                /* corresponding chunk */
-  char*     lim;              /* alignment point within p */
-  mchunkptr newp;             /* chunk to return */
-  INTERNAL_SIZE_T  newsize;   /* its size */
-  INTERNAL_SIZE_T  leadsize;  /* leading space befor alignment point */
-  mchunkptr remainder;        /* spare room at end to split off */
-  long      remainder_size;   /* its size */
-
-  /* If need less alignment than we give anyway, just relay to malloc */
-
-  if (alignment <= ALIGNMENT) return mALLOc(bytes);
-
-  /* Otherwise, ensure that it is at least a minimum chunk size */
-
-  if (alignment <  MINSIZE) alignment = MINSIZE;
-
-  /* Call malloc with worst case padding to hit alignment. */
-
-  nb = request2size(bytes);
-  m  = (char*)mALLOc(nb + alignment + MINSIZE);
-
-  if (m == 0) return 0; /* propagate failure */
-
-  p = mem2chunk(m);
-
-  if ((((unsigned long)(m)) % alignment) == 0) /* aligned */
-  {
-    init_realloced_chunk(p, bytes, chunksize(p));
-    return chunk2mem(p); /* nothing more to do */
-  }
-  else /* misaligned */
-  {
-    /*
-      Find an aligned spot inside chunk.
-      Since we need to give back leading space in a chunk of at
-      least MINSIZE, if the first calculation places us at
-      a spot with less than MINSIZE leader, we can move to the
-      next aligned spot -- we've allocated enough total room so that
-      this is always possible.
-    */
-
-    lim = (char*)mem2chunk(((unsigned long)(m + alignment - 1)) &
-			   ~(alignment - 1));
-    if ((lim - (char*)p) < (long)MINSIZE) lim = lim + alignment;
-
-    newp = (mchunkptr)lim;
-    leadsize = lim - (char*)p;
-    newsize = chunksize(p) - leadsize;
-
-#if HAVE_MMAP
-    if(chunk_is_mmapped(p))
-    {
-      newp->prev_size = p->prev_size + leadsize;
-      set_head(newp, newsize|IS_MMAPPED);
-      init_malloced_chunk(newp, bytes);
-      return chunk2mem(newp);
-    }
-#endif
-
-    /* give back leader, use the rest */
-
-    set_head(newp, newsize | PREV_INUSE);
-    set_inuse_bit_at_offset(newp, newsize);
-    set_head_size(p, leadsize);
-    init_freeable_chunk(p);
-    fREe(chunk2mem(p));
-    p = newp;
-
-    assert (newsize >= nb && (((unsigned long)(chunk2mem(p))) % alignment) == 0);
-  }
-
-  /* Also give back spare room at the end */
-
-  remainder_size = chunksize(p) - nb;
-
-  if (remainder_size >= (long)MINSIZE)
-  {
-    remainder = chunk_at_offset(p, nb);
-    set_head(remainder, remainder_size | PREV_INUSE);
-    set_head_size(p, nb);
-    init_freeable_chunk(remainder);
-    fREe(chunk2mem(remainder));
-  }
-
-  init_malloced_chunk(p, bytes);
-  check_inuse_chunk(p);
-  return chunk2mem(p);
-
-}
-
-
-
-
-/*
-    valloc just invokes memalign with alignment argument equal
-    to the page size of the system (or as near to this as can
-    be figured out from all the includes/defines above.)
-*/
-
-#if __STD_C
-Void_t* vALLOc(size_t bytes)
-#else
-Void_t* vALLOc(bytes) size_t bytes;
-#endif
-{
-  return mEMALIGn (malloc_getpagesize, bytes);
-}
-
-/*
-  pvalloc just invokes valloc for the nearest pagesize
-  that will accommodate request
-*/
-
-
-#if __STD_C
-Void_t* pvALLOc(size_t bytes)
-#else
-Void_t* pvALLOc(bytes) size_t bytes;
-#endif
-{
-  size_t pagesize = malloc_getpagesize;
-  return mEMALIGn (pagesize, (bytes + pagesize - 1) & ~(pagesize - 1));
-}
-
-/*
-
-  calloc calls malloc, then zeroes out the allocated chunk.
-
-*/
-
-#if __STD_C
-Void_t* cALLOc(size_t n, size_t elem_size)
-#else
-Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size;
-#endif
-{
-  mchunkptr p;
-  INTERNAL_SIZE_T csz;
-
-  INTERNAL_SIZE_T sz = n * elem_size;
-
-  /* check if expand_top called, in which case don't need to clear */
-#if MORECORE_CLEARS
-  mchunkptr oldtop = top;
-  INTERNAL_SIZE_T oldtopsize = chunksize(top);
-#endif
-  Void_t* mem = mALLOc (sz);
-
-  if (mem == 0)
-    return 0;
-  else
-  {
-    p = mem2chunk(mem);
-
-    /* Two optional cases in which clearing not necessary */
-
-
-#if HAVE_MMAP
-    if (chunk_is_mmapped(p)) return mem;
-#endif
-
-    csz = chunksize(p);
-
-#if MORECORE_CLEARS
-    if (p == oldtop && csz > oldtopsize)
-    {
-      /* clear only the bytes from non-freshly-sbrked memory */
-      csz = oldtopsize;
-    }
-#endif
-
-    malloc_ZERO(mem, csz - OVERHEAD);
-    /* reinstate moat fill in pad region */
-    init_realloced_chunk(p, sz, chunksize(p));
-    return mem;
-  }
-}
-
-
-
-/*
-
-    Malloc_trim gives memory back to the system (via negative
-    arguments to sbrk) if there is unused memory at the `high' end of
-    the malloc pool. You can call this after freeing large blocks of
-    memory to potentially reduce the system-level memory requirements
-    of a program. However, it cannot guarantee to reduce memory. Under
-    some allocation patterns, some large free blocks of memory will be
-    locked between two used chunks, so they cannot be given back to
-    the system.
-
-    The `pad' argument to malloc_trim represents the amount of free
-    trailing space to leave untrimmed. If this argument is zero,
-    only the minimum amount of memory to maintain internal data
-    structures will be left (one page or less). Non-zero arguments
-    can be supplied to maintain enough trailing space to service
-    future expected allocations without having to re-obtain memory
-    from the system.
-
-    Malloc_trim returns 1 if it actually released any memory, else 0.
-
-*/
-
-#if __STD_C
-int dlmalloc_trim(size_t pad)
-#else
-int malloc_trim(pad) size_t pad;
-#endif
-{
-  long  top_size;        /* Amount of top-most memory */
-  long  extra;           /* Amount to release */
-  char* current_lim;     /* address returned by pre-check sbrk call */
-  char* new_lim;         /* address returned by negative sbrk call */
-
-  unsigned long pagesz = malloc_getpagesize;
-
-  top_size = chunksize(top);
-  extra = ((top_size - pad - MINSIZE + (pagesz-1)) / pagesz - 1) * pagesz;
-
-  if (extra < (long)pagesz)  /* Not enough memory to release */
-    return 0;
-
-  else
-  {
-#ifdef OTHER_SBRKS
-    /* Test to make sure no one else called sbrk */
-    current_lim = (char*)(MORECORE (0));
-    if (current_lim != (char*)(top) + top_size)
-      return 0;     /* Apparently we don't own memory; must fail */
-
-    else
-#endif
-    {
-      new_lim = (char*)(MORECORE (-extra));
-
-      if (new_lim == (char*)(MORECORE_FAILURE)) /* sbrk failed? */
-      {
-	/* Try to figure out what we have */
-	current_lim = (char*)(MORECORE (0));
-	top_size = current_lim - (char*)top;
-	if (top_size >= (long)MINSIZE) /* if not, we are very very dead! */
-	{
-	  sbrked_mem = current_lim - sbrk_base;
-	  set_head(top, top_size | PREV_INUSE);
-	  init_freed_chunk(top, top_size, 0);
-	}
-	check_chunk(top);
-	return 0;
-      }
-
-      else
-      {
-	/* Success. Adjust top accordingly. */
-	set_head(top, (top_size - extra) | PREV_INUSE);
-	sbrked_mem -= extra;
-	init_freed_chunk(top, top_size - extra, 0);
-	check_chunk(top);
-	return 1;
-      }
-    }
-  }
-}
-
-
-
-/*
-  malloc_usable_size:
-
-    This routine tells you how many bytes you can actually use in an
-    allocated chunk, which may be more than you requested (although
-    often not). You can use this many bytes without worrying about
-    overwriting other allocated objects. Not a particularly great
-    programming practice, but still sometimes useful.
-
-*/
-
-#if __STD_C
-size_t dlmalloc_usable_size(Void_t* mem)
-#else
-size_t malloc_usable_size(mem) Void_t* mem;
-#endif
-{
-  mchunkptr p;
-  if (mem == 0)
-    return 0;
-  else
-  {
-    p = mem2chunk(mem);
-    check_inuse_chunk(p);
-    maximize_chunk(p);
-    if(!chunk_is_mmapped(p))
-    {
-      if (!inuse(p)) return 0;
-      return chunksize(p) - OVERHEAD;
-    }
-    return chunksize(p) - OVERHEAD - MMAP_EXTRA;
-  }
-}
-
-
-
-
-/* Utility to update current_mallinfo for malloc_stats and mallinfo() */
-
-static void malloc_update_mallinfo(void)
-{
-  int i;
-  mbinptr b;
-  mchunkptr p;
-#if DEBUG
-  mchunkptr q;
-#endif
-
-  INTERNAL_SIZE_T avail = chunksize(top);
-  int   navail = avail >= MINSIZE ? 1 : 0;
-  check_freefill(top, avail, avail);
-
-#if DEBUG
-  if (lowest_chunk)
-    for (p = lowest_chunk;
-	 p < top && inuse(p) && chunksize(p) >= MINSIZE;
-	 p = next_chunk(p))
-      check_inuse_chunk(p);
-#endif
-
-  for (i = 1; i < NAV; ++i)
-  {
-    b = bin_at(i);
-    for (p = last(b); p != b; p = p->bk)
-    {
-#if DEBUG
-      check_free_chunk(p);
-      check_freefill(p, chunksize(p), chunksize(p));
-      for (q = next_chunk(p);
-	   q < top && inuse(q) && chunksize(q) >= MINSIZE;
-	   q = next_chunk(q))
-	check_inuse_chunk(q);
-#endif
-      avail += chunksize(p);
-      navail++;
-    }
-  }
-
-  current_mallinfo.ordblks = navail;
-  current_mallinfo.uordblks = sbrked_mem - avail;
-  current_mallinfo.fordblks = avail;
-  current_mallinfo.hblks = n_mmaps;
-  current_mallinfo.hblkhd = mmapped_mem;
-  current_mallinfo.keepcost = chunksize(top);
-
-}
-
-
-
-/*
-
-  malloc_stats:
-
-    Prints on stderr the amount of space obtain from the system (both
-    via sbrk and mmap), the maximum amount (which may be more than
-    current if malloc_trim and/or munmap got called), the maximum
-    number of simultaneous mmap regions used, and the current number
-    of bytes allocated via malloc (or realloc, etc) but not yet
-    freed. (Note that this is the number of bytes allocated, not the
-    number requested. It will be larger than the number requested
-    because of alignment and bookkeeping overhead.)
-
-*/
-
-void dlmalloc_stats(void)
-{
-  malloc_update_mallinfo();
-  fprintf(stderr, "max system bytes = %10u\n",
-	  (unsigned int)(max_total_mem));
-  fprintf(stderr, "system bytes     = %10u\n",
-	  (unsigned int)(sbrked_mem + mmapped_mem));
-  fprintf(stderr, "in use bytes     = %10u\n",
-	  (unsigned int)(current_mallinfo.uordblks + mmapped_mem));
-#if HAVE_MMAP
-  fprintf(stderr, "max mmap regions = %10u\n",
-	  (unsigned int)max_n_mmaps);
-#endif
-}
-
-/*
-  mallinfo returns a copy of updated current mallinfo.
-*/
-
-struct mallinfo mALLINFo(void)
-{
-  malloc_update_mallinfo();
-  return current_mallinfo;
-}
-
-
-
-
-/*
-  mallopt:
-
-    mallopt is the general SVID/XPG interface to tunable parameters.
-    The format is to provide a (parameter-number, parameter-value) pair.
-    mallopt then sets the corresponding parameter to the argument
-    value if it can (i.e., so long as the value is meaningful),
-    and returns 1 if successful else 0.
-
-    See descriptions of tunable parameters above.
-
-*/
-
-#if __STD_C
-int mALLOPt(int param_number, int value)
-#else
-int mALLOPt(param_number, value) int param_number; int value;
-#endif
-{
-  switch(param_number)
-  {
-    case M_TRIM_THRESHOLD:
-      trim_threshold = value; return 1;
-    case M_TOP_PAD:
-      top_pad = value; return 1;
-    case M_MMAP_THRESHOLD:
-      mmap_threshold = value; return 1;
-    case M_MMAP_MAX:
-#if HAVE_MMAP
-      n_mmaps_max = value; return 1;
-#else
-      if (value != 0) return 0; else  n_mmaps_max = value; return 1;
-#endif
-    case M_SCANHEAP:
-#ifdef DEBUG2
-      scanheap = value;
-#endif
-      return 1;
-
-    default:
-      return 0;
-  }
-}
-
-/*
-
-History:
-
-    V2.6.3 Sun May 19 08:17:58 1996  Doug Lea  (dl at gee)
-      * Added pvalloc, as recommended by H.J. Liu
-      * Added 64bit pointer support mainly from Wolfram Gloger
-      * Added anonymously donated WIN32 sbrk emulation
-      * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen
-      * malloc_extend_top: fix mask error that caused wastage after
-	foreign sbrks
-      * Add linux mremap support code from HJ Liu
-
-    V2.6.2 Tue Dec  5 06:52:55 1995  Doug Lea  (dl at gee)
-      * Integrated most documentation with the code.
-      * Add support for mmap, with help from
-	Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
-      * Use last_remainder in more cases.
-      * Pack bins using idea from  colin@nyx10.cs.du.edu
-      * Use ordered bins instead of best-fit threshhold
-      * Eliminate block-local decls to simplify tracing and debugging.
-      * Support another case of realloc via move into top
-      * Fix error occuring when initial sbrk_base not word-aligned.
-      * Rely on page size for units instead of SBRK_UNIT to
-	avoid surprises about sbrk alignment conventions.
-      * Add mallinfo, mallopt. Thanks to Raymond Nijssen
-	(raymond@es.ele.tue.nl) for the suggestion.
-      * Add `pad' argument to malloc_trim and top_pad mallopt parameter.
-      * More precautions for cases where other routines call sbrk,
-	courtesy of Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
-      * Added macros etc., allowing use in linux libc from
-	H.J. Lu (hjl@gnu.ai.mit.edu)
-      * Inverted this history list
-
-    V2.6.1 Sat Dec  2 14:10:57 1995  Doug Lea  (dl at gee)
-      * Re-tuned and fixed to behave more nicely with V2.6.0 changes.
-      * Removed all preallocation code since under current scheme
-	the work required to undo bad preallocations exceeds
-	the work saved in good cases for most test programs.
-      * No longer use return list or unconsolidated bins since
-	no scheme using them consistently outperforms those that don't
-	given above changes.
-      * Use best fit for very large chunks to prevent some worst-cases.
-      * Added some support for debugging
-
-    V2.6.0 Sat Nov  4 07:05:23 1995  Doug Lea  (dl at gee)
-      * Removed footers when chunks are in use. Thanks to
-	Paul Wilson (wilson@cs.texas.edu) for the suggestion.
-
-    V2.5.4 Wed Nov  1 07:54:51 1995  Doug Lea  (dl at gee)
-      * Added malloc_trim, with help from Wolfram Gloger
-	(wmglo@Dent.MED.Uni-Muenchen.DE).
-
-    V2.5.3 Tue Apr 26 10:16:01 1994  Doug Lea  (dl at g)
-
-    V2.5.2 Tue Apr  5 16:20:40 1994  Doug Lea  (dl at g)
-      * realloc: try to expand in both directions
-      * malloc: swap order of clean-bin strategy;
-      * realloc: only conditionally expand backwards
-      * Try not to scavenge used bins
-      * Use bin counts as a guide to preallocation
-      * Occasionally bin return list chunks in first scan
-      * Add a few optimizations from colin@nyx10.cs.du.edu
-
-    V2.5.1 Sat Aug 14 15:40:43 1993  Doug Lea  (dl at g)
-      * faster bin computation & slightly different binning
-      * merged all consolidations to one part of malloc proper
-	 (eliminating old malloc_find_space & malloc_clean_bin)
-      * Scan 2 returns chunks (not just 1)
-      * Propagate failure in realloc if malloc returns 0
-      * Add stuff to allow compilation on non-ANSI compilers
-	  from kpv@research.att.com
-
-    V2.5 Sat Aug  7 07:41:59 1993  Doug Lea  (dl at g.oswego.edu)
-      * removed potential for odd address access in prev_chunk
-      * removed dependency on getpagesize.h
-      * misc cosmetics and a bit more internal documentation
-      * anticosmetics: mangled names in macros to evade debugger strangeness
-      * tested on sparc, hp-700, dec-mips, rs6000
-	  with gcc & native cc (hp, dec only) allowing
-	  Detlefs & Zorn comparison study (in SIGPLAN Notices.)
-
-    Trial version Fri Aug 28 13:14:29 1992  Doug Lea  (dl at g.oswego.edu)
-      * Based loosely on libg++-1.2X malloc. (It retains some of the overall
-	 structure of old version,  but most details differ.)
-
-*/
diff --git a/winsup/cygwin/dlmalloc.h b/winsup/cygwin/dlmalloc.h
deleted file mode 100644
index b8d7ebeeb..000000000
--- a/winsup/cygwin/dlmalloc.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-/*
- * Header file for BBCized version of Doug Lea's malloc.c, automatically
- * generated by
- *  /source/prod/libbbc/compat/dlmalloc/cvt
- * from
- *  /source/prod/libbbc/compat/dlmalloc/malloc.c
- *
- * bbclabel: autogenerated
- */
-#define _INCLUDE_MALLOC_H_ 1
-void malloc_outofmem(void (*)(void));
-
-
-struct mallinfo {
-  int arena;    /* total space allocated from system */
-  int ordblks;  /* number of non-inuse chunks */
-  int smblks;   /* unused -- always zero */
-  int hblks;    /* number of mmapped regions */
-  int hblkhd;   /* total space in mmapped regions */
-  int usmblks;  /* unused -- always zero */
-  int fsmblks;  /* unused -- always zero */
-  int uordblks; /* total allocated space */
-  int fordblks; /* total non-inuse space */
-  int keepcost; /* top-most, releasable (via malloc_trim) space */
-};
-
-
-#define M_MXFAST  1    /* UNUSED in this malloc */
-#define M_NLBLKS  2    /* UNUSED in this malloc */
-#define M_GRAIN   3    /* UNUSED in this malloc */
-#define M_KEEP    4    /* UNUSED in this malloc */
-
-
-#define M_TRIM_THRESHOLD    -1
-#define M_TOP_PAD           -2
-#define M_MMAP_THRESHOLD    -3
-#define M_MMAP_MAX          -4
-#define M_SCANHEAP	    -5
-#define M_FILL
-
-#ifdef MALLOC_DEBUG
-
-#define dmalloc(size)		malloc_dbg(size, __FILE__, __LINE__)
-#define dfree(p)			free_dbg(p, __FILE__, __LINE__)
-#define drealloc(p, size)	realloc_dbg(p, size, __FILE__, __LINE__)
-#define dcalloc(n, size)		calloc_dbg(n, size, __FILE__, __LINE__)
-#define dmemalign(align, size)	memalign_dbg(align, size, __FILE__, __LINE__)
-#define dvalloc(size)		valloc_dbg(size, __FILE__, __LINE__)
-#define dpvalloc(size)		pvalloc_dbg(size, __FILE__, __LINE__)
-#define dmalloc_trim(pad)	malloc_trim_dbg(pad, __FILE__, __LINE__)
-#define dmalloc_usable_size(p)	malloc_usable_size_dbg(p, __FILE__, __LINE__)
-#define dmalloc_stats()		malloc_stats_dbg(__FILE__, __LINE__)
-#define dmallopt(flag, val)	mallopt_dbg(flag, val, __FILE__, __LINE__)
-#define dmallinfo()		mallinfo_dbg(__FILE__, __LINE__)
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-void* malloc_dbg(size_t, const char *, int);
-void    free_dbg(void*, const char *, int);
-void* realloc_dbg(void*, size_t, const char *, int);
-void* calloc_dbg(size_t, size_t, const char *, int);
-void* memalign_dbg(size_t, size_t, const char *, int);
-void* valloc_dbg(size_t, const char *, int);
-void* pvalloc_dbg(size_t, const char *, int);
-int     malloc_trim_dbg(size_t, const char *, int);
-size_t  malloc_usable_size_dbg(void*, const char *, int);
-void    malloc_stats_dbg(const char *, int);
-int     mallopt_dbg(int, int, const char *, int);
-struct mallinfo mallinfo_dbg(const char *, int);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* MALLOC_DEBUG */
-
-#ifndef MALLOC_DEBUG
-
-void* malloc(size_t);
-void    free(void*);
-void* realloc(void*, size_t);
-void* calloc(size_t, size_t);
-void* memalign(size_t, size_t);
-void* valloc(size_t);
-void* pvalloc(size_t);
-int     malloc_trim(size_t);
-size_t  malloc_usable_size(void*);
-void    malloc_stats(void);
-int     mallopt(int, int);
-struct mallinfo mallinfo(void);
-#endif /* !MALLOC_DEBUG */
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
deleted file mode 100644
index c6c300b00..000000000
--- a/winsup/cygwin/dtable.cc
+++ /dev/null
@@ -1,870 +0,0 @@
-/* dtable.cc: file descriptor support.
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#define  __INSIDE_CYGWIN_NET__
-
-#include "winsup.h"
-#include <sys/socket.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/cygwin.h>
-#include <assert.h>
-#include <ntdef.h>
-#include <winnls.h>
-
-#define USE_SYS_TYPES_FD_SET
-#include <winsock.h>
-#include "pinfo.h"
-#include "cygerrno.h"
-#include "perprocess.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "ntdll.h"
-
-static const NO_COPY DWORD std_consts[] = {STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
-					   STD_ERROR_HANDLE};
-
-static const char *handle_to_fn (HANDLE, char *);
-
-static const char NO_COPY unknown_file[] = "some disk file";
-
-/* Set aside space for the table of fds */
-void
-dtable_init (void)
-{
-  if (!cygheap->fdtab.size)
-    cygheap->fdtab.extend (NOFILE_INCR);
-}
-
-void __stdcall
-set_std_handle (int fd)
-{
-  if (fd == 0)
-    SetStdHandle (std_consts[fd], cygheap->fdtab[fd]->get_handle ());
-  else if (fd <= 2)
-    SetStdHandle (std_consts[fd], cygheap->fdtab[fd]->get_output_handle ());
-}
-
-int
-dtable::extend (int howmuch)
-{
-  int new_size = size + howmuch;
-  fhandler_base **newfds;
-
-  if (howmuch <= 0)
-    return 0;
-
-  if (new_size > (100 * NOFILE_INCR))
-    {
-      set_errno (EMFILE);
-      return 0;
-    }
-
-  /* Try to allocate more space for fd table. We can't call realloc ()
-     here to preserve old table if memory allocation fails */
-
-  if (!(newfds = (fhandler_base **) ccalloc (HEAP_ARGV, new_size, sizeof newfds[0])))
-    {
-      debug_printf ("calloc failed");
-      set_errno (ENOMEM);
-      return 0;
-    }
-  if (fds)
-    {
-      cfree (fds);
-      memcpy (newfds, fds, size * sizeof (fds[0]));
-    }
-
-  size = new_size;
-  fds = newfds;
-  debug_printf ("size %d, fds %p", size, fds);
-  return 1;
-}
-
-void
-dtable::get_debugger_info ()
-{
-  if (being_debugged ())
-    {
-      char std[3][sizeof ("/dev/ttyNNNN")];
-      std[0][0] = std[1][0] = std [2][0] = '\0';
-      char buf[sizeof ("cYgstd %x") + 32];
-      sprintf (buf, "cYgstd %x %x %x", (unsigned) &std, sizeof (std[0]), 3);
-      OutputDebugString (buf);
-      for (int i = 0; i < 3; i++)
-	if (std[i][0])
-	  {
-	    HANDLE h = GetStdHandle (std_consts[i]);
-	    fhandler_base *fh = build_fh_name (std[i]);
-	    if (!fh)
-	      continue;
-	    fds[i] = fh;
-	    if (!fh->open ((i ? O_WRONLY : O_RDONLY) | O_BINARY, 0777))
-	      release (i);
-	    else
-	      CloseHandle (h);
-	  }
-    }
-}
-
-/* Initialize the file descriptor/handle mapping table.
-   This function should only be called when a cygwin function is invoked
-   by a non-cygwin function, i.e., it should only happen very rarely. */
-
-void
-dtable::stdio_init ()
-{
-  extern void set_console_ctty ();
-  /* Set these before trying to output anything from strace.
-     Also, always set them even if we're to pick up our parent's fds
-     in case they're missed.  */
-
-  if (myself->ppid_handle || ISSTATE (myself, PID_CYGPARENT))
-    return;
-
-  HANDLE in = GetStdHandle (STD_INPUT_HANDLE);
-  HANDLE out = GetStdHandle (STD_OUTPUT_HANDLE);
-  HANDLE err = GetStdHandle (STD_ERROR_HANDLE);
-
-  init_std_file_from_handle (0, in);
-
-  /* STD_ERROR_HANDLE has been observed to be the same as
-     STD_OUTPUT_HANDLE.  We need separate handles (e.g. using pipes
-     to pass data from child to parent).  */
-  if (out == err)
-    {
-      /* Since this code is not invoked for forked tasks, we don't have
-	 to worry about the close-on-exec flag here.  */
-      if (!DuplicateHandle (hMainProc, out, hMainProc, &err, 0,
-			     1, DUPLICATE_SAME_ACCESS))
-	{
-	  /* If that fails, do this as a fall back.  */
-	  err = out;
-	  system_printf ("couldn't make stderr distinct from stdout");
-	}
-    }
-
-  init_std_file_from_handle (1, out);
-  init_std_file_from_handle (2, err);
-  /* Assign the console as the controlling tty for this process if we actually
-     have a console and no other controlling tty has been assigned. */
-  if (myself->ctty < 0 && GetConsoleCP () > 0)
-    set_console_ctty ();
-}
-
-const int dtable::initial_archetype_size;
-
-fhandler_base *
-dtable::find_archetype (device& dev)
-{
-  for (unsigned i = 0; i < farchetype; i++)
-    if (archetypes[i]->get_device () == (unsigned) dev)
-      return archetypes[i];
-  return NULL;
-}
-
-fhandler_base **
-dtable::add_archetype ()
-{
-  if (farchetype++ >= narchetypes)
-    archetypes = (fhandler_base **) crealloc (archetypes, (narchetypes += initial_archetype_size) * sizeof archetypes[0]);
-  return archetypes + farchetype - 1;
-}
-
-void
-dtable::delete_archetype (fhandler_base *fh)
-{
-  for (unsigned i = 0; i < narchetypes; i++)
-    if (fh == archetypes[i])
-      {
-	debug_printf ("deleting archive element %d for %s", i, fh->get_name ());
-	if (i < --farchetype)
-	  archetypes[i] = archetypes[farchetype];
-	break;
-      }
-
-  delete fh;
-}
-
-int
-dtable::find_unused_handle (int start)
-{
-  AssertResourceOwner (LOCK_FD_LIST, READ_LOCK);
-  do
-    {
-      for (size_t i = start; i < size; i++)
-	/* See if open -- no need for overhead of not_open */
-	if (fds[i] == NULL)
-	  return i;
-    }
-  while (extend (NOFILE_INCR));
-  return -1;
-}
-
-void
-dtable::release (int fd)
-{
-  if (!not_open (fd))
-    {
-      if (fds[fd]->need_fixup_before ())
-	dec_need_fixup_before ();
-      fhandler_base *arch = fds[fd]->archetype;
-      delete fds[fd];
-      if (arch && !arch->usecount)
-	cygheap->fdtab.delete_archetype (arch);
-      fds[fd] = NULL;
-    }
-}
-
-extern "C" int
-cygwin_attach_handle_to_fd (char *name, int fd, HANDLE handle, mode_t bin,
-			    DWORD myaccess)
-{
-  if (fd == -1)
-    fd = cygheap->fdtab.find_unused_handle ();
-  fhandler_base *fh = build_fh_name (name);
-  cygheap->fdtab[fd] = fh;
-  fh->init (handle, myaccess, bin ?: fh->pc_binmode ());
-  return fd;
-}
-
-void
-dtable::init_std_file_from_handle (int fd, HANDLE handle)
-{
-  const char *name = NULL;
-  CONSOLE_SCREEN_BUFFER_INFO buf;
-  struct sockaddr sa;
-  int sal = sizeof (sa);
-  DCB dcb;
-  unsigned bin = O_BINARY;
-  device dev;
-
-  dev.devn = 0;		/* FIXME: device */
-  first_fd_for_open = 0;
-
-  if (!not_open (fd))
-    return;
-
-  SetLastError (0);
-  DWORD ft = GetFileType (handle);
-  if (ft != FILE_TYPE_UNKNOWN || GetLastError () != ERROR_INVALID_HANDLE)
-    {
-      /* See if we can consoleify it */
-      if (GetConsoleScreenBufferInfo (handle, &buf))
-	{
-	  if (ISSTATE (myself, PID_USETTY))
-	    dev.parse ("/dev/tty");
-	  else
-	    dev = *console_dev;
-	}
-      else if (GetNumberOfConsoleInputEvents (handle, (DWORD *) &buf))
-	{
-	  if (ISSTATE (myself, PID_USETTY))
-	    dev.parse ("/dev/tty");
-	  else
-	    dev = *console_dev;
-	}
-      else if (ft == FILE_TYPE_PIPE)
-	{
-	  if (fd == 0)
-	    dev = *piper_dev;
-	  else
-	    dev = *pipew_dev;
-	}
-      else if (wsock_started && getpeername ((SOCKET) handle, &sa, &sal) == 0)
-	dev = *tcp_dev;
-      else if (GetCommState (handle, &dcb))
-	dev.parse ("/dev/ttyS0");
-      else
-	{
-	  name = handle_to_fn (handle, (char *) alloca (CYG_MAX_PATH + 100));
-	  bin = 0;
-	}
-    }
-
-  if (!name && !dev)
-    fds[fd] = NULL;
-  else
-    {
-      fhandler_base *fh;
-
-      if (dev)
-	fh = build_fh_dev (dev);
-      else
-	fh = build_fh_name (name);
-
-      if (fh)
-	cygheap->fdtab[fd] = fh;
-
-      if (!bin)
-	{
-	  bin = fh->get_default_fmode (O_RDWR);
-	  if (bin)
-	    /* nothing */;
-	  else if (dev)
-	    bin = O_BINARY;
-	  else if (name != unknown_file)
-	    bin = fh->pc_binmode ();
-	}
-
-      fh->init (handle, GENERIC_READ | GENERIC_WRITE, bin);
-      set_std_handle (fd);
-      paranoid_printf ("fd %d, handle %p", fd, handle);
-    }
-}
-
-#define cnew(name) new ((void *) ccalloc (HEAP_FHANDLER, 1, sizeof (name))) name
-fhandler_base *
-build_fh_name (const char *name, HANDLE h, unsigned opt, suffix_info *si)
-{
-  path_conv pc (name, opt | PC_NULLEMPTY | PC_FULL | PC_POSIX, si);
-  if (pc.error)
-    {
-      fhandler_base *fh = cnew (fhandler_nodevice) ();
-      fh->set_error (pc.error);
-      set_errno (pc.error);
-      return fh;
-    }
-
-  if (!pc.exists () && h)
-    pc.fillin (h);
-
-  return build_fh_pc (pc);
-}
-
-fhandler_base *
-build_fh_dev (const device& dev, const char *unix_name)
-{
-  path_conv pc (dev);
-  if (unix_name)
-    pc.set_normalized_path (unix_name);
-  else
-    pc.set_normalized_path (dev.name);
-  return build_fh_pc (pc);
-}
-
-fhandler_base *
-build_fh_pc (path_conv& pc)
-{
-  fhandler_base *fh = NULL;
-
-    switch (pc.dev.major)
-      {
-      case DEV_TTYS_MAJOR:
-	fh = cnew (fhandler_tty_slave) ();
-	break;
-      case DEV_TTYM_MAJOR:
-	fh = cnew (fhandler_tty_master) ();
-	break;
-      case DEV_CYGDRIVE_MAJOR:
-	fh = cnew (fhandler_cygdrive) ();
-	break;
-      case DEV_FLOPPY_MAJOR:
-      case DEV_CDROM_MAJOR:
-      case DEV_SD_MAJOR:
-	fh = cnew (fhandler_dev_floppy) ();
-	break;
-      case DEV_TAPE_MAJOR:
-	fh = cnew (fhandler_dev_tape) ();
-	break;
-      case DEV_SERIAL_MAJOR:
-	fh = cnew (fhandler_serial) ();
-	break;
-      default:
-	switch (pc.dev)
-	  {
-	  case FH_CONSOLE:
-	  case FH_CONIN:
-	  case FH_CONOUT:
-	    fh = cnew (fhandler_console) ();
-	    break;
-	  case FH_PTYM:
-	    fh = cnew (fhandler_pty_master) ();
-	    break;
-	  case FH_WINDOWS:
-	    fh = cnew (fhandler_windows) ();
-	    break;
-	  case FH_FIFO:
-	    fh = cnew (fhandler_fifo) ();
-	    break;
-	  case FH_PIPE:
-	  case FH_PIPER:
-	  case FH_PIPEW:
-	    fh = cnew (fhandler_pipe) ();
-	    break;
-	  case FH_TCP:
-	  case FH_UDP:
-	  case FH_ICMP:
-	  case FH_UNIX:
-	  case FH_STREAM:
-	  case FH_DGRAM:
-	    fh = cnew (fhandler_socket) ();
-	    break;
-	  case FH_FS:
-	    fh = cnew (fhandler_disk_file) ();
-	    break;
-	  case FH_NULL:
-	    fh = cnew (fhandler_dev_null) ();
-	    break;
-	  case FH_ZERO:
-	    fh = cnew (fhandler_dev_zero) ();
-	    break;
-	  case FH_RANDOM:
-	  case FH_URANDOM:
-	    fh = cnew (fhandler_dev_random) ();
-	    break;
-	  case FH_MEM:
-	  case FH_PORT:
-	    fh = cnew (fhandler_dev_mem) ();
-	    break;
-	  case FH_CLIPBOARD:
-	    fh = cnew (fhandler_dev_clipboard) ();
-	    break;
-	  case FH_OSS_DSP:
-	    fh = cnew (fhandler_dev_dsp) ();
-	    break;
-	  case FH_PROC:
-	    fh = cnew (fhandler_proc) ();
-	    break;
-	  case FH_REGISTRY:
-	    fh = cnew (fhandler_registry) ();
-	    break;
-	  case FH_PROCESS:
-	    fh = cnew (fhandler_process) ();
-	    break;
-	  case FH_TTY:
-	    {
-	      if (myself->ctty == TTY_CONSOLE)
-		fh = cnew (fhandler_console) ();
-	      else if (myself->ctty >= 0)
-		fh = cnew (fhandler_tty_slave) ();
-	      break;
-	    }
-	}
-      }
-
-  if (!fh)
-    fh = cnew (fhandler_nodevice) ();
-
-  fh->set_name (pc);
-
-  debug_printf ("fh %p", fh);
-  return fh;
-}
-
-fhandler_base *
-dtable::dup_worker (fhandler_base *oldfh)
-{
-  fhandler_base *newfh = build_fh_pc (oldfh->pc);
-  *newfh = *oldfh;
-  newfh->set_io_handle (NULL);
-  if (oldfh->dup (newfh))
-    {
-      cfree (newfh);
-      newfh = NULL;
-      return NULL;
-    }
-
-  newfh->set_close_on_exec_flag (0);
-  MALLOC_CHECK;
-  debug_printf ("duped '%s' old %p, new %p", oldfh->get_name (), oldfh->get_io_handle (), newfh->get_io_handle ());
-  return newfh;
-}
-
-int
-dtable::dup2 (int oldfd, int newfd)
-{
-  int res = -1;
-  fhandler_base *newfh = NULL;	// = NULL to avoid an incorrect warning
-
-  MALLOC_CHECK;
-  debug_printf ("dup2 (%d, %d)", oldfd, newfd);
-  SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "dup");
-
-  if (not_open (oldfd))
-    {
-      syscall_printf ("fd %d not open", oldfd);
-      set_errno (EBADF);
-      goto done;
-    }
-
-  if (newfd < 0)
-    {
-      syscall_printf ("new fd out of bounds: %d", newfd);
-      set_errno (EBADF);
-      goto done;
-    }
-
-  if (newfd == oldfd)
-    {
-      res = 0;
-      goto done;
-    }
-
-  if ((newfh = dup_worker (fds[oldfd])) == NULL)
-    {
-      res = -1;
-      goto done;
-    }
-
-  debug_printf ("newfh->io_handle %p, oldfh->io_handle %p",
-		newfh->get_io_handle (), fds[oldfd]->get_io_handle ());
-
-  if (!not_open (newfd))
-    close (newfd);
-  else if ((size_t) newfd < size)
-    /* nothing to do */;
-  else if (find_unused_handle (newfd) < 0)
-    {
-      newfh->close ();
-      res = -1;
-      goto done;
-    }
-
-  fds[newfd] = newfh;
-
-  if ((res = newfd) <= 2)
-    set_std_handle (res);
-
-done:
-  MALLOC_CHECK;
-  ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "dup");
-  syscall_printf ("%d = dup2 (%d, %d)", res, oldfd, newfd);
-
-  return res;
-}
-
-fhandler_fifo *
-dtable::find_fifo (ATOM hill)
-{
-  SetResourceLock (LOCK_FD_LIST, READ_LOCK, "dup");
-  for (unsigned i = 0; i < size; i++)
-    {
-      fhandler_base *fh = fds[i];
-      if (fh && fh->isfifo () && ((fhandler_fifo *) fh)->get_atom () == hill)
-	return (fhandler_fifo *) fh;
-    }
-  return NULL;
-}
-
-select_record *
-dtable::select_read (int fd, select_record *s)
-{
-  if (not_open (fd))
-    {
-      set_errno (EBADF);
-      return NULL;
-    }
-  fhandler_base *fh = fds[fd];
-  s = fh->select_read (s);
-  s->fd = fd;
-  s->fh = fh;
-  s->saw_error = 0;
-  debug_printf ("%s fd %d", fh->get_name (), fd);
-  return s;
-}
-
-select_record *
-dtable::select_write (int fd, select_record *s)
-{
-  if (not_open (fd))
-    {
-      set_errno (EBADF);
-      return NULL;
-    }
-  fhandler_base *fh = fds[fd];
-  s = fh->select_write (s);
-  s->fd = fd;
-  s->fh = fh;
-  s->saw_error = 0;
-  debug_printf ("%s fd %d", fh->get_name (), fd);
-  return s;
-}
-
-select_record *
-dtable::select_except (int fd, select_record *s)
-{
-  if (not_open (fd))
-    {
-      set_errno (EBADF);
-      return NULL;
-    }
-  fhandler_base *fh = fds[fd];
-  s = fh->select_except (s);
-  s->fd = fd;
-  s->fh = fh;
-  s->saw_error = 0;
-  debug_printf ("%s fd %d", fh->get_name (), fd);
-  return s;
-}
-
-/* Function to walk the fd table after an exec and perform
-   per-fhandler type fixups. */
-void
-dtable::fixup_before_fork (DWORD target_proc_id)
-{
-  SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "fixup_before_fork");
-  fhandler_base *fh;
-  for (size_t i = 0; i < size; i++)
-    if ((fh = fds[i]) != NULL)
-      {
-	debug_printf ("fd %d (%s)", i, fh->get_name ());
-	fh->fixup_before_fork_exec (target_proc_id);
-      }
-  ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "fixup_before_fork");
-}
-
-void
-dtable::fixup_before_exec (DWORD target_proc_id)
-{
-  SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "fixup_before_exec");
-  fhandler_base *fh;
-  for (size_t i = 0; i < size; i++)
-    if ((fh = fds[i]) != NULL && !fh->get_close_on_exec ())
-      {
-	debug_printf ("fd %d (%s)", i, fh->get_name ());
-	fh->fixup_before_fork_exec (target_proc_id);
-      }
-  ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "fixup_before_exec");
-}
-
-void
-dtable::set_file_pointers_for_exec ()
-{
-  SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "set_file_pointers_for_exec");
-  fhandler_base *fh;
-  for (size_t i = 0; i < size; i++)
-    if ((fh = fds[i]) != NULL && fh->get_flags () & O_APPEND)
-      SetFilePointer (fh->get_handle (), 0, 0, FILE_END);
-  ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "fixup_before_exec");
-}
-
-void
-dtable::fixup_after_exec (HANDLE parent)
-{
-  first_fd_for_open = 0;
-  fhandler_base *fh;
-  for (size_t i = 0; i < size; i++)
-    if ((fh = fds[i]) != NULL)
-      {
-	fh->clear_readahead ();
-	if (fh->get_close_on_exec ())
-	  release (i);
-	else
-	  {
-	    fh->fixup_after_exec (parent);
-	    if (i == 0)
-	      SetStdHandle (std_consts[i], fh->get_io_handle ());
-	    else if (i <= 2)
-	      SetStdHandle (std_consts[i], fh->get_output_handle ());
-	  }
-      }
-}
-
-void
-dtable::fixup_after_fork (HANDLE parent)
-{
-  fhandler_base *fh;
-  for (size_t i = 0; i < size; i++)
-    if ((fh = fds[i]) != NULL)
-      {
-	if (fh->get_close_on_exec () || fh->get_need_fork_fixup ())
-	  {
-	    debug_printf ("fd %d (%s)", i, fh->get_name ());
-	    fh->fixup_after_fork (parent);
-	  }
-	if (i == 0)
-	  SetStdHandle (std_consts[i], fh->get_io_handle ());
-	else if (i <= 2)
-	  SetStdHandle (std_consts[i], fh->get_output_handle ());
-      }
-}
-
-int
-dtable::vfork_child_dup ()
-{
-  fhandler_base **newtable;
-  SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "dup");
-  newtable = (fhandler_base **) ccalloc (HEAP_ARGV, size, sizeof (fds[0]));
-  int res = 1;
-
-  /* Remove impersonation */
-  cygheap->user.deimpersonate ();
-  if (cygheap->ctty)
-    cygheap->ctty->usecount++;
-
-  for (size_t i = 0; i < size; i++)
-    if (not_open (i))
-      continue;
-    else if ((newtable[i] = dup_worker (fds[i])) != NULL)
-      newtable[i]->set_close_on_exec (fds[i]->get_close_on_exec ());
-    else
-      {
-	res = 0;
-	set_errno (EBADF);
-	goto out;
-      }
-
-  fds_on_hold = fds;
-  fds = newtable;
-
-out:
-  /* Restore impersonation */
-  cygheap->user.reimpersonate ();
-
-  ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "dup");
-  return 1;
-}
-
-void
-dtable::vfork_parent_restore ()
-{
-  SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "restore");
-
-  close_all_files ();
-  fhandler_base **deleteme = fds;
-  fds = fds_on_hold;
-  fds_on_hold = NULL;
-  cfree (deleteme);
-
-  ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "restore");
-  return;
-}
-
-void
-dtable::vfork_child_fixup ()
-{
-  if (!fds_on_hold)
-    return;
-  debug_printf ("here");
-  fhandler_base **saveme = fds;
-  fds = fds_on_hold;
-
-  fhandler_base *fh;
-  for (int i = 0; i < (int) size; i++)
-    if ((fh = fds[i]) != NULL)
-      {
-	fh->clear_readahead ();
-	if (!fh->archetype && fh->get_close_on_exec ())
-	  release (i);
-	else
-	  {
-	    fh->close ();
-	    release (i);
-	  }
-      }
-
-  fds = saveme;
-  cfree (fds_on_hold);
-  fds_on_hold = NULL;
-
-  return;
-}
-
-#define DEVICE_PREFIX "\\device\\"
-#define DEVICE_PREFIX_LEN sizeof (DEVICE_PREFIX) - 1
-#define REMOTE "\\Device\\LanmanRedirector\\"
-#define REMOTE_LEN sizeof (REMOTE) - 1
-
-static const char *
-handle_to_fn (HANDLE h, char *posix_fn)
-{
-  OBJECT_NAME_INFORMATION *ntfn;
-  char fnbuf[32768];
-
-  memset (fnbuf, 0, sizeof (fnbuf));
-  ntfn = (OBJECT_NAME_INFORMATION *) fnbuf;
-  ntfn->Name.MaximumLength = sizeof (fnbuf) - sizeof (*ntfn);
-  ntfn->Name.Buffer = (WCHAR *) (ntfn + 1);
-
-  DWORD res = NtQueryObject (h, ObjectNameInformation, ntfn, sizeof (fnbuf), NULL);
-
-  if (res)
-    {
-      strcpy (posix_fn, unknown_file);
-      debug_printf ("NtQueryObject failed");
-      return unknown_file;
-    }
-
-  // NT seems to do this on an unopened file
-  if (!ntfn->Name.Buffer)
-    {
-      debug_printf ("nt->Name.Buffer == NULL");
-      return NULL;
-    }
-
-  ntfn->Name.Buffer[ntfn->Name.Length / sizeof (WCHAR)] = 0;
-
-  char win32_fn[CYG_MAX_PATH + 100];
-  sys_wcstombs (win32_fn, ntfn->Name.Buffer, ntfn->Name.Length);
-  debug_printf ("nt name '%s'", win32_fn);
-  if (!strncasematch (win32_fn, DEVICE_PREFIX, DEVICE_PREFIX_LEN)
-      || !QueryDosDevice (NULL, fnbuf, sizeof (fnbuf)))
-    return strcpy (posix_fn, win32_fn);
-
-  char *p = strechr (win32_fn + DEVICE_PREFIX_LEN, '\\');
-
-  int n = p - win32_fn;
-  int maxmatchlen = 0;
-  char *maxmatchdos = NULL;
-  for (char *s = fnbuf; *s; s = strchr (s, '\0') + 1)
-    {
-      char device[CYG_MAX_PATH + 10];
-      device[CYG_MAX_PATH + 9] = '\0';
-      if (strchr (s, ':') == NULL)
-	continue;
-      if (!QueryDosDevice (s, device, sizeof (device) - 1))
-	continue;
-      char *q = strrchr (device, ';');
-      if (q)
-	{
-	  char *r = strchr (q, '\\');
-	  if (r)
-	    strcpy (q, r + 1);
-	}
-      int devlen = strlen (device);
-      if (device[devlen - 1] == '\\')
-	device[--devlen] = '\0';
-      if (devlen < maxmatchlen)
-	continue;
-      if (!strncasematch (device, win32_fn, devlen) ||
-	  (win32_fn[devlen] != '\0' && win32_fn[devlen] != '\\'))
-	continue;
-      maxmatchlen = devlen;
-      maxmatchdos = s;
-      debug_printf ("current match '%s'", device);
-    }
-
-  char *w32 = win32_fn;
-  if (maxmatchlen)
-    {
-      n = strlen (maxmatchdos);
-      if (maxmatchdos[n - 1] == '\\')
-	n--;
-      w32 += maxmatchlen - n;
-      memcpy (w32, maxmatchdos, n);
-      w32[n] = '\\';
-    }
-  else if (strncasematch (w32, REMOTE, REMOTE_LEN))
-    {
-      w32 += REMOTE_LEN - 2;
-      *w32 = '\\';
-      debug_printf ("remote drive");
-    }
-
-
-  debug_printf ("derived path '%s'", w32);
-  cygwin_conv_to_full_posix_path (w32, posix_fn);
-  return posix_fn;
-}
diff --git a/winsup/cygwin/dtable.h b/winsup/cygwin/dtable.h
deleted file mode 100644
index 0b2db916b..000000000
--- a/winsup/cygwin/dtable.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* dtable.h: fd table definition.
-
-   Copyright 2000, 2001, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* Initial and increment values for cygwin's fd table */
-#define NOFILE_INCR    32
-
-#include "thread.h"
-
-class suffix_info;
-class fhandler_fifo;
-
-#define BFH_OPTS (PC_NULLEMPTY | PC_FULL | PC_POSIX)
-class dtable
-{
-  fhandler_base **fds;
-  fhandler_base **fds_on_hold;
-  fhandler_base **archetypes;
-  unsigned narchetypes;
-  unsigned farchetype;
-  static const int initial_archetype_size = 8;
-  int first_fd_for_open;
-  int cnt_need_fixup_before;
-public:
-  size_t size;
-
-  dtable () : archetypes (NULL), narchetypes (0), farchetype (0), first_fd_for_open(3), cnt_need_fixup_before(0) {}
-  void init () {first_fd_for_open = 3;}
-
-  void dec_need_fixup_before ()
-    { if (cnt_need_fixup_before > 0) --cnt_need_fixup_before; }
-  void inc_need_fixup_before ()
-    { cnt_need_fixup_before++; }
-  bool need_fixup_before ()
-    { return cnt_need_fixup_before > 0; }
-
-  int vfork_child_dup ();
-  void vfork_parent_restore ();
-  void vfork_child_fixup ();
-  fhandler_base *dup_worker (fhandler_base *oldfh);
-  int extend (int howmuch);
-  void fixup_before_exec (DWORD win_proc_id);
-  void fixup_before_fork (DWORD win_proc_id);
-  void fixup_after_fork (HANDLE);
-  inline int not_open (int fd)
-  {
-    SetResourceLock (LOCK_FD_LIST, READ_LOCK, "not_open");
-
-    int res = fd < 0 || fd >= (int) size || fds[fd] == NULL;
-
-    ReleaseResourceLock (LOCK_FD_LIST, READ_LOCK, "not open");
-    return res;
-  }
-  int find_unused_handle (int start);
-  int find_unused_handle () { return find_unused_handle (first_fd_for_open);}
-  void release (int fd);
-  void init_std_file_from_handle (int fd, HANDLE handle);
-  int dup2 (int oldfd, int newfd);
-  void fixup_after_exec (HANDLE);
-  inline fhandler_base *&operator [](int fd) const { return fds[fd]; }
-  select_record *select_read (int fd, select_record *s);
-  select_record *select_write (int fd, select_record *s);
-  select_record *select_except (int fd, select_record *s);
-  operator fhandler_base **() {return fds;}
-  void stdio_init ();
-  void get_debugger_info ();
-  void set_file_pointers_for_exec ();
-  bool in_vfork_cleanup () {return fds_on_hold == fds;}
-  fhandler_fifo *find_fifo (ATOM);
-  fhandler_base *find_archetype (device& dev);
-  fhandler_base **add_archetype ();
-  void delete_archetype (fhandler_base *);
-};
-
-fhandler_base *build_fh_dev (const device&, const char * = NULL);
-fhandler_base *build_fh_name (const char *unix_name, HANDLE = NULL, unsigned = 0, suffix_info * = NULL);
-fhandler_base *build_fh_pc (path_conv& pc);
-
-void dtable_init (void);
-void stdio_init (void);
-extern dtable fdtab;
-
-extern "C" int getfdtabsize ();
-extern "C" void setfdtabsize (int);
diff --git a/winsup/cygwin/dtable.sgml b/winsup/cygwin/dtable.sgml
deleted file mode 100644
index 9f292ee73..000000000
--- a/winsup/cygwin/dtable.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-<sect1 id="func-cygwin-attach-handle-to-fd">
-<title>cygwin_attach_handle_to_fd</title>
-
-<funcsynopsis>
-<funcdef>extern "C" int
-<function>cygwin_attach_handle_to_fd</function></funcdef>
-<paramdef>char *<parameter>name</parameter></paramdef>
-<paramdef>int <parameter>fd</parameter></paramdef>
-<paramdef>HANDLE <parameter>handle</parameter></paramdef>
-<paramdef>int <parameter>bin</parameter></paramdef>
-<paramdef>int <parameter>access</parameter></paramdef>
-</funcsynopsis>
-
-<para>This function can be used to turn a Win32 "handle" into a
-posix-style file handle. <parameter>fd</parameter> may be -1 to
-make cygwin allocate a handle; the actual handle is returned
-in all cases.</para>
-
-</sect1>
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
deleted file mode 100644
index fd04e1fcc..000000000
--- a/winsup/cygwin/environ.cc
+++ /dev/null
@@ -1,1005 +0,0 @@
-/* environ.cc: Cygwin-adopted functions from newlib to manipulate
-   process's environment.
-
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <assert.h>
-#include <sys/cygwin.h>
-#include <cygwin/version.h>
-#include "pinfo.h"
-#include "perprocess.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "cygerrno.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "registry.h"
-#include "environ.h"
-#include "child_info.h"
-
-extern bool allow_glob;
-extern bool ignore_case_with_glob;
-extern bool allow_ntea;
-extern bool allow_smbntsec;
-extern bool allow_winsymlinks;
-extern bool strip_title_path;
-extern int pcheck_case;
-extern int subauth_id;
-bool reset_com = false;
-static bool envcache = true;
-#ifdef USE_SERVER
-extern bool allow_server;
-#endif
-
-static char **lastenviron;
-
-#define ENVMALLOC \
-  (CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) \
-	  <= CYGWIN_VERSION_DLL_MALLOC_ENV)
-
-#define NL(x) x, (sizeof (x) - 1)
-/* List of names which are converted from dos to unix
-   on the way in and back again on the way out.
-
-   PATH needs to be here because CreateProcess uses it and gdb uses
-   CreateProcess.  HOME is here because most shells use it and would be
-   confused by Windows style path names.  */
-static int return_MAX_PATH (const char *) {return CYG_MAX_PATH;}
-static NO_COPY win_env conv_envvars[] =
-  {
-    {NL ("PATH="), NULL, NULL, cygwin_win32_to_posix_path_list,
-     cygwin_posix_to_win32_path_list,
-     cygwin_win32_to_posix_path_list_buf_size,
-     cygwin_posix_to_win32_path_list_buf_size},
-    {NL ("HOME="), NULL, NULL, cygwin_conv_to_full_posix_path,
-     cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH},
-    {NL ("LD_LIBRARY_PATH="), NULL, NULL, cygwin_conv_to_full_posix_path,
-     cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH},
-    {NL ("TMPDIR="), NULL, NULL, cygwin_conv_to_full_posix_path,
-     cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH},
-    {NL ("TMP="), NULL, NULL, cygwin_conv_to_full_posix_path,
-     cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH},
-    {NL ("TEMP="), NULL, NULL, cygwin_conv_to_full_posix_path,
-     cygwin_conv_to_full_win32_path, return_MAX_PATH, return_MAX_PATH},
-    {NULL, 0, NULL, NULL, NULL, NULL, 0, 0}
-  };
-
-static unsigned char conv_start_chars[256] = {0};
-
-void
-win_env::add_cache (const char *in_posix, const char *in_native)
-{
-  MALLOC_CHECK;
-  posix = (char *) realloc (posix, strlen (in_posix) + 1);
-  strcpy (posix, in_posix);
-  if (in_native)
-    {
-      native = (char *) realloc (native, namelen + 1 + strlen (in_native));
-      (void) strcpy (native, name);
-      (void) strcpy (native + namelen, in_native);
-    }
-  else
-    {
-      native = (char *) realloc (native, namelen + 1 + win32_len (in_posix));
-      (void) strcpy (native, name);
-      towin32 (in_posix, native + namelen);
-    }
-  MALLOC_CHECK;
-  debug_printf ("posix %s", posix);
-  debug_printf ("native %s", native);
-}
-
-
-/* Check for a "special" environment variable name.  *env is the pointer
-  to the beginning of the environment variable name.  *in_posix is any
-  known posix value for the environment variable. Returns a pointer to
-  the appropriate conversion structure.  */
-win_env * __stdcall
-getwinenv (const char *env, const char *in_posix)
-{
-  if (!conv_start_chars[(unsigned char)*env])
-    return NULL;
-
-  for (int i = 0; conv_envvars[i].name != NULL; i++)
-    if (strncmp (env, conv_envvars[i].name, conv_envvars[i].namelen) == 0)
-      {
-	win_env * const we = conv_envvars + i;
-	const char *val;
-	if (!cur_environ () || !(val = in_posix ?: getenv (we->name)))
-	  debug_printf ("can't set native for %s since no environ yet",
-			we->name);
-	else if (!envcache || !we->posix || strcmp (val, we->posix) != 0)
-	      we->add_cache (val);
-	return we;
-      }
-  return NULL;
-}
-
-/* Convert windows path specs to POSIX, if appropriate.
- */
-static void __stdcall
-posify (char **here, const char *value)
-{
-  char *src = *here;
-  win_env *conv;
-
-  if (!(conv = getwinenv (src)))
-    return;
-
-  int len = strcspn (src, "=") + 1;
-
-  /* Turn all the items from c:<foo>;<bar> into their
-     mounted equivalents - if there is one.  */
-
-  char *outenv = (char *) malloc (1 + len + conv->posix_len (value));
-  memcpy (outenv, src, len);
-  conv->toposix (value, outenv + len);
-  conv->add_cache (outenv + len, *value != '/' ? value : NULL);
-
-  debug_printf ("env var converted to %s", outenv);
-  *here = outenv;
-  free (src);
-  MALLOC_CHECK;
-}
-
-/*
- * my_findenv --
- *	Returns pointer to value associated with name, if any, else NULL.
- *	Sets offset to be the offset of the name/value combination in the
- *	environment array, for use by setenv(3) and unsetenv(3).
- *	Explicitly removes '=' in argument name.
- */
-
-static char * __stdcall
-my_findenv (const char *name, int *offset)
-{
-  register int len;
-  register char **p;
-  const char *c;
-
-  c = name;
-  len = 0;
-  while (*c && *c != '=')
-    {
-      c++;
-      len++;
-    }
-
-  for (p = cur_environ (); *p; ++p)
-    if (!strncmp (*p, name, len))
-      if (*(c = *p + len) == '=')
-	{
-	  *offset = p - cur_environ ();
-	  return (char *) (++c);
-	}
-  MALLOC_CHECK;
-  return NULL;
-}
-
-/*
- * getenv --
- *	Returns ptr to value associated with name, if any, else NULL.
- */
-
-extern "C" char *
-getenv (const char *name)
-{
-  int offset;
-
-  return my_findenv (name, &offset);
-}
-
-static int __stdcall
-envsize (const char * const *in_envp)
-{
-  const char * const *envp;
-  for (envp = in_envp; *envp; envp++)
-    continue;
-  return (1 + envp - in_envp) * sizeof (const char *);
-}
-
-/* Takes similar arguments to setenv except that overwrite is
-   either -1, 0, or 1.  0 or 1 signify that the function should
-   perform similarly to setenv.  Otherwise putenv is assumed. */
-static int __stdcall
-_addenv (const char *name, const char *value, int overwrite)
-{
-  int issetenv = overwrite >= 0;
-  int offset;
-  char *p;
-
-  unsigned int valuelen = strlen (value);
-  if ((p = my_findenv (name, &offset)))
-    {				/* Already exists. */
-      if (!overwrite)		/* Ok to overwrite? */
-	return 0;		/* No.  Wanted to add new value.  FIXME: Right return value? */
-
-      /* We've found the offset into environ.  If this is a setenv call and
-	 there is room in the current environment entry then just overwrite it.
-	 Otherwise handle this case below. */
-      if (issetenv && strlen (p) >= valuelen)
-	{
-	  strcpy (p, value);
-	  return 0;
-	}
-    }
-  else
-    {				/* Create new slot. */
-      int sz = envsize (cur_environ ());
-      int allocsz = sz + (2 * sizeof (char *));
-
-      offset = (sz - 1) / sizeof (char *);
-
-      /* Allocate space for additional element plus terminating NULL. */
-      if (cur_environ () == lastenviron)
-	lastenviron = __cygwin_environ = (char **) realloc (cur_environ (),
-							    allocsz);
-      else if ((lastenviron = (char **) malloc (allocsz)) != NULL)
-	__cygwin_environ = (char **) memcpy ((char **) lastenviron,
-					     __cygwin_environ, sz);
-
-      if (!__cygwin_environ)
-	{
-#ifdef DEBUGGING
-	  try_to_debug ();
-#endif
-	  return -1;				/* Oops.  No more memory. */
-	}
-
-      __cygwin_environ[offset + 1] = NULL;	/* NULL terminate. */
-      update_envptrs ();	/* Update any local copies of 'environ'. */
-    }
-
-  char *envhere;
-  if (!issetenv)
-    /* Not setenv. Just overwrite existing. */
-    envhere = cur_environ ()[offset] = (char *) (ENVMALLOC ? strdup (name) : name);
-  else
-    {				/* setenv */
-      /* Look for an '=' in the name and ignore anything after that if found. */
-      for (p = (char *) name; *p && *p != '='; p++)
-	continue;
-
-      int namelen = p - name;	/* Length of name. */
-      /* Allocate enough space for name + '=' + value + '\0' */
-      envhere = cur_environ ()[offset] = (char *) malloc (namelen + valuelen + 2);
-      if (!envhere)
-	return -1;		/* Oops.  No more memory. */
-
-      /* Put name '=' value into current slot. */
-      strncpy (envhere, name, namelen);
-      envhere[namelen] = '=';
-      strcpy (envhere + namelen + 1, value);
-    }
-
-  /* Update cygwin's cache, if appropriate */
-  win_env *spenv;
-  if ((spenv = getwinenv (envhere)))
-    spenv->add_cache (value);
-
-  MALLOC_CHECK;
-  return 0;
-}
-
-/* putenv Sets an environment variable */
-extern "C" int
-putenv (const char *str)
-{
-  int res;
-  if ((res = check_null_empty_str (str)))
-    {
-      if (res == ENOENT)
-	return 0;
-      set_errno (res);
-      return  -1;
-    }
-  char *eq = strchr (str, '=');
-  if (eq)
-    return _addenv (str, eq + 1, -1);
-
-  /* Remove str from the environment. */
-  unsetenv (str);
-  return 0;
-}
-
-/* setenv -- Set the value of the environment variable "name" to be
-   "value".  If overwrite is set, replace any current value.  */
-extern "C" int
-setenv (const char *name, const char *value, int overwrite)
-{
-  int res;
-  if ((res = check_null_empty_str (value)) == EFAULT)
-    {
-      set_errno (res);
-      return  -1;
-    }
-  if ((res = check_null_empty_str (name)))
-    {
-      if (res == ENOENT)
-	return 0;
-      set_errno (res);
-      return  -1;
-    }
-  if (*value == '=')
-    value++;
-  return _addenv (name, value, !!overwrite);
-}
-
-/* unsetenv(name) -- Delete environment variable "name".  */
-extern "C" void
-unsetenv (const char *name)
-{
-  register char **e;
-  int offset;
-
-  while (my_findenv (name, &offset))	/* if set multiple times */
-    /* Move up the rest of the array */
-    for (e = cur_environ () + offset; ; e++)
-      if (!(*e = *(e + 1)))
-	break;
-}
-
-/* Turn environment variable part of a=b string into uppercase. */
-static __inline__ void
-ucenv (char *p, char *eq)
-{
-  /* Amazingly, NT has a case sensitive environment name list,
-     but only sometimes.
-     It's normal to have NT set your "Path" to something.
-     Later, you set "PATH" to something else.  This alters "Path".
-     But if you try and do a naive getenv on "PATH" you'll get nothing.
-
-     So we upper case the labels here to prevent confusion later but
-     we only do it for the first process in a session group. */
-  for (; p < eq; p++)
-    if (islower (*p))
-      *p = cyg_toupper (*p);
-}
-
-/* Parse CYGWIN options */
-
-static NO_COPY bool export_settings = false;
-
-enum settings
-  {
-    justset,
-    isfunc,
-    setbit,
-    set_process_state,
-  };
-
-/* When BUF is:
-   null or empty: disables globbing
-   "ignorecase": enables case-insensitive globbing
-   anything else: enables case-sensitive globbing */
-static void
-glob_init (const char *buf)
-{
-  if (!buf || !*buf)
-    {
-      allow_glob = false;
-      ignore_case_with_glob = false;
-    }
-  else if (strncasematch (buf, "ignorecase", 10))
-    {
-      allow_glob = true;
-      ignore_case_with_glob = true;
-    }
-  else
-    {
-      allow_glob = true;
-      ignore_case_with_glob = false;
-    }
-}
-
-static void
-check_case_init (const char *buf)
-{
-  if (!buf || !*buf)
-    return;
-
-  if (strncasematch (buf, "relax", 5))
-    {
-      pcheck_case = PCHECK_RELAXED;
-      debug_printf ("File case checking set to RELAXED");
-    }
-  else if (strcasematch (buf, "adjust"))
-    {
-      pcheck_case = PCHECK_ADJUST;
-      debug_printf ("File case checking set to ADJUST");
-    }
-  else if (strcasematch (buf, "strict"))
-    {
-      pcheck_case = PCHECK_STRICT;
-      debug_printf ("File case checking set to STRICT");
-    }
-  else
-    {
-      debug_printf ("Wrong case checking name: %s", buf);
-    }
-}
-
-void
-set_file_api_mode (codepage_type cp)
-{
-  if (cp == oem_cp)
-    {
-      SetFileApisToOEM ();
-      debug_printf ("File APIs set to OEM");
-    }
-  else if (cp == ansi_cp)
-    {
-      SetFileApisToANSI ();
-      debug_printf ("File APIs set to ANSI");
-    }
-}
-
-static void
-codepage_init (const char *buf)
-{
-  if (!buf || !*buf)
-    return;
-
-  if (strcasematch (buf, "oem"))
-    {
-      current_codepage = oem_cp;
-      set_file_api_mode (current_codepage);
-    }
-  else if (strcasematch (buf, "ansi"))
-    {
-      current_codepage = ansi_cp;
-      set_file_api_mode (current_codepage);
-    }
-  else
-    debug_printf ("Wrong codepage name: %s", buf);
-}
-
-static void
-subauth_id_init (const char *buf)
-{
-  if (!buf || !*buf)
-    return;
-
-  int i = strtol (buf, NULL, 0);
-
-  /* 0..127 are reserved by Microsoft, 132 is IIS subauthentication. */
-  if (i > 127 && i != 132 && i <= 255)
-    subauth_id = i;
-}
-
-static void
-set_chunksize (const char *buf)
-{
-  wincap.set_chunksize (strtol (buf, NULL, 0));
-}
-
-/* The structure below is used to set up an array which is used to
-   parse the CYGWIN environment variable or, if enabled, options from
-   the registry.  */
-static struct parse_thing
-  {
-    const char *name;
-    union parse_setting
-      {
-	bool *b;
-	DWORD *x;
-	int *i;
-	void (*func)(const char *);
-      } setting;
-
-    enum settings disposition;
-    char *remember;
-    union parse_values
-      {
-	DWORD i;
-	const char *s;
-      } values[2];
-  } known[] NO_COPY =
-{
-  {"binmode", {x: &binmode}, justset, NULL, {{O_TEXT}, {O_BINARY}}},
-  {"check_case", {func: &check_case_init}, isfunc, NULL, {{0}, {0}}},
-  {"codepage", {func: &codepage_init}, isfunc, NULL, {{0}, {0}}},
-#ifdef USE_SERVER
-  {"server", {&allow_server}, justset, NULL, {{false}, {true}}},
-#endif
-  {"envcache", {&envcache}, justset, NULL, {{true}, {false}}},
-  {"error_start", {func: &error_start_init}, isfunc, NULL, {{0}, {0}}},
-  {"export", {&export_settings}, justset, NULL, {{false}, {true}}},
-  {"forkchunk", {func: set_chunksize}, isfunc, NULL, {{0}, {0}}},
-  {"glob", {func: &glob_init}, isfunc, NULL, {{0}, {s: "normal"}}},
-  {"ntea", {&allow_ntea}, justset, NULL, {{false}, {true}}},
-  {"ntsec", {&allow_ntsec}, justset, NULL, {{false}, {true}}},
-  {"smbntsec", {&allow_smbntsec}, justset, NULL, {{false}, {true}}},
-  {"reset_com", {&reset_com}, justset, NULL, {{false}, {true}}},
-  {"strip_title", {&strip_title_path}, justset, NULL, {{false}, {true}}},
-  {"subauth_id", {func: &subauth_id_init}, isfunc, NULL, {{0}, {0}}},
-  {"title", {&display_title}, justset, NULL, {{false}, {true}}},
-  {"tty", {NULL}, set_process_state, NULL, {{0}, {PID_USETTY}}},
-  {"winsymlinks", {&allow_winsymlinks}, justset, NULL, {{false}, {true}}},
-  {NULL, {0}, justset, 0, {{0}, {0}}}
-};
-
-/* Parse a string of the form "something=stuff somethingelse=more-stuff",
-   silently ignoring unknown "somethings".  */
-static void __stdcall
-parse_options (char *buf)
-{
-  int istrue;
-  char *p, *lasts;
-  parse_thing *k;
-
-  if (buf == NULL)
-    {
-      char newbuf[CYG_MAX_PATH + 7];
-      newbuf[0] = '\0';
-      for (k = known; k->name != NULL; k++)
-	if (k->remember)
-	  {
-	    strcat (strcat (newbuf, " "), k->remember);
-	    free (k->remember);
-	    k->remember = NULL;
-	  }
-
-      if (export_settings)
-	{
-	  debug_printf ("%s", newbuf + 1);
-	  setenv ("CYGWIN", newbuf + 1, 1);
-	}
-      return;
-    }
-
-  buf = strcpy ((char *) alloca (strlen (buf) + 1), buf);
-  for (p = strtok_r (buf, " \t", &lasts);
-       p != NULL;
-       p = strtok_r (NULL, " \t", &lasts))
-    {
-      char *keyword_here = p;
-      if (!(istrue = !strncasematch (p, "no", 2)))
-	p += 2;
-      else if (!(istrue = *p != '-'))
-	p++;
-
-      char ch, *eq;
-      if ((eq = strchr (p, '=')) != NULL || (eq = strchr (p, ':')) != NULL)
-	ch = *eq, *eq++ = '\0';
-      else
-	ch = 0;
-
-      for (parse_thing *k = known; k->name != NULL; k++)
-	if (strcasematch (p, k->name))
-	  {
-	    switch (k->disposition)
-	      {
-	      case isfunc:
-		k->setting.func ((!eq || !istrue) ?
-		  k->values[istrue].s : eq);
-		debug_printf ("%s (called func)", k->name);
-		break;
-	      case justset:
-		if (!istrue || !eq)
-		  *k->setting.x = k->values[istrue].i;
-		else
-		  *k->setting.x = strtol (eq, NULL, 0);
-		debug_printf ("%s %d", k->name, *k->setting.x);
-		break;
-	      case set_process_state:
-		k->setting.x = &myself->process_state;
-		/* fall through */
-	      case setbit:
-		*k->setting.x &= ~k->values[istrue].i;
-		if (istrue || (eq && strtol (eq, NULL, 0)))
-		  *k->setting.x |= k->values[istrue].i;
-		debug_printf ("%s %x", k->name, *k->setting.x);
-		break;
-	      }
-
-	    if (eq)
-	      *--eq = ch;
-
-	    int n = eq - p;
-	    p = strdup (keyword_here);
-	    if (n > 0)
-	      p[n] = ':';
-	    k->remember = p;
-	    break;
-	  }
-      }
-  debug_printf ("returning");
-  return;
-}
-
-/* Set options from the registry. */
-static bool __stdcall
-regopt (const char *name)
-{
-  bool parsed_something = false;
-  /* FIXME: should not be under mount */
-  reg_key r (KEY_READ, CYGWIN_INFO_PROGRAM_OPTIONS_NAME, NULL);
-  char buf[CYG_MAX_PATH];
-  char lname[strlen (name) + 1];
-  strlwr (strcpy (lname, name));
-
-  if (r.get_string (lname, buf, sizeof (buf) - 1, "") == ERROR_SUCCESS)
-    {
-      parse_options (buf);
-      parsed_something = true;
-    }
-  else
-    {
-      reg_key r1 (HKEY_LOCAL_MACHINE, KEY_READ, "SOFTWARE",
-		  CYGWIN_INFO_CYGNUS_REGISTRY_NAME,
-		  CYGWIN_INFO_CYGWIN_REGISTRY_NAME,
-		  CYGWIN_INFO_PROGRAM_OPTIONS_NAME, NULL);
-      if (r1.get_string (lname, buf, sizeof (buf) - 1, "") == ERROR_SUCCESS)
-	{
-	  parse_options (buf);
-	  parsed_something = true;
-	}
-    }
-  MALLOC_CHECK;
-  return parsed_something;
-}
-
-/* Initialize the environ array.  Look for the CYGWIN environment
-   environment variable and set appropriate options from it.  */
-void
-environ_init (char **envp, int envc)
-{
-  char *rawenv;
-  int i;
-  char *p;
-  char *newp;
-  int sawTERM = 0;
-  bool envp_passed_in;
-  bool got_something_from_registry;
-  static char NO_COPY cygterm[] = "TERM=cygwin";
-
-  static int initted;
-  if (!initted)
-    {
-      for (int i = 0; conv_envvars[i].name != NULL; i++)
-	{
-	  conv_start_chars[(int) cyg_tolower (conv_envvars[i].name[0])] = 1;
-	  conv_start_chars[(int) cyg_toupper (conv_envvars[i].name[0])] = 1;
-	}
-      initted = 1;
-    }
-
-  got_something_from_registry = regopt ("default");
-  if (myself->progname[0])
-    got_something_from_registry = regopt (myself->progname) || got_something_from_registry;
-
-  /* Set ntsec explicit as default, if NT is running */
-  if (wincap.has_security ())
-    allow_ntsec = true;
-
-  if (!envp)
-    envp_passed_in = 0;
-  else
-    {
-      envc++;
-      envc *= sizeof (char *);
-      char **newenv = (char **) malloc (envc);
-      memcpy (newenv, envp, envc);
-      cfree (envp);
-
-      /* Older applications relied on the fact that cygwin malloced elements of the
-	 environment list.  */
-      envp = newenv;
-      if (ENVMALLOC)
-	for (char **e = newenv; *e; e++)
-	  {
-	    char *p = *e;
-	    *e = strdup (p);
-	    cfree (p);
-	  }
-      envp_passed_in = 1;
-      goto out;
-    }
-
-  /* Allocate space for environment + trailing NULL + CYGWIN env. */
-  lastenviron = envp = (char **) malloc ((4 + (envc = 100)) * sizeof (char *));
-  rawenv = GetEnvironmentStrings ();
-
-  /* Current directory information is recorded as variables of the
-     form "=X:=X:\foo\bar; these must be changed into something legal
-     (we could just ignore them but maybe an application will
-     eventually want to use them).  */
-  for (i = 0, p = rawenv; *p != '\0'; p = strchr (p, '\0') + 1, i++)
-    {
-      newp = strdup (p);
-      if (i >= envc)
-	envp = (char **) realloc (envp, (4 + (envc += 100)) * sizeof (char *));
-      envp[i] = newp;
-      if (*newp == '=')
-	*newp = '!';
-      char *eq = strechr (newp, '=');
-      if (!child_proc_info)
-	ucenv (newp, eq);
-      if (*newp == 'T' && strncmp (newp, "TERM=", 5) == 0)
-	sawTERM = 1;
-      if (*newp == 'C' && strncmp (newp, "CYGWIN=", sizeof ("CYGWIN=") - 1) == 0)
-	parse_options (newp + sizeof ("CYGWIN=") - 1);
-      if (*eq && conv_start_chars[(unsigned char)envp[i][0]])
-	posify (envp + i, *++eq ? eq : --eq);
-      debug_printf ("%p: %s", envp[i], envp[i]);
-    }
-
-  if (!sawTERM)
-    envp[i++] = cygterm;
-  envp[i] = NULL;
-  FreeEnvironmentStrings (rawenv);
-
-out:
-  __cygwin_environ = envp;
-  update_envptrs ();
-  if (envp_passed_in)
-    {
-      p = getenv ("CYGWIN");
-      if (p)
-	parse_options (p);
-    }
-
-  if (got_something_from_registry)
-    parse_options (NULL);	/* possibly export registry settings to
-				   environment */
-  MALLOC_CHECK;
-}
-
-/* Function called by qsort to sort environment strings.  */
-static int
-env_sort (const void *a, const void *b)
-{
-  const char **p = (const char **) a;
-  const char **q = (const char **) b;
-
-  return strcmp (*p, *q);
-}
-
-char * __stdcall
-getwinenveq (const char *name, size_t namelen, int x)
-{
-  char dum[1];
-  char name0[namelen - 1];
-  memcpy (name0, name, namelen - 1);
-  name0[namelen - 1] = '\0';
-  int totlen = GetEnvironmentVariable (name0, dum, 0);
-  if (totlen > 0)
-    {
-      totlen++;
-      if (x == HEAP_1_STR)
-	totlen += namelen;
-      else
-	namelen = 0;
-      char *p = (char *) cmalloc ((cygheap_types) x, totlen);
-      if (namelen)
-	strcpy (p, name);
-      if (GetEnvironmentVariable (name0, p + namelen, totlen))
-	{
-	  debug_printf ("using value from GetEnvironmentVariable for '%s'",
-			name0);
-	  return p;
-	}
-      else
-	cfree (p);
-    }
-
-  debug_printf ("warning: %s not present in environment", name);
-  return NULL;
-}
-
-struct spenv
-{
-  const char *name;
-  size_t namelen;
-  const char * (cygheap_user::*from_cygheap) (const char *, size_t);
-  char *retrieve (bool, const char * const = NULL)
-    __attribute__ ((regparm (3)));
-};
-
-#define env_dontadd almost_null
-
-/* Keep this list in upper case and sorted */
-static NO_COPY spenv spenvs[] =
-{
-  {NL ("HOMEDRIVE="), &cygheap_user::env_homedrive},
-  {NL ("HOMEPATH="), &cygheap_user::env_homepath},
-  {NL ("LOGONSERVER="), &cygheap_user::env_logsrv},
-  {NL ("SYSTEMDRIVE="), NULL},
-  {NL ("SYSTEMROOT="), NULL},
-  {NL ("USERDOMAIN="), &cygheap_user::env_domain},
-  {NL ("USERNAME="), &cygheap_user::env_name},
-  {NL ("USERPROFILE="), &cygheap_user::env_userprofile},
-};
-
-char *
-spenv::retrieve (bool no_envblock, const char *const envname)
-{
-  if (envname && !strncasematch (envname, name, namelen))
-    return NULL;
-
-  debug_printf ("no_envblock %d", no_envblock);
-
-  if (from_cygheap)
-    {
-      const char *p;
-      if (envname && !cygheap->user.issetuid ())
-	{
-	  debug_printf ("duping existing value for '%s'", name);
-	  return cstrdup1 (envname);	/* Don't really care what it's set to
-					   if we're calling a cygwin program */
-	}
-
-      /* Calculate (potentially) value for given environment variable.  */
-      p = (cygheap->user.*from_cygheap) (name, namelen);
-      if (!p || (no_envblock && !envname) || (p == env_dontadd))
-	return env_dontadd;
-      char *s = (char *) cmalloc (HEAP_1_STR, namelen + strlen (p) + 1);
-      strcpy (s, name);
-      (void) strcpy (s + namelen, p);
-      debug_printf ("using computed value for '%s'", name);
-      return s;
-    }
-
-  if (envname)
-    return cstrdup1 (envname);
-
-  return getwinenveq (name, namelen, HEAP_1_STR);
-}
-
-#define SPENVS_SIZE (sizeof (spenvs) / sizeof (spenvs[0]))
-
-/* Create a Windows-style environment block, i.e. a typical character buffer
-   filled with null terminated strings, terminated by double null characters.
-   Converts environment variables noted in conv_envvars into win32 form
-   prior to placing them in the string.  */
-char ** __stdcall
-build_env (const char * const *envp, char *&envblock, int &envc,
-	   bool no_envblock)
-{
-  int len, n;
-  const char * const *srcp;
-  char **dstp;
-  bool saw_spenv[SPENVS_SIZE] = {0};
-
-  debug_printf ("envp %p", envp);
-
-  /* How many elements? */
-  for (n = 0; envp[n]; n++)
-    continue;
-
-  /* Allocate a new "argv-style" environ list with room for extra stuff. */
-  char **newenv = (char **) cmalloc (HEAP_1_ARGV, sizeof (char *) *
-						  (n + SPENVS_SIZE + 1));
-
-  int tl = 0;
-  /* Iterate over input list, generating a new environment list and refreshing
-     "special" entries, if necessary. */
-  for (srcp = envp, dstp = newenv; *srcp; srcp++)
-    {
-      /* Look for entries that require special attention */
-      for (unsigned i = 0; i < SPENVS_SIZE; i++)
-	if (!saw_spenv[i] && (*dstp = spenvs[i].retrieve (no_envblock, *srcp)))
-	  {
-	    saw_spenv[i] = 1;
-	    if (*dstp == env_dontadd)
-	      goto next1;
-	    goto  next0;
-	  }
-
-      /* Add entry to new environment */
-      *dstp = cstrdup1 (*srcp);
-
-    next0:
-      /* If necessary, calculate rough running total for envblock size */
-      if (!no_envblock)
-	tl += strlen (*dstp) + 1;
-      dstp++;
-    next1:
-      continue;
-    }
-
-  assert ((srcp - envp) == n);
-  /* Fill in any required-but-missing environment variables. */
-  for (unsigned i = 0; i < SPENVS_SIZE; i++)
-    if (!saw_spenv[i])
-      {
-	*dstp = spenvs[i].retrieve (no_envblock);
-	if (*dstp && !no_envblock && *dstp != env_dontadd)
-	  {
-	    tl += strlen (*dstp) + 1;
-	    dstp++;
-	  }
-      }
-
-  envc = dstp - newenv;		/* Number of entries in newenv */
-  assert ((size_t) envc <= (n + SPENVS_SIZE));
-  *dstp = NULL;			/* Terminate */
-
-  if (no_envblock)
-    envblock = NULL;
-  else
-    {
-      debug_printf ("env count %d, bytes %d", envc, tl);
-
-      /* Windows programs expect the environment block to be sorted.  */
-      qsort (newenv, envc, sizeof (char *), env_sort);
-
-      /* Create an environment block suitable for passing to CreateProcess.  */
-      char *s;
-      envblock = (char *) malloc (2 + tl);
-      int new_tl = 0;
-      for (srcp = newenv, s = envblock; *srcp; srcp++)
-	{
-	  const char *p;
-	  win_env *conv;
-	  len = strcspn (*srcp, "=") + 1;
-
-	  /* See if this entry requires posix->win32 conversion. */
-	  conv = getwinenv (*srcp, *srcp + len);
-	  if (conv)
-	    p = conv->native;	/* Use win32 path */
-	  else
-	    p = *srcp;		/* Don't worry about it */
-
-	  len = strlen (p);
-	  new_tl += len + 1;	/* Keep running total of block length so far */
-
-	  /* See if we need to increase the size of the block. */
-	  if (new_tl > tl)
-	    {
-	      tl = new_tl + 100;
-	      char *new_envblock =
-			(char *) realloc (envblock, 2 + tl);
-	      /* If realloc moves the block, move `s' with it. */
-	      if (new_envblock != envblock)
-		{
-		  s += new_envblock - envblock;
-		  envblock = new_envblock;
-		}
-	    }
-
-	  memcpy (s, p, len + 1);
-
-	  /* See if environment variable is "special" in a Windows sense.
-	     Under NT, the current directories for visited drives are stored
-	     as =C:=\bar.  Cygwin converts the '=' to '!' for hopefully obvious
-	     reasons.  We need to convert it back when building the envblock */
-	  if (s[0] == '!' && (isdrive (s + 1) || (s[1] == ':' && s[2] == ':'))
-	      && s[3] == '=')
-	    *s = '=';
-	  s += len + 1;
-	}
-      *s = '\0';			/* Two null bytes at the end */
-      assert ((s - envblock) <= tl);	/* Detect if we somehow ran over end
-					   of buffer */
-    }
-
-  debug_printf ("envp %p, envc %d", newenv, envc);
-  return newenv;
-}
-
-/* This idiocy is necessary because the early implementers of cygwin
-   did not seem to know about importing data variables from the DLL.
-   So, we have to synchronize cygwin's idea of the environment with the
-   main program's with each reference to the environment. */
-extern "C" char ** __stdcall
-cur_environ ()
-{
-  if (*main_environ != __cygwin_environ)
-    {
-      __cygwin_environ = *main_environ;
-      update_envptrs ();
-    }
-
-  return __cygwin_environ;
-}
diff --git a/winsup/cygwin/environ.h b/winsup/cygwin/environ.h
deleted file mode 100644
index f6a1797ad..000000000
--- a/winsup/cygwin/environ.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* environ.h: Declarations for environ manipulation
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* Initialize the environment */
-void environ_init (char **, int)
-  __attribute__ ((regparm (2)));
-
-/* The structure below is used to control conversion to/from posix-style
-   file specs.  Currently, only PATH and HOME are converted, but PATH
-   needs to use a "convert path list" function while HOME needs a simple
-   "convert to posix/win32".  For the simple case, where a calculated length
-   is required, just return CYG_MAX_PATH.  *FIXME* */
-struct win_env
-  {
-    const char *name;
-    size_t namelen;
-    char *posix;
-    char *native;
-    int (*toposix) (const char *, char *);
-    int (*towin32) (const char *, char *);
-    int (*posix_len) (const char *);
-    int (*win32_len) (const char *);
-    void add_cache (const char *in_posix, const char *in_native = NULL)
-      __attribute__ ((regparm (3)));
-    const char * get_native () const {return native ? native + namelen : NULL;}
-    const char * get_posix () const {return posix ? posix : NULL;}
-  };
-
-win_env * __stdcall getwinenv (const char *name, const char *posix = NULL)
-  __attribute__ ((regparm (3)));
-char * __stdcall getwinenveq (const char *name, size_t len, int)
-  __attribute__ ((regparm (3)));
-
-void __stdcall update_envptrs ();
-extern char **__cygwin_environ, ***main_environ;
-extern "C" char __stdcall **cur_environ ();
-char ** __stdcall build_env (const char * const *envp, char *&envblock,
-			     int &envc, bool need_envblock)
-  __attribute__ ((regparm (3)));
diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc
deleted file mode 100644
index cbe31d04a..000000000
--- a/winsup/cygwin/errno.cc
+++ /dev/null
@@ -1,697 +0,0 @@
-/* errno.cc: errno-related functions
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#define _sys_nerr FOO_sys_nerr
-#define sys_nerr FOOsys_nerr
-#define _sys_errlist FOO_sys_errlist
-#include "winsup.h"
-#include <stdio.h>
-#include "cygerrno.h"
-#include "thread.h"
-#undef _sys_nerr
-#undef sys_nerr
-#undef _sys_errlist
-
-/* Table to map Windows error codes to Errno values.  */
-/* FIXME: Doing things this way is a little slow.  It's trivial to change
-   this into a big case statement if necessary.  Left as is for now. */
-
-#define X(w, e) {ERROR_##w, #w, e}
-
-static NO_COPY struct
-{
-  DWORD w;		 /* windows version of error */
-  const char *s;	 /* text of windows version */
-  int e;		 /* errno version of error */
-} errmap[] =
-{
-  /* FIXME: Some of these choices are arbitrary! */
-  X (INVALID_FUNCTION,		EBADRQC),
-  X (FILE_NOT_FOUND,		ENOENT),
-  X (PATH_NOT_FOUND,		ENOENT),
-  X (TOO_MANY_OPEN_FILES,	EMFILE),
-  X (ACCESS_DENIED,		EACCES),
-  X (INVALID_HANDLE,		EBADF),
-  X (NOT_ENOUGH_MEMORY,		ENOMEM),
-  X (INVALID_DATA,		EINVAL),
-  X (OUTOFMEMORY,		ENOMEM),
-  X (INVALID_DRIVE,		ENODEV),
-  X (NOT_SAME_DEVICE,		EXDEV),
-  X (NO_MORE_FILES,		ENMFILE),
-  X (WRITE_PROTECT,		EROFS),
-  X (BAD_UNIT,			ENODEV),
-  X (SHARING_VIOLATION,		EACCES),
-  X (LOCK_VIOLATION,		EACCES),
-  X (SHARING_BUFFER_EXCEEDED,	ENOLCK),
-  X (HANDLE_EOF,		ENODATA),
-  X (HANDLE_DISK_FULL,		ENOSPC),
-  X (NOT_SUPPORTED,		ENOSYS),
-  X (REM_NOT_LIST,		ENONET),
-  X (DUP_NAME,			ENOTUNIQ),
-  X (BAD_NETPATH,		ENOSHARE),
-  X (BAD_NET_NAME,		ENOSHARE),
-  X (FILE_EXISTS,		EEXIST),
-  X (CANNOT_MAKE,		EPERM),
-  X (INVALID_PARAMETER,		EINVAL),
-  X (NO_PROC_SLOTS,		EAGAIN),
-  X (BROKEN_PIPE,		EPIPE),
-  X (OPEN_FAILED,		EIO),
-  X (NO_MORE_SEARCH_HANDLES,	ENFILE),
-  X (CALL_NOT_IMPLEMENTED,	ENOSYS),
-  X (INVALID_NAME,		ENOENT),
-  X (WAIT_NO_CHILDREN,		ECHILD),
-  X (CHILD_NOT_COMPLETE,	EBUSY),
-  X (DIR_NOT_EMPTY,		ENOTEMPTY),
-  X (SIGNAL_REFUSED,		EIO),
-  X (BAD_PATHNAME,		ENOENT),
-  X (SIGNAL_PENDING,		EBUSY),
-  X (MAX_THRDS_REACHED,		EAGAIN),
-  X (BUSY,			EBUSY),
-  X (ALREADY_EXISTS,		EEXIST),
-  X (NO_SIGNAL_SENT,		EIO),
-  X (FILENAME_EXCED_RANGE,	EINVAL),
-  X (META_EXPANSION_TOO_LONG,	EINVAL),
-  X (INVALID_SIGNAL_NUMBER,	EINVAL),
-  X (THREAD_1_INACTIVE,		EINVAL),
-  X (BAD_PIPE,			EINVAL),
-  X (PIPE_BUSY,			EBUSY),
-  X (NO_DATA,			EPIPE),
-  X (PIPE_NOT_CONNECTED,	ECOMM),
-  X (MORE_DATA,			EAGAIN),
-  X (DIRECTORY,			ENOTDIR),
-  X (PIPE_CONNECTED,		EBUSY),
-  X (PIPE_LISTENING,		ECOMM),
-  X (NO_TOKEN,			EINVAL),
-  X (PROCESS_ABORTED,		EFAULT),
-  X (BAD_DEVICE,		ENODEV),
-  X (BAD_USERNAME,		EINVAL),
-  X (NOT_CONNECTED,		ENOLINK),
-  X (OPEN_FILES,		EAGAIN),
-  X (ACTIVE_CONNECTIONS,	EAGAIN),
-  X (DEVICE_IN_USE,		EAGAIN),
-  X (INVALID_AT_INTERRUPT_TIME,	EINTR),
-  X (IO_DEVICE,			EIO),
-  X (NOT_OWNER,			EPERM),
-  X (END_OF_MEDIA,		ENOSPC),
-  X (EOM_OVERFLOW,		ENOSPC),
-  X (BEGINNING_OF_MEDIA,	ESPIPE),
-  X (SETMARK_DETECTED,		ESPIPE),
-  X (NO_DATA_DETECTED,		ENOSPC),
-  X (POSSIBLE_DEADLOCK,		EDEADLOCK),
-  X (CRC,			EIO),
-  X (NEGATIVE_SEEK,		EINVAL),
-  X (NOT_READY,			ENOMEDIUM),
-  X (DISK_FULL,			ENOSPC),
-  X (NOACCESS,			EFAULT),
-  X (FILE_INVALID,		ENXIO),
-  X (INVALID_ADDRESS,		EOVERFLOW),
-  X (INVALID_BLOCK_LENGTH,	EIO),
-  { 0, NULL, 0}
-};
-
-extern "C" {
-const char __declspec(dllexport) * _sys_errlist[] NO_COPY_INIT =
-{
-/*      NOERROR 0       */ "No error",
-/*	EPERM 1		*/ "Operation not permitted",
-/*	ENOENT 2	*/ "No such file or directory",
-/*	ESRCH 3		*/ "No such process",
-/*	EINTR 4		*/ "Interrupted system call",
-/*	EIO 5		*/ "I/O error",
-/*	ENXIO 6		*/ "No such device or address",
-/*	E2BIG 7		*/ "Arg list too long",
-/*	ENOEXEC 8	*/ "Exec format error",
-/*	EBADF 9		*/ "Bad file descriptor",
-/*	ECHILD 10	*/ "No children",
-/*	EAGAIN 11	*/ "Resource temporarily unavailable",
-/*	ENOMEM 12	*/ "Not enough core",
-/*	EACCES 13	*/ "Permission denied",
-/*	EFAULT 14	*/ "Bad address",
-/*	ENOTBLK 15	*/ "Block device required",
-/*	EBUSY 16	*/ "Mount device busy",
-/*	EEXIST 17	*/ "File exists",
-/*	EXDEV 18	*/ "Cross-device link",
-/*	ENODEV 19	*/ "No such device",
-/*	ENOTDIR 20	*/ "Not a directory",
-/*	EISDIR 21	*/ "Is a directory",
-/*	EINVAL 22	*/ "Invalid argument",
-/*	ENFILE 23	*/ "Too many open files in system",
-/*	EMFILE 24	*/ "Too many open files",
-/*	ENOTTY 25	*/ "Not a typewriter",
-/*	ETXTBSY 26	*/ "Text file busy",
-/*	EFBIG 27	*/ "File too large",
-/*	ENOSPC 28	*/ "No space left on device",
-/*	ESPIPE 29	*/ "Illegal seek",
-/*	EROFS 30	*/ "Read only file system",
-/*	EMLINK 31	*/ "Too many links",
-/*	EPIPE 32	*/ "Broken pipe",
-/*	EDOM 33		*/ "Math arg out of domain of func",
-/*	ERANGE 34	*/ "Math result not representable",
-/*	ENOMSG 35	*/ "No message of desired type",
-/*	EIDRM 36	*/ "Identifier removed",
-/*	ECHRNG 37	*/ "Channel number out of range",
-/*	EL2NSYNC 38	*/ "Level 2 not synchronized",
-/*	EL3HLT 39	*/ "Level 3 halted",
-/*	EL3RST 40	*/ "Level 3 reset",
-/*	ELNRNG 41	*/ "Link number out of range",
-/*	EUNATCH 42	*/ "Protocol driver not attached",
-/*	ENOCSI 43	*/ "No CSI structure available",
-/*	EL2HLT 44	*/ "Level 2 halted",
-/*	EDEADLK 45	*/ "Deadlock condition",
-/*	ENOLCK 46	*/ "No record locks available",
-			   "47",
-			   "48",
-			   "49",
-/* EBADE 50	*/ "Invalid exchange",
-/* EBADR 51	*/ "Invalid request descriptor",
-/* EXFULL 52	*/ "Exchange full",
-/* ENOANO 53	*/ "No anode",
-/* EBADRQC 54	*/ "Invalid request code",
-/* EBADSLT 55	*/ "Invalid slot",
-/* EDEADLOCK 56	*/ "File locking deadlock error",
-/* EBFONT 57	*/ "Bad font file fmt",
-			   "58",
-			   "59",
-/* ENOSTR 60	*/ "Device not a stream",
-/* ENODATA 61	*/ "No data (for no delay io)",
-/* ETIME 62	*/ "Timer expired",
-/* ENOSR 63	*/ "Out of streams resources",
-/* ENONET 64	*/ "Machine is not on the network",
-/* ENOPKG 65	*/ "Package not installed",
-/* EREMOTE 66	*/ "The object is remote",
-/* ENOLINK 67	*/ "The link has been severed",
-/* EADV 68		*/ "Advertise error",
-/* ESRMNT 69	*/ "Srmount error",
-/*	ECOMM 70	*/ "Communication error on send",
-/* EPROTO 71	*/ "Protocol error",
-			   "72",
-			   "73",
-/*	EMULTIHOP 74	*/ "Multihop attempted",
-/*	ELBIN 75	*/ "Inode is remote (not really error)",
-/*	EDOTDOT 76	*/ "Cross mount point (not really error)",
-/* EBADMSG 77	*/ "Trying to read unreadable message",
-			   "78",
-			   "79",
-/* ENOTUNIQ 80	*/ "Given log. name not unique",
-/* EBADFD 81	*/ "f.d. invalid for this operation",
-/* EREMCHG 82	*/ "Remote address changed",
-/* ELIBACC 83	*/ "Can't access a needed shared lib",
-/* ELIBBAD 84	*/ "Accessing a corrupted shared lib",
-/* ELIBSCN 85	*/ ".lib section in a.out corrupted",
-/* ELIBMAX 86	*/ "Attempting to link in too many libs",
-/* ELIBEXEC 87	*/ "Attempting to exec a shared library",
-/* ENOSYS 88	*/ "Function not implemented",
-/* ENMFILE 89      */ "No more files",
-/* ENOTEMPTY 90	*/ "Directory not empty",
-/* ENAMETOOLONG 91	*/ "File or path name too long",
-/* ELOOP 92     */ "Too many symbolic links",
-		   "93",
-		   "94",
-/* EOPNOTSUPP 95 */ "Operation not supported on transport endpoint",
-/* EPFNOSUPPORT 96 */ "Protocol family not supported",
-		   "97",
-		   "98",
-		   "99",
-		   "100",
-		   "101",
-		   "102",
-		   "103",
-/* ECONNRESET 104 */ "Connection reset by peer",
-/* ENOBUFS 105 */ "No buffer space available",
-/* EAFNOSUPPORT 106 */ "Address family not supported by protocol",
-/* EPROTOTYPE 107 */ "Protocol wrong type for transport endpoint",
-/* ENOTSOCK 108 */  "Socket operation on non-socket",
-/* ENOPROTOOPT 109 */ "Protocol not available",
-/* ESHUTDOWN 110 */ "Cannot send after transport endpoint shutdown",
-/* ECONNREFUSED 111 */ "Connection refused",
-/* EADDRINUSE 112 */ "Address already in use",
-/* ECONNABORTED 113 */ "Connection aborted",
-/* ENETUNREACH 114 */ "Network is unreachable",
-/* ENETDOWN 115 */ "Network is down",
-/* ETIMEDOUT 116 */ "Connection timed out",
-/* EHOSTDOWN 117 */ "Host is down",
-/* EHOSTUNREACH 118 */ "No route to host",
-/* EINPROGRESS 119 */ "Operation now in progress",
-/* EALREADY 120 */ "Operation already in progress",
-/* EDESTADDRREQ 121 */ "Destination address required",
-/* EMSGSIZE 122 */ "Message too long",
-/* EPROTONOSUPPORT 123 */ "Protocol not supported",
-/* ESOCKTNOSUPPORT 124 */ "Socket type not supported",
-/* EADDRNOTAVAIL 125 */ "Cannot assign requested address",
-/* ENETRESET 126 */ "Network dropped connection because of reset",
-/* EISCONN 127 */ "Transport endpoint is already connected",
-/* ENOTCONN 128 */ "Transport endpoint is not connected",
-/* ETOOMANYREFS 129 */ "Too many references: cannot splice",
-/* EPROCLIM 130 */ "Process limit exceeded",
-/* EUSERS 131 */ "Too many users",
-/* EDQUOT 132 */ "Quota exceeded",
-/* ESTALE 133 */ "Stale NFS file handle",
-/* ENOTSUP 134 */   "134",
-/* ENOMEDIUM 135 */ "no medium",
-/* ENOSHARE 136 */   "No such host or network path",
-/* ECASECLASH 137 */ "Filename exists with different case",
-/* EILSEQ 138 */ "Illegal byte sequence",
-/* EOVERFLOW 139 */ "Value too large for defined data type"
-};
-
-int NO_COPY_INIT _sys_nerr = sizeof (_sys_errlist) / sizeof (_sys_errlist[0]);
-};
-
-int __stdcall
-geterrno_from_win_error (DWORD code, int deferrno)
-{
-  for (int i = 0; errmap[i].w != 0; ++i)
-    if (code == errmap[i].w)
-      {
-	syscall_printf ("windows error %u == errno %d", code, errmap[i].e);
-	return errmap[i].e;
-      }
-
-  syscall_printf ("unknown windows error %u, setting errno to %d", code,
-		  deferrno);
-  return deferrno;	/* FIXME: what's so special about EACCESS? */
-}
-
-/* seterrno_from_win_error: Given a Windows error code, set errno
-   as appropriate. */
-void __stdcall
-seterrno_from_win_error (const char *file, int line, DWORD code)
-{
-  syscall_printf ("%s:%d windows error %d", file, line, code);
-  set_errno (geterrno_from_win_error (code, EACCES));
-  return;
-}
-
-/* seterrno: Set `errno' based on GetLastError (). */
-void __stdcall
-seterrno (const char *file, int line)
-{
-  seterrno_from_win_error (file, line, GetLastError ());
-}
-
-extern char *_user_strerror _PARAMS ((int));
-
-/* FIXME: Why is strerror() a long switch and not just:
-	return sys_errlist[errnum];
-	(or moral equivalent).
-	Some entries in sys_errlist[] don't match the corresponding
-	entries in strerror().  This seems odd.
-*/
-
-/* CYGWIN internal */
-/* strerror: convert from errno values to error strings */
-extern "C" char *
-strerror (int errnum)
-{
-  const char *error;
-  if (errnum < _sys_nerr)
-    error = _sys_errlist [errnum];
-  else
-  switch (errnum)
-    {
-    case EPERM:
-      error = "Operation not permitted";
-      break;
-    case ENOENT:
-      error = "No such file or directory";
-      break;
-    case ESRCH:
-      error = "No such process";
-      break;
-    case EINTR:
-      error = "Interrupted system call";
-      break;
-    case EIO:
-      error = "I/O error";
-      break;
-    case ENXIO:
-      error = "No such device or address";
-      break;
-    case E2BIG:
-      error = "Arg list too long";
-      break;
-    case ENOEXEC:
-      error = "Exec format error";
-      break;
-    case EBADF:
-      error = "Bad file descriptor";
-      break;
-    case ECHILD:
-      error = "No children";
-      break;
-    case EAGAIN:
-      error = "Resource temporarily unavailable";
-      break;
-    case ENOMEM:
-      error = "Not enough memory";
-      break;
-    case EACCES:
-      error = "Permission denied";
-      break;
-    case EFAULT:
-      error = "Bad address";
-      break;
-    case ENOTBLK:
-      error = "Block device required";
-      break;
-    case EBUSY:
-      error = "Device or resource busy";
-      break;
-    case EEXIST:
-      error = "File exists";
-      break;
-    case EXDEV:
-      error = "Cross-device link";
-      break;
-    case ENODEV:
-      error = "No such device";
-      break;
-    case ENOTDIR:
-      error = "Not a directory";
-      break;
-    case EISDIR:
-      error = "Is a directory";
-      break;
-    case EINVAL:
-      error = "Invalid argument";
-      break;
-    case ENFILE:
-      error = "Too many open files in system";
-      break;
-    case EMFILE:
-      error = "Too many open files";
-      break;
-    case ENOTTY:
-      error = "Not a character device";
-      break;
-    case ETXTBSY:
-      error = "Text file busy";
-      break;
-    case EFBIG:
-      error = "File too large";
-      break;
-    case ENOSPC:
-      error = "No space left on device";
-      break;
-    case ESPIPE:
-      error = "Illegal seek";
-      break;
-    case EROFS:
-      error = "Read-only file system";
-      break;
-    case EMLINK:
-      error = "Too many links";
-      break;
-    case EPIPE:
-      error = "Broken pipe";
-      break;
-    case EDOM:
-      error = "Math arg out of domain of func";
-      break;
-    case ERANGE:
-      error = "Math result out of range";
-      break;
-    case ENOMSG:
-      error = "No message of desired type";
-      break;
-    case EIDRM:
-      error = "Identifier removed";
-      break;
-    case ECHRNG:
-      error = "Channel number out of range";
-      break;
-    case EL2NSYNC:
-      error = "Level 2 not synchronized";
-      break;
-    case EL3HLT:
-      error = "Level 3 halted";
-      break;
-    case EL3RST:
-      error = "Level 3 reset";
-      break;
-    case ELNRNG:
-      error = "Link number out of range";
-      break;
-    case EUNATCH:
-      error = "Protocol driver not attached";
-      break;
-    case ENOCSI:
-      error = "No CSI structure available";
-      break;
-    case EL2HLT:
-      error = "Level 2 halted";
-      break;
-    case EDEADLK:
-      error = "Deadlock condition";
-      break;
-    case ENOLCK:
-      error = "No lock";
-      break;
-    case EBADE:
-      error = "Invalid exchange";
-      break;
-    case EBADR:
-      error = "Invalid request descriptor";
-      break;
-    case EXFULL:
-      error = "Exchange full";
-      break;
-    case ENOANO:
-      error = "No anode";
-      break;
-    case EBADRQC:
-      error = "Invalid request code";
-      break;
-    case EBADSLT:
-      error = "Invalid slot";
-      break;
-    case EDEADLOCK:
-      error = "File locking deadlock error";
-      break;
-    case EBFONT:
-      error = "Bad font file fmt";
-      break;
-    case ENOSTR:
-      error = "Not a stream";
-      break;
-    case ENODATA:
-      error = "No data (for no delay io)";
-      break;
-    case ETIME:
-      error = "Stream ioctl timeout";
-      break;
-    case ENOSR:
-      error = "No stream resources";
-      break;
-    case ENONET:
-      error = "Machine is not on the network";
-      break;
-    case ENOPKG:
-      error = "No package";
-      break;
-    case EREMOTE:
-      error = "Resource is remote";
-      break;
-    case ENOLINK:
-      error = "Virtual circuit is gone";
-      break;
-    case EADV:
-      error = "Advertise error";
-      break;
-    case ESRMNT:
-      error = "Srmount error";
-      break;
-    case ECOMM:
-      error = "Communication error";
-      break;
-    case EPROTO:
-      error = "Protocol error";
-      break;
-    case EMULTIHOP:
-      error = "Multihop attempted";
-      break;
-    case ELBIN:
-      error = "Inode is remote (not really error)";
-      break;
-    case EDOTDOT:
-      error = "Cross mount point (not really error)";
-      break;
-    case EBADMSG:
-      error = "Bad message";
-      break;
-    case ENOTUNIQ:
-      error = "Given log. name not unique";
-      break;
-    case EBADFD:
-      error = "f.d. invalid for this operation";
-      break;
-    case EREMCHG:
-      error = "Remote address changed";
-      break;
-    case ELIBACC:
-      error = "Cannot access a needed shared library";
-      break;
-    case ELIBBAD:
-      error = "Accessing a corrupted shared library";
-      break;
-    case ELIBSCN:
-      error = ".lib section in a.out corrupted";
-      break;
-    case ELIBMAX:
-      error = "Attempting to link in more shared libraries than system limit";
-      break;
-    case ELIBEXEC:
-      error = "Cannot exec a shared library directly";
-      break;
-    case ENOSYS:
-      error = "Function not implemented";
-      break;
-    case ENMFILE:
-      error = "No more files";
-      break;
-    case ENOTEMPTY:
-      error = "Directory not empty";
-      break;
-    case ENAMETOOLONG:
-      error = "File or path name too long";
-      break;
-    case ELOOP:
-      error = "Too many symbolic links";
-      break;
-    case EOPNOTSUPP:
-      error = "Operation not supported on transport endpoint";
-      break;
-    case EPFNOSUPPORT:
-      error = "Protocol family not supported";
-      break;
-    case ECONNRESET:
-      error = "Connection reset by peer";
-      break;
-    case ENOBUFS:
-      error = "No buffer space available; the socket cannot be connected";
-      break;
-    case EAFNOSUPPORT:
-      error = "Addresses in the specified family cannot be used with this socket";
-      break;
-    case EPROTOTYPE:
-      error = "errno EPROTOTYPE triggered";
-      break;
-    case ENOTSOCK:
-      error = "The descriptor is a file, not a socket";
-      break;
-    case ENOPROTOOPT:
-      error = "This option is unsupported";
-      break;
-    case ESHUTDOWN:
-      error = "errno ESHUTDOWN triggered";
-      break;
-    case ECONNREFUSED:
-      error = "Connection refused";
-      break;
-    case EADDRINUSE:
-      error = "Address already in use";
-      break;
-    case ECONNABORTED:
-      error = "The connection was aborted";
-      break;
-    case ENETUNREACH:
-      error ="The network can't be reached from this host at this time";
-      break;
-    case ENETDOWN:
-      error = "Network failed.";
-      break;
-    case ETIMEDOUT:
-      error = "Attempt to connect timed out without establishing a connection";
-      break;
-    case EHOSTDOWN:
-      error = "errno EHOSTDOWN triggered";
-      break;
-    case EHOSTUNREACH:
-      error = "errno EHOSTUNREACH triggered";
-      break;
-    case EINPROGRESS:
-      error = "errno EINPROGRESS triggered";
-      break;
-    case EALREADY:
-      error = "errno EALREADY triggered";
-      break;
-    case EDESTADDRREQ:
-      error = "errno EDESTADDRREQ triggered";
-      break;
-    case EMSGSIZE:
-      error = "errno EMSGSIZE triggered";
-      break;
-
-    case EPROTONOSUPPORT:
-      error = "errno EPROTONOSUPPORT triggered";
-      break;
-    case ESOCKTNOSUPPORT:
-      error = "errno ESOCKTNOSUPPORT triggered";
-      break;
-    case EADDRNOTAVAIL:
-      error = "errno EADDRNOTAVAIL triggered";
-      break;
-    case ENETRESET:
-      error = "errno ENETRESET triggered";
-      break;
-    case EISCONN:
-      error = "The socket is already connected";
-      break;
-    case ENOTCONN:
-      error = "The socket is not connected";
-      break;
-    case ETOOMANYREFS:
-      error = "errno ETOOMANYREFS triggered";
-      break;
-    case EPROCLIM:
-      error = "errno EPROCLIM triggered";
-      break;
-    case EUSERS:
-      error = "errno EUSERS triggered";
-      break;
-    case EDQUOT:
-      error = "errno EDQUOT triggered";
-      break;
-    case ESTALE:
-      error = "errno ESTALE triggered";
-      break;
-    case ENOTSUP:
-      error = "errno ENOTSUP triggered";
-      break;
-    case ENOMEDIUM:
-      error = "no medium";
-      break;
-    case ENOSHARE:
-      error = "No such host or network path";
-      break;
-    case ECASECLASH:
-      error = "Filename exists with different case";
-      break;
-    case EILSEQ:
-      error = "Illegal byte sequence";
-      break;
-    case EOVERFLOW:
-      error = "Value too large for defined data type";
-      break;
-    default:
-#ifdef _MT_SAFE
-      char *buf= _reent_winsup ()->_strerror_buf;
-#else
-      static NO_COPY char buf[20];
-#endif
-      __small_sprintf (buf, "error %d", errnum);
-      error = buf;
-      break;
-    }
-
-  /* FIXME: strerror should really be const in the appropriate newlib
-     include files. */
-  return (char *) error;
-}
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
deleted file mode 100644
index ffa6d4d3b..000000000
--- a/winsup/cygwin/exceptions.cc
+++ /dev/null
@@ -1,1237 +0,0 @@
-/* exceptions.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <imagehlp.h>
-#include <stdlib.h>
-#include <setjmp.h>
-#include <assert.h>
-
-#include "exceptions.h"
-#include "sync.h"
-#include "pinfo.h"
-#include "cygtls.h"
-#include "sigproc.h"
-#include "cygerrno.h"
-#define NEED_VFORK
-#include "perthread.h"
-#include "shared_info.h"
-#include "perprocess.h"
-#include "security.h"
-#include "cygthread.h"
-
-#define CALL_HANDLER_RETRY 20
-
-char debugger_command[2 * CYG_MAX_PATH + 20];
-
-extern "C" {
-static int handle_exceptions (EXCEPTION_RECORD *, void *, CONTEXT *, void *);
-extern void sigdelayed ();
-};
-
-_threadinfo NO_COPY dummy_thread;
-_threadinfo NO_COPY *_last_thread = &dummy_thread;
-
-CRITICAL_SECTION NO_COPY _threadinfo::protect_linked_list;
-
-extern DWORD sigtid;
-
-extern HANDLE hExeced;
-extern DWORD dwExeced;
-
-static BOOL WINAPI ctrl_c_handler (DWORD);
-static void signal_exit (int) __attribute__ ((noreturn));
-static char windows_system_directory[1024];
-static size_t windows_system_directory_length;
-
-/* This is set to indicate that we have already exited.  */
-
-static NO_COPY int exit_already = 0;
-static NO_COPY muto *mask_sync = NULL;
-
-NO_COPY static struct
-{
-  unsigned int code;
-  const char *name;
-} status_info[] =
-{
-#define X(s) s, #s
-  { X (STATUS_ABANDONED_WAIT_0) },
-  { X (STATUS_ACCESS_VIOLATION) },
-  { X (STATUS_ARRAY_BOUNDS_EXCEEDED) },
-  { X (STATUS_BREAKPOINT) },
-  { X (STATUS_CONTROL_C_EXIT) },
-  { X (STATUS_DATATYPE_MISALIGNMENT) },
-  { X (STATUS_FLOAT_DENORMAL_OPERAND) },
-  { X (STATUS_FLOAT_DIVIDE_BY_ZERO) },
-  { X (STATUS_FLOAT_INEXACT_RESULT) },
-  { X (STATUS_FLOAT_INVALID_OPERATION) },
-  { X (STATUS_FLOAT_OVERFLOW) },
-  { X (STATUS_FLOAT_STACK_CHECK) },
-  { X (STATUS_FLOAT_UNDERFLOW) },
-  { X (STATUS_GUARD_PAGE_VIOLATION) },
-  { X (STATUS_ILLEGAL_INSTRUCTION) },
-  { X (STATUS_INTEGER_DIVIDE_BY_ZERO) },
-  { X (STATUS_INTEGER_OVERFLOW) },
-  { X (STATUS_INVALID_DISPOSITION) },
-  { X (STATUS_IN_PAGE_ERROR) },
-  { X (STATUS_NONCONTINUABLE_EXCEPTION) },
-  { X (STATUS_NO_MEMORY) },
-  { X (STATUS_PENDING) },
-  { X (STATUS_PRIVILEGED_INSTRUCTION) },
-  { X (STATUS_SINGLE_STEP) },
-  { X (STATUS_STACK_OVERFLOW) },
-  { X (STATUS_TIMEOUT) },
-  { X (STATUS_USER_APC) },
-  { X (STATUS_WAIT_0) },
-  { 0, 0 }
-#undef X
-};
-
-/* Initialization code.  */
-
-// Set up the exception handler for the current thread.  The PowerPC & Mips
-// use compiler generated tables to set up the exception handlers for each
-// region of code, and the kernel walks the call list until it finds a region
-// of code that handles exceptions.  The x86 on the other hand uses segment
-// register fs, offset 0 to point to the current exception handler.
-
-asm (".equ __except_list,0");
-
-extern exception_list *_except_list asm ("%fs:__except_list");
-
-static void
-init_exception_handler (exception_list *el)
-{
-  el->handler = handle_exceptions;
-  el->prev = _except_list;
-  _except_list = el;
-}
-
-void
-init_console_handler ()
-{
-  (void) SetConsoleCtrlHandler (ctrl_c_handler, FALSE);
-  if (!SetConsoleCtrlHandler (ctrl_c_handler, TRUE))
-    system_printf ("SetConsoleCtrlHandler failed, %E");
-}
-
-extern "C" void
-init_exceptions (exception_list *el)
-{
-  init_exception_handler (el);
-}
-
-void
-_threadinfo::set_state (bool is_exception)
-{
-  initialized = CYGTLS_INITIALIZED + is_exception;
-}
-
-void
-_threadinfo::reset_exception ()
-{
-  if (initialized == CYGTLS_EXCEPTION)
-    {
-#ifdef DEBUGGING
-      debug_printf ("resetting stack after an exception stack %p, stackptr %p", stack, stackptr);
-#endif
-      set_state (false);
-      stackptr--;
-    }
-}
-
-void
-_threadinfo::call (DWORD (*func) (void *, void *), void *arg)
-{
-  char buf[CYGTLS_PADSIZE];
-  _my_tls.call2 (func, arg, buf);
-}
-
-void
-_threadinfo::call2 (DWORD (*func) (void *, void *), void *arg, void *buf)
-{
-  init_thread (buf);
-  ExitThread (func (arg, buf));
-}
-
-void
-_threadinfo::init ()
-{
-  InitializeCriticalSection (&protect_linked_list);
-}
-
-void
-_threadinfo::init_thread (void *x)
-{
-  if (x)
-    {
-      memset (this, 0, sizeof (*this));
-      stackptr = stack;
-    }
-
-  EnterCriticalSection (&protect_linked_list);
-  prev = _last_thread;
-  _last_thread->next = this;
-  _last_thread = this;
-  LeaveCriticalSection (&protect_linked_list);
-
-  set_state (false);
-  errno_addr = &errno;
-}
-
-void
-_threadinfo::remove ()
-{
-  EnterCriticalSection (&protect_linked_list);
-  if (prev)
-    {
-      prev->next = next;
-      if (next)
-	next->prev = prev;
-      if (this == _last_thread)
-	_last_thread = prev;
-      prev = next = NULL;
-    }
-  LeaveCriticalSection (&protect_linked_list);
-}
-
-void
-_threadinfo::push (__stack_t addr, bool exception)
-{
-  *stackptr++ = (__stack_t) addr;
-  set_state (exception);
-}
-
-__stack_t
-_threadinfo::pop ()
-{
-#ifdef DEBUGGING
-  assert (stackptr > stack);
-#endif
-  __stack_t res = *--stackptr;
-#ifdef DEBUGGING
-  *stackptr = 0;
-  debug_printf ("popped %p, stack %p, stackptr %p", res, stack, stackptr);
-#endif
-  return res;
-}
-
-extern "C" void
-error_start_init (const char *buf)
-{
-  if (!buf || !*buf)
-    {
-      debugger_command[0] = '\0';
-      return;
-    }
-
-  char pgm[CYG_MAX_PATH + 1];
-  if (!GetModuleFileName (NULL, pgm, CYG_MAX_PATH))
-    strcpy (pgm, "cygwin1.dll");
-  for (char *p = strchr (pgm, '\\'); p; p = strchr (p, '\\'))
-    *p = '/';
-
-  __small_sprintf (debugger_command, "%s \"%s\"", buf, pgm);
-}
-
-static void
-open_stackdumpfile ()
-{
-  if (myself->progname[0])
-    {
-      const char *p;
-      /* write to progname.stackdump if possible */
-      if (!myself->progname[0])
-	p = "unknown";
-      else if ((p = strrchr (myself->progname, '\\')))
-	p++;
-      else
-	p = myself->progname;
-      char corefile[strlen (p) + sizeof (".stackdump")];
-      __small_sprintf (corefile, "%s.stackdump", p);
-      HANDLE h = CreateFile (corefile, GENERIC_WRITE, 0, &sec_none_nih,
-			     CREATE_ALWAYS, 0, 0);
-      if (h != INVALID_HANDLE_VALUE)
-	{
-	  if (!myself->ppid_handle)
-	    system_printf ("Dumping stack trace to %s", corefile);
-	  else
-	    debug_printf ("Dumping stack trace to %s", corefile);
-	  SetStdHandle (STD_ERROR_HANDLE, h);
-	}
-    }
-}
-
-/* Utilities for dumping the stack, etc.  */
-
-static void
-exception (EXCEPTION_RECORD *e,  CONTEXT *in)
-{
-  const char *exception_name = NULL;
-
-  if (e)
-    {
-      for (int i = 0; status_info[i].name; i++)
-	{
-	  if (status_info[i].code == e->ExceptionCode)
-	    {
-	      exception_name = status_info[i].name;
-	      break;
-	    }
-	}
-    }
-
-#ifdef __i386__
-#define HAVE_STATUS
-  if (exception_name)
-    small_printf ("Exception: %s at eip=%08x\r\n", exception_name, in->Eip);
-  else
-    small_printf ("Exception %d at eip=%08x\r\n", e->ExceptionCode, in->Eip);
-  small_printf ("eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x\r\n",
-	      in->Eax, in->Ebx, in->Ecx, in->Edx, in->Esi, in->Edi);
-  small_printf ("ebp=%08x esp=%08x program=%s\r\n",
-	      in->Ebp, in->Esp, myself->progname);
-  small_printf ("cs=%04x ds=%04x es=%04x fs=%04x gs=%04x ss=%04x\r\n",
-	      in->SegCs, in->SegDs, in->SegEs, in->SegFs, in->SegGs, in->SegSs);
-#endif
-
-#ifndef HAVE_STATUS
-  system_printf ("Had an exception");
-#endif
-}
-
-#ifdef __i386__
-/* Print a stack backtrace. */
-
-#define HAVE_STACK_TRACE
-
-/* A class for manipulating the stack. */
-class stack_info
-{
-  int walk ();			/* Uses the "old" method */
-  char *next_offset () {return *((char **) sf.AddrFrame.Offset);}
-  bool needargs;
-  DWORD dummy_frame;
-public:
-  STACKFRAME sf;		 /* For storing the stack information */
-  void init (DWORD, bool, bool); /* Called the first time that stack info is needed */
-
-  /* Postfix ++ iterates over the stack, returning zero when nothing is left. */
-  int operator ++(int) { return walk (); }
-};
-
-/* The number of parameters used in STACKFRAME */
-#define NPARAMS (sizeof (thestack.sf.Params) / sizeof (thestack.sf.Params[0]))
-
-/* This is the main stack frame info for this process. */
-static NO_COPY stack_info thestack;
-
-/* Initialize everything needed to start iterating. */
-void
-stack_info::init (DWORD ebp, bool wantargs, bool goodframe)
-{
-# define debp ((DWORD *) ebp)
-  memset (&sf, 0, sizeof (sf));
-  if (!goodframe)
-    sf.AddrFrame.Offset = ebp;
-  else
-    {
-      dummy_frame = ebp;
-      sf.AddrFrame.Offset = (DWORD) &dummy_frame;
-    }
-  sf.AddrReturn.Offset = debp[1];
-  sf.AddrFrame.Mode = AddrModeFlat;
-  needargs = wantargs;
-# undef debp
-}
-
-/* Walk the stack by looking at successive stored 'bp' frames.
-   This is not foolproof. */
-int
-stack_info::walk ()
-{
-  char **ebp;
-  if ((ebp = (char **) next_offset ()) == NULL)
-    return 0;
-
-  sf.AddrFrame.Offset = (DWORD) ebp;
-  sf.AddrPC.Offset = sf.AddrReturn.Offset;
-
-  if (!sf.AddrPC.Offset)
-    return 0;		/* stack frames are exhausted */
-
-  /* The return address always follows the stack pointer */
-  sf.AddrReturn.Offset = (DWORD) *++ebp;
-
-  if (needargs)
-    /* The arguments follow the return address */
-    for (unsigned i = 0; i < NPARAMS; i++)
-      sf.Params[i] = (DWORD) *++ebp;
-
-  return 1;
-}
-
-static void
-stackdump (DWORD ebp, int open_file, bool isexception)
-{
-  extern unsigned long rlim_core;
-
-  if (rlim_core == 0UL)
-    return;
-
-  if (open_file)
-    open_stackdumpfile ();
-
-  int i;
-
-  thestack.init (ebp, 1, !isexception);	/* Initialize from the input CONTEXT */
-  small_printf ("Stack trace:\r\nFrame     Function  Args\r\n");
-  for (i = 0; i < 16 && thestack++; i++)
-    {
-      small_printf ("%08x  %08x ", thestack.sf.AddrFrame.Offset,
-		    thestack.sf.AddrPC.Offset);
-      for (unsigned j = 0; j < NPARAMS; j++)
-	small_printf ("%s%08x", j == 0 ? " (" : ", ", thestack.sf.Params[j]);
-      small_printf (")\r\n");
-    }
-  small_printf ("End of stack trace%s",
-	      i == 16 ? " (more stack frames may be present)" : "");
-}
-
-/* Temporary (?) function for external callers to get a stack dump */
-extern "C" void
-cygwin_stackdump ()
-{
-  CONTEXT c;
-  c.ContextFlags = CONTEXT_FULL;
-  GetThreadContext (GetCurrentThread (), &c);
-  stackdump (c.Ebp, 0, 0);
-}
-
-#define TIME_TO_WAIT_FOR_DEBUGGER 10000
-
-extern "C" int
-try_to_debug (bool waitloop)
-{
-  debug_printf ("debugger_command '%s'", debugger_command);
-  if (*debugger_command == '\0' || being_debugged ())
-    return 0;
-
-  __small_sprintf (strchr (debugger_command, '\0'), " %u", GetCurrentProcessId ());
-
-  LONG prio = GetThreadPriority (GetCurrentThread ());
-  SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_HIGHEST);
-  PROCESS_INFORMATION pi = {NULL, 0, 0, 0};
-
-  STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL};
-  si.lpReserved = NULL;
-  si.lpDesktop = NULL;
-  si.dwFlags = 0;
-  si.cb = sizeof (si);
-
-  /* FIXME: need to know handles of all running threads to
-     suspend_all_threads_except (current_thread_id);
-  */
-
-  /* if any of these mutexes is owned, we will fail to start any cygwin app
-     until trapped app exits */
-
-  ReleaseMutex (title_mutex);
-
-  /* prevent recursive exception handling */
-  char* rawenv = GetEnvironmentStrings () ;
-  for (char* p = rawenv; *p != '\0'; p = strchr (p, '\0') + 1)
-    {
-      if (strncmp (p, "CYGWIN=", sizeof ("CYGWIN=") - 1) == 0)
-	{
-	  char* q = strstr (p, "error_start") ;
-	  /* replace 'error_start=...' with '_rror_start=...' */
-	  if (q) *q = '_' ;
-	  SetEnvironmentVariable ("CYGWIN", p + sizeof ("CYGWIN=")) ;
-	  break ;
-	}
-    }
-
-  BOOL dbg;
-  dbg = CreateProcess (NULL,
-		       debugger_command,
-		       NULL,
-		       NULL,
-		       FALSE,
-		       CREATE_NEW_CONSOLE | CREATE_NEW_PROCESS_GROUP,
-		       NULL,
-		       NULL,
-		       &si,
-		       &pi);
-
-  if (!dbg)
-    system_printf ("Failed to start debugger: %E");
-  else
-    {
-      if (!waitloop)
-	return 1;
-      SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_IDLE);
-      while (!being_debugged ())
-	Sleep (0);
-      Sleep (2000);
-      small_printf ("*** continuing from debugger call\n");
-    }
-
-  SetThreadPriority (GetCurrentThread (), prio);
-  return 0;
-}
-
-/* Main exception handler. */
-
-extern "C" DWORD __stdcall RtlUnwind (void *, void *, void *, DWORD);
-static int
-handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *)
-{
-  static bool NO_COPY debugging = false;
-  static int NO_COPY recursed = 0;
-
-  if (debugging && ++debugging < 500000)
-    {
-      SetThreadPriority (hMainThread, THREAD_PRIORITY_NORMAL);
-      return 0;
-    }
-
-  /* If we've already exited, don't do anything here.  Returning 1
-     tells Windows to keep looking for an exception handler.  */
-  if (exit_already)
-    return 1;
-
-  EXCEPTION_RECORD e = *e0;
-  CONTEXT in = *in0;
-
-  extern DWORD ret_here[];
-  RtlUnwind (frame, ret_here, e0, 0);
-  __asm__ volatile (".equ _ret_here,.");
-
-  int sig;
-  /* Coerce win32 value to posix value.  */
-  switch (e.ExceptionCode)
-    {
-    case STATUS_FLOAT_DENORMAL_OPERAND:
-    case STATUS_FLOAT_DIVIDE_BY_ZERO:
-    case STATUS_FLOAT_INEXACT_RESULT:
-    case STATUS_FLOAT_INVALID_OPERATION:
-    case STATUS_FLOAT_OVERFLOW:
-    case STATUS_FLOAT_STACK_CHECK:
-    case STATUS_FLOAT_UNDERFLOW:
-    case STATUS_INTEGER_DIVIDE_BY_ZERO:
-    case STATUS_INTEGER_OVERFLOW:
-      sig = SIGFPE;
-      break;
-
-    case STATUS_ILLEGAL_INSTRUCTION:
-    case STATUS_PRIVILEGED_INSTRUCTION:
-    case STATUS_NONCONTINUABLE_EXCEPTION:
-      sig = SIGILL;
-      break;
-
-    case STATUS_TIMEOUT:
-      sig = SIGALRM;
-      break;
-
-    case STATUS_ACCESS_VIOLATION:
-    case STATUS_DATATYPE_MISALIGNMENT:
-    case STATUS_ARRAY_BOUNDS_EXCEEDED:
-    case STATUS_GUARD_PAGE_VIOLATION:
-    case STATUS_IN_PAGE_ERROR:
-    case STATUS_NO_MEMORY:
-    case STATUS_INVALID_DISPOSITION:
-    case STATUS_STACK_OVERFLOW:
-      sig = SIGSEGV;
-      break;
-
-    case STATUS_CONTROL_C_EXIT:
-      sig = SIGINT;
-      break;
-
-    case STATUS_INVALID_HANDLE:
-      /* CloseHandle will throw this exception if it is given an
-	 invalid handle.  We don't care about the exception; we just
-	 want CloseHandle to return an error.  This can be revisited
-	 if gcc ever supports Windows style structured exception
-	 handling.  */
-      return 0;
-
-    default:
-      /* If we don't recognize the exception, we have to assume that
-	 we are doing structured exception handling, and we let
-	 something else handle it.  */
-      return 1;
-    }
-
-  debug_printf ("In cygwin_except_handler exc %p at %p sp %p", e.ExceptionCode, in.Eip, in.Esp);
-  debug_printf ("In cygwin_except_handler sig = %d at %p", sig, in.Eip);
-
-  if (global_sigs[sig].sa_mask & SIGTOMASK (sig))
-    syscall_printf ("signal %d, masked %p", sig, global_sigs[sig].sa_mask);
-
-  debug_printf ("In cygwin_except_handler calling %p",
-		 global_sigs[sig].sa_handler);
-
-  DWORD *ebp = (DWORD *)in.Esp;
-  for (DWORD *bpend = (DWORD *) __builtin_frame_address (0); ebp > bpend; ebp--)
-    if (*ebp == in.SegCs && ebp[-1] == in.Eip)
-      {
-	ebp -= 2;
-	break;
-      }
-
-  if (!myself->progname[0]
-      || GetCurrentThreadId () == sigtid
-      || (void *) global_sigs[sig].sa_handler == (void *) SIG_DFL
-      || (void *) global_sigs[sig].sa_handler == (void *) SIG_IGN
-      || (void *) global_sigs[sig].sa_handler == (void *) SIG_ERR)
-    {
-      /* Print the exception to the console */
-      if (1)
-	{
-	  for (int i = 0; status_info[i].name; i++)
-	    {
-	      if (status_info[i].code == e.ExceptionCode)
-		{
-		  if (!myself->ppid_handle)
-		    system_printf ("Exception: %s", status_info[i].name);
-		  break;
-		}
-	    }
-	}
-
-      /* Another exception could happen while tracing or while exiting.
-	 Only do this once.  */
-      if (recursed++)
-	system_printf ("Error while dumping state (probably corrupted stack)");
-      else
-	{
-	  if (try_to_debug (0))
-	    {
-	      debugging = true;
-	      return 0;
-	    }
-
-	  open_stackdumpfile ();
-	  exception (&e, &in);
-	  stackdump ((DWORD) ebp, 0, 1);
-	}
-
-      signal_exit (0x80 | sig);	// Flag signal + core dump
-    }
-
-  _my_tls.push ((__stack_t) ebp, true);
-  sig_send (NULL, sig, &_my_tls);	// Signal myself
-  return 1;
-}
-#endif /* __i386__ */
-
-#ifndef HAVE_STACK_TRACE
-void
-stack (void)
-{
-  system_printf ("Stack trace not yet supported on this machine.");
-}
-#endif
-
-/* Utilities to call a user supplied exception handler.  */
-
-#define SIG_NONMASKABLE	(SIGTOMASK (SIGKILL) | SIGTOMASK (SIGSTOP))
-
-#ifdef __i386__
-#define HAVE_CALL_HANDLER
-
-/* Non-raceable sigsuspend
- * Note: This implementation is based on the Single UNIX Specification
- * man page.  This indicates that sigsuspend always returns -1 and that
- * attempts to block unblockable signals will be silently ignored.
- * This is counter to what appears to be documented in some UNIX
- * man pages, e.g. Linux.
- */
-int __stdcall
-handle_sigsuspend (sigset_t tempmask)
-{
-  sig_dispatch_pending ();
-  sigset_t oldmask = myself->getsigmask ();	// Remember for restoration
-
-  set_signal_mask (tempmask & ~SIG_NONMASKABLE);// Let signals we're
-				//  interested in through.
-  sigproc_printf ("old mask %x, new mask %x", oldmask, tempmask);
-
-  pthread_testcancel ();
-  pthread::cancelable_wait (signal_arrived, INFINITE);
-
-  set_sig_errno (EINTR);	// Per POSIX
-
-  /* A signal dispatch function will have been added to our stack and will
-     be hit eventually.  Set the old mask to be restored when the signal
-     handler returns. */
-
-  _my_tls.oldmask = oldmask;	// Will be restored by signal handler
-  return -1;
-}
-
-extern DWORD exec_exit;		// Possible exit value for exec
-
-extern "C" {
-static void
-sig_handle_tty_stop (int sig)
-{
-  /* Silently ignore attempts to suspend if there is no accomodating
-     cygwin parent to deal with this behavior. */
-  if (!myself->ppid_handle)
-    {
-      myself->process_state &= ~PID_STOPPED;
-      return;
-    }
-
-  myself->stopsig = sig;
-  /* See if we have a living parent.  If so, send it a special signal.
-     It will figure out exactly which pid has stopped by scanning
-     its list of subprocesses.  */
-  if (my_parent_is_alive ())
-    {
-      pinfo parent (myself->ppid);
-      if (ISSTATE (parent, PID_NOCLDSTOP))
-	sig_send (parent, SIGCHLD);
-    }
-  sigproc_printf ("process %d stopped by signal %d, myself->ppid_handle %p",
-		  myself->pid, sig, myself->ppid_handle);
-  if (WaitForSingleObject (sigCONT, INFINITE) != WAIT_OBJECT_0)
-    api_fatal ("WaitSingleObject failed, %E");
-  return;
-}
-}
-
-int
-interruptible (DWORD pc)
-{
-  int res;
-  MEMORY_BASIC_INFORMATION m;
-
-  memset (&m, 0, sizeof m);
-  if (!VirtualQuery ((LPCVOID) pc, &m, sizeof m))
-    sigproc_printf ("couldn't get memory info, pc %p, %E", pc);
-
-  char *checkdir = (char *) alloca (windows_system_directory_length + 4);
-  memset (checkdir, 0, sizeof (checkdir));
-
-# define h ((HMODULE) m.AllocationBase)
-  /* Apparently Windows 95 can sometimes return bogus addresses from
-     GetThreadContext.  These resolve to a strange allocation base.
-     These should *never* be treated as interruptible. */
-  if (!h || m.State != MEM_COMMIT)
-    res = 0;
-  else if (h == user_data->hmodule)
-    res = 1;
-  else if (!GetModuleFileName (h, checkdir, windows_system_directory_length + 2))
-    res = 0;
-  else
-    res = !strncasematch (windows_system_directory, checkdir,
-			  windows_system_directory_length);
-  sigproc_printf ("pc %p, h %p, interruptible %d", pc, h, res);
-# undef h
-  return res;
-}
-void __stdcall
-_threadinfo::interrupt_setup (int sig, void *handler,
-			      struct sigaction& siga, __stack_t retaddr)
-{
-  __stack_t *retaddr_in_tls = stackptr - 1;
-  push ((__stack_t) sigdelayed);
-  oldmask = myself->getsigmask ();
-  newmask = oldmask | siga.sa_mask | SIGTOMASK (sig);
-  sa_flags = siga.sa_flags;
-  func = (void (*) (int)) handler;
-  saved_errno = -1;		// Flag: no errno to save
-  if (handler == sig_handle_tty_stop)
-    {
-      myself->stopsig = 0;
-      myself->process_state |= PID_STOPPED;
-    }
-  this->sig = sig;			// Should ALWAYS be second to last setting set to avoid a race
-  *retaddr_in_tls = retaddr;
-  /* Clear any waiting threads prior to dispatching to handler function */
-  int res = SetEvent (signal_arrived);	// For an EINTR case
-  proc_subproc (PROC_CLEARWAIT, 1);
-  sigproc_printf ("armed signal_arrived %p, res %d", signal_arrived, res);
-}
-
-bool
-_threadinfo::interrupt_now (CONTEXT *ctx, int sig, void *handler,
-			    struct sigaction& siga)
-{
-  push (0);
-  interrupt_setup (sig, handler, siga, (__stack_t) ctx->Eip);
-  ctx->Eip = (DWORD) sigdelayed;
-  SetThreadContext (*this, ctx); /* Restart the thread in a new location */
-  return 1;
-}
-
-void __stdcall
-signal_fixup_after_fork ()
-{
-  if (_my_tls.sig)
-    {
-      _my_tls.sig = 0;
-      _my_tls.stackptr = _my_tls.stack + 1;	// FIXME?
-      set_signal_mask (_my_tls.oldmask);
-    }
-  sigproc_init ();
-}
-
-extern "C" void __stdcall
-set_sig_errno (int e)
-{
-  *_my_tls.errno_addr = e;
-  _my_tls.saved_errno = e;
-  // sigproc_printf ("errno %d", e);
-}
-
-static int setup_handler (int, void *, struct sigaction&, _threadinfo *tls)
-  __attribute__((regparm(3)));
-static int
-setup_handler (int sig, void *handler, struct sigaction& siga, _threadinfo *tls)
-{
-  CONTEXT cx;
-  bool interrupted = false;
-
-  if (tls->sig)
-    goto out;
-
-  for (int i = 0; i < CALL_HANDLER_RETRY; i++)
-    {
-      __stack_t retaddr;
-      __stack_t *retaddr_on_stack = tls->stackptr - 1;
-      if (retaddr_on_stack >= tls->stack
-	  && (retaddr = InterlockedExchange ((LONG *) retaddr_on_stack, 0)))
-	{
-	  if (!retaddr)
-	    continue;
-	  tls->reset_exception ();
-	  tls->interrupt_setup (sig, handler, siga, retaddr);
-	  sigproc_printf ("interrupted known cygwin routine");
-	  interrupted = true;
-	  break;
-	}
-
-      DWORD res;
-      HANDLE hth = (HANDLE) *tls;
-
-      /* Suspend the thread which will receive the signal.  But first ensure that
-	 this thread doesn't have any mutos.  (FIXME: Someday we should just grab
-	 all of the mutos rather than checking for them)
-	 For Windows 95, we also have to ensure that the addresses returned by GetThreadContext
-	 are valid.
-	 If one of these conditions is not true we loop for a fixed number of times
-	 since we don't want to stall the signal handler.  FIXME: Will this result in
-	 noticeable delays?
-	 If the thread is already suspended (which can occur when a program has called
-	 SuspendThread on itself then just queue the signal. */
-
-#ifndef DEBUGGING
-      sigproc_printf ("suspending mainthread");
-#else
-      cx.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
-      if (!GetThreadContext (hth, &cx))
-	memset (&cx, 0, sizeof cx);
-      sigproc_printf ("suspending mainthread PC %p", cx.Eip);
-#endif
-      res = SuspendThread (hth);
-      /* Just release the lock now since we hav suspended the main thread and it
-	 definitely can't be grabbing it now.  This will have to change, of course,
-	 if/when we can send signals to other than the main thread. */
-
-      /* Just set pending if thread is already suspended */
-      if (res)
-	{
-	  (void) ResumeThread (hth);
-	  break;
-	}
-
-      // FIXME - add check for reentering of DLL here
-
-      muto *m;
-      /* FIXME: Make multi-thread aware */
-      for (m = muto_start.next;  m != NULL; m = m->next)
-	if (m->unstable () || m->owner () == cygthread::main_thread_id)
-	  {
-	    sigproc_printf ("suspended thread owns a muto (%s)", m->name);
-	    goto resume_thread;
-	  }
-
-      cx.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
-      if (!GetThreadContext (hth, &cx))
-	system_printf ("couldn't get context of main thread, %E");
-      else if (interruptible (cx.Eip))
-	interrupted = tls->interrupt_now (&cx, sig, handler, siga);
-
-    resume_thread:
-      res = ResumeThread (hth);
-
-      if (interrupted)
-	break;
-      sigproc_printf ("couldn't interrupt.  trying again.");
-      low_priority_sleep (0);
-    }
-
-out:
-  sigproc_printf ("signal %d %sdelivered", sig, interrupted ? "" : "not ");
-  return interrupted;
-}
-#endif /* i386 */
-
-#ifndef HAVE_CALL_HANDLER
-#error "Need to supply machine dependent setup_handler"
-#endif
-
-/* Keyboard interrupt handler.  */
-static BOOL WINAPI
-ctrl_c_handler (DWORD type)
-{
-  static bool saw_close;
-  _my_tls.remove ();
-
-  /* Return FALSE to prevent an "End task" dialog box from appearing
-     for each Cygwin process window that's open when the computer
-     is shut down or console window is closed. */
-
-  if (type == CTRL_SHUTDOWN_EVENT)
-    {
-#if 0
-      /* Don't send a signal.  Only NT service applications and their child
-	 processes will receive this event and the services typically already
-	 handle the shutdown action when getting the SERVICE_CONTROL_SHUTDOWN
-	 control message. */
-      sig_send (NULL, SIGTERM);
-#endif
-      return FALSE;
-    }
-
-  if (myself->ctty != -1)
-    {
-      if (type == CTRL_CLOSE_EVENT)
-        {
-	  saw_close = true;
-	  sig_send (NULL, SIGHUP);
-	  return FALSE;
-	}
-      if (!saw_close && type == CTRL_LOGOFF_EVENT)
-        {
-	  /* Check if the process is actually associated with a visible
-	     window station, one which actually represents a visible desktop.
-	     If not, the CTRL_LOGOFF_EVENT doesn't concern this process. */
-	  if (has_visible_window_station ())
-	    sig_send (myself_nowait, SIGHUP);
-	  return FALSE;
-	}
-    }
-
-  /* If we are a stub and the new process has a pinfo structure, let it
-     handle this signal. */
-  if (dwExeced && pinfo (dwExeced))
-    return TRUE;
-
-  /* We're only the process group leader when we have a valid pinfo structure.
-     If we don't have one, then the parent "stub" will handle the signal. */
-  if (!pinfo (cygwin_pid (GetCurrentProcessId ())))
-    return TRUE;
-
-  tty_min *t = cygwin_shared->tty.get_tty (myself->ctty);
-  /* Ignore this if we're not the process group leader since it should be handled
-     *by* the process group leader. */
-  if (myself->ctty != -1 && t->getpgid () == myself->pid &&
-       (GetTickCount () - t->last_ctrl_c) >= MIN_CTRL_C_SLOP)
-    /* Otherwise we just send a SIGINT to the process group and return TRUE (to indicate
-       that we have handled the signal).  At this point, type should be
-       a CTRL_C_EVENT or CTRL_BREAK_EVENT. */
-    {
-      t->last_ctrl_c = GetTickCount ();
-      kill (-myself->pid, SIGINT);
-      t->last_ctrl_c = GetTickCount ();
-      return TRUE;
-    }
-
-  return TRUE;
-}
-
-/* Function used by low level sig wrappers. */
-extern "C" void __stdcall
-set_process_mask (sigset_t newmask)
-{
-  set_signal_mask (newmask);
-}
-
-/* Set the signal mask for this process.
-   Note that some signals are unmaskable, as in UNIX.  */
-extern "C" void __stdcall
-set_signal_mask (sigset_t newmask, sigset_t& oldmask)
-{
-  mask_sync->acquire (INFINITE);
-  newmask &= ~SIG_NONMASKABLE;
-  sigproc_printf ("old mask %p, new mask %p", oldmask, newmask);
-  myself->setsigmask (newmask);	// Set a new mask
-  mask_sync->release ();
-  if (oldmask & ~newmask)
-    sig_dispatch_pending ();
-  else
-    sigproc_printf ("not calling sig_dispatch_pending");
-  return;
-}
-
-_threadinfo *
-_threadinfo::find_tls (int sig)
-{
-  EnterCriticalSection (&protect_linked_list);
-  for (_threadinfo *t = _last_thread; t ; t = t->prev)
-    if (sigismember (&t->sigwait_mask, sig))
-      return t;
-  LeaveCriticalSection (&protect_linked_list);
-  return NULL;
-}
-
-int __stdcall
-sig_handle (int sig, sigset_t mask, int pid, _threadinfo *tls)
-{
-  if (sig == SIGCONT)
-    {
-      DWORD stopped = myself->process_state & PID_STOPPED;
-      myself->stopsig = 0;
-      myself->process_state &= ~PID_STOPPED;
-      /* Clear pending stop signals */
-      sig_clear (SIGSTOP);
-      sig_clear (SIGTSTP);
-      sig_clear (SIGTTIN);
-      sig_clear (SIGTTOU);
-      if (stopped)
-	SetEvent (sigCONT);
-    }
-
-  int rc = 1;
-  bool insigwait_mask = tls ? sigismember (&tls->sigwait_mask, sig) : false;
-  if (sig != SIGKILL && sig != SIGSTOP
-      && (sigismember (&mask, sig)
-	  || (tls
-	      && (insigwait_mask || sigismember (&tls->sigmask, sig)))
-	  || main_vfork->pid
-	  || ISSTATE (myself, PID_STOPPED)))
-    {
-      sigproc_printf ("signal %d blocked", sig);
-      if (insigwait_mask || (tls = _threadinfo::find_tls (sig)) != NULL)
-	goto thread_specific;
-      rc = -1;
-      goto done;
-    }
-
-  /* Clear pending SIGCONT on stop signals */
-  if (sig == SIGSTOP || sig == SIGTSTP || sig == SIGTTIN || sig == SIGTTOU)
-    sig_clear (SIGCONT);
-
-  sigproc_printf ("signal %d processing", sig);
-  struct sigaction thissig = global_sigs[sig];
-  void *handler;
-  handler = (void *) thissig.sa_handler;
-
-  myself->rusage_self.ru_nsignals++;
-
-  if (sig == SIGKILL)
-    goto exit_sig;
-
-  if (sig == SIGSTOP)
-    goto stop;
-
-#if 0
-  char sigmsg[24];
-  __small_sprintf (sigmsg, "cygwin: signal %d\n", sig);
-  OutputDebugString (sigmsg);
-#endif
-
-  if (handler == (void *) SIG_DFL)
-    {
-      if (insigwait_mask)
-	goto thread_specific;
-      if (sig == SIGCHLD || sig == SIGIO || sig == SIGCONT || sig == SIGWINCH
-	  || sig == SIGURG)
-	{
-	  sigproc_printf ("default signal %d ignored", sig);
-	  goto done;
-	}
-
-      if (sig == SIGTSTP || sig == SIGTTIN || sig == SIGTTOU)
-	goto stop;
-
-      goto exit_sig;
-    }
-
-  if (handler == (void *) SIG_IGN)
-    {
-      sigproc_printf ("signal %d ignored", sig);
-      goto done;
-    }
-
-  if (handler == (void *) SIG_ERR)
-    goto exit_sig;
-
-  goto dosig;
-
-stop:
-  /* Eat multiple attempts to STOP */
-  if (ISSTATE (myself, PID_STOPPED))
-    goto done;
-  handler = (void *) sig_handle_tty_stop;
-  thissig = global_sigs[SIGSTOP];
-
-dosig:
-  /* Dispatch to the appropriate function. */
-  sigproc_printf ("signal %d, about to call %p", sig, handler);
-  rc = setup_handler (sig, handler, thissig, tls ?: _main_tls);
-
-done:
-  sigproc_printf ("returning %d", rc);
-  return rc;
-
-thread_specific:
-  tls->sig = sig;
-  sigproc_printf ("releasing sigwait for thread");
-  SetEvent (tls->event);
-  goto done;
-
-exit_sig:
-  if (sig == SIGQUIT || sig == SIGABRT)
-    {
-      CONTEXT c;
-      c.ContextFlags = CONTEXT_FULL;
-      GetThreadContext (hMainThread, &c);
-      if (!try_to_debug ())
-	stackdump (c.Ebp, 1, 1);
-      sig |= 0x80;
-    }
-  sigproc_printf ("signal %d, about to call do_exit", sig);
-  signal_exit (sig);
-  /* Never returns */
-}
-
-CRITICAL_SECTION NO_COPY exit_lock;
-
-/* Cover function to `do_exit' to handle exiting even in presence of more
-   exceptions.  We used to call exit, but a SIGSEGV shouldn't cause atexit
-   routines to run.  */
-static void
-signal_exit (int rc)
-{
-  EnterCriticalSection (&exit_lock);
-  rc = EXIT_SIGNAL | (rc << 8);
-  if (exit_already++)
-    myself->exit (rc);
-
-  /* We'd like to stop the main thread from executing but when we do that it
-     causes random, inexplicable hangs.  So, instead, we set up the priority
-     of this thread really high so that it should do its thing and then exit. */
-  (void) SetThreadPriority (hMainThread, THREAD_PRIORITY_IDLE);
-  (void) SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_TIME_CRITICAL);
-
-  /* Unlock any main thread mutos since we're executing with prejudice. */
-  muto *m;
-  for (m = muto_start.next;  m != NULL; m = m->next)
-    if (m->unstable () || m->owner () == cygthread::main_thread_id)
-      m->reset ();
-
-  user_data->resourcelocks->Delete ();
-  user_data->resourcelocks->Init ();
-
-  if (hExeced)
-    {
-      sigproc_printf ("terminating captive process");
-      TerminateProcess (hExeced, rc);
-    }
-
-  sigproc_printf ("about to call do_exit (%x)", rc);
-  (void) SetEvent (signal_arrived);
-  do_exit (rc);
-}
-
-HANDLE NO_COPY title_mutex = NULL;
-
-void
-events_init (void)
-{
-  char *name;
-  char mutex_name[CYG_MAX_PATH];
-  /* title_mutex protects modification of console title. It's necessary
-     while finding console window handle */
-
-  if (!(title_mutex = CreateMutex (&sec_all_nih, FALSE,
-				   name = shared_name (mutex_name,
-						       "title_mutex", 0))))
-    api_fatal ("can't create title mutex '%s', %E", name);
-
-  ProtectHandle (title_mutex);
-  new_muto (mask_sync);
-  windows_system_directory[0] = '\0';
-  (void) GetSystemDirectory (windows_system_directory, sizeof (windows_system_directory) - 2);
-  char *end = strchr (windows_system_directory, '\0');
-  if (end == windows_system_directory)
-    api_fatal ("can't find windows system directory");
-  if (end[-1] != '\\')
-    {
-      *end++ = '\\';
-      *end = '\0';
-    }
-  windows_system_directory_length = end - windows_system_directory;
-  debug_printf ("windows_system_directory '%s', windows_system_directory_length %d",
-		windows_system_directory, windows_system_directory_length);
-  InitializeCriticalSection (&exit_lock);
-}
-
-void
-events_terminate (void)
-{
-  exit_already = 1;
-}
-
-extern "C" {
-int __stdcall
-call_signal_handler_now ()
-{
-  int sa_flags = 0;
-  while (_my_tls.sig && _my_tls.stackptr > _my_tls.stack)
-    {
-      sa_flags = _my_tls.sa_flags;
-      int sig = _my_tls.sig;
-      void (*sigfunc) (int) = _my_tls.func;
-      (void) _my_tls.pop ();
-#ifdef DEBUGGING
-      if (_my_tls.stackptr > (_my_tls.stack + 1))
-	try_to_debug ();
-#endif
-      reset_signal_arrived ();
-      sigset_t oldmask = _my_tls.oldmask;
-      int this_errno = _my_tls.saved_errno;
-      set_process_mask (_my_tls.newmask);
-      _my_tls.sig = 0;
-      sigfunc (sig);
-      set_process_mask (oldmask);
-      if (this_errno >= 0)
-	set_errno (this_errno);
-    }
-
-  return sa_flags & SA_RESTART;
-}
-
-#define pid_offset (unsigned)(((_pinfo *)NULL)->pid)
-void __stdcall
-reset_signal_arrived ()
-{
-  (void) ResetEvent (signal_arrived);
-  sigproc_printf ("reset signal_arrived");
-}
-}
diff --git a/winsup/cygwin/exec.cc b/winsup/cygwin/exec.cc
deleted file mode 100644
index d7c2ee1c2..000000000
--- a/winsup/cygwin/exec.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/* exec.cc: exec system call support.
-
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#define _execve __FOO_execve_
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <process.h>
-#include "perprocess.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "pinfo.h"
-#include "environ.h"
-#include "cygerrno.h"
-#undef _execve
-
-/* This is called _execve and not execve because the real execve is defined
-   in libc/posix/execve.c.  It calls us.  */
-
-extern "C" int
-execve (const char *path, char *const argv[], char *const envp[])
-{
-  static char *const empty_env[] = { 0 };
-  MALLOC_CHECK;
-  if (!envp)
-    envp = empty_env;
-  return spawnve (_P_OVERLAY, path, argv, envp);
-}
-
-extern "C" int _execve (const char *, char *const [], char *const [])
-  __attribute__ ((alias ("execve")));
-
-extern "C" int
-execl (const char *path, const char *arg0, ...)
-{
-  int i;
-  va_list args;
-  const char *argv[1024];
-
-  va_start (args, arg0);
-  argv[0] = arg0;
-  i = 1;
-  do
-      argv[i] = va_arg (args, const char *);
-  while (argv[i++] != NULL);
-  va_end (args);
-  MALLOC_CHECK;
-  return execve (path, (char * const  *) argv, cur_environ ());
-}
-
-extern "C" int
-execv (const char *path, char * const *argv)
-{
-  MALLOC_CHECK;
-  return execve (path, (char * const *) argv, cur_environ ());
-}
-
-extern "C" pid_t
-sexecve_is_bad ()
-{
-  set_errno (ENOSYS);
-  return 0;
-}
-
-/*
- * Copy string, until c or <nul> is encountered.
- * NUL-terminate the destination string (s1).
- * Return pointer to terminating byte in dst string.
- */
-
-char * __stdcall
-strccpy (char *s1, const char **s2, char c)
-{
-  while (**s2 && **s2 != c)
-    *s1++ = *((*s2)++);
-  *s1 = 0;
-
-  MALLOC_CHECK;
-  return s1;
-}
-
-extern "C" int
-execvp (const char *path, char * const *argv)
-{
-  path_conv buf;
-  return  execv (find_exec (path, buf), argv);
-}
-
-extern "C" int
-execvpe (const char *path, char * const *argv, char *const *envp)
-{
-  path_conv buf;
-  return  execve (find_exec (path, buf), argv, envp);
-}
diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc
deleted file mode 100644
index c209104b0..000000000
--- a/winsup/cygwin/external.cc
+++ /dev/null
@@ -1,304 +0,0 @@
-/* external.cc: Interface to Cygwin internals from external programs.
-
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Christopher Faylor <cgf@cygnus.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "security.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include <exceptions.h>
-#include "shared_info.h"
-#include "cygwin_version.h"
-#include "perprocess.h"
-#include "cygerrno.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "wincap.h"
-#include "heap.h"
-#include "cygthread.h"
-#include "pwdgrp.h"
-
-static external_pinfo *
-fillout_pinfo (pid_t pid, int winpid)
-{
-  BOOL nextpid;
-  static external_pinfo ep;
-
-  if ((nextpid = !!(pid & CW_NEXTPID)))
-    pid ^= CW_NEXTPID;
-
-  static winpids pids (0);
-
-  static unsigned int i;
-  if (!pids.npids || !nextpid)
-    {
-      pids.set (winpid);
-      i = 0;
-    }
-
-  if (!pid)
-    i = 0;
-
-  memset (&ep, 0, sizeof ep);
-  while (i < pids.npids)
-    {
-      DWORD thispid = pids.winpid (i);
-      _pinfo *p = pids[i];
-      i++;
-
-      if (!p)
-	{
-	  if (!nextpid && thispid != (DWORD) pid)
-	    continue;
-	  ep.pid = cygwin_pid (thispid);
-	  ep.dwProcessId = thispid;
-	  ep.process_state = PID_IN_USE;
-	  ep.ctty = -1;
-	  break;
-	}
-      else if (nextpid || p->pid == pid || (winpid && thispid == (DWORD) pid))
-	{
-	  ep.ctty = p->ctty;
-	  ep.pid = p->pid;
-	  ep.ppid = p->ppid;
-	  ep.hProcess = p->hProcess;
-	  ep.dwProcessId = p->dwProcessId;
-	  ep.uid = p->uid;
-	  ep.gid = p->gid;
-	  ep.pgid = p->pgid;
-	  ep.sid = p->sid;
-	  ep.umask = 0;
-	  ep.start_time = p->start_time;
-	  ep.rusage_self = p->rusage_self;
-	  ep.rusage_children = p->rusage_children;
-	  strcpy (ep.progname, p->progname);
-	  ep.strace_mask = 0;
-	  ep.version = EXTERNAL_PINFO_VERSION;
-
-	  ep.process_state = p->process_state;
-
-	  ep.uid32 = p->uid;
-	  ep.gid32 = p->gid;
-	  break;
-	}
-    }
-
-  if (!ep.pid)
-    {
-      i = 0;
-      pids.reset ();
-      return 0;
-    }
-  return &ep;
-}
-
-static DWORD
-get_cygdrive_info (char *user, char *system, char *user_flags,
-		   char *system_flags)
-{
-  int res = mount_table->get_cygdrive_info (user, system, user_flags,
-					    system_flags);
-  return (res == ERROR_SUCCESS) ? 1 : 0;
-}
-
-static DWORD
-get_cygdrive_prefixes (char *user, char *system)
-{
-  char user_flags[CYG_MAX_PATH];
-  char system_flags[CYG_MAX_PATH];
-  DWORD res = get_cygdrive_info (user, system, user_flags, system_flags);
-  return res;
-}
-
-static DWORD
-check_ntsec (const char *filename)
-{
-  if (!filename)
-    return wincap.has_security () && allow_ntsec;
-  path_conv pc (filename);
-  return wincap.has_security () && allow_ntsec && pc.has_acls ();
-}
-
-extern "C" unsigned long
-cygwin_internal (cygwin_getinfo_types t, ...)
-{
-  va_list arg;
-  va_start (arg, t);
-  if (t != CW_USER_DATA)
-    {
-      wincap.init ();
-      if (!myself)
-	{
-	  memory_init ();
-	  malloc_init ();
-	  set_myself (1);
-	}
-    }
-
-  switch (t)
-    {
-      case CW_LOCK_PINFO:
-	return 1;
-
-      case CW_UNLOCK_PINFO:
-	return 1;
-
-      case CW_GETTHREADNAME:
-	return (DWORD) cygthread::name (va_arg (arg, DWORD));
-
-      case CW_SETTHREADNAME:
-	{
-	  set_errno (ENOSYS);
-	  return 0;
-	}
-
-      case CW_GETPINFO:
-	return (DWORD) fillout_pinfo (va_arg (arg, DWORD), 0);
-
-      case CW_GETVERSIONINFO:
-	return (DWORD) cygwin_version_strings;
-
-      case CW_READ_V1_MOUNT_TABLES:
-	set_errno (ENOSYS);
-	return 1;
-
-      case CW_USER_DATA:
-	return (DWORD) &__cygwin_user_data;
-
-      case CW_PERFILE:
-	perfile_table = va_arg (arg, struct __cygwin_perfile *);
-	return 0;
-
-      case CW_GET_CYGDRIVE_PREFIXES:
-	{
-	  char *user = va_arg (arg, char *);
-	  char *system = va_arg (arg, char *);
-	  return get_cygdrive_prefixes (user, system);
-	}
-
-      case CW_GETPINFO_FULL:
-	return (DWORD) fillout_pinfo (va_arg (arg, pid_t), 1);
-
-      case CW_INIT_EXCEPTIONS:
-	init_exceptions (va_arg (arg, exception_list *));
-	return 0;
-
-      case CW_GET_CYGDRIVE_INFO:
-	{
-	  char *user = va_arg (arg, char *);
-	  char *system = va_arg (arg, char *);
-	  char *user_flags = va_arg (arg, char *);
-	  char *system_flags = va_arg (arg, char *);
-	  return get_cygdrive_info (user, system, user_flags, system_flags);
-	}
-
-      case CW_SET_CYGWIN_REGISTRY_NAME:
-	{
-	  const char *cr = va_arg (arg, char *);
-	  if (check_null_empty_str_errno (cr))
-	    return (DWORD) NULL;
-	  cygheap->cygwin_regname = (char *) crealloc (cygheap->cygwin_regname,
-						       strlen (cr) + 1);
-	  strcpy (cygheap->cygwin_regname, cr);
-	}
-      case CW_GET_CYGWIN_REGISTRY_NAME:
-	  return (DWORD) cygheap->cygwin_regname;
-
-      case CW_STRACE_TOGGLE:
-	{
-	  pid_t pid = va_arg (arg, pid_t);
-	  pinfo p (pid);
-	  if (p)
-	    {
-	      sig_send (p, __SIGSTRACE);
-	      return 0;
-	    }
-	  else
-	    {
-	      set_errno (ESRCH);
-	      return (DWORD) -1;
-	    }
-	}
-
-      case CW_STRACE_ACTIVE:
-	{
-	  return strace.active;
-	}
-
-      case CW_CYGWIN_PID_TO_WINPID:
-	{
-	  pinfo p (va_arg (arg, pid_t));
-	  return p ? p->dwProcessId : 0;
-	}
-      case CW_EXTRACT_DOMAIN_AND_USER:
-	{
-	  struct passwd *pw = va_arg (arg, struct passwd *);
-	  char *domain = va_arg (arg, char *);
-	  char *user = va_arg (arg, char *);
-	  extract_nt_dom_user (pw, domain, user);
-	  return 0;
-	}
-      case CW_CMDLINE:
-	{
-	  size_t n;
-	  pid_t pid = va_arg (arg, pid_t);
-	  pinfo p (pid);
-	  return (DWORD) p->cmdline (n);
-	}
-      case CW_CHECK_NTSEC:
-	{
-	  char *filename = va_arg (arg, char *);
-	  return check_ntsec (filename);
-	}
-      case CW_GET_ERRNO_FROM_WINERROR:
-        {
-	  int error = va_arg (arg, int);
-	  int deferrno = va_arg (arg, int);
-	  return geterrno_from_win_error (error, deferrno);
-	}
-      case CW_GET_POSIX_SECURITY_ATTRIBUTE:
-	{
-	  security_descriptor sd;
-	  int attribute = va_arg (arg, int);
-	  PSECURITY_ATTRIBUTES psa = va_arg (arg, PSECURITY_ATTRIBUTES);
-	  void *sd_buf = va_arg (arg, void *);
-	  DWORD sd_buf_size = va_arg (arg, DWORD);
-	  set_security_attribute (attribute, psa, sd);
-	  if (!psa->lpSecurityDescriptor || sd.size () > sd_buf_size)
-	    return sd.size ();
-	  memcpy (sd_buf, sd, sd.size ());
-	  psa->lpSecurityDescriptor = sd_buf;
-	  return 0;
-        }
-      case CW_GET_SHMLBA:
-        {
-	  return getshmlba ();
-	}
-      case CW_GET_UID_FROM_SID:
-        {
-	  PSID psid = va_arg (arg, PSID);
-	  cygsid sid (psid);
-	  struct passwd *pw = internal_getpwsid (sid);
-	  return pw ? pw->pw_uid : (__uid32_t)-1;
-	}
-      case CW_GET_GID_FROM_SID:
-        {
-	  PSID psid = va_arg (arg, PSID);
-	  cygsid sid (psid);
-	  struct __group32 *gr = internal_getgrsid (sid);
-	  return gr ? gr->gr_gid : (__gid32_t)-1;
-	}
-      default:
-	return (DWORD) -1;
-    }
-}
diff --git a/winsup/cygwin/external.sgml b/winsup/cygwin/external.sgml
deleted file mode 100644
index 270eede4d..000000000
--- a/winsup/cygwin/external.sgml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-<sect1 id="func-cygwin-internal">
-<title>cygwin_internal</title>
-
-<funcsynopsis>
-<funcdef>extern "C" DWORD
-<function>cygwin_internal</function></funcdef>
-<paramdef>cygwin_getinfo_types <parameter>t</parameter></paramdef>
-<paramdef><parameter>...</parameter></paramdef>
-</funcsynopsis>
-
-<para>This function gives you access to various internal data and functions.
-It takes two arguments.  The first argument is a type from the 'cygwin_getinfo_types'
-enum.  The second is an optional pointer.</para>
-<para>Stay away unless you know what you're doing.</para>
-
-</sect1>
-
diff --git a/winsup/cygwin/fcntl.cc b/winsup/cygwin/fcntl.cc
deleted file mode 100644
index d81126f52..000000000
--- a/winsup/cygwin/fcntl.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-/* fcntl.cc: fcntl syscall
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdarg.h>
-#include <unistd.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-#include "thread.h"
-
-int
-fcntl_worker (int fd, int cmd, void *arg)
-{
-  int res;
-
-  cygheap_fdget cfd (fd, true);
-  if (cfd < 0)
-    {
-      res = -1;
-      goto done;
-    }
-  if (cmd != F_DUPFD)
-    res = cfd->fcntl (cmd, arg);
-  else
-    res = dup2 (fd, cygheap_fdnew (((int) arg) - 1));
-done:
-  syscall_printf ("%d = fcntl (%d, %d, %p)", res, fd, cmd, arg);
-  return res;
-}
-
-extern "C" int
-fcntl64 (int fd, int cmd, ...)
-{
-  void *arg = NULL;
-  va_list args;
-
-  va_start (args, cmd);
-  arg = va_arg (args, void *);
-  va_end (args);
-  return fcntl_worker (fd, cmd, arg);
-}
-
-extern "C" int
-_fcntl (int fd, int cmd, ...)
-{
-  void *arg = NULL;
-  va_list args;
-  struct __flock32 *src = NULL;
-  struct __flock64 dst;
-
-  va_start (args, cmd);
-  arg = va_arg (args, void *);
-  va_end (args);
-  if (cmd == F_GETLK || cmd == F_SETLK || cmd == F_SETLKW)
-    {
-      src = (struct __flock32 *) arg;
-      dst.l_type = src->l_type;
-      dst.l_whence = src->l_whence;
-      dst.l_start = src->l_start;
-      dst.l_len = src->l_len;
-      dst.l_pid = src->l_pid;
-      arg = &dst;
-    }
-  int res = fcntl_worker (fd, cmd, arg);
-  if (cmd == F_GETLK)
-    {
-      src->l_type = dst.l_type;
-      src->l_whence = dst.l_whence;
-      src->l_start = dst.l_start;
-      src->l_len = dst.l_len;
-      src->l_pid = (short) dst.l_pid;
-    }
-  return res;
-}
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
deleted file mode 100644
index 9be543a06..000000000
--- a/winsup/cygwin/fhandler.cc
+++ /dev/null
@@ -1,1316 +0,0 @@
-/* fhandler.cc.  See console.cc for fhandler_console functions.
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/cygwin.h>
-#include <sys/uio.h>
-#include <signal.h>
-#include "cygerrno.h"
-#include "perprocess.h"
-#include "security.h"
-#include "cygwin/version.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "shared_info.h"
-#include "pinfo.h"
-#include <assert.h>
-#include <limits.h>
-#include <winioctl.h>
-
-static NO_COPY const int CHUNK_SIZE = 1024; /* Used for crlf conversions */
-
-struct __cygwin_perfile *perfile_table;
-
-DWORD binmode;
-
-inline fhandler_base&
-fhandler_base::operator =(fhandler_base& x)
-{
-  memcpy (this, &x, sizeof *this);
-  pc.set_normalized_path (x.pc.normalized_path);
-  rabuf = NULL;
-  ralen = 0;
-  raixget = 0;
-  raixput = 0;
-  rabuflen = 0;
-  return *this;
-}
-
-int
-fhandler_base::puts_readahead (const char *s, size_t len)
-{
-  int success = 1;
-  while ((*s || (len != (size_t) -1 && len--))
-	 && (success = put_readahead (*s++) > 0))
-    continue;
-  return success;
-}
-
-int
-fhandler_base::put_readahead (char value)
-{
-  char *newrabuf;
-  if (raixput < rabuflen)
-    /* Nothing to do */;
-  else if ((newrabuf = (char *) realloc (rabuf, rabuflen += 32)))
-    rabuf = newrabuf;
-  else
-    return 0;
-
-  rabuf[raixput++] = value;
-  ralen++;
-  return 1;
-}
-
-int
-fhandler_base::get_readahead ()
-{
-  int chret = -1;
-  if (raixget < ralen)
-    chret = ((unsigned char) rabuf[raixget++]) & 0xff;
-  /* FIXME - not thread safe */
-  if (raixget >= ralen)
-    raixget = raixput = ralen = 0;
-  return chret;
-}
-
-int
-fhandler_base::peek_readahead (int queryput)
-{
-  int chret = -1;
-  if (!queryput && raixget < ralen)
-    chret = ((unsigned char) rabuf[raixget]) & 0xff;
-  else if (queryput && raixput > 0)
-    chret = ((unsigned char) rabuf[raixput - 1]) & 0xff;
-  return chret;
-}
-
-void
-fhandler_base::set_readahead_valid (int val, int ch)
-{
-  if (!val)
-    ralen = raixget = raixput = 0;
-  if (ch != -1)
-    put_readahead (ch);
-}
-
-int
-fhandler_base::eat_readahead (int n)
-{
-  int oralen = ralen;
-  if (n < 0)
-    n = ralen;
-  if (n > 0 && ralen)
-    {
-      if ((int) (ralen -= n) < 0)
-	ralen = 0;
-
-      if (raixget >= ralen)
-	raixget = raixput = ralen = 0;
-      else if (raixput > ralen)
-	raixput = ralen;
-    }
-
-  return oralen;
-}
-
-int
-fhandler_base::get_readahead_into_buffer (char *buf, size_t buflen)
-{
-  int ch;
-  int copied_chars = 0;
-
-  while (buflen)
-    if ((ch = get_readahead ()) < 0)
-      break;
-    else
-      {
-	buf[copied_chars++] = (unsigned char)(ch & 0xff);
-	buflen--;
-      }
-
-  return copied_chars;
-}
-
-/* Record the file name. and name hash */
-void
-fhandler_base::set_name (path_conv &in_pc)
-{
-  memcpy (&pc, &in_pc, in_pc.size ());
-  pc.set_normalized_path (in_pc.normalized_path);
-  namehash = hash_path_name (0, get_win32_name ());
-}
-
-/* Detect if we are sitting at EOF for conditions where Windows
-   returns an error but UNIX doesn't.  */
-static int __stdcall
-is_at_eof (HANDLE h, DWORD err)
-{
-  DWORD size, upper1, curr;
-
-  size = GetFileSize (h, &upper1);
-  if (size != INVALID_FILE_SIZE || GetLastError () == NO_ERROR)
-    {
-      LONG upper2 = 0;
-      curr = SetFilePointer (h, 0, &upper2, FILE_CURRENT);
-      if (curr == size && upper1 == (DWORD) upper2)
-	return 1;
-    }
-
-  SetLastError (err);
-  return 0;
-}
-
-void
-fhandler_base::set_flags (int flags, int supplied_bin)
-{
-  int bin;
-  int fmode;
-  debug_printf ("flags %p, supplied_bin %p", flags, supplied_bin);
-  if ((bin = flags & (O_BINARY | O_TEXT)))
-    debug_printf ("O_TEXT/O_BINARY set in flags %p", bin);
-  else if (get_r_binset () && get_w_binset ())
-    bin = get_r_binary () ? O_BINARY : O_TEXT;	// FIXME: Not quite right
-  else if ((fmode = get_default_fmode (flags)) & O_BINARY)
-    bin = O_BINARY;
-  else if (fmode & O_TEXT)
-    bin = O_TEXT;
-  else if (supplied_bin)
-    bin = supplied_bin;
-  else
-    bin = get_w_binary () || get_r_binary () || (binmode != O_TEXT)
-	  ? O_BINARY : O_TEXT;
-
-  openflags = flags | bin;
-
-  bin &= O_BINARY;
-  set_r_binary (bin);
-  set_w_binary (bin);
-  syscall_printf ("filemode set to %s", bin ? "binary" : "text");
-}
-
-/* Normal file i/o handlers.  */
-
-/* Cover function to ReadFile to achieve (as much as possible) Posix style
-   semantics and use of errno.  */
-void
-fhandler_base::raw_read (void *ptr, size_t& ulen)
-{
-#define bytes_read ulen
-
-  HANDLE h = NULL;	/* grumble */
-  int prio = 0;		/* ditto */
-  DWORD len = ulen;
-
-  ulen = (size_t) -1;
-  if (read_state)
-    {
-      h = GetCurrentThread ();
-      prio = GetThreadPriority (h);
-      (void) SetThreadPriority (h, THREAD_PRIORITY_TIME_CRITICAL);
-      SetEvent (read_state);
-    }
-  BOOL res = ReadFile (get_handle (), ptr, len, (DWORD *) &ulen, 0);
-  if (read_state)
-    {
-      SetEvent (read_state);
-      (void) SetThreadPriority (h, prio);
-    }
-  if (!res)
-    {
-      /* Some errors are not really errors.  Detect such cases here.  */
-
-      DWORD  errcode = GetLastError ();
-      switch (errcode)
-	{
-	case ERROR_BROKEN_PIPE:
-	  /* This is really EOF.  */
-	  bytes_read = 0;
-	  break;
-	case ERROR_MORE_DATA:
-	  /* `bytes_read' is supposedly valid.  */
-	  break;
-	case ERROR_NOACCESS:
-	  if (is_at_eof (get_handle (), errcode))
-	    {
-	      bytes_read = 0;
-	      break;
-	    }
-	case ERROR_INVALID_FUNCTION:
-	case ERROR_INVALID_PARAMETER:
-	case ERROR_INVALID_HANDLE:
-	  if (openflags & O_DIROPEN)
-	    {
-	      set_errno (EISDIR);
-	      bytes_read = (size_t) -1;
-	      break;
-	    }
-	default:
-	  syscall_printf ("ReadFile %s failed, %E", get_name ());
-	  __seterrno_from_win_error (errcode);
-	  bytes_read = (size_t) -1;
-	  break;
-	}
-    }
-#undef bytes_read
-}
-
-/* Cover function to WriteFile to provide Posix interface and semantics
-   (as much as possible).  */
-int
-fhandler_base::raw_write (const void *ptr, size_t len)
-{
-  DWORD bytes_written;
-
-  if (!WriteFile (get_output_handle (), ptr, len, &bytes_written, 0))
-    {
-      if (GetLastError () == ERROR_DISK_FULL && bytes_written > 0)
-	return bytes_written;
-      __seterrno ();
-      if (get_errno () == EPIPE)
-	raise (SIGPIPE);
-      return -1;
-    }
-  return bytes_written;
-}
-
-#define ACCFLAGS(x) (x & (O_RDONLY | O_WRONLY | O_RDWR))
-int
-fhandler_base::get_default_fmode (int flags)
-{
-  int fmode = __fmode;
-  if (perfile_table)
-    {
-      size_t nlen = strlen (get_name ());
-      unsigned accflags = ACCFLAGS (flags);
-      for (__cygwin_perfile *pf = perfile_table; pf->name; pf++)
-	if (!*pf->name && ACCFLAGS (pf->flags) == accflags)
-	  {
-	    fmode = pf->flags & ~(O_RDONLY | O_WRONLY | O_RDWR);
-	    break;
-	  }
-	else
-	  {
-	    size_t pflen = strlen (pf->name);
-	    const char *stem = get_name () + nlen - pflen;
-	    if (pflen > nlen || (stem != get_name () && !isdirsep (stem[-1])))
-	      continue;
-	    else if (ACCFLAGS (pf->flags) == accflags && strcasematch (stem, pf->name))
-	      {
-		fmode = pf->flags & ~(O_RDONLY | O_WRONLY | O_RDWR);
-		break;
-	      }
-	  }
-    }
-  return fmode;
-}
-
-bool
-fhandler_base::device_access_denied (int flags)
-{
-  int mode = 0;
-
-  if (flags & O_RDWR)
-    mode |= R_OK | W_OK;
-  if (flags & (O_WRONLY | O_APPEND))
-    mode |= W_OK;
-  if (!mode)
-    mode |= R_OK;
-
-  return access_worker (pc, mode, this);
-}
-
-/* Open system call handler function. */
-int
-fhandler_base::open (int flags, mode_t mode)
-{
-  int res = 0;
-  HANDLE x;
-  int file_attributes;
-  int shared;
-  int creation_distribution;
-  SECURITY_ATTRIBUTES sa = sec_none;
-  security_descriptor sd;
-
-  syscall_printf ("(%s, %p) query_open %d", get_win32_name (), flags, get_query_open ());
-
-  if (get_win32_name () == NULL)
-    {
-      set_errno (ENOENT);
-      goto done;
-    }
-
-  if (get_query_open ())
-    access = 0;
-  else if (get_device () == FH_TAPE)
-    access = GENERIC_READ | GENERIC_WRITE;
-  else if ((flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_RDONLY)
-    access = GENERIC_READ;
-  else if ((flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_WRONLY)
-    access = GENERIC_WRITE;
-  else
-    access = GENERIC_READ | GENERIC_WRITE;
-
-  /* Allow reliable lseek on disk devices. */
-  if (get_device () == FH_FLOPPY)
-    access |= GENERIC_READ;
-
-  /* FIXME: O_EXCL handling?  */
-
-  if ((flags & O_TRUNC) && ((flags & O_ACCMODE) != O_RDONLY))
-    {
-      if (flags & O_CREAT)
-	creation_distribution = CREATE_ALWAYS;
-      else
-	creation_distribution = TRUNCATE_EXISTING;
-    }
-  else if (flags & O_CREAT)
-    creation_distribution = OPEN_ALWAYS;
-  else
-    creation_distribution = OPEN_EXISTING;
-
-  if ((flags & O_EXCL) && (flags & O_CREAT))
-    creation_distribution = CREATE_NEW;
-
-  if (flags & O_APPEND)
-    set_append_p ();
-
-  /* These flags are host dependent. */
-  shared = wincap.shared ();
-
-  file_attributes = FILE_ATTRIBUTE_NORMAL;
-  if (flags & O_DIROPEN)
-    file_attributes |= FILE_FLAG_BACKUP_SEMANTICS;
-  if (get_device () == FH_SERIAL)
-    file_attributes |= FILE_FLAG_OVERLAPPED;
-
-#ifdef HIDDEN_DOT_FILES
-  if (flags & O_CREAT && get_device () == FH_FS)
-    {
-      char *c = strrchr (get_win32_name (), '\\');
-      if ((c && c[1] == '.') || *get_win32_name () == '.')
-	file_attributes |= FILE_ATTRIBUTE_HIDDEN;
-    }
-#endif
-
-  /* CreateFile() with dwDesiredAccess == 0 when called on remote
-     share returns some handle, even if file doesn't exist. This code
-     works around this bug. */
-  if (get_query_open () && isremote () &&
-      creation_distribution == OPEN_EXISTING && !pc.exists ())
-    {
-      set_errno (ENOENT);
-      goto done;
-    }
-
-  /* If mode has no write bits set, we set the R/O attribute. */
-  if (!(mode & (S_IWUSR | S_IWGRP | S_IWOTH)))
-    file_attributes |= FILE_ATTRIBUTE_READONLY;
-
-  /* If the file should actually be created and ntsec is on,
-     set files attributes. */
-  if (flags & O_CREAT && get_device () == FH_FS && allow_ntsec && has_acls ())
-    set_security_attribute (mode, &sa, sd);
-
-  x = CreateFile (get_win32_name (), access, shared, &sa, creation_distribution,
-		  file_attributes, 0);
-
-  if (x == INVALID_HANDLE_VALUE)
-    {
-      if (!wincap.can_open_directories () && pc.isdir ())
-	{
-	  if (flags & (O_CREAT | O_EXCL) == (O_CREAT | O_EXCL))
-	    set_errno (EEXIST);
-	  else if (flags & (O_WRONLY | O_RDWR))
-	    set_errno (EISDIR);
-	  else
-	    set_nohandle (true);
-	}
-      else if (GetLastError () == ERROR_INVALID_HANDLE)
-       set_errno (ENOENT);
-      else
-       __seterrno ();
-      if (!get_nohandle ())
-       goto done;
-   }
-
-  syscall_printf ("%p = CreateFile (%s, %p, %p, %p, %p, %p, 0)",
-		  x, get_win32_name (), access, shared, &sa,
-		  creation_distribution, file_attributes);
-
-  set_io_handle (x);
-  set_flags (flags, pc.binmode ());
-
-  res = 1;
-  set_open_status ();
-done:
-  syscall_printf ("%d = fhandler_base::open (%s, %p)", res, get_win32_name (),
-		  flags);
-  return res;
-}
-
-/* states:
-   open buffer in binary mode?  Just do the read.
-
-   open buffer in text mode?  Scan buffer for control zs and handle
-   the first one found.  Then scan buffer, converting every \r\n into
-   an \n.  If last char is an \r, look ahead one more char, if \n then
-   modify \r, if not, remember char.
-*/
-void
-fhandler_base::read (void *in_ptr, size_t& len)
-{
-  char *ptr = (char *) in_ptr;
-  ssize_t copied_chars = 0;
-  bool need_signal = !!read_state;
-  int c;
-
-  while (len)
-    if ((c = get_readahead ()) < 0)
-      break;
-    else
-      {
-	ptr[copied_chars++] = (unsigned char) (c & 0xff);
-	len--;
-      }
-
-  if (copied_chars && is_slow ())
-    {
-      len = (size_t) copied_chars;
-      goto out;
-    }
-
-  if (!len)
-    {
-      len = (size_t) copied_chars;
-      goto out;
-    }
-
-  raw_read (ptr + copied_chars, len);
-  need_signal = false;
-  if (!copied_chars)
-    /* nothing */;
-  else if ((ssize_t) len > 0)
-    len += copied_chars;
-  else
-    len = copied_chars;
-
-  if (get_r_binary () || len <= 0)
-    goto out;
-
-  /* Scan buffer and turn \r\n into \n */
-  char *src, *dst, *end;
-  src = (char *) ptr;
-  dst = (char *) ptr;
-  end = src + len - 1;
-
-  /* Read up to the last but one char - the last char needs special handling */
-  while (src < end)
-    {
-      if (*src == '\r' && src[1] == '\n')
-	src++;
-      *dst++ = *src++;
-    }
-
-  /* If not beyond end and last char is a '\r' then read one more
-     to see if we should translate this one too */
-  if (src > end)
-    /* nothing */;
-  else if (*src != '\r')
-    *dst++ = *src;
-  else
-    {
-      char c1;
-      size_t c1len = 1;
-      raw_read (&c1, c1len);
-      if (c1len <= 0)
-	/* nothing */;
-      else if (c1 == '\n')
-	*dst++ = '\n';
-      else
-	{
-	  set_readahead_valid (1, c1);
-	  *dst++ = *src;
-	}
-    }
-
-  len = dst - (char *) ptr;
-
-#ifndef NOSTRACE
-  if (strace.active)
-    {
-      char buf[16 * 6 + 1];
-      char *p = buf;
-
-      for (int i = 0; i < copied_chars && i < 16; ++i)
-	{
-	  unsigned char c = ((unsigned char *) ptr)[i];
-	  /* >= 33 so space prints in hex */
-	  __small_sprintf (p, c >= 33 && c <= 127 ? " %c" : " %p", c);
-	  p += strlen (p);
-	}
-      debug_printf ("read %d bytes (%s%s)", copied_chars, buf,
-		    copied_chars > 16 ? " ..." : "");
-    }
-#endif
-
-out:
-  if (need_signal)
-    SetEvent (read_state);
-
-  debug_printf ("returning %d, %s mode", len,
-		get_r_binary () ? "binary" : "text");
-  return;
-}
-
-int
-fhandler_base::write (const void *ptr, size_t len)
-{
-  int res;
-
-  if (get_append_p ())
-    SetFilePointer (get_output_handle (), 0, 0, FILE_END);
-  else if (get_did_lseek ())
-    {
-      _off64_t actual_length, current_position;
-      DWORD size_high = 0;
-      LONG pos_high = 0;
-
-      set_did_lseek (0); /* don't do it again */
-
-      actual_length = GetFileSize (get_output_handle (), &size_high);
-      actual_length += ((_off64_t) size_high) << 32;
-
-      current_position = SetFilePointer (get_output_handle (), 0, &pos_high,
-					 FILE_CURRENT);
-      current_position += ((_off64_t) pos_high) << 32;
-
-      if (current_position > actual_length)
-	{
-	  if ((get_fs_flags (FILE_SUPPORTS_SPARSE_FILES))
-	      && current_position >= actual_length + (128 * 1024))
-	    {
-	      /* If the file systemn supports sparse files and the application
-	         is writing after a long seek beyond EOF, convert the file to
-		 a sparse file. */
-	      DWORD dw;
-	      HANDLE h = get_output_handle ();
-	      BOOL r = DeviceIoControl (h, FSCTL_SET_SPARSE, NULL, 0, NULL,
-	      				0, &dw, NULL);
-	      syscall_printf ("%d = DeviceIoControl(%p, FSCTL_SET_SPARSE, "
-			      "NULL, 0, NULL, 0, &dw, NULL)", r, h);
-	    }
-	  else if (wincap.has_lseek_bug ())
-	    {
-	      /* Oops, this is the bug case - Win95 uses whatever is on the
-	         disk instead of some known (safe) value, so we must seek
-		 back and fill in the gap with zeros. - DJ
-	         Note: this bug doesn't happen on NT4, even though the
-	         documentation for WriteFile() says that it *may* happen
-		 on any OS. */
-	      char zeros[512];
-	      int number_of_zeros_to_write = current_position - actual_length;
-	      memset (zeros, 0, 512);
-	      SetFilePointer (get_output_handle (), 0, NULL, FILE_END);
-	      while (number_of_zeros_to_write > 0)
-		{
-		  DWORD zeros_this_time = (number_of_zeros_to_write > 512
-					 ? 512 : number_of_zeros_to_write);
-		  DWORD written;
-		  if (!WriteFile (get_output_handle (), zeros, zeros_this_time,
-				  &written, NULL))
-		    {
-		      __seterrno ();
-		      if (get_errno () == EPIPE)
-			raise (SIGPIPE);
-		      /* This might fail, but it's the best we can hope for */
-		      SetFilePointer (get_output_handle (), current_position, NULL,
-				      FILE_BEGIN);
-		      return -1;
-
-		    }
-		  if (written < zeros_this_time) /* just in case */
-		    {
-		      set_errno (ENOSPC);
-		      /* This might fail, but it's the best we can hope for */
-		      SetFilePointer (get_output_handle (), current_position, NULL,
-				      FILE_BEGIN);
-		      return -1;
-		    }
-		  number_of_zeros_to_write -= written;
-		}
-	    }
-	}
-    }
-
-  if (get_w_binary ())
-    {
-      debug_printf ("binary write");
-      res = raw_write (ptr, len);
-    }
-  else
-    {
-      debug_printf ("text write");
-      /* This is the Microsoft/DJGPP way.  Still not ideal, but it's
-	 compatible.
-	 Modified slightly by CGF 2000-10-07 */
-
-      int left_in_data = len;
-      char *data = (char *)ptr;
-      res = 0;
-
-      while (left_in_data > 0)
-	{
-	  char buf[CHUNK_SIZE + 1], *buf_ptr = buf;
-	  int left_in_buf = CHUNK_SIZE;
-
-	  while (left_in_buf > 0 && left_in_data > 0)
-	    {
-	      char ch = *data++;
-	      if (ch == '\n')
-		{
-		  *buf_ptr++ = '\r';
-		  left_in_buf--;
-		}
-	      *buf_ptr++ = ch;
-	      left_in_buf--;
-	      left_in_data--;
-	      if (left_in_data > 0 && ch == '\r' && *data == '\n')
-		{
-		  *buf_ptr++ = *data++;
-		  left_in_buf--;
-		  left_in_data--;
-		}
-	    }
-
-	  /* We've got a buffer-full, or we're out of data.  Write it out */
-	  int nbytes;
-	  int want = buf_ptr - buf;
-	  if ((nbytes = raw_write (buf, want)) == want)
-	    {
-	      /* Keep track of how much written not counting additional \r's */
-	      res = data - (char *)ptr;
-	      continue;
-	    }
-
-	  if (nbytes == -1)
-	    res = -1;		/* Error */
-	  else
-	    res += nbytes;	/* Partial write.  Return total bytes written. */
-	  break;		/* All done */
-	}
-    }
-
-  debug_printf ("%d = write (%p, %d)", res, ptr, len);
-  return res;
-}
-
-ssize_t
-fhandler_base::readv (const struct iovec *const iov, const int iovcnt,
-		      ssize_t tot)
-{
-  assert (iov);
-  assert (iovcnt >= 1);
-
-  size_t len = tot;
-  if (iovcnt == 1)
-    {
-      len = iov->iov_len;
-      read (iov->iov_base, len);
-      return len;
-    }
-
-  if (tot == -1)		// i.e. if not pre-calculated by the caller.
-    {
-      len = 0;
-      const struct iovec *iovptr = iov + iovcnt;
-      do
-	{
-	  iovptr -= 1;
-	  len += iovptr->iov_len;
-	}
-      while (iovptr != iov);
-    }
-
-  assert (tot >= 0);
-
-  if (!len)
-    return 0;
-
-  char *buf = (char *) alloca (tot);
-
-  if (!buf)
-    {
-      set_errno (ENOMEM);
-      return -1;
-    }
-
-  read (buf, len);
-  ssize_t nbytes = (ssize_t) len;
-
-  const struct iovec *iovptr = iov;
-
-  while (nbytes > 0)
-    {
-      const int frag = min (nbytes, (ssize_t) iovptr->iov_len);
-      memcpy (iovptr->iov_base, buf, frag);
-      buf += frag;
-      iovptr += 1;
-      nbytes -= frag;
-    }
-
-  return len;
-}
-
-ssize_t
-fhandler_base::writev (const struct iovec *const iov, const int iovcnt,
-		       ssize_t tot)
-{
-  assert (iov);
-  assert (iovcnt >= 1);
-
-  if (iovcnt == 1)
-    return write (iov->iov_base, iov->iov_len);
-
-  if (tot == -1)		// i.e. if not pre-calculated by the caller.
-    {
-      tot = 0;
-      const struct iovec *iovptr = iov + iovcnt;
-      do
-	{
-	  iovptr -= 1;
-	  tot += iovptr->iov_len;
-	}
-      while (iovptr != iov);
-    }
-
-  assert (tot >= 0);
-
-  if (tot == 0)
-    return 0;
-
-  char *const buf = (char *) alloca (tot);
-
-  if (!buf)
-    {
-      set_errno (ENOMEM);
-      return -1;
-    }
-
-  char *bufptr = buf;
-  const struct iovec *iovptr = iov;
-  int nbytes = tot;
-
-  while (nbytes != 0)
-    {
-      const int frag = min (nbytes, (ssize_t) iovptr->iov_len);
-      memcpy (bufptr, iovptr->iov_base, frag);
-      bufptr += frag;
-      iovptr += 1;
-      nbytes -= frag;
-    }
-
-  return write (buf, tot);
-}
-
-_off64_t
-fhandler_base::lseek (_off64_t offset, int whence)
-{
-  _off64_t res;
-
-  /* 9x/Me doesn't support 64bit offsets.  We trap that here and return
-     EINVAL.  It doesn't make sense to simulate bigger offsets by a
-     SetFilePointer sequence since FAT and FAT32 don't support file
-     size >= 4GB anyway. */
-  if (!wincap.has_64bit_file_access ()
-      && (offset < LONG_MIN || offset > LONG_MAX))
-    {
-      debug_printf ("Win9x, offset not 32 bit.");
-      set_errno (EINVAL);
-      return (_off64_t)-1;
-    }
-
-  /* Seeks on text files is tough, we rewind and read till we get to the
-     right place.  */
-
-  if (whence != SEEK_CUR || offset != 0)
-    {
-      if (whence == SEEK_CUR)
-	offset -= ralen - raixget;
-      set_readahead_valid (0);
-    }
-
-  debug_printf ("lseek (%s, %D, %d)", get_name (), offset, whence);
-
-  DWORD win32_whence = whence == SEEK_SET ? FILE_BEGIN
-		       : (whence == SEEK_CUR ? FILE_CURRENT : FILE_END);
-
-  LONG off_low = ((__uint64_t) offset) & UINT32_MAX;
-  LONG *poff_high, off_high;
-  if (!wincap.has_64bit_file_access ())
-    poff_high = NULL;
-  else
-    {
-      off_high =  ((__uint64_t) offset) >> 32LL;
-      poff_high = &off_high;
-    }
-
-  debug_printf ("setting file pointer to %u (high), %u (low)", off_high, off_low);
-  res = SetFilePointer (get_handle (), off_low, poff_high, win32_whence);
-  if (res == INVALID_SET_FILE_POINTER && GetLastError ())
-    {
-      __seterrno ();
-    }
-  else
-    {
-      if (poff_high)
-        res += (_off64_t) *poff_high << 32;
-
-      /* When next we write(), we will check to see if *this* seek went beyond
-	 the end of the file, and back-seek and fill with zeros if so - DJ */
-      set_did_lseek ();
-
-      /* If this was a SEEK_CUR with offset 0, we still might have
-	 readahead that we have to take into account when calculating
-	 the actual position for the application.  */
-      if (whence == SEEK_CUR)
-	res -= ralen - raixget;
-    }
-
-  return res;
-}
-
-int
-fhandler_base::close ()
-{
-  int res = -1;
-
-  syscall_printf ("closing '%s' handle %p", get_name (), get_handle ());
-  if (get_nohandle () || CloseHandle (get_handle ()))
-    res = 0;
-  else
-    {
-      paranoid_printf ("CloseHandle (%d <%s>) failed", get_handle (),
-		       get_name ());
-
-      __seterrno ();
-    }
-  return res;
-}
-
-int
-fhandler_base::ioctl (unsigned int cmd, void *buf)
-{
-  int res;
-
-  switch (cmd)
-    {
-    case FIONBIO:
-      set_nonblocking (*(int *) buf);
-      res = 0;
-      break;
-    default:
-      set_errno (EINVAL);
-      res = -1;
-      break;
-    }
-
-  syscall_printf ("%d = ioctl (%x, %p)", res, cmd, buf);
-  return res;
-}
-
-int
-fhandler_base::lock (int, struct __flock64 *)
-{
-  set_errno (EINVAL);
-  return -1;
-}
-
-extern "C" char * __stdcall
-rootdir (char *full_path)
-{
-  /* Possible choices:
-   * d:... -> d:/
-   * \\server\share... -> \\server\share\
-   * else current drive.
-   */
-  char *root = full_path;
-
-  if (full_path[1] == ':')
-    strcpy (full_path + 2, "\\");
-  else if (full_path[0] == '\\' && full_path[1] == '\\')
-    {
-      char *cp = full_path + 2;
-      while (*cp && *cp != '\\')
-	cp++;
-      if (!*cp)
-	{
-	  set_errno (ENOTDIR);
-	  return NULL;
-	}
-      cp++;
-      while (*cp && *cp != '\\')
-	cp++;
-      strcpy (cp, "\\");
-    }
-  else
-    root = NULL;
-
-  return root;
-}
-
-int __stdcall
-fhandler_base::fstat (struct __stat64 *buf)
-{
-  debug_printf ("here");
-
-  if (is_fs_special ())
-    return fstat_fs (buf);
-
-  switch (get_device ())
-    {
-    case FH_PIPE:
-      buf->st_mode = S_IFIFO | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
-      break;
-    case FH_PIPEW:
-      buf->st_mode = S_IFIFO | STD_WBITS | S_IWGRP | S_IWOTH;
-      break;
-    case FH_PIPER:
-      buf->st_mode = S_IFIFO | STD_RBITS;
-      break;
-    default:
-      buf->st_mode = S_IFCHR | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
-      break;
-    }
-
-  buf->st_uid = geteuid32 ();
-  buf->st_gid = getegid32 ();
-  buf->st_nlink = 1;
-  buf->st_blksize = S_BLKSIZE;
-  time_as_timestruc_t (&buf->st_ctim);
-  buf->st_atim = buf->st_mtim = buf->st_ctim;
-  return 0;
-}
-
-void
-fhandler_base::init (HANDLE f, DWORD a, mode_t bin)
-{
-  set_io_handle (f);
-  access = a;
-  a &= GENERIC_READ | GENERIC_WRITE;
-  int flags = 0;
-  if (a == GENERIC_READ)
-    flags = O_RDONLY;
-  else if (a == GENERIC_WRITE)
-    flags = O_WRONLY;
-  else if (a == (GENERIC_READ | GENERIC_WRITE))
-    flags = O_RDWR;
-  set_flags (flags | bin);
-  set_open_status ();
-  debug_printf ("created new fhandler_base for handle %p, bin %d", f, get_r_binary ());
-}
-
-void
-fhandler_base::dump (void)
-{
-  paranoid_printf ("here");
-}
-
-int
-fhandler_base::dup (fhandler_base *child)
-{
-  debug_printf ("in fhandler_base dup");
-
-  HANDLE nh;
-  if (!get_nohandle ())
-    {
-      if (!DuplicateHandle (hMainProc, get_handle (), hMainProc, &nh, 0, TRUE,
-			    DUPLICATE_SAME_ACCESS))
-	{
-	  system_printf ("dup(%s) failed, handle %x, %E",
-			 get_name (), get_handle ());
-	  __seterrno ();
-	  return -1;
-	}
-
-      child->set_io_handle (nh);
-    }
-  return 0;
-}
-
-int fhandler_base::fcntl (int cmd, void *arg)
-{
-  int res;
-
-  switch (cmd)
-    {
-    case F_GETFD:
-      res = get_close_on_exec () ? FD_CLOEXEC : 0;
-      break;
-    case F_SETFD:
-      set_close_on_exec ((int) arg);
-      res = 0;
-      break;
-    case F_GETFL:
-      res = get_flags ();
-      debug_printf ("GETFL: %d", res);
-      break;
-    case F_SETFL:
-      {
-	/*
-	 * Only O_APPEND, O_ASYNC and O_NONBLOCK/O_NDELAY are allowed.
-	 * Each other flag will be ignored.
-	 * Since O_ASYNC isn't defined in fcntl.h it's currently
-	 * ignored as well.
-	 */
-	const int allowed_flags = O_APPEND | O_NONBLOCK_MASK;
-	int new_flags = (int) arg & allowed_flags;
-	/* Carefully test for the O_NONBLOCK or deprecated OLD_O_NDELAY flag.
-	   Set only the flag that has been passed in.  If both are set, just
-	   record O_NONBLOCK.   */
-	if ((new_flags & OLD_O_NDELAY) && (new_flags & O_NONBLOCK))
-	  new_flags &= ~OLD_O_NDELAY;
-	set_flags ((get_flags () & ~allowed_flags) | new_flags);
-      }
-      res = 0;
-      break;
-    case F_GETLK:
-    case F_SETLK:
-    case F_SETLKW:
-      res = lock (cmd, (struct __flock64 *) arg);
-      break;
-    default:
-      set_errno (EINVAL);
-      res = -1;
-      break;
-    }
-  return res;
-}
-
-/* Base terminal handlers.  These just return errors.  */
-
-int
-fhandler_base::tcflush (int)
-{
-  set_errno (ENOTTY);
-  return -1;
-}
-
-int
-fhandler_base::tcsendbreak (int)
-{
-  set_errno (ENOTTY);
-  return -1;
-}
-
-int
-fhandler_base::tcdrain (void)
-{
-  set_errno (ENOTTY);
-  return -1;
-}
-
-int
-fhandler_base::tcflow (int)
-{
-  set_errno (ENOTTY);
-  return -1;
-}
-
-int
-fhandler_base::tcsetattr (int, const struct termios *)
-{
-  set_errno (ENOTTY);
-  return -1;
-}
-
-int
-fhandler_base::tcgetattr (struct termios *)
-{
-  set_errno (ENOTTY);
-  return -1;
-}
-
-int
-fhandler_base::tcsetpgrp (const pid_t)
-{
-  set_errno (ENOTTY);
-  return -1;
-}
-
-int
-fhandler_base::tcgetpgrp (void)
-{
-  set_errno (ENOTTY);
-  return -1;
-}
-
-void
-fhandler_base::operator delete (void *p)
-{
-  cfree (p);
-  return;
-}
-
-/* Normal I/O constructor */
-fhandler_base::fhandler_base ():
-  status (0),
-  access (0),
-  io_handle (NULL),
-  namehash (0),
-  openflags (0),
-  rabuf (NULL),
-  ralen (0),
-  raixget (0),
-  raixput (0),
-  rabuflen (0),
-  open_status (0),
-  fs_flags (0),
-  read_state (NULL),
-  archetype (NULL),
-  usecount (0)
-{
-}
-
-/* Normal I/O destructor */
-fhandler_base::~fhandler_base (void)
-{
-  if (!pc.normalized_path_size && pc.normalized_path)
-    cfree (pc.normalized_path);
-  if (rabuf)
-    free (rabuf);
-}
-
-/**********************************************************************/
-/* /dev/null */
-
-fhandler_dev_null::fhandler_dev_null () :
-	fhandler_base ()
-{
-}
-
-void
-fhandler_dev_null::dump (void)
-{
-  paranoid_printf ("here");
-}
-
-void
-fhandler_base::set_inheritance (HANDLE &h, int not_inheriting)
-{
-#ifdef DEBUGGING_AND_FDS_PROTECTED
-  HANDLE oh = h;
-#endif
-  /* Note that we could use SetHandleInformation here but it is not available
-     on all platforms.  Test cases seem to indicate that using DuplicateHandle
-     in this fashion does not actually close the original handle, which is
-     what we want.  If this changes in the future, we may be forced to use
-     SetHandleInformation on newer OS's */
-  if (!DuplicateHandle (hMainProc, h, hMainProc, &h, 0, !not_inheriting,
-			     DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE))
-    debug_printf ("DuplicateHandle failed, %E");
-#ifdef DEBUGGING_AND_FDS_PROTECTED
-  if (h)
-    setclexec (oh, h, not_inheriting);
-#endif
-}
-
-void
-fhandler_base::fork_fixup (HANDLE parent, HANDLE &h, const char *name)
-{
-  if (/* !is_socket () && */ !get_close_on_exec ())
-    debug_printf ("handle %p already opened", h);
-  else if (!DuplicateHandle (parent, h, hMainProc, &h, 0, !get_close_on_exec (),
-			     DUPLICATE_SAME_ACCESS))
-    system_printf ("%s - %E, handle %s<%p>", get_name (), name, h);
-#ifdef DEBUGGING_AND_FDS_PROTECTED
-  else if (get_close_on_exec ())
-    ProtectHandle (h);	/* would have to be fancier than this */
-  else
-    /* ProtectHandleINH (h) */;	/* Should already be protected */
-#endif
-}
-
-void
-fhandler_base::set_close_on_exec (int val)
-{
-  if (!get_nohandle ())
-    set_inheritance (io_handle, val);
-  set_close_on_exec_flag (val);
-  debug_printf ("set close_on_exec for %s to %d", get_name (), val);
-}
-
-void
-fhandler_base::fixup_after_fork (HANDLE parent)
-{
-  debug_printf ("inheriting '%s' from parent", get_name ());
-  if (!get_nohandle ())
-    fork_fixup (parent, io_handle, "io_handle");
-}
-
-bool
-fhandler_base::is_nonblocking ()
-{
-  return (openflags & O_NONBLOCK_MASK) != 0;
-}
-
-void
-fhandler_base::set_nonblocking (int yes)
-{
-  int current = openflags & O_NONBLOCK_MASK;
-  int new_flags = yes ? (!current ? O_NONBLOCK : current) : 0;
-  openflags = (openflags & ~O_NONBLOCK_MASK) | new_flags;
-}
-
-DIR *
-fhandler_base::opendir ()
-{
-  set_errno (ENOTDIR);
-  return NULL;
-}
-
-struct dirent *
-fhandler_base::readdir (DIR *)
-{
-  set_errno (ENOTDIR);
-  return NULL;
-}
-
-_off64_t
-fhandler_base::telldir (DIR *)
-{
-  set_errno (ENOTDIR);
-  return -1;
-}
-
-void
-fhandler_base::seekdir (DIR *, _off64_t)
-{
-  set_errno (ENOTDIR);
-  return;
-}
-
-void
-fhandler_base::rewinddir (DIR *)
-{
-  set_errno (ENOTDIR);
-  return;
-}
-
-int
-fhandler_base::closedir (DIR *)
-{
-  set_errno (ENOTDIR);
-  return -1;
-}
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
deleted file mode 100644
index 3e0f3fb3a..000000000
--- a/winsup/cygwin/fhandler.h
+++ /dev/null
@@ -1,1279 +0,0 @@
-/* fhandler.h
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _FHANDLER_H_
-#define _FHANDLER_H_
-
-enum
-{
-  FH_RBINARY	= 0x00001000,	/* binary read mode */
-  FH_WBINARY	= 0x00002000,	/* binary write mode */
-  FH_CLOEXEC	= 0x00004000,	/* close-on-exec */
-  FH_RBINSET	= 0x00008000,	/* binary read mode has been explicitly set */
-  FH_WBINSET	= 0x00010000,	/* binary write mode has been explicitly set */
-  FH_APPEND	= 0x00020000,	/* always append */
-  FH_ASYNC	= 0x00040000,	/* async I/O */
-  FH_ENC	= 0x00080000,	/* native path is encoded */
-  FH_SYMLINK	= 0x00100000,	/* is a symlink */
-  FH_EXECABL	= 0x00200000,	/* file looked like it would run:
-				 * ends in .exe or .bat or begins with #! */
-  FH_LSEEKED	= 0x00400000,	/* set when lseek is called as a flag that
-				 * _write should check if we've moved beyond
-				 * EOF, zero filling or making file sparse
-				   if so. */
-  FH_NOHANDLE	= 0x00800000,	/* No handle associated with fhandler. */
-  FH_NOEINTR	= 0x01000000,	/* Set if I/O should be uninterruptible. */
-  FH_FFIXUP	= 0x02000000,	/* Set if need to fixup after fork. */
-  FH_LOCAL	= 0x04000000,	/* File is unix domain socket */
-  FH_SHUTRD	= 0x08000000,	/* Socket saw a SHUT_RD */
-  FH_SHUTWR	= 0x10000000,	/* Socket saw a SHUT_WR */
-  FH_ISREMOTE	= 0x10000000,	/* File is on a remote drive */
-  FH_DCEXEC	= 0x20000000,	/* Don't care if this is executable */
-  FH_HASACLS	= 0x40000000,	/* True if fs of file has ACLS */
-  FH_QUERYOPEN	= 0x80000000,	/* open file without requesting either read
-				   or write access */
-};
-
-#define FHDEVN(n)	(n)
-#define FHISSETF(x)	__ISSETF (this, x, FH)
-#define FHSETF(x)	__SETF (this, x, FH)
-#define FHCLEARF(x)	__CLEARF (this, x, FH)
-#define FHCONDSETF(n, x) __CONDSETF(n, this, x, FH)
-
-#define FHSTATOFF	0
-
-/* fcntl flags used only internaly. */
-#define O_NOSYMLINK 0x080000
-#define O_DIROPEN   0x100000
-
-/* newlib used to define O_NDELAY differently from O_NONBLOCK.  Now it
-   properly defines both to be the same.  Unfortunately, we have to
-   behave properly the old version, too, to accommodate older executables. */
-#define OLD_O_NDELAY	(CYGWIN_VERSION_CHECK_FOR_OLD_O_NONBLOCK ? 4 : 0)
-
-/* Care for the old O_NDELAY flag. If one of the flags is set,
-   both flags are set. */
-#define O_NONBLOCK_MASK (O_NONBLOCK | OLD_O_NDELAY)
-
-#define UNCONNECTED     0
-#define CONNECT_PENDING 1
-#define CONNECTED       2
-
-extern const char *windows_device_names[];
-extern struct __cygwin_perfile *perfile_table;
-#define __fmode (*(user_data->fmode_ptr))
-extern const char proc[];
-extern const int proc_len;
-
-class select_record;
-class fhandler_disk_file;
-typedef struct __DIR DIR;
-struct dirent;
-struct iovec;
-
-enum line_edit_status
-{
-  line_edit_ok = 0,
-  line_edit_input_done = 1,
-  line_edit_signalled = 2,
-  line_edit_error = 3,
-  line_edit_pipe_full = 4
-};
-
-enum bg_check_types
-{
-  bg_error = -1,
-  bg_eof = 0,
-  bg_ok = 1,
-  bg_signalled = 2
-};
-
-class fhandler_base
-{
-  friend class dtable;
-  friend void close_all_files ();
- protected:
-  DWORD status;
- private:
-  int access;
-  HANDLE io_handle;
-
-  __ino64_t namehash;	/* hashed filename, used as inode num */
-
- protected:
-  /* Full unix path name of this file */
-  /* File open flags from open () and fcntl () calls */
-  int openflags;
-
-  char *rabuf;		/* used for crlf conversion in text files */
-  size_t ralen;
-  size_t raixget;
-  size_t raixput;
-  size_t rabuflen;
-
-  DWORD open_status;
-  DWORD fs_flags;
-  HANDLE read_state;
-  path_conv pc;
-  class fhandler_base *archetype;
-
- public:
-  int usecount;
-
-  void set_name (path_conv &pc);
-  int error () const {return pc.error;}
-  void set_error (int error) {pc.error = error;}
-  bool exists () const {return pc.exists ();}
-  int pc_binmode () const {return pc.binmode ();}
-  device& dev () {return pc.dev;}
-  operator DWORD& () {return (DWORD) pc;}
-  virtual size_t size () const {return sizeof (*this);}
-
-  virtual fhandler_base& operator =(fhandler_base &x);
-  fhandler_base ();
-  virtual ~fhandler_base ();
-
-  /* Non-virtual simple accessor functions. */
-  void set_io_handle (HANDLE x) { io_handle = x; }
-
-  DWORD& get_device () { return dev ().devn; }
-  DWORD get_major () { return dev ().major; }
-  DWORD get_minor () { return dev ().minor; }
-  virtual int get_unit () { return dev ().minor; }
-
-  int get_access () const { return access; }
-  void set_access (int x) { access = x; }
-
-  bool get_async () { return FHISSETF (ASYNC); }
-  void set_async (int x) { FHCONDSETF (x, ASYNC); }
-
-  int get_flags () { return openflags; }
-  void set_flags (int x, int supplied_bin = 0);
-
-  bool is_nonblocking ();
-  void set_nonblocking (int yes);
-
-  bool get_w_binary () { return FHISSETF (WBINSET) ? FHISSETF (WBINARY) : 1; }
-  bool get_r_binary () { return FHISSETF (RBINSET) ? FHISSETF (RBINARY) : 1; }
-
-  bool get_w_binset () { return FHISSETF (WBINSET); }
-  bool get_r_binset () { return FHISSETF (RBINSET); }
-
-  void set_w_binary (int b) { FHCONDSETF (b, WBINARY); FHSETF (WBINSET); }
-  void set_r_binary (int b) { FHCONDSETF (b, RBINARY); FHSETF (RBINSET); }
-  void clear_w_binary () {FHCLEARF (WBINARY); FHCLEARF (WBINSET); }
-  void clear_r_binary () {FHCLEARF (RBINARY); FHCLEARF (RBINSET); }
-
-  bool get_nohandle () { return FHISSETF (NOHANDLE); }
-  void set_nohandle (int x) { FHCONDSETF (x, NOHANDLE); }
-
-  void set_open_status () {open_status = status;}
-  DWORD get_open_status () {return open_status;}
-  void reset_to_open_binmode ()
-  {
-    set_flags ((get_flags () & ~(O_TEXT | O_BINARY))
-	       | ((open_status & (FH_WBINARY | FH_RBINARY)
-		   ? O_BINARY : O_TEXT)));
-  }
-
-  int get_default_fmode (int flags);
-
-  bool get_r_no_interrupt () { return FHISSETF (NOEINTR); }
-  void set_r_no_interrupt (bool b) { FHCONDSETF (b, NOEINTR); }
-
-  bool get_close_on_exec () { return FHISSETF (CLOEXEC); }
-  int set_close_on_exec_flag (int b) { return FHCONDSETF (b, CLOEXEC); }
-
-  LPSECURITY_ATTRIBUTES get_inheritance (bool all = 0)
-  {
-    if (all)
-      return get_close_on_exec () ? &sec_all_nih : &sec_all;
-    else
-      return get_close_on_exec () ? &sec_none_nih : &sec_none;
-  }
-
-  void set_did_lseek (int b = 1) { FHCONDSETF (b, LSEEKED); }
-  bool get_did_lseek () { return FHISSETF (LSEEKED); }
-
-  bool get_need_fork_fixup () { return FHISSETF (FFIXUP); }
-  void set_need_fork_fixup () { FHSETF (FFIXUP); }
-
-  bool get_encoded () { return FHISSETF (ENC);}
-  void set_encoded () { FHSETF (ENC);}
-
-  virtual void set_close_on_exec (int val);
-
-  virtual void fixup_before_fork_exec (DWORD) {}
-  virtual void fixup_after_fork (HANDLE);
-  virtual void fixup_after_exec (HANDLE) {}
-
-  bool get_symlink_p () { return FHISSETF (SYMLINK); }
-  void set_symlink_p (int val) { FHCONDSETF (val, SYMLINK); }
-  void set_symlink_p () { FHSETF (SYMLINK); }
-
-  bool get_socket_p () { return FHISSETF (LOCAL); }
-  void set_socket_p (int val) { FHCONDSETF (val, LOCAL); }
-  void set_socket_p () { FHSETF (LOCAL); }
-
-  bool get_execable_p () { return FHISSETF (EXECABL); }
-  void set_execable_p (executable_states val)
-  {
-    FHCONDSETF (val == is_executable, EXECABL);
-    FHCONDSETF (val == dont_care_if_executable, DCEXEC);
-  }
-  void set_execable_p () { FHSETF (EXECABL); }
-  bool dont_care_if_execable () { return FHISSETF (DCEXEC); }
-  bool exec_state_isknown () { return FHISSETF (DCEXEC) || FHISSETF (EXECABL); }
-
-  bool get_append_p () { return FHISSETF (APPEND); }
-  void set_append_p (int val) { FHCONDSETF (val, APPEND); }
-  void set_append_p () { FHSETF (APPEND); }
-
-  void set_fs_flags (DWORD flags) { fs_flags = flags; }
-  bool get_fs_flags (DWORD flagval = UINT32_MAX)
-    { return (fs_flags & (flagval)); }
-
-  bool get_query_open () { return FHISSETF (QUERYOPEN); }
-  void set_query_open (bool val) { FHCONDSETF (val, QUERYOPEN); }
-
-  bool get_readahead_valid () { return raixget < ralen; }
-  int puts_readahead (const char *s, size_t len = (size_t) -1);
-  int put_readahead (char value);
-
-  int get_readahead ();
-  int peek_readahead (int queryput = 0);
-
-  int eat_readahead (int n);
-
-  void set_readahead_valid (int val, int ch = -1);
-
-  int get_readahead_into_buffer (char *buf, size_t buflen);
-
-  bool has_acls () { return FHISSETF (HASACLS); }
-  void set_has_acls (int val) { FHCONDSETF (val, HASACLS); }
-
-  bool isremote () { return FHISSETF (ISREMOTE); }
-  void set_isremote (int val) { FHCONDSETF (val, ISREMOTE); }
-
-  const char *get_name () const { return pc.normalized_path; }
-  const char *get_win32_name () { return pc.get_win32 (); }
-  __ino64_t get_namehash () { return namehash; }
-
-  virtual void hclose (HANDLE h) {CloseHandle (h);}
-  virtual void set_inheritance (HANDLE &h, int not_inheriting);
-
-  /* fixup fd possibly non-inherited handles after fork */
-  void fork_fixup (HANDLE parent, HANDLE &h, const char *name);
-  virtual bool need_fixup_before () const {return false;}
-
-  virtual int open (int flags, mode_t mode = 0);
-  int open_fs (int flags, mode_t mode = 0);
-  virtual int close ();
-  int close_fs ();
-  virtual int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
-  int __stdcall fstat_fs (struct __stat64 *buf) __attribute__ ((regparm (2)));
-  int __stdcall fstat_helper (struct __stat64 *buf,
-			      FILETIME ftCreateionTime,
-			      FILETIME ftLastAccessTime,
-			      FILETIME ftLastWriteTime,
-			      DWORD nFileSizeHigh,
-			      DWORD nFileSizeLow,
-			      DWORD nFileIndexHigh = 0,
-			      DWORD nFileIndexLow = 0,
-			      DWORD nNumberOfLinks = 1)
-    __attribute__ ((regparm (3)));
-  int __stdcall fstat_by_handle (struct __stat64 *buf) __attribute__ ((regparm (2)));
-  int __stdcall fstat_by_name (struct __stat64 *buf) __attribute__ ((regparm (2)));
-  virtual int ioctl (unsigned int cmd, void *);
-  virtual int fcntl (int cmd, void *);
-  virtual char const *ttyname () { return get_name (); }
-  virtual void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  virtual int write (const void *ptr, size_t len);
-  virtual ssize_t readv (const struct iovec *, int iovcnt, ssize_t tot = -1);
-  virtual ssize_t writev (const struct iovec *, int iovcnt, ssize_t tot = -1);
-  virtual _off64_t lseek (_off64_t offset, int whence);
-  virtual int lock (int, struct __flock64 *);
-  virtual void dump ();
-  virtual int dup (fhandler_base *child);
-
-  virtual HANDLE mmap (caddr_t *addr, size_t len, DWORD access,
-		       int flags, _off64_t off);
-  virtual int munmap (HANDLE h, caddr_t addr, size_t len);
-  virtual int msync (HANDLE h, caddr_t addr, size_t len, int flags);
-  virtual bool fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
-				      DWORD size, void *address);
-
-  void *operator new (size_t, void *p) {return p;}
-
-  virtual void init (HANDLE, DWORD, mode_t);
-
-  virtual int tcflush (int);
-  virtual int tcsendbreak (int);
-  virtual int tcdrain ();
-  virtual int tcflow (int);
-  virtual int tcsetattr (int a, const struct termios *t);
-  virtual int tcgetattr (struct termios *t);
-  virtual int tcsetpgrp (const pid_t pid);
-  virtual int tcgetpgrp ();
-  virtual int is_tty () { return 0; }
-  virtual bool isdevice () { return true; }
-  virtual bool isfifo () { return false; }
-  virtual char *ptsname () { return NULL;}
-  virtual class fhandler_socket *is_socket () { return NULL; }
-  virtual class fhandler_console *is_console () { return 0; }
-  virtual int is_windows () {return 0; }
-
-  virtual void raw_read (void *ptr, size_t& ulen);
-  virtual int raw_write (const void *ptr, size_t ulen);
-
-  /* Virtual accessor functions to hide the fact
-     that some fd's have two handles. */
-  virtual HANDLE& get_handle () { return io_handle; }
-  virtual HANDLE& get_io_handle () { return io_handle; }
-  virtual HANDLE& get_output_handle () { return io_handle; }
-  virtual bool hit_eof () {return false;}
-  virtual select_record *select_read (select_record *s);
-  virtual select_record *select_write (select_record *s);
-  virtual select_record *select_except (select_record *s);
-  virtual int ready_for_read (int fd, DWORD howlong);
-  virtual const char *get_native_name ()
-  {
-    return dev ().native;
-  }
-  virtual bg_check_types bg_check (int) {return bg_ok;}
-  void clear_readahead ()
-  {
-    raixput = raixget = ralen = rabuflen = 0;
-    rabuf = NULL;
-  }
-  void operator delete (void *);
-  virtual HANDLE get_guard () const {return NULL;}
-  virtual void set_eof () {}
-  virtual DIR *opendir ();
-  virtual dirent *readdir (DIR *);
-  virtual _off64_t telldir (DIR *);
-  virtual void seekdir (DIR *, _off64_t);
-  virtual void rewinddir (DIR *);
-  virtual int closedir (DIR *);
-  virtual bool is_slow () {return 0;}
-  bool is_auto_device () {return isdevice () && !dev ().isfs ();}
-  bool is_fs_special () {return dev ().isfs ();}
-  bool device_access_denied (int) __attribute__ ((regparm (1)));
-};
-
-class fhandler_socket: public fhandler_base
-{
- private:
-  int addr_family;
-  int type;
-  int connect_secret [4];
-  HANDLE secret_event;
-  struct _WSAPROTOCOL_INFOA *prot_info_ptr;
-  char *sun_path;
-  int had_connect_or_listen;
-
- public:
-  fhandler_socket ();
-  ~fhandler_socket ();
-  int get_socket () { return (int) get_handle(); }
-  fhandler_socket *is_socket () { return this; }
-
-  bool saw_shutdown_read () const {return FHISSETF (SHUTRD);}
-  bool saw_shutdown_write () const {return FHISSETF (SHUTWR);}
-
-  void set_shutdown_read () {FHSETF (SHUTRD);}
-  void set_shutdown_write () {FHSETF (SHUTWR);}
-
-  bool is_unconnected () const {return had_connect_or_listen == UNCONNECTED;}
-  bool is_connect_pending () const {return had_connect_or_listen == CONNECT_PENDING;}
-  bool is_connected () const {return had_connect_or_listen == CONNECTED;}
-  void set_connect_state (int newstate) { had_connect_or_listen = newstate; }
-  int get_connect_state () const { return had_connect_or_listen; }
-
-  int bind (const struct sockaddr *name, int namelen);
-  int connect (const struct sockaddr *name, int namelen);
-  int listen (int backlog);
-  int accept (struct sockaddr *peer, int *len);
-  int getsockname (struct sockaddr *name, int *namelen);
-  int getpeername (struct sockaddr *name, int *namelen);
-
-  ssize_t readv (const struct iovec *, int iovcnt, ssize_t tot = -1);
-  int recvfrom (void *ptr, size_t len, int flags,
-		struct sockaddr *from, int *fromlen);
-  int recvmsg (struct msghdr *msg, int flags, ssize_t tot = -1);
-
-  ssize_t writev (const struct iovec *, int iovcnt, ssize_t tot = -1);
-  int sendto (const void *ptr, size_t len, int flags,
-	      const struct sockaddr *to, int tolen);
-  int sendmsg (const struct msghdr *msg, int flags, ssize_t tot = -1);
-
-  int ioctl (unsigned int cmd, void *);
-  int fcntl (int cmd, void *);
-  _off64_t lseek (_off64_t, int) { return 0; }
-  int shutdown (int how);
-  int close ();
-  void hclose (HANDLE) {close ();}
-  int dup (fhandler_base *child);
-
-  void set_close_on_exec (int val);
-  virtual void fixup_before_fork_exec (DWORD);
-  void fixup_after_fork (HANDLE);
-  void fixup_after_exec (HANDLE);
-  bool need_fixup_before () const {return true;}
-
-  select_record *select_read (select_record *s);
-  select_record *select_write (select_record *s);
-  select_record *select_except (select_record *s);
-  void set_addr_family (int af) {addr_family = af;}
-  int get_addr_family () {return addr_family;}
-  void set_socket_type (int st) { type = st;}
-  int get_socket_type () {return type;}
-  void set_sun_path (const char *path);
-  char *get_sun_path () {return sun_path;}
-  void set_connect_secret ();
-  void get_connect_secret (char*);
-  HANDLE create_secret_event (int *secret = NULL);
-  int check_peer_secret_event (struct sockaddr_in *peer, int *secret = NULL);
-  void signal_secret_event ();
-  void close_secret_event ();
-  int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
-  bool is_slow () {return 1;}
-};
-
-class fhandler_pipe: public fhandler_base
-{
-protected:
-  HANDLE guard;
-  bool broken_pipe;
-  HANDLE writepipe_exists;
-  DWORD orig_pid;
-  unsigned id;
-public:
-  fhandler_pipe ();
-  _off64_t lseek (_off64_t offset, int whence);
-  select_record *select_read (select_record *s);
-  select_record *select_write (select_record *s);
-  select_record *select_except (select_record *s);
-  void set_close_on_exec (int val);
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  int close ();
-  void create_guard (SECURITY_ATTRIBUTES *sa) {guard = CreateMutex (sa, FALSE, NULL);}
-  int dup (fhandler_base *child);
-  int ioctl (unsigned int cmd, void *);
-  void fixup_after_fork (HANDLE);
-  void fixup_after_exec (HANDLE);
-  bool hit_eof ();
-  void set_eof () {broken_pipe = true;}
-  HANDLE get_guard () const {return guard;}
-  int ready_for_read (int fd, DWORD howlong);
-  static int create (fhandler_pipe *[2], unsigned, int, bool = false);
-  bool is_slow () {return 1;}
-  friend class fhandler_fifo;
-};
-
-class fhandler_fifo: public fhandler_pipe
-{
-  HANDLE output_handle;
-  HANDLE owner;		// You can't have too many mutexes, now, can you?
-  ATOM upand;
-  long read_use;
-  long write_use;
-public:
-  fhandler_fifo ();
-  int open (int flags, mode_t mode = 0);
-  int open_not_mine (int flags) __attribute__ ((regparm (2)));
-  int close ();
-  void set_use (int flags) __attribute__ ((regparm (2)));
-  bool isfifo () { return true; }
-  HANDLE& get_output_handle () { return output_handle; }
-  void set_output_handle (HANDLE h) { output_handle = h; }
-  void set_use ();
-  int dup (fhandler_base *child);
-  bool is_slow () {return 1;}
-  ATOM& get_atom () {return upand;}
-};
-
-class fhandler_dev_raw: public fhandler_base
-{
- protected:
-  char *devbuf;
-  size_t devbufsiz;
-  size_t devbufstart;
-  size_t devbufend;
-  int eom_detected    : 1;
-  int eof_detected    : 1;
-  int lastblk_to_read : 1;
-  int is_writing      : 1;
-  int has_written     : 1;
-  int varblkop	      : 1;
-
-  virtual void clear (void);
-  virtual int writebuf (void);
-
-  /* returns not null, if `win_error' determines an end of media condition */
-  virtual int is_eom(int win_error) = 0;
-  /* returns not null, if `win_error' determines an end of file condition */
-  virtual int is_eof(int win_error) = 0;
-
-  fhandler_dev_raw ();
-
- public:
-  ~fhandler_dev_raw (void);
-
-  int open (int flags, mode_t mode = 0);
-  int close (void);
-
-  void raw_read (void *ptr, size_t& ulen);
-  int raw_write (const void *ptr, size_t ulen);
-
-  int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
-
-  int dup (fhandler_base *child);
-
-  int ioctl (unsigned int cmd, void *buf);
-
-  void fixup_after_fork (HANDLE);
-  void fixup_after_exec (HANDLE);
-};
-
-class fhandler_dev_floppy: public fhandler_dev_raw
-{
- protected:
-  virtual int is_eom (int win_error);
-  virtual int is_eof (int win_error);
-
- public:
-  fhandler_dev_floppy ();
-
-  virtual int open (int flags, mode_t mode = 0);
-  virtual int close (void);
-
-  virtual _off64_t lseek (_off64_t offset, int whence);
-
-  virtual int ioctl (unsigned int cmd, void *buf);
-};
-
-class fhandler_dev_tape: public fhandler_dev_raw
-{
-  int lasterr;
-
-  bool is_rewind_device () { return get_unit () < 128; }
-
- protected:
-  virtual void clear (void);
-
-  virtual int is_eom (int win_error);
-  virtual int is_eof (int win_error);
-
- public:
-  fhandler_dev_tape ();
-
-  virtual int open (int flags, mode_t mode = 0);
-  virtual int close (void);
-
-  virtual _off64_t lseek (_off64_t offset, int whence);
-
-  virtual int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
-
-  virtual int dup (fhandler_base *child);
-
-  virtual int ioctl (unsigned int cmd, void *buf);
-
- private:
-  int tape_write_marks (int marktype, DWORD len);
-  int tape_get_pos (unsigned long *ret);
-  int tape_set_pos (int mode, long count, bool sfm_func = false);
-  int tape_erase (int mode);
-  int tape_prepare (int action);
-  bool tape_get_feature (DWORD parm);
-  int tape_get_blocksize (long *min, long *def, long *max, long *cur);
-  int tape_set_blocksize (long count);
-  int tape_status (struct mtget *get);
-  int tape_compression (long count);
-};
-
-/* Standard disk file */
-
-class fhandler_disk_file: public fhandler_base
-{
- public:
-  fhandler_disk_file ();
-
-  int open (int flags, mode_t mode);
-  int close ();
-  int lock (int, struct __flock64 *);
-  bool isdevice () { return false; }
-  int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
-
-  HANDLE mmap (caddr_t *addr, size_t len, DWORD access, int flags, _off64_t off);
-  int munmap (HANDLE h, caddr_t addr, size_t len);
-  int msync (HANDLE h, caddr_t addr, size_t len, int flags);
-  bool fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
-			      DWORD size, void *address);
-  DIR *opendir ();
-  struct dirent *readdir (DIR *);
-  _off64_t telldir (DIR *);
-  void seekdir (DIR *, _off64_t);
-  void rewinddir (DIR *);
-  int closedir (DIR *);
-};
-
-class fhandler_cygdrive: public fhandler_disk_file
-{
-  int ndrives;
-  const char *pdrive;
-  void set_drives ();
- public:
-  bool iscygdrive_root () { return !dev ().minor; }
-  fhandler_cygdrive ();
-  DIR *opendir ();
-  struct dirent *readdir (DIR *);
-  _off64_t telldir (DIR *);
-  void seekdir (DIR *, _off64_t);
-  void rewinddir (DIR *);
-  int closedir (DIR *);
-  int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
-};
-
-class fhandler_serial: public fhandler_base
-{
- private:
-  size_t vmin_;				/* from termios */
-  unsigned int vtime_;			/* from termios */
-  pid_t pgrp_;
-  int rts;				/* for Windows 9x purposes only */
-  int dtr;				/* for Windows 9x purposes only */
-
- public:
-  int overlapped_armed;
-  OVERLAPPED io_status;
-  DWORD ev;
-
-  /* Constructor */
-  fhandler_serial ();
-
-  int open (int flags, mode_t mode);
-  int close ();
-  void init (HANDLE h, DWORD a, mode_t flags);
-  void overlapped_setup ();
-  int dup (fhandler_base *child);
-  void raw_read (void *ptr, size_t& ulen);
-  int raw_write (const void *ptr, size_t ulen);
-  int tcsendbreak (int);
-  int tcdrain ();
-  int tcflow (int);
-  int ioctl (unsigned int cmd, void *);
-  int tcsetattr (int a, const struct termios *t);
-  int tcgetattr (struct termios *t);
-  _off64_t lseek (_off64_t, int) { return 0; }
-  int tcflush (int);
-  void dump ();
-  int is_tty () { return 1; }
-  void fixup_after_fork (HANDLE parent);
-  void fixup_after_exec (HANDLE);
-
-  /* We maintain a pgrp so that tcsetpgrp and tcgetpgrp work, but we
-     don't use it for permissions checking.  fhandler_tty_slave does
-     permission checking on pgrps.  */
-  virtual int tcgetpgrp () { return pgrp_; }
-  virtual int tcsetpgrp (const pid_t pid) { pgrp_ = pid; return 0; }
-  select_record *select_read (select_record *s);
-  select_record *select_write (select_record *s);
-  select_record *select_except (select_record *s);
-  bool is_slow () {return 1;}
-};
-
-#define acquire_output_mutex(ms) \
-  __acquire_output_mutex (__PRETTY_FUNCTION__, __LINE__, ms);
-
-#define release_output_mutex() \
-  __release_output_mutex (__PRETTY_FUNCTION__, __LINE__);
-
-class tty;
-class tty_min;
-class fhandler_termios: public fhandler_base
-{
- protected:
-  HANDLE output_handle;
-  virtual void doecho (const void *, DWORD) {};
-  virtual int accept_input () {return 1;};
- public:
-  tty_min *tc;
-  fhandler_termios () :
-  fhandler_base ()
-  {
-    set_need_fork_fixup ();
-  }
-  HANDLE& get_output_handle () { return output_handle; }
-  line_edit_status line_edit (const char *rptr, int nread, termios&);
-  void set_output_handle (HANDLE h) { output_handle = h; }
-  void tcinit (tty_min *this_tc, bool force = false);
-  virtual int is_tty () { return 1; }
-  int tcgetpgrp ();
-  int tcsetpgrp (int pid);
-  bg_check_types bg_check (int sig);
-  virtual DWORD __acquire_output_mutex (const char *fn, int ln, DWORD ms) {return 1;}
-  virtual void __release_output_mutex (const char *fn, int ln) {}
-  void fixup_after_fork (HANDLE);
-  void fixup_after_exec (HANDLE parent) { fixup_after_fork (parent); }
-  void echo_erase (int force = 0);
-  virtual _off64_t lseek (_off64_t, int);
-};
-
-enum ansi_intensity
-{
-  INTENSITY_INVISIBLE,
-  INTENSITY_DIM,
-  INTENSITY_NORMAL,
-  INTENSITY_BOLD
-};
-
-#define normal 0
-#define gotesc 1
-#define gotsquare 2
-#define gotarg1 3
-#define gotrsquare 4
-#define gotcommand 5
-#define gettitle 6
-#define eattitle 7
-#define MAXARGS 10
-
-class dev_console
-{
-  WORD default_color, underline_color, dim_color;
-
-  /* Used to determine if an input keystroke should be modified with META. */
-  int meta_mask;
-
-/* Output state */
-  int state_;
-  int args_[MAXARGS];
-  int nargs_;
-  unsigned rarg;
-  bool saw_question_mark;
-  bool alternate_charset_active;
-
-  char my_title_buf [TITLESIZE + 1];
-
-  WORD current_win32_attr;
-  ansi_intensity intensity;
-  bool underline, blink, reverse;
-  WORD fg, bg;
-
-  /* saved cursor coordinates */
-  int savex, savey;
-
-  /* saved screen */
-  COORD savebufsiz;
-  PCHAR_INFO savebuf;
-
-  struct
-    {
-      short Top, Bottom;
-    } scroll_region;
-  struct
-    {
-      SHORT winTop;
-      SHORT winBottom;
-      COORD dwWinSize;
-      COORD dwBufferSize;
-      COORD dwCursorPosition;
-      WORD wAttributes;
-    } info;
-
-  COORD dwLastCursorPosition;
-  DWORD dwLastButtonState;
-  int nModifiers;
-
-  bool insert_mode;
-  bool use_mouse;
-  bool raw_win32_keyboard_mode;
-
-  bool con_to_str (char *d, const char *s, DWORD sz);
-  bool str_to_con (char *d, const char *s, DWORD sz);
-
-  friend class fhandler_console;
-};
-
-/* This is a input and output console handle */
-class fhandler_console: public fhandler_termios
-{
- private:
-  static dev_console *dev_state;
-
-/* Output calls */
-  void set_default_attr ();
-  WORD get_win32_attr ();
-
-  bool fillin_info ();
-  void clear_screen (int, int, int, int);
-  void scroll_screen (int, int, int, int, int, int);
-  void cursor_set (bool, int, int);
-  void cursor_get (int *, int *);
-  void cursor_rel (int, int);
-  const unsigned char *write_normal (unsigned const char*, unsigned const char *);
-  void char_command (char);
-  bool set_raw_win32_keyboard_mode (bool);
-  int output_tcsetattr (int a, const struct termios *t);
-
-/* Input calls */
-  int igncr_enabled ();
-  int input_tcsetattr (int a, const struct termios *t);
-  void set_cursor_maybe ();
-
- public:
-  static int open_fhs;
-
-  fhandler_console ();
-
-  fhandler_console* is_console () { return this; }
-
-  int open (int flags, mode_t mode = 0);
-
-  int write (const void *ptr, size_t len);
-  void doecho (const void *str, DWORD len) { (void) write (str, len); }
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  int close ();
-
-  int tcflush (int);
-  int tcsetattr (int a, const struct termios *t);
-  int tcgetattr (struct termios *t);
-
-  /* Special dup as we must dup two handles */
-  int dup (fhandler_base *child);
-
-  int ioctl (unsigned int cmd, void *);
-  void init (HANDLE, DWORD, mode_t);
-  bool mouse_aware () {return dev_state->use_mouse;}
-
-  select_record *select_read (select_record *s);
-  select_record *select_write (select_record *s);
-  select_record *select_except (select_record *s);
-  void fixup_after_exec (HANDLE);
-  void set_close_on_exec (int val);
-  void fixup_after_fork (HANDLE parent);
-  void set_input_state ();
-  void send_winch_maybe ();
-  static tty_min *get_tty_stuff (int);
-  bool is_slow () {return 1;}
-};
-
-class fhandler_tty_common: public fhandler_termios
-{
- public:
-  fhandler_tty_common ()
-    : fhandler_termios (), output_done_event (NULL),
-    ioctl_request_event (NULL), ioctl_done_event (NULL), output_mutex (NULL),
-    input_mutex (NULL), input_available_event (NULL), inuse (NULL)
-  {
-    // nothing to do
-  }
-  HANDLE output_done_event;	// Raised by master when tty's output buffer
-				// written. Write status in tty::write_retval.
-  HANDLE ioctl_request_event;	// Raised by slave to perform ioctl() request.
-				// Ioctl() request in tty::cmd/arg.
-  HANDLE ioctl_done_event;	// Raised by master on ioctl() completion.
-				// Ioctl() status in tty::ioctl_retval.
-  HANDLE output_mutex, input_mutex;
-  HANDLE input_available_event;
-  HANDLE inuse;			// used to indicate that a tty is in use
-
-  DWORD __acquire_output_mutex (const char *fn, int ln, DWORD ms);
-  void __release_output_mutex (const char *fn, int ln);
-
-  virtual int dup (fhandler_base *child);
-
-  tty *get_ttyp () { return (tty *)tc; }
-
-  int close ();
-  void set_close_on_exec (int val);
-  void fixup_after_fork (HANDLE parent);
-  select_record *select_read (select_record *s);
-  select_record *select_write (select_record *s);
-  select_record *select_except (select_record *s);
-  bool is_slow () {return 1;}
-};
-
-class fhandler_tty_slave: public fhandler_tty_common
-{
- public:
-  /* Constructor */
-  fhandler_tty_slave ();
-
-  int open (int flags, mode_t mode = 0);
-  int write (const void *ptr, size_t len);
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  void init (HANDLE, DWORD, mode_t);
-
-  int tcsetattr (int a, const struct termios *t);
-  int tcgetattr (struct termios *t);
-  int tcflush (int);
-  int ioctl (unsigned int cmd, void *);
-  int close ();
-  int dup (fhandler_base *child);
-  void fixup_after_fork (HANDLE parent);
-
-  _off64_t lseek (_off64_t, int) { return 0; }
-  select_record *select_read (select_record *s);
-  int cygserver_attach_tty (HANDLE*, HANDLE*);
-  int get_unit ();
-  virtual char const *ttyname () { return pc.dev.name; }
-};
-
-class fhandler_pty_master: public fhandler_tty_common
-{
-  int pktmode;			// non-zero if pty in a packet mode.
-protected:
-  device slave;			// device type of slave
-public:
-  int need_nl;			// Next read should start with \n
-
-  /* Constructor */
-  fhandler_pty_master ();
-
-  int process_slave_output (char *buf, size_t len, int pktmode_on);
-  void doecho (const void *str, DWORD len);
-  int accept_input ();
-  int open (int flags, mode_t mode = 0);
-  int write (const void *ptr, size_t len);
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  int close ();
-
-  int tcsetattr (int a, const struct termios *t);
-  int tcgetattr (struct termios *t);
-  int tcflush (int);
-  int ioctl (unsigned int cmd, void *);
-
-  _off64_t lseek (_off64_t, int) { return 0; }
-  char *ptsname ();
-
-  void set_close_on_exec (int val);
-  bool hit_eof ();
-  int get_unit () const { return slave.minor; }
-};
-
-class fhandler_tty_master: public fhandler_pty_master
-{
- public:
-  /* Constructor */
-  fhandler_console *console;	// device handler to perform real i/o.
-
-  fhandler_tty_master ();
-  int init ();
-  int init_console ();
-  void set_winsize (bool);
-  void fixup_after_fork (HANDLE parent);
-  void fixup_after_exec (HANDLE);
-  bool is_slow () {return 1;}
-};
-
-class fhandler_dev_null: public fhandler_base
-{
- public:
-  fhandler_dev_null ();
-
-  void dump ();
-  select_record *select_read (select_record *s);
-  select_record *select_write (select_record *s);
-  select_record *select_except (select_record *s);
-};
-
-class fhandler_dev_zero: public fhandler_base
-{
- public:
-  fhandler_dev_zero ();
-  int open (int flags, mode_t mode = 0);
-  int write (const void *ptr, size_t len);
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  _off64_t lseek (_off64_t offset, int whence);
-
-  void dump ();
-};
-
-class fhandler_dev_random: public fhandler_base
-{
- protected:
-  HCRYPTPROV crypt_prov;
-  long pseudo;
-
-  bool crypt_gen_random (void *ptr, size_t len);
-  int pseudo_write (const void *ptr, size_t len);
-  int pseudo_read (void *ptr, size_t len);
-
- public:
-  fhandler_dev_random ();
-  int open (int flags, mode_t mode = 0);
-  int write (const void *ptr, size_t len);
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  _off64_t lseek (_off64_t offset, int whence);
-  int close (void);
-  int dup (fhandler_base *child);
-
-  void dump ();
-};
-
-class fhandler_dev_mem: public fhandler_base
-{
- protected:
-  DWORD mem_size;
-  _off64_t pos;
-
- public:
-  fhandler_dev_mem ();
-  ~fhandler_dev_mem (void);
-
-  int open (int flags, mode_t mode = 0);
-  int write (const void *ptr, size_t ulen);
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  _off64_t lseek (_off64_t offset, int whence);
-  int close (void);
-  int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
-  int dup (fhandler_base *child);
-
-  HANDLE mmap (caddr_t *addr, size_t len, DWORD access, int flags, _off64_t off);
-  int munmap (HANDLE h, caddr_t addr, size_t len);
-  int msync (HANDLE h, caddr_t addr, size_t len, int flags);
-  bool fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
-			      DWORD size, void *address);
-
-  void dump ();
-} ;
-
-class fhandler_dev_clipboard: public fhandler_base
-{
- public:
-  fhandler_dev_clipboard ();
-  int is_windows (void) { return 1; }
-  int open (int flags, mode_t mode = 0);
-  int write (const void *ptr, size_t len);
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  _off64_t lseek (_off64_t offset, int whence);
-  int close (void);
-
-  int dup (fhandler_base *child);
-
-  void dump ();
-
- private:
-  _off64_t pos;
-  void *membuffer;
-  size_t msize;
-  bool eof;
-};
-
-class fhandler_windows: public fhandler_base
-{
- private:
-  HWND hWnd_;	// the window whose messages are to be retrieved by read() call
-  int method_;  // write method (Post or Send)
- public:
-  fhandler_windows ();
-  int is_windows (void) { return 1; }
-  int open (int flags, mode_t mode = 0);
-  int write (const void *ptr, size_t len);
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  int ioctl (unsigned int cmd, void *);
-  _off64_t lseek (_off64_t, int) { return 0; }
-  int close (void) { return 0; }
-
-  void set_close_on_exec (int val);
-  void fixup_after_fork (HANDLE parent);
-  select_record *select_read (select_record *s);
-  select_record *select_write (select_record *s);
-  select_record *select_except (select_record *s);
-  bool is_slow () {return 1;}
-};
-
-class fhandler_dev_dsp : public fhandler_base
-{
- private:
-  int audioformat_;
-  int audiofreq_;
-  int audiobits_;
-  int audiochannels_;
-  bool setupwav(const char *pData, int nBytes);
- public:
-  fhandler_dev_dsp ();
-  ~fhandler_dev_dsp();
-
-  int open (int flags, mode_t mode = 0);
-  int write (const void *ptr, size_t len);
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  int ioctl (unsigned int cmd, void *);
-  _off64_t lseek (_off64_t, int);
-  int close (void);
-  int dup (fhandler_base *child);
-  void dump (void);
-  void fixup_after_exec (HANDLE);
-};
-
-class fhandler_virtual : public fhandler_base
-{
- protected:
-  char *filebuf;
-  size_t bufalloc;
-  _off64_t filesize;
-  _off64_t position;
-  int fileid; // unique within each class
- public:
-
-  fhandler_virtual ();
-  virtual ~fhandler_virtual();
-
-  virtual int exists();
-  DIR *opendir ();
-  _off64_t telldir (DIR *);
-  void seekdir (DIR *, _off64_t);
-  void rewinddir (DIR *);
-  int closedir (DIR *);
-  int write (const void *ptr, size_t len);
-  void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
-  _off64_t lseek (_off64_t, int);
-  int dup (fhandler_base *child);
-  int open (int flags, mode_t mode = 0);
-  int close (void);
-  int __stdcall fstat (struct stat *buf) __attribute__ ((regparm (2)));
-  virtual bool fill_filebuf ();
-  void fixup_after_exec (HANDLE);
-};
-
-class fhandler_proc: public fhandler_virtual
-{
- public:
-  fhandler_proc ();
-  int exists();
-  struct dirent *readdir (DIR *);
-  static DWORD get_proc_fhandler(const char *path);
-
-  int open (int flags, mode_t mode = 0);
-  int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
-  bool fill_filebuf ();
-};
-
-class fhandler_registry: public fhandler_proc
-{
- private:
-  char *value_name;
- public:
-  fhandler_registry ();
-  int exists();
-  struct dirent *readdir (DIR *);
-  _off64_t telldir (DIR *);
-  void seekdir (DIR *, _off64_t);
-  void rewinddir (DIR *);
-  int closedir (DIR *);
-
-  int open (int flags, mode_t mode = 0);
-  int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
-  bool fill_filebuf ();
-  int close (void);
-};
-
-class pinfo;
-class fhandler_process: public fhandler_proc
-{
-  pid_t pid;
- public:
-  fhandler_process ();
-  int exists();
-  struct dirent *readdir (DIR *);
-  int open (int flags, mode_t mode = 0);
-  int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2)));
-  bool fill_filebuf ();
-};
-
-struct fhandler_nodevice: public fhandler_base
-{
-  fhandler_nodevice ();
-  int open (int flags, mode_t mode = 0);
-  // int __stdcall fstat (struct __stat64 *buf, path_conv *);
-};
-
-typedef union
-{
-  char __base[sizeof (fhandler_base)];
-  char __console[sizeof (fhandler_console)];
-  char __cygdrive[sizeof (fhandler_cygdrive)];
-  char __dev_clipboard[sizeof (fhandler_dev_clipboard)];
-  char __dev_dsp[sizeof (fhandler_dev_dsp)];
-  char __dev_floppy[sizeof (fhandler_dev_floppy)];
-  char __dev_mem[sizeof (fhandler_dev_mem)];
-  char __dev_null[sizeof (fhandler_dev_null)];
-  char __dev_random[sizeof (fhandler_dev_random)];
-  char __dev_raw[sizeof (fhandler_dev_raw)];
-  char __dev_tape[sizeof (fhandler_dev_tape)];
-  char __dev_zero[sizeof (fhandler_dev_zero)];
-  char __disk_file[sizeof (fhandler_disk_file)];
-  char __pipe[sizeof (fhandler_pipe)];
-  char __proc[sizeof (fhandler_proc)];
-  char __process[sizeof (fhandler_process)];
-  char __pty_master[sizeof (fhandler_pty_master)];
-  char __registry[sizeof (fhandler_registry)];
-  char __serial[sizeof (fhandler_serial)];
-  char __socket[sizeof (fhandler_socket)];
-  char __termios[sizeof (fhandler_termios)];
-  char __tty_common[sizeof (fhandler_tty_common)];
-  char __tty_master[sizeof (fhandler_tty_master)];
-  char __tty_slave[sizeof (fhandler_tty_slave)];
-  char __virtual[sizeof (fhandler_virtual)];
-  char __windows[sizeof (fhandler_windows)];
-  char __nodevice[sizeof (fhandler_nodevice)];
-} fhandler_union;
-
-struct select_record
-{
-  int fd;
-  HANDLE h;
-  fhandler_base *fh;
-  bool saw_error;
-  bool windows_handle;
-  bool read_ready, write_ready, except_ready;
-  bool read_selected, write_selected, except_selected;
-  bool except_on_write;
-  int (*startup) (select_record *me, class select_stuff *stuff);
-  int (*peek) (select_record *, bool);
-  int (*verify) (select_record *me, fd_set *readfds, fd_set *writefds,
-		 fd_set *exceptfds);
-  void (*cleanup) (select_record *me, class select_stuff *stuff);
-  struct select_record *next;
-
-  select_record (fhandler_base *in_fh = NULL) : fd (0), h (NULL),
-		 fh (in_fh), saw_error (false), windows_handle (false),
-		 read_ready (false), write_ready (false), except_ready (false),
-		 read_selected (false), write_selected (false),
-		 except_selected (false), except_on_write (false),
-		 startup (NULL), peek (NULL), verify (NULL), cleanup (NULL),
-		 next (NULL) {}
-};
-
-class select_stuff
-{
- public:
-  ~select_stuff ();
-  bool always_ready, windows_used;
-  select_record start;
-  void *device_specific_pipe;
-  void *device_specific_socket;
-  void *device_specific_serial;
-
-  int test_and_set (int i, fd_set *readfds, fd_set *writefds,
-		     fd_set *exceptfds);
-  int poll (fd_set *readfds, fd_set *writefds, fd_set *exceptfds);
-  int wait (fd_set *readfds, fd_set *writefds, fd_set *exceptfds, DWORD ms);
-  void cleanup ();
-  select_stuff (): always_ready (0), windows_used (0), start (0),
-		   device_specific_pipe (0),
-		   device_specific_socket (0),
-		   device_specific_serial (0) {}
-};
-
-int __stdcall set_console_state_for_spawn ();
-
-#endif /* _FHANDLER_H_ */
diff --git a/winsup/cygwin/fhandler_clipboard.cc b/winsup/cygwin/fhandler_clipboard.cc
deleted file mode 100644
index 3f2409402..000000000
--- a/winsup/cygwin/fhandler_clipboard.cc
+++ /dev/null
@@ -1,277 +0,0 @@
-/* fhandler_dev_clipboard: code to access /dev/clipboard
-
-   Copyright 2000, 2001, 2002, 2003 Red Hat, Inc
-
-   Written by Charles Wilson (cwilson@ece.gatech.edu)
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <windows.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-
-/*
- * Robert Collins:
- * FIXME: should we use GetClipboardSequenceNumber to tell if the clipboard has
- * changed? How does /dev/clipboard operate under (say) linux?
- */
-
-static const NO_COPY char *CYGWIN_NATIVE = "CYGWIN_NATIVE_CLIPBOARD";
-/* this is MT safe because windows format id's are atomic */
-static UINT cygnativeformat;
-
-fhandler_dev_clipboard::fhandler_dev_clipboard ()
-  : fhandler_base (), pos (0), membuffer (NULL), msize (0),
-  eof (true)
-{
-  /* FIXME: check for errors and loop until we can open the clipboard */
-  OpenClipboard (NULL);
-  cygnativeformat = RegisterClipboardFormat (CYGWIN_NATIVE);
-  CloseClipboard ();
-}
-
-/*
- * Special clipboard dup to duplicate input and output
- * handles.
- */
-
-int
-fhandler_dev_clipboard::dup (fhandler_base * child)
-{
-  fhandler_dev_clipboard *fhc = (fhandler_dev_clipboard *) child;
-
-  if (!fhc->open (get_flags (), 0))
-    system_printf ("error opening clipboard, %E");
-
-  fhc->membuffer = membuffer;
-  fhc->pos = pos;
-  fhc->msize = msize;
-
-  return 0;
-}
-
-int
-fhandler_dev_clipboard::open (int flags, mode_t)
-{
-  set_flags (flags | O_TEXT);
-  eof = false;
-  pos = 0;
-  if (membuffer)
-    free (membuffer);
-  membuffer = NULL;
-  if (!cygnativeformat)
-    cygnativeformat = RegisterClipboardFormat (CYGWIN_NATIVE);
-  set_nohandle (true);
-  set_open_status ();
-  return 1;
-}
-
-static int
-set_clipboard (const void *buf, size_t len)
-{
-  HGLOBAL hmem;
-  unsigned char *clipbuf;
-  /* Native CYGWIN format */
-  OpenClipboard (0);
-  hmem = GlobalAlloc (GMEM_MOVEABLE, len + sizeof (size_t));
-  if (!hmem)
-    {
-      system_printf ("Couldn't allocate global buffer for write");
-      return -1;
-    }
-  clipbuf = (unsigned char *) GlobalLock (hmem);
-  memcpy (clipbuf + sizeof (size_t), buf, len);
-  *(size_t *) (clipbuf) = len;
-  GlobalUnlock (hmem);
-  EmptyClipboard ();
-  if (!cygnativeformat)
-    cygnativeformat = RegisterClipboardFormat (CYGWIN_NATIVE);
-  if (!SetClipboardData (cygnativeformat, hmem))
-    {
-      system_printf
-	("Couldn't write native format to the clipboard %04x %x",
-	 cygnativeformat, hmem);
-/* FIXME: return an appriate error code &| set_errno(); */
-      return -1;
-    }
-  CloseClipboard ();
-  if (GlobalFree (hmem))
-    {
-      system_printf
-	("Couldn't free global buffer after write to the clipboard");
-/* FIXME: return an appriate error code &| set_errno(); */
-      return 0;
-    }
-
-  /* CF_TEXT/CF_OEMTEXT for copying to wordpad and the like */
-
-  OpenClipboard (0);
-  hmem = GlobalAlloc (GMEM_MOVEABLE, len + 2);
-  if (!hmem)
-    {
-      system_printf ("Couldn't allocate global buffer for write");
-      return -1;
-    }
-  clipbuf = (unsigned char *) GlobalLock (hmem);
-  memcpy (clipbuf, buf, len);
-  *(clipbuf + len) = '\0';
-  *(clipbuf + len + 1) = '\0';
-  GlobalUnlock (hmem);
-  if (!SetClipboardData
-      ((current_codepage == ansi_cp ? CF_TEXT : CF_OEMTEXT), hmem))
-    {
-      system_printf ("Couldn't write to the clipboard");
-/* FIXME: return an appriate error code &| set_errno(); */
-      return -1;
-    }
-  CloseClipboard ();
-  if (GlobalFree (hmem))
-    {
-      system_printf
-	("Couldn't free global buffer after write to the clipboard");
-/* FIXME: return an appriate error code &| set_errno(); */
-    }
-  return 0;
-}
-
-/* FIXME: arbitrary seeking is not handled */
-int
-fhandler_dev_clipboard::write (const void *buf, size_t len)
-{
-  if (!eof)
-    {
-      /* write to our membuffer */
-      size_t cursize = msize;
-      void *tempbuffer = realloc (membuffer, cursize + len);
-      if (!tempbuffer)
-	{
-	  system_printf ("Couldn't realloc() clipboard buffer for write");
-	  return -1;
-	}
-      membuffer = tempbuffer;
-      msize = cursize + len;
-      memcpy ((unsigned char *) membuffer + cursize, buf, len);
-
-      /* now pass to windows */
-      if (set_clipboard (membuffer, msize))
-	{
-	  /* FIXME: membuffer is now out of sync with pos, but msize is used above */
-	  set_errno (ENOSPC);
-	  return -1;
-	}
-
-      pos = msize;
-
-      set_errno (0);
-      eof = false;
-      return len;
-    }
-  else
-    {
-      /* FIXME: return 0 bytes written, file not open */
-      return 0;
-    }
-}
-
-void __stdcall
-fhandler_dev_clipboard::read (void *ptr, size_t& len)
-{
-  HGLOBAL hglb;
-  size_t ret;
-  UINT formatlist[2];
-  UINT format;
-  if (eof)
-    len = 0;
-  else
-    {
-      formatlist[0] = cygnativeformat;
-      formatlist[1] = current_codepage == ansi_cp ? CF_TEXT : CF_OEMTEXT;
-      OpenClipboard (0);
-      if ((format = GetPriorityClipboardFormat (formatlist, 2)) <= 0)
-	{
-	  CloseClipboard ();
-#if 0
-	  system_printf ("a non-accepted format! %d", format);
-#endif
-	  set_errno (0);
-	  len = 0;
-	}
-      else
-	{
-	  hglb = GetClipboardData (format);
-	  if (format == cygnativeformat)
-	    {
-	      unsigned char *buf = (unsigned char *) GlobalLock (hglb);
-	      size_t buflen = (*(size_t *) buf);
-	      ret = ((len > (buflen - pos)) ? (buflen - pos) : len);
-	      memcpy (ptr, buf + sizeof (size_t)+ pos , ret);
-	      pos += ret;
-	      if (pos + len - ret >= buflen)
-		eof = true;
-	      GlobalUnlock (hglb);
-	    }
-	  else
-	    {
-	      LPSTR lpstr;
-	      lpstr = (LPSTR) GlobalLock (hglb);
-
-	      ret = ((len > (strlen (lpstr) - pos)) ? (strlen (lpstr) - pos)
-		     : len);
-
-	      memcpy (ptr, lpstr + pos, ret);
-	      //ret = snprintf((char *) ptr, len, "%s", lpstr);//+pos);
-	      pos += ret;
-	      if (pos + len - ret >= strlen (lpstr))
-		eof = true;
-	      GlobalUnlock (hglb);
-	    }
-	  CloseClipboard ();
-	  set_errno (0);
-	  len = ret;
-	}
-    }
-}
-
-_off64_t
-fhandler_dev_clipboard::lseek (_off64_t offset, int whence)
-{
-  /* On reads we check this at read time, not seek time.
-   * On writes we use this to decide how to write - empty and write, or open, copy, empty
-   * and write
-   */
-  pos = offset;
-  /* treat seek like rewind */
-  if (membuffer)
-    free (membuffer);
-  msize = 0;
-  return 0;
-}
-
-int
-fhandler_dev_clipboard::close (void)
-{
-  eof = true;
-  pos = 0;
-  if (membuffer)
-    free (membuffer);
-  msize = 0;
-  return 0;
-}
-
-void
-fhandler_dev_clipboard::dump ()
-{
-  paranoid_printf ("here, fhandler_dev_clipboard");
-}
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
deleted file mode 100644
index 46f1cb1a5..000000000
--- a/winsup/cygwin/fhandler_console.cc
+++ /dev/null
@@ -1,1817 +0,0 @@
-/* fhandler_console.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <sys/termios.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wincon.h>
-#include <winnls.h>
-#include <ctype.h>
-#include <sys/cygwin.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include "shared_info.h"
-#include "cygthread.h"
-
-#define CONVERT_LIMIT 16384
-
-static bool
-cp_convert (UINT destcp, char *dest, UINT srccp, const char *src, DWORD size)
-{
-  if (!size)
-    /* no action */;
-  else if (destcp == srccp)
-    {
-      if (dest != src)
-	memcpy (dest, src, size);
-    }
-  else
-    {
-      WCHAR wbuffer[CONVERT_LIMIT]; /* same size as the maximum input, s.b. */
-      if (!MultiByteToWideChar (srccp, 0, src, size, wbuffer, sizeof (wbuffer)))
-	return false;
-      if (!WideCharToMultiByte (destcp, 0, wbuffer, size, dest, size,
-				NULL, NULL))
-	return false;
-    }
-  return true;
-}
-
-/*
- * Scroll the screen context.
- * x1, y1 - ul corner
- * x2, y2 - dr corner
- * xn, yn - new ul corner
- * Negative values represents current screen dimensions
- */
-
-#define srTop (dev_state->info.winTop + dev_state->scroll_region.Top)
-#define srBottom ((dev_state->scroll_region.Bottom < 0) ? dev_state->info.winBottom : dev_state->info.winTop + dev_state->scroll_region.Bottom)
-
-#define use_tty ISSTATE (myself, PID_USETTY)
-
-const char * get_nonascii_key (INPUT_RECORD&, char *);
-
-static console_state NO_COPY *shared_console_info;
-
-dev_console NO_COPY *fhandler_console::dev_state;
-
-int NO_COPY fhandler_console::open_fhs;
-
-/* Allocate and initialize the shared record for the current console.
-   Returns a pointer to shared_console_info. */
-tty_min *
-fhandler_console::get_tty_stuff (int flags = 0)
-{
-  if (dev_state)
-    return &shared_console_info->tty_min_state;
-
-  shared_console_info =
-    (console_state *) open_shared (NULL, 0, cygheap->console_h,
-				   sizeof (*shared_console_info),
-				   SH_SHARED_CONSOLE);
-  dev_state = &shared_console_info->dev_state;
-
-  ProtectHandleINH (cygheap->console_h);
-  if (!shared_console_info->tty_min_state.ntty)
-    {
-      shared_console_info->tty_min_state.setntty (TTY_CONSOLE);
-      shared_console_info->tty_min_state.setsid (myself->sid);
-      myself->set_ctty (&shared_console_info->tty_min_state, flags, NULL);
-
-      dev_state->scroll_region.Bottom = -1;
-      dev_state->dwLastCursorPosition.X = -1;
-      dev_state->dwLastCursorPosition.Y = -1;
-      dev_state->default_color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
-      dev_state->underline_color = FOREGROUND_GREEN | FOREGROUND_BLUE;
-      dev_state->dim_color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
-      dev_state->meta_mask = LEFT_ALT_PRESSED;
-      /* Set the mask that determines if an input keystroke is modified by
-	 META.  We set this based on the keyboard layout language loaded
-	 for the current thread.  The left <ALT> key always generates
-	 META, but the right <ALT> key only generates META if we are using
-	 an English keyboard because many "international" keyboards
-	 replace common shell symbols ('[', '{', etc.) with accented
-	 language-specific characters (umlaut, accent grave, etc.).  On
-	 these keyboards right <ALT> (called AltGr) is used to produce the
-	 shell symbols and should not be interpreted as META. */
-      if (PRIMARYLANGID (LOWORD (GetKeyboardLayout (0))) == LANG_ENGLISH)
-	dev_state->meta_mask |= RIGHT_ALT_PRESSED;
-    }
-
-  return &shared_console_info->tty_min_state;
-}
-
-void
-set_console_ctty ()
-{
-  (void) fhandler_console::get_tty_stuff ();
-}
-
-/* Return the tty structure associated with a given tty number.  If the
-   tty number is < 0, just return a dummy record. */
-tty_min *
-tty_list::get_tty (int n)
-{
-  static tty_min nada;
-  if (n == TTY_CONSOLE)
-    return fhandler_console::get_tty_stuff ();
-  else if (n >= 0)
-    return &cygwin_shared->tty.ttys[n];
-  else
-    return &nada;
-}
-
-
-/* Determine if a console is associated with this process prior to a spawn.
-   If it is, then we'll return 1.  If the console has been initialized, then
-   set it into a more friendly state for non-cygwin apps. */
-int __stdcall
-set_console_state_for_spawn ()
-{
-  HANDLE h = CreateFile ("CONIN$", GENERIC_READ, FILE_SHARE_WRITE,
-			 &sec_none_nih, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
-			 NULL);
-
-  if (h == INVALID_HANDLE_VALUE)
-    return 0;
-
-  if (shared_console_info != NULL)
-    {
-      /* ACK.  Temporarily define for use in TTYSETF macro */
-#     define tc &shared_console_info->tty_min_state
-      SetConsoleMode (h, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT | ENABLE_PROCESSED_INPUT);
-      TTYSETF (RSTCONS);
-#     undef tc
-    }
-
-  CloseHandle (h);
-  return 1;
-}
-
-/* The results of GetConsoleCP() and GetConsoleOutputCP() cannot be
-   cached, because a program or the user can change these values at
-   any time. */
-inline bool
-dev_console::con_to_str (char *d, const char *s, DWORD sz)
-{
-  return cp_convert (get_cp (), d, GetConsoleCP (), s, sz);
-}
-
-inline bool
-dev_console::str_to_con (char *d, const char *s, DWORD sz)
-{
-  if (alternate_charset_active)
-    {
-      /* no translation when alternate charset is active */
-      memcpy(d, s, sz);
-      return true;
-    }
-  return cp_convert (GetConsoleOutputCP (), d, get_cp (), s, sz);
-}
-
-bool
-fhandler_console::set_raw_win32_keyboard_mode (bool new_mode)
-{
-  bool old_mode = dev_state->raw_win32_keyboard_mode;
-  dev_state->raw_win32_keyboard_mode = new_mode;
-  syscall_printf ("raw keyboard mode %sabled", dev_state->raw_win32_keyboard_mode ? "en" : "dis");
-  return old_mode;
-};
-
-void
-fhandler_console::set_cursor_maybe ()
-{
-  CONSOLE_SCREEN_BUFFER_INFO now;
-
-  if (!GetConsoleScreenBufferInfo (get_output_handle (), &now))
-    return;
-
-  if (dev_state->dwLastCursorPosition.X != now.dwCursorPosition.X ||
-      dev_state->dwLastCursorPosition.Y != now.dwCursorPosition.Y)
-    {
-      SetConsoleCursorPosition (get_output_handle (), now.dwCursorPosition);
-      dev_state->dwLastCursorPosition = now.dwCursorPosition;
-    }
-}
-
-void
-fhandler_console::send_winch_maybe ()
-{
-  SHORT y = dev_state->info.dwWinSize.Y;
-  SHORT x = dev_state->info.dwWinSize.X;
-  fillin_info ();
-
-  if (y != dev_state->info.dwWinSize.Y || x != dev_state->info.dwWinSize.X)
-    {
-      extern fhandler_tty_master *tty_master;
-      dev_state->scroll_region.Top = 0;
-      dev_state->scroll_region.Bottom = -1;
-      if (tty_master)
-	tty_master->set_winsize (true);
-      else
-	tc->kill_pgrp (SIGWINCH);
-    }
-}
-
-void __stdcall
-fhandler_console::read (void *pv, size_t& buflen)
-{
-  HANDLE h = get_io_handle ();
-
-#define buf ((char *) pv)
-
-  int ch;
-  set_input_state ();
-
-  int copied_chars = get_readahead_into_buffer (buf, buflen);
-
-  if (copied_chars)
-    {
-      buflen = copied_chars;
-      return;
-    }
-
-  HANDLE w4[2];
-  DWORD nwait;
-  char tmp[60];
-
-  w4[0] = h;
-  if (cygthread::is ())
-    nwait = 1;
-  else
-    {
-      w4[1] = signal_arrived;
-      nwait = 2;
-    }
-
-  termios ti = tc->ti;
-  for (;;)
-    {
-      int bgres;
-      if ((bgres = bg_check (SIGTTIN)) <= bg_eof)
-	{
-	  buflen = bgres;
-	  return;
-	}
-
-      set_cursor_maybe ();	/* to make cursor appear on the screen immediately */
-      switch (WaitForMultipleObjects (nwait, w4, FALSE, INFINITE))
-	{
-	case WAIT_OBJECT_0:
-	  break;
-	case WAIT_OBJECT_0 + 1:
-	  goto sig_exit;
-	default:
-	  goto err;
-	}
-
-      DWORD nread;
-      INPUT_RECORD input_rec;
-      const char *toadd = NULL;
-
-      if (!ReadConsoleInput (h, &input_rec, 1, &nread))
-	{
-	  syscall_printf ("ReadConsoleInput failed, %E");
-	  goto err;		/* seems to be failure */
-	}
-
-      /* check the event that occurred */
-      switch (input_rec.EventType)
-	{
-	case KEY_EVENT:
-#define virtual_key_code (input_rec.Event.KeyEvent.wVirtualKeyCode)
-#define control_key_state (input_rec.Event.KeyEvent.dwControlKeyState)
-
-	  dev_state->nModifiers = 0;
-
-#ifdef DEBUGGING
-	  /* allow manual switching to/from raw mode via ctrl-alt-scrolllock */
-	  if (input_rec.Event.KeyEvent.bKeyDown &&
-	      virtual_key_code == VK_SCROLL &&
-	      control_key_state & (LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED) == LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED
-	    )
-	    {
-	      set_raw_win32_keyboard_mode (!dev_state->raw_win32_keyboard_mode);
-	      continue;
-	    }
-#endif
-
-	  if (dev_state->raw_win32_keyboard_mode)
-	    {
-	      __small_sprintf (tmp, "\033{%u;%u;%u;%u;%u;%luK",
-				    input_rec.Event.KeyEvent.bKeyDown,
-				    input_rec.Event.KeyEvent.wRepeatCount,
-				    input_rec.Event.KeyEvent.wVirtualKeyCode,
-				    input_rec.Event.KeyEvent.wVirtualScanCode,
-				    input_rec.Event.KeyEvent.uChar.UnicodeChar,
-				    input_rec.Event.KeyEvent.dwControlKeyState);
-	      toadd = tmp;
-	      nread = strlen (toadd);
-	      break;
-	    }
-
-#define ich (input_rec.Event.KeyEvent.uChar.AsciiChar)
-#define wch (input_rec.Event.KeyEvent.uChar.UnicodeChar)
-#define ALT_PRESSED (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)
-#define CTRL_PRESSED (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)
-
-	  /* Ignore key up events, except for left alt events with non-zero character
-	   */
-	  if (!input_rec.Event.KeyEvent.bKeyDown &&
-	      /*
-		Event for left alt, with a non-zero character, comes from
-		"alt + numerics" key sequence.
-		e.g. <left-alt> 0233 => &eacute;
-	      */
-	      !(wch != 0
-		// ?? experimentally determined on an XP system
-		&& virtual_key_code == VK_MENU
-		// left alt -- see http://www.microsoft.com/hwdev/tech/input/Scancode.asp
-		&& input_rec.Event.KeyEvent.wVirtualScanCode == 0x38))
-	    continue;
-
-	  if (control_key_state & SHIFT_PRESSED)
-	    dev_state->nModifiers |= 1;
-	  if (control_key_state & RIGHT_ALT_PRESSED)
-	    dev_state->nModifiers |= 2;
-	  if (control_key_state & CTRL_PRESSED)
-	    dev_state->nModifiers |= 4;
-	  if (control_key_state & LEFT_ALT_PRESSED)
-	    dev_state->nModifiers |= 8;
-
-	  if (wch == 0 ||
-	      /* arrow/function keys */
-	      (input_rec.Event.KeyEvent.dwControlKeyState & ENHANCED_KEY))
-	    {
-	      toadd = get_nonascii_key (input_rec, tmp);
-	      if (!toadd)
-		{
-		  dev_state->nModifiers = 0;
-		  continue;
-		}
-	      nread = strlen (toadd);
-	    }
-	  else
-	    {
-	      tmp[1] = ich;
-	      /* Need this check since US code page seems to have a bug when
-		 converting a CTRL-U. */
-	      if ((unsigned char) ich > 0x7f)
-		dev_state->con_to_str (tmp + 1, tmp + 1, 1);
-	      /* Determine if the keystroke is modified by META.  The tricky
-		 part is to distinguish whether the right Alt key should be
-		 recognized as Alt, or as AltGr. */
-	      bool meta;
-	      if (wincap.altgr_is_ctrl_alt ())
-		/* WinNT: AltGr is reported as Ctrl+Alt, and Ctrl+Alt is
-		   treated just like AltGr.  However, if Ctrl+Alt+key generates
-		   an ASCII control character, interpret is as META. */
-		meta = (control_key_state & ALT_PRESSED) != 0
-		       && ((control_key_state & CTRL_PRESSED) == 0
-			   || (ich >= 0 && ich <= 0x1f || ich == 0x7f));
-	      else
-		/* Win9x: there's no way to distinguish Alt from AltGr, so rely
-		   on dev_state->meta_mask heuristic (see fhandler_console constructor). */
-		meta = (control_key_state & dev_state->meta_mask) != 0;
-	      if (!meta)
-		toadd = tmp + 1;
-	      else
-		{
-		  tmp[0] = '\033';
-		  tmp[1] = cyg_tolower (tmp[1]);
-		  toadd = tmp;
-		  nread++;
-		  dev_state->nModifiers &= ~4;
-		}
-	    }
-#undef ich
-#undef wch
-#undef ALT_PRESSED
-#undef CTRL_PRESSED
-	  break;
-
-	case MOUSE_EVENT:
-	  send_winch_maybe ();
-	  if (dev_state->use_mouse)
-	    {
-	      MOUSE_EVENT_RECORD& mouse_event = input_rec.Event.MouseEvent;
-
-	      /* Treat the double-click event like a regular button press */
-	      if (mouse_event.dwEventFlags == DOUBLE_CLICK)
-		{
-		  syscall_printf ("mouse: double-click -> click");
-		  mouse_event.dwEventFlags = 0;
-		}
-
-	      /* Did something other than a click occur? */
-	      if (mouse_event.dwEventFlags)
-		continue;
-
-	      /* If the mouse event occurred out of the area we can handle,
-		 ignore it. */
-	      int x = mouse_event.dwMousePosition.X;
-	      int y = mouse_event.dwMousePosition.Y;
-	      if ((x + ' ' + 1 > 0xFF) || (y + ' ' + 1 > 0xFF))
-		{
-		  syscall_printf ("mouse: position out of range");
-		  continue;
-		}
-
-	      /* Ignore unimportant mouse buttons */
-	      mouse_event.dwButtonState &= 0x7;
-
-	      /* This code assumes Windows never reports multiple button
-		 events at the same time. */
-	      int b = 0;
-	      char sz[32];
-	      if (mouse_event.dwButtonState == dev_state->dwLastButtonState)
-		{
-		  syscall_printf ("mouse: button state unchanged");
-		  continue;
-		}
-	      else if (mouse_event.dwButtonState < dev_state->dwLastButtonState)
-		{
-		  b = 3;
-		  strcpy (sz, "btn up");
-		}
-	      else if ((mouse_event.dwButtonState & 1) != (dev_state->dwLastButtonState & 1))
-		{
-		  b = 0;
-		  strcpy (sz, "btn1 down");
-		}
-	      else if ((mouse_event.dwButtonState & 2) != (dev_state->dwLastButtonState & 2))
-		{
-		  b = 2;
-		  strcpy (sz, "btn2 down");
-		}
-	      else if ((mouse_event.dwButtonState & 4) != (dev_state->dwLastButtonState & 4))
-		{
-		  b = 1;
-		  strcpy (sz, "btn3 down");
-		}
-
-	      /* Remember the current button state */
-	      dev_state->dwLastButtonState = mouse_event.dwButtonState;
-
-	      /* If a button was pressed, remember the modifiers */
-	      if (b != 3)
-		{
-		  dev_state->nModifiers = 0;
-		  if (mouse_event.dwControlKeyState & SHIFT_PRESSED)
-		    dev_state->nModifiers |= 0x4;
-		  if (mouse_event.dwControlKeyState & (RIGHT_ALT_PRESSED|LEFT_ALT_PRESSED))
-		    dev_state->nModifiers |= 0x8;
-		  if (mouse_event.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))
-		    dev_state->nModifiers |= 0x10;
-		}
-
-	      b |= dev_state->nModifiers;
-
-	      /* We can now create the code. */
-	      sprintf (tmp, "\033[M%c%c%c", b + ' ', x + ' ' + 1, y + ' ' + 1);
-	      syscall_printf ("mouse: %s at (%d,%d)", sz, x, y);
-
-	      toadd = tmp;
-	      nread = 6;
-	    }
-	  break;
-
-	case FOCUS_EVENT:
-	case WINDOW_BUFFER_SIZE_EVENT:
-	  send_winch_maybe ();
-	  /* fall through */
-	default:
-	  continue;
-	}
-
-      if (toadd)
-	{
-	  line_edit_status res = line_edit (toadd, nread, ti);
-	  if (res == line_edit_signalled)
-	    goto sig_exit;
-	  else if (res == line_edit_input_done)
-	    break;
-	}
-#undef ich
-    }
-
-  while (buflen)
-    if ((ch = get_readahead ()) < 0)
-      break;
-    else
-      {
-	buf[copied_chars++] = (unsigned char)(ch & 0xff);
-	buflen--;
-      }
-#undef buf
-
-  buflen = copied_chars;
-  return;
-
-err:
-  __seterrno ();
-  buflen = (size_t) -1;
-  return;
-
-sig_exit:
-  set_sig_errno (EINTR);
-  buflen = (size_t) -1;
-  return;
-}
-
-void
-fhandler_console::set_input_state ()
-{
-  if (TTYISSETF (RSTCONS))
-    input_tcsetattr (0, &tc->ti);
-}
-
-bool
-fhandler_console::fillin_info (void)
-{
-  bool ret;
-  CONSOLE_SCREEN_BUFFER_INFO linfo;
-
-  if ((ret = GetConsoleScreenBufferInfo (get_output_handle (), &linfo)))
-    {
-      dev_state->info.winTop = linfo.srWindow.Top;
-      dev_state->info.winBottom = linfo.srWindow.Bottom;
-      dev_state->info.dwWinSize.Y = 1 + linfo.srWindow.Bottom - linfo.srWindow.Top;
-      dev_state->info.dwWinSize.X = 1 + linfo.srWindow.Right - linfo.srWindow.Left;
-      dev_state->info.dwBufferSize = linfo.dwSize;
-      dev_state->info.dwCursorPosition = linfo.dwCursorPosition;
-      dev_state->info.wAttributes = linfo.wAttributes;
-    }
-  else
-    {
-      memset (&dev_state->info, 0, sizeof dev_state->info);
-      dev_state->info.dwWinSize.Y = 25;
-      dev_state->info.dwWinSize.X = 80;
-      dev_state->info.winBottom = 24;
-    }
-
-  return ret;
-}
-
-void
-fhandler_console::scroll_screen (int x1, int y1, int x2, int y2, int xn, int yn)
-{
-  SMALL_RECT sr1, sr2;
-  CHAR_INFO fill;
-  COORD dest;
-
-  (void) fillin_info ();
-  sr1.Left = x1 >= 0 ? x1 : dev_state->info.dwWinSize.X - 1;
-  if (y1 == 0)
-    sr1.Top = dev_state->info.winTop;
-  else
-    sr1.Top = y1 > 0 ? y1 : dev_state->info.winBottom;
-  sr1.Right = x2 >= 0 ? x2 : dev_state->info.dwWinSize.X - 1;
-  if (y2 == 0)
-    sr1.Bottom = dev_state->info.winTop;
-  else
-    sr1.Bottom = y2 > 0 ? y2 : dev_state->info.winBottom;
-  sr2.Top = srTop;
-  sr2.Left = 0;
-  sr2.Bottom = srBottom;
-  sr2.Right = dev_state->info.dwWinSize.X - 1;
-  if (sr1.Bottom > sr2.Bottom && sr1.Top <= sr2.Bottom)
-    sr1.Bottom = sr2.Bottom;
-  dest.X = xn >= 0 ? xn : dev_state->info.dwWinSize.X - 1;
-  if (yn == 0)
-    dest.Y = dev_state->info.winTop;
-  else
-    dest.Y = yn > 0 ? yn : dev_state->info.winBottom;
-  fill.Char.AsciiChar = ' ';
-  fill.Attributes = dev_state->current_win32_attr;
-  ScrollConsoleScreenBuffer (get_output_handle (), &sr1, &sr2, dest, &fill);
-
-  /* ScrollConsoleScreenBuffer on Windows 95 is buggy - when scroll distance
-   * is more than half of screen, filling doesn't work as expected */
-
-  if (sr1.Top != sr1.Bottom)
-    if (dest.Y <= sr1.Top)	/* forward scroll */
-      clear_screen (0, 1 + dest.Y + sr1.Bottom - sr1.Top, sr2.Right, sr2.Bottom);
-    else			/* reverse scroll */
-      clear_screen (0, sr1.Top, sr2.Right, dest.Y - 1);
-}
-
-int
-fhandler_console::open (int flags, mode_t)
-{
-  HANDLE h;
-
-  tcinit (get_tty_stuff (flags));
-
-  set_io_handle (NULL);
-  set_output_handle (NULL);
-
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-
-  /* Open the input handle as handle_ */
-  h = CreateFile ("CONIN$", GENERIC_READ | GENERIC_WRITE,
-		  FILE_SHARE_READ | FILE_SHARE_WRITE, &sec_none,
-		  OPEN_EXISTING, 0, 0);
-
-  if (h == INVALID_HANDLE_VALUE)
-    {
-      __seterrno ();
-      return 0;
-    }
-  set_io_handle (h);
-  set_r_no_interrupt (1);	// Handled explicitly in read code
-
-  h = CreateFile ("CONOUT$", GENERIC_READ | GENERIC_WRITE,
-		  FILE_SHARE_READ | FILE_SHARE_WRITE, &sec_none,
-		  OPEN_EXISTING, 0, 0);
-
-  if (h == INVALID_HANDLE_VALUE)
-    {
-      __seterrno ();
-      return 0;
-    }
-  set_output_handle (h);
-
-  if (fillin_info ())
-    dev_state->default_color = dev_state->info.wAttributes;
-
-  set_default_attr ();
-
-  DWORD cflags;
-  if (GetConsoleMode (get_io_handle (), &cflags))
-    {
-      cflags |= ENABLE_PROCESSED_INPUT;
-      SetConsoleMode (get_io_handle (), ENABLE_WINDOW_INPUT | ENABLE_MOUSE_INPUT | cflags);
-    }
-
-  TTYCLEARF (RSTCONS);
-  set_open_status ();
-  open_fhs++;
-  debug_printf ("incremented open_fhs, now %d", open_fhs);
-  debug_printf ("opened conin$ %p, conout$ %p",
-		get_io_handle (), get_output_handle ());
-
-  return 1;
-}
-
-int
-fhandler_console::close (void)
-{
-  CloseHandle (get_io_handle ());
-  CloseHandle (get_output_handle ());
-  set_io_handle (NULL);
-  set_output_handle (NULL);
-  if (!cygheap->fdtab.in_vfork_cleanup () && --open_fhs <= 0
-      && myself->ctty != TTY_CONSOLE)
-    {
-      syscall_printf ("open_fhs %d, freeing console %p",
-		      fhandler_console::open_fhs, myself->ctty);
-      FreeConsole ();
-    }
-  debug_printf ("decremented open_fhs, now %d", open_fhs);
-  return 0;
-}
-
-/*
- * Special console dup to duplicate input and output
- * handles.
- */
-
-int
-fhandler_console::dup (fhandler_base *child)
-{
-  fhandler_console *fhc = (fhandler_console *) child;
-
-  if (!fhc->open (get_flags () & ~O_NOCTTY, 0))
-    system_printf ("error opening console, %E");
-
-  return 0;
-}
-
-int
-fhandler_console::ioctl (unsigned int cmd, void *buf)
-{
-  switch (cmd)
-    {
-      case TIOCGWINSZ:
-	int st;
-
-	st = fillin_info ();
-	if (st)
-	  {
-	    /* *not* the buffer size, the actual screen size... */
-	    /* based on Left Top Right Bottom of srWindow */
-	    ((struct winsize *) buf)->ws_row = dev_state->info.dwWinSize.Y;
-	    ((struct winsize *) buf)->ws_col = dev_state->info.dwWinSize.X;
-	    syscall_printf ("WINSZ: (row=%d,col=%d)",
-			   ((struct winsize *) buf)->ws_row,
-			   ((struct winsize *) buf)->ws_col);
-	    return 0;
-	  }
-	else
-	  {
-	    syscall_printf ("WINSZ failed");
-	    __seterrno ();
-	    return -1;
-	  }
-	return 0;
-      case TIOCSWINSZ:
-	(void) bg_check (SIGTTOU);
-	return 0;
-      case TIOCLINUX:
-	if (* (int *) buf == 6)
-	  {
-	    * (int *) buf = dev_state->nModifiers;
-	    return 0;
-	  }
-	else
-	  {
-	    set_errno (EINVAL);
-	    return -1;
-	  }
-    }
-
-  return fhandler_base::ioctl (cmd, buf);
-}
-
-int
-fhandler_console::tcflush (int queue)
-{
-  int res = 0;
-  if (queue == TCIFLUSH
-      || queue == TCIOFLUSH)
-    {
-      if (!FlushConsoleInputBuffer (get_io_handle ()))
-	{
-	  __seterrno ();
-	  res = -1;
-	}
-    }
-  return res;
-}
-
-int
-fhandler_console::output_tcsetattr (int, struct termios const *t)
-{
-  /* All the output bits we can ignore */
-
-  DWORD flags = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT;
-
-  int res = SetConsoleMode (get_output_handle (), flags) ? 0 : -1;
-  syscall_printf ("%d = tcsetattr (,%x) (ENABLE FLAGS %x) (lflag %x oflag %x)",
-		  res, t, flags, t->c_lflag, t->c_oflag);
-  return res;
-}
-
-int
-fhandler_console::input_tcsetattr (int, struct termios const *t)
-{
-  /* Ignore the optional_actions stuff, since all output is emitted
-     instantly */
-
-  DWORD oflags;
-
-  if (!GetConsoleMode (get_io_handle (), &oflags))
-    oflags = 0;
-  DWORD flags = 0;
-
-#if 0
-  /* Enable/disable LF -> CRLF conversions */
-  set_r_binary ((t->c_iflag & INLCR) ? 0 : 1);
-#endif
-
-  /* There's some disparity between what we need and what's
-     available.  We've got ECHO and ICANON, they've
-     got ENABLE_ECHO_INPUT and ENABLE_LINE_INPUT. */
-
-  tc->ti = *t;
-
-  if (t->c_lflag & ECHO)
-    {
-      flags |= ENABLE_ECHO_INPUT;
-    }
-  if (t->c_lflag & ICANON)
-    {
-      flags |= ENABLE_LINE_INPUT;
-    }
-
-  if (flags & ENABLE_ECHO_INPUT
-      && !(flags & ENABLE_LINE_INPUT))
-    {
-      /* This is illegal, so turn off the echo here, and fake it
-	 when we read the characters */
-
-      flags &= ~ENABLE_ECHO_INPUT;
-    }
-
-  if (t->c_lflag & ISIG)
-    {
-      flags |= ENABLE_PROCESSED_INPUT;
-    }
-
-  if (use_tty)
-    {
-      flags = 0; // ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT;
-      tc->ti.c_iflag = 0;
-      tc->ti.c_lflag = 0;
-    }
-
-  flags |= ENABLE_WINDOW_INPUT | ENABLE_MOUSE_INPUT;
-
-  int res;
-  if (flags == oflags)
-    res = 0;
-  else
-    {
-      res = SetConsoleMode (get_io_handle (), flags) ? 0 : -1;
-      if (res < 0)
-	__seterrno ();
-      syscall_printf ("%d = tcsetattr (,%x) enable flags %p, c_lflag %p iflag %p",
-		      res, t, flags, t->c_lflag, t->c_iflag);
-    }
-
-  TTYCLEARF (RSTCONS);
-  return res;
-}
-
-int
-fhandler_console::tcsetattr (int a, struct termios const *t)
-{
-  int res = output_tcsetattr (a, t);
-  if (res != 0)
-    return res;
-  return input_tcsetattr (a, t);
-}
-
-int
-fhandler_console::tcgetattr (struct termios *t)
-{
-  int res;
-  *t = tc->ti;
-
-  t->c_cflag |= CS8;
-
-  DWORD flags;
-
-  if (!GetConsoleMode (get_io_handle (), &flags))
-    {
-      __seterrno ();
-      res = -1;
-    }
-  else
-    {
-      if (flags & ENABLE_ECHO_INPUT)
-	t->c_lflag |= ECHO;
-
-      if (flags & ENABLE_LINE_INPUT)
-	t->c_lflag |= ICANON;
-
-      if (flags & ENABLE_PROCESSED_INPUT)
-	t->c_lflag |= ISIG;
-
-      /* What about ENABLE_WINDOW_INPUT
-	 and ENABLE_MOUSE_INPUT   ? */
-
-      /* All the output bits we can ignore */
-      res = 0;
-    }
-  syscall_printf ("%d = tcgetattr (%p) enable flags %p, t->lflag %p, t->iflag %p",
-		 res, t, flags, t->c_lflag, t->c_iflag);
-  return res;
-}
-
-fhandler_console::fhandler_console () :
-  fhandler_termios ()
-{
-}
-
-#define FOREGROUND_ATTR_MASK (FOREGROUND_RED | FOREGROUND_GREEN | \
-			      FOREGROUND_BLUE | FOREGROUND_INTENSITY)
-#define BACKGROUND_ATTR_MASK (BACKGROUND_RED | BACKGROUND_GREEN | \
-			      BACKGROUND_BLUE | BACKGROUND_INTENSITY)
-void
-fhandler_console::set_default_attr ()
-{
-  dev_state->blink = dev_state->underline = dev_state->reverse = false;
-  dev_state->intensity = INTENSITY_NORMAL;
-  dev_state->fg = dev_state->default_color & FOREGROUND_ATTR_MASK;
-  dev_state->bg = dev_state->default_color & BACKGROUND_ATTR_MASK;
-  dev_state->current_win32_attr = get_win32_attr ();
-  SetConsoleTextAttribute (get_output_handle (), dev_state->current_win32_attr);
-}
-
-WORD
-fhandler_console::get_win32_attr ()
-{
-  WORD win_fg = dev_state->fg;
-  WORD win_bg = dev_state->bg;
-  if (dev_state->reverse)
-    {
-      WORD save_fg = win_fg;
-      win_fg = (win_bg & BACKGROUND_RED   ? FOREGROUND_RED   : 0) |
-	       (win_bg & BACKGROUND_GREEN ? FOREGROUND_GREEN : 0) |
-	       (win_bg & BACKGROUND_BLUE  ? FOREGROUND_BLUE  : 0) |
-	       (win_fg & FOREGROUND_INTENSITY);
-      win_bg = (save_fg & FOREGROUND_RED   ? BACKGROUND_RED   : 0) |
-	       (save_fg & FOREGROUND_GREEN ? BACKGROUND_GREEN : 0) |
-	       (save_fg & FOREGROUND_BLUE  ? BACKGROUND_BLUE  : 0) |
-	       (win_bg & BACKGROUND_INTENSITY);
-    }
-  if (dev_state->underline)
-    win_fg = dev_state->underline_color;
-  /* emulate blink with bright background */
-  if (dev_state->blink)
-    win_bg |= BACKGROUND_INTENSITY;
-  if (dev_state->intensity == INTENSITY_INVISIBLE)
-    win_fg = win_bg;
-  else if (dev_state->intensity == INTENSITY_BOLD)
-    win_fg |= FOREGROUND_INTENSITY;
-  return (win_fg | win_bg);
-}
-
-/*
- * Clear the screen context from x1/y1 to x2/y2 cell.
- * Negative values represents current screen dimensions
- */
-void
-fhandler_console::clear_screen (int x1, int y1, int x2, int y2)
-{
-  COORD tlc;
-  DWORD done;
-  int num;
-
-  (void)fillin_info ();
-
-  if (x1 < 0)
-    x1 = dev_state->info.dwWinSize.X - 1;
-  if (y1 < 0)
-    y1 = dev_state->info.winBottom;
-  if (x2 < 0)
-    x2 = dev_state->info.dwWinSize.X - 1;
-  if (y2 < 0)
-    y2 = dev_state->info.winBottom;
-
-  num = abs (y1 - y2) * dev_state->info.dwBufferSize.X + abs (x1 - x2) + 1;
-
-  if ((y2 * dev_state->info.dwBufferSize.X + x2) > (y1 * dev_state->info.dwBufferSize.X + x1))
-    {
-      tlc.X = x1;
-      tlc.Y = y1;
-    }
-  else
-    {
-      tlc.X = x2;
-      tlc.Y = y2;
-    }
-  FillConsoleOutputCharacterA (get_output_handle (), ' ',
-			       num,
-			       tlc,
-			       &done);
-  FillConsoleOutputAttribute (get_output_handle (),
-			       dev_state->current_win32_attr,
-			       num,
-			       tlc,
-			       &done);
-}
-
-void
-fhandler_console::cursor_set (bool rel_to_top, int x, int y)
-{
-  COORD pos;
-
-  (void) fillin_info ();
-  if (y > dev_state->info.winBottom)
-    y = dev_state->info.winBottom;
-  else if (y < 0)
-    y = 0;
-  else if (rel_to_top)
-    y += dev_state->info.winTop;
-
-  if (x > dev_state->info.dwWinSize.X)
-    x = dev_state->info.dwWinSize.X - 1;
-  else if (x < 0)
-    x = 0;
-
-  pos.X = x;
-  pos.Y = y;
-  SetConsoleCursorPosition (get_output_handle (), pos);
-}
-
-void
-fhandler_console::cursor_rel (int x, int y)
-{
-  fillin_info ();
-  x += dev_state->info.dwCursorPosition.X;
-  y += dev_state->info.dwCursorPosition.Y;
-  cursor_set (false, x, y);
-}
-
-void
-fhandler_console::cursor_get (int *x, int *y)
-{
-  fillin_info ();
-  *y = dev_state->info.dwCursorPosition.Y;
-  *x = dev_state->info.dwCursorPosition.X;
-}
-
-#define BAK 1
-#define ESC 2
-#define NOR 0
-#define IGN 4
-#if 0
-#define ERR 5
-#else
-#define ERR NOR
-#endif
-#define DWN 6
-#define BEL 7
-#define TAB 8 /* We should't let the console deal with these */
-#define CR 13
-#define LF 10
-
-static const char base_chars[256] =
-{
-/*00 01 02 03 04 05 06 07 */ IGN, ERR, ERR, NOR, NOR, NOR, NOR, BEL,
-/*08 09 0A 0B 0C 0D 0E 0F */ BAK, TAB, DWN, ERR, ERR, CR,  ERR, IGN,
-/*10 11 12 13 14 15 16 17 */ NOR, NOR, ERR, ERR, ERR, ERR, ERR, ERR,
-/*18 19 1A 1B 1C 1D 1E 1F */ NOR, NOR, ERR, ESC, ERR, ERR, ERR, ERR,
-/*   !  "  #  $  %  &  '  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*()  *  +  ,  -  .  /  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*0  1  2  3  4  5  6  7  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*8  9  :  ;  <  =  >  ?  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*@  A  B  C  D  E  F  G  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*H  I  J  K  L  M  N  O  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*P  Q  R  S  T  U  V  W  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*X  Y  Z  [  \  ]  ^  _  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*`  a  b  c  d  e  f  g  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*h  i  j  k  l  m  n  o  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*p  q  r  s  t  u  v  w  */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*x  y  z  {  |  }  ~  7F */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*80 81 82 83 84 85 86 87 */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*88 89 8A 8B 8C 8D 8E 8F */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*90 91 92 93 94 95 96 97 */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*98 99 9A 9B 9C 9D 9E 9F */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*A0 A1 A2 A3 A4 A5 A6 A7 */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*A8 A9 AA AB AC AD AE AF */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*B0 B1 B2 B3 B4 B5 B6 B7 */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*B8 B9 BA BB BC BD BE BF */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*C0 C1 C2 C3 C4 C5 C6 C7 */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*C8 C9 CA CB CC CD CE CF */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*D0 D1 D2 D3 D4 D5 D6 D7 */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*D8 D9 DA DB DC DD DE DF */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*E0 E1 E2 E3 E4 E5 E6 E7 */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*E8 E9 EA EB EC ED EE EF */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*F0 F1 F2 F3 F4 F5 F6 F7 */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR,
-/*F8 F9 FA FB FC FD FE FF */ NOR, NOR, NOR, NOR, NOR, NOR, NOR, NOR };
-
-void
-fhandler_console::char_command (char c)
-{
-  int x, y;
-  char buf[40];
-
-  switch (c)
-    {
-    case 'm':   /* Set Graphics Rendition */
-       int i;
-
-       for (i = 0; i <= dev_state->nargs_; i++)
-	 switch (dev_state->args_[i])
-	   {
-	     case 0:    /* normal color */
-	       set_default_attr ();
-	       break;
-	     case 1:    /* bold */
-	       dev_state->intensity = INTENSITY_BOLD;
-	       break;
-	     case 4:
-	       dev_state->underline = 1;
-	       break;
-	     case 5:    /* blink mode */
-	       dev_state->blink = true;
-	       break;
-	     case 7:    /* reverse */
-	       dev_state->reverse = true;
-	       break;
-	     case 8:    /* invisible */
-	       dev_state->intensity = INTENSITY_INVISIBLE;
-	       break;
-	     case 9:    /* dim */
-	       dev_state->intensity = INTENSITY_DIM;
-	       break;
-             case 10:   /* end alternate charset */
-               dev_state->alternate_charset_active = false;
-	       break;
-             case 11:   /* start alternate charset */
-               dev_state->alternate_charset_active = true;
-	       break;
-	     case 24:
-	       dev_state->underline = false;
-	       break;
-	     case 27:
-	       dev_state->reverse = false;
-	       break;
-	     case 30:		/* BLACK foreground */
-	       dev_state->fg = 0;
-	       break;
-	     case 31:		/* RED foreground */
-	       dev_state->fg = FOREGROUND_RED;
-	       break;
-	     case 32:		/* GREEN foreground */
-	       dev_state->fg = FOREGROUND_GREEN;
-	       break;
-	     case 33:		/* YELLOW foreground */
-	       dev_state->fg = FOREGROUND_RED | FOREGROUND_GREEN;
-	       break;
-	     case 34:		/* BLUE foreground */
-	       dev_state->fg = FOREGROUND_BLUE;
-	       break;
-	     case 35:		/* MAGENTA foreground */
-	       dev_state->fg = FOREGROUND_RED | FOREGROUND_BLUE;
-	       break;
-	     case 36:		/* CYAN foreground */
-	       dev_state->fg = FOREGROUND_BLUE | FOREGROUND_GREEN;
-	       break;
-	     case 37:		/* WHITE foreg */
-	       dev_state->fg = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED;
-	       break;
-	     case 39:
-	       dev_state->fg = dev_state->default_color & FOREGROUND_ATTR_MASK;
-	       break;
-	     case 40:		/* BLACK background */
-	       dev_state->bg = 0;
-	       break;
-	     case 41:		/* RED background */
-	       dev_state->bg = BACKGROUND_RED;
-	       break;
-	     case 42:		/* GREEN background */
-	       dev_state->bg = BACKGROUND_GREEN;
-	       break;
-	     case 43:		/* YELLOW background */
-	       dev_state->bg = BACKGROUND_RED | BACKGROUND_GREEN;
-	       break;
-	     case 44:		/* BLUE background */
-	       dev_state->bg = BACKGROUND_BLUE;
-	       break;
-	     case 45:		/* MAGENTA background */
-	       dev_state->bg = BACKGROUND_RED | BACKGROUND_BLUE;
-	       break;
-	     case 46:		/* CYAN background */
-	       dev_state->bg = BACKGROUND_BLUE | BACKGROUND_GREEN;
-	       break;
-	     case 47:    /* WHITE background */
-	       dev_state->bg = BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED;
-	       break;
-	     case 49:
-	       dev_state->bg = dev_state->default_color & BACKGROUND_ATTR_MASK;
-	       break;
-	   }
-	 dev_state->current_win32_attr = get_win32_attr ();
-	 SetConsoleTextAttribute (get_output_handle (), dev_state->current_win32_attr);
-      break;
-    case 'h':
-    case 'l':
-      if (!dev_state->saw_question_mark)
-	{
-	  switch (dev_state->args_[0])
-	    {
-	    case 4:    /* Insert mode */
-	      dev_state->insert_mode = (c == 'h') ? true : false;
-	      syscall_printf ("insert mode %sabled", dev_state->insert_mode ? "en" : "dis");
-	      break;
-	    }
-	  break;
-	}
-      switch (dev_state->args_[0])
-	{
-	case 47:   /* Save/Restore screen */
-	  if (c == 'h') /* save */
-	    {
-	      CONSOLE_SCREEN_BUFFER_INFO now;
-	      COORD cob = { 0, 0 };
-
-	      if (!GetConsoleScreenBufferInfo (get_output_handle (), &now))
-		break;
-
-	      dev_state->savebufsiz.X = now.srWindow.Right - now.srWindow.Left + 1;
-	      dev_state->savebufsiz.Y = now.srWindow.Bottom - now.srWindow.Top + 1;
-
-	      if (dev_state->savebuf)
-		cfree (dev_state->savebuf);
-	      dev_state->savebuf = (PCHAR_INFO) cmalloc (HEAP_1_BUF, sizeof (CHAR_INFO) *
-					     dev_state->savebufsiz.X * dev_state->savebufsiz.Y);
-
-	      ReadConsoleOutputA (get_output_handle (), dev_state->savebuf,
-				  dev_state->savebufsiz, cob, &now.srWindow);
-	    }
-	  else		/* restore */
-	    {
-	      CONSOLE_SCREEN_BUFFER_INFO now;
-	      COORD cob = { 0, 0 };
-
-	      if (!GetConsoleScreenBufferInfo (get_output_handle (), &now))
-		break;
-
-	      if (!dev_state->savebuf)
-		break;
-
-	      WriteConsoleOutputA (get_output_handle (), dev_state->savebuf,
-				   dev_state->savebufsiz, cob, &now.srWindow);
-
-	      cfree (dev_state->savebuf);
-	      dev_state->savebuf = NULL;
-	      dev_state->savebufsiz.X = dev_state->savebufsiz.Y = 0;
-	    }
-	  break;
-
-	case 1000: /* Mouse support */
-	  dev_state->use_mouse = (c == 'h') ? true : false;
-	  syscall_printf ("mouse support %sabled", dev_state->use_mouse ? "en" : "dis");
-	  break;
-
-	case 2000: /* Raw keyboard mode */
-	  set_raw_win32_keyboard_mode ((c == 'h') ? true : false);
-	  break;
-
-	default: /* Ignore */
-	  syscall_printf ("unknown h/l command: %d", dev_state->args_[0]);
-	  break;
-	}
-      break;
-    case 'J':
-      switch (dev_state->args_[0])
-	{
-	case 0:			/* Clear to end of screen */
-	  cursor_get (&x, &y);
-	  clear_screen (x, y, -1, -1);
-	  break;
-	case 1:			/* Clear from beginning of screen to cursor */
-	  cursor_get (&x, &y);
-	  clear_screen (0, 0, x, y);
-	  break;
-	case 2:			/* Clear screen */
-	  clear_screen (0, 0, -1, -1);
-	  cursor_set (true, 0,0);
-	  break;
-	default:
-	  goto bad_escape;
-	}
-      break;
-
-    case 'A':
-      cursor_rel (0, -(dev_state->args_[0] ? dev_state->args_[0] : 1));
-      break;
-    case 'B':
-      cursor_rel (0, dev_state->args_[0] ? dev_state->args_[0] : 1);
-      break;
-    case 'C':
-      cursor_rel (dev_state->args_[0] ? dev_state->args_[0] : 1, 0);
-      break;
-    case 'D':
-      cursor_rel (-(dev_state->args_[0] ? dev_state->args_[0] : 1),0);
-      break;
-    case 'K':
-      switch (dev_state->args_[0])
-	{
-	  case 0:		/* Clear to end of line */
-	    cursor_get (&x, &y);
-	    clear_screen (x, y, -1, y);
-	    break;
-	  case 2:		/* Clear line */
-	    cursor_get (&x, &y);
-	    clear_screen (0, y, -1, y);
-	    break;
-	  case 1:		/* Clear from bol to cursor */
-	    cursor_get (&x, &y);
-	    clear_screen (0, y, x, y);
-	    break;
-	  default:
-	    goto bad_escape;
-	}
-      break;
-    case 'H':
-    case 'f':
-      cursor_set (true, (dev_state->args_[1] ? dev_state->args_[1] : 1) - 1,
-			(dev_state->args_[0] ? dev_state->args_[0] : 1) - 1);
-      break;
-    case 'G':   /* hpa - position cursor at column n - 1 */
-      cursor_get (&x, &y);
-      cursor_set (false, (dev_state->args_[0] ? dev_state->args_[0] - 1 : 0), y);
-      break;
-    case 'd':   /* vpa - position cursor at line n */
-      cursor_get (&x, &y);
-      cursor_set (true, x, (dev_state->args_[0] ? dev_state->args_[0] - 1 : 0));
-      break;
-    case 's':   /* Save cursor position */
-      cursor_get (&dev_state->savex, &dev_state->savey);
-      dev_state->savey -= dev_state->info.winTop;
-      break;
-    case 'u':   /* Restore cursor position */
-      cursor_set (true, dev_state->savex, dev_state->savey);
-      break;
-    case 'I':	/* TAB */
-      cursor_get (&x, &y);
-      cursor_set (false, 8 * (x / 8 + 1), y);
-      break;
-    case 'L':				/* AL - insert blank lines */
-      dev_state->args_[0] = dev_state->args_[0] ? dev_state->args_[0] : 1;
-      cursor_get (&x, &y);
-      scroll_screen (0, y, -1, -1, 0, y + dev_state->args_[0]);
-      break;
-    case 'M':				/* DL - delete lines */
-      dev_state->args_[0] = dev_state->args_[0] ? dev_state->args_[0] : 1;
-      cursor_get (&x, &y);
-      scroll_screen (0, y + dev_state->args_[0], -1, -1, 0, y);
-      break;
-    case '@':				/* IC - insert chars */
-      dev_state->args_[0] = dev_state->args_[0] ? dev_state->args_[0] : 1;
-      cursor_get (&x, &y);
-      scroll_screen (x, y, -1, y, x + dev_state->args_[0], y);
-      break;
-    case 'P':				/* DC - delete chars */
-      dev_state->args_[0] = dev_state->args_[0] ? dev_state->args_[0] : 1;
-      cursor_get (&x, &y);
-      scroll_screen (x + dev_state->args_[0], y, -1, y, x, y);
-      break;
-    case 'S':				/* SF - Scroll forward */
-      dev_state->args_[0] = dev_state->args_[0] ? dev_state->args_[0] : 1;
-      scroll_screen (0, dev_state->args_[0], -1, -1, 0, 0);
-      break;
-    case 'T':				/* SR - Scroll down */
-      fillin_info ();
-      dev_state->args_[0] = dev_state->args_[0] ? dev_state->args_[0] : 1;
-      scroll_screen (0, 0, -1, -1, 0, dev_state->info.winTop + dev_state->args_[0]);
-      break;
-    case 'X':				/* ec - erase chars */
-      dev_state->args_[0] = dev_state->args_[0] ? dev_state->args_[0] : 1;
-      cursor_get (&x, &y);
-      scroll_screen (x + dev_state->args_[0], y, -1, y, x, y);
-      scroll_screen (x, y, -1, y, x + dev_state->args_[0], y);
-      break;
-    case 'Z':				/* Back tab */
-      cursor_get (&x, &y);
-      cursor_set (false, ((8 * (x / 8 + 1)) - 8), y);
-      break;
-    case 'b':				/* Repeat char #1 #2 times */
-      if (dev_state->insert_mode)
-	{
-	  cursor_get (&x, &y);
-	  scroll_screen (x, y, -1, y, x + dev_state->args_[1], y);
-	}
-      while (dev_state->args_[1]--)
-	WriteFile (get_output_handle (), &dev_state->args_[0], 1, (DWORD *) &x, 0);
-      break;
-    case 'c':				/* u9 - Terminal enquire string */
-      strcpy (buf, "\033[?6c");
-      puts_readahead (buf);
-      break;
-    case 'n':
-      switch (dev_state->args_[0])
-	{
-	case 6:				/* u7 - Cursor position request */
-	  cursor_get (&x, &y);
-	  y -= dev_state->info.winTop;
-	  /* x -= dev_state->info.winLeft;		// not available yet */
-	  __small_sprintf (buf, "\033[%d;%dR", y + 1, x + 1);
-	  puts_readahead (buf);
-	  break;
-    default:
-	  goto bad_escape;
-	}
-      break;
-    case 'r':				/* Set Scroll region */
-      dev_state->scroll_region.Top = dev_state->args_[0] ? dev_state->args_[0] - 1 : 0;
-      dev_state->scroll_region.Bottom = dev_state->args_[1] ? dev_state->args_[1] - 1 : -1;
-      cursor_set (true, 0, 0);
-      break;
-    case 'g':				/* TAB set/clear */
-      break;
-    default:
-bad_escape:
-      break;
-    }
-}
-
-const unsigned char *
-fhandler_console::write_normal (const unsigned char *src,
-				const unsigned char *end)
-{
-  /* Scan forward to see what a char which needs special treatment */
-  DWORD done;
-  const unsigned char *found = src;
-
-  while (found < end)
-    {
-      if (base_chars[*found] != NOR)
-	break;
-      found++;
-    }
-
-  /* Print all the base ones out */
-  if (found != src)
-    {
-      DWORD len = found - src;
-      do
-	{
-	  DWORD buf_len;
-	  char buf[CONVERT_LIMIT];
-	  done = buf_len = min (sizeof (buf), len);
-	  if (!dev_state->str_to_con (buf, (const char *) src, buf_len))
-	    {
-	      debug_printf ("conversion error, handle %p",
-			    get_output_handle ());
-	      __seterrno ();
-	      return 0;
-	    }
-
-	  if (dev_state->insert_mode)
-	    {
-	      int x, y;
-	      cursor_get (&x, &y);
-	      scroll_screen (x, y, -1, y, x + buf_len, y);
-	    }
-
-	  if (!WriteFile (get_output_handle (), buf, buf_len, &done, 0))
-	    {
-	      debug_printf ("write failed, handle %p", get_output_handle ());
-	      __seterrno ();
-	      return 0;
-	    }
-	  len -= done;
-	  src += done;
-	}
-      while (len > 0);
-    }
-
-  if (src < end)
-    {
-      int x, y;
-      switch (base_chars[*src])
-	{
-	case BEL:
-	  MessageBeep (0xFFFFFFFF);
-	  break;
-	case ESC:
-	  dev_state->state_ = gotesc;
-	  break;
-	case DWN:
-	  cursor_get (&x, &y);
-	  if (y >= srBottom)
-	    {
-	      if (y >= dev_state->info.winBottom && !dev_state->scroll_region.Top)
-		WriteFile (get_output_handle (), "\n", 1, &done, 0);
-	      else
-		{
-		  scroll_screen (0, srTop + 1, -1, srBottom, 0, srTop);
-		  y--;
-		}
-	    }
-	  cursor_set (false, ((tc->ti.c_oflag & ONLCR) ? 0 : x), y + 1);
-	  break;
-	case BAK:
-	  cursor_rel (-1, 0);
-	  break;
-	case IGN:
-	  cursor_rel (1, 0);
-	  break;
-	case CR:
-	  cursor_get (&x, &y);
-	  cursor_set (false, 0, y);
-	  break;
-	case ERR:
-	  WriteFile (get_output_handle (), src, 1, &done, 0);
-	  break;
-	case TAB:
-	  cursor_get (&x, &y);
-	  cursor_set (false, 8 * (x / 8 + 1), y);
-	  break;
-	}
-      src ++;
-    }
-  return src;
-}
-
-int
-fhandler_console::write (const void *vsrc, size_t len)
-{
-  /* Run and check for ansi sequences */
-  unsigned const char *src = (unsigned char *) vsrc;
-  unsigned const char *end = src + len;
-
-  debug_printf ("%x, %d", vsrc, len);
-
-  while (src < end)
-    {
-      debug_printf ("at %d(%c) state is %d", *src, isprint (*src) ? *src : ' ',
-		    dev_state->state_);
-      switch (dev_state->state_)
-	{
-	case normal:
-	  src = write_normal (src, end);
-	  if (!src) /* write_normal failed */
-	    return -1;
-	  break;
-	case gotesc:
-	  if (*src == '[')
-	    {
-	      dev_state->state_ = gotsquare;
-	      dev_state->saw_question_mark = false;
-	      for (dev_state->nargs_ = 0; dev_state->nargs_ < MAXARGS; dev_state->nargs_++)
-		dev_state->args_[dev_state->nargs_] = 0;
-	      dev_state->nargs_ = 0;
-	    }
-	  else if (*src == ']')
-	    {
-	      dev_state->rarg = 0;
-	      dev_state->my_title_buf[0] = '\0';
-	      dev_state->state_ = gotrsquare;
-	    }
-	  else if (*src == 'M')		/* Reverse Index */
-	    {
-	      fillin_info ();
-	      scroll_screen (0, 0, -1, -1, 0, dev_state->info.winTop + 1);
-	      dev_state->state_ = normal;
-	    }
-	  else if (*src == 'c')		/* Reset Linux terminal */
-	    {
-	      set_default_attr ();
-	      clear_screen (0, 0, -1, -1);
-	      cursor_set (true, 0, 0);
-	      dev_state->state_ = normal;
-	    }
-	  else if (*src == '8')		/* Restore cursor position */
-	    {
-	      cursor_set (true, dev_state->savex, dev_state->savey);
-	      dev_state->state_ = normal;
-	    }
-	  else if (*src == '7')		/* Save cursor position */
-	    {
-	      cursor_get (&dev_state->savex, &dev_state->savey);
-	      dev_state->savey -= dev_state->info.winTop;
-	      dev_state->state_ = normal;
-	    }
-	  else if (*src == 'R')
-	      dev_state->state_ = normal;
-	  else
-	    {
-	      dev_state->state_ = normal;
-	    }
-	  src++;
-	  break;
-	case gotarg1:
-	  if (isdigit (*src))
-	    {
-	      dev_state->args_[dev_state->nargs_] = dev_state->args_[dev_state->nargs_] * 10 + *src - '0';
-	      src++;
-	    }
-	  else if (*src == ';')
-	    {
-	      src++;
-	      dev_state->nargs_++;
-	      if (dev_state->nargs_ >= MAXARGS)
-		dev_state->nargs_--;
-	    }
-	  else
-	    {
-	      dev_state->state_ = gotcommand;
-	    }
-	  break;
-	case gotcommand:
-	  char_command (*src++);
-	  dev_state->state_ = normal;
-	  break;
-	case gotrsquare:
-	  if (isdigit (*src))
-	    dev_state->rarg = dev_state->rarg * 10 + (*src - '0');
-	  else if (*src == ';' && (dev_state->rarg == 2 || dev_state->rarg == 0))
-	    dev_state->state_ = gettitle;
-	  else
-	    dev_state->state_ = eattitle;
-	  src++;
-	  break;
-	case eattitle:
-	case gettitle:
-	  {
-	    int n = strlen (dev_state->my_title_buf);
-	    if (*src < ' ')
-	      {
-		if (*src == '\007' && dev_state->state_ == gettitle)
-		  {
-		    if (old_title)
-		      strcpy (old_title, dev_state->my_title_buf);
-		    set_console_title (dev_state->my_title_buf);
-		  }
-		dev_state->state_ = normal;
-	      }
-	    else if (n < TITLESIZE)
-	      {
-		dev_state->my_title_buf[n++] = *src;
-		dev_state->my_title_buf[n] = '\0';
-	      }
-	    src++;
-	    break;
-	  }
-	case gotsquare:
-	  if (*src == ';')
-	    {
-	      dev_state->state_ = gotarg1;
-	      dev_state->nargs_++;
-	      src++;
-	    }
-	  else if (isalpha (*src))
-	    dev_state->state_ = gotcommand;
-	  else if (*src != '@' && !isalpha (*src) && !isdigit (*src))
-	    {
-	      if (*src == '?')
-		dev_state->saw_question_mark = true;
-	      /* ignore any extra chars between [ and first arg or command */
-	      src++;
-	    }
-	  else
-	    dev_state->state_ = gotarg1;
-	  break;
-	}
-    }
-
-  syscall_printf ("%d = write_console (,..%d)", len, len);
-
-  return len;
-}
-
-static struct {
-  int vk;
-  const char *val[4];
-} keytable[] NO_COPY = {
-	       /* NORMAL */  /* SHIFT */    /* CTRL */       /* ALT */
-  {VK_LEFT,	{"\033[D",	"\033[D",	"\033[D",	"\033\033[D"}},
-  {VK_RIGHT,	{"\033[C",	"\033[C",	"\033[C",	"\033\033[C"}},
-  {VK_UP,	{"\033[A",	"\033[A",	"\033[A",	"\033\033[A"}},
-  {VK_DOWN,	{"\033[B",	"\033[B",	"\033[B",	"\033\033[B"}},
-  {VK_PRIOR,	{"\033[5~",	"\033[5~",	"\033[5~",	"\033\033[5~"}},
-  {VK_NEXT,	{"\033[6~",	"\033[6~",	"\033[6~",	"\033\033[6~"}},
-  {VK_HOME,	{"\033[1~",	"\033[1~",	"\033[1~",	"\033\033[1~"}},
-  {VK_END,	{"\033[4~",	"\033[4~",	"\033[4~",	"\033\033[4~"}},
-  {VK_INSERT,	{"\033[2~",	"\033[2~",	"\033[2~",	"\033\033[2~"}},
-  {VK_DELETE,	{"\033[3~",	"\033[3~",	"\033[3~",	"\033\033[3~"}},
-  {VK_F1,	{"\033[[A",	"\033[23~",	NULL,		NULL}},
-  {VK_F2,	{"\033[[B",	"\033[24~",	NULL,		NULL}},
-  {VK_F3,	{"\033[[C",	"\033[25~",	NULL,		NULL}},
-  {VK_F4,	{"\033[[D",	"\033[26~",	NULL,		NULL}},
-  {VK_F5,	{"\033[[E",	"\033[28~",	NULL,		NULL}},
-  {VK_F6,	{"\033[17~",	"\033[29~",	"\036",		NULL}},
-  {VK_F7,	{"\033[18~",	"\033[31~",	NULL,		NULL}},
-  {VK_F8,	{"\033[19~",	"\033[32~",	NULL,		NULL}},
-  {VK_F9,	{"\033[20~",	"\033[33~",	NULL,		NULL}},
-  {VK_F10,	{"\033[21~",	"\033[34~",	NULL,		NULL}},
-  {VK_F11,	{"\033[23~",	NULL,		NULL,		NULL}},
-  {VK_F12,	{"\033[24~",	NULL,		NULL,		NULL}},
-  {VK_NUMPAD5,	{"\033[G",	NULL,		NULL,		NULL}},
-  {VK_CLEAR,	{"\033[G",	NULL,		NULL,		NULL}},
-  {'6',		{NULL,		NULL,		"\036",		NULL}},
-  {0,		{"",		NULL,		NULL,		NULL}}
-};
-
-const char *
-get_nonascii_key (INPUT_RECORD& input_rec, char *tmp)
-{
-#define NORMAL  0
-#define SHIFT	1
-#define CONTROL	2
-#define ALT	3
-  int modifier_index = NORMAL;
-
-  if (input_rec.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED)
-    modifier_index = SHIFT;
-  else if (input_rec.Event.KeyEvent.dwControlKeyState &
-		(LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))
-    modifier_index = CONTROL;
-  else if (input_rec.Event.KeyEvent.dwControlKeyState &
-		(LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED))
-    modifier_index = ALT;
-
-  for (int i = 0; keytable[i].vk; i++)
-    if (input_rec.Event.KeyEvent.wVirtualKeyCode == keytable[i].vk)
-      return keytable[i].val[modifier_index];
-
-  if (input_rec.Event.KeyEvent.uChar.AsciiChar)
-    {
-      tmp[0] = input_rec.Event.KeyEvent.uChar.AsciiChar;
-      tmp[1] = '\0';
-      return tmp;
-    }
-  return NULL;
-}
-
-void
-fhandler_console::init (HANDLE f, DWORD a, mode_t bin)
-{
-  // this->fhandler_termios::init (f, mode, bin);
-  /* Ensure both input and output console handles are open */
-  int flags = 0;
-
-  a &= GENERIC_READ | GENERIC_WRITE;
-  if (a == GENERIC_READ)
-    flags = O_RDONLY;
-  if (a == GENERIC_WRITE)
-    flags = O_WRONLY;
-  if (a == (GENERIC_READ | GENERIC_WRITE))
-    flags = O_RDWR;
-  open (flags | O_BINARY);
-  if (f != INVALID_HANDLE_VALUE)
-    CloseHandle (f);	/* Reopened by open */
-
-  tcsetattr (0, &tc->ti);
-}
-
-int
-fhandler_console::igncr_enabled (void)
-{
-  return tc->ti.c_iflag & IGNCR;
-}
-
-void
-fhandler_console::set_close_on_exec (int val)
-{
-  fhandler_base::set_close_on_exec (val);
-  set_inheritance (output_handle, val);
-}
-
-void
-fhandler_console::fixup_after_fork (HANDLE)
-{
-  HANDLE h = get_handle ();
-  HANDLE oh = get_output_handle ();
-
-  /* Windows does not allow duplication of console handles between processes
-     so open the console explicitly. */
-
-  if (!open (O_NOCTTY | get_flags (), 0))
-    system_printf ("error opening console after fork, %E");
-
-  if (!get_close_on_exec ())
-    {
-      CloseHandle (h);
-      CloseHandle (oh);
-    }
-}
-
-void __stdcall
-set_console_title (char *title)
-{
-  int rc;
-  char buf[257];
-  strncpy (buf, title, sizeof (buf) - 1);
-  buf[sizeof (buf) - 1] = '\0';
-  if ((rc = WaitForSingleObject (title_mutex, 15000)) != WAIT_OBJECT_0)
-    sigproc_printf ("wait for title mutex failed rc %d, %E", rc);
-  SetConsoleTitle (buf);
-  ReleaseMutex (title_mutex);
-  debug_printf ("title '%s'", buf);
-}
-
-void
-fhandler_console::fixup_after_exec (HANDLE)
-{
-  HANDLE h = get_handle ();
-  HANDLE oh = get_output_handle ();
-
-  if (!open (O_NOCTTY | get_flags (), 0))
-    {
-      int sawerr = 0;
-      if (!get_io_handle ())
-	{
-	  system_printf ("error opening input console handle after exec, errno %d, %E", get_errno ());
-	  sawerr = 1;
-	}
-      if (!get_output_handle ())
-	{
-	  system_printf ("error opening input console handle after exec, errno %d, %E", get_errno ());
-	  sawerr = 1;
-	}
-
-      if (!sawerr)
-	system_printf ("error opening console after exec, errno %d, %E", get_errno ());
-    }
-
-  CloseHandle (h);
-  CloseHandle (oh);
-  return;
-}
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
deleted file mode 100644
index f86432a31..000000000
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ /dev/null
@@ -1,881 +0,0 @@
-/* fhandler_disk_file.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/cygwin.h>
-#include <signal.h>
-#include "cygerrno.h"
-#include "perprocess.h"
-#include "security.h"
-#include "cygwin/version.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "shared_info.h"
-#include "pinfo.h"
-#include <assert.h>
-#include <ctype.h>
-
-#define _COMPILING_NEWLIB
-#include <dirent.h>
-
-unsigned __stdcall
-path_conv::ndisk_links (DWORD nNumberOfLinks)
-{
-  if (!isdir () || isremote ())
-    return nNumberOfLinks;
-
-  int len = strlen (*this);
-  char fn[len + 3];
-  strcpy (fn, *this);
-
-  const char *s;
-  unsigned count;
-  if (nNumberOfLinks <= 1)
-    {
-      s = "/*";
-      count = 0;
-    }
-  else
-    {
-      s = "/..";
-      count = nNumberOfLinks;
-    }
-
-  if (len == 0 || isdirsep (fn[len - 1]))
-    strcpy (fn + len, s + 1);
-  else
-    strcpy (fn + len, s);
-
-  WIN32_FIND_DATA buf;
-  HANDLE h = FindFirstFile (fn, &buf);
-
-  int saw_dot = 2;
-  if (h != INVALID_HANDLE_VALUE)
-    {
-      if (nNumberOfLinks > 1)
-	saw_dot--;
-      else
-	do
-	  {
-	    if (buf.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-	      count++;
-	    if (buf.cFileName[0] == '.'
-		&& (buf.cFileName[1] == '\0'
-		    || (buf.cFileName[1] == '.' && buf.cFileName[2] == '\0')))
-	      saw_dot--;
-	  }
-	while (FindNextFileA (h, &buf));
-      FindClose (h);
-    }
-
-  if (nNumberOfLinks > 1)
-    {
-      fn[len + 2] = '\0';
-      h = FindFirstFile (fn, &buf);
-      if (h)
-	saw_dot--;
-      FindClose (h);
-    }
-
-  return count + saw_dot;
-}
-
-int __stdcall
-fhandler_base::fstat_by_handle (struct __stat64 *buf)
-{
-  int res = 0;
-  BY_HANDLE_FILE_INFORMATION local;
-
-  /* NT 3.51 seems to have a bug when attempting to get vol serial
-     numbers.  This loop gets around this. */
-  for (int i = 0; i < 2; i++)
-    {
-      if (!(res = GetFileInformationByHandle (get_handle (), &local)))
-	break;
-      if (local.dwVolumeSerialNumber && (long) local.dwVolumeSerialNumber != -1)
-	break;
-    }
-
-  debug_printf ("%d = GetFileInformationByHandle (%s, %d)",
-		res, get_win32_name (), get_handle ());
-  if (res == 0)
-    /* GetFileInformationByHandle will fail if it's given stdin/out/err
-       or a pipe*/
-    {
-      memset (&local, 0, sizeof (local));
-      local.nFileSizeLow = GetFileSize (get_handle (), &local.nFileSizeHigh);
-    }
-
-  return fstat_helper (buf,
-		       local.ftCreationTime,
-		       local.ftLastAccessTime,
-		       local.ftLastWriteTime,
-		       local.nFileSizeHigh,
-		       local.nFileSizeLow,
-		       local.nFileIndexHigh,
-		       local.nFileIndexLow,
-		       local.nNumberOfLinks);
-}
-
-int __stdcall
-fhandler_base::fstat_by_name (struct __stat64 *buf)
-{
-  int res;
-  HANDLE handle;
-  WIN32_FIND_DATA local;
-
-  if (!pc.exists ())
-    {
-      debug_printf ("already determined that pc does not exist");
-      set_errno (ENOENT);
-      res = -1;
-    }
-  else if ((handle = FindFirstFile (pc, &local)) != INVALID_HANDLE_VALUE)
-    {
-      FindClose (handle);
-      res = fstat_helper (buf,
-			  local.ftCreationTime,
-			  local.ftLastAccessTime,
-			  local.ftLastWriteTime,
-			  local.nFileSizeHigh,
-			  local.nFileSizeLow);
-    }
-  else if (pc.isdir ())
-    {
-      FILETIME ft = {};
-      res = fstat_helper (buf, ft, ft, ft, 0, 0);
-    }
-  else
-    {
-      debug_printf ("FindFirstFile failed for '%s', %E", (char *) pc);
-      __seterrno ();
-      res = -1;
-    }
-  return res;
-}
-
-int __stdcall
-fhandler_base::fstat_fs (struct __stat64 *buf)
-{
-  int res = -1;
-  int oret;
-  int open_flags = O_RDONLY | O_BINARY | O_DIROPEN;
-  bool query_open_already;
-
-  if (get_io_handle ())
-    {
-      if (get_nohandle ())
-	return fstat_by_name (buf);
-      else
-	return fstat_by_handle (buf);
-    }
-  /* If we don't care if the file is executable or we already know if it is,
-     then just do a "query open" as it is apparently much faster. */
-  if (pc.exec_state () != dont_know_if_executable)
-    set_query_open (query_open_already = true);
-  else
-    query_open_already = false;
-
-  if (query_open_already && strncasematch (pc.volname (), "FAT", 3)
-      && !strpbrk (get_win32_name (), "?*|<>"))
-    oret = 0;
-  else if (!(oret = open_fs (open_flags, 0))
-	   && !query_open_already
-	   && get_errno () == EACCES)
-    {
-      /* If we couldn't open the file, try a "query open" with no permissions.
-	 This will allow us to determine *some* things about the file, at least. */
-      pc.set_exec (0);
-      set_query_open (true);
-      oret = open_fs (open_flags, 0);
-    }
-
-  if (!oret || get_nohandle ())
-    res = fstat_by_name (buf);
-  else
-    {
-      res = fstat_by_handle (buf);
-      close_fs ();
-    }
-
-  return res;
-}
-
-int __stdcall
-fhandler_base::fstat_helper (struct __stat64 *buf,
-			     FILETIME ftCreationTime,
-			     FILETIME ftLastAccessTime,
-			     FILETIME ftLastWriteTime,
-			     DWORD nFileSizeHigh,
-			     DWORD nFileSizeLow,
-			     DWORD nFileIndexHigh,
-			     DWORD nFileIndexLow,
-			     DWORD nNumberOfLinks)
-{
-  /* This is for FAT filesystems, which don't support atime/ctime */
-  if (ftLastAccessTime.dwLowDateTime == 0
-      && ftLastAccessTime.dwHighDateTime == 0)
-    ftLastAccessTime = ftLastWriteTime;
-  if (ftCreationTime.dwLowDateTime == 0
-      && ftCreationTime.dwHighDateTime == 0)
-    ftCreationTime = ftLastWriteTime;
-
-  to_timestruc_t (&ftLastAccessTime, &buf->st_atim);
-  to_timestruc_t (&ftLastWriteTime, &buf->st_mtim);
-  to_timestruc_t (&ftCreationTime, &buf->st_ctim);
-  buf->st_dev = pc.volser ();
-  buf->st_size = ((_off64_t) nFileSizeHigh << 32) + nFileSizeLow;
-  /* The number of links to a directory includes the
-     number of subdirectories in the directory, since all
-     those subdirectories point to it.
-     This is too slow on remote drives, so we do without it.
-     Setting the count to 2 confuses `find (1)' command. So
-     let's try it with `1' as link count. */
-  buf->st_nlink = pc.ndisk_links (nNumberOfLinks);
-
-  /* Assume that if a drive has ACL support it MAY have valid "inodes".
-     It definitely does not have valid inodes if it does not have ACL
-     support. */
-  switch (pc.has_acls () && (nFileIndexHigh || nFileIndexLow)
-	  ? pc.drive_type () : DRIVE_UNKNOWN)
-    {
-    case DRIVE_FIXED:
-    case DRIVE_REMOVABLE:
-    case DRIVE_CDROM:
-    case DRIVE_RAMDISK:
-      /* Although the documentation indicates otherwise, it seems like
-	 "inodes" on these devices are persistent, at least across reboots. */
-      buf->st_ino = (((__ino64_t) nFileIndexHigh) << 32)
-		    | (__ino64_t) nFileIndexLow;
-      break;
-    default:
-      /* Either the nFileIndex* fields are unreliable or unavailable.  Use the
-	 next best alternative. */
-      buf->st_ino = get_namehash ();
-      break;
-    }
-
-  buf->st_blksize = S_BLKSIZE;
-
-  /* GetCompressedFileSize() gets autoloaded.  It returns INVALID_FILE_SIZE
-     if it doesn't exist.  Since that's also a valid return value on 64bit
-     capable file systems, we must additionally check for the win32 error. */
-  nFileSizeLow = GetCompressedFileSizeA (pc, &nFileSizeHigh);
-  if (nFileSizeLow != INVALID_FILE_SIZE || GetLastError () == NO_ERROR)
-    /* On systems supporting compressed (and sparsed) files,
-       GetCompressedFileSize() returns the actual amount of
-       bytes allocated on disk.  */
-    buf->st_blocks = (((_off64_t)nFileSizeHigh << 32)
-		     + nFileSizeLow + S_BLKSIZE - 1) / S_BLKSIZE;
-  else
-    /* Just compute no. of blocks from file size. */
-    buf->st_blocks  = (buf->st_size + S_BLKSIZE - 1) / S_BLKSIZE;
-
-  buf->st_mode = 0;
-  /* Using a side effect: get_file_attibutes checks for
-     directory. This is used, to set S_ISVTX, if needed.  */
-  if (pc.isdir ())
-    buf->st_mode = S_IFDIR;
-  else if (pc.issymlink ())
-    {
-      /* symlinks are everything for everyone! */
-      buf->st_mode = S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO;
-      get_file_attribute (pc.has_acls (), get_win32_name (), NULL,
-			  &buf->st_uid, &buf->st_gid);
-      goto done;
-    }
-  else if (pc.issocket ())
-    buf->st_mode = S_IFSOCK;
-
-  if (get_file_attribute (pc.has_acls (), get_win32_name (), &buf->st_mode,
-			  &buf->st_uid, &buf->st_gid) == 0)
-    {
-      /* If read-only attribute is set, modify ntsec return value */
-      if (pc.has_attribute (FILE_ATTRIBUTE_READONLY) && !get_symlink_p ())
-	buf->st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
-
-      if (!(buf->st_mode & S_IFMT))
-	buf->st_mode |= S_IFREG;
-    }
-  else
-    {
-      buf->st_mode |= STD_RBITS;
-
-      if (!pc.has_attribute (FILE_ATTRIBUTE_READONLY))
-	buf->st_mode |= STD_WBITS;
-      /* | S_IWGRP | S_IWOTH; we don't give write to group etc */
-
-      if (S_ISDIR (buf->st_mode))
-	buf->st_mode |= S_IFDIR | STD_XBITS;
-      else if (buf->st_mode & S_IFMT)
-	/* nothing */;
-      else if (is_fs_special ())
-	{
-	  buf->st_dev = dev ();
-	  buf->st_mode = dev ().mode;
-	}
-      else
-	{
-	  buf->st_mode |= S_IFREG;
-	  if (pc.exec_state () == dont_know_if_executable)
-	    {
-	      DWORD cur, done;
-	      char magic[3];
-
-	      /* First retrieve current position, set to beginning
-		 of file if not already there. */
-	      cur = SetFilePointer (get_handle (), 0, NULL, FILE_CURRENT);
-	      if (cur != INVALID_SET_FILE_POINTER
-		  && (!cur || SetFilePointer (get_handle (), 0, NULL, FILE_BEGIN)
-		      != INVALID_SET_FILE_POINTER))
-		{
-		  /* FIXME should we use /etc/magic ? */
-		  magic[0] = magic[1] = magic[2] = '\0';
-		  if (ReadFile (get_handle (), magic, 3, &done, NULL)
-		      && has_exec_chars (magic, done))
-		    {
-		      set_execable_p ();
-		      pc.set_exec ();
-		      buf->st_mode |= STD_XBITS;
-		    }
-		  (void) SetFilePointer (get_handle (), cur, NULL, FILE_BEGIN);
-		}
-	    }
-	}
-
-      if (pc.exec_state () == is_executable)
-	buf->st_mode |= STD_XBITS;
-
-      /* This fakes the permissions of all files to match the current umask. */
-      buf->st_mode &= ~(cygheap->umask);
-    }
-
- done:
-  syscall_printf ("0 = fstat (, %p) st_atime=%x st_size=%D, st_mode=%p, st_ino=%d, sizeof=%d",
-		  buf, buf->st_atime, buf->st_size, buf->st_mode,
-		  (int) buf->st_ino, sizeof (*buf));
-  return 0;
-}
-
-int __stdcall
-fhandler_disk_file::fstat (struct __stat64 *buf)
-{
-  return fstat_fs (buf);
-}
-
-fhandler_disk_file::fhandler_disk_file () :
-  fhandler_base ()
-{
-}
-
-int
-fhandler_disk_file::open (int flags, mode_t mode)
-{
-  return open_fs (flags, mode);
-}
-
-int
-fhandler_base::open_fs (int flags, mode_t mode)
-{
-  if (pc.case_clash && flags & O_CREAT)
-    {
-      debug_printf ("case clash detected");
-      set_errno (ECASECLASH);
-      return 0;
-    }
-
-  set_has_acls (pc.has_acls ());
-  set_isremote (pc.isremote ());
-
-  int res = fhandler_base::open (flags | O_DIROPEN, mode);
-  if (!res)
-    goto out;
-
-  /* This is for file systems known for having a buggy CreateFile call
-     which might return a valid HANDLE without having actually opened
-     the file.
-     The only known file system to date is the SUN NFS Solstice Client 3.1
-     which returns a valid handle when trying to open a file in a nonexistent
-     directory. */
-  if (pc.has_buggy_open () && !pc.exists ())
-    {
-      debug_printf ("Buggy open detected.");
-      close_fs ();
-      set_errno (ENOENT);
-      return 0;
-    }
-
-  /* Attributes may be set only if a file is _really_ created.
-     This code is now only used for ntea here since the files
-     security attributes are set in CreateFile () now. */
-  if (flags & O_CREAT
-      && GetLastError () != ERROR_ALREADY_EXISTS
-      && !allow_ntsec && allow_ntea)
-    set_file_attribute (has_acls (), get_win32_name (), mode);
-
-  set_fs_flags (pc.fs_flags ());
-  set_symlink_p (pc.issymlink ());
-  set_execable_p (pc.exec_state ());
-  set_socket_p (pc.issocket ());
-
-out:
-  syscall_printf ("%d = fhandler_disk_file::open (%s, %p)", res,
-		  get_win32_name (), flags);
-  return res;
-}
-
-int
-fhandler_disk_file::close ()
-{
-  return close_fs ();
-}
-
-int
-fhandler_base::close_fs ()
-{
-  int res = fhandler_base::close ();
-  if (!res)
-    user_shared->delqueue.process_queue ();
-  return res;
-}
-
-/* FIXME: The correct way to do this to get POSIX locking semantics is to
-   keep a linked list of posix lock requests and map them into Win32 locks.
-   he problem is that Win32 does not deal correctly with overlapping lock
-   requests. Also another pain is that Win95 doesn't do non-blocking or
-   non-exclusive locks at all. For '95 just convert all lock requests into
-   blocking,exclusive locks.  This shouldn't break many apps but denying all
-   locking would.  For now just convert to Win32 locks and hope for
-   the best.  */
-
-int
-fhandler_disk_file::lock (int cmd, struct __flock64 *fl)
-{
-  _off64_t win32_start;
-  _off64_t win32_len;
-  _off64_t startpos;
-
-  /*
-   * We don't do getlck calls yet.
-   */
-
-  if (cmd == F_GETLK)
-    {
-      set_errno (ENOSYS);
-      return -1;
-    }
-
-  /*
-   * Calculate where in the file to start from,
-   * then adjust this by fl->l_start.
-   */
-
-  switch (fl->l_whence)
-    {
-      case SEEK_SET:
-	startpos = 0;
-	break;
-      case SEEK_CUR:
-	if ((startpos = lseek (0, SEEK_CUR)) == ILLEGAL_SEEK)
-	  return -1;
-	break;
-      case SEEK_END:
-	{
-	  BY_HANDLE_FILE_INFORMATION finfo;
-	  if (GetFileInformationByHandle (get_handle (), &finfo) == 0)
-	    {
-	      __seterrno ();
-	      return -1;
-	    }
-	  startpos = ((_off64_t)finfo.nFileSizeHigh << 32)
-		     + finfo.nFileSizeLow;
-	  break;
-	}
-      default:
-	set_errno (EINVAL);
-	return -1;
-    }
-
-  /*
-   * Now the fun starts. Adjust the start and length
-   *  fields until they make sense.
-   */
-
-  win32_start = startpos + fl->l_start;
-  if (fl->l_len < 0)
-    {
-      win32_start -= fl->l_len;
-      win32_len = -fl->l_len;
-    }
-  else
-    win32_len = fl->l_len;
-
-  if (win32_start < 0)
-    {
-      /* watch the signs! */
-      win32_len -= -win32_start;
-      if (win32_len <= 0)
-	{
-	  /* Failure ! */
-	  set_errno (EINVAL);
-	  return -1;
-	}
-      win32_start = 0;
-    }
-
-  DWORD off_high, off_low, len_high, len_low;
-
-  off_low = (DWORD)(win32_start & UINT32_MAX);
-  off_high = (DWORD)(win32_start >> 32);
-  if (win32_len == 0)
-    {
-      /* Special case if len == 0 for POSIX means lock to the end of
-         the entire file (and all future extensions).  */
-      /* CV, 2003-12-03: And yet another Win 9x bugginess.  For some reason
-	 offset + length must be <= 0x100000000.  I'm using 0xffffffff as
-	 upper border here, this should be sufficient. */
-      len_low = UINT32_MAX - (wincap.lock_file_highword () ? 0 : off_low);
-      len_high = wincap.lock_file_highword ();
-    }
-  else
-    {
-      len_low = (DWORD)(win32_len & UINT32_MAX);
-      len_high = (DWORD)(win32_len >> 32);
-    }
-
-  BOOL res;
-
-  if (wincap.has_lock_file_ex ())
-    {
-      DWORD lock_flags = (cmd == F_SETLK) ? LOCKFILE_FAIL_IMMEDIATELY : 0;
-      lock_flags |= (fl->l_type == F_WRLCK) ? LOCKFILE_EXCLUSIVE_LOCK : 0;
-
-      OVERLAPPED ov;
-
-      ov.Internal = 0;
-      ov.InternalHigh = 0;
-      ov.Offset = off_low;
-      ov.OffsetHigh = off_high;
-      ov.hEvent = (HANDLE) 0;
-
-      if (fl->l_type == F_UNLCK)
-	{
-	  res = UnlockFileEx (get_handle (), 0, len_low, len_high, &ov);
-	}
-      else
-	{
-	  res = LockFileEx (get_handle (), lock_flags, 0,
-			    len_low, len_high, &ov);
-	  /* Deal with the fail immediately case. */
-	  /*
-	   * FIXME !! I think this is the right error to check for
-	   * but I must admit I haven't checked....
-	   */
-	  if ((res == 0) && (lock_flags & LOCKFILE_FAIL_IMMEDIATELY) &&
-			    (GetLastError () == ERROR_LOCK_FAILED))
-	    {
-	      set_errno (EAGAIN);
-	      return -1;
-	    }
-	}
-    }
-  else
-    {
-      /* Windows 95 -- use primitive lock call */
-      if (fl->l_type == F_UNLCK)
-	res = UnlockFile (get_handle (), off_low, off_high, len_low, len_high);
-      else
-	res = LockFile (get_handle (), off_low, off_high, len_low, len_high);
-    }
-
-  if (res == 0)
-    {
-      __seterrno ();
-      return -1;
-    }
-
-  return 0;
-}
-
-DIR *
-fhandler_disk_file::opendir ()
-{
-  DIR *dir;
-  DIR *res = NULL;
-  size_t len;
-
-  if (!pc.isdir ())
-    set_errno (ENOTDIR);
-  else if ((len = strlen (pc)) > CYG_MAX_PATH - 3)
-    set_errno (ENAMETOOLONG);
-  else if ((dir = (DIR *) malloc (sizeof (DIR))) == NULL)
-    set_errno (ENOMEM);
-  else if ((dir->__d_dirname = (char *) malloc (len + 3)) == NULL)
-    {
-      set_errno (ENOMEM);
-      goto free_dir;
-    }
-  else if ((dir->__d_dirent =
-	    (struct dirent *) malloc (sizeof (struct dirent))) == NULL)
-    {
-      set_errno (ENOMEM);
-      goto free_dirname;
-    }
-  else if (access_worker (pc, R_OK, this) != 0)
-    goto free_dirent;
-  else
-    {
-      strcpy (dir->__d_dirname, get_win32_name ());
-      dir->__d_dirent->d_version = __DIRENT_VERSION;
-      cygheap_fdnew fd;
-
-      if (fd < 0)
-	goto free_dirent;
-
-      fd = this;
-      fd->set_nohandle (true);
-      dir->__d_dirent->d_fd = fd;
-      dir->__fh = this;
-      /* FindFirstFile doesn't seem to like duplicate /'s. */
-      len = strlen (dir->__d_dirname);
-      if (len == 0 || isdirsep (dir->__d_dirname[len - 1]))
-	strcat (dir->__d_dirname, "*");
-      else
-	strcat (dir->__d_dirname, "\\*");  /**/
-      dir->__d_cookie = __DIRENT_COOKIE;
-      dir->__handle = INVALID_HANDLE_VALUE;
-      dir->__d_position = 0;
-      dir->__d_dirhash = get_namehash ();
-
-      res = dir;
-
-      if (pc.isencoded ())
-	set_encoded ();
-    }
-
-  syscall_printf ("%p = opendir (%s)", res, get_name ());
-  return res;
-
-free_dirent:
-  free (dir->__d_dirent);
-free_dirname:
-  free (dir->__d_dirname);
-free_dir:
-  free (dir);
-  return res;
-}
-
-struct dirent *
-fhandler_disk_file::readdir (DIR *dir)
-{
-  WIN32_FIND_DATA buf;
-  HANDLE handle;
-  struct dirent *res = NULL;
-
-  if (dir->__handle == INVALID_HANDLE_VALUE
-      && dir->__d_position == 0)
-    {
-      handle = FindFirstFileA (dir->__d_dirname, &buf);
-      DWORD lasterr = GetLastError ();
-      dir->__handle = handle;
-      if (handle == INVALID_HANDLE_VALUE && (lasterr != ERROR_NO_MORE_FILES))
-	{
-	  seterrno_from_win_error (__FILE__, __LINE__, lasterr);
-	  return res;
-	}
-    }
-  else if (dir->__handle == INVALID_HANDLE_VALUE)
-    return res;
-  else if (!FindNextFileA (dir->__handle, &buf))
-    {
-      DWORD lasterr = GetLastError ();
-      (void) FindClose (dir->__handle);
-      dir->__handle = INVALID_HANDLE_VALUE;
-      /* POSIX says you shouldn't set errno when readdir can't
-	 find any more files; so, if another error we leave it set. */
-      if (lasterr != ERROR_NO_MORE_FILES)
-	  seterrno_from_win_error (__FILE__, __LINE__, lasterr);
-      syscall_printf ("%p = readdir (%p)", res, dir);
-      return res;
-    }
-
-  /* Check for Windows shortcut. If it's a Cygwin or U/WIN
-     symlink, drop the .lnk suffix. */
-  if (buf.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
-    {
-      char *c = buf.cFileName;
-      int len = strlen (c);
-      if (strcasematch (c + len - 4, ".lnk"))
-	{
-	  char fbuf[CYG_MAX_PATH + 1];
-	  strcpy (fbuf, dir->__d_dirname);
-	  strcpy (fbuf + strlen (fbuf) - 1, c);
-	  path_conv fpath (fbuf, PC_SYM_NOFOLLOW);
-	  if (fpath.issymlink () || fpath.isspecial ())
-	    c[len - 4] = '\0';
-	}
-    }
-
-  /* We get here if `buf' contains valid data.  */
-  if (get_encoded ())
-    (void) fnunmunge (dir->__d_dirent->d_name, buf.cFileName);
-  else
-    strcpy (dir->__d_dirent->d_name, buf.cFileName);
-
-  dir->__d_position++;
-  res = dir->__d_dirent;
-  syscall_printf ("%p = readdir (%p) (%s)",
-		  &dir->__d_dirent, dir, buf.cFileName);
-  return res;
-}
-
-_off64_t
-fhandler_disk_file::telldir (DIR *dir)
-{
-  return dir->__d_position;
-}
-
-void
-fhandler_disk_file::seekdir (DIR *dir, _off64_t loc)
-{
-    rewinddir (dir);
-    while (loc > dir->__d_position)
-      if (!readdir (dir))
-	break;
-}
-
-void
-fhandler_disk_file::rewinddir (DIR *dir)
-{
-  if (dir->__handle != INVALID_HANDLE_VALUE)
-    {
-      (void) FindClose (dir->__handle);
-      dir->__handle = INVALID_HANDLE_VALUE;
-    }
-  dir->__d_position = 0;
-}
-
-int
-fhandler_disk_file::closedir (DIR *dir)
-{
-  int res = 0;
-  if (dir->__handle != INVALID_HANDLE_VALUE &&
-      FindClose (dir->__handle) == 0)
-    {
-      __seterrno ();
-      res = -1;
-    }
-  syscall_printf ("%d = closedir (%p)", res, dir);
-  return 0;
-}
-
-fhandler_cygdrive::fhandler_cygdrive () :
-  fhandler_disk_file (), ndrives (0), pdrive (NULL)
-{
-}
-
-#define DRVSZ sizeof ("x:\\")
-void
-fhandler_cygdrive::set_drives ()
-{
-  const int len = 2 + 26 * DRVSZ;
-  char *p = const_cast<char *> (get_win32_name ());
-  pdrive = p;
-  ndrives = GetLogicalDriveStrings (len, p) / DRVSZ;
-}
-
-int
-fhandler_cygdrive::fstat (struct __stat64 *buf)
-{
-  if (!iscygdrive_root ())
-    return fhandler_disk_file::fstat (buf);
-  buf->st_mode = S_IFDIR | 0555;
-  if (!ndrives)
-    set_drives ();
-  buf->st_nlink = ndrives + 2;
-  return 0;
-}
-
-DIR *
-fhandler_cygdrive::opendir ()
-{
-  DIR *dir;
-
-  dir = fhandler_disk_file::opendir ();
-  if (dir && iscygdrive_root () && !ndrives)
-    set_drives ();
-
-  return dir;
-}
-
-struct dirent *
-fhandler_cygdrive::readdir (DIR *dir)
-{
-  if (!iscygdrive_root ())
-    return fhandler_disk_file::readdir (dir);
-  if (!pdrive || !*pdrive)
-    return NULL;
-  if (GetFileAttributes (pdrive) == INVALID_FILE_ATTRIBUTES)
-    {
-      pdrive = strchr (pdrive, '\0') + 1;
-      return readdir (dir);
-    }
-
-  *dir->__d_dirent->d_name = cyg_tolower (*pdrive);
-  dir->__d_dirent->d_name[1] = '\0';
-  dir->__d_position++;
-  pdrive = strchr (pdrive, '\0') + 1;
-  syscall_printf ("%p = readdir (%p) (%s)", &dir->__d_dirent, dir,
-		  dir->__d_dirent->d_name);
-  return dir->__d_dirent;
-}
-
-_off64_t
-fhandler_cygdrive::telldir (DIR *dir)
-{
-  return fhandler_disk_file::telldir (dir);
-}
-
-void
-fhandler_cygdrive::seekdir (DIR *dir, _off64_t loc)
-{
-  if (!iscygdrive_root ())
-    return fhandler_disk_file::seekdir (dir, loc);
-
-  for (pdrive = get_win32_name (), dir->__d_position = -1; *pdrive;
-       pdrive = strchr (pdrive, '\0') + 1)
-    if (++dir->__d_position >= loc)
-      break;
-
-  return;
-}
-
-void
-fhandler_cygdrive::rewinddir (DIR *dir)
-{
-  if (!iscygdrive_root ())
-    return fhandler_disk_file::rewinddir (dir);
-  pdrive = get_win32_name ();
-  dir->__d_position = 0;
-  return;
-}
-
-int
-fhandler_cygdrive::closedir (DIR *dir)
-{
-  if (!iscygdrive_root ())
-    return fhandler_disk_file::closedir (dir);
-  pdrive = get_win32_name ();
-  return -1;
-}
diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler_dsp.cc
deleted file mode 100644
index 3c577a89e..000000000
--- a/winsup/cygwin/fhandler_dsp.cc
+++ /dev/null
@@ -1,653 +0,0 @@
-/* fhandler_dev_dsp: code to emulate OSS sound model /dev/dsp
-
-   Copyright 2001, 2002, 2003 Red Hat, Inc
-
-   Written by Andy Younger (andy@snoogie.demon.co.uk)
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdio.h>
-#include <windows.h>
-#include <sys/soundcard.h>
-#include <mmsystem.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-
-//------------------------------------------------------------------------
-// Simple encapsulation of the win32 audio device.
-//
-static void CALLBACK wave_callback (HWAVE hWave, UINT msg, DWORD instance,
-				    DWORD param1, DWORD param2);
-class Audio
-{
-public:
-  enum
-  {
-    MAX_BLOCKS = 12,
-    BLOCK_SIZE = 16384,
-    TOT_BLOCK_SIZE = BLOCK_SIZE + sizeof (WAVEHDR)
-   };
-
-    Audio ();
-   ~Audio ();
-
-  bool open (int rate, int bits, int channels, bool bCallback = false);
-  void close ();
-  int getvolume ();
-  void setvolume (int newVolume);
-  bool write (const void *pSampleData, int nBytes);
-  int blocks ();
-  void callback_sampledone (void *pData);
-  void setformat (int format) {formattype_ = format;}
-  int numbytesoutput ();
-
-  void *operator new (size_t, void *p) {return p;}
-
-private:
-  char *initialisebuffer ();
-  void waitforcallback ();
-  bool flush ();
-
-  HWAVEOUT dev_;
-  volatile int nBlocksInQue_;
-  int nBytesWritten_;
-  char *buffer_;
-  int bufferIndex_;
-  CRITICAL_SECTION lock_;
-  char *freeblocks_[MAX_BLOCKS];
-  int formattype_;
-
-  char bigwavebuffer_[MAX_BLOCKS * TOT_BLOCK_SIZE];
-};
-
-static char audio_buf[sizeof (class Audio)];
-
-Audio::Audio ()
-{
-  InitializeCriticalSection (&lock_);
-  memset (bigwavebuffer_, 0, sizeof (bigwavebuffer_));
-  for (int i = 0; i < MAX_BLOCKS; i++)
-    freeblocks_[i] =  &bigwavebuffer_[i * TOT_BLOCK_SIZE];
-}
-
-Audio::~Audio ()
-{
-  if (dev_)
-    close ();
-  DeleteCriticalSection (&lock_);
-}
-
-bool
-Audio::open (int rate, int bits, int channels, bool bCallback)
-{
-  WAVEFORMATEX format;
-  int nDevices = waveOutGetNumDevs ();
-
-  nBytesWritten_ = 0L;
-  bufferIndex_ = 0;
-  buffer_ = 0L;
-  debug_printf ("number devices %d", nDevices);
-  if (nDevices <= 0)
-    return false;
-
-  debug_printf ("trying to map device freq %d, bits %d, "
-		"channels %d, callback %d", rate, bits, channels,
-		bCallback);
-
-  int bytesperSample = bits / 8;
-
-  memset (&format, 0, sizeof (format));
-  format.wFormatTag = WAVE_FORMAT_PCM;
-  format.wBitsPerSample = bits;
-  format.nChannels = channels;
-  format.nSamplesPerSec = rate;
-  format.nAvgBytesPerSec = format.nSamplesPerSec * format.nChannels *
-    bytesperSample;
-  format.nBlockAlign = format.nChannels * bytesperSample;
-
-  nBlocksInQue_ = 0;
-  HRESULT res = waveOutOpen (&dev_, WAVE_MAPPER, &format, (DWORD) wave_callback,
-			     (DWORD) this, bCallback ? CALLBACK_FUNCTION : 0);
-  if (res == S_OK)
-    {
-      debug_printf ("Sucessfully opened!");
-      return true;
-    }
-  else
-    {
-      debug_printf ("failed to open");
-      return false;
-    }
-}
-
-void
-Audio::close ()
-{
-  if (dev_)
-    {
-      flush ();			// force out last block whatever size..
-
-      while (blocks ())		// block till finished..
-	waitforcallback ();
-
-      waveOutReset (dev_);
-      waveOutClose (dev_);
-      dev_ = 0L;
-    }
-  nBytesWritten_ = 0L;
-}
-
-int
-Audio::numbytesoutput ()
-{
-  return nBytesWritten_;
-}
-
-int
-Audio::getvolume ()
-{
-  DWORD volume;
-
-  waveOutGetVolume (dev_, &volume);
-  return ((volume >> 16) + (volume & 0xffff)) >> 1;
-}
-
-void
-Audio::setvolume (int newVolume)
-{
-  waveOutSetVolume (dev_, (newVolume << 16) | newVolume);
-}
-
-char *
-Audio::initialisebuffer ()
-{
-  EnterCriticalSection (&lock_);
-  WAVEHDR *pHeader = 0L;
-  for (int i = 0; i < MAX_BLOCKS; i++)
-    {
-      char *pData = freeblocks_[i];
-      if (pData)
-	{
-	  pHeader = (WAVEHDR *) pData;
-	  if (pHeader->dwFlags & WHDR_DONE)
-	    {
-	      waveOutUnprepareHeader (dev_, pHeader, sizeof (WAVEHDR));
-	    }
-	  freeblocks_[i] = 0L;
-	  break;
-	}
-    }
-  LeaveCriticalSection (&lock_);
-
-  if (pHeader)
-    {
-      memset (pHeader, 0, sizeof (WAVEHDR));
-      pHeader->dwBufferLength = BLOCK_SIZE;
-      pHeader->lpData = (LPSTR) (&pHeader[1]);
-      return (char *) pHeader->lpData;
-    }
-  return 0L;
-}
-
-bool
-Audio::write (const void *pSampleData, int nBytes)
-{
-  // split up big blocks into smaller BLOCK_SIZE chunks
-  while (nBytes > BLOCK_SIZE)
-    {
-      write (pSampleData, BLOCK_SIZE);
-      nBytes -= BLOCK_SIZE;
-      pSampleData = (void *) ((char *) pSampleData + BLOCK_SIZE);
-    }
-
-  // Block till next sound is flushed
-  if (blocks () == MAX_BLOCKS)
-    waitforcallback ();
-
-  // Allocate new wave buffer if necessary
-  if (buffer_ == 0L)
-    {
-      buffer_ = initialisebuffer ();
-      if (buffer_ == 0L)
-	return false;
-    }
-
-
-  // Handle gathering blocks into larger buffer
-  int sizeleft = BLOCK_SIZE - bufferIndex_;
-  if (nBytes < sizeleft)
-    {
-      memcpy (&buffer_[bufferIndex_], pSampleData, nBytes);
-      bufferIndex_ += nBytes;
-      nBytesWritten_ += nBytes;
-      return true;
-    }
-
-  // flushing when we reach our limit of BLOCK_SIZE
-  memcpy (&buffer_[bufferIndex_], pSampleData, sizeleft);
-  bufferIndex_ += sizeleft;
-  nBytesWritten_ += sizeleft;
-  flush ();
-
-  // change pointer to rest of sample, and size accordingly
-  pSampleData = (void *) ((char *) pSampleData + sizeleft);
-  nBytes -= sizeleft;
-
-  // if we still have some sample left over write it out
-  if (nBytes)
-    return write (pSampleData, nBytes);
-
-  return true;
-}
-
-// return number of blocks back.
-int
-Audio::blocks ()
-{
-  EnterCriticalSection (&lock_);
-  int ret = nBlocksInQue_;
-  LeaveCriticalSection (&lock_);
-  return ret;
-}
-
-// This is called on an interupt so use locking.. Note nBlocksInQue_ is
-// modified by it so we should wrap all references to it in locks.
-void
-Audio::callback_sampledone (void *pData)
-{
-  EnterCriticalSection (&lock_);
-
-  nBlocksInQue_--;
-  for (int i = 0; i < MAX_BLOCKS; i++)
-    if (!freeblocks_[i])
-      {
-	freeblocks_[i] = (char *) pData;
-	break;
-      }
-
-  LeaveCriticalSection (&lock_);
-}
-
-void
-Audio::waitforcallback ()
-{
-  int n = blocks ();
-  if (!n)
-    return;
-  do
-    {
-      Sleep (250);
-    }
-  while (n == blocks ());
-}
-
-bool
-Audio::flush ()
-{
-  if (!buffer_)
-    return false;
-
-  // Send internal buffer out to the soundcard
-  WAVEHDR *pHeader = ((WAVEHDR *) buffer_) - 1;
-  pHeader->dwBufferLength = bufferIndex_;
-
-  // Quick bit of sample buffer conversion
-  if (formattype_ == AFMT_S8)
-    {
-      unsigned char *p = ((unsigned char *) buffer_);
-      for (int i = 0; i < bufferIndex_; i++)
-	{
-	  p[i] -= 0x7f;
-	}
-    }
-
-  if (waveOutPrepareHeader (dev_, pHeader, sizeof (WAVEHDR)) == S_OK &&
-      waveOutWrite (dev_, pHeader, sizeof (WAVEHDR)) == S_OK)
-    {
-      EnterCriticalSection (&lock_);
-      nBlocksInQue_++;
-      LeaveCriticalSection (&lock_);
-      bufferIndex_ = 0;
-      buffer_ = 0L;
-      return true;
-    }
-  else
-    {
-      EnterCriticalSection (&lock_);
-      for (int i = 0; i < MAX_BLOCKS; i++)
-	if (!freeblocks_[i])
-	  {
-	    freeblocks_[i] = (char *) pHeader;
-	    break;
-	  }
-      LeaveCriticalSection (&lock_);
-    }
-  return false;
-}
-
-//------------------------------------------------------------------------
-// Call back routine
-static void CALLBACK
-wave_callback (HWAVE hWave, UINT msg, DWORD instance, DWORD param1,
-	       DWORD param2)
-{
-  if (msg == WOM_DONE)
-    {
-      Audio *ptr = (Audio *) instance;
-      ptr->callback_sampledone ((void *) param1);
-    }
-}
-
-//------------------------------------------------------------------------
-// /dev/dsp handler
-static Audio *s_audio;		// static instance of the Audio handler
-
-//------------------------------------------------------------------------
-// wav file detection..
-#pragma pack(1)
-struct wavchunk
-{
-  char id[4];
-  unsigned int len;
-};
-struct wavformat
-{
-  unsigned short wFormatTag;
-  unsigned short wChannels;
-  unsigned int dwSamplesPerSec;
-  unsigned int dwAvgBytesPerSec;
-  unsigned short wBlockAlign;
-  unsigned short wBitsPerSample;
-};
-#pragma pack()
-
-bool
-fhandler_dev_dsp::setupwav (const char *pData, int nBytes)
-{
-  int len;
-  const char *end = pData + nBytes;
-
-  if (!(pData[0] == 'R' && pData[1] == 'I' &&
-	pData[2] == 'F' && pData[3] == 'F'))
-    return false;
-  if (!(pData[8] == 'W' && pData[9] == 'A' &&
-	pData[10] == 'V' && pData[11] == 'E'))
-    return false;
-
-  len = *(int *) &pData[4];
-  pData += 12;
-  while (len && pData < end)
-    {
-      wavchunk * pChunk = (wavchunk *) pData;
-      int blklen = pChunk-> len;
-      if (pChunk->id[0] == 'f' && pChunk->id[1] == 'm' &&
-	  pChunk->id[2] == 't' && pChunk->id[3] == ' ')
-	{
-	  wavformat *format = (wavformat *) (pChunk + 1);
-	  if ((char *) (format + 1) > end)
-	    return false;
-
-	  // Open up audio device with correct frequency for wav file
-	  //
-	  // FIXME: should through away all the header & not output
-	  // it to the soundcard.
-	  s_audio->close ();
-	  if (s_audio->open (format->dwSamplesPerSec, format->wBitsPerSample,
-			     format->wChannels) == false)
-	    {
-	      s_audio->open (audiofreq_, audiobits_, audiochannels_);
-	    }
-	  else
-	    {
-	      audiofreq_ = format->dwSamplesPerSec;
-	      audiobits_ = format->wBitsPerSample;
-	      audiochannels_ = format->wChannels;
-	    }
-	  return true;
-	}
-
-      pData += blklen + sizeof (wavchunk);
-    }
-  return false;
-}
-
-//------------------------------------------------------------------------
-fhandler_dev_dsp::fhandler_dev_dsp ():
-  fhandler_base ()
-{
-}
-
-fhandler_dev_dsp::~fhandler_dev_dsp ()
-{
-}
-
-int
-fhandler_dev_dsp::open (int flags, mode_t mode)
-{
-  // currently we only support writing
-  if ((flags & (O_WRONLY | O_RDONLY | O_RDWR)) != O_WRONLY)
-    {
-      set_errno (EACCES);
-      return 0;
-    }
-
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-
-  if (!s_audio)
-    s_audio = new (audio_buf) Audio;
-
-  // Work out initial sample format & frequency
-      // dev/dsp defaults
-  audioformat_ = AFMT_S8;
-  audiofreq_ = 8000;
-  audiobits_ = 8;
-  audiochannels_ = 1;
-
-  int res;
-  if (!s_audio->open (audiofreq_, audiobits_, audiochannels_))
-    res = 0;
-  else
-    {
-      set_open_status ();
-      res = 1;
-    }
-
-  debug_printf ("returns %d", res);
-  return res;
-}
-
-int
-fhandler_dev_dsp::write (const void *ptr, size_t len)
-{
-  if (s_audio->numbytesoutput () == 0)
-    {
-      // check for wave file & setup frequencys properly if possible.
-      setupwav ((const char *) ptr, len);
-
-      // Open audio device properly with callbacks.
-      s_audio->close ();
-      if (!s_audio->open (audiofreq_, audiobits_, audiochannels_, true))
-	return 0;
-    }
-
-  s_audio->write (ptr, len);
-  return len;
-}
-
-void __stdcall
-fhandler_dev_dsp::read (void *ptr, size_t& len)
-{
-  return;
-}
-
-_off64_t
-fhandler_dev_dsp::lseek (_off64_t offset, int whence)
-{
-  return 0;
-}
-
-int
-fhandler_dev_dsp::close (void)
-{
-  s_audio->close ();
-  return 0;
-}
-
-int
-fhandler_dev_dsp::dup (fhandler_base * child)
-{
-  fhandler_dev_dsp *fhc = (fhandler_dev_dsp *) child;
-
-  fhc->set_flags (get_flags ());
-  fhc->audiochannels_ = audiochannels_;
-  fhc->audiobits_ = audiobits_;
-  fhc->audiofreq_ = audiofreq_;
-  fhc->audioformat_ = audioformat_;
-  return 0;
-}
-
-int
-fhandler_dev_dsp::ioctl (unsigned int cmd, void *ptr)
-{
-  int *intptr = (int *) ptr;
-  switch (cmd)
-    {
-#define CASE(a) case a : debug_printf("/dev/dsp: ioctl %s", #a);
-
-      CASE (SNDCTL_DSP_RESET)
-	audioformat_ = AFMT_S8;
-	audiofreq_ = 8000;
-	audiobits_ = 8;
-	audiochannels_ = 1;
-	return 0;
-
-      CASE (SNDCTL_DSP_GETBLKSIZE)
-	*intptr = Audio::BLOCK_SIZE;
-	return 0;
-
-      CASE (SNDCTL_DSP_SETFMT)
-      {
-	int nBits = 0;
-	if (*intptr == AFMT_S16_LE)
-	  nBits = 16;
-	else if (*intptr == AFMT_U8)
-	  nBits = 8;
-	else if (*intptr == AFMT_S8)
-	  nBits = 8;
-	if (nBits)
-	  {
-	    s_audio->setformat (*intptr);
-	    s_audio->close ();
-	    if (s_audio->open (audiofreq_, nBits, audiochannels_) == true)
-	      {
-		audiobits_ = nBits;
-		return 0;
-	      }
-	    else
-	      {
-		s_audio->open (audiofreq_, audiobits_, audiochannels_);
-		return -1;
-	      }
-	  }
-      }
-      break;
-
-      CASE (SNDCTL_DSP_SPEED)
-	s_audio->close ();
-	if (s_audio->open (*intptr, audiobits_, audiochannels_) == true)
-	  {
-	    audiofreq_ = *intptr;
-	    return 0;
-	  }
-	else
-	  {
-	    s_audio->open (audiofreq_, audiobits_, audiochannels_);
-	    return -1;
-	  }
-	break;
-
-      CASE (SNDCTL_DSP_STEREO)
-      {
-	int nChannels = *intptr + 1;
-
-	s_audio->close ();
-	if (s_audio->open (audiofreq_, audiobits_, nChannels) == true)
-	  {
-	    audiochannels_ = nChannels;
-	    return 0;
-	  }
-	else
-	  {
-	    s_audio->open (audiofreq_, audiobits_, audiochannels_);
-	    return -1;
-	  }
-      }
-      break;
-
-      CASE (SNDCTL_DSP_GETOSPACE)
-      {
-	audio_buf_info *p = (audio_buf_info *) ptr;
-
-	int nBlocks = s_audio->blocks ();
-	int leftblocks = ((Audio::MAX_BLOCKS - nBlocks) - 1);
-	if (leftblocks < 0)
-	  leftblocks = 0;
-	if (leftblocks > 1)
-	  leftblocks = 1;
-	int left = leftblocks * Audio::BLOCK_SIZE;
-
-	p->fragments = leftblocks;
-	p->fragstotal = Audio::MAX_BLOCKS;
-	p->fragsize = Audio::BLOCK_SIZE;
-	p->bytes = left;
-
-	debug_printf ("ptr %p nblocks %d leftblocks %d left bytes %d ",
-		      ptr, nBlocks, leftblocks, left);
-
-	return 0;
-      }
-      break;
-
-      CASE (SNDCTL_DSP_SETFRAGMENT)
-      {
-	// Fake!! esound & mikmod require this on non PowerPC platforms.
-	//
-	return 0;
-      }
-      break;
-
-      CASE (SNDCTL_DSP_GETFMTS)
-      {
-	*intptr = AFMT_S16_LE | AFMT_U8 | AFMT_S8; // more?
-	return 0;
-      }
-      break;
-
-    default:
-      debug_printf ("/dev/dsp: ioctl not handled yet! FIXME:");
-      break;
-
-#undef CASE
-    };
-  return -1;
-}
-
-void
-fhandler_dev_dsp::dump ()
-{
-  paranoid_printf ("here, fhandler_dev_dsp");
-}
-
-void
-fhandler_dev_dsp::fixup_after_exec (HANDLE)
-{
-  /* FIXME:  Is there a better way to do this? */
-  s_audio = new (audio_buf) Audio;
-}
diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc
deleted file mode 100644
index d886899f7..000000000
--- a/winsup/cygwin/fhandler_fifo.cc
+++ /dev/null
@@ -1,207 +0,0 @@
-/* fhandler_fifo.cc.  See fhandler.h for a description of the fhandler classes.
-
-   Copyright 2002, 2003 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include "winsup.h"
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "cygerrno.h"
-#include "perprocess.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "pinfo.h"
-
-fhandler_fifo::fhandler_fifo ()
-  : fhandler_pipe (), output_handle (NULL), owner (NULL), upand (0),
-    read_use (0), write_use (0)
-{
-}
-
-void
-fhandler_fifo::set_use (int incr)
-{
-  long oread_use = read_use;
-
-  if (get_flags () & (O_WRONLY | O_APPEND))
-    write_use += incr;
-  else if (get_flags () & O_RDWR)
-    {
-      write_use += incr;
-      read_use += incr;
-    }
-  else
-    read_use += incr;
-
-  if (incr >= 0)
-    return;
-  char buf[24];
-  __small_sprintf (buf, "%x.%x", upand, myself->pid);
-  ATOM ant = GlobalFindAtom (buf);
-  if (!ant)
-    return;
-  if (read_use <= 0 && oread_use != read_use)
-    {
-      HANDLE h = get_handle ();
-      if (h)
-	{
-	  set_io_handle (NULL);
-	  CloseHandle (h);
-	}
-      DeleteAtom (ant);
-    }
-}
-
-int
-fhandler_fifo::close ()
-{
-  fhandler_pipe::close ();
-  CloseHandle (get_output_handle ());
-  set_use (-1);
-  return 0;
-}
-
-#define DUMMY_O_RDONLY 4
-int
-fhandler_fifo::open_not_mine (int flags)
-{
-  char buf[24];
-  winpids pids;
-  static int flagtypes[] = {DUMMY_O_RDONLY | O_RDWR, O_WRONLY | O_APPEND | O_RDWR};
-  HANDLE *usehandles[2] = {&(get_handle ()), &(get_output_handle ())};
-  int res;
-
-  for (unsigned i = 0; i < pids.npids; i++)
-    {
-      _pinfo *p = pids[i];
-      __small_sprintf (buf, "%x.%x", upand, p->pid);
-      if (!GlobalFindAtom (buf))
-	continue;
-
-      HANDLE hp = OpenProcess (PROCESS_DUP_HANDLE, false, p->dwProcessId);
-      if (!hp)
-	{
-	  __seterrno ();
-	  goto err;
-	}
-
-      HANDLE handles[2];
-      commune_result r;
-      r = p->commune_send (PICOM_FIFO, upand);
-      flags = (flags & (O_RDWR | O_WRONLY | O_APPEND)) ?: DUMMY_O_RDONLY;
-      for (int i = 0; i < 2; i++)
-	{
-	  if (!(flags & flagtypes[i]))
-	    continue;
-	   if (!DuplicateHandle (hp, r.handles[i], hMainProc, usehandles[i], 0,
-				 false, DUPLICATE_SAME_ACCESS))
-	    {
-	      debug_printf ("couldn't duplicate handle %d/%p, %E", i, handles[i]);
-	      __seterrno ();
-	      goto err;
-	    }
-
-	  if (i == 0)
-	    {
-	      read_state = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
-	      set_need_fork_fixup ();
-	    }
-	}
-      CloseHandle (hp);
-
-      res = 1;
-      set_flags (flags);
-      goto out;
-    }
-
-  set_errno (EAGAIN);
-
-err:
-  res = 0;
-  debug_printf ("failed");
-
-out:
-  debug_printf ("res %d", res);
-  return res;
-}
-
-int
-fhandler_fifo::open (int flags, mode_t)
-{
-  int res = 1;
-  char buf[24];
-
-  upand = GlobalAddAtom (pc);
-  __small_sprintf (buf, "%x.owner", upand);
-  debug_printf ("mutex %s", buf);
-
-  HANDLE h = CreateMutex (&sec_none, false, buf);
-  if (!h)
-    goto errnout;
-
-  if (GetLastError () == ERROR_ALREADY_EXISTS)
-    {
-      CloseHandle (h);
-      return open_not_mine (flags);
-    }
-
-  fhandler_pipe *fhs[2];
-  if (create (fhs, 0, flags, true))
-    {
-      CloseHandle (h);
-      goto errout;
-    }
-
-  set_flags (fhs[0]->get_flags ());
-  set_io_handle (fhs[0]->get_handle ());
-  set_output_handle (fhs[1]->get_handle ());
-  guard = fhs[0]->guard;
-  read_state = fhs[0]->read_state;
-  writepipe_exists = fhs[1]->writepipe_exists;
-  orig_pid = fhs[0]->orig_pid;
-  id = fhs[0]->id;
-  delete (fhs[0]);
-  delete (fhs[1]);
-  set_use (1);
-  __small_sprintf (buf, "%x.%x", upand, myself->pid);
-  (void) GlobalAddAtom (buf);
-  goto out;
-
-errnout:
-  __seterrno ();
-errout:
-  res = 0;
-
-out:
-  debug_printf ("returning %d, errno %d", res, get_errno ());
-  return res;
-}
-
-int
-fhandler_fifo::dup (fhandler_base * child)
-{
-  int res = fhandler_pipe::dup (child);
-  if (!res)
-    {
-      fhandler_fifo *ff = (fhandler_fifo *) child;
-
-      if (!DuplicateHandle (hMainProc, get_output_handle (), hMainProc,
-			    &ff->get_output_handle (), false, true,
-			    DUPLICATE_SAME_ACCESS))
-	{
-	  child->close ();
-	  res = -1;
-	}
-    }
-  return 0;
-}
diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc
deleted file mode 100644
index e849a5357..000000000
--- a/winsup/cygwin/fhandler_floppy.cc
+++ /dev/null
@@ -1,316 +0,0 @@
-/* fhandler_floppy.cc.  See fhandler.h for a description of the
-   fhandler classes.
-
-   Copyright 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <sys/termios.h>
-#include <unistd.h>
-#include <winioctl.h>
-#include <asm/socket.h>
-#include <cygwin/hdreg.h>
-#include <cygwin/fs.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "cygerrno.h"
-
-/**********************************************************************/
-/* fhandler_dev_floppy */
-
-int
-fhandler_dev_floppy::is_eom (int win_error)
-{
-  int ret = (win_error == ERROR_INVALID_PARAMETER);
-  if (ret)
-    debug_printf ("end of medium");
-  return ret;
-}
-
-int
-fhandler_dev_floppy::is_eof (int)
-{
-  int ret = 0;
-  if (ret)
-    debug_printf ("end of file");
-  return ret;
-}
-
-fhandler_dev_floppy::fhandler_dev_floppy ()
-  : fhandler_dev_raw ()
-{
-}
-
-int
-fhandler_dev_floppy::open (int flags, mode_t)
-{
-  /* The correct size of the buffer would be 512 bytes,
-   * which is the atomic size, supported by WinNT.
-   * Unfortunately, the performance is worse than
-   * access to file system on same device!
-   * Setting buffer size to a relatively big value
-   * increases performance by means.
-   * The new ioctl call with 'rdevio.h' header file
-   * supports changing this value.
-   *
-   * Let's be smart: Let's take a multiplier of typical tar
-   * and cpio buffer sizes by default!
-  */
-  devbufsiz = 61440L; /* 512L; */
-  return fhandler_dev_raw::open (flags);
-}
-
-int
-fhandler_dev_floppy::close (void)
-{
-  int ret;
-
-  ret = writebuf ();
-  if (ret)
-    {
-      fhandler_dev_raw::close ();
-      return ret;
-    }
-  return fhandler_dev_raw::close ();
-}
-
-_off64_t
-fhandler_dev_floppy::lseek (_off64_t offset, int whence)
-{
-  int ret;
-  char buf[512];
-  _off64_t drive_size = 0;
-  _off64_t lloffset = offset;
-  _off64_t current_position;
-  _off64_t sector_aligned_offset;
-  _off64_t bytes_left;
-  DWORD low;
-  LONG high = 0;
-
-  DISK_GEOMETRY di;
-  PARTITION_INFORMATION pi;
-  DWORD bytes_read;
-
-  if (!DeviceIoControl (get_handle (),
-			  IOCTL_DISK_GET_DRIVE_GEOMETRY,
-			  NULL, 0,
-			  &di, sizeof (di),
-			  &bytes_read, NULL))
-    {
-      __seterrno ();
-      return -1;
-    }
-  debug_printf ("disk geometry: (%ld cyl)*(%ld trk)*(%ld sec)*(%ld bps)",
-		 di.Cylinders.LowPart,
-		 di.TracksPerCylinder,
-		 di.SectorsPerTrack,
-		 di.BytesPerSector);
-  if (DeviceIoControl (get_handle (),
-			 IOCTL_DISK_GET_PARTITION_INFO,
-			 NULL, 0,
-			 &pi, sizeof (pi),
-			 &bytes_read, NULL))
-    {
-      debug_printf ("partition info: %ld (%ld)",
-		      pi.StartingOffset.LowPart,
-		      pi.PartitionLength.LowPart);
-      drive_size = pi.PartitionLength.QuadPart;
-    }
-  else
-    {
-      drive_size = di.Cylinders.QuadPart * di.TracksPerCylinder *
-		   di.SectorsPerTrack * di.BytesPerSector;
-    }
-  debug_printf ("drive size: %ld", drive_size);
-
-  if (whence == SEEK_END && drive_size > 0)
-    {
-      lloffset = offset + drive_size;
-      whence = SEEK_SET;
-    }
-
-  if (whence == SEEK_CUR)
-    {
-      low = SetFilePointer (get_handle (), 0, &high, FILE_CURRENT);
-      if (low == INVALID_SET_FILE_POINTER && GetLastError ())
-	{
-	  __seterrno ();
-	  return -1;
-	}
-      current_position = low + ((_off64_t) high << 32);
-      if (is_writing)
-	current_position += devbufend - devbufstart;
-      else
-	current_position -= devbufend - devbufstart;
-
-      lloffset += current_position;
-      whence = SEEK_SET;
-    }
-
-  if (lloffset < 0 ||
-      drive_size > 0 && lloffset > drive_size)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  /* FIXME: sector can possibly be not 512 bytes long */
-  sector_aligned_offset = (lloffset / 512) * 512;
-  bytes_left = lloffset - sector_aligned_offset;
-
-  if (whence == SEEK_SET)
-    {
-      /* Invalidate buffer. */
-      ret = writebuf ();
-      if (ret)
-	return ret;
-      devbufstart = devbufend = 0;
-
-      low = sector_aligned_offset & UINT32_MAX;
-      high = sector_aligned_offset >> 32;
-      if (SetFilePointer (get_handle (), low, &high, FILE_BEGIN)
-	  == INVALID_SET_FILE_POINTER && GetLastError ())
-	{
-	  __seterrno ();
-	  return -1;
-	}
-
-      size_t len = bytes_left;
-      raw_read (buf, len);
-      return sector_aligned_offset + bytes_left;
-    }
-
-  set_errno (EINVAL);
-  return -1;
-}
-
-int
-fhandler_dev_floppy::ioctl (unsigned int cmd, void *buf)
-{
-  DISK_GEOMETRY di;
-  PARTITION_INFORMATION pi;
-  DWORD bytes_read;
-  _off64_t drive_size = 0;
-  _off64_t start = 0;
-  switch (cmd)
-    {
-    case HDIO_GETGEO:
-      {
-	debug_printf ("HDIO_GETGEO");
-	if (!DeviceIoControl (get_handle (),
-			      IOCTL_DISK_GET_DRIVE_GEOMETRY,
-			      NULL, 0,
-			      &di, sizeof (di),
-			      &bytes_read, NULL))
-	  {
-	    __seterrno ();
-	    return -1;
-	  }
-	debug_printf ("disk geometry: (%ld cyl)*(%ld trk)*(%ld sec)*(%ld bps)",
-		      di.Cylinders.LowPart,
-		      di.TracksPerCylinder,
-		      di.SectorsPerTrack,
-		      di.BytesPerSector);
-	if (DeviceIoControl (get_handle (),
-			     IOCTL_DISK_GET_PARTITION_INFO,
-			     NULL, 0,
-			     &pi, sizeof (pi),
-			     &bytes_read, NULL))
-	  {
-	    debug_printf ("partition info: %ld (%ld)",
-			  pi.StartingOffset.LowPart,
-			  pi.PartitionLength.LowPart);
-	    start = pi.StartingOffset.QuadPart >> 9ULL;
-	  }
-	struct hd_geometry *geo = (struct hd_geometry *) buf;
-	geo->heads = di.TracksPerCylinder;
-	geo->sectors = di.SectorsPerTrack;
-	geo->cylinders = di.Cylinders.LowPart;
-	geo->start = start;
-	return 0;
-      }
-    case BLKGETSIZE:
-    case BLKGETSIZE64:
-      {
-	debug_printf ("BLKGETSIZE");
-	if (!DeviceIoControl (get_handle (),
-			      IOCTL_DISK_GET_DRIVE_GEOMETRY,
-			      NULL, 0,
-			      &di, sizeof (di),
-			      &bytes_read, NULL))
-	  {
-	    __seterrno ();
-	    return -1;
-	  }
-	debug_printf ("disk geometry: (%ld cyl)*(%ld trk)*(%ld sec)*(%ld bps)",
-		      di.Cylinders.LowPart,
-		      di.TracksPerCylinder,
-		      di.SectorsPerTrack,
-		      di.BytesPerSector);
-	if (DeviceIoControl (get_handle (),
-			     IOCTL_DISK_GET_PARTITION_INFO,
-			     NULL, 0,
-			     &pi, sizeof (pi),
-			     &bytes_read, NULL))
-	  {
-	    debug_printf ("partition info: %ld (%ld)",
-			  pi.StartingOffset.LowPart,
-			  pi.PartitionLength.LowPart);
-	    drive_size = pi.PartitionLength.QuadPart;
-	  }
-	else
-	  {
-	    drive_size = di.Cylinders.QuadPart * di.TracksPerCylinder *
-			 di.SectorsPerTrack * di.BytesPerSector;
-	  }
-	if (cmd == BLKGETSIZE)
-	  *(long *)buf = drive_size >> 9UL;
-	else
-	  *(_off64_t *)buf = drive_size;
-	return 0;
-      }
-    case BLKRRPART:
-      {
-	debug_printf ("BLKRRPART");
-	if (!DeviceIoControl (get_handle (),
-			      IOCTL_DISK_UPDATE_DRIVE_SIZE,
-			      NULL, 0,
-			      &di, sizeof (di),
-			      &bytes_read, NULL))
-	  {
-	    __seterrno ();
-	    return -1;
-	  }
-	return 0;
-      }
-    case BLKSSZGET:
-      {
-	debug_printf ("BLKSSZGET");
-	if (!DeviceIoControl (get_handle (),
-			      IOCTL_DISK_GET_DRIVE_GEOMETRY,
-			      NULL, 0,
-			      &di, sizeof (di),
-			      &bytes_read, NULL))
-	  {
-	    __seterrno ();
-	    return -1;
-	  }
-	debug_printf ("disk geometry: (%ld cyl)*(%ld trk)*(%ld sec)*(%ld bps)",
-		      di.Cylinders.LowPart,
-		      di.TracksPerCylinder,
-		      di.SectorsPerTrack,
-		      di.BytesPerSector);
-	*(int *)buf = di.BytesPerSector;
-	return 0;
-      }
-    default:
-      return fhandler_dev_raw::ioctl (cmd, buf);
-    }
-}
-
diff --git a/winsup/cygwin/fhandler_mem.cc b/winsup/cygwin/fhandler_mem.cc
deleted file mode 100644
index b9807d133..000000000
--- a/winsup/cygwin/fhandler_mem.cc
+++ /dev/null
@@ -1,439 +0,0 @@
-/* fhandler_mem.cc.  See fhandler.h for a description of the fhandler classes.
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <sys/mman.h>
-#include <ntdef.h>
-
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "ntdll.h"
-
-/**********************************************************************/
-/* fhandler_dev_mem */
-
-fhandler_dev_mem::fhandler_dev_mem ()
-  : fhandler_base ()
-{
-  /* Reading physical memory only supported on NT/W2K. */
-  if (!wincap.has_physical_mem_access ())
-    {
-      mem_size = 0;
-      return;
-    }
-
-  if (dev () == FH_MEM) /* /dev/mem */
-    {
-      NTSTATUS ret;
-      SYSTEM_BASIC_INFORMATION sbi;
-      if ((ret = NtQuerySystemInformation (SystemBasicInformation, (PVOID) &sbi,
-					   sizeof sbi, NULL)) != STATUS_SUCCESS)
-	{
-	  __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-	  debug_printf("NtQuerySystemInformation: ret = %d, Dos(ret) = %d",
-		       ret, RtlNtStatusToDosError (ret));
-	  mem_size = 0;
-	}
-      else
-	mem_size = sbi.PhysicalPageSize * sbi.NumberOfPhysicalPages;
-      debug_printf ("MemSize: %d MB", mem_size >> 20);
-    }
-  else if (dev () == FH_KMEM) /* /dev/kmem - Not yet supported */
-    {
-      mem_size = 0;
-      debug_printf ("KMemSize: %d MB", mem_size >> 20);
-    }
-  else if (dev () == FH_ZERO) /* /dev/port == First 64K of /dev/mem */
-    {
-      mem_size = 65536;
-      debug_printf ("PortSize: 64 KB");
-    }
-  else
-    {
-      mem_size = 0;
-      debug_printf ("Illegal minor number!!!");
-    }
-}
-
-fhandler_dev_mem::~fhandler_dev_mem (void)
-{
-}
-
-int
-fhandler_dev_mem::open (int flags, mode_t)
-{
-  if (!wincap.has_physical_mem_access ())
-    {
-      set_errno (ENOENT);
-      debug_printf ("%s is accessible under NT/W2K only", dev ().name);
-      return 0;
-    }
-
-  /* Check for illegal flags. */
-  if (flags & (O_APPEND | O_TRUNC | O_EXCL))
-    {
-      set_errno (EINVAL);
-      return 0;
-    }
-
-  UNICODE_STRING memstr;
-  RtlInitUnicodeString (&memstr, L"\\device\\physicalmemory");
-
-  OBJECT_ATTRIBUTES attr;
-  InitializeObjectAttributes (&attr, &memstr,
-			      OBJ_CASE_INSENSITIVE | OBJ_INHERIT,
-			      NULL, NULL);
-
-  ACCESS_MASK section_access;
-  if ((flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_RDONLY)
-    {
-      set_access (GENERIC_READ);
-      section_access = SECTION_MAP_READ;
-    }
-  else if ((flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_WRONLY)
-    {
-      set_access (GENERIC_WRITE);
-      section_access = SECTION_MAP_READ | SECTION_MAP_WRITE;
-    }
-  else
-    {
-      set_access (GENERIC_READ | GENERIC_WRITE);
-      section_access = SECTION_MAP_READ | SECTION_MAP_WRITE;
-    }
-
-  HANDLE mem;
-  NTSTATUS ret = NtOpenSection (&mem, section_access, &attr);
-  if (!NT_SUCCESS (ret))
-    {
-      __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-      set_io_handle (NULL);
-      return 0;
-    }
-
-  set_io_handle (mem);
-  set_open_status ();
-  return 1;
-}
-
-int
-fhandler_dev_mem::write (const void *ptr, size_t ulen)
-{
-  if (!ulen || pos >= mem_size)
-    return 0;
-
-  if (!(get_access () & GENERIC_WRITE))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  if (pos + ulen > mem_size)
-    ulen = mem_size - pos;
-
-  PHYSICAL_ADDRESS phys;
-  NTSTATUS ret;
-  void *viewmem = NULL;
-  DWORD len = ulen + getpagesize () - 1;
-
-  phys.QuadPart = (ULONGLONG) pos;
-  if ((ret = NtMapViewOfSection (get_handle (),
-				 INVALID_HANDLE_VALUE,
-				 &viewmem,
-				 0L,
-				 len,
-				 &phys,
-				 &len,
-				 ViewShare,
-				 0,
-				 PAGE_READONLY)) != STATUS_SUCCESS)
-    {
-      __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-      return -1;
-    }
-
-  memcpy ((char *) viewmem + (pos - phys.QuadPart), ptr, ulen);
-
-  if (!NT_SUCCESS (ret = NtUnmapViewOfSection (INVALID_HANDLE_VALUE, viewmem)))
-    {
-      __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-      return -1;
-    }
-
-  pos += ulen;
-  return ulen;
-}
-
-void __stdcall
-fhandler_dev_mem::read (void *ptr, size_t& ulen)
-{
-  if (!ulen || pos >= mem_size)
-    {
-      ulen = 0;
-      return;
-    }
-
-  if (!(get_access () & GENERIC_READ))
-    {
-      set_errno (EINVAL);
-      ulen = (size_t) -1;
-      return;
-    }
-
-  if (pos + ulen > mem_size)
-    ulen = mem_size - pos;
-
-  PHYSICAL_ADDRESS phys;
-  NTSTATUS ret;
-  void *viewmem = NULL;
-  DWORD len = ulen + getpagesize () - 1;
-
-  phys.QuadPart = (ULONGLONG) pos;
-  if ((ret = NtMapViewOfSection (get_handle (),
-				 INVALID_HANDLE_VALUE,
-				 &viewmem,
-				 0L,
-				 len,
-				 &phys,
-				 &len,
-				 ViewShare,
-				 0,
-				 PAGE_READONLY)) != STATUS_SUCCESS)
-    {
-      __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-      ulen = (size_t) -1;
-      return;
-    }
-
-  memcpy (ptr, (char *) viewmem + (pos - phys.QuadPart), ulen);
-
-  if (!NT_SUCCESS (ret = NtUnmapViewOfSection (INVALID_HANDLE_VALUE, viewmem)))
-    {
-      __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-      ulen = (size_t) -1;
-      return;
-    }
-
-  pos += ulen;
-  return;
-}
-
-int
-fhandler_dev_mem::close (void)
-{
-  return fhandler_base::close ();
-}
-
-_off64_t
-fhandler_dev_mem::lseek (_off64_t offset, int whence)
-{
-  switch (whence)
-    {
-    case SEEK_SET:
-      pos = offset;
-      break;
-
-    case SEEK_CUR:
-      pos += offset;
-      break;
-
-    case SEEK_END:
-      pos = mem_size;
-      pos += offset;
-      break;
-
-    default:
-      set_errno (EINVAL);
-      return ILLEGAL_SEEK;
-    }
-
-  if (pos > mem_size)
-    {
-      set_errno (EINVAL);
-      return ILLEGAL_SEEK;
-    }
-
-  return pos;
-}
-
-HANDLE
-fhandler_dev_mem::mmap (caddr_t *addr, size_t len, DWORD access,
-			int flags, _off64_t off)
-{
-  if (off >= mem_size
-      || (DWORD) len >= mem_size
-      || off + len >= mem_size)
-    {
-      set_errno (EINVAL);
-      syscall_printf ("-1 = mmap(): illegal parameter, set EINVAL");
-      return INVALID_HANDLE_VALUE;
-    }
-
-  UNICODE_STRING memstr;
-  RtlInitUnicodeString (&memstr, L"\\device\\physicalmemory");
-
-  OBJECT_ATTRIBUTES attr;
-  InitializeObjectAttributes (&attr, &memstr,
-			      OBJ_CASE_INSENSITIVE | OBJ_INHERIT,
-			      NULL, NULL);
-
-  ACCESS_MASK section_access;
-  ULONG protect;
-
-  if (access & FILE_MAP_COPY)
-    {
-      section_access = SECTION_MAP_READ | SECTION_MAP_WRITE;
-      protect = PAGE_WRITECOPY;
-    }
-  else if (access & FILE_MAP_WRITE)
-    {
-      section_access = SECTION_MAP_READ | SECTION_MAP_WRITE;
-      protect = PAGE_READWRITE;
-    }
-  else
-    {
-      section_access = SECTION_MAP_READ;
-      protect = PAGE_READONLY;
-    }
-
-  HANDLE h;
-  NTSTATUS ret = NtOpenSection (&h, section_access, &attr);
-  if (!NT_SUCCESS (ret))
-    {
-      __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-      syscall_printf ("-1 = mmap(): NtOpenSection failed with %E");
-      return INVALID_HANDLE_VALUE;
-    }
-
-  PHYSICAL_ADDRESS phys;
-  void *base = *addr;
-  DWORD dlen = len;
-
-  phys.QuadPart = (ULONGLONG) off;
-
-  if ((ret = NtMapViewOfSection (h,
-				 INVALID_HANDLE_VALUE,
-				 &base,
-				 0L,
-				 dlen,
-				 &phys,
-				 &dlen,
-				 ViewShare /*??*/,
-				 0,
-				 protect)) != STATUS_SUCCESS)
-    {
-      __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-      syscall_printf ("-1 = mmap(): NtMapViewOfSection failed with %E");
-      return INVALID_HANDLE_VALUE;
-    }
-  if ((flags & MAP_FIXED) && base != *addr)
-    {
-      set_errno (EINVAL);
-      syscall_printf ("-1 = mmap(): address shift with MAP_FIXED given");
-      NtUnmapViewOfSection (INVALID_HANDLE_VALUE, base);
-      return INVALID_HANDLE_VALUE;
-    }
-
-  *addr = (caddr_t) base;
-  return h;
-}
-
-int
-fhandler_dev_mem::munmap (HANDLE h, caddr_t addr, size_t len)
-{
-  NTSTATUS ret;
-  if (!NT_SUCCESS (ret = NtUnmapViewOfSection (INVALID_HANDLE_VALUE, addr)))
-    {
-      __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-      return -1;
-    }
-  CloseHandle (h);
-  return 0;
-}
-
-int
-fhandler_dev_mem::msync (HANDLE h, caddr_t addr, size_t len, int flags)
-{
-  return 0;
-}
-
-bool
-fhandler_dev_mem::fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
-					 DWORD size, void *address)
-{
-  DWORD ret;
-  PHYSICAL_ADDRESS phys;
-  void *base = address;
-  DWORD dlen = size;
-  ULONG protect;
-
-  if (access & FILE_MAP_COPY)
-    protect = PAGE_WRITECOPY;
-  else if (access & FILE_MAP_WRITE)
-    protect = PAGE_READWRITE;
-  else
-    protect = PAGE_READONLY;
-
-  phys.QuadPart = (ULONGLONG) offset;
-
-  if ((ret = NtMapViewOfSection (h,
-				 INVALID_HANDLE_VALUE,
-				 &base,
-				 0L,
-				 dlen,
-				 &phys,
-				 &dlen,
-				 ViewShare /*??*/,
-				 0,
-				 protect)) != STATUS_SUCCESS)
-    {
-      __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-      syscall_printf ("-1 = fixup_mmap_after_fork(): NtMapViewOfSection failed with %E");
-      return false;
-    }
-  return base == address;
-}
-
-int
-fhandler_dev_mem::fstat (struct __stat64 *buf)
-{
-  fhandler_base::fstat (buf);
-  buf->st_mode = S_IFCHR;
-  if (wincap.has_physical_mem_access ())
-    buf->st_mode |= S_IRUSR | S_IWUSR |
-		    S_IRGRP | S_IWGRP |
-		    S_IROTH | S_IWOTH;
-  buf->st_blksize = getpagesize ();
-
-  return 0;
-}
-
-int
-fhandler_dev_mem::dup (fhandler_base *child)
-{
-  int ret = fhandler_base::dup (child);
-
-  if (! ret)
-    {
-      fhandler_dev_mem *fhc = (fhandler_dev_mem *) child;
-
-      fhc->mem_size = mem_size;
-      fhc->pos = pos;
-    }
-  return ret;
-}
-
-void
-fhandler_dev_mem::dump ()
-{
-  paranoid_printf ("here, fhandler_dev_mem");
-}
diff --git a/winsup/cygwin/fhandler_nodevice.cc b/winsup/cygwin/fhandler_nodevice.cc
deleted file mode 100644
index 22281d5d3..000000000
--- a/winsup/cygwin/fhandler_nodevice.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-/* fhandler.cc.  See console.cc for fhandler_console functions.
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/cygwin.h>
-#include <sys/uio.h>
-#include <signal.h>
-#include "cygerrno.h"
-#include "perprocess.h"
-#include "security.h"
-#include "cygwin/version.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "shared_info.h"
-#include "pinfo.h"
-#include <assert.h>
-#include <limits.h>
-
-int
-fhandler_nodevice::open (int, mode_t)
-{
-  set_errno (ENXIO);
-  return 0;
-}
-
-fhandler_nodevice::fhandler_nodevice ()
-{
-}
diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc
deleted file mode 100644
index a05615a44..000000000
--- a/winsup/cygwin/fhandler_proc.cc
+++ /dev/null
@@ -1,957 +0,0 @@
-/* fhandler_proc.cc: fhandler for /proc virtual filesystem
-
-   Copyright 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#define _WIN32_WINNT 0x0501
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/cygwin.h>
-#include <ntdef.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "pinfo.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include <assert.h>
-#include <sys/utsname.h>
-#include <sys/param.h>
-#include "ntdll.h"
-#include <winioctl.h>
-#include "cpuid.h"
-
-#define _COMPILING_NEWLIB
-#include <dirent.h>
-
-/* offsets in proc_listing */
-static const int PROC_LOADAVG  = 2;     // /proc/loadavg
-static const int PROC_MEMINFO  = 3;     // /proc/meminfo
-static const int PROC_REGISTRY = 4;     // /proc/registry
-static const int PROC_STAT     = 5;     // /proc/stat
-static const int PROC_VERSION  = 6;     // /proc/version
-static const int PROC_UPTIME   = 7;     // /proc/uptime
-static const int PROC_CPUINFO  = 8;     // /proc/cpuinfo
-static const int PROC_PARTITIONS = 9;   // /proc/partitions
-
-/* names of objects in /proc */
-static const char *proc_listing[] = {
-  ".",
-  "..",
-  "loadavg",
-  "meminfo",
-  "registry",
-  "stat",
-  "version",
-  "uptime",
-  "cpuinfo",
-  "partitions",
-  NULL
-};
-
-static const int PROC_LINK_COUNT = (sizeof (proc_listing) / sizeof (const char *)) - 1;
-
-/* FH_PROC in the table below means the file/directory is handles by
- * fhandler_proc.
- */
-static const DWORD proc_fhandlers[PROC_LINK_COUNT] = {
-  FH_PROC,
-  FH_PROC,
-  FH_PROC,
-  FH_PROC,
-  FH_REGISTRY,
-  FH_PROC,
-  FH_PROC,
-  FH_PROC,
-  FH_PROC,
-  FH_PROC,
-};
-
-/* name of the /proc filesystem */
-const char proc[] = "/proc";
-const int proc_len = sizeof (proc) - 1;
-
-static _off64_t format_proc_meminfo (char *destbuf, size_t maxsize);
-static _off64_t format_proc_stat (char *destbuf, size_t maxsize);
-static _off64_t format_proc_uptime (char *destbuf, size_t maxsize);
-static _off64_t format_proc_cpuinfo (char *destbuf, size_t maxsize);
-static _off64_t format_proc_partitions (char *destbuf, size_t maxsize);
-
-/* Auxillary function that returns the fhandler associated with the given path
-   this is where it would be nice to have pattern matching in C - polymorphism
-   just doesn't cut it. */
-DWORD
-fhandler_proc::get_proc_fhandler (const char *path)
-{
-  debug_printf ("get_proc_fhandler(%s)", path);
-  path += proc_len;
-  /* Since this method is called from path_conv::check we can't rely on
-     it being normalised and therefore the path may have runs of slashes
-     in it.  */
-  while (isdirsep (*path))
-    path++;
-
-  /* Check if this is the root of the virtual filesystem (i.e. /proc).  */
-  if (*path == 0)
-    return FH_PROC;
-
-  for (int i = 0; proc_listing[i]; i++)
-    {
-      if (path_prefix_p (proc_listing[i], path, strlen (proc_listing[i])))
-	return proc_fhandlers[i];
-    }
-
-  if (pinfo (atoi (path)))
-    return FH_PROCESS;
-
-  bool has_subdir = false;
-  while (*path)
-    if (isdirsep (*path++))
-      {
-	has_subdir = true;
-	break;
-      }
-
-  if (has_subdir)
-    /* The user is trying to access a non-existent subdirectory of /proc. */
-    return FH_BAD;
-  else
-    /* Return FH_PROC so that we can return EROFS if the user is trying to create
-       a file. */
-    return FH_PROC;
-}
-
-/* Returns 0 if path doesn't exist, >0 if path is a directory,
-   <0 if path is a file.  */
-int
-fhandler_proc::exists ()
-{
-  const char *path = get_name ();
-  debug_printf ("exists (%s)", path);
-  path += proc_len;
-  if (*path == 0)
-    return 2;
-  for (int i = 0; proc_listing[i]; i++)
-    if (pathmatch (path + 1, proc_listing[i]))
-      return (proc_fhandlers[i] == FH_PROC) ? -1 : 1;
-  return 0;
-}
-
-fhandler_proc::fhandler_proc ():
-  fhandler_virtual ()
-{
-}
-
-int
-fhandler_proc::fstat (struct __stat64 *buf)
-{
-  const char *path = get_name ();
-  debug_printf ("fstat (%s)", path);
-
-  path += proc_len;
-  (void) fhandler_base::fstat (buf);
-
-  buf->st_mode &= ~_IFMT & NO_W;
-
-  if (!*path)
-    {
-      buf->st_nlink = PROC_LINK_COUNT;
-      buf->st_mode |= S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH;
-      return 0;
-    }
-  else
-    {
-      path++;
-      for (int i = 0; proc_listing[i]; i++)
-	if (pathmatch (path, proc_listing[i]))
-	  {
-	    if (proc_fhandlers[i] != FH_PROC)
-	      buf->st_mode |= S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH;
-	    else
-	      {
-		buf->st_mode &= NO_X;
-		buf->st_mode |= S_IFREG;
-	      }
-	    return 0;
-	  }
-    }
-  set_errno (ENOENT);
-  return -1;
-}
-
-struct dirent *
-fhandler_proc::readdir (DIR * dir)
-{
-  if (dir->__d_position >= PROC_LINK_COUNT)
-    {
-      winpids pids;
-      int found = 0;
-      for (unsigned i = 0; i < pids.npids; i++)
-	if (found++ == dir->__d_position - PROC_LINK_COUNT)
-	  {
-	    __small_sprintf (dir->__d_dirent->d_name, "%d", pids[i]->pid);
-	    dir->__d_position++;
-	    return dir->__d_dirent;
-	  }
-      return NULL;
-    }
-
-  strcpy (dir->__d_dirent->d_name, proc_listing[dir->__d_position++]);
-  syscall_printf ("%p = readdir (%p) (%s)", &dir->__d_dirent, dir,
-		  dir->__d_dirent->d_name);
-  return dir->__d_dirent;
-}
-
-int
-fhandler_proc::open (int flags, mode_t mode)
-{
-  int proc_file_no = -1;
-
-  int res = fhandler_virtual::open (flags, mode);
-  if (!res)
-    goto out;
-
-  set_nohandle (true);
-
-  const char *path;
-
-  path = get_name () + proc_len;
-
-  if (!*path)
-    {
-      if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
-	{
-	  set_errno (EEXIST);
-	  res = 0;
-	  goto out;
-	}
-      else if (flags & O_WRONLY)
-	{
-	  set_errno (EISDIR);
-	  res = 0;
-	  goto out;
-	}
-      else
-	{
-	  flags |= O_DIROPEN;
-	  goto success;
-	}
-    }
-
-  proc_file_no = -1;
-  for (int i = 0; proc_listing[i]; i++)
-    if (path_prefix_p (proc_listing[i], path + 1, strlen (proc_listing[i])))
-      {
-	proc_file_no = i;
-	if (proc_fhandlers[i] != FH_PROC)
-	  {
-	    if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
-	      {
-		set_errno (EEXIST);
-		res = 0;
-		goto out;
-	      }
-	    else if (flags & O_WRONLY)
-	      {
-		set_errno (EISDIR);
-		res = 0;
-		goto out;
-	      }
-	    else
-	      {
-		flags |= O_DIROPEN;
-		goto success;
-	      }
-	  }
-      }
-
-  if (proc_file_no == -1)
-    {
-      if (flags & O_CREAT)
-	{
-	  set_errno (EROFS);
-	  res = 0;
-	  goto out;
-	}
-      else
-	{
-	  set_errno (ENOENT);
-	  res = 0;
-	  goto out;
-	}
-    }
-  if (flags & O_WRONLY)
-    {
-      set_errno (EROFS);
-      res = 0;
-      goto out;
-    }
-
-  fileid = proc_file_no;
-  if (!fill_filebuf ())
-    {
-      res = 0;
-      goto out;
-	}
-
-  if (flags & O_APPEND)
-    position = filesize;
-  else
-    position = 0;
-
-success:
-  res = 1;
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-  set_open_status ();
-out:
-  syscall_printf ("%d = fhandler_proc::open (%p, %d)", res, flags, mode);
-  return res;
-}
-
-bool
-fhandler_proc::fill_filebuf ()
-{
-  switch (fileid)
-    {
-    case PROC_VERSION:
-      {
-	if (!filebuf)
-	  {
-	    struct utsname uts_name;
-	    uname (&uts_name);
-		bufalloc = strlen (uts_name.sysname) + 1 + strlen (uts_name.release) +
-			  1 + strlen (uts_name.version) + 2;
-	    filebuf = (char *) realloc (filebuf, bufalloc);
-		filesize = __small_sprintf (filebuf, "%s %s %s\n", uts_name.sysname,
-			     uts_name.release, uts_name.version);
-	  }
-	break;
-      }
-    case PROC_UPTIME:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = 80);
-	filesize = format_proc_uptime (filebuf, bufalloc);
-	break;
-      }
-    case PROC_STAT:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = 16384);
-	filesize = format_proc_stat (filebuf, bufalloc);
-	break;
-      }
-    case PROC_LOADAVG:
-      {
-	/*
-	 * not really supported - Windows doesn't keep track of these values
-	 * Windows 95/98/me does have the KERNEL/CPUUsage performance counter
-	 * which is similar.
-	 */
-	filebuf = (char *) realloc (filebuf, bufalloc = 16);
-	filesize = __small_sprintf (filebuf, "%u.%02u %u.%02u %u.%02u\n",
-				    0, 0, 0, 0, 0, 0);
-	break;
-      }
-    case PROC_MEMINFO:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = 2048);
-	filesize = format_proc_meminfo (filebuf, bufalloc);
-	break;
-      }
-    case PROC_CPUINFO:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = 16384);
-	filesize = format_proc_cpuinfo (filebuf, bufalloc);
-	break;
-      }
-    case PROC_PARTITIONS:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = 4096);
-	filesize = format_proc_partitions (filebuf, bufalloc);
-	break;
-      }
-    }
-    return true;
-}
-
-static _off64_t
-format_proc_meminfo (char *destbuf, size_t maxsize)
-{
-  unsigned long mem_total = 0UL, mem_free = 0UL, swap_total = 0UL,
-		swap_free = 0UL;
-  MEMORYSTATUS memory_status;
-  GlobalMemoryStatus (&memory_status);
-  mem_total = memory_status.dwTotalPhys;
-  mem_free = memory_status.dwAvailPhys;
-  swap_total = memory_status.dwTotalPageFile - mem_total;
-  swap_free = memory_status.dwAvailPageFile - mem_total;
-  return __small_sprintf (destbuf, "         total:      used:      free:\n"
-				   "Mem:  %10lu %10lu %10lu\n"
-				   "Swap: %10lu %10lu %10lu\n"
-				   "MemTotal:     %10lu kB\n"
-				   "MemFree:      %10lu kB\n"
-				   "MemShared:             0 kB\n"
-				   "HighTotal:             0 kB\n"
-				   "HighFree:              0 kB\n"
-				   "LowTotal:     %10lu kB\n"
-				   "LowFree:      %10lu kB\n"
-				   "SwapTotal:    %10lu kB\n"
-				   "SwapFree:     %10lu kB\n",
-				   mem_total, mem_total - mem_free, mem_free,
-				   swap_total, swap_total - swap_free, swap_free,
-				   mem_total >> 10, mem_free >> 10,
-				   mem_total >> 10, mem_free >> 10,
-				   swap_total >> 10, swap_free >> 10);
-}
-
-static _off64_t
-format_proc_uptime (char *destbuf, size_t maxsize)
-{
-  unsigned long long uptime = 0ULL, idle_time = 0ULL;
-  SYSTEM_PROCESSOR_TIMES spt;
-
-  if (!GetSystemTimes ((FILETIME *) &spt.IdleTime, (FILETIME *) &spt.KernelTime,
-		       (FILETIME *) &spt.UserTime)
-      && GetLastError () == ERROR_PROC_NOT_FOUND)
-    {
-      NTSTATUS ret = NtQuerySystemInformation (SystemProcessorTimes, (PVOID) &spt,
-					       sizeof spt, NULL);
-      if (!ret && GetLastError () == ERROR_PROC_NOT_FOUND)
-	{
-	  uptime = GetTickCount () / 10;
-	  goto out;
-	}
-      else if (ret != STATUS_SUCCESS)
-	{
-	  __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-	  debug_printf("NtQuerySystemInformation: ret = %d, "
-		       "Dos(ret) = %d",
-		       ret, RtlNtStatusToDosError (ret));
-	  return 0;
-	}
-    }
-  idle_time = spt.IdleTime.QuadPart / 100000ULL;
-  uptime = (spt.KernelTime.QuadPart +
-	    spt.UserTime.QuadPart) / 100000ULL;
-out:
-
-  return __small_sprintf (destbuf, "%U.%02u %U.%02u\n",
-			  uptime / 100, long (uptime % 100),
-			  idle_time / 100, long (idle_time % 100));
-}
-
-static _off64_t
-format_proc_stat (char *destbuf, size_t maxsize)
-{
-  unsigned long pages_in = 0UL, pages_out = 0UL, interrupt_count = 0UL,
-		context_switches = 0UL, swap_in = 0UL, swap_out = 0UL;
-  time_t boot_time = 0;
-
-  char *eobuf = destbuf;
-  if (!wincap.is_winnt ())
-    eobuf += __small_sprintf (destbuf, "cpu %U %U %U %U\n", 0ULL, 0ULL, 0ULL, 0ULL);
-  else
-    {
-      NTSTATUS ret;
-      SYSTEM_PERFORMANCE_INFORMATION spi;
-      SYSTEM_TIME_OF_DAY_INFORMATION stodi;
-
-      SYSTEM_BASIC_INFORMATION sbi;
-      if ((ret = NtQuerySystemInformation (SystemBasicInformation,
-					   (PVOID) &sbi, sizeof sbi, NULL))
-	  != STATUS_SUCCESS)
-	{
-	  __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-	  debug_printf ("NtQuerySystemInformation: ret = %d, "
-			"Dos(ret) = %d",
-			ret, RtlNtStatusToDosError (ret));
-	  sbi.NumberProcessors = 1;
-	}
-
-      SYSTEM_PROCESSOR_TIMES spt[sbi.NumberProcessors];
-      ret = NtQuerySystemInformation (SystemProcessorTimes, (PVOID) spt,
-				      sizeof spt[0] * sbi.NumberProcessors, NULL);
-      interrupt_count = 0;
-      if (ret == STATUS_SUCCESS)
-	{
-	  unsigned long long user_time = 0ULL, kernel_time = 0ULL, idle_time = 0ULL;
-	  for (int i = 0; i < sbi.NumberProcessors; i++)
-	    {
-	      kernel_time += (spt[i].KernelTime.QuadPart - spt[i].IdleTime.QuadPart) * HZ / 10000000ULL;
-	      user_time += spt[i].UserTime.QuadPart * HZ / 10000000ULL;
-	      idle_time += spt[i].IdleTime.QuadPart * HZ / 10000000ULL;
-	    }
-
-	  eobuf += __small_sprintf (eobuf, "cpu %U %U %U %U\n",
-				    user_time, 0ULL, kernel_time, idle_time);
-	  user_time = 0ULL, kernel_time = 0ULL, idle_time = 0ULL;
-	  for (int i = 0; i < sbi.NumberProcessors; i++)
-	    {
-	      interrupt_count += spt[i].InterruptCount;
-	      kernel_time = (spt[i].KernelTime.QuadPart - spt[i].IdleTime.QuadPart) * HZ / 10000000ULL;
-	      user_time = spt[i].UserTime.QuadPart * HZ / 10000000ULL;
-	      idle_time = spt[i].IdleTime.QuadPart * HZ / 10000000ULL;
-	      eobuf += __small_sprintf (eobuf, "cpu%d %U %U %U %U\n", i,
-					user_time, 0ULL, kernel_time, idle_time);
-	    }
-
-	  ret = NtQuerySystemInformation (SystemPerformanceInformation,
-					  (PVOID) &spi, sizeof spi, NULL);
-	}
-      if (ret == STATUS_SUCCESS)
-	ret = NtQuerySystemInformation (SystemTimeOfDayInformation,
-					(PVOID) &stodi,
-					sizeof stodi, NULL);
-      if (ret != STATUS_SUCCESS)
-	{
-	  __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-	  debug_printf("NtQuerySystemInformation: ret = %d, "
-		       "Dos(ret) = %d",
-		       ret, RtlNtStatusToDosError (ret));
-	  return 0;
-	}
-      pages_in = spi.PagesRead;
-      pages_out = spi.PagefilePagesWritten + spi.MappedFilePagesWritten;
-      /*
-       * Note: there is no distinction made in this structure between pages
-       * read from the page file and pages read from mapped files, but there
-       * is such a distinction made when it comes to writing. Goodness knows
-       * why. The value of swap_in, then, will obviously be wrong but its our
-       * best guess.
-       */
-      swap_in = spi.PagesRead;
-      swap_out = spi.PagefilePagesWritten;
-      context_switches = spi.ContextSwitches;
-      boot_time = to_time_t ((FILETIME *) &stodi.BootTime.QuadPart);
-    }
-  /*
-   * else
-   *   {
-   * There are only two relevant performance counters on Windows 95/98/me,
-   * VMM/cPageIns and VMM/cPageOuts. The extra effort needed to read these
-   * counters is by no means worth it.
-   *   }
-   */
-  eobuf += __small_sprintf (eobuf, "page %u %u\n"
-				   "swap %u %u\n"
-				   "intr %u\n"
-				   "ctxt %u\n"
-				   "btime %u\n",
-				   pages_in, pages_out,
-				   swap_in, swap_out,
-				   interrupt_count,
-				   context_switches,
-				   boot_time);
-  return eobuf - destbuf;
-}
-
-#define read_value(x,y) \
-      do {\
-	dwCount = BUFSIZE; \
-	if ((dwError = RegQueryValueEx (hKey, x, NULL, &dwType, (BYTE *) szBuffer, &dwCount)), \
-	    (dwError != ERROR_SUCCESS && dwError != ERROR_MORE_DATA)) \
-	  { \
-	    __seterrno_from_win_error (dwError); \
-	    debug_printf ("RegQueryValueEx failed retcode %d", dwError); \
-	    return 0; \
-	  } \
-	if (dwType != y) \
-	  { \
-	    debug_printf ("Value %s had an unexpected type (expected %d, found %d)", y, dwType); \
-	    return 0; \
-	  }\
-      } while (0)
-
-#define print(x) \
-	do { \
-	  strcpy (bufptr, x), \
-	  bufptr += sizeof (x) - 1; \
-	} while (0)
-
-static _off64_t
-format_proc_cpuinfo (char *destbuf, size_t maxsize)
-{
-  SYSTEM_INFO siSystemInfo;
-  HKEY hKey;
-  DWORD dwError, dwCount, dwType;
-  DWORD dwOldThreadAffinityMask;
-  int cpu_number;
-  const int BUFSIZE = 256;
-  CHAR szBuffer[BUFSIZE];
-  char *bufptr = destbuf;
-
-  GetSystemInfo (&siSystemInfo);
-
-  for (cpu_number = 0;;cpu_number++)
-    {
-      __small_sprintf (szBuffer, "HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%d", cpu_number);
-
-      if ((dwError = RegOpenKeyEx (HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_QUERY_VALUE, &hKey)) != ERROR_SUCCESS)
-	{
-	  if (dwError == ERROR_FILE_NOT_FOUND)
-	    break;
-	  __seterrno_from_win_error (dwError);
-	  debug_printf ("RegOpenKeyEx failed retcode %d", dwError);
-	  return 0;
-	}
-
-      dwOldThreadAffinityMask = SetThreadAffinityMask (GetCurrentThread (), 1 << cpu_number);
-      if (dwOldThreadAffinityMask == 0)
-	debug_printf ("SetThreadAffinityMask failed %E");
-      // I'm not sure whether the thread changes processor immediately
-      // and I'm not sure whether this function will cause the thread to be rescheduled
-      low_priority_sleep (0);
-
-      bool has_cpuid = false;
-
-      if (!can_set_flag (0x00040000))
-	debug_printf ("386 processor - no cpuid");
-      else
-	{
-	  debug_printf ("486 processor");
-	  if (can_set_flag (0x00200000))
-	    {
-	      debug_printf ("processor supports CPUID instruction");
-	      has_cpuid = true;
-	    }
-	  else
-	    debug_printf ("processor does not support CPUID instruction");
-	}
-
-
-      if (!has_cpuid)
-	{
-	  bufptr += __small_sprintf (bufptr, "processor       : %d\n", cpu_number);
-	  read_value ("VendorIdentifier", REG_SZ);
-	  bufptr += __small_sprintf (bufptr, "vendor_id       : %s\n", szBuffer);
-	  read_value ("Identifier", REG_SZ);
-	  bufptr += __small_sprintf (bufptr, "identifier      : %s\n", szBuffer);
-	  if (wincap.is_winnt ())
-	    {
-	      read_value ("~Mhz", REG_DWORD);
-	      bufptr += __small_sprintf (bufptr, "cpu MHz         : %u\n", *(DWORD *) szBuffer);
-
-	      print ("flags           :");
-	      if (IsProcessorFeaturePresent (PF_3DNOW_INSTRUCTIONS_AVAILABLE))
-		print (" 3dnow");
-	      if (IsProcessorFeaturePresent (PF_COMPARE_EXCHANGE_DOUBLE))
-		print (" cx8");
-	      if (!IsProcessorFeaturePresent (PF_FLOATING_POINT_EMULATED))
-		print (" fpu");
-	      if (IsProcessorFeaturePresent (PF_MMX_INSTRUCTIONS_AVAILABLE))
-		print (" mmx");
-	      if (IsProcessorFeaturePresent (PF_PAE_ENABLED))
-		print (" pae");
-	      if (IsProcessorFeaturePresent (PF_RDTSC_INSTRUCTION_AVAILABLE))
-		print (" tsc");
-	      if (IsProcessorFeaturePresent (PF_XMMI_INSTRUCTIONS_AVAILABLE))
-		print (" sse");
-	      if (IsProcessorFeaturePresent (PF_XMMI64_INSTRUCTIONS_AVAILABLE))
-		print (" sse2");
-	    }
-	}
-      else
-	{
-	  bufptr += __small_sprintf (bufptr, "processor       : %d\n", cpu_number);
-	  unsigned maxf, vendor_id[4], unused;
-	  cpuid (&maxf, &vendor_id[0], &vendor_id[2], &vendor_id[1], 0);
-	  maxf &= 0xffff;
-	  vendor_id[3] = 0;
-	  bufptr += __small_sprintf (bufptr, "vendor_id       : %s\n", (char *)vendor_id);
-	  unsigned cpu_mhz  = 0;
-	  if (wincap.is_winnt ())
-	    {
-	      read_value ("~Mhz", REG_DWORD);
-	      cpu_mhz = *(DWORD *)szBuffer;
-	    }
-	  if (maxf >= 1)
-	    {
-	      unsigned features2, features1, extra_info, cpuid_sig;
-	      cpuid (&cpuid_sig, &extra_info, &features2, &features1, 1);
-	      /* unsigned extended_family = (cpuid_sig & 0x0ff00000) >> 20,
-			  extended_model  = (cpuid_sig & 0x000f0000) >> 16; */
-	      unsigned type            = (cpuid_sig & 0x00003000) >> 12,
-		       family          = (cpuid_sig & 0x00000f00) >> 8,
-		       model           = (cpuid_sig & 0x000000f0) >> 4,
-		       stepping        = cpuid_sig & 0x0000000f;
-	      unsigned brand_id        = extra_info & 0x0000000f,
-		       cpu_count       = (extra_info & 0x00ff0000) >> 16,
-		       apic_id         = (extra_info & 0xff000000) >> 24;
-	      const char *type_str;
-	      switch (type)
-		{
-		case 0:
-		  type_str = "primary processor";
-		  break;
-		case 1:
-		  type_str = "overdrive processor";
-		  break;
-		case 2:
-		  type_str = "secondary processor";
-		  break;
-		case 3:
-		default:
-		  type_str = "reserved";
-		  break;
-		}
-	      unsigned maxe = 0;
-	      cpuid (&maxe, &unused, &unused, &unused, 0x80000000);
-	      if (maxe >= 0x80000004)
-		{
-		  unsigned *model_name = (unsigned *) szBuffer;
-		  cpuid (&model_name[0], &model_name[1], &model_name[2], &model_name[3], 0x80000002);
-		  cpuid (&model_name[4], &model_name[5], &model_name[6], &model_name[7], 0x80000003);
-		  cpuid (&model_name[8], &model_name[9], &model_name[10], &model_name[11], 0x80000004);
-		  model_name[12] = 0;
-		}
-	      else
-		{
-		  // could implement a lookup table here if someone needs it
-		  strcpy (szBuffer, "unknown");
-		}
-	      if (wincap.is_winnt ())
-		{
-		  bufptr += __small_sprintf (bufptr, "type            : %s\n"
-						     "cpu family      : %d\n"
-						     "model           : %d\n"
-						     "model name      : %s\n"
-						     "stepping        : %d\n"
-						     "brand id        : %d\n"
-						     "cpu count       : %d\n"
-						     "apic id         : %d\n"
-						     "cpu MHz         : %d\n"
-						     "fpu             : %s\n",
-					     type_str,
-					     family,
-					     model,
-					     szBuffer,
-					     stepping,
-					     brand_id,
-					     cpu_count,
-					     apic_id,
-					     cpu_mhz,
-					     (features1 & (1 << 0)) ? "yes" : "no");
-		}
-	      else
-		{
-		  bufptr += __small_sprintf (bufptr, "type            : %s\n"
-						     "cpu family      : %d\n"
-						     "model           : %d\n"
-						     "model name      : %s\n"
-						     "stepping        : %d\n"
-						     "brand id        : %d\n"
-						     "cpu count       : %d\n"
-						     "apic id         : %d\n"
-						     "fpu             : %s\n",
-					     type_str,
-					     family,
-					     model,
-					     szBuffer,
-					     stepping,
-					     brand_id,
-					     cpu_count,
-					     apic_id,
-					     (features1 & (1 << 0)) ? "yes" : "no");
-		}
-	      print ("flags           :");
-	      if (features1 & (1 << 0))
-		print (" fpu");
-	      if (features1 & (1 << 1))
-		print (" vme");
-	      if (features1 & (1 << 2))
-		print (" de");
-	      if (features1 & (1 << 3))
-		print (" pse");
-	      if (features1 & (1 << 4))
-		print (" tsc");
-	      if (features1 & (1 << 5))
-		print (" msr");
-	      if (features1 & (1 << 6))
-		print (" pae");
-	      if (features1 & (1 << 7))
-		print (" mce");
-	      if (features1 & (1 << 8))
-		print (" cx8");
-	      if (features1 & (1 << 9))
-		print (" apic");
-	      if (features1 & (1 << 11))
-		print (" sep");
-	      if (features1 & (1 << 12))
-		print (" mtrr");
-	      if (features1 & (1 << 13))
-		print (" pge");
-	      if (features1 & (1 << 14))
-		print (" mca");
-	      if (features1 & (1 << 15))
-		print (" cmov");
-	      if (features1 & (1 << 16))
-		print (" pat");
-	      if (features1 & (1 << 17))
-		print (" pse36");
-	      if (features1 & (1 << 18))
-		print (" psn");
-	      if (features1 & (1 << 19))
-		print (" clfl");
-	      if (features1 & (1 << 21))
-		print (" dtes");
-	      if (features1 & (1 << 22))
-		print (" acpi");
-	      if (features1 & (1 << 23))
-		print (" mmx");
-	      if (features1 & (1 << 24))
-		print (" fxsr");
-	      if (features1 & (1 << 25))
-		print (" sse");
-	      if (features1 & (1 << 26))
-		print (" sse2");
-	      if (features1 & (1 << 27))
-		print (" ss");
-	      if (features1 & (1 << 28))
-		print (" htt");
-	      if (features1 & (1 << 29))
-		print (" tmi");
-	      if (features1 & (1 << 30))
-		print (" ia-64");
-	      if (features1 & (1 << 31))
-		print (" pbe");
-	      if (features2 & (1 << 0))
-		print (" sse3");
-	      if (features2 & (1 << 3))
-		print (" mon");
-	      if (features2 & (1 << 4))
-		print (" dscpl");
-	      if (features2 & (1 << 8))
-		print (" tm2");
-	      if (features2 & (1 << 10))
-		print (" cid");
-	    }
-	  else if (wincap.is_winnt ())
-	    {
-	      bufptr += __small_sprintf (bufptr, "cpu MHz         : %d\n"
-						 "fpu             : %s\n",
-						 cpu_mhz,
-						 IsProcessorFeaturePresent (PF_FLOATING_POINT_EMULATED) ? "no" : "yes");
-	    }
-	}
-      if (dwOldThreadAffinityMask != 0)
-	SetThreadAffinityMask (GetCurrentThread (), dwOldThreadAffinityMask);
-
-      RegCloseKey (hKey);
-      bufptr += __small_sprintf (bufptr, "\n");
-  }
-
-  return bufptr - destbuf;
-}
-
-#undef read_value
-
-static _off64_t
-format_proc_partitions (char *destbuf, size_t maxsize)
-{
-  char *bufptr = destbuf;
-  print ("major minor  #blocks  name\n\n");
-
-  if (wincap.is_winnt ())
-    {
-      for (int drive_number=0;;drive_number++)
-	{
-	  CHAR szDriveName[CYG_MAX_PATH];
-	  __small_sprintf (szDriveName, "\\\\.\\PHYSICALDRIVE%d", drive_number);
-	  HANDLE hDevice;
-	  hDevice = CreateFile (szDriveName,
-				GENERIC_READ,
-				FILE_SHARE_READ | FILE_SHARE_WRITE,
-				NULL,
-				OPEN_EXISTING,
-				0,
-				NULL);
-	  if (hDevice == INVALID_HANDLE_VALUE)
-	    {
-	      if (GetLastError () == ERROR_PATH_NOT_FOUND)
-		  break;
-	      __seterrno ();
-	      debug_printf ("CreateFile %d %E", GetLastError ());
-	      break;
-	    }
-	  else
-	    {
-	      DWORD dwBytesReturned, dwRetCode;
-	      DISK_GEOMETRY dg;
-	      int buf_size = 4096;
-	      char buf[buf_size];
-	      dwRetCode = DeviceIoControl (hDevice,
-					   IOCTL_DISK_GET_DRIVE_GEOMETRY,
-					   NULL,
-					   0,
-					   &dg,
-					   sizeof (dg),
-					   &dwBytesReturned,
-					   NULL);
-	      if (!dwRetCode)
-		debug_printf ("DeviceIoControl %E");
-	      else
-		{
-		  char devname[16];
-		  __small_sprintf (devname, "/dev/sd%c", drive_number + 'a');
-		  device dev;
-		  dev.parse (devname);
-		  bufptr += __small_sprintf (bufptr, "%5d %5d %9U %s\n",
-					     dev.major,
-					     dev.minor,
-					     (long long)((dg.Cylinders.QuadPart * dg.TracksPerCylinder *
-					      dg.SectorsPerTrack * dg.BytesPerSector) >> 10),
-					     devname + 5);
-		}
-	      while (dwRetCode = DeviceIoControl (hDevice,
-						  IOCTL_DISK_GET_DRIVE_LAYOUT,
-						  NULL,
-						  0,
-						  (DRIVE_LAYOUT_INFORMATION *) buf,
-						  buf_size,
-						  &dwBytesReturned,
-						  NULL),
-		     !dwRetCode && GetLastError () == ERROR_INSUFFICIENT_BUFFER)
-	      buf_size *= 2;
-	      if (!dwRetCode)
-		debug_printf ("DeviceIoControl %E");
-	      else
-		{
-		  DRIVE_LAYOUT_INFORMATION *dli = (DRIVE_LAYOUT_INFORMATION *) buf;
-		  for (unsigned partition = 0; partition < dli->PartitionCount; partition++)
-		    {
-		      if (dli->PartitionEntry[partition].PartitionLength.QuadPart == 0)
-			continue;
-		      char devname[16];
-		      __small_sprintf (devname, "/dev/sd%c%d",
-		      				drive_number + 'a',
-						partition + 1);
-		      device dev;
-		      dev.parse (devname);
-		      bufptr += __small_sprintf (bufptr, "%5d %5d %9U %s\n",
-						 dev.major, dev.minor,
-						 (long long)(dli->PartitionEntry[partition].PartitionLength.QuadPart >> 10),
-						 devname + 5);
-		    }
-		}
-
-	      CloseHandle (hDevice);
-	    }
-	}
-    }
-  else
-    {
-      // not worth the effort
-      // you need a 16 bit thunk DLL to access the partition table on Win9x
-      // and then you have to decode it yourself
-    }
-  return bufptr - destbuf;
-}
-
-#undef print
diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc
deleted file mode 100644
index 28dc78ff5..000000000
--- a/winsup/cygwin/fhandler_process.cc
+++ /dev/null
@@ -1,746 +0,0 @@
-/* fhandler_process.cc: fhandler for /proc/<pid> virtual filesystem
-
-   Copyright 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/cygwin.h>
-#include <ntdef.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "pinfo.h"
-#include "shared_info.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "ntdll.h"
-#include <sys/param.h>
-#include <assert.h>
-#include <sys/sysmacros.h>
-
-#define _COMPILING_NEWLIB
-#include <dirent.h>
-
-static const int PROCESS_PPID = 2;
-static const int PROCESS_EXENAME = 3;
-static const int PROCESS_WINPID = 4;
-static const int PROCESS_WINEXENAME = 5;
-static const int PROCESS_STATUS = 6;
-static const int PROCESS_UID = 7;
-static const int PROCESS_GID = 8;
-static const int PROCESS_PGID = 9;
-static const int PROCESS_SID = 10;
-static const int PROCESS_CTTY = 11;
-static const int PROCESS_STAT = 12;
-static const int PROCESS_STATM = 13;
-static const int PROCESS_CMDLINE = 14;
-
-static const char * const process_listing[] =
-{
-  ".",
-  "..",
-  "ppid",
-  "exename",
-  "winpid",
-  "winexename",
-  "status",
-  "uid",
-  "gid",
-  "pgid",
-  "sid",
-  "ctty",
-  "stat",
-  "statm",
-  "cmdline",
-  NULL
-};
-
-static const int PROCESS_LINK_COUNT =
-  (sizeof (process_listing) / sizeof (const char *)) - 1;
-
-static _off64_t format_process_stat (_pinfo *p, char *destbuf, size_t maxsize);
-static _off64_t format_process_status (_pinfo *p, char *destbuf, size_t maxsize);
-static _off64_t format_process_statm (_pinfo *p, char *destbuf, size_t maxsize);
-static int get_process_state (DWORD dwProcessId);
-static bool get_mem_values (DWORD dwProcessId, unsigned long *vmsize,
-			    unsigned long *vmrss, unsigned long *vmtext,
-			    unsigned long *vmdata, unsigned long *vmlib,
-			    unsigned long *vmshare);
-
-/* Returns 0 if path doesn't exist, >0 if path is a directory,
- * <0 if path is a file.
- */
-int
-fhandler_process::exists ()
-{
-  const char *path = get_name ();
-  debug_printf ("exists (%s)", path);
-  path += proc_len + 1;
-  while (*path != 0 && !isdirsep (*path))
-    path++;
-  if (*path == 0)
-    return 2;
-
-  for (int i = 0; process_listing[i]; i++)
-    if (pathmatch (path + 1, process_listing[i]))
-      return -1;
-  return 0;
-}
-
-fhandler_process::fhandler_process ():
-  fhandler_proc ()
-{
-}
-
-int
-fhandler_process::fstat (struct __stat64 *buf)
-{
-  const char *path = get_name ();
-  int file_type = exists ();
-  (void) fhandler_base::fstat (buf);
-  path += proc_len + 1;
-  pid = atoi (path);
-  pinfo p (pid);
-  if (!p)
-    {
-      set_errno (ENOENT);
-      return -1;
-    }
-
-  buf->st_mode &= ~_IFMT & NO_W;
-
-  switch (file_type)
-    {
-    case 0:
-      set_errno (ENOENT);
-      return -1;
-    case 1:
-      buf->st_mode |= S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH;
-      return 0;
-    case 2:
-      buf->st_ctime = buf->st_mtime = p->start_time;
-      buf->st_ctim.tv_nsec = buf->st_mtim.tv_nsec = 0;
-      time_as_timestruc_t (&buf->st_atim);
-      buf->st_uid = p->uid;
-      buf->st_gid = p->gid;
-      buf->st_mode |= S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH;
-      buf->st_nlink = PROCESS_LINK_COUNT;
-      return 0;
-    default:
-    case -1:
-      buf->st_uid = p->uid;
-      buf->st_gid = p->gid;
-      buf->st_mode |= S_IFREG | S_IRUSR | S_IRGRP | S_IROTH;
-      return 0;
-    }
-}
-
-struct dirent *
-fhandler_process::readdir (DIR * dir)
-{
-  if (dir->__d_position >= PROCESS_LINK_COUNT)
-    return NULL;
-  strcpy (dir->__d_dirent->d_name, process_listing[dir->__d_position++]);
-  syscall_printf ("%p = readdir (%p) (%s)", &dir->__d_dirent, dir,
-		  dir->__d_dirent->d_name);
-  return dir->__d_dirent;
-}
-
-int
-fhandler_process::open (int flags, mode_t mode)
-{
-  int process_file_no = -1;
-
-  int res = fhandler_virtual::open (flags, mode);
-  if (!res)
-    goto out;
-
-  set_nohandle (true);
-
-  const char *path;
-  path = get_name () + proc_len + 1;
-  pid = atoi (path);
-  while (*path != 0 && !isdirsep (*path))
-    path++;
-
-  if (*path == 0)
-    {
-      if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
-	{
-	  set_errno (EEXIST);
-	  res = 0;
-	  goto out;
-	}
-      else if (flags & O_WRONLY)
-	{
-	  set_errno (EISDIR);
-	  res = 0;
-	  goto out;
-	}
-      else
-	{
-	  flags |= O_DIROPEN;
-	  goto success;
-	}
-    }
-
-  process_file_no = -1;
-  for (int i = 0; process_listing[i]; i++)
-    {
-      if (path_prefix_p
-	  (process_listing[i], path + 1, strlen (process_listing[i])))
-	process_file_no = i;
-    }
-  if (process_file_no == -1)
-    {
-      if (flags & O_CREAT)
-	{
-	  set_errno (EROFS);
-	  res = 0;
-	  goto out;
-	}
-      else
-	{
-	  set_errno (ENOENT);
-	  res = 0;
-	  goto out;
-	}
-    }
-  if (flags & O_WRONLY)
-    {
-      set_errno (EROFS);
-      res = 0;
-      goto out;
-    }
-
-  fileid = process_file_no;
-  if (!fill_filebuf ())
-	{
-	  res = 0;
-	  goto out;
-	}
-
-  if (flags & O_APPEND)
-    position = filesize;
-  else
-    position = 0;
-
-success:
-  res = 1;
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-  set_open_status ();
-out:
-  syscall_printf ("%d = fhandler_proc::open (%p, %d)", res, flags, mode);
-  return res;
-}
-
-bool
-fhandler_process::fill_filebuf ()
-{
-  pinfo p (pid);
-
-  if (!p)
-    {
-      set_errno (ENOENT);
-      return false;
-    }
-
-  switch (fileid)
-    {
-    case PROCESS_UID:
-    case PROCESS_GID:
-    case PROCESS_PGID:
-    case PROCESS_SID:
-    case PROCESS_CTTY:
-    case PROCESS_PPID:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = 40);
-	int num;
-	switch (fileid)
-	  {
-	  case PROCESS_PPID:
-	    num = p->ppid;
-	    break;
-	  case PROCESS_UID:
-	    num = p->uid;
-	    break;
-	  case PROCESS_PGID:
-	    num = p->pgid;
-	    break;
-	  case PROCESS_SID:
-	    num = p->sid;
-	    break;
-	  case PROCESS_GID:
-	    num = p->gid;
-	    break;
-	  case PROCESS_CTTY:
-	    num = p->ctty;
-	    break;
-	  default: // what's this here for?
-	    num = 0;
-	    break;
-	  }
-	__small_sprintf (filebuf, "%d\n", num);
-	filesize = strlen (filebuf);
-	break;
-      }
-    case PROCESS_CMDLINE:
-      {
-	if (filebuf)
-	  free (filebuf);
-	size_t fs;
-	filebuf = p->cmdline (fs);
-	filesize = fs;
-	if (!filebuf || !*filebuf)
-	  filebuf = strdup ("<defunct>");
-	break;
-      }
-    case PROCESS_EXENAME:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = CYG_MAX_PATH);
-	if (p->process_state & (PID_ZOMBIE | PID_EXITED))
-	  strcpy (filebuf, "<defunct>");
-	else
-	  {
-	    mount_table->conv_to_posix_path (p->progname, filebuf, 1);
-	    int len = strlen (filebuf);
-	    if (len > 4)
-	      {
-		char *s = filebuf + len - 4;
-		if (strcasecmp (s, ".exe") == 0)
-		  *s = 0;
-	      }
-	  }
-	filesize = strlen (filebuf);
-	break;
-      }
-    case PROCESS_WINPID:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = 40);
-	__small_sprintf (filebuf, "%d\n", p->dwProcessId);
-	filesize = strlen (filebuf);
-	break;
-      }
-    case PROCESS_WINEXENAME:
-      {
-	int len = strlen (p->progname);
-	filebuf = (char *) realloc (filebuf, bufalloc = (len + 2));
-	strcpy (filebuf, p->progname);
-	filebuf[len] = '\n';
-	filesize = len + 1;
-	break;
-      }
-    case PROCESS_STATUS:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = 2048);
-	filesize = format_process_status (*p, filebuf, bufalloc);
-	break;
-      }
-    case PROCESS_STAT:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = 2048);
-	filesize = format_process_stat (*p, filebuf, bufalloc);
-	break;
-      }
-    case PROCESS_STATM:
-      {
-	filebuf = (char *) realloc (filebuf, bufalloc = 2048);
-	filesize = format_process_statm (*p, filebuf, bufalloc);
-	break;
-      }
-    }
-
-  return true;
-}
-
-static _off64_t
-format_process_stat (_pinfo *p, char *destbuf, size_t maxsize)
-{
-  char cmd[CYG_MAX_PATH];
-  int state = 'R';
-  unsigned long fault_count = 0UL,
-		utime = 0UL, stime = 0UL,
-		start_time = 0UL,
-		vmsize = 0UL, vmrss = 0UL, vmmaxrss = 0UL;
-  int priority = 0;
-  if (p->process_state & (PID_ZOMBIE | PID_EXITED))
-    strcpy (cmd, "<defunct>");
-  else
-    {
-      strcpy (cmd, p->progname);
-      char *last_slash = strrchr (cmd, '\\');
-      if (last_slash != NULL)
-	strcpy (cmd, last_slash + 1);
-      int len = strlen (cmd);
-      if (len > 4)
-	{
-	  char *s = cmd + len - 4;
-	  if (strcasecmp (s, ".exe") == 0)
-	    *s = 0;
-	 }
-    }
-  /*
-   * Note: under Windows, a _process_ is always running - it's only _threads_
-   * that get suspended. Therefore the default state is R (runnable).
-   */
-  if (p->process_state & PID_ZOMBIE)
-    state = 'Z';
-  else if (p->process_state & PID_STOPPED)
-    state = 'T';
-  else if (wincap.is_winnt ())
-    state = get_process_state (p->dwProcessId);
-  if (!wincap.is_winnt ())
-    start_time = (GetTickCount () / 1000 - time (NULL) + p->start_time) * HZ;
-  else
-    {
-      NTSTATUS ret;
-      HANDLE hProcess;
-      VM_COUNTERS vmc;
-      KERNEL_USER_TIMES put;
-      PROCESS_BASIC_INFORMATION pbi;
-      QUOTA_LIMITS ql;
-      SYSTEM_TIME_OF_DAY_INFORMATION stodi;
-      SYSTEM_PROCESSOR_TIMES spt;
-      hProcess = OpenProcess (PROCESS_VM_READ | PROCESS_QUERY_INFORMATION,
-			      FALSE, p->dwProcessId);
-      if (hProcess != NULL)
-	{
-	  ret = NtQueryInformationProcess (hProcess,
-					   ProcessVmCounters,
-					   (PVOID) &vmc,
-					   sizeof vmc, NULL);
-	  if (ret == STATUS_SUCCESS)
-	    ret = NtQueryInformationProcess (hProcess,
-					     ProcessTimes,
-					     (PVOID) &put,
-					     sizeof put, NULL);
-	  if (ret == STATUS_SUCCESS)
-	    ret = NtQueryInformationProcess (hProcess,
-					     ProcessBasicInformation,
-					     (PVOID) &pbi,
-					     sizeof pbi, NULL);
-	  if (ret == STATUS_SUCCESS)
-	    ret = NtQueryInformationProcess (hProcess,
-					     ProcessQuotaLimits,
-					     (PVOID) &ql,
-					     sizeof ql, NULL);
-	  CloseHandle (hProcess);
-	}
-      else
-	{
-	  DWORD error = GetLastError ();
-	  __seterrno_from_win_error (error);
-	  debug_printf ("OpenProcess: ret = %d",
-			error);
-	  return 0;
-	}
-      if (ret == STATUS_SUCCESS)
-	ret = NtQuerySystemInformation (SystemTimeOfDayInformation,
-					(PVOID) &stodi,
-					sizeof stodi, NULL);
-      if (ret == STATUS_SUCCESS)
-	ret = NtQuerySystemInformation (SystemProcessorTimes,
-					(PVOID) &spt,
-					sizeof spt, NULL);
-      if (ret != STATUS_SUCCESS)
-	{
-	  __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-	  debug_printf ("NtQueryInformationProcess: ret = %d, "
-		       "Dos(ret) = %d",
-		       ret, RtlNtStatusToDosError (ret));
-	  return 0;
-	}
-      fault_count = vmc.PageFaultCount;
-      utime = put.UserTime.QuadPart * HZ / 10000000ULL;
-      stime = put.KernelTime.QuadPart * HZ / 10000000ULL;
-      start_time = (put.CreateTime.QuadPart - stodi.BootTime.QuadPart) * HZ / 10000000ULL;
-#if 0
-       if (stodi.CurrentTime.QuadPart > put.CreateTime.QuadPart)
-	 start_time = (spt.KernelTime.QuadPart + spt.UserTime.QuadPart -
-		       stodi.CurrentTime.QuadPart + put.CreateTime.QuadPart) * HZ / 10000000ULL;
-       else
-	 /*
-	  * sometimes stodi.CurrentTime is a bit behind
-	  * Note: some older versions of procps are broken and can't cope
-	  * with process start times > time(NULL).
-	  */
-	 start_time = (spt.KernelTme.QuadPart + spt.UserTime.QuadPart) * HZ / 10000000ULL;
-#endif
-      priority = pbi.BasePriority;
-      unsigned page_size = getpagesize ();
-      vmsize = vmc.PagefileUsage;
-      vmrss = vmc.WorkingSetSize / page_size;
-      vmmaxrss = ql.MaximumWorkingSetSize / page_size;
-    }
-
-  return __small_sprintf (destbuf, "%d (%s) %c "
-				   "%d %d %d %d %d "
-				   "%lu %lu %lu %lu %lu %lu %lu "
-				   "%ld %ld %ld %ld %ld %ld "
-				   "%lu %lu "
-				   "%ld "
-				   "%lu",
-			  p->pid, cmd,
-			  state,
-			  p->ppid, p->pgid, p->sid, makedev (FH_TTYS, p->ctty),
-			  -1, 0, fault_count, fault_count, 0, 0, utime, stime,
-			  utime, stime, priority, 0, 0, 0,
-			  start_time, vmsize,
-			  vmrss, vmmaxrss
-			  );
-}
-
-static _off64_t
-format_process_status (_pinfo *p, char *destbuf, size_t maxsize)
-{
-  char cmd[CYG_MAX_PATH];
-  int state = 'R';
-  const char *state_str = "unknown";
-  unsigned long vmsize = 0UL, vmrss = 0UL, vmdata = 0UL, vmlib = 0UL, vmtext = 0UL,
-		vmshare = 0UL;
-  if (p->process_state & (PID_ZOMBIE | PID_EXITED))
-    strcpy (cmd, "<defunct>");
-  else
-    {
-      strcpy (cmd, p->progname);
-      char *last_slash = strrchr (cmd, '\\');
-      if (last_slash != NULL)
-	strcpy (cmd, last_slash + 1);
-      int len = strlen (cmd);
-      if (len > 4)
-	{
-	  char *s = cmd + len - 4;
-	  if (strcasecmp (s, ".exe") == 0)
-	    *s = 0;
-	 }
-    }
-  /*
-   * Note: under Windows, a _process_ is always running - it's only _threads_
-   * that get suspended. Therefore the default state is R (runnable).
-   */
-  if (p->process_state & PID_ZOMBIE)
-    state = 'Z';
-  else if (p->process_state & PID_STOPPED)
-    state = 'T';
-  else if (wincap.is_winnt ())
-    state = get_process_state (p->dwProcessId);
-  switch (state)
-    {
-    case 'O':
-      state_str = "running";
-      break;
-    case 'D':
-    case 'S':
-      state_str = "sleeping";
-      break;
-    case 'R':
-      state_str = "runnable";
-      break;
-    case 'Z':
-      state_str = "zombie";
-      break;
-    case 'T':
-      state_str = "stopped";
-      break;
-    }
-  if (wincap.is_winnt ())
-    {
-      if (!get_mem_values (p->dwProcessId, &vmsize, &vmrss, &vmtext, &vmdata, &vmlib, &vmshare))
-	return 0;
-      unsigned page_size = getpagesize ();
-      vmsize *= page_size; vmrss *= page_size; vmdata *= page_size;
-      vmtext *= page_size; vmlib *= page_size;
-    }
-  // The real uid value for *this* process is stored at cygheap->user.real_uid
-  // but we can't get at the real uid value for any other process, so
-  // just fake it as p->uid. Similar for p->gid.
-  return __small_sprintf (destbuf, "Name:   %s\n"
-				   "State:  %c (%s)\n"
-				   "Tgid:   %d\n"
-				   "Pid:    %d\n"
-				   "PPid:   %d\n"
-				   "Uid:    %d %d %d %d\n"
-				   "Gid:    %d %d %d %d\n"
-				   "VmSize: %8d kB\n"
-				   "VmLck:  %8d kB\n"
-				   "VmRSS:  %8d kB\n"
-				   "VmData: %8d kB\n"
-				   "VmStk:  %8d kB\n"
-				   "VmExe:  %8d kB\n"
-				   "VmLib:  %8d kB\n"
-				   "SigPnd: %016x\n"
-				   "SigBlk: %016x\n"
-				   "SigIgn: %016x\n",
-			  cmd,
-			  state, state_str,
-			  p->pgid,
-			  p->pid,
-			  p->ppid,
-			  p->uid, p->uid, p->uid, p->uid,
-			  p->gid, p->gid, p->gid, p->gid,
-			  vmsize >> 10, 0, vmrss >> 10, vmdata >> 10, 0, vmtext >> 10, vmlib >> 10,
-			  0, 0, p->getsigmask ()
-			  );
-}
-
-static _off64_t
-format_process_statm (_pinfo *p, char *destbuf, size_t maxsize)
-{
-  unsigned long vmsize = 0UL, vmrss = 0UL, vmtext = 0UL, vmdata = 0UL,
-		vmlib = 0UL, vmshare = 0UL;
-  if (wincap.is_winnt ())
-    {
-      if (!get_mem_values (p->dwProcessId, &vmsize, &vmrss, &vmtext, &vmdata,
-			   &vmlib, &vmshare))
-	return 0;
-    }
-  return __small_sprintf (destbuf, "%ld %ld %ld %ld %ld %ld %ld",
-			  vmsize, vmrss, vmshare, vmtext, vmlib, vmdata, 0
-			  );
-}
-
-static int
-get_process_state (DWORD dwProcessId)
-{
-  /*
-   * This isn't really heavy magic - just go through the processes'
-   * threads one by one and return a value accordingly
-   * Errors are silently ignored.
-   */
-  NTSTATUS ret;
-  SYSTEM_PROCESSES *sp;
-  ULONG n = 0x1000;
-  PULONG p = new ULONG[n];
-  int state =' ';
-  while (STATUS_INFO_LENGTH_MISMATCH ==
-	 (ret = NtQuerySystemInformation (SystemProcessesAndThreadsInformation,
-					 (PVOID) p,
-					 n * sizeof *p, NULL)))
-    delete [] p, p = new ULONG[n *= 2];
-  if (ret != STATUS_SUCCESS)
-    {
-      debug_printf ("NtQuerySystemInformation: ret = %d, "
-		   "Dos(ret) = %d",
-		   ret, RtlNtStatusToDosError (ret));
-      goto out;
-    }
-  state = 'Z';
-  sp = (SYSTEM_PROCESSES *) p;
-  for (;;)
-    {
-      if (sp->ProcessId == dwProcessId)
-	{
-	  SYSTEM_THREADS *st;
-	  if (wincap.has_process_io_counters ())
-	    /*
-	     * Windows 2000 and XP have an extra member in SYSTEM_PROCESSES
-	     * which means the offset of the first SYSTEM_THREADS entry is
-	     * different on these operating systems compared to NT 4.
-	     */
-	    st = &sp->Threads[0];
-	  else
-	    /*
-	     * 136 is the offset of the first SYSTEM_THREADS entry on
-	     * Windows NT 4.
-	     */
-	    st = (SYSTEM_THREADS *) ((char *) sp + 136);
-	  state = 'S';
-	  for (unsigned i = 0; i < sp->ThreadCount; i++)
-	    {
-	      if (st->State == StateRunning ||
-		  st->State == StateReady)
-		{
-		  state = 'R';
-		  goto out;
-		}
-	      st++;
-	    }
-	  break;
-	}
-      if (!sp->NextEntryDelta)
-	 break;
-      sp = (SYSTEM_PROCESSES *) ((char *) sp + sp->NextEntryDelta);
-    }
-out:
-  delete [] p;
-  return state;
-}
-
-static bool
-get_mem_values (DWORD dwProcessId, unsigned long *vmsize, unsigned long *vmrss,
-		unsigned long *vmtext, unsigned long *vmdata,
-		unsigned long *vmlib, unsigned long *vmshare)
-{
-  bool res = true;
-  NTSTATUS ret;
-  HANDLE hProcess;
-  VM_COUNTERS vmc;
-  MEMORY_WORKING_SET_LIST *mwsl;
-  ULONG n = 0x1000, length;
-  PULONG p = new ULONG[n];
-  unsigned page_size = getpagesize ();
-  hProcess = OpenProcess (PROCESS_QUERY_INFORMATION,
-			  FALSE, dwProcessId);
-  if (hProcess == NULL)
-    {
-      DWORD error = GetLastError ();
-      __seterrno_from_win_error (error);
-      debug_printf ("OpenProcess: ret = %d",
-		    error);
-      return false;
-    }
-  while ((ret = NtQueryVirtualMemory (hProcess, 0,
-				      MemoryWorkingSetList,
-				      (PVOID) p,
-				      n * sizeof *p, &length)),
-	 (ret == STATUS_SUCCESS || ret == STATUS_INFO_LENGTH_MISMATCH) &&
-	 length >= n * sizeof *p)
-    delete [] p, p = new ULONG[n *= 2];
-  if (ret != STATUS_SUCCESS)
-    {
-      debug_printf ("NtQueryVirtualMemory: ret = %d, "
-		   "Dos(ret) = %d",
-		   ret, RtlNtStatusToDosError (ret));
-      res = false;
-      goto out;
-    }
-  mwsl = (MEMORY_WORKING_SET_LIST *) p;
-  for (unsigned long i = 0; i < mwsl->NumberOfPages; i++)
-    {
-      ++*vmrss;
-      unsigned flags = mwsl->WorkingSetList[i] & 0x0FFF;
-      if (flags & (WSLE_PAGE_EXECUTE | WSLE_PAGE_SHAREABLE) == (WSLE_PAGE_EXECUTE | WSLE_PAGE_SHAREABLE))
-	  ++*vmlib;
-      else if (flags & WSLE_PAGE_SHAREABLE)
-	  ++*vmshare;
-      else if (flags & WSLE_PAGE_EXECUTE)
-	  ++*vmtext;
-      else
-	  ++*vmdata;
-    }
-  ret = NtQueryInformationProcess (hProcess,
-				   ProcessVmCounters,
-				   (PVOID) &vmc,
-				   sizeof vmc, NULL);
-  if (ret != STATUS_SUCCESS)
-    {
-      debug_printf ("NtQueryInformationProcess: ret = %d, "
-		    "Dos(ret) = %d",
-		    ret, RtlNtStatusToDosError (ret));
-      res = false;
-      goto out;
-    }
-  *vmsize = vmc.PagefileUsage / page_size;
-out:
-  delete [] p;
-  CloseHandle (hProcess);
-  return res;
-}
diff --git a/winsup/cygwin/fhandler_random.cc b/winsup/cygwin/fhandler_random.cc
deleted file mode 100644
index a90b7032a..000000000
--- a/winsup/cygwin/fhandler_random.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-/* fhandler_random.cc: code to access /dev/random and /dev/urandom
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-   Written by Corinna Vinschen (vinschen@cygnus.com)
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <limits.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-
-#define RANDOM   8
-#define URANDOM  9
-
-#define PSEUDO_MULTIPLIER       (6364136223846793005LL)
-#define PSEUDO_SHIFTVAL		(21)
-
-fhandler_dev_random::fhandler_dev_random ()
-  : fhandler_base (), crypt_prov ((HCRYPTPROV) NULL)
-{
-}
-
-int
-fhandler_dev_random::open (int flags, mode_t)
-{
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-  set_nohandle (true);
-  set_open_status ();
-  return 1;
-}
-
-bool
-fhandler_dev_random::crypt_gen_random (void *ptr, size_t len)
-{
-  if (!crypt_prov
-      && !CryptAcquireContext (&crypt_prov, NULL, MS_DEF_PROV, PROV_RSA_FULL,
-			       CRYPT_VERIFYCONTEXT | CRYPT_MACHINE_KEYSET)
-      && !CryptAcquireContext (&crypt_prov, NULL, MS_DEF_PROV, PROV_RSA_FULL,
-			       CRYPT_VERIFYCONTEXT | CRYPT_MACHINE_KEYSET
-			       | CRYPT_NEWKEYSET))
-    {
-      debug_printf ("%E = CryptAquireContext()");
-      return false;
-    }
-  if (!CryptGenRandom (crypt_prov, len, (BYTE *)ptr))
-    {
-      debug_printf ("%E = CryptGenRandom()");
-      return false;
-    }
-  return true;
-}
-
-int
-fhandler_dev_random::pseudo_write (const void *ptr, size_t len)
-{
-  /* Use buffer to mess up the pseudo random number generator. */
-  for (size_t i = 0; i < len; ++i)
-    pseudo = (pseudo + ((unsigned char *)ptr)[i]) * PSEUDO_MULTIPLIER + 1;
-  return len;
-}
-
-int
-fhandler_dev_random::write (const void *ptr, size_t len)
-{
-  if (!len)
-    return 0;
-  if (!ptr)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  /* Limit len to a value <= 512 since we don't want to overact.
-     Copy to local buffer because CryptGenRandom violates const. */
-  unsigned char buf[512];
-  size_t limited_len = len <= 512 ? len : 512;
-  memcpy (buf, ptr, limited_len);
-
-  /* Mess up system entropy source. Return error if device is /dev/random. */
-  if (!crypt_gen_random (buf, limited_len) && dev () == FH_RANDOM)
-    {
-      __seterrno ();
-      return -1;
-    }
-  /* Mess up the pseudo random number generator. */
-  pseudo_write (buf, limited_len);
-  return len;
-}
-
-int
-fhandler_dev_random::pseudo_read (void *ptr, size_t len)
-{
-  /* Use pseudo random number generator as fallback entropy source.
-     This multiplier was obtained from Knuth, D.E., "The Art of
-     Computer Programming," Vol 2, Seminumerical Algorithms, Third
-     Edition, Addison-Wesley, 1998, p. 106 (line 26) & p. 108 */
-  for (size_t i = 0; i < len; ++i)
-    {
-      pseudo = pseudo * PSEUDO_MULTIPLIER + 1;
-      ((unsigned char *)ptr)[i] = (pseudo >> PSEUDO_SHIFTVAL) & UCHAR_MAX;
-    }
-  return len;
-}
-
-void __stdcall
-fhandler_dev_random::read (void *ptr, size_t& len)
-{
-  if (!len)
-    return;
-
-  if (!ptr)
-    {
-      set_errno (EINVAL);
-      len = (size_t) -1;
-      return;
-    }
-
-  if (crypt_gen_random (ptr, len))
-    return;
-
-  /* If device is /dev/urandom, use pseudo number generator as fallback.
-     Don't do this for /dev/random since it's intended for uses that need
-     very high quality randomness. */
-  if (dev () == FH_URANDOM)
-    {
-      len = pseudo_read (ptr, len);
-      return;
-    }
-
-  __seterrno ();
-  len = (size_t) -1;
-}
-
-_off64_t
-fhandler_dev_random::lseek (_off64_t, int)
-{
-  return 0;
-}
-
-int
-fhandler_dev_random::close (void)
-{
-  if (crypt_prov)
-    while (!CryptReleaseContext (crypt_prov, 0)
-	   && GetLastError () == ERROR_BUSY)
-      Sleep (10);
-  return 0;
-}
-
-int
-fhandler_dev_random::dup (fhandler_base *child)
-{
-  fhandler_dev_random *fhr = (fhandler_dev_random *) child;
-  fhr->crypt_prov = (HCRYPTPROV)NULL;
-  return 0;
-}
-
-void
-fhandler_dev_random::dump ()
-{
-  paranoid_printf ("here, fhandler_dev_random");
-}
-
diff --git a/winsup/cygwin/fhandler_raw.cc b/winsup/cygwin/fhandler_raw.cc
deleted file mode 100644
index 1ece53107..000000000
--- a/winsup/cygwin/fhandler_raw.cc
+++ /dev/null
@@ -1,593 +0,0 @@
-/* fhandler_raw.cc.  See fhandler.h for a description of the fhandler classes.
-
-   Copyright 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include "winsup.h"
-#include <sys/termios.h>
-#include <unistd.h>
-
-#include <cygwin/rdevio.h>
-#include <sys/mtio.h>
-#include <ntdef.h>
-#include "cygerrno.h"
-#include "perprocess.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "ntdll.h"
-
-/* static wrapper functions to hide the effect of media changes and
-   bus resets which occurs after a new media is inserted. This is
-   also related to the used tape device.  */
-
-static BOOL write_file (HANDLE fh, const void *buf, DWORD to_write,
-			DWORD *written, int *err)
-{
-  BOOL ret;
-
-  *err = 0;
-  if (!(ret = WriteFile (fh, buf, to_write, written, 0)))
-    {
-      if ((*err = GetLastError ()) == ERROR_MEDIA_CHANGED
-	  || *err == ERROR_BUS_RESET)
-	{
-	  *err = 0;
-	  if (!(ret = WriteFile (fh, buf, to_write, written, 0)))
-	    *err = GetLastError ();
-	}
-    }
-  syscall_printf ("%d (err %d) = WriteFile (%d, %d, write %d, written %d, 0)",
-		  ret, *err, fh, buf, to_write, *written);
-  return ret;
-}
-
-static BOOL read_file (HANDLE fh, void *buf, DWORD to_read,
-		       DWORD *read, int *err)
-{
-  BOOL ret;
-
-  *err = 0;
-  if (!(ret = ReadFile (fh, buf, to_read, read, 0)))
-    {
-      if ((*err = GetLastError ()) == ERROR_MEDIA_CHANGED
-	  || *err == ERROR_BUS_RESET)
-	{
-	  *err = 0;
-	  if (!(ret = ReadFile (fh, buf, to_read, read, 0)))
-	    *err = GetLastError ();
-	}
-    }
-  syscall_printf ("%d (err %d) = ReadFile (%d, %d, to_read %d, read %d, 0)",
-		  ret, *err, fh, buf, to_read, *read);
-  return ret;
-}
-
-/**********************************************************************/
-/* fhandler_dev_raw */
-
-void
-fhandler_dev_raw::clear (void)
-{
-  devbuf = NULL;
-  devbufsiz = 0;
-  devbufstart = 0;
-  devbufend = 0;
-  eom_detected = 0;
-  eof_detected = 0;
-  lastblk_to_read = 0;
-  varblkop = 0;
-}
-
-int
-fhandler_dev_raw::writebuf (void)
-{
-  DWORD written;
-  int ret = 0;
-
-  if (is_writing && devbuf && devbufend)
-    {
-      DWORD to_write;
-      int ret = 0;
-
-      memset (devbuf + devbufend, 0, devbufsiz - devbufend);
-      if (get_device () != FH_TAPE)
-	to_write = ((devbufend - 1) / 512 + 1) * 512;
-      else if (varblkop)
-	to_write = devbufend;
-      else
-	to_write = devbufsiz;
-      if (!write_file (get_handle (), devbuf, to_write, &written, &ret)
-	  && is_eom (ret))
-	eom_detected = 1;
-      if (written)
-	has_written = 1;
-      devbufstart = devbufend = 0;
-    }
-  is_writing = 0;
-  return ret;
-}
-
-fhandler_dev_raw::fhandler_dev_raw ()
-  : fhandler_base ()
-{
-  clear ();
-  set_need_fork_fixup ();
-}
-
-fhandler_dev_raw::~fhandler_dev_raw (void)
-{
-  if (devbufsiz > 1L)
-    delete [] devbuf;
-  clear ();
-}
-
-int __stdcall
-fhandler_dev_raw::fstat (struct __stat64 *buf)
-{
-  debug_printf ("here");
-
-  switch (get_device ())
-    {
-    case FH_TAPE:
-    case FH_NTAPE:
-      buf->st_mode = S_IFCHR | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
-      break;
-    default:
-      buf->st_mode = S_IFBLK | STD_RBITS | STD_WBITS | S_IWGRP | S_IWOTH;
-      break;
-    }
-
-  buf->st_uid = geteuid32 ();
-  buf->st_gid = getegid32 ();
-  buf->st_nlink = 1;
-  buf->st_blksize = S_BLKSIZE;
-  time_as_timestruc_t (&buf->st_ctim);
-  buf->st_atim = buf->st_mtim = buf->st_ctim;
-  return 0;
-}
-
-int
-fhandler_dev_raw::open (int flags, mode_t)
-{
-  if (!wincap.has_raw_devices ())
-    {
-      set_errno (ENOENT);
-      debug_printf ("%s is accessible under NT/W2K only", get_win32_name ());
-      return 0;
-    }
-
-  /* Check for illegal flags. */
-  if (flags & (O_APPEND | O_EXCL))
-    {
-      set_errno (EINVAL);
-      return 0;
-    }
-
-  /* Always open a raw device existing and binary. */
-  flags &= ~(O_CREAT | O_TRUNC);
-  flags |= O_BINARY;
-
-  DWORD access = GENERIC_READ | SYNCHRONIZE;
-  if (get_device () == FH_TAPE
-      || (flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_WRONLY
-      || (flags & (O_RDONLY | O_WRONLY | O_RDWR)) == O_RDWR)
-    access |= GENERIC_WRITE;
-
-  extern void str2buf2uni (UNICODE_STRING &, WCHAR *, const char *);
-  UNICODE_STRING dev;
-  WCHAR devname[CYG_MAX_PATH + 1];
-  str2buf2uni (dev, devname, get_win32_name ());
-  OBJECT_ATTRIBUTES attr;
-  InitializeObjectAttributes (&attr, &dev, OBJ_CASE_INSENSITIVE, NULL, NULL);
-
-  HANDLE h;
-  IO_STATUS_BLOCK io;
-  NTSTATUS status = NtOpenFile (&h, access, &attr, &io, wincap.shared (),
-				FILE_SYNCHRONOUS_IO_NONALERT);
-  if (!NT_SUCCESS (status))
-    {
-      __seterrno_from_win_error (RtlNtStatusToDosError (status));
-      return 0;
-    }
-
-  set_io_handle (h);
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-
-  if (devbufsiz > 1L)
-    devbuf = new char [devbufsiz];
-
-  return 1;
-}
-
-int
-fhandler_dev_raw::close (void)
-{
-  return fhandler_base::close ();
-}
-
-void
-fhandler_dev_raw::raw_read (void *ptr, size_t& ulen)
-{
-  DWORD bytes_read = 0;
-  DWORD read2;
-  DWORD bytes_to_read;
-  int ret;
-  size_t len = ulen;
-  char *tgt;
-
-  /* In mode O_RDWR the buffer has to be written to device first */
-  ret = writebuf ();
-  if (ret)
-    {
-      if (is_eom (ret))
-	set_errno (ENOSPC);
-      else
-        __seterrno ();
-      goto err;
-    }
-
-  /* Checking a previous end of file */
-  if (eof_detected && !lastblk_to_read)
-    {
-      eof_detected = 0;
-      ulen = 0;
-      return;
-    }
-
-  /* Checking a previous end of media */
-  if (eom_detected && !lastblk_to_read)
-    {
-      set_errno (ENOSPC);
-      goto err;
-    }
-
-  if (devbuf)
-    {
-      while (len > 0)
-	{
-	  if (devbufstart < devbufend)
-	    {
-	      bytes_to_read = min (len, devbufend - devbufstart);
-	      debug_printf ("read %d bytes from buffer (rest %d)",
-			    bytes_to_read, devbufstart - devbufend);
-	      memcpy (ptr, devbuf + devbufstart, bytes_to_read);
-	      len -= bytes_to_read;
-	      ptr = (void *) ((char *) ptr + bytes_to_read);
-	      bytes_read += bytes_to_read;
-	      devbufstart += bytes_to_read;
-
-	      if (lastblk_to_read)
-		{
-		  lastblk_to_read = 0;
-		  break;
-		}
-	    }
-	  if (len > 0)
-	    {
-	      if (!varblkop && len >= devbufsiz)
-		{
-		  if (get_device () == FH_TAPE)
-		    bytes_to_read = (len / devbufsiz) * devbufsiz;
-		  else
-		    bytes_to_read = (len / 512) * 512;
-		  tgt = (char *) ptr;
-		  debug_printf ("read %d bytes direct from file",bytes_to_read);
-		}
-	      else
-		{
-		  bytes_to_read = devbufsiz;
-		  tgt = devbuf;
-		  if (varblkop)
-		    debug_printf ("read variable bytes from file into buffer");
-		  else
-		    debug_printf ("read %d bytes from file into buffer",
-				  bytes_to_read);
-		}
-	      if (!read_file (get_handle (), tgt, bytes_to_read, &read2, &ret))
-		{
-		  if (!is_eof (ret) && !is_eom (ret))
-		    {
-		      __seterrno ();
-		      goto err;
-		    }
-
-		  if (is_eof (ret))
-		    eof_detected = 1;
-		  else
-		    eom_detected = 1;
-
-		  if (!read2)
-		    {
-		      if (!bytes_read && is_eom (ret))
-			{
-			  debug_printf ("return -1, set errno to ENOSPC");
-			  set_errno (ENOSPC);
-			  goto err;
-			}
-		      break;
-		    }
-		  lastblk_to_read = 1;
-		}
-	      if (! read2)
-	       break;
-	      if (tgt == devbuf)
-		{
-		  devbufstart = 0;
-		  devbufend = read2;
-		}
-	      else
-		{
-		  len -= bytes_to_read;
-		  ptr = (void *) ((char *) ptr + bytes_to_read);
-		  bytes_read += bytes_to_read;
-		}
-	    }
-	}
-    }
-  else if (!read_file (get_handle (), ptr, len, &bytes_read, &ret))
-    {
-      if (!is_eof (ret) && !is_eom (ret))
-	{
-	  __seterrno ();
-	  goto err;
-	}
-      if (bytes_read)
-	{
-	  if (is_eof (ret))
-	    eof_detected = 1;
-	  else
-	    eom_detected = 1;
-	}
-      else if (is_eom (ret))
-	{
-	  debug_printf ("return -1, set errno to ENOSPC");
-	  set_errno (ENOSPC);
-	  goto err;
-	}
-    }
-
-  ulen = (size_t) bytes_read;
-  return;
-
-err:
-  ulen = (size_t) -1;
-  return;
-}
-
-int
-fhandler_dev_raw::raw_write (const void *ptr, size_t len)
-{
-  DWORD bytes_written = 0;
-  DWORD bytes_to_write;
-  DWORD written;
-  char *p = (char *) ptr;
-  char *tgt;
-  int ret;
-
-  /* Checking a previous end of media on tape */
-  if (eom_detected)
-    {
-      set_errno (ENOSPC);
-      return -1;
-    }
-
-  if (!is_writing)
-    {
-      devbufend = devbufstart;
-      devbufstart = 0;
-    }
-  is_writing = 1;
-
-  if (devbuf)
-    {
-      while (len > 0)
-	{
-	  if (!varblkop &&
-	      (len < devbufsiz || devbufend > 0) && devbufend < devbufsiz)
-	    {
-	      bytes_to_write = min (len, devbufsiz - devbufend);
-	      memcpy (devbuf + devbufend, p, bytes_to_write);
-	      bytes_written += bytes_to_write;
-	      devbufend += bytes_to_write;
-	      p += bytes_to_write;
-	      len -= bytes_to_write;
-	    }
-	  else
-	    {
-	      if (varblkop)
-		{
-		  bytes_to_write = len;
-		  tgt = p;
-		}
-	      else if (devbufend == devbufsiz)
-		{
-		  bytes_to_write = devbufsiz;
-		  tgt = devbuf;
-		}
-	      else
-		{
-		  bytes_to_write = (len / devbufsiz) * devbufsiz;
-		  tgt = p;
-		}
-
-	      ret = 0;
-	      write_file (get_handle (), tgt, bytes_to_write, &written, &ret);
-	      if (written)
-		has_written = 1;
-
-	      if (ret)
-		{
-		  if (!is_eom (ret))
-		    {
-		      __seterrno ();
-		      return -1;
-		    }
-
-		  eom_detected = 1;
-
-		  if (!written && !bytes_written)
-		    {
-		      set_errno (ENOSPC);
-		      return -1;
-		    }
-
-		  if (tgt == p)
-		    bytes_written += written;
-
-		  break;	// from while (len > 0)
-		}
-
-	      if (tgt == devbuf)
-		{
-		  if (written != devbufsiz)
-		    memmove (devbuf, devbuf + written, devbufsiz - written);
-		  devbufend = devbufsiz - written;
-		}
-	      else
-		{
-		  len -= written;
-		  p += written;
-		  bytes_written += written;
-		}
-	    }
-	}
-    }
-  else if (len > 0)
-    {
-      if (!write_file (get_handle (), ptr, len, &bytes_written, &ret))
-	{
-	  if (bytes_written)
-	    has_written = 1;
-	  if (!is_eom (ret))
-	    {
-	      __seterrno ();
-	      return -1;
-	    }
-	  eom_detected = 1;
-	  if (!bytes_written)
-	    {
-	      set_errno (ENOSPC);
-	      return -1;
-	    }
-	}
-      has_written = 1;
-    }
-  return bytes_written;
-}
-
-int
-fhandler_dev_raw::dup (fhandler_base *child)
-{
-  int ret = fhandler_base::dup (child);
-
-  if (! ret)
-    {
-      fhandler_dev_raw *fhc = (fhandler_dev_raw *) child;
-
-      fhc->devbufsiz = devbufsiz;
-      if (devbufsiz > 1L)
-	fhc->devbuf = new char [devbufsiz];
-      fhc->devbufstart = 0;
-      fhc->devbufend = 0;
-      fhc->eom_detected = eom_detected;
-      fhc->eof_detected = eof_detected;
-      fhc->lastblk_to_read = 0;
-      fhc->varblkop = varblkop;
-    }
-  return ret;
-}
-
-void
-fhandler_dev_raw::fixup_after_fork (HANDLE)
-{
-  devbufstart = 0;
-  devbufend = 0;
-  lastblk_to_read = 0;
-}
-
-void
-fhandler_dev_raw::fixup_after_exec (HANDLE)
-{
-  if (devbufsiz > 1L)
-    devbuf = new char [devbufsiz];
-  devbufstart = 0;
-  devbufend = 0;
-  lastblk_to_read = 0;
-}
-
-int
-fhandler_dev_raw::ioctl (unsigned int cmd, void *buf)
-{
-  int ret = NO_ERROR;
-
-  if (cmd == RDIOCDOP)
-    {
-      struct rdop *op = (struct rdop *) buf;
-
-      if (!op)
-	ret = ERROR_INVALID_PARAMETER;
-      else
-	switch (op->rd_op)
-	  {
-	  case RDSETBLK:
-	    if (get_device () == FH_TAPE)
-	      {
-		struct mtop mop;
-
-		mop.mt_op = MTSETBLK;
-		mop.mt_count = op->rd_parm;
-		ret = ioctl (MTIOCTOP, &mop);
-	      }
-	    else if (op->rd_parm % 512)
-	      ret = ERROR_INVALID_PARAMETER;
-	    else if (devbuf && op->rd_parm < devbufend - devbufstart)
-	      ret = ERROR_INVALID_PARAMETER;
-	    else if (!devbuf || op->rd_parm != devbufsiz)
-	      {
-		char *buf = new char [op->rd_parm];
-		if (devbufsiz > 1L)
-		  {
-		    memcpy (buf, devbuf + devbufstart, devbufend - devbufstart);
-		    devbufend -= devbufstart;
-		    delete [] devbuf;
-		  }
-		else
-		  devbufend = 0;
-
-		devbufstart = 0;
-		devbuf = buf;
-		devbufsiz = op->rd_parm;
-	      }
-	    break;
-	  default:
-	    break;
-	  }
-    }
-  else if (cmd == RDIOCGET)
-    {
-      struct rdget *get = (struct rdget *) buf;
-
-      if (!get)
-	ret = ERROR_INVALID_PARAMETER;
-      else
-	get->bufsiz = devbufsiz ? devbufsiz : 1L;
-    }
-  else
-    return fhandler_base::ioctl (cmd, buf);
-
-  if (ret != NO_ERROR)
-    {
-      SetLastError (ret);
-      __seterrno ();
-      return -1;
-    }
-  return 0;
-}
diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc
deleted file mode 100644
index f80096fa6..000000000
--- a/winsup/cygwin/fhandler_registry.cc
+++ /dev/null
@@ -1,670 +0,0 @@
-/* fhandler_registry.cc: fhandler for /proc/registry virtual filesystem
-
-   Copyright 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* FIXME: Access permissions are ignored at the moment.  */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/cygwin.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include <assert.h>
-
-#define _COMPILING_NEWLIB
-#include <dirent.h>
-
-static const int registry_len = sizeof ("registry") - 1;
-/* If this bit is set in __d_position then we are enumerating values,
- * else sub-keys. keeping track of where we are is horribly messy
- * the bottom 16 bits are the absolute position and the top 15 bits
- * make up the value index if we are enuerating values.
- */
-static const _off_t REG_ENUM_VALUES_MASK = 0x8000000;
-static const _off_t REG_POSITION_MASK = 0xffff;
-
-/* List of root keys in /proc/registry.
- * Possibly we should filter out those not relevant to the flavour of Windows
- * Cygwin is running on.
- */
-static const char *registry_listing[] =
-{
-  ".",
-  "..",
-  "HKEY_CLASSES_ROOT",
-  "HKEY_CURRENT_CONFIG",
-  "HKEY_CURRENT_USER",
-  "HKEY_LOCAL_MACHINE",
-  "HKEY_USERS",
-  "HKEY_DYN_DATA",		// 95/98/Me
-  "HKEY_PERFOMANCE_DATA",	// NT/2000/XP
-  NULL
-};
-
-static const HKEY registry_keys[] =
-{
-  (HKEY) INVALID_HANDLE_VALUE,
-  (HKEY) INVALID_HANDLE_VALUE,
-  HKEY_CLASSES_ROOT,
-  HKEY_CURRENT_CONFIG,
-  HKEY_CURRENT_USER,
-  HKEY_LOCAL_MACHINE,
-  HKEY_USERS,
-  HKEY_DYN_DATA,
-  HKEY_PERFORMANCE_DATA
-};
-
-static const int ROOT_KEY_COUNT = sizeof (registry_keys) / sizeof (HKEY);
-
-/* These get added to each subdirectory in /proc/registry.
- * If we wanted to implement writing, we could maybe add a '.writable' entry or
- * suchlike.
- */
-static const char *special_dot_files[] =
-{
-  ".",
-  "..",
-  NULL
-};
-
-static const int SPECIAL_DOT_FILE_COUNT =
-  (sizeof (special_dot_files) / sizeof (const char *)) - 1;
-
-/* Name given to default values */
-static const char *DEFAULT_VALUE_NAME = "@";
-
-static HKEY open_key (const char *name, REGSAM access, bool isValue);
-
-/* Returns 0 if path doesn't exist, >0 if path is a directory,
- * <0 if path is a file.
- *
- * We open the last key but one and then enum it's sub-keys and values to see if the
- * final component is there. This gets round the problem of not having security access
- * to the final key in the path.
- */
-int
-fhandler_registry::exists ()
-{
-  int file_type = 0, index = 0, pathlen;
-  DWORD buf_size = CYG_MAX_PATH;
-  LONG error;
-  char buf[buf_size];
-  const char *file;
-  HKEY hKey = (HKEY) INVALID_HANDLE_VALUE;
-
-  const char *path = get_name ();
-  debug_printf ("exists (%s)", path);
-  path += proc_len + registry_len + 1;
-  if (*path)
-    path++;
-  else
-    {
-      file_type = 2;
-      goto out;
-    }
-  pathlen = strlen (path);
-  file = path + pathlen - 1;
-  if (isdirsep (*file) && pathlen > 1)
-    file--;
-  while (!isdirsep (*file))
-    file--;
-  file++;
-
-  if (file == path)
-    {
-      for (int i = 0; registry_listing[i]; i++)
-	if (path_prefix_p
-	    (registry_listing[i], path, strlen (registry_listing[i])))
-	  {
-	    file_type = 1;
-	    goto out;
-	  }
-      goto out;
-    }
-
-  hKey = open_key (path, KEY_READ, false);
-  if (hKey != (HKEY) INVALID_HANDLE_VALUE)
-    file_type = 1;
-  else
-    {
-      hKey = open_key (path, KEY_READ, true);
-      if (hKey == (HKEY) INVALID_HANDLE_VALUE)
-	return 0;
-
-      while (ERROR_SUCCESS ==
-	     (error = RegEnumKeyEx (hKey, index++, buf, &buf_size, NULL, NULL,
-				    NULL, NULL))
-	     || (error == ERROR_MORE_DATA))
-	{
-	  if (pathmatch (buf, file))
-	    {
-	      file_type = 1;
-	      goto out;
-	    }
-	  buf_size = CYG_MAX_PATH;
-	}
-      if (error != ERROR_NO_MORE_ITEMS)
-	{
-	  seterrno_from_win_error (__FILE__, __LINE__, error);
-	  goto out;
-	}
-      index = 0;
-      buf_size = CYG_MAX_PATH;
-      while (ERROR_SUCCESS ==
-	     (error = RegEnumValue (hKey, index++, buf, &buf_size, NULL, NULL,
-				    NULL, NULL))
-	     || (error == ERROR_MORE_DATA))
-	{
-	  if (pathmatch (buf, file) || (buf[0] == '\0' &&
-					pathmatch (file, DEFAULT_VALUE_NAME)))
-	    {
-	      file_type = -1;
-	      goto out;
-	    }
-	  buf_size = CYG_MAX_PATH;
-	}
-      if (error != ERROR_NO_MORE_ITEMS)
-	{
-	  seterrno_from_win_error (__FILE__, __LINE__, error);
-	  goto out;
-	}
-    }
-out:
-  if (hKey != (HKEY) INVALID_HANDLE_VALUE)
-    RegCloseKey (hKey);
-  return file_type;
-}
-
-fhandler_registry::fhandler_registry ():
-fhandler_proc ()
-{
-}
-
-int
-fhandler_registry::fstat (struct __stat64 *buf)
-{
-  fhandler_base::fstat (buf);
-  buf->st_mode &= ~_IFMT & NO_W;
-  int file_type = exists ();
-  switch (file_type)
-    {
-    case 0:
-      set_errno (ENOENT);
-      return -1;
-    case 1:
-      buf->st_mode |= S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH;
-      break;
-    case 2:
-      buf->st_mode |= S_IFDIR | S_IXUSR | S_IXGRP | S_IXOTH;
-      buf->st_nlink = ROOT_KEY_COUNT;
-      break;
-    default:
-    case -1:
-      buf->st_mode |= S_IFREG;
-      buf->st_mode &= NO_X;
-      break;
-    }
-  if (file_type != 0 && file_type != 2)
-    {
-      HKEY hKey;
-      const char *path = get_name () + proc_len + registry_len + 2;
-      hKey =
-	open_key (path, STANDARD_RIGHTS_READ | KEY_QUERY_VALUE,
-		  (file_type < 0) ? true : false);
-
-      if (hKey != (HKEY) INVALID_HANDLE_VALUE)
-	{
-	  FILETIME ftLastWriteTime;
-	  DWORD subkey_count;
-	  if (ERROR_SUCCESS ==
-	      RegQueryInfoKey (hKey, NULL, NULL, NULL, &subkey_count, NULL,
-			       NULL, NULL, NULL, NULL, NULL,
-			       &ftLastWriteTime))
-	    {
-	      to_timestruc_t (&ftLastWriteTime, &buf->st_mtim);
-	      buf->st_ctim = buf->st_mtim;
-	      time_as_timestruc_t (&buf->st_atim);
-	      if (file_type > 0)
-		buf->st_nlink = subkey_count;
-	      else
-		{
-		  int pathlen = strlen (path);
-		  const char *value_name = path + pathlen - 1;
-		  if (isdirsep (*value_name) && pathlen > 1)
-		    value_name--;
-		  while (!isdirsep (*value_name))
-		    value_name--;
-		  value_name++;
-		  DWORD dwSize;
-		  if (ERROR_SUCCESS ==
-		      RegQueryValueEx (hKey, value_name, NULL, NULL, NULL,
-				       &dwSize))
-		    buf->st_size = dwSize;
-		}
-	      __uid32_t uid;
-	      __gid32_t gid;
-	      if (get_object_attribute
-		  ((HANDLE) hKey, SE_REGISTRY_KEY, &buf->st_mode, &uid,
-		   &gid) == 0)
-		{
-		  buf->st_uid = uid;
-		  buf->st_gid = gid;
-		  buf->st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
-		  if (file_type > 0)
-		    buf->st_mode |= S_IFDIR;
-		  else
-		    buf->st_mode &= NO_X;
-		}
-	    }
-	  RegCloseKey (hKey);
-	}
-    }
-  return 0;
-}
-
-struct dirent *
-fhandler_registry::readdir (DIR * dir)
-{
-  DWORD buf_size = CYG_MAX_PATH;
-  char buf[buf_size];
-  HANDLE handle;
-  struct dirent *res = NULL;
-  const char *path = dir->__d_dirname + proc_len + 1 + registry_len;
-  LONG error;
-
-  if (*path == 0)
-    {
-      if (dir->__d_position >= ROOT_KEY_COUNT)
-	goto out;
-      strcpy (dir->__d_dirent->d_name, registry_listing[dir->__d_position++]);
-      res = dir->__d_dirent;
-      goto out;
-    }
-  if (dir->__handle == INVALID_HANDLE_VALUE
-      && dir->__d_position == 0)
-    {
-      handle = open_key (path + 1, KEY_READ, false);
-      dir->__handle = handle;
-    }
-  if (dir->__handle == INVALID_HANDLE_VALUE)
-    goto out;
-  if (dir->__d_position < SPECIAL_DOT_FILE_COUNT)
-    {
-      strcpy (dir->__d_dirent->d_name,
-	      special_dot_files[dir->__d_position++]);
-      res = dir->__d_dirent;
-      goto out;
-    }
-retry:
-  if (dir->__d_position & REG_ENUM_VALUES_MASK)
-    /* For the moment, the type of key is ignored here. when write access is added,
-     * maybe add an extension for the type of each value?
-     */
-    error = RegEnumValue ((HKEY) dir->__handle,
-			  (dir->__d_position & ~REG_ENUM_VALUES_MASK) >> 16,
-			  buf, &buf_size, NULL, NULL, NULL, NULL);
-  else
-    error =
-      RegEnumKeyEx ((HKEY) dir->__handle, dir->__d_position -
-		    SPECIAL_DOT_FILE_COUNT, buf, &buf_size, NULL, NULL, NULL,
-		    NULL);
-  if (error == ERROR_NO_MORE_ITEMS
-      && (dir->__d_position & REG_ENUM_VALUES_MASK) == 0)
-    {
-      /* If we're finished with sub-keys, start on values under this key.  */
-      dir->__d_position |= REG_ENUM_VALUES_MASK;
-      buf_size = CYG_MAX_PATH;
-      goto retry;
-    }
-  if (error != ERROR_SUCCESS && error != ERROR_MORE_DATA)
-    {
-      RegCloseKey ((HKEY) dir->__handle);
-      dir->__handle = INVALID_HANDLE_VALUE;
-      if (error != ERROR_NO_MORE_ITEMS)
-	seterrno_from_win_error (__FILE__, __LINE__, error);
-      goto out;
-    }
-
-  /* We get here if `buf' contains valid data.  */
-  if (*buf == 0)
-    strcpy (dir->__d_dirent->d_name, DEFAULT_VALUE_NAME);
-  else
-    strcpy (dir->__d_dirent->d_name, buf);
-
-  dir->__d_position++;
-  if (dir->__d_position & REG_ENUM_VALUES_MASK)
-    dir->__d_position += 0x10000;
-  res = dir->__d_dirent;
-out:
-  syscall_printf ("%p = readdir (%p)", &dir->__d_dirent, dir);
-  return res;
-}
-
-_off64_t
-fhandler_registry::telldir (DIR * dir)
-{
-  return dir->__d_position & REG_POSITION_MASK;
-}
-
-void
-fhandler_registry::seekdir (DIR * dir, _off64_t loc)
-{
-  /* Unfortunately cannot simply set __d_position due to transition from sub-keys to
-   * values.
-   */
-  rewinddir (dir);
-  while (loc > (dir->__d_position & REG_POSITION_MASK))
-    if (!readdir (dir))
-      break;
-}
-
-void
-fhandler_registry::rewinddir (DIR * dir)
-{
-  if (dir->__handle != INVALID_HANDLE_VALUE)
-    {
-      (void) RegCloseKey ((HKEY) dir->__handle);
-      dir->__handle = INVALID_HANDLE_VALUE;
-    }
-  dir->__d_position = 0;
-  return;
-}
-
-int
-fhandler_registry::closedir (DIR * dir)
-{
-  int res = 0;
-  if (dir->__handle != INVALID_HANDLE_VALUE &&
-      RegCloseKey ((HKEY) dir->__handle) != ERROR_SUCCESS)
-    {
-      __seterrno ();
-      res = -1;
-    }
-  syscall_printf ("%d = closedir (%p)", res, dir);
-  return 0;
-}
-
-int
-fhandler_registry::open (int flags, mode_t mode)
-{
-  int pathlen;
-  const char *file;
-  HKEY handle;
-
-  int res = fhandler_virtual::open (flags, mode);
-  if (!res)
-    goto out;
-
-  const char *path;
-  path = get_name () + proc_len + 1 + registry_len;
-  if (!*path)
-    {
-      if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
-	{
-	  set_errno (EEXIST);
-	  res = 0;
-	  goto out;
-	}
-      else if (flags & O_WRONLY)
-	{
-	  set_errno (EISDIR);
-	  res = 0;
-	  goto out;
-	}
-      else
-	{
-	  flags |= O_DIROPEN;
-	  goto success;
-	}
-    }
-  path++;
-  pathlen = strlen (path);
-  file = path + pathlen - 1;
-  if (isdirsep (*file) && pathlen > 1)
-    file--;
-  while (!isdirsep (*file))
-    file--;
-  file++;
-
-  if (file == path)
-    {
-      for (int i = 0; registry_listing[i]; i++)
-	if (path_prefix_p
-	    (registry_listing[i], path, strlen (registry_listing[i])))
-	  {
-	    if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
-	      {
-		set_errno (EEXIST);
-		res = 0;
-		goto out;
-	      }
-	    else if (flags & O_WRONLY)
-	      {
-		set_errno (EISDIR);
-		res = 0;
-		goto out;
-	      }
-	    else
-	      {
-		flags |= O_DIROPEN;
-		goto success;
-	      }
-	  }
-
-      if (flags & O_CREAT)
-	{
-	  set_errno (EROFS);
-	  res = 0;
-	  goto out;
-	}
-      else
-	{
-	  set_errno (ENOENT);
-	  res = 0;
-	  goto out;
-	}
-    }
-
-  if (flags & O_WRONLY)
-    {
-      set_errno (EROFS);
-      res = 0;
-      goto out;
-    }
-
-  handle = open_key (path, KEY_READ, true);
-  if (handle == (HKEY) INVALID_HANDLE_VALUE)
-    {
-      res = 0;
-      goto out;
-    }
-
-  set_io_handle (handle);
-
-  if (pathmatch (file, DEFAULT_VALUE_NAME))
-    value_name = cstrdup ("");
-  else
-    value_name = cstrdup (file);
-
-  if (!fill_filebuf ())
-    {
-      RegCloseKey (handle);
-      res = 0;
-      goto out;
-    }
-
-  if (flags & O_APPEND)
-    position = filesize;
-  else
-    position = 0;
-
-success:
-  res = 1;
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-  set_open_status ();
-out:
-  syscall_printf ("%d = fhandler_registry::open (%p, %d)", res, flags, mode);
-  return res;
-}
-
-int
-fhandler_registry::close ()
-{
-  int res = fhandler_virtual::close ();
-  if (res != 0)
-    return res;
-  HKEY handle = (HKEY) get_handle ();
-  if (handle != (HKEY) INVALID_HANDLE_VALUE)
-    {
-      if (RegCloseKey (handle) != ERROR_SUCCESS)
-	{
-	  __seterrno ();
-	  res = -1;
-	}
-    }
-  if (value_name)
-    cfree (value_name);
-  return res;
-}
-
-bool
-fhandler_registry::fill_filebuf ()
-{
-  DWORD type, size;
-  LONG error;
-  HKEY handle = (HKEY) get_handle ();
-  if (handle != HKEY_PERFORMANCE_DATA)
-    {
-      error = RegQueryValueEx (handle, value_name, NULL, &type, NULL, &size);
-      if (error != ERROR_SUCCESS)
-	{
-	  if (error != ERROR_FILE_NOT_FOUND)
-	    {
-	      seterrno_from_win_error (__FILE__, __LINE__, error);
-	      return false;
-	    }
-	  goto value_not_found;
-	}
-      bufalloc = size;
-      filebuf = (char *) malloc (bufalloc);
-      error =
-	RegQueryValueEx (handle, value_name, NULL, NULL, (BYTE *) filebuf,
-			 &size);
-      if (error != ERROR_SUCCESS)
-	{
-	  seterrno_from_win_error (__FILE__, __LINE__, error);
-	  return true;
-	}
-      filesize = size;
-    }
-  else
-    {
-      bufalloc = 0;
-      do
-	{
-	  bufalloc += 1000;
-	  filebuf = (char *) realloc (filebuf, bufalloc);
-	  error = RegQueryValueEx (handle, value_name, NULL, &type,
-				   (BYTE *) filebuf, &size);
-	  if (error != ERROR_SUCCESS && error != ERROR_MORE_DATA)
-	    {
-	      if (error != ERROR_FILE_NOT_FOUND)
-		{
-		  seterrno_from_win_error (__FILE__, __LINE__, error);
-		  return true;
-		}
-	      goto value_not_found;
-	    }
-	}
-      while (error == ERROR_MORE_DATA);
-      filesize = size;
-    }
-  return true;
-value_not_found:
-  DWORD buf_size = CYG_MAX_PATH;
-  char buf[buf_size];
-  int index = 0;
-  while (ERROR_SUCCESS ==
-	 (error = RegEnumKeyEx (handle, index++, buf, &buf_size, NULL, NULL,
-				NULL, NULL)) || (error == ERROR_MORE_DATA))
-    {
-      if (pathmatch (buf, value_name))
-	{
-	  set_errno (EISDIR);
-	  return false;
-	}
-      buf_size = CYG_MAX_PATH;
-    }
-  if (error != ERROR_NO_MORE_ITEMS)
-    {
-      seterrno_from_win_error (__FILE__, __LINE__, error);
-      return false;
-    }
-  set_errno (ENOENT);
-  return false;
-}
-
-/* Auxillary member function to open registry keys.  */
-static HKEY
-open_key (const char *name, REGSAM access, bool isValue)
-{
-  HKEY hKey = (HKEY) INVALID_HANDLE_VALUE;
-  HKEY hParentKey = (HKEY) INVALID_HANDLE_VALUE;
-  bool parentOpened = false;
-  char component[CYG_MAX_PATH];
-
-  while (*name)
-    {
-      const char *anchor = name;
-      while (*name && !isdirsep (*name))
-	name++;
-      strncpy (component, anchor, name - anchor);
-      component[name - anchor] = '\0';
-      if (*name)
-	name++;
-      if (*name == 0 && isValue == true)
-	goto out;
-
-      if (hParentKey != (HKEY) INVALID_HANDLE_VALUE)
-	{
-	  REGSAM effective_access = KEY_READ;
-	  if ((strchr (name, '/') == NULL && isValue == true) || *name == 0)
-	    effective_access = access;
-	  LONG
-	    error =
-	    RegOpenKeyEx (hParentKey, component, 0, effective_access, &hKey);
-	  if (error != ERROR_SUCCESS)
-	    {
-	      hKey = (HKEY) INVALID_HANDLE_VALUE;
-	      seterrno_from_win_error (__FILE__, __LINE__, error);
-	      return hKey;
-	    }
-	  if (parentOpened)
-	    RegCloseKey (hParentKey);
-	  hParentKey = hKey;
-	  parentOpened = true;
-	}
-      else
-	{
-	  for (int i = 0; registry_listing[i]; i++)
-	    if (pathmatch (component, registry_listing[i]))
-	      hKey = registry_keys[i];
-	  if (hKey == (HKEY) INVALID_HANDLE_VALUE)
-	    return hKey;
-	  hParentKey = hKey;
-	}
-    }
-out:
-  return hKey;
-}
diff --git a/winsup/cygwin/fhandler_serial.cc b/winsup/cygwin/fhandler_serial.cc
deleted file mode 100644
index efb1af99b..000000000
--- a/winsup/cygwin/fhandler_serial.cc
+++ /dev/null
@@ -1,1044 +0,0 @@
-/* fhandler_serial.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include <sys/termios.h>
-#include <ddk/ntddser.h>
-
-/**********************************************************************/
-/* fhandler_serial */
-
-fhandler_serial::fhandler_serial ()
-  : fhandler_base (), vmin_ (0), vtime_ (0), pgrp_ (myself->pgid)
-{
-  set_need_fork_fixup ();
-}
-
-void
-fhandler_serial::overlapped_setup ()
-{
-  memset (&io_status, 0, sizeof (io_status));
-  io_status.hEvent = CreateEvent (&sec_none_nih, TRUE, FALSE, NULL);
-  ProtectHandle (io_status.hEvent);
-  overlapped_armed = 0;
-}
-
-void
-fhandler_serial::raw_read (void *ptr, size_t& ulen)
-{
-  int tot;
-  DWORD n;
-  HANDLE w4[2];
-  size_t minchars = vmin_ ?: ulen;
-
-  w4[0] = io_status.hEvent;
-  w4[1] = signal_arrived;
-
-  debug_printf ("ulen %d, vmin_ %d, vtime_ %d, hEvent %p", ulen, vmin_, vtime_,
-		io_status.hEvent);
-  if (!overlapped_armed)
-    {
-      (void) SetCommMask (get_handle (), EV_RXCHAR);
-      ResetEvent (io_status.hEvent);
-    }
-
-  for (n = 0, tot = 0; ulen; ulen -= n, ptr = (char *) ptr + n)
-    {
-      COMSTAT st;
-      DWORD inq = 1;
-
-      n = 0;
-
-      if (!vtime_ && !vmin_)
-	inq = ulen;
-      else if (vtime_)
-	{
-	  inq = ulen;	// non-interruptible -- have to use kernel timeouts
-			// also note that this is not strictly correct.
-			// if vmin > ulen then things won't work right.
-	  overlapped_armed = -1;
-	}
-
-      if (!ClearCommError (get_handle (), &ev, &st))
-	goto err;
-      else if (ev)
-	termios_printf ("error detected %x", ev);
-      else if (st.cbInQue)
-	inq = st.cbInQue;
-      else if (!overlapped_armed)
-	{
-	  if ((size_t) tot >= minchars)
-	    break;
-	  else if (WaitCommEvent (get_handle (), &ev, &io_status))
-	    {
-	      debug_printf ("WaitCommEvent succeeded: ev %x", ev);
-	      if (!ev)
-		continue;
-	    }
-	  else if (GetLastError () != ERROR_IO_PENDING)
-	    goto err;
-	  else
-	    {
-	      overlapped_armed = 1;
-	      switch (WaitForMultipleObjects (2, w4, FALSE, INFINITE))
-		{
-		case WAIT_OBJECT_0:
-		  if (!GetOverlappedResult (get_handle (), &io_status, &n, FALSE))
-		    goto err;
-		  debug_printf ("n %d, ev %x", n, ev);
-		  break;
-		case WAIT_OBJECT_0 + 1:
-		  tot = -1;
-		  PurgeComm (get_handle (), PURGE_RXABORT);
-		  overlapped_armed = 0;
-		  set_sig_errno (EINTR);
-		  goto out;
-		default:
-		  goto err;
-		}
-	    }
-	}
-
-      overlapped_armed = 0;
-      ResetEvent (io_status.hEvent);
-      if (inq > ulen)
-	inq = ulen;
-      debug_printf ("inq %d", inq);
-      if (ReadFile (get_handle (), ptr, min (inq, ulen), &n, &io_status))
-	/* Got something */;
-      else if (GetLastError () != ERROR_IO_PENDING)
-	goto err;
-      else if (!GetOverlappedResult (get_handle (), &io_status, &n, TRUE))
-	goto err;
-
-      tot += n;
-      debug_printf ("vtime_ %d, vmin_ %d, n %d, tot %d", vtime_, vmin_, n, tot);
-      if (vtime_ || !vmin_ || !n)
-	break;
-      continue;
-
-    err:
-      PurgeComm (get_handle (), PURGE_RXABORT);
-      debug_printf ("err %E");
-      if (GetLastError () == ERROR_OPERATION_ABORTED)
-	n = 0;
-      else
-	{
-	  tot = -1;
-	  __seterrno ();
-	  break;
-	}
-    }
-
-out:
-  ulen = tot;
-}
-
-/* Cover function to WriteFile to provide Posix interface and semantics
-   (as much as possible).  */
-int
-fhandler_serial::raw_write (const void *ptr, size_t len)
-{
-  DWORD bytes_written;
-  OVERLAPPED write_status;
-
-  memset (&write_status, 0, sizeof (write_status));
-  write_status.hEvent = CreateEvent (&sec_none_nih, TRUE, FALSE, NULL);
-  ProtectHandle (write_status.hEvent);
-
-  for (;;)
-    {
-      if (WriteFile (get_handle (), ptr, len, &bytes_written, &write_status))
-	break;
-
-      switch (GetLastError ())
-	{
-	case ERROR_OPERATION_ABORTED:
-	  continue;
-	case ERROR_IO_PENDING:
-	  break;
-	default:
-	  goto err;
-	}
-
-      if (!GetOverlappedResult (get_handle (), &write_status, &bytes_written, TRUE))
-	goto err;
-
-      break;
-    }
-
-  ForceCloseHandle (write_status.hEvent);
-
-  return bytes_written;
-
-err:
-  __seterrno ();
-  ForceCloseHandle (write_status.hEvent);
-  return -1;
-}
-
-void
-fhandler_serial::dump (void)
-{
-  paranoid_printf ("here");
-}
-
-void
-fhandler_serial::init (HANDLE f, DWORD flags, mode_t bin)
-{
-  (void) open (flags, bin & (O_BINARY | O_TEXT));
-}
-
-int
-fhandler_serial::open (int flags, mode_t mode)
-{
-  int res;
-  COMMTIMEOUTS to;
-  extern BOOL reset_com;
-
-  syscall_printf ("fhandler_serial::open (%s, %p, %p)",
-			get_name (), flags, mode);
-
-  if (!fhandler_base::open (flags, mode))
-    return 0;
-
-  res = 1;
-
-  (void) SetCommMask (get_handle (), EV_RXCHAR);
-
-  set_r_no_interrupt (1);	// Handled explicitly in read code
-
-  overlapped_setup ();
-
-  memset (&to, 0, sizeof (to));
-  (void) SetCommTimeouts (get_handle (), &to);
-
-  /* Reset serial port to known state of 9600-8-1-no flow control
-     on open for better behavior under Win 95.
-
-     FIXME:  This should only be done when explicitly opening the com
-     port.  It should not be reset if an fd is inherited.
-     Using __progname in this way, to determine how far along in the
-     initialization we are, is really a terrible kludge and should
-     be fixed ASAP.
-  */
-  extern char *__progname;
-  if (reset_com && __progname)
-    {
-      DCB state;
-      GetCommState (get_handle (), &state);
-      syscall_printf ("setting initial state on %s (reset_com %d)",
-		      get_name (), reset_com);
-      state.BaudRate = CBR_9600;
-      state.ByteSize = 8;
-      state.StopBits = ONESTOPBIT;
-      state.Parity = NOPARITY; /* FIXME: correct default? */
-      state.fBinary = TRUE; /* binary xfer */
-      state.EofChar = 0; /* no end-of-data in binary mode */
-      state.fNull = FALSE; /* don't discard nulls in binary mode */
-      state.fParity = FALSE; /* ignore parity errors */
-      state.fErrorChar = FALSE;
-      state.fTXContinueOnXoff = TRUE; /* separate TX and RX flow control */
-      state.fOutX = FALSE; /* disable transmission flow control */
-      state.fInX = FALSE; /* disable reception flow control */
-      state.XonChar = 0x11;
-      state.XoffChar = 0x13;
-      state.fOutxDsrFlow = FALSE; /* disable DSR flow control */
-      state.fRtsControl = RTS_CONTROL_ENABLE; /* ignore lead control except
-						  DTR */
-      state.fOutxCtsFlow = FALSE; /* disable output flow control */
-      state.fDtrControl = DTR_CONTROL_ENABLE; /* assert DTR */
-      state.fDsrSensitivity = FALSE; /* don't assert DSR */
-      state.fAbortOnError = TRUE;
-      if (!SetCommState (get_handle (), &state))
-	system_printf ("couldn't set initial state for %s, %E", get_name ());
-    }
-
-  /* setting rts and dtr to known state so that ioctl() function with
-  request TIOCMGET could return correct value of RTS and DTR lines.
-  Important only for Win 9x systems */
-
-  if (!wincap.supports_reading_modem_output_lines ())
-    {
-      if (EscapeCommFunction (get_handle (), SETDTR) == 0)
-	system_printf ("couldn't set initial state of DTR for %s, %E", get_name ());
-      if (EscapeCommFunction (get_handle (), SETRTS) == 0)
-	system_printf ("couldn't set initial state of RTS for %s, %E", get_name ());
-
-      /* even though one of above functions fail I have to set rts and dtr
-      variables to initial value. */
-      rts = TIOCM_RTS;
-      dtr = TIOCM_DTR;
-    }
-
-  SetCommMask (get_handle (), EV_RXCHAR);
-  set_open_status ();
-  syscall_printf ("%p = fhandler_serial::open (%s, %p, %p)",
-			res, get_name (), flags, mode);
-  return res;
-}
-
-int
-fhandler_serial::close ()
-{
-  (void) ForceCloseHandle (io_status.hEvent);
-  return fhandler_base::close ();
-}
-
-/* tcsendbreak: POSIX 7.2.2.1 */
-/* Break for 250-500 milliseconds if duration == 0 */
-/* Otherwise, units for duration are undefined */
-int
-fhandler_serial::tcsendbreak (int duration)
-{
-  unsigned int sleeptime = 300000;
-
-  if (duration > 0)
-    sleeptime *= duration;
-
-  if (SetCommBreak (get_handle ()) == 0)
-    return -1;
-
-  /* FIXME: need to send zero bits during duration */
-  usleep (sleeptime);
-
-  if (ClearCommBreak (get_handle ()) == 0)
-    return -1;
-
-  syscall_printf ("0 = fhandler_serial:tcsendbreak (%d)", duration);
-
-  return 0;
-}
-
-/* tcdrain: POSIX 7.2.2.1 */
-int
-fhandler_serial::tcdrain (void)
-{
-  if (FlushFileBuffers (get_handle ()) == 0)
-    return -1;
-
-  return 0;
-}
-
-/* tcflow: POSIX 7.2.2.1 */
-int
-fhandler_serial::tcflow (int action)
-{
-  DWORD win32action = 0;
-  DCB dcb;
-  char xchar;
-
-  termios_printf ("action %d", action);
-
-  switch (action)
-    {
-    case TCOOFF:
-      win32action = SETXOFF;
-      break;
-    case TCOON:
-      win32action = SETXON;
-      break;
-    case TCION:
-    case TCIOFF:
-      if (GetCommState (get_handle (), &dcb) == 0)
-	return -1;
-      if (action == TCION)
-	xchar = (dcb.XonChar ? dcb.XonChar : 0x11);
-      else
-	xchar = (dcb.XoffChar ? dcb.XoffChar : 0x13);
-      if (TransmitCommChar (get_handle (), xchar) == 0)
-	return -1;
-      return 0;
-      break;
-    default:
-      return -1;
-      break;
-    }
-
-  if (EscapeCommFunction (get_handle (), win32action) == 0)
-    return -1;
-
-  return 0;
-}
-
-
-/* ioctl: */
-int
-fhandler_serial::ioctl (unsigned int cmd, void *buffer)
-{
-  int res = 0;
-
-# define ibuffer ((int) buffer)
-# define ipbuffer (*(int *) buffer)
-
-  DWORD ev;
-  COMSTAT st;
-  if (!ClearCommError (get_handle (), &ev, &st))
-    {
-      __seterrno ();
-      res = -1;
-    }
-  else
-    switch (cmd)
-      {
-      case TCFLSH:
-	res = tcflush (ibuffer);
-	break;
-      case TIOCMGET:
-	DWORD modem_lines;
-	if (!GetCommModemStatus (get_handle (), &modem_lines))
-	  {
-	    __seterrno ();
-	    res = -1;
-	  }
-	else
-	  {
-	    ipbuffer = 0;
-	    if (modem_lines & MS_CTS_ON)
-	      ipbuffer |= TIOCM_CTS;
-	    if (modem_lines & MS_DSR_ON)
-	      ipbuffer |= TIOCM_DSR;
-	    if (modem_lines & MS_RING_ON)
-	      ipbuffer |= TIOCM_RI;
-	    if (modem_lines & MS_RLSD_ON)
-	      ipbuffer |= TIOCM_CD;
-
-	    DWORD cb;
-	    DWORD mcr;
-	    if (!DeviceIoControl (get_handle (), IOCTL_SERIAL_GET_DTRRTS,
-				  NULL, 0, &mcr, 4, &cb, 0) || cb != 4)
-	      ipbuffer |= rts | dtr;
-	    else
-	      {
-		if (mcr & 2)
-		  ipbuffer |= TIOCM_RTS;
-		if (mcr & 1)
-		  ipbuffer |= TIOCM_DTR;
-	      }
-	  }
-	break;
-      case TIOCMSET:
-	if (ipbuffer & TIOCM_RTS)
-	  {
-	    if (EscapeCommFunction (get_handle (), SETRTS))
-	      rts = TIOCM_RTS;
-	    else
-	      {
-		__seterrno ();
-		res = -1;
-	      }
-	  }
-	else
-	  {
-	    if (EscapeCommFunction (get_handle (), CLRRTS))
-	      rts = 0;
-	    else
-	      {
-		__seterrno ();
-		res = -1;
-	      }
-	  }
-	if (ipbuffer & TIOCM_DTR)
-	  {
-	    if (EscapeCommFunction (get_handle (), SETDTR))
-	      dtr = TIOCM_DTR;
-	    else
-	      {
-		__seterrno ();
-		res = -1;
-	      }
-	  }
-	else if (EscapeCommFunction (get_handle (), CLRDTR))
-	  dtr = 0;
-	else
-	  {
-	    __seterrno ();
-	    res = -1;
-	  }
-	break;
-     case TIOCINQ:
-       if (ev & CE_FRAME || ev & CE_IOE || ev & CE_OVERRUN || ev & CE_RXOVER
-	   || ev & CE_RXPARITY)
-	 {
-	   set_errno (EINVAL);	/* FIXME: Use correct errno */
-	   res = -1;
-	 }
-       else
-	 ipbuffer = st.cbInQue;
-       break;
-     default:
-       set_errno (ENOSYS);
-       res = -1;
-       break;
-     }
-
-  termios_printf ("%d = ioctl (%p, %p)", res, cmd, buffer);
-# undef ibuffer
-# undef ipbuffer
-  return res;
-}
-
-/* tcflush: POSIX 7.2.2.1 */
-int
-fhandler_serial::tcflush (int queue)
-{
-  DWORD flags;
-
-  switch (queue)
-    {
-    case TCOFLUSH:
-      flags = PURGE_TXABORT | PURGE_TXCLEAR;
-      break;
-    case TCIFLUSH:
-      flags = PURGE_RXABORT | PURGE_RXCLEAR;
-      break;
-    case TCIOFLUSH:
-      flags = PURGE_TXABORT | PURGE_TXCLEAR | PURGE_RXABORT | PURGE_RXCLEAR;
-      break;
-    default:
-      termios_printf ("Invalid tcflush queue %d", queue);
-      set_errno (EINVAL);
-      return -1;
-    }
-	
-  if (!PurgeComm (get_handle (), flags))
-    {
-      __seterrno ();
-      return -1;
-    }
-
-  return 0;
-}
-
-/* tcsetattr: POSIX 7.2.1.1 */
-int
-fhandler_serial::tcsetattr (int action, const struct termios *t)
-{
-  /* Possible actions:
-    TCSANOW:   immediately change attributes.
-    TCSADRAIN: flush output, then change attributes.
-    TCSAFLUSH: flush output and discard input, then change attributes.
-  */
-
-  bool dropDTR = false;
-  COMMTIMEOUTS to;
-  DCB ostate, state;
-  unsigned int ovtime = vtime_, ovmin = vmin_;
-  int tmpDtr, tmpRts, res;
-  res = tmpDtr = tmpRts = 0;
-
-  termios_printf ("action %d", action);
-  if ((action == TCSADRAIN) || (action == TCSAFLUSH))
-    {
-      FlushFileBuffers (get_handle ());
-      termios_printf ("flushed file buffers");
-    }
-  if (action == TCSAFLUSH)
-    PurgeComm (get_handle (), (PURGE_RXABORT | PURGE_RXCLEAR));
-
-  /* get default/last comm state */
-  if (!GetCommState (get_handle (), &ostate))
-    return -1;
-
-  state = ostate;
-
-  /* -------------- Set baud rate ------------------ */
-  /* FIXME: WIN32 also has 14400, 56000, 128000, and 256000.
-     Unix also has 230400. */
-
-  switch (t->c_ospeed)
-    {
-    case B0:
-      /* Drop DTR - but leave DCB-resident bitrate as-is since
-	 0 is an invalid bitrate in Win32 */
-      dropDTR = true;
-      break;
-    case B110:
-      state.BaudRate = CBR_110;
-      break;
-    case B300:
-      state.BaudRate = CBR_300;
-      break;
-    case B600:
-      state.BaudRate = CBR_600;
-      break;
-    case B1200:
-      state.BaudRate = CBR_1200;
-      break;
-    case B2400:
-      state.BaudRate = CBR_2400;
-      break;
-    case B4800:
-      state.BaudRate = CBR_4800;
-      break;
-    case B9600:
-      state.BaudRate = CBR_9600;
-      break;
-    case B19200:
-      state.BaudRate = CBR_19200;
-      break;
-    case B38400:
-      state.BaudRate = CBR_38400;
-      break;
-    case B57600:
-      state.BaudRate = CBR_57600;
-      break;
-    case B115200:
-      state.BaudRate = CBR_115200;
-      break;
-    case B230400:
-      state.BaudRate = 230400 /* CBR_230400 - not defined */;
-      break;
-    default:
-      /* Unsupported baud rate! */
-      termios_printf ("Invalid t->c_ospeed %d", t->c_ospeed);
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  /* -------------- Set byte size ------------------ */
-
-  switch (t->c_cflag & CSIZE)
-    {
-    case CS5:
-      state.ByteSize = 5;
-      break;
-    case CS6:
-      state.ByteSize = 6;
-      break;
-    case CS7:
-      state.ByteSize = 7;
-      break;
-    case CS8:
-      state.ByteSize = 8;
-      break;
-    default:
-      /* Unsupported byte size! */
-      termios_printf ("Invalid t->c_cflag byte size %d",
-		      t->c_cflag & CSIZE);
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  /* -------------- Set stop bits ------------------ */
-
-  if (t->c_cflag & CSTOPB)
-    state.StopBits = TWOSTOPBITS;
-  else
-    state.StopBits = ONESTOPBIT;
-
-  /* -------------- Set parity ------------------ */
-
-  if (t->c_cflag & PARENB)
-    state.Parity = (t->c_cflag & PARODD) ? ODDPARITY : EVENPARITY;
-  else
-    state.Parity = NOPARITY;
-
-  state.fBinary = TRUE;     /* Binary transfer */
-  state.EofChar = 0;	    /* No end-of-data in binary mode */
-  state.fNull = FALSE;      /* Don't discard nulls in binary mode */
-
-  /* -------------- Parity errors ------------------ */
-  /* fParity combines the function of INPCK and NOT IGNPAR */
-
-  if ((t->c_iflag & INPCK) && !(t->c_iflag & IGNPAR))
-    state.fParity = TRUE;   /* detect parity errors */
-  else
-    state.fParity = FALSE;  /* ignore parity errors */
-
-  /* Only present in Win32, Unix has no equivalent */
-  state.fErrorChar = FALSE;
-  state.ErrorChar = 0;
-
-  /* -------------- Set software flow control ------------------ */
-  /* Set fTXContinueOnXoff to FALSE.  This prevents the triggering of a
-     premature XON when the remote device interprets a received character
-     as XON (same as IXANY on the remote side).  Otherwise, a TRUE
-     value separates the TX and RX functions. */
-
-  state.fTXContinueOnXoff = TRUE;     /* separate TX and RX flow control */
-
-  /* Transmission flow control */
-  if (t->c_iflag & IXON)
-    state.fOutX = TRUE;   /* enable */
-  else
-    state.fOutX = FALSE;  /* disable */
-
-  /* Reception flow control */
-  if (t->c_iflag & IXOFF)
-    state.fInX = TRUE;    /* enable */
-  else
-    state.fInX = FALSE;   /* disable */
-
-  /* XoffLim and XonLim are left at default values */
-
-  state.XonChar = (t->c_cc[VSTART] ? t->c_cc[VSTART] : 0x11);
-  state.XoffChar = (t->c_cc[VSTOP] ? t->c_cc[VSTOP] : 0x13);
-
-  /* -------------- Set hardware flow control ------------------ */
-
-  /* Disable DSR flow control */
-  state.fOutxDsrFlow = FALSE;
-
-  /* Some old flavors of Unix automatically enabled hardware flow
-     control when software flow control was not enabled.  Since newer
-     Unices tend to require explicit setting of hardware flow-control,
-     this is what we do. */
-
-  /* RTS/CTS flow control */
-  if (t->c_cflag & CRTSCTS)
-    {							/* enable */
-      state.fOutxCtsFlow = TRUE;
-      state.fRtsControl = RTS_CONTROL_HANDSHAKE;
-    }
-  else
-    {							/* disable */
-      state.fRtsControl = RTS_CONTROL_ENABLE;
-      state.fOutxCtsFlow = FALSE;
-      tmpRts = TIOCM_RTS;
-    }
-
-  if (t->c_cflag & CRTSXOFF)
-    state.fRtsControl = RTS_CONTROL_HANDSHAKE;
-
-  /* -------------- DTR ------------------ */
-  /* Assert DTR on device open */
-
-  state.fDtrControl = DTR_CONTROL_ENABLE;
-
-  /* -------------- DSR ------------------ */
-  /* Assert DSR at the device? */
-
-  if (t->c_cflag & CLOCAL)
-    state.fDsrSensitivity = FALSE;  /* no */
-  else
-    state.fDsrSensitivity = TRUE;   /* yes */
-
-  /* -------------- Error handling ------------------ */
-  /* Since read/write operations terminate upon error, we
-     will use ClearCommError() to resume. */
-
-  state.fAbortOnError = TRUE;
-
-  if ((memcmp (&ostate, &state, sizeof (state)) != 0)
-      && !SetCommState (get_handle (), &state))
-    {
-      /* SetCommState() failed, usually due to invalid DCB param.
-	 Keep track of this so we can set errno to EINVAL later
-	 and return failure */
-      termios_printf ("SetCommState() failed, %E");
-      __seterrno ();
-      res = -1;
-    }
-
-  set_r_binary ((t->c_iflag & IGNCR) ? 0 : 1);
-  set_w_binary ((t->c_oflag & ONLCR) ? 0 : 1);
-
-  if (dropDTR)
-    {
-      EscapeCommFunction (get_handle (), CLRDTR);
-      tmpDtr = 0;
-    }
-  else
-    {
-      /* FIXME: Sometimes when CLRDTR is set, setting
-      state.fDtrControl = DTR_CONTROL_ENABLE will fail.  This
-      is a problem since a program might want to change some
-      parameters while DTR is still down. */
-
-      EscapeCommFunction (get_handle (), SETDTR);
-      tmpDtr = TIOCM_DTR;
-    }
-
-  rts = tmpRts;
-  dtr = tmpDtr;
-
-  /* The following documentation on was taken from "Linux Serial Programming
-  HOWTO".  It explains how MIN (t->c_cc[VMIN] || vmin_) and TIME
-  (t->c_cc[VTIME] || vtime_) is to be used.
-
-  In non-canonical input processing mode, input is not assembled into
-  lines and input processing (erase, kill, delete, etc.) does not
-  occur. Two parameters control the behavior of this mode: c_cc[VTIME]
-  sets the character timer, and c_cc[VMIN] sets the minimum number of
-  characters to receive before satisfying the read.
-
-  If MIN > 0 and TIME = 0, MIN sets the number of characters to receive
-  before the read is satisfied. As TIME is zero, the timer is not used.
-
-  If MIN = 0 and TIME > 0, TIME serves as a timeout value. The read will
-  be satisfied if a single character is read, or TIME is exceeded (t =
-  TIME *0.1 s). If TIME is exceeded, no character will be returned.
-
-  If MIN > 0 and TIME > 0, TIME serves as an inter-character timer. The
-  read will be satisfied if MIN characters are received, or the time
-  between two characters exceeds TIME. The timer is restarted every time
-  a character is received and only becomes active after the first
-  character has been received.
-
-  If MIN = 0 and TIME = 0, read will be satisfied immediately. The
-  number of characters currently available, or the number of characters
-  requested will be returned. According to Antonino (see contributions),
-  you could issue a fcntl(fd, F_SETFL, FNDELAY); before reading to get
-  the same result.
-  */
-
-  if (t->c_lflag & ICANON)
-    {
-      vmin_ = 0;
-      vtime_ = 0;
-    }
-  else
-    {
-      vtime_ = t->c_cc[VTIME] * 100;
-      vmin_ = t->c_cc[VMIN];
-    }
-
-  debug_printf ("vtime %d, vmin %d", vtime_, vmin_);
-
-  if (ovmin != vmin_ || ovtime != vtime_)
-  {
-    memset (&to, 0, sizeof (to));
-
-    if ((vmin_ > 0) && (vtime_ == 0))
-      {
-	/* Returns immediately with whatever is in buffer on a ReadFile();
-	   or blocks if nothing found.  We will keep calling ReadFile(); until
-	   vmin_ characters are read */
-	to.ReadIntervalTimeout = to.ReadTotalTimeoutMultiplier = MAXDWORD;
-	to.ReadTotalTimeoutConstant = MAXDWORD - 1;
-      }
-    else if ((vmin_ == 0) && (vtime_ > 0))
-      {
-	/* set timeoout constant appropriately and we will only try to
-	   read one character in ReadFile() */
-	to.ReadTotalTimeoutConstant = vtime_;
-	to.ReadIntervalTimeout = to.ReadTotalTimeoutMultiplier = MAXDWORD;
-      }
-    else if ((vmin_ > 0) && (vtime_ > 0))
-      {
-	/* time applies to the interval time for this case */
-	to.ReadIntervalTimeout = vtime_;
-      }
-    else if ((vmin_ == 0) && (vtime_ == 0))
-      {
-	/* returns immediately with whatever is in buffer as per
-	   Time-Outs docs in Win32 SDK API docs */
-	to.ReadIntervalTimeout = MAXDWORD;
-      }
-
-    debug_printf ("ReadTotalTimeoutConstant %d, ReadIntervalTimeout %d, ReadTotalTimeoutMultiplier %d",
-		  to.ReadTotalTimeoutConstant, to.ReadIntervalTimeout, to.ReadTotalTimeoutMultiplier);
-
-    if (!SetCommTimeouts(get_handle (), &to))
-      {
-	/* SetCommTimeouts() failed. Keep track of this so we
-	   can set errno to EINVAL later and return failure */
-	termios_printf ("SetCommTimeouts() failed, %E");
-	__seterrno ();
-	res = -1;
-      }
-  }
-
-  return res;
-}
-
-/* tcgetattr: POSIX 7.2.1.1 */
-int
-fhandler_serial::tcgetattr (struct termios *t)
-{
-  DCB state;
-
-  /* Get current Win32 comm state */
-  if (GetCommState (get_handle (), &state) == 0)
-    return -1;
-
-  /* for safety */
-  memset (t, 0, sizeof (*t));
-
-  /* -------------- Baud rate ------------------ */
-
-  /* If DTR is NOT set, return B0 as our speed */
-  if (dtr != TIOCM_DTR)
-    t->c_cflag = t->c_ospeed = t->c_ispeed = B0;
-  else
-    switch (state.BaudRate)
-      {
-      case CBR_110:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B110;
-	break;
-      case CBR_300:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B300;
-	break;
-      case CBR_600:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B600;
-	break;
-      case CBR_1200:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B1200;
-	break;
-      case CBR_2400:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B2400;
-	break;
-      case CBR_4800:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B4800;
-	break;
-      case CBR_9600:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B9600;
-	break;
-      case CBR_19200:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B19200;
-	break;
-      case CBR_38400:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B38400;
-	break;
-      case CBR_57600:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B57600;
-	break;
-      case CBR_115200:
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B115200;
-	break;
-      case 230400: /* CBR_230400 - not defined */
-	t->c_cflag = t->c_ospeed = t->c_ispeed = B230400;
-	break;
-      default:
-	/* Unsupported baud rate! */
-	termios_printf ("Invalid baud rate %d", state.BaudRate);
-	set_errno (EINVAL);
-	return -1;
-      }
-
-  /* -------------- Byte size ------------------ */
-
-  switch (state.ByteSize)
-    {
-    case 5:
-      t->c_cflag |= CS5;
-      break;
-    case 6:
-      t->c_cflag |= CS6;
-      break;
-    case 7:
-      t->c_cflag |= CS7;
-      break;
-    case 8:
-      t->c_cflag |= CS8;
-      break;
-    default:
-      /* Unsupported byte size! */
-      termios_printf ("Invalid byte size %d", state.ByteSize);
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  /* -------------- Stop bits ------------------ */
-
-  if (state.StopBits == TWOSTOPBITS)
-    t->c_cflag |= CSTOPB;
-
-  /* -------------- Parity ------------------ */
-
-  if (state.Parity == ODDPARITY)
-    t->c_cflag |= (PARENB | PARODD);
-  if (state.Parity == EVENPARITY)
-    t->c_cflag |= PARENB;
-
-  /* -------------- Parity errors ------------------ */
-
-  /* fParity combines the function of INPCK and NOT IGNPAR */
-  if (state.fParity)
-    t->c_iflag |= INPCK;
-  else
-    t->c_iflag |= IGNPAR;	/* not necessarily! */
-
-  /* -------------- Software flow control ------------------ */
-
-  /* transmission flow control */
-  if (state.fOutX)
-    t->c_iflag |= IXON;
-
-  /* reception flow control */
-  if (state.fInX)
-    t->c_iflag |= IXOFF;
-
-  t->c_cc[VSTART] = (state.XonChar ? state.XonChar : 0x11);
-  t->c_cc[VSTOP] = (state.XoffChar ? state.XoffChar : 0x13);
-
-  /* -------------- Hardware flow control ------------------ */
-  /* Some old flavors of Unix automatically enabled hardware flow
-     control when software flow control was not enabled.  Since newer
-     Unices tend to require explicit setting of hardware flow-control,
-     this is what we do. */
-
-  /* Input flow-control */
-  if ((state.fRtsControl == RTS_CONTROL_HANDSHAKE) && state.fOutxCtsFlow)
-    t->c_cflag |= CRTSCTS;
-  if (state.fRtsControl == RTS_CONTROL_HANDSHAKE)
-    t->c_cflag |= CRTSXOFF;
-
-  /* -------------- CLOCAL --------------- */
-  /* DSR is only lead toggled only by CLOCAL.  Check it to see if
-     CLOCAL was called. */
-  /* FIXME: If tcsetattr() hasn't been called previously, this may
-     give a false CLOCAL. */
-
-  if (!state.fDsrSensitivity)
-    t->c_cflag |= CLOCAL;
-
-  /* FIXME: need to handle IGNCR */
-#if 0
-  if (!get_r_binary ())
-    t->c_iflag |= IGNCR;
-#endif
-
-  if (!get_w_binary ())
-    t->c_oflag |= ONLCR;
-
-  t->c_cc[VTIME] = vtime_ / 100;
-  t->c_cc[VMIN] = vmin_;
-
-  debug_printf ("vmin_ %d, vtime_ %d", vmin_, vtime_);
-
-  return 0;
-}
-
-void
-fhandler_serial::fixup_after_fork (HANDLE parent)
-{
-  if (get_close_on_exec ())
-    fhandler_base::fixup_after_fork (parent);
-  overlapped_setup ();
-  debug_printf ("io_status.hEvent %p", io_status.hEvent);
-}
-
-void
-fhandler_serial::fixup_after_exec (HANDLE)
-{
-  overlapped_setup ();
-  debug_printf ("io_status.hEvent %p", io_status.hEvent);
-  return;
-}
-
-int
-fhandler_serial::dup (fhandler_base *child)
-{
-  fhandler_serial *fhc = (fhandler_serial *) child;
-  overlapped_setup ();
-  fhc->vmin_ = vmin_;
-  fhc->vtime_ = vtime_;
-  return fhandler_base::dup (child);
-}
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
deleted file mode 100644
index 8d8f9cbb2..000000000
--- a/winsup/cygwin/fhandler_socket.cc
+++ /dev/null
@@ -1,1315 +0,0 @@
-/* fhandler_socket.cc. See fhandler.h for a description of the fhandler classes.
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-/* #define DEBUG_NEST_ON 1 */
-
-#define  __INSIDE_CYGWIN_NET__
-
-#include "winsup.h"
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/uio.h>
-#include <asm/byteorder.h>
-
-#include <stdlib.h>
-#define USE_SYS_TYPES_FD_SET
-#include <winsock2.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "cygwin/version.h"
-#include "perprocess.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "sigproc.h"
-#include "wsock_event.h"
-#include "cygthread.h"
-#include "select.h"
-#include <unistd.h>
-
-extern bool fdsock (cygheap_fdmanip& fd, const device *, SOCKET soc);
-extern "C" {
-int sscanf (const char *, const char *, ...);
-} /* End of "C" section */
-
-fhandler_dev_random* entropy_source;
-
-static void
-secret_event_name (char *buf, short port, int *secret_ptr)
-{
-  __small_sprintf (buf, "%scygwin.local_socket.secret.%d.%08x-%08x-%08x-%08x",
-		   wincap.has_terminal_services () ? "Global\\" : "",
-		   port,
-		   secret_ptr [0], secret_ptr [1],
-		   secret_ptr [2], secret_ptr [3]);
-}
-
-/* cygwin internal: map sockaddr into internet domain address */
-static int
-get_inet_addr (const struct sockaddr *in, int inlen,
-	       struct sockaddr_in *out, int *outlen, int* secret = 0)
-{
-  int secret_buf [4];
-  int* secret_ptr = (secret ? : secret_buf);
-
-  if (in->sa_family == AF_INET)
-    {
-      *out = * (sockaddr_in *)in;
-      *outlen = inlen;
-      return 1;
-    }
-  else if (in->sa_family == AF_LOCAL)
-    {
-      path_conv pc (in->sa_data, PC_SYM_FOLLOW);
-      if (pc.error)
-	{
-	  set_errno (pc.error);
-	  return 0;
-	}
-      if (!pc.exists ())
-	{
-	  set_errno (ENOENT);
-	  return 0;
-	}
-      if (!pc.issocket ())
-	{
-	  set_errno (EBADF);
-	  return 0;
-	}
-      HANDLE fh = CreateFile (pc, GENERIC_READ, wincap.shared (), &sec_none,
-			      OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-      if (fh == INVALID_HANDLE_VALUE)
-	{
-	  __seterrno ();
-	  return 0;
-	}
-      int ret = 0;
-      DWORD len = 0;
-      char buf[128];
-      memset (buf, 0, sizeof buf);
-      if (ReadFile (fh, buf, 128, &len, 0))
-	{
-	  sockaddr_in sin;
-	  sin.sin_family = AF_INET;
-	  sscanf (buf + strlen (SOCKET_COOKIE), "%hu %08x-%08x-%08x-%08x",
-		  &sin.sin_port,
-		  secret_ptr, secret_ptr + 1, secret_ptr + 2, secret_ptr + 3);
-	  sin.sin_port = htons (sin.sin_port);
-	  sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-	  *out = sin;
-	  *outlen = sizeof sin;
-	  ret = 1;
-	}
-      CloseHandle (fh);
-      return ret;
-    }
-  else
-    {
-      set_errno (EAFNOSUPPORT);
-      return 0;
-    }
-}
-
-/**********************************************************************/
-/* fhandler_socket */
-
-fhandler_socket::fhandler_socket ()
-  : fhandler_base (), sun_path (NULL)
-{
-  set_need_fork_fixup ();
-  prot_info_ptr = (LPWSAPROTOCOL_INFOA) cmalloc (HEAP_BUF,
-						 sizeof (WSAPROTOCOL_INFOA));
-#if 0
-  if (pc.is_fs_special ())
-    {
-      fhandler_socket * fhs = (fhandler_socket *) fh;
-      fhs->set_addr_family (AF_LOCAL);
-      fhs->set_sun_path (posix_path);
-    }
-#endif
-}
-
-fhandler_socket::~fhandler_socket ()
-{
-  if (prot_info_ptr)
-    cfree (prot_info_ptr);
-  if (sun_path)
-    cfree (sun_path);
-}
-
-void
-fhandler_socket::set_connect_secret ()
-{
-  if (!entropy_source)
-    {
-      void *buf = malloc (sizeof (fhandler_dev_random));
-      entropy_source = new (buf) fhandler_dev_random ();
-      entropy_source->dev () = *urandom_dev;
-    }
-  if (entropy_source &&
-      !entropy_source->open (O_RDONLY))
-    {
-      delete entropy_source;
-      entropy_source = NULL;
-    }
-  if (entropy_source)
-    {
-      size_t len = sizeof (connect_secret);
-      entropy_source->read (connect_secret, len);
-      if (len != sizeof (connect_secret))
-	bzero ((char*) connect_secret, sizeof (connect_secret));
-    }
-}
-
-void
-fhandler_socket::get_connect_secret (char* buf)
-{
-  __small_sprintf (buf, "%08x-%08x-%08x-%08x",
-		   connect_secret [0], connect_secret [1],
-		   connect_secret [2], connect_secret [3]);
-}
-
-HANDLE
-fhandler_socket::create_secret_event (int* secret)
-{
-  struct sockaddr_in sin;
-  int sin_len = sizeof (sin);
-
-  if (::getsockname (get_socket (), (struct sockaddr*) &sin, &sin_len))
-    {
-      debug_printf ("error getting local socket name (%d)", WSAGetLastError ());
-      return NULL;
-    }
-
-  char event_name[CYG_MAX_PATH];
-  secret_event_name (event_name, sin.sin_port, secret ?: connect_secret);
-  LPSECURITY_ATTRIBUTES sec = get_inheritance (true);
-  secret_event = CreateEvent (sec, FALSE, FALSE, event_name);
-  if (!secret_event && GetLastError () == ERROR_ALREADY_EXISTS)
-    secret_event = OpenEvent (EVENT_ALL_ACCESS, FALSE, event_name);
-
-  if (!secret_event)
-    /* nothing to do */;
-  else if (sec == &sec_all_nih || sec == &sec_none_nih)
-    ProtectHandle (secret_event);
-  else
-    ProtectHandleINH (secret_event);
-
-  return secret_event;
-}
-
-void
-fhandler_socket::signal_secret_event ()
-{
-  if (!secret_event)
-    debug_printf ("no secret event?");
-  else
-    {
-      SetEvent (secret_event);
-      debug_printf ("signaled secret_event");
-    }
-}
-
-void
-fhandler_socket::close_secret_event ()
-{
-  if (secret_event)
-    ForceCloseHandle (secret_event);
-  secret_event = NULL;
-}
-
-int
-fhandler_socket::check_peer_secret_event (struct sockaddr_in* peer, int* secret)
-{
-
-  char event_name[CYG_MAX_PATH];
-
-  secret_event_name (event_name, peer->sin_port, secret ?: connect_secret);
-  HANDLE ev = CreateEvent (&sec_all_nih, FALSE, FALSE, event_name);
-  if (!ev && GetLastError () == ERROR_ALREADY_EXISTS)
-    {
-      debug_printf ("event \"%s\" already exists", event_name);
-      ev = OpenEvent (EVENT_ALL_ACCESS, FALSE, event_name);
-    }
-
-  signal_secret_event ();
-
-  if (ev)
-    {
-      DWORD rc = WaitForSingleObject (ev, 10000);
-      debug_printf ("WFSO rc=%d", rc);
-      CloseHandle (ev);
-      return (rc == WAIT_OBJECT_0 ? 1 : 0);
-    }
-  else
-    return 0;
-}
-
-void
-fhandler_socket::fixup_before_fork_exec (DWORD win_proc_id)
-{
-  if (!winsock2_active)
-    {
-      fhandler_base::fixup_before_fork_exec (win_proc_id);
-      debug_printf ("Without Winsock 2.0");
-    }
-  else if (!WSADuplicateSocketA (get_socket (), win_proc_id, prot_info_ptr))
-    debug_printf ("WSADuplicateSocket went fine, sock %p, win_proc_id %d, prot_info_ptr %p",
-		  get_socket (), win_proc_id, prot_info_ptr);
-  else
-    {
-      debug_printf ("WSADuplicateSocket error, sock %p, win_proc_id %d, prot_info_ptr %p",
-		    get_socket (), win_proc_id, prot_info_ptr);
-      set_winsock_errno ();
-    }
-}
-
-extern "C" void __stdcall load_wsock32 ();
-void
-fhandler_socket::fixup_after_fork (HANDLE parent)
-{
-  SOCKET new_sock;
-
-  debug_printf ("WSASocket begin, dwServiceFlags1=%d",
-		prot_info_ptr->dwServiceFlags1);
-
-  if ((new_sock = WSASocketA (FROM_PROTOCOL_INFO,
-				   FROM_PROTOCOL_INFO,
-				   FROM_PROTOCOL_INFO,
-				   prot_info_ptr, 0, 0)) == INVALID_SOCKET)
-    {
-      debug_printf ("WSASocket error");
-      set_io_handle ((HANDLE)INVALID_SOCKET);
-      set_winsock_errno ();
-    }
-  else if (!new_sock && !winsock2_active)
-    {
-      load_wsock32 ();
-      fhandler_base::fixup_after_fork (parent);
-      debug_printf ("Without Winsock 2.0");
-    }
-  else
-    {
-      debug_printf ("WSASocket went fine new_sock %p, old_sock %p", new_sock, get_io_handle ());
-      set_io_handle ((HANDLE) new_sock);
-    }
-
-  if (secret_event)
-    fork_fixup (parent, secret_event, "secret_event");
-}
-
-void
-fhandler_socket::fixup_after_exec (HANDLE parent)
-{
-  debug_printf ("here");
-  if (!get_close_on_exec ())
-    fixup_after_fork (parent);
-#if 0
-  else if (!winsock2_active)
-    closesocket (get_socket ());
-#endif
-}
-
-int
-fhandler_socket::dup (fhandler_base *child)
-{
-  debug_printf ("here");
-  fhandler_socket *fhs = (fhandler_socket *) child;
-  fhs->addr_family = addr_family;
-  if (get_addr_family () == AF_LOCAL)
-    fhs->set_sun_path (get_sun_path ());
-  fhs->set_socket_type (get_socket_type ());
-  fhs->set_connect_state (get_connect_state ());
-
-  if (winsock2_active)
-    {
-      /* Since WSADuplicateSocket() fails on NT systems when the process
-	 is currently impersonating a non-privileged account, we revert
-	 to the original account before calling WSADuplicateSocket() and
-	 switch back afterwards as it's also in fork().
-	 If WSADuplicateSocket() still fails for some reason, we fall back
-	 to DuplicateHandle(). */
-      WSASetLastError (0);
-      cygheap->user.deimpersonate ();
-      fhs->set_io_handle (get_io_handle ());
-      fhs->fixup_before_fork_exec (GetCurrentProcessId ());
-      cygheap->user.reimpersonate ();
-      if (!WSAGetLastError ())
-	{
-	  fhs->fixup_after_fork (hMainProc);
-	  if (fhs->get_io_handle() != (HANDLE) INVALID_SOCKET)
-	    return 0;
-	}
-      debug_printf ("WSADuplicateSocket failed, trying DuplicateHandle");
-    }
-
-  /* We don't call fhandler_base::dup here since that requires to
-     have winsock called from fhandler_base and it creates only
-     inheritable sockets which is wrong for winsock2. */
-
-  HANDLE nh;
-  if (!DuplicateHandle (hMainProc, get_io_handle (), hMainProc, &nh, 0,
-			!winsock2_active, DUPLICATE_SAME_ACCESS))
-    {
-      system_printf ("!DuplicateHandle(%x) failed, %E", get_io_handle ());
-      __seterrno ();
-      return -1;
-    }
-  fhs->set_io_handle (nh);
-  return 0;
-}
-
-int __stdcall
-fhandler_socket::fstat (struct __stat64 *buf)
-{
-  int res = fhandler_base::fstat (buf);
-  if (!res)
-    {
-      if (get_socket_type ()) /* fstat */
-	{
-	  buf->st_dev = 0;
-	  buf->st_ino = (__ino64_t) ((DWORD) get_handle ());
-	  buf->st_mode = S_IFSOCK | S_IRWXU | S_IRWXG | S_IRWXO;
-	}
-      else
-	{
-	  path_conv spc ("/dev", PC_SYM_NOFOLLOW | PC_NULLEMPTY, NULL);
-	  buf->st_dev = spc.volser ();
-	  buf->st_ino = get_namehash ();
-	  buf->st_mode &= ~S_IRWXO;
-	  buf->st_rdev = (get_device () << 16) | get_unit ();
-	}
-    }
-  return res;
-}
-
-int
-fhandler_socket::bind (const struct sockaddr *name, int namelen)
-{
-  int res = -1;
-
-  if (name->sa_family == AF_LOCAL)
-    {
-#define un_addr ((struct sockaddr_un *) name)
-      struct sockaddr_in sin;
-      int len = sizeof sin;
-
-      if (strlen (un_addr->sun_path) >= UNIX_PATH_LEN)
-	{
-	  set_errno (ENAMETOOLONG);
-	  goto out;
-	}
-      sin.sin_family = AF_INET;
-      sin.sin_port = 0;
-      sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-      if (::bind (get_socket (), (sockaddr *) &sin, len))
-	{
-	  syscall_printf ("AF_LOCAL: bind failed %d", get_errno ());
-	  set_winsock_errno ();
-	  goto out;
-	}
-      if (::getsockname (get_socket (), (sockaddr *) &sin, &len))
-	{
-	  syscall_printf ("AF_LOCAL: getsockname failed %d", get_errno ());
-	  set_winsock_errno ();
-	  goto out;
-	}
-
-      sin.sin_port = ntohs (sin.sin_port);
-      debug_printf ("AF_LOCAL: socket bound to port %u", sin.sin_port);
-
-      path_conv pc (un_addr->sun_path, PC_SYM_FOLLOW);
-      if (pc.error)
-	{
-	  set_errno (pc.error);
-	  goto out;
-	}
-      if (pc.exists ())
-	{
-	  set_errno (EADDRINUSE);
-	  goto out;
-	}
-      mode_t mode = (S_IRWXU | S_IRWXG | S_IRWXO) & ~cygheap->umask;
-      DWORD attr = FILE_ATTRIBUTE_SYSTEM;
-      if (!(mode & (S_IWUSR | S_IWGRP | S_IWOTH)))
-	attr |= FILE_ATTRIBUTE_READONLY;
-      SECURITY_ATTRIBUTES sa = sec_none;
-      security_descriptor sd;
-      if (allow_ntsec && pc.has_acls ())
-	set_security_attribute (mode, &sa, sd);
-      HANDLE fh = CreateFile (pc, GENERIC_WRITE, 0, &sa, CREATE_NEW, attr, 0);
-      if (fh == INVALID_HANDLE_VALUE)
-	{
-	  if (GetLastError () == ERROR_ALREADY_EXISTS)
-	    set_errno (EADDRINUSE);
-	  else
-	    __seterrno ();
-	}
-
-      set_connect_secret ();
-
-      char buf[sizeof (SOCKET_COOKIE) + 80];
-      __small_sprintf (buf, "%s%u ", SOCKET_COOKIE, sin.sin_port);
-      get_connect_secret (strchr (buf, '\0'));
-      DWORD blen = strlen (buf) + 1;
-      if (!WriteFile (fh, buf, blen, &blen, 0))
-	{
-	  __seterrno ();
-	  CloseHandle (fh);
-	  DeleteFile (pc);
-	}
-      else
-	{
-	  CloseHandle (fh);
-	  set_sun_path (un_addr->sun_path);
-	  res = 0;
-	}
-#undef un_addr
-    }
-  else if (::bind (get_socket (), name, namelen))
-    set_winsock_errno ();
-  else
-    res = 0;
-
-out:
-  return res;
-}
-
-int
-fhandler_socket::connect (const struct sockaddr *name, int namelen)
-{
-  int res = -1;
-  bool secret_check_failed = false;
-  bool in_progress = false;
-  sockaddr_in sin;
-  int secret [4];
-  DWORD err;
-
-  if (!get_inet_addr (name, namelen, &sin, &namelen, secret))
-    return -1;
-
-  res = ::connect (get_socket (), (sockaddr *) &sin, namelen);
-
-  if (res)
-    {
-      /* Special handling for connect to return the correct error code
-	 when called on a non-blocking socket. */
-      if (is_nonblocking () || is_connect_pending ())
-	{
-	  err = WSAGetLastError ();
-	  if (err == WSAEWOULDBLOCK || err == WSAEALREADY)
-	    in_progress = true;
-
-	  if (err == WSAEWOULDBLOCK)
-	    WSASetLastError (WSAEINPROGRESS);
-	  else if (err == WSAEINVAL)
-	    WSASetLastError (WSAEISCONN);
-	}
-      set_winsock_errno ();
-    }
-  if (get_addr_family () == AF_LOCAL && get_socket_type () == SOCK_STREAM)
-    {
-      if (!res || in_progress)
-	{
-	  if (!create_secret_event (secret))
-	    {
-	      secret_check_failed = true;
-	    }
-	  else if (in_progress)
-	    signal_secret_event ();
-	}
-
-      if (!secret_check_failed && !res)
-	{
-	  if (!check_peer_secret_event (&sin, secret))
-	    {
-	      debug_printf ("accept from unauthorized server");
-	      secret_check_failed = true;
-	    }
-       }
-
-      if (secret_check_failed)
-	{
-	  close_secret_event ();
-	  if (res)
-	    closesocket (res);
-	  set_errno (ECONNREFUSED);
-	  res = -1;
-	}
-    }
-
-  err = WSAGetLastError ();
-  if (err == WSAEINPROGRESS || err == WSAEALREADY)
-    set_connect_state (CONNECT_PENDING);
-  else
-    set_connect_state (CONNECTED);
-
-  return res;
-}
-
-int
-fhandler_socket::listen (int backlog)
-{
-  int res = ::listen (get_socket (), backlog);
-  if (res)
-    set_winsock_errno ();
-  else
-    set_connect_state (CONNECTED);
-  return res;
-}
-
-int
-fhandler_socket::accept (struct sockaddr *peer, int *len)
-{
-  int res = -1;
-  bool secret_check_failed = false;
-  bool in_progress = false;
-
-  /* Allows NULL peer and len parameters. */
-  struct sockaddr_in peer_dummy;
-  int len_dummy;
-  if (!peer)
-    peer = (struct sockaddr *) &peer_dummy;
-  if (!len)
-    {
-      len_dummy = sizeof (struct sockaddr_in);
-      len = &len_dummy;
-    }
-
-  /* accept on NT fails if len < sizeof (sockaddr_in)
-   * some programs set len to
-   * sizeof (name.sun_family) + strlen (name.sun_path) for UNIX domain
-   */
-  if (len && ((unsigned) *len < sizeof (struct sockaddr_in)))
-    *len = sizeof (struct sockaddr_in);
-
-  res = ::accept (get_socket (), peer, len);
-
-  if ((SOCKET) res == INVALID_SOCKET && WSAGetLastError () == WSAEWOULDBLOCK)
-    in_progress = true;
-
-  if (get_addr_family () == AF_LOCAL && get_socket_type () == SOCK_STREAM)
-    {
-      if ((SOCKET) res != INVALID_SOCKET || in_progress)
-	{
-	  if (!create_secret_event ())
-	    secret_check_failed = true;
-	  else if (in_progress)
-	    signal_secret_event ();
-	}
-
-      if (!secret_check_failed &&
-	  (SOCKET) res != INVALID_SOCKET)
-	{
-	  if (!check_peer_secret_event ((struct sockaddr_in*) peer))
-	    {
-	      debug_printf ("connect from unauthorized client");
-	      secret_check_failed = true;
-	    }
-	}
-
-      if (secret_check_failed)
-	{
-	  close_secret_event ();
-	  if ((SOCKET) res != INVALID_SOCKET)
-	    closesocket (res);
-	  set_errno (ECONNABORTED);
-	  return -1;
-	}
-    }
-
-  if ((SOCKET) res == INVALID_SOCKET)
-    set_winsock_errno ();
-  else
-    {
-      cygheap_fdnew res_fd;
-      if (res_fd >= 0 && fdsock (res_fd, &dev (), res))
-        {
-	  if (get_addr_family () == AF_LOCAL)
-	    ((fhandler_socket *) res_fd)->set_sun_path (get_sun_path ());
-	  ((fhandler_socket *) res_fd)->set_addr_family (get_addr_family ());
-	  ((fhandler_socket *) res_fd)->set_socket_type (get_socket_type ());
-	  ((fhandler_socket *) res_fd)->set_connect_state (CONNECTED);
-	  res = res_fd;
-	}
-      else
-	{
-	  closesocket (res);
-	  res = -1;
-	}
-    }
-
-  debug_printf ("res %d", res);
-  return res;
-}
-
-int
-fhandler_socket::getsockname (struct sockaddr *name, int *namelen)
-{
-  int res = -1;
-
-  if (get_addr_family () == AF_LOCAL)
-    {
-      struct sockaddr_un *sun = (struct sockaddr_un *) name;
-      memset (sun, 0, *namelen);
-      sun->sun_family = AF_LOCAL;
-
-      if (!get_sun_path ())
-	sun->sun_path[0] = '\0';
-      else
-	/* According to SUSv2 "If the actual length of the address is
-	   greater than the length of the supplied sockaddr structure, the
-	   stored address will be truncated."  We play it save here so
-	   that the path always has a trailing 0 even if it's truncated. */
-	strncpy (sun->sun_path, get_sun_path (),
-		 *namelen - sizeof *sun + sizeof sun->sun_path - 1);
-
-      *namelen = sizeof *sun - sizeof sun->sun_path
-		 + strlen (sun->sun_path) + 1;
-      res = 0;
-    }
-  else
-    {
-      res = ::getsockname (get_socket (), name, namelen);
-      if (res)
-	set_winsock_errno ();
-    }
-
-  return res;
-}
-
-int
-fhandler_socket::getpeername (struct sockaddr *name, int *namelen)
-{
-  int res = ::getpeername (get_socket (), name, namelen);
-  if (res)
-    set_winsock_errno ();
-
-  return res;
-}
-
-int
-fhandler_socket::readv (const struct iovec *const iov, const int iovcnt,
-			ssize_t tot)
-{
-  struct msghdr msg =
-    {
-      msg_name:		NULL,
-      msg_namelen:	0,
-      msg_iov:		(struct iovec *) iov, // const_cast
-      msg_iovlen:	iovcnt,
-      msg_accrights:	NULL,
-      msg_accrightslen:	0
-    };
-
-  return recvmsg (&msg, 0, tot);
-}
-
-int
-fhandler_socket::recvfrom (void *ptr, size_t len, int flags,
-			   struct sockaddr *from, int *fromlen)
-{
-  int res;
-  DWORD ret;
-
-  flags &= MSG_WINMASK;
-  if (!winsock2_active)
-    ret = res = ::recvfrom (get_socket (),
-			    (char *) ptr, len, flags,
-			    from, fromlen);
-  else
-    {
-      WSABUF wsabuf = { len, (char *) ptr };
-
-      if (is_nonblocking ())
-	res = WSARecvFrom (get_socket (), &wsabuf, 1, &ret, (DWORD *) &flags,
-			   from, fromlen,
-			   NULL, NULL);
-      else
-	{
-	  wsock_event wsock_evt;
-	  res = WSARecvFrom (get_socket (), &wsabuf, 1, &ret, (DWORD *) &flags,
-			     from, fromlen,
-			     wsock_evt.prepare (), NULL);
-
-	  if (res == SOCKET_ERROR && WSAGetLastError () == WSA_IO_PENDING)
-	    ret = res = wsock_evt.wait (get_socket (), (DWORD *) &flags);
-	}
-    }
-
-  if (res == SOCKET_ERROR)
-    {
-      /* According to SUSv3, errno isn't set in that case and no error
-	 condition is returned. */
-      if (WSAGetLastError () == WSAEMSGSIZE)
-	return len;
-
-      res = -1;
-      set_winsock_errno ();
-    }
-  else
-    res = ret;
-
-  return res;
-}
-
-int
-fhandler_socket::recvmsg (struct msghdr *msg, int flags, ssize_t tot)
-{
-  if (get_addr_family () == AF_LOCAL)
-    {
-      /* On AF_LOCAL sockets the (fixed-size) name of the shared memory
-	 area used for descriptor passing is transmitted first.
-	 If this string is empty, no descriptors are passed and we can
-	 go ahead recv'ing the normal data blocks.  Otherwise start
-	 special handling for descriptor passing. */
-      /*TODO*/
-    }
-
-  struct iovec *const iov = msg->msg_iov;
-  const int iovcnt = msg->msg_iovlen;
-
-  struct sockaddr *from = (struct sockaddr *) msg->msg_name;
-  int *fromlen = from ? &msg->msg_namelen : NULL;
-
-  int res;
-
-  if (!winsock2_active)
-    {
-      if (iovcnt == 1)
-	res = recvfrom (iov->iov_base, iov->iov_len, flags,
-			from, fromlen);
-      else
-	{
-	  if (tot == -1)	// i.e. if not pre-calculated by the caller.
-	    {
-	      tot = 0;
-	      const struct iovec *iovptr = iov + iovcnt;
-	      do
-		{
-		  iovptr -= 1;
-		  tot += iovptr->iov_len;
-		}
-	      while (iovptr != iov);
-	    }
-
-	  char *buf = (char *) alloca (tot);
-
-	  if (!buf)
-	    {
-	      set_errno (ENOMEM);
-	      res = -1;
-	    }
-	  else
-	    {
-	      res = recvfrom (buf, tot, flags,
-			      from, fromlen);
-
-	      const struct iovec *iovptr = iov;
-	      int nbytes = res;
-
-	      while (nbytes > 0)
-		{
-		  const int frag = min (nbytes, (ssize_t) iovptr->iov_len);
-		  memcpy (iovptr->iov_base, buf, frag);
-		  buf += frag;
-		  iovptr += 1;
-		  nbytes -= frag;
-		}
-	    }
-	}
-    }
-  else
-    {
-      WSABUF wsabuf[iovcnt];
-      unsigned long len = 0L;
-
-      {
-	const struct iovec *iovptr = iov + iovcnt;
-	WSABUF *wsaptr = wsabuf + iovcnt;
-	do
-	  {
-	    iovptr -= 1;
-	    wsaptr -= 1;
-	    len += wsaptr->len = iovptr->iov_len;
-	    wsaptr->buf = (char *) iovptr->iov_base;
-	  }
-	while (wsaptr != wsabuf);
-      }
-
-      DWORD ret;
-
-      if (is_nonblocking ())
-	res = WSARecvFrom (get_socket (),
-			   wsabuf, iovcnt, &ret, (DWORD *) &flags,
-			   from, fromlen,
-			   NULL, NULL);
-      else
-	{
-	  wsock_event wsock_evt;
-	  res = WSARecvFrom (get_socket (),
-			     wsabuf, iovcnt, &ret, (DWORD *) &flags,
-			     from, fromlen,
-			     wsock_evt.prepare (), NULL);
-
-	  if (res == SOCKET_ERROR && WSAGetLastError () == WSA_IO_PENDING)
-	    ret = res = wsock_evt.wait (get_socket (), (DWORD *) &flags);
-	}
-
-      if (res == SOCKET_ERROR)
-	{
-	  /* According to SUSv3, errno isn't set in that case and no error
-	     condition is returned. */
-	  if (WSAGetLastError () == WSAEMSGSIZE)
-	    return len;
-
-	  res = -1;
-	  set_winsock_errno ();
-	}
-      else
-	res = ret;
-    }
-
-  return res;
-}
-
-int
-fhandler_socket::writev (const struct iovec *const iov, const int iovcnt,
-			 ssize_t tot)
-{
-  struct msghdr msg =
-    {
-      msg_name:		NULL,
-      msg_namelen:	0,
-      msg_iov:		(struct iovec *) iov, // const_cast
-      msg_iovlen:	iovcnt,
-      msg_accrights:	NULL,
-      msg_accrightslen:	0
-    };
-
-  return sendmsg (&msg, 0, tot);
-}
-
-int
-fhandler_socket::sendto (const void *ptr, size_t len, int flags,
-			 const struct sockaddr *to, int tolen)
-{
-  sockaddr_in sin;
-
-  if (to && !get_inet_addr (to, tolen, &sin, &tolen))
-    return -1;
-
-  int res;
-  DWORD ret;
-
-  if (!winsock2_active)
-    ret = res = ::sendto (get_socket (), (const char *) ptr, len,
-			  flags & MSG_WINMASK,
-			  (to ? (const struct sockaddr *) &sin : NULL), tolen);
-  else
-    {
-      WSABUF wsabuf = { len, (char *) ptr };
-
-      if (is_nonblocking ())
-	res = WSASendTo (get_socket (), &wsabuf, 1, &ret,
-			 flags & MSG_WINMASK,
-			 (to ? (const struct sockaddr *) &sin : NULL), tolen,
-			 NULL, NULL);
-      else
-	{
-	  wsock_event wsock_evt;
-	  res = WSASendTo (get_socket (), &wsabuf, 1, &ret,
-			   flags & MSG_WINMASK,
-			   (to ? (const struct sockaddr *) &sin : NULL), tolen,
-			   wsock_evt.prepare (), NULL);
-
-	  if (res == SOCKET_ERROR && WSAGetLastError () == WSA_IO_PENDING)
-	    ret = res = wsock_evt.wait (get_socket (), (DWORD *) &flags);
-	}
-    }
-
-  if (res == SOCKET_ERROR)
-    {
-      res = -1;
-      set_winsock_errno ();
-    }
-  else
-    res = ret;
-
-  /* Special handling for EPIPE and SIGPIPE.
-
-     EPIPE is generated if the local end has been shut down on a connection
-     oriented socket.  In this case the process will also receive a SIGPIPE
-     unless MSG_NOSIGNAL is set.  */
-  if (res == -1 && get_errno () == ESHUTDOWN
-      && get_socket_type () == SOCK_STREAM)
-    {
-      set_errno (EPIPE);
-      if (! (flags & MSG_NOSIGNAL))
-	raise (SIGPIPE);
-    }
-
-  return res;
-}
-
-int
-fhandler_socket::sendmsg (const struct msghdr *msg, int flags, ssize_t tot)
-{
-  if (get_addr_family () == AF_LOCAL)
-    {
-      /* For AF_LOCAL/AF_UNIX sockets, if descriptors are given, start
-	 the special handling for descriptor passing.  Otherwise just
-	 transmit an empty string to tell the receiver that no
-	 descriptor passing is done. */
-      /*TODO*/
-    }
-
-  struct iovec *const iov = msg->msg_iov;
-  const int iovcnt = msg->msg_iovlen;
-
-  int res;
-
-  if (!winsock2_active)
-    {
-      if (iovcnt == 1)
-	res = sendto (iov->iov_base, iov->iov_len, flags,
-		      (struct sockaddr *) msg->msg_name,
-		      msg->msg_namelen);
-      else
-	{
-	  if (tot == -1)	// i.e. if not pre-calculated by the caller.
-	    {
-	      tot = 0;
-	      const struct iovec *iovptr = iov + iovcnt;
-	      do
-		{
-		  iovptr -= 1;
-		  tot += iovptr->iov_len;
-		}
-	      while (iovptr != iov);
-	    }
-
-	  char *const buf = (char *) alloca (tot);
-
-	  if (!buf)
-	    {
-	      set_errno (ENOMEM);
-	      res = -1;
-	    }
-	  else
-	    {
-	      char *bufptr = buf;
-	      const struct iovec *iovptr = iov;
-	      int nbytes = tot;
-
-	      while (nbytes != 0)
-		{
-		  const int frag = min (nbytes, (ssize_t) iovptr->iov_len);
-		  memcpy (bufptr, iovptr->iov_base, frag);
-		  bufptr += frag;
-		  iovptr += 1;
-		  nbytes -= frag;
-		}
-
-	      res = sendto (buf, tot, flags,
-			    (struct sockaddr *) msg->msg_name,
-			    msg->msg_namelen);
-	    }
-	}
-    }
-  else
-    {
-      WSABUF wsabuf[iovcnt];
-
-      {
-	const struct iovec *iovptr = iov + iovcnt;
-	WSABUF *wsaptr = wsabuf + iovcnt;
-	do
-	  {
-	    iovptr -= 1;
-	    wsaptr -= 1;
-	    wsaptr->len = iovptr->iov_len;
-	    wsaptr->buf = (char *) iovptr->iov_base;
-	  }
-	while (wsaptr != wsabuf);
-      }
-
-      DWORD ret;
-
-      if (is_nonblocking ())
-	res = WSASendTo (get_socket (), wsabuf, iovcnt, &ret, flags,
-			 (struct sockaddr *) msg->msg_name,
-			 msg->msg_namelen,
-			 NULL, NULL);
-      else
-	{
-	  wsock_event wsock_evt;
-	  res = WSASendTo (get_socket (), wsabuf, iovcnt, &ret, flags,
-			   (struct sockaddr *) msg->msg_name,
-			   msg->msg_namelen,
-			   wsock_evt.prepare (), NULL);
-
-	  if (res == SOCKET_ERROR && WSAGetLastError () == WSA_IO_PENDING)
-	    ret = res = wsock_evt.wait (get_socket (), (DWORD *) &flags);
-	}
-
-      if (res == SOCKET_ERROR)
-	{
-	  res = -1;
-	  set_winsock_errno ();
-	}
-      else
-	res = ret;
-    }
-
-  return res;
-}
-
-int
-fhandler_socket::shutdown (int how)
-{
-  int res = ::shutdown (get_socket (), how);
-
-  if (res)
-    set_winsock_errno ();
-  else
-    switch (how)
-      {
-      case SHUT_RD:
-	set_shutdown_read ();
-	break;
-      case SHUT_WR:
-	set_shutdown_write ();
-	break;
-      case SHUT_RDWR:
-	set_shutdown_read ();
-	set_shutdown_write ();
-	break;
-      }
-  return res;
-}
-
-int
-fhandler_socket::close ()
-{
-  int res = 0;
-
-  /* HACK to allow a graceful shutdown even if shutdown() hasn't been
-     called by the application. Note that this isn't the ultimate
-     solution but it helps in many cases. */
-  struct linger linger;
-  linger.l_onoff = 1;
-  linger.l_linger = 240; /* secs. default 2MSL value according to MSDN. */
-  setsockopt (get_socket (), SOL_SOCKET, SO_LINGER,
-	      (const char *)&linger, sizeof linger);
-
-  while ((res = closesocket (get_socket ())) != 0)
-    {
-      if (WSAGetLastError () != WSAEWOULDBLOCK)
-	{
-	  set_winsock_errno ();
-	  res = -1;
-	  break;
-	}
-      if (WaitForSingleObject (signal_arrived, 10) == WAIT_OBJECT_0)
-	{
-	  set_errno (EINTR);
-	  res = -1;
-	  break;
-	}
-      WSASetLastError (0);
-    }
-
-  close_secret_event ();
-
-  debug_printf ("%d = fhandler_socket::close()", res);
-  return res;
-}
-
-#define ASYNC_MASK (FD_READ|FD_WRITE|FD_OOB|FD_ACCEPT|FD_CONNECT)
-
-int
-fhandler_socket::ioctl (unsigned int cmd, void *p)
-{
-  extern int get_ifconf (struct ifconf *ifc, int what); /* net.cc */
-  int res;
-  struct ifconf ifc, *ifcp;
-  struct ifreq *ifr, *ifrp;
-
-  switch (cmd)
-    {
-    case SIOCGIFCONF:
-      ifcp = (struct ifconf *) p;
-      if (!ifcp)
-	{
-	  set_errno (EINVAL);
-	  return -1;
-	}
-      res = get_ifconf (ifcp, cmd);
-      if (res)
-	debug_printf ("error in get_ifconf");
-      break;
-    case SIOCGIFFLAGS:
-      ifr = (struct ifreq *) p;
-      if (ifr == 0)
-	{
-	  set_errno (EINVAL);
-	  return -1;
-	}
-      ifr->ifr_flags = IFF_NOTRAILERS | IFF_UP | IFF_RUNNING;
-      if (!strncmp(ifr->ifr_name, "lo", 2)
-	  || ntohl (((struct sockaddr_in *) &ifr->ifr_addr)->sin_addr.s_addr)
-	  == INADDR_LOOPBACK)
-	ifr->ifr_flags |= IFF_LOOPBACK;
-      else
-	ifr->ifr_flags |= IFF_BROADCAST;
-      res = 0;
-      break;
-    case SIOCGIFBRDADDR:
-    case SIOCGIFNETMASK:
-    case SIOCGIFADDR:
-    case SIOCGIFHWADDR:
-    case SIOCGIFMETRIC:
-    case SIOCGIFMTU:
-      {
-	ifc.ifc_len = 2048;
-	ifc.ifc_buf = (char *) alloca (2048);
-
-	ifr = (struct ifreq *) p;
-	if (ifr == 0)
-	  {
-	    debug_printf ("ifr == NULL");
-	    set_errno (EINVAL);
-	    return -1;
-	  }
-
-	res = get_ifconf (&ifc, cmd);
-	if (res)
-	  {
-	    debug_printf ("error in get_ifconf");
-	    break;
-	  }
-
-	debug_printf ("    name: %s", ifr->ifr_name);
-	for (ifrp = ifc.ifc_req;
-	     (caddr_t) ifrp < ifc.ifc_buf + ifc.ifc_len;
-	     ++ifrp)
-	  {
-	    debug_printf ("testname: %s", ifrp->ifr_name);
-	    if (! strcmp (ifrp->ifr_name, ifr->ifr_name))
-	      {
-		switch (cmd)
-		  {
-		  case SIOCGIFADDR:
-		    ifr->ifr_addr = ifrp->ifr_addr;
-		    break;
-		  case SIOCGIFBRDADDR:
-		    ifr->ifr_broadaddr = ifrp->ifr_broadaddr;
-		    break;
-		  case SIOCGIFNETMASK:
-		    ifr->ifr_netmask = ifrp->ifr_netmask;
-		    break;
-		  case SIOCGIFHWADDR:
-		    ifr->ifr_hwaddr = ifrp->ifr_hwaddr;
-		    break;
-		  case SIOCGIFMETRIC:
-		    ifr->ifr_metric = ifrp->ifr_metric;
-		    break;
-		  case SIOCGIFMTU:
-		    ifr->ifr_mtu = ifrp->ifr_mtu;
-		    break;
-		  }
-		break;
-	      }
-	  }
-	if ((caddr_t) ifrp >= ifc.ifc_buf + ifc.ifc_len)
-	  {
-	    set_errno (EINVAL);
-	    return -1;
-	  }
-	break;
-      }
-    case FIOASYNC:
-      res = WSAAsyncSelect (get_socket (), gethwnd (), WM_ASYNCIO,
-	      *(int *) p ? ASYNC_MASK : 0);
-      syscall_printf ("Async I/O on socket %s",
-	      *(int *) p ? "started" : "cancelled");
-      set_async (*(int *) p);
-      break;
-    default:
-      /* We must cancel WSAAsyncSelect (if any) before setting socket to
-       * blocking mode
-       */
-      if (cmd == FIONBIO && *(int *) p == 0)
-	WSAAsyncSelect (get_socket (), gethwnd (), 0, 0);
-      res = ioctlsocket (get_socket (), cmd, (unsigned long *) p);
-      if (res == SOCKET_ERROR)
-	  set_winsock_errno ();
-      if (cmd == FIONBIO)
-	{
-	  syscall_printf ("socket is now %sblocking",
-			    *(int *) p ? "non" : "");
-	  /* Start AsyncSelect if async socket unblocked */
-	  if (*(int *) p && get_async ())
-	    WSAAsyncSelect (get_socket (), gethwnd (), WM_ASYNCIO, ASYNC_MASK);
-
-	  set_nonblocking (*(int *) p);
-	}
-      break;
-    }
-  syscall_printf ("%d = ioctl_socket (%x, %x)", res, cmd, p);
-  return res;
-}
-
-int
-fhandler_socket::fcntl (int cmd, void *arg)
-{
-  int res = 0;
-  int request, current;
-
-  switch (cmd)
-    {
-    case F_SETFL:
-      {
-	/* Carefully test for the O_NONBLOCK or deprecated OLD_O_NDELAY flag.
-	   Set only the flag that has been passed in.  If both are set, just
-	   record O_NONBLOCK.   */
-	int new_flags = (int) arg & O_NONBLOCK_MASK;
-	if ((new_flags & OLD_O_NDELAY) && (new_flags & O_NONBLOCK))
-	  new_flags = O_NONBLOCK;
-	current = get_flags () & O_NONBLOCK_MASK;
-	request = new_flags ? 1 : 0;
-	if (!!current != !!new_flags && (res = ioctl (FIONBIO, &request)))
-	  break;
-	set_flags ((get_flags () & ~O_NONBLOCK_MASK) | new_flags);
-	break;
-      }
-    default:
-      res = fhandler_base::fcntl (cmd, arg);
-      break;
-    }
-  return res;
-}
-
-void
-fhandler_socket::set_close_on_exec (int val)
-{
-  if (!winsock2_active) /* < Winsock 2.0 */
-    set_inheritance (get_handle (), val);
-  set_close_on_exec_flag (val);
-  debug_printf ("set close_on_exec for %s to %d", get_name (), val);
-}
-
-void
-fhandler_socket::set_sun_path (const char *path)
-{
-  sun_path = path ? cstrdup (path) : NULL;
-}
diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler_tape.cc
deleted file mode 100644
index 871124678..000000000
--- a/winsup/cygwin/fhandler_tape.cc
+++ /dev/null
@@ -1,838 +0,0 @@
-/* fhandler_tape.cc.  See fhandler.h for a description of the fhandler
-   classes.
-
-   Copyright 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <sys/termios.h>
-#include <unistd.h>
-#include <sys/mtio.h>
-#include "cygerrno.h"
-#include "perprocess.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-
-/**********************************************************************/
-/* fhandler_dev_tape */
-
-void
-fhandler_dev_tape::clear (void)
-{
-  lasterr = 0;
-  fhandler_dev_raw::clear ();
-}
-
-int
-fhandler_dev_tape::is_eom (int win_error)
-{
-  int ret = ((win_error == ERROR_END_OF_MEDIA)
-	  || (win_error == ERROR_EOM_OVERFLOW)
-	  || (win_error == ERROR_NO_DATA_DETECTED));
-  if (ret)
-    debug_printf ("end of medium");
-  return ret;
-}
-
-int
-fhandler_dev_tape::is_eof (int win_error)
-{
-  int ret = ((win_error == ERROR_FILEMARK_DETECTED)
-	  || (win_error == ERROR_SETMARK_DETECTED));
-  if (ret)
-    debug_printf ("end of file");
-  return ret;
-}
-
-fhandler_dev_tape::fhandler_dev_tape ()
-  : fhandler_dev_raw ()
-{
-  debug_printf ("unit: %d", dev ().minor);
-}
-
-int
-fhandler_dev_tape::open (int flags, mode_t)
-{
-  int ret;
-
-  devbufsiz = 1L;
-
-  ret = fhandler_dev_raw::open (flags);
-  if (ret)
-    {
-      struct mtget get;
-      struct mtop op;
-      struct mtpos pos;
-
-      if (!ioctl (MTIOCGET, &get))
-	/* Tape drive supports and is set to variable block size. */
-	if (get.mt_dsreg == 0)
-	  devbufsiz = get.mt_maxblksize;
-	else
-	  devbufsiz = get.mt_dsreg;
-	varblkop = get.mt_dsreg == 0;
-
-      if (devbufsiz > 1L)
-	devbuf = new char [devbufsiz];
-
-      /* The following rewind in position 0 solves a problem which appears
-       * in case of multi volume archives: The last ReadFile on first medium
-       * returns ERROR_NO_DATA_DETECTED. After media change, all subsequent
-       * ReadFile calls return ERROR_NO_DATA_DETECTED, too.
-       * The call to tape_set_pos seems to reset some internal flags. */
-      if ((!ioctl (MTIOCPOS, &pos)) && (!pos.mt_blkno))
-	{
-	  op.mt_op = MTREW;
-	  ioctl (MTIOCTOP, &op);
-	}
-
-      if (flags & O_APPEND)
-	{
-	  /* In append mode, seek to beginning of next filemark */
-	  op.mt_op = MTFSFM;
-	  op.mt_count = 1;
-	  ioctl (MTIOCTOP, &op);
-	}
-    }
-
-  return ret;
-}
-
-int
-fhandler_dev_tape::close (void)
-{
-  struct mtop op;
-  int ret = 0;
-
-  if (is_writing)
-    {
-      ret = writebuf ();
-      if ((has_written) && (! eom_detected))
-	{
-	  /* if last operation was writing, write a filemark */
-	  debug_printf ("writing filemark");
-	  op.mt_op = MTWEOF;
-	  op.mt_count = 1;
-	  ioctl (MTIOCTOP, &op);
-	}
-    }
-
-  // To protected reads on signaling (e.g. Ctrl-C)
-  eof_detected = 1;
-
-  if (is_rewind_device ())
-    {
-      debug_printf ("rewinding");
-      op.mt_op = MTREW;
-      ioctl (MTIOCTOP, &op);
-    }
-
-  if (ret)
-    {
-      fhandler_dev_raw::close ();
-      return ret;
-    }
-
-  return fhandler_dev_raw::close ();
-}
-
-int
-fhandler_dev_tape::fstat (struct __stat64 *buf)
-{
-  int ret;
-
-  if (!(ret = fhandler_base::fstat (buf)))
-    {
-      struct mtget get;
-
-      if (!ioctl (MTIOCGET, &get))
-	buf->st_blocks = get.mt_capacity / buf->st_blksize;
-    }
-
-  return ret;
-}
-
-_off64_t
-fhandler_dev_tape::lseek (_off64_t offset, int whence)
-{
-  struct mtop op;
-  struct mtpos pos;
-
-  debug_printf ("lseek (%s, %d, %d)", get_name (), offset, whence);
-
-  writebuf ();
-  eom_detected = eof_detected = 0;
-  lastblk_to_read = 0;
-  devbufstart = devbufend = 0;
-
-  if (ioctl (MTIOCPOS, &pos))
-    {
-      return ILLEGAL_SEEK;
-    }
-
-  switch (whence)
-    {
-      case SEEK_END:
-	op.mt_op = MTFSF;
-	op.mt_count = 1;
-	if (ioctl (MTIOCTOP, &op))
-	  return -1;
-	break;
-      case SEEK_SET:
-	if (whence == SEEK_SET && offset < 0)
-	  {
-	    set_errno (EINVAL);
-	    return -1;
-	  }
-	break;
-      case SEEK_CUR:
-	break;
-      default:
-	set_errno (EINVAL);
-	return -1;
-    }
-
-  op.mt_op = MTFSR;
-  op.mt_count = offset / devbufsiz
-		- (whence == SEEK_SET ? pos.mt_blkno : 0);
-
-  if (op.mt_count < 0)
-    {
-      op.mt_op = MTBSR;
-      op.mt_count = -op.mt_count;
-    }
-
-  if (ioctl (MTIOCTOP, &op) || ioctl (MTIOCPOS, &pos))
-    return -1;
-
-  return (pos.mt_blkno * devbufsiz);
-}
-
-int
-fhandler_dev_tape::dup (fhandler_base *child)
-{
-  fhandler_dev_tape *fhc = (fhandler_dev_tape *) child;
-
-  fhc->lasterr = lasterr;
-  return fhandler_dev_raw::dup (child);
-}
-
-int
-fhandler_dev_tape::ioctl (unsigned int cmd, void *buf)
-{
-  int ret = NO_ERROR;
-  unsigned long block;
-
-  if (cmd == MTIOCTOP)
-    {
-      struct mtop *op = (struct mtop *) buf;
-
-      if (! op)
-	ret = ERROR_INVALID_PARAMETER;
-      else
-	switch (op->mt_op)
-	  {
-	  case MTRESET:
-	    break;
-	  case MTFSF:
-	    ret = tape_set_pos (TAPE_SPACE_FILEMARKS, op->mt_count);
-	    break;
-	  case MTBSF:
-	    ret = tape_set_pos (TAPE_SPACE_FILEMARKS, -op->mt_count);
-	    break;
-	  case MTFSR:
-	    ret = tape_set_pos (TAPE_SPACE_RELATIVE_BLOCKS, op->mt_count);
-	    break;
-	  case MTBSR:
-	    ret = tape_set_pos (TAPE_SPACE_RELATIVE_BLOCKS, -op->mt_count);
-	    break;
-	  case MTWEOF:
-	    if (tape_get_feature (TAPE_DRIVE_WRITE_FILEMARKS))
-	      ret = tape_write_marks (TAPE_FILEMARKS, op->mt_count);
-	    else if (tape_get_feature (TAPE_DRIVE_WRITE_LONG_FMKS))
-	      ret = tape_write_marks (TAPE_LONG_FILEMARKS, op->mt_count);
-	    else
-	      ret = tape_write_marks (TAPE_SHORT_FILEMARKS, op->mt_count);
-	    break;
-	  case MTREW:
-	    ret = tape_set_pos (TAPE_REWIND, 0);
-	    break;
-	  case MTOFFL:
-	    ret = tape_prepare (TAPE_UNLOAD);
-	    break;
-	  case MTNOP:
-	    break;
-	  case MTRETEN:
-	    if (! tape_get_feature (TAPE_DRIVE_END_OF_DATA))
-	      ret = ERROR_INVALID_PARAMETER;
-	    else if (! (ret = tape_set_pos (TAPE_REWIND, 0, false)))
-	      ret = tape_prepare (TAPE_TENSION);
-	    break;
-	  case MTBSFM:
-	    ret = tape_set_pos (TAPE_SPACE_FILEMARKS, -op->mt_count, true);
-	    break;
-	  case MTFSFM:
-	    ret = tape_set_pos (TAPE_SPACE_FILEMARKS, op->mt_count, true);
-	    break;
-	  case MTEOM:
-	    if (tape_get_feature (TAPE_DRIVE_END_OF_DATA))
-	      ret = tape_set_pos (TAPE_SPACE_END_OF_DATA, 0);
-	    else
-	      ret = tape_set_pos (TAPE_SPACE_FILEMARKS, 32767);
-	    break;
-	  case MTERASE:
-	    ret = tape_erase (TAPE_ERASE_SHORT);
-	    break;
-	  case MTRAS1:
-	  case MTRAS2:
-	  case MTRAS3:
-	    ret = ERROR_INVALID_PARAMETER;
-	    break;
-	  case MTSETBLK:
-	    {
-	      long min, max;
-
-	      if (! tape_get_feature (TAPE_DRIVE_SET_BLOCK_SIZE))
-		{
-		  ret = ERROR_INVALID_PARAMETER;
-		  break;
-		}
-	      ret = tape_get_blocksize (&min, NULL, &max, NULL);
-	      if (ret)
-		  break;
-	      if (devbuf && (size_t) op->mt_count == devbufsiz && !varblkop)
-		{
-		  ret = 0;
-		  break;
-		}
-	      if ((op->mt_count == 0
-		   && !tape_get_feature (TAPE_DRIVE_VARIABLE_BLOCK))
-		  || (op->mt_count > 0
-		      && (op->mt_count < min || op->mt_count > max)))
-		{
-		  ret = ERROR_INVALID_PARAMETER;
-		  break;
-		}
-	      if (devbuf && op->mt_count > 0
-		  && (size_t) op->mt_count < devbufend - devbufstart)
-		{
-		  ret = ERROR_MORE_DATA;
-		  break;
-		}
-	      if (! (ret = tape_set_blocksize (op->mt_count)))
-		{
-		  size_t size = 0;
-		  if (op->mt_count == 0)
-		    {
-		      struct mtget get;
-		      if ((ret = tape_status (&get)) != NO_ERROR)
-			break;
-		      size = get.mt_maxblksize;
-		      ret = NO_ERROR;
-		    }
-		  char *buf = NULL;
-		  if (size > 1L && !(buf = new char [size]))
-		    {
-		      ret = ERROR_OUTOFMEMORY;
-		      break;
-		    }
-		  if (devbufsiz > 1L && size > 1L)
-		    {
-		      memcpy (buf, devbuf + devbufstart,
-			      devbufend - devbufstart);
-		      devbufend -= devbufstart;
-		    }
-		  else
-		    devbufend = 0;
-		  if (devbufsiz > 1L)
-		    delete [] devbuf;
-		  devbufstart = 0;
-		  devbuf = buf;
-		  devbufsiz = size;
-		  varblkop = op->mt_count == 0;
-		}
-	    }
-	    break;
-	  case MTSETDENSITY:
-	    ret = ERROR_INVALID_PARAMETER;
-	    break;
-	  case MTSEEK:
-	    if (tape_get_feature (TAPE_DRIVE_ABSOLUTE_BLK))
-	      {
-		ret = tape_set_pos (TAPE_ABSOLUTE_BLOCK, op->mt_count);
-		break;
-	      }
-	    if (! (ret = tape_get_pos (&block)))
-	      {
-		ret = tape_set_pos (TAPE_SPACE_RELATIVE_BLOCKS,
-				 op->mt_count - block);
-	      }
-	    break;
-	  case MTTELL:
-	    if (! (ret = tape_get_pos (&block)))
-	      op->mt_count = block;
-	    break;
-	  case MTSETDRVBUFFER:
-	    ret = ERROR_INVALID_PARAMETER;
-	    break;
-	  case MTFSS:
-	    ret = tape_set_pos (TAPE_SPACE_SETMARKS, op->mt_count);
-	    break;
-	  case MTBSS:
-	    ret = tape_set_pos (TAPE_SPACE_SETMARKS, -op->mt_count);
-	    break;
-	  case MTWSM:
-	    ret = tape_write_marks (TAPE_SETMARKS, op->mt_count);
-	    break;
-	  case MTLOCK:
-	    ret = tape_prepare (TAPE_LOCK);
-	    break;
-	  case MTUNLOCK:
-	    ret = tape_prepare (TAPE_UNLOCK);
-	    break;
-	  case MTLOAD:
-	    ret = tape_prepare (TAPE_LOAD);
-	    break;
-	  case MTUNLOAD:
-	    ret = tape_prepare (TAPE_UNLOAD);
-	    break;
-	  case MTCOMPRESSION:
-	    ret = tape_compression (op->mt_count);
-	    break;
-	  case MTSETPART:
-	  case MTMKPART:
-	  default:
-	    ret = ERROR_INVALID_PARAMETER;
-	    break;
-	  }
-    }
-  else if (cmd == MTIOCGET)
-    ret = tape_status ((struct mtget *) buf);
-  else if (cmd == MTIOCPOS)
-    {
-      ret = ERROR_INVALID_PARAMETER;
-      if (buf && (ret = tape_get_pos (&block)))
-	((struct mtpos *) buf)->mt_blkno = block;
-    }
-  else
-    return fhandler_dev_raw::ioctl (cmd, buf);
-
-  if (ret != NO_ERROR)
-    {
-      SetLastError (ret);
-      __seterrno ();
-      return -1;
-    }
-
-  return 0;
-}
-
-/* ------------------------------------------------------------------ */
-/*                  Private functions used by `ioctl'                 */
-/* ------------------------------------------------------------------ */
-
-static int
-tape_error (DWORD lasterr, const char *txt)
-{
-  if (lasterr)
-    debug_printf ("%s: error: %d", txt, lasterr);
-
-  return lasterr;
-}
-
-int
-fhandler_dev_tape::tape_write_marks (int marktype, DWORD len)
-{
-  syscall_printf ("write_tapemark");
-  while (((lasterr = WriteTapemark (get_handle (),
-				    marktype,
-				    len,
-				    FALSE)) == ERROR_MEDIA_CHANGED)
-	 || (lasterr == ERROR_BUS_RESET))
-    ;
-
-  return tape_error (lasterr, "tape_write_marks");
-}
-
-int
-fhandler_dev_tape::tape_get_pos (unsigned long *ret)
-{
-  DWORD part, low, high;
-
-  while (((lasterr = GetTapePosition (get_handle (),
-				      TAPE_ABSOLUTE_POSITION,
-				      &part,
-				      &low,
-				      &high)) == ERROR_MEDIA_CHANGED)
-	 || (lasterr == ERROR_BUS_RESET))
-    ;
-  if (! tape_error (lasterr, "tape_get_pos") && ret)
-    *ret = low;
-
-  return lasterr;
-}
-
-static int _tape_set_pos (HANDLE hTape, int mode, long count)
-{
-  int err;
-
-  while (((err = SetTapePosition (hTape,
-				  mode,
-				  1,
-				  count,
-				  count < 0 ? -1 : 0,
-				  FALSE)) == ERROR_MEDIA_CHANGED)
-	 || (err == ERROR_BUS_RESET))
-    ;
-
-  return err;
-}
-
-int
-fhandler_dev_tape::tape_set_pos (int mode, long count, bool sfm_func)
-{
-  unsigned long pos, tgtpos;
-
-  switch (mode)
-    {
-      case TAPE_SPACE_RELATIVE_BLOCKS:
-	lasterr = tape_get_pos (&pos);
-
-	if (lasterr)
-	  return lasterr;
-
-	tgtpos = pos + count;
-
-	while (((lasterr = _tape_set_pos (get_handle (),
-					  mode,
-					  count)) == ERROR_FILEMARK_DETECTED)
-	       || (lasterr == ERROR_SETMARK_DETECTED))
-	  {
-	    lasterr = tape_get_pos (&pos);
-	    if (lasterr)
-	      return lasterr;
-	    count = tgtpos - pos;
-	  }
-
-	if (lasterr == ERROR_BEGINNING_OF_MEDIA && ! tgtpos)
-	  lasterr = NO_ERROR;
-
-	break;
-      case TAPE_SPACE_FILEMARKS:
-	if (count < 0)
-	  {
-	    if (pos > 0)
-	      {
-		if ((! _tape_set_pos (get_handle (),
-				  TAPE_SPACE_RELATIVE_BLOCKS,
-				  -1))
-		    || (sfm_func))
-		  ++count;
-		_tape_set_pos (get_handle (), TAPE_SPACE_RELATIVE_BLOCKS, 1);
-	      }
-
-	    while (! (lasterr = _tape_set_pos (get_handle (), mode, -1))
-		   && count++ < 0)
-	      ;
-
-	    if (lasterr == ERROR_BEGINNING_OF_MEDIA)
-	      {
-		if (! count)
-		  lasterr = NO_ERROR;
-	      }
-	    else if (! sfm_func)
-	      lasterr = _tape_set_pos (get_handle (), mode, 1);
-	  }
-	else
-	  {
-	    if (sfm_func)
-	      {
-		if (_tape_set_pos (get_handle (),
-				   TAPE_SPACE_RELATIVE_BLOCKS,
-				   1) == ERROR_FILEMARK_DETECTED)
-		  ++count;
-		_tape_set_pos (get_handle (), TAPE_SPACE_RELATIVE_BLOCKS, -1);
-	      }
-
-	    if (! (lasterr = _tape_set_pos (get_handle (), mode, count))
-		&& sfm_func)
-	      lasterr = _tape_set_pos (get_handle (), mode, -1);
-	  }
-	break;
-      case TAPE_SPACE_SETMARKS:
-      case TAPE_ABSOLUTE_BLOCK:
-      case TAPE_SPACE_END_OF_DATA:
-      case TAPE_REWIND:
-	lasterr = _tape_set_pos (get_handle (), mode, count);
-	break;
-    }
-
-  return tape_error (lasterr, "tape_set_pos");
-}
-
-int
-fhandler_dev_tape::tape_erase (int mode)
-{
-  DWORD varlen;
-  TAPE_GET_DRIVE_PARAMETERS dp;
-
-  while (((lasterr = GetTapeParameters (get_handle (),
-					GET_TAPE_DRIVE_INFORMATION,
-					(varlen = sizeof dp, &varlen),
-					&dp)) == ERROR_MEDIA_CHANGED)
-	 || (lasterr == ERROR_BUS_RESET))
-    ;
-
-  switch (mode)
-    {
-      case TAPE_ERASE_SHORT:
-	if (! lasterr && ! (dp.FeaturesLow & TAPE_DRIVE_ERASE_SHORT))
-	  mode = TAPE_ERASE_LONG;
-	break;
-      case TAPE_ERASE_LONG:
-	if (! lasterr && ! (dp.FeaturesLow & TAPE_DRIVE_ERASE_LONG))
-	  mode = TAPE_ERASE_SHORT;
-	break;
-    }
-
-  return tape_error (EraseTape (get_handle (), mode, false), "tape_erase");
-}
-
-int
-fhandler_dev_tape::tape_prepare (int action)
-{
-  while (((lasterr = PrepareTape (get_handle (),
-				  action,
-				  FALSE)) == ERROR_MEDIA_CHANGED)
-	 || (lasterr == ERROR_BUS_RESET))
-    ;
-  return tape_error (lasterr, "tape_prepare");
-}
-
-bool
-fhandler_dev_tape::tape_get_feature (DWORD parm)
-{
-  DWORD varlen;
-  TAPE_GET_DRIVE_PARAMETERS dp;
-
-  while (((lasterr = GetTapeParameters (get_handle (),
-					GET_TAPE_DRIVE_INFORMATION,
-					(varlen = sizeof dp, &varlen),
-					&dp)) == ERROR_MEDIA_CHANGED)
-	 || (lasterr == ERROR_BUS_RESET))
-    ;
-
-  if (lasterr)
-    return false;
-
-  return ((parm & TAPE_DRIVE_HIGH_FEATURES)
-	  ? ((dp.FeaturesHigh & parm) != 0)
-	  : ((dp.FeaturesLow & parm) != 0));
-}
-
-int
-fhandler_dev_tape::tape_get_blocksize (long *min, long *def, long *max, long *cur)
-{
-  DWORD varlen;
-  TAPE_GET_DRIVE_PARAMETERS dp;
-  TAPE_GET_MEDIA_PARAMETERS mp;
-
-  while (((lasterr = GetTapeParameters (get_handle (),
-					GET_TAPE_DRIVE_INFORMATION,
-					(varlen = sizeof dp, &varlen),
-					&dp)) == ERROR_MEDIA_CHANGED)
-	 || (lasterr == ERROR_BUS_RESET))
-    ;
-
-  if (lasterr)
-    return tape_error (lasterr, "tape_get_blocksize");
-
-  while (((lasterr = GetTapeParameters (get_handle (),
-					GET_TAPE_MEDIA_INFORMATION,
-					(varlen = sizeof dp, &varlen),
-					&mp)) == ERROR_MEDIA_CHANGED)
-	 || (lasterr == ERROR_BUS_RESET))
-    ;
-
-  if (lasterr)
-    return tape_error (lasterr, "tape_get_blocksize");
-
-  if (min)
-    *min = (long) dp.MinimumBlockSize;
-  if (def)
-    *def = (long) dp.DefaultBlockSize;
-  if (max)
-    *max = (long) dp.MaximumBlockSize;
-  if (cur)
-    *cur = (long) mp.BlockSize;
-
-  return tape_error (lasterr, "tape_get_blocksize");
-}
-
-int
-fhandler_dev_tape::tape_set_blocksize (long count)
-{
-  long min, max;
-  TAPE_SET_MEDIA_PARAMETERS mp;
-
-  lasterr = tape_get_blocksize (&min, NULL, &max, NULL);
-
-  if (lasterr)
-    return lasterr;
-
-  if (count != 0 && (count < min || count > max))
-    return tape_error (ERROR_INVALID_PARAMETER, "tape_set_blocksize");
-
-  mp.BlockSize = count;
-
-  return tape_error (SetTapeParameters (get_handle (),
-					SET_TAPE_MEDIA_INFORMATION,
-					&mp),
-		     "tape_set_blocksize");
-}
-
-static long long
-get_ll (PLARGE_INTEGER i)
-{
-  long long l = 0;
-
-  l = i->HighPart;
-  l <<= 32;
-  l |= i->LowPart;
-  return l;
-}
-
-int
-fhandler_dev_tape::tape_status (struct mtget *get)
-{
-  DWORD varlen;
-  TAPE_GET_DRIVE_PARAMETERS dp;
-  TAPE_GET_MEDIA_PARAMETERS mp;
-  int notape = 0;
-
-  if (! get)
-    return ERROR_INVALID_PARAMETER;
-
-  while (((lasterr = GetTapeParameters (get_handle (),
-					GET_TAPE_DRIVE_INFORMATION,
-					(varlen = sizeof dp, &varlen),
-					&dp)) == ERROR_MEDIA_CHANGED)
-	 || (lasterr == ERROR_BUS_RESET))
-    ;
-
-  /* Setting varlen to sizeof DP is by intention, actually! Never set
-     it to sizeof MP which seems to be more correct but results in a
-     ERROR_MORE_DATA error at least on W2K. */
-  if ((lasterr) || (lasterr = GetTapeParameters (get_handle (),
-						 GET_TAPE_MEDIA_INFORMATION,
-						 (varlen = sizeof dp, &varlen),
-						 &mp)))
-    notape = 1;
-
-  memset (get, 0, sizeof *get);
-
-  get->mt_type = MT_ISUNKNOWN;
-
-  if (! notape && (dp.FeaturesLow & TAPE_DRIVE_TAPE_REMAINING))
-    {
-      get->mt_remaining = get_ll (&mp.Remaining);
-      get->mt_resid = get->mt_remaining >> 10;
-    }
-
-  if ((dp.FeaturesHigh & TAPE_DRIVE_SET_BLOCK_SIZE) && ! notape)
-    get->mt_dsreg = mp.BlockSize;
-  else
-    get->mt_dsreg = dp.DefaultBlockSize;
-
-  if (notape)
-    get->mt_gstat |= GMT_DR_OPEN (-1);
-
-  if (! notape)
-    {
-      if (dp.FeaturesLow & TAPE_DRIVE_GET_ABSOLUTE_BLK)
-	tape_get_pos ((unsigned long *) &get->mt_blkno);
-
-      if (! get->mt_blkno)
-	get->mt_gstat |= GMT_BOT (-1);
-
-      get->mt_gstat |= GMT_ONLINE (-1);
-
-      if ((dp.FeaturesLow & TAPE_DRIVE_WRITE_PROTECT) && mp.WriteProtected)
-	get->mt_gstat |= GMT_WR_PROT (-1);
-
-      if (dp.FeaturesLow & TAPE_DRIVE_TAPE_CAPACITY)
-	get->mt_capacity = get_ll (&mp.Capacity);
-    }
-
-  if ((dp.FeaturesLow & TAPE_DRIVE_COMPRESSION) && dp.Compression)
-    get->mt_gstat |= GMT_HW_COMP (-1);
-
-  if ((dp.FeaturesLow & TAPE_DRIVE_ECC) && dp.ECC)
-    get->mt_gstat |= GMT_HW_ECC (-1);
-
-  if ((dp.FeaturesLow & TAPE_DRIVE_PADDING) && dp.DataPadding)
-    get->mt_gstat |= GMT_PADDING (-1);
-
-  if ((dp.FeaturesLow & TAPE_DRIVE_REPORT_SMKS) && dp.ReportSetmarks)
-    get->mt_gstat |= GMT_IM_REP_EN (-1);
-
-  get->mt_erreg = lasterr;
-
-  get->mt_minblksize = dp.MinimumBlockSize;
-  get->mt_maxblksize = dp.MaximumBlockSize;
-  get->mt_defblksize = dp.DefaultBlockSize;
-  get->mt_featureslow = dp.FeaturesLow;
-  get->mt_featureshigh = dp.FeaturesHigh;
-  get->mt_eotwarningzonesize = dp.EOTWarningZoneSize;
-
-  return 0;
-}
-
-int
-fhandler_dev_tape::tape_compression (long count)
-{
-  DWORD varlen;
-  TAPE_GET_DRIVE_PARAMETERS dpg;
-  TAPE_SET_DRIVE_PARAMETERS dps;
-
-  while (((lasterr = GetTapeParameters (get_handle (),
-					GET_TAPE_DRIVE_INFORMATION,
-					(varlen = sizeof dpg, &varlen),
-					&dpg)) == ERROR_MEDIA_CHANGED)
-	 || (lasterr == ERROR_BUS_RESET))
-    ;
-
-  if (lasterr)
-    return tape_error (lasterr, "tape_compression");
-
-  if (! (dpg.FeaturesLow & TAPE_DRIVE_COMPRESSION))
-    return ERROR_INVALID_PARAMETER;
-
-  if (count)
-    {
-      dps.ECC = dpg.ECC;
-      dps.Compression = count ? TRUE : FALSE;
-      dps.DataPadding = dpg.DataPadding;
-      dps.ReportSetmarks = dpg.ReportSetmarks;
-      dps.EOTWarningZoneSize = dpg.EOTWarningZoneSize;
-      lasterr = SetTapeParameters (get_handle (),
-				   SET_TAPE_DRIVE_INFORMATION,
-				   &dps);
-
-      if (lasterr)
-	return tape_error (lasterr, "tape_compression");
-
-      dpg.Compression = dps.Compression;
-    }
-
-  return 0;
-}
-
diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc
deleted file mode 100644
index edb8354ef..000000000
--- a/winsup/cygwin/fhandler_termios.cc
+++ /dev/null
@@ -1,339 +0,0 @@
-/* fhandler_termios.cc
-
-   Copyright 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <sys/termios.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <ctype.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include "tty.h"
-#include "sys/cygwin.h"
-
-/* Common functions shared by tty/console */
-
-void
-fhandler_termios::tcinit (tty_min *this_tc, bool force)
-{
-  /* Initial termios values */
-
-  tc = this_tc;
-
-  if (force || !TTYISSETF (INITIALIZED))
-    {
-      tc->ti.c_iflag = BRKINT | ICRNL | IXON;
-      tc->ti.c_oflag = OPOST | ONLCR;
-      tc->ti.c_cflag = B38400 | CS8 | CREAD;
-      tc->ti.c_lflag = ISIG | ICANON | ECHO | IEXTEN;
-
-      tc->ti.c_cc[VDISCARD]	= CFLUSH;
-      tc->ti.c_cc[VEOL]		= CEOL;
-      tc->ti.c_cc[VEOL2]	= CEOL2;
-      tc->ti.c_cc[VEOF]		= CEOF;
-      tc->ti.c_cc[VERASE]	= CERASE;
-      tc->ti.c_cc[VINTR]	= CINTR;
-      tc->ti.c_cc[VKILL]	= CKILL;
-      tc->ti.c_cc[VLNEXT]	= CLNEXT;
-      tc->ti.c_cc[VMIN]		= 1;
-      tc->ti.c_cc[VQUIT]	= CQUIT;
-      tc->ti.c_cc[VREPRINT]	= CRPRNT;
-      tc->ti.c_cc[VSTART]	= CSTART;
-      tc->ti.c_cc[VSTOP]	= CSTOP;
-      tc->ti.c_cc[VSUSP]	= CSUSP;
-      tc->ti.c_cc[VSWTC]	= CSWTCH;
-      tc->ti.c_cc[VTIME]	= 0;
-      tc->ti.c_cc[VWERASE]	= CWERASE;
-
-      tc->ti.c_ispeed = tc->ti.c_ospeed = B38400;
-      tc->pgid = myself->pgid;
-      TTYSETF (INITIALIZED);
-    }
-}
-
-int
-fhandler_termios::tcsetpgrp (const pid_t pgid)
-{
-  termios_printf ("tty %d pgid %d, sid %d, tsid %d", tc->ntty, pgid,
-		    myself->sid, tc->getsid ());
-  if (myself->sid != tc->getsid ())
-    {
-      set_errno (EPERM);
-      return -1;
-    }
-  tc->setpgid (pgid);
-  return 0;
-}
-
-int
-fhandler_termios::tcgetpgrp ()
-{
-  return tc->pgid;
-}
-
-void
-tty_min::kill_pgrp (int sig)
-{
-  int killself = 0;
-  winpids pids ((DWORD) PID_MAP_RW);
-  for (unsigned i = 0; i < pids.npids; i++)
-    {
-      _pinfo *p = pids[i];
-      if (!proc_exists (p) || p->ctty != ntty || p->pgid != pgid)
-	continue;
-      if (p == myself)
-	killself++;
-      else
-	(void) sig_send (p, sig);
-    }
-  if (killself)
-    sig_send (myself, sig);
-}
-
-bg_check_types
-fhandler_termios::bg_check (int sig)
-{
-  if (!myself->pgid || tc->getpgid () == myself->pgid ||
-	myself->ctty != tc->ntty ||
-	((sig == SIGTTOU) && !(tc->ti.c_lflag & TOSTOP)))
-    return bg_ok;
-
-  if (sig < 0)
-    sig = -sig;
-
-  termios_printf ("bg I/O pgid %d, tpgid %d, ctty %d",
-		    myself->pgid, tc->getpgid (), myself->ctty);
-
-  if (tc->getsid () == 0)
-    {
-      /* The pty has been closed by the master.  Return an EOF
-	 indication.  FIXME: There is nothing to stop somebody
-	 from reallocating this pty.  I think this is the case
-	 which is handled by unlockpt on a Unix system.  */
-      termios_printf ("closed by master");
-      return bg_eof;
-    }
-
-  /* If the process group is no more or if process is ignoring or blocks 'sig',
-     return with error */
-  int pgid_gone = !pid_exists (myself->pgid);
-  int sigs_ignored =
-    ((void *) global_sigs[sig].sa_handler == (void *) SIG_IGN) ||
-    (myself->getsigmask () & SIGTOMASK (sig));
-
-  if (pgid_gone)
-    goto setEIO;
-  else if (!sigs_ignored)
-    /* nothing */;
-  else if (sig == SIGTTOU)
-    return bg_ok;		/* Just allow the output */
-  else
-    goto setEIO;	/* This is an output error */
-
-  /* Don't raise a SIGTT* signal if we have already been interrupted
-     by another signal. */
-  if (WaitForSingleObject (signal_arrived, 0) != WAIT_OBJECT_0)
-    kill_pgrp (myself->pgid, sig);
-  return bg_signalled;
-
-setEIO:
-  set_errno (EIO);
-  return bg_error;
-}
-
-#define set_input_done(x) input_done = input_done || (x)
-
-inline void
-fhandler_termios::echo_erase (int force)
-{
-  if (force || tc->ti.c_lflag & ECHO)
-    doecho ("\b \b", 3);
-}
-
-line_edit_status
-fhandler_termios::line_edit (const char *rptr, int nread, termios& ti)
-{
-  line_edit_status ret = line_edit_ok;
-  char c;
-  int input_done = 0;
-  bool sawsig = false;
-  int iscanon = ti.c_lflag & ICANON;
-
-  while (nread-- > 0)
-    {
-      c = *rptr++;
-
-      termios_printf ("char %c", c);
-
-      /* Check for special chars */
-
-      if (c == '\r')
-	{
-	  if (ti.c_iflag & IGNCR)
-	    continue;
-	  if (ti.c_iflag & ICRNL)
-	    {
-	      c = '\n';
-	      set_input_done (iscanon);
-	    }
-	}
-      else if (c == '\n')
-	{
-	  if (ti.c_iflag & INLCR)
-	    c = '\r';
-	  else
-	    set_input_done (iscanon);
-	}
-
-      if (ti.c_iflag & ISTRIP)
-	c &= 0x7f;
-      if (ti.c_lflag & ISIG)
-	{
-	  int sig;
-	  if (CCEQ (ti.c_cc[VINTR], c))
-	    sig = SIGINT;
-	  else if (CCEQ (ti.c_cc[VQUIT], c))
-	    sig = SIGQUIT;
-	  else if (CCEQ (ti.c_cc[VSUSP], c))
-	    sig = SIGTSTP;
-	  else
-	    goto not_a_sig;
-
-	  termios_printf ("got interrupt %d, sending signal %d", c, sig);
-	  eat_readahead (-1);
-	  tc->kill_pgrp (sig);
-	  ti.c_lflag &= ~FLUSHO;
-	  sawsig = true;
-	  goto restart_output;
-	}
-    not_a_sig:
-      if (ti.c_iflag & IXON)
-	{
-	  if (CCEQ (ti.c_cc[VSTOP], c))
-	    {
-	      if (!tc->output_stopped)
-		{
-		  tc->output_stopped = 1;
-		  acquire_output_mutex (INFINITE);
-		}
-	      continue;
-	    }
-	  else if (CCEQ (ti.c_cc[VSTART], c))
-	    {
-    restart_output:
-	      tc->output_stopped = 0;
-	      release_output_mutex ();
-	      continue;
-	    }
-	  else if ((ti.c_iflag & IXANY) && tc->output_stopped)
-	    goto restart_output;
-	}
-      if (iscanon && ti.c_lflag & IEXTEN && CCEQ (ti.c_cc[VDISCARD], c))
-	{
-	  ti.c_lflag ^= FLUSHO;
-	  continue;
-	}
-      if (!iscanon)
-	/* nothing */;
-      else if (CCEQ (ti.c_cc[VERASE], c))
-	{
-	  if (eat_readahead (1))
-	    echo_erase ();
-	  continue;
-	}
-      else if (CCEQ (ti.c_cc[VWERASE], c))
-	{
-	  int ch;
-	  do
-	    if (!eat_readahead (1))
-	      break;
-	    else
-	      echo_erase ();
-	  while ((ch = peek_readahead (1)) >= 0 && !isspace (ch));
-	  continue;
-	}
-      else if (CCEQ (ti.c_cc[VKILL], c))
-	{
-	  int nchars = eat_readahead (-1);
-	  if (ti.c_lflag & ECHO)
-	    while (nchars--)
-	      echo_erase (1);
-	  continue;
-	}
-      else if (CCEQ (ti.c_cc[VREPRINT], c))
-	{
-	  if (ti.c_lflag & ECHO)
-	    {
-	      doecho ("\n\r", 2);
-	      doecho (rabuf, ralen);
-	    }
-	  continue;
-	}
-      else if (CCEQ (ti.c_cc[VEOF], c))
-	{
-	  termios_printf ("EOF");
-	  (void) accept_input ();
-	  ret = line_edit_input_done;
-	  continue;
-	}
-      else if (CCEQ (ti.c_cc[VEOL], c) ||
-	       CCEQ (ti.c_cc[VEOL2], c) ||
-	       c == '\n')
-	{
-	  set_input_done (1);
-	  termios_printf ("EOL");
-	}
-
-      if (ti.c_iflag & IUCLC && isupper (c))
-	c = cyg_tolower (c);
-
-      put_readahead (c);
-      if (ti.c_lflag & ECHO)
-	doecho (&c, 1);
-      if (!iscanon || input_done)
-	{
-	  int status = accept_input ();
-	  if (status != 1)
-	    {
-	      ret = status ? line_edit_error : line_edit_pipe_full;
-	      eat_readahead (1);
-	      break;
-	    }
-	  ret = line_edit_input_done;
-	  input_done = 0;
-	}
-    }
-
-  if (!iscanon && ralen > 0)
-    ret = line_edit_input_done;
-
-  if (sawsig)
-    ret = line_edit_signalled;
-
-  return ret;
-}
-
-void
-fhandler_termios::fixup_after_fork (HANDLE parent)
-{
-  fhandler_base::fixup_after_fork (parent);
-  fork_fixup (parent, get_output_handle (), "output_handle");
-}
-
-_off64_t
-fhandler_termios::lseek (_off64_t, int)
-{
-  set_errno (ESPIPE);
-  return -1;
-}
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
deleted file mode 100644
index 60b12a939..000000000
--- a/winsup/cygwin/fhandler_tty.cc
+++ /dev/null
@@ -1,1430 +0,0 @@
-/* fhandler_tty.cc
-
-   Copyright 1997, 1998, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <limits.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include "cygheap.h"
-#include "shared_info.h"
-#include "cygserver.h"
-#include "cygthread.h"
-
-/* Tty master stuff */
-
-fhandler_tty_master NO_COPY *tty_master;
-
-static DWORD WINAPI process_input (void *);		// Input queue thread
-static DWORD WINAPI process_output (void *);		// Output queue thread
-static DWORD WINAPI process_ioctl (void *);		// Ioctl requests thread
-
-fhandler_tty_master::fhandler_tty_master ()
-  : fhandler_pty_master (), console (NULL)
-{
-}
-
-int
-fhandler_tty_slave::get_unit ()
-{
-  return dev () == FH_TTY ? myself->ctty : dev ().minor;
-}
-
-void
-fhandler_tty_master::set_winsize (bool sendSIGWINCH)
-{
-  winsize w;
-  console->ioctl (TIOCGWINSZ, &w);
-  get_ttyp ()->winsize = w;
-  if (sendSIGWINCH)
-    tc->kill_pgrp (SIGWINCH);
-}
-
-int
-fhandler_tty_master::init ()
-{
-  slave = dev ();
-  termios_printf ("Creating master for tty%d", get_unit ());
-
-  if (init_console ())
-    {
-      termios_printf ("can't create fhandler");
-      return -1;
-    }
-
-  termios ti;
-  memset (&ti, 0, sizeof (ti));
-  console->tcsetattr (0, &ti);
-
-  cygwin_shared->tty[get_unit ()]->common_init (this);
-
-  set_winsize (false);
-
-  inuse = get_ttyp ()->create_inuse (TTY_MASTER_ALIVE);
-
-  cygthread *h;
-  h = new cygthread (process_input, cygself, "ttyin");
-  h->SetThreadPriority (THREAD_PRIORITY_HIGHEST);
-  h->zap_h ();
-
-  h = new cygthread (process_ioctl, cygself, "ttyioctl");
-  h->SetThreadPriority (THREAD_PRIORITY_HIGHEST);
-  h->zap_h ();
-
-  h = new cygthread (process_output, cygself, "ttyout");
-  h->SetThreadPriority (THREAD_PRIORITY_HIGHEST);
-  h->zap_h ();
-
-  return 0;
-}
-
-#ifdef DEBUGGING
-static class mutex_stack
-{
-public:
-  const char *fn;
-  int ln;
-  const char *tname;
-} ostack[100];
-
-static int osi;
-#endif /*DEBUGGING*/
-
-DWORD
-fhandler_tty_common::__acquire_output_mutex (const char *fn, int ln,
-					   DWORD ms)
-{
-  if (strace.active)
-    strace.prntf (_STRACE_TERMIOS, fn, "(%d): tty output_mutex: waiting %d ms", ln, ms);
-  DWORD res = WaitForSingleObject (output_mutex, ms);
-  if (res == WAIT_OBJECT_0)
-    {
-#ifndef DEBUGGING
-      if (strace.active)
-	strace.prntf (_STRACE_TERMIOS, fn, "(%d): tty output_mutex: acquired", ln, res);
-#else
-      ostack[osi].fn = fn;
-      ostack[osi].ln = ln;
-      ostack[osi].tname = cygthread::name ();
-      termios_printf ("acquired for %s:%d, osi %d", fn, ln, osi);
-      osi++;
-#endif
-    }
-  return res;
-}
-
-void
-fhandler_tty_common::__release_output_mutex (const char *fn, int ln)
-{
-  if (ReleaseMutex (output_mutex))
-    {
-#ifndef DEBUGGING
-      if (strace.active)
-	strace.prntf (_STRACE_TERMIOS, fn, "(%d): tty output_mutex released", ln);
-#else
-      if (osi > 0)
-	osi--;
-      termios_printf ("released at %s:%d, osi %d", fn, ln, osi);
-      termios_printf ("  for %s:%d (%s)", ostack[osi].fn, ostack[osi].ln, ostack[osi].tname);
-      ostack[osi].ln = -ln;
-#endif
-    }
-}
-
-/* Process tty input. */
-
-void
-fhandler_pty_master::doecho (const void *str, DWORD len)
-{
-  acquire_output_mutex (INFINITE);
-  if (!WriteFile (get_ttyp ()->to_master, str, len, &len, NULL))
-    termios_printf ("Write to %p failed, %E", get_ttyp ()->to_master);
-//  WaitForSingleObject (output_done_event, INFINITE);
-  release_output_mutex ();
-}
-
-int
-fhandler_pty_master::accept_input ()
-{
-  DWORD bytes_left;
-  int ret = 1;
-
-  (void) WaitForSingleObject (input_mutex, INFINITE);
-
-  bytes_left = eat_readahead (-1);
-
-  if (!bytes_left)
-    {
-      termios_printf ("sending EOF to slave");
-      get_ttyp ()->read_retval = 0;
-    }
-  else
-    {
-      char *p = rabuf;
-      DWORD rc;
-      DWORD written = 0;
-
-      termios_printf ("about to write %d chars to slave", bytes_left);
-      rc = WriteFile (get_output_handle (), p, bytes_left, &written, NULL);
-      if (!rc)
-	{
-	  debug_printf ("error writing to pipe %E");
-	  get_ttyp ()->read_retval = -1;
-	  ret = -1;
-	}
-      else
-	{
-	  get_ttyp ()->read_retval = 1;
-	  p += written;
-	  bytes_left -= written;
-	  if (bytes_left > 0)
-	    {
-	      debug_printf ("to_slave pipe is full");
-	      puts_readahead (p, bytes_left);
-	      ret = 0;
-	    }
-	}
-    }
-
-  SetEvent (input_available_event);
-  ReleaseMutex (input_mutex);
-  return ret;
-}
-
-static DWORD WINAPI
-process_input (void *)
-{
-  char rawbuf[INP_BUFFER_SIZE];
-
-  while (1)
-    {
-      size_t nraw = INP_BUFFER_SIZE;
-      tty_master->console->read ((void *) rawbuf, nraw);
-      if (tty_master->line_edit (rawbuf, nraw, tty_master->get_ttyp ()->ti)
-	  == line_edit_signalled)
-	tty_master->console->eat_readahead (-1);
-    }
-}
-
-bool
-fhandler_pty_master::hit_eof ()
-{
-  if (get_ttyp ()->was_opened && !get_ttyp ()->slave_alive ())
-    {
-      /* We have the only remaining open handle to this pty, and
-	 the slave pty has been opened at least once.  We treat
-	 this as EOF.  */
-      termios_printf ("all other handles closed");
-      return 1;
-    }
-  return 0;
-}
-
-/* Process tty output requests */
-
-int
-fhandler_pty_master::process_slave_output (char *buf, size_t len, int pktmode_on)
-{
-  size_t rlen;
-  char outbuf[OUT_BUFFER_SIZE + 1];
-  DWORD n;
-  int column = 0;
-  int rc = 0;
-
-  if (len == 0)
-    goto out;
-
-  if (need_nl)
-    {
-      /* We need to return a left over \n character, resulting from
-	 \r\n conversion.  Note that we already checked for FLUSHO and
-	 output_stopped at the time that we read the character, so we
-	 don't check again here.  */
-      if (buf)
-	buf[0] = '\n';
-      need_nl = 0;
-      rc = 1;
-      goto out;
-    }
-
-
-  for (;;)
-    {
-      /* Set RLEN to the number of bytes to read from the pipe.  */
-      rlen = len;
-      if (get_ttyp ()->ti.c_oflag & OPOST && get_ttyp ()->ti.c_oflag & ONLCR)
-	{
-	  /* We are going to expand \n to \r\n, so don't read more than
-	     half of the number of bytes requested.  */
-	  rlen /= 2;
-	  if (rlen == 0)
-	    rlen = 1;
-	}
-      if (rlen > sizeof outbuf)
-	rlen = sizeof outbuf;
-
-      HANDLE handle = get_io_handle ();
-
-      n = 0; // get_readahead_into_buffer (outbuf, len);
-      if (!n)
-	{
-	  /* Doing a busy wait like this is quite inefficient, but nothing
-	     else seems to work completely.  Windows should provide some sort
-	     of overlapped I/O for pipes, or something, but it doesn't.  */
-	  while (1)
-	    {
-	      if (!PeekNamedPipe (handle, NULL, 0, NULL, &n, NULL))
-		goto err;
-	      if (n > 0)
-		break;
-	      if (hit_eof ())
-		goto out;
-	      /* DISCARD (FLUSHO) and tcflush can finish here. */
-	      if (n == 0 && (get_ttyp ()->ti.c_lflag & FLUSHO || !buf))
-	        goto out;
-	      if (n == 0 && is_nonblocking ())
-		{
-		  set_errno (EAGAIN);
-		  rc = -1;
-		  break;
-		}
-
-	      Sleep (10);
-	    }
-
-	  if (ReadFile (handle, outbuf, rlen, &n, NULL) == FALSE)
-	    goto err;
-	}
-
-      termios_printf ("bytes read %u", n);
-      get_ttyp ()->write_error = 0;
-      if (output_done_event != NULL)
-	SetEvent (output_done_event);
-
-      if (get_ttyp ()->ti.c_lflag & FLUSHO || !buf)
-	continue;
-
-      char *optr;
-      optr = buf;
-      if (pktmode_on)
-	*optr++ = TIOCPKT_DATA;
-
-      if (!(get_ttyp ()->ti.c_oflag & OPOST))	// post-process output
-	{
-	  memcpy (optr, outbuf, n);
-	  optr += n;
-	}
-      else					// raw output mode
-	{
-	  char *iptr = outbuf;
-
-	  while (n--)
-	    {
-	      switch (*iptr)
-		{
-		case '\r':
-		  if ((get_ttyp ()->ti.c_oflag & ONOCR) && column == 0)
-		    {
-		      iptr++;
-		      continue;
-		    }
-		  if (get_ttyp ()->ti.c_oflag & OCRNL)
-		    *iptr = '\n';
-		  else
-		    column = 0;
-		  break;
-		case '\n':
-		  if (get_ttyp ()->ti.c_oflag & ONLCR)
-		    {
-		      *optr++ = '\r';
-		      column = 0;
-		    }
-		  if (get_ttyp ()->ti.c_oflag & ONLRET)
-		    column = 0;
-		  break;
-		default:
-		  column++;
-		  break;
-		}
-
-	      /* Don't store data past the end of the user's buffer.  This
-		 can happen if the user requests a read of 1 byte when
-		 doing \r\n expansion.  */
-	      if (optr - buf >= (int) len)
-		{
-		  if (*iptr != '\n' || n != 0)
-		    system_printf ("internal error: %d unexpected characters", n);
-		  need_nl = 1;
-		  break;
-		}
-
-	      *optr++ = *iptr++;
-	    }
-	}
-      rc = optr - buf;
-      break;
-
-    err:
-      if (GetLastError () == ERROR_BROKEN_PIPE)
-	rc = 0;
-      else
-	{
-	  __seterrno ();
-	  rc = -1;
-	}
-      break;
-    }
-
-out:
-  termios_printf ("returning %d", rc);
-  return rc;
-}
-
-static DWORD WINAPI
-process_output (void *)
-{
-  char buf[OUT_BUFFER_SIZE * 2];
-
-  for (;;)
-    {
-      int n = tty_master->process_slave_output (buf, OUT_BUFFER_SIZE, 0);
-      if (n <= 0)
-	{
-	  if (n < 0)
-	    termios_printf ("ReadFile %E");
-	  ExitThread (0);
-	}
-      n = tty_master->console->write ((void *) buf, (size_t) n);
-      tty_master->get_ttyp ()->write_error = n == -1 ? get_errno () : 0;
-    }
-}
-
-
-/* Process tty ioctl requests */
-
-static DWORD WINAPI
-process_ioctl (void *)
-{
-  while (1)
-    {
-      WaitForSingleObject (tty_master->ioctl_request_event, INFINITE);
-      termios_printf ("ioctl() request");
-      tty_master->get_ttyp ()->ioctl_retval =
-      tty_master->console->ioctl (tty_master->get_ttyp ()->cmd,
-			     (void *) &tty_master->get_ttyp ()->arg);
-      SetEvent (tty_master->ioctl_done_event);
-    }
-}
-
-/**********************************************************************/
-/* Tty slave stuff */
-
-fhandler_tty_slave::fhandler_tty_slave ()
-  : fhandler_tty_common ()
-{
-  set_r_no_interrupt (1);
-}
-
-/* FIXME: This function needs to close handles when it has
-   a failing condition. */
-int
-fhandler_tty_slave::open (int flags, mode_t)
-{
-  if (get_device () == FH_TTY)
-    pc.dev.tty_to_real_device ();
-  fhandler_tty_slave *arch = (fhandler_tty_slave *)
-    cygheap->fdtab.find_archetype (pc.dev);
-  if (arch)
-    {
-      *this = *(fhandler_tty_slave *) arch;
-      termios_printf ("copied tty fhandler from cygheap");
-      fhandler_console::open_fhs++;
-      goto out;
-    }
-
-  tcinit (cygwin_shared->tty[get_unit ()]);
-
-  attach_tty (get_unit ());
-
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-  /* Create synchronisation events */
-  char buf[40];
-
-  /* output_done_event may or may not exist.  It will exist if the tty
-     was opened by fhandler_tty_master::init, normally called at
-     startup if use_tty is non-zero.  It will not exist if this is a
-     pty opened by fhandler_pty_master::open.  In the former case, tty
-     output is handled by a separate thread which controls output.  */
-  __small_sprintf (buf, OUTPUT_DONE_EVENT, get_unit ());
-  output_done_event = OpenEvent (EVENT_ALL_ACCESS, TRUE, buf);
-
-  if (!(output_mutex = get_ttyp ()->open_output_mutex ()))
-    {
-      termios_printf ("open output mutex failed, %E");
-      __seterrno ();
-      return 0;
-    }
-  if (!(input_mutex = get_ttyp ()->open_input_mutex ()))
-    {
-      termios_printf ("open input mutex failed, %E");
-      __seterrno ();
-      return 0;
-    }
-  __small_sprintf (buf, INPUT_AVAILABLE_EVENT, get_unit ());
-  if (!(input_available_event = OpenEvent (EVENT_ALL_ACCESS, TRUE, buf)))
-    {
-      termios_printf ("open input event failed, %E");
-      __seterrno ();
-      return 0;
-    }
-
-  /* The ioctl events may or may not exist.  See output_done_event,
-     above.  */
-  __small_sprintf (buf, IOCTL_REQUEST_EVENT, get_unit ());
-  ioctl_request_event = OpenEvent (EVENT_ALL_ACCESS, TRUE, buf);
-  __small_sprintf (buf, IOCTL_DONE_EVENT, get_unit ());
-  ioctl_done_event = OpenEvent (EVENT_ALL_ACCESS, TRUE, buf);
-
-  /* FIXME: Needs a method to eliminate tty races */
-  {
-    acquire_output_mutex (500);
-    inuse = get_ttyp ()->create_inuse (TTY_SLAVE_ALIVE);
-    get_ttyp ()->was_opened = true;
-    release_output_mutex ();
-  }
-
-  /* Duplicate tty handles.  */
-
-  if (!get_ttyp ()->from_slave || !get_ttyp ()->to_slave)
-    {
-      termios_printf ("tty handles have been closed");
-      set_errno (EACCES);
-      return 0;
-    }
-
-  HANDLE from_master_local;
-  HANDLE to_master_local;
-  from_master_local = to_master_local = NULL;
-
-#ifdef USE_SERVER
-  if (!wincap.has_security ()
-      || cygserver_running == CYGSERVER_UNAVAIL
-      || !cygserver_attach_tty (&from_master_local, &to_master_local))
-#endif
-    {
-#ifdef USE_SERVER
-      termios_printf ("cannot dup handles via server. using old method.");
-#endif
-      HANDLE tty_owner = OpenProcess (PROCESS_DUP_HANDLE, FALSE,
-				      get_ttyp ()->master_pid);
-      termios_printf ("tty own handle %p",tty_owner);
-      if (tty_owner == NULL)
-	{
-	  termios_printf ("can't open tty (%d) handle process %d",
-			  get_unit (), get_ttyp ()->master_pid);
-	  __seterrno ();
-	  return 0;
-	}
-
-      if (!DuplicateHandle (tty_owner, get_ttyp ()->from_master,
-			    hMainProc, &from_master_local, 0, TRUE,
-			    DUPLICATE_SAME_ACCESS))
-	{
-	  termios_printf ("can't duplicate input, %E");
-	  __seterrno ();
-	  return 0;
-	}
-
-      if (!DuplicateHandle (tty_owner, get_ttyp ()->to_master,
-			  hMainProc, &to_master_local, 0, TRUE,
-			  DUPLICATE_SAME_ACCESS))
-	{
-	  termios_printf ("can't duplicate output, %E");
-	  __seterrno ();
-	  return 0;
-	}
-      CloseHandle (tty_owner);
-    }
-
-  termios_printf ("duplicated from_master %p->%p from tty_owner",
-      get_ttyp ()->from_master, from_master_local);
-  termios_printf ("duplicated to_master %p->%p from tty_owner",
-      get_ttyp ()->to_master, to_master_local);
-
-  set_io_handle (from_master_local);
-  set_output_handle (to_master_local);
-
-  set_open_status ();
-  if (fhandler_console::open_fhs++ == 0 && !GetConsoleCP ()
-      && !output_done_event && wincap.pty_needs_alloc_console ()
-      && !GetProcessWindowStation ())
-    {
-      BOOL b;
-      HWINSTA h = CreateWindowStation (NULL, 0, GENERIC_READ | GENERIC_WRITE, &sec_none_nih);
-      termios_printf ("CreateWindowStation %p, %E", h);
-      if (h)
-	{
-	  b = SetProcessWindowStation (h);
-	  termios_printf ("SetProcessWindowStation %d, %E", b);
-	}
-      b = AllocConsole ();	// will cause flashing if workstation
-			    	// stuff fails
-      termios_printf ("%d = AllocConsole (), %E", b);
-      if (b)
-	init_console_handler ();
-    }
-
-  // FIXME: Do this better someday
-  arch = (fhandler_tty_slave *) cmalloc (HEAP_ARCHETYPES, sizeof (*this));
-  *((fhandler_tty_slave **) cygheap->fdtab.add_archetype ()) = arch;
-  archetype = arch;
-  *arch = *this;
-
-out:
-  usecount = 0;
-  archetype->usecount++;
-  myself->set_ctty (get_ttyp (), flags, arch);
-  termios_printf ("%s opened, incremented open_fhs %d, archetype usecount %d",
-		  pc.dev.name, fhandler_console::open_fhs, archetype->usecount);
-
-  return 1;
-}
-
-int
-fhandler_tty_slave::close ()
-{
-  if (!--fhandler_console::open_fhs && myself->ctty == -1)
-    FreeConsole ();
-  termios_printf ("decremented open_fhs %d, archetype usecount %d",
-		  fhandler_console::open_fhs, archetype->usecount);
-  if (--archetype->usecount)
-    {
-#ifdef DEBUGGING
-      if (archetype->usecount < 0)
-	system_printf ("usecount %d", archetype->usecount);
-#endif
-      termios_printf ("just exiting because archetype usecount is > 0");
-      return 0;
-    }
-
-  termios_printf ("closing last open %s handle", pc.dev.name);
-  return fhandler_tty_common::close ();
-}
-
-int
-fhandler_tty_slave::cygserver_attach_tty (LPHANDLE from_master_ptr,
-					  LPHANDLE to_master_ptr)
-{
-#ifndef USE_SERVER
-  return 0;
-#else
-  if (!from_master_ptr || !to_master_ptr)
-    return 0;
-
-  client_request_attach_tty req ((DWORD) get_ttyp ()->master_pid,
-				 (HANDLE) get_ttyp ()->from_master,
-				 (HANDLE) get_ttyp ()->to_master);
-
-  if (req.make_request () == -1 || req.error_code ())
-    return 0;
-
-  *from_master_ptr = req.from_master ();
-  *to_master_ptr = req.to_master ();
-
-  return 1;
-#endif
-}
-
-void
-fhandler_tty_slave::init (HANDLE, DWORD a, mode_t)
-{
-  int flags = 0;
-
-  a &= GENERIC_READ | GENERIC_WRITE;
-  if (a == GENERIC_READ)
-    flags = O_RDONLY;
-  if (a == GENERIC_WRITE)
-    flags = O_WRONLY;
-  if (a == (GENERIC_READ | GENERIC_WRITE))
-    flags = O_RDWR;
-
-  open (flags);
-}
-
-int
-fhandler_tty_slave::write (const void *ptr, size_t len)
-{
-  DWORD n, towrite = len;
-
-  termios_printf ("tty%d, write(%x, %d)", get_unit (), ptr, len);
-
-  acquire_output_mutex (INFINITE);
-
-  while (len)
-    {
-      n = min (OUT_BUFFER_SIZE, len);
-      char *buf = (char *)ptr;
-      ptr = (char *) ptr + n;
-      len -= n;
-
-      /* Previous write may have set write_error to != 0.  Check it here.
-	 This is less than optimal, but the alternative slows down tty
-	 writes enormously. */
-      if (get_ttyp ()->write_error)
-	{
-	  set_errno (get_ttyp ()->write_error);
-	  towrite = (DWORD) -1;
-	  break;
-	}
-
-      if (WriteFile (get_output_handle (), buf, n, &n, NULL) == FALSE)
-	{
-	  DWORD err = GetLastError ();
-	  termios_printf ("WriteFile failed, %E");
-	  switch (err)
-	    {
-	    case ERROR_NO_DATA:
-	      err = ERROR_IO_DEVICE;
-	    default:
-	      __seterrno_from_win_error (err);
-	    }
-	  raise (SIGHUP);		/* FIXME: Should this be SIGTTOU? */
-	  towrite = (DWORD) -1;
-	  break;
-	}
-
-      if (output_done_event != NULL)
-	{
-	  DWORD rc;
-	  DWORD x = n * 1000;
-	  rc = WaitForSingleObject (output_done_event, x);
-	  termios_printf ("waited %d ms for output_done_event, WFSO %d", x, rc);
-	}
-    }
-  release_output_mutex ();
-  return towrite;
-}
-
-void __stdcall
-fhandler_tty_slave::read (void *ptr, size_t& len)
-{
-  int totalread = 0;
-  int vmin = 0;
-  int vtime = 0;	/* Initialized to prevent -Wuninitialized warning */
-  size_t readlen;
-  DWORD bytes_in_pipe;
-  char buf[INP_BUFFER_SIZE];
-  char peek_buf[INP_BUFFER_SIZE];
-  DWORD time_to_wait;
-  DWORD rc;
-  HANDLE w4[2];
-
-  termios_printf ("read(%x, %d) handle %p", ptr, len, get_handle ());
-
-  if (!ptr) /* Indicating tcflush(). */
-    time_to_wait = 0;
-  else if ((get_ttyp ()->ti.c_lflag & ICANON))
-    time_to_wait = INFINITE;
-  else
-    {
-      vmin = get_ttyp ()->ti.c_cc[VMIN];
-      if (vmin > INP_BUFFER_SIZE)
-	vmin = INP_BUFFER_SIZE;
-      vtime = get_ttyp ()->ti.c_cc[VTIME];
-      if (vmin < 0)
-	vmin = 0;
-      if (vtime < 0)
-	vtime = 0;
-      if (!vmin && !vtime)
-	time_to_wait = 0;
-      else
-	time_to_wait = !vtime ? INFINITE : 100 * vtime;
-    }
-
-  w4[0] = signal_arrived;
-  w4[1] = input_available_event;
-
-  DWORD waiter = !ptr ? 0 : INFINITE;
-  while (len)
-    {
-      rc = WaitForMultipleObjects (2, w4, FALSE, waiter);
-
-      if (rc == WAIT_TIMEOUT)
-	break;
-
-      if (rc == WAIT_FAILED)
-	{
-	  termios_printf ("wait for input event failed, %E");
-	  break;
-	}
-
-      if (rc == WAIT_OBJECT_0)
-	{
-	  /* if we've received signal after successfully reading some data,
-	     just return all data successfully read */
-	  if (totalread > 0)
-	    break;
-	  set_sig_errno (EINTR);
-	  len = (size_t) -1;
-	  return;
-	}
-
-      rc = WaitForSingleObject (input_mutex, 1000);
-      if (rc == WAIT_FAILED)
-	{
-	  termios_printf ("wait for input mutex failed, %E");
-	  break;
-	}
-      else if (rc == WAIT_TIMEOUT)
-	{
-	  termios_printf ("failed to acquire input mutex after input event arrived");
-	  break;
-	}
-      if (!PeekNamedPipe (get_handle (), peek_buf, sizeof (peek_buf), &bytes_in_pipe, NULL, NULL))
-	{
-	  termios_printf ("PeekNamedPipe failed, %E");
-	  raise (SIGHUP);
-	  bytes_in_pipe = 0;
-	}
-
-      /* On first peek determine no. of bytes to flush. */
-      if (!ptr && len == UINT_MAX)
-        len = (size_t) bytes_in_pipe;
-
-      if (ptr && !vmin && !time_to_wait)
-	{
-	  ReleaseMutex (input_mutex);
-	  len = (size_t) bytes_in_pipe;
-	  return;
-	}
-
-      readlen = min (bytes_in_pipe, min (len, sizeof (buf)));
-
-      if (ptr && vmin && readlen > (unsigned) vmin)
-	readlen = vmin;
-
-      DWORD n = 0;
-      if (readlen)
-	{
-	  termios_printf ("reading %d bytes (vtime %d)", readlen, vtime);
-	  if (ReadFile (get_handle (), buf, readlen, &n, NULL) == FALSE)
-	    {
-	      termios_printf ("read failed, %E");
-	      raise (SIGHUP);
-	    }
-	  /* MSDN states that 5th prameter can be used to determine total
-	     number of bytes in pipe, but for some reason this number doesn't
-	     change after successful read. So we have to peek into the pipe
-	     again to see if input is still available */
-	  if (!PeekNamedPipe (get_handle (), peek_buf, 1, &bytes_in_pipe, NULL, NULL))
-	    {
-	      termios_printf ("PeekNamedPipe failed, %E");
-	      raise (SIGHUP);
-	      bytes_in_pipe = 0;
-	    }
-	  if (n)
-	    {
-	      len -= n;
-	      totalread += n;
-	      if (ptr)
-	        {
-		  memcpy (ptr, buf, n);
-		  ptr = (char *) ptr + n;
-		}
-	    }
-	}
-
-      if (!bytes_in_pipe)
-	ResetEvent (input_available_event);
-
-      ReleaseMutex (input_mutex);
-
-      if (!ptr)
-	{
-	  if (!bytes_in_pipe)
-	    break;
-	  continue;
-        }
-
-      if (get_ttyp ()->read_retval < 0)	// read error
-	{
-	  set_errno (-get_ttyp ()->read_retval);
-	  totalread = -1;
-	  break;
-	}
-      if (get_ttyp ()->read_retval == 0)	//EOF
-	{
-	  termios_printf ("saw EOF");
-	  break;
-	}
-      if (get_ttyp ()->ti.c_lflag & ICANON || is_nonblocking ())
-	break;
-      if (vmin && totalread >= vmin)
-	break;
-
-      /* vmin == 0 && vtime == 0:
-       *   we've already read all input, if any, so return immediately
-       * vmin == 0 && vtime > 0:
-       *   we've waited for input 10*vtime ms in WFSO(input_available_event),
-       *   no matter whether any input arrived, we shouldn't wait any longer,
-       *   so return immediately
-       * vmin > 0 && vtime == 0:
-       *   here, totalread < vmin, so continue waiting until more data
-       *   arrive
-       * vmin > 0 && vtime > 0:
-       *   similar to the previous here, totalread < vmin, and timer
-       *   hadn't expired -- WFSO(input_available_event) != WAIT_TIMEOUT,
-       *   so "restart timer" and wait until more data arrive
-       */
-
-      if (vmin == 0)
-	break;
-
-      if (n)
-	waiter = time_to_wait;
-    }
-  termios_printf ("%d=read(%x, %d)", totalread, ptr, len);
-  len = (size_t) totalread;
-  return;
-}
-
-int
-fhandler_tty_slave::dup (fhandler_base *child)
-{
-  fhandler_console::open_fhs++;
-  fhandler_tty_slave *arch = (fhandler_tty_slave *) archetype;
-  *(fhandler_tty_slave *) child = *arch;
-  arch->usecount++;
-  child->usecount = 0;
-  myself->set_ctty (get_ttyp (), openflags, arch);
-  termios_printf ("incremented open_fhs %d, archetype usecount %d",
-		  fhandler_console::open_fhs, archetype->usecount);
-  return 0;
-}
-
-int
-fhandler_tty_common::dup (fhandler_base *child)
-{
-  fhandler_tty_slave *fts = (fhandler_tty_slave *) child;
-  int errind;
-
-  fts->tcinit (get_ttyp ());
-
-  attach_tty (get_unit ());
-
-  HANDLE nh;
-
-  if (output_done_event == NULL)
-    fts->output_done_event = NULL;
-  else if (!DuplicateHandle (hMainProc, output_done_event, hMainProc,
-			     &fts->output_done_event, 0, 1,
-			     DUPLICATE_SAME_ACCESS))
-    {
-      errind = 1;
-      goto err;
-    }
-  if (ioctl_request_event == NULL)
-    fts->ioctl_request_event = NULL;
-  else if (!DuplicateHandle (hMainProc, ioctl_request_event, hMainProc,
-			     &fts->ioctl_request_event, 0, 1,
-			     DUPLICATE_SAME_ACCESS))
-    {
-      errind = 2;
-      goto err;
-    }
-  if (ioctl_done_event == NULL)
-    fts->ioctl_done_event = NULL;
-  else if (!DuplicateHandle (hMainProc, ioctl_done_event, hMainProc,
-			     &fts->ioctl_done_event, 0, 1,
-			     DUPLICATE_SAME_ACCESS))
-    {
-      errind = 3;
-      goto err;
-    }
-  if (!DuplicateHandle (hMainProc, input_available_event, hMainProc,
-			&fts->input_available_event, 0, 1,
-			DUPLICATE_SAME_ACCESS))
-    {
-      errind = 4;
-      goto err;
-    }
-  if (!DuplicateHandle (hMainProc, output_mutex, hMainProc,
-			&fts->output_mutex, 0, 1,
-			DUPLICATE_SAME_ACCESS))
-    {
-      errind = 5;
-      goto err;
-    }
-  if (!DuplicateHandle (hMainProc, input_mutex, hMainProc,
-			&fts->input_mutex, 0, 1,
-			DUPLICATE_SAME_ACCESS))
-    {
-      errind = 6;
-      goto err;
-    }
-  if (!DuplicateHandle (hMainProc, get_handle (), hMainProc,
-			&nh, 0, 1,
-			DUPLICATE_SAME_ACCESS))
-    {
-      errind = 7;
-      goto err;
-    }
-  fts->set_io_handle (nh);
-
-  if (!DuplicateHandle (hMainProc, get_output_handle (), hMainProc,
-			&nh, 0, 1,
-			DUPLICATE_SAME_ACCESS))
-    {
-      errind = 8;
-      goto err;
-    }
-  fts->set_output_handle (nh);
-
-  if (inuse == NULL)
-    fts->inuse = NULL;
-  else if (!DuplicateHandle (hMainProc, inuse, hMainProc,
-			     &fts->inuse, 0, 1,
-			     DUPLICATE_SAME_ACCESS))
-    {
-      errind = 9;
-      goto err;
-    }
-
-  return 0;
-
-err:
-  __seterrno ();
-  termios_printf ("dup %d failed in DuplicateHandle, %E", errind);
-  return -1;
-}
-
-int
-fhandler_tty_slave::tcgetattr (struct termios *t)
-{
-  *t = get_ttyp ()->ti;
-  return 0;
-}
-
-int
-fhandler_tty_slave::tcsetattr (int, const struct termios *t)
-{
-  acquire_output_mutex (INFINITE);
-  get_ttyp ()->ti = *t;
-  release_output_mutex ();
-  return 0;
-}
-
-int
-fhandler_tty_slave::tcflush (int queue)
-{
-  int ret = 0;
-
-  termios_printf ("tcflush(%d) handle %p", queue, get_handle ());
-
-  if (queue == TCIFLUSH || queue == TCIOFLUSH)
-    {
-      size_t len = UINT_MAX;
-      read (NULL, len);
-      ret = len >= 0;
-    }
-  if (queue == TCOFLUSH || queue == TCIOFLUSH)
-    {
-      /* do nothing for now. */
-    }
-
-  termios_printf ("%d=tcflush(%d)", ret, queue);
-  return ret;
-}
-
-int
-fhandler_tty_slave::ioctl (unsigned int cmd, void *arg)
-{
-  termios_printf ("ioctl (%x)", cmd);
-
-  if (myself->pgid && get_ttyp ()->getpgid () != myself->pgid
-      && myself->ctty == get_unit () && (get_ttyp ()->ti.c_lflag & TOSTOP))
-    {
-      /* background process */
-      termios_printf ("bg ioctl pgid %d, tpgid %d, ctty %d",
-		      myself->pgid, get_ttyp ()->getpgid (), myself->ctty);
-      raise (SIGTTOU);
-    }
-
-  int retval;
-  switch (cmd)
-    {
-    case TIOCGWINSZ:
-    case TIOCSWINSZ:
-    case TIOCLINUX:
-      break;
-    case FIONBIO:
-      set_nonblocking (*(int *) arg);
-      retval = 0;
-      goto out;
-    default:
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  acquire_output_mutex (INFINITE);
-
-  get_ttyp ()->cmd = cmd;
-  get_ttyp ()->ioctl_retval = 0;
-  switch (cmd)
-    {
-    case TIOCGWINSZ:
-      get_ttyp ()->arg.winsize = get_ttyp ()->winsize;
-      if (ioctl_request_event)
-	SetEvent (ioctl_request_event);
-      *(struct winsize *) arg = get_ttyp ()->arg.winsize;
-      if (ioctl_done_event)
-	WaitForSingleObject (ioctl_done_event, INFINITE);
-      get_ttyp ()->winsize = get_ttyp ()->arg.winsize;
-      break;
-    case TIOCSWINSZ:
-      if (get_ttyp ()->winsize.ws_row != ((struct winsize *) arg)->ws_row
-	  || get_ttyp ()->winsize.ws_col != ((struct winsize *) arg)->ws_col)
-	{
-	  if (!ioctl_request_event)
-	    get_ttyp ()->ioctl_retval = -EINVAL;
-	  else
-	    {
-	      get_ttyp ()->arg.winsize = *(struct winsize *) arg;
-	      SetEvent (ioctl_request_event);
-	      get_ttyp ()->winsize = *(struct winsize *) arg;
-	      kill (-get_ttyp ()->getpgid (), SIGWINCH);
-	      if (ioctl_done_event)
-		WaitForSingleObject (ioctl_done_event, INFINITE);
-	    }
-	}
-      break;
-    case TIOCLINUX:
-      int val = *(unsigned char *) arg;
-      if (val != 6 || !ioctl_request_event || !ioctl_done_event)
-	  get_ttyp ()->ioctl_retval = -EINVAL;
-      else
-	{
-	  get_ttyp ()->arg.value = val;
-	  SetEvent (ioctl_request_event);
-	  WaitForSingleObject (ioctl_done_event, INFINITE);
-	  *(unsigned char *) arg = get_ttyp ()->arg.value & 0xFF;
-	}
-      break;
-    }
-
-  release_output_mutex ();
-  retval = get_ttyp ()->ioctl_retval;
-  if (retval < 0)
-    {
-      set_errno (-retval);
-      retval = -1;
-    }
-
-out:
-  termios_printf ("%d = ioctl (%x)", retval, cmd);
-  return retval;
-}
-
-/*******************************************************
- fhandler_pty_master
-*/
-fhandler_pty_master::fhandler_pty_master ()
-  : fhandler_tty_common ()
-{
-}
-
-int
-fhandler_pty_master::open (int flags, mode_t)
-{
-  int ntty = cygwin_shared->tty.allocate_tty (0);
-  if (ntty < 0)
-    return 0;
-
-  slave = *ttys_dev;
-  slave.setunit (ntty);
-  cygwin_shared->tty[ntty]->common_init (this);
-  inuse = get_ttyp ()->create_inuse (TTY_MASTER_ALIVE);
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-  set_open_status ();
-
-  termios_printf ("opened pty master tty%d", get_unit ());
-  return 1;
-}
-
-int
-fhandler_tty_common::close ()
-{
-  termios_printf ("tty%d <%p,%p> closing", get_unit (), get_handle (), get_output_handle ());
-  if (output_done_event && !CloseHandle (output_done_event))
-    termios_printf ("CloseHandle (output_done_event), %E");
-  if (ioctl_done_event && !CloseHandle (ioctl_done_event))
-    termios_printf ("CloseHandle (ioctl_done_event), %E");
-  if (ioctl_request_event && !CloseHandle (ioctl_request_event))
-    termios_printf ("CloseHandle (ioctl_request_event), %E");
-  if (inuse && !CloseHandle (inuse))
-    termios_printf ("CloseHandle (inuse), %E");
-  if (!ForceCloseHandle (input_mutex))
-    termios_printf ("CloseHandle (input_mutex<%p>), %E", input_mutex);
-  if (!ForceCloseHandle (output_mutex))
-    termios_printf ("CloseHandle (output_mutex<%p>), %E", output_mutex);
-
-  /* Send EOF to slaves if master side is closed */
-  if (!get_ttyp ()->master_alive ())
-    {
-      termios_printf ("no more masters left. sending EOF");
-      SetEvent (input_available_event);
-    }
-
-  if (!ForceCloseHandle (input_available_event))
-    termios_printf ("CloseHandle (input_available_event<%p>), %E", input_available_event);
-  if (!ForceCloseHandle1 (get_handle (), from_pty))
-    termios_printf ("CloseHandle (get_handle ()<%p>), %E", get_handle ());
-  if (!ForceCloseHandle1 (get_output_handle (), to_pty))
-    termios_printf ("CloseHandle (get_output_handle ()<%p>), %E", get_output_handle ());
-
-  inuse = NULL;
-  set_io_handle (NULL);
-  return 0;
-}
-
-int
-fhandler_pty_master::close ()
-{
-#if 0
-  while (accept_input () > 0)
-    continue;
-#endif
-  fhandler_tty_common::close ();
-
-  if (!get_ttyp ()->master_alive ())
-    {
-      termios_printf ("freeing tty%d (%d)", get_unit (), get_ttyp ()->ntty);
-#if 0
-      if (get_ttyp ()->to_slave)
-	ForceCloseHandle1 (get_ttyp ()->to_slave, to_slave);
-      if (get_ttyp ()->from_slave)
-	ForceCloseHandle1 (get_ttyp ()->from_slave, from_slave);
-#endif
-      if (get_ttyp ()->from_master)
-	CloseHandle (get_ttyp ()->from_master);
-      if (get_ttyp ()->to_master)
-	CloseHandle (get_ttyp ()->to_master);
-      get_ttyp ()->init ();
-    }
-
-  return 0;
-}
-
-int
-fhandler_pty_master::write (const void *ptr, size_t len)
-{
-  int i;
-  char *p = (char *) ptr;
-  termios ti = tc->ti;
-
-  for (i = 0; i < (int) len; i++)
-    {
-      line_edit_status status = line_edit (p++, 1, ti);
-      if (status > line_edit_signalled)
-	{
-	  if (status != line_edit_pipe_full)
-	    i = -1;
-	  break;
-	}
-    }
-  return i;
-}
-
-void __stdcall
-fhandler_pty_master::read (void *ptr, size_t& len)
-{
-  len = (size_t) process_slave_output ((char *) ptr, len, pktmode);
-  return;
-}
-
-int
-fhandler_pty_master::tcgetattr (struct termios *t)
-{
-  *t = cygwin_shared->tty[get_unit ()]->ti;
-  return 0;
-}
-
-int
-fhandler_pty_master::tcsetattr (int, const struct termios *t)
-{
-  cygwin_shared->tty[get_unit ()]->ti = *t;
-  return 0;
-}
-
-int
-fhandler_pty_master::tcflush (int queue)
-{
-  int ret = 0;
-
-  termios_printf ("tcflush(%d) handle %p", queue, get_handle ());
-
-  if (queue == TCIFLUSH || queue == TCIOFLUSH)
-    ret = process_slave_output (NULL, OUT_BUFFER_SIZE, 0);
-  else if (queue == TCIFLUSH || queue == TCIOFLUSH)
-    {
-      /* do nothing for now. */
-    }
-
-  termios_printf ("%d=tcflush(%d)", ret, queue);
-  return ret;
-}
-
-int
-fhandler_pty_master::ioctl (unsigned int cmd, void *arg)
-{
-  switch (cmd)
-    {
-      case TIOCPKT:
-	pktmode = *(int *) arg;
-	break;
-      case TIOCGWINSZ:
-	*(struct winsize *) arg = get_ttyp ()->winsize;
-	break;
-      case TIOCSWINSZ:
-	if (get_ttyp ()->winsize.ws_row != ((struct winsize *) arg)->ws_row
-	    || get_ttyp ()->winsize.ws_col != ((struct winsize *) arg)->ws_col)
-	  {
-	    get_ttyp ()->winsize = *(struct winsize *) arg;
-	    kill (-get_ttyp ()->getpgid (), SIGWINCH);
-	  }
-	break;
-      case FIONBIO:
-	set_nonblocking (*(int *) arg);
-	break;
-      default:
-	set_errno (EINVAL);
-	return -1;
-    }
-  return 0;
-}
-
-char *
-fhandler_pty_master::ptsname ()
-{
-  static char buf[32];
-
-  __small_sprintf (buf, "/dev/tty%d", get_unit ());
-  return buf;
-}
-
-void
-fhandler_tty_common::set_close_on_exec (int val)
-{
-  if (archetype)
-    set_close_on_exec_flag (val);
-  else
-    {
-      if (output_done_event)
-	set_inheritance (output_done_event, val);
-      if (ioctl_request_event)
-	set_inheritance (ioctl_request_event, val);
-      if (ioctl_done_event)
-	set_inheritance (ioctl_done_event, val);
-      if (inuse)
-	set_inheritance (inuse, val);
-      set_inheritance (output_mutex, val);
-      set_inheritance (input_mutex, val);
-      set_inheritance (input_available_event, val);
-      set_inheritance (output_handle, val);
-#ifndef DEBUGGING
-      fhandler_base::set_close_on_exec (val);
-#else
-      /* FIXME: This is a duplication from fhandler_base::set_close_on_exec.
-	 It is here because we need to specify the "from_pty" stuff here or
-	 we'll get warnings from ForceCloseHandle when debugging. */
-      set_inheritance (get_io_handle (), val);
-      set_close_on_exec_flag (val);
-#endif
-    }
-}
-
-void
-fhandler_tty_slave::fixup_after_fork (HANDLE parent)
-{
-  fhandler_console::open_fhs++;
-  termios_printf ("incremented open_fhs %d", fhandler_console::open_fhs);
-  fhandler_tty_common::fixup_after_fork (parent);
-}
-
-void
-fhandler_tty_common::fixup_after_fork (HANDLE parent)
-{
-  fhandler_termios::fixup_after_fork (parent);
-  if (output_done_event)
-    fork_fixup (parent, output_done_event, "output_done_event");
-  if (ioctl_request_event)
-    fork_fixup (parent, ioctl_request_event, "ioctl_request_event");
-  if (ioctl_done_event)
-    fork_fixup (parent, ioctl_done_event, "ioctl_done_event");
-  if (output_mutex)
-    fork_fixup (parent, output_mutex, "output_mutex");
-  if (input_mutex)
-    fork_fixup (parent, input_mutex, "input_mutex");
-  if (input_available_event)
-    fork_fixup (parent, input_available_event, "input_available_event");
-  fork_fixup (parent, inuse, "inuse");
-}
-
-void
-fhandler_pty_master::set_close_on_exec (int val)
-{
-  fhandler_tty_common::set_close_on_exec (val);
-
-  /* FIXME: There is a console handle leak here. */
-  if (get_ttyp ()->master_pid == GetCurrentProcessId ())
-    {
-      get_ttyp ()->from_slave = get_handle ();
-      get_ttyp ()->to_slave = get_output_handle ();
-      termios_printf ("from_slave %p, to_slave %p", get_handle (),
-		      get_output_handle ());
-    }
-}
-
-void
-fhandler_tty_master::fixup_after_fork (HANDLE child)
-{
-  fhandler_pty_master::fixup_after_fork (child);
-  console->fixup_after_fork (child);
-}
-
-void
-fhandler_tty_master::fixup_after_exec (HANDLE)
-{
-  console->close ();
-  init_console ();
-}
-
-int
-fhandler_tty_master::init_console ()
-{
-  console = (fhandler_console *) build_fh_dev (*console_dev, "/dev/ttym");
-  if (console == NULL)
-    return -1;
-
-  console->init (INVALID_HANDLE_VALUE, GENERIC_READ | GENERIC_WRITE, O_BINARY);
-  fhandler_console::open_fhs--;  /* handled when individual fds are opened */
-  console->set_r_no_interrupt (1);
-  return 0;
-}
diff --git a/winsup/cygwin/fhandler_virtual.cc b/winsup/cygwin/fhandler_virtual.cc
deleted file mode 100644
index 957aaffc2..000000000
--- a/winsup/cygwin/fhandler_virtual.cc
+++ /dev/null
@@ -1,236 +0,0 @@
-/* fhandler_virtual.cc: base fhandler class for virtual filesystems
-
-   Copyright 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/cygwin.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "shared_info.h"
-#include "cygheap.h"
-#include <assert.h>
-
-#include <dirent.h>
-
-fhandler_virtual::fhandler_virtual ():
-  fhandler_base (), filebuf (NULL), bufalloc ((size_t) -1),
-  fileid (-1)
-{
-}
-
-fhandler_virtual::~fhandler_virtual ()
-{
-  if (filebuf)
-    free (filebuf);
-  filebuf = NULL;
-}
-
-void
-fhandler_virtual::fixup_after_exec (HANDLE)
-{
-  if (filebuf)
-    filebuf = NULL;
-}
-
-DIR *
-fhandler_virtual::opendir ()
-{
-  DIR *dir;
-  DIR *res = NULL;
-  size_t len;
-
-  if (exists () <= 0)
-    set_errno (ENOTDIR);
-  else if ((len = strlen (get_name ())) > CYG_MAX_PATH - 3)
-    set_errno (ENAMETOOLONG);
-  else if ((dir = (DIR *) malloc (sizeof (DIR))) == NULL)
-    set_errno (ENOMEM);
-  else if ((dir->__d_dirname = (char *) malloc (len + 3)) == NULL)
-    {
-      free (dir);
-      set_errno (ENOMEM);
-    }
-  else if ((dir->__d_dirent =
-      (struct dirent *) malloc (sizeof (struct dirent))) == NULL)
-    {
-      free (dir);
-      set_errno (ENOMEM);
-    }
-  else
-    {
-      strcpy (dir->__d_dirname, get_name ());
-      dir->__d_dirent->d_version = __DIRENT_VERSION;
-      cygheap_fdnew fd;
-      if (fd >= 0)
-	{
-	  fd = this;
-	  fd->set_nohandle (true);
-	  dir->__d_dirent->d_fd = fd;
-	  dir->__fh = this;
-	  dir->__d_cookie = __DIRENT_COOKIE;
-	  dir->__handle = INVALID_HANDLE_VALUE;
-	  dir->__d_position = 0;
-	  dir->__d_dirhash = get_namehash ();
-
-	  res = dir;
-	}
-    }
-
-  syscall_printf ("%p = opendir (%s)", res, get_name ());
-  return res;
-}
-
-_off64_t fhandler_virtual::telldir (DIR * dir)
-{
-  return dir->__d_position;
-}
-
-void
-fhandler_virtual::seekdir (DIR * dir, _off64_t loc)
-{
-  dir->__d_position = loc;
-  return;
-}
-
-void
-fhandler_virtual::rewinddir (DIR * dir)
-{
-  dir->__d_position = 0;
-  return;
-}
-
-int
-fhandler_virtual::closedir (DIR * dir)
-{
-  return 0;
-}
-
-_off64_t
-fhandler_virtual::lseek (_off64_t offset, int whence)
-{
-  /*
-   * On Linux, when you lseek within a /proc file,
-   * the contents of the file are updated.
-   */
-  if (!fill_filebuf ())
-    return (_off64_t) -1;
-  switch (whence)
-    {
-    case SEEK_SET:
-      position = offset;
-      break;
-    case SEEK_CUR:
-      position += offset;
-      break;
-    case SEEK_END:
-      position = filesize + offset;
-      break;
-    default:
-      set_errno (EINVAL);
-      return (_off64_t) -1;
-    }
-  return position;
-}
-
-int
-fhandler_virtual::dup (fhandler_base * child)
-{
-  int ret = fhandler_base::dup (child);
-
-  if (!ret)
-    {
-      fhandler_virtual *fhproc_child = (fhandler_virtual *) child;
-      fhproc_child->filebuf = (char *) malloc (filesize);
-      fhproc_child->bufalloc = fhproc_child->filesize = filesize;
-      fhproc_child->position = position;
-      memcpy (fhproc_child->filebuf, filebuf, filesize);
-      fhproc_child->set_flags (get_flags ());
-    }
-  return ret;
-}
-
-int
-fhandler_virtual::close ()
-{
-  if (filebuf)
-    free (filebuf);
-  filebuf = NULL;
-  bufalloc = (size_t) -1;
-  user_shared->delqueue.process_queue ();
-  return 0;
-}
-
-void
-fhandler_virtual::read (void *ptr, size_t& len)
-{
-  if (len == 0)
-    return;
-  if (openflags & O_DIROPEN)
-    {
-      set_errno (EISDIR);
-      len = (size_t) -1;
-      return;
-    }
-  if (!filebuf)
-    {
-      len = (size_t) 0;
-      return;
-    }
-  if ((ssize_t) len > filesize - position)
-    len = (size_t) (filesize - position);
-  if ((ssize_t) len < 0)
-    len = 0;
-  else
-    memcpy (ptr, filebuf + position, len);
-  position += len;
-}
-
-int
-fhandler_virtual::write (const void *ptr, size_t len)
-{
-  set_errno (EACCES);
-  return -1;
-}
-
-/* low-level open for all proc files */
-int
-fhandler_virtual::open (int flags, mode_t mode)
-{
-  set_r_binary (1);
-  set_w_binary (1);
-
-  set_has_acls (false);
-  set_isremote (false);
-
-  /* what to do about symlinks? */
-  set_symlink_p (false);
-  set_execable_p (not_executable);
-  set_socket_p (false);
-
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-
-  return 1;
-}
-
-int
-fhandler_virtual::exists ()
-{
-  return 0;
-}
-
-bool
-fhandler_virtual::fill_filebuf ()
-{
-  return true;
-}
diff --git a/winsup/cygwin/fhandler_windows.cc b/winsup/cygwin/fhandler_windows.cc
deleted file mode 100644
index 5964052fa..000000000
--- a/winsup/cygwin/fhandler_windows.cc
+++ /dev/null
@@ -1,147 +0,0 @@
-/* fhandler_windows.cc: code to access windows message queues.
-
-   Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-   Written by Sergey S. Okhapkin (sos@prospect.com.ru).
-   Feedback and testing by Andy Piper (andyp@parallax.co.uk).
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-
-/*
-The following unix-style calls are supported:
-
-	open ("/dev/windows", flags, mode=0)
-		- create a unix fd for message queue.
-		  O_NONBLOCK flag controls the read() call behavior.
-
-	read (fd, buf, len)
-		- return next message from queue. buf must point to MSG
-		  structure, len must be >= sizeof (MSG). If read is set to
-		  non-blocking and the queue is empty, read call returns -1
-		  immediately with errno set to EAGAIN, otherwise it blocks
-		  untill the message will be received.
-
-	write (fd, buf, len)
-		- send a message pointed by buf. len argument ignored.
-
-	ioctl (fd, command, *param)
-		- control read()/write() behavior.
-		ioctl (fd, WINDOWS_POST, NULL): write() will PostMessage();
-		ioctl (fd, WINDOWS_SEND, NULL): write() will SendMessage();
-		ioctl (fd, WINDOWS_HWND, &hWnd): read() messages for
-			hWnd window.
-
-	select () call marks read fd when any message posted to queue.
-*/
-
-fhandler_windows::fhandler_windows ()
-  : fhandler_base (), hWnd_ (NULL), method_ (WINDOWS_POST)
-{
-}
-
-int
-fhandler_windows::open (int flags, mode_t)
-{
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-  set_close_on_exec_flag (1);
-  set_open_status ();
-  return 1;
-}
-
-int
-fhandler_windows::write (const void *buf, size_t)
-{
-  MSG *ptr = (MSG *) buf;
-
-  if (method_ == WINDOWS_POST)
-    {
-      if (!PostMessage (ptr->hwnd, ptr->message, ptr->wParam, ptr->lParam))
-	{
-	  __seterrno ();
-	  return -1;
-	}
-      else
-	return sizeof (MSG);
-    }
-  else
-    return SendMessage (ptr->hwnd, ptr->message, ptr->wParam, ptr->lParam);
-}
-
-void __stdcall
-fhandler_windows::read (void *buf, size_t& len)
-{
-  MSG *ptr = (MSG *) buf;
-
-  if (len < sizeof (MSG))
-    {
-      set_errno (EINVAL);
-      len = (size_t) -1;
-      return;
-    }
-
-  len = (size_t) GetMessage (ptr, hWnd_, 0, 0);
-
-  if ((ssize_t) len == -1)
-    __seterrno ();
-  else
-    set_errno (0);
-  return;
-}
-
-int
-fhandler_windows::ioctl (unsigned int cmd, void *val)
-{
-  switch (cmd)
-    {
-    case WINDOWS_POST:
-    case WINDOWS_SEND:
-      method_ = cmd;
-      break;
-    case WINDOWS_HWND:
-      if (val == NULL)
-	{
-	  set_errno (EINVAL);
-	  return -1;
-	}
-      hWnd_ = * ((HWND *) val);
-      break;
-    default:
-      set_errno (EINVAL);
-      return -1;
-    }
-  return 0;
-}
-
-void
-fhandler_windows::set_close_on_exec (int val)
-{
-  if (get_handle ())
-    fhandler_base::set_close_on_exec (val);
-  else
-    fhandler_base::set_close_on_exec_flag (val);
-  void *h = hWnd_;
-  if (h)
-    set_inheritance (h, val);
-}
-
-void
-fhandler_windows::fixup_after_fork (HANDLE parent)
-{
-  if (get_handle ())
-    fhandler_base::fixup_after_fork (parent);
-  void *h = hWnd_;
-  if (h)
-    fork_fixup (parent, h, "hWnd_");
-}
diff --git a/winsup/cygwin/fhandler_zero.cc b/winsup/cygwin/fhandler_zero.cc
deleted file mode 100644
index 46bf5bf48..000000000
--- a/winsup/cygwin/fhandler_zero.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-/* fhandler_dev_zero.cc: code to access /dev/zero
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-   Written by DJ Delorie (dj@cygnus.com)
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <errno.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-
-fhandler_dev_zero::fhandler_dev_zero ()
-  : fhandler_base ()
-{
-}
-
-int
-fhandler_dev_zero::open (int flags, mode_t)
-{
-  set_flags ((flags & ~O_TEXT) | O_BINARY);
-  set_nohandle (true);
-  set_open_status ();
-  return 1;
-}
-
-int
-fhandler_dev_zero::write (const void *, size_t len)
-{
-  return len;
-}
-
-void __stdcall
-fhandler_dev_zero::read (void *ptr, size_t& len)
-{
-  memset (ptr, 0, len);
-  return;
-}
-
-_off64_t
-fhandler_dev_zero::lseek (_off64_t, int)
-{
-  return 0;
-}
-
-void
-fhandler_dev_zero::dump ()
-{
-  paranoid_printf ("here, fhandler_dev_zero");
-}
diff --git a/winsup/cygwin/flock.cc b/winsup/cygwin/flock.cc
deleted file mode 100644
index b15962d94..000000000
--- a/winsup/cygwin/flock.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-/* One of many ways to emulate flock() on top of real (good) POSIX locks.
- *
- * This flock() emulation is based upon source taken from the Red Hat
- * implementation used in their imap-2002d SRPM.
- *
- * $RH: flock.c,v 1.2 2000/08/23 17:07:00 nalin Exp $
- */
-/* flock.c
-
-   Copyright 2003 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include "winsup.h"
-#include "cygerrno.h"
-#include <sys/file.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-int
-flock (int fd, int operation)
-{
-  int i, cmd;
-  struct __flock64 l = { 0, 0, 0, 0, 0 };
-  if (operation & LOCK_NB)
-    {
-      cmd = F_SETLK;
-    }
-  else
-    {
-      cmd = F_SETLKW;
-    }
-  l.l_whence = SEEK_SET;
-  switch (operation & (~LOCK_NB))
-    {
-    case LOCK_EX:
-      l.l_type = F_WRLCK;
-      i = fcntl_worker (fd, cmd, &l);
-      if (i == -1)
-	{
-	  if ((get_errno () == EAGAIN) || (get_errno () == EACCES))
-	    {
-	      set_errno (EWOULDBLOCK);
-	    }
-	}
-      break;
-    case LOCK_SH:
-      l.l_type = F_RDLCK;
-      i = fcntl_worker (fd, cmd, &l);
-      if (i == -1)
-	{
-	  if ((get_errno () == EAGAIN) || (get_errno () == EACCES))
-	    {
-	      set_errno (EWOULDBLOCK);
-	    }
-	}
-      break;
-    case LOCK_UN:
-      l.l_type = F_UNLCK;
-      i = fcntl_worker (fd, cmd, &l);
-      if (i == -1)
-	{
-	  if ((get_errno () == EAGAIN) || (get_errno () == EACCES))
-	    {
-	      set_errno (EWOULDBLOCK);
-	    }
-	}
-      break;
-    default:
-      i = -1;
-      set_errno (EINVAL);
-      break;
-    }
-  return i;
-}
-
-#ifdef FLOCK_EMULATE_IS_MAIN
-int
-main (int argc, char **argv)
-{
-  int fd = open (argv[1], O_WRONLY);
-  flock (fd, LOCK_EX);
-  return 0;
-}
-#endif
diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
deleted file mode 100644
index 66f83a033..000000000
--- a/winsup/cygwin/fork.cc
+++ /dev/null
@@ -1,747 +0,0 @@
-/* fork.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include "cygheap.h"
-#include "child_info.h"
-#define NEED_VFORK
-#include "perthread.h"
-#include "perprocess.h"
-#include "dll_init.h"
-#include "sync.h"
-#include "shared_info.h"
-#include "cygmalloc.h"
-#include "cygthread.h"
-
-#ifdef DEBUGGING
-static int npid;
-static int npid_max;
-static pid_t fork_pids[100];
-#endif
-
-/* Timeout to wait for child to start, parent to init child, etc.  */
-/* FIXME: Once things stabilize, bump up to a few minutes.  */
-#define FORK_WAIT_TIMEOUT (300 * 1000)     /* 300 seconds */
-
-#define dll_data_start &_data_start__
-#define dll_data_end &_data_end__
-#define dll_bss_start &_bss_start__
-#define dll_bss_end &_bss_end__
-
-void
-per_thread::set (void *s)
-{
-  if (s == PER_THREAD_FORK_CLEAR)
-    {
-      tls = TlsAlloc ();
-      s = NULL;
-    }
-  TlsSetValue (get_tls (), s);
-}
-
-static void
-stack_base (child_info_fork &ch)
-{
-  MEMORY_BASIC_INFORMATION m;
-  memset (&m, 0, sizeof m);
-  if (!VirtualQuery ((LPCVOID) &m, &m, sizeof m))
-    system_printf ("couldn't get memory info, %E");
-
-  ch.stacktop = m.AllocationBase;
-  ch.stackbottom = (LPBYTE) m.BaseAddress + m.RegionSize;
-  ch.stacksize = (DWORD) ch.stackbottom - (DWORD) &m;
-  debug_printf ("bottom %p, top %p, stack %p, size %d, reserve %d",
-		ch.stackbottom, ch.stacktop, &m, ch.stacksize,
-		(DWORD) ch.stackbottom - (DWORD) ch.stacktop);
-}
-
-/* Copy memory from parent to child.
-   The result is a boolean indicating success.  */
-
-static int
-fork_copy (PROCESS_INFORMATION &pi, const char *what, ...)
-{
-  va_list args;
-  char *low;
-  int pass = 0;
-
-  va_start (args, what);
-
-  while ((low = va_arg (args, char *)))
-    {
-      char *high = va_arg (args, char *);
-      DWORD todo = wincap.chunksize () ?: high - low;
-      char *here;
-
-      for (here = low; here < high; here += todo)
-	{
-	  DWORD done = 0;
-	  if (here + todo > high)
-	    todo = high - here;
-	  int res = WriteProcessMemory (pi.hProcess, here, here, todo, &done);
-	  debug_printf ("child handle %p, low %p, high %p, res %d", pi.hProcess,
-			low, high, res);
-	  if (!res || todo != done)
-	    {
-	      if (!res)
-		__seterrno ();
-	      /* If this happens then there is a bug in our fork
-		 implementation somewhere. */
-	      system_printf ("%s pass %d failed, %p..%p, done %d, windows pid %u, %E",
-			    what, pass, low, high, done, pi.dwProcessId);
-	      goto err;
-	    }
-	}
-
-      pass++;
-    }
-
-  debug_printf ("done");
-  return 1;
-
- err:
-  TerminateProcess (pi.hProcess, 1);
-  set_errno (EAGAIN);
-  return 0;
-}
-
-/* Wait for child to finish what it's doing and signal us.
-   We don't want to wait forever here.If there's a problem somewhere
-   it'll hang the entire system (since all forks are mutex'd). If we
-   time out, set errno = EAGAIN and hope the app tries again.  */
-static int
-sync_with_child (PROCESS_INFORMATION &pi, HANDLE subproc_ready,
-		 bool hang_child, const char *s)
-{
-  /* We also add the child process handle to the wait. If the child fails
-     to initialize (eg. because of a missing dll). Then this
-     handle will become signalled. This stops a *looong* timeout wait.
-  */
-  HANDLE w4[2];
-
-  debug_printf ("waiting for child.  reason: %s, hang_child %d", s,
-		hang_child);
-  w4[1] = pi.hProcess;
-  w4[0] = subproc_ready;
-  DWORD rc = WaitForMultipleObjects (2, w4, FALSE, FORK_WAIT_TIMEOUT);
-
-  if (rc == WAIT_OBJECT_0 ||
-      WaitForSingleObject (subproc_ready, 0) == WAIT_OBJECT_0)
-    /* That's ok */;
-  else if (rc == WAIT_FAILED || rc == WAIT_TIMEOUT)
-    {
-      if (rc != WAIT_FAILED)
-	system_printf ("WaitForMultipleObjects timed out");
-      else
-	system_printf ("WaitForMultipleObjects failed, %E");
-      set_errno (EAGAIN);
-      syscall_printf ("-1 = fork(), WaitForMultipleObjects failed");
-      TerminateProcess (pi.hProcess, 1);
-      return 0;
-    }
-  else
-    {
-      /* Child died. Clean up and exit. */
-      DWORD errcode;
-      GetExitCodeProcess (pi.hProcess, &errcode);
-      /* Fix me.  This is not enough.  The fork should not be considered
-       * to have failed if the process was essentially killed by a signal.
-       */
-      if (errcode != STATUS_CONTROL_C_EXIT)
-	{
-	    system_printf ("child %d(%p) died before initialization with status code %p",
-			  pi.dwProcessId, pi.hProcess, errcode);
-	    system_printf ("*** child state %s", s);
-#ifdef DEBUGGING
-	    abort ();
-#endif
-	}
-      set_errno (EAGAIN);
-      syscall_printf ("Child died before subproc_ready signalled");
-      return 0;
-    }
-
-  debug_printf ("child signalled me");
-  return 1;
-}
-
-static int
-resume_child (PROCESS_INFORMATION &pi, HANDLE forker_finished)
-{
-  SetEvent (forker_finished);
-  debug_printf ("signalled child");
-  return 1;
-}
-
-/* Notify parent that it is time for the next step.
-   Note that this has to be a macro since the parent may be messing with
-   our stack. */
-static void __stdcall
-sync_with_parent (const char *s, bool hang_self)
-{
-  debug_printf ("signalling parent: %s", s);
-  /* Tell our parent we're waiting. */
-  if (!SetEvent (fork_info->subproc_ready))
-    api_fatal ("fork child - SetEvent for %s failed, %E", s);
-  if (hang_self)
-    {
-      HANDLE h = fork_info->forker_finished;
-      /* Wait for the parent to fill in our stack and heap.
-	 Don't wait forever here.  If our parent dies we don't want to clog
-	 the system.  If the wait fails, we really can't continue so exit.  */
-      DWORD psync_rc = WaitForSingleObject (h, FORK_WAIT_TIMEOUT);
-      debug_printf ("awake");
-      switch (psync_rc)
-	{
-	case WAIT_TIMEOUT:
-	  api_fatal ("WFSO timed out for %s", s);
-	  break;
-	case WAIT_FAILED:
-	  if (GetLastError () == ERROR_INVALID_HANDLE &&
-	      WaitForSingleObject (fork_info->forker_finished, 1) != WAIT_FAILED)
-	    break;
-	  api_fatal ("WFSO failed for %s, fork_finished %p, %E", s,
-		     fork_info->forker_finished);
-	  break;
-	default:
-	  debug_printf ("no problems");
-	  break;
-	}
-    }
-}
-
-static int __stdcall
-fork_child (HANDLE& hParent, dll *&first_dll, bool& load_dlls)
-{
-  debug_printf ("child is running.  pid %d, ppid %d, stack here %p",
-		myself->pid, myself->ppid, __builtin_frame_address (0));
-
-  /* Restore the inheritance state as in parent
-     Don't call setuid here! The flags are already set. */
-  cygheap->user.reimpersonate ();
-
-  sync_with_parent ("after longjmp", true);
-  sigproc_printf ("hParent %p, child 1 first_dll %p, load_dlls %d", hParent,
-		  first_dll, load_dlls);
-
-#ifdef DEBUGGING
-  char c;
-  if (GetEnvironmentVariable ("FORKDEBUG", &c, 1))
-    try_to_debug ();
-  char buf[80];
-  /* This is useful for debugging fork problems.  Use gdb to attach to
-     the pid reported here. */
-  if (GetEnvironmentVariable ("CYGWIN_FORK_SLEEP", buf, sizeof (buf)))
-    {
-      small_printf ("Sleeping %d after fork, pid %u\n", atoi (buf), GetCurrentProcessId ());
-      Sleep (atoi (buf));
-    }
-#endif
-
-  /* If we've played with the stack, stacksize != 0.  That means that
-     fork() was invoked from other than the main thread.  Make sure that
-     when the "main" thread exits it calls do_exit, like a normal process.
-     Exit with a status code of 0. */
-  if (fork_info->stacksize)
-    {
-      _main_tls = &_my_tls;
-      _my_tls.init_thread (NULL);
-    }
-
-  set_file_api_mode (current_codepage);
-
-  MALLOC_CHECK;
-
-  if (fixup_mmaps_after_fork (hParent))
-    api_fatal ("recreate_mmaps_after_fork_failed");
-
-
-  MALLOC_CHECK;
-
-  /* If we haven't dynamically loaded any dlls, just signal
-     the parent.  Otherwise, load all the dlls, tell the parent
-      that we're done, and wait for the parent to fill in the.
-      loaded dlls' data/bss. */
-  if (!load_dlls)
-    {
-      cygheap->fdtab.fixup_after_fork (hParent);
-      ProtectHandleINH (hParent);
-      sync_with_parent ("performed fork fixup", false);
-    }
-  else
-    {
-      dlls.load_after_fork (hParent, first_dll);
-      cygheap->fdtab.fixup_after_fork (hParent);
-      ProtectHandleINH (hParent);
-      sync_with_parent ("loaded dlls", true);
-    }
-
-  ForceCloseHandle (hParent);
-  (void) ForceCloseHandle1 (fork_info->subproc_ready, subproc_ready);
-  (void) ForceCloseHandle1 (fork_info->forker_finished, forker_finished);
-
-#ifdef USE_SERVER
-  if (fixup_shms_after_fork ())
-    api_fatal ("recreate_shm areas after fork failed");
-#endif
-
-  pinfo_fixup_after_fork ();
-  signal_fixup_after_fork ();
-
-  /* Set thread local stuff to zero.  Under Windows 95/98 this is sometimes
-     non-zero, for some reason.
-     FIXME:  There is a memory leak here after a fork. */
-  for (per_thread **t = threadstuff; *t; t++)
-    if ((*t)->clear_on_fork ())
-      (*t)->set ();
-
-  pthread::atforkchild ();
-  wait_for_sigthread ();
-  cygbench ("fork-child");
-  return 0;
-}
-
-#ifndef NO_SLOW_PID_REUSE
-static void
-slow_pid_reuse (HANDLE h)
-{
-  static NO_COPY HANDLE last_fork_procs[4] = {0};
-  static NO_COPY unsigned nfork_procs = 0;
-
-  if (nfork_procs >= (sizeof (last_fork_procs) / sizeof (last_fork_procs [0])))
-    nfork_procs = 0;
-  /* Keep a list of handles to forked processes sitting around to prevent
-     Windows from reusing the same pid n times in a row.  Having the same pids
-     close in succesion confuses bash.  Keeping a handle open will stop
-     windows from reusing the same pid.  */
-  if (last_fork_procs[nfork_procs])
-    ForceCloseHandle1 (last_fork_procs[nfork_procs], fork_stupidity);
-  if (DuplicateHandle (hMainProc, h, hMainProc, &last_fork_procs[nfork_procs],
-			0, FALSE, DUPLICATE_SAME_ACCESS))
-    ProtectHandle1 (last_fork_procs[nfork_procs], fork_stupidity);
-  else
-    {
-      last_fork_procs[nfork_procs] = NULL;
-      system_printf ("couldn't create last_fork_proc, %E");
-    }
-  nfork_procs++;
-}
-#endif
-
-static int __stdcall
-fork_parent (HANDLE& hParent, dll *&first_dll,
-	     bool& load_dlls, void *stack_here, child_info_fork &ch)
-{
-  HANDLE subproc_ready, forker_finished;
-  DWORD rc;
-  PROCESS_INFORMATION pi = {0, NULL, 0, 0};
-
-  pthread::atforkprepare ();
-
-  subproc_init ();
-
-  int c_flags = GetPriorityClass (hMainProc) /*|
-		CREATE_NEW_PROCESS_GROUP*/;
-  STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL};
-
-  /* If we don't have a console, then don't create a console for the
-     child either.  */
-  HANDLE console_handle = CreateFile ("CONOUT$", GENERIC_WRITE,
-				      FILE_SHARE_WRITE, &sec_none_nih,
-				      OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
-				      NULL);
-
-  if (console_handle != INVALID_HANDLE_VALUE)
-    CloseHandle (console_handle);
-  else
-    c_flags |= DETACHED_PROCESS;
-
-  /* Some file types (currently only sockets) need extra effort in the
-     parent after CreateProcess and before copying the datastructures
-     to the child. So we have to start the child in suspend state,
-     unfortunately, to avoid a race condition. */
-  if (cygheap->fdtab.need_fixup_before ())
-    c_flags |= CREATE_SUSPENDED;
-
-  /* Create an inheritable handle to pass to the child process.  This will
-     allow the child to duplicate handles from the parent to itself. */
-  hParent = NULL;
-  if (!DuplicateHandle (hMainProc, hMainProc, hMainProc, &hParent, 0, 1,
-			DUPLICATE_SAME_ACCESS))
-    {
-      system_printf ("couldn't create handle to myself for child, %E");
-      return -1;
-    }
-
-  /* Remember the address of the first loaded dll and decide
-     if we need to load dlls.  We do this here so that this
-     information will be available in the parent and, when
-     the stack is copied, in the child. */
-  first_dll = dlls.start.next;
-  load_dlls = dlls.reload_on_fork && dlls.loaded_dlls;
-
-  /* This will help some of the confusion.  */
-  fflush (stdout);
-
-  subproc_ready = CreateEvent (&sec_all, FALSE, FALSE, NULL);
-  if (subproc_ready == NULL)
-    {
-      CloseHandle (hParent);
-      system_printf ("unable to allocate subproc_ready event, %E");
-      return -1;
-    }
-  forker_finished = CreateEvent (&sec_all, FALSE, FALSE, NULL);
-  if (forker_finished == NULL)
-    {
-      CloseHandle (hParent);
-      CloseHandle (subproc_ready);
-      system_printf ("unable to allocate forker_finished event, %E");
-      return -1;
-    }
-
-  ProtectHandleINH (subproc_ready);
-  ProtectHandleINH (forker_finished);
-
-  init_child_info (PROC_FORK, &ch, 1, subproc_ready);
-
-  ch.forker_finished = forker_finished;
-
-  stack_base (ch);
-
-  si.cb = sizeof (STARTUPINFO);
-  si.lpReserved2 = (LPBYTE)&ch;
-  si.cbReserved2 = sizeof (ch);
-
-  /* Remove impersonation */
-  cygheap->user.deimpersonate ();
-
-  ch.parent = hParent;
-#ifdef DEBUGGING
-  if (npid_max)
-    {
-      for (int pass = 0; pass < 2; pass++)
-	{
-	  pid_t pid;
-	  while ((pid = fork_pids[npid++]))
-	    if (!pinfo (pid))
-	      {
-		ch.cygpid = pid;
-		goto out;
-	      }
-	  npid = 0;
-	}
-    }
- out:
-#endif
-
-  char sa_buf[1024];
-  PSECURITY_ATTRIBUTES sec_attribs = sec_user_nih (sa_buf);
-  syscall_printf ("CreateProcess (%s, %s, 0, 0, 1, %x, 0, 0, %p, %p)",
-		  myself->progname, myself->progname, c_flags, &si, &pi);
-  __malloc_lock ();
-  void *newheap;
-  newheap = cygheap_setup_for_child (&ch, cygheap->fdtab.need_fixup_before ());
-  rc = CreateProcess (myself->progname, /* image to run */
-		      myself->progname, /* what we send in arg0 */
-		      sec_attribs,
-		      sec_attribs,
-		      TRUE,	  /* inherit handles from parent */
-		      c_flags,
-		      NULL,	  /* environment filled in later */
-		      0,	  /* use current drive/directory */
-		      &si,
-		      &pi);
-
-  CloseHandle (hParent);
-
-  if (!rc)
-    {
-      __seterrno ();
-      syscall_printf ("CreateProcessA failed, %E");
-      ForceCloseHandle (subproc_ready);
-      ForceCloseHandle (forker_finished);
-      /* Restore impersonation */
-      cygheap->user.reimpersonate ();
-      cygheap_setup_for_child_cleanup (newheap, &ch, 0);
-      return -1;
-    }
-
-  /* Fixup the parent datastructure if needed and resume the child's
-     main thread. */
-  if (!cygheap->fdtab.need_fixup_before ())
-    cygheap_setup_for_child_cleanup (newheap, &ch, 0);
-  else
-    {
-      cygheap->fdtab.fixup_before_fork (pi.dwProcessId);
-      cygheap_setup_for_child_cleanup (newheap, &ch, 1);
-      ResumeThread (pi.hThread);
-    }
-
-#ifdef DEBUGGING
-  pinfo forked ((ch.cygpid != 1 ? ch.cygpid : cygwin_pid (pi.dwProcessId)), 1);
-#else
-  pinfo forked (cygwin_pid (pi.dwProcessId), 1);
-#endif
-  if (!forked)
-    {
-      syscall_printf ("pinfo failed");
-      if (get_errno () != ENOMEM)
-	set_errno (EAGAIN);
-      goto cleanup;
-    }
-
-  /* Initialize things that are done later in dll_crt0_1 that aren't done
-     for the forkee.  */
-  strcpy (forked->progname, myself->progname);
-
-  /* Restore impersonation */
-  cygheap->user.reimpersonate ();
-
-  ProtectHandle (pi.hThread);
-  /* Protect the handle but name it similarly to the way it will
-     be called in subproc handling. */
-  ProtectHandle1 (pi.hProcess, childhProc);
-
-  /* Fill in fields in the child's process table entry.  */
-  forked->hProcess = pi.hProcess;
-  forked->dwProcessId = pi.dwProcessId;
-
-  /* Hopefully, this will succeed.  The alternative to doing things this
-     way is to reserve space prior to calling CreateProcess and then fill
-     it in afterwards.  This requires more bookkeeping than I like, though,
-     so we'll just do it the easy way.  So, terminate any child process if
-     we can't actually record the pid in the internal table. */
-  if (!forked.remember ())
-    {
-      TerminateProcess (pi.hProcess, 1);
-      set_errno (EAGAIN);
-      goto cleanup;
-    }
-
-#ifndef NO_SLOW_PID_REUSE
-  slow_pid_reuse (pi.hProcess);
-#endif
-
-  /* Wait for subproc to initialize itself. */
-  if (!sync_with_child (pi, subproc_ready, true, "waiting for longjmp"))
-    goto cleanup;
-
-  /* CHILD IS STOPPED */
-  debug_printf ("child is alive (but stopped)");
-
-  /* Initialize, in order: data, bss, heap, stack, dll data, dll bss
-     Note: variables marked as NO_COPY will not be copied
-     since they are placed in a protected segment. */
-
-
-  MALLOC_CHECK;
-  rc = fork_copy (pi, "user/cygwin data",
-		  user_data->data_start, user_data->data_end,
-		  user_data->bss_start, user_data->bss_end,
-		  cygheap->user_heap.base, cygheap->user_heap.ptr,
-		  stack_here, ch.stackbottom,
-		  dll_data_start, dll_data_end,
-		  dll_bss_start, dll_bss_end, NULL);
-
-  __malloc_unlock ();
-  MALLOC_CHECK;
-  if (!rc)
-    goto cleanup;
-
-  /* Now fill data/bss of any DLLs that were linked into the program. */
-  for (dll *d = dlls.istart (DLL_LINK); d; d = dlls.inext ())
-    {
-      debug_printf ("copying data/bss of a linked dll");
-      if (!fork_copy (pi, "linked dll data/bss", d->p.data_start, d->p.data_end,
-						 d->p.bss_start, d->p.bss_end,
-						 NULL))
-	goto cleanup;
-    }
-
-  /* Start thread, and wait for it to reload dlls.  */
-  if (!resume_child (pi, forker_finished) ||
-      !sync_with_child (pi, subproc_ready, load_dlls, "child loading dlls"))
-    goto cleanup;
-
-  /* If DLLs were loaded in the parent, then the child has reloaded all
-     of them and is now waiting to have all of the individual data and
-     bss sections filled in. */
-  if (load_dlls)
-    {
-      /* CHILD IS STOPPED */
-      /* write memory of reloaded dlls */
-      for (dll *d = dlls.istart (DLL_LOAD); d; d = dlls.inext ())
-	{
-	  debug_printf ("copying data/bss for a loaded dll");
-	  if (!fork_copy (pi, "loaded dll data/bss", d->p.data_start, d->p.data_end,
-						     d->p.bss_start, d->p.bss_end,
-						     NULL))
-	    goto cleanup;
-	}
-      /* Start the child up again. */
-      (void) resume_child (pi, forker_finished);
-    }
-
-  ForceCloseHandle (subproc_ready);
-  ForceCloseHandle (pi.hThread);
-  ForceCloseHandle (forker_finished);
-  forker_finished = NULL;
-  pi.hThread = NULL;
-  pthread::atforkparent ();
-
-  return forked->pid;
-
-/* Common cleanup code for failure cases */
- cleanup:
-  /* Remember to de-allocate the fd table. */
-  if (pi.hProcess)
-    ForceCloseHandle1 (pi.hProcess, childhProc);
-  if (pi.hThread)
-    ForceCloseHandle (pi.hThread);
-  if (subproc_ready)
-    ForceCloseHandle (subproc_ready);
-  if (forker_finished)
-    ForceCloseHandle (forker_finished);
-  return -1;
-}
-
-extern "C" int
-fork ()
-{
-  struct
-  {
-    HANDLE hParent;
-    dll *first_dll;
-    bool load_dlls;
-  } grouped;
-
-  MALLOC_CHECK;
-
-  debug_printf ("entering");
-  grouped.hParent = grouped.first_dll = NULL;
-  grouped.load_dlls = 0;
-
-  void *esp;
-  __asm__ volatile ("movl %%esp,%0": "=r" (esp));
-
-  myself->set_has_pgid_children ();
-
-  child_info_fork ch;
-
-  int res = setjmp (ch.jmp);
-
-  if (res)
-    res = fork_child (grouped.hParent, grouped.first_dll, grouped.load_dlls);
-  else
-    res = fork_parent (grouped.hParent, grouped.first_dll, grouped.load_dlls, esp, ch);
-
-  MALLOC_CHECK;
-  syscall_printf ("%d = fork()", res);
-  return res;
-}
-#ifdef DEBUGGING
-void
-fork_init ()
-{
-  char buf[1024];
-  if (!GetEnvironmentVariable ("CYGWIN_FORK_PIDS", buf, 1024))
-    return;
-  pid_t pid;
-  char *p, *pe;
-  for (p = buf; (pid = strtol (p, &pe, 10)); p = pe)
-    fork_pids[npid_max++] = pid;
-}
-#endif /*DEBUGGING*/
-
-#ifdef NEWVFORK
-/* Dummy function to force second assignment below to actually be
-   carried out */
-static vfork_save *
-get_vfork_val ()
-{
-  return vfork_storage.val ();
-}
-#endif
-
-extern "C" int
-vfork ()
-{
-#ifndef NEWVFORK
-  return fork ();
-#else
-  vfork_save *vf = get_vfork_val ();
-  char **esp, **pp;
-
-  if (vf == NULL)
-    vf = vfork_storage.create ();
-  else if (vf->pid)
-    return fork ();
-
-  // FIXME the tls stuff could introduce a signal race if a child process
-  // exits quickly.
-  if (!setjmp (vf->j))
-    {
-      vf->pid = -1;
-      __asm__ volatile ("movl %%esp,%0": "=r" (vf->vfork_esp):);
-      __asm__ volatile ("movl %%ebp,%0": "=r" (vf->vfork_ebp):);
-      for (pp = (char **) vf->frame, esp = vf->vfork_esp;
-	   esp <= vf->vfork_ebp + 2; pp++, esp++)
-	*pp = *esp;
-      vf->ctty = myself->ctty;
-      vf->sid = myself->sid;
-      vf->pgid = myself->pgid;
-      int res = cygheap->fdtab.vfork_child_dup () ? 0 : -1;
-      debug_printf ("%d = vfork()", res);
-      call_signal_handler_now (); // FIXME: racy
-      vf->tls = _my_tls;
-      return res;
-    }
-
-  vf = get_vfork_val ();
-
-  for (pp = (char **) vf->frame, esp = vf->vfork_esp;
-       esp <= vf->vfork_ebp + 2; pp++, esp++)
-    *esp = *pp;
-
-  cygheap->fdtab.vfork_parent_restore ();
-
-  myself->ctty = vf->ctty;
-  myself->sid = vf->sid;
-  myself->pgid = vf->pgid;
-
-  if (vf->pid < 0)
-    {
-      int exitval = vf->exitval;
-      vf->pid = 0;
-      if ((vf->pid = fork ()) == 0)
-	exit (exitval);
-    }
-
-  int pid = vf->pid;
-  vf->pid = 0;
-  debug_printf ("exiting vfork, pid %d", pid);
-  sig_dispatch_pending ();
-
-  call_signal_handler_now (); // FIXME: racy
-  _my_tls = vf->tls;
-  return pid;
-#endif
-}
diff --git a/winsup/cygwin/gcrt0.c b/winsup/cygwin/gcrt0.c
deleted file mode 100644
index 19a941676..000000000
--- a/winsup/cygwin/gcrt0.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* gcrt0.c
-
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <sys/types.h>
-#include <stdlib.h>
-
-extern u_char etext asm ("etext");
-extern u_char eprol asm ("__eprol");
-extern void _mcleanup (void);
-extern void monstartup (u_long, u_long);
-
-void _monstartup (void) __attribute__((__constructor__));
-
-/* startup initialization for -pg support */
-
-void
-_monstartup (void)
-{
-  static int called;
-
-  /* Guard against multiple calls that may happen if DLLs are linked
-     with profile option set as well. Addede side benefit is that it
-     makes profiling backward compatible (GCC used to emit a call to
-     _monstartup when compiling main with profiling enabled).  */
-  if (called++)
-    return;
-
-  monstartup ((u_long) &eprol, (u_long) &etext);
-  atexit (&_mcleanup);
-}
-
-asm (".text");
-asm ("__eprol:");
-
diff --git a/winsup/cygwin/gendef b/winsup/cygwin/gendef
deleted file mode 100755
index df810cb06..000000000
--- a/winsup/cygwin/gendef
+++ /dev/null
@@ -1,223 +0,0 @@
-#!/usr/bin/perl
-use strict;
-my $in = shift;
-my $tls_offsets = shift;
-my $out = shift;
-my $sigfe = shift;
-
-$main::first = 0;
-if (!defined($in) || !defined($out) || !defined($sigfe)) {
-    die "usage: $0 deffile.in cygtls.h deffile.def sigfe.s\n";
-}
-
-require $tls_offsets;
-
-open(IN, $in) or die "$0: couldn't open \"$in\" - $!\n";
-my @top = ();
-while (<IN>) {
-    push(@top, $_);
-    last if /^\s*exports\s*$/i;
-}
-my $libline = <IN>;
-my @in = <IN>;
-close(IN);
-
-my %sigfe = ();
-my @data = ();
-my @nosigfuncs = ();
-my @out = ();
-for (@in) {
-    /\sDATA$/o and do {
-	push(@data, $_);
-	next;
-    };
-    chomp;
-    if (/=/o) {
-	if (s/\s+NOSIGFE\s*$//) {
-	} elsif (s/ SIGFE$//) {
-	  my $func = (split(' '))[2];
-	  $sigfe{$func} = '_sigfe_' . $func;
-	}
-    } else {
-	my ($func, $sigfe) = m%^\s*(\S+)(?:\s+((?:NO)?SIGR?FE))?$%o;
-	if (defined($sigfe) && $sigfe =~ /^NO/o) {
-	    $_ = $func;
-	} else {
-	    $sigfe ||= 'sigfe';
-	    $_ = '_' . lc($sigfe) . '_' . $func;
-	    $sigfe{$func} = $_;
-	    $_ = $func . ' = ' . $_;
-	}
-    }
-    s/(\S)\s+(\S)/$1 $2/go;
-    s/(\S)\s+$/$1/o;
-    s/^\s+(\S)/$1/o;
-    push(@out, $_ . "\n");
-}
-
-for (@out) {
-    my ($alias, $func) = /^(\S+) = (\S+)\s*$/o;
-    $_ = $alias . ' = ' . $sigfe{$func} . "\n"
-      if defined($func) && $sigfe{$func};
-}
-open(OUT, '>', $out) or die "$0: couldn't open \"$out\" - $!\n";
-print OUT @top, @data, @out;
-close OUT;
-
-open(SIGFE, '>', $sigfe) or die "$0: couldn't open sigfe file \"$sigfe\" - $!\n";
-
-for my $k (sort keys %sigfe) {
-    print SIGFE fefunc($k, $sigfe{$k});
-}
-close SIGFE;
-
-sub fefunc {
-    my $func = '_' . shift;
-    my $fe = '_' . shift;
-    my $extra;
-    my $res = <<EOF;
-	.extern	_siglist_index
-	.extern	_siglist
-	.extern	$func
-	.global	$fe
-$fe:
-	pushl	\$$func
-	jmp	__sigfe
-
-EOF
-    if (!$main::first++) {
-	$res = <<EOF . longjmp () . $res;
-	.text
-	.global	__sigbe
-	.global	_sigreturn
-	.global	_sigdelayed
-
-	.stabs	"_sigfe:F(0,1)",36,0,0,__sigbe
-__sigfe:
-	pushl	%edx
-	movl	%fs:4,%eax
-	movl	\$4,%edx
-	xadd	%edx,$tls::stackptr(%eax)
-	leal	__sigbe,%eax
-	xchg	%eax,8(%esp)
-	movl	%eax,(%edx)
-	popl	%edx
-	ret
-
-	.stabs	"_sigbe:F(0,1)",36,0,0,__sigbe
-__sigbe:
-	pushl	%eax
-	pushl	%edx
-	movl	\$-4,%edx
-1:	movl	%fs:4,%eax
-	xadd	%edx,$tls::stackptr(%eax)
-	xorl	%eax,%eax
-	lock    xchg %eax,-4(%edx)
-	testl	%eax,%eax
-	jnz	2f
-	call	_low_priority_sleep
-	xorl	%edx,%edx
-	jmp	1b
-2:	xchg	%eax,4(%esp)
-	popl	%edx
-	ret
-
-	.stabs	"sigreturn:F(0,1)",36,0,0,_sigreturn
-_sigreturn:
-	addl	\$4,%esp			# Remove argument
-	call	_set_process_mask\@4
-
-	movl	%fs:4,%eax
-
-	cmpl	\$0,$tls::sig(%eax)	# Did a signal come in?
-	jnz	3f			# Yes, if non-zero
-
-1:	popl	%edx			# saved errno
-	testl	%edx,%edx		# Is it < 0
-	jl	2f			# yup.  ignore it
-	movl	$tls::errno_addr(%eax),%eax
-	movl	%edx,(%eax)
-2:	popl	%eax
-	popl	%ebx
-	popl	%ecx
-	popl	%edx
-	popl	%edi
-	popl	%esi
-	popf
-	popl	%ebp
-	jmp	__sigbe
-
-	.stabs	"sigdelayed:F(0,1)",36,0,0,_sigdelayed
-_sigdelayed:
-	pushl	%ebp
-	movl	%esp,%ebp
-	pushf
-	pushl	%esi
-	pushl	%edi
-	pushl	%edx
-	pushl	%ecx
-	pushl	%ebx
-	pushl	%eax
-	movl	%fs:4,%ebx
-	pushl	$tls::saved_errno(%ebx)	# saved errno
-3:	pushl	$tls::oldmask(%ebx)	# oldmask
-	pushl	$tls::sig(%ebx)		# signal argument
-	pushl	\$_sigreturn
-
-	call	_reset_signal_arrived\@0
-	pushl	$tls::func(%ebx)	# signal func
-	pushl	$tls::newmask(%ebx)	# newmask - eaten by set_process_mask
-
-	call	_set_process_mask\@4
-	movl	\$0,$tls::sig(%ebx)	# zero the signal number as a
-					# flag to the signal handler thread
-					# that it is ok to set up sigsave
-	popl	%ebx
-	jmp	*%ebx
-
-EOF
-    }
-    return $res;
-}
-
-sub longjmp {
-    return <<EOF;
-
-	.globl	_longjmp
-
-_longjmp:
-	pushl	%ebp
-	movl	%esp,%ebp
-	movl	8(%ebp),%edi
-	movl	12(%ebp),%eax
-	testl	%eax,%eax
-	jne	0f
-	incl	%eax
-0:
-	movl	%eax,0(%edi)
-	movl	24(%edi),%ebp
-	pushfl
-	popl	%ebx
-	movw	42(%edi),%ax
-	movw	%ax,%ss
-	movl	28(%edi),%esp
-	pushl	32(%edi)
-	pushl	%ebx
-	movw	36(%edi),%ax
-	movw	%ax,%es
-	movw	40(%edi),%ax
-	movw	%ax,%gs
-	movl	%fs:4,%eax
-	leal	($tls::stack)(%eax),%edx
-	movl	%edx,($tls::stackptr)(%eax)
-	movl	0(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	16(%edi),%esi
-	movl	20(%edi),%edi
-	popfl
-	ret
-
-EOF
-}
diff --git a/winsup/cygwin/gendevices b/winsup/cygwin/gendevices
deleted file mode 100755
index d8a5a5d73..000000000
--- a/winsup/cygwin/gendevices
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/bin/perl
-use File::Basename;
-use Cwd;
-my $cwd = getcwd;
-
-use strict;
-use integer;
-sub devsort;
-
-my $input = shift;
-my $output = shift;
-my $base = "/tmp/" . basename($input, '.in') . '.' . $$;
-my $c = $base . '.c';
-my $shilka = $base . '.shilka';
-
-open(INPUT, $input) or die "$0: couldn't open '$input' - $!\n";
-
-my @lines = ();
-my $storage_ix = -1;
-my @storage = ();
-my %pointers = ();
-my @patterns = ();
-my $patterns_ix = -1;
-while (<INPUT>) {
-    if (/%storage_here/) {
-	$storage_ix = @lines;
-    } elsif (/^"([^"]+)",\s*(.*)$/o) {
-    	push(@patterns, [$1, $2]);
-	next;
-    }
-    if (@patterns) {
-	for my $f (sort devsort @patterns) {
-	    my $x = $f->[0];
-	    my $rest = $f->[1];
-	    my ($dev, $devrest) = ($x =~ /([^%]+)(%.*)?$/o);
-	    push(@lines, generate($dev, $devrest, $rest, []));
-	}
-	@patterns = ();
-    }
-    push(@lines, $_);
-}
-
-close INPUT;
-# @storage = sort devsort @storage;
-chop $storage[$#storage];
-chop $storage[$#storage];
-$storage[$#storage] .= "\n";
-splice(@lines, $storage_ix, 1,
-       "static const device dev_storage[] =\n", "{\n",
-       @storage, "};\n\n",
-       sort {$a cmp $b} values %pointers);
-open(SHILKA, '>', $shilka);
-print SHILKA @lines;
-close SHILKA;
-
-chdir '/tmp';
-system qw'shilka -length -strip -no-definitions', $shilka;
-if ($? == -1) {
-    die "$0: shilka command missing? - $!\n";
-} else {
-    exit $? if $?;
-}
-chdir $cwd;
-unlink $shilka;
-open(C, $c) or die "$0: couldn't open $c - $!\n";
-@lines = <C>;
-close C;
-unlink $c;
-splice(@lines, 0, 3);
-my $ign_until_brace = 0;
-for (my $i = 0; $i < @lines; $i++) {
-    $_ = $lines[$i];
-    $ign_until_brace = 1 if /(?:KR_reset|KR_output_statistics).*\)\s*$/o;
-    if ($ign_until_brace || /(?:#\s*line|(?:KR_reset|KR_output_statistics).*;)/)  {
-	$ign_until_brace = 0 if $ign_until_brace && /}/o;
-	splice(@lines, $i, 1);
-	redo;
-    };
-}
-open(OUTPUT, '>', $output) or do {{
-    if (chmod(0664, $output)) {
-	open(OUTPUT, '>', $output);
-	last;
-    }
-    die "$0: couldn't open $output - $!\n";
-}};
-print OUTPUT @lines;
-close OUTPUT;
-
-sub generate {
-    my $dev = shift;
-    my $devrest = shift;
-    my $rest = shift;
-    my $vars = shift;
-    my $res;
-    my @lines = ();
-    if ($devrest) {
-	my ($a, $low, $high, $fmt, $b) = ($devrest =~ /%([\({])([^-]+)-([^\)}]+)[\)}](.)(.*)/o);
-	my ($middle, $devrest0) = ($b =~ /^([^%]*)(%.*)?$/);
-	$fmt = "%$fmt";
-	my $vars_ix = @{$vars};
-	for my $f ($low .. $high) {
-	    $vars->[$vars_ix] = $f;
-	    $#{$vars} = $vars_ix;
-	    my $dev0 = $dev . sprintf($fmt, $f) . $middle;
-	    push(@lines, generate($dev0, $devrest0, $rest, $vars));
-	}
-      } else {
-	my $fh = $dev;
-	$fh =~ s%/%_%og;
-	my $shilka_id = $fh;
-	my $storage_str = $fh . '_storage';
-	$fh =~ s/^_dev_/FH_/o;
-	$fh = uc $fh;
-	$shilka_id =~ s/^_dev_//o;
-	$storage_str =~ s/^_dev/dev/o;
-	my $storage_loc = "dev_storage + " . @storage;
-	@lines = ('"' . $dev . '"' . " = $shilka_id {return $storage_loc;}\n");
-	$rest = "$fh, $rest" if $rest =~ /^"/o;
-	$rest = fixup($rest, $vars);
-	if ($rest =~ /^(.*), ([a-z_]*_dev)/) {
-	    $pointers{$2} ||= "const device *$2 = $storage_loc;\n"; 
-	    $rest = $1;
-	}
-	push(@storage, "  {\"$dev\", " . $rest . "},\n");
-    }
-    return @lines;
-}
-
-sub fixup {
-    my $rest = shift;
-    my $vars = shift;
-    0 while $rest =~ s/{([^}]*)}/evalit($1, $vars)/eg;
-    return $rest;
-}
-
-sub evalit {
-    my $what = shift;
-    my $vars = shift;
-    $what =~ s/\$(\d+)/'$vars->[$1-1]'/g;
-    my $res = eval $what;
-    return $res;
-}
-
-sub devsort {
-    my $a0 = $a->[0];
-    my $b0 = $b->[0];
-    $a0 =~ s/(\D)(\d+)/"$1" . sprintf "%05d", $2/e;
-    $b0 =~ s/(\D)(\d+)/"$1" . sprintf "%05d", $2/e;
-    return $a0 cmp $b0;
-}
diff --git a/winsup/cygwin/gentls_offsets b/winsup/cygwin/gentls_offsets
deleted file mode 100755
index 26432b364..000000000
--- a/winsup/cygwin/gentls_offsets
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/perl -s
-my $tls = shift;
-my $tls_out = shift;
-open(TLS, $tls) or die "$0: couldn't open tls file \"$tls\" - $!\n";
-my $struct = '';
-my @fields = ();
-my $def = '';
-my $tls = join('', <TLS>);
-$tls =~ s/\A.*?gentls_offsets[^\n]*\n//os;
-$tls =~ s%/\*\s*gentls_offsets.*?/\*\s*gentls_offsets\s*\*/%%ogs;
-foreach ($tls =~ /^.*\n/mg) {
-    $def .= $_ if $struct;
-    last if /^};/o;
-    /^\s*typedef/o and do {
-	$def .= $_ ;
-	next;
-    };
-    if (!s/;.*$//o) {
-	if (!$struct && /^\s*(?:struct|class)\s*([a-z_0-9]+)/o) {
-	    $def .= $_;
-	    $struct = $1 
-	}
-	next;
-    }
-    s/(?:\[[^\]]*\]|struct|class)//o;
-    s/^\s+\S+\s+//o;
-    s/[\*\s()]+//go;
-    for my $f (split(/,/)) {
-	push(@fields, $f);
-    }
-}
-close TLS;
-open(TMP, '>', "/tmp/$$.cc") or die "$0: couldn't open temporary index file \"/tmp/$$.c\" - $!\n";
-print TMP <<EOF;
-#define __attribute__(X)
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-typedef void *HANDLE;
-$def
-int
-main(int argc, char **argv)
-{
-  $struct foo[1];
-# define foo_end ((char *) (foo + 1))
-# define offset(f) (((char *) &(foo->f)) - foo_end)
-EOF
-    print TMP 'puts ("//;# autogenerated:  Do not edit.\n");', "\n\n";
-    for my $f (@fields) {
-	print TMP '  printf ("//; $tls::', $f, ' = %d;\n", ', "offset($f));\n";
-    }
-    print TMP '  puts ("//; __DATA__\n");', "\n";
-    for my $f (@fields) {
-	print TMP '  printf ("#define tls_', $f, ' (%d)\n", ', "offset($f));\n";
-    }
-
-    print TMP <<EOF;
-
-  exit (0);
-}
-EOF
-close TMP;
-system @ARGV, '-o', "/tmp/$$-1.cc", '-E', "/tmp/$$.cc";
-system 'g++', '-o', "/tmp/$$.a.out", "/tmp/$$-1.cc" and
-($? == 127 && system 'c++',  '-o', "/tmp/$$.a.out", "/tmp/$$-1.cc") and
-die "$0: couldn't generate executable for offset calculation \"/tmp/$$.a.out\" - $!\n";
-open(TLS_OUT, '>', $tls_out) or die "$0: couldn't open tls index file \"tls_out\" - $!\n";
-open(OFFS, "/tmp/$$.a.out|") or die "$0: couldn't run \"/tmp/$$.a.out\" - $!\n";
-print TLS_OUT <OFFS>;
-close OFFS;
-close TLS_OUT;
-# unlink "/tmp/$$.cc", "/tmp/$$.a.out";
-exit(0);
diff --git a/winsup/cygwin/glob.c b/winsup/cygwin/glob.c
deleted file mode 100644
index 1db8685aa..000000000
--- a/winsup/cygwin/glob.c
+++ /dev/null
@@ -1,931 +0,0 @@
-/*	$NetBSD: __glob13.c,v 1.1.2.1 1997/10/22 06:41:27 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-
-/*
- * glob(3) -- a superset of the one defined in POSIX 1003.2.
- *
- * The [!...] convention to negate a range is supported (SysV, Posix, ksh).
- *
- * Optional extra services, controlled by flags not defined by POSIX:
- *
- * GLOB_QUOTE:
- *	Escaping convention: \ inhibits any special meaning the following
- *	character might have (except \ at end of string is retained).
- * GLOB_MAGCHAR:
- *	Set in gl_flags if pattern contained a globbing character.
- * GLOB_NOMAGIC:
- *	Same as GLOB_NOCHECK, but it will only append pattern if it did
- *	not contain any magic characters.  [Used in csh style globbing]
- * GLOB_ALTDIRFUNC:
- *	Use alternately specified directory access functions.
- * GLOB_TILDE:
- *	expand ~user/foo to the /home/dir/of/user/foo
- * GLOB_BRACE:
- *	expand {1,2}{a,b} to 1a 1b 2a 2b
- * gl_matchc:
- *	Number of matches in the current invocation of glob.
- */
-
-#include "winsup.h"
-
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <glob.h>
-
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <windows.h>
-
-#include "perprocess.h"
-#include "cygwin/version.h"
-
-#ifdef __weak_alias
-#ifdef __LIBC12_SOURCE__
-__weak_alias(glob,_glob);
-__weak_alias(globfree,_globfree);
-#else
-#error "XXX THESE ARE NOT RIGHT!"
-__weak_alias(__glob13,___glob13);
-__weak_alias(__globfree13,___globfree13);
-#endif /* __LIBC12_SOURCE__ */
-#endif /* __weak_alias */
-
-#ifdef __LIBC12_SOURCE__
-#define	STAT	stat12
-#else
-#define STAT	__stat64
-#endif
-
-#define	DOLLAR		'$'
-#define	DOT		'.'
-#define	EOS		'\0'
-#define	LBRACKET	'['
-#define	NOT		'!'
-#define	QUESTION	'?'
-#define	QUOTE		'\\'
-#define	RANGE		'-'
-#define	RBRACKET	']'
-#define	SEP		'/'
-#define	STAR		'*'
-#define	TILDE		'~'
-#define	UNDERSCORE	'_'
-#define	LBRACE		'{'
-#define	RBRACE		'}'
-#define	SLASH		'/'
-#define	COMMA		','
-
-#ifndef DEBUG
-
-#define	M_QUOTE		0x8000
-#define	M_PROTECT	0x4000
-#define	M_MASK		0xffff
-#define	M_ASCII		0x00ff
-
-typedef u_short Char;
-
-#else
-
-#define	M_QUOTE		0x80
-#define	M_PROTECT	0x40
-#define	M_MASK		0xff
-#define	M_ASCII		0x7f
-
-typedef char Char;
-
-#endif
-
-
-#define	CHAR(c)		((Char)((c)&M_ASCII))
-#define	META(c)		((Char)((c)|M_QUOTE))
-#define	M_ALL		META('*')
-#define	M_END		META(']')
-#define	M_NOT		META('!')
-#define	M_ONE		META('?')
-#define	M_RNG		META('-')
-#define	M_SET		META('[')
-#define	ismeta(c)	(((c)&M_QUOTE) != 0)
-
-
-static int	 compare __P((const void *, const void *));
-static void	 g_Ctoc __P((const Char *, char *));
-static int	 g_lstat __P((Char *, struct STAT *, glob_t *));
-static DIR	*g_opendir __P((Char *, glob_t *));
-static Char	*g_strchr __P((Char *, int));
-#ifdef notdef
-static Char	*g_strcat __P((Char *, const Char *));
-#endif
-static int	 g_stat __P((Char *, struct STAT *, glob_t *));
-static int	 glob0 __P((const Char *, glob_t *));
-static int	 glob1 __P((Char *, glob_t *));
-static int	 glob2 __P((Char *, Char *, Char *, glob_t *));
-static int	 glob3 __P((Char *, Char *, Char *, Char *, glob_t *));
-static int	 globextend __P((const Char *, glob_t *));
-static const Char *	 globtilde __P((const Char *, Char *, glob_t *));
-static int	 globexp1 __P((const Char *, glob_t *));
-static int	 globexp2 __P((const Char *, const Char *, glob_t *, int *));
-static int	 match __P((Char *, Char *, Char *));
-#ifdef DEBUG
-static void	 qprintf __P((const char *, Char *));
-#endif
-
-#undef MAXPATHLEN
-#define MAXPATHLEN 16384
-
-extern BOOL ignore_case_with_glob;
-
-int
-glob(pattern, flags, errfunc, pglob)
-	const char *pattern;
-	int flags, (*errfunc) __P((const char *, int));
-	glob_t *pglob;
-{
-	const u_char *patnext;
-	int c;
-	Char *bufnext, *bufend, patbuf[MAXPATHLEN+1];
-
-	patnext = (u_char *) pattern;
-	if (!(flags & GLOB_APPEND)) {
-		pglob->gl_pathc = 0;
-		pglob->gl_pathv = NULL;
-		if (!(flags & GLOB_DOOFFS))
-			pglob->gl_offs = 0;
-	}
-	pglob->gl_flags = flags & ~GLOB_MAGCHAR;
-	pglob->gl_errfunc = errfunc;
-	pglob->gl_matchc = 0;
-
-	bufnext = patbuf;
-	bufend = bufnext + MAXPATHLEN;
-	if (flags & GLOB_QUOTE) {
-		/* Protect the quoted characters. */
-		while (bufnext < bufend && (c = *patnext++) != EOS)
-			if (c == QUOTE) {
-				if ((c = *patnext++) == EOS) {
-					c = QUOTE;
-					--patnext;
-				}
-				*bufnext++ = c | M_PROTECT;
-			}
-			else
-				*bufnext++ = c;
-	}
-	else
-	    while (bufnext < bufend && (c = *patnext++) != EOS)
-		    *bufnext++ = c;
-	*bufnext = EOS;
-
-	if (flags & GLOB_BRACE)
-	    return globexp1(patbuf, pglob);
-	else
-	    return glob0(patbuf, pglob);
-}
-
-/*
- * Expand recursively a glob {} pattern. When there is no more expansion
- * invoke the standard globbing routine to glob the rest of the magic
- * characters
- */
-static int globexp1(pattern, pglob)
-	const Char *pattern;
-	glob_t *pglob;
-{
-	const Char* ptr = pattern;
-	int rv;
-
-	/* Protect a single {}, for find(1), like csh */
-	if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS)
-		return glob0(pattern, pglob);
-
-	while ((ptr = (const Char *) g_strchr((Char *) ptr, LBRACE)) != NULL)
-		if (!globexp2(ptr, pattern, pglob, &rv))
-			return rv;
-
-	return glob0(pattern, pglob);
-}
-
-
-/*
- * Recursive brace globbing helper. Tries to expand a single brace.
- * If it succeeds then it invokes globexp1 with the new pattern.
- * If it fails then it tries to glob the rest of the pattern and returns.
- */
-static int globexp2(ptr, pattern, pglob, rv)
-	const Char *ptr, *pattern;
-	glob_t *pglob;
-	int *rv;
-{
-	int     i;
-	Char   *lm, *ls;
-	const Char *pe, *pm, *pl;
-	Char    patbuf[MAXPATHLEN + 1];
-
-	/* copy part up to the brace */
-	for (lm = patbuf, pm = pattern; pm != ptr; *lm++ = *pm++)
-		continue;
-	ls = lm;
-
-	/* Find the balanced brace */
-	for (i = 0, pe = ++ptr; *pe; pe++)
-		if (*pe == LBRACKET) {
-			/* Ignore everything between [] */
-			for (pm = pe++; *pe != RBRACKET && *pe != EOS; pe++)
-				continue;
-			if (*pe == EOS) {
-				/*
-				 * We could not find a matching RBRACKET.
-				 * Ignore and just look for RBRACE
-				 */
-				pe = pm;
-			}
-		}
-		else if (*pe == LBRACE)
-			i++;
-		else if (*pe == RBRACE) {
-			if (i == 0)
-				break;
-			i--;
-		}
-
-	/* Non matching braces; just glob the pattern */
-	if (i != 0 || *pe == EOS) {
-		*rv = glob0(patbuf, pglob);
-		return 0;
-	}
-
-	for (i = 0, pl = pm = ptr; pm <= pe; pm++)
-		switch (*pm) {
-		case LBRACKET:
-			/* Ignore everything between [] */
-			for (pl = pm++; *pm != RBRACKET && *pm != EOS; pm++)
-				continue;
-			if (*pm == EOS) {
-				/*
-				 * We could not find a matching RBRACKET.
-				 * Ignore and just look for RBRACE
-				 */
-				pm = pl;
-			}
-			break;
-
-		case LBRACE:
-			i++;
-			break;
-
-		case RBRACE:
-			if (i) {
-			    i--;
-			    break;
-			}
-			/* FALLTHROUGH */
-		case COMMA:
-			if (i && *pm == COMMA)
-				break;
-			else {
-				/* Append the current string */
-				for (lm = ls; (pl < pm); *lm++ = *pl++)
-					continue;
-				/*
-				 * Append the rest of the pattern after the
-				 * closing brace
-				 */
-				for (pl = pe + 1; (*lm++ = *pl++) != EOS;)
-					continue;
-
-				/* Expand the current pattern */
-#ifdef DEBUG
-				qprintf("globexp2:", patbuf);
-#endif
-				*rv = globexp1(patbuf, pglob);
-
-				/* move after the comma, to the next string */
-				pl = pm + 1;
-			}
-			break;
-
-		default:
-			break;
-		}
-	*rv = 0;
-	return 0;
-}
-
-
-
-/*
- * expand tilde from the passwd file.
- */
-static const Char *
-globtilde(pattern, patbuf, pglob)
-	const Char *pattern;
-	Char *patbuf;
-	glob_t *pglob;
-{
-	struct passwd *pwd;
-	char *h;
-	const Char *p;
-	Char *b;
-
-	if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE))
-		return pattern;
-
-	/* Copy up to the end of the string or / */
-	for (p = pattern + 1, h = (char *) patbuf; *p && *p != SLASH;
-	     *h++ = *p++)
-		continue;
-
-	*h = EOS;
-
-	if (((char *) patbuf)[0] == EOS) {
-		/*
-		 * handle a plain ~ or ~/ by expanding $HOME
-		 * first and then trying the password file
-		 */
-		if ((h = getenv("HOME")) == NULL) {
-			if ((pwd = getpwuid32(getuid32())) == NULL)
-				return pattern;
-			else
-				h = pwd->pw_dir;
-		}
-	}
-	else {
-		/*
-		 * Expand a ~user
-		 */
-		if ((pwd = getpwnam((char*) patbuf)) == NULL)
-			return pattern;
-		else
-			h = pwd->pw_dir;
-	}
-
-	/* Copy the home directory */
-	for (b = patbuf; *h; *b++ = *h++)
-		continue;
-
-	/* Append the rest of the pattern */
-	while ((*b++ = *p++) != EOS)
-		continue;
-
-	return patbuf;
-}
-
-
-/*
- * The main glob() routine: compiles the pattern (optionally processing
- * quotes), calls glob1() to do the real pattern matching, and finally
- * sorts the list (unless unsorted operation is requested).  Returns 0
- * if things went well, nonzero if errors occurred.  It is not an error
- * to find no matches.
- */
-static int
-glob0(pattern, pglob)
-	const Char *pattern;
-	glob_t *pglob;
-{
-	const Char *qpatnext;
-	int c, err, oldpathc;
-	Char *bufnext, patbuf[MAXPATHLEN+1];
-
-	qpatnext = globtilde(pattern, patbuf, pglob);
-	oldpathc = pglob->gl_pathc;
-	bufnext = patbuf;
-
-	/* We don't need to check for buffer overflow any more. */
-	while ((c = *qpatnext++) != EOS) {
-		switch (c) {
-		case LBRACKET:
-			c = *qpatnext;
-			if (c == NOT)
-				++qpatnext;
-			if (*qpatnext == EOS ||
-			    g_strchr((Char *) qpatnext+1, RBRACKET) == NULL) {
-				*bufnext++ = LBRACKET;
-				if (c == NOT)
-					--qpatnext;
-				break;
-			}
-			*bufnext++ = M_SET;
-			if (c == NOT)
-				*bufnext++ = M_NOT;
-			c = *qpatnext++;
-			do {
-				*bufnext++ = CHAR(c);
-				if (*qpatnext == RANGE &&
-				    (c = qpatnext[1]) != RBRACKET) {
-					*bufnext++ = M_RNG;
-					*bufnext++ = CHAR(c);
-					qpatnext += 2;
-				}
-			} while ((c = *qpatnext++) != RBRACKET);
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_END;
-			break;
-		case QUESTION:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_ONE;
-			break;
-		case STAR:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			/* collapse adjacent stars to one,
-			 * to avoid exponential behavior
-			 */
-			if (bufnext == patbuf || bufnext[-1] != M_ALL)
-			    *bufnext++ = M_ALL;
-			break;
-		default:
-			*bufnext++ = CHAR(c);
-			break;
-		}
-	}
-	*bufnext = EOS;
-#ifdef DEBUG
-	qprintf("glob0:", patbuf);
-#endif
-
-	if ((err = glob1(patbuf, pglob)) != 0)
-		return(err);
-
-	/*
-	 * If there was no match we are going to append the pattern
-	 * if GLOB_NOCHECK was specified or if GLOB_NOMAGIC was specified
-	 * and the pattern did not contain any magic characters
-	 * GLOB_NOMAGIC is there just for compatibility with csh.
-	 */
-	if (pglob->gl_pathc == oldpathc &&
-	    ((pglob->gl_flags & GLOB_NOCHECK) ||
-	      ((pglob->gl_flags & GLOB_NOMAGIC) &&
-	       !(pglob->gl_flags & GLOB_MAGCHAR))))
-		return(globextend(pattern, pglob));
-	else if (!(pglob->gl_flags & GLOB_NOSORT))
-		qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc,
-		    pglob->gl_pathc - oldpathc, sizeof(char *), compare);
-	return(0);
-}
-
-static int
-compare(p, q)
-	const void *p, *q;
-{
-	return(strcmp(*(char **)p, *(char **)q));
-}
-
-static int
-glob1(pattern, pglob)
-	Char *pattern;
-	glob_t *pglob;
-{
-	Char pathbuf[MAXPATHLEN+1];
-
-	/* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */
-	if (*pattern == EOS)
-		return(0);
-	return(glob2(pathbuf, pathbuf, pattern, pglob));
-}
-
-/*
- * The functions glob2 and glob3 are mutually recursive; there is one level
- * of recursion for each segment in the pattern that contains one or more
- * meta characters.
- */
-static int
-glob2(pathbuf, pathend, pattern, pglob)
-	Char *pathbuf, *pathend, *pattern;
-	glob_t *pglob;
-{
-	struct STAT sb;
-	Char *p, *q;
-	int anymeta;
-
-	/*
-	 * Loop over pattern segments until end of pattern or until
-	 * segment with meta character found.
-	 */
-	for (anymeta = 0;;) {
-		if (*pattern == EOS) {		/* End of pattern? */
-			*pathend = EOS;
-			if (g_lstat(pathbuf, &sb, pglob))
-				return(0);
-
-			if (((pglob->gl_flags & GLOB_MARK) &&
-			    pathend[-1] != SEP) && (S_ISDIR(sb.st_mode)
-			    || (S_ISLNK(sb.st_mode) &&
-			    (g_stat(pathbuf, &sb, pglob) == 0) &&
-			    S_ISDIR(sb.st_mode)))) {
-				*pathend++ = SEP;
-				*pathend = EOS;
-			}
-			++pglob->gl_matchc;
-			return(globextend(pathbuf, pglob));
-		}
-
-		/* Find end of next segment, copy tentatively to pathend. */
-		q = pathend;
-		p = pattern;
-		while (*p != EOS && *p != SEP) {
-			if (ismeta(*p))
-				anymeta = 1;
-			*q++ = *p++;
-		}
-
-		if (!anymeta) {		/* No expansion, do next segment. */
-			pathend = q;
-			pattern = p;
-			while (*pattern == SEP)
-				*pathend++ = *pattern++;
-		} else			/* Need expansion, recurse. */
-			return(glob3(pathbuf, pathend, pattern, p, pglob));
-	}
-	/* NOTREACHED */
-}
-
-static int
-glob3(pathbuf, pathend, pattern, restpattern, pglob)
-	Char *pathbuf, *pathend, *pattern, *restpattern;
-	glob_t *pglob;
-{
-	register struct dirent *dp;
-	DIR *dirp;
-	int err;
-	char buf[MAXPATHLEN];
-
-	/*
-	 * The readdirfunc declaration can't be prototyped, because it is
-	 * assigned, below, to two functions which are prototyped in glob.h
-	 * and dirent.h as taking pointers to differently typed opaque
-	 * structures.
-	 */
-	struct dirent *(*readdirfunc) __P((void *));
-
-	*pathend = EOS;
-	errno = 0;
-
-	if ((dirp = g_opendir(pathbuf, pglob)) == NULL) {
-		/* TODO: don't call for ENOENT or ENOTDIR? */
-		if (pglob->gl_errfunc) {
-			g_Ctoc(pathbuf, buf);
-			if (pglob->gl_errfunc(buf, errno) ||
-			    pglob->gl_flags & GLOB_ERR)
-				return (GLOB_ABEND);
-		}
-		return(0);
-	}
-
-	err = 0;
-
-	/* Search directory for matching names. */
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		readdirfunc = pglob->gl_readdir;
-	else
-		readdirfunc = (struct dirent *(*)__P((void *))) readdir;
-	while ((dp = (*readdirfunc)(dirp))) {
-		register u_char *sc;
-		register Char *dc;
-
-		/* Initial DOT must be matched literally. */
-		if (dp->d_name[0] == DOT && *pattern != DOT)
-			continue;
-		for (sc = (u_char *) dp->d_name, dc = pathend;
-		     (*dc++ = *sc++) != EOS;)
-			continue;
-		if (!match(pathend, pattern, restpattern)) {
-			*pathend = EOS;
-			continue;
-		}
-		err = glob2(pathbuf, --dc, restpattern, pglob);
-		if (err)
-			break;
-	}
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		(*pglob->gl_closedir)(dirp);
-	else
-		closedir(dirp);
-	return(err);
-}
-
-
-/*
- * Extend the gl_pathv member of a glob_t structure to accommodate a new item,
- * add the new item, and update gl_pathc.
- *
- * This assumes the BSD realloc, which only copies the block when its size
- * crosses a power-of-two boundary; for v7 realloc, this would cause quadratic
- * behavior.
- *
- * Return 0 if new item added, error code if memory couldn't be allocated.
- *
- * Invariant of the glob_t structure:
- *	Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and
- *	gl_pathv points to (gl_offs + gl_pathc + 1) items.
- */
-static int
-globextend(path, pglob)
-	const Char *path;
-	glob_t *pglob;
-{
-	register char **pathv;
-	register int i;
-	u_int newsize;
-	char *copy;
-	const Char *p;
-
-	newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
-	pathv = pglob->gl_pathv ?
-		    realloc((char *)pglob->gl_pathv, newsize) :
-		    malloc(newsize);
-	if (pathv == NULL)
-		return(GLOB_NOSPACE);
-
-	if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
-		/* first time around -- clear initial gl_offs items */
-		pathv += pglob->gl_offs;
-		for (i = pglob->gl_offs; --i >= 0;)
-			*--pathv = NULL;
-	}
-	pglob->gl_pathv = pathv;
-
-	for (p = path; *p++;)
-		continue;
-	if ((copy = malloc(p - path)) != NULL) {
-		g_Ctoc(path, copy);
-		pathv[pglob->gl_offs + pglob->gl_pathc++] = copy;
-	}
-	pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
-	return(copy == NULL ? GLOB_NOSPACE : 0);
-}
-
-
-/*
- * pattern matching function for filenames.  Each occurrence of the *
- * pattern causes a recursion level.
- */
-static int
-match(name, pat, patend)
-	register Char *name, *pat, *patend;
-{
-	int ok, negate_range;
-	Char c, k;
-
-	while (pat < patend) {
-		c = *pat++;
-		switch (c & M_MASK) {
-		case M_ALL:
-			if (pat == patend)
-				return(1);
-			do
-			    if (match(name, pat, patend))
-				    return(1);
-			while (*name++ != EOS);
-			return(0);
-		case M_ONE:
-			if (*name++ == EOS)
-				return(0);
-			break;
-		case M_SET:
-			ok = 0;
-			if ((k = *name++) == EOS)
-				return(0);
-			if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS)
-				++pat;
-			if (ignore_case_with_glob)
-			  {
-			    while (((c = *pat++) & M_MASK) != M_END)
-			      if ((*pat & M_MASK) == M_RNG) {
-				if (tolower(c) <= tolower(k) && tolower(k) <= tolower(pat[1]))
-				  ok = 1;
-				pat += 2;
-			      } else if (tolower(c) == tolower(k))
-				ok = 1;
-			  }
-			else
-			  {
-			    while (((c = *pat++) & M_MASK) != M_END)
-			      if ((*pat & M_MASK) == M_RNG) {
-				if (c <= k && k <= pat[1])
-				  ok = 1;
-				pat += 2;
-			      } else if (c == k)
-				ok = 1;
-			  }
-			if (ok == negate_range)
-				return(0);
-			break;
-		default:
-			if (ignore_case_with_glob)
-			  {
-			    if (tolower(*name) != tolower(c))
-			      return(0);
-			    ++name;
-			  }
-			else
-			  {
-			    if (*name++ != c)
-			      return(0);
-			  }
-			break;
-		}
-	}
-	return(*name == EOS);
-}
-
-/* Free allocated data belonging to a glob_t structure. */
-void
-globfree(pglob)
-	glob_t *pglob;
-{
-	register int i;
-	register char **pp;
-
-	if (pglob->gl_pathv != NULL) {
-		pp = pglob->gl_pathv + pglob->gl_offs;
-		for (i = pglob->gl_pathc; i--; ++pp)
-			if (*pp)
-				free(*pp);
-		free(pglob->gl_pathv);
-	}
-}
-
-static DIR *
-g_opendir(str, pglob)
-	register Char *str;
-	glob_t *pglob;
-{
-	char buf[MAXPATHLEN];
-
-	if (!*str)
-		strcpy(buf, ".");
-	else
-		g_Ctoc(str, buf);
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_opendir)(buf));
-
-	return(opendir(buf));
-}
-
-static void
-stat32_to_STAT (struct __stat32 *src, struct STAT *dst)
-{
-  dst->st_dev = src->st_dev;
-  dst->st_ino = src->st_ino;
-  dst->st_mode = src->st_mode;
-  dst->st_nlink = src->st_nlink;
-  dst->st_uid = src->st_uid;
-  dst->st_gid = src->st_gid;
-  dst->st_rdev = src->st_rdev;
-  dst->st_size = src->st_size;
-  dst->st_atim = src->st_atim;
-  dst->st_mtim = src->st_mtim;
-  dst->st_ctim = src->st_ctim;
-  dst->st_blksize = src->st_blksize;
-  dst->st_blocks = src->st_blocks;
-}
-
-static int
-g_lstat(fn, sb, pglob)
-	register Char *fn;
-	struct STAT *sb;
-	glob_t *pglob;
-{
-	char buf[MAXPATHLEN];
-
-	g_Ctoc(fn, buf);
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC) {
-		struct __stat32 lsb;
-		int ret;
-
-		if (CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES)
-		  ret = (*pglob->gl_lstat)(buf, &sb);
-		else if (!(ret = (*pglob->gl_lstat)(buf, &lsb)))
-			stat32_to_STAT (&lsb, sb);
-		return ret;
-	}
-	return(lstat64(buf, sb));
-}
-
-static int
-g_stat(fn, sb, pglob)
-	register Char *fn;
-	struct STAT *sb;
-	glob_t *pglob;
-{
-	char buf[MAXPATHLEN];
-
-	g_Ctoc(fn, buf);
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC) {
-		struct __stat32 lsb;
-		int ret;
-
-		if (CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES)
-		  ret = (*pglob->gl_stat)(buf, &sb);
-		if (!(ret = (*pglob->gl_stat)(buf, &lsb)))
-			stat32_to_STAT (&lsb, sb);
-		return ret;
-	}
-	return(stat64(buf, sb));
-}
-
-static Char *
-g_strchr(str, ch)
-	Char *str;
-	int ch;
-{
-	do {
-		if (*str == ch)
-			return (str);
-	} while (*str++);
-	return (NULL);
-}
-
-#ifdef notdef
-static Char *
-g_strcat(dst, src)
-	Char *dst;
-	const Char* src;
-{
-	Char *sdst = dst;
-
-	while (*dst++)
-		continue;
-	--dst;
-	while((*dst++ = *src++) != EOS)
-	    continue;
-
-	return (sdst);
-}
-#endif
-
-static void
-g_Ctoc(str, buf)
-	register const Char *str;
-	char *buf;
-{
-	register char *dc;
-
-	for (dc = buf; (*dc++ = *str++) != EOS;)
-		continue;
-}
-
-#ifdef DEBUG
-static void
-qprintf(str, s)
-	const char *str;
-	register Char *s;
-{
-	register Char *p;
-
-	(void)printf("%s:\n", str);
-	for (p = s; *p; p++)
-		(void)printf("%c", CHAR(*p));
-	(void)printf("\n");
-	for (p = s; *p; p++)
-		(void)printf("%c", *p & M_PROTECT ? '"' : ' ');
-	(void)printf("\n");
-	for (p = s; *p; p++)
-		(void)printf("%c", ismeta(*p) ? '_' : ' ');
-	(void)printf("\n");
-}
-#endif
diff --git a/winsup/cygwin/gmon.c b/winsup/cygwin/gmon.c
deleted file mode 100644
index 048ef0df1..000000000
--- a/winsup/cygwin/gmon.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*-
- * Copyright (c) 1983, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if !defined(lint) && defined(LIBC_SCCS)
-static char rcsid[] = "$OpenBSD: gmon.c,v 1.8 1997/07/23 21:11:27 kstailey Exp $";
-#endif
-
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <gmon.h>
-
-#include <profil.h>
-#include <windows.h>
-
-/* XXX needed? */
-//extern char *minbrk __asm ("minbrk");
-
-struct gmonparam _gmonparam = { GMON_PROF_OFF };
-
-static int	s_scale;
-/* see profil(2) where this is describe (incorrectly) */
-#define		SCALE_1_TO_1	0x10000L
-
-#define ERR(s) write(2, s, sizeof(s))
-
-void	moncontrol __P((int));
-
-static void *
-fake_sbrk(int size)
-{
-    void *rv = malloc(size);
-    if (rv)
-      return rv;
-    else
-      return (void *) -1;
-}
-
-void
-monstartup(lowpc, highpc)
-	u_long lowpc;
-	u_long highpc;
-{
-	register int o;
-	char *cp;
-	struct gmonparam *p = &_gmonparam;
-
-	/*
-	 * round lowpc and highpc to multiples of the density we're using
-	 * so the rest of the scaling (here and in gprof) stays in ints.
-	 */
-	p->lowpc = ROUNDDOWN(lowpc, HISTFRACTION * sizeof(HISTCOUNTER));
-	p->highpc = ROUNDUP(highpc, HISTFRACTION * sizeof(HISTCOUNTER));
-	p->textsize = p->highpc - p->lowpc;
-	p->kcountsize = p->textsize / HISTFRACTION;
-	p->hashfraction = HASHFRACTION;
-	p->fromssize = p->textsize / p->hashfraction;
-	p->tolimit = p->textsize * ARCDENSITY / 100;
-	if (p->tolimit < MINARCS)
-		p->tolimit = MINARCS;
-	else if (p->tolimit > MAXARCS)
-		p->tolimit = MAXARCS;
-	p->tossize = p->tolimit * sizeof(struct tostruct);
-
-	cp = fake_sbrk(p->kcountsize + p->fromssize + p->tossize);
-	if (cp == (char *)-1) {
-		ERR("monstartup: out of memory\n");
-		return;
-	}
-#ifdef notdef
-	bzero(cp, p->kcountsize + p->fromssize + p->tossize);
-#endif
-	p->tos = (struct tostruct *)cp;
-	cp += p->tossize;
-	p->kcount = (u_short *)cp;
-	cp += p->kcountsize;
-	p->froms = (u_short *)cp;
-
-	/* XXX minbrk needed? */
-	//minbrk = fake_sbrk(0);
-	p->tos[0].link = 0;
-
-	o = p->highpc - p->lowpc;
-	if (p->kcountsize < o) {
-#ifndef notdef
-		s_scale = ((float)p->kcountsize / o ) * SCALE_1_TO_1;
-#else /* avoid floating point */
-		int quot = o / p->kcountsize;
-
-		if (quot >= 0x10000)
-			s_scale = 1;
-		else if (quot >= 0x100)
-			s_scale = 0x10000 / quot;
-		else if (o >= 0x800000)
-			s_scale = 0x1000000 / (o / (p->kcountsize >> 8));
-		else
-			s_scale = 0x1000000 / ((o << 8) / p->kcountsize);
-#endif
-	} else
-		s_scale = SCALE_1_TO_1;
-
-	moncontrol(1);
-}
-
-void
-_mcleanup()
-{
-	int fd;
-	int hz;
-	int fromindex;
-	int endfrom;
-	u_long frompc;
-	int toindex;
-	struct rawarc rawarc;
-	struct gmonparam *p = &_gmonparam;
-	struct gmonhdr gmonhdr, *hdr;
-	char *proffile;
-#ifdef DEBUG
-	int log, len;
-	char dbuf[200];
-#endif
-
-	if (p->state == GMON_PROF_ERROR)
-		ERR("_mcleanup: tos overflow\n");
-
-	hz = PROF_HZ;
-	moncontrol(0);
-
-#ifdef nope
-	if ((profdir = getenv("PROFDIR")) != NULL) {
-		extern char *__progname;
-		char *s, *t, *limit;
-		pid_t pid;
-		long divisor;
-
-		/* If PROFDIR contains a null value, no profiling
-		   output is produced */
-		if (*profdir == '\0') {
-			return;
-		}
-
-		limit = buf + sizeof buf - 1 - 10 - 1 -
-		    strlen(__progname) - 1;
-		t = buf;
-		s = profdir;
-		while((*t = *s) != '\0' && t < limit) {
-			t++;
-			s++;
-		}
-		*t++ = '/';
-
-		/*
-		 * Copy and convert pid from a pid_t to a string.  For
-		 * best performance, divisor should be initialized to
-		 * the largest power of 10 less than PID_MAX.
-		 */
-		pid = getpid();
-		divisor=10000;
-		while (divisor > pid) divisor /= 10;	/* skip leading zeros */
-		do {
-			*t++ = (pid/divisor) + '0';
-			pid %= divisor;
-		} while (divisor /= 10);
-		*t++ = '.';
-
-		s = __progname;
-		while ((*t++ = *s++) != '\0')
-			;
-
-		proffile = buf;
-	} else {
-		proffile = "gmon.out";
-	}
-#else
-	{
-	  char gmon_out[] = "gmon.out";
-	  proffile = gmon_out;
-	}
-#endif
-
-	fd = open(proffile , O_CREAT|O_TRUNC|O_WRONLY|O_BINARY, 0666);
-	if (fd < 0) {
-		perror( proffile );
-		return;
-	}
-#ifdef DEBUG
-	log = open("gmon.log", O_CREAT|O_TRUNC|O_WRONLY, 0664);
-	if (log < 0) {
-		perror("mcount: gmon.log");
-		return;
-	}
-	len = sprintf(dbuf, "[mcleanup1] kcount 0x%x ssiz %d\n",
-	    p->kcount, p->kcountsize);
-	write(log, dbuf, len);
-#endif
-	hdr = (struct gmonhdr *)&gmonhdr;
-	hdr->lpc = p->lowpc;
-	hdr->hpc = p->highpc;
-	hdr->ncnt = p->kcountsize + sizeof(gmonhdr);
-	hdr->version = GMONVERSION;
-	hdr->profrate = hz;
-	write(fd, (char *)hdr, sizeof *hdr);
-	write(fd, p->kcount, p->kcountsize);
-	endfrom = p->fromssize / sizeof(*p->froms);
-	for (fromindex = 0; fromindex < endfrom; fromindex++) {
-		if (p->froms[fromindex] == 0)
-			continue;
-
-		frompc = p->lowpc;
-		frompc += fromindex * p->hashfraction * sizeof(*p->froms);
-		for (toindex = p->froms[fromindex]; toindex != 0;
-		     toindex = p->tos[toindex].link) {
-#ifdef DEBUG
-			len = sprintf(dbuf,
-			"[mcleanup2] frompc 0x%x selfpc 0x%x count %d\n" ,
-				frompc, p->tos[toindex].selfpc,
-				p->tos[toindex].count);
-			write(log, dbuf, len);
-#endif
-			rawarc.raw_frompc = frompc;
-			rawarc.raw_selfpc = p->tos[toindex].selfpc;
-			rawarc.raw_count = p->tos[toindex].count;
-			write(fd, &rawarc, sizeof rawarc);
-		}
-	}
-	close(fd);
-}
-
-/*
- * Control profiling
- *	profiling is what mcount checks to see if
- *	all the data structures are ready.
- */
-void
-moncontrol(mode)
-	int mode;
-{
-	struct gmonparam *p = &_gmonparam;
-
-	if (mode) {
-		/* start */
-		profil((char *)p->kcount, p->kcountsize, p->lowpc,
-		    s_scale);
-		p->state = GMON_PROF_ON;
-	} else {
-		/* stop */
-		profil((char *)0, 0, 0, 0);
-		p->state = GMON_PROF_OFF;
-	}
-}
-
-
diff --git a/winsup/cygwin/gmon.h b/winsup/cygwin/gmon.h
deleted file mode 100644
index be016791e..000000000
--- a/winsup/cygwin/gmon.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*	$OpenBSD: gmon.h,v 1.3 1996/04/21 22:31:46 deraadt Exp $	*/
-/*	$NetBSD: gmon.h,v 1.5 1996/04/09 20:55:30 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1982, 1986, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- */
-
-#ifndef _SYS_GMON_H_
-#define _SYS_GMON_H_
-
-#ifndef __P
-#define __P(x) x
-#endif
-
-#include <profile.h>
-
-/*
- * Structure prepended to gmon.out profiling data file.
- */
-struct gmonhdr {
-	u_long	lpc;		/* base pc address of sample buffer */
-	u_long	hpc;		/* max pc address of sampled buffer */
-	int	ncnt;		/* size of sample buffer (plus this header) */
-	int	version;	/* version number */
-	int	profrate;	/* profiling clock rate */
-	int	spare[3];	/* reserved */
-};
-#define GMONVERSION	0x00051879
-
-/*
- * histogram counters are unsigned shorts (according to the kernel).
- */
-#define	HISTCOUNTER	unsigned short
-
-/*
- * fraction of text space to allocate for histogram counters here, 1/2
- */
-#define	HISTFRACTION	2
-
-/*
- * Fraction of text space to allocate for from hash buckets.
- * The value of HASHFRACTION is based on the minimum number of bytes
- * of separation between two subroutine call points in the object code.
- * Given MIN_SUBR_SEPARATION bytes of separation the value of
- * HASHFRACTION is calculated as:
- *
- *	HASHFRACTION = MIN_SUBR_SEPARATION / (2 * sizeof(short) - 1);
- *
- * For example, on the VAX, the shortest two call sequence is:
- *
- *	calls	$0,(r0)
- *	calls	$0,(r0)
- *
- * which is separated by only three bytes, thus HASHFRACTION is
- * calculated as:
- *
- *	HASHFRACTION = 3 / (2 * 2 - 1) = 1
- *
- * Note that the division above rounds down, thus if MIN_SUBR_FRACTION
- * is less than three, this algorithm will not work!
- *
- * In practice, however, call instructions are rarely at a minimal
- * distance.  Hence, we will define HASHFRACTION to be 2 across all
- * architectures.  This saves a reasonable amount of space for
- * profiling data structures without (in practice) sacrificing
- * any granularity.
- */
-#define	HASHFRACTION	2
-
-/*
- * percent of text space to allocate for tostructs with a minimum.
- */
-#define ARCDENSITY	2
-#define MINARCS		50
-#define MAXARCS		((1 << (8 * sizeof(HISTCOUNTER))) - 2)
-
-struct tostruct {
-	u_long	selfpc;
-	long	count;
-	u_short	link;
-	u_short pad;
-};
-
-/*
- * a raw arc, with pointers to the calling site and
- * the called site and a count.
- */
-struct rawarc {
-	u_long	raw_frompc;
-	u_long	raw_selfpc;
-	long	raw_count;
-};
-
-/*
- * general rounding functions.
- */
-#define ROUNDDOWN(x,y)	(((x)/(y))*(y))
-#define ROUNDUP(x,y)	((((x)+(y)-1)/(y))*(y))
-
-/*
- * The profiling data structures are housed in this structure.
- */
-struct gmonparam {
-	int		state;
-	u_short		*kcount;
-	u_long		kcountsize;
-	u_short		*froms;
-	u_long		fromssize;
-	struct tostruct	*tos;
-	u_long		tossize;
-	long		tolimit;
-	u_long		lowpc;
-	u_long		highpc;
-	u_long		textsize;
-	u_long		hashfraction;
-};
-extern struct gmonparam _gmonparam;
-
-/*
- * Possible states of profiling.
- */
-#define	GMON_PROF_ON	0
-#define	GMON_PROF_BUSY	1
-#define	GMON_PROF_ERROR	2
-#define	GMON_PROF_OFF	3
-
-/*
- * Sysctl definitions for extracting profiling information from the kernel.
- */
-#define	GPROF_STATE	0	/* int: profiling enabling variable */
-#define	GPROF_COUNT	1	/* struct: profile tick count buffer */
-#define	GPROF_FROMS	2	/* struct: from location hash bucket */
-#define	GPROF_TOS	3	/* struct: destination/count structure */
-#define	GPROF_GMONPARAM	4	/* struct: profiling parameters (see above) */
-#endif /* !_SYS_GMONH_ */
diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc
deleted file mode 100644
index c185b2671..000000000
--- a/winsup/cygwin/grp.cc
+++ /dev/null
@@ -1,435 +0,0 @@
-/* grp.cc
-
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Original stubs by Jason Molenda of Cygnus Support, crash@cygnus.com
-   First implementation by Gunther Ebert, gunther.ebert@ixos-leipzig.de
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <grp.h>
-#include <wininet.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "pinfo.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-#include "pwdgrp.h"
-
-/* Position in the group cache */
-#define grp_pos _reent_winsup ()->_grp_pos
-
-static __group32 *group_buf;
-static pwdgrp gr (group_buf);
-static char * NO_COPY null_ptr;
-
-bool
-pwdgrp::parse_group ()
-{
-# define grp (*group_buf)[curr_lines]
-  grp.gr_name = next_str (':');
-  if (!*grp.gr_name)
-    return false;
-
-  grp.gr_passwd = next_str (':');
-
-  if (!next_num (grp.gr_gid))
-    return false;
-
-  int n;
-  char *dp = raw_ptr ();
-  for (n = 0; *next_str (','); n++)
-    continue;
-
-  grp.gr_mem = &null_ptr;
-  if (n)
-    {
-      char **namearray = (char **) calloc (n + 1, sizeof (char *));
-      if (namearray)
-	{
-	  for (int i = 0; i < n; i++, dp = strchr (dp, '\0') + 1)
-	    namearray[i] = dp;
-	  grp.gr_mem = namearray;
-	}
-    }
-
-  return true;
-# undef grp
-}
-
-/* Cygwin internal */
-/* Read in /etc/group and save contents in the group cache */
-/* This sets group_in_memory_p to 1 so functions in this file can
-   tell that /etc/group has been read in */
-void
-pwdgrp::read_group ()
-{
-  for (int i = 0; i < gr.curr_lines; i++)
-    if ((*group_buf)[i].gr_mem != &null_ptr)
-      free ((*group_buf)[i].gr_mem);
-
-  load ("/etc/group");
-
-  /* Complete /etc/group in memory if needed */
-  if (!internal_getgrgid (myself->gid))
-    {
-      static char linebuf [200];
-      char group_name [UNLEN + 1] = "mkgroup";
-      char strbuf[128] = "";
-
-      if (wincap.has_security ())
-	{
-	  struct __group32 *gr;
-
-	  cygheap->user.groups.pgsid.string (strbuf);
-	  if ((gr = internal_getgrsid (cygheap->user.groups.pgsid)))
-	    strlcpy (group_name, gr->gr_name, sizeof (group_name));
-	}
-      if (myself->uid == UNKNOWN_UID)
-	strcpy (group_name, "mkpasswd"); /* Feedback... */
-      snprintf (linebuf, sizeof (linebuf), "%s:%s:%lu:%s",
-		group_name, strbuf, myself->gid, cygheap->user.name ());
-      debug_printf ("Completing /etc/group: %s", linebuf);
-      add_line (linebuf);
-    }
-  static char NO_COPY pretty_ls[] = "????????::-1:";
-  if (wincap.has_security ())
-    add_line (pretty_ls);
-  return;
-}
-
-pwdgrp::pwdgrp (passwd *&pbuf) :
-  pwdgrp_buf_elem_size (sizeof (*pbuf)), passwd_buf (&pbuf)
-{
-  read = &pwdgrp::read_passwd;
-  parse = &pwdgrp::parse_passwd;
-  new_muto (pglock);
-}
-
-pwdgrp::pwdgrp (__group32 *&gbuf) :
-  pwdgrp_buf_elem_size (sizeof (*gbuf)), group_buf (&gbuf)
-{
-  read = &pwdgrp::read_group;
-  parse = &pwdgrp::parse_group;
-  new_muto (pglock);
-}
-
-struct __group32 *
-internal_getgrsid (cygpsid &sid)
-{
-  char sid_string[128];
-
-  gr.refresh (false);
-
-  if (sid.string (sid_string))
-    for (int i = 0; i < gr.curr_lines; i++)
-      if (!strcmp (sid_string, group_buf[i].gr_passwd))
-	return group_buf + i;
-  return NULL;
-}
-
-struct __group32 *
-internal_getgrgid (__gid32_t gid, bool check)
-{
-  gr.refresh (check);
-
-  for (int i = 0; i < gr.curr_lines; i++)
-    if (group_buf[i].gr_gid == gid)
-      return group_buf + i;
-  return NULL;
-}
-
-struct __group32 *
-internal_getgrnam (const char *name, bool check)
-{
-  gr.refresh (check);
-
-  for (int i = 0; i < gr.curr_lines; i++)
-    if (strcasematch (group_buf[i].gr_name, name))
-      return group_buf + i;
-
-  /* Didn't find requested group */
-  return NULL;
-}
-
-static struct __group16 *
-grp32togrp16 (struct __group16 *gp16, struct __group32 *gp32)
-{
-  if (!gp16 || !gp32)
-    return NULL;
-
-  /* Copying the pointers is actually unnecessary.  Just having the correct
-     return type is important. */
-  gp16->gr_name = gp32->gr_name;
-  gp16->gr_passwd = gp32->gr_passwd;
-  gp16->gr_gid = (__gid16_t) gp32->gr_gid;		/* Not loss-free */
-  gp16->gr_mem = gp32->gr_mem;
-
-  return gp16;
-}
-
-extern "C" struct __group32 *
-getgrgid32 (__gid32_t gid)
-{
-  return internal_getgrgid (gid, true);
-}
-
-extern "C" struct __group16 *
-getgrgid (__gid16_t gid)
-{
-  static struct __group16 g16;	/* FIXME: thread-safe? */
-
-  return grp32togrp16 (&g16, getgrgid32 (gid16togid32 (gid)));
-}
-
-extern "C" struct __group32 *
-getgrnam32 (const char *name)
-{
-  return internal_getgrnam (name, true);
-}
-
-extern "C" struct __group16 *
-getgrnam (const char *name)
-{
-  static struct __group16 g16;	/* FIXME: thread-safe? */
-
-  return grp32togrp16 (&g16, getgrnam32 (name));
-}
-
-extern "C" void
-endgrent ()
-{
-  grp_pos = 0;
-}
-
-extern "C" struct __group32 *
-getgrent32 ()
-{
-  if (grp_pos == 0)
-    gr.refresh (true);
-  if (grp_pos < gr.curr_lines)
-    return group_buf + grp_pos++;
-
-  return NULL;
-}
-
-extern "C" struct __group16 *
-getgrent ()
-{
-  static struct __group16 g16;	/* FIXME: thread-safe? */
-
-  return grp32togrp16 (&g16, getgrent32 ());
-}
-
-extern "C" void
-setgrent ()
-{
-  grp_pos = 0;
-}
-
-/* Internal function. ONLY USE THIS INTERNALLY, NEVER `getgrent'!!! */
-struct __group32 *
-internal_getgrent (int pos)
-{
-  gr.refresh (false);
-
-  if (pos < gr.curr_lines)
-    return group_buf + pos;
-  return NULL;
-}
-
-int
-internal_getgroups (int gidsetsize, __gid32_t *grouplist, cygpsid * srchsid)
-{
-  HANDLE hToken = NULL;
-  DWORD size;
-  int cnt = 0;
-  struct __group32 *gr;
-  __gid32_t gid;
-  const char *username;
-
-  if (allow_ntsec)
-    {
-      /* If impersonated, use impersonation token. */
-      if (cygheap->user.issetuid ())
-	hToken = cygheap->user.token ();
-      else if (!OpenProcessToken (hMainProc, TOKEN_QUERY, &hToken))
-	hToken = NULL;
-    }
-  if (hToken)
-    {
-      if (GetTokenInformation (hToken, TokenGroups, NULL, 0, &size)
-	  || GetLastError () == ERROR_INSUFFICIENT_BUFFER)
-	{
-	  char buf[size];
-	  TOKEN_GROUPS *groups = (TOKEN_GROUPS *) buf;
-
-	  if (GetTokenInformation (hToken, TokenGroups, buf, size, &size))
-	    {
-	      cygsid sid;
-
-	      if (srchsid)
-		{
-		  for (DWORD pg = 0; pg < groups->GroupCount; ++pg)
-		    if ((cnt = (*srchsid == groups->Groups[pg].Sid)))
-		      break;
-		}
-	      else
-		for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx)
-		  if (sid.getfromgr (gr))
-		    for (DWORD pg = 0; pg < groups->GroupCount; ++pg)
-		      if (sid == groups->Groups[pg].Sid &&
-			  sid != well_known_world_sid)
-		        {
-			  if (cnt < gidsetsize)
-			    grouplist[cnt] = gr->gr_gid;
-			  ++cnt;
-			  if (gidsetsize && cnt > gidsetsize)
-			    {
-			      if (!cygheap->user.issetuid ())
-				CloseHandle (hToken);
-			      goto error;
-			    }
-			  break;
-			}
-	    }
-	}
-      else
-	debug_printf ("%d = GetTokenInformation(NULL) %E", size);
-      if (!cygheap->user.issetuid ())
-	CloseHandle (hToken);
-      return cnt;
-    }
-
-  gid = myself->gid;
-  username = cygheap->user.name ();
-  for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx)
-    if (gid == gr->gr_gid)
-      {
-	if (cnt < gidsetsize)
-	  grouplist[cnt] = gr->gr_gid;
-	++cnt;
-	if (gidsetsize && cnt > gidsetsize)
-	  goto error;
-      }
-    else if (gr->gr_mem)
-      for (int gi = 0; gr->gr_mem[gi]; ++gi)
-	if (strcasematch (username, gr->gr_mem[gi]))
-	  {
-	    if (cnt < gidsetsize)
-	      grouplist[cnt] = gr->gr_gid;
-	    ++cnt;
-	    if (gidsetsize && cnt > gidsetsize)
-	      goto error;
-	  }
-  return cnt;
-
-error:
-  set_errno (EINVAL);
-  return -1;
-}
-
-extern "C" int
-getgroups32 (int gidsetsize, __gid32_t *grouplist)
-{
-  return internal_getgroups (gidsetsize, grouplist);
-}
-
-extern "C" int
-getgroups (int gidsetsize, __gid16_t *grouplist)
-{
-  __gid32_t *grouplist32 = NULL;
-
-  if (gidsetsize < 0)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  if (gidsetsize > 0 && grouplist)
-    grouplist32 = (__gid32_t *) alloca (gidsetsize * sizeof (__gid32_t));
-
-  int ret = internal_getgroups (gidsetsize, grouplist32);
-
-  if (gidsetsize > 0 && grouplist)
-    for (int i = 0; i < ret; ++ i)
-      grouplist[i] = grouplist32[i];
-
-  return ret;
-}
-
-extern "C" int
-initgroups32 (const char *, __gid32_t)
-{
-  if (wincap.has_security ())
-    cygheap->user.groups.clear_supp ();
-  return 0;
-}
-
-extern "C" int
-initgroups (const char * name, __gid16_t gid)
-{
-  return initgroups32 (name, gid16togid32(gid));
-}
-
-/* setgroups32: standards? */
-extern "C" int
-setgroups32 (int ngroups, const __gid32_t *grouplist)
-{
-  if (ngroups < 0 || (ngroups > 0 && !grouplist))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  if (!wincap.has_security ())
-    return 0;
-
-  cygsidlist gsids (cygsidlist_alloc, ngroups);
-  struct __group32 *gr;
-
-  if (ngroups && !gsids.sids)
-    return -1;
-
-  for (int gidx = 0; gidx < ngroups; ++gidx)
-    {
-      for (int gidy = 0; gidy < gidx; gidy++)
-	if (grouplist[gidy] == grouplist[gidx])
-	  goto found; /* Duplicate */
-      if ((gr = internal_getgrgid (grouplist[gidx])) &&
-	  gsids.addfromgr (gr))
-	goto found;
-      debug_printf ("No sid found for gid %d", grouplist[gidx]);
-      gsids.free_sids ();
-      set_errno (EINVAL);
-      return -1;
-    found:
-      continue;
-    }
-  cygheap->user.groups.update_supp (gsids);
-  return 0;
-}
-
-extern "C" int
-setgroups (int ngroups, const __gid16_t *grouplist)
-{
-  __gid32_t *grouplist32 = NULL;
-
-  if (ngroups > 0 && grouplist)
-    {
-      grouplist32 = (__gid32_t *) alloca (ngroups * sizeof (__gid32_t));
-      if (grouplist32 == NULL)
-	return -1;
-      for (int i = 0; i < ngroups; i++)
-	grouplist32[i] = grouplist[i];
-    }
-  return setgroups32 (ngroups, grouplist32);
-}
diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/heap.cc
deleted file mode 100644
index 95d9b17bc..000000000
--- a/winsup/cygwin/heap.cc
+++ /dev/null
@@ -1,161 +0,0 @@
-/* heap.cc: Cygwin heap manager.
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "cygerrno.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include "heap.h"
-#include "shared_info.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "registry.h"
-#include "cygwin_version.h"
-
-#define assert(x)
-
-static unsigned page_const;
-
-extern "C" size_t getpagesize ();
-
-#define MINHEAP_SIZE (4 * 1024 * 1024)
-
-/* Initialize the heap at process start up.  */
-
-void
-heap_init ()
-{
-  /* If we're the forkee, we must allocate the heap at exactly the same place
-     as our parent.  If not, we don't care where it ends up.  */
-
-  page_const = system_info.dwPageSize;
-  if (!cygheap->user_heap.base)
-    {
-      cygheap->user_heap.chunk = cygwin_shared->heap_chunk_size ();
-      while (cygheap->user_heap.chunk >= MINHEAP_SIZE)
-	{
-	  /* Initialize page mask and default heap size.  Preallocate a heap
-	   * to assure contiguous memory.  */
-	  cygheap->user_heap.ptr = cygheap->user_heap.top =
-	  cygheap->user_heap.base =
-	    VirtualAlloc (NULL, cygheap->user_heap.chunk, MEM_RESERVE, PAGE_NOACCESS);
-	  if (cygheap->user_heap.base)
-	    break;
-	  cygheap->user_heap.chunk -= 1 * 1024 * 1024;
-	}
-      if (cygheap->user_heap.base == NULL)
-	api_fatal ("unable to allocate heap, heap_chunk_size %d, %E",
-		   cygheap->user_heap.chunk);
-      cygheap->user_heap.max = (char *) cygheap->user_heap.base + cygheap->user_heap.chunk;
-    }
-  else
-    {
-      DWORD chunk = cygheap->user_heap.chunk;	/* allocation chunk */
-      /* total size commited in parent */
-      DWORD allocsize = (char *) cygheap->user_heap.top -
-			(char *) cygheap->user_heap.base;
-      /* round up by chunk size */
-      DWORD reserve_size = chunk * ((allocsize + (chunk - 1)) / chunk);
-
-      /* Loop until we've managed to reserve an adequate amount of memory. */
-      char *p;
-      for (;;)
-	{
-	  p = (char *) VirtualAlloc (cygheap->user_heap.base, reserve_size,
-				     MEM_RESERVE, PAGE_READWRITE);
-	  if (p)
-	    break;
-	  if ((reserve_size -= page_const) <= allocsize)
-	    break;
-	}
-      if (p != cygheap->user_heap.base)
-	api_fatal ("heap allocated but not at %p", cygheap->user_heap.base);
-      if (!VirtualAlloc (cygheap->user_heap.base, allocsize, MEM_COMMIT, PAGE_READWRITE))
-	api_fatal ("MEM_COMMIT failed, %E");
-    }
-
-  debug_printf ("heap base %p, heap top %p", cygheap->user_heap.base,
-		cygheap->user_heap.top);
-  page_const--;
-  malloc_init ();
-}
-
-#define pround(n) (((size_t)(n) + page_const) & ~page_const)
-
-/* FIXME: This function no longer handles "split heaps". */
-
-extern "C" void *
-sbrk (int n)
-{
-  char *newtop, *newbrk;
-  unsigned commitbytes, newbrksize;
-
-  if (n == 0)
-    return cygheap->user_heap.ptr;		/* Just wanted to find current cygheap->user_heap.ptr address */
-
-  newbrk = (char *) cygheap->user_heap.ptr + n;	/* Where new cygheap->user_heap.ptr will be */
-  newtop = (char *) pround (newbrk);		/* Actual top of allocated memory -
-						   on page boundary */
-
-  if (newtop == cygheap->user_heap.top)
-    goto good;
-
-  if (n < 0)
-    {						/* Freeing memory */
-      assert (newtop < cygheap->user_heap.top);
-      n = (char *) cygheap->user_heap.top - newtop;
-      if (VirtualFree (newtop, n, MEM_DECOMMIT)) /* Give it back to OS */
-	goto good;				/*  Didn't take */
-      else
-	goto err;
-    }
-
-  assert (newtop > cygheap->user_heap.top);
-
-  /* Find the number of bytes to commit, rounded up to the nearest page. */
-  commitbytes = pround (newtop - (char *) cygheap->user_heap.top);
-
-  /* Need to grab more pages from the OS.  If this fails it may be because
-     we have used up previously reserved memory.  Or, we're just plumb out
-     of memory.  Only attempt to commit memory that we know we've previously
-     reserved.  */
-  if (newtop <= cygheap->user_heap.max)
-    {
-      if (VirtualAlloc (cygheap->user_heap.top, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL)
-	goto good;
-    }
-
-  /* Couldn't allocate memory.  Maybe we can reserve some more.
-     Reserve either the maximum of the standard cygwin_shared->heap_chunk_size ()
-     or the requested amount.  Then attempt to actually allocate it.  */
-  if ((newbrksize = cygheap->user_heap.chunk) < commitbytes)
-    newbrksize = commitbytes;
-
-   if ((VirtualAlloc (cygheap->user_heap.top, newbrksize, MEM_RESERVE, PAGE_NOACCESS)
-        || VirtualAlloc (cygheap->user_heap.top, newbrksize = commitbytes, MEM_RESERVE, PAGE_NOACCESS))
-       && VirtualAlloc (cygheap->user_heap.top, commitbytes, MEM_COMMIT, PAGE_READWRITE) != NULL)
-     {
-	cygheap->user_heap.max = (char *) cygheap->user_heap.max + pround (newbrksize);
-	goto good;
-     }
-
-err:
-  set_errno (ENOMEM);
-  return (void *) -1;
-
-good:
-  void *oldbrk = cygheap->user_heap.ptr;
-  cygheap->user_heap.ptr = newbrk;
-  cygheap->user_heap.top = newtop;
-  return oldbrk;
-}
diff --git a/winsup/cygwin/heap.h b/winsup/cygwin/heap.h
deleted file mode 100644
index b497dd3a4..000000000
--- a/winsup/cygwin/heap.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* heap.h: Cygwin heap manager definitions.
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "perprocess.h"
-
-/* Heap management. */
-void heap_init ();
-void malloc_init ();
-
-#define inheap(s) \
-  (cygheap->user_heap.ptr && s \
-   && ((char *) (s) >= (char *) cygheap->user_heap.base) \
-   && ((char *) (s) <= (char *) cygheap->user_heap.top))
diff --git a/winsup/cygwin/hires.h b/winsup/cygwin/hires.h
deleted file mode 100644
index df4c44c4a..000000000
--- a/winsup/cygwin/hires.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* hires.h: Definitions for hires clock calculations
-
-   Copyright 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef __HIRES_H__
-#define __HIRES_H__
-
-#include <mmsystem.h>
-
-/* Largest delay in ms for sleep and alarm calls.
-   Allow actual delay to exceed requested delay by 10 s.
-   Express as multiple of 1000 (i.e. seconds) + max resolution
-   The tv_sec argument in timeval structures cannot exceed
-   HIRES_DELAY_MAX / 1000 - 1, so that adding fractional part
-   and rounding won't exceed HIRES_DELAY_MAX */
-#define HIRES_DELAY_MAX (((UINT_MAX - 10000) / 1000) * 1000) + 10
-
-class hires_base
-{
- protected:
-  int inited;
- public:
-  virtual LONGLONG usecs (bool justdelta) {return 0LL;}
-  virtual ~hires_base () {}
-};
-
-class hires_us : hires_base
-{
-  LARGE_INTEGER primed_ft;
-  LARGE_INTEGER primed_pc;
-  double freq;
-  void prime ();
- public:
-  LONGLONG usecs (bool justdelta);
-};
-
-class hires_ms : hires_base
-{
-  DWORD initime_ms;
-  LARGE_INTEGER initime_us;
-  static UINT minperiod;
-  UINT prime ();
- public:
-  LONGLONG usecs (bool justdelta);
-  UINT dmsecs () { return timeGetTime (); }
-  UINT resolution () { return minperiod ?: prime (); }
-
-};
-
-extern hires_ms gtod;
-#endif /*__HIRES_H__*/
diff --git a/winsup/cygwin/how-autoload-works.txt b/winsup/cygwin/how-autoload-works.txt
deleted file mode 100644
index 4f96d8beb..000000000
--- a/winsup/cygwin/how-autoload-works.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-Copyright 2002 Red Hat Inc., Egor Duda
-
-How does function autoloading work?
-
-Cygwin has the ability to handle win32 functions which are present on
-some platforms and not present on others via autoload mechanism.  It's
-essentially a lazy binding of symbols.  It works as following.  For
-(almost) every function from OS API which cygwin uses, a stub is created
-in file autoload.cc.  Each reference to the such function from win32 API
-in cygwin dll source code is actually pointing to this stub.
-
-When the function, say GetConsoleWindow(), is called for the first time,
-the control is passed to its stub.  The stub tries to load the
-appropriate system dll via LoadModule() and get the actual function
-address via GetProcAddress().  If this operation succeeds, the stub is
-"patched" to pass control to actual address of GetConsoleWindow() in
-appropriate system dll, so that next time we won't have to load dll and
-perform address lookup in it again.  From this point on, the call to the
-function is performed as if the dll/function were linked statically.
-
-If LoadModule() or GetProcAddress() fail, (and on nt4 the latter indeed
-fails because GetConsoleWindow() is not available in kernel32.dll), then
-the application, depending on what kind of stub is created in
-autoload.cc, will either:
-
-1) Exit with fatal error.
-
-2) Or return a predefined value indicating an error; and set the windows
-error code to 127 (ERROR_PROC_NOT_FOUND).
-
-Almost all w32api functions are linked into the cygwin dll in this
-manner, dynamically, at runtime.
-
-The costs:
-1) A tiny overhead in the initial call to a function call as each call
-is performed, indirectly, via a stub.  For the first lookup of a symbol
-of an unloaded dll, there is also some overhead in loading the dll for
-the first time.  The dll is only loaded by the first call to a symbol
-in the dll.  After the first call to a function, subsequent calls are
-as fast as a normal, statically loaded function.
-
-The benefits:
-1) Speedup at startup time.  Applications only load those dlls which are
-actually needed.  For example, if application never uses socket
-functions, winsock dlls are never loaded.
-
-2) Greatly simplify wincap system -- we don't need to have a separate
-capability for every win32 function which may or may not be present on
-particular win32 platform.
-
-3) Allows a single cygwin1.dll for all win32 platforms.
-
-If you're changing in cygwin1.dll source code and if you use some
-function that was not used there before, you should add a stub so it
-will be autoloaded.  To do so, add one of the LoadDllfunc* macros to
-autoload.cc.  All macros eventually resolve to the following form:
-
-LoadDLLfuncEx2 (function name, parameter block length, dll name,
-                non-fatality flag , value to return if function not available)
-
-Parameter block length is a sum of sizes (in bytes) of parameters which are
-being passed to the function. If non-fatality flag is set to 0, then failure
-to load dll and find a function will cause fatal error. If non fatality flag
-is set to 1, then call to the function will return default value.
-You can also use shorter versions -- LoadDLLfuncEx and LoadDLLfunc, if the
-defaults they provide suit your needs.
diff --git a/winsup/cygwin/how-cygheap-works.txt b/winsup/cygwin/how-cygheap-works.txt
deleted file mode 100644
index b60f88808..000000000
--- a/winsup/cygwin/how-cygheap-works.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-Copyright 2001 Red Hat Inc., Christopher Faylor
-
-Cygwin has recently adopted something called the "cygwin heap".  This is
-an internal heap that is inherited by forked/execed children.  It
-consists of process specific information that should be inherited.  So
-things like the file descriptor table, the current working directory,
-and the chroot value live there.
-
-The cygheap is also used to pass argv information to a child process.
-There is a problem here, though.  If you allocate space for argv on the
-heap and then exec a process the child process (1) will happily use the
-space in the heap.  But what happens when that process execs another
-process (2)?  The space used by child process (1) still is being used in
-child process (2) but it is basically just a memory leak.
-
-To rectify this problem, memory used by child process 1 is tagged in
-such a way that child process 2 will know to delete it.  This is in
-cygheap_fixup_in_child.
-
-The cygheap memory allocation functions are adapted from memory
-allocators developed by DJ Delorie.  They are similar to early BSD
-malloc and are intended to be relatively lightweight and relatively
-fast.
-
-How is the cygheap propagated to the child?
-
-Well, it depends if you are running on Windows 9x or Windows NT.
-
-On NT and 9x, just before CreateProcess is about to be called in
-fork or exec, a shared memory region is prepared for copying of the
-cygwin heap.  This is in cygheap_setup_for_child.  The handle to this
-shared memory region is passed to the new process in the 'child_info'
-structure.
-
-If there are no handles that need "fixing up" prior to starting another
-process, cygheap_setup_for_child will also copy the contents of the
-cygwin heap to the shared memory region.
-
-If there are any handles that need "fixing up" prior to invoking
-another process (i.e., sockets) then the creation of the shared
-memory region and copying of the current cygwin heap is a two
-step process.
-
-First the shared memory region is created and the process is started
-in a "CREATE_SUSPENDED" state, inheriting the handle.  After the
-process is created, the fixup_before_*() functions are called.  These
-set information in the heap and duplicate handles in the child, essentially
-ensuring that the child's fd table is correct.
-
-(Note that it is vital that the cygwin heap should not grow during this
-process.  Currently, there is no guard against this happening so this
-operation is not thread safe.)
-
-Meanwhile, back in fork_parent, the function
-cygheap_setup_for_child_cleanup is called.  In the simple "one step"
-case above, all that happens is that the shared memory is ummapped and
-the handle referring to it is closed.
-
-In the two step process, the cygheap is now copied to the shared memory
-region, complete with new fdtab info (the child process will see the
-updated information as soon as it starts).  Then the memory is unmapped,
-the handle is closed, and upon return the child process is started.
-
-It is in the child process that the difference between Windows 9x and
-Windows NT becomes evident.
-
-Under Windows NT, the operation is simple.  The shared memory handle is
-used to map the information that the parent has set up into the cygheap
-location in the child.  This means that the child has a copy of the
-cygwin heap existing in "shared memory" but the only process with a view
-to this "shared memory" is the child.
-
-Under Windows 9x, due to address limitations, we can't just map the
-shared memory region into the cygheap position.  So, instead, the memory
-is mapped whereever Windows wants to put it, a new heap region is
-allocated at the same place as in the parent, the contents of the shared
-memory is *copied* to the new heap, and the shared memory is unmapped.
-Simple, huh?
-
-Why do we go to these contortions?  Previous versions (<1.3.3) of cygwin
-used to block when creating a child so that the child could copy the
-parent's cygheap.  The problem with this was that when a cygwin process
-invoked a non-cygwin child, it would block forever waiting for the child
-to let it know that it was done copying the heap.  That caused
-understandable complaints from people who wanted to run non-cygwin
-applications "in the background".
-
-In Cygwin 1.3.3 (and presumably beyond) the location of the cygwin heap
-has been fixed to be at the end of the cygwin1.dll address space.
-Previously, we let the "OS" choose where to allocate the cygwin heap in
-the initial cygwin process and attempted to use this same location in
-subsequent cygwin processes started from this parent.
-
-The reason for putting cygheap at a fixed, known location is that we
-need to put this information at a fixed location since it incorporates
-pointers to entities within itself.  So, when a process forks or execs,
-the memory referred to by the pointers has to exist at the same place in
-both the parent or the child.
-
-(It "might be nice" to used something like Microsoft's "based pointers"
-for the cygheap.  Unfortunately gcc does not support that feature, as of
-this writing.)
-
-The reason for choosing a fixed, arbitrary location is to accommodate
-Windows XP, although there were sporadic complaints of cygwin heap
-failures in other pathological situations with both NT and 9x.  In
-Windows XP, Microsoft made the allocation of memory less deterministic.
-This is certainly their right.  Cygwin was previously relying on
-undocumented and "iffy" behavior before.  So, now we always allocate
-space immediately after the dll in the theory that there is not going
-to be anything else living there.
-
-Recent (2001-09-20) cygwin email threads have indicated that we're not
-exactly on completely firm ground now, though.  We are assuming that
-there is sufficient space after the cygwin DLL for the allocation of the
-cygwin heap.  Unfortunately the ld option '--enable-auto-image-base'
-has a tendency to allocate DLLs immediately after cygwin1.dll.  This
-causes the dreaded "Couldn't reserve space for cygwin's heap" message.
-
-Solutions for this behavior are currently in the musing state.
diff --git a/winsup/cygwin/how-fhandlers-work.txt b/winsup/cygwin/how-fhandlers-work.txt
deleted file mode 100644
index cef46fedc..000000000
--- a/winsup/cygwin/how-fhandlers-work.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-Copyright 2001 Red Hat Inc., Robert Collins
-
-fhandlers are the core mechanism by which cygwin provides a file descripter (fd)
-interface to things such as a random number generated, winsock sockets, raw disk
-devices, the clipboard, the console and so on. Under unix access to all such
-devices is via a combination of IOCTL's and open/close/read/write calls. Some
-special functions do exist - such as bind () and listen () for sockets, but
-these consistently operate on fd's. Under Win32 there are disparate interfaces
-that have little in common with each other. See for example Direct Sound and
-the Clipboard.
-
-The fhandler class provides all open,read,write,close, ioctl and fork()/exec()
-functionality for the fd interface. The base class operates on win32 backed
-files. The various derived classes utilise win32 primitives to provide their
-specific functionality.
-
-When a file is opened - not necesarily via open() a fd is assigned to it. The fd
-includes a pointer to the actual fhandler that operates this specific file. All
-file-oriented system calls then operate off this basic structure.
-
-For example, lets examine lseek ().
-
-extern "C" off_t
-_lseek (int fd, off_t pos, int dir)
-{
-  off_t res;
-  sigframe thisframe (mainthread);
-
-  if (dir != SEEK_SET && dir != SEEK_CUR && dir != SEEK_END)
-    {
-      set_errno (EINVAL);
-      res = -1;
-    }
-  else if (cygheap->fdtab.not_open (fd))
-    {
-      set_errno (EBADF);
-      res = -1;
-    }
-  else
-    {
-      res = cygheap->fdtab[fd]->lseek (pos, dir);
-    }
-  syscall_printf ("%d = lseek (%d, %d, %d)", res, fd, pos, dir);
-
-  return res;
-}
-
-The sigframe thisframe (mainthread); is signal related - see
-"how_signals_work.txt".
-
-The if, else if, else tests (in order)
-* the validity of the dir parameter,
-* is the fd being passed actually open? (cannot seek on a closed fd)
-* call the lseek virtual function in the associated fhandler.
-
-So as you can see, there is no code that attempts to understand the nature of
-the fhandler.
-
-fhandlers that make cross-function-call use of win32 objects that are not
-inheritable cross-process need to implement fixup-after-fork and recreate those
-objects. HANDLES can be inherited, but memory mapped regions (for example)
-cannot.
-
-For an example step-by-step to create a new fhandler, see
-../doc/fhandler-tut.txt
-
-Note: In most case, it is safe to assume that using new/delete (or
-malloc/free) in an fhandler is dangerous and to be avoided.  The reason
-for this is that memory allocated to fhandlers is copied between execed
-processes in the cygwin heap.  Memory allocated in new/delete is only
-copied to forked processes.  So use cmalloc/cfree.
-
-Obviously it is possible to use new/delete in some situations but if you're
-seeing strange core dumps with usages like cat < /my/newfhandler then the
-above may well be the culprit.
diff --git a/winsup/cygwin/how-signals-work.txt b/winsup/cygwin/how-signals-work.txt
deleted file mode 100644
index 26e5ee1ba..000000000
--- a/winsup/cygwin/how-signals-work.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-Copyright 2001, 2002, 2003 Red Hat Inc., Christopher Faylor
-
-[this information is currently out-of-date]
-How do signals work?
-
-On process startup, cygwin starts a secondary thread that deals with signals.
-This thread contains a loop which blocks waiting for information to show up
-on a pipe whose handle (sendsig) is currently stored in _pinfo (this may change).
-
-Communication on the sendsig pipe is via the 'sigelem' structure.  This
-structure is filled out by the sig_send function with information about the
-signal being sent, such as (as of this writing) the signal number, the
-originating pid, the originating thread, and the address of the mask to
-use (this may change).
-
-If the signal is not blocked, then the function "sig_handle" is called
-with the signal number as an argument.  This is a fairly straightforward
-function.  It first checks to see if the signal is special in any way.
-
-A special signal is something like SIGKILL or SIGSTOP.  The user has no
-control over how those signals affect a UNIX process.  If a SIGKILL is
-received then sig_handle calls exit_sig to exit the process.  If SIGSTOP
-is called then sig_handle calls the regular signal dispatch function
-with a special function argument "sig_handle_tty_stop".  The signal
-dispatch function is described below.
-
-An uncaught signal like SIGTERM or SIGHUP will cause the process to exit
-with the standard UNIX exit values.  Uncaught signals like SIGUSR1 are
-ignored, as on UNIX.
-
-If the signal has an associated signal handler, then the setup_handler
-function is eventually called.  It is passed the signal, the address of
-the handler, and a standard UNIX sigaction structure.  The meat of
-signal processing is in setup_handler.
-
-setup_handler has a "simple" task.  It tries to stop the appropriate
-thread and redirect its execution to the signal handler function.
-Currently, the "appropriate thread" is only the main thread.  Someday
-we'll have to change this to allow cygwin to interrupt other user
-threads.
-
-To accomplish its task, setup_handler first inspects the static sigsave
-structure.  This structure contains information on any not-yet-handled
-signals that may have been set up by a previous call to setup_handler
-but not yet dispatched in the main thread.  If the sigsave structure
-seems to be "active", then a "pending" flag is set (see below) and the
-function returns.  Otherwise processing continues.
-
-After determining that sigsave is available, setup_handler will take one
-of two routes, depending on whether the main thread is executing in the
-cygwin DLL or is currently in "user" code.  We'll discuss the cygwin DLL
-case first.
-
-If sigsave seems to be available, then the frame information for the
-main thread is inspected.  This information is set by any cygwin
-function that is known to block (such as _read()), usually by calling
-'sigframe thisframe (mainthread)' in the cygwin function.  This call
-sets up information about the current stack frame of an executing cygwin
-process.  Any function which uses 'sigframe thisframe' should be signal
-aware.  It should detect when a signal has arrived and return
-immediately.  This method is also used throughout the DLL to ensure
-accurate frame info for the executing function.  So, you'll see it
-sprinkled liberally throughout the DLL, usually at places where
-empirical tests have indicated problems finding this address via the
-brute force method stack walking method employed in setup_handler.
-
-So, if mainframe is active, that means that we have good information
-about the state of the main thread.  Cygwin uses the stack frame info
-from this structure to insert a call to the assembly language function
-'sigdelayed' in place of the main thread's normal return address.  So,
-when a call to (e.g.) _read returns after detecting a signal, it does
-not return to its caller.  Rather, it returns to sigdelayed.
-
-The sigdelayed function saves a lot of state on the stack and sets the
-signal mask as appropriate for POSIX.  It uses information from the
-sigsave structure which has been filled in by interrupt_on_return, as
-called by setup_handler.  sigdelayed pushes a "call" to the function
-"sigreturn" on the stack.  This will be the return address seen by the
-signal handler.  After setting up the return value, modifying the signal
-mask, and saving other information on the stack, sigreturn clears the
-sigsave structure (so that setup_handler can use it) and jumps to the
-signal handler function.  And, so a UNIX signal handler function is
-emulated.
-
-The signal handler function operates as normal for UNIX but, upon
-return, it does not go directly back to the return address of the
-original cygwin function.  Instead it returns to the previously
-mentioned 'sigreturn' assembly language function.
-
-sigreturn resets the process mask to its state prior to calling the
-signal handler.  It checks to see if any new signals have come in and
-calls the handler for them now, ensuring that the order of signal
-arrival is more or less maintained.  It checks to see if a cygwin
-routine has set a special "restore this errno on returning from a
-signal" value and sets errno to this, if so.  Finally, it restores all
-of the register values that were in effect when sigdelayed was called.
-
-Ok, you thought I had forgotten about the 'pending' stuff didn't you?
-Well, if you can rewind up to the discussion of sig_handle, we'll return
-to the situation where sigsave was currently active.  In this case,
-setup_handler will set a "pending" flag, will reincrement the appropriate
-element of the above signal array, and will return 0 to indicate that
-the interrupt did not occur.  Otherwise setup_handler returns 1.
-
-For pending signals, the theory is that the signal handler thread will
-be forced to be rerun by having some strategic cygwin function call
-sig_send with a __SIGFLUSH "argument" to it.  This causes the signal
-handler to rescan the signal array looking for pending signals.
-
-This leads us to the sig_send function.  This is the "client side" part
-of the signal manipulation process.  sig_send is the low-level function
-called by a high level process like kill().  You would use sig_send
-to send a __SIGFLUSH to the signal thread.
diff --git a/winsup/cygwin/how-spawn-works.txt b/winsup/cygwin/how-spawn-works.txt
deleted file mode 100644
index e4e25eae9..000000000
--- a/winsup/cygwin/how-spawn-works.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Spawn.cc in cygwin handles spawn, vfork and exec calls. It does this via
-a mode parameter that determines its behaviour with respect to the
-child.
-
-Of particular interest is the exec behaviour.
-
-In general spawn_guts (where the action happens) does the following:
-* Finds the actual program being run (which may include path searching).
-* Determines the type (.exe, shell script, perl etc) and for non binary
-programs finds the correct interpreter.
-* Creates a commandline (based on the type and the user parameters).
-* Guesses at whether the binary that will be invoked is a cygwin program
-or not (if (real_path.iscygexec ())) and uses that information to copy
-the argv table, or to translate it for win32 program usage.
-* passes a handle to the parent to the child (note: this handle should
-have it's rights restricted  the daemon is merged).
-* Start the process.
-* if the mode is _P_OVERLAY (we are doing an exec)
-wait for the child to
-a) if it's a cygwin process, signal us via an event.
-b) if it's a win32 process, exit.
-c) exit.
-
-If a) occurs, we 'reparent' the child which makes it look to the current
-process's parent in the pid and process group chains.
-b) is where the cygwin process hangs around as a 'stub' presenting it's
-pid as the win32 process's pid, to allow cygwin tools to kill the win32
-process.
-once a-c has occured, execution resumes.
-* If the mode is _P_OVERLAY, this process exits, otherwise it's
-behaviour depends on the mode parameter. See the last block of
-spawn_guts.
diff --git a/winsup/cygwin/how-to-debug-cygwin.txt b/winsup/cygwin/how-to-debug-cygwin.txt
deleted file mode 100644
index cf10bafe7..000000000
--- a/winsup/cygwin/how-to-debug-cygwin.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-Copyright 2001, 2002 Red Hat Inc., Egor Duda
-
-So, your favorite program has crashed?  And did you say something about
-'stackdump'?  Or it just prints its output from left to right and
-upside-down?  Well, you can file an angry bug report and wait until some
-of the core developers try to reproduce your problem, try to find what's
-the matter with your program and cygwin and fix the bug, if any.  But
-you can do something better than that.  You can debug the problem
-yourself, and even if you can't fix it, your analysis may be very
-helpful.  Here's the (incomplete) howto on cygwin debugging.
-
-1.  First things first
-
-    The first thing you'll need to do is to build cygwin1.dll and your
-    crashed application from sources.  To debug them you'll need debug
-    information, which is normally stripped from executables.  You probably
-    also want to build a version of the dll with more debugging capabilities
-    by reconfiguring your build directory, specifying the --enable-debugging
-    option to configure.
-
-2. Creating a known-working cygwin debugging environment
-
-   - create a separate directory, say, c:\cygdeb, and put known-working
-     cygwin1.dll and gdb.exe in it.
-   - create a wrapper c:\cygdeb\debug_wrapper.cmd:
-
-========= debug_wrapper.cmd =========
-rem setting CYGWIN_TESTING environment variable makes cygwin application
-rem not to interfere with other already running cygwin applications.
-set CYGWIN_TESTING=1
-c:\cygdeb\gdb.exe -nw %1 %2
-===================================
-
-3. Using cygwin's JIT debugging facility
-
-   add 'error_start=c:\cygdeb\debug_wrapper.cmd' to CYGWIN environment
-   variable. When some application encounters critical error, cygwin will stop
-   it and execute debug_wrapper.cmd, which will run gdb and make it to attach to
-   the crashed application.
-
-4. Strace
-
-   You can run your program under 'strace' utility, described if user's manual.
-   If you know where the problem approximately is, you can add a bunch of
-   additional debug_printf()s in the source code and see what they print in
-   strace log. There's one common problem with this method, that some bugs
-   may mysteriously disappear once the program is run under strace. Then the
-   bug is likely a race condition. strace has two useful options to deal with
-   such situation: -b enables buffering of output and reduces additional
-   timeouts introduced by strace, and -m option allows you to mask certain
-   classes of *_printf() functions, reducing timeouts even more.
-
-   Note that strace does not use the cygwin DLL and so any process that it
-   starts does not inherit a cygwin environment.  It is equivalent to starting
-   a program from the command prompt.
-
-5. Problems at early startup
-
-   Sometimes, something crashes at the very early stages of application
-   initialization, when JIT debugging facility is not yet active. Ok, there's
-   another environment variable that may help. Create program_wrapper.cmd:
-
-========= program_wrapper.cmd =========
-rem setting CYGWIN_SLEEP environment variable makes cygwin application
-rem to sleep for x milliseconds at startup
-set CYGWIN_SLEEP=20000
-c:\some\path\bad_program.exe some parameters
-===================================
-
-   Now, run program_wrapper.cmd. It should print running program pid.
-   After starting program_wrapper.cmd you've got 20 seconds to open another
-   window, cd to c:\cygdeb in it, run gdb there and in gdb prompt type
-
-   (gdb) attach <pid>
-
-   where <pid> is the pid that program_wrapper.cmd have printed.
-   After that you can normally step through the code in cygwin1.dll and
-   bad_program.exe
-
-6. More problems at early startup
-
-   You can also set a CYGWIN_DEBUG variable to force the debugger to pop up
-   only when a certain program is run:
-
-set CYGWIN_DEBUG=cat.exe=gdb.exe
-
-   This will force gdb.exe to start when the program name contains the string
-   "cat.exe".  The '=gdb.exe' isn't really needed, since it is the default.
-   It is just there to show how you can specify a program to run when the
-   program starts.  You can optionally set a breakpoint on "break_here"
-   once the debugger pops up and then you can single step through the
-   initialization process.
-
-   Note that it bears repeating that both of the above options are *only*
-   available when configuring cygwin with --enable-debugging.
-
-7. Heap corruption
-
-   If your program crashes at malloc() or free() or when it references some
-   malloc()'ed memory, it looks like heap corruption. You can configure and
-   build special version of cygwin1.dll which includes heap sanity checking.
-   To do it, just add --enable-malloc-debugging option to configure. Be warned,
-   however, that this version of dll is _very_ slow (10-100 times slower than
-   normal), so use it only when absolutely necessary.
-
-8. Program dies when running under strace
-
-   If your program crashes when you run it using strace but runs ok (or has a
-   different problem) otherwise, then there may be a problem in one of the
-   strace *_printf statements.  Usually this is caused by a change in arguments
-   resulting in a %s being used with something other than a pointer to a
-   string.
-
-   To debug this scenario, do something like this:
-
-    bash$ gdb -nw yourapp.exe
-    (gdb) dll cygwin1
-    (gdb) l dll_crt0_1
-    (gdb) bp <<first line in the function>>
-    (gdb) run
-    (gdb) set strace.active=1
-    (gdb) continue
-
-   The program will then run in "strace mode", calling each strace *_printf,
-   just like it does when run under the strace program.  Eventually, the
-   program will crash, probably in small_printf.  At that point, a 'bt'
-   command should show you the offending call to strace_printf with the
-   improper format string.
diff --git a/winsup/cygwin/how-vfork-works.txt b/winsup/cygwin/how-vfork-works.txt
deleted file mode 100644
index 7148366db..000000000
--- a/winsup/cygwin/how-vfork-works.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Copyright 2001 Red Hat Inc., Christopher Faylor
-
-How does vfork work?
-
-When a program calls vfork, cygwin attempts to short circuit its
-normal, expensive fork mechanism.
-
-Vfork is mainly smoke and mirrors.  A call to vfork contines to execute
-in the current process but first it returns a pid of 0 so that process
-will execute code intended for the child in a UNIX system.  Before
-returning the zero, vfork makes a copy of the current fd table so that
-closing an fd in the "child" will not affect the "parent".
-
-Some of this info is stored in a per-thread structure but vfork is not
-really thread-safe since it also stores the fd "backup" table in the
-global fd table.
-
-The process continues to execute until it hits some type of exec call.
-The exec call is essentially translated into a spawn NO_WAIT call and
-the new process is started via this mechanism.  After execing, the
-"child" process no longer should exist, so the spawn code longjmps back
-to the original vfork call.  The previously opened fds are closed and
-the parent's fd table is restored.  vfork() then returns the pid of the
-just-spawned process.
-
-Meanwhile, the just-spawned child notices that it has been spawned as
-the result of a vfork and closes the extra file handles.
-
-This all relies on the fact that the child in a vfork call can affect
-just about everything in the parent except for the parent's fds.
-The assumption is that a vfork is always just used as a method for

-starting a program.

-
-The assumption is also that all of this is much faster than the
-slow method that cygwin uses to implement fork().
-
diff --git a/winsup/cygwin/include/a.out.h b/winsup/cygwin/include/a.out.h
deleted file mode 100644
index 500e14f3f..000000000
--- a/winsup/cygwin/include/a.out.h
+++ /dev/null
@@ -1,431 +0,0 @@
-/* a.out.h
-
-   Copyright 1997, 1998, 1999, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _A_OUT_H_
-#define _A_OUT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define COFF_IMAGE_WITH_PE
-#define COFF_LONG_SECTION_NAMES
-
-/*** coff information for Intel 386/486.  */
-
-
-/********************** FILE HEADER **********************/
-
-struct external_filehdr {
-  short f_magic;	/* magic number			*/
-  short f_nscns;	/* number of sections		*/
-  unsigned long f_timdat;	/* time & date stamp		*/
-  unsigned long f_symptr;	/* file pointer to symtab	*/
-  unsigned long f_nsyms;	/* number of symtab entries	*/
-  short f_opthdr;	/* sizeof(optional hdr)		*/
-  short f_flags;	/* flags			*/
-};
-
-/* Bits for f_flags:
- *	F_RELFLG	relocation info stripped from file
- *	F_EXEC		file is executable (no unresolved external references)
- *	F_LNNO		line numbers stripped from file
- *	F_LSYMS		local symbols stripped from file
- *	F_AR32WR	file has byte ordering of an AR32WR machine (e.g. vax)
- */
-
-#define F_RELFLG	(0x0001)
-#define F_EXEC		(0x0002)
-#define F_LNNO		(0x0004)
-#define F_LSYMS		(0x0008)
-
-
-
-#define	I386MAGIC	0x14c
-#define I386PTXMAGIC	0x154
-#define I386AIXMAGIC	0x175
-
-/* This is Lynx's all-platform magic number for executables. */
-
-#define LYNXCOFFMAGIC	0415
-
-#define I386BADMAG(x) (((x).f_magic != I386MAGIC) \
-		       && (x).f_magic != I386AIXMAGIC \
-		       && (x).f_magic != I386PTXMAGIC \
-		       && (x).f_magic != LYNXCOFFMAGIC)
-
-#define	FILHDR	struct external_filehdr
-#define	FILHSZ	20
-
-
-/********************** AOUT "OPTIONAL HEADER"=
- **********************/
-
-
-typedef struct
-{
-  unsigned short magic;		/* type of file				*/
-  unsigned short vstamp;	/* version stamp			*/
-  unsigned long	tsize;		/* text size in bytes, padded to FW bdry*/
-  unsigned long	dsize;		/* initialized data "  "		*/
-  unsigned long	bsize;		/* uninitialized data "   "		*/
-  unsigned long	entry;		/* entry pt.				*/
-  unsigned long text_start;	/* base of text used for this file */
-  unsigned long data_start;	/* base of data used for this file=
- */
-}
-AOUTHDR;
-
-#define AOUTSZ 28
-#define AOUTHDRSZ 28
-
-#define OMAGIC          0404    /* object files, eg as output */
-#define ZMAGIC          0413    /* demand load format, eg normal ld output */
-#define STMAGIC		0401	/* target shlib */
-#define SHMAGIC		0443	/* host   shlib */
-
-
-/* define some NT default values */
-/*  #define NT_IMAGE_BASE        0x400000 moved to internal.h */
-#define NT_SECTION_ALIGNMENT 0x1000
-#define NT_FILE_ALIGNMENT    0x200
-#define NT_DEF_RESERVE       0x100000
-#define NT_DEF_COMMIT        0x1000
-
-/********************** SECTION HEADER **********************/
-
-
-struct external_scnhdr {
-  char		s_name[8];	/* section name			*/
-  unsigned long	s_paddr;	/* physical address, offset
-				   of last addr in scn */
-  unsigned long	s_vaddr;	/* virtual address		*/
-  unsigned long	s_size;		/* section size			*/
-  unsigned long	s_scnptr;	/* file ptr to raw data for section */
-  unsigned long	s_relptr;	/* file ptr to relocation	*/
-  unsigned long	s_lnnoptr;	/* file ptr to line numbers	*/
-  unsigned short s_nreloc;	/* number of relocation entries	*/
-  unsigned short s_nlnno;	/* number of line number entries*/
-  unsigned long	s_flags;	/* flags			*/
-};
-
-#define	SCNHDR	struct external_scnhdr
-#define	SCNHSZ	40
-
-/*
- * names of "special" sections
- */
-#define _TEXT	".text"
-#define _DATA	".data"
-#define _BSS	".bss"
-#define _COMMENT ".comment"
-#define _LIB ".lib"
-
-/********************** LINE NUMBERS **********************/
-
-/* 1 line number entry for every "breakpointable" source line in a section.
- * Line numbers are grouped on a per function basis; first entry in a function
- * grouping will have l_lnno = 0 and in place of physical address will be the
- * symbol table index of the function name.
- */
-struct external_lineno {
-  union {
-    unsigned long l_symndx; /* function name symbol index, iff l_lnno 0 */
-    unsigned long l_paddr;	/* (physical) address of line number	*/
-  } l_addr;
-  unsigned short l_lnno;	/* line number		*/
-};
-
-#define	LINENO	struct external_lineno
-#define	LINESZ	6
-
-/********************** SYMBOLS **********************/
-
-#define E_SYMNMLEN	8	/* # characters in a symbol name	*/
-#define E_FILNMLEN	14	/* # characters in a file name		*/
-#define E_DIMNUM	4	/* # array dimensions in auxiliary entry */
-
-struct external_syment
-{
-  union {
-    char e_name[E_SYMNMLEN];
-    struct {
-      unsigned long e_zeroes;
-      unsigned long e_offset;
-    } e;
-  } e;
-  unsigned long e_value;
-  unsigned short e_scnum;
-  unsigned short e_type;
-  char e_sclass[1];
-  char e_numaux[1];
-};
-
-#define N_BTMASK	(0xf)
-#define N_TMASK		(0x30)
-#define N_BTSHFT	(4)
-#define N_TSHIFT	(2)
-
-union external_auxent {
-  struct {
-    unsigned long x_tagndx;	/* str, un, or enum tag indx */
-    union {
-      struct {
-	unsigned short  x_lnno; /* declaration line number */
-	unsigned short  x_size; /* str/union/array size */
-      } x_lnsz;
-      unsigned long x_fsize;	/* size of function */
-    } x_misc;
-    union {
-      struct {			/* if ISFCN, tag, or .bb */
-	unsigned long x_lnnoptr;/* ptr to fcn line # */
-	unsigned long x_endndx;	/* entry ndx past block end */
-      } x_fcn;
-      struct {			/* if ISARY, up to 4 dimen. */
-	char x_dimen[E_DIMNUM][2];
-      } x_ary;
-    } x_fcnary;
-    unsigned short x_tvndx;	/* tv index */
-  } x_sym;
-
-  union {
-    char x_fname[E_FILNMLEN];
-    struct {
-      unsigned long x_zeroes;
-      unsigned long x_offset;
-    } x_n;
-  } x_file;
-
-  struct {
-    unsigned long x_scnlen;	/* section length */
-    unsigned short x_nreloc;	/* # relocation entries */
-    unsigned short x_nlinno;	/* # line numbers */
-    unsigned long x_checksum;	/* section COMDAT checksum */
-    unsigned short x_associated;/* COMDAT associated section index */
-    char x_comdat[1];		/* COMDAT selection number */
-  } x_scn;
-
-  struct {
-    unsigned long x_tvfill;	/* tv fill value */
-    unsigned short x_tvlen;	/* length of .tv */
-    char x_tvran[2][2];		/* tv range */
-  } x_tv;	/* info about .tv section (in auxent of symbol .tv)) */
-
-};
-
-#define	SYMENT	struct external_syment
-#define	SYMESZ	18
-#define	AUXENT	union external_auxent
-#define	AUXESZ	18
-
-#define _ETEXT	"etext"
-
-/********************** RELOCATION DIRECTIVES **********************/
-
-struct external_reloc {
-  char r_vaddr[4];
-  char r_symndx[4];
-  char r_type[2];
-};
-
-#define RELOC struct external_reloc
-#define RELSZ 10
-
-/* end of coff/i386.h */
-
-/* PE COFF header information */
-
-#ifndef _PE_H
-#define _PE_H
-
-/* NT specific file attributes */
-#define IMAGE_FILE_RELOCS_STRIPPED           0x0001
-#define IMAGE_FILE_EXECUTABLE_IMAGE          0x0002
-#define IMAGE_FILE_LINE_NUMS_STRIPPED        0x0004
-#define IMAGE_FILE_LOCAL_SYMS_STRIPPED       0x0008
-#define IMAGE_FILE_BYTES_REVERSED_LO         0x0080
-#define IMAGE_FILE_32BIT_MACHINE             0x0100
-#define IMAGE_FILE_DEBUG_STRIPPED            0x0200
-#define IMAGE_FILE_SYSTEM                    0x1000
-#define IMAGE_FILE_DLL                       0x2000
-#define IMAGE_FILE_BYTES_REVERSED_HI         0x8000
-
-/* additional flags to be set for section headers to allow the NT loader to
-   read and write to the section data (to replace the addresses of data in
-   dlls for one thing); also to execute the section in .text's case=
- */
-#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000
-#define IMAGE_SCN_MEM_EXECUTE     0x20000000
-#define IMAGE_SCN_MEM_READ        0x40000000
-#define IMAGE_SCN_MEM_WRITE       0x80000000
-
-/*
- * Section characteristics added for ppc-nt
- */
-
-#define IMAGE_SCN_TYPE_NO_PAD                0x00000008  /* Reserved.  */
-
-#define IMAGE_SCN_CNT_CODE                   0x00000020  /* Section contains code. */
-#define IMAGE_SCN_CNT_INITIALIZED_DATA       0x00000040  /* Section contains initialized data. */
-#define IMAGE_SCN_CNT_UNINITIALIZED_DATA     0x00000080  /* Section contains uninitialized data. */
-
-#define IMAGE_SCN_LNK_OTHER                  0x00000100  /* Reserved.  */
-#define IMAGE_SCN_LNK_INFO                   0x00000200  /* Section contains comments or some other type of information. */
-#define IMAGE_SCN_LNK_REMOVE                 0x00000800  /* Section contents will not become part of image. */
-#define IMAGE_SCN_LNK_COMDAT                 0x00001000  /* Section contents comdat. */
-
-#define IMAGE_SCN_MEM_FARDATA                0x00008000
-
-#define IMAGE_SCN_MEM_PURGEABLE              0x00020000
-#define IMAGE_SCN_MEM_16BIT                  0x00020000
-#define IMAGE_SCN_MEM_LOCKED                 0x00040000
-#define IMAGE_SCN_MEM_PRELOAD                0x00080000
-
-#define IMAGE_SCN_ALIGN_1BYTES               0x00100000
-#define IMAGE_SCN_ALIGN_2BYTES               0x00200000
-#define IMAGE_SCN_ALIGN_4BYTES               0x00300000
-#define IMAGE_SCN_ALIGN_8BYTES               0x00400000
-#define IMAGE_SCN_ALIGN_16BYTES              0x00500000  /* Default alignment if no others are specified. */
-#define IMAGE_SCN_ALIGN_32BYTES              0x00600000
-#define IMAGE_SCN_ALIGN_64BYTES              0x00700000
-
-
-#define IMAGE_SCN_LNK_NRELOC_OVFL            0x01000000  /* Section contains extended relocations. */
-#define IMAGE_SCN_MEM_NOT_CACHED             0x04000000  /* Section is not cachable.               */
-#define IMAGE_SCN_MEM_NOT_PAGED              0x08000000  /* Section is not pageable.               */
-#define IMAGE_SCN_MEM_SHARED                 0x10000000  /* Section is shareable.                  */
-
-/* COMDAT selection codes.  */
-
-#define IMAGE_COMDAT_SELECT_NODUPLICATES     (1) /* Warn if duplicates.  */
-#define IMAGE_COMDAT_SELECT_ANY		     (2) /* No warning.  */
-#define IMAGE_COMDAT_SELECT_SAME_SIZE	     (3) /* Warn if different size.  */
-#define IMAGE_COMDAT_SELECT_EXACT_MATCH	     (4) /* Warn if different.  */
-#define IMAGE_COMDAT_SELECT_ASSOCIATIVE	     (5) /* Base on other section.  */
-
-/* Magic values that are true for all dos/nt implementations */
-#define DOSMAGIC       0x5a4d
-#define NT_SIGNATURE   0x00004550
-
-/* NT allows long filenames, we want to accommodate this.  This may break
-     some of the bfd functions */
-#undef  FILNMLEN
-#define FILNMLEN	18	/* # characters in a file name		*/
-
-
-#ifdef COFF_IMAGE_WITH_PE
-/* The filehdr is only weired in images */
-
-#undef FILHDR
-struct external_PE_filehdr
-{
-  /* DOS header fields */
-  unsigned short e_magic;	/* Magic number, 0x5a4d */
-  unsigned short e_cblp;	/* Bytes on last page of file, 0x90 */
-  unsigned short e_cp;		/* Pages in file, 0x3 */
-  unsigned short e_crlc;	/* Relocations, 0x0 */
-  unsigned short e_cparhdr;	/* Size of header in paragraphs, 0x4 */
-  unsigned short e_minalloc;	/* Minimum extra paragraphs needed, 0x0 */
-  unsigned short e_maxalloc;	/* Maximum extra paragraphs needed, 0xFFFF */
-  unsigned short e_ss;		/* Initial (relative) SS value, 0x0 */
-  unsigned short e_sp;		/* Initial SP value, 0xb8 */
-  unsigned short e_csum;	/* Checksum, 0x0 */
-  unsigned short e_ip;		/* Initial IP value, 0x0 */
-  unsigned short e_cs;		/* Initial (relative) CS value, 0x0 */
-  unsigned short e_lfarlc;	/* File address of relocation table, 0x40 */
-  unsigned short e_ovno;	/* Overlay number, 0x0 */
-  char e_res[4][2];		/* Reserved words, all 0x0 */
-  unsigned short e_oemid;	/* OEM identifier (for e_oeminfo), 0x0 */
-  unsigned short e_oeminfo;	/* OEM information; e_oemid specific, 0x0 */
-  char e_res2[10][2];		/* Reserved words, all 0x0 */
-  unsigned long e_lfanew;	/* File address of new exe header, 0x80 */
-  char dos_message[16][4];	/* other stuff, always follow DOS header */
-  unsigned int nt_signature;	/* required NT signature, 0x4550 */
-
-  /* From standard header */
-
-  unsigned short f_magic;	/* magic number			*/
-  unsigned short f_nscns;	/* number of sections		*/
-  unsigned long f_timdat;	/* time & date stamp		*/
-  unsigned long f_symptr;	/* file pointer to symtab	*/
-  unsigned long f_nsyms;	/* number of symtab entries	*/
-  unsigned short f_opthdr;	/* sizeof(optional hdr)		*/
-  unsigned short f_flags;	/* flags			*/
-};
-
-
-#define FILHDR struct external_PE_filehdr
-#undef FILHSZ
-#define FILHSZ 152
-
-#endif
-
-typedef struct
-{
-  unsigned short magic;		/* type of file				*/
-  unsigned short vstamp;	/* version stamp			*/
-  unsigned long	tsize;		/* text size in bytes, padded to FW bdry*/
-  unsigned long	dsize;		/* initialized data "  "		*/
-  unsigned long	bsize;		/* uninitialized data "   "		*/
-  unsigned long	entry;		/* entry pt.				*/
-  unsigned long text_start;	/* base of text used for this file */
-  unsigned long data_start;	/* base of all data used for this file */
-
-  /* NT extra fields; see internal.h for descriptions */
-  unsigned long  ImageBase;
-  unsigned long  SectionAlignment;
-  unsigned long  FileAlignment;
-  unsigned short  MajorOperatingSystemVersion;
-  unsigned short  MinorOperatingSystemVersion;
-  unsigned short  MajorImageVersion;
-  unsigned short  MinorImageVersion;
-  unsigned short  MajorSubsystemVersion;
-  unsigned short  MinorSubsystemVersion;
-  char  Reserved1[4];
-  unsigned long  SizeOfImage;
-  unsigned long  SizeOfHeaders;
-  unsigned long  CheckSum;
-  unsigned short Subsystem;
-  unsigned short DllCharacteristics;
-  unsigned long  SizeOfStackReserve;
-  unsigned long  SizeOfStackCommit;
-  unsigned long  SizeOfHeapReserve;
-  unsigned long  SizeOfHeapCommit;
-  unsigned long  LoaderFlags;
-  unsigned long  NumberOfRvaAndSizes;
-  /* IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; */
-  char  DataDirectory[16][2][4]; /* 16 entries, 2 elements/entry, 4 chars */
-
-} PEAOUTHDR;
-
-
-#undef AOUTSZ
-#define AOUTSZ (AOUTHDRSZ + 196)
-
-#undef  E_FILNMLEN
-#define E_FILNMLEN	18	/* # characters in a file name		*/
-#endif
-
-/* end of coff/pe.h */
-
-#define DT_NON		(0)	/* no derived type */
-#define DT_PTR		(1)	/* pointer */
-#define DT_FCN		(2)	/* function */
-#define DT_ARY		(3)	/* array */
-
-#define ISPTR(x)	(((x) & N_TMASK) == (DT_PTR << N_BTSHFT))
-#define ISFCN(x)	(((x) & N_TMASK) == (DT_FCN << N_BTSHFT))
-#define ISARY(x)	(((x) & N_TMASK) == (DT_ARY << N_BTSHFT))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _A_OUT_H_ */
-
diff --git a/winsup/cygwin/include/arpa/ftp.h b/winsup/cygwin/include/arpa/ftp.h
deleted file mode 100644
index 7d39a3e7a..000000000
--- a/winsup/cygwin/include/arpa/ftp.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ftp.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _ARPA_FTP_H
-#define	_ARPA_FTP_H
-
-/* Definitions for FTP; see RFC-765. */
-
-/*
- * Reply codes.
- */
-#define PRELIM		1	/* positive preliminary */
-#define COMPLETE	2	/* positive completion */
-#define CONTINUE	3	/* positive intermediate */
-#define TRANSIENT	4	/* transient negative completion */
-#define ERROR		5	/* permanent negative completion */
-
-/*
- * Type codes
- */
-#define	TYPE_A		1	/* ASCII */
-#define	TYPE_E		2	/* EBCDIC */
-#define	TYPE_I		3	/* image */
-#define	TYPE_L		4	/* local byte size */
-
-#ifdef FTP_NAMES
-char *typenames[] =  {"0", "ASCII", "EBCDIC", "Image", "Local" };
-#endif
-
-/*
- * Form codes
- */
-#define	FORM_N		1	/* non-print */
-#define	FORM_T		2	/* telnet format effectors */
-#define	FORM_C		3	/* carriage control (ASA) */
-#ifdef FTP_NAMES
-char *formnames[] =  {"0", "Nonprint", "Telnet", "Carriage-control" };
-#endif
-
-/*
- * Structure codes
- */
-#define	STRU_F		1	/* file (no record structure) */
-#define	STRU_R		2	/* record structure */
-#define	STRU_P		3	/* page structure */
-#ifdef FTP_NAMES
-char *strunames[] =  {"0", "File", "Record", "Page" };
-#endif
-
-/*
- * Mode types
- */
-#define	MODE_S		1	/* stream */
-#define	MODE_B		2	/* block */
-#define	MODE_C		3	/* compressed */
-#ifdef FTP_NAMES
-char *modenames[] =  {"0", "Stream", "Block", "Compressed" };
-#endif
-
-/*
- * Record Tokens
- */
-#define	REC_ESC		'\377'	/* Record-mode Escape */
-#define	REC_EOR		'\001'	/* Record-mode End-of-Record */
-#define REC_EOF		'\002'	/* Record-mode End-of-File */
-
-/*
- * Block Header
- */
-#define	BLK_EOR		0x80	/* Block is End-of-Record */
-#define	BLK_EOF		0x40	/* Block is End-of-File */
-#define BLK_ERRORS	0x20	/* Block is suspected of containing errors */
-#define	BLK_RESTART	0x10	/* Block is Restart Marker */
-
-#define	BLK_BYTECOUNT	2	/* Bytes in this block */
-
-#endif /* !_ARPA_FTP_H */
diff --git a/winsup/cygwin/include/arpa/inet.h b/winsup/cygwin/include/arpa/inet.h
deleted file mode 100644
index 284e98e40..000000000
--- a/winsup/cygwin/include/arpa/inet.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* arpa/inet.h
-
-   Copyright 1997, 1998, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _ARPA_INET_H
-#define _ARPA_INET_H
-
-#include <netinet/in.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#ifndef __INSIDE_CYGWIN_NET__
-in_addr_t inet_addr (const char *);
-int inet_aton (const char *, struct in_addr *);
-in_addr_t inet_lnaof (struct in_addr);
-struct in_addr inet_makeaddr (unsigned long , unsigned long);
-in_addr_t inet_netof (struct in_addr);
-in_addr_t inet_network (const char *);
-char *inet_ntoa (struct in_addr);
-#endif
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _ARPA_INET_H */
diff --git a/winsup/cygwin/include/arpa/telnet.h b/winsup/cygwin/include/arpa/telnet.h
deleted file mode 100644
index 50874765c..000000000
--- a/winsup/cygwin/include/arpa/telnet.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- */
-
-#ifndef _ARPA_TELNET_H
-#define _ARPA_TELNET_H
-
-/*
- * Definitions for the TELNET protocol.
- */
-#define	IAC	255		/* interpret as command: */
-#define	DONT	254		/* you are not to use option */
-#define	DO	253		/* please, you use option */
-#define	WONT	252		/* I won't use option */
-#define	WILL	251		/* I will use option */
-#define	SB	250		/* interpret as subnegotiation */
-#define	GA	249		/* you may reverse the line */
-#define	EL	248		/* erase the current line */
-#define	EC	247		/* erase the current character */
-#define	AYT	246		/* are you there */
-#define	AO	245		/* abort output--but let prog finish */
-#define	IP	244		/* interrupt process--permanently */
-#define	BREAK	243		/* break */
-#define	DM	242		/* data mark--for connect. cleaning */
-#define	NOP	241		/* nop */
-#define	SE	240		/* end sub negotiation */
-#define EOR     239             /* end of record (transparent mode) */
-#define	ABORT	238		/* Abort process */
-#define	SUSP	237		/* Suspend process */
-#define	xEOF	236		/* End of file: EOF is already used... */
-
-#define SYNCH	242		/* for telfunc calls */
-
-#ifdef TELCMDS
-char *telcmds[] = {
-	"EOF", "SUSP", "ABORT", "EOR",
-	"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
-	"EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC", 0,
-};
-#else
-extern char *telcmds[];
-#endif
-
-#define	TELCMD_FIRST	xEOF
-#define	TELCMD_LAST	IAC
-#define	TELCMD_OK(x)	((unsigned int)(x) <= TELCMD_LAST && \
-			 (unsigned int)(x) >= TELCMD_FIRST)
-#define	TELCMD(x)	telcmds[(x)-TELCMD_FIRST]
-
-/* telnet options */
-#define TELOPT_BINARY	0	/* 8-bit data path */
-#define TELOPT_ECHO	1	/* echo */
-#define	TELOPT_RCP	2	/* prepare to reconnect */
-#define	TELOPT_SGA	3	/* suppress go ahead */
-#define	TELOPT_NAMS	4	/* approximate message size */
-#define	TELOPT_STATUS	5	/* give status */
-#define	TELOPT_TM	6	/* timing mark */
-#define	TELOPT_RCTE	7	/* remote controlled transmission and echo */
-#define TELOPT_NAOL	8	/* negotiate about output line width */
-#define TELOPT_NAOP	9	/* negotiate about output page size */
-#define TELOPT_NAOCRD	10	/* negotiate about CR disposition */
-#define TELOPT_NAOHTS	11	/* negotiate about horizontal tabstops */
-#define TELOPT_NAOHTD	12	/* negotiate about horizontal tab disposition */
-#define TELOPT_NAOFFD	13	/* negotiate about formfeed disposition */
-#define TELOPT_NAOVTS	14	/* negotiate about vertical tab stops */
-#define TELOPT_NAOVTD	15	/* negotiate about vertical tab disposition */
-#define TELOPT_NAOLFD	16	/* negotiate about output LF disposition */
-#define TELOPT_XASCII	17	/* extended ascic character set */
-#define	TELOPT_LOGOUT	18	/* force logout */
-#define	TELOPT_BM	19	/* byte macro */
-#define	TELOPT_DET	20	/* data entry terminal */
-#define	TELOPT_SUPDUP	21	/* supdup protocol */
-#define	TELOPT_SUPDUPOUTPUT 22	/* supdup output */
-#define	TELOPT_SNDLOC	23	/* send location */
-#define	TELOPT_TTYPE	24	/* terminal type */
-#define	TELOPT_EOR	25	/* end or record */
-#define	TELOPT_TUID	26	/* TACACS user identification */
-#define	TELOPT_OUTMRK	27	/* output marking */
-#define	TELOPT_TTYLOC	28	/* terminal location number */
-#define	TELOPT_3270REGIME 29	/* 3270 regime */
-#define	TELOPT_X3PAD	30	/* X.3 PAD */
-#define	TELOPT_NAWS	31	/* window size */
-#define	TELOPT_TSPEED	32	/* terminal speed */
-#define	TELOPT_LFLOW	33	/* remote flow control */
-#define TELOPT_LINEMODE	34	/* Linemode option */
-#define TELOPT_XDISPLOC	35	/* X Display Location */
-#define TELOPT_OLD_ENVIRON 36	/* Old - Environment variables */
-#define	TELOPT_AUTHENTICATION 37/* Authenticate */
-#define	TELOPT_ENCRYPT	38	/* Encryption option */
-#define TELOPT_NEW_ENVIRON 39	/* New - Environment variables */
-#define	TELOPT_EXOPL	255	/* extended-options-list */
-#define TELOPT_ENVIRON TELOPT_OLD_ENVIRON
-
-#define	NTELOPTS	(1+TELOPT_NEW_ENVIRON)
-#ifdef TELOPTS
-char *telopts[NTELOPTS+1] = {
-	"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
-	"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
-	"NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
-	"NAOVTD", "NAOLFD", "EXTEND ASCII", "LOGOUT", "BYTE MACRO",
-	"DATA ENTRY TERMINAL", "SUPDUP", "SUPDUP OUTPUT",
-	"SEND LOCATION", "TERMINAL TYPE", "END OF RECORD",
-	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
-	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
-	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
-	"ENCRYPT", "NEW-ENVIRON",
-	0,
-};
-#define	TELOPT_FIRST	TELOPT_BINARY
-#define	TELOPT_LAST	TELOPT_NEW_ENVIRON
-#define	TELOPT_OK(x)	((unsigned int)(x) <= TELOPT_LAST)
-#define	TELOPT(x)	telopts[(x)-TELOPT_FIRST]
-#endif
-
-/* sub-option qualifiers */
-#define	TELQUAL_IS	0	/* option is... */
-#define	TELQUAL_SEND	1	/* send option */
-#define	TELQUAL_INFO	2	/* ENVIRON: informational version of IS */
-#define	TELQUAL_REPLY	2	/* AUTHENTICATION: client version of IS */
-#define	TELQUAL_NAME	3	/* AUTHENTICATION: client version of IS */
-
-#define	LFLOW_OFF		0	/* Disable remote flow control */
-#define	LFLOW_ON		1	/* Enable remote flow control */
-#define	LFLOW_RESTART_ANY	2	/* Restart output on any char */
-#define	LFLOW_RESTART_XON	3	/* Restart output only on XON */
-
-/*
- * LINEMODE suboptions
- */
-
-#define	LM_MODE		1
-#define	LM_FORWARDMASK	2
-#define	LM_SLC		3
-
-#define	MODE_EDIT	0x01
-#define	MODE_TRAPSIG	0x02
-#define	MODE_ACK	0x04
-#define MODE_SOFT_TAB	0x08
-#define MODE_LIT_ECHO	0x10
-
-#define	MODE_MASK	0x1f
-
-/* Not part of protocol, but needed to simplify things... */
-#define MODE_FLOW		0x0100
-#define MODE_ECHO		0x0200
-#define MODE_INBIN		0x0400
-#define MODE_OUTBIN		0x0800
-#define MODE_FORCE		0x1000
-
-#define	SLC_SYNCH	1
-#define	SLC_BRK		2
-#define	SLC_IP		3
-#define	SLC_AO		4
-#define	SLC_AYT		5
-#define	SLC_EOR		6
-#define	SLC_ABORT	7
-#define	SLC_EOF		8
-#define	SLC_SUSP	9
-#define	SLC_EC		10
-#define	SLC_EL		11
-#define	SLC_EW		12
-#define	SLC_RP		13
-#define	SLC_LNEXT	14
-#define	SLC_XON		15
-#define	SLC_XOFF	16
-#define	SLC_FORW1	17
-#define	SLC_FORW2	18
-
-#define	NSLC		18
-
-/*
- * For backwards compatability, we define SLC_NAMES to be the
- * list of names if SLC_NAMES is not defined.
- */
-#define	SLC_NAMELIST	"0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR", \
-			"ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP", \
-			"LNEXT", "XON", "XOFF", "FORW1", "FORW2", 0,
-#ifdef	SLC_NAMES
-char *slc_names[] = {
-	SLC_NAMELIST
-};
-#else
-extern char *slc_names[];
-#define	SLC_NAMES SLC_NAMELIST
-#endif
-
-#define	SLC_NAME_OK(x)	((unsigned int)(x) <= NSLC)
-#define SLC_NAME(x)	slc_names[x]
-
-#define	SLC_NOSUPPORT	0
-#define	SLC_CANTCHANGE	1
-#define	SLC_VARIABLE	2
-#define	SLC_DEFAULT	3
-#define	SLC_LEVELBITS	0x03
-
-#define	SLC_FUNC	0
-#define	SLC_FLAGS	1
-#define	SLC_VALUE	2
-
-#define	SLC_ACK		0x80
-#define	SLC_FLUSHIN	0x40
-#define	SLC_FLUSHOUT	0x20
-
-#define	OLD_ENV_VAR	1
-#define	OLD_ENV_VALUE	0
-#define	NEW_ENV_VAR	0
-#define	NEW_ENV_VALUE	1
-#define	ENV_ESC		2
-#define	ENV_USERVAR	3
-
-#define ENV_VALUE 0
-#define ENV_VAR 1
-
-/*
- * AUTHENTICATION suboptions
- */
-
-/*
- * Who is authenticating who ...
- */
-#define	AUTH_WHO_CLIENT		0	/* Client authenticating server */
-#define	AUTH_WHO_SERVER		1	/* Server authenticating client */
-#define	AUTH_WHO_MASK		1
-
-/*
- * amount of authentication done
- */
-#define	AUTH_HOW_ONE_WAY	0
-#define	AUTH_HOW_MUTUAL		2
-#define	AUTH_HOW_MASK		2
-
-#define	AUTHTYPE_NULL		0
-#define	AUTHTYPE_KERBEROS_V4	1
-#define	AUTHTYPE_KERBEROS_V5	2
-#define	AUTHTYPE_SPX		3
-#define	AUTHTYPE_MINK		4
-#define	AUTHTYPE_CNT		5
-
-#define	AUTHTYPE_TEST		99
-
-#ifdef	AUTH_NAMES
-char *authtype_names[] = {
-	"NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK", 0,
-};
-#else
-extern char *authtype_names[];
-#endif
-
-#define	AUTHTYPE_NAME_OK(x)	((unsigned int)(x) < AUTHTYPE_CNT)
-#define	AUTHTYPE_NAME(x)	authtype_names[x]
-
-/*
- * ENCRYPTion suboptions
- */
-#define	ENCRYPT_IS		0	/* I pick encryption type ... */
-#define	ENCRYPT_SUPPORT		1	/* I support encryption types ... */
-#define	ENCRYPT_REPLY		2	/* Initial setup response */
-#define	ENCRYPT_START		3	/* Am starting to send encrypted */
-#define	ENCRYPT_END		4	/* Am ending encrypted */
-#define	ENCRYPT_REQSTART	5	/* Request you start encrypting */
-#define	ENCRYPT_REQEND		6	/* Request you send encrypting */
-#define	ENCRYPT_ENC_KEYID	7
-#define	ENCRYPT_DEC_KEYID	8
-#define	ENCRYPT_CNT		9
-
-#define	ENCTYPE_ANY		0
-#define	ENCTYPE_DES_CFB64	1
-#define	ENCTYPE_DES_OFB64	2
-#define	ENCTYPE_CNT		3
-
-#ifdef	ENCRYPT_NAMES
-char *encrypt_names[] = {
-	"IS", "SUPPORT", "REPLY", "START", "END",
-	"REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
-	0,
-};
-char *enctype_names[] = {
-	"ANY", "DES_CFB64",  "DES_OFB64",  0,
-};
-#else
-extern char *encrypt_names[];
-extern char *enctype_names[];
-#endif
-
-
-#define	ENCRYPT_NAME_OK(x)	((unsigned int)(x) < ENCRYPT_CNT)
-#define	ENCRYPT_NAME(x)		encrypt_names[x]
-
-#define	ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
-#define	ENCTYPE_NAME(x)		enctype_names[x]
-#endif /* _ARPA_TELNET_H */
diff --git a/winsup/cygwin/include/asm/byteorder.h b/winsup/cygwin/include/asm/byteorder.h
deleted file mode 100644
index fe6548b75..000000000
--- a/winsup/cygwin/include/asm/byteorder.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* asm/byteorder.h
-
-   Copyright 1996, 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _I386_BYTEORDER_H
-#define _I386_BYTEORDER_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if 0
-#undef ntohl
-#undef ntohs
-#undef htonl
-#undef htons
-#endif
-
-#ifndef __LITTLE_ENDIAN
-#define __LITTLE_ENDIAN 1234
-#endif
-
-#ifndef __LITTLE_ENDIAN_BITFIELD
-#define __LITTLE_ENDIAN_BITFIELD
-#endif
-
-#if 1
-extern unsigned long int	ntohl(unsigned long int);
-extern unsigned short int	ntohs(unsigned short int);
-extern unsigned long int	htonl(unsigned long int);
-extern unsigned short int	htons(unsigned short int);
-
-extern __inline__ unsigned long int	__ntohl(unsigned long int);
-extern __inline__ unsigned short int	__ntohs(unsigned short int);
-extern __inline__ unsigned long int	__constant_ntohl(unsigned long int);
-extern __inline__ unsigned short int	__constant_ntohs(unsigned short int);
-
-extern __inline__ unsigned long int
-__ntohl(unsigned long int x)
-{
-	__asm__("xchgb %b0,%h0\n\t"	/* swap lower bytes	*/
-		"rorl $16,%0\n\t"	/* swap words		*/
-		"xchgb %b0,%h0"		/* swap higher bytes	*/
-		:"=q" (x)
-		: "0" (x));
-	return x;
-}
-
-#define __constant_ntohl(x) \
-	((unsigned long int)((((unsigned long int)(x) & 0x000000ffU) << 24) | \
-			     (((unsigned long int)(x) & 0x0000ff00U) <<  8) | \
-			     (((unsigned long int)(x) & 0x00ff0000U) >>  8) | \
-			     (((unsigned long int)(x) & 0xff000000U) >> 24)))
-
-extern __inline__ unsigned short int
-__ntohs(unsigned short int x)
-{
-	__asm__("xchgb %b0,%h0"		/* swap bytes		*/
-		: "=q" (x)
-		:  "0" (x));
-	return x;
-}
-
-#define __constant_ntohs(x) \
-	((unsigned short int)((((unsigned short int)(x) & 0x00ff) << 8) | \
-			      (((unsigned short int)(x) & 0xff00) >> 8))) \
-
-#define __htonl(x) __ntohl(x)
-#define __htons(x) __ntohs(x)
-#define __constant_htonl(x) __constant_ntohl(x)
-#define __constant_htons(x) __constant_ntohs(x)
-
-#ifdef  __OPTIMIZE__
-#  define ntohl(x) \
-(__builtin_constant_p((long)(x)) ? \
- __constant_ntohl((x)) : \
- __ntohl((x)))
-#  define ntohs(x) \
-(__builtin_constant_p((short)(x)) ? \
- __constant_ntohs((x)) : \
- __ntohs((x)))
-#  define htonl(x) \
-(__builtin_constant_p((long)(x)) ? \
- __constant_htonl((x)) : \
- __htonl((x)))
-#  define htons(x) \
-(__builtin_constant_p((short)(x)) ? \
- __constant_htons((x)) : \
- __htons((x)))
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/winsup/cygwin/include/asm/socket.h b/winsup/cygwin/include/asm/socket.h
deleted file mode 100644
index b1392ce22..000000000
--- a/winsup/cygwin/include/asm/socket.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* asm/socket.h
-
-   Copyright 1996, 1997, 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
-
-#include <cygwin/if.h>
-
-#define IOCPARM_MASK    0x7f            /* parameters must be < 128 bytes */
-#define IOC_VOID        0x20000000      /* no parameters */
-#define IOC_OUT         0x40000000      /* copy out parameters */
-#define IOC_IN          0x80000000      /* copy in parameters */
-
-#define _IO(x,y)        (IOC_VOID|(x<<8)|y)
-#define _IOR(x,y,t)     (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|(x<<8)|y)
-#define _IOW(x,y,t)     (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|(x<<8)|y)
-
-#define SIOCATMARK  _IOR('s',  7, u_long)  /* at oob mark? */
-#define FIONREAD    _IOR('f', 127, u_long) /* get # bytes to read */
-#define FIONBIO 0x8004667e /* To be compatible with termiost version */
-#define REAL_FIONBIO     _IOW('f', 126, u_long) /* set/clear non-blocking i/o */
-#define FIOASYNC    _IOW('f', 125, u_long) /* set/clear async i/o */
-#define SIOCSHIWAT  _IOW('s',  0, u_long)  /* set high watermark */
-#define SIOCGHIWAT  _IOR('s',  1, u_long)  /* get high watermark */
-#define SIOCSLOWAT  _IOW('s',  2, u_long)  /* set low watermark */
-#define SIOCGLOWAT  _IOR('s',  3, u_long)  /* get low watermark */
-
-/* Needed for if queries */
-#define SIOCGIFCONF     _IOW('s', 100, struct ifconf) /* get if list */
-#define SIOCGIFFLAGS    _IOW('s', 101, struct ifreq) /* Get if flags */
-#define SIOCGIFADDR     _IOW('s', 102, struct ifreq) /* Get if addr */
-#define SIOCGIFBRDADDR  _IOW('s', 103, struct ifreq) /* Get if broadcastaddr */
-#define SIOCGIFNETMASK  _IOW('s', 104, struct ifreq) /* Get if netmask */
-#define SIOCGIFHWADDR   _IOW('s', 105, struct ifreq) /* Get hw addr */
-#define SIOCGIFMETRIC   _IOW('s', 106, struct ifreq) /* get metric */
-#define SIOCGIFMTU      _IOW('s', 107, struct ifreq) /* get MTU size */
-
-#define SOL_SOCKET      0xffff          /* options for socket level */
-
-#define SO_DEBUG        0x0001          /* turn on debugging info recording */
-#define SO_ACCEPTCONN   0x0002          /* socket has had listen() */
-#define SO_REUSEADDR    0x0004          /* allow local address reuse */
-#define SO_KEEPALIVE    0x0008          /* keep connections alive */
-#define SO_DONTROUTE    0x0010          /* just use interface addresses */
-#define SO_BROADCAST    0x0020          /* permit sending of broadcast msgs */
-#define SO_USELOOPBACK  0x0040          /* bypass hardware when possible */
-#define SO_LINGER       0x0080          /* linger on close if data present */
-#define SO_OOBINLINE    0x0100          /* leave received OOB data in line */
-#define SO_DONTLINGER   (u_int)(~SO_LINGER)
-
-/*
- * Additional options.
- */
-#define SO_SNDBUF       0x1001          /* send buffer size */
-#define SO_RCVBUF       0x1002          /* receive buffer size */
-#define SO_SNDLOWAT     0x1003          /* send low-water mark */
-#define SO_RCVLOWAT     0x1004          /* receive low-water mark */
-#define SO_SNDTIMEO     0x1005          /* send timeout */
-#define SO_RCVTIMEO     0x1006          /* receive timeout */
-#define SO_ERROR        0x1007          /* get error status and clear */
-#define SO_TYPE         0x1008          /* get socket type */
-
-#endif /* _ASM_SOCKET_H */
-
diff --git a/winsup/cygwin/include/asm/types.h b/winsup/cygwin/include/asm/types.h
deleted file mode 100644
index 2653fd674..000000000
--- a/winsup/cygwin/include/asm/types.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* asm/types.h
-
-   Copyright 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _ASM_TYPES_H
-#define _ASM_TYPES_H
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-#endif /* _ASM_TYPES_H */
diff --git a/winsup/cygwin/include/cygwin/acl.h b/winsup/cygwin/include/cygwin/acl.h
deleted file mode 100644
index 3ea5f91e5..000000000
--- a/winsup/cygwin/include/cygwin/acl.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* cygwin/acl.h header file for Cygwin.
-
-   Copyright 1999, 2000, 2001, 2002 Red Hat, Inc.
-   Written by C. Vinschen.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_ACL_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define _CYGWIN_ACL_H
-
-#include <_ansi.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-/* Values for `cmd' in calls to acl(2) and facl(2) */
-#define SETACL          (0x0)
-#define GETACL          (0x1)
-#define GETACLCNT       (0x2)
-
-#define	MIN_ACL_ENTRIES (4)    // minimal acl entries from GETACLCNT
-#define	MAX_ACL_ENTRIES	(256)  // max entries of each type
-
-// Return values of aclcheck(3) in case of error */
-#define GRP_ERROR       (0x1)
-#define USER_ERROR      (0x2)
-#define CLASS_ERROR     (0x3)
-#define OTHER_ERROR     (0x4)
-#define DUPLICATE_ERROR (0x5)
-#define ENTRY_ERROR     (0x6)
-#define MISS_ERROR      (0x7) // which = -1
-#define MEM_ERROR       (0x8) // which = -1
-
-// Values for entry type of struct acl
-#define USER_OBJ        (0x0001)                // owner
-#define USER            (0x0002)                // additional user
-#define GROUP_OBJ       (0x0004)                // owning group
-#define GROUP           (0x0008)                // additional group
-#define CLASS_OBJ       (0x0010)                // mask entry
-#define OTHER_OBJ       (0x0020)                // others
-#define ACL_DEFAULT     (0x1000)                // default flag
-#define DEF_USER_OBJ    (ACL_DEFAULT|USER_OBJ)  // default owner
-#define DEF_USER        (ACL_DEFAULT|USER)      // default additional user
-#define DEF_GROUP_OBJ   (ACL_DEFAULT|GROUP_OBJ) // default owning group
-#define DEF_GROUP       (ACL_DEFAULT|GROUP)     // default additional group
-#define DEF_CLASS_OBJ   (ACL_DEFAULT|CLASS_OBJ) // default mask entry
-#define DEF_OTHER_OBJ   (ACL_DEFAULT|OTHER_OBJ) // default others
-// Values with equivalent meanings
-#define USER_OWNER      USER_OBJ
-#define GROUP_OWNER     GROUP_OBJ
-#define MASK            CLASS_OBJ
-#define OTHER           OTHER_OBJ
-
-#ifdef __INSIDE_CYGWIN__
-typedef struct __acl16 {
-    int          a_type;
-    __uid16_t    a_id;
-    mode_t       a_perm;
-} __aclent16_t;
-
-typedef struct __acl32 {
-    int          a_type;
-    __uid32_t    a_id;
-    mode_t       a_perm;
-} __aclent32_t;
-#else
-typedef struct acl {
-    int          a_type;    /* entry type */
-    uid_t        a_id;      /* UID | GID  */
-    mode_t       a_perm;    /* permissions */
-} aclent_t;
-#endif
-
-#ifndef __INSIDE_CYGWIN__
-int _EXFUN(acl,(const char *path, int cmd, int nentries, aclent_t *aclbufp));
-int _EXFUN(lacl,(const char *path, int cmd, int nentries, aclent_t *aclbufp));
-int _EXFUN(facl,(int fd, int cmd, int nentries, aclent_t *aclbufp));
-int _EXFUN(aclcheck,(aclent_t *aclbufp, int nentries, int *which));
-int _EXFUN(aclsort,(int nentries, int calclass, aclent_t *aclbufp));
-int _EXFUN(acltomode,(aclent_t *aclbufp, int nentries, mode_t *modep));
-int _EXFUN(aclfrommode,(aclent_t *aclbufp, int nentries, mode_t *modep));
-int _EXFUN(acltopbits,(aclent_t *aclbufp, int nentries, mode_t *pbitsp));
-int _EXFUN(aclfrompbits,(aclent_t *aclbufp, int nentries, mode_t *pbitsp));
-char *_EXFUN(acltotext,(aclent_t *aclbufp, int aclcnt));
-aclent_t *_EXFUN(aclfromtext,(char *acltextp, int *aclcnt));
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _CYGWIN_ACL_H */
diff --git a/winsup/cygwin/include/cygwin/config.h b/winsup/cygwin/include/cygwin/config.h
deleted file mode 100644
index e3e09f051..000000000
--- a/winsup/cygwin/include/cygwin/config.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* cygwin/config.h header file for Cygwin.
-
-   This wraps Cygwin configuration setting which were in newlib's
-   sys/config.h before.  THis way we can manaage our configuration
-   setting without bothering newlib.
-
-   Copyright 2003 Red Hat, Inc.
-   Written by C. Vinschen.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_CONFIG_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define _CYGWIN_CONFIG_H
-
-#define __DYNAMIC_REENT__
-#define __FILENAME_MAX__ (260 - 1 /* NUL */)
-#define _READ_WRITE_RETURN_TYPE _ssize_t
-#define __LARGE64_FILES 1
-#define __CYGWIN_USE_BIG_TYPES__ 1
-#ifdef __CYGWIN_USE_BIG_TYPES__
-/* __USE_INTERNAL_STAT64 is needed when building newlib for Cygwin.
-   It must be set when __CYGWIN_USE_BIG_TYPES__ is set.  In this case
-   newlib will call the 64 bit stat calls internally.  Otherwise the
-   struct stat used in newlib is not matching the struct stat used in
-   Cygwin. */
-#define __USE_INTERNAL_STAT64 1
-#endif
-#if defined(__INSIDE_CYGWIN__) || defined(_COMPILING_NEWLIB)
-#define __IMPORT
-#else
-#define __IMPORT __declspec(dllimport)
-#endif
-
-#ifndef __WCHAR_MAX__
-#define __WCHAR_MAX__ 0xffffu
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _CYGWIN_CONFIG_H */
diff --git a/winsup/cygwin/include/cygwin/core_dump.h b/winsup/cygwin/include/cygwin/core_dump.h
deleted file mode 100644
index b1943937b..000000000
--- a/winsup/cygwin/include/cygwin/core_dump.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* core_dump.h
-
-   Copyright 1999, 2000, 2001 Red Hat, Inc.
-
-   Written by Egor Duda <deo@logos-m.ru>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_CORE_DUMP_H
-#define _CYGWIN_CORE_DUMP_H
-
-#include <windows.h>
-
-#define	NOTE_INFO_PROCESS	1
-#define	NOTE_INFO_THREAD	2
-#define	NOTE_INFO_MODULE	3
-
-struct win32_core_process_info
-{
-  DWORD pid;
-  int signal;
-  int command_line_size;
-  char command_line[1];
-}
-#ifdef __GNUC__
-  __attribute__ ((packed))
-#endif
-;
-
-struct win32_core_thread_info
-{
-  DWORD tid;
-  BOOL is_active_thread;
-  CONTEXT thread_context;
-}
-#ifdef __GNUC__
-  __attribute__ ((packed))
-#endif
-;
-
-struct win32_core_module_info
-{
-  void* base_address;
-  int module_name_size;
-  char module_name[1];
-}
-#ifdef __GNUC__
-  __attribute__ ((packed))
-#endif
-;
-
-struct win32_pstatus
-{
-  unsigned long data_type;
-  union
-    {
-      struct win32_core_process_info process_info;
-      struct win32_core_thread_info thread_info;
-      struct win32_core_module_info module_info;
-    } data ;
-}
-#ifdef __GNUC__
-  __attribute__ ((packed))
-#endif
-;
-
-typedef struct win32_pstatus win32_pstatus_t ;
-
-#endif /* _CYGWIN_CORE_DUMP_H */
diff --git a/winsup/cygwin/include/cygwin/cygwin_dll.h b/winsup/cygwin/include/cygwin/cygwin_dll.h
deleted file mode 100644
index 80c9d13c6..000000000
--- a/winsup/cygwin/include/cygwin/cygwin_dll.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* cygwin_dll.h
-
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef __CYGWIN_CYGWIN_DLL_H__
-#define __CYGWIN_CYGWIN_DLL_H__
-
-#include <windows.h>
-
-#ifdef __cplusplus
-#define CDECL_BEGIN extern "C" {
-#define CDECL_END }
-#else
-#define CDECL_BEGIN
-#define CDECL_END
-#endif
-
-#define DECLARE_CYGWIN_DLL(Entry)					      \
-									      \
-CDECL_BEGIN								      \
-  int WINAPI Entry (HINSTANCE h, DWORD reason, void *ptr);	              \
-  typedef int (*mainfunc) (int, char **, char **);			      \
-  extern int cygwin_attach_dll (HMODULE, mainfunc);			      \
-  extern void cygwin_detach_dll (DWORD);				      \
-CDECL_END								      \
-									      \
-static HINSTANCE storedHandle;						      \
-static DWORD storedReason;						      \
-static void* storedPtr;							      \
-									      \
-static int __dllMain (int a, char **b, char **c)			      \
-{									      \
-  return Entry (storedHandle, storedReason, storedPtr);		              \
-}									      \
-									      \
-static DWORD dll_index;							      \
-									      \
-int WINAPI _cygwin_dll_entry (HINSTANCE h, DWORD reason, void *ptr)	      \
-{									      \
-  int ret;								      \
-  ret = 1;								      \
-									      \
-  switch (reason)							      \
-  {									      \
-    case DLL_PROCESS_ATTACH:						      \
-    {									      \
-      storedHandle = h;							      \
-      storedReason = reason;						      \
-      storedPtr = ptr;							      \
-      dll_index = cygwin_attach_dll (h, &__dllMain);			      \
-      if (dll_index == (DWORD) -1)					      \
-	ret = 0;							      \
-    }									      \
-    break;								      \
-									      \
-    case DLL_PROCESS_DETACH:						      \
-    {									      \
-      ret = Entry (h, reason, ptr);					      \
-      if (ret)								      \
-      {									      \
-	cygwin_detach_dll (dll_index);					      \
-	dll_index = (DWORD) -1;						      \
-      }									      \
-    }									      \
-    break;								      \
-									      \
-    case DLL_THREAD_ATTACH:						      \
-    {									      \
-      ret = Entry (h, reason, ptr);					      \
-    }									      \
-    break;								      \
-									      \
-    case DLL_THREAD_DETACH:						      \
-    {									      \
-      ret = Entry (h, reason, ptr);					      \
-    }									      \
-    break;								      \
-  }									      \
-  return ret;								      \
-}									      \
-									      \
-/* OBSOLETE: This is only provided for source level compatibility. */         \
-int WINAPI _cygwin_noncygwin_dll_entry (HINSTANCE h, DWORD reason, void *ptr) \
-{									      \
-  return _cygwin_dll_entry (h, reason, ptr);				      \
-}									      \
-
-#endif /* __CYGWIN_CYGWIN_DLL_H__ */
diff --git a/winsup/cygwin/include/cygwin/fs.h b/winsup/cygwin/include/cygwin/fs.h
deleted file mode 100644
index eb8c7e3d1..000000000
--- a/winsup/cygwin/include/cygwin/fs.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* cygwin/fs.h
-
-   Copyright 2002, 2003 Red Hat Inc.
-   Written by Chris January <chris@atomice.net>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_FS_H_
-#define _CYGWIN_FS_H_
-
-#define BLKRRPART  0x0000125f
-#define BLKGETSIZE 0x00001260
-#define BLKSSZGET  0x00001268
-#define BLKGETSIZE64 0x00041268
-
-#endif
diff --git a/winsup/cygwin/include/cygwin/grp.h b/winsup/cygwin/include/cygwin/grp.h
deleted file mode 100644
index 7dcae637d..000000000
--- a/winsup/cygwin/include/cygwin/grp.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* cygwin/grp.h
-
-   Copyright 2002 Red Hat Inc.
-   Written by Corinna Vinschen <corinna@vinschen.de>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_GRP_H_
-#define _CYGWIN_GRP_H_
-
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __INSIDE_CYGWIN__
-struct __group16
-{
-  char *gr_name;
-  char *gr_passwd;
-  __gid16_t gr_gid;
-  char **gr_mem;
-};
-
-struct __group32
-{
-  char *gr_name;
-  char *gr_passwd;
-  __gid32_t gr_gid;
-  char **gr_mem;
-};
-
-struct __group32 * getgrgid32 (__gid32_t gid);
-struct __group32 * getgrnam32 (const char *name);
-__gid32_t getgid32 ();
-__gid32_t getegid32 ();
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CYGWIN_GRP_H_ */
diff --git a/winsup/cygwin/include/cygwin/hdreg.h b/winsup/cygwin/include/cygwin/hdreg.h
deleted file mode 100644
index dc8157838..000000000
--- a/winsup/cygwin/include/cygwin/hdreg.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* cygwin/hdreg.h
-
-   Copyright 2002 Red Hat Inc.
-   Written by Chris January <chris@atomice.net>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_HDREG_H_
-#define _CYGWIN_HDREG_H_
-
-struct hd_geometry {
-  unsigned char heads;
-  unsigned char sectors;
-  unsigned short cylinders;
-  unsigned long start;
-};
-
-#define HDIO_GETGEO                     0x301
-
-#endif
diff --git a/winsup/cygwin/include/cygwin/icmp.h b/winsup/cygwin/include/cygwin/icmp.h
deleted file mode 100644
index 7e7aedccd..000000000
--- a/winsup/cygwin/include/cygwin/icmp.h
+++ /dev/null
@@ -1 +0,0 @@
-/* icmp.h */
diff --git a/winsup/cygwin/include/cygwin/if.h b/winsup/cygwin/include/cygwin/if.h
deleted file mode 100644
index b0953de36..000000000
--- a/winsup/cygwin/include/cygwin/if.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* cygwin/if.h
-
-   Copyright 1996, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_IF_H_
-#define _CYGWIN_IF_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-/* Standard interface flags. */
-#define IFF_UP          0x1             /* interface is up              */
-#define IFF_BROADCAST   0x2             /* broadcast address valid      */
-#define IFF_LOOPBACK    0x8             /* is a loopback net            */
-#define IFF_NOTRAILERS  0x20            /* avoid use of trailers        */
-#define IFF_RUNNING     0x40            /* resources allocated          */
-#define IFF_PROMISC     0x100           /* receive all packets          */
-#define IFF_MULTICAST   0x1000          /* Supports multicast           */
-
-/*
- * Interface request structure used for socket
- * ioctl's.  All interface ioctl's must have parameter
- * definitions which begin with ifr_name.  The
- * remainder may be interface specific.
- */
-
-struct ifreq
-{
-#define IFNAMSIZ        16
-#define IFHWADDRLEN     6
-	union
-	{
-		char    ifrn_name[IFNAMSIZ];            /* if name, e.g. "en0" */
-	} ifr_ifrn;
-
-	union {
-		struct  sockaddr ifru_addr;
-		struct  sockaddr ifru_broadaddr;
-		struct  sockaddr ifru_netmask;
-		struct  sockaddr ifru_hwaddr;
-		short   ifru_flags;
-		int     ifru_metric;
-		int     ifru_mtu;
-	} ifr_ifru;
-};
-
-#define ifr_name        ifr_ifrn.ifrn_name      /* interface name       */
-#define ifr_addr        ifr_ifru.ifru_addr      /* address              */
-#define ifr_broadaddr   ifr_ifru.ifru_broadaddr /* broadcast address    */
-#define ifr_netmask     ifr_ifru.ifru_netmask   /* interface net mask   */
-#define ifr_flags       ifr_ifru.ifru_flags     /* flags                */
-#define ifr_hwaddr      ifr_ifru.ifru_hwaddr    /* MAC address          */
-#define ifr_metric      ifr_ifru.ifru_metric    /* metric               */
-#define ifr_mtu         ifr_ifru.ifru_mtu       /* mtu                  */
-
-
-/*
- * Structure used in SIOCGIFCONF request.
- * Used to retrieve interface configuration
- * for machine (useful for programs which
- * must know all networks accessible).
- */
-
-struct ifconf
-{
-	int     ifc_len;                        /* size of buffer       */
-	union
-	{
-		caddr_t ifcu_buf;
-		struct  ifreq *ifcu_req;
-	} ifc_ifcu;
-};
-#define ifc_buf ifc_ifcu.ifcu_buf               /* buffer address       */
-#define ifc_req ifc_ifcu.ifcu_req               /* array of structures  */
-
-#ifdef __cplusplus
-};
-#endif /* __cplusplus */
-
-#endif /* _CYGWIN_IF_H_ */
diff --git a/winsup/cygwin/include/cygwin/in.h b/winsup/cygwin/include/cygwin/in.h
deleted file mode 100644
index 76bdaaa3e..000000000
--- a/winsup/cygwin/include/cygwin/in.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * INET		An implementation of the TCP/IP protocol suite for the LINUX
- *		operating system.  INET is implemented using the  BSD Socket
- *		interface as the means of communication with the user level.
- *
- *		Definitions of the Internet Protocol.
- *
- * Version:	@(#)in.h	1.0.1	04/21/93
- *
- * Authors:	Original taken from the GNU Project <netinet/in.h> file.
- *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *		This program is free software; you can redistribute it and/or
- *		modify it under the terms of the GNU General Public License
- *		as published by the Free Software Foundation; either version
- *		2 of the License, or (at your option) any later version.
- */
-#ifndef _CYGWIN_IN_H
-#define _CYGWIN_IN_H
-
-#include <stdint.h>
-
-/* Standard well-defined IP protocols.  */
-enum
-{
-  IPPROTO_IP = 0,		/* Dummy protocol for TCP		*/
-  IPPROTO_ICMP = 1,		/* Internet Control Message Protocol	*/
-  IPPROTO_IGMP = 2,		/* Internet Gateway Management Protocol */
-  IPPROTO_IPIP = 4,		/* IPIP tunnels (older KA9Q tunnels use 94) */
-  IPPROTO_TCP = 6,		/* Transmission Control Protocol	*/
-  IPPROTO_EGP = 8,		/* Exterior Gateway Protocol		*/
-  IPPROTO_PUP = 12,		/* PUP protocol				*/
-  IPPROTO_UDP = 17,		/* User Datagram Protocol		*/
-  IPPROTO_IDP = 22,		/* XNS IDP protocol			*/
-
-  IPPROTO_RAW = 255,		/* Raw IP packets			*/
-  IPPROTO_MAX
-};
-
-typedef uint16_t in_port_t;
-/* Standard well-known ports.  *//* from winsup/include/netinet/in.h */
-enum
-{
-  IPPORT_ECHO = 7,		/* Echo service.  */
-  IPPORT_DISCARD = 9,		/* Discard transmissions service.  */
-  IPPORT_SYSTAT = 11,		/* System status service.  */
-  IPPORT_DAYTIME = 13,	/* Time of day service.  */
-  IPPORT_NETSTAT = 15,	/* Network status service.  */
-  IPPORT_FTP = 21,		/* File Transfer Protocol.  */
-  IPPORT_TELNET = 23,		/* Telnet protocol.  */
-  IPPORT_SMTP = 25,		/* Simple Mail Transfer Protocol.  */
-  IPPORT_TIMESERVER = 37,	/* Timeserver service.  */
-  IPPORT_NAMESERVER = 42,	/* Domain Name Service.  */
-  IPPORT_WHOIS = 43,		/* Internet Whois service.  */
-  IPPORT_MTP = 57,
-
-  IPPORT_TFTP = 69,		/* Trivial File Transfer Protocol.  */
-  IPPORT_RJE = 77,
-  IPPORT_FINGER = 79,		/* Finger service.  */
-  IPPORT_TTYLINK = 87,
-  IPPORT_SUPDUP = 95,		/* SUPDUP protocol.  */
-
-
-  IPPORT_EXECSERVER = 512,	/* execd service.  */
-  IPPORT_LOGINSERVER = 513,	/* rlogind service.  */
-  IPPORT_CMDSERVER = 514,
-  IPPORT_EFSSERVER = 520,
-
-  /* UDP ports.  */
-  IPPORT_BIFFUDP = 512,
-  IPPORT_WHOSERVER = 513,
-  IPPORT_ROUTESERVER = 520,
-
-  /* Ports less than this value are reserved for privileged processes.  */
-  IPPORT_RESERVED = 1024,
-
-  /* Ports greater this value are reserved for (non-privileged) servers.  */
-  IPPORT_USERRESERVED = 5000
-};
-
-typedef uint32_t in_addr_t;
-/* Internet address. */
-struct in_addr
-{
-  unsigned int s_addr;
-};
-
-/* Request struct for multicast socket ops */
-
-struct ip_mreq
-{
-  struct in_addr imr_multiaddr;	/* IP multicast address of group */
-  struct in_addr imr_interface;	/* local IP address of interface */
-};
-
-
-/* Structure describing an Internet (IP) socket address. */
-#define __SOCK_SIZE__	16		/* sizeof(struct sockaddr)	*/
-struct sockaddr_in
-{
-  short int sin_family;	/* Address family		*/
-  unsigned short int sin_port;	/* Port number			*/
-  struct in_addr sin_addr;	/* Internet address		*/
-
-  /* Pad to size of `struct sockaddr'. */
-  unsigned char  __pad[__SOCK_SIZE__ - sizeof(short int)
-			- sizeof(unsigned short int) - sizeof(struct in_addr)];
-};
-#define sin_zero	__pad		/* for BSD UNIX comp. -FvK	*/
-
-/*
- * Definitions of the bits in an Internet address integer.
- * On subnets, host and network parts are found according
- * to the subnet mask, not these masks.
- */
-#define	IN_CLASSA(a)		((((long int) (a)) & 0x80000000) == 0)
-#define	IN_CLASSA_NET		0xff000000
-#define	IN_CLASSA_NSHIFT	24
-#define	IN_CLASSA_HOST		(0xffffffff & ~IN_CLASSA_NET)
-#define	IN_CLASSA_MAX		128
-
-#define	IN_CLASSB(a)		((((long int) (a)) & 0xc0000000) == 0x80000000)
-#define	IN_CLASSB_NET		0xffff0000
-#define	IN_CLASSB_NSHIFT	16
-#define	IN_CLASSB_HOST		(0xffffffff & ~IN_CLASSB_NET)
-#define	IN_CLASSB_MAX		65536
-
-#define	IN_CLASSC(a)		((((long int) (a)) & 0xe0000000) == 0xc0000000)
-#define	IN_CLASSC_NET		0xffffff00
-#define	IN_CLASSC_NSHIFT	8
-#define	IN_CLASSC_HOST		(0xffffffff & ~IN_CLASSC_NET)
-
-#define	IN_CLASSD(a)		((((long int) (a)) & 0xf0000000) == 0xe0000000)
-#define	IN_MULTICAST(a)		IN_CLASSD(a)
-#define IN_MULTICAST_NET	0xF0000000
-
-#define	IN_EXPERIMENTAL(a)	((((long int) (a)) & 0xe0000000) == 0xe0000000)
-#define	IN_BADCLASS(a)		((((long int) (a)) & 0xf0000000) == 0xf0000000)
-
-/* Address to accept any incoming messages. */
-#define	INADDR_ANY		((unsigned long int) 0x00000000)
-
-/* Address to send to all hosts. */
-#define	INADDR_BROADCAST	((unsigned long int) 0xffffffff)
-
-/* Address indicating an error return. */
-#define	INADDR_NONE		0xffffffff
-
-/* Network number for local host loopback. */
-#define	IN_LOOPBACKNET		127
-
-/* Address to loopback in software to local host.  */
-#define	INADDR_LOOPBACK		0x7f000001	/* 127.0.0.1   */
-#define	IN_LOOPBACK(a)		((((long int) (a)) & 0xff000000) == 0x7f000000)
-
-/* Defines for Multicast INADDR */
-#define INADDR_UNSPEC_GROUP	0xe0000000      /* 224.0.0.0   */
-#define INADDR_ALLHOSTS_GROUP	0xe0000001      /* 224.0.0.1   */
-#define INADDR_MAX_LOCAL_GROUP  0xe00000ff      /* 224.0.0.255 */
-
-/* <asm/byteorder.h> contains the htonl type stuff.. */
-
-#include <asm/byteorder.h>
-
-/* Some random defines to make it easier in the kernel.. */
-#ifdef __KERNEL__
-
-#define LOOPBACK(x)	(((x) & htonl(0xff000000)) == htonl(0x7f000000))
-#define MULTICAST(x)	(((x) & htonl(0xf0000000)) == htonl(0xe0000000))
-
-#endif
-
-#ifdef USE_IPV6
-/* IPv6 definitions as we start to include them. This is just
-   a beginning dont get excited 8) */
-struct in6_addr
-{
-  unsigned char s6_addr[16];
-};
-
-struct sockaddr_in6
-{
-  unsigned short sin6_family;
-  unsigned short sin6_port;
-  unsigned long sin6_flowinfo;
-  struct in6_addr sin6_addr;
-};
-#endif
-#endif	/* _CYGWIN_IN_H */
diff --git a/winsup/cygwin/include/cygwin/in_systm.h b/winsup/cygwin/include/cygwin/in_systm.h
deleted file mode 100644
index 1a2c1b2e7..000000000
--- a/winsup/cygwin/include/cygwin/in_systm.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* System specific type definitions for networking code.
- *
- * Version:     @(#)in_systm.h        1.0.0   06/07/00
- *
- * Authors:     Original taken from the GNU Project <netinet/in_systm.h> file.
- *              Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
- *
- *              This program is free software; you can redistribute it and/or
- *              modify it under the terms of the GNU General Public License
- *              as published by the Free Software Foundation; either version
- *              2 of the License, or (at your option) any later version.
- */
-#ifndef _CYGWIN_IN_SYSTM_H
-#define _CYGWIN_IN_SYSTM_H
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-__BEGIN_DECLS
-
-/*
- * Network order versions of various data types. Unfortunately, BSD
- * assumes specific sizes for shorts (16 bit) and longs (32 bit) which
- * don't hold in general. As a consequence, the network order versions
- * may not reflect the actual size of the native data types.
- */
-
-typedef u_int16_t n_short;      /* short as received from the net */
-typedef u_int32_t n_long;       /* long as received from the net  */
-typedef u_int32_t n_time;       /* ms since 00:00 GMT, byte rev   */
-
-__END_DECLS
-
-#endif /* _CYGWIN_IN_SYSTM_H */
diff --git a/winsup/cygwin/include/cygwin/ipc.h b/winsup/cygwin/include/cygwin/ipc.h
deleted file mode 100644
index 90534c29d..000000000
--- a/winsup/cygwin/include/cygwin/ipc.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* sys/ipc.h
-
-   Copyright 2001, 2002 Red Hat Inc.
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_IPC_H
-#define _CYGWIN_IPC_H
-
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-struct ipc_perm
-{
-  uid_t  uid;			/* Owner's user ID. */
-  gid_t  gid;			/* Owner's group ID. */
-  uid_t  cuid;			/* Creator's user ID. */
-  gid_t  cgid;			/* Creator's group ID. */
-  mode_t mode;			/* Read/write permission. */
-  key_t  key;
-  unsigned short seq;
-};
-
-/* Mode bits:
- */
-#define IPC_CREAT  0x0200	/* Create entry if key does not exist. */
-#define IPC_EXCL   0x0400	/* Fail if key exists. */
-#define IPC_NOWAIT 0x0800	/* Error if request must wait. */
-
-/* Keys:
- */
-#define IPC_PRIVATE ((key_t) 0)	/* Private key. */
-
-/* Control commands:
- */
-#define IPC_RMID 0x1000		/* Remove identifier. */
-#define IPC_SET  0x1001		/* Set options. */
-#define IPC_STAT 0x1002		/* Get options. */
-#define IPC_INFO 0x1003		/* For ipcs(8). */
-
-#ifdef _KERNEL
-#define IPCID_TO_IX(id)         ((id) & 0xffff)
-#define IPCID_TO_SEQ(id)        (((id) >> 16) & 0xffff)
-#define IXSEQ_TO_IPCID(ix,perm) (((perm.seq) << 16) | (ix & 0xffff))
-
-#define IPC_R           000400  /* read permission */
-#define IPC_W           000200  /* write/alter permission */
-#define IPC_M           010000  /* permission to change control info */
-#endif
-
-key_t ftok (const char *path, int id);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CYGWIN_IPC_H */
diff --git a/winsup/cygwin/include/cygwin/msg.h b/winsup/cygwin/include/cygwin/msg.h
deleted file mode 100644
index 8679786dd..000000000
--- a/winsup/cygwin/include/cygwin/msg.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* sys/msg.h
-
-   Copyright 2002 Red Hat Inc.
-   Written by Conrad Scott <conrad.scott@dsl.pipex.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_MSG_H
-#define _CYGWIN_MSG_H
-
-#include <cygwin/ipc.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* Message operation flags:
- */
-#define MSG_NOERROR 0x01	/* No error if big message. */
-
-#ifdef _KERNEL
-/* Command definitions for the semctl () function:
- */
-#define MSG_STAT   0x2000	/* For ipcs(8) */
-#define MSG_INFO   0x2001	/* For ipcs(8) */
-#endif /* _KERNEL */
-
-/* Used for the number of messages in the message queue.
- */
-typedef unsigned long msgqnum_t;
-
-/* Used for the number of bytes allowed in a message queue.
- */
-typedef unsigned long msglen_t;
-
-struct msqid_ds
-{
-  struct ipc_perm msg_perm;	/* Operation permission structure. */
-  msglen_t        msg_cbytes;	/* Number of bytes currently on queue. */
-  msgqnum_t       msg_qnum;	/* Number of messages currently on queue. */
-  msglen_t        msg_qbytes;	/* Maximum number of bytes allowed on queue. */
-  pid_t           msg_lspid;	/* Process ID of last msgsnd (). */
-  pid_t           msg_lrpid;	/* Process ID of last msgrcv (). */
-  timestruc_t     msg_stim;	/* Time of last msgsnd (). */
-  timestruc_t     msg_rtim;	/* Time of last msgrcv (). */
-  timestruc_t     msg_ctim;	/* Time of last change. */
-#ifdef _KERNEL
-  struct msg     *msg_first;
-  struct msg     *msg_last;
-#else
-  long            msg_spare4[2];
-#endif /* _KERNEL */
-};
-
-#define msg_stime msg_stim.tv_sec
-#define msg_rtime msg_rtim.tv_sec
-#define msg_ctime msg_ctim.tv_sec
-
-#ifdef _KERNEL
-/* Buffer type for msgctl (IPC_INFO, ...) as used by ipcs(8).
- */
-struct msginfo
-{
-  long msgmax;		/* Maximum number of bytes per
-			   message. */
-  long msgmnb;		/* Maximum number of bytes on any one
-			   message queue. */
-  long msgmni;		/* Maximum number of message queues,
-			   system wide. */
-  long msgtql;		/* Maximum number of messages, system
-			   wide. */
-  long msgssz;		/* Size of a message segment, must be
-			   small power of 2 greater than 4. */
-  long msgseg;		/* Number of message segments */
-  long msg_spare[2];
-};
-
-/* Buffer type for msgctl (MSG_INFO, ...) as used by ipcs(8).
- */
-struct msg_info
-{
-  long msg_ids;		/* Number of allocated queues. */
-  long msg_num;		/* Number of messages, system wide. */
-  long msg_tot;		/* Size in bytes of messages, system wide. */
-};
-#endif /* _KERNEL */
-
-int     msgctl (int msqid, int cmd, struct msqid_ds *buf);
-int     msgget (key_t key, int msgflg);
-ssize_t msgrcv (int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg);
-int     msgsnd (int msqid, const void *msgp, size_t msgsz, int msgflg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CYGWIN_MSG_H */
diff --git a/winsup/cygwin/include/cygwin/mtio.h b/winsup/cygwin/include/cygwin/mtio.h
deleted file mode 100644
index 04e65234c..000000000
--- a/winsup/cygwin/include/cygwin/mtio.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/* cygwin/mtio.h
-
-   Copyright 1999, 2001 Red Hat, Inc.
-
-   Written by Corinna Vinschen <corinna@vinschen.de>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* cygwin/mtio.h header file for Cygwin.
-
-   by C. Vinschen.  */
-
-#ifndef _CYGWIN_MTIO_H
-#define _CYGWIN_MTIO_H
-
-#include <sys/ioctl.h>
-#include <asm/socket.h>
-
-#ifndef DEFTAPE
-#define DEFTAPE "/dev/tape"
-#endif
-
-/*
- * Structures and definitions for mag tape io control commands
- */
-
-/* structure for MTIOCTOP - mag tape op command */
-struct	mtop {
-	short	mt_op;		/* operations defined below */
-	int	mt_count;	/* how many of them */
-};
-
-/* Magnetic Tape operations [Not all operations supported by all drivers]: */
-#define MTRESET 0	/* +reset drive in case of problems */
-#define MTFSF	1	/* forward space over FileMark,
-			 * position at first record of next file
-			 */
-#define MTBSF	2	/* backward space FileMark (position before FM) */
-#define MTFSR	3	/* forward space record */
-#define MTBSR	4	/* backward space record */
-#define MTWEOF	5	/* write an end-of-file record (mark) */
-#define MTREW	6	/* rewind */
-#define MTOFFL	7	/* rewind and put the drive offline (eject?) */
-#define MTNOP	8	/* no op, set status only (read with MTIOCGET) */
-#define MTRETEN 9	/* retension tape */
-#define MTBSFM	10	/* +backward space FileMark, position at FM */
-#define MTFSFM  11	/* +forward space FileMark, position at FM */
-#define MTEOM	12	/* goto end of recorded media (for appending files).
-			 * MTEOM positions after the last FM, ready for
-			 * appending another file.
-			 */
-#define MTERASE 13	/* erase tape -- be careful! */
-
-#define MTRAS1  14	/* run self test 1 (nondestructive) */
-#define MTRAS2	15	/* run self test 2 (destructive) */
-#define MTRAS3  16	/* reserved for self test 3 */
-
-#define MTSETBLK 20	/* set block length (SCSI) */
-#define MTSETDENSITY 21	/* set tape density (SCSI) */
-#define MTSEEK	22	/* seek to block (Tandberg, etc.) */
-#define MTTELL	23	/* tell block (Tandberg, etc.) */
-#define MTSETDRVBUFFER 24 /* set the drive buffering according to SCSI-2 */
-			/* ordinary buffered operation with code 1 */
-#define MTFSS	25	/* space forward over setmarks */
-#define MTBSS	26	/* space backward over setmarks */
-#define MTWSM	27	/* write setmarks */
-
-#define MTLOCK  28	/* lock the drive door */
-#define MTUNLOCK 29	/* unlock the drive door */
-#define MTLOAD  30	/* execute the SCSI load command */
-#define MTUNLOAD 31	/* execute the SCSI unload command */
-#define MTCOMPRESSION 32/* control compression with SCSI mode page 15 */
-#define MTSETPART 33	/* Change the active tape partition */
-#define MTMKPART  34	/* Format the tape with one or two partitions */
-
-/* structure for MTIOCGET - mag tape get status command */
-
-struct	mtget {
-	long	mt_type;	/* type of magtape device
-				 * Cygwin: MT_ISUNKNOWN */
-	long	mt_resid;	/* residual count: (not sure)
-				 *	number of bytes ignored, or
-				 *	number of files not skipped, or
-				 *	number of records not skipped.
-				 *  Cygwin: remaining KB.
-				 */
-	/* the following registers are device dependent */
-	long	mt_dsreg;	/* status register, Cygwin returns current
-				   blocksize here. */
-	long	mt_gstat;	/* generic (device independent) status */
-	long	mt_erreg;	/* error register */
-	/* The next two fields are not always used */
-	long	mt_fileno;	/* number of current file on tape */
-	long	mt_blkno;	/* current block number */
-	/* The next are Windows NT specific */
-	long long	mt_capacity;	/* Tape capacity in bytes */
-	long long	mt_remaining;	/* Remaining bytes */
-	int		mt_minblksize;
-	int		mt_maxblksize;
-	int		mt_defblksize;
-	unsigned long	mt_featureslow;
-	unsigned long	mt_featureshigh;
-	unsigned long	mt_eotwarningzonesize;
-};
-
-/* structure for MTIOCPOS - mag tape get position command */
-
-struct	mtpos {
-	long	mt_blkno;	/* current block number */
-};
-
-
-/* mag tape io control commands */
-#define	MTIOCTOP	_IOW('m', 1, struct mtop)	/* do a mag tape op */
-#define	MTIOCGET	_IOR('m', 2, struct mtget)	/* get tape status */
-#define	MTIOCPOS	_IOR('m', 3, struct mtpos)	/* get tape position */
-
-/* Generic Mag Tape (device independent) status macros for examining
- * mt_gstat -- HP-UX compatible.
- * There is room for more generic status bits here, but I don't
- * know which of them are reserved. At least three or so should
- * be added to make this really useful.
- */
-#define GMT_EOF(x)              ((x) & 0x80000000)
-#define GMT_BOT(x)              ((x) & 0x40000000)
-#define GMT_EOT(x)              ((x) & 0x20000000)
-#define GMT_SM(x)               ((x) & 0x10000000)  /* DDS setmark */
-#define GMT_EOD(x)              ((x) & 0x08000000)  /* DDS EOD */
-#define GMT_WR_PROT(x)          ((x) & 0x04000000)
-/* #define GMT_ ?		((x) & 0x02000000) */
-#define GMT_ONLINE(x)           ((x) & 0x01000000)
-#define GMT_D_6250(x)           ((x) & 0x00800000)
-#define GMT_D_1600(x)           ((x) & 0x00400000)
-#define GMT_D_800(x)            ((x) & 0x00200000)
-#define GMT_PADDING(x)		((x) & 0x00100000)  /* data padding */
-#define GMT_HW_ECC(x)		((x) & 0x00080000)  /* HW error correction */
-#define GMT_DR_OPEN(x)          ((x) & 0x00040000)  /* door open (no tape) */
-#define GMT_HW_COMP(x)		((x) & 0x00020000)  /* HW compression */
-#define GMT_IM_REP_EN(x)        ((x) & 0x00010000)  /* immediate report mode */
-/* 16 generic status bits unused */
-
-
-/* SCSI-tape specific definitions */
-/* Bitfield shifts in the status mt_dsreg */
-#define MT_ST_BLKSIZE_SHIFT	0
-#define MT_ST_BLKSIZE_MASK	0xffffff
-#define MT_ST_DENSITY_SHIFT	24
-#define MT_ST_DENSITY_MASK	0xff000000
-
-#define MT_ST_SOFTERR_SHIFT	0
-#define MT_ST_SOFTERR_MASK	0xffff
-
-/*
- * Constants for mt_type. Not all of these are supported,
- * and these are not all of the ones that are supported.
- */
-#define MT_ISUNKNOWN		0x01
-#define MT_ISQIC02		0x02	/* Generic QIC-02 tape streamer */
-#define MT_ISWT5150		0x03	/* Wangtek 5150EQ, QIC-150, QIC-02 */
-#define MT_ISARCHIVE_5945L2	0x04	/* Archive 5945L-2, QIC-24, QIC-02? */
-#define MT_ISCMSJ500		0x05	/* CMS Jumbo 500 (QIC-02?) */
-#define MT_ISTDC3610		0x06	/* Tandberg 6310, QIC-24 */
-#define MT_ISARCHIVE_VP60I	0x07	/* Archive VP60i, QIC-02 */
-#define MT_ISARCHIVE_2150L	0x08	/* Archive Viper 2150L */
-#define MT_ISARCHIVE_2060L	0x09	/* Archive Viper 2060L */
-#define MT_ISARCHIVESC499	0x0A	/* Archive SC-499 QIC-36 controller */
-#define MT_ISQIC02_ALL_FEATURES	0x0F	/* Generic QIC-02 with all features */
-#define MT_ISWT5099EEN24	0x11	/* Wangtek 5099-een24, 60MB, QIC-24 */
-#define MT_ISTEAC_MT2ST		0x12	/* Teac MT-2ST 155mb drive, Teac DC-1 card (Wangtek type) */
-#define MT_ISEVEREX_FT40A	0x32	/* Everex FT40A (QIC-40) */
-#define MT_ISDDS1		0x51	/* DDS device without partitions */
-#define MT_ISDDS2		0x52	/* DDS device with partitions */
-#define MT_ISSCSI1		0x71	/* Generic ANSI SCSI-1 tape unit */
-#define MT_ISSCSI2		0x72	/* Generic ANSI SCSI-2 tape unit */
-
-struct mt_tape_info {
-	long t_type;		/* device type id (mt_type) */
-	char *t_name;		/* descriptive name */
-};
-
-#define MT_TAPE_INFO	{ \
-	{MT_ISUNKNOWN,		"Unknown type of tape device"}, \
-	{MT_ISQIC02,		"Generic QIC-02 tape streamer"}, \
-	{MT_ISWT5150,		"Wangtek 5150, QIC-150"}, \
-	{MT_ISARCHIVE_5945L2,	"Archive 5945L-2"}, \
-	{MT_ISCMSJ500,		"CMS Jumbo 500"}, \
-	{MT_ISTDC3610,		"Tandberg TDC 3610, QIC-24"}, \
-	{MT_ISARCHIVE_VP60I,	"Archive VP60i, QIC-02"}, \
-	{MT_ISARCHIVE_2150L,	"Archive Viper 2150L"}, \
-	{MT_ISARCHIVE_2060L,	"Archive Viper 2060L"}, \
-	{MT_ISARCHIVESC499,	"Archive SC-499 QIC-36 controller"}, \
-	{MT_ISQIC02_ALL_FEATURES, "Generic QIC-02 tape, all features"}, \
-	{MT_ISWT5099EEN24,	"Wangtek 5099-een24, 60MB"}, \
-	{MT_ISTEAC_MT2ST,	"Teac MT-2ST 155mb data cassette drive"}, \
-	{MT_ISEVEREX_FT40A,	"Everex FT40A, QIC-40"}, \
-	{MT_ISSCSI1,		"Generic SCSI-1 tape"}, \
-	{MT_ISSCSI2,		"Generic SCSI-2 tape"}, \
-	{0, NULL} \
-}
-
-#endif /* _CYGWIN_MTIO_H */
diff --git a/winsup/cygwin/include/cygwin/rdevio.h b/winsup/cygwin/include/cygwin/rdevio.h
deleted file mode 100644
index 73059ac09..000000000
--- a/winsup/cygwin/include/cygwin/rdevio.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* cygwin/rdevio.h
-
-   Copyright 1999, 2001 Red Hat, Inc.
-
-   Written by Corinna Vinschen <corinna@vinschen.de>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/*
- * cygwin/rdevio.h header file for Cygwin.
- *
- * Written by C. Vinschen.
- */
-
-#ifndef _CYGWIN_RDEVIO_H
-#define _CYGWIN_RDEVIO_H
-
-/* structure for RDIOCDOP - raw device operation */
-struct rdop {
-	short		rd_op;
-	unsigned long	rd_parm;
-};
-
-/* Raw device operations */
-#define RDSETBLK	1	/* set buffer for driver */
-
-/* structure for RDIOCGET - get raw device */
-struct rdget {
-	unsigned long	bufsiz;
-};
-
-/*
- * ioctl commands
-*/
-#define RDIOCDOP	_IOW('r', 128, struct rdop)
-#define RDIOCGET	_IOR('r', 129, struct rdget)
-
-#endif /* _CYGWIN_RDEVIO_H */
diff --git a/winsup/cygwin/include/cygwin/sem.h b/winsup/cygwin/include/cygwin/sem.h
deleted file mode 100644
index af7a42f36..000000000
--- a/winsup/cygwin/include/cygwin/sem.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* sys/sem.h
-
-   Copyright 2002 Red Hat Inc.
-   Written by Conrad Scott <conrad.scott@dsl.pipex.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_SEM_H
-#define _CYGWIN_SEM_H
-
-#include <cygwin/ipc.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* Semaphore operation flags:
- */
-#define SEM_UNDO   010000	/* Set up adjust on exit entry. */
-
-/* Command definitions for the semctl () function:
- */
-#define GETNCNT    0x3000	/* Get semncnt. */
-#define GETPID     0x3001	/* Get sempid. */
-#define GETVAL     0x3002	/* Get semval. */
-#define GETALL     0x3003	/* Get all cases of semval. */
-#define GETZCNT    0x3004	/* Get semzcnt. */
-#define SETVAL     0x3005	/* Set semval. */
-#define SETALL     0x3006	/* Set all cases of semval. */
-
-#ifdef _KERNEL
-#define SEM_STAT   0x3010	/* For ipcs(8). */
-#define SEM_INFO   0x3011	/* For ipcs(8). */
-#endif /* _KERNEL */
-
-struct semid_ds
-{
-  struct ipc_perm  sem_perm;	/* Operation permission structure. */
-  unsigned short   sem_nsems;	/* Number of semaphores in set. */
-  timestruc_t      sem_otim;	/* Last semop () time. */
-  timestruc_t      sem_ctim;	/* Last time changed by semctl (). */
-#ifdef _KERNEL
-  struct sem	  *sem_base;	/* pointer to first semaphore in set */
-  long             sem_spare4[1];
-#else
-  long             sem_spare4[2];
-#endif /* _KERNEL */
-};
-
-#define sem_otime sem_otim.tv_sec
-#define sem_ctime sem_ctim.tv_sec
-
-struct sembuf
-{
-  unsigned short  sem_num;	/* Semaphore number. */
-  short           sem_op;	/* Semaphore operation. */
-  short           sem_flg;	/* Operation flags. */
-};
-
-#ifdef _KERNEL
-/* Buffer type for semctl (IPC_INFO, ...) as used by ipcs(8).
- */
-struct seminfo
-{
-  long semmni;		/* Maximum number of unique semaphore
-			   sets, system wide. */
-  long semmns;		/* Maximum number of semaphores,
-			   system wide. */
-  long semmsl;		/* Maximum number of semaphores per
-			   semaphore set. */
-  long semopm;		/* Maximum number of operations per
-			   semop call. */
-  long semmnu;		/* Maximum number of undo structures,
-			   system wide. */
-  long semume;		/* Maximum number of undo entries per
-			   undo structure. */
-  long semvmx;		/* Maximum semaphore value. */
-  long semaem;		/* Maximum adjust-on-exit value. */
-  long semmap;		/* # of entries in semaphore map */
-  long semusz;		/* size in bytes of undo structure */
-  long sem_spare[2];
-};
-
-/* Buffer type for semctl (SEM_INFO, ...) as used by ipcs(8).
- */
-struct sem_info
-{
-  long sem_ids;		/* Number of allocated semaphore sets. */
-  long sem_num;		/* Number of allocated semaphores. */
-};
-
-/* Permission flags */
-#define SEM_A		IPC_W	/* alter permission */
-#define SEM_R		IPC_R	/* read permission */
-
-/* Internally used mode bits. */
-#define	SEM_ALLOC	01000	/* semaphore is allocated */
-
-#endif /* _KERNEL */
-
-#ifdef _KERNEL
-/* According to SUSv3, "the fourth argument [to semctl()] is optional and
-   depends upon the operation requested. If required, it is of type
-   union semun, which the application shall explicitly declare:" */
-union semun {
-    int val;			/* value for SETVAL */
-    struct semid_ds *buf;	/* buffer for IPC_STAT, IPC_SET */
-    unsigned short  *array;	/* array for GETALL, SETALL */
-};
-/* Therefore this union is only declared here if building internal code.
-   _KERNEL must not be defined in exernal applications!  Declare union
-   semun explicitely as required by SUSv3, please. */
-#endif /* _KERNEL */
-
-int semctl (int semid, int semnum, int cmd, ...);
-int semget (key_t key, int nsems, int semflg);
-int semop (int semid, struct sembuf *sops, size_t nsops);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CYGWIN_SEM_H */
diff --git a/winsup/cygwin/include/cygwin/shm.h b/winsup/cygwin/include/cygwin/shm.h
deleted file mode 100644
index 2c882012c..000000000
--- a/winsup/cygwin/include/cygwin/shm.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* sys/shm.h
-
-   Copyright 2001, 2002 Red Hat Inc.
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_SHM_H
-#define _CYGWIN_SHM_H
-
-#include <cygwin/ipc.h>
-#include <sys/cygwin.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* Segment low boundary address multiple.
- *
- * 64 Kb was hardcoded for x86. MS states this may change so the constant
- * expression is replaced by a function call returning the correct value. */
-#define SHMLBA	(cygwin_internal (CW_GET_SHMLBA))
-
-/* Shared memory operation flags:
- */
-#define SHM_RDONLY 0x01		/* Attach read-only (else read-write). */
-#define SHM_RND    0x02		/* Round attach address to SHMLBA. */
-
-#ifdef _KERNEL
-/* Command definitions for the semctl () function:
- */
-#define SHM_STAT   0x4000	/* For ipcs(8) */
-#define SHM_INFO   0x4001	/* For ipcs(8) */
-#endif /* _KERNEL */
-
-/* Unsigned integer used for the number of current attaches.
- */
-typedef unsigned int shmatt_t;
-
-struct shmid_ds
-{
-  struct ipc_perm    shm_perm;	/* Operation permission structure. */
-  size_t             shm_segsz;	/* Size of segment in bytes. */
-  pid_t              shm_lpid;	/* Process ID of last operation. */
-  pid_t              shm_cpid;	/* Process ID of creator. */
-  shmatt_t           shm_nattch;/* Number of current attaches. */
-  timestruc_t        shm_atim;	/* Time of last shmat (). */
-  timestruc_t        shm_dtim;	/* Time of last shmdt (). */
-  timestruc_t        shm_ctim;	/* Time of last change by shmctl (). */
-#ifdef _KERNEL
-  struct shm_handle *shm_internal;
-  long               shm_spare4[1];
-#else
-  long               shm_spare4[2];
-#endif /* _KERNEL */
-};
-
-#define shm_atime shm_atim.tv_sec
-#define shm_dtime shm_dtim.tv_sec
-#define shm_ctime shm_ctim.tv_sec
-
-#ifdef _KERNEL
-/* Buffer type for shmctl (IPC_INFO, ...) as used by ipcs(8).
- */
-struct shminfo
-{
-  long shmmax;		/* Maximum size in bytes of a shared
-			   memory segment. */
-  long shmmin;		/* Minimum size in bytes of a shared
-			   memory segment. */
-  long shmmni;		/* Maximum number of shared memory
-			   segments, system wide. */
-  long shmseg;		/* Maximum number of shared memory
-			   segments attached per process. */
-  long shmall;		/* Maximum number of bytes of shared
-			   memory, system wide. */
-  long shm_spare[4];
-};
-
-/* Buffer type for shmctl (SHM_INFO, ...) as used by ipcs(8).
- */
-struct shm_info
-{
-#define shm_ids used_ids
-  long used_ids;	/* Number of allocated segments. */
-  long shm_tot;		/* Size in bytes of allocated segments. */
-  long shm_atts;	/* Number of attached segments, system
-			   wide. */
-};
-#endif /* _KERNEL */
-
-void *shmat (int shmid, const void *shmaddr, int shmflg);
-int   shmctl (int shmid, int cmd, struct shmid_ds *buf);
-int   shmdt (const void *shmaddr);
-int   shmget (key_t key, size_t size, int shmflg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CYGWIN_SHM_H */
diff --git a/winsup/cygwin/include/cygwin/signal.h b/winsup/cygwin/include/cygwin/signal.h
deleted file mode 100644
index 1e2863404..000000000
--- a/winsup/cygwin/include/cygwin/signal.h
+++ /dev/null
@@ -1,191 +0,0 @@
-#ifndef _CYGWIN_SIGNAL_H
-#define _CYGWIN_SIGNAL_H
-
-#if 0
-struct ucontext
-{
-  unsigned long uc_flags;
-  void *uc_link;
-  stack_t uc_stack;
-  struct sigcontext uc_mcontext;
-  sigset_t uc_sigmask;   
-};
-#endif
-
-typedef union sigval
-{
-  int sival_int;			/* integer signal value */
-  void  *sival_ptr;			/* pointer signal value */
-} sigval_t;
-
-#pragma pack(push,4)
-typedef struct
-{
-  int si_signo;				/* signal number */
-  int si_errno;				/* errno associated with signal */
-  int si_code;				/* signal code */
-
-  union
-  {
-    int __pad[128];			/* plan for future growth */
-
-    union
-    {
-    /* timers */
-      struct
-      {
-	unsigned int si_tid;		/* timer id */
-	unsigned int si_overrun;	/* overrun count */
-      };
-	  
-      /* POSIX signals or signals invoked by kill() */
-      struct
-      {
-	pid_t si_pid;            	/* sender's pid */
-	uid_t si_uid;            	/* sender's uid */
-      };
-      sigval_t si_sigval;		/* signal value */
-    };
-
-    struct
-    {
-      pid_t si_pid2;           		/* which child */
-      uid_t si_uid2;           		/* sender's uid */
-      int si_status;           		/* exit code */
-      clock_t si_utime;			/* user time */
-      clock_t si_stime;			/* system time */
-    };
-
-    /* core dumping signals */
-    struct
-    {
-      void *si_addr;			/* faulting address */
-    };
-  };
-} siginfo_t;
-#pragma pack(pop)
-
-enum
-{
-  SI_USER = 1,				/* sent by kill, raise, pthread_kill */
-  SI_ASYNCIO,				/* sent by AIO completion (currently
-					   unimplemented) */
-  SI_MESGQ,				/* sent by real time mesq state change
-					   (currently unimplemented) */
-  SI_TIMER,				/* sent by timer expiration */
-  SI_QUEUE,				/* sent by sigqueue (currently
-					   unimplemented) */
-  SI_KERNEL,				/* sent by system */
-
-  ILL_ILLOP,				/* illegal opcode */
-  ILL_ILLOPN,				/* illegal operand */
-  ILL_ILLADR,				/* illegal addressing mode */
-  ILL_ILLTRP,				/* illegal trap*/
-  ILL_PRVOPC,				/* privileged opcode */
-  ILL_PRVREG,				/* privileged register */
-  ILL_COPROC,				/* coprocessor error */
-  ILL_BADSTK,				/* internal stack error */
-
-  FPE_INTDIV,				/* integer divide by zero */
-  FPE_INTOVF,				/* integer overflow */
-  FPE_FLTDIV,				/* floating point divide by zero */
-  FPE_FLTOVF,				/* floating point overflow */
-  FPE_FLTUND,				/* floating point underflow */
-  FPE_FLTRES,				/* floating point inexact result */
-  FPE_FLTINV,				/* floating point invalid operation */
-  FPE_FLTSUB,				/* subscript out of range */
-
-  SEGV_MAPERR,				/* address not mapped to object */
-  SEGV_ACCERR,				/* invalid permissions for mapped object */
-
-  BUS_ADRALN,				/* invalid address alignment.  */
-  BUS_ADRERR,				/* non-existant physical address.  */
-  BUS_OBJERR,				/* object specific hardware error.  */
-
-  CLD_EXITED,				/* child has exited */
-  CLD_KILLED,				/* child was killed */
-  CLD_DUMPED,				/* child terminated abnormally */
-  CLD_TRAPPED,				/* traced child has trapped */
-  CLD_STOPPED,				/* child has stopped */
-  CLD_CONTINUED				/* stopped child has continued */
-};
-
-typedef struct sigevent
-{
-  sigval_t sigev_value;			/* signal value */
-  int sigev_signo;			/* signal number */ 
-  int sigev_notify;			/* notification type */
-  void (*sigev_notify_function) (sigval_t); /* notification function */
-  pthread_attr_t *sigev_notify_attributes; /* notification attributes */
-} sigevent_t;
-
-enum
-{
-  SIGEV_SIGNAL = 0,			/* a queued signal, with an application
-					   defined value, is generated when the
-					   event of interest occurs */
-  SIGEV_NONE,				/* no asynchronous notification is
-					   delivered when the event of interest
-					   occurs */
-  SIGEV_THREAD				/* a notification function is called to
-					   perform notification */
-};
-
-typedef void (*_sig_func_ptr)(int);
-
-struct sigaction 
-{
-  union
-  {
-    _sig_func_ptr sa_handler;  		/* SIG_DFL, SIG_IGN, or pointer to a function */
-    void  (*sa_sigaction) ( int, siginfo_t *, void * );
-  };
-  sigset_t sa_mask;
-  int sa_flags;
-};
-
-#define SA_NOCLDSTOP 1   		/* Do not generate SIGCHLD when children
-					   stop */
-#define SA_SIGINFO   2   		/* Invoke the signal catching function
-					   with three arguments instead of one
-					 */
-#define SA_RESTART   0x10000000 	/* Restart syscall on signal return */
-#define SA_NODEFER   0x40000000		/* Don't automatically block the signal
-					   when its handler is being executed  */
-#define SA_RESETHAND 0x80000000		/* Reset to SIG_DFL on entry to handler */
-
-#define	SIGHUP	1	/* hangup */
-#define	SIGINT	2	/* interrupt */
-#define	SIGQUIT	3	/* quit */
-#define	SIGILL	4	/* illegal instruction (not reset when caught) */
-#define	SIGTRAP	5	/* trace trap (not reset when caught) */
-#define	SIGABRT 6	/* used by abort */
-#define	SIGEMT	7	/* EMT instruction */
-#define	SIGFPE	8	/* floating point exception */
-#define	SIGKILL	9	/* kill (cannot be caught or ignored) */
-#define	SIGBUS	10	/* bus error */
-#define	SIGSEGV	11	/* segmentation violation */
-#define	SIGSYS	12	/* bad argument to system call */
-#define	SIGPIPE	13	/* write on a pipe with no one to read it */
-#define	SIGALRM	14	/* alarm clock */
-#define	SIGTERM	15	/* software termination signal from kill */
-#define	SIGURG	16	/* urgent condition on IO channel */
-#define	SIGSTOP	17	/* sendable stop signal not from tty */
-#define	SIGTSTP	18	/* stop signal from tty */
-#define	SIGCONT	19	/* continue a stopped process */
-#define	SIGCHLD	20	/* to parent on child stop or exit */
-#define	SIGCLD	20	/* System V name for SIGCHLD */
-#define	SIGTTIN	21	/* to readers pgrp upon background tty read */
-#define	SIGTTOU	22	/* like TTIN for output if (tp->t_local&LTOSTOP) */
-#define	SIGIO	23	/* input/output possible signal */
-#define	SIGPOLL	SIGIO	/* System V name for SIGIO */
-#define	SIGXCPU	24	/* exceeded CPU time limit */
-#define	SIGXFSZ	25	/* exceeded file size limit */
-#define	SIGVTALRM 26	/* virtual time alarm */
-#define	SIGPROF	27	/* profiling time alarm */
-#define	SIGWINCH 28	/* window changed */
-#define	SIGLOST 29	/* resource lost (eg, record-lock lost) */
-#define	SIGUSR1 30	/* user defined signal 1 */
-#define	SIGUSR2 31	/* user defined signal 2 */
-#define NSIG	32      /* signal 0 implied */
-#endif /*_CYGWIN_SIGNAL_H*/
diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h
deleted file mode 100644
index 67e1345f2..000000000
--- a/winsup/cygwin/include/cygwin/socket.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* cygwin/socket.h
-
-   Copyright 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_SOCKET_H
-#define _CYGWIN_SOCKET_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-struct sockaddr {
-  unsigned short	sa_family;	/* address family, AF_xxx	*/
-  char			sa_data[14];	/* 14 bytes of protocol address	*/
-};
-
-#include <asm/socket.h>			/* arch-dependent defines	*/
-#include <cygwin/sockios.h>		/* the SIOCxxx I/O controls	*/
-#include <cygwin/uio.h>			/* iovec support		*/
-#include <sys/types.h>
-
-struct linger {
-  unsigned short			l_onoff;	/* Linger active		*/
- unsigned short			l_linger;	/* How long to linger for	*/
-};
-
-struct msghdr
-{
-	void	*	msg_name;	/* Socket name			*/
-	int		msg_namelen;	/* Length of name		*/
-	struct iovec *	msg_iov;	/* Data blocks			*/
-	int		msg_iovlen;	/* Number of blocks		*/
-	void	*	msg_accrights;	/* Per protocol magic (eg BSD file descriptor passing) */
-	int		msg_accrightslen;	/* Length of rights list */
-};
-
-#ifndef socklen_t
-#define socklen_t int
-#endif
-
-/* Socket types. */
-#define SOCK_STREAM	1		/* stream (connection) socket	*/
-#define SOCK_DGRAM	2		/* datagram (conn.less) socket	*/
-#define SOCK_RAW	3		/* raw socket			*/
-#define SOCK_RDM	4		/* reliably-delivered message	*/
-#define SOCK_SEQPACKET	5		/* sequential packet socket	*/
-
-/* Supported address families. */
-/*
- * Address families.
- */
-#define AF_UNSPEC       0               /* unspecified */
-#define AF_UNIX         1               /* local to host (pipes, portals) */
-#define AF_LOCAL        1               /* POSIX name for AF_UNIX */
-#define AF_INET         2               /* internetwork: UDP, TCP, etc. */
-#define AF_IMPLINK      3               /* arpanet imp addresses */
-#define AF_PUP          4               /* pup protocols: e.g. BSP */
-#define AF_CHAOS        5               /* mit CHAOS protocols */
-#define AF_NS           6               /* XEROX NS protocols */
-#define AF_ISO          7               /* ISO protocols */
-#define AF_OSI          AF_ISO          /* OSI is ISO */
-#define AF_ECMA         8               /* european computer manufacturers */
-#define AF_DATAKIT      9               /* datakit protocols */
-#define AF_CCITT        10              /* CCITT protocols, X.25 etc */
-#define AF_SNA          11              /* IBM SNA */
-#define AF_DECnet       12              /* DECnet */
-#define AF_DLI          13              /* Direct data link interface */
-#define AF_LAT          14              /* LAT */
-#define AF_HYLINK       15              /* NSC Hyperchannel */
-#define AF_APPLETALK    16              /* AppleTalk */
-#define AF_NETBIOS      17              /* NetBios-style addresses */
-#if 0					/* Not yet */
-#define AF_INET6        23              /* IP version 6 */
-#endif
-
-#define AF_MAX          32
-/*
- * Protocol families, same as address families for now.
- */
-#define PF_UNSPEC       AF_UNSPEC
-#define PF_UNIX         AF_UNIX
-#define PF_LOCAL        AF_LOCAL
-#define PF_INET         AF_INET
-#define PF_IMPLINK      AF_IMPLINK
-#define PF_PUP          AF_PUP
-#define PF_CHAOS        AF_CHAOS
-#define PF_NS           AF_NS
-#define PF_ISO          AF_ISO
-#define PF_OSI          AF_OSI
-#define PF_ECMA         AF_ECMA
-#define PF_DATAKIT      AF_DATAKIT
-#define PF_CCITT        AF_CCITT
-#define PF_SNA          AF_SNA
-#define PF_DECnet       AF_DECnet
-#define PF_DLI          AF_DLI
-#define PF_LAT          AF_LAT
-#define PF_HYLINK       AF_HYLINK
-#define PF_APPLETALK    AF_APPLETALK
-#define PF_NETBIOS      AF_NETBIOS
-#if 0
-#define PF_INET6        AF_INET6
-#endif
-
-#define PF_MAX          AF_MAX
-
-/* Maximum queue length specificable by listen.  */
-#define SOMAXCONN       0x7fffffff
-
-/* Flags we can use with send/ and recv. */
-#define MSG_OOB         0x1             /* process out-of-band data */
-#define MSG_PEEK        0x2             /* peek at incoming message */
-#define MSG_DONTROUTE   0x4             /* send without using routing tables */
-#define MSG_WINMASK     0x7             /* flags understood by WinSock calls */
-#define MSG_NOSIGNAL    0x20            /* Don't raise SIGPIPE */
-
-/* Setsockoptions(2) level. Thanks to BSD these must match IPPROTO_xxx */
-#define SOL_IP		0
-#define SOL_IPX		256
-#define SOL_AX25	257
-#define SOL_ATALK	258
-#define	SOL_NETROM	259
-#define SOL_TCP		6
-#define SOL_UDP		17
-
-/* IP options */
-#ifndef IPTOS_LOWDELAY
-#define	IPTOS_LOWDELAY		0x10
-#define	IPTOS_THROUGHPUT	0x08
-#define	IPTOS_RELIABILITY	0x04
-#endif
-
-/* These need to appear somewhere around here */
-#define IP_DEFAULT_MULTICAST_TTL        1
-#define IP_DEFAULT_MULTICAST_LOOP       1
-#define IP_MAX_MEMBERSHIPS              20
-
-/* IP options for use with WinSock */
-
-#define IP_OPTIONS          1
-#define IP_MULTICAST_IF     2
-#define IP_MULTICAST_TTL    3
-#define IP_MULTICAST_LOOP   4
-#define IP_ADD_MEMBERSHIP   5
-#define IP_DROP_MEMBERSHIP  6
-#define IP_TTL              7
-#define IP_TOS              8
-#define IP_DONTFRAGMENT     9
-
-/* IPX options */
-#define IPX_TYPE	1
-
-/* TCP options - this way around because someone left a set in the c library includes */
-#ifndef TCP_NODELAY
-#define TCP_NODELAY     0x0001
-#define TCP_MAXSEG	2
-#endif
-
-/* The various priorities. */
-#define SOPRI_INTERACTIVE	0
-#define SOPRI_NORMAL		1
-#define SOPRI_BACKGROUND	2
-
-#ifdef __cplusplus
-};
-#endif /* __cplusplus */
-
-#endif /* _CYGWIN_SOCKET_H */
diff --git a/winsup/cygwin/include/cygwin/sockios.h b/winsup/cygwin/include/cygwin/sockios.h
deleted file mode 100644
index 2e756954e..000000000
--- a/winsup/cygwin/include/cygwin/sockios.h
+++ /dev/null
@@ -1 +0,0 @@
-/* sockios.h */
diff --git a/winsup/cygwin/include/cygwin/stat.h b/winsup/cygwin/include/cygwin/stat.h
deleted file mode 100644
index 2ae7709c2..000000000
--- a/winsup/cygwin/include/cygwin/stat.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* cygwin/stat.h
-
-   Copyright 2002 Red Hat Inc.
-   Written by Corinna Vinschen <corinna@vinschen.de>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_STAT_H
-#define _CYGWIN_STAT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined (__INSIDE_CYGWIN__) || defined (_COMPILING_NEWLIB)
-struct __stat32
-{
-  __dev16_t	st_dev;
-  __ino32_t	st_ino;
-  mode_t	st_mode;
-  nlink_t       st_nlink;
-  __uid16_t     st_uid;
-  __gid16_t     st_gid;
-  __dev16_t     st_rdev;
-  _off_t        st_size;
-  timestruc_t   st_atim;
-  timestruc_t   st_mtim;
-  timestruc_t   st_ctim;
-  blksize_t     st_blksize;
-  __blkcnt32_t  st_blocks;
-  long          st_spare4[2];
-};
-
-struct __stat64
-{
-  __dev32_t     st_dev;
-  __ino64_t     st_ino;
-  mode_t        st_mode;
-  nlink_t       st_nlink;
-  __uid32_t     st_uid;
-  __gid32_t     st_gid;
-  __dev32_t     st_rdev;
-  _off64_t      st_size;
-  timestruc_t   st_atim;
-  timestruc_t   st_mtim;
-  timestruc_t   st_ctim;
-  blksize_t     st_blksize;
-  __blkcnt64_t  st_blocks;
-  long          st_spare4[2];
-};
-
-extern int fstat64 (int fd, struct __stat64 *buf);
-extern int stat64 (const char *file_name, struct __stat64 *buf);
-extern int lstat64 (const char *file_name, struct __stat64 *buf);
-
-#endif
-
-struct stat
-{
-  dev_t         st_dev;
-  ino_t         st_ino;
-  mode_t        st_mode;
-  nlink_t       st_nlink;
-  uid_t         st_uid;
-  gid_t         st_gid;
-  dev_t         st_rdev;
-  off_t         st_size;
-  timestruc_t   st_atim;
-  timestruc_t   st_mtim;
-  timestruc_t   st_ctim;
-  blksize_t     st_blksize;
-  blkcnt_t      st_blocks;
-  long          st_spare4[2];
-};
-
-#define st_atime st_atim.tv_sec
-#define st_mtime st_mtim.tv_sec
-#define st_ctime st_ctim.tv_sec
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CYGWIN_STAT_H */
diff --git a/winsup/cygwin/include/cygwin/sysproto.h b/winsup/cygwin/include/cygwin/sysproto.h
deleted file mode 100644
index 5b551f457..000000000
--- a/winsup/cygwin/include/cygwin/sysproto.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* cygwin/sysproto.h
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* cygwin/sysproto.h header file for Cygwin.  */
-
-#ifndef _CYGWIN_SYSPROTO_H
-#define _CYGWIN_SYSPROTO_H
-#define _SYS_SYSPROTO_H_ /* Keep it, used by BSD files */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <sys/types.h>
-
-struct msgctl_args {
-  int     msqid;
-  int     cmd;
-  struct  msqid_ds *buf;
-};
-
-struct msgget_args {
-  key_t   key;
-  int     msgflg;
-};
-
-struct msgrcv_args {
-  int     msqid;
-  void    *msgp;
-  size_t  msgsz;
-  long    msgtyp;
-  int     msgflg;
-};
-
-struct msgsnd_args {
-  int     msqid;
-  const void *msgp;
-  size_t  msgsz;
-  int     msgflg;
-};
-
-struct semctl_args {
-  int     semid;
-  int     semnum;
-  int     cmd;
-  union   semun *arg;
-};
-
-struct semget_args {
-  key_t   key; 
-  int     nsems;
-  int     semflg;
-};
-
-struct semop_args {
-  int     semid;
-  struct  sembuf *sops;
-  size_t  nsops;
-};              
-
-struct shmat_args {
-  int     shmid;
-  const void *shmaddr;
-  int     shmflg;
-};
-
-struct shmctl_args {
-  int     shmid;
-  int     cmd;
-  struct shmid_ds *buf;
-};
-
-struct shmdt_args {
-  const void *shmaddr;
-};
-
-struct shmget_args {
-  key_t   key;
-  size_t  size;
-  int     shmflg;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _CYGWIN_SYSPROTO_H */
diff --git a/winsup/cygwin/include/cygwin/types.h b/winsup/cygwin/include/cygwin/types.h
deleted file mode 100644
index aaa0f67f1..000000000
--- a/winsup/cygwin/include/cygwin/types.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* types.h
-
-   Copyright 2001, 2002, 2003 Red Hat Inc.
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#ifndef _CYGWIN_TYPES_H
-#define _CYGWIN_TYPES_H
-
-#include <sys/sysmacros.h>
-#include <stdint.h>
-
-#ifndef __timespec_t_defined
-#define __timespec_t_defined
-typedef struct timespec timespec_t;
-#endif /*__timespec_t_defined*/
-
-#ifndef __timestruc_t_defined
-#define __timestruc_t_defined
-typedef struct timespec timestruc_t;
-#endif /*__timestruc_t_defined*/
-
-#ifndef __off_t_defined
-#define __off_t_defined
-#ifdef __CYGWIN_USE_BIG_TYPES__
-typedef _off64_t off_t;
-#else
-typedef _off_t off_t;
-#endif
-#endif /*__off_t_defined*/
-
-#ifndef __dev_t_defined
-#define __dev_t_defined
-typedef short __dev16_t;
-typedef unsigned long __dev32_t;
-#ifdef __CYGWIN_USE_BIG_TYPES__
-typedef __dev32_t dev_t;
-#else
-typedef __dev16_t dev_t;
-#endif
-#endif /*__dev_t_defined*/
-
-#ifndef __blksize_t_defined
-#define __blksize_t_defined
-typedef long blksize_t;
-#endif /*__blksize_t_defined*/
-
-#ifndef __blkcnt_t_defined
-#define __blkcnt_t_defined
-typedef long __blkcnt32_t;
-typedef long long __blkcnt64_t;
-#ifdef __CYGWIN_USE_BIG_TYPES__
-typedef __blkcnt64_t  blkcnt_t;
-#else
-typedef __blkcnt32_t  blkcnt_t;
-#endif
-#endif /*__blkcnt_t_defined*/
-
-#ifndef __uid_t_defined
-#define __uid_t_defined
-typedef unsigned short __uid16_t;
-typedef unsigned long  __uid32_t;
-#ifdef __CYGWIN_USE_BIG_TYPES__
-typedef __uid32_t uid_t;
-#else
-typedef __uid16_t uid_t;
-#endif
-#endif /*__uid_t_defined*/
-
-#ifndef __gid_t_defined
-#define __gid_t_defined
-typedef unsigned short __gid16_t;
-typedef unsigned long  __gid32_t;
-#ifdef __CYGWIN_USE_BIG_TYPES__
-typedef __gid32_t gid_t;
-#else
-typedef __gid16_t gid_t;
-#endif
-#endif /*__gid_t_defined*/
-
-#ifndef __ino_t_defined
-#define __ino_t_defined
-typedef unsigned long __ino32_t;
-typedef unsigned long long __ino64_t;
-#ifdef __CYGWIN_USE_BIG_TYPES__
-typedef __ino64_t ino_t;
-#else
-typedef __ino32_t ino_t;
-#endif
-#endif /*__ino_t_defined*/
-
-#if defined (__INSIDE_CYGWIN__)
-struct __flock32 {
-	short	 l_type;	/* F_RDLCK, F_WRLCK, or F_UNLCK */
-	short	 l_whence;	/* flag to choose starting offset */
-	_off_t	 l_start;	/* relative offset, in bytes */
-	_off_t	 l_len;		/* length, in bytes; 0 means lock to EOF */
-	short	 l_pid;		/* returned with F_GETLK */
-	short	 l_xxx;		/* reserved for future use */
-};
-
-struct __flock64 {
-	short	 l_type;	/* F_RDLCK, F_WRLCK, or F_UNLCK */
-	short	 l_whence;	/* flag to choose starting offset */
-	_off64_t l_start;	/* relative offset, in bytes */
-	_off64_t l_len;		/* length, in bytes; 0 means lock to EOF */
-	pid_t	 l_pid;		/* returned with F_GETLK */
-};
-#endif
-
-struct flock {
-	short	 l_type;	/* F_RDLCK, F_WRLCK, or F_UNLCK */
-	short	 l_whence;	/* flag to choose starting offset */
-	off_t	 l_start;	/* relative offset, in bytes */
-	off_t	 l_len;		/* length, in bytes; 0 means lock to EOF */
-#ifdef __CYGWIN_USE_BIG_TYPES__
-	pid_t	 l_pid;		/* returned with F_GETLK */
-#else
-	short	 l_pid;		/* returned with F_GETLK */
-	short	 l_xxx;		/* reserved for future use */
-#endif
-};
-
-#ifndef __key_t_defined
-#define __key_t_defined
-typedef long long key_t;
-#endif /* __key_t_defined */
-
-#ifndef __BIT_TYPES_DEFINED
-#define __BIT_TYPES_DEFINED__ 1
-
-#ifndef __vm_offset_t_defined
-#define __vm_offset_t_defined
-typedef unsigned long vm_offset_t;
-#endif /*__vm_offset_t_defined*/
-
-#ifndef __vm_size_t_defined
-#define __vm_size_t_defined
-typedef unsigned long vm_size_t;
-#endif /*__vm_size_t_defined*/
-
-#ifndef __vm_object_t_defined
-#define __vm_object_t_defined
-typedef void *vm_object_t;
-#endif /* __vm_object_t_defined */
-
-#ifndef __u_int8_t_defined
-#define __u_int8_t_defined
-typedef unsigned char u_int8_t;
-#endif
-#ifndef __u_int16_t_defined
-#define __u_int16_t_defined
-typedef __uint16_t u_int16_t;
-#endif
-#ifndef __u_int32_t_defined
-#define __u_int32_t_defined
-typedef __uint32_t u_int32_t;
-#endif
-#ifndef __u_int64_t_defined
-#define __u_int64_t_defined
-typedef __uint64_t u_int64_t;
-#endif
-
-#ifndef __register_t_defined
-#define __register_t_defined
-typedef __int32_t register_t;
-#endif
-
-#ifndef __addr_t_defined
-#define __addr_t_defined
-typedef char *addr_t;
-#endif
-
-#ifndef __mode_t_defined
-#define __mode_t_defined
-typedef unsigned mode_t;
-#endif
-#endif /*__BIT_TYPES_DEFINED*/
-
-#if !defined(__INSIDE_CYGWIN__) || !defined(__cplusplus)
-
-typedef struct __pthread_t {char __dummy;} *pthread_t;
-typedef struct __pthread_mutex_t {char __dummy;} *pthread_mutex_t;
-
-typedef struct __pthread_key_t {char __dummy;} *pthread_key_t;
-typedef struct __pthread_attr_t {char __dummy;} *pthread_attr_t;
-typedef struct __pthread_mutexattr_t {char __dummy;} *pthread_mutexattr_t;
-typedef struct __pthread_condattr_t {char __dummy;} *pthread_condattr_t;
-typedef struct __pthread_cond_t {char __dummy;} *pthread_cond_t;
-
-  /* These variables are not user alterable. This means you!. */
-typedef struct
-{
-  pthread_mutex_t mutex;
-  int state;
-}
-pthread_once_t;
-typedef struct __pthread_rwlock_t {char __dummy;} *pthread_rwlock_t;
-typedef struct __pthread_rwlockattr_t {char __dummy;} *pthread_rwlockattr_t;
-
-#else
-
-/* pthreads types */
-
-typedef class pthread *pthread_t;
-typedef class pthread_mutex *pthread_mutex_t;
-typedef class pthread_key *pthread_key_t;
-typedef class pthread_attr *pthread_attr_t;
-typedef class pthread_mutexattr *pthread_mutexattr_t;
-typedef class pthread_condattr *pthread_condattr_t;
-typedef class pthread_cond *pthread_cond_t;
-typedef class pthread_once pthread_once_t;
-typedef class pthread_rwlock *pthread_rwlock_t;
-typedef class pthread_rwlockattr *pthread_rwlockattr_t;
-
-/* semaphores types */
-typedef class semaphore *sem_t;
-#endif /* __INSIDE_CYGWIN__ */
-#endif /* _CYGWIN_TYPES_H */
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/winsup/cygwin/include/cygwin/uio.h b/winsup/cygwin/include/cygwin/uio.h
deleted file mode 100644
index 18c77ae65..000000000
--- a/winsup/cygwin/include/cygwin/uio.h
+++ /dev/null
@@ -1 +0,0 @@
-/* uio.h */
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
deleted file mode 100644
index 246e7a45c..000000000
--- a/winsup/cygwin/include/cygwin/version.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/* version.h -- Cygwin version numbers and accompanying documentation.
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* Cygwin versioning is relatively complicated because of its status
-   as a shared library.  Let's start with how versioning used to be done.
-
-   Historical versioning in Cygwin 16.0 to 19.5:
-
-   In the olden days of Cygwin, we had a dll major and minor version
-   and a registry version.  The major number started at 16 because the
-   "b15" GNU-Win32 release of the compiler tools was out when this
-   scheme was started.  We incremented the DLL name frequently (for
-   every official release) and towards the end of this period every
-   release used a different shared memory area to prevent DLLs from
-   interfering with each other (embedding a build timestamp into the
-   name of the shared memory area).  This turned out to be a Bad Idea
-   (tm) because people needed to mingle separate releases and have
-   them work together more than we thought they would.  This was
-   especially problematic when tty info needed to be retained when an
-   old Cygwin executable executed a newer one.
-
-   In the old scheme, we incremented the major number whenever a
-   change to the dll invalidated existing executables.  This can
-   happen for a number of reasons, including when functions are
-   removed from the export list of the dll.  The minor number was
-   incremented when a change was made that we wanted to record, but
-   that didn't invalidate existing executables.  Both numbers were
-   recorded in the executable and in the dll.
-
-   In October 1998 (starting with Cygwin 19.6), we started a new
-   means of Cygwin versioning: */
-
-      /* The DLL major and minor numbers correspond to the "version of
-	 the Cygwin library".  This version is used to track important
-	 changes to the DLL and is mainly informative in nature. */
-
-#define CYGWIN_VERSION_DLL_MAJOR 1005
-#define CYGWIN_VERSION_DLL_MINOR 6
-
-      /* Major numbers before CYGWIN_VERSION_DLL_EPOCH are
-	 incompatible. */
-
-#define CYGWIN_VERSION_DLL_EPOCH 19
-
-      /* CYGWIN_VERSION_DLL_COMBINED gives us a single number
-	 representing the combined DLL major and minor numbers. */
-
-      /* WATCH OUT FOR OCTAL!  Don't use, say, "00020" for 0.20 */
-
-#define CYGWIN_VERSION_DLL_MAKE_COMBINED(maj, min) (((maj) * 1000) + min)
-#define CYGWIN_VERSION_DLL_COMBINED \
-  CYGWIN_VERSION_DLL_MAKE_COMBINED (CYGWIN_VERSION_DLL_MAJOR, CYGWIN_VERSION_DLL_MINOR)
-
-     /* Every version of cygwin <= this uses an old, incorrect method
-	to determine signal masks. */
-
-#define CYGWIN_VERSION_DLL_BAD_SIGNAL_MASK	19005
-
-    /* API versions <= this had a termios structure whose members were
-       too small to accomodate modern settings. */
-#define CYGWIN_VERSION_DLL_OLD_TERMIOS		5
-#define CYGWIN_VERSION_DLL_IS_OLD_TERMIOS \
-  (CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) <= \
-  CYGWIN_VERSION_DLL_OLD_TERMIOS)
-
-#define CYGWIN_VERSION_DLL_MALLOC_ENV		28
-     /* Old APIs had getc/putc macros that conflict with new CR/LF
-	handling in the stdio buffers */
-#define CYGWIN_VERSION_OLD_STDIO_CRLF_HANDLING \
-  (CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) <= \
-  20)
-
-#define CYGWIN_VERSION_CHECK_FOR_S_IEXEC \
-  (CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) >= \
-  36)
-
-#define CYGWIN_VERSION_CHECK_FOR_OLD_O_NONBLOCK \
-  (CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) <= \
-  28)
-
-#define CYGWIN_VERSION_CHECK_FOR_USING_BIG_TYPES \
-  (CYGWIN_VERSION_DLL_MAKE_COMBINED (user_data->api_major, user_data->api_minor) >= \
-  79)
-     /* We used to use the DLL major/minor to track
-	non-backward-compatible interface changes to the API.  Now we
-	use an API major/minor number for this purpose. */
-
-     /* API_MAJOR 0.0: Initial version.  API_MINOR changes:
-	1: Export cygwin32_ calls as cygwin_ as well.
-	2: Export j1, jn, y1, yn.
-	3: Export dll_noncygwin_dllcrt0.
-	4: New socket ioctls, revamped ifconf support.
-	5: Thread support/exports.
-	6: Change in termios handling.
-	7: Export scandir and alphasort.
-	8: Export _ctype_, _sys_errlist, _sys_nerr.
-	9: Mount-related changes, new cygwin_umount export.
-	   Raw device support (tape, floppies).
-       10: Fast math routine support added.
-       11: Export seekdir, telldir.
-       12: Export pthread_join, pthread_detach.
-       13: Export math funcs gamma and friends, also _j0, _j1, etc.
-       14: Export snprintf and vnsprintf.
-       15: Export glob
-       16: Export cygwin_stackdump
-       17: Export fast math stuff
-       18: Stop exporting _strace_wm
-       19: Export fchown, lchown, lacl
-       20: regsub, inet_network
-       21: incompatible change to stdio cr/lf and buffering
-       22: Export cygwin_logon_user, cygwin_set_impersonation_token.
-	   geteuid, getegid return effective uid/gid.
-	   getuid, getgid return real uid/gid.
-	   seteuid, setegid set only effective uid/gid.
-	   setuid, setgid set effective and real uid/gid.
-       23: Export new dll_crt0 interface and cygwin_user_data for use
-	   with crt0 startup code.
-       24: Export poll and _poll.
-       25: Export getmode and _getmode.
-       26: CW_GET_CYGDRIVE_PREFIXES addition to external.cc
-       27: CW_GETPINFO_FULL addition to external.cc
-       28: Accidentally bumped by cgf
-       29: Export hstrerror
-       30: CW_GET_CYGDRIVE_INFO addition to external.cc
-       31: Export inet_aton
-       32: Export getrlimit/setrlimit
-       33: Export setlogmask
-       34: Separated out mount table
-       35: Export drand48, erand48, jrand48, lcong48, lrand48,
-	   mrand48, nrand48, seed48, and srand48.
-       36: Added _cygwin_S_IEXEC, et al
-       37: [f]pathconv support _PC_POSIX_PERMISSIONS and _PC_POSIX_SECURITY
-       38: vscanf, vscanf_r, and random pthread functions
-       39: asctime_r, ctime_r, gmtime_r, localtime_r
-       40: fchdir
-       41: __signgam
-       42: sys_errlist, sys_nerr
-       43: sigsetjmp, siglongjmp fixed
-       44: Export dirfd
-       45: perprocess change, gamma_r, gammaf_r, lgamma_r, lgammaf_r
-       46: Remove cygwin_getshared
-       47: Report EOTWarningZoneSize in struct mtget.
-       48: Export "posix" regex functions
-       49: Export setutent, endutent, utmpname, getutent, getutid, getutline.
-       50: Export fnmatch.
-       51: Export recvmsg, sendmsg.
-       52: Export strptime
-       53: Export strlcat, strlcpy.
-       54: Export __fpclassifyd, __fpclassifyf, __signbitd, __signbitf.
-       55: Export fcloseall, fcloseall_r.
-       56: Make ntsec on by default.
-       57: Export setgroups.
-       58: Export memalign, valloc, malloc_trim, malloc_usable_size, mallopt,
-	   malloc_stats
-       59: getsid
-       60: MSG_NOSIGNAL
-       61: Export getc_unlocked, getchar_unlocked, putc_unlocked,
-	   putchar_unlocked
-       62: Erroneously bumped
-       63: Export pututline
-       64: Export fseeko, ftello
-       65: Export siginterrupt
-       66: Export nl_langinfo
-       67: Export pthread_getsequence_np
-       68: Export netdb stuff
-       69: Export strtof
-       70: Export asprintf, _asprintf_r, vasprintf, _vasprintf_r
-       71: Export strerror_r
-       72: Export nanosleep
-       73: Export setreuid32, setreuid, setregid32, setregid
-       74: Export _strtold a64l hcreate hcreate_r hdestroy hdestroy_r hsearch
-		  hsearch_r isblank iswalnum iswalpha iswblank iswcntrl iswctype
-		  iswdigit iswgraph iswlower iswprint iswpunct iswspace iswupper
-		  iswxdigit l64a mbrlen mbrtowc mbsinit mbsrtowcs mempcpy
-		  on_exit setbuffer setlinebuf strndup strnlen tdelete tdestroy
-		  tfind towctrans towlower towupper tsearch twalk wcrtomb wcscat
-		  wcschr wcscpy wcscspn wcslcat wcslcpy wcsncat wcsncmp wcsncpy
-		  wcspbrk wcsrchr wcsrtombs wcsspn wcsstr wctob wctob wctrans
-		  wctype wmemchr wmemcmp wmemcpy wmemmove wmemset
-       75: Export exp2 exp2f fdim fdimf fma fmaf fmax fmaxf fmin fminf lrint
-		  lrintf lround lroundf nearbyint nearbyintf remquo remquof
-		  round roundf scalbln scalblnf sincos sincosf tgamma tgammaf
-		  truncf
-       76: mallinfo
-       77: thread-safe exit/at_exit
-       78: Use stat and fstat rather than _stat, and _fstat.
-	   Export btowc and trunc.
-       79: Export acl32 aclcheck32 aclfrommode32 aclfrompbits32 aclfromtext32
-		  aclsort32 acltomode32 acltopbits32 acltotext32 facl32
-		  fgetpos64 fopen64 freopen64 fseeko64 fsetpos64 ftello64
-		  _open64 _lseek64 _fstat64 _stat64 mknod32
-       80: Export pthread_rwlock stuff
-       81: CW_CHECK_NTSEC addition to external.cc
-       82: Export wcscoll wcswidth wcwidth
-       83: Export gethostid
-       84: Pty open allocates invisible console.  64 bit interface
-       85: Export new 32/64 functions from API 0.79 only with leading
-	   underscore.  No problems with backward compatibility since no
-	   official release has been made so far.  This change removes
-	   exported symbols like fopen64, which might confuse configure.
-       86: Export ftok
-       87: Export vsyslog
-       88: Export _getreent
-       89: Export __mempcpy
-       90: Export _fopen64
-       91: Export argz_add argz_add_sep argz_append argz_count argz_create
-	   argz_create_sep argz_delete argz_extract argz_insert
-	   argz_next argz_replace argz_stringify envz_add envz_entry
-	   envz_get envz_merge envz_remove envz_strip
-       92: Export getusershell, setusershell, endusershell
-       93: Export daemon, forkpty, openpty, iruserok, ruserok, login_tty,
-	   openpty, forkpty, revoke, logwtmp, updwtmp
-       94: Export getopt, getopt_long, optarg, opterr, optind, optopt,
-	   optreset, __check_rhosts_file, __rcmd_errstr.
-       95: Export shmat, shmctl, shmdt, shmget.
-       96: CW_GET_ERRNO_FROM_WINERROR addition to external.cc
-       97: Export sem_open, sem_close, sem_timedwait, sem_getvalue.
-       98: Export _tmpfile64.
-       99: CW_GET_POSIX_SECURITY_ATTRIBUTE addition to external.cc.
-      100: CW_GET_SHMLBA addition to external.cc.
-      101: Export err, errx, verr, verrx, warn, warnx, vwarn, vwarnx.
-      102: CW_GET_UID_FROM_SID and CW_GET_GID_FROM_SID addition to external.cc.
-      103: Export getprogname, setprogname.
-      104: Export msgctl, msgget, msgrcv, msgsnd, semctl, semget, semop.
-      105: Export sigwait.
-      106: Export flock.
-      107: Export fcntl64.
-     */
-
-     /* Note that we forgot to bump the api for ualarm, strtoll, strtoull */
-
-#define CYGWIN_VERSION_API_MAJOR 0
-#define CYGWIN_VERSION_API_MINOR 107
-
-     /* There is also a compatibity version number associated with the
-	shared memory regions.  It is incremented when incompatible
-	changes are made to the shared memory region *or* to any named
-	shared mutexes, semaphores, etc.   The arbitrary starting
-	version was 0 (cygwin release 98r2). */
-
-#define CYGWIN_VERSION_SHARED_DATA 3
-
-     /* An identifier used in the names used to create shared objects.
-	The full names include the CYGWIN_VERSION_SHARED_DATA version
-	as well as this identifier. */
-
-#define CYGWIN_VERSION_DLL_IDENTIFIER	"cygwin1"
-
-     /* The Cygwin mount table interface in the Win32 registry also
-	has a version number associated with it in case that is
-	changed in a non-backwards compatible fashion.  Increment this
-	version number whenever incompatible changes in mount table
-	registry usage are made.
-
-	1: Original number version.
-	2: New mount registry layout, system-wide mount accessibility.
-     */
-
-#define CYGWIN_VERSION_MOUNT_REGISTRY 2
-
-     /* Identifiers used in the Win32 registry. */
-
-#define CYGWIN_INFO_CYGNUS_REGISTRY_NAME "Cygnus Solutions"
-#define CYGWIN_INFO_CYGWIN_REGISTRY_NAME "Cygwin"
-#define CYGWIN_INFO_PROGRAM_OPTIONS_NAME "Program Options"
-#define CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME "mounts v2"
-#define CYGWIN_INFO_CYGDRIVE_FLAGS "cygdrive flags"
-#define CYGWIN_INFO_CYGDRIVE_PREFIX "cygdrive prefix"
-#define CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX "/cygdrive"
-
-     /* In addition to the above version number strings, the build
-	process adds some strings that may be useful in
-	debugging/identifying a particular Cygwin DLL:
-
-	The mkvers.sh script at the top level produces a .cc file
-	which initializes a cygwin_version structure based on the
-	above version information and creates a string table for
-	grepping via "fgrep '%%%' cygwinwhatever.dll" if you are
-	using GNU grep.  Otherwise you may want to do a
-	"strings cygwinwhatever.dll | fgrep '%%%'" instead.
-
-	This will produce output such as:
-
-	%%% Cygwin dll_identifier: cygwin
-	%%% Cygwin api_major: 0
-	%%% Cygwin api_minor: 0
-	%%% Cygwin dll_major: 19
-	%%% Cygwin dll_minor: 6
-	%%% Cygwin shared_data: 1
-	%%% Cygwin registry: b15
-	%%% Cygwin build date: Wed Oct 14 16:26:51 EDT 1998
-	%%% Cygwin shared id: cygwinS1
-
-	This information can also be obtained through a call to
-	cygwin_internal (CW_GETVERSIONINFO).
-     */
-
-#define CYGWIN_VERSION_MAGIC(a, b) ((unsigned) ((((unsigned short) a) << 16) | (unsigned short) b))
-#define CYGWIN_VERSION_MAGIC_VERSION(a) ((unsigned) ((unsigned)a & 0xffff))
diff --git a/winsup/cygwin/include/dlfcn.h b/winsup/cygwin/include/dlfcn.h
deleted file mode 100644
index 5eaa7061e..000000000
--- a/winsup/cygwin/include/dlfcn.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* dlfcn.h
-
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _DLFCN_H
-#define _DLFCN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* declarations used for dynamic linking support routines */
-extern void *dlopen (const char *, int);
-extern void *dlsym (void *, const char *);
-extern int dlclose (void *);
-extern char *dlerror (void);
-
-/* specific to CYGWIN */
-#define FORK_RELOAD	1
-#define FORK_NO_RELOAD	0
-
-extern void dlfork (int);
-
-/* following doesn't exist in Win32 API .... */
-
-/* valid values for mode argument to dlopen */
-#define RTLD_LAZY	1	/* lazy function call binding */
-#define RTLD_NOW	2	/* immediate function call binding */
-#define RTLD_GLOBAL	4	/* symbols in this dlopen'ed obj are visible to other dlopen'ed objs */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _DLFCN_H */
diff --git a/winsup/cygwin/include/err.h b/winsup/cygwin/include/err.h
deleted file mode 100644
index d1002c527..000000000
--- a/winsup/cygwin/include/err.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* err.h
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _ERR_H
-#define _ERR_H
-
-#include <sys/cdefs.h>
-#include <stdarg.h>
-
-__BEGIN_DECLS
-
-extern void warn (const char *fmt, ...);
-extern void warnx (const char *fmt, ...);
-
-extern void err (int eval, const char *fmt, ...);
-extern void errx (int eval, const char *fmt, ...);
-
-extern void vwarn (const char *fmt, va_list ap);
-extern void vwarnx (const char *fmt, va_list ap);
-
-extern void verr (int eval, const char *fmt, va_list ap);
-extern void verrx (int eval, const char *fmt, va_list ap);
-
-__END_DECLS
-
-#endif /* _ERR_H */
diff --git a/winsup/cygwin/include/exceptions.h b/winsup/cygwin/include/exceptions.h
deleted file mode 100644
index 462000d61..000000000
--- a/winsup/cygwin/include/exceptions.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* exceptions.h
-
-   Copyright 1996, 1997, 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _EXCEPTIONS_H
-#define _EXCEPTIONS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Documentation on the innards of exception handling (i.e. from the
-   perspective of a compiler implementor) apparently doesn't exist.  Sigh.
-   However, the following came from Onno Hovers <onno@stack.urc.tue.nl>
-
-The first pointer to the chain of handlers is in the thread environment block
-at FS:[0].  This chain has the following format:
-
-typedef struct __EXCEPTION_FRAME
-{
-   struct __EXCEPTION_FRAME	*Prev;    /-* pointer to the previous frame *-/
-   PEXCEPTION_HANDLER		Handler; /-* handler function *-/
-}
-
-You register an exception handler in your compiler with this simple ASM
-sequence:
-   PUSH _MyExceptionHandler
-   PUSH FS:[0]
-   MOV  FS:[0],ESP
-An exception frame MUST be on the stack! The frame may have more fields and
-both Visual C++ and Borland C++ use more fields for themselves.
-
-When an exception occurs the system calls all handlers starting with the
-handler at FS:0, and then the previous etc. until one handler returns
-ExceptionContinueExecution, which is 0. If a handler does not want to handle
-the exception it should just return ExceptionContinueSearch, which is 1.
-
-The handler has the following parameters:
-ehandler (
-	   PEXCEPTION_RECORD erecord,
-	   PEXCEPTION_FRAME myframe,
-	   PCONTEXT context,		/-* context before and after *-/
-	   PVOID dispatch)		/-* something *-/
-
-When a handler wants to handle the exception, it has some alternatives:
-
--one is to do do something about the exception condition, like emulating
-an invalid instruction, mapping memory where there was a page fault, etc.
-If the handler wants to have the context of the thread that causes the
-exception changed, it should make that change in the context passed to the
-handler.
-
--the second alternative is to call all exception handlers again, indicating
-that you want them to clean up. This way all the __finally blocks get
-executed. After doing that you change the context passed to the handler so
-the code starts executing in the except block. For this purpose you could
-call RtlUnwind. This (undocumented) function calls all exception handlers
-up to but not including the exception frame passed to it. If NULL is passed
-as exception frame RtlUnwind calls all exception handlers and then exits the
-process. The parameters to RtlUnwind are:
-
-RtlUnwind (
-   PEXCEPTION_FRAME	endframe,
-   PVOID		unusedEip,
-   PEXCEPTION_RECORD	erecord,
-   DWORD		returnEax)
-
-You should set unusedEip to the address where RtlUnwind should return like
-this:
-	  PUSH 0
-	  PUSH OFFSET ReturnUnwind
-	  PUSH 0
-	  PUSH 0
-	  CALL RtlUnwind
-ReturnUnwind:
-	  .....
-
-If no EXCEPTION_RECORD is passed, RtlUnwind makes a default exception
-record. In any case, the ExceptionFlags part of this record has the
-EH_UNWINDING (=2),  flag set. (and EH_EXIT_UNWIND (=4), when NULL is passed as the end
-frame.).
-
-The handler for a exception as well as a for unwinds may be executed in the
-thread causing the exception, but may also be executed in another (special
-exception) thread. So it is not wise to make any assumptions about that!
-
-As an alternative you may consider the SetUnhandledExceptionFilter API
-to install your own exception filter. This one is documented.
-*/
-
-/* The January 1994 MSJ has an article entitled "Clearer, More Comprehensive
-   Error Processing with Win32 Structured Exception Handling".  It goes into
-   a teensy bit of detail of the innards of exception handling (i.e. what we
-   have to do).  */
-
-typedef int (exception_handler)
-     (EXCEPTION_RECORD *, void *, CONTEXT *, void *);
-
-typedef struct _exception_list
-{
-  struct _exception_list *prev;
-  exception_handler *handler;
-
-  /* We're apparently free to add more stuff here.
-     At present we don't need any.  */
-} exception_list;
-
-void init_exceptions (exception_list *);
-
-#ifdef __cplusplus
-};
-#endif /* __cplusplus */
-
-#endif /* _EXCEPTIONS_H */
diff --git a/winsup/cygwin/include/fcntl.h b/winsup/cygwin/include/fcntl.h
deleted file mode 100644
index 774966e9a..000000000
--- a/winsup/cygwin/include/fcntl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* fcntl.h
-
-   Copyright 1996, 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _FCNTL_H
-#define _FCNTL_H
-
-#include <sys/fcntl.h>
-#define O_NDELAY	_FNDELAY
-
-#endif /* _FCNTL_H */
diff --git a/winsup/cygwin/include/features.h b/winsup/cygwin/include/features.h
deleted file mode 100644
index 1161909f0..000000000
--- a/winsup/cygwin/include/features.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* features.h
-
-   Copyright 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _FEATURES_H
-#define _FEATURES_H
-
-#include <sys/features.h>
-
-#endif /* _FEATURES_H */
diff --git a/winsup/cygwin/include/fnmatch.h b/winsup/cygwin/include/fnmatch.h
deleted file mode 100644
index e4500abe2..000000000
--- a/winsup/cygwin/include/fnmatch.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*      $OpenBSD: fnmatch.h,v 1.5 2000/03/24 17:13:23 millert Exp $        */
-/*      $NetBSD: fnmatch.h,v 1.5 1994/10/26 00:55:53 cgd Exp $        */
-
-/*-
- * Copyright (c) 1992, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)fnmatch.h        8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _FNMATCH_H_
-#define _FNMATCH_H_
-
-#define FNM_NOMATCH        1        /* Match failed. */
-#define FNM_NOSYS        2        /* Function not supported (unused). */
-
-#define FNM_NOESCAPE        0x01        /* Disable backslash escaping. */
-#define FNM_PATHNAME        0x02        /* Slash must be matched by slash. */
-#define FNM_PERIOD        0x04        /* Period must be matched by period. */
-#ifndef _POSIX_SOURCE
-#define FNM_LEADING_DIR        0x08        /* Ignore /<tail> after Imatch. */
-#define FNM_CASEFOLD        0x10        /* Case insensitive search. */
-#define FNM_IGNORECASE        FNM_CASEFOLD
-#define FNM_FILE_NAME        FNM_PATHNAME
-#endif
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int      fnmatch __P((const char *, const char *, int));
-__END_DECLS
-
-#endif /* !_FNMATCH_H_ */
-
-
diff --git a/winsup/cygwin/include/getopt.h b/winsup/cygwin/include/getopt.h
deleted file mode 100644
index ba095ba2f..000000000
--- a/winsup/cygwin/include/getopt.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1987, 1993, 1994, 1996
- *  The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *  This product includes software developed by the University of
- *  California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __GETOPT_H__
-#define __GETOPT_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __INSIDE_CYGWIN__
-extern int __declspec(dllimport) opterr;	/* if error message should be printed */
-extern int __declspec(dllimport) optind;	/* index into parent argv vector */
-extern int __declspec(dllimport) optopt;	/* character checked for validity */
-extern int __declspec(dllimport) optreset;	/* reset getopt */
-extern char __declspec(dllimport) *optarg;	/* argument associated with option */
-#endif
-
-int getopt (int, char * const *, const char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GETOPT_H__ */
-
-#ifndef __UNISTD_GETOPT__
-#ifndef __GETOPT_LONG_H__
-#define __GETOPT_LONG_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct option {
-	const char *name;
-	int  has_arg;
-	int *flag;
-	int val;
-};
-
-int getopt_long (int, char *const *, const char *, const struct option *, int *);
-#ifndef HAVE_DECL_GETOPT
-#define HAVE_DECL_GETOPT 1
-#endif
-
-#define no_argument             0
-#define required_argument       1
-#define optional_argument       2
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GETOPT_LONG_H__ */
-#endif /* __UNISTD_GETOPT__ */
diff --git a/winsup/cygwin/include/glob.h b/winsup/cygwin/include/glob.h
deleted file mode 100644
index 6a393f004..000000000
--- a/winsup/cygwin/include/glob.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*	$NetBSD: glob.h,v 1.6.2.2 1997/11/04 23:38:33 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)glob.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _GLOB_H_
-#define	_GLOB_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-typedef struct {
-	int gl_pathc;		/* Count of total paths so far. */
-	int gl_matchc;		/* Count of paths matching pattern. */
-	int gl_offs;		/* Reserved at beginning of gl_pathv. */
-	int gl_flags;		/* Copy of flags parameter to glob. */
-	char **gl_pathv;	/* List of paths matching pattern. */
-				/* Copy of errfunc parameter to glob. */
-	int (*gl_errfunc) __P((const char *, int));
-
-	/*
-	 * Alternate filesystem access methods for glob; replacement
-	 * versions of closedir(3), readdir(3), opendir(3), stat(2)
-	 * and lstat(2).
-	 */
-	void (*gl_closedir) __P((void *));
-	struct dirent *(*gl_readdir) __P((void *));
-	void *(*gl_opendir) __P((const char *));
-#ifdef __LIBC12_SOURCE__
-	int (*gl_lstat) __P((const char *, struct stat12 *));
-	int (*gl_stat) __P((const char *, struct stat12 *));
-#else
-#if defined (__INSIDE_CYGWIN__)
-	int (*gl_lstat) ();
-	int (*gl_stat) ();
-#else
-	int (*gl_lstat) __P((const char *, struct stat *));
-	int (*gl_stat) __P((const char *, struct stat *));
-#endif
-#endif
-} glob_t;
-
-#define	GLOB_APPEND	0x0001	/* Append to output from previous call. */
-#define	GLOB_DOOFFS	0x0002	/* Use gl_offs. */
-#define	GLOB_ERR	0x0004	/* Return on error. */
-#define	GLOB_MARK	0x0008	/* Append / to matching directories. */
-#define	GLOB_NOCHECK	0x0010	/* Return pattern itself if nothing matches. */
-#define	GLOB_NOSORT	0x0020	/* Don't sort. */
-
-#ifndef _POSIX_SOURCE
-#define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
-#define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
-#define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
-#define	GLOB_NOMAGIC	0x0200	/* GLOB_NOCHECK without magic chars (csh). */
-#define	GLOB_QUOTE	0x0400	/* Quote special chars with \. */
-#define	GLOB_TILDE	0x0800	/* Expand tilde names from the passwd file. */
-#endif
-
-#define	GLOB_NOSPACE	(-1)	/* Malloc call failed. */
-#define	GLOB_ABEND	(-2)	/* Unignored error. */
-
-__BEGIN_DECLS
-
-#undef DLLEXPORT
-#ifdef __INSIDE_CYGWIN__
-# define DLLEXPORT
-#else
-# define DLLEXPORT __declspec(dllimport)
-#endif
-int	DLLEXPORT glob(const char *, int, int (*)(const char *, int), glob_t *);
-void    DLLEXPORT globfree(glob_t *);
-
-#undef DLLEXPORT
-__END_DECLS
-
-#endif /* !_GLOB_H_ */
diff --git a/winsup/cygwin/include/icmp.h b/winsup/cygwin/include/icmp.h
deleted file mode 100644
index 7e7aedccd..000000000
--- a/winsup/cygwin/include/icmp.h
+++ /dev/null
@@ -1 +0,0 @@
-/* icmp.h */
diff --git a/winsup/cygwin/include/inttypes.h b/winsup/cygwin/include/inttypes.h
deleted file mode 100644
index 1d0410ad8..000000000
--- a/winsup/cygwin/include/inttypes.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/* inttypes.h - fixed size integer types
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _INTTYPES_H
-#define _INTTYPES_H
-
-#include <stdint.h>
-
-/* fprintf() macros for signed integers */
-
-#define PRId8 "d"
-#define PRId16 "d"
-#define PRId32 "ld"
-#define PRId64 "lld"
-
-#define PRIdLEAST8 "d"
-#define PRIdLEAST16 "d"
-#define PRIdLEAST32 "ld"
-#define PRIdLEAST64 "lld"
-
-#define PRIdFAST8 "d"
-#define PRIdFAST16 "ld"
-#define PRIdFAST32 "ld"
-#define PRIdFAST64 "lld"
-
-#define PRIdMAX "lld"
-#define PRIdPTR "ld"
-
-#define PRIi8 "i"
-#define PRIi16 "i"
-#define PRIi32 "li"
-#define PRIi64 "lli"
-
-#define PRIiLEAST8 "i"
-#define PRIiLEAST16 "i"
-#define PRIiLEAST32 "li"
-#define PRIiLEAST64 "lli"
-
-#define PRIiFAST8 "i"
-#define PRIiFAST16 "li"
-#define PRIiFAST32 "li"
-#define PRIiFAST64 "lli"
-
-#define PRIiMAX "lli"
-#define PRIiPTR "li"
-
-/* fprintf() macros for unsigned integers */
-
-#define PRIo8 "o"
-#define PRIo16 "o"
-#define PRIo32 "lo"
-#define PRIo64 "llo"
-
-#define PRIoLEAST8 "o"
-#define PRIoLEAST16 "o"
-#define PRIoLEAST32 "lo"
-#define PRIoLEAST64 "llo"
-
-#define PRIoFAST8 "o"
-#define PRIoFAST16 "lo"
-#define PRIoFAST32 "lo"
-#define PRIoFAST64 "llo"
-
-#define PRIoMAX "llo"
-#define PRIoPTR "lo"
-
-#define PRIu8 "u"
-#define PRIu16 "u"
-#define PRIu32 "lu"
-#define PRIu64 "llu"
-
-#define PRIuLEAST8 "u"
-#define PRIuLEAST16 "u"
-#define PRIuLEAST32 "lu"
-#define PRIuLEAST64 "llu"
-
-#define PRIuFAST8 "u"
-#define PRIuFAST16 "lu"
-#define PRIuFAST32 "lu"
-#define PRIuFAST64 "llu"
-
-#define PRIuMAX "llu"
-#define PRIuPTR "lu"
-
-#define PRIx8 "x"
-#define PRIx16 "x"
-#define PRIx32 "lx"
-#define PRIx64 "llx"
-
-#define PRIxLEAST8 "x"
-#define PRIxLEAST16 "x"
-#define PRIxLEAST32 "lx"
-#define PRIxLEAST64 "llx"
-
-#define PRIxFAST8 "x"
-#define PRIxFAST16 "lx"
-#define PRIxFAST32 "lx"
-#define PRIxFAST64 "llx"
-
-#define PRIxMAX "llx"
-#define PRIxPTR "lx"
-
-#define PRIX8 "X"
-#define PRIX16 "X"
-#define PRIX32 "lX"
-#define PRIX64 "llX"
-
-#define PRIXLEAST8 "X"
-#define PRIXLEAST16 "X"
-#define PRIXLEAST32 "lX"
-#define PRIXLEAST64 "llX"
-
-#define PRIXFAST8 "X"
-#define PRIXFAST16 "lX"
-#define PRIXFAST32 "lX"
-#define PRIXFAST64 "llX"
-
-#define PRIXMAX "llX"
-#define PRIXPTR "lX"
-
-/* fscanf() macros for signed integers */
-
-#define SCNd8 "hhd"
-#define SCNd16 "hd"
-#define SCNd32 "ld"
-#define SCNd64 "lld"
-
-#define SCNdLEAST8 "hhd"
-#define SCNdLEAST16 "hd"
-#define SCNdLEAST32 "ld"
-#define SCNdLEAST64 "lld"
-
-#define SCNdFAST8 "hhd"
-#define SCNdFAST16 "ld"
-#define SCNdFAST32 "ld"
-#define SCNdFAST64 "lld"
-
-#define SCNdMAX "lld"
-#define SCNdPTR "ld"
-
-#define SCNi8 "hhi"
-#define SCNi16 "hi"
-#define SCNi32 "li"
-#define SCNi64 "lli"
-
-#define SCNiLEAST8 "hhi"
-#define SCNiLEAST16 "hi"
-#define SCNiLEAST32 "li"
-#define SCNiLEAST64 "lli"
-
-#define SCNiFAST8 "hhi"
-#define SCNiFAST16 "li"
-#define SCNiFAST32 "li"
-#define SCNiFAST64 "lli"
-
-#define SCNiMAX "lli"
-#define SCNiPTR "li"
-
-/* fscanf() macros for unsigned integers */
-
-#define SCNo8 "hho"
-#define SCNo16 "ho"
-#define SCNo32 "lo"
-#define SCNo64 "llo"
-
-#define SCNoLEAST8 "hho"
-#define SCNoLEAST16 "ho"
-#define SCNoLEAST32 "lo"
-#define SCNoLEAST64 "llo"
-
-#define SCNoFAST8 "hho"
-#define SCNoFAST16 "lo"
-#define SCNoFAST32 "lo"
-#define SCNoFAST64 "llo"
-
-#define SCNoMAX "llo"
-#define SCNoPTR "lo"
-
-#define SCNu8 "hhu"
-#define SCNu16 "hu"
-#define SCNu32 "lu"
-#define SCNu64 "llu"
-
-#define SCNuLEAST8 "hhu"
-#define SCNuLEAST16 "hu"
-#define SCNuLEAST32 "lu"
-#define SCNuLEAST64 "llu"
-
-#define SCNuFAST8 "hhu"
-#define SCNuFAST16 "lu"
-#define SCNuFAST32 "lu"
-#define SCNuFAST64 "llu"
-
-#define SCNuMAX "llu"
-#define SCNuPTR "lu"
-
-#define SCNx8 "hhx"
-#define SCNx16 "hx"
-#define SCNx32 "lx"
-#define SCNx64 "llx"
-
-#define SCNxLEAST8 "hhx"
-#define SCNxLEAST16 "hx"
-#define SCNxLEAST32 "lx"
-#define SCNxLEAST64 "llx"
-
-#define SCNxFAST8 "hhx"
-#define SCNxFAST16 "lx"
-#define SCNxFAST32 "lx"
-#define SCNxFAST64 "llx"
-
-#define SCNxMAX "llx"
-#define SCNxPTR "lx"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <_ansi.h>
-
-typedef struct {
-  intmax_t quot;
-  intmax_t rem;
-} imaxdiv_t;
-
-#if 0 /* Not yet defined */
-intmax_t _EXFUN(imaxabs, (intmax_t));
-imaxdiv_t _EXFUN(imaxdiv, (intmax_t, intmax_t));
-intmax_t _EXFUN(strtoimax, (const char *, char **, int));
-uintmax_t _EXFUN(strtoumax, (const char *, char **, int));
-intmax_t _EXFUN(wcstoimax, (const wchar_t *, wchar_t **, int));
-uintmax_t _EXFUN(wcstoumax, (const wchar_t *, wchar_t **, int));
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _INTTYPES_H */
diff --git a/winsup/cygwin/include/io.h b/winsup/cygwin/include/io.h
deleted file mode 100644
index de9f39e0a..000000000
--- a/winsup/cygwin/include/io.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* io.h
-
-   Copyright 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _IO_H_
-#define _IO_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * Function to return a Win32 HANDLE from a fd.
- */
-extern long get_osfhandle(int);
-extern int setmode (int __fd, int __mode);
-int access(const char *__path, int __amode);
-
-#ifdef __cplusplus
-};
-#endif /* __cplusplus */
-
-#endif /* _IO_H_ */
diff --git a/winsup/cygwin/include/lastlog.h b/winsup/cygwin/include/lastlog.h
deleted file mode 100644
index 9db86206d..000000000
--- a/winsup/cygwin/include/lastlog.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* lastlog.h
-
-   Copyright 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _LASTLOG_H
-#define _LASTLOG_H
-
-#include <utmp.h>
-
-struct lastlog {
-	long ll_time;
-	char ll_line[UT_LINESIZE];
-	char ll_host[UT_HOSTSIZE];
-};
-
-#endif
diff --git a/winsup/cygwin/include/limits.h b/winsup/cygwin/include/limits.h
deleted file mode 100644
index 9fa3cf4fe..000000000
--- a/winsup/cygwin/include/limits.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* limits.h
-
-   Copyright 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _LIMITS_H___
-#ifndef _MACH_MACHLIMITS_H_
-
-/* _MACH_MACHLIMITS_H_ is used on OSF/1.  */
-#define _LIMITS_H___
-#define _MACH_MACHLIMITS_H_
-
-/* Number of bits in a `char'.  */
-#undef CHAR_BIT
-#define CHAR_BIT 8
-
-/* Maximum length of a multibyte character.  */
-#ifndef MB_LEN_MAX
-#define MB_LEN_MAX 1
-#endif
-
-/* Minimum and maximum values a `signed char' can hold.  */
-#undef SCHAR_MIN
-#define SCHAR_MIN (-128)
-#undef SCHAR_MAX
-#define SCHAR_MAX 127
-
-/* Maximum value an `unsigned char' can hold.  (Minimum is 0).  */
-#undef UCHAR_MAX
-#define UCHAR_MAX 255
-
-/* Minimum and maximum values a `char' can hold.  */
-#ifdef __CHAR_UNSIGNED__
-#undef CHAR_MIN
-#define CHAR_MIN 0
-#undef CHAR_MAX
-#define CHAR_MAX 255
-#else
-#undef CHAR_MIN
-#define CHAR_MIN (-128)
-#undef CHAR_MAX
-#define CHAR_MAX 127
-#endif
-
-/* Minimum and maximum values a `signed short int' can hold.  */
-#undef SHRT_MIN
-#define SHRT_MIN (-32768)
-#undef SHRT_MAX
-#define SHRT_MAX 32767
-
-/* Maximum value an `unsigned short int' can hold.  (Minimum is 0).  */
-#undef USHRT_MAX
-#define USHRT_MAX 65535
-
-/* Minimum and maximum values a `signed int' can hold.  */
-#ifndef __INT_MAX__
-#define __INT_MAX__ 2147483647
-#endif
-#undef INT_MIN
-#define INT_MIN (-INT_MAX-1)
-#undef INT_MAX
-#define INT_MAX __INT_MAX__
-
-/* Maximum value an `unsigned int' can hold.  (Minimum is 0).  */
-#undef UINT_MAX
-#define UINT_MAX (INT_MAX * 2U + 1)
-
-/* Minimum and maximum values a `signed long int' can hold.
-   (Same as `int').  */
-#ifndef __LONG_MAX__
-#ifndef __alpha__
-#define __LONG_MAX__ 2147483647L
-#else
-#define __LONG_MAX__ 9223372036854775807L
-# endif /* __alpha__ */
-#endif
-#undef LONG_MIN
-#define LONG_MIN (-LONG_MAX-1)
-#undef LONG_MAX
-#define LONG_MAX __LONG_MAX__
-
-/* Maximum value an `unsigned long int' can hold.  (Minimum is 0).  */
-#undef ULONG_MAX
-#define ULONG_MAX (LONG_MAX * 2UL + 1)
-
-/* Minimum and maximum values a `signed long long int' can hold.  */
-#ifndef __LONG_LONG_MAX__
-#define __LONG_LONG_MAX__ 9223372036854775807LL
-#endif
-
-#if defined (__GNU_LIBRARY__) ? defined (__USE_GNU) : !defined (__STRICT_ANSI__)
-#undef LONG_LONG_MIN
-#define LONG_LONG_MIN (-LONG_LONG_MAX-1)
-#undef LONG_LONG_MAX
-#define LONG_LONG_MAX __LONG_LONG_MAX__
-
-/* Maximum value an `unsigned long long int' can hold.  (Minimum is 0).  */
-#undef ULONG_LONG_MAX
-#define ULONG_LONG_MAX (LONG_LONG_MAX * 2ULL + 1)
-#endif
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-/* Minimum and maximum values a `signed long long int' can hold.  */
-#undef LLONG_MIN
-#define LLONG_MIN (-LLONG_MAX-1)
-#undef LLONG_MAX
-#define LLONG_MAX __LONG_LONG_MAX__
-
-/* Maximum value an `unsigned long long int' can hold.  (Minimum is 0).  */
-#undef ULLONG_MAX
-#define ULLONG_MAX (LLONG_MAX * 2ULL + 1)
-#endif
-
-/* Maximum number of iovcnt in a writev (an arbitrary number) */
-#undef IOV_MAX
-#define IOV_MAX 1024
-
-/* Maximum size of ssize_t */
-#undef SSIZE_MAX
-#define SSIZE_MAX (__LONG_MAX__)
-
-/* Maximum length of a path */
-#define PATH_MAX (260 - 1 /*NUL*/)
-
-/* Max num groups for a user, value taken from NT documentation */
-/* Must match <sys/param.h> NGROUPS */
-#define NGROUPS_MAX 16
-
-/* WaitForMultipleObjects can't handle waiting for more than 64 objects.
-   This limits how many children we can fork/spawn off. */
-#define CHILD_MAX 63
-
-/* # of open files per process. Actually it can be more since Cygwin
-   grows the dtable as necessary. We define a reasonable limit here
-   which is returned by getdtablesize(), sysconf(_SC_OPEN_MAX) and
-   getrlimit(RLIMIT_NOFILE). */
-#undef OPEN_MAX
-#define OPEN_MAX 256
-
-/* # of bytes in a pipe buf. This is the max # of bytes which can be
-   written to a pipe in one atomic operation. */
-#undef PIPE_BUF
-#define PIPE_BUF 4096
-
-/* POSIX values */
-/* These should never vary from one system type to another */
-/* They represent the minimum values that POSIX systems must support.
-   POSIX-conforming apps must not require larger values. */
-#define	_POSIX_ARG_MAX		4096
-#define _POSIX_CHILD_MAX	6
-#define _POSIX_LINK_MAX		8
-#define _POSIX_MAX_CANON	255
-#define _POSIX_MAX_INPUT	255
-#define _POSIX_NAME_MAX		14
-#define _POSIX_NGROUPS_MAX	0
-#define _POSIX_OPEN_MAX		16
-#define _POSIX_PATH_MAX		255
-#define _POSIX_PIPE_BUF		512
-#define _POSIX_SSIZE_MAX	32767
-#define _POSIX_STREAM_MAX	8
-#define _POSIX_TZNAME_MAX       3
-
-#endif /* _MACH_MACHLIMITS_H_ */
-#endif /* _LIMITS_H___ */
diff --git a/winsup/cygwin/include/mapi.h b/winsup/cygwin/include/mapi.h
deleted file mode 100644
index e2d47e264..000000000
--- a/winsup/cygwin/include/mapi.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* mapi.h
-
-   Copyright 1997, 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _MAPI_H
-#define _MAPI_H
-
-/* Currently this doesn't include all the definitions.  It does cover
-   the parts of Simple MAPI required to send mail.  */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-  /* FIXME: should this be elsewhere?  */
-typedef unsigned long FLAGS;
-
-  /* FIXME: should this be elsewhere?  */
-#define SUCCESS_SUCCESS 0
-
-  /* FIXME: should this be elsewhere?  */
-typedef unsigned long LHANDLE, FAR *LPLHANDLE;
-
-
-#define MAPI_E_AMBIGUOUS_RECIPIENT 0x15
-#define MAPI_E_ATTACHMENT_NOT_FOUND 0xb
-#define MAPI_E_ATTACHMENT_OPEN_FAILURE 0xc
-#define MAPI_E_BAD_RECIPTYPE 0xf
-#define MAPI_E_FAILURE 0x2
-#define MAPI_E_INSUFFICIENT_MEMORY 0x5
-#define MAPI_E_INVALID_RECIPS 0x19
-#define MAPI_E_LOGIN_FAILURE 0x3
-#define MAPI_E_TEXT_TOO_LARGE 0x12
-#define MAPI_E_TOO_MANY_FILES 0x9
-#define MAPI_E_TOO_MANY_RECIPIENTS 0xa
-#define MAPI_E_UNKNOWN_RECIPIENT 0xe
-#define MAPI_E_USER_ABORT 0x1
-#define MAPI_E_TEXT_TOO_LARGE 0x12
-#define MAPI_DIALOG 0x8
-#define MAPI_NEW_SESSION 0x2
-#define MAPI_LOGON_UI 0x1
-#define MAPI_RECEIPT_REQUESTED 0x2
-#define MAPI_SENT 0x4
-#define MAPI_UNREAD 0x1
-#define MAPI_OLE 0x1
-#define MAPI_OLE_STATIC 0x2
-
-#define MAPI_ORIG 0
-#define MAPI_TO   1
-#define MAPI_CC   2
-#define MAPI_BCC  3
-
-typedef struct
-{
-  ULONG ulReserved;
-  ULONG flFlags;
-  ULONG nPosition;
-  LPTSTR lpszPathName;
-  LPTSTR lpszFileName;
-  LPVOID lpFileType;
-} MapiFileDesc, FAR *lpMapiFileDesc;
-
-typedef struct
-{
-  ULONG ulReserved;
-  ULONG ulRecipClass;
-  LPTSTR lpszName;
-  LPTSTR lpszAddress;
-  ULONG ulEIDSize;
-  LPVOID lpEntryID;
-} MapiRecipDesc, FAR *lpMapiRecipDesc;
-
-typedef struct
-{
-  ULONG ulReserved;
-  LPTSTR lpszSubject;
-  LPTSTR lpszNoteText;
-  LPTSTR lpszMessageType;
-  LPTSTR lpszDateReceived;
-  LPTSTR lpszConversationID;
-  FLAGS flFlags;
-  lpMapiRecipDesc lpOriginator;
-  ULONG nRecipCount;
-  lpMapiRecipDesc lpRecips;
-  ULONG nFileCount;
-  lpMapiFileDesc lpFiles;
-} MapiMessage, FAR *lpMapiMessage;
-
-ULONG FAR PASCAL MAPISendMail (LHANDLE, ULONG, lpMapiMessage, FLAGS, ULONG);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MAPI_H */
diff --git a/winsup/cygwin/include/memory.h b/winsup/cygwin/include/memory.h
deleted file mode 100644
index 2e16766b9..000000000
--- a/winsup/cygwin/include/memory.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* memory.h
-
-   Copyright 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _MEMORY_H
-#define _MEMORY_H
-
-/* This allows more things to compile. */
-#include <string.h>
-
-#endif /* _MEMORY_H */
diff --git a/winsup/cygwin/include/mntent.h b/winsup/cygwin/include/mntent.h
deleted file mode 100644
index fde1680a0..000000000
--- a/winsup/cygwin/include/mntent.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* mntent.h
-
-   Copyright 1996, 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _MNTENT_H
-#define _MNTENT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct mntent
-{
-  char *mnt_fsname;
-  char *mnt_dir;
-  char *mnt_type;
-  char *mnt_opts;
-  int mnt_freq;
-  int mnt_passno;
-};
-
-#ifndef _NOMNTENT_FUNCS
-FILE *setmntent (const char *__filep, const char *__type);
-struct mntent *getmntent (FILE *__filep);
-int addmntent (FILE *__filep, const struct mntent *__mnt);
-int endmntent (FILE *__filep);
-char *hasmntopt (const struct mntent *__mnt, const char *__opt);
-#endif
-
-/* This next file doesn't exist, it is in the registry,
-   however applications need the define to pass to
-   the above calls.
-*/
-#ifndef MOUNTED
-#define MOUNTED "/etc/mtab"
-#endif
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _MNTENT_H */
diff --git a/winsup/cygwin/include/net/if.h b/winsup/cygwin/include/net/if.h
deleted file mode 100644
index aff3b88e9..000000000
--- a/winsup/cygwin/include/net/if.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* net/if.h
-
-   Copyright 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _NET_IF_H
-#define _NET_IF_H
-
-#include <cygwin/if.h>
-
-#endif /* _NET_IF_H */
diff --git a/winsup/cygwin/include/netdb.h b/winsup/cygwin/include/netdb.h
deleted file mode 100644
index f49a94379..000000000
--- a/winsup/cygwin/include/netdb.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Original linux netdb.h merged with winsock.h types */
-
-/*-
- * Copyright (c) 1980, 1983, 1988, 1993
- *     The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)netdb.h	8.1 (Berkeley) 6/2/93
- *      netdb.h,v 1.1.1.1 1995/02/18 05:34:07 hjl Exp
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#ifndef _NETDB_H_
-#define _NETDB_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Structures returned by network data base library.  All addresses are
- * supplied in host order, and returned in network order (suitable for
- * use in system calls).
- */
-
-  /* Different from the linux versions - note the shorts.. */
-struct	hostent {
-	const char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	short	h_addrtype;	/* host address type */
-	short	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-#define	h_addr	h_addr_list[0]	/* address, for backward compatiblity */
-};
-
-/*
- * Assumption here is that a network number
- * fits in an unsigned long -- probably a poor one.
- */
-
-struct	netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	short		n_addrtype;	/* net address type */
-	unsigned long	n_net;		/* network # */
-};
-
-struct	servent {
-	char	*s_name;	/* official service name */
-	char	**s_aliases;	/* alias list */
-	short   s_port;		/* port # */
-	char	*s_proto;	/* protocol to use */
-};
-
-struct	protoent
-{
-  char	*p_name;	/* official protocol name */
-  char	**p_aliases;	/* alias list */
-  short	p_proto;	/* protocol # */
-};
-
-struct rpcent {
-	char	*r_name;	/* name of server for this rpc program */
-	char	**r_aliases;	/* alias list */
-	int	r_number;	/* rpc program number */
-};
-
-/*
- * Error return codes from gethostbyname() and gethostbyaddr()
- * (left in extern int h_errno).
- */
-
-#ifdef  __INSIDE_CYGWIN_NET__
-extern int h_errno;
-#else
-extern __declspec(dllimport) int h_errno;
-#endif
-
-#define	NETDB_INTERNAL -1 /* see errno */
-#define	NETDB_SUCCESS   0 /* no problem */
-#define	HOST_NOT_FOUND	1 /* Authoritative Answer Host not found */
-#define	TRY_AGAIN	2 /* Non-Authoritive Host not found, or SERVERFAIL */
-#define	NO_RECOVERY	3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
-#define	NO_DATA		4 /* Valid name, no data record of requested type */
-#define	NO_ADDRESS	NO_DATA		/* no address, look for MX record */
-
-#ifndef __INSIDE_CYGWIN_NET__
-void		endhostent (void);
-void		endnetent (void);
-void		endprotoent (void);
-void		endservent (void);
-void		endrpcent  (void);
-struct hostent	*gethostbyaddr (const char *, int, int);
-struct hostent	*gethostbyname (const char *);
-struct hostent	*gethostent (void);
-struct netent	*getnetbyaddr (long, int); /* u_long? */
-struct netent	*getnetbyname (const char *);
-struct netent	*getnetent (void);
-struct protoent	*getprotobyname (const char *);
-struct protoent	*getprotobynumber (int);
-struct protoent	*getprotoent (void);
-struct servent	*getservbyname (const char *, const char *);
-struct servent	*getservbyport (int, const char *);
-struct servent	*getservent (void);
-struct rpcent	*getrpcent (void);
-struct rpcent	*getrpcbyname (const char *);
-struct rpcent	*getrpcbynumber (int);
-const char      *hstrerror (int);
-void		herror (const char *);
-void		sethostent (int);
-void		setnetent (int);
-void		setprotoent (int);
-void		setservent (int);
-void		setrpcent (int);
-#endif
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* !_NETDB_H_ */
-
diff --git a/winsup/cygwin/include/netinet/in.h b/winsup/cygwin/include/netinet/in.h
deleted file mode 100644
index 7081282a7..000000000
--- a/winsup/cygwin/include/netinet/in.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* netinet/in.h
-
-   Copyright 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _NETINET_IN_H
-#define _NETINET_IN_H
-
-#include <cygwin/in.h>
-
-#endif /* _NETINET_IN_H */
diff --git a/winsup/cygwin/include/netinet/in_systm.h b/winsup/cygwin/include/netinet/in_systm.h
deleted file mode 100644
index 17b5feb8d..000000000
--- a/winsup/cygwin/include/netinet/in_systm.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* netinet/in_systm.h
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _NETINET_IN_SYSTM_H
-#define _NETINET_IN_SYSTM_H
-
-#include <cygwin/in_systm.h>
-
-#endif /* _NETINET_IN_SYSTM_H */
diff --git a/winsup/cygwin/include/netinet/ip.h b/winsup/cygwin/include/netinet/ip.h
deleted file mode 100644
index 87b5068d0..000000000
--- a/winsup/cygwin/include/netinet/ip.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)ip.h        8.2 (Berkeley) 6/1/94
- * $FreeBSD: src/sys/netinet/ip.h,v 1.17 1999/12/22 19:13:20 shin Exp $
- */
-
-#ifndef _NETINET_IP_H
-#define _NETINET_IP_H
-
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-
-/* Added by Wu Yongwei */
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN   1234
-#define BIG_ENDIAN      4321
-#endif
-#ifndef BYTE_ORDER
-#define BYTE_ORDER      LITTLE_ENDIAN
-#endif
-
-/*
- * Definitions for internet protocol version 4.
- * Per RFC 791, September 1981.
- */
-#define IPVERSION       4
-
-/*
- * Structure of an internet header, naked of options.
- */
-struct ip {
-#ifdef _IP_VHL
-        u_char  ip_vhl;                 /* version << 4 | header length >> 2 */
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-        u_int   ip_hl:4,                /* header length */
-                ip_v:4;                 /* version */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-        u_int   ip_v:4,                 /* version */
-                ip_hl:4;                /* header length */
-#endif
-#endif /* not _IP_VHL */
-        u_char  ip_tos;                 /* type of service */
-        u_short ip_len;                 /* total length */
-        u_short ip_id;                  /* identification */
-        u_short ip_off;                 /* fragment offset field */
-#define IP_RF 0x8000                    /* reserved fragment flag */
-#define IP_DF 0x4000                    /* dont fragment flag */
-#define IP_MF 0x2000                    /* more fragments flag */
-#define IP_OFFMASK 0x1fff               /* mask for fragmenting bits */
-        u_char  ip_ttl;                 /* time to live */
-        u_char  ip_p;                   /* protocol */
-        u_short ip_sum;                 /* checksum */
-        struct  in_addr ip_src,ip_dst;  /* source and dest address */
-};
-
-#ifdef _IP_VHL
-#define IP_MAKE_VHL(v, hl)      ((v) << 4 | (hl))
-#define IP_VHL_HL(vhl)          ((vhl) & 0x0f)
-#define IP_VHL_V(vhl)           ((vhl) >> 4)
-#define IP_VHL_BORING           0x45
-#endif
-
-#define IP_MAXPACKET    65535           /* maximum packet size */
-
-/*
- * Definitions for IP type of service (ip_tos)
- */
-#ifndef IPTOS_LOWDELAY
-#define IPTOS_LOWDELAY          0x10
-#define IPTOS_THROUGHPUT        0x08
-#define IPTOS_RELIABILITY       0x04
-#endif
-#define IPTOS_MINCOST           0x02
-/* ECN bits proposed by Sally Floyd */
-#define IPTOS_CE                0x01    /* congestion experienced */
-#define IPTOS_ECT               0x02    /* ECN-capable transport */
-
-
-/*
- * Definitions for IP precedence (also in ip_tos) (hopefully unused)
- */
-#define IPTOS_PREC_NETCONTROL           0xe0
-#define IPTOS_PREC_INTERNETCONTROL      0xc0
-#define IPTOS_PREC_CRITIC_ECP           0xa0
-#define IPTOS_PREC_FLASHOVERRIDE        0x80
-#define IPTOS_PREC_FLASH                0x60
-#define IPTOS_PREC_IMMEDIATE            0x40
-#define IPTOS_PREC_PRIORITY             0x20
-#define IPTOS_PREC_ROUTINE              0x00
-
-/*
- * Definitions for options.
- */
-#define IPOPT_COPIED(o)         ((o)&0x80)
-#define IPOPT_CLASS(o)          ((o)&0x60)
-#define IPOPT_NUMBER(o)         ((o)&0x1f)
-
-#define IPOPT_CONTROL           0x00
-#define IPOPT_RESERVED1         0x20
-#define IPOPT_DEBMEAS           0x40
-#define IPOPT_RESERVED2         0x60
-
-#define IPOPT_EOL               0               /* end of option list */
-#define IPOPT_NOP               1               /* no operation */
-
-#define IPOPT_RR                7               /* record packet route */
-#define IPOPT_TS                68              /* timestamp */
-#define IPOPT_SECURITY          130             /* provide s,c,h,tcc */
-#define IPOPT_LSRR              131             /* loose source route */
-#define IPOPT_SATID             136             /* satnet id */
-#define IPOPT_SSRR              137             /* strict source route */
-#define IPOPT_RA                148             /* router alert */
-
-/*
- * Offsets to fields in options other than EOL and NOP.
- */
-#define IPOPT_OPTVAL            0               /* option ID */
-#define IPOPT_OLEN              1               /* option length */
-#define IPOPT_OFFSET            2               /* offset within option */
-#define IPOPT_MINOFF            4               /* min value of above */
-
-/*
- * Time stamp option structure.
- */
-struct  ip_timestamp {
-        u_char  ipt_code;               /* IPOPT_TS */
-        u_char  ipt_len;                /* size of structure (variable) */
-        u_char  ipt_ptr;                /* index of current entry */
-#if BYTE_ORDER == LITTLE_ENDIAN
-        u_int   ipt_flg:4,              /* flags, see below */
-                ipt_oflw:4;             /* overflow counter */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-        u_int   ipt_oflw:4,             /* overflow counter */
-                ipt_flg:4;              /* flags, see below */
-#endif
-        union ipt_timestamp {
-                n_long  ipt_time[1];
-                struct  ipt_ta {
-                        struct in_addr ipt_addr;
-                        n_long ipt_time;
-                } ipt_ta[1];
-        } ipt_timestamp;
-};
-
-/* flag bits for ipt_flg */
-#define IPOPT_TS_TSONLY         0               /* timestamps only */
-#define IPOPT_TS_TSANDADDR      1               /* timestamps and addresses */
-#define IPOPT_TS_PRESPEC        3               /* specified modules only */
-
-/* bits for security (not byte swapped) */
-#define IPOPT_SECUR_UNCLASS     0x0000
-#define IPOPT_SECUR_CONFID      0xf135
-#define IPOPT_SECUR_EFTO        0x789a
-#define IPOPT_SECUR_MMMM        0xbc4d
-#define IPOPT_SECUR_RESTR       0xaf13
-#define IPOPT_SECUR_SECRET      0xd788
-#define IPOPT_SECUR_TOPSECRET   0x6bc5
-
-/*
- * Internet implementation parameters.
- */
-#define MAXTTL          255             /* maximum time to live (seconds) */
-#define IPDEFTTL        64              /* default ttl, from RFC 1340 */
-#define IPFRAGTTL       60              /* time to live for frags, slowhz */
-#define IPTTLDEC        1               /* subtracted when forwarding */
-
-#define IP_MSS          576             /* default maximum segment size */
-
-#endif
diff --git a/winsup/cygwin/include/netinet/ip_icmp.h b/winsup/cygwin/include/netinet/ip_icmp.h
deleted file mode 100644
index 6a1be053c..000000000
--- a/winsup/cygwin/include/netinet/ip_icmp.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* netinet/ip_icmp.h
-
-   Copyright 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _NETINET_IP_ICMP_H
-#define _NETINET_IP_ICMP_H
-
-#include <cygwin/icmp.h>
-
-#endif /* _NETINET_IP_ICMP_H */
diff --git a/winsup/cygwin/include/netinet/tcp.h b/winsup/cygwin/include/netinet/tcp.h
deleted file mode 100644
index 9fcee6c71..000000000
--- a/winsup/cygwin/include/netinet/tcp.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)tcp.h       8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/tcp.h,v 1.13 2000/01/09 19:17:25 shin Exp $
- */
-
-#ifndef _NETINET_TCP_H
-#define _NETINET_TCP_H
-
-/* Added by Wu Yongwei */
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN   1234
-#define BIG_ENDIAN      4321
-#endif
-#ifndef BYTE_ORDER
-#define BYTE_ORDER     LITTLE_ENDIAN
-#endif
-
-typedef u_int32_t tcp_seq;
-typedef u_int32_t tcp_cc;               /* connection count per rfc1644 */
-
-#define tcp6_seq        tcp_seq /* for KAME src sync over BSD*'s */
-#define tcp6hdr         tcphdr  /* for KAME src sync over BSD*'s */
-
-/*
- * TCP header.
- * Per RFC 793, September, 1981.
- */
-struct tcphdr {
-        u_short th_sport;               /* source port */
-        u_short th_dport;               /* destination port */
-        tcp_seq th_seq;                 /* sequence number */
-        tcp_seq th_ack;                 /* acknowledgement number */
-#if BYTE_ORDER == LITTLE_ENDIAN
-        u_int   th_x2:4,                /* (unused) */
-                th_off:4;               /* data offset */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-        u_int   th_off:4,               /* data offset */
-                th_x2:4;                /* (unused) */
-#endif
-        u_char  th_flags;
-#define TH_FIN  0x01
-#define TH_SYN  0x02
-#define TH_RST  0x04
-#define TH_PUSH 0x08
-#define TH_ACK  0x10
-#define TH_URG  0x20
-#define TH_FLAGS (TH_FIN|TH_SYN|TH_RST|TH_ACK|TH_URG)
-
-        u_short th_win;                 /* window */
-        u_short th_sum;                 /* checksum */
-        u_short th_urp;                 /* urgent pointer */
-};
-
-#define TCPOPT_EOL              0
-#define TCPOPT_NOP              1
-#define TCPOPT_MAXSEG           2
-#define TCPOLEN_MAXSEG          4
-#define TCPOPT_WINDOW           3
-#define TCPOLEN_WINDOW          3
-#define TCPOPT_SACK_PERMITTED   4               /* Experimental */
-#define TCPOLEN_SACK_PERMITTED  2
-#define TCPOPT_SACK             5               /* Experimental */
-#define TCPOPT_TIMESTAMP        8
-#define TCPOLEN_TIMESTAMP       10
-#define TCPOLEN_TSTAMP_APPA     (TCPOLEN_TIMESTAMP+2) /* appendix A */
-#define TCPOPT_TSTAMP_HDR               \
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
-
-#define TCPOPT_CC               11              /* CC options: RFC-1644 */
-#define TCPOPT_CCNEW            12
-#define TCPOPT_CCECHO           13
-#define TCPOLEN_CC              6
-#define TCPOLEN_CC_APPA         (TCPOLEN_CC+2)
-#define TCPOPT_CC_HDR(ccopt)            \
-    (TCPOPT_NOP<<24|TCPOPT_NOP<<16|(ccopt)<<8|TCPOLEN_CC)
-
-/*
- * Default maximum segment size for TCP.
- * With an IP MSS of 576, this is 536,
- * but 512 is probably more convenient.
- * This should be defined as MIN(512, IP_MSS - sizeof (struct tcpiphdr)).
- */
-#define TCP_MSS 512
-
-/*
- * Default maximum segment size for TCP6.
- * With an IP6 MSS of 1280, this is 1220,
- * but 1024 is probably more convenient. (xxx kazu in doubt)
- * This should be defined as MIN(1024, IP6_MSS - sizeof (struct tcpip6hdr))
- */
-#define TCP6_MSS        1024
-
-#define TCP_MAXWIN      65535   /* largest value for (unscaled) window */
-#define TTCP_CLIENT_SND_WND     4096    /* dflt send window for T/TCP client */
-
-#define TCP_MAX_WINSHIFT        14      /* maximum window shift */
-
-#define TCP_MAXHLEN     (0xf<<2)        /* max length of header in bytes */
-#define TCP_MAXOLEN     (TCP_MAXHLEN - sizeof(struct tcphdr))
-                                        /* max space left for options */
-
-/*
- * User-settable options (used with setsockopt).
- */
-#ifndef TCP_NODELAY
-#define TCP_NODELAY     0x01    /* don't delay send to coalesce packets */
-#define TCP_MAXSEG      0x02    /* set maximum segment size */
-#endif
-#define TCP_NOPUSH      0x04    /* don't push last block of write */
-#define TCP_NOOPT       0x08    /* don't use TCP options */
-
-#endif
diff --git a/winsup/cygwin/include/netinet/udp.h b/winsup/cygwin/include/netinet/udp.h
deleted file mode 100644
index 61932720b..000000000
--- a/winsup/cygwin/include/netinet/udp.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/udp.h,v 1.7 1999/08/28 00:49:34 peter Exp $
- */
-
-#ifndef _NETINET_UDP_H
-#define _NETINET_UDP_H
-
-/*
- * Udp protocol header.
- * Per RFC 768, September, 1981.
- */
-struct udphdr {
-	u_short	uh_sport;		/* source port */
-	u_short	uh_dport;		/* destination port */
-	u_short	uh_ulen;		/* udp length */
-	u_short	uh_sum;			/* udp checksum */
-};
-
-#endif
diff --git a/winsup/cygwin/include/paths.h b/winsup/cygwin/include/paths.h
deleted file mode 100644
index 11876cb29..000000000
--- a/winsup/cygwin/include/paths.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* paths.h
-
-   Copyright 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef	_PATHS_H_
-#define _PATHS_H_
-
-#define _PATH_BSHELL    "/bin/sh"
-#define _PATH_CSHELL	"/bin/csh"
-#define _PATH_DEFPATH	"/bin"
-#define _PATH_DEV	"/dev/"
-#define _PATH_DEVNULL	"/dev/null"
-#define _PATH_LASTLOG	"/var/log/lastlog"
-#define _PATH_MAN	"/usr/share/man"
-#define _PATH_MEM	"/dev/mem"
-#define _PATH_STDPATH	"/bin:/usr/sbin:/sbin"
-#define _PATH_TMP	"/tmp/"
-#define _PATH_TTY	"/dev/tty"
-#define _PATH_UTMP	"/var/run/utmp"
-#define _PATH_VARRUN	"/var/run/"
-#define _PATH_VI        "/bin/vi"
-#define _PATH_WTMP	"/var/log/wtmp"
-
-#endif /* _PATHS_H_ */
diff --git a/winsup/cygwin/include/poll.h b/winsup/cygwin/include/poll.h
deleted file mode 100644
index a836b2af4..000000000
--- a/winsup/cygwin/include/poll.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* poll.h
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <sys/poll.h>
diff --git a/winsup/cygwin/include/pthread.h b/winsup/cygwin/include/pthread.h
deleted file mode 100644
index 5f12cbbda..000000000
--- a/winsup/cygwin/include/pthread.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* pthread.h: POSIX pthread interface
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Marco Fuykschot <marco@ddi.nl>
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include <sys/types.h>
-#include <signal.h>
-#include <sched.h>
-
-#ifndef _PTHREAD_H
-#define _PTHREAD_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-/* Defines. (These are correctly defined here as per
-   http://www.opengroup.org/onlinepubs/7908799/xsh/pthread.h.html */
-
-/* FIXME: this should allocate a new cond variable, and return the value  that
- would normally be written to the passed parameter of pthread_cond_init(lvalue, NULL); */
-/* #define PTHREAD_COND_INITIALIZER 0 */
-
-#define PTHREAD_DESTRUCTOR_ITERATIONS 1
-/* Tls has 64 items for pre win2000 - and we don't want to use them all :]
- * Before committing discuss this with the list
- */
-#define PTHREAD_KEYS_MAX 32
-/* the default : joinable */
-
-#define PTHREAD_CANCEL_ASYNCHRONOUS 1
-/* defaults are enable, deferred */
-#define PTHREAD_CANCEL_ENABLE 0
-#define PTHREAD_CANCEL_DEFERRED 0
-#define PTHREAD_CANCEL_DISABLE 1
-#define PTHREAD_CANCELED ((void *)-1)
-/* this should be a value that can never be a valid address */
-#define PTHREAD_COND_INITIALIZER (pthread_cond_t)21
-#define PTHREAD_CREATE_DETACHED 1
-/* the default : joinable */
-#define PTHREAD_CREATE_JOINABLE 0
-#define PTHREAD_EXPLICIT_SCHED 1
-#define PTHREAD_INHERIT_SCHED 0
-#define PTHREAD_MUTEX_RECURSIVE 0
-#define PTHREAD_MUTEX_ERRORCHECK 1
-#define PTHREAD_MUTEX_NORMAL 2
-#define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_ERRORCHECK
-/* this should be too low to ever be a valid address */
-#define PTHREAD_MUTEX_INITIALIZER (pthread_mutex_t)20
-#define PTHREAD_ONCE_INIT { PTHREAD_MUTEX_INITIALIZER, 0 }
-#define PTHREAD_PRIO_INHERIT
-#define PTHREAD_PRIO_NONE
-#define PTHREAD_PRIO_PROTECT
-#define PTHREAD_PROCESS_SHARED 1
-#define PTHREAD_PROCESS_PRIVATE 0
-#define PTHREAD_RWLOCK_INITIALIZER (pthread_rwlock_t)22
-/* process is the default */
-#define PTHREAD_SCOPE_PROCESS 0
-#define PTHREAD_SCOPE_SYSTEM 1
-
-
-/* Attributes */
-int pthread_attr_destroy (pthread_attr_t *);
-int pthread_attr_getdetachstate (const pthread_attr_t *, int *);
-int pthread_attr_getinheritsched (const pthread_attr_t *, int *);
-int pthread_attr_getschedparam (const pthread_attr_t *, struct sched_param *);
-int pthread_attr_getschedpolicy (const pthread_attr_t *, int *);
-int pthread_attr_getscope (const pthread_attr_t *, int *);
-int pthread_attr_init (pthread_attr_t *);
-int pthread_attr_setdetachstate (pthread_attr_t *, int);
-int pthread_attr_setinheritsched (pthread_attr_t *, int);
-int pthread_attr_setschedparam (pthread_attr_t *, const struct sched_param *);
-int pthread_attr_setschedpolicy (pthread_attr_t *, int);
-int pthread_attr_setscope (pthread_attr_t *, int);
-
-#ifdef _POSIX_THREAD_ATTR_STACKADDR
-/* These functions may be implementable via some low level trickery. For now they are
- * Not supported or implemented. The prototypes are here so if someone greps the
- * source they will see these comments
- */
-int pthread_attr_getstackaddr (const pthread_attr_t *, void **);
-int pthread_attr_setstackaddr (pthread_attr_t *, void *);
-#endif
-
-#ifdef _POSIX_THREAD_ATTR_STACKSIZE
-int pthread_attr_getstacksize (const pthread_attr_t *, size_t *);
-int pthread_attr_setstacksize (pthread_attr_t *, size_t);
-#endif
-
-int pthread_cancel (pthread_t);
-/* Macros for cleanup_push and pop;
- * The function definitions are
-void pthread_cleanup_push (void (*routine)(void*), void *arg);
-void pthread_cleanup_pop (int execute);
-*/
-typedef void (*__cleanup_routine_type) (void *);
-typedef struct _pthread_cleanup_handler
-{
-  __cleanup_routine_type function;
-  void *arg;
-  struct _pthread_cleanup_handler *next;
-} __pthread_cleanup_handler;
-
-void _pthread_cleanup_push (__pthread_cleanup_handler *handler);
-void _pthread_cleanup_pop (int execute);
-
-#define pthread_cleanup_push(_fn, _arg) { __pthread_cleanup_handler __cleanup_handler = \
-                                         { _fn, _arg, NULL }; \
-                                         _pthread_cleanup_push( &__cleanup_handler );
-#define pthread_cleanup_pop(_execute) _pthread_cleanup_pop( _execute ); }
-
-/* Condition variables */
-int pthread_cond_broadcast (pthread_cond_t *);
-int pthread_cond_destroy (pthread_cond_t *);
-int pthread_cond_init (pthread_cond_t *, const pthread_condattr_t *);
-int pthread_cond_signal (pthread_cond_t *);
-int pthread_cond_timedwait (pthread_cond_t *,
-			    pthread_mutex_t *, const struct timespec *);
-int pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
-int pthread_condattr_destroy (pthread_condattr_t *);
-int pthread_condattr_getpshared (const pthread_condattr_t *, int *);
-int pthread_condattr_init (pthread_condattr_t *);
-int pthread_condattr_setpshared (pthread_condattr_t *, int);
-
-int pthread_create (pthread_t *, const pthread_attr_t *,
-		    void *(*)(void *), void *);
-int pthread_detach (pthread_t);
-int pthread_equal (pthread_t, pthread_t);
-void pthread_exit (void *);
-int pthread_getschedparam (pthread_t, int *, struct sched_param *);
-void *pthread_getspecific (pthread_key_t);
-int pthread_join (pthread_t, void **);
-int pthread_key_create (pthread_key_t *, void (*)(void *));
-int pthread_key_delete (pthread_key_t);
-
-/* Mutex's */
-int pthread_mutex_destroy (pthread_mutex_t *);
-int pthread_mutex_getprioceiling (const pthread_mutex_t *, int *);
-int pthread_mutex_init (pthread_mutex_t *, const pthread_mutexattr_t *);
-int pthread_mutex_lock (pthread_mutex_t *);
-int pthread_mutex_setprioceiling (pthread_mutex_t *, int, int *);
-int pthread_mutex_trylock (pthread_mutex_t *);
-int pthread_mutex_unlock (pthread_mutex_t *);
-int pthread_mutexattr_destroy (pthread_mutexattr_t *);
-int pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *, int *);
-int pthread_mutexattr_getprotocol (const pthread_mutexattr_t *, int *);
-int pthread_mutexattr_getpshared (const pthread_mutexattr_t *, int *);
-int pthread_mutexattr_gettype (const pthread_mutexattr_t *, int *);
-int pthread_mutexattr_init (pthread_mutexattr_t *);
-int pthread_mutexattr_setprioceiling (pthread_mutexattr_t *, int);
-int pthread_mutexattr_setprotocol (pthread_mutexattr_t *, int);
-int pthread_mutexattr_setpshared (pthread_mutexattr_t *, int);
-int pthread_mutexattr_settype (pthread_mutexattr_t *, int);
-
-/* RW Locks */
-int pthread_rwlock_destroy (pthread_rwlock_t *rwlock);
-int pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr);
-int pthread_rwlock_rdlock (pthread_rwlock_t *rwlock);
-int pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock);
-int pthread_rwlock_wrlock (pthread_rwlock_t *rwlock);
-int pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock);
-int pthread_rwlock_unlock (pthread_rwlock_t *rwlock);
-int pthread_rwlockattr_init (pthread_rwlockattr_t *rwlockattr);
-int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr,
-                                   int *pshared);
-int pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared);
-int pthread_rwlockattr_destroy (pthread_rwlockattr_t *rwlockattr);
-
-int pthread_once (pthread_once_t *, void (*)(void));
-
-/* Concurrency levels - X/Open interface */
-int pthread_getconcurrency (void);
-int pthread_setconcurrency (int);
-
-
-pthread_t pthread_self (void);
-int pthread_setcancelstate (int, int *);
-int pthread_setcanceltype (int, int *);
-int pthread_setschedparam (pthread_t, int, const struct sched_param *);
-int pthread_setspecific (pthread_key_t, const void *);
-void pthread_testcancel (void);
-
-/* Non posix calls */
-
-int pthread_suspend (pthread_t);
-int pthread_continue (pthread_t);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PTHREAD_H */
diff --git a/winsup/cygwin/include/pty.h b/winsup/cygwin/include/pty.h
deleted file mode 100644
index e4b4da03f..000000000
--- a/winsup/cygwin/include/pty.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef __PTY_H__
-#define __PTY_H__
-
-#include <_ansi.h>
-#include <sys/termios.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int _EXFUN(openpty ,(int *, int *, char *, struct termios *, struct winsize *));
-int _EXFUN(forkpty ,(int *, char *, struct termios *, struct winsize *));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __PTY_H__ */
diff --git a/winsup/cygwin/include/sched.h b/winsup/cygwin/include/sched.h
deleted file mode 100644
index f97b8ebf4..000000000
--- a/winsup/cygwin/include/sched.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* sched.h: scheduler interface for Cygwin
-
-   Copyright 2001  Red Hat, Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-/* Written from the opengroup specifications */
-
-#ifndef _SCHED_H
-#define _SCHED_H
-#include <time.h>
-
-/* we return -1 and set errno on failure */
-#define SCHED_FIFO  1
-#define SCHED_RR    2
-#define SCHED_OTHER 3
-
-struct sched_param
-{
-  int sched_priority;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* max priority for policy */
-int sched_get_priority_max (int);
-/* min priority for policy */
-int sched_get_priority_min (int);
-/* get sched params for process */
-int sched_getparam (pid_t, struct sched_param *);
-/* get the scheduler for pid */
-int sched_getscheduler (pid_t);
-/* get the time quantum for pid */
-int sched_rr_get_interval (pid_t, struct timespec *);
-/* set the scheduling parameters */
-int sched_setparam (pid_t, const struct sched_param *);
-/* set the scheduler */
-int sched_setscheduler (pid_t, int, const struct sched_param *);
-/* yield the cpu */
-int sched_yield (void);
-
-#if defined(__INSIDE_CYGWIN__)
-/* These are private helper functions used to calculate scheduler settings and
- * validate parameters */
-
-/* check parameters for validity */
-int valid_sched_parameters(const struct sched_param *);
-/* set a single thread's priority */
-int sched_set_thread_priority(HANDLE thread, int priority);
-
-#endif /* INSIDE_CYGWIN */
-
-#ifdef __cplusplus
-}
-#endif
-#endif				/* _SCHED_H */
diff --git a/winsup/cygwin/include/semaphore.h b/winsup/cygwin/include/semaphore.h
deleted file mode 100644
index 96f7c6f88..000000000
--- a/winsup/cygwin/include/semaphore.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* semaphore.h: POSIX semaphore interface
-
-   Copyright 2001, 2003 Red Hat, Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include <sys/types.h>
-
-#ifndef _SEMAPHORE_H
-#define _SEMAPHORE_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#ifndef __INSIDE_CYGWIN__
-  typedef struct __sem_t {char __dummy;} *sem_t;
-#endif
-
-#define SEM_FAILED 0
-#define SEM_VALUE_MAX 1147483648
-
-/* Semaphores */
-  int sem_init (sem_t * sem, int pshared, unsigned int value);
-  int sem_destroy (sem_t * sem);
-  sem_t *sem_open (const char *name, int oflag, ...);
-  int sem_close (sem_t *sem);
-  int sem_wait (sem_t * sem);
-  int sem_trywait (sem_t * sem);
-  int sem_timedwait (sem_t * sem, const struct timespec *abstime);
-  int sem_post (sem_t * sem);
-  int sem_getvalue (sem_t * sem, int *sval);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif				/* _SEMAPHORE_H */
diff --git a/winsup/cygwin/include/stdint.h b/winsup/cygwin/include/stdint.h
deleted file mode 100644
index 406565cc0..000000000
--- a/winsup/cygwin/include/stdint.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* stdint.h - integer types
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _STDINT_H
-#define _STDINT_H
-
-/* Exact-width integer types */
-
-#ifndef __int8_t_defined
-#define __int8_t_defined
-typedef signed char int8_t;
-typedef short int16_t;
-typedef long int32_t;
-typedef long long int64_t;
-#endif
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-#ifndef __uint32_t_defined
-#define __uint32_t_defined
-typedef unsigned long uint32_t;
-#endif
-typedef unsigned long long uint64_t;
-
-/* Minimum-width integer types */
-
-typedef signed char int_least8_t;
-typedef short int_least16_t;
-typedef long int_least32_t;
-typedef long long int_least64_t;
-
-typedef unsigned char uint_least8_t;
-typedef unsigned short uint_least16_t;
-typedef unsigned long uint_least32_t;
-typedef unsigned long long uint_least64_t;
-
-/* Fastest minimum-width integer types */
-
-typedef signed char int_fast8_t;
-typedef long int_fast16_t;
-typedef long int_fast32_t;
-typedef long long int_fast64_t;
-
-typedef unsigned char uint_fast8_t;
-typedef unsigned long uint_fast16_t;
-typedef unsigned long uint_fast32_t;
-typedef unsigned long long uint_fast64_t;
-
-/* Integer types capable of holding object pointers */
-
-#ifndef __intptr_t_defined
-#define __intptr_t_defined
-typedef long intptr_t;
-#endif
-typedef unsigned long uintptr_t;
-
-/* Greatest-width integer types */
-
-typedef long long intmax_t;
-typedef unsigned long long uintmax_t;
-
-/* Limits of exact-width integer types */
-
-#define INT8_MIN (-128)
-#define INT16_MIN (-32768)
-#define INT32_MIN (-2147483647 - 1)
-#define INT64_MIN (-9223372036854775807LL - 1LL)
-
-#define INT8_MAX (127)
-#define INT16_MAX (32767)
-#define INT32_MAX (2147483647)
-#define INT64_MAX (9223372036854775807LL)
-
-#define UINT8_MAX (255)
-#define UINT16_MAX (65535)
-#define UINT32_MAX (4294967295UL)
-#define UINT64_MAX (18446744073709551615ULL)
-
-/* Limits of minimum-width integer types */
-
-#define INT_LEAST8_MIN (-128)
-#define INT_LEAST16_MIN (-32768)
-#define INT_LEAST32_MIN (-2147483647 - 1)
-#define INT_LEAST64_MIN (-9223372036854775807LL - 1LL)
-
-#define INT_LEAST8_MAX (127)
-#define INT_LEAST16_MAX (32767)
-#define INT_LEAST32_MAX (2147483647)
-#define INT_LEAST64_MAX (9223372036854775807LL)
-
-#define UINT_LEAST8_MAX (255)
-#define UINT_LEAST16_MAX (65535)
-#define UINT_LEAST32_MAX (4294967295UL)
-#define UINT_LEAST64_MAX (18446744073709551615ULL)
-
-/* Limits of fastest minimum-width integer types */
-
-#define INT_FAST8_MIN (-128)
-#define INT_FAST16_MIN (-2147483647 - 1)
-#define INT_FAST32_MIN (-2147483647 - 1)
-#define INT_FAST64_MIN (-9223372036854775807LL - 1LL)
-
-#define INT_FAST8_MAX (127)
-#define INT_FAST16_MAX (2147483647)
-#define INT_FAST32_MAX (2147483647)
-#define INT_FAST64_MAX (9223372036854775807LL)
-
-#define UINT_FAST8_MAX (255)
-#define UINT_FAST16_MAX (4294967295UL)
-#define UINT_FAST32_MAX (4294967295UL)
-#define UINT_FAST64_MAX (18446744073709551615ULL)
-
-/* Limits of integer types capable of holding object pointers */
-
-#define INTPTR_MIN (-2147483647 - 1)
-#define INTPTR_MAX (2147483647)
-#define UINTPTR_MAX (4294967295UL)
-
-/* Limits of greatest-width integer types */
-
-#define INTMAX_MIN (-9223372036854775807LL - 1LL)
-#define INTMAX_MAX (9223372036854775807LL)
-#define UINTMAX_MAX (18446744073709551615ULL)
-
-/* Limits of other integer types */
-
-#ifndef PTRDIFF_MIN
-#define PTRDIFF_MIN (-2147483647 - 1)
-#define PTRDIFF_MAX (2147483647)
-#endif
-
-#ifndef SIG_ATOMIC_MIN
-#define SIG_ATOMIC_MIN (-2147483647 - 1)
-#endif
-#ifndef SIG_ATOMIC_MAX
-#define SIG_ATOMIC_MAX (2147483647)
-#endif
-
-#ifndef SIZE_MAX
-#define SIZE_MAX (4294967295UL)
-#endif
-
-#ifndef WCHAR_MIN
-#ifdef __WCHAR_MIN__
-#define WCHAR_MIN __WCHAR_MIN__
-#define WCHAR_MAX __WCHAR_MAX__
-#else
-#define WCHAR_MIN (0)
-#define WCHAR_MAX (65535)
-#endif
-#endif
-
-#ifndef WINT_MIN
-#define WINT_MIN (-2147483647 - 1)
-#define WINT_MAX (2147483647)
-#endif
-
-/* Macros for minimum-width integer constant expressions */
-
-#define INT8_C(x) x
-#define INT16_C(x) x
-#define INT32_C(x) x ## L
-#define INT64_C(x) x ## LL
-
-#define UINT8_C(x) x ## U
-#define UINT16_C(x) x ## U
-#define UINT32_C(x) x ## UL
-#define UINT64_C(x) x ## ULL
-
-/* Macros for greatest-width integer constant expressions */
-
-#define INTMAX_C(x) x ## L
-#define UINTMAX_C(x) x ## UL
-
-#endif /* _STDINT_H */
diff --git a/winsup/cygwin/include/strings.h b/winsup/cygwin/include/strings.h
deleted file mode 100644
index e9d2839f2..000000000
--- a/winsup/cygwin/include/strings.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _STRINGS_H
-#define _STRINGS_H
-
-#include <string.h>
-
-#endif /* _STRINGS_H */
diff --git a/winsup/cygwin/include/sys/acl.h b/winsup/cygwin/include/sys/acl.h
deleted file mode 100644
index 89c38bc0f..000000000
--- a/winsup/cygwin/include/sys/acl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* sys/acl.h header file for Cygwin.
-
-   Copyright 1999, 2000, 2001 Red Hat, Inc.
-   Written by C. Vinschen.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_ACL_H
-#define _SYS_ACL_H
-
-#include <cygwin/acl.h>
-
-#endif /* _SYS_ACL_H */
diff --git a/winsup/cygwin/include/sys/cdefs.h b/winsup/cygwin/include/sys/cdefs.h
deleted file mode 100644
index 57bf89bef..000000000
--- a/winsup/cygwin/include/sys/cdefs.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* sys/cdefs.h
-
-   Copyright 1998, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef	_SYS_CDEFS_H
-#define _SYS_CDEFS_H
-#ifdef	__cplusplus
-#define	__BEGIN_DECLS	extern "C" {
-#define	__END_DECLS	}
-#else
-#define	__BEGIN_DECLS
-#define	__END_DECLS
-#endif
-#define __P(protos)     protos		/* full-blown ANSI C */
-#endif
-
diff --git a/winsup/cygwin/include/sys/copying.dj b/winsup/cygwin/include/sys/copying.dj
deleted file mode 100644
index b6d105976..000000000
--- a/winsup/cygwin/include/sys/copying.dj
+++ /dev/null
@@ -1,41 +0,0 @@
-This is the file "copying.dj".  It does not apply to any sources
-copyrighted by UCB Berkeley or the Free Software Foundation.
-
-   Copyright Information for sources and executables that are marked
-   Copyright (C) DJ Delorie
-                 24 Kirsten Ave
-                 Rochester NH  03867-2954
-
-This document is Copyright (C) DJ Delorie and may be distributed
-verbatim, but changing it is not allowed.
-
-Source code copyright DJ Delorie is distributed under the terms of the
-GNU General Public Licence, with the following exceptions:
-
-* Any existing copyright or authorship information in any given source
-file must remain intact.  If you modify a source file, a notice to that
-effect must be added to the authorship information in the source file.
-
-* binaries provided in djgpp may be distributed without sources ONLY if
-the recipient is given sufficient information to obtain a copy of djgpp
-themselves.  This primarily applies to go32.exe, emu387, stub.exe, and
-the graphics drivers.
-
-* modified versions of the binaries provided in djgpp must be
-distributed under the terms of the GPL.
-
-* objects and libraries linked into an application may be distributed
-without sources.
-
------
-
-Changes to source code copyright BSD or FSF are copyright DJ Delorie, but
-fall under the terms of the original copyright.
-
-A copy of the file "COPYING" is included with this document.  If you did not
-receive a copy of "COPYING", you may obtain one from whence this document
-was obtained, or by writing:
-      Free Software Foundation
-      675 Mass Ave
-      Cambridge, MA  02139
-      USA
diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
deleted file mode 100644
index 10b1b0823..000000000
--- a/winsup/cygwin/include/sys/cygwin.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/* sys/cygwin.h
-
-   Copyright 1997, 1998, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_CYGWIN_H
-#define _SYS_CYGWIN_H
-
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern pid_t cygwin32_winpid_to_pid (int);
-extern void cygwin32_win32_to_posix_path_list (const char *, char *);
-extern int cygwin32_win32_to_posix_path_list_buf_size (const char *);
-extern void cygwin32_posix_to_win32_path_list (const char *, char *);
-extern int cygwin32_posix_to_win32_path_list_buf_size (const char *);
-extern int cygwin32_conv_to_win32_path (const char *, char *);
-extern int cygwin32_conv_to_full_win32_path (const char *, char *);
-extern void cygwin32_conv_to_posix_path (const char *, char *);
-extern void cygwin32_conv_to_full_posix_path (const char *, char *);
-extern int cygwin32_posix_path_list_p (const char *);
-extern void cygwin32_split_path (const char *, char *, char *);
-
-extern pid_t cygwin_winpid_to_pid (int);
-extern int cygwin_win32_to_posix_path_list (const char *, char *);
-extern int cygwin_win32_to_posix_path_list_buf_size (const char *);
-extern int cygwin_posix_to_win32_path_list (const char *, char *);
-extern int cygwin_posix_to_win32_path_list_buf_size (const char *);
-extern int cygwin_conv_to_win32_path (const char *, char *);
-extern int cygwin_conv_to_full_win32_path (const char *, char *);
-extern int cygwin_conv_to_posix_path (const char *, char *);
-extern int cygwin_conv_to_full_posix_path (const char *, char *);
-extern int cygwin_posix_path_list_p (const char *);
-extern void cygwin_split_path (const char *, char *, char *);
-
-struct __cygwin_perfile
-{
-  const char *name;
-  unsigned flags;
-};
-
-/* External interface stuff */
-
-typedef enum
-  {
-    CW_LOCK_PINFO,
-    CW_UNLOCK_PINFO,
-    CW_GETTHREADNAME,
-    CW_GETPINFO,
-    CW_SETPINFO,
-    CW_SETTHREADNAME,
-    CW_GETVERSIONINFO,
-    CW_READ_V1_MOUNT_TABLES,
-    CW_USER_DATA,
-    CW_PERFILE,
-    CW_GET_CYGDRIVE_PREFIXES,
-    CW_GETPINFO_FULL,
-    CW_INIT_EXCEPTIONS,
-    CW_GET_CYGDRIVE_INFO,
-    CW_SET_CYGWIN_REGISTRY_NAME,
-    CW_GET_CYGWIN_REGISTRY_NAME,
-    CW_STRACE_TOGGLE,
-    CW_STRACE_ACTIVE,
-    CW_CYGWIN_PID_TO_WINPID,
-    CW_EXTRACT_DOMAIN_AND_USER,
-    CW_CMDLINE,
-    CW_CHECK_NTSEC,
-    CW_GET_ERRNO_FROM_WINERROR,
-    CW_GET_POSIX_SECURITY_ATTRIBUTE,
-    CW_GET_SHMLBA,
-    CW_GET_UID_FROM_SID,
-    CW_GET_GID_FROM_SID
-  } cygwin_getinfo_types;
-
-#define CW_NEXTPID	0x80000000	/* or with pid to get next one */
-unsigned long cygwin_internal (cygwin_getinfo_types, ...);
-
-/* Flags associated with process_state */
-enum
-{
-  PID_IN_USE	       = 0x0001, /* Entry in use. */
-  PID_ZOMBIE	       = 0x0002, /* Child exited: no parent wait. */
-  PID_STOPPED	       = 0x0004, /* Waiting for SIGCONT. */
-  PID_TTYIN	       = 0x0008, /* Waiting for terminal input. */
-  PID_TTYOU	       = 0x0010, /* Waiting for terminal output. */
-  PID_ORPHANED	       = 0x0020, /* Member of an orphaned process group. */
-  PID_ACTIVE	       = 0x0040, /* Pid accepts signals. */
-  PID_CYGPARENT	       = 0x0080, /* Set if parent was a cygwin app. */
-  PID_MAP_RW	       = 0x0100, /* Flag to open map rw. */
-  PID_MYSELF	       = 0x0200, /* Flag that pid is me. */
-  PID_NOCLDSTOP	       = 0x0400, /* Set if no SIGCHLD signal on stop. */
-  PID_INITIALIZING     = 0x0800, /* Set until ready to receive signals. */
-  PID_USETTY	       = 0x1000, /* Setting this enables or disables cygwin's */
-				 /*  tty support.  This is inherited by */
-				 /*  all execed or forked processes. */
-  PID_ALLPIDS	       = 0x2000, /* child has execed */
-  PID_EXECED	       = 0x4000, /* redirect to original pid info block */
-  PID_NOREDIR	       = 0x8000, /* don't redirect if execed */
-  PID_EXITED	       = 0x80000000 /* Free entry. */
-};
-
-#ifdef WINVER
-#ifdef _PATH_PASSWD
-extern HANDLE cygwin_logon_user (const struct passwd *, const char *);
-#endif
-
-/* This lives in the app and is initialized before jumping into the DLL.
-   It should only contain stuff which the user's process needs to see, or
-   which is needed before the user pointer is initialized, or is needed to
-   carry inheritance information from parent to child.  Note that it cannot
-   be used to carry inheritance information across exec!
-
-   Remember, this structure is linked into the application's executable.
-   Changes to this can invalidate existing executables, so we go to extra
-   lengths to avoid having to do it.
-
-   When adding/deleting members, remember to adjust {public,internal}_reserved.
-   The size of the class shouldn't change [unless you really are prepared to
-   invalidate all existing executables].  The program does a check (using
-   SIZEOF_PER_PROCESS) to make sure you remember to make the adjustment.
-*/
-
-#ifdef __cplusplus
-class ResourceLocks;
-class MTinterface;
-#endif
-
-struct per_process
-{
-  char *initial_sp;
-
-  /* The offset of these 3 values can never change. */
-  /* magic_biscuit is the size of this class and should never change. */
-  unsigned long magic_biscuit;
-  unsigned long dll_major;
-  unsigned long dll_minor;
-
-  struct _reent **impure_ptr_ptr;
-  char ***envptr;
-
-  /* Used to point to the memory machine we should use.  Usually these
-     point back into the dll, but they can be overridden by the user. */
-  void *(*malloc)(size_t);
-  void (*free)(void *);
-  void *(*realloc)(void *, size_t);
-
-  int *fmode_ptr;
-
-  int (*main)(int, char **, char **);
-  void (**ctors)(void);
-  void (**dtors)(void);
-
-  /* For fork */
-  void *data_start;
-  void *data_end;
-  void *bss_start;
-  void *bss_end;
-
-  void *(*calloc)(size_t, size_t);
-  /* For future expansion of values set by the app. */
-  void (*premain[4]) (int, char **, struct per_process *);
-
-  /* The rest are *internal* to cygwin.dll.
-     Those that are here because we want the child to inherit the value from
-     the parent (which happens when bss is copied) are marked as such. */
-
-  /* non-zero of ctors have been run.  Inherited from parent. */
-  int run_ctors_p;
-
-  DWORD unused[7];
-
-  /* Non-zero means the task was forked.  The value is the pid.
-     Inherited from parent. */
-  int forkee;
-
-  HMODULE hmodule;
-
-  DWORD api_major;		/* API version that this program was */
-  DWORD api_minor;		/*  linked with */
-  /* For future expansion, so apps won't have to be relinked if we
-     add an item. */
-  DWORD unused2[5];
-
-#if defined (__INSIDE_CYGWIN__) && defined (__cplusplus)
-  ResourceLocks *resourcelocks;
-  MTinterface *threadinterface;
-#else
-  void *resourcelocks;
-  void *threadinterface;
-#endif
-  struct _reent *impure_ptr;
-};
-#define per_process_overwrite ((unsigned) &(((struct per_process *) NULL)->resourcelocks))
-
-extern void cygwin_premain0 (int argc, char **argv, struct per_process *);
-extern void cygwin_premain1 (int argc, char **argv, struct per_process *);
-extern void cygwin_premain2 (int argc, char **argv, struct per_process *);
-extern void cygwin_premain3 (int argc, char **argv, struct per_process *);
-
-extern void cygwin_set_impersonation_token (const HANDLE);
-
-/* included if <windows.h> is included */
-extern int cygwin32_attach_handle_to_fd (char *, int, HANDLE, mode_t, DWORD);
-extern int cygwin_attach_handle_to_fd (char *, int, HANDLE, mode_t, DWORD);
-
-#ifdef __CYGWIN__
-#include <sys/resource.h>
-
-#define TTY_CONSOLE	0x40000000
-
-#define EXTERNAL_PINFO_VERSION_16_BIT 0
-#define EXTERNAL_PINFO_VERSION_32_BIT 1
-#define EXTERNAL_PINFO_VERSION EXTERNAL_PINFO_VERSION_32_BIT
-
-#ifndef _SYS_TYPES_H
-typedef unsigned short __uid16_t;
-typedef unsigned short __gid16_t;
-typedef unsigned long __uid32_t;
-typedef unsigned long __gid32_t;
-#endif
-
-struct external_pinfo
-  {
-  pid_t pid;
-  pid_t ppid;
-  HANDLE hProcess;
-  DWORD dwProcessId, dwSpawnedProcessId;
-  __uid16_t uid;
-  __gid16_t gid;
-  pid_t pgid;
-  pid_t sid;
-  int ctty;
-  mode_t umask;
-
-  long start_time;
-  struct rusage rusage_self;
-  struct rusage rusage_children;
-
-  char progname[MAX_PATH];
-
-  DWORD strace_mask;
-  DWORD version;
-
-  DWORD process_state;
-
-  /* Only available if version >= EXTERNAL_PINFO_VERSION_32_BIT */
-  __uid32_t uid32;
-  __gid32_t gid32;
-};
-#endif /*__CYGWIN__*/
-#endif /*WINVER*/
-
-#ifdef __cplusplus
-};
-#endif
-#endif /* _SYS_CYGWIN_H */
diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h
deleted file mode 100644
index c3d77c4fb..000000000
--- a/winsup/cygwin/include/sys/dirent.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Posix dirent.h for WIN32.
-
-   Copyright 2001, 2002, 2003 Red Hat, Inc.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-/* Including this file should not require any Windows headers.  */
-   
-#ifndef _SYS_DIRENT_H
-#define _SYS_DIRENT_H
-
-#include <sys/types.h>
-
-#define __DIRENT_VERSION	2
-
-#pragma pack(push,4)
-#ifdef __INSIDE_CYGWIN__
-struct dirent
-{
-  long d_version;	/* Used since Cygwin 1.3.3. */
-  __ino64_t d_ino;	/* still junk but with more bits */
-  long d_fd;		/* File descriptor of open directory.
-			   Used since Cygwin 1.3.3. */
-  unsigned __ino32;
-  char d_name[256];	/* FIXME: use NAME_MAX? */
-};
-#else
-#ifdef __CYGWIN_USE_BIG_TYPES__
-struct dirent
-{
-  long d_version;
-  ino_t d_ino;
-  long d_fd;
-  unsigned long __ino32;
-  char d_name[256];
-};
-#else
-struct dirent
-{
-  long d_version;
-  long d_reserved[2];
-  long d_fd;
-  ino_t d_ino;
-  char d_name[256];
-};
-#endif
-#endif
-#pragma pack(pop)
-
-#define __DIRENT_COOKIE 0xdede4242
-
-#pragma pack(push,4)
-typedef struct __DIR
-{
-  /* This is first to set alignment in non _COMPILING_NEWLIB case.  */
-  unsigned long __d_cookie;
-  struct dirent *__d_dirent;
-  char *__d_dirname;		/* directory name with trailing '*' */
-  _off_t __d_position;		/* used by telldir/seekdir */
-  __ino64_t __d_dirhash;	/* hash of directory name for use by readdir */
-  void *__handle;
-  void *__fh;
-  unsigned __flags;
-} DIR;
-#pragma pack(pop)
-
-DIR *opendir (const char *);
-struct dirent *readdir (DIR *);
-void rewinddir (DIR *);
-int closedir (DIR *);
-
-int dirfd (DIR *);
-
-#ifndef _POSIX_SOURCE
-#ifndef __INSIDE_CYGWIN__
-off_t telldir (DIR *);
-void seekdir (DIR *, off_t loc);
-#endif
-
-int scandir (const char *__dir,
-	     struct dirent ***__namelist,
-	     int (*select) (const struct dirent *),
-	     int (*compar) (const struct dirent **, const struct dirent **));
-
-int alphasort (const struct dirent **__a, const struct dirent **__b);
-#endif /* _POSIX_SOURCE */
-
-#endif
diff --git a/winsup/cygwin/include/sys/file.h b/winsup/cygwin/include/sys/file.h
deleted file mode 100644
index af07df4cf..000000000
--- a/winsup/cygwin/include/sys/file.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This is file FILE.H */
-/*
-** Copyright (C) 1991 DJ Delorie, 24 Kirsten Ave, Rochester NH 03867-2954
-**
-** This file is distributed under the terms listed in the document
-** "copying.dj", available from DJ Delorie at the address above.
-** A copy of "copying.dj" should accompany this file; if not, a copy
-** should be available from where this file was obtained.  This file
-** may not be distributed without a verbatim copy of "copying.dj".
-**
-** This file is distributed WITHOUT ANY WARRANTY; without even the implied
-** warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-/*
- * 2003-11-27  Nicholas Wourms  <nwourms@netscape.net>:
- *
- *   Include sys/cdefs.h. Add function prototype for flock().
- *   Add some comments from BSD's header for further clarity.
- *   (L_SET, L_CURR, L_INCR, L_XTND): Redefine as the macros
- *   SEEK_SET, SEEK_CUR, SEEK_CUR, & SEEK_END respectively.
- *   (LOCK_SH,LOCK_EX,LOCK_NB,LOCK_UN): New macros for flock().
-*/
-#ifndef _FILE_H_
-#define _FILE_H_
-
-#include <sys/cdefs.h>
-#include <fcntl.h>
-
-/* Whence values for lseek(); renamed by POSIX 1003.1 */
-#define L_SET		SEEK_SET
-#define L_CURR		SEEK_CUR
-#define L_INCR		SEEK_CUR
-#define L_XTND		SEEK_END
-
-/* Operations for flock() function */
-#define	LOCK_SH		1	/* Shared lock. */
-#define	LOCK_EX		2	/* Exclusive lock. */
-#define	LOCK_NB		4	/* Don't block when locking. */
-#define	LOCK_UN		8	/* Unlock. */
-
-/* Operations for access function */
-#define	F_OK		0	/* does file exist */
-#define X_OK		1	/* is it executable or searchable by caller */
-#define	W_OK		2	/* is it writable by caller */
-#define	R_OK		4	/* is it readable by caller */
-
-/* Apply or remove an advisory lock on the file fd refers to. */
-__BEGIN_DECLS
-
-int	_EXFUN(flock, (int, int));
-
-__END_DECLS
-
-#endif
diff --git a/winsup/cygwin/include/sys/ioctl.h b/winsup/cygwin/include/sys/ioctl.h
deleted file mode 100644
index fd9515fb1..000000000
--- a/winsup/cygwin/include/sys/ioctl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* sys/ioctl.h
-
-   Copyright 1998, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* sys/ioctl.h */
-
-#ifndef _SYS_IOCTL_H
-#define _SYS_IOCTL_H
-
-#include <sys/cdefs.h>
-
-/* /dev/windows ioctls */
-
-#define WINDOWS_POST	0	/* Set write() behavior to PostMessage() */
-#define WINDOWS_SEND	1	/* Set write() behavior to SendMessage() */
-#define WINDOWS_HWND	2	/* Set hWnd for read() calls */
-
-__BEGIN_DECLS
-
-int ioctl (int __fd, int __cmd, ...);
-
-__END_DECLS
-
-#endif
diff --git a/winsup/cygwin/include/sys/ipc.h b/winsup/cygwin/include/sys/ipc.h
deleted file mode 100644
index e615bd7c2..000000000
--- a/winsup/cygwin/include/sys/ipc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* sys/ipc.h
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* sys/ipc.h header file for Cygwin.  */
-
-#ifndef _SYS_IPC_H
-#define _SYS_IPC_H
-
-#include <cygwin/ipc.h>
-
-#endif /* _SYS_IPC_H */
diff --git a/winsup/cygwin/include/sys/mman.h b/winsup/cygwin/include/sys/mman.h
deleted file mode 100644
index 3264739c0..000000000
--- a/winsup/cygwin/include/sys/mman.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* sys/mman.h
-
-   Copyright 1996, 1997, 1998, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_MMAN_H_
-#define _SYS_MMAN_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <stddef.h>
-#include <sys/types.h>
-
-#define PROT_NONE 0
-#define PROT_READ 1
-#define PROT_WRITE 2
-#define PROT_EXEC 4
-
-#define MAP_FILE 0
-#define MAP_SHARED 1
-#define MAP_PRIVATE 2
-#define MAP_TYPE 0xF
-#define MAP_FIXED 0x10
-#define MAP_ANONYMOUS 0x20
-#define MAP_ANON MAP_ANONYMOUS
-
-#define MAP_FAILED ((void *)-1)
-
-/*
- * Flags for msync.
- */
-#define MS_ASYNC 1
-#define MS_SYNC 2
-#define MS_INVALIDATE 4
-
-#ifndef __INSIDE_CYGWIN__
-extern void *mmap (void *__addr, size_t __len, int __prot, int __flags, int __fd, off_t __off);
-#endif
-extern int munmap (void *__addr, size_t __len);
-extern int mprotect (void *__addr, size_t __len, int __prot);
-extern int msync (void *__addr, size_t __len, int __flags);
-
-#ifdef __cplusplus
-};
-#endif /* __cplusplus */
-
-#endif /*  _SYS_MMAN_H_ */
diff --git a/winsup/cygwin/include/sys/mount.h b/winsup/cygwin/include/sys/mount.h
deleted file mode 100644
index 5915ddcae..000000000
--- a/winsup/cygwin/include/sys/mount.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* sys/mount.h
-
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_MOUNT_H
-#define _SYS_MOUNT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum
-{
-  MOUNT_SYMLINK =	0x001,	/* "mount point" is a symlink */
-  MOUNT_BINARY =	0x002,	/* "binary" format read/writes */
-  MOUNT_SYSTEM =	0x008,	/* mount point came from system table */
-  MOUNT_EXEC   =	0x010,	/* Any file in the mounted directory gets 'x' bit */
-  MOUNT_CYGDRIVE   =	0x020,	/* mount point refers to cygdrive device mount */
-  MOUNT_CYGWIN_EXEC =	0x040,	/* file or directory is or contains a cygwin
-				   executable */
-  MOUNT_MIXED	=	0x080,	/* reads are text, writes are binary
-				   not yet implemented */
-  MOUNT_NOTEXEC =	0x100,	/* don't check files for executable magic */
-  MOUNT_DEVFS =		0x200,	/* /device "filesystem" */
-  MOUNT_PROC =		0x400,	/* /proc "filesystem" */
-  MOUNT_ENC =		0x800	/* encode special characters */
-};
-
-int mount (const char *, const char *, unsigned __flags);
-int umount (const char *);
-int cygwin_umount (const char *__path, unsigned __flags);
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _SYS_MOUNT_H */
diff --git a/winsup/cygwin/include/sys/msg.h b/winsup/cygwin/include/sys/msg.h
deleted file mode 100644
index a554ab4f8..000000000
--- a/winsup/cygwin/include/sys/msg.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* sys/msg.h
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* sys/msg.h header file for Cygwin.  */
-
-#ifndef _SYS_MSG_H
-#define _SYS_MSG_H
-
-#include <cygwin/msg.h>
-
-#endif /* _SYS_MSG_H */
diff --git a/winsup/cygwin/include/sys/mtio.h b/winsup/cygwin/include/sys/mtio.h
deleted file mode 100644
index 84812bdc9..000000000
--- a/winsup/cygwin/include/sys/mtio.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* sys/mtio.h
-
-   Copyright 1999, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* sys/mtio.h header file for Cygwin.  */
-
-#ifndef _SYS_MTIO_H
-#define _SYS_MTIO_H
-
-#include <cygwin/mtio.h>
-
-#endif /* _SYS_MTIO_H */
diff --git a/winsup/cygwin/include/sys/param.h b/winsup/cygwin/include/sys/param.h
deleted file mode 100644
index 811b5ee56..000000000
--- a/winsup/cygwin/include/sys/param.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* sys/param.h
-
-   Copyright 2001, 2003 Red Hat, Inc.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#ifndef _SYS_PARAM_H
-#define _SYS_PARAM_H
-
-#include <sys/types.h>
-/* Linux includes limits.h, but this is not universally done. */
-#include <limits.h>
-
-/* Max number of open files.  The Posix version is OPEN_MAX.  */
-/* Number of fds is virtually unlimited in cygwin, but we must provide
-   some reasonable value for Posix conformance */
-#define NOFILE		8192
-
-/* Max number of groups; must keep in sync with NGROUPS_MAX in limits.h */
-#define NGROUPS		16
-
-/* Ticks/second for system calls such as times() */
-/* FIXME: is this the appropriate value? */
-#define HZ		1000
-
-/* Max hostname size that can be dealt with */
-/* FIXME: is this the appropriate value? */
-#define MAXHOSTNAMELEN	64
-
-/* This is defined to be the same as MAX_PATH which is used internally.
-   The Posix version is PATH_MAX.  */
-#define MAXPATHLEN      (260 - 1 /*NUL*/)
-
-/* This is the number of bytes per block given in the st_blocks stat member.
-   It should be in sync with S_BLKSIZE in sys/stat.h.  S_BLKSIZE is the
-   BSD variant of this constant. */
-#define DEV_BSIZE	1024
-
-/* Some autoconf'd packages check for endianness.  When cross-building we
-   can't run programs on the target.  Fortunately, autoconf supports the
-   definition of byte order in sys/param.h (that's us!).
-   The values here are the same as used in gdb/defs.h (are the more
-   appropriate values?).  */
-#define BIG_ENDIAN	4321
-#define LITTLE_ENDIAN	1234
-
-/* All known win32 systems are little endian.  */
-#define BYTE_ORDER	LITTLE_ENDIAN
-
-#ifndef NULL
-#define NULL            0L
-#endif
-
-#ifndef NBBY
-#define    NBBY 8
-#endif
-
-/* Bit map related macros. */
-#define    setbit(a,i) ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define    clrbit(a,i) ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define    isset(a,i)  ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define    isclr(a,i)  (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-
-/* Macros for counting and rounding. */
-#ifndef howmany
-#define    howmany(x, y)   (((x)+((y)-1))/(y))
-#endif
-#define    rounddown(x, y) (((x)/(y))*(y))
-#define    roundup(x, y)   ((((x)+((y)-1))/(y))*(y))  /* to any y */
-#define    roundup2(x, y)  (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
-#define powerof2(x)    ((((x)-1)&(x))==0)
-
-/* Macros for min/max. */
-#define    MIN(a,b)    (((a)<(b))?(a):(b))
-#define    MAX(a,b)    (((a)>(b))?(a):(b))
-
-#endif
diff --git a/winsup/cygwin/include/sys/poll.h b/winsup/cygwin/include/sys/poll.h
deleted file mode 100644
index a5bd4bded..000000000
--- a/winsup/cygwin/include/sys/poll.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* sys/poll.h
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#ifndef _SYS_POLL_H
-#define _SYS_POLL_H
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-#define POLLIN  1       /* Set if data to read. */
-#define POLLPRI 2       /* Set if urgent data to read. */
-#define POLLOUT 4       /* Set if writing data wouldn't block. */
-#define POLLERR   8     /* An error occured. */
-#define POLLHUP  16     /* Shutdown or close happened. */
-#define POLLNVAL 32     /* Invalid file descriptor. */
-
-#define NPOLLFILE 64    /* Number of canonical fd's in one call to poll(). */
-
-/* The following values are defined by XPG4. */
-#define POLLRDNORM POLLIN
-#define POLLRDBAND POLLPRI
-#define POLLWRNORM POLLOUT
-#define POLLWRBAND POLLOUT
-
-struct pollfd {
-  int fd;
-  short events;
-  short revents;
-};
-
-extern int poll __P ((struct pollfd *fds, unsigned int nfds, int timeout));
-
-__END_DECLS
-
-#endif /* _SYS_POLL_H */
diff --git a/winsup/cygwin/include/sys/procfs.h b/winsup/cygwin/include/sys/procfs.h
deleted file mode 100644
index 78485f678..000000000
--- a/winsup/cygwin/include/sys/procfs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* sys/procfs.h
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* sys/procfs.h header file for Cygwin.  */
-
-#ifndef _SYS_PROCFS_H
-#define _SYS_PROCFS_H
-
-#include <cygwin/core_dump.h>
-
-#endif /* _SYS_PROCFS_H */
diff --git a/winsup/cygwin/include/sys/queue.h b/winsup/cygwin/include/sys/queue.h
deleted file mode 100644
index 92fa56b2f..000000000
--- a/winsup/cygwin/include/sys/queue.h
+++ /dev/null
@@ -1,558 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD: /repoman/r/ncvs/src/sys/sys/queue.h,v 1.56 2003/08/14 14:49:26 kan Exp $
- */
-
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-#include <sys/cdefs.h>
-
-/*
- * This file defines four types of data structures: singly-linked lists,
- * singly-linked tail queues, lists and tail queues.
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may be traversed in either direction.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- *
- *
- *				SLIST	LIST	STAILQ	TAILQ
- * _HEAD			+	+	+	+
- * _HEAD_INITIALIZER		+	+	+	+
- * _ENTRY			+	+	+	+
- * _INIT			+	+	+	+
- * _EMPTY			+	+	+	+
- * _FIRST			+	+	+	+
- * _NEXT			+	+	+	+
- * _PREV			-	-	-	+
- * _LAST			-	-	+	+
- * _FOREACH			+	+	+	+
- * _FOREACH_SAFE		+	+	+	+
- * _FOREACH_REVERSE		-	-	-	+
- * _FOREACH_REVERSE_SAFE	-	-	-	+
- * _INSERT_HEAD			+	+	+	+
- * _INSERT_BEFORE		-	+	-	+
- * _INSERT_AFTER		+	+	+	+
- * _INSERT_TAIL			-	-	+	+
- * _CONCAT			-	-	+	+
- * _REMOVE_HEAD			+	-	+	-
- * _REMOVE			+	+	+	+
- *
- */
-#define	QUEUE_MACRO_DEBUG 0
-#if QUEUE_MACRO_DEBUG
-/* Store the last 2 places the queue element or head was altered */
-struct qm_trace {
-	char * lastfile;
-	int lastline;
-	char * prevfile;
-	int prevline;
-};
-
-#define	TRACEBUF	struct qm_trace trace;
-#define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
-
-#define	QMD_TRACE_HEAD(head) do {					\
-	(head)->trace.prevline = (head)->trace.lastline;		\
-	(head)->trace.prevfile = (head)->trace.lastfile;		\
-	(head)->trace.lastline = __LINE__;				\
-	(head)->trace.lastfile = __FILE__;				\
-} while (0)
-
-#define	QMD_TRACE_ELEM(elem) do {					\
-	(elem)->trace.prevline = (elem)->trace.lastline;		\
-	(elem)->trace.prevfile = (elem)->trace.lastfile;		\
-	(elem)->trace.lastline = __LINE__;				\
-	(elem)->trace.lastfile = __FILE__;				\
-} while (0)
-
-#else
-#define	QMD_TRACE_ELEM(elem)
-#define	QMD_TRACE_HEAD(head)
-#define	TRACEBUF
-#define	TRASHIT(x)
-#endif	/* QUEUE_MACRO_DEBUG */
-
-/*
- * Singly-linked List declarations.
- */
-#define	SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
-
-#define	SLIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#undef SLIST_ENTRY
-#define	SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
-
-/*
- * Singly-linked List functions.
- */
-#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
-
-#define	SLIST_FIRST(head)	((head)->slh_first)
-
-#define	SLIST_FOREACH(var, head, field)					\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var);							\
-	    (var) = SLIST_NEXT((var), field))
-
-#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-	for ((varp) = &SLIST_FIRST((head));				\
-	    ((var) = *(varp)) != NULL;					\
-	    (varp) = &SLIST_NEXT((var), field))
-
-#define	SLIST_INIT(head) do {						\
-	SLIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field);	\
-	SLIST_NEXT((slistelm), field) = (elm);				\
-} while (0)
-
-#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_FIRST((head));			\
-	SLIST_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
-
-#define	SLIST_REMOVE(head, elm, type, field) do {			\
-	if (SLIST_FIRST((head)) == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = SLIST_FIRST((head));		\
-		while (SLIST_NEXT(curelm, field) != (elm))		\
-			curelm = SLIST_NEXT(curelm, field);		\
-		SLIST_NEXT(curelm, field) =				\
-		    SLIST_NEXT(SLIST_NEXT(curelm, field), field);	\
-	}								\
-} while (0)
-
-#define	SLIST_REMOVE_HEAD(head, field) do {				\
-	SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);	\
-} while (0)
-
-/*
- * Singly-linked Tail queue declarations.
- */
-#define	STAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *stqh_first;/* first element */			\
-	struct type **stqh_last;/* addr of last next element */		\
-}
-
-#define	STAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).stqh_first }
-
-#define	STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define	STAILQ_CONCAT(head1, head2) do {				\
-	if (!STAILQ_EMPTY((head2))) {					\
-		*(head1)->stqh_last = (head2)->stqh_first;		\
-		(head1)->stqh_last = (head2)->stqh_last;		\
-		STAILQ_INIT((head2));					\
-	}								\
-} while (0)
-
-#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
-
-#define	STAILQ_FIRST(head)	((head)->stqh_first)
-
-#define	STAILQ_FOREACH(var, head, field)				\
-	for((var) = STAILQ_FIRST((head));				\
-	   (var);							\
-	   (var) = STAILQ_NEXT((var), field))
-
-
-#define	STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = STAILQ_FIRST((head));				\
-	    (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	STAILQ_INIT(head) do {						\
-	STAILQ_FIRST((head)) = NULL;					\
-	(head)->stqh_last = &STAILQ_FIRST((head));			\
-} while (0)
-
-#define	STAILQ_INSERT_AFTER(head, tqelm, elm, field) do {		\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_NEXT((tqelm), field) = (elm);				\
-} while (0)
-
-#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL)	\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
-	STAILQ_NEXT((elm), field) = NULL;				\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &STAILQ_NEXT((elm), field);			\
-} while (0)
-
-#define	STAILQ_LAST(head, type, field)					\
-	(STAILQ_EMPTY((head)) ?						\
-		NULL :							\
-	        ((struct type *)					\
-		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-
-#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
-
-#define	STAILQ_REMOVE(head, elm, type, field) do {			\
-	if (STAILQ_FIRST((head)) == (elm)) {				\
-		STAILQ_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = STAILQ_FIRST((head));		\
-		while (STAILQ_NEXT(curelm, field) != (elm))		\
-			curelm = STAILQ_NEXT(curelm, field);		\
-		if ((STAILQ_NEXT(curelm, field) =			\
-		     STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) == NULL)\
-			(head)->stqh_last = &STAILQ_NEXT((curelm), field);\
-	}								\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD(head, field) do {				\
-	if ((STAILQ_FIRST((head)) =					\
-	     STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL)		\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD_UNTIL(head, elm, field) do {			\
-	if ((STAILQ_FIRST((head)) = STAILQ_NEXT((elm), field)) == NULL)	\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
-} while (0)
-
-/*
- * List declarations.
- */
-#define	LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define	LIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-
-#define	LIST_EMPTY(head)	((head)->lh_first == NULL)
-
-#define	LIST_FIRST(head)	((head)->lh_first)
-
-#define	LIST_FOREACH(var, head, field)					\
-	for ((var) = LIST_FIRST((head));				\
-	    (var);							\
-	    (var) = LIST_NEXT((var), field))
-
-#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = LIST_FIRST((head));				\
-	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	LIST_INIT(head) do {						\
-	LIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
-	if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
-		LIST_NEXT((listelm), field)->field.le_prev =		\
-		    &LIST_NEXT((elm), field);				\
-	LIST_NEXT((listelm), field) = (elm);				\
-	(elm)->field.le_prev = &LIST_NEXT((listelm), field);		\
-} while (0)
-
-#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	LIST_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &LIST_NEXT((elm), field);		\
-} while (0)
-
-#define	LIST_INSERT_HEAD(head, elm, field) do {				\
-	if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL)	\
-		LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\
-	LIST_FIRST((head)) = (elm);					\
-	(elm)->field.le_prev = &LIST_FIRST((head));			\
-} while (0)
-
-#define	LIST_NEXT(elm, field)	((elm)->field.le_next)
-
-#define	LIST_REMOVE(elm, field) do {					\
-	if (LIST_NEXT((elm), field) != NULL)				\
-		LIST_NEXT((elm), field)->field.le_prev = 		\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
-} while (0)
-
-/*
- * Tail queue declarations.
- */
-#define	TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-	TRACEBUF							\
-}
-
-#define	TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
-
-#define	TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-	TRACEBUF							\
-}
-
-/*
- * Tail queue functions.
- */
-#define	TAILQ_CONCAT(head1, head2, field) do {				\
-	if (!TAILQ_EMPTY(head2)) {					\
-		*(head1)->tqh_last = (head2)->tqh_first;		\
-		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
-		(head1)->tqh_last = (head2)->tqh_last;			\
-		TAILQ_INIT((head2));					\
-		QMD_TRACE_HEAD(head);					\
-		QMD_TRACE_HEAD(head2);					\
-	}								\
-} while (0)
-
-#define	TAILQ_EMPTY(head)	((head)->tqh_first == NULL)
-
-#define	TAILQ_FIRST(head)	((head)->tqh_first)
-
-#define	TAILQ_FOREACH(var, head, field)					\
-	for ((var) = TAILQ_FIRST((head));				\
-	    (var);							\
-	    (var) = TAILQ_NEXT((var), field))
-
-#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = TAILQ_FIRST((head));				\
-	    (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	    (var);							\
-	    (var) = TAILQ_PREV((var), headname, field))
-
-#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	    (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-	    (var) = (tvar))
-
-#define	TAILQ_INIT(head) do {						\
-	TAILQ_FIRST((head)) = NULL;					\
-	(head)->tqh_last = &TAILQ_FIRST((head));			\
-	QMD_TRACE_HEAD(head);						\
-} while (0)
-
-#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    &TAILQ_NEXT((elm), field);				\
-	else {								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-		QMD_TRACE_HEAD(head);					\
-	}								\
-	TAILQ_NEXT((listelm), field) = (elm);				\
-	(elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field);		\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&listelm->field);				\
-} while (0)
-
-#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	TAILQ_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field);		\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&listelm->field);				\
-} while (0)
-
-#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL)	\
-		TAILQ_FIRST((head))->field.tqe_prev =			\
-		    &TAILQ_NEXT((elm), field);				\
-	else								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-	TAILQ_FIRST((head)) = (elm);					\
-	(elm)->field.tqe_prev = &TAILQ_FIRST((head));			\
-	QMD_TRACE_HEAD(head);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
-	TAILQ_NEXT((elm), field) = NULL;				\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &TAILQ_NEXT((elm), field);			\
-	QMD_TRACE_HEAD(head);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define	TAILQ_LAST(head, headname)					\
-	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-
-#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-
-#define	TAILQ_PREV(elm, headname, field)				\
-	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-
-#define	TAILQ_REMOVE(head, elm, field) do {				\
-	if ((TAILQ_NEXT((elm), field)) != NULL)				\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else {								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-		QMD_TRACE_HEAD(head);					\
-	}								\
-	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
-	TRASHIT((elm)->field.tqe_next);					\
-	TRASHIT((elm)->field.tqe_prev);					\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-
-#ifdef _KERNEL
-
-/*
- * XXX insque() and remque() are an old way of handling certain queues.
- * They bogusly assumes that all queue heads look alike.
- */
-
-struct quehead {
-	struct quehead *qh_link;
-	struct quehead *qh_rlink;
-};
-
-#ifdef	__GNUC__
-
-static __inline void
-insque(void *a, void *b)
-{
-	struct quehead *element = (struct quehead *)a,
-		 *head = (struct quehead *)b;
-
-	element->qh_link = head->qh_link;
-	element->qh_rlink = head;
-	head->qh_link = element;
-	element->qh_link->qh_rlink = element;
-}
-
-static __inline void
-remque(void *a)
-{
-	struct quehead *element = (struct quehead *)a;
-
-	element->qh_link->qh_rlink = element->qh_rlink;
-	element->qh_rlink->qh_link = element->qh_link;
-	element->qh_rlink = 0;
-}
-
-#else /* !__GNUC__ */
-
-void	insque(void *a, void *b);
-void	remque(void *a);
-
-#endif /* __GNUC__ */
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_QUEUE_H_ */
diff --git a/winsup/cygwin/include/sys/resource.h b/winsup/cygwin/include/sys/resource.h
deleted file mode 100644
index c1fe544a9..000000000
--- a/winsup/cygwin/include/sys/resource.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* sys/resource.h
-
-   Copyright 1997, 1998, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_RESOURCE_H_
-#define _SYS_RESOURCE_H_
-
-#include <sys/time.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define RLIMIT_CPU	0		/* CPU time in seconds */
-#define RLIMIT_FSIZE	1		/* Maximum filesize */
-#define RLIMIT_DATA	2		/* max data size */
-#define RLIMIT_STACK	3		/* max stack size */
-#define RLIMIT_CORE	4		/* max core file size */
-#define RLIMIT_NOFILE	5		/* max number of open files */
-#define RLIMIT_OFILE	RLIMIT_NOFILE	/* BSD name */
-#define RLIMIT_AS	6		/* address space (virt. memory) limit */
-
-#define RLIMIT_NLIMITS  7		/* upper bound of RLIMIT_* defines */
-#define RLIM_NLIMITS    RLIMIT_NLIMITS
-
-#define RLIM_INFINITY	(0xffffffffUL)
-#define RLIM_SAVED_MAX	RLIM_INFINITY
-#define RLIM_SAVED_CUR	RLIM_INFINITY
-
-typedef unsigned long rlim_t;
-
-struct rlimit {
-	rlim_t	rlim_cur;
-	rlim_t	rlim_max;
-};
-
-#define	RUSAGE_SELF	0		/* calling process */
-#define	RUSAGE_CHILDREN	-1		/* terminated child processes */
-
-struct rusage {
-	struct timeval ru_utime;	/* user time used */
-	struct timeval ru_stime;	/* system time used */
-	long ru_maxrss;
-	long ru_ixrss;               /* XXX: 0 */
-	long ru_idrss;               /* XXX: sum of rm_asrss */
-	long ru_isrss;               /* XXX: 0 */
-	long ru_minflt;              /* any page faults not requiring I/O */
-	long ru_majflt;              /* any page faults requiring I/O */
-	long ru_nswap;               /* swaps */
-	long ru_inblock;             /* block input operations */
-	long ru_oublock;             /* block output operations */
-	long ru_msgsnd;              /* messages sent */
-	long ru_msgrcv;              /* messages received */
-	long ru_nsignals;            /* signals received */
-	long ru_nvcsw;               /* voluntary context switches */
-	long ru_nivcsw;              /* involuntary " */
-#define ru_last         ru_nivcsw
-};
-
-int getrlimit (int __resource, struct rlimit *__rlp);
-int setrlimit (int __resource, const struct rlimit *__rlp);
-
-int getrusage (int __who, struct rusage *__rusage);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/winsup/cygwin/include/sys/select.h b/winsup/cygwin/include/sys/select.h
deleted file mode 100644
index 666a151eb..000000000
--- a/winsup/cygwin/include/sys/select.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* select.h
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-   Written by Geoffrey Noer <noer@cygnus.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_SELECT_H
-#define _SYS_SELECT_H
-
-#if !defined (_POSIX_SOURCE) && !defined (__INSIDE_CYGWIN_NET__)
-
-#include <sys/cdefs.h>
-
-/* Get fd_set, and macros like FD_SET */
-#include <sys/types.h>
-
-/* Get definition of timeval.  */
-#include <sys/time.h>
-#include <time.h>
-
-__BEGIN_DECLS
-
-int select __P ((int __n, fd_set *__readfds, fd_set *__writefds,
-		 fd_set *__exceptfds, struct timeval *__timeout));
-
-__END_DECLS
-
-#endif /* !_POSIX_SOURCE, !__INSIDE_CYGWIN_NET__ */
-
-#endif /* sys/select.h */
diff --git a/winsup/cygwin/include/sys/sem.h b/winsup/cygwin/include/sys/sem.h
deleted file mode 100644
index f7bdb595c..000000000
--- a/winsup/cygwin/include/sys/sem.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* sys/sem.h
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* sys/sem.h header file for Cygwin.  */
-
-#ifndef _SYS_SEM_H
-#define _SYS_SEM_H
-
-#include <cygwin/sem.h>
-
-#endif /* _SYS_SEM_H */
diff --git a/winsup/cygwin/include/sys/shm.h b/winsup/cygwin/include/sys/shm.h
deleted file mode 100644
index 2f0c38084..000000000
--- a/winsup/cygwin/include/sys/shm.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* sys/shm.h
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* sys/shm.h header file for Cygwin.  */
-
-#ifndef _SYS_SHM_H
-#define _SYS_SHM_H
-
-#include <cygwin/shm.h>
-
-#endif /* _SYS_SHM_H */
diff --git a/winsup/cygwin/include/sys/smallprint.h b/winsup/cygwin/include/sys/smallprint.h
deleted file mode 100644
index 9593d4d10..000000000
--- a/winsup/cygwin/include/sys/smallprint.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* sys/smallprint.h
-
-   Copyright 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_SMALLPRINT_H
-#define _SYS_SMALLPRINT_H
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int __small_sprintf (char *__dst, const char *__fmt, ...);
-int __small_vsprintf (char *__dst, const char *__fmt, va_list __ap);
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _SYS_SMALLPRINT_H */
diff --git a/winsup/cygwin/include/sys/socket.h b/winsup/cygwin/include/sys/socket.h
deleted file mode 100644
index 3bda9f9bf..000000000
--- a/winsup/cygwin/include/sys/socket.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* sys/socket.h
-
-   Copyright 1996-2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_SOCKET_H
-#define _SYS_SOCKET_H
-
-#include <features.h>
-#include <cygwin/socket.h>
-#include <sys/time.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* SUS symbolic values for the second parm to shutdown(2) */
-#define SHUT_RD   0		/* == Win32 SD_RECEIVE */
-#define SHUT_WR   1		/* == Win32 SD_SEND    */
-#define SHUT_RDWR 2		/* == Win32 SD_BOTH    */
-
-#ifndef __INSIDE_CYGWIN_NET__
-  int accept (int, struct sockaddr *__peer, int *);
-  int bind (int, const struct sockaddr *__my_addr, int __addrlen);
-  int connect (int, const struct sockaddr *, int);
-  int getpeername (int, struct sockaddr *__peer, int *);
-  int getsockname (int, struct sockaddr *__addr, int *);
-  int listen (int, int __n);
-  int recv (int, void *__buff, int __len, int __flags);
-  int recvfrom (int, void *__buff, int __len, int __flags,
-		struct sockaddr *__from, int *__fromlen);
-  int recvmsg(int s, struct msghdr *msg, int flags);
-  int send (int, const void *__buff, int __len, int __flags);
-  int sendmsg(int s, const struct msghdr *msg, int flags);
-  int sendto (int, const void *, int __len, int __flags,
-	      const struct sockaddr *__to, int __tolen);
-  int setsockopt (int __s, int __level, int __optname, const void *optval, int __optlen);
-  int getsockopt (int __s, int __level, int __optname, void *__optval, int *__optlen);
-  int shutdown (int, int);
-  int socket (int __family, int __type, int __protocol);
-  int socketpair (int __domain, int __type, int __protocol, int *__socket_vec);
-
-  struct servent *getservbyname (const char *__name, const char *__proto);
-#endif
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _SYS_SOCKET_H */
diff --git a/winsup/cygwin/include/sys/soundcard.h b/winsup/cygwin/include/sys/soundcard.h
deleted file mode 100644
index 79341c547..000000000
--- a/winsup/cygwin/include/sys/soundcard.h
+++ /dev/null
@@ -1,1287 +0,0 @@
-#ifndef SOUNDCARD_H
-#define SOUNDCARD_H
-/*
- * Copyright by Hannu Savolainen 1993-1997
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. 2.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-
-/*
- * OSS interface version. With versions earlier than 3.6 this value is
- * an integer with value less than 361. In versions 3.6 and later
- * it's a six digit hexadecimal value. For example value
- * of 0x030600 represents OSS version 3.6.0.
- * Use ioctl(fd, OSS_GETVERSION, &int) to get the version number of
- * the currently active driver.
- */
-#define SOUND_VERSION	0x030802
-#define OPEN_SOUND_SYSTEM
-
-/* In Linux we need to be prepared for cross compiling */
-//#include <linux/ioctl.h>
-
-/*
- *	Supported card ID numbers (Should be somewhere else?)
- */
-
-#define SNDCARD_ADLIB		1
-#define SNDCARD_SB		2
-#define SNDCARD_PAS		3
-#define SNDCARD_GUS		4
-#define SNDCARD_MPU401		5
-#define SNDCARD_SB16		6
-#define SNDCARD_SB16MIDI	7
-#define SNDCARD_UART6850	8
-#define SNDCARD_GUS16		9
-#define SNDCARD_MSS		10
-#define SNDCARD_PSS		11
-#define SNDCARD_SSCAPE		12
-#define SNDCARD_PSS_MPU		13
-#define SNDCARD_PSS_MSS		14
-#define SNDCARD_SSCAPE_MSS	15
-#define SNDCARD_TRXPRO		16
-#define SNDCARD_TRXPRO_SB	17
-#define SNDCARD_TRXPRO_MPU	18
-#define SNDCARD_MAD16		19
-#define SNDCARD_MAD16_MPU	20
-#define SNDCARD_CS4232		21
-#define SNDCARD_CS4232_MPU	22
-#define SNDCARD_MAUI		23
-#define SNDCARD_PSEUDO_MSS	24
-#define SNDCARD_GUSPNP		25
-#define SNDCARD_UART401		26
-/* Sound card numbers 27 to N are reserved. Don't add more numbers here. */
-
-/***********************************
- * IOCTL Commands for /dev/sequencer
- */
-
-#ifndef _SIOWR
-#if defined(_IOWR) && (defined(_AIX) || (!defined(sun) && !defined(sparc) && !defined(__sparc__) && !defined(__INCioctlh) && !defined(__Lynx__)))
-/* Use already defined ioctl defines if they exist (except with Sun or Sparc) */
-#define	SIOCPARM_MASK	IOCPARM_MASK
-#define	SIOC_VOID	IOC_VOID
-#define	SIOC_OUT	IOC_OUT
-#define	SIOC_IN		IOC_IN
-#define	SIOC_INOUT	IOC_INOUT
-#define _SIOC_SIZE	_IOC_SIZE
-#define _SIOC_DIR	_IOC_DIR
-#define _SIOC_NONE	_IOC_NONE
-#define _SIOC_READ	_IOC_READ
-#define _SIOC_WRITE	_IOC_WRITE
-#define	_SIO		_IO
-#define	_SIOR		_IOR
-#define	_SIOW		_IOW
-#define	_SIOWR		_IOWR
-#else
-
-/* Ioctl's have the command encoded in the lower word,
- * and the size of any in or out parameters in the upper
- * word.  The high 2 bits of the upper word are used
- * to encode the in/out status of the parameter; for now
- * we restrict parameters to at most 8191 bytes.
- */
-/* #define	SIOCTYPE		(0xff<<8) */
-#define	SIOCPARM_MASK	0x1fff		/* parameters must be < 8192 bytes */
-#define	SIOC_VOID	0x00000000	/* no parameters */
-#define	SIOC_OUT	0x20000000	/* copy out parameters */
-#define	SIOC_IN		0x40000000	/* copy in parameters */
-#define	SIOC_INOUT	(SIOC_IN|SIOC_OUT)
-/* the 0x20000000 is so we can distinguish new ioctl's from old */
-#define	_SIO(x,y)	((int)(SIOC_VOID|(x<<8)|y))
-#define	_SIOR(x,y,t)	((int)(SIOC_OUT|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
-#define	_SIOW(x,y,t)	((int)(SIOC_IN|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
-/* this should be _SIORW, but stdio got there first */
-#define	_SIOWR(x,y,t)	((int)(SIOC_INOUT|((sizeof(t)&SIOCPARM_MASK)<<16)|(x<<8)|y))
-#define _SIOC_SIZE(x)	((x>>16)&SIOCPARM_MASK)
-#define _SIOC_DIR(x)	(x & 0xf0000000)
-#define _SIOC_NONE	SIOC_VOID
-#define _SIOC_READ	SIOC_OUT
-#define _SIOC_WRITE	SIOC_IN
-#  endif /* _IOWR */
-#endif  /* !_SIOWR */
-
-#define SNDCTL_SEQ_RESET		_SIO  ('Q', 0)
-#define SNDCTL_SEQ_SYNC			_SIO  ('Q', 1)
-#define SNDCTL_SYNTH_INFO		_SIOWR('Q', 2, struct synth_info)
-#define SNDCTL_SEQ_CTRLRATE		_SIOWR('Q', 3, int)	/* Set/get timer resolution (HZ) */
-#define SNDCTL_SEQ_GETOUTCOUNT		_SIOR ('Q', 4, int)
-#define SNDCTL_SEQ_GETINCOUNT		_SIOR ('Q', 5, int)
-#define SNDCTL_SEQ_PERCMODE		_SIOW ('Q', 6, int)
-#define SNDCTL_FM_LOAD_INSTR		_SIOW ('Q', 7, struct sbi_instrument)	/* Obsolete. Don't use!!!!!! */
-#define SNDCTL_SEQ_TESTMIDI		_SIOW ('Q', 8, int)
-#define SNDCTL_SEQ_RESETSAMPLES		_SIOW ('Q', 9, int)
-#define SNDCTL_SEQ_NRSYNTHS		_SIOR ('Q',10, int)
-#define SNDCTL_SEQ_NRMIDIS		_SIOR ('Q',11, int)
-#define SNDCTL_MIDI_INFO		_SIOWR('Q',12, struct midi_info)
-#define SNDCTL_SEQ_THRESHOLD		_SIOW ('Q',13, int)
-#define SNDCTL_SYNTH_MEMAVL		_SIOWR('Q',14, int)	/* in=dev#, out=memsize */
-#define SNDCTL_FM_4OP_ENABLE		_SIOW ('Q',15, int)	/* in=dev# */
-#define SNDCTL_SEQ_PANIC		_SIO  ('Q',17)
-#define SNDCTL_SEQ_OUTOFBAND		_SIOW ('Q',18, struct seq_event_rec)
-#define SNDCTL_SEQ_GETTIME		_SIOR ('Q',19, int)
-#define SNDCTL_SYNTH_ID			_SIOWR('Q',20, struct synth_info)
-#define SNDCTL_SYNTH_CONTROL		_SIOWR('Q',21, struct synth_control)
-#define SNDCTL_SYNTH_REMOVESAMPLE	_SIOWR('Q',22, struct remove_sample)
-
-typedef struct synth_control
-{
-	int devno;	/* Synthesizer # */
-	char data[4000]; /* Device spesific command/data record */
-}synth_control;
-
-typedef struct remove_sample
-{
-	int devno;	/* Synthesizer # */
-	int bankno;	/* MIDI bank # (0=General MIDI) */
-	int instrno;	/* MIDI instrument number */
-} remove_sample;
-
-typedef struct seq_event_rec {
-		unsigned char arr[8];
-} seq_event_rec;
-
-#define SNDCTL_TMR_TIMEBASE		_SIOWR('T', 1, int)
-#define SNDCTL_TMR_START		_SIO  ('T', 2)
-#define SNDCTL_TMR_STOP			_SIO  ('T', 3)
-#define SNDCTL_TMR_CONTINUE		_SIO  ('T', 4)
-#define SNDCTL_TMR_TEMPO		_SIOWR('T', 5, int)
-#define SNDCTL_TMR_SOURCE		_SIOWR('T', 6, int)
-#	define TMR_INTERNAL		0x00000001
-#	define TMR_EXTERNAL		0x00000002
-#		define TMR_MODE_MIDI	0x00000010
-#		define TMR_MODE_FSK	0x00000020
-#		define TMR_MODE_CLS	0x00000040
-#		define TMR_MODE_SMPTE	0x00000080
-#define SNDCTL_TMR_METRONOME		_SIOW ('T', 7, int)
-#define SNDCTL_TMR_SELECT		_SIOW ('T', 8, int)
-
-/*
- * Some big endian/little endian handling macros
- */
-
-#if defined(_AIX) || defined(AIX) || defined(sparc) || defined(__sparc__) || defined(HPPA) || defined(PPC)
-/* Big endian machines */
-#  define _PATCHKEY(id) (0xfd00|id)
-#  define AFMT_S16_NE AFMT_S16_BE
-#else
-#  define _PATCHKEY(id) ((id<<8)|0xfd)
-#  define AFMT_S16_NE AFMT_S16_LE
-#endif
-
-/*
- *	Sample loading mechanism for internal synthesizers (/dev/sequencer)
- *	The following patch_info structure has been designed to support
- *	Gravis UltraSound. It tries to be universal format for uploading
- *	sample based patches but is probably too limited.
- *
- *      (PBD) As Hannu guessed, the GUS structure is too limited for
- *      the WaveFront, but this is the right place for a constant definition.
- */
-
-struct patch_info {
-		unsigned short key;		/* Use WAVE_PATCH here */
-#define WAVE_PATCH	   _PATCHKEY(0x04)
-#define GUS_PATCH	   WAVE_PATCH
-#define WAVEFRONT_PATCH    _PATCHKEY(0x06)
-
-		short device_no;	/* Synthesizer number */
-		short instr_no;		/* Midi pgm# */
-
-		unsigned int mode;
-/*
- * The least significant byte has the same format than the GUS .PAT
- * files
- */
-#define WAVE_16_BITS	0x01	/* bit 0 = 8 or 16 bit wave data. */
-#define WAVE_UNSIGNED	0x02	/* bit 1 = Signed - Unsigned data. */
-#define WAVE_LOOPING	0x04	/* bit 2 = looping enabled-1. */
-#define WAVE_BIDIR_LOOP	0x08	/* bit 3 = Set is bidirectional looping. */
-#define WAVE_LOOP_BACK	0x10	/* bit 4 = Set is looping backward. */
-#define WAVE_SUSTAIN_ON	0x20	/* bit 5 = Turn sustaining on. (Env. pts. 3)*/
-#define WAVE_ENVELOPES	0x40	/* bit 6 = Enable envelopes - 1 */
-#define WAVE_FAST_RELEASE 0x80	/* bit 7 = Shut off immediately after note off */
-				/*	(use the env_rate/env_offs fields). */
-/* Linux specific bits */
-#define WAVE_VIBRATO	0x00010000	/* The vibrato info is valid */
-#define WAVE_TREMOLO	0x00020000	/* The tremolo info is valid */
-#define WAVE_SCALE	0x00040000	/* The scaling info is valid */
-#define WAVE_FRACTIONS	0x00080000	/* Fraction information is valid */
-/* Reserved bits */
-#define WAVE_ROM	0x40000000	/* For future use */
-#define WAVE_MULAW	0x20000000	/* For future use */
-/* Other bits must be zeroed */
-
-		int len;	/* Size of the wave data in bytes */
-		int loop_start, loop_end; /* Byte offsets from the beginning */
-
-/*
- * The base_freq and base_note fields are used when computing the
- * playback speed for a note. The base_note defines the tone frequency
- * which is heard if the sample is played using the base_freq as the
- * playback speed.
- *
- * The low_note and high_note fields define the minimum and maximum note
- * frequencies for which this sample is valid. It is possible to define
- * more than one samples for an instrument number at the same time. The
- * low_note and high_note fields are used to select the most suitable one.
- *
- * The fields base_note, high_note and low_note should contain
- * the note frequency multiplied by 1000. For example value for the
- * middle A is 440*1000.
- */
-
-		unsigned int base_freq;
-		unsigned int base_note;
-		unsigned int high_note;
-		unsigned int low_note;
-		int panning;	/* -128=left, 127=right */
-		int detuning;
-
-/*	New fields introduced in version 1.99.5	*/
-
-       /* Envelope. Enabled by mode bit WAVE_ENVELOPES	*/
-		unsigned char	env_rate[ 6 ];	 /* GUS HW ramping rate */
-		unsigned char	env_offset[ 6 ]; /* 255 == 100% */
-
-	/*
-	 * The tremolo, vibrato and scale info are not supported yet.
-	 * Enable by setting the mode bits WAVE_TREMOLO, WAVE_VIBRATO or
-	 * WAVE_SCALE
-	 */
-
-		unsigned char	tremolo_sweep;
-		unsigned char	tremolo_rate;
-		unsigned char	tremolo_depth;
-
-		unsigned char	vibrato_sweep;
-		unsigned char	vibrato_rate;
-		unsigned char	vibrato_depth;
-
-		int		scale_frequency;
-		unsigned int	scale_factor;		/* from 0 to 2048 or 0 to 2 */
-
-		int		volume;
-		int		fractions;
-		int		reserved1;
-		int		spare[2];
-		char data[1];	/* The waveform data starts here */
-	};
-
-struct sysex_info {
-		short key;		/* Use SYSEX_PATCH or MAUI_PATCH here */
-#define SYSEX_PATCH	_PATCHKEY(0x05)
-#define MAUI_PATCH	_PATCHKEY(0x06)
-		short device_no;	/* Synthesizer number */
-		int len;	/* Size of the sysex data in bytes */
-		unsigned char data[1];	/* Sysex data starts here */
-	};
-
-/*
- * /dev/sequencer input events.
- *
- * The data written to the /dev/sequencer is a stream of events. Events
- * are records of 4 or 8 bytes. The first byte defines the size.
- * Any number of events can be written with a write call. There
- * is a set of macros for sending these events. Use these macros if you
- * want to maximize portability of your program.
- *
- * Events SEQ_WAIT, SEQ_MIDIPUTC and SEQ_ECHO. Are also input events.
- * (All input events are currently 4 bytes long. Be prepared to support
- * 8 byte events also. If you receive any event having first byte >= 128,
- * it's a 8 byte event.
- *
- * The events are documented at the end of this file.
- *
- * Normal events (4 bytes)
- * There is also a 8 byte version of most of the 4 byte events. The
- * 8 byte one is recommended.
- */
-#define SEQ_NOTEOFF		0
-#define SEQ_FMNOTEOFF		SEQ_NOTEOFF	/* Just old name */
-#define SEQ_NOTEON		1
-#define	SEQ_FMNOTEON		SEQ_NOTEON
-#define SEQ_WAIT		TMR_WAIT_ABS
-#define SEQ_PGMCHANGE		3
-#define SEQ_FMPGMCHANGE		SEQ_PGMCHANGE
-#define SEQ_SYNCTIMER		TMR_START
-#define SEQ_MIDIPUTC		5
-#define SEQ_DRUMON		6	/*** OBSOLETE ***/
-#define SEQ_DRUMOFF		7	/*** OBSOLETE ***/
-#define SEQ_ECHO		TMR_ECHO	/* For synching programs with output */
-#define SEQ_AFTERTOUCH		9
-#define SEQ_CONTROLLER		10
-
-/*******************************************
- *	Midi controller numbers
- *******************************************
- * Controllers 0 to 31 (0x00 to 0x1f) and
- * 32 to 63 (0x20 to 0x3f) are continuous
- * controllers.
- * In the MIDI 1.0 these controllers are sent using
- * two messages. Controller numbers 0 to 31 are used
- * to send the MSB and the controller numbers 32 to 63
- * are for the LSB. Note that just 7 bits are used in MIDI bytes.
- */
-
-#define	   CTL_BANK_SELECT		0x00
-#define	   CTL_MODWHEEL			0x01
-#define    CTL_BREATH			0x02
-/*		undefined		0x03 */
-#define    CTL_FOOT			0x04
-#define    CTL_PORTAMENTO_TIME		0x05
-#define    CTL_DATA_ENTRY		0x06
-#define    CTL_MAIN_VOLUME		0x07
-#define    CTL_BALANCE			0x08
-/*		undefined		0x09 */
-#define    CTL_PAN			0x0a
-#define    CTL_EXPRESSION		0x0b
-/*		undefined		0x0c */
-/*		undefined		0x0d */
-/*		undefined		0x0e */
-/*		undefined		0x0f */
-#define    CTL_GENERAL_PURPOSE1	0x10
-#define    CTL_GENERAL_PURPOSE2	0x11
-#define    CTL_GENERAL_PURPOSE3	0x12
-#define    CTL_GENERAL_PURPOSE4	0x13
-/*		undefined		0x14 - 0x1f */
-
-/*		undefined		0x20 */
-/* The controller numbers 0x21 to 0x3f are reserved for the */
-/* least significant bytes of the controllers 0x00 to 0x1f. */
-/* These controllers are not recognised by the driver. */
-
-/* Controllers 64 to 69 (0x40 to 0x45) are on/off switches. */
-/* 0=OFF and 127=ON (intermediate values are possible) */
-#define    CTL_DAMPER_PEDAL		0x40
-#define    CTL_SUSTAIN			0x40	/* Alias */
-#define    CTL_HOLD			0x40	/* Alias */
-#define    CTL_PORTAMENTO		0x41
-#define    CTL_SOSTENUTO		0x42
-#define    CTL_SOFT_PEDAL		0x43
-/*		undefined		0x44 */
-#define    CTL_HOLD2			0x45
-/*		undefined		0x46 - 0x4f */
-
-#define    CTL_GENERAL_PURPOSE5	0x50
-#define    CTL_GENERAL_PURPOSE6	0x51
-#define    CTL_GENERAL_PURPOSE7	0x52
-#define    CTL_GENERAL_PURPOSE8	0x53
-/*		undefined		0x54 - 0x5a */
-#define    CTL_EXT_EFF_DEPTH		0x5b
-#define    CTL_TREMOLO_DEPTH		0x5c
-#define    CTL_CHORUS_DEPTH		0x5d
-#define    CTL_DETUNE_DEPTH		0x5e
-#define    CTL_CELESTE_DEPTH		0x5e	/* Alias for the above one */
-#define    CTL_PHASER_DEPTH		0x5f
-#define    CTL_DATA_INCREMENT		0x60
-#define    CTL_DATA_DECREMENT		0x61
-#define    CTL_NONREG_PARM_NUM_LSB	0x62
-#define    CTL_NONREG_PARM_NUM_MSB	0x63
-#define    CTL_REGIST_PARM_NUM_LSB	0x64
-#define    CTL_REGIST_PARM_NUM_MSB	0x65
-/*		undefined		0x66 - 0x78 */
-/*		reserved		0x79 - 0x7f */
-
-/* Pseudo controllers (not midi compatible) */
-#define    CTRL_PITCH_BENDER		255
-#define    CTRL_PITCH_BENDER_RANGE	254
-#define    CTRL_EXPRESSION		253	/* Obsolete */
-#define    CTRL_MAIN_VOLUME		252	/* Obsolete */
-#define SEQ_BALANCE		11
-#define SEQ_VOLMODE		12
-
-/*
- * Volume mode decides how volumes are used
- */
-
-#define VOL_METHOD_ADAGIO	1
-#define VOL_METHOD_LINEAR	2
-
-/*
- * Note! SEQ_WAIT, SEQ_MIDIPUTC and SEQ_ECHO are used also as
- *	 input events.
- */
-
-/*
- * Event codes 0xf0 to 0xfc are reserved for future extensions.
- */
-
-#define SEQ_FULLSIZE		0xfd	/* Long events */
-/*
- *	SEQ_FULLSIZE events are used for loading patches/samples to the
- *	synthesizer devices. These events are passed directly to the driver
- *	of the associated synthesizer device. There is no limit to the size
- *	of the extended events. These events are not queued but executed
- *	immediately when the write() is called (execution can take several
- *	seconds of time).
- *
- *	When a SEQ_FULLSIZE message is written to the device, it must
- *	be written using exactly one write() call. Other events cannot
- *	be mixed to the same write.
- *
- *	For FM synths (YM3812/OPL3) use struct sbi_instrument and write it to the
- *	/dev/sequencer. Don't write other data together with the instrument structure
- *	Set the key field of the structure to FM_PATCH. The device field is used to
- *	route the patch to the corresponding device.
- *
- *	For wave table use struct patch_info. Initialize the key field
- *      to WAVE_PATCH.
- */
-#define SEQ_PRIVATE		0xfe	/* Low level HW dependent events (8 bytes) */
-#define SEQ_EXTENDED		0xff	/* Extended events (8 bytes) OBSOLETE */
-
-/*
- * Record for FM patches
- */
-
-typedef unsigned char sbi_instr_data[32];
-
-struct sbi_instrument {
-		unsigned short	key;	/* FM_PATCH or OPL3_PATCH */
-#define FM_PATCH	_PATCHKEY(0x01)
-#define OPL3_PATCH	_PATCHKEY(0x03)
-		short		device;		/*	Synth# (0-4)	*/
-		int		channel;	/*	Program# to be initialized	*/
-		sbi_instr_data	operators;	/*	Register settings for operator cells (.SBI format)	*/
-	};
-
-struct synth_info {	/* Read only */
-		char	name[30];
-		int	device;		/* 0-N. INITIALIZE BEFORE CALLING */
-		int	synth_type;
-#define SYNTH_TYPE_FM			0
-#define SYNTH_TYPE_SAMPLE		1
-#define SYNTH_TYPE_MIDI			2	/* Midi interface */
-
-		int	synth_subtype;
-#define FM_TYPE_ADLIB			0x00
-#define FM_TYPE_OPL3			0x01
-#define MIDI_TYPE_MPU401		0x401
-
-#define SAMPLE_TYPE_BASIC		0x10
-#define SAMPLE_TYPE_GUS			SAMPLE_TYPE_BASIC
-#define SAMPLE_TYPE_WAVEFRONT		0x11
-
-		int	perc_mode;	/* No longer supported */
-		int	nr_voices;
-		int	nr_drums;	/* Obsolete field */
-		int	instr_bank_size;
-		unsigned int	capabilities;
-#define SYNTH_CAP_PERCMODE		0x00000001 /* No longer used */
-#define SYNTH_CAP_OPL3			0x00000002 /* Set if OPL3 supported */
-#define SYNTH_CAP_INPUT			0x00000004 /* Input (MIDI) device */
-		int	dummies[19];	/* Reserve space */
-	};
-
-struct sound_timer_info {
-		char name[32];
-		int caps;
-	};
-
-#define MIDI_CAP_MPU401		1		/* MPU-401 intelligent mode */
-
-struct midi_info {
-		char		name[30];
-		int		device;		/* 0-N. INITIALIZE BEFORE CALLING */
-		unsigned int	capabilities;	/* To be defined later */
-		int		dev_type;
-		int		dummies[18];	/* Reserve space */
-	};
-
-/********************************************
- * ioctl commands for the /dev/midi##
- */
-typedef struct {
-		unsigned char cmd;
-		char nr_args, nr_returns;
-		unsigned char data[30];
-	} mpu_command_rec;
-
-#define SNDCTL_MIDI_PRETIME		_SIOWR('m', 0, int)
-#define SNDCTL_MIDI_MPUMODE		_SIOWR('m', 1, int)
-#define SNDCTL_MIDI_MPUCMD		_SIOWR('m', 2, mpu_command_rec)
-
-/********************************************
- * IOCTL commands for /dev/dsp and /dev/audio
- */
-
-#define SNDCTL_DSP_RESET		_SIO  ('P', 0)
-#define SNDCTL_DSP_SYNC			_SIO  ('P', 1)
-#define SNDCTL_DSP_SPEED		_SIOWR('P', 2, int)
-#define SNDCTL_DSP_STEREO		_SIOWR('P', 3, int)
-#define SNDCTL_DSP_GETBLKSIZE		_SIOWR('P', 4, int)
-#define SNDCTL_DSP_SAMPLESIZE		SNDCTL_DSP_SETFMT
-#define SNDCTL_DSP_CHANNELS		_SIOWR('P', 6, int)
-#define SOUND_PCM_WRITE_CHANNELS	SNDCTL_DSP_CHANNELS
-#define SOUND_PCM_WRITE_FILTER		_SIOWR('P', 7, int)
-#define SNDCTL_DSP_POST			_SIO  ('P', 8)
-#define SNDCTL_DSP_SUBDIVIDE		_SIOWR('P', 9, int)
-#define SNDCTL_DSP_SETFRAGMENT		_SIOWR('P',10, int)
-
-/*	Audio data formats (Note! U8=8 and S16_LE=16 for compatibility) */
-#define SNDCTL_DSP_GETFMTS		_SIOR ('P',11, int) /* Returns a mask */
-#define SNDCTL_DSP_SETFMT		_SIOWR('P',5, int) /* Selects ONE fmt*/
-#	define AFMT_QUERY		0x00000000	/* Return current fmt */
-#	define AFMT_MU_LAW		0x00000001
-#	define AFMT_A_LAW		0x00000002
-#	define AFMT_IMA_ADPCM		0x00000004
-#	define AFMT_U8			0x00000008
-#	define AFMT_S16_LE		0x00000010	/* Little endian signed 16*/
-#	define AFMT_S16_BE		0x00000020	/* Big endian signed 16 */
-#	define AFMT_S8			0x00000040
-#	define AFMT_U16_LE		0x00000080	/* Little endian U16 */
-#	define AFMT_U16_BE		0x00000100	/* Big endian U16 */
-#	define AFMT_MPEG		0x00000200	/* MPEG (2) audio */
-#	define AFMT_AC3		0x00000400	/* Dolby Digital AC3 */
-
-/*
- * Buffer status queries.
- */
-typedef struct audio_buf_info {
-			int fragments;	/* # of available fragments (partially usend ones not counted) */
-			int fragstotal;	/* Total # of fragments allocated */
-			int fragsize;	/* Size of a fragment in bytes */
-
-			int bytes;	/* Available space in bytes (includes partially used fragments) */
-			/* Note! 'bytes' could be more than fragments*fragsize */
-		} audio_buf_info;
-
-#define SNDCTL_DSP_GETOSPACE		_SIOR ('P',12, audio_buf_info)
-#define SNDCTL_DSP_GETISPACE		_SIOR ('P',13, audio_buf_info)
-#define SNDCTL_DSP_NONBLOCK		_SIO  ('P',14)
-#define SNDCTL_DSP_GETCAPS		_SIOR ('P',15, int)
-#	define DSP_CAP_REVISION		0x000000ff	/* Bits for revision level (0 to 255) */
-#	define DSP_CAP_DUPLEX		0x00000100	/* Full duplex record/playback */
-#	define DSP_CAP_REALTIME		0x00000200	/* Real time capability */
-#	define DSP_CAP_BATCH		0x00000400	/* Device has some kind of */
-							/* internal buffers which may */
-							/* cause some delays and */
-							/* decrease precision of timing */
-#	define DSP_CAP_COPROC		0x00000800	/* Has a coprocessor */
-							/* Sometimes it's a DSP */
-							/* but usually not */
-#	define DSP_CAP_TRIGGER		0x00001000	/* Supports SETTRIGGER */
-#	define DSP_CAP_MMAP		0x00002000	/* Supports mmap() */
-#	define DSP_CAP_MULTI		0x00004000	/* support multiple open */
-#	define DSP_CAP_BIND		0x00008000	/* channel binding to front/rear/cneter/lfe */
-
-
-#define SNDCTL_DSP_GETTRIGGER		_SIOR ('P',16, int)
-#define SNDCTL_DSP_SETTRIGGER		_SIOW ('P',16, int)
-#	define PCM_ENABLE_INPUT		0x00000001
-#	define PCM_ENABLE_OUTPUT		0x00000002
-
-typedef struct count_info {
-		int bytes;	/* Total # of bytes processed */
-		int blocks;	/* # of fragment transitions since last time */
-		int ptr;	/* Current DMA pointer value */
-	} count_info;
-
-#define SNDCTL_DSP_GETIPTR		_SIOR ('P',17, count_info)
-#define SNDCTL_DSP_GETOPTR		_SIOR ('P',18, count_info)
-
-typedef struct buffmem_desc {
-		unsigned *buffer;
-		int size;
-	} buffmem_desc;
-#define SNDCTL_DSP_MAPINBUF		_SIOR ('P', 19, buffmem_desc)
-#define SNDCTL_DSP_MAPOUTBUF		_SIOR ('P', 20, buffmem_desc)
-#define SNDCTL_DSP_SETSYNCRO		_SIO  ('P', 21)
-#define SNDCTL_DSP_SETDUPLEX		_SIO  ('P', 22)
-#define SNDCTL_DSP_GETODELAY		_SIOR ('P', 23, int)
-
-#define SNDCTL_DSP_GETCHANNELMASK		_SIOWR('P', 64, int)
-#define SNDCTL_DSP_BIND_CHANNEL		_SIOWR('P', 65, int)
-#	define DSP_BIND_QUERY		0x00000000
-#	define DSP_BIND_FRONT		0x00000001
-#	define DSP_BIND_SURR		0x00000002
-#	define DSP_BIND_CENTER_LFE	0x00000004
-#	define DSP_BIND_HANDSET		0x00000008
-#	define DSP_BIND_MIC		0x00000010
-#	define DSP_BIND_MODEM1		0x00000020
-#	define DSP_BIND_MODEM2		0x00000040
-#	define DSP_BIND_I2S		0x00000080
-#	define DSP_BIND_SPDIF		0x00000100
-
-/*
- * Application's profile defines the way how playback underrun situations should be handled.
- *
- *	APF_NORMAL (the default) and APF_NETWORK make the driver to cleanup the
- *	playback buffer whenever an underrun occurs. This consumes some time
- *	prevents looping the existing buffer.
- *	APF_CPUINTENS is intended to be set by CPU intensive applications which
- *	are likely to run out of time occasionally. In this mode the buffer cleanup is
- *	disabled which saves CPU time but also let's the previous buffer content to
- *	be played during the "pause" after the underrun.
- */
-#define SNDCTL_DSP_PROFILE		_SIOW ('P', 23, int)
-#define	  APF_NORMAL	0	/* Normal applications */
-#define	  APF_NETWORK	1	/* Underruns probably caused by an "external" delay */
-#define   APF_CPUINTENS 2	/* Underruns probably caused by "overheating" the CPU */
-
-#define SOUND_PCM_READ_RATE		_SIOR ('P', 2, int)
-#define SOUND_PCM_READ_CHANNELS		_SIOR ('P', 6, int)
-#define SOUND_PCM_READ_BITS		_SIOR ('P', 5, int)
-#define SOUND_PCM_READ_FILTER		_SIOR ('P', 7, int)
-
-/* Some alias names */
-#define SOUND_PCM_WRITE_BITS		SNDCTL_DSP_SETFMT
-#define SOUND_PCM_WRITE_RATE		SNDCTL_DSP_SPEED
-#define SOUND_PCM_POST			SNDCTL_DSP_POST
-#define SOUND_PCM_RESET			SNDCTL_DSP_RESET
-#define SOUND_PCM_SYNC			SNDCTL_DSP_SYNC
-#define SOUND_PCM_SUBDIVIDE		SNDCTL_DSP_SUBDIVIDE
-#define SOUND_PCM_SETFRAGMENT		SNDCTL_DSP_SETFRAGMENT
-#define SOUND_PCM_GETFMTS		SNDCTL_DSP_GETFMTS
-#define SOUND_PCM_SETFMT		SNDCTL_DSP_SETFMT
-#define SOUND_PCM_GETOSPACE		SNDCTL_DSP_GETOSPACE
-#define SOUND_PCM_GETISPACE		SNDCTL_DSP_GETISPACE
-#define SOUND_PCM_NONBLOCK		SNDCTL_DSP_NONBLOCK
-#define SOUND_PCM_GETCAPS		SNDCTL_DSP_GETCAPS
-#define SOUND_PCM_GETTRIGGER		SNDCTL_DSP_GETTRIGGER
-#define SOUND_PCM_SETTRIGGER		SNDCTL_DSP_SETTRIGGER
-#define SOUND_PCM_SETSYNCRO		SNDCTL_DSP_SETSYNCRO
-#define SOUND_PCM_GETIPTR		SNDCTL_DSP_GETIPTR
-#define SOUND_PCM_GETOPTR		SNDCTL_DSP_GETOPTR
-#define SOUND_PCM_MAPINBUF		SNDCTL_DSP_MAPINBUF
-#define SOUND_PCM_MAPOUTBUF		SNDCTL_DSP_MAPOUTBUF
-
-/*
- * ioctl calls to be used in communication with coprocessors and
- * DSP chips.
- */
-
-typedef struct copr_buffer {
-		int command;	/* Set to 0 if not used */
-		int flags;
-#define CPF_NONE		0x0000
-#define CPF_FIRST		0x0001	/* First block */
-#define CPF_LAST		0x0002	/* Last block */
-		int len;
-		int offs;	/* If required by the device (0 if not used) */
-
-		unsigned char data[4000]; /* NOTE! 4000 is not 4k */
-	} copr_buffer;
-
-typedef struct copr_debug_buf {
-		int command;	/* Used internally. Set to 0 */
-		int parm1;
-		int parm2;
-		int flags;
-		int len;	/* Length of data in bytes */
-	} copr_debug_buf;
-
-typedef struct copr_msg {
-		int len;
-		unsigned char data[4000];
-	} copr_msg;
-
-#define SNDCTL_COPR_RESET	      _SIO  ('C',  0)
-#define SNDCTL_COPR_LOAD	      _SIOWR('C',  1, copr_buffer)
-#define SNDCTL_COPR_RDATA	      _SIOWR('C',  2, copr_debug_buf)
-#define SNDCTL_COPR_RCODE	      _SIOWR('C',  3, copr_debug_buf)
-#define SNDCTL_COPR_WDATA	      _SIOW ('C',  4, copr_debug_buf)
-#define SNDCTL_COPR_WCODE	      _SIOW ('C',  5, copr_debug_buf)
-#define SNDCTL_COPR_RUN		      _SIOWR('C',  6, copr_debug_buf)
-#define SNDCTL_COPR_HALT	      _SIOWR('C',  7, copr_debug_buf)
-#define SNDCTL_COPR_SENDMSG	      _SIOWR('C',  8, copr_msg)
-#define SNDCTL_COPR_RCVMSG	      _SIOR ('C',  9, copr_msg)
-
-/*********************************************
- * IOCTL commands for /dev/mixer
- */
-
-/*
- * Mixer devices
- *
- * There can be up to 20 different analog mixer channels. The
- * SOUND_MIXER_NRDEVICES gives the currently supported maximum.
- * The SOUND_MIXER_READ_DEVMASK returns a bitmask which tells
- * the devices supported by the particular mixer.
- */
-
-#define SOUND_MIXER_NRDEVICES	25
-#define SOUND_MIXER_VOLUME	0
-#define SOUND_MIXER_BASS	1
-#define SOUND_MIXER_TREBLE	2
-#define SOUND_MIXER_SYNTH	3
-#define SOUND_MIXER_PCM		4
-#define SOUND_MIXER_SPEAKER	5
-#define SOUND_MIXER_LINE	6
-#define SOUND_MIXER_MIC		7
-#define SOUND_MIXER_CD		8
-#define SOUND_MIXER_IMIX	9	/*  Recording monitor  */
-#define SOUND_MIXER_ALTPCM	10
-#define SOUND_MIXER_RECLEV	11	/* Recording level */
-#define SOUND_MIXER_IGAIN	12	/* Input gain */
-#define SOUND_MIXER_OGAIN	13	/* Output gain */
-/*
- * The AD1848 codec and compatibles have three line level inputs
- * (line, aux1 and aux2). Since each card manufacturer have assigned
- * different meanings to these inputs, it's inpractical to assign
- * specific meanings (line, cd, synth etc.) to them.
- */
-#define SOUND_MIXER_LINE1	14	/* Input source 1  (aux1) */
-#define SOUND_MIXER_LINE2	15	/* Input source 2  (aux2) */
-#define SOUND_MIXER_LINE3	16	/* Input source 3  (line) */
-#define SOUND_MIXER_DIGITAL1	17	/* Digital (input) 1 */
-#define SOUND_MIXER_DIGITAL2	18	/* Digital (input) 2 */
-#define SOUND_MIXER_DIGITAL3	19	/* Digital (input) 3 */
-#define SOUND_MIXER_PHONEIN	20	/* Phone input */
-#define SOUND_MIXER_PHONEOUT	21	/* Phone output */
-#define SOUND_MIXER_VIDEO	22	/* Video/TV (audio) in */
-#define SOUND_MIXER_RADIO	23	/* Radio in */
-#define SOUND_MIXER_MONITOR	24	/* Monitor (usually mic) volume */
-
-/* Some on/off settings (SOUND_SPECIAL_MIN - SOUND_SPECIAL_MAX) */
-/* Not counted to SOUND_MIXER_NRDEVICES, but use the same number space */
-#define SOUND_ONOFF_MIN		28
-#define SOUND_ONOFF_MAX		30
-
-/* Note!	Number 31 cannot be used since the sign bit is reserved */
-#define SOUND_MIXER_NONE	31
-
-/*
- * The following unsupported macros are no longer functional.
- * Use SOUND_MIXER_PRIVATE# macros in future.
- */
-#define SOUND_MIXER_ENHANCE	SOUND_MIXER_NONE
-#define SOUND_MIXER_MUTE	SOUND_MIXER_NONE
-#define SOUND_MIXER_LOUD	SOUND_MIXER_NONE
-
-
-#define SOUND_DEVICE_LABELS	{"Vol  ", "Bass ", "Trebl", "Synth", "Pcm  ", "Spkr ", "Line ", \
-				 "Mic  ", "CD   ", "Mix  ", "Pcm2 ", "Rec  ", "IGain", "OGain", \
-				 "Line1", "Line2", "Line3", "Digital1", "Digital2", "Digital3", \
-				 "PhoneIn", "PhoneOut", "Video", "Radio", "Monitor"}
-
-#define SOUND_DEVICE_NAMES	{"vol", "bass", "treble", "synth", "pcm", "speaker", "line", \
-				 "mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", \
-				 "line1", "line2", "line3", "dig1", "dig2", "dig3", \
-				 "phin", "phout", "video", "radio", "monitor"}
-
-/*	Device bitmask identifiers	*/
-
-#define SOUND_MIXER_RECSRC	0xff	/* Arg contains a bit for each recording source */
-#define SOUND_MIXER_DEVMASK	0xfe	/* Arg contains a bit for each supported device */
-#define SOUND_MIXER_RECMASK	0xfd	/* Arg contains a bit for each supported recording source */
-#define SOUND_MIXER_CAPS	0xfc
-#	define SOUND_CAP_EXCL_INPUT	0x00000001	/* Only one recording source at a time */
-#define SOUND_MIXER_STEREODEVS	0xfb	/* Mixer channels supporting stereo */
-#define SOUND_MIXER_OUTSRC	0xfa	/* Arg contains a bit for each input source to output */
-#define SOUND_MIXER_OUTMASK	0xf9	/* Arg contains a bit for each supported input source to output */
-
-/*	Device mask bits	*/
-
-#define SOUND_MASK_VOLUME	(1 << SOUND_MIXER_VOLUME)
-#define SOUND_MASK_BASS		(1 << SOUND_MIXER_BASS)
-#define SOUND_MASK_TREBLE	(1 << SOUND_MIXER_TREBLE)
-#define SOUND_MASK_SYNTH	(1 << SOUND_MIXER_SYNTH)
-#define SOUND_MASK_PCM		(1 << SOUND_MIXER_PCM)
-#define SOUND_MASK_SPEAKER	(1 << SOUND_MIXER_SPEAKER)
-#define SOUND_MASK_LINE		(1 << SOUND_MIXER_LINE)
-#define SOUND_MASK_MIC		(1 << SOUND_MIXER_MIC)
-#define SOUND_MASK_CD		(1 << SOUND_MIXER_CD)
-#define SOUND_MASK_IMIX		(1 << SOUND_MIXER_IMIX)
-#define SOUND_MASK_ALTPCM	(1 << SOUND_MIXER_ALTPCM)
-#define SOUND_MASK_RECLEV	(1 << SOUND_MIXER_RECLEV)
-#define SOUND_MASK_IGAIN	(1 << SOUND_MIXER_IGAIN)
-#define SOUND_MASK_OGAIN	(1 << SOUND_MIXER_OGAIN)
-#define SOUND_MASK_LINE1	(1 << SOUND_MIXER_LINE1)
-#define SOUND_MASK_LINE2	(1 << SOUND_MIXER_LINE2)
-#define SOUND_MASK_LINE3	(1 << SOUND_MIXER_LINE3)
-#define SOUND_MASK_DIGITAL1	(1 << SOUND_MIXER_DIGITAL1)
-#define SOUND_MASK_DIGITAL2	(1 << SOUND_MIXER_DIGITAL2)
-#define SOUND_MASK_DIGITAL3	(1 << SOUND_MIXER_DIGITAL3)
-#define SOUND_MASK_PHONEIN	(1 << SOUND_MIXER_PHONEIN)
-#define SOUND_MASK_PHONEOUT	(1 << SOUND_MIXER_PHONEOUT)
-#define SOUND_MASK_RADIO	(1 << SOUND_MIXER_RADIO)
-#define SOUND_MASK_VIDEO	(1 << SOUND_MIXER_VIDEO)
-#define SOUND_MASK_MONITOR	(1 << SOUND_MIXER_MONITOR)
-
-/* Obsolete macros */
-#define SOUND_MASK_MUTE		(1 << SOUND_MIXER_MUTE)
-#define SOUND_MASK_ENHANCE	(1 << SOUND_MIXER_ENHANCE)
-#define SOUND_MASK_LOUD		(1 << SOUND_MIXER_LOUD)
-
-#define MIXER_READ(dev)		_SIOR('M', dev, int)
-#define SOUND_MIXER_READ_VOLUME		MIXER_READ(SOUND_MIXER_VOLUME)
-#define SOUND_MIXER_READ_BASS		MIXER_READ(SOUND_MIXER_BASS)
-#define SOUND_MIXER_READ_TREBLE		MIXER_READ(SOUND_MIXER_TREBLE)
-#define SOUND_MIXER_READ_SYNTH		MIXER_READ(SOUND_MIXER_SYNTH)
-#define SOUND_MIXER_READ_PCM		MIXER_READ(SOUND_MIXER_PCM)
-#define SOUND_MIXER_READ_SPEAKER	MIXER_READ(SOUND_MIXER_SPEAKER)
-#define SOUND_MIXER_READ_LINE		MIXER_READ(SOUND_MIXER_LINE)
-#define SOUND_MIXER_READ_MIC		MIXER_READ(SOUND_MIXER_MIC)
-#define SOUND_MIXER_READ_CD		MIXER_READ(SOUND_MIXER_CD)
-#define SOUND_MIXER_READ_IMIX		MIXER_READ(SOUND_MIXER_IMIX)
-#define SOUND_MIXER_READ_ALTPCM		MIXER_READ(SOUND_MIXER_ALTPCM)
-#define SOUND_MIXER_READ_RECLEV		MIXER_READ(SOUND_MIXER_RECLEV)
-#define SOUND_MIXER_READ_IGAIN		MIXER_READ(SOUND_MIXER_IGAIN)
-#define SOUND_MIXER_READ_OGAIN		MIXER_READ(SOUND_MIXER_OGAIN)
-#define SOUND_MIXER_READ_LINE1		MIXER_READ(SOUND_MIXER_LINE1)
-#define SOUND_MIXER_READ_LINE2		MIXER_READ(SOUND_MIXER_LINE2)
-#define SOUND_MIXER_READ_LINE3		MIXER_READ(SOUND_MIXER_LINE3)
-
-/* Obsolete macros */
-#define SOUND_MIXER_READ_MUTE		MIXER_READ(SOUND_MIXER_MUTE)
-#define SOUND_MIXER_READ_ENHANCE	MIXER_READ(SOUND_MIXER_ENHANCE)
-#define SOUND_MIXER_READ_LOUD		MIXER_READ(SOUND_MIXER_LOUD)
-
-#define SOUND_MIXER_READ_RECSRC		MIXER_READ(SOUND_MIXER_RECSRC)
-#define SOUND_MIXER_READ_DEVMASK	MIXER_READ(SOUND_MIXER_DEVMASK)
-#define SOUND_MIXER_READ_RECMASK	MIXER_READ(SOUND_MIXER_RECMASK)
-#define SOUND_MIXER_READ_STEREODEVS	MIXER_READ(SOUND_MIXER_STEREODEVS)
-#define SOUND_MIXER_READ_CAPS		MIXER_READ(SOUND_MIXER_CAPS)
-
-#define MIXER_WRITE(dev)		_SIOWR('M', dev, int)
-#define SOUND_MIXER_WRITE_VOLUME	MIXER_WRITE(SOUND_MIXER_VOLUME)
-#define SOUND_MIXER_WRITE_BASS		MIXER_WRITE(SOUND_MIXER_BASS)
-#define SOUND_MIXER_WRITE_TREBLE	MIXER_WRITE(SOUND_MIXER_TREBLE)
-#define SOUND_MIXER_WRITE_SYNTH		MIXER_WRITE(SOUND_MIXER_SYNTH)
-#define SOUND_MIXER_WRITE_PCM		MIXER_WRITE(SOUND_MIXER_PCM)
-#define SOUND_MIXER_WRITE_SPEAKER	MIXER_WRITE(SOUND_MIXER_SPEAKER)
-#define SOUND_MIXER_WRITE_LINE		MIXER_WRITE(SOUND_MIXER_LINE)
-#define SOUND_MIXER_WRITE_MIC		MIXER_WRITE(SOUND_MIXER_MIC)
-#define SOUND_MIXER_WRITE_CD		MIXER_WRITE(SOUND_MIXER_CD)
-#define SOUND_MIXER_WRITE_IMIX		MIXER_WRITE(SOUND_MIXER_IMIX)
-#define SOUND_MIXER_WRITE_ALTPCM	MIXER_WRITE(SOUND_MIXER_ALTPCM)
-#define SOUND_MIXER_WRITE_RECLEV	MIXER_WRITE(SOUND_MIXER_RECLEV)
-#define SOUND_MIXER_WRITE_IGAIN		MIXER_WRITE(SOUND_MIXER_IGAIN)
-#define SOUND_MIXER_WRITE_OGAIN		MIXER_WRITE(SOUND_MIXER_OGAIN)
-#define SOUND_MIXER_WRITE_LINE1		MIXER_WRITE(SOUND_MIXER_LINE1)
-#define SOUND_MIXER_WRITE_LINE2		MIXER_WRITE(SOUND_MIXER_LINE2)
-#define SOUND_MIXER_WRITE_LINE3		MIXER_WRITE(SOUND_MIXER_LINE3)
-
-/* Obsolete macros */
-#define SOUND_MIXER_WRITE_MUTE		MIXER_WRITE(SOUND_MIXER_MUTE)
-#define SOUND_MIXER_WRITE_ENHANCE	MIXER_WRITE(SOUND_MIXER_ENHANCE)
-#define SOUND_MIXER_WRITE_LOUD		MIXER_WRITE(SOUND_MIXER_LOUD)
-
-#define SOUND_MIXER_WRITE_RECSRC	MIXER_WRITE(SOUND_MIXER_RECSRC)
-
-typedef struct mixer_info
-{
-  char id[16];
-  char name[32];
-  int  modify_counter;
-  int fillers[10];
-} mixer_info;
-
-typedef struct _old_mixer_info /* Obsolete */
-{
-  char id[16];
-  char name[32];
-} _old_mixer_info;
-
-#define SOUND_MIXER_INFO		_SIOR ('M', 101, mixer_info)
-#define SOUND_OLD_MIXER_INFO		_SIOR ('M', 101, _old_mixer_info)
-
-/*
- * A mechanism for accessing "proprietary" mixer features. This method
- * permits passing 128 bytes of arbitrary data between a mixer application
- * and the mixer driver. Interpretation of the record is defined by
- * the particular mixer driver.
- */
-typedef unsigned char mixer_record[128];
-
-#define SOUND_MIXER_ACCESS		_SIOWR('M', 102, mixer_record)
-
-/*
- * Two ioctls for special souncard function
- */
-#define SOUND_MIXER_AGC  _SIOWR('M', 103, int)
-#define SOUND_MIXER_3DSE  _SIOWR('M', 104, int)
-
-/*
- * The SOUND_MIXER_PRIVATE# commands can be redefined by low level drivers.
- * These features can be used when accessing device specific features.
- */
-#define SOUND_MIXER_PRIVATE1		_SIOWR('M', 111, int)
-#define SOUND_MIXER_PRIVATE2		_SIOWR('M', 112, int)
-#define SOUND_MIXER_PRIVATE3		_SIOWR('M', 113, int)
-#define SOUND_MIXER_PRIVATE4		_SIOWR('M', 114, int)
-#define SOUND_MIXER_PRIVATE5		_SIOWR('M', 115, int)
-
-/*
- * SOUND_MIXER_GETLEVELS and SOUND_MIXER_SETLEVELS calls can be used
- * for querying current mixer settings from the driver and for loading
- * default volume settings _prior_ activating the mixer (loading
- * doesn't affect current state of the mixer hardware). These calls
- * are for internal use only.
- */
-
-typedef struct mixer_vol_table {
-  int num;	/* Index to volume table */
-  char name[32];
-  int levels[32];
-} mixer_vol_table;
-
-#define SOUND_MIXER_GETLEVELS		_SIOWR('M', 116, mixer_vol_table)
-#define SOUND_MIXER_SETLEVELS		_SIOWR('M', 117, mixer_vol_table)
-
-/*
- * An ioctl for identifying the driver version. It will return value
- * of the SOUND_VERSION macro used when compiling the driver.
- * This call was introduced in OSS version 3.6 and it will not work
- * with earlier versions (returns EINVAL).
- */
-#define OSS_GETVERSION			_SIOR ('M', 118, int)
-
-/*
- * Level 2 event types for /dev/sequencer
- */
-
-/*
- * The 4 most significant bits of byte 0 specify the class of
- * the event:
- *
- *	0x8X = system level events,
- *	0x9X = device/port specific events, event[1] = device/port,
- *		The last 4 bits give the subtype:
- *			0x02	= Channel event (event[3] = chn).
- *			0x01	= note event (event[4] = note).
- *			(0x01 is not used alone but always with bit 0x02).
- *	       event[2] = MIDI message code (0x80=note off etc.)
- *
- */
-
-#define EV_SEQ_LOCAL		0x80
-#define EV_TIMING		0x81
-#define EV_CHN_COMMON		0x92
-#define EV_CHN_VOICE		0x93
-#define EV_SYSEX		0x94
-/*
- * Event types 200 to 220 are reserved for application use.
- * These numbers will not be used by the driver.
- */
-
-/*
- * Events for event type EV_CHN_VOICE
- */
-
-#define MIDI_NOTEOFF		0x80
-#define MIDI_NOTEON		0x90
-#define MIDI_KEY_PRESSURE	0xA0
-
-/*
- * Events for event type EV_CHN_COMMON
- */
-
-#define MIDI_CTL_CHANGE		0xB0
-#define MIDI_PGM_CHANGE		0xC0
-#define MIDI_CHN_PRESSURE	0xD0
-#define MIDI_PITCH_BEND		0xE0
-
-#define MIDI_SYSTEM_PREFIX	0xF0
-
-/*
- * Timer event types
- */
-#define TMR_WAIT_REL		1	/* Time relative to the prev time */
-#define TMR_WAIT_ABS		2	/* Absolute time since TMR_START */
-#define TMR_STOP		3
-#define TMR_START		4
-#define TMR_CONTINUE		5
-#define TMR_TEMPO		6
-#define TMR_ECHO		8
-#define TMR_CLOCK		9	/* MIDI clock */
-#define TMR_SPP			10	/* Song position pointer */
-#define TMR_TIMESIG		11	/* Time signature */
-
-/*
- *	Local event types
- */
-#define LOCL_STARTAUDIO		1
-
-#if (!defined(__KERNEL__) && !defined(KERNEL) && !defined(INKERNEL) && !defined(_KERNEL)) || defined(USE_SEQ_MACROS)
-/*
- *	Some convenience macros to simplify programming of the
- *	/dev/sequencer interface
- *
- *	These macros define the API which should be used when possible.
- */
-#define SEQ_DECLAREBUF()		SEQ_USE_EXTBUF()
-
-void seqbuf_dump(void);	/* This function must be provided by programs */
-
-extern int OSS_init(int seqfd, int buflen);
-extern void OSS_seqbuf_dump(int fd, unsigned char *buf, int buflen);
-extern void OSS_seq_advbuf(int len, int fd, unsigned char *buf, int buflen);
-extern void OSS_seq_needbuf(int len, int fd, unsigned char *buf, int buflen);
-extern void OSS_patch_caching(int dev, int chn, int patch,
-			      int fd, unsigned char *buf, int buflen);
-extern void OSS_drum_caching(int dev, int chn, int patch,
-			      int fd, unsigned char *buf, int buflen);
-extern void OSS_write_patch(int fd, unsigned char *buf, int len);
-extern int OSS_write_patch2(int fd, unsigned char *buf, int len);
-
-#define SEQ_PM_DEFINES int __foo_bar___
-#ifdef OSSLIB
-#  define SEQ_USE_EXTBUF() \
-		extern unsigned char *_seqbuf; \
-		extern int _seqbuflen;extern int _seqbufptr
-#  define SEQ_DEFINEBUF(len) SEQ_USE_EXTBUF();static int _requested_seqbuflen=len
-#  define _SEQ_ADVBUF(len) OSS_seq_advbuf(len, seqfd, _seqbuf, _seqbuflen)
-#  define _SEQ_NEEDBUF(len) OSS_seq_needbuf(len, seqfd, _seqbuf, _seqbuflen)
-#  define SEQ_DUMPBUF() OSS_seqbuf_dump(seqfd, _seqbuf, _seqbuflen)
-
-#  define SEQ_LOAD_GMINSTR(dev, instr) \
-		OSS_patch_caching(dev, -1, instr, seqfd, _seqbuf, _seqbuflen)
-#  define SEQ_LOAD_GMDRUM(dev, drum) \
-		OSS_drum_caching(dev, -1, drum, seqfd, _seqbuf, _seqbuflen)
-#else /* !OSSLIB */
-
-#  define SEQ_LOAD_GMINSTR(dev, instr)
-#  define SEQ_LOAD_GMDRUM(dev, drum)
-
-#  define SEQ_USE_EXTBUF() \
-		extern unsigned char _seqbuf[]; \
-		extern int _seqbuflen;extern int _seqbufptr
-
-#ifndef USE_SIMPLE_MACROS
-/* Sample seqbuf_dump() implementation:
- *
- *	SEQ_DEFINEBUF (2048);	-- Defines a buffer for 2048 bytes
- *
- *	int seqfd;		-- The file descriptor for /dev/sequencer.
- *
- *	void
- *	seqbuf_dump ()
- *	{
- *	  if (_seqbufptr)
- *	    if (write (seqfd, _seqbuf, _seqbufptr) == -1)
- *	      {
- *		perror ("write /dev/sequencer");
- *		exit (-1);
- *	      }
- *	  _seqbufptr = 0;
- *	}
- */
-
-#define SEQ_DEFINEBUF(len)		unsigned char _seqbuf[len]; int _seqbuflen = len;int _seqbufptr = 0
-#define _SEQ_NEEDBUF(len)		if ((_seqbufptr+(len)) > _seqbuflen) seqbuf_dump()
-#define _SEQ_ADVBUF(len)		_seqbufptr += len
-#define SEQ_DUMPBUF			seqbuf_dump
-#else
-/*
- * This variation of the sequencer macros is used just to format one event
- * using fixed buffer.
- *
- * The program using the macro library must define the following macros before
- * using this library.
- *
- * #define _seqbuf		 name of the buffer (unsigned char[])
- * #define _SEQ_ADVBUF(len)	 If the applic needs to know the exact
- *				 size of the event, this macro can be used.
- *				 Otherwise this must be defined as empty.
- * #define _seqbufptr		 Define the name of index variable or 0 if
- *				 not required.
- */
-#define _SEQ_NEEDBUF(len)	/* empty */
-#endif
-#endif /* !OSSLIB */
-
-#define SEQ_VOLUME_MODE(dev, mode)	{_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr] = SEQ_EXTENDED;\
-					_seqbuf[_seqbufptr+1] = SEQ_VOLMODE;\
-					_seqbuf[_seqbufptr+2] = (dev);\
-					_seqbuf[_seqbufptr+3] = (mode);\
-					_seqbuf[_seqbufptr+4] = 0;\
-					_seqbuf[_seqbufptr+5] = 0;\
-					_seqbuf[_seqbufptr+6] = 0;\
-					_seqbuf[_seqbufptr+7] = 0;\
-					_SEQ_ADVBUF(8);}
-
-/*
- * Midi voice messages
- */
-
-#define _CHN_VOICE(dev, event, chn, note, parm) \
-					{_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr] = EV_CHN_VOICE;\
-					_seqbuf[_seqbufptr+1] = (dev);\
-					_seqbuf[_seqbufptr+2] = (event);\
-					_seqbuf[_seqbufptr+3] = (chn);\
-					_seqbuf[_seqbufptr+4] = (note);\
-					_seqbuf[_seqbufptr+5] = (parm);\
-					_seqbuf[_seqbufptr+6] = (0);\
-					_seqbuf[_seqbufptr+7] = 0;\
-					_SEQ_ADVBUF(8);}
-
-#define SEQ_START_NOTE(dev, chn, note, vol) \
-		_CHN_VOICE(dev, MIDI_NOTEON, chn, note, vol)
-
-#define SEQ_STOP_NOTE(dev, chn, note, vol) \
-		_CHN_VOICE(dev, MIDI_NOTEOFF, chn, note, vol)
-
-#define SEQ_KEY_PRESSURE(dev, chn, note, pressure) \
-		_CHN_VOICE(dev, MIDI_KEY_PRESSURE, chn, note, pressure)
-
-/*
- * Midi channel messages
- */
-
-#define _CHN_COMMON(dev, event, chn, p1, p2, w14) \
-					{_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr] = EV_CHN_COMMON;\
-					_seqbuf[_seqbufptr+1] = (dev);\
-					_seqbuf[_seqbufptr+2] = (event);\
-					_seqbuf[_seqbufptr+3] = (chn);\
-					_seqbuf[_seqbufptr+4] = (p1);\
-					_seqbuf[_seqbufptr+5] = (p2);\
-					*(short *)&_seqbuf[_seqbufptr+6] = (w14);\
-					_SEQ_ADVBUF(8);}
-/*
- * SEQ_SYSEX permits sending of sysex messages. (It may look that it permits
- * sending any MIDI bytes but it's absolutely not possible. Trying to do
- * so _will_ cause problems with MPU401 intelligent mode).
- *
- * Sysex messages are sent in blocks of 1 to 6 bytes. Longer messages must be
- * sent by calling SEQ_SYSEX() several times (there must be no other events
- * between them). First sysex fragment must have 0xf0 in the first byte
- * and the last byte (buf[len-1] of the last fragment must be 0xf7. No byte
- * between these sysex start and end markers cannot be larger than 0x7f. Also
- * lengths of each fragments (except the last one) must be 6.
- *
- * Breaking the above rules may work with some MIDI ports but is likely to
- * cause fatal problems with some other devices (such as MPU401).
- */
-#define SEQ_SYSEX(dev, buf, len) \
-					{int ii, ll=(len); \
-					 unsigned char *bufp=buf;\
-					 if (ll>6)ll=6;\
-					_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr] = EV_SYSEX;\
-					_seqbuf[_seqbufptr+1] = (dev);\
-					for(ii=0;ii<ll;ii++)\
-					   _seqbuf[_seqbufptr+ii+2] = bufp[ii];\
-					for(ii=ll;ii<6;ii++)\
-					   _seqbuf[_seqbufptr+ii+2] = 0xff;\
-					_SEQ_ADVBUF(8);}
-
-#define SEQ_CHN_PRESSURE(dev, chn, pressure) \
-		_CHN_COMMON(dev, MIDI_CHN_PRESSURE, chn, pressure, 0, 0)
-
-#define SEQ_SET_PATCH SEQ_PGM_CHANGE
-#ifdef OSSLIB
-#   define SEQ_PGM_CHANGE(dev, chn, patch) \
-		{OSS_patch_caching(dev, chn, patch, seqfd, _seqbuf, _seqbuflen); \
-		 _CHN_COMMON(dev, MIDI_PGM_CHANGE, chn, patch, 0, 0);}
-#else
-#   define SEQ_PGM_CHANGE(dev, chn, patch) \
-		_CHN_COMMON(dev, MIDI_PGM_CHANGE, chn, patch, 0, 0)
-#endif
-
-#define SEQ_CONTROL(dev, chn, controller, value) \
-		_CHN_COMMON(dev, MIDI_CTL_CHANGE, chn, controller, 0, value)
-
-#define SEQ_BENDER(dev, chn, value) \
-		_CHN_COMMON(dev, MIDI_PITCH_BEND, chn, 0, 0, value)
-
-
-#define SEQ_V2_X_CONTROL(dev, voice, controller, value)	{_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr] = SEQ_EXTENDED;\
-					_seqbuf[_seqbufptr+1] = SEQ_CONTROLLER;\
-					_seqbuf[_seqbufptr+2] = (dev);\
-					_seqbuf[_seqbufptr+3] = (voice);\
-					_seqbuf[_seqbufptr+4] = (controller);\
-					_seqbuf[_seqbufptr+5] = ((value)&0xff);\
-					_seqbuf[_seqbufptr+6] = ((value>>8)&0xff);\
-					_seqbuf[_seqbufptr+7] = 0;\
-					_SEQ_ADVBUF(8);}
-/*
- * The following 5 macros are incorrectly implemented and obsolete.
- * Use SEQ_BENDER and SEQ_CONTROL (with proper controller) instead.
- */
-#define SEQ_PITCHBEND(dev, voice, value) SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER, value)
-#define SEQ_BENDER_RANGE(dev, voice, value) SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER_RANGE, value)
-#define SEQ_EXPRESSION(dev, voice, value) SEQ_CONTROL(dev, voice, CTL_EXPRESSION, value*128)
-#define SEQ_MAIN_VOLUME(dev, voice, value) SEQ_CONTROL(dev, voice, CTL_MAIN_VOLUME, (value*16383)/100)
-#define SEQ_PANNING(dev, voice, pos) SEQ_CONTROL(dev, voice, CTL_PAN, (pos+128) / 2)
-
-/*
- * Timing and syncronization macros
- */
-
-#define _TIMER_EVENT(ev, parm)		{_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr+0] = EV_TIMING; \
-					_seqbuf[_seqbufptr+1] = (ev); \
-					_seqbuf[_seqbufptr+2] = 0;\
-					_seqbuf[_seqbufptr+3] = 0;\
-					*(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
-					_SEQ_ADVBUF(8);}
-
-#define SEQ_START_TIMER()		_TIMER_EVENT(TMR_START, 0)
-#define SEQ_STOP_TIMER()		_TIMER_EVENT(TMR_STOP, 0)
-#define SEQ_CONTINUE_TIMER()		_TIMER_EVENT(TMR_CONTINUE, 0)
-#define SEQ_WAIT_TIME(ticks)		_TIMER_EVENT(TMR_WAIT_ABS, ticks)
-#define SEQ_DELTA_TIME(ticks)		_TIMER_EVENT(TMR_WAIT_REL, ticks)
-#define SEQ_ECHO_BACK(key)		_TIMER_EVENT(TMR_ECHO, key)
-#define SEQ_SET_TEMPO(value)		_TIMER_EVENT(TMR_TEMPO, value)
-#define SEQ_SONGPOS(pos)		_TIMER_EVENT(TMR_SPP, pos)
-#define SEQ_TIME_SIGNATURE(sig)		_TIMER_EVENT(TMR_TIMESIG, sig)
-
-/*
- * Local control events
- */
-
-#define _LOCAL_EVENT(ev, parm)		{_SEQ_NEEDBUF(8);\
-					_seqbuf[_seqbufptr+0] = EV_SEQ_LOCAL; \
-					_seqbuf[_seqbufptr+1] = (ev); \
-					_seqbuf[_seqbufptr+2] = 0;\
-					_seqbuf[_seqbufptr+3] = 0;\
-					*(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
-					_SEQ_ADVBUF(8);}
-
-#define SEQ_PLAYAUDIO(devmask)		_LOCAL_EVENT(LOCL_STARTAUDIO, devmask)
-/*
- * Events for the level 1 interface only
- */
-
-#define SEQ_MIDIOUT(device, byte)	{_SEQ_NEEDBUF(4);\
-					_seqbuf[_seqbufptr] = SEQ_MIDIPUTC;\
-					_seqbuf[_seqbufptr+1] = (byte);\
-					_seqbuf[_seqbufptr+2] = (device);\
-					_seqbuf[_seqbufptr+3] = 0;\
-					_SEQ_ADVBUF(4);}
-
-/*
- * Patch loading.
- */
-#ifdef OSSLIB
-#   define SEQ_WRPATCH(patchx, len) \
-		OSS_write_patch(seqfd, (char*)(patchx), len)
-#   define SEQ_WRPATCH2(patchx, len) \
-		OSS_write_patch2(seqfd, (char*)(patchx), len)
-#else
-#   define SEQ_WRPATCH(patchx, len) \
-		{if (_seqbufptr) SEQ_DUMPBUF();\
-		 if (write(seqfd, (char*)(patchx), len)==-1) \
-		    perror("Write patch: /dev/sequencer");}
-#   define SEQ_WRPATCH2(patchx, len) \
-		(SEQ_DUMPBUF(), write(seqfd, (char*)(patchx), len))
-#endif
-
-#endif
-#endif
diff --git a/winsup/cygwin/include/sys/statfs.h b/winsup/cygwin/include/sys/statfs.h
deleted file mode 100644
index 51ad3c6b1..000000000
--- a/winsup/cygwin/include/sys/statfs.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* sys/statfs.h
-
-   Copyright 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <sys/vfs.h>
diff --git a/winsup/cygwin/include/sys/strace.h b/winsup/cygwin/include/sys/strace.h
deleted file mode 100644
index 7d69b8401..000000000
--- a/winsup/cygwin/include/sys/strace.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/* sys/strace.h
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* sys/strace.h */
-
-/* This file contains routines for tracing system calls and other internal
-   phenomenon.
-
-   When tracing system calls, try to use the same style throughout:
-
-   result = syscall (arg1, arg2, arg3) [optional extra stuff]
-
-   If a system call can block (eg: read, write, wait), print another message
-   before hanging so the user will know why the program has stopped.
-
-   Note: __seterrno will also print a trace message.  Have that printed
-   *first*.  This will make it easy to always know what __seterrno is
-   refering to.  For the same reason, try not to have __seterrno messages
-   printed alone.
-*/
-
-#ifndef _SYS_STRACE_H
-#define _SYS_STRACE_H
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-
-class strace
-{
-  int vsprntf (char *buf, const char *func, const char *infmt, va_list ap);
-  void write (unsigned category, const char *buf, int count);
-public:
-  int microseconds ();
-  int version;
-  int active;
-  int lmicrosec;
-  int execing;
-  int inited;
-  void hello ();
-  void prntf (unsigned, const char *func, const char *, ...) /*__attribute__ ((regparm(3)))*/;
-  void vprntf (unsigned, const char *func, const char *, va_list ap) /*__attribute__ ((regparm(3)))*/;
-  void wm (int message, int word, int lon) __attribute__ ((regparm(3)));
-};
-
-extern strace strace;
-
-#endif /* __cplusplus */
-
-#define _STRACE_INTERFACE_ACTIVATE_ADDR  -1
-#define _STRACE_INTERFACE_ACTIVATE_ADDR1 -2
-
-/* Bitmasks of tracing messages to print.  */
-
-#define _STRACE_ALL	 0x00001 // so behaviour of strace=1 is unchanged
-#define _STRACE_FLUSH	 0x00002 // flush output buffer after every message
-#define _STRACE_INHERIT  0x00004 // children inherit mask from parent
-#define _STRACE_UHOH	 0x00008 // unusual or weird phenomenon
-#define _STRACE_SYSCALL	 0x00010 // system calls
-#define _STRACE_STARTUP	 0x00020 // argc/envp printout at startup
-#define _STRACE_DEBUG    0x00040 // info to help debugging
-#define _STRACE_PARANOID 0x00080 // paranoid info
-#define _STRACE_TERMIOS	 0x00100 // info for debugging termios stuff
-#define _STRACE_SELECT	 0x00200 // info on ugly select internals
-#define _STRACE_WM	 0x00400 // trace windows messages (enable _strace_wm)
-#define _STRACE_SIGP	 0x00800 // trace signal and process handling
-#define _STRACE_MINIMAL	 0x01000 // very minimal strace output
-#define _STRACE_EXITDUMP 0x04000 // dump strace cache on exit
-#define _STRACE_SYSTEM	 0x08000 // cache strace messages
-#define _STRACE_NOMUTEX	 0x10000 // don't use mutex for synchronization
-#define _STRACE_MALLOC	 0x20000 // trace malloc calls
-#define _STRACE_THREAD	 0x40000 // thread-locking calls
-#define _STRACE_NOTALL	 0x80000 // don't include if _STRACE_ALL
-#if defined (DEBUGGING)
-# define _STRACE_ON strace.active = 1;
-# define _STRACE_OFF strace.active = 0;
-#else
-# define _STRACE_ON
-# define _STRACE_OFF
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void small_printf (const char *, ...);
-void strace_printf (unsigned, const char *func, const char *, ...);
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-
-#ifdef NOSTRACE
-#define define_strace(c, f)
-#define define_strace1(c, f)
-#else
-#ifdef NEW_MACRO_VARARGS
-/* Output message to strace log */
-
-#define define_strace0(c,...) \
-  do { \
-      if ((c & _STRACE_SYSTEM) || strace.active) \
-	strace.prntf (c, __PRETTY_FUNCTION__, __VA_ARGS__); \
-    } \
-  while (0)
-
-#define define_strace(c, ...) define_strace0 (_STRACE_ ## c, __VA_ARGS__)
-#define define_strace1(c, ...) define_strace0 ((_STRACE_ ## c | _STRACE_NOTALL), __VA_ARGS__)
-
-#define debug_printf(...)	define_strace (DEBUG, __VA_ARGS__)
-#define paranoid_printf(...)	define_strace (PARANOID, __VA_ARGS__)
-#define select_printf(...)	define_strace (SELECT, __VA_ARGS__)
-#define sigproc_printf(...)	define_strace (SIGP, __VA_ARGS__)
-#define syscall_printf(...)	define_strace (SYSCALL, __VA_ARGS__)
-#define system_printf(...)	define_strace (SYSTEM, __VA_ARGS__)
-#define termios_printf(...)	define_strace (TERMIOS, __VA_ARGS__)
-#define wm_printf(...)		define_strace (WM, __VA_ARGS__)
-#define minimal_printf(...)	define_strace1 (MINIMAL, __VA_ARGS__)
-#define malloc_printf(...)	define_strace1 (MALLOC, __VA_ARGS__)
-#define thread_printf(...)	define_strace1 (THREAD, __VA_ARGS__)
-#else
-#define strace_printf_wrap(what, fmt, args...) \
-   ((void) ({\
-	if ((_STRACE_ ## what & _STRACE_SYSTEM) || strace.active) \
-	  strace.prntf(_STRACE_ ## what, __PRETTY_FUNCTION__, fmt, ## args); \
-	0; \
-    }))
-#define strace_printf_wrap1(what, fmt, args...) \
-    ((void) ({\
-	if ((_STRACE_ ## what & _STRACE_SYSTEM) || strace.active) \
-	  strace.prntf((_STRACE_ ## what) | _STRACE_NOTALL, __PRETTY_FUNCTION__, fmt, ## args); \
-	0; \
-    }))
-
-#define debug_printf(fmt, args...) strace_printf_wrap(DEBUG, fmt , ## args)
-#define paranoid_printf(fmt, args...) strace_printf_wrap1(PARANOID, fmt , ## args)
-#define select_printf(fmt, args...) strace_printf_wrap(SELECT, fmt , ## args)
-#define sigproc_printf(fmt, args...) strace_printf_wrap(SIGP, fmt , ## args)
-#define syscall_printf(fmt, args...) strace_printf_wrap(SYSCALL, fmt , ## args)
-#define system_printf(fmt, args...) strace_printf_wrap(SYSTEM, fmt , ## args)
-#define termios_printf(fmt, args...) strace_printf_wrap(TERMIOS, fmt , ## args)
-#define wm_printf(fmt, args...) strace_printf_wrap(WM, fmt , ## args)
-#define minimal_printf(fmt, args...) strace_printf_wrap1(MINIMAL, fmt , ## args)
-#define malloc_printf(fmt, args...) strace_printf_wrap1(MALLOC, fmt , ## args)
-#define thread_printf(fmt, args...) strace_printf_wrap1(THREAD, fmt , ## args)
-#endif /*NEW_MACRO_VARARGS*/
-#endif /*NOSTRACE*/
-#endif /* __cplusplus */
-#endif /* _SYS_STRACE_H */
diff --git a/winsup/cygwin/include/sys/syslog.h b/winsup/cygwin/include/sys/syslog.h
deleted file mode 100644
index a37b042d7..000000000
--- a/winsup/cygwin/include/sys/syslog.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* sys/syslog.h
-
-   Copyright 1996, 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_LOG_H
-#define	_SYS_LOG_H
-
-#include <sys/cdefs.h>
-#include <stdarg.h>
-
-#define	LOG_EMERG	0
-#define	LOG_ALERT	1
-#define	LOG_CRIT	2
-#define	LOG_ERR		3
-#define	LOG_WARNING	4
-#define	LOG_NOTICE	5
-#define	LOG_INFO	6
-#define	LOG_DEBUG	7
-
-#define	LOG_PRIMASK	0x07
-
-#define	LOG_PRI(p)	((p) & LOG_PRIMASK)
-#define	LOG_MAKEPRI(fac, pri)	(((fac) << 3) | (pri))
-
-#define	LOG_KERN	(0<<3)
-#define	LOG_USER	(1<<3)
-#define	LOG_MAIL	(2<<3)
-#define	LOG_DAEMON	(3<<3)
-#define	LOG_AUTH	(4<<3)
-#define	LOG_SYSLOG	(5<<3)
-#define	LOG_LPR		(6<<3)
-#define	LOG_NEWS	(7<<3)
-#define	LOG_UUCP	(8<<3)
-#define	LOG_CRON	(9<<3)
-#define	LOG_AUTHPRIV	(10<<3)
-#define LOG_FTP		(11<<3)
-
-/* Codes through 15 are reserved for system use */
-#define LOG_LOCAL0	(16<<3)
-#define LOG_LOCAL1	(17<<3)
-#define LOG_LOCAL2	(18<<3)
-#define LOG_LOCAL3	(19<<3)
-#define LOG_LOCAL4	(20<<3)
-#define LOG_LOCAL5	(21<<3)
-#define LOG_LOCAL6	(22<<3)
-#define LOG_LOCAL7	(23<<3)
-
-#define	LOG_NFACILITIES	24
-#define	LOG_FACMASK	0x03f8
-#define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
-
-#define	LOG_MASK(pri)	(1 << (pri))
-#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)
-
-/*
- * Option flags for openlog.
- *
- * LOG_ODELAY no longer does anything.
- * LOG_NDELAY is the inverse of what it used to be.
- */
-#define LOG_PID         0x01    /* log the pid with each message */
-#define LOG_CONS        0x02    /* log on the console if errors in sending */
-#define LOG_ODELAY      0x04    /* delay open until first syslog() (default) */
-#define LOG_NDELAY      0x08    /* don't delay open */
-#define LOG_NOWAIT      0x10    /* don't wait for console forks: DEPRECATED */
-#define LOG_PERROR      0x20    /* log to stderr as well */
-
-__BEGIN_DECLS
-
-
-void	closelog (void);
-void	openlog (const char *, int, int);
-int	setlogmask (int);
-void	syslog (int, const char *, ...);
-void	vsyslog (int, const char *, va_list ap);
-
-__END_DECLS
-
-
-#endif /* _SYS_LOG_H */
diff --git a/winsup/cygwin/include/sys/sysmacros.h b/winsup/cygwin/include/sys/sysmacros.h
deleted file mode 100644
index 2c9c69923..000000000
--- a/winsup/cygwin/include/sys/sysmacros.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* sys/sysmacros.h
-
-   Copyright 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_SYSMACROS_H
-#define _SYS_SYSMACROS_H
-
-#ifdef __CYGWIN_USE_BIG_TYPES__
-#define major(dev) ((int)(((dev) >> 16) & 0xffff))
-#define minor(dev) ((int)((dev) & 0xffff))
-#define makedev(major, minor) (((major) << 16) | ((minor) & 0xffff))
-#else
-#define major(dev) ((int)(((dev) >> 8) & 0xff))
-#define minor(dev) ((int)((dev) & 0xff))
-#define makedev(major, minor) (((major) << 8) | ((minor) & 0xff))
-#endif
-
-#endif /* _SYS_SYSMACROS_H */
diff --git a/winsup/cygwin/include/sys/sysproto.h b/winsup/cygwin/include/sys/sysproto.h
deleted file mode 100644
index 488782b89..000000000
--- a/winsup/cygwin/include/sys/sysproto.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* sys/sysproto.h
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* sys/sysproto.h header file for Cygwin.  */
-
-#ifndef _SYS_SYSPROTO_H
-#define _SYS_SYSPROTO_H
-
-#include <cygwin/sysproto.h>
-
-#endif /* _SYS_SYSPROTO_H */
diff --git a/winsup/cygwin/include/sys/termio.h b/winsup/cygwin/include/sys/termio.h
deleted file mode 100644
index 87f2eb461..000000000
--- a/winsup/cygwin/include/sys/termio.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* sys/termio.h
-
-   Copyright 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <sys/termios.h>
-
diff --git a/winsup/cygwin/include/sys/termios.h b/winsup/cygwin/include/sys/termios.h
deleted file mode 100644
index 0d381270e..000000000
--- a/winsup/cygwin/include/sys/termios.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/* sys/termios.h
-
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* sys/termios.h */
-
-#ifndef	_SYS_TERMIOS_H
-#define _SYS_TERMIOS_H
-
-#define	TIOCMGET	0x5415
-#define	TIOCMSET	0x5418
-#define	TIOCINQ		0x541B	
-
-/* TIOCINQ is utilized instead of FIONREAD which has been
-accupied for other purposes under CYGWIN.
-Other UNIX ioctl requests has been omited because
-effects of their work one can achive by standard
-POSIX commands */
-
-
-#define	TIOCM_DTR	0x002
-#define	TIOCM_RTS	0x004
-#define	TIOCM_CTS	0x020
-#define	TIOCM_CAR	0x040
-#define	TIOCM_RNG	0x080
-#define	TIOCM_DSR	0x100
-#define	TIOCM_CD	TIOCM_CAR
-#define	TIOCM_RI	TIOCM_RNG
-
-#define TCOOFF		0
-#define TCOON		1
-#define TCIOFF		2
-#define TCION		3
-
-#define TCGETA	5
-#define TCSETA	6
-#define TCSETAW		7
-#define TCSETAF		8
-
-#define TCIFLUSH	0
-#define TCOFLUSH	1
-#define TCIOFLUSH	2
-#define TCFLSH          3
-
-#define TCSAFLUSH	1
-#define TCSANOW		2
-#define TCSADRAIN	3
-#define TCSADFLUSH	4
-
-#define TIOCPKT		6
-
-#define TIOCPKT_DATA		 0
-#define TIOCPKT_FLUSHREAD	 1
-#define TIOCPKT_FLUSHWRITE	 2
-#define TIOCPKT_STOP		 4
-#define TIOCPKT_START		 8
-#define TIOCPKT_NOSTOP		16
-#define TIOCPKT_DOSTOP		32
-
-#define FIONBIO 0x8004667e /* To be compatible with socket version */
-
-#define CTRL(ch)	((ch)&0x1F)
-
-#define CNUL	0
-#define CDEL	0x0007f
-#define CESC	'\\'
-#define CINTR	CTRL('C')
-#define CQUIT	0x0001c
-#define CERASE	CTRL('H')
-#define CKILL	CTRL('U')
-#define CEOT	CTRL('D')
-#define CEOL	0
-#define CEOL2	0
-#define CEOF	CTRL('D')
-#define CSTART	CTRL('Q')
-#define CSTOP	CTRL('S')
-#define CSWTCH	0x0001a
-#define NSWTCH	0
-#define CSUSP	CTRL('Z')
-#define CDSUSP	CTRL('Y')
-#define CRPRNT	CTRL('R')
-#define CFLUSH	CTRL('O')
-#define CWERASE	CTRL('W')
-#define CLNEXT	CTRL('V')
-
-/* iflag bits */
-#define IGNBRK	0x00001
-#define BRKINT	0x00002
-#define IGNPAR	0x00004
-#define IMAXBEL	0x00008
-#define INPCK	0x00010
-#define ISTRIP	0x00020
-#define INLCR	0x00040
-#define IGNCR	0x00080
-#define ICRNL	0x00100
-#define IXON	0x00400
-#define IXOFF	0x01000
-#define IUCLC	0x04000
-#define IXANY	0x08000
-#define PARMRK	0x10000
-
-/* oflag bits */
-
-#define OPOST	0x00001
-#define OLCUC	0x00002
-#define OCRNL	0x00004
-#define ONLCR	0x00008
-#define ONOCR	0x00010
-#define ONLRET	0x00020
-#define OFILL	0x00040
-#define CRDLY	0x00180
-#define CR0	0x00000
-#define CR1	0x00080
-#define CR2	0x00100
-#define CR3	0x00180
-#define NLDLY	0x00200
-#define NL0	0x00000
-#define NL1	0x00200
-#define BSDLY	0x00400
-#define BS0	0x00000
-#define BS1	0x00400
-#define TABDLY	0x01800
-#define TAB0	0x00000
-#define TAB1	0x00800
-#define TAB2	0x01000
-#define TAB3	0x01800
-#define XTABS	0x01800
-#define VTDLY	0x02000
-#define VT0	0x00000
-#define VT1	0x02000
-#define FFDLY	0x04000
-#define FF0	0x00000
-#define FF1	0x04000
-#define OFDEL	0x08000
-
-/* cflag bits */
-
-/* Baud rate values.  These must fit in speed_t, which is unsigned
-   char.  See also the extended baud rates below.  These baud rates
-   set an additional bit. */
-#define CBAUD	 0x0100f
-#define B0	 0x00000
-#define B50	 0x00001
-#define B75	 0x00002
-#define B110	 0x00003
-#define B134	 0x00004
-#define B150	 0x00005
-#define B200	 0x00006
-#define B300	 0x00007
-#define B600	 0x00008
-#define B1200	 0x00009
-#define B1800	 0x0000a
-#define B2400	 0x0000b
-#define B4800	 0x0000c
-#define B9600	 0x0000d
-#define B19200	 0x0000e
-#define B38400	 0x0000f
-
-#define CSIZE	 0x00030
-#define CS5	 0x00000
-#define CS6	 0x00010
-#define CS7	 0x00020
-#define CS8	 0x00030
-#define CSTOPB	 0x00040
-#define CREAD	 0x00080
-#define PARENB	 0x00100
-#define PARODD	 0x00200
-#define HUPCL	 0x00400
-#define CLOCAL	 0x00800
-#define CBAUDEX	 0x0100f
-#define B57600	 0x01001
-#define B115200	 0x01002
-#define B128000	 0x01003
-#define B230400  0x01004
-#define B256000	 0x01005
-#define CRTSXOFF 0x04000
-#define CRTSCTS	 0x08000
-
-/* lflag bits */
-#define ISIG	0x0001
-#define ICANON	0x0002
-#define ECHO	0x0004
-#define ECHOE	0x0008
-#define ECHOK	0x0010
-#define ECHONL	0x0020
-#define NOFLSH	0x0040
-#define TOSTOP	0x0080
-#define IEXTEN	0x0100
-#define FLUSHO	0x0200
-#define ECHOKE	0x0400
-#define ECHOCTL	0x0800
-
-#define VDISCARD	1
-#define VEOL		2
-#define VEOL2		3
-#define VEOF		4
-#define VERASE		5
-#define VINTR		6
-#define VKILL		7
-#define VLNEXT		8
-#define VMIN		9
-#define VQUIT		10
-#define VREPRINT	11
-#define VSTART		12
-#define VSTOP		13
-#define VSUSP		14
-#define VSWTC		15
-#define VTIME		16
-#define VWERASE	17
-
-#define NCCS		18
-
-/* `c_cc' member of 'struct termios' structure can be disabled by
-   using the value _POSIX_VDISABLE.  */
-#define	_POSIX_VDISABLE	'\0'
-
-/* Compare a character C to a value VAL from the `c_cc' array in a
-   `struct termios'.  If VAL is _POSIX_VDISABLE, no character can match it.  */
-#define CCEQ(val, c)	((c) == (val) && (val) != _POSIX_VDISABLE)
-
-typedef unsigned char cc_t;
-typedef unsigned int  tcflag_t;
-typedef unsigned int  speed_t;
-typedef unsigned short otcflag_t;
-typedef unsigned char ospeed_t;
-
-struct __oldtermios {
-	otcflag_t	c_iflag;
-	otcflag_t	c_oflag;
-	otcflag_t	c_cflag;
-	otcflag_t	c_lflag;
-	char		c_line;
-	cc_t		c_cc[NCCS];
-	ospeed_t	c_ispeed;
-	ospeed_t	c_ospeed;
-};
-
-struct termios {
-	tcflag_t	c_iflag;
-	tcflag_t	c_oflag;
-	tcflag_t	c_cflag;
-	tcflag_t	c_lflag;
-	char		c_line;
-	cc_t		c_cc[NCCS];
-	speed_t		c_ispeed;
-	speed_t		c_ospeed;
-};
-
-#ifdef CYGWIN_VERSION_DLL_IS_OLD_TERMIOS
-#ifdef __GNUC__
-# define __tonew_termios(ti) \
-  ({ \
-    struct termios *__newti; \
-   \
-    if (!CYGWIN_VERSION_DLL_IS_OLD_TERMIOS) \
-      __newti = (struct termios *) ti; \
-    else \
-      { \
-	__newti = (struct termios *) alloca(sizeof(struct termios)); \
-	__newti->c_iflag = ((struct __oldtermios *)ti)->c_iflag; \
-	__newti->c_oflag = ((struct __oldtermios *)ti)->c_oflag; \
-	__newti->c_cflag = ((struct __oldtermios *)ti)->c_cflag; \
-	__newti->c_lflag = ((struct __oldtermios *)ti)->c_lflag; \
-	__newti->c_line = ((struct __oldtermios *)ti)->c_line; \
-	__newti->c_ispeed = ((struct __oldtermios *)ti)->c_ispeed; \
-	__newti->c_ospeed = ((struct __oldtermios *)ti)->c_ospeed; \
-	memcpy (__newti->c_cc, ((struct __oldtermios *)ti)->c_cc, sizeof(__newti->c_cc)); \
-      } \
-    __newti; \
-  })
-
-# define __makenew_termios(ti) \
-  (CYGWIN_VERSION_DLL_IS_OLD_TERMIOS ? \
-   (struct termios *) alloca (sizeof (struct termios)) : (ti))
-
-# define __toapp_termios(toti, fromti) \
-  ({ \
-    if (!CYGWIN_VERSION_DLL_IS_OLD_TERMIOS) \
-      toti = fromti; \
-    else \
-      { \
-	((struct __oldtermios *)toti)->c_iflag = fromti->c_iflag; \
-	((struct __oldtermios *)toti)->c_oflag = fromti->c_oflag; \
-	((struct __oldtermios *)toti)->c_cflag = fromti->c_cflag; \
-	((struct __oldtermios *)toti)->c_lflag = fromti->c_lflag; \
-	((struct __oldtermios *)toti)->c_line = fromti->c_line; \
-	((struct __oldtermios *)toti)->c_ispeed = fromti->c_ispeed; \
-	((struct __oldtermios *)toti)->c_ospeed = fromti->c_ospeed; \
-	memcpy (((struct __oldtermios*)toti)->c_cc, fromti->c_cc, sizeof(fromti->c_cc)); \
-      } \
-    toti; \
-  })
-#endif /*__GNUC__*/
-#endif
-
-#define termio termios
-
-#define cfgetospeed(tp)		((tp)->c_ospeed)
-#define cfgetispeed(tp)		((tp)->c_ispeed)
-#define cfsetospeed(tp,s)	(((tp)->c_ospeed = (s)), 0)
-#define cfsetispeed(tp,s)	(((tp)->c_ispeed = (s)), 0)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int tcgetattr (int, struct termios *);
-int tcsetattr (int, int, const struct termios *);
-int tcsendbreak (int, int);
-int tcdrain (int);
-int tcflush (int, int);
-int tcflow (int, int);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Extra stuff to make porting stuff easier.  */
-struct winsize
-{
-  unsigned short ws_row, ws_col;
-  unsigned short ws_xpixel, ws_ypixel;
-};
-
-#define TIOCGWINSZ (('T' << 8) | 1)
-#define TIOCSWINSZ (('T' << 8) | 2)
-#define TIOCLINUX  (('T' << 8) | 3)
-
-#endif	/* _SYS_TERMIOS_H */
diff --git a/winsup/cygwin/include/sys/ttychars.h b/winsup/cygwin/include/sys/ttychars.h
deleted file mode 100644
index 2d313646f..000000000
--- a/winsup/cygwin/include/sys/ttychars.h
+++ /dev/null
@@ -1 +0,0 @@
-/* ttychars.h */
diff --git a/winsup/cygwin/include/sys/uio.h b/winsup/cygwin/include/sys/uio.h
deleted file mode 100644
index e28f14e7e..000000000
--- a/winsup/cygwin/include/sys/uio.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* sys/uio.h
-
-   Copyright 1996, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _UIO_H_
-#define _UIO_H_
-
-/* For size_t */
-#include <stddef.h>
-/* For ssize_t */
-#include <sys/types.h>
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-/*
- * Define the uio buffers used for writev, readv.
- */
-
-struct iovec
-{
-  void *iov_base;
-  size_t iov_len;
-};
-
-extern ssize_t readv __P ((int filedes, const struct iovec *vector, int count));
-extern ssize_t writev __P ((int filedes, const struct iovec *vector, int count));
-
-__END_DECLS
-
-#endif /* _UIO_H_ */
diff --git a/winsup/cygwin/include/sys/un.h b/winsup/cygwin/include/sys/un.h
deleted file mode 100644
index 4e3eee82b..000000000
--- a/winsup/cygwin/include/sys/un.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* sys/un.h
-
-   Copyright 1999, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_UN_H
-#define _SYS_UN_H
-
-/* POSIX requires only at least 100 bytes */
-#define UNIX_PATH_LEN   108
-
-struct sockaddr_un {
-  unsigned short sun_family;              /* address family AF_LOCAL/AF_UNIX */
-  char	         sun_path[UNIX_PATH_LEN]; /* 108 bytes of socket address     */
-};
-
-/* Evaluates the actual length of `sockaddr_un' structure. */
-#define SUN_LEN(p) ((size_t)(((struct sockaddr_un *) NULL)->sun_path) \
-		   + strlen ((p)->sun_path))
-
-#endif
diff --git a/winsup/cygwin/include/sys/utime.h b/winsup/cygwin/include/sys/utime.h
deleted file mode 100644
index 5565b361d..000000000
--- a/winsup/cygwin/include/sys/utime.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* sys/utime.h
-
-   Copyright 2001 Red Hat, Inc.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#ifndef _SYS_UTIME_H
-#define _SYS_UTIME_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <_ansi.h>
-#include <sys/types.h>
-
-struct utimbuf 
-{
-  time_t actime;
-  time_t modtime; 
-};
-
-int _EXFUN(utime, (const char *__path, struct utimbuf *__buf));
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _SYS_UTIME_H */
diff --git a/winsup/cygwin/include/sys/utmp.h b/winsup/cygwin/include/sys/utmp.h
deleted file mode 100644
index b78c56317..000000000
--- a/winsup/cygwin/include/sys/utmp.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* sys/utmp.h
-
-   Copyright 2001 Red Hat, Inc.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#ifndef UTMP_H
-#define UTMP_H
-
-#include <sys/types.h>
-#include <time.h>
-#include <paths.h>
-
-#define UTMP_FILE _PATH_UTMP
-#define WTMP_FILE _PATH_WTMP
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UT_LINESIZE	16
-#define UT_NAMESIZE	16
-#define UT_HOSTSIZE	256
-#define UT_IDLEN	2
-#define ut_name ut_user
-
-struct utmp 
-{
- short	ut_type;	
- pid_t	ut_pid;		
- char	ut_line[UT_LINESIZE];
- char  ut_id[UT_IDLEN];
- time_t ut_time;	
- char	ut_user[UT_NAMESIZE];	
- char	ut_host[UT_HOSTSIZE];	
- long	ut_addr;	
-};
-
-#define RUN_LVL         1
-#define BOOT_TIME       2
-#define NEW_TIME        3
-#define OLD_TIME        4
-
-#define INIT_PROCESS	5
-#define LOGIN_PROCESS	6
-#define USER_PROCESS	7
-#define DEAD_PROCESS	8
-
-extern struct utmp *_getutline (struct utmp *);
-extern struct utmp *getutent (void);
-extern struct utmp *getutid (struct utmp *);
-extern struct utmp *getutline (struct utmp *);
-extern void endutent (void);
-extern void pututline (struct utmp *);
-extern void setutent (void);
-extern void utmpname (const char *);
-
-void login (struct utmp *);
-int logout (char *);
-int login_tty (int);
-void updwtmp (const char *, const struct utmp *);
-void logwtmp (const char *, const char *, const char *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* UTMP_H */
diff --git a/winsup/cygwin/include/sys/utsname.h b/winsup/cygwin/include/sys/utsname.h
deleted file mode 100644
index bb770c0f1..000000000
--- a/winsup/cygwin/include/sys/utsname.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* sys/utsname.h
-
-   Copyright 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_UTSNAME_H
-#define _SYS_UTSNAME_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct utsname
-{
-  char sysname[20];
-  char nodename[20];
-  char release[20];
-  char version[20];
-  char machine[20];
-};
-
-int uname (struct utsname *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/winsup/cygwin/include/sys/vfs.h b/winsup/cygwin/include/sys/vfs.h
deleted file mode 100644
index 57b6f9232..000000000
--- a/winsup/cygwin/include/sys/vfs.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* sys/vfs.h
-
-   Copyright 1997, 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_VFS_H_
-#define _SYS_VFS_H_
-
-struct statfs {
-   long    f_type;     /* type of filesystem */
-   long    f_bsize;    /* optimal transfer block size */
-   long    f_blocks;   /* total data blocks in file system */
-   long    f_bfree;    /* free blocks in fs */
-   long    f_bavail;   /* free blocks avail to non-superuser */
-   long    f_files;    /* total file nodes in file system */
-   long    f_ffree;    /* free file nodes in fs */
-   long    f_fsid;     /* file system id */
-   long    f_namelen;  /* maximum length of filenames */
-   long    f_spare[6]; /* spare for later */
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-int statfs (const char *__path, struct statfs *__buf);
-int fstatfs (int __fd, struct statfs *__buf);
-
-#ifdef __cplusplus
-};
-#endif /* __cplusplus */
-
-#endif /*_SYS_VFS_H_*/
diff --git a/winsup/cygwin/include/sys/wait.h b/winsup/cygwin/include/sys/wait.h
deleted file mode 100644
index 9dd8bf7dc..000000000
--- a/winsup/cygwin/include/sys/wait.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* sys/wait.h
-
-   Copyright 1997, 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYS_WAIT_H
-#define _SYS_WAIT_H
-
-#include <sys/types.h>
-#include <sys/resource.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define WNOHANG 1
-#define WUNTRACED 2
-
-/* A status looks like:
-      <2 bytes info> <2 bytes code>
-
-      <code> == 0, child has exited, info is the exit value
-      <code> == 1..7e, child has exited, info is the signal number.
-      <code> == 7f, child has stopped, info was the signal number.
-      <code> == 80, there was a core dump.
-*/
-
-#define WIFEXITED(w)	(((w) & 0xff) == 0)
-#define WIFSIGNALED(w)	(((w) & 0x7f) > 0 && (((w) & 0x7f) < 0x7f))
-#define WIFSTOPPED(w)	(((w) & 0xff) == 0x7f)
-#define WEXITSTATUS(w)	(((w) >> 8) & 0xff)
-#define WTERMSIG(w)	((w) & 0x7f)
-#define WSTOPSIG	WEXITSTATUS
-
-pid_t wait (int *);
-pid_t waitpid (pid_t, int *, int);
-pid_t wait3 (int *__status, int __options, struct rusage *__rusage);
-pid_t wait4 (pid_t __pid, int *__status, int __options, struct rusage *__rusage);
-
-union wait
-  {
-    int w_status;
-    struct
-      {
-	unsigned int __w_termsig:7; /* Terminating signal.  */
-	unsigned int __w_coredump:1; /* Set if dumped core.  */
-	unsigned int __w_retcode:8; /* Return code if exited normally.  */
-	unsigned int:16;
-      } __wait_terminated;
-    struct
-      {
-	unsigned int __w_stopval:8; /* W_STOPPED if stopped.  */
-	unsigned int __w_stopsig:8; /* Stopping signal.  */
-	unsigned int:16;
-      } __wait_stopped;
-  };
-
-#define	w_termsig	__wait_terminated.__w_termsig
-#define	w_coredump	__wait_terminated.__w_coredump
-#define	w_retcode	__wait_terminated.__w_retcode
-#define	w_stopsig	__wait_stopped.__w_stopsig
-#define	w_stopval	__wait_stopped.__w_stopval
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif
diff --git a/winsup/cygwin/include/sysexits.h b/winsup/cygwin/include/sysexits.h
deleted file mode 100644
index eba0b92dd..000000000
--- a/winsup/cygwin/include/sysexits.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)sysexits.h  8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _SYSEXITS_H_
-#define _SYSEXITS_H_
-
-/*
- *  SYSEXITS.H -- Exit status codes for system programs.
- *
- *      This include file attempts to categorize possible error
- *      exit statuses for system programs, notably delivermail
- *      and the Berkeley network.
- *
- *      Error numbers begin at EX__BASE to reduce the possibility of
- *      clashing with other exit statuses that random programs may
- *      already return.  The meaning of the codes is approximately
- *      as follows:
- *
- *      EX_USAGE -- The command was used incorrectly, e.g., with
- *              the wrong number of arguments, a bad flag, a bad
- *              syntax in a parameter, or whatever.
- *      EX_DATAERR -- The input data was incorrect in some way.
- *              This should only be used for user's data & not
- *              system files.
- *      EX_NOINPUT -- An input file (not a system file) did not
- *              exist or was not readable.  This could also include
- *              errors like "No message" to a mailer (if it cared
- *              to catch it).
- *      EX_NOUSER -- The user specified did not exist.  This might
- *              be used for mail addresses or remote logins.
- *      EX_NOHOST -- The host specified did not exist.  This is used
- *              in mail addresses or network requests.
- *      EX_UNAVAILABLE -- A service is unavailable.  This can occur
- *              if a support program or file does not exist.  This
- *              can also be used as a catchall message when something
- *              you wanted to do doesn't work, but you don't know
- *              why.
- *      EX_SOFTWARE -- An internal software error has been detected.
- *              This should be limited to non-operating system related
- *              errors as possible.
- *      EX_OSERR -- An operating system error has been detected.
- *              This is intended to be used for such things as "cannot
- *              fork", "cannot create pipe", or the like.  It includes
- *              things like getuid returning a user that does not
- *              exist in the passwd file.
- *      EX_OSFILE -- Some system file (e.g., /etc/passwd, /etc/utmp,
- *              etc.) does not exist, cannot be opened, or has some
- *              sort of error (e.g., syntax error).
- *      EX_CANTCREAT -- A (user specified) output file cannot be
- *              created.
- *      EX_IOERR -- An error occurred while doing I/O on some file.
- *      EX_TEMPFAIL -- temporary failure, indicating something that
- *              is not really an error.  In sendmail, this means
- *              that a mailer (e.g.) could not create a connection,
- *              and the request should be reattempted later.
- *      EX_PROTOCOL -- the remote system returned something that
- *              was "not possible" during a protocol exchange.
- *      EX_NOPERM -- You did not have sufficient permission to
- *              perform the operation.  This is not intended for
- *              file system problems, which should use NOINPUT or
- *              CANTCREAT, but rather for higher level permissions.
- */
-
-#define EX_OK           0       /* successful termination */
-
-#define EX__BASE        64      /* base value for error messages */
-
-#define EX_USAGE        64      /* command line usage error */
-#define EX_DATAERR      65      /* data format error */
-#define EX_NOINPUT      66      /* cannot open input */
-#define EX_NOUSER       67      /* addressee unknown */
-#define EX_NOHOST       68      /* host name unknown */
-#define EX_UNAVAILABLE  69      /* service unavailable */
-#define EX_SOFTWARE     70      /* internal software error */
-#define EX_OSERR        71      /* system error (e.g., can't fork) */
-#define EX_OSFILE       72      /* critical OS file missing */
-#define EX_CANTCREAT    73      /* can't create (user) output file */
-#define EX_IOERR        74      /* input/output error */
-#define EX_TEMPFAIL     75      /* temp failure; user is invited to retry */
-#define EX_PROTOCOL     76      /* remote error in protocol */
-#define EX_NOPERM       77      /* permission denied */
-#define EX_CONFIG       78      /* configuration error */
-
-#define EX__MAX 78      /* maximum listed value */
-
-#endif /* !_SYSEXITS_H_ */
diff --git a/winsup/cygwin/include/syslog.h b/winsup/cygwin/include/syslog.h
deleted file mode 100644
index 5721ca5e4..000000000
--- a/winsup/cygwin/include/syslog.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* syslog.h
-
-   Copyright 1996, 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SYSLOG_H
-#define _SYSLOG_H
-
-#include <sys/syslog.h>
-
-#endif /* _SYSLOG_H */
diff --git a/winsup/cygwin/include/termio.h b/winsup/cygwin/include/termio.h
deleted file mode 100644
index ba7b3b10b..000000000
--- a/winsup/cygwin/include/termio.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* termio.h
-
-   Copyright 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _TERMIO_H
-#define _TERMIO_H
-
-#include <sys/termio.h>
-
-#endif
diff --git a/winsup/cygwin/include/tzfile.h b/winsup/cygwin/include/tzfile.h
deleted file mode 100644
index 5586380a8..000000000
--- a/winsup/cygwin/include/tzfile.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* tzfile.h
-
-   Copyright 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _TZFILE_H
-#define _TZFILE_H
-
-#define SECSPERMIN	60
-#define MINSPERHOUR	60
-#define HOURSPERDAY	24
-#define DAYSPERWEEK	7
-#define DAYSPERNYEAR	365
-#define DAYSPERLYEAR	366
-#define SECSPERHOUR	(SECSPERMIN * MINSPERHOUR)
-#define SECSPERDAY	((long) SECSPERHOUR * HOURSPERDAY)
-#define MONSPERYEAR	12
-
-#define TM_SUNDAY	0
-#define TM_MONDAY	1
-#define TM_TUESDAY	2
-#define TM_WEDNESDAY	3
-#define TM_THURSDAY	4
-#define TM_FRIDAY	5
-#define TM_SATURDAY	6
-
-#define TM_JANUARY	0
-#define TM_FEBRUARY	1
-#define TM_MARCH	2
-#define TM_APRIL	3
-#define TM_MAY		4
-#define TM_JUNE		5
-#define TM_JULY		6
-#define TM_AUGUST	7
-#define TM_SEPTEMBER	8
-#define TM_OCTOBER	9
-#define TM_NOVEMBER	10
-#define TM_DECEMBER	11
-
-#define TM_YEAR_BASE	1900
-
-#define EPOCH_YEAR	1970
-#define EPOCH_WDAY	TM_THURSDAY
-
-#define isleap(y) (((y) % 4) == 0 && ((y) % 100) != 0 || ((y) % 400) == 0)
-#endif
diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc
deleted file mode 100644
index 94453f602..000000000
--- a/winsup/cygwin/init.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-/* init.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include "thread.h"
-#include "perprocess.h"
-#include "cygthread.h"
-#include "cygtls.h"
-
-int NO_COPY dynamically_loaded;
-
-static void WINAPI
-threadfunc_fe (VOID *arg)
-{
-  _threadinfo::call ((DWORD (*)  (void *, void *)) (((char **) _tlsbase)[-1]), arg);
-}
-
-static void
-munge_threadfunc (HANDLE cygwin_hmodule)
-{
-  char **ebp = (char **) __builtin_frame_address (0); 
-  static unsigned threadfunc_ix;
-  if (!threadfunc_ix)
-    {
-      for (char **peb = ebp; peb < (char **) _tlsbase; peb++)
-	if (*peb == (char *) cygthread::stub)
-	  {
-	    threadfunc_ix = peb - ebp;
-	    goto foundit;
-	  }
-      return;
-    }
-
-foundit:
-  char *threadfunc = ebp[threadfunc_ix];
-  ebp[threadfunc_ix] = (char *) threadfunc_fe;
-  ((char **) _tlsbase)[-1] = threadfunc;
-}
-
-extern "C" int WINAPI
-dll_entry (HANDLE h, DWORD reason, void *static_load)
-{
-  switch (reason)
-    {
-    case DLL_PROCESS_ATTACH:
-      _my_tls.stackptr = _my_tls.stack;
-      dynamically_loaded = (static_load == NULL);
-      break;
-    case DLL_PROCESS_DETACH:
-      break;
-    case DLL_THREAD_ATTACH:
-      if (MT_INTERFACE->reent_key.set (&MT_INTERFACE->reents))
-	    api_fatal ("thread initialization failed");
-      munge_threadfunc (h);
-      break;
-    }
-  return 1;
-}
diff --git a/winsup/cygwin/ioctl.cc b/winsup/cygwin/ioctl.cc
deleted file mode 100644
index bd9b3ca3c..000000000
--- a/winsup/cygwin/ioctl.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ioctl.cc: ioctl routines.
-
-   Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Doug Evans of Cygnus Support
-   dje@cygnus.com
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <sys/ioctl.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "sigproc.h"
-#include <sys/termios.h>
-
-extern "C" int
-ioctl (int fd, int cmd, ...)
-{
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    return -1;
-
-  /* check for optional mode argument */
-  va_list ap;
-  va_start (ap, cmd);
-  char *argp = va_arg (ap, char *);
-  va_end (ap);
-
-  debug_printf ("fd %d, cmd %x", fd, cmd);
-  int res;
-  if (cfd->is_tty () && cfd->get_device () != FH_PTYM)
-    switch (cmd)
-      {
-	case TCGETA:
-	  res = tcgetattr (fd, (struct termios *) argp);
-	  goto out;
-	case TCSETA:
-	  res = tcsetattr (fd, TCSANOW, (struct termios *) argp);
-	  goto out;
-	case TCSETAW:
-	  res = tcsetattr (fd, TCSADRAIN, (struct termios *) argp);
-	  goto out;
-	case TCSETAF:
-	  res = tcsetattr (fd, TCSAFLUSH, (struct termios *) argp);
-	  goto out;
-      }
-
-  res = cfd->ioctl (cmd, argp);
-
-out:
-  debug_printf ("returning %d", res);
-  return res;
-}
diff --git a/winsup/cygwin/ipc.cc b/winsup/cygwin/ipc.cc
deleted file mode 100644
index c89b23e21..000000000
--- a/winsup/cygwin/ipc.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ipc.cc: Single unix specification IPC interface for Cygwin
-
-   Copyright 2001, 2002, 2003 Red Hat, Inc.
-
-   Originally written by Robert Collins <robert.collins@hotmail.com>
-   Updated to 64 bit key_t by Charles Wilson <cygwin@cwilson.fastmail.fm>
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include "winsup.h"
-#include <cygwin/ipc.h>
-#include <sys/stat.h>
-
-/* Notes: we return a valid key even if id's low order 8 bits are 0. */
-extern "C" key_t
-ftok (const char *path, int id)
-{
-  struct __stat64 statbuf;
-  key_t tmp;
-  if (stat64 (path, &statbuf))
-    {
-      /* stat set the appropriate errno for us */
-      return (key_t) -1;
-    }
-
-  /* Since __CYGWIN_USE_BIG_TYPES__,
-     dev_t is 32bits for cygwin
-     ino_t is 64bits for cygwin
-     and we need 8 bits for the id.
-     thus key_t needs 104 bits total -- but we only have 64 (long long)
-     We will have to alias; leaving open the possibility that the same
-     key will be returned for multiple files.  This possibility exists
-     also on Linux; the question is, how to minimize this possibility.
-
-     How to solve?  Well, based on C. Vinschen's research, the nFileIndex*
-     words vary as follows, on a partition with > 110,000 files
-     nFileIndexHigh:    564 values between 0x00010000 -- 0xffff0000
-     nFileIndexLow : 103812 values between 0x00000000 -- 0x0003ffff
-     R. Collins suggests that these may represent a tree path,
-     and that it would require ~2.9M files to force the tree depth
-     to increase and reveal more bit usage.
-
-     Implementation details: dev_t is 32bits, but is formed by
-	device(32bits) << 16 | unit(32bits)
-     But device is ACTUALLY == status & FH_DEVMASK, where FH_DEVMASK
-     is 0x00000fff --> 12 bits
-
-     As it happens, the maximum number of devices is actually
-     FH_NDEV, not FH_DEVMASK, where FH_NDEV is currently 0x0000001d.
-     However, FH_NDEV grows as new device types are added.  So
-     currently the device number needs 5 bits, but later?  Let's
-     take a cue from Linux, and use the lower 8 bits (instead of the
-     lower 12 or 16) for the device (major?) number.
-
-     Similarly, while 'units' is an int (32bits), it is unclear
-     how many of these are significant. For most devices, it seems that
-     'units' is equivalent to 'minor'.  For FH_TAPE, it's obvious that
-     only 8 bits are important.  However, for FH_SOCKET...it might be
-     as high as 16 significant bits.
-
-     Let's assume that we only need 8 bits from device (major) and
-     only 8 bits from unit (minor). (On linux, only 8 bits of minor
-     are used, and none from major).
-     ---> so, we only need 0x00ff00ff (16 bits) of dev_t
-
-     ---> we MUST have all 8 bits of id.
-
-     ---> So, we only have 64 - 8 - 16 = 40 bits for ino_t.  But, we
-     need 0xffff0000 for nFileIndexHigh and 0x0003ffff for nFileIndexLow
-     minimum, or 16 + 18 = 34 bits.  Lucky us - we have 6 more bits
-     to distribute.
-
-     For lack of a better idea, we'll allocate 2 of the extra bits to
-     nFileIndexHigh and 4 to nFileIndexLow.  */
-
-  /* get 8 bits from dev_t (major), put into 0xff00000000000000L */
-  tmp  = (((key_t) statbuf.st_dev) & 0x0000000000ff0000LL) << 40;
-  /* get 8 bits from dev_t (minor), put into 0x00ff000000000000L */
-  tmp |= (((key_t) statbuf.st_dev) & 0x00000000000000ffLL) << 48;
-  /* get upper 16+2 bits from nFileInfoHigh, put into 0x0000ffffc0000000L
-     shift down first, then mask, to avoid sign extension on rightshift  */
-  tmp |= (((key_t) statbuf.st_ino) & 0xffffc00000000000LL) >> 16;
-  /* get lower 18+4 bits from nFileInfoLow, put into  0x000000003fffff00L  */
-  tmp |= (((key_t) statbuf.st_ino) & 0x00000000003fffffLL) << 8;
-  /* use all 8 bits of id, and put into 0x00000000000000ffL */
-  tmp |= (id & 0x00ff);
-  return tmp;
-}
diff --git a/winsup/cygwin/lib/_cygwin_crt0_common.cc b/winsup/cygwin/lib/_cygwin_crt0_common.cc
deleted file mode 100644
index 565ba2571..000000000
--- a/winsup/cygwin/lib/_cygwin_crt0_common.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/* common.cc: common crt0 function for cygwin crt0's.
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "perprocess.h"
-#include "cygwin/version.h"
-#include "crt0.h"
-#include <reent.h>
-#include <stdlib.h>
-
-#undef environ
-
-extern "C"
-{
-char **environ;
-void cygwin_crt0 (MainFunc);
-int cygwin_attach_dll (HMODULE, MainFunc);
-int cygwin_attach_noncygwin_dll (HMODULE, MainFunc);
-int main (int, char **, char **);
-struct _reent *_impure_ptr;
-int _fmode;
-void _pei386_runtime_relocator ();
-
-/* Set up pointers to various pieces so the dll can then use them,
-   and then jump to the dll.  */
-
-int __stdcall
-_cygwin_crt0_common (MainFunc f, per_process *u)
-{
-  /* This is used to record what the initial sp was.  The value is needed
-     when copying the parent's stack to the child during a fork.  */
-  DWORD newu;
-  int uwasnull;
-
-  if (u != NULL)
-    uwasnull = 0;	/* Caller allocated space for per_process structure */
-  else if ((newu = cygwin_internal (CW_USER_DATA)) == (DWORD) -1)
-    return 0;
-  else
-    {
-      u = (per_process *) newu;	/* Using DLL built-in per_process */
-      uwasnull = 1;	/* Remember for later */
-    }
-
-  /* The version numbers are the main source of compatibility checking.
-     As a backup to them, we use the size of the per_process struct.  */
-  u->magic_biscuit = sizeof (per_process);
-
-  /* cygwin.dll version number in effect at the time the app was created.  */
-  u->dll_major = CYGWIN_VERSION_DLL_MAJOR;
-  u->dll_minor = CYGWIN_VERSION_DLL_MINOR;
-  u->api_major = CYGWIN_VERSION_API_MAJOR;
-  u->api_minor = CYGWIN_VERSION_API_MINOR;
-
-  u->ctors = &__CTOR_LIST__;
-  u->dtors = &__DTOR_LIST__;
-  u->envptr = &environ;
-  if (uwasnull)
-    _impure_ptr = u->impure_ptr;	/* Use field initialized in newer DLLs. */
-  else
-    u->impure_ptr_ptr = &_impure_ptr;	/* Older DLLs need this. */
-
-  u->forkee = 0;			/* This should only be set in dcrt0.cc
-					   when the process is actually forked */
-  u->main = f;
-
-  /* These functions are executed prior to main.  They are just stubs unless the
-     user overrides them. */
-  u->premain[0] = cygwin_premain0;
-  u->premain[1] = cygwin_premain1;
-  u->premain[2] = cygwin_premain2;
-  u->premain[3] = cygwin_premain3;
-  u->fmode_ptr = &_fmode;
-  u->initial_sp = (char *) __builtin_frame_address (1);
-
-  /* Remember whatever the user linked his application with - or
-     point to entries in the dll.  */
-  u->malloc = &malloc;
-  u->free = &free;
-  u->realloc = &realloc;
-  u->calloc = &calloc;
-
-  /* Setup the module handle so fork can get the path name. */
-  u->hmodule = GetModuleHandle (0);
-
-  /* variables for fork */
-  u->data_start = &_data_start__;
-  u->data_end = &_data_end__;
-  u->bss_start = &_bss_start__;
-  u->bss_end = &_bss_end__;
-
-  _pei386_runtime_relocator ();
-  return 1;
-}
-} /* "C" */
diff --git a/winsup/cygwin/lib/crt0.h b/winsup/cygwin/lib/crt0.h
deleted file mode 100644
index 7bd240622..000000000
--- a/winsup/cygwin/lib/crt0.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* crt0.h: header file for crt0.
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct per_process;
-typedef int (*MainFunc) (int argc, char *argv[], char **env);
-int __stdcall _cygwin_crt0_common (MainFunc, struct per_process *);
-int dll_dllcrt0 (HMODULE, struct per_process *);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/winsup/cygwin/lib/cygwin_attach_dll.c b/winsup/cygwin/lib/cygwin_attach_dll.c
deleted file mode 100644
index 3788bdf9c..000000000
--- a/winsup/cygwin/lib/cygwin_attach_dll.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* attach_dll.cc: crt0 for attaching cygwin DLL from a non-cygwin app.
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#undef __INSIDE_CYGWIN__
-#include <windows.h>
-#include <sys/cygwin.h>
-#include "crt0.h"
-
-/* for a loaded dll */
-int
-cygwin_attach_dll (HMODULE h, MainFunc f)
-{
-  static struct per_process u;
-  (void) _cygwin_crt0_common (f, &u);
-
-  /* jump into the dll. */
-  return dll_dllcrt0 (h, &u);
-}
diff --git a/winsup/cygwin/lib/cygwin_crt0.c b/winsup/cygwin/lib/cygwin_crt0.c
deleted file mode 100644
index fb2a84b18..000000000
--- a/winsup/cygwin/lib/cygwin_crt0.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* cygwin_crt0.cc: crt0 for cygwin
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#undef __INSIDE_CYGWIN__
-#include <windows.h>
-#include <sys/cygwin.h>
-#include <stdlib.h>
-#include "crt0.h"
-
-extern void dll_crt0__FP11per_process (struct per_process *)  __declspec (dllimport) __attribute ((noreturn));
-
-/* for main module */
-void
-cygwin_crt0 (MainFunc f)
-{
-  struct per_process *u;
-  if (_cygwin_crt0_common (f, NULL))
-    u = NULL;		/* Newer DLL.  Use DLL internal per_process. */
-  else			/* Older DLL.  Provide a per_process */
-    {
-      u = (struct per_process *) alloca (sizeof (*u));
-      memset (u, 0, sizeof (u));
-      (void) _cygwin_crt0_common (f, u);
-    }
-  dll_crt0__FP11per_process (u);	/* Jump into the dll, never to return */
-}
diff --git a/winsup/cygwin/lib/dll_entry.c b/winsup/cygwin/lib/dll_entry.c
deleted file mode 100644
index 781f6a3ea..000000000
--- a/winsup/cygwin/lib/dll_entry.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* dll_entry.cc: Provide the default user DLL linker entry point.
-
-   Copyright 1998, 2000, 2001 Red Hat, Inc.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* Here we simply instantiate the DECLARE_CYGWIN_DLL to define the
-   linker entry point, __cygwin_dll_entry@12, which in turn calls
-   _DllMain@12 to do user-specific initialization, if any. There is a
-   default DllMain stub in the library if there is no user supplied
-   one. */
-
-#include "cygwin/cygwin_dll.h"
-
-DECLARE_CYGWIN_DLL (DllMain);
diff --git a/winsup/cygwin/lib/dll_main.cc b/winsup/cygwin/lib/dll_main.cc
deleted file mode 100644
index a224a0a2f..000000000
--- a/winsup/cygwin/lib/dll_main.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/* dll_main.cc: Provide the DllMain stub that the user can override.
-
-   Copyright 1998, 2000, 2001 Red Hat, Inc.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <windows.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <stdio.h>
-
-extern "C"
-BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason,
-		       LPVOID reserved /* Not used. */);
-
-BOOL APIENTRY
-DllMain (
-	 HINSTANCE hInst /* Library instance handle. */ ,
-	 DWORD reason /* Reason this function is being called. */ ,
-	 LPVOID reserved /* Not used. */)
-{
-  switch (reason)
-    {
-    case DLL_PROCESS_ATTACH:
-      break;
-
-    case DLL_PROCESS_DETACH:
-      break;
-
-    case DLL_THREAD_ATTACH:
-      break;
-
-    case DLL_THREAD_DETACH:
-      break;
-    }
-  return TRUE;
-}
diff --git a/winsup/cygwin/lib/libcmain.c b/winsup/cygwin/lib/libcmain.c
deleted file mode 100644
index 13cc34cd9..000000000
--- a/winsup/cygwin/lib/libcmain.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* libcmain.c
-
-   Copyright 1996, 1997, 1998, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <windows.h>
-
-/* Allow apps which don't have a main work, as long as they define WinMain */
-int
-main ()
-{
-  HMODULE x = GetModuleHandleA(0);
-  char *s = GetCommandLineA ();
-  STARTUPINFO si;
-
-  /* GetCommandLineA returns the entire command line including the
-     program name, but WinMain is defined to accept the command
-     line without the program name.  */
-  while (*s != ' ' && *s != '\0')
-    ++s;
-  while (*s == ' ')
-    ++s;
-
-  GetStartupInfo (&si);
-
-  return WinMain (x, 0, s,
-		  ((si.dwFlags & STARTF_USESHOWWINDOW) != 0
-		   ? si.wShowWindow
-		   : SW_SHOWNORMAL));
-}
diff --git a/winsup/cygwin/lib/premain0.c b/winsup/cygwin/lib/premain0.c
deleted file mode 100644
index b77e02e8e..000000000
--- a/winsup/cygwin/lib/premain0.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* premain0.c
-
-   Copyright 2000 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-void
-cygwin_premain0(int argc, char **argv)
-{
-}
diff --git a/winsup/cygwin/lib/premain1.c b/winsup/cygwin/lib/premain1.c
deleted file mode 100644
index 99aeac916..000000000
--- a/winsup/cygwin/lib/premain1.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* premain1.c
-
-   Copyright 2000 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-void
-cygwin_premain1(int argc, char **argv)
-{
-}
diff --git a/winsup/cygwin/lib/premain2.c b/winsup/cygwin/lib/premain2.c
deleted file mode 100644
index a89e76ec3..000000000
--- a/winsup/cygwin/lib/premain2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* premain2.c
-
-   Copyright 2000 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-void
-cygwin_premain2(int argc, char **argv)
-{
-}
diff --git a/winsup/cygwin/lib/premain3.c b/winsup/cygwin/lib/premain3.c
deleted file mode 100644
index c5b99b918..000000000
--- a/winsup/cygwin/lib/premain3.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* premain3.c
-
-   Copyright 2000 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-void
-cygwin_premain3(int argc, char **argv)
-{
-}
diff --git a/winsup/cygwin/lib/pseudo-reloc.c b/winsup/cygwin/lib/pseudo-reloc.c
deleted file mode 100644
index 5760a69ad..000000000
--- a/winsup/cygwin/lib/pseudo-reloc.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* pseudo-reloc.c
-
-   Written by Egor Duda <deo@logos-m.ru>
-   THIS SOFTWARE IS NOT COPYRIGHTED
-
-   This source code is offered for use in the public domain. You may
-   use, modify or distribute it freely.
-
-   This code is distributed in the hope that it will be useful but
-   WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
-   DISCLAMED. This includes but is not limited to warrenties of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#include <windows.h>
-
-extern char __RUNTIME_PSEUDO_RELOC_LIST__;
-extern char __RUNTIME_PSEUDO_RELOC_LIST_END__;
-extern char _image_base__;
-
-typedef struct
-  {
-    DWORD addend;
-    DWORD target;
-  }
-runtime_pseudo_reloc;
-
-void
-do_pseudo_reloc (void* start, void* end, void* base)
-{
-  DWORD reloc_target;
-  runtime_pseudo_reloc* r;
-  for (r = (runtime_pseudo_reloc*) start; r < (runtime_pseudo_reloc*) end; r++)
-    {
-      reloc_target = (DWORD) base + r->target;
-      *((DWORD*) reloc_target) += r->addend;
-    }
-}
-
-void
-_pei386_runtime_relocator ()
-{
-  do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,
-		   &__RUNTIME_PSEUDO_RELOC_LIST_END__,
-		   &_image_base__);
-}
diff --git a/winsup/cygwin/libc/bsdlib.cc b/winsup/cygwin/libc/bsdlib.cc
deleted file mode 100644
index b0f8dbbad..000000000
--- a/winsup/cygwin/libc/bsdlib.cc
+++ /dev/null
@@ -1,260 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * CV 2003-09-10: Cygwin specific changes applied.  Code simplified just
- *                for Cygwin alone.
- */
-
-#include "winsup.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <utmp.h>
-#include <unistd.h>
-#include <sys/termios.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include "cygerrno.h"
-
-extern "C" int
-daemon (int nochdir, int noclose)
-{
-  int fd;
-
-  switch (fork ())
-    {
-      case -1:
-	return -1;
-      case 0:
-	if (!wincap.is_winnt ())
-	  {
-	    /* Register as service under 9x/Me which allows to close
-	       the parent window with the daemon still running.
-	       This function only exists on 9x/Me and is autoloaded
-	       so it fails silently on NT. */
-	    DWORD WINAPI RegisterServiceProcess (DWORD, DWORD);
-	    RegisterServiceProcess (0, 1);
-	  }
-	break;
-      default:
-	/* This sleep avoids a race condition which kills the
-	   child process if parent is started by a NT/W2K service.
-	   FIXME: Is that still true? */
-	Sleep (1000L);
-	_exit (0);
-    }
-  if (setsid () == -1)
-    return -1;
-  if (!nochdir)
-    chdir ("/");
-  if (!noclose && (fd = open (_PATH_DEVNULL, O_RDWR, 0)) >= 0)
-    {
-      dup2 (fd, STDIN_FILENO);
-      dup2 (fd, STDOUT_FILENO);
-      dup2 (fd, STDERR_FILENO);
-      if (fd > 2)
-	close (fd);
-    }
-  return 0;
-}
-
-extern "C" int
-login_tty (int fd)
-{
-  char *fdname;
-  int newfd;
-
-  if (setsid () == -1)
-    return -1;
-  if ((fdname = ttyname (fd)))
-    {
-      if (fd != STDIN_FILENO)
-        close (STDIN_FILENO);
-      if (fd != STDOUT_FILENO)
-        close (STDOUT_FILENO);
-      if (fd != STDERR_FILENO)
-        close (STDERR_FILENO);
-      newfd = open (fdname, O_RDWR);
-      close (newfd);
-    }
-  dup2 (fd, STDIN_FILENO);
-  dup2 (fd, STDOUT_FILENO);
-  dup2 (fd, STDERR_FILENO);
-  if (fd > 2)
-    close (fd);
-  return 0;
-}
-
-extern "C" int
-openpty (int *amaster, int *aslave, char *name, struct termios *termp,
-	 struct winsize *winp)
-{
-  int master, slave;
-  char pts[CYG_MAX_PATH];
-
-  if ((master = open ("/dev/ptmx", O_RDWR | O_NOCTTY)) >= 0)
-    {
-      grantpt (master);
-      unlockpt (master);
-      strcpy (pts, ptsname (master));
-      revoke (pts);
-      if ((slave = open (pts, O_RDWR | O_NOCTTY)) >= 0)
-        {
-	  if (amaster)
-	    *amaster = master;
-	  if (aslave)
-	    *aslave = slave;
-	  if (name)
-	    strcpy (name, pts);
-	  if (termp)
-	    tcsetattr (slave, TCSAFLUSH, termp);
-	  if (winp)
-	    ioctl (slave, TIOCSWINSZ, (char *) winp);
-	  return 0;
-	}
-      close (master);
-    }
-  set_errno (ENOENT);
-  return -1;
-}
-
-extern "C" int
-forkpty (int *amaster, char *name, struct termios *termp, struct winsize *winp)
-{
-  int master, slave, pid;
-
-  if (openpty (&master, &slave, name, termp, winp) == -1)
-    return -1;
-  switch (pid = fork ())
-    {
-      case -1:
-	return -1;
-      case 0:
-	close (master);
-	login_tty (slave);
-	return 0;
-    }
-  if (amaster)
-    *amaster = master;
-  close (slave);
-  return pid;
-}
-
-extern "C" char *__progname;
-
-static void
-_vwarnx (const char *fmt, va_list ap)
-{
-  fprintf (stderr, "%s: ", __progname);
-  vfprintf (stderr, fmt, ap);
-}
-
-extern "C" void
-vwarn (const char *fmt, va_list ap)
-{
-  _vwarnx (fmt, ap);
-  fprintf (stderr, ": %s", strerror (get_errno ()));
-  fputc ('\n', stderr);
-}
-
-extern "C" void
-vwarnx (const char *fmt, va_list ap)
-{
-  _vwarnx (fmt, ap);
-  fputc ('\n', stderr);
-}
-
-extern "C" void
-warn (const char *fmt, ...)
-{
-  va_list ap;
-  va_start (ap, fmt);
-  vwarn (fmt, ap);
-}
-
-extern "C" void
-warnx (const char *fmt, ...)
-{
-  va_list ap;
-  va_start (ap, fmt);
-  vwarnx (fmt, ap);
-}
-
-extern "C" void
-verr (int eval, const char *fmt, va_list ap)
-{
-  vwarn (fmt, ap);
-  exit (eval);
-}
-
-extern "C" void
-verrx (int eval, const char *fmt, va_list ap)
-{
-  vwarnx (fmt, ap);
-  exit (eval);
-}
-
-extern "C" void
-err (int eval, const char *fmt, ...)
-{
-  va_list ap;
-  va_start (ap, fmt);
-  vwarn (fmt, ap);
-  exit (eval);
-}
-
-extern "C" void
-errx (int eval, const char *fmt, ...)
-{
-  va_list ap;
-  va_start (ap, fmt);
-  vwarnx (fmt, ap);
-  exit (eval);
-}
-
-extern "C" const char *
-getprogname (void)
-{
-  return __progname;
-}
-
-extern "C" void
-setprogname (const char *newprogname)
-{
-  if (!check_null_str_errno (newprogname))
-    {
-      /* Per BSD man page, setprogname keeps a pointer to the last
-         path component of the argument.  It does *not* copy the
-	 argument before. */
-      __progname = strrchr (newprogname, '/');
-      if (__progname)
-        ++__progname;
-      else
-	__progname = (char *)newprogname;
-    }
-}
diff --git a/winsup/cygwin/libc/fnmatch.c b/winsup/cygwin/libc/fnmatch.c
deleted file mode 100644
index b48d9e00a..000000000
--- a/winsup/cygwin/libc/fnmatch.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*	$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $	*/
-
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
-#else
-static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $";
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
- * Compares a filename or pathname to a pattern.
- */
-
-/* Just this single line added for Cygwin. */
-#include "winsup.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <fnmatch.h>
-
-#define	EOS	'\0'
-
-#define	RANGE_MATCH	1
-#define	RANGE_NOMATCH	0
-#define	RANGE_ERROR	(-1)
-
-static int rangematch __P((const char *, char, int, char **));
-
-int
-fnmatch(const char *pattern, const char *string, int flags)
-{
-	const char *stringstart;
-	char *newp;
-	char c, test;
-
-	for (stringstart = string;;)
-		switch (c = *pattern++) {
-		case EOS:
-			if ((flags & FNM_LEADING_DIR) && *string == '/')
-				return (0);
-			return (*string == EOS ? 0 : FNM_NOMATCH);
-		case '?':
-			if (*string == EOS)
-				return (FNM_NOMATCH);
-			if (*string == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-			++string;
-			break;
-		case '*':
-			c = *pattern;
-			/* Collapse multiple stars. */
-			while (c == '*')
-				c = *++pattern;
-
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			/* Optimize for pattern with * at end or before /. */
-			if (c == EOS) {
-				if (flags & FNM_PATHNAME)
-					return ((flags & FNM_LEADING_DIR) ||
-					    strchr(string, '/') == NULL ?
-					    0 : FNM_NOMATCH);
-				else
-					return (0);
-			} else if (c == '/' && (flags & FNM_PATHNAME)) {
-				if ((string = strchr(string, '/')) == NULL)
-					return (FNM_NOMATCH);
-				break;
-			}
-
-			/* General case, use recursion. */
-			while ((test = *string) != EOS) {
-				if (!fnmatch(pattern, string, flags & ~FNM_PERIOD))
-					return (0);
-				if (test == '/' && (flags & FNM_PATHNAME))
-					break;
-				++string;
-			}
-			return (FNM_NOMATCH);
-		case '[':
-			if (*string == EOS)
-				return (FNM_NOMATCH);
-			if (*string == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			switch (rangematch(pattern, *string, flags, &newp)) {
-			case RANGE_ERROR:
-				/* not a good range, treat as normal text */
-				goto normal;
-			case RANGE_MATCH:
-				pattern = newp;
-				break;
-			case RANGE_NOMATCH:
-				return (FNM_NOMATCH);
-			}
-			++string;
-			break;
-		case '\\':
-			if (!(flags & FNM_NOESCAPE)) {
-				if ((c = *pattern++) == EOS) {
-					c = '\\';
-					--pattern;
-				}
-			}
-			/* FALLTHROUGH */
-		default:
-		normal:
-			if (c != *string && !((flags & FNM_CASEFOLD) &&
-				 (tolower((unsigned char)c) ==
-				 tolower((unsigned char)*string))))
-				return (FNM_NOMATCH);
-			++string;
-			break;
-		}
-	/* NOTREACHED */
-}
-
-static int
-rangematch(const char *pattern, char test, int flags, char **newp)
-{
-	int negate, ok;
-	char c, c2;
-
-	/*
-	 * A bracket expression starting with an unquoted circumflex
-	 * character produces unspecified results (IEEE 1003.2-1992,
-	 * 3.13.2).  This implementation treats it like '!', for
-	 * consistency with the regular expression syntax.
-	 * J.T. Conklin (conklin@ngai.kaleida.com)
-	 */
-	if ((negate = (*pattern == '!' || *pattern == '^')))
-		++pattern;
-
-	if (flags & FNM_CASEFOLD)
-		test = tolower((unsigned char)test);
-
-	/*
-	 * A right bracket shall lose its special meaning and represent
-	 * itself in a bracket expression if it occurs first in the list.
-	 * -- POSIX.2 2.8.3.2
-	 */
-	ok = 0;
-	c = *pattern++;
-	do {
-		if (c == '\\' && !(flags & FNM_NOESCAPE))
-			c = *pattern++;
-		if (c == EOS)
-			return (RANGE_ERROR);
-		if (c == '/' && (flags & FNM_PATHNAME))
-			return (RANGE_NOMATCH);
-		if ((flags & FNM_CASEFOLD))
-			c = tolower((unsigned char)c);
-		if (*pattern == '-'
-		    && (c2 = *(pattern+1)) != EOS && c2 != ']') {
-			pattern += 2;
-			if (c2 == '\\' && !(flags & FNM_NOESCAPE))
-				c2 = *pattern++;
-			if (c2 == EOS)
-				return (RANGE_ERROR);
-			if (flags & FNM_CASEFOLD)
-				c2 = tolower((unsigned char)c2);
-			if (c <= test && test <= c2)
-				ok = 1;
-		} else if (c == test)
-			ok = 1;
-	} while ((c = *pattern++) != ']');
-
-	*newp = (char *)pattern;
-	return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH);
-}
diff --git a/winsup/cygwin/libc/getopt.c b/winsup/cygwin/libc/getopt.c
deleted file mode 100644
index 90a202601..000000000
--- a/winsup/cygwin/libc/getopt.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dieter Baron and Thomas Klausner.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "winsup.h"
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <getopt.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#define REPLACE_GETOPT
-
-#define _DIAGASSERT(x) do {} while (0)
-
-#ifdef REPLACE_GETOPT
-#ifdef __weak_alias
-__weak_alias(getopt,_getopt)
-#endif
-int __declspec(dllexport) opterr = 1;	/* if error message should be printed */
-int __declspec(dllexport) optind = 1;	/* index into parent argv vector */
-int __declspec(dllexport) optopt = '?';	/* character checked for validity */
-int __declspec(dllexport) optreset;	/* reset getopt */
-char __declspec(dllexport) *optarg;	/* argument associated with option */
-#endif
-
-#ifdef __weak_alias
-__weak_alias(getopt_long,_getopt_long)
-#endif
-
-#ifndef __CYGWIN__
-#define __progname __argv[0]
-#else
-extern char *__progname;
-#endif
-
-#define IGNORE_FIRST	(*options == '-' || *options == '+')
-#define PRINT_ERROR	((opterr) && ((*options != ':') \
-				      || (IGNORE_FIRST && options[1] != ':')))
-
-#define IS_POSIXLY_CORRECT (getenv("POSIXLY_INCORRECT_GETOPT") == NULL)
-
-#define PERMUTE         (!IS_POSIXLY_CORRECT && !IGNORE_FIRST)
-/* XXX: GNU ignores PC if *options == '-' */
-#define IN_ORDER        (!IS_POSIXLY_CORRECT && *options == '-')
-
-/* return values */
-#define	BADCH	(int)'?'
-#define	BADARG		((IGNORE_FIRST && options[1] == ':') \
-			 || (*options == ':') ? (int)':' : (int)'?')
-#define INORDER (int)1
-
-static char EMSG[1];
-
-static int getopt_internal (int, char * const *, const char *);
-static int gcd (int, int);
-static void permute_args (int, int, int, char * const *);
-
-static char *place = EMSG; /* option letter processing */
-
-/* XXX: set optreset to 1 rather than these two */
-static int nonopt_start = -1; /* first non option argument (for permute) */
-static int nonopt_end = -1;   /* first option after non options (for permute) */
-
-/* Error messages */
-static const char recargchar[] = "option requires an argument -- %c";
-static const char recargstring[] = "option requires an argument -- %s";
-static const char ambig[] = "ambiguous option -- %.*s";
-static const char noarg[] = "option doesn't take an argument -- %.*s";
-static const char illoptchar[] = "unknown option -- %c";
-static const char illoptstring[] = "unknown option -- %s";
-
-static void
-_vwarnx(const char *fmt, va_list ap)
-{
-  (void)fprintf(stderr, "%s: ", __progname);
-  if (fmt != NULL)
-    (void)vfprintf(stderr, fmt, ap);
-  (void)fprintf(stderr, "\n");
-}
-
-static void
-warnx(const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  _vwarnx(fmt, ap);
-  va_end(ap);
-}
-
-/*
- * Compute the greatest common divisor of a and b.
- */
-static int
-gcd(a, b)
-	int a;
-	int b;
-{
-	int c;
-
-	c = a % b;
-	while (c != 0) {
-		a = b;
-		b = c;
-		c = a % b;
-	}
-
-	return b;
-}
-
-/*
- * Exchange the block from nonopt_start to nonopt_end with the block
- * from nonopt_end to opt_end (keeping the same order of arguments
- * in each block).
- */
-static void
-permute_args(panonopt_start, panonopt_end, opt_end, nargv)
-	int panonopt_start;
-	int panonopt_end;
-	int opt_end;
-	char * const *nargv;
-{
-	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
-	char *swap;
-
-	_DIAGASSERT(nargv != NULL);
-
-	/*
-	 * compute lengths of blocks and number and size of cycles
-	 */
-	nnonopts = panonopt_end - panonopt_start;
-	nopts = opt_end - panonopt_end;
-	ncycle = gcd(nnonopts, nopts);
-	cyclelen = (opt_end - panonopt_start) / ncycle;
-
-	for (i = 0; i < ncycle; i++) {
-		cstart = panonopt_end+i;
-		pos = cstart;
-		for (j = 0; j < cyclelen; j++) {
-			if (pos >= panonopt_end)
-				pos -= nnonopts;
-			else
-				pos += nopts;
-			swap = nargv[pos];
-			/* LINTED const cast */
-			((char **) nargv)[pos] = nargv[cstart];
-			/* LINTED const cast */
-			((char **)nargv)[cstart] = swap;
-		}
-	}
-}
-
-/*
- * getopt_internal --
- *	Parse argc/argv argument vector.  Called by user level routines.
- *  Returns -2 if -- is found (can be long option or end of options marker).
- */
-static int
-getopt_internal(nargc, nargv, options)
-	int nargc;
-	char * const *nargv;
-	const char *options;
-{
-	char *oli;				/* option letter list index */
-	int optchar;
-
-	_DIAGASSERT(nargv != NULL);
-	_DIAGASSERT(options != NULL);
-
-	optarg = NULL;
-
-	/*
-	 * XXX Some programs (like rsyncd) expect to be able to
-	 * XXX re-initialize optind to 0 and have getopt_long(3)
-	 * XXX properly function again.  Work around this braindamage.
-	 */
-	if (optind == 0)
-		optind = 1;
-
-	if (optreset)
-		nonopt_start = nonopt_end = -1;
-start:
-	if (optreset || !*place) {		/* update scanning pointer */
-		optreset = 0;
-		if (optind >= nargc) {          /* end of argument vector */
-			place = EMSG;
-			if (nonopt_end != -1) {
-				/* do permutation, if we have to */
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			else if (nonopt_start != -1) {
-				/*
-				 * If we skipped non-options, set optind
-				 * to the first of them.
-				 */
-				optind = nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return -1;
-		}
-		if ((*(place = nargv[optind]) != '-')
-		    || (place[1] == '\0')) {    /* found non-option */
-			place = EMSG;
-			if (IN_ORDER) {
-				/*
-				 * GNU extension:
-				 * return non-option as argument to option 1
-				 */
-				optarg = nargv[optind++];
-				return INORDER;
-			}
-			if (!PERMUTE) {
-				/*
-				 * if no permutation wanted, stop parsing
-				 * at first non-option
-				 */
-				return -1;
-			}
-			/* do permutation */
-			if (nonopt_start == -1)
-				nonopt_start = optind;
-			else if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				nonopt_start = optind -
-				    (nonopt_end - nonopt_start);
-				nonopt_end = -1;
-			}
-			optind++;
-			/* process next argument */
-			goto start;
-		}
-		if (nonopt_start != -1 && nonopt_end == -1)
-			nonopt_end = optind;
-		if (place[1] && *++place == '-') {	/* found "--" */
-			place++;
-			return -2;
-		}
-	}
-	if ((optchar = (int)*place++) == (int)':' ||
-	    (oli = strchr(options + (IGNORE_FIRST ? 1 : 0), optchar)) == NULL) {
-		/* option letter unknown or ':' */
-		if (!*place)
-			++optind;
-		if (PRINT_ERROR)
-			warnx(illoptchar, optchar);
-		optopt = optchar;
-		return BADCH;
-	}
-	if (optchar == 'W' && oli[1] == ';') {		/* -W long-option */
-		/* XXX: what if no long options provided (called by getopt)? */
-		if (*place)
-			return -2;
-
-		if (++optind >= nargc) {	/* no arg */
-			place = EMSG;
-			if (PRINT_ERROR)
-				warnx(recargchar, optchar);
-			optopt = optchar;
-			return BADARG;
-		} else				/* white space */
-			place = nargv[optind];
-		/*
-		 * Handle -W arg the same as --arg (which causes getopt to
-		 * stop parsing).
-		 */
-		return -2;
-	}
-	if (*++oli != ':') {			/* doesn't take argument */
-		if (!*place)
-			++optind;
-	} else {				/* takes (optional) argument */
-		optarg = NULL;
-		if (*place)			/* no white space */
-			optarg = place;
-		/* XXX: disable test for :: if PC? (GNU doesn't) */
-		else if (oli[1] != ':') {	/* arg not optional */
-			if (++optind >= nargc) {	/* no arg */
-				place = EMSG;
-				if (PRINT_ERROR)
-					warnx(recargchar, optchar);
-				optopt = optchar;
-				return BADARG;
-			} else
-				optarg = nargv[optind];
-		}
-		place = EMSG;
-		++optind;
-	}
-	/* dump back option letter */
-	return optchar;
-}
-
-#ifdef REPLACE_GETOPT
-/*
- * getopt --
- *	Parse argc/argv argument vector.
- *
- * [eventually this will replace the real getopt]
- */
-int
-getopt(nargc, nargv, options)
-	int nargc;
-	char * const *nargv;
-	const char *options;
-{
-	int retval;
-
-	_DIAGASSERT(nargv != NULL);
-	_DIAGASSERT(options != NULL);
-
-	if ((retval = getopt_internal(nargc, nargv, options)) == -2) {
-		++optind;
-		/*
-		 * We found an option (--), so if we skipped non-options,
-		 * we have to permute.
-		 */
-		if (nonopt_end != -1) {
-			permute_args(nonopt_start, nonopt_end, optind,
-				       nargv);
-			optind -= nonopt_end - nonopt_start;
-		}
-		nonopt_start = nonopt_end = -1;
-		retval = -1;
-	}
-	return retval;
-}
-#endif
-
-/*
- * getopt_long --
- *	Parse argc/argv argument vector.
- */
-int
-getopt_long(nargc, nargv, options, long_options, idx)
-	int nargc;
-	char * const *nargv;
-	const char *options;
-	const struct option *long_options;
-	int *idx;
-{
-	int retval;
-
-	_DIAGASSERT(nargv != NULL);
-	_DIAGASSERT(options != NULL);
-	_DIAGASSERT(long_options != NULL);
-	/* idx may be NULL */
-
-	if ((retval = getopt_internal(nargc, nargv, options)) == -2) {
-		char *current_argv, *has_equal;
-		size_t current_argv_len;
-		int i, match;
-
-		current_argv = place;
-		match = -1;
-
-		optind++;
-		place = EMSG;
-
-		if (*current_argv == '\0') {		/* found "--" */
-			/*
-			 * We found an option (--), so if we skipped
-			 * non-options, we have to permute.
-			 */
-			if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return -1;
-		}
-		if ((has_equal = strchr(current_argv, '=')) != NULL) {
-			/* argument found (--option=arg) */
-			current_argv_len = has_equal - current_argv;
-			has_equal++;
-		} else
-			current_argv_len = strlen(current_argv);
-
-		for (i = 0; long_options[i].name; i++) {
-			/* find matching long option */
-			if (strncmp(current_argv, long_options[i].name,
-			    current_argv_len))
-				continue;
-
-			if (strlen(long_options[i].name) ==
-			    (unsigned)current_argv_len) {
-				/* exact match */
-				match = i;
-				break;
-			}
-			if (match == -1)		/* partial match */
-				match = i;
-			else {
-				/* ambiguous abbreviation */
-				if (PRINT_ERROR)
-					warnx(ambig, (int)current_argv_len,
-					     current_argv);
-				optopt = 0;
-				return BADCH;
-			}
-		}
-		if (match != -1) {			/* option found */
-			if (long_options[match].has_arg == no_argument
-			    && has_equal) {
-				if (PRINT_ERROR)
-					warnx(noarg, (int)current_argv_len,
-					     current_argv);
-				/*
-				 * XXX: GNU sets optopt to val regardless of
-				 * flag
-				 */
-				if (long_options[match].flag == NULL)
-					optopt = long_options[match].val;
-				else
-					optopt = 0;
-				return BADARG;
-			}
-			if (long_options[match].has_arg == required_argument ||
-			    long_options[match].has_arg == optional_argument) {
-				if (has_equal)
-					optarg = has_equal;
-				else if (long_options[match].has_arg ==
-				    required_argument) {
-					/*
-					 * optional argument doesn't use
-					 * next nargv
-					 */
-					optarg = nargv[optind++];
-				}
-			}
-			if ((long_options[match].has_arg == required_argument)
-			    && (optarg == NULL)) {
-				/*
-				 * Missing argument; leading ':'
-				 * indicates no error should be generated
-				 */
-				if (PRINT_ERROR)
-					warnx(recargstring, current_argv);
-				/*
-				 * XXX: GNU sets optopt to val regardless
-				 * of flag
-				 */
-				if (long_options[match].flag == NULL)
-					optopt = long_options[match].val;
-				else
-					optopt = 0;
-				--optind;
-				return BADARG;
-			}
-		} else {			/* unknown option */
-			if (PRINT_ERROR)
-				warnx(illoptstring, current_argv);
-			optopt = 0;
-			return BADCH;
-		}
-		if (long_options[match].flag) {
-			*long_options[match].flag = long_options[match].val;
-			retval = 0;
-		} else
-			retval = long_options[match].val;
-		if (idx)
-			*idx = match;
-	}
-	return retval;
-}
diff --git a/winsup/cygwin/libc/iruserok.c b/winsup/cygwin/libc/iruserok.c
deleted file mode 100644
index 8326dd0a5..000000000
--- a/winsup/cygwin/libc/iruserok.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/* Based on the rcmd.c.new file distributed with linux libc 5.4.19
-   Adapted to inetutils by Bernhard Rosenkraenzer <bero@startrek.in-trier.de>
-
-   Note that a lot in this file is superfluous; hopefully it won't be a
-   problem for systems that need it for iruserok &c....  */
-/*
- * Copyright (c) 1983, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "winsup.h"
-#include <pwd.h>
-#include <sys/stat.h>
-#include <malloc.h>
-#include <string.h>
-#include <netdb.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <time.h>
-
-#ifndef PATH_HEQUIV
-# define PATH_HEQUIV "/etc/hosts.equiv"
-#endif
-
-int         __check_rhosts_file = 1;
-const char *__rcmd_errstr;
-
-/*
- * Returns "true" if match, 0 if no match.
- */
-static int
-__icheckhost(raddr, lhost)
-  u_long raddr;
-  register char *lhost;
-{
-	register struct hostent *hp;
-	register u_long laddr;
-	register char **pp;
-
-	/* Try for raw ip address first. */
-	if (isdigit(*lhost) && (long)(laddr = cygwin_inet_addr(lhost)) != -1)
-		return (raddr == laddr);
-
-	/* Better be a hostname. */
-	if ((hp = cygwin_gethostbyname(lhost)) == NULL)
-		return (0);
-
-	/* Spin through ip addresses. */
-	for (pp = hp->h_addr_list; *pp; ++pp)
-		if (!bcmp(&raddr, *pp, sizeof(u_long)))
-			return (1);
-
-	/* No match. */
-	return (0);
-}
-
-/*
- * XXX
- * Don't make static, used by lpd(8).
- *
- * Returns 0 if ok, -1 if not ok.
- */
-static int
-__ivaliduser(hostf, raddr, luser, ruser)
-  struct __sFILE64 *hostf;
-  u_long raddr;
-  const char *luser;
-  const char *ruser;
-{
-	size_t buf_offs = 0;
-	size_t buf_len = 256;
-	char *buf = malloc (buf_len);
-
-	if (! buf)
-		return -1;
-
-	while (fgets(buf + buf_offs, buf_len - buf_offs, hostf)) {
-		/*int ch;*/
-		register char *user, *p;
-
-		if (strchr(buf + buf_offs, '\n') == NULL) {
-			/* No newline yet, read some more.  */
-			buf_offs += strlen (buf + buf_offs);
-
-			if (buf_offs >= buf_len - 1) {
-				/* Make more room in BUF.  */
-				char *new_buf;
-
-				buf_len += buf_len;
-				new_buf = realloc (buf, buf_len);
-
-				if (! new_buf) {
-					free (buf);
-					return -1;
-				}
-
-				buf = new_buf;
-			}
-
-			continue;
-		}
-
-		buf_offs = 0;			/* Start at beginning next time around.  */
-
-		p = buf;
-		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
-			/* *p = isupper(*p) ? tolower(*p) : *p;  -- Uli */
-			*p = tolower(*p);	/* works for linux libc */
-			p++;
-		}
-		if (*p == ' ' || *p == '\t') {
-			*p++ = '\0';
-			while (*p == ' ' || *p == '\t')
-				p++;
-			user = p;
-			while (*p != '\n' && *p != ' ' &&
-			    *p != '\t' && *p != '\0')
-				p++;
-		} else
-			user = p;
-		*p = '\0';
-
-		if (__icheckhost(raddr, buf) && !strcmp(ruser, *user ? user : luser)) {
-			free (buf);
-			return (0);
-		}
-	}
-
-	free (buf);
-
-	return (-1);
-}
-
-/*
- * New .rhosts strategy: We are passed an ip address. We spin through
- * hosts.equiv and .rhosts looking for a match. When the .rhosts only
- * has ip addresses, we don't have to trust a nameserver.  When it
- * contains hostnames, we spin through the list of addresses the nameserver
- * gives us and look for a match.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok(raddr, superuser, ruser, luser)
-  u_long raddr;
-  int superuser;
-  const char *ruser;
-  const char *luser;
-{
-	register const char *cp;
-	struct __stat64 sbuf;
-	struct passwd *pwd;
-	struct __sFILE64 *hostf;
-
-	uid_t uid;
-	int first = 1;
-	char *pbuf;
-
-	first = 1;
-	hostf = superuser ? NULL : fopen64(PATH_HEQUIV, "rt");
-again:
-	if (hostf) {
-		if (__ivaliduser(hostf, raddr, luser, ruser) == 0) {
-			(void) fclose(hostf);
-			return(0);
-		}
-		(void) fclose(hostf);
-	}
-	if (first == 1 && (__check_rhosts_file || superuser)) {
-		first = 0;
-		if ((pwd = getpwnam(luser)) == NULL)
-			return(-1);
-
-		pbuf = malloc (strlen (pwd->pw_dir) + sizeof "/.rhosts");
-		if (! pbuf)
-		  {
-		    errno = ENOMEM;
-		    return -1;
-		  }
-		strcpy (pbuf, pwd->pw_dir);
-		strcat (pbuf, "/.rhosts");
-
-		/*
-		 * Change effective uid while opening .rhosts.  If root and
-		 * reading an NFS mounted file system, can't read files that
-		 * are protected read/write owner only.
-		 */
-		uid = geteuid32();
-		(void)seteuid32(pwd->pw_uid);
-		hostf = fopen64(pbuf, "rt");
-		(void)seteuid32(uid);
-
-		if (hostf == NULL)
-			return(-1);
-		/*
-		 * If not a regular file, or is owned by someone other than
-		 * user or root or if writeable by anyone but the owner, quit.
-		 */
-		cp = NULL;
-		if (lstat64(pbuf, &sbuf) < 0)
-			cp = ".rhosts not regular file";
-		else if (!S_ISREG(sbuf.st_mode))
-			cp = ".rhosts not regular file";
-		else if (fstat64(fileno(hostf), &sbuf) < 0)
-			cp = ".rhosts fstat failed";
-		else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
-			cp = "bad .rhosts owner";
-		else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
-			cp = ".rhosts writeable by other than owner";
-		/* If there were any problems, quit. */
-		if (cp) {
-			__rcmd_errstr = (char *) cp;
-			fclose(hostf);
-			return(-1);
-		}
-		goto again;
-	}
-	return (-1);
-}
-
-int
-ruserok(rhost, superuser, ruser, luser)
-  const char *rhost;
-  int superuser;
-  const char *ruser;
-  const char *luser;
-{
-	struct hostent *hp;
-	u_long addr;
-	char **ap;
-
-	if ((hp = cygwin_gethostbyname(rhost)) == NULL)
-		return (-1);
-	for (ap = hp->h_addr_list; *ap; ++ap) {
-		bcopy(*ap, &addr, sizeof(addr));
-		if (iruserok(addr, superuser, ruser, luser) == 0)
-			return (0);
-	}
-	return (-1);
-}
diff --git a/winsup/cygwin/localtime.cc b/winsup/cygwin/localtime.cc
deleted file mode 100644
index 3a64d689c..000000000
--- a/winsup/cygwin/localtime.cc
+++ /dev/null
@@ -1,2154 +0,0 @@
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
-*/
-/* Temporarily merged private.h and tzfile.h for ease of management - DJ */
-
-#include "winsup.h"
-#include "cygerrno.h"
-#include <windows.h>
-#define lint
-
-#define USG_COMPAT
-
-#ifndef lint
-#ifndef NOID
-static char	elsieid[] = "@(#)localtime.c	7.66";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-/*
-** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu).
-** POSIX-style TZ environment variable handling from Guy Harris
-** (guy@auspex.com).
-*/
-
-/*LINTLIBRARY*/
-
-#ifndef PRIVATE_H
-
-#define PRIVATE_H
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
-*/
-
-/*
-** This header is for use ONLY with the time conversion code.
-** There is no guarantee that it will remain unchanged,
-** or that it will remain at all.
-** Do NOT copy it to any system include directory.
-** Thank you!
-*/
-
-/*
-** ID
-*/
-
-#ifndef lint
-#ifndef NOID
-static char	privatehid[] = "@(#)private.h	7.48";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-/*
-** Defaults for preprocessor symbols.
-** You can override these in your C compiler options, e.g. `-DHAVE_ADJTIME=0'.
-*/
-
-#ifndef HAVE_ADJTIME
-#define HAVE_ADJTIME		1
-#endif /* !defined HAVE_ADJTIME */
-
-#ifndef HAVE_GETTEXT
-#define HAVE_GETTEXT		0
-#endif /* !defined HAVE_GETTEXT */
-
-#ifndef HAVE_SETTIMEOFDAY
-#define HAVE_SETTIMEOFDAY	3
-#endif /* !defined HAVE_SETTIMEOFDAY */
-
-#ifndef HAVE_STRERROR
-#define HAVE_STRERROR		0
-#endif /* !defined HAVE_STRERROR */
-
-#ifndef HAVE_SYMLINK
-#define HAVE_SYMLINK		1
-#endif /* !defined HAVE_SYMLINK */
-
-#ifndef HAVE_UNISTD_H
-#define HAVE_UNISTD_H		1
-#endif /* !defined HAVE_UNISTD_H */
-
-#ifndef HAVE_UTMPX_H
-#define HAVE_UTMPX_H		0
-#endif /* !defined HAVE_UTMPX_H */
-
-#ifndef LOCALE_HOME
-#define LOCALE_HOME		"/usr/lib/locale"
-#endif /* !defined LOCALE_HOME */
-
-/*
-** Nested includes
-*/
-
-#include "sys/types.h"	/* for time_t */
-#include "stdio.h"
-#include "limits.h"	/* for CHAR_BIT */
-#include "time.h"
-#include "stdlib.h"
-
-#if HAVE_GETTEXT - 0
-#include "libintl.h"
-#endif /* HAVE_GETTEXT - 0 */
-
-#if HAVE_UNISTD_H - 0
-#include "unistd.h"	/* for F_OK and R_OK */
-#endif /* HAVE_UNISTD_H - 0 */
-
-#if !(HAVE_UNISTD_H - 0)
-#ifndef F_OK
-#define F_OK	0
-#endif /* !defined F_OK */
-#ifndef R_OK
-#define R_OK	4
-#endif /* !defined R_OK */
-#endif /* !(HAVE_UNISTD_H - 0) */
-
-/* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX.  */
-#define is_digit(c) ((unsigned)(c) - '0' <= 9)
-
-/*
-** Workarounds for compilers/systems.
-*/
-
-/*
-** SunOS 4.1.1 cc lacks const.
-*/
-
-#ifndef const
-#ifndef __STDC__
-#define const
-#endif /* !defined __STDC__ */
-#endif /* !defined const */
-
-/*
-** SunOS 4.1.1 cc lacks prototypes.
-*/
-
-#ifndef P
-#ifdef __STDC__
-#define P(x)	x
-#endif /* defined __STDC__ */
-#ifndef __STDC__
-#define P(x)	()
-#endif /* !defined __STDC__ */
-#endif /* !defined P */
-
-/*
-** SunOS 4.1.1 headers lack EXIT_SUCCESS.
-*/
-
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS	0
-#endif /* !defined EXIT_SUCCESS */
-
-/*
-** SunOS 4.1.1 headers lack EXIT_FAILURE.
-*/
-
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE	1
-#endif /* !defined EXIT_FAILURE */
-
-/*
-** SunOS 4.1.1 headers lack FILENAME_MAX.
-*/
-
-#ifndef FILENAME_MAX
-
-#ifndef MAXPATHLEN
-#ifdef unix
-#include "sys/param.h"
-#endif /* defined unix */
-#endif /* !defined MAXPATHLEN */
-
-#ifdef MAXPATHLEN
-#define FILENAME_MAX	MAXPATHLEN
-#endif /* defined MAXPATHLEN */
-#ifndef MAXPATHLEN
-#define FILENAME_MAX	1024		/* Pure guesswork */
-#endif /* !defined MAXPATHLEN */
-
-#endif /* !defined FILENAME_MAX */
-
-/*
-** SunOS 4.1.1 libraries lack remove.
-*/
-
-#ifndef remove
-extern int	unlink P((const char * filename));
-#define remove	unlink
-#endif /* !defined remove */
-
-/*
-** Finally, some convenience items.
-*/
-
-#ifndef TYPE_BIT
-#define TYPE_BIT(type)	(sizeof (type) * CHAR_BIT)
-#endif /* !defined TYPE_BIT */
-
-#ifndef TYPE_SIGNED
-#define TYPE_SIGNED(type) (((type) -1) < 0)
-#endif /* !defined TYPE_SIGNED */
-
-#ifndef INT_STRLEN_MAXIMUM
-/*
-** 302 / 1000 is log10(2.0) rounded up.
-** Subtract one for the sign bit if the type is signed;
-** add one for integer division truncation;
-** add one more for a minus sign if the type is signed.
-*/
-#define INT_STRLEN_MAXIMUM(type) \
-    ((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type))
-#endif /* !defined INT_STRLEN_MAXIMUM */
-
-/*
-** INITIALIZE(x)
-*/
-
-#ifndef GNUC_or_lint
-#ifdef lint
-#define GNUC_or_lint
-#endif /* defined lint */
-#ifndef lint
-#ifdef __GNUC__
-#define GNUC_or_lint
-#endif /* defined __GNUC__ */
-#endif /* !defined lint */
-#endif /* !defined GNUC_or_lint */
-
-#ifndef INITIALIZE
-#ifdef GNUC_or_lint
-#define INITIALIZE(x)	((x) = 0)
-#endif /* defined GNUC_or_lint */
-#ifndef GNUC_or_lint
-#define INITIALIZE(x)
-#endif /* !defined GNUC_or_lint */
-#endif /* !defined INITIALIZE */
-
-/*
-** For the benefit of GNU folk...
-** `_(MSGID)' uses the current locale's message library string for MSGID.
-** The default is to use gettext if available, and use MSGID otherwise.
-*/
-
-#ifndef _
-#if HAVE_GETTEXT - 0
-#define _(msgid) gettext(msgid)
-#else /* !(HAVE_GETTEXT - 0) */
-#define _(msgid) msgid
-#endif /* !(HAVE_GETTEXT - 0) */
-#endif /* !defined _ */
-
-#ifndef TZ_DOMAIN
-#define TZ_DOMAIN "tz"
-#endif /* !defined TZ_DOMAIN */
-
-/*
-** UNIX was a registered trademark of UNIX System Laboratories in 1993.
-*/
-
-#endif /* !defined PRIVATE_H */
-
-#ifndef TZFILE_H
-
-#define TZFILE_H
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
-*/
-
-/*
-** This header is for use ONLY with the time conversion code.
-** There is no guarantee that it will remain unchanged,
-** or that it will remain at all.
-** Do NOT copy it to any system include directory.
-** Thank you!
-*/
-
-/*
-** ID
-*/
-
-#ifndef lint
-#ifndef NOID
-static char	tzfilehid[] = "@(#)tzfile.h	7.14";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-/*
-** Information about time zone files.
-*/
-
-#ifndef TZDIR
-#define TZDIR	"/usr/share/zoneinfo" /* Time zone object file directory */
-#endif /* !defined TZDIR */
-
-#ifndef TZDEFAULT
-#define TZDEFAULT	"localtime"
-#endif /* !defined TZDEFAULT */
-
-#ifndef TZDEFRULES
-#define TZDEFRULES	"posixrules"
-#endif /* !defined TZDEFRULES */
-
-/*
-** Each file begins with. . .
-*/
-
-#define	TZ_MAGIC	"TZif"
-
-struct tzhead {
-	char	tzh_magic[4];		/* TZ_MAGIC */
-	char	tzh_reserved[16];	/* reserved for future use */
-	char	tzh_ttisgmtcnt[4];	/* coded number of trans. time flags */
-	char	tzh_ttisstdcnt[4];	/* coded number of trans. time flags */
-	char	tzh_leapcnt[4];		/* coded number of leap seconds */
-	char	tzh_timecnt[4];		/* coded number of transition times */
-	char	tzh_typecnt[4];		/* coded number of local time types */
-	char	tzh_charcnt[4];		/* coded number of abbr. chars */
-};
-
-/*
-** . . .followed by. . .
-**
-**	tzh_timecnt (char [4])s		coded transition times a la time(2)
-**	tzh_timecnt (unsigned char)s	types of local time starting at above
-**	tzh_typecnt repetitions of
-**		one (char [4])		coded UTC offset in seconds
-**		one (unsigned char)	used to set tm_isdst
-**		one (unsigned char)	that's an abbreviation list index
-**	tzh_charcnt (char)s		'\0'-terminated zone abbreviations
-**	tzh_leapcnt repetitions of
-**		one (char [4])		coded leap second transition times
-**		one (char [4])		total correction after above
-**	tzh_ttisstdcnt (char)s		indexed by type; if true, transition
-**					time is standard time, if false,
-**					transition time is wall clock time
-**					if absent, transition times are
-**					assumed to be wall clock time
-**	tzh_ttisgmtcnt (char)s		indexed by type; if true, transition
-**					time is UTC, if false,
-**					transition time is local time
-**					if absent, transition times are
-**					assumed to be local time
-*/
-
-/*
-** In the current implementation, "tzset()" refuses to deal with files that
-** exceed any of the limits below.
-*/
-
-#ifndef TZ_MAX_TIMES
-/*
-** The TZ_MAX_TIMES value below is enough to handle a bit more than a
-** year's worth of solar time (corrected daily to the nearest second) or
-** 138 years of Pacific Presidential Election time
-** (where there are three time zone transitions every fourth year).
-*/
-#define TZ_MAX_TIMES	370
-#endif /* !defined TZ_MAX_TIMES */
-
-#ifndef TZ_MAX_TYPES
-#ifndef NOSOLAR
-#define TZ_MAX_TYPES	256 /* Limited by what (unsigned char)'s can hold */
-#endif /* !defined NOSOLAR */
-#ifdef NOSOLAR
-/*
-** Must be at least 14 for Europe/Riga as of Jan 12 1995,
-** as noted by Earl Chew <earl@hpato.aus.hp.com>.
-*/
-#define TZ_MAX_TYPES	20	/* Maximum number of local time types */
-#endif /* !defined NOSOLAR */
-#endif /* !defined TZ_MAX_TYPES */
-
-#ifndef TZ_MAX_CHARS
-#define TZ_MAX_CHARS	50	/* Maximum number of abbreviation characters */
-				/* (limited by what unsigned chars can hold) */
-#endif /* !defined TZ_MAX_CHARS */
-
-#ifndef TZ_MAX_LEAPS
-#define TZ_MAX_LEAPS	50	/* Maximum number of leap second corrections */
-#endif /* !defined TZ_MAX_LEAPS */
-
-#define SECSPERMIN	60
-#define MINSPERHOUR	60
-#define HOURSPERDAY	24
-#define DAYSPERWEEK	7
-#define DAYSPERNYEAR	365
-#define DAYSPERLYEAR	366
-#define SECSPERHOUR	(SECSPERMIN * MINSPERHOUR)
-#define SECSPERDAY	((long) SECSPERHOUR * HOURSPERDAY)
-#define MONSPERYEAR	12
-
-#define TM_SUNDAY	0
-#define TM_MONDAY	1
-#define TM_TUESDAY	2
-#define TM_WEDNESDAY	3
-#define TM_THURSDAY	4
-#define TM_FRIDAY	5
-#define TM_SATURDAY	6
-
-#define TM_JANUARY	0
-#define TM_FEBRUARY	1
-#define TM_MARCH	2
-#define TM_APRIL	3
-#define TM_MAY		4
-#define TM_JUNE		5
-#define TM_JULY		6
-#define TM_AUGUST	7
-#define TM_SEPTEMBER	8
-#define TM_OCTOBER	9
-#define TM_NOVEMBER	10
-#define TM_DECEMBER	11
-
-#define TM_YEAR_BASE	1900
-
-#define EPOCH_YEAR	1970
-#define EPOCH_WDAY	TM_THURSDAY
-
-/*
-** Accurate only for the past couple of centuries;
-** that will probably do.
-*/
-
-#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
-
-#ifndef USG
-
-/*
-** Use of the underscored variants may cause problems if you move your code to
-** certain System-V-based systems; for maximum portability, use the
-** underscore-free variants.  The underscored variants are provided for
-** backward compatibility only; they may disappear from future versions of
-** this file.
-*/
-
-#define SECS_PER_MIN	SECSPERMIN
-#define MINS_PER_HOUR	MINSPERHOUR
-#define HOURS_PER_DAY	HOURSPERDAY
-#define DAYS_PER_WEEK	DAYSPERWEEK
-#define DAYS_PER_NYEAR	DAYSPERNYEAR
-#define DAYS_PER_LYEAR	DAYSPERLYEAR
-#define SECS_PER_HOUR	SECSPERHOUR
-#define SECS_PER_DAY	SECSPERDAY
-#define MONS_PER_YEAR	MONSPERYEAR
-
-#endif /* !defined USG */
-
-#endif /* !defined TZFILE_H */
-
-#include "fcntl.h"
-
-/*
-** SunOS 4.1.1 headers lack O_BINARY.
-*/
-
-#ifdef O_BINARY
-#define OPEN_MODE	(O_RDONLY | O_BINARY)
-#endif /* defined O_BINARY */
-#ifndef O_BINARY
-#define OPEN_MODE	O_RDONLY
-#endif /* !defined O_BINARY */
-
-#ifndef WILDABBR
-/*
-** Someone might make incorrect use of a time zone abbreviation:
-**	1.	They might reference tzname[0] before calling tzset (explicitly
-**		or implicitly).
-**	2.	They might reference tzname[1] before calling tzset (explicitly
-**		or implicitly).
-**	3.	They might reference tzname[1] after setting to a time zone
-**		in which Daylight Saving Time is never observed.
-**	4.	They might reference tzname[0] after setting to a time zone
-**		in which Standard Time is never observed.
-**	5.	They might reference tm.TM_ZONE after calling offtime.
-** What's best to do in the above cases is open to debate;
-** for now, we just set things up so that in any of the five cases
-** WILDABBR is used.  Another possibility:  initialize tzname[0] to the
-** string "tzname[0] used before set", and similarly for the other cases.
-** And another:  initialize tzname[0] to "ERA", with an explanation in the
-** manual page of what this "time zone abbreviation" means (doing this so
-** that tzname[0] has the "normal" length of three characters).
-*/
-#define WILDABBR	"   "
-#endif /* !defined WILDABBR */
-
-static char wildabbr[] NO_COPY = WILDABBR;
-
-static char gmt[] NO_COPY = "GMT";
-
-struct ttinfo {				/* time type information */
-	long		tt_gmtoff;	/* UTC offset in seconds */
-	int		tt_isdst;	/* used to set tm_isdst */
-	int		tt_abbrind;	/* abbreviation list index */
-	int		tt_ttisstd;	/* true if transition is std time */
-	int		tt_ttisgmt;	/* true if transition is UTC */
-};
-
-struct lsinfo {				/* leap second information */
-	time_t		ls_trans;	/* transition time */
-	long		ls_corr;	/* correction to apply */
-};
-
-#define BIGGEST(a, b)	(((a) > (b)) ? (a) : (b))
-
-#ifdef TZNAME_MAX
-#define MY_TZNAME_MAX	TZNAME_MAX
-#endif /* defined TZNAME_MAX */
-#ifndef TZNAME_MAX
-#define MY_TZNAME_MAX	255
-#endif /* !defined TZNAME_MAX */
-
-struct state {
-	int		leapcnt;
-	int		timecnt;
-	int		typecnt;
-	int		charcnt;
-	time_t		ats[TZ_MAX_TIMES];
-	unsigned char	types[TZ_MAX_TIMES];
-	struct ttinfo	ttis[TZ_MAX_TYPES];
-	char		chars[BIGGEST(BIGGEST(TZ_MAX_CHARS + 1, sizeof gmt),
-				(2 * (MY_TZNAME_MAX + 1)))];
-	struct lsinfo	lsis[TZ_MAX_LEAPS];
-};
-
-struct rule {
-	int		r_type;		/* type of rule--see below */
-	int		r_day;		/* day number of rule */
-	int		r_week;		/* week number of rule */
-	int		r_mon;		/* month number of rule */
-	long		r_time;		/* transition time of rule */
-};
-
-#define JULIAN_DAY		0	/* Jn - Julian day */
-#define DAY_OF_YEAR		1	/* n - day of year */
-#define MONTH_NTH_DAY_OF_WEEK	2	/* Mm.n.d - month, week, day of week */
-
-/*
-** Prototypes for static functions.
-*/
-
-static long		detzcode P((const char * codep));
-static const char *	getzname P((const char * strp));
-static const char *	getnum P((const char * strp, int * nump, int min,
-				int max));
-static const char *	getsecs P((const char * strp, long * secsp));
-static const char *	getoffset P((const char * strp, long * offsetp));
-static const char *	getrule P((const char * strp, struct rule * rulep));
-static void		gmtload P((struct state * sp));
-static void		gmtsub P((const time_t * timep, long offset,
-				struct tm * tmp));
-static void		localsub P((const time_t * timep, long offset,
-				struct tm * tmp));
-static int		increment_overflow P((int * number, int delta));
-static int		normalize_overflow P((int * tensptr, int * unitsptr,
-				int base));
-static void		settzname P((void));
-static time_t		time1 P((struct tm * tmp,
-				void(*funcp) P((const time_t *,
-				long, struct tm *)),
-				long offset));
-static time_t		time2 P((struct tm *tmp,
-				void(*funcp) P((const time_t *,
-				long, struct tm*)),
-				long offset, int * okayp));
-static time_t		time2sub P((struct tm *tmp,
-				void(*funcp) P((const time_t *,
-				long, struct tm*)),
-				long offset, int * okayp, int do_norm_secs));
-static void		timesub P((const time_t * timep, long offset,
-				const struct state * sp, struct tm * tmp));
-static int		tmcomp P((const struct tm * atmp,
-				const struct tm * btmp));
-static time_t		transtime P((time_t janfirst, int year,
-				const struct rule * rulep, long offset));
-static int		tzload P((const char * name, struct state * sp));
-static int		tzparse P((const char * name, struct state * sp,
-				int lastditch));
-
-#ifdef ALL_STATE
-static struct state *	lclptr;
-static struct state *	gmtptr;
-#endif /* defined ALL_STATE */
-
-#ifndef ALL_STATE
-static struct state	lclmem;
-static struct state	gmtmem;
-#define lclptr		(&lclmem)
-#define gmtptr		(&gmtmem)
-#endif /* State Farm */
-
-#ifndef TZ_STRLEN_MAX
-#define TZ_STRLEN_MAX 255
-#endif /* !defined TZ_STRLEN_MAX */
-
-static char		lcl_TZname[TZ_STRLEN_MAX + 1];
-static int		lcl_is_set;
-static int		gmt_is_set;
-
-#define tzname _tzname
-#undef _tzname
-
-char *	tzname[2] = {
-	wildabbr,
-	wildabbr
-};
-
-/*
-** Section 4.12.3 of X3.159-1989 requires that
-**	Except for the strftime function, these functions [asctime,
-**	ctime, gmtime, localtime] return values in one of two static
-**	objects: a broken-down time structure and an array of char.
-** Thanks to Paul Eggert (eggert@twinsun.com) for noting this.
-*/
-
-static struct tm	tm;
-
-
-/* These variables are initialized by tzset.  The macro versions are
-   defined in time.h, and indirect through the __imp_ pointers.  */
-
-#define timezone _timezone
-#define daylight _daylight
-#undef _timezone
-#undef _daylight
-
-#ifdef USG_COMPAT
-time_t			timezone;
-int			daylight;
-#endif /* defined USG_COMPAT */
-
-#ifdef ALTZONE
-time_t			altzone;
-#endif /* defined ALTZONE */
-
-static long
-detzcode(const char *codep)
-{
-	register long	result;
-	register int	i;
-
-	result = (codep[0] & 0x80) ? ~0L : 0L;
-	for (i = 0; i < 4; ++i)
-		result = (result << 8) | (codep[i] & 0xff);
-	return result;
-}
-
-static void
-settzname P((void))
-{
-	register struct state * const	sp = lclptr;
-	register int			i;
-
-	tzname[0] = wildabbr;
-	tzname[1] = wildabbr;
-#ifdef USG_COMPAT
-	daylight = 0;
-	timezone = 0;
-#endif /* defined USG_COMPAT */
-#ifdef ALTZONE
-	altzone = 0;
-#endif /* defined ALTZONE */
-#ifdef ALL_STATE
-	if (sp == NULL) {
-		tzname[0] = tzname[1] = gmt;
-		return;
-	}
-#endif /* defined ALL_STATE */
-	for (i = 0; i < sp->typecnt; ++i) {
-		register const struct ttinfo * const	ttisp = &sp->ttis[i];
-
-		tzname[ttisp->tt_isdst] =
-			&sp->chars[ttisp->tt_abbrind];
-#ifdef USG_COMPAT
-		if (ttisp->tt_isdst)
-			daylight = 1;
-		if (i == 0 || !ttisp->tt_isdst)
-			timezone = -(ttisp->tt_gmtoff);
-#endif /* defined USG_COMPAT */
-#ifdef ALTZONE
-		if (i == 0 || ttisp->tt_isdst)
-			altzone = -(ttisp->tt_gmtoff);
-#endif /* defined ALTZONE */
-	}
-	/*
-	** And to get the latest zone names into tzname. . .
-	*/
-	for (i = 0; i < sp->timecnt; ++i) {
-		register const struct ttinfo * const	ttisp =
-							&sp->ttis[
-								sp->types[i]];
-
-		tzname[ttisp->tt_isdst] =
-			&sp->chars[ttisp->tt_abbrind];
-	}
-}
-
-#include "tz_posixrules.h"
-
-static int
-tzload(const char *name, struct state *sp)
-{
-	register const char *	p;
-	register int		i;
-	register int		fid;
-	save_errno		save;
-
-	if (name == NULL && (name = TZDEFAULT) == NULL)
-		return -1;
-	{
-		register int	doaccess;
-		/*
-		** Section 4.9.1 of the C standard says that
-		** "FILENAME_MAX expands to an integral constant expression
-		** that is the size needed for an array of char large enough
-		** to hold the longest file name string that the implementation
-		** guarantees can be opened."
-		*/
-		char		fullname[FILENAME_MAX + 1];
-
-		if (name[0] == ':')
-			++name;
-		doaccess = name[0] == '/';
-		if (!doaccess) {
-			if ((p = TZDIR) == NULL)
-				return -1;
-			if ((strlen(p) + strlen(name) + 1) >= sizeof fullname)
-				return -1;
-			(void) strcpy(fullname, p);
-			(void) strcat(fullname, "/");
-			(void) strcat(fullname, name);
-			/*
-			** Set doaccess if '.' (as in "../") shows up in name.
-			*/
-			if (strchr(name, '.') != NULL)
-				doaccess = true;
-			name = fullname;
-		}
-#if 0
-		if (doaccess && access(name, R_OK) != 0)
-			return -1;
-#endif
-		if ((fid = open(name, OPEN_MODE)) == -1)
-		  {
-		    const char *base = strrchr(name, '/');
-		    if (base)
-		      base++;
-		    else
-		      base = name;
-		    if (strcmp(base, "posixrules"))
-		      return -1;
-
-		    /* We've got a built-in copy of posixrules just in case */
-		    fid = -2;
-		  }
-	}
-	{
-		struct tzhead *	tzhp;
-		union {
-		  struct tzhead tzhead;
-		  char		buf[sizeof *sp + sizeof *tzhp];
-		} u;
-		int		ttisstdcnt;
-		int		ttisgmtcnt;
-
-		if (fid == -2)
-		  {
-		    memcpy(u.buf, _posixrules_data, sizeof (_posixrules_data));
-		    i = sizeof (_posixrules_data);
-		  }
-		else
-		  {
-		    i = read(fid, u.buf, sizeof u.buf);
-		    if (close(fid) != 0)
-			return -1;
-		  }
-		ttisstdcnt = (int) detzcode(u.tzhead.tzh_ttisgmtcnt);
-		ttisgmtcnt = (int) detzcode(u.tzhead.tzh_ttisstdcnt);
-		sp->leapcnt = (int) detzcode(u.tzhead.tzh_leapcnt);
-		sp->timecnt = (int) detzcode(u.tzhead.tzh_timecnt);
-		sp->typecnt = (int) detzcode(u.tzhead.tzh_typecnt);
-		sp->charcnt = (int) detzcode(u.tzhead.tzh_charcnt);
-		p = u.tzhead.tzh_charcnt + sizeof u.tzhead.tzh_charcnt;
-		if (sp->leapcnt < 0 || sp->leapcnt > TZ_MAX_LEAPS ||
-			sp->typecnt <= 0 || sp->typecnt > TZ_MAX_TYPES ||
-			sp->timecnt < 0 || sp->timecnt > TZ_MAX_TIMES ||
-			sp->charcnt < 0 || sp->charcnt > TZ_MAX_CHARS ||
-			(ttisstdcnt != sp->typecnt && ttisstdcnt != 0) ||
-			(ttisgmtcnt != sp->typecnt && ttisgmtcnt != 0))
-				return -1;
-		if (i - (p - u.buf) < sp->timecnt * 4 +	/* ats */
-			sp->timecnt +			/* types */
-			sp->typecnt * (4 + 2) +		/* ttinfos */
-			sp->charcnt +			/* chars */
-			sp->leapcnt * (4 + 4) +		/* lsinfos */
-			ttisstdcnt +			/* ttisstds */
-			ttisgmtcnt)			/* ttisgmts */
-				return -1;
-		for (i = 0; i < sp->timecnt; ++i) {
-			sp->ats[i] = detzcode(p);
-			p += 4;
-		}
-		for (i = 0; i < sp->timecnt; ++i) {
-			sp->types[i] = (unsigned char) *p++;
-			if (sp->types[i] >= sp->typecnt)
-				return -1;
-		}
-		for (i = 0; i < sp->typecnt; ++i) {
-			register struct ttinfo *	ttisp;
-
-			ttisp = &sp->ttis[i];
-			ttisp->tt_gmtoff = detzcode(p);
-			p += 4;
-			ttisp->tt_isdst = (unsigned char) *p++;
-			if (ttisp->tt_isdst != 0 && ttisp->tt_isdst != 1)
-				return -1;
-			ttisp->tt_abbrind = (unsigned char) *p++;
-			if (ttisp->tt_abbrind < 0 ||
-				ttisp->tt_abbrind > sp->charcnt)
-					return -1;
-		}
-		for (i = 0; i < sp->charcnt; ++i)
-			sp->chars[i] = *p++;
-		sp->chars[i] = '\0';	/* ensure '\0' at end */
-		for (i = 0; i < sp->leapcnt; ++i) {
-			register struct lsinfo *	lsisp;
-
-			lsisp = &sp->lsis[i];
-			lsisp->ls_trans = detzcode(p);
-			p += 4;
-			lsisp->ls_corr = detzcode(p);
-			p += 4;
-		}
-		for (i = 0; i < sp->typecnt; ++i) {
-			register struct ttinfo *	ttisp;
-
-			ttisp = &sp->ttis[i];
-			if (ttisstdcnt == 0)
-				ttisp->tt_ttisstd = false;
-			else {
-				ttisp->tt_ttisstd = *p++;
-				if (ttisp->tt_ttisstd != true &&
-					ttisp->tt_ttisstd != false)
-						return -1;
-			}
-		}
-		for (i = 0; i < sp->typecnt; ++i) {
-			register struct ttinfo *	ttisp;
-
-			ttisp = &sp->ttis[i];
-			if (ttisgmtcnt == 0)
-				ttisp->tt_ttisgmt = false;
-			else {
-				ttisp->tt_ttisgmt = *p++;
-				if (ttisp->tt_ttisgmt != true &&
-					ttisp->tt_ttisgmt != false)
-						return -1;
-			}
-		}
-	}
-	return 0;
-}
-
-static const int	mon_lengths[2][MONSPERYEAR] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-static const int	year_lengths[2] = {
-	DAYSPERNYEAR, DAYSPERLYEAR
-};
-
-/*
-** Given a pointer into a time zone string, scan until a character that is not
-** a valid character in a zone name is found.  Return a pointer to that
-** character.
-*/
-
-static const char *
-getzname(const char *strp)
-{
-	register char	c;
-
-	while ((c = *strp) != '\0' && !is_digit(c) && c != ',' && c != '-' &&
-		c != '+')
-			++strp;
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract a number from that string.
-** Check that the number is within a specified range; if it is not, return
-** NULL.
-** Otherwise, return a pointer to the first character not part of the number.
-*/
-
-static const char *
-getnum(const char *strp, int *nump, const int min, const int max)
-{
-	register char	c;
-	register int	num;
-
-	if (strp == NULL || !is_digit(c = *strp))
-		return NULL;
-	num = 0;
-	do {
-		num = num * 10 + (c - '0');
-		if (num > max)
-			return NULL;	/* illegal value */
-		c = *++strp;
-	} while (is_digit(c));
-	if (num < min)
-		return NULL;		/* illegal value */
-	*nump = num;
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract a number of seconds,
-** in hh[:mm[:ss]] form, from the string.
-** If any error occurs, return NULL.
-** Otherwise, return a pointer to the first character not part of the number
-** of seconds.
-*/
-
-static const char *
-getsecs(const char *strp, long *secsp)
-{
-	int	num;
-
-	/*
-	** `HOURSPERDAY * DAYSPERWEEK - 1' allows quasi-Posix rules like
-	** "M10.4.6/26", which does not conform to Posix,
-	** but which specifies the equivalent of
-	** ``02:00 on the first Sunday on or after 23 Oct''.
-	*/
-	strp = getnum(strp, &num, 0, HOURSPERDAY * DAYSPERWEEK - 1);
-	if (strp == NULL)
-		return NULL;
-	*secsp = num * (long) SECSPERHOUR;
-	if (*strp == ':') {
-		++strp;
-		strp = getnum(strp, &num, 0, MINSPERHOUR - 1);
-		if (strp == NULL)
-			return NULL;
-		*secsp += num * SECSPERMIN;
-		if (*strp == ':') {
-			++strp;
-			/* `SECSPERMIN' allows for leap seconds.  */
-			strp = getnum(strp, &num, 0, SECSPERMIN);
-			if (strp == NULL)
-				return NULL;
-			*secsp += num;
-		}
-	}
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract an offset, in
-** [+-]hh[:mm[:ss]] form, from the string.
-** If any error occurs, return NULL.
-** Otherwise, return a pointer to the first character not part of the time.
-*/
-
-static const char *
-getoffset(const char *strp, long *offsetp)
-{
-	register int	neg = 0;
-
-	if (*strp == '-') {
-		neg = 1;
-		++strp;
-	} else if (*strp == '+')
-		++strp;
-	strp = getsecs(strp, offsetp);
-	if (strp == NULL)
-		return NULL;		/* illegal time */
-	if (neg)
-		*offsetp = -*offsetp;
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract a rule in the form
-** date[/time].  See POSIX section 8 for the format of "date" and "time".
-** If a valid rule is not found, return NULL.
-** Otherwise, return a pointer to the first character not part of the rule.
-*/
-
-static const char *
-getrule(const char *strp, struct rule *rulep)
-{
-	if (*strp == 'J') {
-		/*
-		** Julian day.
-		*/
-		rulep->r_type = JULIAN_DAY;
-		++strp;
-		strp = getnum(strp, &rulep->r_day, 1, DAYSPERNYEAR);
-	} else if (*strp == 'M') {
-		/*
-		** Month, week, day.
-		*/
-		rulep->r_type = MONTH_NTH_DAY_OF_WEEK;
-		++strp;
-		strp = getnum(strp, &rulep->r_mon, 1, MONSPERYEAR);
-		if (strp == NULL)
-			return NULL;
-		if (*strp++ != '.')
-			return NULL;
-		strp = getnum(strp, &rulep->r_week, 1, 5);
-		if (strp == NULL)
-			return NULL;
-		if (*strp++ != '.')
-			return NULL;
-		strp = getnum(strp, &rulep->r_day, 0, DAYSPERWEEK - 1);
-	} else if (is_digit(*strp)) {
-		/*
-		** Day of year.
-		*/
-		rulep->r_type = DAY_OF_YEAR;
-		strp = getnum(strp, &rulep->r_day, 0, DAYSPERLYEAR - 1);
-	} else	return NULL;		/* invalid format */
-	if (strp == NULL)
-		return NULL;
-	if (*strp == '/') {
-		/*
-		** Time specified.
-		*/
-		++strp;
-		strp = getsecs(strp, &rulep->r_time);
-	} else	rulep->r_time = 2 * SECSPERHOUR;	/* default = 2:00:00 */
-	return strp;
-}
-
-/*
-** Given the Epoch-relative time of January 1, 00:00:00 UTC, in a year, the
-** year, a rule, and the offset from UTC at the time that rule takes effect,
-** calculate the Epoch-relative time that rule takes effect.
-*/
-
-static time_t
-transtime(const time_t janfirst, const int year, const struct rule *rulep,
-		long offset)
-{
-	register int	leapyear;
-	register time_t	value;
-	register int	i;
-	int		d, m1, yy0, yy1, yy2, dow;
-
-	INITIALIZE(value);
-	leapyear = isleap(year);
-	switch (rulep->r_type) {
-
-	case JULIAN_DAY:
-		/*
-		** Jn - Julian day, 1 == January 1, 60 == March 1 even in leap
-		** years.
-		** In non-leap years, or if the day number is 59 or less, just
-		** add SECSPERDAY times the day number-1 to the time of
-		** January 1, midnight, to get the day.
-		*/
-		value = janfirst + (rulep->r_day - 1) * SECSPERDAY;
-		if (leapyear && rulep->r_day >= 60)
-			value += SECSPERDAY;
-		break;
-
-	case DAY_OF_YEAR:
-		/*
-		** n - day of year.
-		** Just add SECSPERDAY times the day number to the time of
-		** January 1, midnight, to get the day.
-		*/
-		value = janfirst + rulep->r_day * SECSPERDAY;
-		break;
-
-	case MONTH_NTH_DAY_OF_WEEK:
-		/*
-		** Mm.n.d - nth "dth day" of month m.
-		*/
-		value = janfirst;
-		for (i = 0; i < rulep->r_mon - 1; ++i)
-			value += mon_lengths[leapyear][i] * SECSPERDAY;
-
-		/*
-		** Use Zeller's Congruence to get day-of-week of first day of
-		** month.
-		*/
-		m1 = (rulep->r_mon + 9) % 12 + 1;
-		yy0 = (rulep->r_mon <= 2) ? (year - 1) : year;
-		yy1 = yy0 / 100;
-		yy2 = yy0 % 100;
-		dow = ((26 * m1 - 2) / 10 +
-			1 + yy2 + yy2 / 4 + yy1 / 4 - 2 * yy1) % 7;
-		if (dow < 0)
-			dow += DAYSPERWEEK;
-
-		/*
-		** "dow" is the day-of-week of the first day of the month.  Get
-		** the day-of-month (zero-origin) of the first "dow" day of the
-		** month.
-		*/
-		d = rulep->r_day - dow;
-		if (d < 0)
-			d += DAYSPERWEEK;
-		for (i = 1; i < rulep->r_week; ++i) {
-			if (d + DAYSPERWEEK >=
-				mon_lengths[leapyear][rulep->r_mon - 1])
-					break;
-			d += DAYSPERWEEK;
-		}
-
-		/*
-		** "d" is the day-of-month (zero-origin) of the day we want.
-		*/
-		value += d * SECSPERDAY;
-		break;
-	}
-
-	/*
-	** "value" is the Epoch-relative time of 00:00:00 UTC on the day in
-	** question.  To get the Epoch-relative time of the specified local
-	** time on that day, add the transition time and the current offset
-	** from UTC.
-	*/
-	return value + rulep->r_time + offset;
-}
-
-/*
-** Given a POSIX section 8-style TZ string, fill in the rule tables as
-** appropriate.
-*/
-
-static int
-tzparse(const char *name, struct state *sp, const int lastditch)
-{
-	const char *			stdname;
-	const char *			dstname;
-	size_t				stdlen;
-	size_t				dstlen;
-	long				stdoffset;
-	long				dstoffset;
-	register time_t *		atp;
-	register unsigned char *	typep;
-	register char *			cp;
-	register int			load_result;
-
-	INITIALIZE(dstname);
-	stdname = name;
-	if (lastditch) {
-		stdlen = strlen(name);	/* length of standard zone name */
-		name += stdlen;
-		if (stdlen >= sizeof sp->chars)
-			stdlen = (sizeof sp->chars) - 1;
-		stdoffset = 0;
-	} else {
-		name = getzname(name);
-		stdlen = name - stdname;
-		if (stdlen < 3)
-			return -1;
-		if (*name == '\0')
-			return -1;
-		name = getoffset(name, &stdoffset);
-		if (name == NULL)
-			return -1;
-	}
-	load_result = tzload(TZDEFRULES, sp);
-	if (load_result != 0)
-		sp->leapcnt = 0;		/* so, we're off a little */
-	if (*name != '\0') {
-		dstname = name;
-		name = getzname(name);
-		dstlen = name - dstname;	/* length of DST zone name */
-		if (dstlen < 3)
-			return -1;
-		if (*name != '\0' && *name != ',' && *name != ';') {
-			name = getoffset(name, &dstoffset);
-			if (name == NULL)
-				return -1;
-		} else	dstoffset = stdoffset - SECSPERHOUR;
-		if (*name == ',' || *name == ';') {
-			struct rule	start;
-			struct rule	end;
-			register int	year;
-			register time_t	janfirst;
-			time_t		starttime;
-			time_t		endtime;
-
-			++name;
-			if ((name = getrule(name, &start)) == NULL)
-				return -1;
-			if (*name++ != ',')
-				return -1;
-			if ((name = getrule(name, &end)) == NULL)
-				return -1;
-			if (*name != '\0')
-				return -1;
-			sp->typecnt = 2;	/* standard time and DST */
-			/*
-			** Two transitions per year, from EPOCH_YEAR to 2037.
-			*/
-			sp->timecnt = 2 * (2037 - EPOCH_YEAR + 1);
-			if (sp->timecnt > TZ_MAX_TIMES)
-				return -1;
-			sp->ttis[0].tt_gmtoff = -dstoffset;
-			sp->ttis[0].tt_isdst = 1;
-			sp->ttis[0].tt_abbrind = stdlen + 1;
-			sp->ttis[1].tt_gmtoff = -stdoffset;
-			sp->ttis[1].tt_isdst = 0;
-			sp->ttis[1].tt_abbrind = 0;
-			atp = sp->ats;
-			typep = sp->types;
-			janfirst = 0;
-			for (year = EPOCH_YEAR; year <= 2037; ++year) {
-				starttime = transtime(janfirst, year, &start,
-					stdoffset);
-				endtime = transtime(janfirst, year, &end,
-					dstoffset);
-				if (starttime > endtime) {
-					*atp++ = endtime;
-					*typep++ = 1;	/* DST ends */
-					*atp++ = starttime;
-					*typep++ = 0;	/* DST begins */
-				} else {
-					*atp++ = starttime;
-					*typep++ = 0;	/* DST begins */
-					*atp++ = endtime;
-					*typep++ = 1;	/* DST ends */
-				}
-				janfirst += year_lengths[isleap(year)] *
-					SECSPERDAY;
-			}
-		} else {
-			register long	theirstdoffset;
-			register long	theirdstoffset;
-			register long	theiroffset;
-			register int	isdst;
-			register int	i;
-			register int	j;
-
-			if (*name != '\0')
-				return -1;
-			if (load_result != 0)
-				return -1;
-			/*
-			** Initial values of theirstdoffset and theirdstoffset.
-			*/
-			theirstdoffset = 0;
-			for (i = 0; i < sp->timecnt; ++i) {
-				j = sp->types[i];
-				if (!sp->ttis[j].tt_isdst) {
-					theirstdoffset =
-						-sp->ttis[j].tt_gmtoff;
-					break;
-				}
-			}
-			theirdstoffset = 0;
-			for (i = 0; i < sp->timecnt; ++i) {
-				j = sp->types[i];
-				if (sp->ttis[j].tt_isdst) {
-					theirdstoffset =
-						-sp->ttis[j].tt_gmtoff;
-					break;
-				}
-			}
-			/*
-			** Initially we're assumed to be in standard time.
-			*/
-			isdst = false;
-			theiroffset = theirstdoffset;
-			/*
-			** Now juggle transition times and types
-			** tracking offsets as you do.
-			*/
-			for (i = 0; i < sp->timecnt; ++i) {
-				j = sp->types[i];
-				sp->types[i] = sp->ttis[j].tt_isdst;
-				if (sp->ttis[j].tt_ttisgmt) {
-					/* No adjustment to transition time */
-				} else {
-					/*
-					** If summer time is in effect, and the
-					** transition time was not specified as
-					** standard time, add the summer time
-					** offset to the transition time;
-					** otherwise, add the standard time
-					** offset to the transition time.
-					*/
-					/*
-					** Transitions from DST to DDST
-					** will effectively disappear since
-					** POSIX provides for only one DST
-					** offset.
-					*/
-					if (isdst && !sp->ttis[j].tt_ttisstd) {
-						sp->ats[i] += dstoffset -
-							theirdstoffset;
-					} else {
-						sp->ats[i] += stdoffset -
-							theirstdoffset;
-					}
-				}
-				theiroffset = -sp->ttis[j].tt_gmtoff;
-				if (sp->ttis[j].tt_isdst)
-					theirdstoffset = theiroffset;
-				else	theirstdoffset = theiroffset;
-			}
-			/*
-			** Finally, fill in ttis.
-			** ttisstd and ttisgmt need not be handled.
-			*/
-			sp->ttis[0].tt_gmtoff = -stdoffset;
-			sp->ttis[0].tt_isdst = false;
-			sp->ttis[0].tt_abbrind = 0;
-			sp->ttis[1].tt_gmtoff = -dstoffset;
-			sp->ttis[1].tt_isdst = true;
-			sp->ttis[1].tt_abbrind = stdlen + 1;
-			sp->typecnt = 2;
-		}
-	} else {
-		dstlen = 0;
-		sp->typecnt = 1;		/* only standard time */
-		sp->timecnt = 0;
-		sp->ttis[0].tt_gmtoff = -stdoffset;
-		sp->ttis[0].tt_isdst = 0;
-		sp->ttis[0].tt_abbrind = 0;
-	}
-	sp->charcnt = stdlen + 1;
-	if (dstlen != 0)
-		sp->charcnt += dstlen + 1;
-	if ((size_t) sp->charcnt > sizeof sp->chars)
-		return -1;
-	cp = sp->chars;
-	(void) strncpy(cp, stdname, stdlen);
-	cp += stdlen;
-	*cp++ = '\0';
-	if (dstlen != 0) {
-		(void) strncpy(cp, dstname, dstlen);
-		*(cp + dstlen) = '\0';
-	}
-	return 0;
-}
-
-static void
-gmtload(struct state *sp)
-{
-	if (tzload(gmt, sp) != 0)
-		(void) tzparse(gmt, sp, true);
-}
-
-#ifndef STD_INSPIRED
-/*
-** A non-static declaration of tzsetwall in a system header file
-** may cause a warning about this upcoming static declaration...
-*/
-static
-#endif /* !defined STD_INSPIRED */
-void
-tzsetwall P((void))
-{
-	if (lcl_is_set < 0)
-		return;
-	lcl_is_set = -1;
-
-#ifdef ALL_STATE
-	if (lclptr == NULL) {
-		lclptr = (struct state *) malloc(sizeof *lclptr);
-		if (lclptr == NULL) {
-			settzname();	/* all we can do */
-			return;
-		}
-	}
-#endif /* defined ALL_STATE */
-#if defined (_WIN32) || defined (__CYGWIN__)
-#define is_upper(c) ((unsigned)(c) - 'A' <= 26)
-	{
-	    TIME_ZONE_INFORMATION tz;
-	    char buf[BUFSIZ];
-	    char *cp, *dst;
-	    wchar_t *src;
-	    div_t d;
-	    GetTimeZoneInformation(&tz);
-	    dst = cp = buf;
-	    for (src = tz.StandardName; *src; src++)
-	      if (is_upper(*src)) *dst++ = *src;
-	    if ((dst - cp) < 3)
-	      {
-		/* In non-english Windows, converted tz.StandardName
-		   may not contain a valid standard timezone name. */
-		strcpy(cp, wildabbr);
-		cp += strlen(wildabbr);
-	      }
-	    else
-	      cp = dst;
-	    d = div(tz.Bias+tz.StandardBias, 60);
-	    sprintf(cp, "%d", d.quot);
-	    if (d.rem)
-		sprintf(cp=strchr(cp, 0), ":%d", abs(d.rem));
-	    if(tz.StandardDate.wMonth) {
-		cp = strchr(cp, 0);
-		dst = cp;
-		for (src = tz.DaylightName; *src; src++)
-		  if (is_upper(*src)) *dst++ = *src;
-		if ((dst - cp) < 3)
-		  {
-		    /* In non-english Windows, converted tz.DaylightName
-		       may not contain a valid daylight timezone name. */
-		    strcpy(cp, wildabbr);
-		    cp += strlen(wildabbr);
-		  }
-		else
-		  cp = dst;
-		d = div(tz.Bias+tz.DaylightBias, 60);
-		sprintf(cp, "%d", d.quot);
-		if (d.rem)
-		    sprintf(cp=strchr(cp, 0), ":%d", abs(d.rem));
-		cp = strchr(cp, 0);
-		sprintf(cp=strchr(cp, 0), ",M%d.%d.%d/%d",
-		    tz.DaylightDate.wMonth,
-		    tz.DaylightDate.wDay,
-		    tz.DaylightDate.wDayOfWeek,
-		    tz.DaylightDate.wHour);
-		if (tz.DaylightDate.wMinute || tz.DaylightDate.wSecond)
-		    sprintf(cp=strchr(cp, 0), ":%d", tz.DaylightDate.wMinute);
-		if (tz.DaylightDate.wSecond)
-		    sprintf(cp=strchr(cp, 0), ":%d", tz.DaylightDate.wSecond);
-		cp = strchr(cp, 0);
-		sprintf(cp=strchr(cp, 0), ",M%d.%d.%d/%d",
-		    tz.StandardDate.wMonth,
-		    tz.StandardDate.wDay,
-		    tz.StandardDate.wDayOfWeek,
-		    tz.StandardDate.wHour);
-		if (tz.StandardDate.wMinute || tz.StandardDate.wSecond)
-		    sprintf(cp=strchr(cp, 0), ":%d", tz.StandardDate.wMinute);
-		if (tz.StandardDate.wSecond)
-		    sprintf(cp=strchr(cp, 0), ":%d", tz.StandardDate.wSecond);
-	    }
-	    /* printf("TZ deduced as `%s'\n", buf); */
-	    if (tzparse(buf, lclptr, false) == 0) {
-		settzname();
-		lcl_is_set = 1;
-		strlcpy(lcl_TZname, buf, sizeof (lcl_TZname));
-		setenv("TZ", lcl_TZname, 1);
-		return;
-	    }
-	}
-#endif
-	if (tzload((char *) NULL, lclptr) != 0)
-		gmtload(lclptr);
-	settzname();
-}
-
-extern "C" void
-tzset P((void))
-{
-	const char *	name = getenv("TZ");
-
-	if (name == NULL) {
-		tzsetwall();
-		return;
-	}
-
-	if (lcl_is_set > 0  &&  strcmp(lcl_TZname, name) == 0)
-		return;
-	lcl_is_set = (strlen(name) < sizeof (lcl_TZname));
-	if (lcl_is_set)
-		(void) strcpy(lcl_TZname, name);
-
-#ifdef ALL_STATE
-	if (lclptr == NULL) {
-		lclptr = (struct state *) malloc(sizeof *lclptr);
-		if (lclptr == NULL) {
-			settzname();	/* all we can do */
-			return;
-		}
-	}
-#endif /* defined ALL_STATE */
-	if (*name == '\0') {
-		/*
-		** User wants it fast rather than right.
-		*/
-		lclptr->leapcnt = 0;		/* so, we're off a little */
-		lclptr->timecnt = 0;
-		lclptr->ttis[0].tt_gmtoff = 0;
-		lclptr->ttis[0].tt_abbrind = 0;
-		(void) strcpy(lclptr->chars, gmt);
-	} else if (tzload(name, lclptr) != 0) {
-		if (name[0] == ':' || tzparse(name, lclptr, false) != 0)
-			(void) gmtload(lclptr);
-	}
-	settzname();
-}
-
-/*
-** The easy way to behave "as if no library function calls" localtime
-** is to not call it--so we drop its guts into "localsub", which can be
-** freely called.  (And no, the PANS doesn't require the above behavior--
-** but it *is* desirable.)
-**
-** The unused offset argument is for the benefit of mktime variants.
-*/
-
-/*ARGSUSED*/
-static void
-localsub (const time_t * const	timep,
-	  const long offset,
-	  struct tm * const tmp)
-{
-	register struct state *		sp;
-	register const struct ttinfo *	ttisp;
-	register int			i;
-	const time_t			t = *timep;
-
-	sp = lclptr;
-#ifdef ALL_STATE
-	if (sp == NULL) {
-		gmtsub(timep, offset, tmp);
-		return;
-	}
-#endif /* defined ALL_STATE */
-	if (sp->timecnt == 0 || t < sp->ats[0]) {
-		i = 0;
-		while (sp->ttis[i].tt_isdst)
-			if (++i >= sp->typecnt) {
-				i = 0;
-				break;
-			}
-	} else {
-		for (i = 1; i < sp->timecnt; ++i)
-			if (t < sp->ats[i])
-				break;
-		i = sp->types[i - 1];
-	}
-	ttisp = &sp->ttis[i];
-	/*
-	** To get (wrong) behavior that's compatible with System V Release 2.0
-	** you'd replace the statement below with
-	**	t += ttisp->tt_gmtoff;
-	**	timesub(&t, 0L, sp, tmp);
-	*/
-	timesub(&t, ttisp->tt_gmtoff, sp, tmp);
-	tmp->tm_isdst = ttisp->tt_isdst;
-	tzname[tmp->tm_isdst] = &sp->chars[ttisp->tt_abbrind];
-#ifdef TM_ZONE
-	tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind];
-#endif /* defined TM_ZONE */
-}
-
-extern "C" struct tm *
-localtime(const time_t *timep)
-{
-	tzset();
-	localsub(timep, 0L, &tm);
-	return &tm;
-}
-
-/*
- * Re-entrant version of localtime
- */
-extern "C" struct tm *
-localtime_r(const time_t *timep, struct tm *tm)
-{
-	localsub(timep, 0L, tm);
-	return tm;
-}
-
-/*
-** gmtsub is to gmtime as localsub is to localtime.
-*/
-
-static void
-gmtsub(const time_t *timep, const long offset, struct tm *tmp)
-{
-	if (!gmt_is_set) {
-		gmt_is_set = true;
-#ifdef ALL_STATE
-		gmtptr = (struct state *) malloc(sizeof *gmtptr);
-		if (gmtptr != NULL)
-#endif /* defined ALL_STATE */
-			gmtload(gmtptr);
-	}
-	timesub(timep, offset, gmtptr, tmp);
-#ifdef TM_ZONE
-	/*
-	** Could get fancy here and deliver something such as
-	** "UTC+xxxx" or "UTC-xxxx" if offset is non-zero,
-	** but this is no time for a treasure hunt.
-	*/
-	if (offset != 0)
-		tmp->TM_ZONE = wildabbr;
-	else {
-#ifdef ALL_STATE
-		if (gmtptr == NULL)
-			tmp->TM_ZONE = gmt;
-		else	tmp->TM_ZONE = gmtptr->chars;
-#endif /* defined ALL_STATE */
-#ifndef ALL_STATE
-		tmp->TM_ZONE = gmtptr->chars;
-#endif /* State Farm */
-	}
-#endif /* defined TM_ZONE */
-}
-
-extern "C" struct tm *
-gmtime(const time_t *timep)
-{
-	gmtsub(timep, 0L, &tm);
-	return &tm;
-}
-
-/*
- * Re-entrant version of gmtime
- */
-extern "C" struct tm *
-gmtime_r(const time_t *timep, struct tm *tm)
-{
-	gmtsub(timep, 0L, tm);
-	return tm;
-}
-
-#ifdef STD_INSPIRED
-
-extern "C" struct tm *
-offtime(const time_t *timep, const long offset)
-{
-	gmtsub(timep, offset, &tm);
-	return &tm;
-}
-
-#endif /* defined STD_INSPIRED */
-
-static void
-timesub(const time_t *timep, const long offset, const struct state *sp,
-	struct tm *tmp)
-{
-	register const struct lsinfo *	lp;
-	register long			days;
-	register long			rem;
-	register int			y;
-	register int			yleap;
-	register const int *		ip;
-	register long			corr;
-	register int			hit;
-	register int			i;
-
-	corr = 0;
-	hit = 0;
-#ifdef ALL_STATE
-	i = (sp == NULL) ? 0 : sp->leapcnt;
-#endif /* defined ALL_STATE */
-#ifndef ALL_STATE
-	i = sp->leapcnt;
-#endif /* State Farm */
-	while (--i >= 0) {
-		lp = &sp->lsis[i];
-		if (*timep >= lp->ls_trans) {
-			if (*timep == lp->ls_trans) {
-				hit = ((i == 0 && lp->ls_corr > 0) ||
-					lp->ls_corr > sp->lsis[i - 1].ls_corr);
-				if (hit)
-					while (i > 0 &&
-						sp->lsis[i].ls_trans ==
-						sp->lsis[i - 1].ls_trans + 1 &&
-						sp->lsis[i].ls_corr ==
-						sp->lsis[i - 1].ls_corr + 1) {
-							++hit;
-							--i;
-					}
-			}
-			corr = lp->ls_corr;
-			break;
-		}
-	}
-	days = *timep / SECSPERDAY;
-	rem = *timep % SECSPERDAY;
-#ifdef mc68k
-	if (*timep == 0x80000000) {
-		/*
-		** A 3B1 muffs the division on the most negative number.
-		*/
-		days = -24855;
-		rem = -11648;
-	}
-#endif /* defined mc68k */
-	rem += (offset - corr);
-	while (rem < 0) {
-		rem += SECSPERDAY;
-		--days;
-	}
-	while (rem >= SECSPERDAY) {
-		rem -= SECSPERDAY;
-		++days;
-	}
-	tmp->tm_hour = (int) (rem / SECSPERHOUR);
-	rem = rem % SECSPERHOUR;
-	tmp->tm_min = (int) (rem / SECSPERMIN);
-	/*
-	** A positive leap second requires a special
-	** representation.  This uses "... ??:59:60" et seq.
-	*/
-	tmp->tm_sec = (int) (rem % SECSPERMIN) + hit;
-	tmp->tm_wday = (int) ((EPOCH_WDAY + days) % DAYSPERWEEK);
-	if (tmp->tm_wday < 0)
-		tmp->tm_wday += DAYSPERWEEK;
-	y = EPOCH_YEAR;
-#define LEAPS_THRU_END_OF(y)	((y) / 4 - (y) / 100 + (y) / 400)
-	while (days < 0 || days >= (long) year_lengths[yleap = isleap(y)]) {
-		register int	newy;
-
-		newy = y + days / DAYSPERNYEAR;
-		if (days < 0)
-			--newy;
-		days -= (newy - y) * DAYSPERNYEAR +
-			LEAPS_THRU_END_OF(newy - 1) -
-			LEAPS_THRU_END_OF(y - 1);
-		y = newy;
-	}
-	tmp->tm_year = y - TM_YEAR_BASE;
-	tmp->tm_yday = (int) days;
-	ip = mon_lengths[yleap];
-	for (tmp->tm_mon = 0; days >= (long) ip[tmp->tm_mon]; ++(tmp->tm_mon))
-		days = days - (long) ip[tmp->tm_mon];
-	tmp->tm_mday = (int) (days + 1);
-	tmp->tm_isdst = 0;
-#ifdef TM_GMTOFF
-	tmp->TM_GMTOFF = offset;
-#endif /* defined TM_GMTOFF */
-}
-
-extern "C" char *
-ctime(const time_t *timep)
-{
-/*
-** Section 4.12.3.2 of X3.159-1989 requires that
-**	The ctime function converts the calendar time pointed to by timer
-**	to local time in the form of a string.  It is equivalent to
-**		asctime(localtime(timer))
-*/
-	return asctime(localtime(timep));
-}
-
-extern "C" char *
-ctime_r(const time_t *timep, char *buf)
-{
-	struct tm	tm;
-
-	return asctime_r(localtime_r(timep, &tm), buf);
-}
-
-/*
-** Adapted from code provided by Robert Elz, who writes:
-**	The "best" way to do mktime I think is based on an idea of Bob
-**	Kridle's (so its said...) from a long time ago.
-**	[kridle@xinet.com as of 1996-01-16.]
-**	It does a binary search of the time_t space.  Since time_t's are
-**	just 32 bits, its a max of 32 iterations (even at 64 bits it
-**	would still be very reasonable).
-*/
-
-#ifndef WRONG
-#define WRONG	(-1)
-#endif /* !defined WRONG */
-
-/*
-** Simplified normalize logic courtesy Paul Eggert (eggert@twinsun.com).
-*/
-
-static int
-increment_overflow(int *number, int delta)
-{
-	int	number0;
-
-	number0 = *number;
-	*number += delta;
-	return (*number < number0) != (delta < 0);
-}
-
-static int
-normalize_overflow(int *tensptr, int *unitsptr, const int base)
-{
-	register int	tensdelta;
-
-	tensdelta = (*unitsptr >= 0) ?
-		(*unitsptr / base) :
-		(-1 - (-1 - *unitsptr) / base);
-	*unitsptr -= tensdelta * base;
-	return increment_overflow(tensptr, tensdelta);
-}
-
-static int
-tmcomp(register const struct tm *atmp, register const struct tm *btmp)
-{
-	register int	result;
-
-	if ((result = (atmp->tm_year - btmp->tm_year)) == 0 &&
-		(result = (atmp->tm_mon - btmp->tm_mon)) == 0 &&
-		(result = (atmp->tm_mday - btmp->tm_mday)) == 0 &&
-		(result = (atmp->tm_hour - btmp->tm_hour)) == 0 &&
-		(result = (atmp->tm_min - btmp->tm_min)) == 0)
-			result = atmp->tm_sec - btmp->tm_sec;
-	return result;
-}
-
-static time_t
-time2sub(struct tm *tmp, void (*funcp) P((const time_t*, long, struct tm*)),
-	 const long offset, int *okayp, const int do_norm_secs)
-{
-	register const struct state *	sp;
-	register int			dir;
-	register int			bits;
-	register int			i, j ;
-	register int			saved_seconds;
-	time_t				newt;
-	time_t				t;
-	struct tm			yourtm, mytm;
-
-	*okayp = false;
-	yourtm = *tmp;
-	if (do_norm_secs) {
-		if (normalize_overflow(&yourtm.tm_min, &yourtm.tm_sec,
-			SECSPERMIN))
-				return WRONG;
-	}
-	if (normalize_overflow(&yourtm.tm_hour, &yourtm.tm_min, MINSPERHOUR))
-		return WRONG;
-	if (normalize_overflow(&yourtm.tm_mday, &yourtm.tm_hour, HOURSPERDAY))
-		return WRONG;
-	if (normalize_overflow(&yourtm.tm_year, &yourtm.tm_mon, MONSPERYEAR))
-		return WRONG;
-	/*
-	** Turn yourtm.tm_year into an actual year number for now.
-	** It is converted back to an offset from TM_YEAR_BASE later.
-	*/
-	if (increment_overflow(&yourtm.tm_year, TM_YEAR_BASE))
-		return WRONG;
-	while (yourtm.tm_mday <= 0) {
-		if (increment_overflow(&yourtm.tm_year, -1))
-			return WRONG;
-		i = yourtm.tm_year + (1 < yourtm.tm_mon);
-		yourtm.tm_mday += year_lengths[isleap(i)];
-	}
-	while (yourtm.tm_mday > DAYSPERLYEAR) {
-		i = yourtm.tm_year + (1 < yourtm.tm_mon);
-		yourtm.tm_mday -= year_lengths[isleap(i)];
-		if (increment_overflow(&yourtm.tm_year, 1))
-			return WRONG;
-	}
-	for ( ; ; ) {
-		i = mon_lengths[isleap(yourtm.tm_year)][yourtm.tm_mon];
-		if (yourtm.tm_mday <= i)
-			break;
-		yourtm.tm_mday -= i;
-		if (++yourtm.tm_mon >= MONSPERYEAR) {
-			yourtm.tm_mon = 0;
-			if (increment_overflow(&yourtm.tm_year, 1))
-				return WRONG;
-		}
-	}
-	if (increment_overflow(&yourtm.tm_year, -TM_YEAR_BASE))
-		return WRONG;
-	if (yourtm.tm_year + TM_YEAR_BASE < EPOCH_YEAR) {
-		/*
-		** We can't set tm_sec to 0, because that might push the
-		** time below the minimum representable time.
-		** Set tm_sec to 59 instead.
-		** This assumes that the minimum representable time is
-		** not in the same minute that a leap second was deleted from,
-		** which is a safer assumption than using 58 would be.
-		*/
-		if (increment_overflow(&yourtm.tm_sec, 1 - SECSPERMIN))
-			return WRONG;
-		saved_seconds = yourtm.tm_sec;
-		yourtm.tm_sec = SECSPERMIN - 1;
-	} else {
-		saved_seconds = yourtm.tm_sec;
-		yourtm.tm_sec = 0;
-	}
-	/*
-	** Divide the search space in half
-	** (this works whether time_t is signed or unsigned).
-	*/
-	bits = TYPE_BIT(time_t) - 1;
-	/*
-	** If time_t is signed, then 0 is just above the median,
-	** assuming two's complement arithmetic.
-	** If time_t is unsigned, then (1 << bits) is just above the median.
-	*/
-	t = TYPE_SIGNED(time_t) ? 0 : (((time_t) 1) << bits);
-	for ( ; ; ) {
-		(*funcp)(&t, offset, &mytm);
-		dir = tmcomp(&mytm, &yourtm);
-		if (dir != 0) {
-			if (bits-- < 0)
-				return WRONG;
-			if (bits < 0)
-				--t; /* may be needed if new t is minimal */
-			else if (dir > 0)
-				t -= ((time_t) 1) << bits;
-			else	t += ((time_t) 1) << bits;
-			continue;
-		}
-		if (yourtm.tm_isdst < 0 || mytm.tm_isdst == yourtm.tm_isdst)
-			break;
-		/*
-		** Right time, wrong type.
-		** Hunt for right time, right type.
-		** It's okay to guess wrong since the guess
-		** gets checked.
-		*/
-		/*
-		** The (void *) casts are the benefit of SunOS 3.3 on Sun 2's.
-		*/
-		sp = (const struct state *)
-			(((void *) funcp == (void *) localsub) ?
-			lclptr : gmtptr);
-#ifdef ALL_STATE
-		if (sp == NULL)
-			return WRONG;
-#endif /* defined ALL_STATE */
-		for (i = sp->typecnt - 1; i >= 0; --i) {
-			if (sp->ttis[i].tt_isdst != yourtm.tm_isdst)
-				continue;
-			for (j = sp->typecnt - 1; j >= 0; --j) {
-				if (sp->ttis[j].tt_isdst == yourtm.tm_isdst)
-					continue;
-				newt = t + sp->ttis[j].tt_gmtoff -
-					sp->ttis[i].tt_gmtoff;
-				(*funcp)(&newt, offset, &mytm);
-				if (tmcomp(&mytm, &yourtm) != 0)
-					continue;
-				if (mytm.tm_isdst != yourtm.tm_isdst)
-					continue;
-				/*
-				** We have a match.
-				*/
-				t = newt;
-				goto label;
-			}
-		}
-		return WRONG;
-	}
-label:
-	newt = t + saved_seconds;
-	if ((newt < t) != (saved_seconds < 0))
-		return WRONG;
-	t = newt;
-	(*funcp)(&t, offset, tmp);
-	*okayp = true;
-	return t;
-}
-
-static time_t
-time2(struct tm *tmp, void (*funcp) P((const time_t*, long, struct tm*)),
-      const long offset, int *okayp)
-{
-	time_t	t;
-
-	/*
-	** First try without normalization of seconds
-	** (in case tm_sec contains a value associated with a leap second).
-	** If that fails, try with normalization of seconds.
-	*/
-	t = time2sub(tmp, funcp, offset, okayp, false);
-	return *okayp ? t : time2sub(tmp, funcp, offset, okayp, true);
-}
-
-static time_t
-time1(struct tm *tmp, void (*funcp) P((const time_t *, long, struct tm *)),
-      const long offset)
-{
-	register time_t			t;
-	register const struct state *	sp;
-	register int			samei, otheri;
-	int				okay;
-
-	if (tmp->tm_isdst > 1)
-		tmp->tm_isdst = 1;
-	t = time2(tmp, funcp, offset, &okay);
-#ifdef PCTS
-	/*
-	** PCTS code courtesy Grant Sullivan (grant@osf.org).
-	*/
-	if (okay)
-		return t;
-	if (tmp->tm_isdst < 0)
-		tmp->tm_isdst = 0;	/* reset to std and try again */
-#endif /* defined PCTS */
-#ifndef PCTS
-	if (okay || tmp->tm_isdst < 0)
-		return t;
-#endif /* !defined PCTS */
-	/*
-	** We're supposed to assume that somebody took a time of one type
-	** and did some math on it that yielded a "struct tm" that's bad.
-	** We try to divine the type they started from and adjust to the
-	** type they need.
-	*/
-	/*
-	** The (void *) casts are the benefit of SunOS 3.3 on Sun 2's.
-	*/
-	sp = (const struct state *) (((void *) funcp == (void *) localsub) ?
-		lclptr : gmtptr);
-#ifdef ALL_STATE
-	if (sp == NULL)
-		return WRONG;
-#endif /* defined ALL_STATE */
-	for (samei = sp->typecnt - 1; samei >= 0; --samei) {
-		if (sp->ttis[samei].tt_isdst != tmp->tm_isdst)
-			continue;
-		for (otheri = sp->typecnt - 1; otheri >= 0; --otheri) {
-			if (sp->ttis[otheri].tt_isdst == tmp->tm_isdst)
-				continue;
-			tmp->tm_sec += sp->ttis[otheri].tt_gmtoff -
-					sp->ttis[samei].tt_gmtoff;
-			tmp->tm_isdst = !tmp->tm_isdst;
-			t = time2(tmp, funcp, offset, &okay);
-			if (okay)
-				return t;
-			tmp->tm_sec -= sp->ttis[otheri].tt_gmtoff -
-					sp->ttis[samei].tt_gmtoff;
-			tmp->tm_isdst = !tmp->tm_isdst;
-		}
-	}
-	return WRONG;
-}
-
-extern "C" time_t
-mktime(struct tm *tmp)
-{
-	tzset();
-	return time1(tmp, localsub, 0L);
-}
-
-#ifdef STD_INSPIRED
-
-extern "C" time_t
-timelocal(struct tm *tmp)
-{
-	tmp->tm_isdst = -1;	/* in case it wasn't initialized */
-	return mktime(tmp);
-}
-
-extern "C" time_t
-timegm(struct tm *tmp)
-{
-	tmp->tm_isdst = 0;
-	return time1(tmp, gmtsub, 0L);
-}
-
-extern "C" time_t
-timeoff(struct tm *tmp, const long offset)
-{
-	tmp->tm_isdst = 0;
-	return time1(tmp, gmtsub, offset);
-}
-
-#endif /* defined STD_INSPIRED */
-
-#ifdef CMUCS
-
-/*
-** The following is supplied for compatibility with
-** previous versions of the CMUCS runtime library.
-*/
-
-extern "C" long
-gtime(struct tm *tmp)
-{
-	const time_t	t = mktime(tmp);
-
-	if (t == WRONG)
-		return -1;
-	return t;
-}
-
-#endif /* defined CMUCS */
-
-/*
-** XXX--is the below the right way to conditionalize??
-*/
-
-#ifdef STD_INSPIRED
-
-/*
-** IEEE Std 1003.1-1988 (POSIX) legislates that 536457599
-** shall correspond to "Wed Dec 31 23:59:59 UTC 1986", which
-** is not the case if we are accounting for leap seconds.
-** So, we provide the following conversion routines for use
-** when exchanging timestamps with POSIX conforming systems.
-*/
-
-static long
-leapcorr(time_t *timep)
-{
-	register struct state *		sp;
-	register struct lsinfo *	lp;
-	register int			i;
-
-	sp = lclptr;
-	i = sp->leapcnt;
-	while (--i >= 0) {
-		lp = &sp->lsis[i];
-		if (*timep >= lp->ls_trans)
-			return lp->ls_corr;
-	}
-	return 0;
-}
-
-extern "C" time_t
-time2posix(time_t t)
-{
-	tzset();
-	return t - leapcorr(&t);
-}
-
-extern "C" time_t
-posix2time(time_t t)
-{
-	time_t	x;
-	time_t	y;
-
-	tzset();
-	/*
-	** For a positive leap second hit, the result
-	** is not unique.  For a negative leap second
-	** hit, the corresponding time doesn't exist,
-	** so we return an adjacent second.
-	*/
-	x = t + leapcorr(&t);
-	y = x - leapcorr(&x);
-	if (y < t) {
-		do {
-			x++;
-			y = x - leapcorr(&x);
-		} while (y < t);
-		if (t != y)
-			return x - 1;
-	} else if (y > t) {
-		do {
-			--x;
-			y = x - leapcorr(&x);
-		} while (y > t);
-		if (t != y)
-			return x + 1;
-	}
-	return x;
-}
-
-#endif /* defined STD_INSPIRED */
diff --git a/winsup/cygwin/malloc.cc b/winsup/cygwin/malloc.cc
deleted file mode 100644
index 7c85bd681..000000000
--- a/winsup/cygwin/malloc.cc
+++ /dev/null
@@ -1,5586 +0,0 @@
-/*
-  This is a version (aka dlmalloc) of malloc/free/realloc written by
-  Doug Lea and released to the public domain.  Use, modify, and
-  redistribute this code without permission or acknowledgement in any
-  way you wish.  Send questions, comments, complaints, performance
-  data, etc to dl@cs.oswego.edu
-
-* VERSION 2.7.2 Sat Aug 17 09:07:30 2002  Doug Lea  (dl at gee)
-
-   Note: There may be an updated version of this malloc obtainable at
-	   ftp://gee.cs.oswego.edu/pub/misc/malloc.c
-	 Check before installing!
-
-* Quickstart
-
-  This library is all in one file to simplify the most common usage:
-  ftp it, compile it (-O), and link it into another program. All
-  of the compile-time options default to reasonable values for use on
-  most unix platforms. Compile -DWIN32 for reasonable defaults on windows.
-  You might later want to step through various compile-time and dynamic
-  tuning options.
-
-  For convenience, an include file for code using this malloc is at:
-     ftp://gee.cs.oswego.edu/pub/misc/malloc-2.7.1.h
-  You don't really need this .h file unless you call functions not
-  defined in your system include files.  The .h file contains only the
-  excerpts from this file needed for using this malloc on ANSI C/C++
-  systems, so long as you haven't changed compile-time options about
-  naming and tuning parameters.  If you do, then you can create your
-  own malloc.h that does include all settings by cutting at the point
-  indicated below.
-
-* Why use this malloc?
-
-  This is not the fastest, most space-conserving, most portable, or
-  most tunable malloc ever written. However it is among the fastest
-  while also being among the most space-conserving, portable and tunable.
-  Consistent balance across these factors results in a good general-purpose
-  allocator for malloc-intensive programs.
-
-  The main properties of the algorithms are:
-  * For large (>= 512 bytes) requests, it is a pure best-fit allocator,
-    with ties normally decided via FIFO (i.e. least recently used).
-  * For small (<= 64 bytes by default) requests, it is a caching
-    allocator, that maintains pools of quickly recycled chunks.
-  * In between, and for combinations of large and small requests, it does
-    the best it can trying to meet both goals at once.
-  * For very large requests (>= 128KB by default), it relies on system
-    memory mapping facilities, if supported.
-
-  For a longer but slightly out of date high-level description, see
-     http://gee.cs.oswego.edu/dl/html/malloc.html
-
-  You may already by default be using a C library containing a malloc
-  that is  based on some version of this malloc (for example in
-  linux). You might still want to use the one in this file in order to
-  customize settings or to avoid overheads associated with library
-  versions.
-
-* Contents, described in more detail in "description of public routines" below.
-
-  Standard (ANSI/SVID/...)  functions:
-    malloc(size_t n);
-    calloc(size_t n_elements, size_t element_size);
-    free(Void_t* p);
-    realloc(Void_t* p, size_t n);
-    memalign(size_t alignment, size_t n);
-    valloc(size_t n);
-    mallinfo()
-    mallopt(int parameter_number, int parameter_value)
-
-  Additional functions:
-    independent_calloc(size_t n_elements, size_t size, Void_t* chunks[]);
-    independent_comalloc(size_t n_elements, size_t sizes[], Void_t* chunks[]);
-    pvalloc(size_t n);
-    cfree(Void_t* p);
-    malloc_trim(size_t pad);
-    malloc_usable_size(Void_t* p);
-    malloc_stats();
-
-* Vital statistics:
-
-  Supported pointer representation:       4 or 8 bytes
-  Supported size_t  representation:       4 or 8 bytes
-       Note that size_t is allowed to be 4 bytes even if pointers are 8.
-       You can adjust this by defining INTERNAL_SIZE_T
-
-  Alignment:                              2 * sizeof(size_t) (default)
-       (i.e., 8 byte alignment with 4byte size_t). This suffices for
-       nearly all current machines and C compilers. However, you can
-       define MALLOC_ALIGNMENT to be wider than this if necessary.
-
-  Minimum overhead per allocated chunk:   4 or 8 bytes
-       Each malloced chunk has a hidden word of overhead holding size
-       and status information.
-
-  Minimum allocated size: 4-byte ptrs:  16 bytes    (including 4 overhead)
-			  8-byte ptrs:  24/32 bytes (including, 4/8 overhead)
-
-       When a chunk is freed, 12 (for 4byte ptrs) or 20 (for 8 byte
-       ptrs but 4 byte size) or 24 (for 8/8) additional bytes are
-       needed; 4 (8) for a trailing size field and 8 (16) bytes for
-       free list pointers. Thus, the minimum allocatable size is
-       16/24/32 bytes.
-
-       Even a request for zero bytes (i.e., malloc(0)) returns a
-       pointer to something of the minimum allocatable size.
-
-       The maximum overhead wastage (i.e., number of extra bytes
-       allocated than were requested in malloc) is less than or equal
-       to the minimum size, except for requests >= mmap_threshold that
-       are serviced via mmap(), where the worst case wastage is 2 *
-       sizeof(size_t) bytes plus the remainder from a system page (the
-       minimal mmap unit); typically 4096 or 8192 bytes.
-
-  Maximum allocated size:  4-byte size_t: 2^32 minus about two pages
-			   8-byte size_t: 2^64 minus about two pages
-
-       It is assumed that (possibly signed) size_t values suffice to
-       represent chunk sizes. `Possibly signed' is due to the fact
-       that `size_t' may be defined on a system as either a signed or
-       an unsigned type. The ISO C standard says that it must be
-       unsigned, but a few systems are known not to adhere to this.
-       Additionally, even when size_t is unsigned, sbrk (which is by
-       default used to obtain memory from system) accepts signed
-       arguments, and may not be able to handle size_t-wide arguments
-       with negative sign bit.  Generally, values that would
-       appear as negative after accounting for overhead and alignment
-       are supported only via mmap(), which does not have this
-       limitation.
-
-       Requests for sizes outside the allowed range will perform an optional
-       failure action and then return null. (Requests may also
-       also fail because a system is out of memory.)
-
-  Thread-safety: NOT thread-safe unless USE_MALLOC_LOCK defined
-
-       When USE_MALLOC_LOCK is defined, wrappers are created to
-       surround every public call with either a pthread mutex or
-       a win32 spinlock (depending on WIN32). This is not
-       especially fast, and can be a major bottleneck.
-       It is designed only to provide minimal protection
-       in concurrent environments, and to provide a basis for
-       extensions.  If you are using malloc in a concurrent program,
-       you would be far better off obtaining ptmalloc, which is
-       derived from a version of this malloc, and is well-tuned for
-       concurrent programs. (See http://www.malloc.de) Note that
-       even when USE_MALLOC_LOCK is defined, you can can guarantee
-       full thread-safety only if no threads acquire memory through
-       direct calls to MORECORE or other system-level allocators.
-
-  Compliance: I believe it is compliant with the 1997 Single Unix Specification
-       (See http://www.opennc.org). Also SVID/XPG, ANSI C, and probably
-       others as well.
-
-* Synopsis of compile-time options:
-
-    People have reported using previous versions of this malloc on all
-    versions of Unix, sometimes by tweaking some of the defines
-    below. It has been tested most extensively on Solaris and
-    Linux. It is also reported to work on WIN32 platforms.
-    People also report using it in stand-alone embedded systems.
-
-    The implementation is in straight, hand-tuned ANSI C.  It is not
-    at all modular. (Sorry!)  It uses a lot of macros.  To be at all
-    usable, this code should be compiled using an optimizing compiler
-    (for example gcc -O3) that can simplify expressions and control
-    paths. (FAQ: some macros import variables as arguments rather than
-    declare locals because people reported that some debuggers
-    otherwise get confused.)
-
-    OPTION                     DEFAULT VALUE
-
-    Compilation Environment options:
-
-    __STD_C                    derived from C compiler defines
-    WIN32                      NOT defined
-    HAVE_MEMCPY                defined
-    USE_MEMCPY                 1 if HAVE_MEMCPY is defined
-    HAVE_MMAP                  defined as 1
-    MMAP_CLEARS                1
-    HAVE_MREMAP                0 unless linux defined
-    malloc_getpagesize         derived from system #includes, or 4096 if not
-    HAVE_USR_INCLUDE_MALLOC_H  NOT defined
-    LACKS_UNISTD_H             NOT defined unless WIN32
-    LACKS_SYS_PARAM_H          NOT defined unless WIN32
-    LACKS_SYS_MMAN_H           NOT defined unless WIN32
-    LACKS_FCNTL_H              NOT defined
-
-    Changing default word sizes:
-
-    INTERNAL_SIZE_T            size_t
-    MALLOC_ALIGNMENT           2 * sizeof(INTERNAL_SIZE_T)
-    PTR_UINT                   unsigned long
-    CHUNK_SIZE_T               unsigned long
-
-    Configuration and functionality options:
-
-    USE_DL_PREFIX              NOT defined
-    USE_PUBLIC_MALLOC_WRAPPERS NOT defined
-    USE_MALLOC_LOCK            NOT defined
-    DEBUG                      NOT defined
-    REALLOC_ZERO_BYTES_FREES   NOT defined
-    MALLOC_FAILURE_ACTION      errno = ENOMEM, if __STD_C defined, else no-op
-    TRIM_FASTBINS              0
-    FIRST_SORTED_BIN_SIZE      512
-
-    Options for customizing MORECORE:
-
-    MORECORE                   sbrk
-    MORECORE_CONTIGUOUS        1
-    MORECORE_CANNOT_TRIM       NOT defined
-    MMAP_AS_MORECORE_SIZE      (1024 * 1024)
-
-    Tuning options that are also dynamically changeable via mallopt:
-
-    DEFAULT_MXFAST             64
-    DEFAULT_TRIM_THRESHOLD     256 * 1024
-    DEFAULT_TOP_PAD            0
-    DEFAULT_MMAP_THRESHOLD     256 * 1024
-    DEFAULT_MMAP_MAX           65536
-
-    There are several other #defined constants and macros that you
-    probably don't want to touch unless you are extending or adapting malloc.
-*/
-
-/*
-  WIN32 sets up defaults for MS environment and compilers.
-  Otherwise defaults are for unix.
-*/
-
-/* #define WIN32 */
-
-#ifdef WIN32
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-/* Win32 doesn't supply or need the following headers */
-#define LACKS_UNISTD_H
-#define LACKS_SYS_PARAM_H
-#define LACKS_SYS_MMAN_H
-
-/* Use the supplied emulation of sbrk */
-#define MORECORE sbrk
-#define MORECORE_CONTIGUOUS 1
-#define MORECORE_FAILURE    ((void*)(-1))
-
-/* Use the supplied emulation of mmap and munmap */
-#define HAVE_MMAP 1
-#define MUNMAP_FAILURE  (-1)
-#define MMAP_CLEARS 1
-
-/* These values don't really matter in windows mmap emulation */
-#define MAP_PRIVATE 1
-#define MAP_ANONYMOUS 2
-#define PROT_READ 1
-#define PROT_WRITE 2
-
-/* Emulation functions defined at the end of this file */
-
-/* If USE_MALLOC_LOCK, use supplied critical-section-based lock functions */
-#ifdef USE_MALLOC_LOCK
-static int slwait(int *sl);
-static int slrelease(int *sl);
-#endif
-
-static long getpagesize(void);
-static long getregionsize(void);
-static void *sbrk(long size);
-static void *mmap(void *ptr, long size, long prot, long type, long handle, long arg);
-static long munmap(void *ptr, long size);
-
-static void vminfo (unsigned long*free, unsigned long*reserved, unsigned long*committed);
-static int cpuinfo (int whole, unsigned long*kernel, unsigned long*user);
-
-#endif
-
-/*
-  __STD_C should be nonzero if using ANSI-standard C compiler, a C++
-  compiler, or a C compiler sufficiently close to ANSI to get away
-  with it.
-*/
-
-#ifndef __STD_C
-#if defined(__STDC__) || defined(_cplusplus)
-#define __STD_C     1
-#else
-#define __STD_C     0
-#endif
-#endif /*__STD_C*/
-
-
-/*
-  Void_t* is the pointer type that malloc should say it returns
-*/
-
-#ifndef Void_t
-#if (__STD_C || defined(WIN32))
-#define Void_t      void
-#else
-#define Void_t      char
-#endif
-#endif /*Void_t*/
-
-#if __STD_C
-#include <stddef.h>   /* for size_t */
-#else
-#include <sys/types.h>
-#endif
-
-#include "cygmalloc.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* define LACKS_UNISTD_H if your system does not have a <unistd.h>. */
-
-/* #define  LACKS_UNISTD_H */
-
-#ifndef LACKS_UNISTD_H
-#include <unistd.h>
-#endif
-
-/* define LACKS_SYS_PARAM_H if your system does not have a <sys/param.h>. */
-
-/* #define  LACKS_SYS_PARAM_H */
-
-
-#include <stdio.h>    /* needed for malloc_stats */
-#include <errno.h>    /* needed for optional MALLOC_FAILURE_ACTION */
-
-
-/*
-  Debugging:
-
-  Because freed chunks may be overwritten with bookkeeping fields, this
-  malloc will often die when freed memory is overwritten by user
-  programs.  This can be very effective (albeit in an annoying way)
-  in helping track down dangling pointers.
-
-  If you compile with -DDEBUG, a number of assertion checks are
-  enabled that will catch more memory errors. You probably won't be
-  able to make much sense of the actual assertion errors, but they
-  should help you locate incorrectly overwritten memory.  The
-  checking is fairly extensive, and will slow down execution
-  noticeably. Calling malloc_stats or mallinfo with DEBUG set will
-  attempt to check every non-mmapped allocated and free chunk in the
-  course of computing the summmaries. (By nature, mmapped regions
-  cannot be checked very much automatically.)
-
-  Setting DEBUG may also be helpful if you are trying to modify
-  this code. The assertions in the check routines spell out in more
-  detail the assumptions and invariants underlying the algorithms.
-
-  Setting DEBUG does NOT provide an automated mechanism for checking
-  that all accesses to malloced memory stay within their
-  bounds. However, there are several add-ons and adaptations of this
-  or other mallocs available that do this.
-*/
-
-#if DEBUG
-#include <assert.h>
-#else
-#define assert(x) ((void)0)
-#endif
-
-/*
-  The unsigned integer type used for comparing any two chunk sizes.
-  This should be at least as wide as size_t, but should not be signed.
-*/
-
-#ifndef CHUNK_SIZE_T
-#define CHUNK_SIZE_T unsigned long
-#endif
-
-/*
-  The unsigned integer type used to hold addresses when they are are
-  manipulated as integers. Except that it is not defined on all
-  systems, intptr_t would suffice.
-*/
-#ifndef PTR_UINT
-#define PTR_UINT unsigned long
-#endif
-
-
-/*
-  INTERNAL_SIZE_T is the word-size used for internal bookkeeping
-  of chunk sizes.
-
-  The default version is the same as size_t.
-
-  While not strictly necessary, it is best to define this as an
-  unsigned type, even if size_t is a signed type. This may avoid some
-  artificial size limitations on some systems.
-
-  On a 64-bit machine, you may be able to reduce malloc overhead by
-  defining INTERNAL_SIZE_T to be a 32 bit `unsigned int' at the
-  expense of not being able to handle more than 2^32 of malloced
-  space. If this limitation is acceptable, you are encouraged to set
-  this unless you are on a platform requiring 16byte alignments. In
-  this case the alignment requirements turn out to negate any
-  potential advantages of decreasing size_t word size.
-
-  Implementors: Beware of the possible combinations of:
-     - INTERNAL_SIZE_T might be signed or unsigned, might be 32 or 64 bits,
-       and might be the same width as int or as long
-     - size_t might have different width and signedness as INTERNAL_SIZE_T
-     - int and long might be 32 or 64 bits, and might be the same width
-  To deal with this, most comparisons and difference computations
-  among INTERNAL_SIZE_Ts should cast them to CHUNK_SIZE_T, being
-  aware of the fact that casting an unsigned int to a wider long does
-  not sign-extend. (This also makes checking for negative numbers
-  awkward.) Some of these casts result in harmless compiler warnings
-  on some systems.
-*/
-
-#ifndef INTERNAL_SIZE_T
-#define INTERNAL_SIZE_T size_t
-#endif
-
-/* The corresponding word size */
-#define SIZE_SZ                (sizeof(INTERNAL_SIZE_T))
-
-
-
-/*
-  MALLOC_ALIGNMENT is the minimum alignment for malloc'ed chunks.
-  It must be a power of two at least 2 * SIZE_SZ, even on machines
-  for which smaller alignments would suffice. It may be defined as
-  larger than this though. Note however that code and data structures
-  are optimized for the case of 8-byte alignment.
-*/
-
-
-#ifndef MALLOC_ALIGNMENT
-#define MALLOC_ALIGNMENT       (2 * SIZE_SZ)
-#endif
-
-/* The corresponding bit mask value */
-#define MALLOC_ALIGN_MASK      (MALLOC_ALIGNMENT - 1)
-
-
-
-/*
-  REALLOC_ZERO_BYTES_FREES should be set if a call to
-  realloc with zero bytes should be the same as a call to free.
-  Some people think it should. Otherwise, since this malloc
-  returns a unique pointer for malloc(0), so does realloc(p, 0).
-*/
-
-/*   #define REALLOC_ZERO_BYTES_FREES */
-
-/*
-  TRIM_FASTBINS controls whether free() of a very small chunk can
-  immediately lead to trimming. Setting to true (1) can reduce memory
-  footprint, but will almost always slow down programs that use a lot
-  of small chunks.
-
-  Define this only if you are willing to give up some speed to more
-  aggressively reduce system-level memory footprint when releasing
-  memory in programs that use many small chunks.  You can get
-  essentially the same effect by setting MXFAST to 0, but this can
-  lead to even greater slowdowns in programs using many small chunks.
-  TRIM_FASTBINS is an in-between compile-time option, that disables
-  only those chunks bordering topmost memory from being placed in
-  fastbins.
-*/
-
-#ifndef TRIM_FASTBINS
-#define TRIM_FASTBINS  0
-#endif
-
-
-/*
-  USE_DL_PREFIX will prefix all public routines with the string 'dl'.
-  This is necessary when you only want to use this malloc in one part
-  of a program, using your regular system malloc elsewhere.
-*/
-
-/* #define USE_DL_PREFIX */
-
-
-/*
-  USE_MALLOC_LOCK causes wrapper functions to surround each
-  callable routine with pthread mutex lock/unlock.
-
-  USE_MALLOC_LOCK forces USE_PUBLIC_MALLOC_WRAPPERS to be defined
-*/
-
-
-/* #define USE_MALLOC_LOCK */
-
-
-/*
-  If USE_PUBLIC_MALLOC_WRAPPERS is defined, every public routine is
-  actually a wrapper function that first calls MALLOC_PREACTION, then
-  calls the internal routine, and follows it with
-  MALLOC_POSTACTION. This is needed for locking, but you can also use
-  this, without USE_MALLOC_LOCK, for purposes of interception,
-  instrumentation, etc. It is a sad fact that using wrappers often
-  noticeably degrades performance of malloc-intensive programs.
-*/
-
-#ifdef USE_MALLOC_LOCK
-#define USE_PUBLIC_MALLOC_WRAPPERS
-#else
-/* #define USE_PUBLIC_MALLOC_WRAPPERS */
-#endif
-
-
-/*
-   Two-phase name translation.
-   All of the actual routines are given mangled names.
-   When wrappers are used, they become the public callable versions.
-   When DL_PREFIX is used, the callable names are prefixed.
-*/
-
-#ifndef USE_PUBLIC_MALLOC_WRAPPERS
-#define cALLOc      public_cALLOc
-#define fREe        public_fREe
-#define cFREe       public_cFREe
-#define mALLOc      public_mALLOc
-#define mEMALIGn    public_mEMALIGn
-#define rEALLOc     public_rEALLOc
-#define vALLOc      public_vALLOc
-#define pVALLOc     public_pVALLOc
-#define mALLINFo    public_mALLINFo
-#define mALLOPt     public_mALLOPt
-#define mTRIm       public_mTRIm
-#define mSTATs      public_mSTATs
-#define mUSABLe     public_mUSABLe
-#define iCALLOc     public_iCALLOc
-#define iCOMALLOc   public_iCOMALLOc
-#endif
-
-#ifdef USE_DL_PREFIX
-#define public_cALLOc    dlcalloc
-#define public_fREe      dlfree
-#define public_cFREe     dlcfree
-#define public_mALLOc    dlmalloc
-#define public_mEMALIGn  dlmemalign
-#define public_rEALLOc   dlrealloc
-#define public_vALLOc    dlvalloc
-#define public_pVALLOc   dlpvalloc
-#define public_mALLINFo  dlmallinfo
-#define public_mALLOPt   dlmallopt
-#define public_mTRIm     dlmalloc_trim
-#define public_mSTATs    dlmalloc_stats
-#define public_mUSABLe   dlmalloc_usable_size
-#define public_iCALLOc   dlindependent_calloc
-#define public_iCOMALLOc dlindependent_comalloc
-#else /* USE_DL_PREFIX */
-#define public_cALLOc    calloc
-#define public_fREe      free
-#define public_cFREe     cfree
-#define public_mALLOc    malloc
-#define public_mEMALIGn  memalign
-#define public_rEALLOc   realloc
-#define public_vALLOc    valloc
-#define public_pVALLOc   pvalloc
-#define public_mALLINFo  mallinfo
-#define public_mALLOPt   mallopt
-#define public_mTRIm     malloc_trim
-#define public_mSTATs    malloc_stats
-#define public_mUSABLe   malloc_usable_size
-#define public_iCALLOc   independent_calloc
-#define public_iCOMALLOc independent_comalloc
-#endif /* USE_DL_PREFIX */
-
-
-/*
-  HAVE_MEMCPY should be defined if you are not otherwise using
-  ANSI STD C, but still have memcpy and memset in your C library
-  and want to use them in calloc and realloc. Otherwise simple
-  macro versions are defined below.
-
-  USE_MEMCPY should be defined as 1 if you actually want to
-  have memset and memcpy called. People report that the macro
-  versions are faster than libc versions on some systems.
-
-  Even if USE_MEMCPY is set to 1, loops to copy/clear small chunks
-  (of <= 36 bytes) are manually unrolled in realloc and calloc.
-*/
-
-#define HAVE_MEMCPY
-
-#ifndef USE_MEMCPY
-#ifdef HAVE_MEMCPY
-#define USE_MEMCPY 1
-#else
-#define USE_MEMCPY 0
-#endif
-#endif
-
-
-#if (__STD_C || defined(HAVE_MEMCPY))
-
-#ifdef WIN32
-/* On Win32 memset and memcpy are already declared in windows.h */
-#else
-#if __STD_C
-void* memset(void*, int, size_t);
-void* memcpy(void*, const void*, size_t);
-#else
-Void_t* memset();
-Void_t* memcpy();
-#endif
-#endif
-#endif
-
-/*
-  MALLOC_FAILURE_ACTION is the action to take before "return 0" when
-  malloc fails to be able to return memory, either because memory is
-  exhausted or because of illegal arguments.
-
-  By default, sets errno if running on STD_C platform, else does nothing.
-*/
-
-#ifndef MALLOC_FAILURE_ACTION
-#if __STD_C
-#define MALLOC_FAILURE_ACTION \
-   errno = ENOMEM;
-
-#else
-#define MALLOC_FAILURE_ACTION
-#endif
-#endif
-
-/*
-  MORECORE-related declarations. By default, rely on sbrk
-*/
-
-
-#ifdef LACKS_UNISTD_H
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
-#if __STD_C
-extern Void_t*     sbrk(ptrdiff_t);
-#else
-extern Void_t*     sbrk();
-#endif
-#endif
-#endif
-
-/*
-  MORECORE is the name of the routine to call to obtain more memory
-  from the system.  See below for general guidance on writing
-  alternative MORECORE functions, as well as a version for WIN32 and a
-  sample version for pre-OSX macos.
-*/
-
-#ifndef MORECORE
-#define MORECORE sbrk
-#endif
-
-/*
-  MORECORE_FAILURE is the value returned upon failure of MORECORE
-  as well as mmap. Since it cannot be an otherwise valid memory address,
-  and must reflect values of standard sys calls, you probably ought not
-  try to redefine it.
-*/
-
-#ifndef MORECORE_FAILURE
-#define MORECORE_FAILURE (-1)
-#endif
-
-/*
-  If MORECORE_CONTIGUOUS is true, take advantage of fact that
-  consecutive calls to MORECORE with positive arguments always return
-  contiguous increasing addresses.  This is true of unix sbrk.  Even
-  if not defined, when regions happen to be contiguous, malloc will
-  permit allocations spanning regions obtained from different
-  calls. But defining this when applicable enables some stronger
-  consistency checks and space efficiencies.
-*/
-
-#ifndef MORECORE_CONTIGUOUS
-#define MORECORE_CONTIGUOUS 1
-#endif
-
-/*
-  Define MORECORE_CANNOT_TRIM if your version of MORECORE
-  cannot release space back to the system when given negative
-  arguments. This is generally necessary only if you are using
-  a hand-crafted MORECORE function that cannot handle negative arguments.
-*/
-
-/* #define MORECORE_CANNOT_TRIM */
-
-
-/*
-  Define HAVE_MMAP as true to optionally make malloc() use mmap() to
-  allocate very large blocks.  These will be returned to the
-  operating system immediately after a free(). Also, if mmap
-  is available, it is used as a backup strategy in cases where
-  MORECORE fails to provide space from system.
-
-  This malloc is best tuned to work with mmap for large requests.
-  If you do not have mmap, operations involving very large chunks (1MB
-  or so) may be slower than you'd like.
-*/
-
-#ifndef HAVE_MMAP
-#define HAVE_MMAP 1
-#endif
-
-#if HAVE_MMAP
-/*
-   Standard unix mmap using /dev/zero clears memory so calloc doesn't
-   need to.
-*/
-
-#ifndef MMAP_CLEARS
-#define MMAP_CLEARS 1
-#endif
-
-#else /* no mmap */
-#ifndef MMAP_CLEARS
-#define MMAP_CLEARS 0
-#endif
-#endif
-
-
-/*
-   MMAP_AS_MORECORE_SIZE is the minimum mmap size argument to use if
-   sbrk fails, and mmap is used as a backup (which is done only if
-   HAVE_MMAP).  The value must be a multiple of page size.  This
-   backup strategy generally applies only when systems have "holes" in
-   address space, so sbrk cannot perform contiguous expansion, but
-   there is still space available on system.  On systems for which
-   this is known to be useful (i.e. most linux kernels), this occurs
-   only when programs allocate huge amounts of memory.  Between this,
-   and the fact that mmap regions tend to be limited, the size should
-   be large, to avoid too many mmap calls and thus avoid running out
-   of kernel resources.
-*/
-
-#ifndef MMAP_AS_MORECORE_SIZE
-#define MMAP_AS_MORECORE_SIZE (1024 * 1024)
-#endif
-
-/*
-  Define HAVE_MREMAP to make realloc() use mremap() to re-allocate
-  large blocks.  This is currently only possible on Linux with
-  kernel versions newer than 1.3.77.
-*/
-
-#ifndef HAVE_MREMAP
-#ifdef linux
-#define HAVE_MREMAP 1
-#else
-#define HAVE_MREMAP 0
-#endif
-
-#endif /* HAVE_MMAP */
-
-
-/*
-  The system page size. To the extent possible, this malloc manages
-  memory from the system in page-size units.  Note that this value is
-  cached during initialization into a field of malloc_state. So even
-  if malloc_getpagesize is a function, it is only called once.
-
-  The following mechanics for getpagesize were adapted from bsd/gnu
-  getpagesize.h. If none of the system-probes here apply, a value of
-  4096 is used, which should be OK: If they don't apply, then using
-  the actual value probably doesn't impact performance.
-*/
-
-
-#ifndef malloc_getpagesize
-
-#ifndef LACKS_UNISTD_H
-#  include <unistd.h>
-#endif
-
-#  ifdef _SC_PAGESIZE         /* some SVR4 systems omit an underscore */
-#    ifndef _SC_PAGE_SIZE
-#      define _SC_PAGE_SIZE _SC_PAGESIZE
-#    endif
-#  endif
-
-#  ifdef _SC_PAGE_SIZE
-#    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
-#  else
-#    if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE)
-       extern size_t getpagesize();
-#      define malloc_getpagesize getpagesize()
-#    else
-#      ifdef WIN32 /* use supplied emulation of getpagesize */
-#        define malloc_getpagesize getpagesize()
-#      else
-#        ifndef LACKS_SYS_PARAM_H
-#          include <sys/param.h>
-#        endif
-#        ifdef EXEC_PAGESIZE
-#          define malloc_getpagesize EXEC_PAGESIZE
-#        else
-#          ifdef NBPG
-#            ifndef CLSIZE
-#              define malloc_getpagesize NBPG
-#            else
-#              define malloc_getpagesize (NBPG * CLSIZE)
-#            endif
-#          else
-#            ifdef NBPC
-#              define malloc_getpagesize NBPC
-#            else
-#              ifdef PAGESIZE
-#                define malloc_getpagesize PAGESIZE
-#              else /* just guess */
-#                define malloc_getpagesize (4096)
-#              endif
-#            endif
-#          endif
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/*
-  This version of malloc supports the standard SVID/XPG mallinfo
-  routine that returns a struct containing usage properties and
-  statistics. It should work on any SVID/XPG compliant system that has
-  a /usr/include/malloc.h defining struct mallinfo. (If you'd like to
-  install such a thing yourself, cut out the preliminary declarations
-  as described above and below and save them in a malloc.h file. But
-  there's no compelling reason to bother to do this.)
-
-  The main declaration needed is the mallinfo struct that is returned
-  (by-copy) by mallinfo().  The SVID/XPG malloinfo struct contains a
-  bunch of fields that are not even meaningful in this version of
-  malloc.  These fields are are instead filled by mallinfo() with
-  other numbers that might be of interest.
-
-  HAVE_USR_INCLUDE_MALLOC_H should be set if you have a
-  /usr/include/malloc.h file that includes a declaration of struct
-  mallinfo.  If so, it is included; else an SVID2/XPG2 compliant
-  version is declared below.  These must be precisely the same for
-  mallinfo() to work.  The original SVID version of this struct,
-  defined on most systems with mallinfo, declares all fields as
-  ints. But some others define as unsigned long. If your system
-  defines the fields using a type of different width than listed here,
-  you must #include your system version and #define
-  HAVE_USR_INCLUDE_MALLOC_H.
-*/
-
-/* #define HAVE_USR_INCLUDE_MALLOC_H */
-
-#ifdef HAVE_USR_INCLUDE_MALLOC_H
-#include "/usr/include/malloc.h"
-#else
-
-/* SVID2/XPG mallinfo structure */
-
-struct mallinfo {
-  int arena;    /* non-mmapped space allocated from system */
-  int ordblks;  /* number of free chunks */
-  int smblks;   /* number of fastbin blocks */
-  int hblks;    /* number of mmapped regions */
-  int hblkhd;   /* space in mmapped regions */
-  int usmblks;  /* maximum total allocated space */
-  int fsmblks;  /* space available in freed fastbin blocks */
-  int uordblks; /* total allocated space */
-  int fordblks; /* total free space */
-  int keepcost; /* top-most, releasable (via malloc_trim) space */
-};
-
-/*
-  SVID/XPG defines four standard parameter numbers for mallopt,
-  normally defined in malloc.h.  Only one of these (M_MXFAST) is used
-  in this malloc. The others (M_NLBLKS, M_GRAIN, M_KEEP) don't apply,
-  so setting them has no effect. But this malloc also supports other
-  options in mallopt described below.
-*/
-#endif
-
-
-/* ---------- description of public routines ------------ */
-
-/*
-  malloc(size_t n)
-  Returns a pointer to a newly allocated chunk of at least n bytes, or null
-  if no space is available. Additionally, on failure, errno is
-  set to ENOMEM on ANSI C systems.
-
-  If n is zero, malloc returns a minumum-sized chunk. (The minimum
-  size is 16 bytes on most 32bit systems, and 24 or 32 bytes on 64bit
-  systems.)  On most systems, size_t is an unsigned type, so calls
-  with negative arguments are interpreted as requests for huge amounts
-  of space, which will often fail. The maximum supported value of n
-  differs across systems, but is in all cases less than the maximum
-  representable value of a size_t.
-*/
-#if __STD_C
-Void_t*  public_mALLOc(size_t);
-#else
-Void_t*  public_mALLOc();
-#endif
-
-/*
-  free(Void_t* p)
-  Releases the chunk of memory pointed to by p, that had been previously
-  allocated using malloc or a related routine such as realloc.
-  It has no effect if p is null. It can have arbitrary (i.e., bad!)
-  effects if p has already been freed.
-
-  Unless disabled (using mallopt), freeing very large spaces will
-  when possible, automatically trigger operations that give
-  back unused memory to the system, thus reducing program footprint.
-*/
-#if __STD_C
-void     public_fREe(Void_t*);
-#else
-void     public_fREe();
-#endif
-
-/*
-  calloc(size_t n_elements, size_t element_size);
-  Returns a pointer to n_elements * element_size bytes, with all locations
-  set to zero.
-*/
-#if __STD_C
-Void_t*  public_cALLOc(size_t, size_t);
-#else
-Void_t*  public_cALLOc();
-#endif
-
-/*
-  realloc(Void_t* p, size_t n)
-  Returns a pointer to a chunk of size n that contains the same data
-  as does chunk p up to the minimum of (n, p's size) bytes, or null
-  if no space is available.
-
-  The returned pointer may or may not be the same as p. The algorithm
-  prefers extending p when possible, otherwise it employs the
-  equivalent of a malloc-copy-free sequence.
-
-  If p is null, realloc is equivalent to malloc.
-
-  If space is not available, realloc returns null, errno is set (if on
-  ANSI) and p is NOT freed.
-
-  if n is for fewer bytes than already held by p, the newly unused
-  space is lopped off and freed if possible.  Unless the #define
-  REALLOC_ZERO_BYTES_FREES is set, realloc with a size argument of
-  zero (re)allocates a minimum-sized chunk.
-
-  Large chunks that were internally obtained via mmap will always
-  be reallocated using malloc-copy-free sequences unless
-  the system supports MREMAP (currently only linux).
-
-  The old unix realloc convention of allowing the last-free'd chunk
-  to be used as an argument to realloc is not supported.
-*/
-#if __STD_C
-Void_t*  public_rEALLOc(Void_t*, size_t);
-#else
-Void_t*  public_rEALLOc();
-#endif
-
-/*
-  memalign(size_t alignment, size_t n);
-  Returns a pointer to a newly allocated chunk of n bytes, aligned
-  in accord with the alignment argument.
-
-  The alignment argument should be a power of two. If the argument is
-  not a power of two, the nearest greater power is used.
-  8-byte alignment is guaranteed by normal malloc calls, so don't
-  bother calling memalign with an argument of 8 or less.
-
-  Overreliance on memalign is a sure way to fragment space.
-*/
-#if __STD_C
-Void_t*  public_mEMALIGn(size_t, size_t);
-#else
-Void_t*  public_mEMALIGn();
-#endif
-
-/*
-  valloc(size_t n);
-  Equivalent to memalign(pagesize, n), where pagesize is the page
-  size of the system. If the pagesize is unknown, 4096 is used.
-*/
-#if __STD_C
-Void_t*  public_vALLOc(size_t);
-#else
-Void_t*  public_vALLOc();
-#endif
-
-
-
-/*
-  mallopt(int parameter_number, int parameter_value)
-  Sets tunable parameters The format is to provide a
-  (parameter-number, parameter-value) pair.  mallopt then sets the
-  corresponding parameter to the argument value if it can (i.e., so
-  long as the value is meaningful), and returns 1 if successful else
-  0.  SVID/XPG/ANSI defines four standard param numbers for mallopt,
-  normally defined in malloc.h.  Only one of these (M_MXFAST) is used
-  in this malloc. The others (M_NLBLKS, M_GRAIN, M_KEEP) don't apply,
-  so setting them has no effect. But this malloc also supports four
-  other options in mallopt. See below for details.  Briefly, supported
-  parameters are as follows (listed defaults are for "typical"
-  configurations).
-
-  Symbol            param #   default    allowed param values
-  M_MXFAST          1         64         0-80  (0 disables fastbins)
-  M_TRIM_THRESHOLD -1         256*1024   any   (-1U disables trimming)
-  M_TOP_PAD        -2         0          any
-  M_MMAP_THRESHOLD -3         256*1024   any   (or 0 if no MMAP support)
-  M_MMAP_MAX       -4         65536      any   (0 disables use of mmap)
-*/
-#if __STD_C
-int      public_mALLOPt(int, int);
-#else
-int      public_mALLOPt();
-#endif
-
-
-/*
-  mallinfo()
-  Returns (by copy) a struct containing various summary statistics:
-
-  arena:     current total non-mmapped bytes allocated from system
-  ordblks:   the number of free chunks
-  smblks:    the number of fastbin blocks (i.e., small chunks that
-	       have been freed but not use resused or consolidated)
-  hblks:     current number of mmapped regions
-  hblkhd:    total bytes held in mmapped regions
-  usmblks:   the maximum total allocated space. This will be greater
-		than current total if trimming has occurred.
-  fsmblks:   total bytes held in fastbin blocks
-  uordblks:  current total allocated space (normal or mmapped)
-  fordblks:  total free space
-  keepcost:  the maximum number of bytes that could ideally be released
-	       back to system via malloc_trim. ("ideally" means that
-	       it ignores page restrictions etc.)
-
-  Because these fields are ints, but internal bookkeeping may
-  be kept as longs, the reported values may wrap around zero and
-  thus be inaccurate.
-*/
-#if __STD_C
-struct mallinfo public_mALLINFo(void);
-#else
-struct mallinfo public_mALLINFo();
-#endif
-
-/*
-  independent_calloc(size_t n_elements, size_t element_size, Void_t* chunks[]);
-
-  independent_calloc is similar to calloc, but instead of returning a
-  single cleared space, it returns an array of pointers to n_elements
-  independent elements that can hold contents of size elem_size, each
-  of which starts out cleared, and can be independently freed,
-  realloc'ed etc. The elements are guaranteed to be adjacently
-  allocated (this is not guaranteed to occur with multiple callocs or
-  mallocs), which may also improve cache locality in some
-  applications.
-
-  The "chunks" argument is optional (i.e., may be null, which is
-  probably the most typical usage). If it is null, the returned array
-  is itself dynamically allocated and should also be freed when it is
-  no longer needed. Otherwise, the chunks array must be of at least
-  n_elements in length. It is filled in with the pointers to the
-  chunks.
-
-  In either case, independent_calloc returns this pointer array, or
-  null if the allocation failed.  If n_elements is zero and "chunks"
-  is null, it returns a chunk representing an array with zero elements
-  (which should be freed if not wanted).
-
-  Each element must be individually freed when it is no longer
-  needed. If you'd like to instead be able to free all at once, you
-  should instead use regular calloc and assign pointers into this
-  space to represent elements.  (In this case though, you cannot
-  independently free elements.)
-
-  independent_calloc simplifies and speeds up implementations of many
-  kinds of pools.  It may also be useful when constructing large data
-  structures that initially have a fixed number of fixed-sized nodes,
-  but the number is not known at compile time, and some of the nodes
-  may later need to be freed. For example:
-
-  struct Node { int item; struct Node* next; };
-
-  struct Node* build_list() {
-    struct Node** pool;
-    int n = read_number_of_nodes_needed();
-    if (n <= 0) return 0;
-    pool = (struct Node**)(independent_calloc(n, sizeof(struct Node), 0);
-    if (pool == 0) die();
-    // organize into a linked list...
-    struct Node* first = pool[0];
-    for (i = 0; i < n-1; ++i)
-      pool[i]->next = pool[i+1];
-    free(pool);     // Can now free the array (or not, if it is needed later)
-    return first;
-  }
-*/
-#if __STD_C
-Void_t** public_iCALLOc(size_t, size_t, Void_t**);
-#else
-Void_t** public_iCALLOc();
-#endif
-
-/*
-  independent_comalloc(size_t n_elements, size_t sizes[], Void_t* chunks[]);
-
-  independent_comalloc allocates, all at once, a set of n_elements
-  chunks with sizes indicated in the "sizes" array.    It returns
-  an array of pointers to these elements, each of which can be
-  independently freed, realloc'ed etc. The elements are guaranteed to
-  be adjacently allocated (this is not guaranteed to occur with
-  multiple callocs or mallocs), which may also improve cache locality
-  in some applications.
-
-  The "chunks" argument is optional (i.e., may be null). If it is null
-  the returned array is itself dynamically allocated and should also
-  be freed when it is no longer needed. Otherwise, the chunks array
-  must be of at least n_elements in length. It is filled in with the
-  pointers to the chunks.
-
-  In either case, independent_comalloc returns this pointer array, or
-  null if the allocation failed.  If n_elements is zero and chunks is
-  null, it returns a chunk representing an array with zero elements
-  (which should be freed if not wanted).
-
-  Each element must be individually freed when it is no longer
-  needed. If you'd like to instead be able to free all at once, you
-  should instead use a single regular malloc, and assign pointers at
-  particular offsets in the aggregate space. (In this case though, you
-  cannot independently free elements.)
-
-  independent_comallac differs from independent_calloc in that each
-  element may have a different size, and also that it does not
-  automatically clear elements.
-
-  independent_comalloc can be used to speed up allocation in cases
-  where several structs or objects must always be allocated at the
-  same time.  For example:
-
-  struct Head { ... }
-  struct Foot { ... }
-
-  void send_message(char* msg) {
-    int msglen = strlen(msg);
-    size_t sizes[3] = { sizeof(struct Head), msglen, sizeof(struct Foot) };
-    void* chunks[3];
-    if (independent_comalloc(3, sizes, chunks) == 0)
-      die();
-    struct Head* head = (struct Head*)(chunks[0]);
-    char*        body = (char*)(chunks[1]);
-    struct Foot* foot = (struct Foot*)(chunks[2]);
-    // ...
-  }
-
-  In general though, independent_comalloc is worth using only for
-  larger values of n_elements. For small values, you probably won't
-  detect enough difference from series of malloc calls to bother.
-
-  Overuse of independent_comalloc can increase overall memory usage,
-  since it cannot reuse existing noncontiguous small chunks that
-  might be available for some of the elements.
-*/
-#if __STD_C
-Void_t** public_iCOMALLOc(size_t, size_t*, Void_t**);
-#else
-Void_t** public_iCOMALLOc();
-#endif
-
-
-/*
-  pvalloc(size_t n);
-  Equivalent to valloc(minimum-page-that-holds(n)), that is,
-  round up n to nearest pagesize.
- */
-#if __STD_C
-Void_t*  public_pVALLOc(size_t);
-#else
-Void_t*  public_pVALLOc();
-#endif
-
-/*
-  cfree(Void_t* p);
-  Equivalent to free(p).
-
-  cfree is needed/defined on some systems that pair it with calloc,
-  for odd historical reasons (such as: cfree is used in example
-  code in the first edition of K&R).
-*/
-#if __STD_C
-void     public_cFREe(Void_t*);
-#else
-void     public_cFREe();
-#endif
-
-/*
-  malloc_trim(size_t pad);
-
-  If possible, gives memory back to the system (via negative
-  arguments to sbrk) if there is unused memory at the `high' end of
-  the malloc pool. You can call this after freeing large blocks of
-  memory to potentially reduce the system-level memory requirements
-  of a program. However, it cannot guarantee to reduce memory. Under
-  some allocation patterns, some large free blocks of memory will be
-  locked between two used chunks, so they cannot be given back to
-  the system.
-
-  The `pad' argument to malloc_trim represents the amount of free
-  trailing space to leave untrimmed. If this argument is zero,
-  only the minimum amount of memory to maintain internal data
-  structures will be left (one page or less). Non-zero arguments
-  can be supplied to maintain enough trailing space to service
-  future expected allocations without having to re-obtain memory
-  from the system.
-
-  Malloc_trim returns 1 if it actually released any memory, else 0.
-  On systems that do not support "negative sbrks", it will always
-  rreturn 0.
-*/
-#if __STD_C
-int      public_mTRIm(size_t);
-#else
-int      public_mTRIm();
-#endif
-
-/*
-  malloc_usable_size(Void_t* p);
-
-  Returns the number of bytes you can actually use in
-  an allocated chunk, which may be more than you requested (although
-  often not) due to alignment and minimum size constraints.
-  You can use this many bytes without worrying about
-  overwriting other allocated objects. This is not a particularly great
-  programming practice. malloc_usable_size can be more useful in
-  debugging and assertions, for example:
-
-  p = malloc(n);
-  assert(malloc_usable_size(p) >= 256);
-
-*/
-#if __STD_C
-size_t   public_mUSABLe(Void_t*);
-#else
-size_t   public_mUSABLe();
-#endif
-
-/*
-  malloc_stats();
-  Prints on stderr the amount of space obtained from the system (both
-  via sbrk and mmap), the maximum amount (which may be more than
-  current if malloc_trim and/or munmap got called), and the current
-  number of bytes allocated via malloc (or realloc, etc) but not yet
-  freed. Note that this is the number of bytes allocated, not the
-  number requested. It will be larger than the number requested
-  because of alignment and bookkeeping overhead. Because it includes
-  alignment wastage as being in use, this figure may be greater than
-  zero even when no user-level chunks are allocated.
-
-  The reported current and maximum system memory can be inaccurate if
-  a program makes other calls to system memory allocation functions
-  (normally sbrk) outside of malloc.
-
-  malloc_stats prints only the most commonly interesting statistics.
-  More information can be obtained by calling mallinfo.
-
-*/
-#if __STD_C
-void     public_mSTATs();
-#else
-void     public_mSTATs();
-#endif
-
-/* mallopt tuning options */
-
-/*
-  M_MXFAST is the maximum request size used for "fastbins", special bins
-  that hold returned chunks without consolidating their spaces. This
-  enables future requests for chunks of the same size to be handled
-  very quickly, but can increase fragmentation, and thus increase the
-  overall memory footprint of a program.
-
-  This malloc manages fastbins very conservatively yet still
-  efficiently, so fragmentation is rarely a problem for values less
-  than or equal to the default.  The maximum supported value of MXFAST
-  is 80. You wouldn't want it any higher than this anyway.  Fastbins
-  are designed especially for use with many small structs, objects or
-  strings -- the default handles structs/objects/arrays with sizes up
-  to 16 4byte fields, or small strings representing words, tokens,
-  etc. Using fastbins for larger objects normally worsens
-  fragmentation without improving speed.
-
-  M_MXFAST is set in REQUEST size units. It is internally used in
-  chunksize units, which adds padding and alignment.  You can reduce
-  M_MXFAST to 0 to disable all use of fastbins.  This causes the malloc
-  algorithm to be a closer approximation of fifo-best-fit in all cases,
-  not just for larger requests, but will generally cause it to be
-  slower.
-*/
-
-
-/* M_MXFAST is a standard SVID/XPG tuning option, usually listed in malloc.h */
-#ifndef M_MXFAST
-#define M_MXFAST            1
-#endif
-
-#ifndef DEFAULT_MXFAST
-#define DEFAULT_MXFAST     64
-#endif
-
-
-/*
-  M_TRIM_THRESHOLD is the maximum amount of unused top-most memory
-  to keep before releasing via malloc_trim in free().
-
-  Automatic trimming is mainly useful in long-lived programs.
-  Because trimming via sbrk can be slow on some systems, and can
-  sometimes be wasteful (in cases where programs immediately
-  afterward allocate more large chunks) the value should be high
-  enough so that your overall system performance would improve by
-  releasing this much memory.
-
-  The trim threshold and the mmap control parameters (see below)
-  can be traded off with one another. Trimming and mmapping are
-  two different ways of releasing unused memory back to the
-  system. Between these two, it is often possible to keep
-  system-level demands of a long-lived program down to a bare
-  minimum. For example, in one test suite of sessions measuring
-  the XF86 X server on Linux, using a trim threshold of 128K and a
-  mmap threshold of 192K led to near-minimal long term resource
-  consumption.
-
-  If you are using this malloc in a long-lived program, it should
-  pay to experiment with these values.  As a rough guide, you
-  might set to a value close to the average size of a process
-  (program) running on your system.  Releasing this much memory
-  would allow such a process to run in memory.  Generally, it's
-  worth it to tune for trimming rather tham memory mapping when a
-  program undergoes phases where several large chunks are
-  allocated and released in ways that can reuse each other's
-  storage, perhaps mixed with phases where there are no such
-  chunks at all.  And in well-behaved long-lived programs,
-  controlling release of large blocks via trimming versus mapping
-  is usually faster.
-
-  However, in most programs, these parameters serve mainly as
-  protection against the system-level effects of carrying around
-  massive amounts of unneeded memory. Since frequent calls to
-  sbrk, mmap, and munmap otherwise degrade performance, the default
-  parameters are set to relatively high values that serve only as
-  safeguards.
-
-  The trim value must be greater than page size to have any useful
-  effect.  To disable trimming completely, you can set to
-  (unsigned long)(-1)
-
-  Trim settings interact with fastbin (MXFAST) settings: Unless
-  TRIM_FASTBINS is defined, automatic trimming never takes place upon
-  freeing a chunk with size less than or equal to MXFAST. Trimming is
-  instead delayed until subsequent freeing of larger chunks. However,
-  you can still force an attempted trim by calling malloc_trim.
-
-  Also, trimming is not generally possible in cases where
-  the main arena is obtained via mmap.
-
-  Note that the trick some people use of mallocing a huge space and
-  then freeing it at program startup, in an attempt to reserve system
-  memory, doesn't have the intended effect under automatic trimming,
-  since that memory will immediately be returned to the system.
-*/
-
-#define M_TRIM_THRESHOLD       -1
-
-#ifndef DEFAULT_TRIM_THRESHOLD
-#define DEFAULT_TRIM_THRESHOLD (256 * 1024)
-#endif
-
-/*
-  M_TOP_PAD is the amount of extra `padding' space to allocate or
-  retain whenever sbrk is called. It is used in two ways internally:
-
-  * When sbrk is called to extend the top of the arena to satisfy
-  a new malloc request, this much padding is added to the sbrk
-  request.
-
-  * When malloc_trim is called automatically from free(),
-  it is used as the `pad' argument.
-
-  In both cases, the actual amount of padding is rounded
-  so that the end of the arena is always a system page boundary.
-
-  The main reason for using padding is to avoid calling sbrk so
-  often. Having even a small pad greatly reduces the likelihood
-  that nearly every malloc request during program start-up (or
-  after trimming) will invoke sbrk, which needlessly wastes
-  time.
-
-  Automatic rounding-up to page-size units is normally sufficient
-  to avoid measurable overhead, so the default is 0.  However, in
-  systems where sbrk is relatively slow, it can pay to increase
-  this value, at the expense of carrying around more memory than
-  the program needs.
-*/
-
-#define M_TOP_PAD              -2
-
-#ifndef DEFAULT_TOP_PAD
-#define DEFAULT_TOP_PAD        (0)
-#endif
-
-/*
-  M_MMAP_THRESHOLD is the request size threshold for using mmap()
-  to service a request. Requests of at least this size that cannot
-  be allocated using already-existing space will be serviced via mmap.
-  (If enough normal freed space already exists it is used instead.)
-
-  Using mmap segregates relatively large chunks of memory so that
-  they can be individually obtained and released from the host
-  system. A request serviced through mmap is never reused by any
-  other request (at least not directly; the system may just so
-  happen to remap successive requests to the same locations).
-
-  Segregating space in this way has the benefits that:
-
-   1. Mmapped space can ALWAYS be individually released back
-      to the system, which helps keep the system level memory
-      demands of a long-lived program low.
-   2. Mapped memory can never become `locked' between
-      other chunks, as can happen with normally allocated chunks, which
-      means that even trimming via malloc_trim would not release them.
-   3. On some systems with "holes" in address spaces, mmap can obtain
-      memory that sbrk cannot.
-
-  However, it has the disadvantages that:
-
-   1. The space cannot be reclaimed, consolidated, and then
-      used to service later requests, as happens with normal chunks.
-   2. It can lead to more wastage because of mmap page alignment
-      requirements
-   3. It causes malloc performance to be more dependent on host
-      system memory management support routines which may vary in
-      implementation quality and may impose arbitrary
-      limitations. Generally, servicing a request via normal
-      malloc steps is faster than going through a system's mmap.
-
-  The advantages of mmap nearly always outweigh disadvantages for
-  "large" chunks, but the value of "large" varies across systems.  The
-  default is an empirically derived value that works well in most
-  systems.
-*/
-
-#define M_MMAP_THRESHOLD      -3
-
-#define DEFAULT_MMAP_THRESHOLD (16 * 1024 * 1024)
-
-#ifndef DEFAULT_MMAP_THRESHOLD
-#define DEFAULT_MMAP_THRESHOLD (256 * 1024)
-#endif
-
-/*
-  M_MMAP_MAX is the maximum number of requests to simultaneously
-  service using mmap. This parameter exists because
-. Some systems have a limited number of internal tables for
-  use by mmap, and using more than a few of them may degrade
-  performance.
-
-  The default is set to a value that serves only as a safeguard.
-  Setting to 0 disables use of mmap for servicing large requests.  If
-  HAVE_MMAP is not set, the default value is 0, and attempts to set it
-  to non-zero values in mallopt will fail.
-*/
-
-#define M_MMAP_MAX             -4
-
-#ifndef DEFAULT_MMAP_MAX
-#if HAVE_MMAP
-#define DEFAULT_MMAP_MAX       (65536)
-#else
-#define DEFAULT_MMAP_MAX       (0)
-#endif
-#endif
-
-#ifdef __cplusplus
-};  /* end of extern "C" */
-#endif
-
-/*
-  ========================================================================
-  To make a fully customizable malloc.h header file, cut everything
-  above this line, put into file malloc.h, edit to suit, and #include it
-  on the next line, as well as in programs that use this malloc.
-  ========================================================================
-*/
-
-/* #include "malloc.h" */
-
-/* --------------------- public wrappers ---------------------- */
-
-#ifdef USE_PUBLIC_MALLOC_WRAPPERS
-
-/* Declare all routines as internal */
-#if __STD_C
-static Void_t*  mALLOc(size_t);
-static void     fREe(Void_t*);
-static Void_t*  rEALLOc(Void_t*, size_t);
-static Void_t*  mEMALIGn(size_t, size_t);
-static Void_t*  vALLOc(size_t);
-static Void_t*  pVALLOc(size_t);
-static Void_t*  cALLOc(size_t, size_t);
-static Void_t** iCALLOc(size_t, size_t, Void_t**);
-static Void_t** iCOMALLOc(size_t, size_t*, Void_t**);
-static void     cFREe(Void_t*);
-static int      mTRIm(size_t);
-static size_t   mUSABLe(Void_t*);
-static void     mSTATs();
-static int      mALLOPt(int, int);
-static struct mallinfo mALLINFo(void);
-#else
-static Void_t*  mALLOc();
-static void     fREe();
-static Void_t*  rEALLOc();
-static Void_t*  mEMALIGn();
-static Void_t*  vALLOc();
-static Void_t*  pVALLOc();
-static Void_t*  cALLOc();
-static Void_t** iCALLOc();
-static Void_t** iCOMALLOc();
-static void     cFREe();
-static int      mTRIm();
-static size_t   mUSABLe();
-static void     mSTATs();
-static int      mALLOPt();
-static struct mallinfo mALLINFo();
-#endif
-
-/*
-  MALLOC_PREACTION and MALLOC_POSTACTION should be
-  defined to return 0 on success, and nonzero on failure.
-  The return value of MALLOC_POSTACTION is currently ignored
-  in wrapper functions since there is no reasonable default
-  action to take on failure.
-*/
-
-
-#ifdef USE_MALLOC_LOCK
-
-#ifdef WIN32
-
-static int mALLOC_MUTEx;
-#define MALLOC_PREACTION   slwait(&mALLOC_MUTEx)
-#define MALLOC_POSTACTION  slrelease(&mALLOC_MUTEx)
-
-#else
-
-#include <pthread.h>
-
-static pthread_mutex_t mALLOC_MUTEx = PTHREAD_MUTEX_INITIALIZER;
-
-#define MALLOC_PREACTION   pthread_mutex_lock(&mALLOC_MUTEx)
-#define MALLOC_POSTACTION  pthread_mutex_unlock(&mALLOC_MUTEx)
-
-#endif /* USE_MALLOC_LOCK */
-
-#else
-
-/* Substitute anything you like for these */
-
-#define MALLOC_PREACTION   (0)
-#define MALLOC_POSTACTION  (0)
-
-#endif
-
-Void_t* public_mALLOc(size_t bytes) {
-  Void_t* m;
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  m = mALLOc(bytes);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return m;
-}
-
-void public_fREe(Void_t* m) {
-  if (MALLOC_PREACTION != 0) {
-    return;
-  }
-  fREe(m);
-  if (MALLOC_POSTACTION != 0) {
-  }
-}
-
-Void_t* public_rEALLOc(Void_t* m, size_t bytes) {
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  m = rEALLOc(m, bytes);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return m;
-}
-
-Void_t* public_mEMALIGn(size_t alignment, size_t bytes) {
-  Void_t* m;
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  m = mEMALIGn(alignment, bytes);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return m;
-}
-
-Void_t* public_vALLOc(size_t bytes) {
-  Void_t* m;
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  m = vALLOc(bytes);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return m;
-}
-
-#ifdef NEED_PVALLOC
-Void_t* public_pVALLOc(size_t bytes) {
-  Void_t* m;
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  m = pVALLOc(bytes);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return m;
-}
-#endif
-
-Void_t* public_cALLOc(size_t n, size_t elem_size) {
-  Void_t* m;
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  m = cALLOc(n, elem_size);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return m;
-}
-
-
-Void_t** public_iCALLOc(size_t n, size_t elem_size, Void_t** chunks) {
-  Void_t** m;
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  m = iCALLOc(n, elem_size, chunks);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return m;
-}
-
-Void_t** public_iCOMALLOc(size_t n, size_t sizes[], Void_t** chunks) {
-  Void_t** m;
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  m = iCOMALLOc(n, sizes, chunks);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return m;
-}
-
-void public_cFREe(Void_t* m) {
-  if (MALLOC_PREACTION != 0) {
-    return;
-  }
-  cFREe(m);
-  if (MALLOC_POSTACTION != 0) {
-  }
-}
-
-int public_mTRIm(size_t s) {
-  int result;
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  result = mTRIm(s);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return result;
-}
-
-size_t public_mUSABLe(Void_t* m) {
-  size_t result;
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  result = mUSABLe(m);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return result;
-}
-
-void public_mSTATs() {
-  if (MALLOC_PREACTION != 0) {
-    return;
-  }
-  mSTATs();
-  if (MALLOC_POSTACTION != 0) {
-  }
-}
-
-struct mallinfo public_mALLINFo() {
-  struct mallinfo m;
-  if (MALLOC_PREACTION != 0) {
-    struct mallinfo nm = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-    return nm;
-  }
-  m = mALLINFo();
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return m;
-}
-
-int public_mALLOPt(int p, int v) {
-  int result;
-  if (MALLOC_PREACTION != 0) {
-    return 0;
-  }
-  result = mALLOPt(p, v);
-  if (MALLOC_POSTACTION != 0) {
-  }
-  return result;
-}
-
-#endif
-
-
-
-/* ------------- Optional versions of memcopy ---------------- */
-
-
-#if USE_MEMCPY
-
-/*
-  Note: memcpy is ONLY invoked with non-overlapping regions,
-  so the (usually slower) memmove is not needed.
-*/
-
-#define MALLOC_COPY(dest, src, nbytes)  memcpy(dest, src, nbytes)
-#define MALLOC_ZERO(dest, nbytes)       memset(dest, 0,   nbytes)
-
-#else /* !USE_MEMCPY */
-
-/* Use Duff's device for good zeroing/copying performance. */
-
-#define MALLOC_ZERO(charp, nbytes)                                            \
-do {                                                                          \
-  INTERNAL_SIZE_T* mzp = (INTERNAL_SIZE_T*)(charp);                           \
-  CHUNK_SIZE_T  mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T);                     \
-  long mcn;                                                                   \
-  if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; }             \
-  switch (mctmp) {                                                            \
-    case 0: for(;;) { *mzp++ = 0;                                             \
-    case 7:           *mzp++ = 0;                                             \
-    case 6:           *mzp++ = 0;                                             \
-    case 5:           *mzp++ = 0;                                             \
-    case 4:           *mzp++ = 0;                                             \
-    case 3:           *mzp++ = 0;                                             \
-    case 2:           *mzp++ = 0;                                             \
-    case 1:           *mzp++ = 0; if(mcn <= 0) break; mcn--; }                \
-  }                                                                           \
-} while(0)
-
-#define MALLOC_COPY(dest,src,nbytes)                                          \
-do {                                                                          \
-  INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) src;                            \
-  INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) dest;                           \
-  CHUNK_SIZE_T  mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T);                     \
-  long mcn;                                                                   \
-  if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; }             \
-  switch (mctmp) {                                                            \
-    case 0: for(;;) { *mcdst++ = *mcsrc++;                                    \
-    case 7:           *mcdst++ = *mcsrc++;                                    \
-    case 6:           *mcdst++ = *mcsrc++;                                    \
-    case 5:           *mcdst++ = *mcsrc++;                                    \
-    case 4:           *mcdst++ = *mcsrc++;                                    \
-    case 3:           *mcdst++ = *mcsrc++;                                    \
-    case 2:           *mcdst++ = *mcsrc++;                                    \
-    case 1:           *mcdst++ = *mcsrc++; if(mcn <= 0) break; mcn--; }       \
-  }                                                                           \
-} while(0)
-
-#endif
-
-/* ------------------ MMAP support ------------------  */
-
-
-#if HAVE_MMAP
-
-#ifndef LACKS_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifndef LACKS_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
-#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
-#define MAP_ANONYMOUS MAP_ANON
-#endif
-
-/*
-   Nearly all versions of mmap support MAP_ANONYMOUS,
-   so the following is unlikely to be needed, but is
-   supplied just in case.
-*/
-
-#ifndef MAP_ANONYMOUS
-
-static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */
-
-#define MMAP(addr, size, prot, flags) ((dev_zero_fd < 0) ? \
- (dev_zero_fd = open("/dev/zero", O_RDWR), \
-  mmap((addr), (size), (prot), (flags), dev_zero_fd, 0)) : \
-   mmap((addr), (size), (prot), (flags), dev_zero_fd, 0))
-
-#else
-
-#define MMAP(addr, size, prot, flags) \
- (mmap((addr), (size), (prot), (flags)|MAP_ANONYMOUS, -1, 0))
-
-#endif
-
-
-#endif /* HAVE_MMAP */
-
-
-/*
-  -----------------------  Chunk representations -----------------------
-*/
-
-
-/*
-  This struct declaration is misleading (but accurate and necessary).
-  It declares a "view" into memory allowing access to necessary
-  fields at known offsets from a given base. See explanation below.
-*/
-
-struct malloc_chunk {
-
-  INTERNAL_SIZE_T      prev_size;  /* Size of previous chunk (if free).  */
-  INTERNAL_SIZE_T      size;       /* Size in bytes, including overhead. */
-
-  struct malloc_chunk* fd;         /* double links -- used only if free. */
-  struct malloc_chunk* bk;
-};
-
-
-typedef struct malloc_chunk* mchunkptr;
-
-/*
-   malloc_chunk details:
-
-    (The following includes lightly edited explanations by Colin Plumb.)
-
-    Chunks of memory are maintained using a `boundary tag' method as
-    described in e.g., Knuth or Standish.  (See the paper by Paul
-    Wilson ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a
-    survey of such techniques.)  Sizes of free chunks are stored both
-    in the front of each chunk and at the end.  This makes
-    consolidating fragmented chunks into bigger chunks very fast.  The
-    size fields also hold bits representing whether chunks are free or
-    in use.
-
-    An allocated chunk looks like this:
-
-
-    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Size of previous chunk, if allocated            | |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Size of chunk, in bytes                         |P|
-      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             User data starts here...                          .
-	    .                                                               .
-	    .             (malloc_usable_space() bytes)                     .
-	    .                                                               |
-nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Size of chunk                                     |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-
-    Where "chunk" is the front of the chunk for the purpose of most of
-    the malloc code, but "mem" is the pointer that is returned to the
-    user.  "Nextchunk" is the beginning of the next contiguous chunk.
-
-    Chunks always begin on even word boundries, so the mem portion
-    (which is returned to the user) is also on an even word boundary, and
-    thus at least double-word aligned.
-
-    Free chunks are stored in circular doubly-linked lists, and look like this:
-
-    chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Size of previous chunk                            |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    `head:' |             Size of chunk, in bytes                         |P|
-      mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Forward pointer to next chunk in list             |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Back pointer to previous chunk in list            |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	    |             Unused space (may be 0 bytes long)                .
-	    .                                                               .
-	    .                                                               |
-nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    `foot:' |             Size of chunk, in bytes                           |
-	    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-    The P (PREV_INUSE) bit, stored in the unused low-order bit of the
-    chunk size (which is always a multiple of two words), is an in-use
-    bit for the *previous* chunk.  If that bit is *clear*, then the
-    word before the current chunk size contains the previous chunk
-    size, and can be used to find the front of the previous chunk.
-    The very first chunk allocated always has this bit set,
-    preventing access to non-existent (or non-owned) memory. If
-    prev_inuse is set for any given chunk, then you CANNOT determine
-    the size of the previous chunk, and might even get a memory
-    addressing fault when trying to do so.
-
-    Note that the `foot' of the current chunk is actually represented
-    as the prev_size of the NEXT chunk. This makes it easier to
-    deal with alignments etc but can be very confusing when trying
-    to extend or adapt this code.
-
-    The two exceptions to all this are
-
-     1. The special chunk `top' doesn't bother using the
-	trailing size field since there is no next contiguous chunk
-	that would have to index off it. After initialization, `top'
-	is forced to always exist.  If it would become less than
-	MINSIZE bytes long, it is replenished.
-
-     2. Chunks allocated via mmap, which have the second-lowest-order
-	bit (IS_MMAPPED) set in their size fields.  Because they are
-	allocated one-by-one, each must contain its own trailing size field.
-
-*/
-
-/*
-  ---------- Size and alignment checks and conversions ----------
-*/
-
-/* conversion from malloc headers to user pointers, and back */
-
-#define chunk2mem(p)   ((Void_t*)((char*)(p) + 2*SIZE_SZ))
-#define mem2chunk(mem) ((mchunkptr)((char*)(mem) - 2*SIZE_SZ))
-
-/* The smallest possible chunk */
-#define MIN_CHUNK_SIZE        (sizeof(struct malloc_chunk))
-
-/* The smallest size we can malloc is an aligned minimal chunk */
-
-#define MINSIZE  \
-  (CHUNK_SIZE_T)(((MIN_CHUNK_SIZE+MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK))
-
-/* Check if m has acceptable alignment */
-
-#define aligned_OK(m)  (((PTR_UINT)((m)) & (MALLOC_ALIGN_MASK)) == 0)
-
-
-/*
-   Check if a request is so large that it would wrap around zero when
-   padded and aligned. To simplify some other code, the bound is made
-   low enough so that adding MINSIZE will also not wrap around sero.
-*/
-
-#define REQUEST_OUT_OF_RANGE(req)                                 \
-  ((CHUNK_SIZE_T)(req) >=                                        \
-   (CHUNK_SIZE_T)(INTERNAL_SIZE_T)(-2 * MINSIZE))
-
-/* pad request bytes into a usable size -- internal version */
-
-#define request2size(req)                                         \
-  (((req) + SIZE_SZ + MALLOC_ALIGN_MASK < MINSIZE)  ?             \
-   MINSIZE :                                                      \
-   ((req) + SIZE_SZ + MALLOC_ALIGN_MASK) & ~MALLOC_ALIGN_MASK)
-
-/*  Same, except also perform argument check */
-
-#define checked_request2size(req, sz)                             \
-  if (REQUEST_OUT_OF_RANGE(req)) {                                \
-    MALLOC_FAILURE_ACTION;                                        \
-    return 0;                                                     \
-  }                                                               \
-  (sz) = request2size(req);
-
-/*
-  --------------- Physical chunk operations ---------------
-*/
-
-
-/* size field is or'ed with PREV_INUSE when previous adjacent chunk in use */
-#define PREV_INUSE 0x1
-
-/* extract inuse bit of previous chunk */
-#define prev_inuse(p)       ((p)->size & PREV_INUSE)
-
-
-/* size field is or'ed with IS_MMAPPED if the chunk was obtained with mmap() */
-#define IS_MMAPPED 0x2
-
-/* check for mmap()'ed chunk */
-#define chunk_is_mmapped(p) ((p)->size & IS_MMAPPED)
-
-/*
-  Bits to mask off when extracting size
-
-  Note: IS_MMAPPED is intentionally not masked off from size field in
-  macros for which mmapped chunks should never be seen. This should
-  cause helpful core dumps to occur if it is tried by accident by
-  people extending or adapting this malloc.
-*/
-#define SIZE_BITS (PREV_INUSE|IS_MMAPPED)
-
-/* Get size, ignoring use bits */
-#define chunksize(p)         ((p)->size & ~(SIZE_BITS))
-
-
-/* Ptr to next physical malloc_chunk. */
-#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->size & ~PREV_INUSE) ))
-
-/* Ptr to previous physical malloc_chunk */
-#define prev_chunk(p) ((mchunkptr)( ((char*)(p)) - ((p)->prev_size) ))
-
-/* Treat space at ptr + offset as a chunk */
-#define chunk_at_offset(p, s)  ((mchunkptr)(((char*)(p)) + (s)))
-
-/* extract p's inuse bit */
-#define inuse(p)\
-((((mchunkptr)(((char*)(p))+((p)->size & ~PREV_INUSE)))->size) & PREV_INUSE)
-
-/* set/clear chunk as being inuse without otherwise disturbing */
-#define set_inuse(p)\
-((mchunkptr)(((char*)(p)) + ((p)->size & ~PREV_INUSE)))->size |= PREV_INUSE
-
-#define clear_inuse(p)\
-((mchunkptr)(((char*)(p)) + ((p)->size & ~PREV_INUSE)))->size &= ~(PREV_INUSE)
-
-
-/* check/set/clear inuse bits in known places */
-#define inuse_bit_at_offset(p, s)\
- (((mchunkptr)(((char*)(p)) + (s)))->size & PREV_INUSE)
-
-#define set_inuse_bit_at_offset(p, s)\
- (((mchunkptr)(((char*)(p)) + (s)))->size |= PREV_INUSE)
-
-#define clear_inuse_bit_at_offset(p, s)\
- (((mchunkptr)(((char*)(p)) + (s)))->size &= ~(PREV_INUSE))
-
-
-/* Set size at head, without disturbing its use bit */
-#define set_head_size(p, s)  ((p)->size = (((p)->size & PREV_INUSE) | (s)))
-
-/* Set size/use field */
-#define set_head(p, s)       ((p)->size = (s))
-
-/* Set size at footer (only when chunk is not in use) */
-#define set_foot(p, s)       (((mchunkptr)((char*)(p) + (s)))->prev_size = (s))
-
-
-/*
-  -------------------- Internal data structures --------------------
-
-   All internal state is held in an instance of malloc_state defined
-   below. There are no other static variables, except in two optional
-   cases:
-   * If USE_MALLOC_LOCK is defined, the mALLOC_MUTEx declared above.
-   * If HAVE_MMAP is true, but mmap doesn't support
-     MAP_ANONYMOUS, a dummy file descriptor for mmap.
-
-   Beware of lots of tricks that minimize the total bookkeeping space
-   requirements. The result is a little over 1K bytes (for 4byte
-   pointers and size_t.)
-*/
-
-/*
-  Bins
-
-    An array of bin headers for free chunks. Each bin is doubly
-    linked.  The bins are approximately proportionally (log) spaced.
-    There are a lot of these bins (128). This may look excessive, but
-    works very well in practice.  Most bins hold sizes that are
-    unusual as malloc request sizes, but are more usual for fragments
-    and consolidated sets of chunks, which is what these bins hold, so
-    they can be found quickly.  All procedures maintain the invariant
-    that no consolidated chunk physically borders another one, so each
-    chunk in a list is known to be preceeded and followed by either
-    inuse chunks or the ends of memory.
-
-    Chunks in bins are kept in size order, with ties going to the
-    approximately least recently used chunk. Ordering isn't needed
-    for the small bins, which all contain the same-sized chunks, but
-    facilitates best-fit allocation for larger chunks. These lists
-    are just sequential. Keeping them in order almost never requires
-    enough traversal to warrant using fancier ordered data
-    structures.
-
-    Chunks of the same size are linked with the most
-    recently freed at the front, and allocations are taken from the
-    back.  This results in LRU (FIFO) allocation order, which tends
-    to give each chunk an equal opportunity to be consolidated with
-    adjacent freed chunks, resulting in larger free chunks and less
-    fragmentation.
-
-    To simplify use in double-linked lists, each bin header acts
-    as a malloc_chunk. This avoids special-casing for headers.
-    But to conserve space and improve locality, we allocate
-    only the fd/bk pointers of bins, and then use repositioning tricks
-    to treat these as the fields of a malloc_chunk*.
-*/
-
-typedef struct malloc_chunk* mbinptr;
-
-/* addressing -- note that bin_at(0) does not exist */
-#define bin_at(m, i) ((mbinptr)((char*)&((m)->bins[(i)<<1]) - (SIZE_SZ<<1)))
-
-/* analog of ++bin */
-#define next_bin(b)  ((mbinptr)((char*)(b) + (sizeof(mchunkptr)<<1)))
-
-/* Reminders about list directionality within bins */
-#define first(b)     ((b)->fd)
-#define last(b)      ((b)->bk)
-
-/* Take a chunk off a bin list */
-#define unlink(P, BK, FD) {                                            \
-  FD = P->fd;                                                          \
-  BK = P->bk;                                                          \
-  FD->bk = BK;                                                         \
-  BK->fd = FD;                                                         \
-}
-
-/*
-  Indexing
-
-    Bins for sizes < 512 bytes contain chunks of all the same size, spaced
-    8 bytes apart. Larger bins are approximately logarithmically spaced:
-
-    64 bins of size       8
-    32 bins of size      64
-    16 bins of size     512
-     8 bins of size    4096
-     4 bins of size   32768
-     2 bins of size  262144
-     1 bin  of size what's left
-
-    The bins top out around 1MB because we expect to service large
-    requests via mmap.
-*/
-
-#define NBINS              96
-#define NSMALLBINS         32
-#define SMALLBIN_WIDTH      8
-#define MIN_LARGE_SIZE    256
-
-#define in_smallbin_range(sz)  \
-  ((CHUNK_SIZE_T)(sz) < (CHUNK_SIZE_T)MIN_LARGE_SIZE)
-
-#define smallbin_index(sz)     (((unsigned)(sz)) >> 3)
-
-/*
-  Compute index for size. We expect this to be inlined when
-  compiled with optimization, else not, which works out well.
-*/
-static int largebin_index(unsigned int sz) {
-  unsigned int  x = sz >> SMALLBIN_WIDTH;
-  unsigned int m;            /* bit position of highest set bit of m */
-
-  if (x >= 0x10000) return NBINS-1;
-
-  /* On intel, use BSRL instruction to find highest bit */
-#if defined(__GNUC__) && defined(i386)
-
-  __asm__("bsrl %1,%0\n\t"
-	  : "=r" (m)
-	  : "g"  (x));
-
-#else
-  {
-    /*
-      Based on branch-free nlz algorithm in chapter 5 of Henry
-      S. Warren Jr's book "Hacker's Delight".
-    */
-
-    unsigned int n = ((x - 0x100) >> 16) & 8;
-    x <<= n;
-    m = ((x - 0x1000) >> 16) & 4;
-    n += m;
-    x <<= m;
-    m = ((x - 0x4000) >> 16) & 2;
-    n += m;
-    x = (x << m) >> 14;
-    m = 13 - n + (x & ~(x>>1));
-  }
-#endif
-
-  /* Use next 2 bits to create finer-granularity bins */
-  return NSMALLBINS + (m << 2) + ((sz >> (m + 6)) & 3);
-}
-
-#define bin_index(sz) \
- ((in_smallbin_range(sz)) ? smallbin_index(sz) : largebin_index(sz))
-
-/*
-  FIRST_SORTED_BIN_SIZE is the chunk size corresponding to the
-  first bin that is maintained in sorted order. This must
-  be the smallest size corresponding to a given bin.
-
-  Normally, this should be MIN_LARGE_SIZE. But you can weaken
-  best fit guarantees to sometimes speed up malloc by increasing value.
-  Doing this means that malloc may choose a chunk that is
-  non-best-fitting by up to the width of the bin.
-
-  Some useful cutoff values:
-      512 - all bins sorted
-     2560 - leaves bins <=     64 bytes wide unsorted
-    12288 - leaves bins <=    512 bytes wide unsorted
-    65536 - leaves bins <=   4096 bytes wide unsorted
-   262144 - leaves bins <=  32768 bytes wide unsorted
-       -1 - no bins sorted (not recommended!)
-*/
-
-#define FIRST_SORTED_BIN_SIZE MIN_LARGE_SIZE
-/* #define FIRST_SORTED_BIN_SIZE 65536 */
-
-/*
-  Unsorted chunks
-
-    All remainders from chunk splits, as well as all returned chunks,
-    are first placed in the "unsorted" bin. They are then placed
-    in regular bins after malloc gives them ONE chance to be used before
-    binning. So, basically, the unsorted_chunks list acts as a queue,
-    with chunks being placed on it in free (and malloc_consolidate),
-    and taken off (to be either used or placed in bins) in malloc.
-*/
-
-/* The otherwise unindexable 1-bin is used to hold unsorted chunks. */
-#define unsorted_chunks(M)          (bin_at(M, 1))
-
-/*
-  Top
-
-    The top-most available chunk (i.e., the one bordering the end of
-    available memory) is treated specially. It is never included in
-    any bin, is used only if no other chunk is available, and is
-    released back to the system if it is very large (see
-    M_TRIM_THRESHOLD).  Because top initially
-    points to its own bin with initial zero size, thus forcing
-    extension on the first malloc request, we avoid having any special
-    code in malloc to check whether it even exists yet. But we still
-    need to do so when getting memory from system, so we make
-    initial_top treat the bin as a legal but unusable chunk during the
-    interval between initialization and the first call to
-    sYSMALLOc. (This is somewhat delicate, since it relies on
-    the 2 preceding words to be zero during this interval as well.)
-*/
-
-/* Conveniently, the unsorted bin can be used as dummy top on first call */
-#define initial_top(M)              (unsorted_chunks(M))
-
-/*
-  Binmap
-
-    To help compensate for the large number of bins, a one-level index
-    structure is used for bin-by-bin searching.  `binmap' is a
-    bitvector recording whether bins are definitely empty so they can
-    be skipped over during during traversals.  The bits are NOT always
-    cleared as soon as bins are empty, but instead only
-    when they are noticed to be empty during traversal in malloc.
-*/
-
-/* Conservatively use 32 bits per map word, even if on 64bit system */
-#define BINMAPSHIFT      5
-#define BITSPERMAP       (1U << BINMAPSHIFT)
-#define BINMAPSIZE       (NBINS / BITSPERMAP)
-
-#define idx2block(i)     ((i) >> BINMAPSHIFT)
-#define idx2bit(i)       ((1U << ((i) & ((1U << BINMAPSHIFT)-1))))
-
-#define mark_bin(m,i)    ((m)->binmap[idx2block(i)] |=  idx2bit(i))
-#define unmark_bin(m,i)  ((m)->binmap[idx2block(i)] &= ~(idx2bit(i)))
-#define get_binmap(m,i)  ((m)->binmap[idx2block(i)] &   idx2bit(i))
-
-/*
-  Fastbins
-
-    An array of lists holding recently freed small chunks.  Fastbins
-    are not doubly linked.  It is faster to single-link them, and
-    since chunks are never removed from the middles of these lists,
-    double linking is not necessary. Also, unlike regular bins, they
-    are not even processed in FIFO order (they use faster LIFO) since
-    ordering doesn't much matter in the transient contexts in which
-    fastbins are normally used.
-
-    Chunks in fastbins keep their inuse bit set, so they cannot
-    be consolidated with other free chunks. malloc_consolidate
-    releases all chunks in fastbins and consolidates them with
-    other free chunks.
-*/
-
-typedef struct malloc_chunk* mfastbinptr;
-
-/* offset 2 to use otherwise unindexable first 2 bins */
-#define fastbin_index(sz)        ((((unsigned int)(sz)) >> 3) - 2)
-
-/* The maximum fastbin request size we support */
-#define MAX_FAST_SIZE     80
-
-#define NFASTBINS  (fastbin_index(request2size(MAX_FAST_SIZE))+1)
-
-/*
-  FASTBIN_CONSOLIDATION_THRESHOLD is the size of a chunk in free()
-  that triggers automatic consolidation of possibly-surrounding
-  fastbin chunks. This is a heuristic, so the exact value should not
-  matter too much. It is defined at half the default trim threshold as a
-  compromise heuristic to only attempt consolidation if it is likely
-  to lead to trimming. However, it is not dynamically tunable, since
-  consolidation reduces fragmentation surrounding loarge chunks even
-  if trimming is not used.
-*/
-
-#define FASTBIN_CONSOLIDATION_THRESHOLD  \
-  ((unsigned long)(DEFAULT_TRIM_THRESHOLD) >> 1)
-
-/*
-  Since the lowest 2 bits in max_fast don't matter in size comparisons,
-  they are used as flags.
-*/
-
-/*
-  ANYCHUNKS_BIT held in max_fast indicates that there may be any
-  freed chunks at all. It is set true when entering a chunk into any
-  bin.
-*/
-
-#define ANYCHUNKS_BIT        (1U)
-
-#define have_anychunks(M)     (((M)->max_fast &  ANYCHUNKS_BIT))
-#define set_anychunks(M)      ((M)->max_fast |=  ANYCHUNKS_BIT)
-#define clear_anychunks(M)    ((M)->max_fast &= ~ANYCHUNKS_BIT)
-
-/*
-  FASTCHUNKS_BIT held in max_fast indicates that there are probably
-  some fastbin chunks. It is set true on entering a chunk into any
-  fastbin, and cleared only in malloc_consolidate.
-*/
-
-#define FASTCHUNKS_BIT        (2U)
-
-#define have_fastchunks(M)   (((M)->max_fast &  FASTCHUNKS_BIT))
-#define set_fastchunks(M)    ((M)->max_fast |=  (FASTCHUNKS_BIT|ANYCHUNKS_BIT))
-#define clear_fastchunks(M)  ((M)->max_fast &= ~(FASTCHUNKS_BIT))
-
-/*
-   Set value of max_fast.
-   Use impossibly small value if 0.
-*/
-
-#define set_max_fast(M, s) \
-  (M)->max_fast = (((s) == 0)? SMALLBIN_WIDTH: request2size(s)) | \
-  ((M)->max_fast &  (FASTCHUNKS_BIT|ANYCHUNKS_BIT))
-
-#define get_max_fast(M) \
-  ((M)->max_fast & ~(FASTCHUNKS_BIT | ANYCHUNKS_BIT))
-
-
-/*
-  morecore_properties is a status word holding dynamically discovered
-  or controlled properties of the morecore function
-*/
-
-#define MORECORE_CONTIGUOUS_BIT  (1U)
-
-#define contiguous(M) \
-	(((M)->morecore_properties &  MORECORE_CONTIGUOUS_BIT))
-#define noncontiguous(M) \
-	(((M)->morecore_properties &  MORECORE_CONTIGUOUS_BIT) == 0)
-#define set_contiguous(M) \
-	((M)->morecore_properties |=  MORECORE_CONTIGUOUS_BIT)
-#define set_noncontiguous(M) \
-	((M)->morecore_properties &= ~MORECORE_CONTIGUOUS_BIT)
-
-
-/*
-   ----------- Internal state representation and initialization -----------
-*/
-
-struct malloc_state {
-
-  /* The maximum chunk size to be eligible for fastbin */
-  INTERNAL_SIZE_T  max_fast;   /* low 2 bits used as flags */
-
-  /* Fastbins */
-  mfastbinptr      fastbins[NFASTBINS];
-
-  /* Base of the topmost chunk -- not otherwise kept in a bin */
-  mchunkptr        top;
-
-  /* The remainder from the most recent split of a small request */
-  mchunkptr        last_remainder;
-
-  /* Normal bins packed as described above */
-  mchunkptr        bins[NBINS * 2];
-
-  /* Bitmap of bins. Trailing zero map handles cases of largest binned size */
-  unsigned int     binmap[BINMAPSIZE+1];
-
-  /* Tunable parameters */
-  CHUNK_SIZE_T     trim_threshold;
-  INTERNAL_SIZE_T  top_pad;
-  INTERNAL_SIZE_T  mmap_threshold;
-
-  /* Memory map support */
-  int              n_mmaps;
-  int              n_mmaps_max;
-  int              max_n_mmaps;
-
-  /* Cache malloc_getpagesize */
-  unsigned int     pagesize;
-
-  /* Track properties of MORECORE */
-  unsigned int     morecore_properties;
-
-  /* Statistics */
-  INTERNAL_SIZE_T  mmapped_mem;
-  INTERNAL_SIZE_T  sbrked_mem;
-  INTERNAL_SIZE_T  max_sbrked_mem;
-  INTERNAL_SIZE_T  max_mmapped_mem;
-  INTERNAL_SIZE_T  max_total_mem;
-};
-
-typedef struct malloc_state *mstate;
-
-/*
-   There is exactly one instance of this struct in this malloc.
-   If you are adapting this malloc in a way that does NOT use a static
-   malloc_state, you MUST explicitly zero-fill it before using. This
-   malloc relies on the property that malloc_state is initialized to
-   all zeroes (as is true of C statics).
-*/
-
-static struct malloc_state av_;  /* never directly referenced */
-
-/*
-   All uses of av_ are via get_malloc_state().
-   At most one "call" to get_malloc_state is made per invocation of
-   the public versions of malloc and free, but other routines
-   that in turn invoke malloc and/or free may call more then once.
-   Also, it is called in check* routines if DEBUG is set.
-*/
-
-#define get_malloc_state() (&(av_))
-
-/*
-  Initialize a malloc_state struct.
-
-  This is called only from within malloc_consolidate, which needs
-  be called in the same contexts anyway.  It is never called directly
-  outside of malloc_consolidate because some optimizing compilers try
-  to inline it at all call points, which turns out not to be an
-  optimization at all. (Inlining it in malloc_consolidate is fine though.)
-*/
-
-#if __STD_C
-static void malloc_init_state(mstate av)
-#else
-static void malloc_init_state(av) mstate av;
-#endif
-{
-  int     i;
-  mbinptr bin;
-
-  /* Establish circular links for normal bins */
-  for (i = 1; i < NBINS; ++i) {
-    bin = bin_at(av,i);
-    bin->fd = bin->bk = bin;
-  }
-
-  av->top_pad        = DEFAULT_TOP_PAD;
-  av->n_mmaps_max    = DEFAULT_MMAP_MAX;
-  av->mmap_threshold = DEFAULT_MMAP_THRESHOLD;
-  av->trim_threshold = DEFAULT_TRIM_THRESHOLD;
-
-#if MORECORE_CONTIGUOUS
-  set_contiguous(av);
-#else
-  set_noncontiguous(av);
-#endif
-
-
-  set_max_fast(av, DEFAULT_MXFAST);
-
-  av->top            = initial_top(av);
-  av->pagesize       = malloc_getpagesize;
-}
-
-/*
-   Other internal utilities operating on mstates
-*/
-
-#if __STD_C
-static Void_t*  sYSMALLOc(INTERNAL_SIZE_T, mstate);
-#ifndef MORECORE_CANNOT_TRIM
-static int      sYSTRIm(size_t, mstate);
-#endif
-static void     malloc_consolidate(mstate);
-#ifdef NEED_INDEPENDENT
-static Void_t** iALLOc(size_t, size_t*, int, Void_t**);
-#endif
-#else
-static Void_t*  sYSMALLOc();
-#ifndef MORECORE_CANNOT_TRIM
-static int      sYSTRIm();
-#endif
-static void     malloc_consolidate();
-#ifdef NEED_INDEPENDENT
-static Void_t** iALLOc();
-#endif
-#endif
-
-/*
-  Debugging support
-
-  These routines make a number of assertions about the states
-  of data structures that should be true at all times. If any
-  are not true, it's very likely that a user program has somehow
-  trashed memory. (It's also possible that there is a coding error
-  in malloc. In which case, please report it!)
-*/
-
-#if ! DEBUG
-
-#define check_chunk(P)
-#define check_free_chunk(P)
-#define check_inuse_chunk(P)
-#define check_remalloced_chunk(P,N)
-#define check_malloced_chunk(P,N)
-#define check_malloc_state()
-
-#else
-#define check_chunk(P)              do_check_chunk(P)
-#define check_free_chunk(P)         do_check_free_chunk(P)
-#define check_inuse_chunk(P)        do_check_inuse_chunk(P)
-#define check_remalloced_chunk(P,N) do_check_remalloced_chunk(P,N)
-#define check_malloced_chunk(P,N)   do_check_malloced_chunk(P,N)
-#define check_malloc_state()        do_check_malloc_state()
-
-/*
-  Properties of all chunks
-*/
-
-#if __STD_C
-static void do_check_chunk(mchunkptr p)
-#else
-static void do_check_chunk(p) mchunkptr p;
-#endif
-{
-  mstate av = get_malloc_state();
-  CHUNK_SIZE_T  sz = chunksize(p);
-  /* min and max possible addresses assuming contiguous allocation */
-  char* max_address = (char*)(av->top) + chunksize(av->top);
-  char* min_address = max_address - av->sbrked_mem;
-
-  if (!chunk_is_mmapped(p)) {
-
-    /* Has legal address ... */
-    if (p != av->top) {
-      if (contiguous(av)) {
-	assert(((char*)p) >= min_address);
-	assert(((char*)p + sz) <= ((char*)(av->top)));
-      }
-    }
-    else {
-      /* top size is always at least MINSIZE */
-      assert((CHUNK_SIZE_T)(sz) >= MINSIZE);
-      /* top predecessor always marked inuse */
-      assert(prev_inuse(p));
-    }
-
-  }
-  else {
-#if HAVE_MMAP
-    /* address is outside main heap  */
-    if (contiguous(av) && av->top != initial_top(av)) {
-      assert(((char*)p) < min_address || ((char*)p) > max_address);
-    }
-    /* chunk is page-aligned */
-    assert(((p->prev_size + sz) & (av->pagesize-1)) == 0);
-    /* mem is aligned */
-    assert(aligned_OK(chunk2mem(p)));
-#else
-    /* force an appropriate assert violation if debug set */
-    assert(!chunk_is_mmapped(p));
-#endif
-  }
-}
-
-/*
-  Properties of free chunks
-*/
-
-#if __STD_C
-static void do_check_free_chunk(mchunkptr p)
-#else
-static void do_check_free_chunk(p) mchunkptr p;
-#endif
-{
-  mstate av = get_malloc_state();
-
-  INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
-  mchunkptr next = chunk_at_offset(p, sz);
-
-  do_check_chunk(p);
-
-  /* Chunk must claim to be free ... */
-  assert(!inuse(p));
-  assert (!chunk_is_mmapped(p));
-
-  /* Unless a special marker, must have OK fields */
-  if ((CHUNK_SIZE_T)(sz) >= MINSIZE)
-  {
-    assert((sz & MALLOC_ALIGN_MASK) == 0);
-    assert(aligned_OK(chunk2mem(p)));
-    /* ... matching footer field */
-    assert(next->prev_size == sz);
-    /* ... and is fully consolidated */
-    assert(prev_inuse(p));
-    assert (next == av->top || inuse(next));
-
-    /* ... and has minimally sane links */
-    assert(p->fd->bk == p);
-    assert(p->bk->fd == p);
-  }
-  else /* markers are always of size SIZE_SZ */
-    assert(sz == SIZE_SZ);
-}
-
-/*
-  Properties of inuse chunks
-*/
-
-#if __STD_C
-static void do_check_inuse_chunk(mchunkptr p)
-#else
-static void do_check_inuse_chunk(p) mchunkptr p;
-#endif
-{
-  mstate av = get_malloc_state();
-  mchunkptr next;
-  do_check_chunk(p);
-
-  if (chunk_is_mmapped(p))
-    return; /* mmapped chunks have no next/prev */
-
-  /* Check whether it claims to be in use ... */
-  assert(inuse(p));
-
-  next = next_chunk(p);
-
-  /* ... and is surrounded by OK chunks.
-    Since more things can be checked with free chunks than inuse ones,
-    if an inuse chunk borders them and debug is on, it's worth doing them.
-  */
-  if (!prev_inuse(p))  {
-    /* Note that we cannot even look at prev unless it is not inuse */
-    mchunkptr prv = prev_chunk(p);
-    assert(next_chunk(prv) == p);
-    do_check_free_chunk(prv);
-  }
-
-  if (next == av->top) {
-    assert(prev_inuse(next));
-    assert(chunksize(next) >= MINSIZE);
-  }
-  else if (!inuse(next))
-    do_check_free_chunk(next);
-}
-
-/*
-  Properties of chunks recycled from fastbins
-*/
-
-#if __STD_C
-static void do_check_remalloced_chunk(mchunkptr p, INTERNAL_SIZE_T s)
-#else
-static void do_check_remalloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s;
-#endif
-{
-  INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
-
-  do_check_inuse_chunk(p);
-
-  /* Legal size ... */
-  assert((sz & MALLOC_ALIGN_MASK) == 0);
-  assert((CHUNK_SIZE_T)(sz) >= MINSIZE);
-  /* ... and alignment */
-  assert(aligned_OK(chunk2mem(p)));
-  /* chunk is less than MINSIZE more than request */
-  assert((long)(sz) - (long)(s) >= 0);
-  assert((long)(sz) - (long)(s + MINSIZE) < 0);
-}
-
-/*
-  Properties of nonrecycled chunks at the point they are malloced
-*/
-
-#if __STD_C
-static void do_check_malloced_chunk(mchunkptr p, INTERNAL_SIZE_T s)
-#else
-static void do_check_malloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s;
-#endif
-{
-  /* same as recycled case ... */
-  do_check_remalloced_chunk(p, s);
-
-  /*
-    ... plus,  must obey implementation invariant that prev_inuse is
-    always true of any allocated chunk; i.e., that each allocated
-    chunk borders either a previously allocated and still in-use
-    chunk, or the base of its memory arena. This is ensured
-    by making all allocations from the the `lowest' part of any found
-    chunk.  This does not necessarily hold however for chunks
-    recycled via fastbins.
-  */
-
-  assert(prev_inuse(p));
-}
-
-
-/*
-  Properties of malloc_state.
-
-  This may be useful for debugging malloc, as well as detecting user
-  programmer errors that somehow write into malloc_state.
-
-  If you are extending or experimenting with this malloc, you can
-  probably figure out how to hack this routine to print out or
-  display chunk addresses, sizes, bins, and other instrumentation.
-*/
-
-static void do_check_malloc_state()
-{
-  mstate av = get_malloc_state();
-  int i;
-  mchunkptr p;
-  mchunkptr q;
-  mbinptr b;
-  unsigned int binbit;
-  int empty;
-  unsigned int idx;
-  INTERNAL_SIZE_T size;
-  CHUNK_SIZE_T  total = 0;
-  int max_fast_bin;
-
-  /* internal size_t must be no wider than pointer type */
-  assert(sizeof(INTERNAL_SIZE_T) <= sizeof(char*));
-
-  /* alignment is a power of 2 */
-  assert((MALLOC_ALIGNMENT & (MALLOC_ALIGNMENT-1)) == 0);
-
-  /* cannot run remaining checks until fully initialized */
-  if (av->top == 0 || av->top == initial_top(av))
-    return;
-
-  /* pagesize is a power of 2 */
-  assert((av->pagesize & (av->pagesize-1)) == 0);
-
-  /* properties of fastbins */
-
-  /* max_fast is in allowed range */
-  assert(get_max_fast(av) <= request2size(MAX_FAST_SIZE));
-
-  max_fast_bin = fastbin_index(av->max_fast);
-
-  for (i = 0; i < NFASTBINS; ++i) {
-    p = av->fastbins[i];
-
-    /* all bins past max_fast are empty */
-    if (i > max_fast_bin)
-      assert(p == 0);
-
-    while (p != 0) {
-      /* each chunk claims to be inuse */
-      do_check_inuse_chunk(p);
-      total += chunksize(p);
-      /* chunk belongs in this bin */
-      assert(fastbin_index(chunksize(p)) == i);
-      p = p->fd;
-    }
-  }
-
-  if (total != 0)
-    assert(have_fastchunks(av));
-  else if (!have_fastchunks(av))
-    assert(total == 0);
-
-  /* check normal bins */
-  for (i = 1; i < NBINS; ++i) {
-    b = bin_at(av,i);
-
-    /* binmap is accurate (except for bin 1 == unsorted_chunks) */
-    if (i >= 2) {
-      binbit = get_binmap(av,i);
-      empty = last(b) == b;
-      if (!binbit)
-	assert(empty);
-      else if (!empty)
-	assert(binbit);
-    }
-
-    for (p = last(b); p != b; p = p->bk) {
-      /* each chunk claims to be free */
-      do_check_free_chunk(p);
-      size = chunksize(p);
-      total += size;
-      if (i >= 2) {
-	/* chunk belongs in bin */
-	idx = bin_index(size);
-	assert(idx == i);
-	/* lists are sorted */
-	if ((CHUNK_SIZE_T) size >= (CHUNK_SIZE_T)(FIRST_SORTED_BIN_SIZE)) {
-	  assert(p->bk == b ||
-		 (CHUNK_SIZE_T)chunksize(p->bk) >=
-		 (CHUNK_SIZE_T)chunksize(p));
-	}
-      }
-      /* chunk is followed by a legal chain of inuse chunks */
-      for (q = next_chunk(p);
-	   (q != av->top && inuse(q) &&
-	     (CHUNK_SIZE_T)(chunksize(q)) >= MINSIZE);
-	   q = next_chunk(q))
-	do_check_inuse_chunk(q);
-    }
-  }
-
-  /* top chunk is OK */
-  check_chunk(av->top);
-
-  /* sanity checks for statistics */
-
-  assert(total <= (CHUNK_SIZE_T)(av->max_total_mem));
-  assert(av->n_mmaps >= 0);
-  assert(av->n_mmaps <= av->max_n_mmaps);
-
-  assert((CHUNK_SIZE_T)(av->sbrked_mem) <=
-	 (CHUNK_SIZE_T)(av->max_sbrked_mem));
-
-  assert((CHUNK_SIZE_T)(av->mmapped_mem) <=
-	 (CHUNK_SIZE_T)(av->max_mmapped_mem));
-
-  assert((CHUNK_SIZE_T)(av->max_total_mem) >=
-	 (CHUNK_SIZE_T)(av->mmapped_mem) + (CHUNK_SIZE_T)(av->sbrked_mem));
-}
-#endif
-
-
-/* ----------- Routines dealing with system allocation -------------- */
-
-/*
-  sysmalloc handles malloc cases requiring more memory from the system.
-  On entry, it is assumed that av->top does not have enough
-  space to service request for nb bytes, thus requiring that av->top
-  be extended or replaced.
-*/
-
-#if __STD_C
-static Void_t* sYSMALLOc(INTERNAL_SIZE_T nb, mstate av)
-#else
-static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av;
-#endif
-{
-  mchunkptr       old_top;        /* incoming value of av->top */
-  INTERNAL_SIZE_T old_size;       /* its size */
-  char*           old_end;        /* its end address */
-
-  long            size;           /* arg to first MORECORE or mmap call */
-  char*           brk;            /* return value from MORECORE */
-
-  long            correction;     /* arg to 2nd MORECORE call */
-  char*           snd_brk;        /* 2nd return val */
-
-  INTERNAL_SIZE_T front_misalign; /* unusable bytes at front of new space */
-  INTERNAL_SIZE_T end_misalign;   /* partial page left at end of new space */
-  char*           aligned_brk;    /* aligned offset into brk */
-
-  mchunkptr       p;              /* the allocated/returned chunk */
-  mchunkptr       remainder;      /* remainder from allocation */
-  CHUNK_SIZE_T    remainder_size; /* its size */
-
-  CHUNK_SIZE_T    sum;            /* for updating stats */
-
-  size_t          pagemask  = av->pagesize - 1;
-
-  /*
-    If there is space available in fastbins, consolidate and retry
-    malloc from scratch rather than getting memory from system.  This
-    can occur only if nb is in smallbin range so we didn't consolidate
-    upon entry to malloc. It is much easier to handle this case here
-    than in malloc proper.
-  */
-
-  if (have_fastchunks(av)) {
-    assert(in_smallbin_range(nb));
-    malloc_consolidate(av);
-    return mALLOc(nb - MALLOC_ALIGN_MASK);
-  }
-
-
-#if HAVE_MMAP
-
-  /*
-    If have mmap, and the request size meets the mmap threshold, and
-    the system supports mmap, and there are few enough currently
-    allocated mmapped regions, try to directly map this request
-    rather than expanding top.
-  */
-
-  if ((CHUNK_SIZE_T)(nb) >= (CHUNK_SIZE_T)(av->mmap_threshold) &&
-      (av->n_mmaps < av->n_mmaps_max)) {
-
-    char* mm;             /* return value from mmap call*/
-
-    /*
-      Round up size to nearest page.  For mmapped chunks, the overhead
-      is one SIZE_SZ unit larger than for normal chunks, because there
-      is no following chunk whose prev_size field could be used.
-    */
-    size = (nb + SIZE_SZ + MALLOC_ALIGN_MASK + pagemask) & ~pagemask;
-
-    /* Don't try if size wraps around 0 */
-    if ((CHUNK_SIZE_T)(size) > (CHUNK_SIZE_T)(nb)) {
-
-      mm = (char*)(MMAP(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE));
-
-      if (mm != (char*)(MORECORE_FAILURE)) {
-
-	/*
-	  The offset to the start of the mmapped region is stored
-	  in the prev_size field of the chunk. This allows us to adjust
-	  returned start address to meet alignment requirements here
-	  and in memalign(), and still be able to compute proper
-	  address argument for later munmap in free() and realloc().
-	*/
-
-	front_misalign = (INTERNAL_SIZE_T)chunk2mem(mm) & MALLOC_ALIGN_MASK;
-	if (front_misalign > 0) {
-	  correction = MALLOC_ALIGNMENT - front_misalign;
-	  p = (mchunkptr)(mm + correction);
-	  p->prev_size = correction;
-	  set_head(p, (size - correction) |IS_MMAPPED);
-	}
-	else {
-	  p = (mchunkptr)mm;
-	  p->prev_size = 0;
-	  set_head(p, size|IS_MMAPPED);
-	}
-
-	/* update statistics */
-
-	if (++av->n_mmaps > av->max_n_mmaps)
-	  av->max_n_mmaps = av->n_mmaps;
-
-	sum = av->mmapped_mem += size;
-	if (sum > (CHUNK_SIZE_T)(av->max_mmapped_mem))
-	  av->max_mmapped_mem = sum;
-	sum += av->sbrked_mem;
-	if (sum > (CHUNK_SIZE_T)(av->max_total_mem))
-	  av->max_total_mem = sum;
-
-	check_chunk(p);
-
-	return chunk2mem(p);
-      }
-    }
-  }
-#endif
-
-  /* Record incoming configuration of top */
-
-  old_top  = av->top;
-  old_size = chunksize(old_top);
-  old_end  = (char*)(chunk_at_offset(old_top, old_size));
-
-  brk = snd_brk = (char*)(MORECORE_FAILURE);
-
-  /*
-     If not the first time through, we require old_size to be
-     at least MINSIZE and to have prev_inuse set.
-  */
-
-  assert((old_top == initial_top(av) && old_size == 0) ||
-	 ((CHUNK_SIZE_T) (old_size) >= MINSIZE &&
-	  prev_inuse(old_top)));
-
-  /* Precondition: not enough current space to satisfy nb request */
-  assert((CHUNK_SIZE_T)(old_size) < (CHUNK_SIZE_T)(nb + MINSIZE));
-
-  /* Precondition: all fastbins are consolidated */
-  assert(!have_fastchunks(av));
-
-
-  /* Request enough space for nb + pad + overhead */
-
-  size = nb + av->top_pad + MINSIZE;
-
-  /*
-    If contiguous, we can subtract out existing space that we hope to
-    combine with new space. We add it back later only if
-    we don't actually get contiguous space.
-  */
-
-  if (contiguous(av))
-    size -= old_size;
-
-  /*
-    Round to a multiple of page size.
-    If MORECORE is not contiguous, this ensures that we only call it
-    with whole-page arguments.  And if MORECORE is contiguous and
-    this is not first time through, this preserves page-alignment of
-    previous calls. Otherwise, we correct to page-align below.
-  */
-
-  size = (size + pagemask) & ~pagemask;
-
-  /*
-    Don't try to call MORECORE if argument is so big as to appear
-    negative. Note that since mmap takes size_t arg, it may succeed
-    below even if we cannot call MORECORE.
-  */
-
-  if (size > 0)
-    brk = (char*)(MORECORE(size));
-
-  /*
-    If have mmap, try using it as a backup when MORECORE fails or
-    cannot be used. This is worth doing on systems that have "holes" in
-    address space, so sbrk cannot extend to give contiguous space, but
-    space is available elsewhere.  Note that we ignore mmap max count
-    and threshold limits, since the space will not be used as a
-    segregated mmap region.
-  */
-
-#if HAVE_MMAP
-  if (brk == (char*)(MORECORE_FAILURE)) {
-
-    /* Cannot merge with old top, so add its size back in */
-    if (contiguous(av))
-      size = (size + old_size + pagemask) & ~pagemask;
-
-    /* If we are relying on mmap as backup, then use larger units */
-    if ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(MMAP_AS_MORECORE_SIZE))
-      size = MMAP_AS_MORECORE_SIZE;
-
-    /* Don't try if size wraps around 0 */
-    if ((CHUNK_SIZE_T)(size) > (CHUNK_SIZE_T)(nb)) {
-
-      brk = (char*)(MMAP(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE));
-
-      if (brk != (char*)(MORECORE_FAILURE)) {
-
-	/* We do not need, and cannot use, another sbrk call to find end */
-	snd_brk = brk + size;
-
-	/*
-	   Record that we no longer have a contiguous sbrk region.
-	   After the first time mmap is used as backup, we do not
-	   ever rely on contiguous space since this could incorrectly
-	   bridge regions.
-	*/
-	set_noncontiguous(av);
-      }
-    }
-  }
-#endif
-
-  if (brk != (char*)(MORECORE_FAILURE)) {
-    av->sbrked_mem += size;
-
-    /*
-      If MORECORE extends previous space, we can likewise extend top size.
-    */
-
-    if (brk == old_end && snd_brk == (char*)(MORECORE_FAILURE)) {
-      set_head(old_top, (size + old_size) | PREV_INUSE);
-    }
-
-    /*
-      Otherwise, make adjustments:
-
-      * If the first time through or noncontiguous, we need to call sbrk
-	just to find out where the end of memory lies.
-
-      * We need to ensure that all returned chunks from malloc will meet
-	MALLOC_ALIGNMENT
-
-      * If there was an intervening foreign sbrk, we need to adjust sbrk
-	request size to account for fact that we will not be able to
-	combine new space with existing space in old_top.
-
-      * Almost all systems internally allocate whole pages at a time, in
-	which case we might as well use the whole last page of request.
-	So we allocate enough more memory to hit a page boundary now,
-	which in turn causes future contiguous calls to page-align.
-    */
-
-    else {
-      front_misalign = 0;
-      end_misalign = 0;
-      correction = 0;
-      aligned_brk = brk;
-
-      /*
-	If MORECORE returns an address lower than we have seen before,
-	we know it isn't really contiguous.  This and some subsequent
-	checks help cope with non-conforming MORECORE functions and
-	the presence of "foreign" calls to MORECORE from outside of
-	malloc or by other threads.  We cannot guarantee to detect
-	these in all cases, but cope with the ones we do detect.
-      */
-      if (contiguous(av) && old_size != 0 && brk < old_end) {
-	set_noncontiguous(av);
-      }
-
-      /* handle contiguous cases */
-      if (contiguous(av)) {
-
-	/*
-	   We can tolerate forward non-contiguities here (usually due
-	   to foreign calls) but treat them as part of our space for
-	   stats reporting.
-	*/
-	if (old_size != 0)
-	  av->sbrked_mem += brk - old_end;
-
-	/* Guarantee alignment of first new chunk made from this space */
-
-	front_misalign = (INTERNAL_SIZE_T)chunk2mem(brk) & MALLOC_ALIGN_MASK;
-	if (front_misalign > 0) {
-
-	  /*
-	    Skip over some bytes to arrive at an aligned position.
-	    We don't need to specially mark these wasted front bytes.
-	    They will never be accessed anyway because
-	    prev_inuse of av->top (and any chunk created from its start)
-	    is always true after initialization.
-	  */
-
-	  correction = MALLOC_ALIGNMENT - front_misalign;
-	  aligned_brk += correction;
-	}
-
-	/*
-	  If this isn't adjacent to existing space, then we will not
-	  be able to merge with old_top space, so must add to 2nd request.
-	*/
-
-	correction += old_size;
-
-	/* Extend the end address to hit a page boundary */
-	end_misalign = (INTERNAL_SIZE_T)(brk + size + correction);
-	correction += ((end_misalign + pagemask) & ~pagemask) - end_misalign;
-
-	assert(correction >= 0);
-	snd_brk = (char*)(MORECORE(correction));
-
-	if (snd_brk == (char*)(MORECORE_FAILURE)) {
-	  /*
-	    If can't allocate correction, try to at least find out current
-	    brk.  It might be enough to proceed without failing.
-	  */
-	  correction = 0;
-	  snd_brk = (char*)(MORECORE(0));
-	}
-	else if (snd_brk < brk) {
-	  /*
-	    If the second call gives noncontiguous space even though
-	    it says it won't, the only course of action is to ignore
-	    results of second call, and conservatively estimate where
-	    the first call left us. Also set noncontiguous, so this
-	    won't happen again, leaving at most one hole.
-
-	    Note that this check is intrinsically incomplete.  Because
-	    MORECORE is allowed to give more space than we ask for,
-	    there is no reliable way to detect a noncontiguity
-	    producing a forward gap for the second call.
-	  */
-	  snd_brk = brk + size;
-	  correction = 0;
-	  set_noncontiguous(av);
-	}
-
-      }
-
-      /* handle non-contiguous cases */
-      else {
-	/* MORECORE/mmap must correctly align */
-	assert(aligned_OK(chunk2mem(brk)));
-
-	/* Find out current end of memory */
-	if (snd_brk == (char*)(MORECORE_FAILURE)) {
-	  snd_brk = (char*)(MORECORE(0));
-	  av->sbrked_mem += snd_brk - brk - size;
-	}
-      }
-
-      /* Adjust top based on results of second sbrk */
-      if (snd_brk != (char*)(MORECORE_FAILURE)) {
-	av->top = (mchunkptr)aligned_brk;
-	set_head(av->top, (snd_brk - aligned_brk + correction) | PREV_INUSE);
-	av->sbrked_mem += correction;
-
-	/*
-	  If not the first time through, we either have a
-	  gap due to foreign sbrk or a non-contiguous region.  Insert a
-	  double fencepost at old_top to prevent consolidation with space
-	  we don't own. These fenceposts are artificial chunks that are
-	  marked as inuse and are in any case too small to use.  We need
-	  two to make sizes and alignments work out.
-	*/
-
-	if (old_size != 0) {
-	  /*
-	     Shrink old_top to insert fenceposts, keeping size a
-	     multiple of MALLOC_ALIGNMENT. We know there is at least
-	     enough space in old_top to do this.
-	  */
-	  old_size = (old_size - 3*SIZE_SZ) & ~MALLOC_ALIGN_MASK;
-	  set_head(old_top, old_size | PREV_INUSE);
-
-	  /*
-	    Note that the following assignments completely overwrite
-	    old_top when old_size was previously MINSIZE.  This is
-	    intentional. We need the fencepost, even if old_top otherwise gets
-	    lost.
-	  */
-	  chunk_at_offset(old_top, old_size          )->size =
-	    SIZE_SZ|PREV_INUSE;
-
-	  chunk_at_offset(old_top, old_size + SIZE_SZ)->size =
-	    SIZE_SZ|PREV_INUSE;
-
-	  /*
-	     If possible, release the rest, suppressing trimming.
-	  */
-	  if (old_size >= MINSIZE) {
-	    INTERNAL_SIZE_T tt = av->trim_threshold;
-	    av->trim_threshold = (INTERNAL_SIZE_T)(-1);
-	    fREe(chunk2mem(old_top));
-	    av->trim_threshold = tt;
-	  }
-	}
-      }
-    }
-
-    /* Update statistics */
-    sum = av->sbrked_mem;
-    if (sum > (CHUNK_SIZE_T)(av->max_sbrked_mem))
-      av->max_sbrked_mem = sum;
-
-    sum += av->mmapped_mem;
-    if (sum > (CHUNK_SIZE_T)(av->max_total_mem))
-      av->max_total_mem = sum;
-
-    check_malloc_state();
-
-    /* finally, do the allocation */
-
-    p = av->top;
-    size = chunksize(p);
-
-    /* check that one of the above allocation paths succeeded */
-    if ((CHUNK_SIZE_T)(size) >= (CHUNK_SIZE_T)(nb + MINSIZE)) {
-      remainder_size = size - nb;
-      remainder = chunk_at_offset(p, nb);
-      av->top = remainder;
-      set_head(p, nb | PREV_INUSE);
-      set_head(remainder, remainder_size | PREV_INUSE);
-      check_malloced_chunk(p, nb);
-      return chunk2mem(p);
-    }
-
-  }
-
-  /* catch all failure paths */
-  MALLOC_FAILURE_ACTION;
-  return 0;
-}
-
-
-
-#ifndef MORECORE_CANNOT_TRIM
-/*
-  sYSTRIm is an inverse of sorts to sYSMALLOc.  It gives memory back
-  to the system (via negative arguments to sbrk) if there is unused
-  memory at the `high' end of the malloc pool. It is called
-  automatically by free() when top space exceeds the trim
-  threshold. It is also called by the public malloc_trim routine.  It
-  returns 1 if it actually released any memory, else 0.
-*/
-
-#if __STD_C
-static int sYSTRIm(size_t pad, mstate av)
-#else
-static int sYSTRIm(pad, av) size_t pad; mstate av;
-#endif
-{
-  long  top_size;        /* Amount of top-most memory */
-  long  extra;           /* Amount to release */
-  long  released;        /* Amount actually released */
-  char* current_brk;     /* address returned by pre-check sbrk call */
-  char* new_brk;         /* address returned by post-check sbrk call */
-  size_t pagesz;
-
-  pagesz = av->pagesize;
-  top_size = chunksize(av->top);
-
-  /* Release in pagesize units, keeping at least one page */
-  extra = ((top_size - pad - MINSIZE + (pagesz-1)) / pagesz - 1) * pagesz;
-
-  if (extra > 0) {
-
-    /*
-      Only proceed if end of memory is where we last set it.
-      This avoids problems if there were foreign sbrk calls.
-    */
-    current_brk = (char*)(MORECORE(0));
-    if (current_brk == (char*)(av->top) + top_size) {
-
-      /*
-	Attempt to release memory. We ignore MORECORE return value,
-	and instead call again to find out where new end of memory is.
-	This avoids problems if first call releases less than we asked,
-	of if failure somehow altered brk value. (We could still
-	encounter problems if it altered brk in some very bad way,
-	but the only thing we can do is adjust anyway, which will cause
-	some downstream failure.)
-      */
-
-      MORECORE(-extra);
-      new_brk = (char*)(MORECORE(0));
-
-      if (new_brk != (char*)MORECORE_FAILURE) {
-	released = (long)(current_brk - new_brk);
-
-	if (released != 0) {
-	  /* Success. Adjust top. */
-	  av->sbrked_mem -= released;
-	  set_head(av->top, (top_size - released) | PREV_INUSE);
-	  check_malloc_state();
-	  return 1;
-	}
-      }
-    }
-  }
-  return 0;
-}
-#endif /*MORECORE_CANNOT_TRIM*/
-
-/*
-  ------------------------------ malloc ------------------------------
-*/
-
-
-#if __STD_C
-Void_t* mALLOc(size_t bytes)
-#else
-  Void_t* mALLOc(bytes) size_t bytes;
-#endif
-{
-  mstate av = get_malloc_state();
-
-  INTERNAL_SIZE_T nb;               /* normalized request size */
-  unsigned int    idx;              /* associated bin index */
-  mbinptr         bin;              /* associated bin */
-  mfastbinptr*    fb;               /* associated fastbin */
-
-  mchunkptr       victim;           /* inspected/selected chunk */
-  INTERNAL_SIZE_T size;             /* its size */
-  int             victim_index;     /* its bin index */
-
-  mchunkptr       remainder;        /* remainder from a split */
-  CHUNK_SIZE_T    remainder_size;   /* its size */
-
-  unsigned int    block;            /* bit map traverser */
-  unsigned int    bit;              /* bit map traverser */
-  unsigned int    map;              /* current word of binmap */
-
-  mchunkptr       fwd;              /* misc temp for linking */
-  mchunkptr       bck;              /* misc temp for linking */
-
-  /*
-    Convert request size to internal form by adding SIZE_SZ bytes
-    overhead plus possibly more to obtain necessary alignment and/or
-    to obtain a size of at least MINSIZE, the smallest allocatable
-    size. Also, checked_request2size traps (returning 0) request sizes
-    that are so large that they wrap around zero when padded and
-    aligned.
-  */
-
-  checked_request2size(bytes, nb);
-
-  /*
-    Bypass search if no frees yet
-   */
-  if (!have_anychunks(av)) {
-    if (av->max_fast == 0) /* initialization check */
-      malloc_consolidate(av);
-    goto use_top;
-  }
-
-  /*
-    If the size qualifies as a fastbin, first check corresponding bin.
-  */
-
-  if ((CHUNK_SIZE_T)(nb) <= (CHUNK_SIZE_T)(av->max_fast)) {
-    fb = &(av->fastbins[(fastbin_index(nb))]);
-    if ( (victim = *fb) != 0) {
-      *fb = victim->fd;
-      check_remalloced_chunk(victim, nb);
-      return chunk2mem(victim);
-    }
-  }
-
-  /*
-    If a small request, check regular bin.  Since these "smallbins"
-    hold one size each, no searching within bins is necessary.
-    (For a large request, we need to wait until unsorted chunks are
-    processed to find best fit. But for small ones, fits are exact
-    anyway, so we can check now, which is faster.)
-  */
-
-  if (in_smallbin_range(nb)) {
-    idx = smallbin_index(nb);
-    bin = bin_at(av,idx);
-
-    if ( (victim = last(bin)) != bin) {
-      bck = victim->bk;
-      set_inuse_bit_at_offset(victim, nb);
-      bin->bk = bck;
-      bck->fd = bin;
-
-      check_malloced_chunk(victim, nb);
-      return chunk2mem(victim);
-    }
-  }
-
-  /*
-     If this is a large request, consolidate fastbins before continuing.
-     While it might look excessive to kill all fastbins before
-     even seeing if there is space available, this avoids
-     fragmentation problems normally associated with fastbins.
-     Also, in practice, programs tend to have runs of either small or
-     large requests, but less often mixtures, so consolidation is not
-     invoked all that often in most programs. And the programs that
-     it is called frequently in otherwise tend to fragment.
-  */
-
-  else {
-    idx = largebin_index(nb);
-    if (have_fastchunks(av))
-      malloc_consolidate(av);
-  }
-
-  /*
-    Process recently freed or remaindered chunks, taking one only if
-    it is exact fit, or, if this a small request, the chunk is remainder from
-    the most recent non-exact fit.  Place other traversed chunks in
-    bins.  Note that this step is the only place in any routine where
-    chunks are placed in bins.
-  */
-
-  while ( (victim = unsorted_chunks(av)->bk) != unsorted_chunks(av)) {
-    bck = victim->bk;
-    size = chunksize(victim);
-
-    /*
-       If a small request, try to use last remainder if it is the
-       only chunk in unsorted bin.  This helps promote locality for
-       runs of consecutive small requests. This is the only
-       exception to best-fit, and applies only when there is
-       no exact fit for a small chunk.
-    */
-
-    if (in_smallbin_range(nb) &&
-	bck == unsorted_chunks(av) &&
-	victim == av->last_remainder &&
-	(CHUNK_SIZE_T)(size) > (CHUNK_SIZE_T)(nb + MINSIZE)) {
-
-      /* split and reattach remainder */
-      remainder_size = size - nb;
-      remainder = chunk_at_offset(victim, nb);
-      unsorted_chunks(av)->bk = unsorted_chunks(av)->fd = remainder;
-      av->last_remainder = remainder;
-      remainder->bk = remainder->fd = unsorted_chunks(av);
-
-      set_head(victim, nb | PREV_INUSE);
-      set_head(remainder, remainder_size | PREV_INUSE);
-      set_foot(remainder, remainder_size);
-
-      check_malloced_chunk(victim, nb);
-      return chunk2mem(victim);
-    }
-
-    /* remove from unsorted list */
-    unsorted_chunks(av)->bk = bck;
-    bck->fd = unsorted_chunks(av);
-
-    /* Take now instead of binning if exact fit */
-
-    if (size == nb) {
-      set_inuse_bit_at_offset(victim, size);
-      check_malloced_chunk(victim, nb);
-      return chunk2mem(victim);
-    }
-
-    /* place chunk in bin */
-
-    if (in_smallbin_range(size)) {
-      victim_index = smallbin_index(size);
-      bck = bin_at(av, victim_index);
-      fwd = bck->fd;
-    }
-    else {
-      victim_index = largebin_index(size);
-      bck = bin_at(av, victim_index);
-      fwd = bck->fd;
-
-      if (fwd != bck) {
-	/* if smaller than smallest, place first */
-	if ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(bck->bk->size)) {
-	  fwd = bck;
-	  bck = bck->bk;
-	}
-	else if ((CHUNK_SIZE_T)(size) >=
-		 (CHUNK_SIZE_T)(FIRST_SORTED_BIN_SIZE)) {
-
-	  /* maintain large bins in sorted order */
-	  size |= PREV_INUSE; /* Or with inuse bit to speed comparisons */
-	  while ((CHUNK_SIZE_T)(size) < (CHUNK_SIZE_T)(fwd->size))
-	    fwd = fwd->fd;
-	  bck = fwd->bk;
-	}
-      }
-    }
-
-    mark_bin(av, victim_index);
-    victim->bk = bck;
-    victim->fd = fwd;
-    fwd->bk = victim;
-    bck->fd = victim;
-  }
-
-  /*
-    If a large request, scan through the chunks of current bin to
-    find one that fits.  (This will be the smallest that fits unless
-    FIRST_SORTED_BIN_SIZE has been changed from default.)  This is
-    the only step where an unbounded number of chunks might be
-    scanned without doing anything useful with them. However the
-    lists tend to be short.
-  */
-
-  if (!in_smallbin_range(nb)) {
-    bin = bin_at(av, idx);
-
-    for (victim = last(bin); victim != bin; victim = victim->bk) {
-      size = chunksize(victim);
-
-      if ((CHUNK_SIZE_T)(size) >= (CHUNK_SIZE_T)(nb)) {
-	remainder_size = size - nb;
-	unlink(victim, bck, fwd);
-
-	/* Exhaust */
-	if (remainder_size < MINSIZE)  {
-	  set_inuse_bit_at_offset(victim, size);
-	  check_malloced_chunk(victim, nb);
-	  return chunk2mem(victim);
-	}
-	/* Split */
-	else {
-	  remainder = chunk_at_offset(victim, nb);
-	  unsorted_chunks(av)->bk = unsorted_chunks(av)->fd = remainder;
-	  remainder->bk = remainder->fd = unsorted_chunks(av);
-	  set_head(victim, nb | PREV_INUSE);
-	  set_head(remainder, remainder_size | PREV_INUSE);
-	  set_foot(remainder, remainder_size);
-	  check_malloced_chunk(victim, nb);
-	  return chunk2mem(victim);
-	}
-      }
-    }
-  }
-
-  /*
-    Search for a chunk by scanning bins, starting with next largest
-    bin. This search is strictly by best-fit; i.e., the smallest
-    (with ties going to approximately the least recently used) chunk
-    that fits is selected.
-
-    The bitmap avoids needing to check that most blocks are nonempty.
-  */
-
-  ++idx;
-  bin = bin_at(av,idx);
-  block = idx2block(idx);
-  map = av->binmap[block];
-  bit = idx2bit(idx);
-
-  for (;;) {
-
-    /* Skip rest of block if there are no more set bits in this block.  */
-    if (bit > map || bit == 0) {
-      do {
-	if (++block >= BINMAPSIZE)  /* out of bins */
-	  goto use_top;
-      } while ( (map = av->binmap[block]) == 0);
-
-      bin = bin_at(av, (block << BINMAPSHIFT));
-      bit = 1;
-    }
-
-    /* Advance to bin with set bit. There must be one. */
-    while ((bit & map) == 0) {
-      bin = next_bin(bin);
-      bit <<= 1;
-      assert(bit != 0);
-    }
-
-    /* Inspect the bin. It is likely to be non-empty */
-    victim = last(bin);
-
-    /*  If a false alarm (empty bin), clear the bit. */
-    if (victim == bin) {
-      av->binmap[block] = map &= ~bit; /* Write through */
-      bin = next_bin(bin);
-      bit <<= 1;
-    }
-
-    else {
-      size = chunksize(victim);
-
-      /*  We know the first chunk in this bin is big enough to use. */
-      assert((CHUNK_SIZE_T)(size) >= (CHUNK_SIZE_T)(nb));
-
-      remainder_size = size - nb;
-
-      /* unlink */
-      bck = victim->bk;
-      bin->bk = bck;
-      bck->fd = bin;
-
-      /* Exhaust */
-      if (remainder_size < MINSIZE) {
-	set_inuse_bit_at_offset(victim, size);
-	check_malloced_chunk(victim, nb);
-	return chunk2mem(victim);
-      }
-
-      /* Split */
-      else {
-	remainder = chunk_at_offset(victim, nb);
-
-	unsorted_chunks(av)->bk = unsorted_chunks(av)->fd = remainder;
-	remainder->bk = remainder->fd = unsorted_chunks(av);
-	/* advertise as last remainder */
-	if (in_smallbin_range(nb))
-	  av->last_remainder = remainder;
-
-	set_head(victim, nb | PREV_INUSE);
-	set_head(remainder, remainder_size | PREV_INUSE);
-	set_foot(remainder, remainder_size);
-	check_malloced_chunk(victim, nb);
-	return chunk2mem(victim);
-      }
-    }
-  }
-
-  use_top:
-  /*
-    If large enough, split off the chunk bordering the end of memory
-    (held in av->top). Note that this is in accord with the best-fit
-    search rule.  In effect, av->top is treated as larger (and thus
-    less well fitting) than any other available chunk since it can
-    be extended to be as large as necessary (up to system
-    limitations).
-
-    We require that av->top always exists (i.e., has size >=
-    MINSIZE) after initialization, so if it would otherwise be
-    exhuasted by current request, it is replenished. (The main
-    reason for ensuring it exists is that we may need MINSIZE space
-    to put in fenceposts in sysmalloc.)
-  */
-
-  victim = av->top;
-  size = chunksize(victim);
-
-  if ((CHUNK_SIZE_T)(size) >= (CHUNK_SIZE_T)(nb + MINSIZE)) {
-    remainder_size = size - nb;
-    remainder = chunk_at_offset(victim, nb);
-    av->top = remainder;
-    set_head(victim, nb | PREV_INUSE);
-    set_head(remainder, remainder_size | PREV_INUSE);
-
-    check_malloced_chunk(victim, nb);
-    return chunk2mem(victim);
-  }
-
-  /*
-     If no space in top, relay to handle system-dependent cases
-  */
-  return sYSMALLOc(nb, av);
-}
-
-/*
-  ------------------------------ free ------------------------------
-*/
-
-#if __STD_C
-void fREe(Void_t* mem)
-#else
-void fREe(mem) Void_t* mem;
-#endif
-{
-  mstate av = get_malloc_state();
-
-  mchunkptr       p;           /* chunk corresponding to mem */
-  INTERNAL_SIZE_T size;        /* its size */
-  mfastbinptr*    fb;          /* associated fastbin */
-  mchunkptr       nextchunk;   /* next contiguous chunk */
-  INTERNAL_SIZE_T nextsize;    /* its size */
-  int             nextinuse;   /* true if nextchunk is used */
-  INTERNAL_SIZE_T prevsize;    /* size of previous contiguous chunk */
-  mchunkptr       bck;         /* misc temp for linking */
-  mchunkptr       fwd;         /* misc temp for linking */
-
-  check_malloc_state();
-  /* free(0) has no effect */
-  if (mem != 0) {
-    p = mem2chunk(mem);
-    size = chunksize(p);
-
-    check_inuse_chunk(p);
-
-    /*
-      If eligible, place chunk on a fastbin so it can be found
-      and used quickly in malloc.
-    */
-
-    if ((CHUNK_SIZE_T)(size) <= (CHUNK_SIZE_T)(av->max_fast)
-
-#if TRIM_FASTBINS
-	/*
-	   If TRIM_FASTBINS set, don't place chunks
-	   bordering top into fastbins
-	*/
-	&& (chunk_at_offset(p, size) != av->top)
-#endif
-	) {
-
-      set_fastchunks(av);
-      fb = &(av->fastbins[fastbin_index(size)]);
-      p->fd = *fb;
-      *fb = p;
-    }
-
-    /*
-       Consolidate other non-mmapped chunks as they arrive.
-    */
-
-    else if (!chunk_is_mmapped(p)) {
-      set_anychunks(av);
-
-      nextchunk = chunk_at_offset(p, size);
-      nextsize = chunksize(nextchunk);
-
-      /* consolidate backward */
-      if (!prev_inuse(p)) {
-	prevsize = p->prev_size;
-	size += prevsize;
-	p = chunk_at_offset(p, -((long) prevsize));
-	unlink(p, bck, fwd);
-      }
-
-      if (nextchunk != av->top) {
-	/* get and clear inuse bit */
-	nextinuse = inuse_bit_at_offset(nextchunk, nextsize);
-	set_head(nextchunk, nextsize);
-
-	/* consolidate forward */
-	if (!nextinuse) {
-	  unlink(nextchunk, bck, fwd);
-	  size += nextsize;
-	}
-
-	/*
-	  Place the chunk in unsorted chunk list. Chunks are
-	  not placed into regular bins until after they have
-	  been given one chance to be used in malloc.
-	*/
-
-	bck = unsorted_chunks(av);
-	fwd = bck->fd;
-	p->bk = bck;
-	p->fd = fwd;
-	bck->fd = p;
-	fwd->bk = p;
-
-	set_head(p, size | PREV_INUSE);
-	set_foot(p, size);
-
-	check_free_chunk(p);
-      }
-
-      /*
-	 If the chunk borders the current high end of memory,
-	 consolidate into top
-      */
-
-      else {
-	size += nextsize;
-	set_head(p, size | PREV_INUSE);
-	av->top = p;
-	check_chunk(p);
-      }
-
-      /*
-	If freeing a large space, consolidate possibly-surrounding
-	chunks. Then, if the total unused topmost memory exceeds trim
-	threshold, ask malloc_trim to reduce top.
-
-	Unless max_fast is 0, we don't know if there are fastbins
-	bordering top, so we cannot tell for sure whether threshold
-	has been reached unless fastbins are consolidated.  But we
-	don't want to consolidate on each free.  As a compromise,
-	consolidation is performed if FASTBIN_CONSOLIDATION_THRESHOLD
-	is reached.
-      */
-
-      if ((CHUNK_SIZE_T)(size) >= FASTBIN_CONSOLIDATION_THRESHOLD) {
-	if (have_fastchunks(av))
-	  malloc_consolidate(av);
-
-#ifndef MORECORE_CANNOT_TRIM
-	if ((CHUNK_SIZE_T)(chunksize(av->top)) >=
-	    (CHUNK_SIZE_T)(av->trim_threshold))
-	  sYSTRIm(av->top_pad, av);
-#endif
-      }
-
-    }
-    /*
-      If the chunk was allocated via mmap, release via munmap()
-      Note that if HAVE_MMAP is false but chunk_is_mmapped is
-      true, then user must have overwritten memory. There's nothing
-      we can do to catch this error unless DEBUG is set, in which case
-      check_inuse_chunk (above) will have triggered error.
-    */
-
-    else {
-#if HAVE_MMAP
-      int ret;
-      INTERNAL_SIZE_T offset = p->prev_size;
-      av->n_mmaps--;
-      av->mmapped_mem -= (size + offset);
-      ret = munmap((char*)p - offset, size + offset);
-      /* munmap returns non-zero on failure */
-      assert(ret == 0);
-#endif
-    }
-  }
-    check_malloc_state();
-}
-
-/*
-  ------------------------- malloc_consolidate -------------------------
-
-  malloc_consolidate is a specialized version of free() that tears
-  down chunks held in fastbins.  Free itself cannot be used for this
-  purpose since, among other things, it might place chunks back onto
-  fastbins.  So, instead, we need to use a minor variant of the same
-  code.
-
-  Also, because this routine needs to be called the first time through
-  malloc anyway, it turns out to be the perfect place to trigger
-  initialization code.
-*/
-
-#if __STD_C
-static void malloc_consolidate(mstate av)
-#else
-static void malloc_consolidate(av) mstate av;
-#endif
-{
-  mfastbinptr*    fb;                 /* current fastbin being consolidated */
-  mfastbinptr*    maxfb;              /* last fastbin (for loop control) */
-  mchunkptr       p;                  /* current chunk being consolidated */
-  mchunkptr       nextp;              /* next chunk to consolidate */
-  mchunkptr       unsorted_bin;       /* bin header */
-  mchunkptr       first_unsorted;     /* chunk to link to */
-
-  /* These have same use as in free() */
-  mchunkptr       nextchunk;
-  INTERNAL_SIZE_T size;
-  INTERNAL_SIZE_T nextsize;
-  INTERNAL_SIZE_T prevsize;
-  int             nextinuse;
-  mchunkptr       bck;
-  mchunkptr       fwd;
-
-  /*
-    If max_fast is 0, we know that av hasn't
-    yet been initialized, in which case do so below
-  */
-
-  if (av->max_fast != 0) {
-    clear_fastchunks(av);
-
-    unsorted_bin = unsorted_chunks(av);
-
-    /*
-      Remove each chunk from fast bin and consolidate it, placing it
-      then in unsorted bin. Among other reasons for doing this,
-      placing in unsorted bin avoids needing to calculate actual bins
-      until malloc is sure that chunks aren't immediately going to be
-      reused anyway.
-    */
-
-    maxfb = &(av->fastbins[fastbin_index(av->max_fast)]);
-    fb = &(av->fastbins[0]);
-    do {
-      if ( (p = *fb) != 0) {
-	*fb = 0;
-
-	do {
-	  check_inuse_chunk(p);
-	  nextp = p->fd;
-
-	  /* Slightly streamlined version of consolidation code in free() */
-	  size = p->size & ~PREV_INUSE;
-	  nextchunk = chunk_at_offset(p, size);
-	  nextsize = chunksize(nextchunk);
-
-	  if (!prev_inuse(p)) {
-	    prevsize = p->prev_size;
-	    size += prevsize;
-	    p = chunk_at_offset(p, -((long) prevsize));
-	    unlink(p, bck, fwd);
-	  }
-
-	  if (nextchunk != av->top) {
-	    nextinuse = inuse_bit_at_offset(nextchunk, nextsize);
-	    set_head(nextchunk, nextsize);
-
-	    if (!nextinuse) {
-	      size += nextsize;
-	      unlink(nextchunk, bck, fwd);
-	    }
-
-	    first_unsorted = unsorted_bin->fd;
-	    unsorted_bin->fd = p;
-	    first_unsorted->bk = p;
-
-	    set_head(p, size | PREV_INUSE);
-	    p->bk = unsorted_bin;
-	    p->fd = first_unsorted;
-	    set_foot(p, size);
-	  }
-
-	  else {
-	    size += nextsize;
-	    set_head(p, size | PREV_INUSE);
-	    av->top = p;
-	  }
-
-	} while ( (p = nextp) != 0);
-
-      }
-    } while (fb++ != maxfb);
-  }
-  else {
-    malloc_init_state(av);
-    check_malloc_state();
-  }
-}
-
-/*
-  ------------------------------ realloc ------------------------------
-*/
-
-
-#if __STD_C
-Void_t* rEALLOc(Void_t* oldmem, size_t bytes)
-#else
-Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
-#endif
-{
-  mstate av = get_malloc_state();
-
-  INTERNAL_SIZE_T  nb;              /* padded request size */
-
-  mchunkptr        oldp;            /* chunk corresponding to oldmem */
-  INTERNAL_SIZE_T  oldsize;         /* its size */
-
-  mchunkptr        newp;            /* chunk to return */
-  INTERNAL_SIZE_T  newsize;         /* its size */
-  Void_t*          newmem;          /* corresponding user mem */
-
-  mchunkptr        next;            /* next contiguous chunk after oldp */
-
-  mchunkptr        remainder;       /* extra space at end of newp */
-  CHUNK_SIZE_T     remainder_size;  /* its size */
-
-  mchunkptr        bck;             /* misc temp for linking */
-  mchunkptr        fwd;             /* misc temp for linking */
-
-  CHUNK_SIZE_T     copysize;        /* bytes to copy */
-  unsigned int     ncopies;         /* INTERNAL_SIZE_T words to copy */
-  INTERNAL_SIZE_T* s;               /* copy source */
-  INTERNAL_SIZE_T* d;               /* copy destination */
-
-
-#ifdef REALLOC_ZERO_BYTES_FREES
-  if (bytes == 0) {
-    fREe(oldmem);
-    return 0;
-  }
-#endif
-
-  /* realloc of null is supposed to be same as malloc */
-  if (oldmem == 0) return mALLOc(bytes);
-
-  checked_request2size(bytes, nb);
-
-  oldp    = mem2chunk(oldmem);
-  oldsize = chunksize(oldp);
-
-  check_inuse_chunk(oldp);
-
-  if (!chunk_is_mmapped(oldp)) {
-
-    if ((CHUNK_SIZE_T)(oldsize) >= (CHUNK_SIZE_T)(nb)) {
-      /* already big enough; split below */
-      newp = oldp;
-      newsize = oldsize;
-    }
-
-    else {
-      next = chunk_at_offset(oldp, oldsize);
-
-      /* Try to expand forward into top */
-      if (next == av->top &&
-	  (CHUNK_SIZE_T)(newsize = oldsize + chunksize(next)) >=
-	  (CHUNK_SIZE_T)(nb + MINSIZE)) {
-	set_head_size(oldp, nb);
-	av->top = chunk_at_offset(oldp, nb);
-	set_head(av->top, (newsize - nb) | PREV_INUSE);
-	return chunk2mem(oldp);
-      }
-
-      /* Try to expand forward into next chunk;  split off remainder below */
-      else if (next != av->top &&
-	       !inuse(next) &&
-	       (CHUNK_SIZE_T)(newsize = oldsize + chunksize(next)) >=
-	       (CHUNK_SIZE_T)(nb)) {
-	newp = oldp;
-	unlink(next, bck, fwd);
-      }
-
-      /* allocate, copy, free */
-      else {
-	newmem = mALLOc(nb - MALLOC_ALIGN_MASK);
-	if (newmem == 0)
-	  return 0; /* propagate failure */
-
-	newp = mem2chunk(newmem);
-	newsize = chunksize(newp);
-
-	/*
-	  Avoid copy if newp is next chunk after oldp.
-	*/
-	if (newp == next) {
-	  newsize += oldsize;
-	  newp = oldp;
-	}
-	else {
-	  /*
-	    Unroll copy of <= 36 bytes (72 if 8byte sizes)
-	    We know that contents have an odd number of
-	    INTERNAL_SIZE_T-sized words; minimally 3.
-	  */
-
-	  copysize = oldsize - SIZE_SZ;
-	  s = (INTERNAL_SIZE_T*)(oldmem);
-	  d = (INTERNAL_SIZE_T*)(newmem);
-	  ncopies = copysize / sizeof(INTERNAL_SIZE_T);
-	  assert(ncopies >= 3);
-
-	  if (ncopies > 9)
-	    MALLOC_COPY(d, s, copysize);
-
-	  else {
-	    *(d+0) = *(s+0);
-	    *(d+1) = *(s+1);
-	    *(d+2) = *(s+2);
-	    if (ncopies > 4) {
-	      *(d+3) = *(s+3);
-	      *(d+4) = *(s+4);
-	      if (ncopies > 6) {
-		*(d+5) = *(s+5);
-		*(d+6) = *(s+6);
-		if (ncopies > 8) {
-		  *(d+7) = *(s+7);
-		  *(d+8) = *(s+8);
-		}
-	      }
-	    }
-	  }
-
-	  fREe(oldmem);
-	  check_inuse_chunk(newp);
-	  return chunk2mem(newp);
-	}
-      }
-    }
-
-    /* If possible, free extra space in old or extended chunk */
-
-    assert((CHUNK_SIZE_T)(newsize) >= (CHUNK_SIZE_T)(nb));
-
-    remainder_size = newsize - nb;
-
-    if (remainder_size < MINSIZE) { /* not enough extra to split off */
-      set_head_size(newp, newsize);
-      set_inuse_bit_at_offset(newp, newsize);
-    }
-    else { /* split remainder */
-      remainder = chunk_at_offset(newp, nb);
-      set_head_size(newp, nb);
-      set_head(remainder, remainder_size | PREV_INUSE);
-      /* Mark remainder as inuse so free() won't complain */
-      set_inuse_bit_at_offset(remainder, remainder_size);
-      fREe(chunk2mem(remainder));
-    }
-
-    check_inuse_chunk(newp);
-    return chunk2mem(newp);
-  }
-
-  /*
-    Handle mmap cases
-  */
-
-  else {
-#if HAVE_MMAP
-
-#if HAVE_MREMAP
-    INTERNAL_SIZE_T offset = oldp->prev_size;
-    size_t pagemask = av->pagesize - 1;
-    char *cp;
-    CHUNK_SIZE_T  sum;
-
-    /* Note the extra SIZE_SZ overhead */
-    newsize = (nb + offset + SIZE_SZ + pagemask) & ~pagemask;
-
-    /* don't need to remap if still within same page */
-    if (oldsize == newsize - offset)
-      return oldmem;
-
-    cp = (char*)mremap((char*)oldp - offset, oldsize + offset, newsize, 1);
-
-    if (cp != (char*)MORECORE_FAILURE) {
-
-      newp = (mchunkptr)(cp + offset);
-      set_head(newp, (newsize - offset)|IS_MMAPPED);
-
-      assert(aligned_OK(chunk2mem(newp)));
-      assert((newp->prev_size == offset));
-
-      /* update statistics */
-      sum = av->mmapped_mem += newsize - oldsize;
-      if (sum > (CHUNK_SIZE_T)(av->max_mmapped_mem))
-	av->max_mmapped_mem = sum;
-      sum += av->sbrked_mem;
-      if (sum > (CHUNK_SIZE_T)(av->max_total_mem))
-	av->max_total_mem = sum;
-
-      return chunk2mem(newp);
-    }
-#endif
-
-    /* Note the extra SIZE_SZ overhead. */
-    if ((CHUNK_SIZE_T)(oldsize) >= (CHUNK_SIZE_T)(nb + SIZE_SZ))
-      newmem = oldmem; /* do nothing */
-    else {
-      /* Must alloc, copy, free. */
-      newmem = mALLOc(nb - MALLOC_ALIGN_MASK);
-      if (newmem != 0) {
-	MALLOC_COPY(newmem, oldmem, oldsize - 2*SIZE_SZ);
-	fREe(oldmem);
-      }
-    }
-    return newmem;
-
-#else
-    /* If !HAVE_MMAP, but chunk_is_mmapped, user must have overwritten mem */
-    check_malloc_state();
-    MALLOC_FAILURE_ACTION;
-    return 0;
-#endif
-  }
-}
-
-/*
-  ------------------------------ memalign ------------------------------
-*/
-
-#if __STD_C
-Void_t* mEMALIGn(size_t alignment, size_t bytes)
-#else
-Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes;
-#endif
-{
-  INTERNAL_SIZE_T nb;             /* padded  request size */
-  char*           m;              /* memory returned by malloc call */
-  mchunkptr       p;              /* corresponding chunk */
-  char*           brk;            /* alignment point within p */
-  mchunkptr       newp;           /* chunk to return */
-  INTERNAL_SIZE_T newsize;        /* its size */
-  INTERNAL_SIZE_T leadsize;       /* leading space before alignment point */
-  mchunkptr       remainder;      /* spare room at end to split off */
-  CHUNK_SIZE_T    remainder_size; /* its size */
-  INTERNAL_SIZE_T size;
-
-  /* If need less alignment than we give anyway, just relay to malloc */
-
-  if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes);
-
-  /* Otherwise, ensure that it is at least a minimum chunk size */
-
-  if (alignment <  MINSIZE) alignment = MINSIZE;
-
-  /* Make sure alignment is power of 2 (in case MINSIZE is not).  */
-  if ((alignment & (alignment - 1)) != 0) {
-    size_t a = MALLOC_ALIGNMENT * 2;
-    while ((CHUNK_SIZE_T)a < (CHUNK_SIZE_T)alignment) a <<= 1;
-    alignment = a;
-  }
-
-  checked_request2size(bytes, nb);
-
-  /*
-    Strategy: find a spot within that chunk that meets the alignment
-    request, and then possibly free the leading and trailing space.
-  */
-
-
-  /* Call malloc with worst case padding to hit alignment. */
-
-  m  = (char*)(mALLOc(nb + alignment + MINSIZE));
-
-  if (m == 0) return 0; /* propagate failure */
-
-  p = mem2chunk(m);
-
-  if ((((PTR_UINT)(m)) % alignment) != 0) { /* misaligned */
-
-    /*
-      Find an aligned spot inside chunk.  Since we need to give back
-      leading space in a chunk of at least MINSIZE, if the first
-      calculation places us at a spot with less than MINSIZE leader,
-      we can move to the next aligned spot -- we've allocated enough
-      total room so that this is always possible.
-    */
-
-    brk = (char*)mem2chunk((PTR_UINT)(((PTR_UINT)(m + alignment - 1)) &
-			   -((signed long) alignment)));
-    if ((CHUNK_SIZE_T)(brk - (char*)(p)) < MINSIZE)
-      brk += alignment;
-
-    newp = (mchunkptr)brk;
-    leadsize = brk - (char*)(p);
-    newsize = chunksize(p) - leadsize;
-
-    /* For mmapped chunks, just adjust offset */
-    if (chunk_is_mmapped(p)) {
-      newp->prev_size = p->prev_size + leadsize;
-      set_head(newp, newsize|IS_MMAPPED);
-      return chunk2mem(newp);
-    }
-
-    /* Otherwise, give back leader, use the rest */
-    set_head(newp, newsize | PREV_INUSE);
-    set_inuse_bit_at_offset(newp, newsize);
-    set_head_size(p, leadsize);
-    fREe(chunk2mem(p));
-    p = newp;
-
-    assert (newsize >= nb &&
-	    (((PTR_UINT)(chunk2mem(p))) % alignment) == 0);
-  }
-
-  /* Also give back spare room at the end */
-  if (!chunk_is_mmapped(p)) {
-    size = chunksize(p);
-    if ((CHUNK_SIZE_T)(size) > (CHUNK_SIZE_T)(nb + MINSIZE)) {
-      remainder_size = size - nb;
-      remainder = chunk_at_offset(p, nb);
-      set_head(remainder, remainder_size | PREV_INUSE);
-      set_head_size(p, nb);
-      fREe(chunk2mem(remainder));
-    }
-  }
-
-  check_inuse_chunk(p);
-  return chunk2mem(p);
-}
-
-/*
-  ------------------------------ calloc ------------------------------
-*/
-
-#if __STD_C
-Void_t* cALLOc(size_t n_elements, size_t elem_size)
-#else
-Void_t* cALLOc(n_elements, elem_size) size_t n_elements; size_t elem_size;
-#endif
-{
-  mchunkptr p;
-  CHUNK_SIZE_T  clearsize;
-  CHUNK_SIZE_T  nclears;
-  INTERNAL_SIZE_T* d;
-
-  Void_t* mem = mALLOc(n_elements * elem_size);
-
-  if (mem != 0) {
-    p = mem2chunk(mem);
-
-    if (!chunk_is_mmapped(p))
-    {
-      /*
-	Unroll clear of <= 36 bytes (72 if 8byte sizes)
-	We know that contents have an odd number of
-	INTERNAL_SIZE_T-sized words; minimally 3.
-      */
-
-      d = (INTERNAL_SIZE_T*)mem;
-      clearsize = chunksize(p) - SIZE_SZ;
-      nclears = clearsize / sizeof(INTERNAL_SIZE_T);
-      assert(nclears >= 3);
-
-      if (nclears > 9)
-	MALLOC_ZERO(d, clearsize);
-
-      else {
-	*(d+0) = 0;
-	*(d+1) = 0;
-	*(d+2) = 0;
-	if (nclears > 4) {
-	  *(d+3) = 0;
-	  *(d+4) = 0;
-	  if (nclears > 6) {
-	    *(d+5) = 0;
-	    *(d+6) = 0;
-	    if (nclears > 8) {
-	      *(d+7) = 0;
-	      *(d+8) = 0;
-	    }
-	  }
-	}
-      }
-    }
-#if ! MMAP_CLEARS
-    else
-    {
-      d = (INTERNAL_SIZE_T*)mem;
-      /*
-	Note the additional SIZE_SZ
-      */
-      clearsize = chunksize(p) - 2*SIZE_SZ;
-      MALLOC_ZERO(d, clearsize);
-    }
-#endif
-  }
-  return mem;
-}
-
-/*
-  ------------------------------ cfree ------------------------------
-*/
-
-#if __STD_C
-void cFREe(Void_t *mem)
-#else
-void cFREe(mem) Void_t *mem;
-#endif
-{
-  fREe(mem);
-}
-
-#ifdef NEED_INDEPENDENT
-/*
-  ------------------------- independent_calloc -------------------------
-*/
-
-#if __STD_C
-Void_t** iCALLOc(size_t n_elements, size_t elem_size, Void_t* chunks[])
-#else
-Void_t** iCALLOc(n_elements, elem_size, chunks) size_t n_elements; size_t elem_size; Void_t* chunks[];
-#endif
-{
-  size_t sz = elem_size; /* serves as 1-element array */
-  /* opts arg of 3 means all elements are same size, and should be cleared */
-  return iALLOc(n_elements, &sz, 3, chunks);
-}
-
-/*
-  ------------------------- independent_comalloc -------------------------
-*/
-
-#if __STD_C
-Void_t** iCOMALLOc(size_t n_elements, size_t sizes[], Void_t* chunks[])
-#else
-Void_t** iCOMALLOc(n_elements, sizes, chunks) size_t n_elements; size_t sizes[]; Void_t* chunks[];
-#endif
-{
-  return iALLOc(n_elements, sizes, 0, chunks);
-}
-
-/*
-  ------------------------------ ialloc ------------------------------
-  ialloc provides common support for independent_X routines, handling all of
-  the combinations that can result.
-
-  The opts arg has:
-    bit 0 set if all elements are same size (using sizes[0])
-    bit 1 set if elements should be zeroed
-*/
-
-
-#if __STD_C
-static Void_t** iALLOc(size_t n_elements,
-		       size_t* sizes,
-		       int opts,
-		       Void_t* chunks[])
-#else
-static Void_t** iALLOc(n_elements, sizes, opts, chunks) size_t n_elements; size_t* sizes; int opts; Void_t* chunks[];
-#endif
-{
-  mstate av = get_malloc_state();
-  INTERNAL_SIZE_T element_size;   /* chunksize of each element, if all same */
-  INTERNAL_SIZE_T contents_size;  /* total size of elements */
-  INTERNAL_SIZE_T array_size;     /* request size of pointer array */
-  Void_t*         mem;            /* malloced aggregate space */
-  mchunkptr       p;              /* corresponding chunk */
-  INTERNAL_SIZE_T remainder_size; /* remaining bytes while splitting */
-  Void_t**        marray;         /* either "chunks" or malloced ptr array */
-  mchunkptr       array_chunk;    /* chunk for malloced ptr array */
-  int             mmx;            /* to disable mmap */
-  INTERNAL_SIZE_T size;
-  size_t          i;
-
-  /* Ensure initialization */
-  if (av->max_fast == 0) malloc_consolidate(av);
-
-  /* compute array length, if needed */
-  if (chunks != 0) {
-    if (n_elements == 0)
-      return chunks; /* nothing to do */
-    marray = chunks;
-    array_size = 0;
-  }
-  else {
-    /* if empty req, must still return chunk representing empty array */
-    if (n_elements == 0)
-      return (Void_t**) mALLOc(0);
-    marray = 0;
-    array_size = request2size(n_elements * (sizeof(Void_t*)));
-  }
-
-  /* compute total element size */
-  if (opts & 0x1) { /* all-same-size */
-    element_size = request2size(*sizes);
-    contents_size = n_elements * element_size;
-  }
-  else { /* add up all the sizes */
-    element_size = 0;
-    contents_size = 0;
-    for (i = 0; i != n_elements; ++i)
-      contents_size += request2size(sizes[i]);
-  }
-
-  /* subtract out alignment bytes from total to minimize overallocation */
-  size = contents_size + array_size - MALLOC_ALIGN_MASK;
-
-  /*
-     Allocate the aggregate chunk.
-     But first disable mmap so malloc won't use it, since
-     we would not be able to later free/realloc space internal
-     to a segregated mmap region.
- */
-  mmx = av->n_mmaps_max;   /* disable mmap */
-  av->n_mmaps_max = 0;
-  mem = mALLOc(size);
-  av->n_mmaps_max = mmx;   /* reset mmap */
-  if (mem == 0)
-    return 0;
-
-  p = mem2chunk(mem);
-  assert(!chunk_is_mmapped(p));
-  remainder_size = chunksize(p);
-
-  if (opts & 0x2) {       /* optionally clear the elements */
-    MALLOC_ZERO(mem, remainder_size - SIZE_SZ - array_size);
-  }
-
-  /* If not provided, allocate the pointer array as final part of chunk */
-  if (marray == 0) {
-    array_chunk = chunk_at_offset(p, contents_size);
-    marray = (Void_t**) (chunk2mem(array_chunk));
-    set_head(array_chunk, (remainder_size - contents_size) | PREV_INUSE);
-    remainder_size = contents_size;
-  }
-
-  /* split out elements */
-  for (i = 0; ; ++i) {
-    marray[i] = chunk2mem(p);
-    if (i != n_elements-1) {
-      if (element_size != 0)
-	size = element_size;
-      else
-	size = request2size(sizes[i]);
-      remainder_size -= size;
-      set_head(p, size | PREV_INUSE);
-      p = chunk_at_offset(p, size);
-    }
-    else { /* the final element absorbs any overallocation slop */
-      set_head(p, remainder_size | PREV_INUSE);
-      break;
-    }
-  }
-
-#if DEBUG
-  if (marray != chunks) {
-    /* final element must have exactly exhausted chunk */
-    if (element_size != 0)
-      assert(remainder_size == element_size);
-    else
-      assert(remainder_size == request2size(sizes[i]));
-    check_inuse_chunk(mem2chunk(marray));
-  }
-
-  for (i = 0; i != n_elements; ++i)
-    check_inuse_chunk(mem2chunk(marray[i]));
-#endif
-
-  return marray;
-}
-#endif /* NEED_INDEPENDENT */
-
-
-/*
-  ------------------------------ valloc ------------------------------
-*/
-
-#if __STD_C
-Void_t* vALLOc(size_t bytes)
-#else
-Void_t* vALLOc(bytes) size_t bytes;
-#endif
-{
-  /* Ensure initialization */
-  mstate av = get_malloc_state();
-  if (av->max_fast == 0) malloc_consolidate(av);
-  return mEMALIGn(av->pagesize, bytes);
-}
-
-#ifdef NEED_PVALLOC
-/*
-  ------------------------------ pvalloc ------------------------------
-*/
-
-
-#if __STD_C
-Void_t* pVALLOc(size_t bytes)
-#else
-Void_t* pVALLOc(bytes) size_t bytes;
-#endif
-{
-  mstate av = get_malloc_state();
-  size_t pagesz;
-
-  /* Ensure initialization */
-  if (av->max_fast == 0) malloc_consolidate(av);
-  pagesz = av->pagesize;
-  return mEMALIGn(pagesz, (bytes + pagesz - 1) & ~(pagesz - 1));
-}
-#endif /*NEED_PVALLOC*/
-
-
-/*
-  ------------------------------ malloc_trim ------------------------------
-*/
-
-#if __STD_C
-int mTRIm(size_t pad)
-#else
-int mTRIm(pad) size_t pad;
-#endif
-{
-  mstate av = get_malloc_state();
-  /* Ensure initialization/consolidation */
-  malloc_consolidate(av);
-
-#ifndef MORECORE_CANNOT_TRIM
-  return sYSTRIm(pad, av);
-#else
-  return 0;
-#endif
-}
-
-
-/*
-  ------------------------- malloc_usable_size -------------------------
-*/
-
-#if __STD_C
-size_t mUSABLe(Void_t* mem)
-#else
-size_t mUSABLe(mem) Void_t* mem;
-#endif
-{
-  mchunkptr p;
-  if (mem != 0) {
-    p = mem2chunk(mem);
-    if (chunk_is_mmapped(p))
-      return chunksize(p) - 2*SIZE_SZ;
-    else if (inuse(p))
-      return chunksize(p) - SIZE_SZ;
-  }
-  return 0;
-}
-
-/*
-  ------------------------------ mallinfo ------------------------------
-*/
-
-struct mallinfo mALLINFo()
-{
-  mstate av = get_malloc_state();
-  struct mallinfo mi;
-  unsigned i;
-  mbinptr b;
-  mchunkptr p;
-  INTERNAL_SIZE_T avail;
-  INTERNAL_SIZE_T fastavail;
-  int nblocks;
-  int nfastblocks;
-
-  /* Ensure initialization */
-  if (av->top == 0)  malloc_consolidate(av);
-
-  check_malloc_state();
-
-  /* Account for top */
-  avail = chunksize(av->top);
-  nblocks = 1;  /* top always exists */
-
-  /* traverse fastbins */
-  nfastblocks = 0;
-  fastavail = 0;
-
-  for (i = 0; i < NFASTBINS; ++i) {
-    for (p = av->fastbins[i]; p != 0; p = p->fd) {
-      ++nfastblocks;
-      fastavail += chunksize(p);
-    }
-  }
-
-  avail += fastavail;
-
-  /* traverse regular bins */
-  for (i = 1; i < NBINS; ++i) {
-    b = bin_at(av, i);
-    for (p = last(b); p != b; p = p->bk) {
-      ++nblocks;
-      avail += chunksize(p);
-    }
-  }
-
-  mi.smblks = nfastblocks;
-  mi.ordblks = nblocks;
-  mi.fordblks = avail;
-  mi.uordblks = av->sbrked_mem - avail;
-  mi.arena = av->sbrked_mem;
-  mi.hblks = av->n_mmaps;
-  mi.hblkhd = av->mmapped_mem;
-  mi.fsmblks = fastavail;
-  mi.keepcost = chunksize(av->top);
-  mi.usmblks = av->max_total_mem;
-  return mi;
-}
-
-/*
-  ------------------------------ malloc_stats ------------------------------
-*/
-
-void mSTATs()
-{
-  struct mallinfo mi = mALLINFo();
-
-#ifdef WIN32
-  {
-    CHUNK_SIZE_T  free, reserved, committed;
-    vminfo (&free, &reserved, &committed);
-    fprintf(stderr, "free bytes       = %10lu\n",
-	    free);
-    fprintf(stderr, "reserved bytes   = %10lu\n",
-	    reserved);
-    fprintf(stderr, "committed bytes  = %10lu\n",
-	    committed);
-  }
-#endif
-
-
-  fprintf(stderr, "max system bytes = %10lu\n",
-	  (CHUNK_SIZE_T)(mi.usmblks));
-  fprintf(stderr, "system bytes     = %10lu\n",
-	  (CHUNK_SIZE_T)(mi.arena + mi.hblkhd));
-  fprintf(stderr, "in use bytes     = %10lu\n",
-	  (CHUNK_SIZE_T)(mi.uordblks + mi.hblkhd));
-
-#ifdef WIN32
-  {
-    CHUNK_SIZE_T  kernel, user;
-    if (cpuinfo (TRUE, &kernel, &user)) {
-      fprintf(stderr, "kernel ms        = %10lu\n",
-	      kernel);
-      fprintf(stderr, "user ms          = %10lu\n",
-	      user);
-    }
-  }
-#endif
-}
-
-
-/*
-  ------------------------------ mallopt ------------------------------
-*/
-
-#if __STD_C
-int mALLOPt(int param_number, int value)
-#else
-int mALLOPt(param_number, value) int param_number; int value;
-#endif
-{
-  mstate av = get_malloc_state();
-  /* Ensure initialization/consolidation */
-  malloc_consolidate(av);
-
-  switch(param_number) {
-  case M_MXFAST:
-    if (value >= 0 && value <= MAX_FAST_SIZE) {
-      set_max_fast(av, value);
-      return 1;
-    }
-    else
-      return 0;
-
-  case M_TRIM_THRESHOLD:
-    av->trim_threshold = value;
-    return 1;
-
-  case M_TOP_PAD:
-    av->top_pad = value;
-    return 1;
-
-  case M_MMAP_THRESHOLD:
-    av->mmap_threshold = value;
-    return 1;
-
-  case M_MMAP_MAX:
-#if !HAVE_MMAP
-    if (value != 0)
-      return 0;
-#endif
-    av->n_mmaps_max = value;
-    return 1;
-
-  default:
-    return 0;
-  }
-}
-
-/*
-  -------------------- Alternative MORECORE functions --------------------
-*/
-
-
-/*
-  General Requirements for MORECORE.
-
-  The MORECORE function must have the following properties:
-
-  If MORECORE_CONTIGUOUS is false:
-
-    * MORECORE must allocate in multiples of pagesize. It will
-      only be called with arguments that are multiples of pagesize.
-
-    * MORECORE(0) must return an address that is at least
-      MALLOC_ALIGNMENT aligned. (Page-aligning always suffices.)
-
-  else (i.e. If MORECORE_CONTIGUOUS is true):
-
-    * Consecutive calls to MORECORE with positive arguments
-      return increasing addresses, indicating that space has been
-      contiguously extended.
-
-    * MORECORE need not allocate in multiples of pagesize.
-      Calls to MORECORE need not have args of multiples of pagesize.
-
-    * MORECORE need not page-align.
-
-  In either case:
-
-    * MORECORE may allocate more memory than requested. (Or even less,
-      but this will generally result in a malloc failure.)
-
-    * MORECORE must not allocate memory when given argument zero, but
-      instead return one past the end address of memory from previous
-      nonzero call. This malloc does NOT call MORECORE(0)
-      until at least one call with positive arguments is made, so
-      the initial value returned is not important.
-
-    * Even though consecutive calls to MORECORE need not return contiguous
-      addresses, it must be OK for malloc'ed chunks to span multiple
-      regions in those cases where they do happen to be contiguous.
-
-    * MORECORE need not handle negative arguments -- it may instead
-      just return MORECORE_FAILURE when given negative arguments.
-      Negative arguments are always multiples of pagesize. MORECORE
-      must not misinterpret negative args as large positive unsigned
-      args. You can suppress all such calls from even occurring by defining
-      MORECORE_CANNOT_TRIM,
-
-  There is some variation across systems about the type of the
-  argument to sbrk/MORECORE. If size_t is unsigned, then it cannot
-  actually be size_t, because sbrk supports negative args, so it is
-  normally the signed type of the same width as size_t (sometimes
-  declared as "intptr_t", and sometimes "ptrdiff_t").  It doesn't much
-  matter though. Internally, we use "long" as arguments, which should
-  work across all reasonable possibilities.
-
-  Additionally, if MORECORE ever returns failure for a positive
-  request, and HAVE_MMAP is true, then mmap is used as a noncontiguous
-  system allocator. This is a useful backup strategy for systems with
-  holes in address spaces -- in this case sbrk cannot contiguously
-  expand the heap, but mmap may be able to map noncontiguous space.
-
-  If you'd like mmap to ALWAYS be used, you can define MORECORE to be
-  a function that always returns MORECORE_FAILURE.
-
-  Malloc only has limited ability to detect failures of MORECORE
-  to supply contiguous space when it says it can. In particular,
-  multithreaded programs that do not use locks may result in
-  rece conditions across calls to MORECORE that result in gaps
-  that cannot be detected as such, and subsequent corruption.
-
-  If you are using this malloc with something other than sbrk (or its
-  emulation) to supply memory regions, you probably want to set
-  MORECORE_CONTIGUOUS as false.  As an example, here is a custom
-  allocator kindly contributed for pre-OSX macOS.  It uses virtually
-  but not necessarily physically contiguous non-paged memory (locked
-  in, present and won't get swapped out).  You can use it by
-  uncommenting this section, adding some #includes, and setting up the
-  appropriate defines above:
-
-      #define MORECORE osMoreCore
-      #define MORECORE_CONTIGUOUS 0
-
-  There is also a shutdown routine that should somehow be called for
-  cleanup upon program exit.
-
-  #define MAX_POOL_ENTRIES 100
-  #define MINIMUM_MORECORE_SIZE  (64 * 1024)
-  static int next_os_pool;
-  void *our_os_pools[MAX_POOL_ENTRIES];
-
-  void *osMoreCore(int size)
-  {
-    void *ptr = 0;
-    static void *sbrk_top = 0;
-
-    if (size > 0)
-    {
-      if (size < MINIMUM_MORECORE_SIZE)
-	 size = MINIMUM_MORECORE_SIZE;
-      if (CurrentExecutionLevel() == kTaskLevel)
-	 ptr = PoolAllocateResident(size + RM_PAGE_SIZE, 0);
-      if (ptr == 0)
-      {
-	return (void *) MORECORE_FAILURE;
-      }
-      // save ptrs so they can be freed during cleanup
-      our_os_pools[next_os_pool] = ptr;
-      next_os_pool++;
-      ptr = (void *) ((((CHUNK_SIZE_T) ptr) + RM_PAGE_MASK) & ~RM_PAGE_MASK);
-      sbrk_top = (char *) ptr + size;
-      return ptr;
-    }
-    else if (size < 0)
-    {
-      // we don't currently support shrink behavior
-      return (void *) MORECORE_FAILURE;
-    }
-    else
-    {
-      return sbrk_top;
-    }
-  }
-
-  // cleanup any allocated memory pools
-  // called as last thing before shutting down driver
-
-  void osCleanupMem(void)
-  {
-    void **ptr;
-
-    for (ptr = our_os_pools; ptr < &our_os_pools[MAX_POOL_ENTRIES]; ptr++)
-      if (*ptr)
-      {
-	 PoolDeallocate(*ptr);
-	 *ptr = 0;
-      }
-  }
-
-*/
-
-
-/*
-  --------------------------------------------------------------
-
-  Emulation of sbrk for win32.
-  Donated by J. Walter <Walter@GeNeSys-e.de>.
-  For additional information about this code, and malloc on Win32, see
-     http://www.genesys-e.de/jwalter/
-*/
-
-
-#ifdef WIN32
-
-#ifdef _DEBUG
-/* #define TRACE */
-#endif
-
-/* Support for USE_MALLOC_LOCK */
-#ifdef USE_MALLOC_LOCK
-
-/* Wait for spin lock */
-static int slwait (int *sl) {
-    while (InterlockedCompareExchange ((void **) sl, (void *) 1, (void *) 0) != 0)
-	    Sleep (0);
-    return 0;
-}
-
-/* Release spin lock */
-static int slrelease (int *sl) {
-    InterlockedExchange (sl, 0);
-    return 0;
-}
-
-#ifdef NEEDED
-/* Spin lock for emulation code */
-static int g_sl;
-#endif
-
-#endif /* USE_MALLOC_LOCK */
-
-/* getpagesize for windows */
-static long getpagesize (void) {
-    static long g_pagesize = 0;
-    if (! g_pagesize) {
-	SYSTEM_INFO system_info;
-	GetSystemInfo (&system_info);
-	g_pagesize = system_info.dwPageSize;
-    }
-    return g_pagesize;
-}
-static long getregionsize (void) {
-    static long g_regionsize = 0;
-    if (! g_regionsize) {
-	SYSTEM_INFO system_info;
-	GetSystemInfo (&system_info);
-	g_regionsize = system_info.dwAllocationGranularity;
-    }
-    return g_regionsize;
-}
-
-/* A region list entry */
-typedef struct _region_list_entry {
-    void *top_allocated;
-    void *top_committed;
-    void *top_reserved;
-    long reserve_size;
-    struct _region_list_entry *previous;
-} region_list_entry;
-
-/* Allocate and link a region entry in the region list */
-static int region_list_append (region_list_entry **last, void *base_reserved, long reserve_size) {
-    region_list_entry *next = HeapAlloc (GetProcessHeap (), 0, sizeof (region_list_entry));
-    if (! next)
-	return FALSE;
-    next->top_allocated = (char *) base_reserved;
-    next->top_committed = (char *) base_reserved;
-    next->top_reserved = (char *) base_reserved + reserve_size;
-    next->reserve_size = reserve_size;
-    next->previous = *last;
-    *last = next;
-    return TRUE;
-}
-/* Free and unlink the last region entry from the region list */
-static int region_list_remove (region_list_entry **last) {
-    region_list_entry *previous = (*last)->previous;
-    if (! HeapFree (GetProcessHeap (), sizeof (region_list_entry), *last))
-	return FALSE;
-    *last = previous;
-    return TRUE;
-}
-
-#define CEIL(size,to)	(((size)+(to)-1)&~((to)-1))
-#define FLOOR(size,to)	((size)&~((to)-1))
-
-#define SBRK_SCALE  0
-/* #define SBRK_SCALE  1 */
-/* #define SBRK_SCALE  2 */
-/* #define SBRK_SCALE  4  */
-
-/* sbrk for windows */
-static void *sbrk (long size) {
-    static long g_pagesize, g_my_pagesize;
-    static long g_regionsize, g_my_regionsize;
-    static region_list_entry *g_last;
-    void *result = (void *) MORECORE_FAILURE;
-#ifdef TRACE
-    printf ("sbrk %d\n", size);
-#endif
-#if defined (USE_MALLOC_LOCK) && defined (NEEDED)
-    /* Wait for spin lock */
-    slwait (&g_sl);
-#endif
-    /* First time initialization */
-    if (! g_pagesize) {
-	g_pagesize = getpagesize ();
-	g_my_pagesize = g_pagesize << SBRK_SCALE;
-    }
-    if (! g_regionsize) {
-	g_regionsize = getregionsize ();
-	g_my_regionsize = g_regionsize << SBRK_SCALE;
-    }
-    if (! g_last) {
-	if (! region_list_append (&g_last, 0, 0))
-	   goto sbrk_exit;
-    }
-    /* Assert invariants */
-    assert (g_last);
-    assert ((char *) g_last->top_reserved - g_last->reserve_size <= (char *) g_last->top_allocated &&
-	    g_last->top_allocated <= g_last->top_committed);
-    assert ((char *) g_last->top_reserved - g_last->reserve_size <= (char *) g_last->top_committed &&
-	    g_last->top_committed <= g_last->top_reserved &&
-	    (unsigned) g_last->top_committed % g_pagesize == 0);
-    assert ((unsigned) g_last->top_reserved % g_regionsize == 0);
-    assert ((unsigned) g_last->reserve_size % g_regionsize == 0);
-    /* Allocation requested? */
-    if (size >= 0) {
-	/* Allocation size is the requested size */
-	long allocate_size = size;
-	/* Compute the size to commit */
-	long to_commit = (char *) g_last->top_allocated + allocate_size - (char *) g_last->top_committed;
-	/* Do we reach the commit limit? */
-	if (to_commit > 0) {
-	    /* Round size to commit */
-	    long commit_size = CEIL (to_commit, g_my_pagesize);
-	    /* Compute the size to reserve */
-	    long to_reserve = (char *) g_last->top_committed + commit_size - (char *) g_last->top_reserved;
-	    /* Do we reach the reserve limit? */
-	    if (to_reserve > 0) {
-		/* Compute the remaining size to commit in the current region */
-		long remaining_commit_size = (char *) g_last->top_reserved - (char *) g_last->top_committed;
-		if (remaining_commit_size > 0) {
-		    /* Assert preconditions */
-		    assert ((unsigned) g_last->top_committed % g_pagesize == 0);
-		    assert (0 < remaining_commit_size && remaining_commit_size % g_pagesize == 0); {
-			/* Commit this */
-			void *base_committed = VirtualAlloc (g_last->top_committed, remaining_commit_size,
-											 MEM_COMMIT, PAGE_READWRITE);
-			/* Check returned pointer for consistency */
-			if (base_committed != g_last->top_committed)
-			    goto sbrk_exit;
-			/* Assert postconditions */
-			assert ((unsigned) base_committed % g_pagesize == 0);
-#ifdef TRACE
-			printf ("Commit %p %d\n", base_committed, remaining_commit_size);
-#endif
-			/* Adjust the regions commit top */
-			g_last->top_committed = (char *) base_committed + remaining_commit_size;
-		    }
-		} {
-		    /* Now we are going to search and reserve. */
-		    int contiguous = -1;
-		    int found = FALSE;
-		    MEMORY_BASIC_INFORMATION memory_info;
-		    void *base_reserved;
-		    long reserve_size;
-		    do {
-			/* Assume contiguous memory */
-			contiguous = TRUE;
-			/* Round size to reserve */
-			reserve_size = CEIL (to_reserve, g_my_regionsize);
-			/* Start with the current region's top */
-			memory_info.BaseAddress = g_last->top_reserved;
-			/* Assert preconditions */
-			assert ((unsigned) memory_info.BaseAddress % g_pagesize == 0);
-			assert (0 < reserve_size && reserve_size % g_regionsize == 0);
-			while (VirtualQuery (memory_info.BaseAddress, &memory_info, sizeof (memory_info))) {
-			    /* Assert postconditions */
-			    assert ((unsigned) memory_info.BaseAddress % g_pagesize == 0);
-#ifdef TRACE
-			    printf ("Query %p %d %s\n", memory_info.BaseAddress, memory_info.RegionSize,
-				    memory_info.State == MEM_FREE ? "FREE":
-				    (memory_info.State == MEM_RESERVE ? "RESERVED":
-				     (memory_info.State == MEM_COMMIT ? "COMMITTED": "?")));
-#endif
-			    /* Region is free, well aligned and big enough: we are done */
-			    if (memory_info.State == MEM_FREE &&
-				(unsigned) memory_info.BaseAddress % g_regionsize == 0 &&
-				memory_info.RegionSize >= (unsigned) reserve_size) {
-				found = TRUE;
-				break;
-			    }
-			    /* From now on we can't get contiguous memory! */
-			    contiguous = FALSE;
-			    /* Recompute size to reserve */
-			    reserve_size = CEIL (allocate_size, g_my_regionsize);
-			    memory_info.BaseAddress = (char *) memory_info.BaseAddress + memory_info.RegionSize;
-			    /* Assert preconditions */
-			    assert ((unsigned) memory_info.BaseAddress % g_pagesize == 0);
-			    assert (0 < reserve_size && reserve_size % g_regionsize == 0);
-			}
-			/* Search failed? */
-			if (! found)
-			    goto sbrk_exit;
-			/* Assert preconditions */
-			assert ((unsigned) memory_info.BaseAddress % g_regionsize == 0);
-			assert (0 < reserve_size && reserve_size % g_regionsize == 0);
-			/* Try to reserve this */
-			base_reserved = VirtualAlloc (memory_info.BaseAddress, reserve_size,
-									  MEM_RESERVE, PAGE_NOACCESS);
-			if (! base_reserved) {
-			    int rc = GetLastError ();
-			    if (rc != ERROR_INVALID_ADDRESS)
-				goto sbrk_exit;
-			}
-			/* A null pointer signals (hopefully) a race condition with another thread. */
-			/* In this case, we try again. */
-		    } while (! base_reserved);
-		    /* Check returned pointer for consistency */
-		    if (memory_info.BaseAddress && base_reserved != memory_info.BaseAddress)
-			goto sbrk_exit;
-		    /* Assert postconditions */
-		    assert ((unsigned) base_reserved % g_regionsize == 0);
-#ifdef TRACE
-		    printf ("Reserve %p %d\n", base_reserved, reserve_size);
-#endif
-		    /* Did we get contiguous memory? */
-		    if (contiguous) {
-			long start_size = (char *) g_last->top_committed - (char *) g_last->top_allocated;
-			/* Adjust allocation size */
-			allocate_size -= start_size;
-			/* Adjust the regions allocation top */
-			g_last->top_allocated = g_last->top_committed;
-			/* Recompute the size to commit */
-			to_commit = (char *) g_last->top_allocated + allocate_size - (char *) g_last->top_committed;
-			/* Round size to commit */
-			commit_size = CEIL (to_commit, g_my_pagesize);
-		    }
-		    /* Append the new region to the list */
-		    if (! region_list_append (&g_last, base_reserved, reserve_size))
-			goto sbrk_exit;
-		    /* Didn't we get contiguous memory? */
-		    if (! contiguous) {
-			/* Recompute the size to commit */
-			to_commit = (char *) g_last->top_allocated + allocate_size - (char *) g_last->top_committed;
-			/* Round size to commit */
-			commit_size = CEIL (to_commit, g_my_pagesize);
-		    }
-		}
-	    }
-	    /* Assert preconditions */
-	    assert ((unsigned) g_last->top_committed % g_pagesize == 0);
-	    assert (0 < commit_size && commit_size % g_pagesize == 0); {
-		/* Commit this */
-		void *base_committed = VirtualAlloc (g_last->top_committed, commit_size,
-									     MEM_COMMIT, PAGE_READWRITE);
-		/* Check returned pointer for consistency */
-		if (base_committed != g_last->top_committed)
-		    goto sbrk_exit;
-		/* Assert postconditions */
-		assert ((unsigned) base_committed % g_pagesize == 0);
-#ifdef TRACE
-		printf ("Commit %p %d\n", base_committed, commit_size);
-#endif
-		/* Adjust the regions commit top */
-		g_last->top_committed = (char *) base_committed + commit_size;
-	    }
-	}
-	/* Adjust the regions allocation top */
-	g_last->top_allocated = (char *) g_last->top_allocated + allocate_size;
-	result = (char *) g_last->top_allocated - size;
-    /* Deallocation requested? */
-    } else if (size < 0) {
-	long deallocate_size = - size;
-	/* As long as we have a region to release */
-	while ((char *) g_last->top_allocated - deallocate_size < (char *) g_last->top_reserved - g_last->reserve_size) {
-	    /* Get the size to release */
-	    long release_size = g_last->reserve_size;
-	    /* Get the base address */
-	    void *base_reserved = (char *) g_last->top_reserved - release_size;
-	    /* Assert preconditions */
-	    assert ((unsigned) base_reserved % g_regionsize == 0);
-	    assert (0 < release_size && release_size % g_regionsize == 0); {
-		/* Release this */
-		int rc = VirtualFree (base_reserved, 0,
-				      MEM_RELEASE);
-		/* Check returned code for consistency */
-		if (! rc)
-		    goto sbrk_exit;
-#ifdef TRACE
-		printf ("Release %p %d\n", base_reserved, release_size);
-#endif
-	    }
-	    /* Adjust deallocation size */
-	    deallocate_size -= (char *) g_last->top_allocated - (char *) base_reserved;
-	    /* Remove the old region from the list */
-	    if (! region_list_remove (&g_last))
-		goto sbrk_exit;
-	} {
-	    /* Compute the size to decommit */
-	    long to_decommit = (char *) g_last->top_committed - ((char *) g_last->top_allocated - deallocate_size);
-	    if (to_decommit >= g_my_pagesize) {
-		/* Compute the size to decommit */
-		long decommit_size = FLOOR (to_decommit, g_my_pagesize);
-		/*  Compute the base address */
-		void *base_committed = (char *) g_last->top_committed - decommit_size;
-		/* Assert preconditions */
-		assert ((unsigned) base_committed % g_pagesize == 0);
-		assert (0 < decommit_size && decommit_size % g_pagesize == 0); {
-		    /* Decommit this */
-		    int rc = VirtualFree ((char *) base_committed, decommit_size,
-					  MEM_DECOMMIT);
-		    /* Check returned code for consistency */
-		    if (! rc)
-			goto sbrk_exit;
-#ifdef TRACE
-		    printf ("Decommit %p %d\n", base_committed, decommit_size);
-#endif
-		}
-		/* Adjust deallocation size and regions commit and allocate top */
-		deallocate_size -= (char *) g_last->top_allocated - (char *) base_committed;
-		g_last->top_committed = base_committed;
-		g_last->top_allocated = base_committed;
-	    }
-	}
-	/* Adjust regions allocate top */
-	g_last->top_allocated = (char *) g_last->top_allocated - deallocate_size;
-	/* Check for underflow */
-	if ((char *) g_last->top_reserved - g_last->reserve_size > (char *) g_last->top_allocated ||
-	    g_last->top_allocated > g_last->top_committed) {
-	    /* Adjust regions allocate top */
-	    g_last->top_allocated = (char *) g_last->top_reserved - g_last->reserve_size;
-	    goto sbrk_exit;
-	}
-	result = g_last->top_allocated;
-    }
-    /* Assert invariants */
-    assert (g_last);
-    assert ((char *) g_last->top_reserved - g_last->reserve_size <= (char *) g_last->top_allocated &&
-	    g_last->top_allocated <= g_last->top_committed);
-    assert ((char *) g_last->top_reserved - g_last->reserve_size <= (char *) g_last->top_committed &&
-	    g_last->top_committed <= g_last->top_reserved &&
-	    (unsigned) g_last->top_committed % g_pagesize == 0);
-    assert ((unsigned) g_last->top_reserved % g_regionsize == 0);
-    assert ((unsigned) g_last->reserve_size % g_regionsize == 0);
-
-sbrk_exit:
-#if defined (USE_MALLOC_LOCK) && defined (NEEDED)
-    /* Release spin lock */
-    slrelease (&g_sl);
-#endif
-    return result;
-}
-
-/* mmap for windows */
-static void *mmap (void *ptr, long size, long prot, long type, long handle, long arg) {
-    static long g_pagesize;
-    static long g_regionsize;
-#ifdef TRACE
-    printf ("mmap %d\n", size);
-#endif
-#if defined (USE_MALLOC_LOCK) && defined (NEEDED)
-    /* Wait for spin lock */
-    slwait (&g_sl);
-#endif
-    /* First time initialization */
-    if (! g_pagesize)
-	g_pagesize = getpagesize ();
-    if (! g_regionsize)
-	g_regionsize = getregionsize ();
-    /* Assert preconditions */
-    assert ((unsigned) ptr % g_regionsize == 0);
-    assert (size % g_pagesize == 0);
-    /* Allocate this */
-    ptr = VirtualAlloc (ptr, size,
-					    MEM_RESERVE | MEM_COMMIT | MEM_TOP_DOWN, PAGE_READWRITE);
-    if (! ptr) {
-	ptr = (void *) MORECORE_FAILURE;
-	goto mmap_exit;
-    }
-    /* Assert postconditions */
-    assert ((unsigned) ptr % g_regionsize == 0);
-#ifdef TRACE
-    printf ("Commit %p %d\n", ptr, size);
-#endif
-mmap_exit:
-#if defined (USE_MALLOC_LOCK) && defined (NEEDED)
-    /* Release spin lock */
-    slrelease (&g_sl);
-#endif
-    return ptr;
-}
-
-/* munmap for windows */
-static long munmap (void *ptr, long size) {
-    static long g_pagesize;
-    static long g_regionsize;
-    int rc = MUNMAP_FAILURE;
-#ifdef TRACE
-    printf ("munmap %p %d\n", ptr, size);
-#endif
-#if defined (USE_MALLOC_LOCK) && defined (NEEDED)
-    /* Wait for spin lock */
-    slwait (&g_sl);
-#endif
-    /* First time initialization */
-    if (! g_pagesize)
-	g_pagesize = getpagesize ();
-    if (! g_regionsize)
-	g_regionsize = getregionsize ();
-    /* Assert preconditions */
-    assert ((unsigned) ptr % g_regionsize == 0);
-    assert (size % g_pagesize == 0);
-    /* Free this */
-    if (! VirtualFree (ptr, 0,
-		       MEM_RELEASE))
-	goto munmap_exit;
-    rc = 0;
-#ifdef TRACE
-    printf ("Release %p %d\n", ptr, size);
-#endif
-munmap_exit:
-#if defined (USE_MALLOC_LOCK) && defined (NEEDED)
-    /* Release spin lock */
-    slrelease (&g_sl);
-#endif
-    return rc;
-}
-
-static void vminfo (CHUNK_SIZE_T  *free, CHUNK_SIZE_T  *reserved, CHUNK_SIZE_T  *committed) {
-    MEMORY_BASIC_INFORMATION memory_info;
-    memory_info.BaseAddress = 0;
-    *free = *reserved = *committed = 0;
-    while (VirtualQuery (memory_info.BaseAddress, &memory_info, sizeof (memory_info))) {
-	switch (memory_info.State) {
-	case MEM_FREE:
-	    *free += memory_info.RegionSize;
-	    break;
-	case MEM_RESERVE:
-	    *reserved += memory_info.RegionSize;
-	    break;
-	case MEM_COMMIT:
-	    *committed += memory_info.RegionSize;
-	    break;
-	}
-	memory_info.BaseAddress = (char *) memory_info.BaseAddress + memory_info.RegionSize;
-    }
-}
-
-static int cpuinfo (int whole, CHUNK_SIZE_T  *kernel, CHUNK_SIZE_T  *user) {
-    if (whole) {
-	__int64 creation64, exit64, kernel64, user64;
-	int rc = GetProcessTimes (GetCurrentProcess (),
-				  (FILETIME *) &creation64,
-				  (FILETIME *) &exit64,
-				  (FILETIME *) &kernel64,
-				  (FILETIME *) &user64);
-	if (! rc) {
-	    *kernel = 0;
-	    *user = 0;
-	    return FALSE;
-	}
-	*kernel = (CHUNK_SIZE_T) (kernel64 / 10000);
-	*user = (CHUNK_SIZE_T) (user64 / 10000);
-	return TRUE;
-    } else {
-	__int64 creation64, exit64, kernel64, user64;
-	int rc = GetThreadTimes (GetCurrentThread (),
-				 (FILETIME *) &creation64,
-				 (FILETIME *) &exit64,
-				 (FILETIME *) &kernel64,
-				 (FILETIME *) &user64);
-	if (! rc) {
-	    *kernel = 0;
-	    *user = 0;
-	    return FALSE;
-	}
-	*kernel = (CHUNK_SIZE_T) (kernel64 / 10000);
-	*user = (CHUNK_SIZE_T) (user64 / 10000);
-	return TRUE;
-    }
-}
-
-#endif /* WIN32 */
-
-/* ------------------------------------------------------------
-History:
-    V2.7.2 Sat Aug 17 09:07:30 2002  Doug Lea  (dl at gee)
-      * Fix malloc_state bitmap array misdeclaration
-
-    V2.7.1 Thu Jul 25 10:58:03 2002  Doug Lea  (dl at gee)
-      * Allow tuning of FIRST_SORTED_BIN_SIZE
-      * Use PTR_UINT as type for all ptr->int casts. Thanks to John Belmonte.
-      * Better detection and support for non-contiguousness of MORECORE.
-	Thanks to Andreas Mueller, Conal Walsh, and Wolfram Gloger
-      * Bypass most of malloc if no frees. Thanks To Emery Berger.
-      * Fix freeing of old top non-contiguous chunk im sysmalloc.
-      * Raised default trim and map thresholds to 256K.
-      * Fix mmap-related #defines. Thanks to Lubos Lunak.
-      * Fix copy macros; added LACKS_FCNTL_H. Thanks to Neal Walfield.
-      * Branch-free bin calculation
-      * Default trim and mmap thresholds now 256K.
-
-    V2.7.0 Sun Mar 11 14:14:06 2001  Doug Lea  (dl at gee)
-      * Introduce independent_comalloc and independent_calloc.
-	Thanks to Michael Pachos for motivation and help.
-      * Make optional .h file available
-      * Allow > 2GB requests on 32bit systems.
-      * new WIN32 sbrk, mmap, munmap, lock code from <Walter@GeNeSys-e.de>.
-	Thanks also to Andreas Mueller <a.mueller at paradatec.de>,
-	and Anonymous.
-      * Allow override of MALLOC_ALIGNMENT (Thanks to Ruud Waij for
-	helping test this.)
-      * memalign: check alignment arg
-      * realloc: don't try to shift chunks backwards, since this
-	leads to  more fragmentation in some programs and doesn't
-	seem to help in any others.
-      * Collect all cases in malloc requiring system memory into sYSMALLOc
-      * Use mmap as backup to sbrk
-      * Place all internal state in malloc_state
-      * Introduce fastbins (although similar to 2.5.1)
-      * Many minor tunings and cosmetic improvements
-      * Introduce USE_PUBLIC_MALLOC_WRAPPERS, USE_MALLOC_LOCK
-      * Introduce MALLOC_FAILURE_ACTION, MORECORE_CONTIGUOUS
-	Thanks to Tony E. Bennett <tbennett@nvidia.com> and others.
-      * Include errno.h to support default failure action.
-
-    V2.6.6 Sun Dec  5 07:42:19 1999  Doug Lea  (dl at gee)
-      * return null for negative arguments
-      * Added Several WIN32 cleanups from Martin C. Fong <mcfong at yahoo.com>
-	 * Add 'LACKS_SYS_PARAM_H' for those systems without 'sys/param.h'
-	  (e.g. WIN32 platforms)
-	 * Cleanup header file inclusion for WIN32 platforms
-	 * Cleanup code to avoid Microsoft Visual C++ compiler complaints
-	 * Add 'USE_DL_PREFIX' to quickly allow co-existence with existing
-	   memory allocation routines
-	 * Set 'malloc_getpagesize' for WIN32 platforms (needs more work)
-	 * Use 'assert' rather than 'ASSERT' in WIN32 code to conform to
-	   usage of 'assert' in non-WIN32 code
-	 * Improve WIN32 'sbrk()' emulation's 'findRegion()' routine to
-	   avoid infinite loop
-      * Always call 'fREe()' rather than 'free()'
-
-    V2.6.5 Wed Jun 17 15:57:31 1998  Doug Lea  (dl at gee)
-      * Fixed ordering problem with boundary-stamping
-
-    V2.6.3 Sun May 19 08:17:58 1996  Doug Lea  (dl at gee)
-      * Added pvalloc, as recommended by H.J. Liu
-      * Added 64bit pointer support mainly from Wolfram Gloger
-      * Added anonymously donated WIN32 sbrk emulation
-      * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen
-      * malloc_extend_top: fix mask error that caused wastage after
-	foreign sbrks
-      * Add linux mremap support code from HJ Liu
-
-    V2.6.2 Tue Dec  5 06:52:55 1995  Doug Lea  (dl at gee)
-      * Integrated most documentation with the code.
-      * Add support for mmap, with help from
-	Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
-      * Use last_remainder in more cases.
-      * Pack bins using idea from  colin@nyx10.cs.du.edu
-      * Use ordered bins instead of best-fit threshhold
-      * Eliminate block-local decls to simplify tracing and debugging.
-      * Support another case of realloc via move into top
-      * Fix error occuring when initial sbrk_base not word-aligned.
-      * Rely on page size for units instead of SBRK_UNIT to
-	avoid surprises about sbrk alignment conventions.
-      * Add mallinfo, mallopt. Thanks to Raymond Nijssen
-	(raymond@es.ele.tue.nl) for the suggestion.
-      * Add `pad' argument to malloc_trim and top_pad mallopt parameter.
-      * More precautions for cases where other routines call sbrk,
-	courtesy of Wolfram Gloger (Gloger@lrz.uni-muenchen.de).
-      * Added macros etc., allowing use in linux libc from
-	H.J. Lu (hjl@gnu.ai.mit.edu)
-      * Inverted this history list
-
-    V2.6.1 Sat Dec  2 14:10:57 1995  Doug Lea  (dl at gee)
-      * Re-tuned and fixed to behave more nicely with V2.6.0 changes.
-      * Removed all preallocation code since under current scheme
-	the work required to undo bad preallocations exceeds
-	the work saved in good cases for most test programs.
-      * No longer use return list or unconsolidated bins since
-	no scheme using them consistently outperforms those that don't
-	given above changes.
-      * Use best fit for very large chunks to prevent some worst-cases.
-      * Added some support for debugging
-
-    V2.6.0 Sat Nov  4 07:05:23 1995  Doug Lea  (dl at gee)
-      * Removed footers when chunks are in use. Thanks to
-	Paul Wilson (wilson@cs.texas.edu) for the suggestion.
-
-    V2.5.4 Wed Nov  1 07:54:51 1995  Doug Lea  (dl at gee)
-      * Added malloc_trim, with help from Wolfram Gloger
-	(wmglo@Dent.MED.Uni-Muenchen.DE).
-
-    V2.5.3 Tue Apr 26 10:16:01 1994  Doug Lea  (dl at g)
-
-    V2.5.2 Tue Apr  5 16:20:40 1994  Doug Lea  (dl at g)
-      * realloc: try to expand in both directions
-      * malloc: swap order of clean-bin strategy;
-      * realloc: only conditionally expand backwards
-      * Try not to scavenge used bins
-      * Use bin counts as a guide to preallocation
-      * Occasionally bin return list chunks in first scan
-      * Add a few optimizations from colin@nyx10.cs.du.edu
-
-    V2.5.1 Sat Aug 14 15:40:43 1993  Doug Lea  (dl at g)
-      * faster bin computation & slightly different binning
-      * merged all consolidations to one part of malloc proper
-	 (eliminating old malloc_find_space & malloc_clean_bin)
-      * Scan 2 returns chunks (not just 1)
-      * Propagate failure in realloc if malloc returns 0
-      * Add stuff to allow compilation on non-ANSI compilers
-	  from kpv@research.att.com
-
-    V2.5 Sat Aug  7 07:41:59 1993  Doug Lea  (dl at g.oswego.edu)
-      * removed potential for odd address access in prev_chunk
-      * removed dependency on getpagesize.h
-      * misc cosmetics and a bit more internal documentation
-      * anticosmetics: mangled names in macros to evade debugger strangeness
-      * tested on sparc, hp-700, dec-mips, rs6000
-	  with gcc & native cc (hp, dec only) allowing
-	  Detlefs & Zorn comparison study (in SIGPLAN Notices.)
-
-    Trial version Fri Aug 28 13:14:29 1992  Doug Lea  (dl at g.oswego.edu)
-      * Based loosely on libg++-1.2X malloc. (It retains some of the overall
-	 structure of old version,  but most details differ.)
-
-*/
diff --git a/winsup/cygwin/malloc_wrapper.cc b/winsup/cygwin/malloc_wrapper.cc
deleted file mode 100644
index 5798cf417..000000000
--- a/winsup/cygwin/malloc_wrapper.cc
+++ /dev/null
@@ -1,333 +0,0 @@
-/* malloc_wrapper.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-   Originally written by Steve Chamberlain of Cygnus Support
-   sac@cygnus.com
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include <assert.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-#include "heap.h"
-#include "sync.h"
-#include "perprocess.h"
-#include "cygmalloc.h"
-#include <malloc.h>
-extern "C" struct mallinfo dlmallinfo ();
-
-/* we provide these stubs to call into a user's
-   provided malloc if there is one - otherwise
-   functions we provide - like strdup will cause
-   problems if malloced on our heap and free'd on theirs.
-*/
-
-static int export_malloc_called;
-static int use_internal_malloc = 1;
-
-#ifdef MALLOC_DEBUG
-extern "C" void * _sbrk (size_t incr_arg);
-
-#if 0
-extern "C" void *
-_sbrk_r (struct _reent *, size_t incr_arg)
-{
-  return _sbrk (incr_arg);
-}
-#endif
-
-extern "C" void *
-_malloc_r (struct _reent *, size_t size)
-{
-  export_malloc_called = 1;
-  return malloc (size);
-}
-#undef malloc
-
-extern "C" void *
-_calloc_r (struct _reent *, size_t nmemb, size_t size)
-{
-  export_malloc_called = 1;
-  return calloc (nmemb, size);
-}
-#undef calloc
-
-extern "C" void
-_free_r (struct _reent *, void *p)
-{
-  export_malloc_called = 1;
-  assert (!incygheap (p));
-  assert (inheap (p));
-  free (p);
-}
-#undef free
-
-extern "C" void *
-_realloc_r (struct _reent *, void *p, size_t size)
-{
-  export_malloc_called = 1;
-  assert (!incygheap (p));
-  assert (inheap (p));
-  return realloc (p, size);
-}
-#undef realloc
-
-extern "C" char *
-strdup_dbg (const char *s, const char *file, int line)
-{
-  char *p;
-  export_malloc_called = 1;
-  if ((p = (char *) malloc_dbg (strlen (s) + 1, file, line)) != NULL)
-      strcpy (p, s);
-  return p;
-}
-
-#undef strdup
-extern "C" char *
-strdup (const char *s)
-{
-  return strdup_dbg (s, __FILE__, __LINE__);
-}
-#else
-#endif
-/* These routines are used by the application if it
-   doesn't provide its own malloc. */
-
-extern "C" void
-free (void *p)
-{
-  malloc_printf ("(%p), called by %p", p, __builtin_return_address (0));
-  if (!use_internal_malloc)
-    user_data->free (p);
-  else
-    {
-      __malloc_lock ();
-      dlfree (p);
-      __malloc_unlock ();
-    }
-}
-
-extern "C" void *
-malloc (size_t size)
-{
-  void *res;
-  export_malloc_called = 1;
-  if (!use_internal_malloc)
-    res = user_data->malloc (size);
-  else
-    {
-      __malloc_lock ();
-      res = dlmalloc (size);
-      __malloc_unlock ();
-    }
-  malloc_printf ("(%d) = %x, called by %p", size, res, __builtin_return_address (0));
-  return res;
-}
-
-extern "C" void *
-realloc (void *p, size_t size)
-{
-  void *res;
-  if (!use_internal_malloc)
-    res = user_data->realloc (p, size);
-  else
-    {
-      __malloc_lock ();
-      res = dlrealloc (p, size);
-      __malloc_unlock ();
-    }
-  malloc_printf ("(%x, %d) = %x, called by %x", p, size, res, __builtin_return_address (0));
-  return res;
-}
-
-extern "C" void *
-calloc (size_t nmemb, size_t size)
-{
-  void *res;
-  if (!use_internal_malloc)
-    res = user_data->calloc (nmemb, size);
-  else
-    {
-      __malloc_lock ();
-      res = dlcalloc (nmemb, size);
-      __malloc_unlock ();
-    }
-  malloc_printf ("(%d, %d) = %x, called by %x", nmemb, size, res, __builtin_return_address (0));
-  return res;
-}
-
-extern "C" void *
-memalign (size_t alignment, size_t bytes)
-{
-  void *res;
-  if (!use_internal_malloc)
-    {
-      set_errno (ENOSYS);
-      res = NULL;
-    }
-  else
-    {
-      __malloc_lock ();
-      res = dlmemalign (alignment, bytes);
-      __malloc_unlock ();
-    }
-
-  return res;
-}
-
-extern "C" void *
-valloc (size_t bytes)
-{
-  void *res;
-  if (!use_internal_malloc)
-    {
-      set_errno (ENOSYS);
-      res = NULL;
-    }
-  else
-    {
-      __malloc_lock ();
-      res = dlvalloc (bytes);
-      __malloc_unlock ();
-    }
-
-  return res;
-}
-
-extern "C" size_t
-malloc_usable_size (void *p)
-{
-  size_t res;
-  if (!use_internal_malloc)
-    {
-      set_errno (ENOSYS);
-      res = 0;
-    }
-  else
-    {
-      __malloc_lock ();
-      res = dlmalloc_usable_size (p);
-      __malloc_unlock ();
-    }
-
-  return res;
-}
-
-extern "C" int
-malloc_trim (size_t pad)
-{
-  size_t res;
-  if (!use_internal_malloc)
-    {
-      set_errno (ENOSYS);
-      res = 0;
-    }
-  else
-    {
-      __malloc_lock ();
-      res = dlmalloc_trim (pad);
-      __malloc_unlock ();
-    }
-
-  return res;
-}
-
-extern "C" int
-mallopt (int p, int v)
-{
-  int res;
-  if (!use_internal_malloc)
-    {
-      set_errno (ENOSYS);
-      res = 0;
-    }
-  else
-    {
-      __malloc_lock ();
-      res = dlmallopt (p, v);
-      __malloc_unlock ();
-    }
-
-  return res;
-}
-
-extern "C" void
-malloc_stats ()
-{
-  if (!use_internal_malloc)
-    set_errno (ENOSYS);
-  else
-    {
-      __malloc_lock ();
-      dlmalloc_stats ();
-      __malloc_unlock ();
-    }
-
-  return;
-}
-
-extern "C" struct mallinfo
-mallinfo ()
-{
-  struct mallinfo m;
-  if (!use_internal_malloc)
-    set_errno (ENOSYS);
-  else
-    {
-      __malloc_lock ();
-      m = dlmallinfo ();
-      __malloc_unlock ();
-    }
-
-  return m;
-}
-
-extern "C" char *
-strdup (const char *s)
-{
-  char *p;
-  size_t len = strlen (s) + 1;
-  if ((p = (char *) malloc (len)) != NULL)
-    memcpy (p, s, len);
-  return p;
-}
-
-/* We use a critical section to lock access to the malloc data
-   structures.  This permits malloc to be called from different
-   threads.  Note that it does not make malloc reentrant, and it does
-   not permit a signal handler to call malloc.  The malloc code in
-   newlib will call __malloc_lock and __malloc_unlock at appropriate
-   times.  */
-
-NO_COPY muto *mallock = NULL;
-
-void
-malloc_init ()
-{
-  new_muto (mallock);
-  /* Check if mallock is provided by application. If so, redirect all
-     calls to malloc/free/realloc to application provided. This may
-     happen if some other dll calls cygwin's malloc, but main code provides
-     its own malloc */
-  if (!user_data->forkee)
-    {
-#ifdef MALLOC_DEBUG
-      _free_r (NULL, _malloc_r (NULL, 16));
-#else
-      user_data->free (user_data->malloc (16));
-#endif
-      if (!export_malloc_called)
-	use_internal_malloc = 0;
-    }
-}
diff --git a/winsup/cygwin/mcount.c b/winsup/cygwin/mcount.c
deleted file mode 100644
index dcdbc2b06..000000000
--- a/winsup/cygwin/mcount.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*-
- * Copyright (c) 1983, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if !defined(lint) && !defined(_KERNEL) && defined(LIBC_SCCS)
-static char rcsid[] = "$OpenBSD: mcount.c,v 1.6 1997/07/23 21:11:27 kstailey Exp $";
-#endif
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <gmon.h>
-
-/*
- * mcount is called on entry to each function compiled with the profiling
- * switch set.  _mcount(), which is declared in a machine-dependent way
- * with _MCOUNT_DECL, does the actual work and is either inlined into a
- * C routine or called by an assembly stub.  In any case, this magic is
- * taken care of by the MCOUNT definition in <machine/profile.h>.
- *
- * _mcount updates data structures that represent traversals of the
- * program's call graph edges.  frompc and selfpc are the return
- * address and function address that represents the given call graph edge.
- *
- * Note: the original BSD code used the same variable (frompcindex) for
- * both frompcindex and frompc.  Any reasonable, modern compiler will
- * perform this optimization.
- */
-//_MCOUNT_DECL __P((u_long frompc, u_long selfpc));
-_MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
-	register u_long frompc, selfpc;
-{
-	register u_short *frompcindex;
-	register struct tostruct *top, *prevtop;
-	register struct gmonparam *p;
-	register long toindex;
-
-	p = &_gmonparam;
-	/*
-	 * check that we are profiling
-	 * and that we aren't recursively invoked.
-	 */
-	if (p->state != GMON_PROF_ON)
-		return;
-	p->state = GMON_PROF_BUSY;
-	/*
-	 * check that frompcindex is a reasonable pc value.
-	 * for example:	signal catchers get called from the stack,
-	 *		not from text space.  too bad.
-	 */
-	frompc -= p->lowpc;
-	if (frompc > p->textsize)
-		goto done;
-
-#if (HASHFRACTION & (HASHFRACTION - 1)) == 0
-	if (p->hashfraction == HASHFRACTION)
-		frompcindex =
-		    &p->froms[frompc / (HASHFRACTION * sizeof(*p->froms))];
-	else
-#endif
-		frompcindex =
-		    &p->froms[frompc / (p->hashfraction * sizeof(*p->froms))];
-	toindex = *frompcindex;
-	if (toindex == 0) {
-		/*
-		 *	first time traversing this arc
-		 */
-		toindex = ++p->tos[0].link;
-		if (toindex >= p->tolimit)
-			/* halt further profiling */
-			goto overflow;
-
-		*frompcindex = toindex;
-		top = &p->tos[toindex];
-		top->selfpc = selfpc;
-		top->count = 1;
-		top->link = 0;
-		goto done;
-	}
-	top = &p->tos[toindex];
-	if (top->selfpc == selfpc) {
-		/*
-		 * arc at front of chain; usual case.
-		 */
-		top->count++;
-		goto done;
-	}
-	/*
-	 * have to go looking down chain for it.
-	 * top points to what we are looking at,
-	 * prevtop points to previous top.
-	 * we know it is not at the head of the chain.
-	 */
-	for (; /* goto done */; ) {
-		if (top->link == 0) {
-			/*
-			 * top is end of the chain and none of the chain
-			 * had top->selfpc == selfpc.
-			 * so we allocate a new tostruct
-			 * and link it to the head of the chain.
-			 */
-			toindex = ++p->tos[0].link;
-			if (toindex >= p->tolimit)
-				goto overflow;
-
-			top = &p->tos[toindex];
-			top->selfpc = selfpc;
-			top->count = 1;
-			top->link = *frompcindex;
-			*frompcindex = toindex;
-			goto done;
-		}
-		/*
-		 * otherwise, check the next arc on the chain.
-		 */
-		prevtop = top;
-		top = &p->tos[top->link];
-		if (top->selfpc == selfpc) {
-			/*
-			 * there it is.
-			 * increment its count
-			 * move it to the head of the chain.
-			 */
-			top->count++;
-			toindex = prevtop->link;
-			prevtop->link = top->link;
-			top->link = *frompcindex;
-			*frompcindex = toindex;
-			goto done;
-		}
-	}
-done:
-	p->state = GMON_PROF_ON;
-	return;
-overflow:
-	p->state = GMON_PROF_ERROR;
-	return;
-}
-
-/*
- * Actual definition of mcount function.  Defined in <machine/profile.h>,
- * which is included by <sys/gmon.h>
- */
-MCOUNT
-
diff --git a/winsup/cygwin/misc-std.sgml b/winsup/cygwin/misc-std.sgml
deleted file mode 100644
index 01ac231cd..000000000
--- a/winsup/cygwin/misc-std.sgml
+++ /dev/null
@@ -1,74 +0,0 @@
-<sect1 id="std-misc">
-<title>Compatibility with Miscellaneous Other Standards</title>
-
-<para>The following functions are compatible with miscellaneous other
-standards:</para>
-
-
-<sect2><title>Networking</title>
-
-<para>(Standardized by POSIX 1.g, which is probably still in draft?)</para>
-
-<para>accept, bind, connect, getdomainname, gethostbyaddr,
-gethostbyname, getpeername, getprotobyname, getprotobynumber,
-getservbyname, getservbyport, getsockname, getsockopt, herror, htonl,
-htons, inet_addr, inet_makeaddr, inet_netof, inet_ntoa, listen, ntohl,
-ntohs, rcmd, recv, recvfrom, rexec, rresvport, send, sendto,
-setsockopt, shutdown, socket, socketpair</para>
-
-<para>Of these networking calls, rexec, rcmd and rresvport are
-implemented in MS IP stack but may not be implemented in other
-vendors' stacks. </para>
-
-</sect2>
-
-<sect2><title>Other</title><para>
-
-chroot, closelog, cwait, dlclose, dlerror, dlfork, dlopen, dlsym,
-endgrent, ffs, fstatfs, ftime, get_osfhandle, getdtablesize, getgrent,
-gethostname, getitimer, getmntent, getpagesize, getpgid, getpwent,
-gettimeofday, grantpt, initgroups, ioctl, killpg, login, logout,
-lstat, mknod, memccpy, nice, openlog, pclose, popen, ptsname, putenv,
-random, readv, realpath, regfree, rexec, select, setegid setenv,
-seterrno, seteuid, setitimer, setmntent, setmode, setpassent, setpgrp,
-setpwent, settimeofday, sexecl, sexecle, sexeclp, sexeclpe, sexeclpe,
-sexecp, sexecv, sexecve, sexecvpe, sigpause, spawnl, spawnle, spawnlp,
-spawnlpe, spawnv, spawnve, spawnvp, spawnvpe, srandom, statfs,
-strsignal, strtosigno, swab, syslog, timezone, truncate, ttyslot,
-unlockpt, unsetenv, usleep, utimes, vfork, vhangup, wait3, wait4,
-wcscmp, wcslen, wprintf, writev
-
-</para></sect2>
-<sect2><title>Implementation Notes</title>
-
-<para> <function>initgroups</function> does nothing</para>
-
-<para> <function>chroot</function>, <function>mknod</function>,
-<function>settimeofday</function>, and <function>vhangup</function>
-always return -1 and sets errno to ENOSYS.</para>
-
-<para> <function>nice</function> allows Cygwin programs to alter their
-current runtime priority through the use of its incr argument.  Cygwin
-processes can be set to IDLE_PRIORITY_CLASS, NORMAL_PRIORITY_CLASS,
-HIGH_PRIORITY_CLASS, or REALTIME_PRIORITY_CLASS with the
-<function>nice</function> call.  NORMAL_PRIORITY_CLASS is the
-default.  If you pass a positive number to nice(), then the priority
-level will decrease by one (within the above list of priorities).  A
-negative number would make it increase by one.  It is not possible to
-change it by more than one at a time without making repeated calls.
-An increment above REALTIME_PRIORITY_CLASS results in the process
-staying at that priority.  Likewise, a decrement to
-IDLE_PRIORITY_CLASS has it stay at that priority.  Note that in the
-Win32 API, there are 32 priorities.  So currently we only give access
-to four of these through <function>nice</function>.</para>
-
-<para> <function>seteuid</function> and <function>setegid</function>
-always return 0 and set errno to
-ENOSYS.</para>
-
-<para><function>vfork</function> just calls
-<function>fork</function></para>
-
-</sect2>
-
-</sect1>
diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc
deleted file mode 100644
index 37ef3a49c..000000000
--- a/winsup/cygwin/miscfuncs.cc
+++ /dev/null
@@ -1,342 +0,0 @@
-/* miscfuncs.cc: misc funcs that don't belong anywhere else
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#define _WIN32_WINNT 0x400
-#include "winsup.h"
-#include "cygerrno.h"
-#include <sys/errno.h>
-#include <sys/uio.h>
-#include <assert.h>
-#include <limits.h>
-#include <winbase.h>
-#include <winnls.h>
-#include "cygthread.h"
-
-long tls_ix = -1;
-
-const char case_folded_lower[] NO_COPY = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32, '!', '"', '#', '$', '%', '&',  39, '(', ')', '*', '+', ',', '-', '.', '/',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?',
- '@', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
- 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '[',  92, ']', '^', '_',
- '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
- 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~', 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
-};
-
-const char case_folded_upper[] NO_COPY = {
-   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-  32, '!', '"', '#', '$', '%', '&',  39, '(', ')', '*', '+', ',', '-', '.', '/',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?',
- '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
- 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[',  92, ']', '^', '_',
- '`', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
- 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~', 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191,
- 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
- 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
-};
-
-const char isalpha_array[] NO_COPY = {
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,   0,   0,   0,   0,   0,
-   0,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
-};
-
-#define ch_case_eq(ch1, ch2) (cyg_tolower(ch1) == cyg_tolower(ch2))
-
-#if 0
-
-/* Return TRUE if two strings match up to length n */
-extern "C" int __stdcall
-strncasematch (const char *s1, const char *s2, size_t n)
-{
-  if (s1 == s2)
-    return 1;
-
-  n++;
-  while (--n && *s1)
-    {
-      if (!ch_case_eq (*s1, *s2))
-	return 0;
-      s1++; s2++;
-    }
-  return !n || *s2 == '\0';
-}
-
-/* Return TRUE if two strings match */
-extern "C" int __stdcall
-strcasematch (const char *s1, const char *s2)
-{
-  if (s1 == s2)
-    return 1;
-
-  while (*s1)
-    {
-      if (!ch_case_eq (*s1, *s2))
-	return 0;
-      s1++; s2++;
-    }
-  return *s2 == '\0';
-}
-#endif
-
-extern "C" char * __stdcall
-strcasestr (const char *searchee, const char *lookfor)
-{
-  if (*searchee == 0)
-    {
-      if (*lookfor)
-	return NULL;
-      return (char *) searchee;
-    }
-
-  while (*searchee)
-    {
-      int i = 0;
-      while (1)
-	{
-	  if (lookfor[i] == 0)
-	    return (char *) searchee;
-
-	  if (!ch_case_eq (lookfor[i], searchee[i]))
-	    break;
-	  lookfor++;
-	}
-      searchee++;
-    }
-
-  return NULL;
-}
-
-int __stdcall
-check_null_str (const char *name)
-{
-  if (name && !IsBadStringPtr (name, CYG_MAX_PATH))
-    return 0;
-
-  return EFAULT;
-}
-
-int __stdcall
-check_null_empty_str (const char *name)
-{
-  if (name && !IsBadStringPtr (name, CYG_MAX_PATH))
-    return !*name ? ENOENT : 0;
-
-  return EFAULT;
-}
-
-int __stdcall
-check_null_empty_str_errno (const char *name)
-{
-  int __err;
-  if ((__err = check_null_empty_str (name)))
-    set_errno (__err);
-  return __err;
-}
-
-int __stdcall
-check_null_str_errno (const char *name)
-{
-  int __err;
-  if ((__err = check_null_str (name)))
-    set_errno (__err);
-  return __err;
-}
-
-int __stdcall
-__check_null_invalid_struct (void *s, unsigned sz)
-{
-  if (s && !IsBadWritePtr (s, sz))
-    return 0;
-
-  return EFAULT;
-}
-
-int __stdcall
-__check_null_invalid_struct_errno (void *s, unsigned sz)
-{
-  int err;
-  if ((err = __check_null_invalid_struct (s, sz)))
-    set_errno (err);
-  return err;
-}
-
-int __stdcall
-__check_invalid_read_ptr (const void *s, unsigned sz)
-{
-  if (s && !IsBadReadPtr (s, sz))
-    return 0;
-  return EFAULT;
-}
-
-int __stdcall
-__check_invalid_read_ptr_errno (const void *s, unsigned sz)
-{
-  if (s && !IsBadReadPtr (s, sz))
-    return 0;
-  return set_errno (EFAULT);
-}
-
-ssize_t
-check_iovec_for_read (const struct iovec *iov, int iovcnt)
-{
-  if (iovcnt <= 0 || iovcnt > IOV_MAX)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  if (__check_invalid_read_ptr_errno (iov, iovcnt * sizeof (*iov)))
-    return -1;
-
-  size_t tot = 0;
-
-  while (iovcnt != 0)
-    {
-      if (iov->iov_len > SSIZE_MAX || (tot += iov->iov_len) > SSIZE_MAX)
-	{
-	  set_errno (EINVAL);
-	  return -1;
-	}
-
-      if (iov->iov_len
-	  && __check_null_invalid_struct_errno (iov->iov_base, iov->iov_len))
-	return -1;
-
-      iov += 1;
-      iovcnt -= 1;
-    }
-
-  assert (tot <= SSIZE_MAX);
-
-  return (ssize_t) tot;
-}
-
-ssize_t
-check_iovec_for_write (const struct iovec *iov, int iovcnt)
-{
-  if (iovcnt <= 0 || iovcnt > IOV_MAX)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  if (__check_invalid_read_ptr_errno (iov, iovcnt * sizeof (*iov)))
-    return -1;
-
-  size_t tot = 0;
-
-  while (iovcnt != 0)
-    {
-      if (iov->iov_len > SSIZE_MAX || (tot += iov->iov_len) > SSIZE_MAX)
-	{
-	  set_errno (EINVAL);
-	  return -1;
-	}
-
-      if (iov->iov_len
-	  && __check_invalid_read_ptr_errno (iov->iov_base, iov->iov_len))
-	return -1;
-
-      iov += 1;
-      iovcnt -= 1;
-    }
-
-  assert (tot <= SSIZE_MAX);
-
-  return (ssize_t) tot;
-}
-
-UINT
-get_cp ()
-{
-  return current_codepage == ansi_cp ? GetACP() : GetOEMCP();
-}
-
-int __stdcall
-sys_wcstombs (char *tgt, const WCHAR *src, int len)
-{
-  return WideCharToMultiByte (get_cp (), 0, src, -1, tgt, len, NULL, NULL);
-}
-
-int __stdcall
-sys_mbstowcs (WCHAR *tgt, const char *src, int len)
-{
-  return MultiByteToWideChar (get_cp (), 0, src, -1, tgt, len);
-}
-
-extern "C" int
-low_priority_sleep (DWORD secs)
-{
-  HANDLE thisthread = GetCurrentThread ();
-  int curr_prio = GetThreadPriority (thisthread);
-  bool staylow;
-  if (secs != INFINITE)
-    staylow = false;
-  else
-    {
-      secs = 0;
-      staylow = true;
-    }
-
-  if (!secs && wincap.has_switch_to_thread ())
-    {
-      for (int i = 0; i < 10; i++)
-	SwitchToThread ();
-    }
-  else
-    {
-      int new_prio;
-      if (GetCurrentThreadId () == cygthread::main_thread_id)
-	new_prio = THREAD_PRIORITY_LOWEST;
-      else
-	new_prio = GetThreadPriority (hMainThread);
-
-      if (curr_prio != new_prio)
-	/* Force any threads in normal priority to be scheduled */
-	SetThreadPriority (thisthread, new_prio);
-      Sleep (secs);
-
-      if (!staylow && curr_prio != new_prio)
-	SetThreadPriority (thisthread, curr_prio);
-    }
-
-  return curr_prio;
-}
diff --git a/winsup/cygwin/mkvers.sh b/winsup/cygwin/mkvers.sh
deleted file mode 100755
index 85d016b92..000000000
--- a/winsup/cygwin/mkvers.sh
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/bin/sh
-# mkvers.sh - Make version information for cygwin DLL
-#
-#   Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-#
-# This file is part of Cygwin.
-#
-# This software is a copyrighted work licensed under the terms of the
-# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-# details.
-
-exec 9> version.cc
-
-#
-# Arg 1 is the name of the version include file
-#
-incfile="$1"
-rcfile="$2"
-windres="$3"
-
-[ -r $incfile ] || {
-    echo "**** Couldn't open file '$incfile'.  Aborting."
-}
-
-#
-# Load the current date so we can work on individual fields
-#
-build_date=`date`
-set -$- $build_date
-#
-# Translate the month into a number
-#
-case "$2" in
-    Jan) m=01 ;;
-    Feb) m=02 ;;
-    Mar) m=03 ;;
-    Apr) m=04 ;;
-    May) m=05 ;;
-    Jun) m=06 ;;
-    Jul) m=07 ;;
-    Aug) m=08 ;;
-    Sep) m=09 ;;
-    Oct) m=10 ;;
-    Nov) m=11 ;;
-    Dec) m=12 ;;
-esac
-
-if [ "$3" -lt 10 ]; then
-    d=0$3
-else
-    d=$3
-fi
-hhmm="`echo $4 | sed 's/:..$//'`"
-#
-# Set date into YYYY-MM-DD HH:MM:SS format
-#
-builddate="${6-$5}-$m-$d $hhmm"
-
-set -$- ''
-
-#
-# Output the initial part of version.cc
-#
-cat <<EOF 1>&9
-#include "config.h"
-#include "cygwin_version.h"
-
-#define strval(x) #x
-#define str(x) strval(x)
-#define shared_data_version str(CYGWIN_VERSION_SHARED_DATA)
-
-const char *cygwin_version_strings =
-  "BEGIN_CYGWIN_VERSION_INFO\n"
-EOF
-
-#
-# Split version file into dir and filename components
-#
-dir=`dirname $incfile`
-fn=`basename $incfile`
-
-#
-# Look in the include file CVS directory for a CVS Tag file.  This file,
-# if it exists, will contain the name of the sticky tag associated with
-# the current build.  Save that for output later.
-#
-cvs_tag="`sed -e '/dontuse/d' -e 's%^.\(.*\)%\1%' $dir/CVS/Tag 2>/dev/null`"
-
-wv_cvs_tag="$cvs_tag"
-[ -n "$cvs_tag" ] && cvs_tag=" CVS tag"'
-'"$cvs_tag"
-
-#
-# Look in the source directory containing the include/cygwin/version.h
-# and set dir accordingly.
-dir=`echo $dir | sed -e 's%/include/cygwin.*$%%' -e 's%include/cygwin.*$%.%'`
-
-# Look in $dir for a a ".snapshot-date" file.  If one is found then this
-# information will be saved for output to the DLL.
-#
-if [ -r "$dir/.snapshot-date" ]; then
-    read snapshotdate < "$dir/.snapshot-date"
-    snapshot="snapshot date
-$snapshotdate"
-fi
-
-#
-# Scan the version.h file for strings that begin with CYGWIN_INFO or
-# CYGWIN_VERSION.  Perform crude parsing on the lines to get the values
-# associated with these values and then pipe it into a while loop which
-# outputs these values in C palatable format for inclusion in the DLL
-# with a '%% ' identifier that will introduce "interesting" strings.
-# These strings are strictly for use by a user to scan the DLL for
-# interesting information.
-#
-(sed -n -e 's%#define CYGWIN_INFO_\([A-Z_]*\)[ 	][ 	]*\([a-zA-Z0-9"][^/]*\).*%_\1\
-\2%p' -e 's%#define CYGWIN_VERSION_\([A-Z_]*\)[ 	][ 	]*\([a-zA-Z0-9"][^/]*\).*%_\1\
-\2%p' $incfile | sed -e 's/["\\]//g'  -e '/^_/y/ABCDEFGHIJKLMNOPQRSTUVWXYZ_/abcdefghijklmnopqrstuvwxyz /';
-echo ' build date'; echo $build_date; [ -n "$cvs_tag" ] && echo "$cvs_tag";\
-[ -n "$snapshot" ] && echo "$snapshot"
-) | while read var; do
-    read val
-cat <<EOF
-  "%%% Cygwin $var: $val\n"
-EOF
-done | tee /tmp/mkvers.$$ 1>&9
-
-trap "rm -f /tmp/mkvers.$$" 0 1 2 15
-
-if [ -n "$snapshotdate" ]; then
-  usedate="`echo $snapshotdate | sed 's/-\\(..:..[^-]*\\).*$/ \1SNP/'`"
-else
-  usedate="$builddate"
-fi
-
-#
-# Finally, output the shared ID and set up the cygwin_version structure
-# for use by Cygwin itself.
-#
-cat <<EOF 1>&9
-#ifdef DEBUGGING
-  "%%% Cygwin shared id: " CYGWIN_VERSION_DLL_IDENTIFIER "S" shared_data_version "-$builddate\n"
-#else
-  "%%% Cygwin shared id: " CYGWIN_VERSION_DLL_IDENTIFIER "S" shared_data_version "\n"
-#endif
-  "END_CYGWIN_VERSION_INFO\n\0";
-cygwin_version_info cygwin_version =
-{
-  CYGWIN_VERSION_API_MAJOR, CYGWIN_VERSION_API_MINOR,
-  CYGWIN_VERSION_DLL_MAJOR, CYGWIN_VERSION_DLL_MINOR,
-  CYGWIN_VERSION_SHARED_DATA,
-  CYGWIN_VERSION_MOUNT_REGISTRY,
-  "$usedate",
-#ifdef DEBUGGING
-  CYGWIN_VERSION_DLL_IDENTIFIER "S" shared_data_version "-$builddate"
-#else
-  CYGWIN_VERSION_DLL_IDENTIFIER "S" shared_data_version
-#endif
-};
-EOF
-
-#
-# Generate winver.o using cygwin/version.h information.
-# Turn the cygwin major number from some large number to something like 1.1.0.
-#
-eval `sed -n 's/^.*dll \(m[ai][jn]or\): \([0-9]*\)[^0-9]*$/\1=\2/p' /tmp/mkvers.$$`
-cygverhigh=`expr $major / 1000`
-cygverlow=`expr $major % 1000`
-cygwin_ver="$cygverhigh.$cygverlow.$minor"
-if [ -n "$cvs_tag" ]; then
-    cvs_tag="`echo $wv_cvs_tag | sed -e 's/-branch.*//'`"
-    cygwin_ver="$cygwin_ver-$cvs_tag"
-fi
-
-echo "Version $cygwin_ver"
-set -$- $builddate
-$windres --include-dir $dir/../w32api/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o
diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc
deleted file mode 100644
index 7042048f3..000000000
--- a/winsup/cygwin/mmap.cc
+++ /dev/null
@@ -1,1101 +0,0 @@
-/* mmap.cc
-
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <sys/mman.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-#include "pinfo.h"
-#include "sys/cygwin.h"
-
-#define PAGE_CNT(bytes) howmany((bytes),getpagesize())
-
-#define PGBITS		(sizeof (DWORD)*8)
-#define MAPSIZE(pages)	howmany ((pages), PGBITS)
-
-#define MAP_SET(n)	(page_map_[(n)/PGBITS] |= (1L << ((n) % PGBITS)))
-#define MAP_CLR(n)	(page_map_[(n)/PGBITS] &= ~(1L << ((n) % PGBITS)))
-#define MAP_ISSET(n)	(page_map_[(n)/PGBITS] & (1L << ((n) % PGBITS)))
-
-/* Used for accessing the page file (anonymous mmaps). */
-static fhandler_disk_file fh_paging_file;
-
-/* Class structure used to keep a record of all current mmap areas
-   in a process.  Needed for bookkeeping all mmaps in a process and
-   for duplicating all mmaps after fork() since mmaps are not propagated
-   to child processes by Windows.  All information must be duplicated
-   by hand, see fixup_mmaps_after_fork().
-
-   The class structure:
-
-   One member of class map per process, global variable mmapped_areas.
-   Contains a dynamic class list array.  Each list entry represents all
-   mapping to a file, keyed by file descriptor and file name hash.
-   Each list entry contains a dynamic class mmap_record array.  Each
-   mmap_record represents exactly one mapping.  For each mapping, there's
-   an additional so called `page_map'.  It's an array of bits, one bit
-   per mapped memory page.  The bit is set if the page is accessible,
-   unset otherwise. */
-
-class mmap_record
-{
-  private:
-    int fdesc_;
-    HANDLE mapping_handle_;
-    DWORD access_mode_;
-    _off64_t offset_;
-    DWORD size_to_map_;
-    caddr_t base_address_;
-    DWORD *page_map_;
-    device dev;
-
-  public:
-    mmap_record (int fd, HANDLE h, DWORD ac, _off64_t o, DWORD s, caddr_t b) :
-       fdesc_ (fd),
-       mapping_handle_ (h),
-       access_mode_ (ac),
-       offset_ (o),
-       size_to_map_ (s),
-       base_address_ (b),
-       page_map_ (NULL)
-      {
-	dev.devn = 0;
-	if (fd >= 0 && !cygheap->fdtab.not_open (fd))
-	  dev = cygheap->fdtab[fd]->dev ();
-      }
-
-    int get_fd () const { return fdesc_; }
-    HANDLE get_handle () const { return mapping_handle_; }
-    device& get_device () { return dev; }
-    DWORD get_access () const { return access_mode_; }
-    DWORD get_offset () const { return offset_; }
-    DWORD get_size () const { return size_to_map_; }
-    caddr_t get_address () const { return base_address_; }
-
-    bool alloc_page_map (_off64_t off, DWORD len);
-    void free_page_map () { if (page_map_) cfree (page_map_); }
-    void fixup_page_map (void);
-
-    DWORD find_unused_pages (DWORD pages);
-    _off64_t map_pages (_off64_t off, DWORD len);
-    bool unmap_pages (caddr_t addr, DWORD len);
-    int access (caddr_t address);
-
-    fhandler_base *alloc_fh ();
-    void free_fh (fhandler_base *fh);
-};
-
-class list
-{
-  private:
-    mmap_record *recs;
-    int nrecs, maxrecs;
-    int fd;
-    DWORD hash;
-
-  public:
-    int get_fd () const { return fd; }
-    DWORD get_hash () const { return hash; }
-    mmap_record *get_record (int i) { return i >= nrecs ? NULL : recs + i; }
-
-    void set (int nfd);
-    mmap_record *add_record (mmap_record r, _off64_t off, DWORD len);
-    bool del_record (int i);
-    void free_recs () { if (recs) cfree (recs); }
-    mmap_record *search_record (_off64_t off, DWORD len);
-    long search_record (caddr_t addr, DWORD len, caddr_t &m_addr, DWORD &m_len,
-		long start);
-};
-
-class map
-{
-  private:
-    list *lists;
-    int nlists, maxlists;
-
-  public:
-    list *get_list (int i) { return i >= nlists ? NULL : lists + i; }
-    list *get_list_by_fd (int fd);
-    list *add_list (int fd);
-    void del_list (int i);
-};
-
-/* This is the global map structure pointer.  It's allocated once on the
-   first call to mmap64(). */
-static map *mmapped_areas;
-
-DWORD
-mmap_record::find_unused_pages (DWORD pages)
-{
-  DWORD mapped_pages = PAGE_CNT (size_to_map_);
-  DWORD start;
-
-  if (pages > mapped_pages)
-    return (DWORD)-1;
-  for (start = 0; start <= mapped_pages - pages; ++start)
-    if (!MAP_ISSET (start))
-      {
-	DWORD cnt;
-	for (cnt = 0; cnt < pages; ++cnt)
-	  if (MAP_ISSET (start + cnt))
-	    break;
-	if (cnt >= pages)
-	  return start;
-      }
-  return (DWORD)-1;
-}
-
-bool
-mmap_record::alloc_page_map (_off64_t off, DWORD len)
-{
-  /* Allocate one bit per page */
-  if (!(page_map_ = (DWORD *) ccalloc (HEAP_MMAP,
-				       MAPSIZE (PAGE_CNT (size_to_map_)),
-				       sizeof (DWORD))))
-    return false;
-
-  if (wincap.virtual_protect_works_on_shared_pages ())
-    {
-      DWORD old_prot;
-
-      off -= offset_;
-      len = PAGE_CNT (len) * getpagesize ();
-      if (off > 0 &&
-	  !VirtualProtect (base_address_, off, PAGE_NOACCESS, &old_prot))
-	syscall_printf ("VirtualProtect(%x,%D) failed: %E", base_address_, off);
-      if (off + len < size_to_map_
-	  && !VirtualProtect (base_address_ + off + len,
-			      size_to_map_ - len - off,
-			      PAGE_NOACCESS, &old_prot))
-	syscall_printf ("VirtualProtect(%x,%D) failed: %E",
-			base_address_ + off + len, size_to_map_ - len - off);
-      off /= getpagesize ();
-      len /= getpagesize ();
-      while (len-- > 0)
-	MAP_SET (off + len);
-    }
-  return true;
-}
-
-_off64_t
-mmap_record::map_pages (_off64_t off, DWORD len)
-{
-  /* Used ONLY if this mapping matches into the chunk of another already
-     performed mapping in a special case of MAP_ANON|MAP_PRIVATE.
-
-     Otherwise it's job is now done by alloc_page_map(). */
-  DWORD prot, old_prot;
-  switch (access_mode_)
-    {
-    case FILE_MAP_WRITE:
-      prot = PAGE_READWRITE;
-      break;
-    case FILE_MAP_READ:
-      prot = PAGE_READONLY;
-      break;
-    default:
-      prot = PAGE_WRITECOPY;
-      break;
-    }
-
-  debug_printf ("map_pages (fd=%d, off=%D, len=%u)", fdesc_, off, len);
-  len = PAGE_CNT (len);
-
-  if ((off = find_unused_pages (len)) == (DWORD)-1)
-    return 0L;
-  if (wincap.virtual_protect_works_on_shared_pages ()
-      && !VirtualProtect (base_address_ + off * getpagesize (),
-			  len * getpagesize (), prot, &old_prot))
-    {
-      __seterrno ();
-      return (_off64_t)-1;
-    }
-
-  while (len-- > 0)
-    MAP_SET (off + len);
-  return off * getpagesize ();
-}
-
-bool
-mmap_record::unmap_pages (caddr_t addr, DWORD len)
-{
-  DWORD old_prot;
-  DWORD off = addr - base_address_;
-  off /= getpagesize ();
-  len = PAGE_CNT (len);
-  if (wincap.virtual_protect_works_on_shared_pages ()
-      && !VirtualProtect (base_address_ + off * getpagesize (),
-			  len * getpagesize (), PAGE_NOACCESS, &old_prot))
-    syscall_printf ("-1 = unmap_pages (): %E");
-
-  for (; len-- > 0; ++off)
-    MAP_CLR (off);
-  /* Return TRUE if all pages are free'd which may result in unmapping
-     the whole chunk. */
-  for (len = MAPSIZE (PAGE_CNT (size_to_map_)); len > 0; )
-    if (page_map_[--len])
-      return false;
-  return true;
-}
-
-void
-mmap_record::fixup_page_map ()
-{
-  if (!wincap.virtual_protect_works_on_shared_pages ())
-    return;
-
-  DWORD prot, old_prot;
-  switch (access_mode_)
-    {
-    case FILE_MAP_WRITE:
-      prot = PAGE_READWRITE;
-      break;
-    case FILE_MAP_READ:
-      prot = PAGE_READONLY;
-      break;
-    default:
-      prot = PAGE_WRITECOPY;
-      break;
-    }
-
-  for (DWORD off = PAGE_CNT (size_to_map_); off > 0; --off)
-    VirtualProtect (base_address_ + off * getpagesize (), getpagesize (),
-		    MAP_ISSET (off - 1) ? prot : PAGE_NOACCESS, &old_prot);
-}
-
-int
-mmap_record::access (caddr_t address)
-{
-  if (address < base_address_ || address >= base_address_ + size_to_map_)
-    return 0;
-  DWORD off = (address - base_address_) / getpagesize ();
-  return MAP_ISSET (off);
-}
-
-fhandler_base *
-mmap_record::alloc_fh ()
-{
-  if (get_fd () == -1)
-    {
-      fh_paging_file.set_io_handle (INVALID_HANDLE_VALUE);
-      return &fh_paging_file;
-    }
-
-  static path_conv pc; // should be thread safe - CGF
-  /* The file descriptor could have been closed or, even
-     worse, could have been reused for another file before
-     the call to fork(). This requires creating a fhandler
-     of the correct type to be sure to call the method of the
-     correct class. */
-  return build_fh_dev (get_device ());
-}
-
-void
-mmap_record::free_fh (fhandler_base *fh)
-{
-  if (get_fd () != -1)
-    cfree (fh);
-}
-
-mmap_record *
-list::add_record (mmap_record r, _off64_t off, DWORD len)
-{
-  if (nrecs == maxrecs)
-    {
-      mmap_record *new_recs;
-      if (maxrecs == 0)
-	new_recs = (mmap_record *)
-			cmalloc (HEAP_MMAP, 5 * sizeof (mmap_record));
-      else
-	new_recs = (mmap_record *)
-			crealloc (recs, (maxrecs + 5) * sizeof (mmap_record));
-      if (!new_recs)
-	return NULL;
-      maxrecs += 5;
-      recs = new_recs;
-    }
-  recs[nrecs] = r;
-  if (!recs[nrecs].alloc_page_map (off, len))
-    return NULL;
-  return recs + nrecs++;
-}
-
-/* Used in mmap() */
-mmap_record *
-list::search_record (_off64_t off, DWORD len)
-{
-  if (fd == -1 && !off)
-    {
-      len = PAGE_CNT (len);
-      for (int i = 0; i < nrecs; ++i)
-	if (recs[i].find_unused_pages (len) != (DWORD)-1)
-	  return recs + i;
-    }
-  else
-    {
-      for (int i = 0; i < nrecs; ++i)
-	if (off >= recs[i].get_offset ()
-	    && off + len <= recs[i].get_offset ()
-			 + (PAGE_CNT (recs[i].get_size ()) * getpagesize ()))
-	  return recs + i;
-    }
-  return NULL;
-}
-
-/* Used in munmap() */
-long
-list::search_record (caddr_t addr, DWORD len, caddr_t &m_addr, DWORD &m_len,
-	     _off_t start)
-{
-  caddr_t low, high;
-
-  for (int i = start + 1; i < nrecs; ++i)
-    {
-      low = (addr >= recs[i].get_address ()) ? addr : recs[i].get_address ();
-      high = recs[i].get_address ()
-	     + (PAGE_CNT (recs[i].get_size ()) * getpagesize ());
-      high = (addr + len < high) ? addr + len : high;
-      if (low < high)
-	{
-	  m_addr = low;
-	  m_len = high - low;
-	  return i;
-	}
-    }
-  return -1;
-}
-
-void
-list::set (int nfd)
-{
-  if ((fd = nfd) != -1)
-    hash = cygheap->fdtab[fd]->get_namehash ();
-  nrecs = maxrecs = 0;
-  recs = NULL;
-}
-
-bool
-list::del_record (int i)
-{
-  if (i < nrecs)
-    {
-      recs[i].free_page_map ();
-      for (; i < nrecs - 1; i++)
-	recs[i] = recs[i + 1];
-      nrecs--;
-    }
-  /* Return true if the list is empty which allows the caller to remove
-     this list from the list array. */
-  return !nrecs;
-}
-
-list *
-map::get_list_by_fd (int fd)
-{
-  int i;
-  for (i=0; i<nlists; i++)
-    /* The fd isn't sufficient since it could already be the fd of another
-       file.  So we use the name hash value to identify the file unless
-       it's an anonymous mapping in which case the fd (-1) is sufficient. */
-    if ((fd == -1 && lists[i].get_fd () == -1)
-	|| (fd != -1
-	    && lists[i].get_hash () == cygheap->fdtab[fd]->get_namehash ()))
-      return lists + i;
-  return 0;
-}
-
-list *
-map::add_list (int fd)
-{
-  if (nlists == maxlists)
-    {
-      list *new_lists;
-      if (maxlists == 0)
-	new_lists = (list *) cmalloc (HEAP_MMAP, 5 * sizeof (list));
-      else
-	new_lists = (list *) crealloc (lists, (maxlists + 5) * sizeof (list));
-      if (!new_lists)
-	return NULL;
-      maxlists += 5;
-      lists = new_lists;
-    }
-  lists[nlists].set (fd);
-  return lists + nlists++;
-}
-
-void
-map::del_list (int i)
-{
-  if (i < nlists)
-    {
-      lists[i].free_recs ();
-      for (; i < nlists - 1; i++)
-	lists[i] = lists[i + 1];
-      nlists--;
-    }
-}
-
-extern "C" void *
-mmap64 (void *addr, size_t len, int prot, int flags, int fd, _off64_t off)
-{
-  syscall_printf ("addr %x, len %u, prot %x, flags %x, fd %d, off %D",
-		  addr, len, prot, flags, fd, off);
-
-  static DWORD granularity = getshmlba ();
-
-  /* Error conditions according to SUSv2 */
-  if (off % getpagesize ()
-      || (!(flags & MAP_SHARED) && !(flags & MAP_PRIVATE))
-      || ((flags & MAP_SHARED) && (flags & MAP_PRIVATE))
-      || ((flags & MAP_FIXED) && ((DWORD)addr % getpagesize ()))
-      || !len)
-    {
-      set_errno (EINVAL);
-      syscall_printf ("-1 = mmap(): EINVAL");
-      return MAP_FAILED;
-    }
-
-  SetResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
-
-  if (mmapped_areas == NULL)
-    {
-      /* First mmap call, create STL map */
-      mmapped_areas = (map *) ccalloc (HEAP_MMAP, 1, sizeof (map));
-      if (mmapped_areas == NULL)
-	{
-	  set_errno (ENOMEM);
-	  syscall_printf ("-1 = mmap(): ENOMEM");
-	  ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
-	  return MAP_FAILED;
-	}
-    }
-
-  if (flags & MAP_ANONYMOUS)
-    fd = -1;
-
-  /* Map always in multipliers of `granularity'-sized chunks. */
-  _off64_t gran_off = off & ~(granularity - 1);
-  DWORD gran_len = howmany (off + len, granularity) * granularity - gran_off;
-
-  fhandler_base *fh;
-
-  if (fd != -1)
-    {
-      /* Ensure that fd is open */
-      cygheap_fdget cfd (fd);
-      if (cfd < 0)
-	{
-	  syscall_printf ("-1 = mmap(): EBADF");
-	  ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
-	  return MAP_FAILED;
-	}
-      fh = cfd;
-      if (fh->get_device () == FH_FS)
-	{
-	  DWORD high;
-	  DWORD low = GetFileSize (fh->get_handle (), &high);
-	  _off64_t fsiz = ((_off64_t)high << 32) + low;
-	  /* Don't allow mappings beginning beyond EOF since Windows can't
-	     handle that POSIX like.  FIXME: Still looking for a good idea
-	     to allow that nevertheless. */
-	  if (gran_off >= fsiz)
-	    {
-	      set_errno (ENXIO);
-	      ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK,
-				   "mmap");
-	      return MAP_FAILED;
-	    }
-	  fsiz -= gran_off;
-	  if (gran_len > fsiz)
-	    gran_len = fsiz;
-	}
-      else if (fh->get_device () == FH_ZERO)
-	/* mmap /dev/zero is like MAP_ANONYMOUS. */
-	fd = -1;
-    }
-  if (fd == -1)
-    {
-      fh_paging_file.set_io_handle (INVALID_HANDLE_VALUE);
-      fh = &fh_paging_file;
-    }
-
-  list *map_list = mmapped_areas->get_list_by_fd (fd);
-
-  /* First check if this mapping matches into the chunk of another
-     already performed mapping. Only valid for MAP_ANON in a special
-     case of MAP_PRIVATE. */
-  if (map_list && fd == -1 && off == 0 && !(flags & MAP_FIXED))
-    {
-      mmap_record *rec;
-      if ((rec = map_list->search_record (off, len)) != NULL)
-	{
-	  if ((off = rec->map_pages (off, len)) == (_off64_t)-1)
-	    {
-	      syscall_printf ("-1 = mmap()");
-	      ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK|WRITE_LOCK, "mmap");
-	      return MAP_FAILED;
-	    }
-	  caddr_t ret = rec->get_address () + off;
-	  syscall_printf ("%x = mmap() succeeded", ret);
-	  ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
-	  return ret;
-	}
-    }
-
-  DWORD access = (prot & PROT_WRITE) ? FILE_MAP_WRITE : FILE_MAP_READ;
-  /* copy-on-write doesn't work at all on 9x using anonymous maps.
-     Workaround: Anonymous mappings always use normal READ or WRITE
-		 access and don't use named file mapping.
-     copy-on-write doesn't also work properly on 9x with real files.
-     While the changes are not propagated to the file, they are
-     visible to other processes sharing the same file mapping object.
-     Workaround: Don't use named file mapping.  That should work since
-		 sharing file mappings only works reliable using named
-		 file mapping on 9x.
-  */
-  if ((flags & MAP_PRIVATE)
-      && (wincap.has_working_copy_on_write () || fd != -1))
-    access = FILE_MAP_COPY;
-
-  caddr_t base = (caddr_t)addr;
-  /* This shifts the base address to the next lower 64K boundary.
-     The offset is re-added when evaluating the return value. */
-  if (base)
-    base -= off - gran_off;
-
-  HANDLE h = fh->mmap (&base, gran_len, access, flags, gran_off);
-
-  if (h == INVALID_HANDLE_VALUE)
-    {
-      ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
-      return MAP_FAILED;
-    }
-
-  /* At this point we should have a successfully mmapped area.
-     Now it's time for bookkeeping stuff. */
-  if (fd == -1)
-    gran_len = PAGE_CNT (gran_len) * getpagesize ();
-  mmap_record mmap_rec (fd, h, access, gran_off, gran_len, base);
-
-  /* Get list of mmapped areas for this fd, create a new one if
-     one does not exist yet.
-  */
-  if (!map_list)
-    {
-      /* Create a new one */
-      map_list = mmapped_areas->add_list (fd);
-      if (!map_list)
-	{
-	  fh->munmap (h, base, gran_len);
-	  set_errno (ENOMEM);
-	  syscall_printf ("-1 = mmap(): ENOMEM");
-	  ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
-	  return MAP_FAILED;
-	}
-  }
-
-  /* Insert into the list */
-  mmap_record *rec = map_list->add_record (mmap_rec, off,
-					   len > gran_len ? gran_len : len);
-  if (!rec)
-    {
-      fh->munmap (h, base, gran_len);
-      set_errno (ENOMEM);
-      syscall_printf ("-1 = mmap(): ENOMEM");
-      ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
-      return MAP_FAILED;
-    }
-
-  caddr_t ret = rec->get_address () + (off - gran_off);
-  syscall_printf ("%x = mmap() succeeded", ret);
-  ReleaseResourceLock (LOCK_MMAP_LIST, READ_LOCK | WRITE_LOCK, "mmap");
-  return ret;
-}
-
-extern "C" void *
-mmap (void *addr, size_t len, int prot, int flags, int fd, _off_t off)
-{
-  return mmap64 (addr, len, prot, flags, fd, (_off64_t)off);
-}
-
-/* munmap () removes all mmapped pages between addr and addr+len. */
-
-extern "C" int
-munmap (void *addr, size_t len)
-{
-  syscall_printf ("munmap (addr %x, len %u)", addr, len);
-
-  /* Error conditions according to SUSv3 */
-  if (!addr || ((DWORD)addr % getpagesize ()) || !len
-      || IsBadReadPtr (addr, len))
-    {
-      set_errno (EINVAL);
-      syscall_printf ("-1 = munmap(): Invalid parameters");
-      return -1;
-    }
-
-  SetResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "munmap");
-  if (mmapped_areas == NULL)
-    {
-      syscall_printf ("-1 = munmap(): mmapped_areas == NULL");
-      ReleaseResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "munmap");
-      return 0;
-    }
-
-  /* Iterate through the map, unmap pages between addr and addr+len
-     in all maps. */
-  list *map_list;
-  for (int list_idx = 0;
-       (map_list = mmapped_areas->get_list (list_idx));
-       ++list_idx)
-    {
-      long record_idx = -1;
-      caddr_t u_addr;
-      DWORD u_len;
-
-      while ((record_idx = map_list->search_record((caddr_t)addr, len, u_addr,
-						   u_len, record_idx)) >= 0)
-	{
-	  mmap_record *rec = map_list->get_record (record_idx);
-	  if (rec->unmap_pages (u_addr, u_len))
-	    {
-	      /* The whole record has been unmapped, so we now actually
-		 unmap it from the system in full length... */
-	      fhandler_base *fh = rec->alloc_fh ();
-	      fh->munmap (rec->get_handle (),
-			  rec->get_address (),
-			  rec->get_size ());
-	      rec->free_fh (fh);
-
-	      /* ...and delete the record. */
-	      if (map_list->del_record (record_idx--))
-		{
-		  /* Yay, the last record has been removed from the list,
-		     we can remove the list now, too. */
-		  mmapped_areas->del_list (list_idx--);
-		  break;
-		}
-	    }
-	}
-    }
-
-  ReleaseResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "munmap");
-  syscall_printf ("0 = munmap(): %x", addr);
-  return 0;
-}
-
-/* Sync file with memory. Ignore flags for now. */
-
-extern "C" int
-msync (void *addr, size_t len, int flags)
-{
-  syscall_printf ("addr = %x, len = %u, flags = %x",
-		  addr, len, flags);
-
-  /* However, check flags for validity. */
-  if ((flags & ~(MS_ASYNC | MS_SYNC | MS_INVALIDATE))
-      || ((flags & MS_ASYNC) && (flags & MS_SYNC)))
-    {
-      syscall_printf ("-1 = msync(): Invalid flags");
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  SetResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "msync");
-  /* Check if a mmap'ed area was ever created */
-  if (mmapped_areas == NULL)
-    {
-      syscall_printf ("-1 = msync(): mmapped_areas == NULL");
-      set_errno (EINVAL);
-      ReleaseResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "msync");
-      return -1;
-    }
-
-  /* Iterate through the map, looking for the mmapped area.
-     Error if not found. */
-
-  list *map_list;
-  for (int list_idx = 0;
-       (map_list = mmapped_areas->get_list (list_idx));
-       ++list_idx)
-    {
-      mmap_record *rec;
-      for (int record_idx = 0;
-	   (rec = map_list->get_record (record_idx));
-	   ++record_idx)
-	{
-	  if (rec->access ((caddr_t)addr))
-	    {
-	      /* Check whole area given by len. */
-	      for (DWORD i = getpagesize (); i < len; ++i)
-		if (!rec->access ((caddr_t)addr + i))
-		  goto invalid_address_range;
-	      fhandler_base *fh = rec->alloc_fh ();
-	      int ret = fh->msync (rec->get_handle (), (caddr_t)addr, len,
-				   flags);
-	      rec->free_fh (fh);
-
-	      if (ret)
-		syscall_printf ("%d = msync(): %E", ret);
-	      else
-		syscall_printf ("0 = msync()");
-
-	      ReleaseResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK,
-				   "msync");
-	      return 0;
-	    }
-	}
-    }
-
-invalid_address_range:
-  /* SUSv2: Return code if indicated memory was not mapped is ENOMEM. */
-  set_errno (ENOMEM);
-  syscall_printf ("-1 = msync(): ENOMEM");
-
-  ReleaseResourceLock (LOCK_MMAP_LIST, WRITE_LOCK | READ_LOCK, "msync");
-  return -1;
-}
-
-/* Set memory protection */
-
-extern "C" int
-mprotect (void *addr, size_t len, int prot)
-{
-  DWORD old_prot;
-  DWORD new_prot = 0;
-
-  syscall_printf ("mprotect (addr %x, len %u, prot %x)", addr, len, prot);
-
-  if (!wincap.virtual_protect_works_on_shared_pages ()
-      && addr >= (caddr_t)0x80000000 && addr <= (caddr_t)0xBFFFFFFF)
-    {
-      syscall_printf ("0 = mprotect (9x: No VirtualProtect on shared memory)");
-      return 0;
-    }
-
-  switch (prot)
-    {
-      case PROT_READ | PROT_WRITE | PROT_EXEC:
-      case PROT_WRITE | PROT_EXEC:
-	new_prot = PAGE_EXECUTE_READWRITE;
-	break;
-      case PROT_READ | PROT_WRITE:
-      case PROT_WRITE:
-	new_prot = PAGE_READWRITE;
-	break;
-      case PROT_READ | PROT_EXEC:
-	new_prot = PAGE_EXECUTE_READ;
-	break;
-      case PROT_READ:
-	new_prot = PAGE_READONLY;
-	break;
-      case PROT_EXEC:
-	new_prot = PAGE_EXECUTE;
-	break;
-      case PROT_NONE:
-	new_prot = PAGE_NOACCESS;
-	break;
-      default:
-	syscall_printf ("-1 = mprotect (): invalid prot value");
-	set_errno (EINVAL);
-	return -1;
-     }
-
-  if (VirtualProtect (addr, len, new_prot, &old_prot) == 0)
-    {
-      __seterrno ();
-      syscall_printf ("-1 = mprotect (): %E");
-      return -1;
-    }
-
-  syscall_printf ("0 = mprotect ()");
-  return 0;
-}
-
-/*
- * Base implementation:
- *
- * `mmap' returns ENODEV as documented in SUSv2.
- * In contrast to the global function implementation, the member function
- * `mmap' has to return the mapped base address in `addr' and the handle to
- * the mapping object as return value. In case of failure, the fhandler
- * mmap has to close that handle by itself and return INVALID_HANDLE_VALUE.
- *
- * `munmap' and `msync' get the handle to the mapping object as first parameter
- * additionally.
-*/
-HANDLE
-fhandler_base::mmap (caddr_t *addr, size_t len, DWORD access,
-		     int flags, _off64_t off)
-{
-  set_errno (ENODEV);
-  return INVALID_HANDLE_VALUE;
-}
-
-int
-fhandler_base::munmap (HANDLE h, caddr_t addr, size_t len)
-{
-  set_errno (ENODEV);
-  return -1;
-}
-
-int
-fhandler_base::msync (HANDLE h, caddr_t addr, size_t len, int flags)
-{
-  set_errno (ENODEV);
-  return -1;
-}
-
-bool
-fhandler_base::fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
-				      DWORD size, void *address)
-{
-  set_errno (ENODEV);
-  return -1;
-}
-
-/* Implementation for disk files. */
-HANDLE
-fhandler_disk_file::mmap (caddr_t *addr, size_t len, DWORD access,
-			  int flags, _off64_t off)
-{
-  DWORD protect;
-
-  switch (access)
-    {
-      case FILE_MAP_WRITE:
-	protect = PAGE_READWRITE;
-	break;
-      case FILE_MAP_READ:
-	protect = PAGE_READONLY;
-	break;
-      default:
-	protect = PAGE_WRITECOPY;
-	break;
-    }
-
-  HANDLE h;
-
-  /* On 9x/ME try first to open the mapping by name when opening a
-     shared file object. This is needed since 9x/ME only shares
-     objects between processes by name. What a mess... */
-  if (wincap.share_mmaps_only_by_name ()
-      && get_handle () != INVALID_HANDLE_VALUE
-      && !(access & FILE_MAP_COPY))
-    {
-      /* Grrr, the whole stuff is just needed to try to get a reliable
-	 mapping of the same file. Even that uprising isn't bullet
-	 proof but it does it's best... */
-      char namebuf[CYG_MAX_PATH];
-      cygwin_conv_to_full_posix_path (get_name (), namebuf);
-      for (int i = strlen (namebuf) - 1; i >= 0; --i)
-	namebuf[i] = cyg_tolower (namebuf [i]);
-
-      debug_printf ("named sharing");
-      if (!(h = OpenFileMapping (access, TRUE, namebuf)))
-	h = CreateFileMapping (get_handle (), &sec_none, protect, 0, 0, namebuf);
-    }
-  else
-    h = CreateFileMapping (get_handle (), &sec_none, protect, 0,
-			   get_handle () == INVALID_HANDLE_VALUE ? len : 0,
-			   NULL);
-  if (!h)
-    {
-      __seterrno ();
-      syscall_printf ("-1 = mmap(): CreateFileMapping failed with %E");
-      return INVALID_HANDLE_VALUE;
-    }
-
-  DWORD high = off >> 32, low = off & UINT32_MAX;
-  void *base = NULL;
-  /* If a non-zero address is given, try mapping using the given address first.
-     If it fails and flags is not MAP_FIXED, try again with NULL address. */
-  if (*addr)
-    base = MapViewOfFileEx (h, access, high, low, len, *addr);
-  if (!base && !(flags & MAP_FIXED))
-    base = MapViewOfFileEx (h, access, high, low, len, NULL);
-  debug_printf ("%x = MapViewOfFileEx (h:%x, access:%x, 0, off:%D, "
-		"len:%u, addr:%x)", base, h, access, off, len, *addr);
-  if (!base || ((flags & MAP_FIXED) && base != *addr))
-    {
-      if (!base)
-	{
-	  __seterrno ();
-	  syscall_printf ("-1 = mmap(): MapViewOfFileEx failed with %E");
-	}
-      else
-	{
-	  set_errno (EINVAL);
-	  syscall_printf ("-1 = mmap(): address shift with MAP_FIXED given");
-	}
-      CloseHandle (h);
-      return INVALID_HANDLE_VALUE;
-    }
-
-  *addr = (caddr_t) base;
-  return h;
-}
-
-int
-fhandler_disk_file::munmap (HANDLE h, caddr_t addr, size_t len)
-{
-  UnmapViewOfFile (addr);
-  CloseHandle (h);
-  return 0;
-}
-
-int
-fhandler_disk_file::msync (HANDLE h, caddr_t addr, size_t len, int flags)
-{
-  if (FlushViewOfFile (addr, len) == 0)
-    {
-      __seterrno ();
-      return -1;
-    }
-  return 0;
-}
-
-bool
-fhandler_disk_file::fixup_mmap_after_fork (HANDLE h, DWORD access, DWORD offset,
-					   DWORD size, void *address)
-{
-  /* Re-create the MapViewOfFileEx call */
-  void *base = MapViewOfFileEx (h, access, 0, offset, size, address);
-  if (base != address)
-    {
-      MEMORY_BASIC_INFORMATION m;
-      (void) VirtualQuery (address, &m, sizeof (m));
-      system_printf ("requested %p != %p mem alloc base %p, state %p, size %d, %E",
-		     address, base, m.AllocationBase, m.State, m.RegionSize);
-    }
-  return base == address;
-}
-
-/*
- * Call to re-create all the file mappings in a forked
- * child. Called from the child in initialization. At this
- * point we are passed a valid mmapped_areas map, and all the
- * HANDLE's are valid for the child, but none of the
- * mapped areas are in our address space. We need to iterate
- * through the map, doing the MapViewOfFile calls.
- */
-
-int __stdcall
-fixup_mmaps_after_fork (HANDLE parent)
-{
-
-  debug_printf ("recreate_mmaps_after_fork, mmapped_areas %p", mmapped_areas);
-
-  /* Check if a mmapped area was ever created */
-  if (mmapped_areas == NULL)
-    return 0;
-
-  /* Iterate through the map */
-  list *map_list;
-  for (int list_idx = 0;
-       (map_list = mmapped_areas->get_list (list_idx));
-       ++list_idx)
-    {
-      mmap_record *rec;
-      for (int record_idx = 0;
-	   (rec = map_list->get_record (record_idx));
-	   ++record_idx)
-	{
-
-	  debug_printf ("fd %d, h %x, access %x, offset %D, size %u, address %p",
-	      rec->get_fd (), rec->get_handle (), rec->get_access (),
-	      rec->get_offset (), rec->get_size (), rec->get_address ());
-
-	  fhandler_base *fh = rec->alloc_fh ();
-	  bool ret = fh->fixup_mmap_after_fork (rec->get_handle (),
-						rec->get_access (),
-						rec->get_offset (),
-						rec->get_size (),
-						rec->get_address ());
-	  rec->free_fh (fh);
-
-	  if (!ret)
-	    return -1;
-	  if (rec->get_access () == FILE_MAP_COPY)
-	    {
-	      for (char *address = rec->get_address ();
-		   address < rec->get_address () + rec->get_size ();
-		   address += getpagesize ())
-		if (rec->access (address)
-		    && !ReadProcessMemory (parent, address, address,
-					   getpagesize (), NULL))
-		  {
-		    DWORD old_prot;
-		    DWORD last_error = GetLastError ();
-
-		    if (last_error != ERROR_PARTIAL_COPY
-			&& last_error != ERROR_NOACCESS
-			|| !wincap.virtual_protect_works_on_shared_pages ())
-		      {
-			system_printf ("ReadProcessMemory failed for "
-				       "MAP_PRIVATE address %p, %E",
-				       rec->get_address ());
-			return -1;
-		      }
-		    if (!VirtualProtectEx (parent,
-					   address, getpagesize (),
-					   PAGE_READONLY, &old_prot))
-		      {
-			system_printf ("VirtualProtectEx failed for "
-				       "MAP_PRIVATE address %p, %E",
-				       rec->get_address ());
-			return -1;
-		      }
-		    else
-		      {
-			BOOL ret;
-			DWORD dummy_prot;
-
-			ret = ReadProcessMemory (parent, address, address,
-						 getpagesize (), NULL);
-			if (!VirtualProtectEx(parent,
-					      address, getpagesize (),
-					      old_prot, &dummy_prot))
-			  system_printf ("WARNING: VirtualProtectEx to "
-					 "return to previous state "
-					 "in parent failed for "
-					 "MAP_PRIVATE address %p, %E",
-					 rec->get_address ());
-			if (!VirtualProtect (address, getpagesize (),
-					     old_prot, &dummy_prot))
-			  system_printf ("WARNING: VirtualProtect to copy "
-					 "protection to child failed for"
-					 "MAP_PRIVATE address %p, %E",
-					 rec->get_address ());
-			if (!ret)
-			  {
-			    system_printf ("ReadProcessMemory (2nd try) "
-					   "failed for "
-					   "MAP_PRIVATE address %p, %E",
-					   rec->get_address ());
-			    return -1;
-			  }
-		      }
-		  }
-	    }
-	  rec->fixup_page_map ();
-	}
-    }
-
-  debug_printf ("succeeded");
-  return 0;
-}
diff --git a/winsup/cygwin/msg.cc b/winsup/cygwin/msg.cc
deleted file mode 100644
index 7e80f669b..000000000
--- a/winsup/cygwin/msg.cc
+++ /dev/null
@@ -1,222 +0,0 @@
-/* msg.cc: XSI IPC interface for Cygwin.
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "cygerrno.h"
-#include <signal.h>
-#ifdef USE_SERVER
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "sigproc.h"
-
-#include "cygserver_ipc.h"
-#include "cygserver_msg.h"
-
-/*
- * client_request_msg Constructors
- */
-
-client_request_msg::client_request_msg (int msqid,
-					int cmd,
-					struct msqid_ds *buf)
-  : client_request (CYGSERVER_REQUEST_MSG, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.msgop = MSGOP_msgctl;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-   _parameters.in.ctlargs.msqid = msqid;
-   _parameters.in.ctlargs.cmd = cmd;
-   _parameters.in.ctlargs.buf = buf;
-
-  msglen (sizeof (_parameters.in));
-}
-
-client_request_msg::client_request_msg (key_t key,
-					int msgflg)
-  : client_request (CYGSERVER_REQUEST_MSG, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.msgop = MSGOP_msgget;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-  _parameters.in.getargs.key = key;
-  _parameters.in.getargs.msgflg = msgflg;
-
-  msglen (sizeof (_parameters.in));
-}
-
-client_request_msg::client_request_msg (int msqid,
-					void *msgp,
-					size_t msgsz,
-					long msgtyp,
-					int msgflg)
-  : client_request (CYGSERVER_REQUEST_MSG, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.msgop = MSGOP_msgrcv;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-  _parameters.in.rcvargs.msqid = msqid;
-  _parameters.in.rcvargs.msgp = msgp;
-  _parameters.in.rcvargs.msgsz = msgsz;
-  _parameters.in.rcvargs.msgtyp = msgtyp;
-  _parameters.in.rcvargs.msgflg = msgflg;
-
-  msglen (sizeof (_parameters.in));
-}
-
-client_request_msg::client_request_msg (int msqid,
-					const void *msgp,
-					size_t msgsz,
-					int msgflg)
-  : client_request (CYGSERVER_REQUEST_MSG, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.msgop = MSGOP_msgsnd;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-  _parameters.in.sndargs.msqid = msqid;
-  _parameters.in.sndargs.msgp = msgp;
-  _parameters.in.sndargs.msgsz = msgsz;
-  _parameters.in.sndargs.msgflg = msgflg;
-
-  msglen (sizeof (_parameters.in));
-}
-#endif /* USE_SERVER */
-
-/*
- * XSI message queue API.  These are exported by the DLL.
- */
-
-extern "C" int
-msgctl (int msqid, int cmd, struct msqid_ds *buf)
-{
-#ifdef USE_SERVER
-  syscall_printf ("msgctl (msqid = %d, cmd = 0x%x, buf = %p)",
-		  msqid, cmd, buf);
-  switch (cmd)
-    {
-      case IPC_STAT:
-	if (__check_null_invalid_struct_errno (buf, sizeof *buf))
-	  return -1;
-        break;
-      case IPC_SET:
-	if (__check_invalid_read_ptr_errno (buf, sizeof *buf))
-	  return -1;
-        break;
-      case IPC_RMID:
-        break;
-      case IPC_INFO:
-	/* msqid == 0: Request for msginfo struct. */
-	if (!msqid
-	    && __check_null_invalid_struct_errno (buf, sizeof (struct msginfo)))
-	    return -1;
-	/* Otherwise, request msqid entries from internal msqid_ds array. */
-        if (msqid)
-	  if (__check_null_invalid_struct_errno (buf, msqid * sizeof (struct msqid_ds)))
-	    return -1;
-        break;
-      case MSG_INFO:
-        if (__check_null_invalid_struct_errno (buf, sizeof (struct msg_info)))
-	  return -1;
-        break;
-      default:
-        syscall_printf ("-1 [%d] = msgctl ()", EINVAL);
-	set_errno (EINVAL);
-	return -1;
-    }
-  client_request_msg request (msqid, cmd, buf);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = msgctl ()", request.error_code ());
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return -1;
-    }
-  return request.retval ();
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return -1;
-#endif
-}
-
-extern "C" int
-msgget (key_t key, int msgflg)
-{
-#ifdef USE_SERVER
-  syscall_printf ("msgget (key = %U, msgflg = 0x%x)", key, msgflg);
-  client_request_msg request (key, msgflg);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = msgget ()", request.error_code ());
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return -1;
-    }
-  return request.retval ();
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return -1;
-#endif
-}
-
-extern "C" ssize_t
-msgrcv (int msqid, void *msgp, size_t msgsz, long msgtyp, int msgflg)
-{
-#ifdef USE_SERVER
-  syscall_printf ("msgrcv (msqid = %d, msgp = %p, msgsz = %d, "
-  		  "msgtyp = %d, msgflg = 0x%x)",
-		  msqid, msgp, msgsz, msgtyp, msgflg);
-  if (__check_null_invalid_struct_errno (msgp, msgsz))
-    return -1;
-  client_request_msg request (msqid, msgp, msgsz, msgtyp, msgflg);
-  if (request.make_request () == -1 || request.rcvval () == -1)
-    {
-      syscall_printf ("-1 [%d] = msgrcv ()", request.error_code ());
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return -1;
-    }
-  return request.rcvval ();
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return -1;
-#endif
-}
-
-extern "C" int
-msgsnd (int msqid, const void *msgp, size_t msgsz, int msgflg)
-{
-#ifdef USE_SERVER
-  syscall_printf ("msgsnd (msqid = %d, msgp = %p, msgsz = %d, msgflg = 0x%x)",
-		  msqid, msgp, msgsz, msgflg);
-  if (__check_invalid_read_ptr_errno (msgp, msgsz))
-    return -1;
-  client_request_msg request (msqid, msgp, msgsz, msgflg);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = msgsnd ()", request.error_code ());
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return -1;
-    }
-  return request.retval ();
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return -1;
-#endif
-}
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
deleted file mode 100644
index ac62fecd8..000000000
--- a/winsup/cygwin/net.cc
+++ /dev/null
@@ -1,2341 +0,0 @@
-/* net.cc: network-related routines.
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* #define DEBUG_NEST_ON 1 */
-
-#define  __INSIDE_CYGWIN_NET__
-
-#include "winsup.h"
-#include <ctype.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <iphlpapi.h>
-
-#include <stdlib.h>
-#define gethostname cygwin_gethostname
-#include <unistd.h>
-#undef gethostname
-#include <netdb.h>
-#define USE_SYS_TYPES_FD_SET
-#include <winsock2.h>
-#include <assert.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include "registry.h"
-#include "wsock_event.h"
-
-extern "C"
-{
-  int h_errno;
-
-  int __stdcall rcmd (char **ahost, unsigned short inport, char *locuser,
-		      char *remuser, char *cmd, SOCKET * fd2p);
-  int __stdcall rexec (char **ahost, unsigned short inport, char *locuser,
-		       char *password, char *cmd, SOCKET * fd2p);
-  int __stdcall rresvport (int *);
-  int sscanf (const char *, const char *, ...);
-}				/* End of "C" section */
-
-LPWSAOVERLAPPED
-wsock_event::prepare ()
-{
-  LPWSAOVERLAPPED ret = NULL;
-
-  SetLastError (0);
-  if ((event = WSACreateEvent ()) != WSA_INVALID_EVENT)
-    {
-      memset (&ovr, 0, sizeof ovr);
-      ovr.hEvent = event;
-      ret = &ovr;
-    }
-  else if (GetLastError () == ERROR_PROC_NOT_FOUND) /* winsock2 not available */
-    WSASetLastError (0);
-
-  debug_printf ("%d = wsock_event::prepare ()", ret);
-  return ret;
-}
-
-int
-wsock_event::wait (int socket, LPDWORD flags)
-{
-  int ret = -1;
-  WSAEVENT ev[2] = { event, signal_arrived };
-
-  switch (WSAWaitForMultipleEvents (2, ev, FALSE, WSA_INFINITE, FALSE))
-    {
-      case WSA_WAIT_EVENT_0:
-	DWORD len;
-	if (WSAGetOverlappedResult (socket, &ovr, &len, FALSE, flags))
-	  ret = (int) len;
-	break;
-      case WSA_WAIT_EVENT_0 + 1:
-	if (!CancelIo ((HANDLE) socket))
-	  {
-	    debug_printf ("CancelIo() %E, fallback to blocking io");
-	    WSAGetOverlappedResult (socket, &ovr, &len, TRUE, flags);
-	  }
-	else
-	  WSASetLastError (WSAEINTR);
-	break;
-      case WSA_WAIT_FAILED:
-	break;
-      default:			/* Should be impossible. *LOL* */
-	WSASetLastError (WSAEFAULT);
-	break;
-    }
-  WSACloseEvent (event);
-  event = NULL;
-  return ret;
-}
-
-WSADATA wsadata;
-
-static fhandler_socket *
-get (const int fd)
-{
-  cygheap_fdget cfd (fd);
-
-  if (cfd < 0)
-    return 0;
-
-  fhandler_socket *const fh = cfd->is_socket ();
-
-  if (!fh)
-    set_errno (ENOTSOCK);
-
-  return fh;
-}
-
-static SOCKET __stdcall
-set_socket_inheritance (SOCKET sock)
-{
-  SOCKET osock = sock;
-
-  if (!DuplicateHandle (hMainProc, (HANDLE) sock, hMainProc, (HANDLE *) &sock,
-			0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE))
-    system_printf ("DuplicateHandle failed %E");
-  else
-    debug_printf ("DuplicateHandle succeeded osock %p, sock %p", osock, sock);
-  return sock;
-}
-
-/* htonl: standards? */
-extern "C" unsigned long int
-htonl (unsigned long int x)
-{
-  return ((((x & 0x000000ffU) << 24) |
-	   ((x & 0x0000ff00U) << 8) |
-	   ((x & 0x00ff0000U) >> 8) |
-	   ((x & 0xff000000U) >> 24)));
-}
-
-/* ntohl: standards? */
-extern "C" unsigned long int
-ntohl (unsigned long int x)
-{
-  return htonl (x);
-}
-
-/* htons: standards? */
-extern "C" unsigned short
-htons (unsigned short x)
-{
-  return ((((x & 0x000000ffU) << 8) |
-	   ((x & 0x0000ff00U) >> 8)));
-}
-
-/* ntohs: standards? */
-extern "C" unsigned short
-ntohs (unsigned short x)
-{
-  return htons (x);
-}
-
-static void
-dump_protoent (struct protoent *p)
-{
-  if (p)
-    debug_printf ("protoent %s %x %x", p->p_name, p->p_aliases, p->p_proto);
-}
-
-/* exported as inet_ntoa: BSD 4.3 */
-extern "C" char *
-cygwin_inet_ntoa (struct in_addr in)
-{
-#ifdef _MT_SAFE
-#define ntoa_buf  _reent_winsup ()->_ntoa_buf
-#else
-  static char *ntoa_buf = NULL;
-#endif
-
-  char *res = inet_ntoa (in);
-
-  if (ntoa_buf)
-    {
-      free (ntoa_buf);
-      ntoa_buf = NULL;
-    }
-  if (res)
-    ntoa_buf = strdup (res);
-  return ntoa_buf;
-}
-
-/* exported as inet_addr: BSD 4.3 */
-extern "C" unsigned long
-cygwin_inet_addr (const char *cp)
-{
-  if (check_null_str_errno (cp))
-    return INADDR_NONE;
-  unsigned long res = inet_addr (cp);
-
-  return res;
-}
-
-/* exported as inet_aton: BSD 4.3
-   inet_aton is not exported by wsock32 and ws2_32,
-   so it has to be implemented here. */
-extern "C" int
-cygwin_inet_aton (const char *cp, struct in_addr *inp)
-{
-  if (check_null_str_errno (cp) || check_null_invalid_struct_errno (inp))
-    return 0;
-
-  unsigned long res = inet_addr (cp);
-
-  if (res == INADDR_NONE && strcmp (cp, "255.255.255.255"))
-    return 0;
-  if (inp)
-    inp->s_addr = res;
-  return 1;
-}
-
-/* undocumented in wsock32.dll */
-extern "C" unsigned int WINAPI inet_network (const char *);
-
-extern "C" unsigned int
-cygwin_inet_network (const char *cp)
-{
-  if (check_null_str_errno (cp))
-    return INADDR_NONE;
-  unsigned int res = inet_network (cp);
-
-  return res;
-}
-
-/* inet_netof is in the standard BSD sockets library.  It is useless
-   for modern networks, since it assumes network values which are no
-   longer meaningful, but some existing code calls it.  */
-
-extern "C" unsigned long
-inet_netof (struct in_addr in)
-{
-  unsigned long i, res;
-
-  i = ntohl (in.s_addr);
-  if (IN_CLASSA (i))
-    res = (i & IN_CLASSA_NET) >> IN_CLASSA_NSHIFT;
-  else if (IN_CLASSB (i))
-    res = (i & IN_CLASSB_NET) >> IN_CLASSB_NSHIFT;
-  else
-    res = (i & IN_CLASSC_NET) >> IN_CLASSC_NSHIFT;
-
-
-  return res;
-}
-
-/* inet_makeaddr is in the standard BSD sockets library.  It is
-   useless for modern networks, since it assumes network values which
-   are no longer meaningful, but some existing code calls it.  */
-
-extern "C" struct in_addr
-inet_makeaddr (int net, int lna)
-{
-  unsigned long i;
-  struct in_addr in;
-
-  if (net < IN_CLASSA_MAX)
-    i = (net << IN_CLASSA_NSHIFT) | (lna & IN_CLASSA_HOST);
-  else if (net < IN_CLASSB_MAX)
-    i = (net << IN_CLASSB_NSHIFT) | (lna & IN_CLASSB_HOST);
-  else if (net < 0x1000000)
-    i = (net << IN_CLASSC_NSHIFT) | (lna & IN_CLASSC_HOST);
-  else
-    i = net | lna;
-
-  in.s_addr = htonl (i);
-
-
-  return in;
-}
-
-struct tl
-{
-  int w;
-  const char *s;
-  int e;
-};
-
-static NO_COPY struct tl errmap[] = {
-  {WSAEINTR, "WSAEINTR", EINTR},
-  {WSAEWOULDBLOCK, "WSAEWOULDBLOCK", EWOULDBLOCK},
-  {WSAEINPROGRESS, "WSAEINPROGRESS", EINPROGRESS},
-  {WSAEALREADY, "WSAEALREADY", EALREADY},
-  {WSAENOTSOCK, "WSAENOTSOCK", ENOTSOCK},
-  {WSAEDESTADDRREQ, "WSAEDESTADDRREQ", EDESTADDRREQ},
-  {WSAEMSGSIZE, "WSAEMSGSIZE", EMSGSIZE},
-  {WSAEPROTOTYPE, "WSAEPROTOTYPE", EPROTOTYPE},
-  {WSAENOPROTOOPT, "WSAENOPROTOOPT", ENOPROTOOPT},
-  {WSAEPROTONOSUPPORT, "WSAEPROTONOSUPPORT", EPROTONOSUPPORT},
-  {WSAESOCKTNOSUPPORT, "WSAESOCKTNOSUPPORT", ESOCKTNOSUPPORT},
-  {WSAEOPNOTSUPP, "WSAEOPNOTSUPP", EOPNOTSUPP},
-  {WSAEPFNOSUPPORT, "WSAEPFNOSUPPORT", EPFNOSUPPORT},
-  {WSAEAFNOSUPPORT, "WSAEAFNOSUPPORT", EAFNOSUPPORT},
-  {WSAEADDRINUSE, "WSAEADDRINUSE", EADDRINUSE},
-  {WSAEADDRNOTAVAIL, "WSAEADDRNOTAVAIL", EADDRNOTAVAIL},
-  {WSAENETDOWN, "WSAENETDOWN", ENETDOWN},
-  {WSAENETUNREACH, "WSAENETUNREACH", ENETUNREACH},
-  {WSAENETRESET, "WSAENETRESET", ENETRESET},
-  {WSAECONNABORTED, "WSAECONNABORTED", ECONNABORTED},
-  {WSAECONNRESET, "WSAECONNRESET", ECONNRESET},
-  {WSAENOBUFS, "WSAENOBUFS", ENOBUFS},
-  {WSAEISCONN, "WSAEISCONN", EISCONN},
-  {WSAENOTCONN, "WSAENOTCONN", ENOTCONN},
-  {WSAESHUTDOWN, "WSAESHUTDOWN", ESHUTDOWN},
-  {WSAETOOMANYREFS, "WSAETOOMANYREFS", ETOOMANYREFS},
-  {WSAETIMEDOUT, "WSAETIMEDOUT", ETIMEDOUT},
-  {WSAECONNREFUSED, "WSAECONNREFUSED", ECONNREFUSED},
-  {WSAELOOP, "WSAELOOP", ELOOP},
-  {WSAENAMETOOLONG, "WSAENAMETOOLONG", ENAMETOOLONG},
-  {WSAEHOSTDOWN, "WSAEHOSTDOWN", EHOSTDOWN},
-  {WSAEHOSTUNREACH, "WSAEHOSTUNREACH", EHOSTUNREACH},
-  {WSAENOTEMPTY, "WSAENOTEMPTY", ENOTEMPTY},
-  {WSAEPROCLIM, "WSAEPROCLIM", EPROCLIM},
-  {WSAEUSERS, "WSAEUSERS", EUSERS},
-  {WSAEDQUOT, "WSAEDQUOT", EDQUOT},
-  {WSAESTALE, "WSAESTALE", ESTALE},
-  {WSAEREMOTE, "WSAEREMOTE", EREMOTE},
-  {WSAEINVAL, "WSAEINVAL", EINVAL},
-  {WSAEFAULT, "WSAEFAULT", EFAULT},
-  {0, "NOERROR", 0},
-  {0, NULL, 0}
-};
-
-static int
-find_winsock_errno (int why)
-{
-  for (int i = 0; errmap[i].s != NULL; ++i)
-    if (why == errmap[i].w)
-      return errmap[i].e;
-
-  return EPERM;
-}
-
-void
-__set_winsock_errno (const char *fn, int ln)
-{
-  DWORD werr = WSAGetLastError ();
-  int err = find_winsock_errno (werr);
-
-  set_errno (err);
-  syscall_printf ("%s:%d - winsock error %d -> errno %d", fn, ln, werr, err);
-}
-
-/*
- * Since the member `s' isn't used for debug output we can use it
- * for the error text returned by herror and hstrerror.
- */
-static NO_COPY struct tl host_errmap[] = {
-  {WSAHOST_NOT_FOUND, "Unknown host", HOST_NOT_FOUND},
-  {WSATRY_AGAIN, "Host name lookup failure", TRY_AGAIN},
-  {WSANO_RECOVERY, "Unknown server error", NO_RECOVERY},
-  {WSANO_DATA, "No address associated with name", NO_DATA},
-  {0, NULL, 0}
-};
-
-static void
-set_host_errno ()
-{
-  int i;
-
-  int why = WSAGetLastError ();
-
-  for (i = 0; host_errmap[i].w != 0; ++i)
-    if (why == host_errmap[i].w)
-      break;
-
-  if (host_errmap[i].w != 0)
-    h_errno = host_errmap[i].e;
-  else
-    h_errno = NETDB_INTERNAL;
-}
-
-inline int
-DWORD_round (int n)
-{
-  return sizeof (DWORD) * (((n + sizeof (DWORD) - 1)) / sizeof (DWORD));
-}
-
-inline int
-strlen_round (const char *s)
-{
-  if (!s)
-    return 0;
-  return DWORD_round (strlen (s) + 1);
-}
-
-#pragma pack(push,2)
-struct pservent
-{
-  char *s_name;
-  char **s_aliases;
-  short s_port;
-  char *s_proto;
-};
-#pragma pack(pop)
-
-struct unionent
-{
-  char *name;
-  char **list;
-  short port_proto_addrtype;
-  short h_len;
-  union
-  {
-    char *s_proto;
-    char **h_addr_list;
-  };
-};
-
-enum struct_type
-{
-  is_hostent, is_protoent, is_servent
-};
-
-static const char *entnames[] = {"host", "proto", "serv"};
-
-/* Generic "dup a {host,proto,serv}ent structure" function.
-   This is complicated because we need to be able to free the
-   structure at any point and we can't rely on the pointer contents
-   being untouched by callers.  So, we allocate a chunk of memory
-   large enough to hold the structure and all of the stuff it points
-   to then we copy the source into this new block of memory.
-   The 'unionent' struct is a union of all of the currently used
-   *ent structure.  */
-
-#ifdef DEBUGGING
-static void *
-#else
-static inline void *
-#endif
-dup_ent (void *old, void *src0, struct_type type)
-{
-  if (old)
-    {
-      debug_printf ("freeing old %sent structure \"%s\" %p\n", entnames[type],
-		    ((unionent *) old)->name, old);
-      free (old);
-    }
-
-  if (!src0)
-    return NULL;
-
-  unionent *src = (unionent *) src0;
-  debug_printf ("duping %sent \"%s\", %p", entnames[type],
-		src ? src->name : "<null!>", src);
-
-  /* Find the size of the raw structure minus any character strings, etc. */
-  int sz, struct_sz;
-  switch (type)
-    {
-    case is_protoent:
-      struct_sz = sizeof (protoent);
-      break;
-    case is_servent:
-      struct_sz = sizeof (servent);
-      break;
-    case is_hostent:
-      struct_sz = sizeof (hostent);
-      break;
-    default:
-      api_fatal ("called with invalid value %d", type);
-      break;
-    }
-
-  /* Every *ent begins with a name.  Calculate it's length. */
-  int namelen = strlen_round (src->name);
-  sz = struct_sz + namelen;
-
-  char **av;
-  /* The next field in every *ent is an argv list of "something".
-     Calculate the number of components and how much space the
-     character strings will take.  */
-  int list_len = 0;
-  for (av = src->list; av && *av; av++)
-    {
-      list_len++;
-      sz += sizeof (char **) + strlen_round (*av);
-    }
-
-  /* NULL terminate if there actually was a list */
-  if (av)
-    {
-      sz += sizeof (char **);
-      list_len++;
-    }
-
-  /* Do servent/hostent specific processing */
-  int protolen = 0;
-  int addr_list_len = 0;
-  char *s_proto = NULL;
-  if (type == is_servent)
-    {
-      if (src->s_proto)
-	{
-	  /* Windows 95 idiocy.  Structure is misaligned on Windows 95.
-	     Kludge around this by trying a different pointer alignment.  */
-	  if (!IsBadStringPtr (src->s_proto, INT32_MAX))
-	    s_proto = src->s_proto;
-	  else if (!IsBadStringPtr (((pservent *) src)->s_proto, INT32_MAX))
-	    s_proto = ((pservent *) src)->s_proto;
-	  sz += (protolen = strlen_round (s_proto));
-	}
-    }
-  else if (type == is_hostent)
-    {
-      /* Calculate the length and storage used for h_addr_list */
-      for (av = src->h_addr_list; av && *av; av++)
-	{
-	  addr_list_len++;
-	  sz += sizeof (char **) + DWORD_round (src->h_len);
-	}
-      if (av)
-	{
-	  sz += sizeof (char **);
-	  addr_list_len++;
-	}
-    }
-
-  /* Allocate the storage needed */
-  unionent *dst = (unionent *) calloc (1, sz);
-
-  /* Hopefully, this worked. */
-  if (dst)
-    {
-      /* This field is common to all *ent structures but named differently
-	 in each, of course.  */
-      dst->port_proto_addrtype = src->port_proto_addrtype;
-
-      /* Copy the name field to dst, using space just beyond the end of
-	 the dst structure. */
-      char *dp = ((char *) dst) + struct_sz;
-      strcpy (dst->name = dp, src->name);
-      dp += namelen;
-
-      /* Copy the 'list' type to dst, using space beyond end of structure
-	 + storage for name. */
-      if (src->list)
-	{
-	  char **dav = dst->list = (char **) dp;
-	  dp += sizeof (char **) * list_len;
-	  for (av = src->list; av && *av; av++)
-	    {
-	      int len = strlen (*av) + 1;
-	      memcpy (*dav++ = dp, *av, len);
-	      dp += DWORD_round (len);
-	    }
-	}
-
-      /* Do servent/hostent specific processing. */
-      if (type == is_servent)
-	{
-	  if (s_proto)
-	    {
-	      strcpy (dst->s_proto = dp, s_proto);
-	      dp += protolen;
-	    }
-	}
-      else if (type == is_hostent)
-	{
-	  /* Transfer h_len and duplicate contents of h_addr_list, using
-	     memory after 'list' allocation. */
-	  dst->h_len = src->h_len;
-	  char **dav = dst->h_addr_list = (char **) dp;
-	  dp += sizeof (char **) * addr_list_len;
-	  for (av = src->h_addr_list; av && *av; av++)
-	    {
-	      memcpy (*dav++ = dp, *av, src->h_len);
-	      dp += DWORD_round (src->h_len);
-	    }
-	}
-      /* Sanity check that we did our bookkeeping correctly. */
-      assert ((dp - (char *) dst) == sz);
-    }
-  debug_printf ("duped %sent \"%s\", %p", entnames[type], dst ? dst->name : "<null!>", dst);
-  return dst;
-}
-
-#ifdef _MT_SAFE
-#define protoent_buf  _reent_winsup ()->_protoent_buf
-#else
-static struct protoent *protoent_buf = NULL;
-#endif
-
-/* exported as getprotobyname: standards? */
-extern "C" struct protoent *
-cygwin_getprotobyname (const char *p)
-{
-  if (check_null_str_errno (p))
-    return NULL;
-  protoent_buf = (protoent *) dup_ent (protoent_buf, getprotobyname (p),
-				       is_protoent);
-  if (!protoent_buf)
-    set_winsock_errno ();
-
-  dump_protoent (protoent_buf);
-  return protoent_buf;
-}
-
-/* exported as getprotobynumber: standards? */
-extern "C" struct protoent *
-cygwin_getprotobynumber (int number)
-{
-  protoent_buf = (protoent *) dup_ent (protoent_buf, getprotobynumber (number),
-				       is_protoent);
-  if (!protoent_buf)
-    set_winsock_errno ();
-
-  dump_protoent (protoent_buf);
-  return protoent_buf;
-}
-
-bool
-fdsock (cygheap_fdmanip& fd, const device *dev, SOCKET soc)
-{
-  if (!winsock2_active)
-    soc = set_socket_inheritance (soc);
-  else if (wincap.has_set_handle_information ())
-    {
-      /* NT systems apparently set sockets to inheritable by default */
-      SetHandleInformation ((HANDLE) soc, HANDLE_FLAG_INHERIT, 0);
-      debug_printf ("reset socket inheritance since winsock2_active %d",
-		    winsock2_active);
-    }
-  else
-    debug_printf ("not setting socket inheritance since winsock2_active %d",
-		  winsock2_active);
-  fd = build_fh_dev (*dev);
-  if (!fd.isopen ())
-    return false;
-  fd->set_io_handle ((HANDLE) soc);
-  fd->set_flags (O_RDWR | O_BINARY);
-  fd->set_r_no_interrupt (winsock2_active);
-  cygheap->fdtab.inc_need_fixup_before ();
-  debug_printf ("fd %d, name '%s', soc %p", (int) fd, dev->name, soc);
-  return true;
-}
-
-/* exported as socket: standards? */
-extern "C" int
-cygwin_socket (int af, int type, int protocol)
-{
-  int res = -1;
-  SOCKET soc = 0;
-
-  debug_printf ("socket (%d, %d, %d)", af, type, protocol);
-
-  soc = socket (AF_INET, type, af == AF_LOCAL ? 0 : protocol);
-
-  if (soc == INVALID_SOCKET)
-    {
-      set_winsock_errno ();
-      goto done;
-    }
-
-  const device *dev;
-
-  if (af == AF_INET)
-    dev = type == SOCK_STREAM ? tcp_dev : udp_dev;
-  else
-    dev = type == SOCK_STREAM ? stream_dev : dgram_dev;
-
-  {
-    cygheap_fdnew fd;
-    if (fd < 0 || !fdsock (fd, dev, soc))
-      closesocket (soc);
-    else
-      {
-	((fhandler_socket *) fd)->set_addr_family (af);
-	((fhandler_socket *) fd)->set_socket_type (type);
-	res = fd;
-      }
-  }
-
-done:
-  syscall_printf ("%d = socket (%d, %d, %d)", res, af, type, protocol);
-  return res;
-}
-
-/* exported as sendto: standards? */
-extern "C" int
-cygwin_sendto (int fd, const void *buf, int len, int flags,
-	       const struct sockaddr *to, int tolen)
-{
-  int res;
-  sig_dispatch_pending ();
-
-  fhandler_socket *fh = get (fd);
-
-  if ((len && __check_invalid_read_ptr_errno (buf, (unsigned) len))
-      || (to && __check_invalid_read_ptr_errno (to, tolen))
-      || !fh)
-    res = -1;
-  else if ((res = len) != 0)
-    res = fh->sendto (buf, len, flags, to, tolen);
-
-  syscall_printf ("%d = sendto (%d, %p, %d, %x, %p, %d)",
-		  res, fd, buf, len, flags, to, tolen);
-
-  return res;
-}
-
-/* exported as recvfrom: standards? */
-extern "C" int
-cygwin_recvfrom (int fd, void *buf, int len, int flags,
-		 struct sockaddr *from, int *fromlen)
-{
-  int res;
-  sig_dispatch_pending ();
-
-  fhandler_socket *fh = get (fd);
-
-  if ((len && __check_null_invalid_struct_errno (buf, (unsigned) len))
-      || (from
-	  && (check_null_invalid_struct_errno (fromlen)
-	      || __check_null_invalid_struct_errno (from, (unsigned) *fromlen)))
-      || !fh)
-    res = -1;
-  else if ((res = len) != 0)
-    res = fh->recvfrom (buf, len, flags, from, fromlen);
-
-  syscall_printf ("%d = recvfrom (%d, %p, %d, %x, %p, %p)",
-		  res, fd, buf, len, flags, from, fromlen);
-
-  return res;
-}
-
-/* exported as setsockopt: standards? */
-extern "C" int
-cygwin_setsockopt (int fd, int level, int optname, const void *optval,
-		   int optlen)
-{
-  int res;
-  fhandler_socket *fh = get (fd);
-  const char *name = "error";
-
-  /* For the following debug_printf */
-  switch (optname)
-    {
-      case SO_DEBUG:
-	name = "SO_DEBUG";
-	break;
-      case SO_ACCEPTCONN:
-	name = "SO_ACCEPTCONN";
-	break;
-      case SO_REUSEADDR:
-	name = "SO_REUSEADDR";
-	break;
-      case SO_KEEPALIVE:
-	name = "SO_KEEPALIVE";
-	break;
-      case SO_DONTROUTE:
-	name = "SO_DONTROUTE";
-	break;
-      case SO_BROADCAST:
-	name = "SO_BROADCAST";
-	break;
-      case SO_USELOOPBACK:
-	name = "SO_USELOOPBACK";
-	break;
-      case SO_LINGER:
-	name = "SO_LINGER";
-	break;
-      case SO_OOBINLINE:
-	name = "SO_OOBINLINE";
-	break;
-      case SO_ERROR:
-	name = "SO_ERROR";
-	break;
-    }
-
-  if ((optval && __check_invalid_read_ptr_errno (optval, optlen)) || !fh)
-    res = -1;
-  else
-    {
-      res = setsockopt (fh->get_socket (), level, optname,
-			(const char *) optval, optlen);
-
-      if (optlen == 4)
-	syscall_printf ("setsockopt optval=%x", *(long *) optval);
-
-      if (res)
-	set_winsock_errno ();
-    }
-
-  syscall_printf ("%d = setsockopt (%d, %d, %x (%s), %p, %d)",
-		  res, fd, level, optname, name, optval, optlen);
-  return res;
-}
-
-/* exported as getsockopt: standards? */
-extern "C" int
-cygwin_getsockopt (int fd, int level, int optname, void *optval, int *optlen)
-{
-  int res;
-  fhandler_socket *fh = get (fd);
-  const char *name = "error";
-
-  /* For the following debug_printf */
-  switch (optname)
-    {
-      case SO_DEBUG:
-	name = "SO_DEBUG";
-	break;
-      case SO_ACCEPTCONN:
-	name = "SO_ACCEPTCONN";
-	break;
-      case SO_REUSEADDR:
-	name = "SO_REUSEADDR";
-	break;
-      case SO_KEEPALIVE:
-	name = "SO_KEEPALIVE";
-	break;
-      case SO_DONTROUTE:
-	name = "SO_DONTROUTE";
-	break;
-      case SO_BROADCAST:
-	name = "SO_BROADCAST";
-	break;
-      case SO_USELOOPBACK:
-	name = "SO_USELOOPBACK";
-	break;
-      case SO_LINGER:
-	name = "SO_LINGER";
-	break;
-      case SO_OOBINLINE:
-	name = "SO_OOBINLINE";
-	break;
-      case SO_ERROR:
-	name = "SO_ERROR";
-	break;
-    }
-
-  if ((optval
-       && (check_null_invalid_struct_errno (optlen)
-	   || __check_null_invalid_struct_errno (optval, (unsigned) *optlen)))
-      || !fh)
-    res = -1;
-  else
-    {
-      res = getsockopt (fh->get_socket (), level, optname, (char *) optval,
-			(int *) optlen);
-
-      if (optname == SO_ERROR)
-	{
-	  int *e = (int *) optval;
-
-	  *e = find_winsock_errno (*e);
-	}
-
-      if (res)
-	set_winsock_errno ();
-    }
-
-  syscall_printf ("%d = getsockopt (%d, %d, %x (%s), %p, %p)",
-		  res, fd, level, optname, name, optval, optlen);
-  return res;
-}
-
-/* exported as connect: standards? */
-extern "C" int
-cygwin_connect (int fd, const struct sockaddr *name, int namelen)
-{
-  int res;
-  sig_dispatch_pending ();
-
-  fhandler_socket *fh = get (fd);
-
-  if (__check_invalid_read_ptr_errno (name, namelen) || !fh)
-    res = -1;
-  else
-    {
-      bool was_blocking = false;
-      if (!fh->is_nonblocking ())
-	{
-	  int nonblocking = 1;
-	  fh->ioctl (FIONBIO, &nonblocking);
-	  was_blocking = true;
-	}
-      res = fh->connect (name, namelen);
-      if (was_blocking)
-	{
-	  if (res == -1 && get_errno () == EINPROGRESS)
-	    {
-	      size_t fds_size = howmany (fd + 1, NFDBITS) * sizeof (fd_mask);
-	      fd_set *write_fds = (fd_set *) alloca (fds_size);
-	      fd_set *except_fds = (fd_set *) alloca (fds_size);
-	      memset (write_fds, 0, fds_size);
-	      memset (except_fds, 0, fds_size);
-	      FD_SET (fd, write_fds);
-	      FD_SET (fd, except_fds);
-	      res = cygwin_select (fd + 1, NULL, write_fds, except_fds, NULL);
-	      if (res > 0 && FD_ISSET (fd, except_fds))
-		{
-		  res = -1;
-		  for (;;)
-		    {
-		      int err;
-		      int len = sizeof err;
-		      cygwin_getsockopt (fd, SOL_SOCKET, SO_ERROR,
-					 (void *) &err, &len);
-		      if (err)
-			{
-			  set_errno (err);
-			  break;
-			}
-		      low_priority_sleep (0);
-		    }
-		}
-	      else if (res > 0)
-		res = 0;
-	      else
-		{
-		  WSASetLastError (WSAEINPROGRESS);
-		  set_winsock_errno ();
-		}
-	    }
-	  int nonblocking = 0;
-	  fh->ioctl (FIONBIO, &nonblocking);
-	}
-    }
-
-  syscall_printf ("%d = connect (%d, %p, %d)", res, fd, name, namelen);
-
-  return res;
-}
-
-#ifdef _MT_SAFE
-#define servent_buf  _reent_winsup ()->_servent_buf
-#else
-static struct servent *servent_buf = NULL;
-#endif
-
-/* exported as getservbyname: standards? */
-extern "C" struct servent *
-cygwin_getservbyname (const char *name, const char *proto)
-{
-  sig_dispatch_pending ();
-  if (check_null_str_errno (name)
-      || (proto != NULL && check_null_str_errno (proto)))
-    return NULL;
-
-  servent_buf = (servent *) dup_ent (servent_buf, getservbyname (name, proto),
-				     is_servent);
-  if (!servent_buf)
-    set_winsock_errno ();
-
-  syscall_printf ("%x = getservbyname (%s, %s)", servent_buf, name, proto);
-  return servent_buf;
-}
-
-/* exported as getservbyport: standards? */
-extern "C" struct servent *
-cygwin_getservbyport (int port, const char *proto)
-{
-  sig_dispatch_pending ();
-  if (proto != NULL && check_null_str_errno (proto))
-    return NULL;
-
-  servent_buf = (servent *) dup_ent (servent_buf, getservbyport (port, proto),
-				     is_servent);
-  if (!servent_buf)
-    set_winsock_errno ();
-
-  syscall_printf ("%x = getservbyport (%d, %s)", servent_buf, port, proto);
-  return servent_buf;
-}
-
-extern "C" int
-cygwin_gethostname (char *name, size_t len)
-{
-  sig_dispatch_pending ();
-  if (__check_null_invalid_struct_errno (name, len))
-    return -1;
-
-  if (gethostname (name, len))
-    {
-      DWORD local_len = len;
-
-      if (!GetComputerNameA (name, &local_len))
-	{
-	  set_winsock_errno ();
-	  return -1;
-	}
-    }
-  debug_printf ("name %s", name);
-  h_errno = 0;
-  return 0;
-}
-
-#ifdef _MT_SAFE
-#define hostent_buf  _reent_winsup ()->_hostent_buf
-#else
-static struct hostent *hostent_buf = NULL;
-#endif
-
-/* exported as gethostbyname: standards? */
-extern "C" struct hostent *
-cygwin_gethostbyname (const char *name)
-{
-  static unsigned char tmp_addr[4];
-  static struct hostent tmp;
-  static char *tmp_aliases[1];
-  static char *tmp_addr_list[2];
-  static int a, b, c, d;
-
-  sig_dispatch_pending ();
-  if (check_null_str_errno (name))
-    return NULL;
-
-  if (sscanf (name, "%d.%d.%d.%d", &a, &b, &c, &d) == 4)
-    {
-      /* In case you don't have DNS, at least x.x.x.x still works */
-      memset (&tmp, 0, sizeof (tmp));
-      tmp_addr[0] = a;
-      tmp_addr[1] = b;
-      tmp_addr[2] = c;
-      tmp_addr[3] = d;
-      tmp_addr_list[0] = (char *) tmp_addr;
-      tmp.h_name = name;
-      tmp.h_aliases = tmp_aliases;
-      tmp.h_addrtype = 2;
-      tmp.h_length = 4;
-      tmp.h_addr_list = tmp_addr_list;
-      return &tmp;
-    }
-
-  hostent_buf = (hostent *) dup_ent (hostent_buf, gethostbyname (name),
-				     is_hostent);
-  if (!hostent_buf)
-    {
-      set_winsock_errno ();
-      set_host_errno ();
-    }
-  else
-    {
-      debug_printf ("h_name %s", hostent_buf->h_name);
-      h_errno = 0;
-    }
-  return hostent_buf;
-}
-
-/* exported as gethostbyaddr: standards? */
-extern "C" struct hostent *
-cygwin_gethostbyaddr (const char *addr, int len, int type)
-{
-  sig_dispatch_pending ();
-  if (__check_invalid_read_ptr_errno (addr, len))
-    return NULL;
-
-  hostent_buf = (hostent *) dup_ent (hostent_buf,
-				     gethostbyaddr (addr, len, type),
-				     is_hostent);
-  if (!hostent_buf)
-    {
-      set_winsock_errno ();
-      set_host_errno ();
-    }
-  else
-    {
-      debug_printf ("h_name %s", hostent_buf->h_name);
-      h_errno = 0;
-    }
-  return hostent_buf;
-}
-
-/* exported as accept: standards? */
-extern "C" int
-cygwin_accept (int fd, struct sockaddr *peer, int *len)
-{
-  int res;
-  sig_dispatch_pending ();
-
-  fhandler_socket *fh = get (fd);
-
-  if ((peer && (check_null_invalid_struct_errno (len)
-		|| __check_null_invalid_struct_errno (peer, (unsigned) *len)))
-      || !fh)
-    res = -1;
-  else
-    {
-      if (!fh->is_nonblocking ())
-	{
-	  size_t fds_size = howmany (fd + 1, NFDBITS) * sizeof (fd_mask);
-	  fd_set *read_fds = (fd_set *) alloca (fds_size);
-	  memset (read_fds, 0, fds_size);
-	  FD_SET (fd, read_fds);
-	  res = cygwin_select (fd + 1, read_fds, NULL, NULL, NULL);
-	  if (res == -1)
-	    return -1;
-	}
-      res = fh->accept (peer, len);
-    }
-
-  syscall_printf ("%d = accept (%d, %p, %p)", res, fd, peer, len);
-  return res;
-}
-
-/* exported as bind: standards? */
-extern "C" int
-cygwin_bind (int fd, const struct sockaddr *my_addr, int addrlen)
-{
-  int res;
-  sig_dispatch_pending ();
-  fhandler_socket *fh = get (fd);
-
-  if (__check_invalid_read_ptr_errno (my_addr, addrlen) || !fh)
-    res = -1;
-  else
-    res = fh->bind (my_addr, addrlen);
-
-  syscall_printf ("%d = bind (%d, %p, %d)", res, fd, my_addr, addrlen);
-  return res;
-}
-
-/* exported as getsockname: standards? */
-extern "C" int
-cygwin_getsockname (int fd, struct sockaddr *addr, int *namelen)
-{
-  int res;
-  sig_dispatch_pending ();
-
-  fhandler_socket *fh = get (fd);
-
-  if (check_null_invalid_struct_errno (namelen)
-      || __check_null_invalid_struct_errno (addr, (unsigned) *namelen)
-      || !fh)
-    res = -1;
-  else
-    res = fh->getsockname (addr, namelen);
-
-  syscall_printf ("%d = getsockname (%d, %p, %p)", res, fd, addr, namelen);
-  return res;
-}
-
-/* exported as listen: standards? */
-extern "C" int
-cygwin_listen (int fd, int backlog)
-{
-  int res;
-  sig_dispatch_pending ();
-  fhandler_socket *fh = get (fd);
-
-  if (!fh)
-    res = -1;
-  else
-    res = fh->listen (backlog);
-
-  syscall_printf ("%d = listen (%d, %d)", res, fd, backlog);
-  return res;
-}
-
-/* exported as shutdown: standards? */
-extern "C" int
-cygwin_shutdown (int fd, int how)
-{
-  int res;
-  sig_dispatch_pending ();
-
-  fhandler_socket *fh = get (fd);
-
-  if (!fh)
-    res = -1;
-  else
-    res = fh->shutdown (how);
-
-  syscall_printf ("%d = shutdown (%d, %d)", res, fd, how);
-  return res;
-}
-
-/* exported as hstrerror: BSD 4.3  */
-extern "C" const char *
-cygwin_hstrerror (int err)
-{
-  int i;
-
-  for (i = 0; host_errmap[i].e != 0; ++i)
-    if (err == host_errmap[i].e)
-      break;
-
-  return host_errmap[i].s;
-}
-
-/* exported as herror: BSD 4.3  */
-extern "C" void
-cygwin_herror (const char *s)
-{
-  if (s && check_null_str (s))
-    return;
-  if (cygheap->fdtab.not_open (2))
-    return;
-
-  if (s)
-    {
-      write (2, s, strlen (s));
-      write (2, ": ", 2);
-    }
-
-  const char *h_errstr = cygwin_hstrerror (h_errno);
-
-  if (!h_errstr)
-    switch (h_errno)
-      {
-	case NETDB_INTERNAL:
-	  h_errstr = "Resolver internal error";
-	  break;
-	case NETDB_SUCCESS:
-	  h_errstr = "Resolver error 0 (no error)";
-	  break;
-	default:
-	  h_errstr = "Unknown resolver error";
-	  break;
-      }
-  write (2, h_errstr, strlen (h_errstr));
-  write (2, "\n", 1);
-}
-
-/* exported as getpeername: standards? */
-extern "C" int
-cygwin_getpeername (int fd, struct sockaddr *name, int *len)
-{
-  int res;
-  sig_dispatch_pending ();
-
-  fhandler_socket *fh = get (fd);
-
-  if (check_null_invalid_struct_errno (len)
-      || __check_null_invalid_struct_errno (name, (unsigned) *len)
-      || !fh)
-    res = -1;
-  else
-    res = fh->getpeername (name, len);
-
-  syscall_printf ("%d = getpeername %d", res, (fh ? fh->get_socket () : -1));
-  return res;
-}
-
-/* exported as recv: standards? */
-extern "C" int
-cygwin_recv (int fd, void *buf, int len, int flags)
-{
-  return cygwin_recvfrom (fd, buf, len, flags, NULL, NULL);
-}
-
-/* exported as send: standards? */
-extern "C" int
-cygwin_send (int fd, const void *buf, int len, int flags)
-{
-  return cygwin_sendto (fd, buf, len, flags, NULL, 0);
-}
-
-/* getdomainname: standards? */
-extern "C" int
-getdomainname (char *domain, size_t len)
-{
-  /*
-   * This works for Win95 only if the machine is configured to use MS-TCP.
-   * If a third-party TCP is being used this will fail.
-   * FIXME: On Win95, is there a way to portably check the TCP stack
-   * in use and include paths for the Domain name in each ?
-   * Punt for now and assume MS-TCP on Win95.
-   */
-  sig_dispatch_pending ();
-  if (__check_null_invalid_struct_errno (domain, len))
-    return -1;
-
-  PFIXED_INFO info = NULL;
-  ULONG size = 0;
-
-  if (GetNetworkParams(info, &size) == ERROR_BUFFER_OVERFLOW
-      && (info = (PFIXED_INFO) alloca(size))
-      && GetNetworkParams(info, &size) == ERROR_SUCCESS)
-    {
-      strncpy(domain, info->DomainName, len);
-      return 0;
-    }
-
-  /* This is only used by Win95 and NT <=  4.0.
-     The registry names are language independent.
-     FIXME: Handle DHCP on Win95. The DhcpDomain(s) may be available
-     in ..VxD\DHCP\DhcpInfoXX\OptionInfo, RFC 1533 format */
-
-  reg_key r (HKEY_LOCAL_MACHINE, KEY_READ,
-	     (!wincap.is_winnt ()) ? "System" : "SYSTEM",
-	     "CurrentControlSet", "Services",
-	     (!wincap.is_winnt ()) ? "VxD" : "Tcpip",
-	     (!wincap.is_winnt ()) ? "MSTCP" : "Parameters", NULL);
-
-  if (!r.error ())
-    {
-      int res1, res2 = 0; /* Suppress compiler warning */
-      res1 = r.get_string ("Domain", domain, len, "");
-      if (res1 != ERROR_SUCCESS || !domain[0])
-	res2 = r.get_string ("DhcpDomain", domain, len, "");
-      if (res1 == ERROR_SUCCESS || res2 == ERROR_SUCCESS)
-	return 0;
-    }
-  __seterrno ();
-  return -1;
-}
-
-/* Fill out an ifconf struct. */
-
-/*
- * IFCONF 98/ME, NTSP4, W2K:
- * Use IP Helper Library
- */
-static void
-get_2k_ifconf (struct ifconf *ifc, int what)
-{
-  int cnt = 0;
-  int ethId = 0, pppId = 0, slpId = 0, tokId = 0;
-
-  /* Union maps buffer to correct struct */
-  struct ifreq *ifr = ifc->ifc_req;
-
-  DWORD ip_cnt, lip, lnp;
-  DWORD siz_ip_table = 0;
-  PMIB_IPADDRTABLE ipt;
-  PMIB_IFROW ifrow;
-  struct sockaddr_in *sa = NULL;
-  struct sockaddr *so = NULL;
-
-  typedef struct ifcount_t
-  {
-    DWORD ifIndex;
-    size_t count;
-    unsigned int enumerated;	// for eth0:1
-    unsigned int classId;	// for eth0, tok0 ...
-
-  };
-  ifcount_t *iflist, *ifEntry;
-
-  if (GetIpAddrTable (NULL, &siz_ip_table, TRUE) == ERROR_INSUFFICIENT_BUFFER
-      && (ifrow = (PMIB_IFROW) alloca (sizeof (MIB_IFROW)))
-      && (ipt = (PMIB_IPADDRTABLE) alloca (siz_ip_table))
-      && !GetIpAddrTable (ipt, &siz_ip_table, TRUE))
-    {
-      iflist =
-	(ifcount_t *) alloca (sizeof (ifcount_t) * (ipt->dwNumEntries + 1));
-      memset (iflist, 0, sizeof (ifcount_t) * (ipt->dwNumEntries + 1));
-      for (ip_cnt = 0; ip_cnt < ipt->dwNumEntries; ++ip_cnt)
-	{
-	  ifEntry = iflist;
-	  /* search for matching entry (and stop at first free entry) */
-	  while (ifEntry->count != 0)
-	    {
-	      if (ifEntry->ifIndex == ipt->table[ip_cnt].dwIndex)
-		break;
-	      ifEntry++;
-	    }
-	  if (ifEntry->count == 0)
-	    {
-	      ifEntry->count = 1;
-	      ifEntry->ifIndex = ipt->table[ip_cnt].dwIndex;
-	    }
-	  else
-	    {
-	      ifEntry->count++;
-	    }
-	}
-      // reset the last element. This is just the stopper for the loop.
-      iflist[ipt->dwNumEntries].count = 0;
-
-      /* Iterate over all configured IP-addresses */
-      for (ip_cnt = 0; ip_cnt < ipt->dwNumEntries; ++ip_cnt)
-	{
-	  memset (ifrow, 0, sizeof (MIB_IFROW));
-	  ifrow->dwIndex = ipt->table[ip_cnt].dwIndex;
-	  if (GetIfEntry (ifrow) != NO_ERROR)
-	    continue;
-
-	  ifcount_t *ifEntry = iflist;
-
-	  /* search for matching entry (and stop at first free entry) */
-	  while (ifEntry->count != 0)
-	    {
-	      if (ifEntry->ifIndex == ipt->table[ip_cnt].dwIndex)
-		break;
-	      ifEntry++;
-	    }
-
-	  /* Setup the interface name */
-	  switch (ifrow->dwType)
-	    {
-	      case MIB_IF_TYPE_TOKENRING:
-		if (ifEntry->enumerated == 0)
-		  {
-		    ifEntry->classId = tokId++;
-		    __small_sprintf (ifr->ifr_name, "tok%u",
-				     ifEntry->classId);
-		  }
-		else
-		  {
-		    __small_sprintf (ifr->ifr_name, "tok%u:%u",
-				     ifEntry->classId,
-				     ifEntry->enumerated - 1);
-		  }
-		ifEntry->enumerated++;
-		break;
-	      case MIB_IF_TYPE_ETHERNET:
-		if (ifEntry->enumerated == 0)
-		  {
-		    ifEntry->classId = ethId++;
-		    __small_sprintf (ifr->ifr_name, "eth%u",
-				     ifEntry->classId);
-		  }
-		else
-		  {
-		    __small_sprintf (ifr->ifr_name, "eth%u:%u",
-				     ifEntry->classId,
-				     ifEntry->enumerated - 1);
-		  }
-		ifEntry->enumerated++;
-		break;
-	      case MIB_IF_TYPE_PPP:
-		if (ifEntry->enumerated == 0)
-		  {
-		    ifEntry->classId = pppId++;
-		    __small_sprintf (ifr->ifr_name, "ppp%u",
-				     ifEntry->classId);
-		  }
-		else
-		  {
-		    __small_sprintf (ifr->ifr_name, "ppp%u:%u",
-				     ifEntry->classId,
-				     ifEntry->enumerated - 1);
-		  }
-		ifEntry->enumerated++;
-		break;
-	      case MIB_IF_TYPE_SLIP:
-		if (ifEntry->enumerated == 0)
-		  {
-		    ifEntry->classId = slpId++;
-		    __small_sprintf (ifr->ifr_name, "slp%u",
-				     ifEntry->classId);
-		  }
-		else
-		  {
-		    __small_sprintf (ifr->ifr_name, "slp%u:%u",
-				     ifEntry->classId,
-				     ifEntry->enumerated - 1);
-		  }
-		ifEntry->enumerated++;
-		break;
-	      case MIB_IF_TYPE_LOOPBACK:
-		strcpy (ifr->ifr_name, "lo");
-		break;
-	      default:
-		continue;
-	    }
-	  /* setup sockaddr struct */
-	  switch (what)
-	    {
-	      case SIOCGIFCONF:
-	      case SIOCGIFADDR:
-		sa = (struct sockaddr_in *) &ifr->ifr_addr;
-		sa->sin_addr.s_addr = ipt->table[ip_cnt].dwAddr;
-		sa->sin_family = AF_INET;
-		sa->sin_port = 0;
-		break;
-	      case SIOCGIFBRDADDR:
-		sa = (struct sockaddr_in *) &ifr->ifr_broadaddr;
-#if 0
-		/* Unfortunately, the field returns only crap. */
-		sa->sin_addr.s_addr = ipt->table[ip_cnt].dwBCastAddr;
-#else
-		lip = ipt->table[ip_cnt].dwAddr;
-		lnp = ipt->table[ip_cnt].dwMask;
-		sa->sin_addr.s_addr = lip & lnp | ~lnp;
-		sa->sin_family = AF_INET;
-		sa->sin_port = 0;
-#endif
-		break;
-	      case SIOCGIFNETMASK:
-		sa = (struct sockaddr_in *) &ifr->ifr_netmask;
-		sa->sin_addr.s_addr = ipt->table[ip_cnt].dwMask;
-		sa->sin_family = AF_INET;
-		sa->sin_port = 0;
-		break;
-	      case SIOCGIFHWADDR:
-		so = &ifr->ifr_hwaddr;
-		for (UINT i = 0; i < IFHWADDRLEN; ++i)
-		  if (i >= ifrow->dwPhysAddrLen)
-		    so->sa_data[i] = '\0';
-		  else
-		    so->sa_data[i] = ifrow->bPhysAddr[i];
-		so->sa_family = AF_INET;
-		break;
-	      case SIOCGIFMETRIC:
-		ifr->ifr_metric = 1;
-		break;
-	      case SIOCGIFMTU:
-		ifr->ifr_mtu = ifrow->dwMtu;
-		break;
-	    }
-	  ++cnt;
-	  if ((caddr_t)++ ifr >
-	      ifc->ifc_buf + ifc->ifc_len - sizeof (struct ifreq))
-	    goto done;
-	}
-    }
-
-done:
-  /* Set the correct length */
-  ifc->ifc_len = cnt * sizeof (struct ifreq);
-}
-
-/*
- * IFCONF Windows NT < SP4:
- * Look at the Bind value in
- * HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Tcpip\Linkage\
- * This is a REG_MULTI_SZ with strings of the form:
- * \Device\<Netcard>, where netcard is the name of the net device.
- * Then look under:
- * HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\<NetCard>\
- *							Parameters\Tcpip
- * at the IPAddress, Subnetmask and DefaultGateway values for the
- * required values.
- */
-static void
-get_nt_ifconf (struct ifconf *ifc, int what)
-{
-  HKEY key;
-  unsigned long lip, lnp;
-  struct sockaddr_in *sa = NULL;
-  struct sockaddr *so = NULL;
-  DWORD size;
-  int cnt = 1;
-  char *binding = (char *) 0;
-
-  /* Union maps buffer to correct struct */
-  struct ifreq *ifr = ifc->ifc_req;
-
-  if (RegOpenKeyEx (HKEY_LOCAL_MACHINE,
-		    "SYSTEM\\"
-		    "CurrentControlSet\\"
-		    "Services\\"
-		    "Tcpip\\" "Linkage",
-		    0, KEY_READ, &key) == ERROR_SUCCESS)
-    {
-      if (RegQueryValueEx (key, "Bind",
-			   NULL, NULL,
-			   NULL, &size) == ERROR_SUCCESS)
-	{
-	  binding = (char *) alloca (size);
-	  if (RegQueryValueEx (key, "Bind",
-			       NULL, NULL,
-			       (unsigned char *) binding,
-			       &size) != ERROR_SUCCESS)
-	    {
-	      binding = NULL;
-	    }
-	}
-      RegCloseKey (key);
-    }
-
-  if (binding)
-    {
-      char *bp, eth[2] = "/";
-      char cardkey[256], ipaddress[256], netmask[256];
-
-      for (bp = binding; *bp; bp += strlen (bp) + 1)
-	{
-	  bp += strlen ("\\Device\\");
-	  strcpy (cardkey, "SYSTEM\\CurrentControlSet\\Services\\");
-	  strcat (cardkey, bp);
-	  strcat (cardkey, "\\Parameters\\Tcpip");
-
-	  if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, cardkey,
-			    0, KEY_READ, &key) != ERROR_SUCCESS)
-	    continue;
-
-	  if (RegQueryValueEx (key, "IPAddress",
-			       NULL, NULL,
-			       (unsigned char *) ipaddress,
-			       (size = 256, &size)) == ERROR_SUCCESS
-	      && RegQueryValueEx (key, "SubnetMask",
-				  NULL, NULL,
-				  (unsigned char *) netmask,
-				  (size = 256, &size)) == ERROR_SUCCESS)
-	    {
-	      char *ip, *np;
-	      char dhcpaddress[256], dhcpnetmask[256];
-
-	      for (ip = ipaddress, np = netmask;
-		   *ip && *np;
-		   ip += strlen (ip) + 1, np += strlen (np) + 1)
-		{
-		  if ((caddr_t)++ ifr > ifc->ifc_buf
-		      + ifc->ifc_len - sizeof (struct ifreq))
-		    break;
-
-		  if (!strncmp (bp, "NdisWan", 7))
-		    {
-		      strcpy (ifr->ifr_name, "ppp");
-		      strcat (ifr->ifr_name, bp + 7);
-		    }
-		  else
-		    {
-		      ++*eth;
-		      strcpy (ifr->ifr_name, "eth");
-		      strcat (ifr->ifr_name, eth);
-		    }
-		  memset (&ifr->ifr_addr, '\0', sizeof ifr->ifr_addr);
-		  if (cygwin_inet_addr (ip) == 0L
-		      && RegQueryValueEx (key, "DhcpIPAddress",
-					  NULL, NULL,
-					  (unsigned char *) dhcpaddress,
-					  (size = 256, &size))
-		      == ERROR_SUCCESS
-		      && RegQueryValueEx (key, "DhcpSubnetMask",
-					  NULL, NULL,
-					  (unsigned char *) dhcpnetmask,
-					  (size = 256, &size))
-		      == ERROR_SUCCESS)
-		    {
-		      switch (what)
-			{
-			  case SIOCGIFCONF:
-			  case SIOCGIFADDR:
-			    sa = (struct sockaddr_in *) &ifr->ifr_addr;
-			    sa->sin_addr.s_addr =
-			      cygwin_inet_addr (dhcpaddress);
-			    sa->sin_family = AF_INET;
-			    sa->sin_port = 0;
-			    break;
-			  case SIOCGIFBRDADDR:
-			    lip = cygwin_inet_addr (dhcpaddress);
-			    lnp = cygwin_inet_addr (dhcpnetmask);
-			    sa = (struct sockaddr_in *) &ifr->ifr_broadaddr;
-			    sa->sin_addr.s_addr = lip & lnp | ~lnp;
-			    sa->sin_family = AF_INET;
-			    sa->sin_port = 0;
-			    break;
-			  case SIOCGIFNETMASK:
-			    sa = (struct sockaddr_in *) &ifr->ifr_netmask;
-			    sa->sin_addr.s_addr =
-			      cygwin_inet_addr (dhcpnetmask);
-			    sa->sin_family = AF_INET;
-			    sa->sin_port = 0;
-			    break;
-			  case SIOCGIFHWADDR:
-			    so = &ifr->ifr_hwaddr;
-			    memset (so->sa_data, 0, IFHWADDRLEN);
-			    so->sa_family = AF_INET;
-			    break;
-			  case SIOCGIFMETRIC:
-			    ifr->ifr_metric = 1;
-			    break;
-			  case SIOCGIFMTU:
-			    ifr->ifr_mtu = 1500;
-			    break;
-			}
-		    }
-		  else
-		    {
-		      switch (what)
-			{
-			  case SIOCGIFCONF:
-			  case SIOCGIFADDR:
-			    sa = (struct sockaddr_in *) &ifr->ifr_addr;
-			    sa->sin_addr.s_addr = cygwin_inet_addr (ip);
-			    sa->sin_family = AF_INET;
-			    sa->sin_port = 0;
-			    break;
-			  case SIOCGIFBRDADDR:
-			    lip = cygwin_inet_addr (ip);
-			    lnp = cygwin_inet_addr (np);
-			    sa = (struct sockaddr_in *) &ifr->ifr_broadaddr;
-			    sa->sin_addr.s_addr = lip & lnp | ~lnp;
-			    sa->sin_family = AF_INET;
-			    sa->sin_port = 0;
-			    break;
-			  case SIOCGIFNETMASK:
-			    sa = (struct sockaddr_in *) &ifr->ifr_netmask;
-			    sa->sin_addr.s_addr = cygwin_inet_addr (np);
-			    sa->sin_family = AF_INET;
-			    sa->sin_port = 0;
-			    break;
-			  case SIOCGIFHWADDR:
-			    so = &ifr->ifr_hwaddr;
-			    memset (so->sa_data, 0, IFHWADDRLEN);
-			    so->sa_family = AF_INET;
-			    break;
-			  case SIOCGIFMETRIC:
-			    ifr->ifr_metric = 1;
-			    break;
-			  case SIOCGIFMTU:
-			    ifr->ifr_mtu = 1500;
-			    break;
-			}
-		    }
-		  ++cnt;
-		}
-	    }
-	  RegCloseKey (key);
-	}
-    }
-
-  /* Set the correct length */
-  ifc->ifc_len = cnt * sizeof (struct ifreq);
-}
-
-/*
- * IFCONF Windows 95:
- * HKLM/Enum/Network/MSTCP/"*"
- *	  -> Value "Driver" enth�lt Subkey relativ zu
- *	    HKLM/System/CurrentControlSet/Class/
- *	  -> In Subkey "Bindings" die Values aufz�hlen
- *	    -> Enth�lt Subkeys der Form "VREDIR\*"
- *	       Das * ist ein Subkey relativ zu
- *	       HKLM/System/CurrentControlSet/Class/Net/
- * HKLM/System/CurrentControlSet/Class/"Driver"
- *	  -> Value "IPAddress"
- *	  -> Value "IPMask"
- * HKLM/System/CurrentControlSet/Class/Net/"*"(aus "VREDIR\*")
- *	  -> Wenn Value "AdapterName" == "MS$PPP" -> ppp interface
- *	  -> Value "DriverDesc" enth�lt den Namen
- *
- */
-static void
-get_95_ifconf (struct ifconf *ifc, int what)
-{
-  HKEY key;
-  unsigned long lip, lnp;
-  struct sockaddr_in *sa = NULL;
-  struct sockaddr *so = NULL;
-  FILETIME update;
-  LONG res;
-  DWORD size;
-  int cnt = 1;
-  char ifname[256];
-  char eth[2] = "/";
-  char ppp[2] = "/";
-
-  /* Union maps buffer to correct struct */
-  struct ifreq *ifr = ifc->ifc_req;
-
-  if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Enum\\Network\\MSTCP",
-		    0, KEY_READ, &key) != ERROR_SUCCESS)
-    {
-      /* Set the correct length */
-      ifc->ifc_len = cnt * sizeof (struct ifreq);
-      return;
-    }
-
-  for (int i = 0;
-       (res = RegEnumKeyEx (key, i, ifname,
-			    (size = sizeof ifname, &size),
-			    0, 0, 0, &update)) != ERROR_NO_MORE_ITEMS;
-       ++i)
-    {
-      HKEY ifkey, subkey;
-      char driver[256], classname[256], netname[256];
-      char adapter[256], ip[256], np[256];
-
-      if (res != ERROR_SUCCESS
-	  || RegOpenKeyEx (key, ifname, 0, KEY_READ, &ifkey) != ERROR_SUCCESS)
-	continue;
-
-      if (RegQueryValueEx (ifkey, "Driver", 0,
-			   NULL, (unsigned char *) driver,
-			   (size = sizeof driver, &size)) != ERROR_SUCCESS)
-	{
-	  RegCloseKey (ifkey);
-	  continue;
-	}
-
-      strcpy (classname, "System\\CurrentControlSet\\Services\\Class\\");
-      strcat (classname, driver);
-      if ((res = RegOpenKeyEx (HKEY_LOCAL_MACHINE, classname,
-			       0, KEY_READ, &subkey)) != ERROR_SUCCESS)
-	{
-	  RegCloseKey (ifkey);
-	  continue;
-	}
-
-      if (RegQueryValueEx (subkey, "IPAddress", 0,
-			   NULL, (unsigned char *) ip,
-			   (size = sizeof ip, &size)) == ERROR_SUCCESS
-	  && RegQueryValueEx (subkey, "IPMask", 0,
-			      NULL, (unsigned char *) np,
-			      (size = sizeof np, &size)) == ERROR_SUCCESS)
-	{
-	  if ((caddr_t)++ ifr > ifc->ifc_buf
-	      + ifc->ifc_len - sizeof (struct ifreq))
-	    goto out;
-
-	  switch (what)
-	    {
-	      case SIOCGIFCONF:
-	      case SIOCGIFADDR:
-		sa = (struct sockaddr_in *) &ifr->ifr_addr;
-		sa->sin_addr.s_addr = cygwin_inet_addr (ip);
-		sa->sin_family = AF_INET;
-		sa->sin_port = 0;
-		break;
-	      case SIOCGIFBRDADDR:
-		lip = cygwin_inet_addr (ip);
-		lnp = cygwin_inet_addr (np);
-		sa = (struct sockaddr_in *) &ifr->ifr_broadaddr;
-		sa->sin_addr.s_addr = lip & lnp | ~lnp;
-		sa->sin_family = AF_INET;
-		sa->sin_port = 0;
-		break;
-	      case SIOCGIFNETMASK:
-		sa = (struct sockaddr_in *) &ifr->ifr_netmask;
-		sa->sin_addr.s_addr = cygwin_inet_addr (np);
-		sa->sin_family = AF_INET;
-		sa->sin_port = 0;
-		break;
-	      case SIOCGIFHWADDR:
-		so = &ifr->ifr_hwaddr;
-		memset (so->sa_data, 0, IFHWADDRLEN);
-		so->sa_family = AF_INET;
-		break;
-	      case SIOCGIFMETRIC:
-		ifr->ifr_metric = 1;
-		break;
-	      case SIOCGIFMTU:
-		ifr->ifr_mtu = 1500;
-		break;
-	    }
-	}
-
-      RegCloseKey (subkey);
-
-      strcpy (netname, "System\\CurrentControlSet\\Services\\Class\\Net\\");
-      strcat (netname, ifname);
-
-      if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, netname,
-			0, KEY_READ, &subkey) != ERROR_SUCCESS)
-	{
-	  RegCloseKey (ifkey);
-	  --ifr;
-	  continue;
-	}
-
-      if (RegQueryValueEx (subkey, "AdapterName", 0,
-			   NULL, (unsigned char *) adapter,
-			   (size = sizeof adapter, &size)) == ERROR_SUCCESS
-	  && strcasematch (adapter, "MS$PPP"))
-	{
-	  ++*ppp;
-	  strcpy (ifr->ifr_name, "ppp");
-	  strcat (ifr->ifr_name, ppp);
-	}
-      else
-	{
-	  ++*eth;
-	  strcpy (ifr->ifr_name, "eth");
-	  strcat (ifr->ifr_name, eth);
-	}
-
-      RegCloseKey (subkey);
-      RegCloseKey (ifkey);
-
-      ++cnt;
-    }
-
-out:
-
-  RegCloseKey (key);
-
-  /* Set the correct length */
-  ifc->ifc_len = cnt * sizeof (struct ifreq);
-}
-
-int
-get_ifconf (struct ifconf *ifc, int what)
-{
-  unsigned long lip, lnp;
-  struct sockaddr_in *sa;
-
-  sig_dispatch_pending ();
-  if (check_null_invalid_struct_errno (ifc))
-    return -1;
-
-  /* Union maps buffer to correct struct */
-  struct ifreq *ifr = ifc->ifc_req;
-
-  /* Ensure we have space for two struct ifreqs, fail if not. */
-  if (ifc->ifc_len < (int) (2 * sizeof (struct ifreq)))
-    {
-      set_errno (EFAULT);
-      return -1;
-    }
-
-  /* Set up interface lo0 first */
-  strcpy (ifr->ifr_name, "lo");
-  memset (&ifr->ifr_addr, '\0', sizeof (ifr->ifr_addr));
-  switch (what)
-    {
-      case SIOCGIFCONF:
-      case SIOCGIFADDR:
-	sa = (struct sockaddr_in *) &ifr->ifr_addr;
-	sa->sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-	sa->sin_family = AF_INET;
-	sa->sin_port = 0;
-	break;
-      case SIOCGIFBRDADDR:
-	lip = htonl (INADDR_LOOPBACK);
-	lnp = cygwin_inet_addr ("255.0.0.0");
-	sa = (struct sockaddr_in *) &ifr->ifr_broadaddr;
-	sa->sin_addr.s_addr = lip & lnp | ~lnp;
-	sa->sin_family = AF_INET;
-	sa->sin_port = 0;
-	break;
-      case SIOCGIFNETMASK:
-	sa = (struct sockaddr_in *) &ifr->ifr_netmask;
-	sa->sin_addr.s_addr = cygwin_inet_addr ("255.0.0.0");
-	sa->sin_family = AF_INET;
-	sa->sin_port = 0;
-	break;
-      case SIOCGIFHWADDR:
-	ifr->ifr_hwaddr.sa_family = AF_INET;
-	memset (ifr->ifr_hwaddr.sa_data, 0, IFHWADDRLEN);
-	break;
-      case SIOCGIFMETRIC:
-	ifr->ifr_metric = 1;
-	break;
-      case SIOCGIFMTU:
-	/* This funny value is returned by `ifconfig lo' on Linux 2.2 kernel. */
-	ifr->ifr_mtu = 3924;
-	break;
-      default:
-	set_errno (EINVAL);
-	return -1;
-    }
-
-  OSVERSIONINFO os_version_info;
-
-  memset (&os_version_info, 0, sizeof os_version_info);
-  os_version_info.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
-  GetVersionEx (&os_version_info);
-  if (wincap.has_ip_helper_lib ())
-    get_2k_ifconf (ifc, what);
-  else if (wincap.is_winnt ())
-    get_nt_ifconf (ifc, what);
-  else
-    get_95_ifconf (ifc, what);
-  return 0;
-}
-
-/* exported as rcmd: standards? */
-extern "C" int
-cygwin_rcmd (char **ahost, unsigned short inport, char *locuser,
-	     char *remuser, char *cmd, int *fd2p)
-{
-  int res = -1;
-  SOCKET fd2s;
-
-  sig_dispatch_pending ();
-
-  if (check_null_invalid_struct_errno (ahost) ||
-      check_null_empty_str_errno (*ahost) ||
-      (locuser && check_null_empty_str_errno (locuser)) ||
-      (remuser && check_null_str_errno (remuser)))
-    return (int) INVALID_SOCKET;
-
-  res = rcmd (ahost, inport, locuser, remuser, cmd, fd2p ? &fd2s : NULL);
-  if (res != (int) INVALID_SOCKET)
-    {
-      cygheap_fdnew res_fd;
-
-      if (res_fd >= 0 && fdsock (res_fd, tcp_dev, res))
-	{
-	  ((fhandler_socket *) res_fd)->set_connect_state (CONNECTED);
-	  res = res_fd;
-	}
-      else
-	{
-	  closesocket (res);
-	  res = -1;
-	}
-
-      if (res >= 0 && fd2p)
-	{
-	  cygheap_fdnew newfd (res_fd, false);
-	  cygheap_fdget fd (*fd2p);
-
-	  if (newfd >= 0 && fdsock (newfd, tcp_dev, fd2s))
-	    {
-	      *fd2p = newfd;
-	      ((fhandler_socket *) fd2p)->set_connect_state (CONNECTED);
-	    }
-	  else
-	    {
-	      closesocket (res);
-	      closesocket (fd2s);
-	      res = -1;
-	    }
-	}
-    }
-
-  syscall_printf ("%d = rcmd (...)", res);
-  return res;
-}
-
-/* exported as rresvport: standards? */
-extern "C" int
-cygwin_rresvport (int *port)
-{
-  int res;
-  sig_dispatch_pending ();
-
-  if (check_null_invalid_struct_errno (port))
-    return -1;
-
-  res = rresvport (port);
-
-  if (res != (int) INVALID_SOCKET)
-    {
-      cygheap_fdnew res_fd;
-
-      if (res_fd >= 0 && fdsock (res_fd, tcp_dev, res))
-        res = res_fd;
-      else
-	res = -1;
-    }
-
-  syscall_printf ("%d = rresvport (%d)", res, port ? *port : 0);
-  return res;
-}
-
-/* exported as rexec: standards? */
-extern "C" int
-cygwin_rexec (char **ahost, unsigned short inport, char *locuser,
-	      char *password, char *cmd, int *fd2p)
-{
-  int res = -1;
-  SOCKET fd2s;
-  sig_dispatch_pending ();
-
-  if (check_null_invalid_struct_errno (ahost) ||
-      check_null_empty_str_errno (*ahost) ||
-      (locuser && check_null_empty_str_errno (locuser)) ||
-      (password && check_null_str_errno (password)))
-    return (int) INVALID_SOCKET;
-
-  res = rexec (ahost, inport, locuser, password, cmd, fd2p ? &fd2s : NULL);
-  if (res != (int) INVALID_SOCKET)
-    {
-      cygheap_fdnew res_fd;
-
-      if (res_fd >= 0 && fdsock (res_fd, tcp_dev, res))
-	{
-	  ((fhandler_socket *) res_fd)->set_connect_state (CONNECTED);
-	  res = res_fd;
-	}
-      else
-	{
-	  closesocket (res);
-	  res = -1;
-	}
-
-      if (res >= 0 && fd2p)
-	{
-	  cygheap_fdnew newfd (res_fd, false);
-	  cygheap_fdget fd (*fd2p);
-
-	  if (newfd >= 0 && fdsock (newfd, tcp_dev, fd2s))
-	    {
-	      ((fhandler_socket *) fd2p)->set_connect_state (CONNECTED);
-	      *fd2p = newfd;
-	    }
-	  else
-	    {
-	      closesocket (res);
-	      closesocket (fd2s);
-	      res = -1;
-	    }
-	}
-    }
-
-  syscall_printf ("%d = rexec (...)", res);
-  return res;
-}
-
-/* socketpair: standards? */
-/* Win32 supports AF_INET only, so ignore domain and protocol arguments */
-extern "C" int
-socketpair (int family, int type, int protocol, int *sb)
-{
-  int res = -1;
-  SOCKET insock, outsock, newsock;
-  struct sockaddr_in sock_in, sock_out;
-  int len;
-
-  sig_dispatch_pending ();
-  if (__check_null_invalid_struct_errno (sb, 2 * sizeof (int)))
-    return -1;
-
-  if (family != AF_LOCAL && family != AF_INET)
-    {
-      set_errno (EAFNOSUPPORT);
-      goto done;
-    }
-  if (type != SOCK_STREAM && type != SOCK_DGRAM)
-    {
-      set_errno (EPROTOTYPE);
-      goto done;
-    }
-  if ((family == AF_LOCAL && protocol != PF_UNSPEC && protocol != PF_LOCAL)
-      || (family == AF_INET && protocol != PF_UNSPEC && protocol != PF_INET))
-    {
-      set_errno (EPROTONOSUPPORT);
-      goto done;
-    }
-
-  /* create the first socket */
-  newsock = socket (AF_INET, type, 0);
-  if (newsock == INVALID_SOCKET)
-    {
-      debug_printf ("first socket call failed");
-      set_winsock_errno ();
-      goto done;
-    }
-
-  /* bind the socket to any unused port */
-  sock_in.sin_family = AF_INET;
-  sock_in.sin_port = 0;
-  sock_in.sin_addr.s_addr = INADDR_ANY;
-  if (bind (newsock, (struct sockaddr *) &sock_in, sizeof (sock_in)) < 0)
-    {
-      debug_printf ("bind failed");
-      set_winsock_errno ();
-      closesocket (newsock);
-      goto done;
-    }
-  len = sizeof (sock_in);
-  if (getsockname (newsock, (struct sockaddr *) &sock_in, &len) < 0)
-    {
-      debug_printf ("getsockname error");
-      set_winsock_errno ();
-      closesocket (newsock);
-      goto done;
-    }
-
-  /* For stream sockets, create a listener */
-  if (type == SOCK_STREAM)
-    listen (newsock, 2);
-
-  /* create a connecting socket */
-  outsock = socket (AF_INET, type, 0);
-  if (outsock == INVALID_SOCKET)
-    {
-      debug_printf ("second socket call failed");
-      set_winsock_errno ();
-      closesocket (newsock);
-      goto done;
-    }
-
-  /* For datagram sockets, bind the 2nd socket to an unused address, too */
-  if (type == SOCK_DGRAM)
-    {
-      sock_out.sin_family = AF_INET;
-      sock_out.sin_port = 0;
-      sock_out.sin_addr.s_addr = INADDR_ANY;
-      if (bind (outsock, (struct sockaddr *) &sock_out, sizeof (sock_out)) < 0)
-	{
-	  debug_printf ("bind failed");
-	  set_winsock_errno ();
-	  closesocket (newsock);
-	  closesocket (outsock);
-	  goto done;
-	}
-      len = sizeof (sock_out);
-      if (getsockname (outsock, (struct sockaddr *) &sock_out, &len) < 0)
-	{
-	  debug_printf ("getsockname error");
-	  set_winsock_errno ();
-	  closesocket (newsock);
-	  closesocket (outsock);
-	  goto done;
-	}
-    }
-
-  /* Force IP address to loopback */
-  sock_in.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-  if (type == SOCK_DGRAM)
-    sock_out.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-
-  /* Do a connect */
-  if (connect (outsock, (struct sockaddr *) &sock_in, sizeof (sock_in)) < 0)
-    {
-      debug_printf ("connect error");
-      set_winsock_errno ();
-      closesocket (newsock);
-      closesocket (outsock);
-      goto done;
-    }
-
-  if (type == SOCK_STREAM)
-    {
-      /* For stream sockets, accept the connection and close the listener */
-      len = sizeof (sock_in);
-      insock = accept (newsock, (struct sockaddr *) &sock_in, &len);
-      if (insock == INVALID_SOCKET)
-	{
-	  debug_printf ("accept error");
-	  set_winsock_errno ();
-	  closesocket (newsock);
-	  closesocket (outsock);
-	  goto done;
-	}
-      closesocket (newsock);
-    }
-  else
-    {
-      /* For datagram sockets, connect the 2nd socket */
-      if (connect (newsock, (struct sockaddr *) &sock_out,
-		   sizeof (sock_out)) < 0)
-	{
-	  debug_printf ("connect error");
-	  set_winsock_errno ();
-	  closesocket (newsock);
-	  closesocket (outsock);
-	  goto done;
-	}
-      insock = newsock;
-    }
-
-  {
-    cygheap_fdnew sb0;
-    const device *dev;
-
-    if (family == AF_INET)
-      dev = (type == SOCK_STREAM ? tcp_dev : udp_dev);
-    else
-      dev = (type == SOCK_STREAM ? stream_dev : dgram_dev);
-
-    if (sb0 >= 0 && fdsock (sb0, dev, insock))
-      {
-	((fhandler_socket *) sb0)->set_sun_path ("");
-	((fhandler_socket *) sb0)->set_addr_family (family);
-	((fhandler_socket *) sb0)->set_socket_type (type);
-	((fhandler_socket *) sb0)->set_connect_state (CONNECTED);
-
-	cygheap_fdnew sb1 (sb0, false);
-
-	if (sb1 >= 0 && fdsock (sb1, dev, outsock))
-	  {
-	    ((fhandler_socket *) sb1)->set_sun_path ("");
-	    ((fhandler_socket *) sb1)->set_addr_family (family);
-	    ((fhandler_socket *) sb1)->set_socket_type (type);
-	    ((fhandler_socket *) sb1)->set_connect_state (CONNECTED);
-
-	    sb[0] = sb0;
-	    sb[1] = sb1;
-	    res = 0;
-	  }
-      }
-
-    if (res == -1)
-      {
-	closesocket (insock);
-	closesocket (outsock);
-      }
-  }
-
-done:
-  syscall_printf ("%d = socketpair (...)", res);
-  return res;
-}
-
-/* sethostent: standards? */
-extern "C" void
-sethostent (int)
-{
-}
-
-/* endhostent: standards? */
-extern "C" void
-endhostent (void)
-{
-}
-
-/* exported as recvmsg: standards? */
-extern "C" int
-cygwin_recvmsg (int fd, struct msghdr *msg, int flags)
-{
-  int res;
-  sig_dispatch_pending ();
-
-  fhandler_socket *fh = get (fd);
-
-  if (check_null_invalid_struct_errno (msg)
-      || (msg->msg_name
-	  && __check_null_invalid_struct_errno (msg->msg_name,
-						(unsigned) msg->msg_namelen))
-      || !fh)
-    res = -1;
-  else
-    {
-      res = check_iovec_for_read (msg->msg_iov, msg->msg_iovlen);
-      if (res > 0)
-	res = fh->recvmsg (msg, flags, res); // res == iovec tot
-    }
-
-  syscall_printf ("%d = recvmsg (%d, %p, %x)", res, fd, msg, flags);
-  return res;
-}
-
-/* exported as sendmsg: standards? */
-extern "C" int
-cygwin_sendmsg (int fd, const struct msghdr *msg, int flags)
-{
-  int res;
-  sig_dispatch_pending ();
-
-  fhandler_socket *fh = get (fd);
-
-  if (__check_invalid_read_ptr_errno (msg, sizeof msg)
-      || (msg->msg_name
-	  && __check_invalid_read_ptr_errno (msg->msg_name,
-					     (unsigned) msg->msg_namelen))
-      || !fh)
-    res = -1;
-  else
-    {
-      res = check_iovec_for_write (msg->msg_iov, msg->msg_iovlen);
-      if (res > 0)
-	res = fh->sendmsg (msg, flags, res); // res == iovec tot
-    }
-
-  syscall_printf ("%d = sendmsg (%d, %p, %x)", res, fd, msg, flags);
-  return res;
-}
diff --git a/winsup/cygwin/netdb.cc b/winsup/cygwin/netdb.cc
deleted file mode 100644
index 53f0412dc..000000000
--- a/winsup/cygwin/netdb.cc
+++ /dev/null
@@ -1,423 +0,0 @@
-/* netdb.cc: network database related routines.
-
-   Copyright 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <windows.h>
-#include <sys/cygwin.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <netdb.h>
-
-/* Locate and open a system network database file.  relative_path
- should be one of the following values:
- "protocol"
- "services"
- "networks"
- "hosts"
-
- This routine will try to locate these files based on system type.
- Currently the only distinction made is between NT and non-NT systems.
-
- It is the callers responsibility to close the file.  */
-static FILE *
-open_system_file (const char *relative_path)
-{
-  char win32_name[CYG_MAX_PATH];
-  char posix_name[CYG_MAX_PATH];
-  if (wincap.is_winnt ())
-    {
-      if (!GetSystemDirectory (win32_name, CYG_MAX_PATH))
-	return NULL;
-      strcat (win32_name, "\\drivers\\etc\\");
-    }
-  else
-    {
-      if (!GetWindowsDirectory (win32_name, CYG_MAX_PATH))
-	return NULL;
-      strcat (win32_name, "\\");
-    }
-  strcat (win32_name, relative_path);
-  cygwin_conv_to_full_posix_path (win32_name, posix_name);
-  debug_printf ("netdb file to open %s", win32_name);
-  FILE *result = fopen (posix_name, "rt");
-  debug_printf ("handle to netdb file %p", result);
-  return result;
-}
-
-inline static FILE *
-open_protocol_file ()
-{
-  return open_system_file ("protocol");
-}
-
-/* Wrapper for open_system_file(), fixing the constant name
-"services".  Returns the open file. */
-inline static FILE *
-open_services_file ()
-{
-  return open_system_file ("services");
-}
-
-/* Read an entire line up till the next \n character.  Memory for the
-line is dynamically allocated, and the caller must call free() to
-deallocate it.  When the end of file is reached, NULL is returned.  */
-static char *
-get_entire_line (FILE *fd)
-{
-  static const int BUFF_SIZE = 1024;
-  struct line_fragment
-  {
-    char buffer[BUFF_SIZE];
-    line_fragment *next;
-  };
-
-  line_fragment *fragment_list_head = NULL;
-  line_fragment *fragment = NULL;
-  int fragment_count = 0;
-  char *result;
-
-  do
-    {
-      line_fragment *new_fragment = (line_fragment *) malloc (sizeof (line_fragment));
-      paranoid_printf ("line fragment allocated %p", new_fragment);
-      if (!fragment_list_head)
-	fragment_list_head = new_fragment;
-      if (fragment)
-	fragment->next = new_fragment;
-      fragment = new_fragment;
-      fragment->next = NULL;
-      *fragment->buffer = '\0';
-      result = fgets (fragment->buffer, BUFF_SIZE, fd);
-      ++fragment_count;
-    }
-  while (result && !strchr (fragment->buffer, '\n'));
-
-  if (*fragment_list_head->buffer != '\0')
-    {
-      char *concatenated_line = (char *) calloc (fragment_count * BUFF_SIZE , sizeof (char));
-      paranoid_printf ("concatenated line allocated %p", concatenated_line);
-      *concatenated_line = '\0';
-      fragment = fragment_list_head;
-      while (fragment != NULL)
-	{
-	  line_fragment *previous = fragment;
-	  strcat (concatenated_line, fragment->buffer);
-	  fragment = fragment->next;
-	  free (previous);
-	}
-      return concatenated_line;
-    }
-  else
-    {
-      fragment = fragment_list_head;
-      while (fragment != NULL)
-	{
-	  line_fragment *previous = fragment;
-	  fragment = fragment->next;
-	  free (previous);
-	}
-      return NULL;
-    }
-}
-
-/* Characters representing whitespace.  Used by parse_* routines to
-delimit tokens.  */
-static const NO_COPY char *SPACE = " \t\n\r\f";
-
-/* Parse a list aliases from a network database file.  Returns a
-char** structure terminated by a NULL. */
-static void
-parse_alias_list (char ***aliases, char **lasts)
-{
-  struct alias_t
-  {
-    char *alias_name;
-    alias_t *next;
-  };
-  alias_t *alias_list_head = NULL, *alias_list_tail = NULL;
-  char *alias;
-  int alias_count = 0;
-  alias = strtok_r (NULL, SPACE, lasts);
-
-  while (alias)
-    {
-      ++alias_count;
-      alias_t *new_alias = (alias_t *) malloc (sizeof (alias_t));
-      paranoid_printf ("new alias alloc %p", new_alias);
-      if (!alias_list_head)
-	alias_list_head = new_alias;
-      if (alias_list_tail)
-	alias_list_tail->next = new_alias;
-      new_alias->next = NULL;
-      new_alias->alias_name = alias;
-      alias_list_tail = new_alias;
-      alias = strtok_r (NULL, SPACE, lasts);
-    }
-
-  *aliases = (char**) calloc (alias_count + 1, sizeof (char *));
-  paranoid_printf ("aliases alloc %p", *aliases);
-
-  char **current_entry = *aliases;
-  while (alias_list_head)
-    {
-      alias_t *previous = alias_list_head;
-      *current_entry = strdup (alias_list_head->alias_name);
-      paranoid_printf ("*current entry strdup %p", *current_entry);
-      alias_list_head = alias_list_head->next;
-      free (previous);
-      ++current_entry;
-    }
-
-  *current_entry = NULL;
-}
-
-/* Read the next line from svc_file, and parse it into the structure
-pointed to by sep.  sep can point to stack or static data, but it's
-members will be overwritten with pointers to dynamically allocated
-heap data accommodating parsed data.  It is the responsibility of the
-caller to free up the allocated structures. The function returns true
-to indicate that a line was successfully read and parsed.  False is
-used to indicate that no more lines can be read and parsed.  This
-should also interpreted as end of file. */
-static bool
-parse_services_line (FILE *svc_file, struct servent *sep)
-{
-  char *line;
-  while ((line = get_entire_line (svc_file)))
-    {
-      char *name, *port, *protocol, *lasts;
-
-      line[strcspn (line, "#")] = '\0'; // truncate at comment marker.
-      name = strtok_r (line, SPACE, &lasts);
-      if (!name)
-	{
-	  free (line);
-	  continue;
-	}
-      port = strtok_r (NULL, SPACE, &lasts);
-      protocol = strchr (port, '/');
-      *protocol++ = '\0';
-      sep->s_name = strdup (name);
-      paranoid_printf ("sep->s_name strdup %p", sep->s_name);
-      sep->s_port = atoi (port);
-      sep->s_proto = strdup (protocol);
-      paranoid_printf ("sep->s_proto strdup %p", sep->s_proto);
-      /* parse_alias_list relies on side effects.  Read the comments
-	 for that function.*/
-      parse_alias_list (& sep->s_aliases, &lasts);
-      free (line);
-      return true;
-    }
-  return false;
-}
-
-static FILE *svc_file = NULL;
-static long int svc_read_pos = 0;
-static struct servent current_servent;
-
-/* Steps through a struct servent, and frees all of the internal
-structures.*/
-static void
-free_servent (struct servent *sep)
-{
-  free (sep->s_name);
-  free (sep->s_proto);
-  char ** current = sep->s_aliases;
-  while (current && *current)
-    {
-      free (*current);
-      ++current;
-    }
-  free (sep->s_aliases);
-  sep->s_name = NULL;
-  sep->s_port = 0;
-  sep->s_proto = NULL;
-  sep->s_aliases = NULL;
-}
-
-extern "C" void
-cygwin_setservent (int stay_open)
-{
-  if (svc_file)
-    fclose (svc_file);
-  if (stay_open)
-    svc_file = open_services_file ();
-  free_servent (&current_servent);
-  svc_read_pos = 0;
-  syscall_printf ("setservent (%d)", stay_open);
-}
-
-extern "C" struct servent *
-cygwin_getservent (void)
-{
-  FILE *fd;
-  if (svc_file)
-    fd = svc_file;
-  else
-    {
-      fd = open_services_file ();
-      if (!fd)
-	{
-	  syscall_printf ("%p = getservent()", NULL);
-	  return NULL;
-	}
-      fseek (fd, svc_read_pos, SEEK_SET);
-    }
-  free_servent (&current_servent);
-  bool found = parse_services_line (fd, &current_servent);
-  if (!svc_file)
-    {
-      svc_read_pos = ftell (fd);
-      fclose (fd);
-    }
-  struct servent *result;
-  if (found)
-    result = &current_servent;
-  else
-    result = NULL;
-  syscall_printf ("%p = getservent()", result);
-  return result;
-}
-
-extern "C" void
-cygwin_endservent (void)
-{
-  if (svc_file)
-    {
-      fclose (svc_file);
-      svc_file = NULL;
-    }
-  free_servent (&current_servent);
-  svc_read_pos = 0;
-  syscall_printf ("endservent ()");
-}
-
-/* Read the next line from proto_file, and parse it into the structure
-pointed to by pep.  pep can point to stack or static data, but it's
-members will be overwritten with pointers to dynamically allocated
-heap data accommodating parsed data.  It is the responsibility of the
-caller to free up the allocated structures. The function returns true
-to indicate that a line was successfully read and parsed.  False is
-used to indicate that no more lines can be read and parsed.  This
-should also interpreted as end of file. */
-static bool
-parse_protocol_line (FILE *proto_file, struct protoent *pep)
-{
-  char *line;
-  while ((line = get_entire_line (proto_file)))
-    {
-      char *name, *protocol, *lasts;
-
-      line[strcspn (line, "#")] = '\0'; // truncate at comment marker.
-      name = strtok_r (line, SPACE, &lasts);
-      if (!name)
-	{
-	  free (line);
-	  continue;
-	}
-      protocol = strtok_r (NULL, SPACE, &lasts);
-      pep->p_name = strdup (name);
-      paranoid_printf ("pep->p_name strdup %p", pep->p_name);
-      pep->p_proto = atoi (protocol);
-      /* parse_alias_list relies on side effects.  Read the comments
-	 for that function.*/
-      parse_alias_list (& pep->p_aliases, &lasts);
-      free (line);
-      return true;
-    }
-  return false;
-}
-
-static FILE *proto_file = NULL;
-static long int proto_read_pos = 0;
-static struct protoent current_protoent;
-
-/* Steps through a struct protoent, and frees all the internal
-structures.  */
-static void
-free_protoent (struct protoent *pep)
-{
-  free (pep->p_name);
-  char ** current = pep->p_aliases;
-  while (current && *current)
-    {
-      free (*current);
-      ++current;
-    }
-  free (pep->p_aliases);
-  pep->p_name = NULL;
-  pep->p_proto = 0;
-  pep->p_aliases = NULL;
-}
-
-extern "C" void
-cygwin_setprotoent (int stay_open)
-{
-  if (proto_file)
-    fclose (proto_file);
-
-  if (stay_open)
-    proto_file = open_protocol_file ();
-
-  free_protoent (&current_protoent);
-  proto_read_pos = 0;
-  syscall_printf ("setprotoent (%d)", stay_open);
-}
-
-extern "C" struct protoent *
-cygwin_getprotoent (void)
-{
-  FILE *fd;
-
-  if (proto_file)
-    fd = proto_file;
-  else
-    {
-      fd = open_protocol_file ();
-      if (!fd)
-	{
-	  syscall_printf ("%p = getprotoent()", NULL);
-	  return NULL;
-	}
-      fseek (fd, proto_read_pos, SEEK_SET);
-    }
-  free_protoent (&current_protoent);
-
-  bool found = parse_protocol_line (fd, &current_protoent);
-  if (!proto_file)
-    {
-      proto_read_pos = ftell (fd);
-      fclose (fd);
-    }
-
-  struct protoent *result;
-  if (found)
-    result =  &current_protoent;
-  else
-    result =  NULL;
-
-  syscall_printf ("%p = getprotoent()", result);
-  return result;
-}
-
-extern "C" void
-cygwin_endprotoent (void)
-{
-  if (proto_file)
-    {
-      fclose (proto_file);
-      proto_file = NULL;
-    }
-
-  free_protoent (&current_protoent);
-  proto_read_pos = 0;
-  syscall_printf ("endprotoent ()");
-}
diff --git a/winsup/cygwin/newsym b/winsup/cygwin/newsym
deleted file mode 100755
index 301958ee5..000000000
--- a/winsup/cygwin/newsym
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-lib=$1; shift
-as=$1; shift
-ar=$1; shift
-rm -rf newsym.dir
-trap "rm -rf newsym.dir" 0 1 2 15
-mkdir newsym.dir
-while [ -n "$1" ]; do
-    newsym=$1; shift
-    oldsym=$1; shift
-    cat <<EOF > newsym.dir/$newsym.s
-	.section .text
-	.global	_$newsym
-	.global	__imp__$newsym
-_$newsym:
-	jmp	*__imp__$oldsym
-
-	.section .idata\$7
-	.long	__head_cygwin1_dll
-
-        .section        .idata\$5
-__imp__$newsym:	.rva    1f
-
-	.section .idata\$4
-	.rva	1f
-
-	.section .idata\$6
-1:	.short	2
-	.asciz	"$oldsym"
-EOF
-    $as -o newsym.dir/$newsym.o newsym.dir/$newsym.s
-done
-$ar crus $lib newsym.dir/*.o
diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
deleted file mode 100644
index 45739bf38..000000000
--- a/winsup/cygwin/ntdll.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/* ntdll.h.  Contains ntdll specific stuff not defined elsewhere.
-
-   Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS) 0xc0000004)
-#define PDI_MODULES 0x01
-#define PDI_HEAPS 0x04
-#define LDRP_IMAGE_DLL 0x00000004
-#define WSLE_PAGE_READONLY 0x001
-#define WSLE_PAGE_EXECUTE 0x002
-#define WSLE_PAGE_EXECUTE_READ 0x003
-#define WSLE_PAGE_READWRITE 0x004
-#define WSLE_PAGE_WRITECOPY 0x005
-#define WSLE_PAGE_EXECUTE_READWRITE 0x006
-#define WSLE_PAGE_EXECUTE_WRITECOPY 0x007
-#define WSLE_PAGE_SHARE_COUNT_MASK 0x0E0
-#define WSLE_PAGE_SHAREABLE 0x100
-
-typedef ULONG KAFFINITY;
-
-typedef enum _SYSTEM_INFORMATION_CLASS
-{
-  SystemBasicInformation = 0,
-  SystemPerformanceInformation = 2,
-  SystemTimeOfDayInformation = 3,
-  SystemProcessesAndThreadsInformation = 5,
-  SystemProcessorTimes = 8,
-  /* There are a lot more of these... */
-} SYSTEM_INFORMATION_CLASS;
-
-typedef struct _SYSTEM_BASIC_INFORMATION
-{
-  ULONG Unknown;
-  ULONG MaximumIncrement;
-  ULONG PhysicalPageSize;
-  ULONG NumberOfPhysicalPages;
-  ULONG LowestPhysicalPage;
-  ULONG HighestPhysicalPage;
-  ULONG AllocationGranularity;
-  ULONG LowestUserAddress;
-  ULONG HighestUserAddress;
-  ULONG ActiveProcessors;
-  UCHAR NumberProcessors;
-} SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION;
-
-typedef struct __attribute__ ((aligned (8))) _SYSTEM_PROCESSOR_TIMES
-{
-  LARGE_INTEGER IdleTime;
-  LARGE_INTEGER KernelTime;
-  LARGE_INTEGER UserTime;
-  LARGE_INTEGER DpcTime;
-  LARGE_INTEGER InterruptTime;
-  ULONG InterruptCount;
-} SYSTEM_PROCESSOR_TIMES, *PSYSTEM_PROCESSOR_TIMES;
-
-typedef LONG KPRIORITY;
-typedef struct _VM_COUNTERS
-{
-  ULONG PeakVirtualSize;
-  ULONG VirtualSize;
-  ULONG PageFaultCount;
-  ULONG PeakWorkingSetSize;
-  ULONG WorkingSetSize;
-  ULONG QuotaPeakPagedPoolUsage;
-  ULONG QuotaPagedPoolUsage;
-  ULONG QuotaPeakNonPagedPoolUsage;
-  ULONG QuotaNonPagedPoolUsage;
-  ULONG PagefileUsage;
-  ULONG PeakPagefileUsage;
-} VM_COUNTERS, *PVM_COUNTERS;
-
-typedef struct _CLIENT_ID
-{
-  HANDLE UniqueProcess;
-  HANDLE UniqueThread;
-} CLIENT_ID, *PCLIENT_ID;
-
-typedef enum
-{
-  StateInitialized,
-  StateReady,
-  StateRunning,
-  StateStandby,
-  StateTerminated,
-  StateWait,
-  StateTransition,
-  StateUnknown,
-} THREAD_STATE;
-
-typedef enum
-{
-  Executive,
-  FreePage,
-  PageIn,
-  PoolAllocation,
-  DelayExecution,
-  Suspended,
-  UserRequest,
-  WrExecutive,
-  WrFreePage,
-  WrPageIn,
-  WrPoolAllocation,
-  WrDelayExecution,
-  WrSuspended,
-  WrUserRequest,
-  WrEventPair,
-  WrQueue,
-  WrLpcReceive,
-  WrLpcReply,
-  WrVirtualMemory,
-  WrPageOut,
-  WrRendezvous,
-  Spare2,
-  Spare3,
-  Spare4,
-  Spare5,
-  Spare6,
-  WrKernel,
-  MaximumWaitReason
-} KWAIT_REASON;
-
-typedef struct _SYSTEM_THREADS
-{
-  LARGE_INTEGER KernelTime;
-  LARGE_INTEGER UserTime;
-  LARGE_INTEGER CreateTime;
-  ULONG WaitTime;
-  PVOID StartAddress;
-  CLIENT_ID ClientId;
-  KPRIORITY Priority;
-  KPRIORITY BasePriority;
-  ULONG ContextSwitchCount;
-  THREAD_STATE State;
-  KWAIT_REASON WaitReason;
-  DWORD Reserved;
-} SYSTEM_THREADS, *PSYSTEM_THREADS;
-
-typedef struct _SYSTEM_PROCESSES
-{
-  ULONG NextEntryDelta;
-  ULONG ThreadCount;
-  ULONG Reserved1[6];
-  LARGE_INTEGER CreateTime;
-  LARGE_INTEGER UserTime;
-  LARGE_INTEGER KernelTime;
-  UNICODE_STRING ProcessName;
-  KPRIORITY BasePriority;
-  ULONG ProcessId;
-  ULONG InheritedFromProcessId;
-  ULONG HandleCount;
-  ULONG Reserved2[2];
-  VM_COUNTERS VmCounters;
-  IO_COUNTERS IoCounters;
-  SYSTEM_THREADS Threads[1];
-} SYSTEM_PROCESSES, *PSYSTEM_PROCESSES;
-
-typedef struct _IO_STATUS_BLOCK
-{
-  NTSTATUS Status;
-  ULONG Information;
-} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
-
-typedef struct _SYSTEM_PERFORMANCE_INFORMATION
-{
-  LARGE_INTEGER IdleTime;
-  LARGE_INTEGER ReadTransferCount;
-  LARGE_INTEGER WriteTransferCount;
-  LARGE_INTEGER OtherTransferCount;
-  ULONG ReadOperationCount;
-  ULONG WriteOperationCount;
-  ULONG OtherOperationCount;
-  ULONG AvailablePages;
-  ULONG TotalCommittedPages;
-  ULONG TotalCommitLimit;
-  ULONG PeakCommitment;
-  ULONG PageFaults;
-  ULONG WriteCopyFaults;
-  ULONG TransitionFaults;
-  ULONG Reserved1;
-  ULONG DemandZeroFaults;
-  ULONG PagesRead;
-  ULONG PageReadIos;
-  ULONG Reserved2[2];
-  ULONG PagefilePagesWritten;
-  ULONG PagefilePageWriteIos;
-  ULONG MappedFilePagesWritten;
-  ULONG MappedFilePageWriteIos;
-  ULONG PagedPoolUsage;
-  ULONG NonPagedPoolUsage;
-  ULONG PagedPoolAllocs;
-  ULONG PagedPoolFrees;
-  ULONG NonPagedPoolAllocs;
-  ULONG NonPagedPoolFrees;
-  ULONG TotalFreeSystemPtes;
-  ULONG SystemCodePage;
-  ULONG TotalSystemDriverPages;
-  ULONG TotalSystemCodePages;
-  ULONG SmallNonPagedLookasideListAllocateHits;
-  ULONG SmallPagedLookasideListAllocateHits;
-  ULONG Reserved3;
-  ULONG MmSystemCachePage;
-  ULONG PagedPoolPage;
-  ULONG SystemDriverPage;
-  ULONG FastReadNoWait;
-  ULONG FastReadWait;
-  ULONG FastReadResourceMiss;
-  ULONG FastReadNotPossible;
-  ULONG FastMdlReadNoWait;
-  ULONG FastMdlReadWait;
-  ULONG FastMdlReadResourceMiss;
-  ULONG FastMdlReadNotPossible;
-  ULONG MapDataNoWait;
-  ULONG MapDataWait;
-  ULONG MapDataNoWaitMiss;
-  ULONG MapDataWaitMiss;
-  ULONG PinMappedDataCount;
-  ULONG PinReadNoWait;
-  ULONG PinReadWait;
-  ULONG PinReadNoWaitMiss;
-  ULONG PinReadWaitMiss;
-  ULONG CopyReadNoWait;
-  ULONG CopyReadWait;
-  ULONG CopyReadNoWaitMiss;
-  ULONG CopyReadWaitMiss;
-  ULONG MdlReadNoWait;
-  ULONG MdlReadWait;
-  ULONG MdlReadNoWaitMiss;
-  ULONG MdlReadWaitMiss;
-  ULONG ReadAheadIos;
-  ULONG LazyWriteIos;
-  ULONG LazyWritePages;
-  ULONG DataFlushes;
-  ULONG DataPages;
-  ULONG ContextSwitches;
-  ULONG FirstLevelTbFills;
-  ULONG SecondLevelTbFills;
-  ULONG SystemCalls;
-} SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION;
-
-typedef struct __attribute__ ((aligned(8))) _SYSTEM_TIME_OF_DAY_INFORMATION
-{
-  LARGE_INTEGER BootTime;
-  LARGE_INTEGER CurrentTime;
-  LARGE_INTEGER TimeZoneBias;
-  ULONG CurrentTimeZoneId;
-} SYSTEM_TIME_OF_DAY_INFORMATION, *PSYSTEM_TIME_OF_DAY_INFORMATION;
-
-typedef enum _PROCESSINFOCLASS
-{
-  ProcessBasicInformation = 0,
-  ProcessQuotaLimits = 1,
-  ProcessVmCounters = 3,
-  ProcessTimes =4,
-} PROCESSINFOCLASS;
-
-typedef struct _DEBUG_BUFFER
-{
-  HANDLE SectionHandle;
-  PVOID SectionBase;
-  PVOID RemoteSectionBase;
-  ULONG SectionBaseDelta;
-  HANDLE EventPairHandle;
-  ULONG Unknown[2];
-  HANDLE RemoteThreadHandle;
-  ULONG InfoClassMask;
-  ULONG SizeOfInfo;
-  ULONG AllocatedSize;
-  ULONG SectionSize;
-  PVOID ModuleInformation;
-  PVOID BackTraceInformation;
-  PVOID HeapInformation;
-  PVOID LockInformation;
-  PVOID Reserved[9];
-} DEBUG_BUFFER, *PDEBUG_BUFFER;
-
-typedef struct _DEBUG_HEAP_INFORMATION
-{
-  ULONG Base;
-  ULONG Flags;
-  USHORT Granularity;
-  USHORT Unknown;
-  ULONG Allocated;
-  ULONG Committed;
-  ULONG TagCount;
-  ULONG BlockCount;
-  ULONG Reserved[7];
-  PVOID Tags;
-  PVOID Blocks;
-} DEBUG_HEAP_INFORMATION, *PDEBUG_HEAP_INFORMATION;
-
-typedef struct _DEBUG_MODULE_INFORMATION
-{
-  ULONG Reserved[2];
-  ULONG Base;
-  ULONG Size;
-  ULONG Flags;
-  USHORT Index;
-  USHORT Unknown;
-  USHORT LoadCount;
-  USHORT ModuleNameOffset;
-  CHAR ImageName[256];
-} DEBUG_MODULE_INFORMATION, *PDEBUG_MODULE_INFORMATION;
-
-typedef struct _KERNEL_USER_TIMES
-{
-  LARGE_INTEGER CreateTime;
-  LARGE_INTEGER ExitTime;
-  LARGE_INTEGER KernelTime;
-  LARGE_INTEGER UserTime;
-} KERNEL_USER_TIMES, *PKERNEL_USER_TIMES;
-
-typedef void *PPEB;
-
-typedef struct _PROCESS_BASIC_INFORMATION
-{
-  NTSTATUS ExitStatus;
-  PPEB PebBaseAddress;
-  KAFFINITY AffinityMask;
-  KPRIORITY BasePriority;
-  ULONG UniqueProcessId;
-  ULONG InheritedFromUniqueProcessId;
-} PROCESS_BASIC_INFORMATION, *PPROCESS_BASIC_INFORMATION;
-
-typedef enum _MEMORY_INFORMATION_CLASS
-{
-  MemoryBasicInformation,
-  MemoryWorkingSetList,
-  MemorySectionName,
-  MemoryBasicVlmInformation
-} MEMORY_INFORMATION_CLASS;
-
-typedef struct _MEMORY_WORKING_SET_LIST
-{
-  ULONG NumberOfPages;
-  ULONG WorkingSetList[1];
-} MEMORY_WORKING_SET_LIST, *PMEMORY_WORKING_SET_LIST;
-
-typedef struct _FILE_NAME_INFORMATION
-{
-  DWORD FileNameLength;
-  WCHAR FileName[MAX_PATH + 100];
-} FILE_NAME_INFORMATION;
-
-typedef enum _OBJECT_INFORMATION_CLASS
-{
-   ObjectBasicInformation = 0,
-   ObjectNameInformation = 1,
-   ObjectHandleInformation = 4
-   // and many more
-} OBJECT_INFORMATION_CLASS;
-
-typedef struct _OBJECT_NAME_INFORMATION
-{
-  UNICODE_STRING Name;
-} OBJECT_NAME_INFORMATION;
-
-/* Function declarations for ntdll.dll.  These don't appear in any
-   standard Win32 header.  */
-extern "C"
-{
-  NTSTATUS NTAPI NtCreateToken (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES,
-				TOKEN_TYPE, PLUID, PLARGE_INTEGER, PTOKEN_USER,
-				PTOKEN_GROUPS, PTOKEN_PRIVILEGES, PTOKEN_OWNER,
-				PTOKEN_PRIMARY_GROUP, PTOKEN_DEFAULT_DACL,
-				PTOKEN_SOURCE);
-  NTSTATUS NTAPI NtMapViewOfSection (HANDLE, HANDLE, PVOID *, ULONG, ULONG,
-				     PLARGE_INTEGER, PULONG, SECTION_INHERIT,
-				     ULONG, ULONG);
-  NTSTATUS NTAPI NtOpenFile (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES,
-			     PIO_STATUS_BLOCK, ULONG, ULONG);
-  NTSTATUS NTAPI NtOpenSection (PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES);
-  NTSTATUS NTAPI NtQueryInformationFile (HANDLE, IO_STATUS_BLOCK *, VOID *,
-					 DWORD, DWORD);
-  NTSTATUS NTAPI NtQueryInformationProcess (HANDLE, PROCESSINFOCLASS,
-					    PVOID, ULONG, PULONG);
-  NTSTATUS NTAPI NtQueryObject (HANDLE, OBJECT_INFORMATION_CLASS, VOID *,
-				ULONG, ULONG *);
-  NTSTATUS NTAPI NtQuerySystemInformation (SYSTEM_INFORMATION_CLASS,
-					   PVOID, ULONG, PULONG);
-  NTSTATUS NTAPI NtQueryVirtualMemory (HANDLE, PVOID, MEMORY_INFORMATION_CLASS,
-				       PVOID, ULONG, PULONG);
-  NTSTATUS NTAPI NtUnmapViewOfSection (HANDLE, PVOID);
-  VOID NTAPI RtlInitUnicodeString (PUNICODE_STRING, PCWSTR);
-  ULONG NTAPI RtlNtStatusToDosError (NTSTATUS);
-}
diff --git a/winsup/cygwin/ntea.cc b/winsup/cygwin/ntea.cc
deleted file mode 100644
index a195471e0..000000000
--- a/winsup/cygwin/ntea.cc
+++ /dev/null
@@ -1,325 +0,0 @@
-/* ntea.cc: code for manipulating NTEA information
-
-   Copyright 1997, 1998, 2000, 2001 Red Hat, Inc.
-
-   Written by Sergey S. Okhapkin (sos@prospect.com.ru)
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "security.h"
-
-/* Default to not using NTEA information */
-bool allow_ntea;
-
-/*
-From Windows NT DDK:
-
-FILE_FULL_EA_INFORMATION provides extended attribute information.
-This structure is used primarily by network drivers.
-
-Members
-
-NextEntryOffset
-The offset of the next FILE_FULL_EA_INFORMATION-type entry. This member is
-zero if no other entries follow this one.
-
-Flags
-Can be zero or can be set with FILE_NEED_EA, indicating that the file to which
-the EA belongs cannot be interpreted without understanding the associated
-extended attributes.
-
-EaNameLength
-The length in bytes of the EaName array. This value does not include a
-zero-terminator to EaName.
-
-EaValueLength
-The length in bytes of each EA value in the array.
-
-EaName
-An array of characters naming the EA for this entry.
-
-Comments
-This structure is longword-aligned. If a set of FILE_FULL_EA_INFORMATION
-entries is buffered, NextEntryOffset value in each entry, except the last,
-falls on a longword boundary.
-The value(s) associated with each entry follows the EaName array. That is, an
-EA's values are located at EaName + (EaNameLength + 1).
-*/
-
-typedef struct _FILE_FULL_EA_INFORMATION {
-    ULONG NextEntryOffset;
-    UCHAR Flags;
-    UCHAR EaNameLength;
-    USHORT EaValueLength;
-    CHAR EaName[1];
-} FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION;
-
-/* Functions prototypes */
-
-int NTReadEA (const char *file, const char *attrname, char *buf, int len);
-static PFILE_FULL_EA_INFORMATION NTReadEARaw (HANDLE file, int *len);
-BOOL NTWriteEA(const char *file, const char *attrname, char *buf, int len);
-
-/*
- * NTReadEA - read file's Extended Attribute.
- *
- * Parameters:
- *	file	- pointer to filename
- *	attrname- pointer to EA name (case insensitivy. EAs are sored in upper
- *		  case).
- *	attrbuf - pointer to buffer to store EA's value.
- *	len	- length of attrbuf.
- * Return value:
- *	0	- if file or attribute "attrname" not found.
- *	N	- number of bytes stored in attrbuf if succes.
- *	-1	- attrbuf too small for EA value.
- */
-
-int __stdcall
-NTReadEA (const char *file, const char *attrname, char *attrbuf, int len)
-{
-    HANDLE hFileSource;
-    int eafound = 0;
-    PFILE_FULL_EA_INFORMATION ea, sea;
-    int easize;
-
-    hFileSource = CreateFile (file, FILE_READ_EA,
-			      FILE_SHARE_READ | FILE_SHARE_WRITE,
-			      &sec_none_nih, // sa
-			      OPEN_EXISTING,
-			      FILE_FLAG_BACKUP_SEMANTICS,
-			      NULL);
-
-    if (hFileSource == INVALID_HANDLE_VALUE)
-	return 0;
-
-    /* Read in raw array of EAs */
-    ea = sea = NTReadEARaw (hFileSource, &easize);
-
-    /* Search for requested attribute */
-    while (sea)
-      {
-	if (strcasematch (ea->EaName, attrname)) /* EA found */
-	  {
-	    if (ea->EaValueLength > len)
-	      {
-		eafound = -1;		/* buffer too small */
-		break;
-	      }
-	    memcpy (attrbuf, ea->EaName + (ea->EaNameLength + 1),
-		    ea->EaValueLength);
-	    eafound = ea->EaValueLength;
-	    break;
-	  }
-	if ((ea->NextEntryOffset == 0) || ((int) ea->NextEntryOffset > easize))
-	  break;
-	ea = (PFILE_FULL_EA_INFORMATION) ((char *) ea + ea->NextEntryOffset);
-      }
-
-    if (sea)
-      free (sea);
-    CloseHandle (hFileSource);
-
-    return eafound;
-}
-
-/*
- * NTReadEARaw - internal routine to read EAs array to malloced buffer. The
- *		 caller should free this buffer after usage.
- * Parameters:
- *	hFileSource - handle to file. This handle should have FILE_READ_EA
- *		      rights.
- *	len	    - pointer to int variable where length of buffer will
- *		      be stored.
- * Return value:
- *	pointer to buffer with file's EAs, or NULL if any error occured.
- */
-
-static PFILE_FULL_EA_INFORMATION
-NTReadEARaw (HANDLE hFileSource, int *len)
-{
-  WIN32_STREAM_ID StreamId;
-  DWORD dwBytesWritten;
-  LPVOID lpContext;
-  DWORD StreamSize;
-  PFILE_FULL_EA_INFORMATION eafound = NULL;
-
-  lpContext = NULL;
-  StreamSize = sizeof (WIN32_STREAM_ID) - sizeof (WCHAR**);
-
-  /* Read the WIN32_STREAM_ID in */
-
-  while (BackupRead (hFileSource, (LPBYTE) &StreamId, StreamSize,
-		     &dwBytesWritten,
-		     FALSE,		// don't abort yet
-		     FALSE,		// don't process security
-		     &lpContext))
-    {
-      DWORD sl,sh;
-
-      if (dwBytesWritten == 0) /* No more Stream IDs */
-	break;
-      /* skip StreamName */
-      if (StreamId.dwStreamNameSize)
-	{
-	  unsigned char *buf;
-	  buf = (unsigned char *) malloc (StreamId.dwStreamNameSize);
-
-	  if (buf == NULL)
-	    break;
-
-	  if (!BackupRead (hFileSource, buf,  // buffer to read
-			   StreamId.dwStreamNameSize,   // num bytes to read
-			   &dwBytesWritten,
-			   FALSE,		// don't abort yet
-			   FALSE,		// don't process security
-			   &lpContext))		// Stream name read error
-	    {
-	      free (buf);
-	      break;
-	    }
-	  free (buf);
-	}
-
-	/* Is it EA stream? */
-	if (StreamId.dwStreamId == BACKUP_EA_DATA)
-	  {
-	    unsigned char *buf;
-	    buf = (unsigned char *) malloc (StreamId.Size.LowPart);
-
-	    if (buf == NULL)
-	      break;
-	    if (!BackupRead (hFileSource, buf,	// buffer to read
-			     StreamId.Size.LowPart, // num bytes to write
-			     &dwBytesWritten,
-			     FALSE,		// don't abort yet
-			     FALSE,		// don't process security
-			     &lpContext))
-	      {
-		free (buf);	/* EA read error */
-		break;
-	      }
-	    eafound = (PFILE_FULL_EA_INFORMATION) buf;
-	    *len = StreamId.Size.LowPart;
-	    break;
-	}
-	/* Skip current stream */
-	if (!BackupSeek (hFileSource,
-			 StreamId.Size.LowPart,
-			 StreamId.Size.HighPart,
-			 &sl,
-			 &sh,
-			 &lpContext))
-	  break;
-    }
-
-  /* free context */
-  BackupRead (
-      hFileSource,
-      NULL,		// buffer to write
-      0,		// number of bytes to write
-      &dwBytesWritten,
-      TRUE,		// abort
-      FALSE,		// don't process security
-      &lpContext);
-
-  return eafound;
-}
-
-/*
- * NTWriteEA - write file's Extended Attribute.
- *
- * Parameters:
- *	file	- pointer to filename
- *	attrname- pointer to EA name (case insensitivy. EAs are sored in upper
- *		  case).
- *	buf	- pointer to buffer with EA value.
- *	len	- length of buf.
- * Return value:
- *	true if success, false otherwice.
- * Note: if len=0 given EA will be deleted.
- */
-
-BOOL __stdcall
-NTWriteEA (const char *file, const char *attrname, const char *buf, int len)
-{
-  HANDLE hFileSource;
-  WIN32_STREAM_ID StreamId;
-  DWORD dwBytesWritten;
-  LPVOID lpContext;
-  DWORD StreamSize, easize;
-  bool bSuccess = false;
-  PFILE_FULL_EA_INFORMATION ea;
-
-  hFileSource = CreateFile (file, FILE_WRITE_EA,
-			    FILE_SHARE_READ | FILE_SHARE_WRITE,
-			    &sec_none_nih, // sa
-			    OPEN_EXISTING,
-			    FILE_FLAG_BACKUP_SEMANTICS,
-			    NULL);
-
-  if (hFileSource == INVALID_HANDLE_VALUE)
-    return FALSE;
-
-  lpContext = NULL;
-  StreamSize = sizeof (WIN32_STREAM_ID) - sizeof (WCHAR**);
-
-  /* FILE_FULL_EA_INFORMATION structure is longword-aligned */
-  easize = sizeof (*ea) - sizeof (WCHAR**) + strlen (attrname) + 1 + len
-      + (sizeof (DWORD) - 1);
-  easize &= ~(sizeof (DWORD) - 1);
-
-  if ((ea = (PFILE_FULL_EA_INFORMATION) malloc (easize)) == NULL)
-    goto cleanup;
-
-  memset (ea, 0, easize);
-  ea->EaNameLength = strlen (attrname);
-  ea->EaValueLength = len;
-  strcpy (ea->EaName, attrname);
-  memcpy (ea->EaName + (ea->EaNameLength + 1), buf, len);
-
-  StreamId.dwStreamId = BACKUP_EA_DATA;
-  StreamId.dwStreamAttributes = 0;
-  StreamId.Size.HighPart = 0;
-  StreamId.Size.LowPart = easize;
-  StreamId.dwStreamNameSize = 0;
-
-  if (!BackupWrite (hFileSource, (LPBYTE) &StreamId, StreamSize,
-		    &dwBytesWritten,
-		    FALSE,		// don't abort yet
-		    FALSE,		// don't process security
-		    &lpContext))
-    goto cleanup;
-
-  if (!BackupWrite (hFileSource, (LPBYTE) ea, easize,
-		    &dwBytesWritten,
-		    FALSE,		// don't abort yet
-		    FALSE,		// don't process security
-		    &lpContext))
-    goto cleanup;
-
-  bSuccess = true;
-  /* free context */
-
-cleanup:
-  BackupRead (hFileSource,
-	      NULL,			// buffer to write
-	      0,			// number of bytes to write
-	      &dwBytesWritten,
-	      TRUE,			// abort
-	      FALSE,			// don't process security
-	      &lpContext);
-
-  CloseHandle (hFileSource);
-  if (ea)
-    free (ea);
-
-  return bSuccess;
-}
diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc
deleted file mode 100644
index 7a76e5a80..000000000
--- a/winsup/cygwin/passwd.cc
+++ /dev/null
@@ -1,314 +0,0 @@
-/* passwd.cc: getpwnam () and friends
-
-   Copyright 1996, 1997, 1998, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include <pwd.h>
-#include <stdio.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "pinfo.h"
-#include "cygheap.h"
-#include <sys/termios.h>
-#include "pwdgrp.h"
-
-/* Read /etc/passwd only once for better performance.  This is done
-   on the first call that needs information from it. */
-
-passwd *passwd_buf;
-/* FIXME: This really should use a constructor, but they are slow */
-static pwdgrp pr (passwd_buf);
-
-/* Position in the passwd cache */
-#define pw_pos  _reent_winsup ()->_pw_pos
-
-/* Parse /etc/passwd line into passwd structure. */
-bool
-pwdgrp::parse_passwd ()
-{
-# define res (*passwd_buf)[curr_lines]
-  res.pw_name = next_str (':');
-  res.pw_passwd = next_str (':');
-  if (!next_num (res.pw_uid))
-    return false;
-  if (!next_num (res.pw_gid))
-    return false;
-  res.pw_comment = NULL;
-  res.pw_gecos = next_str (':');
-  res.pw_dir =  next_str (':');
-  res.pw_shell = next_str (':');
-  return true;
-# undef res
-}
-
-/* Read in /etc/passwd and save contents in the password cache.
-   This sets pr to loaded or emulated so functions in this file can
-   tell that /etc/passwd has been read in or will be emulated. */
-void
-pwdgrp::read_passwd ()
-{
-  load ("/etc/passwd");
-
-  char strbuf[128] = "";
-  bool searchentry = true;
-  struct passwd *pw;
-
-  if (wincap.has_security ())
-    {
-      /* must be static */
-      static char NO_COPY pretty_ls[] = "????????:*:-1:-1:";
-      add_line (pretty_ls);
-      cygsid tu = cygheap->user.sid ();
-      tu.string (strbuf);
-      if (myself->uid == ILLEGAL_UID)
-	searchentry = !internal_getpwsid (tu);
-    }
-  else if (myself->uid == ILLEGAL_UID)
-    searchentry = !internal_getpwuid (DEFAULT_UID);
-  if (searchentry &&
-      (!(pw = internal_getpwnam (cygheap->user.name ())) ||
-       (myself->uid != ILLEGAL_UID &&
-	myself->uid != (__uid32_t) pw->pw_uid  &&
-	!internal_getpwuid (myself->uid))))
-    {
-      static char linebuf[1024];	// must be static and
-      					// should not be NO_COPY
-      (void) cygheap->user.ontherange (CH_HOME, NULL);
-      snprintf (linebuf, sizeof (linebuf), "%s:*:%lu:%lu:,%s:%s:/bin/sh",
-		cygheap->user.name (),
-		myself->uid == ILLEGAL_UID ? UNKNOWN_UID : myself->uid,
-		myself->gid,
-		strbuf, getenv ("HOME") ?: "");
-      debug_printf ("Completing /etc/passwd: %s", linebuf);
-      add_line (linebuf);
-    }
-  return;
-}
-
-struct passwd *
-internal_getpwsid (cygpsid &sid)
-{
-  struct passwd *pw;
-  char *ptr1, *ptr2, *endptr;
-  char sid_string[128] = {0,','};
-
-  pr.refresh (false);
-
-  if (sid.string (sid_string + 2))
-    {
-      endptr = strchr (sid_string + 2, 0) - 1;
-      for (int i = 0; i < pr.curr_lines; i++)
-	if ((pw = passwd_buf + i)->pw_dir > pw->pw_gecos + 8)
-	  for (ptr1 = endptr, ptr2 = pw->pw_dir - 2;
-	       *ptr1 == *ptr2; ptr2--)
-	    if (!*--ptr1)
-	      return pw;
-    }
-  return NULL;
-}
-
-struct passwd *
-internal_getpwuid (__uid32_t uid, bool check)
-{
-  pr.refresh (check);
-
-  for (int i = 0; i < pr.curr_lines; i++)
-    if (uid == (__uid32_t) passwd_buf[i].pw_uid)
-      return passwd_buf + i;
-  return NULL;
-}
-
-struct passwd *
-internal_getpwnam (const char *name, bool check)
-{
-  pr.refresh (check);
-
-  for (int i = 0; i < pr.curr_lines; i++)
-    /* on Windows NT user names are case-insensitive */
-    if (strcasematch (name, passwd_buf[i].pw_name))
-      return passwd_buf + i;
-  return NULL;
-}
-
-
-extern "C" struct passwd *
-getpwuid32 (__uid32_t uid)
-{
-  struct passwd *temppw = internal_getpwuid (uid, true);
-  pthread_testcancel ();
-  return temppw;
-}
-
-extern "C" struct passwd *
-getpwuid (__uid16_t uid)
-{
-  return getpwuid32 (uid16touid32 (uid));
-}
-
-extern "C" int
-getpwuid_r32 (__uid32_t uid, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result)
-{
-  *result = NULL;
-
-  if (!pwd || !buffer)
-    return ERANGE;
-
-  struct passwd *temppw = internal_getpwuid (uid, true);
-  pthread_testcancel ();
-  if (!temppw)
-    return 0;
-
-  /* check needed buffer size. */
-  size_t needsize = strlen (temppw->pw_name) + strlen (temppw->pw_dir) +
-		    strlen (temppw->pw_shell) + strlen (temppw->pw_gecos) +
-		    strlen (temppw->pw_passwd) + 5;
-  if (needsize > bufsize)
-    return ERANGE;
-
-  /* make a copy of temppw */
-  *result = pwd;
-  pwd->pw_uid = temppw->pw_uid;
-  pwd->pw_gid = temppw->pw_gid;
-  pwd->pw_name = buffer;
-  pwd->pw_dir = pwd->pw_name + strlen (temppw->pw_name) + 1;
-  pwd->pw_shell = pwd->pw_dir + strlen (temppw->pw_dir) + 1;
-  pwd->pw_gecos = pwd->pw_shell + strlen (temppw->pw_shell) + 1;
-  pwd->pw_comment = NULL;
-  pwd->pw_passwd = pwd->pw_gecos + strlen (temppw->pw_gecos) + 1;
-  strcpy (pwd->pw_name, temppw->pw_name);
-  strcpy (pwd->pw_dir, temppw->pw_dir);
-  strcpy (pwd->pw_shell, temppw->pw_shell);
-  strcpy (pwd->pw_gecos, temppw->pw_gecos);
-  strcpy (pwd->pw_passwd, temppw->pw_passwd);
-  return 0;
-}
-
-extern "C" int
-getpwuid_r (__uid16_t uid, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result)
-{
-  return getpwuid_r32 (uid16touid32 (uid), pwd, buffer, bufsize, result);
-}
-
-extern "C" struct passwd *
-getpwnam (const char *name)
-{
-  struct passwd *temppw = internal_getpwnam (name, true);
-  pthread_testcancel ();
-  return temppw;
-}
-
-
-/* the max size buffer we can expect to
- * use is returned via sysconf with _SC_GETPW_R_SIZE_MAX.
- * This may need updating! - Rob Collins April 2001.
- */
-extern "C" int
-getpwnam_r (const char *nam, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result)
-{
-  *result = NULL;
-
-  if (!pwd || !buffer || !nam)
-    return ERANGE;
-
-  struct passwd *temppw = internal_getpwnam (nam, true);
-  pthread_testcancel ();
-
-  if (!temppw)
-    return 0;
-
-  /* check needed buffer size. */
-  size_t needsize = strlen (temppw->pw_name) + strlen (temppw->pw_dir) +
-		    strlen (temppw->pw_shell) + strlen (temppw->pw_gecos) +
-		    strlen (temppw->pw_passwd) + 5;
-  if (needsize > bufsize)
-    return ERANGE;
-
-  /* make a copy of temppw */
-  *result = pwd;
-  pwd->pw_uid = temppw->pw_uid;
-  pwd->pw_gid = temppw->pw_gid;
-  pwd->pw_name = buffer;
-  pwd->pw_dir = pwd->pw_name + strlen (temppw->pw_name) + 1;
-  pwd->pw_shell = pwd->pw_dir + strlen (temppw->pw_dir) + 1;
-  pwd->pw_gecos = pwd->pw_shell + strlen (temppw->pw_shell) + 1;
-  pwd->pw_comment = NULL;
-  pwd->pw_passwd = pwd->pw_gecos + strlen (temppw->pw_gecos) + 1;
-  strcpy (pwd->pw_name, temppw->pw_name);
-  strcpy (pwd->pw_dir, temppw->pw_dir);
-  strcpy (pwd->pw_shell, temppw->pw_shell);
-  strcpy (pwd->pw_gecos, temppw->pw_gecos);
-  strcpy (pwd->pw_passwd, temppw->pw_passwd);
-  return 0;
-}
-
-extern "C" struct passwd *
-getpwent (void)
-{
-  if (pw_pos == 0)
-    pr.refresh (true);
-  if (pw_pos < pr.curr_lines)
-    return passwd_buf + pw_pos++;
-
-  return NULL;
-}
-
-extern "C" struct passwd *
-getpwduid (__uid16_t)
-{
-  return NULL;
-}
-
-extern "C" void
-setpwent (void)
-{
-  pw_pos = 0;
-}
-
-extern "C" void
-endpwent (void)
-{
-  pw_pos = 0;
-}
-
-extern "C" int
-setpassent ()
-{
-  return 0;
-}
-
-extern "C" char *
-getpass (const char * prompt)
-{
-  char *pass=_reent_winsup ()->_pass;
-  struct termios ti, newti;
-
-  cygheap_fdget fhstdin (0);
-
-  if (fhstdin < 0)
-    pass[0] = '\0';
-  else
-    {
-      fhstdin->tcgetattr (&ti);
-      newti = ti;
-      newti.c_lflag &= ~ECHO;
-      fhstdin->tcsetattr (TCSANOW, &newti);
-      fputs (prompt, stderr);
-      fgets (pass, _PASSWORD_LEN, stdin);
-      fprintf (stderr, "\n");
-      for (int i=0; pass[i]; i++)
-	if (pass[i] == '\r' || pass[i] == '\n')
-	  pass[i] = '\0';
-      fhstdin->tcsetattr (TCSANOW, &ti);
-    }
-  return pass;
-}
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
deleted file mode 100644
index d801a6665..000000000
--- a/winsup/cygwin/path.cc
+++ /dev/null
@@ -1,3830 +0,0 @@
-/* path.cc: path support.
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* This module's job is to
-   - convert between POSIX and Win32 style filenames,
-   - support the `mount' functionality,
-   - support symlinks for files and directories
-
-   Pathnames are handled as follows:
-
-   - A \ or : in a path denotes a pure windows spec.
-   - Paths beginning with // (or \\) are not translated (i.e. looked
-     up in the mount table) and are assumed to be UNC path names.
-
-   The goal in the above set of rules is to allow both POSIX and Win32
-   flavors of pathnames without either interfering.  The rules are
-   intended to be as close to a superset of both as possible.
-
-   Note that you can have more than one path to a file.  The mount
-   table is always prefered when translating Win32 paths to POSIX
-   paths.  Win32 paths in mount table entries may be UNC paths or
-   standard Win32 paths starting with <drive-letter>:
-
-   Text vs Binary issues are not considered here in path style
-   decisions, although the appropriate flags are retrieved and
-   stored in various structures.
-
-   Removing mounted filesystem support would simplify things greatly,
-   but having it gives us a mechanism of treating disk that lives on a
-   UNIX machine as having UNIX semantics [it allows one to edit a text
-   file on that disk and not have cr's magically appear and perhaps
-   break apps running on UNIX boxes].  It also useful to be able to
-   layout a hierarchy without changing the underlying directories.
-
-   The semantics of mounting file systems is not intended to precisely
-   follow normal UNIX systems.
-
-   Each DOS drive is defined to have a current directory.  Supporting
-   this would complicate things so for now things are defined so that
-   c: means c:\.  FIXME: Is this still true?
-*/
-
-#include "winsup.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/mount.h>
-#include <mntent.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <winioctl.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
-#include <winnetwk.h>
-#include <sys/cygwin.h>
-#include <cygwin/version.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "sync.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "shared_info.h"
-#include "registry.h"
-#include <assert.h>
-
-#ifdef _MT_SAFE
-#define iteration _reent_winsup ()->_iteration
-#define available_drives _reent_winsup ()->available_drives
-#else
-static int iteration;
-static DWORD available_drives;
-#endif
-
-static int normalize_win32_path (const char *src, char *dst);
-static void slashify (const char *src, char *dst, int trailing_slash_p);
-static void backslashify (const char *src, char *dst, int trailing_slash_p);
-
-struct symlink_info
-{
-  char contents[CYG_MAX_PATH + 4];
-  char *ext_here;
-  int extn;
-  unsigned pflags;
-  DWORD fileattr;
-  int is_symlink;
-  bool ext_tacked_on;
-  int error;
-  bool case_clash;
-  _major_t major;
-  _minor_t minor;
-  _mode_t mode;
-  int check (char *path, const suffix_info *suffixes, unsigned opt);
-  bool parse_device (const char *);
-  bool case_check (char *path);
-};
-
-int pcheck_case = PCHECK_RELAXED; /* Determines the case check behaviour. */
-
-static char shortcut_header[SHORTCUT_HDR_SIZE];
-static bool shortcut_initalized;
-
-static void
-create_shortcut_header (void)
-{
-  if (!shortcut_initalized)
-    {
-      shortcut_header[0] = 'L';
-      shortcut_header[4] = '\001';
-      shortcut_header[5] = '\024';
-      shortcut_header[6] = '\002';
-      shortcut_header[12] = '\300';
-      shortcut_header[19] = 'F';
-      shortcut_header[20] = '\f';
-      shortcut_header[60] = '\001';
-      shortcut_initalized = true;
-    }
-}
-
-#define CYGWIN_REGNAME (cygheap->cygwin_regname ?: CYGWIN_INFO_CYGWIN_REGISTRY_NAME)
-
-/* Determine if path prefix matches current cygdrive */
-#define iscygdrive(path) \
-  (path_prefix_p (mount_table->cygdrive, (path), mount_table->cygdrive_len))
-
-#define iscygdrive_device(path) \
-  (isalpha (path[mount_table->cygdrive_len]) && \
-   (path[mount_table->cygdrive_len + 1] == '/' || \
-    !path[mount_table->cygdrive_len + 1]))
-
-#define isproc(path) \
-  (path_prefix_p (proc, (path), proc_len))
-
-#define isvirtual_dev(devn) \
-  (devn == FH_CYGDRIVE || devn == FH_PROC || devn == FH_REGISTRY || devn == FH_PROCESS)
-
-/* Return non-zero if PATH1 is a prefix of PATH2.
-   Both are assumed to be of the same path style and / vs \ usage.
-   Neither may be "".
-   LEN1 = strlen (PATH1).  It's passed because often it's already known.
-
-   Examples:
-   /foo/ is a prefix of /foo  <-- may seem odd, but desired
-   /foo is a prefix of /foo/
-   / is a prefix of /foo/bar
-   / is not a prefix of foo/bar
-   foo/ is a prefix foo/bar
-   /foo is not a prefix of /foobar
-*/
-
-int
-path_prefix_p (const char *path1, const char *path2, int len1)
-{
-  /* Handle case where PATH1 has trailing '/' and when it doesn't.  */
-  if (len1 > 0 && isdirsep (path1[len1 - 1]))
-    len1--;
-
-  if (len1 == 0)
-    return isdirsep (path2[0]) && !isdirsep (path2[1]);
-
-  if (!pathnmatch (path1, path2, len1))
-    return 0;
-
-  return isdirsep (path2[len1]) || path2[len1] == 0 || path1[len1 - 1] == ':';
-}
-
-/* Return non-zero if paths match in first len chars.
-   Check is dependent of the case sensitivity setting. */
-int
-pathnmatch (const char *path1, const char *path2, int len)
-{
-  return pcheck_case == PCHECK_STRICT ? !strncmp (path1, path2, len)
-				      : strncasematch (path1, path2, len);
-}
-
-/* Return non-zero if paths match. Check is dependent of the case
-   sensitivity setting. */
-int
-pathmatch (const char *path1, const char *path2)
-{
-  return pcheck_case == PCHECK_STRICT ? !strcmp (path1, path2)
-				      : strcasematch (path1, path2);
-}
-
-/* Normalize a POSIX path.
-   \'s are converted to /'s in the process.
-   All duplicate /'s, except for 2 leading /'s, are deleted.
-   The result is 0 for success, or an errno error value.  */
-
-#define isslash(c) ((c) == '/')
-
-static int
-normalize_posix_path (const char *src, char *dst)
-{
-  const char *src_start = src;
-  char *dst_start = dst;
-
-  syscall_printf ("src %s", src);
-
-  if (isdrive (src) || slash_unc_prefix_p (src))
-    {
-      int err = normalize_win32_path (src, dst);
-      if (!err)
-	for (char *p = dst; (p = strchr (p, '\\')); p++)
-	  *p = '/';
-      return err;
-    }
-
-  if (!isslash (src[0]))
-    {
-      if (!cygheap->cwd.get (dst))
-	return get_errno ();
-      dst = strchr (dst, '\0');
-      if (*src == '.')
-	{
-	  if (dst == dst_start + 1 && *dst_start == '/')
-	     --dst;
-	  goto sawdot;
-	}
-      if (dst > dst_start && !isslash (dst[-1]))
-	*dst++ = '/';
-    }
-  /* Two leading /'s?  If so, preserve them.  */
-  else if (isslash (src[1]))
-    {
-      *dst++ = '/';
-      *dst++ = '/';
-      src += 2;
-      if (isslash (*src))
-	{ /* Starts with three or more slashes - reset. */
-	  dst = dst_start;
-	  *dst++ = '/';
-	  src = src_start + 1;
-	}
-      else if (src[0] == '.' && isslash (src[1]))
-	{
-	  *dst++ = '.';
-	  *dst++ = '/';
-	  src += 2;
-	}
-    }
-  else
-    *dst = '\0';
-
-  while (*src)
-    {
-      /* Strip runs of /'s.  */
-      if (!isslash (*src))
-	*dst++ = *src++;
-      else
-	{
-	  while (*++src)
-	    {
-	      if (isslash (*src))
-		continue;
-
-	      if (*src != '.')
-		break;
-
-	    sawdot:
-	      if (src[1] != '.')
-		{
-		  if (!src[1])
-		    {
-		      if (dst == dst_start)
-			*dst++ = '/';
-		      goto done;
-		    }
-		  if (!isslash (src[1]))
-		    break;
-		}
-	      else if (src[2] && !isslash (src[2]))
-		{
-		  if (src[2] == '.')
-		    {
-		      /* Is this a run of dots? That would be an invalid
-		         filename.  A bunch of leading dots would be ok,
-			 though. */
-		      int n = strspn (src, ".");
-		      if (!src[n] || isslash (src[n])) /* just dots... */
-			return ENOENT;
-		    }
-		  break;
-		}
-	      else
-		{
-		  while (dst > dst_start && !isslash (*--dst))
-		    continue;
-		  src++;
-		}
-	    }
-
-	  *dst++ = '/';
-	}
-	if ((dst - dst_start) >= CYG_MAX_PATH)
-	  {
-	    debug_printf ("ENAMETOOLONG = normalize_posix_path (%s)", src);
-	    return ENAMETOOLONG;
-	  }
-    }
-
-done:
-  *dst = '\0';
-  if (--dst > dst_start && isslash (*dst))
-    *dst = '\0';
-
-  debug_printf ("%s = normalize_posix_path (%s)", dst_start, src_start);
-  return 0;
-}
-
-inline void
-path_conv::add_ext_from_sym (symlink_info &sym)
-{
-  if (sym.ext_here && *sym.ext_here)
-    {
-      known_suffix = path + sym.extn;
-      if (sym.ext_tacked_on)
-	strcpy (known_suffix, sym.ext_here);
-    }
-}
-
-static void __stdcall mkrelpath (char *dst) __attribute__ ((regparm (2)));
-static void __stdcall
-mkrelpath (char *path)
-{
-  char cwd_win32[CYG_MAX_PATH];
-  if (!cygheap->cwd.get (cwd_win32, 0))
-    return;
-
-  unsigned cwdlen = strlen (cwd_win32);
-  if (!path_prefix_p (cwd_win32, path, cwdlen))
-    return;
-
-  size_t n = strlen (path);
-  if (n < cwdlen)
-    return;
-
-  char *tail = path;
-  if (n == cwdlen)
-    tail += cwdlen;
-  else
-    tail += isdirsep (cwd_win32[cwdlen - 1]) ? cwdlen : cwdlen + 1;
-
-  memmove (path, tail, strlen (tail) + 1);
-  if (!*path)
-    strcpy (path, ".");
-}
-
-bool
-fs_info::update (const char *win32_path)
-{
-  char tmp_buf [CYG_MAX_PATH];
-  strncpy (tmp_buf, win32_path, CYG_MAX_PATH);
-
-  if (!rootdir (tmp_buf))
-    {
-      debug_printf ("Cannot get root component of path %s", win32_path);
-      name_storage [0] = '\0';
-      sym_opt_storage = flags_storage = serial_storage = 0;
-      return false;
-    }
-
-  if (strcmp (tmp_buf, root_dir_storage) == 0)
-    return 1;
-
-  strncpy (root_dir_storage, tmp_buf, CYG_MAX_PATH);
-  drive_type_storage = GetDriveType (root_dir_storage);
-  if (drive_type_storage == DRIVE_REMOTE || (drive_type_storage == DRIVE_UNKNOWN && (root_dir_storage[0] == '\\' && root_dir_storage[1] == '\\')))
-    is_remote_drive_storage = 1;
-  else
-    is_remote_drive_storage = 0;
-
-  if (!GetVolumeInformation (root_dir_storage, NULL, 0, &serial_storage, NULL, &flags_storage,
-				 name_storage, sizeof (name_storage)))
-    {
-      debug_printf ("Cannot get volume information (%s), %E", root_dir_storage);
-      name_storage[0] = '\0';
-      sym_opt_storage = flags_storage = serial_storage = 0;
-      return false;
-    }
-  /* FIXME: Samba by default returns "NTFS" in file system name, but
-   * doesn't support Extended Attributes. If there's some fast way to
-   * distinguish between samba and real ntfs, it should be implemented
-   * here.
-   */
-  sym_opt_storage = (!is_remote_drive_storage && strcmp (name_storage, "NTFS") == 0) ? PC_CHECK_EA : 0;
-
-  return true;
-}
-
-void
-path_conv::fillin (HANDLE h)
-{
-  BY_HANDLE_FILE_INFORMATION local;
-  if (!GetFileInformationByHandle (h, &local))
-    {
-      fileattr = INVALID_FILE_ATTRIBUTES;
-      fs.serial () = 0;
-    }
-  else
-    {
-      fileattr = local.dwFileAttributes;
-      fs.serial () = local.dwVolumeSerialNumber;
-    }
-    fs.drive_type () = DRIVE_UNKNOWN;
-}
-
-void
-path_conv::set_normalized_path (const char *path_copy)
-{
-  char *eopath = strchr (path, '\0');
-  size_t n = strlen (path_copy) + 1;
-
-  normalized_path = path + sizeof (path) - n;
-  if (normalized_path > eopath)
-    normalized_path_size = n;
-  else
-    {
-      normalized_path = (char *) cmalloc (HEAP_STR, n);
-      normalized_path_size = 0;
-    }
-  memcpy (normalized_path, path_copy, n);
-}
-
-/* Convert an arbitrary path SRC to a pure Win32 path, suitable for
-   passing to Win32 API routines.
-
-   If an error occurs, `error' is set to the errno value.
-   Otherwise it is set to 0.
-
-   follow_mode values:
-	SYMLINK_FOLLOW	    - convert to PATH symlink points to
-	SYMLINK_NOFOLLOW    - convert to PATH of symlink itself
-	SYMLINK_IGNORE	    - do not check PATH for symlinks
-	SYMLINK_CONTENTS    - just return symlink contents
-*/
-
-void
-path_conv::check (const char *src, unsigned opt,
-		  const suffix_info *suffixes)
-{
-  /* This array is used when expanding symlinks.  It is CYG_MAX_PATH * 2
-     in length so that we can hold the expanded symlink plus a
-     trailer.  */
-  char path_copy[CYG_MAX_PATH + 3];
-  char tmp_buf[2 * CYG_MAX_PATH + 3];
-  symlink_info sym;
-  bool need_directory = 0;
-  bool saw_symlinks = 0;
-  int is_relpath;
-  char *tail;
-
-#if 0
-  static path_conv last_path_conv;
-  static char last_src[CYG_MAX_PATH + 1];
-
-  if (*last_src && strcmp (last_src, src) == 0)
-    {
-      *this = last_path_conv;
-      return;
-    }
-#endif
-
-  int loop = 0;
-  path_flags = 0;
-  known_suffix = NULL;
-  fileattr = INVALID_FILE_ATTRIBUTES;
-  case_clash = false;
-  memset (&dev, 0, sizeof (dev));
-  fs.root_dir ()[0] = '\0';
-  fs.name ()[0] = '\0';
-  fs.flags () = fs.serial () = 0;
-  fs.sym_opt () = 0;
-  fs.drive_type () = 0;
-  fs.is_remote_drive () = 0;
-  normalized_path = NULL;
-
-  if (!(opt & PC_NULLEMPTY))
-    error = 0;
-  else if ((error = check_null_empty_str (src)))
-    return;
-  /* This loop handles symlink expansion.  */
-  for (;;)
-    {
-      MALLOC_CHECK;
-      assert (src);
-
-      char *p = strrchr (src, '\0');
-      /* Detect if the user was looking for a directory.  We have to strip the
-	 trailing slash initially and add it back on at the end due to Windows
-	 brain damage. */
-      if (--p > src)
-	{
-	  if (isdirsep (*p))
-	    need_directory = 1;
-	  else if (--p  > src && p[1] == '.' && isdirsep (*p))
-	    need_directory = 1;
-	}
-
-      is_relpath = !isabspath (src);
-      error = normalize_posix_path (src, path_copy);
-      if (error)
-	return;
-
-      tail = strchr (path_copy, '\0');   // Point to end of copy
-      char *path_end = tail;
-      tail[1] = '\0';
-
-      /* Scan path_copy from right to left looking either for a symlink
-	 or an actual existing file.  If an existing file is found, just
-	 return.  If a symlink is found, exit the for loop.
-	 Also: be careful to preserve the errno returned from
-	 symlink.check as the caller may need it. */
-      /* FIXME: Do we have to worry about multiple \'s here? */
-      int component = 0;		// Number of translated components
-      sym.contents[0] = '\0';
-
-      for (;;)
-	{
-	  const suffix_info *suff;
-	  char pathbuf[CYG_MAX_PATH];
-	  char *full_path;
-
-	  /* Don't allow symlink.check to set anything in the path_conv
-	     class if we're working on an inner component of the path */
-	  if (component)
-	    {
-	      suff = NULL;
-	      sym.pflags = 0;
-	      full_path = pathbuf;
-	    }
-	  else
-	    {
-	      suff = suffixes;
-	      sym.pflags = path_flags;
-	      full_path = this->path;
-	    }
-
-	  /* Convert to native path spec sans symbolic link info. */
-	  error = mount_table->conv_to_win32_path (path_copy, full_path, dev,
-						   &sym.pflags, 1);
-
-	  if (error)
-	    return;
-
-	  if (dev.major == DEV_CYGDRIVE_MAJOR)
-	    {
-	      if (!component)
-		fileattr = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_READONLY;
-	      else
-		{
-		  dev.devn = FH_FS;
-		  fileattr = GetFileAttributes (this->path);
-		}
-	      goto out;
-	    }
-	  else if (isvirtual_dev (dev.devn))
-	    {
-	      /* FIXME: Calling build_fhandler here is not the right way to handle this. */
-	      fhandler_virtual *fh = (fhandler_virtual *) build_fh_dev (dev, path_copy);
-	      int file_type = fh->exists ();
-	      delete fh;
-	      switch (file_type)
-		{
-		  case 1:
-		  case 2:
-		    fileattr = FILE_ATTRIBUTE_DIRECTORY;
-		    break;
-		  case -1:
-		    fileattr = 0;
-		    break;
-		  default:
-		    fileattr = INVALID_FILE_ATTRIBUTES;
-		    break;
-		}
-	      goto out;
-	    }
-	  /* devn should not be a device.  If it is, then stop parsing now. */
-	  else if (dev.devn != FH_FS)
-	    {
-	      fileattr = 0;
-	      path_flags = sym.pflags;
-	      if (component)
-		{
-		  error = ENOTDIR;
-		  return;
-		}
-	      goto out;		/* Found a device.  Stop parsing. */
-	    }
-
-	  if (!fs.update (full_path))
-	    fs.root_dir ()[0] = '\0';
-
-	  /* Eat trailing slashes */
-	  char *dostail = strchr (full_path, '\0');
-
-	  /* If path is only a drivename, Windows interprets it as the
-	     current working directory on this drive instead of the root
-	     dir which is what we want. So we need the trailing backslash
-	     in this case. */
-	  while (dostail > full_path + 3 && (*--dostail == '\\'))
-	    *tail = '\0';
-
-	  if (full_path[0] && full_path[1] == ':' && full_path[2] == '\0')
-	    {
-	      full_path[2] = '\\';
-	      full_path[3] = '\0';
-	    }
-
-	  if ((opt & PC_SYM_IGNORE) && pcheck_case == PCHECK_RELAXED)
-	    {
-	      fileattr = GetFileAttributes (this->path);
-	      goto out;
-	    }
-
-	  int len = sym.check (full_path, suff, opt | fs.sym_opt ());
-
-	  if (sym.minor || sym.major)
-	    {
-	      dev.parse (sym.major, sym.minor);
-	      dev.setfs (1);
-	      dev.mode = sym.mode;
-	      fileattr = sym.fileattr;
-	      goto out;
-	    }
-
-	  if (sym.pflags & PATH_SOCKET)
-	    dev.setfs (1);
-
-	  if (sym.case_clash)
-	    {
-	      if (pcheck_case == PCHECK_STRICT)
-		{
-		  case_clash = true;
-		  error = ENOENT;
-		  goto out;
-		}
-	      /* If pcheck_case==PCHECK_ADJUST the case_clash is remembered
-		 if the last component is concerned. This allows functions
-		 which shall create files to avoid overriding already existing
-		 files with another case. */
-	      if (!component)
-		case_clash = true;
-	    }
-	  if (!(opt & PC_SYM_IGNORE))
-	    {
-	      if (!component)
-		{
-		  fileattr = sym.fileattr;
-		  path_flags = sym.pflags;
-		}
-
-	      /* If symlink.check found an existing non-symlink file, then
-		 it sets the appropriate flag.  It also sets any suffix found
-		 into `ext_here'. */
-	      if (!sym.is_symlink && sym.fileattr != INVALID_FILE_ATTRIBUTES)
-		{
-		  error = sym.error;
-		  if (component == 0)
-		    add_ext_from_sym (sym);
-		  if (pcheck_case == PCHECK_RELAXED)
-		    goto out;	// file found
-		  /* Avoid further symlink evaluation. Only case checks are
-		     done now. */
-		  opt |= PC_SYM_IGNORE;
-		}
-	      /* Found a symlink if len > 0.  If component == 0, then the
-		 src path itself was a symlink.  If !follow_mode then
-		 we're done.  Otherwise we have to insert the path found
-		 into the full path that we are building and perform all of
-		 these operations again on the newly derived path. */
-	      else if (len > 0)
-		{
-		  saw_symlinks = 1;
-		  if (component == 0 && !need_directory && !(opt & PC_SYM_FOLLOW))
-		    {
-		      set_symlink (); // last component of path is a symlink.
-		      if (opt & PC_SYM_CONTENTS)
-			{
-			  strcpy (path, sym.contents);
-			  goto out;
-			}
-		      add_ext_from_sym (sym);
-		      if (pcheck_case == PCHECK_RELAXED)
-			goto out;
-		      /* Avoid further symlink evaluation. Only case checks are
-			 done now. */
-		      opt |= PC_SYM_IGNORE;
-		    }
-		  else
-		    break;
-		}
-	      /* No existing file found. */
-	    }
-
-	  /* Find the "tail" of the path, e.g. in '/for/bar/baz',
-	     /baz is the tail. */
-	  char *newtail = strrchr (path_copy, '/');
-	  if (tail != path_end)
-	    *tail = '/';
-
-	  /* Exit loop if there is no tail or we are at the
-	     beginning of a UNC path */
-	  if (!newtail || newtail == path_copy || (newtail == path_copy + 1 && newtail[-1] == '/'))
-	    goto out;	// all done
-
-	  tail = newtail;
-
-	  /* Haven't found an existing pathname component yet.
-	     Pinch off the tail and try again. */
-	  *tail = '\0';
-	  component++;
-	}
-
-      /* Arrive here if above loop detected a symlink. */
-      if (++loop > MAX_LINK_DEPTH)
-	{
-	  error = ELOOP;   // Eep.
-	  return;
-	}
-
-      MALLOC_CHECK;
-
-      /* The tail is pointing at a null pointer.  Increment it and get the length.
-	 If the tail was empty then this increment will end up pointing to the extra
-	 \0 added to path_copy above. */
-      int taillen = strlen (++tail);
-      int buflen = strlen (sym.contents);
-      if (buflen + taillen > CYG_MAX_PATH)
-	  {
-	    error = ENAMETOOLONG;
-	    strcpy (path, "::ENAMETOOLONG::");
-	    return;
-	  }
-
-      /* Strip off current directory component since this is the part that refers
-	 to the symbolic link. */
-      if ((p = strrchr (path_copy, '/')) == NULL)
-	p = path_copy;
-      else if (p == path_copy)
-	p++;
-      *p = '\0';
-
-      char *headptr;
-      if (isabspath (sym.contents))
-	headptr = tmp_buf;	/* absolute path */
-      else
-	{
-	  /* Copy the first part of the path and point to the end. */
-	  strcpy (tmp_buf, path_copy);
-	  headptr = strchr (tmp_buf, '\0');
-	}
-
-      /* See if we need to separate first part + symlink contents with a / */
-      if (headptr > tmp_buf && headptr[-1] != '/')
-	*headptr++ = '/';
-
-      /* Copy the symlink contents to the end of tmp_buf.
-	 Convert slashes.  FIXME? */
-      for (p = sym.contents; *p; p++)
-	*headptr++ = *p == '\\' ? '/' : *p;
-
-      /* Copy any tail component */
-      if (tail >= path_end)
-	*headptr = '\0';
-      else
-	{
-	  *headptr++ = '/';
-	  strcpy (headptr, tail);
-	}
-
-      /* Now evaluate everything all over again. */
-      src = tmp_buf;
-    }
-
-  if (!(opt & PC_SYM_CONTENTS))
-    add_ext_from_sym (sym);
-
-out:
-  /* Deal with Windows stupidity which considers filename\. to be valid
-     even when "filename" is not a directory. */
-  if (!need_directory || error)
-    /* nothing to do */;
-  else if (fileattr & FILE_ATTRIBUTE_DIRECTORY)
-    path_flags &= ~PATH_SYMLINK;
-  else
-    {
-      debug_printf ("%s is a non-directory", path);
-      error = ENOTDIR;
-      return;
-    }
-
-  if (dev.devn == FH_FS)
-    {
-      if (!fs.update (path))
-	{
-	  fs.root_dir ()[0] = '\0';
-	  set_has_acls (false);		// already implied but...
-	  set_has_buggy_open (false);	// ditto
-	}
-      else
-	{
-	  set_isdisk ();
-	  debug_printf ("root_dir(%s), this->path(%s), set_has_acls(%d)",
-			fs.root_dir (), this->path, fs.flags () & FS_PERSISTENT_ACLS);
-	  if (!(fs.flags () & FS_PERSISTENT_ACLS) || (!allow_smbntsec && fs.is_remote_drive ()))
-	    set_has_acls (false);
-	  else
-	    {
-	      set_has_acls (true);
-	      if (allow_ntsec && wincap.has_security ())
-		set_exec (0);  /* We really don't know if this is executable or not here
-				  but set it to not executable since it will be figured out
-				  later by anything which cares about this. */
-	    }
-	  /* Known file systems with buggy open calls. Further explanation
-	     in fhandler.cc (fhandler_disk_file::open). */
-	  set_has_buggy_open (strcmp (fs.name (), "SUNWNFS") == 0);
-	}
-      if (exec_state () != dont_know_if_executable)
-	/* ok */;
-      else if (isdir ())
-	set_exec (1);
-      else if (issymlink () || issocket ())
-	set_exec (0);
-    }
-
-#if 0
-  if (issocket ())
-    devn = FH_SOCKET;
-#endif
-
-  if (!(opt & PC_FULL))
-    {
-      if (is_relpath)
-	mkrelpath (this->path);
-      if (need_directory)
-	{
-	  size_t n = strlen (this->path);
-	  /* Do not add trailing \ to UNC device names like \\.\a: */
-	  if (this->path[n - 1] != '\\' &&
-	      (strncmp (this->path, "\\\\.\\", 4) != 0 ||
-	       !strncasematch (this->path + 4, "unc\\", 4)))
-	    {
-	      this->path[n] = '\\';
-	      this->path[n + 1] = '\0';
-	    }
-	}
-    }
-
-  if (saw_symlinks)
-    set_has_symlinks ();
-
-  if (!error && !isdir () && !(path_flags & PATH_ALL_EXEC))
-    {
-      const char *p = strchr (path, '\0') - 4;
-      if (p >= path &&
-	  (strcasematch (".exe", p) ||
-	   strcasematch (".bat", p) ||
-	   strcasematch (".com", p)))
-	path_flags |= PATH_EXEC;
-    }
-
-  if (!(opt & PC_POSIX))
-    normalized_path_size = 0;
-  else
-    {
-      if (tail[1] != '\0')
-	*tail = '/';
-      set_normalized_path (path_copy);
-    }
-
-#if 0
-  if (!error)
-    {
-      last_path_conv = *this;
-      strcpy (last_src, src);
-    }
-#endif
-}
-
-static __inline int
-digits (const char *name)
-{
-  char *p;
-  int n = strtol (name, &p, 10);
-
-  return p > name && !*p ? n : -1;
-}
-
-/* Return true if src_path is a valid, internally supported device name.
-   In that case, win32_path gets the corresponding NT device name and
-   dev is appropriately filled with device information. */
-
-static bool
-win32_device_name (const char *src_path, char *win32_path, device& dev)
-{
-  dev.parse (src_path);
-  if (dev.devn == FH_FS)
-    return false;
-  strcpy (win32_path, dev.native);
-  return true;
-}
-
-/* Normalize a Win32 path.
-   /'s are converted to \'s in the process.
-   All duplicate \'s, except for 2 leading \'s, are deleted.
-
-   The result is 0 for success, or an errno error value.
-   FIXME: A lot of this should be mergeable with the POSIX critter.  */
-static int
-normalize_win32_path (const char *src, char *dst)
-{
-  const char *src_start = src;
-  char *dst_start = dst;
-  char *dst_root_start = dst;
-  bool beg_src_slash = isdirsep (src[0]);
-
-  if (beg_src_slash && isdirsep (src[1]))
-    {
-      *dst++ = '\\';
-      src++;
-      if (src[1] == '.' && isdirsep (src[2]))
-	{
-	  *dst++ = '\\';
-	  *dst++ = '.';
-	  src += 2;
-	}
-    }
-  else if (strchr (src, ':') == NULL && *src != '/')
-    {
-      if (!cygheap->cwd.get (dst, 0))
-	return get_errno ();
-      if (beg_src_slash)
-	{
-	  if (dst[1] == ':')
-	    dst[2] = '\0';
-	  else if (slash_unc_prefix_p (dst))
-	    {
-	      char *p = strpbrk (dst + 2, "\\/");
-	      if (p && (p = strpbrk (p + 1, "\\/")))
-		  *p = '\0';
-	    }
-	}
-      if (strlen (dst) + 1 + strlen (src) >= CYG_MAX_PATH)
-	{
-	  debug_printf ("ENAMETOOLONG = normalize_win32_path (%s)", src);
-	  return ENAMETOOLONG;
-	}
-      dst += strlen (dst);
-      if (!beg_src_slash)
-	*dst++ = '\\';
-    }
-
-  while (*src)
-    {
-      /* Strip duplicate /'s.  */
-      if (isdirsep (src[0]) && isdirsep (src[1]))
-	src++;
-      /* Ignore "./".  */
-      else if (src[0] == '.' && isdirsep (src[1])
-	       && (src == src_start || isdirsep (src[-1])))
-	src += 2;
-
-      /* Backup if "..".  */
-      else if (src[0] == '.' && src[1] == '.'
-	       /* dst must be greater than dst_start */
-	       && dst[-1] == '\\'
-	       && (isdirsep (src[2]) || src[2] == 0))
-	{
-	  /* Back up over /, but not if it's the first one.  */
-	  if (dst > dst_root_start + 1)
-	    dst--;
-	  /* Now back up to the next /.  */
-	  while (dst > dst_root_start + 1 && dst[-1] != '\\' && dst[-2] != ':')
-	    dst--;
-	  src += 2;
-	  if (isdirsep (*src))
-	    src++;
-	}
-      /* Otherwise, add char to result.  */
-      else
-	{
-	  if (*src == '/')
-	    *dst++ = '\\';
-	  else
-	    *dst++ = *src;
-	  ++src;
-	}
-      if ((dst - dst_start) >= CYG_MAX_PATH)
-	return ENAMETOOLONG;
-    }
-  *dst = 0;
-  debug_printf ("%s = normalize_win32_path (%s)", dst_start, src_start);
-  return 0;
-}
-
-/* Various utilities.  */
-
-/* slashify: Convert all back slashes in src path to forward slashes
-   in dst path.  Add a trailing slash to dst when trailing_slash_p arg
-   is set to 1. */
-
-static void
-slashify (const char *src, char *dst, int trailing_slash_p)
-{
-  const char *start = src;
-
-  while (*src)
-    {
-      if (*src == '\\')
-	*dst++ = '/';
-      else
-	*dst++ = *src;
-      ++src;
-    }
-  if (trailing_slash_p
-      && src > start
-      && !isdirsep (src[-1]))
-    *dst++ = '/';
-  *dst++ = 0;
-}
-
-/* backslashify: Convert all forward slashes in src path to back slashes
-   in dst path.  Add a trailing slash to dst when trailing_slash_p arg
-   is set to 1. */
-
-static void
-backslashify (const char *src, char *dst, int trailing_slash_p)
-{
-  const char *start = src;
-
-  while (*src)
-    {
-      if (*src == '/')
-	*dst++ = '\\';
-      else
-	*dst++ = *src;
-      ++src;
-    }
-  if (trailing_slash_p
-      && src > start
-      && !isdirsep (src[-1]))
-    *dst++ = '\\';
-  *dst++ = 0;
-}
-
-/* nofinalslash: Remove trailing / and \ from SRC (except for the
-   first one).  It is ok for src == dst.  */
-
-void __stdcall
-nofinalslash (const char *src, char *dst)
-{
-  int len = strlen (src);
-  if (src != dst)
-    memcpy (dst, src, len + 1);
-  while (len > 1 && isdirsep (dst[--len]))
-    dst[len] = '\0';
-}
-
-/* slash_unc_prefix_p: Return non-zero if PATH begins with //UNC/SHARE */
-
-int __stdcall
-slash_unc_prefix_p (const char *path)
-{
-  char *p = NULL;
-  int ret = (isdirsep (path[0])
-	     && isdirsep (path[1])
-	     && (isalnum (path[2]) || path[2] == '.')
-	     && ((p = strpbrk (path + 3, "\\/")) != NULL));
-  if (!ret || p == NULL)
-    return ret;
-  return ret && isalnum (p[1]);
-}
-
-/* conv_path_list: Convert a list of path names to/from Win32/POSIX. */
-
-static void
-conv_path_list (const char *src, char *dst, int to_posix)
-{
-  char *s;
-  char *d = dst;
-  char src_delim = to_posix ? ';' : ':';
-  char dst_delim = to_posix ? ':' : ';';
-  int (*conv_fn) (const char *, char *) = (to_posix
-					   ? cygwin_conv_to_posix_path
-					   : cygwin_conv_to_win32_path);
-
-  char *srcbuf = (char *) alloca (strlen (src) + 1);
-
-  for (;;)
-    {
-      s = strccpy (srcbuf, &src, src_delim);
-      int len = s - srcbuf;
-      if (len >= CYG_MAX_PATH)
-	srcbuf[CYG_MAX_PATH - 1] = '\0';
-      (*conv_fn) (len ? srcbuf : ".", d);
-      if (!*src++)
-	break;
-      d = strchr (d, '\0');
-      *d++ = dst_delim;
-    }
-}
-
-/* init: Initialize the mount table.  */
-
-void
-mount_info::init ()
-{
-  nmounts = 0;
-
-  /* Fetch the mount table and cygdrive-related information from
-     the registry.  */
-  from_registry ();
-}
-
-static void
-set_flags (unsigned *flags, unsigned val)
-{
-  *flags = val;
-  if (!(*flags & PATH_BINARY))
-    {
-      *flags |= PATH_TEXT;
-      debug_printf ("flags: text (%p)", *flags & (PATH_TEXT | PATH_BINARY));
-    }
-  else
-    {
-      *flags |= PATH_BINARY;
-      debug_printf ("flags: binary (%p)", *flags & (PATH_TEXT | PATH_BINARY));
-    }
-}
-
-static char dot_special_chars[] =
-    "."
-    "\001" "\002" "\003" "\004" "\005" "\006" "\007" "\010"
-    "\011" "\012" "\013" "\014" "\015" "\016" "\017" "\020"
-    "\021" "\022" "\023" "\024" "\025" "\026" "\027" "\030"
-    "\031" "\032" "\033" "\034" "\035" "\036" "\037"
-    ":"    "\\"   "*"    "?"    "%"
-    "A"    "B"    "C"    "D"    "E"    "F"    "G"    "H"
-    "I"    "J"    "K"    "L"    "M"    "N"    "O"    "P"
-    "Q"    "R"    "S"    "T"    "U"    "V"    "W"    "X"
-    "Y"    "Z";
-static char *special_chars = dot_special_chars + 1;
-static char special_introducers[] =
-    "anpcl";
-
-static char
-special_char (const char *s, const char *valid_chars = special_chars)
-{
-  if (*s != '%' || strlen (s) < 3)
-    return 0;
-
-  char *p;
-  char hex[] = {s[1], s[2], '\0'};
-  unsigned char c = strtoul (hex, &p, 16);
-  p = strechr (valid_chars, c);
-  return *p;
-}
-
-/* Determines if name is "special".  Assumes that name is empty or "absolute" */
-static int
-special_name (const char *s, int inc = 1)
-{
-  if (!*s)
-    return false;
-
-  s += inc;
-  if (strpbrk (s, special_chars))
-    return !strncasematch (s, "%2f", 3);
-
-  if (strcasematch (s, ".") || strcasematch (s, ".."))
-    return false;
-  if (s[strlen (s)-1] == '.')
-    return true;
-
-  const char *p;
-  if (strcasematch (s, "conin$") || strcasematch (s, "conout$"))
-    return -1;
-
-  if (strncasematch (s, "nul", 3)
-      || strncasematch (s, "aux", 3)
-      || strncasematch (s, "prn", 3)
-      || strncasematch (s, "con", 3))
-    p = s + 3;
-  else if (strncasematch (s, "com", 3) || strncasematch (s, "lpt", 3))
-    (void) strtoul (s + 3, (char **) &p, 10);
-  else
-    return false;
-
-  return (*p == '\0' || *p == '.') ? -1 : false;
-}
-
-bool
-fnunmunge (char *dst, const char *src)
-{
-  bool converted = false;
-  char c;
-
-  if ((c = special_char (src, special_introducers)))
-    {
-      __small_sprintf (dst, "%c%s", c, src + 3);
-      if (special_name (dst, 0))
-	{
-	  *dst++ = c;
-	  src += 3;
-	}
-    }
-
-  while (*src)
-    if (!(c = special_char (src, dot_special_chars)))
-      *dst++ = *src++;
-    else
-      {
-	converted = true;
-	*dst++ = c;
-	src += 3;
-      }
-
-  *dst = *src;
-  return converted;
-}
-
-void
-mount_item::fnmunge (char *dst, const char *src)
-{
-  int name_type;
-  if (!(flags & MOUNT_ENC) || !(name_type = special_name (src)))
-    strcpy (dst, src);
-  else
-    {
-      char *d = dst;
-      *d++ = *src++;
-      if (name_type < 0)
-	d += __small_sprintf (d, "%%%02x", (unsigned char) *src++);
-
-      while (*src)
-	if (!strchr (special_chars, *src) || (*src == '%' && !special_char (src)))
-	  *d++ = *src++;
-	else
-	  d += __small_sprintf (d, "%%%02x", (unsigned char) *src++);
-
-      if (*--d != '.')
-	d++;
-      else
-	d += __small_sprintf (d, "%%%02x", (unsigned char) '.');
-
-      *d = *src;
-    }
-
-  backslashify (dst, dst, 0);
-}
-
-void
-mount_item::build_win32 (char *dst, const char *src, unsigned *outflags, unsigned chroot_pathlen)
-{
-  int n;
-  const char *real_native_path;
-  int real_posix_pathlen;
-  set_flags (outflags, (unsigned) flags);
-  if (!cygheap->root.exists () || posix_pathlen != 1 || posix_path[0] != '/')
-    {
-      n = native_pathlen;
-      real_native_path = native_path;
-      real_posix_pathlen = chroot_pathlen ?: posix_pathlen;
-    }
-  else
-    {
-      n = cygheap->root.native_length ();
-      real_native_path = cygheap->root.native_path ();
-      real_posix_pathlen = posix_pathlen;
-    }
-  memcpy (dst, real_native_path, n + 1);
-  const char *p = src + real_posix_pathlen;
-  if (*p == '/')
-    /* nothing */;
-  else if ((!(flags & MOUNT_ENC) && isdrive (dst) && !dst[2]) || *p)
-    dst[n++] = '\\';
-  fnmunge (dst + n, p);
-}
-
-/* conv_to_win32_path: Ensure src_path is a pure Win32 path and store
-   the result in win32_path.
-
-   If win32_path != NULL, the relative path, if possible to keep, is
-   stored in win32_path.  If the relative path isn't possible to keep,
-   the full path is stored.
-
-   If full_win32_path != NULL, the full path is stored there.
-
-   The result is zero for success, or an errno value.
-
-   {,full_}win32_path must have sufficient space (i.e. CYG_MAX_PATH bytes).  */
-
-int
-mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev,
-				unsigned *flags, bool no_normalize)
-{
-  bool chroot_ok = !cygheap->root.exists ();
-  while (sys_mount_table_counter < cygwin_shared->sys_mount_table_counter)
-    {
-      init ();
-      sys_mount_table_counter++;
-    }
-  int src_path_len = strlen (src_path);
-  MALLOC_CHECK;
-  unsigned dummy_flags;
-
-  dev.devn = FH_FS;
-
-  if (!flags)
-    flags = &dummy_flags;
-
-  *flags = 0;
-  debug_printf ("conv_to_win32_path (%s)", src_path);
-
-  if (src_path_len >= CYG_MAX_PATH)
-    {
-      debug_printf ("ENAMETOOLONG = conv_to_win32_path (%s)", src_path);
-      return ENAMETOOLONG;
-    }
-
-  int i, rc;
-  mount_item *mi = NULL;	/* initialized to avoid compiler warning */
-  char pathbuf[CYG_MAX_PATH];
-
-  if (dst == NULL)
-    goto out;		/* Sanity check. */
-
-  /* Normalize the path, taking out ../../ stuff, we need to do this
-     so that we can move from one mounted directory to another with relative
-     stuff.
-
-     eg mounting c:/foo /foo
-     d:/bar /bar
-
-     cd /bar
-     ls ../foo
-
-     should look in c:/foo, not d:/foo.
-
-     We do this by first getting an absolute UNIX-style path and then
-     converting it to a DOS-style path, looking up the appropriate drive
-     in the mount table.  */
-
-  if (no_normalize)
-    strcpy (pathbuf, src_path);
-  else
-    {
-      rc = normalize_posix_path (src_path, pathbuf);
-
-      if (rc)
-	{
-	  debug_printf ("%d = conv_to_win32_path (%s)", rc, src_path);
-	  return rc;
-	}
-    }
-
-  /* See if this is a cygwin "device" */
-  if (win32_device_name (pathbuf, dst, dev))
-    {
-      *flags = MOUNT_BINARY;	/* FIXME: Is this a sensible default for devices? */
-      rc = 0;
-      goto out_no_chroot_check;
-    }
-
-  /* Check if the cygdrive prefix was specified.  If so, just strip
-     off the prefix and transform it into an MS-DOS path. */
-  MALLOC_CHECK;
-  if (isproc (pathbuf))
-    {
-      dev = *proc_dev;
-      dev.devn = fhandler_proc::get_proc_fhandler (pathbuf);
-      if (dev.devn == FH_BAD)
-	return ENOENT;
-    }
-  else if (iscygdrive (pathbuf))
-    {
-      int n = mount_table->cygdrive_len - 1;
-      int unit;
-
-      if (!pathbuf[n] ||
-	  (pathbuf[n] == '/' && pathbuf[n + 1] == '.' && !pathbuf[n + 2]))
-	{
-	  unit = 0;
-	  dst[0] = '\0';
-	  if (mount_table->cygdrive_len > 1)
-	    dev = *cygdrive_dev;
-	}
-      else if (cygdrive_win32_path (pathbuf, dst, unit))
-	{
-	  set_flags (flags, (unsigned) cygdrive_flags);
-	  goto out;
-	}
-      else if (mount_table->cygdrive_len > 1)
-	return ENOENT;
-    }
-
-  int chroot_pathlen;
-  chroot_pathlen = 0;
-  /* Check the mount table for prefix matches. */
-  for (i = 0; i < nmounts; i++)
-    {
-      const char *path;
-      int len;
-
-      mi = mount + posix_sorted[i];
-      if (!cygheap->root.exists ()
-	  || (mi->posix_pathlen == 1 && mi->posix_path[0] == '/'))
-	{
-	  path = mi->posix_path;
-	  len = mi->posix_pathlen;
-	}
-      else if (cygheap->root.posix_ok (mi->posix_path))
-	{
-	  path = cygheap->root.unchroot (mi->posix_path);
-	  chroot_pathlen = len = strlen (path);
-	}
-      else
-	{
-	  chroot_pathlen = 0;
-	  continue;
-	}
-
-      if (path_prefix_p (path, pathbuf, len))
-	break;
-    }
-
-  if (i < nmounts)
-    {
-      mi->build_win32 (dst, pathbuf, flags, chroot_pathlen);
-      chroot_ok = true;
-    }
-  else
-    {
-      if (strpbrk (src_path, ":\\") != NULL || slash_unc_prefix_p (src_path))
-	rc = normalize_win32_path (src_path, dst);
-      else
-	{
-	  backslashify (pathbuf, dst, 0);	/* just convert */
-	  set_flags (flags, PATH_BINARY);
-	}
-      chroot_ok = !cygheap->root.exists ();
-    }
-
-  if (!isvirtual_dev (dev.devn))
-    win32_device_name (src_path, dst, dev);
-
- out:
-  MALLOC_CHECK;
-  if (chroot_ok || cygheap->root.ischroot_native (dst))
-    rc = 0;
-  else
-    {
-      debug_printf ("attempt to access outside of chroot '%s = %s'",
-		    cygheap->root.posix_path (), cygheap->root.native_path ());
-      rc = ENOENT;
-    }
-
- out_no_chroot_check:
-  debug_printf ("src_path %s, dst %s, flags %p, rc %d", src_path, dst, *flags, rc);
-  return rc;
-}
-
-/* cygdrive_posix_path: Build POSIX path used as the
-   mount point for cygdrives created when there is no other way to
-   obtain a POSIX path from a Win32 one. */
-
-void
-mount_info::cygdrive_posix_path (const char *src, char *dst, int trailing_slash_p)
-{
-  int len = cygdrive_len;
-
-  memcpy (dst, cygdrive, len + 1);
-
-  /* Now finish the path off with the drive letter to be used.
-     The cygdrive prefix always ends with a trailing slash so
-     the drive letter is added after the path. */
-  dst[len++] = cyg_tolower (src[0]);
-  if (!src[2] || (isdirsep (src[2]) && !src[3]))
-    dst[len++] = '\000';
-  else
-    {
-      int n;
-      dst[len++] = '/';
-      if (isdirsep (src[2]))
-	n = 3;
-      else
-	n = 2;
-      strcpy (dst + len, src + n);
-    }
-  slashify (dst, dst, trailing_slash_p);
-}
-
-int
-mount_info::cygdrive_win32_path (const char *src, char *dst, int& unit)
-{
-  int res;
-  const char *p = src + cygdrive_len;
-  if (!isalpha (*p) || (!isdirsep (p[1]) && p[1]))
-    {
-      unit = -1; /* FIXME: should be zero, maybe? */
-      dst[0] = '\0';
-      res = 0;
-    }
-  else
-    {
-      dst[0] = cyg_tolower (*p);
-      dst[1] = ':';
-      strcpy (dst + 2, p + 1);
-      backslashify (dst, dst, !dst[2]);
-      unit = dst[0];
-      res = 1;
-    }
-  debug_printf ("src '%s', dst '%s'", src, dst);
-  return res;
-}
-
-/* conv_to_posix_path: Ensure src_path is a POSIX path.
-
-   The result is zero for success, or an errno value.
-   posix_path must have sufficient space (i.e. CYG_MAX_PATH bytes).
-   If keep_rel_p is non-zero, relative paths stay that way.  */
-
-int
-mount_info::conv_to_posix_path (const char *src_path, char *posix_path,
-				int keep_rel_p)
-{
-  int src_path_len = strlen (src_path);
-  int relative_path_p = !isabspath (src_path);
-  int trailing_slash_p;
-
-  if (src_path_len <= 1)
-    trailing_slash_p = 0;
-  else
-    {
-      const char *lastchar = src_path + src_path_len - 1;
-      trailing_slash_p = isdirsep (*lastchar) && lastchar[-1] != ':';
-    }
-
-  debug_printf ("conv_to_posix_path (%s, %s, %s)", src_path,
-		keep_rel_p ? "keep-rel" : "no-keep-rel",
-		trailing_slash_p ? "add-slash" : "no-add-slash");
-  MALLOC_CHECK;
-
-  if (src_path_len >= CYG_MAX_PATH)
-    {
-      debug_printf ("ENAMETOOLONG");
-      return ENAMETOOLONG;
-    }
-
-  /* FIXME: For now, if the path is relative and it's supposed to stay
-     that way, skip mount table processing. */
-
-  if (keep_rel_p && relative_path_p)
-    {
-      slashify (src_path, posix_path, 0);
-      debug_printf ("%s = conv_to_posix_path (%s)", posix_path, src_path);
-      return 0;
-    }
-
-  char pathbuf[CYG_MAX_PATH];
-  int rc = normalize_win32_path (src_path, pathbuf);
-  if (rc != 0)
-    {
-      debug_printf ("%d = conv_to_posix_path (%s)", rc, src_path);
-      return rc;
-    }
-
-  int pathbuflen = strlen (pathbuf);
-  for (int i = 0; i < nmounts; ++i)
-    {
-      mount_item &mi = mount[native_sorted[i]];
-      if (!path_prefix_p (mi.native_path, pathbuf, mi.native_pathlen))
-	continue;
-
-      if (cygheap->root.exists () && !cygheap->root.posix_ok (mi.posix_path))
-	continue;
-
-      /* SRC_PATH is in the mount table. */
-      int nextchar;
-      const char *p = pathbuf + mi.native_pathlen;
-
-      if (!*p || !p[1])
-	nextchar = 0;
-      else if (isdirsep (*p))
-	nextchar = -1;
-      else
-	nextchar = 1;
-
-      int addslash = nextchar > 0 ? 1 : 0;
-      if ((mi.posix_pathlen + (pathbuflen - mi.native_pathlen) + addslash) >= CYG_MAX_PATH)
-	return ENAMETOOLONG;
-      strcpy (posix_path, mi.posix_path);
-      if (addslash)
-	strcat (posix_path, "/");
-      if (nextchar)
-	slashify (p,
-		  posix_path + addslash + (mi.posix_pathlen == 1 ? 0 : mi.posix_pathlen),
-		  trailing_slash_p);
-
-      if (cygheap->root.exists ())
-	{
-	  const char *p = cygheap->root.unchroot (posix_path);
-	  memmove (posix_path, p, strlen (p) + 1);
-	}
-      if (mi.flags & MOUNT_ENC)
-	{
-	  char tmpbuf[CYG_MAX_PATH + 1];
-	  if (fnunmunge (tmpbuf, posix_path))
-	    strcpy (posix_path, tmpbuf);
-	}
-      goto out;
-    }
-
-  if (!cygheap->root.exists ())
-    /* nothing */;
-  else if (cygheap->root.ischroot_native (pathbuf))
-    {
-      const char *p = pathbuf + cygheap->root.native_length ();
-      if (*p)
-	slashify (p, posix_path, trailing_slash_p);
-      else
-	{
-	  posix_path[0] = '/';
-	  posix_path[1] = '\0';
-	}
-    }
-  else
-    return ENOENT;
-
-  /* Not in the database.  This should [theoretically] only happen if either
-     the path begins with //, or / isn't mounted, or the path has a drive
-     letter not covered by the mount table.  If it's a relative path then the
-     caller must want an absolute path (otherwise we would have returned
-     above).  So we always return an absolute path at this point. */
-  if (isdrive (pathbuf))
-    cygdrive_posix_path (pathbuf, posix_path, trailing_slash_p);
-  else
-    {
-      /* The use of src_path and not pathbuf here is intentional.
-	 We couldn't translate the path, so just ensure no \'s are present. */
-      slashify (src_path, posix_path, trailing_slash_p);
-    }
-
-out:
-  debug_printf ("%s = conv_to_posix_path (%s)", posix_path, src_path);
-  MALLOC_CHECK;
-  return 0;
-}
-
-/* Return flags associated with a mount point given the win32 path. */
-
-unsigned
-mount_info::set_flags_from_win32_path (const char *p)
-{
-  for (int i = 0; i < nmounts; i++)
-    {
-      mount_item &mi = mount[native_sorted[i]];
-      if (path_prefix_p (mi.native_path, p, mi.native_pathlen))
-	return mi.flags;
-    }
-  return PATH_BINARY;
-}
-
-/* read_mounts: Given a specific regkey, read mounts from under its
-   key. */
-
-void
-mount_info::read_mounts (reg_key& r)
-{
-  char posix_path[CYG_MAX_PATH];
-  HKEY key = r.get_key ();
-  DWORD i, posix_path_size;
-  int res;
-
-  /* Loop through subkeys */
-  /* FIXME: we would like to not check MAX_MOUNTS but the heap in the
-     shared area is currently statically allocated so we can't have an
-     arbitrarily large number of mounts. */
-  for (i = 0; ; i++)
-    {
-      char native_path[CYG_MAX_PATH];
-      int mount_flags;
-
-      posix_path_size = CYG_MAX_PATH;
-      /* FIXME: if maximum posix_path_size is 256, we're going to
-	 run into problems if we ever try to store a mount point that's
-	 over 256 but is under CYG_MAX_PATH. */
-      res = RegEnumKeyEx (key, i, posix_path, &posix_path_size, NULL,
-			  NULL, NULL, NULL);
-
-      if (res == ERROR_NO_MORE_ITEMS)
-	break;
-      else if (res != ERROR_SUCCESS)
-	{
-	  debug_printf ("RegEnumKeyEx failed, error %d!", res);
-	  break;
-	}
-
-      /* Get a reg_key based on i. */
-      reg_key subkey = reg_key (key, KEY_READ, posix_path, NULL);
-
-      /* Fetch info from the subkey. */
-      subkey.get_string ("native", native_path, sizeof (native_path), "");
-      mount_flags = subkey.get_int ("flags", 0);
-
-      /* Add mount_item corresponding to registry mount point. */
-      res = mount_table->add_item (native_path, posix_path, mount_flags, false);
-      if (res && get_errno () == EMFILE)
-	break; /* The number of entries exceeds MAX_MOUNTS */
-    }
-}
-
-/* from_registry: Build the entire mount table from the registry.  Also,
-   read in cygdrive-related information from its registry location. */
-
-void
-mount_info::from_registry ()
-{
-  /* Use current mount areas if either user or system mount areas
-     already exist.  Otherwise, import old mounts. */
-
-  reg_key r;
-
-  /* Retrieve cygdrive-related information. */
-  read_cygdrive_info_from_registry ();
-
-  nmounts = 0;
-
-  /* First read mounts from user's table. */
-  read_mounts (r);
-
-  /* Then read mounts from system-wide mount table. */
-  reg_key r1 (HKEY_LOCAL_MACHINE, KEY_READ, "SOFTWARE",
-	      CYGWIN_INFO_CYGNUS_REGISTRY_NAME, CYGWIN_REGNAME,
-	      CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME,
-	      NULL);
-  read_mounts (r1);
-}
-
-/* add_reg_mount: Add mount item to registry.  Return zero on success,
-   non-zero on failure. */
-/* FIXME: Need a mutex to avoid collisions with other tasks. */
-
-int
-mount_info::add_reg_mount (const char *native_path, const char *posix_path, unsigned mountflags)
-{
-  int res = 0;
-
-  if (strchr (posix_path, '\\'))
-    {
-      set_errno (EINVAL);
-      goto err1;
-    }
-
-  /* Add the mount to the right registry location, depending on
-     whether MOUNT_SYSTEM is set in the mount flags. */
-  if (!(mountflags & MOUNT_SYSTEM)) /* current_user mount */
-    {
-      /* reg_key for user mounts in HKEY_CURRENT_USER. */
-      reg_key reg_user;
-
-      /* Start by deleting existing mount if one exists. */
-      res = reg_user.kill (posix_path);
-      if (res != ERROR_SUCCESS && res != ERROR_FILE_NOT_FOUND)
-	goto err;
-
-      /* Create the new mount. */
-      reg_key subkey = reg_key (reg_user.get_key (),
-				KEY_ALL_ACCESS,
-				posix_path, NULL);
-      res = subkey.set_string ("native", native_path);
-      if (res != ERROR_SUCCESS)
-	goto err;
-      res = subkey.set_int ("flags", mountflags);
-    }
-  else /* local_machine mount */
-    {
-      /* reg_key for system mounts in HKEY_LOCAL_MACHINE. */
-      reg_key reg_sys (HKEY_LOCAL_MACHINE, KEY_ALL_ACCESS, "SOFTWARE",
-		       CYGWIN_INFO_CYGNUS_REGISTRY_NAME, CYGWIN_REGNAME,
-		       CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME,
-		       NULL);
-
-      /* Start by deleting existing mount if one exists. */
-      res = reg_sys.kill (posix_path);
-      if (res != ERROR_SUCCESS && res != ERROR_FILE_NOT_FOUND)
-	goto err;
-
-      /* Create the new mount. */
-      reg_key subkey = reg_key (reg_sys.get_key (),
-				KEY_ALL_ACCESS,
-				posix_path, NULL);
-      res = subkey.set_string ("native", native_path);
-      if (res != ERROR_SUCCESS)
-	goto err;
-      res = subkey.set_int ("flags", mountflags);
-
-      sys_mount_table_counter++;
-      cygwin_shared->sys_mount_table_counter++;
-    }
-
-  return 0; /* Success */
- err:
-  __seterrno_from_win_error (res);
- err1:
-  return -1;
-}
-
-/* del_reg_mount: delete mount item from registry indicated in flags.
-   Return zero on success, non-zero on failure.*/
-/* FIXME: Need a mutex to avoid collisions with other tasks. */
-
-int
-mount_info::del_reg_mount (const char * posix_path, unsigned flags)
-{
-  int res;
-
-  if (!(flags & MOUNT_SYSTEM))	/* Delete from user registry */
-    {
-      reg_key reg_user (KEY_ALL_ACCESS,
-			CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME, NULL);
-      res = reg_user.kill (posix_path);
-    }
-  else					/* Delete from system registry */
-    {
-      sys_mount_table_counter++;
-      cygwin_shared->sys_mount_table_counter++;
-      reg_key reg_sys (HKEY_LOCAL_MACHINE, KEY_ALL_ACCESS, "SOFTWARE",
-		       CYGWIN_INFO_CYGNUS_REGISTRY_NAME, CYGWIN_REGNAME,
-		       CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME,
-		       NULL);
-      res = reg_sys.kill (posix_path);
-    }
-
-  if (res != ERROR_SUCCESS)
-    {
-      __seterrno_from_win_error (res);
-      return -1;
-    }
-
-  return 0; /* Success */
-}
-
-/* read_cygdrive_info_from_registry: Read the default prefix and flags
-   to use when creating cygdrives from the special user registry
-   location used to store cygdrive information. */
-
-void
-mount_info::read_cygdrive_info_from_registry ()
-{
-  /* reg_key for user path prefix in HKEY_CURRENT_USER. */
-  reg_key r;
-
-  if (r.get_string (CYGWIN_INFO_CYGDRIVE_PREFIX, cygdrive, sizeof (cygdrive), "") != 0)
-    {
-      /* Didn't find the user path prefix so check the system path prefix. */
-
-      /* reg_key for system path prefix in HKEY_LOCAL_MACHINE.  */
-      reg_key r2 (HKEY_LOCAL_MACHINE, KEY_READ, "SOFTWARE",
-		 CYGWIN_INFO_CYGNUS_REGISTRY_NAME, CYGWIN_REGNAME,
-		 CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME,
-		 NULL);
-
-      if (r2.get_string (CYGWIN_INFO_CYGDRIVE_PREFIX, cygdrive,
-	  sizeof (cygdrive), ""))
-	strcpy (cygdrive, CYGWIN_INFO_CYGDRIVE_DEFAULT_PREFIX);
-      cygdrive_flags = r2.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE);
-      slashify (cygdrive, cygdrive, 1);
-      cygdrive_len = strlen (cygdrive);
-    }
-  else
-    {
-      /* Fetch user cygdrive_flags from registry; returns MOUNT_CYGDRIVE on
-	 error. */
-      cygdrive_flags = r.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE);
-      slashify (cygdrive, cygdrive, 1);
-      cygdrive_len = strlen (cygdrive);
-    }
-}
-
-/* write_cygdrive_info_to_registry: Write the default prefix and flags
-   to use when creating cygdrives to the special user registry
-   location used to store cygdrive information. */
-
-int
-mount_info::write_cygdrive_info_to_registry (const char *cygdrive_prefix, unsigned flags)
-{
-  /* Determine whether to modify user or system cygdrive path prefix. */
-  HKEY top = (flags & MOUNT_SYSTEM) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-
-  if (flags & MOUNT_SYSTEM)
-    {
-      sys_mount_table_counter++;
-      cygwin_shared->sys_mount_table_counter++;
-    }
-
-  /* reg_key for user path prefix in HKEY_CURRENT_USER or system path prefix in
-     HKEY_LOCAL_MACHINE.  */
-  reg_key r (top, KEY_ALL_ACCESS, "SOFTWARE",
-	     CYGWIN_INFO_CYGNUS_REGISTRY_NAME, CYGWIN_REGNAME,
-	     CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME,
-	     NULL);
-
-  /* Verify cygdrive prefix starts with a forward slash and if there's
-     another character, it's not a slash. */
-  if ((cygdrive_prefix == NULL) || (*cygdrive_prefix == 0) ||
-      (!isslash (cygdrive_prefix[0])) ||
-      ((cygdrive_prefix[1] != '\0') && (isslash (cygdrive_prefix[1]))))
-      {
-	set_errno (EINVAL);
-	return -1;
-      }
-
-  char hold_cygdrive_prefix[strlen (cygdrive_prefix) + 1];
-  /* Ensure that there is never a final slash */
-  nofinalslash (cygdrive_prefix, hold_cygdrive_prefix);
-
-  int res;
-  res = r.set_string (CYGWIN_INFO_CYGDRIVE_PREFIX, hold_cygdrive_prefix);
-  if (res != ERROR_SUCCESS)
-    {
-      __seterrno_from_win_error (res);
-      return -1;
-    }
-  r.set_int (CYGWIN_INFO_CYGDRIVE_FLAGS, flags);
-
-  /* This also needs to go in the in-memory copy of "cygdrive", but only if
-     appropriate:
-       1. setting user path prefix, or
-       2. overwriting (a previous) system path prefix */
-  if (!(flags & MOUNT_SYSTEM) || (mount_table->cygdrive_flags & MOUNT_SYSTEM))
-    {
-      slashify (cygdrive_prefix, mount_table->cygdrive, 1);
-      mount_table->cygdrive_flags = flags;
-      mount_table->cygdrive_len = strlen (mount_table->cygdrive);
-    }
-
-  return 0;
-}
-
-int
-mount_info::remove_cygdrive_info_from_registry (const char *cygdrive_prefix, unsigned flags)
-{
-  /* Determine whether to modify user or system cygdrive path prefix. */
-  HKEY top = (flags & MOUNT_SYSTEM) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-
-  if (flags & MOUNT_SYSTEM)
-    {
-      sys_mount_table_counter++;
-      cygwin_shared->sys_mount_table_counter++;
-    }
-
-  /* reg_key for user path prefix in HKEY_CURRENT_USER or system path prefix in
-     HKEY_LOCAL_MACHINE.  */
-  reg_key r (top, KEY_ALL_ACCESS, "SOFTWARE",
-	     CYGWIN_INFO_CYGNUS_REGISTRY_NAME, CYGWIN_REGNAME,
-	     CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME,
-	     NULL);
-
-  /* Delete cygdrive prefix and flags. */
-  int res = r.killvalue (CYGWIN_INFO_CYGDRIVE_PREFIX);
-  int res2 = r.killvalue (CYGWIN_INFO_CYGDRIVE_FLAGS);
-
-  /* Reinitialize the cygdrive path prefix to reflect to removal from the
-     registry. */
-  read_cygdrive_info_from_registry ();
-
-  return (res != ERROR_SUCCESS) ? res : res2;
-}
-
-int
-mount_info::get_cygdrive_info (char *user, char *system, char* user_flags,
-			       char* system_flags)
-{
-  /* Get the user path prefix from HKEY_CURRENT_USER. */
-  reg_key r;
-  int res = r.get_string (CYGWIN_INFO_CYGDRIVE_PREFIX, user, CYG_MAX_PATH, "");
-
-  /* Get the user flags, if appropriate */
-  if (res == ERROR_SUCCESS)
-    {
-      int flags = r.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE);
-      strcpy (user_flags, (flags & MOUNT_BINARY) ? "binmode" : "textmode");
-    }
-
-  /* Get the system path prefix from HKEY_LOCAL_MACHINE. */
-  reg_key r2 (HKEY_LOCAL_MACHINE, KEY_READ, "SOFTWARE",
-	      CYGWIN_INFO_CYGNUS_REGISTRY_NAME, CYGWIN_REGNAME,
-	      CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME,
-	      NULL);
-  int res2 = r2.get_string (CYGWIN_INFO_CYGDRIVE_PREFIX, system, CYG_MAX_PATH, "");
-
-  /* Get the system flags, if appropriate */
-  if (res2 == ERROR_SUCCESS)
-    {
-      int flags = r2.get_int (CYGWIN_INFO_CYGDRIVE_FLAGS, MOUNT_CYGDRIVE);
-      strcpy (system_flags, (flags & MOUNT_BINARY) ? "binmode" : "textmode");
-    }
-
-  return (res != ERROR_SUCCESS) ? res : res2;
-}
-
-static mount_item *mounts_for_sort;
-
-/* sort_by_posix_name: qsort callback to sort the mount entries.  Sort
-   user mounts ahead of system mounts to the same POSIX path. */
-/* FIXME: should the user should be able to choose whether to
-   prefer user or system mounts??? */
-static int
-sort_by_posix_name (const void *a, const void *b)
-{
-  mount_item *ap = mounts_for_sort + (*((int*) a));
-  mount_item *bp = mounts_for_sort + (*((int*) b));
-
-  /* Base weighting on longest posix path first so that the most
-     obvious path will be chosen. */
-  size_t alen = strlen (ap->posix_path);
-  size_t blen = strlen (bp->posix_path);
-
-  int res = blen - alen;
-
-  if (res)
-    return res;		/* Path lengths differed */
-
-  /* The two paths were the same length, so just determine normal
-     lexical sorted order. */
-  res = strcmp (ap->posix_path, bp->posix_path);
-
-  if (res == 0)
-   {
-     /* need to select between user and system mount to same POSIX path */
-     if (!(bp->flags & MOUNT_SYSTEM))	/* user mount */
-      return 1;
-     else
-      return -1;
-   }
-
-  return res;
-}
-
-/* sort_by_native_name: qsort callback to sort the mount entries.  Sort
-   user mounts ahead of system mounts to the same POSIX path. */
-/* FIXME: should the user should be able to choose whether to
-   prefer user or system mounts??? */
-static int
-sort_by_native_name (const void *a, const void *b)
-{
-  mount_item *ap = mounts_for_sort + (*((int*) a));
-  mount_item *bp = mounts_for_sort + (*((int*) b));
-
-  /* Base weighting on longest win32 path first so that the most
-     obvious path will be chosen. */
-  size_t alen = strlen (ap->native_path);
-  size_t blen = strlen (bp->native_path);
-
-  int res = blen - alen;
-
-  if (res)
-    return res;		/* Path lengths differed */
-
-  /* The two paths were the same length, so just determine normal
-     lexical sorted order. */
-  res = strcmp (ap->native_path, bp->native_path);
-
-  if (res == 0)
-   {
-     /* need to select between user and system mount to same POSIX path */
-     if (!(bp->flags & MOUNT_SYSTEM))	/* user mount */
-      return 1;
-     else
-      return -1;
-   }
-
-  return res;
-}
-
-void
-mount_info::sort ()
-{
-  for (int i = 0; i < nmounts; i++)
-    native_sorted[i] = posix_sorted[i] = i;
-  /* Sort them into reverse length order, otherwise we won't
-     be able to look for /foo in /.  */
-  mounts_for_sort = mount;	/* ouch. */
-  qsort (posix_sorted, nmounts, sizeof (posix_sorted[0]), sort_by_posix_name);
-  qsort (native_sorted, nmounts, sizeof (native_sorted[0]), sort_by_native_name);
-}
-
-/* Add an entry to the mount table.
-   Returns 0 on success, -1 on failure and errno is set.
-
-   This is where all argument validation is done.  It may not make sense to
-   do this when called internally, but it's cleaner to keep it all here.  */
-
-int
-mount_info::add_item (const char *native, const char *posix, unsigned mountflags, int reg_p)
-{
-  /* Something's wrong if either path is NULL or empty, or if it's
-     not a UNC or absolute path. */
-
-  if ((native == NULL) || (*native == 0) ||
-      (posix == NULL) || (*posix == 0) ||
-      !isabspath (native) || !isabspath (posix) ||
-      slash_unc_prefix_p (posix) || isdrive (posix))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  /* Make sure both paths do not end in /. */
-  char nativetmp[CYG_MAX_PATH];
-  char posixtmp[CYG_MAX_PATH];
-
-  backslashify (native, nativetmp, 0);
-  nofinalslash (nativetmp, nativetmp);
-
-  slashify (posix, posixtmp, 0);
-  nofinalslash (posixtmp, posixtmp);
-
-  debug_printf ("%s[%s], %s[%s], %p",
-		native, nativetmp, posix, posixtmp, mountflags);
-
-  /* Duplicate /'s in path are an error. */
-  for (char *p = posixtmp + 1; *p; ++p)
-    {
-      if (p[-1] == '/' && p[0] == '/')
-	{
-	  set_errno (EINVAL);
-	  return -1;
-	}
-    }
-
-  /* Write over an existing mount item with the same POSIX path if
-     it exists and is from the same registry area. */
-  int i;
-  for (i = 0; i < nmounts; i++)
-    {
-      if (strcasematch (mount[i].posix_path, posixtmp) &&
-	  (mount[i].flags & MOUNT_SYSTEM) == (mountflags & MOUNT_SYSTEM))
-	break;
-    }
-
-  if (i == nmounts && nmounts == MAX_MOUNTS)
-    {
-      set_errno (EMFILE);
-      return -1;
-    }
-
-  if (reg_p && add_reg_mount (nativetmp, posixtmp, mountflags))
-    return -1;
-
-  if (i == nmounts)
-    nmounts++;
-  mount[i].init (nativetmp, posixtmp, mountflags);
-  sort ();
-
-  return 0;
-}
-
-/* Delete a mount table entry where path is either a Win32 or POSIX
-   path. Since the mount table is really just a table of aliases,
-   deleting / is ok (although running without a slash mount is
-   strongly discouraged because some programs may run erratically
-   without one).  If MOUNT_SYSTEM is set in flags, remove from system
-   registry, otherwise remove the user registry mount.
-*/
-
-int
-mount_info::del_item (const char *path, unsigned flags, int reg_p)
-{
-  char pathtmp[CYG_MAX_PATH];
-  int posix_path_p = false;
-
-  /* Something's wrong if path is NULL or empty. */
-  if (path == NULL || *path == 0 || !isabspath (path))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  if (slash_unc_prefix_p (path) || strpbrk (path, ":\\"))
-    backslashify (path, pathtmp, 0);
-  else
-    {
-      slashify (path, pathtmp, 0);
-      posix_path_p = true;
-    }
-  nofinalslash (pathtmp, pathtmp);
-
-  if (reg_p && posix_path_p &&
-      del_reg_mount (pathtmp, flags) &&
-      del_reg_mount (path, flags)) /* for old irregular entries */
-    return -1;
-
-  for (int i = 0; i < nmounts; i++)
-    {
-      int ent = native_sorted[i]; /* in the same order as getmntent() */
-      if (((posix_path_p)
-	   ? strcasematch (mount[ent].posix_path, pathtmp)
-	   : strcasematch (mount[ent].native_path, pathtmp)) &&
-	  (mount[ent].flags & MOUNT_SYSTEM) == (flags & MOUNT_SYSTEM))
-	{
-	  if (!posix_path_p &&
-	      reg_p && del_reg_mount (mount[ent].posix_path, flags))
-	    return -1;
-
-	  nmounts--; /* One less mount table entry */
-	  /* Fill in the hole if not at the end of the table */
-	  if (ent < nmounts)
-	    memmove (mount + ent, mount + ent + 1,
-		     sizeof (mount[ent]) * (nmounts - ent));
-	  sort (); /* Resort the table */
-	  return 0;
-	}
-    }
-  set_errno (EINVAL);
-  return -1;
-}
-
-/************************* mount_item class ****************************/
-
-static mntent *
-fillout_mntent (const char *native_path, const char *posix_path, unsigned flags)
-{
-#ifdef _MT_SAFE
-  struct mntent &ret=_reent_winsup ()->mntbuf;
-#else
-  static NO_COPY struct mntent ret;
-#endif
-
-  /* Remove drivenum from list if we see a x: style path */
-  if (strlen (native_path) == 2 && native_path[1] == ':')
-    {
-      int drivenum = cyg_tolower (native_path[0]) - 'a';
-      if (drivenum >= 0 && drivenum <= 31)
-	available_drives &= ~(1 << drivenum);
-    }
-
-  /* Pass back pointers to mount_table strings reserved for use by
-     getmntent rather than pointers to strings in the internal mount
-     table because the mount table might change, causing weird effects
-     from the getmntent user's point of view. */
-
-  strcpy (_reent_winsup ()->mnt_fsname, native_path);
-  ret.mnt_fsname = _reent_winsup ()->mnt_fsname;
-  strcpy (_reent_winsup ()->mnt_dir, posix_path);
-  ret.mnt_dir = _reent_winsup ()->mnt_dir;
-
-  if (!(flags & MOUNT_SYSTEM))		/* user mount */
-    strcpy (_reent_winsup ()->mnt_type, (char *) "user");
-  else					/* system mount */
-    strcpy (_reent_winsup ()->mnt_type, (char *) "system");
-
-  ret.mnt_type = _reent_winsup ()->mnt_type;
-
-  /* mnt_opts is a string that details mount params such as
-     binary or textmode, or exec.  We don't print
-     `silent' here; it's a magic internal thing. */
-
-  if (!(flags & MOUNT_BINARY))
-    strcpy (_reent_winsup ()->mnt_opts, (char *) "textmode");
-  else
-    strcpy (_reent_winsup ()->mnt_opts, (char *) "binmode");
-
-  if (flags & MOUNT_CYGWIN_EXEC)
-    strcat (_reent_winsup ()->mnt_opts, (char *) ",cygexec");
-  else if (flags & MOUNT_EXEC)
-    strcat (_reent_winsup ()->mnt_opts, (char *) ",exec");
-  else if (flags & MOUNT_NOTEXEC)
-    strcat (_reent_winsup ()->mnt_opts, (char *) ",noexec");
-  if (flags & MOUNT_ENC)
-    strcat (_reent_winsup ()->mnt_opts, ",managed");
-
-  if ((flags & MOUNT_CYGDRIVE))		/* cygdrive */
-    strcat (_reent_winsup ()->mnt_opts, (char *) ",noumount");
-
-  ret.mnt_opts = _reent_winsup ()->mnt_opts;
-
-  ret.mnt_freq = 1;
-  ret.mnt_passno = 1;
-  return &ret;
-}
-
-struct mntent *
-mount_item::getmntent ()
-{
-  return fillout_mntent (native_path, posix_path, flags);
-}
-
-static struct mntent *
-cygdrive_getmntent ()
-{
-  char native_path[4];
-  char posix_path[CYG_MAX_PATH];
-  DWORD mask = 1, drive = 'a';
-  struct mntent *ret = NULL;
-
-  while (available_drives)
-    {
-      for (/* nothing */; drive <= 'z'; mask <<= 1, drive++)
-	if (available_drives & mask)
-	  break;
-
-      __small_sprintf (native_path, "%c:\\", drive);
-      if (GetFileAttributes (native_path) == INVALID_FILE_ATTRIBUTES)
-	{
-	  available_drives &= ~mask;
-	  continue;
-	}
-      native_path[2] = '\0';
-      __small_sprintf (posix_path, "%s%c", mount_table->cygdrive, drive);
-      ret = fillout_mntent (native_path, posix_path, mount_table->cygdrive_flags);
-      break;
-    }
-
-  return ret;
-}
-
-struct mntent *
-mount_info::getmntent (int x)
-{
-  if (x < 0 || x >= nmounts)
-    return cygdrive_getmntent ();
-
-  return mount[native_sorted[x]].getmntent ();
-}
-
-/* Fill in the fields of a mount table entry.  */
-
-void
-mount_item::init (const char *native, const char *posix, unsigned mountflags)
-{
-  strcpy ((char *) native_path, native);
-  strcpy ((char *) posix_path, posix);
-
-  native_pathlen = strlen (native_path);
-  posix_pathlen = strlen (posix_path);
-
-  flags = mountflags;
-}
-
-/********************** Mount System Calls **************************/
-
-/* Mount table system calls.
-   Note that these are exported to the application.  */
-
-/* mount: Add a mount to the mount table in memory and to the registry
-   that will cause paths under win32_path to be translated to paths
-   under posix_path. */
-
-extern "C" int
-mount (const char *win32_path, const char *posix_path, unsigned flags)
-{
-  int res = -1;
-
-  if (check_null_empty_str_errno (posix_path))
-    /* errno set */;
-  else if (strpbrk (posix_path, "\\:"))
-    set_errno (EINVAL);
-  else if (flags & MOUNT_CYGDRIVE) /* normal mount */
-    {
-      /* When flags include MOUNT_CYGDRIVE, take this to mean that
-	we actually want to change the cygdrive prefix and flags
-	without actually mounting anything. */
-      res = mount_table->write_cygdrive_info_to_registry (posix_path, flags);
-      win32_path = NULL;
-    }
-  else if (!check_null_empty_str_errno (win32_path))
-    res = mount_table->add_item (win32_path, posix_path, flags, true);
-
-  syscall_printf ("%d = mount (%s, %s, %p)", res, win32_path, posix_path, flags);
-  return res;
-}
-
-/* umount: The standard umount call only has a path parameter.  Since
-   it is not possible for this call to specify whether to remove the
-   mount from the user or global mount registry table, assume the user
-   table. */
-
-extern "C" int
-umount (const char *path)
-{
-  if (check_null_empty_str_errno (path))
-    return -1;
-  return cygwin_umount (path, 0);
-}
-
-/* cygwin_umount: This is like umount but takes an additional flags
-   parameter that specifies whether to umount from the user or system-wide
-   registry area. */
-
-extern "C" int
-cygwin_umount (const char *path, unsigned flags)
-{
-  int res = -1;
-
-  if (flags & MOUNT_CYGDRIVE)
-    {
-      /* When flags include MOUNT_CYGDRIVE, take this to mean that we actually want
-	 to remove the cygdrive prefix and flags without actually unmounting
-	 anything. */
-      res = mount_table->remove_cygdrive_info_from_registry (path, flags);
-    }
-  else
-    {
-      res = mount_table->del_item (path, flags, true);
-    }
-
-  syscall_printf ("%d = cygwin_umount (%s, %d)", res,  path, flags);
-  return res;
-}
-
-extern "C" FILE *
-setmntent (const char *filep, const char *)
-{
-  iteration = 0;
-  available_drives = GetLogicalDrives ();
-  return (FILE *) filep;
-}
-
-extern "C" struct mntent *
-getmntent (FILE *)
-{
-  return mount_table->getmntent (iteration++);
-}
-
-extern "C" int
-endmntent (FILE *)
-{
-  return 1;
-}
-
-/********************** Symbolic Link Support **************************/
-
-/* Read symlink from Extended Attribute */
-int
-get_symlink_ea (const char* frompath, char* buf, int buf_size)
-{
-  int res = NTReadEA (frompath, SYMLINK_EA_NAME, buf, buf_size);
-  if (res == 0)
-    debug_printf ("Cannot read symlink from EA");
-  return (res - 1);
-}
-
-/* Save symlink to Extended Attribute */
-bool
-set_symlink_ea (const char* frompath, const char* topath)
-{
-  if (!NTWriteEA (frompath, SYMLINK_EA_NAME, topath, strlen (topath) + 1))
-    {
-      debug_printf ("Cannot save symlink in EA");
-      return false;
-    }
-  return true;
-}
-
-/* Create a symlink from FROMPATH to TOPATH. */
-
-/* If TRUE create symlinks as Windows shortcuts, if false create symlinks
-   as normal files with magic number and system bit set. */
-bool allow_winsymlinks = true;
-
-extern "C" int
-symlink (const char *topath, const char *frompath)
-{
-  return symlink_worker (topath, frompath, allow_winsymlinks, false);
-}
-
-int
-symlink_worker (const char *topath, const char *frompath, bool use_winsym,
-		bool isdevice)
-{
-  HANDLE h;
-  int res = -1;
-  path_conv win32_path, win32_topath;
-  char from[CYG_MAX_PATH + 5];
-  char cwd[CYG_MAX_PATH + 1], *cp = NULL, c = 0;
-  char w32topath[CYG_MAX_PATH + 1];
-  DWORD written;
-  SECURITY_ATTRIBUTES sa = sec_none_nih;
-  security_descriptor sd;
-
-  /* POSIX says that empty 'frompath' is invalid input whlie empty
-     'topath' is valid -- it's symlink resolver job to verify if
-     symlink contents point to existing filesystem object */
-  if (check_null_empty_str_errno (topath) == EFAULT ||
-      check_null_empty_str_errno (frompath))
-    goto done;
-
-  if (strlen (topath) >= CYG_MAX_PATH)
-    {
-      set_errno (ENAMETOOLONG);
-      goto done;
-    }
-
-  win32_path.check (frompath, PC_SYM_NOFOLLOW);
-  if (use_winsym && !win32_path.exists ())
-    {
-      strcpy (from, frompath);
-      strcat (from, ".lnk");
-      win32_path.check (from, PC_SYM_NOFOLLOW);
-    }
-
-  if (win32_path.error)
-    {
-      set_errno (win32_path.case_clash ? ECASECLASH : win32_path.error);
-      goto done;
-    }
-
-  syscall_printf ("symlink (%s, %s)", topath, win32_path.get_win32 ());
-
-  if (win32_path.is_auto_device ())
-    {
-      set_errno (EEXIST);
-      goto done;
-    }
-
-  DWORD create_how;
-  if (!use_winsym)
-    create_how = CREATE_NEW;
-  else if (isdevice)
-    {
-      strcpy (w32topath, topath);
-      create_how = CREATE_ALWAYS;
-      (void) SetFileAttributes (win32_path, FILE_ATTRIBUTE_NORMAL);
-    }
-  else
-    {
-      if (!isabspath (topath))
-	{
-	  getcwd (cwd, CYG_MAX_PATH + 1);
-	  if ((cp = strrchr (from, '/')) || (cp = strrchr (from, '\\')))
-	    {
-	      c = *cp;
-	      *cp = '\0';
-	      chdir (from);
-	    }
-	  backslashify (topath, w32topath, 0);
-	}
-      if (!cp || GetFileAttributes (w32topath) == INVALID_FILE_ATTRIBUTES)
-	{
-	  win32_topath.check (topath, PC_SYM_NOFOLLOW);
-	  if (!cp || win32_topath.error != ENOENT)
-	    strcpy (w32topath, win32_topath);
-	}
-      if (cp)
-	{
-	  *cp = c;
-	  chdir (cwd);
-	}
-      create_how = CREATE_NEW;
-    }
-
-  if (allow_ntsec && win32_path.has_acls ())
-    set_security_attribute (S_IFLNK | STD_RBITS | STD_WBITS,
-			    &sa, sd);
-
-  h = CreateFile (win32_path, GENERIC_WRITE, 0, &sa, create_how,
-		  FILE_ATTRIBUTE_NORMAL, 0);
-  if (h == INVALID_HANDLE_VALUE)
-    __seterrno ();
-  else
-    {
-      BOOL success;
-
-      if (use_winsym)
-	{
-	  create_shortcut_header ();
-	  /* Don't change the datatypes of `len' and `win_len' since
-	     their sizeof is used when writing. */
-	  unsigned short len = strlen (topath);
-	  unsigned short win_len = strlen (w32topath);
-	  success = WriteFile (h, shortcut_header, SHORTCUT_HDR_SIZE,
-			       &written, NULL)
-		    && written == SHORTCUT_HDR_SIZE
-		    && WriteFile (h, &len, sizeof len, &written, NULL)
-		    && written == sizeof len
-		    && WriteFile (h, topath, len, &written, NULL)
-		    && written == len
-		    && WriteFile (h, &win_len, sizeof win_len, &written, NULL)
-		    && written == sizeof win_len
-		    && WriteFile (h, w32topath, win_len, &written, NULL)
-		    && written == win_len;
-	}
-      else
-	{
-	  /* This is the old technique creating a symlink. */
-	  char buf[sizeof (SYMLINK_COOKIE) + CYG_MAX_PATH + 10];
-
-	  __small_sprintf (buf, "%s%s", SYMLINK_COOKIE, topath);
-	  DWORD len = strlen (buf) + 1;
-
-	  /* Note that the terminating nul is written.  */
-	  success = WriteFile (h, buf, len, &written, NULL)
-		    || written != len;
-
-	}
-      if (success)
-	{
-	  CloseHandle (h);
-	  if (!allow_ntsec && allow_ntea)
-	    set_file_attribute (win32_path.has_acls (),
-				win32_path.get_win32 (),
-				S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO);
-
-	  DWORD attr = use_winsym ? FILE_ATTRIBUTE_READONLY
-	    			  : FILE_ATTRIBUTE_SYSTEM;
-#ifdef HIDDEN_DOT_FILES
-	  cp = strrchr (win32_path, '\\');
-	  if ((cp && cp[1] == '.') || *win32_path == '.')
-	    attr |= FILE_ATTRIBUTE_HIDDEN;
-#endif
-	  SetFileAttributes (win32_path, attr);
-
-	  if (!isdevice && win32_path.fs_fast_ea ())
-	    set_symlink_ea (win32_path, topath);
-	  res = 0;
-	}
-      else
-	{
-	  __seterrno ();
-	  CloseHandle (h);
-	  DeleteFileA (win32_path.get_win32 ());
-	}
-    }
-
-done:
-  syscall_printf ("%d = symlink_worker (%s, %s, %d, %d)", res, topath,
-		  frompath, use_winsym, isdevice);
-  return res;
-}
-
-static bool
-cmp_shortcut_header (const char *file_header)
-{
-  create_shortcut_header ();
-  return memcmp (shortcut_header, file_header, SHORTCUT_HDR_SIZE);
-}
-
-static int
-check_shortcut (const char *path, DWORD fileattr, HANDLE h,
-		char *contents, int *error, unsigned *pflags)
-{
-  char file_header[SHORTCUT_HDR_SIZE];
-  unsigned short len;
-  int res = 0;
-  DWORD got = 0;
-
-  /* Valid Cygwin & U/WIN shortcuts are R/O. */
-  if (!(fileattr & FILE_ATTRIBUTE_READONLY))
-    goto file_not_symlink;
-  /* Read the files header information. This is used to check for a
-     Cygwin or U/WIN shortcut or later to check for executable files. */
-  if (!ReadFile (h, file_header, SHORTCUT_HDR_SIZE, &got, 0))
-    {
-      *error = EIO;
-      goto close_it;
-    }
-  /* Check header if the shortcut is really created by Cygwin or U/WIN. */
-  if (got != SHORTCUT_HDR_SIZE || cmp_shortcut_header (file_header))
-    goto file_not_symlink;
-  /* Next 2 byte are USHORT, containing length of description entry. */
-  if (!ReadFile (h, &len, sizeof len, &got, 0))
-    {
-      *error = EIO;
-      goto close_it;
-    }
-  if (got != sizeof len || len == 0 || len > CYG_MAX_PATH)
-    goto file_not_symlink;
-  /* Now read description entry. */
-  if (!ReadFile (h, contents, len, &got, 0))
-    {
-      *error = EIO;
-      goto close_it;
-    }
-  if (got != len)
-    goto file_not_symlink;
-  contents[len] = '\0';
-  res = len;
-  if (res) /* It's a symlink.  */
-    *pflags = PATH_SYMLINK | PATH_LNK;
-  goto close_it;
-
-file_not_symlink:
-  /* Not a symlink, see if executable.  */
-  if (!(*pflags & PATH_ALL_EXEC) && has_exec_chars (file_header, got))
-    *pflags |= PATH_EXEC;
-
-close_it:
-  CloseHandle (h);
-  return res;
-}
-
-
-static int
-check_sysfile (const char *path, DWORD fileattr, HANDLE h,
-	       char *contents, int *error, unsigned *pflags)
-{
-  char cookie_buf[sizeof (SYMLINK_COOKIE) - 1];
-  DWORD got;
-  int res = 0;
-
-  if (!ReadFile (h, cookie_buf, sizeof (cookie_buf), &got, 0))
-    {
-      debug_printf ("ReadFile1 failed");
-      *error = EIO;
-    }
-  else if (got == sizeof (cookie_buf)
-	   && memcmp (cookie_buf, SYMLINK_COOKIE, sizeof (cookie_buf)) == 0)
-    {
-      /* It's a symlink.  */
-      *pflags = PATH_SYMLINK;
-
-      res = ReadFile (h, contents, CYG_MAX_PATH + 1, &got, 0);
-      if (!res)
-	{
-	  debug_printf ("ReadFile2 failed");
-	  *error = EIO;
-	}
-      else
-	{
-	  /* Versions prior to b16 stored several trailing
-	     NULs with the path (to fill the path out to 1024
-	     chars).  Current versions only store one trailing
-	     NUL.  The length returned is the path without
-	     *any* trailing NULs.  We also have to handle (or
-	     at least not die from) corrupted paths.  */
-	  if (memchr (contents, 0, got) != NULL)
-	    res = strlen (contents);
-	  else
-	    res = got;
-	}
-    }
-  else if (got == sizeof (cookie_buf)
-	   && memcmp (cookie_buf, SOCKET_COOKIE, sizeof (cookie_buf)) == 0)
-    *pflags |= PATH_SOCKET;
-  else
-    {
-      /* Not a symlink, see if executable.  */
-      if (*pflags & PATH_ALL_EXEC)
-	/* Nothing to do */;
-      else if (has_exec_chars (cookie_buf, got))
-	*pflags |= PATH_EXEC;
-      else
-	*pflags |= PATH_NOTEXEC;
-      }
-  syscall_printf ("%d = symlink.check_sysfile (%s, %s) (%p)",
-		  res, path, contents, *pflags);
-
-  CloseHandle (h);
-  return res;
-}
-
-enum
-{
-  SCAN_BEG,
-  SCAN_LNK,
-  SCAN_HASLNK,
-  SCAN_JUSTCHECK,
-  SCAN_APPENDLNK,
-  SCAN_EXTRALNK,
-  SCAN_DONE,
-};
-
-class suffix_scan
-{
-  const suffix_info *suffixes, *suffixes_start;
-  int nextstate;
-  char *eopath;
-public:
-  const char *path;
-  char *has (const char *, const suffix_info *);
-  int next ();
-  int lnk_match () {return nextstate >= SCAN_EXTRALNK;}
-};
-
-char *
-suffix_scan::has (const char *in_path, const suffix_info *in_suffixes)
-{
-  nextstate = SCAN_BEG;
-  suffixes = suffixes_start = in_suffixes;
-
-  char *ext_here = strrchr (in_path, '.');
-  path = in_path;
-  eopath = strchr (path, '\0');
-
-  if (!ext_here)
-    goto noext;
-
-  if (suffixes)
-    {
-      /* Check if the extension matches a known extension */
-      for (const suffix_info *ex = in_suffixes; ex->name != NULL; ex++)
-	if (strcasematch (ext_here, ex->name))
-	  {
-	    nextstate = SCAN_JUSTCHECK;
-	    suffixes = NULL;	/* Has an extension so don't scan for one. */
-	    goto done;
-	  }
-    }
-
-  /* Didn't match.  Use last resort -- .lnk. */
-  if (strcasematch (ext_here, ".lnk"))
-    {
-      nextstate = SCAN_HASLNK;
-      suffixes = NULL;
-    }
-
- noext:
-  ext_here = eopath;
-
- done:
-  return ext_here;
-}
-
-int
-suffix_scan::next ()
-{
-  for (;;)
-    {
-      if (!suffixes)
-	switch (nextstate)
-	  {
-	  case SCAN_BEG:
-	    suffixes = suffixes_start;
-	    if (!suffixes)
-	      {
-		nextstate = SCAN_LNK;
-		return 1;
-	      }
-	    if (!*suffixes->name)
-	      suffixes++;
-	    nextstate = SCAN_EXTRALNK;
-	    /* fall through to suffix checking below */
-	    break;
-	  case SCAN_HASLNK:
-	    nextstate = SCAN_EXTRALNK;	/* Skip SCAN_BEG */
-	    return 1;
-	  case SCAN_LNK:
-	  case SCAN_EXTRALNK:
-	    strcpy (eopath, ".lnk");
-	    nextstate = SCAN_DONE;
-	    return 1;
-	  case SCAN_JUSTCHECK:
-	    nextstate = SCAN_APPENDLNK;
-	    return 1;
-	  case SCAN_APPENDLNK:
-	    strcat (eopath, ".lnk");
-	    nextstate = SCAN_DONE;
-	    return 1;
-	  default:
-	    *eopath = '\0';
-	    return 0;
-	  }
-
-      while (suffixes && suffixes->name)
-	if (!suffixes->addon)
-	  suffixes++;
-	else
-	  {
-	    strcpy (eopath, suffixes->name);
-	    if (nextstate == SCAN_EXTRALNK)
-	      strcat (eopath, ".lnk");
-	    suffixes++;
-	    return 1;
-	  }
-      suffixes = NULL;
-    }
-}
-
-bool
-symlink_info::parse_device (const char *contents)
-{
-  char *endptr;
-  _major_t mymajor;
-  _major_t myminor;
-  _mode_t mymode;
-
-  mymajor = strtol (contents += 2, &endptr, 16);
-  if (endptr == contents)
-    return false;
-
-  contents = endptr;
-  myminor = strtol (++contents, &endptr, 16);
-  if (endptr == contents)
-    return false;
-
-  contents = endptr;
-  mymode = strtol (++contents, &endptr, 16);
-  if (endptr == contents)
-    return false;
-
-  switch (mymode & S_IFMT)
-    {
-    case S_IFIFO:
-      mymajor = _major (FH_FIFO);
-      myminor = _minor (FH_FIFO);
-      break;
-    case S_IFBLK:
-    case S_IFCHR:
-      if (mymajor || myminor)
-	break;
-    default:
-      return false;
-    }
-
-  major = mymajor;
-  minor = myminor;
-  mode = mymode;
-  return true;
-}
-
-/* Check if PATH is a symlink.  PATH must be a valid Win32 path name.
-
-   If PATH is a symlink, put the value of the symlink--the file to
-   which it points--into BUF.  The value stored in BUF is not
-   necessarily null terminated.  BUFLEN is the length of BUF; only up
-   to BUFLEN characters will be stored in BUF.  BUF may be NULL, in
-   which case nothing will be stored.
-
-   Set *SYML if PATH is a symlink.
-
-   Set *EXEC if PATH appears to be executable.  This is an efficiency
-   hack because we sometimes have to open the file anyhow.  *EXEC will
-   not be set for every executable file.
-
-   Return -1 on error, 0 if PATH is not a symlink, or the length
-   stored into BUF if PATH is a symlink.  */
-
-int
-symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt)
-{
-  HANDLE h;
-  int res = 0;
-  suffix_scan suffix;
-  contents[0] = '\0';
-
-  is_symlink = true;
-  ext_here = suffix.has (path, suffixes);
-  extn = ext_here - path;
-  major = 0;
-  minor = 0;
-
-  pflags &= ~(PATH_SYMLINK | PATH_LNK);
-
-  case_clash = false;
-
-  while (suffix.next ())
-    {
-      error = 0;
-      fileattr = GetFileAttributes (suffix.path);
-      if (fileattr == INVALID_FILE_ATTRIBUTES)
-	{
-	  /* The GetFileAttributes call can fail for reasons that don't
-	     matter, so we just return 0.  For example, getting the
-	     attributes of \\HOST will typically fail.  */
-	  debug_printf ("GetFileAttributes (%s) failed", suffix.path);
-	  error = geterrno_from_win_error (GetLastError (), EACCES);
-	  continue;
-	}
-
-
-      ext_tacked_on = !!*ext_here;
-
-      if (pcheck_case != PCHECK_RELAXED && !case_check (path)
-	  || (opt & PC_SYM_IGNORE))
-	goto file_not_symlink;
-
-      int sym_check;
-
-      sym_check = 0;
-
-      if (fileattr & FILE_ATTRIBUTE_DIRECTORY)
-	goto file_not_symlink;
-
-      /* Windows shortcuts are treated as symlinks. */
-      if (suffix.lnk_match ())
-	sym_check = 1;
-
-      /* This is the old Cygwin method creating symlinks: */
-      /* A symlink will have the `system' file attribute. */
-      /* Only files can be symlinks (which can be symlinks to directories). */
-      if (fileattr & FILE_ATTRIBUTE_SYSTEM)
-	sym_check = 2;
-
-      if (!sym_check)
-	goto file_not_symlink;
-
-      if (sym_check > 0 && opt & PC_CHECK_EA &&
-	  (res = get_symlink_ea (suffix.path, contents, sizeof (contents))) > 0)
-	{
-	  pflags = PATH_SYMLINK;
-	  if (sym_check == 1)
-	    pflags |= PATH_LNK;
-	  debug_printf ("Got symlink from EA: %s", contents);
-	  break;
-	}
-
-      /* Open the file.  */
-
-      h = CreateFile (suffix.path, GENERIC_READ, FILE_SHARE_READ,
-		      &sec_none_nih, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-      res = -1;
-      if (h == INVALID_HANDLE_VALUE)
-	goto file_not_symlink;
-
-      /* FIXME: if symlink isn't present in EA, but EAs are supported,
-         should we write it there?  */
-      switch (sym_check)
-	{
-	case 1:
-	  res = check_shortcut (suffix.path, fileattr, h, contents, &error, &pflags);
-	  if (!res)
-	    /* check more below */;
-	  else if (contents[0] == ':' && contents[1] == '\\' && parse_device (contents))
-	    goto file_not_symlink;
-	  else
-	    break;
-	  /* If searching for `foo' and then finding a `foo.lnk' which is
-	     no shortcut, return the same as if file not found. */
-	  if (!suffix.lnk_match () || !ext_tacked_on)
-	    goto file_not_symlink;
-
-	  fileattr = INVALID_FILE_ATTRIBUTES;
-	  continue;		/* in case we're going to tack *another* .lnk on this filename. */
-	case 2:
-	  res = check_sysfile (suffix.path, fileattr, h, contents, &error, &pflags);
-	  if (!res)
-	    goto file_not_symlink;
-	  break;
-	}
-      break;
-
-    file_not_symlink:
-      is_symlink = false;
-      syscall_printf ("%s", (major || minor) ? "is a device" : "not a symlink");
-      res = 0;
-      break;
-    }
-
-  syscall_printf ("%d = symlink.check (%s, %p) (%p)",
-		  res, suffix.path, contents, pflags);
-  return res;
-}
-
-/* Check the correct case of the last path component (given in DOS style).
-   Adjust the case in this->path if pcheck_case == PCHECK_ADJUST or return
-   false if pcheck_case == PCHECK_STRICT.
-   Dont't call if pcheck_case == PCHECK_RELAXED.
-*/
-
-bool
-symlink_info::case_check (char *path)
-{
-  WIN32_FIND_DATA data;
-  HANDLE h;
-  char *c;
-
-  /* Set a pointer to the beginning of the last component. */
-  if (!(c = strrchr (path, '\\')))
-    c = path;
-  else
-    ++c;
-
-  if ((h = FindFirstFile (path, &data))
-      != INVALID_HANDLE_VALUE)
-    {
-      FindClose (h);
-
-      /* If that part of the component exists, check the case. */
-      if (strcmp (c, data.cFileName))
-	{
-	  case_clash = true;
-
-	  /* If check is set to STRICT, a wrong case results
-	     in returning a ENOENT. */
-	  if (pcheck_case == PCHECK_STRICT)
-	    return false;
-
-	  /* PCHECK_ADJUST adjusts the case in the incoming
-	     path which points to the path in *this. */
-	  strcpy (c, data.cFileName);
-	}
-    }
-  return true;
-}
-
-/* readlink system call */
-
-extern "C" int
-readlink (const char *path, char *buf, int buflen)
-{
-  extern suffix_info stat_suffixes[];
-
-  if (buflen < 0)
-    {
-      set_errno (ENAMETOOLONG);
-      return -1;
-    }
-
-  path_conv pathbuf (path, PC_SYM_CONTENTS, stat_suffixes);
-
-  if (pathbuf.error)
-    {
-      set_errno (pathbuf.error);
-      syscall_printf ("-1 = readlink (%s, %p, %d)", path, buf, buflen);
-      return -1;
-    }
-
-  if (!pathbuf.exists ())
-    {
-      set_errno (ENOENT);
-      return -1;
-    }
-
-  if (!pathbuf.issymlink ())
-    {
-      if (pathbuf.exists ())
-	set_errno (EINVAL);
-      return -1;
-    }
-
-  int len = min (buflen, (int) strlen (pathbuf.get_win32 ()));
-  memcpy (buf, pathbuf.get_win32 (), len);
-
-  /* errno set by symlink.check if error */
-  return len;
-}
-
-/* Some programs rely on st_dev/st_ino being unique for each file.
-   Hash the path name and hope for the best.  The hash arg is not
-   always initialized to zero since readdir needs to compute the
-   dirent ino_t based on a combination of the hash of the directory
-   done during the opendir call and the hash or the filename within
-   the directory.  FIXME: Not bullet-proof. */
-/* Cygwin internal */
-
-__ino64_t __stdcall
-hash_path_name (__ino64_t hash, const char *name)
-{
-  if (!*name)
-    return hash;
-
-  /* Perform some initial permutations on the pathname if this is
-     not "seeded" */
-  if (!hash)
-    {
-      /* Simplistic handling of drives.  If there is a drive specified,
-	 make sure that the initial letter is upper case.  If there is
-	 no \ after the ':' assume access through the root directory
-	 of that drive.
-	 FIXME:  Should really honor MS-Windows convention of using
-	 the environment to track current directory on various drives. */
-      if (name[1] == ':')
-	{
-	  char *nn, *newname = (char *) alloca (strlen (name) + 2);
-	  nn = newname;
-	  *nn = isupper (*name) ? cyg_tolower (*name) : *name;
-	  *++nn = ':';
-	  name += 2;
-	  if (*name != '\\')
-	    *++nn = '\\';
-	  strcpy (++nn, name);
-	  name = newname;
-	  goto hashit;
-	}
-
-      /* Fill out the hashed path name with the current working directory if
-	 this is not an absolute path and there is no pre-specified hash value.
-	 Otherwise the inodes same will differ depending on whether a file is
-	 referenced with an absolute value or relatively. */
-
-      if (!hash && !isabspath (name))
-	{
-	  hash = cygheap->cwd.get_hash ();
-	  if (name[0] == '.' && name[1] == '\0')
-	    return hash;
-	  hash = (hash << 5) - hash + '\\';
-	}
-    }
-
-hashit:
-  /* Build up hash.  Ignore single trailing slash or \a\b\ != \a\b or
-     \a\b\.  but allow a single \ if that's all there is. */
-  do
-    {
-      int ch = cyg_tolower (*name);
-      hash = (hash << 5) - hash + ch;
-    }
-  while (*++name != '\0' &&
-	 !(*name == '\\' && (!name[1] || (name[1] == '.' && !name[2]))));
-  return hash;
-}
-
-char *
-getcwd (char *buf, size_t ulen)
-{
-  char* res = NULL;
-  if (ulen == 0 && buf)
-    set_errno (EINVAL);
-  else if (buf == NULL || !__check_null_invalid_struct_errno (buf, ulen))
-    res = cygheap->cwd.get (buf, 1, 1, ulen);
-  return res;
-}
-
-/* getwd: standards? */
-extern "C" char *
-getwd (char *buf)
-{
-  return getcwd (buf, CYG_MAX_PATH);
-}
-
-/* chdir: POSIX 5.2.1.1 */
-extern "C" int
-chdir (const char *in_dir)
-{
-  if (check_null_empty_str_errno (in_dir))
-    return -1;
-
-  syscall_printf ("dir '%s'", in_dir);
-
-  char *s;
-  char dir[strlen (in_dir) + 1];
-  strcpy (dir, in_dir);
-  /* Incredibly. Windows allows you to specify a path with trailing
-     whitespace to SetCurrentDirectory.  This doesn't work too well
-     with other parts of the API, though, apparently.  So nuke trailing
-     white space. */
-  for (s = strchr (dir, '\0'); --s >= dir && isspace ((unsigned int) (*s & 0xff)); )
-    *s = '\0';
-
-  if (!*s)
-    {
-      set_errno (ENOENT);
-      return -1;
-    }
-
-  /* Convert path.  First argument ensures that we don't check for NULL/empty/invalid
-     again. */
-  path_conv path (PC_NONULLEMPTY, dir, PC_FULL | PC_SYM_FOLLOW);
-  if (path.error)
-    {
-      set_errno (path.error);
-      syscall_printf ("-1 = chdir (%s)", dir);
-      return -1;
-    }
-
-
-  /* Look for trailing path component consisting entirely of dots.  This
-     is needed only in case of chdir since Windows simply ignores count
-     of dots > 2 here instead of returning an error code.  Counts of dots
-     <= 2 are already eliminated by normalize_posix_path. */
-  const char *p = strrchr (dir, '/');
-  if (!p)
-    p = dir;
-  else
-    p++;
-
-  size_t len = strlen (p);
-  if (len > 2 && strspn (p, ".") == len)
-    {
-      set_errno (ENOENT);
-      return -1;
-    }
-
-  const char *native_dir = path;
-
-  /* Check to see if path translates to something like C:.
-     If it does, append a \ to the native directory specification to
-     defeat the Windows 95 (i.e. MS-DOS) tendency of returning to
-     the last directory visited on the given drive. */
-  if (isdrive (native_dir) && !native_dir[2])
-    {
-      path.get_win32 ()[2] = '\\';
-      path.get_win32 ()[3] = '\0';
-    }
-  int res;
-  int devn = path.get_devn ();
-  if (!isvirtual_dev (devn))
-    res = SetCurrentDirectory (native_dir) ? 0 : -1;
-  else if (!path.exists ())
-    {
-      set_errno (ENOENT);
-      return -1;
-    }
-  else if (!path.isdir ())
-    {
-      set_errno (ENOTDIR);
-      return -1;
-    }
-  else
-    {
-      native_dir = "c:\\";
-      res = 0;
-    }
-
-  /* If res != 0, we didn't change to a new directory.
-     Otherwise, set the current windows and posix directory cache from input.
-     If the specified directory is a MS-DOS style directory or if the directory
-     was symlinked, convert the MS-DOS path back to posix style.  Otherwise just
-     store the given directory.  This allows things like "find", which traverse
-     directory trees, to work correctly with Cygwin mounted directories.
-     FIXME: Is just storing the posixized windows directory the correct thing to
-     do when we detect a symlink?  Should we instead rebuild the posix path from
-     the input by traversing links?  This would be an expensive operation but
-     we'll see if Cygwin mailing list users whine about the current behavior. */
-  if (res)
-    __seterrno ();
-  else if ((!path.has_symlinks () && strpbrk (dir, ":\\") == NULL
-	    && pcheck_case == PCHECK_RELAXED) || isvirtual_dev (devn))
-    cygheap->cwd.set (native_dir, dir);
-  else
-    cygheap->cwd.set (native_dir, NULL);
-
-  /* Note that we're accessing cwd.posix without a lock here.  I didn't think
-     it was worth locking just for strace. */
-  syscall_printf ("%d = chdir() cygheap->cwd.posix '%s' native '%s'", res,
-		  cygheap->cwd.posix, native_dir);
-  MALLOC_CHECK;
-  return res;
-}
-
-extern "C" int
-fchdir (int fd)
-{
-  int res;
-  cygheap_fdget cfd (fd);
-  if (cfd >= 0)
-    res = chdir (cfd->get_win32_name ());
-  else
-    res = -1;
-
-  syscall_printf ("%d = fchdir (%d)", res, fd);
-  return res;
-}
-
-/******************** Exported Path Routines *********************/
-
-/* Cover functions to the path conversion routines.
-   These are exported to the world as cygwin_foo by cygwin.din.  */
-
-extern "C" int
-cygwin_conv_to_win32_path (const char *path, char *win32_path)
-{
-  path_conv p (path, PC_SYM_FOLLOW);
-  if (p.error)
-    {
-      win32_path[0] = '\0';
-      set_errno (p.error);
-      return -1;
-    }
-
-  strcpy (win32_path, p);
-  return 0;
-}
-
-extern "C" int
-cygwin_conv_to_full_win32_path (const char *path, char *win32_path)
-{
-  path_conv p (path, PC_SYM_FOLLOW | PC_FULL);
-  if (p.error)
-    {
-      win32_path[0] = '\0';
-      set_errno (p.error);
-      return -1;
-    }
-
-  strcpy (win32_path, p);
-  return 0;
-}
-
-/* This is exported to the world as cygwin_foo by cygwin.din.  */
-
-extern "C" int
-cygwin_conv_to_posix_path (const char *path, char *posix_path)
-{
-  if (check_null_empty_str_errno (path))
-    return -1;
-  mount_table->conv_to_posix_path (path, posix_path, 1);
-  return 0;
-}
-
-extern "C" int
-cygwin_conv_to_full_posix_path (const char *path, char *posix_path)
-{
-  if (check_null_empty_str_errno (path))
-    return -1;
-  mount_table->conv_to_posix_path (path, posix_path, 0);
-  return 0;
-}
-
-/* The realpath function is supported on some UNIX systems.  */
-
-extern "C" char *
-realpath (const char *path, char *resolved)
-{
-  int err;
-
-  path_conv real_path (path, PC_SYM_FOLLOW | PC_FULL);
-
-  if (real_path.error)
-    err = real_path.error;
-  else
-    {
-      err = mount_table->conv_to_posix_path (real_path.get_win32 (), resolved, 0);
-      if (err == 0)
-	return resolved;
-    }
-
-  /* FIXME: on error, we are supposed to put the name of the path
-     component which could not be resolved into RESOLVED.  */
-  resolved[0] = '\0';
-
-  set_errno (err);
-  return NULL;
-}
-
-/* Return non-zero if path is a POSIX path list.
-   This is exported to the world as cygwin_foo by cygwin.din.
-
-DOCTOOL-START
-<sect1 id="add-func-cygwin-posix-path-list-p">
-  <para>Rather than use a mode to say what the "proper" path list
-  format is, we allow any, and give apps the tools they need to
-  convert between the two.  If a ';' is present in the path list it's
-  a Win32 path list.  Otherwise, if the first path begins with
-  [letter]: (in which case it can be the only element since if it
-  wasn't a ';' would be present) it's a Win32 path list.  Otherwise,
-  it's a POSIX path list.</para>
-</sect1>
-DOCTOOL-END
-  */
-
-extern "C" int
-cygwin_posix_path_list_p (const char *path)
-{
-  int posix_p = !(strchr (path, ';') || isdrive (path));
-  return posix_p;
-}
-
-/* These are used for apps that need to convert env vars like PATH back and
-   forth.  The conversion is a two step process.  First, an upper bound on the
-   size of the buffer needed is computed.  Then the conversion is done.  This
-   allows the caller to use alloca if it wants.  */
-
-static int
-conv_path_list_buf_size (const char *path_list, bool to_posix)
-{
-  int i, num_elms, max_mount_path_len, size;
-  const char *p;
-
-  path_conv pc(".", PC_FULL | PC_POSIX);
-  /* The theory is that an upper bound is
-     current_size + (num_elms * max_mount_path_len)  */
-
-  unsigned nrel;
-  char delim = to_posix ? ';' : ':';
-  for (p = path_list, num_elms = nrel = 0; p; num_elms++)
-    {
-      if (!isabspath (p))
-	nrel++;
-      p = strchr (++p, delim);
-    }
-
-  /* 7: strlen ("//c") + slop, a conservative initial value */
-  for (max_mount_path_len = sizeof ("/cygdrive/X"), i = 0;
-       i < mount_table->nmounts; i++)
-    {
-      int mount_len = (to_posix
-		       ? mount_table->mount[i].posix_pathlen
-		       : mount_table->mount[i].native_pathlen);
-      if (max_mount_path_len < mount_len)
-	max_mount_path_len = mount_len;
-    }
-
-  /* 100: slop */
-  size = strlen (path_list)
-    + (num_elms * max_mount_path_len)
-    + (nrel * strlen (to_posix ? pc.normalized_path : pc.get_win32 ()))
-    + 100;
-
-  if (!pc.normalized_path_size && pc.normalized_path)
-    cfree (pc.normalized_path);		// FIXME - probably should be in a destructor but
-  					// it's hard to justify a destructor for the few
-   					// places where this is needed
-  return size;
-}
-
-extern "C" int
-cygwin_win32_to_posix_path_list_buf_size (const char *path_list)
-{
-  return conv_path_list_buf_size (path_list, true);
-}
-
-extern "C" int
-cygwin_posix_to_win32_path_list_buf_size (const char *path_list)
-{
-  return conv_path_list_buf_size (path_list, false);
-}
-
-extern "C" int
-cygwin_win32_to_posix_path_list (const char *win32, char *posix)
-{
-  conv_path_list (win32, posix, 1);
-  return 0;
-}
-
-extern "C" int
-cygwin_posix_to_win32_path_list (const char *posix, char *win32)
-{
-  conv_path_list (posix, win32, 0);
-  return 0;
-}
-
-/* cygwin_split_path: Split a path into directory and file name parts.
-   Buffers DIR and FILE are assumed to be big enough.
-
-   Examples (path -> `dir' / `file'):
-   / -> `/' / `'
-   "" -> `.' / `'
-   . -> `.' / `.' (FIXME: should this be `.' / `'?)
-   .. -> `.' / `..' (FIXME: should this be `..' / `'?)
-   foo -> `.' / `foo'
-   foo/bar -> `foo' / `bar'
-   foo/bar/ -> `foo' / `bar'
-   /foo -> `/' / `foo'
-   /foo/bar -> `/foo' / `bar'
-   c: -> `c:/' / `'
-   c:/ -> `c:/' / `'
-   c:foo -> `c:/' / `foo'
-   c:/foo -> `c:/' / `foo'
- */
-
-extern "C" void
-cygwin_split_path (const char *path, char *dir, char *file)
-{
-  int dir_started_p = 0;
-
-  /* Deal with drives.
-     Remember that c:foo <==> c:/foo.  */
-  if (isdrive (path))
-    {
-      *dir++ = *path++;
-      *dir++ = *path++;
-      *dir++ = '/';
-      if (!*path)
-	{
-	  *dir = 0;
-	  *file = 0;
-	  return;
-	}
-      if (isdirsep (*path))
-	++path;
-      dir_started_p = 1;
-    }
-
-  /* Determine if there are trailing slashes and "delete" them if present.
-     We pretend as if they don't exist.  */
-  const char *end = path + strlen (path);
-  /* path + 1: keep leading slash.  */
-  while (end > path + 1 && isdirsep (end[-1]))
-    --end;
-
-  /* At this point, END points to one beyond the last character
-     (with trailing slashes "deleted").  */
-
-  /* Point LAST_SLASH at the last slash (duh...).  */
-  const char *last_slash;
-  for (last_slash = end - 1; last_slash >= path; --last_slash)
-    if (isdirsep (*last_slash))
-      break;
-
-  if (last_slash == path)
-    {
-      *dir++ = '/';
-      *dir = 0;
-    }
-  else if (last_slash > path)
-    {
-      memcpy (dir, path, last_slash - path);
-      dir[last_slash - path] = 0;
-    }
-  else
-    {
-      if (dir_started_p)
-	; /* nothing to do */
-      else
-	*dir++ = '.';
-      *dir = 0;
-    }
-
-  memcpy (file, last_slash + 1, end - last_slash - 1);
-  file[end - last_slash - 1] = 0;
-}
-
-/*****************************************************************************/
-
-/* Return the hash value for the current win32 value.
-   This is used when constructing inodes. */
-DWORD
-cwdstuff::get_hash ()
-{
-  DWORD hashnow;
-  cwd_lock->acquire ();
-  hashnow = hash;
-  cwd_lock->release ();
-  return hashnow;
-}
-
-/* Initialize cygcwd 'muto' for serializing access to cwd info. */
-void
-cwdstuff::init ()
-{
-  new_muto (cwd_lock);
-}
-
-/* Get initial cwd.  Should only be called once in a
-   process tree. */
-bool
-cwdstuff::get_initial ()
-{
-  cwd_lock->acquire ();
-
-  if (win32)
-    return 1;
-
-  int i;
-  DWORD len, dlen;
-  for (i = 0, dlen = CYG_MAX_PATH, len = 0; i < 3; dlen *= 2, i++)
-    {
-      win32 = (char *) crealloc (win32, dlen + 2);
-      if ((len = GetCurrentDirectoryA (dlen, win32)) < dlen)
-	break;
-    }
-
-  if (len == 0)
-    {
-      __seterrno ();
-      cwd_lock->release ();
-      debug_printf ("get_initial_cwd failed, %E");
-      cwd_lock->release ();
-      return 0;
-    }
-  set (NULL);
-  return 1;	/* Leaves cwd lock unreleased */
-}
-
-/* Fill out the elements of a cwdstuff struct.
-   It is assumed that the lock for the cwd is acquired if
-   win32_cwd == NULL. */
-void
-cwdstuff::set (const char *win32_cwd, const char *posix_cwd)
-{
-  char pathbuf[CYG_MAX_PATH];
-
-  if (win32_cwd)
-    {
-      cwd_lock->acquire ();
-      win32 = (char *) crealloc (win32, strlen (win32_cwd) + 1);
-      strcpy (win32, win32_cwd);
-    }
-
-  if (!posix_cwd)
-    mount_table->conv_to_posix_path (win32, pathbuf, 0);
-  else
-    (void) normalize_posix_path (posix_cwd, pathbuf);
-
-  posix = (char *) crealloc (posix, strlen (pathbuf) + 1);
-  strcpy (posix, pathbuf);
-
-  hash = hash_path_name (0, win32);
-
-  if (win32_cwd)
-    cwd_lock->release ();
-
-  return;
-}
-
-/* Copy the value for either the posix or the win32 cwd into a buffer. */
-char *
-cwdstuff::get (char *buf, int need_posix, int with_chroot, unsigned ulen)
-{
-  MALLOC_CHECK;
-
-  if (ulen)
-    /* nothing */;
-  else if (buf == NULL)
-    ulen = (unsigned) -1;
-  else
-    {
-      set_errno (EINVAL);
-      goto out;
-    }
-
-  if (!get_initial ())	/* Get initial cwd and set cwd lock */
-    return NULL;
-
-  char *tocopy;
-  if (!need_posix)
-    tocopy = win32;
-  else
-    tocopy = posix;
-
-  debug_printf ("posix %s", posix);
-  if (strlen (tocopy) >= ulen)
-    {
-      set_errno (ERANGE);
-      buf = NULL;
-    }
-  else
-    {
-      if (!buf)
-	buf = (char *) malloc (strlen (tocopy) + 1);
-      strcpy (buf, tocopy);
-      if (!buf[0])	/* Should only happen when chroot */
-	strcpy (buf, "/");
-    }
-
-  cwd_lock->release ();
-
-out:
-  syscall_printf ("(%s) = cwdstuff::get (%p, %d, %d, %d), errno %d",
-		  buf, buf, ulen, need_posix, with_chroot, errno);
-  MALLOC_CHECK;
-  return buf;
-}
-
-int etc::curr_ix = 0;
-/* Note that the first elements of the below arrays are unused */
-bool etc::change_possible[MAX_ETC_FILES + 1];
-const char *etc::fn[MAX_ETC_FILES + 1];
-FILETIME etc::last_modified[MAX_ETC_FILES + 1];
-
-int
-etc::init (int n, const char *etc_fn)
-{
-  if (n > 0)
-    /* ok */;
-  else if (++curr_ix <= MAX_ETC_FILES)
-    n = curr_ix;
-  else
-    api_fatal ("internal error");
-
-  fn[n] = etc_fn;
-  change_possible[n] = false;
-  (void) test_file_change (n);
-  paranoid_printf ("fn[%d] %s, curr_ix %d", n, fn[n], curr_ix);
-  return n;
-}
-
-bool
-etc::test_file_change (int n)
-{
-  HANDLE h;
-  WIN32_FIND_DATA data;
-  bool res;
-
-  if ((h = FindFirstFile (fn[n], &data)) == INVALID_HANDLE_VALUE)
-    {
-      res = true;
-      memset (last_modified + n, 0, sizeof (last_modified[n]));
-      debug_printf ("FindFirstFile failed, %E");
-    }
-  else
-    {
-      FindClose (h);
-      res = CompareFileTime (&data.ftLastWriteTime, last_modified + n) > 0;
-      last_modified[n] = data.ftLastWriteTime;
-      debug_printf ("FindFirstFile succeeded");
-    }
-
-  paranoid_printf ("fn[%d] %s res %d", n, fn[n], res);
-  return res;
-}
-
-bool
-etc::dir_changed (int n)
-{
-  if (!change_possible[n])
-    {
-      static HANDLE changed_h NO_COPY;
-
-      if (!changed_h)
-	{
-	  path_conv pwd ("/etc");
-	  changed_h = FindFirstChangeNotification (pwd, FALSE,
-						  FILE_NOTIFY_CHANGE_LAST_WRITE
-						  | FILE_NOTIFY_CHANGE_FILE_NAME);
-#ifdef DEBUGGING
-	  if (changed_h == INVALID_HANDLE_VALUE)
-	    system_printf ("Can't open %s for checking, %E", (char *) pwd);
-#endif
-	  memset (change_possible, true, sizeof (change_possible));
-	}
-
-      if (changed_h == INVALID_HANDLE_VALUE)
-	change_possible[n] = true;
-      else if (WaitForSingleObject (changed_h, 0) == WAIT_OBJECT_0)
-	{
-	  (void) FindNextChangeNotification (changed_h);
-	  memset (change_possible, true, sizeof change_possible);
-	}
-    }
-
-  paranoid_printf ("fn[%d] %s change_possible %d", n, fn[n], change_possible[n]);
-  return change_possible[n];
-}
-
-bool
-etc::file_changed (int n)
-{
-  bool res = false;
-  if (dir_changed (n) && test_file_change (n))
-    res = true;
-  change_possible[n] = false;	/* Change is no longer possible */
-  paranoid_printf ("fn[%d] %s res %d", n, fn[n], res);
-  return res;
-}
diff --git a/winsup/cygwin/path.h b/winsup/cygwin/path.h
deleted file mode 100644
index 92cd2b876..000000000
--- a/winsup/cygwin/path.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* path.h: path data structures
-
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "devices.h"
-
-#include <sys/ioctl.h>
-#include <fcntl.h>
-
-enum executable_states
-{
-  is_executable,
-  dont_care_if_executable,
-  not_executable = dont_care_if_executable,
-  dont_know_if_executable
-};
-
-struct suffix_info
-{
-  const char *name;
-  int addon;
-  suffix_info (const char *s, int addit = 0): name (s), addon (addit) {}
-};
-
-enum pathconv_arg
-{
-  PC_SYM_FOLLOW		= 0x0001,
-  PC_SYM_NOFOLLOW	= 0x0002,
-  PC_SYM_IGNORE		= 0x0004,
-  PC_SYM_CONTENTS	= 0x0008,
-  PC_FULL		= 0x0010,
-  PC_NULLEMPTY		= 0x0020,
-  PC_CHECK_EA		= 0x0040,
-  PC_POSIX		= 0x0080
-};
-
-enum case_checking
-{
-  PCHECK_RELAXED	= 0,
-  PCHECK_ADJUST		= 1,
-  PCHECK_STRICT		= 2
-};
-
-#define PC_NONULLEMPTY -1
-
-#include <sys/mount.h>
-
-enum path_types
-{
-  PATH_NOTHING = 0,
-  PATH_SYMLINK = MOUNT_SYMLINK,
-  PATH_BINARY = MOUNT_BINARY,
-  PATH_EXEC = MOUNT_EXEC,
-  PATH_NOTEXEC = MOUNT_NOTEXEC,
-  PATH_CYGWIN_EXEC = MOUNT_CYGWIN_EXEC,
-  PATH_ENC = MOUNT_ENC,
-  PATH_ALL_EXEC = (PATH_CYGWIN_EXEC | PATH_EXEC),
-  PATH_LNK =	      0x01000000,
-  PATH_TEXT =	      0x02000000,
-  PATH_ISDISK =	      0x04000000,
-  PATH_HAS_SYMLINKS = 0x10000000,
-  PATH_HASBUGGYOPEN = 0x20000000,
-  PATH_SOCKET =       0x40000000,
-  PATH_HASACLS =      0x80000000
-};
-
-class symlink_info;
-struct fs_info
-{
-  char name_storage[CYG_MAX_PATH];
-  char root_dir_storage[CYG_MAX_PATH];
-  DWORD flags_storage;
-  DWORD serial_storage;
-  DWORD sym_opt_storage; /* additional options to pass to symlink_info resolver */
-  bool is_remote_drive_storage;
-  DWORD drive_type_storage;
-  inline char* name () const {return (char *) name_storage;}
-  inline char* root_dir () const {return (char *) root_dir_storage;}
-  inline DWORD& flags () {return flags_storage;};
-  inline DWORD& serial () {return serial_storage;};
-  inline DWORD& sym_opt () {return sym_opt_storage;};
-  inline bool& is_remote_drive () {return is_remote_drive_storage;};
-  inline DWORD& drive_type () {return drive_type_storage;};
-  bool update (const char *);
-};
-
-class path_conv
-{
-  DWORD fileattr;
-  fs_info fs;
-  void add_ext_from_sym (symlink_info&);
- public:
-
-  unsigned path_flags;
-  char *known_suffix;
-  int error;
-  device dev;
-  bool case_clash;
-
-  int isdisk () const { return path_flags & PATH_ISDISK;}
-  bool& isremote () {return fs.is_remote_drive ();}
-  int has_acls () const {return path_flags & PATH_HASACLS;}
-  int has_symlinks () const {return path_flags & PATH_HAS_SYMLINKS;}
-  int hasgood_inode () const {return path_flags & PATH_HASACLS;}  // Not strictly correct
-  int has_buggy_open () const {return path_flags & PATH_HASBUGGYOPEN;}
-  bool isencoded () {return path_flags & PATH_ENC;}
-  int binmode () const
-  {
-    if (path_flags & PATH_BINARY)
-      return O_BINARY;
-    if (path_flags & PATH_TEXT)
-      return O_TEXT;
-    return 0;
-  }
-  int issymlink () const {return path_flags & PATH_SYMLINK;}
-  int is_lnk_symlink () const {return path_flags & PATH_LNK;}
-  int isdevice () const {return dev.devn && dev.devn != FH_FS && dev.devn != FH_FIFO;}
-  int isfifo () const {return dev == FH_FIFO;}
-  int isspecial () const {return dev.devn && dev.devn != FH_FS;}
-  int is_auto_device () const {return isdevice ()  && !is_fs_special ();}
-  int is_fs_special () const {return isspecial () && dev.isfs ();}
-  int issocket () const {return path_flags & PATH_SOCKET;}
-  int iscygexec () const {return path_flags & PATH_CYGWIN_EXEC;}
-  bool exists () const {return fileattr != INVALID_FILE_ATTRIBUTES;}
-  bool has_attribute (DWORD x) const {return exists () && (fileattr & x);}
-  int isdir () const {return has_attribute (FILE_ATTRIBUTE_DIRECTORY);}
-  executable_states exec_state ()
-  {
-    extern int _check_for_executable;
-    if (path_flags & PATH_ALL_EXEC)
-      return is_executable;
-    if (path_flags & PATH_NOTEXEC)
-      return not_executable;
-    if (!_check_for_executable)
-      return dont_care_if_executable;
-    return dont_know_if_executable;
-  }
-
-  void set_binary () {path_flags |= PATH_BINARY;}
-  void set_symlink () {path_flags |= PATH_SYMLINK;}
-  void set_has_symlinks () {path_flags |= PATH_HAS_SYMLINKS;}
-  void set_isdisk () {path_flags |= PATH_ISDISK; dev.devn = FH_FS;}
-  void set_exec (int x = 1) {path_flags |= x ? PATH_EXEC : PATH_NOTEXEC;}
-  void set_has_acls (int x = 1) {path_flags |= x ? PATH_HASACLS : PATH_NOTHING;}
-  void set_has_buggy_open (int x = 1) {path_flags |= x ? PATH_HASBUGGYOPEN : PATH_NOTHING;}
-
-  void check (const char *src, unsigned opt = PC_SYM_FOLLOW,
-	      const suffix_info *suffixes = NULL)  __attribute__ ((regparm(3)));
-
-  path_conv (const device& in_dev): fileattr (INVALID_FILE_ATTRIBUTES),
-     path_flags (0), known_suffix (NULL), error (0), dev (in_dev) {}
-
-  path_conv (int, const char *src, unsigned opt = PC_SYM_FOLLOW,
-	     const suffix_info *suffixes = NULL)
-  {
-    check (src, opt, suffixes);
-  }
-
-  path_conv (const char *src, unsigned opt = PC_SYM_FOLLOW,
-	     const suffix_info *suffixes = NULL)
-  {
-    check (src, opt | PC_NULLEMPTY, suffixes);
-  }
-
-  path_conv (): fileattr (INVALID_FILE_ATTRIBUTES), path_flags (0),
-  		known_suffix (NULL), error (0), normalized_path (NULL)
-    {path[0] = '\0';}
-
-  inline char *get_win32 () { return path; }
-  operator char *() {return path;}
-  operator const char *() {return path;}
-  operator DWORD &() {return fileattr;}
-  operator int () {return fileattr; }
-  char operator [](int i) const {return path[i];}
-  DWORD get_devn () {return dev.devn;}
-  short get_unitn () {return dev.minor;}
-  DWORD file_attributes () {return fileattr;}
-  DWORD drive_type () {return fs.drive_type ();}
-  DWORD fs_flags () {return fs.flags ();}
-  bool fs_fast_ea () {return !!(fs.sym_opt () & PC_CHECK_EA);}
-  void set_path (const char *p) {strcpy (path, p);}
-  const char * root_dir () const { return fs.root_dir (); }
-  DWORD volser () { return fs.serial (); }
-  const char *volname () {return fs.name (); }
-  void fillin (HANDLE h);
-  inline size_t size ()
-  {
-    return (sizeof (*this) - sizeof (path)) + strlen (path) + 1 + normalized_path_size;
-  }
-
-  unsigned __stdcall ndisk_links (DWORD);
-  char *normalized_path;
-  size_t normalized_path_size;
-  void set_normalized_path (const char *) __attribute__ ((regparm (2)));
- private:
-  char path[CYG_MAX_PATH];
-};
-
-/* Symlink marker */
-#define SYMLINK_COOKIE "!<symlink>"
-
-#define SYMLINK_EA_NAME ".CYGSYMLINK"
-
-/* Socket marker */
-#define SOCKET_COOKIE  "!<socket >"
-
-/* The sizeof header written to a shortcut by Cygwin or U/WIN. */
-#define SHORTCUT_HDR_SIZE       76
-
-/* Maximum depth of symlinks (after which ELOOP is issued).  */
-#define MAX_LINK_DEPTH 10
-int __stdcall slash_unc_prefix_p (const char *path) __attribute__ ((regparm(1)));
-
-enum fe_types
-{
-  FE_NADA = 0,		/* Nothing special */
-  FE_NNF = 1,		/* Return NULL if not found */
-  FE_NATIVE = 2,	/* Return native path in path_conv struct */
-  FE_CWD = 4		/* Search CWD for program */
-};
-const char * __stdcall find_exec (const char *name, path_conv& buf,
-				  const char *winenv = "PATH=",
-				  unsigned opt = FE_NADA,
-				  const char **known_suffix = NULL)
-  __attribute__ ((regparm(3)));
-
-/* Common macros for checking for invalid path names */
-#define isdrive(s) (isalpha (*(s)) && (s)[1] == ':')
-
-static inline bool
-has_exec_chars (const char *buf, int len)
-{
-  return len >= 2 &&
-	 ((buf[0] == '#' && buf[1] == '!') ||
-	  (buf[0] == ':' && buf[1] == '\n') ||
-	  (buf[0] == 'M' && buf[1] == 'Z'));
-}
-
-int pathmatch (const char *path1, const char *path2) __attribute__ ((regparm (2)));
-int pathnmatch (const char *path1, const char *path2, int len) __attribute__ ((regparm (2)));
-
-bool fnunmunge (char *, const char *) __attribute__ ((regparm (2)));
-
-int path_prefix_p (const char *path1, const char *path2, int len1) __attribute__ ((regparm (3)));
-
-/* FIXME: Move to own include file eventually */
-
-#define MAX_ETC_FILES 2
-class etc
-{
-  friend class dtable;
-  static int curr_ix;
-  static bool change_possible[MAX_ETC_FILES + 1];
-  static const char *fn[MAX_ETC_FILES + 1];
-  static FILETIME last_modified[MAX_ETC_FILES + 1];
-  static bool dir_changed (int);
-  static int init (int, const char *);
-  static bool file_changed (int);
-  static bool test_file_change (int);
-  friend class pwdgrp;
-};
diff --git a/winsup/cygwin/path.sgml b/winsup/cygwin/path.sgml
deleted file mode 100644
index 6030c8f78..000000000
--- a/winsup/cygwin/path.sgml
+++ /dev/null
@@ -1,205 +0,0 @@
-<sect1 id="func-cygwin-posix-to-win32-path-list">
-<title>cygwin_posix_to_win32_path_list</title>
-
-<funcsynopsis>
-<funcdef>extern "C" void
-<function>cygwin_posix_to_win32_path_list</function></funcdef>
-<paramdef>const char *<parameter>posix</parameter></paramdef>
-<paramdef>char *<parameter>win32</parameter></paramdef>
-</funcsynopsis>
-
-<para>Given a POSIX path-style string (i.e. /foo:/bar) convert it to
-the equivalent Win32 path-style string (i.e. d:\;e:\bar).
-<parameter>win32</parameter> must point to a sufficiently large
-buffer.</para>
-
-<example>
-<title>Example use of cygwin_posix_to_win32_path_list</title>
-<programlisting>
-char *_epath;
-char *_win32epath;
-_epath = _win32epath = getenv (NAME);
-/* If we have a POSIX path list, convert to win32 path list */
-if (_epath != NULL && *_epath != 0
-    && cygwin_posix_path_list_p (_epath))
-  {
-    _win32epath = (char *) xmalloc
-      (cygwin_posix_to_win32_path_list_buf_size (_epath));
-    cygwin_posix_to_win32_path_list (_epath, _win32epath);
-    }
-</programlisting>
-</example>
-
-<para>See also <link linkend="func-cygwin-posix-to-win32-path-list-buf-size">
-cygwin_posix_to_win32_path_list_buf_size</link></para>
-
-</sect1>
-
-<sect1 id="func-cygwin-win32-to-posix-path-list">
-<title>cygwin_win32_to_posix_path_list</title>
-
-<funcsynopsis>
-<funcdef>extern "C" void
-<function>cygwin_win32_to_posix_path_list</function></funcdef>
-<paramdef>const char *<parameter>win32</parameter></paramdef>
-<paramdef>char *<parameter>posix</parameter></paramdef>
-</funcsynopsis>
-
-<para>Given a Win32 path-style string (i.e. d:\;e:\bar) convert it to
-the equivalent POSIX path-style string (i.e. /foo:/bar).
-<parameter>posix</parameter> must point to a sufficiently large
-buffer.  See also <link
-linkend="func-cygwin-win32-to-posix-path-list-buf-size">
-cygwin_win32_to_posix_path_list_buf_size</link></para>
-
-</sect1>
-
-<sect1 id="func-cygwin-posix-to-win32-path-list-buf-size">
-<title>cygwin_posix_to_win32_path_list_buf_size</title>
-
-<funcsynopsis>
-<funcdef>extern "C" int
-<function>cygwin_posix_to_win32_path_list_buf_size</function></funcdef>
-<paramdef>const char *<parameter>path_list</parameter></paramdef>
-</funcsynopsis>
-
-<para>Returns the number of bytes needed to hold the result of calling
-<link linkend="func-cygwin-posix-to-win32-path-list">
-cygwin_posix_to_win32_path_list</link>.</para>
-
-</sect1>
-
-<sect1 id="func-cygwin-win32-to-posix-path-list-buf-size">
-<title>cygwin_win32_to_posix_path_list_buf_size</title>
-
-<funcsynopsis>
-<funcdef>extern "C" int
-<function>cygwin_win32_to_posix_path_list_buf_size</function></funcdef>
-<paramdef>const char *<parameter>path_list</parameter></paramdef>
-</funcsynopsis>
-
-<para>Tells you how many bytes are needed for the results of <link
-linkend="func-cygwin-win32-to-posix-path-list">
-cygwin_win32_to_posix_path_list</link>.</para>
-
-</sect1>
-
-<sect1 id="func-cygwin-conv-to-posix-path">
-<title>cygwin_conv_to_posix_path</title>
-
-<funcsynopsis>
-<funcdef>extern "C" void
-<function>cygwin_conv_to_posix_path</function></funcdef>
-<paramdef>const char *<parameter>path</parameter></paramdef>
-<paramdef>char *<parameter>posix_path</parameter></paramdef>
-</funcsynopsis>
-
-<para>Converts a Win32 path to a POSIX path.  If
-<parameter>path</parameter> is already a POSIX path, leaves it alone.
-If <parameter>path</parameter> is relative, then
-<parameter>posix_path</parameter> will also be relative.  Note that
-<parameter>posix_path</parameter> must point to a buffer of sufficient
-size; use MAX_PATH if needed.</para>
-
-</sect1>
-
-<sect1 id="func-cygwin-conv-to-win32-path">
-<title>cygwin_conv_to_win32_path</title>
-
-<funcsynopsis>
-<funcdef>extern "C" void
-<function>cygwin_conv_to_win32_path</function></funcdef>
-<paramdef>const char *<parameter>path</parameter></paramdef>
-<paramdef>char *<parameter>win32_path</parameter></paramdef>
-</funcsynopsis>
-
-<para>Converts a POSIX path to a Win32 path.  If
-<parameter>path</parameter> is already a Win32 path, leaves it alone.
-If <parameter>path</parameter> is relative, then
-<parameter>win32_path</parameter> will also be relative.  Note that
-<parameter>win32_path</parameter> must point to a buffer of sufficient
-size; use MAX_PATH if needed.</para>
-
-</sect1>
-<sect1 id="func-cygwin-conv-to-full-posix-path">
-<title>cygwin_conv_to_full_posix_path</title>
-
-<funcsynopsis>
-<funcdef>extern "C" void
-<function>cygwin_conv_to_full_posix_path</function></funcdef>
-<paramdef>const char *<parameter>path</parameter></paramdef>
-<paramdef>char *<parameter>posix_path</parameter></paramdef>
-</funcsynopsis>
-
-<para>Converts a Win32 path to a POSIX path.  If
-<parameter>path</parameter> is already a POSIX path, leaves it alone.
-If <parameter>path</parameter> is relative, then
-<parameter>posix_path</parameter> will be converted to an absolute
-path.  Note that <parameter>posix_path</parameter> must point to a
-buffer of sufficient size; use MAX_PATH if needed.</para>
-
-</sect1>
-
-<sect1 id="func-cygwin-conv-to-full-win32-path">
-<title>cygwin_conv_to_full_win32_path</title>
-
-<funcsynopsis>
-<funcdef>extern "C" void
-<function>cygwin_conv_to_full_win32_path</function></funcdef>
-<paramdef>const char *<parameter>path</parameter></paramdef>
-<paramdef>char *<parameter>win32_path</parameter></paramdef>
-</funcsynopsis>
-
-<para>Converts a POSIX path to a Win32 path.  If
-<parameter>path</parameter> is already a Win32 path, leaves it alone.
-If <parameter>path</parameter> is relative, then
-<parameter>win32_path</parameter> will be converted to an absolute
-path.  Note that <parameter>win32_path</parameter> must point to a
-buffer of sufficient size; use MAX_PATH if needed.</para>
-
-</sect1>
-
-<sect1 id="func-cygwin-posix-path-list-p">
-<title>cygwin_posix_path_list_p</title>
-
-<funcsynopsis>
-<funcdef>extern "C" int
-<function>posix_path_list_p</function></funcdef>
-<paramdef>const char *<parameter>path</parameter></paramdef>
-</funcsynopsis>
-
-<para>This function tells you if the supplied
-<parameter>path</parameter> is a POSIX-style path (i.e. posix names,
-forward slashes, colon delimiters) or a Win32-style path (drive
-letters, reverse slashes, semicolon delimiters.  The return value is
-true if the path is a POSIX path.  Note that "_p" means "predicate", a
-lisp term meaning that the function tells you something about the
-parameter.</para>
-
-</sect1>
-
-<sect1 id="func-cygwin-split-path">
-<title>cygwin_split_path</title>
-
-<funcsynopsis>
-<funcdef>extern "C" void
-<function>cygwin_split_path</function>
-</funcdef>
-<paramdef>const char * <parameter>path</parameter></paramdef>
-<paramdef>char * <parameter>dir</parameter></paramdef>
-<paramdef>char * <parameter>file</parameter></paramdef>
-</funcsynopsis>
-
-<para>Split a path into the directory and the file portions.  Both
-<parameter>dir</parameter> and <parameter>file</parameter> are
-expected to point to buffers of sufficient size.  </para>
-
-<example>
-<title>Example use of cygwin_split_path</title>
-<programlisting>
-char dir[200], file[100];
-cygwin_split_path("c:/foo/bar.c", dir, file);
-printf("dir=%s, file=%s\n", dir, file);
-</programlisting>
-</example>
-</sect1>
diff --git a/winsup/cygwin/perprocess.h b/winsup/cygwin/perprocess.h
deleted file mode 100644
index c0a555983..000000000
--- a/winsup/cygwin/perprocess.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* per_process.h: main Cygwin header file.
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <sys/cygwin.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Pointer into application's static data */
-extern struct per_process __cygwin_user_data;
-#define user_data (&__cygwin_user_data)
-
-/* We use the following to test that sizeof hasn't changed.  When adding
-   or deleting members, insert fillers or use the reserved entries.
-   Do not change this value. */
-#define SIZEOF_PER_PROCESS (42 * 4)
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/winsup/cygwin/perthread.h b/winsup/cygwin/perthread.h
deleted file mode 100644
index a7095dc53..000000000
--- a/winsup/cygwin/perthread.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* perthread.h: Header file for cygwin thread-local storage.
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-   Written by Christopher Faylor <cgf@cygnus.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#define PTMAGIC 0x77366377
-
-struct _reent;
-extern struct _reent reent_data;
-
-#define PER_THREAD_FORK_CLEAR ((void *)UINT32_MAX)
-class per_thread
-{
-  DWORD tls;
-  int clear_on_fork_p;
-public:
-  per_thread (int forkval = 1) {tls = TlsAlloc (); clear_on_fork_p = forkval;}
-  DWORD get_tls () {return tls;}
-  int clear_on_fork () {return clear_on_fork_p;}
-
-  virtual void *get () {return TlsGetValue (get_tls ());}
-  virtual size_t size () {return 0;}
-  virtual void set (void *s = NULL);
-  virtual void set (int n) {TlsSetValue (get_tls (), (void *)n);}
-  virtual void *create ()
-  {
-    void *s = new char [size ()];
-    memset (s, 0, size ());
-    set (s);
-    return s;
-  }
-};
-
-class per_thread_waitq : public per_thread
-{
-public:
-  per_thread_waitq () : per_thread (0) {}
-  void *get () {return (waitq *) per_thread::get ();}
-  void *create () {return (waitq *) per_thread::create ();}
-  size_t size () {return sizeof (waitq);}
-};
-
-#if defined (NEED_VFORK)
-#include "cygtls.h"
-class vfork_save
-{
-  jmp_buf j;
-  int exitval;
- public:
-  int pid;
-  DWORD frame[100];
-  _threadinfo tls;
-  char **vfork_ebp;
-  char **vfork_esp;
-  int ctty;
-  pid_t sid;
-  pid_t pgid;
-  int is_active () { return pid < 0; }
-  void restore_pid (int val)
-  {
-    pid = val;
-    longjmp (j, 1);
-  }
-  void restore_exit (int val)
-  {
-    exitval = val;
-    longjmp (j, 1);
-  }
-  friend int vfork ();
-};
-
-class per_thread_vfork : public per_thread
-{
-public:
-  vfork_save *val () { return (vfork_save *) per_thread::get (); }
-  vfork_save *create () {return (vfork_save *) per_thread::create ();}
-  size_t size () {return sizeof (vfork_save);}
-};
-extern per_thread_vfork vfork_storage;
-extern vfork_save *main_vfork;
-#endif
-
-extern per_thread_waitq waitq_storage;
-
-extern per_thread *threadstuff[];
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
deleted file mode 100644
index 805f96b0b..000000000
--- a/winsup/cygwin/pinfo.cc
+++ /dev/null
@@ -1,801 +0,0 @@
-/* pinfo.cc: process table support
-
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include <time.h>
-#include <limits.h>
-#include <stdarg.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include "cygwin_version.h"
-#include "perprocess.h"
-#include "environ.h"
-#include <assert.h>
-#include <ntdef.h>
-#include "ntdll.h"
-#include "cygthread.h"
-#include "shared_info.h"
-#include "cygheap.h"
-#include "fhandler.h"
-
-static char NO_COPY pinfo_dummy[sizeof (_pinfo)] = {0};
-
-pinfo NO_COPY myself ((_pinfo *)&pinfo_dummy);	// Avoid myself != NULL checks
-
-HANDLE hexec_proc;
-
-void __stdcall
-pinfo_fixup_after_fork ()
-{
-  if (hexec_proc)
-    CloseHandle (hexec_proc);
-  /* Keeps the cygpid from being reused. No rights required */
-  if (!DuplicateHandle (hMainProc, hMainProc, hMainProc, &hexec_proc, 0,
-			TRUE, 0))
-    {
-      system_printf ("couldn't save current process handle %p, %E", hMainProc);
-      hexec_proc = NULL;
-    }
-}
-
-/* Initialize the process table.
-   This is done once when the dll is first loaded.  */
-
-void __stdcall
-set_myself (pid_t pid, HANDLE h)
-{
-  DWORD winpid = GetCurrentProcessId ();
-  if (pid == 1)
-    pid = cygwin_pid (winpid);
-  myself.init (pid, PID_IN_USE | PID_MYSELF, h);
-  myself->dwProcessId = winpid;
-  myself->process_state |= PID_IN_USE;
-  myself->start_time = time (NULL); /* Register our starting time. */
-
-  (void) GetModuleFileName (NULL, myself->progname, sizeof (myself->progname));
-  if (!strace.active)
-    strace.hello ();
-  InitializeCriticalSection (&myself->lock);
-  return;
-}
-
-/* Initialize the process table entry for the current task.
-   This is not called for forked tasks, only execed ones.  */
-void __stdcall
-pinfo_init (char **envp, int envc)
-{
-  if (envp)
-    {
-      environ_init (envp, envc);
-      /* spawn has already set up a pid structure for us so we'll use that */
-      myself->process_state |= PID_CYGPARENT;
-    }
-  else
-    {
-      /* Invent our own pid.  */
-
-      set_myself (1);
-      myself->ppid = 1;
-      myself->pgid = myself->sid = myself->pid;
-      myself->ctty = -1;
-      myself->uid = ILLEGAL_UID;
-      myself->gid = UNKNOWN_GID;
-      environ_init (NULL, 0);	/* call after myself has been set up */
-    }
-
-  debug_printf ("pid %d, pgid %d", myself->pid, myself->pgid);
-}
-
-void
-_pinfo::exit (UINT n, bool norecord)
-{
-  if (this)
-    {
-      if (!norecord)
-	process_state = PID_EXITED;
-
-      /* FIXME:  There is a potential race between an execed process and its
-	 parent here.  I hated to add a mutex just for this, though.  */
-      struct rusage r;
-      fill_rusage (&r, hMainProc);
-      add_rusage (&rusage_self, &r);
-    }
-
-  cygthread::terminate ();
-  sigproc_printf ("Calling ExitProcess %d", n);
-  ExitProcess (n);
-}
-
-void
-pinfo::init (pid_t n, DWORD flag, HANDLE in_h)
-{
-  if (myself && n == myself->pid)
-    {
-      procinfo = myself;
-      destroy = 0;
-      h = NULL;
-      return;
-    }
-
-  void *mapaddr;
-  if (!(flag & PID_MYSELF))
-    mapaddr = NULL;
-  else
-    {
-      flag &= ~PID_MYSELF;
-      HANDLE hdummy;
-      mapaddr = open_shared (NULL, 0, hdummy, 0, SH_MYSELF);
-    }
-
-  int createit = flag & (PID_IN_USE | PID_EXECED);
-  DWORD access = FILE_MAP_READ
-		 | (flag & (PID_IN_USE | PID_EXECED | PID_MAP_RW) ? FILE_MAP_WRITE : 0);
-  for (int i = 0; i < 10; i++)
-    {
-      int created;
-      char mapname[CYG_MAX_PATH]; /* XXX Not a path */
-      shared_name (mapname, "cygpid", n);
-
-      int mapsize;
-      if (flag & PID_EXECED)
-	mapsize = PINFO_REDIR_SIZE;
-      else
-	mapsize = sizeof (_pinfo);
-
-      if (in_h)
-	{
-	  h = in_h;
-	  created = 0;
-	}
-      else if (!createit)
-	{
-	  h = OpenFileMappingA (access, FALSE, mapname);
-	  created = 0;
-	}
-      else
-	{
-	  char sa_buf[1024];
-	  PSECURITY_ATTRIBUTES sec_attribs =
-	    sec_user_nih (sa_buf, cygheap->user.sid(), well_known_world_sid,
-			  FILE_MAP_READ);
-	  h = CreateFileMapping (INVALID_HANDLE_VALUE, sec_attribs,
-				 PAGE_READWRITE, 0, mapsize, mapname);
-	  created = h && GetLastError () != ERROR_ALREADY_EXISTS;
-	}
-
-      if (!h)
-	{
-	  if (createit)
-	    __seterrno ();
-	  procinfo = NULL;
-	  return;
-	}
-
-      procinfo = (_pinfo *) MapViewOfFileEx (h, access, 0, 0, 0, mapaddr);
-      ProtectHandle1 (h, pinfo_shared_handle);
-
-      if ((procinfo->process_state & PID_INITIALIZING) && (flag & PID_NOREDIR)
-	  && cygwin_pid (procinfo->dwProcessId) != procinfo->pid)
-	{
-	  release ();
-	  set_errno (ENOENT);
-	  return;
-	}
-
-      if (procinfo->process_state & PID_EXECED)
-	{
-	  assert (!i);
-	  pid_t realpid = procinfo->pid;
-	  debug_printf ("execed process windows pid %d, cygwin pid %d", n, realpid);
-	  if (realpid == n)
-	    api_fatal ("retrieval of execed process info for pid %d failed due to recursion.", n);
-	  n = realpid;
-	  release ();
-	  if (flag & PID_ALLPIDS)
-	    {
-	      set_errno (ENOENT);
-	      break;
-	    }
-	  continue;
-	}
-
-	/* In certain rare, pathological cases, it is possible for the shared
-	   memory region to exist for a while after a process has exited.  This
-	   should only be a brief occurrence, so rather than introduce some kind
-	   of locking mechanism, just loop.  FIXME: I'm sure I'll regret doing it
-	   this way at some point.  */
-      if (i < 9 && !created && createit && (procinfo->process_state & PID_EXITED))
-	{
-	  low_priority_sleep (5);
-	  release ();
-	  continue;
-	}
-
-      if (!created)
-	/* nothing */;
-      else if (!(flag & PID_EXECED))
-	procinfo->pid = n;
-      else
-	{
-	  procinfo->process_state |= PID_IN_USE | PID_EXECED;
-	  procinfo->pid = myself->pid;
-	}
-      break;
-    }
-  destroy = 1;
-}
-
-void
-pinfo::set_acl()
-{
-  char sa_buf[1024];
-  SECURITY_DESCRIPTOR sd;
-
-  sec_acl ((PACL) sa_buf, true, true, cygheap->user.sid (),
-	   well_known_world_sid, FILE_MAP_READ);
-  if (!InitializeSecurityDescriptor (&sd, SECURITY_DESCRIPTOR_REVISION))
-    debug_printf ("InitializeSecurityDescriptor %E");
-  else if (!SetSecurityDescriptorDacl (&sd, TRUE, (PACL) sa_buf, FALSE))
-    debug_printf ("SetSecurityDescriptorDacl %E");
-  else if (!SetKernelObjectSecurity (h, DACL_SECURITY_INFORMATION, &sd))
-    debug_printf ("SetKernelObjectSecurity %E");
-}
-
-void
-_pinfo::set_ctty (tty_min *tc, int flags, fhandler_tty_slave *arch)
-{
-  if ((ctty < 0 || ctty == tc->ntty) && !(flags & O_NOCTTY))
-    {
-      ctty = tc->ntty;
-      syscall_printf ("attached tty%d sid %d, pid %d, tty->pgid %d, tty->sid %d",
-		      tc->ntty, sid, pid, pgid, tc->getsid ());
-
-      pinfo p (tc->getsid ());
-      if (sid == pid && (!p || p->pid == pid || !proc_exists (p)))
-	{
-	  paranoid_printf ("resetting tty%d sid.  Was %d, now %d.  pgid was %d, now %d.",
-			   tc->ntty, tc->getsid (), sid, tc->getpgid (), pgid);
-	  /* We are the session leader */
-	  tc->setsid (sid);
-	  tc->setpgid (pgid);
-	}
-      else
-	sid = tc->getsid ();
-      if (tc->getpgid () == 0)
-	tc->setpgid (pgid);
-      if (cygheap->ctty != arch)
-	{
-	  debug_printf ("cygheap->ctty %p, arch %p", cygheap->ctty, arch);
-	  if (!cygheap->ctty)
-	    syscall_printf ("ctty NULL");
-	  else
-	    {
-	      syscall_printf ("ctty %p, usecount %d", cygheap->ctty,
-			      cygheap->ctty->usecount);
-	      if (!--cygheap->ctty->usecount)
-		cygheap->ctty->close ();
-	    }
-	  cygheap->ctty = arch;
-	  if (arch)
-	    {
-	      arch->usecount++;
-	      debug_printf ("arch usecount for tty%d is %d", tc->ntty, arch->usecount);
-	    }
-	}
-    }
-}
-
-bool
-_pinfo::alive ()
-{
-  HANDLE h = OpenProcess (PROCESS_QUERY_INFORMATION, false, dwProcessId);
-  if (h)
-    CloseHandle (h);
-  return !!h;
-}
-
-extern char **__argv;
-
-void
-_pinfo::commune_recv ()
-{
-  DWORD nr;
-  DWORD code;
-  HANDLE hp;
-  HANDLE __fromthem = NULL;
-  HANDLE __tothem = NULL;
-
-  hp = OpenProcess (PROCESS_DUP_HANDLE, false, dwProcessId);
-  if (!hp)
-    {
-      sigproc_printf ("couldn't open handle for pid %d(%u)", pid, dwProcessId);
-      hello_pid = -1;
-      return;
-    }
-  if (!DuplicateHandle (hp, fromthem, hMainProc, &__fromthem, 0, false, DUPLICATE_SAME_ACCESS))
-    {
-      sigproc_printf ("couldn't duplicate fromthem, %E");
-      CloseHandle (hp);
-      hello_pid = -1;
-      return;
-    }
-
-  if (!DuplicateHandle (hp, tothem, hMainProc, &__tothem, 0, false, DUPLICATE_SAME_ACCESS))
-    {
-      sigproc_printf ("couldn't duplicate tothem, %E");
-      CloseHandle (__fromthem);
-      CloseHandle (hp);
-      hello_pid = -1;
-      return;
-    }
-
-  CloseHandle (hp);
-  hello_pid = 0;
-
-  if (!ReadFile (__fromthem, &code, sizeof code, &nr, NULL) || nr != sizeof code)
-    {
-      /* __seterrno ();*/	// this is run from the signal thread, so don't set errno
-      goto out;
-    }
-
-  switch (code)
-    {
-    case PICOM_CMDLINE:
-      {
-	unsigned n = 1;
-	CloseHandle (__fromthem); __fromthem = NULL;
-	extern int __argc_safe;
-	const char *argv[__argc_safe + 1];
-	for (int i = 0; i < __argc_safe; i++)
-	  {
-	    if (IsBadStringPtr (__argv[i], INT32_MAX))
-	      argv[i] = "";
-	    else
-	      argv[i] = __argv[i];
-	    n += strlen (argv[i]) + 1;
-	  }
-	argv[__argc_safe] = NULL;
-	if (!WriteFile (__tothem, &n, sizeof n, &nr, NULL))
-	  {
-	    /*__seterrno ();*/	// this is run from the signal thread, so don't set errno
-	    sigproc_printf ("WriteFile sizeof argv failed, %E");
-	  }
-	else
-	  for (const char **a = argv; *a; a++)
-	    if (!WriteFile (__tothem, *a, strlen (*a) + 1, &nr, NULL))
-	      {
-		sigproc_printf ("WriteFile arg %d failed, %E", a - argv);
-		break;
-	      }
-	if (!WriteFile (__tothem, "", 1, &nr, NULL))
-	  {
-	    sigproc_printf ("WriteFile null failed, %E");
-	    break;
-	  }
-	break;
-      }
-    case PICOM_FIFO:
-      {
-	int formic;
-	if (!ReadFile (__fromthem, &formic, sizeof formic, &nr, NULL)
-	    || nr != sizeof formic)
-	  {
-	    /* __seterrno ();*/	// this is run from the signal thread, so don't set errno
-	    goto out;
-	  }
-
-	fhandler_fifo *fh = cygheap->fdtab.find_fifo ((ATOM) formic);
-	HANDLE it[] = {(fh->get_handle ()), (fh->get_output_handle ())};
-
-	if (!WriteFile (__tothem, it, sizeof (it), &nr, NULL))
-	  {
-	    /*__seterrno ();*/	// this is run from the signal thread, so don't set errno
-	    sigproc_printf ("WriteFile read handle failed, %E");
-	  }
-
-	(void) ReadFile (__fromthem, &nr, sizeof (nr), &nr, NULL);
-	break;
-      }
-    }
-
-out:
-  if (__fromthem)
-    CloseHandle (__fromthem);
-  if (__tothem)
-    CloseHandle (__tothem);
-}
-
-#define PIPEBUFSIZE (16 * sizeof (DWORD))
-
-commune_result
-_pinfo::commune_send (DWORD code, ...)
-{
-  HANDLE fromthem = NULL, tome = NULL;
-  HANDLE fromme = NULL, tothem = NULL;
-  DWORD nr;
-  commune_result res;
-  va_list args;
-
-  va_start (args, code);
-
-  res.s = NULL;
-  res.n = 0;
-
-  if (!pid || !this || (dwProcessId != (DWORD) pid && !pinfo (myself->dwProcessId)))
-    {
-      set_errno (ESRCH);
-      goto err;
-    }
-  if (!CreatePipe (&fromthem, &tome, &sec_all_nih, PIPEBUFSIZE))
-    {
-      sigproc_printf ("first CreatePipe failed, %E");
-      __seterrno ();
-      goto err;
-    }
-  if (!CreatePipe (&fromme, &tothem, &sec_all_nih, PIPEBUFSIZE))
-    {
-      sigproc_printf ("first CreatePipe failed, %E");
-      __seterrno ();
-      goto err;
-    }
-  EnterCriticalSection (&myself->lock);
-  myself->tothem = tome;
-  myself->fromthem = fromme;
-  myself->hello_pid = pid;
-  if (!WriteFile (tothem, &code, sizeof code, &nr, NULL) || nr != sizeof code)
-    {
-      __seterrno ();
-      goto err;
-    }
-
-  switch (code)
-    {
-    case PICOM_FIFO:
-      {
-	int formic = va_arg (args, int);
-	if (!WriteFile (tothem, &formic, sizeof formic, &nr, NULL) || nr != sizeof formic)
-	  {
-	    __seterrno ();
-	    goto err;
-	  }
-	break;
-      }
-    }
-
-  if (sig_send (this, __SIGCOMMUNE))
-    goto err;
-
-  /* FIXME: Need something better than an busy loop here */
-  bool isalive;
-  for (int i = 0; (isalive = alive ()) && (i < 10000); i++)
-    if (myself->hello_pid <= 0)
-      break;
-    else
-      low_priority_sleep (0);
-
-  CloseHandle (tome);
-  tome = NULL;
-  CloseHandle (fromme);
-  fromme = NULL;
-
-  if (!isalive)
-    {
-      set_errno (ESRCH);
-      goto err;
-    }
-
-  if (myself->hello_pid < 0)
-    {
-      set_errno (ENOSYS);
-      goto err;
-    }
-
-  size_t n;
-  switch (code)
-    {
-    case PICOM_CMDLINE:
-      if (!ReadFile (fromthem, &n, sizeof n, &nr, NULL) || nr != sizeof n)
-	{
-	  __seterrno ();
-	  goto err;
-	}
-      res.s = (char *) malloc (n);
-      char *p;
-      for (p = res.s; ReadFile (fromthem, p, n, &nr, NULL); p += nr)
-	continue;
-      if ((unsigned) (p - res.s) != n)
-	{
-	  __seterrno ();
-	  goto err;
-	}
-      res.n = n;
-      break;
-    case PICOM_FIFO:
-      {
-	DWORD x = ReadFile (fromthem, res.handles, sizeof (res.handles), &nr, NULL);
-	WriteFile (tothem, &x, sizeof (x), &x, NULL);
-	if (!x)
-	  goto err;
-	if (nr != sizeof (res.handles))
-	  {
-	    set_errno (EPIPE);
-	    goto err;
-	  }
-	break;
-      }
-    }
-  CloseHandle (tothem);
-  CloseHandle (fromthem);
-  goto out;
-
-err:
-  if (tome)
-    CloseHandle (tome);
-  if (fromthem)
-    CloseHandle (fromthem);
-  if (tothem)
-    CloseHandle (tothem);
-  if (fromme)
-    CloseHandle (fromme);
-  memset (&res, 0, sizeof (res));
-
-out:
-  myself->hello_pid = 0;
-  LeaveCriticalSection (&myself->lock);
-  return res;
-}
-
-char *
-_pinfo::cmdline (size_t& n)
-{
-  char *s;
-  if (!this || !pid)
-    return NULL;
-  if (pid != myself->pid)
-    {
-      commune_result cr = commune_send (PICOM_CMDLINE);
-      s = cr.s;
-      n = cr.n;
-    }
-  else
-    {
-      n = 1;
-      for (char **a = __argv; *a; a++)
-	n += strlen (*a) + 1;
-      char *p;
-      p = s = (char *) malloc (n);
-      for (char **a = __argv; *a; a++)
-	{
-	  strcpy (p, *a);
-	  p = strchr (p, '\0') + 1;
-	}
-      *p = '\0';
-    }
-  return s;
-}
-
-void
-pinfo::release ()
-{
-  if (h)
-    {
-#ifdef DEBUGGING
-      if (((DWORD) procinfo & 0x77000000) == 0x61000000)
-	try_to_debug ();
-#endif
-      UnmapViewOfFile (procinfo);
-      procinfo = NULL;
-      ForceCloseHandle1 (h, pinfo_shared_handle);
-      h = NULL;
-    }
-}
-
-/* DOCTOOL-START
-
-<sect1 id="func-cygwin-winpid-to-pid">
-  <title>cygwin_winpid_to_pid</title>
-
-  <funcsynopsis>
-    <funcdef>extern "C" pid_t
-      <function>cygwin_winpid_to_pid</function>
-      </funcdef>
-      <paramdef>int <parameter>winpid</parameter></paramdef>
-  </funcsynopsis>
-
-  <para>Given a windows pid, converts to the corresponding Cygwin
-pid, if any.  Returns -1 if windows pid does not correspond to
-a cygwin pid.</para>
-  <example>
-    <title>Example use of cygwin_winpid_to_pid</title>
-    <programlisting>
-      extern "C" cygwin_winpid_to_pid (int winpid);
-      pid_t mypid;
-      mypid = cygwin_winpid_to_pid (windows_pid);
-    </programlisting>
-  </example>
-</sect1>
-
-   DOCTOOL-END */
-
-extern "C" pid_t
-cygwin_winpid_to_pid (int winpid)
-{
-  pinfo p (cygwin_pid (winpid));
-  if (p)
-    return p->pid;
-
-  set_errno (ESRCH);
-  return (pid_t) -1;
-}
-
-#include <tlhelp32.h>
-
-#define slop_pidlist 200
-#define size_pidlist(i) (sizeof (pidlist[0]) * ((i) + 1))
-#define size_pinfolist(i) (sizeof (pinfolist[0]) * ((i) + 1))
-
-inline void
-winpids::add (DWORD& nelem, bool winpid, DWORD pid)
-{
-  pid_t cygpid = cygwin_pid (pid);
-  if (nelem >= npidlist)
-    {
-      npidlist += slop_pidlist;
-      pidlist = (DWORD *) realloc (pidlist, size_pidlist (npidlist + 1));
-      pinfolist = (pinfo *) realloc (pinfolist, size_pinfolist (npidlist + 1));
-    }
-
-  pinfolist[nelem].init (cygpid, PID_NOREDIR | (winpid ? PID_ALLPIDS : 0)
-			 | pinfo_access);
-  if (winpid)
-    goto out;
-
-  if (!pinfolist[nelem])
-    {
-      if (!pinfo_access)
-	return;
-      pinfolist[nelem].init (cygpid, PID_NOREDIR | (winpid ? PID_ALLPIDS : 0));
-      if (!pinfolist[nelem])
-	return;
-      }
-
-  /* Scan list of previously recorded pids to make sure that this pid hasn't
-     shown up before.  This can happen when a process execs. */
-  for (unsigned i = 0; i < nelem; i++)
-    if (pinfolist[i]->pid == pinfolist[nelem]->pid)
-      {
-	if ((_pinfo *) pinfolist[nelem] != (_pinfo *) myself)
-	  pinfolist[nelem].release ();
-	return;
-      }
-
-out:
-  pidlist[nelem++] = pid;
-}
-
-DWORD
-winpids::enumNT (bool winpid)
-{
-  static DWORD szprocs;
-  static SYSTEM_PROCESSES *procs;
-
-  DWORD nelem = 0;
-  if (!szprocs)
-    procs = (SYSTEM_PROCESSES *) malloc (sizeof (*procs) + (szprocs = 200 * sizeof (*procs)));
-
-  NTSTATUS res;
-  for (;;)
-    {
-      res = NtQuerySystemInformation (SystemProcessesAndThreadsInformation,
-				      procs, szprocs, NULL);
-      if (res == 0)
-	break;
-
-      if (res == STATUS_INFO_LENGTH_MISMATCH)
-	procs =  (SYSTEM_PROCESSES *) realloc (procs, szprocs += 200 * sizeof (*procs));
-      else
-	{
-	  system_printf ("error %p reading system process information", res);
-	  return 0;
-	}
-    }
-
-  SYSTEM_PROCESSES *px = procs;
-  for (;;)
-    {
-      if (px->ProcessId)
-	add (nelem, winpid, px->ProcessId);
-      if (!px->NextEntryDelta)
-	break;
-      px = (SYSTEM_PROCESSES *) ((char *) px + px->NextEntryDelta);
-    }
-
-  return nelem;
-}
-
-DWORD
-winpids::enum9x (bool winpid)
-{
-  DWORD nelem = 0;
-
-  HANDLE h = CreateToolhelp32Snapshot (TH32CS_SNAPPROCESS, 0);
-  if (!h)
-    {
-      system_printf ("Couldn't create process snapshot, %E");
-      return 0;
-    }
-
-  PROCESSENTRY32 proc;
-  proc.dwSize = sizeof (proc);
-
-  if (Process32First (h, &proc))
-    do
-      {
-	if (proc.th32ProcessID)
-	  add (nelem, winpid, proc.th32ProcessID);
-      }
-    while (Process32Next (h, &proc));
-
-  CloseHandle (h);
-  return nelem;
-}
-
-NO_COPY CRITICAL_SECTION winpids::cs;
-
-void
-winpids::set (bool winpid)
-{
-  EnterCriticalSection (&cs);
-  npids = (this->*enum_processes) (winpid);
-  if (pidlist)
-    pidlist[npids] = 0;
-  LeaveCriticalSection (&cs);
-}
-
-void
-winpids::init ()
-{
-  InitializeCriticalSection (&cs);
-}
-
-DWORD
-winpids::enum_init (bool winpid)
-{
-  if (wincap.is_winnt ())
-    enum_processes = &winpids::enumNT;
-  else
-    enum_processes = &winpids::enum9x;
-
-  return (this->*enum_processes) (winpid);
-}
-
-void
-winpids::release ()
-{
-  for (unsigned i = 0; i < npids; i++)
-    if (pinfolist[i] && (_pinfo *) pinfolist[i] != (_pinfo *) myself)
-      pinfolist[i].release ();
-}
-
-winpids::~winpids ()
-{
-  if (npidlist)
-    {
-      release ();
-      free (pidlist);
-      free (pinfolist);
-    }
-}
diff --git a/winsup/cygwin/pinfo.h b/winsup/cygwin/pinfo.h
deleted file mode 100644
index b0ddb6702..000000000
--- a/winsup/cygwin/pinfo.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/* pinfo.h: process table info
-
-   Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _PINFO_H
-#define _PINFO_H
-#include <sys/resource.h>
-#include "thread.h"
-
-struct commune_result
-{
-  char *s;
-  int n;
-  HANDLE handles[2];
-};
-
-enum picom
-{
-  PICOM_CMDLINE = 1,
-  PICOM_FIFO = 2
-};
-
-class _pinfo
-{
-public:
-  /* Cygwin pid */
-  pid_t pid;
-
-  /* Various flags indicating the state of the process.  See PID_
-     constants below. */
-  DWORD process_state;
-
-  /* If hProcess is set, it's because it came from a
-     CreateProcess call.  This means it's process relative
-     to the thing which created the process.  That's ok because
-     we only use this handle from the parent. */
-  HANDLE hProcess;
-
-#define PINFO_REDIR_SIZE ((char *) &myself.procinfo->hProcess - (char *) myself.procinfo)
-
-  /* Handle associated with initial Windows pid which started it all. */
-  HANDLE pid_handle;
-
-  /* Handle to the logical parent of this pid. */
-  HANDLE ppid_handle;
-
-  /* Parent process id.  */
-  pid_t ppid;
-
-  /* dwProcessId contains the processid used for sending signals.  It
-   * will be reset in a child process when it is capable of receiving
-   * signals.
-   */
-  DWORD dwProcessId;
-
-  /* Used to spawn a child for fork(), among other things. */
-  char progname[CYG_MAX_PATH];
-
-  /* User information.
-     The information is derived from the GetUserName system call,
-     with the name looked up in /etc/passwd and assigned a default value
-     if not found.  This data resides in the shared data area (allowing
-     tasks to store whatever they want here) so it's for informational
-     purposes only. */
-  __uid32_t uid;	/* User ID */
-  __gid32_t gid;	/* Group ID */
-  pid_t pgid;		/* Process group ID */
-  pid_t sid;		/* Session ID */
-  int ctty;		/* Control tty */
-  bool has_pgid_children;/* True if we've forked or spawned children with our GID. */
-
-  /* Resources used by process. */
-  long start_time;
-  struct rusage rusage_self;
-  struct rusage rusage_children;
-
-  /* Non-zero if process was stopped by a signal. */
-  char stopsig;
-
-  /* commune */
-  pid_t hello_pid;
-  HANDLE tothem;
-  HANDLE fromthem;
-
-  void exit (UINT n, bool norecord = 0) __attribute__ ((noreturn, regparm(2)));
-
-  inline void set_has_pgid_children ()
-  {
-    if (pgid == pid)
-      has_pgid_children = 1;
-  }
-
-  inline void set_has_pgid_children (bool val) {has_pgid_children = val;}
-
-  inline sigset_t& getsigmask ()
-  {
-    return sig_mask;
-  }
-
-  inline void setsigmask (sigset_t mask)
-  {
-    sig_mask = mask;
-  }
-
-  void commune_recv ();
-  commune_result commune_send (DWORD, ...);
-  bool alive ();
-  char *cmdline (size_t &);
-  void set_ctty (class tty_min *, int, class fhandler_tty_slave *);
-
-  friend void __stdcall set_myself (pid_t, HANDLE);
-
-  /* signals */
-  HANDLE sendsig;
-private:
-  sigset_t sig_mask;
-  CRITICAL_SECTION lock;
-};
-
-class pinfo
-{
-  HANDLE h;
-  _pinfo *procinfo;
-  bool destroy;
-public:
-  void init (pid_t n, DWORD create = 0, HANDLE h = NULL) __attribute__ ((regparm(3)));
-  pinfo () {}
-  pinfo (_pinfo *x): procinfo (x) {}
-  pinfo (pid_t n) {init (n);}
-  pinfo (pid_t n, int create) {init (n, create);}
-  void release ();
-  ~pinfo ()
-  {
-    if (destroy && procinfo)
-      release ();
-  }
-
-  _pinfo *operator -> () const {return procinfo;}
-  int operator == (pinfo *x) const {return x->procinfo == procinfo;}
-  int operator == (pinfo &x) const {return x.procinfo == procinfo;}
-  int operator == (_pinfo *x) const {return x == procinfo;}
-  int operator == (void *x) const {return procinfo == x;}
-  int operator == (int x) const {return (int) procinfo == (int) x;}
-  int operator == (char *x) const {return (char *) procinfo == x;}
-  _pinfo *operator * () const {return procinfo;}
-  operator _pinfo * () const {return procinfo;}
-  // operator bool () const {return (int) h;}
-#ifndef _SIGPROC_H
-  int remember () {system_printf ("remember is not here"); return 0;}
-#else
-  int remember ()
-  {
-    int res = proc_subproc (PROC_ADDCHILD, (DWORD) this);
-    destroy = res ? false : true;
-    return res;
-  }
-#endif
-  HANDLE shared_handle () {return h;}
-  void set_acl();
-};
-
-#define ISSTATE(p, f)	(!!((p)->process_state & f))
-#define NOTSTATE(p, f)	(!((p)->process_state & f))
-
-class winpids
-{
-  DWORD *pidlist;
-  DWORD npidlist;
-  pinfo *pinfolist;
-  DWORD pinfo_access;		// access type for pinfo open
-  DWORD (winpids::* enum_processes) (bool winpid);
-  DWORD enum_init (bool winpid);
-  DWORD enumNT (bool winpid);
-  DWORD enum9x (bool winpid);
-  void add (DWORD& nelem, bool, DWORD pid);
-  static CRITICAL_SECTION cs;
-public:
-  DWORD npids;
-  inline void reset () { npids = 0; release (); }
-  void set (bool winpid);
-  winpids (int): pinfo_access (0), enum_processes (&winpids::enum_init)
-    { reset (); }
-  winpids (DWORD acc = 0): pidlist (NULL), npidlist (0), pinfolist (NULL),
-  			   enum_processes (&winpids::enum_init), npids (0)
-  {
-    pinfo_access = acc;
-    set (0);
-  }
-  inline DWORD& winpid (int i) const {return pidlist[i];}
-  inline _pinfo *operator [] (int i) const {return (_pinfo *) pinfolist[i];}
-  ~winpids ();
-  void release ();
-  static void init ();
-};
-
-extern __inline pid_t
-cygwin_pid (pid_t pid)
-{
-  return (pid_t) (wincap.has_negative_pids ()) ? -(int) pid : pid;
-}
-
-void __stdcall pinfo_init (char **, int);
-void __stdcall set_myself (pid_t pid, HANDLE h = NULL);
-extern pinfo myself;
-
-#define _P_VFORK 0
-#define _P_SYSTEM 512
-
-extern void __stdcall pinfo_fixup_after_fork ();
-extern HANDLE hexec_proc;
-
-/* For mmaps across fork(). */
-int __stdcall fixup_mmaps_after_fork (HANDLE parent);
-/* for shm areas across fork (). */
-int __stdcall fixup_shms_after_fork ();
-
-void __stdcall fill_rusage (struct rusage *, HANDLE);
-void __stdcall add_rusage (struct rusage *, struct rusage *);
-#endif /*_PINFO_H*/
diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc
deleted file mode 100644
index 242556ad6..000000000
--- a/winsup/cygwin/pipe.cc
+++ /dev/null
@@ -1,291 +0,0 @@
-/* pipe.cc: pipe for Cygwin.
-
-   Copyright 1996, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* FIXME: Should this really be fhandler_pipe.cc? */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <sys/socket.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "thread.h"
-#include "pinfo.h"
-#include "cygthread.h"
-
-static unsigned pipecount;
-static const NO_COPY char pipeid_fmt[] = "stupid_pipe.%u.%u";
-
-fhandler_pipe::fhandler_pipe ()
-  : fhandler_base (), guard (NULL), broken_pipe (false), writepipe_exists(0),
-    orig_pid (0), id (0)
-{
-}
-
-_off64_t
-fhandler_pipe::lseek (_off64_t offset, int whence)
-{
-  debug_printf ("(%d, %d)", offset, whence);
-  set_errno (ESPIPE);
-  return -1;
-}
-
-void
-fhandler_pipe::set_close_on_exec (int val)
-{
-  fhandler_base::set_close_on_exec (val);
-  if (guard)
-    set_inheritance (guard, val);
-  if (writepipe_exists)
-    set_inheritance (writepipe_exists, val);
-}
-
-struct pipeargs
-{
-  fhandler_base *fh;
-  void *ptr;
-  size_t *len;
-};
-
-static DWORD WINAPI
-read_pipe (void *arg)
-{
-  pipeargs *pi = (pipeargs *) arg;
-  pi->fh->fhandler_base::read (pi->ptr, *pi->len);
-  return 0;
-}
-
-void __stdcall
-fhandler_pipe::read (void *in_ptr, size_t& in_len)
-{
-  if (broken_pipe)
-    in_len = 0;
-  else
-    {
-      pipeargs pi = {dynamic_cast<fhandler_base *>(this), in_ptr, &in_len};
-      ResetEvent (read_state);
-      cygthread *th = new cygthread (read_pipe, &pi, "read_pipe");
-      if (th->detach (read_state) && !in_len)
-	in_len = (size_t) -1;	/* received a signal */
-    }
-  (void) ReleaseMutex (guard);
-  return;
-}
-
-int
-fhandler_pipe::close ()
-{
-  if (guard)
-    CloseHandle (guard);
-  if (writepipe_exists)
-    CloseHandle (writepipe_exists);
-  if (read_state && !cygheap->fdtab.in_vfork_cleanup ())
-    CloseHandle (read_state);
-  if (get_handle ())
-    {
-      CloseHandle (get_handle ());
-      set_io_handle (NULL);
-    }
-  return 0;
-}
-
-bool
-fhandler_pipe::hit_eof ()
-{
-  char buf[80];
-  HANDLE ev;
-  if (broken_pipe)
-    return 1;
-  if (!orig_pid)
-    return false;
-  __small_sprintf (buf, pipeid_fmt, orig_pid, id);
-  if ((ev = OpenEvent (EVENT_ALL_ACCESS, FALSE, buf)))
-    CloseHandle (ev);
-  debug_printf ("%s %p", buf, ev);
-  return ev == NULL;
-}
-
-void
-fhandler_pipe::fixup_after_exec (HANDLE parent)
-{
-  if (read_state)
-    read_state = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
-}
-
-void
-fhandler_pipe::fixup_after_fork (HANDLE parent)
-{
-  fhandler_base::fixup_after_fork (parent);
-  if (guard)
-    fork_fixup (parent, guard, "guard");
-  if (writepipe_exists)
-    fork_fixup (parent, writepipe_exists, "guard");
-  fixup_after_exec (parent);
-}
-
-int
-fhandler_pipe::dup (fhandler_base *child)
-{
-  if (get_handle ())
-    {
-      int res = fhandler_base::dup (child);
-      if (res)
-	return res;
-    }
-
-  fhandler_pipe *ftp = (fhandler_pipe *) child;
-
-  /* FIXME: This leaks handles in the failing condition */
-  if (guard == NULL)
-    ftp->guard = NULL;
-  else if (!DuplicateHandle (hMainProc, guard, hMainProc, &ftp->guard, 0, 1,
-			     DUPLICATE_SAME_ACCESS))
-    {
-      debug_printf ("couldn't duplicate guard %p, %E", guard);
-      return -1;
-    }
-
-  if (writepipe_exists == NULL)
-    ftp->writepipe_exists = NULL;
-  else if (!DuplicateHandle (hMainProc, writepipe_exists, hMainProc,
-			     &ftp->writepipe_exists, 0, 1,
-			     DUPLICATE_SAME_ACCESS))
-    {
-      debug_printf ("couldn't duplicate writepipe_exists %p, %E", writepipe_exists);
-      return -1;
-    }
-
-  if (read_state == NULL)
-    ftp->read_state = NULL;
-  else if (!DuplicateHandle (hMainProc, read_state, hMainProc,
-			     &ftp->read_state, 0, 1,
-			     DUPLICATE_SAME_ACCESS))
-    {
-      debug_printf ("couldn't duplicate read_state %p, %E", writepipe_exists);
-      return -1;
-    }
-
-  ftp->id = id;
-  ftp->orig_pid = orig_pid;
-  return 0;
-}
-
-int
-fhandler_pipe::create (fhandler_pipe *fhs[2], unsigned psize, int mode, bool fifo)
-{
-  HANDLE r, w;
-  SECURITY_ATTRIBUTES *sa = (mode & O_NOINHERIT) ?  &sec_none_nih : &sec_none;
-  int res = -1;
-
-  if (!CreatePipe (&r, &w, sa, psize))
-    __seterrno ();
-  else
-    {
-      fhs[0] = (fhandler_pipe *) build_fh_dev (*piper_dev);
-      fhs[1] = (fhandler_pipe *) build_fh_dev (*pipew_dev);
-
-      int binmode = mode & O_TEXT ?: O_BINARY;
-      fhs[0]->init (r, GENERIC_READ, binmode);
-      fhs[1]->init (w, GENERIC_WRITE, binmode);
-      if (mode & O_NOINHERIT)
-       {
-	 fhs[0]->set_close_on_exec_flag (1);
-	 fhs[1]->set_close_on_exec_flag (1);
-       }
-
-      fhs[0]->read_state = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
-      fhs[0]->set_need_fork_fixup ();
-
-      res = 0;
-      fhs[0]->create_guard (sa);
-      if (wincap.has_unreliable_pipes ())
-	{
-	  char buf[80];
-	  int count = pipecount++;	/* FIXME: Should this be InterlockedIncrement? */
-	  __small_sprintf (buf, pipeid_fmt, myself->pid, count);
-	  fhs[1]->writepipe_exists = CreateEvent (sa, TRUE, FALSE, buf);
-	  fhs[0]->orig_pid = myself->pid;
-	  fhs[0]->id = count;
-	}
-    }
-
-  syscall_printf ("%d = ([%p, %p], %d, %p)", res, fhs[0], fhs[1], psize, mode);
-  return res;
-}
-
-int
-fhandler_pipe::ioctl (unsigned int cmd, void *p)
-{
-  int n;
-
-  switch (cmd)
-    {
-    case FIONREAD:
-      if (get_device () == FH_PIPEW)
-	{
-	  set_errno (EINVAL);
-	  return -1;
-	}
-      if (!PeekNamedPipe (get_handle (), NULL, 0, NULL, (DWORD *) &n, NULL))
-	{
-	  __seterrno ();
-	  return -1;
-	}
-      break;
-    default:
-      return fhandler_base::ioctl (cmd, p);
-      break;
-    }
-  *(int *) p = n;
-  return 0;
-}
-
-extern "C" int
-pipe (int filedes[2])
-{
-  extern DWORD binmode;
-  fhandler_pipe *fhs[2];
-  int res = fhandler_pipe::create (fhs, 16384, (!binmode || binmode == O_BINARY)
-					       ? O_BINARY : O_TEXT);
-  if (res == 0)
-    {
-      cygheap_fdnew fdin;
-      cygheap_fdnew fdout (fdin, false);
-      fdin = fhs[0];
-      fdout = fhs[1];
-      filedes[0] = fdin;
-      filedes[1] = fdout;
-    }
-
-  return res;
-}
-
-extern "C" int
-_pipe (int filedes[2], unsigned int psize, int mode)
-{
-  fhandler_pipe *fhs[2];
-  int res = fhandler_pipe::create (fhs, psize, mode);
-  /* This type of pipe is not interruptible so set the appropriate flag. */
-  if (!res)
-    {
-      cygheap_fdnew fdin;
-      cygheap_fdnew fdout (fdin, false);
-      fhs[0]->set_r_no_interrupt (1);
-      fdin = fhs[0];
-      fdout = fhs[1];
-      filedes[0] = fdin;
-      filedes[1] = fdout;
-    }
-
-  return res;
-}
diff --git a/winsup/cygwin/poll.cc b/winsup/cygwin/poll.cc
deleted file mode 100644
index 8f9bda911..000000000
--- a/winsup/cygwin/poll.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-/* poll.cc. Implements poll(2) via usage of select(2) call.
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#define  __INSIDE_CYGWIN_NET__
-
-#define FD_SETSIZE 16384		// lots of fds
-#include "winsup.h"
-#include <sys/time.h>
-#include <sys/poll.h>
-#include <sys/socket.h>
-#include <stdlib.h>
-#define USE_SYS_TYPES_FD_SET
-#include <winsock2.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-#include "sigproc.h"
-
-extern "C" int
-poll (struct pollfd *fds, unsigned int nfds, int timeout)
-{
-  int max_fd = 0;
-  fd_set *read_fds, *write_fds, *except_fds;
-  struct timeval tv = { timeout / 1000, (timeout % 1000) * 1000 };
-
-  for (unsigned int i = 0; i < nfds; ++i)
-    if (fds[i].fd > max_fd)
-      max_fd = fds[i].fd;
-
-  size_t fds_size = howmany (max_fd + 1, NFDBITS) * sizeof (fd_mask);
-
-  read_fds = (fd_set *) alloca (fds_size);
-  write_fds = (fd_set *) alloca (fds_size);
-  except_fds = (fd_set *) alloca (fds_size);
-
-  if (!read_fds || !write_fds || !except_fds)
-    {
-      set_errno (ENOMEM);
-      return -1;
-    }
-
-  memset (read_fds, 0, fds_size);
-  memset (write_fds, 0, fds_size);
-  memset (except_fds, 0, fds_size);
-
-  int invalid_fds = 0;
-  for (unsigned int i = 0; i < nfds; ++i)
-    {
-      fds[i].revents = 0;
-      if (!cygheap->fdtab.not_open (fds[i].fd))
-	{
-	  if (fds[i].events & POLLIN)
-	    FD_SET(fds[i].fd, read_fds);
-	  if (fds[i].events & POLLOUT)
-	    FD_SET(fds[i].fd, write_fds);
-	  if (fds[i].events & POLLPRI)
-	    FD_SET(fds[i].fd, except_fds);
-	}
-      else if (fds[i].fd >= 0)
-	{
-	  ++invalid_fds;
-	  fds[i].revents = POLLNVAL;
-	}
-    }
-
-  if (invalid_fds)
-    return invalid_fds;
-
-  int ret = cygwin_select (max_fd + 1, read_fds, write_fds, except_fds, timeout < 0 ? NULL : &tv);
-
-  if (ret > 0)
-    for (unsigned int i = 0; i < nfds; ++i)
-      {
-	if (fds[i].fd >= 0)
-	  {
-	    if (cygheap->fdtab.not_open (fds[i].fd))
-	      fds[i].revents = POLLHUP;
-	    else
-	      {
-		if (FD_ISSET(fds[i].fd, read_fds))
-		  {
-		    char peek[1];
-		    fhandler_socket *sock =
-				      cygheap->fdtab[fds[i].fd]->is_socket ();
-		    if (!sock)
-		      fds[i].revents |= POLLIN;
-		    else
-		      {
-			/* The following action can change errno.  We have to
-			   reset it to it's old value. */
-			int old_errno = get_errno ();
-			switch (sock->recvfrom (peek, sizeof (peek), MSG_PEEK,
-						NULL, NULL))
-			  {
-			    case -1: /* Something weird happened */
-			      /* When select returns that data is available,
-			         that could mean that the socket is in
-				 listen mode and a client tries to connect.
-				 Unfortunately, recvfrom() doesn't make much
-				 sense then.  It returns WSAENOTCONN in that
-				 case.  Since that's not actually an error,
-				 we must not set POLLERR but POLLIN. */
-			      if (WSAGetLastError () != WSAENOTCONN)
-				fds[i].revents |= POLLERR;
-			      else
-				fds[i].revents |= POLLIN;
-			      break;
-			    case 0:  /* Closed on the read side. */
-			      fds[i].revents |= POLLHUP;
-			      break;
-			    default:
-			      fds[i].revents |= POLLIN;
-			      break;
-			  }
-			set_errno (old_errno);
-		      }
-		  }
-		if (FD_ISSET(fds[i].fd, write_fds))
-		  fds[i].revents |= POLLOUT;
-		if (FD_ISSET(fds[i].fd, except_fds))
-		  fds[i].revents |= POLLPRI;
-	      }
-	  }
-      }
-
-  return ret;
-}
diff --git a/winsup/cygwin/posix.sgml b/winsup/cygwin/posix.sgml
deleted file mode 100644
index 80e9c6e97..000000000
--- a/winsup/cygwin/posix.sgml
+++ /dev/null
@@ -1,98 +0,0 @@
-<sect1 id="std-posix">
-<title>Compatibility with POSIX.1</title>
-
-<para>The following functions are compatible with POSIX.1:</para>
-
-<sect2><title>Process Primitives (Section 3) </title><para>
-
-fork, execl, execle, execlp, execv, execve, execvp, wait, waitpid,
-_exit, kill, sigemptyset, sigfillset, sigaddset, sigdelset,
-sigismember, sigaction, pthread_sigmask, sigprocmask, sigpending,
-sigsuspend, alarm, pause, sleep, pthread_kill, pthread_sigmask
-
-</para></sect2>
-<sect2><title>Process Environment (Section 4) </title><para>
-
-getpid, getppid, getuid, geteuid, getgid, getegid, setuid, setgid,
-getgroups, getlogin, getpgrp, setsid, setpgid, uname, time, times,
-getenv, ctermid, ttyname, isatty, sysconf
-
-</para></sect2>
-<sect2><title>Files and Directories (Section 5) </title><para>
-
-opendir, readdir, rewinddir, closedir, chdir, getcwd, open, creat,
-umask, link, mkdir, unlink, rmdir, rename, stat, fstat, access, chmod,
-fchmod, chown, utime, ftruncate, pathconf, fpathconf
-
-</para></sect2>
-<sect2><title>Input and Output Primitives (Section 6) </title><para>
-
-pipe, dup, dup2, close, read, write, fcntl, lseek, fsync
-
-</para></sect2>
-<sect2><title>Device- and Class-Specific Functions (Section 7) </title><para>
-
-cfgetispeed, cfgetospeed, cfsetispeed, cfsetospeed, tcdrain, tcflow,
-tcflush, tcgetattr, tcgetpgrp, tcsendbreak, tcsetattr, tcsetpgrp
-
-</para></sect2>
-<sect2><title>Language-Specific Services for the C Programming Language (Section 8) </title><para>
-
-abort, exit, fclose, fdopen, fflush, fgetc, fgets, fileno, fopen,
-fprintf, fputc, fputs, fread, freopen, fscanf, fseek, ftell, fwrite,
-getc, getchar, gets, perror, printf, putc, putchar, puts, remove,
-rewind, scanf, setlocale, siglongjmp, sigsetjmp, tmpfile, tmpnam,
-tzset
-
-</para></sect2>
-<sect2><title>System Databases (Section 9) </title><para>
-
-getgrgid, getgrnam, getpwnam, getpwuid
-
-</para></sect2>
-<sect2><title>Synchronization (Section 11) </title><para>
-
-sem_init, sem_destroy, sem_wait, sem_trywait, sem_post,
-pthread_mutex_init, pthread_mutex_destroy, pthread_mutex_lock,
-pthread_mutex_trylock, pthread_mutex_unlock
-
-</para></sect2>
-<sect2><title>Memory Management (Section 12) </title><para>
-
-mmap, mprotect, msync, munmap
-
-</para></sect2>
-<sect2><title>Thread Management (Section 16) </title><para>
-
-pthread_attr_init, pthread_attr_destroy, pthread_attr_setstacksize,
-pthread_attr_getstacksize, pthread_create, pthread_exit, pthread_self,
-pthread_equal
-
-</para></sect2>
-<sect2><title>Thread-Specific Data Functions (Section 17) </title><para>
-
-pthread_key_create, pthread_setspecific, pthread_getspecific,
-pthread_key_delete
-
-</para></sect2>
-
-<sect2><title>Implementation Details</title>
-
-<para><function>setuid</function> and <function>setgid</function>
-always return ENOSYS.</para>
-
-<para><function>link</function> will copy the file if it can't
-implement a true symbolic link.  Currently, symbolic links work, if at
-all, only under Windows NT.</para>
-
-<para><function>chown</function> always returns zero.</para>
-
-<para><function>fcntl</function> doesn't support F_GETLK - it returns
--1 and sets errno to ENOSYS.</para>
-
-<para><function>lseek</function> only works properly on binary
-files.</para>
-
-</sect2>
-
-</sect1>
diff --git a/winsup/cygwin/profil.c b/winsup/cygwin/profil.c
deleted file mode 100644
index cbfffc1b2..000000000
--- a/winsup/cygwin/profil.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* profil.c -- win32 profil.c equivalent
-
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include <windows.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <math.h>
-
-#include <profil.h>
-
-#define SLEEPTIME (1000 / PROF_HZ)
-
-/* global profinfo for profil() call */
-static struct profinfo prof;
-
-/* Get the pc for thread THR */
-
-static u_long
-get_thrpc (HANDLE thr)
-{
-  CONTEXT ctx;
-  u_long pc;
-  int res;
-
-  res = SuspendThread (thr);
-  if (res == -1)
-    return (u_long) - 1;
-  ctx.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
-  pc = (u_long) - 1;
-  if (GetThreadContext (thr, &ctx))
-    pc = ctx.Eip;
-  ResumeThread (thr);
-  return pc;
-}
-
-/* Display cell of profile buffer */
-#if 0
-static void
-print_prof (struct profinfo *p)
-{
-  printf ("profthr %x\ttarget thr %x\n", p->profthr, p->targthr);
-  printf ("pc: %x - %x\n", p->lowpc, p->highpc);
-  printf ("scale: %x\n", p->scale);
-  return;
-}
-#endif
-
-/* Everytime we wake up use the main thread pc to hash into the cell in the
-   profile buffer ARG. */
-
-static DWORD CALLBACK
-profthr_func (LPVOID arg)
-{
-  struct profinfo *p = (struct profinfo *) arg;
-  u_long pc, idx;
-
-  SetThreadPriority(p->profthr, THREAD_PRIORITY_TIME_CRITICAL);
-
-  for (;;)
-    {
-      pc = (u_long) get_thrpc (p->targthr);
-      if (pc >= p->lowpc && pc < p->highpc)
-	{
-	  idx = PROFIDX (pc, p->lowpc, p->scale);
-	  p->counter[idx]++;
-	}
-#if 0
-      print_prof (p);
-#endif
-      Sleep (SLEEPTIME);
-    }
-  return 0;
-}
-
-/* Stop profiling to the profiling buffer pointed to by P. */
-
-static int
-profile_off (struct profinfo *p)
-{
-  if (p->profthr)
-    {
-      TerminateThread (p->profthr, 0);
-      CloseHandle (p->profthr);
-    }
-  if (p->targthr)
-    CloseHandle (p->targthr);
-  return 0;
-}
-
-/* Create a timer thread and pass it a pointer P to the profiling buffer. */
-
-static int
-profile_on (struct profinfo *p)
-{
-  DWORD thrid;
-
-  /* get handle for this thread */
-  if (!DuplicateHandle (GetCurrentProcess (), GetCurrentThread (),
-			GetCurrentProcess (), &p->targthr, 0, FALSE,
-			DUPLICATE_SAME_ACCESS))
-    {
-      errno = ESRCH;
-      return -1;
-    }
-
-  p->profthr = CreateThread (0, 0, profthr_func, (void *) p, 0, &thrid);
-  if (!p->profthr)
-    {
-      CloseHandle (p->targthr);
-      p->targthr = 0;
-      errno = EAGAIN;
-      return -1;
-    }
-  return 0;
-}
-
-/*
- * start or stop profiling
- *
- * profiling goes into the SAMPLES buffer of size SIZE (which is treated
- * as an array of u_shorts of size size/2)
- *
- * each bin represents a range of pc addresses from OFFSET.  The number
- * of pc addresses in a bin depends on SCALE.  (A scale of 65536 maps
- * each bin to two addresses, A scale of 32768 maps each bin to 4 addresses,
- * a scale of 1 maps each bin to 128k addreses).  Scale may be 1 - 65536,
- * or zero to turn off profiling
- */
-int
-profile_ctl (struct profinfo * p, char *samples, size_t size,
-	     u_long offset, u_int scale)
-{
-  u_long maxbin;
-
-  if (scale > 65536)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  profile_off (p);
-  if (scale)
-    {
-      memset (samples, 0, size);
-      memset (p, 0, sizeof *p);
-      maxbin = size >> 1;
-      prof.counter = (u_short *) samples;
-      prof.lowpc = offset;
-      prof.highpc = PROFADDR (maxbin, offset, scale);
-      prof.scale = scale;
-
-      return profile_on (p);
-    }
-  return 0;
-}
-
-/* Equivalent to unix profil()
-   Every SLEEPTIME interval, the user's program counter (PC) is examined:
-   offset is subtracted and the result is multiplied by scale.
-   The word pointed to by this address is incremented.  Buf is unused. */
-
-int
-profil (char *samples, size_t size, u_long offset, u_int scale)
-{
-  return profile_ctl (&prof, samples, size, offset, scale);
-}
-
diff --git a/winsup/cygwin/profil.h b/winsup/cygwin/profil.h
deleted file mode 100644
index 7ec4dfa09..000000000
--- a/winsup/cygwin/profil.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* profil.h: gprof profiling header file
-
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* profiling frequency.  (No larger than 1000) */
-#define PROF_HZ			100
-
-/* convert an addr to an index */
-#define PROFIDX(pc, base, scale)	\
-  ({									\
-    size_t i = (pc - base) / 2;				\
-    if (sizeof (unsigned long long int) > sizeof (size_t))		\
-      i = (unsigned long long int) i * scale / 65536;			\
-    else								\
-      i = i / 65536 * scale + i % 65536 * scale / 65536;		\
-    i;									\
-  })
-
-/* convert an index into an address */
-#define PROFADDR(idx, base, scale)	\
-	((base) + ((((unsigned long long)(idx) << 16) / (scale)) << 1))
-
-/* convert a bin size into a scale */
-#define PROFSCALE(range, bins)		(((bins) << 16) / ((range) >> 1))
-
-typedef void *_WINHANDLE;
-
-struct profinfo {
-    _WINHANDLE targthr;			/* thread to profile */
-    _WINHANDLE profthr;			/* profiling thread */
-    u_short *counter;			/* profiling counters */
-    u_long lowpc, highpc;		/* range to be profiled */
-    u_int scale;			/* scale value of bins */
-};
-
-int profile_ctl(struct profinfo *, char *, size_t, u_long, u_int);
-int profil(char *, size_t, u_long, u_int);
-
diff --git a/winsup/cygwin/pseudo-reloc.cc b/winsup/cygwin/pseudo-reloc.cc
deleted file mode 100644
index 5760a69ad..000000000
--- a/winsup/cygwin/pseudo-reloc.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/* pseudo-reloc.c
-
-   Written by Egor Duda <deo@logos-m.ru>
-   THIS SOFTWARE IS NOT COPYRIGHTED
-
-   This source code is offered for use in the public domain. You may
-   use, modify or distribute it freely.
-
-   This code is distributed in the hope that it will be useful but
-   WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
-   DISCLAMED. This includes but is not limited to warrenties of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#include <windows.h>
-
-extern char __RUNTIME_PSEUDO_RELOC_LIST__;
-extern char __RUNTIME_PSEUDO_RELOC_LIST_END__;
-extern char _image_base__;
-
-typedef struct
-  {
-    DWORD addend;
-    DWORD target;
-  }
-runtime_pseudo_reloc;
-
-void
-do_pseudo_reloc (void* start, void* end, void* base)
-{
-  DWORD reloc_target;
-  runtime_pseudo_reloc* r;
-  for (r = (runtime_pseudo_reloc*) start; r < (runtime_pseudo_reloc*) end; r++)
-    {
-      reloc_target = (DWORD) base + r->target;
-      *((DWORD*) reloc_target) += r->addend;
-    }
-}
-
-void
-_pei386_runtime_relocator ()
-{
-  do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,
-		   &__RUNTIME_PSEUDO_RELOC_LIST_END__,
-		   &_image_base__);
-}
diff --git a/winsup/cygwin/pthread.cc b/winsup/cygwin/pthread.cc
deleted file mode 100644
index 78c7f46ec..000000000
--- a/winsup/cygwin/pthread.cc
+++ /dev/null
@@ -1,241 +0,0 @@
-/* pthread.cc: posix pthread interface for Cygwin
-
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Originally written by Marco Fuykschot <marco@ddi.nl>
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include "winsup.h"
-#include "thread.h"
-#include "cygerrno.h"
-#include <stdarg.h>
-#include <sys/fcntl.h>
-
-extern "C"
-{
-/*  ThreadCreation */
-int
-pthread_create (pthread_t * thread, const pthread_attr_t * attr,
-		void *(*start_routine) (void *), void *arg)
-{
-  return pthread::create (thread, attr, start_routine, arg);
-}
-
-int
-pthread_once (pthread_once_t * once_control, void (*init_routine) (void))
-{
-  return pthread::once (once_control, init_routine);
-}
-
-int
-pthread_atfork (void (*prepare)(void), void (*parent)(void), void (*child)(void))
-{
-  return pthread::atfork (prepare, parent, child);
-}
-
-/* Thread Exit */
-void
-pthread_exit (void *value_ptr)
-{
-  return pthread::self ()->exit (value_ptr);
-}
-
-int
-pthread_join (pthread_t thread, void **return_val)
-{
-  return pthread::join (&thread, (void **) return_val);
-}
-
-int
-pthread_detach (pthread_t thread)
-{
-  return pthread::detach (&thread);
-}
-
-
-/* This isn't a posix call... should we keep it? */
-int
-pthread_suspend (pthread_t thread)
-{
-  return pthread::suspend (&thread);
-}
-
-/* same */
-int
-pthread_continue (pthread_t thread)
-{
-  return pthread::resume (&thread);
-}
-
-unsigned long
-pthread_getsequence_np (pthread_t * thread)
-{
-  if (!pthread::is_good_object (thread))
-    return EINVAL;
-  return (*thread)->getsequence_np ();
-}
-
-/*  ID */
-
-pthread_t pthread_self ()
-{
-  return pthread::self ();
-}
-
-/* Mutexes  */
-int
-pthread_mutex_init (pthread_mutex_t * mutex, const pthread_mutexattr_t * attr)
-{
-  return pthread_mutex::init (mutex, attr);
-}
-
-/* Synchronisation */
-int
-pthread_cond_init (pthread_cond_t * cond, const pthread_condattr_t * attr)
-{
-  return pthread_cond::init (cond, attr);
-}
-
-/* RW Locks */
-int
-pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr)
-{
-  return pthread_rwlock::init (rwlock, attr);
-}
-
-/* Cancelability */
-
-int
-pthread_cancel (pthread_t thread)
-{
-  return pthread::cancel (thread);
-}
-
-int
-pthread_setcancelstate (int state, int *oldstate)
-{
-  return pthread::self ()->setcancelstate (state, oldstate);
-}
-
-int
-pthread_setcanceltype (int type, int *oldtype)
-{
-  return pthread::self ()->setcanceltype (type, oldtype);
-}
-
-void
-pthread_testcancel (void)
-{
-  pthread::self ()->testcancel ();
-}
-
-void
-_pthread_cleanup_push (__pthread_cleanup_handler *handler)
-{
-  pthread::self ()->push_cleanup_handler (handler);
-}
-
-void
-_pthread_cleanup_pop (int execute)
-{
-  pthread::self ()->pop_cleanup_handler (execute);
-}
-
-/* Semaphores */
-int
-sem_init (sem_t * sem, int pshared, unsigned int value)
-{
-  return semaphore::init (sem, pshared, value);
-}
-
-int
-sem_destroy (sem_t * sem)
-{
-  return semaphore::destroy (sem);
-}
-
-/* Mangle semaphore name to follow windows naming rules.  Prepend "Global\"
-   if running on terminal service aware machine.  Substitute invalid backslash
-   by forward slash characters, hoping not to collide. */
-static bool
-mangle_sem_name (char *mangled, const char *name)
-{
-  if (check_null_empty_str_errno (name))
-    return false;
-  int len = strlen (name);
-  if (len > CYG_MAX_PATH
-      || (wincap.has_terminal_services () && len > CYG_MAX_PATH - 7))
-    {
-      set_errno (EINVAL);
-      return false;
-    }
-  strcpy (mangled, wincap.has_terminal_services () ? "Global\\" : "");
-  char *d = mangled + strlen (mangled);
-  const char *s = name;
-  while (*s)
-    *d++ = (*s == '\\') ? '/' : *s++;
-  *d = '\0';
-  return true;
-}
-
-sem_t *
-sem_open (const char *name, int oflag, ...)
-{
-  mode_t mode = 0;
-  unsigned int value = 0;
-  if (oflag & O_CREAT)
-    {
-      va_list ap;
-      va_start (ap, oflag);
-      mode = va_arg (ap, mode_t);
-      value = va_arg (ap, unsigned int);
-      va_end (ap);
-    }
-  char mangled_name[CYG_MAX_PATH + 1];
-  if (!mangle_sem_name (mangled_name, name))
-    return NULL;
-  return semaphore::open (mangled_name, oflag, mode, value);
-}
-
-int
-sem_close (sem_t * sem)
-{
-  return semaphore::destroy (sem);
-}
-
-int
-sem_wait (sem_t * sem)
-{
-  return semaphore::wait (sem);
-}
-
-int
-sem_trywait (sem_t * sem)
-{
-  return semaphore::trywait (sem);
-}
-
-int
-sem_timedwait (sem_t * sem, const struct timespec *abstime)
-{
-  return semaphore::timedwait (sem, abstime);
-}
-
-int
-sem_post (sem_t * sem)
-{
-  return semaphore::post (sem);
-}
-
-int
-sem_getvalue (sem_t * sem, int *sval)
-{
-  return semaphore::getvalue (sem, sval);
-}
-
-}
diff --git a/winsup/cygwin/pwdgrp.h b/winsup/cygwin/pwdgrp.h
deleted file mode 100644
index b9093d8fc..000000000
--- a/winsup/cygwin/pwdgrp.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* pwdgrp.h
-
-   Copyright 2001, 2002, 2003 Red Hat inc.
-
-   Stuff common to pwd and grp handling.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* These functions are needed to allow searching and walking through
-   the passwd and group lists */
-extern struct passwd *internal_getpwsid (cygpsid &);
-extern struct passwd *internal_getpwnam (const char *, bool = FALSE);
-extern struct passwd *internal_getpwuid (__uid32_t, bool = FALSE);
-extern struct __group32 *internal_getgrsid (cygpsid &);
-extern struct __group32 *internal_getgrgid (__gid32_t gid, bool = FALSE);
-extern struct __group32 *internal_getgrnam (const char *, bool = FALSE);
-extern struct __group32 *internal_getgrent (int);
-int internal_getgroups (int, __gid32_t *, cygpsid * = NULL);
-
-#include "sync.h"
-class pwdgrp
-{
-  unsigned pwdgrp_buf_elem_size;
-  union
-  {
-    passwd **passwd_buf;
-    __group32 **group_buf;
-    void **pwdgrp_buf;
-  };
-  void (pwdgrp::*read) ();
-  bool (pwdgrp::*parse) ();
-  int etc_ix;
-  path_conv pc;
-  char *buf, *lptr;
-  int max_lines;
-  bool initialized;
-  muto *pglock;
-
-  bool parse_passwd ();
-  bool parse_group ();
-  void read_passwd ();
-  void read_group ();
-  char *add_line (char *);
-  char *raw_ptr () const {return lptr;}
-  char *next_str (char);
-  bool next_num (unsigned long&);
-  bool next_num (unsigned int& i)
-  {
-    unsigned long x;
-    bool res = next_num (x);
-    i = (unsigned int) x;
-    return res;
-  }
-  inline bool next_num (int& i)
-  {
-    unsigned long x;
-    bool res = next_num (x);
-    i = (int) x;
-    return res;
-  }
-
-public:
-  int curr_lines;
-
-  void load (const char *);
-  inline void refresh (bool check)
-  {
-    if (!check && initialized)
-      return;
-    if (pglock->acquire () == 1 &&
-	(!initialized || (check && etc::file_changed (etc_ix))))
-	(this->*read) ();
-    pglock->release ();
-  }
-
-  pwdgrp (passwd *&pbuf);
-  pwdgrp (__group32 *&gbuf);
-};
diff --git a/winsup/cygwin/regex/COPYRIGHT b/winsup/cygwin/regex/COPYRIGHT
deleted file mode 100644
index 30c1f7a48..000000000
--- a/winsup/cygwin/regex/COPYRIGHT
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright 1992, 1993, 1994, 1997 Henry Spencer.  All rights reserved.
-This software is not subject to any license of the American Telephone
-and Telegraph Company or of the Regents of the University of California.
-
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it, subject
-to the following restrictions:
-
-1. The author is not responsible for the consequences of use of this
-   software, no matter how awful, even if they arise from flaws in it.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.  Since few users ever read sources,
-   credits must appear in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.  Since few users
-   ever read sources, credits must appear in the documentation.
-
-4. This notice may not be removed or altered.
diff --git a/winsup/cygwin/regex/cclass.h b/winsup/cygwin/regex/cclass.h
deleted file mode 100644
index 7ddb44afb..000000000
--- a/winsup/cygwin/regex/cclass.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* character-class table */
-static struct cclass {
-	const char *name;
-	const char *chars;
-	const char *multis;
-} cclasses[] = {
-	{"alnum",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789",				""},
-	{"alpha",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-						""},
-	{"blank",	" \t",		""},
-	{"cntrl",	"\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\
-	\25\26\27\30\31\32\33\34\35\36\37\177",	""},
-	{"digit",	"0123456789",	""},
-	{"graph",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-	0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
-						""},
-	{"lower",	"abcdefghijklmnopqrstuvwxyz",
-						""},
-	{"print",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-	0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ",
-						""},
-	{"punct",	"!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
-						""},
-	{"space",	"\t\n\v\f\r ",	""},
-	{"upper",	"ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-						""},
-	{"xdigit",	"0123456789ABCDEFabcdef",
-						""},
-	{NULL,		0,		""}
-};
diff --git a/winsup/cygwin/regex/cname.h b/winsup/cygwin/regex/cname.h
deleted file mode 100644
index 1000f603e..000000000
--- a/winsup/cygwin/regex/cname.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* character-name table */
-static struct cname {
-	const char *name;
-	char code;
-} cnames[] = {
-	{"NUL",	'\0'},
-	{"SOH",	'\001'},
-	{"STX",	'\002'},
-	{"ETX",	'\003'},
-	{"EOT",	'\004'},
-	{"ENQ",	'\005'},
-	{"ACK",	'\006'},
-	{"BEL",	'\007'},
-	{"alert",	'\007'},
-	{"BS",		'\010'},
-	{"backspace",	'\b'},
-	{"HT",		'\011'},
-	{"tab",		'\t'},
-	{"LF",		'\012'},
-	{"newline",	'\n'},
-	{"VT",		'\013'},
-	{"vertical-tab",	'\v'},
-	{"FF",		'\014'},
-	{"form-feed",	'\f'},
-	{"CR",		'\015'},
-	{"carriage-return",	'\r'},
-	{"SO",	'\016'},
-	{"SI",	'\017'},
-	{"DLE",	'\020'},
-	{"DC1",	'\021'},
-	{"DC2",	'\022'},
-	{"DC3",	'\023'},
-	{"DC4",	'\024'},
-	{"NAK",	'\025'},
-	{"SYN",	'\026'},
-	{"ETB",	'\027'},
-	{"CAN",	'\030'},
-	{"EM",	'\031'},
-	{"SUB",	'\032'},
-	{"ESC",	'\033'},
-	{"IS4",	'\034'},
-	{"FS",	'\034'},
-	{"IS3",	'\035'},
-	{"GS",	'\035'},
-	{"IS2",	'\036'},
-	{"RS",	'\036'},
-	{"IS1",	'\037'},
-	{"US",	'\037'},
-	{"space",		' '},
-	{"exclamation-mark",	'!'},
-	{"quotation-mark",	'"'},
-	{"number-sign",		'#'},
-	{"dollar-sign",		'$'},
-	{"percent-sign",		'%'},
-	{"ampersand",		'&'},
-	{"apostrophe",		'\''},
-	{"left-parenthesis",	'('},
-	{"right-parenthesis",	')'},
-	{"asterisk",	'*'},
-	{"plus-sign",	'+'},
-	{"comma",	','},
-	{"hyphen",	'-'},
-	{"hyphen-minus",	'-'},
-	{"period",	'.'},
-	{"full-stop",	'.'},
-	{"slash",	'/'},
-	{"solidus",	'/'},
-	{"zero",		'0'},
-	{"one",		'1'},
-	{"two",		'2'},
-	{"three",	'3'},
-	{"four",		'4'},
-	{"five",		'5'},
-	{"six",		'6'},
-	{"seven",	'7'},
-	{"eight",	'8'},
-	{"nine",		'9'},
-	{"colon",	':'},
-	{"semicolon",	';'},
-	{"less-than-sign",	'<'},
-	{"equals-sign",		'='},
-	{"greater-than-sign",	'>'},
-	{"question-mark",	'?'},
-	{"commercial-at",	'@'},
-	{"left-square-bracket",	'['},
-	{"backslash",		'\\'},
-	{"reverse-solidus",	'\\'},
-	{"right-square-bracket",	']'},
-	{"circumflex",		'^'},
-	{"circumflex-accent",	'^'},
-	{"underscore",		'_'},
-	{"low-line",		'_'},
-	{"grave-accent",		'`'},
-	{"left-brace",		'{'},
-	{"left-curly-bracket",	'{'},
-	{"vertical-line",	'|'},
-	{"right-brace",		'}'},
-	{"right-curly-bracket",	'}'},
-	{"tilde",		'~'},
-	{"DEL",	'\177'},
-	{NULL,	0}
-};
diff --git a/winsup/cygwin/regex/engine.c b/winsup/cygwin/regex/engine.c
deleted file mode 100644
index 0b88dcf1e..000000000
--- a/winsup/cygwin/regex/engine.c
+++ /dev/null
@@ -1,1019 +0,0 @@
-/*
- * The matching engine and friends.  This file is #included by regexec.c
- * after suitable #defines of a variety of macros used herein, so that
- * different state representations can be used without duplicating masses
- * of code.
- */
-
-#ifdef SNAMES
-#define	matcher	smatcher
-#define	fast	sfast
-#define	slow	sslow
-#define	dissect	sdissect
-#define	backref	sbackref
-#define	step	sstep
-#define	print	sprint
-#define	at	sat
-#define	match	smat
-#endif
-#ifdef LNAMES
-#define	matcher	lmatcher
-#define	fast	lfast
-#define	slow	lslow
-#define	dissect	ldissect
-#define	backref	lbackref
-#define	step	lstep
-#define	print	lprint
-#define	at	lat
-#define	match	lmat
-#endif
-
-/* another structure passed up and down to avoid zillions of parameters */
-struct match {
-	struct re_guts *g;
-	int eflags;
-	regmatch_t *pmatch;	/* [nsub+1] (0 element unused) */
-	char *offp;		/* offsets work from here */
-	char *beginp;		/* start of string -- virtual NUL precedes */
-	char *endp;		/* end of string -- virtual NUL here */
-	char *coldp;		/* can be no match starting before here */
-	char **lastpos;		/* [nplus+1] */
-	STATEVARS;
-	states st;		/* current states */
-	states fresh;		/* states for a fresh start */
-	states tmp;		/* temporary */
-	states empty;		/* empty set of states */
-};
-
-#include "engine.ih"
-
-#ifdef REDEBUG
-#define	SP(t, s, c)	print(m, t, s, c, stdout)
-#define	AT(t, p1, p2, s1, s2)	at(m, t, p1, p2, s1, s2)
-#define	NOTE(str)	{ if (m->eflags&REG_TRACE) printf("=%s\n", (str)); }
-#else
-#define	SP(t, s, c)	/* nothing */
-#define	AT(t, p1, p2, s1, s2)	/* nothing */
-#define	NOTE(s)	/* nothing */
-#endif
-
-/*
- - matcher - the actual matching engine
- == static int matcher(register struct re_guts *g, char *string, \
- ==	size_t nmatch, regmatch_t pmatch[], int eflags);
- */
-static int			/* 0 success, REG_NOMATCH failure */
-matcher(g, string, nmatch, pmatch, eflags)
-register struct re_guts *g;
-char *string;
-size_t nmatch;
-regmatch_t pmatch[];
-int eflags;
-{
-	register char *endp;
-	register size_t i;
-	struct match mv;
-	register struct match *m = &mv;
-	register char *dp;
-	const register sopno gf = g->firststate+1;	/* +1 for OEND */
-	const register sopno gl = g->laststate;
-	char *start;
-	char *stop;
-
-	/* simplify the situation where possible */
-	if (g->cflags&REG_NOSUB)
-		nmatch = 0;
-	if (eflags&REG_STARTEND) {
-		start = string + pmatch[0].rm_so;
-		stop = string + pmatch[0].rm_eo;
-	} else {
-		start = string;
-		stop = start + strlen(start);
-	}
-	if (stop < start)
-		return(REG_INVARG);
-
-	/* prescreening; this does wonders for this rather slow code */
-	if (g->must != NULL) {
-		for (dp = start; dp < stop; dp++)
-			if (*dp == g->must[0] && stop - dp >= g->mlen &&
-				memcmp(dp, g->must, (size_t)g->mlen) == 0)
-				break;
-		if (dp == stop)		/* we didn't find g->must */
-			return(REG_NOMATCH);
-	}
-
-	/* match struct setup */
-	m->g = g;
-	m->eflags = eflags;
-	m->pmatch = NULL;
-	m->lastpos = NULL;
-	m->offp = string;
-	m->beginp = start;
-	m->endp = stop;
-	STATESETUP(m, 4);
-	SETUP(m->st);
-	SETUP(m->fresh);
-	SETUP(m->tmp);
-	SETUP(m->empty);
-	CLEAR(m->empty);
-
-	/* this loop does only one repetition except for backrefs */
-	for (;;) {
-		endp = fast(m, start, stop, gf, gl);
-		if (endp == NULL) {		/* a miss */
-			STATETEARDOWN(m);
-			return(REG_NOMATCH);
-		}
-		if (nmatch == 0 && !g->backrefs)
-			break;		/* no further info needed */
-
-		/* where? */
-		assert(m->coldp != NULL);
-		for (;;) {
-			NOTE("finding start");
-			endp = slow(m, m->coldp, stop, gf, gl);
-			if (endp != NULL)
-				break;
-			assert(m->coldp < m->endp);
-			m->coldp++;
-		}
-		if (nmatch == 1 && !g->backrefs)
-			break;		/* no further info needed */
-
-		/* oh my, he wants the subexpressions... */
-		if (m->pmatch == NULL)
-			m->pmatch = (regmatch_t *)malloc((m->g->nsub + 1) *
-							sizeof(regmatch_t));
-		if (m->pmatch == NULL) {
-			STATETEARDOWN(m);
-			return(REG_ESPACE);
-		}
-		for (i = 1; i <= m->g->nsub; i++)
-			m->pmatch[i].rm_so = m->pmatch[i].rm_eo = -1;
-		if (!g->backrefs && !(m->eflags&REG_BACKR)) {
-			NOTE("dissecting");
-			dp = dissect(m, m->coldp, endp, gf, gl);
-		} else {
-			if (g->nplus > 0 && m->lastpos == NULL)
-				m->lastpos = (char **)malloc((g->nplus+1) *
-							sizeof(char *));
-			if (g->nplus > 0 && m->lastpos == NULL) {
-				free(m->pmatch);
-				STATETEARDOWN(m);
-				return(REG_ESPACE);
-			}
-			NOTE("backref dissect");
-			dp = backref(m, m->coldp, endp, gf, gl, (sopno)0);
-		}
-		if (dp != NULL)
-			break;
-
-		/* uh-oh... we couldn't find a subexpression-level match */
-		assert(g->backrefs);	/* must be back references doing it */
-		assert(g->nplus == 0 || m->lastpos != NULL);
-		for (;;) {
-			if (dp != NULL || endp <= m->coldp)
-				break;		/* defeat */
-			NOTE("backoff");
-			endp = slow(m, m->coldp, endp-1, gf, gl);
-			if (endp == NULL)
-				break;		/* defeat */
-			/* try it on a shorter possibility */
-#ifndef NDEBUG
-			for (i = 1; i <= m->g->nsub; i++) {
-				assert(m->pmatch[i].rm_so == -1);
-				assert(m->pmatch[i].rm_eo == -1);
-			}
-#endif
-			NOTE("backoff dissect");
-			dp = backref(m, m->coldp, endp, gf, gl, (sopno)0);
-		}
-		assert(dp == NULL || dp == endp);
-		if (dp != NULL)		/* found a shorter one */
-			break;
-
-		/* despite initial appearances, there is no match here */
-		NOTE("false alarm");
-		start = m->coldp + 1;	/* recycle starting later */
-		assert(start <= stop);
-	}
-
-	/* fill in the details if requested */
-	if (nmatch > 0) {
-		pmatch[0].rm_so = m->coldp - m->offp;
-		pmatch[0].rm_eo = endp - m->offp;
-	}
-	if (nmatch > 1) {
-		assert(m->pmatch != NULL);
-		for (i = 1; i < nmatch; i++)
-			if (i <= m->g->nsub)
-				pmatch[i] = m->pmatch[i];
-			else {
-				pmatch[i].rm_so = -1;
-				pmatch[i].rm_eo = -1;
-			}
-	}
-
-	if (m->pmatch != NULL)
-		free((char *)m->pmatch);
-	if (m->lastpos != NULL)
-		free((char *)m->lastpos);
-	STATETEARDOWN(m);
-	return(0);
-}
-
-/*
- - dissect - figure out what matched what, no back references
- == static char *dissect(register struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst);
- */
-static char *			/* == stop (success) always */
-dissect(m, start, stop, startst, stopst)
-register struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	register int i;
-	register sopno ss;	/* start sop of current subRE */
-	register sopno es;	/* end sop of current subRE */
-	register char *sp;	/* start of string matched by it */
-	register char *stp;	/* string matched by it cannot pass here */
-	register char *rest;	/* start of rest of string */
-	register char *tail;	/* string unmatched by rest of RE */
-	register sopno ssub;	/* start sop of subsubRE */
-	register sopno esub;	/* end sop of subsubRE */
-	register char *ssp;	/* start of string matched by subsubRE */
-	register char *sep;	/* end of string matched by subsubRE */
-	register char *oldssp;	/* previous ssp */
-	register char *dp;
-
-	AT("diss", start, stop, startst, stopst);
-	sp = start;
-	for (ss = startst; ss < stopst; ss = es) {
-		/* identify end of subRE */
-		es = ss;
-		switch (OP(m->g->strip[es])) {
-		case OPLUS_:
-		case OQUEST_:
-			es += OPND(m->g->strip[es]);
-			break;
-		case OCH_:
-			while (OP(m->g->strip[es]) != O_CH)
-				es += OPND(m->g->strip[es]);
-			break;
-		}
-		es++;
-
-		/* figure out what it matched */
-		switch (OP(m->g->strip[ss])) {
-		case OEND:
-			assert(nope);
-			break;
-		case OCHAR:
-			sp++;
-			break;
-		case OBOL:
-		case OEOL:
-		case OBOW:
-		case OEOW:
-			break;
-		case OANY:
-		case OANYOF:
-			sp++;
-			break;
-		case OBACK_:
-		case O_BACK:
-			assert(nope);
-			break;
-		/* cases where length of match is hard to find */
-		case OQUEST_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = es - 1;
-			/* did innards match? */
-			if (slow(m, sp, rest, ssub, esub) != NULL) {
-				dp = dissect(m, sp, rest, ssub, esub);
-				assert(dp == rest);
-			} else		/* no */
-				assert(sp == rest);
-			sp = rest;
-			break;
-		case OPLUS_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = es - 1;
-			ssp = sp;
-			oldssp = ssp;
-			for (;;) {	/* find last match of innards */
-				sep = slow(m, ssp, rest, ssub, esub);
-				if (sep == NULL || sep == ssp)
-					break;	/* failed or matched null */
-				oldssp = ssp;	/* on to next try */
-				ssp = sep;
-			}
-			if (sep == NULL) {
-				/* last successful match */
-				sep = ssp;
-				ssp = oldssp;
-			}
-			assert(sep == rest);	/* must exhaust substring */
-			assert(slow(m, ssp, sep, ssub, esub) == rest);
-			dp = dissect(m, ssp, sep, ssub, esub);
-			assert(dp == sep);
-			sp = rest;
-			break;
-		case OCH_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = ss + OPND(m->g->strip[ss]) - 1;
-			assert(OP(m->g->strip[esub]) == OOR1);
-			for (;;) {	/* find first matching branch */
-				if (slow(m, sp, rest, ssub, esub) == rest)
-					break;	/* it matched all of it */
-				/* that one missed, try next one */
-				assert(OP(m->g->strip[esub]) == OOR1);
-				esub++;
-				assert(OP(m->g->strip[esub]) == OOR2);
-				ssub = esub + 1;
-				esub += OPND(m->g->strip[esub]);
-				if (OP(m->g->strip[esub]) == OOR2)
-					esub--;
-				else
-					assert(OP(m->g->strip[esub]) == O_CH);
-			}
-			dp = dissect(m, sp, rest, ssub, esub);
-			assert(dp == rest);
-			sp = rest;
-			break;
-		case O_PLUS:
-		case O_QUEST:
-		case OOR1:
-		case OOR2:
-		case O_CH:
-			assert(nope);
-			break;
-		case OLPAREN:
-			i = OPND(m->g->strip[ss]);
-			assert(0 < i && i <= m->g->nsub);
-			m->pmatch[i].rm_so = sp - m->offp;
-			break;
-		case ORPAREN:
-			i = OPND(m->g->strip[ss]);
-			assert(0 < i && i <= m->g->nsub);
-			m->pmatch[i].rm_eo = sp - m->offp;
-			break;
-		default:		/* uh oh */
-			assert(nope);
-			break;
-		}
-	}
-
-	assert(sp == stop);
-	return(sp);
-}
-
-/*
- - backref - figure out what matched what, figuring in back references
- == static char *backref(register struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst, sopno lev);
- */
-static char *			/* == stop (success) or NULL (failure) */
-backref(m, start, stop, startst, stopst, lev)
-register struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-sopno lev;			/* PLUS nesting level */
-{
-	register int i;
-	register sopno ss;	/* start sop of current subRE */
-	register char *sp;	/* start of string matched by it */
-	register sopno ssub;	/* start sop of subsubRE */
-	register sopno esub;	/* end sop of subsubRE */
-	register char *ssp;	/* start of string matched by subsubRE */
-	register char *dp;
-	register size_t len;
-	register int hard;
-	register sop s;
-	register regoff_t offsave;
-	register cset *cs;
-
-	AT("back", start, stop, startst, stopst);
-	sp = start;
-
-	/* get as far as we can with easy stuff */
-	hard = 0;
-	for (ss = startst; !hard && ss < stopst; ss++)
-		switch (OP(s = m->g->strip[ss])) {
-		case OCHAR:
-			if (sp == stop || *sp++ != (char)OPND(s))
-				return(NULL);
-			break;
-		case OANY:
-			if (sp == stop)
-				return(NULL);
-			sp++;
-			break;
-		case OANYOF:
-			cs = &m->g->sets[OPND(s)];
-			if (sp == stop || !CHIN(cs, *sp++))
-				return(NULL);
-			break;
-		case OBOL:
-			if ( (sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
-					(sp < m->endp && *(sp-1) == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OEOL:
-			if ( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
-					(sp < m->endp && *sp == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OBOW:
-			if (( (sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
-					(sp < m->endp && *(sp-1) == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) ||
-					(sp > m->beginp &&
-							!ISWORD(*(sp-1))) ) &&
-					(sp < m->endp && ISWORD(*sp)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OEOW:
-			if (( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
-					(sp < m->endp && *sp == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) ||
-					(sp < m->endp && !ISWORD(*sp)) ) &&
-					(sp > m->beginp && ISWORD(*(sp-1))) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case O_QUEST:
-			break;
-		case OOR1:	/* matches null but needs to skip */
-			ss++;
-			s = m->g->strip[ss];
-			do {
-				assert(OP(s) == OOR2);
-				ss += OPND(s);
-			} while (OP(s = m->g->strip[ss]) != O_CH);
-			/* note that the ss++ gets us past the O_CH */
-			break;
-		default:	/* have to make a choice */
-			hard = 1;
-			break;
-		}
-	if (!hard) {		/* that was it! */
-		if (sp != stop)
-			return(NULL);
-		return(sp);
-	}
-	ss--;			/* adjust for the for's final increment */
-
-	/* the hard stuff */
-	AT("hard", sp, stop, ss, stopst);
-	s = m->g->strip[ss];
-	switch (OP(s)) {
-	case OBACK_:		/* the vilest depths */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		if (m->pmatch[i].rm_eo == -1)
-			return(NULL);
-		assert(m->pmatch[i].rm_so != -1);
-		len = m->pmatch[i].rm_eo - m->pmatch[i].rm_so;
-		assert(stop - m->beginp >= len);
-		if (sp > stop - len)
-			return(NULL);	/* not enough left to match */
-		ssp = m->offp + m->pmatch[i].rm_so;
-		if (memcmp(sp, ssp, len) != 0)
-			return(NULL);
-		while (m->g->strip[ss] != SOP(O_BACK, i))
-			ss++;
-		return(backref(m, sp+len, stop, ss+1, stopst, lev));
-		break;
-	case OQUEST_:		/* to null or not */
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);	/* not */
-		return(backref(m, sp, stop, ss+OPND(s)+1, stopst, lev));
-		break;
-	case OPLUS_:
-		assert(m->lastpos != NULL);
-		assert(lev+1 <= m->g->nplus);
-		m->lastpos[lev+1] = sp;
-		return(backref(m, sp, stop, ss+1, stopst, lev+1));
-		break;
-	case O_PLUS:
-		if (sp == m->lastpos[lev])	/* last pass matched null */
-			return(backref(m, sp, stop, ss+1, stopst, lev-1));
-		/* try another pass */
-		m->lastpos[lev] = sp;
-		dp = backref(m, sp, stop, ss-OPND(s)+1, stopst, lev);
-		if (dp == NULL)
-			return(backref(m, sp, stop, ss+1, stopst, lev-1));
-		else
-			return(dp);
-		break;
-	case OCH_:		/* find the right one, if any */
-		ssub = ss + 1;
-		esub = ss + OPND(s) - 1;
-		assert(OP(m->g->strip[esub]) == OOR1);
-		for (;;) {	/* find first matching branch */
-			dp = backref(m, sp, stop, ssub, esub, lev);
-			if (dp != NULL)
-				return(dp);
-			/* that one missed, try next one */
-			if (OP(m->g->strip[esub]) == O_CH)
-				return(NULL);	/* there is none */
-			esub++;
-			assert(OP(m->g->strip[esub]) == OOR2);
-			ssub = esub + 1;
-			esub += OPND(m->g->strip[esub]);
-			if (OP(m->g->strip[esub]) == OOR2)
-				esub--;
-			else
-				assert(OP(m->g->strip[esub]) == O_CH);
-		}
-		break;
-	case OLPAREN:		/* must undo assignment if rest fails */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		offsave = m->pmatch[i].rm_so;
-		m->pmatch[i].rm_so = sp - m->offp;
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);
-		m->pmatch[i].rm_so = offsave;
-		return(NULL);
-		break;
-	case ORPAREN:		/* must undo assignment if rest fails */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		offsave = m->pmatch[i].rm_eo;
-		m->pmatch[i].rm_eo = sp - m->offp;
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);
-		m->pmatch[i].rm_eo = offsave;
-		return(NULL);
-		break;
-	default:		/* uh oh */
-		assert(nope);
-		break;
-	}
-
-	/* "can't happen" */
-	assert(nope);
-	/* NOTREACHED */
-	return((char *)NULL);	/* dummy */
-}
-
-/*
- - fast - step through the string at top speed
- == static char *fast(register struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst);
- */
-static char *			/* where tentative match ended, or NULL */
-fast(m, start, stop, startst, stopst)
-register struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	register states st = m->st;
-	register states fresh = m->fresh;
-	register states tmp = m->tmp;
-	register char *p = start;
-	register int c = (start == m->beginp) ? OUT : *(start-1);
-	register int lastc;	/* previous c */
-	register int flagch;
-	register int i;
-	register char *coldp;	/* last p after which no match was underway */
-
-	CLEAR(st);
-	SET1(st, startst);
-	st = step(m->g, startst, stopst, st, NOTHING, st);
-	ASSIGN(fresh, st);
-	SP("start", st, *p);
-	coldp = NULL;
-	for (;;) {
-		/* next character */
-		lastc = c;
-		c = (p == m->endp) ? OUT : *p;
-		if (EQ(st, fresh))
-			coldp = p;
-
-		/* is there an EOL and/or BOL between lastc and c? */
-		flagch = '\0';
-		i = 0;
-		if ( (lastc == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(lastc == OUT && !(m->eflags&REG_NOTBOL)) ) {
-			flagch = BOL;
-			i = m->g->nbol;
-		}
-		if ( (c == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(c == OUT && !(m->eflags&REG_NOTEOL)) ) {
-			flagch = (flagch == BOL) ? BOLEOL : EOL;
-			i += m->g->neol;
-		}
-		if (i != 0) {
-			for (; i > 0; i--)
-				st = step(m->g, startst, stopst, st, flagch, st);
-			SP("boleol", st, c);
-		}
-
-		/* how about a word boundary? */
-		if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
-					(c != OUT && ISWORD(c)) ) {
-			flagch = BOW;
-		}
-		if ( (lastc != OUT && ISWORD(lastc)) &&
-				(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
-			flagch = EOW;
-		}
-		if (flagch == BOW || flagch == EOW) {
-			st = step(m->g, startst, stopst, st, flagch, st);
-			SP("boweow", st, c);
-		}
-
-		/* are we done? */
-		if (ISSET(st, stopst) || p == stop)
-			break;		/* NOTE BREAK OUT */
-
-		/* no, we must deal with this character */
-		ASSIGN(tmp, st);
-		ASSIGN(st, fresh);
-		assert(c != OUT);
-		st = step(m->g, startst, stopst, tmp, c, st);
-		SP("aft", st, c);
-		assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
-		p++;
-	}
-
-	assert(coldp != NULL);
-	m->coldp = coldp;
-	if (ISSET(st, stopst))
-		return(p+1);
-	else
-		return(NULL);
-}
-
-/*
- - slow - step through the string more deliberately
- == static char *slow(register struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst);
- */
-static char *			/* where it ended */
-slow(m, start, stop, startst, stopst)
-register struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	register states st = m->st;
-	register states empty = m->empty;
-	register states tmp = m->tmp;
-	register char *p = start;
-	register int c = (start == m->beginp) ? OUT : *(start-1);
-	register int lastc;	/* previous c */
-	register int flagch;
-	register int i;
-	register char *matchp;	/* last p at which a match ended */
-
-	AT("slow", start, stop, startst, stopst);
-	CLEAR(st);
-	SET1(st, startst);
-	SP("sstart", st, *p);
-	st = step(m->g, startst, stopst, st, NOTHING, st);
-	matchp = NULL;
-	for (;;) {
-		/* next character */
-		lastc = c;
-		c = (p == m->endp) ? OUT : *p;
-
-		/* is there an EOL and/or BOL between lastc and c? */
-		flagch = '\0';
-		i = 0;
-		if ( (lastc == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(lastc == OUT && !(m->eflags&REG_NOTBOL)) ) {
-			flagch = BOL;
-			i = m->g->nbol;
-		}
-		if ( (c == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(c == OUT && !(m->eflags&REG_NOTEOL)) ) {
-			flagch = (flagch == BOL) ? BOLEOL : EOL;
-			i += m->g->neol;
-		}
-		if (i != 0) {
-			for (; i > 0; i--)
-				st = step(m->g, startst, stopst, st, flagch, st);
-			SP("sboleol", st, c);
-		}
-
-		/* how about a word boundary? */
-		if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
-					(c != OUT && ISWORD(c)) ) {
-			flagch = BOW;
-		}
-		if ( (lastc != OUT && ISWORD(lastc)) &&
-				(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
-			flagch = EOW;
-		}
-		if (flagch == BOW || flagch == EOW) {
-			st = step(m->g, startst, stopst, st, flagch, st);
-			SP("sboweow", st, c);
-		}
-
-		/* are we done? */
-		if (ISSET(st, stopst))
-			matchp = p;
-		if (EQ(st, empty) || p == stop)
-			break;		/* NOTE BREAK OUT */
-
-		/* no, we must deal with this character */
-		ASSIGN(tmp, st);
-		ASSIGN(st, empty);
-		assert(c != OUT);
-		st = step(m->g, startst, stopst, tmp, c, st);
-		SP("saft", st, c);
-		assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
-		p++;
-	}
-
-	return(matchp);
-}
-
-
-/*
- - step - map set of states reachable before char to set reachable after
- == static states step(register struct re_guts *g, sopno start, sopno stop, \
- ==	register states bef, int ch, register states aft);
- == #define	BOL	(OUT+1)
- == #define	EOL	(BOL+1)
- == #define	BOLEOL	(BOL+2)
- == #define	NOTHING	(BOL+3)
- == #define	BOW	(BOL+4)
- == #define	EOW	(BOL+5)
- == #define	CODEMAX	(BOL+5)		// highest code used
- == #define	NONCHAR(c)	((c) > CHAR_MAX)
- == #define	NNONCHAR	(CODEMAX-CHAR_MAX)
- */
-static states
-step(g, start, stop, bef, ch, aft)
-register struct re_guts *g;
-sopno start;			/* start state within strip */
-sopno stop;			/* state after stop state within strip */
-register states bef;		/* states reachable before */
-int ch;				/* character or NONCHAR code */
-register states aft;		/* states already known reachable after */
-{
-	register cset *cs;
-	register sop s;
-	register sopno pc;
-	register onestate here;		/* note, macros know this name */
-	register sopno look;
-	register long i;
-
-	for (pc = start, INIT(here, pc); pc != stop; pc++, INC(here)) {
-		s = g->strip[pc];
-		switch (OP(s)) {
-		case OEND:
-			assert(pc == stop-1);
-			break;
-		case OCHAR:
-			/* only characters can match */
-			assert(!NONCHAR(ch) || ch != (char)OPND(s));
-			if (ch == (char)OPND(s))
-				FWD(aft, bef, 1);
-			break;
-		case OBOL:
-			if (ch == BOL || ch == BOLEOL)
-				FWD(aft, bef, 1);
-			break;
-		case OEOL:
-			if (ch == EOL || ch == BOLEOL)
-				FWD(aft, bef, 1);
-			break;
-		case OBOW:
-			if (ch == BOW)
-				FWD(aft, bef, 1);
-			break;
-		case OEOW:
-			if (ch == EOW)
-				FWD(aft, bef, 1);
-			break;
-		case OANY:
-			if (!NONCHAR(ch))
-				FWD(aft, bef, 1);
-			break;
-		case OANYOF:
-			cs = &g->sets[OPND(s)];
-			if (!NONCHAR(ch) && CHIN(cs, ch))
-				FWD(aft, bef, 1);
-			break;
-		case OBACK_:		/* ignored here */
-		case O_BACK:
-			FWD(aft, aft, 1);
-			break;
-		case OPLUS_:		/* forward, this is just an empty */
-			FWD(aft, aft, 1);
-			break;
-		case O_PLUS:		/* both forward and back */
-			FWD(aft, aft, 1);
-			i = ISSETBACK(aft, OPND(s));
-			BACK(aft, aft, OPND(s));
-			if (!i && ISSETBACK(aft, OPND(s))) {
-				/* oho, must reconsider loop body */
-				pc -= OPND(s) + 1;
-				INIT(here, pc);
-			}
-			break;
-		case OQUEST_:		/* two branches, both forward */
-			FWD(aft, aft, 1);
-			FWD(aft, aft, OPND(s));
-			break;
-		case O_QUEST:		/* just an empty */
-			FWD(aft, aft, 1);
-			break;
-		case OLPAREN:		/* not significant here */
-		case ORPAREN:
-			FWD(aft, aft, 1);
-			break;
-		case OCH_:		/* mark the first two branches */
-			FWD(aft, aft, 1);
-			assert(OP(g->strip[pc+OPND(s)]) == OOR2);
-			FWD(aft, aft, OPND(s));
-			break;
-		case OOR1:		/* done a branch, find the O_CH */
-			if (ISSTATEIN(aft, here)) {
-				for (look = 1;
-						OP(s = g->strip[pc+look]) != O_CH;
-						look += OPND(s))
-					assert(OP(s) == OOR2);
-				FWD(aft, aft, look);
-			}
-			break;
-		case OOR2:		/* propagate OCH_'s marking */
-			FWD(aft, aft, 1);
-			if (OP(g->strip[pc+OPND(s)]) != O_CH) {
-				assert(OP(g->strip[pc+OPND(s)]) == OOR2);
-				FWD(aft, aft, OPND(s));
-			}
-			break;
-		case O_CH:		/* just empty */
-			FWD(aft, aft, 1);
-			break;
-		default:		/* ooooops... */
-			assert(nope);
-			break;
-		}
-	}
-
-	return(aft);
-}
-
-#ifdef REDEBUG
-/*
- - print - print a set of states
- == #ifdef REDEBUG
- == static void print(struct match *m, char *caption, states st, \
- ==	int ch, FILE *d);
- == #endif
- */
-static void
-print(m, caption, st, ch, d)
-struct match *m;
-char *caption;
-states st;
-int ch;
-FILE *d;
-{
-	register struct re_guts *g = m->g;
-	register int i;
-	register int first = 1;
-
-	if (!(m->eflags&REG_TRACE))
-		return;
-
-	fprintf(d, "%s", caption);
-	if (ch != '\0')
-		fprintf(d, " %s", pchar(ch));
-	for (i = 0; i < g->nstates; i++)
-		if (ISSET(st, i)) {
-			fprintf(d, "%s%d", (first) ? "\t" : ", ", i);
-			first = 0;
-		}
-	fprintf(d, "\n");
-}
-
-/* 
- - at - print current situation
- == #ifdef REDEBUG
- == static void at(struct match *m, char *title, char *start, char *stop, \
- ==						sopno startst, sopno stopst);
- == #endif
- */
-static void
-at(m, title, start, stop, startst, stopst)
-struct match *m;
-char *title;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	if (!(m->eflags&REG_TRACE))
-		return;
-
-	printf("%s %s-", title, pchar(*start));
-	printf("%s ", pchar(*stop));
-	printf("%ld-%ld\n", (long)startst, (long)stopst);
-}
-
-#ifndef PCHARDONE
-#define	PCHARDONE	/* never again */
-/*
- - pchar - make a character printable
- == #ifdef REDEBUG
- == static char *pchar(int ch);
- == #endif
- *
- * Is this identical to regchar() over in debug.c?  Well, yes.  But a
- * duplicate here avoids having a debugging-capable regexec.o tied to
- * a matching debug.o, and this is convenient.  It all disappears in
- * the non-debug compilation anyway, so it doesn't matter much.
- */
-static char *			/* -> representation */
-pchar(ch)
-int ch;
-{
-	static char pbuf[10];
-
-	if (isprint(ch) || ch == ' ')
-		sprintf(pbuf, "%c", ch);
-	else
-		sprintf(pbuf, "\\%o", ch);
-	return(pbuf);
-}
-#endif
-#endif
-
-#undef	matcher
-#undef	fast
-#undef	slow
-#undef	dissect
-#undef	backref
-#undef	step
-#undef	print
-#undef	at
-#undef	match
diff --git a/winsup/cygwin/regex/engine.ih b/winsup/cygwin/regex/engine.ih
deleted file mode 100644
index cc98334e7..000000000
--- a/winsup/cygwin/regex/engine.ih
+++ /dev/null
@@ -1,35 +0,0 @@
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === engine.c === */
-static int matcher(register struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
-static char *dissect(register struct match *m, char *start, char *stop, sopno startst, sopno stopst);
-static char *backref(register struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
-static char *fast(register struct match *m, char *start, char *stop, sopno startst, sopno stopst);
-static char *slow(register struct match *m, char *start, char *stop, sopno startst, sopno stopst);
-static states step(register struct re_guts *g, sopno start, sopno stop, register states bef, int ch, register states aft);
-#define	BOL	(OUT+1)
-#define	EOL	(BOL+1)
-#define	BOLEOL	(BOL+2)
-#define	NOTHING	(BOL+3)
-#define	BOW	(BOL+4)
-#define	EOW	(BOL+5)
-#define	CODEMAX	(BOL+5)		/* highest code used */
-#define	NONCHAR(c)	((c) > CHAR_MAX)
-#define	NNONCHAR	(CODEMAX-CHAR_MAX)
-#ifdef REDEBUG
-static void print(struct match *m, char *caption, states st, int ch, FILE *d);
-#endif
-#ifdef REDEBUG
-static void at(struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
-#endif
-#ifdef REDEBUG
-static char *pchar(int ch);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
diff --git a/winsup/cygwin/regex/mkh b/winsup/cygwin/regex/mkh
deleted file mode 100755
index 252b246c7..000000000
--- a/winsup/cygwin/regex/mkh
+++ /dev/null
@@ -1,76 +0,0 @@
-#! /bin/sh
-# mkh - pull headers out of C source
-PATH=/bin:/usr/bin ; export PATH
-
-# egrep pattern to pick out marked lines
-egrep='^ =([ 	]|$)'
-
-# Sed program to process marked lines into lines for the header file.
-# The markers have already been removed.  Two things are done here:  removal
-# of backslashed newlines, and some fudging of comments.  The first is done
-# because -o needs to have prototypes on one line to strip them down.
-# Getting comments into the output is tricky; we turn C++-style // comments
-# into /* */ comments, after altering any existing */'s to avoid trouble.
-peel='	/\\$/N
-	/\\\n[ 	]*/s///g
-	/\/\//s;\*/;* /;g
-	/\/\//s;//\(.*\);/*\1 */;'
-
-for a
-do
-	case "$a" in
-	-o)	# old (pre-function-prototype) compiler
-		# add code to comment out argument lists
-		peel="$peel
-			"'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1(/*\2*/);'
-		shift
-		;;
-	-b)	# funny Berkeley __P macro
-		peel="$peel
-			"'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1 __P((\2));'
-		shift
-		;;
-	-s)	# compiler doesn't like `static foo();'
-		# add code to get rid of the `static'
-		peel="$peel
-			"'/^static[ 	][^\/]*[a-zA-Z0-9_)](.*)/s;static.;;'
-		shift
-		;;
-	-p)	# private declarations
-		egrep='^ ==([ 	]|$)'
-		shift
-		;;
-	-i)	# wrap in #ifndef, argument is name
-		ifndef="$2"
-		shift ; shift
-		;;
-	*)	break
-		;;
-	esac
-done
-
-if test " $ifndef" != " "
-then
-	echo "#ifndef $ifndef"
-	echo "#define	$ifndef	/* never again */"
-fi
-echo "/* ========= begin header generated by $0 ========= */"
-echo '#ifdef __cplusplus'
-echo 'extern "C" {'
-echo '#endif'
-for f
-do
-	echo
-	echo "/* === $f === */"
-	egrep "$egrep" $f | sed 's/^ ==*[ 	]//;s/^ ==*$//' | sed "$peel"
-	echo
-done
-echo '#ifdef __cplusplus'
-echo '}'
-echo '#endif'
-echo "/* ========= end header generated by $0 ========= */"
-if test " $ifndef" != " "
-then
-	echo "#endif"
-fi
-exit 0
diff --git a/winsup/cygwin/regex/regcomp.c b/winsup/cygwin/regex/regcomp.c
deleted file mode 100644
index 580c70328..000000000
--- a/winsup/cygwin/regex/regcomp.c
+++ /dev/null
@@ -1,1546 +0,0 @@
-#include "winsup.h"
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdlib.h>
-#include "regex.h"
-
-#include "utils.h"
-#include "regex2.h"
-
-#include "cclass.h"
-#include "cname.h"
-
-/*
- * parse structure, passed up and down to avoid global variables and
- * other clumsinesses
- */
-struct parse {
-	char *next;		/* next character in RE */
-	char *end;		/* end of string (-> NUL normally) */
-	int error;		/* has an error been seen? */
-	sop *strip;		/* malloced strip */
-	sopno ssize;		/* malloced strip size (allocated) */
-	sopno slen;		/* malloced strip length (used) */
-	int ncsalloc;		/* number of csets allocated */
-	struct re_guts *g;
-#	define	NPAREN	10	/* we need to remember () 1-9 for back refs */
-	sopno pbegin[NPAREN];	/* -> ( ([0] unused) */
-	sopno pend[NPAREN];	/* -> ) ([0] unused) */
-};
-
-#include "regcomp.ih"
-
-static char nuls[10];		/* place to point scanner in event of error */
-
-/*
- * macros for use with parse structure
- * BEWARE:  these know that the parse structure is named `p' !!!
- */
-#define	PEEK()	(*p->next)
-#define	PEEK2()	(*(p->next+1))
-#define	MORE()	(p->next < p->end)
-#define	MORE2()	(p->next+1 < p->end)
-#define	SEE(c)	(MORE() && PEEK() == (c))
-#define	SEETWO(a, b)	(MORE() && MORE2() && PEEK() == (a) && PEEK2() == (b))
-#define	EAT(c)	((SEE(c)) ? (NEXT(), 1) : 0)
-#define	EATTWO(a, b)	((SEETWO(a, b)) ? (NEXT2(), 1) : 0)
-#define	NEXT()	(p->next++)
-#define	NEXT2()	(p->next += 2)
-#define	NEXTn(n)	(p->next += (n))
-#define	GETNEXT()	(*p->next++)
-#define	SETERROR(e)	seterr(p, (e))
-#define	REQUIRE(co, e)	(void) ((co) || SETERROR(e))
-#define	MUSTSEE(c, e)	(REQUIRE(MORE() && PEEK() == (c), e))
-#define	MUSTEAT(c, e)	(REQUIRE(MORE() && GETNEXT() == (c), e))
-#define	MUSTNOTSEE(c, e)	(REQUIRE(!MORE() || PEEK() != (c), e))
-#define	EMIT(op, sopnd)	doemit(p, (sop)(op), (size_t)(sopnd))
-#define	INSERT(op, pos)	doinsert(p, (sop)(op), HERE()-(pos)+1, pos)
-#define	AHEAD(pos)		dofwd(p, pos, HERE()-(pos))
-#define	ASTERN(sop, pos)	EMIT(sop, HERE()-pos)
-#define	HERE()		(p->slen)
-#define	THERE()		(p->slen - 1)
-#define	THERETHERE()	(p->slen - 2)
-#define	DROP(n)	(p->slen -= (n))
-
-#ifndef NDEBUG
-static int never = 0;		/* for use in asserts; shuts lint up */
-#else
-#define	never	0		/* some <assert.h>s have bugs too */
-#endif
-
-/*
- - regcomp - interface for parser and compilation
- = extern int regcomp(regex_t *, const char *, int);
- = #define	REG_BASIC	0000
- = #define	REG_EXTENDED	0001
- = #define	REG_ICASE	0002
- = #define	REG_NOSUB	0004
- = #define	REG_NEWLINE	0010
- = #define	REG_NOSPEC	0020
- = #define	REG_PEND	0040
- = #define	REG_DUMP	0200
- */
-int				/* 0 success, otherwise REG_something */
-regcomp(preg, pattern, cflags)
-regex_t *preg;
-const char *pattern;
-int cflags;
-{
-	struct parse pa;
-	register struct re_guts *g;
-	register struct parse *p = &pa;
-	register int i;
-	register size_t len;
-#ifdef REDEBUG
-#	define	GOODFLAGS(f)	(f)
-#else
-#	define	GOODFLAGS(f)	((f)&~REG_DUMP)
-#endif
-
-	cflags = GOODFLAGS(cflags);
-	if ((cflags&REG_EXTENDED) && (cflags&REG_NOSPEC))
-		return(REG_INVARG);
-
-	if (cflags&REG_PEND) {
-		if (preg->re_endp < pattern)
-			return(REG_INVARG);
-		len = preg->re_endp - pattern;
-	} else
-		len = strlen((char *)pattern);
-
-	/* do the mallocs early so failure handling is easy */
-	g = (struct re_guts *)malloc(sizeof(struct re_guts) +
-							(NC-1)*sizeof(cat_t));
-	if (g == NULL)
-		return(REG_ESPACE);
-	p->ssize = len/(size_t)2*(size_t)3 + (size_t)1;	/* ugh */
-	p->strip = (sop *)malloc(p->ssize * sizeof(sop));
-	p->slen = 0;
-	if (p->strip == NULL) {
-		free((char *)g);
-		return(REG_ESPACE);
-	}
-
-	/* set things up */
-	p->g = g;
-	p->next = (char *)pattern;	/* convenience; we do not modify it */
-	p->end = p->next + len;
-	p->error = 0;
-	p->ncsalloc = 0;
-	for (i = 0; i < NPAREN; i++) {
-		p->pbegin[i] = 0;
-		p->pend[i] = 0;
-	}
-	g->csetsize = NC;
-	g->sets = NULL;
-	g->setbits = NULL;
-	g->ncsets = 0;
-	g->cflags = cflags;
-	g->iflags = 0;
-	g->nbol = 0;
-	g->neol = 0;
-	g->must = NULL;
-	g->mlen = 0;
-	g->nsub = 0;
-	g->ncategories = 1;	/* category 0 is "everything else" */
-	g->categories = &g->catspace[-(CHAR_MIN)];
-	(void) memset((char *)g->catspace, 0, NC*sizeof(cat_t));
-	g->backrefs = 0;
-
-	/* do it */
-	EMIT(OEND, 0);
-	g->firststate = THERE();
-	if (cflags&REG_EXTENDED)
-		p_ere(p, OUT);
-	else if (cflags&REG_NOSPEC)
-		p_str(p);
-	else
-		p_bre(p, OUT, OUT);
-	EMIT(OEND, 0);
-	g->laststate = THERE();
-
-	/* tidy up loose ends and fill things in */
-	categorize(p, g);
-	stripsnug(p, g);
-	findmust(p, g);
-	g->nplus = pluscount(p, g);
-	g->magic = MAGIC2;
-	preg->re_nsub = g->nsub;
-	preg->re_g = g;
-	preg->re_magic = MAGIC1;
-#ifndef REDEBUG
-	/* not debugging, so can't rely on the assert() in regexec() */
-	if (g->iflags&BAD)
-		SETERROR(REG_ASSERT);
-#endif
-
-	/* win or lose, we're done */
-	if (p->error != 0)	/* lose */
-		regfree(preg);
-	return(p->error);
-}
-
-/*
- - p_ere - ERE parser top level, concatenation and alternation
- == static void p_ere(register struct parse *p, int stop);
- */
-static void
-p_ere(p, stop)
-register struct parse *p;
-int stop;			/* character this ERE should end at */
-{
-	register char c;
-	register sopno prevback = 0;
-	register sopno prevfwd = 0;
-	register sopno conc = 0;
-	register int first = 1;		/* is this the first alternative? */
-
-	for (;;) {
-		/* do a bunch of concatenated expressions */
-		conc = HERE();
-		while (MORE() && (c = PEEK()) != '|' && c != stop)
-			p_ere_exp(p);
-		REQUIRE(HERE() != conc, REG_EMPTY);	/* require nonempty */
-
-		if (!EAT('|'))
-			break;		/* NOTE BREAK OUT */
-
-		if (first) {
-			INSERT(OCH_, conc);	/* offset is wrong */
-			prevfwd = conc;
-			prevback = conc;
-			first = 0;
-		}
-		ASTERN(OOR1, prevback);
-		prevback = THERE();
-		AHEAD(prevfwd);			/* fix previous offset */
-		prevfwd = HERE();
-		EMIT(OOR2, 0);			/* offset is very wrong */
-	}
-
-	if (!first) {		/* tail-end fixups */
-		AHEAD(prevfwd);
-		ASTERN(O_CH, prevback);
-	}
-
-	assert(!MORE() || SEE(stop));
-}
-
-/*
- - p_ere_exp - parse one subERE, an atom possibly followed by a repetition op
- == static void p_ere_exp(register struct parse *p);
- */
-static void
-p_ere_exp(p)
-register struct parse *p;
-{
-	register char c;
-	register sopno pos;
-	register int count;
-	register int count2;
-	register sopno subno;
-	int wascaret = 0;
-
-	assert(MORE());		/* caller should have ensured this */
-	c = GETNEXT();
-
-	pos = HERE();
-	switch (c) {
-	case '(':
-		REQUIRE(MORE(), REG_EPAREN);
-		p->g->nsub++;
-		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
-		EMIT(OLPAREN, subno);
-		if (!SEE(')'))
-			p_ere(p, ')');
-		if (subno < NPAREN) {
-			p->pend[subno] = HERE();
-			assert(p->pend[subno] != 0);
-		}
-		EMIT(ORPAREN, subno);
-		MUSTEAT(')', REG_EPAREN);
-		break;
-#ifndef POSIX_MISTAKE
-	case ')':		/* happens only if no current unmatched ( */
-		/*
-		 * You may ask, why the ifndef?  Because I didn't notice
-		 * this until slightly too late for 1003.2, and none of the
-		 * other 1003.2 regular-expression reviewers noticed it at
-		 * all.  So an unmatched ) is legal POSIX, at least until
-		 * we can get it fixed.
-		 */
-		SETERROR(REG_EPAREN);
-		break;
-#endif
-	case '^':
-		EMIT(OBOL, 0);
-		p->g->iflags |= USEBOL;
-		p->g->nbol++;
-		wascaret = 1;
-		break;
-	case '$':
-		EMIT(OEOL, 0);
-		p->g->iflags |= USEEOL;
-		p->g->neol++;
-		break;
-	case '|':
-		SETERROR(REG_EMPTY);
-		break;
-	case '*':
-	case '+':
-	case '?':
-		SETERROR(REG_BADRPT);
-		break;
-	case '.':
-		if (p->g->cflags&REG_NEWLINE)
-			nonnewline(p);
-		else
-			EMIT(OANY, 0);
-		break;
-	case '[':
-		p_bracket(p);
-		break;
-	case '\\':
-		REQUIRE(MORE(), REG_EESCAPE);
-		c = GETNEXT();
-		ordinary(p, c);
-		break;
-	case '{':		/* okay as ordinary except if digit follows */
-		REQUIRE(!MORE() || !isdigit(PEEK()), REG_BADRPT);
-		/* FALLTHROUGH */
-	default:
-		ordinary(p, c);
-		break;
-	}
-
-	if (!MORE())
-		return;
-	c = PEEK();
-	/* we call { a repetition if followed by a digit */
-	if (!( c == '*' || c == '+' || c == '?' ||
-				(c == '{' && MORE2() && isdigit(PEEK2())) ))
-		return;		/* no repetition, we're done */
-	NEXT();
-
-	REQUIRE(!wascaret, REG_BADRPT);
-	switch (c) {
-	case '*':	/* implemented as +? */
-		/* this case does not require the (y|) trick, noKLUDGE */
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		INSERT(OQUEST_, pos);
-		ASTERN(O_QUEST, pos);
-		break;
-	case '+':
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		break;
-	case '?':
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, pos);		/* offset slightly wrong */
-		ASTERN(OOR1, pos);		/* this one's right */
-		AHEAD(pos);			/* fix the OCH_ */
-		EMIT(OOR2, 0);			/* offset very wrong... */
-		AHEAD(THERE());			/* ...so fix it */
-		ASTERN(O_CH, THERETHERE());
-		break;
-	case '{':
-		count = p_count(p);
-		if (EAT(',')) {
-			if (isdigit(PEEK())) {
-				count2 = p_count(p);
-				REQUIRE(count <= count2, REG_BADBR);
-			} else		/* single number with comma */
-				count2 = INFINITY;
-		} else		/* just a single number */
-			count2 = count;
-		repeat(p, pos, count, count2);
-		if (!EAT('}')) {	/* error heuristics */
-			while (MORE() && PEEK() != '}')
-				NEXT();
-			REQUIRE(MORE(), REG_EBRACE);
-			SETERROR(REG_BADBR);
-		}
-		break;
-	}
-
-	if (!MORE())
-		return;
-	c = PEEK();
-	if (!( c == '*' || c == '+' || c == '?' ||
-				(c == '{' && MORE2() && isdigit(PEEK2())) ) )
-		return;
-	SETERROR(REG_BADRPT);
-}
-
-/*
- - p_str - string (no metacharacters) "parser"
- == static void p_str(register struct parse *p);
- */
-static void
-p_str(p)
-register struct parse *p;
-{
-	REQUIRE(MORE(), REG_EMPTY);
-	while (MORE())
-		ordinary(p, GETNEXT());
-}
-
-/*
- - p_bre - BRE parser top level, anchoring and concatenation
- == static void p_bre(register struct parse *p, register int end1, \
- ==	register int end2);
- * Giving end1 as OUT essentially eliminates the end1/end2 check.
- *
- * This implementation is a bit of a kludge, in that a trailing $ is first
- * taken as an ordinary character and then revised to be an anchor.  The
- * only undesirable side effect is that '$' gets included as a character
- * category in such cases.  This is fairly harmless; not worth fixing.
- * The amount of lookahead needed to avoid this kludge is excessive.
- */
-static void
-p_bre(p, end1, end2)
-register struct parse *p;
-register int end1;		/* first terminating character */
-register int end2;		/* second terminating character */
-{
-	register sopno start = HERE();
-	register int first = 1;			/* first subexpression? */
-	register int wasdollar = 0;
-
-	if (EAT('^')) {
-		EMIT(OBOL, 0);
-		p->g->iflags |= USEBOL;
-		p->g->nbol++;
-	}
-	while (MORE() && !SEETWO(end1, end2)) {
-		wasdollar = p_simp_re(p, first);
-		first = 0;
-	}
-	if (wasdollar) {	/* oops, that was a trailing anchor */
-		DROP(1);
-		EMIT(OEOL, 0);
-		p->g->iflags |= USEEOL;
-		p->g->neol++;
-	}
-
-	REQUIRE(HERE() != start, REG_EMPTY);	/* require nonempty */
-}
-
-/*
- - p_simp_re - parse a simple RE, an atom possibly followed by a repetition
- == static int p_simp_re(register struct parse *p, int starordinary);
- */
-static int			/* was the simple RE an unbackslashed $? */
-p_simp_re(p, starordinary)
-register struct parse *p;
-int starordinary;		/* is a leading * an ordinary character? */
-{
-	register int c;
-	register int count;
-	register int count2;
-	register sopno pos;
-	register int i;
-	register sopno subno;
-#	define	BACKSL	(1<<CHAR_BIT)
-
-	pos = HERE();		/* repetion op, if any, covers from here */
-
-	assert(MORE());		/* caller should have ensured this */
-	c = GETNEXT();
-	if (c == '\\') {
-		REQUIRE(MORE(), REG_EESCAPE);
-		c = BACKSL | (unsigned char)GETNEXT();
-	}
-	switch (c) {
-	case '.':
-		if (p->g->cflags&REG_NEWLINE)
-			nonnewline(p);
-		else
-			EMIT(OANY, 0);
-		break;
-	case '[':
-		p_bracket(p);
-		break;
-	case BACKSL|'{':
-		SETERROR(REG_BADRPT);
-		break;
-	case BACKSL|'(':
-		p->g->nsub++;
-		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
-		EMIT(OLPAREN, subno);
-		/* the MORE here is an error heuristic */
-		if (MORE() && !SEETWO('\\', ')'))
-			p_bre(p, '\\', ')');
-		if (subno < NPAREN) {
-			p->pend[subno] = HERE();
-			assert(p->pend[subno] != 0);
-		}
-		EMIT(ORPAREN, subno);
-		REQUIRE(EATTWO('\\', ')'), REG_EPAREN);
-		break;
-	case BACKSL|')':	/* should not get here -- must be user */
-	case BACKSL|'}':
-		SETERROR(REG_EPAREN);
-		break;
-	case BACKSL|'1':
-	case BACKSL|'2':
-	case BACKSL|'3':
-	case BACKSL|'4':
-	case BACKSL|'5':
-	case BACKSL|'6':
-	case BACKSL|'7':
-	case BACKSL|'8':
-	case BACKSL|'9':
-		i = (c&~BACKSL) - '0';
-		assert(i < NPAREN);
-		if (p->pend[i] != 0) {
-			assert(i <= p->g->nsub);
-			EMIT(OBACK_, i);
-			assert(p->pbegin[i] != 0);
-			assert(OP(p->strip[p->pbegin[i]]) == OLPAREN);
-			assert(OP(p->strip[p->pend[i]]) == ORPAREN);
-			(void) dupl(p, p->pbegin[i]+1, p->pend[i]);
-			EMIT(O_BACK, i);
-		} else
-			SETERROR(REG_ESUBREG);
-		p->g->backrefs = 1;
-		break;
-	case '*':
-		REQUIRE(starordinary, REG_BADRPT);
-		/* FALLTHROUGH */
-	default:
-		ordinary(p, (char)c);	/* takes off BACKSL, if any */
-		break;
-	}
-
-	if (EAT('*')) {		/* implemented as +? */
-		/* this case does not require the (y|) trick, noKLUDGE */
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		INSERT(OQUEST_, pos);
-		ASTERN(O_QUEST, pos);
-	} else if (EATTWO('\\', '{')) {
-		count = p_count(p);
-		if (EAT(',')) {
-			if (MORE() && isdigit(PEEK())) {
-				count2 = p_count(p);
-				REQUIRE(count <= count2, REG_BADBR);
-			} else		/* single number with comma */
-				count2 = INFINITY;
-		} else		/* just a single number */
-			count2 = count;
-		repeat(p, pos, count, count2);
-		if (!EATTWO('\\', '}')) {	/* error heuristics */
-			while (MORE() && !SEETWO('\\', '}'))
-				NEXT();
-			REQUIRE(MORE(), REG_EBRACE);
-			SETERROR(REG_BADBR);
-		}
-	} else if (c == (unsigned char)'$')	/* $ (but not \$) ends it */
-		return(1);
-
-	return(0);
-}
-
-/*
- - p_count - parse a repetition count
- == static int p_count(register struct parse *p);
- */
-static int			/* the value */
-p_count(p)
-register struct parse *p;
-{
-	register int count = 0;
-	register int ndigits = 0;
-
-	while (MORE() && isdigit(PEEK()) && count <= DUPMAX) {
-		count = count*10 + (GETNEXT() - '0');
-		ndigits++;
-	}
-
-	REQUIRE(ndigits > 0 && count <= DUPMAX, REG_BADBR);
-	return(count);
-}
-
-/*
- - p_bracket - parse a bracketed character list
- == static void p_bracket(register struct parse *p);
- *
- * Note a significant property of this code:  if the allocset() did SETERROR,
- * no set operations are done.
- */
-static void
-p_bracket(p)
-register struct parse *p;
-{
-	register cset *cs = allocset(p);
-	register int invert = 0;
-
-	/* Dept of Truly Sickening Special-Case Kludges */
-	if (p->next + 5 < p->end && strncmp(p->next, "[:<:]]", 6) == 0) {
-		EMIT(OBOW, 0);
-		NEXTn(6);
-		return;
-	}
-	if (p->next + 5 < p->end && strncmp(p->next, "[:>:]]", 6) == 0) {
-		EMIT(OEOW, 0);
-		NEXTn(6);
-		return;
-	}
-
-	if (EAT('^'))
-		invert++;	/* make note to invert set at end */
-	if (EAT(']'))
-		CHadd(cs, ']');
-	else if (EAT('-'))
-		CHadd(cs, '-');
-	while (MORE() && PEEK() != ']' && !SEETWO('-', ']'))
-		p_b_term(p, cs);
-	if (EAT('-'))
-		CHadd(cs, '-');
-	MUSTEAT(']', REG_EBRACK);
-
-	if (p->error != 0)	/* don't mess things up further */
-		return;
-
-	if (p->g->cflags&REG_ICASE) {
-		register int i;
-		register int ci;
-
-		for (i = p->g->csetsize - 1; i >= 0; i--)
-			if (CHIN(cs, i) && isalpha(i)) {
-				ci = othercase(i);
-				if (ci != i)
-					CHadd(cs, ci);
-			}
-		if (cs->multis != NULL)
-			mccase(p, cs);
-	}
-	if (invert) {
-		register int i;
-
-		for (i = p->g->csetsize - 1; i >= 0; i--)
-			if (CHIN(cs, i))
-				CHsub(cs, i);
-			else
-				CHadd(cs, i);
-		if (p->g->cflags&REG_NEWLINE)
-			CHsub(cs, '\n');
-		if (cs->multis != NULL)
-			mcinvert(p, cs);
-	}
-
-	assert(cs->multis == NULL);		/* xxx */
-
-	if (nch(p, cs) == 1) {		/* optimize singleton sets */
-		ordinary(p, firstch(p, cs));
-		freeset(p, cs);
-	} else
-		EMIT(OANYOF, freezeset(p, cs));
-}
-
-/*
- - p_b_term - parse one term of a bracketed character list
- == static void p_b_term(register struct parse *p, register cset *cs);
- */
-static void
-p_b_term(p, cs)
-register struct parse *p;
-register cset *cs;
-{
-	register char c;
-	register char start, finish;
-	register int i;
-
-	/* classify what we've got */
-	switch ((MORE()) ? PEEK() : '\0') {
-	case '[':
-		c = (MORE2()) ? PEEK2() : '\0';
-		break;
-	case '-':
-		SETERROR(REG_ERANGE);
-		return;			/* NOTE RETURN */
-		break;
-	default:
-		c = '\0';
-		break;
-	}
-
-	switch (c) {
-	case ':':		/* character class */
-		NEXT2();
-		REQUIRE(MORE(), REG_EBRACK);
-		c = PEEK();
-		REQUIRE(c != '-' && c != ']', REG_ECTYPE);
-		p_b_cclass(p, cs);
-		REQUIRE(MORE(), REG_EBRACK);
-		REQUIRE(EATTWO(':', ']'), REG_ECTYPE);
-		break;
-	case '=':		/* equivalence class */
-		NEXT2();
-		REQUIRE(MORE(), REG_EBRACK);
-		c = PEEK();
-		REQUIRE(c != '-' && c != ']', REG_ECOLLATE);
-		p_b_eclass(p, cs);
-		REQUIRE(MORE(), REG_EBRACK);
-		REQUIRE(EATTWO('=', ']'), REG_ECOLLATE);
-		break;
-	default:		/* symbol, ordinary character, or range */
-/* xxx revision needed for multichar stuff */
-		start = p_b_symbol(p);
-		if (SEE('-') && MORE2() && PEEK2() != ']') {
-			/* range */
-			NEXT();
-			if (EAT('-'))
-				finish = '-';
-			else
-				finish = p_b_symbol(p);
-		} else
-			finish = start;
-/* xxx what about signed chars here... */
-		REQUIRE(start <= finish, REG_ERANGE);
-		for (i = start; i <= finish; i++)
-			CHadd(cs, i);
-		break;
-	}
-}
-
-/*
- - p_b_cclass - parse a character-class name and deal with it
- == static void p_b_cclass(register struct parse *p, register cset *cs);
- */
-static void
-p_b_cclass(p, cs)
-register struct parse *p;
-register cset *cs;
-{
-	register char *sp = p->next;
-	register struct cclass *cp;
-	register size_t len;
-	register const char *u;
-	register char c;
-
-	while (MORE() && isalpha(PEEK()))
-		NEXT();
-	len = p->next - sp;
-	for (cp = cclasses; cp->name != NULL; cp++)
-		if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
-			break;
-	if (cp->name == NULL) {
-		/* oops, didn't find it */
-		SETERROR(REG_ECTYPE);
-		return;
-	}
-
-	u = cp->chars;
-	while ((c = *u++) != '\0')
-		CHadd(cs, c);
-	for (u = cp->multis; *u != '\0'; u += strlen(u) + 1)
-		MCadd(p, cs, u);
-}
-
-/*
- - p_b_eclass - parse an equivalence-class name and deal with it
- == static void p_b_eclass(register struct parse *p, register cset *cs);
- *
- * This implementation is incomplete. xxx
- */
-static void
-p_b_eclass(p, cs)
-register struct parse *p;
-register cset *cs;
-{
-	register char c;
-
-	c = p_b_coll_elem(p, '=');
-	CHadd(cs, c);
-}
-
-/*
- - p_b_symbol - parse a character or [..]ed multicharacter collating symbol
- == static char p_b_symbol(register struct parse *p);
- */
-static char			/* value of symbol */
-p_b_symbol(p)
-register struct parse *p;
-{
-	register char value;
-
-	REQUIRE(MORE(), REG_EBRACK);
-	if (!EATTWO('[', '.'))
-		return(GETNEXT());
-
-	/* collating symbol */
-	value = p_b_coll_elem(p, '.');
-	REQUIRE(EATTWO('.', ']'), REG_ECOLLATE);
-	return(value);
-}
-
-/*
- - p_b_coll_elem - parse a collating-element name and look it up
- == static char p_b_coll_elem(register struct parse *p, int endc);
- */
-static char			/* value of collating element */
-p_b_coll_elem(p, endc)
-register struct parse *p;
-int endc;			/* name ended by endc,']' */
-{
-	register char *sp = p->next;
-	register struct cname *cp;
-	register int len;
-
-	while (MORE() && !SEETWO(endc, ']'))
-		NEXT();
-	if (!MORE()) {
-		SETERROR(REG_EBRACK);
-		return(0);
-	}
-	len = p->next - sp;
-	for (cp = cnames; cp->name != NULL; cp++)
-		if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
-			return(cp->code);	/* known name */
-	if (len == 1)
-		return(*sp);	/* single character */
-	SETERROR(REG_ECOLLATE);			/* neither */
-	return(0);
-}
-
-/*
- - othercase - return the case counterpart of an alphabetic
- == static char othercase(int ch);
- */
-static char			/* if no counterpart, return ch */
-othercase(ch)
-int ch;
-{
-	assert(isalpha(ch));
-	if (isupper(ch))
-		return(tolower(ch));
-	else if (islower(ch))
-		return(toupper(ch));
-	else			/* peculiar, but could happen */
-		return(ch);
-}
-
-/*
- - bothcases - emit a dualcase version of a two-case character
- == static void bothcases(register struct parse *p, int ch);
- *
- * Boy, is this implementation ever a kludge...
- */
-static void
-bothcases(p, ch)
-register struct parse *p;
-int ch;
-{
-	register char *oldnext = p->next;
-	register char *oldend = p->end;
-	char bracket[3];
-
-	assert(othercase(ch) != ch);	/* p_bracket() would recurse */
-	p->next = bracket;
-	p->end = bracket+2;
-	bracket[0] = ch;
-	bracket[1] = ']';
-	bracket[2] = '\0';
-	p_bracket(p);
-	assert(p->next == bracket+2);
-	p->next = oldnext;
-	p->end = oldend;
-}
-
-/*
- - ordinary - emit an ordinary character
- == static void ordinary(register struct parse *p, register int ch);
- */
-static void
-ordinary(p, ch)
-register struct parse *p;
-register int ch;
-{
-	register cat_t *cap = p->g->categories;
-
-	if ((p->g->cflags&REG_ICASE) && isalpha(ch) && othercase(ch) != ch)
-		bothcases(p, ch);
-	else {
-		EMIT(OCHAR, (unsigned char)ch);
-		if (cap[ch] == 0)
-			cap[ch] = p->g->ncategories++;
-	}
-}
-
-/*
- - nonnewline - emit REG_NEWLINE version of OANY
- == static void nonnewline(register struct parse *p);
- *
- * Boy, is this implementation ever a kludge...
- */
-static void
-nonnewline(p)
-register struct parse *p;
-{
-	register char *oldnext = p->next;
-	register char *oldend = p->end;
-	char bracket[4];
-
-	p->next = bracket;
-	p->end = bracket+3;
-	bracket[0] = '^';
-	bracket[1] = '\n';
-	bracket[2] = ']';
-	bracket[3] = '\0';
-	p_bracket(p);
-	assert(p->next == bracket+3);
-	p->next = oldnext;
-	p->end = oldend;
-}
-
-/*
- - repeat - generate code for a bounded repetition, recursively if needed
- == static void repeat(register struct parse *p, sopno start, int from, int to);
- */
-static void
-repeat(p, start, from, to)
-register struct parse *p;
-sopno start;			/* operand from here to end of strip */
-int from;			/* repeated from this number */
-int to;				/* to this number of times (maybe INFINITY) */
-{
-	register sopno finish = HERE();
-#	define	N	2
-#	define	INF	3
-#	define	REP(f, t)	((f)*8 + (t))
-#	define	MAP(n)	(((n) <= 1) ? (n) : ((n) == INFINITY) ? INF : N)
-	register sopno copy;
-
-	if (p->error != 0)	/* head off possible runaway recursion */
-		return;
-
-	assert(from <= to);
-
-	switch (REP(MAP(from), MAP(to))) {
-	case REP(0, 0):			/* must be user doing this */
-		DROP(finish-start);	/* drop the operand */
-		break;
-	case REP(0, 1):			/* as x{1,1}? */
-	case REP(0, N):			/* as x{1,n}? */
-	case REP(0, INF):		/* as x{1,}? */
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, start);		/* offset is wrong... */
-		repeat(p, start+1, 1, to);
-		ASTERN(OOR1, start);
-		AHEAD(start);			/* ... fix it */
-		EMIT(OOR2, 0);
-		AHEAD(THERE());
-		ASTERN(O_CH, THERETHERE());
-		break;
-	case REP(1, 1):			/* trivial case */
-		/* done */
-		break;
-	case REP(1, N):			/* as x?x{1,n-1} */
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, start);
-		ASTERN(OOR1, start);
-		AHEAD(start);
-		EMIT(OOR2, 0);			/* offset very wrong... */
-		AHEAD(THERE());			/* ...so fix it */
-		ASTERN(O_CH, THERETHERE());
-		copy = dupl(p, start+1, finish+1);
-		assert(copy == finish+4);
-		repeat(p, copy, 1, to-1);
-		break;
-	case REP(1, INF):		/* as x+ */
-		INSERT(OPLUS_, start);
-		ASTERN(O_PLUS, start);
-		break;
-	case REP(N, N):			/* as xx{m-1,n-1} */
-		copy = dupl(p, start, finish);
-		repeat(p, copy, from-1, to-1);
-		break;
-	case REP(N, INF):		/* as xx{n-1,INF} */
-		copy = dupl(p, start, finish);
-		repeat(p, copy, from-1, to);
-		break;
-	default:			/* "can't happen" */
-		SETERROR(REG_ASSERT);	/* just in case */
-		break;
-	}
-}
-
-/*
- - seterr - set an error condition
- == static int seterr(register struct parse *p, int e);
- */
-static int			/* useless but makes type checking happy */
-seterr(p, e)
-register struct parse *p;
-int e;
-{
-	if (p->error == 0)	/* keep earliest error condition */
-		p->error = e;
-	p->next = nuls;		/* try to bring things to a halt */
-	p->end = nuls;
-	return(0);		/* make the return value well-defined */
-}
-
-/*
- - allocset - allocate a set of characters for []
- == static cset *allocset(register struct parse *p);
- */
-static cset *
-allocset(p)
-register struct parse *p;
-{
-	register int no = p->g->ncsets++;
-	register size_t nc;
-	register size_t nbytes;
-	register cset *cs;
-	register size_t css = (size_t)p->g->csetsize;
-	register int i;
-
-	if (no >= p->ncsalloc) {	/* need another column of space */
-		p->ncsalloc += CHAR_BIT;
-		nc = p->ncsalloc;
-		assert(nc % CHAR_BIT == 0);
-		nbytes = nc / CHAR_BIT * css;
-		if (p->g->sets == NULL)
-			p->g->sets = (cset *)malloc(nc * sizeof(cset));
-		else
-			p->g->sets = (cset *)realloc((char *)p->g->sets,
-							nc * sizeof(cset));
-		if (p->g->setbits == NULL)
-			p->g->setbits = (uch *)malloc(nbytes);
-		else {
-			p->g->setbits = (uch *)realloc((char *)p->g->setbits,
-								nbytes);
-			/* xxx this isn't right if setbits is now NULL */
-			for (i = 0; i < no; i++)
-				p->g->sets[i].ptr = p->g->setbits + css*(i/CHAR_BIT);
-		}
-		if (p->g->sets != NULL && p->g->setbits != NULL)
-			(void) memset((char *)p->g->setbits + (nbytes - css),
-								0, css);
-		else {
-			no = 0;
-			SETERROR(REG_ESPACE);
-			/* caller's responsibility not to do set ops */
-		}
-	}
-
-	assert(p->g->sets != NULL);	/* xxx */
-	cs = &p->g->sets[no];
-	cs->ptr = p->g->setbits + css*((no)/CHAR_BIT);
-	cs->mask = 1 << ((no) % CHAR_BIT);
-	cs->hash = 0;
-	cs->smultis = 0;
-	cs->multis = NULL;
-
-	return(cs);
-}
-
-/*
- - freeset - free a now-unused set
- == static void freeset(register struct parse *p, register cset *cs);
- */
-static void
-freeset(p, cs)
-register struct parse *p;
-register cset *cs;
-{
-	register size_t i;
-	register cset *top = &p->g->sets[p->g->ncsets];
-	register size_t css = (size_t)p->g->csetsize;
-
-	for (i = 0; i < css; i++)
-		CHsub(cs, i);
-	if (cs == top-1)	/* recover only the easy case */
-		p->g->ncsets--;
-}
-
-/*
- - freezeset - final processing on a set of characters
- == static int freezeset(register struct parse *p, register cset *cs);
- *
- * The main task here is merging identical sets.  This is usually a waste
- * of time (although the hash code minimizes the overhead), but can win
- * big if REG_ICASE is being used.  REG_ICASE, by the way, is why the hash
- * is done using addition rather than xor -- all ASCII [aA] sets xor to
- * the same value!
- */
-static int			/* set number */
-freezeset(p, cs)
-register struct parse *p;
-register cset *cs;
-{
-	register uch h = cs->hash;
-	register size_t i;
-	register cset *top = &p->g->sets[p->g->ncsets];
-	register cset *cs2;
-	register size_t css = (size_t)p->g->csetsize;
-
-	/* look for an earlier one which is the same */
-	for (cs2 = &p->g->sets[0]; cs2 < top; cs2++)
-		if (cs2->hash == h && cs2 != cs) {
-			/* maybe */
-			for (i = 0; i < css; i++)
-				if (!!CHIN(cs2, i) != !!CHIN(cs, i))
-					break;		/* no */
-			if (i == css)
-				break;			/* yes */
-		}
-
-	if (cs2 < top) {	/* found one */
-		freeset(p, cs);
-		cs = cs2;
-	}
-
-	return((int)(cs - p->g->sets));
-}
-
-/*
- - firstch - return first character in a set (which must have at least one)
- == static int firstch(register struct parse *p, register cset *cs);
- */
-static int			/* character; there is no "none" value */
-firstch(p, cs)
-register struct parse *p;
-register cset *cs;
-{
-	register size_t i;
-	register size_t css = (size_t)p->g->csetsize;
-
-	for (i = 0; i < css; i++)
-		if (CHIN(cs, i))
-			return((char)i);
-	assert(never);
-	return(0);		/* arbitrary */
-}
-
-/*
- - nch - number of characters in a set
- == static int nch(register struct parse *p, register cset *cs);
- */
-static int
-nch(p, cs)
-register struct parse *p;
-register cset *cs;
-{
-	register size_t i;
-	register size_t css = (size_t)p->g->csetsize;
-	register int n = 0;
-
-	for (i = 0; i < css; i++)
-		if (CHIN(cs, i))
-			n++;
-	return(n);
-}
-
-/*
- - mcadd - add a collating element to a cset
- == static void mcadd(register struct parse *p, register cset *cs, \
- ==	register char *cp);
- */
-static void
-mcadd(p, cs, cp)
-register struct parse *p;
-register cset *cs;
-register const char *cp;
-{
-	register size_t oldend = cs->smultis;
-
-	cs->smultis += strlen(cp) + 1;
-	if (cs->multis == NULL)
-		cs->multis = malloc(cs->smultis);
-	else
-		cs->multis = realloc(cs->multis, cs->smultis);
-	if (cs->multis == NULL) {
-		SETERROR(REG_ESPACE);
-		return;
-	}
-
-	(void) strcpy(cs->multis + oldend - 1, cp);
-	cs->multis[cs->smultis - 1] = '\0';
-}
-
-/*
- - mcinvert - invert the list of collating elements in a cset
- == static void mcinvert(register struct parse *p, register cset *cs);
- *
- * This would have to know the set of possibilities.  Implementation
- * is deferred.
- */
-static void
-mcinvert(p, cs)
-register struct parse *p;
-register cset *cs;
-{
-	assert(cs->multis == NULL);	/* xxx */
-}
-
-/*
- - mccase - add case counterparts of the list of collating elements in a cset
- == static void mccase(register struct parse *p, register cset *cs);
- *
- * This would have to know the set of possibilities.  Implementation
- * is deferred.
- */
-static void
-mccase(p, cs)
-register struct parse *p;
-register cset *cs;
-{
-	assert(cs->multis == NULL);	/* xxx */
-}
-
-/*
- - isinsets - is this character in any sets?
- == static int isinsets(register struct re_guts *g, int c);
- */
-static int			/* predicate */
-isinsets(g, c)
-register struct re_guts *g;
-int c;
-{
-	register uch *col;
-	register int i;
-	register int ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT;
-	register unsigned uc = (unsigned char)c;
-
-	for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
-		if (col[uc] != 0)
-			return(1);
-	return(0);
-}
-
-/*
- - samesets - are these two characters in exactly the same sets?
- == static int samesets(register struct re_guts *g, int c1, int c2);
- */
-static int			/* predicate */
-samesets(g, c1, c2)
-register struct re_guts *g;
-int c1;
-int c2;
-{
-	register uch *col;
-	register int i;
-	register int ncols = (g->ncsets+(CHAR_BIT-1)) / CHAR_BIT;
-	register unsigned uc1 = (unsigned char)c1;
-	register unsigned uc2 = (unsigned char)c2;
-
-	for (i = 0, col = g->setbits; i < ncols; i++, col += g->csetsize)
-		if (col[uc1] != col[uc2])
-			return(0);
-	return(1);
-}
-
-/*
- - categorize - sort out character categories
- == static void categorize(struct parse *p, register struct re_guts *g);
- */
-static void
-categorize(p, g)
-struct parse *p;
-register struct re_guts *g;
-{
-	register cat_t *cats = g->categories;
-	register int c;
-	register int c2;
-	register cat_t cat;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	for (c = CHAR_MIN; c <= CHAR_MAX; c++)
-		if (cats[c] == 0 && isinsets(g, c)) {
-			cat = g->ncategories++;
-			cats[c] = cat;
-			for (c2 = c+1; c2 <= CHAR_MAX; c2++)
-				if (cats[c2] == 0 && samesets(g, c, c2))
-					cats[c2] = cat;
-		}
-}
-
-/*
- - dupl - emit a duplicate of a bunch of sops
- == static sopno dupl(register struct parse *p, sopno start, sopno finish);
- */
-static sopno			/* start of duplicate */
-dupl(p, start, finish)
-register struct parse *p;
-sopno start;			/* from here */
-sopno finish;			/* to this less one */
-{
-	register sopno ret = HERE();
-	register sopno len = finish - start;
-
-	assert(finish >= start);
-	if (len == 0)
-		return(ret);
-	enlarge(p, p->ssize + len);	/* this many unexpected additions */
-	assert(p->ssize >= p->slen + len);
-	(void) memcpy((char *)(p->strip + p->slen),
-		(char *)(p->strip + start), (size_t)len*sizeof(sop));
-	p->slen += len;
-	return(ret);
-}
-
-/*
- - doemit - emit a strip operator
- == static void doemit(register struct parse *p, sop op, size_t opnd);
- *
- * It might seem better to implement this as a macro with a function as
- * hard-case backup, but it's just too big and messy unless there are
- * some changes to the data structures.  Maybe later.
- */
-static void
-doemit(p, op, opnd)
-register struct parse *p;
-sop op;
-size_t opnd;
-{
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	/* deal with oversize operands ("can't happen", more or less) */
-	assert(opnd < 1<<OPSHIFT);
-
-	/* deal with undersized strip */
-	if (p->slen >= p->ssize)
-		enlarge(p, (p->ssize+1) / 2 * 3);	/* +50% */
-	assert(p->slen < p->ssize);
-
-	/* finally, it's all reduced to the easy case */
-	p->strip[p->slen++] = SOP(op, opnd);
-}
-
-/*
- - doinsert - insert a sop into the strip
- == static void doinsert(register struct parse *p, sop op, size_t opnd, sopno pos);
- */
-static void
-doinsert(p, op, opnd, pos)
-register struct parse *p;
-sop op;
-size_t opnd;
-sopno pos;
-{
-	register sopno sn;
-	register sop s;
-	register int i;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	sn = HERE();
-	EMIT(op, opnd);		/* do checks, ensure space */
-	assert(HERE() == sn+1);
-	s = p->strip[sn];
-
-	/* adjust paren pointers */
-	assert(pos > 0);
-	for (i = 1; i < NPAREN; i++) {
-		if (p->pbegin[i] >= pos) {
-			p->pbegin[i]++;
-		}
-		if (p->pend[i] >= pos) {
-			p->pend[i]++;
-		}
-	}
-
-	memmove((char *)&p->strip[pos+1], (char *)&p->strip[pos],
-						(HERE()-pos-1)*sizeof(sop));
-	p->strip[pos] = s;
-}
-
-/*
- - dofwd - complete a forward reference
- == static void dofwd(register struct parse *p, sopno pos, sop value);
- */
-static void
-dofwd(p, pos, value)
-register struct parse *p;
-register sopno pos;
-sop value;
-{
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	assert(value < 1<<OPSHIFT);
-	p->strip[pos] = OP(p->strip[pos]) | value;
-}
-
-/*
- - enlarge - enlarge the strip
- == static void enlarge(register struct parse *p, sopno size);
- */
-static void
-enlarge(p, size)
-register struct parse *p;
-register sopno size;
-{
-	register sop *sp;
-
-	if (p->ssize >= size)
-		return;
-
-	sp = (sop *)realloc(p->strip, size*sizeof(sop));
-	if (sp == NULL) {
-		SETERROR(REG_ESPACE);
-		return;
-	}
-	p->strip = sp;
-	p->ssize = size;
-}
-
-/*
- - stripsnug - compact the strip
- == static void stripsnug(register struct parse *p, register struct re_guts *g);
- */
-static void
-stripsnug(p, g)
-register struct parse *p;
-register struct re_guts *g;
-{
-	g->nstates = p->slen;
-	g->strip = (sop *)realloc((char *)p->strip, p->slen * sizeof(sop));
-	if (g->strip == NULL) {
-		SETERROR(REG_ESPACE);
-		g->strip = p->strip;
-	}
-}
-
-/*
- - findmust - fill in must and mlen with longest mandatory literal string
- == static void findmust(register struct parse *p, register struct re_guts *g);
- *
- * This algorithm could do fancy things like analyzing the operands of |
- * for common subsequences.  Someday.  This code is simple and finds most
- * of the interesting cases.
- *
- * Note that must and mlen got initialized during setup.
- */
-static void
-findmust(p, g)
-struct parse *p;
-register struct re_guts *g;
-{
-	register sop *scan;
-	sop *start = NULL;
-	register sop *newstart = NULL;
-	register sopno newlen;
-	register sop s;
-	register char *cp;
-	register sopno i;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	/* find the longest OCHAR sequence in strip */
-	newlen = 0;
-	scan = g->strip + 1;
-	do {
-		s = *scan++;
-		switch (OP(s)) {
-		case OCHAR:		/* sequence member */
-			if (newlen == 0)		/* new sequence */
-				newstart = scan - 1;
-			newlen++;
-			break;
-		case OPLUS_:		/* things that don't break one */
-		case OLPAREN:
-		case ORPAREN:
-			break;
-		case OQUEST_:		/* things that must be skipped */
-		case OCH_:
-			scan--;
-			do {
-				scan += OPND(s);
-				s = *scan;
-				/* assert() interferes w debug printouts */
-				if (OP(s) != O_QUEST && OP(s) != O_CH &&
-							OP(s) != OOR2) {
-					g->iflags |= BAD;
-					return;
-				}
-			} while (OP(s) != O_QUEST && OP(s) != O_CH);
-			/* fallthrough */
-		default:		/* things that break a sequence */
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-			}
-			newlen = 0;
-			break;
-		}
-	} while (OP(s) != OEND);
-
-	if (g->mlen == 0)		/* there isn't one */
-		return;
-
-	/* turn it into a character string */
-	g->must = malloc((size_t)g->mlen + 1);
-	if (g->must == NULL) {		/* argh; just forget it */
-		g->mlen = 0;
-		return;
-	}
-	cp = g->must;
-	scan = start;
-	for (i = g->mlen; i > 0; i--) {
-		while (OP(s = *scan++) != OCHAR)
-			continue;
-		assert(cp < g->must + g->mlen);
-		*cp++ = (char)OPND(s);
-	}
-	assert(cp == g->must + g->mlen);
-	*cp++ = '\0';		/* just on general principles */
-}
-
-/*
- - pluscount - count + nesting
- == static sopno pluscount(register struct parse *p, register struct re_guts *g);
- */
-static sopno			/* nesting depth */
-pluscount(p, g)
-struct parse *p;
-register struct re_guts *g;
-{
-	register sop *scan;
-	register sop s;
-	register sopno plusnest = 0;
-	register sopno maxnest = 0;
-
-	if (p->error != 0)
-		return(0);	/* there may not be an OEND */
-
-	scan = g->strip + 1;
-	do {
-		s = *scan++;
-		switch (OP(s)) {
-		case OPLUS_:
-			plusnest++;
-			break;
-		case O_PLUS:
-			if (plusnest > maxnest)
-				maxnest = plusnest;
-			plusnest--;
-			break;
-		}
-	} while (OP(s) != OEND);
-	if (plusnest != 0)
-		g->iflags |= BAD;
-	return(maxnest);
-}
diff --git a/winsup/cygwin/regex/regcomp.ih b/winsup/cygwin/regex/regcomp.ih
deleted file mode 100644
index e16d5ab2f..000000000
--- a/winsup/cygwin/regex/regcomp.ih
+++ /dev/null
@@ -1,48 +0,0 @@
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regcomp.c === */
-static void p_ere(register struct parse *p, int stop);
-static void p_ere_exp(register struct parse *p);
-static void p_str(register struct parse *p);
-static void p_bre(register struct parse *p, register int end1, register int end2);
-static int p_simp_re(register struct parse *p, int starordinary);
-static int p_count(register struct parse *p);
-static void p_bracket(register struct parse *p);
-static void p_b_term(register struct parse *p, register cset *cs);
-static void p_b_cclass(register struct parse *p, register cset *cs);
-static void p_b_eclass(register struct parse *p, register cset *cs);
-static char p_b_symbol(register struct parse *p);
-static char p_b_coll_elem(register struct parse *p, int endc);
-static char othercase(int ch);
-static void bothcases(register struct parse *p, int ch);
-static void ordinary(register struct parse *p, register int ch);
-static void nonnewline(register struct parse *p);
-static void repeat(register struct parse *p, sopno start, int from, int to);
-static int seterr(register struct parse *p, int e);
-static cset *allocset(register struct parse *p);
-static void freeset(register struct parse *p, register cset *cs);
-static int freezeset(register struct parse *p, register cset *cs);
-static int firstch(register struct parse *p, register cset *cs);
-static int nch(register struct parse *p, register cset *cs);
-static void mcadd(register struct parse *p, register cset *cs, register const char *cp);
-static void mcinvert(register struct parse *p, register cset *cs);
-static void mccase(register struct parse *p, register cset *cs);
-static int isinsets(register struct re_guts *g, int c);
-static int samesets(register struct re_guts *g, int c1, int c2);
-static void categorize(struct parse *p, register struct re_guts *g);
-static sopno dupl(register struct parse *p, sopno start, sopno finish);
-static void doemit(register struct parse *p, sop op, size_t opnd);
-static void doinsert(register struct parse *p, sop op, size_t opnd, sopno pos);
-static void dofwd(register struct parse *p, sopno pos, sop value);
-static void enlarge(register struct parse *p, sopno size);
-static void stripsnug(register struct parse *p, register struct re_guts *g);
-static void findmust(register struct parse *p, register struct re_guts *g);
-static sopno pluscount(register struct parse *p, register struct re_guts *g);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
diff --git a/winsup/cygwin/regex/regerror.c b/winsup/cygwin/regex/regerror.c
deleted file mode 100644
index 4d14ab231..000000000
--- a/winsup/cygwin/regex/regerror.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "winsup.h"
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdlib.h>
-#include "regex.h"
-
-#include "utils.h"
-#include "regerror.ih"
-
-/*
- = #define	REG_OKAY	 0
- = #define	REG_NOMATCH	 1
- = #define	REG_BADPAT	 2
- = #define	REG_ECOLLATE	 3
- = #define	REG_ECTYPE	 4
- = #define	REG_EESCAPE	 5
- = #define	REG_ESUBREG	 6
- = #define	REG_EBRACK	 7
- = #define	REG_EPAREN	 8
- = #define	REG_EBRACE	 9
- = #define	REG_BADBR	10
- = #define	REG_ERANGE	11
- = #define	REG_ESPACE	12
- = #define	REG_BADRPT	13
- = #define	REG_EMPTY	14
- = #define	REG_ASSERT	15
- = #define	REG_INVARG	16
- = #define	REG_ATOI	255	// convert name to number (!)
- = #define	REG_ITOA	0400	// convert number to name (!)
- */
-static struct rerr {
-	int code;
-	const char *name;
-	const char *explain;
-} rerrs[] = {
-	{REG_OKAY,	"REG_OKAY",	"no errors detected"},
-	{REG_NOMATCH,	"REG_NOMATCH",	"regexec() failed to match"},
-	{REG_BADPAT,	"REG_BADPAT",	"invalid regular expression"},
-	{REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element"},
-	{REG_ECTYPE,	"REG_ECTYPE",	"invalid character class"},
-	{REG_EESCAPE,	"REG_EESCAPE",	"trailing backslash (\\)"},
-	{REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number"},
-	{REG_EBRACK,	"REG_EBRACK",	"brackets ([ ]) not balanced"},
-	{REG_EPAREN,	"REG_EPAREN",	"parentheses not balanced"},
-	{REG_EBRACE,	"REG_EBRACE",	"braces not balanced"},
-	{REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)"},
-	{REG_ERANGE,	"REG_ERANGE",	"invalid character range"},
-	{REG_ESPACE,	"REG_ESPACE",	"out of memory"},
-	{REG_BADRPT,	"REG_BADRPT",	"repetition-operator operand invalid"},
-	{REG_EMPTY,	"REG_EMPTY",	"empty (sub)expression"},
-	{REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug"},
-	{REG_INVARG,	"REG_INVARG",	"invalid argument to regex routine"},
-	{-1,		"",		"*** unknown regexp error code ***"},
-};
-
-/*
- - regerror - the interface to error numbers
- = extern size_t regerror(int, const regex_t *, char *, size_t);
- */
-/* ARGSUSED */
-size_t
-regerror(errcode, preg, errbuf, errbuf_size)
-int errcode;
-const regex_t *preg;
-char *errbuf;
-size_t errbuf_size;
-{
-	register struct rerr *r;
-	register size_t len;
-	register int target = errcode &~ REG_ITOA;
-	register const char *s;
-	char convbuf[50];
-
-	if (errcode == REG_ATOI)
-		s = regatoi(preg, convbuf);
-	else {
-		for (r = rerrs; r->code >= 0; r++)
-			if (r->code == target)
-				break;
-	
-		if (errcode&REG_ITOA) {
-			if (r->code >= 0)
-				(void) strcpy(convbuf, r->name);
-			else
-				sprintf(convbuf, "REG_0x%x", target);
-			assert(strlen(convbuf) < sizeof(convbuf));
-			s = convbuf;
-		} else
-			s = r->explain;
-	}
-
-	len = strlen(s) + 1;
-	if (errbuf_size > 0) {
-		if (errbuf_size > len)
-			(void) strcpy(errbuf, s);
-		else {
-			(void) strncpy(errbuf, s, errbuf_size-1);
-			errbuf[errbuf_size-1] = '\0';
-		}
-	}
-
-	return(len);
-}
-
-/*
- - regatoi - internal routine to implement REG_ATOI
- == static char *regatoi(const regex_t *preg, char *localbuf);
- */
-static const char *
-regatoi(preg, localbuf)
-const regex_t *preg;
-char *localbuf;
-{
-	register struct rerr *r;
-
-	for (r = rerrs; r->code >= 0; r++)
-		if (strcmp(r->name, preg->re_endp) == 0)
-			break;
-	if (r->code < 0)
-		return("0");
-
-	sprintf(localbuf, "%d", r->code);
-	return(localbuf);
-}
diff --git a/winsup/cygwin/regex/regerror.ih b/winsup/cygwin/regex/regerror.ih
deleted file mode 100644
index d428544e3..000000000
--- a/winsup/cygwin/regex/regerror.ih
+++ /dev/null
@@ -1,12 +0,0 @@
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regerror.c === */
-static const char *regatoi(const regex_t *preg, char *localbuf);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
diff --git a/winsup/cygwin/regex/regex.3 b/winsup/cygwin/regex/regex.3
deleted file mode 100644
index bc747096d..000000000
--- a/winsup/cygwin/regex/regex.3
+++ /dev/null
@@ -1,509 +0,0 @@
-.TH REGEX 3 "25 Sept 1997"
-.BY "Henry Spencer"
-.de ZR
-.\" one other place knows this name:  the SEE ALSO section
-.IR regex (7) \\$1
-..
-.SH NAME
-regcomp, regexec, regerror, regfree \- regular-expression library
-.SH SYNOPSIS
-.ft B
-.\".na
-#include <sys/types.h>
-.br
-#include <regex.h>
-.HP 10
-int regcomp(regex_t\ *preg, const\ char\ *pattern, int\ cflags);
-.HP
-int\ regexec(const\ regex_t\ *preg, const\ char\ *string,
-size_t\ nmatch, regmatch_t\ pmatch[], int\ eflags);
-.HP
-size_t\ regerror(int\ errcode, const\ regex_t\ *preg,
-char\ *errbuf, size_t\ errbuf_size);
-.HP
-void\ regfree(regex_t\ *preg);
-.\".ad
-.ft
-.SH DESCRIPTION
-These routines implement POSIX 1003.2 regular expressions (``RE''s);
-see
-.ZR .
-.I Regcomp
-compiles an RE written as a string into an internal form,
-.I regexec
-matches that internal form against a string and reports results,
-.I regerror
-transforms error codes from either into human-readable messages,
-and
-.I regfree
-frees any dynamically-allocated storage used by the internal form
-of an RE.
-.PP
-The header
-.I <regex.h>
-declares two structure types,
-.I regex_t
-and
-.IR regmatch_t ,
-the former for compiled internal forms and the latter for match reporting.
-It also declares the four functions,
-a type
-.IR regoff_t ,
-and a number of constants with names starting with ``REG_''.
-.PP
-.I Regcomp
-compiles the regular expression contained in the
-.I pattern
-string,
-subject to the flags in
-.IR cflags ,
-and places the results in the
-.I regex_t
-structure pointed to by
-.IR preg .
-.I Cflags
-is the bitwise OR of zero or more of the following flags:
-.IP REG_EXTENDED \w'REG_EXTENDED'u+2n
-Compile modern (``extended'') REs,
-rather than the obsolete (``basic'') REs that
-are the default.
-.IP REG_BASIC
-This is a synonym for 0,
-provided as a counterpart to REG_EXTENDED to improve readability.
-This is an extension,
-compatible with but not specified by POSIX 1003.2,
-and should be used with
-caution in software intended to be portable to other systems.
-.IP REG_NOSPEC
-Compile with recognition of all special characters turned off.
-All characters are thus considered ordinary,
-so the ``RE'' is a literal string.
-This is an extension,
-compatible with but not specified by POSIX 1003.2,
-and should be used with
-caution in software intended to be portable to other systems.
-REG_EXTENDED and REG_NOSPEC may not be used
-in the same call to
-.IR regcomp .
-.IP REG_ICASE
-Compile for matching that ignores upper/lower case distinctions.
-See
-.ZR .
-.IP REG_NOSUB
-Compile for matching that need only report success or failure,
-not what was matched.
-.IP REG_NEWLINE
-Compile for newline-sensitive matching.
-By default, newline is a completely ordinary character with no special
-meaning in either REs or strings.
-With this flag,
-`[^' bracket expressions and `.' never match newline,
-a `^' anchor matches the null string after any newline in the string
-in addition to its normal function,
-and the `$' anchor matches the null string before any newline in the
-string in addition to its normal function.
-.IP REG_PEND
-The regular expression ends,
-not at the first NUL,
-but just before the character pointed to by the
-.I re_endp
-member of the structure pointed to by
-.IR preg .
-The
-.I re_endp
-member is of type
-.IR const\ char\ * .
-This flag permits inclusion of NULs in the RE;
-they are considered ordinary characters.
-This is an extension,
-compatible with but not specified by POSIX 1003.2,
-and should be used with
-caution in software intended to be portable to other systems.
-.PP
-When successful,
-.I regcomp
-returns 0 and fills in the structure pointed to by
-.IR preg .
-One member of that structure
-(other than
-.IR re_endp )
-is publicized:
-.IR re_nsub ,
-of type
-.IR size_t ,
-contains the number of parenthesized subexpressions within the RE
-(except that the value of this member is undefined if the
-REG_NOSUB flag was used).
-If
-.I regcomp
-fails, it returns a non-zero error code;
-see DIAGNOSTICS.
-.PP
-.I Regexec
-matches the compiled RE pointed to by
-.I preg
-against the
-.IR string ,
-subject to the flags in
-.IR eflags ,
-and reports results using
-.IR nmatch ,
-.IR pmatch ,
-and the returned value.
-The RE must have been compiled by a previous invocation of
-.IR regcomp .
-The compiled form is not altered during execution of
-.IR regexec ,
-so a single compiled RE can be used simultaneously by multiple threads.
-.PP
-By default,
-the NUL-terminated string pointed to by
-.I string
-is considered to be the text of an entire line,
-with the NUL indicating the end of the line.
-(That is,
-any other end-of-line marker is considered to have been removed
-and replaced by the NUL.)
-The
-.I eflags
-argument is the bitwise OR of zero or more of the following flags:
-.IP REG_NOTBOL \w'REG_STARTEND'u+2n
-The first character of
-the string
-is not the beginning of a line, so the `^' anchor should not match before it.
-This does not affect the behavior of newlines under REG_NEWLINE.
-.IP REG_NOTEOL
-The NUL terminating
-the string
-does not end a line, so the `$' anchor should not match before it.
-This does not affect the behavior of newlines under REG_NEWLINE.
-.IP REG_STARTEND
-The string is considered to start at
-\fIstring\fR\ + \fIpmatch\fR[0].\fIrm_so\fR
-and to have a terminating NUL located at
-\fIstring\fR\ + \fIpmatch\fR[0].\fIrm_eo\fR
-(there need not actually be a NUL at that location),
-regardless of the value of
-.IR nmatch .
-See below for the definition of
-.IR pmatch
-and
-.IR nmatch .
-This is an extension,
-compatible with but not specified by POSIX 1003.2,
-and should be used with
-caution in software intended to be portable to other systems.
-Note that a non-zero \fIrm_so\fR does not imply REG_NOTBOL;
-REG_STARTEND affects only the location of the string,
-not how it is matched.
-.PP
-See
-.ZR
-for a discussion of what is matched in situations where an RE or a
-portion thereof could match any of several substrings of
-.IR string .
-.PP
-Normally,
-.I regexec
-returns 0 for success and the non-zero code REG_NOMATCH for failure.
-Other non-zero error codes may be returned in exceptional situations;
-see DIAGNOSTICS.
-.PP
-If REG_NOSUB was specified in the compilation of the RE,
-or if
-.I nmatch
-is 0,
-.I regexec
-ignores the
-.I pmatch
-argument (but see below for the case where REG_STARTEND is specified).
-Otherwise,
-.I pmatch
-points to an array of
-.I nmatch
-structures of type
-.IR regmatch_t .
-Such a structure has at least the members
-.I rm_so
-and
-.IR rm_eo ,
-both of type
-.I regoff_t
-(a signed arithmetic type at least as large as an
-.I off_t
-and a
-.IR ssize_t ),
-containing respectively the offset of the first character of a substring
-and the offset of the first character after the end of the substring.
-Offsets are measured from the beginning of the
-.I string
-argument given to
-.IR regexec .
-An empty substring is denoted by equal offsets,
-both indicating the character following the empty substring.
-.PP
-The 0th member of the
-.I pmatch
-array is filled in to indicate what substring of
-.I string
-was matched by the entire RE.
-Remaining members report what substring was matched by parenthesized
-subexpressions within the RE;
-member
-.I i
-reports subexpression
-.IR i ,
-with subexpressions counted (starting at 1) by the order of their opening
-parentheses in the RE, left to right.
-Unused entries in the array\(emcorresponding either to subexpressions that
-did not participate in the match at all, or to subexpressions that do not
-exist in the RE (that is, \fIi\fR\ > \fIpreg\fR\->\fIre_nsub\fR)\(emhave both
-.I rm_so
-and
-.I rm_eo
-set to \-1.
-If a subexpression participated in the match several times,
-the reported substring is the last one it matched.
-(Note, as an example in particular, that when the RE `(b*)+' matches `bbb',
-the parenthesized subexpression matches the three `b's and then
-an infinite number of empty strings following the last `b',
-so the reported substring is one of the empties.)
-.PP
-If REG_STARTEND is specified,
-.I pmatch
-must point to at least one
-.I regmatch_t
-(even if
-.I nmatch
-is 0 or REG_NOSUB was specified),
-to hold the input offsets for REG_STARTEND.
-Use for output is still entirely controlled by
-.IR nmatch ;
-if
-.I nmatch
-is 0 or REG_NOSUB was specified,
-the value of
-.IR pmatch [0]
-will not be changed by a successful
-.IR regexec .
-.PP
-.I Regerror
-maps a non-zero
-.I errcode
-from either
-.I regcomp
-or
-.I regexec
-to a human-readable, printable message.
-If
-.I preg
-is non-NULL,
-the error code should have arisen from use of
-the
-.I regex_t
-pointed to by
-.IR preg ,
-and if the error code came from
-.IR regcomp ,
-it should have been the result from the most recent
-.I regcomp
-using that
-.IR regex_t .
-.RI ( Regerror
-may be able to supply a more detailed message using information
-from the
-.IR regex_t .)
-.I Regerror
-places the NUL-terminated message into the buffer pointed to by
-.IR errbuf ,
-limiting the length (including the NUL) to at most
-.I errbuf_size
-bytes.
-If the whole message won't fit,
-as much of it as will fit before the terminating NUL is supplied.
-In any case,
-the returned value is the size of buffer needed to hold the whole
-message (including terminating NUL).
-If
-.I errbuf_size
-is 0,
-.I errbuf
-is ignored but the return value is still correct.
-.PP
-If the
-.I errcode
-given to
-.I regerror
-is first ORed with REG_ITOA,
-the ``message'' that results is the printable name of the error code,
-e.g. ``REG_NOMATCH'',
-rather than an explanation thereof.
-If
-.I errcode
-is REG_ATOI,
-then
-.I preg
-shall be non-NULL and the
-.I re_endp
-member of the structure it points to
-must point to the printable name of an error code;
-in this case, the result in
-.I errbuf
-is the decimal digits of
-the numeric value of the error code
-(0 if the name is not recognized).
-REG_ITOA and REG_ATOI are intended primarily as debugging facilities;
-they are extensions,
-compatible with but not specified by POSIX 1003.2,
-and should be used with
-caution in software intended to be portable to other systems.
-Be warned also that they are considered experimental and changes are possible.
-.PP
-.I Regfree
-frees any dynamically-allocated storage associated with the compiled RE
-pointed to by
-.IR preg .
-The remaining
-.I regex_t
-is no longer a valid compiled RE
-and the effect of supplying it to
-.I regexec
-or
-.I regerror
-is undefined.
-.PP
-None of these functions references global variables except for tables
-of constants;
-all are safe for use from multiple threads if the arguments are safe.
-.SH IMPLEMENTATION CHOICES
-There are a number of decisions that 1003.2 leaves up to the implementor,
-either by explicitly saying ``undefined'' or by virtue of them being
-forbidden by the RE grammar.
-This implementation treats them as follows.
-.PP
-See
-.ZR
-for a discussion of the definition of case-independent matching.
-.PP
-There is no particular limit on the length of REs,
-except insofar as memory is limited.
-Memory usage is approximately linear in RE size, and largely insensitive
-to RE complexity, except for bounded repetitions.
-See BUGS for one short RE using them
-that will run almost any system out of memory.
-.PP
-A backslashed character other than one specifically given a magic meaning
-by 1003.2 (such magic meanings occur only in obsolete [``basic''] REs)
-is taken as an ordinary character.
-.PP
-Any unmatched [ is a REG_EBRACK error.
-.PP
-Equivalence classes cannot begin or end bracket-expression ranges.
-The endpoint of one range cannot begin another.
-.PP
-RE_DUP_MAX, the limit on repetition counts in bounded repetitions, is 255.
-.PP
-A repetition operator (?, *, +, or bounds) cannot follow another
-repetition operator.
-A repetition operator cannot begin an expression or subexpression
-or follow `^' or `|'.
-.PP
-`|' cannot appear first or last in a (sub)expression or after another `|',
-i.e. an operand of `|' cannot be an empty subexpression.
-An empty parenthesized subexpression, `()', is legal and matches an
-empty (sub)string.
-An empty string is not a legal RE.
-.PP
-A `{' followed by a digit is considered the beginning of bounds for a
-bounded repetition, which must then follow the syntax for bounds.
-A `{' \fInot\fR followed by a digit is considered an ordinary character.
-.PP
-`^' and `$' beginning and ending subexpressions in obsolete (``basic'')
-REs are anchors, not ordinary characters.
-.SH SEE ALSO
-grep(1), regex(7)
-.PP
-POSIX 1003.2, sections 2.8 (Regular Expression Notation)
-and
-B.5 (C Binding for Regular Expression Matching).
-.SH DIAGNOSTICS
-Non-zero error codes from
-.I regcomp
-and
-.I regexec
-include the following:
-.PP
-.nf
-.ta \w'REG_ECOLLATE'u+3n
-REG_NOMATCH	regexec() failed to match
-REG_BADPAT	invalid regular expression
-REG_ECOLLATE	invalid collating element
-REG_ECTYPE	invalid character class
-REG_EESCAPE	\e applied to unescapable character
-REG_ESUBREG	invalid backreference number
-REG_EBRACK	brackets [ ] not balanced
-REG_EPAREN	parentheses ( ) not balanced
-REG_EBRACE	braces { } not balanced
-REG_BADBR	invalid repetition count(s) in { }
-REG_ERANGE	invalid character range in [ ]
-REG_ESPACE	ran out of memory
-REG_BADRPT	?, *, or + operand invalid
-REG_EMPTY	empty (sub)expression
-REG_ASSERT	``can't happen''\(emyou found a bug
-REG_INVARG	invalid argument, e.g. negative-length string
-.fi
-.SH HISTORY
-Written by Henry Spencer,
-henry@zoo.toronto.edu.
-.SH BUGS
-This is an alpha release with known defects.
-Please report problems.
-.PP
-There is one known functionality bug.
-The implementation of internationalization is incomplete:
-the locale is always assumed to be the default one of 1003.2,
-and only the collating elements etc. of that locale are available.
-.PP
-The back-reference code is subtle and doubts linger about its correctness
-in complex cases.
-.PP
-.I Regexec
-performance is poor.
-This will improve with later releases.
-.I Nmatch
-exceeding 0 is expensive;
-.I nmatch
-exceeding 1 is worse.
-.I Regexec
-is largely insensitive to RE complexity \fIexcept\fR that back
-references are massively expensive.
-RE length does matter; in particular, there is a strong speed bonus
-for keeping RE length under about 30 characters,
-with most special characters counting roughly double.
-.PP
-.I Regcomp
-implements bounded repetitions by macro expansion,
-which is costly in time and space if counts are large
-or bounded repetitions are nested.
-An RE like, say,
-`((((a{1,100}){1,100}){1,100}){1,100}){1,100}'
-will (eventually) run almost any existing machine out of swap space.
-.PP
-There are suspected problems with response to obscure error conditions.
-Notably,
-certain kinds of internal overflow,
-produced only by truly enormous REs or by multiply nested bounded repetitions,
-are probably not handled well.
-.PP
-Due to a mistake in 1003.2, things like `a)b' are legal REs because `)' is
-a special character only in the presence of a previous unmatched `('.
-This can't be fixed until the spec is fixed.
-.PP
-The standard's definition of back references is vague.
-For example, does
-`a\e(\e(b\e)*\e2\e)*d' match `abbbd'?
-Until the standard is clarified,
-behavior in such cases should not be relied on.
-.PP
-The implementation of word-boundary matching is a bit of a kludge,
-and bugs may lurk in combinations of word-boundary matching and anchoring.
diff --git a/winsup/cygwin/regex/regex.7 b/winsup/cygwin/regex/regex.7
deleted file mode 100644
index 0fa180269..000000000
--- a/winsup/cygwin/regex/regex.7
+++ /dev/null
@@ -1,235 +0,0 @@
-.TH REGEX 7 "25 Oct 1995"
-.BY "Henry Spencer"
-.SH NAME
-regex \- POSIX 1003.2 regular expressions
-.SH DESCRIPTION
-Regular expressions (``RE''s),
-as defined in POSIX 1003.2, come in two forms:
-modern REs (roughly those of
-.IR egrep ;
-1003.2 calls these ``extended'' REs)
-and obsolete REs (roughly those of
-.IR ed ;
-1003.2 ``basic'' REs).
-Obsolete REs mostly exist for backward compatibility in some old programs;
-they will be discussed at the end.
-1003.2 leaves some aspects of RE syntax and semantics open;
-`\(dg' marks decisions on these aspects that
-may not be fully portable to other 1003.2 implementations.
-.PP
-A (modern) RE is one\(dg or more non-empty\(dg \fIbranches\fR,
-separated by `|'.
-It matches anything that matches one of the branches.
-.PP
-A branch is one\(dg or more \fIpieces\fR, concatenated.
-It matches a match for the first, followed by a match for the second, etc.
-.PP
-A piece is an \fIatom\fR possibly followed
-by a single\(dg `*', `+', `?', or \fIbound\fR.
-An atom followed by `*' matches a sequence of 0 or more matches of the atom.
-An atom followed by `+' matches a sequence of 1 or more matches of the atom.
-An atom followed by `?' matches a sequence of 0 or 1 matches of the atom.
-.PP
-A \fIbound\fR is `{' followed by an unsigned decimal integer,
-possibly followed by `,'
-possibly followed by another unsigned decimal integer,
-always followed by `}'.
-The integers must lie between 0 and RE_DUP_MAX (255\(dg) inclusive,
-and if there are two of them, the first may not exceed the second.
-An atom followed by a bound containing one integer \fIi\fR
-and no comma matches
-a sequence of exactly \fIi\fR matches of the atom.
-An atom followed by a bound
-containing one integer \fIi\fR and a comma matches
-a sequence of \fIi\fR or more matches of the atom.
-An atom followed by a bound
-containing two integers \fIi\fR and \fIj\fR matches
-a sequence of \fIi\fR through \fIj\fR (inclusive) matches of the atom.
-.PP
-An atom is a regular expression enclosed in `()' (matching a match for the
-regular expression),
-an empty set of `()' (matching the null string)\(dg,
-a \fIbracket expression\fR (see below), `.'
-(matching any single character), `^' (matching the null string at the
-beginning of a line), `$' (matching the null string at the
-end of a line), a `\e' followed by one of the characters
-`^.[$()|*+?{\e'
-(matching that character taken as an ordinary character),
-a `\e' followed by any other character\(dg
-(matching that character taken as an ordinary character,
-as if the `\e' had not been present\(dg),
-or a single character with no other significance (matching that character).
-A `{' followed by a character other than a digit is an ordinary
-character, not the beginning of a bound\(dg.
-It is illegal to end an RE with `\e'.
-.PP
-A \fIbracket expression\fR is a list of characters enclosed in `[]'.
-It normally matches any single character from the list (but see below).
-If the list begins with `^',
-it matches any single character
-(but see below) \fInot\fR from the rest of the list.
-If two characters in the list are separated by `\-', this is shorthand
-for the full \fIrange\fR of characters between those two (inclusive) in the
-collating sequence,
-e.g. `[0\-9]' in ASCII matches any decimal digit.
-It is illegal\(dg for two ranges to share an
-endpoint, e.g. `a\-c\-e'.
-Ranges are very collating-sequence-dependent,
-and portable programs should avoid relying on them.
-.PP
-To include a literal `]' in the list, make it the first character
-(following a possible `^').
-To include a literal `\-', make it the first or last character,
-or the second endpoint of a range.
-To use a literal `\-' as the first endpoint of a range,
-enclose it in `[.' and `.]' to make it a collating element (see below).
-With the exception of these and some combinations using `[' (see next
-paragraphs), all other special characters, including `\e', lose their
-special significance within a bracket expression.
-.PP
-Within a bracket expression, a collating element (a character,
-a multi-character sequence that collates as if it were a single character,
-or a collating-sequence name for either)
-enclosed in `[.' and `.]' stands for the
-sequence of characters of that collating element.
-The sequence is a single element of the bracket expression's list.
-A bracket expression containing a multi-character collating element 
-can thus match more than one character,
-e.g. if the collating sequence includes a `ch' collating element,
-then the RE `[[.ch.]]*c' matches the first five characters
-of `chchcc'.
-.PP
-Within a bracket expression, a collating element enclosed in `[=' and
-`=]' is an equivalence class, standing for the sequences of characters
-of all collating elements equivalent to that one, including itself.
-(If there are no other equivalent collating elements,
-the treatment is as if the enclosing delimiters were `[.' and `.]'.)
-For example, if o and \o'o^' are the members of an equivalence class,
-then `[[=o=]]', `[[=\o'o^'=]]', and `[o\o'o^']' are all synonymous.
-An equivalence class may not\(dg be an endpoint
-of a range.
-.PP
-Within a bracket expression, the name of a \fIcharacter class\fR enclosed
-in `[:' and `:]' stands for the list of all characters belonging to that
-class.
-Standard character class names are:
-.PP
-.RS
-.nf
-.ta 3c 6c 9c
-alnum	digit	punct
-alpha	graph	space
-blank	lower	upper
-cntrl	print	xdigit
-.fi
-.RE
-.PP
-These stand for the character classes defined in
-.IR ctype (3).
-A locale may provide others.
-A character class may not be used as an endpoint of a range.
-.PP
-There are two special cases\(dg of bracket expressions:
-the bracket expressions `[[:<:]]' and `[[:>:]]' match the null string at
-the beginning and end of a word respectively.
-A word is defined as a sequence of
-word characters
-which is neither preceded nor followed by
-word characters.
-A word character is an
-.I alnum
-character (as defined by
-.IR ctype (3))
-or an underscore.
-This is an extension,
-compatible with but not specified by POSIX 1003.2,
-and should be used with
-caution in software intended to be portable to other systems.
-.PP
-In the event that an RE could match more than one substring of a given
-string,
-the RE matches the one starting earliest in the string.
-If the RE could match more than one substring starting at that point,
-it matches the longest.
-Subexpressions also match the longest possible substrings, subject to
-the constraint that the whole match be as long as possible,
-with subexpressions starting earlier in the RE taking priority over
-ones starting later.
-Note that higher-level subexpressions thus take priority over
-their lower-level component subexpressions.
-.PP
-Match lengths are measured in characters, not collating elements.
-A null string is considered longer than no match at all.
-For example,
-`bb*' matches the three middle characters of `abbbc',
-`(wee|week)(knights|nights)' matches all ten characters of `weeknights',
-when `(.*).*' is matched against `abc' the parenthesized subexpression
-matches all three characters, and
-when `(a*)*' is matched against `bc' both the whole RE and the parenthesized
-subexpression match the null string.
-.PP
-If case-independent matching is specified,
-the effect is much as if all case distinctions had vanished from the
-alphabet.
-When an alphabetic that exists in multiple cases appears as an
-ordinary character outside a bracket expression, it is effectively
-transformed into a bracket expression containing both cases,
-e.g. `x' becomes `[xX]'.
-When it appears inside a bracket expression, all case counterparts
-of it are added to the bracket expression, so that (e.g.) `[x]'
-becomes `[xX]' and `[^x]' becomes `[^xX]'.
-.PP
-No particular limit is imposed on the length of REs\(dg.
-Programs intended to be portable should not employ REs longer
-than 256 bytes,
-as an implementation can refuse to accept such REs and remain
-POSIX-compliant.
-.PP
-Obsolete (``basic'') regular expressions differ in several respects.
-`|', `+', and `?' are ordinary characters and there is no equivalent
-for their functionality.
-The delimiters for bounds are `\e{' and `\e}',
-with `{' and `}' by themselves ordinary characters.
-The parentheses for nested subexpressions are `\e(' and `\e)',
-with `(' and `)' by themselves ordinary characters.
-`^' is an ordinary character except at the beginning of the
-RE or\(dg the beginning of a parenthesized subexpression,
-`$' is an ordinary character except at the end of the
-RE or\(dg the end of a parenthesized subexpression,
-and `*' is an ordinary character if it appears at the beginning of the
-RE or the beginning of a parenthesized subexpression
-(after a possible leading `^').
-Finally, there is one new type of atom, a \fIback reference\fR:
-`\e' followed by a non-zero decimal digit \fId\fR
-matches the same sequence of characters
-matched by the \fId\fRth parenthesized subexpression
-(numbering subexpressions by the positions of their opening parentheses,
-left to right),
-so that (e.g.) `\e([bc]\e)\e1' matches `bb' or `cc' but not `bc'.
-.SH SEE ALSO
-regex(3)
-.PP
-POSIX 1003.2, section 2.8 (Regular Expression Notation).
-.SH HISTORY
-Written by Henry Spencer, based on the 1003.2 spec.
-.SH BUGS
-Having two kinds of REs is a botch.
-.PP
-The current 1003.2 spec says that `)' is an ordinary character in
-the absence of an unmatched `(';
-this was an unintentional result of a wording error,
-and change is likely.
-Avoid relying on it.
-.PP
-Back references are a dreadful botch,
-posing major problems for efficient implementations.
-They are also somewhat vaguely defined
-(does
-`a\e(\e(b\e)*\e2\e)*d' match `abbbd'?).
-Avoid using them.
-.PP
-1003.2's specification of case-independent matching is vague.
-The ``one case implies all cases'' definition given above
-is current consensus among implementors as to the right interpretation.
-.PP
-The syntax for word boundaries is incredibly ugly.
diff --git a/winsup/cygwin/regex/regex.h b/winsup/cygwin/regex/regex.h
deleted file mode 100644
index ecba140b0..000000000
--- a/winsup/cygwin/regex/regex.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef _REGEX_H_
-#define	_REGEX_H_	/* never again */
-#include <sys/types.h>
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __INSIDE_CYGWIN__
-#define regcomp posix_regcomp
-#define regerror posix_regerror
-#define regexec posix_regexec
-#define regfree posix_regfree
-#endif
-
-/* === regex2.h === */
-typedef _off_t regoff_t;
-typedef struct {
-	int re_magic;
-	size_t re_nsub;		/* number of parenthesized subexpressions */
-	const char *re_endp;	/* end pointer for REG_PEND */
-	struct re_guts *re_g;	/* none of your business :-) */
-} regex_t;
-typedef struct {
-	regoff_t rm_so;		/* start of match */
-	regoff_t rm_eo;		/* end of match */
-} regmatch_t;
-
-
-/* === regcomp.c === */
-extern int regcomp(regex_t *, const char *, int);
-#define	REG_BASIC	0000
-#define	REG_EXTENDED	0001
-#define	REG_ICASE	0002
-#define	REG_NOSUB	0004
-#define	REG_NEWLINE	0010
-#define	REG_NOSPEC	0020
-#define	REG_PEND	0040
-#define	REG_DUMP	0200
-
-
-/* === regerror.c === */
-#define	REG_OKAY	 0
-#define	REG_NOMATCH	 1
-#define	REG_BADPAT	 2
-#define	REG_ECOLLATE	 3
-#define	REG_ECTYPE	 4
-#define	REG_EESCAPE	 5
-#define	REG_ESUBREG	 6
-#define	REG_EBRACK	 7
-#define	REG_EPAREN	 8
-#define	REG_EBRACE	 9
-#define	REG_BADBR	10
-#define	REG_ERANGE	11
-#define	REG_ESPACE	12
-#define	REG_BADRPT	13
-#define	REG_EMPTY	14
-#define	REG_ASSERT	15
-#define	REG_INVARG	16
-#define	REG_ATOI	255	/* convert name to number (!) */
-#define	REG_ITOA	0400	/* convert number to name (!) */
-extern size_t regerror(int, const regex_t *, char *, size_t);
-
-
-/* === regexec.c === */
-extern int regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
-#define	REG_NOTBOL	00001
-#define	REG_NOTEOL	00002
-#define	REG_STARTEND	00004
-#define	REG_TRACE	00400	/* tracing of execution */
-#define	REG_LARGE	01000	/* force large representation */
-#define	REG_BACKR	02000	/* force use of backref code */
-
-
-/* === regfree.c === */
-extern void regfree(regex_t *);
-
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-#endif
diff --git a/winsup/cygwin/regex/regex2.h b/winsup/cygwin/regex/regex2.h
deleted file mode 100644
index 8c103fa54..000000000
--- a/winsup/cygwin/regex/regex2.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * First, the stuff that ends up in the outside-world include file
- = typedef _off_t regoff_t;
- = typedef struct {
- = 	int re_magic;
- = 	size_t re_nsub;		// number of parenthesized subexpressions
- = 	const char *re_endp;	// end pointer for REG_PEND
- = 	struct re_guts *re_g;	// none of your business :-)
- = } regex_t;
- = typedef struct {
- = 	regoff_t rm_so;		// start of match
- = 	regoff_t rm_eo;		// end of match
- = } regmatch_t;
- */
-/*
- * internals of regex_t
- */
-#define	MAGIC1	((('r'^0200)<<8) | 'e')
-
-/*
- * The internal representation is a *strip*, a sequence of
- * operators ending with an endmarker.  (Some terminology etc. is a
- * historical relic of earlier versions which used multiple strips.)
- * Certain oddities in the representation are there to permit running
- * the machinery backwards; in particular, any deviation from sequential
- * flow must be marked at both its source and its destination.  Some
- * fine points:
- *
- * - OPLUS_ and O_PLUS are *inside* the loop they create.
- * - OQUEST_ and O_QUEST are *outside* the bypass they create.
- * - OCH_ and O_CH are *outside* the multi-way branch they create, while
- *   OOR1 and OOR2 are respectively the end and the beginning of one of
- *   the branches.  Note that there is an implicit OOR2 following OCH_
- *   and an implicit OOR1 preceding O_CH.
- *
- * In state representations, an operator's bit is on to signify a state
- * immediately *preceding* "execution" of that operator.
- */
-typedef long sop;		/* strip operator */
-typedef long sopno;
-#define	OPRMASK	0x7c000000
-#define	OPDMASK	0x03ffffff
-#define	OPSHIFT	(26)
-#define	OP(n)	((n)&OPRMASK)
-#define	OPND(n)	((n)&OPDMASK)
-#define	SOP(op, opnd)	((op)|(opnd))
-/* operators			   meaning	operand			*/
-/*						(back, fwd are offsets)	*/
-#define	OEND	(1<<OPSHIFT)	/* endmarker	-			*/
-#define	OCHAR	(2<<OPSHIFT)	/* character	unsigned char		*/
-#define	OBOL	(3<<OPSHIFT)	/* left anchor	-			*/
-#define	OEOL	(4<<OPSHIFT)	/* right anchor	-			*/
-#define	OANY	(5<<OPSHIFT)	/* .		-			*/
-#define	OANYOF	(6<<OPSHIFT)	/* [...]	set number		*/
-#define	OBACK_	(7<<OPSHIFT)	/* begin \d	paren number		*/
-#define	O_BACK	(8<<OPSHIFT)	/* end \d	paren number		*/
-#define	OPLUS_	(9<<OPSHIFT)	/* + prefix	fwd to suffix		*/
-#define	O_PLUS	(10<<OPSHIFT)	/* + suffix	back to prefix		*/
-#define	OQUEST_	(11<<OPSHIFT)	/* ? prefix	fwd to suffix		*/
-#define	O_QUEST	(12<<OPSHIFT)	/* ? suffix	back to prefix		*/
-#define	OLPAREN	(13<<OPSHIFT)	/* (		fwd to )		*/
-#define	ORPAREN	(14<<OPSHIFT)	/* )		back to (		*/
-#define	OCH_	(15<<OPSHIFT)	/* begin choice	fwd to OOR2		*/
-#define	OOR1	(16<<OPSHIFT)	/* | pt. 1	back to OOR1 or OCH_	*/
-#define	OOR2	(17<<OPSHIFT)	/* | pt. 2	fwd to OOR2 or O_CH	*/
-#define	O_CH	(18<<OPSHIFT)	/* end choice	back to OOR1		*/
-#define	OBOW	(19<<OPSHIFT)	/* begin word	-			*/
-#define	OEOW	(20<<OPSHIFT)	/* end word	-			*/
-
-/*
- * Structure for [] character-set representation.  Character sets are
- * done as bit vectors, grouped 8 to a byte vector for compactness.
- * The individual set therefore has both a pointer to the byte vector
- * and a mask to pick out the relevant bit of each byte.  A hash code
- * simplifies testing whether two sets could be identical.
- *
- * This will get trickier for multicharacter collating elements.  As
- * preliminary hooks for dealing with such things, we also carry along
- * a string of multi-character elements, and decide the size of the
- * vectors at run time.
- */
-typedef struct {
-	uch *ptr;		/* -> uch [csetsize] */
-	uch mask;		/* bit within array */
-	uch hash;		/* hash code */
-	size_t smultis;
-	char *multis;		/* -> char[smulti]  ab\0cd\0ef\0\0 */
-} cset;
-/* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */
-#define	CHadd(cs, c)	((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (c))
-#define	CHsub(cs, c)	((cs)->ptr[(uch)(c)] &= ~(cs)->mask, (cs)->hash -= (c))
-#define	CHIN(cs, c)	((cs)->ptr[(uch)(c)] & (cs)->mask)
-#define	MCadd(p, cs, cp)	mcadd(p, cs, cp)	/* regcomp() internal fns */
-#define	MCsub(p, cs, cp)	mcsub(p, cs, cp)
-#define	MCin(p, cs, cp)	mcin(p, cs, cp)
-
-/* stuff for character categories */
-typedef unsigned char cat_t;
-
-/*
- * main compiled-expression structure
- */
-struct re_guts {
-	int magic;
-#		define	MAGIC2	((('R'^0200)<<8)|'E')
-	sop *strip;		/* malloced area for strip */
-	int csetsize;		/* number of bits in a cset vector */
-	int ncsets;		/* number of csets in use */
-	cset *sets;		/* -> cset [ncsets] */
-	uch *setbits;		/* -> uch[csetsize][ncsets/CHAR_BIT] */
-	int cflags;		/* copy of regcomp() cflags argument */
-	sopno nstates;		/* = number of sops */
-	sopno firststate;	/* the initial OEND (normally 0) */
-	sopno laststate;	/* the final OEND */
-	int iflags;		/* internal flags */
-#		define	USEBOL	01	/* used ^ */
-#		define	USEEOL	02	/* used $ */
-#		define	BAD	04	/* something wrong */
-	int nbol;		/* number of ^ used */
-	int neol;		/* number of $ used */
-	int ncategories;	/* how many character categories */
-	cat_t *categories;	/* ->catspace[-CHAR_MIN] */
-	char *must;		/* match must contain this string */
-	int mlen;		/* length of must */
-	size_t nsub;		/* copy of re_nsub */
-	int backrefs;		/* does it use back references? */
-	sopno nplus;		/* how deep does it nest +s? */
-	/* catspace must be last */
-	cat_t catspace[1];	/* actually [NC] */
-};
-
-/* misc utilities */
-#define	OUT	(CHAR_MAX+1)	/* a non-character value */
-#define	ISWORD(c)	(isalnum(c) || (c) == '_')
diff --git a/winsup/cygwin/regex/regexec.c b/winsup/cygwin/regex/regexec.c
deleted file mode 100644
index 35b99c272..000000000
--- a/winsup/cygwin/regex/regexec.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * the outer shell of regexec()
- *
- * This file includes engine.c *twice*, after muchos fiddling with the
- * macros that code uses.  This lets the same code operate on two different
- * representations for state sets.
- */
-#include "winsup.h"
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-#include "regex.h"
-
-#include "utils.h"
-#include "regex2.h"
-
-#ifdef lint
-static int nope = 0;		/* for use in asserts; shuts lint up */
-#endif
-
-/* macros for manipulating states, small version */
-#define	states	unsigned
-#define	states1	unsigned	/* for later use in regexec() decision */
-#define	CLEAR(v)	((v) = 0)
-#define	SET0(v, n)	((v) &= ~((unsigned)1 << (n)))
-#define	SET1(v, n)	((v) |= (unsigned)1 << (n))
-#define	ISSET(v, n)	((v) & ((unsigned)1 << (n)))
-#define	ASSIGN(d, s)	((d) = (s))
-#define	EQ(a, b)	((a) == (b))
-#define	STATEVARS	int dummy	/* dummy version */
-#define	STATESETUP(m, n)	/* nothing */
-#define	STATETEARDOWN(m)	/* nothing */
-#define	SETUP(v)	((v) = 0)
-#define	onestate	unsigned
-#define	INIT(o, n)	((o) = (unsigned)1 << (n))
-#define	INC(o)	((o) <<= 1)
-#define	ISSTATEIN(v, o)	((v) & (o))
-/* some abbreviations; note that some of these know variable names! */
-/* do "if I'm here, I can also be there" etc without branches */
-#define	FWD(dst, src, n)	((dst) |= ((unsigned)(src)&(here)) << (n))
-#define	BACK(dst, src, n)	((dst) |= ((unsigned)(src)&(here)) >> (n))
-#define	ISSETBACK(v, n)	((v) & ((unsigned)here >> (n)))
-/* function names */
-#define SNAMES			/* engine.c looks after details */
-
-#include "engine.c"
-
-/* now undo things */
-#undef	states
-#undef	CLEAR
-#undef	SET0
-#undef	SET1
-#undef	ISSET
-#undef	ASSIGN
-#undef	EQ
-#undef	STATEVARS
-#undef	STATESETUP
-#undef	STATETEARDOWN
-#undef	SETUP
-#undef	onestate
-#undef	INIT
-#undef	INC
-#undef	ISSTATEIN
-#undef	FWD
-#undef	BACK
-#undef	ISSETBACK
-#undef	SNAMES
-
-/* macros for manipulating states, large version */
-#define	states	char *
-#define	CLEAR(v)	memset(v, 0, m->g->nstates)
-#define	SET0(v, n)	((v)[n] = 0)
-#define	SET1(v, n)	((v)[n] = 1)
-#define	ISSET(v, n)	((v)[n])
-#define	ASSIGN(d, s)	memcpy(d, s, m->g->nstates)
-#define	EQ(a, b)	(memcmp(a, b, m->g->nstates) == 0)
-#define	STATEVARS	int vn; char *space
-#define	STATESETUP(m, nv)	{ (m)->space = malloc((nv)*(m)->g->nstates); \
-				if ((m)->space == NULL) return(REG_ESPACE); \
-				(m)->vn = 0; }
-#define	STATETEARDOWN(m)	{ free((m)->space); }
-#define	SETUP(v)	((v) = &m->space[m->vn++ * m->g->nstates])
-#define	onestate	int
-#define	INIT(o, n)	((o) = (n))
-#define	INC(o)	((o)++)
-#define	ISSTATEIN(v, o)	((v)[o])
-/* some abbreviations; note that some of these know variable names! */
-/* do "if I'm here, I can also be there" etc without branches */
-#define	FWD(dst, src, n)	((dst)[here+(n)] |= (src)[here])
-#define	BACK(dst, src, n)	((dst)[here-(n)] |= (src)[here])
-#define	ISSETBACK(v, n)	((v)[here - (n)])
-/* function names */
-#define	LNAMES			/* flag */
-
-#include "engine.c"
-
-/*
- - regexec - interface for matching
- = extern int regexec(const regex_t *, const char *, size_t, \
- =					regmatch_t [], int);
- = #define	REG_NOTBOL	00001
- = #define	REG_NOTEOL	00002
- = #define	REG_STARTEND	00004
- = #define	REG_TRACE	00400	// tracing of execution
- = #define	REG_LARGE	01000	// force large representation
- = #define	REG_BACKR	02000	// force use of backref code
- *
- * We put this here so we can exploit knowledge of the state representation
- * when choosing which matcher to call.  Also, by this point the matchers
- * have been prototyped.
- */
-int				/* 0 success, REG_NOMATCH failure */
-regexec(preg, string, nmatch, pmatch, eflags)
-const regex_t *preg;
-const char *string;
-size_t nmatch;
-regmatch_t pmatch[];
-int eflags;
-{
-	register struct re_guts *g = preg->re_g;
-#ifdef REDEBUG
-#	define	GOODFLAGS(f)	(f)
-#else
-#	define	GOODFLAGS(f)	((f)&(REG_NOTBOL|REG_NOTEOL|REG_STARTEND))
-#endif
-
-	if (preg->re_magic != MAGIC1 || g->magic != MAGIC2)
-		return(REG_BADPAT);
-	assert(!(g->iflags&BAD));
-	if (g->iflags&BAD)		/* backstop for no-debug case */
-		return(REG_BADPAT);
-	eflags = GOODFLAGS(eflags);
-
-	if ((unsigned) g->nstates <= CHAR_BIT*sizeof(states1) && !(eflags&REG_LARGE))
-		return(smatcher(g, (char *)string, nmatch, pmatch, eflags));
-	else
-		return(lmatcher(g, (char *)string, nmatch, pmatch, eflags));
-}
diff --git a/winsup/cygwin/regex/regfree.c b/winsup/cygwin/regex/regfree.c
deleted file mode 100644
index b8be143d8..000000000
--- a/winsup/cygwin/regex/regfree.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "winsup.h"
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "regex.h"
-
-#include "utils.h"
-#include "regex2.h"
-
-/*
- - regfree - free everything
- = extern void regfree(regex_t *);
- */
-void
-regfree(preg)
-regex_t *preg;
-{
-	register struct re_guts *g;
-
-	if (preg->re_magic != MAGIC1)	/* oops */
-		return;			/* nice to complain, but hard */
-
-	g = preg->re_g;
-	if (g == NULL || g->magic != MAGIC2)	/* oops again */
-		return;
-	preg->re_magic = 0;		/* mark it invalid */
-	g->magic = 0;			/* mark it invalid */
-
-	if (g->strip != NULL)
-		free((char *)g->strip);
-	if (g->sets != NULL)
-		free((char *)g->sets);
-	if (g->setbits != NULL)
-		free((char *)g->setbits);
-	if (g->must != NULL)
-		free(g->must);
-	free((char *)g);
-}
diff --git a/winsup/cygwin/regex/tests b/winsup/cygwin/regex/tests
deleted file mode 100644
index e4d928dad..000000000
--- a/winsup/cygwin/regex/tests
+++ /dev/null
@@ -1,477 +0,0 @@
-# regular expression test set
-# Lines are at least three fields, separated by one or more tabs.  "" stands
-# for an empty field.  First field is an RE.  Second field is flags.  If
-# C flag given, regcomp() is expected to fail, and the third field is the
-# error name (minus the leading REG_).
-#
-# Otherwise it is expected to succeed, and the third field is the string to
-# try matching it against.  If there is no fourth field, the match is
-# expected to fail.  If there is a fourth field, it is the substring that
-# the RE is expected to match.  If there is a fifth field, it is a comma-
-# separated list of what the subexpressions should match, with - indicating
-# no match for that one.  In both the fourth and fifth fields, a (sub)field
-# starting with @ indicates that the (sub)expression is expected to match
-# a null string followed by the stuff after the @; this provides a way to
-# test where null strings match.  The character `N' in REs and strings
-# is newline, `S' is space, `T' is tab, `Z' is NUL.
-#
-# The full list of flags:
-#	-	placeholder, does nothing
-#	b	RE is a BRE, not an ERE
-#	&	try it as both an ERE and a BRE
-#	C	regcomp() error expected, third field is error name
-#	i	REG_ICASE
-#	m	("mundane") REG_NOSPEC
-#	s	REG_NOSUB (not really testable)
-#	n	REG_NEWLINE
-#	^	REG_NOTBOL
-#	$	REG_NOTEOL
-#	#	REG_STARTEND (see below)
-#	p	REG_PEND
-#
-# For REG_STARTEND, the start/end offsets are those of the substring
-# enclosed in ().
-
-# basics
-a		&	a	a
-abc		&	abc	abc
-abc|de		-	abc	abc
-a|b|c		-	abc	a
-
-# parentheses and perversions thereof
-a(b)c		-	abc	abc
-a\(b\)c		b	abc	abc
-a(		C	EPAREN
-a(		b	a(	a(
-a\(		-	a(	a(
-a\(		bC	EPAREN
-a\(b		bC	EPAREN
-a(b		C	EPAREN
-a(b		b	a(b	a(b
-# gag me with a right parenthesis -- 1003.2 goofed here (my fault, partly)
-a)		-	a)	a)
-)		-	)	)
-# end gagging (in a just world, those *should* give EPAREN)
-a)		b	a)	a)
-a\)		bC	EPAREN
-\)		bC	EPAREN
-a()b		-	ab	ab
-a\(\)b		b	ab	ab
-
-# anchoring and REG_NEWLINE
-^abc$		&	abc	abc
-a^b		-	a^b
-a^b		b	a^b	a^b
-a$b		-	a$b
-a$b		b	a$b	a$b
-^		&	abc	@abc
-$		&	abc	@
-^$		&	""	@
-$^		-	""	@
-\($\)\(^\)	b	""	@
-# stop retching, those are legitimate (although disgusting)
-^^		-	""	@
-$$		-	""	@
-b$		&	abNc
-b$		&n	abNc	b
-^b$		&	aNbNc
-^b$		&n	aNbNc	b
-^$		&n	aNNb	@Nb
-^$		n	abc
-^$		n	abcN	@
-$^		n	aNNb	@Nb
-\($\)\(^\)	bn	aNNb	@Nb
-^^		n^	aNNb	@Nb
-$$		n	aNNb	@NN
-^a		^	a
-a$		$	a
-^a		^n	aNb
-^b		^n	aNb	b
-a$		$n	bNa
-b$		$n	bNa	b
-a*(^b$)c*	-	b	b
-a*\(^b$\)c*	b	b	b
-
-# certain syntax errors and non-errors
-|		C	EMPTY
-|		b	|	|
-*		C	BADRPT
-*		b	*	*
-+		C	BADRPT
-?		C	BADRPT
-""		&C	EMPTY
-()		-	abc	@abc
-\(\)		b	abc	@abc
-a||b		C	EMPTY
-|ab		C	EMPTY
-ab|		C	EMPTY
-(|a)b		C	EMPTY
-(a|)b		C	EMPTY
-(*a)		C	BADRPT
-(+a)		C	BADRPT
-(?a)		C	BADRPT
-({1}a)		C	BADRPT
-\(\{1\}a\)	bC	BADRPT
-(a|*b)		C	BADRPT
-(a|+b)		C	BADRPT
-(a|?b)		C	BADRPT
-(a|{1}b)	C	BADRPT
-^*		C	BADRPT
-^*		b	*	*
-^+		C	BADRPT
-^?		C	BADRPT
-^{1}		C	BADRPT
-^\{1\}		bC	BADRPT
-
-# metacharacters, backslashes
-a.c		&	abc	abc
-a[bc]d		&	abd	abd
-a\*c		&	a*c	a*c
-a\\b		&	a\b	a\b
-a\\\*b		&	a\*b	a\*b
-a\bc		&	abc	abc
-a\		&C	EESCAPE
-a\\bc		&	a\bc	a\bc
-\{		bC	BADRPT
-a\[b		&	a[b	a[b
-a[b		&C	EBRACK
-# trailing $ is a peculiar special case for the BRE code
-a$		&	a	a
-a$		&	a$
-a\$		&	a
-a\$		&	a$	a$
-a\\$		&	a
-a\\$		&	a$
-a\\$		&	a\$
-a\\$		&	a\	a\
-
-# back references, ugh
-a\(b\)\2c	bC	ESUBREG
-a\(b\1\)c	bC	ESUBREG
-a\(b*\)c\1d	b	abbcbbd	abbcbbd	bb
-a\(b*\)c\1d	b	abbcbd
-a\(b*\)c\1d	b	abbcbbbd
-^\(.\)\1	b	abc
-a\([bc]\)\1d	b	abcdabbd	abbd	b
-a\(\([bc]\)\2\)*d	b	abbccd	abbccd
-a\(\([bc]\)\2\)*d	b	abbcbd
-# actually, this next one probably ought to fail, but the spec is unclear
-a\(\(b\)*\2\)*d		b	abbbd	abbbd
-# here is a case that no NFA implementation does right
-\(ab*\)[ab]*\1	b	ababaaa	ababaaa	a
-# check out normal matching in the presence of back refs
-\(a\)\1bcd	b	aabcd	aabcd
-\(a\)\1bc*d	b	aabcd	aabcd
-\(a\)\1bc*d	b	aabd	aabd
-\(a\)\1bc*d	b	aabcccd	aabcccd
-\(a\)\1bc*[ce]d	b	aabcccd	aabcccd
-^\(a\)\1b\(c\)*cd$	b	aabcccd	aabcccd
-
-# ordinary repetitions
-ab*c		&	abc	abc
-ab+c		-	abc	abc
-ab?c		-	abc	abc
-a\(*\)b		b	a*b	a*b
-a\(**\)b	b	ab	ab
-a\(***\)b	bC	BADRPT
-*a		b	*a	*a
-**a		b	a	a
-***a		bC	BADRPT
-
-# the dreaded bounded repetitions
-{		&	{	{
-{abc		&	{abc	{abc
-{1		C	BADRPT
-{1}		C	BADRPT
-a{b		&	a{b	a{b
-a{1}b		-	ab	ab
-a\{1\}b		b	ab	ab
-a{1,}b		-	ab	ab
-a\{1,\}b	b	ab	ab
-a{1,2}b		-	aab	aab
-a\{1,2\}b	b	aab	aab
-a{1		C	EBRACE
-a\{1		bC	EBRACE
-a{1a		C	EBRACE
-a\{1a		bC	EBRACE
-a{1a}		C	BADBR
-a\{1a\}		bC	BADBR
-a{,2}		-	a{,2}	a{,2}
-a\{,2\}		bC	BADBR
-a{,}		-	a{,}	a{,}
-a\{,\}		bC	BADBR
-a{1,x}		C	BADBR
-a\{1,x\}	bC	BADBR
-a{1,x		C	EBRACE
-a\{1,x		bC	EBRACE
-a{300}		C	BADBR
-a\{300\}	bC	BADBR
-a{1,0}		C	BADBR
-a\{1,0\}	bC	BADBR
-ab{0,0}c	-	abcac	ac
-ab\{0,0\}c	b	abcac	ac
-ab{0,1}c	-	abcac	abc
-ab\{0,1\}c	b	abcac	abc
-ab{0,3}c	-	abbcac	abbc
-ab\{0,3\}c	b	abbcac	abbc
-ab{1,1}c	-	acabc	abc
-ab\{1,1\}c	b	acabc	abc
-ab{1,3}c	-	acabc	abc
-ab\{1,3\}c	b	acabc	abc
-ab{2,2}c	-	abcabbc	abbc
-ab\{2,2\}c	b	abcabbc	abbc
-ab{2,4}c	-	abcabbc	abbc
-ab\{2,4\}c	b	abcabbc	abbc
-((a{1,10}){1,10}){1,10}	-	a	a	a,a
-
-# multiple repetitions
-a**		&C	BADRPT
-a++		C	BADRPT
-a??		C	BADRPT
-a*+		C	BADRPT
-a*?		C	BADRPT
-a+*		C	BADRPT
-a+?		C	BADRPT
-a?*		C	BADRPT
-a?+		C	BADRPT
-a{1}{1}		C	BADRPT
-a*{1}		C	BADRPT
-a+{1}		C	BADRPT
-a?{1}		C	BADRPT
-a{1}*		C	BADRPT
-a{1}+		C	BADRPT
-a{1}?		C	BADRPT
-a*{b}		-	a{b}	a{b}
-a\{1\}\{1\}	bC	BADRPT
-a*\{1\}		bC	BADRPT
-a\{1\}*		bC	BADRPT
-
-# brackets, and numerous perversions thereof
-a[b]c		&	abc	abc
-a[ab]c		&	abc	abc
-a[^ab]c		&	adc	adc
-a[]b]c		&	a]c	a]c
-a[[b]c		&	a[c	a[c
-a[-b]c		&	a-c	a-c
-a[^]b]c		&	adc	adc
-a[^-b]c		&	adc	adc
-a[b-]c		&	a-c	a-c
-a[b		&C	EBRACK
-a[]		&C	EBRACK
-a[1-3]c		&	a2c	a2c
-a[3-1]c		&C	ERANGE
-a[1-3-5]c	&C	ERANGE
-a[[.-.]--]c	&	a-c	a-c
-a[1-		&C	ERANGE
-a[[.		&C	EBRACK
-a[[.x		&C	EBRACK
-a[[.x.		&C	EBRACK
-a[[.x.]		&C	EBRACK
-a[[.x.]]	&	ax	ax
-a[[.x,.]]	&C	ECOLLATE
-a[[.one.]]b	&	a1b	a1b
-a[[.notdef.]]b	&C	ECOLLATE
-a[[.].]]b	&	a]b	a]b
-a[[:alpha:]]c	&	abc	abc
-a[[:notdef:]]c	&C	ECTYPE
-a[[:		&C	EBRACK
-a[[:alpha	&C	EBRACK
-a[[:alpha:]	&C	EBRACK
-a[[:alpha,:]	&C	ECTYPE
-a[[:]:]]b	&C	ECTYPE
-a[[:-:]]b	&C	ECTYPE
-a[[:alph:]]	&C	ECTYPE
-a[[:alphabet:]]	&C	ECTYPE
-[[:alnum:]]+	-	-%@a0X-	a0X
-[[:alpha:]]+	-	-%@aX0-	aX
-[[:blank:]]+	-	aSSTb	SST
-[[:cntrl:]]+	-	aNTb	NT
-[[:digit:]]+	-	a019b	019
-[[:graph:]]+	-	Sa%bS	a%b
-[[:lower:]]+	-	AabC	ab
-[[:print:]]+	-	NaSbN	aSb
-[[:punct:]]+	-	S%-&T	%-&
-[[:space:]]+	-	aSNTb	SNT
-[[:upper:]]+	-	aBCd	BC
-[[:xdigit:]]+	-	p0f3Cq	0f3C
-a[[=b=]]c	&	abc	abc
-a[[=		&C	EBRACK
-a[[=b		&C	EBRACK
-a[[=b=		&C	EBRACK
-a[[=b=]		&C	EBRACK
-a[[=b,=]]	&C	ECOLLATE
-a[[=one=]]b	&	a1b	a1b
-
-# complexities
-a(((b)))c	-	abc	abc
-a(b|(c))d	-	abd	abd
-a(b*|c)d	-	abbd	abbd
-# just gotta have one DFA-buster, of course
-a[ab]{20}	-	aaaaabaaaabaaaabaaaab	aaaaabaaaabaaaabaaaab
-# and an inline expansion in case somebody gets tricky
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab]	-	aaaaabaaaabaaaabaaaab	aaaaabaaaabaaaabaaaab
-# and in case somebody just slips in an NFA...
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab](wee|week)(knights|night)	-	aaaaabaaaabaaaabaaaabweeknights	aaaaabaaaabaaaabaaaabweeknights
-# fish for anomalies as the number of states passes 32
-12345678901234567890123456789	-	a12345678901234567890123456789b	12345678901234567890123456789
-123456789012345678901234567890	-	a123456789012345678901234567890b	123456789012345678901234567890
-1234567890123456789012345678901	-	a1234567890123456789012345678901b	1234567890123456789012345678901
-12345678901234567890123456789012	-	a12345678901234567890123456789012b	12345678901234567890123456789012
-123456789012345678901234567890123	-	a123456789012345678901234567890123b	123456789012345678901234567890123
-# and one really big one, beyond any plausible word width
-1234567890123456789012345678901234567890123456789012345678901234567890	-	a1234567890123456789012345678901234567890123456789012345678901234567890b	1234567890123456789012345678901234567890123456789012345678901234567890
-# fish for problems as brackets go past 8
-[ab][cd][ef][gh][ij][kl][mn]	-	xacegikmoq	acegikm
-[ab][cd][ef][gh][ij][kl][mn][op]	-	xacegikmoq	acegikmo
-[ab][cd][ef][gh][ij][kl][mn][op][qr]	-	xacegikmoqy	acegikmoq
-[ab][cd][ef][gh][ij][kl][mn][op][q]	-	xacegikmoqy	acegikmoq
-
-# subtleties of matching
-abc		&	xabcy	abc
-a\(b\)?c\1d	b	acd
-aBc		i	Abc	Abc
-a[Bc]*d		i	abBCcd	abBCcd
-0[[:upper:]]1	&i	0a1	0a1
-0[[:lower:]]1	&i	0A1	0A1
-a[^b]c		&i	abc
-a[^b]c		&i	aBc
-a[^b]c		&i	adc	adc
-[a]b[c]		-	abc	abc
-[a]b[a]		-	aba	aba
-[abc]b[abc]	-	abc	abc
-[abc]b[abd]	-	abd	abd
-a(b?c)+d	-	accd	accd
-(wee|week)(knights|night)	-	weeknights	weeknights
-(we|wee|week|frob)(knights|night|day)	-	weeknights	weeknights
-a[bc]d		-	xyzaaabcaababdacd	abd
-a[ab]c		-	aaabc	abc
-abc		s	abc	abc
-a*		&	b	@b
-
-# Let's have some fun -- try to match a C comment.
-# first the obvious, which looks okay at first glance...
-/\*.*\*/	-	/*x*/	/*x*/
-# but...
-/\*.*\*/	-	/*x*/y/*z*/	/*x*/y/*z*/
-# okay, we must not match */ inside; try to do that...
-/\*([^*]|\*[^/])*\*/	-	/*x*/	/*x*/
-/\*([^*]|\*[^/])*\*/	-	/*x*/y/*z*/	/*x*/
-# but...
-/\*([^*]|\*[^/])*\*/	-	/*x**/y/*z*/	/*x**/y/*z*/
-# and a still fancier version, which does it right (I think)...
-/\*([^*]|\*+[^*/])*\*+/	-	/*x*/	/*x*/
-/\*([^*]|\*+[^*/])*\*+/	-	/*x*/y/*z*/	/*x*/
-/\*([^*]|\*+[^*/])*\*+/	-	/*x**/y/*z*/	/*x**/
-/\*([^*]|\*+[^*/])*\*+/	-	/*x****/y/*z*/	/*x****/
-/\*([^*]|\*+[^*/])*\*+/	-	/*x**x*/y/*z*/	/*x**x*/
-/\*([^*]|\*+[^*/])*\*+/	-	/*x***x/y/*z*/	/*x***x/y/*z*/
-
-# subexpressions
-.*		-	abc	abc	-
-a(b)(c)d	-	abcd	abcd	b,c
-a(((b)))c	-	abc	abc	b,b,b
-a(b|(c))d	-	abd	abd	b,-
-a(b*|c|e)d	-	abbd	abbd	bb
-a(b*|c|e)d	-	acd	acd	c
-a(b*|c|e)d	-	ad	ad	@d
-a(b?)c		-	abc	abc	b
-a(b?)c		-	ac	ac	@c
-a(b+)c		-	abc	abc	b
-a(b+)c		-	abbbc	abbbc	bbb
-a(b*)c		-	ac	ac	@c
-(a|ab)(bc([de]+)f|cde)	-	abcdef	abcdef	a,bcdef,de
-# the regression tester only asks for 9 subexpressions
-a(b)(c)(d)(e)(f)(g)(h)(i)(j)k	-	abcdefghijk	abcdefghijk	b,c,d,e,f,g,h,i,j
-a(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)l	-	abcdefghijkl	abcdefghijkl	b,c,d,e,f,g,h,i,j,k
-a([bc]?)c	-	abc	abc	b
-a([bc]?)c	-	ac	ac	@c
-a([bc]+)c	-	abc	abc	b
-a([bc]+)c	-	abcc	abcc	bc
-a([bc]+)bc	-	abcbc	abcbc	bc
-a(bb+|b)b	-	abb	abb	b
-a(bbb+|bb+|b)b	-	abb	abb	b
-a(bbb+|bb+|b)b	-	abbb	abbb	bb
-a(bbb+|bb+|b)bb	-	abbb	abbb	b
-(.*).*		-	abcdef	abcdef	abcdef
-(a*)*		-	bc	@b	@b
-
-# do we get the right subexpression when it is used more than once?
-a(b|c)*d	-	ad	ad	-
-a(b|c)*d	-	abcd	abcd	c
-a(b|c)+d	-	abd	abd	b
-a(b|c)+d	-	abcd	abcd	c
-a(b|c?)+d	-	ad	ad	@d
-a(b|c?)+d	-	abcd	abcd	@d
-a(b|c){0,0}d	-	ad	ad	-
-a(b|c){0,1}d	-	ad	ad	-
-a(b|c){0,1}d	-	abd	abd	b
-a(b|c){0,2}d	-	ad	ad	-
-a(b|c){0,2}d	-	abcd	abcd	c
-a(b|c){0,}d	-	ad	ad	-
-a(b|c){0,}d	-	abcd	abcd	c
-a(b|c){1,1}d	-	abd	abd	b
-a(b|c){1,1}d	-	acd	acd	c
-a(b|c){1,2}d	-	abd	abd	b
-a(b|c){1,2}d	-	abcd	abcd	c
-a(b|c){1,}d	-	abd	abd	b
-a(b|c){1,}d	-	abcd	abcd	c
-a(b|c){2,2}d	-	acbd	acbd	b
-a(b|c){2,2}d	-	abcd	abcd	c
-a(b|c){2,4}d	-	abcd	abcd	c
-a(b|c){2,4}d	-	abcbd	abcbd	b
-a(b|c){2,4}d	-	abcbcd	abcbcd	c
-a(b|c){2,}d	-	abcd	abcd	c
-a(b|c){2,}d	-	abcbd	abcbd	b
-a(b+|((c)*))+d	-	abd	abd	@d,@d,-
-a(b+|((c)*))+d	-	abcd	abcd	@d,@d,-
-
-# check out the STARTEND option
-[abc]		&#	a(b)c	b
-[abc]		&#	a(d)c
-[abc]		&#	a(bc)d	b
-[abc]		&#	a(dc)d	c
-.		&#	a()c
-b.*c		&#	b(bc)c	bc
-b.*		&#	b(bc)c	bc
-.*c		&#	b(bc)c	bc
-
-# plain strings, with the NOSPEC flag
-abc		m	abc	abc
-abc		m	xabcy	abc
-abc		m	xyz
-a*b		m	aba*b	a*b
-a*b		m	ab
-""		mC	EMPTY
-
-# cases involving NULs
-aZb		&	a	a
-aZb		&p	a
-aZb		&p#	(aZb)	aZb
-aZ*b		&p#	(ab)	ab
-a.b		&#	(aZb)	aZb
-a.*		&#	(aZb)c	aZb
-
-# word boundaries (ick)
-[[:<:]]a	&	a	a
-[[:<:]]a	&	ba
-[[:<:]]a	&	-a	a
-a[[:>:]]	&	a	a
-a[[:>:]]	&	ab
-a[[:>:]]	&	a-	a
-[[:<:]]a.c[[:>:]]	&	axcd-dayc-dazce-abc	abc
-[[:<:]]a.c[[:>:]]	&	axcd-dayc-dazce-abc-q	abc
-[[:<:]]a.c[[:>:]]	&	axc-dayc-dazce-abc	axc
-[[:<:]]b.c[[:>:]]	&	a_bxc-byc_d-bzc-q	bzc
-[[:<:]].x..[[:>:]]	&	y_xa_-_xb_y-_xc_-axdc	_xc_
-[[:<:]]a_b[[:>:]]	&	x_a_b
-
-# past problems, and suspected problems
-(A[1])|(A[2])|(A[3])|(A[4])|(A[5])|(A[6])|(A[7])|(A[8])|(A[9])|(A[A])	-	A1	A1
-abcdefghijklmnop	i	abcdefghijklmnop	abcdefghijklmnop
-abcdefghijklmnopqrstuv	i	abcdefghijklmnopqrstuv	abcdefghijklmnopqrstuv
-(ALAK)|(ALT[AB])|(CC[123]1)|(CM[123]1)|(GAMC)|(LC[23][EO ])|(SEM[1234])|(SL[ES][12])|(SLWW)|(SLF )|(SLDT)|(VWH[12])|(WH[34][EW])|(WP1[ESN])	-	CC11	CC11
-CC[13]1|a{21}[23][EO][123][Es][12]a{15}aa[34][EW]aaaaaaa[X]a	-	CC11	CC11
-Char \([a-z0-9_]*\)\[.*	b	Char xyz[k	Char xyz[k	xyz
-a?b	-	ab	ab
--\{0,1\}[0-9]*$	b	-5	-5
-a*a*a*a*a*a*a*	&	aaaaaa	aaaaaa
diff --git a/winsup/cygwin/regex/utils.h b/winsup/cygwin/regex/utils.h
deleted file mode 100644
index 1a997ac8f..000000000
--- a/winsup/cygwin/regex/utils.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* utility definitions */
-#ifdef _POSIX2_RE_DUP_MAX
-#define	DUPMAX	_POSIX2_RE_DUP_MAX
-#else
-#define	DUPMAX	255
-#endif
-#define	INFINITY	(DUPMAX + 1)
-#define	NC		(CHAR_MAX - CHAR_MIN + 1)
-typedef unsigned char uch;
-
-/* switch off assertions (if not already off) if no REDEBUG */
-#ifndef REDEBUG
-#ifndef NDEBUG
-#define	NDEBUG	/* no assertions please */
-#endif
-#endif
-#include <assert.h>
-
-/* for old systems with bcopy() but no memmove() */
-#ifdef USEBCOPY
-#define	memmove(d, s, c)	bcopy(s, d, c)
-#endif
diff --git a/winsup/cygwin/regexp/COPYRIGHT b/winsup/cygwin/regexp/COPYRIGHT
deleted file mode 100644
index 48b3f4339..000000000
--- a/winsup/cygwin/regexp/COPYRIGHT
+++ /dev/null
@@ -1,22 +0,0 @@
-This entire subtree is copyright the University of Toronto.
-The following copyright notice applies to all files found here.  None of
-these files contain AT&T proprietary source code.
-_____________________________________________________________________________
-
-	Copyright (c) 1986 by University of Toronto.
-	Written by Henry Spencer.  Not derived from licensed software.
-
-	Permission is granted to anyone to use this software for any
-	purpose on any computer system, and to redistribute it freely,
-	subject to the following restrictions:
-
-	1. The author is not responsible for the consequences of use of
-		this software, no matter how awful, even if they arise
-		from defects in it.
-
-	2. The origin of this software must not be misrepresented, either
-		by explicit claim or by omission.
-
-	3. Altered versions must be plainly marked as such, and must not
-		be misrepresented as being the original software.
-
diff --git a/winsup/cygwin/regexp/README b/winsup/cygwin/regexp/README
deleted file mode 100644
index 37d6f51c7..000000000
--- a/winsup/cygwin/regexp/README
+++ /dev/null
@@ -1,84 +0,0 @@
-This is a nearly-public-domain reimplementation of the V8 regexp(3) package.
-It gives C programs the ability to use egrep-style regular expressions, and
-does it in a much cleaner fashion than the analogous routines in SysV.
-
-	Copyright (c) 1986 by University of Toronto.
-	Written by Henry Spencer.  Not derived from licensed software.
-
-	Permission is granted to anyone to use this software for any
-	purpose on any computer system, and to redistribute it freely,
-	subject to the following restrictions:
-
-	1. The author is not responsible for the consequences of use of
-		this software, no matter how awful, even if they arise
-		from defects in it.
-
-	2. The origin of this software must not be misrepresented, either
-		by explicit claim or by omission.
-
-	3. Altered versions must be plainly marked as such, and must not
-		be misrepresented as being the original software.
-
-Barring a couple of small items in the BUGS list, this implementation is
-believed 100% compatible with V8.  It should even be binary-compatible,
-sort of, since the only fields in a "struct regexp" that other people have
-any business touching are declared in exactly the same way at the same
-location in the struct (the beginning).
-
-This implementation is *NOT* AT&T/Bell code, and is not derived from licensed
-software.  Even though U of T is a V8 licensee.  This software is based on
-a V8 manual page sent to me by Dennis Ritchie (the manual page enclosed
-here is a complete rewrite and hence is not covered by AT&T copyright).
-The software was nearly complete at the time of arrival of our V8 tape.
-I haven't even looked at V8 yet, although a friend elsewhere at U of T has
-been kind enough to run a few test programs using the V8 regexp(3) to resolve
-a few fine points.  I admit to some familiarity with regular-expression
-implementations of the past, but the only one that this code traces any
-ancestry to is the one published in Kernighan & Plauger (from which this
-one draws ideas but not code).
-
-Simplistically:  put this stuff into a source directory, copy regexp.h into
-/usr/include, inspect Makefile for compilation options that need changing
-to suit your local environment, and then do "make r".  This compiles the
-regexp(3) functions, compiles a test program, and runs a large set of
-regression tests.  If there are no complaints, then put regexp.o, regsub.o,
-and regerror.o into your C library, and regexp.3 into your manual-pages
-directory.
-
-Note that if you don't put regexp.h into /usr/include *before* compiling,
-you'll have to add "-I." to CFLAGS before compiling.
-
-The files are:
-
-Makefile	instructions to make everything
-regexp.3	manual page
-regexp.h	header file, for /usr/include
-regexp.c	source for regcomp() and regexec()
-regsub.c	source for regsub()
-regerror.c	source for default regerror()
-regmagic.h	internal header file
-try.c		source for test program
-timer.c		source for timing program
-tests		test list for try and timer
-
-This implementation uses nondeterministic automata rather than the
-deterministic ones found in some other implementations, which makes it
-simpler, smaller, and faster at compiling regular expressions, but slower
-at executing them.  In theory, anyway.  This implementation does employ
-some special-case optimizations to make the simpler cases (which do make
-up the bulk of regular expressions actually used) run quickly.  In general,
-if you want blazing speed you're in the wrong place.  Replacing the insides
-of egrep with this stuff is probably a mistake; if you want your own egrep
-you're going to have to do a lot more work.  But if you want to use regular
-expressions a little bit in something else, you're in luck.  Note that many
-existing text editors use nondeterministic regular-expression implementations,
-so you're in good company.
-
-This stuff should be pretty portable, given appropriate option settings.
-If your chars have less than 8 bits, you're going to have to change the
-internal representation of the automaton, although knowledge of the details
-of this is fairly localized.  There are no "reserved" char values except for
-NUL, and no special significance is attached to the top bit of chars.
-The string(3) functions are used a fair bit, on the grounds that they are
-probably faster than coding the operations in line.  Some attempts at code
-tuning have been made, but this is invariably a bit machine-specific.
diff --git a/winsup/cygwin/regexp/regexp.h b/winsup/cygwin/regexp/regexp.h
deleted file mode 100644
index 0850d70a4..000000000
--- a/winsup/cygwin/regexp/regexp.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* regexp.h
-
-   Copyright 1996, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/*
- * Definitions etc. for regexp(3) routines.
- *
- * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
- * not the System V one.
- *
- *	$Id$
- */
-
-#define NSUBEXP  10
-typedef struct regexp {
-	char *startp[NSUBEXP];
-	char *endp[NSUBEXP];
-	char regstart;		/* Internal use only. */
-	char reganch;		/* Internal use only. */
-	char *regmust;		/* Internal use only. */
-	int regmlen;		/* Internal use only. */
-	char program[1];	/* Unwarranted chumminess with compiler. */
-} regexp;
-
-extern regexp *regcomp();
-extern int regexec();
-extern void regsub();
-extern void regerror();
diff --git a/winsup/cygwin/regexp/regmagic.h b/winsup/cygwin/regexp/regmagic.h
deleted file mode 100644
index ea7835711..000000000
--- a/winsup/cygwin/regexp/regmagic.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* regmagic.h
-
-   Copyright 1996, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/*	$Id$ */
-
-/*
- * The first byte of the regexp internal "program" is actually this magic
- * number; the start node begins in the second byte.
- */
-#define	MAGIC	0234
diff --git a/winsup/cygwin/regexp/v8_regerror.c b/winsup/cygwin/regexp/v8_regerror.c
deleted file mode 100644
index 56d63ff2f..000000000
--- a/winsup/cygwin/regexp/v8_regerror.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* regerror.c
-
-   Copyright 1996, 1998, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "regexp.h"
-#include <stdio.h>
-
-void __declspec(dllexport)
-regerror(const char *s __attribute__ ((unused)))
-{
-#ifdef ERRAVAIL
-	error("regexp: %s", s);
-#else
-/*
-	fprintf(stderr, "regexp(3): %s\n", s);
-	exit(1);
-*/
-	return;	  /* let std. egrep handle errors */
-#endif
-	/* NOTREACHED */
-}
diff --git a/winsup/cygwin/regexp/v8_regexp.c b/winsup/cygwin/regexp/v8_regexp.c
deleted file mode 100644
index fef1267a0..000000000
--- a/winsup/cygwin/regexp/v8_regexp.c
+++ /dev/null
@@ -1,1321 +0,0 @@
-/*
- * regcomp and regexec -- regsub and regerror are elsewhere
- *
- *	Copyright (c) 1986 by University of Toronto.
- *	Written by Henry Spencer.  Not derived from licensed software.
- *
- *	Permission is granted to anyone to use this software for any
- *	purpose on any computer system, and to redistribute it freely,
- *	subject to the following restrictions:
- *
- *	1. The author is not responsible for the consequences of use of
- *		this software, no matter how awful, even if they arise
- *		from defects in it.
- *
- *	2. The origin of this software must not be misrepresented, either
- *		by explicit claim or by omission.
- *
- *	3. Altered versions must be plainly marked as such, and must not
- *		be misrepresented as being the original software.
- *** THIS IS AN ALTERED VERSION.  It was altered by John Gilmore,
- *** hoptoad!gnu, on 27 Dec 1986, to add \n as an alternative to |
- *** to assist in implementing egrep.
- *** THIS IS AN ALTERED VERSION.  It was altered by John Gilmore,
- *** hoptoad!gnu, on 27 Dec 1986, to add \< and \> for word-matching
- *** as in BSD grep and ex.
- *** THIS IS AN ALTERED VERSION.  It was altered by John Gilmore,
- *** hoptoad!gnu, on 28 Dec 1986, to optimize characters quoted with \.
- *** THIS IS AN ALTERED VERSION.  It was altered by James A. Woods,
- *** ames!jaw, on 19 June 1987, to quash a regcomp() redundancy.
- *** THIS IS AN ALTERED VERSION.  It was altered by Geoffrey Noer,
- *** noer@cygnus.com, on 6 Oct 1997, to change the prototype format
- *** for inclusion in the Cygwin32 library.
- *
- * Beware that some of this code is subtly aware of the way operator
- * precedence is structured in regular expressions.  Serious changes in
- * regular-expression syntax might require a total rethink.
- */
-
-#include "winsup.h"
-#include "regexp.h"
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include "regmagic.h"
-
-/*
- * The "internal use only" fields in regexp.h are present to pass info from
- * compile to execute that permits the execute phase to run lots faster on
- * simple cases.  They are:
- *
- * regstart	char that must begin a match; '\0' if none obvious
- * reganch	is the match anchored (at beginning-of-line only)?
- * regmust	string (pointer into program) that match must include, or NULL
- * regmlen	length of regmust string
- *
- * Regstart and reganch permit very fast decisions on suitable starting points
- * for a match, cutting down the work a lot.  Regmust permits fast rejection
- * of lines that cannot possibly match.  The regmust tests are costly enough
- * that regcomp() supplies a regmust only if the r.e. contains something
- * potentially expensive (at present, the only such thing detected is * or +
- * at the start of the r.e., which can involve a lot of backup).  Regmlen is
- * supplied because the test in regexec() needs it and regcomp() is computing
- * it anyway.
- */
-
-/*
- * Structure for regexp "program".  This is essentially a linear encoding
- * of a nondeterministic finite-state machine (aka syntax charts or
- * "railroad normal form" in parsing technology).  Each node is an opcode
- * plus a "next" pointer, possibly plus an operand.  "Next" pointers of
- * all nodes except BRANCH implement concatenation; a "next" pointer with
- * a BRANCH on both ends of it is connecting two alternatives.  (Here we
- * have one of the subtle syntax dependencies:  an individual BRANCH (as
- * opposed to a collection of them) is never concatenated with anything
- * because of operator precedence.)  The operand of some types of node is
- * a literal string; for others, it is a node leading into a sub-FSM.  In
- * particular, the operand of a BRANCH node is the first node of the branch.
- * (NB this is *not* a tree structure:  the tail of the branch connects
- * to the thing following the set of BRANCHes.)  The opcodes are:
- */
-
-/* definition	number	opnd?	meaning */
-#define	END	0	/* no	End of program. */
-#define	BOL	1	/* no	Match "" at beginning of line. */
-#define	EOL	2	/* no	Match "" at end of line. */
-#define	ANY	3	/* no	Match any one character. */
-#define	ANYOF	4	/* str	Match any character in this string. */
-#define	ANYBUT	5	/* str	Match any character not in this string. */
-#define	BRANCH	6	/* node	Match this alternative, or the next... */
-#define	BACK	7	/* no	Match "", "next" ptr points backward. */
-#define	EXACTLY	8	/* str	Match this string. */
-#define	NOTHING	9	/* no	Match empty string. */
-#define	STAR	10	/* node	Match this (simple) thing 0 or more times. */
-#define	PLUS	11	/* node	Match this (simple) thing 1 or more times. */
-#define	WORDA	12	/* no	Match "" at wordchar, where prev is nonword */
-#define	WORDZ	13	/* no	Match "" at nonwordchar, where prev is word */
-#define	OPEN	20	/* no	Mark this point in input as start of #n. */
-			/*	OPEN+1 is number 1, etc. */
-#define	CLOSE	30	/* no	Analogous to OPEN. */
-
-/*
- * Opcode notes:
- *
- * BRANCH	The set of branches constituting a single choice are hooked
- *		together with their "next" pointers, since precedence prevents
- *		anything being concatenated to any individual branch.  The
- *		"next" pointer of the last BRANCH in a choice points to the
- *		thing following the whole choice.  This is also where the
- *		final "next" pointer of each individual branch points; each
- *		branch starts with the operand node of a BRANCH node.
- *
- * BACK		Normal "next" pointers all implicitly point forward; BACK
- *		exists to make loop structures possible.
- *
- * STAR,PLUS	'?', and complex '*' and '+', are implemented as circular
- *		BRANCH structures using BACK.  Simple cases (one character
- *		per match) are implemented with STAR and PLUS for speed
- *		and to minimize recursive plunges.
- *
- * OPEN,CLOSE	...are numbered at compile time.
- */
-
-/*
- * A node is one char of opcode followed by two chars of "next" pointer.
- * "Next" pointers are stored as two 8-bit pieces, high order first.  The
- * value is a positive offset from the opcode of the node containing it.
- * An operand, if any, simply follows the node.  (Note that much of the
- * code generation knows about this implicit relationship.)
- *
- * Using two bytes for the "next" pointer is vast overkill for most things,
- * but allows patterns to get big without disasters.
- */
-#define	OP(p)	(*(p))
-#define	NEXT(p)	(((*((p)+1)&0377)<<8) + (*((p)+2)&0377))
-#define	OPERAND(p)	((p) + 3)
-
-/*
- * See regmagic.h for one further detail of program structure.
- */
-
-
-/*
- * Utility definitions.
- */
-#ifndef CHARBITS
-#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-#else
-#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-#endif
-
-#define	FAIL(m)	{ regerror(m); return(NULL); }
-#define	ISMULT(c)	((c) == '*' || (c) == '+' || (c) == '?')
-
-/*
- * Flags to be passed up and down.
- */
-#define	HASWIDTH	01	/* Known never to match null string. */
-#define	SIMPLE		02	/* Simple enough to be STAR/PLUS operand. */
-#define	SPSTART		04	/* Starts with * or +. */
-#define	WORST		0	/* Worst case. */
-
-/*
- * Global work variables for regcomp().
- */
-static char *regparse;		/* Input-scan pointer. */
-static int regnpar;		/* () count. */
-static char regdummy;
-static char *regcode;		/* Code-emit pointer; &regdummy = don't. */
-static long regsize;		/* Code size. */
-
-/*
- * Forward declarations for regcomp()'s friends.
- */
-#ifndef STATIC
-#define	STATIC	static
-#endif
-STATIC char *reg (int, int *);
-STATIC char *regbranch (int *);
-STATIC char *regpiece (int *);
-STATIC char *regatom (int *);
-STATIC char *regnode (char);
-STATIC char *regnext (char *);
-STATIC void regc (char);
-STATIC void reginsert (char, char *);
-STATIC void regtail (char *, char *);
-STATIC void regoptail (char *, char *);
-#ifdef STRCSPN
-STATIC int strcspn (char *, char *);
-#endif
-
-/*
- - regcomp - compile a regular expression into internal code
- *
- * We can't allocate space until we know how big the compiled form will be,
- * but we can't compile it (and thus know how big it is) until we've got a
- * place to put the code.  So we cheat:  we compile it twice, once with code
- * generation turned off and size counting turned on, and once "for real".
- * This also means that we don't allocate space until we are sure that the
- * thing really will compile successfully, and we never have to move the
- * code and thus invalidate pointers into it.  (Note that it has to be in
- * one piece because free() must be able to free it all.)
- *
- * Beware that the optimization-preparation code in here knows about some
- * of the structure of the compiled regexp.
- */
-regexp * __declspec(dllexport)
-regcomp(exp)
-const char *exp;
-{
-	register regexp *r;
-	register char *scan;
-	register char *longest;
-	register int len;
-	int flags;
-
-	if (exp == NULL)
-		FAIL("NULL argument");
-
-	/* First pass: determine size, legality. */
-#ifdef notdef
-	if (exp[0] == '.' && exp[1] == '*') exp += 2;  /* aid grep */
-#endif
-	regparse = (char *)exp;
-	regnpar = 1;
-	regsize = 0L;
-	regcode = &regdummy;
-	regc(MAGIC);
-	if (reg(0, &flags) == NULL)
-		return(NULL);
-
-	/* Small enough for pointer-storage convention? */
-	if (regsize >= 32767L)		/* Probably could be 65535L. */
-		FAIL("regexp too big");
-
-	/* Allocate space. */
-	r = (regexp *)malloc(sizeof(regexp) + (unsigned)regsize);
-	if (r == NULL)
-		FAIL("out of space");
-
-	/* Second pass: emit code. */
-	regparse = (char *)exp;
-	regnpar = 1;
-	regcode = r->program;
-	regc(MAGIC);
-	if (reg(0, &flags) == NULL)
-		return(NULL);
-
-	/* Dig out information for optimizations. */
-	r->regstart = '\0';	/* Worst-case defaults. */
-	r->reganch = 0;
-	r->regmust = NULL;
-	r->regmlen = 0;
-	scan = r->program+1;			/* First BRANCH. */
-	if (OP(regnext(scan)) == END) {		/* Only one top-level choice. */
-		scan = OPERAND(scan);
-
-		/* Starting-point info. */
-		if (OP(scan) == EXACTLY)
-			r->regstart = *OPERAND(scan);
-		else if (OP(scan) == BOL)
-			r->reganch++;
-
-		/*
-		 * If there's something expensive in the r.e., find the
-		 * longest literal string that must appear and make it the
-		 * regmust.  Resolve ties in favor of later strings, since
-		 * the regstart check works with the beginning of the r.e.
-		 * and avoiding duplication strengthens checking.  Not a
-		 * strong reason, but sufficient in the absence of others.
-		 */
-		if (flags&SPSTART) {
-			longest = NULL;
-			len = 0;
-			for (; scan != NULL; scan = regnext(scan))
-				if (OP(scan) == EXACTLY && (int) strlen(OPERAND(scan)) >= len) {
-					longest = OPERAND(scan);
-					len = strlen(OPERAND(scan));
-				}
-			r->regmust = longest;
-			r->regmlen = len;
-		}
-	}
-
-	return(r);
-}
-
-/*
- - reg - regular expression, i.e. main body or parenthesized thing
- *
- * Caller must absorb opening parenthesis.
- *
- * Combining parenthesis handling with the base level of regular expression
- * is a trifle forced, but the need to tie the tails of the branches to what
- * follows makes it hard to avoid.
- */
-static char *
-reg(paren, flagp)
-int paren;			/* Parenthesized? */
-int *flagp;
-{
-	register char *ret;
-	register char *br;
-	register char *ender;
-	register int parno = 0;
-	int flags;
-
-	*flagp = HASWIDTH;	/* Tentatively. */
-
-	/* Make an OPEN node, if parenthesized. */
-	if (paren) {
-		if (regnpar >= NSUBEXP)
-			FAIL("too many ()");
-		parno = regnpar;
-		regnpar++;
-		ret = regnode(OPEN+parno);
-	} else
-		ret = NULL;
-
-	/* Pick up the branches, linking them together. */
-	br = regbranch(&flags);
-	if (br == NULL)
-		return(NULL);
-	if (ret != NULL)
-		regtail(ret, br);	/* OPEN -> first. */
-	else
-		ret = br;
-	if (!(flags&HASWIDTH))
-		*flagp &= ~HASWIDTH;
-	*flagp |= flags&SPSTART;
-	while (*regparse == '|' || *regparse == '\n') {
-		regparse++;
-		br = regbranch(&flags);
-		if (br == NULL)
-			return(NULL);
-		regtail(ret, br);	/* BRANCH -> BRANCH. */
-		if (!(flags&HASWIDTH))
-			*flagp &= ~HASWIDTH;
-		*flagp |= flags&SPSTART;
-	}
-
-	/* Make a closing node, and hook it on the end. */
-	ender = regnode((paren) ? CLOSE+parno : END);
-	regtail(ret, ender);
-
-	/* Hook the tails of the branches to the closing node. */
-	for (br = ret; br != NULL; br = regnext(br))
-		regoptail(br, ender);
-
-	/* Check for proper termination. */
-	if (paren && *regparse++ != ')') {
-		FAIL("unmatched ()");
-	} else if (!paren && *regparse != '\0') {
-		if (*regparse == ')') {
-			FAIL("unmatched ()");
-		} else
-			FAIL("junk on end");	/* "Can't happen". */
-		/* NOTREACHED */
-	}
-
-	return(ret);
-}
-
-/*
- - regbranch - one alternative of an | operator
- *
- * Implements the concatenation operator.
- */
-static char *
-regbranch(flagp)
-int *flagp;
-{
-	register char *ret;
-	register char *chain;
-	register char *latest;
-	int flags;
-
-	*flagp = WORST;		/* Tentatively. */
-
-	ret = regnode(BRANCH);
-	chain = NULL;
-	while (*regparse != '\0' && *regparse != ')' &&
-	       *regparse != '\n' && *regparse != '|') {
-		latest = regpiece(&flags);
-		if (latest == NULL)
-			return(NULL);
-		*flagp |= flags&HASWIDTH;
-		if (chain == NULL)	/* First piece. */
-			*flagp |= flags&SPSTART;
-		else
-			regtail(chain, latest);
-		chain = latest;
-	}
-	if (chain == NULL)	/* Loop ran zero times. */
-		(void) regnode(NOTHING);
-
-	return(ret);
-}
-
-/*
- - regpiece - something followed by possible [*+?]
- *
- * Note that the branching code sequences used for ? and the general cases
- * of * and + are somewhat optimized:  they use the same NOTHING node as
- * both the endmarker for their branch list and the body of the last branch.
- * It might seem that this node could be dispensed with entirely, but the
- * endmarker role is not redundant.
- */
-static char *
-regpiece(flagp)
-int *flagp;
-{
-	register char *ret;
-	register char op;
-	register char *next;
-	int flags;
-
-	ret = regatom(&flags);
-	if (ret == NULL)
-		return(NULL);
-
-	op = *regparse;
-	if (!ISMULT(op)) {
-		*flagp = flags;
-		return(ret);
-	}
-
-	if (!(flags&HASWIDTH) && op != '?')
-		FAIL("*+ operand could be empty");
-	*flagp = (op != '+') ? (WORST|SPSTART) : (WORST|HASWIDTH);
-
-	if (op == '*' && (flags&SIMPLE))
-		reginsert(STAR, ret);
-	else if (op == '*') {
-		/* Emit x* as (x&|), where & means "self". */
-		reginsert(BRANCH, ret);			/* Either x */
-		regoptail(ret, regnode(BACK));		/* and loop */
-		regoptail(ret, ret);			/* back */
-		regtail(ret, regnode(BRANCH));		/* or */
-		regtail(ret, regnode(NOTHING));		/* null. */
-	} else if (op == '+' && (flags&SIMPLE))
-		reginsert(PLUS, ret);
-	else if (op == '+') {
-		/* Emit x+ as x(&|), where & means "self". */
-		next = regnode(BRANCH);			/* Either */
-		regtail(ret, next);
-		regtail(regnode(BACK), ret);		/* loop back */
-		regtail(next, regnode(BRANCH));		/* or */
-		regtail(ret, regnode(NOTHING));		/* null. */
-	} else if (op == '?') {
-		/* Emit x? as (x|) */
-		reginsert(BRANCH, ret);			/* Either x */
-		regtail(ret, regnode(BRANCH));		/* or */
-		next = regnode(NOTHING);		/* null. */
-		regtail(ret, next);
-		regoptail(ret, next);
-	}
-	regparse++;
-	if (ISMULT(*regparse))
-		FAIL("nested *?+");
-
-	return(ret);
-}
-
-/*
- - regatom - the lowest level
- *
- * Optimization:  gobbles an entire sequence of ordinary characters so that
- * it can turn them into a single node, which is smaller to store and
- * faster to run.  Backslashed characters are exceptions, each becoming a
- * separate node; the code is simpler that way and it's not worth fixing.
- */
-static char *
-regatom(flagp)
-int *flagp;
-{
-	register char *ret;
-	int flags;
-
-	*flagp = WORST;		/* Tentatively. */
-
-	switch (*regparse++) {
-	/* FIXME: these chars only have meaning at beg/end of pat? */
-	case '^':
-		ret = regnode(BOL);
-		break;
-	case '$':
-		ret = regnode(EOL);
-		break;
-	case '.':
-		ret = regnode(ANY);
-		*flagp |= HASWIDTH|SIMPLE;
-		break;
-	case '[': {
-			register int class;
-			register int classend;
-
-			if (*regparse == '^') {	/* Complement of range. */
-				ret = regnode(ANYBUT);
-				regparse++;
-			} else
-				ret = regnode(ANYOF);
-			if (*regparse == ']' || *regparse == '-')
-				regc(*regparse++);
-			while (*regparse != '\0' && *regparse != ']') {
-				if (*regparse == '-') {
-					regparse++;
-					if (*regparse == ']' || *regparse == '\0')
-						regc('-');
-					else {
-						class = UCHARAT(regparse-2)+1;
-						classend = UCHARAT(regparse);
-						if (class > classend+1)
-							FAIL("invalid [] range");
-						for (; class <= classend; class++)
-							regc(class);
-						regparse++;
-					}
-				} else
-					regc(*regparse++);
-			}
-			regc('\0');
-			if (*regparse != ']')
-				FAIL("unmatched []");
-			regparse++;
-			*flagp |= HASWIDTH|SIMPLE;
-		}
-		break;
-	case '(':
-		ret = reg(1, &flags);
-		if (ret == NULL)
-			return(NULL);
-		*flagp |= flags&(HASWIDTH|SPSTART);
-		break;
-	case '\0':
-	case '|':
-	case '\n':
-	case ')':
-		FAIL("internal urp");	/* Supposed to be caught earlier. */
-		break;
-	case '?':
-	case '+':
-	case '*':
-		FAIL("?+* follows nothing");
-		break;
-	case '\\':
-		switch (*regparse++) {
-		case '\0':
-			FAIL("trailing \\");
-			break;
-		case '<':
-			ret = regnode(WORDA);
-			break;
-		case '>':
-			ret = regnode(WORDZ);
-			break;
-		/* FIXME: Someday handle \1, \2, ... */
-		default:
-			/* Handle general quoted chars in exact-match routine */
-			goto de_fault;
-		}
-		break;
-	de_fault:
-	default:
-		/*
-		 * Encode a string of characters to be matched exactly.
-		 *
-		 * This is a bit tricky due to quoted chars and due to
-		 * '*', '+', and '?' taking the SINGLE char previous
-		 * as their operand.
-		 *
-		 * On entry, the char at regparse[-1] is going to go
-		 * into the string, no matter what it is.  (It could be
-		 * following a \ if we are entered from the '\' case.)
-		 *
-		 * Basic idea is to pick up a good char in  ch  and
-		 * examine the next char.  If it's *+? then we twiddle.
-		 * If it's \ then we frozzle.  If it's other magic char
-		 * we push  ch  and terminate the string.  If none of the
-		 * above, we push  ch  on the string and go around again.
-		 *
-		 *  regprev  is used to remember where "the current char"
-		 * starts in the string, if due to a *+? we need to back
-		 * up and put the current char in a separate, 1-char, string.
-		 * When  regprev  is NULL,  ch  is the only char in the
-		 * string; this is used in *+? handling, and in setting
-		 * flags |= SIMPLE at the end.
-		 */
-		{
-			char *regprev;
-			register char ch = 0;
-
-			regparse--;			/* Look at cur char */
-			ret = regnode(EXACTLY);
-			for ( regprev = 0 ; ; ) {
-				ch = *regparse++;	/* Get current char */
-				switch (*regparse) {	/* look at next one */
-
-				default:
-					regc(ch);	/* Add cur to string */
-					break;
-
-				case '.': case '[': case '(':
-				case ')': case '|': case '\n':
-				case '$': case '^':
-				case '\0':
-				/* FIXME, $ and ^ should not always be magic */
-				magic:
-					regc(ch);	/* dump cur char */
-					goto done;	/* and we are done */
-
-				case '?': case '+': case '*':
-					if (!regprev)	/* If just ch in str, */
-						goto magic;	/* use it */
-					/* End mult-char string one early */
-					regparse = regprev; /* Back up parse */
-					goto done;
-
-				case '\\':
-					regc(ch);	/* Cur char OK */
-					switch (regparse[1]){ /* Look after \ */
-					case '\0':
-					case '<':
-					case '>':
-					/* FIXME: Someday handle \1, \2, ... */
-						goto done; /* Not quoted */
-					default:
-						/* Backup point is \, scan							 * point is after it. */
-						regprev = regparse;
-						regparse++;
-						continue;	/* NOT break; */
-					}
-				}
-				regprev = regparse;	/* Set backup point */
-			}
-		done:
-			regc('\0');
-			*flagp |= HASWIDTH;
-			if (!regprev)		/* One char? */
-				*flagp |= SIMPLE;
-		}
-		break;
-	}
-
-	return(ret);
-}
-
-/*
- - regnode - emit a node
- */
-static char *			/* Location. */
-regnode(op)
-char op;
-{
-	register char *ret;
-	register char *ptr;
-
-	ret = regcode;
-	if (ret == &regdummy) {
-		regsize += 3;
-		return(ret);
-	}
-
-	ptr = ret;
-	*ptr++ = op;
-	*ptr++ = '\0';		/* Null "next" pointer. */
-	*ptr++ = '\0';
-	regcode = ptr;
-
-	return(ret);
-}
-
-/*
- - regc - emit (if appropriate) a byte of code
- */
-static void
-regc(b)
-char b;
-{
-	if (regcode != &regdummy)
-		*regcode++ = b;
-	else
-		regsize++;
-}
-
-/*
- - reginsert - insert an operator in front of already-emitted operand
- *
- * Means relocating the operand.
- */
-static void
-reginsert(op, opnd)
-char op;
-char *opnd;
-{
-	register char *src;
-	register char *dst;
-	register char *place;
-
-	if (regcode == &regdummy) {
-		regsize += 3;
-		return;
-	}
-
-	src = regcode;
-	regcode += 3;
-	dst = regcode;
-	while (src > opnd)
-		*--dst = *--src;
-
-	place = opnd;		/* Op node, where operand used to be. */
-	*place++ = op;
-	*place++ = '\0';
-	*place++ = '\0';
-}
-
-/*
- - regtail - set the next-pointer at the end of a node chain
- */
-static void
-regtail(p, val)
-char *p;
-char *val;
-{
-	register char *scan;
-	register char *temp;
-	register int offset;
-
-	if (p == &regdummy)
-		return;
-
-	/* Find last node. */
-	scan = p;
-	for (;;) {
-		temp = regnext(scan);
-		if (temp == NULL)
-			break;
-		scan = temp;
-	}
-
-	if (OP(scan) == BACK)
-		offset = scan - val;
-	else
-		offset = val - scan;
-	*(scan+1) = (offset>>8)&0377;
-	*(scan+2) = offset&0377;
-}
-
-/*
- - regoptail - regtail on operand of first argument; nop if operandless
- */
-static void
-regoptail(p, val)
-char *p;
-char *val;
-{
-	/* "Operandless" and "op != BRANCH" are synonymous in practice. */
-	if (p == NULL || p == &regdummy || OP(p) != BRANCH)
-		return;
-	regtail(OPERAND(p), val);
-}
-
-/*
- * regexec and friends
- */
-
-/*
- * Global work variables for regexec().
- */
-static char *reginput;		/* String-input pointer. */
-static char *regbol;		/* Beginning of input, for ^ check. */
-static char **regstartp;	/* Pointer to startp array. */
-static char **regendp;		/* Ditto for endp. */
-
-/*
- * Forwards.
- */
-STATIC int regtry (const regexp *, const char *);
-STATIC int regmatch (char *);
-STATIC int regrepeat (char *);
-
-#ifdef DEBUG
-int regnarrate = 0;
-void regdump __P((regexp *));
-STATIC char *regprop __P((char *));
-#endif
-
-/*
- - regexec - match a regexp against a string
- */
-int __declspec(dllexport)
-regexec(prog, string)
-register const regexp *prog;
-register const char *string;
-{
-	register char *s;
-
-	/* Be paranoid... */
-	if (prog == NULL || string == NULL) {
-		regerror("NULL parameter");
-		return(0);
-	}
-
-	/* Check validity of program. */
-	if (UCHARAT(prog->program) != MAGIC) {
-		regerror("corrupted program");
-		return(0);
-	}
-
-	/* If there is a "must appear" string, look for it. */
-	if (prog->regmust != NULL) {
-		s = (char *)string;
-		while ((s = strchr(s, prog->regmust[0])) != NULL) {
-			if (strncmp(s, prog->regmust, prog->regmlen) == 0)
-				break;	/* Found it. */
-			s++;
-		}
-		if (s == NULL)	/* Not present. */
-			return(0);
-	}
-
-	/* Mark beginning of line for ^ . */
-	regbol = (char *)string;
-
-	/* Simplest case:  anchored match need be tried only once. */
-	if (prog->reganch)
-		return(regtry(prog, string));
-
-	/* Messy cases:  unanchored match. */
-	s = (char *)string;
-	if (prog->regstart != '\0')
-		/* We know what char it must start with. */
-		while ((s = strchr(s, prog->regstart)) != NULL) {
-			if (regtry(prog, s))
-				return(1);
-			s++;
-		}
-	else
-		/* We don't -- general case. */
-		do {
-			if (regtry(prog, s))
-				return(1);
-		} while (*s++ != '\0');
-
-	/* Failure. */
-	return(0);
-}
-
-/*
- - regtry - try match at specific point
- */
-static int			/* 0 failure, 1 success */
-regtry(prog, string)
-const regexp *prog;
-const char *string;
-{
-	register int i;
-	register char **sp;
-	register char **ep;
-
-	reginput = (char *)string;				/* XXX */
-	regstartp = (char **)prog->startp;			/* XXX */
-	regendp = (char **)prog->endp;				/* XXX */
-
-	sp = (char **)prog->startp;				/* XXX */
-	ep = (char **)prog->endp;				/* XXX */
-	for (i = NSUBEXP; i > 0; i--) {
-		*sp++ = NULL;
-		*ep++ = NULL;
-	}
-	if (regmatch((char *)prog->program + 1)) {		/* XXX */
-		((regexp *)prog)->startp[0] = (char *)string;	/* XXX */
-		((regexp *)prog)->endp[0] = reginput;		/* XXX */
-		return(1);
-	} else
-		return(0);
-}
-
-/*
- - regmatch - main matching routine
- *
- * Conceptually the strategy is simple:  check to see whether the current
- * node matches, call self recursively to see whether the rest matches,
- * and then act accordingly.  In practice we make some effort to avoid
- * recursion, in particular by going through "ordinary" nodes (that don't
- * need to know whether the rest of the match failed) by a loop instead of
- * by recursion.
- */
-static int			/* 0 failure, 1 success */
-regmatch(prog)
-char *prog;
-{
-	register char *scan;	/* Current node. */
-	char *next;		/* Next node. */
-
-	scan = prog;
-#ifdef DEBUG
-	if (scan != NULL && regnarrate)
-		fprintf(stderr, "%s(\n", regprop(scan));
-#endif
-	while (scan != NULL) {
-#ifdef DEBUG
-		if (regnarrate)
-			fprintf(stderr, "%s...\n", regprop(scan));
-#endif
-		next = regnext(scan);
-
-		switch (OP(scan)) {
-		case BOL:
-			if (reginput != regbol)
-				return(0);
-			break;
-		case EOL:
-			if (*reginput != '\0')
-				return(0);
-			break;
-		case WORDA:
-			/* Must be looking at a letter, digit, or _ */
-			if ((!isalnum(*reginput)) && *reginput != '_')
-				return(0);
-			/* Prev must be BOL or nonword */
-			if (reginput > regbol &&
-			    (isalnum(reginput[-1]) || reginput[-1] == '_'))
-				return(0);
-			break;
-		case WORDZ:
-			/* Must be looking at non letter, digit, or _ */
-			if (isalnum(*reginput) || *reginput == '_')
-				return(0);
-			/* We don't care what the previous char was */
-			break;
-		case ANY:
-			if (*reginput == '\0')
-				return(0);
-			reginput++;
-			break;
-		case EXACTLY: {
-				register int len;
-				register char *opnd;
-
-				opnd = OPERAND(scan);
-				/* Inline the first character, for speed. */
-				if (*opnd != *reginput)
-					return(0);
-				len = strlen(opnd);
-				if (len > 1 && strncmp(opnd, reginput, len) != 0)
-					return(0);
-				reginput += len;
-			}
-			break;
-		case ANYOF:
-			if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) == NULL)
-				return(0);
-			reginput++;
-			break;
-		case ANYBUT:
-			if (*reginput == '\0' || strchr(OPERAND(scan), *reginput) != NULL)
-				return(0);
-			reginput++;
-			break;
-		case NOTHING:
-			break;
-		case BACK:
-			break;
-		case OPEN+1:
-		case OPEN+2:
-		case OPEN+3:
-		case OPEN+4:
-		case OPEN+5:
-		case OPEN+6:
-		case OPEN+7:
-		case OPEN+8:
-		case OPEN+9: {
-				register int no;
-				register char *save;
-
-				no = OP(scan) - OPEN;
-				save = reginput;
-
-				if (regmatch(next)) {
-					/*
-					 * Don't set startp if some later
-					 * invocation of the same parentheses
-					 * already has.
-					 */
-					if (regstartp[no] == NULL)
-						regstartp[no] = save;
-					return(1);
-				} else
-					return(0);
-			}
-			break;
-		case CLOSE+1:
-		case CLOSE+2:
-		case CLOSE+3:
-		case CLOSE+4:
-		case CLOSE+5:
-		case CLOSE+6:
-		case CLOSE+7:
-		case CLOSE+8:
-		case CLOSE+9: {
-				register int no;
-				register char *save;
-
-				no = OP(scan) - CLOSE;
-				save = reginput;
-
-				if (regmatch(next)) {
-					/*
-					 * Don't set endp if some later
-					 * invocation of the same parentheses
-					 * already has.
-					 */
-					if (regendp[no] == NULL)
-						regendp[no] = save;
-					return(1);
-				} else
-					return(0);
-			}
-			break;
-		case BRANCH: {
-				register char *save;
-
-				if (OP(next) != BRANCH)		/* No choice. */
-					next = OPERAND(scan);	/* Avoid recursion. */
-				else {
-					do {
-						save = reginput;
-						if (regmatch(OPERAND(scan)))
-							return(1);
-						reginput = save;
-						scan = regnext(scan);
-					} while (scan != NULL && OP(scan) == BRANCH);
-					return(0);
-					/* NOTREACHED */
-				}
-			}
-			break;
-		case STAR:
-		case PLUS: {
-				register char nextch;
-				register int no;
-				register char *save;
-				register int min;
-
-				/*
-				 * Lookahead to avoid useless match attempts
-				 * when we know what character comes next.
-				 */
-				nextch = '\0';
-				if (OP(next) == EXACTLY)
-					nextch = *OPERAND(next);
-				min = (OP(scan) == STAR) ? 0 : 1;
-				save = reginput;
-				no = regrepeat(OPERAND(scan));
-				while (no >= min) {
-					/* If it could work, try it. */
-					if (nextch == '\0' || *reginput == nextch)
-						if (regmatch(next))
-							return(1);
-					/* Couldn't or didn't -- back up. */
-					no--;
-					reginput = save + no;
-				}
-				return(0);
-			}
-			break;
-		case END:
-			return(1);	/* Success! */
-			break;
-		default:
-			regerror("memory corruption");
-			return(0);
-			break;
-		}
-
-		scan = next;
-	}
-
-	/*
-	 * We get here only if there's trouble -- normally "case END" is
-	 * the terminating point.
-	 */
-	regerror("corrupted pointers");
-	return(0);
-}
-
-/*
- - regrepeat - repeatedly match something simple, report how many
- */
-static int
-regrepeat(p)
-char *p;
-{
-	register int count = 0;
-	register char *scan;
-	register char *opnd;
-
-	scan = reginput;
-	opnd = OPERAND(p);
-	switch (OP(p)) {
-	case ANY:
-		count = strlen(scan);
-		scan += count;
-		break;
-	case EXACTLY:
-		while (*opnd == *scan) {
-			count++;
-			scan++;
-		}
-		break;
-	case ANYOF:
-		while (*scan != '\0' && strchr(opnd, *scan) != NULL) {
-			count++;
-			scan++;
-		}
-		break;
-	case ANYBUT:
-		while (*scan != '\0' && strchr(opnd, *scan) == NULL) {
-			count++;
-			scan++;
-		}
-		break;
-	default:		/* Oh dear.  Called inappropriately. */
-		regerror("internal foulup");
-		count = 0;	/* Best compromise. */
-		break;
-	}
-	reginput = scan;
-
-	return(count);
-}
-
-/*
- - regnext - dig the "next" pointer out of a node
- */
-static char *
-regnext(p)
-register char *p;
-{
-	register int offset;
-
-	if (p == &regdummy)
-		return(NULL);
-
-	offset = NEXT(p);
-	if (offset == 0)
-		return(NULL);
-
-	if (OP(p) == BACK)
-		return(p-offset);
-	else
-		return(p+offset);
-}
-
-#ifdef DEBUG
-
-/*
- - regdump - dump a regexp onto stdout in vaguely comprehensible form
- */
-void
-regdump(r)
-regexp *r;
-{
-	register char *s;
-	register char op = EXACTLY;	/* Arbitrary non-END op. */
-	register char *next;
-	extern char *strchr();
-
-
-	s = r->program + 1;
-	while (op != END) {	/* While that wasn't END last time... */
-		op = OP(s);
-		printf("%2d%s", s-r->program, regprop(s));	/* Where, what. */
-		next = regnext(s);
-		if (next == NULL)		/* Next ptr. */
-			printf("(0)");
-		else
-			printf("(%d)", (s-r->program)+(next-s));
-		s += 3;
-		if (op == ANYOF || op == ANYBUT || op == EXACTLY) {
-			/* Literal string, where present. */
-			while (*s != '\0') {
-				putchar(*s);
-				s++;
-			}
-			s++;
-		}
-		putchar('\n');
-	}
-
-	/* Header fields of interest. */
-	if (r->regstart != '\0')
-		printf("start `%c' ", r->regstart);
-	if (r->reganch)
-		printf("anchored ");
-	if (r->regmust != NULL)
-		printf("must have \"%s\"", r->regmust);
-	printf("\n");
-}
-
-/*
- - regprop - printable representation of opcode
- */
-static char *
-regprop(op)
-char *op;
-{
-	register char *p;
-	static char buf[50];
-
-	(void) strcpy(buf, ":");
-
-	switch (OP(op)) {
-	case BOL:
-		p = "BOL";
-		break;
-	case EOL:
-		p = "EOL";
-		break;
-	case ANY:
-		p = "ANY";
-		break;
-	case ANYOF:
-		p = "ANYOF";
-		break;
-	case ANYBUT:
-		p = "ANYBUT";
-		break;
-	case BRANCH:
-		p = "BRANCH";
-		break;
-	case EXACTLY:
-		p = "EXACTLY";
-		break;
-	case NOTHING:
-		p = "NOTHING";
-		break;
-	case BACK:
-		p = "BACK";
-		break;
-	case END:
-		p = "END";
-		break;
-	case OPEN+1:
-	case OPEN+2:
-	case OPEN+3:
-	case OPEN+4:
-	case OPEN+5:
-	case OPEN+6:
-	case OPEN+7:
-	case OPEN+8:
-	case OPEN+9:
-		sprintf(buf+strlen(buf), "OPEN%d", OP(op)-OPEN);
-		p = NULL;
-		break;
-	case CLOSE+1:
-	case CLOSE+2:
-	case CLOSE+3:
-	case CLOSE+4:
-	case CLOSE+5:
-	case CLOSE+6:
-	case CLOSE+7:
-	case CLOSE+8:
-	case CLOSE+9:
-		sprintf(buf+strlen(buf), "CLOSE%d", OP(op)-CLOSE);
-		p = NULL;
-		break;
-	case STAR:
-		p = "STAR";
-		break;
-	case PLUS:
-		p = "PLUS";
-		break;
-	case WORDA:
-		p = "WORDA";
-		break;
-	case WORDZ:
-		p = "WORDZ";
-		break;
-	default:
-		regerror("corrupted opcode");
-		break;
-	}
-	if (p != NULL)
-		(void) strcat(buf, p);
-	return(buf);
-}
-#endif
-
-/*
- * The following is provided for those people who do not have strcspn() in
- * their C libraries.  They should get off their butts and do something
- * about it; at least one public-domain implementation of those (highly
- * useful) string routines has been published on Usenet.
- */
-#ifdef STRCSPN
-/*
- * strcspn - find length of initial segment of s1 consisting entirely
- * of characters not from s2
- */
-
-static int
-strcspn(s1, s2)
-char *s1;
-char *s2;
-{
-	register char *scan1;
-	register char *scan2;
-	register int count;
-
-	count = 0;
-	for (scan1 = s1; *scan1 != '\0'; scan1++) {
-		for (scan2 = s2; *scan2 != '\0';)	/* ++ moved down. */
-			if (*scan1 == *scan2++)
-				return(count);
-		count++;
-	}
-	return(count);
-}
-#endif
diff --git a/winsup/cygwin/regexp/v8_regsub.c b/winsup/cygwin/regexp/v8_regsub.c
deleted file mode 100644
index aa95b876a..000000000
--- a/winsup/cygwin/regexp/v8_regsub.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * regsub
- *
- *	Copyright (c) 1986 by University of Toronto.
- *	Written by Henry Spencer.  Not derived from licensed software.
- *
- *	Permission is granted to anyone to use this software for any
- *	purpose on any computer system, and to redistribute it freely,
- *	subject to the following restrictions:
- *
- *	1. The author is not responsible for the consequences of use of
- *		this software, no matter how awful, even if they arise
- *		from defects in it.
- *
- *	2. The origin of this software must not be misrepresented, either
- *		by explicit claim or by omission.
- *
- *	3. Altered versions must be plainly marked as such, and must not
- *		be misrepresented as being the original software.
- */
-
-#if 0
-#ifndef lint
-static char *rcsid = "$Id$";
-#endif /* not lint */
-#endif
-
-#include "winsup.h"
-#include "regexp.h"
-#include <stdio.h>
-#include <string.h>
-#include "regmagic.h"
-
-#ifndef CHARBITS
-#define	UCHARAT(p)	((int)*(unsigned char *)(p))
-#else
-#define	UCHARAT(p)	((int)*(p)&CHARBITS)
-#endif
-
-/*
- - regsub - perform substitutions after a regexp match
- */
-void __declspec(dllexport)
-regsub(prog, source, dest)
-const regexp *prog;
-const char *source;
-char *dest;
-{
-	register char *src;
-	register char *dst;
-	register char c;
-	register int no;
-	register int len;
-
-	if (prog == NULL || source == NULL || dest == NULL) {
-		regerror("NULL parm to regsub");
-		return;
-	}
-	if (UCHARAT(prog->program) != MAGIC) {
-		regerror("damaged regexp fed to regsub");
-		return;
-	}
-
-	src = (char *)source;
-	dst = dest;
-	while ((c = *src++) != '\0') {
-		if (c == '&')
-			no = 0;
-		else if (c == '\\' && '0' <= *src && *src <= '9')
-			no = *src++ - '0';
-		else
-			no = -1;
-		if (no < 0) {	/* Ordinary character. */
-			if (c == '\\' && (*src == '\\' || *src == '&'))
-				c = *src++;
-			*dst++ = c;
-		} else if (prog->startp[no] != NULL && prog->endp[no] != NULL) {
-			len = prog->endp[no] - prog->startp[no];
-			(void) strncpy(dst, prog->startp[no], len);
-			dst += len;
-			if (len != 0 && *(dst-1) == '\0') {	/* strncpy hit NUL. */
-				regerror("damaged match string");
-				return;
-			}
-		}
-	}
-	*dst++ = '\0';
-}
diff --git a/winsup/cygwin/registry.cc b/winsup/cygwin/registry.cc
deleted file mode 100644
index 0a36b3a7b..000000000
--- a/winsup/cygwin/registry.cc
+++ /dev/null
@@ -1,252 +0,0 @@
-/* registry.cc: registry interface
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "shared_info.h"
-#include "registry.h"
-#include "security.h"
-#include <cygwin/version.h>
-
-static char NO_COPY cygnus_class[] = "cygnus";
-
-reg_key::reg_key (HKEY top, REGSAM access, ...)
-{
-  va_list av;
-  va_start (av, access);
-  build_reg (top, access, av);
-  va_end (av);
-}
-
-reg_key::reg_key (REGSAM access, ...)
-{
-  va_list av;
-
-  new (this) reg_key (HKEY_CURRENT_USER, access, "SOFTWARE",
-		 CYGWIN_INFO_CYGNUS_REGISTRY_NAME,
-		 CYGWIN_INFO_CYGWIN_REGISTRY_NAME, NULL);
-
-  HKEY top = key;
-  va_start (av, access);
-  build_reg (top, KEY_READ, av);
-  va_end (av);
-  if (top != key)
-    RegCloseKey (top);
-}
-
-reg_key::reg_key (REGSAM access)
-{
-  new (this) reg_key (HKEY_CURRENT_USER, access, "SOFTWARE",
-		 CYGWIN_INFO_CYGNUS_REGISTRY_NAME,
-		 CYGWIN_INFO_CYGWIN_REGISTRY_NAME,
-		 CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME, NULL);
-}
-
-void
-reg_key::build_reg (HKEY top, REGSAM access, va_list av)
-{
-  char *name;
-  HKEY r = top;
-  key_is_invalid = 0;
-
-  /* FIXME: Most of the time a valid mount area should exist.  Perhaps
-     we should just try an open of the correct key first and only resort
-     to this method in the unlikely situation that it's the first time
-     the current mount areas are being used. */
-
-  while ((name = va_arg (av, char *)) != NULL)
-    {
-      DWORD disp;
-      int res = RegCreateKeyExA (r,
-				 name,
-				 0,
-				 cygnus_class,
-				 REG_OPTION_NON_VOLATILE,
-				 access,
-				 &sec_none_nih,
-				 &key,
-				 &disp);
-      if (r != top)
-	RegCloseKey (r);
-      r = key;
-      if (res != ERROR_SUCCESS)
-	{
-	  key_is_invalid = res;
-	  debug_printf ("failed to create key %s in the registry", name);
-	  break;
-	}
-
-      /* If we're considering the mounts key, check if it had to
-	 be created and set had_to_create appropriately. */
-      if (strcmp (name, CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME) == 0)
-	if (disp == REG_CREATED_NEW_KEY)
-	  mount_table->had_to_create_mount_areas++;
-    }
-}
-
-/* Given the current registry key, return the specific int value
-   requested.  Return def on failure. */
-
-int
-reg_key::get_int (const char *name, int def)
-{
-  DWORD type;
-  DWORD dst;
-  DWORD size = sizeof (dst);
-
-  if (key_is_invalid)
-    return def;
-
-  LONG res = RegQueryValueExA (key, name, 0, &type, (unsigned char *) &dst,
-			       &size);
-
-  if (type != REG_DWORD || res != ERROR_SUCCESS)
-    return def;
-
-  return dst;
-}
-
-/* Given the current registry key, set a specific int value. */
-
-int
-reg_key::set_int (const char *name, int val)
-{
-  DWORD value = val;
-  if (key_is_invalid)
-    return key_is_invalid;
-
-  return (int) RegSetValueExA (key, name, 0, REG_DWORD,
-			       (unsigned char *) &value, sizeof (value));
-}
-
-/* Given the current registry key, return the specific string value
-   requested.  Return zero on success, non-zero on failure. */
-
-int
-reg_key::get_string (const char *name, char *dst, size_t max, const char * def)
-{
-  DWORD size = max;
-  DWORD type;
-  LONG res;
-
-  if (key_is_invalid)
-    res = key_is_invalid;
-  else
-    res = RegQueryValueExA (key, name, 0, &type, (unsigned char *) dst, &size);
-
-  if ((def != 0) && ((type != REG_SZ) || (res != ERROR_SUCCESS)))
-    strcpy (dst, def);
-  return (int) res;
-}
-
-/* Given the current registry key, set a specific string value. */
-
-int
-reg_key::set_string (const char *name, const char *src)
-{
-  if (key_is_invalid)
-    return key_is_invalid;
-  return (int) RegSetValueExA (key, name, 0, REG_SZ, (unsigned char*) src,
-			       strlen (src) + 1);
-}
-
-/* Return the handle to key. */
-
-HKEY
-reg_key::get_key ()
-{
-  return key;
-}
-
-/* Delete subkey of current key.  Returns the error code from the
-   RegDeleteKeyA invocation. */
-
-int
-reg_key::kill (const char *name)
-{
-  if (key_is_invalid)
-    return key_is_invalid;
-  return RegDeleteKeyA (key, name);
-}
-
-/* Delete the value specified by name of current key.  Returns the error code
-   from the RegDeleteValueA invocation. */
-
-int
-reg_key::killvalue (const char *name)
-{
-  if (key_is_invalid)
-    return key_is_invalid;
-  return RegDeleteValueA (key, name);
-}
-
-reg_key::~reg_key ()
-{
-  if (!key_is_invalid)
-    RegCloseKey (key);
-  key_is_invalid = 1;
-}
-
-char *
-get_registry_hive_path (const PSID psid, char *path)
-{
-  char sid[256];
-  char key[256];
-  HKEY hkey;
-
-  if (!psid || !path)
-    return NULL;
-  cygpsid csid (psid);
-  csid.string (sid);
-  strcpy (key,"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\");
-  strcat (key, sid);
-  if (!RegOpenKeyExA (HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hkey))
-    {
-      char buf[256];
-      DWORD type, siz;
-
-      key[0] = '\0';
-      if (!RegQueryValueExA (hkey, "ProfileImagePath", 0, &type,
-			     (BYTE *)buf, (siz = 256, &siz)))
-	ExpandEnvironmentStringsA (buf, key, 256);
-      RegCloseKey (hkey);
-      if (key[0])
-	return strcpy (path, key);
-    }
-  return NULL;
-}
-
-void
-load_registry_hive (PSID psid)
-{
-  char sid[256];
-  char path[CYG_MAX_PATH + 1];
-  HKEY hkey;
-  LONG ret;
-
-  if (!psid)
-    return;
-  /* Check if user hive is already loaded. */
-  cygpsid csid (psid);
-  csid.string (sid);
-  if (!RegOpenKeyExA (HKEY_USERS, sid, 0, KEY_READ, &hkey))
-    {
-      debug_printf ("User registry hive for %s already exists", sid);
-      RegCloseKey (hkey);
-      return;
-    }
-  set_process_privilege (SE_RESTORE_NAME);
-  if (get_registry_hive_path (psid, path))
-    {
-      strcat (path, "\\NTUSER.DAT");
-      if ((ret = RegLoadKeyA (HKEY_USERS, sid, path)) != ERROR_SUCCESS)
-	debug_printf ("Loading user registry hive for %s failed: %d", sid, ret);
-    }
-}
-
diff --git a/winsup/cygwin/registry.h b/winsup/cygwin/registry.h
deleted file mode 100644
index f0c807941..000000000
--- a/winsup/cygwin/registry.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* registry.h: shared info for cygwin
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-class reg_key
-{
-private:
-
-  HKEY key;
-  LONG key_is_invalid;
-
-public:
-
-  reg_key (HKEY toplev, REGSAM access, ...);
-  reg_key (REGSAM access, ...);
-  reg_key (REGSAM access = KEY_ALL_ACCESS);
-
-  void *operator new (size_t, void *p) {return p;}
-  void build_reg (HKEY key, REGSAM access, va_list av);
-
-  int error () {return key == (HKEY) INVALID_HANDLE_VALUE;}
-
-  int kill (const char *child);
-  int killvalue (const char *name);
-
-  HKEY get_key ();
-  int get_int (const char *,int def);
-  int get_string (const char *, char *buf, size_t len, const char *def);
-  int set_string (const char *,const char *);
-  int set_int (const char *, int val);
-
-  ~reg_key ();
-};
-
-/* Evaluates path to the directory of the local user registry hive */
-char *__stdcall get_registry_hive_path (const PSID psid, char *path);
-void __stdcall load_registry_hive (PSID psid);
diff --git a/winsup/cygwin/resource.cc b/winsup/cygwin/resource.cc
deleted file mode 100644
index 536dfe8a5..000000000
--- a/winsup/cygwin/resource.cc
+++ /dev/null
@@ -1,190 +0,0 @@
-/* resource.cc: getrusage () and friends.
-
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002 Red Hat, Inc.
-
-   Written by Steve Chamberlain (sac@cygnus.com), Doug Evans (dje@cygnus.com),
-   Geoffrey Noer (noer@cygnus.com) of Cygnus Support.
-   Rewritten by Sergey S. Okhapkin (sos@prospect.com.ru)
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <limits.h>
-#include "cygerrno.h"
-#include "pinfo.h"
-#include "psapi.h"
-
-/* add timeval values */
-static void
-add_timeval (struct timeval *tv1, struct timeval *tv2)
-{
-  tv1->tv_sec += tv2->tv_sec;
-  tv1->tv_usec += tv2->tv_usec;
-  if (tv1->tv_usec >= 1000000)
-    {
-      tv1->tv_usec -= 1000000;
-      tv1->tv_sec++;
-    }
-}
-
-/* add rusage values of r2 to r1 */
-void __stdcall
-add_rusage (struct rusage *r1, struct rusage *r2)
-{
-  add_timeval (&r1->ru_utime, &r2->ru_utime);
-  add_timeval (&r1->ru_stime, &r2->ru_stime);
-  r1->ru_maxrss += r2->ru_maxrss;
-  r1->ru_ixrss += r2->ru_ixrss;
-  r1->ru_idrss += r2->ru_idrss;
-  r1->ru_isrss += r2->ru_isrss;
-  r1->ru_minflt += r2->ru_minflt;
-  r1->ru_majflt += r2->ru_majflt;
-  r1->ru_nswap += r2->ru_nswap;
-  r1->ru_inblock += r2->ru_inblock;
-  r1->ru_oublock += r2->ru_oublock;
-  r1->ru_msgsnd += r2->ru_msgsnd;
-  r1->ru_msgrcv += r2->ru_msgrcv;
-  r1->ru_nsignals += r2->ru_nsignals;
-  r1->ru_nvcsw += r2->ru_nvcsw;
-  r1->ru_nivcsw += r2->ru_nivcsw;
-}
-
-/* FIXME: what about other fields? */
-void __stdcall
-fill_rusage (struct rusage *r, HANDLE h)
-{
-  FILETIME creation_time = {0,0};
-  FILETIME exit_time = {0,0};
-  FILETIME kernel_time = {0,0};
-  FILETIME user_time = {0,0};
-
-  struct timeval tv;
-
-  memset (r, 0, sizeof (*r));
-  GetProcessTimes (h, &creation_time, &exit_time, &kernel_time, &user_time);
-  totimeval (&tv, &kernel_time, 0, 0);
-  add_timeval (&r->ru_stime, &tv);
-  totimeval (&tv, &user_time, 0, 0);
-  add_timeval (&r->ru_utime, &tv);
-
-  PROCESS_MEMORY_COUNTERS pmc;
-
-  memset (&pmc, 0, sizeof (pmc));
-  if (GetProcessMemoryInfo (h, &pmc, sizeof (pmc)))
-    {
-      r->ru_maxrss += (long) (pmc.WorkingSetSize /1024);
-      r->ru_majflt += pmc.PageFaultCount;
-    }
-}
-
-extern "C" int
-getrusage (int intwho, struct rusage *rusage_in)
-{
-  int res = 0;
-  struct rusage r;
-
-  if (intwho == RUSAGE_SELF)
-    {
-      memset (&r, 0, sizeof (r));
-      fill_rusage (&r, hMainProc);
-      *rusage_in = r;
-    }
-  else if (intwho == RUSAGE_CHILDREN)
-    *rusage_in = myself->rusage_children;
-  else
-    {
-      set_errno (EINVAL);
-      res = -1;
-    }
-
-  syscall_printf ("%d = getrusage (%d, %p)", res, intwho, rusage_in);
-  return res;
-}
-
-unsigned long rlim_core = RLIM_INFINITY;
-
-extern "C" int
-getrlimit (int resource, struct rlimit *rlp)
-{
-  MEMORY_BASIC_INFORMATION m;
-
-  if (check_null_invalid_struct_errno (rlp))
-    return -1;
-
-  rlp->rlim_cur = RLIM_INFINITY;
-  rlp->rlim_max = RLIM_INFINITY;
-
-  switch (resource)
-    {
-    case RLIMIT_CPU:
-    case RLIMIT_FSIZE:
-    case RLIMIT_DATA:
-      break;
-    case RLIMIT_STACK:
-      if (!VirtualQuery ((LPCVOID) &m, &m, sizeof m))
-	debug_printf ("couldn't get stack info, returning def.values. %E");
-      else
-	{
-	  rlp->rlim_cur = (DWORD) &m - (DWORD) m.AllocationBase;
-	  rlp->rlim_max = (DWORD) m.BaseAddress + m.RegionSize
-			  - (DWORD) m.AllocationBase;
-	}
-      break;
-    case RLIMIT_NOFILE:
-      rlp->rlim_cur = getdtablesize ();
-      if (rlp->rlim_cur < OPEN_MAX)
-	rlp->rlim_cur = OPEN_MAX;
-      break;
-    case RLIMIT_CORE:
-      rlp->rlim_cur = rlim_core;
-      break;
-    case RLIMIT_AS:
-      rlp->rlim_cur = 0x80000000UL;
-      rlp->rlim_max = 0x80000000UL;
-      break;
-    default:
-      set_errno (EINVAL);
-      return -1;
-    }
-  return 0;
-}
-
-extern "C" int
-setrlimit (int resource, const struct rlimit *rlp)
-{
-  if (__check_invalid_read_ptr_errno (rlp, sizeof (*rlp)))
-    return -1;
-
-  struct rlimit oldlimits;
-
-  // Check if the request is to actually change the resource settings.
-  // If it does not result in a change, take no action and do not
-  // fail.
-  if (getrlimit (resource, &oldlimits) < 0)
-    return -1;
-
-  if (oldlimits.rlim_cur == rlp->rlim_cur &&
-      oldlimits.rlim_max == rlp->rlim_max)
-    // No change in resource requirements, succeed immediately
-    return 0;
-
-  switch (resource)
-    {
-    case RLIMIT_CORE:
-      rlim_core = rlp->rlim_cur;
-      break;
-    case RLIMIT_NOFILE:
-      if (rlp->rlim_cur != RLIM_INFINITY)
-	return setdtablesize (rlp->rlim_cur);
-      break;
-    default:
-      set_errno (EINVAL);
-      return -1;
-    }
-  return 0;
-}
diff --git a/winsup/cygwin/rmsym b/winsup/cygwin/rmsym
deleted file mode 100755
index 1549eed99..000000000
--- a/winsup/cygwin/rmsym
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-lib=$1; shift
-nm=$1; shift
-ar=$1; shift
-grepit=`echo $* | sed 's/ /\$|__imp__/g'`
-[ -n "$grepit" ] && grepit="__imp__$grepit\$"
-objs=`$nm $lib | awk -F: '/^d*[0-9][0-9]*.o:/ {obj=$1} '"/$grepit/"'{print obj}'`
-[ -n "$objs" ] || exit 1
-$ar ds $lib $objs
diff --git a/winsup/cygwin/scandir.cc b/winsup/cygwin/scandir.cc
deleted file mode 100644
index a2f682a50..000000000
--- a/winsup/cygwin/scandir.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-/* scandir.cc
-
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-   Written by Corinna Vinschen <corinna.vinschen@cityweb.de>
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include "winsup.h"
-#include <dirent.h>
-#include <stdlib.h>
-#include "cygerrno.h"
-
-extern "C" int
-alphasort (const struct dirent **a, const struct dirent **b)
-{
-  return strcoll ((*a)->d_name, (*b)->d_name);
-}
-
-extern "C" int
-scandir (const char *dir,
-	 struct dirent ***namelist,
-	 int (*select) (const struct dirent *),
-	 int (*compar) (const struct dirent **, const struct dirent **))
-{
-  DIR *dirp;
-  struct dirent *ent, *etmp, **nl = NULL, **ntmp;
-  int count = 0;
-  int allocated = 0;
-
-  if (!(dirp = opendir (dir)))
-    return -1;
-
-  int prior_errno = get_errno ();
-  set_errno (0);
-  if (!compar)
-    compar = alphasort;
-
-  while ((ent = readdir (dirp)))
-    {
-      if (!select || select (ent))
-	{
-
-	  /* Ignore error from readdir/select. See POSIX specs. */
-	  set_errno (0);
-
-	  if (count == allocated)
-	    {
-
-	      if (allocated == 0)
-		allocated = 10;
-	      else
-		allocated *= 2;
-
-	      ntmp = (struct dirent **) realloc (nl, allocated * sizeof *nl);
-	      if (!ntmp)
-		{
-		  set_errno (ENOMEM);
-		  break;
-		}
-	      nl = ntmp;
-	  }
-
-	  if (!(etmp = (struct dirent *) malloc (sizeof *ent)))
-	    {
-	      set_errno (ENOMEM);
-	      break;
-	    }
-	  *etmp = *ent;
-	  nl[count++] = etmp;
-	}
-    }
-
-  if ((prior_errno = get_errno ()) != 0)
-    {
-      closedir (dirp);
-      if (nl)
-	{
-	  while (count > 0)
-	    free (nl[--count]);
-	  free (nl);
-	}
-      /* Ignore errors from closedir() and what not else. */
-      set_errno (prior_errno);
-      return -1;
-    }
-
-  closedir (dirp);
-  set_errno (prior_errno);
-
-  qsort (nl, count, sizeof *nl, (int (*)(const void *, const void *)) compar);
-  if (namelist)
-    *namelist = nl;
-  return count;
-}
diff --git a/winsup/cygwin/sched.cc b/winsup/cygwin/sched.cc
deleted file mode 100644
index 548c65957..000000000
--- a/winsup/cygwin/sched.cc
+++ /dev/null
@@ -1,501 +0,0 @@
-/* sched.cc: scheduler interface for Cygwin
-
-   Copyright 2001, 2002  Red Hat, Inc.
-
-   Written by Robert Collins <rbtcollins@hotmail.com>
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#define _WIN32_WINNT 0x300
-#include "winsup.h"
-#include <limits.h>
-#include "cygerrno.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <syslog.h>
-#include <sched.h>
-#include "pinfo.h"
-/* for getpid */
-#include <unistd.h>
-#include "registry.h"
-
-extern "C" HWND WINAPI GetForegroundWindow();
-
-/* Win32 priority to UNIX priority Mapping.
-   For now, I'm just following the spec: any range of priorities is ok.
-   There are probably many many issues with this...
-
-   We don't want process's going realtime. Well, they probably could, but the issues
-   with avoiding the priority values 17-22 and 27-30 (not supported before win2k)
-   make that inefficient.
-   However to complicate things most unixes use lower is better priorities.
-
-   So we map -14 to 15, and 15 to 1 via (16- ((n+16) >> 1))
-   we then map 1 to 15 to various process class and thread priority combinations
-
-   Then we need to look at the threads vi process priority. As win95 98 and NT 4
-   Don't support opening threads cross-process (unless a thread HANDLE is passed around)
-   for now, we'll just use the priority class.
-
-   The code and logic are present to calculate the priority for thread
-   , if a thread handle can be obtained. Alternatively, if the symbols wouldn't be
-   resolved until they are used
-   we could support this on windows 2000 and ME now, and just fall back to the
-   class only on pre win2000 machines.
-
-   Lastly, because we can't assume that the pid we're given are Windows pids, we can't
-   alter non-cygwin started programs.
-*/
-
-extern "C"
-{
-
-/* max priority for policy */
-int
-sched_get_priority_max (int policy)
-{
-  if (policy < 1 || policy > 3)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  return -14;
-}
-
-/* min priority for policy */
-int
-sched_get_priority_min (int policy)
-{
-  if (policy < 1 || policy > 3)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  return 15;
-}
-
-/* Check a scheduler parameter struct for valid settings */
-int
-valid_sched_parameters (const struct sched_param *param)
-{
-  if (param->sched_priority < -14 || param->sched_priority > 15)
-    {
-      return 0;
-    }
-  return -1;
-
-}
-
-/* get sched params for process
-
-   Note, I'm never returning EPERM,
-   Always ESRCH. This is by design (If cygwin ever looks at paranoid security
-   Walking the pid values is a known hole in some os's)
-*/
-int
-sched_getparam (pid_t pid, struct sched_param *param)
-{
-  pid_t localpid;
-  int winpri;
-  if (!param || pid < 0)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  localpid = pid ? pid : getpid ();
-
-  DWORD Class;
-  int ThreadPriority;
-  HANDLE process;
-  pinfo p (localpid);
-
-  /* get the class */
-
-  if (!p)
-    {
-      set_errno (ESRCH);
-      return -1;
-    }
-  process = OpenProcess (PROCESS_QUERY_INFORMATION, FALSE, p->dwProcessId);
-  if (!process)
-    {
-      set_errno (ESRCH);
-      return -1;
-    }
-  Class = GetPriorityClass (process);
-  CloseHandle (process);
-  if (!Class)
-    {
-      set_errno (ESRCH);
-      return -1;
-    }
-  ThreadPriority = THREAD_PRIORITY_NORMAL;
-
-  /* calculate the unix priority.
-
-     FIXME: windows 2000 supports ABOVE_NORMAL and BELOW_NORMAL class's
-     So this logic just defaults those class factors to NORMAL in the calculations */
-
-  switch (Class)
-    {
-    case IDLE_PRIORITY_CLASS:
-      switch (ThreadPriority)
-	{
-	case THREAD_PRIORITY_IDLE:
-	  winpri = 1;
-	  break;
-	case THREAD_PRIORITY_LOWEST:
-	  winpri = 2;
-	  break;
-	case THREAD_PRIORITY_BELOW_NORMAL:
-	  winpri = 3;
-	  break;
-	case THREAD_PRIORITY_NORMAL:
-	  winpri = 4;
-	  break;
-	case THREAD_PRIORITY_ABOVE_NORMAL:
-	  winpri = 5;
-	  break;
-	case THREAD_PRIORITY_HIGHEST:
-	default:
-	  winpri = 6;
-	  break;
-	}
-      break;
-    case HIGH_PRIORITY_CLASS:
-      switch (ThreadPriority)
-	{
-	case THREAD_PRIORITY_IDLE:
-	  winpri = 1;
-	  break;
-	case THREAD_PRIORITY_LOWEST:
-	  winpri = 11;
-	  break;
-	case THREAD_PRIORITY_BELOW_NORMAL:
-	  winpri = 12;
-	  break;
-	case THREAD_PRIORITY_NORMAL:
-	  winpri = 13;
-	  break;
-	case THREAD_PRIORITY_ABOVE_NORMAL:
-	  winpri = 14;
-	  break;
-	case THREAD_PRIORITY_HIGHEST:
-	default:
-	  winpri = 15;
-	  break;
-	}
-      break;
-    case NORMAL_PRIORITY_CLASS:
-    default:
-      switch (ThreadPriority)
-	{
-	case THREAD_PRIORITY_IDLE:
-	  winpri = 1;
-	  break;
-	case THREAD_PRIORITY_LOWEST:
-	  winpri = 7;
-	  break;
-	case THREAD_PRIORITY_BELOW_NORMAL:
-	  winpri = 8;
-	  break;
-	case THREAD_PRIORITY_NORMAL:
-	  winpri = 9;
-	  break;
-	case THREAD_PRIORITY_ABOVE_NORMAL:
-	  winpri = 10;
-	  break;
-	case THREAD_PRIORITY_HIGHEST:
-	default:
-	  winpri = 11;
-	  break;
-	}
-      break;
-    }
-
-  /* reverse out winpri = (16- ((unixpri+16) >> 1)) */
-  /*
-     winpri-16 = -  (unixpri +16 ) >> 1
-
-     -(winpri-16) = unixpri +16 >> 1
-     (-(winpri-16)) << 1 = unixpri+16
-     ((-(winpri - 16)) << 1) - 16 = unixpri
-   */
-
-  param->sched_priority = ((-(winpri - 16)) << 1) - 16;
-
-  return 0;
-}
-
-/* get the scheduler for pid
-
-   All process's on WIN32 run with SCHED_FIFO.
-   So we just give an answer.
-   (WIN32 uses a multi queue FIFO).
-*/
-int
-sched_getscheduler (pid_t pid)
-{
-  if (pid < 0)
-    return ESRCH;
-  else
-    return SCHED_FIFO;
-}
-
-/* get the time quantum for pid
-
-   Implemented only for NT systems, it fails and sets errno to ESRCH
-   for non-NT systems.
-*/
-int
-sched_rr_get_interval (pid_t pid, struct timespec *interval)
-{
-  static const char quantable[2][2][3] =
-    {{{12, 24, 36}, { 6, 12, 18}},
-     {{36, 36, 36}, {18, 18, 18}}};
-  /* FIXME: Clocktickinterval can be 15 ms for multi-processor system. */
-  static const int clocktickinterval = 10;
-  static const int quantapertick = 3;
-
-  HWND forwin;
-  DWORD forprocid;
-  int vfindex, slindex, qindex, prisep;
-  long nsec;
-
-  if (!wincap.is_winnt ())
-    {
-      set_errno (ESRCH);
-      return -1;
-    }
-
-  forwin = GetForegroundWindow ();
-  if (!forwin)
-    GetWindowThreadProcessId (forwin, &forprocid);
-  else
-    forprocid = 0;
-
-  reg_key reg (HKEY_LOCAL_MACHINE, KEY_READ, "SYSTEM", "CurrentControlSet",
-               "Control", "PriorityControl", NULL);
-  if (reg.error ())
-    {
-      set_errno (ESRCH);
-      return -1;
-    }
-  prisep = reg.get_int ("Win32PrioritySeparation", 2);
-  pinfo pi (pid ? pid : myself->pid);
-  if (!pi)
-    {
-      set_errno (ESRCH);
-      return -1;
-    }
-
-  if (pi->dwProcessId == forprocid)
-    {
-      qindex = prisep & 3;
-      qindex = qindex == 3 ? 2 : qindex;
-    }
-  else
-    qindex = 0;
-  vfindex = ((prisep >> 2) & 3) % 3;
-  if (vfindex == 0)
-    vfindex = wincap.is_server () || prisep & 3 == 0 ? 1 : 0;
-  else
-    vfindex -= 1;
-  slindex = ((prisep >> 4) & 3) % 3;
-  if (slindex == 0)
-    slindex = wincap.is_server () ? 1 : 0;
-  else
-    slindex -= 1;
-
-  nsec = quantable[vfindex][slindex][qindex] / quantapertick
-    * clocktickinterval * 1000000;
-  interval->tv_sec = nsec / 1000000000;
-  interval->tv_nsec = nsec % 1000000000;
-
-  return 0;
-}
-
-/* set the scheduling parameters */
-int
-sched_setparam (pid_t pid, const struct sched_param *param)
-{
-  pid_t localpid;
-  int winpri;
-  DWORD Class;
-  int ThreadPriority;
-  HANDLE process;
-
-  if (!param || pid < 0)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  if (!valid_sched_parameters (param))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  /*  winpri = (16- ((unixpri+16) >> 1)) */
-  winpri = 16 - ((param->sched_priority + 16) >> 1);
-
-  /* calculate our desired priority class and thread priority */
-
-  if (winpri < 7)
-    Class = IDLE_PRIORITY_CLASS;
-  else if (winpri > 10)
-    Class = HIGH_PRIORITY_CLASS;
-  else
-    Class = NORMAL_PRIORITY_CLASS;
-
-  switch (Class)
-    {
-    case IDLE_PRIORITY_CLASS:
-      switch (winpri)
-	{
-	case 1:
-	  ThreadPriority = THREAD_PRIORITY_IDLE;
-	  break;
-	case 2:
-	  ThreadPriority = THREAD_PRIORITY_LOWEST;
-	  break;
-	case 3:
-	  ThreadPriority = THREAD_PRIORITY_BELOW_NORMAL;
-	  break;
-	case 4:
-	  ThreadPriority = THREAD_PRIORITY_NORMAL;
-	  break;
-	case 5:
-	  ThreadPriority = THREAD_PRIORITY_ABOVE_NORMAL;
-	  break;
-	case 6:
-	  ThreadPriority = THREAD_PRIORITY_HIGHEST;
-	  break;
-	}
-      break;
-    case NORMAL_PRIORITY_CLASS:
-      switch (winpri)
-	{
-	case 7:
-	  ThreadPriority = THREAD_PRIORITY_LOWEST;
-	  break;
-	case 8:
-	  ThreadPriority = THREAD_PRIORITY_BELOW_NORMAL;
-	  break;
-	case 9:
-	  ThreadPriority = THREAD_PRIORITY_NORMAL;
-	  break;
-	case 10:
-	  ThreadPriority = THREAD_PRIORITY_ABOVE_NORMAL;
-	  break;
-	case 11:
-	  ThreadPriority = THREAD_PRIORITY_HIGHEST;
-	  break;
-	}
-      break;
-    case HIGH_PRIORITY_CLASS:
-      switch (winpri)
-	{
-	case 12:
-	  ThreadPriority = THREAD_PRIORITY_BELOW_NORMAL;
-	  break;
-	case 13:
-	  ThreadPriority = THREAD_PRIORITY_NORMAL;
-	  break;
-	case 14:
-	  ThreadPriority = THREAD_PRIORITY_ABOVE_NORMAL;
-	  break;
-	case 15:
-	  ThreadPriority = THREAD_PRIORITY_HIGHEST;
-	  break;
-	}
-      break;
-    }
-
-  localpid = pid ? pid : getpid ();
-
-  pinfo p (localpid);
-
-  /* set the class */
-
-  if (!p)
-    {
-      set_errno (1);		//ESRCH);
-      return -1;
-    }
-  process =
-    OpenProcess (PROCESS_SET_INFORMATION, FALSE, (DWORD) p->dwProcessId);
-  if (!process)
-    {
-      set_errno (2);		//ESRCH);
-      return -1;
-    }
-  if (!SetPriorityClass (process, Class))
-    {
-      CloseHandle (process);
-      set_errno (EPERM);
-      return -1;
-    }
-  CloseHandle (process);
-
-  return 0;
-}
-
-/* we map -14 to 15, and 15 to 1 via (16- ((n+16) >> 1)). This lines up with the allowed
- * valueswe return elsewhere in the sched* functions. We then map in groups of three to
- * allowed thread priority's. The reason for dropping accuracy while still returning
- * a wide range of values is to allow more flexible code in the future.
- */
-int
-sched_set_thread_priority (HANDLE thread, int priority)
-{
-  int real_pri;
-  real_pri = 16 - ((priority + 16) >> 1);
-  if (real_pri <1 || real_pri > 15)
-    return EINVAL;
-
-  if (real_pri < 4)
-    real_pri = THREAD_PRIORITY_LOWEST;
-  else if (real_pri < 7)
-    real_pri = THREAD_PRIORITY_BELOW_NORMAL;
-  else if (real_pri < 10)
-    real_pri = THREAD_PRIORITY_NORMAL;
-  else if (real_pri < 13)
-    real_pri = THREAD_PRIORITY_ABOVE_NORMAL;
-  else
-    real_pri = THREAD_PRIORITY_HIGHEST;
-
-  if (!SetThreadPriority (thread, real_pri))
-    /* invalid handle, no access are the only expected errors. */
-    return EPERM;
-  return 0;
-}
-
-/* set the scheduler */
-int
-sched_setscheduler (pid_t pid, int policy,
-		    const struct sched_param *param)
-{
-  /* on win32, you can't change the scheduler. Doh! */
-  set_errno (ENOSYS);
-  return -1;
-}
-
-/* yield the cpu */
-int
-sched_yield (void)
-{
-  low_priority_sleep (0);
-  return 0;
-}
-}
diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc
deleted file mode 100644
index 4d0f4084b..000000000
--- a/winsup/cygwin/sec_acl.cc
+++ /dev/null
@@ -1,1037 +0,0 @@
-/* sec_acl.cc: Sun compatible ACL functions.
-
-   Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Corinna Vinschen <corinna@vinschen.de>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <grp.h>
-#include <pwd.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/acl.h>
-#include <ctype.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "pinfo.h"
-#include "cygheap.h"
-#include "pwdgrp.h"
-
-extern "C" int aclsort32 (int nentries, int, __aclent32_t *aclbufp);
-extern "C" int acl32 (const char *path, int cmd, int nentries, __aclent32_t *aclbufp);
-
-static int
-searchace (__aclent32_t *aclp, int nentries, int type, __uid32_t id = ILLEGAL_UID)
-{
-  int i;
-
-  for (i = 0; i < nentries; ++i)
-    if ((aclp[i].a_type == type && (id == ILLEGAL_UID || aclp[i].a_id == id))
-	|| !aclp[i].a_type)
-      return i;
-  return -1;
-}
-
-static int
-setacl (const char *file, int nentries, __aclent32_t *aclbufp)
-{
-  security_descriptor sd_ret;
-
-  if (read_sd (file, sd_ret) <= 0)
-    {
-      debug_printf ("read_sd %E");
-      return -1;
-    }
-
-  BOOL dummy;
-
-  /* Get owner SID. */
-  PSID owner_sid;
-  if (!GetSecurityDescriptorOwner (sd_ret, &owner_sid, &dummy))
-    {
-      __seterrno ();
-      return -1;
-    }
-  cygsid owner (owner_sid);
-
-  /* Get group SID. */
-  PSID group_sid;
-  if (!GetSecurityDescriptorGroup (sd_ret, &group_sid, &dummy))
-    {
-      __seterrno ();
-      return -1;
-    }
-  cygsid group (group_sid);
-
-  /* Initialize local security descriptor. */
-  SECURITY_DESCRIPTOR sd;
-  if (!InitializeSecurityDescriptor (&sd, SECURITY_DESCRIPTOR_REVISION))
-    {
-      __seterrno ();
-      return -1;
-    }
-  if (!SetSecurityDescriptorOwner (&sd, owner, FALSE))
-    {
-      __seterrno ();
-      return -1;
-    }
-  if (!SetSecurityDescriptorGroup (&sd, group, FALSE))
-    {
-      __seterrno ();
-      return -1;
-    }
-
-  /* Fill access control list. */
-  char acl_buf[3072];
-  PACL acl = (PACL) acl_buf;
-  size_t acl_len = sizeof (ACL);
-  int ace_off = 0;
-
-  cygsid sid;
-  struct passwd *pw;
-  struct __group32 *gr;
-  int pos;
-
-  if (!InitializeAcl (acl, 3072, ACL_REVISION))
-    {
-      __seterrno ();
-      return -1;
-    }
-  for (int i = 0; i < nentries; ++i)
-    {
-      DWORD allow;
-      /* Owner has more standard rights set. */
-      if ((aclbufp[i].a_type & ~ACL_DEFAULT) == USER_OBJ)
-	allow = STANDARD_RIGHTS_ALL | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA;
-      else
-	allow = STANDARD_RIGHTS_READ | FILE_READ_ATTRIBUTES | FILE_READ_EA;
-      if (aclbufp[i].a_perm & S_IROTH)
-	allow |= FILE_GENERIC_READ;
-      if (aclbufp[i].a_perm & S_IWOTH)
-	allow |= STANDARD_RIGHTS_WRITE | FILE_GENERIC_WRITE;
-      if (aclbufp[i].a_perm & S_IXOTH)
-	allow |= FILE_GENERIC_EXECUTE;
-      if ((aclbufp[i].a_perm & (S_IWOTH | S_IXOTH)) == (S_IWOTH | S_IXOTH))
-	allow |= FILE_DELETE_CHILD;
-      /* Set inherit property. */
-      DWORD inheritance = (aclbufp[i].a_type & ACL_DEFAULT)
-			  ? (SUB_CONTAINERS_AND_OBJECTS_INHERIT | INHERIT_ONLY)
-			  : NO_INHERITANCE;
-      /*
-       * If a specific acl contains a corresponding default entry with
-       * identical permissions, only one Windows ACE with proper
-       * inheritance bits is created.
-       */
-      if (!(aclbufp[i].a_type & ACL_DEFAULT)
-	  && aclbufp[i].a_type & (USER|GROUP|OTHER_OBJ)
-	  && (pos = searchace (aclbufp + i + 1, nentries - i - 1,
-			       aclbufp[i].a_type | ACL_DEFAULT,
-			       (aclbufp[i].a_type & (USER|GROUP))
-			       ? aclbufp[i].a_id : ILLEGAL_UID)) >= 0
-	  && aclbufp[i].a_perm == aclbufp[pos].a_perm)
-	{
-	  inheritance = SUB_CONTAINERS_AND_OBJECTS_INHERIT;
-	  /* This invalidates the corresponding default entry. */
-	  aclbufp[pos].a_type = USER|GROUP|ACL_DEFAULT;
-	}
-      switch (aclbufp[i].a_type)
-	{
-	case USER_OBJ:
-	  if (!add_access_allowed_ace (acl, ace_off++, allow,
-					owner, acl_len, inheritance))
-	    return -1;
-	  break;
-	case DEF_USER_OBJ:
-	  if (!add_access_allowed_ace (acl, ace_off++, allow,
-				       well_known_creator_owner_sid, acl_len, inheritance))
-	    return -1;
-	  break;
-	case USER:
-	case DEF_USER:
-	  if (!(pw = internal_getpwuid (aclbufp[i].a_id))
-	      || !sid.getfrompw (pw)
-	      || !add_access_allowed_ace (acl, ace_off++, allow,
-					  sid, acl_len, inheritance))
-	    return -1;
-	  break;
-	case GROUP_OBJ:
-	  if (!add_access_allowed_ace (acl, ace_off++, allow,
-				       group, acl_len, inheritance))
-	    return -1;
-	  break;
-	case DEF_GROUP_OBJ:
-	  if (!add_access_allowed_ace (acl, ace_off++, allow,
-				       well_known_creator_group_sid, acl_len, inheritance))
-	    return -1;
-	  break;
-	case GROUP:
-	case DEF_GROUP:
-	  if (!(gr = internal_getgrgid (aclbufp[i].a_id))
-	      || !sid.getfromgr (gr)
-	      || !add_access_allowed_ace (acl, ace_off++, allow,
-					  sid, acl_len, inheritance))
-	    return -1;
-	  break;
-	case OTHER_OBJ:
-	case DEF_OTHER_OBJ:
-	  if (!add_access_allowed_ace (acl, ace_off++, allow,
-				       well_known_world_sid,
-				       acl_len, inheritance))
-	    return -1;
-	  break;
-	}
-    }
-  /* Set AclSize to computed value. */
-  acl->AclSize = acl_len;
-  debug_printf ("ACL-Size: %d", acl_len);
-  /* Create DACL for local security descriptor. */
-  if (!SetSecurityDescriptorDacl (&sd, TRUE, acl, FALSE))
-    {
-      __seterrno ();
-      return -1;
-    }
-  /* Make self relative security descriptor in sd_ret. */
-  DWORD sd_size = 0;
-  MakeSelfRelativeSD (&sd, sd_ret, &sd_size);
-  if (sd_size <= 0)
-    {
-      __seterrno ();
-      return -1;
-    }
-  if (!MakeSelfRelativeSD (&sd, sd_ret, &sd_size))
-    {
-      __seterrno ();
-      return -1;
-    }
-  debug_printf ("Created SD-Size: %d", sd_ret.size ());
-  return write_sd (file, sd_ret);
-}
-
-/* Temporary access denied bits */
-#define DENY_R 040000
-#define DENY_W 020000
-#define DENY_X 010000
-
-static void
-getace (__aclent32_t &acl, int type, int id, DWORD win_ace_mask,
-	DWORD win_ace_type)
-{
-  acl.a_type = type;
-  acl.a_id = id;
-
-  if ((win_ace_mask & FILE_READ_BITS) && !(acl.a_perm & (S_IROTH | DENY_R)))
-    if (win_ace_type == ACCESS_ALLOWED_ACE_TYPE)
-      acl.a_perm |= S_IROTH;
-    else if (win_ace_type == ACCESS_DENIED_ACE_TYPE)
-      acl.a_perm |= DENY_R;
-
-  if ((win_ace_mask & FILE_WRITE_BITS) && !(acl.a_perm & (S_IWOTH | DENY_W)))
-    if (win_ace_type == ACCESS_ALLOWED_ACE_TYPE)
-      acl.a_perm |= S_IWOTH;
-    else if (win_ace_type == ACCESS_DENIED_ACE_TYPE)
-      acl.a_perm |= DENY_W;
-
-  if ((win_ace_mask & FILE_EXEC_BITS) && !(acl.a_perm & (S_IXOTH | DENY_X)))
-    if (win_ace_type == ACCESS_ALLOWED_ACE_TYPE)
-      acl.a_perm |= S_IXOTH;
-    else if (win_ace_type == ACCESS_DENIED_ACE_TYPE)
-      acl.a_perm |= DENY_X;
-}
-
-static int
-getacl (const char *file, DWORD attr, int nentries, __aclent32_t *aclbufp)
-{
-  security_descriptor sd;
-
-  int ret;
-  if ((ret = read_sd (file, sd)) <= 0)
-    {
-      debug_printf ("read_sd %E");
-      return ret;
-    }
-
-  cygpsid owner_sid;
-  cygpsid group_sid;
-  BOOL dummy;
-  __uid32_t uid;
-  __gid32_t gid;
-
-  if (!GetSecurityDescriptorOwner (sd, (PSID *) &owner_sid, &dummy))
-    {
-      debug_printf ("GetSecurityDescriptorOwner %E");
-      __seterrno ();
-      return -1;
-    }
-  uid = owner_sid.get_uid ();
-
-  if (!GetSecurityDescriptorGroup (sd, (PSID *) &group_sid, &dummy))
-    {
-      debug_printf ("GetSecurityDescriptorGroup %E");
-      __seterrno ();
-      return -1;
-    }
-  gid = group_sid.get_gid ();
-
-  __aclent32_t lacl[MAX_ACL_ENTRIES];
-  memset (&lacl, 0, MAX_ACL_ENTRIES * sizeof (__aclent32_t));
-  lacl[0].a_type = USER_OBJ;
-  lacl[0].a_id = uid;
-  lacl[1].a_type = GROUP_OBJ;
-  lacl[1].a_id = gid;
-  lacl[2].a_type = OTHER_OBJ;
-  lacl[2].a_id = ILLEGAL_GID;
-  lacl[3].a_type = CLASS_OBJ;
-  lacl[3].a_id = ILLEGAL_GID;
-  lacl[3].a_perm = S_IROTH | S_IWOTH | S_IXOTH;
-
-  PACL acl;
-  BOOL acl_exists;
-
-  if (!GetSecurityDescriptorDacl (sd, &acl_exists, &acl, &dummy))
-    {
-      __seterrno ();
-      debug_printf ("GetSecurityDescriptorDacl %E");
-      return -1;
-    }
-
-  int pos, i, types_def = 0;
-
-  if (!acl_exists || !acl)
-    for (pos = 0; pos < 3; ++pos) /* Don't change CLASS_OBJ entry */
-      lacl[pos].a_perm = S_IROTH | S_IWOTH | S_IXOTH;
-  else
-    {
-      for (i = 0; i < acl->AceCount; ++i)
-	{
-	  ACCESS_ALLOWED_ACE *ace;
-
-	  if (!GetAce (acl, i, (PVOID *) &ace))
-	    continue;
-
-	  cygpsid ace_sid ((PSID) &ace->SidStart);
-	  int id;
-	  int type = 0;
-
-	  if (ace_sid == well_known_world_sid)
-	    {
-	      type = OTHER_OBJ;
-	      id = ILLEGAL_GID;
-	    }
-	  else if (ace_sid == group_sid)
-	    {
-	      type = GROUP_OBJ;
-	      id = gid;
-	    }
-	  else if (ace_sid == owner_sid)
-	    {
-	      type = USER_OBJ;
-	      id = uid;
-	    }
-	  else if (ace_sid == well_known_creator_group_sid)
-	    {
-	      type = GROUP_OBJ | ACL_DEFAULT;
-	      id = ILLEGAL_GID;
-	    }
-	  else if (ace_sid == well_known_creator_owner_sid)
-	    {
-	      type = USER_OBJ | ACL_DEFAULT;
-	      id = ILLEGAL_GID;
-	    }
-	  else
-	    id = ace_sid.get_id (true, &type);
-
-	  if (!type)
-	    continue;
-	  if (!(ace->Header.AceFlags & INHERIT_ONLY || type & ACL_DEFAULT))
-	    {
-	      if ((pos = searchace (lacl, MAX_ACL_ENTRIES, type, id)) >= 0)
-		getace (lacl[pos], type, id, ace->Mask, ace->Header.AceType);
-	    }
-	  if ((ace->Header.AceFlags & SUB_CONTAINERS_AND_OBJECTS_INHERIT)
-	      && (attr & FILE_ATTRIBUTE_DIRECTORY))
-	    {
-	      if (type == USER_OBJ)
-		type = USER;
-	      else if (type == GROUP_OBJ)
-		type = GROUP;
-	      type |= ACL_DEFAULT;
-	      types_def |= type;
-	      if ((pos = searchace (lacl, MAX_ACL_ENTRIES, type, id)) >= 0)
-		getace (lacl[pos], type, id, ace->Mask, ace->Header.AceType);
-	    }
-	}
-      /* Include DEF_CLASS_OBJ if any default ace exists */
-      if ((types_def & (USER|GROUP))
-	  && ((pos = searchace (lacl, MAX_ACL_ENTRIES, DEF_CLASS_OBJ)) >= 0))
-	{
-	  lacl[pos].a_type = DEF_CLASS_OBJ;
-	  lacl[pos].a_id = ILLEGAL_GID;
-	  lacl[pos].a_perm = S_IRWXU | S_IRWXG | S_IRWXO;
-	}
-    }
-  if ((pos = searchace (lacl, MAX_ACL_ENTRIES, 0)) < 0)
-    pos = MAX_ACL_ENTRIES;
-  if (aclbufp) {
-    if (owner_sid == group_sid)
-      lacl[0].a_perm = lacl[1].a_perm;
-    if (pos > nentries)
-      {
-	set_errno (ENOSPC);
-	return -1;
-      }
-    memcpy (aclbufp, lacl, pos * sizeof (__aclent32_t));
-    for (i = 0; i < pos; ++i)
-      aclbufp[i].a_perm &= ~(DENY_R | DENY_W | DENY_X);
-    aclsort32 (pos, 0, aclbufp);
-  }
-  syscall_printf ("%d = getacl (%s)", pos, file);
-  return pos;
-}
-
-static int
-acl_worker (const char *path, int cmd, int nentries, __aclent32_t *aclbufp,
-	    int nofollow)
-{
-  extern suffix_info stat_suffixes[];
-  path_conv real_path (path, (nofollow ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW) | PC_FULL, stat_suffixes);
-  if (real_path.error)
-    {
-      set_errno (real_path.error);
-      syscall_printf ("-1 = acl (%s)", path);
-      return -1;
-    }
-  if (!real_path.has_acls () || !allow_ntsec)
-    {
-      struct __stat64 st;
-      int ret = -1;
-
-      switch (cmd)
-	{
-	case SETACL:
-	  set_errno (ENOSYS);
-	  break;
-	case GETACL:
-	  if (!aclbufp)
-	    set_errno(EFAULT);
-	  else if (nentries < MIN_ACL_ENTRIES)
-	    set_errno (ENOSPC);
-	  else if ((nofollow && !lstat64 (path, &st))
-		   || (!nofollow && !stat64 (path, &st)))
-	    {
-	      aclbufp[0].a_type = USER_OBJ;
-	      aclbufp[0].a_id = st.st_uid;
-	      aclbufp[0].a_perm = (st.st_mode & S_IRWXU) >> 6;
-	      aclbufp[1].a_type = GROUP_OBJ;
-	      aclbufp[1].a_id = st.st_gid;
-	      aclbufp[1].a_perm = (st.st_mode & S_IRWXG) >> 3;
-	      aclbufp[2].a_type = OTHER_OBJ;
-	      aclbufp[2].a_id = ILLEGAL_GID;
-	      aclbufp[2].a_perm = st.st_mode & S_IRWXO;
-	      aclbufp[3].a_type = CLASS_OBJ;
-	      aclbufp[3].a_id = ILLEGAL_GID;
-	      aclbufp[3].a_perm = S_IRWXU | S_IRWXG | S_IRWXO;
-	      ret = MIN_ACL_ENTRIES;
-	    }
-	  break;
-	case GETACLCNT:
-	  ret = MIN_ACL_ENTRIES;
-	  break;
-	}
-      syscall_printf ("%d = acl (%s)", ret, path);
-      return ret;
-    }
-  switch (cmd)
-    {
-      case SETACL:
-	if (!aclsort32 (nentries, 0, aclbufp))
-	  return setacl (real_path.get_win32 (),
-			 nentries, aclbufp);
-	break;
-      case GETACL:
-	if (!aclbufp)
-	  set_errno(EFAULT);
-	else
-	  return getacl (real_path.get_win32 (),
-			 real_path.file_attributes (),
-			 nentries, aclbufp);
-	break;
-      case GETACLCNT:
-	return getacl (real_path.get_win32 (),
-		       real_path.file_attributes (),
-		       0, NULL);
-      default:
-	set_errno (EINVAL);
-	break;
-    }
-  syscall_printf ("-1 = acl (%s)", path);
-  return -1;
-}
-
-extern "C" int
-acl32 (const char *path, int cmd, int nentries, __aclent32_t *aclbufp)
-{
-  return acl_worker (path, cmd, nentries, aclbufp, 0);
-}
-
-extern "C" int
-lacl32 (const char *path, int cmd, int nentries, __aclent32_t *aclbufp)
-{
-  return acl_worker (path, cmd, nentries, aclbufp, 1);
-}
-
-extern "C" int
-facl32 (int fd, int cmd, int nentries, __aclent32_t *aclbufp)
-{
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    {
-      syscall_printf ("-1 = facl (%d)", fd);
-      return -1;
-    }
-  const char *path = cfd->get_name ();
-  if (path == NULL)
-    {
-      syscall_printf ("-1 = facl (%d) (no name)", fd);
-      set_errno (ENOSYS);
-      return -1;
-    }
-  syscall_printf ("facl (%d): calling acl (%s)", fd, path);
-  return acl_worker (path, cmd, nentries, aclbufp, 0);
-}
-
-extern "C" int
-aclcheck32 (__aclent32_t *aclbufp, int nentries, int *which)
-{
-  bool has_user_obj = false;
-  bool has_group_obj = false;
-  bool has_other_obj = false;
-  bool has_class_obj = false;
-  bool has_ug_objs = false;
-  bool has_def_user_obj = false;
-  bool has_def_group_obj = false;
-  bool has_def_other_obj = false;
-  bool has_def_class_obj = false;
-  bool has_def_ug_objs = false;
-  int pos2;
-
-  for (int pos = 0; pos < nentries; ++pos)
-    switch (aclbufp[pos].a_type)
-      {
-      case USER_OBJ:
-	if (has_user_obj)
-	  {
-	    if (which)
-	      *which = pos;
-	    return USER_ERROR;
-	  }
-	has_user_obj = true;
-	break;
-      case GROUP_OBJ:
-	if (has_group_obj)
-	  {
-	    if (which)
-	      *which = pos;
-	    return GRP_ERROR;
-	  }
-	has_group_obj = true;
-	break;
-      case OTHER_OBJ:
-	if (has_other_obj)
-	  {
-	    if (which)
-	      *which = pos;
-	    return OTHER_ERROR;
-	  }
-	has_other_obj = true;
-	break;
-      case CLASS_OBJ:
-	if (has_class_obj)
-	  {
-	    if (which)
-	      *which = pos;
-	    return CLASS_ERROR;
-	  }
-	has_class_obj = true;
-	break;
-      case USER:
-      case GROUP:
-	if ((pos2 = searchace (aclbufp + pos + 1, nentries - pos - 1,
-			       aclbufp[pos].a_type, aclbufp[pos].a_id)) >= 0)
-	  {
-	    if (which)
-	      *which = pos2;
-	    return DUPLICATE_ERROR;
-	  }
-	has_ug_objs = true;
-	break;
-      case DEF_USER_OBJ:
-	if (has_def_user_obj)
-	  {
-	    if (which)
-	      *which = pos;
-	    return USER_ERROR;
-	  }
-	has_def_user_obj = true;
-	break;
-      case DEF_GROUP_OBJ:
-	if (has_def_group_obj)
-	  {
-	    if (which)
-	      *which = pos;
-	    return GRP_ERROR;
-	  }
-	has_def_group_obj = true;
-	break;
-      case DEF_OTHER_OBJ:
-	if (has_def_other_obj)
-	  {
-	    if (which)
-	      *which = pos;
-	    return OTHER_ERROR;
-	  }
-	has_def_other_obj = true;
-	break;
-      case DEF_CLASS_OBJ:
-	if (has_def_class_obj)
-	  {
-	    if (which)
-	      *which = pos;
-	    return CLASS_ERROR;
-	  }
-	has_def_class_obj = true;
-	break;
-      case DEF_USER:
-      case DEF_GROUP:
-	if ((pos2 = searchace (aclbufp + pos + 1, nentries - pos - 1,
-			       aclbufp[pos].a_type, aclbufp[pos].a_id)) >= 0)
-	  {
-	    if (which)
-	      *which = pos2;
-	    return DUPLICATE_ERROR;
-	  }
-	has_def_ug_objs = true;
-	break;
-      default:
-	return ENTRY_ERROR;
-      }
-  if (!has_user_obj
-      || !has_group_obj
-      || !has_other_obj
-#if 0
-      /* These checks are not ok yet since CLASS_OBJ isn't fully implemented. */
-      || (has_ug_objs && !has_class_obj)
-      || (has_def_ug_objs && !has_def_class_obj)
-#endif
-     )
-    {
-      if (which)
-	*which = -1;
-      return MISS_ERROR;
-    }
-  return 0;
-}
-
-static int
-acecmp (const void *a1, const void *a2)
-{
-#define ace(i) ((const __aclent32_t *) a##i)
-  int ret = ace (1)->a_type - ace (2)->a_type;
-  if (!ret)
-    ret = ace (1)->a_id - ace (2)->a_id;
-  return ret;
-#undef ace
-}
-
-extern "C" int
-aclsort32 (int nentries, int, __aclent32_t *aclbufp)
-{
-  if (aclcheck32 (aclbufp, nentries, NULL))
-    return -1;
-  if (!aclbufp || nentries < 1)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  qsort ((void *) aclbufp, nentries, sizeof (__aclent32_t), acecmp);
-  return 0;
-}
-
-extern "C" int
-acltomode32 (__aclent32_t *aclbufp, int nentries, mode_t *modep)
-{
-  int pos;
-
-  if (!aclbufp || nentries < 1 || !modep)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  *modep = 0;
-  if ((pos = searchace (aclbufp, nentries, USER_OBJ)) < 0
-      || !aclbufp[pos].a_type)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  *modep |= (aclbufp[pos].a_perm & S_IRWXO) << 6;
-  if ((pos = searchace (aclbufp, nentries, GROUP_OBJ)) < 0
-      || !aclbufp[pos].a_type)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  *modep |= (aclbufp[pos].a_perm & S_IRWXO) << 3;
-  int cpos;
-  if ((cpos = searchace (aclbufp, nentries, CLASS_OBJ)) >= 0
-      && aclbufp[cpos].a_type == CLASS_OBJ)
-    *modep |= ((aclbufp[pos].a_perm & S_IRWXO) & aclbufp[cpos].a_perm) << 3;
-  if ((pos = searchace (aclbufp, nentries, OTHER_OBJ)) < 0
-      || !aclbufp[pos].a_type)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  *modep |= aclbufp[pos].a_perm & S_IRWXO;
-  return 0;
-}
-
-extern "C" int
-aclfrommode32 (__aclent32_t *aclbufp, int nentries, mode_t *modep)
-{
-  int pos;
-
-  if (!aclbufp || nentries < 1 || !modep)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  if ((pos = searchace (aclbufp, nentries, USER_OBJ)) < 0
-      || !aclbufp[pos].a_type)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  aclbufp[pos].a_perm = (*modep & S_IRWXU) >> 6;
-  if ((pos = searchace (aclbufp, nentries, GROUP_OBJ)) < 0
-      || !aclbufp[pos].a_type)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  aclbufp[pos].a_perm = (*modep & S_IRWXG) >> 3;
-  if ((pos = searchace (aclbufp, nentries, CLASS_OBJ)) >= 0
-      && aclbufp[pos].a_type == CLASS_OBJ)
-    aclbufp[pos].a_perm = (*modep & S_IRWXG) >> 3;
-  if ((pos = searchace (aclbufp, nentries, OTHER_OBJ)) < 0
-      || !aclbufp[pos].a_type)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  aclbufp[pos].a_perm = (*modep & S_IRWXO);
-  return 0;
-}
-
-extern "C" int
-acltopbits32 (__aclent32_t *aclbufp, int nentries, mode_t *pbitsp)
-{
-  return acltomode32 (aclbufp, nentries, pbitsp);
-}
-
-extern "C" int
-aclfrompbits32 (__aclent32_t *aclbufp, int nentries, mode_t *pbitsp)
-{
-  return aclfrommode32 (aclbufp, nentries, pbitsp);
-}
-
-static char *
-permtostr (mode_t perm)
-{
-  static char pbuf[4];
-
-  pbuf[0] = (perm & S_IROTH) ? 'r' : '-';
-  pbuf[1] = (perm & S_IWOTH) ? 'w' : '-';
-  pbuf[2] = (perm & S_IXOTH) ? 'x' : '-';
-  pbuf[3] = '\0';
-  return pbuf;
-}
-
-extern "C" char *
-acltotext32 (__aclent32_t *aclbufp, int aclcnt)
-{
-  if (!aclbufp || aclcnt < 1 || aclcnt > MAX_ACL_ENTRIES
-      || aclcheck32 (aclbufp, aclcnt, NULL))
-    {
-      set_errno (EINVAL);
-      return NULL;
-    }
-  char buf[32000];
-  buf[0] = '\0';
-  bool first = true;
-
-  for (int pos = 0; pos < aclcnt; ++pos)
-    {
-      if (!first)
-	strcat (buf, ",");
-      first = false;
-      if (aclbufp[pos].a_type & ACL_DEFAULT)
-	strcat (buf, "default");
-      switch (aclbufp[pos].a_type)
-	{
-	case USER_OBJ:
-	  __small_sprintf (buf + strlen (buf), "user::%s",
-		   permtostr (aclbufp[pos].a_perm));
-	  break;
-	case USER:
-	  __small_sprintf (buf + strlen (buf), "user:%d:%s",
-		   aclbufp[pos].a_id, permtostr (aclbufp[pos].a_perm));
-	  break;
-	case GROUP_OBJ:
-	  __small_sprintf (buf + strlen (buf), "group::%s",
-		   permtostr (aclbufp[pos].a_perm));
-	  break;
-	case GROUP:
-	  __small_sprintf (buf + strlen (buf), "group:%d:%s",
-		   aclbufp[pos].a_id, permtostr (aclbufp[pos].a_perm));
-	  break;
-	case CLASS_OBJ:
-	  __small_sprintf (buf + strlen (buf), "mask::%s",
-		   permtostr (aclbufp[pos].a_perm));
-	  break;
-	case OTHER_OBJ:
-	  __small_sprintf (buf + strlen (buf), "other::%s",
-		   permtostr (aclbufp[pos].a_perm));
-	  break;
-	default:
-	  set_errno (EINVAL);
-	  return NULL;
-	}
-    }
-  return strdup (buf);
-}
-
-static mode_t
-permfromstr (char *perm)
-{
-  mode_t mode = 0;
-
-  if (strlen (perm) != 3)
-    return 01000;
-  if (perm[0] == 'r')
-    mode |= S_IROTH;
-  else if (perm[0] != '-')
-    return 01000;
-  if (perm[1] == 'w')
-    mode |= S_IWOTH;
-  else if (perm[1] != '-')
-    return 01000;
-  if (perm[2] == 'x')
-    mode |= S_IXOTH;
-  else if (perm[2] != '-')
-    return 01000;
-  return mode;
-}
-
-extern "C" __aclent32_t *
-aclfromtext32 (char *acltextp, int *)
-{
-  if (!acltextp)
-    {
-      set_errno (EINVAL);
-      return NULL;
-    }
-  char buf[strlen (acltextp) + 1];
-  __aclent32_t lacl[MAX_ACL_ENTRIES];
-  memset (lacl, 0, sizeof lacl);
-  int pos = 0;
-  strcpy (buf, acltextp);
-  char *lasts;
-  for (char *c = strtok_r (buf, ",", &lasts);
-       c;
-       c = strtok_r (NULL, ",", &lasts))
-    {
-      if (!strncmp (c, "default", 7))
-	{
-	  lacl[pos].a_type |= ACL_DEFAULT;
-	  c += 7;
-	}
-      if (!strncmp (c, "user:", 5))
-	{
-	  if (c[5] == ':')
-	    lacl[pos].a_type |= USER_OBJ;
-	  else
-	    {
-	      lacl[pos].a_type |= USER;
-	      c += 5;
-	      if (isalpha (*c))
-		{
-		  struct passwd *pw = internal_getpwnam (c);
-		  if (!pw)
-		    {
-		      set_errno (EINVAL);
-		      return NULL;
-		    }
-		  lacl[pos].a_id = pw->pw_uid;
-		  c = strechr (c, ':');
-		}
-	      else if (isdigit (*c))
-		lacl[pos].a_id = strtol (c, &c, 10);
-	      if (*c != ':')
-		{
-		  set_errno (EINVAL);
-		  return NULL;
-		}
-	    }
-	}
-      else if (!strncmp (c, "group:", 6))
-	{
-	  if (c[5] == ':')
-	    lacl[pos].a_type |= GROUP_OBJ;
-	  else
-	    {
-	      lacl[pos].a_type |= GROUP;
-	      c += 5;
-	      if (isalpha (*c))
-		{
-		  struct __group32 *gr = internal_getgrnam (c);
-		  if (!gr)
-		    {
-		      set_errno (EINVAL);
-		      return NULL;
-		    }
-		  lacl[pos].a_id = gr->gr_gid;
-		  c = strechr (c, ':');
-		}
-	      else if (isdigit (*c))
-		lacl[pos].a_id = strtol (c, &c, 10);
-	      if (*c != ':')
-		{
-		  set_errno (EINVAL);
-		  return NULL;
-		}
-	    }
-	}
-      else if (!strncmp (c, "mask:", 5))
-	{
-	  if (c[5] == ':')
-	    lacl[pos].a_type |= CLASS_OBJ;
-	  else
-	    {
-	      set_errno (EINVAL);
-	      return NULL;
-	    }
-	}
-      else if (!strncmp (c, "other:", 6))
-	{
-	  if (c[5] == ':')
-	    lacl[pos].a_type |= OTHER_OBJ;
-	  else
-	    {
-	      set_errno (EINVAL);
-	      return NULL;
-	    }
-	}
-      if ((lacl[pos].a_perm = permfromstr (c)) == 01000)
-	{
-	  set_errno (EINVAL);
-	  return NULL;
-	}
-      ++pos;
-    }
-  __aclent32_t *aclp = (__aclent32_t *) malloc (pos * sizeof (__aclent32_t));
-  if (aclp)
-    memcpy (aclp, lacl, pos * sizeof (__aclent32_t));
-  return aclp;
-}
-
-/* __aclent16_t and __aclent32_t have same size and same member offsets */
-static __aclent32_t *
-acl16to32 (__aclent16_t *aclbufp, int nentries)
-{
-  __aclent32_t *aclbufp32 = (__aclent32_t *) aclbufp;
-  if (aclbufp32)
-    for (int i = 0; i < nentries; i++)
-      aclbufp32[i].a_id &= USHRT_MAX;
-  return aclbufp32;
-}
-
-extern "C" int
-acl (const char *path, int cmd, int nentries, __aclent16_t *aclbufp)
-{
-  return acl32 (path, cmd, nentries, acl16to32 (aclbufp, nentries));
-}
-
-extern "C" int
-facl (int fd, int cmd, int nentries, __aclent16_t *aclbufp)
-{
-  return facl32 (fd, cmd, nentries, acl16to32 (aclbufp, nentries));
-}
-
-extern "C" int
-lacl (const char *path, int cmd, int nentries, __aclent16_t *aclbufp)
-{
-  return lacl32 (path, cmd, nentries, acl16to32 (aclbufp, nentries));
-}
-
-extern "C" int
-aclcheck (__aclent16_t *aclbufp, int nentries, int *which)
-{
-  return aclcheck32 (acl16to32 (aclbufp, nentries), nentries, which);
-}
-
-extern "C" int
-aclsort (int nentries, int i, __aclent16_t *aclbufp)
-{
-  return aclsort32 (nentries, i, acl16to32 (aclbufp, nentries));
-}
-
-
-extern "C" int
-acltomode (__aclent16_t *aclbufp, int nentries, mode_t *modep)
-{
-  return acltomode32 (acl16to32 (aclbufp, nentries), nentries, modep);
-}
-
-extern "C" int
-aclfrommode (__aclent16_t *aclbufp, int nentries, mode_t *modep)
-{
-  return aclfrommode32 ((__aclent32_t *)aclbufp, nentries, modep);
-}
-
-extern "C" int
-acltopbits (__aclent16_t *aclbufp, int nentries, mode_t *pbitsp)
-{
-  return acltopbits32 (acl16to32 (aclbufp, nentries), nentries, pbitsp);
-}
-
-extern "C" int
-aclfrompbits (__aclent16_t *aclbufp, int nentries, mode_t *pbitsp)
-{
-  return aclfrompbits32 ((__aclent32_t *)aclbufp, nentries, pbitsp);
-}
-
-extern "C" char *
-acltotext (__aclent16_t *aclbufp, int aclcnt)
-{
-  return acltotext32 (acl16to32 (aclbufp, aclcnt), aclcnt);
-}
-
-extern "C" __aclent16_t *
-aclfromtext (char *acltextp, int * aclcnt)
-{
-  return (__aclent16_t *) aclfromtext32 (acltextp, aclcnt);
-}
diff --git a/winsup/cygwin/sec_helper.cc b/winsup/cygwin/sec_helper.cc
deleted file mode 100644
index 9683a5aa4..000000000
--- a/winsup/cygwin/sec_helper.cc
+++ /dev/null
@@ -1,493 +0,0 @@
-/* sec_helper.cc: NT security helper functions
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-   Written by Corinna Vinschen <corinna@vinschen.de>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <grp.h>
-#include <pwd.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/acl.h>
-#include <ctype.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wininet.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "pinfo.h"
-#include "cygheap.h"
-#include "pwdgrp.h"
-
-/* General purpose security attribute objects for global use. */
-SECURITY_ATTRIBUTES NO_COPY sec_none;
-SECURITY_ATTRIBUTES NO_COPY sec_none_nih;
-SECURITY_ATTRIBUTES NO_COPY sec_all;
-SECURITY_ATTRIBUTES NO_COPY sec_all_nih;
-
-SID_IDENTIFIER_AUTHORITY NO_COPY sid_auth[] = {
-	{SECURITY_NULL_SID_AUTHORITY},
-	{SECURITY_WORLD_SID_AUTHORITY},
-	{SECURITY_LOCAL_SID_AUTHORITY},
-	{SECURITY_CREATOR_SID_AUTHORITY},
-	{SECURITY_NON_UNIQUE_AUTHORITY},
-	{SECURITY_NT_AUTHORITY}
-};
-
-cygsid well_known_null_sid;
-cygsid well_known_world_sid;
-cygsid well_known_local_sid;
-cygsid well_known_creator_owner_sid;
-cygsid well_known_creator_group_sid;
-cygsid well_known_dialup_sid;
-cygsid well_known_network_sid;
-cygsid well_known_batch_sid;
-cygsid well_known_interactive_sid;
-cygsid well_known_service_sid;
-cygsid well_known_authenticated_users_sid;
-cygsid well_known_system_sid;
-cygsid well_known_admins_sid;
-
-bool
-cygpsid::operator== (const char *nsidstr) const
-{
-  cygsid nsid (nsidstr);
-  return psid == nsid;
-}
-
-__uid32_t
-cygpsid::get_id (BOOL search_grp, int *type)
-{
-    /* First try to get SID from group, then passwd */
-  __uid32_t id = ILLEGAL_UID;
-
-  if (search_grp)
-    {
-      struct __group32 *gr;
-      if (cygheap->user.groups.pgsid == psid)
-	id = myself->gid;
-      else if ((gr = internal_getgrsid (*this)))
-	id = gr->gr_gid;
-      if (id != ILLEGAL_UID)
-	{
-	  if (type)
-	    *type = GROUP;
-	  return id;
-	}
-    }
-  if (!search_grp || type)
-    {
-      struct passwd *pw;
-      if (*this == cygheap->user.sid ())
-	id = myself->uid;
-      else if ((pw = internal_getpwsid (*this)))
-	id = pw->pw_uid;
-      if (id != ILLEGAL_UID && type)
-	*type = USER;
-    }
-  return id;
-}
-
-
-char *
-cygpsid::string (char *nsidstr) const
-{
-  char *t;
-  DWORD i;
-
-  if (!psid || !nsidstr)
-    return NULL;
-  strcpy (nsidstr, "S-1-");
-  t = nsidstr + sizeof ("S-1-") - 1;
-  t += __small_sprintf (t, "%u", GetSidIdentifierAuthority (psid)->Value[5]);
-  for (i = 0; i < *GetSidSubAuthorityCount (psid); ++i)
-    t += __small_sprintf (t, "-%lu", *GetSidSubAuthority (psid, i));
-  return nsidstr;
-}
-
-void
-cygsid::init ()
-{
-  well_known_null_sid = "S-1-0-0";
-  well_known_world_sid = "S-1-1-0";
-  well_known_local_sid = "S-1-2-0";
-  well_known_creator_owner_sid = "S-1-3-0";
-  well_known_creator_group_sid = "S-1-3-1";
-  well_known_dialup_sid = "S-1-5-1";
-  well_known_network_sid = "S-1-5-2";
-  well_known_batch_sid = "S-1-5-3";
-  well_known_interactive_sid = "S-1-5-4";
-  well_known_service_sid = "S-1-5-6";
-  well_known_authenticated_users_sid = "S-1-5-11";
-  well_known_system_sid = "S-1-5-18";
-  well_known_admins_sid = "S-1-5-32-544";
-}
-
-PSID
-cygsid::get_sid (DWORD s, DWORD cnt, DWORD *r)
-{
-  DWORD i;
-
-  if (s > 5 || cnt < 1 || cnt > 8)
-    {
-      psid = NO_SID;
-      return NULL;
-    }
-  set ();
-  InitializeSid (psid, &sid_auth[s], cnt);
-  for (i = 0; i < cnt; ++i)
-    memcpy ((char *) psid + 8 + sizeof (DWORD) * i, &r[i], sizeof (DWORD));
-  return psid;
-}
-
-const PSID
-cygsid::getfromstr (const char *nsidstr)
-{
-  char *lasts;
-  DWORD s, cnt = 0;
-  DWORD r[8];
-
-  if (nsidstr && !strncmp (nsidstr, "S-1-", 4))
-    {
-      s = strtoul (nsidstr + 4, &lasts, 10);
-      while (cnt < 8 && *lasts == '-')
-	r[cnt++] = strtoul (lasts + 1, &lasts, 10);
-      if (!*lasts)
-	return get_sid (s, cnt, r);
-    }
-  return psid = NO_SID;
-}
-
-BOOL
-cygsid::getfrompw (const struct passwd *pw)
-{
-  char *sp = (pw && pw->pw_gecos) ? strrchr (pw->pw_gecos, ',') : NULL;
-  return (*this = sp ? sp + 1 : sp) != NULL;
-}
-
-BOOL
-cygsid::getfromgr (const struct __group32 *gr)
-{
-  char *sp = (gr && gr->gr_passwd) ? gr->gr_passwd : NULL;
-  return (*this = sp) != NULL;
-}
-
-bool
-get_sids_info (cygpsid owner_sid, cygpsid group_sid, __uid32_t * uidret, __gid32_t * gidret)
-{
-  struct passwd *pw;
-  struct __group32 *gr = NULL;
-  bool ret = false;
-
-  owner_sid.debug_print ("get_sids_info: owner SID =");
-  group_sid.debug_print ("get_sids_info: group SID =");
-
-  if (group_sid == cygheap->user.groups.pgsid)
-    *gidret = myself->gid;
-  else if ((gr = internal_getgrsid (group_sid)))
-    *gidret = gr->gr_gid;
-  else
-    *gidret = ILLEGAL_GID;
-
-  if (owner_sid == cygheap->user.sid ())
-    {
-      *uidret = myself->uid;
-      if (*gidret == myself->gid)
-	ret = true;
-      else
-	ret = (internal_getgroups (0, NULL, &group_sid) > 0);
-    }
-  else if ((pw = internal_getpwsid (owner_sid)))
-    {
-      *uidret = pw->pw_uid;
-      if (gr || (*gidret != ILLEGAL_GID
-		 && (gr = internal_getgrgid (*gidret))))
-	for (int idx = 0; gr->gr_mem[idx]; ++idx)
-	  if ((ret = strcasematch (pw->pw_name, gr->gr_mem[idx])))
-	    break;
-    }
-  else
-    *uidret = ILLEGAL_UID;
-
-  return ret;
-}
-
-PSECURITY_DESCRIPTOR
-security_descriptor::malloc (size_t nsize)
-{
-  if (psd)
-    ::free (psd);
-  psd = (PSECURITY_DESCRIPTOR) ::malloc (nsize);
-  sd_size = psd ? nsize : 0;
-  return psd;
-}
-
-PSECURITY_DESCRIPTOR
-security_descriptor::realloc (size_t nsize)
-{
-  PSECURITY_DESCRIPTOR tmp = (PSECURITY_DESCRIPTOR) ::realloc (psd, nsize);
-  if (!tmp)
-    return NULL;
-  sd_size = nsize;
-  return psd = tmp;
-}
-
-void
-security_descriptor::free (void)
-{
-  if (psd)
-    ::free (psd);
-  psd = NULL;
-  sd_size = 0;
-}
-
-#if 0 // unused
-#define SIDLEN	(sidlen = MAX_SID_LEN, &sidlen)
-#define DOMLEN	(domlen = INTERNET_MAX_HOST_NAME_LENGTH, &domlen)
-
-BOOL
-lookup_name (const char *name, const char *logsrv, PSID ret_sid)
-{
-  cygsid sid;
-  DWORD sidlen;
-  char domuser[INTERNET_MAX_HOST_NAME_LENGTH + UNLEN + 2];
-  char dom[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-  DWORD domlen;
-  SID_NAME_USE acc_type;
-
-  debug_printf ("name  : %s", name ? name : "NULL");
-
-  if (!name)
-    return FALSE;
-
-  if (cygheap->user.domain ())
-    {
-      strcat (strcat (strcpy (domuser, cygheap->user.domain ()), "\\"), name);
-      if (LookupAccountName (NULL, domuser, sid, SIDLEN, dom, DOMLEN, &acc_type)
-	  && legal_sid_type (acc_type))
-	goto got_it;
-      if (logsrv && *logsrv
-	  && LookupAccountName (logsrv, domuser, sid, SIDLEN,
-				dom, DOMLEN, &acc_type)
-	  && legal_sid_type (acc_type))
-	goto got_it;
-    }
-  if (logsrv && *logsrv)
-    {
-      if (LookupAccountName (logsrv, name, sid, SIDLEN, dom, DOMLEN, &acc_type)
-	  && legal_sid_type (acc_type))
-	goto got_it;
-      if (acc_type == SidTypeDomain)
-	{
-	  strcat (strcat (strcpy (domuser, dom), "\\"), name);
-	  if (LookupAccountName (logsrv, domuser, sid, SIDLEN,
-				 dom, DOMLEN, &acc_type))
-	    goto got_it;
-	}
-    }
-  if (LookupAccountName (NULL, name, sid, SIDLEN, dom, DOMLEN, &acc_type)
-      && legal_sid_type (acc_type))
-    goto got_it;
-  if (acc_type == SidTypeDomain)
-    {
-      strcat (strcat (strcpy (domuser, dom), "\\"), name);
-      if (LookupAccountName (NULL, domuser, sid, SIDLEN, dom, DOMLEN,&acc_type))
-	goto got_it;
-    }
-  debug_printf ("LookupAccountName (%s) %E", name);
-  __seterrno ();
-  return FALSE;
-
-got_it:
-  debug_printf ("sid : [%d]", *GetSidSubAuthority ((PSID) sid,
-			      *GetSidSubAuthorityCount ((PSID) sid) - 1));
-
-  if (ret_sid)
-    memcpy (ret_sid, sid, sidlen);
-
-  return TRUE;
-}
-
-#undef SIDLEN
-#undef DOMLEN
-#endif //unused
-
-int
-set_process_privilege (const char *privilege, bool enable, bool use_thread)
-{
-  HANDLE hToken = NULL;
-  LUID priv_luid;
-  TOKEN_PRIVILEGES new_priv, orig_priv;
-  int ret = -1;
-  DWORD size;
-
-  if (!LookupPrivilegeValue (NULL, privilege, &priv_luid))
-    {
-      __seterrno ();
-      goto out;
-    }
-
-  if ((use_thread
-       && !OpenThreadToken (GetCurrentThread (), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES,
-			    0, &hToken))
-      ||(!use_thread
-	 && !OpenProcessToken (hMainProc, TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES,
-			     &hToken)))
-    {
-      __seterrno ();
-      goto out;
-    }
-
-  new_priv.PrivilegeCount = 1;
-  new_priv.Privileges[0].Luid = priv_luid;
-  new_priv.Privileges[0].Attributes = enable ? SE_PRIVILEGE_ENABLED : 0;
-
-  if (!AdjustTokenPrivileges (hToken, FALSE, &new_priv,
-			      sizeof orig_priv, &orig_priv, &size))
-    {
-      __seterrno ();
-      goto out;
-    }
-  /* AdjustTokenPrivileges returns TRUE even if the privilege could not
-     be enabled. GetLastError () returns an correct error code, though. */
-  if (enable && GetLastError () == ERROR_NOT_ALL_ASSIGNED)
-    {
-      __seterrno ();
-      goto out;
-    }
-
-  ret = orig_priv.Privileges[0].Attributes == SE_PRIVILEGE_ENABLED ? 1 : 0;
-
-out:
-  if (hToken)
-    CloseHandle (hToken);
-
-  syscall_printf ("%d = set_process_privilege (%s, %d)", ret, privilege, enable);
-  return ret;
-}
-
-/*
- * Function to return a common SECURITY_DESCRIPTOR * that
- * allows all access.
- */
-
-static NO_COPY SECURITY_DESCRIPTOR *null_sdp = 0;
-
-SECURITY_DESCRIPTOR *__stdcall
-get_null_sd ()
-{
-  static NO_COPY SECURITY_DESCRIPTOR sd;
-
-  if (null_sdp == 0)
-    {
-      InitializeSecurityDescriptor (&sd, SECURITY_DESCRIPTOR_REVISION);
-      SetSecurityDescriptorDacl (&sd, TRUE, 0, FALSE);
-      null_sdp = &sd;
-    }
-  return null_sdp;
-}
-
-/*
- * Initialize global security attributes.
- *
- * Called from dcrt0.cc (_dll_crt0).
- */
-
-void
-init_global_security ()
-{
-  sec_none.nLength = sec_none_nih.nLength =
-  sec_all.nLength = sec_all_nih.nLength = sizeof (SECURITY_ATTRIBUTES);
-  sec_none.bInheritHandle = sec_all.bInheritHandle = TRUE;
-  sec_none_nih.bInheritHandle = sec_all_nih.bInheritHandle = FALSE;
-  sec_none.lpSecurityDescriptor = sec_none_nih.lpSecurityDescriptor = NULL;
-  sec_all.lpSecurityDescriptor = sec_all_nih.lpSecurityDescriptor =
-    get_null_sd ();
-}
-
-bool
-sec_acl (PACL acl, bool original, bool admins, PSID sid1, PSID sid2, DWORD access2)
-{
-  size_t acl_len = MAX_DACL_LEN(5);
-  LPVOID pAce;
-  cygpsid psid;
-
-  if (!InitializeAcl (acl, acl_len, ACL_REVISION))
-    {
-      debug_printf ("InitializeAcl %E");
-      return false;
-    }
-  if (sid1)
-    if (!AddAccessAllowedAce (acl, ACL_REVISION,
-			      GENERIC_ALL, sid1))
-      debug_printf ("AddAccessAllowedAce(sid1) %E");
-  if (original && (psid = cygheap->user.saved_sid ())
-      && psid != sid1 && psid != well_known_system_sid)
-    if (!AddAccessAllowedAce (acl, ACL_REVISION,
-			      GENERIC_ALL, psid))
-      debug_printf ("AddAccessAllowedAce(original) %E");
-  if (sid2)
-    if (!AddAccessAllowedAce (acl, ACL_REVISION,
-			      access2, sid2))
-      debug_printf ("AddAccessAllowedAce(sid2) %E");
-  if (admins)
-    if (!AddAccessAllowedAce (acl, ACL_REVISION,
-			      GENERIC_ALL, well_known_admins_sid))
-      debug_printf ("AddAccessAllowedAce(admin) %E");
-  if (!AddAccessAllowedAce (acl, ACL_REVISION,
-			    GENERIC_ALL, well_known_system_sid))
-    debug_printf ("AddAccessAllowedAce(system) %E");
-  FindFirstFreeAce (acl, &pAce);
-  if (pAce)
-    acl->AclSize = (char *) pAce - (char *) acl;
-  else
-    debug_printf ("FindFirstFreeAce %E");
-
-  return true;
-}
-
-PSECURITY_ATTRIBUTES __stdcall
-__sec_user (PVOID sa_buf, PSID sid1, PSID sid2, DWORD access2, BOOL inherit)
-{
-  PSECURITY_ATTRIBUTES psa = (PSECURITY_ATTRIBUTES) sa_buf;
-  PSECURITY_DESCRIPTOR psd = (PSECURITY_DESCRIPTOR)
-			     ((char *) sa_buf + sizeof (*psa));
-  PACL acl = (PACL) ((char *) sa_buf + sizeof (*psa) + sizeof (*psd));
-
-  if (!wincap.has_security () || !sec_acl (acl, true, true, sid1, sid2, access2))
-    return inherit ? &sec_none : &sec_none_nih;
-
-  if (!InitializeSecurityDescriptor (psd, SECURITY_DESCRIPTOR_REVISION))
-    debug_printf ("InitializeSecurityDescriptor %E");
-
-/*
- * Setting the owner lets the created security attribute not work
- * on NT4 SP3 Server. Don't know why, but the function still does
- * what it should do also if the owner isn't set.
-*/
-#if 0
-  if (!SetSecurityDescriptorOwner (psd, sid, FALSE))
-    debug_printf ("SetSecurityDescriptorOwner %E");
-#endif
-
-  if (!SetSecurityDescriptorDacl (psd, TRUE, acl, FALSE))
-    debug_printf ("SetSecurityDescriptorDacl %E");
-
-  psa->nLength = sizeof (SECURITY_ATTRIBUTES);
-  psa->lpSecurityDescriptor = psd;
-  psa->bInheritHandle = inherit;
-  return psa;
-}
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc
deleted file mode 100644
index 1c34052fd..000000000
--- a/winsup/cygwin/security.cc
+++ /dev/null
@@ -1,1915 +0,0 @@
-/* security.cc: NT security functions
-
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Originaly written by Gunther Ebert, gunther.ebert@ixos-leipzig.de
-   Completely rewritten by Corinna Vinschen <corinna@vinschen.de>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <grp.h>
-#include <pwd.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/acl.h>
-#include <ctype.h>
-#include <winnls.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wininet.h>
-#include <ntsecapi.h>
-#include <subauth.h>
-#include <aclapi.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "pinfo.h"
-#include "cygheap.h"
-#include <ntdef.h>
-#include "ntdll.h"
-#include "lm.h"
-#include "pwdgrp.h"
-
-bool allow_ntsec;
-/* allow_smbntsec is handled exclusively in path.cc (path_conv::check).
-   It's defined here because of it's strong relationship to allow_ntsec.
-   The default is TRUE to reflect the old behaviour. */
-bool allow_smbntsec;
-
-cygsid *
-cygsidlist::alloc_sids (int n)
-{
-  if (n > 0)
-    return (cygsid *) cmalloc (HEAP_STR, n * sizeof (cygsid));
-  else
-    return NULL;
-}
-
-void
-cygsidlist::free_sids ()
-{
-  if (sids)
-    cfree (sids);
-  sids = NULL;
-  count = maxcount = 0;
-  type = cygsidlist_empty;
-}
-
-extern "C" void
-cygwin_set_impersonation_token (const HANDLE hToken)
-{
-  debug_printf ("set_impersonation_token (%d)", hToken);
-  cygheap->user.external_token = hToken;
-  return;
-}
-
-void
-extract_nt_dom_user (const struct passwd *pw, char *domain, char *user)
-{
-  char *d, *u, *c;
-
-  domain[0] = 0;
-  strlcpy (user, pw->pw_name, UNLEN + 1);
-  debug_printf ("pw_gecos = %x (%s)", pw->pw_gecos, pw->pw_gecos);
-
-  if ((d = strstr (pw->pw_gecos, "U-")) != NULL &&
-      (d == pw->pw_gecos || d[-1] == ','))
-    {
-      c = strechr (d + 2, ',');
-      if ((u = strechr (d + 2, '\\')) >= c)
-	u = d + 1;
-      else if (u - d <= INTERNET_MAX_HOST_NAME_LENGTH + 2)
-	strlcpy (domain, d + 2, u - d - 1);
-      if (c - u <= UNLEN + 1)
-	strlcpy (user, u + 1, c - u);
-    }
-  if (domain[0])
-    return;
-
-  cygsid psid;
-  DWORD ulen = UNLEN + 1;
-  DWORD dlen = INTERNET_MAX_HOST_NAME_LENGTH + 1;
-  SID_NAME_USE use;
-  if (psid.getfrompw (pw))
-    LookupAccountSid (NULL, psid, user, &ulen, domain, &dlen, &use);
-}
-
-extern "C" HANDLE
-cygwin_logon_user (const struct passwd *pw, const char *password)
-{
-  if (!wincap.has_security ())
-    {
-      set_errno (ENOSYS);
-      return INVALID_HANDLE_VALUE;
-    }
-  if (!pw)
-    {
-      set_errno (EINVAL);
-      return INVALID_HANDLE_VALUE;
-    }
-
-  char nt_domain[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-  char nt_user[UNLEN + 1];
-  HANDLE hToken;
-
-  extract_nt_dom_user (pw, nt_domain, nt_user);
-  debug_printf ("LogonUserA (%s, %s, %s, ...)", nt_user, nt_domain, password);
-  if (!LogonUserA (nt_user, *nt_domain ? nt_domain : NULL, (char *) password,
-		   LOGON32_LOGON_INTERACTIVE,
-		   LOGON32_PROVIDER_DEFAULT,
-		   &hToken)
-      || !SetHandleInformation (hToken,
-				HANDLE_FLAG_INHERIT,
-				HANDLE_FLAG_INHERIT))
-    {
-      __seterrno ();
-      return INVALID_HANDLE_VALUE;
-    }
-  debug_printf ("%d = logon_user(%s,...)", hToken, pw->pw_name);
-  return hToken;
-}
-
-static void
-str2lsa (LSA_STRING &tgt, const char *srcstr)
-{
-  tgt.Length = strlen (srcstr);
-  tgt.MaximumLength = tgt.Length + 1;
-  tgt.Buffer = (PCHAR) srcstr;
-}
-
-static void
-str2buf2lsa (LSA_STRING &tgt, char *buf, const char *srcstr)
-{
-  tgt.Length = strlen (srcstr);
-  tgt.MaximumLength = tgt.Length + 1;
-  tgt.Buffer = (PCHAR) buf;
-  memcpy (buf, srcstr, tgt.MaximumLength);
-}
-
-void
-str2buf2uni (UNICODE_STRING &tgt, WCHAR *buf, const char *srcstr)
-{
-  tgt.Length = strlen (srcstr) * sizeof (WCHAR);
-  tgt.MaximumLength = tgt.Length + sizeof (WCHAR);
-  tgt.Buffer = (PWCHAR) buf;
-  sys_mbstowcs (buf, srcstr, tgt.MaximumLength);
-}
-
-#if 0				/* unused */
-static void
-lsa2wchar (WCHAR *tgt, LSA_UNICODE_STRING &src, int size)
-{
-  size = (size - 1) * sizeof (WCHAR);
-  if (src.Length < size)
-    size = src.Length;
-  memcpy (tgt, src.Buffer, size);
-  size >>= 1;
-  tgt[size] = 0;
-}
-#endif
-
-static void
-lsa2str (char *tgt, LSA_UNICODE_STRING &src, int size)
-{
-  if (src.Length / 2 < size)
-    size = src.Length / 2;
-  sys_wcstombs (tgt, src.Buffer, size);
-  tgt[size] = 0;
-}
-
-static LSA_HANDLE
-open_local_policy ()
-{
-  LSA_OBJECT_ATTRIBUTES oa = { 0, 0, 0, 0, 0, 0 };
-  LSA_HANDLE lsa = INVALID_HANDLE_VALUE;
-
-  NTSTATUS ret = LsaOpenPolicy (NULL, &oa, POLICY_EXECUTE, &lsa);
-  if (ret != STATUS_SUCCESS)
-    __seterrno_from_win_error (LsaNtStatusToWinError (ret));
-  return lsa;
-}
-
-static void
-close_local_policy (LSA_HANDLE &lsa)
-{
-  if (lsa != INVALID_HANDLE_VALUE)
-    LsaClose (lsa);
-  lsa = INVALID_HANDLE_VALUE;
-}
-
-#if 0 /* unused */
-static BOOL
-get_lsa_srv_inf (LSA_HANDLE lsa, char *logonserver, char *domain)
-{
-  NET_API_STATUS ret;
-  WCHAR *buf;
-  char name[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-  WCHAR account[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-  WCHAR primary[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-  PPOLICY_ACCOUNT_DOMAIN_INFO adi;
-  PPOLICY_PRIMARY_DOMAIN_INFO pdi;
-
-  if ((ret = LsaQueryInformationPolicy (lsa, PolicyAccountDomainInformation,
-					(PVOID *) &adi)) != STATUS_SUCCESS)
-    {
-      __seterrno_from_win_error (LsaNtStatusToWinError (ret));
-      return FALSE;
-    }
-  lsa2wchar (account, adi->DomainName, INTERNET_MAX_HOST_NAME_LENGTH + 1);
-  LsaFreeMemory (adi);
-  if ((ret = LsaQueryInformationPolicy (lsa, PolicyPrimaryDomainInformation,
-					(PVOID *) &pdi)) != STATUS_SUCCESS)
-    {
-      __seterrno_from_win_error (LsaNtStatusToWinError (ret));
-      return FALSE;
-    }
-  lsa2wchar (primary, pdi->Name, INTERNET_MAX_HOST_NAME_LENGTH + 1);
-  LsaFreeMemory (pdi);
-  /* If the SID given in the primary domain info is NULL, the machine is
-     not member of a domain.  The name in the primary domain info is the
-     name of the workgroup then. */
-  if (pdi->Sid &&
-      (ret =
-       NetGetDCName (NULL, primary, (LPBYTE *) &buf)) == STATUS_SUCCESS)
-    {
-      sys_wcstombs (name, buf, INTERNET_MAX_HOST_NAME_LENGTH + 1);
-      strcpy (logonserver, name);
-      if (domain)
-	sys_wcstombs (domain, primary, INTERNET_MAX_HOST_NAME_LENGTH + 1);
-    }
-  else
-    {
-      sys_wcstombs (name, account, INTERNET_MAX_HOST_NAME_LENGTH + 1);
-      strcpy (logonserver, "\\\\");
-      strcat (logonserver, name);
-      if (domain)
-	sys_wcstombs (domain, account, INTERNET_MAX_HOST_NAME_LENGTH + 1);
-    }
-  if (ret == STATUS_SUCCESS)
-    NetApiBufferFree (buf);
-  return TRUE;
-}
-#endif
-
-bool
-get_logon_server (const char *domain, char *server, WCHAR *wserver)
-{
-  WCHAR wdomain[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-  NET_API_STATUS ret;
-  WCHAR *buf;
-  DWORD size = INTERNET_MAX_HOST_NAME_LENGTH + 1;
-
-  /* Empty domain is interpreted as local system */
-  if ((GetComputerName (server + 2, &size)) &&
-      (strcasematch (domain, server + 2) || !domain[0]))
-    {
-      server[0] = server[1] = '\\';
-      if (wserver)
-	sys_mbstowcs (wserver, server, INTERNET_MAX_HOST_NAME_LENGTH + 1);
-      return true;
-    }
-
-  /* Try to get the primary domain controller for the domain */
-  sys_mbstowcs (wdomain, domain, INTERNET_MAX_HOST_NAME_LENGTH + 1);
-  if ((ret = NetGetDCName (NULL, wdomain, (LPBYTE *) &buf)) == STATUS_SUCCESS)
-    {
-      sys_wcstombs (server, buf, INTERNET_MAX_HOST_NAME_LENGTH + 1);
-      if (wserver)
-	for (WCHAR *ptr1 = buf; (*wserver++ = *ptr1++);)
-	  ;
-      NetApiBufferFree (buf);
-      return true;
-    }
-  __seterrno_from_win_error (ret);
-  return false;
-}
-
-static bool
-get_user_groups (WCHAR *wlogonserver, cygsidlist &grp_list, char *user,
-		 char *domain)
-{
-  char dgroup[INTERNET_MAX_HOST_NAME_LENGTH + GNLEN + 2];
-  WCHAR wuser[UNLEN + 1];
-  sys_mbstowcs (wuser, user, UNLEN + 1);
-  LPGROUP_USERS_INFO_0 buf;
-  DWORD cnt, tot, len;
-  NET_API_STATUS ret;
-
-  /* Look only on logonserver */
-  ret = NetUserGetGroups (wlogonserver, wuser, 0, (LPBYTE *) &buf,
-			  MAX_PREFERRED_LENGTH, &cnt, &tot);
-  if (ret)
-    {
-      __seterrno_from_win_error (ret);
-      /* It's no error when the user name can't be found. */
-      return ret == NERR_UserNotFound;
-    }
-
-  len = strlen (domain);
-  strcpy (dgroup, domain);
-  dgroup[len++] = '\\';
-
-  for (DWORD i = 0; i < cnt; ++i)
-    {
-      cygsid gsid;
-      DWORD glen = MAX_SID_LEN;
-      char domain[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-      DWORD dlen = sizeof (domain);
-      SID_NAME_USE use = SidTypeInvalid;
-
-      sys_wcstombs (dgroup + len, buf[i].grui0_name, GNLEN + 1);
-      if (!LookupAccountName (NULL, dgroup, gsid, &glen, domain, &dlen, &use))
-	debug_printf ("LookupAccountName(%s): %E", dgroup);
-      else if (legal_sid_type (use))
-	grp_list += gsid;
-      else
-	debug_printf ("Global group %s invalid. Domain: %s Use: %d",
-		      dgroup, domain, use);
-    }
-
-  NetApiBufferFree (buf);
-  return true;
-}
-
-static bool
-is_group_member (WCHAR *wgroup, PSID pusersid, cygsidlist &grp_list)
-{
-  LPLOCALGROUP_MEMBERS_INFO_0 buf;
-  DWORD cnt, tot;
-  NET_API_STATUS ret;
-  bool retval = false;
-
-  /* Members can be users or global groups */
-  ret = NetLocalGroupGetMembers (NULL, wgroup, 0, (LPBYTE *) &buf,
-				 MAX_PREFERRED_LENGTH, &cnt, &tot, NULL);
-  if (ret)
-    return false;
-
-  for (DWORD bidx = 0; !retval && bidx < cnt; ++bidx)
-    if (EqualSid (pusersid, buf[bidx].lgrmi0_sid))
-      retval = true;
-    else
-      for (int glidx = 0; !retval && glidx < grp_list.count; ++glidx)
-	if (EqualSid (grp_list.sids[glidx], buf[bidx].lgrmi0_sid))
-	  retval = true;
-
-  NetApiBufferFree (buf);
-  return retval;
-}
-
-static bool
-get_user_local_groups (cygsidlist &grp_list, PSID pusersid)
-{
-  LPLOCALGROUP_INFO_0 buf;
-  DWORD cnt, tot;
-  NET_API_STATUS ret;
-
-  ret = NetLocalGroupEnum (NULL, 0, (LPBYTE *) &buf,
-			   MAX_PREFERRED_LENGTH, &cnt, &tot, NULL);
-  if (ret)
-    {
-      __seterrno_from_win_error (ret);
-      return false;
-    }
-
-  char bgroup[INTERNET_MAX_HOST_NAME_LENGTH + GNLEN + 2];
-  char lgroup[INTERNET_MAX_HOST_NAME_LENGTH + GNLEN + 2];
-  DWORD blen, llen;
-  SID_NAME_USE use;
-
-  blen = llen = INTERNET_MAX_HOST_NAME_LENGTH + 1;
-  if (!LookupAccountSid (NULL, well_known_admins_sid, lgroup, &llen, bgroup, &blen, &use)
-      || !GetComputerNameA (lgroup, &(llen = INTERNET_MAX_HOST_NAME_LENGTH + 1)))
-    {
-      __seterrno ();
-      return false;
-    }
-  bgroup[blen++] = lgroup[llen++] = '\\';
-
-  for (DWORD i = 0; i < cnt; ++i)
-    if (is_group_member (buf[i].lgrpi0_name, pusersid, grp_list))
-      {
-	cygsid gsid;
-	DWORD glen = MAX_SID_LEN;
-	char domain[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-	DWORD dlen = sizeof (domain);
-
-	use = SidTypeInvalid;
-	sys_wcstombs (bgroup + blen, buf[i].lgrpi0_name, GNLEN + 1);
-	if (!LookupAccountName (NULL, bgroup, gsid, &glen, domain, &dlen, &use))
-	  {
-	    if (GetLastError () != ERROR_NONE_MAPPED)
-	      debug_printf ("LookupAccountName(%s): %E", bgroup);
-	    strcpy (lgroup + llen, bgroup + blen);
-	    if (!LookupAccountName (NULL, lgroup, gsid, &glen,
-				    domain, &dlen, &use))
-	      debug_printf ("LookupAccountName(%s): %E", lgroup);
-	  }
-	if (!legal_sid_type (use))
-	  debug_printf ("Rejecting local %s. use: %d", bgroup + blen, use);
-	else if (!grp_list.contains (gsid))
-	  grp_list += gsid;
-      }
-  NetApiBufferFree (buf);
-  return true;
-}
-
-static bool
-sid_in_token_groups (PTOKEN_GROUPS grps, cygsid &sid)
-{
-  if (!grps)
-    return false;
-  for (DWORD i = 0; i < grps->GroupCount; ++i)
-    if (sid == grps->Groups[i].Sid)
-      return true;
-  return false;
-}
-
-#if 0				/* Unused */
-static BOOL
-get_user_primary_group (WCHAR *wlogonserver, const char *user,
-			PSID pusersid, cygsid &pgrpsid)
-{
-  LPUSER_INFO_3 buf;
-  WCHAR wuser[UNLEN + 1];
-  NET_API_STATUS ret;
-  BOOL retval = FALSE;
-  UCHAR count = 0;
-
-  if (well_known_system_sid == pusersid)
-    {
-      pgrpsid = well_known_system_sid;
-      return TRUE;
-    }
-
-  sys_mbstowcs (wuser, user, UNLEN + 1);
-  ret = NetUserGetInfo (wlogonserver, wuser, 3, (LPBYTE *) &buf);
-  if (ret)
-    {
-      __seterrno_from_win_error (ret);
-      return FALSE;
-    }
-
-  pgrpsid = pusersid;
-  if (IsValidSid (pgrpsid)
-      && (count = *GetSidSubAuthorityCount (pgrpsid)) > 1)
-    {
-      *GetSidSubAuthority (pgrpsid, count - 1) = buf->usri3_primary_group_id;
-      retval = TRUE;
-    }
-  NetApiBufferFree (buf);
-  return retval;
-}
-#endif
-
-static void
-get_unix_group_sidlist (struct passwd *pw, cygsidlist &grp_list)
-{
-  struct __group32 *gr;
-  cygsid gsid;
-
-  for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx)
-    {
-      if (gr->gr_gid == (__gid32_t) pw->pw_gid)
-	goto found;
-      else if (gr->gr_mem)
-	for (int gi = 0; gr->gr_mem[gi]; ++gi)
-	  if (strcasematch (pw->pw_name, gr->gr_mem[gi]))
-	    goto found;
-      continue;
-    found:
-      if (gsid.getfromgr (gr) && !grp_list.contains (gsid))
-	grp_list += gsid;
-
-    }
-}
-
-static void
-get_token_group_sidlist (cygsidlist &grp_list, PTOKEN_GROUPS my_grps,
-			 LUID auth_luid, int &auth_pos)
-{
-  auth_pos = -1;
-  if (my_grps)
-    {
-      if (sid_in_token_groups (my_grps, well_known_local_sid))
-	grp_list += well_known_local_sid;
-      if (sid_in_token_groups (my_grps, well_known_dialup_sid))
-	grp_list += well_known_dialup_sid;
-      if (sid_in_token_groups (my_grps, well_known_network_sid))
-	grp_list += well_known_network_sid;
-      if (sid_in_token_groups (my_grps, well_known_batch_sid))
-	grp_list += well_known_batch_sid;
-      if (sid_in_token_groups (my_grps, well_known_interactive_sid))
-	grp_list += well_known_interactive_sid;
-      if (sid_in_token_groups (my_grps, well_known_service_sid))
-	grp_list += well_known_service_sid;
-    }
-  else
-    {
-      grp_list += well_known_local_sid;
-      grp_list += well_known_interactive_sid;
-    }
-  if (auth_luid.QuadPart != 999) /* != SYSTEM_LUID */
-    {
-      char buf[64];
-      __small_sprintf (buf, "S-1-5-5-%u-%u", auth_luid.HighPart,
-		       auth_luid.LowPart);
-      grp_list += buf;
-      auth_pos = grp_list.count - 1;
-    }
-}
-
-static bool
-get_initgroups_sidlist (cygsidlist &grp_list,
-			PSID usersid, PSID pgrpsid, struct passwd *pw,
-			PTOKEN_GROUPS my_grps, LUID auth_luid, int &auth_pos,
-			bool &special_pgrp)
-{
-  grp_list += well_known_world_sid;
-  grp_list += well_known_authenticated_users_sid;
-  if (well_known_system_sid == usersid)
-    {
-      auth_pos = -1;
-      grp_list += well_known_admins_sid;
-      get_unix_group_sidlist (pw, grp_list);
-    }
-  else
-    {
-      char user[UNLEN + 1];
-      char domain[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-      WCHAR wserver[INTERNET_MAX_HOST_NAME_LENGTH + 3];
-      char server[INTERNET_MAX_HOST_NAME_LENGTH + 3];
-
-      get_token_group_sidlist (grp_list, my_grps, auth_luid, auth_pos);
-      extract_nt_dom_user (pw, domain, user);
-      if (get_logon_server (domain, server, wserver))
-	get_user_groups (wserver, grp_list, user, domain);
-      get_unix_group_sidlist (pw, grp_list);
-      if (!get_user_local_groups (grp_list, usersid))
-	return false;
-    }
-  /* special_pgrp true if pgrpsid is not in normal groups */
-  if ((special_pgrp = !grp_list.contains (pgrpsid)))
-    grp_list += pgrpsid;
-  return true;
-}
-
-static void
-get_setgroups_sidlist (cygsidlist &tmp_list, PTOKEN_GROUPS my_grps,
-		       user_groups &groups, LUID auth_luid, int &auth_pos)
-{
-  PSID pgpsid = groups.pgsid;
-  tmp_list += well_known_world_sid;
-  tmp_list += well_known_authenticated_users_sid;
-  get_token_group_sidlist (tmp_list, my_grps, auth_luid, auth_pos);
-  for (int gidx = 0; gidx < groups.sgsids.count; gidx++)
-    tmp_list += groups.sgsids.sids[gidx];
-  if (!groups.sgsids.contains (pgpsid))
-    tmp_list += pgpsid;
-}
-
-static const char *sys_privs[] = {
-  SE_TCB_NAME,
-  SE_ASSIGNPRIMARYTOKEN_NAME,
-  SE_CREATE_TOKEN_NAME,
-  SE_CHANGE_NOTIFY_NAME,
-  SE_SECURITY_NAME,
-  SE_BACKUP_NAME,
-  SE_RESTORE_NAME,
-  SE_SYSTEMTIME_NAME,
-  SE_SHUTDOWN_NAME,
-  SE_REMOTE_SHUTDOWN_NAME,
-  SE_TAKE_OWNERSHIP_NAME,
-  SE_DEBUG_NAME,
-  SE_SYSTEM_ENVIRONMENT_NAME,
-  SE_SYSTEM_PROFILE_NAME,
-  SE_PROF_SINGLE_PROCESS_NAME,
-  SE_INC_BASE_PRIORITY_NAME,
-  SE_LOAD_DRIVER_NAME,
-  SE_CREATE_PAGEFILE_NAME,
-  SE_INCREASE_QUOTA_NAME
-};
-
-#define SYSTEM_PERMISSION_COUNT (sizeof sys_privs / sizeof (const char *))
-
-PTOKEN_PRIVILEGES
-get_system_priv_list (cygsidlist &grp_list)
-{
-  LUID priv;
-  PTOKEN_PRIVILEGES privs = (PTOKEN_PRIVILEGES)
-    malloc (sizeof (ULONG) + 20 * sizeof (LUID_AND_ATTRIBUTES));
-  if (!privs)
-    {
-      debug_printf ("malloc (system_privs) failed.");
-      return NULL;
-    }
-  privs->PrivilegeCount = 0;
-
-  for (DWORD i = 0; i < SYSTEM_PERMISSION_COUNT; ++i)
-    if (LookupPrivilegeValue (NULL, sys_privs[i], &priv))
-      {
-	privs->Privileges[privs->PrivilegeCount].Luid = priv;
-	privs->Privileges[privs->PrivilegeCount].Attributes =
-	  SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_ENABLED_BY_DEFAULT;
-	++privs->PrivilegeCount;
-      }
-  return privs;
-}
-
-PTOKEN_PRIVILEGES
-get_priv_list (LSA_HANDLE lsa, cygsid &usersid, cygsidlist &grp_list)
-{
-  PLSA_UNICODE_STRING privstrs;
-  ULONG cnt;
-  PTOKEN_PRIVILEGES privs = NULL;
-  NTSTATUS ret;
-  char buf[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-
-  if (usersid == well_known_system_sid)
-    return get_system_priv_list (grp_list);
-
-  for (int grp = -1; grp < grp_list.count; ++grp)
-    {
-      if (grp == -1)
-	{
-	  if ((ret = LsaEnumerateAccountRights (lsa, usersid, &privstrs,
-						&cnt)) != STATUS_SUCCESS)
-	    continue;
-	}
-      else if ((ret = LsaEnumerateAccountRights (lsa, grp_list.sids[grp],
-						 &privstrs, &cnt))
-	       != STATUS_SUCCESS)
-	continue;
-      for (ULONG i = 0; i < cnt; ++i)
-	{
-	  LUID priv;
-	  PTOKEN_PRIVILEGES tmp;
-	  DWORD tmp_count;
-
-	  lsa2str (buf, privstrs[i], sizeof (buf) - 1);
-	  if (!LookupPrivilegeValue (NULL, buf, &priv))
-	    continue;
-
-	  for (DWORD p = 0; privs && p < privs->PrivilegeCount; ++p)
-	    if (!memcmp (&priv, &privs->Privileges[p].Luid, sizeof (LUID)))
-	      goto next_account_right;
-
-	  tmp_count = privs ? privs->PrivilegeCount : 0;
-	  tmp = (PTOKEN_PRIVILEGES)
-	    realloc (privs, sizeof (ULONG) +
-		     (tmp_count + 1) * sizeof (LUID_AND_ATTRIBUTES));
-	  if (!tmp)
-	    {
-	      if (privs)
-		free (privs);
-	      LsaFreeMemory (privstrs);
-	      debug_printf ("realloc (privs) failed.");
-	      return NULL;
-	    }
-	  tmp->PrivilegeCount = tmp_count;
-	  privs = tmp;
-	  privs->Privileges[privs->PrivilegeCount].Luid = priv;
-	  privs->Privileges[privs->PrivilegeCount].Attributes =
-	    SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_ENABLED_BY_DEFAULT;
-	  ++privs->PrivilegeCount;
-
-	next_account_right:
-	  ;
-	}
-      LsaFreeMemory (privstrs);
-    }
-  return privs;
-}
-
-/* Accept a token if
-   - the requested usersid matches the TokenUser and
-   - if setgroups has been called:
-	the token groups that are listed in /etc/group match the union of
-	the requested primary and supplementary groups in gsids.
-   - else the (unknown) implicitly requested supplementary groups and those
-	in the token are the groups associated with the usersid. We assume
-	they match and verify only the primary groups.
-	The requested primary group must appear in the token.
-	The primary group in the token is a group associated with the usersid,
-	except if the token is internal and the group is in the token SD
-	(see create_token). In that latter case that group must match the
-	requested primary group.  */
-bool
-verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern)
-{
-  DWORD size;
-  bool intern = false;
-
-  if (pintern)
-    {
-      TOKEN_SOURCE ts;
-      if (!GetTokenInformation (token, TokenSource,
-				&ts, sizeof ts, &size))
-	debug_printf ("GetTokenInformation(): %E");
-      else
-	*pintern = intern = !memcmp (ts.SourceName, "Cygwin.1", 8);
-    }
-  /* Verify usersid */
-  cygsid tok_usersid = NO_SID;
-  if (!GetTokenInformation (token, TokenUser,
-			    &tok_usersid, sizeof tok_usersid, &size))
-    debug_printf ("GetTokenInformation(): %E");
-  if (usersid != tok_usersid)
-    return false;
-
-  /* For an internal token, if setgroups was not called and if the sd group
-     is not well_known_null_sid, it must match pgrpsid */
-  if (intern && !groups.issetgroups ())
-    {
-      char sd_buf[MAX_SID_LEN + sizeof (SECURITY_DESCRIPTOR)];
-      cygpsid gsid (NO_SID);
-      if (!GetKernelObjectSecurity (token, GROUP_SECURITY_INFORMATION,
-				    (PSECURITY_DESCRIPTOR) sd_buf,
-				    sizeof sd_buf, &size))
-	debug_printf ("GetKernelObjectSecurity(): %E");
-      else if (!GetSecurityDescriptorGroup ((PSECURITY_DESCRIPTOR) sd_buf,
-					    (PSID *) &gsid, (BOOL *) &size))
-	debug_printf ("GetSecurityDescriptorGroup(): %E");
-      if (well_known_null_sid != gsid)
-	return gsid == groups.pgsid;
-    }
-
-  PTOKEN_GROUPS my_grps;
-  bool saw_buf[NGROUPS_MAX] = {};
-  bool *saw = saw_buf, sawpg = false, ret = false;
-
-  if (!GetTokenInformation (token, TokenGroups, NULL, 0, &size) &&
-      GetLastError () != ERROR_INSUFFICIENT_BUFFER)
-    debug_printf ("GetTokenInformation(token, TokenGroups): %E");
-  else if (!(my_grps = (PTOKEN_GROUPS) alloca (size)))
-    debug_printf ("alloca (my_grps) failed.");
-  else if (!GetTokenInformation (token, TokenGroups, my_grps, size, &size))
-    debug_printf ("GetTokenInformation(my_token, TokenGroups): %E");
-  else if (!groups.issetgroups ()) /* setgroups was never called */
-    ret = sid_in_token_groups (my_grps, groups.pgsid)
-	  || groups.pgsid == usersid;
-  else /* setgroups was called */
-    {
-      struct __group32 *gr;
-      cygsid gsid;
-      if (groups.sgsids.count > (int) (sizeof (saw_buf) / sizeof (*saw_buf))
-	  && !(saw = (bool *) calloc (groups.sgsids.count, sizeof (bool))))
-	goto done;
-
-      /* token groups found in /etc/group match the user.gsids ? */
-      for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx)
-	if (gsid.getfromgr (gr) && sid_in_token_groups (my_grps, gsid))
-	  {
-	    int pos = groups.sgsids.position (gsid);
-	    if (pos >= 0)
-	      saw[pos] = true;
-	    else if (groups.pgsid == gsid)
-	      sawpg = true;
-	    else if (gsid != well_known_world_sid
-		     && gsid != usersid)
-	      goto done;
-	  }
-      for (int gidx = 0; gidx < groups.sgsids.count; gidx++)
-	if (!saw[gidx])
-	  goto done;
-      ret = sawpg
-	    || groups.sgsids.contains (groups.pgsid)
-	    || groups.pgsid == usersid;
-    }
-done:
-  if (saw != saw_buf)
-    free (saw);
-  return ret;
-}
-
-HANDLE
-create_token (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
-{
-  NTSTATUS ret;
-  LSA_HANDLE lsa = INVALID_HANDLE_VALUE;
-  int old_priv_state;
-
-  cygsidlist tmp_gsids (cygsidlist_auto, 12);
-
-  SECURITY_QUALITY_OF_SERVICE sqos =
-    { sizeof sqos, SecurityImpersonation, SECURITY_STATIC_TRACKING, FALSE };
-  OBJECT_ATTRIBUTES oa = { sizeof oa, 0, 0, 0, 0, &sqos };
-  PSECURITY_ATTRIBUTES psa;
-  bool special_pgrp = false;
-  char sa_buf[1024];
-  LUID auth_luid = SYSTEM_LUID;
-  LARGE_INTEGER exp = { QuadPart:INT64_MAX };
-
-  TOKEN_USER user;
-  PTOKEN_GROUPS new_tok_gsids = NULL;
-  PTOKEN_PRIVILEGES privs = NULL;
-  TOKEN_OWNER owner;
-  TOKEN_PRIMARY_GROUP pgrp;
-  TOKEN_DEFAULT_DACL dacl = {};
-  TOKEN_SOURCE source;
-  TOKEN_STATISTICS stats;
-  memcpy (source.SourceName, "Cygwin.1", 8);
-  source.SourceIdentifier.HighPart = 0;
-  source.SourceIdentifier.LowPart = 0x0101;
-
-  HANDLE token = INVALID_HANDLE_VALUE;
-  HANDLE primary_token = INVALID_HANDLE_VALUE;
-
-  HANDLE my_token = INVALID_HANDLE_VALUE;
-  PTOKEN_GROUPS my_tok_gsids = NULL;
-  DWORD size;
-
-  /* SE_CREATE_TOKEN_NAME privilege needed to call NtCreateToken. */
-  if ((old_priv_state = set_process_privilege (SE_CREATE_TOKEN_NAME)) < 0)
-    goto out;
-
-  /* Open policy object. */
-  if ((lsa = open_local_policy ()) == INVALID_HANDLE_VALUE)
-    goto out;
-
-  /* User, owner, primary group. */
-  user.User.Sid = usersid;
-  user.User.Attributes = 0;
-  owner.Owner = usersid;
-
-  /* Retrieve authentication id and group list from own process. */
-  if (!OpenProcessToken (hMainProc, TOKEN_QUERY, &my_token))
-    debug_printf ("OpenProcessToken(my_token): %E");
-  else
-    {
-      /* Switching user context to SYSTEM doesn't inherit the authentication
-	 id of the user account running current process. */
-      if (usersid != well_known_system_sid)
-	if (!GetTokenInformation (my_token, TokenStatistics,
-				  &stats, sizeof stats, &size))
-	  debug_printf
-	    ("GetTokenInformation(my_token, TokenStatistics): %E");
-	else
-	  auth_luid = stats.AuthenticationId;
-
-      /* Retrieving current processes group list to be able to inherit
-	 some important well known group sids. */
-      if (!GetTokenInformation (my_token, TokenGroups, NULL, 0, &size) &&
-	  GetLastError () != ERROR_INSUFFICIENT_BUFFER)
-	debug_printf ("GetTokenInformation(my_token, TokenGroups): %E");
-      else if (!(my_tok_gsids = (PTOKEN_GROUPS) malloc (size)))
-	debug_printf ("malloc (my_tok_gsids) failed.");
-      else if (!GetTokenInformation (my_token, TokenGroups, my_tok_gsids,
-				     size, &size))
-	{
-	  debug_printf ("GetTokenInformation(my_token, TokenGroups): %E");
-	  free (my_tok_gsids);
-	  my_tok_gsids = NULL;
-	}
-      CloseHandle (my_token);
-    }
-
-  /* Create list of groups, the user is member in. */
-  int auth_pos;
-  if (new_groups.issetgroups ())
-    get_setgroups_sidlist (tmp_gsids, my_tok_gsids, new_groups, auth_luid,
-			   auth_pos);
-  else if (!get_initgroups_sidlist (tmp_gsids, usersid, new_groups.pgsid, pw,
-				    my_tok_gsids, auth_luid, auth_pos,
-				    special_pgrp))
-    goto out;
-
-  /* Primary group. */
-  pgrp.PrimaryGroup = new_groups.pgsid;
-
-  /* Create a TOKEN_GROUPS list from the above retrieved list of sids. */
-  char grps_buf[sizeof (ULONG) + tmp_gsids.count * sizeof (SID_AND_ATTRIBUTES)];
-  new_tok_gsids = (PTOKEN_GROUPS) grps_buf;
-  new_tok_gsids->GroupCount = tmp_gsids.count;
-  for (DWORD i = 0; i < new_tok_gsids->GroupCount; ++i)
-    {
-      new_tok_gsids->Groups[i].Sid = tmp_gsids.sids[i];
-      new_tok_gsids->Groups[i].Attributes = SE_GROUP_MANDATORY |
-	SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED;
-    }
-  if (auth_pos >= 0)
-    new_tok_gsids->Groups[auth_pos].Attributes |= SE_GROUP_LOGON_ID;
-
-  /* Retrieve list of privileges of that user. */
-  if (!(privs = get_priv_list (lsa, usersid, tmp_gsids)))
-    goto out;
-
-  /* Let's be heroic... */
-  ret = NtCreateToken (&token, TOKEN_ALL_ACCESS, &oa, TokenImpersonation,
-		       &auth_luid, &exp, &user, new_tok_gsids, privs, &owner,
-		       &pgrp, &dacl, &source);
-  if (ret)
-    __seterrno_from_win_error (RtlNtStatusToDosError (ret));
-  else if (GetLastError () == ERROR_PROC_NOT_FOUND)
-    {
-      __seterrno ();
-      debug_printf ("Loading NtCreateToken failed.");
-    }
-  else
-    {
-      /* Set security descriptor and primary group */
-      psa = sec_user (sa_buf, usersid);
-      if (psa->lpSecurityDescriptor &&
-	  !SetSecurityDescriptorGroup ((PSECURITY_DESCRIPTOR)
-				       psa->lpSecurityDescriptor,
-				       special_pgrp ? new_groups.pgsid
-						    : well_known_null_sid,
-				       FALSE))
-	debug_printf ("SetSecurityDescriptorGroup %E");
-      /* Convert to primary token. */
-      if (!DuplicateTokenEx (token, MAXIMUM_ALLOWED, psa, SecurityImpersonation,
-			     TokenPrimary, &primary_token))
-	{
-	  __seterrno ();
-	  debug_printf ("DuplicateTokenEx %E");
-	}
-    }
-
-out:
-  if (old_priv_state >= 0)
-    set_process_privilege (SE_CREATE_TOKEN_NAME, old_priv_state);
-  if (token != INVALID_HANDLE_VALUE)
-    CloseHandle (token);
-  if (privs)
-    free (privs);
-  if (my_tok_gsids)
-    free (my_tok_gsids);
-  close_local_policy (lsa);
-
-  debug_printf ("%d = create_token ()", primary_token);
-  return primary_token;
-}
-
-int subauth_id = 255;
-
-HANDLE
-subauth (struct passwd *pw)
-{
-  LSA_STRING name;
-  HANDLE lsa_hdl;
-  LSA_OPERATIONAL_MODE sec_mode;
-  NTSTATUS ret, ret2;
-  ULONG package_id, size;
-  struct {
-    LSA_STRING str;
-    CHAR buf[16];
-  } origin;
-  struct {
-    MSV1_0_LM20_LOGON auth;
-    WCHAR dombuf[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-    WCHAR usrbuf[UNLEN + 1];
-    WCHAR wkstbuf[1];
-    CHAR authinf1[1];
-    CHAR authinf2[1];
-  } subbuf;
-  TOKEN_SOURCE ts;
-  PMSV1_0_LM20_LOGON_PROFILE profile;
-  LUID luid;
-  QUOTA_LIMITS quota;
-  char nt_domain[INTERNET_MAX_HOST_NAME_LENGTH + 1];
-  char nt_user[UNLEN + 1];
-  SECURITY_ATTRIBUTES sa = { sizeof sa, NULL, TRUE };
-  HANDLE user_token = INVALID_HANDLE_VALUE;
-  HANDLE primary_token = INVALID_HANDLE_VALUE;
-  int old_tcb_state;
-
-  if ((old_tcb_state = set_process_privilege (SE_TCB_NAME)) < 0)
-    return INVALID_HANDLE_VALUE;
-
-  /* Register as logon process. */
-  str2lsa (name, "Cygwin");
-  SetLastError (0);
-  ret = LsaRegisterLogonProcess (&name, &lsa_hdl, &sec_mode);
-  if (ret != STATUS_SUCCESS)
-    {
-      debug_printf ("LsaRegisterLogonProcess: %d", ret);
-      __seterrno_from_win_error (LsaNtStatusToWinError (ret));
-      goto out;
-    }
-  else if (GetLastError () == ERROR_PROC_NOT_FOUND)
-    {
-      debug_printf ("Couldn't load Secur32.dll");
-      goto out;
-    }
-  /* Get handle to MSV1_0 package. */
-  str2lsa (name, MSV1_0_PACKAGE_NAME);
-  ret = LsaLookupAuthenticationPackage (lsa_hdl, &name, &package_id);
-  if (ret != STATUS_SUCCESS)
-    {
-      debug_printf ("LsaLookupAuthenticationPackage: %d", ret);
-      __seterrno_from_win_error (LsaNtStatusToWinError (ret));
-      LsaDeregisterLogonProcess (lsa_hdl);
-      goto out;
-    }
-  /* Create origin. */
-  str2buf2lsa (origin.str, origin.buf, "Cygwin");
-  /* Create token source. */
-  memcpy (ts.SourceName, "Cygwin.1", 8);
-  ts.SourceIdentifier.HighPart = 0;
-  ts.SourceIdentifier.LowPart = 0x0100;
-  /* Get user information. */
-  extract_nt_dom_user (pw, nt_domain, nt_user);
-  /* Fill subauth with values. */
-  subbuf.auth.MessageType = MsV1_0NetworkLogon;
-  str2buf2uni (subbuf.auth.LogonDomainName, subbuf.dombuf, nt_domain);
-  str2buf2uni (subbuf.auth.UserName, subbuf.usrbuf, nt_user);
-  str2buf2uni (subbuf.auth.Workstation, subbuf.wkstbuf, "");
-  memcpy (subbuf.auth.ChallengeToClient, "12345678", MSV1_0_CHALLENGE_LENGTH);
-  str2buf2lsa (subbuf.auth.CaseSensitiveChallengeResponse, subbuf.authinf1, "");
-  str2buf2lsa (subbuf.auth.CaseInsensitiveChallengeResponse,subbuf.authinf2,"");
-  subbuf.auth.ParameterControl = 0 | (subauth_id << 24);
-  /* Try to logon... */
-  ret = LsaLogonUser (lsa_hdl, (PLSA_STRING) &origin, Network,
-		      package_id, &subbuf, sizeof subbuf,
-		      NULL, &ts, (PVOID *) &profile, &size,
-		      &luid, &user_token, &quota, &ret2);
-  if (ret != STATUS_SUCCESS)
-    {
-      debug_printf ("LsaLogonUser: %d", ret);
-      __seterrno_from_win_error (LsaNtStatusToWinError (ret));
-      LsaDeregisterLogonProcess (lsa_hdl);
-      goto out;
-    }
-  LsaFreeReturnBuffer (profile);
-  /* Convert to primary token. */
-  if (!DuplicateTokenEx (user_token, TOKEN_ALL_ACCESS, &sa,
-			 SecurityImpersonation, TokenPrimary, &primary_token))
-    __seterrno ();
-
-out:
-  set_process_privilege (SE_TCB_NAME, old_tcb_state);
-  if (user_token != INVALID_HANDLE_VALUE)
-    CloseHandle (user_token);
-  return primary_token;
-}
-
-/* read_sd reads a security descriptor from a file.
-   In case of error, -1 is returned and errno is set.
-   If sd_buf is too small, 0 is returned and sd_size
-   is set to the needed buffer size.
-   On success, 1 is returned.
-
-   GetFileSecurity() is used instead of BackupRead()
-   to avoid access denied errors if the caller has
-   not the permission to open that file for read.
-
-   Originally the function should return the size
-   of the SD on success. Unfortunately NT returns
-   0 in `len' on success, while W2K returns the
-   correct size!
-   
-   2003-11-26: Now the function allocates the space needed by itself so
-   it knows the real size and returns it in the security_descriptor object.
-*/
-
-LONG
-read_sd (const char *file, security_descriptor &sd)
-{
-
-  DWORD len = 0;
-  const char *pfile = file;
-  char fbuf[CYG_MAX_PATH];
-  if (current_codepage == oem_cp)
-    {
-      DWORD fname_len = min (sizeof (fbuf) - 1, strlen (file));
-      bzero (fbuf, sizeof (fbuf));
-      OemToCharBuff (file, fbuf, fname_len);
-      pfile = fbuf;
-    }
-
-  if (!GetFileSecurity (pfile,
-			OWNER_SECURITY_INFORMATION
-			| GROUP_SECURITY_INFORMATION
-			| DACL_SECURITY_INFORMATION,
-			NULL, 0, &len)
-      && GetLastError () != ERROR_INSUFFICIENT_BUFFER)
-    {
-      debug_printf ("file = %s", file);
-      __seterrno ();
-      return -1;
-    }
-  debug_printf ("file = %s: len=%d", file, len);
-  if (!sd.malloc (len))
-    {
-      set_errno (ENOMEM);
-      return -1;
-    }
-  if (!GetFileSecurity (pfile,
-			OWNER_SECURITY_INFORMATION
-			| GROUP_SECURITY_INFORMATION
-			| DACL_SECURITY_INFORMATION,
-			sd, len, &len))
-    {
-      __seterrno ();
-      return -1;
-    }
-  return sd.size ();
-}
-
-LONG
-write_sd (const char *file, security_descriptor &sd)
-{
-  BOOL dummy;
-  cygpsid owner;
-
-  if (!GetSecurityDescriptorOwner (sd, (PSID *) &owner, &dummy))
-    {
-      __seterrno ();
-      return -1;
-    }
-  /* Try turning privilege on, may not have WRITE_OWNER or WRITE_DAC access.
-     Must have privilege to set different owner, else BackupWrite misbehaves */
-  static int NO_COPY saved_res; /* 0: never, 1: failed, 2 & 3: OK */
-  int res;
-  if (!saved_res || cygheap->user.issetuid ())
-    {
-      res = 2 + set_process_privilege (SE_RESTORE_NAME, true,
-				       cygheap->user.issetuid ());
-      if (!cygheap->user.issetuid ())
-	saved_res = res;
-    }
-  else
-    res = saved_res;
-  if (res == 1 && owner != cygheap->user.sid ())
-    return -1;
-
-  HANDLE fh;
-  fh = CreateFile (file,
-		   WRITE_OWNER | WRITE_DAC,
-		   FILE_SHARE_READ | FILE_SHARE_WRITE,
-		   &sec_none_nih,
-		   OPEN_EXISTING,
-		   FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS,
-		   NULL);
-
-  if (fh == INVALID_HANDLE_VALUE)
-    {
-      __seterrno ();
-      return -1;
-    }
-
-  LPVOID context = NULL;
-  DWORD bytes_written = 0;
-  WIN32_STREAM_ID header;
-
-  memset (&header, 0, sizeof (header));
-  /* write new security info header */
-  header.dwStreamId = BACKUP_SECURITY_DATA;
-  header.dwStreamAttributes = STREAM_CONTAINS_SECURITY;
-  header.Size.HighPart = 0;
-  header.Size.LowPart = sd.size ();
-  header.dwStreamNameSize = 0;
-  if (!BackupWrite (fh, (LPBYTE) &header,
-		    3 * sizeof (DWORD) + sizeof (LARGE_INTEGER),
-		    &bytes_written, FALSE, TRUE, &context))
-    {
-      __seterrno ();
-      CloseHandle (fh);
-      return -1;
-    }
-
-  /* write new security descriptor */
-  if (!BackupWrite (fh, (LPBYTE) (PSECURITY_DESCRIPTOR) sd,
-		    header.Size.LowPart + header.dwStreamNameSize,
-		    &bytes_written, FALSE, TRUE, &context))
-    {
-      /* Samba returns ERROR_NOT_SUPPORTED.
-	 FAT returns ERROR_INVALID_SECURITY_DESCR.
-	 This shouldn't return as error, but better be ignored. */
-      DWORD ret = GetLastError ();
-      if (ret != ERROR_NOT_SUPPORTED && ret != ERROR_INVALID_SECURITY_DESCR)
-	{
-	  __seterrno ();
-	  BackupWrite (fh, NULL, 0, &bytes_written, TRUE, TRUE, &context);
-	  CloseHandle (fh);
-	  return -1;
-	}
-    }
-
-  /* terminate the restore process */
-  BackupWrite (fh, NULL, 0, &bytes_written, TRUE, TRUE, &context);
-  CloseHandle (fh);
-  return 0;
-}
-
-static void
-get_attribute_from_acl (mode_t *attribute, PACL acl, PSID owner_sid,
-			PSID group_sid, bool grp_member)
-{
-  ACCESS_ALLOWED_ACE *ace;
-  int allow = 0;
-  int deny = 0;
-  int *flags, *anti;
-
-  for (DWORD i = 0; i < acl->AceCount; ++i)
-    {
-      if (!GetAce (acl, i, (PVOID *) &ace))
-	continue;
-      if (ace->Header.AceFlags & INHERIT_ONLY)
-	continue;
-      switch (ace->Header.AceType)
-	{
-	case ACCESS_ALLOWED_ACE_TYPE:
-	  flags = &allow;
-	  anti = &deny;
-	  break;
-	case ACCESS_DENIED_ACE_TYPE:
-	  flags = &deny;
-	  anti = &allow;
-	  break;
-	default:
-	  continue;
-	}
-
-      cygpsid ace_sid ((PSID) &ace->SidStart);
-      if (ace_sid == well_known_world_sid)
-	{
-	  if (ace->Mask & FILE_READ_BITS)
-	    *flags |= ((!(*anti & S_IROTH)) ? S_IROTH : 0)
-		      | ((!(*anti & S_IRGRP)) ? S_IRGRP : 0)
-		      | ((!(*anti & S_IRUSR)) ? S_IRUSR : 0);
-	  if (ace->Mask & FILE_WRITE_BITS)
-	    *flags |= ((!(*anti & S_IWOTH)) ? S_IWOTH : 0)
-		      | ((!(*anti & S_IWGRP)) ? S_IWGRP : 0)
-		      | ((!(*anti & S_IWUSR)) ? S_IWUSR : 0);
-	  if (ace->Mask & FILE_EXEC_BITS)
-	    *flags |= ((!(*anti & S_IXOTH)) ? S_IXOTH : 0)
-		      | ((!(*anti & S_IXGRP)) ? S_IXGRP : 0)
-		      | ((!(*anti & S_IXUSR)) ? S_IXUSR : 0);
-	  if ((S_ISDIR (*attribute)) &&
-	      (ace->Mask & (FILE_WRITE_DATA | FILE_EXECUTE | FILE_DELETE_CHILD))
-	      == (FILE_WRITE_DATA | FILE_EXECUTE))
-	    *flags |= S_ISVTX;
-	}
-      else if (ace_sid == well_known_null_sid)
-	{
-	  /* Read SUID, SGID and VTX bits from NULL ACE. */
-	  if (ace->Mask & FILE_READ_DATA)
-	    *flags |= S_ISVTX;
-	  if (ace->Mask & FILE_WRITE_DATA)
-	    *flags |= S_ISGID;
-	  if (ace->Mask & FILE_APPEND_DATA)
-	    *flags |= S_ISUID;
-	}
-      else if (ace_sid == owner_sid)
-	{
-	  if (ace->Mask & FILE_READ_BITS)
-	    *flags |= ((!(*anti & S_IRUSR)) ? S_IRUSR : 0);
-	  if (ace->Mask & FILE_WRITE_BITS)
-	    *flags |= ((!(*anti & S_IWUSR)) ? S_IWUSR : 0);
-	  if (ace->Mask & FILE_EXEC_BITS)
-	    *flags |= ((!(*anti & S_IXUSR)) ? S_IXUSR : 0);
-	}
-      else if (ace_sid == group_sid)
-	{
-	  if (ace->Mask & FILE_READ_BITS)
-	    *flags |= ((!(*anti & S_IRGRP)) ? S_IRGRP : 0)
-		      | ((grp_member && !(*anti & S_IRUSR)) ? S_IRUSR : 0);
-	  if (ace->Mask & FILE_WRITE_BITS)
-	    *flags |= ((!(*anti & S_IWGRP)) ? S_IWGRP : 0)
-		      | ((grp_member && !(*anti & S_IWUSR)) ? S_IWUSR : 0);
-	  if (ace->Mask & FILE_EXEC_BITS)
-	    *flags |= ((!(*anti & S_IXGRP)) ? S_IXGRP : 0)
-		      | ((grp_member && !(*anti & S_IXUSR)) ? S_IXUSR : 0);
-	}
-    }
-  *attribute &= ~(S_IRWXU | S_IRWXG | S_IRWXO | S_ISVTX | S_ISGID | S_ISUID);
-  if (owner_sid && group_sid && EqualSid (owner_sid, group_sid)
-      /* FIXME: temporary exception for /var/empty */
-      && well_known_system_sid != group_sid)
-    {
-      allow &= ~(S_IRGRP | S_IWGRP | S_IXGRP);
-      allow |= (((allow & S_IRUSR) ? S_IRGRP : 0)
-		| ((allow & S_IWUSR) ? S_IWGRP : 0)
-		| ((allow & S_IXUSR) ? S_IXGRP : 0));
-    }
-  *attribute |= allow;
-  return;
-}
-
-static void
-get_info_from_sd (PSECURITY_DESCRIPTOR psd, mode_t *attribute,
-		  __uid32_t *uidret, __gid32_t *gidret)
-{
-  if (!psd)
-    {
-      /* If reading the security descriptor failed, treat the object
-	 as unreadable. */
-      if (attribute)
-	*attribute &= ~(S_IRWXU | S_IRWXG | S_IRWXO);
-      if (uidret)
-	*uidret = ILLEGAL_UID;
-      if (gidret)
-	*gidret = ILLEGAL_GID;
-      return;
-    }
-
-  cygpsid owner_sid;
-  cygpsid group_sid;
-  BOOL dummy;
-
-  if (!GetSecurityDescriptorOwner (psd, (PSID *) &owner_sid, &dummy))
-    debug_printf ("GetSecurityDescriptorOwner %E");
-  if (!GetSecurityDescriptorGroup (psd, (PSID *) &group_sid, &dummy))
-    debug_printf ("GetSecurityDescriptorGroup %E");
-
-  __uid32_t uid;
-  __gid32_t gid;
-  bool grp_member = get_sids_info (owner_sid, group_sid, &uid, &gid);
-  if (uidret)
-    *uidret = uid;
-  if (gidret)
-    *gidret = gid;
-
-  if (!attribute)
-    {
-      syscall_printf ("uid %d, gid %d", uid, gid);
-      return;
-    }
-
-  PACL acl;
-  BOOL acl_exists;
-
-  if (!GetSecurityDescriptorDacl (psd, &acl_exists, &acl, &dummy))
-    {
-      __seterrno ();
-      debug_printf ("GetSecurityDescriptorDacl %E");
-      *attribute &= ~(S_IRWXU | S_IRWXG | S_IRWXO);
-    }
-  else if (!acl_exists || !acl)
-    *attribute |= S_IRWXU | S_IRWXG | S_IRWXO;
-  else
-    get_attribute_from_acl (attribute, acl, owner_sid, group_sid, grp_member);
-
-  syscall_printf ("%sACL = %x, uid %d, gid %d",
-		  (!acl_exists || !acl)?"NO ":"", *attribute, uid, gid);
-  return;
-}
-
-static void
-get_nt_attribute (const char *file, mode_t *attribute,
-		  __uid32_t *uidret, __gid32_t *gidret)
-{
-  security_descriptor sd;
-
-  if (read_sd (file, sd) <= 0)
-    debug_printf ("read_sd %E");
-  get_info_from_sd (sd, attribute, uidret, gidret);
-}
-
-int
-get_file_attribute (int use_ntsec, const char *file,
-		    mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret)
-{
-  int res;
-  syscall_printf ("file: %s", file);
-
-  if (use_ntsec && allow_ntsec && wincap.has_security ())
-    {
-      get_nt_attribute (file, attribute, uidret, gidret);
-      return 0;
-    }
-
-  if (uidret)
-    *uidret = myself->uid;
-  if (gidret)
-    *gidret = myself->gid;
-
-  if (!attribute)
-    return 0;
-
-  if (allow_ntea)
-    {
-      int oatt = *attribute;
-      res = NTReadEA (file, ".UNIXATTR", (char *)attribute, sizeof (*attribute));
-      *attribute |= oatt;
-    }
-  else
-    res = 0;
-
-  return res > 0 ? 0 : -1;
-}
-
-static void
-get_nt_object_attribute (HANDLE handle, SE_OBJECT_TYPE object_type,
-			 mode_t *attribute, __uid32_t *uidret,
-			 __gid32_t *gidret)
-{
-  security_descriptor sd;
-  PSECURITY_DESCRIPTOR psd = NULL;
-
-  if (object_type == SE_REGISTRY_KEY)
-    {
-      /* use different code for registry handles, for performance reasons */
-      DWORD len = 0;
-      if (RegGetKeySecurity ((HKEY) handle,
-			     DACL_SECURITY_INFORMATION
-			     | GROUP_SECURITY_INFORMATION
-			     | OWNER_SECURITY_INFORMATION,
-			     sd, &len) != ERROR_INSUFFICIENT_BUFFER)
-	{
-	  __seterrno ();
-	  debug_printf ("RegGetKeySecurity %E");
-	}
-      if (!sd.malloc (len))
-	set_errno (ENOMEM);
-      else if (RegGetKeySecurity ((HKEY) handle,
-				  DACL_SECURITY_INFORMATION
-				  | GROUP_SECURITY_INFORMATION
-				  | OWNER_SECURITY_INFORMATION,
-				  sd, &len) != ERROR_SUCCESS)
-	{
-	  __seterrno ();
-	  debug_printf ("RegGetKeySecurity %E");
-	}
-	get_info_from_sd (sd, attribute, uidret, gidret);
-      }
-  else
-    {
-      if (ERROR_SUCCESS != GetSecurityInfo (handle, object_type,
-					    DACL_SECURITY_INFORMATION |
-					    GROUP_SECURITY_INFORMATION |
-					    OWNER_SECURITY_INFORMATION,
-					    NULL, NULL, NULL, NULL, &psd))
-	{
-	  __seterrno ();
-	  debug_printf ("GetSecurityInfo %E");
-	  psd = NULL;
-	}
-      get_info_from_sd (psd, attribute, uidret, gidret);
-      if (psd)
-	LocalFree (psd);
-    }
-}
-
-int
-get_object_attribute (HANDLE handle, SE_OBJECT_TYPE object_type,
-		      mode_t *attribute, __uid32_t *uidret, __gid32_t *gidret)
-{
-  if (allow_ntsec && wincap.has_security ())
-    {
-      get_nt_object_attribute (handle, object_type, attribute, uidret, gidret);
-      return 0;
-    }
-  /* The entries are already set to default values */
-  return -1;
-}
-
-bool
-add_access_allowed_ace (PACL acl, int offset, DWORD attributes,
-			PSID sid, size_t &len_add, DWORD inherit)
-{
-  if (!AddAccessAllowedAce (acl, ACL_REVISION, attributes, sid))
-    {
-      __seterrno ();
-      return false;
-    }
-  ACCESS_ALLOWED_ACE *ace;
-  if (inherit && GetAce (acl, offset, (PVOID *) &ace))
-    ace->Header.AceFlags |= inherit;
-  len_add += sizeof (ACCESS_ALLOWED_ACE) - sizeof (DWORD) + GetLengthSid (sid);
-  return true;
-}
-
-bool
-add_access_denied_ace (PACL acl, int offset, DWORD attributes,
-		       PSID sid, size_t &len_add, DWORD inherit)
-{
-  if (!AddAccessDeniedAce (acl, ACL_REVISION, attributes, sid))
-    {
-      __seterrno ();
-      return false;
-    }
-  ACCESS_DENIED_ACE *ace;
-  if (inherit && GetAce (acl, offset, (PVOID *) &ace))
-    ace->Header.AceFlags |= inherit;
-  len_add += sizeof (ACCESS_DENIED_ACE) - sizeof (DWORD) + GetLengthSid (sid);
-  return true;
-}
-
-static PSECURITY_DESCRIPTOR
-alloc_sd (__uid32_t uid, __gid32_t gid, int attribute,
-	  security_descriptor &sd_ret)
-{
-  BOOL dummy;
-
-  debug_printf("uid %d, gid %d, attribute %x", uid, gid, attribute);
-
-  /* Get owner and group from current security descriptor. */
-  PSID cur_owner_sid = NULL;
-  PSID cur_group_sid = NULL;
-  if (!GetSecurityDescriptorOwner (sd_ret, &cur_owner_sid, &dummy))
-    debug_printf ("GetSecurityDescriptorOwner %E");
-  if (!GetSecurityDescriptorGroup (sd_ret, &cur_group_sid, &dummy))
-    debug_printf ("GetSecurityDescriptorGroup %E");
-
-  /* Get SID of owner. */
-  cygsid owner_sid;
-  /* Check for current user first */
-  if (uid == myself->uid)
-    owner_sid = cygheap->user.sid ();
-  else if (uid == ILLEGAL_UID)
-    owner_sid = cur_owner_sid;
-  else if (!owner_sid.getfrompw (internal_getpwuid (uid)))
-    {
-      set_errno (EINVAL);
-      return NULL;
-    }
-  owner_sid.debug_print ("alloc_sd: owner SID =");
-
-  /* Get SID of new group. */
-  cygsid group_sid;
-  /* Check for current user first */
-  if (gid == myself->gid)
-    group_sid = cygheap->user.groups.pgsid;
-  else if (gid == ILLEGAL_GID)
-    group_sid = cur_group_sid;
-  else if (!group_sid.getfromgr (internal_getgrgid (gid)))
-    {
-      set_errno (EINVAL);
-      return NULL;
-    }
-  group_sid.debug_print ("alloc_sd: group SID =");
-
-  /* Initialize local security descriptor. */
-  SECURITY_DESCRIPTOR sd;
-  if (!InitializeSecurityDescriptor (&sd, SECURITY_DESCRIPTOR_REVISION))
-    {
-      __seterrno ();
-      return NULL;
-    }
-
-  /*
-   * We set the SE_DACL_PROTECTED flag here to prevent the DACL from being
-   * modified by inheritable ACEs.
-   * This flag as well as the SetSecurityDescriptorControl call are available
-   * only since Win2K.
-   */
-  if (wincap.has_security_descriptor_control ())
-    SetSecurityDescriptorControl (&sd, SE_DACL_PROTECTED, SE_DACL_PROTECTED);
-
-  /* Create owner for local security descriptor. */
-  if (!SetSecurityDescriptorOwner (&sd, owner_sid, FALSE))
-    {
-      __seterrno ();
-      return NULL;
-    }
-
-  /* Create group for local security descriptor. */
-  if (!SetSecurityDescriptorGroup (&sd, group_sid, FALSE))
-    {
-      __seterrno ();
-      return NULL;
-    }
-
-  /* Initialize local access control list. */
-  char acl_buf[3072];
-  PACL acl = (PACL) acl_buf;
-  if (!InitializeAcl (acl, 3072, ACL_REVISION))
-    {
-      __seterrno ();
-      return NULL;
-    }
-
-  /* From here fill ACL. */
-  size_t acl_len = sizeof (ACL);
-  int ace_off = 0;
-
-  /* Construct allow attribute for owner. */
-  DWORD owner_allow = STANDARD_RIGHTS_ALL
-		      | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA;
-  if (attribute & S_IRUSR)
-    owner_allow |= FILE_GENERIC_READ;
-  if (attribute & S_IWUSR)
-    owner_allow |= FILE_GENERIC_WRITE;
-  if (attribute & S_IXUSR)
-    owner_allow |= FILE_GENERIC_EXECUTE;
-  if (S_ISDIR (attribute)
-      && (attribute & (S_IWUSR | S_IXUSR)) == (S_IWUSR | S_IXUSR))
-    owner_allow |= FILE_DELETE_CHILD;
-
-  /* Construct allow attribute for group. */
-  DWORD group_allow = STANDARD_RIGHTS_READ
-		      | FILE_READ_ATTRIBUTES | FILE_READ_EA;
-  if (attribute & S_IRGRP)
-    group_allow |= FILE_GENERIC_READ;
-  if (attribute & S_IWGRP)
-    group_allow |= STANDARD_RIGHTS_WRITE | FILE_GENERIC_WRITE;
-  if (attribute & S_IXGRP)
-    group_allow |= FILE_GENERIC_EXECUTE;
-  if (S_ISDIR (attribute)
-      && (attribute & (S_IWGRP | S_IXGRP)) == (S_IWGRP | S_IXGRP)
-      && !(attribute & S_ISVTX))
-    group_allow |= FILE_DELETE_CHILD;
-
-  /* Construct allow attribute for everyone. */
-  DWORD other_allow = STANDARD_RIGHTS_READ
-		      | FILE_READ_ATTRIBUTES | FILE_READ_EA;
-  if (attribute & S_IROTH)
-    other_allow |= FILE_GENERIC_READ;
-  if (attribute & S_IWOTH)
-    other_allow |= STANDARD_RIGHTS_WRITE | FILE_GENERIC_WRITE;
-  if (attribute & S_IXOTH)
-    other_allow |= FILE_GENERIC_EXECUTE;
-  if (S_ISDIR (attribute)
-      && (attribute & (S_IWOTH | S_IXOTH)) == (S_IWOTH | S_IXOTH)
-      && !(attribute & S_ISVTX))
-    other_allow |= FILE_DELETE_CHILD;
-
-  /* Construct SUID, SGID and VTX bits in NULL ACE. */
-  DWORD null_allow = 0L;
-  if (attribute & (S_ISUID | S_ISGID | S_ISVTX))
-    {
-      if (attribute & S_ISUID)
-	null_allow |= FILE_APPEND_DATA;
-      if (attribute & S_ISGID)
-	null_allow |= FILE_WRITE_DATA;
-      if (attribute & S_ISVTX)
-	null_allow |= FILE_READ_DATA;
-    }
-
-  /* Add owner and group permissions if SIDs are equal
-     and construct deny attributes for group and owner. */
-  bool isownergroup;
-  if ((isownergroup = (owner_sid == group_sid)))
-    owner_allow |= group_allow;
-
-  DWORD owner_deny = ~owner_allow & (group_allow | other_allow);
-  owner_deny &= ~(STANDARD_RIGHTS_READ
-		  | FILE_READ_ATTRIBUTES | FILE_READ_EA
-		  | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA);
-
-  DWORD group_deny = ~group_allow & other_allow;
-  group_deny &= ~(STANDARD_RIGHTS_READ
-		  | FILE_READ_ATTRIBUTES | FILE_READ_EA);
-
-  /* Set deny ACE for owner. */
-  if (owner_deny
-      && !add_access_denied_ace (acl, ace_off++, owner_deny,
-				 owner_sid, acl_len, NO_INHERITANCE))
-    return NULL;
-  /* Set deny ACE for group here to respect the canonical order,
-     if this does not impact owner */
-  if (group_deny && !(group_deny & owner_allow) && !isownergroup
-      && !add_access_denied_ace (acl, ace_off++, group_deny,
-				 group_sid, acl_len, NO_INHERITANCE))
-    return NULL;
-  /* Set allow ACE for owner. */
-  if (!add_access_allowed_ace (acl, ace_off++, owner_allow,
-			       owner_sid, acl_len, NO_INHERITANCE))
-    return NULL;
-  /* Set deny ACE for group, if still needed. */
-  if (group_deny & owner_allow && !isownergroup
-      && !add_access_denied_ace (acl, ace_off++, group_deny,
-				 group_sid, acl_len, NO_INHERITANCE))
-    return NULL;
-  /* Set allow ACE for group. */
-  if (!isownergroup
-      && !add_access_allowed_ace (acl, ace_off++, group_allow,
-				  group_sid, acl_len, NO_INHERITANCE))
-    return NULL;
-
-  /* Set allow ACE for everyone. */
-  if (!add_access_allowed_ace (acl, ace_off++, other_allow,
-			       well_known_world_sid, acl_len, NO_INHERITANCE))
-    return NULL;
-  /* Set null ACE for special bits. */
-  if (null_allow
-      && !add_access_allowed_ace (acl, ace_off++, null_allow,
-				  well_known_null_sid, acl_len, NO_INHERITANCE))
-    return NULL;
-
-  /* Fill ACL with unrelated ACEs from current security descriptor. */
-  PACL oacl;
-  BOOL acl_exists = FALSE;
-  ACCESS_ALLOWED_ACE *ace;
-  if (GetSecurityDescriptorDacl (sd_ret, &acl_exists, &oacl, &dummy)
-      && acl_exists && oacl)
-    for (DWORD i = 0; i < oacl->AceCount; ++i)
-      if (GetAce (oacl, i, (PVOID *) &ace))
-	{
-	  cygpsid ace_sid ((PSID) &ace->SidStart);
-
-	  /* Check for related ACEs. */
-	  if (ace_sid == well_known_null_sid)
-	    continue;
-	  if ((ace_sid == cur_owner_sid)
-	      || (ace_sid == owner_sid)
-	      || (ace_sid == cur_group_sid)
-	      || (ace_sid == group_sid)
-	      || (ace_sid == well_known_world_sid))
-	    {
-	      if (ace->Header.AceFlags & SUB_CONTAINERS_AND_OBJECTS_INHERIT)
-		ace->Header.AceFlags |= INHERIT_ONLY;
-	      else
-		continue;
-	    }
-	  /*
-	   * Add unrelated ACCESS_DENIED_ACE to the beginning but
-	   * behind the owner_deny, ACCESS_ALLOWED_ACE to the end.
-	   * FIXME: this would break the order of the inherit_only ACEs
-	   */
-	  if (!AddAce (acl, ACL_REVISION,
-		       ace->Header.AceType == ACCESS_DENIED_ACE_TYPE?
-		       (owner_deny ? 1 : 0) : MAXDWORD,
-		       (LPVOID) ace, ace->Header.AceSize))
-	    {
-	      __seterrno ();
-	      return NULL;
-	    }
-	  acl_len += ace->Header.AceSize;
-	}
-
-  /* Construct appropriate inherit attribute for new directories */
-  if (S_ISDIR (attribute) && !acl_exists)
-    {
-      const DWORD inherit = SUB_CONTAINERS_AND_OBJECTS_INHERIT | INHERIT_ONLY;
-
-#if 0 /* FIXME: Not done currently as this breaks the canonical order */
-      /* Set deny ACE for owner. */
-      if (owner_deny
-	  && !add_access_denied_ace (acl, ace_off++, owner_deny,
-				     well_known_creator_owner_sid, acl_len, inherit))
-	return NULL;
-      /* Set deny ACE for group here to respect the canonical order,
-	 if this does not impact owner */
-      if (group_deny && !(group_deny & owner_allow)
-	  && !add_access_denied_ace (acl, ace_off++, group_deny,
-				     well_known_creator_group_sid, acl_len, inherit))
-	return NULL;
-#endif
-      /* Set allow ACE for owner. */
-      if (!add_access_allowed_ace (acl, ace_off++, owner_allow,
-				   well_known_creator_owner_sid, acl_len, inherit))
-	return NULL;
-#if 0 /* FIXME: Not done currently as this breaks the canonical order and
-	 won't be preserved on chown and chmod */
-      /* Set deny ACE for group, conflicting with owner_allow. */
-      if (group_deny & owner_allow
-	  && !add_access_denied_ace (acl, ace_off++, group_deny,
-				     well_known_creator_group_sid, acl_len, inherit))
-	return NULL;
-#endif
-      /* Set allow ACE for group. */
-      if (!add_access_allowed_ace (acl, ace_off++, group_allow,
-				   well_known_creator_group_sid, acl_len, inherit))
-	return NULL;
-      /* Set allow ACE for everyone. */
-      if (!add_access_allowed_ace (acl, ace_off++, other_allow,
-				   well_known_world_sid, acl_len, inherit))
-	return NULL;
-    }
-
-  /* Set AclSize to computed value. */
-  acl->AclSize = acl_len;
-  debug_printf ("ACL-Size: %d", acl_len);
-
-  /* Create DACL for local security descriptor. */
-  if (!SetSecurityDescriptorDacl (&sd, TRUE, acl, FALSE))
-    {
-      __seterrno ();
-      return NULL;
-    }
-
-  /* Make self relative security descriptor. */
-  DWORD sd_size = 0;
-  MakeSelfRelativeSD (&sd, sd_ret, &sd_size);
-  if (sd_size <= 0)
-    {
-      __seterrno ();
-      return NULL;
-    }
-  if (!sd_ret.malloc (sd_size))
-    {
-      set_errno (ENOMEM);
-      return NULL;
-    }
-  if (!MakeSelfRelativeSD (&sd, sd_ret, &sd_size))
-    {
-      __seterrno ();
-      return NULL;
-    }
-  debug_printf ("Created SD-Size: %u", sd_ret.size ());
-
-  return sd_ret;
-}
-
-void
-set_security_attribute (int attribute, PSECURITY_ATTRIBUTES psa,
-			security_descriptor &sd)
-{
-  psa->lpSecurityDescriptor = sd.malloc (SECURITY_DESCRIPTOR_MIN_LENGTH);
-  InitializeSecurityDescriptor ((PSECURITY_DESCRIPTOR)psa->lpSecurityDescriptor,
-				SECURITY_DESCRIPTOR_REVISION);
-  psa->lpSecurityDescriptor = alloc_sd (geteuid32 (), getegid32 (),
-  					attribute, sd);
-}
-
-static int
-set_nt_attribute (const char *file, __uid32_t uid, __gid32_t gid,
-		  int attribute)
-{
-  if (!wincap.has_security ())
-    return 0;
-
-  security_descriptor sd;
-
-  int ret;
-  if ((ret = read_sd (file, sd)) <= 0)
-    {
-      debug_printf ("read_sd %E");
-      return -1;
-    }
-
-  if (!alloc_sd (uid, gid, attribute, sd))
-    return -1;
-
-  return write_sd (file, sd);
-}
-
-int
-set_file_attribute (int use_ntsec, const char *file,
-		    __uid32_t uid, __gid32_t gid, int attribute)
-{
-  int ret = 0;
-
-  if (use_ntsec && allow_ntsec)
-    ret = set_nt_attribute (file, uid, gid, attribute);
-  else if (allow_ntea && !NTWriteEA (file, ".UNIXATTR", (char *) &attribute,
-				     sizeof (attribute)))
-    {
-      __seterrno ();
-      ret = -1;
-    }
-  syscall_printf ("%d = set_file_attribute (%s, %d, %d, %p)",
-		  ret, file, uid, gid, attribute);
-  return ret;
-}
-
-int
-set_file_attribute (int use_ntsec, const char *file, int attribute)
-{
-  return set_file_attribute (use_ntsec, file,
-			     myself->uid, myself->gid, attribute);
-}
-
-int
-check_file_access (const char *fn, int flags)
-{
-  int ret = -1;
-
-  security_descriptor sd;
-
-  HANDLE hToken, hIToken;
-  BOOL status;
-  char pbuf[sizeof (PRIVILEGE_SET) + 3 * sizeof (LUID_AND_ATTRIBUTES)];
-  DWORD desired = 0, granted, plength = sizeof pbuf;
-  static GENERIC_MAPPING NO_COPY mapping = { FILE_GENERIC_READ,
-					     FILE_GENERIC_WRITE,
-					     FILE_GENERIC_EXECUTE,
-					     FILE_ALL_ACCESS };
-  if (read_sd (fn, sd) <= 0)
-    goto done;
-
-  if (cygheap->user.issetuid ())
-    hToken = cygheap->user.token ();
-  else if (!OpenProcessToken (hMainProc, TOKEN_DUPLICATE, &hToken))
-    {
-      __seterrno ();
-      goto done;
-    }
-  if (!(status = DuplicateToken (hToken, SecurityIdentification, &hIToken)))
-    __seterrno ();
-  if (!cygheap->user.issetuid ())
-    CloseHandle (hToken);
-  if (!status)
-    goto done;
-
-  if (flags & R_OK)
-    desired |= FILE_READ_DATA;
-  if (flags & W_OK)
-    desired |= FILE_WRITE_DATA;
-  if (flags & X_OK)
-    desired |= FILE_EXECUTE;
-  if (!AccessCheck (sd, hIToken, desired, &mapping,
-		    (PPRIVILEGE_SET) pbuf, &plength, &granted, &status))
-    __seterrno ();
-  else if (!status)
-    set_errno (EACCES);
-  else
-    ret = 0;
-  CloseHandle (hIToken);
- done:
-  debug_printf ("flags %x, ret %d", flags, ret);
-  return ret;
-}
diff --git a/winsup/cygwin/security.h b/winsup/cygwin/security.h
deleted file mode 100644
index 8e958ba00..000000000
--- a/winsup/cygwin/security.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/* security.h: security declarations
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SECURITY_H
-#define _SECURITY_H
-
-#include <accctrl.h>
-
-#define DEFAULT_UID DOMAIN_USER_RID_ADMIN
-#define UNKNOWN_UID 400 /* Non conflicting number */
-#define UNKNOWN_GID 401
-
-#define MAX_SID_LEN 40
-#define MAX_DACL_LEN(n) (sizeof (ACL) \
-		   + (n) * (sizeof (ACCESS_ALLOWED_ACE) - sizeof (DWORD) + MAX_SID_LEN))
-#define ACL_DEFAULT_SIZE 3072
-#define NO_SID ((PSID)NULL)
-
-#define FILE_READ_BITS   (FILE_READ_DATA | GENERIC_READ | GENERIC_ALL)
-#define FILE_WRITE_BITS  (FILE_WRITE_DATA | GENERIC_WRITE | GENERIC_ALL)
-#define FILE_EXEC_BITS   (FILE_EXECUTE | GENERIC_EXECUTE | GENERIC_ALL)
-
-class cygpsid {
-protected:
-  PSID psid;
-public:
-  cygpsid () {}
-  cygpsid (PSID nsid) { psid = nsid; }
-  operator const PSID () { return psid; }
-  const PSID operator= (PSID nsid) { return psid = nsid;}
-  __uid32_t get_id (BOOL search_grp, int *type = NULL);
-  int get_uid () { return get_id (FALSE); }
-  int get_gid () { return get_id (TRUE); }
-
-  char *string (char *nsidstr) const;
-
-  bool operator== (const PSID nsid) const
-    {
-      if (!psid || !nsid)
-	return nsid == psid;
-      return EqualSid (psid, nsid);
-    }
-  bool operator!= (const PSID nsid) const
-    { return !(*this == nsid); }
-  bool operator== (const char *nsidstr) const;
-  bool operator!= (const char *nsidstr) const
-    { return !(*this == nsidstr); }
-
-  void debug_print (const char *prefix = NULL) const
-    {
-      char buf[256] __attribute__ ((unused));
-      debug_printf ("%s %s", prefix ?: "", string (buf) ?: "NULL");
-    }
-};
-
-class cygsid : public cygpsid {
-  char sbuf[MAX_SID_LEN];
-
-  const PSID getfromstr (const char *nsidstr);
-  PSID get_sid (DWORD s, DWORD cnt, DWORD *r);
-
-  inline const PSID assign (const PSID nsid)
-    {
-      if (!nsid)
-	psid = NO_SID;
-      else
-	{
-	  psid = (PSID) sbuf;
-	  CopySid (MAX_SID_LEN, psid, nsid);
-	}
-      return psid;
-    }
-
-public:
-  static void init();
-  inline operator const PSID () { return psid; }
-
-  inline const PSID operator= (cygsid &nsid)
-    { return assign (nsid); }
-  inline const PSID operator= (const PSID nsid)
-    { return assign (nsid); }
-  inline const PSID operator= (const char *nsidstr)
-    { return getfromstr (nsidstr); }
-
-  inline cygsid () : cygpsid ((PSID) sbuf) {}
-  inline cygsid (const PSID nsid) { *this = nsid; }
-  inline cygsid (const char *nstrsid) { *this = nstrsid; }
-
-  inline PSID set () { return psid = (PSID) sbuf; }
-
-  BOOL getfrompw (const struct passwd *pw);
-  BOOL getfromgr (const struct __group32 *gr);
-};
-
-typedef enum { cygsidlist_empty, cygsidlist_alloc, cygsidlist_auto } cygsidlist_type;
-class cygsidlist {
-  int maxcount;
-public:
-  int count;
-  cygsid *sids;
-  cygsidlist_type type;
-
-  cygsidlist (cygsidlist_type t, int m)
-    {
-      type = t;
-      count = 0;
-      maxcount = m;
-      if (t == cygsidlist_alloc)
-	sids = alloc_sids (m);
-      else
-	sids = new cygsid [m];
-    }
-  ~cygsidlist () { if (type == cygsidlist_auto) delete [] sids; }
-
-  BOOL add (const PSID nsi) /* Only with auto for now */
-    {
-      if (count >= maxcount)
-	{
-	  cygsid *tmp = new cygsid [ 2 * maxcount];
-	  if (!tmp)
-	    return FALSE;
-	  maxcount *= 2;
-	  for (int i = 0; i < count; ++i)
-	    tmp[i] = sids[i];
-	  delete [] sids;
-	  sids = tmp;
-	}
-      sids[count++] = nsi;
-      return TRUE;
-    }
-  BOOL add (cygsid &nsi) { return add ((PSID) nsi); }
-  BOOL add (const char *sidstr)
-    { cygsid nsi (sidstr); return add (nsi); }
-  BOOL addfromgr (struct __group32 *gr) /* Only with alloc */
-    { return sids[count++].getfromgr (gr); }
-
-  BOOL operator+= (cygsid &si) { return add (si); }
-  BOOL operator+= (const char *sidstr) { return add (sidstr); }
-  BOOL operator+= (const PSID psid) { return add (psid); }
-
-  int position (const PSID sid) const
-    {
-      for (int i = 0; i < count; ++i)
-	if (sids[i] == sid)
-	  return i;
-      return -1;
-    }
-
-  BOOL contains (const PSID sid) const { return position (sid) >= 0; }
-  cygsid *alloc_sids (int n);
-  void free_sids ();
-  void debug_print (const char *prefix = NULL) const
-    {
-      debug_printf ("-- begin sidlist ---");
-      if (!count)
-	debug_printf ("No elements");
-      for (int i = 0; i < count; ++i)
-	sids[i].debug_print (prefix);
-      debug_printf ("-- ende sidlist ---");
-    }
-};
-
-/* Wrapper class to allow simple deleting of buffer space allocated
-   by read_sd() */
-class security_descriptor {
-protected:
-  PSECURITY_DESCRIPTOR psd;
-  DWORD sd_size;
-public:
-  security_descriptor () : psd (NULL), sd_size (0) {}
-  ~security_descriptor () { free (); }
-
-  PSECURITY_DESCRIPTOR malloc (size_t nsize);
-  PSECURITY_DESCRIPTOR realloc (size_t nsize);
-  void free (void);
-
-  inline DWORD size (void) const { return sd_size; }
-  inline operator const PSECURITY_DESCRIPTOR () { return psd; }
-};
-
-class user_groups {
-public:
-  cygsid pgsid;
-  cygsidlist sgsids;
-  BOOL ischanged;
-
-  BOOL issetgroups () const { return (sgsids.type == cygsidlist_alloc); }
-  void update_supp (const cygsidlist &newsids)
-    {
-      sgsids.free_sids ();
-      sgsids = newsids;
-      ischanged = TRUE;
-    }
-  void clear_supp ()
-    {
-      if (issetgroups ())
-	{
-	  sgsids.free_sids ();
-	  ischanged = TRUE;
-	}
-    }
-  void update_pgrp (const PSID sid)
-    {
-      pgsid = sid;
-      ischanged = TRUE;
-    }
-};
-
-extern cygsid well_known_null_sid;
-extern cygsid well_known_world_sid;
-extern cygsid well_known_local_sid;
-extern cygsid well_known_creator_owner_sid;
-extern cygsid well_known_creator_group_sid;
-extern cygsid well_known_dialup_sid;
-extern cygsid well_known_network_sid;
-extern cygsid well_known_batch_sid;
-extern cygsid well_known_interactive_sid;
-extern cygsid well_known_service_sid;
-extern cygsid well_known_authenticated_users_sid;
-extern cygsid well_known_system_sid;
-extern cygsid well_known_admins_sid;
-
-inline BOOL
-legal_sid_type (SID_NAME_USE type)
-{
-  return type == SidTypeUser  || type == SidTypeGroup
-      || type == SidTypeAlias || type == SidTypeWellKnownGroup;
-}
-
-extern bool allow_ntea;
-extern bool allow_ntsec;
-extern bool allow_smbntsec;
-
-/* File manipulation */
-int __stdcall set_process_privileges ();
-int __stdcall get_file_attribute (int, const char *, mode_t *,
-				  __uid32_t * = NULL, __gid32_t * = NULL);
-int __stdcall set_file_attribute (int, const char *, int);
-int __stdcall set_file_attribute (int, const char *, __uid32_t, __gid32_t, int);
-int __stdcall get_object_attribute (HANDLE handle, SE_OBJECT_TYPE object_type, mode_t *,
-				  __uid32_t * = NULL, __gid32_t * = NULL);
-LONG __stdcall read_sd (const char *file, security_descriptor &sd);
-LONG __stdcall write_sd (const char *file, security_descriptor &sd);
-bool __stdcall add_access_allowed_ace (PACL acl, int offset, DWORD attributes, PSID sid, size_t &len_add, DWORD inherit);
-bool __stdcall add_access_denied_ace (PACL acl, int offset, DWORD attributes, PSID sid, size_t &len_add, DWORD inherit);
-int __stdcall check_file_access (const char *, int);
-
-void set_security_attribute (int attribute, PSECURITY_ATTRIBUTES psa,
-			     security_descriptor &sd_buf);
-
-bool get_sids_info (cygpsid, cygpsid, __uid32_t * , __gid32_t *);
-
-/* Try a subauthentication. */
-HANDLE subauth (struct passwd *pw);
-/* Try creating a token directly. */
-HANDLE create_token (cygsid &usersid, user_groups &groups, struct passwd * pw);
-/* Verify an existing token */
-bool verify_token (HANDLE token, cygsid &usersid, user_groups &groups, bool *pintern = NULL);
-
-/* Extract U-domain\user field from passwd entry. */
-void extract_nt_dom_user (const struct passwd *pw, char *domain, char *user);
-/* Get default logonserver for a domain. */
-bool get_logon_server (const char * domain, char * server, WCHAR *wserver = NULL);
-
-/* sec_helper.cc: Security helper functions. */
-int set_process_privilege (const char *privilege, bool enable = true, bool use_thread = false);
-
-/* shared.cc: */
-/* Retrieve a security descriptor that allows all access */
-SECURITY_DESCRIPTOR *__stdcall get_null_sd (void);
-
-/* Various types of security attributes for use in Create* functions. */
-extern SECURITY_ATTRIBUTES sec_none, sec_none_nih, sec_all, sec_all_nih;
-extern SECURITY_ATTRIBUTES *__stdcall __sec_user (PVOID sa_buf, PSID sid1, PSID sid2, 
-						  DWORD access2, BOOL inherit)
-  __attribute__ ((regparm (3)));
-extern bool sec_acl (PACL acl, bool original, bool admins, PSID sid1 = NO_SID, 
-		     PSID sid2 = NO_SID, DWORD access2 = 0);
-
-int __stdcall NTReadEA (const char *file, const char *attrname, char *buf, int len);
-BOOL __stdcall NTWriteEA (const char *file, const char *attrname, const char *buf, int len);
-
-extern inline SECURITY_ATTRIBUTES *
-sec_user_nih (char sa_buf[], PSID sid1 = NULL, PSID sid2 = NULL, DWORD access2 = 0)
-{
-  return __sec_user (sa_buf, sid1, sid2, access2, FALSE);
-}
-
-extern inline SECURITY_ATTRIBUTES *
-sec_user (char sa_buf[], PSID sid1 = NULL, PSID sid2 = NULL, DWORD access2 = 0)
-{
-  return __sec_user (sa_buf, sid1, sid2, access2, TRUE);
-}
-#endif /*_SECURITY_H*/
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
deleted file mode 100644
index f96293409..000000000
--- a/winsup/cygwin/select.cc
+++ /dev/null
@@ -1,1507 +0,0 @@
-/* select.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Christopher Faylor of Cygnus Solutions
-   cgf@cygnus.com
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/*
- * The following line means that the BSD socket
- * definitions for fd_set, FD_ISSET etc. are used in this
- * file.
- */
-
-#define  __INSIDE_CYGWIN_NET__
-
-#include "winsup.h"
-#include <sys/socket.h>
-#include <stdlib.h>
-#include <sys/time.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <stdio.h>
-#define USE_SYS_TYPES_FD_SET
-#include <winsock.h>
-#include "select.h"
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "sigproc.h"
-#include "perthread.h"
-#include "tty.h"
-#include "cygthread.h"
-
-/*
- * All these defines below should be in sys/types.h
- * but because of the includes above, they may not have
- * been included. We create special UNIX_xxxx versions here.
- */
-
-#ifndef NBBY
-#define NBBY 8    /* number of bits in a byte */
-#endif /* NBBY */
-
-/*
- * Select uses bit masks of file descriptors in longs.
- * These macros manipulate such bit fields (the filesystem macros use chars).
- * FD_SETSIZE may be defined by the user, but the default here
- * should be >= NOFILE (param.h).
- */
-
-typedef long fd_mask;
-#define UNIX_NFDBITS (sizeof (fd_mask) * NBBY)       /* bits per mask */
-#ifndef unix_howmany
-#define unix_howmany(x,y) (((x)+((y)-1))/(y))
-#endif
-
-#define unix_fd_set fd_set
-
-#define NULL_fd_set ((fd_set *) NULL)
-#define sizeof_fd_set(n) \
-  ((unsigned) (NULL_fd_set->fds_bits + unix_howmany ((n), UNIX_NFDBITS)))
-#define UNIX_FD_SET(n, p) \
-  ((p)->fds_bits[(n)/UNIX_NFDBITS] |= (1L << ((n) % UNIX_NFDBITS)))
-#define UNIX_FD_CLR(n, p) \
-  ((p)->fds_bits[(n)/UNIX_NFDBITS] &= ~(1L << ((n) % UNIX_NFDBITS)))
-#define UNIX_FD_ISSET(n, p) \
-  ((p)->fds_bits[(n)/UNIX_NFDBITS] & (1L << ((n) % UNIX_NFDBITS)))
-#define UNIX_FD_ZERO(p, n) \
-  bzero ((caddr_t)(p), sizeof_fd_set ((n)))
-
-#define allocfd_set(n) ((fd_set *) memset (alloca (sizeof_fd_set (n)), 0, sizeof_fd_set (n)))
-#define copyfd_set(to, from, n) memcpy (to, from, sizeof_fd_set (n));
-
-#define set_handle_or_return_if_not_open(h, s) \
-  h = (s)->fh->get_handle (); \
-  if (cygheap->fdtab.not_open ((s)->fd)) \
-    { \
-      (s)->saw_error = true; \
-      set_sig_errno (EBADF); \
-      return -1; \
-    } \
-
-/* The main select code.
- */
-extern "C" int
-cygwin_select (int maxfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
-	       struct timeval *to)
-{
-  select_stuff sel;
-  fd_set *dummy_readfds = allocfd_set (maxfds);
-  fd_set *dummy_writefds = allocfd_set (maxfds);
-  fd_set *dummy_exceptfds = allocfd_set (maxfds);
-
-  select_printf ("%d, %p, %p, %p, %p", maxfds, readfds, writefds, exceptfds, to);
-
-  if (!readfds)
-    readfds = dummy_readfds;
-  if (!writefds)
-    writefds = dummy_writefds;
-  if (!exceptfds)
-    exceptfds = dummy_exceptfds;
-
-  for (int i = 0; i < maxfds; i++)
-    if (!sel.test_and_set (i, readfds, writefds, exceptfds))
-      {
-	select_printf ("aborting due to test_and_set error");
-	return -1;	/* Invalid fd, maybe? */
-      }
-
-  /* Convert to milliseconds or INFINITE if to == NULL */
-  DWORD ms = to ? (to->tv_sec * 1000) + (to->tv_usec / 1000) : INFINITE;
-  if (ms == 0 && to->tv_usec)
-    ms = 1;			/* At least 1 ms granularity */
-
-  if (to)
-    select_printf ("to->tv_sec %d, to->tv_usec %d, ms %d", to->tv_sec, to->tv_usec, ms);
-  else
-    select_printf ("to NULL, ms %x", ms);
-
-  select_printf ("sel.always_ready %d", sel.always_ready);
-
-  int timeout = 0;
-  /* Allocate some fd_set structures using the number of fds as a guide. */
-  fd_set *r = allocfd_set (maxfds);
-  fd_set *w = allocfd_set (maxfds);
-  fd_set *e = allocfd_set (maxfds);
-
-  /* Degenerate case.  No fds to wait for.  Just wait. */
-  if (sel.start.next == NULL)
-    {
-      if (WaitForSingleObject (signal_arrived, ms) == WAIT_OBJECT_0)
-	{
-	  select_printf ("signal received");
-	  set_sig_errno (EINTR);
-	  return -1;
-	}
-      timeout = 1;
-    }
-  else if (sel.always_ready || ms == 0)
-    /* Don't bother waiting. */;
-  else if ((timeout = sel.wait (r, w, e, ms) < 0))
-    return -1;	/* some kind of error */
-
-  sel.cleanup ();
-  copyfd_set (readfds, r, maxfds);
-  copyfd_set (writefds, w, maxfds);
-  copyfd_set (exceptfds, e, maxfds);
-  return timeout ? 0 : sel.poll (readfds, writefds, exceptfds);
-}
-
-/* Call cleanup functions for all inspected fds.  Gets rid of any
-   executing threads. */
-void
-select_stuff::cleanup ()
-{
-  select_record *s = &start;
-
-  select_printf ("calling cleanup routines");
-  while ((s = s->next))
-    if (s->cleanup)
-      {
-	s->cleanup (s, this);
-	s->cleanup = NULL;
-      }
-}
-
-/* Destroy all storage associated with select stuff. */
-select_stuff::~select_stuff ()
-{
-  cleanup ();
-  select_record *s = &start;
-  select_record *snext = start.next;
-
-  select_printf ("deleting select records");
-  while ((s = snext))
-    {
-      snext = s->next;
-      delete s;
-    }
-}
-
-/* Add a record to the select chain */
-int
-select_stuff::test_and_set (int i, fd_set *readfds, fd_set *writefds,
-			    fd_set *exceptfds)
-{
-  select_record *s = NULL;
-  if (UNIX_FD_ISSET (i, readfds) && (s = cygheap->fdtab.select_read (i, s)) == NULL)
-    return 0; /* error */
-  if (UNIX_FD_ISSET (i, writefds) && (s = cygheap->fdtab.select_write (i, s)) == NULL)
-    return 0; /* error */
-  if (UNIX_FD_ISSET (i, exceptfds) && (s = cygheap->fdtab.select_except (i, s)) == NULL)
-    return 0; /* error */
-  if (s == NULL)
-    return 1; /* nothing to do */
-
-  if (s->read_ready || s->write_ready || s->except_ready)
-    always_ready = true;
-
-  if (s->windows_handle || s->windows_handle || s->windows_handle)
-    windows_used = true;
-
-  s->next = start.next;
-  start.next = s;
-  return 1;
-}
-
-/* The heart of select.  Waits for an fd to do something interesting. */
-int
-select_stuff::wait (fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
-		    DWORD ms)
-{
-  int wait_ret;
-  HANDLE w4[MAXIMUM_WAIT_OBJECTS];
-  select_record *s = &start;
-  int m = 0;
-  int res = 0;
-
-  w4[m++] = signal_arrived;  /* Always wait for the arrival of a signal. */
-  /* Loop through the select chain, starting up anything appropriate and
-     counting the number of active fds. */
-  while ((s = s->next))
-    {
-      if (m > MAXIMUM_WAIT_OBJECTS)
-	{
-	  set_sig_errno (EINVAL);
-	  return -1;
-	}
-      if (!s->startup (s, this))
-	{
-	  __seterrno ();
-	  return -1;
-	}
-      if (s->h == NULL)
-	continue;
-      for (int i = 1; i < m; i++)
-	if (w4[i] == s->h)
-	  goto next_while;
-      w4[m++] = s->h;
-  next_while:
-      continue;
-    }
-
-  DWORD start_time = GetTickCount ();	/* Record the current time for later use. */
-
-  debug_printf ("m %d, ms %u", m, ms);
-  for (;;)
-    {
-      if (!windows_used)
-	wait_ret = WaitForMultipleObjects (m, w4, FALSE, ms);
-      else
-	wait_ret = MsgWaitForMultipleObjects (m, w4, FALSE, ms, QS_ALLINPUT);
-
-      switch (wait_ret)
-      {
-	case WAIT_OBJECT_0:
-	  select_printf ("signal received");
-	  set_sig_errno (EINTR);
-	  return -1;
-	case WAIT_FAILED:
-	  select_printf ("WaitForMultipleObjects failed");
-	  __seterrno ();
-	  return -1;
-	case WAIT_TIMEOUT:
-	  select_printf ("timed out");
-	  res = 1;
-	  goto out;
-      }
-
-      select_printf ("woke up.  wait_ret %d.  verifying", wait_ret);
-      s = &start;
-      bool gotone = false;
-      /* Some types of object (e.g., consoles) wake up on "inappropriate" events
-	 like mouse movements.  The verify function will detect these situations.
-	 If it returns false, then this wakeup was a false alarm and we should go
-	 back to waiting. */
-      while ((s = s->next))
-	if (s->saw_error)
-	  return -1;		/* Somebody detected an error */
-	else if ((((wait_ret >= m && s->windows_handle) || s->h == w4[wait_ret])) &&
-	    s->verify (s, readfds, writefds, exceptfds))
-	  gotone = true;
-
-      select_printf ("gotone %d", gotone);
-      if (gotone)
-	goto out;
-
-      if (ms == INFINITE)
-	{
-	  select_printf ("looping");
-	  continue;
-	}
-      select_printf ("recalculating ms");
-
-      DWORD now = GetTickCount ();
-      if (now > (start_time + ms))
-	{
-	  select_printf ("timed out after verification");
-	  goto out;
-	}
-      ms -= (now - start_time);
-      start_time = now;
-      select_printf ("ms now %u", ms);
-    }
-
-out:
-  select_printf ("returning %d", res);
-  return res;
-}
-
-static int
-set_bits (select_record *me, fd_set *readfds, fd_set *writefds,
-	  fd_set *exceptfds)
-{
-  int ready = 0;
-  select_printf ("me %p, testing fd %d (%s)", me, me->fd, me->fh->get_name ());
-  if (me->read_selected && me->read_ready)
-    {
-      UNIX_FD_SET (me->fd, readfds);
-      ready++;
-    }
-  if (me->write_selected && me->write_ready)
-    {
-      UNIX_FD_SET (me->fd, writefds);
-      if (me->except_on_write && me->fh->is_socket ())
-	((fhandler_socket *) me->fh)->set_connect_state (CONNECTED);
-      ready++;
-    }
-  if ((me->except_selected || me->except_on_write) && me->except_ready)
-    {
-      if (me->except_on_write) /* Only on sockets */
-	{
-	  UNIX_FD_SET (me->fd, writefds);
-	  if (me->fh->is_socket ())
-	    ((fhandler_socket *) me->fh)->set_connect_state (CONNECTED);
-	}
-      if (me->except_selected)
-	UNIX_FD_SET (me->fd, exceptfds);
-      ready++;
-    }
-  select_printf ("ready %d", ready);
-  return ready;
-}
-
-/* Poll every fd in the select chain.  Set appropriate fd in mask. */
-int
-select_stuff::poll (fd_set *readfds, fd_set *writefds, fd_set *exceptfds)
-{
-  int n = 0;
-  select_record *s = &start;
-  while ((s = s->next))
-    n += (!s->peek || s->peek (s, true)) ?
-	 set_bits (s, readfds, writefds, exceptfds) : 0;
-  select_printf ("returning %d", n);
-  return n;
-}
-
-static int
-verify_true (select_record *, fd_set *, fd_set *, fd_set *)
-{
-  return 1;
-}
-
-static int
-verify_ok (select_record *me, fd_set *readfds, fd_set *writefds,
-	   fd_set *exceptfds)
-{
-  return set_bits (me, readfds, writefds, exceptfds);
-}
-
-static int
-no_startup (select_record *, select_stuff *)
-{
-  return 1;
-}
-
-static int
-no_verify (select_record *, fd_set *, fd_set *, fd_set *)
-{
-  return 0;
-}
-
-static int
-peek_pipe (select_record *s, bool from_select)
-{
-  int n = 0;
-  int gotone = 0;
-  fhandler_base *fh = s->fh;
-
-  HANDLE h;
-  set_handle_or_return_if_not_open (h, s);
-
-  /* pipes require a guard mutex to guard against the situation where multiple
-     readers are attempting to read from the same pipe.  In this scenario, it
-     is possible for PeekNamedPipe to report available data to two readers but
-     only one will actually get the data.  This will result in the other reader
-     entering fhandler_base::raw_read and blocking indefinitely in an interruptible
-     state.  This causes things like "make -j2" to hang.  So, for the non-select case
-     we use the pipe mutex, if it is available. */
-  HANDLE guard_mutex = from_select ? NULL : fh->get_guard ();
-
-  /* Don't perform complicated tests if we don't need to. */
-  if (!s->read_selected && !s->except_selected)
-    goto out;
-
-  if (s->read_selected)
-    {
-      if (s->read_ready)
-	{
-	  select_printf ("already ready");
-	  gotone = 1;
-	  goto out;
-	}
-
-      switch (fh->get_device ())
-	{
-	case FH_PTYM:
-	case FH_TTYM:
-	  if (((fhandler_pty_master *) fh)->need_nl)
-	    {
-	      gotone = s->read_ready = true;
-	      goto out;
-	    }
-	  break;
-	default:
-	  if (fh->get_readahead_valid ())
-	    {
-	      select_printf ("readahead");
-	      gotone = s->read_ready = true;
-	      goto out;
-	    }
-	}
-
-      if (fh->bg_check (SIGTTIN) <= bg_eof)
-	{
-	  gotone = s->read_ready = true;
-	  goto out;
-	}
-    }
-
-  if (fh->get_device () == FH_PIPEW)
-    /* nothing */;
-  else if (!PeekNamedPipe (h, NULL, 0, NULL, (DWORD *) &n, NULL))
-    {
-      select_printf ("%s, PeekNamedPipe failed, %E", fh->get_name ());
-      n = -1;
-    }
-  else if (!n || !guard_mutex)
-    /* no guard mutex or nothing to read from the pipe. */;
-  else if (WaitForSingleObject (guard_mutex, 0) != WAIT_OBJECT_0)
-    {
-      select_printf ("%s, couldn't get mutex %p, %E", fh->get_name (),
-		     guard_mutex);
-      n = 0;
-    }
-  else
-    {
-      /* Now that we have the mutex, make sure that no one else has snuck
-	 in and grabbed the data that we originally saw. */
-      if (!PeekNamedPipe (h, NULL, 0, NULL, (DWORD *) &n, NULL))
-	{
-	  select_printf ("%s, PeekNamedPipe failed, %E", fh->get_name ());
-	  n = -1;
-	}
-      if (n <= 0)
-	ReleaseMutex (guard_mutex);	/* Oops.  We lost the race.  */
-    }
-
-  if (n < 0)
-    {
-      fh->set_eof ();		/* Flag that other end of pipe is gone */
-      select_printf ("%s, n %d", fh->get_name (), n);
-      if (s->except_selected)
-	gotone += s->except_ready = true;
-      if (s->read_selected)
-	gotone += s->read_ready = true;
-    }
-  if (n > 0 && s->read_selected)
-    {
-      select_printf ("%s, ready for read", fh->get_name ());
-      gotone += s->read_ready = true;
-    }
-  if (!gotone && s->fh->hit_eof ())
-    {
-      select_printf ("%s, saw EOF", fh->get_name ());
-      if (s->except_selected)
-	gotone = s->except_ready = true;
-      if (s->read_selected)
-	gotone += s->read_ready = true;
-      select_printf ("saw eof on '%s'", fh->get_name ());
-    }
-
-out:
-  return gotone || s->write_ready;
-}
-
-static int start_thread_pipe (select_record *me, select_stuff *stuff);
-
-struct pipeinf
-  {
-    cygthread *thread;
-    bool stop_thread_pipe;
-    select_record *start;
-  };
-
-static DWORD WINAPI
-thread_pipe (void *arg)
-{
-  pipeinf *pi = (pipeinf *) arg;
-  bool gotone = false;
-
-  for (;;)
-    {
-      select_record *s = pi->start;
-      while ((s = s->next))
-	if (s->startup == start_thread_pipe)
-	  {
-	    if (peek_pipe (s, true))
-	      gotone = true;
-	    if (pi->stop_thread_pipe)
-	      {
-		select_printf ("stopping");
-		goto out;
-	      }
-	  }
-      /* Paranoid check */
-      if (pi->stop_thread_pipe)
-	{
-	  select_printf ("stopping from outer loop");
-	  break;
-	}
-      if (gotone)
-	break;
-      Sleep (10);
-    }
-out:
-  return 0;
-}
-
-static int
-start_thread_pipe (select_record *me, select_stuff *stuff)
-{
-  if (stuff->device_specific_pipe)
-    {
-      me->h = *((pipeinf *) stuff->device_specific_pipe)->thread;
-      return 1;
-    }
-  pipeinf *pi = new pipeinf;
-  pi->start = &stuff->start;
-  pi->stop_thread_pipe = false;
-  pi->thread = new cygthread (thread_pipe, (LPVOID) pi, "select_pipe");
-  me->h = *pi->thread;
-  if (!me->h)
-    return 0;
-  stuff->device_specific_pipe = (void *) pi;
-  return 1;
-}
-
-static void
-pipe_cleanup (select_record *, select_stuff *stuff)
-{
-  pipeinf *pi = (pipeinf *) stuff->device_specific_pipe;
-  if (pi && pi->thread)
-    {
-      pi->stop_thread_pipe = true;
-      pi->thread->detach ();
-      delete pi;
-      stuff->device_specific_pipe = NULL;
-    }
-}
-
-int
-fhandler_pipe::ready_for_read (int fd, DWORD howlong)
-{
-  int res;
-  if (howlong)
-    res = true;
-  else
-    res = fhandler_base::ready_for_read (fd, howlong);
-
-  if (res)
-    get_guard ();
-  return res;
-}
-
-select_record *
-fhandler_pipe::select_read (select_record *s)
-{
-  if (!s)
-    s = new select_record;
-  s->startup = start_thread_pipe;
-  s->peek = peek_pipe;
-  s->verify = verify_ok;
-  s->read_selected = true;
-  s->read_ready = false;
-  s->cleanup = pipe_cleanup;
-  return s;
-}
-
-select_record *
-fhandler_pipe::select_write (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = no_verify;
-    }
-  s->peek = peek_pipe;
-  s->write_selected = true;
-  s->write_ready = true;
-  return s;
-}
-
-select_record *
-fhandler_pipe::select_except (select_record *s)
-{
-  if (!s)
-      s = new select_record;
-  s->startup = start_thread_pipe;
-  s->peek = peek_pipe;
-  s->verify = verify_ok;
-  s->cleanup = pipe_cleanup;
-  s->except_selected = true;
-  s->except_ready = false;
-  return s;
-}
-
-static int
-peek_console (select_record *me, bool)
-{
-  extern const char * get_nonascii_key (INPUT_RECORD& input_rec, char *);
-  fhandler_console *fh = (fhandler_console *) me->fh;
-
-  if (!me->read_selected)
-    return me->write_ready;
-
-  if (fh->get_readahead_valid ())
-    {
-      select_printf ("readahead");
-      return me->read_ready = true;
-    }
-
-  if (me->read_ready)
-    {
-      select_printf ("already ready");
-      return 1;
-    }
-
-  INPUT_RECORD irec;
-  DWORD events_read;
-  HANDLE h;
-  char tmpbuf[17];
-  set_handle_or_return_if_not_open (h, me);
-
-  for (;;)
-    if (fh->bg_check (SIGTTIN) <= bg_eof)
-      return me->read_ready = true;
-    else if (!PeekConsoleInput (h, &irec, 1, &events_read) || !events_read)
-      break;
-    else
-      {
-	if (irec.EventType == KEY_EVENT)
-	  {
-	    if (irec.Event.KeyEvent.bKeyDown
-		&& (irec.Event.KeyEvent.uChar.AsciiChar
-		    || get_nonascii_key (irec, tmpbuf)))
-	      return me->read_ready = true;
-	  }
-	else
-	  {
-	    fh->send_winch_maybe ();
-	    if (irec.EventType == MOUSE_EVENT
-		&& fh->mouse_aware ()
-		&& (irec.Event.MouseEvent.dwEventFlags == 0
-		    || irec.Event.MouseEvent.dwEventFlags == DOUBLE_CLICK))
-		return me->read_ready = true;
-	  }
-
-	/* Read and discard the event */
-	ReadConsoleInput (h, &irec, 1, &events_read);
-      }
-
-  return me->write_ready;
-}
-
-static int
-verify_console (select_record *me, fd_set *rfds, fd_set *wfds,
-	      fd_set *efds)
-{
-  return peek_console (me, true);
-}
-
-
-select_record *
-fhandler_console::select_read (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = verify_console;
-      set_cursor_maybe ();
-    }
-
-  s->peek = peek_console;
-  s->h = get_handle ();
-  s->read_selected = true;
-  s->read_ready = false;
-  return s;
-}
-
-select_record *
-fhandler_console::select_write (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = no_verify;
-      set_cursor_maybe ();
-    }
-
-  s->peek = peek_console;
-  s->write_selected = true;
-  s->write_ready = true;
-  return s;
-}
-
-select_record *
-fhandler_console::select_except (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = no_verify;
-      set_cursor_maybe ();
-    }
-
-  s->peek = peek_console;
-  s->except_selected = true;
-  s->except_ready = false;
-  return s;
-}
-
-select_record *
-fhandler_tty_common::select_read (select_record *s)
-{
-  return ((fhandler_pipe *) this)->fhandler_pipe::select_read (s);
-}
-
-select_record *
-fhandler_tty_common::select_write (select_record *s)
-{
-  return ((fhandler_pipe *) this)->fhandler_pipe::select_write (s);
-}
-
-select_record *
-fhandler_tty_common::select_except (select_record *s)
-{
-  return ((fhandler_pipe *) this)->fhandler_pipe::select_except (s);
-}
-
-static int
-verify_tty_slave (select_record *me, fd_set *readfds, fd_set *writefds,
-	   fd_set *exceptfds)
-{
-  if (WaitForSingleObject (me->h, 0) == WAIT_OBJECT_0)
-    me->read_ready = true;
-  return set_bits (me, readfds, writefds, exceptfds);
-}
-
-select_record *
-fhandler_tty_slave::select_read (select_record *s)
-{
-  if (!s)
-    s = new select_record;
-  s->h = input_available_event;
-  s->startup = no_startup;
-  s->peek = peek_pipe;
-  s->verify = verify_tty_slave;
-  s->read_selected = true;
-  s->read_ready = false;
-  s->cleanup = NULL;
-  return s;
-}
-
-select_record *
-fhandler_dev_null::select_read (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = no_verify;
-    }
-  s->h = get_handle ();
-  s->read_selected = true;
-  s->read_ready = true;
-  return s;
-}
-
-select_record *
-fhandler_dev_null::select_write (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = no_verify;
-    }
-  s->h = get_handle ();
-  s->write_selected = true;
-  s->write_ready = true;
-  return s;
-}
-
-select_record *
-fhandler_dev_null::select_except (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = no_verify;
-    }
-  s->h = get_handle ();
-  s->except_selected = true;
-  s->except_ready = true;
-  return s;
-}
-
-static int start_thread_serial (select_record *me, select_stuff *stuff);
-
-struct serialinf
-  {
-    cygthread *thread;
-    bool stop_thread_serial;
-    select_record *start;
-  };
-
-static int
-peek_serial (select_record *s, bool)
-{
-  COMSTAT st;
-
-  fhandler_serial *fh = (fhandler_serial *) s->fh;
-
-  if (fh->get_readahead_valid () || fh->overlapped_armed < 0)
-    return s->read_ready = true;
-
-  select_printf ("fh->overlapped_armed %d", fh->overlapped_armed);
-
-  HANDLE h;
-  set_handle_or_return_if_not_open (h, s);
-  int ready = 0;
-
-  if (s->read_selected && s->read_ready || (s->write_selected && s->write_ready))
-    {
-      select_printf ("already ready");
-      ready = 1;
-      goto out;
-    }
-
-  (void) SetCommMask (h, EV_RXCHAR);
-
-  if (!fh->overlapped_armed)
-    {
-      COMSTAT st;
-
-      ResetEvent (fh->io_status.hEvent);
-
-      if (!ClearCommError (h, &fh->ev, &st))
-	{
-	  debug_printf ("ClearCommError");
-	  goto err;
-	}
-      else if (st.cbInQue)
-	return s->read_ready = true;
-      else if (WaitCommEvent (h, &fh->ev, &fh->io_status))
-	return s->read_ready = true;
-      else if (GetLastError () == ERROR_IO_PENDING)
-	fh->overlapped_armed = 1;
-      else
-	{
-	  debug_printf ("WaitCommEvent");
-	  goto err;
-	}
-    }
-
-  HANDLE w4[2];
-  DWORD to;
-
-  w4[0] = fh->io_status.hEvent;
-  w4[1] = signal_arrived;
-  to = 10;
-
-  switch (WaitForMultipleObjects (2, w4, FALSE, to))
-    {
-    case WAIT_OBJECT_0:
-      if (!ClearCommError (h, &fh->ev, &st))
-	{
-	  debug_printf ("ClearCommError");
-	  goto err;
-	}
-      else if (!st.cbInQue)
-	Sleep (to);
-      else
-	{
-	  return s->read_ready = true;
-	  select_printf ("got something");
-	}
-      break;
-    case WAIT_OBJECT_0 + 1:
-      select_printf ("interrupt");
-      set_sig_errno (EINTR);
-      ready = -1;
-      break;
-    case WAIT_TIMEOUT:
-      break;
-    default:
-      debug_printf ("WaitForMultipleObjects");
-      goto err;
-    }
-
-out:
-  return ready;
-
-err:
-  if (GetLastError () == ERROR_OPERATION_ABORTED)
-    {
-      select_printf ("operation aborted");
-      return ready;
-    }
-
-  __seterrno ();
-  s->saw_error = true;
-  select_printf ("error %E");
-  return -1;
-}
-
-static DWORD WINAPI
-thread_serial (void *arg)
-{
-  serialinf *si = (serialinf *) arg;
-  bool gotone = false;
-
-  for (;;)
-    {
-      select_record *s = si->start;
-      while ((s = s->next))
-	if (s->startup == start_thread_serial)
-	  {
-	    if (peek_serial (s, true))
-	      gotone = true;
-	  }
-      if (si->stop_thread_serial)
-	{
-	  select_printf ("stopping");
-	  break;
-	}
-      if (gotone)
-	break;
-    }
-
-  select_printf ("exiting");
-  return 0;
-}
-
-static int
-start_thread_serial (select_record *me, select_stuff *stuff)
-{
-  if (stuff->device_specific_serial)
-    {
-      me->h = *((serialinf *) stuff->device_specific_serial)->thread;
-      return 1;
-    }
-  serialinf *si = new serialinf;
-  si->start = &stuff->start;
-  si->stop_thread_serial = false;
-  si->thread = new cygthread (thread_serial, (LPVOID) si, "select_serial");
-  me->h = *si->thread;
-  stuff->device_specific_serial = (void *) si;
-  return 1;
-}
-
-static void
-serial_cleanup (select_record *, select_stuff *stuff)
-{
-  serialinf *si = (serialinf *) stuff->device_specific_serial;
-  if (si && si->thread)
-    {
-      si->stop_thread_serial = true;
-      si->thread->detach ();
-      delete si;
-      stuff->device_specific_serial = NULL;
-    }
-}
-
-select_record *
-fhandler_serial::select_read (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = start_thread_serial;
-      s->verify = verify_ok;
-      s->cleanup = serial_cleanup;
-    }
-  s->peek = peek_serial;
-  s->read_selected = true;
-  s->read_ready = false;
-  return s;
-}
-
-select_record *
-fhandler_serial::select_write (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = verify_ok;
-    }
-  s->peek = peek_serial;
-  s->h = get_handle ();
-  s->write_selected = true;
-  s->write_ready = true;
-  return s;
-}
-
-select_record *
-fhandler_serial::select_except (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = verify_ok;
-    }
-  s->h = NULL;
-  s->peek = peek_serial;
-  s->except_selected = false;	// Can't do this
-  s->except_ready = false;
-  return s;
-}
-
-int
-fhandler_base::ready_for_read (int fd, DWORD howlong)
-{
-  int avail = 0;
-  select_record me (this);
-  me.fd = fd;
-  while (!avail)
-    {
-      (void) select_read (&me);
-      avail = me.read_ready ?: me.peek (&me, false);
-
-      if (fd >= 0 && cygheap->fdtab.not_open (fd))
-	{
-	  set_sig_errno (EBADF);
-	  avail = 0;
-	  break;
-	}
-
-      if (howlong != INFINITE)
-	{
-	  if (!avail)
-	    set_sig_errno (EAGAIN);
-	  break;
-	}
-
-      if (WaitForSingleObject (signal_arrived, avail ? 0 : 10) == WAIT_OBJECT_0)
-	{
-	  debug_printf ("interrupted");
-	  set_sig_errno (EINTR);
-	  avail = 0;
-	  break;
-	}
-    }
-
-  if (get_guard () && !avail && me.read_ready)
-    ReleaseMutex (get_guard ());
-
-  select_printf ("read_ready %d, avail %d", me.read_ready, avail);
-  return avail;
-}
-
-select_record *
-fhandler_base::select_read (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = verify_ok;
-    }
-  s->h = get_handle ();
-  s->read_selected = true;
-  s->read_ready = true;
-  return s;
-}
-
-select_record *
-fhandler_base::select_write (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = verify_ok;
-    }
-  s->h = get_handle ();
-  s->write_selected = true;
-  s->write_ready = true;
-  return s;
-}
-
-select_record *
-fhandler_base::select_except (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = verify_ok;
-    }
-  s->h = NULL;
-  s->except_selected = true;
-  s->except_ready = false;
-  return s;
-}
-
-struct socketinf
-  {
-    cygthread *thread;
-    winsock_fd_set readfds, writefds, exceptfds;
-    SOCKET exitsock;
-    struct sockaddr_in sin;
-    select_record *start;
-  };
-
-static int
-peek_socket (select_record *me, bool)
-{
-  winsock_fd_set ws_readfds, ws_writefds, ws_exceptfds;
-  struct timeval tv = {0, 0};
-  WINSOCK_FD_ZERO (&ws_readfds);
-  WINSOCK_FD_ZERO (&ws_writefds);
-  WINSOCK_FD_ZERO (&ws_exceptfds);
-
-  HANDLE h;
-  set_handle_or_return_if_not_open (h, me);
-  select_printf ("considering handle %p", h);
-
-  if (me->read_selected && !me->read_ready)
-    {
-      select_printf ("adding read fd_set %s, fd %d", me->fh->get_name (),
-		     me->fd);
-      WINSOCK_FD_SET (h, &ws_readfds);
-    }
-  if (me->write_selected && !me->write_ready)
-    {
-      select_printf ("adding write fd_set %s, fd %d", me->fh->get_name (),
-		     me->fd);
-      WINSOCK_FD_SET (h, &ws_writefds);
-    }
-  if ((me->except_selected || me->except_on_write) && !me->except_ready)
-    {
-      select_printf ("adding except fd_set %s, fd %d", me->fh->get_name (),
-		     me->fd);
-      WINSOCK_FD_SET (h, &ws_exceptfds);
-    }
-  int r;
-  if ((me->read_selected && !me->read_ready)
-      || (me->write_selected && !me->write_ready)
-      || ((me->except_selected || me->except_on_write) && !me->except_ready))
-    {
-      r = WINSOCK_SELECT (0, &ws_readfds, &ws_writefds, &ws_exceptfds, &tv);
-      select_printf ("WINSOCK_SELECT returned %d", r);
-      if (r == -1)
-	{
-	  select_printf ("error %d", WSAGetLastError ());
-	  set_winsock_errno ();
-	  return 0;
-	}
-      if (WINSOCK_FD_ISSET (h, &ws_readfds) || (me->read_selected && me->read_ready))
-	me->read_ready = true;
-      if (WINSOCK_FD_ISSET (h, &ws_writefds) || (me->write_selected && me->write_ready))
-	me->write_ready = true;
-      if (WINSOCK_FD_ISSET (h, &ws_exceptfds) || ((me->except_selected || me->except_on_write) && me->except_ready))
-	me->except_ready = true;
-    }
-  return me->read_ready || me->write_ready || me->except_ready;
-}
-
-static int start_thread_socket (select_record *, select_stuff *);
-
-static DWORD WINAPI
-thread_socket (void *arg)
-{
-  socketinf *si = (socketinf *) arg;
-
-  select_printf ("stuff_start %p", &si->start);
-  int r = WINSOCK_SELECT (0, &si->readfds, &si->writefds, &si->exceptfds, NULL);
-  select_printf ("Win32 select returned %d", r);
-  if (r == -1)
-    select_printf ("error %d", WSAGetLastError ());
-  select_record *s = si->start;
-  while ((s = s->next))
-    if (s->startup == start_thread_socket)
-	{
-	  HANDLE h = s->fh->get_handle ();
-	  select_printf ("s %p, testing fd %d (%s)", s, s->fd, s->fh->get_name ());
-	  if (WINSOCK_FD_ISSET (h, &si->readfds))
-	    {
-	      select_printf ("read_ready");
-	      s->read_ready = true;
-	    }
-	  if (WINSOCK_FD_ISSET (h, &si->writefds))
-	    {
-	      select_printf ("write_ready");
-	      s->write_ready = true;
-	    }
-	  if (WINSOCK_FD_ISSET (h, &si->exceptfds))
-	    {
-	      select_printf ("except_ready");
-	      s->except_ready = true;
-	    }
-	}
-
-  if (WINSOCK_FD_ISSET (si->exitsock, &si->readfds))
-    select_printf ("saw exitsock read");
-
-  return 0;
-}
-
-extern "C" unsigned long htonl (unsigned long);
-
-static int
-start_thread_socket (select_record *me, select_stuff *stuff)
-{
-  socketinf *si;
-
-  if ((si = (socketinf *) stuff->device_specific_socket))
-    {
-      me->h = *si->thread;
-      return 1;
-    }
-
-  si = new socketinf;
-  WINSOCK_FD_ZERO (&si->readfds);
-  WINSOCK_FD_ZERO (&si->writefds);
-  WINSOCK_FD_ZERO (&si->exceptfds);
-  select_record *s = &stuff->start;
-  while ((s = s->next))
-    if (s->startup == start_thread_socket)
-      {
-	HANDLE h = s->fh->get_handle ();
-	select_printf ("Handle %p", h);
-	if (s->read_selected && !s->read_ready)
-	  {
-	    WINSOCK_FD_SET (h, &si->readfds);
-	    select_printf ("Added to readfds");
-	  }
-	if (s->write_selected && !s->write_ready)
-	  {
-	    WINSOCK_FD_SET (h, &si->writefds);
-	    select_printf ("Added to writefds");
-	  }
-	if ((s->except_selected || s->except_on_write) && !s->except_ready)
-	  {
-	    WINSOCK_FD_SET (h, &si->exceptfds);
-	    select_printf ("Added to exceptfds");
-	  }
-      }
-
-  if ((si->exitsock = socket (PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
-    {
-      set_winsock_errno ();
-      select_printf ("cannot create socket, %E");
-      return -1;
-    }
-  /* Allow rapid reuse of the port. */
-  int tmp = 1;
-  (void) setsockopt (si->exitsock, SOL_SOCKET, SO_REUSEADDR, (char *) &tmp, sizeof (tmp));
-
-  int sin_len = sizeof (si->sin);
-  memset (&si->sin, 0, sizeof (si->sin));
-  si->sin.sin_family = AF_INET;
-  si->sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-  if (bind (si->exitsock, (struct sockaddr *) &si->sin, sizeof (si->sin)) < 0)
-    {
-      select_printf ("cannot bind socket, %E");
-      goto err;
-    }
-
-  if (getsockname (si->exitsock, (struct sockaddr *) &si->sin, &sin_len) < 0)
-    {
-      select_printf ("getsockname error");
-      goto err;
-    }
-
-  if (listen (si->exitsock, 1))
-    {
-      select_printf ("listen failed, %E");
-      goto err;
-    }
-
-  select_printf ("exitsock %p", si->exitsock);
-  WINSOCK_FD_SET ((HANDLE) si->exitsock, &si->readfds);
-  WINSOCK_FD_SET ((HANDLE) si->exitsock, &si->exceptfds);
-  stuff->device_specific_socket = (void *) si;
-  si->start = &stuff->start;
-  select_printf ("stuff_start %p", &stuff->start);
-  si->thread = new cygthread (thread_socket, (LPVOID) si, "select_socket");
-  me->h = *si->thread;
-  return 1;
-
-err:
-  set_winsock_errno ();
-  closesocket (si->exitsock);
-  return -1;
-}
-
-void
-socket_cleanup (select_record *, select_stuff *stuff)
-{
-  socketinf *si = (socketinf *) stuff->device_specific_socket;
-  select_printf ("si %p si->thread %p", si, si ? si->thread : NULL);
-  if (si && si->thread)
-    {
-      select_printf ("connection to si->exitsock %p", si->exitsock);
-      SOCKET s = socket (AF_INET, SOCK_STREAM, 0);
-
-      /* Set LINGER with 0 timeout for hard close */
-      struct linger tmp = {1, 0}; /* On, 0 delay */
-      (void) setsockopt (s, SOL_SOCKET, SO_LINGER, (char *)&tmp, sizeof (tmp));
-      (void) setsockopt (si->exitsock, SOL_SOCKET, SO_LINGER, (char *)&tmp, sizeof (tmp));
-
-      /* Connecting to si->exitsock will cause any executing select to wake
-	 up.  When this happens then the exitsock condition will cause the
-	 thread to terminate. */
-      if (connect (s, (struct sockaddr *) &si->sin, sizeof (si->sin)) < 0)
-	{
-	  set_winsock_errno ();
-	  select_printf ("connect failed");
-	  /* FIXME: now what? */
-	}
-      shutdown (s, SD_BOTH);
-      closesocket (s);
-
-      /* Wait for thread to go away */
-      si->thread->detach ();
-      shutdown (si->exitsock, SD_BOTH);
-      closesocket (si->exitsock);
-      stuff->device_specific_socket = NULL;
-      delete si;
-    }
-  select_printf ("returning");
-}
-
-select_record *
-fhandler_socket::select_read (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = start_thread_socket;
-      s->verify = verify_true;
-      s->cleanup = socket_cleanup;
-    }
-  s->peek = peek_socket;
-  s->read_ready = saw_shutdown_read ();
-  s->read_selected = true;
-  return s;
-}
-
-select_record *
-fhandler_socket::select_write (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = start_thread_socket;
-      s->verify = verify_true;
-      s->cleanup = socket_cleanup;
-    }
-  s->peek = peek_socket;
-  s->write_ready = saw_shutdown_write () || is_unconnected ();
-  s->write_selected = true;
-  if (is_connect_pending ())
-    {
-      s->except_ready = saw_shutdown_write () || saw_shutdown_read ();
-      s->except_on_write = true;
-    }
-  return s;
-}
-
-select_record *
-fhandler_socket::select_except (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = start_thread_socket;
-      s->verify = verify_true;
-      s->cleanup = socket_cleanup;
-    }
-  s->peek = peek_socket;
-  /* FIXME: Is this right?  Should these be used as criteria for except? */
-  s->except_ready = saw_shutdown_write () || saw_shutdown_read ();
-  s->except_selected = true;
-  return s;
-}
-
-static int
-peek_windows (select_record *me, bool)
-{
-  MSG m;
-  HANDLE h;
-  set_handle_or_return_if_not_open (h, me);
-
-  if (me->read_selected && me->read_ready)
-    return 1;
-
-  if (PeekMessage (&m, (HWND) h, 0, 0, PM_NOREMOVE))
-    {
-      me->read_ready = true;
-      select_printf ("window %d(%p) ready", me->fd, me->fh->get_handle ());
-      return 1;
-    }
-
-  select_printf ("window %d(%p) not ready", me->fd, me->fh->get_handle ());
-  return me->write_ready;
-}
-
-static int
-verify_windows (select_record *me, fd_set *rfds, fd_set *wfds,
-		fd_set *efds)
-{
-  return peek_windows (me, true);
-}
-
-select_record *
-fhandler_windows::select_read (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-    }
-  s->verify = verify_windows;
-  s->peek = peek_windows;
-  s->read_selected = true;
-  s->read_ready = false;
-  s->h = get_handle ();
-  s->windows_handle = true;
-  return s;
-}
-
-select_record *
-fhandler_windows::select_write (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = verify_ok;
-    }
-  s->peek = peek_windows;
-  s->h = get_handle ();
-  s->write_selected = true;
-  s->write_ready = true;
-  s->windows_handle = true;
-  return s;
-}
-
-select_record *
-fhandler_windows::select_except (select_record *s)
-{
-  if (!s)
-    {
-      s = new select_record;
-      s->startup = no_startup;
-      s->verify = verify_ok;
-    }
-  s->peek = peek_windows;
-  s->h = get_handle ();
-  s->except_selected = true;
-  s->except_ready = true;
-  s->windows_handle = true;
-  return s;
-}
diff --git a/winsup/cygwin/select.h b/winsup/cygwin/select.h
deleted file mode 100644
index 30b59964f..000000000
--- a/winsup/cygwin/select.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* select.h
-
-   Copyright 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* Winsock select() types and macros */
-
-/*
- * Use this struct to interface to
- * the system provided select.
- */
-typedef struct winsock_fd_set
-{
-  unsigned int fd_count;
-  HANDLE fd_array[1024]; /* Dynamically allocated. */
-} winsock_fd_set;
-
-/*
- * Define the Win32 winsock definitions to have a prefix WINSOCK_
- * so we can be explicit when we are using them.
- */
-#define WINSOCK_FD_ISSET(fd, set) __WSAFDIsSet ((SOCKET)fd, (fd_set *)set)
-#define WINSOCK_FD_SET(fd, set) do { \
-	       (set)->fd_array[(set)->fd_count++]=fd;\
-} while(0)
-#define WINSOCK_FD_ZERO(set) ((set)->fd_count = 0)
-#define WINSOCK_FD_CLR(fd, set) do { \
-    u_int __i; \
-    for (__i = 0; __i < (set)->fd_count ; __i++) { \
-	if ((set)->fd_array[__i] == fd) { \
-	    while (__i < (set)->fd_count-1) { \
-		(set)->fd_array[__i] = \
-		    (set)->fd_array[__i+1]; \
-		__i++; \
-	    } \
-	    (set)->fd_count--; \
-	    break; \
-	} \
-    } \
-} while(0)
-
-extern "C" int PASCAL __WSAFDIsSet(SOCKET, fd_set*);
-extern "C" int PASCAL win32_select(int, fd_set*, fd_set*, fd_set*, const struct timeval*);
-
-/*
- * call to winsock's select() -
- * type coercion need to appease confused prototypes
- */
-#define WINSOCK_SELECT(nfd, rd, wr, ex, timeo) \
-    win32_select (nfd, (fd_set *)rd, (fd_set *)wr, (fd_set *)ex, timeo)
-
diff --git a/winsup/cygwin/sem.cc b/winsup/cygwin/sem.cc
deleted file mode 100644
index 3dfaf42ad..000000000
--- a/winsup/cygwin/sem.cc
+++ /dev/null
@@ -1,176 +0,0 @@
-/* sem.cc: XSI IPC interface for Cygwin.
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "cygerrno.h"
-#include <signal.h>
-#ifdef USE_SERVER
-#include <sys/types.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdarg.h>
-
-#include "sigproc.h"
-
-#include "cygserver_ipc.h"
-#include "cygserver_sem.h"
-
-/*
- * client_request_sem Constructors
- */
-
-client_request_sem::client_request_sem (int semid,
-					int semnum,
-					int cmd,
-					union semun *arg)
-  : client_request (CYGSERVER_REQUEST_SEM, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.semop = SEMOP_semctl;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-   _parameters.in.ctlargs.semid = semid;
-   _parameters.in.ctlargs.semnum = semnum;
-   _parameters.in.ctlargs.cmd = cmd;
-   _parameters.in.ctlargs.arg = arg;
-
-  msglen (sizeof (_parameters.in));
-}
-
-client_request_sem::client_request_sem (key_t key,
-					int nsems,
-					int semflg)
-  : client_request (CYGSERVER_REQUEST_SEM, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.semop = SEMOP_semget;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-  _parameters.in.getargs.key = key;
-  _parameters.in.getargs.nsems = nsems;
-  _parameters.in.getargs.semflg = semflg;
-
-  msglen (sizeof (_parameters.in));
-}
-
-client_request_sem::client_request_sem (int semid,
-					struct sembuf *sops,
-					size_t nsops)
-  : client_request (CYGSERVER_REQUEST_SEM, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.semop = SEMOP_semop;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-  _parameters.in.opargs.semid = semid;
-  _parameters.in.opargs.sops = sops;
-  _parameters.in.opargs.nsops = nsops;
-
-  msglen (sizeof (_parameters.in));
-}
-#endif /* USE_SERVER */
-
-/*
- * XSI semaphore API.  These are exported by the DLL.
- */
-
-extern "C" int
-semctl (int semid, int semnum, int cmd, ...)
-{
-#ifdef USE_SERVER
-  union semun arg = {0};
-  if (cmd == IPC_STAT || cmd == IPC_SET || cmd == IPC_INFO || cmd == SEM_INFO
-      || cmd == GETALL || cmd == SETALL || cmd == SETVAL)
-    {
-      va_list ap;
-      va_start (ap, cmd);
-      arg = va_arg (ap, union semun);
-      va_end (ap);
-    }
-  syscall_printf ("semctl (semid = %d, semnum = %d, cmd = %d, arg.val = 0x%x)",
-		  semid, semnum, cmd, arg.val);
-  if ((cmd == IPC_STAT || cmd == IPC_SET)
-      && __check_null_invalid_struct_errno (arg.buf, sizeof (struct semid_ds)))
-    return -1;
-  if (cmd == IPC_INFO)
-    {
-      /* semid == 0: Request for seminfo struct. */
-      if (!semid
-	  && __check_null_invalid_struct_errno (arg.buf, sizeof (struct seminfo)))
-	  return -1;
-      /* Otherwise, request semid entries from internal semid_ds array. */
-      if (semid)
-	if (__check_null_invalid_struct_errno (arg.buf, semid * sizeof (struct semid_ds)))
-	  return -1;
-    }
-  if (cmd == SEM_INFO
-      && __check_null_invalid_struct_errno (arg.buf, sizeof (struct sem_info)))
-    return -1;
-  client_request_sem request (semid, semnum, cmd, &arg);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = semctl ()", request.error_code ());
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return -1;
-    }
-  return request.retval ();
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return -1;
-#endif
-}
-
-extern "C" int
-semget (key_t key, int nsems, int semflg)
-{
-#ifdef USE_SERVER
-  syscall_printf ("semget (key = %U, nsems = %d, semflg = 0x%x)",
-		  key, nsems, semflg);
-  client_request_sem request (key, nsems, semflg);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = semctl ()", request.error_code ());
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return -1;
-    }
-  return request.retval ();
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return -1;
-#endif
-}
-
-extern "C" int
-semop (int semid, struct sembuf *sops, size_t nsops)
-{
-#ifdef USE_SERVER
-  syscall_printf ("semop (semid = %d, sops = %p, nsops = %d)",
-		  semid, sops, nsops);
-  if (__check_null_invalid_struct_errno (sops, nsops * sizeof (struct sembuf)))
-    return -1;
-  client_request_sem request (semid, sops, nsops);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = semctl ()", request.error_code ());
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return -1;
-    }
-  return request.retval ();
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return -1;
-#endif
-}
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc
deleted file mode 100644
index 9a91a1c08..000000000
--- a/winsup/cygwin/shared.cc
+++ /dev/null
@@ -1,280 +0,0 @@
-/* shared.cc: shared data area support.
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <grp.h>
-#include <pwd.h>
-#include "pinfo.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-#include "heap.h"
-#include "shared_info_magic.h"
-#include "registry.h"
-#include "cygwin_version.h"
-#include "child_info.h"
-
-shared_info NO_COPY *cygwin_shared;
-user_info NO_COPY *user_shared;
-HANDLE NO_COPY cygwin_user_h;
-
-char * __stdcall
-shared_name (char *ret_buf, const char *str, int num)
-{
-  extern bool _cygwin_testing;
-
-  __small_sprintf (ret_buf, "%s%s.%s.%d", cygheap->shared_prefix,
-		   cygwin_version.shared_id, str, num);
-  if (_cygwin_testing)
-    strcat (ret_buf, cygwin_version.dll_build_date);
-  return ret_buf;
-}
-
-#define page_const (65535)
-#define pround(n) (((size_t) (n) + page_const) & ~page_const)
-
-static char *offsets[] =
-{
-  (char *) cygwin_shared_address,
-  (char *) cygwin_shared_address
-    + pround (sizeof (shared_info)),
-  (char *) cygwin_shared_address
-    + pround (sizeof (shared_info))
-    + pround (sizeof (user_info)),
-  (char *) cygwin_shared_address
-    + pround (sizeof (shared_info))
-    + pround (sizeof (user_info))
-    + pround (sizeof (console_state)),
-  (char *) cygwin_shared_address
-    + pround (sizeof (shared_info))
-    + pround (sizeof (user_info))
-    + pround (sizeof (console_state))
-    + pround (sizeof (_pinfo))
-};
-
-void * __stdcall
-open_shared (const char *name, int n, HANDLE &shared_h, DWORD size,
-	     shared_locations m, PSECURITY_ATTRIBUTES psa)
-{
-  void *shared;
-
-  void *addr;
-  if (!wincap.needs_memory_protection ())
-    addr = NULL;
-  else
-    {
-      addr = offsets[m];
-      (void) VirtualFree (addr, 0, MEM_RELEASE);
-    }
-
-  if (!size)
-    return addr;
-
-  if (!shared_h)
-    {
-      char *mapname;
-      char map_buf[CYG_MAX_PATH];
-      if (!name)
-	mapname = NULL;
-      else
-        mapname = shared_name (map_buf, name, n);
-      if (!(shared_h = CreateFileMapping (INVALID_HANDLE_VALUE, psa,
-					  PAGE_READWRITE, 0, size, mapname)))
-	api_fatal ("CreateFileMapping %s, %E.  Terminating.", mapname);
-    }
-
-  shared = (shared_info *)
-    MapViewOfFileEx (shared_h, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0, addr);
-
-  if (!shared)
-    {
-      /* Probably win95, so try without specifying the address.  */
-      shared = (shared_info *) MapViewOfFileEx (shared_h,
-				       FILE_MAP_READ|FILE_MAP_WRITE,
-				       0, 0, 0, 0);
-#ifdef DEBUGGING
-      if (wincap.is_winnt ())
-	system_printf ("relocating shared object %s(%d) from %p to %p on Windows NT", name, n, addr, shared);
-#endif
-    }
-
-  if (!shared)
-    api_fatal ("MapViewOfFileEx '%s'(%p), %E.  Terminating.", name, shared_h);
-
-  if (m == SH_CYGWIN_SHARED && wincap.needs_memory_protection ())
-    {
-      unsigned delta = (char *) shared - offsets[0];
-      offsets[0] = (char *) shared;
-      for (int i = SH_CYGWIN_SHARED + 1; i < SH_TOTAL_SIZE; i++)
-	{
-	  unsigned size = offsets[i + 1] - offsets[i];
-	  offsets[i] += delta;
-	  if (!VirtualAlloc (offsets[i], size, MEM_RESERVE, PAGE_NOACCESS))
-	    continue;  /* oh well */
-	}
-      offsets[SH_TOTAL_SIZE] += delta;
-
-#if 0
-      if (!child_proc_info && wincap.needs_memory_protection ())
-	for (DWORD s = 0x950000; s <= 0xa40000; s += 0x1000)
-	  VirtualAlloc ((void *) s, 4, MEM_RESERVE, PAGE_NOACCESS);
-#endif
-    }
-
-  debug_printf ("name %s, shared %p (wanted %p), h %p", name, shared, addr, shared_h);
-
-  return shared;
-}
-
-void
-user_shared_initialize (bool reinit)
-{
-  char name[UNLEN + 1] = ""; /* Large enough for SID */
-
-  if (reinit)
-    {
-      if (!UnmapViewOfFile (user_shared))
-	debug_printf("UnmapViewOfFile %E");
-      if (!ForceCloseHandle (cygwin_user_h))
-	debug_printf("CloseHandle %E");
-      cygwin_user_h = NULL;
-    }
-
-  if (!cygwin_user_h)
-    {
-      if (wincap.has_security ())
-        {
-	  cygpsid tu (cygheap->user.sid ());
-	  tu.string (name);
-	}
-      else
-	strcpy (name, cygheap->user.name ());
-    }
-
-  user_shared = (user_info *) open_shared (name, USER_VERSION,
-					    cygwin_user_h, sizeof (user_info),
-					    SH_USER_SHARED, &sec_none);
-  debug_printf ("opening user shared for '%s' at %p", name, user_shared);
-  ProtectHandleINH (cygwin_user_h);
-  debug_printf ("user shared version %x", user_shared->version);
-
-  /* Initialize the Cygwin per-user shared, if necessary */
-  if (!user_shared->version)
-    {
-      user_shared->version = USER_VERSION_MAGIC;
-      debug_printf ("initializing user shared");
-      user_shared->cb =  sizeof (*user_shared);
-      if (user_shared->cb != sizeof (*user_shared))
-	system_printf ("size of user shared region changed from %u to %u",
-		       sizeof (*user_shared), user_shared->cb);
-      user_shared->mountinfo.init ();	/* Initialize the mount table.  */
-      /* Initialize the queue of deleted files.  */
-      user_shared->delqueue.init ();
-    }
-  else if (user_shared->version != USER_VERSION_MAGIC)
-    multiple_cygwin_problem ("user", user_shared->version, USER_VERSION_MAGIC);
-  else if (user_shared->cb != sizeof (*user_shared))
-    multiple_cygwin_problem ("user shared size", user_shared->cb, sizeof (*user_shared));
-}
-
-void
-shared_info::initialize ()
-{
-  DWORD sversion = (DWORD) InterlockedExchange ((LONG *) &version, SHARED_VERSION_MAGIC);
-  if (!sversion)
-    {
-      /* Initialize tty table.  */
-      tty.init ();
-    }
-  else
-    {
-      if (version != SHARED_VERSION_MAGIC)
-	{
-	  multiple_cygwin_problem ("shared", version, SHARED_VERSION_MAGIC);
-	  InterlockedExchange ((LONG *) &version, sversion);
-	}
-      while (!cb)
-	low_priority_sleep (0);	// Should be hit only very very rarely
-    }
-
-  heap_init ();
-
-  if (!sversion)
-    cb = sizeof (*this);	// Do last, after all shared memory initializion
-
-  if (cb != SHARED_INFO_CB)
-    system_printf ("size of shared memory region changed from %u to %u",
-		   SHARED_INFO_CB, cb);
-}
-
-void __stdcall
-memory_init ()
-{
-  getpagesize ();
-
-  /* Initialize the Cygwin heap, if necessary */
-  if (!cygheap)
-    {
-      cygheap_init ();
-      cygheap->user.init ();
-    }
-
-  /* Initialize general shared memory */
-  cygwin_shared = (shared_info *) open_shared ("shared",
-					       CYGWIN_VERSION_SHARED_DATA,
-					       cygheap->shared_h,
-					       sizeof (*cygwin_shared),
-					       SH_CYGWIN_SHARED);
-
-  cygwin_shared->initialize ();
-  ProtectHandleINH (cygheap->shared_h);
-
-  user_shared_initialize (false);
-}
-
-unsigned
-shared_info::heap_chunk_size ()
-{
-  if (!heap_chunk)
-    {
-      /* Fetch misc. registry entries.  */
-
-      reg_key reg (KEY_READ, NULL);
-
-      /* Note that reserving a huge amount of heap space does not result in
-      the use of swap since we are not committing it. */
-      /* FIXME: We should not be restricted to a fixed size heap no matter
-      what the fixed size is. */
-
-      heap_chunk = reg.get_int ("heap_chunk_in_mb", 0);
-      if (!heap_chunk) {
-	reg_key r1 (HKEY_LOCAL_MACHINE, KEY_READ, "SOFTWARE",
-		    CYGWIN_INFO_CYGNUS_REGISTRY_NAME,
-		    CYGWIN_INFO_CYGWIN_REGISTRY_NAME, NULL);
-	heap_chunk = r1.get_int ("heap_chunk_in_mb", 384);
-      }
-
-      if (heap_chunk < 4)
-	heap_chunk = 4 * 1024 * 1024;
-      else
-	heap_chunk <<= 20;
-      if (!heap_chunk)
-	heap_chunk = 384 * 1024 * 1024;
-      debug_printf ("fixed heap size is %u", heap_chunk);
-    }
-
-  return heap_chunk;
-}
diff --git a/winsup/cygwin/shared.sgml b/winsup/cygwin/shared.sgml
deleted file mode 100644
index f43d654e2..000000000
--- a/winsup/cygwin/shared.sgml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<sect1 id="func-cygwin-getshared">
-<title>cygwin_getshared</title>
-
-<funcsynopsis>
-<funcdef>shared_info *
-<function>cygwin_getshared</function></funcdef>
-<void>
-</funcsynopsis>
-
-<para>Returns a pointer to an internal Cygwin memory structure
-containing shared information used by cooperating cygwin processes.
-This function is intended for use only by "system" programs like
-<filename>mount</filename> and <filename>ps</filename>.
-</para>
-
-</sect1>
diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/shared_info.h
deleted file mode 100644
index 3a462bee3..000000000
--- a/winsup/cygwin/shared_info.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/* shared_info.h: shared info for cygwin
-
-   Copyright 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "tty.h"
-#include "security.h"
-
-/* Mount table entry */
-
-class mount_item
-{
- public:
-  /* FIXME: Nasty static allocation.  Need to have a heap in the shared
-     area [with the user being able to configure at runtime the max size].  */
-  /* Win32-style mounted partition source ("C:\foo\bar").
-     native_path[0] == 0 for unused entries.  */
-  char native_path[CYG_MAX_PATH];
-  int native_pathlen;
-
-  /* POSIX-style mount point ("/foo/bar") */
-  char posix_path[CYG_MAX_PATH];
-  int posix_pathlen;
-
-  unsigned flags;
-
-  void init (const char *dev, const char *path, unsigned flags);
-
-  struct mntent *getmntent ();
-  void fnmunge (char *, const char *);
-  void build_win32 (char *, const char *, unsigned *, unsigned);
-};
-
-/* Warning: Decreasing this value will cause cygwin.dll to ignore existing
-   higher numbered registry entries.  Don't change this number willy-nilly.
-   What we need is to have a more dynamic allocation scheme, but the current
-   scheme should be satisfactory for a long while yet.  */
-#define MAX_MOUNTS 30
-
-#define USER_VERSION	1	// increment when mount table changes and
-#define USER_VERSION_MAGIC CYGWIN_VERSION_MAGIC (USER_MAGIC, USER_VERSION)
-#define CURR_USER_MAGIC 0x8dc7b1d5U
-
-class reg_key;
-struct device;
-
-/* NOTE: Do not make gratuitous changes to the names or organization of the
-   below class.  The layout is checksummed to determine compatibility between
-   different cygwin versions. */
-class mount_info
-{
- public:
-  DWORD sys_mount_table_counter;
-  int nmounts;
-  mount_item mount[MAX_MOUNTS];
-
-  /* cygdrive_prefix is used as the root of the path automatically
-     prepended to a path when the path has no associated mount.
-     cygdrive_flags are the default flags for the cygdrives. */
-  char cygdrive[CYG_MAX_PATH];
-  size_t cygdrive_len;
-  unsigned cygdrive_flags;
- private:
-  int posix_sorted[MAX_MOUNTS];
-  int native_sorted[MAX_MOUNTS];
-
- public:
-  /* Increment when setting up a reg_key if mounts area had to be
-     created so we know when we need to import old mount tables. */
-  int had_to_create_mount_areas;
-
-  void init ();
-  int add_item (const char *dev, const char *path, unsigned flags, int reg_p);
-  int del_item (const char *path, unsigned flags, int reg_p);
-
-  void from_registry ();
-  int add_reg_mount (const char * native_path, const char * posix_path,
-		      unsigned mountflags);
-  int del_reg_mount (const char * posix_path, unsigned mountflags);
-
-  unsigned set_flags_from_win32_path (const char *path);
-  int conv_to_win32_path (const char *src_path, char *dst, device&,
-			  unsigned *flags = NULL, bool no_normalize = 0);
-  int conv_to_posix_path (const char *src_path, char *posix_path,
-			  int keep_rel_p);
-  struct mntent *getmntent (int x);
-
-  int write_cygdrive_info_to_registry (const char *cygdrive_prefix, unsigned flags);
-  int remove_cygdrive_info_from_registry (const char *cygdrive_prefix, unsigned flags);
-  int get_cygdrive_info (char *user, char *system, char* user_flags,
-			 char* system_flags);
-
- private:
-
-  void sort ();
-  void read_mounts (reg_key& r);
-  void mount_slash ();
-  void to_registry ();
-
-  int cygdrive_win32_path (const char *src, char *dst, int& unit);
-  void cygdrive_posix_path (const char *src, char *dst, int trailing_slash_p);
-  void read_cygdrive_info_from_registry ();
-};
-
-/******** Close-on-delete queue ********/
-
-/* First pass at a file deletion queue structure.
-
-   We can't keep this list in the per-process info, since
-   one process may open a file, and outlive a process which
-   wanted to unlink the file - and the data would go away.
-*/
-
-#define MAX_DELQUEUES_PENDING 100
-
-class delqueue_list
-{
-  char name[MAX_DELQUEUES_PENDING][CYG_MAX_PATH];
-  char inuse[MAX_DELQUEUES_PENDING];
-  int empty;
-
-public:
-  void init ();
-  void queue_file (const char *dosname);
-  void process_queue ();
-};
-
-class user_info
-{
-public:
-  DWORD version;
-  DWORD cb;
-  delqueue_list delqueue;
-  mount_info mountinfo;
-};
-/******** Shared Info ********/
-/* Data accessible to all tasks */
-
-#define SHARED_VERSION (unsigned)(cygwin_version.api_major << 8 | \
-				  cygwin_version.api_minor)
-#define SHARED_VERSION_MAGIC CYGWIN_VERSION_MAGIC (SHARED_MAGIC, SHARED_VERSION)
-
-#define SHARED_INFO_CB 21008
-
-#define CURR_SHARED_MAGIC 0x818f75beU
-
-/* NOTE: Do not make gratuitous changes to the names or organization of the
-   below class.  The layout is checksummed to determine compatibility between
-   different cygwin versions. */
-class shared_info
-{
-  DWORD version;
-  DWORD cb;
- public:
-  unsigned heap_chunk;
-  DWORD sys_mount_table_counter;
-
-  tty_list tty;
-  void initialize ();
-  unsigned heap_chunk_size ();
-};
-
-extern shared_info *cygwin_shared;
-extern user_info *user_shared; 
-#define mount_table (&(user_shared->mountinfo))
-extern HANDLE cygwin_user_h;
-
-enum shared_locations
-{
-  SH_CYGWIN_SHARED,
-  SH_USER_SHARED,
-  SH_SHARED_CONSOLE,
-  SH_MYSELF,
-  SH_TOTAL_SIZE
-};
-void __stdcall memory_init ();
-
-#define shared_align_past(p) \
-  ((char *) (system_info.dwAllocationGranularity * \
-	     (((DWORD) ((p) + 1) + system_info.dwAllocationGranularity - 1) / \
-	      system_info.dwAllocationGranularity)))
-
-#define cygwin_shared_address	((void *) 0xa000000)
-
-#ifdef FHDEVN
-struct console_state
-{
-  tty_min tty_min_state;
-  dev_console dev_state;
-};
-#endif
-
-char *__stdcall shared_name (char *, const char *, int);
-void *__stdcall open_shared (const char *name, int n, HANDLE &shared_h, DWORD size, 
-			     shared_locations, PSECURITY_ATTRIBUTES psa = &sec_all);
-extern void user_shared_initialize (bool reinit);
-
diff --git a/winsup/cygwin/shm.cc b/winsup/cygwin/shm.cc
deleted file mode 100644
index 92ea20f86..000000000
--- a/winsup/cygwin/shm.cc
+++ /dev/null
@@ -1,371 +0,0 @@
-/* shm.cc: XSI IPC interface for Cygwin.
-
-   Copyright 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include "cygerrno.h"
-#include <signal.h>
-#ifdef USE_SERVER
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "pinfo.h"
-#include "sigproc.h"
-
-#include "cygserver_ipc.h"
-#include "cygserver_shm.h"
-
-/*
- * client_request_shm Constructors
- */
-
-client_request_shm::client_request_shm (int shmid,
-					const void *shmaddr,
-					int shmflg)
-  : client_request (CYGSERVER_REQUEST_SHM, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.shmop = SHMOP_shmat;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-  _parameters.in.atargs.shmid = shmid;
-  _parameters.in.atargs.shmaddr = shmaddr;
-  _parameters.in.atargs.shmflg = shmflg;
-
-  msglen (sizeof (_parameters.in));
-}
-
-client_request_shm::client_request_shm (int shmid,
-					int cmd,
-					struct shmid_ds *buf)
-  : client_request (CYGSERVER_REQUEST_SHM, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.shmop = SHMOP_shmctl;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-   _parameters.in.ctlargs.shmid = shmid;
-   _parameters.in.ctlargs.cmd = cmd;
-   _parameters.in.ctlargs.buf = buf;
-
-  msglen (sizeof (_parameters.in));
-}
-
-client_request_shm::client_request_shm (const void *shmaddr)
-  : client_request (CYGSERVER_REQUEST_SHM, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.shmop = SHMOP_shmdt;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-  _parameters.in.dtargs.shmaddr = shmaddr;
-
-  msglen (sizeof (_parameters.in));
-}
-
-client_request_shm::client_request_shm (key_t key,
-					size_t size,
-					int shmflg)
-  : client_request (CYGSERVER_REQUEST_SHM, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.shmop = SHMOP_shmget;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-  _parameters.in.getargs.key = key;
-  _parameters.in.getargs.size = size;
-  _parameters.in.getargs.shmflg = shmflg;
-
-  msglen (sizeof (_parameters.in));
-}
-
-client_request_shm::client_request_shm (proc *p1)
-  : client_request (CYGSERVER_REQUEST_SHM, &_parameters, sizeof (_parameters))
-{
-  _parameters.in.shmop = SHMOP_shmfork;
-  ipc_set_proc_info (_parameters.in.ipcblk);
-
-  _parameters.in.forkargs = *p1;
-}
-
-/* List of shmid's with file mapping HANDLE and size, returned by shmget. */
-struct shm_shmid_list {
-  SLIST_ENTRY(shm_shmid_list) ssh_next;
-  int shmid;
-  vm_object_t hdl;
-  size_t size;
-};
-
-static SLIST_HEAD(, shm_shmid_list) ssh_list;
-
-/* List of attached mappings, as returned by shmat. */
-struct shm_attached_list {
-  SLIST_ENTRY(shm_attached_list) sph_next;
-  vm_object_t ptr;
-  vm_object_t hdl;
-  size_t size;
-  int access;
-};
-
-static SLIST_HEAD(, shm_attached_list) sph_list;
-
-int __stdcall
-fixup_shms_after_fork ()
-{
-  if (!SLIST_FIRST (&sph_list))
-    return 0;
-  pinfo p (myself->ppid);
-  proc parent = { myself->ppid, p->dwProcessId, p->uid, p->gid };
-
-  client_request_shm request (&parent);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = shmctl ()", request.error_code ());
-      set_errno (request.error_code ());
-      return 0;
-    }
-  shm_attached_list *sph_entry;
-  /* Remove map from list... */
-  SLIST_FOREACH (sph_entry, &sph_list, sph_next)
-    {
-      vm_object_t ptr = MapViewOfFileEx(sph_entry->hdl, sph_entry->access,
-      					0, 0, sph_entry->size, sph_entry->ptr);
-      if (ptr != sph_entry->ptr)
-        api_fatal ("MapViewOfFileEx (%p), %E.  Terminating.", sph_entry->ptr);
-    }
-  return 0;
-}
-#endif /* USE_SERVER */
-
-/*
- * XSI shmaphore API.  These are exported by the DLL.
- */
-
-extern "C" void *
-shmat (int shmid, const void *shmaddr, int shmflg)
-{
-#ifdef USE_SERVER
-  syscall_printf ("shmat (shmid = %d, shmaddr = %p, shmflg = 0x%x)",
-		  shmid, shmaddr, shmflg);
-
-  shm_shmid_list *ssh_entry;
-  SLIST_FOREACH (ssh_entry, &ssh_list, ssh_next)
-    {
-      if (ssh_entry->shmid == shmid)
-	break;
-    }
-  if (!ssh_entry)
-    {
-      /* Invalid shmid */
-      set_errno (EINVAL);
-      return NULL;
-    }
-  vm_object_t attach_va = NULL;
-  if (shmaddr)
-    {
-      if (shmflg & SHM_RND)
-        attach_va = (vm_object_t)((vm_offset_t)shmaddr & ~(SHMLBA-1));
-      else
-	attach_va = (vm_object_t)shmaddr;
-      /* Don't even bother to call anything if shmaddr is NULL or
-         not aligned. */
-      if (!attach_va || (vm_offset_t)attach_va % SHMLBA)
-	{
-	  set_errno (EINVAL);
-	  return NULL;
-	}
-    }
-  /* Try allocating memory before calling cygserver. */
-  shm_attached_list *sph_entry = new (shm_attached_list);
-  if (!sph_entry)
-    {
-      set_errno (ENOMEM);
-      return NULL;
-    }
-  DWORD access = (shmflg & SHM_RDONLY) ? FILE_MAP_READ : FILE_MAP_WRITE;
-  vm_object_t ptr = MapViewOfFileEx(ssh_entry->hdl, access, 0, 0,
-				    ssh_entry->size, attach_va);
-  if (!ptr)
-    {
-      __seterrno ();
-      delete sph_entry;
-      return NULL;
-    }
-  /* Use returned ptr address as is, so it's stored using the exact value
-     in cygserver. */
-  client_request_shm request (shmid, ptr, shmflg & ~SHM_RND);
-  if (request.make_request () == -1 || request.ptrval () == NULL)
-    {
-      syscall_printf ("-1 [%d] = shmctl ()", request.error_code ());
-      UnmapViewOfFile (ptr);
-      delete sph_entry;
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return NULL;
-    }
-  sph_entry->ptr = ptr;
-  sph_entry->hdl = ssh_entry->hdl;
-  sph_entry->size = ssh_entry->size;
-  sph_entry->access = access;
-  SLIST_INSERT_HEAD (&sph_list, sph_entry, sph_next);
-  return ptr;
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return NULL;
-#endif
-}
-
-extern "C" int
-shmctl (int shmid, int cmd, struct shmid_ds *buf)
-{
-#ifdef USE_SERVER
-  syscall_printf ("shmctl (shmid = %d, cmd = %d, buf = 0x%x)",
-		  shmid, cmd, buf);
-  switch (cmd)
-    {
-      case IPC_STAT:
-      case IPC_SET:
-	if (__check_null_invalid_struct_errno (buf, sizeof (struct shmid_ds)))
-	  return -1;
-        break;
-      case IPC_INFO:
-	/* shmid == 0: Request for shminfo struct. */
-	if (!shmid
-	    && __check_null_invalid_struct_errno (buf, sizeof (struct shminfo)))
-	    return -1;
-	/* Otherwise, request shmid entries from internal shmid_ds array. */
-	if (shmid)
-	  if (__check_null_invalid_struct_errno (buf, shmid * sizeof (struct shmid_ds)))
-	    return -1;
-        break;
-      case SHM_INFO:
-        if (__check_null_invalid_struct_errno (buf, sizeof (struct shm_info)))
-	  return -1;
-        break;
-    }
-  client_request_shm request (shmid, cmd, buf);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = shmctl ()", request.error_code ());
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return -1;
-    }
-  if (cmd == IPC_RMID)
-    {
-      /* The process must cleanup its own storage... */
-      shm_shmid_list *ssh_entry, *ssh_next_entry;
-      SLIST_FOREACH_SAFE (ssh_entry, &ssh_list, ssh_next, ssh_next_entry)
-        {
-	  if (ssh_entry->shmid == shmid)
-	    {
-	      SLIST_REMOVE (&ssh_list, ssh_entry, shm_shmid_list, ssh_next);
-	      /* ...and close the handle. */
-	      CloseHandle (ssh_entry->hdl);
-	      delete ssh_entry;
-	      break;
-	    }
-	}
-    }
-  return request.retval ();
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return -1;
-#endif
-}
-
-extern "C" int
-shmdt (const void *shmaddr)
-{
-#ifdef USE_SERVER
-  syscall_printf ("shmget (shmaddr = %p)", shmaddr);
-  client_request_shm request (shmaddr);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = shmctl ()", request.error_code ());
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return -1;
-    }
-  shm_attached_list *sph_entry, *sph_next_entry;
-  /* Remove map from list... */
-  SLIST_FOREACH_SAFE (sph_entry, &sph_list, sph_next, sph_next_entry)
-    {
-      if (sph_entry->ptr == shmaddr)
-        {
-	  SLIST_REMOVE (&sph_list, sph_entry, shm_attached_list, sph_next);
-	  /* ...and unmap view. */
-	  UnmapViewOfFile (sph_entry->ptr);
-	  delete sph_entry;
-	  break;
-	}
-    }
-  return request.retval ();
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return -1;
-#endif
-}
-
-extern "C" int
-shmget (key_t key, size_t size, int shmflg)
-{
-#ifdef USE_SERVER
-  syscall_printf ("shmget (key = %U, size = %d, shmflg = 0x%x)",
-		  key, size, shmflg);
-  /* Try allocating memory before calling cygserver. */
-  shm_shmid_list *ssh_new_entry = new (shm_shmid_list);
-  if (!ssh_new_entry)
-    {
-      set_errno (ENOMEM);
-      return -1;
-    }
-  client_request_shm request (key, size, shmflg);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = shmctl ()", request.error_code ());
-      delete ssh_new_entry;
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-        raise (SIGSYS);
-      return -1;
-    }
-  int shmid = request.retval ();	/* Shared mem ID */
-  vm_object_t hdl = request.objval ();	/* HANDLE associated with it. */
-  shm_shmid_list *ssh_entry;
-  SLIST_FOREACH (ssh_entry, &ssh_list, ssh_next)
-    {
-      if (ssh_entry->shmid == shmid)
-        {
-	  /* We already maintain an entry for this shmid.  That means,
-	     the hdl returned by cygserver is a superfluous duplicate
-	     of the original hdl maintained by cygserver.  We can safely
-	     delete it. */
-	  CloseHandle (hdl);
-	  delete ssh_new_entry;
-	  return shmid;
-	}
-    }
-  /* We arrive here only if shmid is a new one for this process.  Add the
-     shmid and hdl value to the list. */
-  ssh_new_entry->shmid = shmid;
-  ssh_new_entry->hdl = hdl;
-  ssh_new_entry->size = size;
-  SLIST_INSERT_HEAD (&ssh_list, ssh_new_entry, ssh_next);
-  return shmid;
-#else
-  set_errno (ENOSYS);
-  raise (SIGSYS);
-  return -1;
-#endif
-}
diff --git a/winsup/cygwin/signal.cc b/winsup/cygwin/signal.cc
deleted file mode 100644
index 311e7303b..000000000
--- a/winsup/cygwin/signal.cc
+++ /dev/null
@@ -1,481 +0,0 @@
-/* signal.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Steve Chamberlain of Cygnus Support, sac@cygnus.com
-   Significant changes by Sergey Okhapkin <sos@prospect.com.ru>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include "cygerrno.h"
-#include <sys/cygwin.h>
-#include "pinfo.h"
-#include "sigproc.h"
-#include "hires.h"
-#include "security.h"
-#include "cygtls.h"
-
-int sigcatchers;	/* FIXME: Not thread safe. */
-
-#define sigtrapped(func) ((func) != SIG_IGN && (func) != SIG_DFL)
-
-static inline void
-set_sigcatchers (void (*oldsig) (int), void (*cursig) (int))
-{
-#ifdef DEBUGGING
-  int last_sigcatchers = sigcatchers;
-#endif
-  if (!sigtrapped (oldsig) && sigtrapped (cursig))
-    sigcatchers++;
-  else if (sigtrapped (oldsig) && !sigtrapped (cursig))
-    sigcatchers--;
-#ifdef DEBUGGING
-  if (last_sigcatchers != sigcatchers)
-    sigproc_printf ("last %d, old %d, cur %p, cur %p", last_sigcatchers,
-		    sigcatchers, oldsig, cursig);
-#endif
-}
-
-extern "C" _sig_func_ptr
-signal (int sig, _sig_func_ptr func)
-{
-  sig_dispatch_pending ();
-  _sig_func_ptr prev;
-
-  /* check that sig is in right range */
-  if (sig < 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
-    {
-      set_errno (EINVAL);
-      syscall_printf ("SIG_ERR = signal (%d, %p)", sig, func);
-      return (_sig_func_ptr) SIG_ERR;
-    }
-
-  prev = global_sigs[sig].sa_handler;
-  global_sigs[sig].sa_handler = func;
-  global_sigs[sig].sa_mask = 0;
-  /* SA_RESTART is set to maintain BSD compatible signal behaviour by default.
-     This is also compatible with the behaviour of signal(2) in Linux. */
-  global_sigs[sig].sa_flags |= SA_RESTART;
-  set_sigcatchers (prev, func);
-
-  syscall_printf ("%p = signal (%d, %p)", prev, sig, func);
-  return prev;
-}
-
-extern "C" int
-nanosleep (const struct timespec *rqtp, struct timespec *rmtp)
-{
-  int res = 0;
-  sig_dispatch_pending ();
-  pthread_testcancel ();
-
-  if ((unsigned int) rqtp->tv_sec > (HIRES_DELAY_MAX / 1000 - 1)
-      || (unsigned int) rqtp->tv_nsec > 999999999)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  DWORD resolution = gtod.resolution ();
-  DWORD req = ((rqtp->tv_sec * 1000 + (rqtp->tv_nsec + 999999) / 1000000
-		+ resolution - 1) / resolution) * resolution;
-  DWORD end_time = gtod.dmsecs () + req;
-  syscall_printf ("nanosleep (%ld)", req);
-
-  int rc = pthread::cancelable_wait (signal_arrived, req);
-  DWORD rem;
-  if ((rem = end_time - gtod.dmsecs ()) > HIRES_DELAY_MAX)
-    rem = 0;
-  if (rc == WAIT_OBJECT_0)
-    {
-      (void) call_signal_handler_now ();
-      set_errno (EINTR);
-      res = -1;
-    }
-
-  if (rmtp)
-    {
-      rmtp->tv_sec = rem / 1000;
-      rmtp->tv_nsec = (rem % 1000) * 1000000;
-    }
-
-  syscall_printf ("%d = nanosleep (%ld, %ld)", res, req, rem);
-  return res;
-}
-
-extern "C" unsigned int
-sleep (unsigned int seconds)
-{
-  struct timespec req, rem;
-  req.tv_sec = seconds;
-  req.tv_nsec = 0;
-  nanosleep (&req, &rem);
-  return rem.tv_sec + (rem.tv_nsec > 0);
-}
-
-extern "C" unsigned int
-usleep (unsigned int useconds)
-{
-  struct timespec req;
-  req.tv_sec = useconds / 1000000;
-  req.tv_nsec = (useconds % 1000000) * 1000;
-  int res = nanosleep (&req, 0);
-  return res;
-}
-
-extern "C" int
-sigprocmask (int sig, const sigset_t *set, sigset_t *oldset)
-{
-  return handle_sigprocmask (sig, set, oldset, myself->getsigmask ());
-}
-
-int __stdcall
-handle_sigprocmask (int sig, const sigset_t *set, sigset_t *oldset, sigset_t& opmask)
-{
-  sig_dispatch_pending ();
-  /* check that sig is in right range */
-  if (sig < 0 || sig >= NSIG)
-    {
-      set_errno (ESRCH);
-      syscall_printf ("SIG_ERR = sigprocmask signal %d out of range", sig);
-      return -1;
-    }
-
-  if (oldset)
-    {
-      if (check_null_invalid_struct_errno (oldset))
-	return -1;
-      *oldset = opmask;
-    }
-
-  if (set)
-    {
-      if (check_invalid_read_struct_errno (set))
-	return -1;
-      sigset_t newmask = opmask;
-      switch (sig)
-	{
-	case SIG_BLOCK:
-	  /* add set to current mask */
-	  newmask |= *set;
-	  break;
-	case SIG_UNBLOCK:
-	  /* remove set from current mask */
-	  newmask &= ~*set;
-	  break;
-	case SIG_SETMASK:
-	  /* just set it */
-	  newmask = *set;
-	  break;
-	default:
-	  set_errno (EINVAL);
-	  return -1;
-	}
-      (void) set_signal_mask (newmask, opmask);
-    }
-  return 0;
-}
-
-static int
-kill_worker (pid_t pid, int sig)
-{
-  sig_dispatch_pending ();
-
-  int res = 0;
-  pinfo dest (pid);
-  BOOL sendSIGCONT;
-
-  if (!dest)
-    {
-      set_errno (ESRCH);
-      return -1;
-    }
-
-  if ((sendSIGCONT = (sig < 0)))
-    sig = -sig;
-
-  DWORD process_state = dest->process_state;
-  if (sig == 0)
-    {
-      res = proc_exists (dest) ? 0 : -1;
-      if (res < 0)
-	set_errno (ESRCH);
-    }
-  else if ((res = sig_send (dest, sig)))
-    {
-      sigproc_printf ("%d = sig_send, %E ", res);
-      res = -1;
-    }
-  else if (sendSIGCONT)
-    (void) sig_send (dest, SIGCONT);
-
-  syscall_printf ("%d = kill_worker (%d, %d), process_state %p", res, pid, sig, process_state);
-  return res;
-}
-
-int
-raise (int sig)
-{
-  return kill (myself->pid, sig);
-}
-
-int
-kill (pid_t pid, int sig)
-{
-  syscall_printf ("kill (%d, %d)", pid, sig);
-  /* check that sig is in right range */
-  if (sig < 0 || sig >= NSIG)
-    {
-      set_errno (EINVAL);
-      syscall_printf ("signal %d out of range", sig);
-      return -1;
-    }
-
-  /* Silently ignore stop signals from a member of orphaned process group.
-     FIXME: Why??? */
-  if (ISSTATE (myself, PID_ORPHANED) &&
-      (sig == SIGTSTP || sig == SIGTTIN || sig == SIGTTOU))
-    sig = 0;
-
-  return (pid > 0) ? kill_worker (pid, sig) : kill_pgrp (-pid, sig);
-}
-
-int
-kill_pgrp (pid_t pid, int sig)
-{
-  int res = 0;
-  int found = 0;
-  int killself = 0;
-
-  sigproc_printf ("pid %d, signal %d", pid, sig);
-
-  winpids pids ((DWORD) PID_MAP_RW);
-  for (unsigned i = 0; i < pids.npids; i++)
-    {
-      _pinfo *p = pids[i];
-
-      if (!proc_exists (p))
-	continue;
-
-      /* Is it a process we want to kill?  */
-      if ((pid == 0 && (p->pgid != myself->pgid || p->ctty != myself->ctty)) ||
-	  (pid > 1 && p->pgid != pid) ||
-	  (sig < 0 && NOTSTATE (p, PID_STOPPED)))
-	continue;
-      sigproc_printf ("killing pid %d, pgrp %d, p->ctty %d, myself->ctty %d",
-		      p->pid, p->pgid, p->ctty, myself->ctty);
-      if (p == myself)
-	killself++;
-      else if (kill_worker (p->pid, sig))
-	res = -1;
-      found++;
-    }
-
-  if (killself && kill_worker (myself->pid, sig))
-    res = -1;
-
-  if (!found)
-    {
-      set_errno (ESRCH);
-      res = -1;
-    }
-  syscall_printf ("%d = kill (%d, %d)", res, pid, sig);
-  return res;
-}
-
-extern "C" int
-killpg (pid_t pgrp, int sig)
-{
-  return kill (-pgrp, sig);
-}
-
-extern "C" void
-abort (void)
-{
-  sig_dispatch_pending ();
-  /* Flush all streams as per SUSv2.
-     From my reading of this document, this isn't strictly correct.
-     The streams are supposed to be flushed prior to exit.  However,
-     if there is I/O in any signal handler that will not necessarily
-     be flushed.
-     However this is the way FreeBSD does it, and it is much easier to
-     do things this way, so... */
-  if (_REENT->__cleanup)
-    _REENT->__cleanup (_REENT);
-
-  /* Ensure that SIGABRT can be caught regardless of blockage. */
-  sigset_t sig_mask;
-  sigfillset (&sig_mask);
-  sigdelset (&sig_mask, SIGABRT);
-  set_signal_mask (sig_mask);
-
-  raise (SIGABRT);
-  (void) call_signal_handler_now (); /* Call any signal handler */
-  do_exit (1);	/* signal handler didn't exit.  Goodbye. */
-}
-
-extern "C" int
-sigaction (int sig, const struct sigaction *newact, struct sigaction *oldact)
-{
-  sig_dispatch_pending ();
-  sigproc_printf ("signal %d, newact %p, oldact %p", sig, newact, oldact);
-  /* check that sig is in right range */
-  if (sig < 0 || sig >= NSIG)
-    {
-      set_errno (EINVAL);
-      syscall_printf ("SIG_ERR = sigaction signal %d out of range", sig);
-      return -1;
-    }
-
-  struct sigaction oa = global_sigs[sig];
-
-  if (newact)
-    {
-      if (sig == SIGKILL || sig == SIGSTOP)
-	{
-	  set_errno (EINVAL);
-	  return -1;
-	}
-      global_sigs[sig] = *newact;
-      if (newact->sa_handler == SIG_IGN)
-	sig_clear (sig);
-      if (newact->sa_handler == SIG_DFL && sig == SIGCHLD)
-	sig_clear (sig);
-      set_sigcatchers (oa.sa_handler, newact->sa_handler);
-      if (sig == SIGCHLD)
-	{
-	  myself->process_state &= ~PID_NOCLDSTOP;
-	  if (newact->sa_flags & SA_NOCLDSTOP);
-	    myself->process_state |= PID_NOCLDSTOP;
-	}
-    }
-
-  if (oldact)
-    *oldact = oa;
-
-  return 0;
-}
-
-extern "C" int
-sigaddset (sigset_t *set, const int sig)
-{
-  /* check that sig is in right range */
-  if (sig <= 0 || sig >= NSIG)
-    {
-      set_errno (EINVAL);
-      syscall_printf ("SIG_ERR = sigaddset signal %d out of range", sig);
-      return -1;
-    }
-
-  *set |= SIGTOMASK (sig);
-  return 0;
-}
-
-extern "C" int
-sigdelset (sigset_t *set, const int sig)
-{
-  /* check that sig is in right range */
-  if (sig <= 0 || sig >= NSIG)
-    {
-      set_errno (EINVAL);
-      syscall_printf ("SIG_ERR = sigdelset signal %d out of range", sig);
-      return -1;
-    }
-
-  *set &= ~SIGTOMASK (sig);
-  return 0;
-}
-
-extern "C" int
-sigismember (const sigset_t *set, int sig)
-{
-  /* check that sig is in right range */
-  if (sig <= 0 || sig >= NSIG)
-    {
-      set_errno (EINVAL);
-      syscall_printf ("SIG_ERR = sigdelset signal %d out of range", sig);
-      return -1;
-    }
-
-  if (*set & SIGTOMASK (sig))
-    return 1;
-  else
-    return 0;
-}
-
-extern "C" int
-sigemptyset (sigset_t *set)
-{
-  *set = (sigset_t) 0;
-  return 0;
-}
-
-extern "C" int
-sigfillset (sigset_t *set)
-{
-  *set = ~((sigset_t) 0);
-  return 0;
-}
-
-extern "C" int
-sigsuspend (const sigset_t *set)
-{
-  return handle_sigsuspend (*set);
-}
-
-extern "C" int
-sigpause (int signal_mask)
-{
-  return handle_sigsuspend ((sigset_t) signal_mask);
-}
-
-extern "C" int
-pause (void)
-{
-  return handle_sigsuspend (myself->getsigmask ());
-}
-
-extern "C" int
-siginterrupt (int sig, int flag)
-{
-  struct sigaction act;
-  (void) sigaction(sig, NULL, &act);
-  if (flag)
-    act.sa_flags &= ~SA_RESTART;
-  else
-    act.sa_flags |= SA_RESTART;
-  return sigaction (sig, &act, NULL);
-}
-
-
-extern "C" int
-sigwait (const sigset_t *set, int *sig)
-{
-  pthread_testcancel ();
-  _my_tls.event = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
-  if (!_my_tls.event)
-    {
-      __seterrno ();
-      return -1;
-    }
-
-  _my_tls.sigwait_mask = *set;
-
-  switch (WaitForSingleObject (_my_tls.event, INFINITE))
-    {
-    case WAIT_OBJECT_0:
-      CloseHandle (_my_tls.event);
-      _my_tls.event = NULL;
-      *sig = InterlockedExchange ((LONG *) &_my_tls.sig, (LONG) 0);
-      break;
-    default:
-      __seterrno ();
-      return -1;
-    }
-  return 0;
-}
diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
deleted file mode 100644
index 0f4431f85..000000000
--- a/winsup/cygwin/sigproc.cc
+++ /dev/null
@@ -1,1245 +0,0 @@
-/* sigproc.cc: inter/intra signal and sub process handler
-
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Christopher Faylor
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include <time.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <sys/cygwin.h>
-#include <assert.h>
-#include <sys/signal.h>
-#include "cygerrno.h"
-#include "sync.h"
-#include "pinfo.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "child_info_magic.h"
-#include "shared_info.h"
-#include "cygthread.h"
-#include "cygtls.h"
-#include "sigproc.h"
-#include "perthread.h"
-
-/*
- * Convenience defines
- */
-#define WSSC		  60000	// Wait for signal completion
-#define WPSP		  40000	// Wait for proc_subproc mutex
-
-#define PSIZE 63		// Number of processes
-
-#define wake_wait_subproc() SetEvent (events[0])
-
-#define no_signals_available() (!hwait_sig || !sig_loop_wait || exit_state)
-
-#define NZOMBIES	256
-
-struct sigelem
-{
-  int sig;
-  int pid;
-  _threadinfo *tls;
-  class sigelem *next;
-  friend class pending_signals;
-  friend int __stdcall sig_dispatch_pending ();
-};
-
-class pending_signals
-{
-  sigelem sigs[NSIG + 1];
-  sigelem start;
-  sigelem *end;
-  sigelem *prev;
-  sigelem *curr;
-  int empty;
-public:
-  void reset () {curr = &start; prev = &start;}
-  void add (int sig, int pid, _threadinfo *tls);
-  void del ();
-  sigelem *next ();
-  friend int __stdcall sig_dispatch_pending ();
-};
-
-struct sigpacket
-{
-  int sig;
-  pid_t pid;
-  HANDLE wakeup;
-  sigset_t *mask;
-  _threadinfo *tls;
-};
-
-static pending_signals sigqueue;
-
-struct sigaction *global_sigs;
-
-void __stdcall
-sigalloc ()
-{
-  cygheap->sigs = global_sigs =
-    (struct sigaction *) ccalloc (HEAP_SIGS, NSIG, sizeof (struct sigaction));
-}
-
-void __stdcall
-signal_fixup_after_exec ()
-{
-  global_sigs = cygheap->sigs;
-  /* Set up child's signal handlers */
-  for (int i = 0; i < NSIG; i++)
-    {
-      global_sigs[i].sa_mask = 0;
-      if (global_sigs[i].sa_handler != SIG_IGN)
-	global_sigs[i].sa_handler = SIG_DFL;
-    }
-}
-
-/*
- * Global variables
- */
-const char *__sp_fn ;
-int __sp_ln;
-
-char NO_COPY myself_nowait_dummy[1] = {'0'};// Flag to sig_send that signal goes to
-					//  current process but no wait is required
-HANDLE NO_COPY signal_arrived;		// Event signaled when a signal has
-					//  resulted in a user-specified
-					//  function call
-/*
- * Common variables
- */
-
-
-/* How long to wait for message/signals.  Normally this is infinite.
- * On termination, however, these are set to zero as a flag to exit.
- */
-
-#define Static static NO_COPY
-
-Static DWORD proc_loop_wait = 1000;	// Wait for subprocesses to exit
-Static DWORD sig_loop_wait = INFINITE;	// Wait for signals to arrive
-
-Static HANDLE sigcomplete_main;		// Event signaled when a signal has
-					//  finished processing for the main
-					//  thread
-HANDLE NO_COPY sigCONT;			// Used to "STOP" a process
-Static cygthread *hwait_sig;		// Handle of wait_sig thread
-Static cygthread *hwait_subproc;	// Handle of sig_subproc thread
-
-Static HANDLE wait_sig_inited;		// Control synchronization of
-					//  message queue startup
-
-/* Used by WaitForMultipleObjects.  These are handles to child processes.
- */
-Static HANDLE events[PSIZE + 1];	  // All my children's handles++
-#define hchildren (events + 1)		// Where the children handles begin
-Static char cpchildren[PSIZE * sizeof (pinfo)];		// All my children info
-Static int nchildren;			// Number of active children
-Static char czombies[(NZOMBIES + 1) * sizeof (pinfo)];		// All my deceased children info
-Static int nzombies;			// Number of deceased children
-
-#define pchildren ((pinfo *) cpchildren)
-#define zombies ((pinfo *) czombies)
-
-Static waitq waitq_head = {0, 0, 0, 0, 0, 0, 0};// Start of queue for wait'ing threads
-Static waitq waitq_main;		// Storage for main thread
-
-muto NO_COPY *sync_proc_subproc = NULL;	// Control access to subproc stuff
-
-DWORD NO_COPY sigtid = 0;		// ID of the signal thread
-
-/* Functions
- */
-static int __stdcall checkstate (waitq *) __attribute__ ((regparm (1)));
-static __inline__ bool get_proc_lock (DWORD, DWORD);
-static void __stdcall remove_zombie (int);
-static DWORD WINAPI wait_sig (VOID *arg);
-static int __stdcall stopped_or_terminated (waitq *, _pinfo *);
-static DWORD WINAPI wait_subproc (VOID *);
-
-/* Determine if the parent process is alive.
- */
-
-bool __stdcall
-my_parent_is_alive ()
-{
-  bool res;
-  if (!myself->ppid_handle)
-    {
-      debug_printf ("No myself->ppid_handle");
-      res = false;
-    }
-  else
-    for (int i = 0; i < 2; i++)
-      switch (res = WaitForSingleObject (myself->ppid_handle, 0))
-	{
-	  case WAIT_OBJECT_0:
-	    debug_printf ("parent dead.");
-	    res = false;
-	    goto out;
-	  case WAIT_TIMEOUT:
-	    debug_printf ("parent still alive");
-	    res = true;
-	    goto out;
-	  case WAIT_FAILED:
-	    DWORD werr = GetLastError ();
-	    if (werr == ERROR_INVALID_HANDLE && i == 0)
-	      continue;
-	    system_printf ("WFSO for myself->ppid_handle(%p) failed, error %d",
-			   myself->ppid_handle, werr);
-	    res = false;
-	    goto out;
-	}
-out:
-  return res;
-}
-
-void __stdcall
-wait_for_sigthread ()
-{
-  sigproc_printf ("wait_sig_inited %p", wait_sig_inited);
-  HANDLE hsig_inited = wait_sig_inited;
-  (void) WaitForSingleObject (hsig_inited, INFINITE);
-  wait_sig_inited = NULL;
-  (void) ForceCloseHandle1 (hsig_inited, wait_sig_inited);
-}
-
-/* Get the sync_proc_subproc muto to control access to
- * children, zombie arrays.
- * Attempt to handle case where process is exiting as we try to grab
- * the mutex.
- */
-static bool
-get_proc_lock (DWORD what, DWORD val)
-{
-  Static int lastwhat = -1;
-  if (!sync_proc_subproc)
-    return false;
-  if (sync_proc_subproc->acquire (WPSP))
-    {
-      lastwhat = what;
-      return true;
-    }
-  if (!sync_proc_subproc)
-    return false;
-  system_printf ("Couldn't aquire sync_proc_subproc for(%d,%d), %E, last %d",
-		  what, val, lastwhat);
-  return true;
-}
-
-static bool __stdcall
-proc_can_be_signalled (_pinfo *p)
-{
-  if (p == myself_nowait || p == myself)
-    {
-      assert (!wait_sig_inited);
-      return true;
-    }
-
-  if (p->sendsig == INVALID_HANDLE_VALUE)
-    {
-      set_errno (EPERM);
-      return false;
-    }
-
-  if (ISSTATE (p, PID_INITIALIZING) ||
-      (((p)->process_state & (PID_ACTIVE | PID_IN_USE)) ==
-       (PID_ACTIVE | PID_IN_USE)))
-    return true;
-
-  set_errno (ESRCH);
-  return false;
-}
-
-bool __stdcall
-pid_exists (pid_t pid)
-{
-  pinfo p (pid);
-  return proc_exists (p);
-}
-
-/* Test to determine if a process really exists and is processing signals.
- */
-bool __stdcall
-proc_exists (_pinfo *p)
-{
-  return p && !(p->process_state & (PID_EXITED | PID_ZOMBIE));
-}
-
-/* Return 1 if this is one of our children, zero otherwise.
-   FIXME: This really should be integrated with the rest of the proc_subproc
-   testing.  Scanning these lists twice is inefficient. */
-int __stdcall
-mychild (int pid)
-{
-  for (int i = 0; i < nchildren; i++)
-    if (pchildren[i]->pid == pid)
-      return 1;
-  for (int i = 0; i < nzombies; i++)
-    if (zombies[i]->pid == pid)
-      return 1;
-  return 0;
-}
-
-/* Handle all subprocess requests
- */
-#define vchild (*((pinfo *) val))
-int __stdcall
-proc_subproc (DWORD what, DWORD val)
-{
-  int rc = 1;
-  int potential_match;
-  _pinfo *child;
-  int clearing;
-  waitq *w;
-  int thiszombie;
-
-#define wval	 ((waitq *) val)
-
-  sigproc_printf ("args: %x, %d", what, val);
-
-  if (!get_proc_lock (what, val))	// Serialize access to this function
-    {
-      system_printf ("couldn't get proc lock.  Something is wrong.");
-      goto out1;
-    }
-
-  switch (what)
-    {
-    /* Add a new subprocess to the children arrays.
-     * (usually called from the main thread)
-     */
-    case PROC_ADDCHILD:
-      if (nchildren >= PSIZE - 1)
-	{
-	  rc = 0;
-	  break;
-	}
-      pchildren[nchildren] = vchild;
-      hchildren[nchildren] = vchild->hProcess;
-      if (!DuplicateHandle (hMainProc, vchild->hProcess, hMainProc, &vchild->pid_handle,
-			    0, 0, DUPLICATE_SAME_ACCESS))
-	system_printf ("Couldn't duplicate child handle for pid %d, %E", vchild->pid);
-      ProtectHandle1 (vchild->pid_handle, pid_handle);
-
-      if (!DuplicateHandle (hMainProc, hMainProc, vchild->hProcess, &vchild->ppid_handle,
-			    SYNCHRONIZE | PROCESS_DUP_HANDLE, TRUE, 0))
-	system_printf ("Couldn't duplicate my handle<%p> for pid %d, %E", hMainProc, vchild->pid);
-      vchild->ppid = myself->pid;
-      vchild->uid = myself->uid;
-      vchild->gid = myself->gid;
-      vchild->pgid = myself->pgid;
-      vchild->sid = myself->sid;
-      vchild->ctty = myself->ctty;
-      vchild->process_state |= PID_INITIALIZING | (myself->process_state & PID_USETTY);
-
-      sigproc_printf ("added pid %d to wait list, slot %d, winpid %p, handle %p",
-		  vchild->pid, nchildren, vchild->dwProcessId,
-		  vchild->hProcess);
-      nchildren++;
-
-      wake_wait_subproc ();
-      break;
-
-    /* A child process had terminated.
-       Possibly this is just due to an exec().  Cygwin implements an exec()
-       as a "handoff" from one windows process to another.  If child->hProcess
-       is different from what is recorded in hchildren, then this is an exec().
-       Otherwise this is a normal child termination event.
-       (called from wait_subproc thread) */
-    case PROC_CHILDTERMINATED:
-      if (hchildren[val] != pchildren[val]->hProcess)
-	{
-	  sigproc_printf ("pid %d[%d], reparented old hProcess %p, new %p",
-			  pchildren[val]->pid, val, hchildren[val], pchildren[val]->hProcess);
-	  HANDLE h = hchildren[val];
-	  hchildren[val] = pchildren[val]->hProcess; /* Filled out by child */
-	  sync_proc_subproc->release ();	// Release the lock ASAP
-	  ForceCloseHandle1 (h, childhProc);
-	  ProtectHandle1 (pchildren[val]->hProcess, childhProc);
-	  rc = 0;
-	  goto out;			// This was an exec()
-	}
-
-      sigproc_printf ("pid %d[%d] terminated, handle %p, nchildren %d, nzombies %d",
-		  pchildren[val]->pid, val, hchildren[val], nchildren, nzombies);
-
-      thiszombie = nzombies;
-      zombies[nzombies] = pchildren[val];	// Add to zombie array
-      zombies[nzombies++]->process_state = PID_ZOMBIE;// Walking dead
-
-      sigproc_printf ("zombifying [%d], pid %d, handle %p, nchildren %d",
-		      val, pchildren[val]->pid, hchildren[val], nchildren);
-      if ((int) val < --nchildren)
-	{
-	  hchildren[val] = hchildren[nchildren];
-	  pchildren[val] = pchildren[nchildren];
-	}
-
-      /* See if we should care about the this terminated process.  If we've
-	 filled up our table or if we're ignoring SIGCHLD, then we immediately
-	 remove the process and move on. Otherwise, this process becomes a zombie
-	 which must be reaped by a wait() call.  FIXME:  This is a very inelegant
-	 way to deal with this and could lead to process hangs.  */
-      if (nzombies >= NZOMBIES)
-	{
-	  sigproc_printf ("zombie table overflow %d", thiszombie);
-	  remove_zombie (thiszombie);
-	}
-
-      /* Don't scan the wait queue yet.  Caller will send SIGCHLD to this process.
-	 This will cause an eventual scan of waiters. */
-      break;
-
-    /* Handle a wait4() operation.  Allocates an event for the calling
-     * thread which is signaled when the appropriate pid exits or stops.
-     * (usually called from the main thread)
-     */
-    case PROC_WAIT:
-      wval->ev = NULL;		// Don't know event flag yet
-
-      if (wval->pid <= 0)
-	child = NULL;		// Not looking for a specific pid
-      else if (!mychild (wval->pid))
-	goto out;		// invalid pid.  flag no such child
-
-      wval->status = 0;		// Don't know status yet
-      sigproc_printf ("wval->pid %d, wval->options %d", wval->pid, wval->options);
-
-      /* If the first time for this thread, create a new event, otherwise
-       * reset the event.
-       */
-      if ((wval->ev = wval->thread_ev) == NULL)
-	{
-	  wval->ev = wval->thread_ev = CreateEvent (&sec_none_nih, TRUE,
-						    FALSE, NULL);
-	  ProtectHandle (wval->ev);
-	}
-
-      ResetEvent (wval->ev);
-      w = waitq_head.next;
-      waitq_head.next = wval;	/* Add at the beginning. */
-      wval->next = w;		/* Link in rest of the list. */
-      clearing = 0;
-      goto scan_wait;
-
-    /* Clear all waiting threads.  Called from exceptions.cc prior to
-       the main thread's dispatch to a signal handler function.
-       (called from wait_sig thread) */
-    case PROC_CLEARWAIT:
-      /* Clear all "wait"ing threads. */
-      if (val)
-	sigproc_printf ("clear waiting threads");
-      else
-	sigproc_printf ("looking for processes to reap");
-      clearing = val;
-
-    scan_wait:
-      /* Scan the linked list of wait()ing threads.  If a wait's parameters
-       * match this pid, then activate it.
-       */
-      for (w = &waitq_head; w->next != NULL; w = w->next)
-	{
-	  if ((potential_match = checkstate (w)) > 0)
-	    sigproc_printf ("released waiting thread");
-	  else if (!clearing && !(w->next->options & WNOHANG) && potential_match < 0)
-	    sigproc_printf ("only found non-terminated children");
-	  else if (potential_match <= 0)		// nothing matched
-	    {
-	      sigproc_printf ("waiting thread found no children");
-	      HANDLE oldw = w->next->ev;
-	      w->next->pid = 0;
-	      if (clearing)
-		w->next->status = -1;		/* flag that a signal was received */
-	      else if (!potential_match || !(w->next->options & WNOHANG))
-		w->next->ev = NULL;
-	      if (!SetEvent (oldw))
-		system_printf ("couldn't wake up wait event %p, %E", oldw);
-	      w->next = w->next->next;
-	    }
-	  if (w->next == NULL)
-	    break;
-	}
-
-      if (!clearing)
-	sigproc_printf ("finished processing terminated/stopped child");
-      else
-	{
-	  waitq_head.next = NULL;
-	  sigproc_printf ("finished clearing");
-	}
-
-      if (global_sigs[SIGCHLD].sa_handler == (void *) SIG_IGN)
-	while (nzombies)
-	  remove_zombie (0);
-      break;
-  }
-
-out:
-  sync_proc_subproc->release ();	// Release the lock
-out1:
-  sigproc_printf ("returning %d", rc);
-  return rc;
-}
-
-/* Terminate the wait_subproc thread.
- * Called on process exit.
- * Also called by spawn_guts to disassociate any subprocesses from this
- * process.  Subprocesses will then know to clean up after themselves and
- * will not become zombies.
- */
-void __stdcall
-proc_terminate (void)
-{
-  sigproc_printf ("nchildren %d, nzombies %d", nchildren, nzombies);
-  /* Signal processing is assumed to be blocked in this routine. */
-  if (hwait_subproc)
-    {
-      proc_loop_wait = 0;	// Tell wait_subproc thread to exit
-      sync_proc_subproc->acquire (WPSP);
-      wake_wait_subproc ();	// Wake wait_subproc loop
-      hwait_subproc = NULL;
-
-      (void) proc_subproc (PROC_CLEARWAIT, 1);
-
-      /* Clean out zombie processes from the pid list. */
-      int i;
-      for (i = 0; i < nzombies; i++)
-	{
-	  if (zombies[i]->hProcess)
-	    {
-	      ForceCloseHandle1 (zombies[i]->hProcess, childhProc);
-	      ForceCloseHandle1 (zombies[i]->pid_handle, pid_handle);
-	    }
-	  zombies[i]->ppid = 1;
-	  zombies[i]->process_state = PID_EXITED;	/* CGF FIXME - still needed? */
-	  zombies[i].release ();	// FIXME: this breaks older gccs for some reason
-	}
-
-      /* Disassociate my subprocesses */
-      for (i = 0; i < nchildren; i++)
-	{
-	  if (!pchildren[i]->hProcess)
-	    sigproc_printf ("%d(%d) hProcess cleared already?", pchildren[i]->pid,
-			pchildren[i]->dwProcessId);
-	  else
-	    {
-	      ForceCloseHandle1 (pchildren[i]->hProcess, childhProc);
-	      sigproc_printf ("%d(%d) closed child handle", pchildren[i]->pid,
-			      pchildren[i]->dwProcessId);
-	      pchildren[i]->ppid = 1;
-	      if (pchildren[i]->pgid == myself->pid)
-		pchildren[i]->process_state |= PID_ORPHANED;
-	    }
-	  pchildren[i].release ();
-	}
-      nchildren = nzombies = 0;
-      /* Just zero sync_proc_subproc as the delete below seems to cause
-	 problems for older gccs. */
-	sync_proc_subproc = NULL;
-    }
-  sigproc_printf ("leaving");
-}
-
-/* Clear pending signal */
-void __stdcall
-sig_clear (int target_sig)
-{
-  if (GetCurrentThreadId () != sigtid)
-    sig_send (myself, -target_sig);
-  else
-    {
-      sigqueue.reset ();
-      sigelem *q;
-      while ((q = sigqueue.next ()))
-	if (q->sig == target_sig)
-	  {
-	    sigqueue.del ();
-	    break;
-	  }
-    }
-  return;
-}
-
-extern "C" int
-sigpending (sigset_t *mask)
-{
-  sigset_t outset = (sigset_t) sig_send (myself, __SIGPENDING);
-  if (outset == SIG_BAD_MASK)
-    return -1;
-  *mask = outset;
-  return 0;
-}
-
-/* Force the wait_sig thread to wake up and scan for pending signals */
-int __stdcall
-sig_dispatch_pending ()
-{
-  if (exit_state || GetCurrentThreadId () == sigtid || !sigqueue.start.next)
-    return 0;
-
-  (void) sig_send (myself, __SIGFLUSH);
-  return call_signal_handler_now ();
-}
-
-/* Message initialization.  Called from dll_crt0_1
- *
- * This routine starts the signal handling thread.  The wait_sig_inited
- * event is used to signal that the thread is ready to handle signals.
- * We don't wait for this during initialization but instead detect it
- * in sig_send to gain a little concurrency.
- */
-void __stdcall
-sigproc_init ()
-{
-  wait_sig_inited = CreateEvent (&sec_none_nih, TRUE, FALSE, NULL);
-  ProtectHandle (wait_sig_inited);
-
-  /* sync_proc_subproc is used by proc_subproc.  It serialises
-   * access to the children and zombie arrays.
-   */
-  new_muto (sync_proc_subproc);
-
-  /* local event signaled when main thread has been dispatched
-     to a signal handler function. */
-  signal_arrived = CreateEvent (&sec_none_nih, TRUE, FALSE, NULL);
-  ProtectHandle (signal_arrived);
-
-  hwait_sig = new cygthread (wait_sig, cygself, "sig");
-  hwait_sig->zap_h ();
-
-  /* Initialize waitq structure for main thread.  A waitq structure is
-   * allocated for each thread that executes a wait to allow multiple threads
-   * to perform waits.  Pre-allocate a waitq structure for the main thread.
-   */
-  waitq *w;
-  if ((w = (waitq *)waitq_storage.get ()) == NULL)
-    {
-      w = &waitq_main;
-      waitq_storage.set (w);
-    }
-  memset (w, 0, sizeof *w);	// Just to be safe
-
-  global_sigs[SIGSTOP].sa_flags = SA_RESTART | SA_NODEFER;
-  sigproc_printf ("process/signal handling enabled(%x)", myself->process_state);
-  return;
-}
-
-/* Called on process termination to terminate signal and process threads.
- */
-void __stdcall
-sigproc_terminate (void)
-{
-  hwait_sig = NULL;
-
-  if (!sig_loop_wait)
-    sigproc_printf ("sigproc handling not active");
-  else
-    {
-      sigproc_printf ("entering");
-      sig_loop_wait = 0;	// Tell wait_sig to exit when it is
-				//  finished with anything it is doing
-      ForceCloseHandle (sigcomplete_main);
-      HANDLE sendsig = myself->sendsig;
-      myself->sendsig = INVALID_HANDLE_VALUE;
-      CloseHandle (sendsig);
-    }
-  proc_terminate ();		// Terminate process handling thread
-
-  return;
-}
-
-/* Send a signal to another process by raising its signal semaphore.
- * If pinfo *p == NULL, send to the current process.
- * If sending to this process, wait for notification that a signal has
- * completed before returning.
- */
-int __stdcall
-sig_send (_pinfo *p, int sig, void *tls)
-{
-  int rc = 1;
-  bool its_me;
-  HANDLE sendsig;
-  sigpacket pack;
-
-  bool wait_for_completion;
-  // FIXMENOW: Avoid using main thread's completion event!
-  if (!(its_me = (p == NULL || p == myself || p == myself_nowait)))
-    wait_for_completion = false;
-  else
-    {
-      if (no_signals_available ())
-	goto out;		// Either exiting or not yet initializing
-      if (wait_sig_inited)
-	wait_for_sigthread ();
-      wait_for_completion = p != myself_nowait && _my_tls.isinitialized ();
-      p = myself;
-    }
-
-  /* It is possible that the process is not yet ready to receive messages
-   * or that it has exited.  Detect this.
-   */
-  if (!proc_can_be_signalled (p))	/* Is the process accepting messages? */
-    {
-      sigproc_printf ("invalid pid %d(%x), signal %d",
-		  p->pid, p->process_state, sig);
-      goto out;
-    }
-
-  sigproc_printf ("pid %d, signal %d, its_me %d", p->pid, sig, its_me);
-
-  if (its_me)
-    {
-      sendsig = myself->sendsig;
-      if (wait_for_completion)
-	pack.wakeup = sigcomplete_main;
-    }
-  else
-    {
-      HANDLE hp = OpenProcess (PROCESS_DUP_HANDLE, false, p->dwProcessId);
-      if (!hp)
-	{
-	  sigproc_printf ("OpenProcess failed, %E");
-	  __seterrno ();
-	  goto out;
-	}
-      for (int i = 0; !p->sendsig && i < 10000; i++)
-	low_priority_sleep (0);
-      if (!DuplicateHandle (hp, p->sendsig, hMainProc, &sendsig, false, 0,
-			    DUPLICATE_SAME_ACCESS) || !sendsig)
-	{
-	  sigproc_printf ("DuplicateHandle failed, %E");
-	  __seterrno ();
-	  goto out;
-	}
-      CloseHandle (hp);
-      pack.wakeup = NULL;
-    }
-
-  sigset_t pending;
-  if (!its_me)
-    pack.mask = NULL;
-  else if (sig == __SIGPENDING)
-    pack.mask = &pending;
-  else if (sig == __SIGFLUSH || sig > 0)
-    pack.mask = &myself->getsigmask ();
-  else
-    pack.mask = NULL;
-
-  pack.sig = sig;
-  pack.pid = myself->pid;
-  pack.tls = (_threadinfo *) tls;
-  DWORD nb;
-  if (!WriteFile (sendsig, &pack, sizeof (pack), &nb, NULL) || nb != sizeof (pack))
-    {
-      /* Couldn't send to the pipe.  This probably means that the
-         process is exiting.  */
-      if (!its_me)
-	{
-	  sigproc_printf ("WriteFile for pipe %p failed, %E", sendsig);
-	  __seterrno ();
-	  ForceCloseHandle (sendsig);
-	}
-      else
-	{
-	  if (no_signals_available ())
-	    sigproc_printf ("I'm going away now");
-	  else
-	    system_printf ("error sending signal %d to pid %d, pipe handle %p, %E",
-			  sig, p->pid, sendsig);
-	}
-      goto out;
-    }
-
-
-  /* No need to wait for signal completion unless this was a signal to
-     this process.
-
-     If it was a signal to this process, wait for a dispatched signal.
-     Otherwise just wait for the wait_sig to signal that it has finished
-     processing the signal.  */
-  if (wait_for_completion)
-    {
-      sigproc_printf ("Waiting for pack.wakeup %p", pack.wakeup);
-      rc = WaitForSingleObject (pack.wakeup, WSSC);
-    }
-  else
-    {
-      rc = WAIT_OBJECT_0;
-      sigproc_printf ("Not waiting for sigcomplete.  its_me %d signal %d", its_me, sig);
-      if (!its_me)
-	ForceCloseHandle (sendsig);
-    }
-
-  if (rc == WAIT_OBJECT_0)
-    rc = 0;		// Successful exit
-  else
-    {
-      /* It's an error unless sig_loop_wait == 0 (the process is exiting). */
-      if (!no_signals_available ())
-	system_printf ("wait for sig_complete event failed, signal %d, rc %d, %E",
-		      sig, rc);
-      set_errno (ENOSYS);
-      rc = -1;
-    }
-
-  if (wait_for_completion)
-    call_signal_handler_now ();
-
-out:
-  if (sig != __SIGPENDING)
-    /* nothing */;
-  else if (!rc)
-    rc = (int) pending;
-  else
-    rc = SIG_BAD_MASK;
-  sigproc_printf ("returning %p from sending signal %d", rc, sig);
-  return rc;
-}
-
-/* Initialize the wait_subproc thread.
- * Called from fork() or spawn() to initialize the handling of subprocesses.
- */
-void __stdcall
-subproc_init (void)
-{
-  if (hwait_subproc)
-    return;
-
-  /* A "wakeup" handle which can be toggled to make wait_subproc reexamine
-   * the hchildren array.
-   */
-  events[0] = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
-  hwait_subproc = new cygthread (wait_subproc, NULL, "proc");
-  hwait_subproc->zap_h ();
-  ProtectHandle (events[0]);
-  sigproc_printf ("started wait_subproc thread");
-}
-
-/* Initialize some of the memory block passed to child processes
-   by fork/spawn/exec. */
-
-void __stdcall
-init_child_info (DWORD chtype, child_info *ch, pid_t pid, HANDLE subproc_ready)
-{
-  memset (ch, 0, sizeof *ch);
-  ch->cb = chtype == PROC_FORK ? sizeof (child_info_fork) : sizeof (child_info);
-  ch->intro = PROC_MAGIC_GENERIC;
-  ch->magic = CHILD_INFO_MAGIC;
-  ch->type = chtype;
-  ch->cygpid = pid;
-  ch->subproc_ready = subproc_ready;
-  ch->pppid_handle = myself->ppid_handle;
-  ch->fhandler_union_cb = sizeof (fhandler_union);
-  ch->user_h = cygwin_user_h;
-}
-
-/* Check the state of all of our children to see if any are stopped or
- * terminated.
- */
-static int __stdcall
-checkstate (waitq *parent_w)
-{
-  int potential_match = 0;
-
-  sigproc_printf ("nchildren %d, nzombies %d", nchildren, nzombies);
-
-  /* Check already dead processes first to see if they match the criteria
-   * given in w->next.
-   */
-  for (int i = 0; i < nzombies; i++)
-    switch (stopped_or_terminated (parent_w, zombies[i]))
-      {
-      case -1:
-	potential_match = -1;
-	break;
-      case 1:
-	remove_zombie (i);
-	potential_match = 1;
-	goto out;
-      }
-
-  sigproc_printf ("checking alive children");
-
-  /* No dead terminated children matched.  Check for stopped children. */
-  for (int i = 0; i < nchildren; i++)
-    switch (stopped_or_terminated (parent_w, pchildren[i]))
-      {
-      case -1:
-	potential_match = -1;
-	break;
-      case 1:
-	potential_match = 1;
-	goto out;
-      }
-
-out:
-  sigproc_printf ("returning %d", potential_match);
-  return potential_match;
-}
-
-/* Remove a zombie from zombies by swapping it with the last child in the list.
- */
-static void __stdcall
-remove_zombie (int ci)
-{
-  sigproc_printf ("removing %d, pid %d, nzombies %d", ci, zombies[ci]->pid,
-		  nzombies);
-
-  if (zombies[ci])
-    {
-      ForceCloseHandle1 (zombies[ci]->hProcess, childhProc);
-      ForceCloseHandle1 (zombies[ci]->pid_handle, pid_handle);
-      zombies[ci].release ();
-    }
-
-  if (ci < --nzombies)
-    zombies[ci] = zombies[nzombies];
-
-  return;
-}
-
-/* Check status of child process vs. waitq member.
- *
- * parent_w is the pointer to the parent of the waitq member in question.
- * child is the subprocess being considered.
- *
- * Returns
- *   1 if stopped or terminated child matches parent_w->next criteria
- *  -1 if a non-stopped/terminated child matches parent_w->next criteria
- *   0 if child does not match parent_w->next criteria
- */
-static int __stdcall
-stopped_or_terminated (waitq *parent_w, _pinfo *child)
-{
-  int potential_match;
-  waitq *w = parent_w->next;
-
-  sigproc_printf ("considering pid %d", child->pid);
-  if (w->pid == -1)
-    potential_match = 1;
-  else if (w->pid == 0)
-    potential_match = child->pgid == myself->pgid;
-  else if (w->pid < 0)
-    potential_match = child->pgid == -w->pid;
-  else
-    potential_match = (w->pid == child->pid);
-
-  if (!potential_match)
-    return 0;
-
-  bool terminated;
-
-  if ((terminated = child->process_state == PID_ZOMBIE) ||
-      ((w->options & WUNTRACED) && child->stopsig))
-    {
-      parent_w->next = w->next;	/* successful wait.  remove from wait queue */
-      w->pid = child->pid;
-
-      if (!terminated)
-	{
-	  sigproc_printf ("stopped child");
-	  w->status = (child->stopsig << 8) | 0x7f;
-	  child->stopsig = 0;
-	}
-      else /* Should only get here when child has been moved to the zombies array */
-	{
-	  DWORD status;
-	  if (!GetExitCodeProcess (child->hProcess, &status))
-	    status = 0xffff;
-	  if (status & EXIT_SIGNAL)
-	    w->status = (status >> 8) & 0xff;	/* exited due to signal */
-	  else
-	    w->status = (status & 0xff) << 8;	/* exited via "exit ()" */
-
-	  add_rusage (&myself->rusage_children, &child->rusage_children);
-	  add_rusage (&myself->rusage_children, &child->rusage_self);
-
-	  if (w->rusage)
-	    {
-	      add_rusage ((struct rusage *) w->rusage, &child->rusage_children);
-	      add_rusage ((struct rusage *) w->rusage, &child->rusage_self);
-	    }
-	}
-
-      if (!SetEvent (w->ev))	/* wake up wait4 () immediately */
-	system_printf ("couldn't wake up wait event %p, %E", w->ev);
-      return 1;
-    }
-
-  return -potential_match;
-}
-
-static void
-talktome ()
-{
-  winpids pids ((DWORD) PID_MAP_RW);
-  for (unsigned i = 0; i < pids.npids; i++)
-    if (pids[i]->hello_pid == myself->pid)
-      if (!IsBadWritePtr (pids[i], sizeof (_pinfo)))
-	pids[i]->commune_recv ();
-}
-
-/* Process signals by waiting for a semaphore to become signaled.
-   Then scan an in-memory array representing queued signals.
-   Executes in a separate thread.
-
-   Signals sent from this process are sent a completion signal so
-   that returns from kill/raise do not occur until the signal has
-   has been handled, as per POSIX.  */
-
-void
-pending_signals::add (int sig, int pid, _threadinfo *tls)
-{
-  sigelem *se;
-  for (se = start.next; se; se = se->next)
-    if (se->sig == sig)
-      return;
-  while (sigs[empty].sig)
-    if (++empty == NSIG)
-      empty = 0;
-  se = sigs + empty;
-  se->sig = sig;
-  se->next = NULL;
-  se->tls = tls;
-  se->pid = pid;
-  if (end)
-    end->next = se;
-  end = se;
-  if (!start.next)
-    start.next = se;
-  empty++;
-}
-
-void
-pending_signals::del ()
-{
-  sigelem *next = curr->next;
-  prev->next = next;
-  curr->sig = 0;
-#ifdef DEBUGGING
-  curr->next = NULL;
-#endif
-  if (end == curr)
-    end = prev;
-  empty = curr - sigs;
-  curr = next;
-}
-
-sigelem *
-pending_signals::next ()
-{
-  sigelem *res;
-  prev = curr;
-  if (!curr || !(curr = curr->next))
-    res = NULL;
-  else
-    res = curr;
-  return res;
-}
-
-/* Process signals by waiting for signal data to arrive in a pipe.
-   Set a completion event if one was specified. */
-static DWORD WINAPI
-wait_sig (VOID *self)
-{
-  HANDLE readsig;
-  char sa_buf[1024];
-
-  /* Initialization */
-  (void) SetThreadPriority (GetCurrentThread (), WAIT_SIG_PRIORITY);
-
-  /* sigcomplete_main	   - event used to signal main thread on signal
-    			     completion */
-  if (!CreatePipe (&readsig, &myself->sendsig, sec_user_nih (sa_buf), 0))
-    api_fatal ("couldn't create signal pipe, %E");
-  sigcomplete_main = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
-  sigproc_printf ("sigcomplete_main %p", sigcomplete_main);
-  sigCONT = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
-
-  /* Setting dwProcessId flags that this process is now capable of receiving
-     signals.  Prior to this, dwProcessId was set to the windows pid of
-     of the original windows process which spawned us unless this was a
-     "toplevel" process.  */
-  myself->dwProcessId = GetCurrentProcessId ();
-  myself->process_state |= PID_ACTIVE;
-  myself->process_state &= ~PID_INITIALIZING;
-
-  ProtectHandle (sigcomplete_main);
-
-  /* If we've been execed, then there is still a stub left in the previous
-     windows process waiting to see if it's started a cygwin process or not.
-     Signalling subproc_ready indicates that we are a cygwin process.  */
-  if (child_proc_info && child_proc_info->type == PROC_EXEC)
-    {
-      debug_printf ("subproc_ready %p", child_proc_info->subproc_ready);
-      if (!SetEvent (child_proc_info->subproc_ready))
-	system_printf ("SetEvent (subproc_ready) failed, %E");
-      ForceCloseHandle1 (child_proc_info->subproc_ready, subproc_ready);
-      /* Initialize an "indirect" pid block so that if someone looks up this
-	 process via its Windows PID it will be redirected to the appropriate
-	 Cygwin PID shared memory block. */
-      static pinfo NO_COPY myself_identity;
-      myself_identity.init (cygwin_pid (myself->dwProcessId), PID_EXECED);
-    }
-
-  SetEvent (wait_sig_inited);
-  sigtid = GetCurrentThreadId ();
-
-  for (;;)
-    {
-      DWORD nb;
-      sigpacket pack;
-      if (!ReadFile (readsig, &pack, sizeof (pack), &nb, NULL))
-	break;
-
-      if (nb != sizeof (pack))
-	{
-	  system_printf ("short read from signal pipe: %d != %d", nb,
-			 sizeof (pack));
-	  continue;
-	}
-
-      if (!pack.sig)
-	{
-#ifdef DEBUGGING
-	  system_printf ("zero signal?");
-#endif
-	  continue;
-	}
-
-      sigset_t dummy_mask;
-      if (!pack.mask)
-	{
-	  dummy_mask = myself->getsigmask ();
-	  pack.mask = &dummy_mask;
-	}
-
-      sigelem *q;
-      switch (pack.sig)
-	{
-	case __SIGCOMMUNE:
-	  talktome ();
-	  break;
-	case __SIGSTRACE:
-	  strace.hello ();
-	  break;
-	case __SIGPENDING:
-	  *pack.mask = 0;
-	  unsigned bit;
-	  sigqueue.reset ();
-	  while ((q = sigqueue.next ()))
-	    if (myself->getsigmask () & (bit = SIGTOMASK (q->sig)))
-	      *pack.mask |= bit;
-	  break;
-	case __SIGFLUSH:
-	  sigqueue.reset ();
-	  while ((q = sigqueue.next ()))
-	    if (sig_handle (q->sig, *pack.mask, q->pid, q->tls) > 0)
-	      sigqueue.del ();
-	  break;
-	default:
-	  if (pack.sig < 0)
-	    sig_clear (-pack.sig);
-	  else
-	    {
-	      if (sig_handle (pack.sig, *pack.mask, pack.pid, pack.tls) <= 0)
-		sigqueue.add (pack.sig, pack.pid, pack.tls);// FIXME: Shouldn't add this in !sh condition
-	      if (pack.sig == SIGCHLD)
-		proc_subproc (PROC_CLEARWAIT, 0);
-	    }
-	  break;
-	}
-      if (pack.wakeup)
-	SetEvent (pack.wakeup);
-    }
-
-  sigproc_printf ("done");
-  ExitThread (0);
-}
-
-/* Wait for subprocesses to terminate. Executes in a separate thread. */
-static DWORD WINAPI
-wait_subproc (VOID *)
-{
-  sigproc_printf ("starting");
-  int errloop = 0;
-
-  for (;;)
-    {
-      DWORD rc = WaitForMultipleObjects (nchildren + 1, events, FALSE,
-					 proc_loop_wait);
-      if (rc == WAIT_TIMEOUT)
-	if (!proc_loop_wait)
-	  break;			// Exiting
-	else
-	  continue;
-
-      if (rc == WAIT_FAILED)
-	{
-	  if (!proc_loop_wait)
-	    break;
-
-	  /* It's ok to get an ERROR_INVALID_HANDLE since another thread may have
-	     closed a handle in the children[] array.  So, we try looping a couple
-	     of times to stabilize. FIXME - this is not foolproof.  Probably, this
-	     thread should be responsible for closing the children. */
-	  if (!errloop++)
-	    proc_subproc (PROC_NOTHING, 0);	// Just synchronize and continue
-	  if (errloop < 10)
-	    continue;
-
-	  system_printf ("wait failed. nchildren %d, wait %d, %E",
-			nchildren, proc_loop_wait);
-
-	  for (int i = 0; i <= nchildren; i++)
-	    if ((rc = WaitForSingleObject (events[i], 0)) == WAIT_OBJECT_0 ||
-		rc == WAIT_TIMEOUT)
-	      continue;
-	    else if (i == 0)
-		system_printf ("nchildren %d, event[%d] %p, %E", nchildren, i, events[i]);
-	    else
-	      {
-		system_printf ("nchildren %d, event[%d] %p, pchildren[%d] %p, events[0] %p, %E",
-			       nchildren, i, events[i], i - 1, (_pinfo *) pchildren[i - 1], events[0]);
-		system_printf ("pid %d, dwProcessId %u, hProcess %p, progname '%s'",
-			       pchildren[i - 1]->pid, pchildren[i - 1]->dwProcessId,
-			       pchildren[i - 1]->hProcess, pchildren[i - 1]->progname);
-	      }
-	  break;
-	}
-
-      errloop = 0;
-      rc -= WAIT_OBJECT_0;
-      if (rc-- != 0)
-	{
-	  rc = proc_subproc (PROC_CHILDTERMINATED, rc);
-	  if (!proc_loop_wait)		// Don't bother if wait_subproc is
-	    break;			//  exiting
-
-	  /* Send a SIGCHLD to myself.   We do this here, rather than in proc_subproc
-	     to avoid the proc_subproc lock since the signal thread will eventually
-	     be calling proc_subproc and could unnecessarily block. */
-	  if (rc)
-	    sig_send (myself_nowait, SIGCHLD);
-	}
-      sigproc_printf ("looping");
-    }
-
-  ForceCloseHandle (events[0]);
-  events[0] = NULL;
-  sigproc_printf ("done");
-  ExitThread (0);
-}
diff --git a/winsup/cygwin/sigproc.h b/winsup/cygwin/sigproc.h
deleted file mode 100644
index 30ce799e3..000000000
--- a/winsup/cygwin/sigproc.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* sigproc.h
-
-   Copyright 1997, 1998, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _SIGPROC_H
-#define _SIGPROC_H
-#include <signal.h>
-
-#define EXIT_SIGNAL	 0x010000
-#define EXIT_REPARENTING 0x020000
-#define EXIT_NOCLOSEALL  0x040000
-
-#ifdef NSIG
-enum
-{
-  __SIGFLUSH	    = -(NSIG + 1),
-  __SIGSTRACE	    = -(NSIG + 2),
-  __SIGCOMMUNE	    = -(NSIG + 3),
-  __SIGPENDING	    = -(NSIG + 4)
-};
-#endif
-
-#define SIG_BAD_MASK (1 << (SIGKILL - 1))
-
-enum procstuff
-{
-  PROC_ADDCHILD		= 1,	// add a new subprocess to list
-  PROC_CHILDTERMINATED	= 2,	// a child died
-  PROC_CLEARWAIT	= 3,	// clear all waits - signal arrived
-  PROC_WAIT		= 4,	// setup for wait() for subproc
-  PROC_NOTHING		= 5	// nothing, really
-};
-
-typedef struct struct_waitq
-{
-  int pid;
-  int options;
-  int status;
-  HANDLE ev;
-  void *rusage;			/* pointer to potential rusage */
-  struct struct_waitq *next;
-  HANDLE thread_ev;
-} waitq;
-
-extern HANDLE signal_arrived;
-extern HANDLE sigCONT;
-
-bool __stdcall my_parent_is_alive ();
-int __stdcall sig_dispatch_pending ();
-#ifdef _PINFO_H
-extern "C" void __stdcall set_signal_mask (sigset_t newmask, sigset_t& = myself->getsigmask ());
-#endif
-int __stdcall handle_sigprocmask (int sig, const sigset_t *set,
-				  sigset_t *oldset, sigset_t& opmask)
-  __attribute__ ((regparm (3)));
-
-extern "C" void __stdcall reset_signal_arrived ();
-extern "C" int __stdcall call_signal_handler_now ();
-#ifdef _CYGTLS_H
-int __stdcall sig_handle (int, sigset_t, int, _threadinfo *) __attribute__ ((regparm (3)));
-#endif
-void __stdcall sig_clear (int) __attribute__ ((regparm (1)));
-void __stdcall sig_set_pending (int) __attribute__ ((regparm (1)));
-int __stdcall handle_sigsuspend (sigset_t);
-
-int __stdcall proc_subproc (DWORD, DWORD) __attribute__ ((regparm (2)));
-
-class _pinfo;
-void __stdcall proc_terminate ();
-void __stdcall sigproc_init ();
-void __stdcall subproc_init ();
-void __stdcall sigproc_terminate ();
-bool __stdcall proc_exists (_pinfo *) __attribute__ ((regparm(1)));
-bool __stdcall pid_exists (pid_t) __attribute__ ((regparm(1)));
-int __stdcall sig_send (_pinfo *, int, void * = NULL) __attribute__ ((regparm(3)));
-void __stdcall signal_fixup_after_fork ();
-void __stdcall signal_fixup_after_exec ();
-void __stdcall wait_for_sigthread ();
-void __stdcall sigalloc ();
-
-extern char myself_nowait_dummy[];
-
-extern struct sigaction *global_sigs;
-
-#define WAIT_SIG_PRIORITY THREAD_PRIORITY_TIME_CRITICAL
-
-#define myself_nowait ((_pinfo *)myself_nowait_dummy)
-#endif /*_SIGPROC_H*/
diff --git a/winsup/cygwin/smallprint.c b/winsup/cygwin/smallprint.c
deleted file mode 100644
index 740248e82..000000000
--- a/winsup/cygwin/smallprint.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/* smallprint.c: small print routines for WIN32
-
-   Copyright 1996, 1998, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-int __small_sprintf (char *dst, const char *fmt, ...);
-int __small_vsprintf (char *dst, const char *fmt, va_list ap);
-
-static char *
-rn (char *dst, int base, int dosign, long long val, int len, int pad)
-{
-  /* longest number is ULLONG_MAX, 18446744073709551615, 20 digits */
-  unsigned uval;
-  char res[20];
-  static const char str[16] = "0123456789ABCDEF";
-  int l = 0;
-
-  if (dosign && val < 0)
-    {
-      *dst++ = '-';
-      uval = -val;
-    }
-  else if (dosign > 0 && val > 0)
-    {
-      *dst++ = '+';
-      uval = val;
-    }
-  else
-    {
-      uval = val;
-    }
-
-  do
-    {
-      res[l++] = str[uval % base];
-      uval /= base;
-    }
-  while (uval);
-
-  while (len -- > l)
-    *dst++ = pad;
-
-  while (l > 0)
-    {
-      *dst++ = res[--l];
-    }
-
-  return dst;
-}
-
-int
-__small_vsprintf (char *dst, const char *fmt, va_list ap)
-{
-  char tmp[CYG_MAX_PATH + 1];
-  char *orig = dst;
-  const char *s;
-
-  while (*fmt)
-    {
-      int i, n = 0x7fff;
-      if (*fmt != '%')
-	*dst++ = *fmt++;
-      else
-	{
-	  int len = 0;
-	  char pad = ' ';
-	  int addsign = -1;
-
-	  switch (*++fmt)
-	  {
-	    case '+':
-	      addsign = 1;
-	      fmt++;
-	      break;
-	    case '%':
-	      *dst++ = *fmt++;
-	      continue;
-	  }
-
-	  for (;;)
-	    {
-	      char c = *fmt++;
-	      switch (c)
-		{
-		case '0':
-		  if (len == 0)
-		    {
-		      pad = '0';
-		      continue;
-		    }
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-		  len = len * 10 + (c - '0');
-		  continue;
-		case 'l':
-		  continue;
-		case 'c':
-		  {
-		    int c = va_arg (ap, int);
-		    if (c > ' ' && c <= 127)
-		      *dst++ = c;
-		    else
-		      {
-			*dst++ = '0';
-			*dst++ = 'x';
-			dst = rn (dst, 16, 0, c, len, pad);
-		      }
-		  }
-		  break;
-		case 'E':
-		  strcpy (dst, "Win32 error ");
-		  dst = rn (dst + sizeof ("Win32 error"), 10, 0, GetLastError (), len, pad);
-		  break;
-		case 'd':
-		  dst = rn (dst, 10, addsign, va_arg (ap, int), len, pad);
-		  break;
-		case 'D':
-		  dst = rn (dst, 10, addsign, va_arg (ap, long long), len, pad);
-		  break;
-		case 'u':
-		  dst = rn (dst, 10, 0, va_arg (ap, int), len, pad);
-		  break;
-		case 'U':
-		  dst = rn (dst, 10, 0, va_arg (ap, long long), len, pad);
-		  break;
-		case 'o':
-		  dst = rn (dst, 8, 0, va_arg (ap, unsigned), len, pad);
-		  break;
-		case 'p':
-		  *dst++ = '0';
-		  *dst++ = 'x';
-		  /* fall through */
-		case 'x':
-		  dst = rn (dst, 16, 0, va_arg (ap, int), len, pad);
-		  break;
-		case 'X':
-		  dst = rn (dst, 16, 0, va_arg (ap, long long), len, pad);
-		  break;
-		case 'P':
-		  if (!GetModuleFileName (NULL, tmp, CYG_MAX_PATH))
-		    s = "cygwin program";
-		  else
-		    s = tmp;
-		  goto fillin;
-		case '.':
-		  n = strtol (fmt, (char **)&fmt, 10);
-		  if (*fmt++ != 's')
-		    goto endfor;
-		case 's':
-		  s = va_arg (ap, char *);
-		  if (s == NULL)
-		    s = "(null)";
-		fillin:
-		  for (i = 0; *s && i < n; i++)
-		    *dst++ = *s++;
-		  break;
-		default:
-		  *dst++ = '?';
-		  *dst++ = fmt[-1];
-		}
-	    endfor:
-	      break;
-	    }
-	}
-    }
-  *dst = 0;
-  return dst - orig;
-}
-
-int
-__small_sprintf (char *dst, const char *fmt, ...)
-{
-  int r;
-  va_list ap;
-  va_start (ap, fmt);
-  r = __small_vsprintf (dst, fmt, ap);
-  va_end (ap);
-  return r;
-}
-
-void
-small_printf (const char *fmt, ...)
-{
-  char buf[16384];
-  va_list ap;
-  DWORD done;
-  int count;
-
-#if 0	/* Turn on to force console errors */
-  extern SECURITY_ATTRIBUTES sec_none;
-  HANDLE h = CreateFileA ("CONOUT$", GENERIC_READ|GENERIC_WRITE,
-		   FILE_SHARE_WRITE | FILE_SHARE_WRITE, &sec_none,
-		   OPEN_EXISTING, 0, 0);
-  if (h)
-    SetStdHandle (STD_ERROR_HANDLE, h);
-#endif
-
-  va_start (ap, fmt);
-  count = __small_vsprintf (buf, fmt, ap);
-  va_end (ap);
-
-  WriteFile (GetStdHandle (STD_ERROR_HANDLE), buf, count, &done, NULL);
-  FlushFileBuffers (GetStdHandle (STD_ERROR_HANDLE));
-}
-
-#ifdef DEBUGGING
-static HANDLE NO_COPY console_handle = NULL;
-void
-console_printf (const char *fmt, ...)
-{
-  char buf[16384];
-  va_list ap;
-  DWORD done;
-  int count;
-
-  if (!console_handle)
-    console_handle = CreateFileA ("CON", GENERIC_WRITE,
-				  FILE_SHARE_READ | FILE_SHARE_WRITE,
-				  NULL, OPEN_EXISTING, 0, 0);
-
-  if (console_handle == INVALID_HANDLE_VALUE)
-    console_handle = GetStdHandle (STD_ERROR_HANDLE);
-
-  va_start (ap, fmt);
-  count = __small_vsprintf (buf, fmt, ap);
-  va_end (ap);
-
-  WriteFile (console_handle, buf, count, &done, NULL);
-  FlushFileBuffers (console_handle);
-}
-#endif
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
deleted file mode 100644
index 0e288dfa6..000000000
--- a/winsup/cygwin/spawn.cc
+++ /dev/null
@@ -1,1111 +0,0 @@
-/* spawn.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <process.h>
-#include <sys/wait.h>
-#include <limits.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <ctype.h>
-#include "cygerrno.h"
-#include <sys/cygwin.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "sigproc.h"
-#include "cygheap.h"
-#include "child_info.h"
-#include "shared_info.h"
-#include "pinfo.h"
-#define NEED_VFORK
-#include "perthread.h"
-#include "registry.h"
-#include "environ.h"
-#include "cygthread.h"
-
-#define LINE_BUF_CHUNK (CYG_MAX_PATH * 2)
-
-static suffix_info std_suffixes[] =
-{
-  suffix_info (".exe", 1), suffix_info ("", 1),
-  suffix_info (".com"), suffix_info (".cmd"),
-  suffix_info (".bat"), suffix_info (".dll"),
-  suffix_info (NULL)
-};
-
-HANDLE hExeced;
-DWORD dwExeced;
-
-/* Add .exe to PROG if not already present and see if that exists.
-   If not, return PROG (converted from posix to win32 rules if necessary).
-   The result is always BUF.
-
-   Returns (possibly NULL) suffix */
-
-static const char *
-perhaps_suffix (const char *prog, path_conv& buf)
-{
-  char *ext;
-
-  debug_printf ("prog '%s'", prog);
-  buf.check (prog, PC_SYM_FOLLOW | PC_FULL, std_suffixes);
-
-  if (!buf.exists () || buf.isdir ())
-    ext = NULL;
-  else if (buf.known_suffix)
-    ext = (char *) buf + (buf.known_suffix - buf.get_win32 ());
-  else
-    ext = strchr (buf, '\0');
-
-  debug_printf ("buf %s, suffix found '%s'", (char *) buf, ext);
-  return ext;
-}
-
-/* Find an executable name, possibly by appending known executable
-   suffixes to it.  The win32-translated name is placed in 'buf'.
-   Any found suffix is returned in known_suffix.
-
-   If the file is not found and !null_if_not_found then the win32 version
-   of name is placed in buf and returned.  Otherwise the contents of buf
-   is undefined and NULL is returned.  */
-
-const char * __stdcall
-find_exec (const char *name, path_conv& buf, const char *mywinenv,
-	   unsigned opt, const char **known_suffix)
-{
-  const char *suffix = "";
-  debug_printf ("find_exec (%s)", name);
-  const char *retval = buf;
-  char tmp[CYG_MAX_PATH];
-  const char *posix = (opt & FE_NATIVE) ? NULL : name;
-  bool has_slash = strchr (name, '/');
-
-  /* Check to see if file can be opened as is first.
-     Win32 systems always check . first, but PATH may not be set up to
-     do this. */
-  if ((has_slash || opt & FE_CWD)
-      && (suffix = perhaps_suffix (name, buf)) != NULL)
-    {
-      if (posix && !has_slash)
-	{
-	  tmp[0] = '.';
-	  tmp[1] = '/';
-	  strcpy (tmp + 2, name);
-	  posix = tmp;
-	}
-      goto out;
-    }
-
-  win_env *winpath;
-  const char *path;
-  const char *posix_path;
-
-  /* Return the error condition if this is an absolute path or if there
-     is no PATH to search. */
-  if (strchr (name, '/') || strchr (name, '\\') ||
-      isdrive (name) ||
-      !(winpath = getwinenv (mywinenv)) ||
-      !(path = winpath->get_native ()) ||
-      *path == '\0')
-    goto errout;
-
-  debug_printf ("%s%s", mywinenv, path);
-
-  posix = (opt & FE_NATIVE) ? NULL : tmp;
-  posix_path = winpath->get_posix () - 1;
-  /* Iterate over the specified path, looking for the file with and
-     without executable extensions. */
-  do
-    {
-      posix_path++;
-      char *eotmp = strccpy (tmp, &path, ';');
-      /* An empty path or '.' means the current directory, but we've
-	 already tried that.  */
-      if (opt & FE_CWD && (tmp[0] == '\0' || (tmp[0] == '.' && tmp[1] == '\0')))
-	continue;
-
-      *eotmp++ = '\\';
-      strcpy (eotmp, name);
-
-      debug_printf ("trying %s", tmp);
-
-      if ((suffix = perhaps_suffix (tmp, buf)) != NULL)
-	{
-	  if (posix == tmp)
-	    {
-	      eotmp = strccpy (tmp, &posix_path, ':');
-	      if (eotmp == tmp)
-		*eotmp++ = '.';
-	      *eotmp++ = '/';
-	      strcpy (eotmp, name);
-	    }
-	  goto out;
-	}
-    }
-  while (*path && *++path && (posix_path = strchr (posix_path, ':')));
-
- errout:
-  posix = NULL;
-  /* Couldn't find anything in the given path.
-     Take the appropriate action based on null_if_not_found. */
-  if (opt & FE_NNF)
-    retval = NULL;
-  else if (opt & FE_NATIVE)
-    buf.check (name);
-  else
-    retval = name;
-
- out:
-  if (posix)
-    buf.set_path (posix);
-  debug_printf ("%s = find_exec (%s)", (char *) buf, name);
-  if (known_suffix)
-    *known_suffix = suffix ?: strchr (buf, '\0');
-  return retval;
-}
-
-/* Utility for spawn_guts.  */
-
-static HANDLE
-handle (int n, int direction)
-{
-  fhandler_base *fh = cygheap->fdtab[n];
-
-  if (!fh)
-    return INVALID_HANDLE_VALUE;
-  if (fh->get_close_on_exec ())
-    return INVALID_HANDLE_VALUE;
-  if (direction == 0)
-    return fh->get_handle ();
-  return fh->get_output_handle ();
-}
-
-int
-iscmd (const char *argv0, const char *what)
-{
-  int n;
-  n = strlen (argv0) - strlen (what);
-  if (n >= 2 && argv0[1] != ':')
-    return 0;
-  return n >= 0 && strcasematch (argv0 + n, what) &&
-	 (n == 0 || isdirsep (argv0[n - 1]));
-}
-
-class linebuf
-{
- public:
-  size_t ix;
-  char *buf;
-  size_t alloced;
-  linebuf () : ix (0), buf (NULL), alloced (0) {}
-  ~linebuf () {if (buf) free (buf);}
-  void add (const char *what, int len);
-  void add (const char *what) {add (what, strlen (what));}
-  void prepend (const char *what, int len);
-};
-
-void
-linebuf::add (const char *what, int len)
-{
-  size_t newix;
-  if ((newix = ix + len) >= alloced || !buf)
-    {
-      alloced += LINE_BUF_CHUNK + newix;
-      buf = (char *) realloc (buf, alloced + 1);
-    }
-  memcpy (buf + ix, what, len);
-  ix = newix;
-  buf[ix] = '\0';
-}
-
-void
-linebuf::prepend (const char *what, int len)
-{
-  int buflen;
-  size_t newix;
-  if ((newix = ix + len) >= alloced)
-    {
-      alloced += LINE_BUF_CHUNK + newix;
-      buf = (char *) realloc (buf, alloced + 1);
-      buf[ix] = '\0';
-    }
-  if ((buflen = strlen (buf)))
-      memmove (buf + len, buf, buflen + 1);
-  else
-      buf[newix] = '\0';
-  memcpy (buf, what, len);
-  ix = newix;
-}
-
-class av
-{
-  char **argv;
-  int calloced;
- public:
-  int error;
-  int argc;
-  av (int ac, const char * const *av) : calloced (0), error (false), argc (ac)
-  {
-    argv = (char **) cmalloc (HEAP_1_ARGV, (argc + 5) * sizeof (char *));
-    memcpy (argv, av, (argc + 1) * sizeof (char *));
-  }
-  ~av ()
-  {
-    if (argv)
-      {
-	for (int i = 0; i < calloced; i++)
-	  if (argv[i])
-	    cfree (argv[i]);
-	cfree (argv);
-      }
-  }
-  int unshift (const char *what, int conv = 0);
-  operator char **() {return argv;}
-  void all_calloced () {calloced = argc;}
-  void replace0_maybe (const char *arg0)
-  {
-    /* Note: Assumes that argv array has not yet been "unshifted" */
-    if (!calloced
-	&& (argv[0] = cstrdup1 (arg0)))
-      calloced = true;
-    else
-      error = errno;
-  }
-  void dup_maybe (int i)
-  {
-    if (i >= calloced
-	&& !(argv[i] = cstrdup1 (argv[i])))
-      error = errno;
-  }
-  void dup_all ()
-  {
-    for (int i = calloced; i < argc; i++)
-      if (!(argv[i] = cstrdup1 (argv[i])))
-	error = errno;
-  }
-};
-
-int
-av::unshift (const char *what, int conv)
-{
-  char **av;
-  av = (char **) crealloc (argv, (argc + 2) * sizeof (char *));
-  if (!av)
-    return 0;
-
-  argv = av;
-  memmove (argv + 1, argv, (argc + 1) * sizeof (char *));
-  char buf[CYG_MAX_PATH + 1];
-  if (conv)
-    {
-      cygwin_conv_to_posix_path (what, buf);
-      char *p = strchr (buf, '\0') - 4;
-      if (p > buf && strcasematch (p, ".exe"))
-	*p = '\0';
-      what = buf;
-    }
-  if (!(*argv = cstrdup1 (what)))
-    error = errno;
-  argc++;
-  calloced++;
-  return 1;
-}
-
-struct pthread_cleanup
-{
-  _sig_func_ptr oldint;
-  _sig_func_ptr oldquit;
-  sigset_t oldmask;
-  pthread_cleanup (): oldint (NULL), oldquit (NULL), oldmask (0) {}
-};
-
-static void
-do_cleanup (void *args)
-{
-# define cleanup ((pthread_cleanup *) args)
-  if (cleanup->oldint)
-    signal (SIGINT, cleanup->oldint);
-  if (cleanup->oldquit)
-    signal (SIGQUIT, cleanup->oldquit);
-  if (cleanup->oldmask)
-    sigprocmask (SIG_SETMASK, &(cleanup->oldmask), NULL);
-# undef cleanup
-}
-
-
-static int __stdcall
-spawn_guts (const char * prog_arg, const char *const *argv,
-	    const char *const envp[], int mode)
-{
-  bool rc;
-  pid_t cygpid;
-
-  MALLOC_CHECK;
-
-  if (prog_arg == NULL)
-    {
-      syscall_printf ("prog_arg is NULL");
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  syscall_printf ("spawn_guts (%d, %.9500s)", mode, prog_arg);
-
-  if (argv == NULL)
-    {
-      syscall_printf ("argv is NULL");
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  path_conv real_path;
-
-  linebuf one_line;
-
-  STARTUPINFO si = {0, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL};
-
-  child_info_spawn ciresrv;
-  si.lpReserved2 = (LPBYTE) &ciresrv;
-  si.cbReserved2 = sizeof (ciresrv);
-
-  DWORD chtype;
-  if (mode != _P_OVERLAY)
-    chtype = PROC_SPAWN;
-  else
-    chtype = PROC_EXEC;
-
-  HANDLE subproc_ready;
-  if (chtype != PROC_EXEC)
-    subproc_ready = NULL;
-  else
-    {
-      subproc_ready = CreateEvent (&sec_all, TRUE, FALSE, NULL);
-      ProtectHandleINH (subproc_ready);
-    }
-
-  init_child_info (chtype, &ciresrv, (mode == _P_OVERLAY) ? myself->pid : 1,
-		   subproc_ready);
-  if (!DuplicateHandle (hMainProc, hMainProc, hMainProc, &ciresrv.parent, 0, 1,
-			DUPLICATE_SAME_ACCESS))
-     {
-       system_printf ("couldn't create handle to myself for child, %E");
-       return -1;
-     }
-
-  ciresrv.moreinfo = (cygheap_exec_info *) ccalloc (HEAP_1_EXEC, 1, sizeof (cygheap_exec_info));
-  ciresrv.moreinfo->old_title = NULL;
-
-  /* CreateProcess takes one long string that is the command line (sigh).
-     We need to quote any argument that has whitespace or embedded "'s.  */
-
-  int ac;
-  for (ac = 0; argv[ac]; ac++)
-    /* nothing */;
-
-  av newargv (ac, argv);
-
-  int null_app_name = 0;
-  if (ac == 3 && argv[1][0] == '/' && argv[1][1] == 'c' &&
-      (iscmd (argv[0], "command.com") || iscmd (argv[0], "cmd.exe")))
-    {
-      real_path.check (prog_arg);
-      one_line.add ("\"");
-      if (!real_path.error)
-	one_line.add (real_path);
-      else
-	one_line.add (argv[0]);
-      one_line.add ("\"");
-      one_line.add (" ");
-      one_line.add (argv[1]);
-      one_line.add (" ");
-      one_line.add (argv[2]);
-      strcpy (real_path, argv[0]);
-      null_app_name = 1;
-      goto skip_arg_parsing;
-    }
-
-  const char *ext;
-  if ((ext = perhaps_suffix (prog_arg, real_path)) == NULL)
-    {
-      set_errno (ENOENT);
-      return -1;
-    }
-
-  MALLOC_CHECK;
-
-  /* If the file name ends in either .exe, .com, .bat, or .cmd we assume
-     that it is NOT a script file */
-  while (*ext == '\0')
-    {
-      HANDLE hnd = CreateFile (real_path, GENERIC_READ,
-			       FILE_SHARE_READ | FILE_SHARE_WRITE,
-			       &sec_none_nih, OPEN_EXISTING,
-			       FILE_ATTRIBUTE_NORMAL, 0);
-      if (hnd == INVALID_HANDLE_VALUE)
-	{
-	  __seterrno ();
-	  return -1;
-	}
-
-      DWORD done;
-
-      char buf[2 * CYG_MAX_PATH + 1];
-      buf[0] = buf[1] = buf[2] = buf[sizeof (buf) - 1] = '\0';
-      if (!ReadFile (hnd, buf, sizeof (buf) - 1, &done, 0))
-	{
-	  CloseHandle (hnd);
-	  __seterrno ();
-	  return -1;
-	}
-
-      CloseHandle (hnd);
-
-      if (buf[0] == 'M' && buf[1] == 'Z')
-	break;
-
-      debug_printf ("%s is a script", (char *) real_path);
-
-      char *pgm, *arg1;
-
-      if (buf[0] != '#' || buf[1] != '!')
-	{
-	  pgm = (char *) "/bin/sh";
-	  arg1 = NULL;
-	}
-      else
-	{
-	  char *ptr;
-	  pgm = buf + 2;
-	  pgm += strspn (pgm, " \t");
-	  for (ptr = pgm, arg1 = NULL;
-	       *ptr && *ptr != '\r' && *ptr != '\n';
-	       ptr++)
-	    if (!arg1 && (*ptr == ' ' || *ptr == '\t'))
-	      {
-		/* Null terminate the initial command and step over
-		   any additional white space.  If we've hit the
-		   end of the line, exit the loop.  Otherwise, we've
-		   found the first argument. Position the current
-		   pointer on the last known white space. */
-		*ptr = '\0';
-		char *newptr = ptr + 1;
-		newptr += strspn (newptr, " \t");
-		if (!*newptr || *newptr == '\r' || *newptr == '\n')
-		  break;
-		arg1 = newptr;
-		ptr = newptr - 1;
-	      }
-
-	  *ptr = '\0';
-	}
-
-      /* Replace argv[0] with the full path to the script if this is the
-	 first time through the loop. */
-      newargv.replace0_maybe (prog_arg);
-
-      /* pointers:
-       * pgm	interpreter name
-       * arg1	optional string
-       */
-      if (arg1)
-	newargv.unshift (arg1);
-
-      /* FIXME: This should not be using FE_NATIVE.  It should be putting
-	 the posix path on the argv list. */
-      find_exec (pgm, real_path, "PATH=", FE_NATIVE, &ext);
-      newargv.unshift (real_path, 1);
-    }
-
-  if (real_path.iscygexec ())
-    newargv.dup_all ();
-  else
-    {
-      for (int i = 0; i < newargv.argc; i++)
-	{
-	  char *p = NULL;
-	  const char *a;
-
-	  newargv.dup_maybe (i);
-	  a = i ? newargv[i] : (char *) real_path;
-	  int len = strlen (a);
-	  if (len != 0 && !strpbrk (a, " \t\n\r\""))
-	    one_line.add (a, len);
-	  else
-	    {
-	      one_line.add ("\"", 1);
-	      /* Handle embedded special characters " and \.
-		 A " is always preceded by a \.
-		 A \ is not special unless it precedes a ".  If it does,
-		 then all preceding \'s must be doubled to avoid having
-		 the Windows command line parser interpret the \ as quoting
-		 the ".  This rule applies to a string of \'s before the end
-		 of the string, since cygwin/windows uses a " to delimit the
-		 argument. */
-	      for (; (p = strpbrk (a, "\"\\")); a = ++p)
-		{
-		  one_line.add (a, p - a);
-		  /* Find length of string of backslashes */
-		  int n = strspn (p, "\\");
-		  if (!n)
-		    one_line.add ("\\\"", 2);	/* No backslashes, so it must be a ".
-						   The " has to be protected with a backslash. */
-		  else
-		    {
-		      one_line.add (p, n);	/* Add the run of backslashes */
-		      /* Need to double up all of the preceding
-			 backslashes if they precede a quote or EOS. */
-		      if (!p[n] || p[n] == '"')
-			one_line.add (p, n);
-		      p += n - 1;		/* Point to last backslash */
-		    }
-		}
-	      if (*a)
-		one_line.add (a);
-	      one_line.add ("\"", 1);
-	    }
-	  MALLOC_CHECK;
-	  one_line.add (" ", 1);
-	  MALLOC_CHECK;
-	}
-
-      MALLOC_CHECK;
-      if (one_line.ix)
-	one_line.buf[one_line.ix - 1] = '\0';
-      else
-	one_line.add ("", 1);
-      MALLOC_CHECK;
-
-      if (one_line.ix > 32767)
-	{
-	  debug_printf ("Command line too long (>32K), return E2BIG");
-	  set_errno (E2BIG);
-	  return -1;
-	}
-    }
-
-  char *envblock;
-  newargv.all_calloced ();
-  if (newargv.error)
-    {
-      set_errno (newargv.error);
-      return -1;
-    }
-
-  ciresrv.moreinfo->argc = newargv.argc;
-  ciresrv.moreinfo->argv = newargv;
-  ciresrv.hexec_proc = hexec_proc;
-
-  if (mode != _P_OVERLAY ||
-      !DuplicateHandle (hMainProc, myself.shared_handle (), hMainProc,
-			&ciresrv.moreinfo->myself_pinfo, 0,
-			TRUE, DUPLICATE_SAME_ACCESS))
-    ciresrv.moreinfo->myself_pinfo = NULL;
-
- skip_arg_parsing:
-  PROCESS_INFORMATION pi = {NULL, 0, 0, 0};
-  si.lpReserved = NULL;
-  si.lpDesktop = NULL;
-  si.dwFlags = STARTF_USESTDHANDLES;
-  si.hStdInput = handle (0, 0); /* Get input handle */
-  si.hStdOutput = handle (1, 1); /* Get output handle */
-  si.hStdError = handle (2, 1); /* Get output handle */
-  si.cb = sizeof (si);
-
-  int flags = CREATE_DEFAULT_ERROR_MODE | GetPriorityClass (hMainProc);
-
-  if (mode == _P_DETACH || !set_console_state_for_spawn ())
-    flags |= DETACHED_PROCESS;
-  if (mode != _P_OVERLAY)
-    flags |= CREATE_SUSPENDED;
-
-  /* Some file types (currently only sockets) need extra effort in the
-     parent after CreateProcess and before copying the datastructures
-     to the child. So we have to start the child in suspend state,
-     unfortunately, to avoid a race condition. */
-  if (cygheap->fdtab.need_fixup_before ())
-    flags |= CREATE_SUSPENDED;
-
-
-  const char *runpath = null_app_name ? NULL : (const char *) real_path;
-
-  syscall_printf ("null_app_name %d (%s, %.9500s)", null_app_name, runpath, one_line.buf);
-
-  void *newheap;
-  /* Preallocated buffer for `sec_user' call */
-  char sa_buf[1024];
-
-  cygbench ("spawn-guts");
-
-  cygheap->fdtab.set_file_pointers_for_exec ();
-  cygheap->user.deimpersonate ();
-  /* When ruid != euid we create the new process under the current original
-     account and impersonate in child, this way maintaining the different
-     effective vs. real ids.
-     FIXME: If ruid != euid and ruid != saved_uid we currently give
-     up on ruid. The new process will have ruid == euid. */
-  if (!cygheap->user.issetuid ()
-      || (cygheap->user.saved_uid == cygheap->user.real_uid
-	  && cygheap->user.saved_gid == cygheap->user.real_gid
-	  && !cygheap->user.groups.issetgroups ()))
-    {
-      PSECURITY_ATTRIBUTES sec_attribs = sec_user_nih (sa_buf);
-      ciresrv.moreinfo->envp = build_env (envp, envblock, ciresrv.moreinfo->envc,
-					  real_path.iscygexec ());
-      newheap = cygheap_setup_for_child (&ciresrv, cygheap->fdtab.need_fixup_before ());
-      rc = CreateProcess (runpath,	/* image name - with full path */
-			  one_line.buf,	/* what was passed to exec */
-			  sec_attribs,	/* process security attrs */
-			  sec_attribs,	/* thread security attrs */
-			  TRUE,		/* inherit handles from parent */
-			  flags,
-			  envblock,	/* environment */
-			  0,		/* use current drive/directory */
-			  &si,
-			  &pi);
-    }
-  else
-    {
-      PSID sid = cygheap->user.sid ();
-      /* Give access to myself */
-      if (mode == _P_OVERLAY)
-	myself.set_acl();
-
-      /* Set security attributes with sid */
-      PSECURITY_ATTRIBUTES sec_attribs = sec_user_nih (sa_buf, sid);
-
-      /* allow the child to interact with our window station/desktop */
-      HANDLE hwst, hdsk;
-      SECURITY_INFORMATION dsi = DACL_SECURITY_INFORMATION;
-      DWORD n;
-      char wstname[1024];
-      char dskname[1024];
-
-      hwst = GetProcessWindowStation ();
-      SetUserObjectSecurity (hwst, &dsi, get_null_sd ());
-      GetUserObjectInformation (hwst, UOI_NAME, wstname, 1024, &n);
-      hdsk = GetThreadDesktop (GetCurrentThreadId ());
-      SetUserObjectSecurity (hdsk, &dsi, get_null_sd ());
-      GetUserObjectInformation (hdsk, UOI_NAME, dskname, 1024, &n);
-      strcat (wstname, "\\");
-      strcat (wstname, dskname);
-      si.lpDesktop = wstname;
-
-      ciresrv.moreinfo->envp = build_env (envp, envblock, ciresrv.moreinfo->envc,
-					  real_path.iscygexec ());
-      newheap = cygheap_setup_for_child (&ciresrv, cygheap->fdtab.need_fixup_before ());
-      rc = CreateProcessAsUser (cygheap->user.token (),
-		       runpath,		/* image name - with full path */
-		       one_line.buf,	/* what was passed to exec */
-		       sec_attribs,     /* process security attrs */
-		       sec_attribs,     /* thread security attrs */
-		       TRUE,		/* inherit handles from parent */
-		       flags,
-		       envblock,	/* environment */
-		       0,		/* use current drive/directory */
-		       &si,
-		       &pi);
-    }
-
-  /* Restore impersonation. In case of _P_OVERLAY this isn't
-     allowed since it would overwrite child data. */
-  if (mode != _P_OVERLAY || !rc)
-      cygheap->user.reimpersonate ();
-
-  MALLOC_CHECK;
-  if (envblock)
-    free (envblock);
-  MALLOC_CHECK;
-
-  /* Set errno now so that debugging messages from it appear before our
-     final debugging message [this is a general rule for debugging
-     messages].  */
-  if (!rc)
-    {
-      __seterrno ();
-      syscall_printf ("CreateProcess failed, %E");
-      if (subproc_ready)
-	ForceCloseHandle (subproc_ready);
-      cygheap_setup_for_child_cleanup (newheap, &ciresrv, 0);
-      return -1;
-    }
-
-  /* FIXME: There is a small race here */
-
-  int res;
-  pthread_cleanup cleanup;
-  pthread_cleanup_push (do_cleanup, (void *) &cleanup);
-  if (mode == _P_SYSTEM)
-    {
-      sigset_t child_block;
-      cleanup.oldint = signal (SIGINT, SIG_IGN);
-      cleanup.oldquit = signal (SIGQUIT, SIG_IGN);
-      sigemptyset (&child_block);
-      sigaddset (&child_block, SIGCHLD);
-      (void) sigprocmask (SIG_BLOCK, &child_block, &cleanup.oldmask);
-    }
-
-  /* Fixup the parent datastructure if needed and resume the child's
-     main thread. */
-  if (!cygheap->fdtab.need_fixup_before ())
-    cygheap_setup_for_child_cleanup (newheap, &ciresrv, 0);
-  else
-    {
-      cygheap->fdtab.fixup_before_exec (pi.dwProcessId);
-      cygheap_setup_for_child_cleanup (newheap, &ciresrv, 1);
-      if (mode == _P_OVERLAY)
-	{
-	  ResumeThread (pi.hThread);
-	  cygthread::terminate ();
-	}
-    }
-
-  if (mode != _P_OVERLAY)
-    cygpid = cygwin_pid (pi.dwProcessId);
-  else
-    cygpid = myself->pid;
-
-  /* We print the original program name here so the user can see that too.  */
-  syscall_printf ("%d = spawn_guts (%s, %.9500s)",
-		  rc ? cygpid : (unsigned int) -1, prog_arg, one_line.buf);
-
-  /* Name the handle similarly to proc_subproc. */
-  ProtectHandle1 (pi.hProcess, childhProc);
-
-  if (mode == _P_OVERLAY)
-    {
-      /* These are both duplicated in the child code.  We do this here,
-	 primarily for strace. */
-      strace.execing = 1;
-      hExeced = pi.hProcess;
-      dwExeced = pi.dwProcessId;
-      strcpy (myself->progname, real_path);
-      close_all_files ();
-    }
-  else
-    {
-      myself->set_has_pgid_children ();
-      ProtectHandle (pi.hThread);
-      pinfo child (cygpid, PID_IN_USE);
-      if (!child)
-	{
-	  syscall_printf ("pinfo failed");
-	  if (get_errno () != ENOMEM)
-	    set_errno (EAGAIN);
-	  res = -1;
-	  goto out;
-	}
-      child->dwProcessId = pi.dwProcessId;
-      child->hProcess = pi.hProcess;
-      if (!child.remember ())
-	{
-	  syscall_printf ("process table full");
-	  set_errno (EAGAIN);
-	  res = -1;
-	  goto out;
-	}
-
-      strcpy (child->progname, real_path);
-      /* FIXME: This introduces an unreferenced, open handle into the child.
-	 The purpose is to keep the pid shared memory open so that all of
-	 the fields filled out by child.remember do not disappear and so there
-	 is not a brief period during which the pid is not available.
-	 However, we should try to find another way to do this eventually. */
-      (void) DuplicateHandle (hMainProc, child.shared_handle (), pi.hProcess,
-			      NULL, 0, 0, DUPLICATE_SAME_ACCESS);
-      /* Start the child running */
-      ResumeThread (pi.hThread);
-    }
-
-  ForceCloseHandle (pi.hThread);
-
-  sigproc_printf ("spawned windows pid %d", pi.dwProcessId);
-
-  bool exited;
-
-  res = 0;
-  exited = false;
-  MALLOC_CHECK;
-  if (mode == _P_OVERLAY)
-    {
-      int nwait = 3;
-      HANDLE waitbuf[3] = {pi.hProcess, signal_arrived, subproc_ready};
-      for (int i = 0; i < 100; i++)
-	{
-	  switch (WaitForMultipleObjects (nwait, waitbuf, FALSE, INFINITE))
-	    {
-	    case WAIT_OBJECT_0:
-	      sigproc_printf ("subprocess exited");
-	      DWORD exitcode;
-	      if (!GetExitCodeProcess (pi.hProcess, &exitcode))
-		exitcode = 1;
-	      res |= exitcode;
-	      exited = true;
-	      break;
-	    case WAIT_OBJECT_0 + 1:
-	      sigproc_printf ("signal arrived");
-	      reset_signal_arrived ();
-	      continue;
-	    case WAIT_OBJECT_0 + 2:
-	      if (my_parent_is_alive ())
-		res |= EXIT_REPARENTING;
-	      else if (!myself->ppid_handle)
-		{
-		  nwait = 2;
-		  sigproc_terminate ();
-		  continue;
-		}
-	      break;
-	    case WAIT_FAILED:
-	      system_printf ("wait failed: nwait %d, pid %d, winpid %d, %E",
-			     nwait, myself->pid, myself->dwProcessId);
-	      system_printf ("waitbuf[0] %p %d", waitbuf[0],
-			     WaitForSingleObject (waitbuf[0], 0));
-	      system_printf ("waitbuf[1] %p = %d", waitbuf[1],
-			     WaitForSingleObject (waitbuf[1], 0));
-	      system_printf ("waitbuf[w] %p = %d", waitbuf[2],
-			     WaitForSingleObject (waitbuf[2], 0));
-	      set_errno (ECHILD);
-	      try_to_debug ();
-	      return -1;
-	    }
-	  break;
-	}
-
-      ForceCloseHandle (subproc_ready);
-
-      sigproc_printf ("res = %x", res);
-
-      if (res & EXIT_REPARENTING)
-	{
-	  /* Try to reparent child process.
-	   * Make handles to child available to parent process and exit with
-	   * EXIT_REPARENTING status. Wait() syscall in parent will then wait
-	   * for newly created child.
-	   */
-	  HANDLE oldh = myself->hProcess;
-	  HANDLE h = myself->ppid_handle;
-	  sigproc_printf ("parent handle %p", h);
-	  int rc = DuplicateHandle (hMainProc, pi.hProcess, h, &myself->hProcess,
-				    0, FALSE, DUPLICATE_SAME_ACCESS);
-	  sigproc_printf ("%d = DuplicateHandle, oldh %p, newh %p",
-			  rc, oldh, myself->hProcess);
-	  if (!rc && my_parent_is_alive ())
-	    {
-	      system_printf ("Reparent failed, parent handle %p, %E", h);
-	      system_printf ("my dwProcessId %d, myself->dwProcessId %d",
-			     GetCurrentProcessId (), myself->dwProcessId);
-	      system_printf ("old hProcess %p, hProcess %p", oldh, myself->hProcess);
-	    }
-	}
-
-    }
-
-  MALLOC_CHECK;
-
-  switch (mode)
-    {
-    case _P_OVERLAY:
-      ForceCloseHandle1 (pi.hProcess, childhProc);
-      proc_terminate ();
-      myself->exit (res, 1);
-      break;
-    case _P_WAIT:
-    case _P_SYSTEM:
-      waitpid (cygpid, (int *) &res, 0);
-      break;
-    case _P_DETACH:
-      res = 0;	/* Lose all memory of this child. */
-      break;
-    case _P_NOWAIT:
-    case _P_NOWAITO:
-    case _P_VFORK:
-      res = cygpid;
-      break;
-    default:
-      break;
-    }
-
-out:
-  pthread_cleanup_pop (1);
-  return (int) res;
-}
-
-extern "C" int
-cwait (int *result, int pid, int)
-{
-  return waitpid (pid, result, 0);
-}
-
-/*
- * Helper function for spawn runtime calls.
- * Doesn't search the path.
- */
-
-extern "C" int
-spawnve (int mode, const char *path, const char *const *argv,
-	 const char *const *envp)
-{
-  int ret;
-  vfork_save *vf = vfork_storage.val ();
-
-  if (vf != NULL && (vf->pid < 0) && mode == _P_OVERLAY)
-    mode = _P_NOWAIT;
-  else
-    vf = NULL;
-
-  syscall_printf ("spawnve (%s, %s, %x)", path, argv[0], envp);
-
-  switch (mode)
-    {
-    case _P_OVERLAY:
-      /* We do not pass _P_SEARCH_PATH here. execve doesn't search PATH.*/
-      /* Just act as an exec if _P_OVERLAY set. */
-      spawn_guts (path, argv, envp, mode);
-      /* Errno should be set by spawn_guts.  */
-      ret = -1;
-      break;
-    case _P_VFORK:
-    case _P_NOWAIT:
-    case _P_NOWAITO:
-    case _P_WAIT:
-    case _P_DETACH:
-    case _P_SYSTEM:
-      subproc_init ();
-      ret = spawn_guts (path, argv, envp, mode);
-      if (vf)
-	{
-	  if (ret > 0)
-	    {
-	      debug_printf ("longjmping due to vfork");
-	      vf->restore_pid (ret);
-	    }
-	}
-      break;
-    default:
-      set_errno (EINVAL);
-      ret = -1;
-      break;
-    }
-  return ret;
-}
-
-/*
- * spawn functions as implemented in the MS runtime library.
- * Most of these based on (and copied from) newlib/libc/posix/execXX.c
- */
-
-extern "C" int
-spawnl (int mode, const char *path, const char *arg0, ...)
-{
-  int i;
-  va_list args;
-  const char *argv[256];
-
-  va_start (args, arg0);
-  argv[0] = arg0;
-  i = 1;
-
-  do
-      argv[i] = va_arg (args, const char *);
-  while (argv[i++] != NULL);
-
-  va_end (args);
-
-  return spawnve (mode, path, (char * const  *) argv, cur_environ ());
-}
-
-extern "C" int
-spawnle (int mode, const char *path, const char *arg0, ...)
-{
-  int i;
-  va_list args;
-  const char * const *envp;
-  const char *argv[256];
-
-  va_start (args, arg0);
-  argv[0] = arg0;
-  i = 1;
-
-  do
-    argv[i] = va_arg (args, const char *);
-  while (argv[i++] != NULL);
-
-  envp = va_arg (args, const char * const *);
-  va_end (args);
-
-  return spawnve (mode, path, (char * const *) argv, (char * const *) envp);
-}
-
-extern "C" int
-spawnlp (int mode, const char *path, const char *arg0, ...)
-{
-  int i;
-  va_list args;
-  const char *argv[256];
-
-  va_start (args, arg0);
-  argv[0] = arg0;
-  i = 1;
-
-  do
-      argv[i] = va_arg (args, const char *);
-  while (argv[i++] != NULL);
-
-  va_end (args);
-
-  return spawnvpe (mode, path, (char * const *) argv, cur_environ ());
-}
-
-extern "C" int
-spawnlpe (int mode, const char *path, const char *arg0, ...)
-{
-  int i;
-  va_list args;
-  const char * const *envp;
-  const char *argv[256];
-
-  va_start (args, arg0);
-  argv[0] = arg0;
-  i = 1;
-
-  do
-    argv[i] = va_arg (args, const char *);
-  while (argv[i++] != NULL);
-
-  envp = va_arg (args, const char * const *);
-  va_end (args);
-
-  return spawnvpe (mode, path, (char * const *) argv, envp);
-}
-
-extern "C" int
-spawnv (int mode, const char *path, const char * const *argv)
-{
-  return spawnve (mode, path, argv, cur_environ ());
-}
-
-extern "C" int
-spawnvp (int mode, const char *path, const char * const *argv)
-{
-  return spawnvpe (mode, path, argv, cur_environ ());
-}
-
-extern "C" int
-spawnvpe (int mode, const char *file, const char * const *argv,
-					     const char * const *envp)
-{
-  path_conv buf;
-  return spawnve (mode, find_exec (file, buf), argv, envp);
-}
diff --git a/winsup/cygwin/speclib b/winsup/cygwin/speclib
deleted file mode 100755
index 6642414e7..000000000
--- a/winsup/cygwin/speclib
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh -x
-# speclib - Make a special version of the cygwin import library.
-#
-#   Copyright 2001, 2002 Red Hat, Inc.
-#
-# This file is part of Cygwin.
-#
-# This software is a copyrighted work licensed under the terms of the
-# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-# details.
-
-case "$1" in
-    -v) shift; v() { :; } ;;
-    *) v() { /bin/false; } ;;
-esac
-lib=$1; shift
-nm=$1; shift
-ar=$1; shift
-libdll=$1; shift
-cp /dev/null /tmp/$$.objs
-trap "cd /tmp; /bin/rm -rf $lib.bak /tmp/$$.dir /tmp/$$.syms /tmp/$$.objs /tmp/$$.raw" 0 1 2 15
-$nm --extern-only --defined-only $* | sed -n -e 's%^.* [TD] \(.*\)$%/ \1\$/p%p' > /tmp/$$.syms
-v || $nm -Ap --extern-only --defined-only $libdll | egrep ' I __head| I _.*_iname' |  awk -F: '{print $2}' > /tmp/$$.objs
-$nm -Ap --extern-only --defined-only $libdll | sed -n -f /tmp/$$.syms | awk -F: '{print $2}' >> /tmp/$$.objs
-sort -o /tmp/$$.objs -u /tmp/$$.objs
-
-[ -s /tmp/$$.objs ] || { echo "speclib: couldn't find symbols for $lib" 1>&2; exit 1; }
-
-/bin/rm -rf /tmp/$$.dir
-mkdir /tmp/$$.dir
-cd /tmp/$$.dir
-if v; then
-    $ar x $libdll
-    /bin/rm -f `cat /tmp/$$.objs`
-else
-    $ar x $libdll `cat /tmp/$$.objs`
-fi
-/bin/rm -f $lib
-$ar crus $lib *.o
-export lib;
-perl -pi.bak -- - $lib << 'EOF'
-BEGIN {
-    binmode STDIN;
-    binmode STDOUT;
-    $lib = ($ENV{lib} =~ m!/([^/]+)$!o)[0] || $ENV{lib};
-    $lib =~ s/\.a//o;
-    my $pad = length('cygwin1_dll') - length($lib);
-    die "speclib: library name too long (" . length($lib) . ")\n" if $pad < 0;
-    $lib = "__head_$lib" . "\0" x $pad;
-}
-    s/__head_cygwin1_dll/$lib/g;
-EOF
diff --git a/winsup/cygwin/stackdump.sgml b/winsup/cygwin/stackdump.sgml
deleted file mode 100644
index bff76bffd..000000000
--- a/winsup/cygwin/stackdump.sgml
+++ /dev/null
@@ -1,13 +0,0 @@
-<sect1 id="func-cygwin-stackdump">
-<title>cygwin_stackdump</title>
-
-<funcsynopsis>
-<funcdef>extern "C" void
-<function>cygwin_stackdump</function></funcdef>
-<void>
-</funcsynopsis>
-
-<para> Outputs a stackdump to stderr from the called location.
-</para>
-
-</sect1>
diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc
deleted file mode 100644
index 4c0f08e68..000000000
--- a/winsup/cygwin/strace.cc
+++ /dev/null
@@ -1,422 +0,0 @@
-/* strace.cc: system/windows tracing
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include <time.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <ctype.h>
-#include "pinfo.h"
-#include "perprocess.h"
-#include "cygwin_version.h"
-#include "hires.h"
-#include "security.h"
-#include "cygthread.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-
-#define PROTECT(x) x[sizeof (x)-1] = 0
-#define CHECK(x) if (x[sizeof (x)-1] != 0) { small_printf ("array bound exceeded %d\n", __LINE__); ExitProcess (1); }
-
-class strace NO_COPY strace;
-
-#ifndef NOSTRACE
-
-void
-strace::hello ()
-{
-  char buf[30];
-
-  if (inited)
-    {
-      active ^= 1;
-      return;
-    }
-
-  inited = 1;
-  if (!being_debugged ())
-    return;
-
-  __small_sprintf (buf, "cYg%8x %x", _STRACE_INTERFACE_ACTIVATE_ADDR, &active);
-  OutputDebugString (buf);
-
-  if (active)
-    {
-      prntf (1, NULL, "**********************************************");
-      prntf (1, NULL, "Program name: %s (%d)", myself->progname, myself->pid ?: GetCurrentProcessId ());
-      prntf (1, NULL, "App version:  %d.%d, api: %d.%d",
-	     user_data->dll_major, user_data->dll_minor,
-	     user_data->api_major, user_data->api_minor);
-      prntf (1, NULL, "DLL version:  %d.%d, api: %d.%d",
-	     cygwin_version.dll_major, cygwin_version.dll_minor,
-	     cygwin_version.api_major, cygwin_version.api_minor);
-      prntf (1, NULL, "DLL build:    %s", cygwin_version.dll_build_date);
-      prntf (1, NULL, "OS version:   Windows %s", wincap.osname ());
-      prntf (1, NULL, "Heap size:    %u", cygheap->user_heap.chunk);
-      prntf (1, NULL, "**********************************************");
-    }
-}
-
-int
-strace::microseconds ()
-{
-  static hires_us now;
-  return (int) now.usecs (true);
-}
-
-static int __stdcall
-getfunc (char *in_dst, const char *func)
-{
-  const char *p;
-  const char *pe;
-  char *dst = in_dst;
-  for (p = func; (pe = strchr (p, '(')); p = pe + 1)
-    if (isalnum ((int)pe[-1]) || pe[-1] == '_')
-      break;
-    else if (isspace ((int)pe[-1]))
-      {
-	pe--;
-	break;
-      }
-  if (!pe)
-    pe = strchr (func, '\0');
-  for (p = pe; p > func; p--)
-    if (p != pe && *p == ' ')
-      {
-	p++;
-	break;
-      }
-  if (*p == '*')
-    p++;
-  while (p < pe)
-    *dst++ = *p++;
-
-  *dst++ = ':';
-  *dst++ = ' ';
-  *dst = '\0';
-
-  return dst - in_dst;
-}
-
-extern "C" char *__progname;
-
-/* sprintf analog for use by output routines. */
-int
-strace::vsprntf (char *buf, const char *func, const char *infmt, va_list ap)
-{
-  int count;
-  char fmt[80];
-  static NO_COPY bool nonewline = false;
-  DWORD err = GetLastError ();
-  const char *tn = cygthread::name ();
-  char *pn = __progname ?: (myself ? myself->progname : NULL);
-
-  int microsec = microseconds ();
-  lmicrosec = microsec;
-
-  __small_sprintf (fmt, "%7d [%s] %s ", microsec, tn, "%s %d%s");
-
-  SetLastError (err);
-
-  if (nonewline)
-    count = 0;
-  else
-    {
-      char *p, progname[CYG_MAX_PATH + 1];
-      if (!pn)
-	p = (char *) "*** unknown ***";
-      else if ((p = strrchr (pn, '\\')) != NULL)
-	p++;
-      else if ((p = strrchr (pn, '/')) != NULL)
-	p++;
-      else
-	p = pn;
-      strcpy (progname, p);
-      if ((p = strrchr (progname, '.')) != NULL && strcasematch (p, ".exe"))
-	*p = '\000';
-      p = progname;
-      count = __small_sprintf (buf, fmt, p && *p ? p : "?",
-			       myself->pid ?: GetCurrentProcessId (),
-			       execing ? "!" : "");
-      if (func)
-	count += getfunc (buf + count, func);
-    }
-
-  count += __small_vsprintf (buf + count, infmt, ap);
-  char *p;
-  for (p = buf + count; p > buf; p--)
-    switch (p[-1])
-      {
-	case '\n':
-	  p[-1] = '\0';
-	  break;
-	case '\b':
-	  *--p = '\0';
-	   nonewline = true;
-	  goto done;
-	default:
-	  goto addnl;
-      }
-
-addnl:
-  *p++ = '\n';
-  *p = '\0';
-  nonewline = false;
-
-done:
-  return p - buf;
-}
-
-/* Write to strace file or strace queue. */
-void
-strace::write (unsigned category, const char *buf, int count)
-{
-# define PREFIX (3 + 8 + 1 + 8 + 1)
-  char outbuf[PREFIX + 1 + count + 1];
-# define outstuff (outbuf + 12)
-  __small_sprintf (outstuff, "%x %s", category, buf);
-  __small_sprintf (outbuf, "cYg%08x", strlen (outstuff) + 1);
-  outstuff[-1] = ' ';
-  OutputDebugString (outbuf);
-#undef outstuff
-#undef PREFIX
-}
-
-/* Printf function used when tracing system calls.
-   Warning: DO NOT SET ERRNO HERE! */
-
-void
-strace::vprntf (unsigned category, const char *func, const char *fmt, va_list ap)
-{
-  DWORD err = GetLastError ();
-  int count;
-  char buf[10000];
-
-  PROTECT (buf);
-  SetLastError (err);
-
-  count = vsprntf (buf, func, fmt, ap);
-  CHECK (buf);
-  if (category & _STRACE_SYSTEM)
-    {
-      DWORD done;
-      WriteFile (GetStdHandle (STD_ERROR_HANDLE), buf, count, &done, 0);
-      FlushFileBuffers (GetStdHandle (STD_ERROR_HANDLE));
-    }
-
-#ifndef NOSTRACE
-  if (active)
-    write (category, buf, count);
-#endif
-  SetLastError (err);
-}
-
-void
-strace::prntf (unsigned category, const char *func, const char *fmt, ...)
-{
-  va_list ap;
-
-  va_start (ap, fmt);
-  vprntf (category, func, fmt, ap);
-}
-
-extern "C" void
-strace_printf (unsigned category, const char *func, const char *fmt, ...)
-{
-  va_list ap;
-
-  if ((category & _STRACE_SYSTEM) || strace.active)
-    {
-      va_start (ap, fmt);
-      strace.vprntf (category, func, fmt, ap);
-    }
-}
-
-static NO_COPY struct tab
-{
-  int v;
-  const char *n;
-}
-ta[] =
-{
-  {  WM_NULL, "WM_NULL"  },
-  {  WM_CREATE, "WM_CREATE"  },
-  {  WM_DESTROY, "WM_DESTROY"  },
-  {  WM_MOVE, "WM_MOVE"  },
-  {  WM_SIZE, "WM_SIZE"  },
-  {  WM_ACTIVATE, "WM_ACTIVATE"  },
-  {  WM_SETFOCUS, "WM_SETFOCUS"  },
-  {  WM_KILLFOCUS, "WM_KILLFOCUS"  },
-  {  WM_ENABLE, "WM_ENABLE"  },
-  {  WM_SETREDRAW, "WM_SETREDRAW"  },
-  {  WM_SETTEXT, "WM_SETTEXT"  },
-  {  WM_GETTEXT, "WM_GETTEXT"  },
-  {  WM_GETTEXTLENGTH, "WM_GETTEXTLENGTH"  },
-  {  WM_PAINT, "WM_PAINT"  },
-  {  WM_CLOSE, "WM_CLOSE"  },
-  {  WM_QUERYENDSESSION, "WM_QUERYENDSESSION"  },
-  {  WM_QUIT, "WM_QUIT"  },
-  {  WM_QUERYOPEN, "WM_QUERYOPEN"  },
-  {  WM_ERASEBKGND, "WM_ERASEBKGND"  },
-  {  WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE"  },
-  {  WM_ENDSESSION, "WM_ENDSESSION"  },
-  {  WM_SHOWWINDOW, "WM_SHOWWINDOW"  },
-  {  WM_WININICHANGE, "WM_WININICHANGE"  },
-  {  WM_DEVMODECHANGE, "WM_DEVMODECHANGE"  },
-  {  WM_ACTIVATEAPP, "WM_ACTIVATEAPP"  },
-  {  WM_FONTCHANGE, "WM_FONTCHANGE"  },
-  {  WM_TIMECHANGE, "WM_TIMECHANGE"  },
-  {  WM_CANCELMODE, "WM_CANCELMODE"  },
-  {  WM_SETCURSOR, "WM_SETCURSOR"  },
-  {  WM_MOUSEACTIVATE, "WM_MOUSEACTIVATE"  },
-  {  WM_CHILDACTIVATE, "WM_CHILDACTIVATE"  },
-  {  WM_QUEUESYNC, "WM_QUEUESYNC"  },
-  {  WM_GETMINMAXINFO, "WM_GETMINMAXINFO"  },
-  {  WM_PAINTICON, "WM_PAINTICON"  },
-  {  WM_ICONERASEBKGND, "WM_ICONERASEBKGND"  },
-  {  WM_NEXTDLGCTL, "WM_NEXTDLGCTL"  },
-  {  WM_SPOOLERSTATUS, "WM_SPOOLERSTATUS"  },
-  {  WM_DRAWITEM, "WM_DRAWITEM"  },
-  {  WM_MEASUREITEM, "WM_MEASUREITEM"  },
-  {  WM_DELETEITEM, "WM_DELETEITEM"  },
-  {  WM_VKEYTOITEM, "WM_VKEYTOITEM"  },
-  {  WM_CHARTOITEM, "WM_CHARTOITEM"  },
-  {  WM_SETFONT, "WM_SETFONT"  },
-  {  WM_GETFONT, "WM_GETFONT"  },
-  {  WM_SETHOTKEY, "WM_SETHOTKEY"  },
-  {  WM_GETHOTKEY, "WM_GETHOTKEY"  },
-  {  WM_QUERYDRAGICON, "WM_QUERYDRAGICON"  },
-  {  WM_COMPAREITEM, "WM_COMPAREITEM"  },
-  {  WM_COMPACTING, "WM_COMPACTING"  },
-  {  WM_WINDOWPOSCHANGING, "WM_WINDOWPOSCHANGING"  },
-  {  WM_WINDOWPOSCHANGED, "WM_WINDOWPOSCHANGED"  },
-  {  WM_POWER, "WM_POWER"  },
-  {  WM_COPYDATA, "WM_COPYDATA"  },
-  {  WM_CANCELJOURNAL, "WM_CANCELJOURNAL"  },
-  {  WM_NCCREATE, "WM_NCCREATE"  },
-  {  WM_NCDESTROY, "WM_NCDESTROY"  },
-  {  WM_NCCALCSIZE, "WM_NCCALCSIZE"  },
-  {  WM_NCHITTEST, "WM_NCHITTEST"  },
-  {  WM_NCPAINT, "WM_NCPAINT"  },
-  {  WM_NCACTIVATE, "WM_NCACTIVATE"  },
-  {  WM_GETDLGCODE, "WM_GETDLGCODE"  },
-  {  WM_NCMOUSEMOVE, "WM_NCMOUSEMOVE"  },
-  {  WM_NCLBUTTONDOWN, "WM_NCLBUTTONDOWN"  },
-  {  WM_NCLBUTTONUP, "WM_NCLBUTTONUP"  },
-  {  WM_NCLBUTTONDBLCLK, "WM_NCLBUTTONDBLCLK"  },
-  {  WM_NCRBUTTONDOWN, "WM_NCRBUTTONDOWN"  },
-  {  WM_NCRBUTTONUP, "WM_NCRBUTTONUP"  },
-  {  WM_NCRBUTTONDBLCLK, "WM_NCRBUTTONDBLCLK"  },
-  {  WM_NCMBUTTONDOWN, "WM_NCMBUTTONDOWN"  },
-  {  WM_NCMBUTTONUP, "WM_NCMBUTTONUP"  },
-  {  WM_NCMBUTTONDBLCLK, "WM_NCMBUTTONDBLCLK"  },
-  {  WM_KEYFIRST, "WM_KEYFIRST"  },
-  {  WM_KEYDOWN, "WM_KEYDOWN"  },
-  {  WM_KEYUP, "WM_KEYUP"  },
-  {  WM_CHAR, "WM_CHAR"  },
-  {  WM_DEADCHAR, "WM_DEADCHAR"  },
-  {  WM_SYSKEYDOWN, "WM_SYSKEYDOWN"  },
-  {  WM_SYSKEYUP, "WM_SYSKEYUP"  },
-  {  WM_SYSCHAR, "WM_SYSCHAR"  },
-  {  WM_SYSDEADCHAR, "WM_SYSDEADCHAR"  },
-  {  WM_KEYLAST, "WM_KEYLAST"  },
-  {  WM_INITDIALOG, "WM_INITDIALOG"  },
-  {  WM_COMMAND, "WM_COMMAND"  },
-  {  WM_SYSCOMMAND, "WM_SYSCOMMAND"  },
-  {  WM_TIMER, "WM_TIMER"  },
-  {  WM_HSCROLL, "WM_HSCROLL"  },
-  {  WM_VSCROLL, "WM_VSCROLL"  },
-  {  WM_INITMENU, "WM_INITMENU"  },
-  {  WM_INITMENUPOPUP, "WM_INITMENUPOPUP"  },
-  {  WM_MENUSELECT, "WM_MENUSELECT"  },
-  {  WM_MENUCHAR, "WM_MENUCHAR"  },
-  {  WM_ENTERIDLE, "WM_ENTERIDLE"  },
-  {  WM_CTLCOLORMSGBOX, "WM_CTLCOLORMSGBOX"  },
-  {  WM_CTLCOLOREDIT, "WM_CTLCOLOREDIT"  },
-  {  WM_CTLCOLORLISTBOX, "WM_CTLCOLORLISTBOX"  },
-  {  WM_CTLCOLORBTN, "WM_CTLCOLORBTN"  },
-  {  WM_CTLCOLORDLG, "WM_CTLCOLORDLG"  },
-  {  WM_CTLCOLORSCROLLBAR, "WM_CTLCOLORSCROLLBAR"  },
-  {  WM_CTLCOLORSTATIC, "WM_CTLCOLORSTATIC"  },
-  {  WM_MOUSEFIRST, "WM_MOUSEFIRST"  },
-  {  WM_MOUSEMOVE, "WM_MOUSEMOVE"  },
-  {  WM_LBUTTONDOWN, "WM_LBUTTONDOWN"  },
-  {  WM_LBUTTONUP, "WM_LBUTTONUP"  },
-  {  WM_LBUTTONDBLCLK, "WM_LBUTTONDBLCLK"  },
-  {  WM_RBUTTONDOWN, "WM_RBUTTONDOWN"  },
-  {  WM_RBUTTONUP, "WM_RBUTTONUP"  },
-  {  WM_RBUTTONDBLCLK, "WM_RBUTTONDBLCLK"  },
-  {  WM_MBUTTONDOWN, "WM_MBUTTONDOWN"  },
-  {  WM_MBUTTONUP, "WM_MBUTTONUP"  },
-  {  WM_MBUTTONDBLCLK, "WM_MBUTTONDBLCLK"  },
-  {  WM_MOUSELAST, "WM_MOUSELAST"  },
-  {  WM_PARENTNOTIFY, "WM_PARENTNOTIFY"  },
-  {  WM_ENTERMENULOOP, "WM_ENTERMENULOOP"  },
-  {  WM_EXITMENULOOP, "WM_EXITMENULOOP"  },
-  {  WM_MDICREATE, "WM_MDICREATE"  },
-  {  WM_MDIDESTROY, "WM_MDIDESTROY"  },
-  {  WM_MDIACTIVATE, "WM_MDIACTIVATE"  },
-  {  WM_MDIRESTORE, "WM_MDIRESTORE"  },
-  {  WM_MDINEXT, "WM_MDINEXT"  },
-  {  WM_MDIMAXIMIZE, "WM_MDIMAXIMIZE"  },
-  {  WM_MDITILE, "WM_MDITILE"  },
-  {  WM_MDICASCADE, "WM_MDICASCADE"  },
-  {  WM_MDIICONARRANGE, "WM_MDIICONARRANGE"  },
-  {  WM_MDIGETACTIVE, "WM_MDIGETACTIVE"  },
-  {  WM_MDISETMENU, "WM_MDISETMENU"  },
-  {  WM_DROPFILES, "WM_DROPFILES"  },
-  {  WM_MDIREFRESHMENU, "WM_MDIREFRESHMENU"  },
-  {  WM_CUT, "WM_CUT"  },
-  {  WM_COPY, "WM_COPY"  },
-  {  WM_PASTE, "WM_PASTE"  },
-  {  WM_CLEAR, "WM_CLEAR"  },
-  {  WM_UNDO, "WM_UNDO"  },
-  {  WM_RENDERFORMAT, "WM_RENDERFORMAT"  },
-  {  WM_RENDERALLFORMATS, "WM_RENDERALLFORMATS"  },
-  {  WM_DESTROYCLIPBOARD, "WM_DESTROYCLIPBOARD"  },
-  {  WM_DRAWCLIPBOARD, "WM_DRAWCLIPBOARD"  },
-  {  WM_PAINTCLIPBOARD, "WM_PAINTCLIPBOARD"  },
-  {  WM_VSCROLLCLIPBOARD, "WM_VSCROLLCLIPBOARD"  },
-  {  WM_SIZECLIPBOARD, "WM_SIZECLIPBOARD"  },
-  {  WM_ASKCBFORMATNAME, "WM_ASKCBFORMATNAME"  },
-  {  WM_CHANGECBCHAIN, "WM_CHANGECBCHAIN"  },
-  {  WM_HSCROLLCLIPBOARD, "WM_HSCROLLCLIPBOARD"  },
-  {  WM_QUERYNEWPALETTE, "WM_QUERYNEWPALETTE"  },
-  {  WM_PALETTEISCHANGING, "WM_PALETTEISCHANGING"  },
-  {  WM_PALETTECHANGED, "WM_PALETTECHANGED"  },
-  {  WM_HOTKEY, "WM_HOTKEY"  },
-  {  WM_PENWINFIRST, "WM_PENWINFIRST"  },
-  {  WM_PENWINLAST, "WM_PENWINLAST"  },
-  {  WM_ASYNCIO, "ASYNCIO"  },
-  {  0, 0  }};
-
-void
-strace::wm (int message, int word, int lon)
-{
-  if (active)
-    {
-      int i;
-
-      for (i = 0; ta[i].n; i++)
-	{
-	  if (ta[i].v == message)
-	    {
-	      prntf (_STRACE_WM, NULL, "wndproc %d %s %d %d", message, ta[i].n, word, lon);
-	      return;
-	    }
-	}
-      prntf (_STRACE_WM, NULL, "wndproc %d unknown  %d %d", message, word, lon);
-    }
-}
-#endif /*NOSTRACE*/
diff --git a/winsup/cygwin/string.h b/winsup/cygwin/string.h
deleted file mode 100644
index 1ad902134..000000000
--- a/winsup/cygwin/string.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* string.h: Extra string defs
-
-   Copyright 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGWIN_STRING_H
-#define _CYGWIN_STRING_H
-
-#include_next <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef strchr
-#define strchr cygwin_strchr
-static inline __stdcall char *
-strchr (const char *s, int c)
-{
-  register char * res;
-  __asm__ __volatile__ ("\
-	movb	%%al,%%ah\n\
-1:	movb	(%1),%%al\n\
-	cmpb	%%ah,%%al\n\
-	je	2f\n\
-	incl	%1\n\
-	testb	%%al,%%al\n\
-	jne	1b\n\
-	xorl	%1,%1\n\
-2:	movl	%1,%0\n\
-	":"=a" (res), "=r" (s)
-	:"0" (c), "1" (s));
-  return res;
-}
-
-#undef strechr
-#define strechr cygwin_strechr
-static inline __stdcall char *
-strechr (const char *s, int c)
-{
-  register char * res;
-  __asm__ __volatile__ ("\
-	movb	%%al,%%ah\n\
-1:	movb	(%1),%%al\n\
-	cmpb	%%ah,%%al\n\
-	je	2f\n\
-	incl	%1\n\
-	testb	%%al,%%al\n\
-	jne	1b\n\
-	decl	%1\n\
-2:	movl	%1,%0\n\
-	":"=a" (res), "=r" (s)
-	:"0" (c), "1" (s));
-  return res;
-}
-
-extern const char isalpha_array[];
-
-#undef strcasematch
-#define strcasematch cygwin_strcasematch
-
-static inline int
-cygwin_strcasematch (const char *cs, const char *ct)
-{
-  register int __res;
-  int d0, d1;
-  __asm__ ("\
-	.global	_isalpha_array			\n\
-	cld					\n\
-	andl	$0xff,%%eax			\n\
-1:	lodsb					\n\
-	scasb					\n\
-	je	2f				\n\
-	xorb	_isalpha_array(%%eax),%%al	\n\
-	cmpb	-1(%%edi),%%al			\n\
-	jne	3f				\n\
-2:	testb	%%al,%%al			\n\
-	jnz	1b				\n\
-	movl	$1,%%eax			\n\
-	jmp	4f				\n\
-3:	xor	%0,%0				\n\
-4:"
-	:"=a" (__res), "=&S" (d0), "=&D" (d1)
-		     : "1" (cs),   "2" (ct));
-
-  return __res;
-}
-
-#undef strncasematch
-#define strncasematch cygwin_strncasematch
-
-static inline int
-cygwin_strncasematch (const char *cs, const char *ct, size_t n)
-{
-  register int __res;
-  int d0, d1, d2;
-  __asm__ ("\
-	.global	_isalpha_array;			\n\
-	cld					\n\
-	andl	$0xff,%%eax			\n\
-1:	decl	%3				\n\
-	js	3f				\n\
-	lodsb					\n\
-	scasb					\n\
-	je	2f				\n\
-	xorb	_isalpha_array(%%eax),%%al	\n\
-	cmpb	-1(%%edi),%%al			\n\
-	jne	4f				\n\
-2:	testb	%%al,%%al			\n\
-	jnz	1b				\n\
-3:	movl	$1,%%eax			\n\
-	jmp	5f				\n\
-4:	xor	%0,%0				\n\
-5:"
-	:"=a" (__res), "=&S" (d0), "=&D" (d1), "=&c" (d2)
-		       :"1" (cs),  "2" (ct), "3" (n));
-
-  return __res;
-}
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _CYGWIN_STRING_H */
diff --git a/winsup/cygwin/strsep.cc b/winsup/cygwin/strsep.cc
deleted file mode 100644
index f03df3d94..000000000
--- a/winsup/cygwin/strsep.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-/* strsep.cc: strsep call */
-
-#include <stdio.h>
-
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-extern "C" char *
-strsep (char **stringp,
-	 const char *delim)
-{
-	register char *s;
-	register const char *spanp;
-	register int c, sc;
-	char *tok;
-
-	if ((s = *stringp) == NULL)
-		return (NULL);
-	for (tok = s;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*stringp = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
diff --git a/winsup/cygwin/sync.cc b/winsup/cygwin/sync.cc
deleted file mode 100644
index b6dec83fa..000000000
--- a/winsup/cygwin/sync.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-/* sync.cc: Synchronization functions for cygwin.
-
-   This file implements the methods for controlling the "muto" class
-   which is intended to operate similarly to a mutex but attempts to
-   avoid making expensive calls to the kernel.
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-   Written by Christopher Faylor <cgf@cygnus.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include <time.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <stdlib.h>
-#include "sync.h"
-#include "security.h"
-
-muto NO_COPY muto_start;
-
-#undef WaitForSingleObject
-
-/* Constructor */
-muto *
-muto::init (const char *s)
-{
-  waiters = -1;
-  /* Create event which is used in the fallback case when blocking is necessary */
-  if (!(bruteforce = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL)))
-    {
-      DWORD oerr = GetLastError ();
-      SetLastError (oerr);
-      return NULL;
-    }
-  name = s;
-  next = muto_start.next;
-  muto_start.next = this;
-  return this;
-}
-
-#if 0 /* FIXME: Do we need this? mutos aren't destroyed until process exit */
-/* Destructor (racy?) */
-muto::~muto ()
-{
-  while (visits)
-    release ();
-
-  HANDLE h = bruteforce;
-  bruteforce = NULL;
-  /* Just need to close the event handle */
-  if (h)
-    CloseHandle (h);
-}
-#endif
-
-/* Acquire the lock.  Argument is the number of milliseconds to wait for
-   the lock.  Multiple visits from the same thread are allowed and should
-   be handled correctly.
-
-   Note: The goal here is to minimize, as much as possible, calls to the
-   OS.  Hence the use of InterlockedIncrement, etc., rather than (much) more
-   expensive OS mutexes.  */
-int
-muto::acquire (DWORD ms)
-{
-  DWORD this_tid = GetCurrentThreadId ();
-
-  if (tid != this_tid)
-    {
-      /* Increment the waiters part of the class.  Need to do this first to
-	 avoid potential races. */
-      LONG was_waiting = InterlockedIncrement (&waiters);
-
-      /* This is deceptively simple.  Basically, it allows multiple attempts to
-	 lock the same muto to succeed without attempting to manipulate sync.
-	 If the muto is already locked then this thread will wait for ms until
-	 it is signalled by muto::release.  Then it will attempt to grab the
-	 sync field.  If it succeeds, then this thread owns the muto.
-
-	 There is a pathological condition where a thread times out waiting for
-	 bruteforce but the release code triggers the bruteforce event.  In this
-	 case, it is possible for a thread which is going to wait for bruteforce
-	 to wake up immediately.  It will then attempt to grab sync but will fail
-	 and go back to waiting.  */
-      if (tid != this_tid && (was_waiting || InterlockedExchange (&sync, 1) != 0))
-	{
-	  switch (WaitForSingleObject (bruteforce, ms))
-	      {
-	      case WAIT_OBJECT_0:
-		goto gotit;
-		break;
-	      default:
-		InterlockedDecrement (&waiters);
-		return 0;	/* failed. */
-	      }
-	}
-    }
-
-gotit:
-  tid = this_tid;	/* register this thread. */
-  return ++visits;	/* Increment visit count. */
-}
-
-/* Return the muto lock.  Needs to be called once per every acquire. */
-int
-muto::release ()
-{
-  DWORD this_tid = GetCurrentThreadId ();
-
-  if (tid != this_tid || !visits)
-    {
-      SetLastError (ERROR_NOT_OWNER);	/* Didn't have the lock. */
-      return 0;	/* failed. */
-    }
-
-  /* FIXME: Need to check that other thread has not exited, too. */
-  if (!--visits)
-    {
-      tid = 0;		/* We were the last unlocker. */
-      (void) InterlockedExchange (&sync, 0); /* Reset trigger. */
-      /* This thread had incremented waiters but had never decremented it.
-	 Decrement it now.  If it is >= 0 then there are possibly other
-	 threads waiting for the lock, so trigger bruteforce. */
-      if (InterlockedDecrement (&waiters) >= 0)
-	(void) SetEvent (bruteforce); /* Wake up one of the waiting threads */
-    }
-
-  return 1;	/* success. */
-}
-
-/* Call only when we're exiting.  This is not thread safe. */
-void
-muto::reset ()
-{
-  visits = sync = tid = 0;
-  InterlockedExchange (&waiters, -1);
-  if (bruteforce)
-    {
-      CloseHandle (bruteforce);
-      bruteforce = CreateEvent (&sec_none_nih, FALSE, FALSE, name);
-    }
-}
diff --git a/winsup/cygwin/sync.h b/winsup/cygwin/sync.h
deleted file mode 100644
index 9cd50c3ac..000000000
--- a/winsup/cygwin/sync.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* sync.h: Header file for cygwin synchronization primitives.
-
-   Copyright 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-   Written by Christopher Faylor <cgf@cygnus.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* FIXME: Note that currently this class cannot be allocated via `new' since
-   there are issues with malloc and fork. */
-class muto
-{
-  LONG sync;	/* Used to serialize access to this class. */
-  LONG visits;	/* Count of number of times a thread has called acquire. */
-  LONG waiters;	/* Number of threads waiting for lock. */
-  HANDLE bruteforce; /* event handle used to control waiting for lock. */
-  DWORD tid;	/* Thread Id of lock owner. */
-public:
-  class muto *next;
-  const char *name;
-
-  /* The real constructor. */
-  muto *init(const char *name) __attribute__ ((regparm (3)));
-
-#if 0	/* FIXME: See comment in sync.cc */
-  ~muto ()
-#endif
-  int acquire (DWORD ms = INFINITE) __attribute__ ((regparm (2))); /* Acquire the lock. */
-  int release () __attribute__ ((regparm (1)));		     /* Release the lock. */
-
-  /* Return true if caller thread owns the lock. */
-  int ismine () {return tid == GetCurrentThreadId ();}
-  DWORD owner () {return tid;}
-  int unstable () {return !tid && (sync || waiters >= 0);}
-  void reset () __attribute__ ((regparm (1)));
-};
-
-extern muto muto_start;
-
-/* Use a statically allocated buffer as the storage for a muto */
-#define new_muto(__name) \
-({ \
-  static muto __name##_storage __attribute__((nocommon)) __attribute__((section(".data_cygwin_nocopy"))); \
-  __name = __name##_storage.init (#__name); \
-})
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
deleted file mode 100644
index cf60e11f4..000000000
--- a/winsup/cygwin/syscalls.cc
+++ /dev/null
@@ -1,3002 +0,0 @@
-/* syscalls.cc: syscalls
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#define fstat __FOOfstat__
-#define lstat __FOOlstat__
-#define stat __FOOstat__
-#define _close __FOO_close__
-#define _lseek __FOO_lseek__
-#define _open __FOO_open__
-#define _read __FOO_read__
-#define _write __FOO_write__
-#define _open64 __FOO_open64__
-#define _lseek64 __FOO_lseek64__
-#define _fstat64 __FOO_fstat64__
-
-#include "winsup.h"
-#include <sys/stat.h>
-#include <sys/vfs.h> /* needed for statfs */
-#include <pwd.h>
-#include <grp.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <process.h>
-#include <utmp.h>
-#include <sys/uio.h>
-#include <errno.h>
-#include <ctype.h>
-#include <limits.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <winnls.h>
-#include <wininet.h>
-#include <lmcons.h> /* for UNLEN */
-#include <rpc.h>
-
-#undef fstat
-#undef lstat
-#undef stat
-
-#include <cygwin/version.h>
-#include <sys/cygwin.h>
-#include "cygerrno.h"
-#include "perprocess.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "sigproc.h"
-#include "pinfo.h"
-#include "shared_info.h"
-#include "cygheap.h"
-#define NEED_VFORK
-#include "perthread.h"
-#include "pwdgrp.h"
-#include "cpuid.h"
-#include "registry.h"
-
-#undef _close
-#undef _lseek
-#undef _open
-#undef _read
-#undef _write
-#undef _open64
-#undef _lseek64
-#undef _fstat64
-
-SYSTEM_INFO system_info;
-
-static int __stdcall mknod_worker (const char *, mode_t, mode_t, _major_t,
-				   _minor_t);
-
-static int __stdcall stat_worker (const char *name, struct __stat64 *buf,
-				  int nofollow) __attribute__ ((regparm (3)));
-
-/* Close all files and process any queued deletions.
-   Lots of unix style applications will open a tmp file, unlink it,
-   but never call close.  This function is called by _exit to
-   ensure we don't leave any such files lying around.  */
-
-void __stdcall
-close_all_files (void)
-{
-  SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "close_all_files");
-
-  if (cygheap->ctty)
-    {
-      if (cygheap->ctty->usecount == 1)
-	cygheap->ctty->close ();
-      else
-	cygheap->ctty->usecount--;
-      debug_printf ("ctty usecount %d", cygheap->ctty->archetype->usecount);
-    }
-
-  fhandler_base *fh;
-  for (int i = 0; i < (int) cygheap->fdtab.size; i++)
-    if ((fh = cygheap->fdtab[i]) != NULL)
-      {
-#ifdef DEBUGGING
-	debug_printf ("closing fd %d", i);
-#endif
-	fh->close ();
-	cygheap->fdtab.release (i);
-      }
-
-  ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "close_all_files");
-  user_shared->delqueue.process_queue ();
-}
-
-int
-dup (int fd)
-{
-  return cygheap->fdtab.dup2 (fd, cygheap_fdnew ());
-}
-
-int
-dup2 (int oldfd, int newfd)
-{
-  return cygheap->fdtab.dup2 (oldfd, newfd);
-}
-
-extern "C" int
-unlink (const char *ourname)
-{
-  int res = -1;
-  DWORD devn;
-
-  path_conv win32_name (ourname, PC_SYM_NOFOLLOW | PC_FULL);
-
-  if (win32_name.error)
-    {
-      set_errno (win32_name.error);
-      goto done;
-    }
-
-  if ((devn = win32_name.get_devn ()) == FH_PROC || devn == FH_REGISTRY
-      || devn == FH_PROCESS)
-    {
-      set_errno (EROFS);
-      goto done;
-    }
-
-  syscall_printf ("_unlink (%s)", win32_name.get_win32 ());
-
-  if (!win32_name.exists ())
-    {
-      syscall_printf ("unlinking a nonexistent file");
-      set_errno (ENOENT);
-      goto done;
-    }
-  else if (win32_name.isdir ())
-    {
-      syscall_printf ("unlinking a directory");
-      set_errno (EPERM);
-      goto done;
-    }
-
-  /* Windows won't check the directory mode, so we do that ourselves.  */
-  if (!writable_directory (win32_name))
-    {
-      syscall_printf ("non-writable directory");
-      set_errno (EPERM);
-      goto done;
-    }
-
-  bool setattrs;
-  if (!((DWORD) win32_name & (FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM)))
-    setattrs = false;
-  else
-    {
-      /* Allow us to delete even if read-only */
-      setattrs = SetFileAttributes (win32_name,
-				    (DWORD) win32_name
-				    & ~(FILE_ATTRIBUTE_READONLY
-					| FILE_ATTRIBUTE_SYSTEM));
-    }
-  /* Attempt to use "delete on close" semantics to handle removing
-     a file which may be open. */
-  if (wincap.has_delete_on_close ())
-    {
-      HANDLE h;
-      h = CreateFile (win32_name, 0, FILE_SHARE_READ, &sec_none_nih,
-		      OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, 0);
-      if (h != INVALID_HANDLE_VALUE)
-	{
-	  if (wincap.has_hard_links () && setattrs)
-	    (void) SetFileAttributes (win32_name, (DWORD) win32_name);
-	  BOOL res = CloseHandle (h);
-	  syscall_printf ("%d = CloseHandle (%p)", res, h);
-	  if (GetFileAttributes (win32_name) == INVALID_FILE_ATTRIBUTES
-	      || !win32_name.isremote ())
-	    {
-	      syscall_printf ("CreateFile (FILE_FLAG_DELETE_ON_CLOSE) succeeded");
-	      goto ok;
-	    }
-	  else
-	    {
-	      syscall_printf ("CreateFile (FILE_FLAG_DELETE_ON_CLOSE) failed");
-	      if (setattrs)
-		SetFileAttributes (win32_name, (DWORD) win32_name & ~(FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_SYSTEM));
-	    }
-	}
-    }
-
-  /* Try a delete with attributes reset */
-  if (DeleteFile (win32_name))
-    {
-      syscall_printf ("DeleteFile after CreateFile/CloseHandle succeeded");
-      goto ok;
-    }
-
-  DWORD lasterr;
-  lasterr = GetLastError ();
-
-  (void) SetFileAttributes (win32_name, (DWORD) win32_name);
-
-  /* Windows 9x seems to report ERROR_ACCESS_DENIED rather than sharing
-     violation.  So, set lasterr to ERROR_SHARING_VIOLATION in this case
-     to simplify tests. */
-  if (wincap.access_denied_on_delete () && lasterr == ERROR_ACCESS_DENIED
-      && !win32_name.isremote ())
-    lasterr = ERROR_SHARING_VIOLATION;
-
-  /* FILE_FLAGS_DELETE_ON_CLOSE was a bust.  If this is a sharing
-     violation, then queue the file for deletion when the process
-     exits.  Otherwise, punt. */
-  if (lasterr != ERROR_SHARING_VIOLATION)
-    goto err;
-
-  syscall_printf ("couldn't delete file, err %d", lasterr);
-
-  /* Add file to the "to be deleted" queue. */
-  user_shared->delqueue.queue_file (win32_name);
-
- /* Success condition. */
- ok:
-  res = 0;
-  goto done;
-
- /* Error condition. */
- err:
-  __seterrno ();
-  res = -1;
-
- done:
-  syscall_printf ("%d = unlink (%s)", res, ourname);
-  return res;
-}
-
-extern "C" int
-_remove_r (struct _reent *, const char *ourname)
-{
-  path_conv win32_name (ourname, PC_SYM_NOFOLLOW | PC_FULL);
-
-  if (win32_name.error)
-    {
-      set_errno (win32_name.error);
-      syscall_printf ("-1 = remove (%s)", ourname);
-      return -1;
-    }
-
-  return win32_name.isdir () ? rmdir (ourname) : unlink (ourname);
-}
-
-extern "C" int
-remove (const char *ourname)
-{
-  path_conv win32_name (ourname, PC_SYM_NOFOLLOW | PC_FULL);
-
-  if (win32_name.error)
-    {
-      set_errno (win32_name.error);
-      syscall_printf ("-1 = remove (%s)", ourname);
-      return -1;
-    }
-
-  return win32_name.isdir () ? rmdir (ourname) : unlink (ourname);
-}
-
-extern "C" pid_t
-getpid ()
-{
-  return myself->pid;
-}
-
-extern "C" pid_t
-_getpid_r (struct _reent *)
-{
-  return getpid ();
-}
-
-/* getppid: POSIX 4.1.1.1 */
-extern "C" pid_t
-getppid ()
-{
-  return myself->ppid;
-}
-
-/* setsid: POSIX 4.3.2.1 */
-extern "C" pid_t
-setsid (void)
-{
-  vfork_save *vf = vfork_storage.val ();
-  /* This is a horrible, horrible kludge */
-  if (vf && vf->pid < 0)
-    {
-      pid_t pid = fork ();
-      if (pid > 0)
-	{
-	  syscall_printf ("longjmping due to vfork");
-	  vf->restore_pid (pid);
-	}
-      /* assuming that fork was successful */
-    }
-
-  if (myself->pgid != myself->pid)
-    {
-      if (myself->ctty >= 0 && fhandler_console::open_fhs <= 0)
-	{
-	  syscall_printf ("freeing console");
-	  FreeConsole ();
-	}
-      myself->ctty = -1;
-      myself->sid = getpid ();
-      myself->pgid = getpid ();
-      syscall_printf ("sid %d, pgid %d, ctty %d, open_fhs %d", myself->sid,
-		      myself->pgid, myself->ctty, fhandler_console::open_fhs);
-      if (cygheap->ctty)
-	{
-	  if (!--cygheap->ctty->usecount)
-	    cygheap->ctty->close ();
-	  cygheap->ctty = NULL;
-	}
-      return myself->sid;
-    }
-
-  set_errno (EPERM);
-  return -1;
-}
-
-extern "C" pid_t
-getsid (pid_t pid)
-{
-  pid_t res;
-  if (!pid)
-    res = myself->sid;
-  else
-    {
-      pinfo p (pid);
-      if (p)
-	res = p->sid;
-      else
-	{
-	  set_errno (ESRCH);
-	  res = -1;
-	}
-    }
-  return res;
-}
-
-extern "C" ssize_t
-read (int fd, void *ptr, size_t len)
-{
-  const iovec iov =
-    {
-      iov_base: ptr,
-      iov_len: len
-    };
-
-  return readv (fd, &iov, 1);
-}
-
-extern "C" ssize_t _read (int, void *, size_t)
-  __attribute__ ((alias ("read")));
-
-extern "C" ssize_t
-write (int fd, const void *ptr, size_t len)
-{
-  const struct iovec iov =
-    {
-      iov_base: (void *) ptr,	// const_cast
-      iov_len: len
-    };
-
-  return writev (fd, &iov, 1);
-}
-
-extern "C" ssize_t _write (int fd, const void *ptr, size_t len)
-  __attribute__ ((alias ("write")));
-
-extern "C" ssize_t
-readv (int fd, const struct iovec *const iov, const int iovcnt)
-{
-  extern int sigcatchers;
-  const int e = get_errno ();
-
-  int res = -1;
-
-  const ssize_t tot = check_iovec_for_read (iov, iovcnt);
-
-  if (tot <= 0)
-    {
-      res = tot;
-      goto done;
-    }
-
-  while (1)
-    {
-      sig_dispatch_pending ();
-
-      cygheap_fdget cfd (fd);
-      if (cfd < 0)
-	break;
-
-      if ((cfd->get_flags () & O_ACCMODE) == O_WRONLY)
-	{
-	  set_errno (EBADF);
-	  break;
-	}
-
-      DWORD wait = cfd->is_nonblocking () ? 0 : INFINITE;
-
-      /* Could block, so let user know we at least got here.  */
-      syscall_printf ("readv (%d, %p, %d) %sblocking, sigcatchers %d",
-		      fd, iov, iovcnt, wait ? "" : "non", sigcatchers);
-
-      if (wait && (!cfd->is_slow () || cfd->get_r_no_interrupt ()))
-	debug_printf ("no need to call ready_for_read");
-      else if (!cfd->ready_for_read (fd, wait))
-	{
-	  res = -1;
-	  goto out;
-	}
-
-      /* FIXME: This is not thread safe.  We need some method to
-	 ensure that an fd, closed in another thread, aborts I/O
-	 operations. */
-      if (!cfd.isopen ())
-	break;
-
-      /* Check to see if this is a background read from a "tty",
-	 sending a SIGTTIN, if appropriate */
-      res = cfd->bg_check (SIGTTIN);
-
-      if (!cfd.isopen ())
-	{
-	  res = -1;
-	  break;
-	}
-
-      if (res > bg_eof)
-	{
-	  myself->process_state |= PID_TTYIN;
-	  if (!cfd.isopen ())
-	    {
-	      res = -1;
-	      break;
-	    }
-	  res = cfd->readv (iov, iovcnt, tot);
-	  myself->process_state &= ~PID_TTYIN;
-	}
-
-    out:
-      if (res >= 0 || get_errno () != EINTR || !call_signal_handler_now ())
-	break;
-      set_errno (e);
-    }
-
-done:
-  syscall_printf ("%d = readv (%d, %p, %d), errno %d", res, fd, iov, iovcnt,
-		  get_errno ());
-  MALLOC_CHECK;
-  return res;
-}
-
-extern "C" ssize_t
-writev (const int fd, const struct iovec *const iov, const int iovcnt)
-{
-  int res = -1;
-  sig_dispatch_pending ();
-  const ssize_t tot = check_iovec_for_write (iov, iovcnt);
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    goto done;
-
-  if (tot <= 0)
-    {
-      res = tot;
-      goto done;
-    }
-
-  if ((cfd->get_flags () & O_ACCMODE) == O_RDONLY)
-    {
-      set_errno (EBADF);
-      goto done;
-    }
-
-  /* Could block, so let user know we at least got here.  */
-  if (fd == 1 || fd == 2)
-    paranoid_printf ("writev (%d, %p, %d)", fd, iov, iovcnt);
-  else
-    syscall_printf  ("writev (%d, %p, %d)", fd, iov, iovcnt);
-
-  res = cfd->bg_check (SIGTTOU);
-
-  if (res > (int) bg_eof)
-    {
-      myself->process_state |= PID_TTYOU;
-      res = cfd->writev (iov, iovcnt, tot);
-      myself->process_state &= ~PID_TTYOU;
-    }
-
-done:
-  if (fd == 1 || fd == 2)
-    paranoid_printf ("%d = write (%d, %p, %d), errno %d",
-		     res, fd, iov, iovcnt, get_errno ());
-  else
-    syscall_printf ("%d = write (%d, %p, %d), errno %d",
-		    res, fd, iov, iovcnt, get_errno ());
-
-  MALLOC_CHECK;
-  return res;
-}
-
-/* _open */
-/* newlib's fcntl.h defines _open as taking variable args so we must
-   correspond.  The third arg if it exists is: mode_t mode. */
-extern "C" int
-open (const char *unix_path, int flags, ...)
-{
-  int res = -1;
-  va_list ap;
-  mode_t mode = 0;
-  sig_dispatch_pending ();
-
-  syscall_printf ("open (%s, %p)", unix_path, flags);
-  if (!check_null_empty_str_errno (unix_path))
-    {
-      /* check for optional mode argument */
-      va_start (ap, flags);
-      mode = va_arg (ap, mode_t);
-      va_end (ap);
-
-      fhandler_base *fh;
-      cygheap_fdnew fd;
-
-      if (fd >= 0)
-	{
-	  if (!(fh = build_fh_name (unix_path, NULL, PC_SYM_FOLLOW)))
-	    res = -1;		// errno already set
-	  else if (fh->is_fs_special () && fh->device_access_denied (flags))
-	    {
-	      delete fh;
-	      res = -1;
-	    }
-	  else if (!fh->open (flags, (mode & 07777) & ~cygheap->umask))
-	    {
-	      delete fh;
-	      res = -1;
-	    }
-	  else
-	    {
-	      cygheap->fdtab[fd] = fh;
-	      if ((res = fd) <= 2)
-		set_std_handle (res);
-	    }
-	}
-    }
-
-  syscall_printf ("%d = open (%s, %p)", res, unix_path, flags);
-  return res;
-}
-
-extern "C" int _open (const char *, int flags, ...)
-  __attribute__ ((alias ("open")));
-
-extern "C" int _open64 (const char *, int flags, ...)
-  __attribute__ ((alias ("open")));
-
-extern "C" _off64_t
-lseek64 (int fd, _off64_t pos, int dir)
-{
-  _off64_t res;
-
-  if (dir != SEEK_SET && dir != SEEK_CUR && dir != SEEK_END)
-    {
-      set_errno (EINVAL);
-      res = -1;
-    }
-  else
-    {
-      cygheap_fdget cfd (fd);
-      if (cfd >= 0)
-	res = cfd->lseek (pos, dir);
-      else
-	res = -1;
-    }
-  syscall_printf ("%d = lseek (%d, %D, %d)", res, fd, pos, dir);
-
-  return res;
-}
-
-extern "C" int _lseek64 (int fd, _off64_t pos, int dir)
-  __attribute__ ((alias ("lseek64")));
-
-extern "C" _off_t
-lseek (int fd, _off_t pos, int dir)
-{
-  return lseek64 (fd, (_off64_t) pos, dir);
-}
-
-extern "C" _off_t _lseek (int, _off_t, int)
-  __attribute__ ((alias ("lseek")));
-
-extern "C" int
-close (int fd)
-{
-  int res;
-
-  syscall_printf ("close (%d)", fd);
-
-  MALLOC_CHECK;
-  cygheap_fdget cfd (fd, true);
-  if (cfd < 0)
-    res = -1;
-  else
-    {
-      res = cfd->close ();
-      cfd.release ();
-    }
-
-  syscall_printf ("%d = close (%d)", res, fd);
-  MALLOC_CHECK;
-  return res;
-}
-
-extern "C" int _close (int) __attribute__ ((alias ("close")));
-
-extern "C" int
-isatty (int fd)
-{
-  int res;
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    res = 0;
-  else
-    res = cfd->is_tty ();
-  syscall_printf ("%d = isatty (%d)", res, fd);
-  return res;
-}
-
-/* Under NT, try to make a hard link using backup API.  If that
-   fails or we are Win 95, just copy the file.
-   FIXME: We should actually be checking partition type, not OS.
-   Under NTFS, we should support hard links.  On FAT partitions,
-   we should just copy the file.
-*/
-
-extern "C" int
-link (const char *a, const char *b)
-{
-  int res = -1;
-  path_conv real_a (a, PC_SYM_NOFOLLOW | PC_FULL);
-  path_conv real_b (b, PC_SYM_NOFOLLOW | PC_FULL);
-  extern bool allow_winsymlinks;
-
-  if (real_a.error)
-    {
-      set_errno (real_a.error);
-      goto done;
-    }
-
-  if (real_b.error)
-    {
-      set_errno (real_b.case_clash ? ECASECLASH : real_b.error);
-      goto done;
-    }
-
-  if (real_b.exists ())
-    {
-      syscall_printf ("file '%s' exists?", (char *) real_b);
-      set_errno (EEXIST);
-      goto done;
-    }
-
-  if (real_b[strlen (real_b) - 1] == '.')
-    {
-      syscall_printf ("trailing dot, bailing out");
-      set_errno (EINVAL);
-      goto done;
-    }
-
-  /* Shortcut hack. */
-  char new_lnk_buf[CYG_MAX_PATH + 5];
-  if (allow_winsymlinks && real_a.is_lnk_symlink () && !real_b.case_clash)
-    {
-      strcpy (new_lnk_buf, b);
-      strcat (new_lnk_buf, ".lnk");
-      b = new_lnk_buf;
-      real_b.check (b, PC_SYM_NOFOLLOW | PC_FULL);
-    }
-  /* Try to make hard link first on Windows NT */
-  if (wincap.has_hard_links ())
-    {
-      if (CreateHardLinkA (real_b, real_a, NULL))
-	goto success;
-
-      HANDLE hFileSource;
-
-      WIN32_STREAM_ID StreamId;
-      DWORD dwBytesWritten;
-      LPVOID lpContext;
-      DWORD cbPathLen;
-      DWORD StreamSize;
-      WCHAR wbuf[CYG_MAX_PATH];
-
-      BOOL bSuccess;
-
-      hFileSource = CreateFile (real_a, FILE_WRITE_ATTRIBUTES,
-				FILE_SHARE_READ | FILE_SHARE_WRITE /*| FILE_SHARE_DELETE*/,
-				&sec_none_nih, // sa
-				OPEN_EXISTING, 0, NULL);
-
-      if (hFileSource == INVALID_HANDLE_VALUE)
-	{
-	  syscall_printf ("cannot open source, %E");
-	  goto docopy;
-	}
-
-      cbPathLen = sys_mbstowcs (wbuf, real_b, CYG_MAX_PATH) * sizeof (WCHAR);
-
-      StreamId.dwStreamId = BACKUP_LINK;
-      StreamId.dwStreamAttributes = 0;
-      StreamId.dwStreamNameSize = 0;
-      StreamId.Size.HighPart = 0;
-      StreamId.Size.LowPart = cbPathLen;
-
-      StreamSize = sizeof (WIN32_STREAM_ID) - sizeof (WCHAR**) +
-		   StreamId.dwStreamNameSize;
-
-      lpContext = NULL;
-      /* Write the WIN32_STREAM_ID */
-      bSuccess = BackupWrite (
-	hFileSource,
-	 (LPBYTE) &StreamId,	// buffer to write
-	StreamSize,		// number of bytes to write
-	&dwBytesWritten,
-	FALSE,			// don't abort yet
-	FALSE,			// don't process security
-	&lpContext);
-
-      if (bSuccess)
-	{
-	  /* write the buffer containing the path */
-	  /* FIXME: BackupWrite sometimes traps if linkname is invalid.
-	     Need to handle. */
-	  bSuccess = BackupWrite (
-		hFileSource,
-		 (LPBYTE) wbuf,	// buffer to write
-		cbPathLen,	// number of bytes to write
-		&dwBytesWritten,
-		FALSE,		// don't abort yet
-		FALSE,		// don't process security
-		&lpContext
-		);
-
-	  if (!bSuccess)
-	    syscall_printf ("cannot write linkname, %E");
-
-	  /* Free context */
-	  BackupWrite (
-	    hFileSource,
-	    NULL,		// buffer to write
-	    0,			// number of bytes to write
-	    &dwBytesWritten,
-	    TRUE,		// abort
-	    FALSE,		// don't process security
-	    &lpContext);
-	}
-      else
-	syscall_printf ("cannot write streamId, %E");
-
-      CloseHandle (hFileSource);
-
-      if (!bSuccess)
-	goto docopy;
-
-    success:
-      res = 0;
-      if (!allow_winsymlinks && real_a.is_lnk_symlink ())
-	SetFileAttributes (real_b, (DWORD) real_a
-				   | FILE_ATTRIBUTE_SYSTEM
-				   | FILE_ATTRIBUTE_READONLY);
-
-      goto done;
-    }
-docopy:
-  /* do this with a copy */
-  if (CopyFileA (real_a, real_b, 1))
-    res = 0;
-  else
-    __seterrno ();
-
-done:
-  syscall_printf ("%d = link (%s, %s)", res, a, b);
-  return res;
-}
-
-/* chown: POSIX 5.6.5.1 */
-/*
- * chown () is only implemented for Windows NT.  Under other operating
- * systems, it is only a stub that always returns zero.
- */
-static int
-chown_worker (const char *name, unsigned fmode, __uid32_t uid, __gid32_t gid)
-{
-  int res;
-
-  if (check_null_empty_str_errno (name))
-    return -1;
-
-  if (!wincap.has_security ())  // real chown only works on NT
-    res = 0;			// return zero (and do nothing) under Windows 9x
-  else
-    {
-      /* we need Win32 path names because of usage of Win32 API functions */
-      path_conv win32_path (PC_NONULLEMPTY, name, fmode);
-
-      if (win32_path.error)
-	{
-	  set_errno (win32_path.error);
-	  res = -1;
-	  goto done;
-	}
-
-      /* FIXME: This makes chown on a device succeed always.  Someday we'll want
-	 to actually allow chown to work properly on devices. */
-      if (win32_path.is_auto_device () && !win32_path.issocket ())
-	{
-	  res = 0;
-	  goto done;
-	}
-
-      mode_t attrib = 0;
-      if (win32_path.isdir ())
-	attrib |= S_IFDIR;
-      res = get_file_attribute (win32_path.has_acls (),
-				win32_path.get_win32 (),
-				&attrib);
-      if (!res)
-	 res = set_file_attribute (win32_path.has_acls (), win32_path, uid,
-				   gid, attrib);
-      if (res != 0 && (!win32_path.has_acls () || !allow_ntsec))
-	{
-	  /* fake - if not supported, pretend we're like win95
-	     where it just works */
-	  res = 0;
-	}
-    }
-
-done:
-  syscall_printf ("%d = %schown (%s,...)",
-		  res, (fmode & PC_SYM_NOFOLLOW) ? "l" : "", name);
-  return res;
-}
-
-extern "C" int
-chown32 (const char * name, __uid32_t uid, __gid32_t gid)
-{
-  return chown_worker (name, PC_SYM_FOLLOW, uid, gid);
-}
-
-extern "C" int
-chown (const char * name, __uid16_t uid, __gid16_t gid)
-{
-  return chown_worker (name, PC_SYM_FOLLOW,
-		       uid16touid32 (uid), gid16togid32 (gid));
-}
-
-extern "C" int
-lchown32 (const char * name, __uid32_t uid, __gid32_t gid)
-{
-  return chown_worker (name, PC_SYM_NOFOLLOW, uid, gid);
-}
-
-extern "C" int
-lchown (const char * name, __uid16_t uid, __gid16_t gid)
-{
-  return chown_worker (name, PC_SYM_NOFOLLOW,
-		       uid16touid32 (uid), gid16togid32 (gid));
-}
-
-extern "C" int
-fchown32 (int fd, __uid32_t uid, __gid32_t gid)
-{
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    {
-      syscall_printf ("-1 = fchown (%d,...)", fd);
-      return -1;
-    }
-
-  const char *path = cfd->get_name ();
-
-  if (path == NULL)
-    {
-      syscall_printf ("-1 = fchown (%d,...) (no name)", fd);
-      set_errno (ENOSYS);
-      return -1;
-    }
-
-  syscall_printf ("fchown (%d,...): calling chown_worker (%s,FOLLOW,...)",
-		  fd, path);
-  return chown_worker (path, PC_SYM_FOLLOW, uid, gid);
-}
-
-extern "C" int
-fchown (int fd, __uid16_t uid, __gid16_t gid)
-{
-  return fchown32 (fd, uid16touid32 (uid), gid16togid32 (gid));
-}
-
-/* umask: POSIX 5.3.3.1 */
-extern "C" mode_t
-umask (mode_t mask)
-{
-  mode_t oldmask;
-
-  oldmask = cygheap->umask;
-  cygheap->umask = mask & 0777;
-  return oldmask;
-}
-
-int
-chmod_device (path_conv& pc, mode_t mode)
-{
-  return mknod_worker (pc, pc.dev.mode & S_IFMT, mode, pc.dev.major, pc.dev.minor);
-}
-
-/* chmod: POSIX 5.6.4.1 */
-extern "C" int
-chmod (const char *path, mode_t mode)
-{
-  int res = -1;
-
-  path_conv win32_path (path);
-
-  if (win32_path.error)
-    {
-      set_errno (win32_path.error);
-      goto done;
-    }
-
-  /* FIXME: This makes chmod on a device succeed always.  Someday we'll want
-     to actually allow chmod to work properly on devices. */
-  if (win32_path.is_auto_device ())
-    {
-      res = 0;
-      goto done;
-    }
-  if (win32_path.is_fs_special ())
-    {
-      res = chmod_device (win32_path, mode);
-      goto done;
-    }
-
-  if (!win32_path.exists ())
-    __seterrno ();
-  else
-    {
-      /* temporary erase read only bit, to be able to set file security */
-      SetFileAttributes (win32_path, (DWORD) win32_path & ~FILE_ATTRIBUTE_READONLY);
-
-      if (win32_path.isdir ())
-	mode |= S_IFDIR;
-      if (!set_file_attribute (win32_path.has_acls (), win32_path,
-			       ILLEGAL_UID, ILLEGAL_GID, mode)
-	  && allow_ntsec)
-	res = 0;
-
-      /* if the mode we want has any write bits set, we can't
-	 be read only. */
-      if (mode & (S_IWUSR | S_IWGRP | S_IWOTH))
-	(DWORD) win32_path &= ~FILE_ATTRIBUTE_READONLY;
-      else
-	(DWORD) win32_path |= FILE_ATTRIBUTE_READONLY;
-
-      if (!win32_path.is_lnk_symlink () && S_ISLNK (mode) || S_ISSOCK (mode))
-	(DWORD) win32_path |= FILE_ATTRIBUTE_SYSTEM;
-
-      if (!SetFileAttributes (win32_path, win32_path))
-	__seterrno ();
-      else if (!allow_ntsec)
-	/* Correct NTFS security attributes have higher priority */
-	res = 0;
-    }
-
-done:
-  syscall_printf ("%d = chmod (%s, %p)", res, path, mode);
-  return res;
-}
-
-/* fchmod: P96 5.6.4.1 */
-
-extern "C" int
-fchmod (int fd, mode_t mode)
-{
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    {
-      syscall_printf ("-1 = fchmod (%d, 0%o)", fd, mode);
-      return -1;
-    }
-
-  const char *path = cfd->get_name ();
-
-  if (path == NULL)
-    {
-      syscall_printf ("-1 = fchmod (%d, 0%o) (no name)", fd, mode);
-      set_errno (ENOSYS);
-      return -1;
-    }
-
-  syscall_printf ("fchmod (%d, 0%o): calling chmod (%s, 0%o)",
-		  fd, mode, path, mode);
-  return chmod (path, mode);
-}
-
-static void
-stat64_to_stat32 (struct __stat64 *src, struct __stat32 *dst)
-{
-  dst->st_dev = ((src->st_dev >> 8) & 0xff00) | (src->st_dev & 0xff);
-  dst->st_ino = ((unsigned) (src->st_ino >> 32)) | (unsigned) src->st_ino;
-  dst->st_mode = src->st_mode;
-  dst->st_nlink = src->st_nlink;
-  dst->st_uid = src->st_uid;
-  dst->st_gid = src->st_gid;
-  dst->st_rdev = ((src->st_rdev >> 8) & 0xff00) | (src->st_rdev & 0xff);
-  dst->st_size = src->st_size;
-  dst->st_atim = src->st_atim;
-  dst->st_mtim = src->st_mtim;
-  dst->st_ctim = src->st_ctim;
-  dst->st_blksize = src->st_blksize;
-  dst->st_blocks = src->st_blocks;
-}
-
-extern "C" int
-fstat64 (int fd, struct __stat64 *buf)
-{
-  int res;
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    res = -1;
-  else
-    {
-      memset (buf, 0, sizeof (struct __stat64));
-      res = cfd->fstat (buf);
-      if (!res)
-	{
-	  if (!buf->st_ino)
-	    buf->st_ino = hash_path_name (0, cfd->get_win32_name ());
-	  if (!buf->st_dev)
-	    buf->st_dev = cfd->get_device ();
-	  if (!buf->st_rdev)
-	    buf->st_rdev = buf->st_dev;
-	}
-    }
-
-  syscall_printf ("%d = fstat (%d, %p)", res, fd, buf);
-  return res;
-}
-
-extern "C" int
-_fstat64_r (struct _reent *ptr, int fd, struct __stat64 *buf)
-{
-  int ret;
-
-  set_errno (0);
-  if ((ret = fstat64 (fd, buf)) == -1 && get_errno () != 0)
-    ptr->_errno = get_errno ();
-  return ret;
-}
-
-extern "C" int
-fstat (int fd, struct __stat32 *buf)
-{
-  struct __stat64 buf64;
-  int ret = fstat64 (fd, &buf64);
-  if (!ret)
-    stat64_to_stat32 (&buf64, buf);
-  return ret;
-}
-
-extern "C" int
-_fstat_r (struct _reent *ptr, int fd, struct __stat32 *buf)
-{
-  int ret;
-
-  set_errno (0);
-  if ((ret = fstat (fd, buf)) == -1 && get_errno () != 0)
-    ptr->_errno = get_errno ();
-  return ret;
-}
-
-/* fsync: P96 6.6.1.1 */
-extern "C" int
-fsync (int fd)
-{
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    {
-      syscall_printf ("-1 = fsync (%d)", fd);
-      return -1;
-    }
-
-  if (FlushFileBuffers (cfd->get_handle ()) == 0)
-    {
-      __seterrno ();
-      return -1;
-    }
-  return 0;
-}
-
-/* sync: standards? */
-extern "C" int
-sync ()
-{
-  return 0;
-}
-
-suffix_info stat_suffixes[] =
-{
-  suffix_info ("", 1),
-  suffix_info (".exe", 1),
-  suffix_info (NULL)
-};
-
-/* Cygwin internal */
-static int __stdcall
-stat_worker (const char *name, struct __stat64 *buf, int nofollow)
-{
-  int res = -1;
-  fhandler_base *fh = NULL;
-
-  if (check_null_invalid_struct_errno (buf))
-    goto done;
-
-  fh = build_fh_name (name, NULL, (nofollow ? PC_SYM_NOFOLLOW : PC_SYM_FOLLOW)
-		      		  | PC_FULL, stat_suffixes);
-
-  if (fh->error ())
-    {
-      debug_printf ("got %d error from build_fh_name", fh->error ());
-      set_errno (fh->error ());
-    }
-  else
-    {
-      debug_printf ("(%s, %p, %d, %p), file_attributes %d", name, buf, nofollow,
-		    fh, (DWORD) *fh);
-      memset (buf, 0, sizeof (*buf));
-      res = fh->fstat (buf);
-      if (!res)
-	{
-	  if (!buf->st_ino)
-	    buf->st_ino = hash_path_name (0, fh->get_win32_name ());
-	  if (!buf->st_dev)
-	    buf->st_dev = fh->get_device ();
-	  if (!buf->st_rdev)
-	    buf->st_rdev = buf->st_dev;
-	}
-    }
-
- done:
-  if (fh)
-    delete fh;
-  MALLOC_CHECK;
-  syscall_printf ("%d = (%s, %p)", res, name, buf);
-  return res;
-}
-
-extern "C" int
-stat64 (const char *name, struct __stat64 *buf)
-{
-  syscall_printf ("entering");
-  return stat_worker (name, buf, 0);
-}
-
-extern "C" int
-_stat64_r (struct _reent *ptr, const char *name, struct __stat64 *buf)
-{
-  int ret;
-
-  set_errno (0);
-  if ((ret = stat64 (name, buf)) == -1 && get_errno () != 0)
-    ptr->_errno = get_errno ();
-  return ret;
-}
-
-extern "C" int
-stat (const char *name, struct __stat32 *buf)
-{
-  struct __stat64 buf64;
-  int ret = stat64 (name, &buf64);
-  if (!ret)
-    stat64_to_stat32 (&buf64, buf);
-  return ret;
-}
-
-extern "C" int
-_stat_r (struct _reent *ptr, const char *name, struct __stat32 *buf)
-{
-  int ret;
-
-  set_errno (0);
-  if ((ret = stat (name, buf)) == -1 && get_errno () != 0)
-    ptr->_errno = get_errno ();
-  return ret;
-}
-
-/* lstat: Provided by SVR4 and 4.3+BSD, POSIX? */
-extern "C" int
-lstat64 (const char *name, struct __stat64 *buf)
-{
-  syscall_printf ("entering");
-  return stat_worker (name, buf, 1);
-}
-
-/* lstat: Provided by SVR4 and 4.3+BSD, POSIX? */
-extern "C" int
-lstat (const char *name, struct __stat32 *buf)
-{
-  struct __stat64 buf64;
-  int ret = lstat64 (name, &buf64);
-  if (!ret)
-    stat64_to_stat32 (&buf64, buf);
-  return ret;
-}
-
-int
-access_worker (path_conv& real_path, int flags, fhandler_base *fh)
-{
-  if (real_path.error)
-    {
-      set_errno (real_path.error);
-      return -1;
-    }
-
-  if (!real_path.exists ())
-    {
-      set_errno (ENOENT);
-      return -1;
-    }
-
-  if (!(flags & (R_OK | W_OK | X_OK)))
-    return 0;
-
-  if (real_path.is_fs_special ())
-    /* short circuit */;
-  else if (real_path.has_attribute (FILE_ATTRIBUTE_READONLY) && (flags & W_OK))
-    {
-      set_errno (EACCES);
-      return -1;
-    }
-  else if (real_path.has_acls () && allow_ntsec)
-    return check_file_access (real_path, flags);
-
-  struct __stat64 st;
-  int r = fh ? fh->fstat (&st) : stat_worker (real_path, &st, 0);
-  if (r)
-    return -1;
-  r = -1;
-  if (flags & R_OK)
-    {
-      if (st.st_uid == myself->uid)
-	{
-	  if (!(st.st_mode & S_IRUSR))
-	    goto done;
-	}
-      else if (st.st_gid == myself->gid)
-	{
-	  if (!(st.st_mode & S_IRGRP))
-	    goto done;
-	}
-      else if (!(st.st_mode & S_IROTH))
-	goto done;
-    }
-  if (flags & W_OK)
-    {
-      if (st.st_uid == myself->uid)
-	{
-	  if (!(st.st_mode & S_IWUSR))
-	    goto done;
-	}
-      else if (st.st_gid == myself->gid)
-	{
-	  if (!(st.st_mode & S_IWGRP))
-	    goto done;
-	}
-      else if (!(st.st_mode & S_IWOTH))
-	goto done;
-    }
-  if (flags & X_OK)
-    {
-      if (st.st_uid == myself->uid)
-	{
-	  if (!(st.st_mode & S_IXUSR))
-	    goto done;
-	}
-      else if (st.st_gid == myself->gid)
-	{
-	  if (!(st.st_mode & S_IXGRP))
-	    goto done;
-	}
-      else if (!(st.st_mode & S_IXOTH))
-	goto done;
-    }
-  r = 0;
-done:
-  if (r)
-    set_errno (EACCES);
-  return r;
-}
-
-extern "C" int
-access (const char *fn, int flags)
-{
-  // flags were incorrectly specified
-  if (flags & ~(F_OK|R_OK|W_OK|X_OK))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  path_conv pc (fn, PC_SYM_FOLLOW | PC_FULL, stat_suffixes);
-  return access_worker (pc, flags);
-}
-
-extern "C" int
-rename (const char *oldpath, const char *newpath)
-{
-  int res = 0;
-  char *lnk_suffix = NULL;
-
-  path_conv real_old (oldpath, PC_SYM_NOFOLLOW);
-
-  if (real_old.error)
-    {
-      syscall_printf ("-1 = rename (%s, %s)", oldpath, newpath);
-      set_errno (real_old.error);
-      return -1;
-    }
-
-  path_conv real_new (newpath, PC_SYM_NOFOLLOW);
-
-  /* Shortcut hack. */
-  char new_lnk_buf[CYG_MAX_PATH + 5];
-  if (real_old.is_lnk_symlink () && !real_new.error && !real_new.case_clash)
-    {
-      strcpy (new_lnk_buf, newpath);
-      strcat (new_lnk_buf, ".lnk");
-      newpath = new_lnk_buf;
-      real_new.check (newpath, PC_SYM_NOFOLLOW);
-    }
-
-  if (real_new.error || real_new.case_clash)
-    {
-      syscall_printf ("-1 = rename (%s, %s)", oldpath, newpath);
-      set_errno (real_new.case_clash ? ECASECLASH : real_new.error);
-      return -1;
-    }
-
-  if (!writable_directory (real_old) || !writable_directory (real_new))
-    {
-      syscall_printf ("-1 = rename (%s, %s)", oldpath, newpath);
-      set_errno (EACCES);
-      return -1;
-    }
-
-  if (!real_old.exists ()) /* file to move doesn't exist */
-    {
-       syscall_printf ("file to move doesn't exist");
-       set_errno (ENOENT);
-       return (-1);
-    }
-
-  /* Destination file exists and is read only, change that or else
-     the rename won't work. */
-  if (real_new.has_attribute (FILE_ATTRIBUTE_READONLY))
-    SetFileAttributes (real_new, (DWORD) real_new & ~FILE_ATTRIBUTE_READONLY);
-
-  /* Shortcut hack No. 2, part 1 */
-  if (!real_old.issymlink () && !real_new.error && real_new.is_lnk_symlink ()
-      && (lnk_suffix = strrchr (real_new.get_win32 (), '.')))
-     *lnk_suffix = '\0';
-
-  if (!MoveFile (real_old, real_new))
-    res = -1;
-
-  if (res == 0 || (GetLastError () != ERROR_ALREADY_EXISTS
-		   && GetLastError () != ERROR_FILE_EXISTS))
-    goto done;
-
-  if (wincap.has_move_file_ex ())
-    {
-      if (MoveFileEx (real_old.get_win32 (), real_new.get_win32 (),
-		      MOVEFILE_REPLACE_EXISTING))
-	res = 0;
-    }
-  else
-    {
-      syscall_printf ("try win95 hack");
-      for (int i = 0; i < 2; i++)
-	{
-	  if (!DeleteFileA (real_new.get_win32 ()) &&
-	      GetLastError () != ERROR_FILE_NOT_FOUND)
-	    {
-	      syscall_printf ("deleting %s to be paranoid",
-			      real_new.get_win32 ());
-	      break;
-	    }
-	  else if (MoveFile (real_old.get_win32 (), real_new.get_win32 ()))
-	    {
-	      res = 0;
-	      break;
-	    }
-	}
-    }
-
-done:
-  if (res)
-    {
-      __seterrno ();
-      /* Reset R/O attributes if neccessary. */
-      if (real_new.has_attribute (FILE_ATTRIBUTE_READONLY))
-	SetFileAttributes (real_new, real_new);
-    }
-  else
-    {
-      /* make the new file have the permissions of the old one */
-      DWORD attr = real_old;
-#ifdef HIDDEN_DOT_FILES
-      char *c = strrchr (real_old.get_win32 (), '\\');
-      if ((c && c[1] == '.') || *real_old.get_win32 () == '.')
-	attr &= ~FILE_ATTRIBUTE_HIDDEN;
-      c = strrchr (real_new.get_win32 (), '\\');
-      if ((c && c[1] == '.') || *real_new.get_win32 () == '.')
-	attr |= FILE_ATTRIBUTE_HIDDEN;
-#endif
-      SetFileAttributes (real_new, attr);
-
-      /* Shortcut hack, No. 2, part 2 */
-      /* if the new filename was an existing shortcut, remove it now if the
-	 new filename is equal to the shortcut name without .lnk suffix. */
-      if (lnk_suffix)
-	{
-	  *lnk_suffix = '.';
-	  DeleteFile (real_new);
-	}
-    }
-
-  syscall_printf ("%d = rename (%s, %s)", res, (char *) real_old,
-		  (char *) real_new);
-
-  return res;
-}
-
-extern "C" int
-system (const char *cmdstring)
-{
-  pthread_testcancel ();
-
-  if (check_null_empty_str_errno (cmdstring))
-    return -1;
-
-  int res;
-  const char* command[4];
-
-  if (cmdstring == (const char *) NULL)
-    return 1;
-
-  command[0] = "sh";
-  command[1] = "-c";
-  command[2] = cmdstring;
-  command[3] = (const char *) NULL;
-
-  if ((res = spawnvp (_P_SYSTEM, "sh", command)) == -1)
-    {
-      // when exec fails, return value should be as if shell
-      // executed exit (127)
-      res = 127;
-    }
-
-  return res;
-}
-
-extern "C" int
-setdtablesize (int size)
-{
-  if (size <= (int)cygheap->fdtab.size || cygheap->fdtab.extend (size - cygheap->fdtab.size))
-    return 0;
-
-  return -1;
-}
-
-extern "C" int
-getdtablesize ()
-{
-  return cygheap->fdtab.size > OPEN_MAX ? cygheap->fdtab.size : OPEN_MAX;
-}
-
-extern "C" size_t
-getpagesize ()
-{
-  if (!system_info.dwPageSize)
-    GetSystemInfo (&system_info);
-  return (int) system_info.dwPageSize;
-}
-
-size_t
-getshmlba ()
-{
-  if (!system_info.dwAllocationGranularity)
-    GetSystemInfo (&system_info);
-  return system_info.dwAllocationGranularity;
-}
-
-static int
-check_posix_perm (const char *fname, int v)
-{
-  /* Windows 95/98/ME don't support file system security at all. */
-  if (!wincap.has_security ())
-    return 0;
-
-  /* ntea is ok for supporting permission bits but it doesn't support
-     full POSIX security settings. */
-  if (v == _PC_POSIX_PERMISSIONS && allow_ntea)
-    return 1;
-
-  if (!allow_ntsec)
-    return 0;
-
-  char *root = rootdir (strcpy ((char *)alloca (strlen (fname)), fname));
-
-  if (!allow_smbntsec
-      && ((root[0] == '\\' && root[1] == '\\')
-	  || GetDriveType (root) == DRIVE_REMOTE))
-    return 0;
-
-  DWORD vsn, len, flags;
-  if (!GetVolumeInformation (root, NULL, 0, &vsn, &len, &flags, NULL, 16))
-    {
-      __seterrno ();
-      return 0;
-    }
-
-  return (flags & FS_PERSISTENT_ACLS) ? 1 : 0;
-}
-
-/* FIXME: not all values are correct... */
-extern "C" long int
-fpathconf (int fd, int v)
-{
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    return -1;
-  switch (v)
-    {
-    case _PC_LINK_MAX:
-      return _POSIX_LINK_MAX;
-    case _PC_MAX_CANON:
-    case _PC_MAX_INPUT:
-      if (isatty (fd))
-	return _POSIX_MAX_CANON;
-      else
-	{
-	  set_errno (EBADF);
-	  return -1;
-	}
-    case _PC_NAME_MAX:
-    case _PC_PATH_MAX:
-      return PATH_MAX;
-    case _PC_PIPE_BUF:
-      return PIPE_BUF;
-    case _PC_CHOWN_RESTRICTED:
-    case _PC_NO_TRUNC:
-      return -1;
-    case _PC_VDISABLE:
-      if (cfd->is_tty ())
-	return -1;
-      else
-	{
-	  set_errno (EBADF);
-	  return -1;
-	}
-    case _PC_POSIX_PERMISSIONS:
-    case _PC_POSIX_SECURITY:
-      if (cfd->get_device () == FH_FS)
-	return check_posix_perm (cfd->get_win32_name (), v);
-      set_errno (EINVAL);
-      return -1;
-    default:
-      set_errno (EINVAL);
-      return -1;
-    }
-}
-
-extern "C" long int
-pathconf (const char *file, int v)
-{
-  switch (v)
-    {
-    case _PC_PATH_MAX:
-      if (check_null_empty_str_errno (file))
-	  return -1;
-      return PATH_MAX - strlen (file);
-    case _PC_NAME_MAX:
-      return PATH_MAX;
-    case _PC_LINK_MAX:
-      return _POSIX_LINK_MAX;
-    case _PC_MAX_CANON:
-    case _PC_MAX_INPUT:
-      return _POSIX_MAX_CANON;
-    case _PC_PIPE_BUF:
-      return PIPE_BUF;
-    case _PC_CHOWN_RESTRICTED:
-    case _PC_NO_TRUNC:
-      return -1;
-    case _PC_VDISABLE:
-      return -1;
-    case _PC_POSIX_PERMISSIONS:
-    case _PC_POSIX_SECURITY:
-      {
-	path_conv full_path (file, PC_SYM_FOLLOW | PC_FULL);
-	if (full_path.error)
-	  {
-	    set_errno (full_path.error);
-	    return -1;
-	  }
-	if (full_path.is_auto_device ())
-	  {
-	    set_errno (EINVAL);
-	    return -1;
-	  }
-	return check_posix_perm (full_path, v);
-      }
-    default:
-      set_errno (EINVAL);
-      return -1;
-    }
-}
-
-extern "C" char *
-ttyname (int fd)
-{
-  char *name;
-  cygheap_fdget cfd (fd);
-  if (cfd < 0 || !cfd->is_tty ())
-    return 0;
-  name = (char *) (cfd->ttyname ());
-  debug_printf ("returning %s", name);
-  return name;
-}
-
-extern "C" char *
-ctermid (char *str)
-{
-  static NO_COPY char buf[16];
-  if (str == NULL)
-    str = buf;
-  if (!real_tty_attached (myself))
-    strcpy (str, "/dev/conin");
-  else
-    __small_sprintf (str, "/dev/tty%d", myself->ctty);
-  return str;
-}
-
-/* Tells stdio if it should do the cr/lf conversion for this file */
-extern "C" int
-_cygwin_istext_for_stdio (int fd)
-{
-  syscall_printf ("_cygwin_istext_for_stdio (%d)", fd);
-  if (CYGWIN_VERSION_OLD_STDIO_CRLF_HANDLING)
-    {
-      syscall_printf (" _cifs: old API");
-      return 0; /* we do it for old apps, due to getc/putc macros */
-    }
-
-  cygheap_fdget cfd (fd, false, false);
-  if (cfd < 0)
-    {
-      syscall_printf (" _cifs: fd not open");
-      return 0;
-    }
-
-  if (cfd->get_device () != FH_FS)
-    {
-      syscall_printf (" _cifs: fd not disk file");
-      return 0;
-    }
-
-  if (cfd->get_w_binary () || cfd->get_r_binary ())
-    {
-      syscall_printf (" _cifs: get_*_binary");
-      return 0;
-    }
-
-  syscall_printf ("_cygwin_istext_for_stdio says yes");
-  return 1;
-}
-
-/* internal newlib function */
-extern "C" int _fwalk (struct _reent *ptr, int (*function) (FILE *));
-
-static int setmode_mode;
-static int setmode_file;
-
-static int
-setmode_helper (FILE *f)
-{
-  if (fileno (f) != setmode_file)
-    return 0;
-  syscall_printf ("setmode: file was %s now %s",
-		 f->_flags & __SCLE ? "text" : "raw",
-		 setmode_mode & O_TEXT ? "text" : "raw");
-  if (setmode_mode & O_TEXT)
-    f->_flags |= __SCLE;
-  else
-    f->_flags &= ~__SCLE;
-  return 0;
-}
-
-extern "C" int
-getmode (int fd)
-{
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    return -1;
-
-  return cfd->get_flags () & (O_BINARY | O_TEXT);
-}
-
-/* Set a file descriptor into text or binary mode, returning the
-   previous mode.  */
-
-extern "C" int
-setmode (int fd, int mode)
-{
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    return -1;
-  if (mode != O_BINARY  && mode != O_TEXT && mode != 0)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  /* Note that we have no way to indicate the case that writes are
-     binary but not reads, or vice-versa.  These cases can arise when
-     using the tty or console interface.  People using those
-     interfaces should not use setmode.  */
-
-  int res;
-  if (cfd->get_w_binary () && cfd->get_r_binary ())
-    res = O_BINARY;
-  else if (cfd->get_w_binset () && cfd->get_r_binset ())
-    res = O_TEXT;	/* Specifically set O_TEXT */
-  else
-    res = 0;
-
-  if (!mode)
-    cfd->reset_to_open_binmode ();
-  else
-    cfd->set_flags ((cfd->get_flags () & ~(O_TEXT | O_BINARY)) | mode);
-
-  if (_cygwin_istext_for_stdio (fd))
-    setmode_mode = O_TEXT;
-  else
-    setmode_mode = O_BINARY;
-  setmode_file = fd;
-  _fwalk (_REENT, setmode_helper);
-
-  syscall_printf ("setmode (%d<%s>, %p) returns %s", fd, cfd->get_name (),
-		  mode, res & O_TEXT ? "text" : "binary");
-  return res;
-}
-
-extern "C" int
-ftruncate64 (int fd, _off64_t length)
-{
-  int res = -1;
-
-  if (length < 0)
-    set_errno (EINVAL);
-  else
-    {
-      cygheap_fdget cfd (fd);
-      if (cfd >= 0)
-	{
-	  HANDLE h = cygheap->fdtab[fd]->get_handle ();
-
-	  if (cfd->get_handle ())
-	    {
-	      /* remember curr file pointer location */
-	      _off64_t prev_loc = cfd->lseek (0, SEEK_CUR);
-
-	      cfd->lseek (length, SEEK_SET);
-	      if (!SetEndOfFile (h))
-		__seterrno ();
-	      else
-		res = 0;
-
-	      /* restore original file pointer location */
-	      cfd->lseek (prev_loc, SEEK_SET);
-	    }
-	}
-    }
-
-  syscall_printf ("%d = ftruncate (%d, %D)", res, fd, length);
-  return res;
-}
-
-/* ftruncate: P96 5.6.7.1 */
-extern "C" int
-ftruncate (int fd, _off_t length)
-{
-  return ftruncate64 (fd, (_off64_t)length);
-}
-
-/* truncate: Provided by SVR4 and 4.3+BSD.  Not part of POSIX.1 or XPG3 */
-extern "C" int
-truncate64 (const char *pathname, _off64_t length)
-{
-  int fd;
-  int res = -1;
-
-  fd = open (pathname, O_RDWR);
-
-  if (fd == -1)
-    set_errno (EBADF);
-  else
-    {
-      res = ftruncate64 (fd, length);
-      close (fd);
-    }
-  syscall_printf ("%d = truncate (%s, %d)", res, pathname, length);
-
-  return res;
-}
-
-/* truncate: Provided by SVR4 and 4.3+BSD.  Not part of POSIX.1 or XPG3 */
-extern "C" int
-truncate (const char *pathname, _off_t length)
-{
-  return truncate64 (pathname, (_off64_t)length);
-}
-
-extern "C" long
-get_osfhandle (int fd)
-{
-  long res;
-
-  cygheap_fdget cfd (fd);
-  if (cfd >= 0)
-    res = (long) cfd->get_handle ();
-  else
-    res = -1;
-
-  syscall_printf ("%d = get_osfhandle (%d)", res, fd);
-  return res;
-}
-
-extern "C" int
-statfs (const char *fname, struct statfs *sfs)
-{
-  if (!sfs)
-    {
-      set_errno (EFAULT);
-      return -1;
-    }
-
-  path_conv full_path (fname, PC_SYM_FOLLOW | PC_FULL);
-  const char *root = full_path.root_dir ();
-
-  syscall_printf ("statfs %s", root);
-
-  /* GetDiskFreeSpaceEx must be called before GetDiskFreeSpace on
-     WinME, to avoid the MS KB 314417 bug */
-  ULARGE_INTEGER availb, freeb, totalb;
-  BOOL status = GetDiskFreeSpaceEx (root, &availb, &totalb, &freeb);
-
-  DWORD spc, bps, availc, freec, totalc;
-
-  if (!GetDiskFreeSpace (root, &spc, &bps, &freec, &totalc))
-    {
-      __seterrno ();
-      return -1;
-    }
-
-  if (status)
-    {
-      availc = availb.QuadPart / (spc*bps);
-      totalc = totalb.QuadPart / (spc*bps);
-      freec = freeb.QuadPart / (spc*bps);
-    }
-  else
-    availc = freec;
-
-  DWORD vsn, maxlen, flags;
-
-  if (!GetVolumeInformation (root, NULL, 0, &vsn, &maxlen, &flags, NULL, 0))
-    {
-      __seterrno ();
-      return -1;
-    }
-  sfs->f_type = flags;
-  sfs->f_bsize = spc*bps;
-  sfs->f_blocks = totalc;
-  sfs->f_bavail = availc;
-  sfs->f_bfree = freec;
-  sfs->f_files = -1;
-  sfs->f_ffree = -1;
-  sfs->f_fsid = vsn;
-  sfs->f_namelen = maxlen;
-  return 0;
-}
-
-extern "C" int
-fstatfs (int fd, struct statfs *sfs)
-{
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    return -1;
-  return statfs (cfd->get_name (), sfs);
-}
-
-/* setpgid: POSIX 4.3.3.1 */
-extern "C" int
-setpgid (pid_t pid, pid_t pgid)
-{
-  int res = -1;
-  if (pid == 0)
-    pid = getpid ();
-  if (pgid == 0)
-    pgid = pid;
-
-  if (pgid < 0)
-    {
-      set_errno (EINVAL);
-      goto out;
-    }
-  else
-    {
-      pinfo p (pid, PID_MAP_RW);
-      if (!p)
-	{
-	  set_errno (ESRCH);
-	  goto out;
-	}
-      /* A process may only change the process group of itself and its children */
-      if (p == myself || p->ppid == myself->pid)
-	{
-	  p->pgid = pgid;
-	  if (p->pid != p->pgid)
-	    p->set_has_pgid_children (0);
-	  res = 0;
-	}
-      else
-	{
-	  set_errno (EPERM);
-	  goto out;
-	}
-    }
-out:
-  syscall_printf ("pid %d, pgid %d, res %d", pid, pgid, res);
-  return res;
-}
-
-extern "C" pid_t
-getpgid (pid_t pid)
-{
-  if (pid == 0)
-    pid = getpid ();
-
-  pinfo p (pid);
-  if (p == 0)
-    {
-      set_errno (ESRCH);
-      return -1;
-    }
-  return p->pgid;
-}
-
-extern "C" int
-setpgrp (void)
-{
-  return setpgid (0, 0);
-}
-
-extern "C" pid_t
-getpgrp (void)
-{
-  return getpgid (0);
-}
-
-extern "C" char *
-ptsname (int fd)
-{
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    return 0;
-  return (char *) (cfd->ptsname ());
-}
-
-/* FIXME: what is this? */
-extern "C" int __declspec(dllexport)
-regfree ()
-{
-  return 0;
-}
-
-static int __stdcall
-mknod_worker (const char *path, mode_t type, mode_t mode, _major_t major,
-	      _minor_t minor)
-{
-  char buf[sizeof (":\\00000000:00000000:00000000") + CYG_MAX_PATH];
-  sprintf (buf, ":\\%x:%x:%x", major, minor,
-	   type | (mode & (S_IRWXU | S_IRWXG | S_IRWXO)));
-  return symlink_worker (buf, path, true, true);
-}
-
-extern "C" int
-mknod32 (const char *path, mode_t mode, __dev32_t dev)
-{
-  if (check_null_empty_str_errno (path))
-    return -1;
-
-  if (strlen (path) >= CYG_MAX_PATH)
-    return -1;
-
-  path_conv w32path (path, PC_SYM_NOFOLLOW | PC_FULL);
-  if (w32path.exists ())
-    {
-      set_errno (EEXIST);
-      return -1;
-    }
-
-  mode_t type = mode & S_IFMT;
-  _major_t major = _major (dev);
-  _minor_t minor = _minor (dev);
-  switch (type)
-    {
-    case S_IFCHR:
-    case S_IFBLK:
-      break;
-
-    case S_IFIFO:
-      major = _major (FH_FIFO);
-      minor = _minor (FH_FIFO);
-      break;
-
-    case 0:
-    case S_IFREG:
-      {
-	int fd = open (path, O_CREAT, mode);
-	if (fd < 0)
-	  return -1;
-	close (fd);
-	return 0;
-      }
-
-    default:
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  return mknod_worker (w32path, type, mode, major, minor);
-}
-
-extern "C" int
-mknod (const char *_path, mode_t mode, __dev16_t dev)
-{
-  return mknod32 (_path, mode, (__dev32_t) dev);
-}
-
-extern "C" int
-mkfifo (const char *_path, mode_t mode)
-{
-  set_errno (ENOSYS);	// FIXME
-  return -1;
-}
-
-/* seteuid: standards? */
-extern "C" int
-seteuid32 (__uid32_t uid)
-{
-  debug_printf ("uid: %u myself->gid: %u", uid, myself->gid);
-
-  if (uid == myself->uid && !cygheap->user.groups.ischanged)
-    {
-      debug_printf ("Nothing happens");
-      return 0;
-    }
-
-  cygsid usersid;
-  user_groups &groups = cygheap->user.groups;
-  HANDLE ptok, new_token = INVALID_HANDLE_VALUE;
-  struct passwd * pw_new;
-  bool token_is_internal, issamesid;
-  char dacl_buf[MAX_DACL_LEN (5)];
-  TOKEN_DEFAULT_DACL tdacl = {};
-
-  pw_new = internal_getpwuid (uid);
-  if (!wincap.has_security () && pw_new)
-    goto success_9x;
-  if (!usersid.getfrompw (pw_new))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  RevertToSelf ();
-  if (!OpenProcessToken (hMainProc, TOKEN_QUERY | TOKEN_ADJUST_DEFAULT, &ptok))
-    {
-      __seterrno ();
-      goto failed_ptok;;
-    }
-
-  /* Verify if the process token is suitable. */
-  if (verify_token (ptok, usersid, groups))
-    new_token = ptok;
-  /* Verify if the external token is suitable */
-  else if (cygheap->user.external_token != INVALID_HANDLE_VALUE
-	   && verify_token (cygheap->user.external_token, usersid, groups))
-    new_token = cygheap->user.external_token;
-  /* Verify if the current token (internal or former external) is suitable */
-  else if (cygheap->user.current_token != INVALID_HANDLE_VALUE
-	   && cygheap->user.current_token != cygheap->user.external_token
-	   && verify_token (cygheap->user.current_token, usersid, groups,
-			    &token_is_internal))
-    new_token = cygheap->user.current_token;
-  /* Verify if the internal token is suitable */
-  else if (cygheap->user.internal_token != INVALID_HANDLE_VALUE
-	   && cygheap->user.internal_token != cygheap->user.current_token
-	   && verify_token (cygheap->user.internal_token, usersid, groups,
-			    &token_is_internal))
-    new_token = cygheap->user.internal_token;
-
-  debug_printf ("Found token %d", new_token);
-
-  /* Set process def dacl to allow access to impersonated token */
-  if (sec_acl ((PACL) dacl_buf, true, true, usersid))
-    {
-      tdacl.DefaultDacl = (PACL) dacl_buf;
-      if (!SetTokenInformation (ptok, TokenDefaultDacl,
-				&tdacl, sizeof dacl_buf))
-	debug_printf ("SetTokenInformation"
-		      "(TokenDefaultDacl): %E");
-    }
-
-  /* If no impersonation token is available, try to
-     authenticate using NtCreateToken () or subauthentication. */
-  if (new_token == INVALID_HANDLE_VALUE)
-    {
-      new_token = create_token (usersid, groups, pw_new);
-      if (new_token == INVALID_HANDLE_VALUE)
-	{
-	  /* create_token failed. Try subauthentication. */
-	  debug_printf ("create token failed, try subauthentication.");
-	  new_token = subauth (pw_new);
-	  if (new_token == INVALID_HANDLE_VALUE)
-	    goto failed;
-	}
-      /* Keep at most one internal token */
-      if (cygheap->user.internal_token != INVALID_HANDLE_VALUE)
-	CloseHandle (cygheap->user.internal_token);
-      cygheap->user.internal_token = new_token;
-    }
-  if (new_token != ptok)
-    {
-      /* Avoid having HKCU use default user */
-      load_registry_hive (usersid);
-
-      /* Try setting owner to same value as user. */
-      if (!SetTokenInformation (new_token, TokenOwner,
-				&usersid, sizeof usersid))
-	debug_printf ("SetTokenInformation(user.token, "
-		      "TokenOwner): %E");
-      /* Try setting primary group in token to current group */
-      if (!SetTokenInformation (new_token, TokenPrimaryGroup,
-				&groups.pgsid, sizeof (cygsid)))
-	debug_printf ("SetTokenInformation(user.token, "
-		      "TokenPrimaryGroup): %E");
-      /* Try setting default DACL */
-      if (tdacl.DefaultDacl
-	  && !SetTokenInformation (new_token, TokenDefaultDacl,
-				   &tdacl, sizeof (tdacl)))
-	debug_printf ("SetTokenInformation (TokenDefaultDacl): %E");
-    }
-
-  CloseHandle (ptok);
-  issamesid = (usersid == cygheap->user.sid ());
-  cygheap->user.set_sid (usersid);
-  cygheap->user.current_token = new_token == ptok ? INVALID_HANDLE_VALUE
-						  : new_token;
-  if (!issamesid) /* MS KB 199190 */
-    RegCloseKey (HKEY_CURRENT_USER);
-  cygheap->user.reimpersonate ();
-  if (!issamesid)
-    user_shared_initialize (true);
-
-success_9x:
-  cygheap->user.set_name (pw_new->pw_name);
-  myself->uid = uid;
-  groups.ischanged = FALSE;
-  return 0;
-
-failed:
-  CloseHandle (ptok);
-failed_ptok:
-  cygheap->user.reimpersonate ();
-  return -1;
-}
-
-extern "C" int
-seteuid (__uid16_t uid)
-{
-  return seteuid32 (uid16touid32 (uid));
-}
-
-/* setuid: POSIX 4.2.2.1 */
-extern "C" int
-setuid32 (__uid32_t uid)
-{
-  int ret = seteuid32 (uid);
-  if (!ret)
-    cygheap->user.real_uid = myself->uid;
-  debug_printf ("real: %d, effective: %d", cygheap->user.real_uid, myself->uid);
-  return ret;
-}
-
-extern "C" int
-setuid (__uid16_t uid)
-{
-  return setuid32 (uid16touid32 (uid));
-}
-
-extern "C" int
-setreuid32 (__uid32_t ruid, __uid32_t euid)
-{
-  int ret = 0;
-  bool tried = false;
-  __uid32_t old_euid = myself->uid;
-
-  if (ruid != ILLEGAL_UID && cygheap->user.real_uid != ruid && euid != ruid)
-    tried = !(ret = seteuid32 (ruid));
-  if (!ret && euid != ILLEGAL_UID)
-    ret = seteuid32 (euid);
-  if (tried && (ret || euid == ILLEGAL_UID) && seteuid32 (old_euid))
-    system_printf ("Cannot restore original euid %u", old_euid);
-  if (!ret && ruid != ILLEGAL_UID)
-    cygheap->user.real_uid = ruid;
-  debug_printf ("real: %u, effective: %u", cygheap->user.real_uid, myself->uid);
-  return ret;
-}
-
-extern "C" int
-setreuid (__uid16_t ruid, __uid16_t euid)
-{
-  return setreuid32 (uid16touid32 (ruid), uid16touid32 (euid));
-}
-
-/* setegid: from System V.  */
-extern "C" int
-setegid32 (__gid32_t gid)
-{
-  debug_printf ("new egid: %u current: %u", gid, myself->gid);
-
-  if (gid == myself->gid || !wincap.has_security ())
-    {
-      myself->gid = gid;
-      return 0;
-    }
-
-  user_groups * groups = &cygheap->user.groups;
-  cygsid gsid;
-  HANDLE ptok;
-  struct __group32 * gr = internal_getgrgid (gid);
-
-  if (!gsid.getfromgr (gr))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  myself->gid = gid;
-
-  groups->update_pgrp (gsid);
-  /* If impersonated, update primary group and revert */
-  if (cygheap->user.issetuid ())
-    {
-      if (!SetTokenInformation (cygheap->user.token (),
-				TokenPrimaryGroup,
-				&gsid, sizeof gsid))
-	debug_printf ("SetTokenInformation(thread, "
-		      "TokenPrimaryGroup): %E");
-      RevertToSelf ();
-    }
-  if (!OpenProcessToken (hMainProc, TOKEN_ADJUST_DEFAULT, &ptok))
-    debug_printf ("OpenProcessToken(): %E");
-  else
-    {
-      if (!SetTokenInformation (ptok, TokenPrimaryGroup,
-				&gsid, sizeof gsid))
-	debug_printf ("SetTokenInformation(process, "
-		      "TokenPrimaryGroup): %E");
-      CloseHandle (ptok);
-    }
-  if (cygheap->user.issetuid ()
-      && !ImpersonateLoggedOnUser (cygheap->user.token ()))
-    system_printf ("Impersonating in setegid failed: %E");
-  return 0;
-}
-
-extern "C" int
-setegid (__gid16_t gid)
-{
-  return setegid32 (gid16togid32 (gid));
-}
-
-/* setgid: POSIX 4.2.2.1 */
-extern "C" int
-setgid32 (__gid32_t gid)
-{
-  int ret = setegid32 (gid);
-  if (!ret)
-    cygheap->user.real_gid = myself->gid;
-  return ret;
-}
-
-extern "C" int
-setgid (__gid16_t gid)
-{
-  int ret = setegid32 (gid16togid32 (gid));
-  if (!ret)
-    cygheap->user.real_gid = myself->gid;
-  return ret;
-}
-
-extern "C" int
-setregid32 (__gid32_t rgid, __gid32_t egid)
-{
-  int ret = 0;
-  bool tried = false;
-  __gid32_t old_egid = myself->gid;
-
-  if (rgid != ILLEGAL_GID && cygheap->user.real_gid != rgid && egid != rgid)
-    tried = !(ret = setegid32 (rgid));
-  if (!ret && egid != ILLEGAL_GID)
-    ret = setegid32 (egid);
-  if (tried && (ret || egid == ILLEGAL_GID) && setegid32 (old_egid))
-    system_printf ("Cannot restore original egid %u", old_egid);
-  if (!ret && rgid != ILLEGAL_GID)
-    cygheap->user.real_gid = rgid;
-  debug_printf ("real: %u, effective: %u", cygheap->user.real_gid, myself->gid);
-  return ret;
-}
-
-extern "C" int
-setregid (__gid16_t rgid, __gid16_t egid)
-{
-  return setregid32 (gid16togid32 (rgid), gid16togid32 (egid));
-}
-
-/* chroot: privileged Unix system call.  */
-/* FIXME: Not privileged here. How should this be done? */
-extern "C" int
-chroot (const char *newroot)
-{
-  path_conv path (newroot, PC_SYM_FOLLOW | PC_FULL | PC_POSIX);
-
-  int ret;
-  if (path.error)
-    ret = -1;
-  else if (!path.exists ())
-    {
-      set_errno (ENOENT);
-      ret = -1;
-    }
-  else if (!path.isdir ())
-    {
-      set_errno (ENOTDIR);
-      ret = -1;
-    }
-  else
-    {
-      cygheap->root.set (path.normalized_path, path);
-      ret = 0;
-    }
-
-  syscall_printf ("%d = chroot (%s)", ret ? get_errno () : 0,
-				      newroot ? newroot : "NULL");
-  if (!path.normalized_path_size && path.normalized_path)
-    cfree (path.normalized_path);
-  return ret;
-}
-
-extern "C" int
-creat (const char *path, mode_t mode)
-{
-  return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
-}
-
-extern "C" void
-__assertfail ()
-{
-  exit (99);
-}
-
-extern "C" int
-getw (FILE *fp)
-{
-  int w, ret;
-  ret = fread (&w, sizeof (int), 1, fp);
-  return ret != 1 ? EOF : w;
-}
-
-extern "C" int
-putw (int w, FILE *fp)
-{
-  int ret;
-  ret = fwrite (&w, sizeof (int), 1, fp);
-  if (feof (fp) || ferror (fp))
-    return -1;
-  return 0;
-}
-
-extern "C" int
-wcscmp (const wchar_t *s1, const wchar_t *s2)
-{
-  while (*s1  && *s1 == *s2)
-    {
-      s1++;
-      s2++;
-    }
-
-  return (* (unsigned short *) s1) - (* (unsigned short *) s2);
-}
-
-extern "C" size_t
-wcslen (const wchar_t *s1)
-{
-  int l = 0;
-  while (s1[l])
-    l++;
-  return l;
-}
-
-/* FIXME: to do this right, maybe work out the usoft va_list machine
-   and use wsvprintfW instead?
-*/
-extern "C" int
-wprintf (const char *fmt, ...)
-{
-  va_list ap;
-  int ret;
-
-  va_start (ap, fmt);
-  ret = vprintf (fmt, ap);
-  va_end (ap);
-  return ret;
-}
-
-extern "C" int
-vhangup ()
-{
-  set_errno (ENOSYS);
-  return -1;
-}
-
-extern "C" _PTR
-memccpy (_PTR out, const _PTR in, int c, size_t len)
-{
-  const char *inc = (char *) in;
-  char *outc = (char *) out;
-
-  while (len)
-    {
-      char x = *inc++;
-      *outc++ = x;
-      if (x == c)
-	return outc;
-      len --;
-    }
-  return 0;
-}
-
-extern "C" int
-nice (int incr)
-{
-  DWORD priority[] =
-    {
-      IDLE_PRIORITY_CLASS,
-      IDLE_PRIORITY_CLASS,
-      NORMAL_PRIORITY_CLASS,
-      HIGH_PRIORITY_CLASS,
-      REALTIME_PRIORITY_CLASS,
-      REALTIME_PRIORITY_CLASS
-    };
-  int curr = 2;
-
-  switch (GetPriorityClass (hMainProc))
-    {
-      case IDLE_PRIORITY_CLASS:
-	curr = 1;
-	break;
-      case NORMAL_PRIORITY_CLASS:
-	curr = 2;
-	break;
-      case HIGH_PRIORITY_CLASS:
-	curr = 3;
-	break;
-      case REALTIME_PRIORITY_CLASS:
-	curr = 4;
-	break;
-    }
-  if (incr > 0)
-    incr = -1;
-  else if (incr < 0)
-    incr = 1;
-
-  if (SetPriorityClass (hMainProc, priority[curr + incr]) == FALSE)
-    {
-      __seterrno ();
-      return -1;
-    }
-
-  return 0;
-}
-
-/*
- * Find the first bit set in I.
- */
-
-extern "C" int
-ffs (int i)
-{
-  static const unsigned char table[] =
-    {
-      0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
-      6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
-      7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-      7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
-      8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-      8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-      8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-      8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
-    };
-  unsigned long int a;
-  unsigned long int x = i & -i;
-
-  a = x <= 0xffff ? (x <= 0xff ? 0 : 8) : (x <= 0xffffff ?  16 : 24);
-
-  return table[x >> a] + a;
-}
-
-static void
-locked_append (int fd, const void * buf, size_t size)
-{
-  struct __flock64 lock_buffer = {F_WRLCK, SEEK_SET, 0, 0, 0};
-  int count = 0;
-
-  do
-    if ((lock_buffer.l_start = lseek64 (fd, 0, SEEK_END)) != (_off64_t)-1
-	&& fcntl_worker (fd, F_SETLKW, &lock_buffer) != -1)
-      {
-	if (lseek64 (fd, 0, SEEK_END) != (_off64_t)-1)
-	  write (fd, buf, size);
-	lock_buffer.l_type = F_UNLCK;
-	fcntl_worker (fd, F_SETLK, &lock_buffer);
-	break;
-      }
-  while (count++ < 1000
-	 && (errno == EACCES || errno == EAGAIN)
-	 && !usleep (1000));
-}
-
-extern "C" void
-updwtmp (const char *wtmp_file, const struct utmp *ut)
-{
-  int fd;
-
-  if ((fd = open (wtmp_file, O_WRONLY | O_BINARY, 0)) >= 0)
-    {
-      locked_append (fd, ut, sizeof *ut);
-      close (fd);
-    }
-}
-
-extern "C" void
-logwtmp (const char *line, const char *user, const char *host)
-{
-  struct utmp ut;
-  memset (&ut, 0, sizeof ut);
-  ut.ut_type = USER_PROCESS;
-  ut.ut_pid = getpid ();
-  if (line)
-    strncpy (ut.ut_line, line, sizeof ut.ut_line);
-  time (&ut.ut_time);
-  if (user)
-    strncpy (ut.ut_user, user, sizeof ut.ut_user);
-  if (host)
-    strncpy (ut.ut_host, host, sizeof ut.ut_host);
-  updwtmp (_PATH_WTMP, &ut);
-}
-
-extern "C" void
-login (struct utmp *ut)
-{
-  pututline (ut);
-  endutent ();
-  updwtmp (_PATH_WTMP, ut);
-}
-
-extern "C" int
-logout (char *line)
-{
-  struct utmp ut_buf, *ut;
-
-  memset (&ut_buf, 0, sizeof ut_buf);
-  strncpy (ut_buf.ut_line, line, sizeof ut_buf.ut_line);
-  setutent ();
-  ut = getutline (&ut_buf);
-
-  if (ut)
-    {
-      ut->ut_type = DEAD_PROCESS;
-      memset (ut->ut_user, 0, sizeof ut->ut_user);
-      memset (ut->ut_host, 0, sizeof ut->ut_host);
-      time (&ut->ut_time);
-      debug_printf ("set logout time for %s", line);
-      pututline (ut);
-      endutent ();
-      return 1;
-    }
-  return 0;
-}
-
-static int utmp_fd = -1;
-static bool utmp_readonly = false;
-static char *utmp_file = (char *) _PATH_UTMP;
-
-static void
-internal_setutent (bool force_readwrite)
-{
-  if (force_readwrite && utmp_readonly)
-    endutent ();
-  if (utmp_fd < 0)
-    {
-      utmp_fd = open (utmp_file, O_RDWR | O_BINARY);
-      /* If open fails, we assume an unprivileged process (who?).  In this
-	 case we try again for reading only unless the process calls
-	 pututline() (==force_readwrite) in which case opening just fails. */
-      if (utmp_fd < 0 && !force_readwrite)
-	{
-	  utmp_fd = open (utmp_file, O_RDONLY | O_BINARY);
-	  if (utmp_fd >= 0)
-	    utmp_readonly = true;
-	}
-    }
-  else
-    lseek (utmp_fd, 0, SEEK_SET);
-}
-
-extern "C" void
-setutent ()
-{
-  internal_setutent (false);
-}
-
-extern "C" void
-endutent ()
-{
-  if (utmp_fd >= 0)
-    {
-      close (utmp_fd);
-      utmp_fd = -1;
-      utmp_readonly = false;
-    }
-}
-
-extern "C" void
-utmpname (_CONST char *file)
-{
-  if (check_null_empty_str (file))
-    {
-      debug_printf ("Invalid file");
-      return;
-    }
-  endutent ();
-  utmp_file = strdup (file);
-  debug_printf ("New UTMP file: %s", utmp_file);
-}
-
-/* Note: do not make NO_COPY */
-static struct utmp utmp_data_buf[16];
-static unsigned utix = 0;
-#define nutdbuf (sizeof (utmp_data_buf) / sizeof (utmp_data_buf[0]))
-#define utmp_data ({ \
-  if (utix > nutdbuf) \
-    utix = 0; \
-  utmp_data_buf + utix++; \
-})
-
-extern "C" struct utmp *
-getutent ()
-{
-  if (utmp_fd < 0)
-    {
-      internal_setutent (false);
-      if (utmp_fd < 0)
-	return NULL;
-    }
-
-  utmp *ut = utmp_data;
-  if (read (utmp_fd, ut, sizeof *ut) != sizeof *ut)
-    return NULL;
-  return ut;
-}
-
-extern "C" struct utmp *
-getutid (struct utmp *id)
-{
-  if (check_null_invalid_struct_errno (id))
-    return NULL;
-  if (utmp_fd < 0)
-    {
-      internal_setutent (false);
-      if (utmp_fd < 0)
-	return NULL;
-    }
-
-  utmp *ut = utmp_data;
-  while (read (utmp_fd, ut, sizeof *ut) == sizeof *ut)
-    {
-      switch (id->ut_type)
-	{
-	case RUN_LVL:
-	case BOOT_TIME:
-	case OLD_TIME:
-	case NEW_TIME:
-	  if (id->ut_type == ut->ut_type)
-	    return ut;
-	  break;
-	case INIT_PROCESS:
-	case LOGIN_PROCESS:
-	case USER_PROCESS:
-	case DEAD_PROCESS:
-	   if (strncmp (id->ut_id, ut->ut_id, UT_IDLEN) == 0)
-	    return ut;
-	  break;
-	default:
-	  return NULL;
-	}
-    }
-  return NULL;
-}
-
-extern "C" struct utmp *
-getutline (struct utmp *line)
-{
-  if (check_null_invalid_struct_errno (line))
-    return NULL;
-  if (utmp_fd < 0)
-    {
-      internal_setutent (false);
-      if (utmp_fd < 0)
-	return NULL;
-    }
-
-  utmp *ut = utmp_data;
-  while (read (utmp_fd, ut, sizeof *ut) == sizeof *ut)
-    if ((ut->ut_type == LOGIN_PROCESS ||
-	 ut->ut_type == USER_PROCESS) &&
-	!strncmp (ut->ut_line, line->ut_line, sizeof (ut->ut_line)))
-      return ut;
-
-  return NULL;
-}
-
-extern "C" void
-pututline (struct utmp *ut)
-{
-  if (check_null_invalid_struct (ut))
-    return;
-  internal_setutent (true);
-  if (utmp_fd < 0)
-    {
-      debug_printf ("error: utmp_fd %d", utmp_fd);
-      return;
-    }
-  debug_printf ("ut->ut_type %d, ut->ut_pid %d, ut->ut_line '%s', ut->ut_id '%s'\n",
-		ut->ut_type, ut->ut_pid, ut->ut_line, ut->ut_id);
-  debug_printf ("ut->ut_user '%s', ut->ut_host '%s'\n",
-		ut->ut_user, ut->ut_host);
-
-  struct utmp *u;
-  if ((u = getutid (ut)))
-    {
-      lseek (utmp_fd, -sizeof *ut, SEEK_CUR);
-      write (utmp_fd, ut, sizeof *ut);
-    }
-  else
-    locked_append (utmp_fd, ut, sizeof *ut);
-}
-
-extern "C"
-long gethostid (void)
-{
-  unsigned data[13] = {0x92895012,
-		       0x10293412,
-		       0x29602018,
-		       0x81928167,
-		       0x34601329,
-		       0x75630198,
-		       0x89860395,
-		       0x62897564,
-		       0x00194362,
-		       0x20548593,
-		       0x96839102,
-		       0x12219854,
-		       0x00290012};
-
-  bool has_cpuid = false;
-
-  DWORD opmask = SetThreadAffinityMask (GetCurrentThread (), 1);
-  if (!opmask)
-    debug_printf ("SetThreadAffinityMask to 1 failed, %E");
-
-  if (!can_set_flag (0x00040000))
-    debug_printf ("386 processor - no cpuid");
-  else
-    {
-      debug_printf ("486 processor");
-      if (can_set_flag (0x00200000))
-	{
-	  debug_printf ("processor supports CPUID instruction");
-	  has_cpuid = true;
-	}
-      else
-	debug_printf ("processor does not support CPUID instruction");
-    }
-  if (has_cpuid)
-    {
-      unsigned maxf, unused[3];
-      cpuid (&maxf, &unused[0], &unused[1], &unused[2], 0);
-      maxf &= 0xffff;
-      if (maxf >= 1)
-	{
-	  unsigned features;
-	  cpuid (&data[0], &unused[0], &unused[1], &features, 1);
-	  if (features & (1 << 18))
-	    {
-	      debug_printf ("processor has psn");
-	      if (maxf >= 3)
-		{
-		  cpuid (&unused[0], &unused[1], &data[1], &data[2], 3);
-		  debug_printf ("Processor PSN: %04x-%04x-%04x-%04x-%04x-%04x",
-				data[0] >> 16, data[0] & 0xffff, data[2] >> 16, data[2] & 0xffff, data[1] >> 16, data[1] & 0xffff);
-		}
-	    }
-	  else
-	    debug_printf ("processor does not have psn");
-	}
-    }
-
-  UUID Uuid;
-  RPC_STATUS status = UuidCreateSequential (&Uuid);
-  if (GetLastError () == ERROR_PROC_NOT_FOUND)
-    status = UuidCreate (&Uuid);
-  if (status == RPC_S_OK)
-    {
-      data[4] = *(unsigned *)&Uuid.Data4[2];
-      data[5] = *(unsigned short *)&Uuid.Data4[6];
-      // Unfortunately Windows will sometimes pick a virtual Ethernet card
-      // e.g. VMWare Virtual Ethernet Adaptor
-      debug_printf ("MAC address of first Ethernet card: %02x:%02x:%02x:%02x:%02x:%02x",
-		    Uuid.Data4[2], Uuid.Data4[3], Uuid.Data4[4],
-		    Uuid.Data4[5], Uuid.Data4[6], Uuid.Data4[7]);
-    }
-  else
-    {
-      debug_printf ("no Ethernet card installed");
-    }
-
-  reg_key key (HKEY_LOCAL_MACHINE, KEY_READ, "SOFTWARE", "Microsoft", "Windows", "CurrentVersion", NULL);
-  key.get_string ("ProductId", (char *)&data[6], 24, "00000-000-0000000-00000");
-  debug_printf ("Windows Product ID: %s", (char *)&data[6]);
-
-  /* Contrary to MSDN, NT4 requires the second argument
-     or a STATUS_ACCESS_VIOLATION is generated */
-  ULARGE_INTEGER availb;
-  GetDiskFreeSpaceEx ("C:\\", &availb, (PULARGE_INTEGER) &data[11], NULL);
-  if (GetLastError () == ERROR_PROC_NOT_FOUND)
-    GetDiskFreeSpace ("C:\\", NULL, NULL, NULL, (DWORD *)&data[11]);
-
-  debug_printf ("hostid entropy: %08x %08x %08x %08x "
-				"%08x %08x %08x %08x "
-				"%08x %08x %08x %08x "
-				"%08x",
-				data[0], data[1],
-				data[2], data[3],
-				data[4], data[5],
-				data[6], data[7],
-				data[8], data[9],
-				data[10], data[11],
-				data[12]);
-
-  long hostid = 0x40291372;
-  // a random hashing algorithm
-  // dependancy on md5 is probably too costly
-  for (int i=0;i<13;i++)
-    hostid ^= ((data[i] << (i << 2)) | (data[i] >> (32 - (i << 2))));
-
-  if (opmask && !SetThreadAffinityMask (GetCurrentThread (), opmask))
-    debug_printf ("SetThreadAffinityMask to %p failed, %E", opmask);
-
-  debug_printf ("hostid: %08x", hostid);
-
-  return hostid;
-}
-
-#define ETC_SHELLS "/etc/shells"
-static int shell_index;
-static struct __sFILE64 *shell_fp;
-
-extern "C" char *
-getusershell ()
-{
-  /* List of default shells if no /etc/shells exists, defined as on Linux.
-     FIXME: SunOS has a far longer list, containing all shells which
-     might be shipped with the OS.  Should we do the same for the Cygwin
-     distro, adding bash, tcsh, ksh, pdksh and zsh?  */
-  static NO_COPY const char *def_shells[] = {
-    "/bin/sh",
-    "/bin/csh",
-    "/usr/bin/sh",
-    "/usr/bin/csh",
-    NULL
-  };
-  static char buf[CYG_MAX_PATH];
-  int ch, buf_idx;
-
-  if (!shell_fp && !(shell_fp = fopen64 (ETC_SHELLS, "rt")))
-    {
-      if (def_shells[shell_index])
-	return strcpy (buf, def_shells[shell_index++]);
-      return NULL;
-    }
-  /* Skip white space characters. */
-  while ((ch = getc (shell_fp)) != EOF && isspace (ch))
-    ;
-  /* Get each non-whitespace character as part of the shell path as long as
-     it fits in buf. */
-  for (buf_idx = 0;
-       ch != EOF && !isspace (ch) && buf_idx < CYG_MAX_PATH;
-       buf_idx++, ch = getc (shell_fp))
-    buf[buf_idx] = ch;
-  /* Skip any trailing non-whitespace character not fitting in buf.  If the
-     path is longer than CYG_MAX_PATH, it's invalid anyway. */
-  while (ch != EOF && !isspace (ch))
-    ch = getc (shell_fp);
-  if (buf_idx)
-    {
-      buf[buf_idx] = '\0';
-      return buf;
-    }
-  return NULL;
-}
-
-extern "C" void
-setusershell ()
-{
-  if (shell_fp)
-    fseek (shell_fp, 0L, SEEK_SET);
-  shell_index = 0;
-}
-
-extern "C" void
-endusershell ()
-{
-  if (shell_fp)
-    fclose (shell_fp);
-  shell_index = 0;
-}
diff --git a/winsup/cygwin/sysconf.cc b/winsup/cygwin/sysconf.cc
deleted file mode 100644
index b5a2b383d..000000000
--- a/winsup/cygwin/sysconf.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-/* sysconf.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <time.h>
-#include <limits.h>
-#include <ntdef.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-#include "ntdll.h"
-
-/* sysconf: POSIX 4.8.1.1 */
-/* Allows a portable app to determine quantities of resources or
-   presence of an option at execution time. */
-long int
-sysconf (int in)
-{
-  switch (in)
-    {
-      case _SC_ARG_MAX:
-	/* FIXME: what's the right value?  _POSIX_ARG_MAX is only 4K */
-	return 1048576;
-      case _SC_OPEN_MAX:
-	{
-	  long max = getdtablesize ();
-	  if (max < OPEN_MAX)
-	    max = OPEN_MAX;
-	  return max;
-	}
-      case _SC_PAGESIZE:
-	return getpagesize ();
-      case _SC_CLK_TCK:
-	return CLOCKS_PER_SEC;
-      case _SC_JOB_CONTROL:
-	return _POSIX_JOB_CONTROL;
-      case _SC_CHILD_MAX:
-	return CHILD_MAX;
-      case _SC_NGROUPS_MAX:
-	return NGROUPS_MAX;
-      case _SC_SAVED_IDS:
-	return _POSIX_SAVED_IDS;
-      case _SC_LOGIN_NAME_MAX:
-      case _SC_GETPW_R_SIZE_MAX:
-      case _SC_GETGR_R_SIZE_MAX:
-	return 16*1024;
-      case _SC_VERSION:
-	return _POSIX_VERSION;
-#if 0	/* FIXME -- unimplemented */
-      case _SC_TZNAME_MAX:
-	return _POSIX_TZNAME_MAX;
-      case _SC_STREAM_MAX:
-	return _POSIX_STREAM_MAX;
-#endif
-      case _SC_NPROCESSORS_CONF:
-      case _SC_NPROCESSORS_ONLN:
-	if (!wincap.supports_smp ())
-	  return 1;
-	/*FALLTHRU*/
-      case _SC_PHYS_PAGES:
-	if (wincap.supports_smp ())
-	  {
-	    NTSTATUS ret;
-	    SYSTEM_BASIC_INFORMATION sbi;
-	    if ((ret = NtQuerySystemInformation (SystemBasicInformation,
-						   (PVOID) &sbi,
-						 sizeof sbi, NULL))
-		  != STATUS_SUCCESS)
-	      {
-		__seterrno_from_win_error (RtlNtStatusToDosError (ret));
-		debug_printf ("NtQuerySystemInformation: ret = %d, "
-			      "Dos(ret) = %d",
-			      ret, RtlNtStatusToDosError (ret));
-		return -1;
-	      }
-	    switch (in)
-	      {
-	      case _SC_NPROCESSORS_CONF:
-	       return sbi.NumberProcessors;
-	      case _SC_NPROCESSORS_ONLN:
-	       {
-		 int i = 0;
-		 do
-		   if (sbi.ActiveProcessors & 1)
-		     i++;
-		 while (sbi.ActiveProcessors >>= 1);
-		 return i;
-	       }
-	      case _SC_PHYS_PAGES:
-		return sbi.NumberOfPhysicalPages;
-	      }
-	  }
-	break;
-      case _SC_AVPHYS_PAGES:
-        if (wincap.supports_smp ())
-	  {
-	    NTSTATUS ret;
-	    SYSTEM_PERFORMANCE_INFORMATION spi;
-	    if ((ret = NtQuerySystemInformation (SystemPerformanceInformation,
-						   (PVOID) &spi,
-						 sizeof spi, NULL))
-		  != STATUS_SUCCESS)
-	      {
-		__seterrno_from_win_error (RtlNtStatusToDosError (ret));
-		debug_printf ("NtQuerySystemInformation: ret = %d, "
-			      "Dos(ret) = %d",
-			      ret, RtlNtStatusToDosError (ret));
-		return -1;
-	      }
-	    return spi.AvailablePages;
-	  }
-    }
-
-  /* Invalid input or unimplemented sysconf name */
-  set_errno (EINVAL);
-  return -1;
-}
diff --git a/winsup/cygwin/syslog.cc b/winsup/cygwin/syslog.cc
deleted file mode 100644
index c0a34ca02..000000000
--- a/winsup/cygwin/syslog.cc
+++ /dev/null
@@ -1,420 +0,0 @@
-/* syslog.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <syslog.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-#include "thread.h"
-
-/* FIXME: These should probably be in the registry. */
-/* FIXME: The Win95 path should be whatever slash is */
-
-#define WIN95_EVENT_LOG_PATH "C:\\CYGWIN_SYSLOG.TXT"
-#define CYGWIN_LOG_NAME "Cygwin"
-
-/*
- * Utility function to help enable moving
- * WIN95_EVENT_LOG_PATH into registry later.
- */
-static const char *
-get_win95_event_log_path ()
-{
-  return WIN95_EVENT_LOG_PATH;
-}
-
-/* FIXME: For MT safe code these will need to be replaced */
-
-#ifdef _MT_SAFE
-#define process_ident  _reent_winsup ()->_process_ident
-#define process_logopt  _reent_winsup ()->_process_logopt
-#define process_facility  _reent_winsup ()->_process_facility
-  /* Default priority logmask */
-#define process_logmask _reent_winsup ()->_process_logmask
-#else
-static char *process_ident = 0;
-static int process_logopt = 0;
-static int process_facility = 0;
-
-/* Default priority logmask */
-static int process_logmask = LOG_UPTO (LOG_DEBUG);
-#endif
-
-/*
- * openlog: save the passed args. Don't open the
- * system log (NT) or log file (95) yet.
- */
-extern "C" void
-openlog (const char *ident, int logopt, int facility)
-{
-    debug_printf ("openlog called with (%s, %d, %d)",
-		       ident ? ident : "<NULL>", logopt, facility);
-
-    if (process_ident != NULL)
-      {
-	free (process_ident);
-	process_ident = 0;
-      }
-    if (ident)
-      {
-	process_ident = (char *) malloc (strlen (ident) + 1);
-	if (process_ident == NULL)
-	  {
-	    debug_printf ("failed to allocate memory for process_ident");
-	    return;
-	  }
-	strcpy (process_ident, ident);
-      }
-    process_logopt = logopt;
-    process_facility = facility;
-}
-
-/* setlogmask: set the log priority mask and return previous mask.
-   If maskpri is zero, just return previous. */
-int
-setlogmask (int maskpri)
-{
-  if (maskpri == 0)
-    return process_logmask;
-
-  int old_mask = process_logmask;
-  process_logmask = maskpri & LOG_PRIMASK;
-
-  return old_mask;
-}
-
-/* Private class used to handle formatting of syslog message */
-/* It is named pass_handler because it does a two-pass handling of log
-   strings.  The first pass counts the length of the string, and the second
-   one builds the string. */
-
-class pass_handler
-{
-  private:
-    FILE *fp_;
-    char *message_;
-    int total_len_;
-
-    void shutdown ();
-
-    /* Explicitly disallow copies */
-    pass_handler (const pass_handler &);
-    pass_handler & operator = (const pass_handler &);
-
-  public:
-    pass_handler ();
-    ~pass_handler ();
-
-    int initialize (int);
-
-    int print (const char *,...);
-    int print_va (const char *, va_list);
-    char *get_message () const { return message_; }
-    void set_message (char *s) { message_ = s; *message_ = '\0'; }
-};
-
-pass_handler::pass_handler () : fp_ (0), message_ (0), total_len_ (0)
-{
-  ;
-}
-
-pass_handler::~pass_handler ()
-{
-  shutdown ();
-}
-
-void
-pass_handler::shutdown ()
-{
-  if (fp_ != NULL)
-    {
-      fclose (fp_);
-      fp_ = 0;
-    }
-}
-
-int
-pass_handler::initialize (int pass_number)
-{
-    shutdown ();
-    if (pass_number)
-      return total_len_ + 1;
-
-    fp_ = fopen ("/dev/null", "wb");
-    if (fp_ == NULL)
-      {
-	debug_printf ("failed to open /dev/null");
-	return -1;
-      }
-    total_len_ = 0;
-    return 0;
-}
-
-int
-pass_handler::print (const char *fmt, ...)
-{
-    va_list ap;
-    va_start (ap, fmt);
-    int ret = print_va (fmt, ap);
-    va_end (ap);
-    return ret;
-}
-
-int
-pass_handler::print_va (const char *fmt, va_list list)
-{
-    if (fp_ != NULL)
-      {
-	int len = vfprintf (fp_, fmt, list);
-	if (len < 0)
-	  return -1;
-	total_len_ += len;
-	return 0;
-      }
-    else if (message_ != NULL)
-      {
-	char *printpos = &message_[strlen (message_)];
-	vsprintf (printpos, fmt, list);
-	return 0;
-      }
-    debug_printf ("FAILURE ! fp_ and message_ both 0!! ");
-    return -1;
-}
-
-/*
- * syslog: creates the log message and writes to system
- * log (NT) or log file (95). FIXME. WinNT log error messages
- * don't look pretty, but in order to fix this we have to
- * embed resources in the code and tell the NT registry
- * where we are, blech (what happens if we move ?).
- * We could, however, add the resources in Cygwin and
- * always point to that.
- */
-
-extern "C" void
-vsyslog (int priority, const char *message, va_list ap)
-{
-    debug_printf ("%x %s", priority, message);
-    /* If the priority fails the current mask, reject */
-    if (((priority & LOG_PRIMASK) & process_logmask) == 0)
-      {
-	debug_printf ("failing message %x due to priority mask %x",
-		      priority, process_logmask);
-	return;
-      }
-
-    /* Translate %m in the message to error text */
-    char *errtext = strerror (get_errno ());
-    int errlen = strlen (errtext);
-    int numfound = 0;
-
-    for (const char *cp = message; *cp; cp++)
-      if (*cp == '%' && cp[1] == 'm')
-	numfound++;
-
-    char *newmessage = (char *) alloca (strlen (message) +
-					(errlen * numfound) + 1);
-
-    if (newmessage == NULL)
-      {
-	debug_printf ("failed to allocate newmessage");
-	return;
-      }
-
-    char *dst = newmessage;
-    for (const char *cp2 = message; *cp2; cp2++)
-      if (*cp2 == '%' && cp2[1] == 'm')
-	{
-	  cp2++;
-	  strcpy (dst, errtext);
-	  while (*dst)
-	    dst++;
-	}
-      else
-	*dst++ = *cp2;
-
-    *dst = '\0';
-    message = newmessage;
-
-    /* Work out the priority type - we ignore the facility for now.. */
-    WORD eventType;
-    switch (LOG_PRI (priority))
-      {
-      case LOG_EMERG:
-      case LOG_ALERT:
-      case LOG_CRIT:
-      case LOG_ERR:
-	eventType = EVENTLOG_ERROR_TYPE;
-	break;
-      case LOG_WARNING:
-	eventType = EVENTLOG_WARNING_TYPE;
-	break;
-      case LOG_NOTICE:
-      case LOG_INFO:
-      case LOG_DEBUG:
-	eventType = EVENTLOG_INFORMATION_TYPE;
-	break;
-      default:
-	eventType = EVENTLOG_ERROR_TYPE;
-	break;
-      }
-
-    /* We need to know how long the buffer needs to be.
-       The only legal way I can see of doing this is to
-       do a vfprintf to /dev/null, and count the bytes
-       output, then do it again to a malloc'ed string. This
-       is ugly, slow, but prevents core dumps :-).
-     */
-    pass_handler pass;
-    for (int pass_number = 0; pass_number < 2; ++pass_number)
-      {
-	int n = pass.initialize (pass_number);
-	if (n == -1)
-	  return;
-	else if (n > 0)
-	  pass.set_message ((char *) alloca (n));
-
-	/* Deal with ident_string */
-	if (process_ident != NULL)
-	  {
-	    if (pass.print ("%s : ", process_ident) == -1)
-	      return;
-	  }
-	if (process_logopt & LOG_PID)
-	  {
-	    if (pass.print ("PID %u : ", getpid ()) == -1)
-	      return;
-	  }
-
-	if (!wincap.has_eventlog ())
-	  {
-	    /* Add a priority string - not needed for systems with
-	       eventlog capability. */
-	    switch (LOG_PRI (priority))
-	      {
-	     case LOG_EMERG:
-	       pass.print ("%s : ", "LOG_EMERG");
-	       break;
-	     case LOG_ALERT:
-	       pass.print ("%s : ", "LOG_ALERT");
-	       break;
-	     case LOG_CRIT:
-	       pass.print ("%s : ", "LOG_CRIT");
-	       break;
-	      case LOG_ERR:
-		pass.print ("%s : ", "LOG_ERR");
-		break;
-	      case LOG_WARNING:
-		pass.print ("%s : ", "LOG_WARNING");
-		break;
-	     case LOG_NOTICE:
-	       pass.print ("%s : ", "LOG_NOTICE");
-	       break;
-	      case LOG_INFO:
-		pass.print ("%s : ", "LOG_INFO");
-	       break;
-	     case LOG_DEBUG:
-	       pass.print ("%s : ", "LOG_DEBUG");
-		break;
-	      default:
-		pass.print ("%s : ", "LOG_ERR");
-		break;
-	      }
-	  }
-
-	/* Print out the variable part */
-	if (pass.print_va (message, ap) == -1)
-	  return;
-
-      }
-    const char *msg_strings[1];
-    char *total_msg = pass.get_message ();
-    int len = strlen (total_msg);
-    if (len != 0 && (total_msg[len - 1] == '\n'))
-      total_msg[len - 1] = '\0';
-
-    msg_strings[0] = total_msg;
-
-    if (wincap.has_eventlog ())
-      {
-	/* For NT, open the event log and send the message */
-	HANDLE hEventSrc = RegisterEventSourceA (NULL, (process_ident != NULL) ?
-					 process_ident : CYGWIN_LOG_NAME);
-	if (hEventSrc == NULL)
-	  {
-	    debug_printf ("RegisterEventSourceA failed with %E");
-	    return;
-	  }
-	if (!ReportEventA (hEventSrc, eventType, 0, 0,
-			   cygheap->user.sid (), 1, 0, msg_strings, NULL))
-	  debug_printf ("ReportEventA failed with %E");
-	DeregisterEventSource (hEventSrc);
-      }
-    else
-      {
-	/* Under Windows 95, append the message to the log file */
-	char timestamp[24];
-	time_t ctime;
-	FILE *fp = fopen (get_win95_event_log_path (), "a");
-	if (fp == NULL)
-	  {
-	    debug_printf ("failed to open file %s",
-			  get_win95_event_log_path ());
-	    return;
-	  }
-	strftime (timestamp, sizeof timestamp, "%Y-%m-%d %H:%M:%S : ",
-		  localtime (&(ctime = time (NULL))));
-
-	/* Now to prevent several syslog messages from being
-	   interleaved, we must lock the first byte of the file
-	   This works on Win32 even if we created the file above.
-	*/
-	HANDLE fHandle = cygheap->fdtab[fileno (fp)]->get_handle ();
-	for (int i = 0;; i++)
-	  if (LockFile (fHandle, 0, 0, 1, 0) == FALSE)
-	    if (i == 3)
-	      {
-		debug_printf ("failed to lock file %s", get_win95_event_log_path ());
-		fclose (fp);
-		return;
-	      }
-	    else
-	      usleep (1000);
-	  else
-	    break;
-	fputs (timestamp, fp);
-	fputs (msg_strings[0], fp);
-	fputc ('\n', fp);
-	fclose (fp);
-      }
-}
-
-extern "C" void
-syslog (int priority, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  vsyslog (priority, message, ap);
-  va_end (ap);
-}
-
-extern "C" void
-closelog (void)
-{
-  ;
-}
diff --git a/winsup/cygwin/termios.cc b/winsup/cygwin/termios.cc
deleted file mode 100644
index e046984b6..000000000
--- a/winsup/cygwin/termios.cc
+++ /dev/null
@@ -1,305 +0,0 @@
-/* termios.cc: termios for WIN32.
-
-   Copyright 1996, 1997, 1998, 2000, 2001, 2002 Red Hat, Inc.
-
-   Written by Doug Evans and Steve Chamberlain of Cygnus Support
-   dje@cygnus.com, sac@cygnus.com
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <signal.h>
-#include <stdlib.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "cygwin/version.h"
-#include "perprocess.h"
-#include "sigproc.h"
-#include <sys/termios.h>
-
-/* tcsendbreak: POSIX 7.2.2.1 */
-extern "C" int
-tcsendbreak (int fd, int duration)
-{
-  int res = -1;
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    goto out;
-
-  if (!cfd->is_tty ())
-    set_errno (ENOTTY);
-  else if ((res = cfd->bg_check (-SIGTTOU)) > bg_eof)
-    res = cfd->tcsendbreak (duration);
-
-out:
-  syscall_printf ("%d = tcsendbreak (%d, %d)", res, fd, duration);
-  return res;
-}
-
-/* tcdrain: POSIX 7.2.2.1 */
-extern "C" int
-tcdrain (int fd)
-{
-  int res = -1;
-
-  termios_printf ("tcdrain");
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    goto out;
-
-  if (!cfd->is_tty ())
-    set_errno (ENOTTY);
-  else if ((res = cfd->bg_check (-SIGTTOU)) > bg_eof)
-    res = cfd->tcdrain ();
-
-out:
-  syscall_printf ("%d = tcdrain (%d)", res, fd);
-  return res;
-}
-
-/* tcflush: POSIX 7.2.2.1 */
-extern "C" int
-tcflush (int fd, int queue)
-{
-  int res = -1;
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    goto out;
-
-  if (!cfd->is_tty ())
-    set_errno (ENOTTY);
-  else if (queue != TCIFLUSH && queue != TCOFLUSH && queue != TCIOFLUSH)
-      set_errno (EINVAL);
-  else if ((res = cfd->bg_check (-SIGTTOU)) > bg_eof)
-    res = cfd->tcflush (queue);
-
-out:
-  termios_printf ("%d = tcflush (%d, %d)", res, fd, queue);
-  return res;
-}
-
-/* tcflow: POSIX 7.2.2.1 */
-extern "C" int
-tcflow (int fd, int action)
-{
-  int res = -1;
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    goto out;
-
-  if (!cfd->is_tty ())
-    set_errno (ENOTTY);
-  else if ((res = cfd->bg_check (-SIGTTOU)) > bg_eof)
-    res = cfd->tcflow (action);
-
-out:
-  syscall_printf ("%d = tcflow (%d, %d)", res, fd, action);
-  return res;
-}
-
-/* tcsetattr: POSIX96 7.2.1.1 */
-extern "C" int
-tcsetattr (int fd, int a, const struct termios *t)
-{
-  int res;
-  t = __tonew_termios (t);
-  int e = get_errno ();
-
-  while (1)
-    {
-      res = -1;
-      cygheap_fdget cfd (fd);
-      if (cfd < 0)
-	{
-	  e = get_errno ();
-	  break;
-	}
-
-      if (!cfd->is_tty ())
-	{
-	  e = ENOTTY;
-	  break;
-	}
-
-      res = cfd->bg_check (-SIGTTOU);
-
-      switch (res)
-	{
-	case bg_eof:
-	  e = get_errno ();
-	  break;
-	case bg_ok:
-	  if (cfd.isopen ())
-	    res = cfd->tcsetattr (a, t);
-	  e = get_errno ();
-	  break;
-	case bg_signalled:
-	  if (call_signal_handler_now ())
-	    continue;
-	  res = -1;
-	  /* fall through intentionally */
-	default:
-	  e = get_errno ();
-	  break;
-	}
-      break;
-    }
-
-  set_errno (e);
-  termios_printf ("iflag %p, oflag %p, cflag %p, lflag %p, VMIN %d, VTIME %d",
-	t->c_iflag, t->c_oflag, t->c_cflag, t->c_lflag, t->c_cc[VMIN],
-	t->c_cc[VTIME]);
-  termios_printf ("%d = tcsetattr (%d, %d, %x)", res, fd, a, t);
-  return res;
-}
-
-/* tcgetattr: POSIX 7.2.1.1 */
-extern "C" int
-tcgetattr (int fd, struct termios *in_t)
-{
-  int res = -1;
-  struct termios *t = __makenew_termios (in_t);
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    /* saw an error */;
-  else if (!cfd->is_tty ())
-    set_errno (ENOTTY);
-  else if ((res = cfd->tcgetattr (t)) == 0)
-    (void) __toapp_termios (in_t, t);
-
-  if (res)
-    termios_printf ("%d = tcgetattr (%d, %p)", res, fd, in_t);
-  else
-    termios_printf ("iflag %x, oflag %x, cflag %x, lflag %x, VMIN %d, VTIME %d",
-	  t->c_iflag, t->c_oflag, t->c_cflag, t->c_lflag, t->c_cc[VMIN],
-	  t->c_cc[VTIME]);
-
-  return res;
-}
-
-/* tcgetpgrp: POSIX 7.2.3.1 */
-extern "C" int
-tcgetpgrp (int fd)
-{
-  int res = -1;
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    /* saw an error */;
-  else if (!cfd->is_tty ())
-    set_errno (ENOTTY);
-  else
-    res = cfd->tcgetpgrp ();
-
-  termios_printf ("%d = tcgetpgrp (%d)", res, fd);
-  return res;
-}
-
-/* tcsetpgrp: POSIX 7.2.4.1 */
-extern "C" int
-tcsetpgrp (int fd, pid_t pgid)
-{
-  int res = -1;
-
-  cygheap_fdget cfd (fd);
-  if (cfd < 0)
-    /* saw an error */;
-  else if (!cfd->is_tty ())
-    set_errno (ENOTTY);
-  else
-    res = cfd->tcsetpgrp (pgid);
-
-  termios_printf ("%d = tcsetpgrp (%d, %x)", res, fd, pgid);
-  return res;
-}
-
-/* NIST PCTS requires not macro-only implementation */
-#undef cfgetospeed
-#undef cfgetispeed
-#undef cfsetospeed
-#undef cfsetispeed
-
-/* cfgetospeed: POSIX96 7.1.3.1 */
-extern "C" speed_t
-cfgetospeed (struct termios *tp)
-{
-  return __tonew_termios (tp)->c_ospeed;
-}
-
-/* cfgetispeed: POSIX96 7.1.3.1 */
-extern "C" speed_t
-cfgetispeed (struct termios *tp)
-{
-  return __tonew_termios (tp)->c_ispeed;
-}
-
-static inline int
-setspeed (speed_t &set_speed, speed_t from_speed)
-{
-  int res;
-  switch (from_speed)
-    {
-    case B0:
-    case B50:
-    case B75:
-    case B110:
-    case B134:
-    case B150:
-    case B200:
-    case B300:
-    case B600:
-    case B1200:
-    case B1800:
-    case B2400:
-    case B4800:
-    case B9600:
-    case B19200:
-    case B38400:
-    case B57600:
-    case B115200:
-    case B128000:
-    case B230400:
-    case B256000:
-      set_speed = from_speed;
-      res = 0;
-      break;
-    default:
-      set_errno (EINVAL);
-      res = -1;
-      break;
-    }
-  return res;
-}
-
-/* cfsetospeed: POSIX96 7.1.3.1 */
-extern "C" int
-cfsetospeed (struct termios *in_tp, speed_t speed)
-{
-  struct termios *tp = __tonew_termios (in_tp);
-  int res = setspeed (tp->c_ospeed, speed);
-  (void) __toapp_termios (in_tp, tp);
-  return res;
-}
-
-/* cfsetispeed: POSIX96 7.1.3.1 */
-extern "C" int
-cfsetispeed (struct termios *in_tp, speed_t speed)
-{
-  struct termios *tp = __tonew_termios (in_tp);
-  int res = setspeed (tp->c_ispeed, speed);
-  (void) __toapp_termios (in_tp, tp);
-  return res;
-}
diff --git a/winsup/cygwin/textmode.c b/winsup/cygwin/textmode.c
deleted file mode 100644
index 6d52d50f8..000000000
--- a/winsup/cygwin/textmode.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* binmode.c
-
-   Copyright 2000 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <windows.h>
-#include <sys/fcntl.h>
-#include <sys/cygwin.h>
-
-extern int _fmode;
-void
-cygwin_premain0 (int argc, char **argv, struct per_process *myself)
-{
-  _fmode &= ~_O_BINARY;
-  _fmode |= _O_TEXT;
-}
diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
deleted file mode 100644
index ca2e3bfaf..000000000
--- a/winsup/cygwin/thread.cc
+++ /dev/null
@@ -1,3355 +0,0 @@
-/* thread.cc: Locking and threading module functions
-
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Originally written by Marco Fuykschot <marco@ddi.nl>
-   Substantialy enhanced by Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* Implementation overview and caveats:
-
-   Win32 puts some contraints on what can and cannot be implemented.  Where
-   possible we work around those contrainsts.  Where we cannot work around
-   the constraints we either pretend to be conformant, or return an error
-   code.
-
-   Some caveats: PROCESS_SHARED objects while they pretend to be process
-   shared, may not actually work.  Some test cases are needed to determine
-   win32's behaviour.  My suspicion is that the win32 handle needs to be
-   opened with different flags for proper operation.
-
-   R.Collins, April 2001.  */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "winsup.h"
-#include <limits.h>
-#include "cygerrno.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <syslog.h>
-#include "pinfo.h"
-#include "sigproc.h"
-#include "perprocess.h"
-#include "security.h"
-#include "cygtls.h"
-#include <semaphore.h>
-#include <stdio.h>
-#include <sys/timeb.h>
-#include <exceptions.h>
-#include <sys/fcntl.h>
-
-extern int threadsafe;
-
-extern "C" struct _reent *
-__getreent ()
-{
-  struct __reent_t *_r =
-    (struct __reent_t *) MT_INTERFACE->reent_key.get ();
-
-  if (_r == 0)
-    {
-#ifdef _CYG_THREAD_FAILSAFE
-      system_printf ("local thread storage not inited");
-#endif
-      /* Return _impure_ptr as long as MTinterface is not initialized */
-      return _impure_ptr;
-    }
-
-  return _r->_clib;
-}
-
-struct _winsup_t *
-_reent_winsup ()
-{
-  struct __reent_t *_r =
-    (struct __reent_t *) MT_INTERFACE->reent_key.get ();
-
-  if (_r == 0)
-    {
-#ifdef _CYG_THREAD_FAILSAFE
-      system_printf ("local thread storage not inited");
-#endif
-      return NULL;
-    }
-
-  return _r->_winsup;
-}
-
-inline LPCRITICAL_SECTION
-ResourceLocks::Lock (int _resid)
-{
-#ifdef _CYG_THREAD_FAILSAFE
-  if (!inited)
-    system_printf ("lock called before initialization");
-
-  thread_printf
-    ("Get Resource lock %d ==> %p for %p , real : %d , threadid %d ", _resid,
-     &lock, user_data, myself->pid, GetCurrentThreadId ());
-#endif
-  return &lock;
-}
-
-void
-SetResourceLock (int _res_id, int _mode, const char *_function)
-{
-#ifdef _CYG_THREAD_FAILSAFE
-  thread_printf ("Set resource lock %d mode %d for %s start",
-		 _res_id, _mode, _function);
-#endif
-  EnterCriticalSection (user_data->resourcelocks->Lock (_res_id));
-
-#ifdef _CYG_THREAD_FAILSAFE
-  user_data->resourcelocks->owner = GetCurrentThreadId ();
-  user_data->resourcelocks->count++;
-#endif
-}
-
-void
-ReleaseResourceLock (int _res_id, int _mode, const char *_function)
-{
-#ifdef _CYG_THREAD_FAILSAFE
-  thread_printf ("Release resource lock %d mode %d for %s done", _res_id,
-		 _mode, _function);
-
-  AssertResourceOwner (_res_id, _mode);
-  user_data->resourcelocks->count--;
-  if (user_data->resourcelocks->count == 0)
-    user_data->resourcelocks->owner = 0;
-#endif
-
-  LeaveCriticalSection (user_data->resourcelocks->Lock (_res_id));
-}
-
-#ifdef _CYG_THREAD_FAILSAFE
-void
-AssertResourceOwner (int _res_id, int _mode)
-{
-
-  thread_printf
-    ("Assert Resource lock %d ==> for %p , real : %d , threadid %d count %d owner %d",
-     _res_id, user_data, myself->pid, GetCurrentThreadId (),
-     user_data->resourcelocks->count, user_data->resourcelocks->owner);
-  if (user_data && (user_data->resourcelocks->owner != GetCurrentThreadId ()))
-    system_printf ("assertion failed, not the resource owner");
-}
-
-#endif
-
-void
-ResourceLocks::Init ()
-{
-  InitializeCriticalSection (&lock);
-  inited = true;
-
-#ifdef _CYG_THREAD_FAILSAFE
-  owner = 0;
-  count = 0;
-#endif
-
-  thread_printf ("lock %p inited by %p , %d", &lock, user_data, myself->pid);
-}
-
-void
-ResourceLocks::Delete ()
-{
-  if (inited)
-    {
-      thread_printf ("Close Resource Locks %p ", &lock);
-      DeleteCriticalSection (&lock);
-      inited = false;
-    }
-}
-
-void
-MTinterface::Init ()
-{
-  reents._clib = _impure_ptr;
-  reents._winsup = &winsup_reent;
-  winsup_reent._process_logmask = LOG_UPTO (LOG_DEBUG);
-  reent_key.set (&reents);
-
-  pthread_mutex::init_mutex ();
-  pthread_cond::init_mutex ();
-  pthread_rwlock::init_mutex ();
-}
-
-void
-MTinterface::fixup_before_fork (void)
-{
-  pthread_key::fixup_before_fork ();
-}
-
-/* This function is called from a single threaded process */
-void
-MTinterface::fixup_after_fork (void)
-{
-  pthread_key::fixup_after_fork ();
-
-  /* As long as the signal handling not multithreaded
-     switch reents storage back to _impure_ptr for the mainthread
-     to support fork from threads other than the mainthread */
-  reents._clib = _impure_ptr;
-  reents._winsup = &winsup_reent;
-  winsup_reent._process_logmask = LOG_UPTO (LOG_DEBUG);
-  reent_key.set (&reents);
-
-  threadcount = 0;
-  pthread::init_mainthread ();
-
-  pthread::fixup_after_fork ();
-  pthread_mutex::fixup_after_fork ();
-  pthread_cond::fixup_after_fork ();
-  pthread_rwlock::fixup_after_fork ();
-  semaphore::fixup_after_fork ();
-}
-
-/* pthread calls */
-
-/* static methods */
-void
-pthread::init_mainthread ()
-{
-  pthread *thread = get_tls_self_pointer ();
-  if (!thread)
-    {
-      thread = new pthread ();
-      if (!thread)
-	api_fatal ("failed to create mainthread object");
-    }
-
-  thread->cygtls = &_my_tls;
-  _my_tls.tid = thread;
-  thread->thread_id = GetCurrentThreadId ();
-  if (!DuplicateHandle (GetCurrentProcess (), GetCurrentThread (),
-			GetCurrentProcess (), &thread->win32_obj_id,
-			0, FALSE, DUPLICATE_SAME_ACCESS))
-    api_fatal ("failed to create mainthread handle");
-  thread->set_tls_self_pointer ();
-  if (!thread->create_cancel_event ())
-    api_fatal ("couldn't create cancel event for main thread");
-  thread->postcreate ();
-}
-
-pthread *
-pthread::self ()
-{
-  pthread *thread = get_tls_self_pointer ();
-  if (thread)
-    return thread;
-  return pthread_null::get_null_pthread ();
-}
-
-void
-pthread::set_tls_self_pointer ()
-{
-  MT_INTERFACE->thread_self_key.set (this);
-}
-
-pthread *
-pthread::get_tls_self_pointer ()
-{
-  return (pthread *) MT_INTERFACE->thread_self_key.get ();
-}
-
-
-
-List<pthread> pthread::threads;
-
-/* member methods */
-pthread::pthread ():verifyable_object (PTHREAD_MAGIC), win32_obj_id (0),
-		    valid (false), suspended (false),
-		    cancelstate (0), canceltype (0), cancel_event (0),
-		    joiner (NULL), next (NULL), cleanup_stack (NULL)
-{
-  if (this != pthread_null::get_null_pthread ())
-    threads.insert (this);
-}
-
-pthread::~pthread ()
-{
-  if (win32_obj_id)
-    CloseHandle (win32_obj_id);
-  if (cancel_event)
-    CloseHandle (cancel_event);
-
-  if (this != pthread_null::get_null_pthread ())
-    threads.remove (this);
-}
-
-bool
-pthread::create_cancel_event ()
-{
-  cancel_event = ::CreateEvent (&sec_none_nih, TRUE, FALSE, NULL);
-  if (!cancel_event)
-    {
-      system_printf ("couldn't create cancel event, %E");
-      /* we need the event for correct behaviour */
-      return false;
-    }
-  return true;
-}
-
-void
-pthread::precreate (pthread_attr *newattr)
-{
-  pthread_mutex *verifyable_mutex_obj = &mutex;
-
-  /* already running ? */
-  if (win32_obj_id)
-    return;
-
-  if (newattr)
-    {
-      attr.joinable = newattr->joinable;
-      attr.contentionscope = newattr->contentionscope;
-      attr.inheritsched = newattr->inheritsched;
-      attr.stacksize = newattr->stacksize;
-    }
-
-  if (!pthread_mutex::is_good_object (&verifyable_mutex_obj))
-    {
-      thread_printf ("New thread object access mutex is not valid. this %p",
-		     this);
-      magic = 0;
-      return;
-    }
-  /* Change the mutex type to NORMAL to speed up mutex operations */
-  mutex.type = PTHREAD_MUTEX_NORMAL;
-  if (!create_cancel_event ())
-    magic = 0;
-}
-
-void
-pthread::create (void *(*func) (void *), pthread_attr *newattr,
-		 void *threadarg)
-{
-  precreate (newattr);
-  if (!magic)
-    return;
-
-  function = func;
-  arg = threadarg;
-
-  win32_obj_id = ::CreateThread (&sec_none_nih, attr.stacksize,
-				thread_init_wrapper, this, CREATE_SUSPENDED,
-				&thread_id);
-
-  if (!win32_obj_id)
-    {
-      thread_printf ("CreateThread failed: this %p, %E", this);
-      magic = 0;
-    }
-  else
-    {
-      postcreate ();
-      ResumeThread (win32_obj_id);
-    }
-}
-
-void
-pthread::postcreate ()
-{
-  valid = true;
-
-  InterlockedIncrement (&MT_INTERFACE->threadcount);
-  /* FIXME: set the priority appropriately for system contention scope */
-  if (attr.inheritsched == PTHREAD_EXPLICIT_SCHED)
-    {
-      /* FIXME: set the scheduling settings for the new thread */
-      /* sched_thread_setparam (win32_obj_id, attr.schedparam); */
-    }
-}
-
-void
-pthread::exit (void *value_ptr)
-{
-  class pthread *thread = this;
-
-  // run cleanup handlers
-  pop_all_cleanup_handlers ();
-
-  pthread_key::run_all_destructors ();
-
-  mutex.lock ();
-  // cleanup if thread is in detached state and not joined
-  if (equal (joiner, thread))
-    delete this;
-  else
-    {
-      valid = false;
-      return_ptr = value_ptr;
-      mutex.unlock ();
-    }
-
-  (_reclaim_reent) (_REENT);
-
-
-  if (InterlockedDecrement (&MT_INTERFACE->threadcount) == 0)
-    ::exit (0);
-  else
-    {
-      _my_tls.remove ();
-      ExitThread (0);
-    }
-}
-
-int
-pthread::cancel (void)
-{
-  class pthread *thread = this;
-  class pthread *self = pthread::self ();
-
-  mutex.lock ();
-
-  if (!valid)
-    {
-      mutex.unlock ();
-      return 0;
-    }
-
-  if (canceltype == PTHREAD_CANCEL_DEFERRED ||
-      cancelstate == PTHREAD_CANCEL_DISABLE)
-    {
-      // cancel deferred
-      mutex.unlock ();
-      SetEvent (cancel_event);
-      return 0;
-    }
-  else if (equal (thread, self))
-    {
-      mutex.unlock ();
-      cancel_self ();
-      return 0; // Never reached
-    }
-
-  // cancel asynchronous
-  SuspendThread (win32_obj_id);
-  if (WaitForSingleObject (win32_obj_id, 0) == WAIT_TIMEOUT)
-    {
-      CONTEXT context;
-      context.ContextFlags = CONTEXT_CONTROL;
-      GetThreadContext (win32_obj_id, &context);
-      context.Eip = (DWORD) pthread::static_cancel_self;
-      SetThreadContext (win32_obj_id, &context);
-    }
-  mutex.unlock ();
-  ResumeThread (win32_obj_id);
-
-  return 0;
-/*
-  TODO: insert  pthread_testcancel into the required functions
-  the required function list is: *indicates done, X indicates not present in cygwin.
-aio_suspend ()
-*close ()
-*creat ()
-fcntl ()
-fsync ()
-getmsg ()
-getpmsg ()
-lockf ()
-mq_receive ()
-mq_send ()
-msgrcv ()
-msgsnd ()
-msync ()
-nanosleep ()
-open ()
-*pause ()
-poll ()
-pread ()
-*pthread_cond_timedwait ()
-*pthread_cond_wait ()
-*pthread_join ()
-*pthread_testcancel ()
-putmsg ()
-putpmsg ()
-pwrite ()
-read ()
-readv ()
-select ()
-*sem_wait ()
-*sigpause ()
-*sigsuspend ()
-sigtimedwait ()
-sigwait ()
-sigwaitinfo ()
-*sleep ()
-*system ()
-tcdrain ()
-*usleep ()
-*wait ()
-*wait3()
-waitid ()
-*waitpid ()
-write ()
-writev ()
-
-the optional list is:
-catclose ()
-catgets ()
-catopen ()
-closedir ()
-closelog ()
-ctermid ()
-dbm_close ()
-dbm_delete ()
-dbm_fetch ()
-dbm_nextkey ()
-dbm_open ()
-dbm_store ()
-dlclose ()
-dlopen ()
-endgrent ()
-endpwent ()
-endutxent ()
-fclose ()
-fcntl ()
-fflush ()
-fgetc ()
-fgetpos ()
-fgets ()
-fgetwc ()
-fgetws ()
-fopen ()
-fprintf ()
-fputc ()
-fputs ()
-fputwc ()
-fputws ()
-fread ()
-freopen ()
-fscanf ()
-fseek ()
-fseeko ()
-fsetpos ()
-ftell ()
-ftello ()
-ftw ()
-fwprintf ()
-fwrite ()
-fwscanf ()
-getc ()
-getc_unlocked ()
-getchar ()
-getchar_unlocked ()
-getcwd ()
-getdate ()
-getgrent ()
-getgrgid ()
-getgrgid_r ()
-getgrnam ()
-getgrnam_r ()
-getlogin ()
-getlogin_r ()
-getpwent ()
-*getpwnam ()
-*getpwnam_r ()
-*getpwuid ()
-*getpwuid_r ()
-gets ()
-getutxent ()
-getutxid ()
-getutxline ()
-getw ()
-getwc ()
-getwchar ()
-getwd ()
-glob ()
-iconv_close ()
-iconv_open ()
-ioctl ()
-lseek ()
-mkstemp ()
-nftw ()
-opendir ()
-openlog ()
-pclose ()
-perror ()
-popen ()
-printf ()
-putc ()
-putc_unlocked ()
-putchar ()
-putchar_unlocked ()
-puts ()
-pututxline ()
-putw ()
-putwc ()
-putwchar ()
-readdir ()
-readdir_r ()
-remove ()
-rename ()
-rewind ()
-rewinddir ()
-scanf ()
-seekdir ()
-semop ()
-setgrent ()
-setpwent ()
-setutxent ()
-strerror ()
-syslog ()
-tmpfile ()
-tmpnam ()
-ttyname ()
-ttyname_r ()
-ungetc ()
-ungetwc ()
-unlink ()
-vfprintf ()
-vfwprintf ()
-vprintf ()
-vwprintf ()
-wprintf ()
-wscanf ()
-
-Note, that for fcntl (), for any value of the cmd argument.
-
-And we must not introduce cancellation points anywhere else that's part of the posix or
-opengroup specs.
- */
-}
-
-void
-pthread::testcancel (void)
-{
-  if (cancelstate == PTHREAD_CANCEL_DISABLE)
-    return;
-
-  if (WaitForSingleObject (cancel_event, 0) == WAIT_OBJECT_0)
-    cancel_self ();
-}
-
-void
-pthread::static_cancel_self (void)
-{
-  pthread::self ()->cancel_self ();
-}
-
-
-DWORD
-pthread::cancelable_wait (HANDLE object, DWORD timeout, const bool do_cancel)
-{
-  DWORD res;
-  HANDLE wait_objects[2];
-  pthread_t thread = self ();
-
-  if (!is_good_object (&thread) || thread->cancelstate == PTHREAD_CANCEL_DISABLE)
-    return WaitForSingleObject (object, timeout);
-
-  // Do not change the wait order
-  // The object must have higher priority than the cancel event,
-  // because WaitForMultipleObjects will return the smallest index
-  // if both objects are signaled
-  wait_objects[0] = object;
-  wait_objects[1] = thread->cancel_event;
-
-  res = WaitForMultipleObjects (2, wait_objects, FALSE, timeout);
-  if (do_cancel && res == WAIT_CANCELED)
-    pthread::static_cancel_self ();
-  return res;
-}
-
-int
-pthread::setcancelstate (int state, int *oldstate)
-{
-  int result = 0;
-
-  mutex.lock ();
-
-  if (state != PTHREAD_CANCEL_ENABLE && state != PTHREAD_CANCEL_DISABLE)
-    result = EINVAL;
-  else
-    {
-      if (oldstate)
-	*oldstate = cancelstate;
-      cancelstate = state;
-    }
-
-  mutex.unlock ();
-
-  return result;
-}
-
-int
-pthread::setcanceltype (int type, int *oldtype)
-{
-  int result = 0;
-
-  mutex.lock ();
-
-  if (type != PTHREAD_CANCEL_DEFERRED && type != PTHREAD_CANCEL_ASYNCHRONOUS)
-    result = EINVAL;
-  else
-    {
-      if (oldtype)
-	*oldtype = canceltype;
-      canceltype = type;
-    }
-
-  mutex.unlock ();
-
-  return result;
-}
-
-void
-pthread::push_cleanup_handler (__pthread_cleanup_handler *handler)
-{
-  if (this != self ())
-    // TODO: do it?
-    api_fatal ("Attempt to push a cleanup handler across threads");
-  handler->next = cleanup_stack;
-  cleanup_stack = handler;
-}
-
-void
-pthread::pop_cleanup_handler (int const execute)
-{
-  if (this != self ())
-    // TODO: send a signal or something to the thread ?
-    api_fatal ("Attempt to execute a cleanup handler across threads");
-
-  mutex.lock ();
-
-  if (cleanup_stack != NULL)
-    {
-      __pthread_cleanup_handler *handler = cleanup_stack;
-
-      if (execute)
-	(*handler->function) (handler->arg);
-      cleanup_stack = handler->next;
-    }
-
-  mutex.unlock ();
-}
-
-void
-pthread::pop_all_cleanup_handlers ()
-{
-  while (cleanup_stack != NULL)
-    pop_cleanup_handler (1);
-}
-
-void
-pthread::cancel_self ()
-{
-  exit (PTHREAD_CANCELED);
-}
-
-DWORD
-pthread::get_thread_id ()
-{
-  return thread_id;
-}
-
-void
-pthread::_fixup_after_fork ()
-{
-  /* set thread to not running if it is not the forking thread */
-  if (this != pthread::self ())
-    {
-      magic = 0;
-      valid = false;
-      win32_obj_id = NULL;
-      cancel_event = NULL;
-    }
-}
-
-void
-pthread::suspend_except_self ()
-{
-  if (valid && this != pthread::self ())
-    SuspendThread (win32_obj_id);
-}
-
-void
-pthread::resume ()
-{
-  if (valid)
-    ResumeThread (win32_obj_id);
-}
-
-/* static members */
-bool
-pthread_attr::is_good_object (pthread_attr_t const *attr)
-{
-  if (verifyable_object_isvalid (attr, PTHREAD_ATTR_MAGIC) != VALID_OBJECT)
-    return false;
-  return true;
-}
-
-/* instance members */
-
-pthread_attr::pthread_attr ():verifyable_object (PTHREAD_ATTR_MAGIC),
-joinable (PTHREAD_CREATE_JOINABLE), contentionscope (PTHREAD_SCOPE_PROCESS),
-inheritsched (PTHREAD_INHERIT_SCHED), stacksize (0)
-{
-  schedparam.sched_priority = 0;
-}
-
-pthread_attr::~pthread_attr ()
-{
-}
-
-bool
-pthread_condattr::is_good_object (pthread_condattr_t const *attr)
-{
-  if (verifyable_object_isvalid (attr, PTHREAD_CONDATTR_MAGIC) != VALID_OBJECT)
-    return false;
-  return true;
-}
-
-pthread_condattr::pthread_condattr ():verifyable_object
-  (PTHREAD_CONDATTR_MAGIC), shared (PTHREAD_PROCESS_PRIVATE)
-{
-}
-
-pthread_condattr::~pthread_condattr ()
-{
-}
-
-List<pthread_cond> pthread_cond::conds;
-
-/* This is used for cond creation protection within a single process only */
-fast_mutex NO_COPY pthread_cond::cond_initialization_lock;
-
-/* We can only be called once.
-   TODO: (no rush) use a non copied memory section to
-   hold an initialization flag.  */
-void
-pthread_cond::init_mutex ()
-{
-  if (!cond_initialization_lock.init ())
-    api_fatal ("Could not create win32 Mutex for pthread cond static initializer support.");
-}
-
-pthread_cond::pthread_cond (pthread_condattr *attr) :
-  verifyable_object (PTHREAD_COND_MAGIC),
-  shared (0), waiting (0), pending (0), sem_wait (NULL),
-  mtx_cond(NULL), next (NULL)
-{
-  pthread_mutex *verifyable_mutex_obj;
-
-  if (attr)
-    if (attr->shared != PTHREAD_PROCESS_PRIVATE)
-      {
-	magic = 0;
-	return;
-      }
-
-  verifyable_mutex_obj = &mtx_in;
-  if (!pthread_mutex::is_good_object (&verifyable_mutex_obj))
-    {
-      thread_printf ("Internal cond mutex is not valid. this %p", this);
-      magic = 0;
-      return;
-    }
-  /*
-   * Change the mutex type to NORMAL.
-   * This mutex MUST be of type normal
-  */
-  mtx_in.type = PTHREAD_MUTEX_NORMAL;
-
-  verifyable_mutex_obj = &mtx_out;
-  if (!pthread_mutex::is_good_object (&verifyable_mutex_obj))
-    {
-      thread_printf ("Internal cond mutex is not valid. this %p", this);
-      magic = 0;
-      return;
-    }
-  /* Change the mutex type to NORMAL to speed up mutex operations */
-  mtx_out.type = PTHREAD_MUTEX_NORMAL;
-
-  sem_wait = ::CreateSemaphore (&sec_none_nih, 0, LONG_MAX, NULL);
-  if (!sem_wait)
-    {
-      debug_printf ("CreateSemaphore failed. %E");
-      magic = 0;
-      return;
-    }
-
-  conds.insert (this);
-}
-
-pthread_cond::~pthread_cond ()
-{
-  if (sem_wait)
-    CloseHandle (sem_wait);
-
-  conds.remove (this);
-}
-
-void
-pthread_cond::unblock (const bool all)
-{
-  unsigned long releaseable;
-
-  /*
-   * Block outgoing threads (and avoid simultanous unblocks)
-   */
-  mtx_out.lock ();
-
-  releaseable = waiting - pending;
-  if (releaseable)
-    {
-      unsigned long released;
-
-      if (!pending)
-	{
-	  /*
-	   * Block incoming threads until all waiting threads are released.
-	   */
-	  mtx_in.lock ();
-
-	  /*
-	   * Calculate releaseable again because threads can enter until
-	   * the semaphore has been taken, but they can not leave, therefore pending
-	   * is unchanged and releaseable can only get higher
-	   */
-	  releaseable = waiting - pending;
-	}
-
-      released = all ? releaseable : 1;
-      pending += released;
-      /*
-       * Signal threads
-       */
-      ::ReleaseSemaphore (sem_wait, released, NULL);
-    }
-
-  /*
-   * And let the threads release.
-   */
-  mtx_out.unlock ();
-}
-
-int
-pthread_cond::wait (pthread_mutex_t mutex, DWORD dwMilliseconds)
-{
-  DWORD rv;
-
-  mtx_in.lock ();
-  if (InterlockedIncrement ((long *)&waiting) == 1)
-    mtx_cond = mutex;
-  else if (mtx_cond != mutex)
-    {
-      InterlockedDecrement ((long *)&waiting);
-      mtx_in.unlock ();
-      return EINVAL;
-    }
-  mtx_in.unlock ();
-
-  /*
-   * Release the mutex and wait on semaphore
-   */
-  ++mutex->condwaits;
-  mutex->unlock ();
-
-  rv = pthread::cancelable_wait (sem_wait, dwMilliseconds, false);
-
-  mtx_out.lock ();
-
-  if (rv != WAIT_OBJECT_0)
-    {
-      /*
-       * It might happen that a signal is sent while the thread got canceled
-       * or timed out. Try to take one.
-       * If the thread gets one than a signal|broadcast is in progress.
-       */
-      if (WaitForSingleObject (sem_wait, 0) == WAIT_OBJECT_0)
-	/*
-	 * thread got cancelled ot timed out while a signalling is in progress.
-	 * Set wait result back to signaled
-	 */
-	rv = WAIT_OBJECT_0;
-    }
-
-  InterlockedDecrement ((long *)&waiting);
-
-  if (rv == WAIT_OBJECT_0 && --pending == 0)
-    /*
-     * All signaled threads are released,
-     * new threads can enter Wait
-     */
-    mtx_in.unlock ();
-
-  mtx_out.unlock ();
-
-  mutex->lock ();
-  --mutex->condwaits;
-
-  if (rv == WAIT_CANCELED)
-    pthread::static_cancel_self ();
-  else if (rv == WAIT_TIMEOUT)
-    return ETIMEDOUT;
-
-  return 0;
-}
-
-void
-pthread_cond::_fixup_after_fork ()
-{
-  waiting = pending = 0;
-  mtx_cond = NULL;
-
-  /* Unlock eventually locked mutexes */
-  mtx_in.unlock ();
-  mtx_out.unlock ();
-
-  sem_wait = ::CreateSemaphore (&sec_none_nih, 0, LONG_MAX, NULL);
-  if (!sem_wait)
-    api_fatal ("pthread_cond::_fixup_after_fork () failed to recreate win32 semaphore");
-}
-
-bool
-pthread_rwlockattr::is_good_object (pthread_rwlockattr_t const *attr)
-{
-  if (verifyable_object_isvalid (attr, PTHREAD_RWLOCKATTR_MAGIC) != VALID_OBJECT)
-    return false;
-  return true;
-}
-
-pthread_rwlockattr::pthread_rwlockattr ():verifyable_object
-  (PTHREAD_RWLOCKATTR_MAGIC), shared (PTHREAD_PROCESS_PRIVATE)
-{
-}
-
-pthread_rwlockattr::~pthread_rwlockattr ()
-{
-}
-
-List<pthread_rwlock> pthread_rwlock::rwlocks;
-
-/* This is used for rwlock creation protection within a single process only */
-fast_mutex NO_COPY pthread_rwlock::rwlock_initialization_lock;
-
-/* We can only be called once.
-   TODO: (no rush) use a non copied memory section to
-   hold an initialization flag.  */
-void
-pthread_rwlock::init_mutex ()
-{
-  if (!rwlock_initialization_lock.init ())
-    api_fatal ("Could not create win32 Mutex for pthread rwlock static initializer support.");
-}
-
-pthread_rwlock::pthread_rwlock (pthread_rwlockattr *attr) :
-  verifyable_object (PTHREAD_RWLOCK_MAGIC),
-  shared (0), waiting_readers (0), waiting_writers (0), writer (NULL),
-  readers (NULL), readers_mx (), mtx (NULL), cond_readers (NULL), cond_writers (NULL),
-  next (NULL)
-{
-  pthread_mutex *verifyable_mutex_obj = &mtx;
-  pthread_cond *verifyable_cond_obj;
-
-  if (!readers_mx.init ())
-    {
-      thread_printf ("Internal rwlock synchronisation mutex is not valid. this %p", this);
-      magic = 0;
-      return;
-    }
-
-  if (attr)
-    if (attr->shared != PTHREAD_PROCESS_PRIVATE)
-      {
-	magic = 0;
-	return;
-      }
-
-  if (!pthread_mutex::is_good_object (&verifyable_mutex_obj))
-    {
-      thread_printf ("Internal rwlock mutex is not valid. this %p", this);
-      magic = 0;
-      return;
-    }
-  /* Change the mutex type to NORMAL to speed up mutex operations */
-  mtx.type = PTHREAD_MUTEX_NORMAL;
-
-  verifyable_cond_obj = &cond_readers;
-  if (!pthread_cond::is_good_object (&verifyable_cond_obj))
-    {
-      thread_printf ("Internal rwlock readers cond is not valid. this %p", this);
-      magic = 0;
-      return;
-    }
-
-  verifyable_cond_obj = &cond_writers;
-  if (!pthread_cond::is_good_object (&verifyable_cond_obj))
-    {
-      thread_printf ("Internal rwlock writers cond is not valid. this %p", this);
-      magic = 0;
-      return;
-    }
-
-
-  rwlocks.insert (this);
-}
-
-pthread_rwlock::~pthread_rwlock ()
-{
-  rwlocks.remove (this);
-}
-
-int
-pthread_rwlock::rdlock ()
-{
-  int result = 0;
-  struct RWLOCK_READER *reader;
-  pthread_t self = pthread::self ();
-
-  mtx.lock ();
-
-  if (lookup_reader (self))
-    {
-      result = EDEADLK;
-      goto DONE;
-    }
-
-  reader = new struct RWLOCK_READER;
-  if (!reader)
-    {
-      result = EAGAIN;
-      goto DONE;
-    }
-
-  while (writer || waiting_writers)
-    {
-      pthread_cleanup_push (pthread_rwlock::rdlock_cleanup, this);
-
-      ++waiting_readers;
-      cond_readers.wait (&mtx);
-      --waiting_readers;
-
-      pthread_cleanup_pop (0);
-    }
-
-  reader->thread = self;
-  add_reader (reader);
-
- DONE:
-  mtx.unlock ();
-
-  return result;
-}
-
-int
-pthread_rwlock::tryrdlock ()
-{
-  int result = 0;
-  pthread_t self = pthread::self ();
-
-  mtx.lock ();
-
-  if (writer || waiting_writers || lookup_reader (self))
-    result = EBUSY;
-  else
-    {
-      struct RWLOCK_READER *reader = new struct RWLOCK_READER;
-      if (reader)
-	{
-	  reader->thread = self;
-	  add_reader (reader);
-	}
-      else
-	result = EAGAIN;
-    }
-
-  mtx.unlock ();
-
-  return result;
-}
-
-int
-pthread_rwlock::wrlock ()
-{
-  int result = 0;
-  pthread_t self = pthread::self ();
-
-  mtx.lock ();
-
-  if (writer == self || lookup_reader (self))
-    {
-      result = EDEADLK;
-      goto DONE;
-    }
-
-  while (writer || readers)
-    {
-      pthread_cleanup_push (pthread_rwlock::wrlock_cleanup, this);
-
-      ++waiting_writers;
-      cond_writers.wait (&mtx);
-      --waiting_writers;
-
-      pthread_cleanup_pop (0);
-    }
-
-  writer = self;
-
- DONE:
-  mtx.unlock ();
-
-  return result;
-}
-
-int
-pthread_rwlock::trywrlock ()
-{
-  int result = 0;
-  pthread_t self = pthread::self ();
-
-  mtx.lock ();
-
-  if (writer || readers)
-    result = EBUSY;
-  else
-    writer = self;
-
-  mtx.unlock ();
-
-  return result;
-}
-
-int
-pthread_rwlock::unlock ()
-{
-  int result = 0;
-  pthread_t self = pthread::self ();
-
-  mtx.lock ();
-
-  if (writer)
-    {
-      if (writer != self)
-	{
-	  result = EPERM;
-	  goto DONE;
-	}
-
-      writer = NULL;
-    }
-  else
-    {
-      struct RWLOCK_READER *reader = lookup_reader (self);
-
-      if (!reader)
-	{
-	  result = EPERM;
-	  goto DONE;
-	}
-
-      remove_reader (reader);
-      delete reader;
-    }
-
-  release ();
-
- DONE:
-  mtx.unlock ();
-
-  return result;
-}
-
-void
-pthread_rwlock::add_reader (struct RWLOCK_READER *rd)
-{
-  List_insert (readers, rd);
-}
-
-void
-pthread_rwlock::remove_reader (struct RWLOCK_READER *rd)
-{
-  List_remove (readers_mx, readers, rd);
-}
-
-struct pthread_rwlock::RWLOCK_READER *
-pthread_rwlock::lookup_reader (pthread_t thread)
-{
-  readers_mx.lock ();
-
-  struct RWLOCK_READER *cur = readers;
-
-  while (cur && cur->thread != thread)
-    cur = cur->next;
-
-  readers_mx.unlock ();
-
-  return cur;
-}
-
-void
-pthread_rwlock::rdlock_cleanup (void *arg)
-{
-  pthread_rwlock *rwlock = (pthread_rwlock *) arg;
-
-  --(rwlock->waiting_readers);
-  rwlock->release ();
-  rwlock->mtx.unlock ();
-}
-
-void
-pthread_rwlock::wrlock_cleanup (void *arg)
-{
-  pthread_rwlock *rwlock = (pthread_rwlock *) arg;
-
-  --(rwlock->waiting_writers);
-  rwlock->release ();
-  rwlock->mtx.unlock ();
-}
-
-void
-pthread_rwlock::_fixup_after_fork ()
-{
-  pthread_t self = pthread::self ();
-  struct RWLOCK_READER **temp = &readers;
-
-  waiting_readers = 0;
-  waiting_writers = 0;
-
-  if (!readers_mx.init ())
-    api_fatal ("pthread_rwlock::_fixup_after_fork () failed to recreate mutex");
-
-  /* Unlock eventually locked mutex */
-  mtx.unlock ();
-  /*
-   * Remove all readers except self
-   */
-  while (*temp)
-    {
-      if ((*temp)->thread == self)
-	temp = &((*temp)->next);
-      else
-	{
-	  struct RWLOCK_READER *cur = *temp;
-	  *temp = (*temp)->next;
-	  delete cur;
-	}
-    }
-}
-
-/* pthread_key */
-/* static members */
-/* This stores pthread_key information across fork() boundaries */
-List<pthread_key> pthread_key::keys;
-
-bool
-pthread_key::is_good_object (pthread_key_t const *key)
-{
-  if (verifyable_object_isvalid (key, PTHREAD_KEY_MAGIC) != VALID_OBJECT)
-    return false;
-  return true;
-}
-
-/* non-static members */
-
-pthread_key::pthread_key (void (*aDestructor) (void *)):verifyable_object (PTHREAD_KEY_MAGIC), destructor (aDestructor)
-{
-  tls_index = TlsAlloc ();
-  if (tls_index == TLS_OUT_OF_INDEXES)
-    magic = 0;
-  else
-    keys.insert (this);
-}
-
-pthread_key::~pthread_key ()
-{
-  /* We may need to make the list code lock the list during operations
-   */
-  if (magic != 0)
-    {
-      keys.remove (this);
-      TlsFree (tls_index);
-    }
-}
-
-int
-pthread_key::set (const void *value)
-{
-  /* the OS function doesn't perform error checking */
-  TlsSetValue (tls_index, (void *) value);
-  return 0;
-}
-
-void *
-pthread_key::get () const
-{
-  int saved_error = ::GetLastError ();
-  void *result = TlsGetValue (tls_index);
-  ::SetLastError (saved_error);
-  return result;
-}
-
-void
-pthread_key::_fixup_before_fork ()
-{
-  fork_buf = get ();
-}
-
-void
-pthread_key::_fixup_after_fork ()
-{
-  tls_index = TlsAlloc ();
-  if (tls_index == TLS_OUT_OF_INDEXES)
-    api_fatal ("pthread_key::recreate_key_from_buffer () failed to reallocate Tls storage");
-  set (fork_buf);
-}
-
-void
-pthread_key::run_destructor ()
-{
-  if (destructor)
-    {
-      void *oldValue = get ();
-      if (oldValue)
-	{
-	  set (NULL);
-	  destructor (oldValue);
-	}
-    }
-}
-
-/* pshared mutexs:
-
-   REMOVED FROM CURRENT. These can be reinstated with the daemon, when all the
-   gymnastics can be a lot easier.
-
-   the mutex_t (size 4) is not used as a verifyable object because we cannot
-   guarantee the same address space for all processes.
-   we use the following:
-   high bit set (never a valid address).
-   second byte is reserved for the priority.
-   third byte is reserved
-   fourth byte is the mutex id. (max 255 cygwin mutexs system wide).
-   creating mutex's does get slower and slower, but as creation is a one time
-   job, it should never become an issue
-
-   And if you're looking at this and thinking, why not an array in cygwin for all mutexs,
-   - you incur a penalty on _every_ mutex call and you have toserialise them all.
-   ... Bad karma.
-
-   option 2? put everything in userspace and update the ABI?
-   - bad karma as well - the HANDLE, while identical across process's,
-   Isn't duplicated, it's reopened. */
-
-/* static members */
-bool
-pthread_mutex::is_good_object (pthread_mutex_t const *mutex)
-{
-  if (verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC) != VALID_OBJECT)
-    return false;
-  return true;
-}
-
-bool
-pthread_mutex::is_good_initializer (pthread_mutex_t const *mutex)
-{
-  if (verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC, PTHREAD_MUTEX_INITIALIZER) != VALID_STATIC_OBJECT)
-    return false;
-  return true;
-}
-
-bool
-pthread_mutex::is_good_initializer_or_object (pthread_mutex_t const *mutex)
-{
-  if (verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC, PTHREAD_MUTEX_INITIALIZER) == INVALID_OBJECT)
-    return false;
-  return true;
-}
-
-bool
-pthread_mutex::is_good_initializer_or_bad_object (pthread_mutex_t const *mutex)
-{
-  verifyable_object_state objectState = verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC, PTHREAD_MUTEX_INITIALIZER);
-  if (objectState == VALID_OBJECT)
-	return false;
-  return true;
-}
-
-bool
-pthread_mutex::can_be_unlocked (pthread_mutex_t const *mutex)
-{
-  pthread_t self = pthread::self ();
-
-  if (!is_good_object (mutex))
-    return false;
-  /*
-   * Check if the mutex is owned by the current thread and can be unlocked
-   */
-  return ((*mutex)->recursion_counter == 1 && pthread::equal ((*mutex)->owner, self));
-}
-
-List<pthread_mutex> pthread_mutex::mutexes;
-
-/* This is used for mutex creation protection within a single process only */
-fast_mutex NO_COPY pthread_mutex::mutex_initialization_lock;
-
-/* We can only be called once.
-   TODO: (no rush) use a non copied memory section to
-   hold an initialization flag.  */
-void
-pthread_mutex::init_mutex ()
-{
-  if (!mutex_initialization_lock.init ())
-    api_fatal ("Could not create win32 Mutex for pthread mutex static initializer support.");
-}
-
-pthread_mutex::pthread_mutex (pthread_mutexattr *attr) :
-  verifyable_object (PTHREAD_MUTEX_MAGIC),
-  lock_counter (0),
-  win32_obj_id (NULL), recursion_counter (0),
-  condwaits (0), owner (NULL), type (PTHREAD_MUTEX_DEFAULT),
-  pshared (PTHREAD_PROCESS_PRIVATE)
-{
-  win32_obj_id = ::CreateSemaphore (&sec_none_nih, 0, LONG_MAX, NULL);
-  if (!win32_obj_id)
-    {
-      magic = 0;
-      return;
-    }
-  /*attr checked in the C call */
-  if (attr)
-    {
-      if (attr->pshared == PTHREAD_PROCESS_SHARED)
-	{
-	  // fail
-	  magic = 0;
-	  return;
-	}
-
-      type = attr->mutextype;
-    }
-
-  mutexes.insert (this);
-}
-
-pthread_mutex::~pthread_mutex ()
-{
-  if (win32_obj_id)
-    CloseHandle (win32_obj_id);
-
-  mutexes.remove (this);
-}
-
-int
-pthread_mutex::_lock (pthread_t self)
-{
-  int result = 0;
-
-  if (InterlockedIncrement ((long *)&lock_counter) == 1)
-    set_owner (self);
-  else if (type != PTHREAD_MUTEX_NORMAL && pthread::equal (owner, self))
-    {
-      InterlockedDecrement ((long *) &lock_counter);
-      if (type == PTHREAD_MUTEX_RECURSIVE)
-	result = lock_recursive ();
-      else
-	result = EDEADLK;
-    }
-  else
-    {
-      WaitForSingleObject (win32_obj_id, INFINITE);
-      set_owner (self);
-    }
-
-  return result;
-}
-
-int
-pthread_mutex::_trylock (pthread_t self)
-{
-  int result = 0;
-
-  if (InterlockedCompareExchange ((long *) &lock_counter, 1, 0) == 0)
-    set_owner (self);
-  else if (type == PTHREAD_MUTEX_RECURSIVE && pthread::equal (owner, self))
-    result = lock_recursive ();
-  else
-    result = EBUSY;
-
-  return result;
-}
-
-int
-pthread_mutex::_unlock (pthread_t self)
-{
-  if (!pthread::equal (owner, self))
-    return EPERM;
-
-  if (--recursion_counter == 0)
-    {
-      owner = NULL;
-      if (InterlockedDecrement ((long *)&lock_counter))
-	// Another thread is waiting
-	::ReleaseSemaphore (win32_obj_id, 1, NULL);
-    }
-
-  return 0;
-}
-
-int
-pthread_mutex::_destroy (pthread_t self)
-{
-  if (condwaits || _trylock (self))
-    // Do not destroy a condwaited or locked mutex
-    return EBUSY;
-  else if (recursion_counter != 1)
-    {
-      // Do not destroy a recursive locked mutex
-      --recursion_counter;
-      return EBUSY;
-    }
-
-  delete this;
-  return 0;
-}
-
-void
-pthread_mutex::_fixup_after_fork ()
-{
-  debug_printf ("mutex %x in _fixup_after_fork", this);
-  if (pshared != PTHREAD_PROCESS_PRIVATE)
-    api_fatal ("pthread_mutex::_fixup_after_fork () doesn'tunderstand PROCESS_SHARED mutex's");
-
-  if (owner == NULL)
-    /* mutex has no owner, reset to initial */
-    lock_counter = 0;
-  else if (lock_counter != 0)
-    /* All waiting threads are gone after a fork */
-    lock_counter = 1;
-
-  win32_obj_id = ::CreateSemaphore (&sec_none_nih, 0, LONG_MAX, NULL);
-  if (!win32_obj_id)
-    api_fatal ("pthread_mutex::_fixup_after_fork () failed to recreate win32 semaphore for mutex");
-
-  condwaits = 0;
-}
-
-bool
-pthread_mutexattr::is_good_object (pthread_mutexattr_t const * attr)
-{
-  if (verifyable_object_isvalid (attr, PTHREAD_MUTEXATTR_MAGIC) != VALID_OBJECT)
-    return false;
-  return true;
-}
-
-pthread_mutexattr::pthread_mutexattr ():verifyable_object (PTHREAD_MUTEXATTR_MAGIC),
-pshared (PTHREAD_PROCESS_PRIVATE), mutextype (PTHREAD_MUTEX_DEFAULT)
-{
-}
-
-pthread_mutexattr::~pthread_mutexattr ()
-{
-}
-
-List<semaphore> semaphore::semaphores;
-
-semaphore::semaphore (int pshared, unsigned int value)
-: verifyable_object (SEM_MAGIC),
-  shared (pshared),
-  currentvalue (value),
-  name (NULL)
-{
-  SECURITY_ATTRIBUTES sa = (pshared != PTHREAD_PROCESS_PRIVATE)
-			   ? sec_all : sec_none_nih;
-  this->win32_obj_id = ::CreateSemaphore (&sa, value, LONG_MAX, NULL);
-  if (!this->win32_obj_id)
-    magic = 0;
-
-  semaphores.insert (this);
-}
-
-semaphore::semaphore (const char *sem_name, int oflag, mode_t mode,
-				  unsigned int value)
-: verifyable_object (SEM_MAGIC),
-  shared (PTHREAD_PROCESS_SHARED),
-  currentvalue (value), 		/* Unused for named semaphores. */
-  name (NULL)
-{
-  if (oflag & O_CREAT)
-    {
-      SECURITY_ATTRIBUTES sa = sec_all;
-      security_descriptor sd;
-      if (allow_ntsec)
-	set_security_attribute (mode, &sa, sd);
-      this->win32_obj_id = ::CreateSemaphore (&sa, value, LONG_MAX, sem_name);
-      if (!this->win32_obj_id)
-	magic = 0;
-      if (GetLastError () == ERROR_ALREADY_EXISTS && (oflag & O_EXCL))
-	{
-	  __seterrno ();
-	  CloseHandle (this->win32_obj_id);
-	  magic = 0;
-	}
-    }
-  else
-    {
-      this->win32_obj_id = ::OpenSemaphore (SEMAPHORE_ALL_ACCESS, FALSE,
-					    sem_name);
-      if (!this->win32_obj_id)
-	{
-	  __seterrno ();
-	  magic = 0;
-	}
-    }
-  if (magic)
-    {
-      name = new char [strlen (sem_name + 1)];
-      if (!name)
-	{
-	  set_errno (ENOSPC);
-	  CloseHandle (this->win32_obj_id);
-	  magic = 0;
-	}
-      else
-	strcpy (name, sem_name);
-    }
-
-  semaphores.insert (this);
-}
-
-semaphore::~semaphore ()
-{
-  if (win32_obj_id)
-    CloseHandle (win32_obj_id);
-
-  delete [] name;
-
-  semaphores.remove (this);
-}
-
-void
-semaphore::_post ()
-{
-  if (ReleaseSemaphore (win32_obj_id, 1, &currentvalue))
-    currentvalue++;
-}
-
-int
-semaphore::_getvalue (int *sval)
-{
-  long val;
-
-  switch (WaitForSingleObject (win32_obj_id, 0))
-    {
-      case WAIT_OBJECT_0:
-	ReleaseSemaphore (win32_obj_id, 1, &val);
-	*sval = val + 1;
-	break;
-      case WAIT_TIMEOUT:
-	*sval = 0;
-	break;
-      default:
-	set_errno (EAGAIN);
-	return -1;
-    }
-  return 0;
-}
-
-int
-semaphore::_trywait ()
-{
-  /* FIXME: signals should be able to interrupt semaphores...
-   *We probably need WaitForMultipleObjects here.
-   */
-  if (WaitForSingleObject (win32_obj_id, 0) == WAIT_TIMEOUT)
-    {
-      set_errno (EAGAIN);
-      return -1;
-    }
-  currentvalue--;
-  return 0;
-}
-
-int
-semaphore::_timedwait (const struct timespec *abstime)
-{
-  struct timeval tv;
-  long waitlength;
-
-  if (__check_invalid_read_ptr (abstime, sizeof *abstime))
-    {
-      /* According to SUSv3, abstime need not be checked for validity,
-	 if the semaphore can be locked immediately. */
-      if (!_trywait ())
-	return 0;
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  gettimeofday (&tv, NULL);
-  waitlength = abstime->tv_sec * 1000 + abstime->tv_nsec / (1000 * 1000);
-  waitlength -= tv.tv_sec * 1000 + tv.tv_usec / 1000;
-  if (waitlength < 0)
-    waitlength = 0;
-  switch (pthread::cancelable_wait (win32_obj_id, waitlength))
-    {
-    case WAIT_OBJECT_0:
-      currentvalue--;
-      break;
-    case WAIT_TIMEOUT:
-      set_errno (ETIMEDOUT);
-      return -1;
-    default:
-      debug_printf ("cancelable_wait failed. %E");
-      __seterrno ();
-      return -1;
-    }
-  return 0;
-}
-
-void
-semaphore::_wait ()
-{
-  switch (pthread::cancelable_wait (win32_obj_id, INFINITE))
-    {
-    case WAIT_OBJECT_0:
-      currentvalue--;
-      break;
-    default:
-      debug_printf ("cancelable_wait failed. %E");
-      return;
-    }
-}
-
-void
-semaphore::_fixup_after_fork ()
-{
-  if (shared == PTHREAD_PROCESS_PRIVATE)
-    {
-      debug_printf ("sem %x in _fixup_after_fork", this);
-      /* FIXME: duplicate code here and in the constructor. */
-      this->win32_obj_id = ::CreateSemaphore (&sec_none_nih, currentvalue,
-					      LONG_MAX, NULL);
-      if (!win32_obj_id)
-	api_fatal ("failed to create new win32 semaphore, error %d");
-    }
-}
-
-verifyable_object::verifyable_object (long verifyer):
-magic (verifyer)
-{
-}
-
-verifyable_object::~verifyable_object ()
-{
-  magic = 0;
-}
-
-/* Generic memory acccess routine - where should it live ? */
-int __stdcall
-check_valid_pointer (void const *pointer)
-{
-  if (!pointer || IsBadWritePtr ((void *) pointer, sizeof (verifyable_object)))
-    return EFAULT;
-  return 0;
-}
-
-verifyable_object_state
-verifyable_object_isvalid (void const * objectptr, long magic, void *static_ptr)
-{
-  verifyable_object **object = (verifyable_object **)objectptr;
-  if (check_valid_pointer (object))
-    return INVALID_OBJECT;
-  if (static_ptr && *object == static_ptr)
-    return VALID_STATIC_OBJECT;
-  if (!*object)
-    return INVALID_OBJECT;
-  if (check_valid_pointer (*object))
-    return INVALID_OBJECT;
-  if ((*object)->magic != magic)
-    return INVALID_OBJECT;
-  return VALID_OBJECT;
-}
-
-verifyable_object_state
-verifyable_object_isvalid (void const * objectptr, long magic)
-{
-  return verifyable_object_isvalid (objectptr, magic, NULL);
-}
-
-inline void
-__reent_t::init_clib (struct _reent& var)
-{
-  var = ((struct _reent) _REENT_INIT (var));
-  var._stdin = _GLOBAL_REENT->_stdin;
-  var._stdout = _GLOBAL_REENT->_stdout;
-  var._stderr = _GLOBAL_REENT->_stderr;
-  var.__sdidinit = _GLOBAL_REENT->__sdidinit;
-  var.__cleanup = _GLOBAL_REENT->__cleanup;
-  _clib = &var;
-};
-
-DWORD WINAPI
-pthread::thread_init_wrapper (void *arg)
-{
-  pthread *thread = (pthread *) arg;
-  _my_tls.tid = thread;
-
-  exception_list cygwin_except_entry;
-  init_exceptions (&cygwin_except_entry); /* Initialize SIGSEGV handling, etc. */
-
-  thread->set_tls_self_pointer ();
-  struct __reent_t local_reent;
-  struct _winsup_t local_winsup;
-  struct _reent local_clib;
-
-  memset (&local_winsup, 0, sizeof (struct _winsup_t));
-
-  local_reent.init_clib (local_clib);
-  local_reent._winsup = &local_winsup;
-
-  local_winsup._process_logmask = LOG_UPTO (LOG_DEBUG);
-
-  MT_INTERFACE->reent_key.set (&local_reent);
-
-  thread->mutex.lock ();
-  // if thread is detached force cleanup on exit
-  if (thread->attr.joinable == PTHREAD_CREATE_DETACHED && thread->joiner == NULL)
-    thread->joiner = thread;
-  thread->mutex.unlock ();
-
-#ifdef _CYG_THREAD_FAILSAFE
-  if (_REENT == _impure_ptr)
-    system_printf ("local storage for thread isn't setup correctly");
-#endif
-
-  thread_printf ("started thread %p %p %p %p %p %p", arg, &local_clib,
-		 _impure_ptr, thread, thread->function, thread->arg);
-
-  // call the user's thread
-  void *ret = thread->function (thread->arg);
-
-  thread->exit (ret);
-
-  return 0;	// just for show.  Never returns.
-}
-
-bool
-pthread::is_good_object (pthread_t const *thread)
-{
-  if (verifyable_object_isvalid (thread, PTHREAD_MAGIC) != VALID_OBJECT)
-    return false;
-  return true;
-}
-
-unsigned long
-pthread::getsequence_np ()
-{
-  return get_thread_id ();
-}
-
-int
-pthread::create (pthread_t *thread, const pthread_attr_t *attr,
-		  void *(*start_routine) (void *), void *arg)
-{
-  if (attr && !pthread_attr::is_good_object (attr))
-    return EINVAL;
-
-  *thread = new pthread ();
-  (*thread)->create (start_routine, attr ? *attr : NULL, arg);
-  if (!is_good_object (thread))
-    {
-      delete (*thread);
-      *thread = NULL;
-      return EAGAIN;
-    }
-
-  return 0;
-}
-
-int
-pthread::once (pthread_once_t *once_control, void (*init_routine) (void))
-{
-  // already done ?
-  if (once_control->state)
-    return 0;
-
-  pthread_mutex_lock (&once_control->mutex);
-  /* Here we must set a cancellation handler to unlock the mutex if needed */
-  /* but a cancellation handler is not the right thing. We need this in the thread
-   *cleanup routine. Assumption: a thread can only be in one pthread_once routine
-   *at a time. Stote a mutex_t *in the pthread_structure. if that's non null unlock
-   *on pthread_exit ();
-   */
-  if (!once_control->state)
-    {
-      init_routine ();
-      once_control->state = 1;
-    }
-  /* Here we must remove our cancellation handler */
-  pthread_mutex_unlock (&once_control->mutex);
-  return 0;
-}
-
-int
-pthread::cancel (pthread_t thread)
-{
-  if (!is_good_object (&thread))
-    return ESRCH;
-
-  return thread->cancel ();
-}
-
-void
-pthread::atforkprepare (void)
-{
-  MT_INTERFACE->fixup_before_fork ();
-
-  callback *cb = MT_INTERFACE->pthread_prepare;
-  while (cb)
-    {
-      cb->cb ();
-      cb = cb->next;
-    }
-}
-
-void
-pthread::atforkparent (void)
-{
-  callback *cb = MT_INTERFACE->pthread_parent;
-  while (cb)
-    {
-      cb->cb ();
-      cb = cb->next;
-    }
-}
-
-void
-pthread::atforkchild (void)
-{
-  MT_INTERFACE->fixup_after_fork ();
-
-  callback *cb = MT_INTERFACE->pthread_child;
-  while (cb)
-    {
-      cb->cb ();
-      cb = cb->next;
-    }
-}
-
-/* Register a set of functions to run before and after fork.
-   prepare calls are called in LI-FC order.
-   parent and child calls are called in FI-FC order.  */
-int
-pthread::atfork (void (*prepare)(void), void (*parent)(void), void (*child)(void))
-{
-  callback *prepcb = NULL, *parentcb = NULL, *childcb = NULL;
-  if (prepare)
-    {
-      prepcb = new callback;
-      if (!prepcb)
-	return ENOMEM;
-    }
-  if (parent)
-    {
-      parentcb = new callback;
-      if (!parentcb)
-	{
-	  if (prepcb)
-	    delete prepcb;
-	  return ENOMEM;
-	}
-    }
-  if (child)
-    {
-      childcb = new callback;
-      if (!childcb)
-	{
-	  if (prepcb)
-	    delete prepcb;
-	  if (parentcb)
-	    delete parentcb;
-	  return ENOMEM;
-	}
-    }
-
-  if (prepcb)
-  {
-    prepcb->cb = prepare;
-    List_insert (MT_INTERFACE->pthread_prepare, prepcb);
-  }
-  if (parentcb)
-  {
-    parentcb->cb = parent;
-    callback **t = &MT_INTERFACE->pthread_parent;
-    while (*t)
-      t = &(*t)->next;
-    /* t = pointer to last next in the list */
-    List_insert (*t, parentcb);
-  }
-  if (childcb)
-  {
-    childcb->cb = child;
-    callback **t = &MT_INTERFACE->pthread_child;
-    while (*t)
-      t = &(*t)->next;
-    /* t = pointer to last next in the list */
-    List_insert (*t, childcb);
-  }
-  return 0;
-}
-
-extern "C" int
-pthread_attr_init (pthread_attr_t *attr)
-{
-  if (pthread_attr::is_good_object (attr))
-    return EBUSY;
-
-  *attr = new pthread_attr;
-  if (!pthread_attr::is_good_object (attr))
-    {
-      delete (*attr);
-      *attr = NULL;
-      return ENOMEM;
-    }
-  return 0;
-}
-
-extern "C" int
-pthread_attr_getinheritsched (const pthread_attr_t *attr,
-				int *inheritsched)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  *inheritsched = (*attr)->inheritsched;
-  return 0;
-}
-
-extern "C" int
-pthread_attr_getschedparam (const pthread_attr_t *attr,
-			      struct sched_param *param)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  *param = (*attr)->schedparam;
-  return 0;
-}
-
-/* From a pure code point of view, this should call a helper in sched.cc,
-   to allow for someone adding scheduler policy changes to win32 in the future.
-   However that's extremely unlikely, so short and sweet will do us */
-extern "C" int
-pthread_attr_getschedpolicy (const pthread_attr_t *attr, int *policy)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  *policy = SCHED_FIFO;
-  return 0;
-}
-
-
-extern "C" int
-pthread_attr_getscope (const pthread_attr_t *attr, int *contentionscope)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  *contentionscope = (*attr)->contentionscope;
-  return 0;
-}
-
-extern "C" int
-pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  if (detachstate < 0 || detachstate > 1)
-    return EINVAL;
-  (*attr)->joinable = detachstate;
-  return 0;
-}
-
-extern "C" int
-pthread_attr_getdetachstate (const pthread_attr_t *attr, int *detachstate)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  *detachstate = (*attr)->joinable;
-  return 0;
-}
-
-extern "C" int
-pthread_attr_setinheritsched (pthread_attr_t *attr, int inheritsched)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  if (inheritsched != PTHREAD_INHERIT_SCHED
-      && inheritsched != PTHREAD_EXPLICIT_SCHED)
-    return ENOTSUP;
-  (*attr)->inheritsched = inheritsched;
-  return 0;
-}
-
-extern "C" int
-pthread_attr_setschedparam (pthread_attr_t *attr,
-			      const struct sched_param *param)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  if (!valid_sched_parameters (param))
-    return ENOTSUP;
-  (*attr)->schedparam = *param;
-  return 0;
-}
-
-/* See __pthread_attr_getschedpolicy for some notes */
-extern "C" int
-pthread_attr_setschedpolicy (pthread_attr_t *attr, int policy)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  if (policy != SCHED_FIFO)
-    return ENOTSUP;
-  return 0;
-}
-
-extern "C" int
-pthread_attr_setscope (pthread_attr_t *attr, int contentionscope)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  if (contentionscope != PTHREAD_SCOPE_SYSTEM
-      && contentionscope != PTHREAD_SCOPE_PROCESS)
-    return EINVAL;
-  /* In future, we may be able to support system scope by escalating the thread
-     priority to exceed the priority class. For now we only support PROCESS scope. */
-  if (contentionscope != PTHREAD_SCOPE_PROCESS)
-    return ENOTSUP;
-  (*attr)->contentionscope = contentionscope;
-  return 0;
-}
-
-extern "C" int
-pthread_attr_setstacksize (pthread_attr_t *attr, size_t size)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  (*attr)->stacksize = size;
-  return 0;
-}
-
-extern "C" int
-pthread_attr_getstacksize (const pthread_attr_t *attr, size_t *size)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  *size = (*attr)->stacksize;
-  return 0;
-}
-
-extern "C" int
-pthread_attr_destroy (pthread_attr_t *attr)
-{
-  if (!pthread_attr::is_good_object (attr))
-    return EINVAL;
-  delete (*attr);
-  *attr = NULL;
-  return 0;
-}
-
-int
-pthread::join (pthread_t *thread, void **return_val)
-{
-   pthread_t joiner = self ();
-
-   joiner->testcancel ();
-
-   // Initialize return val with NULL
-   if (return_val)
-     *return_val = NULL;
-
-   if (!is_good_object (&joiner))
-     return EINVAL;
-
-  if (!is_good_object (thread))
-    return ESRCH;
-
-  if (equal (*thread,joiner))
-    return EDEADLK;
-
-  (*thread)->mutex.lock ();
-
-  if ((*thread)->attr.joinable == PTHREAD_CREATE_DETACHED)
-    {
-      (*thread)->mutex.unlock ();
-      return EINVAL;
-    }
-  else
-    {
-      (*thread)->joiner = joiner;
-      (*thread)->attr.joinable = PTHREAD_CREATE_DETACHED;
-      (*thread)->mutex.unlock ();
-
-      switch (cancelable_wait ((*thread)->win32_obj_id, INFINITE, false))
-	{
-	case WAIT_OBJECT_0:
-	  if (return_val)
-	    *return_val = (*thread)->return_ptr;
-	  delete (*thread);
-	  break;
-	case WAIT_CANCELED:
-	  // set joined thread back to joinable since we got canceled
-	  (*thread)->joiner = NULL;
-	  (*thread)->attr.joinable = PTHREAD_CREATE_JOINABLE;
-	  joiner->cancel_self ();
-	  // never reached
-	  break;
-	default:
-	  // should never happen
-	  return EINVAL;
-	}
-    }
-
-  return 0;
-}
-
-int
-pthread::detach (pthread_t *thread)
-{
-  if (!is_good_object (thread))
-    return ESRCH;
-
-  (*thread)->mutex.lock ();
-  if ((*thread)->attr.joinable == PTHREAD_CREATE_DETACHED)
-    {
-      (*thread)->mutex.unlock ();
-      return EINVAL;
-    }
-
-  // check if thread is still alive
-  if ((*thread)->valid && WaitForSingleObject ((*thread)->win32_obj_id, 0) == WAIT_TIMEOUT)
-    {
-      // force cleanup on exit
-      (*thread)->joiner = *thread;
-      (*thread)->attr.joinable = PTHREAD_CREATE_DETACHED;
-      (*thread)->mutex.unlock ();
-    }
-  else
-    {
-      // thread has already terminated.
-      (*thread)->mutex.unlock ();
-      delete (*thread);
-    }
-
-  return 0;
-}
-
-int
-pthread::suspend (pthread_t *thread)
-{
-  if (!is_good_object (thread))
-    return ESRCH;
-
-  if ((*thread)->suspended == false)
-    {
-      (*thread)->suspended = true;
-      SuspendThread ((*thread)->win32_obj_id);
-    }
-
-  return 0;
-}
-
-
-int
-pthread::resume (pthread_t *thread)
-{
-  if (!is_good_object (thread))
-    return ESRCH;
-
-  if ((*thread)->suspended == true)
-    ResumeThread ((*thread)->win32_obj_id);
-  (*thread)->suspended = false;
-
-  return 0;
-}
-
-/* provided for source level compatability.
-   See http://www.opengroup.org/onlinepubs/007908799/xsh/pthread_getconcurrency.html
-*/
-extern "C" int
-pthread_getconcurrency (void)
-{
-  return MT_INTERFACE->concurrency;
-}
-
-/* keep this in sync with sched.cc */
-extern "C" int
-pthread_getschedparam (pthread_t thread, int *policy,
-			 struct sched_param *param)
-{
-  if (!pthread::is_good_object (&thread))
-    return ESRCH;
-  *policy = SCHED_FIFO;
-  /* we don't return the current effective priority, we return the current
-     requested priority */
-  *param = thread->attr.schedparam;
-  return 0;
-}
-
-/* Thread SpecificData */
-extern "C" int
-pthread_key_create (pthread_key_t *key, void (*destructor) (void *))
-{
-  /* The opengroup docs don't define if we should check this or not,
-     but creation is relatively rare.  */
-  if (pthread_key::is_good_object (key))
-    return EBUSY;
-
-  *key = new pthread_key (destructor);
-
-  if (!pthread_key::is_good_object (key))
-    {
-      delete (*key);
-      *key = NULL;
-      return EAGAIN;
-    }
-  return 0;
-}
-
-extern "C" int
-pthread_key_delete (pthread_key_t key)
-{
-  if (!pthread_key::is_good_object (&key))
-    return EINVAL;
-
-  delete (key);
-  return 0;
-}
-
-/* provided for source level compatability.  See
-http://www.opengroup.org/onlinepubs/007908799/xsh/pthread_getconcurrency.html
-*/
-extern "C" int
-pthread_setconcurrency (int new_level)
-{
-  if (new_level < 0)
-    return EINVAL;
-  MT_INTERFACE->concurrency = new_level;
-  return 0;
-}
-
-/* keep syncronised with sched.cc */
-extern "C" int
-pthread_setschedparam (pthread_t thread, int policy,
-			 const struct sched_param *param)
-{
-  if (!pthread::is_good_object (&thread))
-    return ESRCH;
-  if (policy != SCHED_FIFO)
-    return ENOTSUP;
-  if (!param)
-    return EINVAL;
-  int rv =
-    sched_set_thread_priority (thread->win32_obj_id, param->sched_priority);
-  if (!rv)
-    thread->attr.schedparam.sched_priority = param->sched_priority;
-  return rv;
-}
-
-
-extern "C" int
-pthread_setspecific (pthread_key_t key, const void *value)
-{
-  if (!pthread_key::is_good_object (&key))
-    return EINVAL;
-  (key)->set (value);
-  return 0;
-}
-
-extern "C" void *
-pthread_getspecific (pthread_key_t key)
-{
-  if (!pthread_key::is_good_object (&key))
-    return NULL;
-
-  return (key)->get ();
-
-}
-
-/* Thread synchronisation */
-bool
-pthread_cond::is_good_object (pthread_cond_t const *cond)
-{
-  if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC) != VALID_OBJECT)
-    return false;
-  return true;
-}
-
-bool
-pthread_cond::is_good_initializer (pthread_cond_t const *cond)
-{
-  if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC, PTHREAD_COND_INITIALIZER) != VALID_STATIC_OBJECT)
-    return false;
-  return true;
-}
-
-bool
-pthread_cond::is_good_initializer_or_object (pthread_cond_t const *cond)
-{
-  if (verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC, PTHREAD_COND_INITIALIZER) == INVALID_OBJECT)
-    return false;
-  return true;
-}
-
-bool
-pthread_cond::is_good_initializer_or_bad_object (pthread_cond_t const *cond)
-{
-  verifyable_object_state objectState = verifyable_object_isvalid (cond, PTHREAD_COND_MAGIC, PTHREAD_COND_INITIALIZER);
-  if (objectState == VALID_OBJECT)
-	return false;
-  return true;
-}
-
-extern "C" int
-pthread_cond_destroy (pthread_cond_t *cond)
-{
-  if (pthread_cond::is_good_initializer (cond))
-    return 0;
-  if (!pthread_cond::is_good_object (cond))
-    return EINVAL;
-
-  /* reads are atomic */
-  if ((*cond)->waiting)
-    return EBUSY;
-
-  delete (*cond);
-  *cond = NULL;
-
-  return 0;
-}
-
-int
-pthread_cond::init (pthread_cond_t *cond, const pthread_condattr_t *attr)
-{
-  if (attr && !pthread_condattr::is_good_object (attr))
-    return EINVAL;
-
-  cond_initialization_lock.lock ();
-
-  if (!is_good_initializer_or_bad_object (cond))
-    {
-      cond_initialization_lock.unlock ();
-      return EBUSY;
-    }
-
-  *cond = new pthread_cond (attr ? (*attr) : NULL);
-  if (!is_good_object (cond))
-    {
-      delete (*cond);
-      *cond = NULL;
-      cond_initialization_lock.unlock ();
-      return EAGAIN;
-    }
-  cond_initialization_lock.unlock ();
-  return 0;
-}
-
-extern "C" int
-pthread_cond_broadcast (pthread_cond_t *cond)
-{
-  if (pthread_cond::is_good_initializer (cond))
-    return 0;
-  if (!pthread_cond::is_good_object (cond))
-    return EINVAL;
-
-  (*cond)->unblock (true);
-
-  return 0;
-}
-
-extern "C" int
-pthread_cond_signal (pthread_cond_t *cond)
-{
-  if (pthread_cond::is_good_initializer (cond))
-    return 0;
-  if (!pthread_cond::is_good_object (cond))
-    return EINVAL;
-
-  (*cond)->unblock (false);
-
-  return 0;
-}
-
-static int
-__pthread_cond_dowait (pthread_cond_t *cond, pthread_mutex_t *mutex,
-		       DWORD waitlength)
-{
-  if (!pthread_mutex::is_good_object (mutex))
-    return EINVAL;
-  if (!pthread_mutex::can_be_unlocked (mutex))
-    return EPERM;
-
-  if (pthread_cond::is_good_initializer (cond))
-    pthread_cond::init (cond, NULL);
-  if (!pthread_cond::is_good_object (cond))
-    return EINVAL;
-
-  return (*cond)->wait (*mutex, waitlength);
-}
-
-extern "C" int
-pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex,
-			const struct timespec *abstime)
-{
-  struct timeval tv;
-  long waitlength;
-
-  pthread_testcancel ();
-
-  if (check_valid_pointer (abstime))
-    return EINVAL;
-
-  gettimeofday (&tv, NULL);
-  waitlength = abstime->tv_sec * 1000 + abstime->tv_nsec / (1000 * 1000);
-  waitlength -= tv.tv_sec * 1000 + tv.tv_usec / 1000;
-  if (waitlength < 0)
-    return ETIMEDOUT;
-  return __pthread_cond_dowait (cond, mutex, waitlength);
-}
-
-extern "C" int
-pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
-{
-  pthread_testcancel ();
-
-  return __pthread_cond_dowait (cond, mutex, INFINITE);
-}
-
-extern "C" int
-pthread_condattr_init (pthread_condattr_t *condattr)
-{
-  if (pthread_condattr::is_good_object (condattr))
-    return EBUSY;
-
-  *condattr = new pthread_condattr;
-  if (!pthread_condattr::is_good_object (condattr))
-    {
-      delete (*condattr);
-      *condattr = NULL;
-      return ENOMEM;
-    }
-  return 0;
-}
-
-extern "C" int
-pthread_condattr_getpshared (const pthread_condattr_t *attr, int *pshared)
-{
-  if (!pthread_condattr::is_good_object (attr))
-    return EINVAL;
-  *pshared = (*attr)->shared;
-  return 0;
-}
-
-extern "C" int
-pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared)
-{
-  if (!pthread_condattr::is_good_object (attr))
-    return EINVAL;
-  if ((pshared < 0) || (pshared > 1))
-    return EINVAL;
-  /* shared cond vars not currently supported */
-  if (pshared != PTHREAD_PROCESS_PRIVATE)
-    return EINVAL;
-  (*attr)->shared = pshared;
-  return 0;
-}
-
-extern "C" int
-pthread_condattr_destroy (pthread_condattr_t *condattr)
-{
-  if (!pthread_condattr::is_good_object (condattr))
-    return EINVAL;
-  delete (*condattr);
-  *condattr = NULL;
-  return 0;
-}
-
-/* RW locks */
-bool
-pthread_rwlock::is_good_object (pthread_rwlock_t const *rwlock)
-{
-  if (verifyable_object_isvalid (rwlock, PTHREAD_RWLOCK_MAGIC) != VALID_OBJECT)
-    return false;
-  return true;
-}
-
-bool
-pthread_rwlock::is_good_initializer (pthread_rwlock_t const *rwlock)
-{
-  if (verifyable_object_isvalid (rwlock, PTHREAD_RWLOCK_MAGIC, PTHREAD_RWLOCK_INITIALIZER) != VALID_STATIC_OBJECT)
-    return false;
-  return true;
-}
-
-bool
-pthread_rwlock::is_good_initializer_or_object (pthread_rwlock_t const *rwlock)
-{
-  if (verifyable_object_isvalid (rwlock, PTHREAD_RWLOCK_MAGIC, PTHREAD_RWLOCK_INITIALIZER) == INVALID_OBJECT)
-    return false;
-  return true;
-}
-
-bool
-pthread_rwlock::is_good_initializer_or_bad_object (pthread_rwlock_t const *rwlock)
-{
-  verifyable_object_state objectState = verifyable_object_isvalid (rwlock, PTHREAD_RWLOCK_MAGIC, PTHREAD_RWLOCK_INITIALIZER);
-  if (objectState == VALID_OBJECT)
-	return false;
-  return true;
-}
-
-extern "C" int
-pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
-{
-  if (pthread_rwlock::is_good_initializer (rwlock))
-    return 0;
-  if (!pthread_rwlock::is_good_object (rwlock))
-    return EINVAL;
-
-  if ((*rwlock)->writer || (*rwlock)->readers ||
-      (*rwlock)->waiting_readers || (*rwlock)->waiting_writers)
-    return EBUSY;
-
-  delete (*rwlock);
-  *rwlock = NULL;
-
-  return 0;
-}
-
-int
-pthread_rwlock::init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr)
-{
-  if (attr && !pthread_rwlockattr::is_good_object (attr))
-    return EINVAL;
-
-  rwlock_initialization_lock.lock ();
-
-  if (!is_good_initializer_or_bad_object (rwlock))
-    {
-      rwlock_initialization_lock.unlock ();
-      return EBUSY;
-    }
-
-  *rwlock = new pthread_rwlock (attr ? (*attr) : NULL);
-  if (!is_good_object (rwlock))
-    {
-      delete (*rwlock);
-      *rwlock = NULL;
-      rwlock_initialization_lock.unlock ();
-      return EAGAIN;
-    }
-  rwlock_initialization_lock.unlock ();
-  return 0;
-}
-
-extern "C" int
-pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
-{
-  pthread_testcancel ();
-
-  if (pthread_rwlock::is_good_initializer (rwlock))
-    pthread_rwlock::init (rwlock, NULL);
-  if (!pthread_rwlock::is_good_object (rwlock))
-    return EINVAL;
-
-  return (*rwlock)->rdlock ();
-}
-
-extern "C" int
-pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
-{
-  if (pthread_rwlock::is_good_initializer (rwlock))
-    pthread_rwlock::init (rwlock, NULL);
-  if (!pthread_rwlock::is_good_object (rwlock))
-    return EINVAL;
-
-  return (*rwlock)->tryrdlock ();
-}
-
-extern "C" int
-pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
-{
-  pthread_testcancel ();
-
-  if (pthread_rwlock::is_good_initializer (rwlock))
-    pthread_rwlock::init (rwlock, NULL);
-  if (!pthread_rwlock::is_good_object (rwlock))
-    return EINVAL;
-
-  return (*rwlock)->wrlock ();
-}
-
-extern "C" int
-pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
-{
-  if (pthread_rwlock::is_good_initializer (rwlock))
-    pthread_rwlock::init (rwlock, NULL);
-  if (!pthread_rwlock::is_good_object (rwlock))
-    return EINVAL;
-
-  return (*rwlock)->trywrlock ();
-}
-
-extern "C" int
-pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
-{
-  if (pthread_rwlock::is_good_initializer (rwlock))
-    return 0;
-  if (!pthread_rwlock::is_good_object (rwlock))
-    return EINVAL;
-
-  return (*rwlock)->unlock ();
-}
-
-extern "C" int
-pthread_rwlockattr_init (pthread_rwlockattr_t *rwlockattr)
-{
-  if (pthread_rwlockattr::is_good_object (rwlockattr))
-    return EBUSY;
-
-  *rwlockattr = new pthread_rwlockattr;
-  if (!pthread_rwlockattr::is_good_object (rwlockattr))
-    {
-      delete (*rwlockattr);
-      *rwlockattr = NULL;
-      return ENOMEM;
-    }
-  return 0;
-}
-
-extern "C" int
-pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, int *pshared)
-{
-  if (!pthread_rwlockattr::is_good_object (attr))
-    return EINVAL;
-  *pshared = (*attr)->shared;
-  return 0;
-}
-
-extern "C" int
-pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared)
-{
-  if (!pthread_rwlockattr::is_good_object (attr))
-    return EINVAL;
-  if ((pshared < 0) || (pshared > 1))
-    return EINVAL;
-  /* shared rwlock vars not currently supported */
-  if (pshared != PTHREAD_PROCESS_PRIVATE)
-    return EINVAL;
-  (*attr)->shared = pshared;
-  return 0;
-}
-
-extern "C" int
-pthread_rwlockattr_destroy (pthread_rwlockattr_t *rwlockattr)
-{
-  if (!pthread_rwlockattr::is_good_object (rwlockattr))
-    return EINVAL;
-  delete (*rwlockattr);
-  *rwlockattr = NULL;
-  return 0;
-}
-
-/* Thread signal */
-extern "C" int
-pthread_kill (pthread_t thread, int sig)
-{
-  // lock myself, for the use of thread2signal
-  // two different kills might clash: FIXME
-
-  if (!pthread::is_good_object (&thread))
-    return EINVAL;
-
-  int rval = sig ? sig_send (NULL, sig, thread->cygtls) : 0;
-
-  // unlock myself
-  return rval;
-}
-
-extern "C" int
-pthread_sigmask (int operation, const sigset_t *set, sigset_t *old_set)
-{
-  return handle_sigprocmask (operation, set, old_set, _my_tls.sigmask);
-}
-
-/* ID */
-
-extern "C" int
-pthread_equal (pthread_t t1, pthread_t t2)
-{
-  return pthread::equal (t1, t2);
-}
-
-/* Mutexes  */
-
-/* FIXME: there's a potential race with PTHREAD_MUTEX_INITALIZER:
-   the mutex is not actually inited until the first use.
-   So two threads trying to lock/trylock may collide.
-   Solution: we need a global mutex on mutex creation, or possibly simply
-   on all constructors that allow INITIALIZER macros.
-   the lock should be very small: only around the init routine, not
-   every test, or all mutex access will be synchronised.  */
-
-int
-pthread_mutex::init (pthread_mutex_t *mutex,
-		      const pthread_mutexattr_t *attr)
-{
-  if (attr && !pthread_mutexattr::is_good_object (attr) || check_valid_pointer (mutex))
-    return EINVAL;
-
-  mutex_initialization_lock.lock ();
-
-  if (!is_good_initializer_or_bad_object (mutex))
-    {
-      mutex_initialization_lock.unlock ();
-      return EBUSY;
-    }
-
-  *mutex = new pthread_mutex (attr ? (*attr) : NULL);
-  if (!is_good_object (mutex))
-    {
-      delete (*mutex);
-      *mutex = NULL;
-      mutex_initialization_lock.unlock ();
-      return EAGAIN;
-    }
-  mutex_initialization_lock.unlock ();
-  return 0;
-}
-
-extern "C" int
-pthread_mutex_getprioceiling (const pthread_mutex_t *mutex,
-				int *prioceiling)
-{
-  pthread_mutex_t *themutex = (pthread_mutex_t *) mutex;
-  if (pthread_mutex::is_good_initializer (mutex))
-    pthread_mutex::init ((pthread_mutex_t *) mutex, NULL);
-  if (!pthread_mutex::is_good_object (themutex))
-    return EINVAL;
-  /* We don't define _POSIX_THREAD_PRIO_PROTECT because we do't currently support
-     mutex priorities.
-
-     We can support mutex priorities in the future though:
-     Store a priority with each mutex.
-     When the mutex is optained, set the thread priority as appropriate
-     When the mutex is released, reset the thread priority.  */
-  return ENOSYS;
-}
-
-extern "C" int
-pthread_mutex_lock (pthread_mutex_t *mutex)
-{
-  pthread_mutex_t *themutex = mutex;
-  /* This could be simplified via is_good_initializer_or_object
-     and is_good_initializer, but in a performance critical call like this....
-     no.  */
-  switch (verifyable_object_isvalid (themutex, PTHREAD_MUTEX_MAGIC, PTHREAD_MUTEX_INITIALIZER))
-    {
-    case INVALID_OBJECT:
-      return EINVAL;
-      break;
-    case VALID_STATIC_OBJECT:
-      if (pthread_mutex::is_good_initializer (mutex))
-	{
-	  int rv = pthread_mutex::init (mutex, NULL);
-	  if (rv && rv != EBUSY)
-	    return rv;
-	}
-      /* No else needed. If it's been initialized while we waited,
-	 we can just attempt to lock it */
-      break;
-    case VALID_OBJECT:
-      break;
-    }
-  return (*themutex)->lock ();
-}
-
-extern "C" int
-pthread_mutex_trylock (pthread_mutex_t *mutex)
-{
-  pthread_mutex_t *themutex = mutex;
-  if (pthread_mutex::is_good_initializer (mutex))
-    pthread_mutex::init (mutex, NULL);
-  if (!pthread_mutex::is_good_object (themutex))
-    return EINVAL;
-  return (*themutex)->trylock ();
-}
-
-extern "C" int
-pthread_mutex_unlock (pthread_mutex_t *mutex)
-{
-  if (pthread_mutex::is_good_initializer (mutex))
-    pthread_mutex::init (mutex, NULL);
-  if (!pthread_mutex::is_good_object (mutex))
-    return EINVAL;
-  return (*mutex)->unlock ();
-}
-
-extern "C" int
-pthread_mutex_destroy (pthread_mutex_t *mutex)
-{
-  int rv;
-
-  if (pthread_mutex::is_good_initializer (mutex))
-    return 0;
-  if (!pthread_mutex::is_good_object (mutex))
-    return EINVAL;
-
-  rv = (*mutex)->destroy ();
-  if (rv)
-    return rv;
-
-  *mutex = NULL;
-  return 0;
-}
-
-extern "C" int
-pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prioceiling,
-				int *old_ceiling)
-{
-  pthread_mutex_t *themutex = mutex;
-  if (pthread_mutex::is_good_initializer (mutex))
-    pthread_mutex::init (mutex, NULL);
-  if (!pthread_mutex::is_good_object (themutex))
-    return EINVAL;
-  return ENOSYS;
-}
-
-/* Win32 doesn't support mutex priorities - see __pthread_mutex_getprioceiling
-   for more detail */
-extern "C" int
-pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr,
-				 int *protocol)
-{
-  if (!pthread_mutexattr::is_good_object (attr))
-    return EINVAL;
-  return ENOSYS;
-}
-
-extern "C" int
-pthread_mutexattr_getpshared (const pthread_mutexattr_t *attr,
-				int *pshared)
-{
-  if (!pthread_mutexattr::is_good_object (attr))
-    return EINVAL;
-  *pshared = (*attr)->pshared;
-  return 0;
-}
-
-extern "C" int
-pthread_mutexattr_gettype (const pthread_mutexattr_t *attr, int *type)
-{
-  if (!pthread_mutexattr::is_good_object (attr))
-    return EINVAL;
-  *type = (*attr)->mutextype;
-  return 0;
-}
-
-/* FIXME: write and test process shared mutex's.  */
-extern "C" int
-pthread_mutexattr_init (pthread_mutexattr_t *attr)
-{
-  if (pthread_mutexattr::is_good_object (attr))
-    return EBUSY;
-
-  *attr = new pthread_mutexattr ();
-  if (!pthread_mutexattr::is_good_object (attr))
-    {
-      delete (*attr);
-      *attr = NULL;
-      return ENOMEM;
-    }
-  return 0;
-}
-
-extern "C" int
-pthread_mutexattr_destroy (pthread_mutexattr_t *attr)
-{
-  if (!pthread_mutexattr::is_good_object (attr))
-    return EINVAL;
-  delete (*attr);
-  *attr = NULL;
-  return 0;
-}
-
-
-/* Win32 doesn't support mutex priorities */
-extern "C" int
-pthread_mutexattr_setprotocol (pthread_mutexattr_t *attr, int protocol)
-{
-  if (!pthread_mutexattr::is_good_object (attr))
-    return EINVAL;
-  return ENOSYS;
-}
-
-/* Win32 doesn't support mutex priorities */
-extern "C" int
-pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attr,
-				    int prioceiling)
-{
-  if (!pthread_mutexattr::is_good_object (attr))
-    return EINVAL;
-  return ENOSYS;
-}
-
-extern "C" int
-pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr,
-				    int *prioceiling)
-{
-  if (!pthread_mutexattr::is_good_object (attr))
-    return EINVAL;
-  return ENOSYS;
-}
-
-extern "C" int
-pthread_mutexattr_setpshared (pthread_mutexattr_t *attr, int pshared)
-{
-  if (!pthread_mutexattr::is_good_object (attr))
-    return EINVAL;
-  /* we don't use pshared for anything as yet. We need to test PROCESS_SHARED
-   *functionality
-   */
-  if (pshared != PTHREAD_PROCESS_PRIVATE)
-    return EINVAL;
-  (*attr)->pshared = pshared;
-  return 0;
-}
-
-/* see pthread_mutex_gettype */
-extern "C" int
-pthread_mutexattr_settype (pthread_mutexattr_t *attr, int type)
-{
-  if (!pthread_mutexattr::is_good_object (attr))
-    return EINVAL;
-
-  switch (type)
-    {
-    case PTHREAD_MUTEX_ERRORCHECK:
-    case PTHREAD_MUTEX_RECURSIVE:
-    case PTHREAD_MUTEX_NORMAL:
-      (*attr)->mutextype = type;
-      break;
-    default:
-      return EINVAL;
-    }
-
-  return 0;
-}
-
-/* Semaphores */
-
-/* static members */
-bool
-semaphore::is_good_object (sem_t const * sem)
-{
-  if (verifyable_object_isvalid (sem, SEM_MAGIC) != VALID_OBJECT)
-    return false;
-  return true;
-}
-
-int
-semaphore::init (sem_t *sem, int pshared, unsigned int value)
-{
-  /* opengroup calls this undefined */
-  if (is_good_object (sem))
-    return EBUSY;
-
-  if (value > SEM_VALUE_MAX)
-    return EINVAL;
-
-  *sem = new semaphore (pshared, value);
-
-  if (!is_good_object (sem))
-    {
-      delete (*sem);
-      *sem = NULL;
-      return EAGAIN;
-    }
-  return 0;
-}
-
-int
-semaphore::destroy (sem_t *sem)
-{
-  if (!is_good_object (sem))
-    return EINVAL;
-
-  /* FIXME - new feature - test for busy against threads... */
-
-  delete (*sem);
-  *sem = NULL;
-  return 0;
-}
-
-sem_t *
-semaphore::open (const char *name, int oflag, mode_t mode, unsigned int value)
-{
-  if (value > SEM_VALUE_MAX)
-    {
-      set_errno (EINVAL);
-      return NULL;
-    }
-
-  sem_t *sem = new sem_t;
-  if (!sem)
-    {
-      set_errno (ENOMEM);
-      return NULL;
-    }
-
-  *sem = new semaphore (name, oflag, mode, value);
-
-  if (!is_good_object (sem))
-    {
-      delete *sem;
-      delete sem;
-      return NULL;
-    }
-  return sem;
-}
-
-int
-semaphore::wait (sem_t *sem)
-{
-  pthread_testcancel ();
-
-  if (!is_good_object (sem))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  (*sem)->_wait ();
-  return 0;
-}
-
-int
-semaphore::trywait (sem_t *sem)
-{
-  if (!is_good_object (sem))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  return (*sem)->_trywait ();
-}
-
-int
-semaphore::timedwait (sem_t *sem, const struct timespec *abstime)
-{
-  if (!is_good_object (sem))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  return (*sem)->_timedwait (abstime);
-}
-
-int
-semaphore::post (sem_t *sem)
-{
-  if (!is_good_object (sem))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  (*sem)->_post ();
-  return 0;
-}
-
-int
-semaphore::getvalue (sem_t *sem, int *sval)
-{
-
-  if (!is_good_object (sem)
-      || __check_null_invalid_struct (sval, sizeof (int)))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-
-  return (*sem)->_getvalue (sval);
-}
-
-/* pthread_null */
-pthread *
-pthread_null::get_null_pthread ()
-{
-  /* because of weird entry points */
-  _instance.magic = 0;
-  return &_instance;
-}
-
-pthread_null::pthread_null ()
-{
-  attr.joinable = PTHREAD_CREATE_DETACHED;
-  /* Mark ourselves as invalid */
-  magic = 0;
-}
-
-pthread_null::~pthread_null ()
-{
-}
-
-void
-pthread_null::create (void *(*)(void *), pthread_attr *, void *)
-{
-}
-
-void
-pthread_null::exit (void *value_ptr)
-{
-  ExitThread (0);
-}
-
-int
-pthread_null::cancel ()
-{
-  return 0;
-}
-
-void
-pthread_null::testcancel ()
-{
-}
-
-int
-pthread_null::setcancelstate (int state, int *oldstate)
-{
-  return EINVAL;
-}
-
-int
-pthread_null::setcanceltype (int type, int *oldtype)
-{
-  return EINVAL;
-}
-
-void
-pthread_null::push_cleanup_handler (__pthread_cleanup_handler *handler)
-{
-}
-
-void
-pthread_null::pop_cleanup_handler (int const execute)
-{
-}
-
-unsigned long
-pthread_null::getsequence_np ()
-{
-  return 0;
-}
-
-pthread_null pthread_null::_instance;
diff --git a/winsup/cygwin/thread.h b/winsup/cygwin/thread.h
deleted file mode 100644
index 4e94cbbb4..000000000
--- a/winsup/cygwin/thread.h
+++ /dev/null
@@ -1,805 +0,0 @@
-/* thread.h: Locking and threading module definitions
-
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Marco Fuykschot <marco@ddi.nl>
-   Major update 2001 Robert Collins <rbtcollins@hotmail.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _CYGNUS_THREADS_
-#define _CYGNUS_THREADS_
-
-#define LOCK_FD_LIST     1
-#define LOCK_MEMORY_LIST 2
-#define LOCK_MMAP_LIST   3
-#define LOCK_DLL_LIST    4
-
-#define WRITE_LOCK 1
-#define READ_LOCK  2
-
-extern "C"
-{
-#if defined (_CYG_THREAD_FAILSAFE) && defined (_MT_SAFE)
-  void AssertResourceOwner (int, int);
-#else
-#define AssertResourceOwner(i,ii)
-#endif
-}
-
-#ifndef _MT_SAFE
-
-#define SetResourceLock(i,n,c)
-#define ReleaseResourceLock(i,n,c)
-
-#else
-
-#include <pthread.h>
-#include <limits.h>
-#include <errno.h>
-#include <signal.h>
-#include <pwd.h>
-#include <grp.h>
-#include <security.h>
-#define _NOMNTENT_FUNCS
-#include <mntent.h>
-
-extern "C"
-{
-
-struct _winsup_t
-{
-  /*
-     Needed for the group functions
-   */
-  struct __group16 _grp;
-  char *_namearray[2];
-  int _grp_pos;
-
-  /* console.cc */
-  unsigned _rarg;
-
-  /* dlfcn.cc */
-  int _dl_error;
-  char _dl_buffer[256];
-
-  /* passwd.cc */
-  struct passwd _res;
-  char _pass[_PASSWORD_LEN];
-  int _pw_pos;
-
-  /* path.cc */
-  struct mntent mntbuf;
-  int _iteration;
-  DWORD available_drives;
-  char mnt_type[80];
-  char mnt_opts[80];
-  char mnt_fsname[CYG_MAX_PATH];
-  char mnt_dir[CYG_MAX_PATH];
-
-  /* strerror */
-  char _strerror_buf[20];
-
-  /* sysloc.cc */
-  char *_process_ident;
-  int _process_logopt;
-  int _process_facility;
-  int _process_logmask;
-
-  /* times.cc */
-  char timezone_buf[20];
-  struct tm _localtime_buf;
-
-  /* uinfo.cc */
-  char _username[UNLEN + 1];
-
-  /* net.cc */
-  char *_ntoa_buf;
-  struct protoent *_protoent_buf;
-  struct servent *_servent_buf;
-  struct hostent *_hostent_buf;
-};
-
-
-struct __reent_t
-{
-  struct _reent *_clib;
-  struct _winsup_t *_winsup;
-  void init_clib (_reent&);
-};
-
-_winsup_t *_reent_winsup ();
-void SetResourceLock (int, int, const char *) __attribute__ ((regparm (3)));
-void ReleaseResourceLock (int, int, const char *)
-  __attribute__ ((regparm (3)));
-
-#ifdef _CYG_THREAD_FAILSAFE
-void AssertResourceOwner (int, int);
-#else
-#define AssertResourceOwner(i,ii)
-#endif
-}
-
-class fast_mutex
-{
-public:
-  fast_mutex () :
-    lock_counter (0), win32_obj_id (0)
-  {
-  }
-
-  ~fast_mutex ()
-  {
-    if(win32_obj_id)
-      CloseHandle (win32_obj_id);
-  }
-
-  bool init ()
-  {
-    lock_counter = 0;
-    win32_obj_id = ::CreateSemaphore (&sec_none_nih, 0, LONG_MAX, NULL);
-    if (!win32_obj_id)
-      {
-	debug_printf ("CreateSemaphore failed. %E");
-	return false;
-      }
-    return true;
-  }
-
-  void lock ()
-  {
-    if (InterlockedIncrement ((long *)&lock_counter) != 1)
-      WaitForSingleObject (win32_obj_id, INFINITE);
-  }
-
-  void unlock ()
-  {
-    if (InterlockedDecrement ((long *)&lock_counter))
-      ::ReleaseSemaphore (win32_obj_id, 1, NULL);
-  }
-
-private:
-  unsigned long lock_counter;
-  HANDLE win32_obj_id;
-};
-
-class per_process;
-class pinfo;
-
-class ResourceLocks
-{
-public:
-  ResourceLocks ()
-  {
-  }
-  LPCRITICAL_SECTION Lock (int);
-  void Init ();
-  void Delete ();
-#ifdef _CYG_THREAD_FAILSAFE
-  DWORD owner;
-  DWORD count;
-#endif
-private:
-  CRITICAL_SECTION lock;
-  bool inited;
-};
-
-#define PTHREAD_MAGIC 0xdf0df045
-#define PTHREAD_MUTEX_MAGIC PTHREAD_MAGIC+1
-#define PTHREAD_KEY_MAGIC PTHREAD_MAGIC+2
-#define PTHREAD_ATTR_MAGIC PTHREAD_MAGIC+3
-#define PTHREAD_MUTEXATTR_MAGIC PTHREAD_MAGIC+4
-#define PTHREAD_COND_MAGIC PTHREAD_MAGIC+5
-#define PTHREAD_CONDATTR_MAGIC PTHREAD_MAGIC+6
-#define SEM_MAGIC PTHREAD_MAGIC+7
-#define PTHREAD_ONCE_MAGIC PTHREAD_MAGIC+8
-#define PTHREAD_RWLOCK_MAGIC PTHREAD_MAGIC+9
-#define PTHREAD_RWLOCKATTR_MAGIC PTHREAD_MAGIC+10
-
-#define MUTEX_OWNER_ANONYMOUS        ((pthread_t) -1)
-
-/* verifyable_object should not be defined here - it's a general purpose class */
-
-class verifyable_object
-{
-public:
-  long magic;
-
-  verifyable_object (long);
-  virtual ~verifyable_object ();
-};
-
-typedef enum
-{
-  VALID_OBJECT,
-  INVALID_OBJECT,
-  VALID_STATIC_OBJECT
-} verifyable_object_state;
-
-verifyable_object_state verifyable_object_isvalid (void const *, long);
-verifyable_object_state verifyable_object_isvalid (void const *, long, void *);
-
-template <class list_node> inline void
-List_insert (list_node *&head, list_node *node)
-{
-  if (!node)
-    return;
-  do
-    node->next = head;
-  while (InterlockedCompareExchangePointer (&head, node, node->next) != node->next);
-}
-
-template <class list_node> inline void
-List_remove (fast_mutex &mx, list_node *&head, list_node *node)
-{
-  if (!node)
-    return;
-  mx.lock ();
-  if (head)
-    {
-      if (InterlockedCompareExchangePointer (&head, node->next, node) != node)
-	{
-	  list_node *cur = head;
-
-	  while (cur->next && node != cur->next)
-	    cur = cur->next;
-	  if (node == cur->next)
-	    cur->next = cur->next->next;
-	}
-    }
-  mx.unlock ();
-}
-
-
-template <class list_node> class List
-{
- public:
-  List() : head(NULL)
-  {
-    mx_init ();
-  }
-
-  ~List()
-  {
-  }
-
-  void fixup_after_fork ()
-  {
-    mx_init ();
-  }
-
-  void insert (list_node *node)
-  {
-    List_insert (head, node);
-  }
-
-  void remove (list_node *node)
-  {
-    List_remove (mx, head, node);
-  }
-
-  void for_each (void (list_node::*callback) ())
-  {
-    mx.lock ();
-    list_node *cur = head;
-    while (cur)
-      {
-	(cur->*callback) ();
-	cur = cur->next;
-      }
-    mx.unlock ();
-  }
-
-protected:
-  void mx_init ()
-  {
-    if (!mx.init ())
-      api_fatal ("Could not create mutex for list synchronisation.");
-  }
-
-  fast_mutex mx;
-  list_node *head;
-};
-
-class pthread_key: public verifyable_object
-{
-public:
-  static bool is_good_object (pthread_key_t const *);
-  DWORD tls_index;
-
-  int set (const void *);
-  void *get () const;
-
-  pthread_key (void (*)(void *));
-  ~pthread_key ();
-  static void fixup_before_fork ()
-  {
-    keys.for_each (&pthread_key::_fixup_before_fork);
-  }
-
-  static void fixup_after_fork ()
-  {
-    keys.fixup_after_fork ();
-    keys.for_each (&pthread_key::_fixup_after_fork);
-  }
-
-  static void run_all_destructors ()
-  {
-    keys.for_each (&pthread_key::run_destructor);
-  }
-
-  /* List support calls */
-  class pthread_key *next;
-private:
-  static List<pthread_key> keys;
-  void _fixup_before_fork ();
-  void _fixup_after_fork ();
-  void (*destructor) (void *);
-  void run_destructor ();
-  void *fork_buf;
-};
-
-class pthread_attr: public verifyable_object
-{
-public:
-  static bool is_good_object(pthread_attr_t const *);
-  int joinable;
-  int contentionscope;
-  int inheritsched;
-  struct sched_param schedparam;
-  size_t stacksize;
-
-  pthread_attr ();
-  ~pthread_attr ();
-};
-
-class pthread_mutexattr: public verifyable_object
-{
-public:
-  static bool is_good_object(pthread_mutexattr_t const *);
-  int pshared;
-  int mutextype;
-  pthread_mutexattr ();
-  ~pthread_mutexattr ();
-};
-
-class pthread_mutex: public verifyable_object
-{
-public:
-  static bool is_good_object (pthread_mutex_t const *);
-  static bool is_good_initializer (pthread_mutex_t const *);
-  static bool is_good_initializer_or_object (pthread_mutex_t const *);
-  static bool is_good_initializer_or_bad_object (pthread_mutex_t const *mutex);
-  static bool can_be_unlocked (pthread_mutex_t const *mutex);
-  static void init_mutex ();
-  static int init (pthread_mutex_t *, const pthread_mutexattr_t *);
-
-  unsigned long lock_counter;
-  HANDLE win32_obj_id;
-  unsigned int recursion_counter;
-  LONG condwaits;
-  pthread_t owner;
-  int type;
-  int pshared;
-
-  pthread_t get_pthread_self () const
-  {
-    return PTHREAD_MUTEX_NORMAL == type ? MUTEX_OWNER_ANONYMOUS :
-      ::pthread_self ();
-  }
-
-  int lock ()
-  {
-    return _lock (get_pthread_self ());
-  }
-  int trylock ()
-  {
-    return _trylock (get_pthread_self ());
-  }
-  int unlock ()
-  {
-    return _unlock (get_pthread_self ());
-  }
-  int destroy ()
-  {
-    return _destroy (get_pthread_self ());
-  }
-
-  void set_owner (pthread_t self)
-  {
-    recursion_counter = 1;
-    owner = self;
-  }
-
-  int lock_recursive ()
-  {
-    if (UINT_MAX == recursion_counter)
-      return EAGAIN;
-    ++recursion_counter;
-    return 0;
-  }
-
-  pthread_mutex (pthread_mutexattr * = NULL);
-  pthread_mutex (pthread_mutex_t *, pthread_mutexattr *);
-  ~pthread_mutex ();
-
-  class pthread_mutex * next;
-  static void fixup_after_fork ()
-  {
-    mutexes.fixup_after_fork ();
-    mutexes.for_each (&pthread_mutex::_fixup_after_fork);
-  }
-
-private:
-  int _lock (pthread_t self);
-  int _trylock (pthread_t self);
-  int _unlock (pthread_t self);
-  int _destroy (pthread_t self);
-
-  void _fixup_after_fork ();
-
-  static List<pthread_mutex> mutexes;
-  static fast_mutex mutex_initialization_lock;
-};
-
-#define WAIT_CANCELED   (WAIT_OBJECT_0 + 1)
-
-class _threadinfo;
-class pthread: public verifyable_object
-{
-public:
-  HANDLE win32_obj_id;
-  class pthread_attr attr;
-  void *(*function) (void *);
-  void *arg;
-  void *return_ptr;
-  bool valid;
-  bool suspended;
-  int cancelstate, canceltype;
-  _threadinfo *cygtls;
-  HANDLE cancel_event;
-  pthread_t joiner;
-
-  virtual void create (void *(*)(void *), pthread_attr *, void *);
-
-  pthread ();
-  virtual ~pthread ();
-
-  static void init_mainthread ();
-  static bool is_good_object(pthread_t const *);
-  static void atforkprepare();
-  static void atforkparent();
-  static void atforkchild();
-
-  /* API calls */
-  static int cancel (pthread_t);
-  static int join (pthread_t * thread, void **return_val);
-  static int detach (pthread_t * thread);
-  static int create (pthread_t * thread, const pthread_attr_t * attr,
-			      void *(*start_routine) (void *), void *arg);
-  static int once (pthread_once_t *, void (*)(void));
-  static int atfork(void (*)(void), void (*)(void), void (*)(void));
-  static int suspend (pthread_t * thread);
-  static int resume (pthread_t * thread);
-
-  virtual void exit (void *value_ptr) __attribute__ ((noreturn));
-
-  virtual int cancel ();
-
-  virtual void testcancel ();
-  static void static_cancel_self ();
-
-  static DWORD cancelable_wait (HANDLE object, DWORD timeout, const bool do_cancel = true);
-
-  virtual int setcancelstate (int state, int *oldstate);
-  virtual int setcanceltype (int type, int *oldtype);
-
-  virtual void push_cleanup_handler (__pthread_cleanup_handler *handler);
-  virtual void pop_cleanup_handler (int const execute);
-
-  static pthread* self ();
-  static DWORD WINAPI thread_init_wrapper (void *);
-
-  virtual unsigned long getsequence_np();
-
-  static int equal (pthread_t t1, pthread_t t2)
-  {
-    return t1 == t2;
-  }
-
-  /* List support calls */
-  class pthread *next;
-  static void fixup_after_fork ()
-  {
-    threads.fixup_after_fork ();
-    threads.for_each (&pthread::_fixup_after_fork);
-  }
-
-  static void suspend_all_except_self ()
-  {
-    threads.for_each (&pthread::suspend_except_self);
-  }
-
-  static void resume_all ()
-  {
-    threads.for_each (&pthread::resume);
-  }
-
-private:
-  static List<pthread> threads;
-  DWORD thread_id;
-  __pthread_cleanup_handler *cleanup_stack;
-  pthread_mutex mutex;
-
-  void suspend_except_self ();
-  void resume ();
-
-  void _fixup_after_fork ();
-
-  void pop_all_cleanup_handlers (void);
-  void precreate (pthread_attr *);
-  void postcreate ();
-  void set_tls_self_pointer ();
-  bool create_cancel_event ();
-  static pthread *get_tls_self_pointer ();
-  void cancel_self ();
-  DWORD get_thread_id ();
-};
-
-class pthread_null : public pthread
-{
-  public:
-  static pthread *get_null_pthread();
-  ~pthread_null();
-
-  /* From pthread These should never get called
-  * as the ojbect is not verifyable
-  */
-  void create (void *(*)(void *), pthread_attr *, void *);
-  void exit (void *value_ptr) __attribute__ ((noreturn));
-  int cancel ();
-  void testcancel ();
-  int setcancelstate (int state, int *oldstate);
-  int setcanceltype (int type, int *oldtype);
-  void push_cleanup_handler (__pthread_cleanup_handler *handler);
-  void pop_cleanup_handler (int const execute);
-  unsigned long getsequence_np();
-
-  private:
-  pthread_null ();
-  static pthread_null _instance;
-};
-
-class pthread_condattr: public verifyable_object
-{
-public:
-  static bool is_good_object(pthread_condattr_t const *);
-  int shared;
-
-  pthread_condattr ();
-  ~pthread_condattr ();
-};
-
-class pthread_cond: public verifyable_object
-{
-public:
-  static bool is_good_object (pthread_cond_t const *);
-  static bool is_good_initializer (pthread_cond_t const *);
-  static bool is_good_initializer_or_object (pthread_cond_t const *);
-  static bool is_good_initializer_or_bad_object (pthread_cond_t const *);
-  static void init_mutex ();
-  static int init (pthread_cond_t *, const pthread_condattr_t *);
-
-  int shared;
-
-  unsigned long waiting;
-  unsigned long pending;
-  HANDLE sem_wait;
-
-  pthread_mutex mtx_in;
-  pthread_mutex mtx_out;
-
-  pthread_mutex_t mtx_cond;
-
-  void unblock (const bool all);
-  int wait (pthread_mutex_t mutex, DWORD dwMilliseconds = INFINITE);
-
-  pthread_cond (pthread_condattr *);
-  ~pthread_cond ();
-
-  class pthread_cond * next;
-  static void fixup_after_fork ()
-  {
-    conds.fixup_after_fork ();
-    conds.for_each (&pthread_cond::_fixup_after_fork);
-  }
-
-private:
-  void _fixup_after_fork ();
-
-  static List<pthread_cond> conds;
-  static fast_mutex cond_initialization_lock;
-};
-
-class pthread_rwlockattr: public verifyable_object
-{
-public:
-  static bool is_good_object(pthread_rwlockattr_t const *);
-  int shared;
-
-  pthread_rwlockattr ();
-  ~pthread_rwlockattr ();
-};
-
-class pthread_rwlock: public verifyable_object
-{
-public:
-  static bool is_good_object (pthread_rwlock_t const *);
-  static bool is_good_initializer (pthread_rwlock_t const *);
-  static bool is_good_initializer_or_object (pthread_rwlock_t const *);
-  static bool is_good_initializer_or_bad_object (pthread_rwlock_t const *);
-  static void init_mutex ();
-  static int init (pthread_rwlock_t *, const pthread_rwlockattr_t *);
-
-  int shared;
-
-  unsigned long waiting_readers;
-  unsigned long waiting_writers;
-  pthread_t writer;
-  struct RWLOCK_READER
-  {
-    struct RWLOCK_READER *next;
-    pthread_t thread;
-  } *readers;
-  fast_mutex readers_mx;
-
-  int rdlock ();
-  int tryrdlock ();
-
-  int wrlock ();
-  int trywrlock ();
-
-  int unlock ();
-
-  pthread_mutex mtx;
-  pthread_cond cond_readers;
-  pthread_cond cond_writers;
-
-  pthread_rwlock (pthread_rwlockattr *);
-  ~pthread_rwlock ();
-
-  class pthread_rwlock * next;
-  static void fixup_after_fork ()
-  {
-    rwlocks.fixup_after_fork ();
-    rwlocks.for_each (&pthread_rwlock::_fixup_after_fork);
-  }
-
-private:
-  static List<pthread_rwlock> rwlocks;
-
-  void add_reader (struct RWLOCK_READER *rd);
-  void remove_reader (struct RWLOCK_READER *rd);
-  struct RWLOCK_READER *lookup_reader (pthread_t thread);
-
-  void release ()
-  {
-    if (waiting_writers)
-      {
-	if (!readers)
-	  cond_writers.unblock (false);
-      }
-    else if (waiting_readers)
-      cond_readers.unblock (true);
-  }
-
-
-  static void rdlock_cleanup (void *arg);
-  static void wrlock_cleanup (void *arg);
-
-  void _fixup_after_fork ();
-
-  static fast_mutex rwlock_initialization_lock;
-};
-
-class pthread_once
-{
-public:
-  pthread_mutex_t mutex;
-  int state;
-};
-
-/* shouldn't be here */
-class semaphore: public verifyable_object
-{
-public:
-  static bool is_good_object(sem_t const *);
-  /* API calls */
-  static int init (sem_t * sem, int pshared, unsigned int value);
-  static int destroy (sem_t * sem);
-  static sem_t *open (const char *name, int oflag, mode_t mode,
-		      unsigned int value);
-  static int wait (sem_t * sem);
-  static int post (sem_t * sem);
-  static int getvalue (sem_t * sem, int *sval);
-  static int trywait (sem_t * sem);
-  static int timedwait (sem_t * sem, const struct timespec *abstime);
-
-  HANDLE win32_obj_id;
-  int shared;
-  long currentvalue;
-  char *name;
-
-  semaphore (int, unsigned int);
-  semaphore (const char *name, int oflag, mode_t mode, unsigned int value);
-  ~semaphore ();
-
-  class semaphore * next;
-  static void fixup_after_fork ()
-  {
-    semaphores.fixup_after_fork ();
-    semaphores.for_each (&semaphore::_fixup_after_fork);
-  }
-
-private:
-  void _wait ();
-  void _post ();
-  int _getvalue (int *sval);
-  int _trywait ();
-  int _timedwait (const struct timespec *abstime);
-
-  void _fixup_after_fork ();
-
-  static List<semaphore> semaphores;
-};
-
-class callback
-{
-public:
-  void (*cb)(void);
-  class callback * next;
-};
-
-struct MTinterface
-{
-  // General
-  int concurrency;
-  long int threadcount;
-
-  // Used for main thread data, and sigproc thread
-  struct __reent_t reents;
-  struct _winsup_t winsup_reent;
-
-  callback *pthread_prepare;
-  callback *pthread_child;
-  callback *pthread_parent;
-
-  pthread_key reent_key;
-  pthread_key thread_self_key;
-
-  void Init ();
-  void fixup_before_fork (void);
-  void fixup_after_fork (void);
-
-#if 1 // avoid initialization since zero is implied and
-      // only use of this class is static
-  MTinterface () : reent_key (NULL), thread_self_key (NULL) {}
-#else
-  MTinterface () :
-    concurrency (0), threadcount (0),
-    pthread_prepare (NULL), pthread_child (NULL), pthread_parent (NULL),
-    reent_key (NULL), thread_self_key (NULL)
-  {
-  }
-#endif
-};
-
-#define MT_INTERFACE user_data->threadinterface
-
-#endif // MT_SAFE
-
-#endif // _CYGNUS_THREADS_
diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc
deleted file mode 100644
index 2def51f45..000000000
--- a/winsup/cygwin/times.cc
+++ /dev/null
@@ -1,666 +0,0 @@
-/* times.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <time.h>
-#include <sys/times.h>
-#include <sys/timeb.h>
-#include <utime.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "pinfo.h"
-#include "hires.h"
-
-#define FACTOR (0x19db1ded53e8000LL)
-#define NSPERSEC 10000000LL
-
-static void __stdcall timeval_to_filetime (timeval *time, FILETIME *out);
-
-/* Cygwin internal */
-static unsigned long long __stdcall
-__to_clock_t (FILETIME * src, int flag)
-{
-  unsigned long long total = ((unsigned long long) src->dwHighDateTime << 32) + ((unsigned)src->dwLowDateTime);
-  syscall_printf ("dwHighDateTime %u, dwLowDateTime %u", src->dwHighDateTime, src->dwLowDateTime);
-
-  /* Convert into clock ticks - the total is in 10ths of a usec.  */
-  if (flag)
-    total -= FACTOR;
-
-  total /= (unsigned long long) (NSPERSEC / CLOCKS_PER_SEC);
-  syscall_printf ("total %08x %08x", (unsigned)(total>>32), (unsigned)(total));
-  return total;
-}
-
-/* times: POSIX 4.5.2.1 */
-extern "C" clock_t
-times (struct tms *buf)
-{
-  FILETIME creation_time, exit_time, kernel_time, user_time;
-
-  if (check_null_invalid_struct_errno (buf))
-    return ((clock_t) -1);
-
-  DWORD ticks = GetTickCount ();
-  /* Ticks is in milliseconds, convert to our ticks. Use long long to prevent
-     overflow. */
-  clock_t tc = (clock_t) ((long long) ticks * CLOCKS_PER_SEC / 1000);
-  if (wincap.has_get_process_times ())
-    {
-      GetProcessTimes (hMainProc, &creation_time, &exit_time,
-		       &kernel_time, &user_time);
-
-      syscall_printf ("ticks %d, CLOCKS_PER_SEC %d", ticks, CLOCKS_PER_SEC);
-      syscall_printf ("user_time %d, kernel_time %d, creation_time %d, exit_time %d",
-		      user_time, kernel_time, creation_time, exit_time);
-      buf->tms_stime = __to_clock_t (&kernel_time, 0);
-      buf->tms_utime = __to_clock_t (&user_time, 0);
-      timeval_to_filetime (&myself->rusage_children.ru_stime, &kernel_time);
-      buf->tms_cstime = __to_clock_t (&kernel_time, 1);
-      timeval_to_filetime (&myself->rusage_children.ru_utime, &user_time);
-      buf->tms_cutime = __to_clock_t (&user_time, 1);
-    }
-  else
-    /* GetProcessTimes() does not work for non-NT versions of Windows.  The
-       return values are undefined, so instead just copy the ticks value
-       into utime so that clock() will work properly on these systems */
-    {
-      buf->tms_utime = tc;
-      buf->tms_stime = 0;
-      buf->tms_cstime = 0;
-      buf->tms_cutime = 0;
-    }
-
-   return tc;
-}
-
-extern "C" clock_t _times (struct tms *) __attribute__((alias ("times")));
-
-/* settimeofday: BSD */
-extern "C" int
-settimeofday (const struct timeval *tv, const struct timezone *tz)
-{
-  SYSTEMTIME st;
-  struct tm *ptm;
-  int res;
-
-  tz = tz;			/* silence warning about unused variable */
-
-  ptm = gmtime (&tv->tv_sec);
-  st.wYear	   = ptm->tm_year + 1900;
-  st.wMonth	   = ptm->tm_mon + 1;
-  st.wDayOfWeek    = ptm->tm_wday;
-  st.wDay	   = ptm->tm_mday;
-  st.wHour	   = ptm->tm_hour;
-  st.wMinute       = ptm->tm_min;
-  st.wSecond       = ptm->tm_sec;
-  st.wMilliseconds = tv->tv_usec / 1000;
-
-  res = !SetSystemTime (&st);
-
-  syscall_printf ("%d = settimeofday (%x, %x)", res, tv, tz);
-
-  return res;
-}
-
-/* timezone: standards? */
-extern "C" char *
-timezone ()
-{
-#ifdef _MT_SAFE
-  char *b=_reent_winsup ()->timezone_buf;
-#else
-  static NO_COPY char b[20] = {0};
-#endif
-
-  tzset ();
-  __small_sprintf (b,"GMT%+d:%02d", (int) (-_timezone / 3600), (int) (abs (_timezone / 60) % 60));
-  return b;
-}
-
-/* Cygwin internal */
-void __stdcall
-totimeval (struct timeval *dst, FILETIME *src, int sub, int flag)
-{
-  long long x = __to_clock_t (src, flag);
-
-  x *= (int) (1e6) / CLOCKS_PER_SEC; /* Turn x into usecs */
-  x -= (long long) sub * (int) (1e6);
-
-  dst->tv_usec = x % (long long) (1e6); /* And split */
-  dst->tv_sec = x / (long long) (1e6);
-}
-
-hires_ms gtod;
-UINT NO_COPY hires_ms::minperiod;
-
-/* FIXME: Make thread safe */
-extern "C" int
-gettimeofday (struct timeval *tv, struct timezone *tz)
-{
-  static bool tzflag;
-  LONGLONG now = gtod.usecs (false);
-  if (now == (LONGLONG) -1)
-    return -1;
-
-  tv->tv_sec = now / 1000000;
-  tv->tv_usec = now % 1000000;
-
-  if (tz != NULL)
-    {
-      if (!tzflag)
-	{
-	  tzset ();
-	  tzflag = true;
-	}
-      tz->tz_minuteswest = _timezone / 60;
-      tz->tz_dsttime = _daylight;
-    }
-
-  return 0;
-}
-
-extern "C" int _gettimeofday (struct timeval *, struct timezone *)
-  __attribute__((alias ("gettimeofday")));
-
-/* Cygwin internal */
-void
-time_t_to_filetime (time_t time_in, FILETIME *out)
-{
-  long long x = time_in * NSPERSEC + FACTOR;
-  out->dwHighDateTime = x >> 32;
-  out->dwLowDateTime = x;
-}
-
-/* Cygwin internal */
-static void __stdcall
-timeval_to_filetime (timeval *time_in, FILETIME *out)
-{
-  long long x = time_in->tv_sec * NSPERSEC +
-			time_in->tv_usec * (NSPERSEC/1000000) + FACTOR;
-  out->dwHighDateTime = x >> 32;
-  out->dwLowDateTime = x;
-}
-
-/* Cygwin internal */
-static timeval __stdcall
-time_t_to_timeval (time_t in)
-{
-  timeval res;
-  res.tv_sec = in;
-  res.tv_usec = 0;
-  return res;
-}
-
-/* Cygwin internal */
-/* Convert a Win32 time to "UNIX" format. */
-long __stdcall
-to_time_t (FILETIME *ptr)
-{
-  /* A file time is the number of 100ns since jan 1 1601
-     stuffed into two long words.
-     A time_t is the number of seconds since jan 1 1970.  */
-
-  long long x = ((long long) ptr->dwHighDateTime << 32) + ((unsigned)ptr->dwLowDateTime);
-
-  /* pass "no time" as epoch */
-  if (x == 0)
-    return 0;
-
-  x -= FACTOR;			/* number of 100ns between 1601 and 1970 */
-  x /= (long long) NSPERSEC;		/* number of 100ns in a second */
-  return x;
-}
-
-/* Cygwin internal */
-/* Convert a Win32 time to "UNIX" timestruc_t format. */
-void __stdcall
-to_timestruc_t (FILETIME *ptr, timestruc_t *out)
-{
-  /* A file time is the number of 100ns since jan 1 1601
-     stuffed into two long words.
-     A timestruc_t is the number of seconds and microseconds since jan 1 1970
-     stuffed into a time_t and a long.  */
-
-  long rem;
-  long long x = ((long long) ptr->dwHighDateTime << 32) + ((unsigned)ptr->dwLowDateTime);
-
-  /* pass "no time" as epoch */
-  if (x == 0)
-    {
-      out->tv_sec = 0;
-      out->tv_nsec = 0;
-      return;
-    }
-
-  x -= FACTOR;			/* number of 100ns between 1601 and 1970 */
-  rem = x % ((long long)NSPERSEC);
-  x /= (long long) NSPERSEC;		/* number of 100ns in a second */
-  out->tv_nsec = rem * 100;	/* as tv_nsec is in nanoseconds */
-  out->tv_sec = x;
-}
-
-/* Cygwin internal */
-/* Get the current time as a "UNIX" timestruc_t format. */
-void __stdcall
-time_as_timestruc_t (timestruc_t * out)
-{
-  SYSTEMTIME systemtime;
-  FILETIME filetime;
-
-  GetSystemTime (&systemtime);
-  SystemTimeToFileTime (&systemtime, &filetime);
-  to_timestruc_t (&filetime, out);
-}
-
-/* time: POSIX 4.5.1.1, C 4.12.2.4 */
-/* Return number of seconds since 00:00 UTC on jan 1, 1970 */
-extern "C" time_t
-time (time_t * ptr)
-{
-  time_t res;
-  SYSTEMTIME systemtime;
-  FILETIME filetime;
-
-  GetSystemTime (&systemtime);
-  SystemTimeToFileTime (&systemtime, &filetime);
-  res = to_time_t (&filetime);
-  if (ptr)
-    *ptr = res;
-
-  syscall_printf ("%d = time (%x)", res, ptr);
-
-  return res;
-}
-
-/*
- * localtime_r.c
- * Original Author:	Adapted from tzcode maintained by Arthur David Olson.
- *
- * Converts the calendar time pointed to by tim_p into a broken-down time
- * expressed as local time. Returns a pointer to a structure containing the
- * broken-down time.
- */
-
-#define SECSPERMIN	60
-#define MINSPERHOUR	60
-#define HOURSPERDAY	24
-#define SECSPERHOUR	(SECSPERMIN * MINSPERHOUR)
-#define SECSPERDAY	(SECSPERHOUR * HOURSPERDAY)
-#define DAYSPERWEEK	7
-#define MONSPERYEAR	12
-
-#define YEAR_BASE	1900
-#define EPOCH_YEAR      1970
-#define EPOCH_WDAY      4
-
-#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
-
-#if 0 /* POSIX_LOCALTIME */
-
-static _CONST int mon_lengths[2][MONSPERYEAR] = {
-  {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
-  {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
-};
-
-static _CONST int year_lengths[2] = {
-  365,
-  366
-};
-
-/*
- * Convert a time_t into a struct tm *.
- * Does NO timezone conversion.
- */
-
-/* Cygwin internal */
-static struct tm * __stdcall
-corelocaltime (const time_t * tim_p)
-{
-  long days, rem;
-  int y;
-  int yleap;
-  _CONST int *ip;
-#ifdef _MT_SAFE
-  struct tm &localtime_buf=_reent_winsup ()->_localtime_buf;
-#else
-  static NO_COPY struct tm localtime_buf = {0};
-#endif
-
-  time_t tim = *tim_p;
-  struct tm *res = &localtime_buf;
-
-  days = ((long) tim) / SECSPERDAY;
-  rem = ((long) tim) % SECSPERDAY;
-
-  while (rem < 0)
-    {
-      rem += SECSPERDAY;
-      --days;
-    }
-  while (rem >= SECSPERDAY)
-    {
-      rem -= SECSPERDAY;
-      ++days;
-    }
-
-  /* compute hour, min, and sec */
-  res->tm_hour = (int) (rem / SECSPERHOUR);
-  rem %= SECSPERHOUR;
-  res->tm_min = (int) (rem / SECSPERMIN);
-  res->tm_sec = (int) (rem % SECSPERMIN);
-
-  /* compute day of week */
-  if ((res->tm_wday = ((EPOCH_WDAY + days) % DAYSPERWEEK)) < 0)
-    res->tm_wday += DAYSPERWEEK;
-
-  /* compute year & day of year */
-  y = EPOCH_YEAR;
-  if (days >= 0)
-    {
-      for (;;)
-	{
-	  yleap = isleap (y);
-	  if (days < year_lengths[yleap])
-	    break;
-	  y++;
-	  days -= year_lengths[yleap];
-	}
-    }
-  else
-    {
-      do
-	{
-	  --y;
-	  yleap = isleap (y);
-	  days += year_lengths[yleap];
-	} while (days < 0);
-    }
-
-  res->tm_year = y - YEAR_BASE;
-  res->tm_yday = days;
-  ip = mon_lengths[yleap];
-  for (res->tm_mon = 0; days >= ip[res->tm_mon]; ++res->tm_mon)
-    days -= ip[res->tm_mon];
-  res->tm_mday = days + 1;
-
-  /* set daylight saving time flag */
-  res->tm_isdst = -1;
-
-  syscall_printf ("%d = corelocaltime (%x)", res, tim_p);
-
-  return (res);
-}
-
-/* localtime: POSIX 8.1.1, C 4.12.3.4 */
-/*
- * localtime takes a time_t (which is in UTC)
- * and formats it into a struct tm as a local time.
- */
-extern "C" struct tm *
-localtime (const time_t *tim_p)
-{
-  time_t tim = *tim_p;
-  struct tm *rtm;
-
-  tzset ();
-
-  tim -= _timezone;
-
-  rtm = corelocaltime (&tim);
-
-  rtm->tm_isdst = _daylight;
-
-  syscall_printf ("%x = localtime (%x)", rtm, tim_p);
-
-  return rtm;
-}
-
-/* gmtime: C 4.12.3.3 */
-/*
- * gmtime takes a time_t (which is already in UTC)
- * and just puts it into a struct tm.
- */
-extern "C" struct tm *
-gmtime (const time_t *tim_p)
-{
-  time_t tim = *tim_p;
-
-  struct tm *rtm = corelocaltime (&tim);
-  /* UTC has no daylight savings time */
-  rtm->tm_isdst = 0;
-
-  syscall_printf ("%x = gmtime (%x)", rtm, tim_p);
-
-  return rtm;
-}
-
-#endif /* POSIX_LOCALTIME */
-
-/* utimes: standards? */
-extern "C" int
-utimes (const char *path, struct timeval *tvp)
-{
-  int res = 0;
-  struct timeval tmp[2];
-  path_conv win32 (path);
-
-  if (win32.error)
-    {
-      set_errno (win32.error);
-      syscall_printf ("-1 = utimes (%s, %x)", path, tvp);
-      return -1;
-    }
-
-  /* MSDN suggests using FILE_FLAG_BACKUP_SEMANTICS for accessing
-     the times of directories.  */
-  /* Note: It's not documented in MSDN that FILE_WRITE_ATTRIBUTES is
-     sufficient to change the timestamps... */
-  HANDLE h = CreateFile (win32, FILE_WRITE_ATTRIBUTES,
-			 FILE_SHARE_READ | FILE_SHARE_WRITE,
-			 &sec_none_nih, OPEN_EXISTING,
-			 FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS,
-			 0);
-
-  if (h == INVALID_HANDLE_VALUE)
-    {
-      if (win32.isdir ())
-	{
-	  /* What we can do with directories more? */
-	  res = 0;
-	}
-      else
-	{
-	  res = -1;
-	  __seterrno ();
-	}
-    }
-  else
-    {
-      if (tvp == 0)
-	{
-	  gettimeofday (&tmp[0], 0);
-	  tmp[1] = tmp[0];
-	  tvp = tmp;
-	}
-
-      FILETIME lastaccess;
-      FILETIME lastwrite;
-
-      timeval_to_filetime (tvp + 0, &lastaccess);
-      timeval_to_filetime (tvp + 1, &lastwrite);
-
-      debug_printf ("incoming lastaccess %08x %08x",
-		   tvp->tv_sec,
-		   tvp->tv_usec);
-
-//      dump_filetime (lastaccess);
-//      dump_filetime (lastwrite);
-
-      /* FIXME: SetFileTime needs a handle with a write lock
-	 on the file whose time is being modified.  So calls to utime()
-	 fail for read only files.  */
-
-      if (!SetFileTime (h, 0, &lastaccess, &lastwrite))
-	{
-	  __seterrno ();
-	  res = -1;
-	}
-      else
-	res = 0;
-      CloseHandle (h);
-    }
-
-  syscall_printf ("%d = utimes (%s, %x); (h%d)",
-		  res, path, tvp, h);
-  return res;
-}
-
-/* utime: POSIX 5.6.6.1 */
-extern "C" int
-utime (const char *path, struct utimbuf *buf)
-{
-  struct timeval tmp[2];
-
-  if (buf == 0)
-    return utimes (path, 0);
-
-  debug_printf ("incoming utime act %x", buf->actime);
-  tmp[0] = time_t_to_timeval (buf->actime);
-  tmp[1] = time_t_to_timeval (buf->modtime);
-
-  return utimes (path, tmp);
-}
-
-/* ftime: standards? */
-extern "C" int
-ftime (struct timeb *tp)
-{
-  struct timeval tv;
-  struct timezone tz;
-
-  if (gettimeofday (&tv, &tz) < 0)
-    return -1;
-
-  tp->time = tv.tv_sec;
-  tp->millitm = tv.tv_usec / 1000;
-  tp->timezone = tz.tz_minuteswest;
-  tp->dstflag = tz.tz_dsttime;
-
-  return 0;
-}
-
-/* obsolete, changed to cygwin_tzset when localtime.c was added - dj */
-extern "C" void
-cygwin_tzset ()
-{
-}
-
-void
-hires_us::prime ()
-{
-  LARGE_INTEGER ifreq;
-  if (!QueryPerformanceFrequency (&ifreq))
-    {
-      inited = -1;
-      return;
-    }
-
-  FILETIME f;
-  int priority = GetThreadPriority (GetCurrentThread ());
-  SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_TIME_CRITICAL);
-  if (!QueryPerformanceCounter (&primed_pc))
-    {
-      SetThreadPriority (GetCurrentThread (), priority);
-      inited = -1;
-      return;
-    }
-
-  GetSystemTimeAsFileTime (&f);
-  SetThreadPriority (GetCurrentThread (), priority);
-
-  inited = 1;
-  primed_ft.HighPart = f.dwHighDateTime;
-  primed_ft.LowPart = f.dwLowDateTime;
-  primed_ft.QuadPart -= FACTOR;
-  primed_ft.QuadPart /= 10;
-  freq = (double) ((double) 1000000. / (double) ifreq.QuadPart);
-  return;
-}
-
-LONGLONG
-hires_us::usecs (bool justdelta)
-{
-  if (!inited)
-    prime ();
-  if (inited < 0)
-    {
-      set_errno (ENOSYS);
-      return (long long) -1;
-    }
-
-  LARGE_INTEGER now;
-  if (!QueryPerformanceCounter (&now))
-    {
-      set_errno (ENOSYS);
-      return -1;
-    }
-
-  // FIXME: Use round() here?
-  now.QuadPart = (LONGLONG) (freq * (double) (now.QuadPart - primed_pc.QuadPart));
-  return justdelta ? now.QuadPart : primed_ft.QuadPart + now.QuadPart;
-}
-
-UINT
-hires_ms::prime ()
-{
-  TIMECAPS tc;
-  FILETIME f;
-
-  if (!minperiod)
-    if (timeGetDevCaps (&tc, sizeof (tc)) != TIMERR_NOERROR)
-      minperiod = 1;
-    else
-      {
-	minperiod = min (max (tc.wPeriodMin, 1), tc.wPeriodMax);
-	timeBeginPeriod (minperiod);
-      }
-
-  if (!inited)
-    {
-      int priority = GetThreadPriority (GetCurrentThread ());
-      SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_TIME_CRITICAL);
-      initime_ms = timeGetTime ();
-      GetSystemTimeAsFileTime (&f);
-      SetThreadPriority (GetCurrentThread (), priority);
-
-      inited = 1;
-      initime_us.HighPart = f.dwHighDateTime;
-      initime_us.LowPart = f.dwLowDateTime;
-      initime_us.QuadPart -= FACTOR;
-      initime_us.QuadPart /= 10;
-    }
-  return minperiod;
-}
-
-LONGLONG
-hires_ms::usecs (bool justdelta)
-{
-  if (!minperiod) /* NO_COPY variable */
-    prime ();
-  DWORD now = timeGetTime ();
-  // FIXME: Not sure how this will handle the 49.71 day wrap around
-  LONGLONG res = initime_us.QuadPart + ((LONGLONG) (now - initime_ms) * 1000);
-  return res;
-}
diff --git a/winsup/cygwin/tlsoffsets.h b/winsup/cygwin/tlsoffsets.h
deleted file mode 100644
index d7abe835e..000000000
--- a/winsup/cygwin/tlsoffsets.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//;# autogenerated:  Do not edit.
-
-//; $tls::func = -620;
-//; $tls::saved_errno = -616;
-//; $tls::sa_flags = -612;
-//; $tls::oldmask = -608;
-//; $tls::newmask = -604;
-//; $tls::event = -600;
-//; $tls::errno_addr = -596;
-//; $tls::initialized = -592;
-//; $tls::sigmask = -588;
-//; $tls::sigwait_mask = -584;
-//; $tls::sigwait_info = -580;
-//; $tls::infodata = -576;
-//; $tls::tid = -52;
-//; $tls::prev = -48;
-//; $tls::next = -44;
-//; $tls::stack = -40;
-//; $tls::sig = -8;
-//; $tls::stackptr = -4;
-//; __DATA__
-
-#define tls_func (-620)
-#define tls_saved_errno (-616)
-#define tls_sa_flags (-612)
-#define tls_oldmask (-608)
-#define tls_newmask (-604)
-#define tls_event (-600)
-#define tls_errno_addr (-596)
-#define tls_initialized (-592)
-#define tls_sigmask (-588)
-#define tls_sigwait_mask (-584)
-#define tls_sigwait_info (-580)
-#define tls_infodata (-576)
-#define tls_tid (-52)
-#define tls_prev (-48)
-#define tls_next (-44)
-#define tls_stack (-40)
-#define tls_sig (-8)
-#define tls_stackptr (-4)
diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc
deleted file mode 100644
index 07c7a0a06..000000000
--- a/winsup/cygwin/tty.cc
+++ /dev/null
@@ -1,467 +0,0 @@
-/* tty.cc
-
-   Copyright 1997, 1998, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <unistd.h>
-#include <utmp.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <sys/cygwin.h>
-#include "cygerrno.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygheap.h"
-#include "pinfo.h"
-#include "cygserver.h"
-#include "shared_info.h"
-#include "cygthread.h"
-
-extern fhandler_tty_master *tty_master;
-
-extern "C" int
-grantpt (int fd)
-{
-  return 0;
-}
-
-extern "C" int
-unlockpt (int fd)
-{
-  return 0;
-}
-
-extern "C" int
-revoke (char *ttyname)
-{
-  set_errno (ENOSYS);
-  return -1;
-}
-
-extern "C" int
-ttyslot (void)
-{
-  if (NOTSTATE (myself, PID_USETTY))
-    return -1;
-  return myself->ctty;
-}
-
-void __stdcall
-tty_init (void)
-{
-  if (!myself->ppid_handle && NOTSTATE (myself, PID_CYGPARENT))
-    cygheap->fdtab.get_debugger_info ();
-
-  if (NOTSTATE (myself, PID_USETTY))
-    return;
-  if (myself->ctty == -1)
-    if (NOTSTATE (myself, PID_CYGPARENT))
-      myself->ctty = attach_tty (myself->ctty);
-    else
-      return;
-  if (myself->ctty == -1)
-    termios_printf ("Can't attach to tty");
-}
-
-/* Create session's master tty */
-
-void __stdcall
-create_tty_master (int ttynum)
-{
-  device ttym = *ttym_dev;
-  ttym.setunit (ttynum); /* CGF FIXME device */
-  tty_master = (fhandler_tty_master *) build_fh_dev (ttym);
-  if (tty_master->init ())
-    api_fatal ("Can't create master tty");
-  else
-    {
-      /* Log utmp entry */
-      struct utmp our_utmp;
-      DWORD len = sizeof our_utmp.ut_host;
-
-      bzero ((char *) &our_utmp, sizeof (utmp));
-      (void) time (&our_utmp.ut_time);
-      strncpy (our_utmp.ut_name, getlogin (), sizeof (our_utmp.ut_name));
-      GetComputerName (our_utmp.ut_host, &len);
-      __small_sprintf (our_utmp.ut_line, "tty%d", ttynum);
-      if ((len = strlen (our_utmp.ut_line)) >= UT_IDLEN)
-	len -= UT_IDLEN;
-      else
-	len = 0;
-      strncpy (our_utmp.ut_id, our_utmp.ut_line + len, UT_IDLEN);
-      our_utmp.ut_type = USER_PROCESS;
-      our_utmp.ut_pid = myself->pid;
-      myself->ctty = ttynum;
-      login (&our_utmp);
-    }
-}
-
-void __stdcall
-tty_terminate (void)
-{
-  if (NOTSTATE (myself, PID_USETTY))
-    return;
-  cygwin_shared->tty.terminate ();
-}
-
-int __stdcall
-attach_tty (int num)
-{
-  if (num != -1)
-    {
-      return cygwin_shared->tty.connect_tty (num);
-    }
-  if (NOTSTATE (myself, PID_USETTY))
-    return -1;
-  return cygwin_shared->tty.allocate_tty (1);
-}
-
-void
-tty_list::terminate (void)
-{
-  int ttynum = myself->ctty;
-
-  /* Keep master running till there are connected clients */
-  if (ttynum != -1 && ttys[ttynum].master_pid == GetCurrentProcessId ())
-    {
-      tty *t = ttys + ttynum;
-      CloseHandle (t->from_master);
-      CloseHandle (t->to_master);
-      /* Wait for children which rely on tty handling in this process to
-	 go away */
-      for (int i = 0; ; i++)
-	{
-	  if (!t->slave_alive ())
-	    break;
-	  if (i >= 100)
-	    {
-	      small_printf ("waiting for children using tty%d to terminate\n",
-			    ttynum);
-	      i = 0;
-	    }
-
-	  low_priority_sleep (200);
-	}
-
-      termios_printf ("tty %d master about to finish", ttynum);
-      ForceCloseHandle1 (t->to_slave, to_pty);
-      ForceCloseHandle1 (t->from_slave, from_pty);
-      CloseHandle (tty_master->inuse);
-      t->init ();
-
-      char buf[20];
-      __small_sprintf (buf, "tty%d", ttynum);
-      logout (buf);
-    }
-}
-
-int
-tty_list::connect_tty (int ttynum)
-{
-  if (ttynum < 0 || ttynum >= NTTYS)
-    {
-      termios_printf ("ttynum (%d) out of range", ttynum);
-      return -1;
-    }
-  if (!ttys[ttynum].exists ())
-    {
-      termios_printf ("tty %d was not allocated", ttynum);
-      return -1;
-    }
-
-  return ttynum;
-}
-
-void
-tty_list::init (void)
-{
-  for (int i = 0; i < NTTYS; i++)
-    {
-      ttys[i].init ();
-      ttys[i].setntty (i);
-    }
-}
-
-/* Search for tty class for our console. Allocate new tty if our process is
-   the only cygwin process in the current console.
-   Return tty number or -1 if error.
-   If flag == 0, just find a free tty.
- */
-int
-tty_list::allocate_tty (int with_console)
-{
-  HWND console;
-
-  /* FIXME: This whole function needs a protective mutex. */
-
-  if (!with_console)
-    console = NULL;
-  else if (!(console = GetConsoleWindow ()))
-    {
-      char *oldtitle = new char [TITLESIZE];
-
-      if (!oldtitle)
-	{
-	  termios_printf ("Can't *allocate console title buffer");
-	  return -1;
-	}
-      if (!GetConsoleTitle (oldtitle, TITLESIZE))
-	{
-	  termios_printf ("Can't read console title");
-	  return -1;
-	}
-
-      if (WaitForSingleObject (title_mutex, INFINITE) == WAIT_FAILED)
-	termios_printf ("WFSO for title_mutext %p failed, %E", title_mutex);
-
-      char buf[40];
-
-      __small_sprintf (buf, "cygwin.find.console.%d", myself->pid);
-      SetConsoleTitle (buf);
-      for (int times = 0; times < 25; times++)
-	{
-	  Sleep (10);
-	  if ((console = FindWindow (NULL, buf)))
-	    break;
-	}
-      SetConsoleTitle (oldtitle);
-      Sleep (40);
-      ReleaseMutex (title_mutex);
-      if (console == NULL)
-	{
-	  termios_printf ("Can't find console window");
-	  return -1;
-	}
-    }
-  /* Is a tty allocated for console? */
-
-  int freetty = -1;
-  for (int i = 0; i < NTTYS; i++)
-    {
-      if (!ttys[i].exists ())
-	{
-	  if (freetty < 0)	/* Scanning? */
-	    freetty = i;	/* Yes. */
-	  if (!with_console)	/* Do we want to attach this to a console? */
-	    break;		/* No.  We've got one. */
-	}
-
-      if (with_console && ttys[i].gethwnd () == console)
-	{
-	  termios_printf ("console %x already associated with tty%d",
-		console, i);
-	  /* Is the master alive? */
-	  HANDLE hMaster;
-	  hMaster = OpenProcess (PROCESS_DUP_HANDLE, FALSE, ttys[i].master_pid);
-	  if (hMaster)
-	    {
-	      CloseHandle (hMaster);
-	      return i;
-	    }
-	  /* Master is dead */
-	  freetty = i;
-	  break;
-	}
-    }
-
-  /* There is no tty allocated to console, allocate the first free found */
-  if (freetty == -1)
-    {
-      system_printf ("No free ttys available");
-      return -1;
-    }
-  tty *t = ttys + freetty;
-  t->init ();
-  t->setsid (-1);
-  t->setpgid (myself->pgid);
-  t->sethwnd (console);
-
-  if (with_console)
-    {
-      termios_printf ("console %x associated with tty%d", console, freetty);
-      create_tty_master (freetty);
-    }
-  else
-    termios_printf ("tty%d allocated", freetty);
-  return freetty;
-}
-
-bool
-tty::slave_alive ()
-{
-  return alive (TTY_SLAVE_ALIVE);
-}
-
-bool
-tty::master_alive ()
-{
-  return alive (TTY_MASTER_ALIVE);
-}
-
-bool
-tty::alive (const char *fmt)
-{
-  HANDLE ev;
-  char buf[sizeof (TTY_MASTER_ALIVE) + 16];
-
-  __small_sprintf (buf, fmt, ntty);
-  if ((ev = OpenEvent (EVENT_ALL_ACCESS, FALSE, buf)))
-    CloseHandle (ev);
-  return ev != NULL;
-}
-
-HANDLE
-tty::create_inuse (const char *fmt)
-{
-  HANDLE h;
-  char buf[sizeof (TTY_MASTER_ALIVE) + 16];
-
-  __small_sprintf (buf, fmt, ntty);
-  h = CreateEvent (&sec_all, TRUE, FALSE, buf);
-  termios_printf ("%s = %p", buf, h);
-  if (!h)
-    termios_printf ("couldn't open inuse event, %E", buf);
-  return h;
-}
-
-void
-tty::init (void)
-{
-  output_stopped = 0;
-  setsid (0);
-  pgid = 0;
-  hwnd = NULL;
-  to_slave = NULL;
-  from_slave = NULL;
-  was_opened = 0;
-}
-
-HANDLE
-tty::get_event (const char *fmt, BOOL manual_reset)
-{
-  HANDLE hev;
-  char buf[40];
-
-  __small_sprintf (buf, fmt, ntty);
-  if (!(hev = CreateEvent (&sec_all, manual_reset, FALSE, buf)))
-    {
-      termios_printf ("couldn't create %s", buf);
-      set_errno (ENOENT);	/* FIXME this can't be the right errno */
-      return NULL;
-    }
-
-  termios_printf ("created event %s", buf);
-  return hev;
-}
-
-bool
-tty::make_pipes (fhandler_pty_master *ptym)
-{
-  /* Create communication pipes */
-
-  /* FIXME: should this be sec_none_nih? */
-  if (!CreatePipe (&from_master, &to_slave, &sec_all, 128 * 1024))
-    {
-      termios_printf ("can't create input pipe");
-      set_errno (ENOENT);
-      return false;
-    }
-
-  // ProtectHandle1INH (to_slave, to_pty);
-  if (!CreatePipe (&from_slave, &to_master, &sec_all, 128 * 1024))
-    {
-      termios_printf ("can't create output pipe");
-      set_errno (ENOENT);
-      return false;
-    }
-  // ProtectHandle1INH (from_slave, from_pty);
-  termios_printf ("tty%d from_slave %p, to_slave %p", ntty, from_slave,
-		  to_slave);
-
-  DWORD pipe_mode = PIPE_NOWAIT;
-  if (!SetNamedPipeHandleState (to_slave, &pipe_mode, NULL, NULL))
-    termios_printf ("can't set to_slave to non-blocking mode");
-  ptym->set_io_handle (from_slave);
-  ptym->set_output_handle (to_slave);
-  return true;
-}
-
-bool
-tty::common_init (fhandler_pty_master *ptym)
-{
-  /* Set termios information.  Force initialization. */
-  ptym->tcinit (this, true);
-
-  if (!make_pipes (ptym))
-    return false;
-  ptym->need_nl = 0;
-
-  /* Save our pid  */
-
-  master_pid = GetCurrentProcessId ();
-
-  /* We do not open allow the others to open us (for handle duplication)
-     but rely on cygheap->inherited_ctty for descendant processes.
-     In the future the cygserver may allow access by others. */
-
-#ifdef USE_SERVER
-  if (wincap.has_security ())
-    {
-      if (cygserver_running == CYGSERVER_UNKNOWN)
-	cygserver_init ();
-    }
-#endif
-
-  /* Create synchronisation events */
-
-  if (ptym->get_major () != DEV_TTYM_MAJOR)
-    {
-      ptym->output_done_event = ptym->ioctl_done_event =
-      ptym->ioctl_request_event = NULL;
-    }
-  else
-    {
-      if (!(ptym->output_done_event = get_event (OUTPUT_DONE_EVENT)))
-	return false;
-      if (!(ptym->ioctl_done_event = get_event (IOCTL_DONE_EVENT)))
-	return false;
-      if (!(ptym->ioctl_request_event = get_event (IOCTL_REQUEST_EVENT)))
-	return false;
-    }
-
-  if (!(ptym->input_available_event = get_event (INPUT_AVAILABLE_EVENT, TRUE)))
-    return false;
-
-  char buf[40];
-  __small_sprintf (buf, OUTPUT_MUTEX, ntty);
-  if (!(ptym->output_mutex = CreateMutex (&sec_all, FALSE, buf)))
-    {
-      termios_printf ("can't create %s", buf);
-      set_errno (ENOENT);
-      return false;
-    }
-
-  __small_sprintf (buf, INPUT_MUTEX, ntty);
-  if (!(ptym->input_mutex = CreateMutex (&sec_all, FALSE, buf)))
-    {
-      termios_printf ("can't create %s", buf);
-      set_errno (ENOENT);
-      return false;
-    }
-
-  ProtectHandle1INH (ptym->output_mutex, output_mutex);
-  ProtectHandle1INH (ptym->input_mutex, input_mutex);
-  winsize.ws_col = 80;
-  winsize.ws_row = 25;
-
-  termios_printf ("tty%d opened", ntty);
-  return true;
-}
diff --git a/winsup/cygwin/tty.h b/winsup/cygwin/tty.h
deleted file mode 100644
index 8153aaf4d..000000000
--- a/winsup/cygwin/tty.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/* tty.h: shared tty info for cygwin
-
-   Copyright 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-
-/* tty tables */
-
-#define INP_BUFFER_SIZE 256
-#define OUT_BUFFER_SIZE 256
-#define NTTYS		128
-#define real_tty_attached(p)	((p)->ctty >= 0 && (p)->ctty != TTY_CONSOLE)
-
-/* Input/Output/ioctl events */
-
-#define OUTPUT_DONE_EVENT	"cygtty%d.output.done"
-#define IOCTL_REQUEST_EVENT	"cygtty%d.ioctl.request"
-#define IOCTL_DONE_EVENT	"cygtty%d.ioctl.done"
-#define RESTART_OUTPUT_EVENT	"cygtty%d.output.restart"
-#define INPUT_AVAILABLE_EVENT	"cygtty%d.input.avail"
-#define OUTPUT_MUTEX		"cygtty%d.output.mutex"
-#define INPUT_MUTEX		"cygtty%d.input.mutex"
-#define TTY_SLAVE_ALIVE		"cygtty%x.slave_alive"
-#define TTY_MASTER_ALIVE	"cygtty%x.master_alive"
-
-#include <sys/termios.h>
-
-enum
-{
-  TTY_INITIALIZED = 1,		/* Set if tty is initialized */
-  TTY_RSTCONS = 2		/* Set if console needs to be set to "non-cooked" */
-};
-
-#define TTYISSETF(x)	__ISSETF (tc, x, TTY)
-#define TTYSETF(x)	__SETF (tc, x, TTY)
-#define TTYCLEARF(x)	__CLEARF (tc, x, TTY)
-#define TTYCONDSETF(n, x) __CONDSETF(n, tc, x, TTY)
-
-#ifndef MIN_CTRL_C_SLOP
-#define MIN_CTRL_C_SLOP 50
-#endif
-
-class tty_min
-{
-  pid_t sid;	/* Session ID of tty */
-public:
-  DWORD status;
-  pid_t pgid;
-  int output_stopped;
-  int ntty;
-  DWORD last_ctrl_c;	// tick count of last ctrl-c
-
-  tty_min (int t = -1, pid_t s = -1) : sid (s), ntty (t) {}
-  void setntty (int n) {ntty = n;}
-  pid_t getpgid () {return pgid;}
-  void setpgid (int pid) {pgid = pid;}
-  int getsid () {return sid;}
-  void setsid (pid_t tsid) {sid = tsid;}
-  void kill_pgrp (int sig);
-  struct termios ti;
-  struct winsize winsize;
-
-  /* ioctl requests buffer */
-  int cmd;
-  union
-  {
-    struct termios termios;
-    struct winsize winsize;
-    int value;
-    pid_t pid;
-  } arg;
-  /* XXX_retval variables holds master's completion codes. Error are stored as
-   * -ERRNO
-   */
-  int ioctl_retval;
-
-  int write_error;
-};
-
-class fhandler_pty_master;
-
-class tty: public tty_min
-{
-  HANDLE get_event (const char *fmt, BOOL manual_reset = FALSE)
-    __attribute__ ((regparm (2)));
-public:
-  HWND  hwnd;	/* Console window handle tty belongs to */
-
-  DWORD master_pid;	/* Win32 PID of tty master process */
-
-  HANDLE from_master, to_slave;
-  HANDLE from_slave, to_master;
-
-  int read_retval;
-  bool was_opened;	/* True if opened at least once. */
-
-  void init ();
-  HANDLE create_inuse (const char *);
-  bool common_init (fhandler_pty_master *);
-  bool alive (const char *fmt);
-  bool slave_alive ();
-  bool master_alive ();
-  HWND gethwnd () {return hwnd;}
-  void sethwnd (HWND wnd) {hwnd = wnd;}
-  bool make_pipes (fhandler_pty_master *ptym);
-  HANDLE open_output_mutex ()
-  {
-    char buf[80];
-    __small_sprintf (buf, OUTPUT_MUTEX, ntty);
-    return OpenMutex (MUTEX_ALL_ACCESS, TRUE, buf);
-  }
-  HANDLE open_input_mutex ()
-  {
-    char buf[80];
-    __small_sprintf (buf, INPUT_MUTEX, ntty);
-    return OpenMutex (MUTEX_ALL_ACCESS, TRUE, buf);
-  }
-  bool exists ()
-  {
-    HANDLE h = open_output_mutex ();
-    if (h)
-      {
-	CloseHandle (h);
-	return 1;
-      }
-    return slave_alive ();
-  }
-};
-
-class tty_list
-{
-  tty ttys[NTTYS];
-
-public:
-  tty * operator [](int n) {return ttys + n;}
-  int allocate_tty (int n); /* n non zero if allocate a tty, pty otherwise */
-  int connect_tty (int);
-  void terminate ();
-  void init ();
-  tty_min *get_tty (int n);
-};
-
-void __stdcall tty_init ();
-void __stdcall tty_terminate ();
-int __stdcall attach_tty (int);
-void __stdcall create_tty_master (int);
-extern "C" int ttyslot (void);
diff --git a/winsup/cygwin/tz_posixrules.h b/winsup/cygwin/tz_posixrules.h
deleted file mode 100644
index dea668e2f..000000000
--- a/winsup/cygwin/tz_posixrules.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* generated with bin2h from zoneinfo/posixrules */
-
-static NO_COPY unsigned char _posixrules_data[] = {
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,
-0,1,16,0,0,0,2,0,0,0,8,0,151,254,240,1,135,225,224,2,119,224,240,3,112,254,96,4,96,253,112,5,80,
-224,96,6,64,223,112,7,48,194,96,7,141,25,112,9,16,164,96,9,173,148,240,10,240,134,96,11,224,133,112,12,217,162,
-224,13,192,103,112,14,185,132,224,15,169,131,240,16,153,102,224,17,137,101,240,18,121,72,224,19,105,71,240,20,89,42,224,
-21,73,41,240,22,57,12,224,23,41,11,240,24,34,41,96,25,8,237,240,26,2,11,96,26,242,10,112,27,225,237,96,28,
-209,236,112,29,193,207,96,30,177,206,112,31,161,177,96,32,118,0,240,33,129,147,96,34,85,226,240,35,106,175,224,36,53,
-196,240,37,74,145,224,38,21,166,240,39,42,115,224,39,254,195,112,41,10,85,224,41,222,165,112,42,234,55,224,43,190,135,
-112,44,211,84,96,45,158,105,112,46,179,54,96,47,126,75,112,48,147,24,96,49,103,103,240,50,114,250,96,51,71,73,240,
-52,82,220,96,53,39,43,240,54,50,190,96,55,7,13,240,56,27,218,224,56,230,239,240,57,251,188,224,58,198,209,240,59,
-219,158,224,60,175,238,112,61,187,128,224,62,143,208,112,63,155,98,224,64,111,178,112,65,132,127,96,66,79,148,112,67,100,
-97,96,68,47,118,112,69,68,67,96,70,15,88,112,71,36,37,96,71,248,116,240,73,4,7,96,73,216,86,240,74,227,233,
-96,75,184,56,240,76,205,5,224,77,152,26,240,78,172,231,224,79,119,252,240,80,140,201,224,81,97,25,112,82,108,171,224,
-83,64,251,112,84,76,141,224,85,32,221,112,86,44,111,224,87,0,191,112,88,21,140,96,88,224,161,112,89,245,110,96,90,
-192,131,112,91,213,80,96,92,169,159,240,93,181,50,96,94,137,129,240,95,149,20,96,96,105,99,240,97,126,48,224,98,73,
-69,240,99,94,18,224,100,41,39,240,101,61,244,224,102,18,68,112,103,29,214,224,103,242,38,112,104,253,184,224,105,210,8,
-112,106,221,154,224,107,177,234,112,108,198,183,96,109,145,204,112,110,166,153,96,111,113,174,112,112,134,123,96,113,90,202,240,
-114,102,93,96,115,58,172,240,116,70,63,96,117,26,142,240,118,47,91,224,118,250,112,240,120,15,61,224,120,218,82,240,121,
-239,31,224,122,186,52,240,123,207,1,224,124,163,81,112,125,174,227,224,126,131,51,112,127,142,197,224,128,99,21,112,129,119,
-226,96,130,66,247,112,131,87,196,96,132,34,217,112,133,55,166,96,134,11,245,240,135,23,136,96,135,235,215,240,136,247,106,
-96,137,203,185,240,138,215,76,96,139,171,155,240,140,192,104,224,141,139,125,240,142,160,74,224,143,107,95,240,144,128,44,224,
-145,84,124,112,146,96,14,224,147,52,94,112,148,63,240,224,149,20,64,112,150,41,13,96,150,244,34,112,152,8,239,96,152,
-212,4,112,153,232,209,96,154,189,32,240,155,200,179,96,156,157,2,240,157,168,149,96,158,124,228,240,159,136,119,96,160,92,
-198,240,161,113,147,224,162,60,168,240,163,81,117,224,164,28,138,240,165,49,87,224,166,5,167,112,167,17,57,224,167,229,137,
-112,168,241,27,224,169,197,107,112,170,218,56,96,171,165,77,112,172,186,26,96,173,133,47,112,174,153,252,96,175,101,17,112,
-176,121,222,96,177,78,45,240,178,89,192,96,179,46,15,240,180,57,162,96,181,13,241,240,182,34,190,224,182,237,211,240,184,
-2,160,224,184,205,181,240,185,226,130,224,186,182,210,112,187,194,100,224,188,150,180,112,189,162,70,224,190,118,150,112,191,130,
-40,224,192,86,120,112,193,107,69,96,194,54,90,112,195,75,39,96,196,22,60,112,197,43,9,96,197,255,88,240,199,10,235,
-96,199,223,58,240,200,234,205,96,201,191,28,240,202,211,233,224,203,158,254,240,204,179,203,224,205,126,224,240,206,147,173,224,
-207,103,253,112,208,115,143,224,209,71,223,112,210,83,113,224,211,39,193,112,212,51,83,224,213,7,163,112,214,28,112,96,214,
-231,133,112,215,252,82,96,216,199,103,112,217,220,52,96,218,176,131,240,219,188,22,96,220,144,101,240,221,155,248,96,222,112,
-71,240,223,133,20,224,224,80,41,240,225,100,246,224,226,48,11,240,227,68,216,224,228,15,237,240,229,36,186,224,229,249,10,
-112,231,4,156,224,231,216,236,112,232,228,126,224,233,184,206,112,234,205,155,96,235,152,176,112,236,173,125,96,237,120,146,112,
-238,141,95,96,239,97,174,240,240,109,65,96,241,65,144,240,242,77,35,96,243,33,114,240,244,45,5,96,245,1,84,240,246,
-22,33,224,246,225,54,240,247,246,3,224,248,193,24,240,249,213,229,224,250,160,250,240,251,181,199,224,252,138,23,112,253,149,
-169,224,254,105,249,112,255,117,139,224,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,
-1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,
-0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,
-1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,
-0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,
-1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,
-0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,
-1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,
-0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,255,255,199,192,1,0,255,255,185,176,0,4,69,68,84,
-0,69,83,84,0,0,0
-};
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
deleted file mode 100644
index 33835b2b9..000000000
--- a/winsup/cygwin/uinfo.cc
+++ /dev/null
@@ -1,560 +0,0 @@
-/* uinfo.cc: user info (uid, gid, etc...)
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <pwd.h>
-#include <unistd.h>
-#include <winnls.h>
-#include <wininet.h>
-#include <utmp.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <lm.h>
-#include <sys/cygwin.h>
-#include "pinfo.h"
-#include "security.h"
-#include "path.h"
-#include "fhandler.h"
-#include "dtable.h"
-#include "cygerrno.h"
-#include "cygheap.h"
-#include "registry.h"
-#include "child_info.h"
-#include "environ.h"
-#include "pwdgrp.h"
-
-/* Initialize the part of cygheap_user that does not depend on files.
-   The information is used in shared.cc for the user shared.
-   Final initialization occurs in uinfo_init */
-void
-cygheap_user::init ()
-{
-  char user_name[UNLEN + 1];
-  DWORD user_name_len = UNLEN + 1;
-
-  set_name (GetUserName (user_name, &user_name_len) ? user_name : "unknown");
-
-  if (!wincap.has_security ())
-    return;
-
-  HANDLE ptok;
-  DWORD siz;
-  char pdacl_buf [sizeof (PTOKEN_DEFAULT_DACL) + ACL_DEFAULT_SIZE];
-  PTOKEN_DEFAULT_DACL pdacl = (PTOKEN_DEFAULT_DACL) pdacl_buf;
-
-  if (!OpenProcessToken (hMainProc, TOKEN_ADJUST_DEFAULT | TOKEN_QUERY,
-			 &ptok))
-    {
-      system_printf ("OpenProcessToken(): %E");
-      return;
-    }
-  if (!GetTokenInformation (ptok, TokenPrimaryGroup,
-			    &groups.pgsid, sizeof (cygsid), &siz))
-    system_printf ("GetTokenInformation (TokenPrimaryGroup): %E");
-
-  /* Get the SID from current process and store it in effec_cygsid */
-  if (!GetTokenInformation (ptok, TokenUser, &effec_cygsid, sizeof (cygsid), &siz))
-    {
-      system_printf ("GetTokenInformation (TokenUser): %E");
-      goto out;
-    }
-
-  /* Set token owner to the same value as token user */
-  if (!SetTokenInformation (ptok, TokenOwner, &effec_cygsid, sizeof (cygsid)))
-    debug_printf ("SetTokenInformation(TokenOwner): %E");
-
-  /* Add the user in the default DACL if needed */
-  if (!GetTokenInformation (ptok, TokenDefaultDacl, pdacl, sizeof (pdacl_buf), &siz))
-    system_printf ("GetTokenInformation (TokenDefaultDacl): %E");
-  else if (pdacl->DefaultDacl) /* Running with security */
-    {
-      PACL pAcl = pdacl->DefaultDacl;
-      PACCESS_ALLOWED_ACE pAce;
-
-      for (int i = 0; i < pAcl->AceCount; i++)
-        {
-	  if (!GetAce (pAcl, i, (LPVOID *) &pAce))
-	    system_printf ("GetAce: %E");
-	  else if (pAce->Header.AceType == ACCESS_ALLOWED_ACE_TYPE
-		   && effec_cygsid == &pAce->SidStart)
-	    goto out;
-	}
-      pAcl->AclSize = &pdacl_buf[sizeof (pdacl_buf)] - (char *) pAcl;
-      if (!AddAccessAllowedAce (pAcl, ACL_REVISION, GENERIC_ALL, effec_cygsid))
-	system_printf ("AddAccessAllowedAce: %E");
-      else if (FindFirstFreeAce (pAcl, (LPVOID *) &pAce), !(pAce))
-	debug_printf ("FindFirstFreeAce %E");
-      else
-        {
-          pAcl->AclSize = (char *) pAce - (char *) pAcl;
-	  if (!SetTokenInformation (ptok, TokenDefaultDacl, pdacl, sizeof (* pdacl)))
-	    system_printf ("SetTokenInformation (TokenDefaultDacl): %E");
-        }
-    }
- out:
-  CloseHandle (ptok);
-}
-
-void
-internal_getlogin (cygheap_user &user)
-{
-  struct passwd *pw = NULL;
-
-  if (wincap.has_security ())
-    {
-      cygpsid psid = user.sid ();
-      pw = internal_getpwsid (psid);
-    }
-
-  if (!pw && !(pw = internal_getpwnam (user.name ()))
-      && !(pw = internal_getpwuid (DEFAULT_UID)))
-    debug_printf ("user not found in augmented /etc/passwd");
-  else
-    {
-      myself->uid = pw->pw_uid;
-      myself->gid = pw->pw_gid;
-      user.set_name (pw->pw_name);
-      if (wincap.has_security ())
-	{
-	  cygsid gsid;
-	  if (gsid.getfromgr (internal_getgrgid (pw->pw_gid)))
-	    {
-	      HANDLE ptok;
-	      if (gsid != user.groups.pgsid
-		  && OpenProcessToken (hMainProc, TOKEN_ADJUST_DEFAULT, &ptok))
-	        {
-		  /* Set primary group to the group in /etc/passwd. */
-		  if (!SetTokenInformation (ptok, TokenPrimaryGroup,
-					    &gsid, sizeof gsid))
-		    debug_printf ("SetTokenInformation(TokenPrimaryGroup): %E");
-		  else
-		    user.groups.pgsid = gsid;
-		  CloseHandle (ptok);
-		}
-	    }
-	  else
-	    debug_printf ("gsid not found in augmented /etc/group");
-	}
-    }
-  (void) cygheap->user.ontherange (CH_HOME, pw);
-
-  return;
-}
-
-void
-uinfo_init ()
-{
-  if (child_proc_info && !cygheap->user.has_impersonation_tokens ())
-    return;
-
-  if (!child_proc_info)
-    internal_getlogin (cygheap->user); /* Set the cygheap->user. */
-  /* Conditions must match those in spawn to allow starting child
-     processes with ruid != euid and rgid != egid. */
-  else if (cygheap->user.issetuid ()
-  	   && cygheap->user.saved_uid == cygheap->user.real_uid
-	   && cygheap->user.saved_gid == cygheap->user.real_gid
-	   && !cygheap->user.groups.issetgroups ())
-    {
-      cygheap->user.reimpersonate ();
-      return;
-    }
-  else
-    cygheap->user.close_impersonation_tokens ();
-
-  cygheap->user.saved_uid = cygheap->user.real_uid = myself->uid;
-  cygheap->user.saved_gid = cygheap->user.real_gid = myself->gid;
-  cygheap->user.external_token = INVALID_HANDLE_VALUE;
-  cygheap->user.internal_token = INVALID_HANDLE_VALUE;
-  cygheap->user.current_token = INVALID_HANDLE_VALUE;
-  cygheap->user.set_saved_sid ();	/* Update the original sid */
-}
-
-extern "C" char *
-getlogin (void)
-{
-#ifdef _MT_SAFE
-  char *this_username=_reent_winsup ()->_username;
-#else
-  static char this_username[UNLEN + 1] NO_COPY;
-#endif
-
-  return strcpy (this_username, cygheap->user.name ());
-}
-
-extern "C" __uid32_t
-getuid32 (void)
-{
-  return cygheap->user.real_uid;
-}
-
-extern "C" __uid16_t
-getuid (void)
-{
-  return cygheap->user.real_uid;
-}
-
-extern "C" __gid32_t
-getgid32 (void)
-{
-  return cygheap->user.real_gid;
-}
-
-extern "C" __gid16_t
-getgid (void)
-{
-  return cygheap->user.real_gid;
-}
-
-extern "C" __uid32_t
-geteuid32 (void)
-{
-  return myself->uid;
-}
-
-extern "C" __uid16_t
-geteuid (void)
-{
-  return myself->uid;
-}
-
-extern "C" __gid32_t
-getegid32 (void)
-{
-  return myself->gid;
-}
-
-extern "C" __gid16_t
-getegid (void)
-{
-  return myself->gid;
-}
-
-/* Not quite right - cuserid can change, getlogin can't */
-extern "C" char *
-cuserid (char *src)
-{
-  if (!src)
-    return getlogin ();
-
-  strcpy (src, getlogin ());
-  return src;
-}
-
-const char *
-cygheap_user::ontherange (homebodies what, struct passwd *pw)
-{
-  LPUSER_INFO_3 ui = NULL;
-  WCHAR wuser[UNLEN + 1];
-  NET_API_STATUS ret;
-  char homepath_env_buf[CYG_MAX_PATH + 1];
-  char homedrive_env_buf[3];
-  char *newhomedrive = NULL;
-  char *newhomepath = NULL;
-
-
-  debug_printf ("what %d, pw %p", what, pw);
-  if (what == CH_HOME)
-    {
-      char *p;
-      if (homedrive)
-	newhomedrive = homedrive;
-      else if ((p = getenv ("HOMEDRIVE")))
-	newhomedrive = p;
-
-      if (homepath)
-	newhomepath = homepath;
-      else if ((p = getenv ("HOMEPATH")))
-	newhomepath = p;
-
-      if ((p = getenv ("HOME")))
-	debug_printf ("HOME is already in the environment %s", p);
-      else
-	{
-	  if (pw && pw->pw_dir && *pw->pw_dir)
-	    {
-	      debug_printf ("Set HOME (from /etc/passwd) to %s", pw->pw_dir);
-	      setenv ("HOME", pw->pw_dir, 1);
-	    }
-	  else if (!newhomedrive || !newhomepath)
-	    setenv ("HOME", "/", 1);
-	  else
-	    {
-	      char home[CYG_MAX_PATH];
-	      char buf[CYG_MAX_PATH + 1];
-	      strcpy (buf, newhomedrive);
-	      strcat (buf, newhomepath);
-	      cygwin_conv_to_full_posix_path (buf, home);
-	      debug_printf ("Set HOME (from HOMEDRIVE/HOMEPATH) to %s", home);
-	      setenv ("HOME", home, 1);
-	    }
-	}
-    }
-
-  if (what != CH_HOME && homepath == NULL && newhomepath == NULL)
-    {
-      if (!pw)
-	pw = internal_getpwnam (name ());
-      if (pw && pw->pw_dir && *pw->pw_dir)
-	cygwin_conv_to_full_win32_path (pw->pw_dir, homepath_env_buf);
-      else
-	{
-	  homepath_env_buf[0] = homepath_env_buf[1] = '\0';
-	  if (logsrv ())
-	    {
-	      WCHAR wlogsrv[INTERNET_MAX_HOST_NAME_LENGTH + 3];
-	      sys_mbstowcs (wlogsrv, logsrv (),
-			    sizeof (wlogsrv) / sizeof (*wlogsrv));
-	     sys_mbstowcs (wuser, winname (), sizeof (wuser) / sizeof (*wuser));
-	      if (!(ret = NetUserGetInfo (wlogsrv, wuser, 3, (LPBYTE *) &ui)))
-		{
-		  sys_wcstombs (homepath_env_buf, ui->usri3_home_dir, CYG_MAX_PATH);
-		  if (!homepath_env_buf[0])
-		    {
-		      sys_wcstombs (homepath_env_buf, ui->usri3_home_dir_drive,
-				    CYG_MAX_PATH);
-		      if (homepath_env_buf[0])
-			strcat (homepath_env_buf, "\\");
-		      else
-			cygwin_conv_to_full_win32_path ("/", homepath_env_buf);
-		    }
-		}
-	    }
-	  if (ui)
-	    NetApiBufferFree (ui);
-	}
-
-      if (homepath_env_buf[1] != ':')
-	{
-	  newhomedrive = almost_null;
-	  newhomepath = homepath_env_buf;
-	}
-      else
-	{
-	  homedrive_env_buf[0] = homepath_env_buf[0];
-	  homedrive_env_buf[1] = homepath_env_buf[1];
-	  homedrive_env_buf[2] = '\0';
-	  newhomedrive = homedrive_env_buf;
-	  newhomepath = homepath_env_buf + 2;
-	}
-    }
-
-  if (newhomedrive && newhomedrive != homedrive)
-    cfree_and_set (homedrive, (newhomedrive == almost_null)
-			      ? almost_null : cstrdup (newhomedrive));
-
-  if (newhomepath && newhomepath != homepath)
-    cfree_and_set (homepath, cstrdup (newhomepath));
-
-  switch (what)
-    {
-    case CH_HOMEDRIVE:
-      return homedrive;
-    case CH_HOMEPATH:
-      return homepath;
-    default:
-      return homepath;
-    }
-}
-
-const char *
-cygheap_user::test_uid (char *&what, const char *name, size_t namelen)
-{
-  if (!what && !issetuid ())
-    what = getwinenveq (name, namelen, HEAP_STR);
-  return what;
-}
-
-const char *
-cygheap_user::env_logsrv (const char *name, size_t namelen)
-{
-  if (test_uid (plogsrv, name, namelen))
-    return plogsrv;
-
-  const char *mydomain = domain ();
-  const char *myname = winname ();
-  if (!mydomain || strcasematch (myname, "SYSTEM"))
-    return almost_null;
-
-  char logsrv[INTERNET_MAX_HOST_NAME_LENGTH + 3];
-  cfree_and_set (plogsrv, almost_null);
-  if (get_logon_server (mydomain, logsrv, NULL))
-    plogsrv = cstrdup (logsrv);
-  return plogsrv;
-}
-
-const char *
-cygheap_user::env_domain (const char *name, size_t namelen)
-{
-  if (pwinname && test_uid (pdomain, name, namelen))
-    return pdomain;
-
-  char username[UNLEN + 1];
-  DWORD ulen = sizeof (username);
-  char userdomain[DNLEN + 1];
-  DWORD dlen = sizeof (userdomain);
-  SID_NAME_USE use;
-
-  cfree_and_set (pwinname, almost_null);
-  cfree_and_set (pdomain, almost_null);
-  if (!LookupAccountSid (NULL, sid (), username, &ulen,
-			 userdomain, &dlen, &use))
-    __seterrno ();
-  else
-    {
-      pwinname = cstrdup (username);
-      pdomain = cstrdup (userdomain);
-    }
-  return pdomain;
-}
-
-const char *
-cygheap_user::env_userprofile (const char *name, size_t namelen)
-{
-  if (test_uid (puserprof, name, namelen))
-    return puserprof;
-
-  char userprofile_env_buf[CYG_MAX_PATH + 1];
-  cfree_and_set (puserprof, almost_null);
-  /* FIXME: Should this just be setting a puserprofile like everything else? */
-  const char *myname = winname ();
-  if (myname && strcasematch (myname, "SYSTEM")
-      && get_registry_hive_path (sid (), userprofile_env_buf))
-    puserprof = cstrdup (userprofile_env_buf);
-
-  return puserprof;
-}
-
-const char *
-cygheap_user::env_homepath (const char *name, size_t namelen)
-{
-  return ontherange (CH_HOMEPATH);
-}
-
-const char *
-cygheap_user::env_homedrive (const char *name, size_t namelen)
-{
-  return ontherange (CH_HOMEDRIVE);
-}
-
-const char *
-cygheap_user::env_name (const char *name, size_t namelen)
-{
-  if (!test_uid (pwinname, name, namelen))
-    (void) domain ();
-  return pwinname;
-}
-
-char *
-pwdgrp::next_str (char c)
-{
-  char *res = lptr;
-  lptr = strechr (lptr, c);
-  if (*lptr)
-    *lptr++ = '\0';
-  return res;
-}
-
-bool
-pwdgrp::next_num (unsigned long& n)
-{
-  char *p = next_str (':');
-  char *cp;
-  n = strtoul (p, &cp, 10);
-  return p != cp && !*cp;
-}
-
-char *
-pwdgrp::add_line (char *eptr)
-{
-  if (eptr)
-    {
-      lptr = eptr;
-      eptr = strchr (lptr, '\n');
-      if (eptr)
-	{
-	  if (eptr > lptr && eptr[-1] == '\r')
-	    eptr[-1] = '\0';
-	  else
-	    *eptr = '\0';
-	  eptr++;
-	}
-      if (curr_lines >= max_lines)
-	{
-	  max_lines += 10;
-	  *pwdgrp_buf = realloc (*pwdgrp_buf, max_lines * pwdgrp_buf_elem_size);
-	}
-      if ((this->*parse) ())
-	curr_lines++;
-    }
-  return eptr;
-}
-
-void
-pwdgrp::load (const char *posix_fname)
-{
-  const char *res;
-  static const char failed[] = "failed";
-  static const char succeeded[] = "succeeded";
-
-  if (buf)
-    free (buf);
-  buf = NULL;
-  curr_lines = 0;
-
-  pc.check (posix_fname);
-  etc_ix = etc::init (etc_ix, pc);
-
-  paranoid_printf ("%s", posix_fname);
-
-  if (pc.error || !pc.exists () || !pc.isdisk () || pc.isdir ())
-    {
-      paranoid_printf ("strange path_conv problem");
-      res = failed;
-    }
-  else
-    {
-      HANDLE fh = CreateFile (pc, GENERIC_READ, wincap.shared (), NULL,
-			      OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-      if (fh == INVALID_HANDLE_VALUE)
-	{
-	  paranoid_printf ("%s CreateFile failed, %E");
-	  res = failed;
-	}
-      else
-	{
-	  DWORD size = GetFileSize (fh, NULL), read_bytes;
-	  buf = (char *) malloc (size + 1);
-	  if (!ReadFile (fh, buf, size, &read_bytes, NULL))
-	    {
-	      paranoid_printf ("ReadFile failed, %E");
-	      CloseHandle (fh);
-	      if (buf)
-		free (buf);
-	      buf = NULL;
-	      res = failed;
-	    }
-	  else
-	    {
-	      CloseHandle (fh);
-	      buf[read_bytes] = '\0';
-	      char *eptr = buf;
-	      while ((eptr = add_line (eptr)))
-		continue;
-	      debug_printf ("%s curr_lines %d", posix_fname, curr_lines);
-	      res = succeeded;
-	    }
-	}
-    }
-
-  debug_printf ("%s load %s", posix_fname, res);
-  initialized = true;
-  return;
-}
diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
deleted file mode 100644
index 277440937..000000000
--- a/winsup/cygwin/uname.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-/* uname.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-   Written by Steve Chamberlain of Cygnus Support, sac@cygnus.com
-   Rewritten by Geoffrey Noer of Cygnus Solutions, noer@cygnus.com
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <stdio.h>
-#include <sys/utsname.h>
-#include "cygwin_version.h"
-
-/* uname: POSIX 4.4.1.1 */
-extern "C" int
-uname (struct utsname *name)
-{
-  SYSTEM_INFO sysinfo;
-
-  if (check_null_invalid_struct_errno (name))
-    return -1;
-
-  char *snp = strstr  (cygwin_version.dll_build_date, "SNP");
-
-  memset (name, 0, sizeof (*name));
-  __small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ());
-
-  GetSystemInfo (&sysinfo);
-
-  /* Computer name */
-  cygwin_gethostname (name->nodename, sizeof (name->nodename) - 1);
-
-  /* Cygwin dll release */
-  __small_sprintf (name->release, "%d.%d.%d%s(%d.%d/%d/%d)",
-		   cygwin_version.dll_major / 1000,
-		   cygwin_version.dll_major % 1000,
-		   cygwin_version.dll_minor,
-		   snp ? "s" : "",
-		   cygwin_version.api_major,
-		   cygwin_version.api_minor,
-		   cygwin_version.shared_data,
-		   cygwin_version.mount_registry);
-
-  /* Cygwin "version" aka build date */
-  strcpy (name->version, cygwin_version.dll_build_date);
-  if (snp)
-    name->version[snp - cygwin_version.dll_build_date] = '\0';
-
-  /* CPU type */
-  switch (sysinfo.wProcessorArchitecture)
-    {
-      case PROCESSOR_ARCHITECTURE_INTEL:
-	unsigned int ptype;
-	if (wincap.has_valid_processorlevel ())
-	  {
-	    if (sysinfo.wProcessorLevel < 3) /* Shouldn't happen. */
-	      ptype = 3;
-	    else if (sysinfo.wProcessorLevel > 9) /* P4 */
-	      ptype = 6;
-	    else
-	      ptype = sysinfo.wProcessorLevel;
-	  }
-	else
-	  {
-	    if (sysinfo.dwProcessorType == PROCESSOR_INTEL_386 ||
-		sysinfo.dwProcessorType == PROCESSOR_INTEL_486)
-	      ptype = sysinfo.dwProcessorType / 100;
-	    else
-	      ptype = PROCESSOR_INTEL_PENTIUM / 100;
-	  }
-	__small_sprintf (name->machine, "i%d86", ptype);
-	break;
-      case PROCESSOR_ARCHITECTURE_ALPHA:
-	strcpy (name->machine, "alpha");
-	break;
-      case PROCESSOR_ARCHITECTURE_MIPS:
-	strcpy (name->machine, "mips");
-	break;
-      default:
-	strcpy (name->machine, "unknown");
-	break;
-    }
-
-  return 0;
-}
diff --git a/winsup/cygwin/wait.cc b/winsup/cygwin/wait.cc
deleted file mode 100644
index d7dd1f82e..000000000
--- a/winsup/cygwin/wait.cc
+++ /dev/null
@@ -1,127 +0,0 @@
-/* wait.cc: Posix wait routines.
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <sys/wait.h>
-#include <stdlib.h>
-#include "cygerrno.h"
-#include "sigproc.h"
-#include "perthread.h"
-#include "thread.h"
-
-/* This is called _wait and not wait because the real wait is defined
-   in libc/syscalls/syswait.c.  It calls us.  */
-
-extern "C" pid_t
-wait (int *status)
-{
-  return wait4 (-1, status, 0, NULL);
-}
-
-extern "C" pid_t
-waitpid (pid_t intpid, int *status, int options)
-{
-  return wait4 (intpid, status, options, NULL);
-}
-
-extern "C" pid_t
-wait3 (int *status, int options, struct rusage *r)
-{
-  return wait4 (-1, status, options, r);
-}
-
-/* Wait for any child to complete.
- * Note: this is not thread safe.  Use of wait in multiple threads will
- * not work correctly.
- */
-
-extern "C" pid_t
-wait4 (int intpid, int *status, int options, struct rusage *r)
-{
-  int res;
-  waitq *w;
-  HANDLE waitfor;
-
-  pthread_testcancel ();
-
-  while (1)
-    {
-      sig_dispatch_pending ();
-      bool sawsig = false;
-      if (options & ~(WNOHANG | WUNTRACED))
-	{
-	  set_errno (EINVAL);
-	  return -1;
-	}
-
-      if (r)
-	memset (r, 0, sizeof (*r));
-
-      if ((w = (waitq *) waitq_storage.get ()) == NULL)
-	w = (waitq *) waitq_storage.create ();
-
-      w->pid = intpid;
-      w->options = options;
-      w->rusage = r;
-      sigproc_printf ("calling proc_subproc, pid %d, options %d",
-		     w->pid, w->options);
-      if (!proc_subproc (PROC_WAIT, (DWORD) w))
-	{
-	  set_errno (ENOSYS);
-	  paranoid_printf ("proc_subproc returned 0");
-	  res = -1;
-	  goto done;
-	}
-
-      if ((waitfor = w->ev) == NULL)
-	goto nochildren;
-
-      res = pthread::cancelable_wait (waitfor, INFINITE);
-
-      sigproc_printf ("%d = WaitForSingleObject (...)", res);
-
-      if (w->ev == NULL)
-	{
-	nochildren:
-	  /* found no children */
-	  set_errno (ECHILD);
-	  res = -1;
-	  goto done;
-	}
-
-      if (w->status == -1)
-	{
-	  set_sig_errno (EINTR);
-	  call_signal_handler_now ();
-	  sawsig = true;
-	  res = -1;
-	}
-      else if (res != WAIT_OBJECT_0)
-	{
-	  /* We shouldn't set errno to any random value if we can help it.
-	     See the Posix manual for a list of valid values for `errno'.  */
-	  set_errno (EINVAL);
-	  res = -1;
-	}
-      else if ((res = w->pid) != 0 && status)
-	*status = w->status;
-
-    done:
-      if (!sawsig || !call_signal_handler_now ())
-	break;
-    }
-
-  sigproc_printf ("intpid %d, status %p, w->status %d, options %d, res %d",
-		  intpid, status, w->status, options, res);
-  w->status = -1;
-  if (res < 0)
-    sigproc_printf ("*** errno = %d", get_errno ());
-  return res;
-}
diff --git a/winsup/cygwin/winbase.h b/winsup/cygwin/winbase.h
deleted file mode 100644
index 3dbf116ea..000000000
--- a/winsup/cygwin/winbase.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#include_next "winbase.h"
-
-#ifndef _WINBASE2_H
-#define _WINBASE2_H
-
-extern __inline__ long
-ilockincr (long *m)
-{
-  register int __res;
-  __asm__ __volatile__ ("\n\
-	movl	$1,%0\n\
-	lock	xadd %0,(%1)\n\
-	inc	%0\n\
-	": "=a" (__res), "=q" (m): "1" (m));
-  return __res;
-}
-
-extern __inline__ long
-ilockdecr (long *m)
-{
-  register int __res;
-  __asm__ __volatile__ ("\n\
-	movl	$0xffffffff,%0\n\
-	lock	xadd %0,(%1)\n\
-	dec	%0\n\
-	": "=a" (__res), "=q" (m): "1" (m));
-  return __res;
-}
-
-extern __inline__ long
-ilockexch (long *t, long v)
-{
-  register int __res;
-  __asm__ __volatile__ ("\n\
-1:	lock	cmpxchgl %3,(%1)\n\
-	jne 1b\n\
- 	": "=a" (__res), "=q" (t): "1" (t), "q" (v), "0" (*t));
-  return __res;
-}
-
-extern __inline__ long
-ilockcmpexch (long *t, long v, long c)
-{
-  register int __res;
-  __asm__ __volatile__ ("\n\
-	lock cmpxchgl %3,(%1)\n\
-	": "=a" (__res), "=q" (t) : "1" (t), "q" (v), "0" (c));
-  return __res;
-}
-
-#undef InterlockedIncrement
-#define InterlockedIncrement ilockincr
-#undef InterlockedDecrement
-#define InterlockedDecrement ilockdecr
-#undef InterlockedExchange
-#define InterlockedExchange ilockexch
-#undef InterlockedCompareExchange
-#define InterlockedCompareExchange ilockcmpexch
-#endif /*_WINBASE2_H*/
diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
deleted file mode 100644
index 379b6343c..000000000
--- a/winsup/cygwin/wincap.cc
+++ /dev/null
@@ -1,640 +0,0 @@
-/* wincap.cc -- figure out on which OS we're running. Set the
-		capability class to the appropriate values.
-
-   Copyright 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-
-static NO_COPY wincaps wincap_unknown = {
-  lock_file_highword:0x0,
-  chunksize:0x0,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE,
-  is_winnt:false,
-  is_server:false,
-  access_denied_on_delete:false,
-  has_delete_on_close:false,
-  has_page_guard:false,
-  has_security:false,
-  has_security_descriptor_control:false,
-  has_get_process_times:false,
-  has_lseek_bug:false,
-  has_lock_file_ex:false,
-  has_signal_object_and_wait:false,
-  has_eventlog:false,
-  has_ip_helper_lib:false,
-  has_set_handle_information:false,
-  has_set_handle_information_on_console_handles:false,
-  supports_smp:false,
-  map_view_of_file_ex_sucks:false,
-  altgr_is_ctrl_alt:false,
-  has_physical_mem_access:false,
-  has_working_copy_on_write:false,
-  share_mmaps_only_by_name:false,
-  virtual_protect_works_on_shared_pages:false,
-  has_hard_links:false,
-  can_open_directories:false,
-  has_move_file_ex:false,
-  has_negative_pids:false,
-  has_unreliable_pipes:false,
-  has_try_enter_critical_section:false,
-  has_raw_devices:false,
-  has_valid_processorlevel:false,
-  has_64bit_file_access:false,
-  has_process_io_counters:false,
-  supports_reading_modem_output_lines:false,
-  needs_memory_protection:false,
-  pty_needs_alloc_console:false,
-  has_terminal_services:false,
-  has_switch_to_thread:false
-};
-
-static NO_COPY wincaps wincap_95 = {
-  lock_file_highword:0x0,
-  chunksize:32 * 1024 * 1024,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE,
-  is_winnt:false,
-  is_server:false,
-  access_denied_on_delete:true,
-  has_delete_on_close:false,
-  has_page_guard:false,
-  has_security:false,
-  has_security_descriptor_control:false,
-  has_get_process_times:false,
-  has_lseek_bug:true,
-  has_lock_file_ex:false,
-  has_signal_object_and_wait:false,
-  has_eventlog:false,
-  has_ip_helper_lib:false,
-  has_set_handle_information:false,
-  has_set_handle_information_on_console_handles:false,
-  supports_smp:false,
-  map_view_of_file_ex_sucks:true,
-  altgr_is_ctrl_alt:false,
-  has_physical_mem_access:false,
-  has_working_copy_on_write:false,
-  share_mmaps_only_by_name:true,
-  virtual_protect_works_on_shared_pages:false,
-  has_hard_links:false,
-  can_open_directories:false,
-  has_move_file_ex:false,
-  has_negative_pids:true,
-  has_unreliable_pipes:true,
-  has_try_enter_critical_section:false,
-  has_raw_devices:false,
-  has_valid_processorlevel:false,
-  has_64bit_file_access:false,
-  has_process_io_counters:false,
-  supports_reading_modem_output_lines:false,
-  needs_memory_protection:false,
-  pty_needs_alloc_console:false,
-  has_terminal_services:false,
-  has_switch_to_thread:false
-};
-
-static NO_COPY wincaps wincap_95osr2 = {
-  lock_file_highword:0x0,
-  chunksize:32 * 1024 * 1024,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE,
-  is_winnt:false,
-  is_server:false,
-  access_denied_on_delete:true,
-  has_delete_on_close:false,
-  has_page_guard:false,
-  has_security:false,
-  has_security_descriptor_control:false,
-  has_get_process_times:false,
-  has_lseek_bug:true,
-  has_lock_file_ex:false,
-  has_signal_object_and_wait:false,
-  has_eventlog:false,
-  has_ip_helper_lib:false,
-  has_set_handle_information:false,
-  has_set_handle_information_on_console_handles:false,
-  supports_smp:false,
-  map_view_of_file_ex_sucks:true,
-  altgr_is_ctrl_alt:false,
-  has_physical_mem_access:false,
-  has_working_copy_on_write:false,
-  share_mmaps_only_by_name:true,
-  virtual_protect_works_on_shared_pages:false,
-  has_hard_links:false,
-  can_open_directories:false,
-  has_move_file_ex:false,
-  has_negative_pids:true,
-  has_unreliable_pipes:true,
-  has_try_enter_critical_section:false,
-  has_raw_devices:false,
-  has_valid_processorlevel:false,
-  has_64bit_file_access:false,
-  has_process_io_counters:false,
-  supports_reading_modem_output_lines:false,
-  needs_memory_protection:false,
-  pty_needs_alloc_console:false,
-  has_terminal_services:false,
-  has_switch_to_thread:false
-};
-
-static NO_COPY wincaps wincap_98 = {
-  lock_file_highword:0x0,
-  chunksize:32 * 1024 * 1024,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE,
-  is_winnt:false,
-  is_server:false,
-  access_denied_on_delete:true,
-  has_delete_on_close:false,
-  has_page_guard:false,
-  has_security:false,
-  has_security_descriptor_control:false,
-  has_get_process_times:false,
-  has_lseek_bug:true,
-  has_lock_file_ex:false,
-  has_signal_object_and_wait:false,
-  has_eventlog:false,
-  has_ip_helper_lib:true,
-  has_set_handle_information:false,
-  has_set_handle_information_on_console_handles:false,
-  supports_smp:false,
-  map_view_of_file_ex_sucks:true,
-  altgr_is_ctrl_alt:false,
-  has_physical_mem_access:false,
-  has_working_copy_on_write:false,
-  share_mmaps_only_by_name:true,
-  virtual_protect_works_on_shared_pages:false,
-  has_hard_links:false,
-  can_open_directories:false,
-  has_move_file_ex:false,
-  has_negative_pids:true,
-  has_unreliable_pipes:true,
-  has_try_enter_critical_section:false,
-  has_raw_devices:false,
-  has_valid_processorlevel:true,
-  has_64bit_file_access:false,
-  has_process_io_counters:false,
-  supports_reading_modem_output_lines:false,
-  needs_memory_protection:false,
-  pty_needs_alloc_console:false,
-  has_terminal_services:false,
-  has_switch_to_thread:false
-};
-
-static NO_COPY wincaps wincap_98se = {
-  lock_file_highword:0x0,
-  chunksize:32 * 1024 * 1024,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE,
-  is_winnt:false,
-  is_server:false,
-  access_denied_on_delete:true,
-  has_delete_on_close:false,
-  has_page_guard:false,
-  has_security:false,
-  has_security_descriptor_control:false,
-  has_get_process_times:false,
-  has_lseek_bug:true,
-  has_lock_file_ex:false,
-  has_signal_object_and_wait:false,
-  has_eventlog:false,
-  has_ip_helper_lib:true,
-  has_set_handle_information:false,
-  has_set_handle_information_on_console_handles:false,
-  supports_smp:false,
-  map_view_of_file_ex_sucks:true,
-  altgr_is_ctrl_alt:false,
-  has_physical_mem_access:false,
-  has_working_copy_on_write:false,
-  share_mmaps_only_by_name:true,
-  virtual_protect_works_on_shared_pages:false,
-  has_hard_links:false,
-  can_open_directories:false,
-  has_move_file_ex:false,
-  has_negative_pids:true,
-  has_unreliable_pipes:true,
-  has_try_enter_critical_section:false,
-  has_raw_devices:false,
-  has_valid_processorlevel:true,
-  has_64bit_file_access:false,
-  has_process_io_counters:false,
-  supports_reading_modem_output_lines:false,
-  needs_memory_protection:false,
-  pty_needs_alloc_console:false,
-  has_terminal_services:false,
-  has_switch_to_thread:false
-};
-
-static NO_COPY wincaps wincap_me = {
-  lock_file_highword:0x0,
-  chunksize:32 * 1024 * 1024,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE,
-  is_winnt:false,
-  is_server:false,
-  access_denied_on_delete:true,
-  has_delete_on_close:false,
-  has_page_guard:false,
-  has_security:false,
-  has_security_descriptor_control:false,
-  has_get_process_times:false,
-  has_lseek_bug:true,
-  has_lock_file_ex:false,
-  has_signal_object_and_wait:false,
-  has_eventlog:false,
-  has_ip_helper_lib:true,
-  has_set_handle_information:false,
-  has_set_handle_information_on_console_handles:false,
-  supports_smp:false,
-  map_view_of_file_ex_sucks:true,
-  altgr_is_ctrl_alt:false,
-  has_physical_mem_access:false,
-  has_working_copy_on_write:false,
-  share_mmaps_only_by_name:true,
-  virtual_protect_works_on_shared_pages:false,
-  has_hard_links:false,
-  can_open_directories:false,
-  has_move_file_ex:false,
-  has_negative_pids:true,
-  has_unreliable_pipes:true,
-  has_try_enter_critical_section:false,
-  has_raw_devices:false,
-  has_valid_processorlevel:true,
-  has_64bit_file_access:false,
-  has_process_io_counters:false,
-  supports_reading_modem_output_lines:false,
-  needs_memory_protection:false,
-  pty_needs_alloc_console:false,
-  has_terminal_services:false,
-  has_switch_to_thread:false
-};
-
-static NO_COPY wincaps wincap_nt3 = {
-  lock_file_highword:UINT32_MAX,
-  chunksize:0,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-  is_winnt:true,
-  is_server:false,
-  access_denied_on_delete:false,
-  has_delete_on_close:true,
-  has_page_guard:true,
-  has_security:true,
-  has_security_descriptor_control:false,
-  has_get_process_times:true,
-  has_lseek_bug:false,
-  has_lock_file_ex:true,
-  has_signal_object_and_wait:false,
-  has_eventlog:true,
-  has_ip_helper_lib:false,
-  has_set_handle_information:true,
-  has_set_handle_information_on_console_handles:false,
-  supports_smp:false,
-  map_view_of_file_ex_sucks:false,
-  altgr_is_ctrl_alt:true,
-  has_physical_mem_access:true,
-  has_working_copy_on_write:true,
-  share_mmaps_only_by_name:false,
-  virtual_protect_works_on_shared_pages:true,
-  has_hard_links:true,
-  can_open_directories:true,
-  has_move_file_ex:true,
-  has_negative_pids:false,
-  has_unreliable_pipes:false,
-  has_try_enter_critical_section:false,
-  has_raw_devices:true,
-  has_valid_processorlevel:true,
-  has_64bit_file_access:true,
-  has_process_io_counters:false,
-  supports_reading_modem_output_lines:true,
-  needs_memory_protection:true,
-  pty_needs_alloc_console:true,
-  has_terminal_services:false,
-  has_switch_to_thread:false
-};
-
-static NO_COPY wincaps wincap_nt4 = {
-  lock_file_highword:UINT32_MAX,
-  chunksize:0,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-  is_winnt:true,
-  is_server:false,
-  access_denied_on_delete:false,
-  has_delete_on_close:true,
-  has_page_guard:true,
-  has_security:true,
-  has_security_descriptor_control:false,
-  has_get_process_times:true,
-  has_lseek_bug:false,
-  has_lock_file_ex:true,
-  has_signal_object_and_wait:true,
-  has_eventlog:true,
-  has_ip_helper_lib:false,
-  has_set_handle_information:true,
-  has_set_handle_information_on_console_handles:false,
-  supports_smp:true,
-  map_view_of_file_ex_sucks:false,
-  altgr_is_ctrl_alt:true,
-  has_physical_mem_access:true,
-  has_working_copy_on_write:true,
-  share_mmaps_only_by_name:false,
-  virtual_protect_works_on_shared_pages:true,
-  has_hard_links:true,
-  can_open_directories:true,
-  has_move_file_ex:true,
-  has_negative_pids:false,
-  has_unreliable_pipes:false,
-  has_try_enter_critical_section:true,
-  has_raw_devices:true,
-  has_valid_processorlevel:true,
-  has_64bit_file_access:true,
-  has_process_io_counters:false,
-  supports_reading_modem_output_lines:true,
-  needs_memory_protection:true,
-  pty_needs_alloc_console:true,
-  has_terminal_services:false,
-  has_switch_to_thread:true
-};
-
-static NO_COPY wincaps wincap_nt4sp4 = {
-  lock_file_highword:UINT32_MAX,
-  chunksize:0,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-  is_winnt:true,
-  is_server:false,
-  access_denied_on_delete:false,
-  has_delete_on_close:true,
-  has_page_guard:true,
-  has_security:true,
-  has_security_descriptor_control:false,
-  has_get_process_times:true,
-  has_lseek_bug:false,
-  has_lock_file_ex:true,
-  has_signal_object_and_wait:true,
-  has_eventlog:true,
-  has_ip_helper_lib:true,
-  has_set_handle_information:true,
-  has_set_handle_information_on_console_handles:false,
-  supports_smp:true,
-  map_view_of_file_ex_sucks:false,
-  altgr_is_ctrl_alt:true,
-  has_physical_mem_access:true,
-  has_working_copy_on_write:true,
-  share_mmaps_only_by_name:false,
-  virtual_protect_works_on_shared_pages:true,
-  has_hard_links:true,
-  can_open_directories:true,
-  has_move_file_ex:true,
-  has_negative_pids:false,
-  has_unreliable_pipes:false,
-  has_try_enter_critical_section:true,
-  has_raw_devices:true,
-  has_valid_processorlevel:true,
-  has_64bit_file_access:true,
-  has_process_io_counters:false,
-  supports_reading_modem_output_lines:true,
-  needs_memory_protection:true,
-  pty_needs_alloc_console:true,
-  has_terminal_services:false,
-  has_switch_to_thread:true
-};
-
-static NO_COPY wincaps wincap_2000 = {
-  lock_file_highword:UINT32_MAX,
-  chunksize:0,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-  is_winnt:true,
-  is_server:false,
-  access_denied_on_delete:false,
-  has_delete_on_close:true,
-  has_page_guard:true,
-  has_security:true,
-  has_security_descriptor_control:true,
-  has_get_process_times:true,
-  has_lseek_bug:false,
-  has_lock_file_ex:true,
-  has_signal_object_and_wait:true,
-  has_eventlog:true,
-  has_ip_helper_lib:true,
-  has_set_handle_information:true,
-  has_set_handle_information_on_console_handles:true,
-  supports_smp:true,
-  map_view_of_file_ex_sucks:false,
-  altgr_is_ctrl_alt:true,
-  has_physical_mem_access:true,
-  has_working_copy_on_write:true,
-  share_mmaps_only_by_name:false,
-  virtual_protect_works_on_shared_pages:true,
-  has_hard_links:true,
-  can_open_directories:true,
-  has_move_file_ex:true,
-  has_negative_pids:false,
-  has_unreliable_pipes:false,
-  has_try_enter_critical_section:true,
-  has_raw_devices:true,
-  has_valid_processorlevel:true,
-  has_64bit_file_access:true,
-  has_process_io_counters:true,
-  supports_reading_modem_output_lines:true,
-  needs_memory_protection:true,
-  pty_needs_alloc_console:true,
-  has_terminal_services:true,
-  has_switch_to_thread:true
-};
-
-static NO_COPY wincaps wincap_xp = {
-  lock_file_highword:UINT32_MAX,
-  chunksize:0,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-  is_winnt:true,
-  is_server:false,
-  access_denied_on_delete:false,
-  has_delete_on_close:true,
-  has_page_guard:true,
-  has_security:true,
-  has_security_descriptor_control:true,
-  has_get_process_times:true,
-  has_lseek_bug:false,
-  has_lock_file_ex:true,
-  has_signal_object_and_wait:true,
-  has_eventlog:true,
-  has_ip_helper_lib:true,
-  has_set_handle_information:true,
-  has_set_handle_information_on_console_handles:true,
-  supports_smp:true,
-  map_view_of_file_ex_sucks:false,
-  altgr_is_ctrl_alt:true,
-  has_physical_mem_access:true,
-  has_working_copy_on_write:true,
-  share_mmaps_only_by_name:false,
-  virtual_protect_works_on_shared_pages:true,
-  has_hard_links:true,
-  can_open_directories:true,
-  has_move_file_ex:true,
-  has_negative_pids:false,
-  has_unreliable_pipes:false,
-  has_try_enter_critical_section:true,
-  has_raw_devices:true,
-  has_valid_processorlevel:true,
-  has_64bit_file_access:true,
-  has_process_io_counters:true,
-  supports_reading_modem_output_lines:true,
-  needs_memory_protection:true,
-  pty_needs_alloc_console:true,
-  has_terminal_services:true,
-  has_switch_to_thread:true
-};
-
-static NO_COPY wincaps wincap_2003 = {
-  lock_file_highword:UINT32_MAX,
-  chunksize:0,
-  shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-  is_winnt:true,
-  is_server:true,
-  access_denied_on_delete:false,
-  has_delete_on_close:true,
-  has_page_guard:true,
-  has_security:true,
-  has_security_descriptor_control:true,
-  has_get_process_times:true,
-  has_lseek_bug:false,
-  has_lock_file_ex:true,
-  has_signal_object_and_wait:true,
-  has_eventlog:true,
-  has_ip_helper_lib:true,
-  has_set_handle_information:true,
-  has_set_handle_information_on_console_handles:true,
-  supports_smp:true,
-  map_view_of_file_ex_sucks:false,
-  altgr_is_ctrl_alt:true,
-  has_physical_mem_access:true,
-  has_working_copy_on_write:true,
-  share_mmaps_only_by_name:false,
-  virtual_protect_works_on_shared_pages:true,
-  has_hard_links:true,
-  can_open_directories:true,
-  has_move_file_ex:true,
-  has_negative_pids:false,
-  has_unreliable_pipes:false,
-  has_try_enter_critical_section:true,
-  has_raw_devices:true,
-  has_valid_processorlevel:true,
-  has_64bit_file_access:true,
-  has_process_io_counters:true,
-  supports_reading_modem_output_lines:true,
-  needs_memory_protection:true,
-  pty_needs_alloc_console:true,
-  has_terminal_services:true,
-  has_switch_to_thread:true
-};
-
-wincapc wincap;
-
-void
-wincapc::init ()
-{
-  const char *os;
-  bool has_osversioninfoex = false;
-
-  if (caps)
-    return;		// already initialized
-
-  memset (&version, 0, sizeof version);
-  /* Request simple version info first. */
-  version.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
-  GetVersionEx (reinterpret_cast<LPOSVERSIONINFO>(&version));
-
-  switch (version.dwPlatformId)
-    {
-      case VER_PLATFORM_WIN32_NT:
-	switch (version.dwMajorVersion)
-	  {
-	    case 3:
-	      os = "NT";
-	      caps = &wincap_nt3;
-	      break;
-	    case 4:
-	      os = "NT";
-	      if (strcmp (version.szCSDVersion, "Service Pack 4") < 0)
-		caps = &wincap_nt4;
-	      else
-	        {
-		  caps = &wincap_nt4sp4;
-		  if (strcmp (version.szCSDVersion, "Service Pack 6") >= 0)
-		    has_osversioninfoex = true;
-		}
-	      break;
-	    case 5:
-	      os = "NT";
-	      has_osversioninfoex = true;
-	      switch (version.dwMinorVersion)
-	        {
-		  case 0:
-		    caps = &wincap_2000;
-		    break;
-
-		  case 1:
-		    caps = &wincap_xp;
-		    break;
-
-		  default:
-		    caps = &wincap_2003;
-		}
-	      break;
-	    default:
-	      os = "??";
-	      caps = &wincap_unknown;
-	      break;
-	  }
-	break;
-      case VER_PLATFORM_WIN32_WINDOWS:
-	switch (version.dwMinorVersion)
-	  {
-	    case 0:
-	      os = "95";
-	      if (strchr (version.szCSDVersion, 'C'))
-		caps = &wincap_95osr2;
-	      else
-		caps = &wincap_95;
-	      break;
-	    case 10:
-	      os = "98";
-	      if (strchr (version.szCSDVersion, 'A'))
-		caps = &wincap_98se;
-	      else
-		caps = &wincap_98;
-	      break;
-	    case 90:
-	      os = "ME";
-	      caps = &wincap_me;
-	      break;
-	    default:
-	      os = "??";
-	      caps = &wincap_unknown;
-	      break;
-	  }
-	break;
-      default:
-	os = "??";
-	caps = &wincap_unknown;
-	break;
-    }
-
-  if (has_osversioninfoex)
-    {
-      /* Request extended version to get server info.
-	 Available since NT4 SP6. */
-      version.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX);
-      GetVersionEx (reinterpret_cast<LPOSVERSIONINFO>(&version));
-      if (version.wProductType != VER_NT_WORKSTATION)
-	((wincaps *)this->caps)->is_server = true;
-    }
-
-  __small_sprintf (osnam, "%s-%d.%d", os, version.dwMajorVersion,
-		   version.dwMinorVersion);
-}
-
-void
-wincapc::set_chunksize (DWORD nchunksize)
-{
-  ((wincaps *)this->caps)->chunksize = nchunksize;
-}
diff --git a/winsup/cygwin/wincap.h b/winsup/cygwin/wincap.h
deleted file mode 100644
index 320b75916..000000000
--- a/winsup/cygwin/wincap.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* wincap.h: Header for OS capability class.
-
-   Copyright 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _WINCAP_H
-#define _WINCAP_H
-
-struct wincaps
-{
-  DWORD    lock_file_highword;
-  DWORD    chunksize;
-  int      shared;
-  unsigned is_winnt                                     : 1;
-  unsigned is_server                                    : 1;
-  unsigned access_denied_on_delete                      : 1;
-  unsigned has_delete_on_close                          : 1;
-  unsigned has_page_guard                               : 1;
-  unsigned has_security                                 : 1;
-  unsigned has_security_descriptor_control              : 1;
-  unsigned has_get_process_times                        : 1;
-  unsigned has_lseek_bug                                : 1;
-  unsigned has_lock_file_ex                             : 1;
-  unsigned has_signal_object_and_wait                   : 1;
-  unsigned has_eventlog                                 : 1;
-  unsigned has_ip_helper_lib                            : 1;
-  unsigned has_set_handle_information                   : 1;
-  unsigned has_set_handle_information_on_console_handles: 1;
-  unsigned supports_smp                                 : 1;
-  unsigned map_view_of_file_ex_sucks                    : 1;
-  unsigned altgr_is_ctrl_alt                            : 1;
-  unsigned has_physical_mem_access                      : 1;
-  unsigned has_working_copy_on_write                    : 1;
-  unsigned share_mmaps_only_by_name                     : 1;
-  unsigned virtual_protect_works_on_shared_pages        : 1;
-  unsigned has_hard_links                               : 1;
-  unsigned can_open_directories                         : 1;
-  unsigned has_move_file_ex                             : 1;
-  unsigned has_negative_pids                            : 1;
-  unsigned has_unreliable_pipes                         : 1;
-  unsigned has_try_enter_critical_section		: 1;
-  unsigned has_raw_devices				: 1;
-  unsigned has_valid_processorlevel			: 1;
-  unsigned has_64bit_file_access			: 1;
-  unsigned has_process_io_counters                      : 1;
-  unsigned supports_reading_modem_output_lines          : 1;
-  unsigned needs_memory_protection			: 1;
-  unsigned pty_needs_alloc_console			: 1;
-  unsigned has_terminal_services			: 1;
-  unsigned has_switch_to_thread				: 1;
-};
-
-class wincapc
-{
-  OSVERSIONINFOEX  version;
-  char             osnam[40];
-  void             *caps;
-
-public:
-  void init ();
-
-  void set_chunksize (DWORD nchunksize);
-
-  const char *osname () const { return osnam; }
-
-#define IMPLEMENT(cap) cap() const { return ((wincaps *) this->caps)->cap; }
-
-  DWORD IMPLEMENT (lock_file_highword)
-  DWORD IMPLEMENT (chunksize)
-  int   IMPLEMENT (shared)
-  bool  IMPLEMENT (is_winnt)
-  bool  IMPLEMENT (is_server)
-  bool  IMPLEMENT (access_denied_on_delete)
-  bool  IMPLEMENT (has_delete_on_close)
-  bool  IMPLEMENT (has_page_guard)
-  bool  IMPLEMENT (has_security)
-  bool  IMPLEMENT (has_security_descriptor_control)
-  bool  IMPLEMENT (has_get_process_times)
-  bool  IMPLEMENT (has_lseek_bug)
-  bool  IMPLEMENT (has_lock_file_ex)
-  bool  IMPLEMENT (has_signal_object_and_wait)
-  bool  IMPLEMENT (has_eventlog)
-  bool  IMPLEMENT (has_ip_helper_lib)
-  bool  IMPLEMENT (has_set_handle_information)
-  bool  IMPLEMENT (has_set_handle_information_on_console_handles)
-  bool  IMPLEMENT (supports_smp)
-  bool  IMPLEMENT (map_view_of_file_ex_sucks)
-  bool  IMPLEMENT (altgr_is_ctrl_alt)
-  bool  IMPLEMENT (has_physical_mem_access)
-  bool  IMPLEMENT (has_working_copy_on_write)
-  bool  IMPLEMENT (share_mmaps_only_by_name)
-  bool  IMPLEMENT (virtual_protect_works_on_shared_pages)
-  bool  IMPLEMENT (has_hard_links)
-  bool  IMPLEMENT (can_open_directories)
-  bool  IMPLEMENT (has_move_file_ex)
-  bool  IMPLEMENT (has_negative_pids)
-  bool  IMPLEMENT (has_unreliable_pipes)
-  bool  IMPLEMENT (has_try_enter_critical_section)
-  bool  IMPLEMENT (has_raw_devices)
-  bool  IMPLEMENT (has_valid_processorlevel)
-  bool  IMPLEMENT (has_64bit_file_access)
-  bool  IMPLEMENT (has_process_io_counters)
-  bool  IMPLEMENT (supports_reading_modem_output_lines)
-  bool  IMPLEMENT (needs_memory_protection)
-  bool  IMPLEMENT (pty_needs_alloc_console)
-  bool  IMPLEMENT (has_terminal_services)
-  bool  IMPLEMENT (has_switch_to_thread)
-
-#undef IMPLEMENT
-};
-
-extern wincapc wincap;
-
-#endif /* _WINCAP_H */
diff --git a/winsup/cygwin/window.cc b/winsup/cygwin/window.cc
deleted file mode 100644
index f9f5da23a..000000000
--- a/winsup/cygwin/window.cc
+++ /dev/null
@@ -1,269 +0,0 @@
-/* window.cc: hidden windows for signals/itimer support
-
-   Copyright 1997, 1998, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Sergey Okhapkin <sos@prospect.com.ru>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include "winsup.h"
-#include <sys/time.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <limits.h>
-#include <wingdi.h>
-#include <winuser.h>
-#define USE_SYS_TYPES_FD_SET
-#include <winsock2.h>
-#include <unistd.h>
-#include "cygerrno.h"
-#include "perprocess.h"
-#include "security.h"
-#include "cygthread.h"
-
-static NO_COPY UINT timer_active = 0;
-static NO_COPY struct itimerval itv;
-static NO_COPY DWORD start_time;
-static NO_COPY HWND ourhwnd = NULL;
-
-static LRESULT CALLBACK
-WndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-#ifndef NOSTRACE
-  strace.wm (uMsg, wParam, lParam);
-#endif
-  switch (uMsg)
-    {
-    case WM_PAINT:
-      return 0;
-    case WM_DESTROY:
-      PostQuitMessage (0);
-      return 0;
-    case WM_TIMER:
-      if (wParam == timer_active)
-	{
-	  UINT elapse = itv.it_interval.tv_sec * 1000 +
-			itv.it_interval.tv_usec / 1000;
-	  KillTimer (hwnd, timer_active);
-	  if (!elapse)
-	    {
-	      timer_active = 0;
-	    }
-	  else
-	    {
-	      timer_active = SetTimer (hwnd, 1, elapse, NULL);
-	      start_time = GetTickCount ();
-	      itv.it_value = itv.it_interval;
-	    }
-	  raise (SIGALRM);
-	}
-      return 0;
-    case WM_ASYNCIO:
-      if (WSAGETSELECTEVENT (lParam) == FD_OOB)
-	raise (SIGURG);
-      else
-	raise (SIGIO);
-      return 0;
-    default:
-      return DefWindowProc (hwnd, uMsg, wParam, lParam);
-    }
-}
-
-static HANDLE window_started;
-
-static DWORD WINAPI
-Winmain (VOID *)
-{
-  MSG msg;
-  WNDCLASS wc;
-  static NO_COPY char classname[] = "CygwinWndClass";
-
-  /* Register the window class for the main window. */
-
-  wc.style = 0;
-  wc.lpfnWndProc = (WNDPROC) WndProc;
-  wc.cbClsExtra = 0;
-  wc.cbWndExtra = 0;
-  wc.hInstance = user_data->hmodule;
-  wc.hIcon = NULL;
-  wc.hCursor = NULL;
-  wc.hbrBackground = NULL;
-  wc.lpszMenuName = NULL;
-  wc.lpszClassName = classname;
-
-  if (!RegisterClass (&wc))
-    {
-      system_printf ("Cannot register window class");
-      return FALSE;
-    }
-
-  /* Create hidden window. */
-  ourhwnd = CreateWindow (classname, classname, WS_POPUP, CW_USEDEFAULT,
-			  CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
-			  (HWND) NULL, (HMENU) NULL, user_data->hmodule,
-			  (LPVOID) NULL);
-
-  SetEvent (window_started);
-
-  if (!ourhwnd)
-    {
-      system_printf ("Cannot create window");
-      return FALSE;
-    }
-
-  /* Start the message loop. */
-
-  while (GetMessage (&msg, ourhwnd, 0, 0) == TRUE)
-    DispatchMessage (&msg);
-
-  return 0;
-}
-
-HWND __stdcall
-gethwnd ()
-{
-  if (ourhwnd != NULL)
-    return ourhwnd;
-
-  cygthread *h;
-
-  window_started = CreateEvent (&sec_none_nih, TRUE, FALSE, NULL);
-  h = new cygthread (Winmain, NULL, "win");
-  h->SetThreadPriority (THREAD_PRIORITY_HIGHEST);
-  WaitForSingleObject (window_started, INFINITE);
-  CloseHandle (window_started);
-  h->zap_h ();
-  return ourhwnd;
-}
-
-extern "C" int
-setitimer (int which, const struct itimerval *value, struct itimerval *oldvalue)
-{
-  UINT elapse;
-
-  if (which != ITIMER_REAL)
-    {
-      set_errno (ENOSYS);
-      return -1;
-    }
-  /* Check if we will wrap */
-  if (itv.it_value.tv_sec >= (long) (UINT_MAX / 1000))
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  if (timer_active)
-    {
-      KillTimer (gethwnd (), timer_active);
-      timer_active = 0;
-    }
-  if (oldvalue)
-    *oldvalue = itv;
-  if (value == NULL)
-    {
-      set_errno (EFAULT);
-      return -1;
-    }
-  itv = *value;
-  elapse = itv.it_value.tv_sec * 1000 + itv.it_value.tv_usec / 1000;
-  if (elapse == 0)
-    if (itv.it_value.tv_usec)
-      elapse = 1;
-    else
-      return 0;
-  if (!(timer_active = SetTimer (gethwnd (), 1, elapse, NULL)))
-    {
-      __seterrno ();
-      return -1;
-    }
-  start_time = GetTickCount ();
-  return 0;
-}
-
-extern "C" int
-getitimer (int which, struct itimerval *value)
-{
-  UINT elapse, val;
-
-  if (which != ITIMER_REAL)
-    {
-      set_errno (EINVAL);
-      return -1;
-    }
-  if (value == NULL)
-    {
-      set_errno (EFAULT);
-      return -1;
-    }
-  *value = itv;
-  if (!timer_active)
-    {
-      value->it_value.tv_sec = 0;
-      value->it_value.tv_usec = 0;
-      return 0;
-    }
-  elapse = GetTickCount () - start_time;
-  val = itv.it_value.tv_sec * 1000 + itv.it_value.tv_usec / 1000;
-  val -= elapse;
-  value->it_value.tv_sec = val / 1000;
-  value->it_value.tv_usec = val % 1000;
-  return 0;
-}
-
-extern "C" unsigned int
-alarm (unsigned int seconds)
-{
-  int ret;
-  struct itimerval newt, oldt;
-
-  newt.it_value.tv_sec = seconds;
-  newt.it_value.tv_usec = 0;
-  newt.it_interval.tv_sec = 0;
-  newt.it_interval.tv_usec = 0;
-  setitimer (ITIMER_REAL, &newt, &oldt);
-  ret = oldt.it_value.tv_sec;
-  if (ret == 0 && oldt.it_value.tv_usec)
-    ret = 1;
-  return ret;
-}
-
-extern "C" useconds_t
-ualarm (useconds_t value, useconds_t interval)
-{
-  struct itimerval timer, otimer;
-
-  timer.it_value.tv_sec = 0;
-  timer.it_value.tv_usec = value;
-  timer.it_interval.tv_sec = 0;
-  timer.it_interval.tv_usec = interval;
-
-  if (setitimer (ITIMER_REAL, &timer, &otimer) < 0)
-    return (u_int)-1;
-
-  return (otimer.it_value.tv_sec * 1000000) + otimer.it_value.tv_usec;
-}
-
-bool
-has_visible_window_station (void)
-{
-  HWINSTA station_hdl;
-  USEROBJECTFLAGS uof;
-  DWORD len;
-
-  /* Check if the process is associated with a visible window station.
-     These are processes running on the local desktop as well as processes
-     running in terminal server sessions.
-     Processes running in a service session not explicitely associated
-     with the desktop (using the "Allow service to interact with desktop"
-     property) are running in an invisible window station. */
-  if ((station_hdl = GetProcessWindowStation ())
-      && GetUserObjectInformationA (station_hdl, UOI_FLAGS, &uof,
-				    sizeof uof, &len)
-      && (uof.dwFlags & WSF_VISIBLE))
-    return true;
-  return false;
-}
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
deleted file mode 100644
index 2d60fcd52..000000000
--- a/winsup/cygwin/winsup.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/* winsup.h: main Cygwin header file.
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#define __INSIDE_CYGWIN__
-
-#define strlen __builtin_strlen
-#define strcmp __builtin_strcmp
-#define strcpy __builtin_strcpy
-#define memcpy __builtin_memcpy
-#define memcmp __builtin_memcmp
-#ifdef HAVE_BUILTIN_MEMSET
-# define memset __builtin_memset
-#endif
-
-#define NO_COPY __attribute__((nocommon)) __attribute__((section(".data_cygwin_nocopy")))
-#define NO_COPY_INIT __attribute__((section(".data_cygwin_nocopy")))
-
-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ >= 199900L
-#define NEW_MACRO_VARARGS
-#endif
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
-#endif
-
-#include <sys/types.h>
-#include <sys/strace.h>
-
-/* Declarations for functions used in C and C++ code. */
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern __uid32_t getuid32 (void);
-extern __uid32_t geteuid32 (void);
-extern int seteuid32 (__uid32_t);
-extern __gid32_t getegid32 (void);
-extern struct passwd *getpwuid32 (__uid32_t);
-extern struct passwd *getpwnam (const char *);
-extern struct __sFILE64 *fopen64 (const char *, const char *);
-extern struct hostent *cygwin_gethostbyname (const char *name);
-extern unsigned long cygwin_inet_addr (const char *cp);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Note that MAX_PATH is defined in the windows headers */
-/* There is also PATH_MAX and MAXPATHLEN.
-   PATH_MAX is from Posix and does *not* include the trailing NUL.
-   MAXPATHLEN is from Unix.
-
-   Thou shalt use CYG_MAX_PATH throughout.  It avoids the NUL vs no-NUL
-   issue and is neither of the Unixy ones [so we can punt on which
-   one is the right one to use]. 
-   
-   Windows ANSI calls are limited to MAX_PATH in length. Cygwin calls that
-   thunk through to Windows Wide calls are limited to 32K. We define
-   CYG_MAX_PATH as a convenient, not to short, not too long 'happy medium'.
-   
-   */
-
-#define CYG_MAX_PATH (MAX_PATH)
-
-#ifdef __cplusplus
-
-extern const char case_folded_lower[];
-#define cyg_tolower(c) (case_folded_lower[(unsigned char)(c)])
-extern const char case_folded_upper[];
-#define cyg_toupper(c) (case_folded_upper[(unsigned char)(c)])
-
-#ifndef MALLOC_DEBUG
-#define cfree newlib_cfree_dont_use
-#endif
-
-#define WIN32_LEAN_AND_MEAN 1
-#define _WINGDI_H
-#define _WINUSER_H
-#define _WINNLS_H
-#define _WINVER_H
-#define _WINNETWK_H
-#define _WINSVC_H
-#include <windows.h>
-#include <wincrypt.h>
-#include <lmcons.h>
-#undef _WINGDI_H
-#undef _WINUSER_H
-#undef _WINNLS_H
-#undef _WINVER_H
-#undef _WINNETWK_H
-#undef _WINSVC_H
-
-#include "wincap.h"
-
-/* The one function we use from winuser.h most of the time */
-extern "C" DWORD WINAPI GetLastError (void);
-
-enum codepage_type {ansi_cp, oem_cp};
-extern codepage_type current_codepage;
-
-UINT get_cp ();
-
-int __stdcall sys_wcstombs(char *, const WCHAR *, int)
-  __attribute__ ((regparm(3)));
-
-int __stdcall sys_mbstowcs(WCHAR *, const char *, int)
-  __attribute__ ((regparm(3)));
-
-/* Used to check if Cygwin DLL is dynamically loaded. */
-extern int dynamically_loaded;
-
-extern int cygserver_running;
-
-#define _MT_SAFE	// DELTEME someday
-
-#define TITLESIZE 1024
-
-/* status bit manipulation */
-#define __ISSETF(what, x, prefix) \
-  ((what)->status & prefix##_##x)
-#define __SETF(what, x, prefix) \
-  ((what)->status |= prefix##_##x)
-#define __CLEARF(what, x, prefix) \
-  ((what)->status &= ~prefix##_##x)
-#define __CONDSETF(n, what, x, prefix) \
-  ((n) ? __SETF (what, x, prefix) : __CLEARF (what, x, prefix))
-
-#include "debug.h"
-
-/* Events/mutexes */
-extern HANDLE title_mutex;
-
-/**************************** Convenience ******************************/
-
-/* Used when treating / and \ as equivalent. */
-#define isdirsep(ch) \
-    ({ \
-	char __c = (ch); \
-	((__c) == '/' || (__c) == '\\'); \
-    })
-
-/* Convert a signal to a signal mask */
-#define SIGTOMASK(sig)	(1<<((sig) - signal_shift_subtract))
-extern unsigned int signal_shift_subtract;
-
-#ifdef NEW_MACRO_VARARGS
-# define api_fatal(...) __api_fatal ("%P: *** " __VA_ARGS__)
-#else
-# define api_fatal(fmt, args...) __api_fatal ("%P: *** " fmt,## args)
-#endif
-
-#undef issep
-#define issep(ch) (strchr (" \t\n\r", (ch)) != NULL)
-
-#define isabspath(p) \
-  (isdirsep (*(p)) || (isalpha (*(p)) && (p)[1] == ':' && (!(p)[2] || isdirsep ((p)[2]))))
-
-/******************** Initialization/Termination **********************/
-
-class per_process;
-/* cygwin .dll initialization */
-void dll_crt0 (per_process *) __asm__ ("_dll_crt0__FP11per_process");
-extern "C" void __stdcall _dll_crt0 ();
-
-/* dynamically loaded dll initialization */
-extern "C" int dll_dllcrt0 (HMODULE, per_process *);
-
-/* dynamically loaded dll initialization for non-cygwin apps */
-extern "C" int dll_noncygwin_dllcrt0 (HMODULE, per_process *);
-
-/* exit the program */
-
-enum exit_states
-  {
-    ES_NOT_EXITING = 0,
-    ES_EVENTS_TERMINATE,
-    ES_THREADTERM,
-    ES_SIGNAL,
-    ES_CLOSEALL,
-    ES_SIGPROCTERMINATE,
-    ES_TITLE,
-    ES_HUP_PGRP,
-    ES_HUP_SID,
-    ES_TTY_TERMINATE
-  };
-
-extern exit_states exit_state;
-void __stdcall do_exit (int) __attribute__ ((regparm (1), noreturn));
-
-/* UID/GID */
-void uinfo_init (void);
-
-#define ILLEGAL_UID16 ((__uid16_t)-1)
-#define ILLEGAL_UID ((__uid32_t)-1)
-#define ILLEGAL_GID16 ((__gid16_t)-1)
-#define ILLEGAL_GID ((__gid32_t)-1)
-#define ILLEGAL_SEEK ((_off64_t)-1)
-
-#define uid16touid32(u16)  ((u16)==ILLEGAL_UID16?ILLEGAL_UID:(__uid32_t)(u16))
-#define gid16togid32(g16)  ((g16)==ILLEGAL_GID16?ILLEGAL_GID:(__gid32_t)(g16))
-
-/* various events */
-void events_init (void);
-void events_terminate (void);
-
-void __stdcall close_all_files (void);
-
-/* Invisible window initialization/termination. */
-HWND __stdcall gethwnd (void);
-/* Check if running in a visible window station. */
-extern bool has_visible_window_station (void);
-
-/* Globals that handle initialization of winsock in a child process. */
-extern HANDLE wsock32_handle;
-extern HANDLE ws2_32_handle;
-
-/* Globals that handle initialization of netapi in a child process. */
-extern HANDLE netapi32_handle;
-
-/* debug_on_trap support. see exceptions.cc:try_to_debug() */
-extern "C" void error_start_init (const char*);
-extern "C" int try_to_debug (bool waitloop = 1);
-
-void set_file_api_mode (codepage_type);
-
-extern int cygwin_finished_initializing;
-
-/**************************** Miscellaneous ******************************/
-
-void __stdcall set_std_handle (int);
-int __stdcall writable_directory (const char *file);
-int __stdcall stat_dev (DWORD, int, unsigned long, struct __stat64 *);
-
-__ino64_t __stdcall hash_path_name (__ino64_t hash, const char *name) __attribute__ ((regparm(2)));
-void __stdcall nofinalslash (const char *src, char *dst) __attribute__ ((regparm(2)));
-extern "C" char *__stdcall rootdir (char *full_path) __attribute__ ((regparm(1)));
-
-/* String manipulation */
-extern "C" char *__stdcall strccpy (char *s1, const char **s2, char c);
-extern "C" int __stdcall strcasematch (const char *s1, const char *s2) __attribute__ ((regparm(2)));
-extern "C" int __stdcall strncasematch (const char *s1, const char *s2, size_t n) __attribute__ ((regparm(3)));
-extern "C" char *__stdcall strcasestr (const char *searchee, const char *lookfor) __attribute__ ((regparm(2)));
-
-/* Time related */
-void __stdcall totimeval (struct timeval *dst, FILETIME * src, int sub, int flag);
-long __stdcall to_time_t (FILETIME * ptr);
-void __stdcall to_timestruc_t (FILETIME * ptr, timestruc_t * out);
-void __stdcall time_as_timestruc_t (timestruc_t * out);
-
-void __stdcall set_console_title (char *);
-void init_console_handler ();
-void init_global_security ();
-
-int __stdcall check_null_str (const char *name) __attribute__ ((regparm(1)));
-int __stdcall check_null_empty_str (const char *name) __attribute__ ((regparm(1)));
-int __stdcall check_null_empty_str_errno (const char *name) __attribute__ ((regparm(1)));
-int __stdcall check_null_str_errno (const char *name) __attribute__ ((regparm(1)));
-int __stdcall __check_null_invalid_struct (void *s, unsigned sz) __attribute__ ((regparm(2)));
-int __stdcall __check_null_invalid_struct_errno (void *s, unsigned sz) __attribute__ ((regparm(2)));
-int __stdcall __check_invalid_read_ptr (const void *s, unsigned sz) __attribute__ ((regparm(2)));
-int __stdcall __check_invalid_read_ptr_errno (const void *s, unsigned sz) __attribute__ ((regparm(2)));
-
-#define check_null_invalid_struct(s) \
-  __check_null_invalid_struct ((s), sizeof (*(s)))
-#define check_null_invalid_struct_errno(s) \
-  __check_null_invalid_struct_errno ((s), sizeof (*(s)))
-#define check_invalid_read_struct_errno(s) \
-  __check_invalid_read_ptr_errno ((s), sizeof (*(s)))
-
-struct iovec;
-ssize_t check_iovec_for_read (const struct iovec *, int) __attribute__ ((regparm(2)));
-ssize_t check_iovec_for_write (const struct iovec *, int) __attribute__ ((regparm(2)));
-
-#define set_winsock_errno() __set_winsock_errno (__FUNCTION__, __LINE__)
-void __set_winsock_errno (const char *fn, int ln) __attribute__ ((regparm(2)));
-
-extern bool wsock_started;
-
-/* Printf type functions */
-extern "C" void __api_fatal (const char *, ...) __attribute__ ((noreturn));
-extern "C" int __small_sprintf (char *dst, const char *fmt, ...) /*__attribute__ ((regparm (2)))*/;
-extern "C" int __small_vsprintf (char *dst, const char *fmt, va_list ap) /*__attribute__ ((regparm (3)))*/;
-extern void multiple_cygwin_problem (const char *, unsigned, unsigned);
-
-int symlink_worker (const char *, const char *, bool, bool)
-  __attribute__ ((regparm (3)));
-
-class path_conv;
-int access_worker (path_conv&, int, class fhandler_base * = NULL) __attribute__ ((regparm (3)));
-
-int fcntl_worker (int fd, int cmd, void *arg);
-
-extern "C" int low_priority_sleep (DWORD) __attribute__ ((regparm (1)));
-#define SLEEP_0_STAY_LOW INFINITE
-
-size_t getshmlba (void);
-
-/**************************** Exports ******************************/
-
-extern "C" {
-int cygwin_select (int , fd_set *, fd_set *, fd_set *,
-		   struct timeval *to);
-int cygwin_gethostname (char *__name, size_t __len);
-
-int kill_pgrp (pid_t, int);
-int _kill (int, int);
-int _raise (int sig);
-
-extern DWORD binmode;
-extern char _data_start__, _data_end__, _bss_start__, _bss_end__;
-extern void (*__CTOR_LIST__) (void);
-extern void (*__DTOR_LIST__) (void);
-extern SYSTEM_INFO system_info;
-};
-
-/*************************** Unsorted ******************************/
-
-#define WM_ASYNCIO	0x8000		// WM_APP
-
-
-#define STD_RBITS (S_IRUSR | S_IRGRP | S_IROTH)
-#define STD_WBITS (S_IWUSR)
-#define STD_XBITS (S_IXUSR | S_IXGRP | S_IXOTH)
-#define NO_W ~(S_IWUSR | S_IWGRP | S_IWOTH)
-#define NO_R ~(S_IRUSR | S_IRGRP | S_IROTH)
-#define NO_X ~(S_IXUSR | S_IXGRP | S_IXOTH)
-
-/* The title on program start. */
-extern char *old_title;
-extern bool display_title;
-
-extern HANDLE hMainThread;
-extern HANDLE hMainProc;
-
-extern bool cygwin_testing;
-
-extern char almost_null[];
-
-#define winsock2_active (wsadata.wVersion >= 512)
-#define winsock_active (wsadata.wVersion < 512)
-extern struct WSAData wsadata;
-
-#endif /* defined __cplusplus */
diff --git a/winsup/cygwin/winver.rc b/winsup/cygwin/winver.rc
deleted file mode 100644
index 5fc130440..000000000
--- a/winsup/cygwin/winver.rc
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <winver.h>
-#include <cygwin/version.h>
-
-#define STRINGIFY1(x) #x
-#define STRINGIFY(x) STRINGIFY1(x)
-
-#define CYGWIN_DLL_NAME CYGWIN_VERSION_DLL_IDENTIFIER STRINGIFY(.dll)
-
-#define CYGWIN_REGISTRY_KEY CYGWIN_INFO_CYGNUS_REGISTRY_NAME "\\" \
-			    CYGWIN_INFO_CYGWIN_REGISTRY_NAME
-
-#define CYGWIN_API_VERSION STRINGIFY(CYGWIN_VERSION_API_MAJOR) "." \
-			  STRINGIFY(CYGWIN_VERSION_API_MINOR)
-
-#define CYGWIN_BUILD_DATE_TIME	STRINGIFY(CYGWIN_BUILD_DATE) " " \
-				STRINGIFY(CYGWIN_BUILD_TIME)
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION    CYGWIN_VERSION_DLL_MAJOR,CYGWIN_VERSION_DLL_MINOR,0,0
-  PRODUCTVERSION CYGWIN_VERSION_DLL_MAJOR,CYGWIN_VERSION_DLL_MINOR,0,0
-  FILEFLAGSMASK  0x3fL
-#ifdef DEBUGGING
-  FILEFLAGS      VS_FF_DEBUG
-#else
-  FILEFLAGS      0x0L
-#endif
-  FILEOS         VOS__WINDOWS32
-  FILETYPE       VFT_DLL
-  FILESUBTYPE    0x0L
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904B0"
-    BEGIN
-      VALUE "CompanyName", "Red Hat"
-      VALUE "FileDescription", "Cygwin\256 POSIX Emulation DLL"
-      VALUE "FileVersion", STRINGIFY(CYGWIN_VERSION)
-      VALUE "InternalName", CYGWIN_DLL_NAME
-      VALUE "LegalCopyright", "Copyright \251 Red Hat, Inc. 1996-2003"
-      VALUE "OriginalFilename", CYGWIN_DLL_NAME
-      VALUE "ProductName", "Cygwin"
-      VALUE "ProductVersion", STRINGIFY(CYGWIN_VERSION)
-      VALUE "APIVersion", CYGWIN_API_VERSION
-      VALUE "SharedMemoryVersion", STRINGIFY(CYGWIN_VERSION_SHARED_DATA)
-      VALUE "RegistryKey", CYGWIN_REGISTRY_KEY
-      VALUE "BuildDate", CYGWIN_BUILD_DATE_TIME
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-      VALUE "Translation", 0x409, 1200
-  END
-END
diff --git a/winsup/cygwin/wsock_event.h b/winsup/cygwin/wsock_event.h
deleted file mode 100644
index 3f8638134..000000000
--- a/winsup/cygwin/wsock_event.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* wsock_event.h: Defining the wsock_event class
-
-   Copyright 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef __WSOCK_EVENT_H__
-#define __WSOCK_EVENT_H__
-
-class wsock_event
-{
-  WSAEVENT		event;
-  WSAOVERLAPPED		ovr;
-public:
-  wsock_event () : event (NULL) {};
-  ~wsock_event ()
-    {
-      if (event)
-	WSACloseEvent (event);
-      event = NULL;
-    };
-
-  /* The methods are implemented in net.cc */
-  LPWSAOVERLAPPED prepare ();
-  int wait (int socket, LPDWORD flags);
-};
-
-#endif /* __WSOCK_EVENT_H__ */
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
deleted file mode 100644
index 96e19d9a9..000000000
--- a/winsup/doc/ChangeLog
+++ /dev/null
@@ -1,229 +0,0 @@
-2003-09-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* pathnames.sgml: Remove description how to mount raw devices and
-	dicourage it.  Desparately try to make usage of raw devices a bit
-	clearer.
-
-2003-07-31  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* effectively.sgml: New file, "Using Cygwin Effectively with Windows".
-	* legal.sgml: Update year in copyright notice.
-	* using.sgml: Include "Using Cygwin Effectively with Windows" section.
-
-2003-07-15  Christopher Faylor  <cgf@redhat.com>
-
-	* pathnames.sgml: Use correct registry key.  Clarify '@' operation.
-
-2003-07-03  Christopher Faylor  <cgf@redhat.com>
-
-	* ntsec.sgml: Reword references to "ntsec patch".
-
-2003-05-08  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* cygwin-ug-net.in.sgml: Remove outdated revision information and 
-	author's names.
-
-2003-04-26  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* gcc.sgml: Remove outdated "WinMainCRTStartup" references. Add a
-	hellogui.c example. 
-
-2003-03-26  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* setup-net.sgml: Make suggested additions to setup.exe documentation
-
-2003-03-23  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* setup-net.sgml: Improve setup.exe documentation
-
-2003-03-22  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* setup-net.sgml: Document setup.exe
-
-2003-02-07  Christopher Faylor  <cgf@redhat.com>
-
-	* how.texinfo: Add more w32api words.
-
-2003-02-07  Igor Pechtchanski <pechtcha@cs.nyu.edu>
-
-	* ntsec.sgml: Add note on special names for missing user/group.
-
-2002-12-18  Christopher Faylor  <cgf@redhat.com>
-
-	* overview2.sgml: Remove CTRL-Z discussion.
-	* cygwinenv.sgml: Expand on CYGWIN=binmode.
-
-2002-11-10  Christopher Faylor  <cgf@redhat.com>
-
-	* how-programming.texinfo: Document _WIN32 more fully.
-
-2002-10-22  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* ntsec.sgml: Correct some minor grammatical errors.
-
-2002-10-22  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* dll.sgml: Simplify dll build instructions.
-
-2002-09-11  Corinna Vinschen  <corinna@vinschen.de>
-
-	* ntsec.html: Add chapter for switching user context w/o password.
-
-2002-08-29  Christopher Faylor  <cgf@redhat.com>
-
-	* how-api.texinfo: Remove a line from the CRLF discussion about lseek
-	not working.  Answer thread safe question more simply.
-
-2002-08-27  Nicholas Wourms  <nwourms@netscape.net>
-
-	* calls.texinfo: Add getc_unlocked, getchar_unlocked, putc_unlocked
-	and putchar_unlocked.
-
-2002-08-21  Christopher Faylor  <cgf@redhat.com>
-
-	* dll.sgml: Remove indirect reference to older gccs.
-
-2002-06-22  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* dll.sgml: Refine dll build instructions.
-
-2002-08-21  Christopher Faylor  <cgf@redhat.com>
-
-	* ntsec.html: Correct some typos.
-
-2002-07-23  Nicholas Wourms  <nwourms@netscape.net>
-
-	* calls.texinfo: Add fcloseall and fcloseall_r.
-
-2002-06-24  Corinna Vinschen <corinna@vinschen.de>
-
-	* ntsec.sgml: Clean up text for examples of /etc/passwd and /etc/group.
-	Add examples with SIDs.  Warn about changing them crudely.
-
-2002-06-21  Christopher Faylor  <cgf@redhat.com>
-
-	* what.texinfo: Fix typo.
-
-2002-06-02  Christopher Faylor  <cgf@redhat.com>
-
-	* how-programming.texinfo: Add more words to the "how to build".
-
-2002-03-01  Christopher Faylor  <cgf@redhat.com>
-
-	* overview.sgml: Fix 'more more' typo.
-
-2002-01-12  Christopher Faylor  <cgf@redhat.com>
-
-	* overview.sgml: Fix Red Hat cygwin contract link.
-	* what.texinfo: Ditto.
-
-2002-01-01  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Duh.  Actually use bzip2 to create the tarball.  Don't
-	just change the name.
-
-2002-01-01  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Make .bz2 tarball.
-
-2001-12-11  Christopher Faylor  <cgf@redhat.com>
-
-	* what.texinfo: Clarify XP.
-
-2001-12-03  Christopher Faylor  <cgf@redhat.com>
-
-	Cleanup copyrights and Cygnus'isms throughout.
-	* setup.sgml: Nuke ancient instructions.
-
-Tue Oct 16 18:02:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* pathnames.sgml: Cleanup raw device text to be more coherent.
-
-Tue Oct 16 17:14:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* pathnames.sgml: Add description for new fixed device paths.
-
-Fri Sep  7 12:47:47 2001  Michael Schaap <cygwin@mscha.com>
-
-	* how-resources.texinfo: Add some additional words about where to find
-	documentation.
-
-Wed Jun 13 13:54:35 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* who.texinfo: Oops.  Add a couple of important folk.
-
-Wed Jun 13 13:45:44 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* who.texinfo: Remove email addresses.  Modernize.
-
-Tue May 29 21:30:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Tweak to attempt to accomodate older texi2html.
-
-Tue May 29 16:24:46 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Accomodate newer versions of docbook and openjade.
-
-Thu Apr 12 23:52:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygwinenv.sgml: Add text for `check_case' option.
-
-Fri Mar  2 12:42:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygwinenv.sgml: Add text for `winsymlinks' option.
-	* how-api.texinfo: Add text to explain new symlinks==shortcuts
-	and the CYGWIN setting `(no)winsymlinks'.
-	* how-using.texinfo: Add text that Cygwin now treats shortcuts
-	as symlinks.
-
-2001-02-07  Eric M. Monsler  <emonsler@beamreachnetworks.com>
-
-	* setup2.sgml: Add docs about domain accounts.
-
-Thu Dec 21 15:03:29 2000  Edward M. Lee <tailbert@yahoo.com>
-
-	* cygwinenv.sgml: Fix typo in <filename>. Add missing </para>.
-
-Tue Dec 19 21:06:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygwinenv.sgml: Add text for `smbntsec' option.
-
-Sat Nov 18 23:50:12 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygwinenv.sgml: Remove CYGWIN=strace option.  Update CYGWIN options.
-	* setup2.sgml: Remove CYGWIN=strace example.
-	* how-programming.texinfo: Remove stuff about CYGWIN=strace.
-
-Thu Oct 26 10:00:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* ntsec.sgml: Slight changes. Fix some errors.
-
-Thu Oct 26  9:35:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* ntsec.sgml: Changed the (now incorrect) hint that ntsec only
-	uses access allowed ACEs.
-
-Fri Sep 29 23:52:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* pathnames.sgml: Add documentation about raw block special
-	devices and tape devices to the "POSIX devices" chapter.
-
-Fri Aug 18 15:51:06 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* fhandler-tut.txt: hinfo -> dtable.
-
-Thu Jul 20 13:01:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* ntsec.sgml: Add description for the new setuid ability
-	of Cygwin since release 1.1.3.
-	* overview2.sgml: Add description for new chroot functionality.
-	* calls.texinfo: Add missing calls. Change comments for
-	setuid, setgid, seteuid, setegid, chroot.
-
-Tue May  3  0:25:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-        * ntsec.sgml: Revisited description of `ntsec' according to
-        the changes in release 1.1.
-        * setup.sgml: Include ntsec.
-        * setup-net.sgml: Ditto.
-
diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in
deleted file mode 100644
index 4be5f06e5..000000000
--- a/winsup/doc/Makefile.in
+++ /dev/null
@@ -1,121 +0,0 @@
-# -*- Makefile -*- for winsup/doc
-# Copyright (c) 1998-2000,2001 Red Hat, Inc.
-#
-# This file is part of Cygwin.
-#
-# This software is a copyrighted work licensed under the terms of the
-# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-# details.
-
-SHELL = @SHELL@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-SGMLDIRS =  -d $(srcdir) -d $(utils_source) -d $(cygwin_source)
-
-# These *.info targets don't actually work, so remove them for now.
-# Put them back when we figure out what to do with them. (davisb)
-#DOC=faq.txt faq.info readme.txt readme.info
-DOC=faq.txt readme.txt
-HTMLDOC=faq.html readme.html
-
-CC:=@CC@
-CC_FOR_TARGET:=@CC@
-exeext:=@build_exeext@
-
-MAKEINFO:=makeinfo
-TEXI2DVI:=texi2dvi
-TEXI2HTML:=texi2html
-
-include $(srcdir)/../Makefile.common
-
-TOCLEAN:=faq.txt ./*.html readme.txt doctool.o doctool \
-	 cygwin-ug.sgml cygwin-ug-net.sgml
-
-.SUFFIXES:
-
-# You can add cygwin-api/cygwin-api.html if you want to.
-all : \
-	cygwin-ug/cygwin-ug.html \
-	cygwin-ug-net/cygwin-ug-net.html \
-	cygwin-api-int/cygwin-api-int.html \
-	cygwin-api/cygwin-api.html \
-	$(DOC) \
-	$(HTMLDOC)
-
-clean:
-	rm -f $(TOCLEAN)
-
-install:	all
-
-cygwin-ug/cygwin-ug.html : cygwin-ug.sgml doctool
-	-db2html $<
-
-cygwin-ug.sgml : cygwin-ug.in.sgml ./doctool Makefile
-	-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $<
-
-cygwin-ug-net/cygwin-ug-net.html : cygwin-ug-net.sgml doctool
-	-db2html $<
-
-cygwin-ug-net.sgml : cygwin-ug-net.in.sgml ./doctool Makefile
-	-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $<
-
-cygwin-api/cygwin-api.html : cygwin-api.sgml
-	-db2html $<
-
-cygwin-api.sgml : cygwin-api.in.sgml ./doctool Makefile
-	-./doctool -m $(SGMLDIRS) -s $(srcdir) -o $@ $<
-
-cygwin-api-int/cygwin-api-int.html : cygwin-api-int.sgml
-	-db2html $<
-
-cygwin-api-int.sgml : cygwin-api.in.sgml ./doctool Makefile
-	-./doctool -i -m $(SGMLDIRS) -s $(srcdir) -b cygwin-api-int -o $@ $<
-
-./doctool : doctool.c
-	gcc -g $< -o $@
-
-%.dvi: %.sgml
-	-db2dvi $<
-
-%.rtf: %.sgml
-	-db2rtf $<
-
-%.ps: %.sgml
-	-db2ps $<
-
-%.pdf: %.ps
-	-ps2pdf $< $@
-
-%.info: %.texinfo
-	-$(MAKEINFO) -I $(srcdir) $<
-
-%.txt: %.texinfo
-	-$(MAKEINFO) -I $(srcdir) $<
-
-%.html: %.texinfo
-	-$(TEXI2HTML) -I $(srcdir) $<
-
-readme.txt: $(srcdir)/readme.texinfo $(srcdir)/*.texinfo
-	-$(MAKEINFO) -I$(srcdir) --no-split --no-headers $< -o - |\
-	sed '/^Concept Index/,$$d' > $@
-
-faq.html: $(srcdir)/faq.texinfo $(srcdir)/*.texinfo
-	-rm -f faq_toc.html; \
-	for i in $(srcdir)/*.texinfo ; do \
-		sed < $$i -e 's?@file{\([fth]*p://[^}]*\)}?@strong{<A HREF="\1">\1</A>}?' \
-	    -e 's?\([.+a-zA-Z0-9-]*@@[.a-zA-Z0-9-]*[a-zA-Z0-9]\)?<A HREF="mailto:\1">\1</A>?' >./`basename $$i` ; done; \
-	$(TEXI2HTML) -split_chapter ./faq.texinfo; \
-	rm -f *.texinfo; \
-	[ -r faq_toc.html ] && mv faq_toc.html faq.html; exit 0
-
-TBFILES = cygwin-ug-net.dvi cygwin-ug-net.rtf cygwin-ug-net.ps \
-	  cygwin-ug-net.pdf cygwin-ug-net.sgml \
-	  cygwin-api.dvi cygwin-api.rtf cygwin-api.ps \
-	  cygwin-api.pdf cygwin-api.sgml
-TBDIRS = cygwin-ug-net cygwin-api
-TBDEPS = cygwin-ug-net/cygwin-ug-net.html cygwin-api/cygwin-api.html
-
-tarball : cygwin-docs.tar.bz2
-cygwin-docs.tar.bz2 : $(TBFILES) $(TBDEPS)
-	find $(TBFILES) $(TBDIRS) \! -type d | sort | tar -T - -cf -  | bzip2 > cygwin-docs.tar.bz2
diff --git a/winsup/doc/calls.texinfo b/winsup/doc/calls.texinfo
deleted file mode 100644
index e180d811f..000000000
--- a/winsup/doc/calls.texinfo
+++ /dev/null
@@ -1,709 +0,0 @@
-@chapter What Unix API calls are supported by Cygwin?
-
-This is the beginning of documentation listing the calls supported
-by the Cygwin library.
-
-All POSIX.1/1996 and ANSI C calls are listed in this file.  Note that
-while almost all POSIX.1/1990 calls are included in Cygwin, most
-POSIX.1/1996 calls are not (yet at least!).  Additional Unix
-compatibility calls and extended libc/libm calls are provided by
-Cygwin but may or may not be listed yet.
-
-To see if a function is implemented but not listed here, check for the
-presence of the call in the file winsup/cygwin.din in the sources.  In
-addition, you may want to read the source code corresponding to the call
-to verify that it is not a stub.  Finally, libc/libm functions
-(including extended calls not listed here) may be documented in the
-newlib texinfo documentation.
-
-Calls are implemented on both Windows 95 and NT unless otherwise
-noted.  Included are references to relevant standards, if any.
-Calls starting with "cygwin_" are Cygwin-specific calls.
-
-@section ANSI C Library Functions
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-@itemize @code
-
-@item libc stdio (newlib/libc/stdio)
-@itemize @code
-@item clearerr: C 4.9.10.1
-@item fclose: C 4.9.5.1, P 8.2.3.2
-@item feof: C 4.9.10.2
-@item ferror: C 4.9.10.3
-@item fflush: C 4.9.5.2, P 8.2.3.4
-@item fgetc: C 4.9.7.1, P 8.2.3.5
-@item fgetpos: C 4.9.9.1
-@item fgets: C 4.9.7.2, P 8.2.3.5
-@item fopen: C 4.9.5.3, P 8.2.3.1
-@item fprintf: C 4.9.7.3, P 8.2.3.6
-@item fputc: C 4.9.7.3, P 8.2.3.6
-@item fputs: C 4.9.7.4, P 8.2.3.6
-@item fread: C 4.9.8.1, P 8.2.3.5
-@item freopen: C 4.9.5.4, P 8.2.3.3
-@item fscanf: C 4.9.6.2, P 8.2.3.7
-@item fseek: C 4.9.9.2, P 8.2.3.7
-@item fsetpos: C 4.9.9.3
-@item ftell: C 4.9.9.4, P 8.2.3.10
-@item fwrite: C 4.9.8.2, P 8.2.3.6
-@item getc: C 4.9.7.5, P 8.2.3.5
-@item getchar: C 4.9.7.6, P 8.2.3.5
-@item gets: C 4.9.7.7, P 8.2.3.5
-@item perror: C 4.9.10.4, P 8.2.3.8
-@item printf: C 4.9.6.3, P 8.2.3.6
-@item putc: C 4.9.7.8, P 8.2.3.6
-@item putchar: C 4.9.7.9, P 8.2.3.6
-@item puts: C 4.9.7.10, P 8.2.3.6
-@item remove: C 4.9.4.1, P 8.2.4
-@item rename: C 4.9.4.2, P 5.5.3.1
-@item rewind: C 4.9.9.5, P 8.2.3.7
-@item scanf: C 4.9.6.4, P 8.2.3.5
-@item setbuf: C 4.9.5.5
-@item setvbuf: C 4.9.5.6
-@item sprintf: C 4.9.6.5
-@item sscanf: C 4.9.6.6
-@item tmpfile: C 4.9.4.3, P 8.2.3.9
-@item tmpnam: C 4.9.4.4, P 8.2.5
-@item vfprintf: C 4.9.6.7
-@item ungetc: C 4.9.7.11
-@item vprintf: C 4.9.6.8
-@item vsprintf: C 4.9.6.9
-@end itemize
-
-@item libc string (newlib/libc/string)
-@itemize @code
-@item memchr: C 4.11.5.1
-@item memcmp: C 4.11.4.1
-@item memcpy: C 4.11.2.1
-@item memmove: C 4.11.2.2
-@item memset: C 4.11.6.1
-@item strcat: C 4.11.3.1
-@item strchr: C 4.11.5.2
-@item strcmp: C 4.11.4.2
-@item strcoll: C 4.11.4.3
-@item strcpy: C 4.11.2.3
-@item strcspn: C 4.11.5.3
-@item strerror: C 4.11.6.2
-@item strlen: C 4.11.6.3
-@item strncat: C 4.11.3.2
-@item strncmp: C 4.11.3.2
-@item strncpy: C 4.11.2.4
-@item strpbrk: C 4.11.5.4
-@item strrchr: C 4.11.5.5
-@item strspn: C 4.11.5.6
-@item strstr: C 4.11.5.7
-@item strtok: C 4.11.5.8
-@item strxfrm: C 4.11.4.5
-@end itemize
-
-@item libc stdlib (newlib/libc/stdlib, environ.cc, newlib/libc/include/machine/setjmp.h newlib/libc/include/assert.h)
-@itemize @code
-@item abort: C 4.10.4.1, P 8.2.3.12
-@item abs: C 4.10.6.1
-@item assert: C 4.2.1.1
-@item atexit: C 4.10.4.2
-@item atof: C 4.10.1.1
-@item atoi: C 4.10.1.2
-@item atol: C 4.10.1.3
-@item bsearch: C 4.10.5.1
-@item calloc: C 4.10.3.1
-@item div: C 4.10.6.2
-@item exit: C 4.10.4.3, P 8.2.3.12
-@item free: C 4.10.3.2
-@item getenv: C 4.10.4.4, P 4.6.1.1
-@item labs: C 4.10.6.3
-@item ldiv: C 4.10.6.2
-@item longjmp: C 4.6.2.1
-@item malloc: C 4.10.3.3
-@item mblen: C 4.10.7.1
-@item mbstowcs: C 4.10.8.1
-@item mbtowc: C 4.10.7.2
-@item qsort: 4.10.5.2
-@item rand: C 4.10.2.1
-@item realloc: C 4.10.3.4
-@item setjmp: C 4.6.1.1
-@item srand: C 4.10.2.2
-@item strtod: C 4.10.1.4
-@item strtol: C 4.10.1.5
-@item strtoul: C 4.10.1.6
-@item system: C 4.10.4.5
-@item wcstombs: C 4.10.8.2
-@item wctomb: C 4.10.7.3
-@end itemize
-
-@item libc time (times.cc, newlib/libc/time)
-@itemize @code
-@item asctime: C 4.12.3.1
-@item gmtime: C 4.12.3.3
-@item localtime: C 4.12.3.4, P 8.1.1
-@item time: C 4.12.2.4, P 4.5.1.1
-@item clock: C 4.12.2.1
-@item ctime: C 4.12.3.2
-@item difftime: C 4.12.2.2
-@item mktime: C 4.12.2.3, P 8.1.1
-@item strftime: C 4.11.6.2
-@end itemize
-
-@item libc signals (signal.cc, newlib/libc/signal)
-@itemize @code
-@item raise: C 4.7.2.1
-@item signal: C 4.7.1.1
-@end itemize
-
-@item libc ctype (newlib/libc/ctype)
-@itemize @code
-@item isalnum: C 4.3.1.1
-@item isalpha: C 4.3.1.2
-@item iscntrl: C 4.3.1.3
-@item isdigit: C 4.3.1.4
-@item isgraph: C 4.3.1.5
-@item islower: C 4.3.1.6
-@item isprint: C 4.3.1.7
-@item ispunct: C 4.3.1.8
-@item isspace: C 4.3.1.9
-@item isupper: C 4.3.1.10
-@item isxdigit: C 4.3.1.11
-@item tolower: C 4.3.2.1
-@item toupper: C 4.3.2.2
-@end itemize
-
-@item libm math (newlib/libm/math)
-@itemize @code
-@item acos: C 4.5.2.1
-@item asin: C 4.5.2.2
-@item atan: C 4.5.2.3
-@item atan2: C 4.5.2.4
-@item ceil: C 4.5.6.1
-@item cos: C 4.5.2.5
-@item cosh: C 4.5.3.2
-@item exp: C 4.5.4.1
-@item fabs: C 4.5.6.2
-@item floor: C 4.5.6.3
-@item fmod: C 4.5.6.4
-@item frexp: C 4.5.4.2
-@item ldexp: C 4.5.4.3
-@item log: C 4.5.4.4
-@item log10: C 4.5.4.5
-@item modf: C 4.5.4.6
-@item pow: C 4.5.5.1
-@item sin: C 4.5.2.6
-@item sinh: C 4.5.3.2
-@item sqrt: C 4.5.5.2
-@item tan: C 4.5.2.7
-@item tanh: C 4.5.3.3
-@end itemize
-
-@item libc misc (newlib/libc/locale, gcc/ginclude/stdarg.h)
-@itemize @code
-@item localeconv: C 4.4.2.1
-@item setlocale: C 4.4.1.1, P 8.1.2.1
-@item va_arg: C 4.8.1.2
-@item va_end: C 4.8.1.3
-@item va_start: C 4.8.1.1
-@end itemize
-
-@section POSIX.1/96 Functions
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-@item Process Primitives (Section 3)
-@itemize @code
-@item fork: P 3.1.1.1
-@item execl: P 3.1.2.1
-@item execle: P 3.1.2.1
-@item execlp: P 3.1.2.1
-@item execv: P 3.1.2.1
-@item execve: P 3.1.2.1
-@item execvp: P 3.1.2.1
-@item pthread_atfork: P96 3.1.3.1 -- unimplemented
-@item wait: P 3.2.1.1
-@item waitpid: P 3.2.1.1
-@item _exit: P 3.2.2.1
-@item kill: P 3.3.2.1
-@item sigemptyset: P 3.3.3.1
-@item sigfillset: P 3.3.3.1
-@item sigaddset: P 3.3.3.1
-@item sigdelset: P 3.3.3.1
-@item sigismember: P 3.3.3.1
-@item sigaction: P 3.3.4.1 
-@item pthread_sigmask: P96 3.3.5.1
-@item sigprocmask: P 3.3.5.1
-@item sigpending: P 3.3.6.1
-@item sigsuspend: P 3.3.7.1
-@item sigwait: P96 3.3.8.1 -- unimplemented
-@item sigwaitinfo: P96 3.3.8.1 -- unimplemented
-@item sigtimedwait: P96 3.3.8.1 -- unimplemented
-@item sigqueue: P96 3.3.9.1 -- unimplemented
-@item pthread_kill: P96 3.3.10.1
-@item alarm: P 3.4.1.1
-@item pause: P 3.4.2.1
-@item sleep: P 3.4.3.1
-@end itemize
-
-@item Process Environment (Section 4)
-@itemize @code
-@item getpid: P 4.1.1.1
-@item getppid: P 4.1.1.1
-@item getuid: P 4.2.1.1
-@item geteuid: P 4.2.1.1
-@item getgid: P 4.2.1.1
-@item getegid: P 4.2.1.1
-@item setuid: P 4.2.2.1 (stub on 9X, sets ENOSYS, returns zero)
-@item setgid: P 4.2.2.1 (stub on 9X, sets ENOSYS, returns zero)
-@item getgroups: P 4.2.3.1
-@item getlogin: P 4.2.4.1
-@item getlogin_r: P 4.2.4.1 -- unimplemented
-@item getpgrp: P 4.3.1.1
-@item setsid: P 4.3.2.1
-@item setpgid: P 4.3.3.1
-@item uname: P 4.4.1.1
-@item time: C 4.12.2.4, P 4.5.1.1
-@item times: P 4.5.2.1
-@item getenv: C 4.10.4.4, P 4.6.1.1
-@item ctermid: P 4.7.1.1
-@item ttyname: P 4.7.2.1
-@item ttyname_r: P 4.7.2.1 -- unimplemented
-@item isatty: P 4.7.2.1
-@item sysconf: P 4.8.1.1
-@end itemize
-
-@item Files and Directories (Section 5)
-@itemize @code
-@item opendir: P 5.1.2.1
-@item readdir: P 5.1.2.1
-@item readdir_r: P96 5.1.2.1 -- unimplemented
-@item rewinddir: P 5.1.2.1
-@item closedir: P 5.1.2.1
-@item chdir: P 5.2.1.1
-@item getcwd: P 5.2.2.1
-@item open: P 5.3.1.1
-@item creat: P 5.3.2.1
-@item umask: P 5.3.3.1
-@item link: P 5.3.4.1 (copy file in Win 95, and when link fails in NT)
-@item mkdir: P 5.4.1.1
-@item mkfifo: P 5.4.2.1 -- unimplemented!!!
-@item unlink: P 5.5.1.1
-@item rmdir: P 5.5.2.1
-@item rename: C 4.9.4.2, P 5.5.3.1
-@item stat: P 5.6.2.1
-@item fstat: P 5.6.2.1
-@item access: P 5.6.3.1
-@item chmod: P 5.6.4.1
-@item fchmod: P96 5.6.4.1
-@item chown: P 5.6.5.1 (stub in Win 95; always returns zero)
-@item utime: P 5.6.6.1
-@item ftruncate: P96 5.6.7.1
-@item pathconf: P 5.7.1.1
-@item fpathconf: P 5.7.1.1
-@end itemize
-
-@item Input and Output Primitives (Section 6)
-@itemize @code
-@item pipe: P 6.1.1.1
-@item dup: P 6.2.1.1
-@item dup2: P 6.2.1.1
-@item close: P 6.3.1.1
-@item read: P 6.4.1.1
-@item write: P 6.4.2.1
-@item fcntl: P 6.5.2.1 (note: fcntl(fd, F_GETLK,...) is not implemented (returns -1 with errno set to ENOSYS)).
-@item lseek: P 6.5.3.1 (note: only works correctly on binary files)
-@item fsync: P96 6.6.1.1
-@item fdatasync: P96 6.6.2.1 -- unimplemented
-@item aio_read: P96 6.7.2.1 -- unimplemented
-@item aio_write: P96 6.7.3.1 -- unimplemented
-@item lio_listio: P96 6.7.4.1 -- unimplemented
-@item aio_error: P96 6.7.5.1 -- unimplemented
-@item aio_return: P96 6.7.6.1 -- unimplemented
-@item aio_cancel: P96 6.7.7.1 -- unimplemented
-@item aio_suspend: P96 6.7.8.1 -- unimplemented
-@item aio_fsync: P96 6.7.9.1 -- unimplemented
-@end itemize
-
-@item Device- and Class-Specific Functions (Section 7)
-@itemize @code
-@item cfgetispeed: P96 7.1.3.1
-@item cfgetospeed: P96 7.1.3.1
-@item cfsetispeed: P96 7.1.3.1
-@item cfsetospeed: P96 7.1.3.1
-@item tcdrain: P 7.2.2.1
-@item tcflow: P 7.2.2.1
-@item tcflush: P 7.2.2.1
-@item tcgetattr: P96 7.2.1.1
-@item tcgetpgrp: P 7.2.3.1
-@item tcsendbreak: P 7.2.2.1
-@item tcsetattr: P96 7.2.1.1
-@item tcsetpgrp: P 7.2.4.1
-@end itemize
-
-@item Language-Specific Services for the C Programming Language
-(Section 8)
-@itemize @code
-@item abort: C 4.10.4.1, P 8.2.3.12
-@item asctime_r: P96 8.3.4.1 -- unimplemented
-@item ctime_r: P96 8.3.5.1 -- unimplemented
-@item exit: C 4.10.4.3, P 8.2.3.12
-@item fclose: C 4.9.5.1, P 8.2.3.2
-@item fdopen: P 8.2.2.1
-@item fflush: C 4.9.5.2, P 8.2.3.4
-@item fgetc: C 4.9.7.1, P 8.2.3.5
-@item fgets: C 4.9.7.2, P 8.2.3.5
-@item fileno: P 8.2.1.1
-@item flockfile: P96 8.2.6.1 -- unimplemented
-@item fopen: C 4.9.5.3, P 8.2.3.1
-@item fprintf: C 4.9.7.3, P 8.2.3.6
-@item fputc: C 4.9.7.3, P 8.2.3.6
-@item fputs: C 4.9.7.4, P 8.2.3.6
-@item fread: C 4.9.8.1, P 8.2.3.5
-@item freopen: C 4.9.5.4, P 8.2.3.3
-@item fscanf: C 4.9.6.2, P 8.2.3.7
-@item fseek: C 4.9.9.2, P 8.2.3.7
-@item ftell: C 4.9.9.4, P 8.2.3.10
-@item ftrylockfile: P96 8.2.6.1 -- unimplemented
-@item funlockfile: P96 8.2.6.1 -- unimplemented
-@item fwrite: C 4.9.8.2, P 8.2.3.6
-@item getc: C 4.9.7.5, P 8.2.3.5
-@item getc_unlocked: P96 8.2.7.1
-@item getchar: C 4.9.7.6, P 8.2.3.5
-@item getchar_unlocked: P96 8.2.7.1
-@item gets: C 4.9.7.7, P 8.2.3.5
-@item gmtime_r: P96 8.3.6.1 -- unimplemented
-@item localtime_r: P96 8.3.7.1 -- unimplemented
-@item perror: C 4.9.10.4, P 8.2.3.8
-@item printf: C 4.9.6.3, P 8.2.3.6
-@item putc: C 4.9.7.8, P 8.2.3.6
-@item putc_unlocked: P96 8.2.7.1
-@item putchar: C 4.9.7.9, P 8.2.3.6
-@item putchar_unlocked: P96 8.2.7.1
-@item puts: C 4.9.7.10, P 8.2.3.6
-@item rand_r: P96 8.3.8.1 -- unimplemented
-@item remove: C 4.9.4.1, P 8.2.4
-@item rewind: C 4.9.9.5, P 8.2.3.7
-@item scanf: C 4.9.6.4, P 8.2.3.5
-@item setlocale: C 4.4.1.1, P 8.1.2.1
-@item siglongjmp: P 8.3.1.1
-@item sigsetjmp: P 8.3.1.1
-@item strtok_r: P96 8.3.3.1 -- unimplemented
-@item tmpfile: C 4.9.4.3, P 8.2.3.9
-@item tmpnam: C 4.9.4.4, P 8.2.5
-@item tzset: P 8.3.2.1
-@end itemize
-
-@item System Databases (Section 9)
-@itemize @code
-@item getgrgid: P 9.2.1.1
-@item getgrgid_r: P96 9.2.1.1 -- unimplemented
-@item getgrnam: P 9.2.1.1
-@item getgrnam_r: P96 9.2.1.1 -- unimplemented
-@item getpwnam: P 9.2.2.1
-@item getpwnam_r: P96 9.2.2.1 -- unimplemented
-@item getpwuid: P 9.2.2.1
-@item getpwuid_r: P96 9.2.2.1 -- unimplemented
-@end itemize
-
-@item Synchronization (Section 11)
-@itemize @code
-@item pthread_cond_broadcast: P96 11.4.3.1
-@item pthread_cond_destroy: P96 11.4.2.1
-@item pthread_cond_init: P96 11.4.2.1
-@item pthread_cond_signal: P96 11.4.3.1
-@item pthread_cond_timedwait: P96 11.4.4.1
-@item pthread_cond_wait: P96 11.4.4.1
-@item pthread_condattr_destroy: P96 11.4.1.1 -- unimplemented
-@item pthread_condattr_getpshared: P96 11.4.1.1 -- unimplemented
-@item pthread_condattr_init: P96 11.4.1.1 -- unimplemented
-@item pthread_condattr_setpshared: P96 11.4.1.1 -- unimplemented
-@item pthread_mutex_destroy: P96 11.3.2.1
-@item pthread_mutex_init: P96 11.3.2.1
-@item pthread_mutex_lock: P96 11.3.3.1
-@item pthread_mutex_trylock: P96 11.3.3.1
-@item pthread_mutex_unlock: P96 11.3.3.1
-@item sem_close: P96 11.2.4.1 -- unimplemented
-@item sem_destroy: P96 11.2.2.1
-@item sem_getvalue: P96 11.2.8.1 -- unimplemented
-@item sem_init: P96 11.2.1.1
-@item sem_open: P96 11.2.3.1 -- unimplemented
-@item sem_post: P96 11.2.7.1
-@item sem_trywait: P96 11.2.6.1
-@item sem_unlink: P96 11.2.5.1 -- unimplemented
-@item sem_wait: P96 11.2.6.1
-@end itemize
-
-@item Memory Management (Section 12)
-@itemize @code
-@item mlock: P96 12.1.2.1 -- unimplemented
-@item mlockall: P96 12.1.1.1 -- unimplemented
-@item mmap: P96 12.2.1.1
-@item mprotect: P96 12.2.3.1 
-@item msync: P96 12.2.4.1
-@item munlock: P96 12.1.2.1 -- unimplemented
-@item munlockall: P96 12.1.1.1 -- unimplemented
-@item munmap: P96 12.2.2.1 
-@item shm_open: P96 12.3.1.1 -- unimplemented
-@item shm_unlink: P96 12.3.2.1 -- unimplemented
-@end itemize
-
-@item Execution Scheduling (Section 13)
-@itemize @code
-@item pthread_attr_getinheritsched: P96 13.5.1.1 -- unimplemented
-@item pthread_attr_getschedparam: P96 13.5.1.1 -- unimplemented
-@item pthread_attr_getschedpolicy: P96 13.5.1.1 -- unimplemented
-@item pthread_attr_getscope: P96 13.5.1.1 -- unimplemented
-@item pthread_attr_setinheritsched: P96 13.5.1.1
-@item pthread_attr_setschedparam: P96 13.5.1.1 -- unimplemented
-@item pthread_attr_setschedpolicy: P96 13.5.1.1 -- unimplemented
-@item pthread_attr_setscope: P96 13.5.1.1 -- unimplemented
-@item pthread_getschedparam: P96 13.5.2.1
-@item pthread_mutex_getprioceiling: P96 13.6.2.1 -- unimplemented
-@item pthread_mutex_setprioceiling: P96 13.6.2.1 -- unimplemented
-@item pthread_mutexattr_getprioceiling: P96 13.6.1.1 -- unimplemented
-@item pthread_mutexattr_getprotocol: P96 13.6.1.1 -- unimplemented
-@item pthread_mutexattr_setprioceiling: P96 13.6.1.1 -- unimplemented
-@item pthread_mutexattr_setprotocol: P96 13.6.1.1 -- unimplemented
-@item pthread_setschedparam: P96 13.5.2.1
-@item sched_get_priority_max: P96 13.3.6.1 -- unimplemented
-@item sched_get_priority_min: P96 13.3.6.1 -- unimplemented
-@item sched_getparam: P96 13.3.2.1 -- unimplemented
-@item sched_getscheduler: P96 13.3.4.1 -- unimplemented
-@item sched_rr_get_interval: P96 13.3.6.1 -- unimplemented
-@item sched_setparam: P96 13.3.1.1 -- unimplemented
-@item sched_setscheduler: P96 13.3.3.1 -- unimplemented
-@item sched_yield: P96 13.3.5.1 -- unimplemented
-@end itemize
-
-@item Clocks and Timers (Section 14)
-@itemize @code
-@item clock_getres: P96 14.2.1.1 -- unimplemented
-@item clock_gettime: P96 14.2.1.1 -- unimplemented
-@item clock_settime: P96 14.2.1.1 -- unimplemented
-@item nanosleep: P96 14.2.5.1 -- unimplemented
-@item timer_create: P96 14.2.2.1 -- unimplemented
-@item timer_delete: P96 14.2.3.1 -- unimplemented
-@item timer_getoverrun: P96 14.2.4.1 -- unimplemented
-@item timer_gettime: P96 14.2.4.1 -- unimplemented
-@item timer_settime: P96 14.2.4.1 -- unimplemented
-@end itemize
-
-@item Message Passing (Section 15)
-@itemize @code
-@item mq_close: P96 15.2.2.1 -- unimplemented
-@item mq_getattr: P96 15.2.8.1 -- unimplemented
-@item mq_notify: P96 15.2.6.1 -- unimplemented
-@item mq_open: P96 15.2.1.1 -- unimplemented
-@item mq_receive: P96 15.2.5.1 -- unimplemented
-@item mq_send: P96 15.2.4.1 -- unimplemented
-@item mq_setattr: P96 15.2.7.1 -- unimplemented
-@item mq_unlink: P96 15.2.3.1 -- unimplemented
-@end itemize
-
-@item Thread Management (Section 16)
-@itemize @code
-@item pthread_attr_destroy: P96 16.2.1.1
-@item pthread_attr_getdetachstate: P96 16.2.1.1 -- unimplemented
-@item pthread_attr_getstackaddr: P96 16.2.1.1 -- unimplemented
-@item pthread_attr_getstacksize: P96 16.2.1.1
-@item pthread_attr_init: P96 16.2.1.1
-@item pthread_attr_setdetachstate: P96 16.2.1.1 -- unimplemented
-@item pthread_attr_setstackaddr: P96 16.2.1.1 -- unimplemented
-@item pthread_attr_setstacksize: P96 16.2.1.1
-@item pthread_create: P96 16.2.2.1
-@item pthread_detach: P96 16.2.4.1 -- unimplemented
-@item pthread_equal: P96 16.2.7.1
-@item pthread_exit: P96 16.2.5.1
-@item pthread_join: P96 16.2.3.1 -- unimplemented
-@item pthread_once: P96 16.2.8.1 -- unimplemented
-@item pthread_self: P96 16.2.6.1
-@end itemize
-
-@item Thread-Specific Data (Section 17)
-@itemize @code
-@item pthread_getspecific: P96 17.1.2.1
-@item pthread_key_create: P96 17.1.1.1
-@item pthread_key_delete: P96 17.1.3.1
-@item pthread_setspecific: P96 17.1.2.1
-@end itemize
-
-@item Thread Cancellation (Section 18)
-@itemize @code
-@item pthread_cancel: P96 18.2.1.1 -- unimplemented
-@item pthread_cleanup_pop: P96 18.2.3.1 -- unimplemented
-@item pthread_cleanup_push: P96 18.2.3.1 -- unimplemented
-@item pthread_setcancelstate: P96 18.2.2.1 -- unimplemented
-@item pthread_setcanceltype: P96 18.2.2.1 -- unimplemented
-@item pthread_testcancel: P96 18.2.2.1 -- unimplemented
-@end itemize
-
-@section Misc Functions
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-@item Networking (net.cc) (Standardized by POSIX 1.g, which is probably still in draft?)
-@itemize @code
-@item accept
-@item bind
-@item connect
-@item getdomainname
-@item gethostbyaddr
-@item gethostbyname
-@item getpeername
-@item getprotobyname
-@item getprotobynumber
-@item getservbyname
-@item getservbyport
-@item getsockname
-@item getsockopt
-@item herror
-@item htonl
-@item htons
-@item inet_addr
-@item inet_makeaddr
-@item inet_netof
-@item inet_ntoa
-@item listen
-@item ntohl
-@item ntohs
-@item rcmd
-@item recv
-@item recvfrom
-@item rexec
-@item rresvport
-@item send
-@item sendto
-@item setsockopt
-@item shutdown
-@item socket
-@item socketpair
-@end itemize
-
-Of these networking calls, rexec, rcmd and rresvport are implemented
-in MS IP stack but may not be implemented in other vendors' stacks.
-
-@item Other
-@itemize @code
-@item acl
-@item aclcheck
-@item aclfrommode
-@item aclfrompbits
-@item aclfromtext
-@item aclsort
-@item acltomode
-@item acltopbits
-@item acltotext
-@item chroot (with restrictions)
-@item closelog
-@item cwait
-@item cygwin_conv_to_full_posix_path
-@item cygwin_conv_to_full_win32_path
-@item cygwin_conv_to_posix_path
-@item cygwin_conv_to_win32_path
-@item cygwin_logon_user
-@item cygwin_posix_path_list_p
-@item cygwin_posix_to_win32_path_list
-@item cygwin_posix_to_win32_path_list_buf_size
-@item cygwin_set_impersonation_token
-@item cygwin_split_path
-@item cygwin_win32_to_posix_path_list
-@item cygwin_win32_to_posix_path_list_buf_size
-@item cygwin_winpid_to_pid
-@item dlclose
-@item dlerror
-@item dlfork
-@item dlopen
-@item dlsym
-@item endgrent
-@item endhostent
-@item facl
-@item fcloseall
-@item fcloseall_r
-@item ffs
-@item fstatfs
-@item ftime
-@item get_osfhandle
-@item getdtablesize
-@item getgrent
-@item gethostname
-@item getitimer
-@item getmntent
-@item getpagesize
-@item getpgid
-@item getpwent
-@item gettimeofday: BSD
-@item grantpt
-@item initgroups (stub)
-@item ioctl
-@item killpg
-@item login
-@item logout
-@item lstat
-@item mknod (stub, sets ENOSYS, returns -1)
-@item memccpy
-@item nice
-@item openlog
-@item pclose
-@item popen
-@item ptsname
-@item putenv
-@item random
-@item readv
-@item realpath
-@item regfree
-@item rexec
-@item select
-@item setegid: SVR4 (stub on 9X, sets ENOSYS, returns zero)@item endpwent
-@item setenv
-@item seterrno
-@item seteuid (stub on 9X, sets ENOSYS, returns zero)
-@item sethostent
-@item setitimer
-@item setmntent
-@item setmode
-@item setpassent
-@item setpgrp
-@item setpwent
-@item settimeofday: BSD (stub, set ENOSYS, return -1)
-@item sexecl
-@item sexecle
-@item sexeclp
-@item sexeclpe
-@item sexeclpe
-@item sexecp
-@item sexecv
-@item sexecve
-@item sexecvpe
-@item sigpause
-@item spawnl (spawn calls are from Windows C library)
-@item spawnle
-@item spawnlp
-@item spawnlpe
-@item spawnv
-@item spawnve
-@item spawnvp
-@item spawnvpe
-@item srandom
-@item statfs
-@item strsignal
-@item strtosigno
-@item swab
-@item syslog
-@item timezone
-@item truncate (SVR4/4.3+BSD)
-@item ttyslot
-@item unlockpt
-@item unsetenv
-@item usleep
-@item utimes
-@item vfork: stub that calls fork
-@item vhangup (stub, sets ENOSYS, returns -1)
-@item wait3
-@item wait4
-@item wcscmp
-@item wcslen
-@item wprintf
-@item writev
-@end itemize
-
-@end itemize
-
diff --git a/winsup/doc/changes.texinfo b/winsup/doc/changes.texinfo
deleted file mode 100644
index 6e464784d..000000000
--- a/winsup/doc/changes.texinfo
+++ /dev/null
@@ -1,202 +0,0 @@
-@section Release Beta 20.1 (Dec 4 1998)
-
-This is a bug fix update to the Beta 20 release.
-
-The main change is an improved version of the Cygwin library although
-there are also a couple of other minor changes to the tools.
-
-@subsection Changes in specific tools:
-
-The "-mno-cygwin" flag to gcc now include the correct headers.  In 20.0,
-it included the Cygwin headers which was incorrect.
-
-The "-pipe" flag to gcc works correctly now.
-
-The cygcheck program now reassures users that not finding cpp is the
-correct behavior.
-
-The "-b" flag to md5sum can now be used to generate correct checksums
-of binary files.
-
-The libtermcap library has been added to the compiler tools sources.
-It is the new source of the termcap library and /etc/termcap file.
-
-The less pager (using libtermcap) has been added to the binary
-distribution.
-
-@subsection Changes in the Cygwin API (cygwin.dll):
-
-This version of Cygwin is backwards-compatible with the beta 20 and 19
-releases.  The library is now much more stable under Windows 9x and the
-bugs affecting configures under 9x (and NT to a lesser extent) have
-also been fixed.
-
-The bug that made it necessary to start the value of the CYGWIN
-environment variable with two leading spaces has been fixed.
-
-The serial support in the select call has been fixed.
-
-Handling of DLLs loaded by non-cygwin apps has been improved.  Bugs in
-dlopen have been fixed.
-
-Passing _SC_CHILD_MAX to the sysconf function now yields CHILD_MAX (63)
-instead of _POSIX_CHILD_MAX (3).
-
-Several minor path bugs have been fixed.  Including the one that
-caused "mkdir a/" to fail.
-
-The include file sys/sysmacros.h has been added.  Added missing protos
-for wcslen and wcscmp to wchar.h.
-
-__P is now defined in include/sys/cdefs.h.  To support that last change,
-the top-level Makefile.in now sets CC_FOR_TARGET and CXX_FOR_TARGET
-differently.
-
-Cygwin now exports the following newlib bessel functions: j1, jn, y1,
-yn.
-
-Several tty ioctl options have been added: TCGETA, TCSETA, TCSETAW, and
-TCSETAF.
-
-Several functions cope with NULL pointer references more gracefully.
-
-Problems with execution of relative paths via #! should be fixed.
-
-@section Release Beta 20 (Oct 30 1998)
-
-This is a significant update to the Beta 19 release.  In addition to an
-EGCS-based compiler and updated tools, this release includes a new
-version of the Cygwin library that contains many improvements and
-bugfixes over the last one.
-
-@subsection The project has a new name!
-
-Starting with this release, we are retiring the "GNU-Win32" name for the
-releases.  We have also dropped the "32" from Cygwin32.  This means that
-you should now refer to the tools as "the Cygwin toolset", the library
-as "the Cygwin library" or "the Cygwin DLL", and the library's interface
-as "the Cygwin API".
-
-Because of this name change, we have changed any aspects of the library
-that involved the name "Cygwin32".  For example, the CYGWIN32
-environment variable is now the CYGWIN environment variable.  API
-functions starting with cygwin32_ are still available under that form
-for backwards-compatibility as well as under the new cygwin_-prefixed
-names.  The same goes for the change of preprocessor define from
-__CYGWIN32__ to __CYGWIN__.  We will remove the old names in a future
-release so please take the minute or two that it will take to remove
-those "32"s.  Thanks and I apologize for the hassle this may cause
-people.  We would have changed the name to "Bob" but that name's already
-taken by Microsoft...  :-)
-
-Why change it?  For one thing, not all of the software included in the
-distributions is GNU software, including the Cygwin library itself.  So
-calling the project "GNU-Win32" has always been a bit of a misnomer.  In
-addition, we think that calling the tools the "Cygwin tools" that use
-the "Cygwin library" will be less confusing to people.
-
-Also notice that we are now on the spiffy new sourceware.cygnus.com
-web/ftp site.  The old address will work for some unknown period of
-time (hopefully at least until we get all of the mirrors adjusted).
-
-@subsection Changes in specific tools:
-
-The latest public EGCS release is now the basis for the compiler used
-in Cygwin distributions.  As a result, EGCS 1.1 is the compiler in this
-release, with a few additional x86/Cygwin-related patches.
-
-Those of you who are more interested in native Windows development than
-in porting Unix programs will be glad to know that a new gcc flag
-"-mno-cygwin" will link in the latest Mingw32 libs and produce an
-executable that does not use Cygwin.
-
-All of the other development tools have been updated to their latest
-versions.  The linker (ld) includes many important bug fixes.  It is now
-possible to safely strip a DLL with a .reloc section.  The windres
-resource compiler is significantly improved.
-
-Beta 20 also includes upgrades to a number of packages: ash-0.3.2-4,
-bash 2.02.1, grep-2.2, ncurses 4.2, and less 332.  We have added bzip2
-0.9.0 to the distribution.  And you'll now find that the df utility
-has joined its other friends from the fileutils package.
-
-The sh executable is still ash from the Debian Linux distribution but no
-longer has the problematic quoting bug that was present in the Beta 19
-release.  Control-Cs in the bash shell no longer kill background tasks.
-
-Tcl/tk are upgraded to version 8.1a2 (with additional patches).
-Compatible versions of tix and itcl are included.  These all include
-Cygwin-compatible configury files so you can do a Unix-style build of
-the Win32 ports of tcl/tk.  expect has been upgraded to 5.26 with some
-additional Cygwin patches.
-
-In response to customer requests and feedback, Cygnus has developed a
-better graphical front end to GDB than GDBtk or WinGDB.  This tcl-based
-GUI is shipping today to customers of the GNUPro Toolkit.  The
-instrumentation changes to GDB and the tcl interpreter that was built
-into GDB are part of the GPL'd source base.  But the tcl scripts are not
-being made available to the net at this time.  For this reason, you will
-only find a command-line version of gdb in this Cygwin release.
-
-DJ Delorie has written a new "cygcheck" program that will print out
-useful information about how your Cygwin environment is set up, what
-DLLs a named executable is loading from where, etc.  We hope this will
-make it easier to help diagnose common setup problems.
-
-The ps utility has been upgraded.  It now has several options including
-shorter and longer output formats.
-
-@subsection Changes in the Cygwin API (cygwin.dll):
-
-This version of Cygwin is backwards-compatible with the beta 19 release.
-You can use the new "cygwin1.dll" with your old B19-compiled executables
-if you move the old "cygwinb19.dll" out of the way and install a copy
-of "cygwin1.dll" as "cygwinb19.dll".
-
-Quite a lot of the Cygwin internals have been rewritten or modified to
-address various issues.  If you have a question about specific changes,
-the winsup/ChangeLog file in the development tools sources lists all
-changes made to the DLL over the last three years.  Following are a few
-highlights:
-
-We are now using a new versioning scheme for Cygwin.  There is now a
-separate version number for the DLL, the API, the shared memory region
-interfaces, and the registry interface.  This will hopefully make it
-easier for multiple Cygwin toolsets to coexist in one user environment.
-
-Windows 98 is now supported (it is like Windows 95 from Cygwin's
-perspective).  We still recommend upgrading to Windows NT.
-
-While there is still a lot left to do in improving Cygwin's runtime
-performance, we have put some effort into this prior to the B20 release.
-Hopefully you will find that the latest version of Cygwin is faster than
-ever.  In addition, we have plugged several nasty handle leaks
-associated with opening/closing files and with using ttys.
-
-The lseek call now uses WriteFile to fill gaps with zeros whenever a
-write is done past an EOF, rather than leaving "undefined" data as Win32
-specifies.
-
-Significant work has been done to improve the Cygwin header files.
-
-The Cygwin Support for Unix-style serial I/O is much improved.
-
-Path handling has had another round of fixes/rewrites.  We no longer use
-NT Extended Attributes by default for storing Unix permissions/execute
-status because the file NT creates on FAT partitions is not scalable to
-thousands of files (everything slows to a crawl).
-
-Signal handling has also gotten a fair amount of attention.
-Unfortunately, there are still some problems combining itimers and
-Windows 9x.
-
-The number of ttys has been upped from 16 to 128.
-
-New API calls included in the DLL: sethostent, endhostent.
-
-As mentioned earlier, all cygwin32_-prefixed functions are now exported
-with a cygwin_ prefix instead.  Please adjust your code to call the
-newly named functions.
-
-reads of `slow' devices are now correctly interrupted by signals, i.e.
-a read will receive an EINTR.
diff --git a/winsup/doc/configure b/winsup/doc/configure
deleted file mode 100755
index eea87df57..000000000
--- a/winsup/doc/configure
+++ /dev/null
@@ -1,1067 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=cygwin-api.in.sgml
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:575: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:596: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:614: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:646: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CC"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:678: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CC="gcc"
-fi
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:714: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:768: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-  if test "$ac_test_CXXFLAGS" != set; then
-    CXXFLAGS='$(CFLAGS)'
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CC@%$CC%g
-s%@build_exeext@%$build_exeext%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/winsup/doc/configure.in b/winsup/doc/configure.in
deleted file mode 100644
index 503777724..000000000
--- a/winsup/doc/configure.in
+++ /dev/null
@@ -1,54 +0,0 @@
-dnl Autoconf configure script for winsup/regexp
-dnl Copyright 1997,1998,1999,2000,2001 Red Hat, Inc.
-dnl
-dnl This file is part of Cygwin.
-dnl 
-dnl This software is a copyrighted work licensed under the terms of the
-dnl Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-dnl details.
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.12)
-AC_INIT(cygwin-api.in.sgml)
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-  if test "$ac_test_CXXFLAGS" != set; then
-    CXXFLAGS='$(CFLAGS)'
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-AC_CANONICAL_SYSTEM
-
-LIB_AC_PROG_CC
-
-AC_SUBST(build_exeext)
-
-AC_OUTPUT(Makefile)
diff --git a/winsup/doc/copy.texinfo b/winsup/doc/copy.texinfo
deleted file mode 100644
index 5dcdac9c8..000000000
--- a/winsup/doc/copy.texinfo
+++ /dev/null
@@ -1,384 +0,0 @@
-@chapter What are the copyrights ?
-
-@section The general idea
-
-Most of the tools are covered by the GNU General Public License (GPL),
-although some are public domain, and others have a X11-style
-copyright.  To cover the GNU GPL requirements, the basic rule is if
-you give out any binaries, you must also make the source available.
-For the full details, be sure to read the text of the GNU GPL which
-follows.
-
-The Cygwin API library found in the winsup subdirectory of the source
-code is also covered by the GNU GPL.  By default, all executables link
-against this library (and in the process include GPL'd Cygwin glue
-code).  This means that unless you modify the tools so that compiled
-executables do not make use of the Cygwin library, your compiled
-programs will also have to be free software distributed under the GPL
-with source code available to all.
-
-Cygwin is currently available for proprietary use only through a
-proprietary-use license.  Please see
-@file{http://www.redhat.com/software/cygwin/} for more information
-about the Red Hat Cygwin Product.
-
-In accordance with section 10 of the GPL, Red Hat, Inc. permits
-programs whose sources are distributed under a license that complies
-with the Open Source definition to be linked with libcygwin.a without
-libcygwin.a itself causing the resulting program to be covered by the
-GNU GPL.
-
-This means that you can port an Open Source(tm) application to cygwin,
-and distribute that executable as if it didn't include a copy of
-libcygwin.a linked into it.  Note that this does not apply to the
-cygwin DLL itself.  If you distribute a (possibly modified) version of
-the DLL you must adhere to the terms of the GPL, i.e., you must
-provide sources for the cygwin DLL.
-
-See @file{http://www.opensource.org/docs/definition_plain.html} for
-the precise Open Source Definition referenced above.
-
-@section 	   GNU GENERAL PUBLIC LICENSE
-@example
-		   GNU GENERAL PUBLIC LICENSE
-		      Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
-
-@end example
-
diff --git a/winsup/doc/cygwin-api.in.sgml b/winsup/doc/cygwin-api.in.sgml
deleted file mode 100644
index 06baf5247..000000000
--- a/winsup/doc/cygwin-api.in.sgml
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-  <!ENTITY cygnus-copyright "<YEAR>1998</YEAR><HOLDER>Red Hat, Inc.</HOLDER>">
-  <!ENTITY cygnus-code-copyright "
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Copyright (C) 1998,2001 Red Hat, Inc.
-
-This is copyrighted software that may only
-be reproduced, modified, or distributed
-under license from Red Hat, Inc.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-">
- ]>
-
-<book id="cygwin-api">
-
-  <bookinfo>
-    <date>1998-08-31</date>
-    <title>Cygwin API Reference</title>
-    <authorgroup>
-      <author>
-        <firstname>DJ</firstname>
-        <surname>Delorie</surname>
-      </author>
-      <author>
-        <firstname>Geoffrey</firstname>
-        <surname>Noer</surname>
-      </author>
-    </authorgroup>
-
-    DOCTOOL-INSERT-legal
-
-    <revhistory>
-      <revision>
-	<revnumber>0.0</revnumber>
-	<date>1998-08-31</date>
-	<authorinitials>dj</authorinitials>
-	<revremark>Initial revision</revremark>
-      </revision>
-      <revision>
-	<revnumber>0.5.0</revnumber>
-	<date>1998-12-17</date>
-	<authorinitials>noer</authorinitials>
-	<revremark>Add pthread, sem calls.  Change revnumber to
-	three-part number: Cygwin API major, Cygwin API minor, Doc rev
-	number.  Starts out at 0.5.0.</revremark>
-      </revision>
-    </revhistory>
-  </bookinfo>
-
-  <toc></toc>
-
-<chapter id="compatibility"><title>Compatibility</title>
-DOCTOOL-INSERT-std-ansi
-DOCTOOL-INSERT-std-posix
-DOCTOOL-INSERT-std-misc
-</chapter>
-
-<chapter id="cygwin-functions"><title>Cygwin Functions</title>
-
-<para>These functions are specific to Cygwin itself, and probably
-won't be found anywhere else.  </para>
-
-DOCTOOL-INSERT-func-
-
-</chapter>
-
-</book>
diff --git a/winsup/doc/cygwin-ug-net.in.sgml b/winsup/doc/cygwin-ug-net.in.sgml
deleted file mode 100644
index aceb33460..000000000
--- a/winsup/doc/cygwin-ug-net.in.sgml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-  <!ENTITY cygnus-copyright
-  "<YEAR>1999,2000,2001</YEAR>
-  <HOLDER>Red Hat, Inc.</HOLDER>">
-  <!ENTITY cygnus-code-copyright "
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Copyright (C) 1998,1999,2000,2001,2002,2003 Red Hat, Inc.
-
-This is copyrighted software that may only
-be reproduced, modified, or distributed
-under license from Red Hat, Inc.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-">
- ]>
-
-<book id="cygwin-ug-net">
-
-  <bookinfo>
-    <date>2003-04-08</date>
-    <title>Cygwin User's Guide</title>
-
-DOCTOOL-INSERT-legal
-
-  </bookinfo>
-
-  <toc></toc>
-
-DOCTOOL-INSERT-overview
-
-DOCTOOL-INSERT-setup-net
-
-DOCTOOL-INSERT-using
-
-DOCTOOL-INSERT-programming
-
-</book>
diff --git a/winsup/doc/cygwin-ug.in.sgml b/winsup/doc/cygwin-ug.in.sgml
deleted file mode 100644
index 91054f324..000000000
--- a/winsup/doc/cygwin-ug.in.sgml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [
-  <!ENTITY cygnus-copyright "<YEAR>1999,2000,2001</YEAR>
-  <HOLDER>Red Hat, Inc.</HOLDER>">
-  <!ENTITY cygnus-code-copyright "
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Copyright (C) 1998, 1999, 2000, 2001 Red Hat, Inc.
-
-This is copyrighted software that may only
-be reproduced, modified, or distributed
-under license from Red Hat, Inc.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-">
- ]>
-
-<book id="cygwin-ug">
-
-  <bookinfo>
-    <date>2001-22-03</date>
-    <title>Cygwin User's Guide</title>
-    <authorgroup>
-      <author>
-        <firstname>Corinna</firstname>
-        <surname>Vinschen</surname>
-      </author>
-      <author>
-        <firstname>Christopher</firstname>
-        <surname>Faylor</surname>
-      </author>
-      <author>
-        <firstname>DJ</firstname>
-        <surname>Delorie</surname>
-      </author>
-      <author>
-        <firstname>Pierre</firstname>
-	<surname>Humblet</surname>
-      </author>
-      <author>
-        <firstname>Geoffrey</firstname>
-        <surname>Noer</surname>
-      </author>
-    </authorgroup>
-
-DOCTOOL-INSERT-legal
-
-    <revhistory>
-      <revision>
-	<revnumber>0.0</revnumber>
-	<date>1998-08-31</date>
-	<authorinitials>dj</authorinitials>
-	<revremark>Initial revision</revremark>
-      </revision>
-      <revision>
-        <revnumber>20.1.0</revnumber>
-        <date>1999-02-08</date>
-        <authorinitials>Pierre.Humblet@eurecom.fr</authorinitials>
-        <revremark>Expand, describe Cygwin 20.1</revremark>
-      </revision>
-    </revhistory>
-  </bookinfo>
-
-  <toc></toc>
-
-DOCTOOL-INSERT-overview
-
-DOCTOOL-INSERT-setup
-
-DOCTOOL-INSERT-using
-
-DOCTOOL-INSERT-programming
-
-</book>
diff --git a/winsup/doc/cygwinenv.sgml b/winsup/doc/cygwinenv.sgml
deleted file mode 100644
index c78299e5e..000000000
--- a/winsup/doc/cygwinenv.sgml
+++ /dev/null
@@ -1,153 +0,0 @@
-<sect1 id="using-cygwinenv"><title>The <EnVar>CYGWIN</EnVar> environment
-variable</title>
-
-<para>The <EnVar>CYGWIN</EnVar> environment variable is used to configure
-many global settings for the Cygwin runtime system. It contains the options
-listed below, separated by blank characters. Many options can be turned off
-by prefixing with <literal>no </literal>.</para>
-
-<itemizedlist Mark="bullet">
-<listitem>
-<para><FirstTerm>(no)binmode</FirstTerm> - if set, non-disk 
-(e.g. pipe and COM ports) file opens default to binary mode 
-(no CRLF translation) instead of text mode.  Defaults to set (binary
-mode).  By default, devices are opened in binary mode, so this option
-has little effect on normal cygwin operations.
-
-It does affect two things, however.  For non-NTFS filesystems, this
-option will control the line endings for standard output/input/error
-for redirection from the Windows command shell.  It will also affect
-the default translation mode of a pipe, although most shells set the
-pipe to binary by default.
-</para>
-<warning><title>Warning!</title><para>If set in 12/98 b20.1, all files 
-always open in binary mode.</para></warning>
-</listitem>
-<listitem>
-<para><FirstTerm>check_case:level</FirstTerm> - Controls the behaviour of
-Cygwin when a user tries to open or create a file using a case different from
-the case of the path as asved on the disk.
-<literal>level</literal> is one of <literal>relaxed</literal>,
-<literal>adjust</literal> and <literal>strict</literal>.</para>
-<itemizedlist Mark="bullet">
-<listitem>
-<para><FirstTerm>relaxed</FirstTerm> which is the default behaviour simply
-ignores case. That's the default for native Windows applications as well.</para>
-</listitem>
-<listitem>
-<para><FirstTerm>adjust</FirstTerm> behaves mostly invisible. The POSIX input
-path is internally adjusted in case, so that the resulting DOS path uses the
-correct case throughout. You can see the result when changing the directory
-using a wrong case and calling <command>/bin/pwd</command> afterwards.</para>
-</listitem>
-<listitem>
-<para><FirstTerm>strict</FirstTerm> results in a error message if the case
-isn't correct. Trying to open a file <filename>Foo</filename> while a file
-<filename>fOo</filename> exists results in a "no such file or directory"
-error. Trying to create a file <filename>BAR</filename> while a file
-<filename>Bar</filename> exists results in a "Filename exists with different
-case" error.</para>
-</listitem>
-</itemizedlist>
-</listitem>
-
-<listitem>
-<para><FirstTerm>codepage:[ansi|oem]</FirstTerm> - Windows console 
-applications can use different character sets (codepages) for drawing
-characters.  The first setting, called "ansi", is the default.
-This character set contains various forms of latin characters used
-in European languages.  The name originates from the ANSI Latin1
-(ISO 8859-1) standard, used in Windows 1.0, though the character
-sets have since diverged from any standard.  The second setting
-selects an older, DOS-based character set, containing various line
-drawing and special characters.  It is called "oem" since it was
-originally encoded in the firmware of IBM PCs by original
-equipment manufacturers (OEMs).  If you find that some characters 
-(especially non-US or 'graphical' ones) do not display correctly in 
-Cygwin, you can use this option to select an appropriate codepage.
-</listitem>
-
-<listitem>
-<para><FirstTerm>(no)envcache</FirstTerm> - If set, environment variable
-conversions (between Win32 and POSIX) are cached.  Note that this is may
-cause problems if the mount table changes, as the cache is not invalidated
-and may contain values that depend on the previous mount table
-contents. Defaults to set.</para>
-</listitem>
-<listitem>
-<para><FirstTerm>(no)export</FirstTerm> - if set, the final values of these
-settings are re-exported to the environment as $CYGWIN again.</para>
-</listitem>
-<listitem>
-<para><FirstTerm>error_start:filepath</FirstTerm> - if set, runs <filename>filepath</filename>
-when cygwin encounters a fatal error.  This is useful for debugging.
-<filename>filepath</filename> is usually set to the path to the <filename>gdb</filename>
-program.</para>
-<para><FirstTerm>(no)glob[:ignorecase]</FirstTerm> - if set, command line arguments
-containing UNIX-style file wildcard characters (brackets, question mark,
-asterisk, escaped with \) are expanded into lists of files that match 
-those wildcards.
-This is applicable only to programs running from a DOS command line prompt.
-Default is set.</para>
-<para>This option also accepts an optional <literal>[no]ignorecase</literal> modifer.
-If supplied, wildcard matching is case insensitive.  The default is <literal>noignorecase</literal></para>
-</listitem>
-<listitem>
-<para><FirstTerm>(no)ntea</FirstTerm> - if set, use the full NT Extended
-Attributes to store UNIX-like inode information.
-This option only operates under Windows NT. Defaults to not set. </para>
-<Warning><Title>Warning!</Title> <para>This may create additional
-<emphasis>large</emphasis> files on non-NTFS partitions.</para></Warning>
-</listitem>
-<listitem>
-<para><FirstTerm>(no)ntsec</FirstTerm> - if set, use the NT security
-model to set UNIX-like permissions on files and processes. The
-file permissions can only be set on NTFS partitions. FAT doesn't
-support the NT file security. For more information, read the documentation
-in <citation>ntsec.sgml</citation>.</para>
-</listitem>
-<listitem>
-<para><FirstTerm>(no)smbntsec</FirstTerm> - if set, use `ntsec' on remote
-drives as well (this is the default). If you encounter problems with NT shares
-or Samba drives, setting this to `nosmbntsec' could help. In that case the
-permission and owner/group information is faked as on FAT partitions.
-A reason for a non working ntsec on remote drives could be insufficient
-permissions of the users. Since the needed user rights are somewhat dangerous
-(SeRestorePrivilege) it's not always an option to grant that rights to users.
-However, this shouldn't be a problem in NT domain environments.</para>
-</listitem>
-<listitem>
-<para><FirstTerm>(no)reset_com</FirstTerm> - if set, serial ports are reset
-to 9600-8-N-1 with no flow control when used. This is done at open
-time and when handles are inherited.  Defaults to set.</para>
-</listitem>
-<listitem>
-<para><FirstTerm>(no)strip_title</FirstTerm> - if set, strips the directory
-part off the window title, if any.  Default is not set.</para>
-</listitem>
-<listitem>
-<para><FirstTerm>(no)title</FirstTerm> - if set, the title bar
-reflects the name of the program currently running.  Default is not
-set.  Note that under Win9x the title bar is always enabled and it is
-stripped by default, but this is because of the way Win9x works.  In
-order not to strip, specify <literal>title</literal> or <literal>title
-nostrip_title</literal>.</para>
-</listitem>
-<listitem>
-<para><FirstTerm>(no)tty</FirstTerm> - if set, Cygwin enables extra support
-(i.e., termios) for UNIX-like ttys. 
-It is not compatible with some Windows programs.
-Defaults to not set, in which case the tty is opened in text mode 
-with ^Z as EOF. Note that this has been changed such that ^D works as
-expected instead of ^Z, and is settable via stty.
-This option must be specified before starting a Cygwin shell 
-and it cannot be changed in the shell.</para>
-</listitem>
-<listitem>
-<para><FirstTerm>(no)winsymlinks</FirstTerm> - if set, Cygwin creates
-symlinks as Windows shortcuts with a special header and the R/O attribute
-set. If not set, Cygwin creates symlinks as plain files with a magic number,
-a path and the system attribute set. Defaults to set.</para>
-</listitem>
-</itemizedlist>
-</sect1>
diff --git a/winsup/doc/dll.sgml b/winsup/doc/dll.sgml
deleted file mode 100644
index 7bb10829c..000000000
--- a/winsup/doc/dll.sgml
+++ /dev/null
@@ -1,132 +0,0 @@
-<sect1 id="dll"><title>Building and Using DLLs</title>
-
-<para>DLLs are Dynamic Link Libraries, which means that they're linked
-into your program at run time instead of build time.  There are three
-parts to a DLL:</para>
-
-<itemizedlist spacing="compact">
-<listitem><para> the exports </para></listitem>
-<listitem><para> the code and data </para></listitem>
-<listitem><para> the import library </para></listitem>
-</itemizedlist>
-
-<para>The code and data are the parts you write - functions,
-variables, etc.  All these are merged together, like if you were
-building one big object files, and put into the dll.  They are not
-put into your .exe at all.</para>
-
-<para>The exports contains a list of functions and variables that the
-dll makes available to other programs.  Think of this as the list of
-"global" symbols, the rest being hidden.  Normally, you'd create this
-list by hand with a text editor, but it's possible to do it
-automatically from the list of functions in your code.  The
-<filename>dlltool</filename> program creates the exports section of
-the dll from your text file of exported symbols.</para>
-
-<para>The import library is a regular UNIX-like
-<filename>.a</filename> library, but it only contains the tiny bit of
-information needed to tell the OS how your program interacts with
-("imports") the dll.  This information is linked into your
-<filename>.exe</filename>.  This is also generated by
-<filename>dlltool</filename>.</para>
-
-<sect2 id="dll-build"><title>Building DLLs</title>
-
-<para>This page gives only a few simple examples of gcc's DLL-building 
-capabilities. To begin an exploration of the many additional options,
-see the gcc documentation and website, currently at 
-<ulink URL="http://gcc.gnu.org/">http://gcc.gnu.org/</ulink>
-
-<para>Let's go through a simple example of how to build a dll.
-For this example, we'll use a single file
-<filename>myprog.c</filename> for the program
-(<filename>myprog.exe</filename>) and a single file
-<filename>mydll.c</filename> for the contents of the dll
-(<filename>mydll.dll</filename>).</para>
-
-<para>Fortunately, with the latest gcc and binutils the process for building a dll
-is now pretty simple. Say you want to build this minimal function in mydll.c:</para>
-
-<screen>
-#include &lt;stdio.h&gt;
-
-int
-hello()
-{
-  printf ("Hello World!\n");
-}  
-</screen>
-
-<para>First compile mydll.c to object code:</para>
-
-<screen>gcc -c mydll.c</screen>
-
-<para>Then, tell gcc that it is building a shared library:</para>
-
-<screen>gcc -shared -o mydll.dll mydll.o</screen>
-
-<para>
-That's it! To finish up the example, you can now link to the
-dll with a simple program:
-</para>
-
-<screen>
-int 
-main ()
-{
-  hello ();
-}  
-</screen>
-
-<para>
-Then link to your dll with a command like:
-</para>
-
-<screen>gcc -o myprog myprog.ca -L./ -lmydll</screen>
-
-<para>However, if you are building a dll as an export library,
-you will probably want to use the complete syntax:</para>
-
-<screen>gcc -shared -o cyg${module}.dll \
-    -Wl,--out-implib=lib${module}.dll.a \
-    -Wl,--export-all-symbols \
-    -Wl,--enable-auto-import \
-    -Wl,--whole-archive ${old_lib} \
-    -Wl,--no-whole-archive ${dependency_libs}</screen>
-
-<para>Where ${module} is the name of your DLL, ${old_lib} are all
-your object files, bundled together in static libs or single object
-files and the ${dependency_libs} are import libs you need to
-link against, e.g '-lpng -lz -L/usr/local/special -lmyspeciallib'.</para>
-</sect2>
-
-<sect2 id="dll-link"><title>Linking Against DLLs</title>
-
-<para>If you have an existing DLL already, you need to build a
-Cygwin-compatible import library.  If you have the source to compile
-the DLL, see <Xref Linkend="dll-build"> for details on having 
-<filename>gcc</filename> build one for you.  If you do not have the
-source or a supplied working import library, you can get most of
-the way by creating a .def file with these commands (you might need to
-do this in <filename>bash</filename> for the quoting to work
-correctly):</para>
-
-<screen>
-echo EXPORTS > foo.def
-nm foo.dll | grep ' T _' | sed 's/.* T _//' >> foo.def
-</screen>
-
-<para>Note that this will only work if the DLL is not stripped.
-Otherwise you will get an error message: "No symbols in
-foo.dll".</para>
-
-<para>Once you have the <filename>.def</filename> file, you can create
-an import library from it like this:</para>
-
-<screen>
-dlltool --def foo.def --dllname foo.dll --output-lib foo.a
-</screen>
-
-</sect2>
-
-</sect1>
diff --git a/winsup/doc/doctool.c b/winsup/doc/doctool.c
deleted file mode 100644
index ae034f345..000000000
--- a/winsup/doc/doctool.c
+++ /dev/null
@@ -1,622 +0,0 @@
-/* doctool.c
-
-   Copyright 1998,1999,2000,2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <utime.h>
-
-/* Building native in a cross-built directory is tricky.  Be careful,
-and beware that you don't have the full portability stuff available to
-you (like libiberty) */
-
-/*****************************************************************************/
-
-/* The list of extensions that may contain SGML snippets.  We check
-   both cases in case the file system isn't case sensitive enough. */
-
-struct {
-  char *upper;
-  char *lower;
-  int is_sgml;
-} extensions[] = {
-  { ".C",	".c",		0 },
-  { ".CC",	".cc",		0 },
-  { ".H",	".h",		0 },
-  { ".SGML",	".sgml",	1 },
-  { 0, 0, 0 }
-};
-
-/*****************************************************************************/
-
-void
-show_help()
-{
-  printf("Usage: doctool [-m] [-i] [-d dir] [-o outfile] [-s prefix] \\\n");
-  printf("                [-b book_id] infile\n");
-  printf("  -m   means to adjust Makefile to include new dependencies\n");
-  printf("  -i   means to include internal snippets\n");
-  printf("  -d   means to recursively scan directory for snippets\n");
-  printf("  -o   means to output to file (else stdout)\n");
-  printf("  -s   means to suppress source dir prefix\n");
-  printf("  -b   means to change the <book id=\"book_id\">\n");
-  printf("\n");
-  printf("doctool looks for DOCTOOL-START and DOCTOOL-END lines in source,\n");
-  printf("saves <foo id=\"bar\"> blocks, and looks for DOCTOOL-INSERT-bar\n");
-  printf("commands to insert selected sections.  IDs starting with int-\n");
-  printf("are internal only, add- are added at the end of relevant sections\n");
-  printf("or add-int- for both.  Inserted sections are chosen by prefix,\n");
-  printf("and sorted when inserted.\n");
-  exit(1);
-}
-
-/*****************************************************************************/
-
-typedef struct Section {
-  struct Section *next;
-  struct OneFile *file;
-  char *name;
-  char internal;
-  char addend;
-  char used;
-  char **lines;
-  int num_lines;
-  int max_lines;
-} Section;
-
-typedef struct OneFile {
-  struct OneFile *next;
-  char *filename;
-  int enable_scan;
-  int used;
-  Section *sections;
-} OneFile;
-
-OneFile *file_list = 0;
-
-char *output_name = 0;
-FILE *output_file = 0;
-
-char *source_dir_prefix = "";
-char *book_id = 0;
-
-int internal_flag = 0;
-
-/*****************************************************************************/
-
-char *
-has_string(char *line, char *string)
-{
-  int i;
-  while (*line)
-  {
-    for (i=0; line[i]; i++)
-    {
-      if (!string[i])
-	return line;
-      if (line[i] != string[i])
-	break;
-    }
-    line++;
-  }
-  return 0;
-}
-
-int
-starts_with(char *line, char *string)
-{
-  int i=0;
-  while (1)
-  {
-    if (!string[i])
-      return 1;
-    if (!line[i] || line[i] != string[i])
-      return 0;
-    i++;
-  }
-}
-
-/*****************************************************************************/
-
-#ifdef S_ISLNK
-#define STAT lstat
-#else
-#define STAT stat
-#endif
-
-void
-scan_directory(dirname)
-  char *dirname;
-{
-  struct stat st;
-  char *name;
-  struct dirent *de;
-  DIR *dir = opendir(dirname);
-  if (!dir)
-    return;
-  while (de = readdir(dir))
-  {
-    if (strcmp(de->d_name, ".") == 0
-	|| strcmp(de->d_name, "..") == 0)
-      continue;
-
-    name = (char *)malloc(strlen(dirname)+strlen(de->d_name)+3);
-    strcpy(name, dirname);
-    strcat(name, "/");
-    strcat(name, de->d_name);
-
-    STAT(name, &st);
-
-    if (S_ISDIR(st.st_mode))
-    {
-      scan_directory(name);
-    }
-
-    else if (S_ISREG(st.st_mode))
-    {
-      char *dot = strrchr(de->d_name, '.');
-      int i;
-
-      if (dot)
-      {
-	for (i=0; extensions[i].upper; i++)
-	  if (strcmp(dot, extensions[i].upper) == 0
-	      || strcmp(dot, extensions[i].lower) == 0)
-	  {
-	    OneFile *one = (OneFile *)malloc(sizeof(OneFile));
-	    one->next = file_list;
-	    file_list = one;
-	    one->filename = name;
-	    one->enable_scan = ! extensions[i].is_sgml;
-	    one->used = 0;
-	    one->sections = 0;
-	  }
-      }
-    }
-  }
-  closedir (dir);
-}
-
-/*****************************************************************************/
-
-void
-scan_file(OneFile *one)
-{
-  FILE *f = fopen(one->filename, "r");
-  int enabled = ! one->enable_scan;
-  char line[1000], *tag=0, *id=0, *tmp;
-  int taglen = 0;
-  Section *section = 0;
-  Section **prev_section_ptr = &(one->sections);
-
-  if (!f)
-  {
-    perror(one->filename);
-    return;
-  }
-
-  while (fgets(line, 1000, f))
-  {
-    if (one->enable_scan)
-    {
-      /* source files have comment-embedded docs, check for them */
-      if (has_string(line, "DOCTOOL-START"))
-	enabled = 1;
-      if (has_string(line, "DOCTOOL-END"))
-	enabled = 0;
-    }
-    if (!enabled)
-      continue;
-
-    /* DOCTOOL-START
-
-<sect1 id="dt-tags">
-this is the doctool tags section.
-</sect1>
-
-       DOCTOOL-END */
-
-    if (!tag && line[0] == '<')
-    {
-      tag = (char *)malloc(strlen(line)+1);
-      id = (char *)malloc(strlen(line)+1);
-      if (sscanf(line, "<%s id=\"%[^\"]\">", tag, id) == 2)
-      {
-	if (strcmp(tag, "book") == 0 || strcmp(tag, "BOOK") == 0)
-	{
-	  /* Don't want to "scan" these */
-	  return;
-	}
-	taglen = strlen(tag);
-	section = (Section *)malloc(sizeof(Section));
-	/* We want chunks within single files to appear in that order */
-	section->next = 0;
-	section->file = one;
-	*prev_section_ptr = section;
-	prev_section_ptr = &(section->next);
-	section->internal = 0;
-	section->addend = 0;
-	section->used = 0;
-	section->name = id;
-	if (starts_with(section->name, "add-"))
-	{
-	  section->addend = 1;
-	  section->name += 4;
-	}
-	if (starts_with(section->name, "int-"))
-	{
-	  section->internal = 1;
-	  section->name += 4;
-	}
-	section->lines = (char **)malloc(10*sizeof(char *));
-	section->num_lines = 0;
-	section->max_lines = 10;
-      }
-      else
-      {
-	free(tag);
-	free(id);
-	tag = id = 0;
-      }
-    }
-
-    if (tag && section)
-    {
-      if (section->num_lines >= section->max_lines)
-      {
-	section->max_lines += 10;
-	section->lines = (char **)realloc(section->lines,
-					  section->max_lines * sizeof (char *));
-      }
-      section->lines[section->num_lines] = (char *)malloc(strlen(line)+1);
-      strcpy(section->lines[section->num_lines], line);
-      section->num_lines++;
-
-      if (line[0] == '<' && line[1] == '/'
-	  && memcmp(line+2, tag, taglen) == 0
-	  && (isspace(line[2+taglen]) || line[2+taglen] == '>'))
-      {
-	/* last line! */
-	tag = 0;
-      }
-    }
-  }
-  fclose(f);
-}
-
-/*****************************************************************************/
-
-Section **
-enumerate_matching_sections(char *name_prefix, int internal, int addend, int *count_ret)
-{
-  Section **rv = (Section **)malloc(12*sizeof(Section *));
-  int count = 0, max=10, prefix_len = strlen(name_prefix);
-  OneFile *one;
-  int wildcard = 0;
-
-  if (name_prefix[strlen(name_prefix)-1] == '-')
-    wildcard = 1;
-
-  for (one=file_list; one; one=one->next)
-  {
-    Section *s;
-    for (s=one->sections; s; s=s->next)
-    {
-      int matches = 0;
-      if (wildcard)
-      {
-	if (starts_with(s->name, name_prefix))
-	  matches = 1;
-      }
-      else
-      {
-	if (strcmp(s->name, name_prefix) == 0)
-	  matches = 1;
-      }
-      if (s->internal <= internal
-	  && s->addend == addend
-	  && matches
-	  && ! s->used)
-      {
-	s->used = 1;
-	if (count >= max)
-	{
-	  max += 10;
-	  rv = (Section **)realloc(rv, max*sizeof(Section *));
-	}
-	rv[count++] = s;
-	rv[count] = 0;
-      }
-    }
-  }
-  if (count_ret)
-    *count_ret = count;
-  return rv;
-}
-
-/*****************************************************************************/
-
-#define ID_CHARS "~@$%&()_-+[]{}:."
-
-void include_section(char *name, int addend);
-
-char *
-unprefix(char *fn)
-{
-  int l = strlen(source_dir_prefix);
-  if (memcmp(fn, source_dir_prefix, l) == 0)
-  {
-    fn += l;
-    while (*fn == '/' || *fn == '\\')
-      fn++;
-    return fn;
-  }
-  return fn;
-}
-
-void
-parse_line(char *line, char *filename)
-{
-  char *cmd = has_string(line, "DOCTOOL-INSERT-");
-  char *sname, *send, *id, *save;
-  if (!cmd)
-  {
-    if (book_id
-	&& (starts_with(line, "<book") || starts_with(line, "<BOOK")))
-    {
-      cmd = strchr(line, '>');
-      if (cmd)
-      {
-	cmd++;
-	fprintf(output_file, "<book id=\"%s\">", book_id);
-	fputs(cmd, output_file);
-	return;
-      }
-    }
-    fputs(line, output_file);
-    return;
-  }
-  if (cmd != line)
-    fwrite(line, cmd-line, 1, output_file);
-  save = (char *)malloc(strlen(line)+1);
-  strcpy(save, line);
-  line = save;
-
-  sname = cmd + 15; /* strlen("DOCTOOL-INSERT-") */
-  for (send = sname;
-       *send && isalnum(*send) || strchr(ID_CHARS, *send);
-       send++);
-  id = (char *)malloc(send-sname+2);
-  memcpy(id, sname, send-sname);
-  id[send-sname] = 0;
-  include_section(id, 0);
-
-  fprintf(output_file, "<!-- %s -->\n", unprefix(filename));
-
-  fputs(send, output_file);
-  free(save);
-}
-
-int
-section_sort(const void *va, const void *vb)
-{
-  Section *a = *(Section **)va;
-  Section *b = *(Section **)vb;
-  int rv = strcmp(a->name, b->name);
-  if (rv)
-    return rv;
-  return a->internal - b->internal;
-}
-
-void
-include_section(char *name, int addend)
-{
-  Section **sections, *s;
-  int count, i, l;
-
-  sections = enumerate_matching_sections(name, internal_flag, addend, &count);
-
-  qsort(sections, count, sizeof(sections[0]), section_sort);
-  for (i=0; i<count; i++)
-  {
-    s = sections[i];
-    s->file->used = 1;
-    fprintf(output_file, "<!-- %s -->\n", unprefix(s->file->filename));
-    for (l=addend; l<s->num_lines-1; l++)
-      parse_line(s->lines[l], s->file->filename);
-    if (!addend)
-    {
-      include_section(s->name, 1);
-      parse_line(s->lines[l], s->file->filename);
-    }
-  }
-
-  free(sections);
-}
-
-void
-parse_sgml(FILE *in, char *input_name)
-{
-  static char line[1000];
-  while (fgets(line, 1000, in))
-  {
-    parse_line(line, input_name);
-  }
-}
-
-/*****************************************************************************/
-
-void
-fix_makefile(char *output_name)
-{
-  FILE *in, *out;
-  char line[1000];
-  int oname_len = strlen(output_name);
-  OneFile *one;
-  int used_something = 0;
-  struct stat st;
-  struct utimbuf times;
-
-  stat("Makefile", &st);
-
-  in = fopen("Makefile", "r");
-  if (!in)
-  {
-    perror("Makefile");
-    return;
-  }
-
-  out = fopen("Makefile.new", "w");
-  if (!out)
-  {
-    perror("Makefile.new");
-    return;
-  }
-
-  while (fgets(line, 1000, in))
-  {
-    if (starts_with(line, output_name)
-	&& strcmp(line+oname_len, ": \\\n") == 0)
-    {
-      /* this is the old dependency */
-      while (fgets(line, 1000, in))
-      {
-	if (strcmp(line+strlen(line)-2, "\\\n"))
-	  break;
-      }
-    }
-    else
-      fputs(line, out);
-  }
-  fclose(in);
-
-  for (one=file_list; one; one=one->next)
-    if (one->used)
-    {
-      used_something = 1;
-      break;
-    }
-
-  if (used_something)
-  {
-    fprintf(out, "%s:", output_name);
-    for (one=file_list; one; one=one->next)
-      if (one->used)
-	fprintf(out, " \\\n\t%s", one->filename);
-    fprintf(out, "\n");
-  }
-
-  fclose(out);
-
-  times.actime = st.st_atime;
-  times.modtime = st.st_mtime;
-  utime("Makefile.new", &times);
-
-  if (rename("Makefile", "Makefile.old"))
-    return;
-  if (rename("Makefile.new", "Makefile"))
-    rename("Makefile.old", "Makefile");
-}
-
-/*****************************************************************************/
-
-int
-main(argc, argv)
-  int argc;
-  char **argv;
-{
-  int i;
-  OneFile *one;
-  FILE *input_file;
-  int fix_makefile_flag = 0;
-
-  while (argc > 1 && argv[1][0] == '-')
-  {
-    if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0)
-    {
-      show_help();
-    }
-    else if (strcmp(argv[1], "-i") == 0)
-    {
-      internal_flag = 1;
-    }
-    else if (strcmp(argv[1], "-m") == 0)
-    {
-      fix_makefile_flag = 1;
-    }
-    else if (strcmp(argv[1], "-d") == 0 && argc > 2)
-    {
-      scan_directory(argv[2]);
-      argc--;
-      argv++;
-    }
-    else if (strcmp(argv[1], "-o") == 0 && argc > 2)
-    {
-      output_name = argv[2];
-      argc--;
-      argv++;
-    }
-    else if (strcmp(argv[1], "-s") == 0 && argc > 2)
-    {
-      source_dir_prefix = argv[2];
-      argc--;
-      argv++;
-    }
-    else if (strcmp(argv[1], "-b") == 0 && argc > 2)
-    {
-      book_id = argv[2];
-      argc--;
-      argv++;
-    }
-
-    argc--;
-    argv++;
-  }
-
-  for (one=file_list; one; one=one->next)
-  {
-    scan_file(one);
-  }
-
-  input_file = fopen(argv[1], "r");
-  if (!input_file)
-  {
-    perror(argv[1]);
-    return 1;
-  }
-
-  if (output_name)
-  {
-    output_file = fopen(output_name, "w");
-    if (!output_file)
-    {
-      perror(output_name);
-      return 1;
-    }
-  }
-  else
-  {
-    output_file = stdout;
-    output_name = "<stdout>";
-  }
-
-  parse_sgml(input_file, argv[1]);
-
-  if (output_file != stdout)
-    fclose(output_file);
-
-  if (fix_makefile_flag)
-    fix_makefile(output_name);
-
-  return 0;
-}
diff --git a/winsup/doc/doctool.txt b/winsup/doc/doctool.txt
deleted file mode 100644
index c89e39243..000000000
--- a/winsup/doc/doctool.txt
+++ /dev/null
@@ -1,146 +0,0 @@
-Doctool
-
-DJ Delorie <dj@cygnus.com>
-
-These are the instructions for using doctool.  Yes, I should have
-written them *in* DocBook, but hey, I was in a hurry.
-
-OK, doctool is a program that gathers snippets of a docbook document and
-puts them all together in the right order.  There are three
-places that it gets snippets from:
-
-1. The document that you tell it you want "finished"
-
-2. blocks of SGML in *.sgml files
-
-3. comments in source code
-
-The first of these is the template file, which is to say, it's a
-normal SGML file (sort of).  This file is the first one read, and
-includes such things as your <book> tags etc.  It contains commands to
-doctool to tell it where to put the other parts.
-
-The second, the *.sgml files, contain one or more blocks of SGML.
-To work with doctool, each of these snippets must begin and end
-with matching tags, must have an id="" attribute, and the start/end
-tags must begin at the beginning of the line.  For example:
-
-<foo id="frob-45">
-  stuff goes here
-</foo>
-<bar id="frob-48">
-  stuff goes here
-</bar>
-
-In this example, the file contains two snippets, one marked by "foo"
-and one barked by "bar", with id's "from-45" and "from-48".  Note that
-I made up the foo and bar tags.  You'd usually use a <sect1> tag or
-something useful like that.  Stuff outside the blocks is ignored.
-
-The third is simply an encapsulation of the second in comments, like this:
-
-/* DOCTOOL-START
-<foo id="frob-45">
-  stuff goes here
-</foo>
-DOCTOOL-END */
-
-The DOCTOOL-START and DOCTOOL-END things are special.  Doctool uses
-those to know which parts of which comments are useful, and which
-parts are the useless source code stuff ;-)
-
-
-OK, so now we've got all these snippets of SGML floating around.  What
-do we do with them?  Well, inside the template document (#1 in our
-list up there) you'd put text snippets that said "ok, put them
-here".  Each text snippet looks like this:
-
-DOCTOOL-INSERT-frob-
-
-Note that the "frob-" part tells doctool to pull in all the snippets
-with IDs that start with "frob-", in alphabetical (well, asciibetical
-at the moment) order.  So, by saying "DOCTOOL-INSERT-frob-" you'd get
-all the "frob-*" snippets, like "frob-45" and "frob-48".
-
-If you just said DOCTOOL-INSERT-frob, it inserts the snippet named
-"frob" and no others.
-
-Note that no snippet will ever be inserted more than once, no matter
-how many DOCTOOL-INSERTs you have.
-
-There's two other tricks doctool has.  If it finds a snippet with an ID
-like "int-*" (i.e. int-frob-45) that means that snippet of documentation
-is for the "internal" version only.  The "int-" is discarded, and if
-the -i option is given to doctool, this snippet is treated as if the
-int- wasn't there.  Without the -i, the int-* snippets are ignored
-completely.
-
-If a snippet has "add-" on it, like "add-frob-45", that's an addendum.
-Each time a snippet named without the add- is found, doctool looks for
-an addendum with exactly that same name (i.e. frob-45 looks for
-add-frob-45).  If it finds any, it puts them just before the last line
-of the non-add snippet (so that it's *inside* the main snippet's
-block, not after it).  Example:
-
-<sect1 id="frob-45">
-  some text
-</sect1>
-<sect1 id="add-frob-45">
-  more text
-</sect1>
-
-This would yield:
-
-<sect1 id="frob-45">
-  some text
-  more text
-</sect1>
-
-You should use the same outermost tags as the main snippet, but only
-because it sets the proper nesting rules for what's enclosed.
-
-You can use add- and int- at the same time, but always do add-int- and
-not int-add- (i.e. "add-int-frob-45").
-
-
-OK, now for doctool command line options.
-
--m tells doctool to "fix" the Makefile (not makefile) to include the
-extra dependencies needed by the file you're generating.  You need to
-manually include dependencies on the Makefile itself and the template
-file; doctool only includes the snippet files (sources etc) that it
-actually pulled content from.  Note: this isn't perfect!  Someone can
-come along and add a new snippet to a source file, and doctool would
-never know.  Sometimes, it's best to just rebuild the docs all the
-time.
-
--i means to include snippets with the "int-" prefix on their IDs.  Use
-with -b to make internal and public versions from the same sources.
-
-"-d dir" tells doctool to scan all the files in that directory (and
-subdirectories, recursively) for files that might contain snippets of
-SGML.  These include *.c, *.cc, *.h, and *.sgml.  The idea is that
-most of the documentation would be in a *.sgml file named after the
-source (i.e. foo.c -> foo.sgml) but some commentary within the source
-might be useful in the docs as well.  SGML files (*.sgml) do not need
-the DOCTOOL-START/END tags but the others do.
-
--o sets the output file.  Without -o, the file goes to stdout (ick).
-
--s tells doctool to supress a "source directory prefix".  What this
-means is that, in the generated output doctool puts comments that say
-where each snippet comes from (for debugging), which includes the full
-path sometimes, but if you use -s, you can tell doctool to cut off
-that prefix.  For example,
-/usr/people/dj/src/cygnus/latest/devo/winsup/foo.c might get shortened
-to winsup/foo.c if you gave "-s
-/usr/people/dj/src/cygnus/latest/devo/".  Cygnus makefiles could
-just use -s $(srcdir) most of the time.
-
--b changes the ID for the <book> tag.  db2html uses the <book> tag's
-ID as the default subdirectory name and/or html file name to create
-the book with.  You'd need this to generate two books (internal vs
-public) from the same source.
-
-The only other thing you'd add to the command line is the ONE template
-file you want to pull in.
diff --git a/winsup/doc/effectively.sgml b/winsup/doc/effectively.sgml
deleted file mode 100644
index d6c2d9ad9..000000000
--- a/winsup/doc/effectively.sgml
+++ /dev/null
@@ -1,207 +0,0 @@
-<sect1 id="using-effectively">
-<title>Using Cygwin effectively with Windows</title>
-
-<para>
-Cygwin is not a full operating system, and so must rely on Windows for
-accomplishing some tasks. For example, Cygwin provides a POSIX view
-of the Windows filesystem, but does not provide filesystem drivers of 
-its own. Therefore part of using Cygwin effectively is learning to use
-Windows effectively. 
-Many Windows utilities provide a good way to interact with Cygwin's 
-predominately command-line environment. For example, 
-<command>ipconfig.exe</command> provides information about network 
-configuration, and <command>net.exe</command> views and configures
-network file and printer resources.  Most of these tools
-support the <literal>/?</literal> switch to display usage information. 
-</para>
-
-<para>
-Unfortunately, no standard set of tools included with all versions of 
-Windows exists.  If you are unfamiliar with the tools available 
-on your system, here is a general guide.  Windows 95, 98, and ME have 
-very limited command-line configuration tools.  Windows NT 4.0 has much 
-better coverage, which Windows 2000 and XP expanded. 
-Microsoft also provides free downloads for Windows NT 4.0 (the Resource Kit 
-Support Tools), Windows 2000 (the Resource Kit Tools), and XP (the 
-Windows Support Tools). Additionally, many independent sites such as 
-<ulink URL="http://download.com.com">download.com</ulink>, 
-<ulink URL="http://simtel.net">simtel.net</ulink>, 
-and <ulink URL="http://sysinternals.com">sysinternals.com</ulink>
-provide command-line utilities.  A few Windows tools, such as 
-<command>find.exe</command> and <command>sort.exe</command>,
-may conflict with the Cygwin versions; make sure that you use the full 
-path (<command>/usr/bin/find</command>) or that your Cygwin 
-<literal>bin</literal> directory comes first in your <EnVar>PATH</EnVar>.
-</para>
-
-<sect2> <title>Pathnames</title>
-
-<para>
-Windows programs do not understand POSIX pathnames, so any arguments 
-that reference the filesystem must be in Windows (or DOS) format or 
-translated.  Cygwin provides the <command>cygpath</command> utility for 
-converting between Windows and POSIX paths. A complete description of its 
-options and examples of its usage are in <Xref Linkend="cygpath">, 
-including a shell script for starting Windows Explorer in any directory. 
-The same format works for most Windows programs, for example 
-<screen>
-<literal>notepad.exe "$(cygpath -aw "Desktop/Phone Numbers.txt")"</literal>
-</screen>
-A few programs require a Windows-style, semicolon-delimited path list, 
-which <command>cygpath</command> can translate from a POSIX path with the
-<literal>-p</literal> option. For example, a Java compilation from 
-<command>bash</command> might look like this: 
-<screen>
-<literal>javac -cp "$(cygpath -pw "$CLASSPATH")" hello.java</literal>
-</screen>
-Since using quoting and subshells is somewhat awkward, it is often 
-preferable to use <command>cygpath</command> in shell scripts.
-</para>
-
-</sect2>
-
-<sect2> <title>Console Programs</title>
-<para>
-Another issue is receiving output from or giving input to the console-based 
-Windows programs.  Unfortunately, interacting with Windows console 
-applications is not a simple matter of using a translation utility. Windows 
-console applications and designed to run under <command>command.com</command> 
-or <command>cmd.exe</command>, and some do not deal gracefully with other
-situations.  Cygwin can receive console input only if it
-is also running in a console (DOS box) since Windows does not provide
-any way to attach to the backend of the console device. Another
-traditional Unix input/output method, ptys (pseudo-terminals), are 
-supported by Cygwin but not entirely by Windows.  The basic problem is 
-that a Cygwin pty is a pipe and some Windows applications do not like 
-having their input or output redirected to pipes.  
-</para>
-
-<para>
-To help deal with these issues, Cygwin supports customizable levels of 
-Windows verses Unix compatibility behavior.  To be most compatible with 
-Windows programs, use a DOS prompt, running only the occasional Cygwin 
-command or script. Next would be to run <command>bash</command> with 
-the default DOS box. To make Cygwin more Unix compatible in this case, 
-set <EnVar>CYGWIN=tty</EnVar> (see <Xref Linkend="using-cygwinenv">).
-Alternatively, the optional <command>rxvt</command> package provides 
-a native-Windows version of the popular X11 terminal emulator (it is not 
-necessary to set <EnVar>CYGWIN=tty</EnVar> with <command>rxvt</command>). 
-Using <command>rxvt.exe</command> provides the most Unix-like environment, 
-but expect some compatibility problems with Windows programs.
-</para>
-
-</sect2>
-
-<sect2> <title>Cygwin and Windows Networking</title>
-<para>
-Many popular Cygwin packages, such as <command>ncftp</command>, 
-<command>lynx</command>, and <command>wget</command>, require a 
-network connection.  Since Cygwin relies on Windows for connectivity, 
-if one of these tools is not working as expected you may need to 
-troubleshoot using Windows tools. The first test is to see if you
-can reach the URL's host with <command>ping.exe</command>, one of the 
-few utilities included with every Windows version since Windows 95.
-If you chose to install the inetutils package, you may have both
-Windows and Cygwin versions of utilities such as <command>ftp</command>
-and <command>telnet</command>. If you are having problems using one
-of these programs, see if the alternate one works as expected. 
-</para>
-
-<para>
-There are a variety of other programs available for specific situations.
-If your system does not have an always-on network connection, you 
-may be interested in <command>rasdial.exe</command> (or alternatives for
-Windows 95, 98, and ME) for automating dialup connections.  
-Users who frequently change their network 
-configuration can script these changes with <command>netsh.exe</command> 
-(Windows 2000 and XP). For proxy users, the open source 
-<ulink URL="http://apserver.sourceforge.net">
-NTLM Authorization Proxy Server</ulink> or the no-charge
-<ulink URL="http://www.hummingbird.com/products/nc/socks/index.html">
-Hummingbird SOCKS Proxy</ulink> may allow you to use Cygwin network
-programs in your environment.
-</para>
-
-</sect2>
-
-<sect2><title>The cygutils package</title>
-
-<para>
-The optional cygutils package contains miscellaneous tools that are
-small enough to not require their own package. It is not included in a
-default Cygwin install; select it from the Utils category in 
-<command>setup.exe</command>. Several of the cygutils tools are useful
-for interacting with Windows. 
-</para>
-
-<para>
-One of the hassles of Unix-Windows interoperability is the different line 
-endings on text files.  As mentioned in <Xref Linkend="using-textbinary">, 
-Unix tools such as <command>tr</command> can convert between CRLF and LF 
-endings, but cygutils provides several dedicated programs: 
-<command>conv</command>, <command>d2u</command>, <command>dos2unix</command>, 
-<command>u2d</command>, and <command>unix2dos</command>. Use the
-<literal>--help</literal> switch for usage information. 
-</para>
-
-<sect2><title>Creating shortcuts with cygutils</title>
-<para>
-Another problem area is between Unix-style links, which link one file
-to another, and Microsoft .lnk files, which provide a shortcut to a
-file.  They seem similar at first glance but, in reality, are fairly 
-different.  By default, Cygwin uses a mechanism that creates symbolic
-links that are compatible with standard Microsoft .lnk files. However,
-they do not include much of the information that is available in a 
-standard Microsoft shortcut, such as the working directory, an icon, 
-etc.  The cygutils package includes a <command>mkshortcut</command> 
-utility for creating standard Microsoft .lnk files.
-</para>
-
-<para>
-If Cygwin handled these native shortcuts like any other symlink, 
-you could not archive Microsoft .lnk files into <command>tar</command>
-archives and keep all the information in them.  After unpacking, 
-these shortcuts would have lost all the extra information and would
-be no different than standard Cygwin symlinks. Therefore these two types 
-of links are treated differently.  Unfortunately, this means that the 
-usual Unix way of creating and using symlinks does not work with 
-Windows shortcuts. 
-</para>
-</sect2>
-  
-<sect2><title>Printing with cygutils</title>
-<para>
-There are several options for printing from Cygwin, including the 
-<command>lpr</command> found in cygutils (not to be confused with the 
-native Windows <command>lpr.exe</command>). The easiest way to use cygutils' 
-<command>lpr</command> is to specify a default device name in the 
-<EnVar>PRINTER</EnVar> environment variable.  You may also specify a device 
-on the command line with the <literal>-d</literal> or <literal>-P</literal> 
-options, which will override the environment variable setting. 
-</para>
-
-<para>
-A device name 
-may be a UNC path (<literal>\\server_name\printer_name</literal>), a reserved 
-DOS device name (<literal>prn</literal>, <literal>lpt1</literal>), or a 
-local port name that is mapped to a printer share. Note that forward slashes 
-may be used in a UNC path (<literal>//server_name/printer_name</literal>),
-which is helpful when using <command>lpr</command> from a shell that uses
-the backslash as an escape character. 
-</para>
-
-<para>
-<command>lpr</command> sends raw data to the printer; no formatting is done.
-Many, but not all, printers accept plain text as input. If your printer 
-supports PostScript, packages such as 
-<command>a2ps</command> and <command>enscript</command> can prepare text
-files for printing. The ghostscript package also provides some translation
-from PostScript to various native printer languages. Additionally, a native 
-Windows application for printing PostScript, <command>gsprint</command>, is 
-available from the <ulink URL="http://www.cs.wisc.edu/~ghost/">Ghostscript
-website</ulink>.
-</para>
-
-</sect2>
-
-</sect1>
diff --git a/winsup/doc/faq.texinfo b/winsup/doc/faq.texinfo
deleted file mode 100644
index 9a9540621..000000000
--- a/winsup/doc/faq.texinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-\input texinfo 
-
-@title The Cygwin FAQ
-
-@author You can always find the latest version of this FAQ at @file{http://cygwin.com/faq.html}.
-
-@setfilename faq.txt
-
-@include what.texinfo
-@include install.texinfo
-@include calls.texinfo
-@include how.texinfo
-@include relnotes.texinfo
-@include history.texinfo
-@include who.texinfo
-@include copy.texinfo
diff --git a/winsup/doc/fhandler-tut.txt b/winsup/doc/fhandler-tut.txt
deleted file mode 100644
index 213b32b20..000000000
--- a/winsup/doc/fhandler-tut.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-fhandler tutorial
-
-This document will show how to add a new "fhandler" to cygwin, by
-showing an example of /dev/zero.
-
-Files to note:
-
-fhandler.h - must define a new derived class here and FH_*
-path.cc - to notice "/dev/zero" and mark it
-fhandler_zero.cc - new
-dtable.cc - to create the fhandler instance
-
-OK, first we have to define what this new fhandler will do.  In our
-example case, we're going to implement the unix "/dev/zero" device,
-which has the following characteristics:
-
-* writes to /dev/zero are silently discarded
-* reads from /dev/zero return all zero bytes
-* mmap()ing /dev/zero maps a chunk of zero'd out memory.
-
-Since windows doesn't have a device that acts like this, we'll be
-simulating everything.  Thus:
-
-* writes simply return a success status
-* reads memset() the buffer and return success
-* we take advantage of the fact that CreateFileMapping can take a
-  handle of -1, which (1) maps swap memory, and (2) zeros it out for
-  us (at least, on NT).
-
-OK, let's start with fhandler.h.
-
-First, update the comment about which files are where.  We're adding
-fhandler_dev_zero as FH_DEV_ZERO.  We're adding this as a "fast"
-device (it will never block) so we have to adjust FH_NDEV also.
-
-Later in that file, we'll copy fhandler_dev_null and edit it to be
-fhandler_dev_zero.  I chose that one because it's small, but we'll add
-more members as we go (since we're simulating the whole thing).  In
-fact, let's copy the I/O methods from fhandler_windows since we'll
-need all those anyway, even though we'll go through the full list
-later.
-
-OK, next we need to edit path.cc to recognize when the user is trying
-to open "/dev/zero".  Look in get_device_number; there's a long list
-of cases, just add one (I added one after "null").  Also remember to
-add an entry to the windows_device_names list in the right spot.
-
-To go along with that change, we'll need to change dtable.cc.  Look for
-FH_NULL and add a case for FH_ZERO as well.
-
-Now we get to fhandler_zero.cc itself.  Create the empty file and copy
-the "usual" header/copyright/includes from some other fhandler_*.cc
-source file.  Also, edit Makefile.in to build this new file.  Add one
-new entry to DLL_OFILES, and a new line for the winsup.h dependencies.
-
-Since we changed fhandler.h, when you type "make" it will rebuild
-everything.  Go ahead and do that when you get a chance to let it run,
-since we're not changing the headers any more.  Note that you won't be
-able to link the new dll, as we haven't added all the methods for the
-new fhandler class yet, but at least you'll get a lot of compilation
-out of the way.
-
-Next we start adding in the fhandler methods themselves.
-
-Constructor: This takes a name, and all we do is pass that name back
-to the base class, along with the FH_ZERO value.  We call set_cb
-because all fhandlers call this (it's for exec to copy the fd).
-
-open: we override the one that takes a name because there are no real
-windows devices like /dev/zero, but we ignore the name.  We call
-set_flags to save the flags.
-
-write: writes are discarded; we return success.
-
-read: reads read NUL bytes, so fill the buffer with NULs and return
-success.
-
-lseek/close: just return success.
-
-dump: this is just for debugging, so we just print something.
-
-select_*: we don't support this yet, see the myriad examples in
-select.cc for examples.  The base fhandler's methods will do for now.
diff --git a/winsup/doc/filemodes.sgml b/winsup/doc/filemodes.sgml
deleted file mode 100644
index b0bac2eef..000000000
--- a/winsup/doc/filemodes.sgml
+++ /dev/null
@@ -1,34 +0,0 @@
-<sect1 id="using-filemodes"><title>File permissions</title>
-
-<para>On Windows 9x systems, files are always readable, and Cygwin uses the
-native read-only mode to determine if they are writable. Files are
-considered to be executable if the filename ends with .bat, .com or .exe, or
-if its content starts with #!. Consequently <command>chmod</command> can
-only affect the "w" mode, it silently ignores actions involving the other
-modes.  This means that <command>ls -l</command>
-needs to open and read files. It can thus be relatively slow.</para>
-
-<para>Under NT, file permissions default to the same behavior as Windows
-9x but there is optional functionality in Cygwin that can make file
-systems behave more like on UNIX systems.  This is turned on by adding
-the "ntea" option to the <EnVar>CYGWIN</EnVar> environment variable.</para>
-
-<para>When the "ntea" feature is activated, Cygwin will start with basic
-permissions as determined above, but can store POSIX file permissions in NT
-Extended Attributes.  This feature works quite well on NTFS partitions
-because the attributes can be stored sensibly inside the normal NTFS
-filesystem structure.  However, on a FAT partition, NT stores extended
-attributes in a flat file at the root of the partition called <filename>EA
-DATA. SF</filename>.  This file can grow to extremely large sizes if you
-have a large number of files on the partition in question, slowing the
-system to a crawl.  In addition, the <filename>EA DATA. SF</filename> file
-can only be deleted outside of Windows because of its "in use" status.  For
-these reasons, the use of NT Extended Attributes is off by default in
-Cygwin.  Finally, note that specifying "ntea" in <EnVar>CYGWIN</EnVar> has no
-effect under Windows 9x. </para>
-
-<para>Under NT, the test "[ -w filename]" is only true if filename is
-writable across the board, e.g. <command>chmod +w filename</command>. </para>
-
-</sect1>
-
diff --git a/winsup/doc/gcc.sgml b/winsup/doc/gcc.sgml
deleted file mode 100644
index a67865de3..000000000
--- a/winsup/doc/gcc.sgml
+++ /dev/null
@@ -1,154 +0,0 @@
-<sect1 id="gcc"><title>Using GCC with Cygwin</title>
-
-<sect2 id="gcc-cons"><title>Console Mode Applications</title>
-
-<para>Use gcc to compile, just like under UNIX.
-Refer to the GCC User's Guide for information on standard usage and
-options.  Here's a simple example:</para>
-
-<example>
-<title>Building Hello World with GCC</title>
-<screen>
-<prompt>C:\&gt;</prompt> <userinput>gcc hello.c -o hello.exe</userinput>
-<prompt>C:\&gt;</prompt> <userinput>hello.exe</userinput>
-Hello, World
-
-<prompt>C:\&gt;</prompt>
-</screen>
-</example>
-
-</sect2>
-
-<sect2 id="gcc-gui"><title>GUI Mode Applications</title>
-
-<para>Cygwin allows you to build programs with full access to the
-standard Windows 32-bit API, including the GUI functions as defined in
-any Microsoft or off-the-shelf publication.  However, the process of
-building those applications is slightly different, as you'll be using
-the GNU tools instead of the Microsoft tools.</para>
-
-<para>For the most part, your sources won't need to change at all.
-However, you should remove all __export attributes from functions
-and replace them like this:</para>
-
-<screen>
-int foo (int) __attribute__ ((__dllexport__));
-
-int
-foo (int i)
-</screen>
-
-<para>The Makefile is similar to any other UNIX-like Makefile,
-and like any other Cygwin makefile.  The only difference is that you use
-<command>gcc -mwindows</command> to link your program into a GUI
-application instead of a command-line application.  Here's an example:</para>
-
-<screen>
-myapp.exe : myapp.o myapp.res
-	gcc -mwindows myapp.o myapp.res -o $@
-
-myapp.res : myapp.rc resource.h
-	windres $< -O coff -o $@
-</screen>
-
-<para>Note the use of <filename>windres</filename> to compile the
-Windows resources into a COFF-format <filename>.res</filename> file.
-That will include all the bitmaps, icons, and other resources you
-need, into one handy object file.  Normally, if you omitted the "-O
-coff" it would create a Windows <filename>.res</filename> format file,
-but we can only link COFF objects.  So, we tell
-<filename>windres</filename> to produce a COFF object, but for
-compatibility with the many examples that assume your linker can
-handle Windows resource files directly, we maintain the
-<filename>.res</filename> naming convention.  For more information on
-<filename>windres</filename>, consult the Binutils manual.  </para>
-
-<para>
-The following is a simple GUI-mode "Hello, World!" program to help
-get you started:
-<screen>
-/*-------------------------------------------------*/
-/* hellogui.c - gui hello world                    */
-/* build: gcc -mwindows hellogui.c -o hellogui.exe */
-/*-------------------------------------------------*/
-#include &lt;windows.h&gt;
-
-char glpszText[1024];
-
-LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
-
-int APIENTRY WinMain(HINSTANCE hInstance, 
-		HINSTANCE hPrevInstance,
-		LPSTR lpCmdLine,
-		int nCmdShow)
-{
-	sprintf(glpszText, 
-		"Hello World\nGetCommandLine(): [%s]\n"
-		"WinMain lpCmdLine: [%s]\n",
-		lpCmdLine, GetCommandLine() );
-
-	WNDCLASSEX wcex; 
- 
-	wcex.cbSize = sizeof(wcex);
-	wcex.style = CS_HREDRAW | CS_VREDRAW;
-	wcex.lpfnWndProc = WndProc;
-	wcex.cbClsExtra = 0;
-	wcex.cbWndExtra = 0;
-	wcex.hInstance = hInstance;
-	wcex.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-	wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
-	wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1);
-	wcex.lpszMenuName = NULL;
-	wcex.lpszClassName = "HELLO";
-	wcex.hIconSm = NULL;
-
-	if (!RegisterClassEx(&amp;wcex))
-		return FALSE; 
-
-	HWND hWnd;
-	hWnd = CreateWindow("HELLO", "Hello", WS_OVERLAPPEDWINDOW,
-		CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance, NULL);
-
-	if (!hWnd)
-		return FALSE;
-
-	ShowWindow(hWnd, nCmdShow);
-	UpdateWindow(hWnd);
-
-	MSG msg;
-	while (GetMessage(&amp;msg, NULL, 0, 0)) 
-	{
-		TranslateMessage(&amp;msg);
-		DispatchMessage(&amp;msg);
-	}
-
-	return msg.wParam;
-}
-
-LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-	PAINTSTRUCT ps;
-	HDC hdc;
-	
-	switch (message) 
-	{
-		case WM_PAINT:
-			hdc = BeginPaint(hWnd, &amp;ps);
-			RECT rt;
-			GetClientRect(hWnd, &amp;rt);
-			DrawText(hdc, glpszText, strlen(glpszText), &amp;rt, DT_TOP | DT_LEFT);
-			EndPaint(hWnd, &amp;ps);
-			break;
-		case WM_DESTROY:
-			PostQuitMessage(0);
-			break;
-		default:
-			return DefWindowProc(hWnd, message, wParam, lParam);
-	}
-	return 0;
-}
-</screen>
-</para>
-
-</sect2>
-</sect1>
diff --git a/winsup/doc/gdb.sgml b/winsup/doc/gdb.sgml
deleted file mode 100644
index 732004f49..000000000
--- a/winsup/doc/gdb.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-<sect1 id="gdb"><title>Debugging Cygwin Programs</title>
-
-<para>When your program doesn't work right, it usually has a "bug" in
-it, meaning there's something wrong with the program itself that is
-causing unexpected results or crashes.  Diagnosing these bugs and
-fixing them is made easy by special tools called
-<emphasis>debuggers</emphasis>.  In the case of Cygwin, the debugger
-is GDB, which stands for "GNU DeBugger".  This tool lets you run your
-program in a controlled environment where you can investigate the
-state of your program while it is running or after it crashes.
-Crashing programs sometimes create "core" files. In Cygwin these are 
-regular text files that cannot be used directly by GDB.
-</para>
-
-<para>Before you can debug your program, you need to prepare your
-program for debugging.  What you need to do is add
-<literal>-g</literal> to all the other flags you use when compiling
-your sources to objects.</para>
-
-<example><title>Compiling with -g</title>
-<screen>
-<prompt>$</prompt> gcc -g -O2 -c myapp.c
-<prompt>$</prompt> gcc -g myapp.c -o myapp
-</screen>
-</example>
-
-<para>What this does is add extra information to the objects (they get
-much bigger too) that tell the debugger about line numbers, variable
-names, and other useful things.  These extra symbols and debugging
-information give your program enough information about the original
-sources so that the debugger can make debugging much easier for
-you.</para>
-
-<para>In Windows versions of GNUPro, GDB comes with a full-featured
-graphical interface.  In Cygwin Net distributions, GDB is only
-available as a command-line tool.  To invoke GDB, simply type
-<command>gdb myapp.exe</command> at the command prompt.  It will
-display some text telling you about itself, then
-<literal>(gdb)</literal> will appear to prompt you to enter commands.
-Whenever you see this prompt, it means that gdb is waiting for you to
-type in a command, like <command>run</command> or
-<command>help</command>.  Oh <literal>:-)</literal> type
-<command>help</command> to get help on the commands you can type in,
-or read the <citation>GDB User's Manual</citation> for a complete
-description of GDB and how to use it.</para>
-
-<para>If your program crashes and you're trying to figure out why it
-crashed, the best thing to do is type <command>run</command> and let
-your program run.  After it crashes, you can type
-<command>where</command> to find out where it crashed, or
-<command>info locals</command> to see the values of all the local
-variables.  There's also a <command>print</command> that lets you look
-at individual variables or what pointers point to.</para>
-
-<para>If your program is doing something unexpected, you can use the
-<command>break</command> command to tell gdb to stop your program when it
-gets to a specific function or line number:</para>
-
-<example><title>"break" in gdb</title>
-<screen>
-<prompt>(gdb)</prompt> break my_function
-<prompt>(gdb)</prompt> break 47
-</screen>
-</example>
-
-<para>Now, when you type <command>run</command> your program will stop
-at that "breakpoint" and you can use the other gdb commands to look at
-the state of your program at that point, modify variables, and
-<command>step</command> through your program's statements one at a
-time.</para>
-
-<para>Note that you may specify additional arguments to the
-<command>run</command> command to provide command-line arguments to
-your program.  These two cases are the same as far as your program is
-concerned:</para>
-
-<example><title>Debugging with command line arguments</title>
-<screen>
-<prompt>$</prompt> myprog -t foo --queue 47
-
-<prompt>$</prompt> gdb myprog
-<prompt>(gdb)</prompt> run -t foo --queue 47
-</screen>
-</example>
-
-
-</sect1>
diff --git a/winsup/doc/history.texinfo b/winsup/doc/history.texinfo
deleted file mode 100644
index f5ae98780..000000000
--- a/winsup/doc/history.texinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-@chapter History
-
-This section of the FAQ is no longer maintained.
-
-Instead, see @file{http://cygwin.com/history.html}.
diff --git a/winsup/doc/how-api.texinfo b/winsup/doc/how-api.texinfo
deleted file mode 100644
index 3ae60bbcb..000000000
--- a/winsup/doc/how-api.texinfo
+++ /dev/null
@@ -1,289 +0,0 @@
-@section Cygwin API Questions
-
-@subsection How does everything work?
-
-There's a C library which provides a Unix-style API.  The
-applications are linked with it and voila - they run on Windows.
-
-The aim is to add all the goop necessary to make your apps run on
-Windows into the C library.  Then your apps should run on Unix and
-Windows with no changes at the source level.
-
-The C library is in a DLL, which makes basic applications quite small.
-And it allows relatively easy upgrades to the Win32/Unix translation
-layer, providing that dll changes stay backward-compatible.
-
-For a good overview of Cygwin, you may want to read the paper on Cygwin
-published by the Usenix Association in conjunction with the 2d Usenix NT
-Symposium in August 1998.  It is available in html format on the project
-WWW site.
-
-@subsection Are development snapshots for the Cygwin library available?
-
-Yes.  They're made whenever anything interesting happens inside the
-Cygwin library (usually roughly on a nightly basis, depending on how much
-is going on).  They are only intended for those people who wish to
-contribute code to the project.  If you aren't going to be happy
-debugging problems in a buggy snapshot, avoid these and wait for a real
-release.  The snapshots are available from
-http://cygwin.com/snapshots/
-
-
-@subsection How is the DOS/Unix CR/LF thing handled?
-
-Let's start with some background.
-
-In UNIX, a file is a file and what the file contains is whatever the
-program/programmer/user told it to put into it.  In Windows, a file is
-also a file and what the file contains depends not only on the
-program/programmer/user but also the file processing mode.
-
-When processing in text mode, certain values of data are treated
-specially.  A \n (new line) written to the file will prepend a \r
-(carriage return) so that if you `printf("Hello\n") you in fact get
-"Hello\r\n".  Upon reading this combination, the \r is removed and the
-number of bytes returned by the read is 1 less than was actually read.
-This tends to confuse programs dependant on ftell() and fseek().  A
-Ctrl-Z encountered while reading a file sets the End Of File flags even
-though it truly isn't the end of file.
-
-One of Cygwin's goals is to make it possible to easily mix Cygwin-ported
-Unix programs with generic Windows programs.  As a result, Cygwin opens
-files in text mode as is normal under Windows.  In the accompanying
-tools, tools that deal with binaries (e.g. objdump) operate in unix
-binary mode and tools that deal with text files (e.g. bash) operate in
-text mode.
-
-Some people push the notion of globally setting the default processing
-mode to binary via mount point options or by setting the CYGWIN
-environment variable.  But that creates a different problem.  In
-binary mode, the program receives all of the data in the file, including
-a \r.  Since the programs will no longer deal with these properly for
-you, you would have to remove the \r from the relevant text files,
-especially scripts and startup resource files.  This is a porter "cop
-out", forcing the user to deal with the \r for the porter.
-
-It is rather easy for the porter to fix the source code by supplying the
-appropriate file processing mode switches to the open/fopen functions.
-Treat all text files as text and treat all binary files as binary.
-To be specific, you can select binary mode by adding @code{O_BINARY} to
-the second argument of an @code{open} call, or @code{"b"} to second
-argument of an @code{fopen} call.  You can also call @code{setmode (fd,
-O_BINARY)}.
-
-Note that because the open/fopen switches are defined by ANSI, they
-exist under most flavors of Unix; open/fopen will just ignore the switch
-since they have no meaning to UNIX.
-
-Explanation adapted from mailing list email by Earnie Boyd
-<earnie_boyd@@yahoo.com>.
-
-@subsection Is the Cygwin library multi-thread-safe?
-
-Yes.
-
-There is also extensive support for 'POSIX threads', see the file
-@code{cygwin.din} for the list of POSIX thread functions provided.
-
-@subsection Why is some functionality only supported in Windows NT?
-
-Windows 9x: n.
-32 bit extensions and a graphical shell for a 16 bit patch to an
-8 bit operating system originally coded for a 4 bit microprocessor,
-written by a 2 bit company that can't stand 1 bit of competition.
-
-But seriously, Windows 9x lacks most of the security-related calls and
-has several other deficiencies with respect to its version of the Win32
-API.  See the calls.texinfo document for more information as to what
-is not supported in Win 9x.
-
-@subsection How is fork() implemented?
-
-Cygwin fork() essentially works like a non-copy on write version
-of fork() (like old Unix versions used to do).  Because of this it
-can be a little slow.  In most cases, you are better off using the
-spawn family of calls if possible.
-
-Here's how it works:
-
-Parent initializes a space in the Cygwin process table for child.
-Parent creates child suspended using Win32 CreateProcess call, giving
-the same path it was invoked with itself.  Parent calls setjmp to save
-its own context and then sets a pointer to this in the Cygwin shared
-memory area (shared among all Cygwin tasks).  Parent fills in the childs
-.data and .bss subsections by copying from its own address space into
-the suspended child's address space.  Parent then starts the child.
-Parent waits on mutex for child to get to safe point.  Child starts and
-discovers if has been forked and then longjumps using the saved jump
-buffer.  Child sets mutex parent is waiting on and then blocks on
-another mutex waiting for parent to fill in its stack and heap.  Parent
-notices child is in safe area, copies stack and heap from itself into
-child, releases the mutex the child is waiting on and returns from the
-fork call.  Child wakes from blocking on mutex, recreates any mmapped
-areas passed to it via shared area and then returns from fork itself.
-
-@subsection How does wildcarding (globbing) work?
-
-If the DLL thinks it was invoked from a DOS style prompt, it runs a
-`globber' over the arguments provided on the command line.  This means
-that if you type @code{LS *.EXE} from DOS, it will do what you might
-expect.
-
-Beware: globbing uses @code{malloc}.  If your application defines
-@code{malloc}, that will get used.  This may do horrible things to you.
-
-@subsection How do symbolic links work?
-
-Cygwin knows of two ways to create symlinks.
-
-The old method is the only valid one up to but not including version 1.3.0.
-If it's enabled (from 1.3.0 on by setting `nowinsymlinks' in the environment
-variable CYGWIN) Cygwin generates link files with a magic header.  When you
-open a file or directory that is a link to somewhere else, it opens the file
-or directory listed in the magic header.  Because we don't want to have to
-open every referenced file to check symlink status, Cygwin marks symlinks
-with the system attribute.  Files without the system attribute are not
-checked.  Because remote samba filesystems do not enable the system
-attribute by default, symlinks do not work on network drives unless you
-explicitly enable this attribute.
-
-The new method which is introduced with Cygwin version 1.3.0 is enabled
-by default or if `winsymlinks' is set in the environment variable CYGWIN.
-Using this method, Cygwin generates symlinks by creating Windows shortcuts.
-Cygwin created shortcuts have a special header (which is in that way never
-created by Explorer) and the R/O attribute set.  A DOS path is stored in
-the shortcut as usual and the description entry is used to store the POSIX
-path.  While the POSIX path is stored as is, the DOS path has perhaps to be
-rearranged to result in a valid path.  This may result in a divergence
-between the DOS and the POSIX path when symlinks are moved crossing mount
-points.  When a user changes the shortcut, this will be detected by Cygwin
-and it will only use the DOS path then.  While Cygwin shortcuts are shown
-without the ".lnk" suffix in `ls' output, non-Cygwin shortcuts are shown
-with the suffix.  However, both are treated as symlinks.
-
-Both, the old and the new symlinks can live peacefully together since Cygwin
-treats both as symlinks regardless of the setting of `(no)winsymlinks' in
-the environment variable CYGWIN.
-
-@subsection Why do some files, which are not executables have the 'x' type.
-
-When working out the unix-style attribute bits on a file, the library
-has to fill out some information not provided by the WIN32 API.  
-
-It guesses that files ending in .exe and .bat are executable, as are
-ones which have a "#!" as their first characters.
-
-@subsection How secure is Cygwin in a multi-user environment?
-
-Cygwin is not secure in a multi-user environment.  For
-example if you have a long running daemon such as "inetd"
-running as admin while ordinary users are logged in, or if
-you have a user logged in remotely while another user is logged
-into the console, one cygwin client can trick another into
-running code for it.  In this way one user may gain the
-priveledge of another cygwin program running on the machine.
-This is because cygwin has shared state that is accessible by 
-all processes.
-
-(Thanks to Tim Newsham (newsham@@lava.net) for this explanation).
-
-@subsection How do the net-related functions work?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-The network support in Cygwin is supposed to provide the Unix API, not
-the Winsock API.
-
-There are differences between the semantics of functions with the same
-name under the API.
-
-E.g., the select system call on Unix can wait on a standard file handles
-and handles to sockets.  The select call in winsock can only wait on
-sockets.  Because of this, cygwin.dll does a lot of nasty stuff behind
-the scenes, trying to persuade various winsock/win32 functions to do what
-a Unix select would do.
-
-If you are porting an application which already uses Winsock, then
-using the net support in Cygwin is wrong.
-
-But you can still use native Winsock, and use Cygwin.  The functions
-which cygwin.dll exports are called 'cygwin_<name>'.  There
-are a load of defines which map the standard Unix names to the names
-exported by the dll -- check out include/netdb.h:
-
-@example
-..etc..
-void		cygwin_setprotoent (int);
-void		cygwin_setservent (int);
-void		cygwin_setrpcent (int);
-..etc..
-#ifndef __INSIDE_CYGWIN_NET__
-#define endprotoent cygwin_endprotoent 
-#define endservent cygwin_endservent 
-#define endrpcent  cygwin_endrpcent  
-..etc..
-@end example
-
-The idea is that you'll get the Unix->Cygwin mapping if you include
-the standard Unix header files.  If you use this, you won't need to
-link with libwinsock.a - all the net stuff is inside the dll.
-
-The mywinsock.h file is a standard winsock.h which has been hacked to
-remove the bits which conflict with the standard Unix API, or are
-defined in other headers.  E.g., in mywinsock.h, the definition of
-struct hostent is removed.  This is because on a Unix box, it lives in
-netdb.  It isn't a good idea to use it in your applications.
-
-As of the b19 release, this information may be slightly out of date.
-
-@subsection I don't want Unix sockets, how do I use normal Win32 winsock?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-To use the vanilla Win32 winsock, you just need to #define Win32_Winsock
-and #include "windows.h" at the top of your source file(s).  You'll also
-want to add -lwsock32 to the compiler's command line so you link against
-libwsock32.a.
-
-@subsection What version numbers are associated with Cygwin?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-There is a cygwin.dll major version number that gets incremented
-every time we make a new Cygwin release available.  This
-corresponds to the name of the release (e.g. beta 19's major
-number is "19").  There is also a cygwin.dll minor version number.  If
-we release an update of the library for an existing release, the minor
-number would be incremented.
-
-There are also Cygwin API major and minor numbers.  The major number
-tracks important non-backward-compatible interface changes to the API.
-An executable linked with an earlier major number will not be compatible
-with the latest DLL.  The minor number tracks significant API additions
-or changes that will not break older executables but may be required by
-newly compiled ones.
-
-Then there is a shared memory region compatibity version number.  It is
-incremented when incompatible changes are made to the shared memory
-region or to any named shared mutexes, semaphores, etc.
-
-Finally there is a mount point registry version number which keeps track
-of non-backwards-compatible changes to the registry mount table layout.
-This has been "B15.0" since the beta 15 release.
-
-@subsection Why isn't _timezone set correctly?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-Did you explicitly call tzset() before checking the value of _timezone?
-If not, you must do so.
-
-@subsection Is there a mouse interface?
-
-There is no way to capture mouse events from Cygwin.  There are
-currently no plans to add support for this.
-
diff --git a/winsup/doc/how-programming.texinfo b/winsup/doc/how-programming.texinfo
deleted file mode 100644
index d54ec3d4e..000000000
--- a/winsup/doc/how-programming.texinfo
+++ /dev/null
@@ -1,605 +0,0 @@
-@section Programming Questions
-
-@subsection How do I contribute a package?
-
-If you are willing to be a package maintainer, great.  We urgently need
-volunteers to prepare and maintain packages, because the priority of the
-Cygwin Team is Cygwin itself.
-
-The Cygwin Package Contributor's Guide is at
-@file{http://cygwin.com/setup.html}, which details everything you need
-to know about being a package maintainer.  Use the cygwin-apps mailing
-list (start at @file{http://cygwin.com/lists.html}) for
-questions about package maintenance, @emph{after} searching and browsing the
-cygwin-apps list archives, of course.  Charles Wilson posted a short
-recipe of what is involved, using texinfo as an example, available at
-@file{http://cygwin.com/ml/cygwin-apps/2000-11/msg00055.html}.  This
-should give you an idea of what is required.
-
-You should announce your intentions to the general cygwin list, in case
-others were thinking the same thing.
-
-@subsection How do I contribute to Cygwin?
-
-If you want to contribute to Cygwin itself, see
-@file{http://cygwin.com/contrib.html}.
-
-@subsection Why are compiled executables so huge?!?
-
-By default, gcc compiles in all symbols.  You'll also find that gcc
-creates large executables on UNIX.
-
-If that bothers you, just use the 'strip' program, part of the binutils
-package.  Or compile with the @samp{-s} option to gcc.
-
-@subsection Where is glibc?
-
-Cygwin does not provide glibc.  It uses newlib instead, which provides
-much (but not all) of the same functionality.  Porting glibc to Cygwin
-would be difficult.
-
-@subsection Where is Objective C?
-
-Objective C is not distributed with the Cygwin version of gcc, and there
-are no plans to do so.  The gcc package maintainer had difficulty
-building it, and once built there were problems using it.  It appears
-that there is only minimual support for the Objective C front-end in the
-main GCC distribution, anyway.
-
-@subsection Why is make behaving badly?
-
-First of all, if you are using @samp{make -j[N]}, then stop.  It doesn't
-work well.
-
-Otherwise, read on...
-
-Make has two operating modes, UNIX and WIN32.  You need to make sure
-that you are operating in the right mode.
-
-In UNIX mode, make uses sh.exe as a subshell.  The path list separator
-is ':', '\' is the escape character, POSIX paths are expected, and
-Cygwin mounts will be understood.  Use this for Makefiles written for
-UNIX.
-
-In WIN32 mode, make uses the "native" command shell (cmd.exe or
-command.com), with all the restrictions that implies.  The path list
-separator is ';', the path separator is '\', "copy" and "del" work, but
-the Cygwin mount table is not understood.  Use this for nmake-style
-Makefiles.
-
-The default mode for the Net Release of make (the one installed by
-@code{setup.exe}) is UNIX.  The default mode for commercial releases to
-Redhat (formerly Cygnus) customers is WIN32.
-
-You can override the default by setting the environment variable
-MAKE_MODE to "UNIX" (actually case is not significant) or "WIN32"
-(actually anything other than "UNIX").  You can also specify the options
---unix or --win32 on the make command line.
-
-@subsection Why the undefined reference to @samp{WinMain@@16}?
-
-Try adding an empty main() function to one of your sources.
-
-Or, perhaps you have @samp{-lm} too early in the link command line.  It
-should be at the end:
-
-@example
-    bash$ gcc hello.c -lm
-    bash$ ./a.exe
-    Hello World!
-@end example
-
-works, but
-
-@example
-    bash$  gcc -lm hello.c
-    /c/TEMP/ccjLEGlU.o(.text+0x10):hello.c: multiple definition of `main'
-    /usr/lib/libm.a(libcmain.o)(.text+0x0):libcmain.c: first defined here
-    /usr/lib/libm.a(libcmain.o)(.text+0x6a):libcmain.c: undefined reference to `WinMain@@16'
-    collect2: ld returned 1 exit status
-@end example
-
-This is an artifact of libm.a being a symbolic link to libcygwin.a.
-
-@subsection How do I use Win32 API calls?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-It's pretty simple actually.  Cygwin tools require that you explicitly
-link the import libraries for whatever Win32 API functions that you
-are going to use, with the exception of kernel32, which is linked
-automatically (because the startup and/or built-in code uses it).
-
-For example, to use graphics functions (GDI) you must link
-with gdi32 like this:
-
-gcc -o foo.exe foo.o bar.o -lgdi32
-
-or (compiling and linking in one step):
-
-gcc -o foo.exe foo.c bar.c -lgdi32
-
-The following libraries are available for use in this way:
-
-advapi32  largeint  ole32     scrnsave  vfw32
-cap       lz32      oleaut32  shell32   win32spl
-comctl32  mapi32    oledlg    snmp      winmm
-comdlg32  mfcuia32  olepro32  svrapi    winserve
-ctl3d32   mgmtapi   opengl32  tapi32    winspool
-dlcapi    mpr       penwin32  th32      winstrm
-gdi32     msacm32   pkpd32    thunk32   wow32
-glaux     nddeapi   rasapi32  url       wsock32
-glu32     netapi32  rpcdce4   user32    wst
-icmp      odbc32    rpcndr    uuid
-imm32     odbccp32  rpcns4    vdmdbg
-kernel32  oldnames  rpcrt4    version
-
-The regular setup allows you to use the option -mwindows on the
-command line to include a set of the basic libraries (and also
-make your program a GUI program instead of a console program),
-including user32, gdi32 and, IIRC, comdlg32.
-
-Note that you should never include -lkernel32 on your link line
-unless you are invoking ld directly.  Do not include the same import
-library twice on your link line.  Finally, it is a good idea to
-put import libraries last on your link line, or at least after
-all the object files and static libraries that reference them.
-
-The first two are related to problems the linker has (as of b18 at least)
-when import libraries are referenced twice.  Tables get messed up and
-programs crash randomly.  The last point has to do with the fact that
-gcc processes the files listed on the command line in sequence and
-will only resolve references to libraries if they are given after
-the file that makes the reference.
-
-@subsection How do I compile a Win32 executable that doesn't use Cygwin?
-
-The -mno-cygwin flag to gcc makes gcc link against standard Microsoft
-DLLs instead of Cygwin.  This is desirable for native Windows programs
-that don't need a UNIX emulation layer.
-
-This is not to be confused with 'MinGW' (Minimalist GNU for Windows),
-which is a completely separate effort.  That project's home page is
-@file{http://www.mingw.org/index.shtml}.
-
-@subsection Can I build a Cygwin program that does not require cygwin1.dll at runtime?
-
-No.  If your program uses the Cygwin API, then your executable cannot
-run without cygwin1.dll.  In particular, it is not possible to
-statically link with a Cygwin library to obtain an independent,
-self-contained executable.
-
-If this is an issue because you intend to distribute your Cygwin
-application, then you had better read and understand
-@file{http://cygwin.com/licensing.html}, which explains the licensing
-options.  Unless you purchase a special commercial license from Red
-Hat, then your Cygwin application must be Open Source.
-
-@subsection Can I link with both MSVCRT*.DLL and cygwin1.dll?
-
-No, you must use one or the other, they are mutually exclusive.
-
-@subsection How do I make the console window go away?
-
-The default during compilation is to produce a console application.
-It you are writing a GUI program, you should either compile with
--mwindows as explained above, or add the string
-"-Wl,--subsystem,windows" to the GCC commandline.
-
-@subsection Why does make complain about a "missing separator"?
-
-This problem usually occurs as a result of someone editing a Makefile
-with a text editor that replaces tab characters with spaces.  Command
-lines must start with tabs.  This is not specific to Cygwin.
-
-@subsection Why can't we redistribute Microsoft's Win32 headers?
-
-Subsection 2.d.f of the `Microsoft Open Tools License agreement' looks
-like it says that one may not "permit further redistribution of the
-Redistributables to their end users".  We take this to mean that we can
-give them to you, but you can't give them to anyone else, which is
-something that Cygnus (err... Red Hat) can't agree to.  Fortunately, we
-have our own Win32 headers which are pretty complete.
-
-@subsection How do I link against .lib files?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-1. Build a C file with a function table.  Put all functions you intend
-to use in that table.  This forces the linker to include all the object
-files from the .lib.  Maybe there is an option to force LINK.EXE to
-include an object file.
-2. Build a dummy 'LibMain'.
-3. Build a .def with all the exports you need.
-4. Link with your .lib using link.exe.
-
-or
-
-1. Extract all the object files from the .lib using LIB.EXE.
-2. Build a dummy C file referencing all the functions you need, either
-with a direct call or through an initialized function pointer.
-3. Build a dummy LibMain.
-4. Link all the objects with this file+LibMain.
-5. Write a .def.
-6. Link.
-
-You can use these methods to use MSVC (and many other runtime libs)
-with Cygwin development tools.
-
-Note that this is a lot of work (half a day or so), but much less than
-rewriting the runtime library in question from specs...
-
-(thanks to Jacob Navia (root@@jacob.remcomp.fr) for this explanation)
-
-@subsection How do I rebuild the tools on my NT box?
-
-Install all required components in one directory (we'll call it /src).
-Ideally, you should check out what you need from CVS
-(@file{http://cygwin.com/cvs.html}).  This is the @emph{preferred
-method} for acquiring the sources.  Otherwise, you can install the
-appropriate source packages from the cygwin distribution.
-
-As of this writing, you need to install at least the cygwin source
-package and the w32api source package.  The winsup source package
-should be extracted first and the w32api source directory should
-be extracted into the resulting 'winsup' directory.  Then rename
-w32api-whatever to w32api.
-
-It is possible that the cygwin source package may require a newer
-version of the w32api package since the release of the packages is
-not always in lock step (another reason to just use CVS).
-
-You @emph{must} build cygwin in a separate directory from the source.
-So, create something like a /obj directory.  You'll be performing
-your build in that directory:
-
-@example
-bash
-cd /obj
-/src/configure --prefix=/install -v > configure.log 2>&1
-make > make.log 2>&1
-make install > install.log 2>&1
-@end example
-
-Normally, this procedure will also attempt to build the documentation,
-which additionally requires db2html, and possibly other tools, which are
-not included in the Cygwin distribution.  You can get db2html as part of
-docbook, from @file{http://sources.redhat.com/docbook-tools/}.
-
-To check a cygwin1.dll, run "make check" in the winsup/cygwin directory.
-If that works, install everything @emph{except} the dll (if you can).
-Then, close down all cygwin programs (including bash windows, inetd,
-etc.), save your old dll, and copy the new dll to @emph{all} the
-places where the old dll was (if there is more than one on your
-machine).  Then start up a bash window and see what happens.  (Or better,
-run a cygwin program from the Windows command prompt.)
-
-If you get the error "shared region is corrupted" it means that two
-different versions of cygwin1.dll are running on your machine at the
-same time.
-
-@subsection How can I compile a powerpc NT toolchain?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-Unfortunately, this will be difficult.  It hasn't been built for
-some time (late 1996) since Microsoft has dropped development of
-powerpc NT.  Exception handling/signals support semantics/args have been
-changed for x86 and not updated for ppc so the ppc specific support would
-have to be rewritten.  We don't know of any other incompatibilities.
-Please send us patches if you do this work!
-
-@subsection How can I compile an Alpha NT toolchain?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-We have not ported the tools to Alpha NT and do not have plans to
-do so at the present time.  We would be happy to add support
-for Alpha NT if someone contributes the changes to us.
-
-@subsection How can I adjust the heap/stack size of an application?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-Pass heap/stack linker arguments to gcc.  To create foo.exe with
-a heap size of 1024 and a stack size of 4096, you would invoke
-gcc as:
-
-@code{gcc -Wl,--heap,1024,--stack,4096 -o foo foo.c}
-
-@subsection How can I find out which dlls are needed by an executable?
-
-@samp{objdump -p} provides this information, but is rather verbose.
-
-@samp{cygcheck} will do this much more concisely, and operates
-recursively, provided the command is in your path.
-
-Note there is currently a bug in cygcheck in that it will not report
-on a program in a Windows system dir (e.g., C:\Windows or C:\WINNT) even
-if it's in your path.  To work around this, supply the full Win32 path
-to the executable, including the .exe extension:
-
-@example
-cygcheck c:\\winnt\\system32\\cmd.exe
-@end example
-
-(Note the windows path separator must be escaped if this is typed in
-bash.)
-
-@subsection How do I build a DLL?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-There's documentation that explains the process on the main Cygwin
-project web page (http://cygwin.com/).
-
-@subsection How can I set a breakpoint at MainCRTStartup?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-Set a breakpoint at *0x401000 in gdb and then run the program in
-question.
-
-@subsection How can I build a relocatable dll?
-
-@strong{(Please note: This section has not yet been updated for the
-latest net release.  However, there was a discussion on the cygwin
-mailing list recently that addresses this issue.  Read
-@file{http://cygwin.com/ml/cygwin/2000-06/msg00688.html} and
-related messages.)}
-
-You must execute the following sequence of five commands, in this
-order:
-
-@example
-$(LD) -s --base-file BASEFILE --dll -o DLLNAME OBJS LIBS -e ENTRY
-
-$(DLLTOOL) --as=$(AS) --dllname DLLNAME --def DEFFILE \
-        --base-file BASEFILE --output-exp EXPFILE
-
-$(LD) -s --base-file BASEFILE EXPFILE -dll -o DLLNAME OBJS LIBS -e ENTRY
-
-$(DLLTOOL) --as=$(AS) --dllname DLLNAME --def DEFFILE \
-	--base-file BASEFILE --output-exp EXPFILE
-
-$(LD) EXPFILE --dll -o DLLNAME OBJS LIBS -e ENTRY
-@end example
-
-In this example, $(LD) is the linker, ld.
-
-$(DLLTOOL) is dlltool.
-
-$(AS) is the assembler, as.
-
-DLLNAME is the name of the DLL you want to create, e.g., tcl80.dll.
-
-OBJS is the list of object files you want to put into the DLL.
-
-LIBS is the list of libraries you want to link the DLL against.  For
-example, you may or may not want -lcygwin.  You may want -lkernel32.
-Tcl links against -lcygwin -ladvapi32 -luser32 -lgdi32 -lcomdlg32
--lkernel32.
-
-DEFFILE is the name of your definitions file.  A simple DEFFILE would
-consist of ``EXPORTS'' followed by a list of all symbols which should
-be exported from the DLL.  Each symbol should be on a line by itself.
-Other programs will only be able to access the listed symbols.
-
-BASEFILE is a temporary file that is used during this five stage
-process, e.g., tcl.base.
-
-EXPFILE is another temporary file, e.g., tcl.exp.
-
-ENTRY is the name of the function which you want to use as the entry
-point.  This function should be defined using the WINAPI attribute,
-and should take three arguments:
-        int WINAPI startup (HINSTANCE, DWORD, LPVOID)
-
-This means that the actual symbol name will have an appended @@12, so if
-your entry point really is named @samp{startup}, the string you should
-use for ENTRY in the above examples would be @samp{startup@@12}.
-
-If your DLL calls any Cygwin API functions, the entry function will need
-to initialize the Cygwin impure pointer.  You can do that by declaring
-a global variable @samp{_impure_ptr}, and then initializing it in the
-entry function.  Be careful not to export the global variable
-@samp{_impure_ptr} from your DLL; that is, do not put it in DEFFILE.
-
-@example
-/* This is a global variable.  */
-struct _reent *_impure_ptr;
-extern struct _reent *__imp_reent_data;
-
-int entry (HINSTANT hinst, DWORD reason, LPVOID reserved)
-@{
-  _impure_ptr = __imp_reent_data;
-  /* Whatever else you want to do.  */
-@}
-@end example
-
-You may put an optional `--subsystem windows' on the $(LD) lines.  The
-Tcl build does this, but I admit that I no longer remember whether
-this is important.  Note that if you specify a --subsytem <x> flag to ld,
-the -e entry must come after the subsystem flag, since the subsystem flag
-sets a different default entry point.
-
-You may put an optional `--image-base BASEADDR' on the $(LD) lines.
-This will set the default image base.  Programs using this DLL will
-start up a bit faster if each DLL occupies a different portion of the
-address space.  Each DLL starts at the image base, and continues for
-whatever size it occupies.
-
-Now that you've built your DLL, you may want to build a library so
-that other programs can link against it.  This is not required: you
-could always use the DLL via LoadLibrary.  However, if you want to be
-able to link directly against the DLL, you need to create a library.
-Do that like this:
-
-$(DLLTOOL) --as=$(AS) --dllname DLLNAME --def DEFFILE --output-lib LIBFILE
-
-$(DLLTOOL), $(AS), DLLNAME, and DEFFILE are the same as above.  Make
-sure you use the same DLLNAME and DEFFILE, or things won't work right.
-
-LIBFILE is the name of the library you want to create, e.g.,
-libtcl80.a.  You can then link against that library using something
-like -ltcl80 in your linker command.
-
-@subsection How can I debug what's going on?
-
-You can debug your application using @code{gdb}.  Make sure you
-compile it with the -g flag!  If your application calls functions in
-MS dlls, gdb will complain about not being able to load debug information
-for them when you run your program.  This is normal since these dlls
-don't contain debugging information (and even if they did, that debug
-info would not be compatible with gdb).
-
-@subsection Can I use a system trace mechanism instead?
-
-Yes.  You can use the @code{strace.exe} utility to run other cygwin
-programs with various debug and trace messages enabled.  For information
-on using @code{strace}, see the Cygwin User's Guide or the file
-@code{winsup/utils/utils.sgml}.
-
-@subsection Why doesn't gdb handle signals?
-
-Unfortunately, there is only minimal signal handling support in gdb
-currently.  Signal handling only works with Windows-type signals.
-SIGINT may work, SIGFPE may work, SIGSEGV definitely does.  You cannot
-'stop', 'print' or 'nopass' signals like SIGUSR1 or SIGHUP to the
-process being debugged.
-
-@subsection The linker complains that it can't find something.
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-A common error is to put the library on the command line before
-the thing that needs things from it.
-
-This is wrong @code{gcc -lstdc++ hello.cc}.
-This is right @code{gcc hello.cc -lstdc++}.
-
-@subsection I use a function I know is in the API, but I still get a link error.
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-The function probably isn't declared in the header files, or
-the UNICODE stuff for it isn't filled in.
-
-@subsection Can you make DLLs that are linked against libc ?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-Yes.
-
-@subsection Where is malloc.h?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-Include stdlib.h instead of malloc.h.
-
-@subsection Can I use my own malloc?
-
-If you define a function called @code{malloc} in your own code, and link
-with the DLL, the DLL @emph{will} call your @code{malloc}.  Needless to
-say, you will run into serious problems if your malloc is buggy.
-
-If you run any programs from the DOS command prompt, rather than from in
-bash, the DLL will try and expand the wildcards on the command line.
-This process uses @code{malloc} @emph{before} your main line is started.
-If you have written your own @code{malloc} to need some initialization
-to occur after @code{main} is called, then this will surely break.
-
-Moreover, there is an outstanding issue with @code{_malloc_r} in
-@code{newlib}.  This re-entrant version of @code{malloc} will be called
-directly from within @code{newlib}, by-passing your custom version, and
-is probably incompatible with it.  But it may not be possible to replace
-@code{_malloc_r} too, because @code{cygwin1.dll} does not export it and
-Cygwin does not expect your program to replace it.  This is really a
-newlib issue, but we are open to suggestions on how to deal with it.
-
-@subsection Can I mix objects compiled with msvc++ and gcc?
-
-Yes, but only if you are combining C object files.  MSVC C++ uses a
-different mangling scheme than GNU C++, so you will have difficulties
-combining C++ objects.
-
-@subsection Can I use the gdb debugger to debug programs built by VC++?
-
-No, not for full (high level source language) debugging.
-The Microsoft compilers generate a different type of debugging
-symbol information, which gdb does not understand.
-
-However, the low-level (assembly-type) symbols generated by
-Microsoft compilers are coff, which gdb DOES understand.
-Therefore you should at least be able to see all of your
-global symbols; you just won't have any information about
-data types, line numbers, local variables etc.
-
-@subsection Where can I find info on x86 assembly?
-
-CPU reference manuals for Intel's current chips are available in
-downloadable PDF form on Intel's web site:
-
-@file{http://developer.intel.com/design/pro/manuals/}
-
-@subsection Shell scripts aren't running properly from my makefiles?
-
-If your scripts are in the current directory, you must have @samp{.}
-(dot) in your $PATH.  (It is not normally there by default.)  Otherwise,
-you would need to add /bin/sh in front of each and every shell script
-invoked in your Makefiles.
-
-@subsection What preprocessor do I need to know about?
-
-We use _WIN32 to signify access to the Win32 API and __CYGWIN__ for
-access to the Cygwin environment provided by the dll.
-
-We chose _WIN32 because this is what Microsoft defines in VC++ and
-we thought it would be a good idea for compatibility with VC++ code
-to follow their example.  We use _MFC_VER to indicate code that should
-be compiled with VC++.
-
-_WIN32 is only defined when you use either the -mno-cygwin or -mwin32
-gcc command line options.  This is because Cygwin is supposed to be a
-Unix emulation environment and defining _WIN32 confuses some programs
-which think that they have to make special concessions for a Windows
-environment which Cygwin handles automatically.
-
-@subsection How should I port my Unix GUI to Windows?
-
-There are two basic strategies for porting Unix GUIs to Windows.
-
-The first is to use a portable graphics library such as tcl/tk, X11, or
-V (and others?).  Typically, you will end up with a GUI on Windows that
-requires some runtime support.  With tcl/tk, you'll want to include the
-necessary library files and the tcl/tk DLLs.  In the case of X11, you'll
-need everyone using your program to have an X11 server installed.
-
-The second method is to rewrite your GUI using Win32 API calls (or MFC
-with VC++).  If your program is written in a fairly modular fashion, you
-may still want to use Cygwin if your program contains a lot of shared
-(non-GUI-related) code.  That way you still gain some of the portability
-advantages inherent in using Cygwin.
-
-@subsection Why not use DJGPP ?
-
-DJGPP is a similar idea, but for DOS instead of Win32.  DJGPP uses a
-"DOS extender" to provide a more reasonable operating interface for its
-applications.   The Cygwin toolset doesn't have to do this since all of
-the applications are native WIN32.   Applications compiled with the
-Cygwin tools can access the Win32 API functions, so you can write
-programs which use the Windows GUI.
-
-You can get more info on DJGPP by following
-@file{http://www.delorie.com/}.
diff --git a/winsup/doc/how-resources.texinfo b/winsup/doc/how-resources.texinfo
deleted file mode 100644
index 21cf28201..000000000
--- a/winsup/doc/how-resources.texinfo
+++ /dev/null
@@ -1,118 +0,0 @@
-@section Where can I get more information?
-
-@subsection Where's the documentation?
-
-If you have installed Cygwin, you can find lots of documentation in
-@samp{/usr/doc/}.  Many packages ship with standard documentation, you
-can find this in a directory @samp{/usr/doc/@emph{package_name}}.  In
-addition, some packages have Cygwin specific instructions in a file
-@samp{/usr/doc/Cygwin/@emph{package_name}.README}.
-
-There are links to quite a lot of it on the main Cygwin project web
-page: @file{http://cygwin.com/}.  Be sure to at least
-read any 'Release Notes' or 'Readme' or 'read this' links on the main
-web page, if there are any.
-
-There is a comprehensive Cygwin User's Guide at
-@file{http://cygwin.com/cygwin-ug-net/cygwin-ug-net.html}
-and an API Reference at
-@file{http://cygwin.com/cygwin-api/cygwin-api.html}.
-
-You can find documentation for the individual GNU tools at
-@file{http://www.fsf.org/manual/}.  (You should read GNU manuals from a
-local mirror, check @file{http://www.fsf.org/server/list-mirrors.html}
-for a list of them.)
-
-@subsection What Cygwin mailing lists can I join?
-
-Comprehensive information about the Cygwin mailing lists can be found at
-@file{http://cygwin.com/lists.html}.
-
-To subscribe to the main list, send a message to
-cygwin-subscribe@@cygwin.com.  To unsubscribe from the 
-main list, send a message to cygwin-unsubscribe@@cygwin.com.
-In both cases, the subject and body of the message are ignored.
-
-Similarly, to subscribe to the Cygwin annoucements list, send a message
-to cygwin-announce-subscribe@@cygwin.com.  To unsubscribe,
-send a message to cygwin-announce-unsubscribe@@cygwin.com.
-
-If you are going to help develop the Cygwin library by volunteering for
-the project, you will want to subscribe to the Cygwin developers list,
-called cygwin-developers.  If you are contributing to Cygwin tools &
-applications, rather than the library itself, then you should subscribe
-to cygwin-apps.  The same mechanism as described for the first two lists
-works for these as well.  Both cygwin-developers and cygwin-apps are
-by-approval lists.
-
-There is a searchable archive of the main mailing list at
-@file{http://cygwin.com/ml/cygwin/}.  There is an alternate
-archive, also searchable, at @file{http://www.delorie.com/archives/}.
-You can also search at @file{http://www.google.com/} and include
-"cygwin" in the list of search terms.
-
-Cygwin mailing lists are not gatewayed to USENET, so anti-spam measures
-in your email address are neither required nor appreciated.  Also, avoid
-sending HTML content to Cygwin mailing lists.
-
-@subsection Posting Guidelines (Or: Why won't you/the mailing list answer my questions?)
-
-If you follow these guidelines, you are much more likely to get a
-helpful response from the Cygwin developers and/or the Cygwin community at
-large:
-
-@itemize @bullet
-@item Read the User's Guide and the FAQ first.
-@item Check the mailing list archives.  Your topic may have come up
-before.  (It may even have been answered!)  Use the search facilities
-at the links above.  Try the alternate site if the main archive is not
-producing search results.
-@item Explain your problem carefully and completely.  "I installed Blah
-and it doesn't work!" wastes everybody's time.  It provides no
-information for anyone to help you with your problem.  You should
-provide:
-
-@itemize @bullet
-@item A problem statement:  How does it behave, how do you think it
-should behave, and what makes you think it's broken?  (Oh yeah, and what
-is @emph{"it"}?)
-@item Information about your Windows OS ("Win95 OSR2" or "NT4/SP3" or
-"Win2K" or "Win98 SE" or ...).
-@item Details about your installation process, or attempts at same.  (Internet or
-Directory install?  If the former, exactly when and from what mirror?
-If the latter, which packages did you download?  Which version of
-setup.exe?  Any subsequent updates?)
-@item Details about your Cygwin setup, accomplished by @emph{attaching}
-the output of 'cygcheck -s -v -r' to your message.  (Do not paste the
-output into your message.)
-@item A valid return address, so that a reply doesn't require manual editing of
-the 'To:' header.
-@end itemize
-
-@item Your message must be relevant to the list.  Messages that are
-@emph{not} directly related to Cygwin are considered off-topic and are
-unwelcome.  For example, the following are off-topic:
-
-@itemize @bullet
-@item General programming language questions
-@item General Windows programming questions
-@item General UNIX shell programming questions
-@item General application usage questions
-@item How to make millions by working at home
-@item Announcements from LaserJet toner cartridge suppliers
-@end itemize
-
-@item Read and obey ``How To Ask Questions The Smart Way'' by Eric
-S. Raymond, at @file{http://www.catb.org/~esr/faqs/smart-questions.html}.
-
-@end itemize
-
-If you do not follow the above guidelines, you may still elicit a
-response, but you may not appreciate it!
-
-For inquiries about support contracts and commercial licensing, visit
-@file{http://www.redhat.com/software/cygwin/}.
-
-Beyond that, perhaps nobody has time to answer your question.  Perhaps
-nobody knows the answer.
-
diff --git a/winsup/doc/how-using.texinfo b/winsup/doc/how-using.texinfo
deleted file mode 100644
index fdb31bd8d..000000000
--- a/winsup/doc/how-using.texinfo
+++ /dev/null
@@ -1,739 +0,0 @@
-@section Using Cygwin
-
-@subsection Why can't my application locate cygncurses5.dll?  or cygintl.dll?  or cygreadline5.dll?  or ...?
-
-If you upgraded recently, and suddenly vim (or some other Cygwin
-application) cannot find @code{cygncurses5.dll}, it means that you did
-not follow these instructions properly:
-@file{http://cygwin.com/ml/cygwin-announce/2001/msg00124.html}.  To
-repair the damage, you must run Cygwin Setup again, and re-install the
-@samp{libncurses5} package.
-
-Note that Cygwin Setup won't show this option by default.  In the
-``Select packages to install'' dialogue, click on the @samp{Full/Part}
-button.  This lists all packages, even those that are already
-installed.  Scroll down to locate the @samp{libncurses5} package.
-Click on the ``cycle'' glyph until it says ``Reinstall''.  Continue
-with the installation.
-
-Similarly, if something cannot find @code{cygintl.dll}, then run
-Cygwin Setup and re-install the @samp{libintl} and @samp{libintl1}
-packages.
-
-For a detailed explanation of the general problem, and how to extend
-it to other missing DLLs (like cygreadline5.dll) and identify their
-containing packages, see
-@file{http://cygwin.com/ml/cygwin/2002-01/msg01619.html}.
-
-@subsection Why is Cygwin suddenly @emph{so} slow?
-
-If you recently upgraded the @samp{cygwin} package and suddenly
-@emph{every} command takes a @emph{very} long time, then you probably
-have the obsolete @code{//c} notation in your PATH.  This now means
-the @emph{network share} @code{c}, which will slow things down
-tremendously if it does not exist.  See then next FAQ entry.
-
-@subsection Why doesn't //c (for C:) work anymore?
-
-(Similarly for any drive letter, e.g. @code{//z} for @code{Z:})
-
-This ``feature'' has long been deprecated, and no longer works at all
-in the latest release.  As of release 1.3.3, @code{//c} now means the
-@emph{network share} @code{c}.
-
-For a detailed discussion of why this change was made, and how deal
-with it now, refer to
-@file{http://sources.redhat.com/ml/cygwin/2001-09/msg00014.html}.
-
-@subsection How should I set my PATH?
-
-This is done for you in the file /etc/profile, which is sourced by bash
-when you start it from the Desktop or Start Menu shortcut, created by
-@code{setup.exe}.  The line is
-
-@example
-	PATH="/usr/local/bin:/usr/bin:/bin:$PATH"
-@end example
-
-Effectively, this @strong{prepends} /usr/local/bin and /usr/bin to your
-Windows system path.  If you choose to reset your PATH, say in
-$HOME/.bashrc, or by editing etc/profile directly, then you should
-follow this rule.  You @strong{must} have @code{/usr/bin} in your PATH
-@strong{before} any Windows system directories.  (And you must not omit
-the Windows system directories!)  Otherwise you will likely encounter
-all sorts of problems running Cygwin applications.
-
-@subsection Bash says "command not found", but it's right there!
-
-If you compile a program, you might find that you can't run it:
-
-@example
-	bash$ gcc -o hello hello.c
-        bash$ hello
-        bash: hello: command not found
-@end example
-
-Unlike Windows, bash does not look for programs in @samp{.} (the current
-directory) by default.  You can add @samp{.} to your PATH (see above),
-but this is not recommended (at least on UNIX) for security reasons.
-Just tell bash where to find it, when you type it on the command line:
-
-@example
-	bash$ gcc -o hello hello.c
-        bash$ ./hello
-        Hello World!
-@end example
-
-@subsection How do I convert between Windows and UNIX paths?
-
-Use the 'cygpath' utility.  Type '@code{cygpath --help}' for
-information.  For example (on my installation):
-@example
-	bash$ cygpath --windows ~/.bashrc
-        D:\starksb\.bashrc
-        bash$ cygpath --unix C:/cygwin/bin/cygwin.bat
-        /usr/bin/cygwin.bat
-        bash$ cygpath --unix C:\\cygwin\\bin\\cygwin.bat
-        /usr/bin/cygwin.bat
-@end example
-Note that bash interprets the backslash '\' as an escape character, so
-you must type it twice in the bash shell if you want it to be recognized
-as such.
-
-@subsection Why doesn't bash read my .bashrc file on startup?
-
-Your .bashrc is read from your home directory specified by the HOME
-environment variable.  It uses /.bashrc if HOME is not set.  So you need
-to set HOME correctly, or move your .bashrc to the top of the drive
-mounted as / in Cygwin.
-
-@subsection How can I get bash filename completion to be case insensitive?
-
-Add the following to your @code{~/.bashrc} file:
-
-@example
-	shopt -s nocaseglob
-@end example
-
-and add the following to your @code{~/.inputrc} file:
-
-@example
-	set completion-ignore-case on
-@end example
-
-@subsection Can I use paths/filenames containing spaces in them?
-
-Cygwin does support spaces in filenames and paths.  That said, some
-utilities that use the library may not, since files don't typically
-contain spaces in Unix.  If you stumble into problems with this, you
-will need to either fix the utilities or stop using spaces in filenames
-used by Cygwin tools.
-
-In particular, bash interprets space as a word separator.  You would have
-to quote a filename containing spaces, or escape the space character.
-For example:
-@example
-	bash-2.03$ cd '/cygdrive/c/Program Files'
-@end example
-or
-@example
-	bash-2.03$ cd /cygdrive/c/Program\ Files
-@end example
-
-@subsection Why can't I cd into a shortcut to a directory?
-
-This is only valid up to but not including version 1.3.0:
-
-Cygwin does not follow MS Windows Explorer Shortcuts (*.lnk files).  It
-sees a shortcut as a regular file and this you cannot "cd" into it.
-
-Some people have suggested replacing the current symbolic link scheme
-with shortcuts.  The major problem with this is that .LNK files would
-then be used to symlink Cygwin paths that may or may not be valid
-under native Win32 non-Cygwin applications such as Explorer.
-
-Since version 1.3.0, Cygwin treats shortcuts as symlinks.
-
-@subsection I'm having basic problems with find.  Why?
-
-Make sure you are using the find that came with Cygwin and that you
-aren't picking up the Win32 find command instead.  You can verify that
-you are getting the right one by doing a "type find" in bash.
-
-If the path argument to find, including current directory (default), is
-itself a symbolic link, then find will not traverse it unless you
-specify the @samp{-follow} option.  This behavior is different than most
-other UNIX implementations, but is not likely to change.
-
-@subsection Why doesn't @samp{su} work?
-
-The @samp{su} command has been in and out of Cygwin distributions, but
-it has not been ported to Cygwin and has never worked.  It is
-currently installed as part of the sh-utils, but again, it does not work.
-
-You may be able to use @samp{login} instead, but you should read
-@file{http://www.cygwin.com/ml/cygwin/2001-03/msg00337.html} first.
-
-For some technical background into why @samp{su} doesn't work, read
-@file{http://www.cygwin.com/ml/cygwin/2003-06/msg00897.html} and
-related messages.
-
-@subsection Why doesn't man (or apropos) work?
-
-Even after installing the @samp{man} package, you get an error like this:
-
-@example
-	bash-2.04$ man man
-	Error executing formatting or display command.
-	System command (cd /usr/man ; (echo -e ".pl 1100i"; cat /usr/man/man1/man.1; echo ".pl \n(nlu+10") | /usr/bin/tbl | /usr/bin/groff -Tascii -mandoc | less -is) exited with status 32512.
-	No manual entry for man
-@end example
-
-You also need /bin/sh, which is found in the @samp{ash} package.
-You must install this too.
-
-In addition, before you can use @samp{man -k} or @samp{apropos}, you
-must create the whatis database.  Just run the command
-
-@example
-	/usr/sbin/makewhatis
-@end example
-
-(it may take a minute to complete).
-
-@subsection Why doesn't chmod work?
-
-@samp{ntsec} will allow UNIX permissions in Windows NT on NTFS file
-systems.  This is on by default (a recent change).
-
-@samp{ntea} works on NTFS @emph{and} FAT but it creates a huge,
-@strong{undeletable} file on FAT filesystems.
-
-(The @samp{ntsec} and @samp{ntea} settings are values for the
-@samp{CYGWIN} environment variable.  See the Cygwin User's Guide at
-@file{http://cygwin.com/cygwin-ug-net/cygwin-ug-net.html} for more
-information on this variable and its settings.)
-
-There is no solution at all for Windows 9x.
-
-If you have an application that requires a certain permission mode on a
-file, you may be able to work around this requirement by modifying the
-application's source code.  For a hint, based on work done by Corinna
-Vinschen for OpenSSH, see this message from the cygwin mailing list:
-@file{http://cygwin.com/ml/cygwin/2000-11/msg01176.html}.
-
-@subsection Why doesn't @samp{mkdir -p} work on a network share?
-
-Unfortunately, you cannot do something like this:
-
-@example
-bash$ mkdir -p //MACHINE/Share/path/to/new/dir
-mkdir: cannot create directory `//MACHINE': No such file or directory
-@end example
-
-This is because mkdir checks for the existence of each directory on the
-path, creating them as necessary.  Since @samp{//MACHINE} is not a
-directory (you can't cd to it either), mkdir tries to create it, and
-fails.
-
-This might get fixed someday, but for now, you have to work around it:
-
-@example
-bash$ cd //MACHINE/Share
-bash$ mkdir -p path/to/new/dir
-@end example
-
-@subsection Why doesn't my shell script work?
-
-There are two basic problems you might run into.  One is the fact that
-/bin/sh is really ash, and is missing some features you might expect
-in /bin/sh, particularly if you are used to /bin/sh actually being
-bash (Linux) or ksh (Tru64).  For example:
-
-@itemize bullet
-@item No `~' expansion (use $HOME instead)
-@item No job control
-@item No getopts
-@item No let
-@item No functions exported
-@item Must use `.' instead of `source' (true of sh and ksh too, not just ash)
-@end itemize
-
-Or, it could be a permission problem, and Cygwin doesn't understand that
-your script is executable.  Because @samp{chmod} may not work (see FAQ
-entry above), Cygwin must read the contents of files to determine if
-they are executable.  If your script does not start with
-
-@example
-	#! /bin/sh
-@end example
-
-(or any path to a script interpreter, it does not have to be /bin/sh)
-then Cygwin will not know it is an executable script.  The Bourne shell
-idiom
-
-@example
-	:
-	# This is the 2nd line, assume processing by /bin/sh
-@end example
-
-also works.
-
-Note that you can use @samp{mount -x} to force Cygwin to treat all files
-under the mount point as executable.  This can be used for individual
-files as well as directories.  Then Cygwin will not bother to read files
-to determine whether they are executable.
-
-@subsection How do I print under Cygwin?
-
-There is no working lp or lpr system as you would find on UNIX.
-
-Jason Tishler has written a couple of messages that explain how to use
-a2ps (for nicely formatted text in PostScript) and ghostscript (to print
-PostScript files on non-PostScript Windows printers).  Start at
-@file{http://cygwin.com/ml/cygwin/2001-04/msg00657.html}.  Note that the
-@samp{file} command is now available as part of Cygwin setup.
-
-Alternatively, on NT, you can use the Windows @samp{print} command.  (It
-does not seem to be available on Win9x.)  Type
-
-@example
-	bash$ print /\?
-@end example
-
-for usage instructions (note the @samp{?} must be escaped from the
-shell).
-
-Finally, you can simply @samp{cat} the file to the printer's share name:
-
-@example
-	bash$ cat myfile > //host/printer
-@end example
-
-You may need to press the formfeed button on your printer or append the
-formfeed character to your file.
-
-@subsection Why don't international (8-bit) characters work?
-
-Before you can type international characters (����) in bash, you must
-add the following lines to your @code{~/.inputrc} file:
-
-@example
-	set meta-flag on 
-        set convert-meta off 
-        set output-meta on 
-@end example
-
-These are options to the @code{readline} library, which you can read
-about in the @code{bash(1)} man page.
-
-@subsection Why don't cursor keys work under Win95/Win98?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-Careful examination shows that they not just non-functional, but
-rather behave strangely, for example, with NumLock off, keys on numeric
-keyboard work, until you press usual cursor keys, when even numeric
-stop working, but they start working again after hitting alphanumeric
-key, etc. This reported to happen on localized versions of Win98 and
-Win95, and not specific to Cygwin (there're known cases of Alt+Enter
-(fullscreen/windowed toggle) not working and shifts sticking with
-other programs). The cause of this problem is Microsoft keyboard
-localizer which by default installed in 'autoexec.bat'. Corresponding
-line looks like:
-
-@example
-keyb ru,,C:\WINDOWS\COMMAND\keybrd3.sys
-@end example
-
-(That's for russian locale.) You should comment that line if you want
-your keys working properly. Of course, this will deprive you of your
-local alphabet keyboard support, so you should think about
-another localizer. exUSSR users are of course knowledgeable of Keyrus
-localizer, and it might work for other locales too, since it has keyboard
-layout editor. But it has russian messages and documentation ;-(
-Reference URL is http://www.hnet.ru/software/contrib/Utils/KeyRus/
-(note the you may need to turn off Windows logo for Keyrus to operate
-properly).
-
-@subsection Is it OK to have multiple copies of the DLL?
-
-You should only have one copy of the Cygwin DLL on your system.  If you
-have multiple versions, they will conflict and cause problems.
-
-If you get the error "shared region is corrupted" or "shared region
-version mismatch" it means you have multiple versions of cygwin1.dll
-running at the same time.  This could happen, for example, if you update
-cygwin1.dll without exiting @emph{all} Cygwin apps (including inetd)
-beforehand.
-
-If you're trying to find multiple versions of the DLL that are causing
-this problem, reboot first, in case DLL's still loaded in memory are the
-cause.  Then use the Windows System find utility to search your whole
-machine, not just components in your PATH (as 'type' would do) or
-cygwin-mounted filesystems (as Cygwin 'find' would do).
-
-@subsection Where can I find "more"?
-
-If you are looking for the "more" pager, you should use the "less" pager
-instead.
-
-@subsection Why isn't package XXXX available in Cygwin?  (Or, why is your package so out of date?)
-
-Probably because there is nobody willing or able to maintain it.  It
-takes time, and the priority for the Cygwin Team is the Cygwin package.
-The rest is a volunteer effort.  Want to contribute?  See below.
-
-@subsection How can I access other drives?
-
-You have some flexibility here.
-
-Cygwin has a builtin "cygdrive prefix" for drives that are not mounted.
-You can access any drive, say Z:, as '/cygdrive/z/'.
-
-In some applications (notably bash), you can use the familiar windows
-<drive>:/path/, using posix forward-slashes ('/') instead of Windows
-backward-slashes ('\').  (But see the warning below!)  This maps in the
-obvious way to the Windows path, but will be converted internally to use
-the Cygwin path, following mounts (default or explicit).  For example:
-@example
-	bash$ cd C:/Windows
-	bash$ pwd
-        /cygdrive/c/Windows
-@end example
-and
-@example
-	bash$ cd C:/cygwin
-	bash$ pwd
-        /
-@end example
-for a default setup.  You could also use backward-slashes in the
-Windows path, but these would have to be escaped from the shell.
-
-@strong{Warning:} There is some ambiguity in going from a Windows path
-to the posix path, because different posix paths, through different
-mount points, could map to the same Windows directory.  This matters
-because different mount points may be binmode or textmode, so the
-behavior of Cygwin apps will vary depending on the posix path used to
-get there.
-
-You can avoid the ambiguity of Windows paths, and avoid typing
-"/cygdrive", by explicitly mounting drives to posix paths.  For example:
-@example
-	bash$ mkdir /c
-	bash$ mount c:/ /c
-	bash$ ls /c
-@end example
-Then @samp{/cygdrive/c/Windows} becomes @samp{/c/Windows} which is a
-little less typing.
-
-Note that you only need to mount drives once.  The mapping is kept
-in the registry so mounts stay valid pretty much indefinitely.
-You can only get rid of them with umount, or the registry editor.
-
-The '-b' option to mount mounts the mountpoint in binary mode
-("binmode") where text and binary files are treated equivalently.  This
-should only be necessary for badly ported Unix programs where binary
-flags are missing from open calls.  It is also the setting for /,
-/usr/bin and /usr/lib in a default Cygwin installation.  The default for
-new mounts is text mode ("textmode"), which is also the mode for all
-"cygdrive" mounts.
-
-You can change the default @samp{cygdrive} prefix and whether it is
-binmode or textmode using the @code{mount} command.  For example,
-@example
-	bash$ mount -b --change-cygdrive-prefix cygdrive
-@end example
-will change all @code{/cygdrive/...} mounts to binmode.
-
-@subsection How can I copy and paste into Cygwin console windows?
-
-First, consider using rxvt instead of the standard console window.  In
-rxvt, selecting with the left-mouse also copies, and middle-mouse
-pastes.  It couldn't be easier!
-
-Under Windows NT, open the properties dialog of the console window.
-The options contain a toggle button, named "Quick edit mode".  It must
-be ON.  Save the properties.
-
-Under Windows 9x, open the properties dialog of the console window.
-Select the Misc tab.  Uncheck Fast Pasting.  Check QuickEdit.
-
-You can also bind the insert key to paste from the clipboard by adding 
-the following line to your .inputrc file: 
-@example
-	"\e[2~": paste-from-clipboard 
-@end example 
-
-
-@subsection What does "mount failed: Device or resource busy" mean?
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-This usually means that you are trying to mount to a location
-already in use by mount.  For example, if c: is mounted as '/'
-and you try to mount d: there as well, you will get this error
-message.  First "umount" the old location, then "mount" the new one and
-you should have better luck.
-
-If you are trying to umount '/' and are getting this message, you may
-need to run @code{regedit.exe} and change the "native" key for the '/'
-mount in one of the mount points kept under
-HKEY_CURRENT_USER/Software/Red Hat, Inc./CYGWIN.DLL setup/<version>
-where <version> is the latest registry version associated with the
-Cygwin library.
-
-@subsection How can I share files between Unix and Windows?
-
-During development, we have both Unix boxes running Samba and
-NT/Windows 95/98 machines.  We often build with cross-compilers
-under Unix and copy binaries and source to the Windows system
-or just toy with them directly off the Samba-mounted partition.
-On dual-boot NT/Windows 9x machines, we usually use the FAT
-filesystem so we can also access the files under Windows 9x.
-
-@subsection Are mixed-case filenames possible with Cygwin?
-
-Several Unix programs expect to be able to use to filenames
-spelled the same way, but with different case.  A prime example
-of this is perl's configuration script, which wants @code{Makefile} and
-@code{makefile}.  WIN32 can't tell the difference between files with
-just different case, so the configuration fails.
-
-In releases prior to beta 16, mount had a special mixed case option
-which renamed files in such a way as to allow mixed case filenames.  We
-chose to remove the support when we rewrote the path handling code for
-beta 16.  The standard Windows apps -- explorer.exe,
-cmd.exe/command.com, etc. -- do not distinguish filenames that differed
-only in case, resulting in some (very) undesirable behavior.
-
-Sergey Okhapkin had maintained a mixed-case patch ('coolview') until
-about B20.1, but this has not been updated to recent versions of Cygwin.
-
-@subsection What about DOS special filenames?
-
-Files cannot be named com1, lpt1, or aux (to name a few); either as
-the root filename or as the extension part.  If you do, you'll have
-trouble.  Unix programs don't avoid these names which can make things
-interesting.  E.g., the perl distribution has a file called
-@code{aux.sh}.  The perl configuration tries to make sure that
-@code{aux.sh} is there, but an operation on a file with the magic
-letters 'aux' in it will hang.
-
-@subsection When it hangs, how do I get it back?
-
-If something goes wrong and the tools hang on you for some reason (easy
-to do if you try and read a file called aux.sh), first try hitting ^C to
-return to bash or the cmd prompt.
-
-If you start up another shell, and applications don't run, it's a good
-bet that the hung process is still running somewhere.  Use the Task
-Manager, pview, or a similar utility to kill the process.
-
-And, if all else fails, there's always the reset button/power switch.
-This should never be necessary under Windows NT.
-
-@subsection Why the weird directory structure?
-
-Why do /lib and /usr/lib (and /bin, /usr/bin) point to the same thing?
-
-Why use mounts instead of symbolic links?
-
-Can I use a disk root (e.g., C:\) as Cygwin root?  Why is this discouraged?
-
-After a new installation in the default location, your mount points will
-look something like this:
-
-@example
-	bash$ mount
-	C:\cygwin\bin on /usr/bin type system (binmode)
-	C:\cygwin\lib on /usr/lib type system (binmode)
-	C:\cygwin on / type system (binmode)
-@end example
-
-(Exactly what you see depends on what options you gave to @code{setup.exe}.)
-
-Note that /bin and /usr/bin point to the same location, as do /lib and
-/usr/lib.  This is intentional, and you should not undo these mounts
-unless you @emph{really} know what you are doing.
-
-Various applications and packages may expect to be installed in /lib or
-/usr/lib (similarly /bin or /usr/bin).  Rather than distinguish between
-them and try to keep track of them (possibly requiring the occasional
-duplication or symbolic link), it was decided to maintain only one
-actual directory, with equivalent ways to access it.
-
-Symbolic links had been considered for this purpose, but were dismissed
-because they do not always work on Samba drives.  Also, mounts are
-faster to process because no disk access is required to resolve them.
-
-Note that non-cygwin applications will not observe Cygwin mounts (or
-symlinks for that matter).  For example, if you use WinZip to unpack the
-tar distribution of a Cygwin package, it may not get installed to the
-correct Cygwin path.  @emph{So don't do this!}
-
-It is strongly recommended not to make the Cygwin root directory the
-same as your drive's root directory, unless you know what you are doing
-and are prepared to deal with the consequences.  It is generally easier
-to maintain the Cygwin hierarchy if it is isolated from, say, C:\.  For
-one thing, you avoid possible collisions with other (non-cygwin)
-applications that may create (for example) \bin and \lib directories.
-(Maybe you have nothing like that installed now, but who knows about
-things you might add in the future?)
-
-@subsection How do anti-virus programs like Cygwin?
-
-Users have reported that NAI (formerly McAfee) VirusScan for NT (and
-others?) is incompatible with Cygwin.  This is because it tries to scan
-the newly loaded shared memory in cygwin1.dll, which can cause fork() to
-fail, wreaking havoc on many of the tools.  (It is not confirmed that
-this is still a problem, however.)
-
-There have been several reports of NAI VirusScan causing the system to
-hang when unpacking tar.gz archives.  This is surely a bug in VirusScan,
-and should be reported to NAI.  The only workaround is to disable
-VirusScan when accessing these files.  This can be an issue during
-setup, and is discussed in that FAQ entry.
-
-Some users report a significant performance hit using Cygwin when their
-anti-virus software is enabled.  Rather than disable the anti-virus
-software completely, it may be possible to specify directories whose
-contents are exempt from scanning.  In a default installation, this
-would be @samp{@code{C:\cygwin\bin}}.  Obviously, this could be
-exploited by a hostile non-Cygwin program, so do this at your own risk.
-
-@subsection Is there a Cygwin port of GNU Emacs?
-
-Yes!  It uses the X11 (@file{http://cygwin.com/xfree/}) Windows
-interface.  From a remote login shell, this ``emacs -nw'' works fine.
-There is also a non-X11 version which just provides the text-only
-terminal interface.  Use Cygwin Setup to install either one (or both).
-
-@subsection What about NT Emacs?
-
-If you want GNU Emacs with a native Microsoft Windows interface, but
-without X, then you must use the native Windows port, commonly known
-as ``NT Emacs''.  You get NT Emacs from any GNU mirror.  It is not
-available from Cygwin Setup.
-
-NT Emacs uses the Windows command shell by default.  Since it is not a
-Cygwin application, it has no knowledge of Cygwin mounts.  With those
-points in mind, you need to add the following code to your ~/.emacs
-(or ~/_emacs) file in order to use Cygwin bash.  This is particularly useful
-for the JDEE package (@file{http://jdee.sunsite.dk/}).  The following
-settings are for Emacs 21.1:
-
-@example
-	;; This assumes that Cygwin is installed in C:\cygwin (the
-	;; default) and that C:\cygwin\bin is not already in your
-	;; Windows Path (it generally should not be).
-	;;
-	(setq exec-path (cons "C:/cygwin/bin" exec-path))
-	(setenv "PATH" (concat "C:\\cygwin\\bin;" (getenv "PATH")))
-	;;
-	;; NT-emacs assumes a Windows command shell, which you change
-	;; here.
-	;;
-	(setq process-coding-system-alist '(("bash" . undecided-unix)))
-	(setq shell-file-name "bash")
-	(setenv "SHELL" shell-file-name) 
-	(setq explicit-shell-file-name shell-file-name) 
-	;;
-	;; This removes unsightly ^M characters that would otherwise
-	;; appear in the output of java applications.
-	;;
-	(add-hook 'comint-output-filter-functions
-	          'comint-strip-ctrl-m)
-@end example
-
-If you want NT Emacs to understand Cygwin paths, get
-cygwin-mount.el from @file{http://www.emacswiki.org/elisp/index.html}.
-
-Note that all of this ``just works'' if you use the Cygwin port of
-Emacs from Cygwin Setup.
-
-@subsection What about XEmacs?
-
-For a concise description of the current situation with XEmacs, see
-this message from the Cygwin mailing list:
-@file{http://cygwin.com/ml/cygwin/2002-11/msg00609.html}.
-
-@subsection Is there a better alternative to the standard console window?
-
-Yes!  Use rxvt instead.  It's an optional package in Cygwin Setup.
-You can use it with or without X11.  You can resize it easily by
-dragging an edge or corner.  Copy and paste is easy with the left and
-middle mouse buttons, respectively.  It will honor settings in your
-~/.Xdefaults file, even without X.
-
-Don't invoke as simply ``rxvt'' because that will run /bin/sh (really
-ash) which is not a good interactive shell.  For details see
-@code{/usr/doc/Cygwin/rxvt-<ver>.README}.
-
-@subsection info error "dir: No such file or directory"
-
-Cygwin packages install their info documentation in the /usr/info
-directory.  But you need to create a @code{dir} file there before the
-standalone info program (probably @code{/usr/bin/info}) can be used to
-read those info files.  This is how you do it:
-@example
-	bash$ cd /usr/info
-	bash$ for f in *.info ; do install-info $f dir ; done
-@end example
-This may generate warnings:
-@example
-	install-info: warning: no info dir entry in `gzip.info'
-	install-info: warning: no info dir entry in `time.info'
-@end example
-The @code{install-info} command cannot parse these files, so you will
-have to add their entries to @code{/usr/info/dir} by hand.
-
-Even if the dir file already exists, you may have to update it when
-you install new Cygwin packages.  Some packages update the dir file
-for you, but many don't.
-
-@subsection Why do I get a message saying Out of Queue slots?
-
-"Out of queue slots!" generally occurs when you're trying to remove
-many files that you do not have permission to remove (either because
-you don't have permission, they are opened exclusively, etc).  What
-happens is Cygwin queues up these files with the supposition that it
-will be possible to delete these files in the future.  Assuming that
-the permission of an affected file does change later on, the file will
-be deleted as requested.  However, if too many requests come in to
-delete inaccessible files, the queue overflows and you get the message
-you're asking about.  Usually you can remedy this with a quick chmod,
-close of a file, or other such thing.  (Thanks to Larry Hall for
-this explanation).
-
-@subsection Why don't symlinks work on samba-mounted filesystems?
-
-Symlinks are marked with "system" file attribute.  Samba does not
-enable this attribute by default.  To enable it, consult your Samba
-documentation and then add these lines to your samba configuration
-file:
-
-@smallexample
-	map system = yes
-	create mask = 0775
-@end smallexample
-
-Note that the 0775 can be anything as long as the 0010 bit is set.
-
-@subsection Why does df report sizes incorrectly.
-
-There is a bug in the Win32 API function GetFreeDiskSpace that
-makes it return incorrect values for disks larger than 2 GB in size.
-Perhaps that may be your problem?
-
-@subsection Why doesn't Cygwin tcl/tk understand Cygwin paths?
-
-The versions of Tcl/Tk distributed with Cygwin (e.g. cygtclsh80.exe,
-cygwish80.exe) are not actually "Cygwin versions" of those tools.
-They are built with the @samp{-mno-cygwin} option to @code{gcc}, which
-means they do not understand Cygwin mounts or symbolic links.
-
-See the entry "How do I convert between Windows and UNIX paths?"
-elsewhere in this FAQ.
diff --git a/winsup/doc/how.texinfo b/winsup/doc/how.texinfo
deleted file mode 100644
index 4c7385ba4..000000000
--- a/winsup/doc/how.texinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-@chapter Question and Answers
-
-@include how-resources.texinfo
-@include how-using.texinfo
-@include how-api.texinfo
-@include how-programming.texinfo
diff --git a/winsup/doc/install.texinfo b/winsup/doc/install.texinfo
deleted file mode 100644
index 2f3fcd232..000000000
--- a/winsup/doc/install.texinfo
+++ /dev/null
@@ -1,280 +0,0 @@
-@chapter Installation Instructions
-@section Contents
-
-Unlike previous net releases such as B20.1 and earlier, there is no
-monolithic "full" or "usertools" installation.  Rather, you can pick and
-choose the packages you wish to install, and update them individually.
-
-For a searchable list of packages that can be installed with Cygwin,
-see @file{http://cygwin.com/packages/}.
-
-Full source code is available for all packages and tools.
-
-There is only one recommended way to install Cygwin, which is to use the GUI
-installer ``Cygwin Setup''.  It is flexible and easy to use.
-
-Do it any other way, and you're on your own!  That said, keep in mind
-that the GUI installer is a "work in progress", so there might be a few
-difficulties, especially if you are behind a firewall or have other
-specific requirements.  If something doesn't work right for you, and
-it's not covered here or elsewhere, then by all means report it to the
-mailing list.
-
-@section Installation using ``Cygwin Setup''
-
-The Cygwin Setup program is the @emph{only} recommended way to install
-Cygwin.
-
-@subsection Why not install in C:\?
-
-The Cygwin Setup program will prompt you for a "root" directory.
-The default is @samp{C:\cygwin}, but you can change it.  You are urged not to
-choose something like 'C:\' (the root directory on the system drive) for
-your Cygwin root.  If you do, then critical Cygwin system directories
-like 'etc', 'lib' and 'bin' could easily be corrupted by other (non-Cygwin)
-applications or packages that use \etc, \lib or \bin.  Perhaps there is
-no conflict now, but who knows what you might install in the future?
-It's also just good common sense to segregate your Cygwin "filesystems"
-from the rest of your Windows system disk.
-
-(In the past, there had been genuine bugs that would cause problems
-for people who installed in C:\, but we believe those are gone now.)
-
-@subsection Can I use Cygwin Setup to update a B18, B19, B20, B20.1 or CD-ROM (1.0) installation of Cygwin?
-
-No, you must start from scratch with the new Cygwin Setup.  The
-overall structure has changed so much that it would be pointless to
-try to accomodate old installations of Cygwin.  You will probably be
-much better off with a whole new installation anyway.  You may backup
-or rename your old installation first, or just install the new one
-somewhere else.  Be sure to make note of your current mount table,
-because this will be overwritten during the new setup.  Make sure you
-don't end up with two different versions of @samp{cygwin1.dll} on your
-system.
-
-Once you've installed the latest net release, Cygwin Setup will update
-just the individual packages that need it.
-
-@subsection Is Cygwin Setup, or one of the packages, infected with a virus?
-
-Unlikely.  Unless you can confirm it, please don't report it to the
-mailing list.  Anti-virus products have been known to detect false
-positives when extracting compressed tar archives.  If this causes
-problems for you, consider disabling your anti-virus software when
-running @code{setup}.  Read the next entry for a fairly safe way to do
-this.
-
-@subsection My computer hangs when I run Cygwin Setup!
-
-Both Network Associates (formerly McAfee) and Norton anti-virus
-products have been reported to "hang" when extracting Cygwin tar
-archives.  If this happens to you, consider disabling your anti-virus
-software when running Cygwin Setup.  The following procedure should be
-a fairly safe way to do that:
-
-@enumerate
-@item Download @code{setup.exe} and scan it explicitly.
-
-@item Turn off the anti-virus software.
-
-@item Run setup to download and extract all the tar files.
-
-@item Re-activate your anti-virus software and scan everything
-in C:\cygwin (or wherever you chose to install), or your entire hard
-disk if you are paranoid.
-
-@end enumerate
-
-This should be safe, but only if Cygwin Setup is not substituted by
-something malicious, and no mirror has been compromised.
-
-@subsection What packages should I download?
-
-When using Cygwin Setup for the first time, the default is to install
-a minimal subset of packages.  If you want anything beyond that, you
-will have to select it explicitly.  See
-@file{http://cygwin.com/packages/} for a searchable list of available
-packages.
-
-If you want to build programs, of course you'll need @samp{gcc},
-@samp{binutils}, @samp{make} and probably other packages from the
-``Devel'' category.
-
-@subsection How do I just get everything?
-
-Long ago, the default was to install everything, much to the
-irritation of most users.  Now the default is to install only a basic
-core of packages.  Cygwin Setup is designed to make it easy to browse
-categories and select what you want to install or omit from those
-categories.  It's also easy to install everything:
-
-@enumerate
-
-@item At the ``Select Packages'' screen, in ``Categories'' view, at the line 
-marked ``All'', click on the word ``default'' so that it changes to
-``install''.  (Be patient, there is some computing to do at this step.
-It may take a second or two to register the change.)  This tells Setup
-to install @emph{everything}, not just what it thinks you should have
-by default.
-
-@item Now click on the ``View'' button (twice) until you get the
-``Partial'' view.  This shows exactly which packages are about to be
-downloaded and installed.
-
-@end enumerate
-
-This procedure only works for packages that are currently available.
-There is no way to tell Cygwin Setup to install all packages by
-default from now on.  As new packages become available that would not
-be installed by default, you have to repeat the above procedure to get
-them.
-
-In general, a better method (in my opinion), is to:
-
-@enumerate
-
-@item First download & install all packages that would normally be
-installed by default.  This includes fundamental packages and any
-updates to what you have already installed.  Then...
-
-@item Run Cygwin Setup again, and apply the above technique to get all
-new packages that would not be installed by default.  You can check
-the list in the Partial View before proceeding, in case there's
-something you really @emph{don't} want.
-
-@item In the latest version of Cygwin Setup, if you click the ``View''
-button (twice) more, it shows packages not currently installed.  You
-ought to check whether you @emph{really} want to install everything!
-
-@end enumerate
-
-@subsection How much disk space does Cygwin require?
-
-That depends, obviously, on what you've chosen to download and
-install.  A full installation today is probably larger than 800MB
-installed, not including the package archives themselves nor the source
-code.
-
-After installation, the package archives remain in your ``Local
-Package Directory'', by default the location of @code{setup.exe}.  You
-may conserve disk space by deleting the subdirectories there.  These
-directories will have very wierd looking names, being encoded with
-their URLs.
-
-@subsection What if setup fails?
-
-First, make sure that you are using the latest version of Cygwin
-Setup.  The latest version is always available from the 'Install
-Cygwin now' link on the Cygwin Home Page at @file{http://cygwin.com/}.
-
-If you are downloading from the internet, setup will fail if it cannot
-download the list of mirrors at
-@file{http://cygwin.com/mirrors.html}.  It could be that
-the network is too busy.  Similarly for an ftp download site that isn't
-working.  Try another mirror, or try again later.
-
-If setup refuses to download a package that you know needs to be
-upgraded, try deleting that package's entry from /etc/setup.  If you are
-reacting quickly to an announcement on the mailing list, it could be
-that the mirror you are using doesn't have the latest copy yet.  Try
-another mirror, or try again tomorrow.
-
-If setup has otherwise behaved strangely, check the files
-@samp{setup.log} and @samp{setup.log.full} in @code{/var/log}
-(@code{C:\cygwin\var\log} by default).  It may provide some clues as
-to what went wrong and why.
-
-If you're still baffled, search the Cygwin mailing list for clues.
-Others may have the same problem, and a solution may be posted there.
-If that search proves fruitless, send a query to the Cygwin mailing
-list.  You must provide complete details in your query: version of
-setup, options you selected, contents of setup.log and setup.log.full,
-what happened that wasn't supposed to happen, etc.
-
-@subsection My Windows logon name has a space in it, will this cause problems?
-
-Most definitely yes!  UNIX shells (and thus Cygwin) use the space
-character as a word delimiter.  Under certain circumstances, it is
-possible to get around this with various shell quoting mechanisms, but
-you are much better off if you can avoid the problem entirely.
-
-In particular, the environment variables @samp{USER} and @samp{HOME} are
-set for you in /etc/profile.  By default these derive from your Windows
-logon name.  You may edit this file and set them explicitly to something
-without spaces.
-
-(If you use the @samp{login} package or anything else that reads
-/etc/passwd, you may need to make corresponding changes there.  See the
-README file for that package.)
-
-@subsection How do I uninstall individual packages?
-
-Run Cygwin Setup as you would to install packages.  In the list of
-packages to install, browse the relevant category or click on the
-``View'' button to get a full listing.  Click on the cycle glyph until
-the action reads ``Uninstall''.  Proceed by clicking ``Next''.
-
-@subsection How do I uninstall @strong{all} of Cygwin?
-
-Setup has no automatic uninstall facility.  Just delete everything
-manually:
-
-@itemize @bullet
-@item Cygwin shortcuts on the Desktop and Start Menu
-
-@item The registry tree @samp{Software\Cygnus Solutions} under
-@code{HKEY_LOCAL_MACHINE} and/or @code{HKEY_CURRENT_USER}.
-
-@item Anything under the Cygwin root folder, @samp{C:\cygwin} by
-default.
-
-@item Anything created by setup in its temporary working directory.
-
-@end itemize
-
-It's up to you to deal with other changes you made to your system, such
-as installing the inetd service, altering system paths, etc.  Setup
-would not have done any of these things for you.
-
-@subsection How do I install snapshots?
-
-First, are you sure you want to do this?  Snapshots are risky.  They
-have not been tested.  Use them @strong{only} if there is a feature or
-bugfix that you need to try, and you are willing to deal with any
-problems.
-
-Before installing a snapshot, you must first Close @strong{all} Cygwin
-applications, including shells and services (e.g. inetd, sshd), before
-updating @code{cygwin1.dll}.  You may have to restart Windows to clear
-the DLL from memory.
-
-You cannot use Setup to install a snapshot.
-
-You should generally install the full
-@code{cygwin-inst-YYYYMMDD.tar.bz2} update, rather than just the DLL,
-otherwise some components may be out of sync.  Cygwin tar won't be
-able to update @code{/usr/bin/cygwin1.dll}, but it should succeed with
-everything else.
-
-@enumerate
-
-@item Download the snapshot, and run:
-@example
-	cd /
-        tar jxvf /posix/path/to/cygwin-inst-YYYYMMDD.tar.bz2 --exclude=usr/bin/cygwin1.dll
-        cd /tmp
-        tar jxvf /posix/path/to/cygwin-inst-YYYYMMDD.tar.bz2 usr/bin/cygwin1.dll
-@end example
-
-@item After closing all Cygwin apps (see above), use Explorer or the
-Windows command shell to move @code{C:\cygwin\tmp\usr\bin\cygwin1.dll}
-to @code{C:\cygwin\bin\cygwin1.dll}.
-
-@end enumerate
-
-@subsection Can Cygwin Setup maintain a ``mirror''?
-
-NO.  Cygwin Setup cannot do this for you.  Use a tool designed for
-this purpose.  See @file{http://rsync.samba.org/},
-@file{http://sunsite.org.uk/packages/mirror/},
-@file{http://wget.sunsite.dk/} for utilities that can do this for you.
diff --git a/winsup/doc/legal.sgml b/winsup/doc/legal.sgml
deleted file mode 100644
index 531128e33..000000000
--- a/winsup/doc/legal.sgml
+++ /dev/null
@@ -1,30 +0,0 @@
-<LegalNotice id="legal">
-
-<para>Copyright &copy; 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.</para>
-
-<!--
-
-<Para>GNUPro&trade;, the GNUPro&trade; logo, and the Red Hat
-logo are trademarks of Red Hat, Inc.  All other brand and product
-names are trademarks of their respective owners.</Para>
-
-<Para>Permission is granted to make and distribute verbatim copies of
-this documentation provided the copyright notice and this permission
-notice are preserved on all copies.</Para>
-
-<Para>Permission is granted to copy and distribute modified versions
-of this documentation under the conditions for verbatim copying,
-provided that the entire resulting derived work is distributed under
-the terms of a permission notice identical to this one.</Para>
-
-<Para>Permission is granted to copy and distribute translations of
-this documentation into another language, under the above conditions
-for modified versions, except that this permission notice may be
-stated in a translation approved by the Free Software
-Foundation.</Para>
-
-<Para>This documentation has been prepared by Red Hat, Inc.
-Technical Publications.</para>
--->
-
-</LegalNotice>
diff --git a/winsup/doc/ntsec.sgml b/winsup/doc/ntsec.sgml
deleted file mode 100644
index 0a5fe42a8..000000000
--- a/winsup/doc/ntsec.sgml
+++ /dev/null
@@ -1,797 +0,0 @@
-<sect1 id="ntsec"><title>NT security and the <literal>ntsec</literal> usage</title>
-
-<para>The design goal of ntsec is to get a more UNIX like
-permission structure based upon the security features of Windows NT.
-To describe the changes, I will give a short overview of NT security
-in chapter one.</para>
-<para>Chapter two discusses the changes in ntsec related to privileges on
-processes.</para>
-<para>Chapter three shows the basics of UNIX like setting of
-file permissions.</para>
-<para>Chapter four talks about the advanced settings introduced in
-release 1.1</para>
-<para>Chapter five illustrates the permission mapping leak of Windows NT.</para>
-<para>Chapter six describes the new support of a setuid concept introduced
-with release 1.1.3.</para>
-
-<para>Chapter six describes in short the new acl API since release 1.1</para>
-
-<para>The setting of UNIX like object permissions is controlled by the new
-<EnVar>CYGWIN</EnVar> variable setting <literal>(no)ntsec</literal>.</para>
-
-<sect2 id="ntsec-common"><title>NT security</title>
-
-<para>The NT security allows a process to allow or deny access of
-different kind to `objects'. `Objects' are files, processes,
-threads, semaphores, etc.</para>
-
-<para>The main data structure of NT security is the `security descriptor'
-(SD) structure. It explains the permissions, that are granted (or denied)
-to an object and contains information, that is related to so called
-`security identifiers' (SID).</para>
-
-<para>A SID is a unique identifier for users, groups and domains. 
-SIDs are comparable to UNIX UIDs and GIDs, but are more complicated
-because they are unique across networks. Example:</para>
-
-<para>SID of a system `foo':</para>
-
-<screen>
-  S-1-5-21-165875785-1005667432-441284377
-</screen>
-
-<para>SID of a user `johndoe' of the system `foo':</para>
-
-<screen>
-  S-1-5-21-165875785-1005667432-441284377-1023
-</screen>
-
-<para>The above example shows the convention for printing SIDs. The leading
-`S' should show that it is a SID. The next number is a version number which
-is always 1. The next number is the so called `top-level authority' that
-identifies the source that issued the SID.</para>
-
-<para>While each system in a NT network has it's own SID, the situation
-is modified in NT domains: The SID of the domain controller is the
-base SID for each domain user. If an NT user has one account as domain
-user and another account on his local machine, this accounts are under
-any circumstances DIFFERENT, regardless of the usage of the same user
-name and password!</para>
-
-<para>SID of a domain `bar':</para>
-
-<screen>
-  S-1-5-21-186985262-1144665072-740312968
-</screen>
-
-<para>SID of a user `johndoe' in the domain `bar':</para>
-
-<screen>
-  S-1-5-21-186985262-1144665072-740312968-1207
-</screen>
-
-<para>The last part of the SID, the so called `relative identifier' (RID),
-is by default used as UID and/or GID under cygwin. As the name and the
-above example implies, this id is unique only relative to one system or
-domain.</para>
-
-<para>Note, that it's possible, that an user has the same RID on two
-different systems. The resulting SIDs are nevertheless different, so
-the SIDs are representing different users in an NT network.</para>
-
-<para>There is a big difference between UNIX IDs and NT SIDs, the existence of
-the so called `well known groups'. For example UNIX has no GID for the
-group of `all users'. NT has an SID for them, called `Everyone' in the
-English versions. The SIDs of well-known groups are not unique across
-an NT network but their meanings are unmistakable.
-Examples of well-known groups:</para>
-
-<screen>
-everyone                        S-1-1-0
-creator/owner                   S-1-3-0
-batch process (via `at')        S-1-5-3
-authenticated users             S-1-5-11
-system                          S-1-5-18
-</screen>
-
-<para>The last important group of SIDs are the `predefined groups'. This
-groups are used mainly on systems outside of domains to simplify the 
-administration of user permissions. The corresponding SIDs are not unique
-across the network so they are interpreted only locally:</para>
-
-<screen>
-administrators                  S-1-5-32-544
-users                           S-1-5-32-545
-guests                          S-1-5-32-546
-...
-</screen>
-
-<para>Now, how are permissions given to objects? A process may assign an SD
-to the object. The SD of an object consists of three parts:</para>
-
-<itemizedlist spacing="compact">
-<listitem><para>the SID of the owner </para></listitem>
-<listitem><para>the SID of the group </para></listitem>
-<listitem><para>a list of SIDs with their permissions, called
-`access control list' (ACL) </para></listitem>
-</itemizedlist>
-
-<para>UNIX is able to create three different permissions, the permissions
-for the owner, for the group and for the world. In contrast the ACL
-has a potentially infinite number of members. Every member is a so called
-`access control element' (ACE). An ACE contains three parts:</para>
-
-<itemizedlist spacing="compact">
-<listitem><para>the type of the ACE </para></listitem>
-<listitem><para>permissions, described with a DWORD </para></listitem>
-<listitem><para>the SID, for which the above mentioned permissions are
-set </para></listitem>
-</itemizedlist>
-
-<para>The two important types of ACEs are the `access allowed ACE' and the
-`access denied ACE'. The ntsec functionality only used `access allowed ACEs' up
-to Cygwin version 1.1.0. Later versions also use `access denied ACEs' 
-to reflect the UNIX permissions as well as possible.</para>
-
-<para>The possible permissions on objects are more detailed than in
-UNIX. For example, the permission to delete an object is different
-from the write permission.</para>
-
-<para>With the aforementioned method NT is able to grant or revoke permissions
-to objects in a far more specific way. But what about cygwin? In a POSIX
-environment it would be fine to have the security behavior of a POSIX
-system. The NT security model is MOSTLY able to reproduce the POSIX model.
-The ntsec method tries to do this in cygwin.</para>
-
-<para>You ask "Mostly? Why mostly???" Because there's a leak in the NT model.
-I will describe that in detail in chapter 4.</para>
-
-<para>Creating  explicit object security is not that easy so you will often
-see only two simple variations in use:</para>
-
-<itemizedlist spacing="compact">
-<listitem><para>default permissions, computed by the operating system </para></listitem>
-<listitem><para>each permission to everyone </para></listitem>
-</itemizedlist>
-
-<para>For parameters to functions that create or open securable objects another
-data structure is used, the `security attributes' (SA). This structure
-contains an SD and a flag that specifies whether the returned handle
-to the object is inherited to child processes or not.
-This property is not important for ntsec so in
-this document the difference between SDs and SAs is ignored.</para>
-
-</sect2>
-
-<sect2 id="ntsec-processes"><title>Process privileges</title>
-
-<para>Any process started under control of cygwin has a semaphore attached
-to it, that is used for signaling purposes. The creation of this semaphore
-can be found in sigproc.cc, function `getsem'. The first parameter to the
-function call `CreateSemaphore' is an SA. Without ntsec this SA 
-assigns default security to the semaphore. There is a simple disadvantage:
-Only the owner of the process may send signals to it. Or, in other words,
-if the owner of the process is not a member of the administrators' group,
-no administrator may kill the process! This is especially annoying, if
-processes are started via service manager.</para>
-
-<para>Ntsec now assigns an SA to the process control semaphore, that
-has each permission set for the user of the process, for the
-administrators' group and for `system', which is a synonym for the
-operating system itself. The creation of this SA is done by the function
-`sec_user', that can be found in `shared.cc'. Each member of the
-administrators' group is now allowed to send signals to any process
-created in cygwin, regardless of the process owner.</para>
-
-<para>Moreover, each process now has the appropriate security settings, when
-it is started via `CreateProcess'. You will find this in function
-`spawn_guts' in module `spawn.cc'. The security settings for starting a
-process in another user context have to add the sid of the new user, too.
-In the case of the `CreateProcessAsUser' call, sec_user creates an SA with
-an additional entry for the sid of the new user.</para>
-
-</sect2>
-
-<sect2 id="ntsec-files"><title>File permissions</title>
-
-<para>If ntsec is turned on, file permissions are set as in UNIX. An SD is
-assigned to the file containing the owner and group and ACEs for the
-owner, the group and `Everyone'.</para>
-
-<para>The complete settings of UNIX like permissions can be found in the file
-`security.cc'. The two functions `get_nt_attribute' and `set_nt_attribute'
-are the main code. The reading and writing of the SDs is done by the
-functions `read_sd' and `write_sd'. `write_sd' uses the function `BackupRead'
-instead of the simpler function `SetFileSecurity' because the latter is
-unable to set owners different from the caller.</para>
-
-<para>If you are creating a file `foo' outside of cygwin, you will see something
-like the following on <command>ls -ln</command>:</para>
-
-<para>If your login is member of the administrators' group:</para>
-<screen>
-  rwxrwxrwx 1  544  513  ... foo
-</screen>
-<para>if not:</para>
-<screen>
-  rwxrwxrwx 1  1000  513  ... foo
-</screen>
-
-<para>Note the user and group IDs. 544 is the UID of the administrators' group.
-This is a `feature' <literal>:-P</literal> of WinNT. If one is a member of
-the administrators' group, every file, that he has created is owned by the
-administrators' group, instead by him.</para>
-
-<para>The second example shows the UID of the first user, that has been
-created with NT's the user administration tool. The users and groups are
-sequentially numbered, starting with 1000. Users and groups are using the
-same numbering scheme, so a user and a group don't share the same ID.</para>
-
-<para>In both examples the GID 513 is of special interest. This GID is a
-well known group with different naming in local systems and domains.
-Outside of domains the group is named 'None' (`Kein' in German, `Aucun'
-in French, etc.), in domains it is named 'Domain Users'.  Unfortunately,
-the group `None' is never shown in the user admin tool outside of domains!
-This is very confusing but this seems to have no negative consequences.</para>
-
-<para>To work correctly, ntsec depends on the files
-<filename>/etc/passwd/</filename> and <filename>/etc/group</filename>.
-In cygwin release 1.0 the names and the IDs must correspond to the
-appropriate NT IDs! The IDs used in cygwin are the RID of the NT SID, as
-mentioned earlier.
-An SID of e.g. the user `corinna' on my NT workstation:</para>
-
-<screen>
-  S-1-5-21-165875785-1005667432-441284377-1000
-</screen>
-
-<para>Note the last number: It's the RID 1000, the cygwin's UID.</para>
-
-<para>Unfortunately, workstations and servers outside of domains are not
-able to set primary groups! In these cases, where there is no correlation
-of users to primary groups, NT returns 513 (None) as primary group,
-regardless of the membership to existing local groups.</para>
-
-<para>When using <command>mkpasswd  -l -g</command> on such systems, you
-have to change the primary group by hand if `None' as primary group is
-not what you want (and I'm sure, it's not what you want!)</para>
-
-<para>Look at the following examples, which were parts of my files before
-storing SIDs in /etc/passwd and /etc/group had been introduced (See next
-chapter for details).  With the exception of my personal user entry, all
-entries are well known entries.</para> 
-
-<example>
-<title>/etc/passwd</title>
-<screen>
-everyone:*:0:0:::
-system:*:18:18:::
-administrator::500:544::/home/root:/bin/bash
-guest:*:501:546:::
-administrators:*:544:544::/home/root:
-corinna::1000:547:Corinna Vinschen:/home/corinna:/bin/tcsh
-</screen>
-</example>
-
-<example>
-<title>/etc/group</title>
-<screen>
-everyone::0:
-system::18:
-none::513:
-administrators::544:
-users::545:
-guests::546:
-powerusers::547:
-</screen>
-</example>
-
-<para>As you can see, I changed my primary group membership from 513 (None)
-to 547 (powerusers).  So all files I created inside of Cygwin were now owned
-by the powerusers group instead of None.  This is the way I liked it.</para>
-
-<para>Groups may be mentioned in the passwd file, too. This has two
-advantages:</para>
-<itemizedlist spacing="compact">
-<listitem><para>Because NT assigns them to files as owners, a
-<command>ls -l</command> is often more readable.</para></listitem>
-<listitem><para>Moreover it's possible to assigned them to files as
-owners with cygwin's <command>chown</command>.</para></listitem>
-</itemizedlist>
-
-<para>The group `system' is the aforementioned synonym for the operating system
-itself and is normally the owner of processes, that are started through
-service manager. The same is true for files, that are created by
-processes, which are started through service manager.</para>
-
-</sect2>
-
-<sect2 id="ntsec-release1.1"><title>New since Cygwin release 1.1</title>
-
-<para>In Cygwin release 1.1 a new technique of using the 
-<filename>/etc/passwd</filename> and <filename>/etc/group</filename>
- is introduced.</para>
-
-<para>Both files may now contain SIDs of users and groups. They
-are saved in the last field of pw_gecos in <filename>/etc/passwd</filename>
-and in the gr_passwd field in <filename>/etc/group</filename>.</para>
-
-<para>This has the following advantages:</para>
-<itemizedlist spacing="compact">
-<listitem><para>ntsec works better in domain environments.</para></listitem>
-<listitem><para>Accounts (users and groups) may get another name in
-cygwin than their NT account name. The name in <filename>/etc/passwd</filename>
-or <filename>/etc/group</filename> is transparently used by cygwin
-applications (eg. <command>chown</command>, <command>chmod</command>,
-<command>ls</command>):</para>
-
-<screen>
-root::500:513::/home/root:/bin/sh
-</screen>
-
-<para>instead of</para>
-
-<screen>
-adminstrator::500:513::/home/root:/bin/sh
-</screen>
-
-<para>Caution: If you like to use the account as login account via
-<command>telnet</command> etc. you have to remain the name unchanged or
-you have to use the special version of <command>login</command> which is
-part of the standard Cygwin distribution since 1.1.</para></listitem>
-<listitem><para>Cygwin UIDs and GIDs are now not necessarily the RID
-part of the NT SID:</para>
-
-<screen>
-root::0:513:S-1-5-21-54355234-56236534-345635656-500:/home/root:/bin/sh
-</screen>
-
-<para>instead of</para>
-
-<screen>
-root::500:513::/home/root:/bin/sh
-</screen>
-
-</listitem>
-<listitem><para>As in U*X systems UIDs and GIDs numbering scheme now
-don't influence each other. So it's possible to have same Id's for a
-user and a group:</para>
-<example>
-<title>/etc/passwd:</title>
-<screen>
-root::0:0:S-1-5-21-54355234-56236534-345635656-500:/home/root:/bin/sh
-</screen>
-</example>
-
-<example>
-<title>/etc/group:</title>
-<screen>
-root:S-1-5-32-544:0:
-</screen>
-</example>
-</listitem>
-</itemizedlist>
-
-<para>The tools <command>mkpasswd</command> and <command>mkgroup</command>
-create the needed entries by default. If you don't want that you can use
-the options <literal>-s</literal> or <literal>--no-sids</literal>. I suggest
-not to do this since ntsec works better when having the SIDs available.</para>
-
-<para>Please note that the pw_gecos field in <filename>/etc/passwd</filename>
-is defined as a comma seperated list. The SID has to be the last field!</para>
-
-<para>As aforementioned you are able to use cygwin account names different
-from the NT account names. If you want to login thru `telnet' or something
-else you have to use the special <command>login</command>. You may then
-add another field to pw_gecos which contains the NT user name including
-it's domain. So you are able to login as each domain user. The syntax
-is easy: Just add an entry of the form U-ntdomain\ntusername to the pw_gecos
-field. Note that the SID must still remain the last field in pw_gecos!</para>
-
-<screen>
-the_king::1:1:Elvis Presley,U-STILLHERE\elvis,S-1-5-21-1234-5678-9012-1000:/bin/sh
-</screen>
-
-<para>For a local user just drop the domain:</para>
-
-<screen>
-the_king::1:1:Elvis Presley,U-elvis,S-1-5-21-1234-5678-9012-1000:/bin/sh
-</screen>
-
-<para>In either case the password of the user is taken from the NT user
-database, NOT from the passwd file!</para>
-
-<para>As in the previous chapter I give my personal
-<filename>/etc/passwd</filename> and <filename>/etc/group</filename> as
-examples.  Please note that I've changed these files heavily!  There's no
-need to change them that way, it's just for testing purposes and...
-for fun.</para>
-
-<example>
-<title>/etc/passwd</title>
-<screen>
-root:*:0:0:Administrators group,S-1-5-32-544::
-SYSTEM:*:18:18:,S-1-5-18:/home/system:/bin/bash
-admin:*:500:513:,S-1-5-21-1844237615-436374069-1060284298-500:/home/Administrator:/bin/bash
-corinna:*:100:0:Corinna Vinschen,S-1-5-21-1844237615-436374069-1060284298-1003:/home/corinna:/bin/tcsh
-Guest:*:501:546:,S-1-5-21-1844237615-436374069-1060284298-501:/home/Guest:/bin/bash
-</screen>
-</example>
-
-<example>
-<title>/etc/group</title>
-<screen>
-root:S-1-5-32-544:0:
-local:S-1-2-0:2:
-network:S-1-5-2:3:
-interactive:S-1-5-4:4:
-authenticatedusers:S-1-5-11:5:
-SYSTEM:S-1-5-18:18:
-local_svc:S-1-5-19:19:
-netwrk_svc:S-1-5-20:20:
-none:S-1-5-21-1844237615-436374069-1060284298-513:513:
-bckup_op:S-1-5-32-551:551:
-guests:S-1-5-32-546:546:
-pwrusers:S-1-5-32-547:547:
-replicator:S-1-5-32-552:552:
-users:S-1-5-32-545:545:
-</screen>
-</example>
-
-<para>If you want to do similar changes to your files, please do that only
-if you're feeling comfortably with the concepts.  Otherwise don't be surprised
-if some stuff doesn't work anymore.  If you screwed up things, revert to files
-created by mkpasswd and mkgroup.  Especially don't change the uid or the name
-of user SYSTEM.  Even if that works mostly, some Cygwin applications running
-as local service under that account could behave strangly suddenly.</para>
-
-</sect2>
-
-<sect2 id="ntsec-mapping"><title>The mapping leak</title>
-
-<para>Now its time to point out the leak in the NT permissions.
-The official documentation explains in short the following:</para>
-<itemizedlist spacing="compact">
-<listitem><para>access allow ACEs are accumulated regarding to the
-group membership of the caller.</para></listitem>
-<listitem><para>The order of ACEs is important. The system reads them
-in sequence until either any needed right is denied or all needed rights
-are granted. Later ACEs are then not taken into account.</para></listitem>
-<listitem><para>All access denied ACEs _should_ precede any
-access allowed ACE.</para></listitem>
-</itemizedlist>
-
-<para>Note that the last rule is a preference, not a law. NT will correctly
-deal with the ACL regardless of the sequence order. The second rule is
-not modified to get the ACEs in the prefered order.</para>
-
-<para>Unfortunately the security tab of the NT4 explorer is completely
-unable to deal with access denied ACEs while the explorer of W2K rearranges
-the order of the ACEs before you can read them. Thank God, the sort order
-remains unchanged if one presses the Cancel button.</para>
-
-<para>You still ask "Where is the leak?" NT ACLs are unable to reflect each
-possible combination of POSIX permissions. Example:</para>
-
-<screen>
-rw-r-xrw-
-</screen>
-
-<para>1st try:</para>
-
-<screen>
-UserAllow:   110
-GroupAllow:  101
-OthersAllow: 110
-</screen>
-
-<para>Hmm, because of the accumulation of allow rights the user may
-execute because the group may execute.</para>
-
-<para>2st try:</para>
-
-<screen>
-UserDeny:    001
-GroupAllow:  101
-OthersAllow: 110
-</screen>
-
-<para>Now the user may read and write but not execute. Better? No!
-Unfortunately the group may write now because others may write.</para>
-
-<para>3rd try:</para>
-
-<screen>
-UserDeny:    001
-GroupDeny:   010
-GroupAllow:  001
-OthersAllow: 110
-</screen>
-
-<para>Now the group may not write as intended but unfortunately the user may
-not write anymore, too. How should this problem be solved? According to
-the official rules a UserAllow has to follow the GroupDeny but it's
-easy to see that this can never be solved that way.</para>
-
-<para>The only chance:</para>
-
-<screen>
-UserDeny:    001
-UserAllow:   010
-GroupDeny:   010
-GroupAllow:  001
-OthersAllow: 110
-</screen>
-
-<para>Again: This works for both, NT4 and W2K. Only the GUIs aren't
-able to deal with that order.</para>
-
-</sect2>
-
-<sect2 id="ntsec-aclfuncs"><title>New acl API</title>
-
-<para>For dealing with ACLs Cygwin now has the acl API as it's
-implemented in newer versions of Solaris. The new data structure
-for a single ACL entry (ACE in NT terminology) is defined in
-<filename>sys/acl.h</filename> as:</para>
-
-<screen>
-typedef struct acl {
-  int     a_type;  /* entry type */
-  uid_t   a_id;    /* UID | GID */
-  mode_t  a_perm;  /* permissions */
-} aclent_t;
-</screen>
-
-<para>The a_perm member of the aclent_t type contains only the bits
-for read, write and execute as in the file mode. If eg. read permission
-is granted, all read bits (S_IRUSR, S_IRGRP, S_IROTH) are set.
-CLASS_OBJ or MASK ACL entries are not fully implemented yet.</para>
-
-<para>The new API calls are</para>
-
-<screen>
-acl(2), facl(2)
-aclcheck(3),
-aclsort(3),
-acltomode(3), aclfrommode(3),
-acltopbits(3), aclfrompbits(3),
-acltotext(3), aclfromtext(3)
-</screen>
-
-<para>Like in Solaris, Cygwin has two new commands for working with
-ACLs on the command line: <command>getfacl</command> and
-<command>setfacl</command>.</para>
-
-<para>Online man pages for the aforementioned commands and API calls
-can be found on eg. http://docs.sun.com</para>
-
-</sect2>
-
-<sect2 id="ntsec-setuid"><title>New setuid concept</title>
-
-<para>UNIX applications which have to switch the user context are using
-the <command>setuid</command> and <command>seteuid</command> calls which
-are not part of the Windows API.
-Nevertheless these calls are supported under Windows NT/W2K since Cygwin
-release 1.1.3.  Because of the nature of NT security an application which
-needs the ability has to be patched, though.</para>
-
-<para>NT uses so called `access tokens' to identify a user and it's
-permissions. To switch the user context the application has to request
-such an `access token'. This is typically done by calling the NT API
-function <command>LogonUser</command>. The access token is returned and
-either used in <command>ImpersonateLoggedOnUser</command> to change user
-context of the current process or in <command>CreateProcessAsUser</command>
-to change user context of a spawned child process. An important restriction
-is that the application using <command>LogonUser</command> must have special
-permissions:</para>
-
-<screen>
-"Act as part of the operating system"
-"Replace process level token"
-"Increase quotas"
-</screen>
-
-<para>Note that administrators do not have all these user rights set 
-by default.</para>
-
-<para>Two new Cygwin calls are introduced to support porting
-<command>setuid</command> applications with a minimum of effort. You only
-give Cygwin the right access token and then you can call
-<command>seteuid</command> or <command>setuid</command> as usual in POSIX
-applications. The call to <command>sexec</command> is not needed
-anymore. Porting a <command>setuid</command> application is illustrated by
-a short example:</para>
-
-<screen>
-
-/* First include all needed cygwin stuff. */
-#ifdef __CYGWIN__
-#include &lt;windows.h&gt;
-#include &lt;sys/cygwin.h&gt;
-/* Use the following define to determine the Windows version */
-#define is_winnt        (GetVersion() < 0x80000000)
-#endif
-
-[...]
-
-  struct passwd *user_pwd_entry = getpwnam (username);
-  char *cleartext_password = getpass ("Password:");
-
-[...]
-
-#ifdef __CYGWIN__
-  /* Patch the typical password test. */
-  if (is_winnt)
-    {
-      HANDLE token;
-
-      /* Try to get the access token from NT. */
-      token = cygwin_logon_user (user_pwd_entry, cleartext_password);
-      if (token == INVALID_HANDLE_VALUE)
-         error_exit;
-      /* Inform Cygwin about the new impersonation token.
-         Cygwin is able now, to switch to that user context by
-         setuid or seteuid calls. */
-      cygwin_set_impersonation_token (token);
-    }
-  else
-#endif /* CYGWIN */
-    /* Use standard method for W9X as well. */
-    hashed_password = crypt (cleartext_password, salt);
-    if (!user_pwd_entry ||
-        strcmp (hashed_password, user_pwd_entry-&gt;pw_password))
-      error_exit;
-
-[...]
-
-  /* Everything else remains the same! */
-
-  setegid (user_pwd_entry-&gt;pw_gid);
-  seteuid (user_pwd_entry-&gt;pw_uid);
-  execl ("/bin/sh", ...);
-
-</screen>
-
-<para>The new Cygwin call to retrive an access token is defined as follows:</para>
-
-<screen>
-#include &lt;windows.h&gt;
-#include &lt;sys/cygwin.h&gt;
-
-HANDLE
-cygwin_logon_user (struct passwd *pw, const char *cleartext_password)
-</screen>
-
-<para>You can call that function as often as you want for different user
-logons and remeber the access tokens for further calls to the second function.</para>
-
-<screen>
-#include &lt;windows.h&gt;
-#include &lt;sys/cygwin.h&gt;
-
-void
-cygwin_set_impersonation_token (HANDLE hToken);
-</screen>
-
-<para> is the call to inform Cygwin about the user context to which further
-calls to <command>setuid</command>/<command>seteuid</command> should switch to.
-While you need always the correct access token to do a
-<command>setuid</command>/<command>seteuid</command> to another users context,
-you are always able to use <command>setuid</command>/<command>seteuid</command>
-to return to your own user context by giving your own uid as parameter.</para>
-
-<para>If you have remembered several access tokens from calls to
-<command>cygwin_logon_user</command> you can switch to different user
-contexts by observing the following order:</para>
-
-<screen>
-
-  cygwin_set_impersonation_token (user1_token);
-  seteuid (user1_uid);
-
-[...]
-
-  seteuid (own_uid);
-  cygwin_set_impersonation_token (user2_token);
-  seteuid (user2_uid);
-
-[...]
-
-  seteuid (own_uid);
-  cygwin_set_impersonation_token (user1_token);
-  seteuid (user1_uid);
-
-etc.
-
-</screen>
-
-</sect2>
-
-<sect2 id="ntsec-release1.3.3"><title>New since Cygwin release 1.3.3</title>
-
-<para>
-Since Cygwin release 1.3.3, applications having the
-<command>Create a process level token</command> user right can switch user
-context without giving a password by just calling the usual
-<command>setuid</command>, <command>seteuid</command>,
-<command>setgid</command> and <command>setegid</command> functions.  This is
-typically only given to the SYSTEM user. However, this now allows to switch
-the user context using e. g. rhosts authentication or (when running sshd
-under SYSTEM account as service) public key authentication.
-</para>
-<para>
-An important restriction of this method is, that a process started under
-SYSTEM account can't access network shares which require authentication.
-This also applies to the subprocesses which switched the user context 
-without a password.  People using network home drives are typically not
-able to access it when trying to login using ssh or rsh without password.
-</para>
-
-</sect2>
-
-<sect2 id="ntsec-release1.3.20"><title>Special values of user and group
-ids</title>
-
-<para>
-If the current user is not present in <filename>/etc/passwd</filename>,
-that user's user id is set to a special value of 400.  The user name for
-the current user will always be shown correctly.  If another user
-(or a Windows group, treated as a user) is not present in
-<filename>/etc/passwd</filename>, the user id of that user will have a
-special value of -1 (which would be shown by <command>ls</command> as
-65535).  The user name shown in this case will be '????????'.
-</para>
-
-<para>
-If the current user is not present in <filename>/etc/passwd</filename>,
-that user's login group id is set to a special value of 401.  If another
-user is not present in <filename>/etc/passwd</filename>, that user's login
-group id is set to a special value of -1.  If the user is present in
-<filename>/etc/passwd</filename>, but that user's group is not in
-<filename>/etc/group</filename> and is not the login group of that user,
-the group id is set to a special value of -1.  The name of this group
-(id -1) will be shown as '????????'.
-In releases of Cygwin before 1.3.20, the group id 401 had a group name
-'None'.  Since Cygwin release 1.3.20, the group id 401 is shown as
-'mkpasswd', indicating the command that should be run to alleviate the
-situation.
-</para>
-
-<para>
-Also, since Cygwin release 1.3.20, if the current user is present in
-<filename>/etc/passwd</filename>, but that user's login group is not
-present in <filename>/etc/group</filename>, the group name will be shown
-as 'mkgroup', again indicating the appropriate command.
-</para>
-
-<para>To summarize:</para>
-<itemizedlist spacing="compact">
-
-<listitem><para>If the current user doesn't show up in
-<filename>/etc/passwd</filename>, it's <emphasis>group</emphasis> will
-be named 'mkpasswd'.</para></listitem>
-
-<listitem><para>Otherwise, if the login group of the current user isn't
-in <filename>/etc/group</filename>, it will be named 'mkgroup'.</para>
-</listitem>
-
-<listitem><para>Otherwise a group not in <filename>/etc/group</filename>
-will be shown as '????????' and a user not in
-<filename>/etc/passwd</filename> will be shown as "????????".</para>
-</listitem>
-
-</itemizedlist>
-
-<para>
-Note that, since the special user and group names are just indicators,
-nothing prevents you from actually having a user named `mkpasswd' in
-<filename>/etc/passwd</filename> (or a group named `mkgroup' in
-<filename>/etc/group</filename>).  If you do that, however, be aware of
-the possible confusion.
-</para>
-
-</sect2>
-
-</sect1>
diff --git a/winsup/doc/overview.sgml b/winsup/doc/overview.sgml
deleted file mode 100644
index a9ce8955b..000000000
--- a/winsup/doc/overview.sgml
+++ /dev/null
@@ -1,88 +0,0 @@
-<chapter id="overview"><title>Cygwin Overview</title>
-
-<sect1 id="what-is-it"><title>What is it?</title>
-
-<para>The Cygwin tools are ports of the popular GNU development
-tools and utilities for Windows NT and 9x. They function through the
-use of the Cygwin library which provides the UNIX system calls and
-environment that these programs require.</para>
-
-<para>With the tools installed, programmers may write Win32
-console or GUI applications that make use of the standard Microsoft
-Win32 API and/or the Cygwin API. As a result, it is possible to
-easily port many significant UNIX programs without the need for
-extensive changes to the source code.  This includes configuring and
-building most of the available GNU software (including the development
-tools included with the Cygwin distributions). Even if the
-compiler tools are of little to no use to you, you may have
-interest in the many standard UNIX utilities. They can be used both
-from the bash shell (provided) or from the command.com.</para>
-
-</sect1>
-
-<sect1 id="are-free"><title>Are the Cygwin tools free software?</title>
-
-<para>Yes. Parts are GNU software (gcc, gas, ld, etc...), parts are
-covered by the standard X11 license, some of it is public domain,
-some of it was written by Red Hat and placed under the GPL. None of it
-is shareware. You don't have to pay anyone to use it but you should be
-sure to read the copyright section of the FAQ for more information on
-how the GNU General Public License may affect your use of these
-tools. If you intend to port a proprietary application using the Cygwin
-library, you may want the Cygwin proprietary-use license.
-For more information about the proprietary-use license, please go to
-<ulink URL="http://www.redhat.com/software/tools/cygwin/">http://www.redhat.com/software/tools/cygwin/
-</ulink>.  Customers of the native Win32 GNUPro should feel free to submit bug
-reports and ask questions through the normal channels.  All other
-questions should be sent to the project mailing list
-<email>cygwin@cygwin.com</email>.</para>
-
-</sect1>
-
-<sect1 id="brief-history"><title>A brief history of the Cygwin project</title>
-
-<para>The first thing done was to enhance the development tools (gcc,
-gdb, gas, et al) so that they could generate/interpret Win32 native
-object files.</para>
-
-<para>The next task was to port the tools to Win NT/9x. We could have
-done this by rewriting large portions of the source to work within the
-context of the Win32 API. But this would have meant spending a huge
-amount of time on each and every tool. Instead, we took a
-substantially different approach by writing a shared library
-(the Cygwin DLL) that adds the necessary UNIX-like functionality
-missing from the Win32 API (fork, spawn, signals, select, sockets,
-etc.).  We call this new interface the Cygwin API. Once written, it
-was possible to build working Win32 tools using UNIX-hosted
-cross-compilers, linking against this library.</para>
-
-<para>From this point, we pursued the goal of producing native tools
-capable of rebuilding themselves under Windows 9x and NT (this is
-often called self-hosting). Since neither OS ships with standard UNIX
-user tools (fileutils, textutils, bash, etc...), we had to get the GNU
-equivalents working with the Cygwin API. Most of these tools were
-previously only built natively so we had to modify their configure
-scripts to be compatible with cross-compilation. Other than the
-configuration changes, very few source-level changes had to be
-made. Running bash with the development tools and user tools in place,
-Windows 9x and NT look like a flavor of UNIX from the perspective of
-the GNU configure mechanism. Self hosting was achieved as of the beta
-17.1 release.</para>
-
-</sect1>
-
-DOCTOOL-INSERT-ov-ex-unix
-DOCTOOL-INSERT-ov-ex-win
-<sect1 id="highlights"><title>Highlights of Cygwin Functionality</title>
-DOCTOOL-INSERT-ov-hi-intro
-DOCTOOL-INSERT-ov-hi-win9xnt
-DOCTOOL-INSERT-ov-hi-perm
-DOCTOOL-INSERT-ov-hi-files
-DOCTOOL-INSERT-ov-hi-textvsbinary
-DOCTOOL-INSERT-ov-hi-ansiclib
-DOCTOOL-INSERT-ov-hi-process
-DOCTOOL-INSERT-ov-hi-signals
-DOCTOOL-INSERT-ov-hi-sockets
-DOCTOOL-INSERT-ov-hi-select
-</sect1>
-</chapter>
diff --git a/winsup/doc/overview2.sgml b/winsup/doc/overview2.sgml
deleted file mode 100644
index 04b6b35e7..000000000
--- a/winsup/doc/overview2.sgml
+++ /dev/null
@@ -1,320 +0,0 @@
-<sect1 id="ov-ex-unix"><title>Expectations for UNIX Programmers</title>
-
-<para>Developers coming from a UNIX background will find a set of utilities
-they are already comfortable using, including a working UNIX shell.  The
-compiler tools are the standard GNU compilers most people will have previously
-used under UNIX, only ported to the Windows host.  Programmers wishing to port
-UNIX software to Windows NT or 9x will find that the Cygwin library provides
-an easy way to port many UNIX packages, with only minimal source code
-changes.</para>
-</sect1>
-
-<sect1 id="ov-ex-win"><title>Expectations for Windows Programmers</title>
-<para>Developers coming from a Windows background will find a set of tools capable
-of writing console or GUI executables that rely on the Microsoft Win32 API.
-The linker and dlltool utility may be used to write Windows Dynamically Linked
-Libraries (DLLs).  The resource compiler "windres" is also provided with the
-native Windows GNUPro tools.  All tools may be used from the Microsoft command
-line prompt, with full support for normal Windows pathnames.</para>
-</sect1>
-
-<sect2 id="ov-hi-intro"><title>Introduction</title> <para>When a binary linked
-against the library is executed, the Cygwin DLL is loaded into the
-application's text segment.  Because we are trying to emulate a UNIX kernel
-which needs access to all processes running under it, the first Cygwin DLL to
-run creates shared memory areas that other processes using separate instances
-of the DLL can access.  This is used to keep track of open file descriptors and
-assist fork and exec, among other purposes.  In addition to the shared memory
-regions, every process also has a per_process structure that contains
-information such as process id, user id, signal masks, and other similar
-process-specific information.</para>
-
-<para>The DLL is implemented using the Win32 API, which allows it to run on all
-Win32 hosts.  Because processes run under the standard Win32 subsystem, they
-can access both the UNIX compatibility calls provided by Cygwin as well as
-any of the Win32 API calls.  This gives the programmer complete flexibility in
-designing the structure of their program in terms of the APIs used.  For
-example, they could write a Win32-specific GUI using Win32 API calls on top of
-a UNIX back-end that uses Cygwin.</para>
-
-<para>Early on in the development process, we made the important design
-decision that it would not be necessary to strictly adhere to existing UNIX
-standards like POSIX.1 if it was not possible or if it would significantly
-diminish the usability of the tools on the Win32 platform.  In many cases, an
-environment variable can be set to override the default behavior and force
-standards compliance.</para>
-</sect2>
-
-<sect2 id="ov-hi-win9xnt"><title>Supporting both Windows NT and 9x</title>
-<para>While Windows 95 and Windows 98 are similar enough to each other that we
-can safely ignore the distinction when implementing Cygwin, Windows NT is an
-extremely different operating system.  For this reason, whenever the DLL is
-loaded, the library checks which operating system is active so that it can act
-accordingly.</para>
-
-<para>In some cases, the Win32 API is only different for
-historical reasons.  In this situation, the same basic functionality is
-available under Windows 9x and NT but the method used to gain this
-functionality differs.  A trivial example: in our implementation of
-uname, the library examines the sysinfo.dwProcessorType structure
-member to figure out the processor type under Windows 9x.  This field
-is not supported in NT, which has its own operating system-specific
-structure member called sysinfo.wProcessorLevel.</para>
-
-<para>Other differences between NT and 9x are much more fundamental in
-nature.  The best example is that only NT provides a security model.</para>
-</sect2>
-
-<sect2 id="ov-hi-perm"><title>Permissions and Security</title>
-<para>Windows NT includes a sophisticated security model based on Access
-Control Lists (ACLs).  Cygwin maps Win32 file ownership and permissions to the
-more standard, older UNIX model by default.  Cygwin version 1.1 introduces
-support for ACLs according to the system calls used on newer versions of
-Solaris. This ability is used when the `ntsec' feature is switched on which
-is described in another chapter.
-The chmod call maps UNIX-style permissions
-back to the Win32 equivalents.  Because many programs expect to be able to find
-the /etc/passwd and /etc/group files, we provide utilities that can be used to
-construct them from the user and group information provided by the operating
-system.</para>
-
-<para>Under Windows NT, the administrator is permitted to chown files.  There
-is no mechanism to support the setuid concept or API call since Cygwin version
-1.1.2.  With version 1.1.3 Cygwin introduces a mechanism for setting real
-and effective UIDs under Windows NT/W2K. This is described in the ntsec
-section.</para>
-
-<para>Under Windows 9x, the situation is considerably different.  Since a
-security model is not provided, Cygwin fakes file ownership by making all
-files look like they are owned by a default user and group id.  As under NT,
-file permissions can still be determined by examining their read/write/execute
-status.  Rather than return an unimplemented error, under Windows 9x, the
-chown call succeeds immediately without actually performing any action
-whatsoever.  This is appropriate since essentially all users jointly own the
-files when no concept of file ownership exists.</para>
-
-<para>It is important that we discuss the implications of our "kernel" using
-shared memory areas to store information about Cygwin processes.  Because
-these areas are not yet protected in any way, in principle a malicious user
-could modify them to cause unexpected behavior in Cygwin processes.  While
-this is not a new problem under Windows 9x (because of the lack of operating
-system security), it does constitute a security hole under Windows NT.
-This is because one user could affect the Cygwin programs run by
-another user by changing the shared memory information in ways that
-they could not in a more typical WinNT program.  For this reason, it
-is not appropriate to use Cygwin in high-security applications.  In
-practice, this will not be a major problem for most uses of the
-library.</para>
-</sect2>
-
-<sect2 id="ov-hi-files"><title>File Access</title> <para>Cygwin supports
-both Win32- and POSIX-style paths, using either forward or back slashes as the
-directory delimiter.  Paths coming into the DLL are translated from Win32 to
-POSIX as needed.  As a result, the library believes that the file system is a
-POSIX-compliant one, translating paths back to Win32 paths whenever it calls a
-Win32 API function.  UNC pathnames (starting with two slashes) are
-supported.</para>
-
-<para>The layout of this POSIX view of the Windows file system space is stored
-in the Windows registry.  While the slash ('/') directory points to the system
-partition by default, this is easy to change with the Cygwin mount utility.
-In addition to selecting the slash partition, it allows mounting arbitrary
-Win32 paths into the POSIX file system space.  Many people use the utility to
-mount each drive letter under the slash partition (e.g. C:\ to /c, D:\ to /d,
-etc...).</para>
-
-<para>The library exports several Cygwin-specific functions that can be used
-by external programs to convert a path or path list from Win32 to POSIX or vice
-versa.  Shell scripts and Makefiles cannot call these functions directly.
-Instead, they can do the same path translations by executing the cygpath
-utility program that we provide with Cygwin.</para>
-
-<para>Win32 file systems are case preserving but case insensitive.  Cygwin
-does not currently support case distinction because, in practice, few UNIX
-programs actually rely on it.  While we could mangle file names to support case
-distinction, this would add unnecessary overhead to the library and make it
-more difficult for non-Cygwin applications to access those files.</para>
-
-<para>Symbolic links are emulated by files containing a magic cookie followed
-by the path to which the link points.  They are marked with the System
-attribute so that only files with that attribute have to be read to determine
-whether or not the file is a symbolic link.  Hard links are fully supported
-under Windows NT on NTFS file systems.  On a FAT file system, the call falls
-back to simply copying the file, a strategy that works in many cases.</para>
-
-<para>The inode number for a file is calculated by hashing its full Win32 path.
-The inode number generated by the stat call always matches the one returned in
-d_ino of the dirent structure.  It is worth noting that the number produced by
-this method is not guaranteed to be unique.  However, we have not found this to
-be a significant problem because of the low probability of generating a
-duplicate inode number.</para>
-
-<para>Chroot is supported since release 1.1.3. Note that chroot isn't
-supported native by Windows. This implies some restrictions. First of all,
-the chroot call isn't a privileged call. Each user may call it. Second, the
-chroot environment isn't safe against native windows processes. If you
-want to support a chroot environment as, for example, by allowing an
-anonymous ftp with restricted access, you'll have to care that only
-native Cygwin applications are accessible inside of the chroot environment.
-Since that applications are only using the Cygwin POSIX API to access the
-file system their access can be restricted as it is intended. This includes
-not only POSIX paths but Win32 paths (containing drive letter and/or
-backslashes) and CIFS paths (//server/share or \\server\share) as well.</para>
-</sect2>
-
-<sect2 id="ov-hi-textvsbinary"><title>Text Mode vs. Binary Mode</title>
-<para>Interoperability with other Win32 programs such as text editors was
-critical to the success of the port of the development tools.  Most Red Hat
-customers upgrading from the older DOS-hosted toolchains expected the new
-Win32-hosted ones to continue to work with their old development
-sources.</para>
-
-<para>Unfortunately, UNIX and Win32 use different end-of-line terminators in
-text files.  Consequently, carriage-return newlines have to be translated on
-the fly by Cygwin into a single newline when reading in text mode.</para>
-
-<para>This solution addresses the compatibility requirement at the expense of
-violating the POSIX standard that states that text and binary mode will be
-identical. Consequently, processes that attempt to lseek through text files can
-no longer rely on the number of bytes read as an accurate indicator of position
-in the file.  For this reason, the CYGWIN environment variable can be
-set to override this behavior.</para>
-</sect2>
-
-<sect2 id="ov-hi-ansiclib"><title>ANSI C Library</title>
-<para>We chose to include Red Hat's own existing ANSI C library
-"newlib" as part of the library, rather than write all of the lib C
-and math calls from scratch.  Newlib is a BSD-derived ANSI C library,
-previously only used by cross-compilers for embedded systems
-development.</para>
-
-<para>The reuse of existing free implementations of such things
-as the glob, regexp, and getopt libraries saved us considerable
-effort.  In addition, Cygwin uses Doug Lea's free malloc
-implementation that successfully balances speed and compactness.  The
-library accesses the malloc calls via an exported function pointer.
-This makes it possible for a Cygwin process to provide its own
-malloc if it so desires.</para>
-</sect2>
-
-<sect2 id="ov-hi-process"><title>Process Creation</title>
-<para>The fork call in Cygwin is particularly interesting because it
-does not map well on top of the Win32 API.  This makes it very
-difficult to implement correctly.  Currently, the Cygwin fork is a
-non-copy-on-write implementation similar to what was present in early
-flavors of UNIX.</para>
-
-<para>The first thing that happens when a parent process
-forks a child process is that the parent initializes a space in the
-Cygwin process table for the child.  It then creates a suspended
-child process using the Win32 CreateProcess call.  Next, the parent
-process calls setjmp to save its own context and sets a pointer to
-this in a Cygwin shared memory area (shared among all Cygwin
-tasks).  It then fills in the child's .data and .bss sections by
-copying from its own address space into the suspended child's address
-space.  After the child's address space is initialized, the child is
-run while the parent waits on a mutex.  The child discovers it has
-been forked and longjumps using the saved jump buffer.  The child then
-sets the mutex the parent is waiting on and blocks on another mutex.
-This is the signal for the parent to copy its stack and heap into the
-child, after which it releases the mutex the child is waiting on and
-returns from the fork call.  Finally, the child wakes from blocking on
-the last mutex, recreates any memory-mapped areas passed to it via the
-shared area, and returns from fork itself.</para>
-
-<para>While we have some
-ideas as to how to speed up our fork implementation by reducing the
-number of context switches between the parent and child process, fork
-will almost certainly always be inefficient under Win32.  Fortunately,
-in most circumstances the spawn family of calls provided by Cygwin
-can be substituted for a fork/exec pair with only a little effort.
-These calls map cleanly on top of the Win32 API.  As a result, they
-are much more efficient.  Changing the compiler's driver program to
-call spawn instead of fork was a trivial change and increased
-compilation speeds by twenty to thirty percent in our
-tests.</para>
-
-<para>However, spawn and exec present their own set of
-difficulties.  Because there is no way to do an actual exec under
-Win32, Cygwin has to invent its own Process IDs (PIDs).  As a
-result, when a process performs multiple exec calls, there will be
-multiple Windows PIDs associated with a single Cygwin PID.  In some
-cases, stubs of each of these Win32 processes may linger, waiting for
-their exec'd Cygwin process to exit.</para>
-</sect2>
-
-<sect2 id="ov-hi-signals"><title>Signals</title>
-<para>When
-a Cygwin process starts, the library starts a secondary thread for
-use in signal handling.  This thread waits for Windows events used to
-pass signals to the process.  When a process notices it has a signal,
-it scans its signal bitmask and handles the signal in the appropriate
-fashion.</para>
-
-<para>Several complications in the implementation arise from the
-fact that the signal handler operates in the same address space as the
-executing program.  The immediate consequence is that Cygwin system
-functions are interruptible unless special care is taken to avoid
-this.   We go to some lengths to prevent the sig_send function that
-sends signals from being interrupted.  In the case of a process
-sending a signal to another process, we place a mutex around sig_send
-such that sig_send will not be interrupted until it has completely
-finished sending the signal.</para>
-
-<para>In the case of a process sending
-itself a signal, we use a separate semaphore/event pair instead of the
-mutex.  sig_send starts by resetting the event and incrementing the
-semaphore that flags the signal handler to process the signal.  After
-the signal is processed, the signal handler signals the event that it
-is done.  This process keeps intraprocess signals synchronous, as
-required by POSIX.</para>
-
-<para>Most standard UNIX signals are provided.  Job
-control works as expected in shells that support
-it.</para>
-</sect2>
-
-<sect2 id="ov-hi-sockets"><title>Sockets</title>
-<para>Socket-related calls in Cygwin simply
-call the functions by the same name in Winsock, Microsoft's
-implementation of Berkeley sockets.  Only a few changes were needed to
-match the expected UNIX semantics - one of the most troublesome
-differences was that Winsock must be initialized before the first
-socket function is called.  As a result, Cygwin has to perform this
-initialization when appropriate.  In order to support sockets across
-fork calls, child processes initialize Winsock if any inherited file
-descriptor is a socket.</para>
-
-<para>Unfortunately, implicitly loading DLLs
-at process startup is usually a slow affair.  Because many processes
-do not use sockets, Cygwin explicitly loads the Winsock DLL the
-first time it calls the Winsock initialization routine.  This single
-change sped up GNU configure times by thirty
-percent.</para>
-</sect2>
-
-<sect2 id="ov-hi-select"><title>Select</title>
-<para>The UNIX select function is another
-call that does not map cleanly on top of the Win32 API.  Much to our
-dismay, we discovered that the Win32 select in Winsock only worked on
-socket handles.  Our implementation allows select to function normally
-when given different types of file descriptors (sockets, pipes,
-handles, and a custom /dev/windows Windows messages
-pseudo-device).</para>
-
-<para>Upon entry into the select function, the first
-operation is to sort the file descriptors into the different types.
-There are then two cases to consider.  The simple case is when at
-least one file descriptor is a type that is always known to be ready
-(such as a disk file).  In that case, select returns immediately as
-soon as it has polled each of the other types to see if they are
-ready.  The more complex case involves waiting for socket or pipe file
-descriptors to be ready.  This is accomplished by the main thread
-suspending itself, after starting one thread for each type of file
-descriptor present.  Each thread polls the file descriptors of its
-respective type with the appropriate Win32 API call.  As soon as a
-thread identifies a ready descriptor, that thread signals the main
-thread to wake up.  This case is now the same as the first one since
-we know at least one descriptor is ready.  So select returns, after
-polling all of the file descriptors one last time.</para>
-</sect2>
diff --git a/winsup/doc/pathnames.sgml b/winsup/doc/pathnames.sgml
deleted file mode 100644
index 13441e995..000000000
--- a/winsup/doc/pathnames.sgml
+++ /dev/null
@@ -1,317 +0,0 @@
-<sect1 id="using-pathnames"><title>Mapping path names</title>
-
-<sect2><title>Introduction</title>
-
-<para>Cygwin supports both Win32- and POSIX-style paths, where
-directory delimiters may be either forward or back slashes.  UNC
-pathnames (starting with two slashes and a network name) are also
-supported.</para>
-
-<para>POSIX operating systems (such as Linux) do not have the concept
-of drive letters.  Instead, all absolute paths begin with a
-slash (instead of a drive letter such as "c:") and all file systems
-appear as subdirectories (for example, you might buy a new disk and
-make it be the <filename>/disk2</filename> directory).</para>
-
-<para>Because many programs written to run on UNIX systems assume
-the existance of a single unified POSIX file system structure, Cygwin
-maintains a special internal POSIX view of the Win32 file system
-that allows these programs to successfully run under Windows.  Cygwin
-uses this mapping to translate between Win32 and POSIX paths as
-necessary.</para>
-
-</sect2>
-
-<sect2 id="mount-table"><title>The Cygwin Mount Table</title>
-
-<para>The <command>mount</command> utility program is used to
-to map Win32 drives and network shares into Cygwin's internal POSIX
-directory tree.  This is a similar concept to the typical UNIX mount
-program.  For those people coming from a Windows background, the
-<command>mount</command> utility is very similar to the old DOS
-<command>join</command>, in that it makes your drive letters appear as
-subdirectories somewhere else.</para>
-
-<para>The mapping is stored in the current user's Cygwin
-<FirstTerm>mount table</FirstTerm> in the Windows registry so that the
-information will be retrieved next time the user logs in.  Because it
-is sometimes desirable to have system-wide as well as user-specific
-mounts, there is also a system-wide mount table that all Cygwin users
-inherit.  The system-wide table may only be modified by a user with
-the appropriate priviledges (Administrator priviledges in Windows
-NT).</para>
-
-<para>The current user's table is located under
-"HKEY_CURRENT_USER/Software/Cygnus Solutions/Cygwin/mounts
-v&lt;version&gt;"
-where &lt;version&gt; is the latest registry version associated with
-the Cygwin library (this version is not the same as the release
-number).  The system-wide table is located under the same subkeys
-under HKEY_LOCAL_SYSTEM.</para>
-
-<para>By default, the POSIX root <filename>/</filename> points to the
-system partition but it can be relocated to any directory in the
-Windows file system using the <command>mount</command> command.
-Whenever Cygwin generates a POSIX path from a Win32 one, it uses the
-longest matching prefix in the mount table.  Thus, if
-<filename>C:</filename> is mounted as <filename>/c</filename> and also
-as <filename>/</filename>, then Cygwin would translate
-<filename>C:/foo/bar</filename> to <filename>/c/foo/bar</filename>.</para>
-
-<para>Invoking <command>mount</command> without any arguments displays
-Cygwin's current set of mount points.
-In the following example, the C
-drive is the POSIX root and D drive is mapped to
-<filename>/d</filename>.  Note that in this case, the root mount is a
-system-wide mount point that is visible to all users running Cygwin
-programs, whereas the <filename>/d</filename> mount is only visible
-to the current user.</para>
-
-<example>
-<title>Displaying the current set of mount points</title>
-<screen>
-<prompt>c:\&gt;</prompt> <userinput>mount</userinput>
-f:\cygwin\bin on /usr/bin type system (binmode)
-f:\cygwin\lib on /usr/lib type system (binmode)
-f:\cygwin on / type system (binmode)
-e:\src on /usr/src type system (binmode)
-c: on /cygdrive/c type user (binmode,noumount)
-e: on /cygdrive/e type user (binmode,noumount)
-</screen>
-</example>
-
-<para>You can also use the <command>mount</command> command to add
-new mount points, and the <command>umount</command> to delete
-them.  See <Xref Linkend="mount"> and <Xref Linkend="umount"> for more
-information on how to use these utilities to set up your Cygwin POSIX
-file system.</para>
-
-<para>Whenever Cygwin cannot use any of the existing mounts to convert
-from a particular Win32 path to a POSIX one, Cygwin will
-automatically default to an imaginary mount point under the default POSIX
-path <filename>/cygdrive</filename>.  For example, if Cygwin accesses
-<filename>Z:\foo</filename> and the Z drive is not currently in the
-mount table, then <filename>Z:\</filename> would be automatically
-converted to <filename>/cygdrive/Z</filename>.  The default
-prefix of <filename>/cygdrive</filename> may be changed (see the
-<Xref Linkend="mount"> for more information).</para>
-
-<para>It is possible to assign some special attributes to each mount
-point.  Automatically mounted partitions are displayed as "auto"
-mounts.  Mounts can also be marked as either "textmode" or "binmode"
--- whether text files are read in the same manner as binary files by
-default or not (see <Xref Linkend="using-textbinary"> for more
-information on text and binary modes.</para>
-
-</sect2>
-
-<sect2><title>Additional Path-related Information</title>
-
-<para>The <command>cygpath</command> program provides the ability to
-translate between Win32 and POSIX pathnames in shell scripts. See
-<Xref Linkend="cygpath"> for the details.</para>
-
-<para>The <EnVar>HOME</EnVar>, <EnVar>PATH</EnVar>, and
-<EnVar>LD_LIBRARY_PATH</EnVar> environment variables are automatically
-converted from Win32 format to POSIX format (e.g.  from
-<filename>c:\cygwin\bin</filename> to <filename>/bin</filename>, if
-there was a mount from that Win32 path to that POSIX path) when a Cygwin
-process first starts.</para>
-
-<para>Symbolic links can also be used to map Win32 pathnames to POSIX.
-For example, the command
-<command>ln -s //pollux/home/joe/data /data</command> would have about
-the same effect as creating a mount point from
-<filename>//pollux/home/joe/data</filename> to <filename>/data</filename>
-using <command>mount</command>, except that symbolic links cannot set
-the default file access mode.  Other differences are that the mapping is
-distributed throughout the file system and proceeds by iteratively
-walking the directory tree instead of matching the longest prefix in a
-kernel table.  Note that symbolic links will only work on network
-drives that are properly configured to support the "system" file
-attribute.  Many do not do so by default (the Unix Samba server does
-not by default, for example).</para>
-
-</sect2>
-
-</sect1>
-
-<sect1 id="using-specialnames"><title>Special filenames</title>
-
-<sect2> <title>DOS devices</title>
-
-<para>Windows filenames invalid under Windows are also invalid under
-Cygwin.  This means that base filenames such as 
-<filename>AUX</filename>, <filename>COM1</filename>,
-<filename>LPT1</filename> or <filename>PRN</filename> (to name a few)
-cannot be used in a regular Cygwin Windows or POSIX path, even with an
-extension (<filename>prn.txt</filename>). However the special names can be
-used as filename extensions (<filename>file.aux</filename>). You can use
-the special names as you would under DOS, for example you can print on your
-default printer with the command <command>cat filename > PRN</command>
-(make sure to end with a Form Feed).
-</para>
-
-</sect2>
-
-<sect2> <Title>POSIX devices</title>
-<para>There is no need to create a POSIX <filename>/dev</filename> 
-directory as it is simulated within Cygwin automatically.
-It supports the following devices: <filename>/dev/null</filename>,
-<filename>/dev/zero</filename>, <filename>/dev/tty</filename>,
-<filename>/dev/ttyX</filename>, <filename>/dev/ptmx</filename>,
-<filename>/dev/comX</filename> (the serial ports),
-<filename>/dev/windows</filename> (the windows message queue),
-<filename>/dev/random</filename> and <filename>/dev/urandom</filename>.
-These devices cannot be seen with the command <command>ls /dev</command>
-although commands such as <command>ls /dev/tty</command> work fine.
-</para>
-
-<para>Windows NT/W2K/XP additionally support raw devices like floppies,
-disks, partitions and tapes.  These are accessed from Cygwin applications
-using POSIX device names which are supported in two different ways.
-</para>
-
-<para>Up to Cygwin 1.3.3 the only way to access those devices was
-to mount the Win32 device names to a POSIX device name but this usage
-is discouraged since Cygwin 1.3.4 and only kept for backward compatibility.
-</para>
-
-<para>
-Beginning with Cygwin 1.3.4, raw devices are accessible by Cygwin processes
-using fixed POSIX device names.  These fixed POSIX device names are generated
-using a direct conversion from the POSIX namespace to the internal NT namespace.
-E.g. the first harddisk is the NT internal device \device\harddisk0\partition0
-or the first partition on the third harddisk is \device\harddisk2\partition1.
-The first floppy in the system is \device\floppy0, the first CD-ROM is
-\device\cdrom0 and the first tape drive is \device\tape0.
-</para>
-
-<para>The new fixed POSIX names are mapped to NT internal devices as
-follows:</para>
-
-<screen>
-/dev/st0	\device\tape0, rewind
-/dev/nst0	\device\tape0, no-rewind
-/dev/st1	\device\tape1
-...
-
-/dev/fd0	\device\floppy0
-/dev/fd1	\device\floppy1
-...
-
-/dev/scd0	\device\cdrom0
-/dev/scd1	\device\cdrom1
-...
-
-/dev/sda	\device\harddisk0\partition0	(whole disk)
-/dev/sda1	\device\harddisk0\partition1	(first partition)
-...
-/dev/sda15	\device\harddisk0\partition15	(fifteenth partition)
-
-/dev/sdb	\device\harddisk1\partition0
-/dev/sdb1	\device\harddisk1\partition1
-
-[up to]
-
-/dev/sdl	\device\harddisk11\partition0
-/dev/sdl1	\device\harddisk11\partition1
-...
-/dev/sdl15	\device\harddisk11\partition15
-</screen>
-
-<para>
-if you don't like these device names, feel free to create symbolic
-links as they are created on Linux systems for convenience:
-</para>
-
-<screen>
-ln -s /dev/scd0 /dev/cdrom
-ln -s /dev/scd2 /dev/sr2      # actually srX are real device nodes on Linux but who cares.
-ln -s /dev/nst0  /dev/tape
-...
-</screen>
-
-<para>
-Note that you can't use the mount table to map from fixed device name
-to your own device name or to map from internal NT device name to
-your own device name.  Also using symbolic links to map from the internal
-NT device name to your own device name will not do what you want.
-The following three examples will not work as expected:
-</para>
-
-<screen>
-mount -f -b /dev/nst0 /dev/tape
-mount -f -b /device/tape0 /dev/tape
-ln -s /device/tape0 /dev/tape
-</screen>
-
-</sect2>
-
-<sect2><title>The .exe extension</title>
-
-<para> Executable program filenames end with .exe but the .exe need
-not be included in the command, so that traditional UNIX names can be
-used.  However, for programs that end in ".bat" and ".com", you cannot
-omit the extension.
-</para>
-
-<para>As a side effect, the <command> ls filename</command> gives
-information about <filename>filename.exe</filename> if
-<filename>filename.exe</filename> exists and <filename>filename</filename>
-does not.  In the same situation the function call
-<function>stat("filename",..)</function> gives information about
-<filename>filename.exe</filename>.  The two files can be distinguished
-by examining their inodes, as demonstrated below.
-<screen>
-<prompt>C:\&gt;</prompt> <userinput>ls * </userinput>
-a      a.exe     b.exe
-<prompt>C:\&gt;</prompt> <userinput>ls -i a a.exe</userinput>
-445885548 a       435996602 a.exe
-<prompt>C:\&gt;</prompt> <userinput>ls -i b b.exe</userinput>
-432961010 b       432961010 b.exe
-</screen>
-If a shell script <filename>myprog</filename> and a program
-<filename>myprog.exe</filename> coexist in a directory, the program
-has precedence and is selected for execution of
-<command>myprog</command>.</para>
-
-<para>The <command>gcc</command> compiler produces an executable named
-<filename>filename.exe</filename> when asked to produce
-<filename>filename</filename>. This allows many makefiles written
-for UNIX systems to work well under Cygwin.</para>
-
-<para>Unfortunately, the <command>install</command> and
-<command>strip</command> commands do distinguish between
-<filename>filename</filename> and <filename>filename.exe</filename>. They
-fail when working on a non-existing <filename>filename</filename> even if
-<filename>filename.exe</filename> exists, thus breaking some makefiles.
-This problem can be solved by writing <command>install</command> and
-<command>strip</command> shell scripts to provide the extension ".exe"
-when needed.
-</para>
-</sect2>
-
-<sect2><title>The @pathnames</title> 
-<para>To circumvent the limitations on shell line length in the native
-Windows command shells, Cygwin programs expand their arguments
-starting with "@" in a special way.  If a file
-<filename>pathname</filename> exists, the argument
-<filename>@pathname</filename> expands recursively to the content of
-<filename>pathname</filename>. Double quotes can be used inside the
-file to delimit strings containing blank space. 
-Embedded double quotes must be repeated.
-In the following example compare the behaviors of the bash built-in
-<command>echo</command> and of the program <command>/bin/echo</command>.</para>
-
-<example><title> Using @pathname</title>
-<screen>
-<prompt>bash$</prompt> <userinput>echo  'This   is   "a     long"  line' > mylist</userinput>
-<prompt>bash$</prompt> <userinput>echo @mylist</userinput>
-@mylist
-<prompt>c:\&gt;</prompt> <userinput>c:\cygwin\bin\echo @mylist</userinput>
-This is a     long line
-</screen>
-</example>
-</sect2> 
-</sect1>
diff --git a/winsup/doc/programming.sgml b/winsup/doc/programming.sgml
deleted file mode 100644
index 45f26f4fa..000000000
--- a/winsup/doc/programming.sgml
+++ /dev/null
@@ -1,11 +0,0 @@
-<chapter id="programming"><title>Programming with Cygwin</title>
-
-DOCTOOL-INSERT-gcc
-
-DOCTOOL-INSERT-gdb
-
-DOCTOOL-INSERT-dll
-
-DOCTOOL-INSERT-windres
-
-</chapter>
diff --git a/winsup/doc/readme.texinfo b/winsup/doc/readme.texinfo
deleted file mode 100644
index bcd32a633..000000000
--- a/winsup/doc/readme.texinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-\input texinfo 
-@title The Cygwin README
-
-@subtitle (Only partially updated for the latest net release.)
-
-@setfilename readme.txt
-
-@include install.texinfo
-
-@chapter Release Information
-
-@strong{(Please note: This section has not yet been updated for the latest
-net release.)}
-
-@include changes.texinfo
-
-@include relnotes.texinfo
diff --git a/winsup/doc/relnotes.texinfo b/winsup/doc/relnotes.texinfo
deleted file mode 100644
index f18c591d6..000000000
--- a/winsup/doc/relnotes.texinfo
+++ /dev/null
@@ -1,24 +0,0 @@
-@chapter Known Problems in the Latest Net Release
-
-@section Aware of the problem, no solution known.
-
-@subsection Pipe key (@samp{|}) doesn't work on non-US keyboards in Win9x/ME
-
-This might get fixed someday, but meanwhile, just use rxvt, which does
-not have this problem.  This is no real loss, because rxvt has many
-other advantages.  (Do not attempt to use the "broken" pipe key
-(@samp{�}) as a substitute, it is a different character.)
-
-@subsection Cannot access tape devices with mt on Win9x
-
-Win9x does not support the API used by the Cygwin fhandler_dev_tape
-class.  Details at
-@file{http://sources.redhat.com/ml/cygwin/2000-12/msg00331.html}.
-
-@subsection On Win9x, scp leaves ssh processes running.
-
-@section Fixed in the Next Release
-
-(Nothing to report.)
-
-
diff --git a/winsup/doc/setup-net.sgml b/winsup/doc/setup-net.sgml
deleted file mode 100644
index c9b692712..000000000
--- a/winsup/doc/setup-net.sgml
+++ /dev/null
@@ -1,240 +0,0 @@
-<chapter id="setup-net"><title>Setting Up Cygwin</title>
-
-<sect1><title>Internet Setup</title>
-<para>To install the Cygwin net release, go to <ulink
-URL="http://cygwin.com/">http://cygwin.com/</ulink> and click on <ulink
-URL="http://cygwin.com/">"Install Cygwin Now!"</ulink>.  This will
-download a GUI installer called <command>setup.exe</command> which can
-be run to download a complete cygwin installation via the internet.
-Follow the instructions on each screen to install Cygwin.
-</para>
-
-<para>
-The <command>setup.exe</command> installer is designed to be easy
-for new users to understand while remaining flexible for the 
-experienced. The volunteer development team is constantly working
-on <command>setup.exe</command>; before requesting a new feature,
-check the wishlist in the <ulink URL="http://sources.redhat.com/cgi-bin/cvsweb.cgi/setup/README?cvsroot=cygwin-apps&amp;rev=2">CVS <literal>README</literal>
-</ulink>. It may already be present in the CVS version!
-</para>
-
-<para>
-Since the default value for each option is the logical choice for
-most installations, you can get a working minimal Cygwin environment
-installed by simply clicking the <literal>Next</literal> button
-at each page. The only exception to this is choosing a Cygwin mirror,
-which you can choose by experimenting with those listed at
-<ulink URL="http://cygwin.com/mirrors.html">
-http://cygwin.com/mirrors.html
-</ulink>. For more details about each of page of the 
-<command>setup.exe</command> installation, read on below.
-Please note that this guide assumes that you have a basic understanding
-of Unix (or a Unix-like OS). If you are new to Unix, you will also want 
-to make use of <ulink URL="http://www.google.com/search?q=new+to+unix">
-other resources</ulink>.
-</para>
-
-<sect2><title>Download Source</title>
-<para>
-Cygwin uses packages to manage installing various software. When
-the default <literal>Install from Internet</literal> option is chosen,
-<command>setup.exe</command> creates a local directory to store
-the packages before actually installing the contents. 
-<literal>Download from Internet</literal> performs only the first
-part (storing the packages locally), while 
-<literal>Install from Local Directory</literal> performs only the 
-second (installing the contents of the packages). 
-</para>
-<para>
-The <literal>Download from Internet</literal> option is mainly
-for creating a base Cygwin package tree on one computer for 
-installation on several machines with 
-<literal>Install from Local Directory</literal>; copy the
-entire local package tree to another machine with the directory
-tree intact. For example, you might create a <literal>C:\cache\</literal>
-directory and place <command>setup.exe</command> in it. Run 
-<command>setup.exe</command> to <literal>Install from Internet</literal>
-or <literal>Download from Internet</literal>, then copy the whole
-<literal>C:\cache\</literal> to each machine and instead choose
-<literal>Install from Local Directory</literal>. Unfortunately
-<command>setup.exe</command> does not yet support unattended installs.
-</para>
-<para>
-Though this provides some basic mirroring functionality, if you
-are managing a wide Cygwin installation, to keep up to date we recommend 
-using a mirroring tool such as <command>wget</command>. A helpful user on 
-the Cygwin mailing list created a simple demonstration script to accomplish
-this; search the list for <command>mkcygwget</command> for ideas.
-</para>
-</sect2>
-
-<sect2><title>Selecting an Install Directory</title>
-<para>
-The <literal>Root Directory</literal> for Cygwin (default
-<literal>C:\cygwin</literal>) will become <literal>/</literal> 
-within your Cygwin installation. You must have write access to
-the parent directory, and any ACLs on the parent directory will
-determine access to installed files.
-</para>
-<para>
-The <literal>Install For</literal> options of <literal>All Users</literal> 
-or <literal>Just Me</literal> should always be left on the default
-<literal>All Users</literal>, unless you do not have write access to 
-<literal>HKEY_LOCAL_MACHINE</literal> in the registry or the All Users 
-Start Menu. This is true  even if you are the only user planning to use Cygwin 
-on the machine.  Selecting <literal>Just Me</literal> will cause problems 
-for programs such as <command>crond</command> and <command>sshd</command>.
-If you do not have the necessary permissions, but still want to use these
-programs, consult the Cygwin mailing list archives about others' experiences.
-
-</para>
-<para>
-The <literal>Default Text File Type</literal> should be left on
-<literal>Unix</literal> (that is, <literal>\n</literal>) unless you
-have a very good reason to switch it to 
-<literal>DOS</literal> (that is, <literal>\r\n</literal>).
-</para>
-</sect2>
-
-<sect2><title>Local Package Directory</title>
-<para>
-The <literal>Local Package Directory</literal> is the cache where 
-<command>setup.exe</command> stores the packages before they are
-installed. The cache must not be the same folder as the Cygwin
-root. Within the cache, a separate directory is created for each
-Cygwin mirror, which allows <command>setup.exe</command> to use 
-multiple mirrors and custom packages. After installing Cygwin,
-the cache is no longer necessary, but you may want to retain the
-packages as backups, for installing Cygwin to another system,
-or in case you need to reinstall a package.
-</para>
-
-<sect2><title>Connection Method</title>
-<para>
-The <literal>Direct Connection</literal> method of downloading will 
-directly download the packages, while the IE5 method will leverage your 
-IE5 cache for performance. If your organisation uses a proxy server or
-auto-configuration scripts, the IE5 method also uses these settings.
-If you have a proxy server, you can manually type it into 
-the <literal>Use Proxy</literal> section. Unfortunately, 
-<command>setup.exe</command> does not currently support password
-authorization for proxy servers.
-</para>
-</sect2>
-
-<sect2><title>Choosing Mirrors</title>
-<para>
-Since there is no way of knowing from where you will be downloading
-Cygwin, you need to choose at least one mirror site.  Cygwin mirrors 
-are geographically distributed around the world; check the list at <ulink 
-URL="http://cygwin.com/mirrors.html">http://cygwin.com/mirrors.html</ulink>
-to find one near you. You can select multiple mirrors by holding down
-<literal>CTRL</literal> and clicking on each one. If you have the URL of 
-an unlisted mirror (for example, if your organization has an internal Cygwin 
-mirror) you can add it.
-</para>
-</sect2>
-
-<sect2><title>Choosing Packages</title>
-<para>
-For each selected mirror site, <command>setup.exe</command> downloads a 
-small text file called <literal>setup.bz2</literal> that contains a list
-of packages available from that site along with some basic information about
-each package which <command>setup.exe</command> parses and uses to create the 
-chooser window. For details about the format of this file, see
-<ulink URL="http://sources.redhat.com/cygwin-apps/setup.html#setup.ini">
-http://sources.redhat.com/cygwin-apps/setup.html</ulink>.
-</para>
-<para>
-The chooser is the most complex part of <command>setup.exe</command>. 
-Packages are grouped into categories, and one package may belong to multiple 
-categories (assigned by the volunteer package maintainer). Each package
-can be found under any of those categories in the heirarchial chooser view.
-By default <command>setup.exe</command>
-will install only the packages in the <literal>Base</literal> category
-and their dependencies, resulting in a minimal Cygwin installation.
-However, this will not include many commonly used tools such as 
-<command>gcc</command> (which you will find in the <literal>Devel</literal> 
-category). 
-</para>
-<para>
-You can change <command>setup.exe</command>'s view style, which is helpful
-if you know the name of a package you want to install but not which 
-category it is in. 
-Click on the <literal>View</literal> button and it will rotate between 
-<literal>Category</literal> (the default), <literal>Full</literal> (all 
-packages), and <literal>Partial</literal> (only packages to be upgraded).
-If you are familiar with Unix, you will probably want to at least glance 
-through the <literal>Full</literal> listing for your favorite tools.
-</para>
-<para>
-Once you have an existing Cygwin installation, the <command>setup.exe</command>
-chooser is also used to manage your Cygwin installation. 
-Information on installed packages is kept in the
-<literal>/etc/setup/</literal> directory of your Cygwin installation; if 
-<command>setup.exe</command> cannot find this directory it will act just like
-you had no Cygwin installation.  If <command>setup.exe</command>
-finds a newer version of an installed package available, it will automatically 
-mark it to be upgraded. 
-To <literal>Uninstall</literal>, <literal>Reinstall</literal>, or get the
-<literal>Source</literal> for an existing package, click on 
-<literal>Keep</literal> to toggle it. 
-Also, to avoid the need to reboot after upgrading, make sure
-to close all Cygwin windows and stop all Cygwin processes before 
-<command>setup.exe</command> begins to install the upgraded package.
-</para>
-<para>
-The final feature of the <command>setup.exe</command> chooser is for
-<literal>Previous</literal> and <literal>Experimental</literal> packages.
-By default the chooser shows only the current version of each package,
-though mirrors have at least one previous version and occasionally there
-is a testing or beta version of a package available. To see these package,
-click on the <literal>Prev</literal> or <literal>Exp</literal> radio button.
-Be warned, however, that the next time you run <command>setup.exe</command> 
-it will try to replace old or experimental versions with the latest. 
-</para>
-</sect2>
-
-<sect2><title>Download and Installation Progress</title>
-<para>
-First, <command>setup.exe</command> will download all selected packages
-to the local directory chosen earlier. Before installing, 
-<command>setup.exe</command> performs a checksum on each package. If the
-local directory is a slow medium (such as a network drive) this can take
-a long time. During the download and installation, <command>setup.exe</command>
-show progress bars for the current task and total remaining disk space.
-</para>
-</sect2>
-
-<sect2><title>Icons</title>
-<para>
-You may choose to install shortcuts on the Desktop and/or Start Menu
-to start a <literal>bash</literal> shell. If you prefer to use a different
-shell or the native Windows version of <literal>rxvt</literal>, you can
-use these shortcuts as a guide to creating your own. 
-</para>
-</sect2>
-
-<sect2><title>Post-Install Scripts</title>
-<para>
-Last of all, <command>setup.exe</command> will run any post-install
-scripts to finish correctly setting up installed packages. Since each
-script is run separately, several windows may pop up. If you are 
-interested in what is being done, see the Cygwin Package Contributor's
-Guide at <ulink 
-URL="http://cygwin.com/setup.html">http://cygwin.com/setup.html</ulink>
-When the last post-install script is completed, <command>setup.exe</command> 
-will display a box announcing the completion. A few packages, such as
-the OpenSSH server, require some manual site-specific configuration. 
-Relevant documentation can be found in the <literal>/usr/doc/Cygwin/</literal> 
-directory.
-</para>
-</sect2>
-
-</sect1>
-
-DOCTOOL-INSERT-setup-env
-DOCTOOL-INSERT-setup-maxmem
-DOCTOOL-INSERT-ntsec
-DOCTOOL-INSERT-setup-files
-</chapter>
diff --git a/winsup/doc/setup.sgml b/winsup/doc/setup.sgml
deleted file mode 100644
index 1ba28abb5..000000000
--- a/winsup/doc/setup.sgml
+++ /dev/null
@@ -1,47 +0,0 @@
-<chapter id="setup"><title>Setting Up Cygwin</title>
-
-<sect1><title>Cygwin Contents</title>
-
-<para>The following packages are included in the native Win32
-release of GNUPro:</para>
-
-<para>GNUPro development tools: binutils, bison, byacc, dejagnu,
-diff, expect, flex, gas, gcc, gdb, itcl, ld, libstdc++, make, patch,
-tcl, tix, tk</para>
-
-<para>GNUPro unsupported tools: ash, bash, bzip2, diff, fileutils,
-findutils, gawk, grep, gzip, m4, sed, shellutils, tar, textutils,
-time</para>
-
-</sect1>
-
-<sect1 id="installing-binaries"><title>Installing the binary release</title>
-
-<para>Load the GNUPro CD-ROM and run the installer.  It will
-take you through the installation process, starting with asking for
-your install location.  Once the installation is complete, there will
-be a new Program Files folder that you can use to obtain a shell
-from which you can run the tools.</para>
-
-<para>There are two remaining thing you should do from this
-prompt. First, you need to type <command>mkdir -p /tmp</command> to
-ensure that a temp directory exists for programs that expect to find
-one there.</para>
-
-<para>Second, depending on how you intend to use the tools, various
-programs may need to be able to find `/bin/sh'. You should `mkdir -p
-/bin' and put a copy of `sh.exe' there, removing the older version, if
-present.  Note that you can use the `mount' utility to select which
-drive letter is mounted as `/'.</para>
-
-<para>If you should ever want to uninstall the tools, you may do so
-via the "Add/Remove Programs" control panel.</para>
-
-</sect1>
-
-DOCTOOL-INSERT-setup-dir
-DOCTOOL-INSERT-setup-env
-DOCTOOL-INSERT-ntsec
-DOCTOOL-INSERT-setup-reg
-DOCTOOL-INSERT-setup-mount
-</chapter>
diff --git a/winsup/doc/setup2.sgml b/winsup/doc/setup2.sgml
deleted file mode 100644
index 592a25dc2..000000000
--- a/winsup/doc/setup2.sgml
+++ /dev/null
@@ -1,201 +0,0 @@
-<sect1 id="setup-env"><title>Environment Variables</title>
-
-<para>
-Before starting bash, you may set some environment variables.  A .bat
-file is provided where the most important ones are set before bash in
-launched.  This is the safest way to launch bash initially.  The .bat
-file is installed in the root directory that you specified during setup
-and pointed to in the Start Menu under the "Cygwin" option.  You can
-edit it this file your liking.</para>
-
-<para>
-The <envar>CYGWIN</envar> variable is used to configure many global
-settings for the Cygwin runtime system.  Initially you can leave
-<envar>CYGWIN</envar> unset or set it to <literal>tty</literal> (e.g.
-to support job control with ^Z etc...) using a syntax like this in the
-DOS shell, before launching bash.  </para>
-
-<screen>
-<prompt>C:\&gt;</prompt> <userinput>set CYGWIN=tty notitle glob</userinput>
-</screen>
-
-<para>
-The <envar>PATH</envar> environment variable is used by Cygwin
-applications as a list of directories to search for executable files
-to run.  This environment variable is converted from Windows format
-(e.g. <filename>C:\WinNT\system32;C:\WinNT</filename>) to UNIX format
-(e.g., <filename>/WinNT/system32:/WinNT</filename>) when a Cygwin
-process first starts.
-Set it so that it contains at least the <filename>x:\cygwin\bin</filename>
-directory where "<filename>x:\cygwin</filename> is the "root" of your
-cygwin installation if you wish to use cygwin tools outside of bash.
-</para>
-
-<para> 
-The <envar>HOME</envar> environment variable is used by many programs to
-determine the location of your home directory and we recommend that it be
-defined.  This environment variable is also converted from Windows format
-when a Cygwin process first starts.  Set it to point to your home directory
-before launching bash. 
-</para>
-
-<para>
-The <envar>TERM</envar> environment variable specifies your terminal
-type.  It is automatically set to <literal>cygwin</literal> if you have
-not set it to something else.
-</para>
-
-<para>The <envar>LD_LIBRARY_PATH</envar> environment variable is used by
-the Cygwin function <function>dlopen ()</function> as a list of
-directories to search for .dll files to load.  This environment variable
-is converted from Windows format to UNIX format when a Cygwin process
-first starts.  Most Cygwin applications do not make use of the
-<function>dlopen ()</function> call and do not need this variable.
-</para>
-
-</sect1>
-
-<sect1 id="setup-maxmem"><title>Changing Cygwin's Maximum Memory</title>
-
-<para>
-By default no Cygwin program can allocate more than 384 MB of memory 
-(program+data).  You should not need to change this default in most 
-circumstances.  However, if you need to use more real or virtual memory in 
-your machine you may add an entry in the either the 
-<literal>HKEY_LOCAL_MACHINE</literal> (to change the limit for all users) or 
-<literal>HKEY_CURRENT_USER</literal> (for just the current user) section of 
-the registry. 
-</para>
-
-<para>
-Add the <literal>DWORD</literal> value <literal>heap_chunk_in_mb</literal> 
-and set it to the desired memory limit in decimal MB. It is preferred to do 
-this in Cygwin using the <command>regtool</command> program included in the 
-Cygwin package.
-(For more information about <command>regtool</command> or the other Cygwin 
-utilities, see <Xref Linkend="using-utils"> or use each the
-<literal>--help</literal> option of each util.)  You should always be careful 
-when using <command>regtool</command> since damaging your system registry can 
-result in an unusable system.  This example sets memory limit to 1024 MB:
-
-<screen>
-regtool -i set /HKLM/Software/Cygnus\ Solutions/Cygwin/heap_chunk_in_mb 1024
-regtool -v list /HKLM/Software/Cygnus\ Solutions/Cygwin
-</screen>
-</para>
-
-<para>
-Exit all running Cygwin processes and restart them. Memory can be allocated up 
-to the size of the system swap space minus any the size of any running 
-processes. The system swap should be at least as large as the physically 
-installed RAM and can be modified under the System category of the 
-Control Panel.  
-</para>
-
-<para>
-Here is a small program written by DJ Delorie that tests the 
-memory allocation limit on your system:
-
-<screen>
-main()
-{
-  unsigned int bit=0x40000000, sum=0;
-  char *x;
-  
-  while (bit > 4096) 
-  {
-    x = malloc(bit);
-    if (x)
-    sum += bit;
-    bit >>= 1;
-  }
-  printf("%08x bytes (%.1fMb)\n", sum, sum/1024.0/1024.0);
-  return 0;
-}
-</screen>
-
-You can compile this program using:
-<screen>
-gcc max_memory.c -o max_memory.exe
-</screen>
-
-Run the program and it will output the maximum amount of allocatable memory.
-</para>
-</sect1>
-
-<sect1 id="setup-files"><title>Customizing bash</title>
-
-<para>
-To set bash up so that cut and paste work properly, click on the
-"Properties" button of the window, then on the "Misc" tab.  Make sure
-that "Quick Edit" is checked and "Fast Pasting" isn't.  These settings
-will be remembered next time you run bash from that
-shortcut. Similarly you can set the working directory inside the
-"Program" tab. The entry "%HOME%" is valid.
-</para>
-
-<para>
-Your home directory should contain three initialization files
-that control the behavior of bash.  They are
-<filename>.profile</filename>, <filename>.bashrc</filename> and
-<filename>.inputrc</filename>.  These initialization files will only
-be read if <envar>HOME</envar> is defined before starting bash.
-</para>
-
-<para>
-<filename>.profile</filename> (other names are also valid, see the bash man
-page) contains bash commands.  It is executed when bash is started as login
-shell, e.g. from the command <command>bash --login</command> (the provided
-.bat file does not set the switch).  This is a useful place to define and
-export environment variables and bash functions that will be used by bash
-and the programs invoked by bash.  It is a good place to redefine
-<envar>PATH</envar> if needed.  We recommend adding a ":." to the end of
-<envar>PATH</envar> to also search the current working directory (contrary
-to DOS, the local directory is not searched by default).  Also to avoid
-delays you should either <command>unset</command> <envar>MAILCHECK</envar> 
-or define <envar>MAILPATH</envar> to point to your existing mail inbox.
-</para>
-
-<para>
-<filename>.bashrc</filename> is similar to
-<filename>.profile</filename> but is executed each time an interactive
-bash shell is launched.  It serves to define elements that are not
-inherited through the environment, such as aliases. If you do not use
-login shells, you may want to put the contents of
-<filename>.profile</filename> as discussed above in this file
-instead.
-</para>
-
-<para>
-<screen>
-shopt -s nocaseglob
-</screen>
-will allow bash to glob filenames in a case-insensitive manner.
-Note that <filename>.bashrc</filename> is not called automatically for login 
-shells. You can source it from <filename>.profile</filename>.
-</para>
-
-<para>
-<filename>.inputrc</filename> controls how programs using the readline
-library (including bash) behave.  It is loaded automatically.  The
-full details are in the <filename>readline.info</filename>. 
-Due to a bug in the current readline version, 
-<filename>.inputrc</filename> cannot contain \r,
-even on text mounted systems.
-Consider the following settings:
-<screen>
-# Make Bash 8bit clean
-set meta-flag on
-set convert-meta off
-set output-meta on
-# Ignore case while completing
-set completion-ignore-case on
-</screen>
-The first three commands allow bash to display 8-bit characters,
-useful for languages with accented characters.  The last line makes
-filename completion case insensitive, which can be convenient in a
-Windows environment.
-</para>
-
-</sect1>
-
diff --git a/winsup/doc/textbinary.sgml b/winsup/doc/textbinary.sgml
deleted file mode 100644
index a58bd0231..000000000
--- a/winsup/doc/textbinary.sgml
+++ /dev/null
@@ -1,181 +0,0 @@
-<sect1 id="using-textbinary"><title>Text and Binary modes</title>
-
-<sect2> <title>The Issue</title>
-
-<para>On a UNIX system, when an application reads from a file it gets
-exactly what's in the file on disk and the converse is true for writing.
-The situation is different in the DOS/Windows world where a file can
-be opened in one of two modes, binary or text.  In the binary mode the
-system behaves exactly as in UNIX.  However in text mode there are
-major differences:</para>
-<OrderedList Numeration="Loweralpha" Spacing="Compact">
-<listitem>
-<para>
-On writing in text mode, a NL (\n, ^J) is transformed into the 
-sequence CR (\r, ^M) NL.</para>
-</listitem>
-<listitem>
-<para>
-On reading in text mode, a CR followed by an NL is deleted and a ^Z
-character signals the end of file.</para>
-</listitem>
-</OrderedList>
-
-<para>This can wreak havoc with the seek/fseek calls since the number
-of bytes actually in the file may differ from that seen by the
-application.</para>
-
-<para>The mode can be specified explicitly as explained in the Programming
-section below.  In an ideal DOS/Windows world, all programs using lines as
-records (such as <command>bash</command>, <command>make</command>,
-<command>sed</command> ...) would open files (and change the mode of their
-standard input and output) as text.  All other programs (such as
-<command>cat</command>, <command>cmp</command>, <command>tr</command> ...)
-would use binary mode.  In practice with Cygwin, programs that deal
-explicitly with object files specify binary mode (this is the case of
-<command>od</command>, which is helpful to diagnose CR problems).  Most
-other programs (such as <command>cat</command>, <command>cmp</command>,
-<command>tr</command>) use the default mode.</para>
-
-</sect2>
-
-<sect2><title>The default Cygwin behavior</title>
-
-<para>The Cygwin system gives us some flexibility in deciding how files 
-are to be opened when the mode is not specified explicitly. 
-The rules are evolving, this section gives the design goals.</para>
-<OrderedList Numeration="Loweralpha">
-<listitem>
-<para>If the file appears to reside on a file system that is mounted
-(i.e. if its pathname starts with a directory displayed by
-<command>mount</command>), then the default is specified by the mount
-flag. If the file is a symbolic link, the mode of the target file system
-applies.</para>
-</listitem>
-<listitem>
-<para>If the file appears to reside on a file system that is not mounted
-(as can happen when the path contains a drive letter), the default is text.
-</para>
-</listitem>
-<listitem>
-<para>Pipes and non-file devices are opened in binary mode,
-except if the <EnVar>CYGWIN</EnVar> environment variable contains
-<literal>nobinmode</literal>.</para>
-<warning><Title>Warning!</Title><para>In b20.1 of 12/98, a file will be opened
-in binary mode if any of the following conditions hold:</para> 
-<OrderedList Numeration="arabic" Spacing="Compact">
-<listitem><para>binary mode is specified in the open call</para>
-</listitem>
-<listitem><para><envar>CYGWIN</envar> contains <literal>binmode</literal></para>
-</listitem>
-<listitem><para>the file resides in a binary mounted partition</para>
-</listitem>
-<listitem><para>the file is not a disk file</para>
-</listitem>
-</OrderedList>
-</warning>
-</listitem>
-
-<listitem>
-<para>When a Cygwin program is launched by a shell, its standard input,
-output and error are in binary mode if the <envar>CYGWIN</envar> variable
-contains <literal>tty</literal>, else in text mode, except if they are piped
-or redirected.</para>
-<para> When redirecting, the Cygwin shells uses rules (a-c). For
-these shells the relevant value of <envar>CYGWIN</envar> is that at the time
-the shell was launched and not that at the time the program is executed.
-Non-Cygwin shells always pipe and redirect with binary mode. With
-non-Cygwin shells the commands <command> cat filename | program </command>
-and <command> program &lt filename </command> are not equivalent when
-<filename>filename</filename> is on a text-mounted partition. </para>
-</listitem>
-</OrderedList>
-</sect2>
-
-<sect2><title>Example</title>
-<para>To illustrate the various rules, we provide scripts to delete CRs
-from files by using the <command>tr</command> program, which can only write
-to standard output. 
-The script</para>
-<screen>
-#!/bin/sh
-# Remove \r from the file given as argument
-tr -d '\r' < "$1" > "$1".nocr
-</screen>
-<para> will not work on a text mounted systems because the \r will be 
-reintroduced on writing. However scripts such as </para>
-<screen>
-#!/bin/sh
-# Remove \r from the file given as argument
-tr -d '\r' | gzip | gunzip > "$1".nocr
-</screen>
-<para>and the .bat file</para>
-<screen>
-REM Remove \r from the file given as argument
-@echo off
-tr -d \r < %1 > %1.nocr
-</screen>
-<para> work fine. In the first case (assuming the pipes are binary)
-we rely on <command>gunzip</command> to set its output to binary mode,
-possibly overriding the mode used by the shell.
-In the second case we rely on the DOS shell to redirect in binary mode.
-</para>
-</sect2>
-
-<sect2><title>Binary or text?</title>
-
-<para>UNIX programs that have been written for maximum portability
-will know the difference between text and binary files and act
-appropriately under Cygwin.  For those programs, the text mode default
-is a good choice.  Programs included in official Cygwin distributions
-should work well in the default mode. </para>
-
-<para>Text mode makes it much easier to mix files between Cygwin and
-Windows programs, since Windows programs will usually use the CRLF
-format.  Unfortunately you may still have some problems with text
-mode.  First, some of the utilities included with Cygwin do not yet
-specify binary mode when they should, e.g. <command>cat</command> will
-not work with binary files (input will stop at ^Z, CRs will be
-introduced in the output). Second, you will introduce CRs in text
-files you write, which can cause problems when moving them back to a
-UNIX system. </para>
-
-<para>If you are mounting a remote file system from a UNIX machine,
-or moving files back and forth to a UNIX machine, you may want to
-access the files in binary mode. The text files found there will normally
-be in UNIX NL format, and you would want any files put there by Cygwin
-programs to be stored in a format understood by UNIX.
-Be sure to remove CRs from all Makefiles and
-shell scripts and make sure that you only edit the files with
-DOS/Windows editors that can cope with and preserve NL terminated lines.
-</para>
-
-<para>Note that you can decide this on a disk by disk basis (for
-example, mounting local disks in text mode and network disks in binary
-mode).  You can also partition a disk, for example by mounting
-<filename>c:</filename> in text mode, and <filename>c:\home</filename>
-in binary mode.</para>
-
-</sect2>
-
-<sect2><title>Programming</title>
-
-<para>In the <function>open()</function> function call, binary mode can be
-specified with the flag <literal>O_BINARY</literal> and text mode with
-<literal>O_TEXT</literal>. These symbols are defined in
-<filename>fcntl.h</filename>.</para>
-
-<para>In the <function>fopen()</function> function call, binary mode can be
-specified by adding a <literal>b</literal> to the mode string. There is no
-direct way to specify text mode.</para>
-
-<para>The mode of a file can be changed by the call
-<function>setmode(fd,mode)</function> where <literal>fd</literal> is a file
-descriptor (an integer) and <literal>mode</literal> is
-<literal>O_BINARY</literal> or <literal>O_TEXT</literal>. The function
-returns <literal>O_BINARY</literal> or <literal>O_TEXT</literal> depending
-on the mode before the call, and <literal>EOF</literal> on error.</para>
-
-</sect2>
-
-</sect1>
diff --git a/winsup/doc/using.sgml b/winsup/doc/using.sgml
deleted file mode 100644
index 13a353c52..000000000
--- a/winsup/doc/using.sgml
+++ /dev/null
@@ -1,21 +0,0 @@
-<chapter id="using"><title>Using Cygwin</title>
-
-<para>This chapter explains some key differences between the Cygwin
-environment and traditional UNIX systems. It assumes a working
-knowledge of standard UNIX commands.</para>
-
-DOCTOOL-INSERT-using-pathnames
-
-DOCTOOL-INSERT-using-textbinary
-
-DOCTOOL-INSERT-using-filemodes
-
-DOCTOOL-INSERT-using-specialnames
-
-DOCTOOL-INSERT-using-cygwinenv
-
-DOCTOOL-INSERT-using-utils
-
-DOCTOOL-INSERT-using-effectively
-
-</chapter>
diff --git a/winsup/doc/what.texinfo b/winsup/doc/what.texinfo
deleted file mode 100644
index a188b902a..000000000
--- a/winsup/doc/what.texinfo
+++ /dev/null
@@ -1,159 +0,0 @@
-@chapter What is it?
-
-The Cygwin tools are ports of the popular GNU development tools for
-Microsoft Windows.  They run thanks to the Cygwin library which
-provides the UNIX system calls and environment these programs expect.
-
-With these tools installed, it is possible to write Win32 console or
-GUI applications that make use of the standard Microsoft Win32 API
-and/or the Cygwin API.  As a result, it is possible to easily
-port many significant Unix programs without the need
-for extensive changes to the source code.  This includes configuring
-and building most of the available GNU software (including the packages
-included with the Cygwin development tools themselves).  Even if
-the development tools are of little to no use to you, you may have
-interest in the many standard Unix utilities provided with the package.
-They can be used both from the bash shell (provided) or from the
-standard Windows command shell.
-
-@section What versions of Windows are supported?
-
-Wait a minute... Cygwin is only @emph{supported} if you are paying for
-it, such as through a support contract with Red Hat.  For information
-about getting a Red Hat support contract, see
-@file{http://www.redhat.com/software/tools/cygwin/}.
-
-That said, Cygwin can be expected to run on all modern 32 bit versions of
-Windows, except Windows CE.  This includes Windows 95/98/ME/NT/2000/XP.
-
-Keep in mind that Cygwin can only do as much as the underlying OS
-supports.  Because of this, Cygwin will behave differently, and
-exhibit different limitations, on the various versions of Windows.
-
-@section Where can I get it?
-
-The home page for the Cygwin project is @file{http://cygwin.com/}.
-There you should find everything you need for Cygwin, including links
-for download and setup, a current list of mirror sites, a User's
-Guide, an API Reference, mailing lists and archives, and additional
-ported software.
-
-You can find documentation for the individual GNU tools at
-@file{http://www.fsf.org/manual/}.  (You should read GNU manuals from a
-local mirror.  Check @file{http://www.fsf.org/server/list-mirrors.html}
-for a list of them.)
-
-@section Is it free software?
-
-Yes.  Parts are GNU software (gcc, gas, ld, etc...), parts are covered
-by the standard X11 license, some of it is public domain, some of
-it was written by Cygnus and placed under the GPL.  None of it is
-shareware.  You don't have to pay anyone to use it but you should be
-sure to read the copyright section of the FAQ more more information on
-how the GNU General Public License may affect your use of these tools.
-
-In particular, if you intend to port a proprietary (non-GPL'd)
-application using Cygwin, you will need the proprietary-use license 
-for the Cygwin library.  This is available for purchase; please visit
-@file{http://www.redhat.com/software/tools/cygwin/} for more information.
-All other questions should be sent to the project
-mailing list cygwin@@cygwin.com.
-
-Note that when we say "free" we mean freedom, not price.  The goal of
-such freedom is that the people who use a given piece of software
-should be able to change it to fit their needs, learn from it, share
-it with their friends, etc.  The Cygwin license allows you those
-freedoms, so it is free software.
-
-The Cygwin 1.0 product was a "commercial" distribution of cygwin.  As
-such, it included such non-software things as printed manuals,
-support, and aggregation of useful utilities.  There was nothing
-(software-wise) in there that you couldn't get off the net already, if
-you took the time to find and download everything (and usually, build
-it yourself), although the @emph{versions} available for download may
-have been different than those distributed with the commercial
-product.  We tested it all to make sure it worked together, and
-packaged it in a convenient form.  We considered such testing and
-packaging to be a valuable service and thus charged a fee for it.
-Plus, it provided income for the Cygwin project so we could continue
-working on it.  However, Red Hat is no longer offering Cygwin 1.0 on
-CD, and there are no plans to do so again.  The latest news about this
-can be found at @file{http://cygwin.com/cygwin-cd.html}.
-
-
-@section Recent history of the project: What version @emph{is} this, anyway?
-
-Starting on April 17, 2000, the Cygwin team changed the procedure for
-doing net releases.
-
-Previously, net releases entailed downloading one or two large files
-(called something like @code{FULL.EXE} or @code{USER.EXE}).  These files
-unpacked a "Cygwin Distribution" to a static (and arcane) directory
-structure.  This distribution contained lots of .exe, .a, .h, and other
-files.
-
-These distributions were named after the version of the Cygwin DLL which
-they contained.  The last version released with this method was Cygwin
-B20.1.
-
-This distribution method has the advantage that everything was "all in
-one place".  You could copy the huge FULL.EXE file around and know that
-you were getting the complete "Cygwin Distribution".
-
-The method had several disadvantages, however.  1) it was huge, 2) it
-was hard to download in one error-free piece, and 3) it was hard to
-update.
-
-Why was it hard to update?  Because any change to any package in
-FULL.EXE meant re-generating all of FULL.EXE.  This process was not easy
-to automate since FULL.EXE was an InstallShield executable.  As a
-result, until recently, Cygwin development was relatively static.
-
-To rectify these problems, the Cygwin team decided, early in January
-2000, to break up the packages in the release and make a small program
-(@code{setup.exe}) available to use in downloading packages.  After much
-development and internal discussion on the cygwin-developers mailing
-list, the new, improved version of a Cygwin release was made available
-on April 17, 2000.
-
-This new release also had a new version of the Cygwin DLL -- 1.1.0.
-Most of the other packages were updated and some packages from the
-Cygwin CD were included.  Meanwhile, the Cygwin DLL continues to be
-updated, and since release 1.3.1, is more generically referred to as
-"1.3.x".
-
-Users obtain this package by first downloading a version of
-Cygwin Setup.  This program started as a simple command line tool,
-has metamorphosed into a GUI, and is in the process of continual
-improvement.  However, its purpose is simple -- it is designed to
-install packages from the cygwin web site at @file{http://cygwin.com/}.
-In effect, it is a smaller, more intelligent replacement for FULL.EXE.
-It does not require the downloading a huge executable but rather
-downloads individual small packages.
-
-Does this mean that the new net release of the Cygwin package is 1.3.x?
-No.  We no longer label the releases with the Cygwin version number.
-Each package in the cygwin release has its own version now.
-
-Does this mean that Cygwin 1.3.x is newer than B20.1?  Yes!  The cygwin
-1.3.x versions all represent continual improvement in the Cygwin DLL.
-Although the 1.3.x code is still considered "beta quality", the Cygwin
-team felt comfortable enough with the cygwin technology to bump the
-version number to "1".
-
-The other packages in the latest directory are also continually
-improving, thanks to the efforts of net volunteers who maintain the
-cygwin binary ports.  Each package has its own version numbers and its
-own release process.
-
-So, how do you get the most up-to-date version of cygwin?  Easy.  Just
-download the Cygwin Setup program from
-@file{http://cygwin.com/setup.exe}.  This program will handle the task
-of updating the packages on your system to the latest version.  The
-Cygwin team frequently updates and adds new packages to the sourceware
-web site.  The Cygwin Setup program is the easiest way to determine what
-you need on your system.
-
-For some "ancient" history of the project (rather, just woefully out of
-date), visit the Project History page at
-@file{http://cygwin.com/history.html}.
diff --git a/winsup/doc/who.texinfo b/winsup/doc/who.texinfo
deleted file mode 100644
index cc93ceaa1..000000000
--- a/winsup/doc/who.texinfo
+++ /dev/null
@@ -1,88 +0,0 @@
-@chapter Who's behind the project?
-
-@strong{(Please note that if you have cygwin-specific questions, all of these
-people will appreciate it if you use the cygwin mailing lists rather than
-sending personal email.)}
-
-Chris Faylor is behind many of the recent changes in Cygwin.  Prior to
-joining Cygnus, he contributed significant fixes to the process control
-and environ code, reworked the strace mechanism, and rewrote the
-signal-related code from scratch as a Net contributor.  In addition to
-continuing to make technical contributions, Chris is also currently the
-group's manager.
-
-Corinna Vinschen has contributed several useful fixes to the path
-handling code, console support, improved security handling, and raw
-device support.  Corinna is currently employed by Red Hat as a
-GDB/Cygwin engineer.
-
-DJ Delorie has done important work in profiling Cygwin,
-worked on the Dejagnu automated testing framework, merged the dlltool
-functionality into ld, wrote a good deal of the Cygwin Users' Guide,
-authored the cygcheck utility, and made automated snapshots available
-from our project WWW page.  DJ is currently employed by Red Hat as
-a GCC engineer.
-
-Egor Duda has contributed many useful fixes.  He is responsible for
-Cygwin's ability to start a debugger on detection of a fatal error
-as well as produce core dumps.
-
-Robert Collins has contributed many improvements to thread handling
-as well as generic fixes to cygwin itself.
-
-Kazuhiro Fujieda has contributed many bug fixes and bug reports.
-
-Earnie Boyd has contributed many bug fixes and is the mingw and w32api
-maintainer.
-
-David Starks-Browning is our dedicated FAQ maintainer.
-
-Geoffrey Noer took over the Cygwin project from its initial author Steve
-Chamberlain in mid-1996.  As maintainer, he produced Net releases beta
-16 through 20; made the development snapshots; worked with Net
-contributors to fix bugs; made many various code improvements himself;
-wrote a paper on Cygwin for the 1998 Usenix NT Symposium; authored the
-project WWW pages, FAQ, README; etc.  Geoffrey is not currently employed
-by Red Hat.
-
-Steve Chamberlain designed and implemented
-Cygwin in 1995-1996 while working for Cygnus.  He worked with the Net
-to improve the technology, ported/integrated many of the user tools
-for the first time to Cygwin, and produced all of the releases up to
-beta 14.  Steve is not currently employed by Red Hat.
-
-Marco Fuykschot and Peter Boncz of Data Distilleries contributed nearly
-all of the changes required to make Cygwin thread-safe.  They also
-provided the pthreads interface.
-
-Sergey Okhapkin has been an invaluable Net contributor.  He implemented
-the tty/pty support, has played a significant role in revamping signal
-and exception handling, and has made countless contributions throughout
-the library.  He also provided binaries of the development snapshots to
-the Net after the beta 19 release.
-
-Mumit Khan has been most helpful on the EGCS end of things, providing
-quite a large number of stabilizing patches to the compiler tools for
-the B20 release.
-
-Philippe Giacinti contributed the implementation of dlopen, dlclose,
-dlsym, dlfork, and dlerror in Cygwin.
-
-Ian Lance Taylor did a much-needed rework of the path handling code for
-beta 18, and has made many assorted fixes throughout the code.  Jeremy
-Allison made significant contributions in the area of file handling and
-process control, and rewrote select from scratch.  Doug Evans rewrote
-the path-handling code in beta 16, among other things.  Kim Knuttila and
-Michael Meissner put in many long hours working on the now-defunct
-PowerPC port.  Jason Molenda and Mark Eichin have also made important
-contributions.
-
-Please note that all of us working on Cygwin try to
-be as responsive as possible and deal with patches and questions as we
-get them, but realistically we don't have time to answer all of the
-email that is sent to the main mailing list.  Making Net releases of the
-Win32 tools and helping people on the Net out is not our primary job
-function, so some email will have to go unanswered.
-
-Many thanks to everyone using the tools for their many contributions in
-the form of advice, bug reports, and code fixes.  Keep them coming!
diff --git a/winsup/doc/windres.sgml b/winsup/doc/windres.sgml
deleted file mode 100644
index 2d5410639..000000000
--- a/winsup/doc/windres.sgml
+++ /dev/null
@@ -1,167 +0,0 @@
-
-<sect1 id="windres"><title>Defining Windows Resources</title>
-
-<para><filename>windres</filename> reads a Windows resource file
-(<filename>*.rc</filename>) and converts it to a res or coff file.
-The syntax and semantics of the input file are the same as for any
-other resource compiler, so please refer to any publication describing
-the Windows resource format for details.  Also, the
-<filename>windres</filename> program itself is fully documented in the
-Binutils manual.  Here's an example of using it in a project:</para>
-
-<screen>
-myapp.exe : myapp.o myapp.res
-	gcc -mwindows myapp.o myapp.res -o $@
-
-myapp.res : myapp.rc resource.h
-	windres $< -O coff -o $@
-</screen>
-
-
-<para>What follows is a quick-reference to the syntax
-<filename>windres</filename> supports.</para>
-
-<screen>
-
-id ACCELERATORS suboptions
-BEG
-"^C" 12
-"Q" 12
-65 12
-65 12 , VIRTKEY ASCII NOINVERT SHIFT CONTROL ALT
-65 12 , VIRTKEY, ASCII, NOINVERT, SHIFT, CONTROL, ALT
-(12 is an acc_id)
-END
-
-SHIFT, CONTROL, ALT require VIRTKEY
-
-
-id BITMAP memflags "filename"
-memflags defaults to MOVEABLE
-
-
-id CURSOR memflags "filename"
-memflags defaults to MOVEABLE,DISCARDABLE
-
-
-id DIALOG memflags exstyle x,y,width,height styles BEG controls END
-id DIALOGEX memflags exstyle x,y,width,height styles BEG controls END
-id DIALOGEX memflags exstyle x,y,width,height,helpid styles BEG controls END
-
-memflags defaults to MOVEABLE
-exstyle may be EXSTYLE=number
-styles:	CAPTION "string"
-	CLASS id
-	STYLE  FOO | NOT FOO | (12)
-	EXSTYLE number
-	FONT number, "name"
-	FONT number, "name",weight,italic
-	MENU id
-	CHARACTERISTICS number
-	LANGUAGE number,number
-	VERSIONK number
-controls:
-	AUTO3STATE params
-	AUTOCHECKBOX params
-	AUTORADIOBUTTON params
-	BEDIT params
-	CHECKBOX params
-	COMBOBOX params
-	CONTROL ["name",] id, class, style, x,y,w,h [,exstyle] [data]
-	CONTROL ["name",] id, class, style, x,y,w,h, exstyle, helpid [data]
-	CTEXT params
-	DEFPUSHBUTTON params
-	EDITTEXT params
-	GROUPBOX params
-	HEDIT params
-	ICON ["name",] id, x,y [data]
-	ICON ["name",] id, x,y,w,h, style, exstyle [data]
-	ICON ["name",] id, x,y,w,h, style, exstyle, helpid [data]
-	IEDIT params
-	LISTBOX params
-	LTEXT params
-	PUSHBOX params
-	PUSHBUTTON params
-	RADIOBUTTON params
-	RTEXT params
-	SCROLLBAR params
-	STATE3 params
-	USERBUTTON "string", id, x,y,w,h, style, exstyle
-params:
-	["name",] id, x, y, w, h, [data]
-	["name",] id, x, y, w, h, style [,exstyle] [data]
-	["name",] id, x, y, w, h, style, exstyle, helpid [data]
-
-[data] is optional BEG (string|number) [,(string|number)] (etc) END
-
-
-id FONT memflags "filename"
-memflags defaults to MOVEABLE|DISCARDABLE
-
-id ICON memflags "filename"
-memflags defaults to MOVEABLE|DISCARDABLE
-
-LANGUAGE num,num
-
-id MENU options BEG items END
-items:
-	"string", id, flags
-	SEPARATOR
-	POPUP "string" flags BEG menuitems END
-flags:
-	CHECKED
-	GRAYED
-	HELP
-	INACTIVE
-	MENUBARBREAK
-	MENUBREAK
-
-id MENUEX suboptions BEG items END
-items:
-	MENUITEM "string"
-	MENUITEM "string", id
-	MENUITEM "string", id, type [,state]
-	POPUP "string" BEG items END
-	POPUP "string", id BEG items END
-	POPUP "string", id, type BEG items END
-	POPUP "string", id, type, state [,helpid] BEG items END
-
-id MESSAGETABLE memflags "filename"
-memflags defaults to MOVEABLE
-
-id RCDATA suboptions BEG (string|number) [,(string|number)] (etc) END
-
-STRINGTABLE suboptions BEG strings END
-strings:
-	id "string"
-	id, "string"
-
-(User data)
-id id suboptions BEG (string|number) [,(string|number)] (etc) END
-
-id VERSIONINFO stuffs BEG verblocks END
-stuffs:	FILEVERSION num,num,num,num
-	PRODUCTVERSION num,num,num,num
-	FILEFLAGSMASK num
-	FILEOS num
-	FILETYPE num
-	FILESUBTYPE num
-verblocks:
-	BLOCK "StringFileInfo" BEG BLOCK BEG vervals END END
-	BLOCK "VarFileInfo" BEG BLOCK BEG vertrans END END
-vervals: VALUE "foo","bar"
-vertrans: VALUE num,num
-
-
-
-suboptions:
-	memflags
-	CHARACTERISTICS num
-	LANGUAGE num,num
-	VERSIONK num
-
-memflags are MOVEABLE/FIXED PURE/IMPURE PRELOAD/LOADONCALL DISCARDABLE
-
-</screen>
-
-</sect1>
diff --git a/winsup/mingw/CRT_fp10.c b/winsup/mingw/CRT_fp10.c
deleted file mode 100644
index a13fb0096..000000000
--- a/winsup/mingw/CRT_fp10.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * CRT_FP10.c
- *
- * This defines _fpreset as asm ("fnint"). Calls to _fpreset
- * will set default floating point precesion to 64-bit mantissa
- * at app startup.
- *
- * Linking in CRT_FP10.o before libmingw.a will override the definition
- * set in CRT_FP8.o.
- */
-
-/* Override library  _fpreset() with asm fninit */
-void _fpreset (void)
-  { __asm__ ( "fninit" ) ;}
-
-void __attribute__ ((alias ("_fpreset"))) fpreset(void);
diff --git a/winsup/mingw/CRT_fp8.c b/winsup/mingw/CRT_fp8.c
deleted file mode 100644
index d772d759a..000000000
--- a/winsup/mingw/CRT_fp8.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * CRT_FP8.c
- *
- * This forces calls of _fpreset to the MSVCRT function
- * exported from dll.  Effectively it make default
- * precison same as apps built with MSVC (53-bit mantissa).
-
- *
- * To change to 64-bit mantissa, link in CRT_FP10.o before libmingw.a. 
- */
-
-/* Link against the _fpreset visible in import lib */
-
-extern void (*_imp___fpreset)(void) ;
-void _fpreset (void)
-{  (*_imp___fpreset)(); }
-
-void __attribute__ ((alias ("_fpreset"))) fpreset(void);
diff --git a/winsup/mingw/CRT_noglob.c b/winsup/mingw/CRT_noglob.c
deleted file mode 100644
index 442820cd8..000000000
--- a/winsup/mingw/CRT_noglob.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * noglob.c
- *
- * This file defines _CRT_glob to have a value of 0, which will
- * turn off command line globbing. It is compiled into a separate object
- * file which you can add to your link line to turn off globbing like
- * this:
- *
- * gcc -o foo.exe foo.o noglob.o
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-int _CRT_glob = 0;
diff --git a/winsup/mingw/CRTfmode.c b/winsup/mingw/CRTfmode.c
deleted file mode 100644
index c3f2a444c..000000000
--- a/winsup/mingw/CRTfmode.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * CRTfmode.c
- *
- * Sets _CRT_fmode to be zero, which will cause _mingw32_init_fmode to leave
- * all file modes in their default state (basically text mode).
- *
- * This file is part of the Mingw32 package.
- *
- * THIS FILE IS IN THE PUBLIC DOMAIN.
- *
- * Contributers:
- *   Created by Colin Peters <colin@fu.is.saga-u.ac.jp>
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-int _CRT_fmode = 0;
diff --git a/winsup/mingw/CRTglob.c b/winsup/mingw/CRTglob.c
deleted file mode 100644
index 09f858146..000000000
--- a/winsup/mingw/CRTglob.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * CRTglob.c
- *
- * This object file defines _CRT_glob to have a value of -1, which will
- * turn on command line globbing by default. If you want to turn off
- * command line globbing include a line
- *
- * int _CRT_glob = 0;
- *
- * in one of your source modules.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-int _CRT_glob = -1;
diff --git a/winsup/mingw/CRTinit.c b/winsup/mingw/CRTinit.c
deleted file mode 100644
index fa0e7ba1f..000000000
--- a/winsup/mingw/CRTinit.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * CRTinit.c
- *
- * A dummy version of _CRT_INIT for MS compatibility. Programs, or more often
- * dlls, which use the static version of the MSVC run time are supposed to
- * call _CRT_INIT to initialize the run time library in DllMain. This does
- * not appear to be necessary when using crtdll or the dll versions of the
- * MSVC runtime, so the dummy call simply does nothing.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-void
-_CRT_INIT ()
-{
-}
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
deleted file mode 100644
index 4682a1eb8..000000000
--- a/winsup/mingw/ChangeLog
+++ /dev/null
@@ -1,2209 +0,0 @@
-2003-12-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdio.h:(_fileno): Define macro version after both
-	fileno and _fileno functions declared.
-
-	* include/stdio.h (_rmtmp, rmtmp): Add prototypes.
-	* moldnames.def.in (rmtmp) Add stub.
-
-2003-11-27  Dimitry Sibiryakov  <aafemt@users.sourceforge.net>
-
-	* include/signal.h (SIG_SGE, SIG_ACK): Add defines.
-
-2003-10-27  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/math.h: Guard ISO C99 additions with __cplusplus
-	not __GLIBCPP__.
-
-2003-10-21  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/_mingw.h: Define __attribute__((x)) to nothing
-	if not __GNUC__.
-
-2003-10-21  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/complex.h: New file.
-	* mingwex/complex: New directory.
-	* mingwex/complex/cabs.c: New file.
-	* mingwex/complex/cacos.c: New file.
-	* mingwex/complex/cacosh.c: New file.
-	* mingwex/complex/casin.c: New file.
-	* mingwex/complex/casinh.c: New file.
-	* mingwex/complex/catan.c: New file.
-	* mingwex/complex/catanh.c: New file.
-	* mingwex/complex/ccos.c: New file.
-	* mingwex/complex/ccosh.c: New file.
-	* mingwex/complex/cexp.c: New file.
-	* mingwex/complex/cimag.c: New file.
-	* mingwex/complex/clog.c: New file.
-	* mingwex/complex/cpow.c: New file.
-	* mingwex/complex/cproj.c: New file.
-	* mingwex/complex/creal.c: New file.
-	* mingwex/complex/csin.c: New file.
-	* mingwex/complex/csinh.c: New file.
-	* mingwex/complex/csqrt.c: New file.
-	* mingwex/complex/ctan.c: New file.
-	* mingwex/complex/ctanh.c: New file.
-	* mingwex/Makefile.in (COMPLEX_DISTFILES): New list of
-	files.
-	(dist): Use it.
-	(COMPLEX_OBJS): New list of objects.
-	(LIB_OBJS): Include it in the library.
-
-2003-10-21  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/math.h (cabs): Remove non-ISO prototype.
-
-2003-10-21  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/math/cephes_mconf.h (NAN, NANF, NANL):
-	Use GCC __builtin's if available.
-	(INFINITY, INFINITYF, INFINITYL): Likewise.
-
-2003-10-21  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/math/s_erf.c (erf): Set errno to ERANGE if
-	beyond approximation limit.
-	* mingwex/math/sf_erf.c (erff): Likewise.
-
-2003-10-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdio.h (getc): Cast result to unsigned char before
-	return.
-	(putc): Likewise
-	(getchar): Likewise.
-	(putchar): Likewise.
-	Thanks to M.Fujii  <boochang@m4.kcn.ne.jp>
-
-2003-10-10  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h: Increment version to 3.2.
-	* Makefile.in: Ditto.
-
-2003-10-10  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/sys/types.h: Revert last change.
-
-2003-10-10  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/sys/types.h (ssize_t): Correct the definition.
-
-2003-10-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdio.h (_filbuf): Add prototype.
-	(_flsbuf): Add prototype.
-	(getc): Add inline version.
-	(putc): Likewise.
-	(getchar): Likewise.
-	(putchar): Likewise.
-
-2003-10-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/dirent.c (_treaddir): Reset errno to 0 if end
-	of directory.
-
-2003-09-29  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdlib.h: Guard non-ISO functions with
-	!__STRICT_ANSI__, throughout.
-
-2003-09-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/io.h (_fileno): Remove prototype.
-	(fileno): Likewise.
-	(FILENAME_MAX): Define, if needed.
-	Don't include <stdio.h>.
-	* include/stdio.h (FILENAME_MAX): Protect against
-	prior definition.
-	(_fileno): Define macro implementation.
-	(fileno): Likewise.
-
-2003-09-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/inttypes.h: Include _mingw.h.
-
-2003-09-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/_mingw.h (__CRT_INLINE): Define.
-	* include/ctype.h: Replace 'extern inline' with __CRT_INLINE,
-	throughout
-	* include/inttypes.h: Likewise.
-	* include/math.h: Likewise.
-	* include/stdio.h: Likewise.
-	* include/stdlib.h: Likewise.
-	* include/string.h: Likewise.
-	* include/wchar.h: Likewise.
-	* include/wctype.h: Likewise.
-
-2003-09-22  Roland Schwingel  <rolandschwingel@users.sourceforge.net>
-
-	* mingwex/dirent.c (_topendir): Allocate enough memory for
-	DIR struct in UNICODE case too.
-
-2003-09-15  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h: Increment version to 3.2.
-	* Makefile.in: Ditto.
-
-2003-07-03  Earnie Boyd  <earnie@users.sf.net>
-
-	* config.guess, config.sub: Update with versions from ftp.gnu.org.
-
-2003-07-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/math/trunc.c (trunc): Provide lvalue for memory input constraint. 
-	* mingwex/math/truncf.c (truncf): Likewise.
-	* mingwex/math/truncl.c (truncl): Likewise.
-	* mingwex/math/modff.c (modff): Likewise.
-	* mingwex/math/modfl.c (modfl): Likewise.
-
-2003-07-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/search.h: New file.
-	* include/stdlib.h: Add comment about qsort, bsearch in
-	search.h.
-	* test_headers.c: Include search.h.
-	* moldname.def.in (lfind, lsearch): Add. 
-
-2003-07-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/process.h (_execv, _execvp, _spawnv, _spawnvp, _execve,
-	_execvpe, _spawnve, _spawnvpe, execv, execvp, spawnv, spawnvp,
-	execve, execvpe, spawnve, spawnvpe): Const-ify all the char params.
-
-2003-07-01  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h (small, hyper): Change to __small and __hyper to
-	avoid user space name conflicts.
-
-2003-07-01  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h (__int32, __int16, __int8, small, hyper): Define.
-	Note: Also added to w32api/include/basetyps.h.
-	* mingwex/math/tgamma.c, tgammaf.c, tgammal.c (small): 
-	Rename to Small (case difference).
-
-2003-06-18  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/dirent.h (dirent): Make d_name and array instead of a pointer.
-	* mingwex/dirent.c: Modifications througout to fill d_name array.
-	* Makefile.in (LIBS): Add new MSVCRT libraries libmsvcr70 and
-	libmsvcr71, including debug versions.
-	(msvcr70.def, msvcr70d.def, msvcr71.def, msvcr71.def): New targets.
-
-2003-06-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* msvcrt.def.in (__badioinfo, __lc_codepage, __lc_handle,
-	__pioinfo, __setlc_active, _unguarded_readlc_active, _dstbias):
-	Mark as DATA.
-	Thanks to: Aaron W  LaFramboise   <AWLaFramboise@aol.com>
-
-2003-05-30  Sascha Sommer  <saschasommer@freenet.de>
-
-	* include/sys/types.h (_ssize_t, ssize_t):  Add typedefs.
-
-2003-05-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdlib.h (_Exit): Move out of __STRICT_ANSI__ block,
-	but still protect inline definition with __STRICT_ANSI__.
-
-2003-05-14  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* string_old.c: Remove, splitting into...
-	* strcasecmp.c: New file.
-	* strncasecmp.c: New file.
-	* wscmpi.c : New file.
-	* ctype_old.c: Remove, splitting into...
-	* isascii.c: New file.
-	* iscsym.c: New file.
-	* iscsymf.c: New file.
-	* toascii.c: New file.
-	* Makefile.in (MOLD_OBJS): Adjust.
-	(SRCDIST_FILES): Adjust.
-
-2003-05-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/math.h (fabs) : Remove inline definition.
-	(fabsf): Likewise.
-	(fabsl): Likewise. 
-
-2003-05-06  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h: Change version to 3.0
-	* Makefile.in: Ditto.
-
-2003-05-06  Earnie Boyd  <earnie@users.sf.net>
-
-	* configure.in (W32API_INCLUDE): Need the -I switch in the value.
-	* mingwex/configure.in (W32API_INCLUDE): Ditto.
-	* profile/configure.in (W32API_INCLUDE): Ditto.
-
-2003-05-06  Earnie Boyd  <earnie@users.sf.net>
-
-	* configure.in (CFLAGS): Remove -D__USE_CRTIMP=1 due to possibilites
-	of multiply defined symbols if the symbols is defined locally.  E.G.:
-	A local definition of malloc causes this problem.
-	* configure: Regenerate.
-	* profile/Makefile.in (W32API_INCLUDE): New variable.
-	(ALL_CFLAGS): Use W32API_INCLUDE value.
-	(ALL_CXXFLAGS): Ditto.
-	(gcrt0.o gcrt1.o gcrt2.o): Use ALL_CFLAGS instead of CFLAGS.
-	Thanks to Jeff Bonggren <jbon@users.sf.net>.
-	* profile/configure.in (W32API_INCLUDE): Set default value.
-	* profile/configure: Regenerate.
-	* mingwex/Makefile.in (W32API_INCLUDE): New variable.
-	(ALL_CFLAGS): Use W32API-INCLUDE value.
-	(ALL_CXXFLAGS): Ditto.
-	* mingwex/configure.in (W32API_INCLUDE): Set default value.
-	* mingwex/configure: Regenerate.
-
-2003-05-05  Earnie Boyd  <earnie@users.sf.net>
-
-	* Makefile.in (W32API_INCLUDE): New variable.
-	(ALL_CFLAGS): Use W32API_INCLUDE value.
-	(ALL_CXXFLAGS): Ditto.
-	* configure.in (CFLAGS): Add -D__USE_CRTIMP=1 to default values.
-	(W32API_INCLUDE): Set default value.
-	* configure: Regenerate.
-	
-2003-04-11  Earnie Boyd  <earnie@users.sf.net>
-
-	* configure.in (LIBM_A): Define for cygwin target.
-	* configure (LIBM_A): Ditto.
-
-2003-04-07  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/time.h (strftime): Remove duplicate declaration.
-
-2003-04-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/_mingw.h (_CRTIMP): Make conditional on __USE_CRTIMP.
-
-2003-03-16  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/dirent.c (_topendir): Eliminate signed/unsigned warning.
-	* mingwex/strtoimax.c (strtoimax): Likewise.
-	* mingwex/wcstoimax.c (wcstoimax): Likewise.
-	* mingwex/wtoll.c (wtoll): Remove unnecessary ';'
-	* mingwex/fesentenv.c: Include float.h.
-	* mingwex/math/powl.c: Eliminate type punning/strict aliasing 
-	warning.
-	* mingwex/math/tanhl.c: Eliminate signed/unsigned warning in
-	constants.
-	* mingwex/math/tgammal.c: Likewise.
-
-2003-03-16  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/utime.h: New file, forwarding to sys/utime.h.
-
-2003-03-16  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/sys/param.h (MAXPATHLEN): Define.
-
-2003-03-16  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/tchar.h: Ansi-fy a comment.
-
-2003-03-16  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* profile/profile.h (mcount): Use __builtin_return_address
-	rather than inline __asm statements.
-	* profile/Makefile.in: Remove special rule for mcount.o
-	Specify dependencies for mcount.o profil.o gmon.o.
-
-2003-03-10  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdlib.h (qsort): Remove const from first parm.
-	Thanks to: Tien-Ren Chen  <trchen@sourceforge.users.net>
-
-2003-03-03  Christopher Faylor  <cgf@redhat.com>
-
-	* mingwex/getopt.c: Refresh from NetBSD sources.
-
-2003-03-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/getopt.c: New file, copied from cygwin srcs.
-	* include/getopt.h: New file, copied from cygwin srcs.
-	* include/unistd.h: Include getopt.h.
-	* mingwex/Makefile.in (DISTFILES): Add getopt.c.
-	(POSIX_OBJS): Add getopt.o.
-
-2003-03-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdio.h (vscanf): Add prototype.
-	(vfscanf): Ditto.
-	(vsscanf): Ditto.
-	(vwscanf): Ditto.
-	(vfwscanf): Ditto.
-	(vswscanf): Ditto.
-	* include/wchar.h (vwscanf): Add prototype.
-	(vfwscanf): Ditto.
-	(vswscanf): Ditto.
-	* mingwex/snprintf.c: Move to mingwex/stdio.
- 	* mingwex/vsnprintf.c: Ditto.
-	* mingwex/snwprintf.c: Ditto.
-	* mingwex/vsnwprintf.c: Ditto.
-	* mingwex/Makefile.in (VPATH): Add $(srcdir)/stdio
-	(STDIO_DISTFILES): Add.
-	(DISTFILES): Adjust.
-	(STDIO_STUB_OBJS): Rename to STDIO_OBJS and add v*scanf objects.
-	(LIB_OBJS): Adjust.
-	(dist): Adjust.
-
-2003-03-02  Aaron W  LaFramboise   <AWLaFramboise@aol.com>
-
-	* mingwex/stdio: New directory
-	* mingwex/stdio/vfscanf.c: New file.
-	* mingwex/stdio/vfwscanf.c:  New file.
-	* mingwex/stdio/vscanf.c:  New file.
-	* mingwex/stdio/vsscanf.c:  New file.
-	* mingwex/stdio/vswscanf.c:  New file.
-	* mingwex/stdio/vwscanf.c:  New file.
-
-2003-02-25  Earnie Boyd  <earnie@users.sf.net>
-
-	* Makefile.in (libmsvcrt20.a): Remove target and dependencies.
-	(libmsvcrt40.a): Ditto.
-
-2003-02-21  Earnie Boyd  <earnie@users.sf.net>
-
-	Thanks to David Frasier <davidf@sjsoft.com> who inspired portions of
-	this patch.
-	* Makefile.in (libmsvcrtd.a): Add target library.
-	(libmoldnamed.a): Ditto.
-	(msvcrt.def, msvcrtd.def, msvcrt20.def, msvcrt40.def): Use msvcrt.def.in
-	template to create.
-	($(srcdir)): Remove explicit reference for depencies of object targets.
-	* moldname.def, moldname-msvcrt.def, moldname-crtdll.def, msvcrt.def,
-	msvcrt20.def, msvcrt40.def: Remove.
-	* msvcrt.def.in: New file (Copy of previous msvcrt.def).
-
-2003-02-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in: Make sure libmingwex.a from current build tree is used.
-
-2003-02-14  Christopher Faylor  <cgf@redhat.com>
-
-	* profile/Makefile.in (mcount.o): Use ALL_CFLAGS for compilation to
-	ensure -mno-cygwin where appropriate.  Filter out -O2.
-
-2003-02-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* profile/Makefile.in (mcount.o): Use -O1 optimization
-	switch to compile.
-
-2003-02-10  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/math.h: Remove _CRTIMP from pow() prototype,
-	unless __NO_ISOCEXT.
-
-2003-02-10  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/math/cephes_emath.h: Don't redefine INFINITY.
-
-2003-02-10  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/_mingw.h (_CRTIMP): Define for __GNUC__ if
-	__declspec(dllimport)  supported.
-	(__cdecl): Define if not already defined.
-	(__stdcall): Likewise.
-	* include/dirent.h: Qualify fuctions with __cdecl.
-	* include/fenv.h: Likewise.
-	* include/inttypes.h: Likewise.
-	* include/assert.h: Qualify fuctions with __cdecl. Qualify
-	CRT dll imports with _CRTIMP.
-	* include/conio.h: Likewise.
-	* include/ctype.h: Likewise.
-	* include/direct.h: Likewise.
-	* include/dos.h: Likewise.
-	* include/errno.h: Likewise.
-	* include/float.h: Likewise.
-	* include/io.h: Likewise.
-	* include/locale.h: Likewise.
-	* include/malloc.h: Likewise.
-	* include/math.h: Likewise.
-	* include/mbctype.h: Likewise.
-	* include/mbstring.h: Likewise.
-	* include/process.h: Likewise.
-	* include/setjmp.h: Likewise.
-	* include/signal.h: Likewise.
-	* include/stdio.h: Likewise.
-	* include/stdlib.h: Likewise.
-	* include/string.h: Likewise.
-	* include/time.h: Likewise.
-	* include/wchar.h: Likewise.
-	* include/wctype.h: Likewise.
-	* include/sys/stat.h: Likewise.
-	* include/sys/timeb.h: Likewise.
-	* include/sys/utime.h: Likewise.
-
-	* include/ctype.h: Guard ctype inlines with __NO_INLINE__.
-	* include/wctype.h: Guard wctype inlines with __NO_INLINE__.
-
-	* include/stdio.h (__VALIST): Guard against prior definition.
-
-2003-02-08  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h: Change version to 3.0
-	* Makefile.in: Ditto.
-
-2003-02-08  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/stdlib.h: Make words after #endif a comment.
-
-2003-02-07  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/locale.h: Include stddef.h for definition of NULL.
-
-2003-01-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/math.h (tgamma): Correct typo in comment.
-
-2003-01-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/mingw-fseek.c (INLINE): Remove define.
-	(__mingw_is_win9x): Remove static inline function.
-	(_mingw_fwrite): Use _osver instead of __mingw_is_win9x.
-
-2003-01-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/math/llround.c: Correct function name and
-	change return value to long long.
-
-2003-01-07  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ctype.h (__isascii): Don't cast arg to unsigned.
-	(iswascii): Likewise.  Correct mask.
-	* include/wctype.h (iswascii): Don't cast arg to unsigned.
-	Correct mask
-
-2003-01-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdlib.h (_osver, _winver, _winmajor,
-	_winminor): Declare as direct imports from dll if
-	__DECLSPEC_SUPPORTED.
-
-2003-01-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* pseudo-reloc.c (do_pseudo_reloc): Make static.
-	* pseudo-reloc-list.c: New file.
-	* crt1.c (_pei386_runtime_relocator): Declare.
-	(__mingw_CRTStartup): Call it.
-	* dllcrt1.c (_pei386_runtime_relocator): Declare.
-	(DllMainCRTStartup): Call it.
-	* Makefile.in: Add pseudo-reloc.o pseude-reloc-list.o to
-	libmingw32.a.
-
-2003-01-01  Egor Duda  <deo@logos-m.ru>
-
-	* pseudo-reloc.c: New file.
-
-2002-12-20  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h: Increment version to 2.4.
-	Makefile.in: Ditto.
-
-2002-12-12  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/malloc.h (_alloca): Add definition.
-	(alloca): Ditto.
-
-2002-12-08  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/math/s_erf.c: New file.
-	* mingwex/math/sf_erf.c: New file.
-	* mingwex/Makefile.in (MATH_DISTFILES): Add new files.
-	(MATH_OBJS): Add new objects.
-	* include/math.h (erf[f]): Add prototypes.
-	(erfc[f]): Add prototypes.
-
-2002-12-07  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/math.h: Add traditional/XOPEN math constants.
-
-2002-11-27  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/math/lgamma.c: New file.
-	* mingwex/math/lgammaf.c: New file.
-	* mingwex/math/lgammal.c: New file.
-	* mingwex/math/tgamma.c: New file.
-	* mingwex/math/tgammaf.c: New file.
-	* mingwex/math/tgammal.c: New file.
-	* mingwex/math/cephes_mconf (polevlf): Add float version.
-	(p1evlf): Likewise.
-	Define _CEPHES_USE_ERRNO.
-	* mingwex/Makefile.in (MATH_DISTFILES): Add new files.
-	(MATH_OBJS): Add new objects.
-	* include/math.h (lgamma[fl]): Add prototypes.
-	(tgamma[fl]): Add prototypes.
-
-2002-11-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/strtold.c: New file.
-	* mingwex/wcstold.c: New file.
-	* mingwex/ldtoa.c: New file.
-	* mingwex/math/cephes_emath.h: New file.
-	* mingwex/math/cephes_emath.c: New file.
-	* mingwex/Makefile.in (DISTFILES): Add new files.
-	(MATH_DISTFILES): Ditto.
-	(STDLIB_OBJS): New. Define as strtold.c wcstold.c.
-	(MATH_OBJS): Add cephes_emath.o.
-	(LIB_OBJS): Add $(STDLIB_OBJS).
-	* include/stdlib.h (strtold, wcstold): Add prototypes.
-	* include/wchar.h (wcstold): Add prototype.
-
-2002-11-09  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/math.h (sqrt): Remove inline definition.
-	(sqrtf): Replace inline definition with prototype.
-	(sqrtl): Likewise.
-	* mingwex/math/sqrtf.c (sqrtf): Set domain error if
-	argument less than zero.
-	* mingwex/math/sqrtf.c (sqrtl): Likewise.
-
-2002-10-30  Guido Serassio  <serassio@libero.it>
-
-        * include/stdio.h (_getmaxstdio): Add prototype.
-         (_setmaxstdio): Likewise.
-
-2002-10-19  Kang Li  <rubylith@users.sourceforge.net>
-
-	* include/fcntl.h (O_SEQUENTIAL): Correct typo.
-
-2002-10-19  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* crt1.c: Define new macro __IN_MINGW_RUNTIME before including
-	stdlib.h.
-	Define WIN32_MEAN_AND_LEAN before including windows.h
-	* include/stdlib.h (_fmode): Protect declaration as dllimported
-	variable with __IN_MINGW_RUNTIME.
-
-2002-10-19  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-
-	* crt1.c: Include stdlib.h.
-
-2002-10-19  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* Makefile.in (CRT0S): Add txtmode.o binmode.o.
-	(MINGW_OBJS): Add txtmode.o.
-	(SRCDIST_FILES): Add txtmode.c binmode.c.
-	crt1.c: Don't include fcntrl.h, stdlib.h.
-	(_fmode): Declare, without dllimport attribute.
-	(__p__fmode): Declare access function for dll's _fmode.
-	(_mingw32_init_fmode): Sync dll _fmode with staticly linked
-	_fmode for app.
-	* txtmode.c: New file.
-	* binmode.c: New file.
-	* samples/fmode/test2.c: New file.
-	* samples/fmode/jamfile: Add test2.exe target.
-
-2002-10-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdint.h (INT64_C, UINT64_C ): Append suffix to let
-	macros work with C89.
-	(INTMAX_C, UINTMAX_C): Likewise.
-
-2002-10-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/string.h (strcasecmp): Make extern __inline__.
-	(strncasecmp): Likewise.
-	(wcscmpi): Likewise.
-
-2002-10-08  Heiko Gerdau  <hg@technosis.de>
-
-	* include/tchar.h (_tchdir. _tgetcwd, _tgetdcwd.
-	_tmkdir, _trmdir, _tstat): Add ASCII and UNICODE
-	mappings.
-
-2002-10-07  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/math/powil.c: Rename powil to __powil.
-	* mingwex/math/powl.c: Adjust declaration and call
-	to __powil. Remove comment on powil.
-	* mingwex/math/powi.c: New file.
-	* mingwex/math/powif.c: New file.
-	* mingwex/math/pow.c: New file.
-	* mingwex/math/cephes_mconf.h. Add double and float
-	versions of constants.
-	(polevl): Add double precision function.
-	(p1evl): Likewise.
-	* mingwex/Makefile.in (MATH_DISTFILES): Add pow.c,
-	powi.c, powif.c.
-	(MATH_OBJS): Add pow.o,	powi.o, powif.o.
-
-2002-10-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/cytpe.h (_imp____mbcur_max): Add missing ';'.
-	(_imp____mbcur_max_dll): Likewise.
-
-2002-10-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/fcntl.h (_fmode): Remove declarations and
-	compatibility defines.
-	(_setmode, setmode): Remove prototypes.
-	* include/stdlib (_fmode): Add declarations and
-	compatibility defines.  Change type to int.
-	* include/io.h (_setmode, setmode): Add prototypes.
-	* samples/fmode/all.c: Adjust includes.
-	* samples/fmode/test.c: Likewise.
-	* crt1.c (_CRT_fmode): Declare as int.
-	* CRTfmode.c (_CRT_fmode): Likewise.
-
-	* include/stdlib: Remove comment about MB_CUR_MAX.
-
-2002-10-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdlib.h (_imp____mbcur_max): Add missing ';'.
-	(_imp____mbcur_max_dll): Likewise.
-
-2002-09-18  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/math/files.txt: Remove inadvertantly added file.
-
-2002-09-18  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/string.h (_strerror): Move into #ifndef
-	__STRICT_ANSI__ block.
-
-2002-09-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/time.h (__need_NULL): Define before including
-	stddef.h.  Thanks to: R�diger Dehmel  <de@lmnet.de>.
-
-2002-09-16  Ranjit Matthew  <rmathew@hotmail.com>
-
-	* include/stdio.h: Correct comment about directory separator.
-
-2002-09-12  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/sys/time.h (timeval): Add struct definition and
-	associated macros (copied from w32api/include/winsock.h).
-
-2002-09-05  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h: Increment version to 2.3.
-	Makefile.in: Ditto.
-
-2002-09-05  Earnie Boyd  <earnie@users.sf.net>
-
-	* mingwex/fegetenv.c: Change to \n line endings.
-	* mingwex/vsnprintf.c: Ditto.
-	* mingwex/vsnwprintf.c: Ditto.
-
-2002-09-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* mingwex/math/hypotl.c: Replace with version based on cephes
-	library.
-
-2002-08-28  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/sys/param.h: Add ENDIAN defines.
-	* test_headers.c: Include sys/param.h.
-
-2002-08-28  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* test_headers.c: Don't include varargs.h.
-	* Makefile.in (test_headers): Don't use -std=xx
-	with -xc++.
-
-2002-08-21  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/sys/param.h: New File.
-
-2002-08-21  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/math.h (asm): Change to __asm__ throughout.
-	Expose ISO C99 functions if __GLIPCPP__.
-	(hypotf): Use hypot, not _hypot in stub.
-
-2002-08-20  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/tchar.h: Ansi-fy another comment.
-
-2002-08-20  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/tchar.h: Ansi-fy comment.
-
-2002-08-20  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* test_headers.c : New file.
-	* Makefile.in (test_headers): New target, using it,
-	(SRCDIST_FILES): Distribute it.
-
-2002-08-20  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h: Increment version to 2.2.
-	Makefile.in: Ditto.
-
-2002-08-14  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/unistd.h: Add include of process.h.
-
-2002-08-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdio.h (_fcloseall): Add prototype.
-
-2002-07-29  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/tchar.h (_tfdopen): Correct typo.
-
-2002-07-29  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* moldname.def.in (chgsign,scalb,finite,fpclass,logb,
-	nextafter): Add non-underscored stubs.
-	* moldname-msvcrt.def: Regenerate.
-	* moldname-crtdll.def: Regenerate.
-	* mingwex/math: New directory.
-	* mingwex/rint.c: Move to mingwex/math.
-	* mingwex/rintf.c: Ditto.
-	* mingwex/rintl.c: Ditto.
-	* mingwex/round.c: Ditto.
-	* mingwex/roundf.c: Ditto.
-	* mingwex/roundl.c: Ditto.
-	* mingwex/rint.c: Ditto.
-	* mingwex/rintf.c: Ditto.
-	* mingwex/rintl.c: Ditto.
-	* mingwex/trunc.c: Ditto.
-	* mingwex/truncf.c: Ditto.
-	* mingwex/truncl.c: Ditto.
-	* mingwex/signbit.c: Ditto.
-	* mingwex/signbitf.c: Ditto.
-	* mingwex/signbitl.c: Ditto.
-	* mingwex/copysignl.S: Ditto.
-	* mingwex/fdim.c: Ditto.
-	* mingwex/fdimf.c: Ditto.
-	* mingwex/fdiml.c: Ditto.
-	* mingwex/fmin.c: Ditto.
-	* mingwex/fminf.c: Ditto.
-	* mingwex/fminl.c: Ditto.
-	* mingwex/fmax.c: Ditto.
-	* mingwex/fmaxf.c: Ditto.
-	* mingwex/fmaxl.c: Ditto.
-	* mingwex/fma.c: Ditto.
-	* mingwex/fmaf.c: Ditto.
-	* mingwex/fmal.c: Ditto.
-	* mingwex/fpclassify.c: Ditto.
-	* mingwex/fpclassifyl.c: Ditto.
-	* mingwex/fpclassifyl.c: Ditto.
-	* mingwex/isnan.c: Ditto.
-	* mingwex/isnanf.c: Ditto.
-	* mingwex/isnanl.c: Ditto.
-	* mingwex/fucom.c: Ditto.
-	* mingwex/fp_consts.c: Ditto. Split out float and long double
-	definitions.
-	* mingwex/math_stubs.c: Remove.
-	* mingwex/log2.c: Remove. Replaced by math/log2.S
-	* mingwex/log2f.c: Remove.  Replaced by math/log2f.S
-	* mingwex/log2l.c: Remove.  Replaced by math/log2l.S
-	* mingwex/math/acosf.c : New file.
-	* mingwex/math/acosl.c: New file.
-	* mingwex/math/asinf.c: New file.
-	* mingwex/math/asinl.c: New file.
-	* mingwex/math/atan2f.c: New file.
-	* mingwex/math/atan2l.c: New file.
-	* mingwex/math/atanf.c: New file.
-	* mingwex/math/atanl.c: New file.
-	* mingwex/math/cbrt.c: New file.
-	* mingwex/math/cbrtf.c: New file.
-	* mingwex/math/cbrtl.c: New file.
-	* mingwex/math/ceilf.S: New file.
-	* mingwex/math/ceill.S: New file.
-	* mingwex/math/cephes_ld.h: New file.
-	* mingwex/math/copysign.S: New file.
-	* mingwex/math/copysignf.S: New file.
-	* mingwex/math/cosf.S: New file.
-	* mingwex/math/coshf.c: New file.
-	* mingwex/math/coshl.c: New file.
-	* mingwex/math/cosl.S: New file.
-	* mingwex/math/exp2.S: New file.
-	* mingwex/math/exp2f.S: New file.
-	* mingwex/math/exp2l.S: New file.
-	* mingwex/math/expf.c: New file.
-	* mingwex/math/expl.c: New file.
-	* mingwex/math/fabs.c: New file.
-	* mingwex/math/fabsf.c: New file.
-	* mingwex/math/fabsl.c: New file.
-	* mingwex/math/floorf.S: New file.
-	* mingwex/math/floorl.S: New file.
-	* mingwex/math/fmodf.c: New file.
-	* mingwex/math/fmodl.c: New file.
-	* mingwex/math/fp_consts.h: Ditto.
-	* mingwex/math/fp_constsf.c: Ditto.
-	* mingwex/math/fp_constsl.c: Ditto.
-	* mingwex/math/frexpf.c: New file.
-	* mingwex/math/frexpl.S: New file.
-	* mingwex/math/hypotf.c: New file.
-	* mingwex/math/hypotl.c: New file.
-	* mingwex/math/ilogb.S: New file.
-	* mingwex/math/ilogbf.S: New file.
-	* mingwex/math/ilogbl.S: New file.
-	* mingwex/math/ldexpf.c: New file.
-	* mingwex/math/ldexpl.c: New file.
-	* mingwex/math/llrint.c: New file.
-	* mingwex/math/llrintf.c: New file.
-	* mingwex/math/llrintl.c: New file.
-	* mingwex/math/llround.c: New file.
-	* mingwex/math/llroundf.c: New file.
-	* mingwex/math/llroundl.c: New file.
-	* mingwex/math/log10f.S: New file.
-	* mingwex/math/log10l.S: New file.
-	* mingwex/math/log1p.S: New file.
-	* mingwex/math/log1pf.S: New file.
-	* mingwex/math/log1pl.S: New file.
-	* mingwex/math/log2.S: New file.
-	* mingwex/math/log2f.S: New file.
-	* mingwex/math/log2l.S: New file.
-	* mingwex/math/logb.c: New file.
-	* mingwex/math/logbf.c: New file.
-	* mingwex/math/logbl.c: New file.
-	* mingwex/math/logf.S: New file.
-	* mingwex/math/logl.S: New file.
-	* mingwex/math/lrint.c: New file.
-	* mingwex/math/lrintf.c: New file.
-	* mingwex/math/lrintl.c: New file.
-	* mingwex/math/lround.c: New file.
-	* mingwex/math/lroundf.c: New file.
-	* mingwex/math/lroundl.c: New file.
-	* mingwex/math/modff.c: New file.
-	* mingwex/math/modfl.c: New file.
-	* mingwex/math/nearbyint.S: New file.
-	* mingwex/math/nearbyintf.S: New file.
-	* mingwex/math/nearbyintl.S: New file.
-	* mingwex/math/nextafterf.c: New file.
-	* mingwex/math/powf.c: New file.
-	* mingwex/math/powl.c: New file.
-	* mingwex/math/powil.c: New file.
-	* mingwex/math/remainder.S: New file.
-	* mingwex/math/remainderf.S: New file.
-	* mingwex/math/remainderl.S: New file.
-	* mingwex/math/remquo.S: New file.
-	* mingwex/math/remquof.S: New file.
-	* mingwex/math/remquol.S: New file.
-	* mingwex/math/scalbn.S: New file.
-	* mingwex/math/scalbnf.S: New file.
-	* mingwex/math/scalbnl.S: New file.
-	* mingwex/math/sinf.S: New file.
-	* mingwex/math/sinhf.c: New file.
-	* mingwex/math/sinhl.c: New file.
-	* mingwex/math/sinl.S: New file.
-	* mingwex/math/sqrt.c: New file.
-	* mingwex/math/sqrtf.c: New file.
-	* mingwex/math/sqrtl.c: New file.
-	* mingwex/math/tanf.S: New file.
-	* mingwex/math/tanhf.c: New file.
-	* mingwex/math/tanhl.c: New file.
-	* mingwex/math/tanl.S: New file.
-	* mingwex/Makefile.in: Adjust VPATH for source files in
-	mingwex/math.
-	Adjust MATH_OBJS.
-	Add MATH_DISTFILES and use it to build source distro.
-	* include/ math.h: Add protypes for new functions and
-	reorganise to reflect ANSI,C99 status.
-
-2002-06-19  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/tchar.h (_getts): Define as _getws for _UNICODE.
-	(_putts): Define as _putws for _UNICODE.
-	Thanks to: Tomasz Pona  <cochisek@poczta.onet.pl>  for report.
-
-2002-06-18  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/float.h: #include_next<float.h> before header guard.
-
-2002-06-18  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/_mingw.h (__MINGW_IMPORT): Check for prior definition before
-	defining.
-	* include/excpt.h (): Include windef.h not windows.h.
-	* include/fcntl.h (_O_SHORT_LIVED): Add define.
-	(_chmod): Add prototype.
-        (_creat): Correct prototype.
-	(SH_DENY*): Rename defines to _SH_DENY*.
-	(SH_DENY*): Add Non-ANSI names for _SH_DENY*.
-	include/stdio.h (_IOMYBUF, _IOEOF, _IOERR, _IOSTRG,
-	_IOAPPEND): Add defines.
-	(_wfindfirst): Correct prototype.
-	(_wfdopen): Add prototype.
-	* include/stdlib.h (_rotl, _rotr, _lrotl, _lrotr): Add
-	prototypes.
-	* include/string.h (_mbschr, _mbstok, _mbsncat): Remove
-	 prototypes.
-	(_wcsdup): Correct prototype.
-	* include/mbstring.h: Remove comments about _mbschr, _mbstok,
-	 _mbsncat being in string.h.
-	* include/wchar.h (_wfindfirst): Correct prototype.
-	* include/tchar.h (_tfdopen): Add _UNICODE mappings.
-
-2002-06-15  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h: Increment to version 2.1.
-	* Makefile.in: Ditto.
-
-2002-06-15  Earnie Boyd  <earnie@users.sf.net>
-
-	* Makefile.in (conf_prefix): New variable.
-	(dist_prefix): Ditto. Conditionally set to $(conf_prefix).
-	(bindist): Use dist_prefix.
-
-2002-06-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/_mingw.h: Increment version to 2.0.
-	* Makefile.in: Ditto.
-
-	Merge in mingwex branch.
-
-	2002-06-11  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/math.h (fdim, fdimf, fdiml): Add prototypes.
-	* mingwex/fdim.c: New file.
-	* mingwex/fdimf.c: New file.
-	* mingwex/fdiml.c: New file.
-	* mingwex/Makefile.in (DISTFILES): Add fdim.c, fdimf.c,
-	fdiml.c.
-	(MATHOBJS):Add fdim.o, fdimf.o. fdiml.o.
-
-	2002-05-23  Danny Smith  <dannysmith@users.sourceforge.net>
-	* mingwex/Makefile.in (DISTFILES): Add truncf.c, truncl.c.
-
-	2002-05-22  Danny Smith  <dannysmith@users.sourceforge.net>
-	* mingwex/isnanl.c: New file.
-
-	2002-05-21  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/stdint.h: Include stddef.h to get
-	wchar_t and wint_t.
-	(WINT_MAX): Define to ((wint_t)-1).
-
-	2002-05-21  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/wctype.h: Replace 'inline' with '__inline__'.
-	* include/inttypes.h: Likewise.
-
-	2002-05-16  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/_mingw.h (__MINGW_IMPORT): Put extern at start 
-	to avoid warnings.  Thanks to: Oscar Fuentes  <ofv@wanadoo.es>.
-
-	2002-05-16  Danny Smith  <dannysmith@users.sourceforge.net>
-	* mingwex/snprintf.c: Split out vsnprintf to....
-	* mingwex/vsnprintf.c: New file.
-	* mingwex/snwprintf.c: Split out vsnwprintf to...
-	* mingwex/vsnwprintf.c: New file.
-	* mingwex/Makefile.in: Adjust DISTFILES and STDIO_STUB_OBJS.
-
-	2002-05-15  Pascal Obry  <obry@gnat.com>
-	* include/dirent.h (DIR): Change dd_stat type to int.
-	(_WDIR): Likewise.
-
-	2002-05-07  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/stdio.h (vsnprintf): Change inline to __inline__;
-	(vsnwprintf): Likewise.
- 	* include/wchar.h (vsnwprintf): Likewise.
-	(wcstof): Likewise.
-	(fwide): Likewise.
-	(mbsinit): Likewise.
-
-	2002-04-29  Danny Smith  <dannysmith@users.sourceforge.net>
-	Change FP default precison from 53 to 64-bit mantissa.
-	* Makefile.in (CRT0S): Add CRT_fp8.o.
-	(MINGW_OBJS): Replace CRT_fp8.o with CRT_fp10.o.
-	* include/float.h: Replace standard float.h defines with
-	#include_next<float.h> to use GCC's defines. Adjust comments
-	to reflect change.	
-
-	2002-04-26  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/dos.h: Change  prefix "__imp_"  to "_imp__" for
-	__GNUC__ without __DECLSPEC_SUPPORTED.
-	* include/fnctl.h: Likewise.
-	* include/math.h: Likewise.
-	* include/stdio.h: Likewise.
-	* include/stdlib.h: Likewise.
-	* include/time.h: Likewise.
-	* include/wctype.h: Likewise.
-	* include/ctype.h: Likewise.
-
-	2002-04-26  Danny Smith  <dannysmith@users.sourceforge.net>
-	Add atexit support for dlls.
-	* crt1.c (atexit): Force thunk to _imp__atexit.
-	(_onexit): Force thunk to _imp___onexit.
-	* dllcrt1.c (DllMainCRTStartup): Initialise private atexit
-	table on DLL_PROCESS_ATTACH, clean it up on DLL_PROCESS_DETACH.
-	(__dll_exit): New function to run atexit-registered functions
-	 and flush output buffers on DLL_PROCESS_DETACH or failed
-	DLL_PROCESS_ATTACH. 
-	(atexit): Force use of private atexit table via _dllonexit,
-	(_onexit): New function. Force use of private atexit table via
-	_dllonexit,
-	* msvcrt.def (atexit, _onexit): Add DATA keyword so that only
-	_imp_<_symbol> is visible in import lib.
-	* msvcrt20.def: Likewise.
-	* msvcrt40.def: Likewise.
-	* crtdll.def: Likewise.
-
-	2002-04-26  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/fenv.h: Change header guard macro to _FENV_H_.
-	(fenv_t, fexcept_t): Move into block protected by
-	#ifndef RC_INVOKED.
-	Cleanup some whitespace.
-	* include/inttypes.h: Change header guard macro to
-	_INTTYPES_H_.
-
-	2002-04-26  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/math.h (copysignl): Declare.
-	* mingwex/Makefile.in (DISTFILES): Add copysignl.S.
-	(MATHOBJS):Add copysignl.o.
-
-	2002-04-24  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/math.h (__signbitl, __isnanl): Declare.
-
-	2002-04-24  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/math.h (nanl, __fpcassifyl, fminl, fmaxl, rintl,
-	roundl, truncl, fmal, log2l): Declare.
-	Protect C99 declarations with _STDC_VERSION__ >= 199901L)
-	|| !defined  __STRICT_ANSI__.
- 	* mingwex/fmax.c (fmax): Call __isnan, not _isnan.
-	* mingwex/fmin.c (fmin): Likewise.
-	* mingwex/fmaxf.c (fmaxf): Call __isnanf, not _isnan.
-	* mingwex/fminf.c (fminf): Likewise.
-	* mingwex/fmaxl.c: New file.
-	* mingwex/fminl.c: New file.
-	* mingwex/fpclassify.c (__fpclassifyf): Split out to ...
-	* mingwex/fpclassifyf.c: New file. 
-	* mingwex/fpclassifyl.c: New file. 
-	* mingwex/rint.c (rintf): Split out to...
-	* mingwex/rintf.c: New file.
-	* mingwex/rintl.c: New file.
-	* mingwex/round.c (roundf): Split out to...
-	* mingwex/roundf.c: New file.
-	* mingwex/roundl.c: New file.
-	* mingwex/trunc.c (truncf): Split out to...
-	* mingwex/truncf.c: New file.
-	* mingwex/truncl.c: New file.
-	* mingwex/signbit.c (signbitf): Split out to...
-	* mingwex/signbitf.c: New file.
-	* mingwex/signbitl.c: New file.
-	* mingwex/fmal.c: New file.
-	* mingwex/copysignl.S: New file.
-	* mingwex/log2l.c: New file.
-	* mingwex/fp_consts.c: Add nanl definition.
-	Comment out unused constants.
-	* mingwex/Makefile.in (DISTFILES): Add fmaxl.c, fminl.c,
-	fpclassifyf.c, fpclassifyl.c, rintf.c, rintl.c, roundf.c,
-	roundl.c, truncf.c truncl.c, signbitf.c signbitl.c,
-	fmal.c, log2l.c
-	(MATHOBJS): Add fmaxl.o, fminl.o, fpclassifyf.o,
-	fpclassifyl.o, rintf.o, rintl.o, roundf.o, roundl.o,
-	truncf.o truncl.o, signbitf.o signbitl.o, fmal.o,
-	log2l.o.
-	* mingwex/snwprintf.c (snwprintf, vsnwprintf): Correct typo.
-	
-	2002-04-23  Danny Smith  <dannysmith@users.sourceforge.net>
-	Make wide char versions of opendir and friends.
-	* include/dirent.h (_wdirent, _WDIR): Define wide versions of
-	struct dirent, DIR.
-	(_wopendir,_wreaddir,_wclosedir,_wrewinddir,_wtelldir,
-	_wseekdir): Add prototypes for wide versions of corresponding
-	standard functions.
-	* include/tchar.h; Add _UNICODE mappings for dirent.h
-	structures and functions.
-	* mingwex/dirent.c: Make _UNICODE neutral.
-	* mingwex/wdirent.c: New file to define _UNICODE before
-	including dirent.c.  
-	* mingwex/Makefile.in (DISTFILES): Add wdirent.c.
-	(POSIX_OBJS): Add wdirent.o.
-	(wdirent.o): Specify dependency on dirent.c as well as
-	wdirent.c.
-	* samples/dirent/wtest.c: New file, wide version of test.c.
-
-	2002-04-17  Danny Smith  <dannysmith@users.sourceforge.net>
-	* Makefile.in (INCLUDES): Add "-iwithprefixbefore include" to
-	ensure gcc include dir is searched despite -nostdinc.
-	* profile/Makefile.in (INCLUDES): Likewise.
-	* mingwex/Makefile.in (INCLUDES): Likewise.
-	* include/stdarg.h: Replace with stub that just guards the
-	real gcc system header with #ifndef RC_INVOKED
-	* include/varargs.h: Likewise.
-	* include/stddef.h: Likewise.
-	* include/stdio.h: Include stdarg.h after defining
-	 __need___va_list.
-	(__VALIST): Define as __gnuc_va_list if __GNUC__, else char*.
-	Replace va_list with __VALIST throughout.
-
-	2002-04-17  Danny Smith  <dannysmith@users.sourceforge.net>
-	* crt1.c: Revert changes of 2002-04-16. Use _fpreset again.
-	* msvcrt.def (_fpreset): Mark as DATA so that only
-	_imp___fpreset is exported.
-	* msvcrt20.def (_fpreset): Likewise.
-	* msvcrt40.def (_fpreset): Likewise.
-	* crtdll.def (_fpreset): Likewise.
-	* CRT_fp10.c (_fpreset): Overide library _fpreset with one
-	that calls fninit.
-	(fpreset): Add alias.
-	(__CRT_PC): Delete definition. _fpreset does it now.
-	*  CRT_fp8.c (_fpreset): Force use of library _imp___fpreset.
-	(fpreset): Add alias.
-	(__CRT_PC): Delete definition.
-	* moldname.def.in: Comment out fpreset.
-	* moldname-msvcrt.def: Regenerate.
-	* moldname-crtdll.def: Regenerate.
-	* include/fenv.h (FE_DFL_ENV): Define as (fenv_t*)0.
-	* mingwex/fesetenv.c (FE_DFL_ENV): Use it to set environment
-	with the _fpreset determined by startup CRT_fp object.
-
-	2002-04-16  Danny Smith  <dannysmith@users.sourceforge.net>
-	* CRT_fp8.c: New file.
-	* CRT_fp10.c: New file.
-	* crt1.c (__CRT_PC) Declare.
-	(__CRT_fesetenv): New static function, using _CRT_PC.
-	(__mingw_CRTStartup):Use __CRT_fesetenv instead of _fpreset.
-	(_gnu_exception_handler): Likewise.
-	* Makefile.in (CRT0S): Add CRT_fp10.o.
-	(MINGW_OBJS): Add  CRT_fp8.o.
-	(SRCDIST_FILES): Add CRT_fp8.c, CRT_fp10.c.
-	Add CRT_fp8.o, CRT_fp10.o dependancies.
-	* include/float.h (_fpreset): Expand comment.
-	* include/fenv.h (FE_PC64_ENV): New define for Intel x87
-	(extended precison) environmemt.
-	(FE_PC53_ENV): New define for MSVCRT default environmemt.
-	(FE_DFL_ENV): Define as FE_PC53_ENV.
-	* mingwex/fesetenv.c: Use FE_PC53_ENV, FE_PC64_ENV to determine
-	precision control for default environment.
-
-	* include/math.h: Fix long comment line.
-	* profile/configure.in (CRT0S): Set to both gcrt1.o and gcrt2.o
-	for mingw.
-	* profile/configure: Regenerate.
-
-	2002-04-12  Danny Smith  <dannysmith@users.sourceforge.net>
-	* mingwex/Makefile.in (DISTFILES): Add suffix to wcstof.c.
-
-	2002-04-10  Danny Smith  <dannysmith@users.sourceforge.net>
-	* mingwex/mingw-fseek.c: New file, based on Mumit Khan
-	mingw-local patch to binutils.
-	Sun Nov  7 04:27:07 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-	(__mingw_fseek): New function to work around Win9x f/lseek bug.
-	(__mingw_fwrite): Likewise.
-	(__mingw_is_win9x): New helper function.
-	* include/stdio.h (__USE_MINGW_FSEEK): New define,guarding...
-	(__mingw_fseek): New prototype and define to replace fseek.
-	(__mingw_fwrite): New prototype and define to replace fwrite.
-	* mingwex/Makefile.in: Add mingw-fseek.o to libmingwex.a.
-	* moldname-crtdll.def: Remove CR from end of line.
-	* moldname-msvcrt.def: Ditto.
-
-	2002-04-09  Danny Smith  <dannysmith@users.sourceforge.net>
-	* profile/configure.in (CRT0S): Configure name of gcrt?.o
-	based on target, building gcrt0.o for cygwin -mno-cygwin.
-	* profile/configure: Regenerate.
-	* profile/Makefile.in (CRT0S): Use name from configure.
-	(gcrt0.o): New rule.   
-	(ALL_CRT0S): New define, used to cleanup all gcrt?.o's.
-
-	2002-04-04  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/math.h (_controlfp, _control87, _clearfp, _statusfp, _fpreset,
-	_fpecode): Remove prototypes copied from float.h.
-	(nan, nanf): Move into block protected against RC_INVOKED
-	and __cplusplus.
-	* include/stdlib.h (_Exit): Change from static inline to
-	extern inline.
-	* mingwex/_Exit.c : New file.
-	* mingwex/Makefile.in: Add _Exit.o to libmingwex.a.
-
-	2002-04-04  Danny Smith  <dannysmith@users.sourceforge.net>
-	Add libgmon.a and libmingwex.a for cygwin -mno-cygwin.
-	* configure.in (SUBDIRS): Add  profile and mingwex to cygwin target.
-	(configdirs): Likewise.
-	(LIBGMON_A): Define for cygwin target as well.
-	* configure: Regenerate.
-	* profile/configure.in (THREAD_DLL): Remove define.
-	(LIBM_A): Remove define.
-	(LIBGMON_A): Define for cygwin target as well.
-	* profile/configure: Regenerate.
-	* profile/makefile.in (install): Install to inst_libdir and
-	inst_includedir.
-	* mingwex/makefile.in (CFLAGS): Move -fomit-frame-pointer to...
-	(OPTFLAGS): New define.
-	(ALL_CFLAGS): Add $(OPTFLAGS).
-	(ALL_CXXFLAGS): Same.
-	(.c.o:): Remove ALL_CXXFLAGS. 
-
-	2002-03-29  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/stdint.h: Add missing newline at eof. 
-	* include/stdio.h (snprintf): Add prototype.
-	(vsnprintf): Add prototype and inline definition.
-	(snwprintf): Add prototype.
-	(vsnwprintf): Add prototype and inline definition.
-	* include/wchar.h (snwprintf): Add prototype.
-	(vsnwprintf): Add prototype and inline definition.
-	* mingwex/Makefile.in: Add snprintf.o, snwprintf.o
-	to libmingwex.a.
-	* mingwex/snprintf.c: New file.
-	* mingwex/snwprintf.c: New file.
-
-	2002-03-22  Danny Smith   <dannysmith@users.sourceforge.net>
-	* configure.in: Add mingwex as SUBDIRS and configdirs.
-	* configure: Regenerate.
-	* Makefile.in (MINGW_OBJS): Remove dirent.o.
-	(SRC_DIST_FILES): Remove dirent.c.
-	* dirent.c: Remove.
-	* include/stdlib.h (_Exit): Add static inline
-	function.
-	(struct lldiv_t): Define.
-	(lldiv): Add prototype.
-	(llabs): Add extern inline function.
-	(strtoll,strtoull): Add prototypes.
-	(wcstol, wcstoul, wcstod): Group together.
-	(strtof, wcstof): Add extern inline definitions.
-	(atoll,lltoa,ulltoa, wtoll, lltow ulltow): Add prototypes
-	and extern inline definitions.
-	* include/wchar.h (fwide, wcstoll,wcstoull, wmemchr
-	wmemcmp, wmemcpy, wmemmove, wmemset. mbsinit): Add
-	prototypes.
-	(wcstol, wcstoul,wcstod): Copy prototypes from stdlib.h.
-	(wcstof): Add extern inline definition.
-	* include/math.h (nan, nanf): Add prototypes.
-	(NAN, INFINITE): Define constants.
-	(fpclassify, isnan ,signbit): Add macros and supporting float
-	and double functions.
-	(isfinite, isinf, isnormal): Add macros.
-	(isgreater, isless, isgreaterequal, islessequal,islessgreater):
-	Add macros.
-	(rint, rintf, round, roundf, trunc. truncf, fmax, fmaxf,
-	fmin, fminf, fma, fmaf, log2, log2f): Add prototypes.
-	(copysign, logb, nextafter, scalb): Add prototypes and
-	inline stubs for underscored versions in msvcrt.dll.  	
-	* include/inttypes.h: New file.
-	* include/fenv.h: New file
-
-	Add new mingwex subdir and files.
-	* mingwex: New directory.
-	* mingwex/Makefile.in: New file.
-	* mingwex/configure.in: New file.
-	* mingwex/configure: Generate.
-	* mingwex/dirent.c: Moved here from parent dir.
-	* mingwex/atoll.c: New file.
-	* mingwex/feclearexcept.c: New file.
-	* mingwex/fegetenv.c: New file.
-	* mingwex/fegetexceptflag.c: New file.
-	* mingwex/fegetround.c: New file.
-	* mingwex/feholdexcept.c: New file.
-	* mingwex/feraiseexcept.c: New file.
-	* mingwex/fesetenv.c: New file.
-	* mingwex/fesetexceptflag.c: New file.
-	* mingwex/fesetround.o: New file.
-	* mingwex/fetestexcept.c: New file.
-	* mingwex/feupdateenv.c: New file.
-	* mingwex/fma.S: New file.
-	* mingwex/fmaf.S: New file.
-	* mingwex/fmax.c: New file.
-	* mingwex/fmaxf.c: New file.
-	* mingwex/fmin.c: New file.
-	* mingwex/fminf.c: New file.
-	* mingwex/fp_consts.c: New file.
-	* mingwex/fpclassify.c: New file.
-	* mingwex/fucom.c: New file.
-	* mingwex/fwide.c: New file.
-	* mingwex/imaxabs.c: New file.
-	* mingwex/imaxdiv.c: New file.
-	* mingwex/isnan.c: New file.
-	* mingwex/isnanf.c: New file.
-	* mingwex/lltoa.c: New file.
-	* mingwex/lltow.c: New file.
-	* mingwex/log2.c: New file.
-	* mingwex/log2f.c: New file.
-	* mingwex/math_stubs.c: New file.
-	* mingwex/mbsinit.c: New file.
-	* mingwex/rint.c: New file.
-	* mingwex/round.c: New file.
-	* mingwex/signbit.c: New file.
-	* mingwex/sitest.c: New file.
-	* mingwex/strtof.c: New file.
-	* mingwex/strtoimax.c: New file.
-	* mingwex/strtoumax.c: New file.
-	* mingwex/testwmem.c: New file.
-	* mingwex/trunc.c: New file.
-	* mingwex/ulltoa.c: New file.
-	* mingwex/ulltow.c: New file.
-	* mingwex/wcstof.c: New file.
-	* mingwex/wcstoimax.c: New file.
-	* mingwex/wcstoumax.c: New file.
-	* mingwex/wmemchr.c: New file.
-	* mingwex/wmemcmp.c: New file.
-	* mingwex/wmemcpy.c: New file.
-	* mingwex/wmemmove.c: New file.
-	* mingwex/wmemset.c: New file.
-	* mingwex/wtoll.c: New file.
-
-2002-04-20  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/mbstring.h: New file.
-	* include/mbctype.h: New file.
-
-2002-04-20  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/tchar.h (__TEXT): Make same as define in
-	w32api/include/winnt.h.
-
-2002-04-20  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/tchar.h (_tputenv): Add UNICODE mappings.
-	(_tsearchenv): Likewise.
-	(_tmakepath): Likewise.
-	(_tsplitpath): Likewise.
-	(_tfullpath): Likewise.
-
-2002-04-18  Pascal Obry  <obry@gnat.com>
-
-	* dirent.c (opendir): Convert given pathname to
-	absolute pathname.
-
-2002-04-09  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/_mingw.h: Increment version.
-	* Makefile.in: Ditto.
-
-2002-04-09  Earnie Boyd  <earnie@users.sf.net>
-
-	* moldname-crtdll.def: Remove CR from end of line.
-	* moldname-msvcrt.def: Ditto.
-	* Makefile.in: Use bzip2 compression for Cygwin target.
-
-2002-04-04  Danny Smith  <dannysmith@sourceforge.users.net>
-
-	* include/math.h (DOMAIN, SING, OVERFLOW, UNDERFLOW,
-	TLOSS, PLOSS): Move oldname defines back, following
-	the underscored names.
-
-2002-03-29  Danny Smith  <dannysmith@sourceforge.users.net>
-
-	* include/stdio.h (_snwprintf): Correct spelling.
-	(_vsnwprintf): Likewise.
-	* include/wchar.h (_snwprintf): Correct spelling.
-	(_vsnwprintf): Likewise.
-
-2002-03-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* moldname.def.in (__MSVCRT__): Replace with !(__CRTDLL__).
-	(wpopen): Add if !(__CRTDLL__).
-	* Makefile.in (moldname-msvcrt.def rule): Use -C, not -c to
-	preserve comments.
-	(moldname-crtdll.def rule): Likewise.
-	* moldname-msvcrt.def: Regenerate.
-	* moldname-crtdll.def: Regenerate.
-	* include/stdio.h (wpopen):Use prototype, not a define.
-	(_swnprintf): Add prototype.
-	(_vswnprintf): Likewise.
-	Tidy up whitespace.
-	* include/wchar.h (_swnprintf): Add prototype.
-	(_vswnprintf): Likewise.
-	Tidy up whitespace.
-
-2002-01-28  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/malloc.h (_heapinfo): Correct structure definition.
-	(_USEDENTRY,_FREEENTRY): Add defines.
-	Add comment on platform support for _heap* functions.
-	(_get_sbh_threshold): Add prototype.
-	(_set_sbh_threshold): Likewise.
-	(_expand): Likewise.
-
-2002-01-25  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* profile/profil.c: Update copyright info.
-	* profile/profil.h: Likewise.
-	* profile/gcrt0.c: Likewise.
-
-2002-01-25  Pascal Obry  <obry@gnat.com>
-
-	* profile/profil.h (PROFADDR): Cast idx to unsigned long long to
-	avoid overflow.
-	* profile/gmon.c: Define bzero as memset if mingw32.
-	(monstartup): Use it.
-
-2002-01-25  Danny Smith  <dannysmith@users.sourceforge.net> 
-
-	* include/tchar.h (_TCHAR): Add missing ;.
-
-2002-01-25  Danny Smith  <dannysmith@users.sourceforge.net> 
-
-	* include/tchar.h (_TCHAR): Add typedefs.
-
-2002-01-16  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdlib.h (_onexit_t): Add typedef.
-	(_onexit): Add prototype.
-
-2002-01-12  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* msvcrt.def: Revert accidental change.
-	* include/stdlib.h: Ditto. 
-
-2001-12-07  Earnie Boyd  <earnie@users.sf.net>
-
-	* Makefile.in: Increment VERSION.
-	* include/_mingw.h: Ditto.
-
-2001-12-05  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/strings.h: New File.
-
-2001-12-02  Danny Smith  <dannysmith@users.sourceforge.net> 
-
-	Apply patches from:
-	2001-06-21  Mumit Khan  <khan@nanotech.wisc.edu>
-
-	* include/math.h (_FPCLASS* ): Add defines from float.h.
-	(IEEE recommended functions): Add declarations from float.h.
-	* include/float.h (_FPCLASS* ): Protect against redefinition.
-
-2001-11-29   Wu Yongwei  <adah@netstd.com>
- 
-	* include/_mingw.h,assert.h,conio.h,ctype.h,dir.h,direct.h
-	dirent.h,dos.h,errno.h,excpt.h,fcntl.h,float.h,io.h,
-	limits.h,locale.h,malloc.h,math.h,process.h,setjmp.h,
-	share.h,signal.h,stdarg.h,stddef.h,stdint.h,stdio.h,
-	stdlib.h,string.h,tchar.h,time.h,varargs.h,wchar.h,
-	wctype.h,sys/stat.h,sys/timeb.h,sys/types.h,sys/utime.h:
-	Correct spelling of "disclaimed" in comments.
-	* include/excpt.h: Another spelling correction. 
-
-2001-11-08  Robert Collins  <rbtcollins@hotmail.com>
-
-	* include/errno.h: Fix "errno is not a prototype" warning.
-
-2001-11-07  Danny Smith  <dannysmith@users.sourceforge.net> 
-
-	* include/ctype.h (tolower, toupper,_tolower,_toupper): Comment 
-	differences between ANSI and non-ANSI versions. 
-	(_ctype[],_pctype): Declare vars. 
-	(__ISCTYPE): New helper macro using _pctype. 
-	(is* ctype functions): Use __ISCTYPE to define inline versions. 
-	(_toupper, _tolower, __isascii, __toascii, __iscsym, __iscsymf):
-	Inline definitions. 
-	(isw* ctype functions): Inline definitions. 
-	* include/wctype.h (_ctype[],_pctype): Declare vars. 
-	(isw* ctype functions): Inline definitions. 
-
-
-2001-11-06  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/float.h (_clearfp, _statusfp, _fpreset, fpreset,
-	__fpecode): Use __STDC__ prototypes.
- 
-
-2001-11-06 Thomas Pfaff <tpfaff@gmx.net>
-
- 	* mthr_stub.c (__mingwthr_remove_key_dtor) New.
- 	* mthr_init.c (DllMain) Run dtors if a process terminates.
- 	* mthr.c  (__mingwthr_add_key_dtor)  Removed.
- 	(___mingwthr_add_key_dtor)  New.
- 	(___mingwthr_remove_key_dtor) New.
- 	(__mingwthr_run_key_dtors) Complete rewrite.
-  	(__mingwthr_remove_key_dtor) New.
-
-2001-11-05  Egor Duda  <deo@logos-m.ru>
-
-	* Makefile.in: Delete unused executable after creating base-files.
-
-2001-11-06  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/errno.h (_errno): Use __STDC__ prototype.
-	Thanks to: Jim Barton.
-
-2001-11-04  "stefan" <stefan@lkcc.org>
-
-	* include/sys/locking.h (_LK_UNLCK, LK_UNLCK): Correct names.
-
-2001-10-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/io.h (_commit): Add declaration.
-	Thanks to: "stefan" <stefan@lkcc.org>  
-
-2001-10-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/sys/stat.h: Make S_IS* macros safer.
-
-2001-10-27  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdlib.h (EXIT_FAILURE): Change value to 1.
-
-2001-10-12  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdlib.h (__p__environ, __p__wenviron): Use
-	__STDC__ prototypes.
-	
-2001-09-19  Earnie Boyd  <earnie@SF.net>
-
-	* Makefile.in: Remove the /usr from the install target.
-	(VERSION): Increment.
-	include/_mingw.h: Ditto.
-
-2001-09-17  Earnie Boyd  <earnie@SF.net>
-
-	* Makefile.in: Increment version.
-	* include/_mingw.h: Ditto.
-
-2001-09-10  Earnie Boyd  <earnie@SF.net>
-
-	* dossh: Remove inadvertantly imported file.
-
-2001-09-10  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* dirent.c (opendir): Use GetFileAttributes rather than stat
-	to determine if input arg is dir.
-
-2001-08-29  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdarg.h (va_list): Typedef as __builtin_va_list if
-	__GNUC__ >= 3. 
-	* include/varargs.h (va_list): Ditto.
-	* include/stdio.h (va_list): Ditto.
-
-2001-08-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/stdlib.h (_wpgmptr): Don't declare ifndef __MSVCRT__.
-	* include/stdio.h (_IORW): Change constant to 0x0080.
-	(TMP_MAX): Add new define.
-	(_P_tmpdir): Ditto.
-	(_wP_tmpdir): Ditto.
-	(L_tmpnam): Change constant to 16.
-
-2001-06-28  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/malloc.h: Fix non-ANSI comment after #endif.
-
-2001-06-11  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-
-	* profile/configure.in: Make msvcrt.dll version default.
-	* profile/makefile.in: Build both gcrt1.o and gcrt2.o.	
-	* provile/configure: Regenerate.
-
-2001-06-11  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/stdio.h (swscanf): Make first arugument const. 
-	* include/wchar.h (swscanf): Ditto. 
-	* include/tchar.h (_tfopen): New _UNICODE define.
-	(_tgetenv): Ditto.
-	(_tsetlocale): Ditto.
-
-2001-06-04  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* profile/Makefile.in (mkinstalldirs): Correct relative path.
-
-2001-06-04  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/_mingw.h: Change version to 1.0.
-	Makefile.in: Ditto.
-
-2000-02-21  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/tchar.h: (__TEXT): Remove undef.
-	(_TEXT): Ditto.
-	(_T): Ditto.
-
-Fri Feb  2 10:34:07  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/tchar.h: (__TEXT): Add private macro.
-	(_TEXT): Modify definition to use __TEXT.
-	(_T): Ditto.
-	This change allows the passing of a MACRO as an argument and have that
-	MACRO resolved first.
-	Thanks to: Eric PAIRE <eric.paire@ri.silicomp.com>
-
-Wed Jan 31 17:12:51  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* Makefile.in: Increment version to 0.5
-	* include/_mingw.h: Increment minor version
-
-Tue Jan 30 13:01:01  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/assert.h: (assert): Remove ; from end of definition
-	Thanks to: AJ Reins <tbisp@qwest.net>
-
-Tue Jan 30 07:31:22  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/time.h: (CLOCKS_PER_SEC): Type cast the constant.
-	Thanks to: Cosmin Truta  <cosmin@cs.toronto.edu>
-
-Mon Jan 29 14:03:07  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* time.h: (CLOCKS_PER_SEC) Change from FP to  integer constant.
-
-Sun Jan 28 13:01:08  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/wchar.h: The 2001.01.18 Change was incorrect.  The functions
-	are actually C functions.  These functions are resolved via the
-	-lmsvcp60 library and comments were placed in the header.
-
-2001-01-28  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-
-	*include/stdlib.h (__p__pgmptr): add prototype.
-	(__p__wpgmptr): likewise.
-	(_pgmptr_dll): move declaration from dos.h.
-	(_wpgmptr_dll): likewise.
-	(_pgmptr): conditional define (MSVCT/CRTDLL).
-	(_wpgmptr): likewise.
-	*include/dos.h (_base*_dll variables): declare only for CRTDLL.
-	(_os*_dll variables): likewise.
-	(_pgmptr_dll): remove declaration and associated defines to stdlib.h.
-	(_wpgmptr_dll): likewise.
-
-2001-01-22  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-
-	* include/stdint.h: New file.
-
-Thu Jan 18 10:33:01  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/wchar.h: Protect prototypes only declared in the C++ STL
-	from being declared unless __cplusplus is defined.
-
-Tue Jan 16 11:37:31  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/stdlib.h: Apply Danny Smith patch 102730
-	2000-12-09  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	(_wgetenv) Correction to return type.
-
-Tue Jan 16 09:41:41  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/locale.h: Apply Danny Smith patch 101834
-	2000-11-23  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	(LC_MIN) Add definition.
- 	(LC_MAX) ditto. 
-	(_wsetlocale) Add prototype.
-
-2000-11-29  Earnie Boyd  <earnie_boyd@yahoo.com>
-
-	* Makefile.in: eliminate the need for RUNTIME and CRT_ID.
-	Always build crt1.o, dllcrt1.o, crt2.o and dllcrt2.o.
-	Create a libcoldname.a for the oldname library for CRTDLL.
-	Restrict libmoldname.a for the oldname library for MSVCRT.
-	* configure.in: eliminate setting RUNTIME and CRT_ID variables.
-	Restructure the $target_os case logic.
-	Always name the MinGW thread dll helper mingwm.
-	Change Cygwin's HEADER_SUBDIR value from mingw32 to mingw.
-	* configure: regenerate.
-
-2000-11-22  Earnie Boyd  <earnie_boyd@yahoo.com>
-
-	* Makefile.in: Fix bindist target to distribute the correct files.
-	Remove the use of SNAPSHOT variable and test SNAPDATE instead.
-	Set SNAPDATE within the snapshot target on recursive call to $(MAKE).
-
-2000-11-21  Earnie Boyd  <earnie_boyd@yahoo.com>
-
-	* Makefile.in: Add missing line continuation `\' for $(SUBDIRS) target.
-	Add variables and targets to control binary and source distributions.
-	Add variables and targets to control snapshot distribution.
-	* profile/gmon.h: Add missing #endif for #ifndef.
-	* profile/ChangeLog: Merge entries here and remove.
-	* profile/Makefile.in: Add variables and targets to control 
-	distribution.
-	* README: Add.
-	* TODO: ditto.
-	* config.guess: ditto.
-	* config.sub: ditto.
-	* mkinstalldirs: ditto.
-	* install-sh: ditto.
-	* configure: regenerate.
-	* profile/configure: ditto.
-
-2000-11-20  Earnie Boyd  <earnie_boyd@yahoo.com>
-
-	* Merge in changes from
-	2000-10-23  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	* include/direct.h: add guard around MSVCRT-only prototytpes
-	* include/io.h: add __int64 struct definitions and function prototypes;
-		 add guard for MSVCRT-only prototypes
-	* include/limits.h: add ISO C9x macros LLONG_MIN, LLONG_MAX, ULLONG_MAX
-	* include/stdio.h: add wchar function prototypes (__MSVCRT__);
-		 put wchar functions together to make sync with wchar.h easier
-	* include/stdlib.h: add wide char functions (__MSVCRT__)
-	* include/string.h: add string collation functions ( __MSVCRT__)
-	* include/sys/stat.h: add __int64 struct and function ( __MSVCRT__)
-	* include/tchar.h: add macros and macro function definitions
-	* include/wchar.h: add wide char function prototypes ( __MSVCRT__ );
-		enclose more functions in __MSVCRT__ guard;
-		some oldname wide char function prototypes #if (0)'d
-	* profile/gmon.h: add guard around BSD-ish typedefs
-
-Mon Nov 20 18:58:12 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Use a different variable name for subdirectory since the
-	previous one was used by the top level make.
-
-Sun Nov 19 20:50:51 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Install mingw stuff in a subdirectory if building under
-	cygwin.
-
-Sat Jun 17 21:48:23 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in (subdirs): Eliminate for loop.
-
-Sat Jun 17 18:27:59 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in (subdirs): Previous change did not fix problem in
-	broken shells.
-
-Sat Jun 17 13:49:12 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Avoid installing dll if we're cross building and the
-	cross-host system isn't a Windows system.
-	* configure.in: Detect cross-hosting situation and set appropriate
-	variables in Makefile.in.
-	* configure: Regenerate.
-
-Wed Apr 19 13:10:54 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* configure.in: Change HEADER_SUBDIR to mingw32.
-	* configure: Regenerate.
-
-Mon Apr 10 17:24:28 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/string.h: Use proper prototype for _strerror.
-
-2000-03-30  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Makefile.in (subdirs): Workaround for broken shells.
-
-2000-02-03  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Snapshot 2000-02-03.
-
-	* include/{assert.h, conio.h, ctype.h, direct.h, dirent.h, fcntl.h, 
-	float.h, io.h, locale.h, malloc.h, math.h, process.h, signal.h, 
-	stdio.h, stdlib.h, string.h, time.h, wctype.h, sys/stat.h, 
-	sys/timeb.h, sys/utime.h}: Remove parameter names to avoid namespace
-	pollution.
-
-	* Makefile.in (all): Build CRT0S first.
-	(libmingwthrd.a): Remove thread support DLL from dependency.
-
-2000-01-21  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Snapshot 2000-01-21.
-
-2000-01-20  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	Merge in changes from Cygwin:
-	* configure.in (HEADER_SUBDIRS): New variable. Substitute.
-	(SUBDIRS): Likewise.
-	* Makefile.in (HEADER_SUBDIRS): New variable.
-	(install): Use to install Mingw headers to a subdirectory if building
-	under Cygwin.
-	(DLL_CC_STUFF): Add DLL entry point.
-	* configure: Regenerate.
-
-2000-01-19  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/stdio.h (fsetpos): Fix prototype.
-	(fpos_t): Fix for MSVCRT.
-	* include/float.h (fpreset): Add prototype.
-	* include/limits.h: Define UINT_MAX, USHRT_MAX and ULONG_MAX with
-	constant values.
-	* include/time.h: Don't define tzname as a macro for CRTDLL, and
-	export using libmoldname.a.
-	* crtdll.def: Add DATA tags.
-	* msvcrt.def: Likewise.
-	* moldname.def.in: Likewise. Add fpreset. Export tzname for
-	both MSVCRT and CRTDLL.
-	* moldname-crtdll.def: Regenerate.
-	* moldname-msvcrt.def: Regenerate.
-
-Tue Dec 21 02:22:14 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-	
-	* Snapshot 1999-12-21.
-
-	* include/wctype.h: New file.
-	* include/ctype.h (MB_CUR_MAX): Define.
-	(wctype_t): Guard.
-	* include/stdlib.h (MB_CUR_MAX): Define.
-	* include/wchar.h: Define stat, _stat structures here as well.
-	* include/float.h: Add invalid subconditions (_SW) and floating
-	point error (_FPE) macros.
-	* include/time.h (_CLOCK_T): Rename macro to _CLOCK_T_DEFINED.
-	(_TIME_T): Rename macro to _TIME_T_DEFINED.
-	* include/sys/types.h: Likewise.
-
-Thu Nov 18 00:22:26 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* profile/profil.c (profile_on): Set the profiler thread priority to
-	be time critical. Thanks to Pascal Obry <pascal_obry@csi.com>.
-	* Snapshot 1999-11-18.
-
-Sun Nov  7 02:50:09 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	Released 1999-11-07.
-
-	* Makefile.in (CRT0S): Add crtst.o.
-	(install): Install in subdirs as well.
-	* dirent.h (struct _stat): Rename from struct stat.
-	* include/tchar.h: Add some new macros. Thanks to
-	Eric Kohl <ekohl@abo.rhein-zeitung.de>.
-	* profile/Makefile.in (install): Fix target.
-
-Thu Nov  4 14:32:58 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Makefile.in: Add support for profile directory.
-	* configure.in: Likewise.
-	* configure: Regenerate.
-
-	* profile: Imported profiling sources from winsup-19991026 snapshot.
-	* profile/Makefile.in: New file.
-	* profile/configure.in: New file.
-	* profile/configure: Generate.
-	* profile/gcrt0.c (u_char, u_short, u_int, u_long): typedef for Mingw.
-	* profile/gmon.h (u_char, u_short, u_int, u_long): Likewise.
-	* profile/gmon.c (unistd.h): Include conditionally.
-	(sys/param.h): Likewise.
-	* profile/mcount.c (sys/param.h): Likewise.
-	* profile/profil.c (profile_on): thread id is DWORD, not int.
-
-
-Wed Nov  3 16:26:44 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/stdlib.h: Add wide character version of argv/environ.
-	Formatting changes.
-	* include/wchar.h: More wide character prototypes.
-	* include/sys/stat.h: Likewise. Add struct stat as well as _stat.
-
-	* dllcrt1.c (init.c): Don't include.
-	(DllMainCRTStartup): Don't call _mingw32_init_mainargs().
-	* Makefile.in: Remove init.c from dllcrt{1,2}.c dependency lists.
-
-Sat Oct 30 03:06:26 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* moldname.def: Remove file.
-	* moldname.def.in: And add this.
-	* moldname-msvcrt.def: Generate from moldname.def.in.
-	* moldname-crtdll.def: Likewise.
-
-	* mthr.c: New file for -mthread (thread-safe C++ EH) support.
-	* mthr_init.c: New file for -mthread (thread-safe C++ EH) support.
-	* mthr_stub.c: New file for -mthread (thread-safe C++ EH) support.
-
-	* Makefile.in: Update.
-	* configure.in: Likewise. Also add *cygwin* target for building
-	under Cygwin winsup.
-	* configure: Regenerate.
-
-Fri Oct  1 11:10:30 1999 Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/_mingw.h: Add version macros.
-	* include/direct.h (_diskfree_t, getdiskfree, getdrives):  Add.
-	Also add wide character versions shared with wchar.h.
-	* include/dos.h (_diskfree_t, getdiskfree, getdrives):  Add.
-	* include/io.h (sopen, _sopen): Fix prototype.
-	Add wide character prototypes.
-	* include/wchar.h: Likewise.
-	* include/stdlib.h (beep, seterrormode, sleep): Remove non-
-	underscored versions. Potential incompatibility.
-	* include/time.h (daylight, timezone, tzname): Fix MSVCRT cases.
-	Add wide character prototypes.
-	* include/sys/timeb.h (struct _timeb): Don't use macro, but real
-	definition.
-
-Wed Aug 18 18:38:39 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* configure.in (RUNTIME, CRT_ID): Add to differentiate between
-	crtdll and msvcrt runtimes. Remove DLL_ENTRY and DEF_DLL_ENTRY
-	macros.
-	* configure: Rengerate.
-	* Makefile.in (RUNTIME, CRT_ID): Use to generate the correct
-	dll name and crt's. CRTDLL and MSVCRT are meant to created
-	separately, so remove all the *-msvcrt* targets.
-	(libmingwthr.a): New target. Dummy thread support archive.
-	(LIBS): Add libmingwthr.a.
-	(CRT0S): Use CRT_ID. Add crtmt.o.
-	(MINGW_OBJS): Add crtst.o.
-	* main.c (WinMain): Fix prototype.
-	* crtmt.c: New file.
-	* crtst.c: New file.
-
-	* include/process.h (_beginthreadex): Fix prototype.
-	* include/_mingw.h (__int64): Define for __GNUC__.
-	* include/tchar.h (_ttol): Add macro.
-	* include/stdlib.h (_wtoi, _wtol, _i64toa, _ui64toa, _atoi64,
-	_i64tow, _ui64tow, _wtoi64): Add prototypes.
-
-	Reported by Emanuele Aliberti <ea@iol.it>:
-	* include/tchar.h (_ttoi): Add macro.
-
-	Reported by Ulf Moeller <3umoelle@informatik.uni-hamburg.de>:
-	* include/stdio.h (_snprintf): Add prototype.
-	(_vsnprintf): Likewise.
-
-Sat Aug  7 18:00:00 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	Reported by Tor Lillqvist <tml@iki.fi>:
-	* include/stdlib.h (__p___argv): Fix return type.
-
-Fri Jul 30 22:07:06 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-	
-	Add UWIN support.
-	* include/errno.h (errno): It's linked in from startup, not imported.
-	* include/stdlib.h (errno): Likewise.
-	* include/io.h: Guard against conflicting macros and prototypes in 
-	system headers.
-	* include/stdlib.h: Likewise.
-	* include/string.h: Likewise.
-	* include/time.h: Likewise.
-
-Fri Jul 30 13:47:34 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/io.h (X_OK): Fix definition. Thanks to Jan Nijtmans.
-	* include/dos.h: Fix typo __MINGW_EXPORT->__MINGW_IMPORT.
-	* Makefile.in (INCLUDES): Remove old windows32 include directory.
-
-	* crt1.c (_gnu_exception_handler): Fix prototype.
-	(__mingw_CRTStartup): New function based on mainCRTStartup.
-	(mainCRTStartup): Set the app type for MSVCRT and call
-	__mingw_CRTStartup.
-	(WinMainCRTStartup): Likewise.
-	* init.c (_startupinfo): Define.
-	(_getmainargs): Add 5th parameter.
-	(_mingw32_init_mainargs): Use.
-
-	* ALL *.c files: Reformat according to GNU coding style.
-
-Fri Jul 16 00:46:04 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Makefile.in (INCLUDES): Add w32api include directory.
-
-	* include/_mingw.h: New file.
-	* include/{assert.h,conio.h,ctype.h,direct.h,dirent.h,dos.h,
-	  errno.h,excpt.h,fcntl.h,float.h,io.h,limits.h,locale.h,malloc.h,
-	  math.h,process.h,setjmp.h,share.h,signal.h,stdarg.h,stdio.h,
-	  stdlib.h,string.h,tchar.h,time.h,varargs.h,sys/locking.h,
-	  sys/stat.h,sys/timeb.h,sys/types.h,sys/utime.h}: Include and
-	  use the macros __DECLSPEC_SUPPORTED  and __MINGW_IMPORT.
-	
-	* include/stdlib.h (atexit): Fix prototype.
-
-Mon Jun 14 18:38:49 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/stdio.h (_tempnam): Fix prototype.
-	(tempnam): Likewise.
-	* include/stdlib.h: Replace with GCC's version, and guard
-	with RC_INVOKED.
-
-	From Anders Norlander <anorland@hem2.passagen.se>:
-	* include/stdlib.h (__argc): Declare.
-	(__argv): Likewise.
-
-Mon Apr  5 13:49:17 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* crt1.c (_gnu_exception_handler): Acknowledge Jacob Navia's
-	contribution.
-	* Makefile.in (_libm_dummy.o): New target.
-	(libm.a): Use. 
-
-Tue Mar 16 18:15:26 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Released 1999-03-16 along with egcs-1.1.2.
-
-Wed Feb 17 17:15:56 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Makefile.in (LIBS): Add libm.a.
-	(libm.a): Dummy libm.a.
-
-	* Makefile.in: Update from winsup 1999-02-08 snapshot.
-	Preserve local changes.
-	(mkinstalldirs): In ../, not ../../.
-	(INCLUDES): Point to local windows32api headers and use -nostdinc.
-	(LIBGCC): Delete.
-	(LIBS): Add libmoldname-msvc.a.
-	(libmoldname-msvc.a): Add target.
-	(distclean): Add target.
-
-Tue Feb  9 00:26:05 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/dir.h: Reintroduce as an obsolescent header.
-	* crt1.c (signal.h): Include.
-	(_gnu_exception_handler): New function to properly handle win32
-	asynchronous signals.
-	(mainCRTStartup): Use.
-
-Sun Jan  3 23:52:25 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-	
-	* include/direct.h: Include io.h instead of dir.h
-	* include/dirent.h: Likewise.
-	* include/dos.h: Likewise.
-	* include/stdio.h: Replace reference to dir.h with io.h.
-
-Thu Dec 31 16:04:55 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* 1999-01-01 release bundled with egcs-1.1.1.
-
-	* include/io.h: Incorporate dir.h.
-	* include/dir.h: Remove.
-	* include/signal.h: Move RC_INVOKED up a bit.
-
-Tue Dec 29 15:04:38 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/signal.h (sig_atomic_t): Define.
-	(NSIG): Define.
-	* include/malloc.h: Import defs from deprecated alloc.h.
-	* include/alloc.h: Remove.
-
-	From "Daniel J. Rodriksson" <djr@dit.upm.es>:
-	* include/sys/types.h (_dev_t): Should be unsigned int for MSVCRT.
-	* include/sys/stat.h (struct stat): st_uid is of type short. Use
-	_off_t instead of long for st_size.
-
-Thu Sep 10 22:28:49 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-	
-	* include/errno.h (sys_errlist, sys_nerr): Move from here ...
-	* include/stdlib.h: Here.
-
-	* include/netdb.h: Remove.
-	* include/arpa/inet.h: Remove.
-	* include/netinet/in.h: Remove.
-	* include/sys/socket.h: Remove.
-
-Fri Sep  4 15:09:11 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Release egcs-1.1.
-
-	* include/{ctype.h,dos.h,io.h,string.h,time.h,sys/types.h,
-	sys/utime.h}: Protect stddef.h in RC_INVOKED macro.
-
-Thu Sep  3 10:43:29 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* setjmp.h (_JBTYPE, _JBLEN): Define correctly.
-	(jmpbuf): typedef using above. 
-	(setjmp, longjmp): Prototype using jmpbuf.
-
-	Merge with Colin Peters' 980701 snapshot. I've ignored changes to
-	obsolescent imported names, ie., from __imp__ to _imp___. 
-
-	Also ignored empty include/sys/param.h and incorrect
-	include/sys/times.h.
-
-	* CRTinit.c: New file.
-	* include/{errno.h,fcntl.h,math.h,process.h} (__MSVCRT__): Use #ifdef 
-	instead of #if.
-	* include/io.h (umask): Fix prototype.
-	* include/stdlib.h (OS constants): Replace with Colin's.
-	* include/time.h (tzset, daylight, timezone): Replace with Colin's.
-	* include/sys/state.h: Merge.
-
-Thu Sep  3 09:49:07 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/assert.h (assert): Lose the trailing semicolon.
-
-Thu Jul 30 21:18:49 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/math.h (matherr): Declare.
-	* include/stdio.h (fileno, _fileno): Declare.
-	* include/stdlib.h (environ, _environ): Fix to use runtime DLL.
-
-	From Earnie Boyd:
-	* include/stdio.h (fdopen, _fdopen): Add const.
-	(getw, putw): Declare.
-	* include/stdlib.h (MAX_{DRIVE,DIR,FNAME,EXT}): Fix. 
-
-Sat Jun 13 18:19:41 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/time.h (_timezone): Undefine.
-	* include/sys/timeb.h (struct timeb): Rename _timezone to timezone.
-
-	* include/time.h (_daylight, _timezone, _tzname, _tzset): Remove
-	__cdecl for MSVCRT.
-	* include/stdlib.h (environ): Use DLL version.
-	* init.c (environ): Undefine it before use.
-
-Sun Mar 22 19:59:30 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Update to 980309 snapshot from Colin Peters.
-
-	* include/utime.h: remove
-	* include/stdlib.h (__imp__osver_dll, __imp__winver_dll,
-	__imp__winmajor_dll, __imp__winminor_dll): Apply Jan-Jaap's 
-	patches to define these.
-	* include/time.h (CLK_TCK): Renamed from CLK_TICK.
-	(_daylight, _timezone, _tzname, _tzset): Define.
-
-	* include/netdb.h: Add from Colin's windows32api changes.
-	* include/sys/socket.h: Likewise.
-	* include/arpa/inet.h: Likewise.
-	* include/netinet/in.h: Likewise.
-
-Wed Feb  4 14:16:44 1998  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Update to 980128 snapshot from Colin Peters. 
-
-Sat Dec  6 21:30:35 1997  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* configure.in (AC_INIT): Use dllmain.c instead of defunct
-	oldnames.c
-	* configure: Regenerate.
-
-Fri Dec  5 15:57:36 1997  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Update to 971205 snapshot from Colin Peters. Lots of changes.
-	Files renamed and include hierarchy loses directories named
-	nonansi.
-
-	* include/dos.h: from Jan-Jaap.
-
-Thu Dec  4 21:48:13 1997  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	Changes to conform to FSF tree.
-
-	* crt1.c: Renamed from mcrt0.c.
-	* dllcrt1.c: Renamed from dllcrt0.c.
-	* Makefile.in: Update above. Also renamed libmoldnames.a to
-	libmoldname.a.
-
-Mon Dec  1 16:51:30 1997  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* crtdll.def: Export all functions but the ones with funny names.
-	* moldnames.def: Add fdopen since fileno is already there.
-	* include/nonansi/dos.h: New file from Jan-Jaap.
-	* include/errno.h: Add extern decl + various additions from JJ.
-	* include/stdio.h: Likewise.
-	* include/stdlib.h: Likewise.
-	* include/nonansi/io.h: Likewise.
-	* include/nonansi/process.h: Likewise.
-	* include/sys/types.h: Likewise.
-
-Tue Nov  4 14:51:01 1997  Mumit Khan  <khan@xraylith.wisc.edu>
-	
-	* include/time.h (CLK_TCK): Renamed from CLK_TICK.
-	(CLK_TICK): Delete.
-	* include/stdlib.h (free): Fix prototype to return void, not void*.
-	* include/nonansi/process.h: Add P_* and WAIT_* defs.
-
-	* dllcrt0.c: Delete now-unneeded '.section .idata$3' asm hack.
-	* mcrt0.c: Likewise.
-
-	* Makefile.in (LIBS): Delete moldnames.dll from target libs.
-	(libmoldnames.a): Add explicit rule to create it.
-
-Fri Aug 15 18:23:43 1997  Rob Savoye  <rob@cygnus.com>
-
-	New directory for the minimalist cygwin environment.
-	
-	* crtglob.c: New file. Turn on file globbing support. 
-	* crt_noglob.c: New file. Turn off file globbing support. 
-	* ctype_old.c: New file. Wrappers for functions that don't
-	have an underscore.
-	* dirent.c: New file. Directory routines readdir, opendir, closedir.
-	* dllcrt0.c: New file. Initialization code to use crtdll.dll.
-	* dllmain.c: New file. A stub DllMain function.
-	* hugeval.c: New file. A gross hack to define HUGE_VAL.
-	* init.c: New file. Common code to initialize standard file
-	handles and command line arguments.
-	* main.c: New file. A main for programs that only call WinMain.
-	* mcrt0.c: New file. Default crt0 for mingw32.
-	* oldnames.c: New File. Wrappers for functions that don't
-	have an underscore.
-	* string_old.c:  New File.
-	* include/{assert.h,ctype.h,errno.h,float.h,limits.h,locale.h
-	math.h,nonansi,setjmp.h,signal.h,stdarg.h,stddef.h,stdio.h,stdlib.h
-	string.h,tchar.h,time.h,wchar.h}: New header files for mingw.
-	* include/sys/types.h: New header file for mingw.
-	* include/nonansi/{alloc.h,conio.h,dir.h,direct.h,dirent.h
-	fcntl.h,io.h,malloc.h,mem.h,memory.h,process.h,share.h,unistd.h
-	utime.h,values.h,varargs.h}: New header files for mingw.
-	* include/nonansi/sys/{fcntl.h,locking.h,stat.h,time.h
-	timeb.h,unistd.h}: New header files for mingw.
-	* Makefile.in,configure.in: Build and configure support.
-	* configure: Generated from autoconf 2.12 with Cygnus patches.
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
deleted file mode 100644
index 656fd25b7..000000000
--- a/winsup/mingw/Makefile.in
+++ /dev/null
@@ -1,464 +0,0 @@
-# Makefile.in for the winsup/mingw directory.
-# Copyright (c) 1995, 1996, 1997, 1998 Cygnus Solutions
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# This makefile requires GNU make.
-
-PACKAGE = mingw-runtime
-VERSION = 4.0
-CYGRELEASE = 1
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-objdir = .
-
-host_alias = @host_alias@
-build_alias = @build_alias@
-target_alias = @target_alias@
-prefix = @prefix@
-conf_prefix = @prefix@
-
-program_transform_name = @program_transform_name@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-ifeq ($(target_alias),$(host_alias))
-ifeq ($(build_alias),$(host_alias))
-tooldir:=$(exec_prefix)
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-datadir = @datadir@
-infodir = @infodir@
-includedir = @includedir@
-ifneq (,$(findstring cygwin,$(target_alias)))
-inst_bindir:=$(tooldir)/bin
-inst_includedir:=$(tooldir)/include/mingw
-inst_libdir:=$(tooldir)/lib/mingw
-else
-inst_bindir:=$(bindir)
-inst_includedir:=$(includedir)
-inst_libdir:=$(libdir)
-endif
-
-# The Mingw headers are installed under a subdirectory of 
-# $(tooldir)/include when configuring in Cygwin.
-HEADER_SUBDIR = @HEADER_SUBDIR@
-
-SHELL = /bin/sh
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-mkinstalldirs = $(SHELL) @MKINSTALLDIRS@
-
-CC = @CC@
-# FIXME: Which is it, CC or CC_FOR_TARGET?
-CC_FOR_TARGET = $(CC)
-AS_FOR_TARGET = $(AS)
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-
-# compiling with Cygwin?
-MNO_CYGWIN = @MNO_CYGWIN@
-ifdef MNO_CYGWIN
-   subdirforlib=/mingw
-else
-   libdir=
-endif
-
-# Either crtdll (CRT_ID 1) or msvcrt (CRT_ID 2).
-RUNTIME = @RUNTIME@
-CRT_ID = @CRT_ID@
-
-# Needed for threading dll.
-THREAD_DLL = @THREAD_DLL@
-THREAD_DLL_VERSION = 10
-THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
-
-# Various libraries.
-LIBM_A=@LIBM_A@
-
-W32API_INCLUDE = @W32API_INCLUDE@
-INCLUDES+= -I$(srcdir)/include \
-  -I$(srcdir)/../include \
-  -nostdinc -nostdinc++ \
-  -iwithprefixbefore include
-ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
-ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-AR_FLAGS = rcv
-RANLIB = @RANLIB@
-DLLTOOL = @DLLTOOL@
-DLLTOOLFLAGS = 
-DLLTOOL_FOR_TARGET = $(DLLTOOL)
-DLLTOOL_FLAGS = --as $(AS_FOR_TARGET)
-DLLWRAP = @DLLWRAP@
-DLLWRAP_FOR_TARGET = $(DLLWRAP)
-DLLWRAP_FLAGS = --dlltool $(DLLTOOL) --as $(AS) --driver-name $(CC)
-
-TAR = tar
-TARFLAGS = z
-TARFILEEXT = .tar.gz
-
-SUBDIRS := @SUBDIRS@
-
-FLAGS_TO_PASS:=\
-	AS="$(AS)" \
-	CC="$(CC)" \
-	CFLAGS="$(CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_CONFIG)" \
-	CXXFLAGS="$(CXXFLAGS) $(CFLAGS_COMMON) $(CFLAGS_CONFIG)" \
-	EXE_LDFLAGS="$(EXE_LDFLAGS)" \
-	AR="$(AR)" \
-	RANLIB="$(RANLIB)" \
-	LD="$(LD)" \
-	DLLTOOL="$(DLLTOOL)" \
-	exec_prefix="$(exec_prefix)" \
-	bindir="$(bindir)" \
-	libdir="$(libdir)" \
-	tooldir="$(tooldir)" \
-	datadir="$(datadir)" \
-	infodir="$(infodir)" \
-	includedir="$(includedir)" \
-	inst_bindir="$(inst_bindir)" \
-	inst_includedir="$(inst_includedir)" \
-	inst_libdir="$(inst_libdir)" \
-	prefix="$(prefix)" \
-	target_alias="$(target_alias)" \
-	TAR="$(TAR)" \
-	TARFLAGS="$(TARFLAGS)" \
-	TARFILEEXT="$(TARFILEEXT)"
-
-CRT0S = crt1.o dllcrt1.o crt2.o dllcrt2.o CRT_noglob.o crtmt.o crtst.o \
-	CRT_fp8.o CRT_fp10.o txtmode.o binmode.o
-MINGW_OBJS = CRTglob.o CRTfmode.o CRTinit.o  dllmain.o gccmain.o \
-	     main.o crtst.o mthr_stub.o CRT_fp10.o txtmode.o \
-	     pseudo-reloc.o pseudo-reloc-list.o
-
-MOLD_OBJS = isascii.o iscsym.o iscsymf.o toascii.o \
-	strcasecmp.o strncasecmp.o wcscmpi.o
-
-LIBS = libcrtdll.a \
-       libmsvcrt.a libmsvcrtd.a \
-       libmsvcr70.a libmsvcr70d.a \
-       libmsvcr71.a libmsvcr71d.a \
-       libmingw32.a \
-       libcoldname.a \
-       libmoldname.a libmoldnamed.a \
-       $(LIBM_A) \
-       libmingwthrd.a
-
-DLLS = $(THREAD_DLL_NAME)
-
-SRCDIST_FILES = CRT_noglob.c CRTfmode.c CRTglob.c CRTinit.c ChangeLog \
-Makefile.in README TODO config.guess config.sub configure configure.in \
-crt1.c crtdll.def crtmt.c crtst.c  dllcrt1.c dllmain.c \
-gccmain.c init.c install-sh jamfile main.c mkinstalldirs \
-moldname.def.in msvcrt.def.in \
-mthr.c mthr_init.c mthr_stub.c readme.txt \
-isascii.c iscsym.c iscsymf.c toascii.c \
-strcasecmp.c strncasecmp.c wcscmpi.c \
-CRT_fp8.c CRT_fp10.c test_headers.c txtmode.c binmode.c pseudo-reloc.c \
-pseudo-reloc-list.c
-
-
-all_dlls_host = @all_dlls_host@
-install_dlls_host = @install_dlls_host@
-
-all: $(CRT0S) $(LIBS) $(all_dlls_host)
-	@$(MAKE) subdirs DO=$@ $(FLAGS_TO_PASS)
-
-all_dlls_host: $(DLLS)
-
-install_dlls_host:
-	for i in $(DLLS); do \
-		$(INSTALL_PROGRAM) $$i $(inst_bindir)/$$i ; \
-	done
-
-_libm_dummy.o:
-	rm -f _libm_dummy.c
-	echo "static int __mingw_libm_dummy;" > _libm_dummy.c
-	$(CC) -c $(ALL_CFLAGS) _libm_dummy.c
-	rm -f _libm_dummy.c
-
-libm.a: _libm_dummy.o
-	$(AR) rc $@ _libm_dummy.o
-	$(RANLIB) $@
-
-libmingwthrd.a: crtmt.o mingwthrd.def 
-	$(DLLTOOL) $(DLLTOOL_FLAGS) --dllname $(THREAD_DLL_NAME) \
-	  --def mingwthrd.def --output-lib $@
-	$(AR) $(ARFLAGS) $@ crtmt.o
-	$(RANLIB) $@
-
-# Using dllwrap would be so much easier, but Cygnus top-level configure
-# Makefile.in etc don't pass the right variables yet.
-xx_$(THREAD_DLL_NAME) xx_mingwthrd.def: mthr.o mthr_init.o
-	$(DLLWRAP) $(DLLWRAP_FLAGS) -o $(THREAD_DLL_NAME) \
-		--output-def mingwthrd.def \
-		mthr.o mthr_init.o
-
-DLL_OFILES        = mthr.o mthr_init.o
-DLL_CC_STUFF      = -B./ -mdll $(MNO_CYGWIN) -Wl,--image-base,0x6FBC0000 \
-		    -Wl,--entry,_DllMainCRTStartup@12 \
-                    $(DLL_OFILES) \
-		    -Lmingwex
-DLL_DLLTOOL_STUFF = --as=$(AS) --dllname $(THREAD_DLL_NAME) \
-                    --def mingwthrd.def \
-                    --base-file mingwthrd.base --output-exp mingwthrd.exp
-
-$(THREAD_DLL_NAME) mingwthrd.def: $(DLL_OFILES) Makefile $(SUBDIRS)
-	$(DLLTOOL) --as $(AS) --output-def mingwthrd.def $(DLL_OFILES)
-	$(CC) -Wl,--base-file=mingwthrd.base $(DLL_CC_STUFF) \
-		-o mingwthrd_dummy.exe
-	$(DLLTOOL) $(DLL_DLLTOOL_STUFF)
-	$(CC) -Wl,--base-file=mingwthrd.base mingwthrd.exp $(DLL_CC_STUFF) \
-		-o mingwthrd_dummy.exe
-	$(DLLTOOL) $(DLL_DLLTOOL_STUFF) 
-	$(CC) mingwthrd.exp -o $(THREAD_DLL_NAME) $(DLL_CC_STUFF)
-	rm -f mingwthrd_dummy.exe
-
-libmingw32.a: $(MINGW_OBJS)
-	$(AR) rc $@ $(MINGW_OBJS)
-	$(RANLIB) $@
-
-msvcrt.def msvcrtd.def \
-msvcr70.def msvcr70d.def \
-msvcr71.def msvcr71d.def \
-: msvcrt.def.in
-	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
-		-D__FILENAME__=$@ \
-		-D__MSVCRT__ -C -E -P \
-		-xc-header $? > $@
-
-moldname-crtdll.def: moldname.def.in
-	$(CC) -DRUNTIME=crtdll \
-		-D__FILENAME__=moldname-crtdll.def \
-		-D__CRTDLL__  -C -E -P \
-		-xc-header $? > $@
-
-moldname-msvcrt.def: moldname.def.in
-	$(CC) -DRUNTIME=msvcrt \
-		-D__FILENAME__=moldname-msvcrt.def \
-		-D__MSVCRT__  -C -E -P \
-		-xc-header $? > $@
-
-libcoldname.a: moldname-crtdll.def $(MOLD_OBJS)
-	$(DLLTOOL) --as $(AS) -k -U	\
-		--dllname crtdll.dll	\
-		--def moldname-crtdll.def	\
-		--output-lib $@
-	$(AR) rc $@ $(MOLD_OBJS)
-	$(RANLIB) $@
-
-libmoldname.a: moldname-msvcrt.def $(MOLD_OBJS)
-	$(DLLTOOL) --as $(AS) -k -U	\
-		--dllname msvcrt.dll	\
-		--def moldname-msvcrt.def	\
-		--output-lib $@
-	$(AR) rc $@ $(MOLD_OBJS)
-	$(RANLIB) $@
-
-libmoldnamed.a: moldname-msvcrt.def $(MOLD_OBJS)
-	$(DLLTOOL) --as $(AS) -k -U	\
-		--dllname msvcrtd.dll	\
-		--def moldname-msvcrt.def	\
-		--output-lib $@
-	$(AR) rc $@ $(MOLD_OBJS)
-	$(RANLIB) $@
-
-# The special rules are necessary.
-crt1.o dllcrt1.o:
-	$(CC) -c -D__CRTDLL__ -U__MSVCRT__ $(ALL_CFLAGS) $< -o $@
-
-crt2.o dllcrt2.o:
-	$(CC) -c -D__MSVCRT__ -U__CRTDLL__ $(ALL_CFLAGS) $< -o $@
-
-TEST_H_OPTIONS = $(ALL_CFLAGS) -Wall -W -Wsystem-headers -c \
-	$(srcdir)/test_headers.c -o test_headers.o
-
-.PHONY: test_headers
-test_headers:
-	@echo "Testing runtime headers..."
-	@for lang in c c++ objective-c ; do \
-		echo "$$lang ..."; \
-		$(CC) -x$$lang  $(TEST_H_OPTIONS) ; \
-		echo "$$lang -ansi"; \
-		$(CC) -x$$lang -ansi $(TEST_H_OPTIONS) ; \
-	done
-# specify -std=xx only for C
-	@for std in gnu89 gnu99 c89 c99 ; do \
-		echo "std = $$std"; \
-		$(CC) -std=$$std  $(TEST_H_OPTIONS) ; \
-	done
-
-	@rm -f test_headers.o
-
-clean:
-	-rm -f *.o *.a *~ core a.out mingwthrd.def mingwthrd.base mingwthrd.exp
-	-rm -f $(THREAD_DLL_NAME) mingwthrd_dummy.exe
-	-rm -f moldname-*.def
-	@$(MAKE) subdirs DO=$@ $(FLAGS_TO_PASS)
-
-distclean: clean
-	@$(MAKE) subdirs DO=$@ $(FLAGS_TO_PASS)
-	-rm -f config.cache config.status config.log 
-	-rm -f Makefile
-
-ifdef SNAPDATE
-      distdir=$(PACKAGE)-$(VERSION)-$(SNAPDATE)
-else
-   ifneq (,$(findstring cygwin, $(target_alias)))
-      distdir=$(PACKAGE)-$(VERSION)-$(CYGRELEASE)
-   else
-      distdir=$(PACKAGE)-$(VERSION)
-   endif
-endif
-
-ifneq (,$(findstring cygwin, $(target_alias)))
-  TARFLAGS = j
-  TARFILEEXT = .tar.bz2
-endif
-
-ifneq (,$(findstring mingw, $(target_alias)))
-    dist_prefix =
-else
-    dist_prefix = $(conf_prefix)
-endif
-
-dist: srcdist bindist
-
-srcdist:
-	rm -rf $(distdir)
-	mkdir $(distdir)
-	chmod 755 $(distdir)
-	for i in $(SRCDIST_FILES); do \
-		cp -p $(srcdir)/$$i $(distdir)/$$i ; \
-	done
-	for i in $(SUBDIRS); do \
-		(cd $$i; $(MAKE) distdir=../$(distdir) dist); \
-	done
-#FIXME this needs to be done with SUBDIRS and Makefiles.
-	mkdir $(distdir)/include
-	mkdir $(distdir)/include/sys
-	cp $(srcdir)/include/*.h $(distdir)/include/
-	cp $(srcdir)/include/sys/*.h $(distdir)/include/sys/
-#end FIXME
-	rm -f $(distdir)-src.tar.gz
-	$(TAR) $(TARFLAGS)cf $(distdir)-src$(TARFILEEXT) $(distdir)
-
-
-bindist:
-	rm -rf $(distdir)
-	mkdir $(distdir)
-	chmod 755 $(distdir)
-	$(MAKE) install prefix=$(shell pwd)/$(distdir)$(dist_prefix)
-	rm -f $(distdir).tar.gz
-	cd $(distdir); \
-	$(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) *
-
-snapshot: 
-	make dist SNAPDATE=$(shell date '+%Y%m%d')
-
-info:
-
-info-html:
-
-install-info: info
-
-install-dirs:
-	$(mkinstalldirs) $(inst_bindir)
-	$(mkinstalldirs) $(inst_includedir)
-	$(mkinstalldirs) $(inst_libdir)
-
-install: all install-dirs $(install_dlls_host)
-	for i in $(LIBS); do \
-		$(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
-	done
-	for i in $(CRT0S); do \
-		$(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
-	done
-	for sub in . sys ; do \
-		dstdir=$(inst_includedir)/$$sub ; \
-		$(mkinstalldirs) $$dstdir ; \
-		for i in $(srcdir)/include/$$sub/*.h ; do \
-		  $(INSTALL_DATA) $$i $$dstdir/`basename $$i` ; \
-		done ; \
-	done
-	@$(MAKE) subdirs DO=$@ $(FLAGS_TO_PASS)
-
-subdirs: $(SUBDIRS)
-	@true
-
-# The . is here because SUBDIRS may be empty
-
-. $(SUBDIRS): force
-	@if [ -d ./$@ ]; then \
-	  echo "Making $(DO) in $@..." ; \
-	  if (rootme=`pwd`/ ; export rootme ; \
-	    rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
-	    cd ./$@; \
-	    $(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \
-	  else exit 1 ; fi ; \
-	else true ; fi ; \
-
-force:
-
-#
-# Dependancies
-#
-libcrtdll.a: crtdll.def
-libmsvcrt.a: msvcrt.def
-libmsvcrtd.a: msvcrtd.def
-CRT_noglob.o: CRT_noglob.c
-CRTfmode.o: CRTfmode.c
-CRTglob.o: CRTglob.c
-CRTinit.o: CRTinit.c
-crt1.o: crt1.c init.c
-crt2.o: crt1.c init.c
-crtmt.o: crtmt.c
-crtst.o: crtst.c
-ctype_old.o: ctype_old.c
-dllcrt1.o: dllcrt1.c 
-dllcrt2.o: dllcrt1.c 
-dllmain.o: dllmain.c
-main.o: main.c
-oldnames.o: oldnames.c
-string_old.o: string_old.c
-CRT_fp8.o: CRT_fp8.c
-CRT_fp10.o: CRT_fp10.c
-
-
-Makefile: Makefile.in config.status configure
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
-
-.SUFFIXES: .y $(SUFFIXES) .cc .def .a
-
-lib%.a:%.def
-	$(DLLTOOL) --as=$(AS) -k --dllname $*.dll --output-lib lib$*.a --def $<
-
-.c.o:
-	$(CC) -c $(ALL_CFLAGS) $< -o $@
-
diff --git a/winsup/mingw/README b/winsup/mingw/README
deleted file mode 100644
index 936819172..000000000
--- a/winsup/mingw/README
+++ /dev/null
@@ -1,10 +0,0 @@
-	Free Win32 runtime and import library definitions
-
-	Maintained by MinGW Developers
-	Send bug reports and questions to MinGW-users@lists.sourceforge.net
-	URL: http://www.mingw.org
-
-A historical readme.txt exists and is distributed for your edification.  The 
-references within may or may not be correct.  Please do not rely on them.  See
-http://www.mingw.org for a list of valid references.
-
diff --git a/winsup/mingw/TODO b/winsup/mingw/TODO
deleted file mode 100644
index 60f6bc2af..000000000
--- a/winsup/mingw/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Finish the README.
diff --git a/winsup/mingw/binmode.c b/winsup/mingw/binmode.c
deleted file mode 100644
index 1cc3dedbf..000000000
--- a/winsup/mingw/binmode.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <fcntl.h>
-
-/* Set default file mode to binary */
-
-int _fmode = _O_BINARY; 
diff --git a/winsup/mingw/config.guess b/winsup/mingw/config.guess
deleted file mode 100755
index 0e30d56e9..000000000
--- a/winsup/mingw/config.guess
+++ /dev/null
@@ -1,1407 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-07-02'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/winsup/mingw/config.sub b/winsup/mingw/config.sub
deleted file mode 100755
index 0bdc33431..000000000
--- a/winsup/mingw/config.sub
+++ /dev/null
@@ -1,1504 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-06-17'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/winsup/mingw/configure b/winsup/mingw/configure
deleted file mode 100755
index 05699ab0a..000000000
--- a/winsup/mingw/configure
+++ /dev/null
@@ -1,2163 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=dllmain.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:555: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:576: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:602: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="${ac_tool_prefix}gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CC"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:634: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="gcc"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CC="gcc"
-fi
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:670: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:719: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:743: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-  if test "$ac_test_CXXFLAGS" != set; then
-    CXXFLAGS='$(CFLAGS)'
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-case "$with_cross_host" in
-  ""|*cygwin*) all_dlls_host='all_dlls_host'
-	       install_dlls_host='install_dlls_host';;
-esac
-
-
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:784: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AR"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:816: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AR="ar"
-fi
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:853: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:885: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="as"
-fi
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:921: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:953: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB="ranlib"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB="ranlib"
-fi
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ld; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:989: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="${ac_tool_prefix}ld"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_LD"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ld", so it can be a program name with args.
-set dummy ld; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1021: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LD="ld"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LD" && ac_cv_prog_LD="ld"
-fi
-fi
-LD="$ac_cv_prog_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  LD="ld"
-fi
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1057: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1089: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="dlltool"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="dlltool"
-fi
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLWRAP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLWRAP"; then
-  ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLWRAP="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLWRAP="$ac_cv_prog_DLLWRAP"
-if test -n "$DLLWRAP"; then
-  echo "$ac_t""$DLLWRAP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLWRAP"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1157: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLWRAP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLWRAP"; then
-  ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLWRAP="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLWRAP" && ac_cv_prog_DLLWRAP="dlltool"
-fi
-fi
-DLLWRAP="$ac_cv_prog_DLLWRAP"
-if test -n "$DLLWRAP"; then
-  echo "$ac_t""$DLLWRAP" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLWRAP="dlltool"
-fi
-fi
-
-
-# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
-set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1193: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-WINDRES="$ac_cv_prog_WINDRES"
-if test -n "$WINDRES"; then
-  echo "$ac_t""$WINDRES" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_WINDRES"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1225: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_WINDRES="windres"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_WINDRES" && ac_cv_prog_WINDRES="windres"
-fi
-fi
-WINDRES="$ac_cv_prog_WINDRES"
-if test -n "$WINDRES"; then
-  echo "$ac_t""$WINDRES" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  WINDRES="windres"
-fi
-fi
-
-
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1260: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1275 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1292 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1309 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1342: checking for working alloca.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1347 "configure"
-#include "confdefs.h"
-#include <alloca.h>
-int main() {
-char *p = alloca(2 * sizeof(int));
-; return 0; }
-EOF
-if { (eval echo configure:1354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_header_alloca_h=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_alloca_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
-if test $ac_cv_header_alloca_h = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA_H 1
-EOF
-
-fi
-
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1375: checking for alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1380 "configure"
-#include "confdefs.h"
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int main() {
-char *p = (char *) alloca(1);
-; return 0; }
-EOF
-if { (eval echo configure:1408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_func_alloca_works=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_alloca_works=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
-if test $ac_cv_func_alloca_works = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA 1
-EOF
-
-fi
-
-if test $ac_cv_func_alloca_works = no; then
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-  # that cause trouble.  Some versions do not even contain alloca or
-  # contain a buggy version.  If you still want to use their alloca,
-  # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.${ac_objext}
-  cat >> confdefs.h <<\EOF
-#define C_ALLOCA 1
-EOF
-
-
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1440: checking whether alloca needs Cray hooks" >&5
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1445 "configure"
-#include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "webecray" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_os_cray=yes
-else
-  rm -rf conftest*
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_os_cray" 1>&6
-if test $ac_cv_os_cray = yes; then
-for ac_func in _getb67 GETB67 getb67; do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1470: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1475 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:1498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<EOF
-#define CRAY_STACKSEG_END $ac_func
-EOF
-
-  break
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-done
-fi
-
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:1525: checking stack direction for C alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1533 "configure"
-#include "confdefs.h"
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-main ()
-{
-  exit (find_stack_direction() < 0);
-}
-EOF
-if { (eval echo configure:1552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_stack_direction=1
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_stack_direction=-1
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
-cat >> confdefs.h <<EOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-EOF
-
-fi
-
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1602: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:1623: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1641: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-SUBDIRS="profile mingwex"
-configdirs="profile mingwex"
-HEADER_SUBDIR=""
-
-LIBGMON_A=libgmon.a
-
-W32API_INCLUDE='-I $(srcdir)/../w32api/include'
-
-case "$target_os" in
-*cygwin*)
-  MNO_CYGWIN=-mno-cygwin
-  LIBM_A=libm.a
-  # Install mingw headers in mingw subdirectory.
-  HEADER_SUBDIR="mingw"
-  ;;
-*)
-  # Build it for MSVCRT by default.
-  MNO_CYGWIN=
-  LIBM_A=libm.a
-  ;;
-esac
-
-# THREAD_DLL used to be set within the above case and was mingwc for CRTDLL.
-# I can find no reason to do this.
-#
-# FIXME: In the future I would like to change the dll name to mingwthrd to
-# to match the libmingwthrd.a name.
-THREAD_DLL=mingwm
-
-if test -n "$configdirs"; then
-  subdirs="$configdirs"
-
-fi
-
-MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs
-
-
-
-
-
-
-
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1719: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CC@%$CC%g
-s%@all_dlls_host@%$all_dlls_host%g
-s%@install_dlls_host@%$install_dlls_host%g
-s%@AR@%$AR%g
-s%@AS@%$AS%g
-s%@RANLIB@%$RANLIB%g
-s%@LD@%$LD%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@DLLWRAP@%$DLLWRAP%g
-s%@WINDRES@%$WINDRES%g
-s%@CPP@%$CPP%g
-s%@ALLOCA@%$ALLOCA%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@subdirs@%$subdirs%g
-s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
-s%@MNO_CYGWIN@%$MNO_CYGWIN%g
-s%@THREAD_DLL@%$THREAD_DLL%g
-s%@LIBM_A@%$LIBM_A%g
-s%@LIBGMON_A@%$LIBGMON_A%g
-s%@SUBDIRS@%$SUBDIRS%g
-s%@HEADER_SUBDIR@%$HEADER_SUBDIR%g
-s%@W32API_INCLUDE@%$W32API_INCLUDE%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file and --srcdir arguments so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $ac_configure_args; do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case "$ac_arg" in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
-
-  for ac_config_dir in $configdirs; do
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    if test ! -d $srcdir/$ac_config_dir; then
-      continue
-    fi
-
-    echo configuring in $ac_config_dir
-
-    case "$srcdir" in
-    .) ;;
-    *)
-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
-      else
-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
-      fi
-      ;;
-    esac
-
-    ac_popdir=`pwd`
-    cd $ac_config_dir
-
-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
-
-    case "$srcdir" in
-    .) # No --srcdir option.  We are building in place.
-      ac_sub_srcdir=$srcdir ;;
-    /*) # Absolute path.
-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
-    *) # Relative path.
-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
-    esac
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_sub_srcdir/configure; then
-      ac_sub_configure=$ac_sub_srcdir/configure
-    elif test -f $ac_sub_srcdir/configure.in; then
-      ac_sub_configure=$ac_configure
-    else
-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-
-      # Make the cache file name correct relative to the subdirectory.
-      case "$cache_file" in
-      /*) ac_sub_cache_file=$cache_file ;;
-      *) # Relative path.
-        ac_sub_cache_file="$ac_dots$cache_file" ;;
-      esac
-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
-
-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-      # The eval makes quoting arguments work.
-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
-      then :
-      else
-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
-      fi
-    fi
-
-    cd $ac_popdir
-  done
-fi
-
-
diff --git a/winsup/mingw/configure.in b/winsup/mingw/configure.in
deleted file mode 100644
index b493b4831..000000000
--- a/winsup/mingw/configure.in
+++ /dev/null
@@ -1,136 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-dnl This file is part of winsup/mingw
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-AC_PREREQ(2.12)
-AC_INIT(dllmain.c)
-
-dnl FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-dnl copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-dnl are probably using a cross compiler, which will not be able to fully
-dnl link an executable.  This should really be fixed in autoconf
-dnl itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-  if test "$ac_test_CXXFLAGS" != set; then
-    CXXFLAGS='$(CFLAGS)'
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-LIB_AC_PROG_CC
-
-case "$with_cross_host" in
-  ""|*cygwin*) all_dlls_host='all_dlls_host'
-	       install_dlls_host='install_dlls_host';;
-esac
-AC_SUBST(all_dlls_host)
-AC_SUBST(install_dlls_host)
-
-AC_CHECK_TOOL(AR, ar, ar)
-
-AC_SUBST(AR)
-AC_CHECK_TOOL(AS, as, as)
-AC_SUBST(AS)
-AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
-AC_SUBST(RANLIB)
-AC_CHECK_TOOL(LD, ld, ld)
-AC_SUBST(LD)
-AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
-AC_SUBST(DLLTOOL)
-AC_CHECK_TOOL(DLLWRAP, dlltool, dlltool)
-AC_SUBST(DLLWRAP)
-AC_CHECK_TOOL(WINDRES, windres, windres)
-AC_SUBST(WINDRES)
-
-AC_ALLOCA
-
-AC_CANONICAL_SYSTEM
-SUBDIRS="profile mingwex"
-configdirs="profile mingwex"
-HEADER_SUBDIR=""
-
-LIBGMON_A=libgmon.a
-
-W32API_INCLUDE='-I $(srcdir)/../w32api/include'
-
-case "$target_os" in
-*cygwin*)
-  MNO_CYGWIN=-mno-cygwin
-  LIBM_A=libm.a
-  # Install mingw headers in mingw subdirectory.
-  HEADER_SUBDIR="mingw"
-  ;;
-*)
-  # Build it for MSVCRT by default.
-  MNO_CYGWIN=
-  LIBM_A=libm.a
-  ;;
-esac
-
-# THREAD_DLL used to be set within the above case and was mingwc for CRTDLL.
-# I can find no reason to do this.
-#
-# FIXME: In the future I would like to change the dll name to mingwthrd to
-# to match the libmingwthrd.a name.
-THREAD_DLL=mingwm
-
-if test -n "$configdirs"; then
-  AC_CONFIG_SUBDIRS($configdirs)
-fi
-
-MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs
-AC_SUBST(MKINSTALLDIRS)
-AC_SUBST(MNO_CYGWIN)
-AC_SUBST(THREAD_DLL)
-AC_SUBST(LIBM_A)
-AC_SUBST(LIBGMON_A)
-AC_SUBST(SUBDIRS)
-AC_SUBST(HEADER_SUBDIR)
-AC_SUBST(W32API_INCLUDE)
-
-AC_PROG_INSTALL
-AC_OUTPUT(Makefile)
-
diff --git a/winsup/mingw/crt1.c b/winsup/mingw/crt1.c
deleted file mode 100644
index e589b4c14..000000000
--- a/winsup/mingw/crt1.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * crt1.c
- *
- * Source code for the startup proceedures used by all programs. This code
- * is compiled to make crt1.o, which should be located in the library path.
- *
- * This code is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *  Maintained by Mumit Khan <khan@xraylith.wisc.EDU>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-/* Hide the declaration of _fmode with dllimport attribute in stdlib.h.
-   This is not necessary with Mumit Khan's patches to gcc's winnt.c,
-   but those patches are still unofficial.  */
-
-#define __IN_MINGW_RUNTIME 
-#include <stdlib.h>
-#include <stdio.h>
-#include <io.h>
-#include <process.h>
-#include <float.h>
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <signal.h>
-
-/* NOTE: The code for initializing the _argv, _argc, and environ variables
- *       has been moved to a separate .c file which is included in both
- *       crt1.c and dllcrt1.c. This means changes in the code don't have to
- *       be manually synchronized, but it does lead to this not-generally-
- *       a-good-idea use of include. */
-#include "init.c"
-
-
-extern void _pei386_runtime_relocator (void);
-
-extern int main (int, char **, char **);
-
-/*
- * Must have the correct app type for MSVCRT. 
- */
-
-#ifdef __MSVCRT__
-#define __UNKNOWN_APP    0
-#define __CONSOLE_APP    1
-#define __GUI_APP        2
-__MINGW_IMPORT void __set_app_type(int);
-#endif /* __MSVCRT__ */
-
-/*  Global _fmode for this .exe, not the one in msvcrt.dll,
-    The default is set in txtmode.o in libmingw32.a */
-/* Override the dllimport'd declarations in stdlib.h */
-#undef _fmode 
-extern int _fmode; 
-extern int* __p__fmode(void); /* To access the dll _fmode */
-
-/*
- * Setup the default file handles to have the _CRT_fmode mode, as well as
- * any new files created by the user.
- */
-extern int _CRT_fmode;
-
-static void
-_mingw32_init_fmode ()
-{
-  /* Don't set the std file mode if the user hasn't set any value for it. */
-  if (_CRT_fmode)
-    {
-      _fmode = _CRT_fmode;
-
-      /*
-       * This overrides the default file mode settings for stdin,
-       * stdout and stderr. At first I thought you would have to
-       * test with isatty, but it seems that the DOS console at
-       * least is smart enough to handle _O_BINARY stdout and
-       * still display correctly.
-       */
-      if (stdin)
-	{
-	  _setmode (_fileno (stdin), _CRT_fmode);
-	}
-      if (stdout)
-	{
-	  _setmode (_fileno (stdout), _CRT_fmode);
-	}
-      if (stderr)
-	{
-	  _setmode (_fileno (stderr), _CRT_fmode);
-	}
-    }
-
-    /*  Now sync  the dll _fmode to the  one for this .exe.  */
-    *__p__fmode() = _fmode;	
-
-}
-
-/* This function will be called when a trap occurs. Thanks to Jacob
-   Navia for his contribution. */
-static CALLBACK long
-_gnu_exception_handler (EXCEPTION_POINTERS * exception_data)
-{
-  void (*old_handler) (int);
-  long action = EXCEPTION_CONTINUE_SEARCH;
-  int reset_fpu = 0;
-
-  switch (exception_data->ExceptionRecord->ExceptionCode)
-    {
-    case EXCEPTION_ACCESS_VIOLATION:
-      /* test if the user has set SIGSEGV */
-      old_handler = signal (SIGSEGV, SIG_DFL);
-      if (old_handler == SIG_IGN)
-	{
-	  /* this is undefined if the signal was raised by anything other
-	     than raise ().  */
-	  signal (SIGSEGV, SIG_IGN);
-	  action = EXCEPTION_CONTINUE_EXECUTION;
-	}
-      else if (old_handler != SIG_DFL)
-	{
-	  /* This means 'old' is a user defined function. Call it */
-	  (*old_handler) (SIGSEGV);
-	  action = EXCEPTION_CONTINUE_EXECUTION;
-	}
-      break;
-
-    case EXCEPTION_FLT_INVALID_OPERATION:
-    case EXCEPTION_FLT_DIVIDE_BY_ZERO:
-    case EXCEPTION_FLT_DENORMAL_OPERAND:
-    case EXCEPTION_FLT_OVERFLOW:
-    case EXCEPTION_FLT_UNDERFLOW:
-    case EXCEPTION_FLT_INEXACT_RESULT:
-      reset_fpu = 1;
-      /* fall through. */
-
-    case EXCEPTION_INT_DIVIDE_BY_ZERO:
-      /* test if the user has set SIGFPE */
-      old_handler = signal (SIGFPE, SIG_DFL);
-      if (old_handler == SIG_IGN)
-	{
-	  signal (SIGFPE, SIG_IGN);
-	  if (reset_fpu)
-	    _fpreset ();
-	  action = EXCEPTION_CONTINUE_EXECUTION;
-	}
-      else if (old_handler != SIG_DFL)
-	{
-	  /* This means 'old' is a user defined function. Call it */
-	  (*old_handler) (SIGFPE);
-	  action = EXCEPTION_CONTINUE_EXECUTION;
-	}
-      break;
-
-    default:
-      break;
-    }
-  return action;
-}
-
-/*
- * The function mainCRTStartup is the entry point for all console programs.
- */
-static int
-__mingw_CRTStartup ()
-{
-  int nRet;
-
-  /*
-   * Set up the top-level exception handler so that signal handling
-   * works as expected. The mapping between ANSI/POSIX signals and
-   * Win32 SE is not 1-to-1, so caveat emptore.
-   * 
-   */
-  SetUnhandledExceptionFilter (_gnu_exception_handler);
-
-  /*
-   * Initialize floating point unit.
-   */
-  _fpreset ();			/* Supplied by the runtime library. */
-
-  /*
-   * Set up __argc, __argv and _environ.
-   */
-  _mingw32_init_mainargs ();
-
-  /*
-   * Sets the default file mode.
-   * If _CRT_fmode is set, also set mode for stdin, stdout
-   * and stderr, as well
-   * NOTE: DLLs don't do this because that would be rude!
-   */
-  _mingw32_init_fmode ();
-
-  
-   /* Adust references to dllimported data that have non-zero offsets.  */
-  _pei386_runtime_relocator ();
-
-  /*
-   * Call the main function. If the user does not supply one
-   * the one in the 'libmingw32.a' library will be linked in, and
-   * that one calls WinMain. See main.c in the 'lib' dir
-   * for more details.
-   */
-  nRet = main (_argc, _argv, environ);
-
-  /*
-   * Perform exit processing for the C library. This means
-   * flushing output and calling 'atexit' registered functions.
-   */
-  _cexit ();
-
-  ExitProcess (nRet);
-
-  return 0;
-}
-
-/*
- * The function mainCRTStartup is the entry point for all console programs.
- */
-int
-mainCRTStartup ()
-{
-#ifdef __MSVCRT__
-  __set_app_type (__CONSOLE_APP);
-#endif
-  __mingw_CRTStartup ();
-  return 0;
-}
-
-/*
- * For now the GUI startup function is the same as the console one.
- * This simply gets rid of the annoying warning about not being able
- * to find WinMainCRTStartup when linking GUI applications.
- */
-int
-WinMainCRTStartup ()
-{
-#ifdef __MSVCRT__
-  __set_app_type (__GUI_APP);
-#endif
-  __mingw_CRTStartup ();
-return 0;
-}
-
-/*
- *  We force use of library version of atexit, which is only
- *  visible in import lib as _imp__atexit
- */
-extern int (*_imp__atexit)(void (*)(void));
-int atexit (void (* pfn )(void) )
-{
-  return ( (*_imp__atexit)(pfn));
-}
-
-/* Likewise for non-ANSI _onexit */
-extern _onexit_t (*_imp___onexit)(_onexit_t);
-_onexit_t
-_onexit (_onexit_t pfn )
-{
-  return (*_imp___onexit)(pfn);
-}
diff --git a/winsup/mingw/crtdll.def b/winsup/mingw/crtdll.def
deleted file mode 100644
index 6f924fb7b..000000000
--- a/winsup/mingw/crtdll.def
+++ /dev/null
@@ -1,704 +0,0 @@
-;
-; crtdll.def
-;
-; Exports from crtdll.dll from Windows 95 SYSTEM directory. Hopefully this
-; should also work with the crtdll provided with Windows NT.
-;
-; Contributors:
-;  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
-;
-;  THIS SOFTWARE IS NOT COPYRIGHTED
-;
-;  This source code is offered for use in the public domain. You may
-;  use, modify or distribute it freely.
-;
-;  This code is distributed in the hope that it will be useful but
-;  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
-;  DISCLAMED. This includes but is not limited to warrenties of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-;
-; $Revision$
-; $Author$
-; $Date$
-;
-; These three functions appear to be name mangled in some way, so GCC is
-; probably not going to be able to use them in any case.
-;
-;    ??2@YAPAXI@Z
-;    ??3@YAXPAX@Z
-;    ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z
-;
-; These are functions for which I have not yet written prototypes or
-; otherwise set up (they are still included below though unlike those
-; first three).
-;
-;    _CIacos
-;    _CIasin
-;    _CIatan
-;    _CIatan2
-;    _CIcos
-;    _CIcosh
-;    _CIexp
-;    _CIfmod
-;    _CIlog
-;    _CIlog10
-;    _CIpow
-;    _CIsin
-;    _CIsinh
-;    _CIsqrt
-;    _CItan
-;    _CItanh
-;    __dllonexit
-;    __mb_cur_max_dll
-;    __threadhandle
-;    __threadid
-;    _abnormal_termination
-;    _acmdln_dll
-;    _aexit_rtn_dll
-;    _amsg_exit
-;    _commit
-;    _commode_dll
-;    _cpumode_dll
-;    _ctype
-;    _expand
-;    _fcloseall
-;    _filbuf
-;    _fileinfo_dll
-;    _flsbuf
-;    _flushall
-;    _fmode_dll
-;    _fpieee_flt
-;    _fsopen
-;    _ftol
-;    _getdiskfree
-;    _getdllprocaddr
-;    _getdrive
-;    _getdrives
-;    _getsystime
-;    _initterm
-;    _ismbbalnum
-;    _ismbbalpha
-;    _ismbbgraph
-;    _ismbbkalnum
-;    _ismbbkana
-;    _ismbbkpunct
-;    _ismbblead
-;    _ismbbprint
-;    _ismbbpunct
-;    _ismbbtrail
-;    _ismbcalpha
-;    _ismbcdigit
-;    _ismbchira
-;    _ismbckata
-;    _ismbcl0
-;    _ismbcl1
-;    _ismbcl2
-;    _ismbclegal
-;    _ismbclower
-;    _ismbcprint
-;    _ismbcspace
-;    _ismbcsymbol
-;    _ismbcupper
-;    _ismbslead
-;    _ismbstrail
-;    _lfind
-;    _loaddll
-;    _lrotl
-;    _lrotr
-;    _lsearch
-;    _makepath
-;    _matherr
-;    _mbbtombc
-;    _mbbtype
-;    _mbccpy
-;    _mbcjistojms
-;    _mbcjmstojis
-;    _mbclen
-;    _mbctohira
-;    _mbctokata
-;    _mbctolower
-;    _mbctombb
-;    _mbctoupper
-;    _mbctype
-;    _mbsbtype
-;    _mbscat
-;    _mbscmp
-;    _mbscpy
-;    _mbscspn
-;    _mbsdec
-;    _mbsdup
-;    _mbsicmp
-;    _mbsinc
-;    _mbslen
-;    _mbslwr
-;    _mbsnbcat
-;    _mbsnbcmp
-;    _mbsnbcnt
-;    _mbsnbcpy
-;    _mbsnbicmp
-;    _mbsnbset
-;    _mbsnccnt
-;    _mbsncmp
-;    _mbsncpy
-;    _mbsnextc
-;    _mbsnicmp
-;    _mbsninc
-;    _mbsnset
-;    _mbspbrk
-;    _mbsrchr
-;    _mbsrev
-;    _mbsset
-;    _mbsspn
-;    _mbsspnp
-;    _mbsstr
-;    _mbstrlen
-;    _mbsupr
-;    _onexit
-;    _osversion_dll
-;    _pctype_dll
-;    _purecall
-;    _pwctype_dll
-;    _rmtmp
-;    _rotl
-;    _rotr
-;    _setsystime
-;    _snprintf
-;    _snwprintf
-;    _splitpath
-;    _strdate
-;    _strdec
-;    _strinc
-;    _strncnt
-;    _strnextc
-;    _strninc
-;    _strspnp
-;    _strtime
-;    _tempnam
-;    _ultoa
-;    _unloaddll
-;    _vsnprintf
-;    _vsnwprintf
-;    _wtoi
-;    _wtol
-;
-EXPORTS
-_CIacos
-_CIasin
-_CIatan
-_CIatan2
-_CIcos
-_CIcosh
-_CIexp
-_CIfmod
-_CIlog
-_CIlog10
-_CIpow
-_CIsin
-_CIsinh
-_CIsqrt
-_CItan
-_CItanh
-_HUGE_dll DATA
-_XcptFilter
-__GetMainArgs
-__argc_dll DATA
-__argv_dll DATA
-__dllonexit
-__doserrno
-__fpecode
-__isascii
-__iscsym
-__iscsymf
-__mb_cur_max_dll DATA
-__pxcptinfoptrs
-__threadhandle
-__threadid
-__toascii
-_abnormal_termination
-_access
-_acmdln_dll DATA
-_aexit_rtn_dll DATA
-_amsg_exit
-_assert
-_basemajor_dll DATA
-_baseminor_dll DATA
-_baseversion_dll DATA
-_beep
-_beginthread
-_c_exit
-_cabs
-_cexit
-_cgets
-_chdir
-_chdrive
-_chgsign
-_chmod
-_chsize
-_clearfp
-_close
-_commit
-_commode_dll DATA
-_control87
-_controlfp
-_copysign
-_cprintf
-_cpumode_dll DATA
-_cputs
-_creat
-_cscanf
-_ctype
-_cwait
-_daylight_dll DATA
-_dup
-_dup2
-_ecvt
-_endthread
-_environ_dll DATA
-_eof
-_errno
-_except_handler2
-_execl
-_execle
-_execlp
-_execlpe
-_execv
-_execve
-_execvp
-_execvpe
-_exit
-_expand
-_fcloseall
-_fcvt
-_fdopen
-_fgetchar
-_fgetwchar
-_filbuf
-_fileinfo_dll DATA
-_filelength
-_fileno
-_findclose
-_findfirst
-_findnext
-_finite
-_flsbuf
-_flushall
-_fmode_dll DATA
-_fpclass
-_fpieee_flt
-_fpreset DATA
-_fputchar
-_fputwchar
-_fsopen
-_fstat
-_ftime
-_ftol
-_fullpath
-_futime
-_gcvt
-_get_osfhandle
-_getch
-_getche
-_getcwd
-_getdcwd
-_getdiskfree
-_getdllprocaddr
-_getdrive
-_getdrives
-_getpid
-_getsystime
-_getw
-_global_unwind2
-_heapchk
-_heapmin
-_heapset
-_heapwalk
-_hypot
-_initterm
-_iob DATA
-_isatty
-_isctype
-_ismbbalnum
-_ismbbalpha
-_ismbbgraph
-_ismbbkalnum
-_ismbbkana
-_ismbbkpunct
-_ismbblead
-_ismbbprint
-_ismbbpunct
-_ismbbtrail
-_ismbcalpha
-_ismbcdigit
-_ismbchira
-_ismbckata
-_ismbcl0
-_ismbcl1
-_ismbcl2
-_ismbclegal
-_ismbclower
-_ismbcprint
-_ismbcspace
-_ismbcsymbol
-_ismbcupper
-_ismbslead
-_ismbstrail
-_isnan
-_itoa
-_j0
-_j1
-_jn
-_kbhit
-_lfind
-_loaddll
-_local_unwind2
-_locking
-_logb
-_lrotl
-_lrotr
-_lsearch
-_lseek
-_ltoa
-_makepath
-_matherr
-_mbbtombc
-_mbbtype
-_mbccpy
-_mbcjistojms
-_mbcjmstojis
-_mbclen
-_mbctohira
-_mbctokata
-_mbctolower
-_mbctombb
-_mbctoupper
-_mbctype
-_mbsbtype
-_mbscat
-_mbschr
-_mbscmp
-_mbscpy
-_mbscspn
-_mbsdec
-_mbsdup
-_mbsicmp
-_mbsinc
-_mbslen
-_mbslwr
-_mbsnbcat
-_mbsnbcmp
-_mbsnbcnt
-_mbsnbcpy
-_mbsnbicmp
-_mbsnbset
-_mbsncat
-_mbsnccnt
-_mbsncmp
-_mbsncpy
-_mbsnextc
-_mbsnicmp
-_mbsninc
-_mbsnset
-_mbspbrk
-_mbsrchr
-_mbsrev
-_mbsset
-_mbsspn
-_mbsspnp
-_mbsstr
-_mbstok
-_mbstrlen
-_mbsupr
-_memccpy
-_memicmp
-_mkdir
-_mktemp
-_msize
-_nextafter
-_onexit DATA
-_open
-_open_osfhandle
-_osmajor_dll DATA
-_osminor_dll DATA
-_osmode_dll DATA
-_osver_dll DATA
-_osversion_dll DATA
-_pclose
-_pctype_dll DATA
-_pgmptr_dll DATA
-_pipe
-_popen
-_purecall
-_putch
-_putenv
-_putw
-_pwctype_dll DATA
-_read
-_rmdir
-_rmtmp
-_rotl
-_rotr
-_scalb
-_searchenv
-_seterrormode
-_setjmp
-_setmode
-_setsystime
-_sleep
-_snprintf
-_snwprintf
-_sopen
-_spawnl
-_spawnle
-_spawnlp
-_spawnlpe
-_spawnv
-_spawnve
-_spawnvp
-_spawnvpe
-_splitpath
-_stat
-_statusfp
-_strcmpi
-_strdate
-_strdec
-_strdup
-_strerror
-_stricmp
-_stricoll
-_strinc
-_strlwr
-_strncnt
-_strnextc
-_strnicmp
-_strninc
-_strnset
-_strrev
-_strset
-_strspnp
-_strtime
-_strupr
-_swab
-_sys_errlist DATA
-_sys_nerr_dll DATA
-_tell
-_tempnam
-_timezone_dll DATA
-_tolower
-_toupper
-_tzname DATA
-_tzset
-_ultoa
-_umask
-_ungetch
-_unlink
-_unloaddll
-_utime
-_vsnprintf
-_vsnwprintf
-_wcsdup
-_wcsicmp
-_wcsicoll
-_wcslwr
-_wcsnicmp
-_wcsnset
-_wcsrev
-_wcsset
-_wcsupr
-_winmajor_dll DATA
-_winminor_dll DATA
-_winver_dll DATA
-_write
-_wtoi
-_wtol
-_y0
-_y1
-_yn
-abort
-abs
-acos
-asctime
-asin
-atan
-atan2
-atexit DATA
-atof
-atoi
-atol
-bsearch
-calloc
-ceil
-clearerr
-clock
-cos
-cosh
-ctime
-difftime
-div
-exit
-exp
-fabs
-fclose
-feof
-ferror
-fflush
-fgetc
-fgetpos
-fgets
-fgetwc
-floor
-fmod
-fopen
-fprintf
-fputc
-fputs
-fputwc
-fread
-free
-freopen
-frexp
-fscanf
-fseek
-fsetpos
-ftell
-fwprintf
-fwrite
-fwscanf
-getc
-getchar
-getenv
-gets
-gmtime
-is_wctype
-isalnum
-isalpha
-iscntrl
-isdigit
-isgraph
-isleadbyte
-islower
-isprint
-ispunct
-isspace
-isupper
-iswalnum
-iswalpha
-iswascii
-iswcntrl
-iswctype
-iswdigit
-iswgraph
-iswlower
-iswprint
-iswpunct
-iswspace
-iswupper
-iswxdigit
-isxdigit
-labs
-ldexp
-ldiv
-localeconv
-localtime
-log
-log10
-longjmp
-malloc
-mblen
-mbstowcs
-mbtowc
-memchr
-memcmp
-memcpy
-memmove
-memset
-mktime
-modf
-perror
-pow
-printf
-putc
-putchar
-puts
-qsort
-raise
-rand
-realloc
-remove
-rename
-rewind
-scanf
-setbuf
-setlocale
-setvbuf
-signal
-sin
-sinh
-sprintf
-sqrt
-srand
-sscanf
-strcat
-strchr
-strcmp
-strcoll
-strcpy
-strcspn
-strerror
-strftime
-strlen
-strncat
-strncmp
-strncpy
-strpbrk
-strrchr
-strspn
-strstr
-strtod
-strtok
-strtol
-strtoul
-strxfrm
-swprintf
-swscanf
-system
-tan
-tanh
-time
-tmpfile
-tmpnam
-tolower
-toupper
-towlower
-towupper
-ungetc
-ungetwc
-vfprintf
-vfwprintf
-vprintf
-vsprintf
-vswprintf
-vwprintf
-wcscat
-wcschr
-wcscmp
-wcscoll
-wcscpy
-wcscspn
-wcsftime
-wcslen
-wcsncat
-wcsncmp
-wcsncpy
-wcspbrk
-wcsrchr
-wcsspn
-wcsstr
-wcstod
-wcstok
-wcstol
-wcstombs
-wcstoul
-wcsxfrm
-wctomb
-wprintf
-wscanf
diff --git a/winsup/mingw/crtmt.c b/winsup/mingw/crtmt.c
deleted file mode 100644
index 116d850f0..000000000
--- a/winsup/mingw/crtmt.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * crtmt.c
- *
- * This object file defines _CRT_MT to have a value of 1, which will
- * turn on MT support in GCC runtime. This is only linked in when
- * you specify -mthreads when linking with gcc. The Mingw support
- * library, libmingw32.a, contains the complement, crtst.o, which
- * sets this variable to 0. 
- *
- * Mumit Khan  <khan@nanotech.wisc.edu>
- *
- */
-
-int _CRT_MT = 1;
diff --git a/winsup/mingw/crtst.c b/winsup/mingw/crtst.c
deleted file mode 100644
index 4835b0963..000000000
--- a/winsup/mingw/crtst.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * crtst.c
- *
- * This object file defines _CRT_MT to have a value of 0, which will
- * turn off MT support in GCC runtime. This is linked by default unless
- * you specify -mthreads when linking with gcc. 
- *
- * Mumit Khan  <khan@nanotech.wisc.edu>
- *
- */
-
-int _CRT_MT = 0;
diff --git a/winsup/mingw/dllcrt1.c b/winsup/mingw/dllcrt1.c
deleted file mode 100644
index 4538cf793..000000000
--- a/winsup/mingw/dllcrt1.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * dllcrt1.c
- *
- * Initialization code for DLLs.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *  DLL support adapted from Gunther Ebert <gunther.ebert@ixos-leipzig.de>
- *  Maintained by Mumit Khan <khan@xraylith.wisc.EDU>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- * 
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include <io.h>
-#include <process.h>
-#include <errno.h>
-#include <windows.h>
-
-/* Unlike normal crt1, I don't initialize the FPU, because the process
- * should have done that already. I also don't set the file handle modes,
- * because that would be rude. */
-
-#ifdef	__GNUC__
-extern void __main ();
-extern void __do_global_dtors ();
-#endif
-
-typedef void (* p_atexit_fn )(void);
-static p_atexit_fn* first_atexit;
-static p_atexit_fn* next_atexit;
-
-static void
-__dll_exit (void);
-
-/* This  is based on the function in the Wine project's exit.c */
-p_atexit_fn __dllonexit (p_atexit_fn, p_atexit_fn**, p_atexit_fn**);
-
-
-extern BOOL WINAPI DllMain (HANDLE, DWORD, LPVOID);
-
-extern void _pei386_runtime_relocator (void);
-
-BOOL WINAPI
-DllMainCRTStartup (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
-{
-  BOOL bRet;
-
-  if (dwReason == DLL_PROCESS_ATTACH)
-    {
-
-#ifdef DEBUG
-      printf ("%s: DLL_PROCESS_ATTACH (%d)\n", __FUNCTION__);
-#endif
-
-      /* Initialize private atexit table for this dll.
-	 32 is min size required by ANSI */
-
-      first_atexit = (p_atexit_fn*) malloc (32 * sizeof (p_atexit_fn));
-      if (first_atexit == NULL ) /* can't allocate memory */
-	{
-	  errno=ENOMEM;
-	  return FALSE;
-	}
-      *first_atexit =  NULL;
-      next_atexit = first_atexit;
-
-      /* Adust references to dllimported data (from other DLL's)
-	 that have non-zero offsets.  */ 
-      _pei386_runtime_relocator ();
-
-#ifdef	__GNUC__
-      /* From libgcc.a, __main calls global class constructors,
-	 __do_global_ctors, which registers __do_global_dtors
-	 as the first entry of the private atexit table we
-	 have just initialised  */
-      __main ();
-      	
-#endif
-   }
-
-  /*
-   * Call the user-supplied DllMain subroutine.
-   * This has to come after initialization of atexit table and
-   * registration of global constructors.
-   * NOTE: DllMain is optional, so libmingw32.a includes a stub
-   *       which will be used if the user does not supply one.
-   */
-
-  bRet = DllMain (hDll, dwReason, lpReserved);
-  /* Handle case where DllMain returns FALSE on attachment attempt.  */ 
-
-  if ( (dwReason == DLL_PROCESS_ATTACH) && !bRet)
-    {
-#ifdef DEBUG
-      printf ("%s: DLL_PROCESS_ATTACH failed, cleaning up\n", __FUNCTION__);
-#endif
-
-      __dll_exit ();     /* Cleanup now. This will set first_atexit to NULL so we
-			    know we've cleaned up	*/
-    }
-
-  if (dwReason == DLL_PROCESS_DETACH)
-    {
-#ifdef DEBUG
-      printf ("%s: DLL_PROCESS_DETACH (%d)\n", __FUNCTION__);
-#endif
-      /* If not attached, return FALSE. Cleanup already done above
-	 if failed attachment attempt. */
-      if  (! first_atexit )
-        bRet = FALSE;
-      else
-	/*
-	 * We used to call __do_global_dtors () here. This is
-	 * no longer necessary since  __do_global_dtors is now
-	 * registered at start (last out) of private atexit table.
-	 */
-	__dll_exit ();
-    }
-  return bRet;
-}
-
-static
-void
-__dll_exit(void)
-/* Run LIFO terminators registered in private atexit table */
-{
-  if ( first_atexit )
-    {
-      p_atexit_fn* __last = next_atexit - 1;
-      while ( __last >= first_atexit )
-	{	
-          if ( *__last != NULL )
-	    {
-#ifdef DEBUG
-	      printf ("%s: Calling exit function  0x%x from 0x%x\n",
-		      __FUNCTION__, (unsigned)(*__last),(unsigned)__last);
-#endif
-              (**__last) ();
-	    }
-	  __last--;
-	}
-      free ( first_atexit ) ;
-      first_atexit = NULL ;
-    }
-    /*
-       Make sure output buffers opened by DllMain or 
-       atexit-registered functions are flushed before detaching,
-       otherwise we can have problems with redirected output.
-     */
-    fflush (NULL);
-}
-
-/*
- * The atexit exported from msvcrt.dll causes problems in DLLs.
- * Here, we override the exported version of atexit with one that passes the
- * private table initialised in DllMainCRTStartup to __dllonexit.
- * That means we have to hide the mscvrt.dll atexit because the
- * atexit defined here gets __dllonexit from the same lib. 
- */
-
-int
-atexit (p_atexit_fn pfn )
-{
-#ifdef DEBUG
-  printf ("%s: registering exit function  0x%x at 0x%x\n",
-	  __FUNCTION__, (unsigned)pfn, (unsigned)next_atexit);
-#endif
-  return (__dllonexit (pfn,  &first_atexit, &next_atexit)
-	  == NULL ? -1  : 0 );
-}
-
-/*
- * Likewise for non-ANSI function _onexit that may be called by
- * code in the dll. 
- */
-
-_onexit_t
-_onexit (_onexit_t pfn )
-{
-#ifdef DEBUG
-  printf ("%s: registering exit function  0x%x at 0x%x\n",
-	  __FUNCTION__, (unsigned)pfn, (unsigned)next_atexit);
-#endif
-  return ((_onexit_t) __dllonexit ((p_atexit_fn)pfn,  &first_atexit, &next_atexit));
-}
diff --git a/winsup/mingw/dllmain.c b/winsup/mingw/dllmain.c
deleted file mode 100644
index 40c4f4f37..000000000
--- a/winsup/mingw/dllmain.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * dllmain.c
- *
- * A stub DllMain function which will be called by DLLs which do not
- * have a user supplied DllMain.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <windows.h>
-
-BOOL WINAPI 
-DllMain (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
-{
-  return TRUE;
-}
-
diff --git a/winsup/mingw/gccmain.c b/winsup/mingw/gccmain.c
deleted file mode 100644
index 5c438e98a..000000000
--- a/winsup/mingw/gccmain.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * gccmain.c
- *
- * A separate version of __main, __do_global_ctors and __do_global_dtors for
- * Mingw32 for use with Cygwin32 b19. Hopefully this object file will only
- * be linked if the libgcc.a doesn't include __main, __do_global_dtors and
- * __do_global_ctors.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Code supplied by Stan Cox <scox@cygnus.com>
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-/* Needed for the atexit prototype. */
-#include <stdlib.h>
-
-typedef void (*func_ptr) (void);
-extern func_ptr __CTOR_LIST__[];
-extern func_ptr __DTOR_LIST__[];
-
-void
-__do_global_dtors (void)
-{
-  static func_ptr *p = __DTOR_LIST__ + 1;
-
-  /*
-   * Call each destructor in the destructor list until a null pointer
-   * is encountered.
-   */
-  while (*p)
-    {
-      (*(p)) ();
-      p++;
-    }
-}
-
-void
-__do_global_ctors (void)
-{
-  unsigned long nptrs = (unsigned long) __CTOR_LIST__[0];
-  unsigned i;
-
-  /*
-   * If the first entry in the constructor list is -1 then the list
-   * is terminated with a null entry. Otherwise the first entry was
-   * the number of pointers in the list.
-   */
-  if (nptrs == -1)
-    {
-      for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++)
-	;
-    }
-
-  /* 
-   * Go through the list backwards calling constructors.
-   */
-  for (i = nptrs; i >= 1; i--)
-    {
-      __CTOR_LIST__[i] ();
-    }
-
-  /*
-   * Register the destructors for processing on exit.
-   */
-  atexit (__do_global_dtors);
-}
-
-static int initialized = 0;
-
-void
-__main (void)
-{
-  if (!initialized)
-    {
-      initialized = 1;
-      __do_global_ctors ();
-    }
-}
-
diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
deleted file mode 100644
index c5cbb4cc0..000000000
--- a/winsup/mingw/include/_mingw.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * _mingw.h
- *
- * Mingw specific macros included by ALL include files. 
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Mumit Khan  <khan@xraylith.wisc.edu>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __MINGW_H
-#define __MINGW_H
-
-/* These are defined by the user (or the compiler)
-   to specify how identifiers are imported from a DLL.
-
-   __DECLSPEC_SUPPORTED    Defined if dllimport attribute is supported.
-   __MINGW_IMPORT          The attribute definition to specify imported
-                           variables/functions. 
-   _CRTIMP                 As above.  For MS compatibility.  
-   __MINGW32_VERSION       Runtime version.
-   __MINGW32_MAJOR_VERSION Runtime major version.
-   __MINGW32_MINOR_VERSION Runtime minor version.
-   __MINGW32_BUILD_DATE    Runtime build date.
-   
-   Other macros:
-
-   __int64                 define to be long long. Using a typedef can
-                           tweak bugs in the C++ parser.
-  
-   All headers should include this first, and then use __DECLSPEC_SUPPORTED
-   to choose between the old ``__imp__name'' style or __MINGW_IMPORT
-   style declarations.  */
-
-#ifndef __GNUC__
-# ifndef __MINGW_IMPORT
-#  define __MINGW_IMPORT  __declspec(dllimport)
-# endif
-# ifndef _CRTIMP
-#  define _CRTIMP  __declspec(dllimport)
-# endif
-# define __DECLSPEC_SUPPORTED
-# define __attribute__(x) /* nothing */
-#else /* __GNUC__ */
-# ifdef __declspec
-#  ifndef __MINGW_IMPORT
-   /* Note the extern. This is needed to work around GCC's
-      limitations in handling dllimport attribute.  */
-#   define __MINGW_IMPORT  extern __attribute__((dllimport))
-#  endif
-#  ifndef _CRTIMP
-#   ifdef __USE_CRTIMP
-#    define _CRTIMP  __attribute__((dllimport))
-#   else  
-#    define _CRTIMP
-#   endif
-#  endif
-#  define __DECLSPEC_SUPPORTED
-# else /* __declspec */
-#  undef __DECLSPEC_SUPPORTED
-#  undef __MINGW_IMPORT
-#  ifndef _CRTIMP
-#   define _CRTIMP
-#  endif
-# endif /* __declspec */
-# ifndef __cdecl
-#  define __cdecl __attribute__((cdecl))
-# endif
-# ifndef __stdcall
-#  define __stdcall __attribute__((stdcall))
-# endif
-# ifndef __int64
-#  define __int64 long long
-# endif
-# ifndef __int32
-#  define __int32 long
-# endif
-# ifndef __int16
-#  define __int16 int
-# endif
-# ifndef __int8
-#  define __int8 char
-# endif
-# ifndef __small
-#  define __small char
-# endif
-# ifndef __hyper
-#  define __hyper long long
-# endif
-#endif /* __GNUC__ */
-
-#ifdef __cplusplus
-#define __CRT_INLINE inline
-#else
-#define __CRT_INLINE extern __inline__
-#endif
-
-#define __MINGW32_VERSION 4.0
-#define __MINGW32_MAJOR_VERSION 4
-#define __MINGW32_MINOR_VERSION 0
-
-#endif /* __MINGW_H */
diff --git a/winsup/mingw/include/assert.h b/winsup/mingw/include/assert.h
deleted file mode 100644
index 893db9113..000000000
--- a/winsup/mingw/include/assert.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* 
- * assert.h
- *
- * Define the assert macro for debug output.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _ASSERT_H_
-#define	_ASSERT_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#ifndef RC_INVOKED
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#ifdef NDEBUG
-
-/*
- * If not debugging, assert does nothing.
- */
-#define assert(x)	((void)0)
-
-#else /* debugging enabled */
-
-/*
- * CRTDLL nicely supplies a function which does the actual output and
- * call to abort.
- */
-_CRTIMP void __cdecl _assert (const char*, const char*, int)
-#ifdef	__GNUC__
-	__attribute__ ((noreturn))
-#endif
-	;
-
-/*
- * Definition of the assert macro.
- */
-#define assert(e)       ((e) ? (void)0 : _assert(#e, __FILE__, __LINE__))
-#endif	/* NDEBUG */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* Not RC_INVOKED */
-
-#endif /* Not _ASSERT_H_ */
-
diff --git a/winsup/mingw/include/complex.h b/winsup/mingw/include/complex.h
deleted file mode 100644
index af3fc0f18..000000000
--- a/winsup/mingw/include/complex.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * complex.h
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Danny Smith <dannysmith@users.sourceforge.net>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef _COMPLEX_H_
-#define _COMPLEX_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
-     || !defined __STRICT_ANSI__ 
-
-/* These macros are specified by C99 standard */
-
-#ifndef __cplusplus
-#define complex _Complex
-#endif
-
-#define _Complex_I  (0.0F +  1.0iF)
-
-/* GCC doesn't support _Imaginary type yet, so we don't
-   define _Imaginary_I */
-
-#define I _Complex_I
-
-#ifdef __cplusplus
-extern "C" {
-#endif 
-
-#ifndef RC_INVOKED
-
-/* TODO: float and long double versions */ 
-double __attribute__ ((const)) creal (double _Complex);
-double __attribute__ ((const)) cimag (double _Complex);
-double __attribute__ ((const)) carg (double _Complex);
-double __attribute__ ((const)) cabs (double _Complex);
-double _Complex __attribute__ ((const)) cconj (double _Complex);
-double _Complex __attribute__ ((const)) cacos (double _Complex);
-double _Complex __attribute__ ((const)) casin (double _Complex);
-double _Complex __attribute__ ((const)) catan (double _Complex);
-double _Complex __attribute__ ((const)) ccos (double _Complex);
-double _Complex __attribute__ ((const)) csin (double _Complex);
-double _Complex __attribute__ ((const)) ctan (double _Complex);
-double _Complex __attribute__ ((const)) cacosh (double _Complex);
-double _Complex __attribute__ ((const)) casinh (double _Complex);
-double _Complex __attribute__ ((const)) catanh (double _Complex);
-double _Complex __attribute__ ((const)) ccosh (double _Complex);
-double _Complex __attribute__ ((const)) csinh (double _Complex);
-double _Complex __attribute__ ((const)) ctanh (double _Complex);
-double _Complex __attribute__ ((const)) cexp (double _Complex);
-double _Complex __attribute__ ((const)) clog (double _Complex);
-double _Complex __attribute__ ((const)) cpow (double _Complex, double _Complex);
-double _Complex __attribute__ ((const)) csqrt (double _Complex);
-double _Complex __attribute__ ((const)) cproj (double _Complex);
-
-#ifdef __GNUC__
-
-__CRT_INLINE double __attribute__ ((const)) creal (double _Complex _Z)
-{
-  return __real__ _Z;
-}
-
-__CRT_INLINE double __attribute__ ((const)) cimag (double _Complex _Z)
-{
-  return __imag__ _Z;
-}
-
-__CRT_INLINE double _Complex __attribute__ ((const)) conj (double _Complex _Z)
-{
-  return __extension__ ~_Z;
-}
-
-__CRT_INLINE  double __attribute__ ((const)) carg (double _Complex _Z)
-{
-  double res;
-  __asm__  ("fpatan;"
-	   : "=t" (res) : "0" (__real__ _Z), "u" (__imag__ _Z) : "st(1)");
-  return res;
-}
-#endif /* __GNUC__ */
-
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif 
-
-#endif /* __STDC_VERSION__ >= 199901L */
-
-
-#endif /* _COMPLEX_H */
diff --git a/winsup/mingw/include/conio.h b/winsup/mingw/include/conio.h
deleted file mode 100644
index 780ccc10d..000000000
--- a/winsup/mingw/include/conio.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * conio.h
- *
- * Low level console I/O functions. Pretty please try to use the ANSI
- * standard ones if you are writing new code.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef	_CONIO_H_
-#define	_CONIO_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#ifndef RC_INVOKED
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-_CRTIMP char* __cdecl	_cgets (char*);
-_CRTIMP int __cdecl	_cprintf (const char*, ...);
-_CRTIMP int __cdecl	_cputs (const char*);
-_CRTIMP int __cdecl	_cscanf (char*, ...);
-
-_CRTIMP int __cdecl	_getch (void);
-_CRTIMP int __cdecl	_getche (void);
-_CRTIMP int __cdecl	_kbhit (void);
-_CRTIMP int __cdecl	_putch (int);
-_CRTIMP int __cdecl	_ungetch (int);
-
-
-#ifndef	_NO_OLDNAMES
-
-_CRTIMP int __cdecl	getch (void);
-_CRTIMP int __cdecl	getche (void);
-_CRTIMP int __cdecl	kbhit (void);
-_CRTIMP int __cdecl	putch (int);
-_CRTIMP int __cdecl	ungetch (int);
-
-#endif	/* Not _NO_OLDNAMES */
-
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _CONIO_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
diff --git a/winsup/mingw/include/ctype.h b/winsup/mingw/include/ctype.h
deleted file mode 100644
index 375c7c370..000000000
--- a/winsup/mingw/include/ctype.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/* 
- * ctype.h
- *
- * Functions for testing character types and converting characters.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _CTYPE_H_
-#define _CTYPE_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define	__need_wchar_t
-#define	__need_wint_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif	/* Not RC_INVOKED */
-
-
-/*
- * The following flags are used to tell iswctype and _isctype what character
- * types you are looking for.
- */
-#define	_UPPER		0x0001
-#define	_LOWER		0x0002
-#define	_DIGIT		0x0004
-#define	_SPACE		0x0008 /* HT  LF  VT  FF  CR  SP */
-#define	_PUNCT		0x0010
-#define	_CONTROL	0x0020
-#define	_BLANK		0x0040 /* this is SP only, not SP and HT as in C99  */
-#define	_HEX		0x0080
-#define	_LEADBYTE	0x8000
-
-#define	_ALPHA		0x0103
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_CRTIMP int __cdecl isalnum(int);
-_CRTIMP int __cdecl isalpha(int);
-_CRTIMP int __cdecl iscntrl(int);
-_CRTIMP int __cdecl isdigit(int);
-_CRTIMP int __cdecl isgraph(int);
-_CRTIMP int __cdecl islower(int);
-_CRTIMP int __cdecl isprint(int);
-_CRTIMP int __cdecl ispunct(int);
-_CRTIMP int __cdecl isspace(int);
-_CRTIMP int __cdecl isupper(int);
-_CRTIMP int __cdecl isxdigit(int);
-
-#ifndef __STRICT_ANSI__
-_CRTIMP int __cdecl _isctype (int, int);
-#endif
-
-/* These are the ANSI versions, with correct checking of argument */
-_CRTIMP int __cdecl tolower(int);
-_CRTIMP int __cdecl toupper(int);
-
-/*
- * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
- * exported.
- */
-#ifndef	__STRICT_ANSI__
-/*
- *  These are the cheap non-std versions: The return values are undefined
- *  if the argument is not ASCII char or is not of appropriate case
- */ 
-_CRTIMP int __cdecl _tolower(int);
-_CRTIMP int __cdecl _toupper(int);
-#endif
-
-/* Also defined in stdlib.h */
-#ifndef MB_CUR_MAX
-#ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
-   __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
-#else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
-   extern int* _imp____mbcur_max;
-#  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mbcur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
-#endif  	/*  __DECLSPEC_SUPPORTED */
-#endif  /* MB_CUR_MAX */
-
-
-#ifdef __DECLSPEC_SUPPORTED
-__MINGW_IMPORT unsigned short _ctype[];
-# ifdef __MSVCRT__
-  __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
-
-#else		/*  __DECLSPEC_SUPPORTED */
-extern unsigned short** _imp___ctype;
-#define _ctype (*_imp___ctype)
-# ifdef __MSVCRT__
-  extern unsigned short** _imp___pctype;
-# define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
-#endif		/*  __DECLSPEC_SUPPORTED */
-
-/*
- * Use inlines here rather than macros, because macros will upset 
- * C++ usage (eg, ::isalnum), and so usually get undefined
- *
- * According to standard for SB chars, these function are defined only
- * for input values representable by unsigned char or EOF.
- * Thus, there is no range test.
- * This reproduces behaviour of MSVCRT.dll lib implemention for SB chars.
- *
- * If no MB char support is needed, these can be simplified even
- * more by command line define -DMB_CUR_MAX=1.  The compiler will then
- * optimise away the constant condition.			
- */
-
-
-#if ! (defined (__NO_INLINE__)  || defined (__NO_CTYPE_INLINES) \
-      || defined (__STRICT_ANSI__ ))
-/* use  simple lookup if SB locale, else  _isctype()  */
-#define __ISCTYPE(c, mask)  (MB_CUR_MAX == 1 ? (_pctype[c] & mask) : _isctype(c, mask))
-__CRT_INLINE int __cdecl isalnum(int c) {return __ISCTYPE(c, (_ALPHA|_DIGIT));}
-__CRT_INLINE int __cdecl isalpha(int c) {return __ISCTYPE(c, _ALPHA);}
-__CRT_INLINE int __cdecl iscntrl(int c) {return __ISCTYPE(c, _CONTROL);}
-__CRT_INLINE int __cdecl isdigit(int c) {return __ISCTYPE(c, _DIGIT);}
-__CRT_INLINE int __cdecl isgraph(int c) {return __ISCTYPE(c, (_PUNCT|_ALPHA|_DIGIT));}
-__CRT_INLINE int __cdecl islower(int c) {return __ISCTYPE(c, _LOWER);}
-__CRT_INLINE int __cdecl isprint(int c) {return __ISCTYPE(c, (_BLANK|_PUNCT|_ALPHA|_DIGIT));}
-__CRT_INLINE int __cdecl ispunct(int c) {return __ISCTYPE(c, _PUNCT);}
-__CRT_INLINE int __cdecl isspace(int c) {return __ISCTYPE(c, _SPACE);}
-__CRT_INLINE int __cdecl isupper(int c) {return __ISCTYPE(c, _UPPER);}
-__CRT_INLINE int __cdecl isxdigit(int c) {return __ISCTYPE(c, _HEX);}
-
-/* these reproduce behaviour of lib underscored versions  */
-__CRT_INLINE int __cdecl _tolower(int c) {return ( c -'A'+'a');}
-__CRT_INLINE int __cdecl _toupper(int c) {return ( c -'a'+'A');}
-
-/* TODO? Is it worth inlining ANSI tolower, toupper? Probably only
-   if we only want C-locale. */
-
-#endif /* _NO_CTYPE_INLINES */
-
-/* Wide character equivalents */
-
-#ifndef WEOF
-#define	WEOF	(wchar_t)(0xFFFF)
-#endif
-
-#ifndef _WCTYPE_T_DEFINED
-typedef wchar_t wctype_t;
-#define _WCTYPE_T_DEFINED
-#endif
-
-_CRTIMP int __cdecl iswalnum(wint_t);
-_CRTIMP int __cdecl iswalpha(wint_t);
-_CRTIMP int __cdecl iswascii(wint_t);
-_CRTIMP int __cdecl iswcntrl(wint_t);
-_CRTIMP int __cdecl iswctype(wint_t, wctype_t);
-_CRTIMP int __cdecl is_wctype(wint_t, wctype_t);	/* Obsolete! */
-_CRTIMP int __cdecl iswdigit(wint_t);
-_CRTIMP int __cdecl iswgraph(wint_t);
-_CRTIMP int __cdecl iswlower(wint_t);
-_CRTIMP int __cdecl iswprint(wint_t);
-_CRTIMP int __cdecl iswpunct(wint_t);
-_CRTIMP int __cdecl iswspace(wint_t);
-_CRTIMP int __cdecl iswupper(wint_t);
-_CRTIMP int __cdecl iswxdigit(wint_t);
-
-_CRTIMP wchar_t __cdecl towlower(wchar_t);
-_CRTIMP wchar_t __cdecl towupper(wchar_t);
-
-_CRTIMP int __cdecl isleadbyte (int);
-
-/* Also in wctype.h */
-#if ! (defined (__NO_INLINE__) || defined(__NO_CTYPE_INLINES) \
-       || defined(__WCTYPE_INLINES_DEFINED))
-#define __WCTYPE_INLINES_DEFINED
-__CRT_INLINE int __cdecl iswalnum(wint_t wc) {return (iswctype(wc,_ALPHA|_DIGIT));}
-__CRT_INLINE int __cdecl iswalpha(wint_t wc) {return (iswctype(wc,_ALPHA));}
-__CRT_INLINE int __cdecl iswascii(wint_t wc) {return ((wc & ~0x7F) ==0);}
-__CRT_INLINE int __cdecl iswcntrl(wint_t wc) {return (iswctype(wc,_CONTROL));}
-__CRT_INLINE int __cdecl iswdigit(wint_t wc) {return (iswctype(wc,_DIGIT));}
-__CRT_INLINE int __cdecl iswgraph(wint_t wc) {return (iswctype(wc,_PUNCT|_ALPHA|_DIGIT));}
-__CRT_INLINE int __cdecl iswlower(wint_t wc) {return (iswctype(wc,_LOWER));}
-__CRT_INLINE int __cdecl iswprint(wint_t wc) {return (iswctype(wc,_BLANK|_PUNCT|_ALPHA|_DIGIT));}
-__CRT_INLINE int __cdecl iswpunct(wint_t wc) {return (iswctype(wc,_PUNCT));}
-__CRT_INLINE int __cdecl iswspace(wint_t wc) {return (iswctype(wc,_SPACE));}
-__CRT_INLINE int __cdecl iswupper(wint_t wc) {return (iswctype(wc,_UPPER));}
-__CRT_INLINE int __cdecl iswxdigit(wint_t wc) {return (iswctype(wc,_HEX));}
-__CRT_INLINE int __cdecl isleadbyte(int c) {return (_pctype[(unsigned char)(c)] & _LEADBYTE);}
-#endif /* !(defined(__NO_CTYPE_INLINES) || defined(__WCTYPE_INLINES_DEFINED)) */
-
-#ifndef	__STRICT_ANSI__
-int __cdecl __isascii (int);
-int __cdecl __toascii (int);
-int __cdecl __iscsymf (int);		/* Valid first character in C symbol */
-int __cdecl __iscsym (int);		/* Valid character in C symbol (after first) */
-
-#if !(defined (__NO_INLINE__) || defined (__NO_CTYPE_INLINES))
-__CRT_INLINE int __cdecl __isascii(int c) {return ((c & ~0x7F) == 0);} 
-__CRT_INLINE int __cdecl __toascii(int c) {return (c & 0x7F);}
-__CRT_INLINE int __cdecl __iscsymf(int c) {return (isalpha(c) || (c == '_'));}
-__CRT_INLINE int __cdecl __iscsym(int c)  {return  (isalnum(c) || (c == '_'));}
-#endif /* __NO_CTYPE_INLINES */
-
-#ifndef	_NO_OLDNAMES
-/* Not _CRTIMP */ 
-int __cdecl isascii (int);
-int __cdecl toascii (int);
-int __cdecl iscsymf (int);
-int __cdecl iscsym (int);
-#endif	/* Not _NO_OLDNAMES */
-
-#endif	/* Not __STRICT_ANSI__ */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _CTYPE_H_ */
-
diff --git a/winsup/mingw/include/dir.h b/winsup/mingw/include/dir.h
deleted file mode 100644
index d759a0a61..000000000
--- a/winsup/mingw/include/dir.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 
- * dir.h
- *
- * This file OBSOLESCENT and only provided for backward compatibility.
- * Please use io.h instead.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *             Mumit Khan <khan@xraylith.wisc.edu>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#include <io.h>
-
diff --git a/winsup/mingw/include/direct.h b/winsup/mingw/include/direct.h
deleted file mode 100644
index c8fec4cf4..000000000
--- a/winsup/mingw/include/direct.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * direct.h
- *
- * Functions for manipulating paths and directories (included from io.h)
- * plus functions for setting the current drive.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef __STRICT_ANSI__
-
-#ifndef	_DIRECT_H_
-#define	_DIRECT_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define __need_wchar_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif	/* Not RC_INVOKED */
-
-#include <io.h>
-
-#ifndef RC_INVOKED
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#ifndef _DISKFREE_T_DEFINED
-/* needed by _getdiskfree (also in dos.h) */
-struct _diskfree_t {
-	unsigned total_clusters;
-	unsigned avail_clusters;
-	unsigned sectors_per_cluster;
-	unsigned bytes_per_sector;
-};
-#define _DISKFREE_T_DEFINED
-#endif  
-
-/*
- * You really shouldn't be using these. Use the Win32 API functions instead.
- * However, it does make it easier to port older code.
- */
-_CRTIMP int __cdecl _getdrive (void);
-_CRTIMP unsigned long __cdecl _getdrives(void);
-_CRTIMP int __cdecl _chdrive (int);
-_CRTIMP char* __cdecl _getdcwd (int, char*, int);
-_CRTIMP unsigned __cdecl _getdiskfree (unsigned, struct _diskfree_t *);
-
-#ifndef	_NO_OLDNAMES
-# define diskfree_t _diskfree_t
-#endif
-
-#ifndef _WDIRECT_DEFINED
-/* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
-_CRTIMP int __cdecl _wchdir(const wchar_t*);
-_CRTIMP wchar_t* __cdecl _wgetcwd(wchar_t*, int);
-_CRTIMP wchar_t* __cdecl _wgetdcwd(int, wchar_t*, int);
-_CRTIMP int __cdecl _wmkdir(const wchar_t*);
-_CRTIMP int __cdecl _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
-#define _WDIRECT_DEFINED
-#endif
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _DIRECT_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/dirent.h b/winsup/mingw/include/dirent.h
deleted file mode 100644
index 4e787d841..000000000
--- a/winsup/mingw/include/dirent.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * DIRENT.H (formerly DIRLIB.H)
- *
- * by M. J. Weinstein   Released to public domain 1-Jan-89
- *
- * Because I have heard that this feature (opendir, readdir, closedir)
- * it so useful for programmers coming from UNIX or attempting to port
- * UNIX code, and because it is reasonably light weight, I have included
- * it in the Mingw32 package. I have also added an implementation of
- * rewinddir, seekdir and telldir.
- *   - Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  This code is distributed in the hope that is will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includeds but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef _DIRENT_H_
-#define _DIRENT_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#include <io.h>
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct dirent
-{
-	long		d_ino;		/* Always zero. */
-	unsigned short	d_reclen;	/* Always zero. */
-	unsigned short	d_namlen;	/* Length of name in d_name. */
-	char		d_name[FILENAME_MAX]; /* File name. */
-};
-
-/*
- * This is an internal data structure. Good programmers will not use it
- * except as an argument to one of the functions below.
- * dd_stat field is now int (was short in older versions).
- */
-typedef struct
-{
-	/* disk transfer area for this dir */
-	struct _finddata_t	dd_dta;
-
-	/* dirent struct to return from dir (NOTE: this makes this thread
-	 * safe as long as only one thread uses a particular DIR struct at
-	 * a time) */
-	struct dirent		dd_dir;
-
-	/* _findnext handle */
-	long			dd_handle;
-
-	/*
-         * Status of search:
-	 *   0 = not started yet (next entry to read is first entry)
-	 *  -1 = off the end
-	 *   positive = 0 based index of next entry
-	 */
-	int			dd_stat;
-
-	/* given path for dir with search pattern (struct is extended) */
-	char			dd_name[1];
-} DIR;
-
-DIR* __cdecl opendir (const char*);
-struct dirent* __cdecl readdir (DIR*);
-int __cdecl closedir (DIR*);
-void __cdecl rewinddir (DIR*);
-long __cdecl telldir (DIR*);
-void __cdecl seekdir (DIR*, long);
-
-
-/* wide char versions */
-
-struct _wdirent
-{
-	long		d_ino;		/* Always zero. */
-	unsigned short	d_reclen;	/* Always zero. */
-	unsigned short	d_namlen;	/* Length of name in d_name. */
-	wchar_t		d_name[FILENAME_MAX]; /* File name. */
-	/* NOTE: The name in the dirent structure points to the name in the	 *       wfinddata_t structure in the _WDIR. */
-};
-
-/*
- * This is an internal data structure. Good programmers will not use it
- * except as an argument to one of the functions below.
- */
-typedef struct
-{
-	/* disk transfer area for this dir */
-	struct _wfinddata_t	dd_dta;
-
-	/* dirent struct to return from dir (NOTE: this makes this thread
-	 * safe as long as only one thread uses a particular DIR struct at
-	 * a time) */
-	struct _wdirent		dd_dir;
-
-	/* _findnext handle */
-	long			dd_handle;
-
-	/*
-         * Status of search:
-	 *   0 = not started yet (next entry to read is first entry)
-	 *  -1 = off the end
-	 *   positive = 0 based index of next entry
-	 */
-	int			dd_stat;
-
-	/* given path for dir with search pattern (struct is extended) */
-	wchar_t			dd_name[1];
-} _WDIR;
-
-
-
-_WDIR* __cdecl _wopendir (const wchar_t*);
-struct _wdirent*  __cdecl _wreaddir (_WDIR*);
-int __cdecl _wclosedir (_WDIR*);
-void __cdecl _wrewinddir (_WDIR*);
-long __cdecl _wtelldir (_WDIR*);
-void __cdecl _wseekdir (_WDIR*, long);
-
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _DIRENT_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/dos.h b/winsup/mingw/include/dos.h
deleted file mode 100644
index 4f2134e7e..000000000
--- a/winsup/mingw/include/dos.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * dos.h
- *
- * DOS-specific functions and structures.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by J.J. van der Heijden <J.J.vanderHeijden@student.utwente.nl>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef	_DOS_H_
-#define	_DOS_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define __need_wchar_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif	/* Not RC_INVOKED */
-
-/* For DOS file attributes */
-#include <io.h>
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int _basemajor_dll;
-__MINGW_IMPORT unsigned int _baseminor_dll;
-__MINGW_IMPORT unsigned int _baseversion_dll;
-__MINGW_IMPORT unsigned int _osmajor_dll;
-__MINGW_IMPORT unsigned int _osminor_dll;
-__MINGW_IMPORT unsigned int _osmode_dll;
-
-#define _basemajor _basemajor_dll
-#define _baseminor _baseminor_dll
-#define _baseversion _baseversion_dll
-#define _osmajor _osmajor_dll
-#define _osminor _osminor_dll
-#define _osmode _osmode_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
-#ifndef _DISKFREE_T_DEFINED
-/* needed by _getdiskfree (also in direct.h) */
-struct _diskfree_t {
-	unsigned total_clusters;
-	unsigned avail_clusters;
-	unsigned sectors_per_cluster;
-	unsigned bytes_per_sector;
-};
-#define _DISKFREE_T_DEFINED
-#endif  
-
-_CRTIMP unsigned __cdecl _getdiskfree (unsigned, struct _diskfree_t *);
-
-#ifndef	_NO_OLDNAMES
-# define diskfree_t _diskfree_t
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _DOS_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/errno.h b/winsup/mingw/include/errno.h
deleted file mode 100644
index e4669ccec..000000000
--- a/winsup/mingw/include/errno.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* 
- * errno.h
- *
- * Error numbers and access to error reporting.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _ERRNO_H_
-#define	_ERRNO_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/*
- * Error numbers.
- * TODO: Can't be sure of some of these assignments, I guessed from the
- * names given by strerror and the defines in the Cygnus errno.h. A lot
- * of the names from the Cygnus errno.h are not represented, and a few
- * of the descriptions returned by strerror do not obviously match
- * their error naming.
- */
-#define EPERM		1	/* Operation not permitted */
-#define	ENOFILE		2	/* No such file or directory */
-#define	ENOENT		2
-#define	ESRCH		3	/* No such process */
-#define	EINTR		4	/* Interrupted function call */
-#define	EIO		5	/* Input/output error */
-#define	ENXIO		6	/* No such device or address */
-#define	E2BIG		7	/* Arg list too long */
-#define	ENOEXEC		8	/* Exec format error */
-#define	EBADF		9	/* Bad file descriptor */
-#define	ECHILD		10	/* No child processes */
-#define	EAGAIN		11	/* Resource temporarily unavailable */
-#define	ENOMEM		12	/* Not enough space */
-#define	EACCES		13	/* Permission denied */
-#define	EFAULT		14	/* Bad address */
-/* 15 - Unknown Error */
-#define	EBUSY		16	/* strerror reports "Resource device" */
-#define	EEXIST		17	/* File exists */
-#define	EXDEV		18	/* Improper link (cross-device link?) */
-#define	ENODEV		19	/* No such device */
-#define	ENOTDIR		20	/* Not a directory */
-#define	EISDIR		21	/* Is a directory */
-#define	EINVAL		22	/* Invalid argument */
-#define	ENFILE		23	/* Too many open files in system */
-#define	EMFILE		24	/* Too many open files */
-#define	ENOTTY		25	/* Inappropriate I/O control operation */
-/* 26 - Unknown Error */
-#define	EFBIG		27	/* File too large */
-#define	ENOSPC		28	/* No space left on device */
-#define	ESPIPE		29	/* Invalid seek (seek on a pipe?) */
-#define	EROFS		30	/* Read-only file system */
-#define	EMLINK		31	/* Too many links */
-#define	EPIPE		32	/* Broken pipe */
-#define	EDOM		33	/* Domain error (math functions) */
-#define	ERANGE		34	/* Result too large (possibly too small) */
-/* 35 - Unknown Error */
-#define	EDEADLOCK	36	/* Resource deadlock avoided (non-Cyg) */
-#define	EDEADLK		36
-/* 37 - Unknown Error */
-#define	ENAMETOOLONG	38	/* Filename too long (91 in Cyg?) */
-#define	ENOLCK		39	/* No locks available (46 in Cyg?) */
-#define	ENOSYS		40	/* Function not implemented (88 in Cyg?) */
-#define	ENOTEMPTY	41	/* Directory not empty (90 in Cyg?) */
-#define	EILSEQ		42	/* Illegal byte sequence */
-
-/*
- * NOTE: ENAMETOOLONG and ENOTEMPTY conflict with definitions in the
- *       sockets.h header provided with windows32api-0.1.2.
- *       You should go and put an #if 0 ... #endif around the whole block
- *       of errors (look at the comment above them).
- */
-
-#ifndef	RC_INVOKED
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/*
- * Definitions of errno. For _doserrno, sys_nerr and * sys_errlist, see
- * stdlib.h.
- */
-#ifdef _UWIN
-#undef errno
-extern int errno;
-#else
-_CRTIMP int* __cdecl _errno(void);
-#define	errno		(*_errno())
-#endif
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _ERRNO_H_ */
diff --git a/winsup/mingw/include/excpt.h b/winsup/mingw/include/excpt.h
deleted file mode 100644
index 20a2d721a..000000000
--- a/winsup/mingw/include/excpt.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* 
- * excpt.h
- *
- * Support for operating system level structured exception handling.
- *
- * NOTE: This is very preliminary stuff. I am also pretty sure it is
- *       completely Intel specific.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *  Based on code by Mikey <jeffdb@netzone.com>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	_EXCPT_H_
-#define	_EXCPT_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#ifndef	__STRICT_ANSI__
-
-#include <windef.h>
-
-/*
- * NOTE: The constants structs and typedefs below should be defined in the
- *       Win32 API headers.
- */
-#define	EH_NONCONTINUABLE	0x01
-#define	EH_UNWINDING		0x02
-#define	EH_EXIT_UNWIND		0x04
-#define	EH_STACK_INVALID	0x08
-#define	EH_NESTED_CALL		0x10
-
-#ifndef	RC_INVOKED
-
-typedef enum {
-	ExceptionContinueExecution,
-	ExceptionContinueSearch,
-	ExceptionNestedException,
-	ExceptionCollidedUnwind
-} EXCEPTION_DISPOSITION;
-
-
-/*
- * End of stuff that should be in the Win32 API files.
- */
-
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/*
- * The type of function that is expected as an exception handler to be
- * installed with _try1.
- */
-typedef EXCEPTION_DISPOSITION (*PEXCEPTION_HANDLER)
-		(struct _EXCEPTION_RECORD*, void*, struct _CONTEXT*, void*);
-
-/*
- * This is not entirely necessary, but it is the structure installed by
- * the _try1 primitive below.
- */
-typedef struct _EXCEPTION_REGISTRATION
-{
-	struct _EXCEPTION_REGISTRATION*	prev;
-	PEXCEPTION_HANDLER		handler;
-} EXCEPTION_REGISTRATION, *PEXCEPTION_REGISTRATION;
-
-typedef EXCEPTION_REGISTRATION EXCEPTION_REGISTRATION_RECORD;
-typedef PEXCEPTION_REGISTRATION PEXCEPTION_REGISTRATION_RECORD;
-
-/*
- * A macro which installs the supplied exception handler.
- * Push the pointer to the new handler onto the stack,
- * then push the pointer to the old registration structure (at fs:0)
- * onto the stack, then put a pointer to the new registration
- * structure (i.e. the current stack pointer) at fs:0.
- */
-#define __try1(pHandler) \
-	__asm__ ("pushl %0;pushl %%fs:0;movl %%esp,%%fs:0;" : : "g" (pHandler));
-
-/*
- * A macro which (despite its name) *removes* an installed
- * exception handler. Should be used only in conjunction with the above
- * install routine __try1.
- * Move the pointer to the old reg. struct (at the current stack
- * position) to fs:0, replacing the pointer we installed above,
- * then add 8 to the stack pointer to get rid of the space we
- * used when we pushed on our new reg. struct above. Notice that
- * the stack must be in the exact state at this point that it was
- * after we did _try1 or this will smash things.
- */
-#define	__except1	\
-	__asm__ ("movl (%%esp),%%eax;movl %%eax,%%fs:0;addl $8,%%esp;" \
-	 : : : "%eax");
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not strict ANSI */
-
-#endif	/* _EXCPT_H_ not defined */
diff --git a/winsup/mingw/include/fcntl.h b/winsup/mingw/include/fcntl.h
deleted file mode 100644
index ce193295b..000000000
--- a/winsup/mingw/include/fcntl.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * fcntl.h
- *
- * Access constants for _open. Note that the permissions constants are
- * in sys/stat.h (ick).
- *
- * This code is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef __STRICT_ANSI__
-
-#ifndef _FCNTL_H_
-#define _FCNTL_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/*
- * It appears that fcntl.h should include io.h for compatibility...
- */
-#include <io.h>
-
-/* Specifiy one of these flags to define the access mode. */
-#define	_O_RDONLY	0
-#define _O_WRONLY	1
-#define _O_RDWR		2
-
-/* Mask for access mode bits in the _open flags. */
-#define _O_ACCMODE	(_O_RDONLY|_O_WRONLY|_O_RDWR)
-
-#define	_O_APPEND	0x0008	/* Writes will add to the end of the file. */
-
-#define	_O_RANDOM	0x0010
-#define	_O_SEQUENTIAL	0x0020
-#define	_O_TEMPORARY	0x0040	/* Make the file dissappear after closing.
-				 * WARNING: Even if not created by _open! */
-#define	_O_NOINHERIT	0x0080
-
-#define	_O_CREAT	0x0100	/* Create the file if it does not exist. */
-#define	_O_TRUNC	0x0200	/* Truncate the file if it does exist. */
-#define	_O_EXCL		0x0400	/* Open only if the file does not exist. */
-
-#define _O_SHORT_LIVED  0x1000
-
-/* NOTE: Text is the default even if the given _O_TEXT bit is not on. */
-#define	_O_TEXT		0x4000	/* CR-LF in file becomes LF in memory. */
-#define	_O_BINARY	0x8000	/* Input and output is not translated. */
-#define	_O_RAW		_O_BINARY
-
-#ifndef	_NO_OLDNAMES
-
-/* POSIX/Non-ANSI names for increased portability */
-#define	O_RDONLY	_O_RDONLY
-#define O_WRONLY	_O_WRONLY
-#define O_RDWR		_O_RDWR
-#define O_ACCMODE	_O_ACCMODE
-#define	O_APPEND	_O_APPEND
-#define	O_CREAT		_O_CREAT
-#define	O_TRUNC		_O_TRUNC
-#define	O_EXCL		_O_EXCL
-#define	O_TEXT		_O_TEXT
-#define	O_BINARY	_O_BINARY
-#define	O_TEMPORARY	_O_TEMPORARY
-#define O_NOINHERIT	_O_NOINHERIT
-#define O_SEQUENTIAL	_O_SEQUENTIAL
-#define	O_RANDOM	_O_RANDOM
-
-#endif	/* Not _NO_OLDNAMES */
-
-#endif	/* Not _FCNTL_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/fenv.h b/winsup/mingw/include/fenv.h
deleted file mode 100644
index 43dfd338a..000000000
--- a/winsup/mingw/include/fenv.h
+++ /dev/null
@@ -1,91 +0,0 @@
-#ifndef _FENV_H_
-#define _FENV_H_
-
-
-/* FPU status word exception flags */
-#define FE_INVALID	0x01
-#define FE_DENORMAL	0x02
-#define FE_DIVBYZERO	0x04
-#define FE_OVERFLOW	0x08
-#define FE_UNDERFLOW	0x10
-#define FE_INEXACT	0x20
-#define FE_ALL_EXCEPT (FE_INVALID | FE_DENORMAL | FE_DIVBYZERO \
-		       | FE_OVERFLOW | FE_UNDERFLOW | FE_INEXACT)
-
-/* FPU control word rounding flags */
-#define FE_TONEAREST	0x0000
-#define FE_DOWNWARD	0x0400
-#define FE_UPWARD	0x0800
-#define FE_TOWARDZERO	0x0c00
-
-#ifndef RC_INVOKED
-/*
-  For now, support only for the basic abstraction of flags that are
-  either set or clear. fexcept_t could be  structure that holds more
-  info about the fp environment.
-*/
-typedef unsigned short fexcept_t;
-
-/* This 28-byte struct represents the entire floating point
-   environment as stored by fnstenv or fstenv */
-typedef struct
-{
-  unsigned short __control_word;
-  unsigned short __unused0;
-  unsigned short __status_word;
-  unsigned short __unused1;
-  unsigned short __tag_word;
-  unsigned short __unused2;  
-  unsigned int	 __ip_offset;    /* instruction pointer offset */
-  unsigned short __ip_selector;  
-  unsigned short __opcode;
-  unsigned int	 __data_offset;
-  unsigned short __data_selector;  
-  unsigned short __unused3;
-} fenv_t;
-
-
-/*The C99 standard (7.6.9) allows us to define implementation-specific macros for
-  different fp environments */
-  
-/* The default Intel x87 floating point environment (64-bit mantissa) */
-#define FE_PC64_ENV ((const fenv_t *)-1)
-
-/* The floating point environment set by MSVCRT _fpreset (53-bit mantissa) */
-#define FE_PC53_ENV ((const fenv_t *)-2)
-
-/* The FE_DFL_ENV macro is required by standard.
-  fesetenv will use the environment set at app startup.*/
-#define FE_DFL_ENV ((const fenv_t *) 0)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*TODO: Some of these could be inlined */
-/* 7.6.2 Exception */
-
-extern int __cdecl feclearexcept (int);
-extern int __cdecl fegetexceptflag (fexcept_t * flagp, int excepts);
-extern int __cdecl feraiseexcept (int excepts );
-extern int __cdecl fesetexceptflag (const fexcept_t *, int);
-extern int __cdecl fetestexcept (int excepts);
-
-/* 7.6.3 Rounding */
-
-extern int __cdecl fegetround (void);
-extern int __cdecl fesetround (int mode);
-
-/* 7.6.4 Environment */
-
-extern int __cdecl fegetenv (fenv_t * envp);
-extern int __cdecl fesetenv (const fenv_t * );
-extern int __cdecl feupdateenv (const fenv_t *);
-extern int __cdecl feholdexcept (fenv_t *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif	/* Not RC_INVOKED */
-
-#endif /* ndef _FENV_H */
diff --git a/winsup/mingw/include/float.h b/winsup/mingw/include/float.h
deleted file mode 100644
index 1e3d4aa82..000000000
--- a/winsup/mingw/include/float.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 
- * float.h
- *
- * Constants related to floating point arithmetic.
- *
- * Also included here are some non-ANSI bits for accessing the floating
- * point controller.
- *
- * NOTE: GCC provides float.h, but it doesn't include the non-standard
- *       stuff for accessing the fp controller. We include_next the
- *       GCC-supplied header and just define the MS-specific extensions
- *       here.     
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include_next<float.h>
-
-#ifndef _MINGW_FLOAT_H_
-#define _MINGW_FLOAT_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/*
- * Functions and definitions for controlling the FPU.
- */
-#ifndef	__STRICT_ANSI__
-
-/* TODO: These constants are only valid for x86 machines */
-
-/* Control word masks for unMask */
-#define	_MCW_EM		0x0008001F	/* Error masks */
-#define	_MCW_IC		0x00040000	/* Infinity */
-#define	_MCW_RC		0x00000300	/* Rounding */
-#define	_MCW_PC		0x00030000	/* Precision */
-
-/* Control word values for unNew (use with related unMask above) */
-#define	_EM_INVALID	0x00000010
-#define	_EM_DENORMAL	0x00080000
-#define	_EM_ZERODIVIDE	0x00000008
-#define	_EM_OVERFLOW	0x00000004
-#define	_EM_UNDERFLOW	0x00000002
-#define	_EM_INEXACT	0x00000001
-#define	_IC_AFFINE	0x00040000
-#define	_IC_PROJECTIVE	0x00000000
-#define	_RC_CHOP	0x00000300
-#define	_RC_UP		0x00000200
-#define	_RC_DOWN	0x00000100
-#define	_RC_NEAR	0x00000000
-#define	_PC_24		0x00020000
-#define	_PC_53		0x00010000
-#define	_PC_64		0x00000000
-
-/* These are also defined in Mingw math.h, needed to work around
-   GCC build issues.  */
-/* Return values for fpclass. */
-#ifndef __MINGW_FPCLASS_DEFINED
-#define __MINGW_FPCLASS_DEFINED 1
-#define	_FPCLASS_SNAN	0x0001	/* Signaling "Not a Number" */
-#define	_FPCLASS_QNAN	0x0002	/* Quiet "Not a Number" */
-#define	_FPCLASS_NINF	0x0004	/* Negative Infinity */
-#define	_FPCLASS_NN	0x0008	/* Negative Normal */
-#define	_FPCLASS_ND	0x0010	/* Negative Denormal */
-#define	_FPCLASS_NZ	0x0020	/* Negative Zero */
-#define	_FPCLASS_PZ	0x0040	/* Positive Zero */
-#define	_FPCLASS_PD	0x0080	/* Positive Denormal */
-#define	_FPCLASS_PN	0x0100	/* Positive Normal */
-#define	_FPCLASS_PINF	0x0200	/* Positive Infinity */
-#endif /* __MINGW_FPCLASS_DEFINED */
-
-/* invalid subconditions (_SW_INVALID also set) */
-#define _SW_UNEMULATED		0x0040  /* unemulated instruction */
-#define _SW_SQRTNEG		0x0080  /* square root of a neg number */
-#define _SW_STACKOVERFLOW	0x0200  /* FP stack overflow */
-#define _SW_STACKUNDERFLOW	0x0400  /* FP stack underflow */
-
-/*  Floating point error signals and return codes */
-#define _FPE_INVALID		0x81
-#define _FPE_DENORMAL		0x82
-#define _FPE_ZERODIVIDE		0x83
-#define _FPE_OVERFLOW		0x84
-#define _FPE_UNDERFLOW		0x85
-#define _FPE_INEXACT		0x86
-#define _FPE_UNEMULATED		0x87
-#define _FPE_SQRTNEG		0x88
-#define _FPE_STACKOVERFLOW	0x8a
-#define _FPE_STACKUNDERFLOW	0x8b
-#define _FPE_EXPLICITGEN	0x8c    /* raise( SIGFPE ); */
-
-#ifndef RC_INVOKED
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* Set the FPU control word as cw = (cw & ~unMask) | (unNew & unMask),
- * i.e. change the bits in unMask to have the values they have in unNew,
- * leaving other bits unchanged. */
-_CRTIMP unsigned int __cdecl _controlfp (unsigned int unNew, unsigned int unMask);
-_CRTIMP unsigned int __cdecl _control87 (unsigned int unNew, unsigned int unMask);
-
-
-_CRTIMP unsigned int __cdecl _clearfp (void);	/* Clear the FPU status word */
-_CRTIMP unsigned int __cdecl _statusfp (void);	/* Report the FPU status word */
-#define		_clear87	_clearfp
-#define		_status87	_statusfp
-
-
-/*
-   MSVCRT.dll _fpreset initializes the control register to 0x27f,
-   the status register to zero and the tag word to 0FFFFh.
-   This differs from asm instruction finit/fninit which set control
-   word to 0x37f (64 bit mantissa precison rather than 53 bit).
-   By default, the mingw version of _fpreset sets fp control as
-   per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when
-   building your application.	 
-*/
-void __cdecl _fpreset (void);
-void __cdecl fpreset (void);
-
-/* Global 'variable' for the current floating point error code. */
-_CRTIMP int * __cdecl __fpecode(void);
-#define	_fpecode	(*(__fpecode()))
-
-/*
- * IEEE recommended functions.  MS puts them in float.h
- * but they really belong in math.h.
- */
-
-_CRTIMP double __cdecl _chgsign	(double);
-_CRTIMP double __cdecl _copysign (double, double);
-_CRTIMP double __cdecl _logb (double);
-_CRTIMP double __cdecl _nextafter (double, double);
-_CRTIMP double __cdecl _scalb (double, long);
-
-_CRTIMP int __cdecl _finite (double);
-_CRTIMP int __cdecl _fpclass (double);
-_CRTIMP int __cdecl _isnan (double);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not __STRICT_ANSI__ */
-
-#endif /* _FLOAT_H_ */
-
diff --git a/winsup/mingw/include/getopt.h b/winsup/mingw/include/getopt.h
deleted file mode 100644
index 6b6f643b7..000000000
--- a/winsup/mingw/include/getopt.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1987, 1993, 1994, 1996
- *  The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *  This product includes software developed by the University of
- *  California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __GETOPT_H__
-#define __GETOPT_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int   opterr;      /* if error message should be printed */
-extern int   optind;      /* index into parent argv vector */
-extern int   optopt;      /* character checked for validity */
-extern int   optreset;    /* reset getopt */
-extern char *optarg;      /* argument associated with option */
-
-int getopt (int, char * const *, const char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GETOPT_H__ */
-
-#ifndef __UNISTD_GETOPT__
-#ifndef __GETOPT_LONG_H__
-#define __GETOPT_LONG_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct option {
-	const char *name;
-	int  has_arg;
-	int *flag;
-	int val;
-};
-
-int getopt_long (int, char *const *, const char *, const struct option *, int *);
-#ifndef HAVE_DECL_GETOPT
-#define HAVE_DECL_GETOPT 1
-#endif
-
-#define no_argument             0
-#define required_argument       1
-#define optional_argument       2
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __GETOPT_LONG_H__ */
-#endif /* __UNISTD_GETOPT__ */
diff --git a/winsup/mingw/include/inttypes.h b/winsup/mingw/include/inttypes.h
deleted file mode 100644
index a2042614a..000000000
--- a/winsup/mingw/include/inttypes.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* 7.8 Format conversion of integer types <inttypes.h> */
-
-#ifndef _INTTYPES_H_
-#define _INTTYPES_H_
-
-#include <_mingw.h>
-#include <stdint.h>
-#define __need_wchar_t
-#include <stddef.h>
-
-#ifdef	__cplusplus
-extern	"C"	{
-#endif
-
-typedef struct {
-	intmax_t quot;
-	intmax_t rem;
-	} imaxdiv_t;
-
-#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS)
-
-/* 7.8.1 Macros for format specifiers
- * 
- * MS runtime does not yet understand C9x standard "ll"
- * length specifier. It appears to treat "ll" as "l".
- * The non-standard I64 length specifier causes warning in GCC,
- * but understood by MS runtime functions.
- */
-
-/* fprintf macros for signed types */
-#define PRId8 "d"
-#define PRId16 "d"
-#define PRId32 "d"
-#define PRId64 "I64d"
-
-#define PRIdLEAST8 "d"
-#define PRIdLEAST16 "d"
-#define PRIdLEAST32 "d"
-#define PRIdLEAST64 "I64d"
-
-#define PRIdFAST8 "d"
-#define PRIdFAST16 "d"
-#define PRIdFAST32 "d"
-#define PRIdFAST64 "I64d"
-
-#define PRIdMAX "I64d"
-#define PRIdPTR "d"
-
-#define PRIi8 "i"
-#define PRIi16 "i"
-#define PRIi32 "i"
-#define PRIi64 "I64i"
-
-#define PRIiLEAST8 "i"
-#define PRIiLEAST16 "i"
-#define PRIiLEAST32 "i"
-#define PRIiLEAST64 "I64i"
-
-#define PRIiFAST8 "i"
-#define PRIiFAST16 "i"
-#define PRIiFAST32 "i"
-#define PRIiFAST64 "I64i"
-
-#define PRIiMAX "I64i"
-#define PRIiPTR "i"
-
-#define PRIo8 "o"
-#define PRIo16 "o"
-#define PRIo32 "o"
-#define PRIo64 "I64o"
-
-#define PRIoLEAST8 "o"
-#define PRIoLEAST16 "o"
-#define PRIoLEAST32 "o"
-#define PRIoLEAST64 "I64o"
-
-#define PRIoFAST8 "o"
-#define PRIoFAST16 "o"
-#define PRIoFAST32 "o"
-#define PRIoFAST64 "I64o"
-
-#define PRIoMAX "I64o"
-
-#define PRIoPTR "o"
-
-/* fprintf macros for unsigned types */
-#define PRIu8 "u"
-#define PRIu16 "u"
-#define PRIu32 "u"
-#define PRIu64 "I64u"
-
-
-#define PRIuLEAST8 "u"
-#define PRIuLEAST16 "u"
-#define PRIuLEAST32 "u"
-#define PRIuLEAST64 "I64u"
-
-#define PRIuFAST8 "u"
-#define PRIuFAST16 "u"
-#define PRIuFAST32 "u"
-#define PRIuFAST64 "I64u"
-
-#define PRIuMAX "I64u"
-#define PRIuPTR "u"
-
-#define PRIx8 "x"
-#define PRIx16 "x"
-#define PRIx32 "x"
-#define PRIx64 "I64x"
-
-#define PRIxLEAST8 "x"
-#define PRIxLEAST16 "x"
-#define PRIxLEAST32 "x"
-#define PRIxLEAST64 "I64x"
-
-#define PRIxFAST8 "x"
-#define PRIxFAST16 "x"
-#define PRIxFAST32 "x"
-#define PRIxFAST64 "I64x"
-
-#define PRIxMAX "I64x"
-#define PRIxPTR "x"
-
-#define PRIX8 "X"
-#define PRIX16 "X"
-#define PRIX32 "X"
-#define PRIX64 "I64X"
-
-#define PRIXLEAST8 "X"
-#define PRIXLEAST16 "X"
-#define PRIXLEAST32 "X"
-#define PRIXLEAST64 "I64X"
-
-#define PRIXFAST8 "X"
-#define PRIXFAST16 "X"
-#define PRIXFAST32 "X"
-#define PRIXFAST64 "I64X"
-
-#define PRIXMAX "I64X"
-#define PRIXPTR "X"
-
-/*
- *   fscanf macros for signed int types
- *   NOTE: if 32-bit int is used for int_fast8_t and int_fast16_t
- *   (see stdint.h, 7.18.1.3), FAST8 and FAST16 should have
- *   no length identifiers
- */
-
-#define SCNd16 "hd"
-#define SCNd32 "d"
-#define SCNd64 "I64d"
-
-#define SCNdLEAST16 "hd"
-#define SCNdLEAST32 "d"
-#define SCNdLEAST64 "I64d"
-
-#define SCNdFAST16 "hd"
-#define SCNdFAST32 "d"
-#define SCNdFAST64 "I64d"
-
-#define SCNdMAX "I64d"
-#define SCNdPTR "d"
-
-#define SCNi16 "hi"
-#define SCNi32 "i"
-#define SCNi64 "I64i"
-
-#define SCNiLEAST16 "hi"
-#define SCNiLEAST32 "i"
-#define SCNiLEAST64 "I64i"
-
-#define SCNiFAST16 "hi"
-#define SCNiFAST32 "i"
-#define SCNiFAST64 "I64i"
-
-#define SCNiMAX "I64i"
-#define SCNiPTR "i"
-
-#define SCNo16 "ho"
-#define SCNo32 "o"
-#define SCNo64 "I64o"
-
-#define SCNoLEAST16 "ho"
-#define SCNoLEAST32 "o"
-#define SCNoLEAST64 "I64o"
-
-#define SCNoFAST16 "ho"
-#define SCNoFAST32 "o"
-#define SCNoFAST64 "I64o"
-
-#define SCNoMAX "I64o"
-#define SCNoPTR "o"
-
-#define SCNx16 "hx"
-#define SCNx32 "x"
-#define SCNx64 "I64x"
-
-#define SCNxLEAST16 "hx"
-#define SCNxLEAST32 "x"
-#define SCNxLEAST64 "I64x"
-
-#define SCNxFAST16 "hx"
-#define SCNxFAST32 "x"
-#define SCNxFAST64 "I64x"
-
-#define SCNxMAX "I64x"
-#define SCNxPTR "x"
-
-
-/* fscanf macros for unsigned int types */
-
-#define SCNu16 "hu"
-#define SCNu32 "u"
-#define SCNu64 "I64u"
-
-#define SCNuLEAST16 "hu"
-#define SCNuLEAST32 "u"
-#define SCNuLEAST64 "I64u"
-
-#define SCNuFAST16 "hu"
-#define SCNuFAST32 "u"
-#define SCNuFAST64 "I64u"
-
-#define SCNuMAX "I64u"
-#define SCNuPTR "u"
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-/*
- * no length modifier for char types prior to C9x
- * MS runtime  scanf appears to treat "hh" as "h" 
- */
-
-/* signed char */
-#define SCNd8 "hhd"
-#define SCNdLEAST8 "hhd"
-#define SCNdFAST8 "hhd"
-
-#define SCNi8 "hhi"
-#define SCNiLEAST8 "hhi"
-#define SCNiFAST8 "hhi"
-
-#define SCNo8 "hho"
-#define SCNoLEAST8 "hho"
-#define SCNoFAST8 "hho"
-
-#define SCNx8 "hhx"
-#define SCNxLEAST8 "hhx"
-#define SCNxFAST8 "hhx"
-
-/* unsigned char */
-#define SCNu8 "hhu"
-#define SCNuLEAST8 "hhu"
-#define SCNuFAST8 "hhu"
-#endif /* __STDC_VERSION__ >= 199901 */
-
-#endif	/* !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) */
-
-__CRT_INLINE intmax_t __cdecl imaxabs (intmax_t j)
-	{return	(j >= 0 ? j : -j);}
-imaxdiv_t __cdecl imaxdiv (intmax_t numer, intmax_t denom);
-
-/* 7.8.2 Conversion functions for greatest-width integer types */
-
-intmax_t __cdecl strtoimax (const char* __restrict__ nptr,
-                            char** __restrict__ endptr, int base);
-uintmax_t __cdecl strtoumax (const char* __restrict__ nptr,
-			     char** __restrict__ endptr, int base);
-
-intmax_t __cdecl wcstoimax (const wchar_t* __restrict__ nptr,
-                            wchar_t** __restrict__ endptr, int base);
-uintmax_t __cdecl wcstoumax (const wchar_t* __restrict__ nptr,
-			     wchar_t** __restrict__ endptr, int base);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* ndef _INTTYPES_H */
diff --git a/winsup/mingw/include/io.h b/winsup/mingw/include/io.h
deleted file mode 100644
index 50b395ac5..000000000
--- a/winsup/mingw/include/io.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/* 
- * io.h
- *
- * System level I/O functions and types.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef	_IO_H_
-#define	_IO_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/* MSVC's io.h contains the stuff from dir.h, so I will too.
- * NOTE: This also defines off_t, the file offset type, through
- *       an inclusion of sys/types.h */
-#ifndef __STRICT_ANSI__
-
-#include <sys/types.h>	/* To get time_t. */
-
-/*
- * Attributes of files as returned by _findfirst et al.
- */
-#define	_A_NORMAL	0x00000000
-#define	_A_RDONLY	0x00000001
-#define	_A_HIDDEN	0x00000002
-#define	_A_SYSTEM	0x00000004
-#define	_A_VOLID	0x00000008
-#define	_A_SUBDIR	0x00000010
-#define	_A_ARCH		0x00000020
-
-
-#ifndef RC_INVOKED
-
-#ifndef	_FSIZE_T_DEFINED
-typedef	unsigned long	_fsize_t;
-#define _FSIZE_T_DEFINED
-#endif
-
-/*
- * The maximum length of a file name. You should use GetVolumeInformation
- * instead of this constant. But hey, this works.
- * Also defined in stdio.h. 
- */
-#ifndef FILENAME_MAX
-#define	FILENAME_MAX	(260)
-#endif
-
-/*
- * The following structure is filled in by _findfirst or _findnext when
- * they succeed in finding a match.
- */
-struct _finddata_t
-{
-	unsigned	attrib;		/* Attributes, see constants above. */
-	time_t		time_create;
-	time_t		time_access;	/* always midnight local time */
-	time_t		time_write;
-	_fsize_t	size;
-	char		name[FILENAME_MAX];	/* may include spaces. */
-};
-
-struct _finddatai64_t {
-    unsigned    attrib;
-    time_t      time_create;
-    time_t      time_access;
-    time_t      time_write;
-    __int64     size;
-    char        name[FILENAME_MAX];
-};
-
-
-#ifndef _WFINDDATA_T_DEFINED
-struct _wfinddata_t {
-    	unsigned	attrib;
-    	time_t		time_create;	/* -1 for FAT file systems */
-    	time_t		time_access;	/* -1 for FAT file systems */
-    	time_t		time_write;
-    	_fsize_t	size;
-    	wchar_t		name[FILENAME_MAX];	/* may include spaces. */
-};
-struct _wfinddatai64_t {
-    unsigned    attrib;
-    time_t      time_create;
-    time_t      time_access;
-    time_t      time_write;
-    __int64     size;
-    wchar_t     name[FILENAME_MAX];
-};
-
-#define _WFINDDATA_T_DEFINED
-#endif
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/*
- * Functions for searching for files. _findfirst returns -1 if no match
- * is found. Otherwise it returns a handle to be used in _findnext and
- * _findclose calls. _findnext also returns -1 if no match could be found,
- * and 0 if a match was found. Call _findclose when you are finished.
- */
-_CRTIMP int __cdecl _findfirst (const char*, struct _finddata_t*);
-_CRTIMP int __cdecl _findnext (int, struct _finddata_t*);
-_CRTIMP int __cdecl _findclose (int);
-
-_CRTIMP int __cdecl _chdir (const char*);
-_CRTIMP char* __cdecl _getcwd (char*, int);
-_CRTIMP int __cdecl _mkdir (const char*);
-_CRTIMP char* __cdecl _mktemp (char*);
-_CRTIMP int __cdecl _rmdir (const char*);
-_CRTIMP int __cdecl _chmod (const char*, int);
-
-
-#ifdef __MSVCRT__
-_CRTIMP __int64 __cdecl _filelengthi64(int);
-_CRTIMP long __cdecl _findfirsti64(const char*, struct _finddatai64_t*);
-_CRTIMP int __cdecl _findnexti64(long, struct _finddatai64_t*);
-_CRTIMP __int64 __cdecl _lseeki64(int, __int64, int);
-_CRTIMP __int64 __cdecl _telli64(int);
-#endif /* __MSVCRT__ */
-
-
-#ifndef _NO_OLDNAMES
-
-#ifndef _UWIN
-_CRTIMP int __cdecl chdir (const char*);
-_CRTIMP char* __cdecl getcwd (char*, int);
-_CRTIMP int __cdecl mkdir (const char*);
-_CRTIMP char* __cdecl mktemp (char*);
-_CRTIMP int __cdecl rmdir (const char*);
-_CRTIMP int __cdecl chmod (const char*, int);
-#endif /* _UWIN */
-
-#endif /* Not _NO_OLDNAMES */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not __STRICT_ANSI__ */
-
-/* TODO: Maximum number of open handles has not been tested, I just set
- * it the same as FOPEN_MAX. */
-#define	HANDLE_MAX	FOPEN_MAX
-
-
-/* Some defines for _access nAccessMode (MS doesn't define them, but
- * it doesn't seem to hurt to add them). */
-#define	F_OK	0	/* Check for file existence */
-#define	X_OK	1	/* Check for execute permission. */
-#define	W_OK	2	/* Check for write permission */
-#define	R_OK	4	/* Check for read permission */
-
-#ifndef RC_INVOKED
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-_CRTIMP int __cdecl _access (const char*, int);
-_CRTIMP int __cdecl _chsize (int, long);
-_CRTIMP int __cdecl _close (int);
-_CRTIMP int __cdecl _commit(int);
-
-/* NOTE: The only significant bit in unPermissions appears to be bit 7 (0x80),
- *       the "owner write permission" bit (on FAT). */
-_CRTIMP int __cdecl _creat (const char*, int);
-
-_CRTIMP int __cdecl _dup (int);
-_CRTIMP int __cdecl _dup2 (int, int);
-_CRTIMP long __cdecl _filelength (int);
-_CRTIMP long __cdecl _get_osfhandle (int);
-_CRTIMP int __cdecl _isatty (int);
-
-/* In a very odd turn of events this function is excluded from those
- * files which define _STREAM_COMPAT. This is required in order to
- * build GNU libio because of a conflict with _eof in streambuf.h
- * line 107. Actually I might just be able to change the name of
- * the enum member in streambuf.h... we'll see. TODO */
-#ifndef	_STREAM_COMPAT
-_CRTIMP int __cdecl _eof (int);
-#endif
-
-/* LK_... locking commands defined in sys/locking.h. */
-_CRTIMP int __cdecl _locking (int, int, long);
-
-_CRTIMP long __cdecl _lseek (int, long, int);
-
-/* Optional third argument is unsigned unPermissions. */
-_CRTIMP int __cdecl _open (const char*, int, ...);
-
-_CRTIMP int __cdecl _open_osfhandle (long, int);
-_CRTIMP int __cdecl _pipe (int *, unsigned int, int);
-_CRTIMP int __cdecl _read (int, void*, unsigned int);
-_CRTIMP int __cdecl _setmode (int, int);
-
-/* SH_... flags for nShFlags defined in share.h
- * Optional fourth argument is unsigned unPermissions */
-_CRTIMP int __cdecl _sopen (const char*, int, int, ...);
-
-_CRTIMP long __cdecl _tell (int);
-/* Should umask be in sys/stat.h and/or sys/types.h instead? */
-_CRTIMP int __cdecl _umask (int);
-_CRTIMP int __cdecl _unlink (const char*);
-_CRTIMP int __cdecl _write (int, const void*, unsigned int);
-
-/* Wide character versions. Also declared in wchar.h. */
-/* Not in crtdll.dll */
-#if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
-_CRTIMP int __cdecl _waccess(const wchar_t*, int);
-_CRTIMP int __cdecl _wchmod(const wchar_t*, int);
-_CRTIMP int __cdecl _wcreat(const wchar_t*, int);
-_CRTIMP long __cdecl _wfindfirst(const wchar_t*, struct _wfinddata_t*);
-_CRTIMP int __cdecl _wfindnext(long, struct _wfinddata_t *);
-_CRTIMP int __cdecl _wunlink(const wchar_t*);
-_CRTIMP int __cdecl _wopen(const wchar_t*, int, ...);
-_CRTIMP int __cdecl _wsopen(const wchar_t*, int, int, ...);
-_CRTIMP wchar_t * __cdecl _wmktemp(wchar_t*);
-_CRTIMP long __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
-_CRTIMP int __cdecl _wfindnexti64(long, struct _wfinddatai64_t*);
-#endif /* defined (__MSVCRT__) */
-#define _WIO_DEFINED
-#endif /* _WIO_DEFINED */
-
-#ifndef	_NO_OLDNAMES
-/*
- * Non-underscored versions of non-ANSI functions to improve portability.
- * These functions live in libmoldname.a.
- */
-
-#ifndef _UWIN
-_CRTIMP int __cdecl access (const char*, int);
-_CRTIMP int __cdecl chsize (int, long );
-_CRTIMP int __cdecl close (int);
-_CRTIMP int __cdecl creat (const char*, int);
-_CRTIMP int __cdecl dup (int);
-_CRTIMP int __cdecl dup2 (int, int);
-_CRTIMP int __cdecl eof (int);
-_CRTIMP long __cdecl filelength (int);
-_CRTIMP int __cdecl isatty (int);
-_CRTIMP long __cdecl lseek (int, long, int);
-_CRTIMP int __cdecl open (const char*, int, ...);
-_CRTIMP int __cdecl read (int, void*, unsigned int);
-_CRTIMP int __cdecl setmode (int, int);
-_CRTIMP int __cdecl sopen (const char*, int, int, ...);
-_CRTIMP long __cdecl tell (int);
-_CRTIMP int __cdecl umask (int);
-_CRTIMP int __cdecl unlink (const char*);
-_CRTIMP int __cdecl write (int, const void*, unsigned int);
-#endif /* _UWIN */
-
-/* Wide character versions. Also declared in wchar.h. */
-/* Where do these live? Not in libmoldname.a nor in libmsvcrt.a */
-#if 0
-int 		waccess(const wchar_t *, int);
-int 		wchmod(const wchar_t *, int);
-int 		wcreat(const wchar_t *, int);
-long 		wfindfirst(wchar_t *, struct _wfinddata_t *);
-int 		wfindnext(long, struct _wfinddata_t *);
-int 		wunlink(const wchar_t *);
-int 		wrename(const wchar_t *, const wchar_t *);
-int 		wopen(const wchar_t *, int, ...);
-int 		wsopen(const wchar_t *, int, int, ...);
-wchar_t * 	wmktemp(wchar_t *);
-#endif
-
-#endif	/* Not _NO_OLDNAMES */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* _IO_H_ not defined */
-
-#endif	/* Not strict ANSI */
-
diff --git a/winsup/mingw/include/limits.h b/winsup/mingw/include/limits.h
deleted file mode 100644
index a1901fc9d..000000000
--- a/winsup/mingw/include/limits.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* 
- * limits.h
- *
- * Defines constants for the sizes of integral types.
- *
- * NOTE: GCC should supply a version of this header and it should be safe to
- *       use that version instead of this one (maybe safer).
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _LIMITS_H_
-#define _LIMITS_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/*
- * File system limits
- *
- * TODO: NAME_MAX and OPEN_MAX are file system limits or not? Are they the
- *       same as FILENAME_MAX and FOPEN_MAX from stdio.h?
- * NOTE: Apparently the actual size of PATH_MAX is 260, but a space is
- *       required for the NUL. TODO: Test?
- */
-#define PATH_MAX	(259)
-
-/*
- * Characteristics of the char data type.
- *
- * TODO: Is MB_LEN_MAX correct?
- */
-#define CHAR_BIT	8
-#define MB_LEN_MAX	2
-
-#define SCHAR_MIN	(-128)
-#define SCHAR_MAX	127
-
-#define UCHAR_MAX	255
-
-/* TODO: Is this safe? I think it might just be testing the preprocessor,
- *       not the compiler itself... */
-#if	('\x80' < 0)
-#define CHAR_MIN	SCHAR_MIN
-#define CHAR_MAX	SCHAR_MAX
-#else
-#define CHAR_MIN	0
-#define CHAR_MAX	UCHAR_MAX
-#endif
-
-/*
- * Maximum and minimum values for ints.
- */
-#define INT_MAX		2147483647
-#define INT_MIN		(-INT_MAX-1)
-
-#define UINT_MAX	0xffffffff
-
-/*
- * Maximum and minimum values for shorts.
- */
-#define SHRT_MAX	32767
-#define SHRT_MIN	(-SHRT_MAX-1)
-
-#define USHRT_MAX	0xffff
-
-/*
- * Maximum and minimum values for longs and unsigned longs.
- *
- * TODO: This is not correct for Alphas, which have 64 bit longs.
- */
-#define LONG_MAX	2147483647L
-
-#define LONG_MIN	(-LONG_MAX-1)
-
-#define ULONG_MAX	0xffffffffUL
-
-
-/*
- * The GNU C compiler also allows 'long long int'
- */
-#if	!defined(__STRICT_ANSI__) && defined(__GNUC__)
-
-#define LONG_LONG_MAX	9223372036854775807LL
-#define LONG_LONG_MIN	(-LONG_LONG_MAX-1)
-
-#define ULONG_LONG_MAX	(2ULL * LONG_LONG_MAX + 1)
-
-/* ISO C9x macro names */
-#define LLONG_MAX LONG_LONG_MAX
-#define LLONG_MIN LONG_LONG_MIN
-#define ULLONG_MAX ULONG_LONG_MAX
-
-#endif /* Not Strict ANSI and GNU C compiler */
-
-
-#endif /* not _LIMITS_H_ */
diff --git a/winsup/mingw/include/locale.h b/winsup/mingw/include/locale.h
deleted file mode 100644
index 3f36388bd..000000000
--- a/winsup/mingw/include/locale.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* 
- * locale.h
- *
- * Functions and types for localization (ie. changing the appearance of
- * output based on the standards of a certain country).
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	_LOCALE_H_
-#define	_LOCALE_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/*
- * NOTE: I have tried to test this, but I am limited by my knowledge of
- *       locale issues. The structure does not bomb if you look at the
- *       values, and 'decimal_point' even seems to be correct. But the
- *       rest of the values are, by default, not particularly useful
- *       (read meaningless and not related to the international settings
- *       of the system).
- */
-
-#define	LC_ALL		0
-#define LC_COLLATE	1
-#define LC_CTYPE	2
-#define	LC_MONETARY	3
-#define	LC_NUMERIC	4
-#define	LC_TIME		5
-#define	LC_MIN		LC_ALL
-#define	LC_MAX		LC_TIME
-
-#ifndef RC_INVOKED
-
-/* According to C89 std, NULL is defined in locale.h too.  */
-#define __need_NULL
-#include <stddef.h>
-
-/*
- * The structure returned by 'localeconv'.
- */
-struct lconv
-{
-	char*	decimal_point;
-	char*	thousands_sep;
-	char*	grouping;
-	char*	int_curr_symbol;
-	char*	currency_symbol;
-	char*	mon_decimal_point;
-	char*	mon_thousands_sep;
-	char*	mon_grouping;
-	char*	positive_sign;
-	char*	negative_sign;
-	char	int_frac_digits;
-	char	frac_digits;
-	char	p_cs_precedes;
-	char	p_sep_by_space;
-	char	n_cs_precedes;
-	char	n_sep_by_space;
-	char	p_sign_posn;
-	char	n_sign_posn;
-};
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-_CRTIMP  char* __cdecl setlocale (int, const char*);
-_CRTIMP struct lconv* __cdecl localeconv (void);
-
-#ifndef _WLOCALE_DEFINED  /* also declared in wchar.h */
-# define __need_wchar_t
-# include <stddef.h>
-  _CRTIMP wchar_t* __cdecl _wsetlocale(int, const wchar_t*);
-# define _WLOCALE_DEFINED
-#endif /* ndef _WLOCALE_DEFINED */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _LOCALE_H_ */
-
diff --git a/winsup/mingw/include/malloc.h b/winsup/mingw/include/malloc.h
deleted file mode 100644
index 834e0212f..000000000
--- a/winsup/mingw/include/malloc.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * malloc.h
- *
- * Support for programs which want to use malloc.h to get memory management
- * functions. Unless you absolutely need some of these functions and they are
- * not in the ANSI headers you should use the ANSI standard header files
- * instead.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef _MALLOC_H_
-#define _MALLOC_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#include <stdlib.h>
-
-#ifndef RC_INVOKED
-
-/*
- * The structure used to walk through the heap with _heapwalk.
- */
-typedef	struct _heapinfo
-{
-	int*	_pentry;
-	size_t	_size;
-	int	_useflag;
-} _HEAPINFO;
-
-/* Values for _heapinfo.useflag */
-#define _USEDENTRY 0
-#define _FREEENTRY 1
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-/*
-   The _heap* memory allocation functions are supported on NT
-   but not W9x. On latter, they always set errno to ENOSYS.
-*/
-_CRTIMP int __cdecl _heapwalk (_HEAPINFO*);
-#ifdef __GNUC__
-#define _alloca(x) __builtin_alloca((x))
-#endif
-
-#ifndef	_NO_OLDNAMES
-_CRTIMP int __cdecl heapwalk (_HEAPINFO*);
-#ifdef __GNUC__
-#define alloca(x) __builtin_alloca((x))
-#endif
-#endif	/* Not _NO_OLDNAMES */
-
-_CRTIMP int __cdecl _heapchk (void);	/* Verify heap integrety. */
-_CRTIMP int __cdecl _heapmin (void);	/* Return unused heap to the OS. */
-_CRTIMP int __cdecl _heapset (unsigned int);
-
-_CRTIMP size_t __cdecl _msize (void*);
-_CRTIMP size_t __cdecl _get_sbh_threshold (void); 
-_CRTIMP int __cdecl _set_sbh_threshold (size_t);
-_CRTIMP void* __cdecl _expand (void*, size_t); 
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* RC_INVOKED */
-
-#endif /* Not _MALLOC_H_ */
-
-#endif /* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/math.h b/winsup/mingw/include/math.h
deleted file mode 100644
index 96405229d..000000000
--- a/winsup/mingw/include/math.h
+++ /dev/null
@@ -1,758 +0,0 @@
-/* 
- * math.h
- *
- * Mathematical functions.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _MATH_H_
-#define _MATH_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/*
- * Types for the _exception structure.
- */
-
-#define	_DOMAIN		1	/* domain error in argument */
-#define	_SING		2	/* singularity */
-#define	_OVERFLOW	3	/* range overflow */
-#define	_UNDERFLOW	4	/* range underflow */
-#define	_TLOSS		5	/* total loss of precision */
-#define	_PLOSS		6	/* partial loss of precision */
-
-/*
- * Exception types with non-ANSI names for compatibility.
- */
-
-#ifndef	__STRICT_ANSI__
-#ifndef	_NO_OLDNAMES
-
-#define	DOMAIN		_DOMAIN
-#define	SING		_SING
-#define	OVERFLOW	_OVERFLOW
-#define	UNDERFLOW	_UNDERFLOW
-#define	TLOSS		_TLOSS
-#define	PLOSS		_PLOSS
-
-#endif	/* Not _NO_OLDNAMES */
-#endif	/* Not __STRICT_ANSI__ */
-
-
-/* Traditional/XOPEN math constants (double precison) */
-#ifndef __STRICT_ANSI__
-#define M_E		2.7182818284590452354
-#define M_LOG2E		1.4426950408889634074
-#define M_LOG10E	0.43429448190325182765
-#define M_LN2		0.69314718055994530942
-#define M_LN10		2.30258509299404568402
-#define M_PI		3.14159265358979323846
-#define M_PI_2		1.57079632679489661923
-#define M_PI_4		0.78539816339744830962
-#define M_1_PI		0.31830988618379067154
-#define M_2_PI		0.63661977236758134308
-#define M_2_SQRTPI	1.12837916709551257390
-#define M_SQRT2		1.41421356237309504880
-#define M_SQRT1_2	0.70710678118654752440
-#endif
-
-/* These are also defined in Mingw float.h; needed here as well to work 
-   around GCC build issues.  */
-#ifndef	__STRICT_ANSI__
-#ifndef __MINGW_FPCLASS_DEFINED
-#define __MINGW_FPCLASS_DEFINED 1
-/* IEEE 754 classication */
-#define	_FPCLASS_SNAN	0x0001	/* Signaling "Not a Number" */
-#define	_FPCLASS_QNAN	0x0002	/* Quiet "Not a Number" */
-#define	_FPCLASS_NINF	0x0004	/* Negative Infinity */
-#define	_FPCLASS_NN	0x0008	/* Negative Normal */
-#define	_FPCLASS_ND	0x0010	/* Negative Denormal */
-#define	_FPCLASS_NZ	0x0020	/* Negative Zero */
-#define	_FPCLASS_PZ	0x0040	/* Positive Zero */
-#define	_FPCLASS_PD	0x0080	/* Positive Denormal */
-#define	_FPCLASS_PN	0x0100	/* Positive Normal */
-#define	_FPCLASS_PINF	0x0200	/* Positive Infinity */
-#endif /* __MINGW_FPCLASS_DEFINED */
-#endif	/* Not __STRICT_ANSI__ */
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * HUGE_VAL is returned by strtod when the value would overflow the
- * representation of 'double'. There are other uses as well.
- *
- * __imp__HUGE is a pointer to the actual variable _HUGE in
- * MSVCRT.DLL. If we used _HUGE directly we would get a pointer
- * to a thunk function.
- *
- * NOTE: The CRTDLL version uses _HUGE_dll instead.
- */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-#ifdef __MSVCRT__
-extern double*	_imp___HUGE;
-#define	HUGE_VAL	(*_imp___HUGE)
-#else
-/* CRTDLL */
-extern double*	_imp___HUGE_dll;
-#define	HUGE_VAL	(*_imp___HUGE_dll)
-#endif
-
-#else /* __DECLSPEC_SUPPORTED */
-
-#ifdef __MSVCRT__
-__MINGW_IMPORT double	_HUGE;
-#define	HUGE_VAL	_HUGE
-#else
-/* CRTDLL */
-__MINGW_IMPORT double	_HUGE_dll;
-#define	HUGE_VAL	_HUGE_dll
-#endif
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-struct _exception
-{
-	int	type;
-	char	*name;
-	double	arg1;
-	double	arg2;
-	double	retval;
-};
-
-
-_CRTIMP double __cdecl sin (double);
-_CRTIMP double __cdecl cos (double);
-_CRTIMP double __cdecl tan (double);
-_CRTIMP double __cdecl sinh (double);
-_CRTIMP double __cdecl cosh (double);
-_CRTIMP double __cdecl tanh (double);
-_CRTIMP double __cdecl asin (double);
-_CRTIMP double __cdecl acos (double);
-_CRTIMP double __cdecl atan (double);
-_CRTIMP double __cdecl atan2 (double, double);
-_CRTIMP double __cdecl exp (double);
-_CRTIMP double __cdecl log (double);
-_CRTIMP double __cdecl log10 (double);
-#ifdef __NO_ISOCEXT
-_CRTIMP
-#endif
-	double __cdecl pow (double, double);
-_CRTIMP double __cdecl sqrt (double);
-_CRTIMP double __cdecl ceil (double);
-_CRTIMP double __cdecl floor (double);
-_CRTIMP double __cdecl fabs (double);
-_CRTIMP double __cdecl ldexp (double, int);
-_CRTIMP double __cdecl frexp (double, int*);
-_CRTIMP double __cdecl modf (double, double*);
-_CRTIMP double __cdecl fmod (double, double);
-
-
-#ifndef __STRICT_ANSI__
-
-/* Complex number (for _cabs). This is the MS version. The ISO
-   C99 counterpart _Complex is an intrinsic type in GCC and
-   'complex' is defined as a macro.  See complex.h  */
-struct _complex
-{
-	double	x;	/* Real part */
-	double	y;	/* Imaginary part */
-};
-
-_CRTIMP double __cdecl _cabs (struct _complex);
-
-_CRTIMP double __cdecl _hypot (double, double);
-_CRTIMP double __cdecl _j0 (double);
-_CRTIMP double __cdecl _j1 (double);
-_CRTIMP double __cdecl _jn (int, double);
-_CRTIMP double __cdecl _y0 (double);
-_CRTIMP double __cdecl _y1 (double);
-_CRTIMP double __cdecl _yn (int, double);
-_CRTIMP int __cdecl _matherr (struct _exception *);
-
-/* These are also declared in Mingw float.h; needed here as well to work 
-   around GCC build issues.  */
-/* BEGIN FLOAT.H COPY */
-/*
- * IEEE recommended functions
- */
-
-_CRTIMP double __cdecl _chgsign (double);
-_CRTIMP double __cdecl _copysign (double, double);
-_CRTIMP double __cdecl _logb (double);
-_CRTIMP double __cdecl _nextafter (double, double);
-_CRTIMP double __cdecl _scalb (double, long);
-
-_CRTIMP int __cdecl _finite (double);
-_CRTIMP int __cdecl _fpclass (double);
-_CRTIMP int __cdecl _isnan (double);
-
-/* END FLOAT.H COPY */
-
-
-/*
- * Non-underscored versions of non-ANSI functions.
- * These reside in liboldnames.a.
- */
-
-#if !defined (_NO_OLDNAMES)
-
-_CRTIMP double __cdecl j0 (double);
-_CRTIMP double __cdecl j1 (double);
-_CRTIMP double __cdecl jn (int, double);
-_CRTIMP double __cdecl y0 (double);
-_CRTIMP double __cdecl y1 (double);
-_CRTIMP double __cdecl yn (int, double);
-
-_CRTIMP double __cdecl chgsign (double);
-_CRTIMP double __cdecl scalb (double, long);
-_CRTIMP int __cdecl finite (double);
-_CRTIMP int __cdecl fpclass (double);
-
-#endif /* Not _NO_OLDNAMES */
-
-#endif /* __STRICT_ANSI__ */
-
-
-#ifndef __NO_ISOCEXT
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
-	|| !defined __STRICT_ANSI__ || defined __cplusplus
-
-#define NAN (0.0F/0.0F)
-#define HUGE_VALF (1.0F/0.0F)
-#define HUGE_VALL (1.0L/0.0L)
-#define INFINITY (1.0F/0.0F)
-
-
-/* 7.12.3.1 */
-/*
-   Return values for fpclassify.
-   These are based on Intel x87 fpu condition codes
-   in the high byte of status word and differ from
-   the return values for MS IEEE 754 extension _fpclass()
-*/
-#define FP_NAN		0x0100
-#define FP_NORMAL	0x0400
-#define FP_INFINITE	(FP_NAN | FP_NORMAL)
-#define FP_ZERO		0x4000
-#define FP_SUBNORMAL	(FP_NORMAL | FP_ZERO)
-/* 0x0200 is signbit mask */
-
-
-/*
-  We can't inline float or double, because we want to ensure truncation
-  to semantic type before classification. 
-  (A normal long double value might become subnormal when 
-  converted to double, and zero when converted to float.)
-*/
-
-extern int __cdecl __fpclassifyf (float);
-extern int __cdecl __fpclassify (double);
-
-__CRT_INLINE int __cdecl __fpclassifyl (long double x){
-  unsigned short sw;
-  __asm__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x));
-  return sw & (FP_NAN | FP_NORMAL | FP_ZERO );
-}
-
-#define fpclassify(x) (sizeof (x) == sizeof (float) ? __fpclassifyf (x)	  \
-		       : sizeof (x) == sizeof (double) ? __fpclassify (x) \
-		       : __fpclassifyl (x))
-
-/* 7.12.3.2 */
-#define isfinite(x) ((fpclassify(x) & FP_NAN) == 0)
-
-/* 7.12.3.3 */
-#define isinf(x) (fpclassify(x) == FP_INFINITE)
-
-/* 7.12.3.4 */
-/* We don't need to worry about trucation here:
-   A NaN stays a NaN. */
-
-__CRT_INLINE int __cdecl __isnan (double _x)
-{
-  unsigned short sw;
-  __asm__ ("fxam;"
-	   "fstsw %%ax": "=a" (sw) : "t" (_x));
-  return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL))
-    == FP_NAN;
-}
-
-__CRT_INLINE int __cdecl __isnanf (float _x)
-{
-  unsigned short sw;
-  __asm__ ("fxam;"
-	    "fstsw %%ax": "=a" (sw) : "t" (_x));
-  return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL))
-    == FP_NAN;
-}
-
-__CRT_INLINE int __cdecl __isnanl (long double _x)
-{
-  unsigned short sw;
-  __asm__ ("fxam;"
-	    "fstsw %%ax": "=a" (sw) : "t" (_x));
-  return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL))
-    == FP_NAN;
-}
-
-
-#define isnan(x) (sizeof (x) == sizeof (float) ? __isnanf (x)	\
-		  : sizeof (x) == sizeof (double) ? __isnan (x)	\
-		  : __isnanl (x))
-
-/* 7.12.3.5 */
-#define isnormal(x) (fpclassify(x) == FP_NORMAL)
-
-/* 7.12.3.6 The signbit macro */
-__CRT_INLINE int __cdecl __signbit (double x) {
-  unsigned short stw;
-  __asm__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x));
-  return stw & 0x0200;
-}
-
-__CRT_INLINE int __cdecl __signbitf (float x) {
-  unsigned short stw;
-  __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x));
-  return stw & 0x0200;
-}
-
-__CRT_INLINE int __cdecl __signbitl (long double x) {
-  unsigned short stw;
-  __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x));
-  return stw & 0x0200;
-}
-
-#define signbit(x) (sizeof (x) == sizeof (float) ? __signbitf (x)	\
-		    : sizeof (x) == sizeof (double) ? __signbit (x)	\
-		    : __signbitl (x))
-
-/* 7.12.4 Trigonometric functions: Double in C89 */
-extern float __cdecl sinf (float);
-extern long double __cdecl sinl (long double);
-
-extern float __cdecl cosf (float);
-extern long double __cdecl cosl (long double);
-
-extern float __cdecl tanf (float);
-extern long double __cdecl tanl (long double);
-
-extern float __cdecl asinf (float);
-extern long double __cdecl asinl (long double);
-
-extern float __cdecl acosf (float);
-extern long double __cdecl acosl (long double);
-
-extern float __cdecl atanf (float);
-extern long double __cdecl atanl (long double);
-
-extern float __cdecl atan2f (float, float);
-extern long double __cdecl atan2l (long double, long double);
-
-/* 7.12.5 Hyperbolic functions: Double in C89  */
-__CRT_INLINE float __cdecl sinhf (float x)
-  {return (float) sinh (x);}
-extern long double __cdecl sinhl (long double);
-
-__CRT_INLINE float __cdecl coshf (float x)
-  {return (float) cosh (x);}
-extern long double __cdecl coshl (long double);
-
-__CRT_INLINE float __cdecl tanhf (float x)
-  {return (float) tanh (x);}
-extern long double __cdecl tanhl (long double);
-
-/*
- * TODO: asinh, acosh, atanh
- */ 
-
-/* 7.12.6.1 Double in C89 */
-__CRT_INLINE float __cdecl expf (float x)
-  {return (float) exp (x);}
-extern long double __cdecl expl (long double);
-
-/* 7.12.6.2 */
-extern double __cdecl exp2(double);
-extern float __cdecl exp2f(float);
-extern long double __cdecl exp2l(long double);
-
-/* 7.12.6.3 The expm1 functions: TODO */
-
-/* 7.12.6.4 Double in C89 */
-__CRT_INLINE float __cdecl frexpf (float x, int* expn)
-  {return (float) frexp (x, expn);}
-extern long double __cdecl frexpl (long double, int*);
-
-/* 7.12.6.5 */
-#define FP_ILOGB0 ((int)0x80000000)
-#define FP_ILOGBNAN ((int)0x80000000)
-extern int __cdecl ilogb (double);
-extern int __cdecl ilogbf (float);
-extern int __cdecl ilogbl (long double);
-
-/* 7.12.6.6  Double in C89 */
-__CRT_INLINE float __cdecl ldexpf (float x, int expn)
-  {return (float) ldexp (x, expn);}
-extern long double __cdecl ldexpl (long double, int);
-
-/* 7.12.6.7 Double in C89 */
-extern float __cdecl logf (float);
-extern long double __cdecl logl (long double);
-
-/* 7.12.6.8 Double in C89 */
-extern float __cdecl log10f (float);
-extern long double __cdecl log10l (long double);
-
-/* 7.12.6.9 */
-extern double __cdecl log1p(double);
-extern float __cdecl log1pf(float);
-extern long double __cdecl log1pl(long double);
-
-/* 7.12.6.10 */
-extern double __cdecl log2 (double);
-extern float __cdecl log2f (float);
-extern long double __cdecl log2l (long double);
-
-/* 7.12.6.11 */
-extern double __cdecl logb (double);
-extern float __cdecl logbf (float);
-extern long double __cdecl logbl (long double);
-
-__CRT_INLINE double __cdecl logb (double x)
-{
-  double res;
-  __asm__ ("fxtract\n\t"
-       "fstp	%%st" : "=t" (res) : "0" (x));
-  return res;
-}
-
-__CRT_INLINE float __cdecl logbf (float x)
-{
-  float res;
-  __asm__ ("fxtract\n\t"
-       "fstp	%%st" : "=t" (res) : "0" (x));
-  return res;
-}
-
-__CRT_INLINE long double __cdecl logbl (long double x)
-{
-  long double res;
-  __asm__ ("fxtract\n\t"
-       "fstp	%%st" : "=t" (res) : "0" (x));
-  return res;
-}
-
-/* 7.12.6.12  Double in C89 */
-extern float __cdecl modff (float, float*);
-extern long double __cdecl modfl (long double, long double*);
-
-/* 7.12.6.13 */
-extern double __cdecl scalbn (double, int);
-extern float __cdecl scalbnf (float, int);
-extern long double __cdecl scalbnl (long double, int);
-
-extern double __cdecl scalbln (double, long);
-extern float __cdecl scalblnf (float, long);
-extern long double __cdecl scalblnl (long double, long);
-
-/* 7.12.7.1 */
-/* Implementations adapted from Cephes versions */ 
-extern double __cdecl cbrt (double);
-extern float __cdecl cbrtf (float);
-extern long double __cdecl cbrtl (long double);
-
-/* 7.12.7.2 The fabs functions: Double in C89 */
-extern  float __cdecl fabsf (float x);
-extern long double __cdecl fabsl (long double x);
-
-/* 7.12.7.3  */
-extern double __cdecl hypot (double, double); /* in libmoldname.a */
-__CRT_INLINE float __cdecl hypotf (float x, float y)
-  { return (float) hypot (x, y);}
-extern long double __cdecl hypotl (long double, long double);
-
-/* 7.12.7.4 The pow functions. Double in C89 */
-__CRT_INLINE float __cdecl powf (float x, float y)
-  {return (float) pow (x, y);}
-extern long double __cdecl powl (long double, long double);
-
-/* 7.12.7.5 The sqrt functions. Double in C89. */
-extern float __cdecl sqrtf (float);
-extern long double __cdecl sqrtl (long double);
-
-/* 7.12.8.1 The erf functions  */
-extern double __cdecl erf (double);
-extern float __cdecl erff (float);
-/* TODO
-extern long double __cdecl erfl (long double);
-*/ 
-
-/* 7.12.8.2 The erfc functions  */
-extern double __cdecl erfc (double);
-extern float __cdecl erfcf (float);
-/* TODO
-extern long double __cdecl erfcl (long double);
-*/ 
-
-/* 7.12.8.3 The lgamma functions */
-extern double __cdecl lgamma (double);
-extern float __cdecl lgammaf (float);
-extern long double __cdecl lgammal (long double);
-
-/* 7.12.8.4 The tgamma functions */
-extern double __cdecl tgamma (double);
-extern float __cdecl tgammaf (float);
-extern long double __cdecl tgammal (long double);
-
-/* 7.12.9.1 Double in C89 */
-extern float __cdecl ceilf (float);
-extern long double __cdecl ceill (long double);
-
-/* 7.12.9.2 Double in C89 */
-extern float __cdecl floorf (float);
-extern long double __cdecl floorl (long double);
-
-/* 7.12.9.3 */
-extern double __cdecl nearbyint ( double);
-extern float __cdecl nearbyintf (float);
-extern long double __cdecl nearbyintl (long double);
-
-/* 7.12.9.4 */
-/* round, using fpu control word settings */
-__CRT_INLINE double __cdecl rint (double x)
-{
-  double retval;
-  __asm__ ("frndint;": "=t" (retval) : "0" (x));
-  return retval;
-}
-
-__CRT_INLINE float __cdecl rintf (float x)
-{
-  float retval;
-  __asm__ ("frndint;" : "=t" (retval) : "0" (x) );
-  return retval;
-}
-
-__CRT_INLINE long double __cdecl rintl (long double x)
-{
-  long double retval;
-  __asm__ ("frndint;" : "=t" (retval) : "0" (x) );
-  return retval;
-}
-
-/* 7.12.9.5 */
-__CRT_INLINE long __cdecl lrint (double x) 
-{
-  long retval;  
-  __asm__ __volatile__							      \
-    ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
-
-__CRT_INLINE long __cdecl lrintf (float x) 
-{
-  long retval;
-  __asm__ __volatile__							      \
-    ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
-
-__CRT_INLINE long __cdecl lrintl (long double x) 
-{
-  long retval;
-  __asm__ __volatile__							      \
-    ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
-
-__CRT_INLINE long long __cdecl llrint (double x) 
-{
-  long long retval;
-  __asm__ __volatile__							      \
-    ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
-
-__CRT_INLINE long long __cdecl llrintf (float x) 
-{
-  long long retval;
-  __asm__ __volatile__							      \
-    ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
-
-__CRT_INLINE long long __cdecl llrintl (long double x) 
-{
-  long long retval;
-  __asm__ __volatile__							      \
-    ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
-
-/* 7.12.9.6 */
-/* round away from zero, regardless of fpu control word settings */
-extern double __cdecl round (double);
-extern float __cdecl roundf (float);
-extern long double __cdecl roundl (long double);
-
-/* 7.12.9.7  */
-extern long __cdecl lround (double);
-extern long __cdecl lroundf (float);
-extern long __cdecl lroundl (long double);
-
-extern long long __cdecl llround (double);
-extern long long __cdecl llroundf (float);
-extern long long __cdecl llroundl (long double);
-
-/* 7.12.9.8 */
-/* round towards zero, regardless of fpu control word settings */
-extern double __cdecl trunc (double);
-extern float __cdecl truncf (float);
-extern long double __cdecl truncl (long double);
-
-/* 7.12.10.1 Double in C89 */
-extern float __cdecl fmodf (float, float);
-extern long double __cdecl fmodl (long double, long double);
-
-/* 7.12.10.2 */ 
-extern double __cdecl remainder (double, double);
-extern float __cdecl remainderf (float, float);
-extern long double __cdecl remainderl (long double, long double);
-
-/* 7.12.10.3 */
-extern double __cdecl remquo(double, double, int *);
-extern float __cdecl remquof(float, float, int *);
-extern long double __cdecl remquol(long double, long double, int *);
-
-/* 7.12.11.1 */
-extern double __cdecl copysign (double, double); /* in libmoldname.a */
-extern float __cdecl copysignf (float, float);
-extern long double __cdecl copysignl (long double, long double);
-
-/* 7.12.11.2 Return a NaN */
-extern double __cdecl nan(const char *tagp);
-extern float __cdecl nanf(const char *tagp);
-extern long double __cdecl nanl(const char *tagp);
-
-#ifndef __STRICT_ANSI__
-#define _nan() nan("")
-#define _nanf() nanf("")
-#define _nanl() nanl("")
-#endif
-
-/* 7.12.11.3 */
-extern double __cdecl nextafter (double, double); /* in libmoldname.a */
-extern float __cdecl nextafterf (float, float);
-/* TODO: Not yet implemented */
-/* extern long double __cdecl nextafterl (long double, long double); */
-
-/* 7.12.11.4 The nexttoward functions: TODO */
-
-/* 7.12.12.1 */
-/*  x > y ? (x - y) : 0.0  */
-extern double __cdecl fdim (double x, double y);
-extern float __cdecl fdimf (float x, float y);
-extern long double __cdecl fdiml (long double x, long double y);
-
-/* fmax and fmin.
-   NaN arguments are treated as missing data: if one argument is a NaN
-   and the other numeric, then these functions choose the numeric
-   value. */
-
-/* 7.12.12.2 */
-extern double __cdecl fmax  (double, double);
-extern float __cdecl fmaxf (float, float);
-extern long double __cdecl fmaxl (long double, long double);
-
-/* 7.12.12.3 */
-extern double __cdecl fmin (double, double);
-extern float __cdecl fminf (float, float);
-extern long double __cdecl fminl (long double, long double);
-
-/* 7.12.13.1 */
-/* return x * y + z as a ternary op */ 
-extern double __cdecl fma (double, double, double);
-extern float __cdecl fmaf (float, float, float);
-extern long double __cdecl fmal (long double, long double, long double);
-
-
-/* 7.12.14 */
-/* 
- *  With these functions, comparisons involving quiet NaNs set the FP
- *  condition code to "unordered".  The IEEE floating-point spec
- *  dictates that the result of floating-point comparisons should be
- *  false whenever a NaN is involved, with the exception of the != op, 
- *  which always returns true: yes, (NaN != NaN) is true).
- */
-
-#if __GNUC__ >= 3
-
-#define isgreater(x, y) __builtin_isgreater(x, y)
-#define isgreaterequal(x, y) __builtin_isgreaterequal(x, y)
-#define isless(x, y) __builtin_isless(x, y)
-#define islessequal(x, y) __builtin_islessequal(x, y)
-#define islessgreater(x, y) __builtin_islessgreater(x, y)
-#define isunordered(x, y) __builtin_isunordered(x, y)
-
-#else
-/*  helper  */
-__CRT_INLINE int  __cdecl
-__fp_unordered_compare (long double x, long double y){
-  unsigned short retval;
-  __asm__ ("fucom %%st(1);"
-	   "fnstsw;": "=a" (retval) : "t" (x), "u" (y));
-  return retval;
-}
-
-#define isgreater(x, y) ((__fp_unordered_compare(x, y) \
-			   & 0x4500) == 0)
-#define isless(x, y) ((__fp_unordered_compare (y, x) \
-                       & 0x4500) == 0)
-#define isgreaterequal(x, y) ((__fp_unordered_compare (x, y) \
-                               & FP_INFINITE) == 0)
-#define islessequal(x, y) ((__fp_unordered_compare(y, x) \
-			    & FP_INFINITE) == 0)
-#define islessgreater(x, y) ((__fp_unordered_compare(x, y) \
-			      & FP_SUBNORMAL) == 0)
-#define isunordered(x, y) ((__fp_unordered_compare(x, y) \
-			    & 0x4500) == 0x4500)
-
-#endif
-
-
-#endif /* __STDC_VERSION__ >= 199901L */
-#endif /* __NO_ISOCEXT */
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif	/* Not RC_INVOKED */
-
-
-#endif	/* Not _MATH_H_ */
diff --git a/winsup/mingw/include/mbctype.h b/winsup/mingw/include/mbctype.h
deleted file mode 100644
index dd57a7b5c..000000000
--- a/winsup/mingw/include/mbctype.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* 
- * mbctype.h
- *
- * Functions for testing multibyte character types and converting characters.
- *
- * This file is part of the Mingw32 package.
- *
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef _MBCTYPE_H_
-#define _MBCTYPE_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/* return values for _mbsbtype  and  _mbbtype in mbstring.h */
-#define _MBC_SINGLE 0 
-#define _MBC_LEAD 1  
-#define _MBC_TRAIL 2
-#define _MBC_ILLEGAL (-1)
-
-/*  args for setmbcp (in lieu of actual codepage)  */
-#define _MB_CP_SBCS 0
-#define _MB_CP_OEM (-2)
-#define _MB_CP_ANSI (-3)
-#define _MB_CP_LOCALE (-4)
-
-/* TODO: bit masks */
-/*
-#define _MS
-#define _MP
-#define _M1
-#define _M2
-#define _SBUP
-#define _SBLOW
-*/
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus 
-extern "C" {
-#endif
-
-#ifndef	__STRICT_ANSI__
-
-_CRTIMP int __cdecl _setmbcp (int);
-_CRTIMP int __cdecl _getmbcp (void);
-
-/* byte classification  */
-/* NB: Corresponding _ismbc* functions are in mbstring.h */
-
-_CRTIMP int __cdecl _ismbbalpha (unsigned int);
-_CRTIMP int __cdecl _ismbbalnum (unsigned int);
-_CRTIMP int __cdecl _ismbbgraph (unsigned int);
-_CRTIMP int __cdecl _ismbbprint (unsigned int);
-_CRTIMP int __cdecl _ismbbpunct (unsigned int);
-
-_CRTIMP int __cdecl _ismbbkana (unsigned int);
-_CRTIMP int __cdecl _ismbbkalnum (unsigned int);
-_CRTIMP int __cdecl _ismbbkprint (unsigned int);
-_CRTIMP int __cdecl _ismbbkpunct (unsigned int);
-
-
-/* these are also in mbstring.h */
-_CRTIMP int __cdecl _ismbblead (unsigned int);
-_CRTIMP int __cdecl _ismbbtrail (unsigned int);
-_CRTIMP int __cdecl _ismbslead (const unsigned char*, const unsigned char*);
-_CRTIMP int __cdecl _ismbstrail (const unsigned char*, const unsigned char*);
-
-#ifdef __DECLSPEC_SUPPORTED
-__MINGW_IMPORT unsigned char _mbctype[];
-__MINGW_IMPORT unsigned char _mbcasemap[];
-#endif
-
-/* TODO : _MBCS_ mappings go in tchar.h */
-
-#endif	/* Not strict ANSI */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _MCTYPE_H_ */
-
diff --git a/winsup/mingw/include/mbstring.h b/winsup/mingw/include/mbstring.h
deleted file mode 100644
index 4ad777602..000000000
--- a/winsup/mingw/include/mbstring.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * mbstring.h
- *
- * Protototypes for string functions supporting multibyte characters. 
- *
- * This file is part of the Mingw32 package.
- *
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef _MBSTRING_H_
-#define _MBSTRING_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#ifndef RC_INVOKED
-
-#define __need_size_t
-#include <stddef.h>
-
-#ifdef __cplusplus 
-extern "C" {
-#endif
-
-#ifndef	__STRICT_ANSI__
-
-/* character classification */
-_CRTIMP int __cdecl _ismbcalnum (unsigned int);
-_CRTIMP int __cdecl _ismbcalpha (unsigned int);
-_CRTIMP int __cdecl _ismbcdigit (unsigned int);
-_CRTIMP int __cdecl _ismbcgraph (unsigned int);
-_CRTIMP int __cdecl _ismbcprint (unsigned int);
-_CRTIMP int __cdecl _ismbcpunct (unsigned int);
-_CRTIMP int __cdecl _ismbcspace (unsigned int);
-_CRTIMP int __cdecl _ismbclower (unsigned int);
-_CRTIMP int __cdecl _ismbcupper (unsigned int);
-_CRTIMP int __cdecl _ismbclegal (unsigned int);
-_CRTIMP int __cdecl _ismbcsymbol (unsigned int);
-
-
-/* also in mbctype.h */
-_CRTIMP int __cdecl _ismbblead (unsigned int );
-_CRTIMP int __cdecl _ismbbtrail (unsigned int );
-_CRTIMP int __cdecl _ismbslead ( const unsigned char*, const unsigned char*);
-_CRTIMP int __cdecl _ismbstrail ( const unsigned char*, const unsigned char*);
-
-_CRTIMP unsigned int __cdecl _mbctolower (unsigned int);
-_CRTIMP unsigned int __cdecl _mbctoupper (unsigned int);
-
-_CRTIMP void __cdecl _mbccpy (unsigned char*, const unsigned char*);
-_CRTIMP size_t __cdecl _mbclen (const unsigned char*);
-
-_CRTIMP unsigned int __cdecl _mbbtombc (unsigned int);
-_CRTIMP unsigned int __cdecl _mbctombb (unsigned int);
-
-/* Return value constants for these are defined in mbctype.h.  */
-_CRTIMP int __cdecl _mbbtype (unsigned char, int);
-_CRTIMP int __cdecl _mbsbtype (const unsigned char*, size_t);
-
-_CRTIMP unsigned char* __cdecl  _mbscpy (unsigned char*, const unsigned char*);
-_CRTIMP unsigned char* __cdecl  _mbsncpy (unsigned char*, const unsigned char*, size_t);
-_CRTIMP unsigned char* __cdecl  _mbsnbcpy (unsigned char*, const unsigned char*, size_t);
-_CRTIMP unsigned char* __cdecl  _mbsset (unsigned char*, unsigned int);
-_CRTIMP unsigned char* __cdecl  _mbsnset (unsigned char*, unsigned int, size_t);
-_CRTIMP unsigned char* __cdecl  _mbsnbset (unsigned char*, unsigned int, size_t);
-_CRTIMP unsigned char* __cdecl  _mbsdup (const unsigned char*);
-_CRTIMP unsigned char* __cdecl  _mbsrev (unsigned char*);
-_CRTIMP unsigned char* __cdecl  _mbscat (unsigned char*, const unsigned char*);
-_CRTIMP unsigned char* __cdecl  _mbsncat (unsigned char*, const unsigned char*, size_t);
-_CRTIMP unsigned char* __cdecl  _mbsnbcat (unsigned char*, const unsigned char*, size_t);
-_CRTIMP size_t __cdecl _mbslen (const unsigned char*);
-_CRTIMP size_t __cdecl _mbsnbcnt (const unsigned char*, size_t);
-_CRTIMP size_t __cdecl _mbsnccnt (const unsigned char*, size_t);
-_CRTIMP unsigned char* __cdecl  _mbschr (const unsigned char*, unsigned int);
-_CRTIMP unsigned char* __cdecl  _mbsrchr (const unsigned char*, unsigned int);
-_CRTIMP size_t __cdecl _mbsspn (const unsigned char*, const unsigned char*);
-_CRTIMP size_t __cdecl _mbscspn (const unsigned char*, const unsigned char*);
-_CRTIMP unsigned char* __cdecl  _mbsspnp (const unsigned char*, const unsigned char*);
-_CRTIMP unsigned char* __cdecl  _mbspbrk (const unsigned char*, const unsigned char*);
-_CRTIMP int __cdecl _mbscmp (const unsigned char*, const unsigned char*);
-_CRTIMP int __cdecl _mbsicmp (const unsigned char*, const unsigned char*);
-_CRTIMP int __cdecl _mbsncmp (const unsigned char*, const unsigned char*, size_t);
-_CRTIMP int __cdecl _mbsnicmp (const unsigned char*, const unsigned char*, size_t);
-_CRTIMP int __cdecl _mbsnbcmp (const unsigned char*, const unsigned char*, size_t);
-_CRTIMP int __cdecl _mbsnbicmp (const unsigned char*, const unsigned char*, size_t);
-_CRTIMP int __cdecl _mbscoll (const unsigned char*, const unsigned char*);
-_CRTIMP int __cdecl _mbsicoll (const unsigned char*, const unsigned char*);
-_CRTIMP int __cdecl _mbsncoll (const unsigned char*, const unsigned char*, size_t);
-_CRTIMP int __cdecl _mbsnicoll (const unsigned char*, const unsigned char*, size_t);
-_CRTIMP int __cdecl _mbsnbcoll (const unsigned char*, const unsigned char*, size_t);
-_CRTIMP int __cdecl _mbsnbicoll (const unsigned char*, const unsigned char*, size_t);
-
-_CRTIMP unsigned char* __cdecl  _mbsinc (const unsigned char*);
-_CRTIMP unsigned char* __cdecl  _mbsninc (const unsigned char*, size_t);
-_CRTIMP unsigned char* __cdecl  _mbsdec (const unsigned char*, const unsigned char*);
-_CRTIMP unsigned int __cdecl _mbsnextc  (const unsigned char*);
-_CRTIMP unsigned char* __cdecl  _mbslwr (unsigned char*);
-_CRTIMP unsigned char* __cdecl  _mbsupr (unsigned char*);
-_CRTIMP unsigned char* __cdecl  _mbstok (unsigned char*, const unsigned char*);
-
-/* Kanji */
-_CRTIMP int __cdecl _ismbchira (unsigned int);
-_CRTIMP int __cdecl _ismbckata (unsigned int);
-_CRTIMP int __cdecl _ismbcl0 (unsigned int);
-_CRTIMP int __cdecl _ismbcl1 (unsigned int);
-_CRTIMP int __cdecl _ismbcl2 (unsigned int);
-_CRTIMP unsigned int __cdecl _mbcjistojms (unsigned int);
-_CRTIMP unsigned int __cdecl _mbcjmstojis (unsigned int);
-_CRTIMP unsigned int __cdecl _mbctohira (unsigned int);
-_CRTIMP unsigned int __cdecl _mbctokata (unsigned int);
-
-#endif	/* Not strict ANSI */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-#endif	/* Not _MBSTRING_H_ */
-
-
diff --git a/winsup/mingw/include/mem.h b/winsup/mingw/include/mem.h
deleted file mode 100644
index 20c8fa4a5..000000000
--- a/winsup/mingw/include/mem.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * This file is part of the Mingw32 package.
- *
- * mem.h maps to string.h
- */
-#ifndef	__STRICT_ANSI__
-#include <string.h>
-#endif
diff --git a/winsup/mingw/include/memory.h b/winsup/mingw/include/memory.h
deleted file mode 100644
index e0c91d635..000000000
--- a/winsup/mingw/include/memory.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * This file is part of the Mingw32 package.
- *
- * memory.h maps to the standard string.h header.
- */
-#ifndef	__STRICT_ANSI__
-#include	<string.h>
-#endif
-
diff --git a/winsup/mingw/include/process.h b/winsup/mingw/include/process.h
deleted file mode 100644
index 67277db8f..000000000
--- a/winsup/mingw/include/process.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* 
- * process.h
- *
- * Function calls for spawning child processes.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef	_PROCESS_H_
-#define	_PROCESS_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/* Includes a definition of _pid_t and pid_t */
-#include <sys/types.h>
-
-/*
- * Constants for cwait actions.
- * Obsolete for Win32.
- */
-#define	_WAIT_CHILD		0
-#define	_WAIT_GRANDCHILD	1
-
-#ifndef	_NO_OLDNAMES
-#define	WAIT_CHILD		_WAIT_CHILD
-#define	WAIT_GRANDCHILD		_WAIT_GRANDCHILD
-#endif	/* Not _NO_OLDNAMES */
-
-/*
- * Mode constants for spawn functions.
- */
-#define	_P_WAIT		0
-#define	_P_NOWAIT	1
-#define	_P_OVERLAY	2
-#define	_OLD_P_OVERLAY	_P_OVERLAY
-#define	_P_NOWAITO	3
-#define	_P_DETACH	4
-
-#ifndef	_NO_OLDNAMES
-#define	P_WAIT		_P_WAIT
-#define	P_NOWAIT	_P_NOWAIT
-#define	P_OVERLAY	_P_OVERLAY
-#define	OLD_P_OVERLAY	_OLD_P_OVERLAY
-#define	P_NOWAITO	_P_NOWAITO
-#define	P_DETACH	_P_DETACH
-#endif	/* Not _NO_OLDNAMES */
-
-
-#ifndef RC_INVOKED
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-_CRTIMP void __cdecl _cexit(void);
-_CRTIMP void __cdecl _c_exit(void);
-
-_CRTIMP int __cdecl _cwait (int*, _pid_t, int);
-
-_CRTIMP _pid_t __cdecl _getpid(void);
-
-_CRTIMP int __cdecl _execl	(const char*, const char*, ...);
-_CRTIMP int __cdecl _execle	(const char*, const char*, ...);
-_CRTIMP int __cdecl _execlp	(const char*, const char*, ...);
-_CRTIMP int __cdecl _execlpe	(const char*, const char*, ...);
-_CRTIMP int __cdecl _execv	(const char*, const char* const*);
-_CRTIMP int __cdecl _execve	(const char*, const char* const*, const char* const*);
-_CRTIMP int __cdecl _execvp	(const char*, const char* const*);
-_CRTIMP int __cdecl _execvpe	(const char*, const char* const*, const char* const*);
-
-_CRTIMP int __cdecl _spawnl	(int, const char*, const char*, ...);
-_CRTIMP int __cdecl _spawnle	(int, const char*, const char*, ...);
-_CRTIMP int __cdecl _spawnlp	(int, const char*, const char*, ...);
-_CRTIMP int __cdecl _spawnlpe	(int, const char*, const char*, ...);
-_CRTIMP int __cdecl _spawnv	(int, const char*, const char* const*);
-_CRTIMP int __cdecl _spawnve	(int, const char*, const char* const*, const char* const*);
-_CRTIMP int __cdecl _spawnvp	(int, const char*, const char* const*);
-_CRTIMP int __cdecl _spawnvpe	(int, const char*, const char* const*, const char* const*);
-
-
-/*
- * The functions _beginthreadex and _endthreadex are not provided by CRTDLL.
- * They are provided by MSVCRT.
- *
- * NOTE: Apparently _endthread calls CloseHandle on the handle of the thread,
- * making for race conditions if you are not careful. Basically you have to
- * make sure that no-one is going to do *anything* with the thread handle
- * after the thread calls _endthread or returns from the thread function.
- *
- * NOTE: No old names for these functions. Use the underscore.
- */
-_CRTIMP unsigned long __cdecl
-	_beginthread	(void (*)(void *), unsigned, void*);
-_CRTIMP void __cdecl _endthread	(void);
-
-#ifdef	__MSVCRT__
-_CRTIMP unsigned long __cdecl
-	_beginthreadex	(void *, unsigned, unsigned (__stdcall *) (void *), 
-			 void*, unsigned, unsigned*);
-_CRTIMP void __cdecl _endthreadex (unsigned);
-#endif
-
-
-#ifndef	_NO_OLDNAMES
-/*
- * Functions without the leading underscore, for portability. These functions
- * live in liboldnames.a.
- */
-_CRTIMP int  __cdecl cwait (int*, pid_t, int);
-_CRTIMP pid_t __cdecl getpid (void);
-_CRTIMP int __cdecl execl (const char*, const char*, ...);
-_CRTIMP int __cdecl execle (const char*, const char*, ...);
-_CRTIMP int __cdecl execlp (const char*, const char*, ...);
-_CRTIMP int __cdecl execlpe (const char*, const char*, ...);
-_CRTIMP int __cdecl execv (const char*, const char* const*);
-_CRTIMP int __cdecl execve (const char*, const char* const*, const char* const*);
-_CRTIMP int __cdecl execvp (const char*, const char* const*);
-_CRTIMP int __cdecl execvpe (const char*, const char* const*, const char* const*);
-_CRTIMP int __cdecl spawnl (int, const char*, const char*, ...);
-_CRTIMP int __cdecl spawnle (int, const char*, const char*, ...);
-_CRTIMP int __cdecl spawnlp (int, const char*, const char*, ...);
-_CRTIMP int __cdecl spawnlpe (int, const char*, const char*, ...);
-_CRTIMP int __cdecl spawnv (int, const char*, const char* const*);
-_CRTIMP int __cdecl spawnve (int, const char*, const char* const*, const char* const*);
-_CRTIMP int __cdecl spawnvp (int, const char*, const char* const*);
-_CRTIMP int __cdecl spawnvpe (int, const char*, const char* const*, const char* const*);
-#endif	/* Not _NO_OLDNAMES */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* _PROCESS_H_ not defined */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/search.h b/winsup/mingw/include/search.h
deleted file mode 100644
index b42b05a71..000000000
--- a/winsup/mingw/include/search.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* 
- * search.h
- *
- * Functions for searching and sorting.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Danny Smith  <dannysmith@users.sourceforge.net>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef _SEARCH_H_
-#define _SEARCH_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _SIZE_T_DEFINED
-typedef unsigned int size_t;
-#define _SIZE_T_DEFINED
-#endif
-
-/* bsearch and qsort are also declared in stdlib.h */
-_CRTIMP void* __cdecl bsearch (const void*, const void*, size_t, size_t, 
-			       int (*)(const void*, const void*));
-_CRTIMP void __cdecl qsort (void*, size_t, size_t,
-			    int (*)(const void*, const void*));
-
-#ifndef __STRICT_ANSI__
-_CRTIMP void* __cdecl _lfind (const void*, const void*, unsigned int*,
-			      unsigned int, int (*)(const void*, const void*));
-_CRTIMP void* __cdecl _lsearch (const void*, void*, unsigned int*, unsigned int,
-				int (*)(const void*, const void*));
-
-#ifndef	_NO_OLDNAMES
-_CRTIMP void* __cdecl lfind (const void*, const void*, unsigned int*,
-			     unsigned int, int (*)(const void*, const void*));
-_CRTIMP void* __cdecl lsearch (const void*, void*, unsigned int*, unsigned int,
-			       int (*)(const void*, const void*));
-#endif
-#endif /* __STRICT_ANSI__ */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* RC_INVOKED */
-
-#endif /*  _SEARCH_H_ */
diff --git a/winsup/mingw/include/setjmp.h b/winsup/mingw/include/setjmp.h
deleted file mode 100644
index 91a650c34..000000000
--- a/winsup/mingw/include/setjmp.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* 
- * setjmp.h
- *
- * Declarations supporting setjmp and longjump, a method for avoiding
- * the normal function call return sequence. (Bleah!)
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _SETJMP_H_
-#define _SETJMP_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * The buffer used by setjmp to store the information used by longjmp
- * to perform it's evil goto-like work. The size of this buffer was
- * determined through experimentation; it's contents are a mystery.
- * NOTE: This was determined on an i386 (actually a Pentium). The
- *       contents could be different on an Alpha or something else.
- */
-#define _JBLEN 16
-#define _JBTYPE int
-typedef _JBTYPE jmp_buf[_JBLEN];
-
-/*
- * The function provided by CRTDLL which appears to do the actual work
- * of setjmp.
- */
-_CRTIMP int __cdecl _setjmp (jmp_buf);
-
-#define	setjmp(x)	_setjmp(x)
-
-/*
- * Return to the last setjmp call and act as if setjmp had returned
- * nVal (which had better be non-zero!).
- */
-_CRTIMP void __cdecl longjmp (jmp_buf, int);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _SETJMP_H_ */
-
diff --git a/winsup/mingw/include/share.h b/winsup/mingw/include/share.h
deleted file mode 100644
index 605d7e796..000000000
--- a/winsup/mingw/include/share.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * share.h
- *
- * Constants for file sharing functions.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef	_SHARE_H_
-#define	_SHARE_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define _SH_COMPAT	0x00	/* Compatibility */
-#define	_SH_DENYRW	0x10	/* Deny read/write */
-#define	_SH_DENYWR	0x20	/* Deny write */
-#define	_SH_DENYRD	0x30	/* Deny read */
-#define	_SH_DENYNO	0x40	/* Deny nothing */
-
-#ifndef __STRICT_ANSI__
-
-#ifndef _NO_OLDNAMES
-
-/* Non ANSI names */
-#define SH_DENYRW _SH_DENYRW
-#define SH_DENYWR _SH_DENYWR
-#define SH_DENYRD _SH_DENYRD
-#define SH_DENYNO _SH_DENYNO
-
-#endif	/* Not _NO_OLDNAMES */
-
-#endif	/* Not __STRICT_ANSI__ */
-
-#endif	/* Not _SHARE_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/signal.h b/winsup/mingw/include/signal.h
deleted file mode 100644
index e13863263..000000000
--- a/winsup/mingw/include/signal.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* 
- * signal.h
- *
- * A way to set handlers for exceptional conditions (also known as signals).
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	_SIGNAL_H_
-#define	_SIGNAL_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/*
- * The actual signal values. Using other values with signal
- * produces a SIG_ERR return value.
- *
- * NOTE: SIGINT is produced when the user presses Ctrl-C.
- *       SIGILL has not been tested.
- *       SIGFPE doesn't seem to work?
- *       SIGSEGV does not catch writing to a NULL pointer (that shuts down
- *               your app; can you say "segmentation violation core dump"?).
- *       SIGTERM comes from what kind of termination request exactly?
- *       SIGBREAK is indeed produced by pressing Ctrl-Break.
- *       SIGABRT is produced by calling abort.
- * TODO: The above results may be related to not installing an appropriate
- *       structured exception handling frame. Results may be better if I ever
- *       manage to get the SEH stuff down.
- */
-#define	SIGINT		2	/* Interactive attention */
-#define	SIGILL		4	/* Illegal instruction */
-#define	SIGFPE		8	/* Floating point error */
-#define	SIGSEGV		11	/* Segmentation violation */
-#define	SIGTERM		15	/* Termination request */
-#define SIGBREAK	21	/* Control-break */
-#define	SIGABRT		22	/* Abnormal termination (abort) */
-
-#define NSIG 23     /* maximum signal number + 1 */
-
-#ifndef	RC_INVOKED
-
-#ifndef _SIG_ATOMIC_T_DEFINED
-typedef int sig_atomic_t;
-#define _SIG_ATOMIC_T_DEFINED
-#endif
-
-/*
- * The prototypes (below) are the easy part. The hard part is figuring
- * out what signals are available and what numbers they are assigned
- * along with appropriate values of SIG_DFL and SIG_IGN.
- */
-
-/*
- * A pointer to a signal handler function. A signal handler takes a
- * single int, which is the signal it handles.
- */
-typedef	void (*__p_sig_fn_t)(int);
-
-/*
- * These are special values of signal handler pointers which are
- * used to send a signal to the default handler (SIG_DFL), ignore
- * the signal (SIG_IGN), indicate an error return (SIG_ERR),
- * get an error (SIG_SGE), or acknowledge (SIG_ACK).
- */
-#define	SIG_DFL	((__p_sig_fn_t) 0)
-#define	SIG_IGN	((__p_sig_fn_t) 1)
-#define	SIG_ERR ((__p_sig_fn_t) -1)
-#define SIG_SGE ((__p_sig_fn_t) 3)
-#define SIG_ACK ((__p_sig_fn_t) 4)
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/*
- * Call signal to set the signal handler for signal sig to the
- * function pointed to by handler. Returns a pointer to the
- * previous handler, or SIG_ERR if an error occurs. Initially
- * unhandled signals defined above will return SIG_DFL.
- */
-_CRTIMP __p_sig_fn_t __cdecl	signal(int, __p_sig_fn_t);
-
-/*
- * Raise the signal indicated by sig. Returns non-zero on success.
- */
-_CRTIMP int __cdecl	raise (int);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _SIGNAL_H_ */
-
diff --git a/winsup/mingw/include/stdarg.h b/winsup/mingw/include/stdarg.h
deleted file mode 100644
index 90a2d95a0..000000000
--- a/winsup/mingw/include/stdarg.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * This is just an RC_INVOKED guard for the real stdarg.h
- * fixincluded in gcc system dir. One day we will delete this file.
- */
-#ifndef RC_INVOKED
-#include_next<stdarg.h>
-#endif
diff --git a/winsup/mingw/include/stddef.h b/winsup/mingw/include/stddef.h
deleted file mode 100644
index ef9d5ffe4..000000000
--- a/winsup/mingw/include/stddef.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * This is just an RC_INVOKED guard for the real stddef.h
- * fixincluded in gcc system dir.  One day we will delete this file.
- */
-#ifndef RC_INVOKED
-#include_next<stddef.h>
-#endif
diff --git a/winsup/mingw/include/stdint.h b/winsup/mingw/include/stdint.h
deleted file mode 100644
index 258002e3b..000000000
--- a/winsup/mingw/include/stdint.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* ISO C9x  7.18  Integer types <stdint.h>
- * Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794)
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  Contributor: Danny Smith <danny_r_smith_2001@yahoo.co.nz>
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- *  Date: 2000-12-02
- */
-
-
-#ifndef _STDINT_H
-#define _STDINT_H
-#define __need_wint_t
-#define __need_wchar_t
-#include <stddef.h>
-
-/* 7.18.1.1  Exact-width integer types */
-typedef signed char int8_t;
-typedef unsigned char   uint8_t;
-typedef short  int16_t;
-typedef unsigned short  uint16_t;
-typedef int  int32_t;
-typedef unsigned   uint32_t;
-typedef long long  int64_t;
-typedef unsigned long long   uint64_t;
-
-/* 7.18.1.2  Minimum-width integer types */
-typedef signed char int_least8_t;
-typedef unsigned char   uint_least8_t;
-typedef short  int_least16_t;
-typedef unsigned short  uint_least16_t;
-typedef int  int_least32_t;
-typedef unsigned   uint_least32_t;
-typedef long long  int_least64_t;
-typedef unsigned long long   uint_least64_t;
-
-/*  7.18.1.3  Fastest minimum-width integer types 
- *  Not actually guaranteed to be fastest for all purposes
- *  Here we use the exact-width types for 8 and 16-bit ints. 
- */
-typedef char int_fast8_t;
-typedef unsigned char uint_fast8_t;
-typedef short  int_fast16_t;
-typedef unsigned short  uint_fast16_t;
-typedef int  int_fast32_t;
-typedef unsigned  int  uint_fast32_t;
-typedef long long  int_fast64_t;
-typedef unsigned long long   uint_fast64_t;
-
-/* 7.18.1.4  Integer types capable of holding object pointers */
-typedef int intptr_t;
-typedef unsigned uintptr_t;
-
-/* 7.18.1.5  Greatest-width integer types */
-typedef long long  intmax_t;
-typedef unsigned long long   uintmax_t;
-
-/* 7.18.2  Limits of specified-width integer types */
-#if !defined ( __cplusplus) || defined (__STDC_LIMIT_MACROS)
-
-/* 7.18.2.1  Limits of exact-width integer types */
-#define INT8_MIN (-128) 
-#define INT16_MIN (-32768)
-#define INT32_MIN (-2147483647 - 1)
-#define INT64_MIN  (-9223372036854775807LL - 1)
-
-#define INT8_MAX 127
-#define INT16_MAX 32767
-#define INT32_MAX 2147483647
-#define INT64_MAX 9223372036854775807LL
-
-#define UINT8_MAX 0xff /* 255U */
-#define UINT16_MAX 0xffff /* 65535U */
-#define UINT32_MAX 0xffffffff  /* 4294967295U */
-#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */
-
-/* 7.18.2.2  Limits of minimum-width integer types */
-#define INT_LEAST8_MIN INT8_MIN
-#define INT_LEAST16_MIN INT16_MIN
-#define INT_LEAST32_MIN INT32_MIN
-#define INT_LEAST64_MIN INT64_MIN
-
-#define INT_LEAST8_MAX INT8_MAX
-#define INT_LEAST16_MAX INT16_MAX
-#define INT_LEAST32_MAX INT32_MAX
-#define INT_LEAST64_MAX INT64_MAX
-
-#define UINT_LEAST8_MAX UINT8_MAX
-#define UINT_LEAST16_MAX UINT16_MAX
-#define UINT_LEAST32_MAX UINT32_MAX
-#define UINT_LEAST64_MAX UINT64_MAX
-
-/* 7.18.2.3  Limits of fastest minimum-width integer types */
-#define INT_FAST8_MIN INT8_MIN
-#define INT_FAST16_MIN INT16_MIN
-#define INT_FAST32_MIN INT32_MIN
-#define INT_FAST64_MIN INT64_MIN
-
-#define INT_FAST8_MAX INT8_MAX
-#define INT_FAST16_MAX INT16_MAX
-#define INT_FAST32_MAX INT32_MAX
-#define INT_FAST64_MAX INT64_MAX
-
-#define UINT_FAST8_MAX UINT8_MAX
-#define UINT_FAST16_MAX UINT16_MAX
-#define UINT_FAST32_MAX UINT32_MAX
-#define UINT_FAST64_MAX UINT64_MAX
-
-/* 7.18.2.4  Limits of integer types capable of holding
-    object pointers */ 
-#define INTPTR_MIN INT32_MIN
-#define INTPTR_MAX INT32_MAX
-#define UINTPTR_MAX UINT32_MAX
-
-/* 7.18.2.5  Limits of greatest-width integer types */
-#define INTMAX_MIN INT64_MIN
-#define INTMAX_MAX INT64_MAX
-#define UINTMAX_MAX UINT64_MAX
-
-/* 7.18.3  Limits of other integer types */
-#define PTRDIFF_MIN INT32_MIN
-#define PTRDIFF_MAX INT32_MAX
-
-#define SIG_ATOMIC_MIN INT32_MIN
-#define SIG_ATOMIC_MAX INT32_MAX
-
-#define SIZE_MAX UINT32_MAX
-
-#ifndef WCHAR_MIN  /* also in wchar.h */ 
-#define WCHAR_MIN 0
-#define WCHAR_MAX ((wchar_t)-1) /* UINT16_MAX */
-#endif
-
-/*
- * wint_t is unsigned short for compatibility with MS runtime
- */
-#define WINT_MIN 0
-#define WINT_MAX ((wint_t)-1) /* UINT16_MAX */
-
-#endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */
-
-
-/* 7.18.4  Macros for integer constants */
-#if !defined ( __cplusplus) || defined (__STDC_CONSTANT_MACROS)
-
-/* 7.18.4.1  Macros for minimum-width integer constants
-
-    Accoding to Douglas Gwyn <gwyn@arl.mil>:
-	"This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC
-	9899:1999 as initially published, the expansion was required
-	to be an integer constant of precisely matching type, which
-	is impossible to accomplish for the shorter types on most
-	platforms, because C99 provides no standard way to designate
-	an integer constant with width less than that of type int.
-	TC1 changed this to require just an integer constant
-	*expression* with *promoted* type."
-
-	The trick used here is from Clive D W Feather.
-*/
-
-#define INT8_C(val) (INT_LEAST8_MAX-INT_LEAST8_MAX+(val))
-#define INT16_C(val) (INT_LEAST16_MAX-INT_LEAST16_MAX+(val))
-#define INT32_C(val) (INT_LEAST32_MAX-INT_LEAST32_MAX+(val))
-/*  The 'trick' doesn't work in C89 for long long because, without
-    suffix, (val) will be evaluated as int, not intmax_t */ 
-#define INT64_C(val) val##LL
-
-#define UINT8_C(val) (UINT_LEAST8_MAX-UINT_LEAST8_MAX+(val))
-#define UINT16_C(val) (UINT_LEAST16_MAX-UINT_LEAST16_MAX+(val))
-#define UINT32_C(val) (UINT_LEAST32_MAX-UINT_LEAST32_MAX+(val))
-#define UINT64_C(val) val##ULL
-
-/* 7.18.4.2  Macros for greatest-width integer constants */
-#define INTMAX_C(val) val##LL
-#define UINTMAX_C(val) val##ULL
-
-#endif  /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */
-
-#endif
diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h
deleted file mode 100644
index 43c4f991f..000000000
--- a/winsup/mingw/include/stdio.h
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * stdio.h
- *
- * Definitions of types and prototypes of functions for standard input and
- * output.
- *
- * NOTE: The file manipulation functions provided by Microsoft seem to
- * work with either slash (/) or backslash (\) as the directory separator.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _STDIO_H_
-#define	_STDIO_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#ifndef RC_INVOKED
-#define __need_size_t
-#define __need_NULL
-#define __need_wchar_t
-#define	__need_wint_t
-#include <stddef.h>
-#define __need___va_list
-#include <stdarg.h>
-#endif	/* Not RC_INVOKED */
-
-
-/* Flags for the iobuf structure  */
-#define	_IOREAD	1 /* currently reading */
-#define	_IOWRT	2 /* currently writing */
-#define	_IORW	0x0080 /* opened as "r+w" */
-
-
-/*
- * The three standard file pointers provided by the run time library.
- * NOTE: These will go to the bit-bucket silently in GUI applications!
- */
-#define	STDIN_FILENO	0
-#define	STDOUT_FILENO	1
-#define	STDERR_FILENO	2
-
-/* Returned by various functions on end of file condition or error. */
-#define	EOF	(-1)
-
-/*
- * The maximum length of a file name. You should use GetVolumeInformation
- * instead of this constant. But hey, this works.
- * Also defined in io.h.
- */
-#ifndef FILENAME_MAX
-#define	FILENAME_MAX	(260)
-#endif
-
-/*
- * The maximum number of files that may be open at once. I have set this to
- * a conservative number. The actual value may be higher.
- */
-#define FOPEN_MAX	(20)
-
-/* After creating this many names, tmpnam and tmpfile return NULL */
-#define TMP_MAX	32767
-/*
- * Tmpnam, tmpfile and, sometimes, _tempnam try to create
- * temp files in the root directory of the current drive
- * (not in pwd, as suggested by some older MS doc's).
- * Redefining these macros does not effect the CRT functions.
- */
-#define _P_tmpdir   "\\"
-#define _wP_tmpdir  L"\\"
-
-/*
- * The maximum size of name (including NUL) that will be put in the user
- * supplied buffer caName for tmpnam.
- * Inferred from the size of the static buffer returned by tmpnam
- * when passed a NULL argument. May actually be smaller.
- */
-#define L_tmpnam (16)
-
-#define _IOFBF    0x0000  /* full buffered */
-#define _IOLBF    0x0040  /* line buffered */
-#define _IONBF    0x0004  /* not buffered */
-
-#define _IOMYBUF  0x0008  /* stdio malloc()'d buffer */
-#define _IOEOF    0x0010  /* EOF reached on read */
-#define _IOERR    0x0020  /* I/O error from system */
-#define _IOSTRG   0x0040  /* Strange or no file descriptor */
-#ifdef _POSIX_SOURCE
-# define _IOAPPEND 0x0200
-#endif
-/*
- * The buffer size as used by setbuf such that it is equivalent to
- * (void) setvbuf(fileSetBuffer, caBuffer, _IOFBF, BUFSIZ).
- */
-#define	BUFSIZ	512
-
-/* Constants for nOrigin indicating the position relative to which fseek
- * sets the file position. Enclosed in ifdefs because io.h could also
- * define them. (Though not anymore since io.h includes this file now.) */
-#ifndef	SEEK_SET
-#define SEEK_SET	(0)
-#endif
-
-#ifndef	SEEK_CUR
-#define	SEEK_CUR	(1)
-#endif
-
-#ifndef	SEEK_END
-#define SEEK_END	(2)
-#endif
-
-
-#ifndef	RC_INVOKED
-
-#ifndef __VALIST
-#ifdef __GNUC__
-#define __VALIST __gnuc_va_list
-#else
-#define __VALIST char*
-#endif
-#endif /* defined __VALIST  */
-
-/*
- * The structure underlying the FILE type.
- *
- * Some believe that nobody in their right mind should make use of the
- * internals of this structure. Provided by Pedro A. Aranda Gutiirrez
- * <paag@tid.es>.
- */
-#ifndef _FILE_DEFINED
-#define	_FILE_DEFINED
-typedef struct _iobuf
-{
-	char*	_ptr;
-	int	_cnt;
-	char*	_base;
-	int	_flag;
-	int	_file;
-	int	_charbuf;
-	int	_bufsiz;
-	char*	_tmpfname;
-} FILE;
-#endif	/* Not _FILE_DEFINED */
-
-
-/*
- * The standard file handles
- */
-#ifndef __DECLSPEC_SUPPORTED
-
-extern FILE (*_imp___iob)[];	/* A pointer to an array of FILE */
-
-#define _iob	(*_imp___iob)	/* An array of FILE */
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT FILE _iob[];	/* An array of FILE imported from DLL. */
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-#define stdin	(&_iob[STDIN_FILENO])
-#define stdout	(&_iob[STDOUT_FILENO])
-#define stderr	(&_iob[STDERR_FILENO])
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * File Operations
- */
-_CRTIMP FILE* __cdecl fopen (const char*, const char*);
-_CRTIMP FILE* __cdecl	freopen (const char*, const char*, FILE*);
-_CRTIMP int __cdecl	fflush (FILE*);
-_CRTIMP int __cdecl	fclose (FILE*);
-/* MS puts remove & rename (but not wide versions) in io.h  also */
-_CRTIMP int __cdecl	remove (const char*);
-_CRTIMP int __cdecl	rename (const char*, const char*);
-_CRTIMP FILE* __cdecl	tmpfile (void);
-_CRTIMP char* __cdecl	tmpnam (char*);
-
-#ifndef __STRICT_ANSI__
-_CRTIMP char* __cdecl	_tempnam (const char*, const char*);
-_CRTIMP int  __cdecl    _rmtmp(void);
-
-#ifndef	NO_OLDNAMES
-_CRTIMP char* __cdecl	tempnam (const char*, const char*);
-_CRTIMP int __cdecl     rmtmp(void);
-#endif
-#endif /* __STRICT_ANSI__ */
-
-_CRTIMP int __cdecl	setvbuf (FILE*, char*, int, size_t);
-
-_CRTIMP void __cdecl	setbuf (FILE*, char*);
-
-/*
- * Formatted Output
- */
-
-_CRTIMP int __cdecl	fprintf (FILE*, const char*, ...);
-_CRTIMP int __cdecl	printf (const char*, ...);
-_CRTIMP int __cdecl	sprintf (char*, const char*, ...);
-_CRTIMP int __cdecl	_snprintf (char*, size_t, const char*, ...);
-_CRTIMP int __cdecl	vfprintf (FILE*, const char*, __VALIST);
-_CRTIMP int __cdecl	vprintf (const char*, __VALIST);
-_CRTIMP int __cdecl	vsprintf (char*, const char*, __VALIST);
-_CRTIMP int __cdecl	_vsnprintf (char*, size_t, const char*, __VALIST);
-
-#ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
-int __cdecl snprintf(char* s, size_t n, const char*  format, ...);
-__CRT_INLINE int __cdecl
-vsnprintf (char* s, size_t n, const char* format, __VALIST arg)
-  { return _vsnprintf ( s, n, format, arg); }
-int __cdecl vscanf (const char * __restrict__, __VALIST);
-int __cdecl vfscanf (FILE * __restrict__, const char * __restrict__,
-		     __VALIST);
-int __cdecl vsscanf (const char * __restrict__,
-		     const char * __restrict__, __VALIST);
-#endif
-
-/*
- * Formatted Input
- */
-
-_CRTIMP int __cdecl	fscanf (FILE*, const char*, ...);
-_CRTIMP int __cdecl	scanf (const char*, ...);
-_CRTIMP int __cdecl	sscanf (const char*, const char*, ...);
-/*
- * Character Input and Output Functions
- */
-
-_CRTIMP int __cdecl	fgetc (FILE*);
-_CRTIMP char* __cdecl	fgets (char*, int, FILE*);
-_CRTIMP int __cdecl	fputc (int, FILE*);
-_CRTIMP int __cdecl	fputs (const char*, FILE*);
-_CRTIMP char* __cdecl	gets (char*);
-_CRTIMP int __cdecl	puts (const char*);
-_CRTIMP int __cdecl	ungetc (int, FILE*);
-
-/* Traditionally, getc and putc are defined as macros. but the
-   standard doesn't say that they must be macros.
-   We use inline functions here to allow the fast versions
-   to be used in C++ with namespace qualification, eg., ::getc.
-
-   _filbuf and _flsbuf  are not thread-safe. */
-_CRTIMP int __cdecl	_filbuf (FILE*);
-_CRTIMP int __cdecl	_flsbuf (int, FILE*);
-
-#if !defined _MT
-
-__CRT_INLINE int __cdecl getc (FILE* __F)
-{
-  return (--__F->_cnt >= 0)
-    ?  (int) (unsigned char) *__F->_ptr++
-    : _filbuf (__F);
-}
-
-__CRT_INLINE int __cdecl putc (int __c, FILE* __F)
-{
-  return (--__F->_cnt >= 0)
-    ?  (int) (unsigned char) (*__F->_ptr++ = (char)__c)
-    :  _flsbuf (__c, __F);
-}
-
-__CRT_INLINE int __cdecl getchar (void)
-{
-  return (--stdin->_cnt >= 0)
-    ?  (int) (unsigned char) *stdin->_ptr++
-    : _filbuf (stdin);
-}
-
-__CRT_INLINE int __cdecl putchar(int __c)
-{
-  return (--stdout->_cnt >= 0)
-    ?  (int) (unsigned char) (*stdout->_ptr++ = (char)__c)
-    :  _flsbuf (__c, stdout);}
-
-#else  /* Use library functions.  */
-
-_CRTIMP int __cdecl	getc (FILE*);
-_CRTIMP int __cdecl	putc (int, FILE*);
-_CRTIMP int __cdecl	getchar (void);
-_CRTIMP int __cdecl	putchar (int);
-
-#endif
-
-/*
- * Direct Input and Output Functions
- */
-
-_CRTIMP size_t __cdecl	fread (void*, size_t, size_t, FILE*);
-_CRTIMP size_t __cdecl	fwrite (const void*, size_t, size_t, FILE*);
-
-/*
- * File Positioning Functions
- */
-
-_CRTIMP int __cdecl	fseek (FILE*, long, int);
-_CRTIMP long __cdecl	ftell (FILE*);
-_CRTIMP void __cdecl	rewind (FILE*);
-
-#ifdef __USE_MINGW_FSEEK  /* These are in libmingwex.a */
-/*
- * Workaround for limitations on win9x where a file contents are
- * not zero'd out if you seek past the end and then write.
- */
-
-int __cdecl __mingw_fseek (FILE *, long, int);
-int __cdecl __mingw_fwrite (const void*, size_t, size_t, FILE*);
-#define fseek(fp, offset, whence)  __mingw_fseek(fp, offset, whence)
-#define fwrite(buffer, size, count, fp)  __mingw_fwrite(buffer, size, count, fp)
-#endif /* __USE_MINGW_FSEEK */
-
-/*
- * An opaque data type used for storing file positions... The contents of
- * this type are unknown, but we (the compiler) need to know the size
- * because the programmer using fgetpos and fsetpos will be setting aside
- * storage for fpos_t structres. Actually I tested using a byte array and
- * it is fairly evident that the fpos_t type is a long (in CRTDLL.DLL).
- * Perhaps an unsigned long? TODO? It's definitely a 64-bit number in
- * MSVCRT however, and for now `long long' will do.
- */
-#ifdef __MSVCRT__
-typedef long long fpos_t;
-#else
-typedef long	fpos_t;
-#endif
-
-_CRTIMP int __cdecl	fgetpos	(FILE*, fpos_t*);
-_CRTIMP int __cdecl	fsetpos (FILE*, const fpos_t*);
-
-/*
- * Error Functions
- */
-
-_CRTIMP void __cdecl	clearerr (FILE*);
-_CRTIMP int __cdecl	feof (FILE*);
-_CRTIMP int __cdecl	ferror (FILE*);
-_CRTIMP void __cdecl	perror (const char*);
-
-
-#ifndef __STRICT_ANSI__
-/*
- * Pipes
- */
-_CRTIMP FILE* __cdecl	_popen (const char*, const char*);
-_CRTIMP int __cdecl	_pclose (FILE*);
-
-#ifndef NO_OLDNAMES
-_CRTIMP FILE* __cdecl	popen (const char*, const char*);
-_CRTIMP int __cdecl	pclose (FILE*);
-#endif
-
-/*
- * Other Non ANSI functions
- */
-_CRTIMP int __cdecl	_flushall (void);
-_CRTIMP int __cdecl	_fgetchar (void);
-_CRTIMP int __cdecl	_fputchar (int);
-_CRTIMP FILE* __cdecl	_fdopen (int, const char*);
-_CRTIMP int __cdecl	_fileno (FILE*);
-_CRTIMP int __cdecl	_fcloseall(void);
-#ifdef __MSVCRT__
-_CRTIMP int __cdecl	_getmaxstdio(void);
-_CRTIMP int __cdecl	_setmaxstdio(int);
-#endif
-
-#ifndef _NO_OLDNAMES
-_CRTIMP int __cdecl	fgetchar (void);
-_CRTIMP int __cdecl	fputchar (int);
-_CRTIMP FILE* __cdecl	fdopen (int, const char*);
-_CRTIMP int __cdecl	fileno (FILE*);
-#endif	/* Not _NO_OLDNAMES */
-
-#define _fileno(__F) ((__F)->_file)
-#ifndef _NO_OLDNAMES
-#define fileno(__F) ((__F)->_file)
-#endif
-
-#endif	/* Not __STRICT_ANSI__ */
-
-/* Wide  versions */
-
-#ifndef _WSTDIO_DEFINED
-/*  also in wchar.h - keep in sync */
-_CRTIMP int __cdecl	fwprintf (FILE*, const wchar_t*, ...);
-_CRTIMP int __cdecl	wprintf (const wchar_t*, ...);
-_CRTIMP int __cdecl	swprintf (wchar_t*, const wchar_t*, ...);
-_CRTIMP int __cdecl	_snwprintf (wchar_t*, size_t, const wchar_t*, ...);
-_CRTIMP int __cdecl	vfwprintf (FILE*, const wchar_t*, __VALIST);
-_CRTIMP int __cdecl	vwprintf (const wchar_t*, __VALIST);
-_CRTIMP int __cdecl	vswprintf (wchar_t*, const wchar_t*, __VALIST);
-_CRTIMP int __cdecl	_vsnwprintf (wchar_t*, size_t, const wchar_t*, __VALIST);
-_CRTIMP int __cdecl	fwscanf (FILE*, const wchar_t*, ...);
-_CRTIMP int __cdecl	wscanf (const wchar_t*, ...);
-_CRTIMP int __cdecl	swscanf (const wchar_t*, const wchar_t*, ...);
-_CRTIMP wint_t __cdecl	fgetwc (FILE*);
-_CRTIMP wint_t __cdecl	fputwc (wchar_t, FILE*);
-_CRTIMP wint_t __cdecl	ungetwc (wchar_t, FILE*);
-
-#ifdef __MSVCRT__ 
-_CRTIMP wchar_t* __cdecl fgetws (wchar_t*, int, FILE*);
-_CRTIMP int __cdecl	fputws (const wchar_t*, FILE*);
-_CRTIMP wint_t __cdecl	getwc (FILE*);
-_CRTIMP wint_t __cdecl	getwchar (void);
-_CRTIMP wchar_t* __cdecl _getws (wchar_t*);
-_CRTIMP wint_t __cdecl	putwc (wint_t, FILE*);
-_CRTIMP int __cdecl	_putws (const wchar_t*);
-_CRTIMP wint_t __cdecl	putwchar (wint_t);
-_CRTIMP FILE* __cdecl	_wfdopen(int, wchar_t *);
-_CRTIMP FILE* __cdecl	_wfopen (const wchar_t*, const wchar_t*);
-_CRTIMP FILE* __cdecl	_wfreopen (const wchar_t*, const wchar_t*, FILE*);
-_CRTIMP FILE* __cdecl	_wfsopen (const wchar_t*, const wchar_t*, int);
-_CRTIMP wchar_t* __cdecl _wtmpnam (wchar_t*);
-_CRTIMP wchar_t* __cdecl _wtempnam (const wchar_t*, const wchar_t*);
-_CRTIMP int __cdecl	_wrename (const wchar_t*, const wchar_t*);
-_CRTIMP int __cdecl	_wremove (const wchar_t*);
-_CRTIMP void __cdecl	_wperror (const wchar_t*);
-_CRTIMP FILE* __cdecl	_wpopen (const wchar_t*, const wchar_t*);
-#endif	/* __MSVCRT__ */
-
-#ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
-int __cdecl snwprintf (wchar_t* s, size_t n, const wchar_t*  format, ...);
-__CRT_INLINE int __cdecl
-vsnwprintf (wchar_t* s, size_t n, const wchar_t* format, __VALIST arg)
-  { return _vsnwprintf ( s, n, format, arg);}
-int __cdecl vwscanf (const wchar_t * __restrict__, __VALIST);
-int __cdecl vfwscanf (FILE * __restrict__,
-		       const wchar_t * __restrict__, __VALIST);
-int __cdecl vswscanf (const wchar_t * __restrict__,
-		       const wchar_t * __restrict__, __VALIST);
-#endif
-
-#define _WSTDIO_DEFINED
-#endif /* _WSTDIO_DEFINED */
-
-#ifndef __STRICT_ANSI__
-#ifdef __MSVCRT__
-#ifndef NO_OLDNAMES
-_CRTIMP FILE* __cdecl	wpopen (const wchar_t*, const wchar_t*);
-#endif /* not NO_OLDNAMES */
-#endif /* MSVCRT runtime */
-
-/*
- * Other Non ANSI wide functions
- */
-_CRTIMP wint_t __cdecl	_fgetwchar (void);
-_CRTIMP wint_t __cdecl	_fputwchar (wint_t);
-_CRTIMP int __cdecl	_getw (FILE*);
-_CRTIMP int __cdecl	_putw (int, FILE*);
-
-#ifndef _NO_OLDNAMES
-_CRTIMP wint_t __cdecl	fgetwchar (void);
-_CRTIMP wint_t __cdecl	fputwchar (wint_t);
-_CRTIMP int __cdecl	getw (FILE*);
-_CRTIMP int __cdecl	putw (int, FILE*);
-#endif	/* Not _NO_OLDNAMES */
-
-#endif /* __STRICT_ANSI */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif /* _STDIO_H_ */
diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h
deleted file mode 100644
index 901a10ece..000000000
--- a/winsup/mingw/include/stdlib.h
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- * stdlib.h
- *
- * Definitions for common types, variables, and functions.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _STDLIB_H_
-#define _STDLIB_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-
-#define __need_size_t
-#define __need_wchar_t
-#define __need_NULL
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif /* RC_INVOKED */
-
-/*
- * RAND_MAX is the maximum value that may be returned by rand.
- * The minimum is zero.
- */
-#define	RAND_MAX	0x7FFF
-
-/*
- * These values may be used as exit status codes.
- */
-#define	EXIT_SUCCESS	0
-#define	EXIT_FAILURE	1
-
-/*
- * Definitions for path name functions.
- * NOTE: All of these values have simply been chosen to be conservatively high.
- *       Remember that with long file names we can no longer depend on
- *       extensions being short.
- */
-#ifndef __STRICT_ANSI__
-
-#ifndef MAX_PATH
-#define	MAX_PATH	(260)
-#endif
-
-#define	_MAX_PATH	MAX_PATH
-#define	_MAX_DRIVE	(3)
-#define	_MAX_DIR	256
-#define	_MAX_FNAME	256
-#define	_MAX_EXT	256
-
-#endif	/* Not __STRICT_ANSI__ */
-
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined (__STRICT_ANSI__)
-
-/*
- * This seems like a convenient place to declare these variables, which
- * give programs using WinMain (or main for that matter) access to main-ish
- * argc and argv. environ is a pointer to a table of environment variables.
- * NOTE: Strings in _argv and environ are ANSI strings.
- */
-extern int	_argc;
-extern char**	_argv;
-
-/* imports from runtime dll of the above variables */
-#ifdef __MSVCRT__
-
-extern int*  __cdecl   __p___argc(void);
-extern char*** __cdecl  __p___argv(void);
-extern wchar_t***  __cdecl __p___wargv(void);
-
-#define __argc (*__p___argc())
-#define __argv (*__p___argv())
-#define __wargv (*__p___wargv())
-
-#else /* !MSVCRT */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern int*    _imp____argc_dll;
-extern char***  _imp____argv_dll;
-#define __argc (*_imp____argc_dll)
-#define __argv (*_imp____argv_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT int    __argc_dll;
-__MINGW_IMPORT char**  __argv_dll;
-#define __argc __argc_dll
-#define __argv __argv_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* __MSVCRT */
-#endif /* __STRICT_ANSI__ */
-/*
- * Also defined in ctype.h.
- */
-#ifndef MB_CUR_MAX
-#ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
-   __MINGW_IMPORT int __mb_cur_max;
-# else		/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif		/* not __MSVCRT */
-
-#else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
-   extern int* _imp____mbcur_max;
-#  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mbcur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
-#endif  	/*  __DECLSPEC_SUPPORTED */
-#endif  /* MB_CUR_MAX */
-
-/* 
- * MS likes to declare errno in stdlib.h as well. 
- */
-
-#ifdef _UWIN
-#undef errno
-extern int errno;
-#else
- _CRTIMP int* __cdecl	_errno(void);
-#define	errno		(*_errno())
-#endif
- _CRTIMP int* __cdecl	__doserrno(void);
-#define	_doserrno	(*__doserrno())
-
-#if !defined (__STRICT_ANSI__)
-/*
- * Use environ from the DLL, not as a global. 
- */
-
-#ifdef __MSVCRT__
-  extern _CRTIMP char *** __cdecl __p__environ(void);
-  extern _CRTIMP wchar_t *** __cdecl  __p__wenviron(void);
-# define _environ (*__p__environ())
-# define _wenviron (*__p__wenviron())
-#else /* ! __MSVCRT__ */
-# ifndef __DECLSPEC_SUPPORTED
-    extern char *** _imp___environ_dll;
-#   define _environ (*_imp___environ_dll)
-# else /* __DECLSPEC_SUPPORTED */
-    __MINGW_IMPORT char ** _environ_dll;
-#   define _environ _environ_dll
-# endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
-#define environ _environ
-
-#ifdef	__MSVCRT__
-/* One of the MSVCRTxx libraries */
-
-#ifndef __DECLSPEC_SUPPORTED
-  extern int*	_imp___sys_nerr;
-# define	sys_nerr	(*_imp___sys_nerr)
-#else /* __DECLSPEC_SUPPORTED */
-  __MINGW_IMPORT int	_sys_nerr;
-# ifndef _UWIN
-#   define	sys_nerr	_sys_nerr
-# endif /* _UWIN */
-#endif /* __DECLSPEC_SUPPORTED */
-
-#else /* ! __MSVCRT__ */
-
-/* CRTDLL run time library */
-
-#ifndef __DECLSPEC_SUPPORTED
-  extern int*	_imp___sys_nerr_dll;
-# define sys_nerr	(*_imp___sys_nerr_dll)
-#else /* __DECLSPEC_SUPPORTED */
-  __MINGW_IMPORT int	_sys_nerr_dll;
-# define sys_nerr	_sys_nerr_dll
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* ! __MSVCRT__ */
-
-#ifndef __DECLSPEC_SUPPORTED
-extern char***	_imp__sys_errlist;
-#define	sys_errlist	(*_imp___sys_errlist)
-#else /* __DECLSPEC_SUPPORTED */
-__MINGW_IMPORT char*	_sys_errlist[];
-#ifndef _UWIN
-#define	sys_errlist	_sys_errlist
-#endif /* _UWIN */
-#endif /* __DECLSPEC_SUPPORTED */
-
-/*
- * OS version and such constants.
- */
-
-#ifdef	__MSVCRT__
-/* msvcrtxx.dll */
-
-extern _CRTIMP unsigned __cdecl int*	__p__osver(void);
-extern _CRTIMP unsigned __cdecl int*	__p__winver(void);
-extern _CRTIMP unsigned __cdecl int*	__p__winmajor(void);
-extern _CRTIMP unsigned __cdecl int*	__p__winminor(void);
-
-#ifndef __DECLSPEC_SUPPORTED
-# define _osver		(*__p__osver())
-# define _winver	(*__p__winver())
-# define _winmajor	(*__p__winmajor())
-# define _winminor	(*__p__winminor())
-#else
-__MINGW_IMPORT unsigned int _osver;
-__MINGW_IMPORT unsigned int _winver;
-__MINGW_IMPORT unsigned int _winmajor;
-__MINGW_IMPORT unsigned int _winminor;
-#endif /* __DECLSPEC_SUPPORTED */
-
-#else
-/* Not msvcrtxx.dll, thus crtdll.dll */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern unsigned int*	_imp___osver_dll;
-extern unsigned int*	_imp___winver_dll;
-extern unsigned int*	_imp___winmajor_dll;
-extern unsigned int*	_imp___winminor_dll;
-
-#define _osver		(*_imp___osver_dll)
-#define _winver		(*_imp___winver_dll)
-#define _winmajor	(*_imp___winmajor_dll)
-#define _winminor	(*_imp___winminor_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int	_osver_dll;
-__MINGW_IMPORT unsigned int	_winver_dll;
-__MINGW_IMPORT unsigned int	_winmajor_dll;
-__MINGW_IMPORT unsigned int	_winminor_dll;
-
-#define _osver		_osver_dll
-#define _winver		_winver_dll
-#define _winmajor	_winmajor_dll
-#define _winminor	_winminor_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif
-
-#if defined  __MSVCRT__
-/* although the _pgmptr is exported as DATA,
- * be safe and use the access function __p__pgmptr() to get it. */
-_CRTIMP char** __cdecl __p__pgmptr(void);
-#define _pgmptr     (*__p__pgmptr())
-_CRTIMP wchar_t** __cdecl __p__wpgmptr(void);
-#define _wpgmptr    (*__p__wpgmptr())
-#else /* ! __MSVCRT__ */
-# ifndef __DECLSPEC_SUPPORTED
-  extern char** __imp__pgmptr_dll;
-# define _pgmptr (*_imp___pgmptr_dll)
-# else /* __DECLSPEC_SUPPORTED */
- __MINGW_IMPORT char* _pgmptr_dll;
-# define _pgmptr _pgmptr_dll
-# endif /* __DECLSPEC_SUPPORTED */
-/* no wide version in CRTDLL */
-#endif /* __MSVCRT__ */
-
-/*
- * This variable determines the default file mode.
- * TODO: Which flags work?
- */
-#if !defined (__DECLSPEC_SUPPORTED) || defined (__IN_MINGW_RUNTIME)
-
-#ifdef __MSVCRT__
-extern int* _imp___fmode;
-#define	_fmode	(*_imp___fmode)
-#else
-/* CRTDLL */
-extern int* _imp___fmode_dll;
-#define	_fmode	(*_imp___fmode_dll)
-#endif
-
-#else /* __DECLSPEC_SUPPORTED */
-
-#ifdef __MSVCRT__
-__MINGW_IMPORT  int _fmode;
-#else /* ! __MSVCRT__ */
-__MINGW_IMPORT  int _fmode_dll;
-#define	_fmode	_fmode_dll
-#endif /* ! __MSVCRT__ */
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* Not __STRICT_ANSI__ */
-
-#ifdef	__GNUC__
-#define	_ATTRIB_NORETURN	__attribute__ ((noreturn))
-#else	/* Not __GNUC__ */
-#define	_ATTRIB_NORETURN
-#endif	/* __GNUC__ */
-
-_CRTIMP double __cdecl	atof	(const char*);
-_CRTIMP int __cdecl	atoi	(const char*);
-_CRTIMP long __cdecl 	atol	(const char*);
-#if !defined (__STRICT_ANSI__)
-_CRTIMP int __cdecl	_wtoi (const wchar_t *);
-_CRTIMP long __cdecl _wtol (const wchar_t *);
-#endif
-_CRTIMP double __cdecl	strtod	(const char*, char**);
-#if !defined __NO_ISOCEXT  /* extern stub in static libmingwex.a */
-__CRT_INLINE float __cdecl strtof (const char *nptr, char **endptr)
-  { return (strtod (nptr, endptr));}
-long double __cdecl strtold (const char * __restrict__, char ** __restrict__);
-#endif /* __NO_ISOCEXT */
-
-_CRTIMP long __cdecl	strtol	(const char*, char**, int);
-_CRTIMP unsigned long __cdecl	strtoul	(const char*, char**, int);
-
-#ifndef _WSTDLIB_DEFINED
-/*  also declared in wchar.h */
-_CRTIMP double __cdecl	wcstod	(const wchar_t*, wchar_t**);
-#if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */
-__CRT_INLINE float __cdecl wcstof( const wchar_t *nptr, wchar_t **endptr)
-{  return (wcstod(nptr, endptr)); }
-long double __cdecl wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__);
-#endif /* __NO_ISOCEXT */
-
-_CRTIMP long __cdecl	wcstol	(const wchar_t*, wchar_t**, int);
-_CRTIMP unsigned long __cdecl	wcstoul (const wchar_t*, wchar_t**, int);
-#define _WSTDLIB_DEFINED
-#endif
-
-_CRTIMP size_t __cdecl	wcstombs	(char*, const wchar_t*, size_t);
-_CRTIMP int __cdecl	wctomb		(char*, wchar_t);
-
-_CRTIMP int __cdecl	mblen		(const char*, size_t);
-_CRTIMP size_t __cdecl	mbstowcs	(wchar_t*, const char*, size_t);
-_CRTIMP int __cdecl	mbtowc		(wchar_t*, const char*, size_t);
-
-_CRTIMP int __cdecl	rand	(void);
-_CRTIMP void __cdecl	srand	(unsigned int);
-
-_CRTIMP void* __cdecl	calloc	(size_t, size_t);
-_CRTIMP void* __cdecl	malloc	(size_t);
-_CRTIMP void* __cdecl	realloc	(void*, size_t);
-_CRTIMP void __cdecl	free	(void*);
-
-_CRTIMP void __cdecl	abort	(void) _ATTRIB_NORETURN;
-_CRTIMP void __cdecl	exit	(int) _ATTRIB_NORETURN;
-
-/* Note: This is in startup code, not imported directly from dll */
-int __cdecl	atexit	(void (*)(void));
-
-_CRTIMP int __cdecl	system	(const char*);
-_CRTIMP char* __cdecl	getenv	(const char*);
-
-/* bsearch and qsort are also in non-ANSI header search.h  */
-_CRTIMP void* __cdecl	bsearch	(const void*, const void*, size_t, size_t, 
-				 int (*)(const void*, const void*));
-_CRTIMP void __cdecl	qsort	(void*, size_t, size_t,
-				 int (*)(const void*, const void*));
-
-_CRTIMP int __cdecl	abs	(int);
-_CRTIMP long __cdecl	labs	(long);
-
-/*
- * div_t and ldiv_t are structures used to return the results of div and
- * ldiv.
- *
- * NOTE: div and ldiv appear not to work correctly unless
- *       -fno-pcc-struct-return is specified. This is included in the
- *       mingw32 specs file.
- */
-typedef struct { int quot, rem; } div_t;
-typedef struct { long quot, rem; } ldiv_t;
-
-_CRTIMP div_t __cdecl	div	(int, int);
-_CRTIMP ldiv_t __cdecl	ldiv	(long, long);
-
-#if !defined (__STRICT_ANSI__)
-
-/*
- * NOTE: Officially the three following functions are obsolete. The Win32 API
- *       functions SetErrorMode, Beep and Sleep are their replacements.
- */
-_CRTIMP void __cdecl	_beep (unsigned int, unsigned int);
-_CRTIMP void __cdecl	_seterrormode (int);
-_CRTIMP void __cdecl	_sleep (unsigned long);
-
-_CRTIMP void __cdecl	_exit	(int) _ATTRIB_NORETURN;
-
-/* _onexit is MS extension. Use atexit for portability.  */
-/* Note: This is in startup code, not imported directly from dll */
-typedef  int (* _onexit_t)(void);
-_onexit_t __cdecl _onexit( _onexit_t );
-
-_CRTIMP int __cdecl	_putenv	(const char*);
-_CRTIMP void __cdecl	_searchenv (const char*, const char*, char*);
-
-
-_CRTIMP char* __cdecl	_ecvt (double, int, int*, int*);
-_CRTIMP char* __cdecl	_fcvt (double, int, int*, int*);
-_CRTIMP char* __cdecl	_gcvt (double, int, char*);
-
-_CRTIMP void __cdecl	_makepath (char*, const char*, const char*, const char*, const char*);
-_CRTIMP void __cdecl	_splitpath (const char*, char*, char*, char*, char*);
-_CRTIMP char* __cdecl	_fullpath (char*, const char*, size_t);
-
-_CRTIMP char* __cdecl	_itoa (int, char*, int);
-_CRTIMP char* __cdecl	_ltoa (long, char*, int);
-_CRTIMP char* __cdecl   _ultoa(unsigned long, char*, int);
-_CRTIMP wchar_t* __cdecl  _itow (int, wchar_t*, int);
-_CRTIMP wchar_t* __cdecl  _ltow (long, wchar_t*, int);
-_CRTIMP wchar_t* __cdecl  _ultow (unsigned long, wchar_t*, int);
-
-#ifdef __MSVCRT__
-_CRTIMP __int64 __cdecl	_atoi64(const char *);
-_CRTIMP char* __cdecl	_i64toa(__int64, char *, int);
-_CRTIMP char* __cdecl	_ui64toa(unsigned __int64, char *, int);
-_CRTIMP __int64 __cdecl	_wtoi64(const wchar_t *);
-_CRTIMP wchar_t* __cdecl _i64tow(__int64, wchar_t *, int);
-_CRTIMP wchar_t* __cdecl _ui64tow(unsigned __int64, wchar_t *, int);
-
-_CRTIMP wchar_t* __cdecl _wgetenv(const wchar_t*);
-_CRTIMP int __cdecl	 _wputenv(const wchar_t*);
-_CRTIMP void __cdecl	_wsearchenv(const wchar_t*, const wchar_t*, wchar_t*);
-_CRTIMP void __cdecl    _wmakepath(wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*);
-_CRTIMP void __cdecl	_wsplitpath (const wchar_t*, wchar_t*, wchar_t*, wchar_t*, wchar_t*);
-_CRTIMP wchar_t* __cdecl    _wfullpath (wchar_t*, const wchar_t*, size_t);
-
-_CRTIMP unsigned int __cdecl _rotl(unsigned int, int);
-_CRTIMP unsigned int __cdecl _rotr(unsigned int, int);
-_CRTIMP unsigned long __cdecl _lrotl(unsigned long, int);
-_CRTIMP unsigned long __cdecl _lrotr(unsigned long, int);
-#endif
-
-#ifndef	_NO_OLDNAMES
-
-_CRTIMP int __cdecl	putenv (const char*);
-_CRTIMP void __cdecl	searchenv (const char*, const char*, char*);
-
-_CRTIMP char* __cdecl	itoa (int, char*, int);
-_CRTIMP char* __cdecl	ltoa (long, char*, int);
-
-#ifndef _UWIN
-_CRTIMP char* __cdecl	ecvt (double, int, int*, int*);
-_CRTIMP char* __cdecl	fcvt (double, int, int*, int*);
-_CRTIMP char* __cdecl	gcvt (double, int, char*);
-#endif /* _UWIN */
-#endif	/* Not _NO_OLDNAMES */
-
-#endif	/* Not __STRICT_ANSI__ */
-
-/* C99 names */
-
-#if !defined __NO_ISOCEXT /* externs in static libmingwex.a */
-
-/* C99 name for _exit */
-void __cdecl _Exit(int) _ATTRIB_NORETURN;
-#ifndef __STRICT_ANSI__   /* inline using non-ansi functions */
-__CRT_INLINE void __cdecl _Exit(int status)
-	{  _exit(status); }
-#endif 
-
-typedef struct { long long quot, rem; } lldiv_t;
-
-lldiv_t	__cdecl lldiv (long long, long long);
-
-__CRT_INLINE long long __cdecl llabs(long long _j)
-  {return (_j >= 0 ? _j : -_j);}
-
-long long  __cdecl strtoll (const char* __restrict__, char** __restrict, int);
-unsigned long long  __cdecl strtoull (const char* __restrict__, char** __restrict__, int);
-
-#if defined (__MSVCRT__) /* these are stubs for MS _i64 versions */ 
-long long  __cdecl atoll (const char *);
-
-#if !defined (__STRICT_ANSI__)
-long long  __cdecl wtoll (const wchar_t *);
-char* __cdecl lltoa (long long, char *, int);
-char* __cdecl ulltoa (unsigned long long , char *, int);
-wchar_t* __cdecl lltow (long long, wchar_t *, int);
-wchar_t* __cdecl ulltow (unsigned long long, wchar_t *, int);
-
-  /* inline using non-ansi functions */
-__CRT_INLINE long long  __cdecl atoll (const char * _c)
-	{ return _atoi64 (_c); }
-__CRT_INLINE char*  __cdecl lltoa (long long _n, char * _c, int _i)
-	{ return _i64toa (_n, _c, _i); }
-__CRT_INLINE char*  __cdecl ulltoa (unsigned long long _n, char * _c, int _i)
-	{ return _ui64toa (_n, _c, _i); }
-__CRT_INLINE long long  __cdecl wtoll (const wchar_t * _w)
- 	{ return _wtoi64 (_w); }
-__CRT_INLINE wchar_t*  __cdecl lltow (long long _n, wchar_t * _w, int _i)
-	{ return _i64tow (_n, _w, _i); } 
-__CRT_INLINE wchar_t*  __cdecl ulltow (unsigned long long _n, wchar_t * _w, int _i)
-	{ return _ui64tow (_n, _w, _i); } 
-#endif /* (__STRICT_ANSI__)  */
-
-#endif /* __MSVCRT__ */
-
-#endif /* !__NO_ISOCEXT */
-
-/*
- * Undefine the no return attribute used in some function definitions
- */
-#undef	_ATTRIB_NORETURN
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _STDLIB_H_ */
-
diff --git a/winsup/mingw/include/string.h b/winsup/mingw/include/string.h
deleted file mode 100644
index afedab717..000000000
--- a/winsup/mingw/include/string.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * string.h
- *
- * Definitions for memory and string functions.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _STRING_H_
-#define	_STRING_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/*
- * Define size_t, wchar_t and NULL
- */
-#define __need_size_t
-#define __need_wchar_t
-#define	__need_NULL
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif	/* Not RC_INVOKED */
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Prototypes of the ANSI Standard C library string functions.
- */
-_CRTIMP void* __cdecl	memchr (const void*, int, size_t);
-_CRTIMP int __cdecl 	memcmp (const void*, const void*, size_t);
-_CRTIMP void* __cdecl 	memcpy (void*, const void*, size_t);
-_CRTIMP void* __cdecl	memmove (void*, const void*, size_t);
-_CRTIMP void* __cdecl	memset (void*, int, size_t);
-_CRTIMP char* __cdecl	strcat (char*, const char*);
-_CRTIMP char* __cdecl	strchr (const char*, int);
-_CRTIMP int __cdecl	strcmp (const char*, const char*);
-_CRTIMP int __cdecl	strcoll (const char*, const char*);	/* Compare using locale */
-_CRTIMP char* __cdecl	strcpy (char*, const char*);
-_CRTIMP size_t __cdecl	strcspn (const char*, const char*);
-_CRTIMP char* __cdecl	strerror (int); /* NOTE: NOT an old name wrapper. */
-
-_CRTIMP size_t __cdecl	strlen (const char*);
-_CRTIMP char* __cdecl	strncat (char*, const char*, size_t);
-_CRTIMP int __cdecl	strncmp (const char*, const char*, size_t);
-_CRTIMP char* __cdecl	strncpy (char*, const char*, size_t);
-_CRTIMP char* __cdecl	strpbrk (const char*, const char*);
-_CRTIMP char* __cdecl	strrchr (const char*, int);
-_CRTIMP size_t __cdecl	strspn (const char*, const char*);
-_CRTIMP char* __cdecl	strstr (const char*, const char*);
-_CRTIMP char* __cdecl	strtok (char*, const char*);
-_CRTIMP size_t __cdecl	strxfrm (char*, const char*, size_t);
-
-#ifndef __STRICT_ANSI__
-/*
- * Extra non-ANSI functions provided by the CRTDLL library
- */
-_CRTIMP char* __cdecl	_strerror (const char *);
-_CRTIMP void* __cdecl	_memccpy (void*, const void*, int, size_t);
-_CRTIMP int __cdecl 	_memicmp (const void*, const void*, size_t);
-_CRTIMP char* __cdecl 	_strdup (const char*);
-_CRTIMP int __cdecl	_strcmpi (const char*, const char*);
-_CRTIMP int __cdecl	_stricmp (const char*, const char*);
-_CRTIMP int __cdecl	_stricoll (const char*, const char*);
-_CRTIMP char* __cdecl	_strlwr (char*);
-_CRTIMP int __cdecl	_strnicmp (const char*, const char*, size_t);
-_CRTIMP char* __cdecl	_strnset (char*, int, size_t);
-_CRTIMP char* __cdecl	_strrev (char*);
-_CRTIMP char* __cdecl	_strset (char*, int);
-_CRTIMP char* __cdecl	_strupr (char*);
-_CRTIMP void __cdecl	_swab (const char*, char*, size_t);
-
-#ifdef __MSVCRT__
-_CRTIMP int __cdecl  _strncoll(const char*, const char*, size_t);
-_CRTIMP int __cdecl  _strnicoll(const char*, const char*, size_t);
-#endif
-
-#endif	/* Not __STRICT_ANSI__ */
-
-/*
- * Unicode versions of the standard calls.
- */
-_CRTIMP wchar_t* __cdecl wcscat (wchar_t*, const wchar_t*);
-_CRTIMP wchar_t* __cdecl wcschr (const wchar_t*, wchar_t);
-_CRTIMP int __cdecl	wcscmp (const wchar_t*, const wchar_t*);
-_CRTIMP int __cdecl	wcscoll (const wchar_t*, const wchar_t*);
-_CRTIMP wchar_t* __cdecl wcscpy (wchar_t*, const wchar_t*);
-_CRTIMP size_t __cdecl	wcscspn (const wchar_t*, const wchar_t*);
-/* Note: No wcserror in CRTDLL. */
-_CRTIMP size_t __cdecl	wcslen (const wchar_t*);
-_CRTIMP wchar_t* __cdecl wcsncat (wchar_t*, const wchar_t*, size_t);
-_CRTIMP int __cdecl	wcsncmp(const wchar_t*, const wchar_t*, size_t);
-_CRTIMP wchar_t* __cdecl wcsncpy(wchar_t*, const wchar_t*, size_t);
-_CRTIMP wchar_t* __cdecl wcspbrk(const wchar_t*, const wchar_t*);
-_CRTIMP wchar_t* __cdecl wcsrchr(const wchar_t*, wchar_t);
-_CRTIMP size_t __cdecl	wcsspn(const wchar_t*, const wchar_t*);
-_CRTIMP wchar_t* __cdecl wcsstr(const wchar_t*, const wchar_t*);
-_CRTIMP wchar_t* __cdecl wcstok(wchar_t*, const wchar_t*);
-_CRTIMP size_t __cdecl	wcsxfrm(wchar_t*, const wchar_t*, size_t);
-
-#ifndef	__STRICT_ANSI__
-/*
- * Unicode versions of non-ANSI functions provided by CRTDLL.
- */
-
-/* NOTE: _wcscmpi not provided by CRTDLL, this define is for portability */
-#define		_wcscmpi	_wcsicmp
-
-_CRTIMP wchar_t* __cdecl _wcsdup (const wchar_t*);
-_CRTIMP int __cdecl	_wcsicmp (const wchar_t*, const wchar_t*);
-_CRTIMP int __cdecl	_wcsicoll (const wchar_t*, const wchar_t*);
-_CRTIMP wchar_t* __cdecl _wcslwr (wchar_t*);
-_CRTIMP int __cdecl	_wcsnicmp (const wchar_t*, const wchar_t*, size_t);
-_CRTIMP wchar_t* __cdecl _wcsnset (wchar_t*, wchar_t, size_t);
-_CRTIMP wchar_t* __cdecl _wcsrev (wchar_t*);
-_CRTIMP wchar_t* __cdecl _wcsset (wchar_t*, wchar_t);
-_CRTIMP wchar_t* __cdecl _wcsupr (wchar_t*);
-
-#ifdef __MSVCRT__
-_CRTIMP int __cdecl  _wcsncoll(const wchar_t*, const wchar_t*, size_t);
-_CRTIMP int __cdecl  _wcsnicoll(const wchar_t*, const wchar_t*, size_t);
-#endif
-
-
-#endif	/* Not __STRICT_ANSI__ */
-
-
-#ifndef	__STRICT_ANSI__
-#ifndef	_NO_OLDNAMES
-
-/*
- * Non-underscored versions of non-ANSI functions. They live in liboldnames.a
- * and provide a little extra portability. Also a few extra UNIX-isms like
- * strcasecmp.
- */
-
-_CRTIMP void* __cdecl	memccpy (void*, const void*, int, size_t);
-_CRTIMP int __cdecl	memicmp (const void*, const void*, size_t);
-_CRTIMP char* __cdecl	strdup (const char*);
-_CRTIMP int __cdecl	strcmpi (const char*, const char*);
-_CRTIMP int __cdecl	stricmp (const char*, const char*);
-__CRT_INLINE int __cdecl
-strcasecmp (const char * __sz1, const char * __sz2)
-  {return _stricmp (__sz1, __sz2);}
-_CRTIMP int __cdecl	stricoll (const char*, const char*);
-_CRTIMP char* __cdecl	strlwr (char*);
-_CRTIMP int __cdecl	strnicmp (const char*, const char*, size_t);
-__CRT_INLINE int __cdecl
-strncasecmp (const char * __sz1, const char * __sz2, size_t __sizeMaxCompare)
-  {return _strnicmp (__sz1, __sz2, __sizeMaxCompare);}
-_CRTIMP char* __cdecl	strnset (char*, int, size_t);
-_CRTIMP char* __cdecl	strrev (char*);
-_CRTIMP char* __cdecl	strset (char*, int);
-_CRTIMP char* __cdecl	strupr (char*);
-#ifndef _UWIN
-_CRTIMP void __cdecl	swab (const char*, char*, size_t);
-#endif /* _UWIN */
-
-/* NOTE: There is no _wcscmpi, but this is for compatibility. */
-__CRT_INLINE int __cdecl
-wcscmpi (const wchar_t * __ws1, const wchar_t * __ws2)
-  {return _wcsicmp (__ws1, __ws2);}
-_CRTIMP wchar_t* __cdecl wcsdup (wchar_t*);
-_CRTIMP int __cdecl	wcsicmp (const wchar_t*, const wchar_t*);
-_CRTIMP int __cdecl	wcsicoll (const wchar_t*, const wchar_t*);
-_CRTIMP wchar_t* __cdecl wcslwr (wchar_t*);
-_CRTIMP int __cdecl	wcsnicmp (const wchar_t*, const wchar_t*, size_t);
-_CRTIMP wchar_t* __cdecl wcsnset (wchar_t*, wchar_t, size_t);
-_CRTIMP wchar_t* __cdecl wcsrev (wchar_t*);
-_CRTIMP wchar_t* __cdecl wcsset (wchar_t*, wchar_t);
-_CRTIMP wchar_t* __cdecl wcsupr (wchar_t*);
-
-#endif	/* Not _NO_OLDNAMES */
-#endif	/* Not strict ANSI */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _STRING_H_ */
-
diff --git a/winsup/mingw/include/strings.h b/winsup/mingw/include/strings.h
deleted file mode 100644
index 2a777c2d7..000000000
--- a/winsup/mingw/include/strings.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-    File: strings.h
-    Copyright: Public Domain
-
-    This file is provided because non ANSI fuctions are described in string.h 
-    that belong in strings.h.  These functions are provided for in the OLDNAME
-    libraries.
-*/
-#if !defined(_STRINGS_H_)
-# define _STRINGS_H_ 1
-# include <string.h>
-#endif
diff --git a/winsup/mingw/include/sys/fcntl.h b/winsup/mingw/include/sys/fcntl.h
deleted file mode 100644
index b343f272f..000000000
--- a/winsup/mingw/include/sys/fcntl.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * This file is part of the Mingw32 package.
- *
- * This fcntl.h maps to the root fcntl.h
- */
-#ifndef __STRICT_ANSI__
-#include <fcntl.h>
-#endif
diff --git a/winsup/mingw/include/sys/file.h b/winsup/mingw/include/sys/file.h
deleted file mode 100644
index 96c49e117..000000000
--- a/winsup/mingw/include/sys/file.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * This file is part of the Mingw32 package.
- *
- * This file.h maps to the root fcntl.h
- * TODO?
- */
-#ifndef __STRICT_ANSI__
-#include <fcntl.h>
-#endif
diff --git a/winsup/mingw/include/sys/locking.h b/winsup/mingw/include/sys/locking.h
deleted file mode 100644
index 48e08e2c1..000000000
--- a/winsup/mingw/include/sys/locking.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * locking.h
- *
- * Constants for the mode parameter of the locking function.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef	_LOCKING_H_
-#define	_LOCKING_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define	_LK_UNLCK	0	/* Unlock */
-#define	_LK_LOCK	1	/* Lock */
-#define	_LK_NBLCK	2	/* Non-blocking lock */
-#define	_LK_RLCK	3	/* Lock for read only */
-#define	_LK_NBRLCK	4	/* Non-blocking lock for read only */
-
-#ifndef	NO_OLDNAMES
-#define	LK_UNLCK	_LK_UNLCK
-#define	LK_LOCK		_LK_LOCK
-#define	LK_NBLCK	_LK_NBLCK
-#define	LK_RLCK		_LK_RLCK
-#define	LK_NBRLCK	_LK_NBRLCK
-#endif	/* Not NO_OLDNAMES */
-
-#endif	/* Not _LOCKING_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/sys/param.h b/winsup/mingw/include/sys/param.h
deleted file mode 100644
index 5ff4c8779..000000000
--- a/winsup/mingw/include/sys/param.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * param.h
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Earnie Boyd <earnie@users.sf.net>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _SYS_PARAM_H
-#define _SYS_PARAM_H
-
-#include <sys/types.h>
-#include <limits.h>
-
-#ifndef __STRICT_ANSI__
-/* These are useful for cross-compiling */ 
-#define BIG_ENDIAN	4321
-#define LITTLE_ENDIAN	1234
-#define BYTE_ORDER	LITTLE_ENDIAN
-
-#define MAXPATHLEN PATH_MAX
-
-#endif
-
-#endif
diff --git a/winsup/mingw/include/sys/stat.h b/winsup/mingw/include/sys/stat.h
deleted file mode 100644
index f851c25f4..000000000
--- a/winsup/mingw/include/sys/stat.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * stat.h
- *
- * Symbolic constants for opening and creating files, also stat, fstat and
- * chmod functions.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef __STRICT_ANSI__
-
-#ifndef _STAT_H_
-#define _STAT_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define __need_size_t
-#define __need_wchar_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif /* Not RC_INVOKED */
-
-#include <sys/types.h>
-
-/*
- * Constants for the stat st_mode member.
- */
-#define	_S_IFIFO	0x1000	/* FIFO */
-#define	_S_IFCHR	0x2000	/* Character */
-#define	_S_IFBLK	0x3000	/* Block: Is this ever set under w32? */
-#define	_S_IFDIR	0x4000	/* Directory */
-#define	_S_IFREG	0x8000	/* Regular */
-
-#define	_S_IFMT		0xF000	/* File type mask */
-
-#define	_S_IEXEC	0x0040
-#define	_S_IWRITE	0x0080
-#define	_S_IREAD	0x0100
-
-#define	_S_IRWXU	(_S_IREAD | _S_IWRITE | _S_IEXEC)
-#define	_S_IXUSR	_S_IEXEC
-#define	_S_IWUSR	_S_IWRITE
-#define	_S_IRUSR	_S_IREAD
-
-#define	_S_ISDIR(m)	(((m) & _S_IFMT) == _S_IFDIR)
-#define	_S_ISFIFO(m)	(((m) & _S_IFMT) == _S_IFIFO)
-#define	_S_ISCHR(m)	(((m) & _S_IFMT) == _S_IFCHR)
-#define	_S_ISBLK(m)	(((m) & _S_IFMT) == _S_IFBLK)
-#define	_S_ISREG(m)	(((m) & _S_IFMT) == _S_IFREG)
-
-#ifndef _NO_OLDNAMES
-
-#define	S_IFIFO		_S_IFIFO
-#define	S_IFCHR		_S_IFCHR
-#define	S_IFBLK		_S_IFBLK
-#define	S_IFDIR		_S_IFDIR
-#define	S_IFREG		_S_IFREG
-#define	S_IFMT		_S_IFMT
-#define	S_IEXEC		_S_IEXEC
-#define	S_IWRITE	_S_IWRITE
-#define	S_IREAD		_S_IREAD
-#define	S_IRWXU		_S_IRWXU
-#define	S_IXUSR		_S_IXUSR
-#define	S_IWUSR		_S_IWUSR
-#define	S_IRUSR		_S_IRUSR
-
-#define	S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
-#define	S_ISFIFO(m)	(((m) & S_IFMT) == S_IFIFO)
-#define	S_ISCHR(m)	(((m) & S_IFMT) == S_IFCHR)
-#define	S_ISBLK(m)	(((m) & S_IFMT) == S_IFBLK)
-#define	S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)
-
-#endif	/* Not _NO_OLDNAMES */
-
-#ifndef RC_INVOKED
-
-#ifndef _STAT_DEFINED
-/*
- * The structure manipulated and returned by stat and fstat.
- *
- * NOTE: If called on a directory the values in the time fields are not only
- * invalid, they will cause localtime et. al. to return NULL. And calling
- * asctime with a NULL pointer causes an Invalid Page Fault. So watch it!
- */
-struct _stat
-{
-	_dev_t	st_dev;		/* Equivalent to drive number 0=A 1=B ... */
-	_ino_t	st_ino;		/* Always zero ? */
-	_mode_t	st_mode;	/* See above constants */
-	short	st_nlink;	/* Number of links. */
-	short	st_uid;		/* User: Maybe significant on NT ? */
-	short	st_gid;		/* Group: Ditto */
-	_dev_t	st_rdev;	/* Seems useless (not even filled in) */
-	_off_t	st_size;	/* File size in bytes */
-	time_t	st_atime;	/* Accessed date (always 00:00 hrs local
-				 * on FAT) */
-	time_t	st_mtime;	/* Modified time */
-	time_t	st_ctime;	/* Creation time */
-};
-
-struct stat
-{
-	_dev_t	st_dev;		/* Equivalent to drive number 0=A 1=B ... */
-	_ino_t	st_ino;		/* Always zero ? */
-	_mode_t	st_mode;	/* See above constants */
-	short	st_nlink;	/* Number of links. */
-	short	st_uid;		/* User: Maybe significant on NT ? */
-	short	st_gid;		/* Group: Ditto */
-	_dev_t	st_rdev;	/* Seems useless (not even filled in) */
-	_off_t	st_size;	/* File size in bytes */
-	time_t	st_atime;	/* Accessed date (always 00:00 hrs local
-				 * on FAT) */
-	time_t	st_mtime;	/* Modified time */
-	time_t	st_ctime;	/* Creation time */
-};
-#if defined (__MSVCRT__)
-struct _stati64 {
-    _dev_t st_dev;
-    _ino_t st_ino;
-    unsigned short st_mode;
-    short st_nlink;
-    short st_uid;
-    short st_gid;
-    _dev_t st_rdev;
-    __int64 st_size;
-    time_t st_atime;
-    time_t st_mtime;
-    time_t st_ctime;
-};
-#endif /* __MSVCRT__ */
-#define _STAT_DEFINED
-#endif /* _STAT_DEFINED */
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-_CRTIMP int __cdecl	_fstat (int, struct _stat*);
-_CRTIMP int __cdecl	_chmod (const char*, int);
-_CRTIMP int __cdecl	_stat (const char*, struct _stat*);
-
-#if defined (__MSVCRT__)
-_CRTIMP int __cdecl  _fstati64(int, struct _stati64 *);
-_CRTIMP int __cdecl  _stati64(const char *, struct _stati64 *);
-#if !defined ( _WSTAT_DEFINED) /* also declared in wchar.h */
-_CRTIMP int __cdecl	_wstat(const wchar_t*, struct _stat*);
-_CRTIMP int __cdecl	_wstati64 (const wchar_t*, struct _stati64*);
-#define _WSTAT_DEFINED
-#endif /* _WSTAT_DEFIND */
-#endif /* __MSVCRT__ */
-
-#ifndef	_NO_OLDNAMES
-
-/* These functions live in liboldnames.a. */
-_CRTIMP int __cdecl	fstat (int, struct stat*);
-_CRTIMP int __cdecl	chmod (const char*, int);
-_CRTIMP int __cdecl	stat (const char*, struct stat*);
-
-#endif	/* Not _NO_OLDNAMES */
-
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _STAT_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/sys/time.h b/winsup/mingw/include/sys/time.h
deleted file mode 100644
index dfa35d18b..000000000
--- a/winsup/mingw/include/sys/time.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#include <time.h>
-
-#ifndef __STRICT_ANSI__
-#ifndef _TIMEVAL_DEFINED /* also in winsock[2].h */
-#define _TIMEVAL_DEFINED
-struct timeval {
-  long tv_sec;
-  long tv_usec;
-};
-#define timerisset(tvp)	 ((tvp)->tv_sec || (tvp)->tv_usec)
-#define timercmp(tvp, uvp, cmp) \
-	(((tvp)->tv_sec != (uvp)->tv_sec) ? \
-	((tvp)->tv_sec cmp (uvp)->tv_sec) : \
-	((tvp)->tv_usec cmp (uvp)->tv_usec))
-#define timerclear(tvp)	 (tvp)->tv_sec = (tvp)->tv_usec = 0
-#endif /* _TIMEVAL_DEFINED */
-
-#endif /* __STRICT_ANSI__ */
diff --git a/winsup/mingw/include/sys/timeb.h b/winsup/mingw/include/sys/timeb.h
deleted file mode 100644
index 16b4dc0a4..000000000
--- a/winsup/mingw/include/sys/timeb.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * timeb.h
- *
- * Support for the UNIX System V ftime system call.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef	_TIMEB_H_
-#define	_TIMEB_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#ifndef	RC_INVOKED
-
-/*
- * TODO: Structure not tested.
- */
-struct _timeb
-{
-	long	time;
-	short	millitm;
-	short	timezone;
-	short	dstflag;
-};
-
-#ifndef	_NO_OLDNAMES
-/*
- * TODO: Structure not tested.
- */
-struct timeb
-{
-	long	time;
-	short	millitm;
-	short	timezone;
-	short	dstflag;
-};
-#endif
-
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* TODO: Not tested. */
-_CRTIMP void __cdecl	_ftime (struct _timeb*);
-
-#ifndef	_NO_OLDNAMES
-_CRTIMP void __cdecl	ftime (struct timeb*);
-#endif	/* Not _NO_OLDNAMES */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _TIMEB_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/sys/types.h b/winsup/mingw/include/sys/types.h
deleted file mode 100644
index 6c39fd8e3..000000000
--- a/winsup/mingw/include/sys/types.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * types.h
- *
- * The definition of constants, data types and global variables.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *  Lots of types supplied by Pedro A. Aranda <paag@tid.es>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	_TYPES_H_
-#define	_TYPES_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define __need_wchar_t
-#define __need_size_t
-#define __need_ptrdiff_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif	/* Not RC_INVOKED */
-
-#ifndef RC_INVOKED
-
-#ifndef _TIME_T_DEFINED
-typedef	long	time_t;
-#define	_TIME_T_DEFINED
-#endif
-
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef	_OFF_T_
-#define	_OFF_T_
-typedef long _off_t;
-
-#ifndef	_NO_OLDNAMES
-typedef _off_t	off_t;
-#endif
-#endif	/* Not _OFF_T_ */
-
-
-#ifndef _DEV_T_
-#define	_DEV_T_
-#ifdef __MSVCRT__
-typedef unsigned int _dev_t;
-#else
-typedef short _dev_t;
-#endif
-
-#ifndef	_NO_OLDNAMES
-typedef _dev_t	dev_t;
-#endif
-#endif	/* Not _DEV_T_ */
-
-
-#ifndef _INO_T_
-#define	_INO_T_
-typedef short _ino_t;
-
-#ifndef	_NO_OLDNAMES
-typedef _ino_t	ino_t;
-#endif
-#endif	/* Not _INO_T_ */
-
-
-#ifndef _PID_T_
-#define	_PID_T_
-typedef int	_pid_t;
-
-#ifndef	_NO_OLDNAMES
-typedef _pid_t	pid_t;
-#endif
-#endif	/* Not _PID_T_ */
-
-
-#ifndef _MODE_T_
-#define	_MODE_T_
-typedef unsigned short _mode_t;
-
-#ifndef	_NO_OLDNAMES
-typedef _mode_t	mode_t;
-#endif
-#endif	/* Not _MODE_T_ */
-
-
-#ifndef _SIGSET_T_
-#define	_SIGSET_T_
-typedef int	_sigset_t;
-
-#ifndef	_NO_OLDNAMES
-typedef _sigset_t	sigset_t;
-#endif
-#endif	/* Not _SIGSET_T_ */
-
-#ifndef _SSIZE_T_
-#define _SSIZE_T_
-typedef long _ssize_t;
-
-#ifndef	_NO_OLDNAMES
-typedef _ssize_t ssize_t;
-#endif
-#endif /* Not _SSIZE_T_ */ 
-
-#endif	/* Not __STRICT_ANSI__ */
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _TYPES_H_ */
diff --git a/winsup/mingw/include/sys/unistd.h b/winsup/mingw/include/sys/unistd.h
deleted file mode 100644
index ed122d9dd..000000000
--- a/winsup/mingw/include/sys/unistd.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * This file is part of the Mingw32 package.
- *
- * unistd.h maps (roughly) to io.h
- */
-#ifndef __STRICT_ANSI__
-#include <io.h>
-#endif
-
diff --git a/winsup/mingw/include/sys/utime.h b/winsup/mingw/include/sys/utime.h
deleted file mode 100644
index 1ddeabafa..000000000
--- a/winsup/mingw/include/sys/utime.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * utime.h
- *
- * Support for the utime function.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef	_UTIME_H_
-#define	_UTIME_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define __need_wchar_t
-#define __need_size_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif	/* Not RC_INVOKED */
-#include <sys/types.h>
-
-#ifndef	RC_INVOKED
-
-/*
- * Structure used by _utime function.
- */
-struct _utimbuf
-{
-	time_t	actime;		/* Access time */
-	time_t	modtime;	/* Modification time */
-};
-
-
-#ifndef	_NO_OLDNAMES
-/* NOTE: Must be the same as _utimbuf above. */
-struct utimbuf
-{
-	time_t	actime;
-	time_t	modtime;
-};
-#endif	/* Not _NO_OLDNAMES */
-
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-_CRTIMP int __cdecl	_utime (const char*, struct _utimbuf*);
-_CRTIMP int __cdecl	_futime (int, struct _utimbuf*);
-
-/* The wide character version, only available for MSVCRT versions of the
- * C runtime library. */
-#ifdef __MSVCRT__
-_CRTIMP int __cdecl	_wutime (const wchar_t*, struct _utimbuf*);
-#endif /* MSVCRT runtime */
-#ifndef	_NO_OLDNAMES
-_CRTIMP int __cdecl	utime (const char*, struct utimbuf*);
-#endif	/* Not _NO_OLDNAMES */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _UTIME_H_ */
-
-#endif	/* Not __STRICT_ANSI__ */
-
diff --git a/winsup/mingw/include/tchar.h b/winsup/mingw/include/tchar.h
deleted file mode 100644
index d0c96dbbe..000000000
--- a/winsup/mingw/include/tchar.h
+++ /dev/null
@@ -1,409 +0,0 @@
-/* 
- * tchar.h
- *
- * Unicode mapping layer for the standard C library. By including this
- * file and using the 't' names for string functions
- * (eg. _tprintf) you can make code which can be easily adapted to both
- * Unicode and non-unicode environments. In a unicode enabled compile define
- * _UNICODE before including tchar.h, otherwise the standard non-unicode
- * library functions will be used.
- *
- * Note that you still need to include string.h or stdlib.h etc. to define
- * the appropriate functions. Also note that there are several defines
- * included for non-ANSI functions which are commonly available (but using
- * the convention of prepending an underscore to non-ANSI library function
- * names).
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	_TCHAR_H_
-#define _TCHAR_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-/*
- * NOTE: This tests _UNICODE, which is different from the UNICODE define
- *       used to differentiate Win32 API calls.
- */
-#ifdef	_UNICODE
-
-
-/*
- * Use TCHAR instead of char or wchar_t. It will be appropriately translated
- * if _UNICODE is correctly defined (or not).
- */
-#ifndef _TCHAR_DEFINED
-#ifndef RC_INVOKED
-typedef	wchar_t	TCHAR;
-typedef wchar_t _TCHAR;
-#endif	/* Not RC_INVOKED */
-#define _TCHAR_DEFINED
-#endif
-
-
-/*
- * __TEXT is a private macro whose specific use is to force the expansion of a
- * macro passed as an argument to the macros _T or _TEXT.  DO NOT use this
- * macro within your programs.  It's name and function could change without
- * notice.
- */
-#define	__TEXT(q)	L##q
-
-/*  for porting from other Windows compilers */
-#if 0  /* no  wide startup module */
-#define _tmain      wmain
-#define _tWinMain   wWinMain
-#define _tenviron   _wenviron
-#define __targv     __wargv
-#endif
-
-/*
- * Unicode functions
- */
-#define	_tprintf	wprintf
-#define	_ftprintf	fwprintf
-#define	_stprintf	swprintf
-#define	_sntprintf	_snwprintf
-#define	_vtprintf	vwprintf
-#define	_vftprintf	vfwprintf
-#define _vstprintf	vswprintf
-#define	_vsntprintf	_vsnwprintf
-#define	_tscanf		wscanf
-#define	_ftscanf	fwscanf
-#define	_stscanf	swscanf
-#define	_fgettc		fgetwc
-#define	_fgettchar	_fgetwchar
-#define	_fgetts		fgetws
-#define	_fputtc		fputwc
-#define	_fputtchar	_fputwchar
-#define	_fputts		fputws
-#define	_gettc		getwc
-#define	_getts		_getws
-#define	_puttc		putwc
-#define	_putts		_putws
-#define	_ungettc	ungetwc
-#define	_tcstod		wcstod
-#define	_tcstol		wcstol
-#define _tcstoul	wcstoul
-#define	_itot		_itow
-#define	_ltot		_ltow
-#define	_ultot		_ultow
-#define	_ttoi		_wtoi
-#define	_ttol		_wtol
-#define	_tcscat		wcscat
-#define _tcschr		wcschr
-#define _tcscmp		wcscmp
-#define _tcscpy		wcscpy
-#define _tcscspn	wcscspn
-#define	_tcslen		wcslen
-#define	_tcsncat	wcsncat
-#define	_tcsncmp	wcsncmp
-#define	_tcsncpy	wcsncpy
-#define	_tcspbrk	wcspbrk
-#define	_tcsrchr	wcsrchr
-#define _tcsspn		wcsspn
-#define	_tcsstr		wcsstr
-#define _tcstok		wcstok
-#define	_tcsdup		_wcsdup
-#define	_tcsicmp	_wcsicmp
-#define	_tcsnicmp	_wcsnicmp
-#define	_tcsnset	_wcsnset
-#define	_tcsrev		_wcsrev
-#define _tcsset		_wcsset
-#define	_tcslwr		_wcslwr
-#define	_tcsupr		_wcsupr
-#define	_tcsxfrm	wcsxfrm
-#define	_tcscoll	wcscoll
-#define	_tcsicoll	_wcsicoll
-#define	_istalpha	iswalpha
-#define	_istupper	iswupper
-#define	_istlower	iswlower
-#define	_istdigit	iswdigit
-#define	_istxdigit	iswxdigit
-#define	_istspace	iswspace
-#define	_istpunct	iswpunct
-#define	_istalnum	iswalnum
-#define	_istprint	iswprint
-#define	_istgraph	iswgraph
-#define	_istcntrl	iswcntrl
-#define	_istascii	iswascii
-#define _totupper	towupper
-#define	_totlower	towlower
-#define _tcsftime	wcsftime
-/* Macro functions */ 
-#define _tcsdec     _wcsdec
-#define _tcsinc     _wcsinc
-#define _tcsnbcnt   _wcsncnt
-#define _tcsnccnt   _wcsncnt
-#define _tcsnextc   _wcsnextc
-#define _tcsninc    _wcsninc
-#define _tcsspnp    _wcsspnp
-#define _wcsdec(_wcs1, _wcs2) ((_wcs1)>=(_wcs2) ? NULL : (_wcs2)-1)
-#define _wcsinc(_wcs)  ((_wcs)+1)
-#define _wcsnextc(_wcs) ((unsigned int) *(_wcs))
-#define _wcsninc(_wcs, _inc) (((_wcs)+(_inc)))
-#define _wcsncnt(_wcs, _cnt) ((wcslen(_wcs)>_cnt) ? _count : wcslen(_wcs))
-#define _wcsspnp(_wcs1, _wcs2) ((*((_wcs1)+wcsspn(_wcs1,_wcs2))) ? ((_wcs1)+wcsspn(_wcs1,_wcs2)) : NULL)
-
-#if 1  /* defined __MSVCRT__ */
-/*
- *   These wide functions not in crtdll.dll.
- *   Define macros anyway so that _wfoo rather than _tfoo is undefined
- */
-#define _ttoi64     _wtoi64
-#define _i64tot     _i64tow
-#define _ui64tot    _ui64tow
-#define	_tasctime	_wasctime
-#define	_tctime		_wctime
-#define	_tstrdate	_wstrdate
-#define	_tstrtime	_wstrtime
-#define	_tutime		_wutime
-#define _tcsnccoll  _wcsncoll
-#define _tcsncoll   _wcsncoll
-#define _tcsncicoll _wcsnicoll
-#define _tcsnicoll  _wcsnicoll
-#define _taccess    _waccess
-#define _tchmod     _wchmod
-#define _tcreat     _wcreat
-#define _tfindfirst _wfindfirst
-#define _tfindnext  _wfindnext
-#define _tfdopen    _wfdopen
-#define _tfopen     _wfopen
-#define _tgetenv    _wgetenv
-#define _tputenv    _wputenv
-#define _tsearchenv _wsearchenv
-#define _tmakepath  _wmakepath
-#define _tsplitpath _wsplitpath
-#define _tfullpath  _wfullpath
-#define _tmktemp    _wmktemp
-#define _topen      _wopen
-#define _tremove    _wremove
-#define _trename    _wrename
-#define _tsopen     _wsopen
-#define _tsetlocale _wsetlocale
-#define _tunlink    _wunlink
-#define _tfinddata_t    _wfinddata_t
-#define _tfindfirsti64  _wfindfirsti64
-#define _tfindnexti64   _wfindnexti64
-#define _tfinddatai64_t _wfinddatai64_t
-#define _tchdir		_wchdir
-#define _tgetcwd	_wgetcwd
-#define _tgetdcwd	_wgetdcwd
-#define _tmkdir		_wmkdir
-#define _trmdir		_wrmdir
-#define _tstat		_wstat
-#endif  /* __MSVCRT__ */
-
-/* dirent structures and functions */
-#define _tdirent	_wdirent
-#define _TDIR 		_WDIR
-#define _topendir	_wopendir
-#define _tclosedir	_wclosedir
-#define _treaddir	_wreaddir
-#define _trewinddir	_wrewinddir
-#define _ttelldir	_wtelldir
-#define _tseekdir	_wseekdir
-#else	/* Not _UNICODE */
-
-/*
- * TCHAR, the type you should use instead of char.
- */
-#ifndef _TCHAR_DEFINED
-#ifndef RC_INVOKED
-typedef char	TCHAR;
-typedef char	_TCHAR;
-#endif
-#define _TCHAR_DEFINED
-#endif
-
-/*
- * __TEXT is a private macro whose specific use is to force the expansion of a
- * macro passed as an argument to the macros _T or _TEXT.  DO NOT use this
- * macro within your programs.  It's name and function could change without
- * notice.
- */
-#define	__TEXT(q)	q
-
-/*  for porting from other Windows compilers */
-#define _tmain      main
-#define _tWinMain   WinMain
-#define _tenviron  _environ
-#define __targv     __argv
-
-/*
- * Non-unicode (standard) functions
- */
-
-#define	_tprintf	printf
-#define _ftprintf	fprintf
-#define	_stprintf	sprintf
-#define	_sntprintf	_snprintf
-#define	_vtprintf	vprintf
-#define	_vftprintf	vfprintf
-#define _vstprintf	vsprintf
-#define	_vsntprintf	_vsnprintf
-#define	_tscanf		scanf
-#define	_ftscanf	fscanf
-#define	_stscanf	sscanf
-#define	_fgettc		fgetc
-#define	_fgettchar	_fgetchar
-#define	_fgetts		fgets
-#define	_fputtc		fputc
-#define	_fputtchar	_fputchar
-#define	_fputts		fputs
-#define _tfdopen	_fdopen
-#define	_tfopen		fopen
-#define	_tgetenv	getenv
-#define	_tputenv	_putenv
-#define	_tsearchenv	_searchenv
-#define	_tmakepath	_makepath
-#define	_tsplitpath	_splitpath
-#define	_tfullpath	_fullpath
-#define	_gettc		getc
-#define	_getts		gets
-#define	_puttc		putc
-#define	_putts		puts
-#define	_ungettc	ungetc
-#define	_tcstod		strtod
-#define	_tcstol		strtol
-#define _tcstoul	strtoul
-#define	_itot		_itoa
-#define	_ltot		_ltoa
-#define	_ultot		_ultoa
-#define	_ttoi		atoi
-#define	_ttol		atol
-#define	_tcscat		strcat
-#define _tcschr		strchr
-#define _tcscmp		strcmp
-#define _tcscpy		strcpy
-#define _tcscspn	strcspn
-#define	_tcslen		strlen
-#define	_tcsncat	strncat
-#define	_tcsncmp	strncmp
-#define	_tcsncpy	strncpy
-#define	_tcspbrk	strpbrk
-#define	_tcsrchr	strrchr
-#define _tcsspn		strspn
-#define	_tcsstr		strstr
-#define _tcstok		strtok
-#define	_tcsdup		_strdup
-#define	_tcsicmp	_stricmp
-#define	_tcsnicmp	_strnicmp
-#define	_tcsnset	_strnset
-#define	_tcsrev		_strrev
-#define _tcsset		_strset
-#define	_tcslwr		_strlwr
-#define	_tcsupr		_strupr
-#define	_tcsxfrm	strxfrm
-#define	_tcscoll	strcoll
-#define	_tcsicoll	_stricoll
-#define	_istalpha	isalpha
-#define	_istupper	isupper
-#define	_istlower	islower
-#define	_istdigit	isdigit
-#define	_istxdigit	isxdigit
-#define	_istspace	isspace
-#define	_istpunct	ispunct
-#define	_istalnum	isalnum
-#define	_istprint	isprint
-#define	_istgraph	isgraph
-#define	_istcntrl	iscntrl
-#define	_istascii	isascii
-#define _totupper	toupper
-#define	_totlower	tolower
-#define	_tasctime	asctime
-#define	_tctime		ctime
-#define	_tstrdate	_strdate
-#define	_tstrtime	_strtime
-#define	_tutime		_utime
-#define _tcsftime	strftime
-/* Macro functions */ 
-#define _tcsdec     _strdec
-#define _tcsinc     _strinc
-#define _tcsnbcnt   _strncnt
-#define _tcsnccnt   _strncnt
-#define _tcsnextc   _strnextc
-#define _tcsninc    _strninc
-#define _tcsspnp    _strspnp
-#define _strdec(_str1, _str2) ((_str1)>=(_str2) ? NULL : (_str2)-1)
-#define _strinc(_str)  ((_str)+1)
-#define _strnextc(_str) ((unsigned int) *(_str))
-#define _strninc(_str, _inc) (((_str)+(_inc)))
-#define _strncnt(_str, _cnt) ((strlen(_str)>_cnt) ? _count : strlen(_str))
-#define _strspnp(_str1, _str2) ((*((_str1)+strspn(_str1,_str2))) ? ((_str1)+strspn(_str1,_str2)) : NULL)
-
-#define _tchmod     _chmod
-#define _tcreat     _creat
-#define _tfindfirst _findfirst
-#define _tfindnext  _findnext
-#define _tmktemp    _mktemp
-#define _topen      _open
-#define _taccess    _access
-#define _tremove    remove
-#define _trename    rename
-#define _tsopen     _sopen
-#define _tsetlocale setlocale
-#define _tunlink    _unlink
-#define _tfinddata_t    _finddata_t
-#define _tchdir	    _chdir
-#define _tgetcwd    _getcwd
-#define _tgetdcwd   _getdcwd
-#define _tmkdir	    _mkdir
-#define _trmdir	    _rmdir
-#define _tstat      _stat
-
-#if 1  /* defined __MSVCRT__ */
-/* Not in crtdll.dll. Define macros anyway? */
-#define _ttoi64     _atoi64
-#define _i64tot     _i64toa
-#define _ui64tot    _ui64toa
-#define _tcsnccoll  _strncoll
-#define _tcsncoll   _strncoll
-#define _tcsncicoll _strnicoll
-#define _tcsnicoll  _strnicoll
-#define _tfindfirsti64  _findfirsti64
-#define _tfindnexti64   _findnexti64
-#define _tfinddatai64_t _finddatai64_t
-#endif  /* __MSVCRT__ */
-
-/* dirent structures and functions */
-#define _tdirent	dirent
-#define _TDIR 		DIR
-#define _topendir	opendir
-#define _tclosedir	closedir
-#define _treaddir	readdir
-#define _trewinddir	rewinddir
-#define _ttelldir	telldir
-#define _tseekdir	seekdir
-
-#endif	/* Not _UNICODE */
-
-/*
- * UNICODE a constant string when _UNICODE is defined else returns the string
- * unmodified.  Also defined in w32api/winnt.h.
- */
-#define _TEXT(x)	__TEXT(x)
-#define	_T(x)		__TEXT(x)
-
-#endif	/* Not _TCHAR_H_ */
-
diff --git a/winsup/mingw/include/time.h b/winsup/mingw/include/time.h
deleted file mode 100644
index 45d6b0e1c..000000000
--- a/winsup/mingw/include/time.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* 
- * time.h
- *
- * Date and time functions and types.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	_TIME_H_
-#define	_TIME_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define __need_wchar_t
-#define __need_size_t
-#define __need_NULL
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif	/* Not RC_INVOKED */
-
-/*
- * Need a definition of time_t.
- */
-#include <sys/types.h>
-
-/*
- * Number of clock ticks per second. A clock tick is the unit by which
- * processor time is measured and is returned by 'clock'.
- */
-#define	CLOCKS_PER_SEC	((clock_t)1000)
-#define	CLK_TCK		CLOCKS_PER_SEC
-
-
-#ifndef RC_INVOKED
-
-/*
- * A type for storing the current time and date. This is the number of
- * seconds since midnight Jan 1, 1970.
- * NOTE: Normally this is defined by the above include of sys/types.h
- */
-#ifndef _TIME_T_DEFINED
-typedef	long	time_t;
-#define _TIME_T_DEFINED
-#endif
-
-/*
- * A type for measuring processor time (in clock ticks).
- */
-#ifndef _CLOCK_T_DEFINED
-typedef	long	clock_t;
-#define _CLOCK_T_DEFINED
-#endif
-
-
-/*
- * A structure for storing all kinds of useful information about the
- * current (or another) time.
- */
-struct tm
-{
-	int	tm_sec;		/* Seconds: 0-59 (K&R says 0-61?) */
-	int	tm_min;		/* Minutes: 0-59 */
-	int	tm_hour;	/* Hours since midnight: 0-23 */
-	int	tm_mday;	/* Day of the month: 1-31 */
-	int	tm_mon;		/* Months *since* january: 0-11 */
-	int	tm_year;	/* Years since 1900 */
-	int	tm_wday;	/* Days since Sunday (0-6) */
-	int	tm_yday;	/* Days since Jan. 1: 0-365 */
-	int	tm_isdst;	/* +1 Daylight Savings Time, 0 No DST,
-				 * -1 don't know */
-};
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-_CRTIMP clock_t __cdecl	clock (void);
-_CRTIMP time_t __cdecl	time (time_t*);
-_CRTIMP double __cdecl	difftime (time_t, time_t);
-_CRTIMP time_t __cdecl	mktime (struct tm*);
-
-/*
- * These functions write to and return pointers to static buffers that may
- * be overwritten by other function calls. Yikes!
- *
- * NOTE: localtime, and perhaps the others of the four functions grouped
- * below may return NULL if their argument is not 'acceptable'. Also note
- * that calling asctime with a NULL pointer will produce an Invalid Page
- * Fault and crap out your program. Guess how I know. Hint: stat called on
- * a directory gives 'invalid' times in st_atime etc...
- */
-_CRTIMP char* __cdecl		asctime (const struct tm*);
-_CRTIMP char* __cdecl		ctime (const time_t*);
-_CRTIMP struct tm*  __cdecl	gmtime (const time_t*);
-_CRTIMP struct tm*  __cdecl	localtime (const time_t*);
-
-
-_CRTIMP size_t __cdecl	strftime (char*, size_t, const char*, const struct tm*);
-
-_CRTIMP size_t __cdecl	wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*);
-
-#ifndef __STRICT_ANSI__
-extern _CRTIMP void __cdecl	_tzset (void);
-
-#ifndef _NO_OLDNAMES
-extern _CRTIMP void __cdecl	tzset (void);
-#endif
-
-_CRTIMP char* __cdecl	_strdate(char*);
-_CRTIMP char* __cdecl	_strtime(char*);
-
-#endif	/* Not __STRICT_ANSI__ */
-
-/*
- * _daylight: non zero if daylight savings time is used.
- * _timezone: difference in seconds between GMT and local time.
- * _tzname: standard/daylight savings time zone names (an array with two
- *          elements).
- */
-#ifdef __MSVCRT__
-
-/* These are for compatibility with pre-VC 5.0 suppied MSVCRT. */
-extern _CRTIMP int* __cdecl	__p__daylight (void);
-extern _CRTIMP long* __cdecl	__p__timezone (void);
-extern _CRTIMP char** __cdecl	__p__tzname (void);
-
-__MINGW_IMPORT int	_daylight;
-__MINGW_IMPORT long	_timezone;
-__MINGW_IMPORT char 	*_tzname[2];
-
-#else /* not __MSVCRT (ie. crtdll) */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern int*	_imp___daylight_dll;
-extern long*	_imp___timezone_dll;
-extern char**	_imp___tzname;
-
-#define _daylight	(*_imp___daylight_dll)
-#define _timezone	(*_imp___timezone_dll)
-#define _tzname		(*_imp___tzname)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT int	_daylight_dll;
-__MINGW_IMPORT long	_timezone_dll;
-__MINGW_IMPORT char*	_tzname[2];
-
-#define _daylight	_daylight_dll
-#define _timezone	_timezone_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* not __MSVCRT__ */
-
-#ifndef _NO_OLDNAMES
-
-#ifdef __MSVCRT__
-
-/* These go in the oldnames import library for MSVCRT. */
-__MINGW_IMPORT int	daylight;
-__MINGW_IMPORT long	timezone;
-__MINGW_IMPORT char 	*tzname[2];
-
-#ifndef _WTIME_DEFINED
-
-/* wide function prototypes, also declared in wchar.h */
-
-_CRTIMP wchar_t* __cdecl	_wasctime(const struct tm*);
-_CRTIMP wchar_t* __cdecl	_wctime(const time_t*);
-_CRTIMP wchar_t* __cdecl	_wstrdate(wchar_t*);
-_CRTIMP wchar_t* __cdecl	_wstrtime(wchar_t*);
-
-#define _WTIME_DEFINED
-#endif /* _WTIME_DEFINED */ 
-
-
-#else /* not __MSVCRT__ */
-
-/* CRTDLL is royally messed up when it comes to these macros.
-   TODO: import and alias these via oldnames import library instead 
-   of macros.  */
-
-#define daylight        _daylight
-/* NOTE: timezone not defined because it would conflict with sys/timeb.h.
-   Also, tzname used to a be macro, but now it's in moldname. */
-__MINGW_IMPORT char 	*tzname[2];
-
-#endif /* not __MSVCRT__ */
-
-#endif	/* Not _NO_OLDNAMES */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _TIME_H_ */
-
diff --git a/winsup/mingw/include/unistd.h b/winsup/mingw/include/unistd.h
deleted file mode 100644
index faa205655..000000000
--- a/winsup/mingw/include/unistd.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This file is part of the Mingw32 package.
- *
- * unistd.h maps (roughly) to io.h
- */
-
-#ifndef __STRICT_ANSI__
-
-#include <io.h>
-#include <process.h>
-
-#define __UNISTD_GETOPT__
-#include <getopt.h>
-#undef __UNISTD_GETOPT__
-
-#endif 
-
diff --git a/winsup/mingw/include/utime.h b/winsup/mingw/include/utime.h
deleted file mode 100644
index 8285f38fd..000000000
--- a/winsup/mingw/include/utime.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sys/utime.h>
diff --git a/winsup/mingw/include/values.h b/winsup/mingw/include/values.h
deleted file mode 100644
index 10e16a281..000000000
--- a/winsup/mingw/include/values.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * TODO: Nothing here yet. Should provide UNIX compatibility constants
- * comparible to those in limits.h and float.h.
- */
diff --git a/winsup/mingw/include/varargs.h b/winsup/mingw/include/varargs.h
deleted file mode 100644
index c1197e97e..000000000
--- a/winsup/mingw/include/varargs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * This is just an RC_INVOKED guard for the real varargs.h
- * fixincluded in gcc system dir.  One day we will delete this file.
- */
-#ifndef RC_INVOKED
-#include_next<varargs.h>
-#endif
diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h
deleted file mode 100644
index 1543678c6..000000000
--- a/winsup/mingw/include/wchar.h
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * wchar.h
- *
- * Defines of all functions for supporting wide characters. Actually it
- * just includes all those headers, which is not a good thing to do from a
- * processing time point of view, but it does mean that everything will be
- * in sync.
- *
- * This file is part of the Mingw32 package.
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef	_WCHAR_H_
-#define	_WCHAR_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <sys/types.h>
-
-#define __need_size_t
-#define __need_wint_t
-#define __need_wchar_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif /* Not RC_INVOKED */
-
-#define WCHAR_MIN	0
-#define WCHAR_MAX	((wchar_t)-1)
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus 
-extern "C" {
-#endif
-
-#ifndef	__STRICT_ANSI__
-
-#ifndef	_FSIZE_T_DEFINED
-typedef	unsigned long	_fsize_t;
-#define _FSIZE_T_DEFINED
-#endif
-
-#ifndef _WFINDDATA_T_DEFINED
-struct _wfinddata_t {
-    	unsigned	attrib;
-    	time_t		time_create;	/* -1 for FAT file systems */
-    	time_t		time_access;	/* -1 for FAT file systems */
-    	time_t		time_write;
-    	_fsize_t	size;
-    	wchar_t		name[FILENAME_MAX];	/* may include spaces. */
-};
-struct _wfinddatai64_t {
-    unsigned    attrib;
-    time_t      time_create;
-    time_t      time_access;
-    time_t      time_write;
-    __int64     size;
-    wchar_t     name[FILENAME_MAX];
-};
-#define _WFINDDATA_T_DEFINED
-#endif
-
-/* Wide character versions. Also defined in io.h. */
-/* CHECK: I believe these only exist in MSVCRT, and not in CRTDLL. Also
-   applies to other wide character versions? */
-#if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
-_CRTIMP int __cdecl	 _waccess (const wchar_t*, int);
-_CRTIMP int __cdecl	_wchmod (const wchar_t*, int);
-_CRTIMP int __cdecl	_wcreat (const wchar_t*, int);
-_CRTIMP long __cdecl	_wfindfirst (const wchar_t*, struct _wfinddata_t *);
-_CRTIMP int __cdecl	_wfindnext (long, struct _wfinddata_t *);
-_CRTIMP int __cdecl	_wunlink (const wchar_t*);
-_CRTIMP int __cdecl	_wopen (const wchar_t*, int, ...);
-_CRTIMP int __cdecl	_wsopen (const wchar_t*, int, int, ...);
-_CRTIMP wchar_t* __cdecl _wmktemp (wchar_t*);
-_CRTIMP long __cdecl	_wfindfirsti64 (const wchar_t*, struct _wfinddatai64_t*);
-_CRTIMP int __cdecl 	_wfindnexti64 (long, struct _wfinddatai64_t*);
-#endif /* defined (__MSVCRT__) */
-#define _WIO_DEFINED
-#endif /* _WIO_DEFINED */
-
-#ifndef _WSTDIO_DEFINED
-/* also in stdio.h - keep in sync */
-_CRTIMP int __cdecl	fwprintf (FILE*, const wchar_t*, ...);
-_CRTIMP int __cdecl	wprintf (const wchar_t*, ...);
-_CRTIMP int __cdecl	swprintf (wchar_t*, const wchar_t*, ...);
-_CRTIMP int __cdecl	_snwprintf (wchar_t*, size_t, const wchar_t*, ...);
-_CRTIMP int __cdecl	vfwprintf (FILE*, const wchar_t*, __VA_LIST);
-_CRTIMP int __cdecl	vwprintf (const wchar_t*, __VA_LIST);
-_CRTIMP int __cdecl	vswprintf (wchar_t*, const wchar_t*, __VA_LIST);
-_CRTIMP int __cdecl	_vsnwprintf (wchar_t*, size_t, const wchar_t*, __VA_LIST);
-_CRTIMP int __cdecl	fwscanf (FILE*, const wchar_t*, ...);
-_CRTIMP int __cdecl	wscanf (const wchar_t*, ...);
-_CRTIMP int __cdecl	swscanf (const wchar_t*, const wchar_t*, ...);
-_CRTIMP wint_t __cdecl	fgetwc (FILE*);
-_CRTIMP wint_t __cdecl	fputwc (wchar_t, FILE*);
-_CRTIMP wint_t __cdecl	ungetwc (wchar_t, FILE*);
-
-#ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
-int __cdecl snwprintf (wchar_t* s, size_t n, const wchar_t*  format, ...);
-__CRT_INLINE int __cdecl
-vsnwprintf (wchar_t* s, size_t n, const wchar_t* format, __VALIST arg)
-  { return _vsnwprintf ( s, n, format, arg);}
-int __cdecl vwscanf (const wchar_t * __restrict__, __VALIST);
-int __cdecl vfwscanf (FILE * __restrict__,
-		       const wchar_t * __restrict__, __VALIST);
-int __cdecl vswscanf (const wchar_t * __restrict__,
-		       const wchar_t * __restrict__, __VALIST);
-#endif
-
-#ifdef __MSVCRT__ 
-_CRTIMP wchar_t* __cdecl fgetws (wchar_t*, int, FILE*);
-_CRTIMP int __cdecl	fputws (const wchar_t*, FILE*);
-_CRTIMP wint_t __cdecl	getwc (FILE*);
-_CRTIMP wint_t __cdecl  getwchar (void);
-_CRTIMP wchar_t* __cdecl _getws (wchar_t*);
-_CRTIMP wint_t __cdecl	putwc (wint_t, FILE*);
-_CRTIMP int __cdecl	_putws (const wchar_t*);
-_CRTIMP wint_t __cdecl	putwchar (wint_t);
-_CRTIMP FILE* __cdecl	_wfdopen(int, wchar_t *);
-_CRTIMP FILE* __cdecl	_wfopen (const wchar_t*, const wchar_t*);
-_CRTIMP FILE* __cdecl	_wfreopen (const wchar_t*, const wchar_t*, FILE*);
-_CRTIMP FILE* __cdecl   _wfsopen (const wchar_t*, const wchar_t*, int);
-_CRTIMP wchar_t* __cdecl _wtmpnam (wchar_t*);
-_CRTIMP wchar_t* __cdecl _wtempnam (const wchar_t*, const wchar_t*);
-_CRTIMP int __cdecl	_wrename (const wchar_t*, const wchar_t*);
-_CRTIMP int __cdecl	_wremove (const wchar_t*)
-
-_CRTIMP FILE* __cdecl	_wpopen (const wchar_t*, const wchar_t*)
-_CRTIMP void __cdecl	_wperror (const wchar_t*);
-#endif	/* __MSVCRT__ */
-#define _WSTDIO_DEFINED
-#endif /* _WSTDIO_DEFINED */
-
-#ifndef _WDIRECT_DEFINED
-/* Also in direct.h */
-#ifdef __MSVCRT__ 
-_CRTIMP int __cdecl	  _wchdir (const wchar_t*);
-_CRTIMP wchar_t* __cdecl  _wgetcwd (wchar_t*, int);
-_CRTIMP wchar_t* __cdecl  _wgetdcwd (int, wchar_t*, int);
-_CRTIMP int __cdecl	  _wmkdir (const wchar_t*);
-_CRTIMP int __cdecl	  _wrmdir (const wchar_t*);
-#endif	/* __MSVCRT__ */
-#define _WDIRECT_DEFINED
-#endif /* _WDIRECT_DEFINED */
-
-#ifndef _STAT_DEFINED
-/*
- * The structure manipulated and returned by stat and fstat.
- *
- * NOTE: If called on a directory the values in the time fields are not only
- * invalid, they will cause localtime et. al. to return NULL. And calling
- * asctime with a NULL pointer causes an Invalid Page Fault. So watch it!
- */
-struct _stat
-{
-	_dev_t	st_dev;		/* Equivalent to drive number 0=A 1=B ... */
-	_ino_t	st_ino;		/* Always zero ? */
-	_mode_t	st_mode;	/* See above constants */
-	short	st_nlink;	/* Number of links. */
-	short	st_uid;		/* User: Maybe significant on NT ? */
-	short	st_gid;		/* Group: Ditto */
-	_dev_t	st_rdev;	/* Seems useless (not even filled in) */
-	_off_t	st_size;	/* File size in bytes */
-	time_t	st_atime;	/* Accessed date (always 00:00 hrs local
-				 * on FAT) */
-	time_t	st_mtime;	/* Modified time */
-	time_t	st_ctime;	/* Creation time */
-};
-
-struct stat
-{
-	_dev_t	st_dev;		/* Equivalent to drive number 0=A 1=B ... */
-	_ino_t	st_ino;		/* Always zero ? */
-	_mode_t	st_mode;	/* See above constants */
-	short	st_nlink;	/* Number of links. */
-	short	st_uid;		/* User: Maybe significant on NT ? */
-	short	st_gid;		/* Group: Ditto */
-	_dev_t	st_rdev;	/* Seems useless (not even filled in) */
-	_off_t	st_size;	/* File size in bytes */
-	time_t	st_atime;	/* Accessed date (always 00:00 hrs local
-				 * on FAT) */
-	time_t	st_mtime;	/* Modified time */
-	time_t	st_ctime;	/* Creation time */
-};
-#if defined (__MSVCRT__)
-struct _stati64 {
-    _dev_t st_dev;
-    _ino_t st_ino;
-    unsigned short st_mode;
-    short st_nlink;
-    short st_uid;
-    short st_gid;
-    _dev_t st_rdev;
-    __int64 st_size;
-    time_t st_atime;
-    time_t st_mtime;
-    time_t st_ctime;
-    };
-#endif  /* __MSVCRT__ */
-#define _STAT_DEFINED
-#endif /* _STAT_DEFINED */
-
-#if !defined ( _WSTAT_DEFINED)
-/* also declared in sys/stat.h */
-#if defined __MSVCRT__
-_CRTIMP int __cdecl	_wstat (const wchar_t*, struct _stat*);
-_CRTIMP int __cdecl	_wstati64 (const wchar_t*, struct _stati64*);
-#endif  /* __MSVCRT__ */
-#define _WSTAT_DEFINED
-#endif /* ! _WSTAT_DEFIND  */
-
-#ifndef _WTIME_DEFINED
-#ifdef __MSVCRT__
-/* wide function prototypes, also declared in time.h */
-_CRTIMP wchar_t* __cdecl	_wasctime (const struct tm*);
-_CRTIMP wchar_t* __cdecl	_wctime (const time_t*);
-_CRTIMP wchar_t* __cdecl	_wstrdate (wchar_t*);
-_CRTIMP wchar_t* __cdecl	_wstrtime (wchar_t*);
-#endif /* __MSVCRT__ */
-_CRTIMP size_t __cdecl		wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*);
-#define _WTIME_DEFINED
-#endif /* _WTIME_DEFINED */ 
-
-#ifndef _WLOCALE_DEFINED  /* also declared in locale.h */
-_CRTIMP wchar_t* __cdecl _wsetlocale (int, const wchar_t*);
-#define _WLOCALE_DEFINED
-#endif
-
-#ifndef _WSTDLIB_DEFINED /* also declared in stdlib.h */
-_CRTIMP long __cdecl 		wcstol (const wchar_t*, wchar_t**, int);
-_CRTIMP unsigned long __cdecl	wcstoul (const wchar_t*, wchar_t**, int);
-_CRTIMP double __cdecl		wcstod (const wchar_t*, wchar_t**);
-#if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */
-__CRT_INLINE float __cdecl wcstof( const wchar_t *nptr, wchar_t **endptr)
-{  return (wcstod(nptr, endptr)); }
-long double __cdecl wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__);
-#endif /* __NO_ISOCEXT */
-#define  _WSTDLIB_DEFINED
-#endif
-
-
-#ifndef	_NO_OLDNAMES
-
-/* Wide character versions. Also declared in io.h. */
-/* CHECK: Are these in the oldnames???  NO! */
-#if (0)
-int 		waccess (const wchar_t *, int);
-int 		wchmod (const wchar_t *, int);
-int 		wcreat (const wchar_t *, int);
-long 		wfindfirst (wchar_t *, struct _wfinddata_t *);
-int 		wfindnext (long, struct _wfinddata_t *);
-int 		wunlink (const wchar_t *);
-int 		wrename (const wchar_t *, const wchar_t *);
-int 		wremove (const wchar_t *);
-int 		wopen (const wchar_t *, int, ...);
-int 		wsopen (const wchar_t *, int, int, ...);
-wchar_t* 	wmktemp (wchar_t *);
-#endif
-#endif /* _NO_OLDNAMES */
-
-#endif /* not __STRICT_ANSI__ */
-
-/* These are resolved by -lmsvcp60 */
-/* If you don't have msvcp60.dll in your windows system directory, you can
-   easily obtain it with a search from your favorite search engine. */
-typedef int mbstate_t;
-typedef wchar_t _Wint_t;
-
-wint_t __cdecl btowc(int);
-size_t __cdecl mbrlen(const char *, size_t, mbstate_t *);
-size_t __cdecl mbrtowc(wchar_t *, const char *, size_t, mbstate_t *);
-size_t __cdecl mbsrtowcs(wchar_t *, const char **, size_t, mbstate_t *);
-
-size_t __cdecl wcrtomb(char *, wchar_t, mbstate_t *);
-size_t __cdecl wcsrtombs(char *, const wchar_t **, size_t, mbstate_t *);
-int __cdecl wctob(wint_t);
-
-#ifndef __NO_ISOCEXT /* these need static lib libmingwex.a */
-__CRT_INLINE int __cdecl fwide(FILE* stream, int mode) {return -1;} /* limited to byte orientation */ 
-__CRT_INLINE int __cdecl mbsinit(const mbstate_t* ps) {return 1;}
-wchar_t* __cdecl wmemset(wchar_t* s, wchar_t c, size_t n);
-wchar_t* __cdecl wmemchr(const wchar_t* s, wchar_t c, size_t n);
-int wmemcmp(const wchar_t* s1, const wchar_t * s2, size_t n);
-wchar_t* __cdecl wmemcpy(wchar_t* __restrict__ s1, const wchar_t* __restrict__ s2,
-		 size_t n);
-wchar_t* __cdecl wmemmove(wchar_t* s1, const wchar_t* s2, size_t n);
-long long __cdecl wcstoll(const wchar_t* __restrict__ nptr,
-		  wchar_t** __restrict__ endptr, int base);
-unsigned long long __cdecl wcstoull(const wchar_t* __restrict__ nptr,
-			    wchar_t ** __restrict__ endptr, int base);
-#endif /* __NO_ISOCEXT */
-
-
-#ifdef __cplusplus
-}	/* end of extern "C" */
-#endif
-
-#endif /* Not RC_INVOKED */
-
-#endif /* not _WCHAR_H_ */
-
diff --git a/winsup/mingw/include/wctype.h b/winsup/mingw/include/wctype.h
deleted file mode 100644
index 7b2d20a6d..000000000
--- a/winsup/mingw/include/wctype.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * wctype.h
- *
- * Functions for testing wide character types and converting characters.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Mumit Khan <khan@xraylith.wisc.edu>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAIMED. This includes but is not limited to warranties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef _WCTYPE_H_
-#define _WCTYPE_H_
-
-/* All the headers include this file. */
-#include <_mingw.h>
-
-#define	__need_wchar_t
-#define	__need_wint_t
-#ifndef RC_INVOKED
-#include <stddef.h>
-#endif	/* Not RC_INVOKED */
-
-/*
- * The following flags are used to tell iswctype and _isctype what character
- * types you are looking for.
- */
-#define	_UPPER		0x0001
-#define	_LOWER		0x0002
-#define	_DIGIT		0x0004
-#define	_SPACE		0x0008
-#define	_PUNCT		0x0010
-#define	_CONTROL	0x0020
-#define	_BLANK		0x0040
-#define	_HEX		0x0080
-#define	_LEADBYTE	0x8000
-
-#define	_ALPHA		0x0103
-
-#ifndef RC_INVOKED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef WEOF
-#define	WEOF	(wchar_t)(0xFFFF)
-#endif
-
-#ifndef _WCTYPE_T_DEFINED
-typedef wchar_t wctype_t;
-#define _WCTYPE_T_DEFINED
-#endif
-
-/* Wide character equivalents - also in ctype.h */
-_CRTIMP int __cdecl	iswalnum(wint_t);
-_CRTIMP int __cdecl	iswalpha(wint_t);
-_CRTIMP int __cdecl	iswascii(wint_t);
-_CRTIMP int __cdecl	iswcntrl(wint_t);
-_CRTIMP int __cdecl	iswctype(wint_t, wctype_t);
-_CRTIMP int __cdecl	is_wctype(wint_t, wctype_t);	/* Obsolete! */
-_CRTIMP int __cdecl	iswdigit(wint_t);
-_CRTIMP int __cdecl	iswgraph(wint_t);
-_CRTIMP int __cdecl	iswlower(wint_t);
-_CRTIMP int __cdecl	iswprint(wint_t);
-_CRTIMP int __cdecl	iswpunct(wint_t);
-_CRTIMP int __cdecl	iswspace(wint_t);
-_CRTIMP int __cdecl	iswupper(wint_t);
-_CRTIMP int __cdecl	iswxdigit(wint_t);
-
-_CRTIMP wchar_t __cdecl	towlower(wchar_t);
-_CRTIMP wchar_t __cdecl	towupper(wchar_t);
-
-_CRTIMP int __cdecl	isleadbyte (int);
-
-/* Also in ctype.h */
-
-#ifdef __DECLSPEC_SUPPORTED
-__MINGW_IMPORT unsigned short _ctype[];
-# ifdef __MSVCRT__
-  __MINGW_IMPORT unsigned short* _pctype;
-# else	/* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif
-
-#else		/* ! __DECLSPEC_SUPPORTED */
-extern unsigned short** _imp___ctype;
-#define _ctype (*_imp___ctype)
-# ifdef __MSVCRT__
-  extern unsigned short** _imp___pctype;
-# define _pctype (*_imp___pctype)
-# else	/* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif	/* CRTDLL */
-#endif		/*  __DECLSPEC_SUPPORTED */
-
-
-#if !(defined (__NO_INLINE__) || defined(__NO_CTYPE_INLINES) \
-      || defined(__WCTYPE_INLINES_DEFINED))
-#define __WCTYPE_INLINES_DEFINED
-__CRT_INLINE int __cdecl iswalnum(wint_t wc) {return (iswctype(wc,_ALPHA|_DIGIT));}
-__CRT_INLINE int __cdecl iswalpha(wint_t wc) {return (iswctype(wc,_ALPHA));}
-__CRT_INLINE int __cdecl iswascii(wint_t wc) {return ((wc & ~0x7F) ==0);}
-__CRT_INLINE int __cdecl iswcntrl(wint_t wc) {return (iswctype(wc,_CONTROL));}
-__CRT_INLINE int __cdecl iswdigit(wint_t wc) {return (iswctype(wc,_DIGIT));}
-__CRT_INLINE int __cdecl iswgraph(wint_t wc) {return (iswctype(wc,_PUNCT|_ALPHA|_DIGIT));}
-__CRT_INLINE int __cdecl iswlower(wint_t wc) {return (iswctype(wc,_LOWER));}
-__CRT_INLINE int __cdecl iswprint(wint_t wc) {return (iswctype(wc,_BLANK|_PUNCT|_ALPHA|_DIGIT));}
-__CRT_INLINE int __cdecl iswpunct(wint_t wc) {return (iswctype(wc,_PUNCT));}
-__CRT_INLINE int __cdecl iswspace(wint_t wc) {return (iswctype(wc,_SPACE));}
-__CRT_INLINE int __cdecl iswupper(wint_t wc) {return (iswctype(wc,_UPPER));}
-__CRT_INLINE int __cdecl iswxdigit(wint_t wc) {return (iswctype(wc,_HEX));}
-__CRT_INLINE int __cdecl isleadbyte(int c) {return (_pctype[(unsigned char)(c)] & _LEADBYTE);}
-#endif /* !(defined(__NO_CTYPE_INLINES) || defined(__WCTYPE_INLINES_DEFINED)) */
-
-
-typedef wchar_t wctrans_t;
-_CRTIMP wint_t __cdecl		towctrans(wint_t, wctrans_t);
-_CRTIMP wctrans_t __cdecl	wctrans(const char*);
-_CRTIMP wctype_t __cdecl	wctype(const char*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
-#endif	/* Not _WCTYPE_H_ */
-
diff --git a/winsup/mingw/init.c b/winsup/mingw/init.c
deleted file mode 100644
index 8fa4652fa..000000000
--- a/winsup/mingw/init.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * init.c
- *
- * Code to initialize standard file handles and command line arguments.
- * This file is #included in both crt1.c and dllcrt1.c.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *  Maintained by Mumit Khan <khan@xraylith.wisc.EDU>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-/*
- * Access to a standard 'main'-like argument count and list. Also included
- * is a table of environment variables.
- */
-int _argc = 0;
-char **_argv = 0;
-
-/* NOTE: Thanks to Pedro A. Aranda Gutiirrez <paag@tid.es> for pointing
- * this out to me. GetMainArgs (used below) takes a fourth argument
- * which is an int that controls the globbing of the command line. If
- * _CRT_glob is non-zero the command line will be globbed (e.g. *.*
- * expanded to be all files in the startup directory). In the mingw32
- * library a _CRT_glob variable is defined as being -1, enabling
- * this command line globbing by default. To turn it off and do all
- * command line processing yourself (and possibly escape bogons in
- * MS's globbing code) include a line in one of your source modules
- * defining _CRT_glob and setting it to zero, like this:
- *  int _CRT_glob = 0;
- */
-extern int _CRT_glob;
-
-#ifdef __MSVCRT__
-typedef struct {
-  int newmode;
-} _startupinfo;
-extern void __getmainargs (int *, char ***, char ***, int, _startupinfo *);
-#else
-extern void __GetMainArgs (int *, char ***, char ***, int);
-#endif
-
-/*
- * Initialize the _argc, _argv and environ variables.
- */
-static void
-_mingw32_init_mainargs ()
-{
-  /* The environ variable is provided directly in stdlib.h through
-   * a dll function call. */
-  char **dummy_environ;
-#ifdef __MSVCRT__
-  _startupinfo start_info;
-  start_info.newmode = 0;
-#endif
-
-  /*
-   * Microsoft's runtime provides a function for doing just that.
-   */
-#ifdef __MSVCRT__
-  (void) __getmainargs (&_argc, &_argv, &dummy_environ, _CRT_glob, 
-                        &start_info);
-#else
-  /* CRTDLL version */
-  (void) __GetMainArgs (&_argc, &_argv, &dummy_environ, _CRT_glob);
-#endif
-}
-
diff --git a/winsup/mingw/install-sh b/winsup/mingw/install-sh
deleted file mode 100755
index 9344e52bc..000000000
--- a/winsup/mingw/install-sh
+++ /dev/null
@@ -1,253 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile
-	([ -f $dstdir/$dstfile ] &&
-	 $doit $mvcmd $dstdir/$dstfile $dstdir/$dstfile.$$ );
-	exec $doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/winsup/mingw/isascii.c b/winsup/mingw/isascii.c
deleted file mode 100644
index 2d2534178..000000000
--- a/winsup/mingw/isascii.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * isascii.c
- *
- * Oldnames from ANSI header ctype.h
- *
- * Some wrapper functions for those old name functions whose appropriate
- * equivalents are not simply underscore prefixed.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <ctype.h>
-
-int
-isascii (int c)
-{
-	return __isascii(c);
-}
-
diff --git a/winsup/mingw/iscsym.c b/winsup/mingw/iscsym.c
deleted file mode 100644
index 125b4964b..000000000
--- a/winsup/mingw/iscsym.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * iscsym.c
- *
- * Oldnames from ANSI header ctype.h
- *
- * Some wrapper functions for those old name functions whose appropriate
- * equivalents are not simply underscore prefixed.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <ctype.h>
-
-int
-iscsym (int c)
-{
-	return __iscsym(c);
-}
diff --git a/winsup/mingw/iscsymf.c b/winsup/mingw/iscsymf.c
deleted file mode 100644
index 417b9d20c..000000000
--- a/winsup/mingw/iscsymf.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * iscsymf.c
- *
- * Oldnames from ANSI header ctype.h
- *
- * Some wrapper functions for those old name functions whose appropriate
- * equivalents are not simply underscore prefixed.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <ctype.h>
-
-int
-iscsymf (int c)
-{
-	return __iscsymf(c);
-}
-
diff --git a/winsup/mingw/jamfile b/winsup/mingw/jamfile
deleted file mode 100644
index 1769d952d..000000000
--- a/winsup/mingw/jamfile
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Jamfile for building various libraries and object files for the
-# Minimalist GNU-Win32 package.
-#
-# $Revision$
-# $Author$
-# $Date$
-#
-
-# Change this line if you have installed Mingw32 in another directory.
-#
-LOCATE_TARGET = /mingw32/lib ;
-
-RUNTIME default = crtdll ;
-
-# Build the mingw32 library which contains startup code and extra support
-# routines.
-#
-Library libmingw32.a :
-	CRTglob.c
-	CRTfmode.c
-	CRTinit.c
-	dirent.c
-	dllmain.c
-	gccmain.c
-	main.c
-	;
-
-
-# Build the startup object files for normal applications and for DLLs.
-# The crt2 and dllcrt2 versions are for MSVCRTxx.DLL runtimes. crt1 and
-# dllcrt1 are for the CRTDLL.DLL runtime.
-#
-Object crt1.o : crt1.c ;
-Object crt2.o : crt1.c ;
-
-CCFLAGS on crt2.o += -D__MSVCRT__ ;
-
-Object dllcrt1.o : dllcrt1.c ;
-Object dllcrt2.o : dllcrt1.c ;
-
-CCFLAGS on dllcrt2.o += -D__MSVCRT__ ;
-
-DEPENDS all : crt1.o dllcrt1.o crt2.o dllcrt2.o ;
-
-
-# Build an object file which contains a single global variable initialized
-# so that globbing will not be performed on the command line.
-#
-Object CRT_noglob.o : CRT_noglob.c ;
-LOCATE on CRT_noglob.o = $(LOCATE_TARGET) ;
-
-DEPENDS all : CRT_noglob.o ;
-
-
-# Build a special import library which contains mostly the imports defined
-# in moldname.def, but with their leading underscores stripped off, plus the
-# extra code in the C modules included.
-#
-ImportLib libmoldname.a : moldname.def ctype_old.c string_old.c ;
-
-DLLNAME on libmoldname.a = $(RUNTIME).dll ;
-DLLTOOLFLAGS on libmoldname.a += -U ;
-
-
-# Build import libraries for the various runtimes.
-#
-ImportLib libcrtdll.a : crtdll.def ;
-ImportLib libmsvcrt.a : msvcrt.def ;
-ImportLib libmsvcrt20.a : msvcrt20.def ;
-ImportLib libmsvcrt40.a : msvcrt40.def ;
-
diff --git a/winsup/mingw/main.c b/winsup/mingw/main.c
deleted file mode 100644
index ea1dcd85e..000000000
--- a/winsup/mingw/main.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * main.c
- *
- * Extra startup code for applications which do not have a main function
- * of their own (but do have a WinMain). Generally these are GUI
- * applications, but they don't *have* to be.
- *
- * This file is part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *  Maintained by Mumit Khan <khan@xraylith.wisc.EDU>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <stdlib.h>
-#include <process.h>
-#include <windows.h>
-
-#define ISSPACE(a)	(a == ' ' || a == '\t')
-
-extern int PASCAL WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, 
-                           LPSTR szCmdLine, int nShow);
-
-int
-main (int argc, char *argv[], char *environ[])
-{
-  char *szCmd;
-  STARTUPINFO startinfo;
-  int nRet;
-
-  /* Get the command line passed to the process. */
-  szCmd = GetCommandLineA ();
-  GetStartupInfoA (&startinfo);
-
-  /* Strip off the name of the application and any leading
-   * whitespace. */
-  if (szCmd)
-    {
-      while (ISSPACE (*szCmd))
-	{
-	  szCmd++;
-	}
-
-      /* On my system I always get the app name enclosed
-       * in quotes... */
-      if (*szCmd == '\"')
-	{
-	  do
-	    {
-	      szCmd++;
-	    }
-	  while (*szCmd != '\"' && *szCmd != '\0');
-
-	  if (*szCmd == '\"')
-	    {
-	      szCmd++;
-	    }
-	}
-      else
-	{
-	  /* If no quotes then assume first token is program
-	   * name. */
-	  while (!ISSPACE (*szCmd) && *szCmd != '\0')
-	    {
-	      szCmd++;
-	    }
-	}
-
-      while (ISSPACE (*szCmd))
-	{
-	  szCmd++;
-	}
-    }
-
-  nRet = WinMain (GetModuleHandle (NULL), NULL, szCmd,
-		  (startinfo.dwFlags & STARTF_USESHOWWINDOW) ?
-		  startinfo.wShowWindow : SW_SHOWDEFAULT);
-
-  return nRet;
-}
-
diff --git a/winsup/mingw/mingwex/Makefile.in b/winsup/mingw/mingwex/Makefile.in
deleted file mode 100644
index cc9e44040..000000000
--- a/winsup/mingw/mingwex/Makefile.in
+++ /dev/null
@@ -1,233 +0,0 @@
-#
-# mingw/mingwex/Makefile.in: This file is part of Mingw runtime.
-#
-# This makefile requires GNU make.
-
-srcdir = @srcdir@
-VPATH = $(srcdir):$(srcdir)/math:$(srcdir)/stdio:$(srcdir)/complex
-objdir = .
-
-target_alias = @target_alias@
-prefix = @prefix@
-
-program_transform_name = @program_transform_name@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-datadir = @datadir@
-infodir = @infodir@
-includedir = @includedir@
-
-SHELL = /bin/sh
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-mkinstalldirs = $(SHELL) $(srcdir)/../mkinstalldirs
-DISTFILES = Makefile.in configure configure.in \
-	_Exit.c atoll.c dirent.c feclearexcept.c fegetenv.c \
-	fegetexceptflag.c fegetround.c feholdexcept.c feraiseexcept.c \
-	fesetenv.c fesetexceptflag.c fesetround.c fetestexcept.c \
-	feupdateenv.c fwide.c  getopt.c imaxabs.c imaxdiv.c ldtoa.c \
-	lltoa.c lltow.c mbsinit.c mingw-fseek.c sitest.c strtof.c \
-	strtoimax.c strtold.c strtoumax.c testwmem.c ulltoa.c ulltow.c \
-	wcstof.c wcstoimax.c wcstold.c wcstoumax.c wdirent.c wmemchr.c \
-	wmemcmp.c wmemcpy.c wmemmove.c wmemset.c wtoll.c
-	
-MATH_DISTFILES = \
-	acosf.c acosl.c asinf.c asinl.c atan2f.c atan2l.c \
-	atanf.c atanl.c cbrt.c cbrtf.c cbrtl.c ceilf.S ceill.S \
-	cephes_emath.h cephes_emath.c cephes_mconf.h \
-	copysign.S copysignf.S copysignl.S cosf.S coshf.c coshl.c cosl.S \
-	exp2.S exp2f.S exp2l.S expf.c expl.c fabs.c fabsf.c fabsl.c \
-	fdim.c fdimf.c fdiml.c floorf.S floorl.S fma.S fmaf.S fmal.c \
-	fmax.c fmaxf.c fmaxl.c fmin.c fminf.c fminl.c fmodf.c \
-	fmodl.c fp_consts.c fp_consts.h fp_constsf.c  fp_constsl.c \
-	fpclassify.c fpclassifyf.c fpclassifyl.c \
-	frexpf.c frexpl.S fucom.c hypotf.c hypotl.c ilogb.S ilogbf.S \
-	ilogbl.S isnan.c isnanf.c isnanl.c ldexpf.c ldexpl.c \
-	lgamma.c lgammaf.c lgammal.c llrint.c \
-	llrintf.c llrintl.c llround.c llroundf.c llroundl.c \
-	log10f.S log10l.S log1p.S log1pf.S log1pl.S log2.S log2f.S \
-	log2l.S logb.c logbf.c logbl.c logf.S logl.S lrint.c lrintf.c \
-	lrintl.c lround.c lroundf.c lroundl.c modff.c modfl.c \
-	nearbyint.S nearbyintf.S nearbyintl.S nextafterf.c \
-	pow.c powf.c powi.c powif.c powil.c powl.c \
-	remainder.S remainderf.S remainderl.S remquo.S \
-	remquof.S remquol.S rint.c rintf.c rintl.c round.c roundf.c \
-	roundl.c scalbn.S scalbnf.S scalbnl.S s_erf.c sf_erf.c \
-	signbit.c signbitf.c signbitl.c sinf.S sinhf.c sinhl.c sinl.S \
-	sqrtf.c sqrtl.c tanf.S tanhf.c tanhl.c tanl.S tgamma.c \
-	tgammaf.c tgammal.c trunc.c truncf.c truncl.c
-
-STDIO_DISTFILES = \
-	snprintf.c snwprintf.c vsnprintf.c vsnwprintf.c \
-	vfscanf.c vfwscanf.c vscanf.c vsscanf.c vswscanf.c vwscanf.c
-
-COMPLEX_DISTFILES = \
-	cabs.c cacos.c cacosh.c casin.c casinh.c catan.c catanh.c \
-	ccos.c ccosh.c cexp.c cimag.c clog.c cpow.c cproj.c creal.c \
-	csin.c csinh.c csqrt.c ctan.c ctanh.c
-
-CC = @CC@
-# FIXME: Which is it, CC or CC_FOR_TARGET?
-CC_FOR_TARGET = $(CC)
-AS_FOR_TARGET = $(AS)
-CFLAGS = @CFLAGS@ -Wall
-CXXFLAGS = @CXXFLAGS@
-OPTFLAGS= -fomit-frame-pointer
-
-# compiling with Cygwin?
-MNO_CYGWIN = @MNO_CYGWIN@
-
-W32API_INCLUDE = @W32API_INCLUDE@
-INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
-  -nostdinc -nostdinc++ \
-  -iwithprefixbefore include
-ALL_CFLAGS = $(CFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
-ALL_CXXFLAGS = $(CXXFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-AR_FLAGS = rcv
-RANLIB = @RANLIB@
-DLLTOOL = @DLLTOOL@
-DLLTOOLFLAGS = 
-DLLTOOL_FOR_TARGET = $(DLLTOOL)
-DLLTOOL_FLAGS = --as $(AS_FOR_TARGET)
-
-LIBMINGWEX_A = libmingwex.a
-
-Q8_OBJS = \
-	fwide.o imaxabs.o imaxdiv.o mbsinit.o \
-	strtoimax.o strtoumax.o wcstoimax.o wcstoumax.o \
-	wmemchr.o wmemcmp.o wmemcpy.o wmemmove.o wmemset.o
-STDLIB_OBJS = \
-	strtold.o wcstold.o
-STDLIB_STUB_OBJS = \
-	lltoa.o ulltoa.o \
-	lltow.o ulltow.o \
-	atoll.o wtoll.o \
-	strtof.o wcstof.o \
-	_Exit.o
-STDIO_OBJS = \
-	snprintf.o  vsnprintf.o snwprintf.o vsnwprintf.o \
-	vfscanf.o vfwscanf.o vscanf.o vsscanf.o vswscanf.o vwscanf.o
-MATH_OBJS = \
-	acosf.o acosl.o asinf.o asinl.o atan2f.o atan2l.o \
-	atanf.o atanl.o cbrt.o cbrtf.o cbrtl.o ceilf.o ceill.o \
-	cephes_emath.o \
-	copysign.o copysignf.o copysignl.o cosf.o coshf.o coshl.o cosl.o \
-	exp2.o exp2f.o exp2l.o expf.o expl.o fabs.o fabsf.o fabsl.o \
-	fdim.o fdimf.o fdiml.o floorf.o floorl.o fma.o fmaf.o fmal.o \
-	fmax.o fmaxf.o fmaxl.o fmin.o fminf.o fminl.o fmodf.o \
-	fmodl.o fp_consts.o fp_constsf.o fp_constsl.o \
-	fpclassify.o fpclassifyf.o fpclassifyl.o \
-	frexpf.o frexpl.o fucom.o hypotf.o hypotl.o ilogb.o ilogbf.o \
-	ilogbl.o isnan.o isnanf.o isnanl.o ldexpf.o ldexpl.o \
-	lgamma.o lgammaf.o lgammal.o llrint.o \
-	llrintf.o llrintl.o llround.o llroundf.o llroundl.o \
-	log10f.o log10l.o log1p.o log1pf.o log1pl.o log2.o log2f.o \
-	log2l.o logb.o logbf.o logbl.o logf.o logl.o lrint.o lrintf.o \
-	lrintl.o lround.o lroundf.o lroundl.o modff.o modfl.o \
-	nearbyint.o nearbyintf.o nearbyintl.o nextafterf.o \
-	pow.o powf.o powi.o powif.o powil.o powl.o \
-	remainder.o remainderf.o remainderl.o remquo.o \
-	remquof.o remquol.o rint.o rintf.o rintl.o round.o roundf.o \
-	roundl.o scalbn.o scalbnf.o scalbnl.o s_erf.o sf_erf.o \
-	signbit.o signbitf.o signbitl.o sinf.o sinhf.o sinhl.o sinl.o \
-	sqrtf.o sqrtl.o tanf.o tanhf.o tanhl.o tanl.o tgamma.o \
-	tgammaf.o tgammal.o trunc.o truncf.o truncl.o
-FENV_OBJS = fesetround.o  fegetround.o \
-	fegetenv.o fesetenv.o feupdateenv.o \
-	feclearexcept.o feholdexcept.o fegetexceptflag.o \
-	feraiseexcept.o fetestexcept.o fesetexceptflag.o
-POSIX_OBJS = \
-	dirent.o wdirent.o getopt.o
-REPLACE_OBJS = \
-	mingw-fseek.o
-COMPLEX_OBJS = \
-	cabs.o cacos.o cacosh.o casin.o casinh.o catan.o catanh.o \
-	ccos.o ccosh.o cexp.o cimag.o clog.o cpow.o cproj.o creal.o \
-	csin.o csinh.o csqrt.o ctan.o ctanh.o
-
-LIB_OBJS = $(Q8_OBJS) $(STDLIB_OBJS) $(STDLIB_STUB_OBJS) \
-	$(STDIO_OBJS) $(MATH_OBJS)  $(FENV_OBJS) \
-	$(POSIX_OBJS) $(REPLACE_OBJS) $(COMPLEX_OBJS)
-
-LIBS = $(LIBMINGWEX_A)
-DLLS = 
-
-all: $(LIBMINGWEX_A)
-
-$(LIBMINGWEX_A): $(LIB_OBJS)
-	rm -f $(LIBMINGWEX_A)
-	$(AR) $(ARFLAGS) $@ $(LIB_OBJS)
-	$(RANLIB) $@
-
-
-Makefile: Makefile.in config.status configure
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
-
-info:
-
-info-html:
-
-install-info: info
-
-install: all
-	$(mkinstalldirs) $(inst_libdir)
-	for i in $(LIBS); do \
-		$(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
-	done
-
-clean:
-	-rm -f $(LIB_OBJS)  $(LIBMINGWEX_A)
-
-distclean:
-	-rm -f *.o *.a *~ core a.out
-	-rm -f config.cache config.status config.log 
-	-rm -f Makefile
-.c.o:
-	$(CC) -c  $(ALL_CFLAGS) $< -o $@
-.S.o:
-	$(CC) -c  $< -o $@
-.s.o:
-	$(CC) -c  $< -o $@
-
-
-#
-# Dependancies
-#
-wdirent.o: $(srcdir)/dirent.c $(srcdir)/wdirent.c
-strtold.o: $(srcdir)/strtold.c $(srcdir)/math/cephes_emath.h
-wcstold.o: $(srcdir)/wcstold.c $(srcdir)/math/cephes_emath.h
-
-
-dist:
-	mkdir $(distdir)/mingwex
-	chmod 755 $(distdir)/mingwex
-	@for i in $(DISTFILES); do\
-		cp -p $(srcdir)/$$i $(distdir)/mingwex/$$i ; \
-	done
-	mkdir $(distdir)/mingwex/math
-	chmod 755 $(distdir)/mingwex/math
-	@for i in $(MATH_DISTFILES); do\
-		cp -p $(srcdir)/math/$$i $(distdir)/mingwex/math/$$i ; \
-	done
-	mkdir $(distdir)/mingwex/stdio
-	chmod 755 $(distdir)/mingwex/stdio
-	@for i in $(STDIO_DISTFILES); do\
-		cp -p $(srcdir)/stdio/$$i $(distdir)/mingwex/stdio/$$i ; \
-	done
-	mkdir $(distdir)/mingwex/complex
-	chmod 755 $(distdir)/mingwex/complex
-	@for i in $(COMPLEX_DISTFILES); do\
-		cp -p $(srcdir)/complex/$$i $(distdir)/mingwex/complex/$$i ; \
-	done
-
diff --git a/winsup/mingw/mingwex/_Exit.c b/winsup/mingw/mingwex/_Exit.c
deleted file mode 100644
index 38f7e182e..000000000
--- a/winsup/mingw/mingwex/_Exit.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <stdlib.h>
-void _Exit(int status)
-	{  _exit(status); }
diff --git a/winsup/mingw/mingwex/atoll.c b/winsup/mingw/mingwex/atoll.c
deleted file mode 100644
index 97920b4ee..000000000
--- a/winsup/mingw/mingwex/atoll.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <stdlib.h>
-long long atoll (const char * _c)
-	{ return _atoi64 (_c); }
diff --git a/winsup/mingw/mingwex/complex/cabs.c b/winsup/mingw/mingwex/complex/cabs.c
deleted file mode 100644
index ff547dd6e..000000000
--- a/winsup/mingw/mingwex/complex/cabs.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-#include <complex.h>
-
-double cabs (double complex Z)
-{
-  return _hypot ( __real__ Z,  __imag__ Z);
-}
diff --git a/winsup/mingw/mingwex/complex/cacos.c b/winsup/mingw/mingwex/complex/cacos.c
deleted file mode 100644
index 265cba0d7..000000000
--- a/winsup/mingw/mingwex/complex/cacos.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-   cacos.c
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-#if 0
-/* cacos (Z) = -I * clog(Z + I * csqrt(1 - Z * Z)) */
-
-double complex cacos (double  complex Z)
-{
-  double complex Res;
-  double x, y;
-
-  x = __real__ Z;
-  y = __imag__ Z;
-
-  if (y == 0.0)
-    {
-      __real__ Res = acos (x);
-      __imag__ Res = 0.0;
-    }
-
-  else
-    {
-      double complex ZZ;
-      /* Z * Z = ((x - y) * (x + y)) + (2.0 * x * y) * I */
-      /* caculate 1 - Z * Z */
-      __real__ ZZ = 1.0 - (x - y) * (x + y);
-      __imag__ ZZ = -2.0 * x * y;
-
-       
-       Res = csqrt(ZZ);
-
-      /* calculate ZZ + I * sqrt (ZZ) */
-    
-      __real__ ZZ = x - __imag__ Res;
-      __imag__ ZZ = y + __real__ Res;
-       
-      ZZ = clog(ZZ);
-
-      /* mult by -I */
-
-      __real__ Res  =  __imag__ ZZ;
-      __imag__ Res = - __real__ ZZ;
-    }
-  return Res;
-}
-
-#else
-
-/* cacos ( Z ) =  pi/2 - casin ( Z ) */
-
-double complex cacos (double complex Z)
-{
-  double complex Res  = casin (Z);
-  __real__ Res = M_PI_2 - __real__ Res;
-  __imag__ Res = - __imag__ Res;
-  return Res;
-}
-#endif
-
-#if 0
-#include <stdio.h>
-int main()
-{
-  double z;
-  double complex bar = 0.7 + 1.2  * I;
-  double complex foo = cacos (bar);
-
-  printf ("%.16e\t%.16e\n", __real__ foo, __imag__ foo);
-
-  foo = cacos (bar);
-  printf ("%.16e\t%.16e\n", __real__ foo, __imag__ foo);
-
-  return 1;
-}
-#endif
-
diff --git a/winsup/mingw/mingwex/complex/cacosh.c b/winsup/mingw/mingwex/complex/cacosh.c
deleted file mode 100644
index 34469cb56..000000000
--- a/winsup/mingw/mingwex/complex/cacosh.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-   cacosh.c
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-#if 0
-/* cacosh (z) = I * cacos (z)  */
-double complex cacosh (double complex Z)
-{
-  double complex Tmp;
-  double complex Res;
-
-  Tmp = cacos (Z);
-  __real__ Res = -__imag__ Tmp;
-  __imag__ Res = __real__ Tmp;
-  return Res;
-}
-
-#else
-
-/* cacosh (z) = I * cacos (z) = I * (pi/2 - casin (z))  */
-
-double complex cacosh (double complex Z)
-{
-  double complex Tmp;
-  double complex Res;
-
-  Tmp = casin (Z);
-  __real__ Res = __imag__ Tmp;
-  __imag__ Res =  M_PI_2 - __real__ Tmp;
-  return Res;
-}
-#endif
diff --git a/winsup/mingw/mingwex/complex/casin.c b/winsup/mingw/mingwex/complex/casin.c
deleted file mode 100644
index cd79767b5..000000000
--- a/winsup/mingw/mingwex/complex/casin.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-   casin.c
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-/* casin (Z ) = -I * clog(I * Z + csqrt (1.0 - Z * Z))) */
-
-double complex casin (double complex Z)
-{
-  double complex Res;
-  double x, y;
-
-  x = __real__ Z;
-  y = __imag__ Z;
-
-  if (y == 0.0)
-    {
-      __real__ Res = asin (x);
-      __imag__ Res = 0.0;
-    }
-  else  /* -I * clog(I * Z + csqrt(1.0 - Z * Z))) */
-    {
-      double complex ZZ;
-                                 
-      /* Z * Z = ((x - y) * (x + y)) + (2.0 * x * y) * I */
-      /* calculate 1 - Z * Z */
-      __real__ ZZ = 1.0 - (x - y) * (x + y);
-      __imag__ ZZ = -2.0 * x * y;
-      ZZ = csqrt (ZZ);
-
-
-      /* add  I * Z  to ZZ */
-
-      __real__ ZZ -= y;
-      __imag__ ZZ += x;
-
-      ZZ = clog (ZZ);
-
-      /* mult by -I */
-      __real__ Res = __imag__ ZZ;
-      __imag__ Res = - __real__ ZZ;  
-    }
-  return (Res);
-}
diff --git a/winsup/mingw/mingwex/complex/casinh.c b/winsup/mingw/mingwex/complex/casinh.c
deleted file mode 100644
index a86c1d625..000000000
--- a/winsup/mingw/mingwex/complex/casinh.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-   casinh.c
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-/* casinh (z) = -I casin (I * z) */
-
-double complex casinh (double complex Z)
-{
-  double complex Tmp;
-  double complex Res;
-
-  __real__ Tmp = - __imag__ Z;
-  __imag__ Tmp =   __real__ Z;
-  Tmp = casin (Tmp);
-  __real__ Res =   __imag__ Tmp;
-  __imag__ Res = - __real__ Tmp;
-  return Res;
-}
diff --git a/winsup/mingw/mingwex/complex/catan.c b/winsup/mingw/mingwex/complex/catan.c
deleted file mode 100644
index eee1e8fa7..000000000
--- a/winsup/mingw/mingwex/complex/catan.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* catan.c */
-
-/*
-   Contributed by Danny Smith
-   2003-10-17
-
-   FIXME: This needs some serious numerical analysis.
-*/
-
-#include <math.h>
-#include <complex.h>
-#include <errno.h>
-
-/* catan (z) = -I/2 * clog ((I + z) / (I - z)) */ 
-
-double complex 
-catan (double complex Z)
-{
-  double complex Res;
-  double complex Tmp;
-  double x = __real__ Z;
-  double y = __imag__ Z;
-
-  if ( x == 0.0 && (1.0 - fabs (y)) == 0.0)
-    {
-      errno = ERANGE;
-      __real__ Res = HUGE_VAL;
-      __imag__ Res = HUGE_VAL;
-    }
-   else if (isinf (_hypot (x, y)))
-   {
-     __real__ Res = (x > 0 ? M_PI_2 : -M_PI_2);
-     __imag__ Res = 0.0;
-   }
-  else
-    {
-      __real__ Tmp = - x; 
-      __imag__ Tmp = 1.0 - y;
-
-      __real__ Res = x; 
-      __imag__ Res = y + 1.0;
-
-      Tmp = clog (Res/Tmp);	
-      __real__ Res  = - 0.5 * __imag__ Tmp;
-      __imag__ Res =  0.5 * __real__ Tmp;
-    }
-
-   return Res; 
-}
diff --git a/winsup/mingw/mingwex/complex/catanh.c b/winsup/mingw/mingwex/complex/catanh.c
deleted file mode 100644
index 78f028014..000000000
--- a/winsup/mingw/mingwex/complex/catanh.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* catanh.c */
-/*
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-/*  catanh (z) = -I * catan (I  * z)  */
-
-double complex catanh (double complex Z)
-{
-  double complex Tmp;
-  double complex Res;
-
-  __real__ Tmp = - __imag__ Z;
-  __imag__ Tmp =   __real__ Z;
-  Tmp = catan (Tmp);
-  __real__ Res =  __imag__ Tmp;
-  __imag__ Res = - __real__ Tmp;
-  return Res;
-}
diff --git a/winsup/mingw/mingwex/complex/ccos.c b/winsup/mingw/mingwex/complex/ccos.c
deleted file mode 100644
index ef5b5a70e..000000000
--- a/winsup/mingw/mingwex/complex/ccos.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-   ccos.c
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-/* ccos (x + I * y) = cos (x) * cosh (y)
-    + I * (sin (x) * sinh (y)) */ 
-
-
-double complex ccos (double complex Z)
-{
-  double complex Res;
-  __real__ Res = cos (__real__ Z) * cosh ( __imag__ Z);
-  __imag__ Res = -sin (__real__ Z) * sinh ( __imag__ Z);
-  return Res;
-}
diff --git a/winsup/mingw/mingwex/complex/ccosh.c b/winsup/mingw/mingwex/complex/ccosh.c
deleted file mode 100644
index 8d304fd0e..000000000
--- a/winsup/mingw/mingwex/complex/ccosh.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-   ccosh.c
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-/* ccosh (x + I * y) = cosh (x) * cos (y)
-    + I * (sinh (x) * sin (y)) */ 
-
-double complex ccosh (double complex Z)
-{
-  double complex Res;
-  __real__ Res = cosh (__real__ Z) * cos (__imag__ Z);
-  __imag__ Res = sinh (__real__ Z) * sin (__imag__ Z);
-  return Res;
-}
diff --git a/winsup/mingw/mingwex/complex/cexp.c b/winsup/mingw/mingwex/complex/cexp.c
deleted file mode 100644
index 43ac9ab9e..000000000
--- a/winsup/mingw/mingwex/complex/cexp.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-   cexp.c
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-/* cexp (x + I * y) = exp (x) * cos (y) + I * exp (x) * sin (y) */
-
-double complex cexp (double complex Z)
-{
-  double complex  Res;
-  long double rho = exp (__real__ Z);
-  __real__ Res = rho * cos(__imag__ Z);
-  __imag__ Res = rho * sin(__imag__ Z);
-  return Res;
-}
diff --git a/winsup/mingw/mingwex/complex/cimag.c b/winsup/mingw/mingwex/complex/cimag.c
deleted file mode 100644
index b6b32561c..000000000
--- a/winsup/mingw/mingwex/complex/cimag.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <complex.h>
-double __attribute__ ((const)) cimag (double complex _Z)
-{
-  return __imag__ _Z;
-}
-
diff --git a/winsup/mingw/mingwex/complex/clog.c b/winsup/mingw/mingwex/complex/clog.c
deleted file mode 100644
index 57c51ebb0..000000000
--- a/winsup/mingw/mingwex/complex/clog.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-   clog.c
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-/* clog (x + I * y) = log (hypot (x, y)) + I * atan2 (y, x) */
-
-#include <math.h>
-#include <complex.h>
-
-double complex clog (double complex Z)
-{
-  double complex Res;
-  __real__ Res = log (_hypot (__real__ Z,  __imag__ Z));
-  __imag__ Res = carg (Z);
-  return Res;
-}
-
diff --git a/winsup/mingw/mingwex/complex/cpow.c b/winsup/mingw/mingwex/complex/cpow.c
deleted file mode 100644
index c12b12fc0..000000000
--- a/winsup/mingw/mingwex/complex/cpow.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  cpow.c */
-/*
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-/* cpow(X, Y) = cexp(X * clog(Y)) */
-
-#include <math.h>
-#include <complex.h>
-
-/* Use dll version of pow */
-extern double  (*_imp__pow) (double, double);
-#define pow (*_imp__pow)
-
-double complex cpow (double complex X, double complex Y)
-{
-  double complex Res;
-  double i;
-  double r = hypot (__real__ X, __imag__ X);
-  if (r == 0.0)
-    {
-       __real__ Res = __imag__ Res = 0.0;
-    }
-  else
-    {
-      double rho;
-      double theta;
-      i = carg (X);
-      theta = i * __real__ Y;
- 
-      if (__imag__ Y == 0.0)
-	/* This gives slightly more accurate results in these cases. */
-   	rho = pow (r, __real__ Y);
-      else
-	{
-          r = log (r);
-	  /* rearrangement of cexp(X * clog(Y)) */
-	  theta += r * __imag__ Y;
-	  rho = exp (r * __real__ Y - i * __imag__ Y);
-	}
-
-      __real__ Res = rho * cos (theta);
-      __imag__ Res = rho * sin (theta);
-    }
-  return  Res;
-}
-
diff --git a/winsup/mingw/mingwex/complex/cproj.c b/winsup/mingw/mingwex/complex/cproj.c
deleted file mode 100644
index cc7c48d0f..000000000
--- a/winsup/mingw/mingwex/complex/cproj.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-   cproj.c
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-/* Return the value of the projection onto the Riemann sphere.*/
-
-double complex cproj (double complex Z)
-{
-  complex double Res = Z;
-  if (isinf (__real__ Z) || isinf (__imag__ Z))
-    {
-      __real__ Res = HUGE_VAL;
-      __imag__ Res = copysign (0.0, __imag__ Z);
-    }
-  return Res;
-}
-
diff --git a/winsup/mingw/mingwex/complex/creal.c b/winsup/mingw/mingwex/complex/creal.c
deleted file mode 100644
index 6905b7e2a..000000000
--- a/winsup/mingw/mingwex/complex/creal.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <complex.h>
-double __attribute__ ((const)) creal (double complex _Z)
-{
-  return __real__ _Z;
-}
-
diff --git a/winsup/mingw/mingwex/complex/csin.c b/winsup/mingw/mingwex/complex/csin.c
deleted file mode 100644
index 37df8057e..000000000
--- a/winsup/mingw/mingwex/complex/csin.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  csin.c */
-
-/*
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-/* csin (x + I * y) = sin (x) * cosh (y)
-    + I * (cos (x) * sinh (y)) */ 
-
-double complex csin (double complex Z)
-{
-  double complex Res;
-  __real__ Res = sin (__real__ Z) * cosh ( __imag__ Z);
-  __imag__ Res = cos (__real__ Z) * sinh ( __imag__ Z);
-  return Res;
-}
-
diff --git a/winsup/mingw/mingwex/complex/csinh.c b/winsup/mingw/mingwex/complex/csinh.c
deleted file mode 100644
index 4ee6cbe86..000000000
--- a/winsup/mingw/mingwex/complex/csinh.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* csinh.c */
-/*
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-
-#include <math.h>
-#include <complex.h>
-
-/* csinh (x + I * y) = sinh (x) * cos (y)
-    + I * (cosh (x) * sin (y)) */ 
-
-
-double complex csinh (double complex Z)
-{
-  double complex Res;
-  __real__ Res = sinh (__real__ Z) * cos (__imag__ Z);
-  __imag__ Res = cosh (__real__ Z) * sin (__imag__ Z);
-  return Res;
-}
diff --git a/winsup/mingw/mingwex/complex/csqrt.c b/winsup/mingw/mingwex/complex/csqrt.c
deleted file mode 100644
index 3717939f4..000000000
--- a/winsup/mingw/mingwex/complex/csqrt.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-   csqrt.c
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-
-double complex  csqrt (double complex Z)
-{
-  double complex Res;
-  double t;
-  double x = __real__ Z;
-  double y = __imag__ Z;
-
-  if (y == 0.0)
-    {
-      if (x < 0.0)
-        {
- 	  __real__ Res = 0.0;
-	  __imag__ Res = sqrt (-x);
-        }
-      else
-        {
- 	  __real__ Res = sqrt (x);
-	  __imag__ Res = 0.0;
-        }
-    }
-
-  else if (x == 0.0)
-    {
-      t = sqrt(0.5 * fabs (y));
-      __real__ Res = y > 0 ? t : -t;
-      __imag__ Res = t;
-    }
-
-  else
-    {
-      t = sqrt (2.0  * (_hypot (x, y) + fabs (x)));
-      if ( x > 0.0)
-        {	
-          __real__ Res = 0.5 * t;
-          __imag__ Res = y / t;
-        }
-      else
-        {
-	  __real__ Res = fabs ( y / t);
-	  __imag__ Res = (y < 0.0 ? -0.5 : 0.5) * t;
-        }
-    }
-
-  return Res;
-}
-
diff --git a/winsup/mingw/mingwex/complex/ctan.c b/winsup/mingw/mingwex/complex/ctan.c
deleted file mode 100644
index a479772a9..000000000
--- a/winsup/mingw/mingwex/complex/ctan.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* ctan.c */
-
-/*
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-#include <math.h>
-#include <complex.h>
-#include <errno.h>
-
-
-/* ctan (x + I * y) = (sin (2 * x)  +  I * sinh(2 * y))
-		      / (cos (2 * x)  +  cosh (2 * y)) */
-
-double complex ctan (double complex Z)
-{
-  double complex Res;
-  double two_I = 2.0 * __imag__ Z;
-  double two_R = 2.0 * __real__ Z;
-  double denom = cos (two_R) + cosh (two_I);
-  if (denom == 0.0)
-    {
-      errno = ERANGE;
-      __real__ Res = HUGE_VAL;
-      __imag__ Res = HUGE_VAL;
-    }
-  else if (isinf (denom))
-    {
-      errno = ERANGE;
-      __real__ Res = 0.0;
-      __imag__ Res = two_I > 0 ? 1.0 : -1.0;
-    }
-  else
-    {
-      __real__ Res = sin (two_R) / denom;
-      __imag__ Res = sinh (two_I) / denom;
-    }
-  return Res;
-}
-
diff --git a/winsup/mingw/mingwex/complex/ctanh.c b/winsup/mingw/mingwex/complex/ctanh.c
deleted file mode 100644
index 6d3e615da..000000000
--- a/winsup/mingw/mingwex/complex/ctanh.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  ctanh.c */
-
-/*
-   Contributed by Danny Smith
-   2003-10-20
-*/
-
-
-#include <math.h>
-#include <complex.h>
-#include <errno.h>
-
-/*
-  ctanh (x + I * y) = (sinh (2 * x)  +  sin (2 * y) * I )
-		     / (cosh (2 * x) + cos (2 * y)) .
-*/
-
-double complex
-ctanh (double complex Z)
-{
-  double complex Res;
-  double two_R = 2.0 * __real__ Z;
-  double two_I = 2.0 * __imag__ Z;
-  double denom = cosh (two_R) + cos (two_I);
-
-  if (denom == 0.0)
-    {
-      errno = ERANGE;
-      __real__ Res = HUGE_VAL;
-      __imag__ Res = HUGE_VAL;
-    }
-  else if ( isinf (denom))
-    {
-      errno = ERANGE;
-      __real__ Res = two_R > 0 ? 1.0 : -1.0;
-      __imag__ Res = 0.0;
-    }
-  else
-    {
-      __real__ Res = sinh (two_R) / denom;
-      __imag__ Res = sin (two_I) / denom;
-    }
-  return Res;
-}
diff --git a/winsup/mingw/mingwex/configure b/winsup/mingw/mingwex/configure
deleted file mode 100755
index b369222b7..000000000
--- a/winsup/mingw/mingwex/configure
+++ /dev/null
@@ -1,1011 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=imaxabs.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-CC=${CC-cc}
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-RANLIB=${RANLIB-ranlib}
-
-DLLTOOL=${DLLTOOL-dlltool}
-
-DLLWRAP=${DLLWRAP-dllwrap}
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-case "$target_os" in
-*cygwin*)
-  MNO_CYGWIN=-mno-cygwin
-  ;;
-*)
-  # Build it for MSVCRT by default.
-  MNO_CYGWIN=
-  ;;
-esac
-
-
-
-W32API_INCLUDE='-I $(srcdir)/../../w32api/include'
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:676: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@DLLWRAP@%$DLLWRAP%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@MNO_CYGWIN@%$MNO_CYGWIN%g
-s%@W32API_INCLUDE@%$W32API_INCLUDE%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
diff --git a/winsup/mingw/mingwex/configure.in b/winsup/mingw/mingwex/configure.in
deleted file mode 100644
index f9b340e29..000000000
--- a/winsup/mingw/mingwex/configure.in
+++ /dev/null
@@ -1,55 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-dnl This file is part of Mingw runtime.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-AC_PREREQ(2.13)
-AC_INIT(imaxabs.c)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-RANLIB=${RANLIB-ranlib}
-AC_SUBST(RANLIB)
-DLLTOOL=${DLLTOOL-dlltool}
-AC_SUBST(DLLTOOL)
-DLLWRAP=${DLLWRAP-dllwrap}
-AC_SUBST(DLLWRAP)
-AC_CANONICAL_SYSTEM
-
-case "$target_os" in
-*cygwin*)
-  MNO_CYGWIN=-mno-cygwin
-  ;;
-*)
-  # Build it for MSVCRT by default.
-  MNO_CYGWIN=
-  ;;
-esac
-
-AC_SUBST(MNO_CYGWIN)
-
-W32API_INCLUDE='-I $(srcdir)/../../w32api/include'
-AC_SUBST(W32API_INCLUDE)
-
-AC_PROG_INSTALL
-AC_OUTPUT(Makefile)
-
diff --git a/winsup/mingw/mingwex/dirent.c b/winsup/mingw/mingwex/dirent.c
deleted file mode 100644
index bef2222cb..000000000
--- a/winsup/mingw/mingwex/dirent.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * dirent.c
- *
- * Derived from DIRLIB.C by Matt J. Weinstein 
- * This note appears in the DIRLIB.H
- * DIRLIB.H by M. J. Weinstein   Released to public domain 1-Jan-89
- *
- * Updated by Jeremy Bettis <jeremy@hksys.com>
- * Significantly revised and rewinddir, seekdir and telldir added by Colin
- * Peters <colin@fu.is.saga-u.ac.jp>
- *	
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <io.h>
-#include <direct.h>
-#include <dirent.h>
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h> /* for GetFileAttributes */
-
-#include <tchar.h>
-#define SUFFIX	_T("*")
-#define	SLASH	_T("\\")
-
-/*
- * opendir
- *
- * Returns a pointer to a DIR structure appropriately filled in to begin
- * searching a directory.
- */
-_TDIR * 
-_topendir (const _TCHAR *szPath)
-{
-  _TDIR *nd;
-  unsigned int rc;
-  _TCHAR szFullPath[MAX_PATH];
-	
-  errno = 0;
-
-  if (!szPath)
-    {
-      errno = EFAULT;
-      return (_TDIR *) 0;
-    }
-
-  if (szPath[0] == _T('\0'))
-    {
-      errno = ENOTDIR;
-      return (_TDIR *) 0;
-    }
-
-  /* Attempt to determine if the given path really is a directory. */
-  rc = GetFileAttributes (szPath);
-  if (rc == (unsigned int)-1)
-    {
-      /* call GetLastError for more error info */
-      errno = ENOENT;
-      return (_TDIR *) 0;
-    }
-  if (!(rc & FILE_ATTRIBUTE_DIRECTORY))
-    {
-      /* Error, entry exists but not a directory. */
-      errno = ENOTDIR;
-      return (_TDIR *) 0;
-    }
-
-  /* Make an absolute pathname.  */
-  _tfullpath (szFullPath, szPath, MAX_PATH);
-
-  /* Allocate enough space to store DIR structure and the complete
-   * directory path given. */
-  nd = (_TDIR *) malloc (sizeof (_TDIR) + (_tcslen(szFullPath) + _tcslen (SLASH) +
-			 _tcslen(SUFFIX) + 1) * sizeof(_TCHAR));
-
-  if (!nd)
-    {
-      /* Error, out of memory. */
-      errno = ENOMEM;
-      return (_TDIR *) 0;
-    }
-
-  /* Create the search expression. */
-  _tcscpy (nd->dd_name, szFullPath);
-
-  /* Add on a slash if the path does not end with one. */
-  if (nd->dd_name[0] != _T('\0') &&
-      nd->dd_name[_tcslen (nd->dd_name) - 1] != _T('/') &&
-      nd->dd_name[_tcslen (nd->dd_name) - 1] != _T('\\'))
-    {
-      _tcscat (nd->dd_name, SLASH);
-    }
-
-  /* Add on the search pattern */
-  _tcscat (nd->dd_name, SUFFIX);
-
-  /* Initialize handle to -1 so that a premature closedir doesn't try
-   * to call _findclose on it. */
-  nd->dd_handle = -1;
-
-  /* Initialize the status. */
-  nd->dd_stat = 0;
-
-  /* Initialize the dirent structure. ino and reclen are invalid under
-   * Win32, and name simply points at the appropriate part of the
-   * findfirst_t structure. */
-  nd->dd_dir.d_ino = 0;
-  nd->dd_dir.d_reclen = 0;
-  nd->dd_dir.d_namlen = 0;
-  memset (nd->dd_dir.d_name, 0, FILENAME_MAX);
-
-  return nd;
-}
-
-
-/*
- * readdir
- *
- * Return a pointer to a dirent structure filled with the information on the
- * next entry in the directory.
- */
-struct _tdirent *
-_treaddir (_TDIR * dirp)
-{
-  errno = 0;
-
-  /* Check for valid DIR struct. */
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return (struct _tdirent *) 0;
-    }
-
-  if (dirp->dd_stat < 0)
-    {
-      /* We have already returned all files in the directory
-       * (or the structure has an invalid dd_stat). */
-      return (struct _tdirent *) 0;
-    }
-  else if (dirp->dd_stat == 0)
-    {
-      /* We haven't started the search yet. */
-      /* Start the search */
-      dirp->dd_handle = _tfindfirst (dirp->dd_name, &(dirp->dd_dta));
-
-  	  if (dirp->dd_handle == -1)
-	{
-	  /* Whoops! Seems there are no files in that
-	   * directory. */
-	  dirp->dd_stat = -1;
-	}
-      else
-	{
-	  dirp->dd_stat = 1;
-	}
-    }
-  else
-    {
-      /* Get the next search entry. */
-      if (_tfindnext (dirp->dd_handle, &(dirp->dd_dta)))
-	{
-	  /* We are off the end or otherwise error.	
-	     _findnext sets errno to ENOENT if no more file
-	     Undo this. */ 
-	  DWORD winerr = GetLastError();
-	  if (winerr == ERROR_NO_MORE_FILES)
-	    errno = 0;	
-	  _findclose (dirp->dd_handle);
-	  dirp->dd_handle = -1;
-	  dirp->dd_stat = -1;
-	}
-      else
-	{
-	  /* Update the status to indicate the correct
-	   * number. */
-	  dirp->dd_stat++;
-	}
-    }
-
-  if (dirp->dd_stat > 0)
-    {
-      /* Successfully got an entry. Everything about the file is
-       * already appropriately filled in except the length of the
-       * file name. */
-      dirp->dd_dir.d_namlen = _tcslen (dirp->dd_dta.name);
-      _tcscpy (dirp->dd_dir.d_name, dirp->dd_dta.name);
-      return &dirp->dd_dir;
-    }
-
-  return (struct _tdirent *) 0;
-}
-
-
-/*
- * closedir
- *
- * Frees up resources allocated by opendir.
- */
-int
-_tclosedir (_TDIR * dirp)
-{
-  int rc;
-
-  errno = 0;
-  rc = 0;
-
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return -1;
-    }
-
-  if (dirp->dd_handle != -1)
-    {
-      rc = _findclose (dirp->dd_handle);
-    }
-
-  /* Delete the dir structure. */
-  free (dirp);
-
-  return rc;
-}
-
-/*
- * rewinddir
- *
- * Return to the beginning of the directory "stream". We simply call findclose
- * and then reset things like an opendir.
- */
-void
-_trewinddir (_TDIR * dirp)
-{
-  errno = 0;
-
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return;
-    }
-
-  if (dirp->dd_handle != -1)
-    {
-      _findclose (dirp->dd_handle);
-    }
-
-  dirp->dd_handle = -1;
-  dirp->dd_stat = 0;
-}
-
-/*
- * telldir
- *
- * Returns the "position" in the "directory stream" which can be used with
- * seekdir to go back to an old entry. We simply return the value in stat.
- */
-long
-_ttelldir (_TDIR * dirp)
-{
-  errno = 0;
-
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return -1;
-    }
-  return dirp->dd_stat;
-}
-
-/*
- * seekdir
- *
- * Seek to an entry previously returned by telldir. We rewind the directory
- * and call readdir repeatedly until either dd_stat is the position number
- * or -1 (off the end). This is not perfect, in that the directory may
- * have changed while we weren't looking. But that is probably the case with
- * any such system.
- */
-void
-_tseekdir (_TDIR * dirp, long lPos)
-{
-  errno = 0;
-
-  if (!dirp)
-    {
-      errno = EFAULT;
-      return;
-    }
-
-  if (lPos < -1)
-    {
-      /* Seeking to an invalid position. */
-      errno = EINVAL;
-      return;
-    }
-  else if (lPos == -1)
-    {
-      /* Seek past end. */
-      if (dirp->dd_handle != -1)
-	{
-	  _findclose (dirp->dd_handle);
-	}
-      dirp->dd_handle = -1;
-      dirp->dd_stat = -1;
-    }
-  else
-    {
-      /* Rewind and read forward to the appropriate index. */
-      _trewinddir (dirp);
-
-      while ((dirp->dd_stat < lPos) && _treaddir (dirp))
-	;
-    }
-}
diff --git a/winsup/mingw/mingwex/feclearexcept.c b/winsup/mingw/mingwex/feclearexcept.c
deleted file mode 100644
index e6017fc9d..000000000
--- a/winsup/mingw/mingwex/feclearexcept.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <fenv.h>
-
-/* 7.6.2.1
-   The feclearexcept function clears the supported exceptions
-   represented by its argument.  */
-
-int feclearexcept (int excepts)
-{
-  fenv_t _env;
-  __asm__ volatile ("fnstenv %0;" : "=m" (_env)); /* get the env */
-  _env.__status_word &= ~(excepts & FE_ALL_EXCEPT); /* clear the except */
-  __asm__ volatile ("fldenv %0;" :: "m" (_env)); /*set the env */
-  return 0;
-}
diff --git a/winsup/mingw/mingwex/fegetenv.c b/winsup/mingw/mingwex/fegetenv.c
deleted file mode 100644
index 5ea5bd011..000000000
--- a/winsup/mingw/mingwex/fegetenv.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <fenv.h>
-
-/* 7.6.4.1
-   The fegetenv function stores the current floating-point environment
-   in the object pointed to by envp. */
-
-int fegetenv (fenv_t * envp)
-{
-  __asm__ ("fnstenv %0;": "=m" (*envp));
-  return 0;
-}
-
diff --git a/winsup/mingw/mingwex/fegetexceptflag.c b/winsup/mingw/mingwex/fegetexceptflag.c
deleted file mode 100644
index 353e90dfa..000000000
--- a/winsup/mingw/mingwex/fegetexceptflag.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <fenv.h>
-
-
-/* 7.6.2.2  
-   The fegetexceptflag function stores an implementation-defined
-   representation of the exception flags indicated by the argument
-   excepts in the object pointed to by the argument flagp.  */
-
-int fegetexceptflag (fexcept_t * flagp, int excepts)
-{
-  unsigned short _sw;
-  __asm__ ("fnstsw %%ax;": "=a" (_sw));
-  *flagp = _sw  & excepts & FE_ALL_EXCEPT;
-  return 0;
-}
diff --git a/winsup/mingw/mingwex/fegetround.c b/winsup/mingw/mingwex/fegetround.c
deleted file mode 100644
index 076b1068c..000000000
--- a/winsup/mingw/mingwex/fegetround.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <fenv.h>
-
-/* 7.6.3.1
-   The fegetround function returns the value of the rounding direction
-   macro representing the current rounding direction.  */
-
-int
-fegetround (void)
-{
-  unsigned short _cw;
-  __asm__ ("fnstcw %0;"	: "=m" (_cw));
-  return _cw
-          & (FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO);
-}
diff --git a/winsup/mingw/mingwex/feholdexcept.c b/winsup/mingw/mingwex/feholdexcept.c
deleted file mode 100644
index df486afb3..000000000
--- a/winsup/mingw/mingwex/feholdexcept.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <fenv.h>
-
-/* 7.6.4.2
-   The feholdexcept function saves the current floating-point
-   environment in the object pointed to by envp, clears the exception
-   flags, and then installs a non-stop (continue on exceptions) mode,
-   if available, for all exceptions.  */
-
-int feholdexcept (fenv_t * envp)
-{
-  fenv_t tmp_env;
-  __asm__ ("fnstenv %0;" : "=m" (* envp)); /* save current into envp */
-  tmp_env = * envp;
-  tmp_env.__status_word &= ~FE_ALL_EXCEPT; /* clear exception flags */
-  tmp_env.__control_word |= FE_ALL_EXCEPT;  /* set cw to non-stop */
-  __asm__ volatile ("fldenv %0;" : : "m" (tmp_env)); /* install the copy */
-  return 0;
-}
diff --git a/winsup/mingw/mingwex/feraiseexcept.c b/winsup/mingw/mingwex/feraiseexcept.c
deleted file mode 100644
index b1ba87006..000000000
--- a/winsup/mingw/mingwex/feraiseexcept.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <fenv.h> 
-
-/* 7.6.2.3
-   The feraiseexcept function raises the supported exceptions
-   represented by its argument The order in which these exceptions
-   are raised is unspecified, except as stated in F.7.6.
-   Whether the feraiseexcept function additionally raises
-   the inexact exception whenever it raises the overflow
-   or underflow exception is implementation-defined. */
-
-int feraiseexcept (int excepts)
-{
-  fenv_t _env;
-  __asm__ volatile ("fnstenv %0;" : "=m" (_env));
-  _env.__status_word |= excepts & FE_ALL_EXCEPT;
-  __asm__ volatile ("fldenv %0;"
-		    "fwait;" : : "m" (_env));
-  return 0;
-}
diff --git a/winsup/mingw/mingwex/fesetenv.c b/winsup/mingw/mingwex/fesetenv.c
deleted file mode 100644
index 1e8090cc3..000000000
--- a/winsup/mingw/mingwex/fesetenv.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <fenv.h>
-#include <float.h>
-
-/* 7.6.4.3
-   The fesetenv function establishes the floating-point environment
-   represented by the object pointed to by envp. The argument envp
-   points to an object set by a call to fegetenv or feholdexcept, or
-   equal the macro FE_DFL_ENV or an implementation-defined environment
-   macro. Note that fesetenv merely installs the state of the exception
-   flags represented through its argument, and does not raise these
-   exceptions.
- */
-
-extern void (*_imp___fpreset)( void ) ;
-
-int fesetenv (const fenv_t * envp)
-{
-  if (envp == FE_PC64_ENV)
-   /*
-    *  fninit initializes the control register to 0x37f,
-    *  the status register to zero and the tag word to 0FFFFh.
-    *  The other registers are unaffected.
-    */
-    __asm__ ("fninit");
-
-  else if (envp == FE_PC53_ENV)
-   /*
-    * MS _fpreset() does same *except* it sets control word
-    * to 0x27f (53-bit precison).
-    * We force calling _fpreset in msvcrt.dll
-    */
-
-   (*_imp___fpreset)();
-
-  else if (envp == FE_DFL_ENV)
-    /* Use the choice made at app startup */ 
-    _fpreset();
-
-  else
-    __asm__ ("fldenv %0;" : : "m" (*envp));
-  return 0;
-}
diff --git a/winsup/mingw/mingwex/fesetexceptflag.c b/winsup/mingw/mingwex/fesetexceptflag.c
deleted file mode 100644
index 7f4b8e562..000000000
--- a/winsup/mingw/mingwex/fesetexceptflag.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <fenv.h> 
-
-/* 7.6.2.4
-   The fesetexceptflag function sets the complete status for those
-   exception flags indicated by the argument excepts, according to the
-   representation in the object pointed to by flagp. The value of
-   *flagp shall have been set by a previous call to fegetexceptflag
-   whose second argument represented at least those exceptions
-   represented by the argument excepts. This function does not raise
-   exceptions, but only sets the state of the flags. */ 
-
-int fesetexceptflag (const fexcept_t * flagp, int excepts) 
-{ 
-  fenv_t _env;
-
-  excepts &= FE_ALL_EXCEPT;
-  __asm__ volatile ("fnstenv %0;" : "=m" (_env));
-  _env.__status_word &= ~excepts;
-  _env.__status_word |= (*flagp & excepts);
-  __asm__ volatile ("fldenv %0;" : : "m" (_env));
-  return 0;
-}
diff --git a/winsup/mingw/mingwex/fesetround.c b/winsup/mingw/mingwex/fesetround.c
deleted file mode 100644
index a8cef86a4..000000000
--- a/winsup/mingw/mingwex/fesetround.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <fenv.h>
- /* 7.6.3.2
-    The fesetround function establishes the rounding direction
-    represented by its argument round. If the argument is not equal
-    to the value of a rounding direction macro, the rounding direction
-    is not changed.  */
-
-int fesetround (int mode)
-{
-  unsigned short _cw;
-  if ((mode & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO))
-      != 0)
-    return -1;
-  __asm__ volatile ("fnstcw %0;": "=m" (_cw));
-  _cw &= ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO);
-  _cw |= mode;
-  __asm__ volatile ("fldcw %0;" : : "m" (_cw));
-  return 0;
-}
diff --git a/winsup/mingw/mingwex/fetestexcept.c b/winsup/mingw/mingwex/fetestexcept.c
deleted file mode 100644
index 6934ed925..000000000
--- a/winsup/mingw/mingwex/fetestexcept.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <fenv.h> 
-/* 7.6.2.5 
-   The fetestexcept function determines which of a specified subset of
-   the exception flags are currently set. The excepts argument
-   specifies the exception flags to be queried.
-   The fetestexcept function returns the value of the bitwise OR of the
-   exception macros corresponding to the currently set exceptions
-   included in excepts. */
-
-int fetestexcept (int excepts)
-{
-  unsigned short _sw;
-  __asm__ ("fnstsw %%ax" : "=a" (_sw));
-  return _sw & excepts & FE_ALL_EXCEPT;
-}
diff --git a/winsup/mingw/mingwex/feupdateenv.c b/winsup/mingw/mingwex/feupdateenv.c
deleted file mode 100644
index f414837f5..000000000
--- a/winsup/mingw/mingwex/feupdateenv.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <fenv.h>
-
-/* 7.6.4.4
-   The feupdateenv function saves the currently raised exceptions in
-   its automatic storage, installs the floating-point environment
-   represented by the object pointed to by envp, and then raises the
-   saved exceptions. The argument envp shall point to an object
-   set by a call to feholdexcept or fegetenv, or equal the macro
-   FE_DFL_ENV or an implementation-defined environment macro. */
-
-/* FIXME: this works but surely there must be a better way.  */
-
-int feupdateenv (const fenv_t * envp)
-{
-  unsigned int _fexcept = fetestexcept (FE_ALL_EXCEPT); /*save excepts */
-  fesetenv (envp); /* install the env  */
-  feraiseexcept (_fexcept); /* raise the execept */
-  return 0;
-}
-
diff --git a/winsup/mingw/mingwex/fwide.c b/winsup/mingw/mingwex/fwide.c
deleted file mode 100644
index fc8bf5bf5..000000000
--- a/winsup/mingw/mingwex/fwide.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*	This source code was extracted from the Q8 package created and placed
-    in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-    Implements subclause 7.24 of ISO/IEC 9899:1999 (E).
-
-	This is a minimal implementation for environments where
-	internationalization is not considered important.
-
-	It supports an encoding where all char codes are mapped
-	to the *same* code values within a wchar_t or wint_t,
-	so long as no other wchar_t codes are used by the program.
-
-*/
-
-#include	<wchar.h>
-
-int
-fwide(stream, mode)
-	FILE	*stream;
-	int		mode;
-	{
-	return -1;			/* limited to byte orientation */
-	}
-
diff --git a/winsup/mingw/mingwex/getopt.c b/winsup/mingw/mingwex/getopt.c
deleted file mode 100644
index b5d5a23b9..000000000
--- a/winsup/mingw/mingwex/getopt.c
+++ /dev/null
@@ -1,503 +0,0 @@
-/*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dieter Baron and Thomas Klausner.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <getopt.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#define REPLACE_GETOPT
-
-#define _DIAGASSERT(x) do {} while (0)
-
-#ifdef REPLACE_GETOPT
-#ifdef __weak_alias
-__weak_alias(getopt,_getopt)
-#endif
-int	opterr = 1;		/* if error message should be printed */
-int	optind = 1;		/* index into parent argv vector */
-int	optopt = '?';		/* character checked for validity */
-int	optreset;		/* reset getopt */
-char    *optarg;		/* argument associated with option */
-#endif
-
-#ifdef __weak_alias
-__weak_alias(getopt_long,_getopt_long)
-#endif
-
-#ifndef __CYGWIN__
-#define __progname __argv[0]
-#else
-extern char __declspec(dllimport) *__progname;
-#endif
-
-#define IGNORE_FIRST	(*options == '-' || *options == '+')
-#define PRINT_ERROR	((opterr) && ((*options != ':') \
-				      || (IGNORE_FIRST && options[1] != ':')))
-
-#define IS_POSIXLY_CORRECT (getenv("POSIXLY_INCORRECT_GETOPT") == NULL)
-
-#define PERMUTE         (!IS_POSIXLY_CORRECT && !IGNORE_FIRST)
-/* XXX: GNU ignores PC if *options == '-' */
-#define IN_ORDER        (!IS_POSIXLY_CORRECT && *options == '-')
-
-/* return values */
-#define	BADCH	(int)'?'
-#define	BADARG		((IGNORE_FIRST && options[1] == ':') \
-			 || (*options == ':') ? (int)':' : (int)'?')
-#define INORDER (int)1
-
-static char EMSG[1];
-
-static int getopt_internal (int, char * const *, const char *);
-static int gcd (int, int);
-static void permute_args (int, int, int, char * const *);
-
-static char *place = EMSG; /* option letter processing */
-
-/* XXX: set optreset to 1 rather than these two */
-static int nonopt_start = -1; /* first non option argument (for permute) */
-static int nonopt_end = -1;   /* first option after non options (for permute) */
-
-/* Error messages */
-static const char recargchar[] = "option requires an argument -- %c";
-static const char recargstring[] = "option requires an argument -- %s";
-static const char ambig[] = "ambiguous option -- %.*s";
-static const char noarg[] = "option doesn't take an argument -- %.*s";
-static const char illoptchar[] = "unknown option -- %c";
-static const char illoptstring[] = "unknown option -- %s";
-
-static void
-_vwarnx(const char *fmt, va_list ap)
-{
-  (void)fprintf(stderr, "%s: ", __progname);
-  if (fmt != NULL)
-    (void)vfprintf(stderr, fmt, ap);
-  (void)fprintf(stderr, "\n");
-}
-
-static void
-warnx(const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  _vwarnx(fmt, ap);
-  va_end(ap);
-}
-
-/*
- * Compute the greatest common divisor of a and b.
- */
-static int
-gcd(a, b)
-	int a;
-	int b;
-{
-	int c;
-
-	c = a % b;
-	while (c != 0) {
-		a = b;
-		b = c;
-		c = a % b;
-	}
-
-	return b;
-}
-
-/*
- * Exchange the block from nonopt_start to nonopt_end with the block
- * from nonopt_end to opt_end (keeping the same order of arguments
- * in each block).
- */
-static void
-permute_args(panonopt_start, panonopt_end, opt_end, nargv)
-	int panonopt_start;
-	int panonopt_end;
-	int opt_end;
-	char * const *nargv;
-{
-	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
-	char *swap;
-
-	_DIAGASSERT(nargv != NULL);
-
-	/*
-	 * compute lengths of blocks and number and size of cycles
-	 */
-	nnonopts = panonopt_end - panonopt_start;
-	nopts = opt_end - panonopt_end;
-	ncycle = gcd(nnonopts, nopts);
-	cyclelen = (opt_end - panonopt_start) / ncycle;
-
-	for (i = 0; i < ncycle; i++) {
-		cstart = panonopt_end+i;
-		pos = cstart;
-		for (j = 0; j < cyclelen; j++) {
-			if (pos >= panonopt_end)
-				pos -= nnonopts;
-			else
-				pos += nopts;
-			swap = nargv[pos];
-			/* LINTED const cast */
-			((char **) nargv)[pos] = nargv[cstart];
-			/* LINTED const cast */
-			((char **)nargv)[cstart] = swap;
-		}
-	}
-}
-
-/*
- * getopt_internal --
- *	Parse argc/argv argument vector.  Called by user level routines.
- *  Returns -2 if -- is found (can be long option or end of options marker).
- */
-static int
-getopt_internal(nargc, nargv, options)
-	int nargc;
-	char * const *nargv;
-	const char *options;
-{
-	char *oli;				/* option letter list index */
-	int optchar;
-
-	_DIAGASSERT(nargv != NULL);
-	_DIAGASSERT(options != NULL);
-
-	optarg = NULL;
-
-	/*
-	 * XXX Some programs (like rsyncd) expect to be able to
-	 * XXX re-initialize optind to 0 and have getopt_long(3)
-	 * XXX properly function again.  Work around this braindamage.
-	 */
-	if (optind == 0)
-		optind = 1;
-
-	if (optreset)
-		nonopt_start = nonopt_end = -1;
-start:
-	if (optreset || !*place) {		/* update scanning pointer */
-		optreset = 0;
-		if (optind >= nargc) {          /* end of argument vector */
-			place = EMSG;
-			if (nonopt_end != -1) {
-				/* do permutation, if we have to */
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			else if (nonopt_start != -1) {
-				/*
-				 * If we skipped non-options, set optind
-				 * to the first of them.
-				 */
-				optind = nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return -1;
-		}
-		if ((*(place = nargv[optind]) != '-')
-		    || (place[1] == '\0')) {    /* found non-option */
-			place = EMSG;
-			if (IN_ORDER) {
-				/*
-				 * GNU extension:
-				 * return non-option as argument to option 1
-				 */
-				optarg = nargv[optind++];
-				return INORDER;
-			}
-			if (!PERMUTE) {
-				/*
-				 * if no permutation wanted, stop parsing
-				 * at first non-option
-				 */
-				return -1;
-			}
-			/* do permutation */
-			if (nonopt_start == -1)
-				nonopt_start = optind;
-			else if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				nonopt_start = optind -
-				    (nonopt_end - nonopt_start);
-				nonopt_end = -1;
-			}
-			optind++;
-			/* process next argument */
-			goto start;
-		}
-		if (nonopt_start != -1 && nonopt_end == -1)
-			nonopt_end = optind;
-		if (place[1] && *++place == '-') {	/* found "--" */
-			place++;
-			return -2;
-		}
-	}
-	if ((optchar = (int)*place++) == (int)':' ||
-	    (oli = strchr(options + (IGNORE_FIRST ? 1 : 0), optchar)) == NULL) {
-		/* option letter unknown or ':' */
-		if (!*place)
-			++optind;
-		if (PRINT_ERROR)
-			warnx(illoptchar, optchar);
-		optopt = optchar;
-		return BADCH;
-	}
-	if (optchar == 'W' && oli[1] == ';') {		/* -W long-option */
-		/* XXX: what if no long options provided (called by getopt)? */
-		if (*place)
-			return -2;
-
-		if (++optind >= nargc) {	/* no arg */
-			place = EMSG;
-			if (PRINT_ERROR)
-				warnx(recargchar, optchar);
-			optopt = optchar;
-			return BADARG;
-		} else				/* white space */
-			place = nargv[optind];
-		/*
-		 * Handle -W arg the same as --arg (which causes getopt to
-		 * stop parsing).
-		 */
-		return -2;
-	}
-	if (*++oli != ':') {			/* doesn't take argument */
-		if (!*place)
-			++optind;
-	} else {				/* takes (optional) argument */
-		optarg = NULL;
-		if (*place)			/* no white space */
-			optarg = place;
-		/* XXX: disable test for :: if PC? (GNU doesn't) */
-		else if (oli[1] != ':') {	/* arg not optional */
-			if (++optind >= nargc) {	/* no arg */
-				place = EMSG;
-				if (PRINT_ERROR)
-					warnx(recargchar, optchar);
-				optopt = optchar;
-				return BADARG;
-			} else
-				optarg = nargv[optind];
-		}
-		place = EMSG;
-		++optind;
-	}
-	/* dump back option letter */
-	return optchar;
-}
-
-#ifdef REPLACE_GETOPT
-/*
- * getopt --
- *	Parse argc/argv argument vector.
- *
- * [eventually this will replace the real getopt]
- */
-int
-getopt(nargc, nargv, options)
-	int nargc;
-	char * const *nargv;
-	const char *options;
-{
-	int retval;
-
-	_DIAGASSERT(nargv != NULL);
-	_DIAGASSERT(options != NULL);
-
-	if ((retval = getopt_internal(nargc, nargv, options)) == -2) {
-		++optind;
-		/*
-		 * We found an option (--), so if we skipped non-options,
-		 * we have to permute.
-		 */
-		if (nonopt_end != -1) {
-			permute_args(nonopt_start, nonopt_end, optind,
-				       nargv);
-			optind -= nonopt_end - nonopt_start;
-		}
-		nonopt_start = nonopt_end = -1;
-		retval = -1;
-	}
-	return retval;
-}
-#endif
-
-/*
- * getopt_long --
- *	Parse argc/argv argument vector.
- */
-int
-getopt_long(nargc, nargv, options, long_options, idx)
-	int nargc;
-	char * const *nargv;
-	const char *options;
-	const struct option *long_options;
-	int *idx;
-{
-	int retval;
-
-	_DIAGASSERT(nargv != NULL);
-	_DIAGASSERT(options != NULL);
-	_DIAGASSERT(long_options != NULL);
-	/* idx may be NULL */
-
-	if ((retval = getopt_internal(nargc, nargv, options)) == -2) {
-		char *current_argv, *has_equal;
-		size_t current_argv_len;
-		int i, match;
-
-		current_argv = place;
-		match = -1;
-
-		optind++;
-		place = EMSG;
-
-		if (*current_argv == '\0') {		/* found "--" */
-			/*
-			 * We found an option (--), so if we skipped
-			 * non-options, we have to permute.
-			 */
-			if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return -1;
-		}
-		if ((has_equal = strchr(current_argv, '=')) != NULL) {
-			/* argument found (--option=arg) */
-			current_argv_len = has_equal - current_argv;
-			has_equal++;
-		} else
-			current_argv_len = strlen(current_argv);
-
-		for (i = 0; long_options[i].name; i++) {
-			/* find matching long option */
-			if (strncmp(current_argv, long_options[i].name,
-			    current_argv_len))
-				continue;
-
-			if (strlen(long_options[i].name) ==
-			    (unsigned)current_argv_len) {
-				/* exact match */
-				match = i;
-				break;
-			}
-			if (match == -1)		/* partial match */
-				match = i;
-			else {
-				/* ambiguous abbreviation */
-				if (PRINT_ERROR)
-					warnx(ambig, (int)current_argv_len,
-					     current_argv);
-				optopt = 0;
-				return BADCH;
-			}
-		}
-		if (match != -1) {			/* option found */
-			if (long_options[match].has_arg == no_argument
-			    && has_equal) {
-				if (PRINT_ERROR)
-					warnx(noarg, (int)current_argv_len,
-					     current_argv);
-				/*
-				 * XXX: GNU sets optopt to val regardless of
-				 * flag
-				 */
-				if (long_options[match].flag == NULL)
-					optopt = long_options[match].val;
-				else
-					optopt = 0;
-				return BADARG;
-			}
-			if (long_options[match].has_arg == required_argument ||
-			    long_options[match].has_arg == optional_argument) {
-				if (has_equal)
-					optarg = has_equal;
-				else if (long_options[match].has_arg ==
-				    required_argument) {
-					/*
-					 * optional argument doesn't use
-					 * next nargv
-					 */
-					optarg = nargv[optind++];
-				}
-			}
-			if ((long_options[match].has_arg == required_argument)
-			    && (optarg == NULL)) {
-				/*
-				 * Missing argument; leading ':'
-				 * indicates no error should be generated
-				 */
-				if (PRINT_ERROR)
-					warnx(recargstring, current_argv);
-				/*
-				 * XXX: GNU sets optopt to val regardless
-				 * of flag
-				 */
-				if (long_options[match].flag == NULL)
-					optopt = long_options[match].val;
-				else
-					optopt = 0;
-				--optind;
-				return BADARG;
-			}
-		} else {			/* unknown option */
-			if (PRINT_ERROR)
-				warnx(illoptstring, current_argv);
-			optopt = 0;
-			return BADCH;
-		}
-		if (long_options[match].flag) {
-			*long_options[match].flag = long_options[match].val;
-			retval = 0;
-		} else
-			retval = long_options[match].val;
-		if (idx)
-			*idx = match;
-	}
-	return retval;
-}
diff --git a/winsup/mingw/mingwex/imaxabs.c b/winsup/mingw/mingwex/imaxabs.c
deleted file mode 100644
index b643ceab6..000000000
--- a/winsup/mingw/mingwex/imaxabs.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-    This source code was extracted from the Q8 package created and
-    placed in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-	Implements subclause 7.8.2 of ISO/IEC 9899:1999 (E).
-
-	This particular implementation requires the matching <inttypes.h>.
-*/
-
-#include	<inttypes.h>
-
-intmax_t
-imaxabs (intmax_t _j)
-  { return	_j >= 0 ? _j : -_j; }
-
-long long __attribute__ ((alias ("imaxabs")))	llabs (long long); 
diff --git a/winsup/mingw/mingwex/imaxdiv.c b/winsup/mingw/mingwex/imaxdiv.c
deleted file mode 100644
index 6acfcf6cb..000000000
--- a/winsup/mingw/mingwex/imaxdiv.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-    This source code was extracted from the Q8 package created and
-    placed in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-
-	last edit:	1999/11/05	gwyn@arl.mil
-
-	Implements subclause 7.8.2 of ISO/IEC 9899:1999 (E).
-
-*/
-
-#include	<inttypes.h>
-
-imaxdiv_t
-imaxdiv(intmax_t numer, intmax_t denom)
-{
-  imaxdiv_t	result;
-  result.quot = numer / denom;
-  result.rem = numer % denom;
-  return result;
-}
-
-long long __attribute__ ((alias ("imaxdiv")))
-lldiv (long long, long long); 
diff --git a/winsup/mingw/mingwex/ldtoa.c b/winsup/mingw/mingwex/ldtoa.c
deleted file mode 100644
index 09dc7911b..000000000
--- a/winsup/mingw/mingwex/ldtoa.c
+++ /dev/null
@@ -1,614 +0,0 @@
-/* This file is extracted from S L Moshier's  ioldoubl.c,
- * modified for use in MinGW 
- *
- * Extended precision arithmetic functions for long double I/O.
- * This program has been placed in the public domain.
- */
-  
-
-/*
- * Revision history:
- *
- *  5 Jan 84	PDP-11 assembly language version
- *  6 Dec 86	C language version
- * 30 Aug 88	100 digit version, improved rounding
- * 15 May 92    80-bit long double support
- *
- * Author:  S. L. Moshier.
- *
- * 6 Oct 02	Modified for MinGW by inlining utility routines,
- * 		removing global variables and splitting out strtold
- *		from _IO_ldtoa and _IO_ldtostr.
- *  
- *		Danny Smith <dannysmith@users.sourceforge.net>
- * 
- */
- 
-
-#ifdef USE_LDTOA
-
-#include "math/cephes_emath.h"
-
-#if NE == 10
-
-/* 1.0E0 */
-static const unsigned short __eone[NE] =
- {0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x3fff,};
-
-#else
-
-static const unsigned short __eone[NE] = {
-0, 0000000,0000000,0000000,0100000,0x3fff,};
-#endif
-
-
-#if NE == 10
-static const unsigned short __etens[NTEN + 1][NE] =
-{
-  {0x6576, 0x4a92, 0x804a, 0x153f,
-   0xc94c, 0x979a, 0x8a20, 0x5202, 0xc460, 0x7525,},	/* 10**4096 */
-  {0x6a32, 0xce52, 0x329a, 0x28ce,
-   0xa74d, 0x5de4, 0xc53d, 0x3b5d, 0x9e8b, 0x5a92,},	/* 10**2048 */
-  {0x526c, 0x50ce, 0xf18b, 0x3d28,
-   0x650d, 0x0c17, 0x8175, 0x7586, 0xc976, 0x4d48,},
-  {0x9c66, 0x58f8, 0xbc50, 0x5c54,
-   0xcc65, 0x91c6, 0xa60e, 0xa0ae, 0xe319, 0x46a3,},
-  {0x851e, 0xeab7, 0x98fe, 0x901b,
-   0xddbb, 0xde8d, 0x9df9, 0xebfb, 0xaa7e, 0x4351,},
-  {0x0235, 0x0137, 0x36b1, 0x336c,
-   0xc66f, 0x8cdf, 0x80e9, 0x47c9, 0x93ba, 0x41a8,},
-  {0x50f8, 0x25fb, 0xc76b, 0x6b71,
-   0x3cbf, 0xa6d5, 0xffcf, 0x1f49, 0xc278, 0x40d3,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0xf020, 0xb59d, 0x2b70, 0xada8, 0x9dc5, 0x4069,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0400, 0xc9bf, 0x8e1b, 0x4034,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x2000, 0xbebc, 0x4019,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0x9c40, 0x400c,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0xc800, 0x4005,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0x4002,},	/* 10**1 */
-};
-
-#else
-static const unsigned short __etens[NTEN+1][NE] = {
-{0xc94c,0x979a,0x8a20,0x5202,0xc460,0x7525,},/* 10**4096 */
-{0xa74d,0x5de4,0xc53d,0x3b5d,0x9e8b,0x5a92,},/* 10**2048 */
-{0x650d,0x0c17,0x8175,0x7586,0xc976,0x4d48,},
-{0xcc65,0x91c6,0xa60e,0xa0ae,0xe319,0x46a3,},
-{0xddbc,0xde8d,0x9df9,0xebfb,0xaa7e,0x4351,},
-{0xc66f,0x8cdf,0x80e9,0x47c9,0x93ba,0x41a8,},
-{0x3cbf,0xa6d5,0xffcf,0x1f49,0xc278,0x40d3,},
-{0xf020,0xb59d,0x2b70,0xada8,0x9dc5,0x4069,},
-{0x0000,0x0000,0x0400,0xc9bf,0x8e1b,0x4034,},
-{0x0000,0x0000,0x0000,0x2000,0xbebc,0x4019,},
-{0x0000,0x0000,0x0000,0x0000,0x9c40,0x400c,},
-{0x0000,0x0000,0x0000,0x0000,0xc800,0x4005,},
-{0x0000,0x0000,0x0000,0x0000,0xa000,0x4002,}, /* 10**1 */
-};
-#endif
-
-#if NE == 10
-static const unsigned short __emtens[NTEN + 1][NE] =
-{
-  {0x2030, 0xcffc, 0xa1c3, 0x8123,
-   0x2de3, 0x9fde, 0xd2ce, 0x04c8, 0xa6dd, 0x0ad8,},	/* 10**-4096 */
-  {0x8264, 0xd2cb, 0xf2ea, 0x12d4,
-   0x4925, 0x2de4, 0x3436, 0x534f, 0xceae, 0x256b,},	/* 10**-2048 */
-  {0xf53f, 0xf698, 0x6bd3, 0x0158,
-   0x87a6, 0xc0bd, 0xda57, 0x82a5, 0xa2a6, 0x32b5,},
-  {0xe731, 0x04d4, 0xe3f2, 0xd332,
-   0x7132, 0xd21c, 0xdb23, 0xee32, 0x9049, 0x395a,},
-  {0xa23e, 0x5308, 0xfefb, 0x1155,
-   0xfa91, 0x1939, 0x637a, 0x4325, 0xc031, 0x3cac,},
-  {0xe26d, 0xdbde, 0xd05d, 0xb3f6,
-   0xac7c, 0xe4a0, 0x64bc, 0x467c, 0xddd0, 0x3e55,},
-  {0x2a20, 0x6224, 0x47b3, 0x98d7,
-   0x3f23, 0xe9a5, 0xa539, 0xea27, 0xa87f, 0x3f2a,},
-  {0x0b5b, 0x4af2, 0xa581, 0x18ed,
-   0x67de, 0x94ba, 0x4539, 0x1ead, 0xcfb1, 0x3f94,},
-  {0xbf71, 0xa9b3, 0x7989, 0xbe68,
-   0x4c2e, 0xe15b, 0xc44d, 0x94be, 0xe695, 0x3fc9,},
-  {0x3d4d, 0x7c3d, 0x36ba, 0x0d2b,
-   0xfdc2, 0xcefc, 0x8461, 0x7711, 0xabcc, 0x3fe4,},
-  {0xc155, 0xa4a8, 0x404e, 0x6113,
-   0xd3c3, 0x652b, 0xe219, 0x1758, 0xd1b7, 0x3ff1,},
-  {0xd70a, 0x70a3, 0x0a3d, 0xa3d7,
-   0x3d70, 0xd70a, 0x70a3, 0x0a3d, 0xa3d7, 0x3ff8,},
-  {0xcccd, 0xcccc, 0xcccc, 0xcccc,
-   0xcccc, 0xcccc, 0xcccc, 0xcccc, 0xcccc, 0x3ffb,},	/* 10**-1 */
-};
-
-#else
-static const unsigned short __emtens[NTEN+1][NE] = {
-{0x2de4,0x9fde,0xd2ce,0x04c8,0xa6dd,0x0ad8,}, /* 10**-4096 */
-{0x4925,0x2de4,0x3436,0x534f,0xceae,0x256b,}, /* 10**-2048 */
-{0x87a6,0xc0bd,0xda57,0x82a5,0xa2a6,0x32b5,},
-{0x7133,0xd21c,0xdb23,0xee32,0x9049,0x395a,},
-{0xfa91,0x1939,0x637a,0x4325,0xc031,0x3cac,},
-{0xac7d,0xe4a0,0x64bc,0x467c,0xddd0,0x3e55,},
-{0x3f24,0xe9a5,0xa539,0xea27,0xa87f,0x3f2a,},
-{0x67de,0x94ba,0x4539,0x1ead,0xcfb1,0x3f94,},
-{0x4c2f,0xe15b,0xc44d,0x94be,0xe695,0x3fc9,},
-{0xfdc2,0xcefc,0x8461,0x7711,0xabcc,0x3fe4,},
-{0xd3c3,0x652b,0xe219,0x1758,0xd1b7,0x3ff1,},
-{0x3d71,0xd70a,0x70a3,0x0a3d,0xa3d7,0x3ff8,},
-{0xcccd,0xcccc,0xcccc,0xcccc,0xcccc,0x3ffb,}, /* 10**-1 */
-};
-#endif
-
-/* This routine will not return more than NDEC+1 digits. */
-void __etoasc(short unsigned int * __restrict__ x,
-		   char * __restrict__ string,
-		   const int ndigits, const int outformat,
-		   int* outexp)
-{
-long digit;
-unsigned short y[NI], t[NI], u[NI], w[NI], equot[NI];
-const unsigned short *r, *p;
-const unsigned short *ten;
-unsigned short sign;
-int i, j, k, expon, ndigs;
-char *s, *ss;
-unsigned short m;
-
-ndigs = ndigits;
-#ifdef NANS
-if( __eisnan(x) )
-	{
-	sprintf( string, " NaN " );
-	expon = 9999;
-	goto bxit;
-	}
-#endif
-__emov( x, y ); /* retain external format */
-if( y[NE-1] & 0x8000 )
-	{
-	sign = 0xffff;
-	y[NE-1] &= 0x7fff;
-	}
-else
-	{
-	sign = 0;
-	}
-expon = 0;
-ten = &__etens[NTEN][0];
-__emov( __eone, t );
-/* Test for zero exponent */
-if( y[NE-1] == 0 )
-	{
-	for( k=0; k<NE-1; k++ )
-		{
-		if( y[k] != 0 )
-			goto tnzro; /* denormalized number */
-		}
-	goto isone; /* legal all zeros */
-	}
-tnzro:
-
-/* Test for infinity.
- */
-if( y[NE-1] == 0x7fff )
-	{
-	if( sign )
-		sprintf( string, " -Infinity " );
-	else
-		sprintf( string, " Infinity " );
-	expon = 9999;
-	goto bxit;
-	}
-
-/* Test for exponent nonzero but significand denormalized.
- * This is an error condition.
- */
-if( (y[NE-1] != 0) && ((y[NE-2] & 0x8000) == 0) )
-	{
-	mtherr( "etoasc", DOMAIN );
-	sprintf( string, "NaN" );
-	expon = 9999;
-	goto bxit;
-	}
-
-/* Compare to 1.0 */
-i = __ecmp( __eone, y );
-if( i == 0 )
-	goto isone;
-
-if( i < 0 )
-	{ /* Number is greater than 1 */
-/* Convert significand to an integer and strip trailing decimal zeros. */
-	__emov( y, u );
-	u[NE-1] = EXONE + NBITS - 1;
-
-	p = &__etens[NTEN-4][0];
-	m = 16;
-do
-	{
-	__ediv( p, u, t);
-	__efloor( t, w );
-	for( j=0; j<NE-1; j++ )
-		{
-		if( t[j] != w[j] )
-			goto noint;
-		}
-	__emov( t, u );
-	expon += (int )m;
-noint:
-	p += NE;
-	m >>= 1;
-	}
-while( m != 0 );
-
-/* Rescale from integer significand */
-	u[NE-1] += y[NE-1] - (unsigned int )(EXONE + NBITS - 1);
-	__emov( u, y );
-/* Find power of 10 */
-	__emov( __eone, t );
-	m = MAXP;
-	p = &__etens[0][0];
-	while( __ecmp( ten, u ) <= 0 )
-		{
-		if( __ecmp( p, u ) <= 0 )
-			{
-			__ediv( p, u, u );
-			__emul( p, t, t );
-			expon += (int )m;
-			}
-		m >>= 1;
-		if( m == 0 )
-			break;
-		p += NE;
-		}
-	}
-else
-	{ /* Number is less than 1.0 */
-/* Pad significand with trailing decimal zeros. */
-	if( y[NE-1] == 0 )
-		{
-		while( (y[NE-2] & 0x8000) == 0 )
-			{
-			__emul( ten, y, y );
-			expon -= 1;
-			}
-		}
-	else
-		{
-		__emovi( y, w );
-		for( i=0; i<NDEC+1; i++ )
-			{
-			if( (w[NI-1] & 0x7) != 0 )
-				break;
-/* multiply by 10 */
-			__emovz( w, u );
-			__eshdn1( u );
-			__eshdn1( u );
-			__eaddm( w, u );
-			u[1] += 3;
-			while( u[2] != 0 )
-				{
-				__eshdn1(u);
-				u[1] += 1;
-				}
-			if( u[NI-1] != 0 )
-				break;
-			if( __eone[NE-1] <= u[1] )
-				break;
-			__emovz( u, w );
-			expon -= 1;
-			}
-		__emovo( w, y );
-		}
-	k = -MAXP;
-	p = &__emtens[0][0];
-	r = &__etens[0][0];
-	__emov( y, w );
-	__emov( __eone, t );
-	while( __ecmp( __eone, w ) > 0 )
-		{
-		if( __ecmp( p, w ) >= 0 )
-			{
-			__emul( r, w, w );
-			__emul( r, t, t );
-			expon += k;
-			}
-		k /= 2;
-		if( k == 0 )
-			break;
-		p += NE;
-		r += NE;
-		}
-	__ediv( t, __eone, t );
-	}
-isone:
-/* Find the first (leading) digit. */
-__emovi( t, w );
-__emovz( w, t );
-__emovi( y, w );
-__emovz( w, y );
-__eiremain( t, y, equot);
-digit = equot[NI-1];
-while( (digit == 0) && (__eiszero(y) == 0) )
-	{
-	__eshup1( y );
-	__emovz( y, u );
-	__eshup1( u );
-	__eshup1( u );
-	__eaddm( u, y );
-	__eiremain( t, y, equot);
-	digit = equot[NI-1];
-	expon -= 1;
-	}
-s = string;
-if( sign )
-	*s++ = '-';
-else
-	*s++ = ' ';
-/* Examine number of digits requested by caller. */
-if( outformat == 3 )
-        ndigs += expon;
-/*
-else if( ndigs < 0 )
-        ndigs = 0;
-*/
-if( ndigs > NDEC )
-	ndigs = NDEC;
-if( digit == 10 )
-	{
-	*s++ = '1';
-	*s++ = '.';
-	if( ndigs > 0 )
-		{
-		*s++ = '0';
-		ndigs -= 1;
-		}
-	expon += 1;
-	if( ndigs < 0 )
-	        {
-	        ss = s;
-	        goto doexp;
-	        }
-	}
-else
-	{
-	*s++ = (char )digit + '0';
-	*s++ = '.';
-	}
-/* Generate digits after the decimal point. */
-for( k=0; k<=ndigs; k++ )
-	{
-/* multiply current number by 10, without normalizing */
-	__eshup1( y );
-	__emovz( y, u );
-	__eshup1( u );
-	__eshup1( u );
-	__eaddm( u, y );
-	__eiremain( t, y, equot);
-	*s++ = (char )equot[NI-1] + '0';
-	}
-digit = equot[NI-1];
---s;
-ss = s;
-/* round off the ASCII string */
-if( digit > 4 )
-	{
-/* Test for critical rounding case in ASCII output. */
-	if( digit == 5 )
-		{
-		if( __eiiszero(y) == 0 )
-			goto roun;	/* round to nearest */
-		if( (*(s-1) & 1) == 0 )
-			goto doexp;	/* round to even */
-		}
-/* Round up and propagate carry-outs */
-roun:
-	--s;
-	k = *s & 0x7f;
-/* Carry out to most significant digit? */
-	if( ndigs < 0 )
-		{
-	        /* This will print like "1E-6". */
-		*s = '1';
-
-		expon += 1;
-		goto doexp;
-		}
-	else if( k == '.' )
-		{
-		--s;
-		k = *s;
-		k += 1;
-		*s = (char )k;
-/* Most significant digit carries to 10? */
-		if( k > '9' )
-			{
-			expon += 1;
-			*s = '1';
-			}
-		goto doexp;
-		}
-/* Round up and carry out from less significant digits */
-	k += 1;
-	*s = (char )k;
-	if( k > '9' )
-		{
-		*s = '0';
-		goto roun;
-		}
-	}
-doexp:
-#if defined (__GO32__)  || defined (__MINGW32__) 
-if( expon >= 0 )
-	sprintf( ss, "e+%02d", expon );
-else
-	sprintf( ss, "e-%02d", -expon );
-#else
-	sprintf( ss, "E%d", expon );
-#endif
-bxit:
-
-if (outexp)
-  *outexp =  expon;
-}
-
-
-/* FIXME: Not thread safe */ 
-static char outstr[128];
-
- char *
-_IO_ldtoa(long double d, int mode, int ndigits, int *decpt,
-	  int *sign, char **rve)
-{
-unsigned short e[NI];
-char *s, *p;
-int k;
-int outexpon = 0;
-
-union
-  {
-    unsigned short int us[6];
-    long double ld;
-  } xx;
-xx.ld = d; 
-__e64toe(xx.us, e );
-if( __eisneg(e) )
-        *sign = 1;
-else
-        *sign = 0;
-/* Mode 3 is "f" format.  */
-if( mode != 3 )
-        ndigits -= 1;
-/* Mode 0 is for %.999 format, which is supposed to give a
-   minimum length string that will convert back to the same binary value.
-   For now, just ask for 20 digits which is enough but sometimes too many.  */
-if( mode == 0 )
-        ndigits = 20;
-/* This sanity limit must agree with the corresponding one in etoasc, to
-   keep straight the returned value of outexpon.  */
-if( ndigits > NDEC )
-        ndigits = NDEC;
-
-__etoasc( e, outstr, ndigits, mode, &outexpon );
-s =  outstr;
-if( __eisinf(e) || __eisnan(e) )
-        {
-        *decpt = 9999;
-        goto stripspaces;
-        }
-*decpt = outexpon + 1;
-
-/* Transform the string returned by etoasc into what the caller wants.  */
-
-/* Look for decimal point and delete it from the string. */
-s = outstr;
-while( *s != '\0' )
-        {
-        if( *s == '.' )
-               goto yesdecpt;
-        ++s;
-        }
-goto nodecpt;
-
-yesdecpt:
-
-/* Delete the decimal point.  */
-while( *s != '\0' )
-        {
-        *s = *(s+1);
-        ++s;
-        }
-
-nodecpt:
-
-/* Back up over the exponent field. */
-while( *s != 'E' && *s != 'e' && s > outstr)
-        --s;
-*s = '\0';
-
-stripspaces:
-
-/* Strip leading spaces and sign. */
-p = outstr;
-while( *p == ' ' || *p == '-')
-        ++p;
-
-/* Find new end of string.  */
-s = outstr;
-while( (*s++ = *p++) != '\0' )
-        ;
---s;
-
-/* Strip trailing zeros.  */
-if( mode == 2 )
-        k = 1;
-else if( ndigits > outexpon )
-        k = ndigits;
-else
-        k = outexpon;
-
-while( *(s-1) == '0' && ((s - outstr) > k))
-        *(--s) = '\0';
-
-/* In f format, flush small off-scale values to zero.
-   Rounding has been taken care of by etoasc. */
-if( mode == 3 && ((ndigits + outexpon) < 0))
-        {
-        s = outstr;
-        *s = '\0';
-        *decpt = 0;
-        }
-
-if( rve )
-        *rve = s;
-return outstr;
-}
-
-void
-_IO_ldtostr(long double *x, char *string, int ndigs, int flags, char fmt)
-{
-unsigned short w[NI];
-char *t, *u;
-int outexpon = 0;
-int outformat = -1;
-char dec_sym = *(localeconv()->decimal_point);
-
-__e64toe( (unsigned short *)x, w );
-__etoasc( w, string, ndigs, outformat, &outexpon );
-
-if( ndigs == 0 && flags == 0 )
-	{
-	/* Delete the decimal point unless alternate format.  */
-	t = string;	
-	while( *t != '.' )
-		++t;
-	u = t +  1;
-	while( *t != '\0' )
-		*t++ = *u++;
-	}
-if (*string == ' ')
-	{
-	t = string;	
-	u = t + 1;
-	while( *t != '\0' )
-		*t++ = *u++;
-	}
-if (fmt == 'E')
-	{
-	t = string;	
-	while( *t != 'e' )
-		++t;
-	*t = 'E';
-	}
-if (dec_sym != '.')
-  {
-    t = string;
-    while (*t != '.')
-      ++t;
-    *t = dec_sym;
-  }
-}
-
-#endif /* USE_LDTOA */
diff --git a/winsup/mingw/mingwex/lltoa.c b/winsup/mingw/mingwex/lltoa.c
deleted file mode 100644
index 28248a834..000000000
--- a/winsup/mingw/mingwex/lltoa.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <stdlib.h>
-char* lltoa(long long _n, char * _c, int _i)
-	{ return _i64toa (_n, _c, _i); }
diff --git a/winsup/mingw/mingwex/lltow.c b/winsup/mingw/mingwex/lltow.c
deleted file mode 100644
index cdf45b742..000000000
--- a/winsup/mingw/mingwex/lltow.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <stdlib.h>
-wchar_t* lltow(long long _n, wchar_t * _w, int _i)
-	{ return _i64tow (_n, _w, _i); } 
diff --git a/winsup/mingw/mingwex/math/acosf.c b/winsup/mingw/mingwex/math/acosf.c
deleted file mode 100644
index 364f6a90c..000000000
--- a/winsup/mingw/mingwex/math/acosf.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-#include <math.h>
-
-float
-acosf (float x)
-{
-  float res;
-
-  /* acosl = atanl (sqrtl(1 - x^2) / x) */
-  asm (	"fld	%%st\n\t"
-	"fmul	%%st(0)\n\t"		/* x^2 */
-	"fld1\n\t"
-	"fsubp\n\t"			/* 1 - x^2 */
-	"fsqrt\n\t"			/* sqrtl (1 - x^2) */
-	"fxch	%%st(1)\n\t"
-	"fpatan"
-	: "=t" (res) : "0" (x) : "st(1)");
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/acosl.c b/winsup/mingw/mingwex/math/acosl.c
deleted file mode 100644
index f98d2cdc1..000000000
--- a/winsup/mingw/mingwex/math/acosl.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- */
-
-#include <math.h>
-
-long double
-acosl (long double x)
-{
-  long double res;
-
-  /* acosl = atanl (sqrtl(1 - x^2) / x) */
-  asm (	"fld	%%st\n\t"
-	"fmul	%%st(0)\n\t"		/* x^2 */
-	"fld1\n\t"
-	"fsubp\n\t"			/* 1 - x^2 */
-	"fsqrt\n\t"			/* sqrtl (1 - x^2) */
-	"fxch	%%st(1)\n\t"
-	"fpatan"
-	: "=t" (res) : "0" (x) : "st(1)");
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/asinf.c b/winsup/mingw/mingwex/math/asinf.c
deleted file mode 100644
index e79429ec8..000000000
--- a/winsup/mingw/mingwex/math/asinf.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-/* asin = atan (x / sqrt(1 - x^2)) */
-
-float asinf (float x)
-{
-  float res;
-
-  asm (	"fld	%%st\n\t"
-	"fmul	%%st(0)\n\t"			/* x^2 */
-	"fld1\n\t"
-	"fsubp\n\t"				/* 1 - x^2 */
-	"fsqrt\n\t"				/* sqrt (1 - x^2) */
-	"fpatan"
-	: "=t" (res) : "0" (x) : "st(1)");
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/asinl.c b/winsup/mingw/mingwex/math/asinl.c
deleted file mode 100644
index a2ac32b39..000000000
--- a/winsup/mingw/mingwex/math/asinl.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- * Adapted for long double type by Danny Smith <dannysmith@users.sourceforge.net>.
- */
-
-/* asin = atan (x / sqrt(1 - x^2)) */
-
-long double asinl (long double x)
-{
-  long double res;
-
-  asm (	"fld	%%st\n\t"
-	"fmul	%%st(0)\n\t"			/* x^2 */
-	"fld1\n\t"
-	"fsubp\n\t"				/* 1 - x^2 */
-	"fsqrt\n\t"				/* sqrt (1 - x^2) */
-	"fpatan"
-	: "=t" (res) : "0" (x) : "st(1)");
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/atan2f.c b/winsup/mingw/mingwex/math/atan2f.c
deleted file mode 100644
index 52ec6f672..000000000
--- a/winsup/mingw/mingwex/math/atan2f.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- */
-
-#include <math.h>
-
-float
-atan2f (float y, float x)
-{
-  float res;
-  asm ("fpatan" : "=t" (res) : "u" (y), "0" (x) : "st(1)");
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/atan2l.c b/winsup/mingw/mingwex/math/atan2l.c
deleted file mode 100644
index efd62c1ec..000000000
--- a/winsup/mingw/mingwex/math/atan2l.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- */
-
-#include <math.h>
-
-long double
-atan2l (long double y, long double x)
-{
-  long double res;
-  asm ("fpatan" : "=t" (res) : "u" (y), "0" (x) : "st(1)");
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/atanf.c b/winsup/mingw/mingwex/math/atanf.c
deleted file mode 100644
index ae70d5daa..000000000
--- a/winsup/mingw/mingwex/math/atanf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- */
-
-#include <math.h>
-
-float
-atanf (float x)
-{
-  float res;
-
-  asm ("fld1\n\t"
-       "fpatan" : "=t" (res) : "0" (x));
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/atanl.c b/winsup/mingw/mingwex/math/atanl.c
deleted file mode 100644
index 5de06d35b..000000000
--- a/winsup/mingw/mingwex/math/atanl.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- */
-
-#include <math.h>
-
-long double
-atanl (long double x)
-{
-  long double res;
-
-  asm ("fld1\n\t"
-       "fpatan"
-       : "=t" (res) : "0" (x));
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/cbrt.c b/winsup/mingw/mingwex/math/cbrt.c
deleted file mode 100644
index 93f5c819c..000000000
--- a/winsup/mingw/mingwex/math/cbrt.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*							cbrt.c
- *
- *	Cube root
- *
- *
- *
- * SYNOPSIS:
- *
- * double x, y, cbrt();
- *
- * y = cbrt( x );
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns the cube root of the argument, which may be negative.
- *
- * Range reduction involves determining the power of 2 of
- * the argument.  A polynomial of degree 2 applied to the
- * mantissa, and multiplication by the cube root of 1, 2, or 4
- * approximates the root to within about 0.1%.  Then Newton's
- * iteration is used three times to converge to an accurate
- * result.
- *
- *
- *
- * ACCURACY:
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *    DEC        -10,10     200000      1.8e-17     6.2e-18
- *    IEEE       0,1e308     30000      1.5e-16     5.0e-17
- *
- */
-/*							cbrt.c  */
-
-/*
-Cephes Math Library Release 2.2:  January, 1991
-Copyright 1984, 1991 by Stephen L. Moshier
-Direct inquiries to 30 Frost Street, Cambridge, MA 02140
-*/
-
-/*
-  Modified for mingwex.a 
-  2002-07-01  Danny Smith  <dannysmith@users.sourceforge.net>
- */
-#ifdef __MINGW32__
-#include <math.h>
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-#endif
-
-
-static const double CBRT2  = 1.2599210498948731647672;
-static const double CBRT4  = 1.5874010519681994747517;
-static const double CBRT2I = 0.79370052598409973737585;
-static const double CBRT4I = 0.62996052494743658238361;
-
-#ifndef __MINGW32__
-#ifdef ANSIPROT
-extern double frexp ( double, int * );
-extern double ldexp ( double, int );
-extern int isnan ( double );
-extern int isfinite ( double );
-#else
-double frexp(), ldexp();
-int isnan(), isfinite();
-#endif
-#endif
-
-double cbrt(x)
-double x;
-{
-int e, rem, sign;
-double z;
-
-#ifdef __MINGW32__
-if (!isfinite (x) || x == 0 )
-  return x;
-#else
-
-#ifdef NANS
-if( isnan(x) )
-  return x;
-#endif
-#ifdef INFINITIES
-if( !isfinite(x) )
-  return x;
-#endif
-if( x == 0 )
-	return( x );
-
-#endif /* __MINGW32__ */
-
-if( x > 0 )
-	sign = 1;
-else
-	{
-	sign = -1;
-	x = -x;
-	}
-
-z = x;
-/* extract power of 2, leaving
- * mantissa between 0.5 and 1
- */
-x = frexp( x, &e );
-
-/* Approximate cube root of number between .5 and 1,
- * peak relative error = 9.2e-6
- */
-x = (((-1.3466110473359520655053e-1  * x
-      + 5.4664601366395524503440e-1) * x
-      - 9.5438224771509446525043e-1) * x
-      + 1.1399983354717293273738e0 ) * x
-      + 4.0238979564544752126924e-1;
-
-/* exponent divided by 3 */
-if( e >= 0 )
-	{
-	rem = e;
-	e /= 3;
-	rem -= 3*e;
-	if( rem == 1 )
-		x *= CBRT2;
-	else if( rem == 2 )
-		x *= CBRT4;
-	}
-
-
-/* argument less than 1 */
-
-else
-	{
-	e = -e;
-	rem = e;
-	e /= 3;
-	rem -= 3*e;
-	if( rem == 1 )
-		x *= CBRT2I;
-	else if( rem == 2 )
-		x *= CBRT4I;
-	e = -e;
-	}
-
-/* multiply by power of 2 */
-x = ldexp( x, e );
-
-/* Newton iteration */
-x -= ( x - (z/(x*x)) )*0.33333333333333333333;
-#ifdef DEC
-x -= ( x - (z/(x*x)) )/3.0;
-#else
-x -= ( x - (z/(x*x)) )*0.33333333333333333333;
-#endif
-
-if( sign < 0 )
-	x = -x;
-return(x);
-}
diff --git a/winsup/mingw/mingwex/math/cbrtf.c b/winsup/mingw/mingwex/math/cbrtf.c
deleted file mode 100644
index 537cf8d98..000000000
--- a/winsup/mingw/mingwex/math/cbrtf.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*							cbrtf.c
- *
- *	Cube root
- *
- *
- *
- * SYNOPSIS:
- *
- * float x, y, cbrtf();
- *
- * y = cbrtf( x );
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns the cube root of the argument, which may be negative.
- *
- * Range reduction involves determining the power of 2 of
- * the argument.  A polynomial of degree 2 applied to the
- * mantissa, and multiplication by the cube root of 1, 2, or 4
- * approximates the root to within about 0.1%.  Then Newton's
- * iteration is used to converge to an accurate result.
- *
- *
- *
- * ACCURACY:
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *    IEEE      0,1e38      100000      7.6e-8      2.7e-8
- *
- */
-/*							cbrt.c  */
-
-/*
-Cephes Math Library Release 2.2:  June, 1992
-Copyright 1984, 1987, 1988, 1992 by Stephen L. Moshier
-Direct inquiries to 30 Frost Street, Cambridge, MA 02140
-*/
-
-/*
-  Modified for mingwex.a 
-  2002-07-01  Danny Smith  <dannysmith@users.sourceforge.net>
- */
-#ifdef __MINGW32__
-#include <math.h>
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-#endif
-
-static const float CBRT2 = 1.25992104989487316477;
-static const float CBRT4 = 1.58740105196819947475;
-
-#ifndef __MINGW32__
-#ifdef ANSIC
-float frexpf(float, int *), ldexpf(float, int);
-
-float cbrtf( float xx )
-#else
-float frexpf(), ldexpf();
-
-float cbrtf(xx)
-double xx;
-#endif
-{
-int e, rem, sign;
-float x, z;
-
-x = xx;
-
-#else /* __MINGW32__ */
-float cbrtf (float x)
-{
-int e, rem, sign;
-float z;
-#endif /* __MINGW32__ */
-
-#ifdef __MINGW32__
-if (!isfinite (x) || x == 0.0F )
-  return x;
-#else
-if( x == 0 )
-	return( 0.0 );
-#endif
-if( x > 0 )
-	sign = 1;
-else
-	{
-	sign = -1;
-	x = -x;
-	}
-
-z = x;
-/* extract power of 2, leaving
- * mantissa between 0.5 and 1
- */
-x = frexpf( x, &e );
-
-/* Approximate cube root of number between .5 and 1,
- * peak relative error = 9.2e-6
- */
-x = (((-0.13466110473359520655053  * x
-      + 0.54664601366395524503440 ) * x
-      - 0.95438224771509446525043 ) * x
-      + 1.1399983354717293273738  ) * x
-      + 0.40238979564544752126924;
-
-/* exponent divided by 3 */
-if( e >= 0 )
-	{
-	rem = e;
-	e /= 3;
-	rem -= 3*e;
-	if( rem == 1 )
-		x *= CBRT2;
-	else if( rem == 2 )
-		x *= CBRT4;
-	}
-
-
-/* argument less than 1 */
-
-else
-	{
-	e = -e;
-	rem = e;
-	e /= 3;
-	rem -= 3*e;
-	if( rem == 1 )
-		x /= CBRT2;
-	else if( rem == 2 )
-		x /= CBRT4;
-	e = -e;
-	}
-
-/* multiply by power of 2 */
-x = ldexpf( x, e );
-
-/* Newton iteration */
-x -= ( x - (z/(x*x)) ) * 0.333333333333;
-
-if( sign < 0 )
-	x = -x;
-return(x);
-}
diff --git a/winsup/mingw/mingwex/math/cbrtl.c b/winsup/mingw/mingwex/math/cbrtl.c
deleted file mode 100644
index 36bd48f70..000000000
--- a/winsup/mingw/mingwex/math/cbrtl.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*							cbrtl.c
- *
- *	Cube root, long double precision
- *
- *
- *
- * SYNOPSIS:
- *
- * long double x, y, cbrtl();
- *
- * y = cbrtl( x );
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns the cube root of the argument, which may be negative.
- *
- * Range reduction involves determining the power of 2 of
- * the argument.  A polynomial of degree 2 applied to the
- * mantissa, and multiplication by the cube root of 1, 2, or 4
- * approximates the root to within about 0.1%.  Then Newton's
- * iteration is used three times to converge to an accurate
- * result.
- *
- *
- *
- * ACCURACY:
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *    IEEE     .125,8        80000      7.0e-20     2.2e-20
- *    IEEE    exp(+-707)    100000      7.0e-20     2.4e-20
- *
- */
-
-
-/*
-Cephes Math Library Release 2.2: January, 1991
-Copyright 1984, 1991 by Stephen L. Moshier
-Direct inquiries to 30 Frost Street, Cambridge, MA 02140
-*/
-
-/*
-  Modified for mingwex.a 
-  2002-07-01  Danny Smith  <dannysmith@users.sourceforge.net>
- */
-#ifdef __MINGW32__
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-#endif
-
-static const long double CBRT2  = 1.2599210498948731647672L;
-static const long double CBRT4  = 1.5874010519681994747517L;
-static const long double CBRT2I = 0.79370052598409973737585L;
-static const long double CBRT4I = 0.62996052494743658238361L;
-
-#ifndef __MINGW32__
-
-#ifdef ANSIPROT
-extern long double frexpl ( long double, int * );
-extern long double ldexpl ( long double, int );
-extern int isnanl ( long double );
-#else
-long double frexpl(), ldexpl();
-extern int isnanl();
-#endif
-
-#ifdef INFINITIES
-extern long double INFINITYL;
-#endif
-
-#endif /* __MINGW32__ */
-
-long double cbrtl(x)
-long double x;
-{
-int e, rem, sign;
-long double z;
-
-#ifdef __MINGW32__
-if (!isfinite (x) || x == 0.0L)
-	return(x);
-#else     
-
-#ifdef NANS
-if(isnanl(x))
-	return(x);
-#endif
-#ifdef INFINITIES
-if( x == INFINITYL)
-	return(x);
-if( x == -INFINITYL)
-	return(x);
-#endif
-if( x == 0 )
-	return( x );
-
-#endif /* __MINGW32__ */
-
-if( x > 0 )
-	sign = 1;
-else
-	{
-	sign = -1;
-	x = -x;
-	}
-
-z = x;
-/* extract power of 2, leaving
- * mantissa between 0.5 and 1
- */
-x = frexpl( x, &e );
-
-/* Approximate cube root of number between .5 and 1,
- * peak relative error = 1.2e-6
- */
-x = (((( 1.3584464340920900529734e-1L * x
-       - 6.3986917220457538402318e-1L) * x
-       + 1.2875551670318751538055e0L) * x
-       - 1.4897083391357284957891e0L) * x
-       + 1.3304961236013647092521e0L) * x
-       + 3.7568280825958912391243e-1L;
-
-/* exponent divided by 3 */
-if( e >= 0 )
-	{
-	rem = e;
-	e /= 3;
-	rem -= 3*e;
-	if( rem == 1 )
-		x *= CBRT2;
-	else if( rem == 2 )
-		x *= CBRT4;
-	}
-else
-	{ /* argument less than 1 */
-	e = -e;
-	rem = e;
-	e /= 3;
-	rem -= 3*e;
-	if( rem == 1 )
-		x *= CBRT2I;
-	else if( rem == 2 )
-		x *= CBRT4I;
-	e = -e;
-	}
-
-/* multiply by power of 2 */
-x = ldexpl( x, e );
-
-/* Newton iteration */
-
-x -= ( x - (z/(x*x)) )*0.3333333333333333333333L;
-x -= ( x - (z/(x*x)) )*0.3333333333333333333333L;
-
-if( sign < 0 )
-	x = -x;
-return(x);
-}
diff --git a/winsup/mingw/mingwex/math/ceilf.S b/winsup/mingw/mingwex/math/ceilf.S
deleted file mode 100644
index ffcdfc687..000000000
--- a/winsup/mingw/mingwex/math/ceilf.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-	.file	"ceilf.S"
-	.text
-	.align 4
-.globl _ceilf
-	.def	_ceilf;	.scl	2;	.type	32;	.endef
-_ceilf:
-	flds	4(%esp)
-	subl	$8,%esp
-
-	fstcw	4(%esp)			/* store fpu control word */
-
-	/* We use here %edx although only the low 1 bits are defined.
-	   But none of the operations should care and they are faster
-	   than the 16 bit operations.  */
-	movl	$0x0800,%edx		/* round towards +oo */
-	orl	4(%esp),%edx
-	andl	$0xfbff,%edx
-	movl	%edx,(%esp)
-	fldcw	(%esp)			/* load modified control word */
-
-	frndint				/* round */
-
-	fldcw	4(%esp)			/* restore original control word */
-
-	addl	$8,%esp
-	ret
diff --git a/winsup/mingw/mingwex/math/ceill.S b/winsup/mingw/mingwex/math/ceill.S
deleted file mode 100644
index 29cb27a62..000000000
--- a/winsup/mingw/mingwex/math/ceill.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- * Changes for long double by Ulrich Drepper <drepper@cygnus.com>
- */
-
-
-	.file	"ceill.S"
-	.text
-	.align 4
-.globl _ceill
-	.def	_ceill;	.scl	2;	.type	32;	.endef
-_ceill:
-	fldt	4(%esp)
-	subl	$8,%esp
-
-	fstcw	4(%esp)			/* store fpu control word */
-
-	/* We use here %edx although only the low 1 bits are defined.
-	   But none of the operations should care and they are faster
-	   than the 16 bit operations.  */
-	movl	$0x0800,%edx		/* round towards +oo */
-	orl	4(%esp),%edx
-	andl	$0xfbff,%edx
-	movl	%edx,(%esp)
-	fldcw	(%esp)			/* load modified control word */
-
-	frndint				/* round */
-
-	fldcw	4(%esp)			/* restore original control word */
-
-	addl	$8,%esp
-	ret
diff --git a/winsup/mingw/mingwex/math/cephes_emath.c b/winsup/mingw/mingwex/math/cephes_emath.c
deleted file mode 100644
index ab798a2d2..000000000
--- a/winsup/mingw/mingwex/math/cephes_emath.c
+++ /dev/null
@@ -1,1318 +0,0 @@
-/* This file is extracted from S L Moshier's  ioldoubl.c,
- * modified for use in MinGW 
- *
- * Extended precision arithmetic functions for long double I/O.
- * This program has been placed in the public domain.
- */
-
-   
-
-/*
- * Revision history:
- *
- *  5 Jan 84	PDP-11 assembly language version
- *  6 Dec 86	C language version
- * 30 Aug 88	100 digit version, improved rounding
- * 15 May 92    80-bit long double support
- *
- * Author:  S. L. Moshier.
- *
- * 6 Oct 02	Modified for MinGW by inlining utility routines,
- * 		removing global variables and splitting out strtold
- *		from _IO_ldtoa and _IO_ldtostr.
- *  
- *		Danny Smith <dannysmith@users.sourceforge.net>
- * 
- */
-
-
-#include "cephes_emath.h"
-
-/*
- * The constants are for 64 bit precision.
- */
-
-
-/* Move in external format number,
- * converting it to internal format.
- */
-void __emovi(const short unsigned int * __restrict__ a,
-		  short unsigned int * __restrict__ b)
-{
-register const unsigned short *p;
-register unsigned short *q;
-int i;
-
-q = b;
-p = a + (NE-1);	/* point to last word of external number */
-/* get the sign bit */
-if( *p & 0x8000 )
-	*q++ = 0xffff;
-else
-	*q++ = 0;
-/* get the exponent */
-*q = *p--;
-*q++ &= 0x7fff;	/* delete the sign bit */
-#ifdef INFINITY
-if( (*(q-1) & 0x7fff) == 0x7fff )
-	{
-#ifdef NANS
-	if( __eisnan(a) )
-		{
-		*q++ = 0;
-		for( i=3; i<NI; i++ )
-			*q++ = *p--;
-		return;
-		}
-#endif
-	for( i=2; i<NI; i++ )
-		*q++ = 0;
-	return;
-	}
-#endif
-/* clear high guard word */
-*q++ = 0;
-/* move in the significand */
-for( i=0; i<NE-1; i++ )
-	*q++ = *p--;
-/* clear low guard word */
-*q = 0;
-}
-
-
-/*
-;	Add significands
-;	x + y replaces y
-*/
-
-void __eaddm(const short unsigned int * __restrict__ x,
-		  short unsigned int * __restrict__ y)
-{
-register unsigned long a;
-int i;
-unsigned int carry;
-
-x += NI-1;
-y += NI-1;
-carry = 0;
-for( i=M; i<NI; i++ )
-	{
-	a = (unsigned long )(*x) + (unsigned long )(*y) + carry;
-	if( a & 0x10000 )
-		carry = 1;
-	else
-		carry = 0;
-	*y = (unsigned short )a;
-	--x;
-	--y;
-	}
-}
-
-/*
-;	Subtract significands
-;	y - x replaces y
-*/
-
-void __esubm(const short unsigned int * __restrict__ x,
-		  short unsigned int * __restrict__ y)
-{
-unsigned long a;
-int i;
-unsigned int carry;
-
-x += NI-1;
-y += NI-1;
-carry = 0;
-for( i=M; i<NI; i++ )
-	{
-	a = (unsigned long )(*y) - (unsigned long )(*x) - carry;
-	if( a & 0x10000 )
-		carry = 1;
-	else
-		carry = 0;
-	*y = (unsigned short )a;
-	--x;
-	--y;
-	}
-}
-
-
-/* Multiply significand of e-type number b
-by 16-bit quantity a, e-type result to c. */
-
-static void __m16m(short unsigned int a,
-		 short unsigned int *  __restrict__ b,
-		 short unsigned int *  __restrict__ c)
-{
-register unsigned short *pp;
-register unsigned long carry;
-unsigned short *ps;
-unsigned short p[NI];
-unsigned long aa, m;
-int i;
-
-aa = a;
-pp = &p[NI-2];
-*pp++ = 0;
-*pp = 0;
-ps = &b[NI-1];
-
-for( i=M+1; i<NI; i++ )
-	{
-	if( *ps == 0 )
-		{
-		--ps;
-		--pp;
-		*(pp-1) = 0;
-		}
-	else
-		{
-		m = (unsigned long) aa * *ps--;
-		carry = (m & 0xffff) + *pp;
-		*pp-- = (unsigned short )carry;
-		carry = (carry >> 16) + (m >> 16) + *pp;
-		*pp = (unsigned short )carry;
-		*(pp-1) = carry >> 16;
-		}
-	}
-for( i=M; i<NI; i++ )
-	c[i] = p[i];
-}
-
-
-/* Divide significands. Neither the numerator nor the denominator
-is permitted to have its high guard word nonzero.  */
-
-
-int __edivm(short unsigned int * __restrict__ den,
-		 short unsigned int * __restrict__ num)
-{
-int i;
-register unsigned short *p;
-unsigned long tnum;
-unsigned short j, tdenm, tquot;
-unsigned short tprod[NI+1];
-unsigned short equot[NI];
-
-p = &equot[0];
-*p++ = num[0];
-*p++ = num[1];
-
-for( i=M; i<NI; i++ )
-	{
-	*p++ = 0;
-	}
-__eshdn1( num );
-tdenm = den[M+1];
-for( i=M; i<NI; i++ )
-	{
-	/* Find trial quotient digit (the radix is 65536). */
-	tnum = (((unsigned long) num[M]) << 16) + num[M+1];
-
-	/* Do not execute the divide instruction if it will overflow. */
-        if( (tdenm * 0xffffUL) < tnum )
-		tquot = 0xffff;
-	else
-		tquot = tnum / tdenm;
-
-		/* Prove that the divide worked. */
-/*
-	tcheck = (unsigned long )tquot * tdenm;
-	if( tnum - tcheck > tdenm )
-		tquot = 0xffff;
-*/
-	/* Multiply denominator by trial quotient digit. */
-	__m16m( tquot, den, tprod );
-	/* The quotient digit may have been overestimated. */
-	if( __ecmpm( tprod, num ) > 0 )
-		{
-		tquot -= 1;
-		__esubm( den, tprod );
-		if( __ecmpm( tprod, num ) > 0 )
-			{
-			tquot -= 1;
-			__esubm( den, tprod );
-			}
-		}
-	__esubm( tprod, num );
-	equot[i] = tquot;
-	__eshup6(num);
-	}
-/* test for nonzero remainder after roundoff bit */
-p = &num[M];
-j = 0;
-for( i=M; i<NI; i++ )
-	{
-	j |= *p++;
-	}
-if( j )
-	j = 1;
-
-for( i=0; i<NI; i++ )
-	num[i] = equot[i];
-
-return( (int )j );
-}
-
-
-
-/* Multiply significands */
-int __emulm(const short unsigned int * __restrict__ a,
-		 short unsigned int * __restrict__ b)
-{
-const unsigned short *p;
-unsigned short *q;
-unsigned short pprod[NI];
-unsigned short equot[NI];
-unsigned short j;
-int i;
-
-equot[0] = b[0];
-equot[1] = b[1];
-for( i=M; i<NI; i++ )
-	equot[i] = 0;
-
-j = 0;
-p = &a[NI-1];
-q = &equot[NI-1];
-for( i=M+1; i<NI; i++ )
-	{
-	if( *p == 0 )
-		{
-		--p;
-		}
-	else
-		{
-		__m16m( *p--, b, pprod );
-		__eaddm(pprod, equot);
-		}
-	j |= *q;
-	__eshdn6(equot);
-	}
-
-for( i=0; i<NI; i++ )
-	b[i] = equot[i];
-
-/* return flag for lost nonzero bits */
-return( (int)j );
-}
-
-
-
-/*
- * Normalize and round off.
- *
- * The internal format number to be rounded is "s".
- * Input "lost" indicates whether the number is exact.
- * This is the so-called sticky bit.
- *
- * Input "subflg" indicates whether the number was obtained
- * by a subtraction operation.  In that case if lost is nonzero
- * then the number is slightly smaller than indicated.
- *
- * Input "exp" is the biased exponent, which may be negative.
- * the exponent field of "s" is ignored but is replaced by
- * "exp" as adjusted by normalization and rounding.
- *
- * Input "rcntrl" is the rounding control.
- *
- * Input "rnprc" is precison control (64 or NBITS).
- */
-
-void __emdnorm(short unsigned int *s, int lost, int subflg, long int exp, int rcntrl, int rndprc)
-{
-int i, j;
-unsigned short r;
-int rw = NI-1; /* low guard word */
-int re = NI-2;
-const unsigned short rmsk = 0xffff;
-const unsigned short rmbit = 0x8000;
-#if NE == 6
-unsigned short rbit[NI] = {0,0,0,0,0,0,0,1,0};
-#else
-unsigned short rbit[NI] = {0,0,0,0,0,0,0,0,0,0,0,1,0};
-#endif
-
-/* Normalize */
-j = __enormlz( s );
-
-/* a blank significand could mean either zero or infinity. */
-#ifndef INFINITY
-if( j > NBITS )
-	{
-	__ecleazs( s );
-	return;
-	}
-#endif
-exp -= j;
-#ifndef INFINITY
-if( exp >= 32767L )
-	goto overf;
-#else
-if( (j > NBITS) && (exp < 32767L) )
-	{
-	__ecleazs( s );
-	return;
-	}
-#endif
-if( exp < 0L )
-	{
-	if( exp > (long )(-NBITS-1) )
-		{
-		j = (int )exp;
-		i = __eshift( s, j );
-		if( i )
-			lost = 1;
-		}
-	else
-		{
-		__ecleazs( s );
-		return;
-		}
-	}
-/* Round off, unless told not to by rcntrl. */
-if( rcntrl == 0 )
-	goto mdfin;
-if (rndprc == 64)
-  {
-    rw = 7;
-    re = 6;
-    rbit[NI-2] = 0;
-    rbit[6] = 1;
-  }
-
-/* Shift down 1 temporarily if the data structure has an implied
- * most significant bit and the number is denormal.
- * For rndprc = 64 or NBITS, there is no implied bit.
- * But Intel long double denormals lose one bit of significance even so.
- */
-#if IBMPC
-if( (exp <= 0) && (rndprc != NBITS) )
-#else
-if( (exp <= 0) && (rndprc != 64) && (rndprc != NBITS) )
-#endif
-	{
-	lost |= s[NI-1] & 1;
-	__eshdn1(s);
-	}
-/* Clear out all bits below the rounding bit,
- * remembering in r if any were nonzero.
- */
-r = s[rw] & rmsk;
-if( rndprc < NBITS )
-	{
-	i = rw + 1;
-	while( i < NI )
-		{
-		if( s[i] )
-			r |= 1;
-		s[i] = 0;
-		++i;
-		}
-	}
-s[rw] &= ~rmsk;
-if( (r & rmbit) != 0 )
-	{
-	if( r == rmbit )
-		{
-		if( lost == 0 )
-			{ /* round to even */
-			if( (s[re] & 1) == 0 )
-				goto mddone;
-			}
-		else
-			{
-			if( subflg != 0 )
-				goto mddone;
-			}
-		}
-	__eaddm( rbit, s );
-	}
-mddone:
-#if IBMPC
-if( (exp <= 0) && (rndprc != NBITS) )
-#else
-if( (exp <= 0) && (rndprc != 64) && (rndprc != NBITS) )
-#endif
-	{
-	__eshup1(s);
-	}
-if( s[2] != 0 )
-	{ /* overflow on roundoff */
-	__eshdn1(s);
-	exp += 1;
-	}
-mdfin:
-s[NI-1] = 0;
-if( exp >= 32767L )
-	{
-#ifndef INFINITY
-overf:
-#endif
-#ifdef INFINITY
-	s[1] = 32767;
-	for( i=2; i<NI-1; i++ )
-		s[i] = 0;
-#else
-	s[1] = 32766;
-	s[2] = 0;
-	for( i=M+1; i<NI-1; i++ )
-		s[i] = 0xffff;
-	s[NI-1] = 0;
-	if( (rndprc < 64) || (rndprc == 113) )
-		s[rw] &= ~rmsk;
-#endif
-	return;
-	}
-if( exp < 0 )
-	s[1] = 0;
-else
-	s[1] = (unsigned short )exp;
-}
-
-
-/*
-;	Multiply.
-;
-;	unsigned short a[NE], b[NE], c[NE];
-;	emul( a, b, c );	c = b * a
-*/
-void __emul(const short unsigned int *a,
-		 const short unsigned int *b,
-		 short unsigned int *c)
-{
-unsigned short ai[NI], bi[NI];
-int i, j;
-long lt, lta, ltb;
-
-#ifdef NANS
-/* NaN times anything is the same NaN. */
-if( __eisnan(a) )
-	{
-	__emov(a,c);
-	return;
-	}
-if( __eisnan(b) )
-	{
-	__emov(b,c);
-	return;
-	}
-/* Zero times infinity is a NaN. */
-if( (__eisinf(a) && __eiiszero(b))
-	|| (__eisinf(b) && __eiiszero(a)) )
-	{
-	mtherr( "emul", DOMAIN );
-	__enan_NBITS( c );
-	return;
-	}
-#endif
-/* Infinity times anything else is infinity. */
-#ifdef INFINITY
-if( __eisinf(a) || __eisinf(b) )
-	{
-	if( __eisneg(a) ^ __eisneg(b) )
-		*(c+(NE-1)) = 0x8000;
-	else
-		*(c+(NE-1)) = 0;
-	__einfin(c);
-	return;
-	}
-#endif
-__emovi( a, ai );
-__emovi( b, bi );
-lta = ai[E];
-ltb = bi[E];
-if( ai[E] == 0 )
-	{
-	for( i=1; i<NI-1; i++ )
-		{
-		if( ai[i] != 0 )
-			{
-			lta -= __enormlz( ai );
-			goto mnzer1;
-			}
-		}
-	__eclear(c);
-	return;
-	}
-mnzer1:
-
-if( bi[E] == 0 )
-	{
-	for( i=1; i<NI-1; i++ )
-		{
-		if( bi[i] != 0 )
-			{
-			ltb -= __enormlz( bi );
-			goto mnzer2;
-			}
-		}
-	__eclear(c);
-	return;
-	}
-mnzer2:
-
-/* Multiply significands */
-j = __emulm( ai, bi );
-/* calculate exponent */
-lt = lta + ltb - (EXONE - 1);
-__emdnorm( bi, j, 0, lt, 64, NBITS );
-/* calculate sign of product */
-if( ai[0] == bi[0] )
-	bi[0] = 0;
-else
-	bi[0] = 0xffff;
-__emovo( bi, c );
-}
-
-
-/* move out internal format to ieee long double */
-void __toe64(short unsigned int *a, short unsigned int *b)
-{
-register unsigned short *p, *q;
-unsigned short i;
-
-#ifdef NANS
-if( __eiisnan(a) )
-	{
-	__enan_64( b );
-	return;
-	}
-#endif
-#ifdef IBMPC
-/* Shift Intel denormal significand down 1.  */
-if( a[E] == 0 )
-  __eshdn1(a);
-#endif
-p = a;
-#ifdef MIEEE
-q = b;
-#else
-q = b + 4; /* point to output exponent */
-#if 1
-/* NOTE: if data type is 96 bits wide, clear the last word here. */
-*(q+1)= 0;
-#endif
-#endif
-
-/* combine sign and exponent */
-i = *p++;
-#ifdef MIEEE
-if( i )
-	*q++ = *p++ | 0x8000;
-else
-	*q++ = *p++;
-*q++ = 0;
-#else
-if( i )
-	*q-- = *p++ | 0x8000;
-else
-	*q-- = *p++;
-#endif
-/* skip over guard word */
-++p;
-/* move the significand */
-#ifdef MIEEE
-for( i=0; i<4; i++ )
-	*q++ = *p++;
-#else
-#ifdef INFINITY
-if (__eiisinf (a))
-        {
-	/* Intel long double infinity.  */
-	*q-- = 0x8000;
-	*q-- = 0;
-	*q-- = 0;
-	*q = 0;
-	return;
-	}
-#endif
-for( i=0; i<4; i++ )
-	*q-- = *p++;
-#endif
-}
-
-
-/* Compare two e type numbers.
- *
- * unsigned short a[NE], b[NE];
- * ecmp( a, b );
- *
- *  returns +1 if a > b
- *           0 if a == b
- *          -1 if a < b
- *          -2 if either a or b is a NaN.
- */
-int __ecmp(const short unsigned int * __restrict__ a,
-		const short unsigned int *  __restrict__ b)
-{
-unsigned short ai[NI], bi[NI];
-register unsigned short *p, *q;
-register int i;
-int msign;
-
-#ifdef NANS
-if (__eisnan (a)  || __eisnan (b))
-	return( -2 );
-#endif
-__emovi( a, ai );
-p = ai;
-__emovi( b, bi );
-q = bi;
-
-if( *p != *q )
-	{ /* the signs are different */
-/* -0 equals + 0 */
-	for( i=1; i<NI-1; i++ )
-		{
-		if( ai[i] != 0 )
-			goto nzro;
-		if( bi[i] != 0 )
-			goto nzro;
-		}
-	return(0);
-nzro:
-	if( *p == 0 )
-		return( 1 );
-	else
-		return( -1 );
-	}
-/* both are the same sign */
-if( *p == 0 )
-	msign = 1;
-else
-	msign = -1;
-i = NI-1;
-do
-	{
-	if( *p++ != *q++ )
-		{
-		goto diff;
-		}
-	}
-while( --i > 0 );
-
-return(0);	/* equality */
-
-
-
-diff:
-
-if( *(--p) > *(--q) )
-	return( msign );		/* p is bigger */
-else
-	return( -msign );	/* p is littler */
-}
-
-/*
-;	Shift significand
-;
-;	Shifts significand area up or down by the number of bits
-;	given by the variable sc.
-*/
-int __eshift(short unsigned int *x, int sc)
-{
-unsigned short lost;
-unsigned short *p;
-
-if( sc == 0 )
-	return( 0 );
-
-lost = 0;
-p = x + NI-1;
-
-if( sc < 0 )
-	{
-	sc = -sc;
-	while( sc >= 16 )
-		{
-		lost |= *p;	/* remember lost bits */
-		__eshdn6(x);
-		sc -= 16;
-		}
-
-	while( sc >= 8 )
-		{
-		lost |= *p & 0xff;
-		__eshdn8(x);
-		sc -= 8;
-		}
-
-	while( sc > 0 )
-		{
-		lost |= *p & 1;
-		__eshdn1(x);
-		sc -= 1;
-		}
-	}
-else
-	{
-	while( sc >= 16 )
-		{
-		__eshup6(x);
-		sc -= 16;
-		}
-
-	while( sc >= 8 )
-		{
-		__eshup8(x);
-		sc -= 8;
-		}
-
-	while( sc > 0 )
-		{
-		__eshup1(x);
-		sc -= 1;
-		}
-	}
-if( lost )
-	lost = 1;
-return( (int )lost );
-}
-
-
-
-/*
-;	normalize
-;
-; Shift normalizes the significand area pointed to by argument
-; shift count (up = positive) is returned.
-*/
-int __enormlz(short unsigned int *x)
-{
-register unsigned short *p;
-int sc;
-
-sc = 0;
-p = &x[M];
-if( *p != 0 )
-	goto normdn;
-++p;
-if( *p & 0x8000 )
-	return( 0 );	/* already normalized */
-while( *p == 0 )
-	{
-	__eshup6(x);
-	sc += 16;
-/* With guard word, there are NBITS+16 bits available.
- * return true if all are zero.
- */
-	if( sc > NBITS )
-		return( sc );
-	}
-/* see if high byte is zero */
-while( (*p & 0xff00) == 0 )
-	{
-	__eshup8(x);
-	sc += 8;
-	}
-/* now shift 1 bit at a time */
-while( (*p  & 0x8000) == 0)
-	{
-	__eshup1(x);
-	sc += 1;
-	if( sc > (NBITS+16) )
-		{
-		mtherr( "enormlz", UNDERFLOW );
-		return( sc );
-		}
-	}
-return( sc );
-
-/* Normalize by shifting down out of the high guard word
-   of the significand */
-normdn:
-
-if( *p & 0xff00 )
-	{
-	__eshdn8(x);
-	sc -= 8;
-	}
-while( *p != 0 )
-	{
-	__eshdn1(x);
-	sc -= 1;
-
-	if( sc < -NBITS )
-		{
-		mtherr( "enormlz", OVERFLOW );
-		return( sc );
-		}
-	}
-return( sc );
-}
-
-
-/* Move internal format number out,
- * converting it to external format.
- */
-void __emovo(const short unsigned int * __restrict__ a,
-		  short unsigned int * __restrict__ b)
-{
-register const unsigned short *p;
-register unsigned short *q;
-unsigned short i;
-
-p = a;
-q = b + (NE-1); /* point to output exponent */
-/* combine sign and exponent */
-i = *p++;
-if( i )
-	*q-- = *p++ | 0x8000;
-else
-	*q-- = *p++;
-#ifdef INFINITY
-if( *(p-1) == 0x7fff )
-	{
-#ifdef NANS
-	if( __eiisnan(a) )
-		{
-		__enan_NBITS( b );
-		return;
-		}
-#endif
-	__einfin(b);
-	return;
-	}
-#endif
-/* skip over guard word */
-++p;
-/* move the significand */
-for( i=0; i<NE-1; i++ )
-	*q-- = *p++;
-}
-
-
-#if USE_LDTOA
-
-
-void __eiremain(short unsigned int *den, short unsigned int *num,
-	 short unsigned int *equot )
-{
-long ld, ln;
-unsigned short j;
-
-ld = den[E];
-ld -= __enormlz( den );
-ln = num[E];
-ln -= __enormlz( num );
-__ecleaz( equot );
-while( ln >= ld )
-	{
-	if( __ecmpm(den,num) <= 0 )
-		{
-		__esubm(den, num);
-		j = 1;
-		}
-	else
-		{
-		j = 0;
-		}
-	__eshup1(equot);
-	equot[NI-1] |= j;
-	__eshup1(num);
-	ln -= 1;
-	}
-__emdnorm( num, 0, 0, ln, 0, NBITS );
-}
-
-
-void __eadd1(const short unsigned int *  __restrict__ a,
-		  const short unsigned int *  __restrict__ b,
-		  short unsigned int *  __restrict__ c,
-		  int subflg)
-{
-unsigned short ai[NI], bi[NI], ci[NI];
-int i, lost, j, k;
-long lt, lta, ltb;
-
-#ifdef INFINITY
-if( __eisinf(a) )
-	{
-	__emov(a,c);
-	if( subflg )
-		__eneg(c);
-	return;
-	}
-if( __eisinf(b) )
-	{
-	__emov(b,c);
-	return;
-	}
-#endif
-__emovi( a, ai );
-__emovi( b, bi );
-if( sub )
-	ai[0] = ~ai[0];
-
-/* compare exponents */
-lta = ai[E];
-ltb = bi[E];
-lt = lta - ltb;
-if( lt > 0L )
-	{	/* put the larger number in bi */
-	__emovz( bi, ci );
-	__emovz( ai, bi );
-	__emovz( ci, ai );
-	ltb = bi[E];
-	lt = -lt;
-	}
-lost = 0;
-if( lt != 0L )
-	{
-	if( lt < (long )(-NBITS-1) )
-		goto done;	/* answer same as larger addend */
-	k = (int )lt;
-	lost = __eshift( ai, k ); /* shift the smaller number down */
-	}
-else
-	{
-/* exponents were the same, so must compare significands */
-	i = __ecmpm( ai, bi );
-	if( i == 0 )
-		{ /* the numbers are identical in magnitude */
-		/* if different signs, result is zero */
-		if( ai[0] != bi[0] )
-			{
-			__eclear(c);
-			return;
-			}
-		/* if same sign, result is double */
-		/* double denomalized tiny number */
-		if( (bi[E] == 0) && ((bi[3] & 0x8000) == 0) )
-			{
-			__eshup1( bi );
-			goto done;
-			}
-		/* add 1 to exponent unless both are zero! */
-		for( j=1; j<NI-1; j++ )
-			{
-			if( bi[j] != 0 )
-				{
-/* This could overflow, but let emovo take care of that. */
-				ltb += 1;
-				break;
-				}
-			}
-		bi[E] = (unsigned short )ltb;
-		goto done;
-		}
-	if( i > 0 )
-		{	/* put the larger number in bi */
-		__emovz( bi, ci );
-		__emovz( ai, bi );
-		__emovz( ci, ai );
-		}
-	}
-if( ai[0] == bi[0] )
-	{
-	__eaddm( ai, bi );
-	subflg = 0;
-	}
-else
-	{
-	__esubm( ai, bi );
-	subflg = 1;
-	}
-__emdnorm( bi, lost, subflg, ltb, 64, NBITS);
-
-done:
-__emovo( bi, c );
-}
-
-
-/* y = largest integer not greater than x
- * (truncated toward minus infinity)
- *
- * unsigned short x[NE], y[NE]
- *
- * efloor( x, y );
- */
-
-
-void __efloor(short unsigned int *x, short unsigned int *y)
-{
-register unsigned short *p;
-int e, expon, i;
-unsigned short f[NE];
-const unsigned short bmask[] = {
-0xffff,
-0xfffe,
-0xfffc,
-0xfff8,
-0xfff0,
-0xffe0,
-0xffc0,
-0xff80,
-0xff00,
-0xfe00,
-0xfc00,
-0xf800,
-0xf000,
-0xe000,
-0xc000,
-0x8000,
-0x0000,
-};
-
-__emov( x, f ); /* leave in external format */
-expon = (int )f[NE-1];
-e = (expon & 0x7fff) - (EXONE - 1);
-if( e <= 0 )
-	{
-	__eclear(y);
-	goto isitneg;
-	}
-/* number of bits to clear out */
-e = NBITS - e;
-__emov( f, y );
-if( e <= 0 )
-	return;
-
-p = &y[0];
-while( e >= 16 )
-	{
-	*p++ = 0;
-	e -= 16;
-	}
-/* clear the remaining bits */
-*p &= bmask[e];
-/* truncate negatives toward minus infinity */
-isitneg:
-
-if( (unsigned short )expon & (unsigned short )0x8000 )
-	{
-	for( i=0; i<NE-1; i++ )
-		{
-		if( f[i] != y[i] )
-			{
-			__esub( __eone, y, y );
-			break;
-			}
-		}
-	}
-}
-
-/*
-;	Subtract external format numbers.
-;
-;	unsigned short a[NE], b[NE], c[NE];
-;	esub( a, b, c );	 c = b - a
-*/
-
-
-void __esub(const short unsigned int *  a,
-		 const short unsigned int *  b,
-		 short unsigned int *  c)
-{
-
-#ifdef NANS
-if( __eisnan(a) )
-	{
-	__emov (a, c);
-	return;
-	}
-if( __eisnan(b) )
-	{
-	__emov(b,c);
-	return;
-	}
-/* Infinity minus infinity is a NaN.
- * Test for subtracting infinities of the same sign.
- */
-if( __eisinf(a) && __eisinf(b) && ((__eisneg (a) ^ __eisneg (b)) == 0))
-	{
-	mtherr( "esub", DOMAIN );
-	__enan_NBITS( c );
-	return;
-	}
-#endif
-__eadd1( a, b, c, 1 );
-}
-
-
-
-/*
-;	Divide.
-;
-;	unsigned short a[NI], b[NI], c[NI];
-;	ediv( a, b, c );	c = b / a
-*/
-
-void __ediv(const short unsigned int *a,
-		 const short unsigned int *b,
-		 short unsigned int *c)
-{
-unsigned short ai[NI], bi[NI];
-int i;
-long lt, lta, ltb;
-
-#ifdef NANS
-/* Return any NaN input. */
-if( __eisnan(a) )
-	{
-	__emov(a,c);
-	return;
-	}
-if( __eisnan(b) )
-	{
-	__emov(b,c);
-	return;
-	}
-/* Zero over zero, or infinity over infinity, is a NaN. */
-if( (__eiszero(a) && __eiszero(b))
-	|| (__eisinf (a) && __eisinf (b)) )
-	{
-	mtherr( "ediv", DOMAIN );
-	__enan_NBITS( c );
-	return;
-	}
-#endif
-/* Infinity over anything else is infinity. */
-#ifdef INFINITY
-if( __eisinf(b) )
-	{
-	if( __eisneg(a) ^ __eisneg(b) )
-		*(c+(NE-1)) = 0x8000;
-	else
-		*(c+(NE-1)) = 0;
-	__einfin(c);
-	return;
-	}
-if( __eisinf(a) )
-	{
-	__eclear(c);
-	return;
-	}
-#endif
-__emovi( a, ai );
-__emovi( b, bi );
-lta = ai[E];
-ltb = bi[E];
-if( bi[E] == 0 )
-	{ /* See if numerator is zero. */
-	for( i=1; i<NI-1; i++ )
-		{
-		if( bi[i] != 0 )
-			{
-			ltb -= __enormlz( bi );
-			goto dnzro1;
-			}
-		}
-	__eclear(c);
-	return;
-	}
-dnzro1:
-
-if( ai[E] == 0 )
-	{	/* possible divide by zero */
-	for( i=1; i<NI-1; i++ )
-		{
-		if( ai[i] != 0 )
-			{
-			lta -= __enormlz( ai );
-			goto dnzro2;
-			}
-		}
-	if( ai[0] == bi[0] )
-		*(c+(NE-1)) = 0;
-	else
-		*(c+(NE-1)) = 0x8000;
-	__einfin(c);
-	mtherr( "ediv", SING );
-	return;
-	}
-dnzro2:
-
-i = __edivm( ai, bi );
-/* calculate exponent */
-lt = ltb - lta + EXONE;
-__emdnorm( bi, i, 0, lt, 64, NBITS );
-/* set the sign */
-if( ai[0] == bi[0] )
-	bi[0] = 0;
-else
-	bi[0] = 0Xffff;
-__emovo( bi, c );
-}
-
-void __e64toe(short unsigned int *pe, short unsigned int *y)
-{
-unsigned short yy[NI];
-unsigned short *p, *q, *e;
-int i;
-
-e = pe;
-p = yy;
-for( i=0; i<NE-5; i++ )
-	*p++ = 0;
-#ifdef IBMPC
-for( i=0; i<5; i++ )
-	*p++ = *e++;
-#endif
-#ifdef DEC
-for( i=0; i<5; i++ )
-	*p++ = *e++;
-#endif
-#ifdef MIEEE
-p = &yy[0] + (NE-1);
-*p-- = *e++;
-++e;
-for( i=0; i<4; i++ )
-	*p-- = *e++;
-#endif
-
-#ifdef IBMPC
-/* For Intel long double, shift denormal significand up 1
-   -- but only if the top significand bit is zero.  */
-if((yy[NE-1] & 0x7fff) == 0 && (yy[NE-2] & 0x8000) == 0)
-  {
-    unsigned short temp[NI+1];
-    __emovi(yy, temp);
-    __eshup1(temp);
-    __emovo(temp,y);
-    return;
-  }
-#endif
-#ifdef INFINITY
-/* Point to the exponent field.  */
-p = &yy[NE-1];
-if( *p == 0x7fff )
-	{
-#ifdef NANS
-#ifdef IBMPC
-	for( i=0; i<4; i++ )
-		{
-		if((i != 3 && pe[i] != 0)
-		   /* Check for Intel long double infinity pattern.  */
-		   || (i == 3 && pe[i] != 0x8000))
-			{
-			__enan_NBITS( y );
-			return;
-			}
-		}
-#else
-	for( i=1; i<=4; i++ )
-		{
-		if( pe[i] != 0 )
-			{
-			__enan_NBITS( y );
-			return;
-			}
-		}
-#endif
-#endif /* NANS */
-	__eclear( y );
-	__einfin( y );
-	if( *p & 0x8000 )
-		__eneg(y);
-	return;
-	}
-#endif
-p = yy;
-q = y;
-for( i=0; i<NE; i++ )
-	*q++ = *p++;
-}
-
-#endif /* USE_LDTOA */ 
diff --git a/winsup/mingw/mingwex/math/cephes_emath.h b/winsup/mingw/mingwex/math/cephes_emath.h
deleted file mode 100644
index 67b8d816c..000000000
--- a/winsup/mingw/mingwex/math/cephes_emath.h
+++ /dev/null
@@ -1,712 +0,0 @@
-#ifndef _CEPHES_EMATH_H
-#define _CEPHES_EMATH_H
-
-/* This file is extracted from S L Moshier's  ioldoubl.c,
- * modified for use in MinGW 
- *
- * Extended precision arithmetic functions for long double I/O.
- * This program has been placed in the public domain.
- */
-
-   
-
-/*
- * Revision history:
- *
- *  5 Jan 84	PDP-11 assembly language version
- *  6 Dec 86	C language version
- * 30 Aug 88	100 digit version, improved rounding
- * 15 May 92    80-bit long double support
- *
- * Author:  S. L. Moshier.
- *
- * 6 Oct 02	Modified for MinGW by inlining utility routines,
- * 		removing global variables, and splitting out strtold
- *		from _IO_ldtoa and _IO_ldtostr.
- *  
- *		Danny Smith <dannysmith@users.sourceforge.net>
- * 
- */
-
-  
-
-/*							ieee.c
- *
- *    Extended precision IEEE binary floating point arithmetic routines
- *
- * Numbers are stored in C language as arrays of 16-bit unsigned
- * short integers.  The arguments of the routines are pointers to
- * the arrays.
- *
- *
- * External e type data structure, simulates Intel 8087 chip
- * temporary real format but possibly with a larger significand:
- *
- *	NE-1 significand words	(least significant word first,
- *				 most significant bit is normally set)
- *	exponent		(value = EXONE for 1.0,
- *				top bit is the sign)
- *
- *
- * Internal data structure of a number (a "word" is 16 bits):
- *
- * ei[0]	sign word	(0 for positive, 0xffff for negative)
- * ei[1]	biased __exponent	(value = EXONE for the number 1.0)
- * ei[2]	high guard word	(always zero after normalization)
- * ei[3]
- * to ei[NI-2]	significand	(NI-4 significand words,
- *				 most significant word first,
- *				 most significant bit is set)
- * ei[NI-1]	low guard word	(0x8000 bit is rounding place)
- *
- *
- *
- *		Routines for external format numbers
- *
- *	__asctoe64( string, &d )	ASCII string to long double
- *	__asctoeg( string, e, prec )	ASCII string to specified precision
- *	__e64toe( &d, e )		IEEE long double precision to e type
- *	__eadd( a, b, c )		c = b + a
- *	__eclear(e)			e = 0
- *	__ecmp (a, b)			Returns 1 if a > b, 0 if a == b,
- *					-1 if a < b, -2 if either a or b is a NaN.
- *	__ediv( a, b, c )		c = b / a
- *	__efloor( a, b )		truncate to integer, toward -infinity
- *	__efrexp( a, exp, s )		extract exponent and significand
- *	__eifrac( e, &l, frac )   	e to long integer and e type fraction
- *	__euifrac( e, &l, frac )  	e to unsigned long integer and e type fraction
- *	__einfin( e )			set e to infinity, leaving its sign alone
- *	__eldexp( a, n, b )		multiply by 2**n
- *	__emov( a, b )			b = a
- *	__emul( a, b, c )		c = b * a
- *	__eneg(e)			e = -e
- *	__eround( a, b )		b = nearest integer value to a
- *	__esub( a, b, c )		c = b - a
- *	__e24toasc( &f, str, n )	single to ASCII string, n digits after decimal
- *	__e53toasc( &d, str, n )	double to ASCII string, n digits after decimal
- *	__e64toasc( &d, str, n )	long double to ASCII string
- *	__etoasc( e, str, n )		e to ASCII string, n digits after decimal
- *	__etoe24( e, &f )		convert e type to IEEE single precision
- *	__etoe53( e, &d )		convert e type to IEEE double precision
- *	__etoe64( e, &d )		convert e type to IEEE long double precision
- *	__eisneg( e )             	1 if sign bit of e != 0, else 0
- *	__eisinf( e )             	1 if e has maximum exponent (non-IEEE)
- *					or is infinite (IEEE)
- *	__eisnan( e )             	1 if e is a NaN
- *	__esqrt( a, b )			b = square root of a
- *
- *
- *		Routines for internal format numbers
- *
- *	__eaddm( ai, bi )		add significands, bi = bi + ai
- *	__ecleaz(ei)		ei = 0
- *	__ecleazs(ei)		set ei = 0 but leave its sign alone
- *	__ecmpm( ai, bi )		compare significands, return 1, 0, or -1
- *	__edivm( ai, bi )		divide  significands, bi = bi / ai
- *	__emdnorm(ai,l,s,exp)	normalize and round off
- *	__emovi( a, ai )		convert external a to internal ai
- *	__emovo( ai, a )		convert internal ai to external a
- *	__emovz( ai, bi )		bi = ai, low guard word of bi = 0
- *	__emulm( ai, bi )		multiply significands, bi = bi * ai
- *	__enormlz(ei)		left-justify the significand
- *	__eshdn1( ai )		shift significand and guards down 1 bit
- *	__eshdn8( ai )		shift down 8 bits
- *	__eshdn6( ai )		shift down 16 bits
- *	__eshift( ai, n )		shift ai n bits up (or down if n < 0)
- *	__eshup1( ai )		shift significand and guards up 1 bit
- *	__eshup8( ai )		shift up 8 bits
- *	__eshup6( ai )		shift up 16 bits
- *	__esubm( ai, bi )		subtract significands, bi = bi - ai
- *
- *
- * The result is always normalized and rounded to NI-4 word precision
- * after each arithmetic operation.
- *
- * Exception flags are NOT fully supported.
- *
- * Define INFINITY in mconf.h for support of infinity; otherwise a
- * saturation arithmetic is implemented.
- *
- * Define NANS for support of Not-a-Number items; otherwise the
- * arithmetic will never produce a NaN output, and might be confused
- * by a NaN input.
- * If NaN's are supported, the output of ecmp(a,b) is -2 if
- * either a or b is a NaN. This means asking if(ecmp(a,b) < 0)
- * may not be legitimate. Use if(ecmp(a,b) == -1) for less-than
- * if in doubt.
- * Signaling NaN's are NOT supported; they are treated the same
- * as quiet NaN's.
- *
- * Denormals are always supported here where appropriate (e.g., not
- * for conversion to DEC numbers).
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <math.h>
-#include <locale.h>
-#include <ctype.h>
-
-#define alloca __builtin_alloca
-
-/* Don't build non-ANSI _IO_ldtoa.  It is not thread safe. */ 
-#ifndef USE_LDTOA
-#define USE_LDTOA 0
-#endif
-
-
- /* Number of 16 bit words in external x type format */
-#define NE 6
-
- /* Number of 16 bit words in internal format */
-#define NI (NE+3)
-
- /* Array offset to exponent */
-#define E 1
-
- /* Array offset to high guard word */
-#define M 2
-
- /* Number of bits of precision */
-#define NBITS ((NI-4)*16)
-
- /* Maximum number of decimal digits in ASCII conversion
-  * = NBITS*log10(2)
-  */
-#define NDEC (NBITS*8/27)
-
- /* The exponent of 1.0 */
-#define EXONE (0x3fff)
-
-
-#define  mtherr(x,y) 
-
-
-extern long double strtold (const char * __restrict__ s, char ** __restrict__ se);
-extern int __asctoe64(const char * __restrict__ ss,
-	       short unsigned int * __restrict__ y);
-extern void __emul(const short unsigned int *  a,
-		 const short unsigned int *  b,
-		 short unsigned int * c);
-extern int __ecmp(const short unsigned int * __restrict__ a,
-		const short unsigned int *  __restrict__ b);
-extern int __enormlz(short unsigned int *x);
-extern int __eshift(short unsigned int *x, int sc);
-extern void __eaddm(const short unsigned int  *  __restrict__  x,
-	          short unsigned int *  __restrict__  y);
-extern void __esubm(const short unsigned int * __restrict__  x,
-		  short unsigned int *  __restrict__ y);
-extern void __emdnorm(short unsigned int *s, int lost, int subflg,
-		      long int exp, int rcntrl, const int rndprc);
-extern void __toe64(short unsigned int *  __restrict__  a,
-		  short unsigned int *  __restrict__  b);
-extern int __edivm(short unsigned int *  __restrict__  den,
-		 short unsigned int * __restrict__  num);
-extern int __emulm(const short unsigned int *  __restrict__ a,
-		 short unsigned int *  __restrict__ b);
-extern void __emovi(const short unsigned int * __restrict__ a,
-		  short unsigned int * __restrict__ b);
-extern void __emovo(const short unsigned int * __restrict__ a,
-		  short unsigned int * __restrict__ b);
-
-#if USE_LDTOA
-
-extern char * _IO_ldtoa(long double, int, int, int *, int *, char **);
-extern void _IO_ldtostr(long double *x, char *string, int ndigs,
-			int flags, char fmt);
-
-extern void __eiremain(short unsigned int * __restrict__ den,
-		       short unsigned int *__restrict__ num,
-		       short unsigned int *__restrict__ equot);
-extern void __efloor(short unsigned int *x, short unsigned int *y);
-extern void __eadd1(const short unsigned int * __restrict__ a,
-		  const short unsigned int * __restrict__ b,
-		  short unsigned int * __restrict__ c,
-		  int subflg);
-extern void __esub(const short unsigned int *a, const short unsigned int *b,
-		   short unsigned int *c);
-extern void __ediv(const short unsigned int *a, const short unsigned int *b,
-		   short unsigned int *c);
-extern void __e64toe(short unsigned int *pe, short unsigned int *y);
-
-
-#endif
-
-static  __inline__ int __eisneg(const short unsigned int *x);
-static  __inline__ int __eisinf(const short unsigned int *x);
-static __inline__ int __eisnan(const short unsigned int *x);
-static __inline__ int __eiszero(const short unsigned int *a);
-static __inline__ void __emovz(register const short unsigned int * __restrict__ a,
-			       register short unsigned int * __restrict__ b);
-static __inline__ void __eclear(register short unsigned int *x);
-static __inline__ void __ecleaz(register short unsigned int *xi);
-static __inline__ void __ecleazs(register short unsigned int *xi);
-static  __inline__ int __eiisinf(const short unsigned int *x);
-static __inline__ int __eiisnan(const short unsigned int *x);
-static __inline__ int __eiiszero(const short unsigned int *x);
-static __inline__ void __enan_64(short unsigned int *nan);
-static __inline__ void __enan_NBITS (short unsigned int *nan);
-static __inline__ void __enan_NI16 (short unsigned int *nan);
-static __inline__ void __einfin(register short unsigned int *x);
-static __inline__ void __eneg(short unsigned int *x);
-static __inline__ void __eshup1(register short unsigned int *x);
-static __inline__ void __eshup8(register short unsigned int *x);
-static __inline__ void __eshup6(register short unsigned int *x);
-static __inline__ void __eshdn1(register short unsigned int *x);
-static __inline__ void __eshdn8(register short unsigned int *x);
-static __inline__ void __eshdn6(register short unsigned int *x);
-
-
-
-/* Intel IEEE, low order words come first:
- */
-#define IBMPC 1
-
-/* Define 1 for ANSI C atan2() function
- * See atan.c and clog.c.
- */
-#define ANSIC 1
-
-/*define VOLATILE volatile*/
-#define VOLATILE 
-
-/* For 12-byte long doubles on an i386, pad a 16-bit short 0
- * to the end of real constants initialized by integer arrays.
- *
- * #define XPD 0,
- *
- * Otherwise, the type is 10 bytes long and XPD should be
- * defined blank.
- *
- * #define XPD
- */
-#define XPD 0,
-/* #define XPD */
-#define NANS
-
-/* NaN's require infinity support. */
-#ifdef NANS
-#ifndef INFINITY
-#define INFINITY
-#endif
-#endif
-
-/* This handles 64-bit long ints. */
-#define LONGBITS (8 * sizeof(long))
-
-
-#define NTEN 12
-#define MAXP 4096
-
-extern const unsigned short __etens[NTEN + 1][NE];
-
-/*
-; Clear out entire external format number.
-;
-; unsigned short x[];
-; eclear( x );
-*/
-
-static __inline__ void __eclear(register short unsigned int *x)
-{
-  memset(x, 0, NE * sizeof(unsigned short));
-}
-
-
-/* Move external format number from a to b.
- *
- * emov( a, b );
- */
-
-static __inline__ void __emov(register const short unsigned int * __restrict__ a,
-			    register short unsigned int * __restrict__ b)
-{
-  memcpy(b, a, NE * sizeof(unsigned short));
-}
-
-
-/*
-;	Negate external format number
-;
-;	unsigned short x[NE];
-;	eneg( x );
-*/
-
-static __inline__ void __eneg(short unsigned int *x)
-{
-
-#ifdef NANS
-if( __eisnan(x) )
-	return;
-#endif
-x[NE-1] ^= 0x8000; /* Toggle the sign bit */
-}
-
-
-/* Return 1 if external format number is negative,
- * else return zero.
- */
-static __inline__ int __eisneg(const short unsigned int *x)
-{
-
-#ifdef NANS
-if( __eisnan(x) )
-	return( 0 );
-#endif
-if( x[NE-1] & 0x8000 )
-	return( 1 );
-else
-	return( 0 );
-}
-
-
-/* Return 1 if external format number has maximum possible exponent,
- * else return zero.
- */
-static __inline__ int __eisinf(const short unsigned int *x)
-{
-
-if( (x[NE-1] & 0x7fff) == 0x7fff )
-	{
-#ifdef NANS
-	if( __eisnan(x) )
-		return( 0 );
-#endif
-	return( 1 );
-	}
-else
-	return( 0 );
-}
-
-/* Check if e-type number is not a number.
- */
-static __inline__ int __eisnan(const short unsigned int *x)
-{
-#ifdef NANS
-int i;
-/* NaN has maximum __exponent */
-if( (x[NE-1] & 0x7fff) == 0x7fff )
-/* ... and non-zero significand field. */
-    for( i=0; i<NE-1; i++ )
-	{
-	if( *x++ != 0 )
-		return (1);
-	}
-#endif
-return (0);
-}
-
-/*
-; Fill __entire number, including __exponent and significand, with
-; largest possible number.  These programs implement a saturation
-; value that is an ordinary, legal number.  A special value
-; "infinity" may also be implemented; this would require tests
-; for that value and implementation of special rules for arithmetic
-; operations involving inifinity.
-*/
-
-static __inline__ void __einfin(register short unsigned int *x)
-{
-register int i;
-
-#ifdef INFINITY
-for( i=0; i<NE-1; i++ )
-	*x++ = 0;
-*x |= 32767;
-#else
-for( i=0; i<NE-1; i++ )
-	*x++ = 0xffff;
-*x |= 32766;
-*(x-5) = 0;
-#endif
-}
-
-/* Clear out internal format number.
- */
-
-static __inline__ void __ecleaz(register short unsigned int *xi)
-{
-  memset(xi, 0, NI * sizeof(unsigned short));
-}
-
-/* same, but don't touch the sign. */
-
-static __inline__ void __ecleazs(register short unsigned int *xi)
-{
-  ++xi;
-  memset(xi, 0, (NI-1) * sizeof(unsigned short));
-}
-
-
-
-/* Move internal format number from a to b.
- */
-static __inline__ void __emovz(register const short unsigned int * __restrict__ a,
-			     register short unsigned int * __restrict__ b)
-{
-  memcpy(b, a, (NI-1) * sizeof(unsigned short));
-  b[NI-1]=0;
-}
-
-/* Return nonzero if internal format number is a NaN.
- */
-
-static __inline__ int __eiisnan (const short unsigned int *x)
-{
-int i;
-
-if( (x[E] & 0x7fff) == 0x7fff )
-	{
-	for( i=M+1; i<NI; i++ )
-		{
-		if( x[i] != 0 )
-			return(1);
-		}
-	}
-return(0);
-}
-
-/* Return nonzero if external format number is zero. */
-
-static __inline__ int
-__eiszero(const short unsigned int * a)
-{
-if (*((long double*) a) == 0)
-	return (1);
-return (0);
-}
-
-/* Return nonzero if internal format number is zero. */
-
-static __inline__ int
-__eiiszero(const short unsigned int * ai)
-{
-  int i;
-  /* skip the sign word */
-  for( i=1; i<NI-1; i++ )
-    {
-      if( ai[i] != 0 )
-        return (0);
-    }
-  return (1);
-}
-
-
-/* Return nonzero if internal format number is infinite. */
-
-static __inline__ int 
-__eiisinf (const unsigned short *x)
-{
-
-#ifdef NANS
-  if (__eiisnan (x))
-    return (0);
-#endif
-  if ((x[E] & 0x7fff) == 0x7fff)
-    return (1);
-  return (0);
-}
-
-/*
-;	Compare significands of numbers in internal format.
-;	Guard words are included in the comparison.
-;
-;	unsigned short a[NI], b[NI];
-;	cmpm( a, b );
-;
-;	for the significands:
-;	returns	+1 if a > b
-;		 0 if a == b
-;		-1 if a < b
-*/
-static __inline__ int __ecmpm(register const short unsigned int * __restrict__ a,
-			    register const short unsigned int *  __restrict__ b)
-{
-int i;
-
-a += M; /* skip up to significand area */
-b += M;
-for( i=M; i<NI; i++ )
-	{
-	if( *a++ != *b++ )
-		goto difrnt;
-	}
-return(0);
-
-difrnt:
-if( *(--a) > *(--b) )
-	return(1);
-else
-	return(-1);
-}
-
-
-/*
-;	Shift significand down by 1 bit
-*/
-
-static __inline__ void __eshdn1(register short unsigned int *x)
-{
-register unsigned short bits;
-int i;
-
-x += M;	/* point to significand area */
-
-bits = 0;
-for( i=M; i<NI; i++ )
-	{
-	if( *x & 1 )
-		bits |= 1;
-	*x >>= 1;
-	if( bits & 2 )
-		*x |= 0x8000;
-	bits <<= 1;
-	++x;
-	}	
-}
-
-/*
-;	Shift significand up by 1 bit
-*/
-
-static __inline__ void __eshup1(register short unsigned int *x)
-{
-register unsigned short bits;
-int i;
-
-x += NI-1;
-bits = 0;
-
-for( i=M; i<NI; i++ )
-	{
-	if( *x & 0x8000 )
-		bits |= 1;
-	*x <<= 1;
-	if( bits & 2 )
-		*x |= 1;
-	bits <<= 1;
-	--x;
-	}
-}
-
-
-
-/*
-;	Shift significand down by 8 bits
-*/
-
-static __inline__ void __eshdn8(register short unsigned int *x)
-{
-register unsigned short newbyt, oldbyt;
-int i;
-
-x += M;
-oldbyt = 0;
-for( i=M; i<NI; i++ )
-	{
-	newbyt = *x << 8;
-	*x >>= 8;
-	*x |= oldbyt;
-	oldbyt = newbyt;
-	++x;
-	}
-}
-
-/*
-;	Shift significand up by 8 bits
-*/
-
-static __inline__ void __eshup8(register short unsigned int *x)
-{
-int i;
-register unsigned short newbyt, oldbyt;
-
-x += NI-1;
-oldbyt = 0;
-
-for( i=M; i<NI; i++ )
-	{
-	newbyt = *x >> 8;
-	*x <<= 8;
-	*x |= oldbyt;
-	oldbyt = newbyt;
-	--x;
-	}
-}
-
-/*
-;	Shift significand up by 16 bits
-*/
-
-static __inline__ void __eshup6(register short unsigned int *x)
-{
-int i;
-register unsigned short *p;
-
-p = x + M;
-x += M + 1;
-
-for( i=M; i<NI-1; i++ )
-	*p++ = *x++;
-
-*p = 0;
-}
-
-/*
-;	Shift significand down by 16 bits
-*/
-
-static __inline__ void __eshdn6(register short unsigned int *x)
-{
-int i;
-register unsigned short *p;
-
-x += NI-1;
-p = x + 1;
-
-for( i=M; i<NI-1; i++ )
-	*(--p) = *(--x);
-
-*(--p) = 0;
-}
-
-/*
-;	Add significands
-;	x + y replaces y
-*/
-
-static __inline__ void __enan_64(unsigned short* nan)
-{
-  static const unsigned short nan64[6]
-    = {0, 0, 0, 0xc000, 0xffff, 0};
-  nan = (unsigned short*) nan64;
-  return;
-}
-
-static __inline__ void __enan_NBITS(unsigned short* nan)
-{
- int i; 
- for( i=0; i<NE-2; i++ )
-    *nan++ = 0;
-  *nan++ = 0xc000;
-  *nan++ = 0x7fff;
-  return;
-}
-
-static __inline__ void __enan_NI16(unsigned short* nan)
-{
-  int i; 
-  *nan++ = 0;
-  *nan = 0x7fff;
-  *nan = 0;
-  *nan = 0xc000;
-  for( i=4; i<NI; i++ )
-    *nan++ = 0;
-  return;
-}
-
-
-#endif /* _CEPHES_EMATH_H */
-
diff --git a/winsup/mingw/mingwex/math/cephes_mconf.h b/winsup/mingw/mingwex/math/cephes_mconf.h
deleted file mode 100644
index 9818c4546..000000000
--- a/winsup/mingw/mingwex/math/cephes_mconf.h
+++ /dev/null
@@ -1,395 +0,0 @@
-#include <math.h>
-#include <errno.h>
-
-
-#define IBMPC 1
-#define ANSIPROT 1
-#define MINUSZERO 1
-#define INFINITIES 1
-#define NANS 1
-#define DENORMAL 1
-#define VOLATILE
-#define mtherr(fname, code) 
-#define XPD 0,
-
-#define _CEPHES_USE_ERRNO
-
-#ifdef _CEPHES_USE_ERRNO
-#define _SET_ERRNO(x) errno = (x)
-#else
-#define _SET_ERRNO(x)
-#endif
-
-/* constants used by cephes functions */
-
-/* double */
-#define MAXNUM	1.7976931348623158E308
-#define MAXLOG	7.09782712893383996843E2
-#define MINLOG	-7.08396418532264106224E2
-#define LOGE2	6.93147180559945309417E-1
-#define LOG2E	1.44269504088896340736
-#define PI	3.14159265358979323846
-#define PIO2	1.57079632679489661923
-#define PIO4	7.85398163397448309616E-1
-
-#define NEGZERO (-0.0)
-#undef NAN
-#undef INFINITY
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2))
-#define INFINITY __builtin_huge_val()
-#define NAN __builtin_nan("")
-#else
-extern double __INF;
-#define INFINITY (__INF)
-extern double __QNAN;
-#define NAN (__QNAN)
-#endif
-
-/*long double*/
-#define MAXNUML 1.189731495357231765021263853E4932L
-#define MAXLOGL	1.1356523406294143949492E4L
-#define MINLOGL	-1.13994985314888605586758E4L
-#define LOGE2L	6.9314718055994530941723E-1L
-#define LOG2EL	1.4426950408889634073599E0L
-#define PIL	3.1415926535897932384626L
-#define PIO2L	1.5707963267948966192313L
-#define PIO4L	7.8539816339744830961566E-1L
-
-#define isfinitel isfinite
-#define isinfl isinf
-#define isnanl isnan
-#define signbitl signbit
-
-#define NEGZEROL (-0.0L)
-
-#undef NANL
-#undef INFINITYL
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2))
-#define INFINITYL __builtin_huge_vall()
-#define NANL __builtin_nanl("")
-#else
-extern long double __INFL;
-#define INFINITYL (__INFL)
-extern long double __QNANL;
-#define NANL (__QNANL)
-#endif
-
-/* float */
-
-#define MAXNUMF	3.4028234663852885981170418348451692544e38F
-#define MAXLOGF	88.72283905206835F
-#define MINLOGF	-103.278929903431851103F /* log(2^-149) */
-#define LOG2EF	1.44269504088896341F
-#define LOGE2F	0.693147180559945309F
-#define PIF	3.141592653589793238F
-#define PIO2F	1.5707963267948966192F
-#define PIO4F	0.7853981633974483096F
-
-#define isfinitef isfinite
-#define isinff isinf
-#define isnanf isnan
-#define signbitf signbit
-
-#define NEGZEROF (-0.0F)
-
-#undef NANF
-#undef INFINITYF
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 2))
-#define INFINITYF __builtin_huge_valf()
-#define NANF __builtin_nanf("")
-#else
-extern float __INFF;
-#define INFINITYF (__INFF)
-extern float __QNANF;
-#define NANF (__QNANF)
-#endif
-
-
-/* double */
-
-/*
-Cephes Math Library Release 2.2:  July, 1992
-Copyright 1984, 1987, 1988, 1992 by Stephen L. Moshier
-Direct inquiries to 30 Frost Street, Cambridge, MA 02140
-*/
-
-
-/*							polevl.c
- *							p1evl.c
- *
- *	Evaluate polynomial
- *
- *
- *
- * SYNOPSIS:
- *
- * int N;
- * double x, y, coef[N+1], polevl[];
- *
- * y = polevl( x, coef, N );
- *
- *
- *
- * DESCRIPTION:
- *
- * Evaluates polynomial of degree N:
- *
- *                     2          N
- * y  =  C  + C x + C x  +...+ C x
- *        0    1     2          N
- *
- * Coefficients are stored in reverse order:
- *
- * coef[0] = C  , ..., coef[N] = C  .
- *            N                   0
- *
- *  The function p1evl() assumes that coef[N] = 1.0 and is
- * omitted from the array.  Its calling arguments are
- * otherwise the same as polevl().
- *
- *
- * SPEED:
- *
- * In the interest of speed, there are no checks for out
- * of bounds arithmetic.  This routine is used by most of
- * the functions in the library.  Depending on available
- * equipment features, the user may wish to rewrite the
- * program in microcode or assembly language.
- *
- */
-
-/* Polynomial evaluator:
- *  P[0] x^n  +  P[1] x^(n-1)  +  ...  +  P[n]
- */
-static  __inline__ double polevl( x, p, n )
-double x;
-const void *p;
-int n;
-{
-register double y;
-register double *P = (double *)p;
-
-y = *P++;
-do
-	{
-	y = y * x + *P++;
-	}
-while( --n );
-return(y);
-}
-
-
-
-/* Polynomial evaluator:
- *  x^n  +  P[0] x^(n-1)  +  P[1] x^(n-2)  +  ...  +  P[n]
- */
-static __inline__  double p1evl( x, p, n )
-double x;
-const void *p;
-int n;
-{
-register double y;
-register double *P = (double *)p;
-
-n -= 1;
-y = x + *P++;
-do
-	{
-	y = y * x + *P++;
-	}
-while( --n );
-return( y );
-}
-
-
-/* long double */
-/*
-Cephes Math Library Release 2.2:  July, 1992
-Copyright 1984, 1987, 1988, 1992 by Stephen L. Moshier
-Direct inquiries to 30 Frost Street, Cambridge, MA 02140
-*/
-
-
-/*							polevll.c
- *							p1evll.c
- *
- *	Evaluate polynomial
- *
- *
- *
- * SYNOPSIS:
- *
- * int N;
- * long double x, y, coef[N+1], polevl[];
- *
- * y = polevll( x, coef, N );
- *
- *
- *
- * DESCRIPTION:
- *
- * Evaluates polynomial of degree N:
- *
- *                     2          N
- * y  =  C  + C x + C x  +...+ C x
- *        0    1     2          N
- *
- * Coefficients are stored in reverse order:
- *
- * coef[0] = C  , ..., coef[N] = C  .
- *            N                   0
- *
- *  The function p1evll() assumes that coef[N] = 1.0 and is
- * omitted from the array.  Its calling arguments are
- * otherwise the same as polevll().
- *
- *
- * SPEED:
- *
- * In the interest of speed, there are no checks for out
- * of bounds arithmetic.  This routine is used by most of
- * the functions in the library.  Depending on available
- * equipment features, the user may wish to rewrite the
- * program in microcode or assembly language.
- *
- */
-
-/* Polynomial evaluator:
- *  P[0] x^n  +  P[1] x^(n-1)  +  ...  +  P[n]
- */
-static  __inline__ long double polevll( x, p, n )
-long double x;
-const void *p;
-int n;
-{
-register long double y;
-register long double *P = (long double *)p;
-
-y = *P++;
-do
-	{
-	y = y * x + *P++;
-	}
-while( --n );
-return(y);
-}
-
-
-
-/* Polynomial evaluator:
- *  x^n  +  P[0] x^(n-1)  +  P[1] x^(n-2)  +  ...  +  P[n]
- */
-static __inline__ long double p1evll( x, p, n )
-long double x;
-const void *p;
-int n;
-{
-register long double y;
-register long double *P = (long double *)p;
-
-n -= 1;
-y = x + *P++;
-do
-	{
-	y = y * x + *P++;
-	}
-while( --n );
-return( y );
-}
-
-/* Float version */
-
-/*							polevlf.c
- *							p1evlf.c
- *
- *	Evaluate polynomial
- *
- *
- *
- * SYNOPSIS:
- *
- * int N;
- * float x, y, coef[N+1], polevlf[];
- *
- * y = polevlf( x, coef, N );
- *
- *
- *
- * DESCRIPTION:
- *
- * Evaluates polynomial of degree N:
- *
- *                     2          N
- * y  =  C  + C x + C x  +...+ C x
- *        0    1     2          N
- *
- * Coefficients are stored in reverse order:
- *
- * coef[0] = C  , ..., coef[N] = C  .
- *            N                   0
- *
- *  The function p1evl() assumes that coef[N] = 1.0 and is
- * omitted from the array.  Its calling arguments are
- * otherwise the same as polevl().
- *
- *
- * SPEED:
- *
- * In the interest of speed, there are no checks for out
- * of bounds arithmetic.  This routine is used by most of
- * the functions in the library.  Depending on available
- * equipment features, the user may wish to rewrite the
- * program in microcode or assembly language.
- *
- */
-
-/*
-Cephes Math Library Release 2.1:  December, 1988
-Copyright 1984, 1987, 1988 by Stephen L. Moshier
-Direct inquiries to 30 Frost Street, Cambridge, MA 02140
-*/
-
-static __inline__ float polevlf(float x, const float* coef, int N )
-{
-float ans;
-float *p;
-int i;
-
-p = (float*)coef;
-ans = *p++;
-
-/*
-for( i=0; i<N; i++ )
-	ans = ans * x  +  *p++;
-*/
-
-i = N;
-do
-	ans = ans * x  +  *p++;
-while( --i );
-
-return( ans );
-}
-
-/*							p1evl()	*/
-/*                                          N
- * Evaluate polynomial when coefficient of x  is 1.0.
- * Otherwise same as polevl.
- */
-
-static __inline__ float p1evlf( float x, const float *coef, int N )
-{
-float ans;
-float *p;
-int i;
-
-p = (float*)coef;
-ans = x + *p++;
-i = N-1;
-
-do
-	ans = ans * x  + *p++;
-while( --i );
-
-return( ans );
-}
diff --git a/winsup/mingw/mingwex/math/copysign.S b/winsup/mingw/mingwex/math/copysign.S
deleted file mode 100644
index 60d6c72db..000000000
--- a/winsup/mingw/mingwex/math/copysign.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-	.file	"copysign.S"
-	.text
-	.align 4
-.globl _copysign
-	.def	_copysign;	.scl	2;	.type	32;	.endef
-_copysign:
-	movl	16(%esp),%edx
-	movl	8(%esp),%eax
-	andl	$0x80000000,%edx
-	andl	$0x7fffffff,%eax
-	orl	%edx,%eax
-	movl	%eax,8(%esp)
-	fldl	4(%esp)
-	ret
diff --git a/winsup/mingw/mingwex/math/copysignf.S b/winsup/mingw/mingwex/math/copysignf.S
deleted file mode 100644
index 8a60c463c..000000000
--- a/winsup/mingw/mingwex/math/copysignf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-	.file	"copysignf.S"
-	.text
-	.align 4
-.globl _copysignf
-	.def	_copysignf;	.scl	2;	.type	32;	.endef
-_copysignf:
-	movl	8(%esp),%edx
-	movl	4(%esp),%eax
-	andl	$0x80000000,%edx
-	andl	$0x7fffffff,%eax
-	orl	%edx,%eax
-	movl	%eax,4(%esp)
-	flds	4(%esp)
-	ret
diff --git a/winsup/mingw/mingwex/math/copysignl.S b/winsup/mingw/mingwex/math/copysignl.S
deleted file mode 100644
index 4143b37f8..000000000
--- a/winsup/mingw/mingwex/math/copysignl.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Changes for long double by Ulrich Drepper <drepper@cygnus.com>
- * Public domain.
- */
-
-	.file	"copysignl.S"
-	.text
-	.align 4
-.globl _copysignl
-	.def	_copysignl;	.scl	2;	.type	32;	.endef
-_copysignl:
-	movl	24(%esp),%edx
-	movl	12(%esp),%eax
-	andl	$0x8000,%edx
-	andl	$0x7fff,%eax
-	orl	%edx,%eax
-	movl	%eax,12(%esp)
-	fldt	4(%esp)
-	ret
diff --git a/winsup/mingw/mingwex/math/cosf.S b/winsup/mingw/mingwex/math/cosf.S
deleted file mode 100644
index 862f6ce6c..000000000
--- a/winsup/mingw/mingwex/math/cosf.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Removed glibc header dependancy by Danny Smith
- *  <dannysmith@users.sourceforge.net>
- */
-	.file	"cosf.S"
-	.text
-	.align 4
-.globl _cosl
-	.def	_cosf;	.scl	2;	.type	32;	.endef
-_cosf:
-	flds	4(%esp)
-	fcos
-	fnstsw	%ax
-	testl	$0x400,%eax
-	jnz	1f
-	ret
-1:	fldpi
-	fadd	%st(0)
-	fxch	%st(1)
-2:	fprem1
-	fnstsw	%ax
-	testl	$0x400,%eax
-	jnz	2b
-	fstp	%st(1)
-	fcos
-	ret
diff --git a/winsup/mingw/mingwex/math/coshf.c b/winsup/mingw/mingwex/math/coshf.c
deleted file mode 100644
index 4e44f0811..000000000
--- a/winsup/mingw/mingwex/math/coshf.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <math.h>
-float coshf (float x)
-  {return (float) cosh (x);}
diff --git a/winsup/mingw/mingwex/math/coshl.c b/winsup/mingw/mingwex/math/coshl.c
deleted file mode 100644
index c698e50c0..000000000
--- a/winsup/mingw/mingwex/math/coshl.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*							coshl.c
- *
- *	Hyperbolic cosine, long double precision
- *
- *
- *
- * SYNOPSIS:
- *
- * long double x, y, coshl();
- *
- * y = coshl( x );
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns hyperbolic cosine of argument in the range MINLOGL to
- * MAXLOGL.
- *
- * cosh(x)  =  ( exp(x) + exp(-x) )/2.
- *
- *
- *
- * ACCURACY:
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *    IEEE     +-10000      30000       1.1e-19     2.8e-20
- *
- *
- * ERROR MESSAGES:
- *
- *   message         condition              value returned
- * cosh overflow    |x| > MAXLOGL+LOGE2L      INFINITYL
- *
- *
- */
-
-
-/*
-Cephes Math Library Release 2.7:  May, 1998
-Copyright 1985, 1991, 1998 by Stephen L. Moshier
-*/
-
-/*
-Modified for mingw
-2002-07-22 Danny Smith <dannysmith@users.sourceforge.net>
-*/
-
-#ifdef __MINGW32__
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-#endif
-
-#ifndef _SET_ERRNO
-#define _SET_ERRNO(x)
-#endif
-
-
-#ifndef __MINGW32__
-extern long double MAXLOGL, MAXNUML, LOGE2L;
-#ifdef ANSIPROT
-extern long double expl ( long double );
-extern int isnanl ( long double );
-#else
-long double expl(), isnanl();
-#endif
-#ifdef INFINITIES
-extern long double INFINITYL;
-#endif
-#ifdef NANS
-extern long double NANL;
-#endif
-#endif /* __MINGW32__ */
-
-long double coshl(x)
-long double x;
-{
-long double y;
-
-#ifdef NANS
-if( isnanl(x) )
-	{
-	_SET_ERRNO(EDOM);
-	return(x);
-  	}
-#endif
-if( x < 0 )
-	x = -x;
-if( x > (MAXLOGL + LOGE2L) )
-	{
-	mtherr( "coshl", OVERFLOW );
-	_SET_ERRNO(ERANGE);
-#ifdef INFINITIES
-	return( INFINITYL );
-#else
-	return( MAXNUML );
-#endif
-	}	
-if( x >= (MAXLOGL - LOGE2L) )
-	{
-	y = expl(0.5L * x);
-	y = (0.5L * y) * y;
-	return(y);
-	}
-y = expl(x);
-y = 0.5L * (y + 1.0L / y);
-return( y );
-}
diff --git a/winsup/mingw/mingwex/math/cosl.S b/winsup/mingw/mingwex/math/cosl.S
deleted file mode 100644
index 59d9858b3..000000000
--- a/winsup/mingw/mingwex/math/cosl.S
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- * Removed glibc header dependancy by Danny Smith
- *  <dannysmith@users.sourceforge.net>
- */
-	.file	"cosl.S"
-	.text
-	.align 4
-.globl _cosl
-	.def	_cosl;	.scl	2;	.type	32;	.endef
-_cosl:
-	fldt	4(%esp)
-	fcos
-	fnstsw	%ax
-	testl	$0x400,%eax
-	jnz	1f
-	ret
-1:	fldpi
-	fadd	%st(0)
-	fxch	%st(1)
-2:	fprem1
-	fnstsw	%ax
-	testl	$0x400,%eax
-	jnz	2b
-	fstp	%st(1)
-	fcos
-	ret
diff --git a/winsup/mingw/mingwex/math/exp2.S b/winsup/mingw/mingwex/math/exp2.S
deleted file mode 100644
index 320065726..000000000
--- a/winsup/mingw/mingwex/math/exp2.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Adapted for exp2 by Ulrich Drepper <drepper@cygnus.com>.
- * Public domain.
- */
-
-	.file	"exp2.S"
-	.text
-	.align 4
-.globl _exp2
-	.def	_exp2;	.scl	2;	.type	32;	.endef
-_exp2:
-	fldl	4(%esp)
-/* I added the following ugly construct because exp(+-Inf) resulted
-   in NaN.  The ugliness results from the bright minds at Intel.
-   For the i686 the code can be written better.
-   -- drepper@cygnus.com.  */
-	fxam				/* Is NaN or +-Inf?  */
-	fstsw	%ax
-	movb	$0x45, %dh
-	andb	%ah, %dh
-	cmpb	$0x05, %dh
-	je	1f			/* Is +-Inf, jump.  */
-	fld	%st
-	frndint				/* int(x) */
-	fsubr	%st,%st(1)		/* fract(x) */
-	fxch
-	f2xm1				/* 2^(fract(x)) - 1 */
-	fld1
-	faddp				/* 2^(fract(x)) */
-	fscale				/* e^x */
-	fstp	%st(1)
-	ret
-
-1:	testl	$0x200, %eax		/* Test sign.  */
-	jz	2f			/* If positive, jump.  */
-	fstp	%st
-	fldz				/* Set result to 0.  */
-2:	ret
diff --git a/winsup/mingw/mingwex/math/exp2f.S b/winsup/mingw/mingwex/math/exp2f.S
deleted file mode 100644
index 0707a0cc6..000000000
--- a/winsup/mingw/mingwex/math/exp2f.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Adapted for exp2 by Ulrich Drepper <drepper@cygnus.com>.
- * Public domain.
- */
-
-	.file	"exp2f.S"
-	.text
-	.align 4
-.globl _exp2f
-	.def	_exp2f;	.scl	2;	.type	32;	.endef
-_exp2f:
-	flds	4(%esp)
-/* I added the following ugly construct because exp(+-Inf) resulted
-   in NaN.  The ugliness results from the bright minds at Intel.
-   For the i686 the code can be written better.
-   -- drepper@cygnus.com.  */
-	fxam				/* Is NaN or +-Inf?  */
-	fstsw	%ax
-	movb	$0x45, %dh
-	andb	%ah, %dh
-	cmpb	$0x05, %dh
-	je	1f			/* Is +-Inf, jump.  */
-	fld	%st
-	frndint				/* int(x) */
-	fsubr	%st,%st(1)		/* fract(x) */
-	fxch
-	f2xm1				/* 2^(fract(x)) - 1 */
-	fld1
-	faddp				/* 2^(fract(x)) */
-	fscale				/* e^x */
-	fstp	%st(1)
-	ret
-
-1:	testl	$0x200, %eax		/* Test sign.  */
-	jz	2f			/* If positive, jump.  */
-	fstp	%st
-	fldz				/* Set result to 0.  */
-2:	ret
diff --git a/winsup/mingw/mingwex/math/exp2l.S b/winsup/mingw/mingwex/math/exp2l.S
deleted file mode 100644
index 2457c26f4..000000000
--- a/winsup/mingw/mingwex/math/exp2l.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Adapted for exp2 by Ulrich Drepper <drepper@cygnus.com>.
- * Public domain.
- */
-
-	.file	"exp2l.S"
-	.text
-	.align 4
-.globl _exp2l
-	.def	_exp2l;	.scl	2;	.type	32;	.endef
-_exp2l:
-	fldt	4(%esp)
-/* I added the following ugly construct because exp(+-Inf) resulted
-   in NaN.  The ugliness results from the bright minds at Intel.
-   For the i686 the code can be written better.
-   -- drepper@cygnus.com.  */
-	fxam				/* Is NaN or +-Inf?  */
-	fstsw	%ax
-	movb	$0x45, %dh
-	andb	%ah, %dh
-	cmpb	$0x05, %dh
-	je	1f			/* Is +-Inf, jump.  */
-	fld	%st
-	frndint				/* int(x) */
-	fsubr	%st,%st(1)		/* fract(x) */
-	fxch
-	f2xm1				/* 2^(fract(x)) - 1 */
-	fld1
-	faddp				/* 2^(fract(x)) */
-	fscale				/* e^x */
-	fstp	%st(1)
-	ret
-
-1:	testl	$0x200, %eax		/* Test sign.  */
-	jz	2f			/* If positive, jump.  */
-	fstp	%st
-	fldz				/* Set result to 0.  */
-2:	ret
diff --git a/winsup/mingw/mingwex/math/expf.c b/winsup/mingw/mingwex/math/expf.c
deleted file mode 100644
index e56e0bc6e..000000000
--- a/winsup/mingw/mingwex/math/expf.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <math.h>
-float expf (float x)
-  {return (float) exp (x);}
diff --git a/winsup/mingw/mingwex/math/expl.c b/winsup/mingw/mingwex/math/expl.c
deleted file mode 100644
index 5f8face2c..000000000
--- a/winsup/mingw/mingwex/math/expl.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- */
-
-/*
- * The 8087 method for the exponential function is to calculate
- *   exp(x) = 2^(x log2(e))
- * after separating integer and fractional parts
- *   x log2(e) = i + f, |f| <= .5
- * 2^i is immediate but f needs to be precise for long double accuracy.
- * Suppress range reduction error in computing f by the following.
- * Separate x into integer and fractional parts
- *   x = xi + xf, |xf| <= .5
- * Separate log2(e) into the sum of an exact number c0 and small part c1.
- *   c0 + c1 = log2(e) to extra precision
- * Then
- *   f = (c0 xi - i) + c0 xf + c1 x
- * where c0 xi is exact and so also is (c0 xi - i).
- * -- moshier@na-net.ornl.gov
- */
-
-#include <math.h>
-
-static long double c0 = 1.44268798828125L;
-static long double c1 = 7.05260771340735992468e-6L;
-
-long double
-expl (long double x)
-{
-  long double res;
-
-/* I added the following ugly construct because expl(+-Inf) resulted
-   in NaN.  The ugliness results from the bright minds at Intel.
-   For the i686 the code can be written better.
-   -- drepper@cygnus.com.  */
-  asm ("fxam\n\t"		/* Is NaN or +-Inf?  */
-       "fstsw	%%ax\n\t"
-       "movb	$0x45, %%dh\n\t"
-       "andb	%%ah, %%dh\n\t"
-       "cmpb	$0x05, %%dh\n\t"
-       "je	1f\n\t"		/* Is +-Inf, jump.    */
-       "fldl2e\n\t"             /* 1  log2(e)         */
-       "fmul %%st(1),%%st\n\t"  /* 1  x log2(e)       */
-       "frndint\n\t"            /* 1  i               */
-       "fld %%st(1)\n\t"        /* 2  x               */
-       "frndint\n\t"            /* 2  xi              */
-       "fld %%st(1)\n\t"        /* 3  i               */
-       "fldt %2\n\t"            /* 4  c0              */
-       "fld %%st(2)\n\t"        /* 5  xi              */
-       "fmul %%st(1),%%st\n\t"  /* 5  c0 xi           */
-       "fsubp %%st,%%st(2)\n\t" /* 4  f = c0 xi  - i  */
-       "fld %%st(4)\n\t"        /* 5  x               */
-       "fsub %%st(3),%%st\n\t"  /* 5  xf = x - xi     */
-       "fmulp %%st,%%st(1)\n\t" /* 4  c0 xf           */
-       "faddp %%st,%%st(1)\n\t" /* 3  f = f + c0 xf   */
-       "fldt %3\n\t"            /* 4                  */
-       "fmul %%st(4),%%st\n\t"  /* 4  c1 * x          */
-       "faddp %%st,%%st(1)\n\t" /* 3  f = f + c1 * x  */
-       "f2xm1\n\t"		/* 3 2^(fract(x * log2(e))) - 1 */
-       "fld1\n\t"               /* 4 1.0              */
-       "faddp\n\t"		/* 3 2^(fract(x * log2(e))) */
-       "fstp	%%st(1)\n\t"    /* 2  */
-       "fscale\n\t"	        /* 2 scale factor is st(1); e^x */
-       "fstp	%%st(1)\n\t"    /* 1  */
-       "fstp	%%st(1)\n\t"    /* 0  */
-       "jmp 2f\n\t"
-       "1:\ttestl	$0x200, %%eax\n\t"	/* Test sign.  */
-       "jz	2f\n\t"		/* If positive, jump.  */
-       "fstp	%%st\n\t"
-       "fldz\n\t"		/* Set result to 0.  */
-       "2:\t\n"
-       : "=t" (res) : "0" (x), "m" (c0), "m" (c1) : "ax", "dx");
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/fabs.c b/winsup/mingw/mingwex/math/fabs.c
deleted file mode 100644
index c2074e8cb..000000000
--- a/winsup/mingw/mingwex/math/fabs.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <math.h>
-
-double
-fabs (double x)
-{
-  double res;
-
-  asm ("fabs;" : "=t" (res) : "0" (x));
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/fabsf.c b/winsup/mingw/mingwex/math/fabsf.c
deleted file mode 100644
index 6580f955c..000000000
--- a/winsup/mingw/mingwex/math/fabsf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math.h>
-
-float
-fabsf (float x)
-{
-  float res;
-  asm ("fabs;" : "=t" (res) : "0" (x));
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/fabsl.c b/winsup/mingw/mingwex/math/fabsl.c
deleted file mode 100644
index eead724d4..000000000
--- a/winsup/mingw/mingwex/math/fabsl.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math.h>
-
-long double
-fabsl (long double x)
-{
-  long double res;
-  asm ("fabs;" : "=t" (res) : "0" (x));
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/fdim.c b/winsup/mingw/mingwex/math/fdim.c
deleted file mode 100644
index 330b09241..000000000
--- a/winsup/mingw/mingwex/math/fdim.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-double
-fdim (double x, double y)
-{
-  return  (isgreater(x, y) ? (x - y) : 0.0);
-}
diff --git a/winsup/mingw/mingwex/math/fdimf.c b/winsup/mingw/mingwex/math/fdimf.c
deleted file mode 100644
index 02bfc6e5e..000000000
--- a/winsup/mingw/mingwex/math/fdimf.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-float
-fdimf (float x, float y)
-{
-  return  (isgreater(x, y) ? (x - y) : 0.0F);
-}
diff --git a/winsup/mingw/mingwex/math/fdiml.c b/winsup/mingw/mingwex/math/fdiml.c
deleted file mode 100644
index 1c3d0aaaa..000000000
--- a/winsup/mingw/mingwex/math/fdiml.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-long double
-fdiml (long double x, long double y)
-{
-   return  (isgreater(x, y) ? (x - y) : 0.0L);
-}
diff --git a/winsup/mingw/mingwex/math/floorf.S b/winsup/mingw/mingwex/math/floorf.S
deleted file mode 100644
index 8ae8100a7..000000000
--- a/winsup/mingw/mingwex/math/floorf.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Changes for long double by Ulrich Drepper <drepper@cygnus.com>
- * 
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-	.file	"floorf.S"
-	.text
-	.align 4
-.globl _floorf
-	.def	_floorf;	.scl	2;	.type	32;	.endef
-_floorf:
-	flds	4(%esp)
-	subl	$8,%esp
-
-	fstcw	4(%esp)			/* store fpu control word */
-
-	/* We use here %edx although only the low 1 bits are defined.
-	   But none of the operations should care and they are faster
-	   than the 16 bit operations.  */
-	movl	$0x400,%edx		/* round towards -oo */
-	orl	4(%esp),%edx
-	andl	$0xf7ff,%edx
-	movl	%edx,(%esp)
-	fldcw	(%esp)			/* load modified control word */
-
-	frndint				/* round */
-
-	fldcw	4(%esp)			/* restore original control word */
-
-	addl	$8,%esp
-	ret
diff --git a/winsup/mingw/mingwex/math/floorl.S b/winsup/mingw/mingwex/math/floorl.S
deleted file mode 100644
index 5ab9214b5..000000000
--- a/winsup/mingw/mingwex/math/floorl.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Changes for long double by Ulrich Drepper <drepper@cygnus.com>
- * 
- */
-	.file	"floorl.S"
-	.text
-	.align 4
-.globl _floorl
-	.def	_floorl;	.scl	2;	.type	32;	.endef
-_floorl:
-	fldt	4(%esp)
-	subl	$8,%esp
-
-	fstcw	4(%esp)			/* store fpu control word */
-
-	/* We use here %edx although only the low 1 bits are defined.
-	   But none of the operations should care and they are faster
-	   than the 16 bit operations.  */
-	movl	$0x400,%edx		/* round towards -oo */
-	orl	4(%esp),%edx
-	andl	$0xf7ff,%edx
-	movl	%edx,(%esp)
-	fldcw	(%esp)			/* load modified control word */
-
-	frndint				/* round */
-
-	fldcw	4(%esp)			/* restore original control word */
-
-	addl	$8,%esp
-	ret
diff --git a/winsup/mingw/mingwex/math/fma.S b/winsup/mingw/mingwex/math/fma.S
deleted file mode 100644
index d6226653c..000000000
--- a/winsup/mingw/mingwex/math/fma.S
+++ /dev/null
@@ -1,12 +0,0 @@
-	.file	"fma.S"
-	.text
-	.align 2
-	.p2align 4,,15
-.globl _fma
-	.def	_fma;	.scl	2;	.type	32;	.endef
-_fma:
-	fldl	4(%esp)
-	fmull	12(%esp)
-	fldl	20(%esp)
-	faddp
-	ret
diff --git a/winsup/mingw/mingwex/math/fmaf.S b/winsup/mingw/mingwex/math/fmaf.S
deleted file mode 100644
index 0d64ac2f1..000000000
--- a/winsup/mingw/mingwex/math/fmaf.S
+++ /dev/null
@@ -1,12 +0,0 @@
-	.file	"fmaf.S"
-	.text
-	.align 2
-	.p2align 4,,15
-.globl _fmaf
-	.def	_fmaf;	.scl	2;	.type	32;	.endef
-_fmaf:
-	flds	4(%esp)
-	fmuls	8(%esp)
-	flds	12(%esp)
-	faddp
-	ret
diff --git a/winsup/mingw/mingwex/math/fmal.c b/winsup/mingw/mingwex/math/fmal.c
deleted file mode 100644
index 1fbd41d28..000000000
--- a/winsup/mingw/mingwex/math/fmal.c
+++ /dev/null
@@ -1,5 +0,0 @@
-long double
-fmal ( long double _x,  long double _y,  long double _z)
-{
-  return ((_x * _y) + _z);
-}
diff --git a/winsup/mingw/mingwex/math/fmax.c b/winsup/mingw/mingwex/math/fmax.c
deleted file mode 100644
index 35c1f45e5..000000000
--- a/winsup/mingw/mingwex/math/fmax.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-double
-fmax (double _x, double _y)
-{
-   return ( isgreaterequal (_x, _y)|| __isnan (_y) ?  _x : _y );
-}
diff --git a/winsup/mingw/mingwex/math/fmaxf.c b/winsup/mingw/mingwex/math/fmaxf.c
deleted file mode 100644
index 079a7e746..000000000
--- a/winsup/mingw/mingwex/math/fmaxf.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-float
-fmaxf (float _x, float _y)
-{
-  return (( isgreaterequal(_x, _y) || __isnanf (_y)) ?  _x : _y );
-}
diff --git a/winsup/mingw/mingwex/math/fmaxl.c b/winsup/mingw/mingwex/math/fmaxl.c
deleted file mode 100644
index 4e38da476..000000000
--- a/winsup/mingw/mingwex/math/fmaxl.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-long double
-fmaxl (long double _x, long double  _y)
-{
-  return (( isgreaterequal(_x, _y) || __isnanl (_y)) ?  _x : _y );
-}
diff --git a/winsup/mingw/mingwex/math/fmin.c b/winsup/mingw/mingwex/math/fmin.c
deleted file mode 100644
index 96a6ed111..000000000
--- a/winsup/mingw/mingwex/math/fmin.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-double
-fmin (double _x, double _y)
-{
-  return ((islessequal(_x, _y) || __isnan (_y)) ? _x : _y );
-}
diff --git a/winsup/mingw/mingwex/math/fminf.c b/winsup/mingw/mingwex/math/fminf.c
deleted file mode 100644
index f3d71480d..000000000
--- a/winsup/mingw/mingwex/math/fminf.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-float
-fminf (float _x, float _y)
-{
-  return ((islessequal(_x, _y) || _isnan (_y)) ? _x : _y );
-}
diff --git a/winsup/mingw/mingwex/math/fminl.c b/winsup/mingw/mingwex/math/fminl.c
deleted file mode 100644
index d8a3fea2c..000000000
--- a/winsup/mingw/mingwex/math/fminl.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-long double
-fminl (long double _x, long double _y)
-{
-  return ((islessequal(_x, _y) || __isnanl (_y)) ? _x : _y );
-}
diff --git a/winsup/mingw/mingwex/math/fmodf.c b/winsup/mingw/mingwex/math/fmodf.c
deleted file mode 100644
index 6405d725f..000000000
--- a/winsup/mingw/mingwex/math/fmodf.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for float type by Danny Smith
- *  <dannysmith@users.sourceforge.net>.
- */
-
-#include <math.h>
-
-float
-fmodf (float x, float y)
-{
-  float res;
-
-  asm ("1:\tfprem\n\t"
-       "fstsw   %%ax\n\t"
-       "sahf\n\t"
-       "jp      1b\n\t"
-       "fstp    %%st(1)"
-       : "=t" (res) : "0" (x), "u" (y) : "ax", "st(1)");
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/fmodl.c b/winsup/mingw/mingwex/math/fmodl.c
deleted file mode 100644
index f1c97f10b..000000000
--- a/winsup/mingw/mingwex/math/fmodl.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- */
-
-#include <math.h>
-
-long double
-fmodl (long double x, long double y)
-{
-  long double res;
-
-  asm ("1:\tfprem\n\t"
-       "fstsw   %%ax\n\t"
-       "sahf\n\t"
-       "jp      1b\n\t"
-       "fstp    %%st(1)"
-       : "=t" (res) : "0" (x), "u" (y) : "ax", "st(1)");
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/fp_consts.c b/winsup/mingw/mingwex/math/fp_consts.c
deleted file mode 100644
index 285c9d7dc..000000000
--- a/winsup/mingw/mingwex/math/fp_consts.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#include "fp_consts.h"
-const union _ieee_rep __QNAN = { __DOUBLE_QNAN_REP };
-const union _ieee_rep __SNAN = { __DOUBLE_SNAN_REP };
-const union _ieee_rep __INF = { __DOUBLE_INF_REP };
-const union _ieee_rep __DENORM = { __DOUBLE_DENORM_REP };
-
-/* ISO C99 */
-#undef nan
-/* FIXME */
-double nan (const char * tagp __attribute__((unused)) )
-	{ return __QNAN.double_val; } 
-
-
diff --git a/winsup/mingw/mingwex/math/fp_consts.h b/winsup/mingw/mingwex/math/fp_consts.h
deleted file mode 100644
index 249339501..000000000
--- a/winsup/mingw/mingwex/math/fp_consts.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef _FP_CONSTS_H
-#define _FP_CONSTS_H
-
-/*
-According to IEEE 754 a QNaN has exponent bits of all 1 values and
-initial significand bit of 1.  A SNaN has has an exponent of all 1
-values and initial significand bit of 0 (with one or more other
-significand bits of 1). An Inf has significand of 0 and
-exponent of all 1 values. A denormal value has all exponent bits of 0.
-
-The following does _not_ follow those rules, but uses values
-equal to those exported from MS C++ runtime lib, msvcprt.dll
-for float and double. MSVC however, does not have long doubles.
-*/
-
-
-#define __DOUBLE_INF_REP { 0, 0, 0, 0x7ff0 }
-#define __DOUBLE_QNAN_REP { 0, 0, 0, 0xfff8 }  /* { 0, 0, 0, 0x7ff8 }  */
-#define __DOUBLE_SNAN_REP { 0, 0, 0, 0xfff0 }  /* { 1, 0, 0, 0x7ff0 }  */
-#define __DOUBLE_DENORM_REP {1, 0, 0, 0}
-
-#define D_NAN_MASK 0x7ff0000000000000LL /* this will mask NaN's and Inf's */
-
-#define __FLOAT_INF_REP { 0, 0x7f80 }
-#define __FLOAT_QNAN_REP { 0, 0xffc0 }  /* { 0, 0x7fc0 }  */
-#define __FLOAT_SNAN_REP { 0, 0xff80 }  /* { 1, 0x7f80 }  */
-#define __FLOAT_DENORM_REP {1,0}
-
-#define F_NAN_MASK 0x7f800000
-
-/*
-   This assumes no implicit (hidden) bit in extended mode.
-   Padded to 96 bits
- */
-#define __LONG_DOUBLE_INF_REP { 0, 0, 0, 0x8000, 0x7fff, 0 }
-#define __LONG_DOUBLE_QNAN_REP { 0, 0, 0, 0xc000, 0xffff, 0 } 
-#define __LONG_DOUBLE_SNAN_REP { 0, 0, 0, 0x8000, 0xffff, 0 }
-#define __LONG_DOUBLE_DENORM_REP {1, 0, 0, 0, 0, 0}
-
-union _ieee_rep
-{
-  unsigned short rep[6];
-  float float_val;
-  double double_val;
-  long double ldouble_val;
-} ;
-
-#endif
diff --git a/winsup/mingw/mingwex/math/fp_constsf.c b/winsup/mingw/mingwex/math/fp_constsf.c
deleted file mode 100644
index 5a4afef2b..000000000
--- a/winsup/mingw/mingwex/math/fp_constsf.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "fp_consts.h"
-
-const union _ieee_rep __QNANF = { __FLOAT_QNAN_REP };   
-const union _ieee_rep __SNANF = { __FLOAT_SNAN_REP };   
-const union _ieee_rep __INFF = { __FLOAT_INF_REP };   
-const union _ieee_rep __DENORMF = { __FLOAT_DENORM_REP };   
-
-/* ISO C99 */
-#undef nanf
-/* FIXME */
-float nanf(const char * tagp __attribute__((unused)) )
-  { return __QNANF.float_val;}
diff --git a/winsup/mingw/mingwex/math/fp_constsl.c b/winsup/mingw/mingwex/math/fp_constsl.c
deleted file mode 100644
index 44fdb7fd3..000000000
--- a/winsup/mingw/mingwex/math/fp_constsl.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "fp_consts.h"
-
-const union _ieee_rep __QNANL = { __LONG_DOUBLE_QNAN_REP };
-const union _ieee_rep __SNANL  = { __LONG_DOUBLE_SNAN_REP };
-const union _ieee_rep __INFL = { __LONG_DOUBLE_INF_REP };
-const union _ieee_rep __DENORML = { __LONG_DOUBLE_DENORM_REP };
-
-
-#undef nanl
-/* FIXME */
-long double nanl (const char * tagp __attribute__((unused)) )
-  { return __QNANL.ldouble_val; } 
diff --git a/winsup/mingw/mingwex/math/fpclassify.c b/winsup/mingw/mingwex/math/fpclassify.c
deleted file mode 100644
index f8cd8cb44..000000000
--- a/winsup/mingw/mingwex/math/fpclassify.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <math.h>
-
-/* 'fxam' sets FPU flags C3,C2,C0   'fstsw' stores: 
- FP_NAN			001		0x0100
- FP_NORMAL		010		0x0400
- FP_INFINITE		011		0x0500
- FP_ZERO		100		0x4000
- FP_SUBNORMAL		110		0x4400
-
-and sets C1 flag (signbit) if neg */
-
-int __fpclassify (double _x){
-  unsigned short sw;
-  __asm__ (
-	"fxam; fstsw %%ax;"
-	: "=a" (sw)
-	: "t" (_x)
-	);
-  return sw & (FP_NAN | FP_NORMAL | FP_ZERO );
-}
diff --git a/winsup/mingw/mingwex/math/fpclassifyf.c b/winsup/mingw/mingwex/math/fpclassifyf.c
deleted file mode 100644
index aca4e59f1..000000000
--- a/winsup/mingw/mingwex/math/fpclassifyf.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <math.h>
-int __fpclassifyf (float _x){
-  unsigned short sw;
-  __asm__ (
-	"fxam; fstsw %%ax;"
-	: "=a" (sw)
-	: "t" (_x)
-	);
-  return sw & (FP_NAN | FP_NORMAL | FP_ZERO );
-}
diff --git a/winsup/mingw/mingwex/math/fpclassifyl.c b/winsup/mingw/mingwex/math/fpclassifyl.c
deleted file mode 100644
index 9979d6278..000000000
--- a/winsup/mingw/mingwex/math/fpclassifyl.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <math.h>
-int __fpclassifyl (long double _x){
-  unsigned short sw;
-  __asm__ (
-	"fxam; fstsw %%ax;"
-	: "=a" (sw)
-	: "t" (_x)
-	);
-  return sw & (FP_NAN | FP_NORMAL | FP_ZERO );
-}
diff --git a/winsup/mingw/mingwex/math/frexpf.c b/winsup/mingw/mingwex/math/frexpf.c
deleted file mode 100644
index df262abc5..000000000
--- a/winsup/mingw/mingwex/math/frexpf.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <math.h>
-float frexpf (float x, int* expn)
-  {return (float)frexp(x, expn);}
diff --git a/winsup/mingw/mingwex/math/frexpl.S b/winsup/mingw/mingwex/math/frexpl.S
deleted file mode 100644
index 2b691c87f..000000000
--- a/winsup/mingw/mingwex/math/frexpl.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-  Cephes Math Library Release 2.7:  May, 1998
-  Copyright 1984, 1987, 1988, 1992, 1998 by Stephen L. Moshier
-
-  Extracted from floorl.387 for use in libmingwex.a by
-  Danny Smith <dannysmith@users.sourceforge.net>
-  2002-06-20
-*/
-
-/*
- * frexpl(long double x, int* expnt) extracts the exponent from x.
- * It returns an integer power of two to expnt and the significand
- * between 0.5 and 1 to y.  Thus  x = y * 2**expn.
- */ 
-	.align 2
-.globl _frexpl
-_frexpl:
-	pushl %ebp
-	movl %esp,%ebp
-	subl $24,%esp
-	pushl %esi
-	pushl %ebx
-	fldt 8(%ebp)
-	movl 20(%ebp),%ebx
-	fld %st(0)
-	fstpt -12(%ebp)
-	leal -4(%ebp),%ecx
-	movw -4(%ebp),%dx
-	andl $32767,%edx
-	jne L25
-	fldz
-	fucompp
-	fnstsw %ax
-	andb $68,%ah
-	xorb $64,%ah
-	jne L21
-	movl $0,(%ebx)
-	fldz
-	jmp L24
-	.align 2,0x90
-	.align 2,0x90
-L21:
-	fldt -12(%ebp)
-	fadd %st(0),%st
-	fstpt -12(%ebp)
-	decl %edx
-	movw (%ecx),%si
-	andl $32767,%esi
-	jne L22
-	cmpl $-66,%edx
-	jg L21
-L22:
-	addl %esi,%edx
-	jmp L19
-	.align 2,0x90
-L25:
-	fstp %st(0)
-L19:
-	addl $-16382,%edx
-	movl %edx,(%ebx)
-	movw (%ecx),%ax
-	andl $-32768,%eax
-	orl $16382,%eax
-	movw %ax,(%ecx)
-	fldt -12(%ebp)
-L24:
-	leal -32(%ebp),%esp
-	popl %ebx
-	popl %esi
-	leave
-	ret
diff --git a/winsup/mingw/mingwex/math/fucom.c b/winsup/mingw/mingwex/math/fucom.c
deleted file mode 100644
index 80c937262..000000000
--- a/winsup/mingw/mingwex/math/fucom.c
+++ /dev/null
@@ -1,11 +0,0 @@
-int 
-__fp_unordered_compare (long double x,  long double y){
-  unsigned short retval;
-  __asm__ (
-	"fucom %%st(1);"
-	"fnstsw;"
-	: "=a" (retval)
-	: "t" (x), "u" (y)
-	);
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/hypotf.c b/winsup/mingw/mingwex/math/hypotf.c
deleted file mode 100644
index ee67a45dc..000000000
--- a/winsup/mingw/mingwex/math/hypotf.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <math.h>
-
-float hypotf (float x, float y)
-  { return (float) _hypot (x, y);}
diff --git a/winsup/mingw/mingwex/math/hypotl.c b/winsup/mingw/mingwex/math/hypotl.c
deleted file mode 100644
index 2a25b82c3..000000000
--- a/winsup/mingw/mingwex/math/hypotl.c
+++ /dev/null
@@ -1,73 +0,0 @@
-#include <math.h>
-#include <float.h>
-#include <errno.h>
-
-/*
-This implementation is based largely on Cephes library
-function cabsl (cmplxl.c), which bears the following notice:
-
-Cephes Math Library Release 2.1:  January, 1989
-Copyright 1984, 1987, 1989 by Stephen L. Moshier
-Direct inquiries to 30 Frost Street, Cambridge, MA 02140
-*/
-
-/*
-   Modified for use in libmingwex.a
-   02 Sept 2002  Danny Smith  <dannysmith@users.sourceforege.net>
-   Calls to ldexpl replaced by logbl and calls to frexpl replaced
-   by scalbnl to avoid duplicated range checks.
-*/
-
-extern long double __INFL;
-#define PRECL 32
-
-long double
-hypotl (long double x, long double y)
-{
-  int exx;
-  int eyy;
-  int  scale;
-  long double xx =fabsl(x);
-  long double yy =fabsl(y);
-  if (!isfinite(xx) || !isfinite(yy))
-    return  xx + yy; /* Return INF or NAN. */
-
-  if (xx == 0.0L)
-     return yy;
-  if (yy == 0.0L)
-     return xx;
-
-  /* Get exponents */
-  exx =  logbl (xx);
-  eyy =  logbl (yy);
-
-  /* Check if large differences in scale */
-  scale = exx - eyy;
-  if ( scale > PRECL)
-     return xx;
-  if ( scale < -PRECL)
-     return yy;
-
-  /* Exponent of approximate geometric mean (x 2) */
-  scale = (exx + eyy) >> 1;
-
-  /*  Rescale: Geometric mean is now about 2 */  
-  x = scalbnl(xx, -scale);
-  y = scalbnl(yy, -scale);
-
-  xx = sqrtl(x * x  + y * y);
-
-  /* Check for overflow and underflow */
-  exx = logbl(xx);   
-  exx += scale;
-    if (exx > LDBL_MAX_EXP)
-    {
-      errno = ERANGE; 
-      return __INFL;
-    }
-  if (exx < LDBL_MIN_EXP)
-    return 0.0L;
-
-  /* Undo scaling */
-  return (scalbnl (xx, scale));
-}
diff --git a/winsup/mingw/mingwex/math/ilogb.S b/winsup/mingw/mingwex/math/ilogb.S
deleted file mode 100644
index 2335b5146..000000000
--- a/winsup/mingw/mingwex/math/ilogb.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-
-	.file	"ilogb.S"
-	.text
-	.align 4
-.globl _ilogb
-	.def	_ilogb;	.scl	2;	.type	32;	.endef
-_ilogb:
-
-	fldl	4(%esp)
-/* I added the following ugly construct because ilogb(+-Inf) is
-   required to return INT_MAX in ISO C99.
-   -- jakub@redhat.com.  */
-	fxam			/* Is NaN or +-Inf?  */
-	fstsw   %ax
-	movb    $0x45, %dh
-	andb    %ah, %dh
-	cmpb    $0x05, %dh
-	je      1f		/* Is +-Inf, jump.  */
-
-	fxtract
-	pushl	%eax
-	fstp	%st
-
-	fistpl	(%esp)
-	fwait
-	popl	%eax
-
-	ret
-
-1:	fstp	%st
-	movl	$0x7fffffff, %eax
-	ret
diff --git a/winsup/mingw/mingwex/math/ilogbf.S b/winsup/mingw/mingwex/math/ilogbf.S
deleted file mode 100644
index fa3e78e84..000000000
--- a/winsup/mingw/mingwex/math/ilogbf.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-	.file	"ilogbf.S"
-	.text
-	.align 4
-.globl _ilogbf
-	.def	_ilogbf;	.scl	2;	.type	32;	.endef
-_ilogbf:
-	flds	4(%esp)
-/* I added the following ugly construct because ilogb(+-Inf) is
-   required to return INT_MAX in ISO C99.
-   -- jakub@redhat.com.  */
-	fxam			/* Is NaN or +-Inf?  */
-	fstsw   %ax
-	movb    $0x45, %dh
-	andb    %ah, %dh
-	cmpb    $0x05, %dh
-	je      1f		/* Is +-Inf, jump.  */
-
-	fxtract
-	pushl	%eax
-	fstp	%st
-
-	fistpl	(%esp)
-	fwait
-	popl	%eax
-
-	ret
-
-1:	fstp	%st
-	movl	$0x7fffffff, %eax
-	ret
diff --git a/winsup/mingw/mingwex/math/ilogbl.S b/winsup/mingw/mingwex/math/ilogbl.S
deleted file mode 100644
index b9dc6ea72..000000000
--- a/winsup/mingw/mingwex/math/ilogbl.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Changes for long double by Ulrich Drepper <drepper@cygnus.com>
- * Public domain.
- */
-
-	.file	"ilogbl.S"
-	.text
-	.align 4
-.globl _ilogbl
-	.def	_ilogbl;	.scl	2;	.type	32;	.endef
-_ilogbl:
-	fldt	4(%esp)
-/* I added the following ugly construct because ilogb(+-Inf) is
-   required to return INT_MAX in ISO C99.
-   -- jakub@redhat.com.  */
-	fxam			/* Is NaN or +-Inf?  */
-	fstsw   %ax
-	movb    $0x45, %dh
-	andb    %ah, %dh
-	cmpb    $0x05, %dh
-	je      1f		/* Is +-Inf, jump.  */
-
-	fxtract
-	pushl	%eax
-	fstp	%st
-
-	fistpl	(%esp)
-	fwait
-	popl	%eax
-
-	ret
-
-1:	fstp	%st
-	movl	$0x7fffffff, %eax
-	ret
diff --git a/winsup/mingw/mingwex/math/isnan.c b/winsup/mingw/mingwex/math/isnan.c
deleted file mode 100644
index b38bc290e..000000000
--- a/winsup/mingw/mingwex/math/isnan.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-
-int
-__isnan (double _x)
-{
-  unsigned short _sw;
-  __asm__ ("fxam;"
-	   "fstsw %%ax": "=a" (_sw) : "t" (_x));
-  return (_sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL))
-    == FP_NAN;
-}
-
-#undef isnan
-int __attribute__ ((alias ("__isnan"))) isnan (double);
diff --git a/winsup/mingw/mingwex/math/isnanf.c b/winsup/mingw/mingwex/math/isnanf.c
deleted file mode 100644
index 73fe0eb02..000000000
--- a/winsup/mingw/mingwex/math/isnanf.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <math.h>
-int
-__isnanf (float _x)
-{
-  unsigned short _sw;
-  __asm__ ("fxam;"
-	   "fstsw %%ax": "=a" (_sw) : "t" (_x) );
-  return (_sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL))
-    == FP_NAN;
-}
-
-int __attribute__ ((alias ("__isnanf"))) isnanf (float);
diff --git a/winsup/mingw/mingwex/math/isnanl.c b/winsup/mingw/mingwex/math/isnanl.c
deleted file mode 100644
index 86d0088b4..000000000
--- a/winsup/mingw/mingwex/math/isnanl.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <math.h>
-
-int
-__isnanl (long double _x)
-{
-  unsigned short _sw;
-  __asm__ ("fxam;"
-	   "fstsw %%ax": "=a" (_sw) : "t" (_x));
-  return (_sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL))
-    == FP_NAN;
-}
-
-int __attribute__ ((alias ("__isnanl"))) isnanl (long double);
diff --git a/winsup/mingw/mingwex/math/ldexpf.c b/winsup/mingw/mingwex/math/ldexpf.c
deleted file mode 100644
index 5d01a0184..000000000
--- a/winsup/mingw/mingwex/math/ldexpf.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <math.h>
-float ldexpf (float x, int expn)
-  {return (float) ldexp (x, expn);}
diff --git a/winsup/mingw/mingwex/math/ldexpl.c b/winsup/mingw/mingwex/math/ldexpl.c
deleted file mode 100644
index e4477bf6c..000000000
--- a/winsup/mingw/mingwex/math/ldexpl.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <math.h>
-#include <errno.h>
-
-
-long double ldexpl(long double x, int expn)
-{
-  if (isfinite (x) && x != 0.0L)
-    {
-      x = scalbnl (x , expn);
-      if (!isfinite (x) || x == 0.0) errno = ERANGE;
-    }
-  return x;
-}
-
diff --git a/winsup/mingw/mingwex/math/lgamma.c b/winsup/mingw/mingwex/math/lgamma.c
deleted file mode 100644
index f85094957..000000000
--- a/winsup/mingw/mingwex/math/lgamma.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/*							lgam()
- *
- *	Natural logarithm of gamma function
- *
- *
- *
- * SYNOPSIS:
- *
- * double x, y, __lgamma_r();
- * int* sgngam;
- * y = __lgamma_r( x, sgngam );
- * 
- * double x, y, lgamma();
- * y = lgamma( x);
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns the base e (2.718...) logarithm of the absolute
- * value of the gamma function of the argument. In the reentrant
- * version, the sign (+1 or -1) of the gamma function is returned
- * in the variable referenced by sgngam.
- *
- * For arguments greater than 13, the logarithm of the gamma
- * function is approximated by the logarithmic version of
- * Stirling's formula using a polynomial approximation of
- * degree 4. Arguments between -33 and +33 are reduced by
- * recurrence to the interval [2,3] of a rational approximation.
- * The cosecant reflection formula is employed for arguments
- * less than -33.
- *
- * Arguments greater than MAXLGM return MAXNUM and an error
- * message.  MAXLGM = 2.035093e36 for DEC
- * arithmetic or 2.556348e305 for IEEE arithmetic.
- *
- *
- *
- * ACCURACY:
- *
- *
- * arithmetic      domain        # trials     peak         rms
- *    DEC     0, 3                  7000     5.2e-17     1.3e-17
- *    DEC     2.718, 2.035e36       5000     3.9e-17     9.9e-18
- *    IEEE    0, 3                 28000     5.4e-16     1.1e-16
- *    IEEE    2.718, 2.556e305     40000     3.5e-16     8.3e-17
- * The error criterion was relative when the function magnitude
- * was greater than one but absolute when it was less than one.
- *
- * The following test used the relative error criterion, though
- * at certain points the relative error could be much higher than
- * indicated.
- *    IEEE    -200, -4             10000     4.8e-16     1.3e-16
- *
- */
-
-/*
- * Cephes Math Library Release 2.8:  June, 2000
- * Copyright 1984, 1987, 1989, 1992, 2000 by Stephen L. Moshier
- */
-
-/*
- * 26-11-2002 Modified for mingw.
- * Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-
-#ifndef __MINGW32__
-#include "mconf.h"
-#ifdef ANSIPROT
-extern double pow ( double, double );
-extern double log ( double );
-extern double exp ( double );
-extern double sin ( double );
-extern double polevl ( double, void *, int );
-extern double p1evl ( double, void *, int );
-extern double floor ( double );
-extern double fabs ( double );
-extern int isnan ( double );
-extern int isfinite ( double );
-#else
-double pow(), log(), exp(), sin(), polevl(), p1evl(), floor(), fabs();
-int isnan(), isfinite();
-#endif
-#ifdef INFINITIES
-extern double INFINITY;
-#endif
-#ifdef NANS
-extern double NAN;
-#endif
-#else /* __MINGW32__ */
-#include "cephes_mconf.h"
-#endif /* __MINGW32__ */
-
-
-/* A[]: Stirling's formula expansion of log gamma
- * B[], C[]: log gamma function between 2 and 3
- */
-#ifdef UNK
-static double A[] = {
- 8.11614167470508450300E-4,
--5.95061904284301438324E-4,
- 7.93650340457716943945E-4,
--2.77777777730099687205E-3,
- 8.33333333333331927722E-2
-};
-static double B[] = {
--1.37825152569120859100E3,
--3.88016315134637840924E4,
--3.31612992738871184744E5,
--1.16237097492762307383E6,
--1.72173700820839662146E6,
--8.53555664245765465627E5
-};
-static double C[] = {
-/* 1.00000000000000000000E0, */
--3.51815701436523470549E2,
--1.70642106651881159223E4,
--2.20528590553854454839E5,
--1.13933444367982507207E6,
--2.53252307177582951285E6,
--2.01889141433532773231E6
-};
-/* log( sqrt( 2*pi ) ) */
-static double LS2PI  =  0.91893853320467274178;
-#define MAXLGM 2.556348e305
-static double LOGPI = 1.14472988584940017414;
-#endif
-
-#ifdef DEC
-static const unsigned short A[] = {
-0035524,0141201,0034633,0031405,
-0135433,0176755,0126007,0045030,
-0035520,0006371,0003342,0172730,
-0136066,0005540,0132605,0026407,
-0037252,0125252,0125252,0125132
-};
-static const unsigned short B[] = {
-0142654,0044014,0077633,0035410,
-0144027,0110641,0125335,0144760,
-0144641,0165637,0142204,0047447,
-0145215,0162027,0146246,0155211,
-0145322,0026110,0010317,0110130,
-0145120,0061472,0120300,0025363
-};
-static const unsigned short C[] = {
-/*0040200,0000000,0000000,0000000*/
-0142257,0164150,0163630,0112622,
-0143605,0050153,0156116,0135272,
-0144527,0056045,0145642,0062332,
-0145213,0012063,0106250,0001025,
-0145432,0111254,0044577,0115142,
-0145366,0071133,0050217,0005122
-};
-/* log( sqrt( 2*pi ) ) */
-static const unsigned short LS2P[] = {040153,037616,041445,0172645,};
-#define LS2PI *(double *)LS2P
-#define MAXLGM 2.035093e36
-static const unsigned short LPI[4] = {
-0040222,0103202,0043475,0006750,
-};
-#define LOGPI *(double *)LPI
-
-#endif
-
-#ifdef IBMPC
-static const unsigned short A[] = {
-0x6661,0x2733,0x9850,0x3f4a,
-0xe943,0xb580,0x7fbd,0xbf43,
-0x5ebb,0x20dc,0x019f,0x3f4a,
-0xa5a1,0x16b0,0xc16c,0xbf66,
-0x554b,0x5555,0x5555,0x3fb5
-};
-static const unsigned short B[] = {
-0x6761,0x8ff3,0x8901,0xc095,
-0xb93e,0x355b,0xf234,0xc0e2,
-0x89e5,0xf890,0x3d73,0xc114,
-0xdb51,0xf994,0xbc82,0xc131,
-0xf20b,0x0219,0x4589,0xc13a,
-0x055e,0x5418,0x0c67,0xc12a
-};
-static const unsigned short C[] = {
-/*0x0000,0x0000,0x0000,0x3ff0,*/
-0x12b2,0x1cf3,0xfd0d,0xc075,
-0xd757,0x7b89,0xaa0d,0xc0d0,
-0x4c9b,0xb974,0xeb84,0xc10a,
-0x0043,0x7195,0x6286,0xc131,
-0xf34c,0x892f,0x5255,0xc143,
-0xe14a,0x6a11,0xce4b,0xc13e
-};
-/* log( sqrt( 2*pi ) ) */
-static const unsigned short LS2P[] = {
-0xbeb5,0xc864,0x67f1,0x3fed
-};
-#define LS2PI *(double *)LS2P
-#define MAXLGM 2.556348e305
-static const unsigned short LPI[4] = {
-0xa1bd,0x48e7,0x50d0,0x3ff2,
-};
-#define LOGPI *(double *)LPI
-#endif
-
-#ifdef MIEEE
-static const unsigned short A[] = {
-0x3f4a,0x9850,0x2733,0x6661,
-0xbf43,0x7fbd,0xb580,0xe943,
-0x3f4a,0x019f,0x20dc,0x5ebb,
-0xbf66,0xc16c,0x16b0,0xa5a1,
-0x3fb5,0x5555,0x5555,0x554b
-};
-static const unsigned short B[] = {
-0xc095,0x8901,0x8ff3,0x6761,
-0xc0e2,0xf234,0x355b,0xb93e,
-0xc114,0x3d73,0xf890,0x89e5,
-0xc131,0xbc82,0xf994,0xdb51,
-0xc13a,0x4589,0x0219,0xf20b,
-0xc12a,0x0c67,0x5418,0x055e
-};
-static const unsigned short C[] = {
-0xc075,0xfd0d,0x1cf3,0x12b2,
-0xc0d0,0xaa0d,0x7b89,0xd757,
-0xc10a,0xeb84,0xb974,0x4c9b,
-0xc131,0x6286,0x7195,0x0043,
-0xc143,0x5255,0x892f,0xf34c,
-0xc13e,0xce4b,0x6a11,0xe14a
-};
-/* log( sqrt( 2*pi ) ) */
-static const unsigned short LS2P[] = {
-0x3fed,0x67f1,0xc864,0xbeb5
-};
-#define LS2PI *(double *)LS2P
-#define MAXLGM 2.556348e305
-static unsigned short LPI[4] = {
-0x3ff2,0x50d0,0x48e7,0xa1bd,
-};
-#define LOGPI *(double *)LPI
-#endif
-
-
-/* Logarithm of gamma function */
-/* Reentrant version */ 
-
-double __lgamma_r(double x, int* sgngam)
-{
-double p, q, u, w, z;
-int i;
-
-*sgngam = 1;
-#ifdef NANS
-if( isnan(x) )
-	return(x);
-#endif
-
-#ifdef INFINITIES
-if( !isfinite(x) )
-	return(INFINITY);
-#endif
-
-if( x < -34.0 )
-	{
-	q = -x;
-	w = __lgamma_r(q, sgngam); /* note this modifies sgngam! */
-	p = floor(q);
-	if( p == q )
-		{
-lgsing:
-		_SET_ERRNO(EDOM);
-		mtherr( "lgam", SING );
-#ifdef INFINITIES
-		return (INFINITY);
-#else
-		return (MAXNUM);
-#endif
-		}
-	i = p;
-	if( (i & 1) == 0 )
-		*sgngam = -1;
-	else
-		*sgngam = 1;
-	z = q - p;
-	if( z > 0.5 )
-		{
-		p += 1.0;
-		z = p - q;
-		}
-	z = q * sin( PI * z );
-	if( z == 0.0 )
-		goto lgsing;
-/*	z = log(PI) - log( z ) - w;*/
-	z = LOGPI - log( z ) - w;
-	return( z );
-	}
-
-if( x < 13.0 )
-	{
-	z = 1.0;
-	p = 0.0;
-	u = x;
-	while( u >= 3.0 )
-		{
-		p -= 1.0;
-		u = x + p;
-		z *= u;
-		}
-	while( u < 2.0 )
-		{
-		if( u == 0.0 )
-			goto lgsing;
-		z /= u;
-		p += 1.0;
-		u = x + p;
-		}
-	if( z < 0.0 )
-		{
-		*sgngam = -1;
-		z = -z;
-		}
-	else
-		*sgngam = 1;
-	if( u == 2.0 )
-		return( log(z) );
-	p -= 2.0;
-	x = x + p;
-	p = x * polevl( x, B, 5 ) / p1evl( x, C, 6);
-	return( log(z) + p );
-	}
-
-if( x > MAXLGM )
-	{
-	_SET_ERRNO(ERANGE);
-	mtherr( "lgamma", OVERFLOW );
-#ifdef INFINITIES
-	return( *sgngam * INFINITY );
-#else
-	return( *sgngam * MAXNUM );
-#endif
-	}
-
-q = ( x - 0.5 ) * log(x) - x + LS2PI;
-if( x > 1.0e8 )
-	return( q );
-
-p = 1.0/(x*x);
-if( x >= 1000.0 )
-	q += ((   7.9365079365079365079365e-4 * p
-		- 2.7777777777777777777778e-3) *p
-		+ 0.0833333333333333333333) / x;
-else
-	q += polevl( p, A, 4 ) / x;
-return( q );
-}
-
-/* This is the C99 version */
-
-double lgamma(double x)
-{
-  int local_sgngam=0;
-  return (__lgamma_r(x, &local_sgngam));
-}
diff --git a/winsup/mingw/mingwex/math/lgammaf.c b/winsup/mingw/mingwex/math/lgammaf.c
deleted file mode 100644
index 20982f999..000000000
--- a/winsup/mingw/mingwex/math/lgammaf.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*							lgamf()
- *
- *	Natural logarithm of gamma function
- *
- *
- *
- * SYNOPSIS:
- *
- * float x, y, __lgammaf_r();
- * int* sgngamf;
- * y = __lgammaf_r( x, sgngamf );
- * 
- * float x, y, lgammaf();
- * y = lgammaf( x);
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns the base e (2.718...) logarithm of the absolute
- * value of the gamma function of the argument. In the reentrant
- * version the sign (+1 or -1) of the gamma function is returned in
- * variable referenced by sgngamf.
- *
- * For arguments greater than 6.5, the logarithm of the gamma
- * function is approximated by the logarithmic version of
- * Stirling's formula.  Arguments between 0 and +6.5 are reduced by
- * by recurrence to the interval [.75,1.25] or [1.5,2.5] of a rational
- * approximation.  The cosecant reflection formula is employed for
- * arguments less than zero.
- *
- * Arguments greater than MAXLGM = 2.035093e36 return MAXNUM and an
- * error message.
- *
- *
- *
- * ACCURACY:
- *
- *
- *
- * arithmetic      domain        # trials     peak         rms
- *    IEEE        -100,+100       500,000    7.4e-7       6.8e-8
- * The error criterion was relative when the function magnitude
- * was greater than one but absolute when it was less than one.
- * The routine has low relative error for positive arguments.
- *
- * The following test used the relative error criterion.
- *    IEEE    -2, +3              100000     4.0e-7      5.6e-8
- *
- */
-
-
-/*
-  Cephes Math Library Release 2.7:  July, 1998
-  Copyright 1984, 1987, 1989, 1992, 1998 by Stephen L. Moshier
-*/
-
-/*
-  26-11-2002 Modified for mingw.
-  Danny Smith <dannysmith@users.sourceforge.net>
-*/
-
-
-/* log gamma(x+2), -.5 < x < .5 */
-static const float B[] = {
- 6.055172732649237E-004,
--1.311620815545743E-003,
- 2.863437556468661E-003,
--7.366775108654962E-003,
- 2.058355474821512E-002,
--6.735323259371034E-002,
- 3.224669577325661E-001,
- 4.227843421859038E-001
-};
-
-/* log gamma(x+1), -.25 < x < .25 */
-static const float C[] = {
- 1.369488127325832E-001,
--1.590086327657347E-001,
- 1.692415923504637E-001,
--2.067882815621965E-001,
- 2.705806208275915E-001,
--4.006931650563372E-001,
- 8.224670749082976E-001,
--5.772156501719101E-001
-};
-
-/* log( sqrt( 2*pi ) ) */
-static const float LS2PI  =  0.91893853320467274178;
-#define MAXLGM 2.035093e36
-static const float PIINV =  0.318309886183790671538;
-
-#ifndef __MINGW32__
-#include "mconf.h"
-float floorf(float);
-float polevlf( float, float *, int );
-float p1evlf( float, float *, int );
-#else
-#include "cephes_mconf.h"
-#endif
-
-/* Reentrant version */ 
-/* Logarithm of gamma function */
-
-float __lgammaf_r( float x, int* sgngamf )
-{
-float p, q, w, z;
-float nx, tx;
-int i, direction;
-
-*sgngamf = 1;
-#ifdef NANS
-if( isnan(x) )
-	return(x);
-#endif
-
-#ifdef INFINITIES
-if( !isfinite(x) )
-	return(x);
-#endif
-
-
-if( x < 0.0 )
-	{
-	q = -x;
-	w = __lgammaf_r(q, sgngamf); /* note this modifies sgngam! */
-	p = floorf(q);
-	if( p == q )
-		{
-lgsing:
-		_SET_ERRNO(EDOM);
-		mtherr( "lgamf", SING );
-#ifdef INFINITIES
-		return (INFINITYF);
-#else
-	return( *sgngamf * MAXNUMF );
-#endif
-		}
-	i = p;
-	if( (i & 1) == 0 )
-		*sgngamf = -1;
-	else
-		*sgngamf = 1;
-	z = q - p;
-	if( z > 0.5 )
-		{
-		p += 1.0;
-		z = p - q;
-		}
-	z = q * sinf( PIF * z );
-	if( z == 0.0 )
-		goto lgsing;
-	z = -logf( PIINV*z ) - w;
-	return( z );
-	}
-
-if( x < 6.5 )
-	{
-	direction = 0;
-	z = 1.0;
-	tx = x;
-	nx = 0.0;
-	if( x >= 1.5 )
-		{
-		while( tx > 2.5 )
-			{
-			nx -= 1.0;
-			tx = x + nx;
-			z *=tx;
-			}
-		x += nx - 2.0;
-iv1r5:
-		p = x * polevlf( x, B, 7 );
-		goto cont;
-		}
-	if( x >= 1.25 )
-		{
-		z *= x;
-		x -= 1.0; /* x + 1 - 2 */
-		direction = 1;
-		goto iv1r5;
-		}
-	if( x >= 0.75 )
-		{
-		x -= 1.0;
-		p = x * polevlf( x, C, 7 );
-		q = 0.0;
-		goto contz;
-		}
-	while( tx < 1.5 )
-		{
-		if( tx == 0.0 )
-			goto lgsing;
-		z *=tx;
-		nx += 1.0;
-		tx = x + nx;
-		}
-	direction = 1;
-	x += nx - 2.0;
-	p = x * polevlf( x, B, 7 );
-
-cont:
-	if( z < 0.0 )
-		{
-		*sgngamf = -1;
-		z = -z;
-		}
-	else
-		{
-		*sgngamf = 1;
-		}
-	q = logf(z);
-	if( direction )
-		q = -q;
-contz:
-	return( p + q );
-	}
-
-if( x > MAXLGM )
-	{
-	_SET_ERRNO(ERANGE);
-	mtherr( "lgamf", OVERFLOW );
-#ifdef INFINITIES
-	return( *sgngamf * INFINITYF );
-#else
-	return( *sgngamf * MAXNUMF );
-#endif
-
-	}
-
-/* Note, though an asymptotic formula could be used for x >= 3,
- * there is cancellation error in the following if x < 6.5.  */
-q = LS2PI - x;
-q += ( x - 0.5 ) * logf(x);
-
-if( x <= 1.0e4 )
-	{
-	z = 1.0/x;
-	p = z * z;
-	q += ((    6.789774945028216E-004 * p
-		 - 2.769887652139868E-003 ) * p
-		+  8.333316229807355E-002 ) * z;
-	}
-return( q );
-}
-
-/* This is the C99 version */
-
-float lgammaf(float x)
-{
-  int local_sgngamf=0;
-  return (__lgammaf_r(x, &local_sgngamf));
-}
diff --git a/winsup/mingw/mingwex/math/lgammal.c b/winsup/mingw/mingwex/math/lgammal.c
deleted file mode 100644
index d2b306afd..000000000
--- a/winsup/mingw/mingwex/math/lgammal.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/*							lgaml()
- *
- *	Natural logarithm of gamma function
- *
- *
- *
- * SYNOPSIS:
- *
- * long double x, y, __lgammal_r();
- * int* sgngaml;
- * y = __lgammal_r( x, sgngaml );
- * 
- * long double x, y, lgammal();
- * y = lgammal( x);
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns the base e (2.718...) logarithm of the absolute
- * value of the gamma function of the argument. In the reentrant
- * version, the sign (+1 or -1) of the gamma function is returned
- * in the variable referenced by sgngaml.
- *
- * For arguments greater than 33, the logarithm of the gamma
- * function is approximated by the logarithmic version of
- * Stirling's formula using a polynomial approximation of
- * degree 4. Arguments between -33 and +33 are reduced by
- * recurrence to the interval [2,3] of a rational approximation.
- * The cosecant reflection formula is employed for arguments
- * less than -33.
- *
- * Arguments greater than MAXLGML (10^4928) return MAXNUML.
- *
- *
- *
- * ACCURACY:
- *
- *
- * arithmetic      domain        # trials     peak         rms
- *    IEEE         -40, 40        100000     2.2e-19     4.6e-20
- *    IEEE    10^-2000,10^+2000    20000     1.6e-19     3.3e-20
- * The error criterion was relative when the function magnitude
- * was greater than one but absolute when it was less than one.
- *
- */
-
-/*
- * Copyright 1994 by Stephen L. Moshier
- */
-
-/*
- * 26-11-2002 Modified for mingw.
- * Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-#ifndef __MINGW32__
-#include "mconf.h"
-#ifdef ANSIPROT
-extern long double fabsl ( long double );
-extern long double lgaml ( long double );
-extern long double logl ( long double );
-extern long double expl ( long double );
-extern long double gammal ( long double );
-extern long double sinl ( long double );
-extern long double floorl ( long double );
-extern long double powl ( long double, long double );
-extern long double polevll ( long double, void *, int );
-extern long double p1evll ( long double, void *, int );
-extern int isnanl ( long double );
-extern int isfinitel ( long double );
-#else
-long double fabsl(), lgaml(), logl(), expl(), gammal(), sinl();
-long double floorl(), powl(), polevll(), p1evll(), isnanl(), isfinitel();
-#endif
-#ifdef INFINITIES
-extern long double INFINITYL;
-#endif
-#ifdef NANS
-extern long double NANL;
-#endif
-#else /* __MINGW32__ */
-#include "cephes_mconf.h"
-#endif /* __MINGW32__ */
-
-#if UNK
-static long double S[9] = {
--1.193945051381510095614E-3L,
- 7.220599478036909672331E-3L,
--9.622023360406271645744E-3L,
--4.219773360705915470089E-2L,
- 1.665386113720805206758E-1L,
--4.200263503403344054473E-2L,
--6.558780715202540684668E-1L,
- 5.772156649015328608253E-1L,
- 1.000000000000000000000E0L,
-};
-#endif
-#if IBMPC
-static const unsigned short S[] = {
-0xbaeb,0xd6d3,0x25e5,0x9c7e,0xbff5, XPD
-0xfe9a,0xceb4,0xc74e,0xec9a,0x3ff7, XPD
-0x9225,0xdfef,0xb0e9,0x9da5,0xbff8, XPD
-0x10b0,0xec17,0x87dc,0xacd7,0xbffa, XPD
-0x6b8d,0x7515,0x1905,0xaa89,0x3ffc, XPD
-0xf183,0x126b,0xf47d,0xac0a,0xbffa, XPD
-0x7bf6,0x57d1,0xa013,0xa7e7,0xbffe, XPD
-0xc7a9,0x7db0,0x67e3,0x93c4,0x3ffe, XPD
-0x0000,0x0000,0x0000,0x8000,0x3fff, XPD
-};
-#endif
-#if MIEEE
-static long S[27] = {
-0xbff50000,0x9c7e25e5,0xd6d3baeb,
-0x3ff70000,0xec9ac74e,0xceb4fe9a,
-0xbff80000,0x9da5b0e9,0xdfef9225,
-0xbffa0000,0xacd787dc,0xec1710b0,
-0x3ffc0000,0xaa891905,0x75156b8d,
-0xbffa0000,0xac0af47d,0x126bf183,
-0xbffe0000,0xa7e7a013,0x57d17bf6,
-0x3ffe0000,0x93c467e3,0x7db0c7a9,
-0x3fff0000,0x80000000,0x00000000,
-};
-#endif
-
-#if UNK
-static long double SN[9] = {
- 1.133374167243894382010E-3L,
- 7.220837261893170325704E-3L,
- 9.621911155035976733706E-3L,
--4.219773343731191721664E-2L,
--1.665386113944413519335E-1L,
--4.200263503402112910504E-2L,
- 6.558780715202536547116E-1L,
- 5.772156649015328608727E-1L,
--1.000000000000000000000E0L,
-};
-#endif
-#if IBMPC
-static const unsigned SN[] = {
-0x5dd1,0x02de,0xb9f7,0x948d,0x3ff5, XPD
-0x989b,0xdd68,0xc5f1,0xec9c,0x3ff7, XPD
-0x2ca1,0x18f0,0x386f,0x9da5,0x3ff8, XPD
-0x783f,0x41dd,0x87d1,0xacd7,0xbffa, XPD
-0x7a5b,0xd76d,0x1905,0xaa89,0xbffc, XPD
-0x7f64,0x1234,0xf47d,0xac0a,0xbffa, XPD
-0x5e26,0x57d1,0xa013,0xa7e7,0x3ffe, XPD
-0xc7aa,0x7db0,0x67e3,0x93c4,0x3ffe, XPD
-0x0000,0x0000,0x0000,0x8000,0xbfff, XPD
-};
-#endif
-#if MIEEE
-static long SN[27] = {
-0x3ff50000,0x948db9f7,0x02de5dd1,
-0x3ff70000,0xec9cc5f1,0xdd68989b,
-0x3ff80000,0x9da5386f,0x18f02ca1,
-0xbffa0000,0xacd787d1,0x41dd783f,
-0xbffc0000,0xaa891905,0xd76d7a5b,
-0xbffa0000,0xac0af47d,0x12347f64,
-0x3ffe0000,0xa7e7a013,0x57d15e26,
-0x3ffe0000,0x93c467e3,0x7db0c7aa,
-0xbfff0000,0x80000000,0x00000000,
-};
-#endif
-
-
-/* A[]: Stirling's formula expansion of log gamma
- * B[], C[]: log gamma function between 2 and 3
- */
-
-
-/* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x A(1/x^2)
- * x >= 8
- * Peak relative error 1.51e-21
- * Relative spread of error peaks 5.67e-21
- */
-#if UNK
-static long double A[7] = {
- 4.885026142432270781165E-3L,
--1.880801938119376907179E-3L,
- 8.412723297322498080632E-4L,
--5.952345851765688514613E-4L,
- 7.936507795855070755671E-4L,
--2.777777777750349603440E-3L,
- 8.333333333333331447505E-2L,
-};
-#endif
-#if IBMPC
-static const unsigned short A[] = {
-0xd984,0xcc08,0x91c2,0xa012,0x3ff7, XPD
-0x3d91,0x0304,0x3da1,0xf685,0xbff5, XPD
-0x3bdc,0xaad1,0xd492,0xdc88,0x3ff4, XPD
-0x8b20,0x9fce,0x844e,0x9c09,0xbff4, XPD
-0xf8f2,0x30e5,0x0092,0xd00d,0x3ff4, XPD
-0x4d88,0x03a8,0x60b6,0xb60b,0xbff6, XPD
-0x9fcc,0xaaaa,0xaaaa,0xaaaa,0x3ffb, XPD
-};
-#endif
-#if MIEEE
-static long A[21] = {
-0x3ff70000,0xa01291c2,0xcc08d984,
-0xbff50000,0xf6853da1,0x03043d91,
-0x3ff40000,0xdc88d492,0xaad13bdc,
-0xbff40000,0x9c09844e,0x9fce8b20,
-0x3ff40000,0xd00d0092,0x30e5f8f2,
-0xbff60000,0xb60b60b6,0x03a84d88,
-0x3ffb0000,0xaaaaaaaa,0xaaaa9fcc,
-};
-#endif
-
-/* log gamma(x+2) = x B(x)/C(x)
- * 0 <= x <= 1
- * Peak relative error 7.16e-22
- * Relative spread of error peaks 4.78e-20
- */
-#if UNK
-static long double B[7] = {
--2.163690827643812857640E3L,
--8.723871522843511459790E4L,
--1.104326814691464261197E6L,
--6.111225012005214299996E6L,
--1.625568062543700591014E7L,
--2.003937418103815175475E7L,
--8.875666783650703802159E6L,
-};
-static long double C[7] = {
-/* 1.000000000000000000000E0L,*/
--5.139481484435370143617E2L,
--3.403570840534304670537E4L,
--6.227441164066219501697E5L,
--4.814940379411882186630E6L,
--1.785433287045078156959E7L,
--3.138646407656182662088E7L,
--2.099336717757895876142E7L,
-};
-#endif
-#if IBMPC
-static const unsigned short B[] = {
-0x9557,0x4995,0x0da1,0x873b,0xc00a, XPD
-0xfe44,0x9af8,0x5b8c,0xaa63,0xc00f, XPD
-0x5aa8,0x7cf5,0x3684,0x86ce,0xc013, XPD
-0x259a,0x258c,0xf206,0xba7f,0xc015, XPD
-0xbe18,0x1ca3,0xc0a0,0xf80a,0xc016, XPD
-0x168f,0x2c42,0x6717,0x98e3,0xc017, XPD
-0x2051,0x9d55,0x92c8,0x876e,0xc016, XPD
-};
-static const unsigned short C[] = {
-/*0x0000,0x0000,0x0000,0x8000,0x3fff, XPD*/
-0xaa77,0xcf2f,0xae76,0x807c,0xc008, XPD
-0xb280,0x0d74,0xb55a,0x84f3,0xc00e, XPD
-0xa505,0xcd30,0x81dc,0x9809,0xc012, XPD
-0x3369,0x4246,0xb8c2,0x92f0,0xc015, XPD
-0x63cf,0x6aee,0xbe6f,0x8837,0xc017, XPD
-0x26bb,0xccc7,0xb009,0xef75,0xc017, XPD
-0x462b,0xbae8,0xab96,0xa02a,0xc017, XPD
-};
-#endif
-#if MIEEE
-static long B[21] = {
-0xc00a0000,0x873b0da1,0x49959557,
-0xc00f0000,0xaa635b8c,0x9af8fe44,
-0xc0130000,0x86ce3684,0x7cf55aa8,
-0xc0150000,0xba7ff206,0x258c259a,
-0xc0160000,0xf80ac0a0,0x1ca3be18,
-0xc0170000,0x98e36717,0x2c42168f,
-0xc0160000,0x876e92c8,0x9d552051,
-};
-static long C[21] = {
-/*0x3fff0000,0x80000000,0x00000000,*/
-0xc0080000,0x807cae76,0xcf2faa77,
-0xc00e0000,0x84f3b55a,0x0d74b280,
-0xc0120000,0x980981dc,0xcd30a505,
-0xc0150000,0x92f0b8c2,0x42463369,
-0xc0170000,0x8837be6f,0x6aee63cf,
-0xc0170000,0xef75b009,0xccc726bb,
-0xc0170000,0xa02aab96,0xbae8462b,
-};
-#endif
-
-/* log( sqrt( 2*pi ) ) */
-static const long double LS2PI  =  0.91893853320467274178L;
-#define MAXLGM 1.04848146839019521116e+4928L
-
-
-/* Logarithm of gamma function */
-/* Reentrant version */ 
-
-long double __lgammal_r(long double x, int* sgngaml)
-{
-long double p, q, w, z, f, nx;
-int i;
-
-*sgngaml = 1;
-#ifdef NANS
-if( isnanl(x) )
-	return(NANL);
-#endif
-#ifdef INFINITIES
-if( !isfinitel(x) )
-	return(INFINITYL);
-#endif
-if( x < -34.0L )
-	{
-	q = -x;
-	w = __lgammal_r(q, sgngaml); /* note this modifies sgngam! */
-	p = floorl(q);
-	if( p == q )
-		{
-lgsing:
-		_SET_ERRNO(EDOM);
-		mtherr( "lgammal", SING );
-#ifdef INFINITIES
-		return (INFINITYL);
-#else
-		return (MAXNUML);
-#endif
-		}
-	i = p;
-	if( (i & 1) == 0 )
-		*sgngaml = -1;
-	else
-		*sgngaml = 1;
-	z = q - p;
-	if( z > 0.5L )
-		{
-		p += 1.0L;
-		z = p - q;
-		}
-	z = q * sinl( PIL * z );
-	if( z == 0.0L )
-		goto lgsing;
-/*	z = LOGPI - logl( z ) - w; */
-	z = logl( PIL/z ) - w;
-	return( z );
-	}
-
-if( x < 13.0L )
-	{
-	z = 1.0L;
-	nx = floorl( x +  0.5L );
-	f = x - nx;
-	while( x >= 3.0L )
-		{
-		nx -= 1.0L;
-		x = nx + f;
-		z *= x;
-		}
-	while( x < 2.0L )
-		{
-		if( fabsl(x) <= 0.03125 )
-			goto lsmall;
-		z /= nx +  f;
-		nx += 1.0L;
-		x = nx + f;
-		}
-	if( z < 0.0L )
-		{
-		*sgngaml = -1;
-		z = -z;
-		}
-	else
-		*sgngaml = 1;
-	if( x == 2.0L )
-		return( logl(z) );
-	x = (nx - 2.0L) + f;
-	p = x * polevll( x, B, 6 ) / p1evll( x, C, 7);
-	return( logl(z) + p );
-	}
-
-if( x > MAXLGM )
-	{
-	_SET_ERRNO(ERANGE);
-	mtherr( "lgammal", OVERFLOW );
-#ifdef INFINITIES
-	return( *sgngaml * INFINITYL );
-#else
-	return( *sgngaml * MAXNUML );
-#endif
-	}
-
-q = ( x - 0.5L ) * logl(x) - x + LS2PI;
-if( x > 1.0e10L )
-	return(q);
-p = 1.0L/(x*x);
-q += polevll( p, A, 6 ) / x;
-return( q );
-
-
-lsmall:
-if( x == 0.0L )
-	goto lgsing;
-if( x < 0.0L )
-	{
-	x = -x;
-	q = z / (x * polevll( x, SN, 8 ));
-	}
-else
-	q = z / (x * polevll( x, S, 8 ));
-if( q < 0.0L )
-	{
-	*sgngaml = -1;
-	q = -q;
-	}
-else
-	*sgngaml = 1;
-q = logl( q );
-return(q);
-}
-
-/* This is the C99 version */
-
-long double lgammal(long double x)
-{
-  int local_sgngaml=0;
-  return (__lgammal_r(x, &local_sgngaml));
-}
diff --git a/winsup/mingw/mingwex/math/llrint.c b/winsup/mingw/mingwex/math/llrint.c
deleted file mode 100644
index b6d9f3273..000000000
--- a/winsup/mingw/mingwex/math/llrint.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <math.h>
-
-long long llrint (double x) 
-{
-  long long retval;
-  __asm__ __volatile__							      \
-    ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
-
diff --git a/winsup/mingw/mingwex/math/llrintf.c b/winsup/mingw/mingwex/math/llrintf.c
deleted file mode 100644
index 7fa67dbdf..000000000
--- a/winsup/mingw/mingwex/math/llrintf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math.h>
-
-long long llrintf (float x) 
-{
-  long long retval;
-  __asm__ __volatile__							      \
-    ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/llrintl.c b/winsup/mingw/mingwex/math/llrintl.c
deleted file mode 100644
index 948d96265..000000000
--- a/winsup/mingw/mingwex/math/llrintl.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <math.h>
-
-long long llrintl (long double x) 
-{
-  long long retval;
-  __asm__ __volatile__							      \
-    ("fistpll %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
-
diff --git a/winsup/mingw/mingwex/math/llround.c b/winsup/mingw/mingwex/math/llround.c
deleted file mode 100644
index f8fafc48d..000000000
--- a/winsup/mingw/mingwex/math/llround.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-
-long long
-llround (double x) {
-  long long retval;
-  unsigned short saved_cw, _cw;
-  __asm__ (
-	"fnstcw %0;" : "=m" (saved_cw)
-	); /* save  control word  */
-  _cw = ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-     	  | (x > 0.0 ? FE_UPWARD : FE_DOWNWARD); /* round away from zero */
-  __asm__ (
-	"fldcw %0;" : : "m" (_cw)
-	);  /* load the rounding control */
-  __asm__ __volatile__ (
-	"fistpll %0"  : "=m" (retval) : "t" (x) : "st"
-	);
-  __asm__ (
-	"fldcw %0;" : : "m" (saved_cw)
-	); /* restore control word */
-  return retval;
-}
-
diff --git a/winsup/mingw/mingwex/math/llroundf.c b/winsup/mingw/mingwex/math/llroundf.c
deleted file mode 100644
index b6c431f9d..000000000
--- a/winsup/mingw/mingwex/math/llroundf.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-
-long long
-llroundf (float x) {
-  long long retval;
-  unsigned short saved_cw, _cw;
-  __asm__ (
-	"fnstcw %0;" : "=m" (saved_cw)
-	); /* save  control word  */
-  _cw = ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-     	  | (x > 0.0 ? FE_UPWARD : FE_DOWNWARD); /* round away from zero */
-  __asm__ (
-	"fldcw %0;" : : "m" (_cw)
-	);  /* load the rounding control */
-  __asm__ __volatile__ (
-	"fistpll %0"  : "=m" (retval) : "t" (x) : "st"
-	);
-  __asm__ (
-	"fldcw %0;" : : "m" (saved_cw)
-	); /* restore control word */
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/llroundl.c b/winsup/mingw/mingwex/math/llroundl.c
deleted file mode 100644
index ad334fb2c..000000000
--- a/winsup/mingw/mingwex/math/llroundl.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-
-long long
-llroundl (long double x) {
-  long long  retval;
-  unsigned short saved_cw, _cw;
-  __asm__ (
-	"fnstcw %0;" : "=m" (saved_cw)
-	); /* save  control word  */
-  _cw = ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-     	  | (x > 0.0 ? FE_UPWARD : FE_DOWNWARD); /* round away from zero */
-  __asm__ (
-	"fldcw %0;" : : "m" (_cw)
-	);  /* load the rounding control */
-  __asm__ __volatile__ (
-	"fistpll %0"  : "=m" (retval) : "t" (x) : "st");
-  __asm__ (
-	"fldcw %0;" : : "m" (saved_cw)
-	); /* restore control word */
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/log10f.S b/winsup/mingw/mingwex/math/log10f.S
deleted file mode 100644
index 90fc9af92..000000000
--- a/winsup/mingw/mingwex/math/log10f.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- * Adapted for float type by Ulrich Drepper <drepper@cygnus.com>.
- *
- * Changed to use fyl2xp1 for values near 1, <drepper@cygnus.com>.
- */
-
-	.file	"log10f.S"
-	.text
-	.align 4
-one:	.double 1.0
-	/* It is not important that this constant is precise.  It is only
-	   a value which is known to be on the safe side for using the
-	   fyl2xp1 instruction.  */
-limit:	.double 0.29
-
-	.text
-	.align 4
-.globl _log10f
-	.def	_log10f;	.scl	2;	.type	32;	.endef
-_log10f:
-	fldlg2			// log10(2)
-	flds	4(%esp)		// x : log10(2)
-	fxam
-	fnstsw
-	fld	%st		// x : x : log10(2)
-	sahf
-	jc	3f		// in case x is NaN or �Inf
-4:	fsubl	one		// x-1 : x : log10(2)
-	fld	%st		// x-1 : x-1 : x : log10(2)
-	fabs			// |x-1| : x-1 : x : log10(2)
-	fcompl	limit		// x-1 : x : log10(2)
-	fnstsw			// x-1 : x : log10(2)
-	andb	$0x45, %ah
-	jz	2f
-	fstp	%st(1)		// x-1 : log10(2)
-	fyl2xp1			// log10(x)
-	ret
-
-2:	fstp	%st(0)		// x : log10(2)
-	fyl2x			// log10(x)
-	ret
-
-3:	jp	4b		// in case x is �Inf
-	fstp	%st(1)
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/log10l.S b/winsup/mingw/mingwex/math/log10l.S
deleted file mode 100644
index 8c046a09d..000000000
--- a/winsup/mingw/mingwex/math/log10l.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- *
- * Changed to use fyl2xp1 for values near 1, <drepper@cygnus.com>.
- *
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"log10l.S"
-	.text
-	.align 4
-one:	.double 1.0
-	/* It is not important that this constant is precise.  It is only
-	   a value which is known to be on the safe side for using the
-	   fyl2xp1 instruction.  */
-limit:	.double 0.29
-
-	.text
-	.align 4
-.globl _log10l
-	.def	_log10l;	.scl	2;	.type	32;	.endef
-_log10l:
-	fldlg2			// log10(2)
-	fldt	4(%esp)		// x : log10(2)
-	fxam
-	fnstsw
-	fld	%st		// x : x : log10(2)
-	sahf
-	jc	3f		// in case x is NaN or �Inf
-4:	fsubl	one		// x-1 : x : log10(2)
-	fld	%st		// x-1 : x-1 : x : log10(2)
-	fabs			// |x-1| : x-1 : x : log10(2)
-	fcompl	limit		// x-1 : x : log10(2)
-	fnstsw			// x-1 : x : log10(2)
-	andb	$0x45, %ah
-	jz	2f
-	fstp	%st(1)		// x-1 : log10(2)
-	fyl2xp1			// log10(x)
-	ret
-
-2:	fstp	%st(0)		// x : log10(2)
-	fyl2x			// log10(x)
-	ret
-
-3:	jp	4b		// in case x is �Inf
-	fstp	%st(1)
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/log1p.S b/winsup/mingw/mingwex/math/log1p.S
deleted file mode 100644
index a38816cb3..000000000
--- a/winsup/mingw/mingwex/math/log1p.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"log1p.S"
-	.text
-	.align 4
-	/* The fyl2xp1 can only be used for values in
-	   -1 + sqrt(2) / 2 <= x <= 1 - sqrt(2) / 2
-	   0.29 is a safe value.
-	 */
-limit:	.double 0.29
-one:	.double 1.0
-/*
- * Use the fyl2xp1 function when the argument is in the range -0.29 to 0.29,
- * otherwise fyl2x with the needed extra computation.
- */
-.globl _log1p; 
-	.def	_log1p;	.scl	2;	.type	32;	.endef
-_log1p:
-	fldln2
-	fldl	4(%esp)
-	fxam
-	fnstsw
-	fld	%st
-	sahf
-	jc	3f	// in case x is NaN or �Inf
-
-4:	fabs
-	fcompl	limit
-	fnstsw
-	sahf
-	jc	2f
-	faddl	one
-	fyl2x
-	ret
-
-2:	fyl2xp1
-	ret
-
-3:	jp	4b	// in case x is �Inf
-	fstp	%st(1)
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/log1pf.S b/winsup/mingw/mingwex/math/log1pf.S
deleted file mode 100644
index 1d9949f2a..000000000
--- a/winsup/mingw/mingwex/math/log1pf.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"log1pf.S"
-	.text
-	.align 4
-	/* The fyl2xp1 can only be used for values in
-	   -1 + sqrt(2) / 2 <= x <= 1 - sqrt(2) / 2
-	   0.29 is a safe value.
-	 */
-limit:	.float 0.29
-one:	.float 1.0
-/*
- * Use the fyl2xp1 function when the argument is in the range -0.29 to 0.29,
- * otherwise fyl2x with the needed extra computation.
- */
-.globl _log1pf; 
-	.def	_log1pf;	.scl	2;	.type	32;	.endef
-_log1pf:
-	fldln2
-	flds	4(%esp)
-	fxam
-	fnstsw
-	fld	%st
-	sahf
-	jc	3f		// in case x is NaN or �Inf
-
-4:	fabs
-	fcomps	limit
-	fnstsw
-	sahf
-	jc	2f
-	fadds	one
-	fyl2x
-	ret
-
-2:	fyl2xp1
-	ret
-
-3:	jp	4b		// in case x is �Inf
-	fstp	%st(1)
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/log1pl.S b/winsup/mingw/mingwex/math/log1pl.S
deleted file mode 100644
index 5ce4fbaaa..000000000
--- a/winsup/mingw/mingwex/math/log1pl.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
-* Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"log1pl.S"
-	.text
-	.align 4
-	/* The fyl2xp1 can only be used for values in
-	   -1 + sqrt(2) / 2 <= x <= 1 - sqrt(2) / 2
-	   0.29 is a safe value.
-	 */
-limit:	.tfloat 0.29
-	/* Please note:	 we use a double value here.  Since 1.0 has
-	   an exact representation this does not effect the accuracy
-	   but it helps to optimize the code.  */
-one:	.double 1.0
-
-/*
- * Use the fyl2xp1 function when the argument is in the range -0.29 to 0.29,
- * otherwise fyl2x with the needed extra computation.
- */
-.globl _log1pl; 
-	.def	_log1pl;	.scl	2;	.type	32;	.endef
-_log1pl:
-	fldln2
-	fldt	4(%esp)
-	fxam
-	fnstsw
-	fld	%st
-	sahf
-	jc	3f		// in case x is NaN or �Inf
-4:
-	fabs
-	fldt	limit
-	fcompp
-	fnstsw
-	sahf
-	jnc	2f
-	faddl	one
-	fyl2x
-	ret
-
-2:	fyl2xp1
-	ret
-
-3:	jp	4b		// in case x is �Inf
-	fstp	%st(1)
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/log2.S b/winsup/mingw/mingwex/math/log2.S
deleted file mode 100644
index 08f008310..000000000
--- a/winsup/mingw/mingwex/math/log2.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Adapted for use as log2 by Ulrich Drepper <drepper@cygnus.com>.
- * Public domain.
- *
- * Changed to use fyl2xp1 for values near 1, <drepper@cygnus.com>.
- *
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"log2.S"
-	.text
-	.align 4
-one:	.double 1.0
-	/* It is not important that this constant is precise.  It is only
-	   a value which is known to be on the safe side for using the
-	   fyl2xp1 instruction.  */
-limit:	.double 0.29
-
-	.text
-	.align 4
-.globl _log2
-	.def	_log2;	.scl	2;	.type	32;	.endef
-_log2:
-	fldl	one
-	fldl	4(%esp)		// x : 1
-	fxam
-	fnstsw
-	fld	%st		// x : x : 1
-	sahf
-	jc	3f		// in case x is NaN or �Inf
-4:	fsub	%st(2), %st	// x-1 : x : 1
-	fld	%st		// x-1 : x-1 : x : 1
-	fabs			// |x-1| : x-1 : x : 1
-	fcompl	limit		// x-1 : x : 1
-	fnstsw			// x-1 : x : 1
-	andb	$0x45, %ah
-	jz	2f
-	fstp	%st(1)		// x-1 : 1
-	fyl2xp1			// log(x)
-	ret
-
-2:	fstp	%st(0)		// x : 1
-	fyl2x			// log(x)
-	ret
-
-3:	jp	4b		// in case x is �Inf
-	fstp	%st(1)
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/log2f.S b/winsup/mingw/mingwex/math/log2f.S
deleted file mode 100644
index 211abba3d..000000000
--- a/winsup/mingw/mingwex/math/log2f.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Adapted for use as log2 by Ulrich Drepper <drepper@cygnus.com>.
- * Public domain.
- *
- * Changed to use fyl2xp1 for values near 1, <drepper@cygnus.com>.
- *
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"log2f.S"
-	.text
-	.align 4
-one:	.double 1.0
-	/* It is not important that this constant is precise.  It is only
-	   a value which is known to be on the safe side for using the
-	   fyl2xp1 instruction.  */
-limit:	.double 0.29
-
-	.text
-	.align 4
-.globl _log2f
-	.def	_log2f;	.scl	2;	.type	32;	.endef
-_log2f:
-	fldl	one
-	flds	4(%esp)		// x : 1
-	fxam
-	fnstsw
-	fld	%st		// x : x : 1
-	sahf
-	jc	3f		// in case x is NaN or �Inf
-4:	fsub	%st(2), %st	// x-1 : x : 1
-	fld	%st		// x-1 : x-1 : x : 1
-	fabs			// |x-1| : x-1 : x : 1
-	fcompl	limit		// x-1 : x : 1
-	fnstsw			// x-1 : x : 1
-	andb	$0x45, %ah
-	jz	2f
-	fstp	%st(1)		// x-1 : 1
-	fyl2xp1			// log(x)
-	ret
-
-2:	fstp	%st(0)		// x : 1
-	fyl2x			// log(x)
-	ret
-
-3:	jp	4b		// in case x is �Inf
-	fstp	%st(1)
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/log2l.S b/winsup/mingw/mingwex/math/log2l.S
deleted file mode 100644
index 52503fc52..000000000
--- a/winsup/mingw/mingwex/math/log2l.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Adapted for use as log2 by Ulrich Drepper <drepper@cygnus.com>.
- * Public domain.
- *
- * Changed to use fyl2xp1 for values near 1, <drepper@cygnus.com>.
- */
-
-	.file	"log2l.S"
-	.text
-	.align 4
-one:	.double 1.0
-	/* It is not important that this constant is precise.  It is only
-	   a value which is known to be on the safe side for using the
-	   fyl2xp1 instruction.  */
-limit:	.double 0.29
-
-	.text
-	.align 4
-.globl _log2l
-	.def	_log2l;	.scl	2;	.type	32;	.endef
-_log2l:
-	fldl	one
-	fldt	4(%esp)		// x : 1
-	fxam
-	fnstsw
-	fld	%st		// x : x : 1
-	sahf
-	jc	3f		// in case x is NaN or �Inf
-4:	fsub	%st(2), %st	// x-1 : x : 1
-	fld	%st		// x-1 : x-1 : x : 1
-	fabs			// |x-1| : x-1 : x : 1
-	fcompl	limit		// x-1 : x : 1
-	fnstsw			// x-1 : x : 1
-	andb	$0x45, %ah
-	jz	2f
-	fstp	%st(1)		// x-1 : 1
-	fyl2xp1			// log(x)
-	ret
-
-2:	fstp	%st(0)		// x : 1
-	fyl2x			// log(x)
-	ret
-
-3:	jp	4b		// in case x is �Inf
-	fstp	%st(1)
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/logb.c b/winsup/mingw/mingwex/math/logb.c
deleted file mode 100644
index cdff13647..000000000
--- a/winsup/mingw/mingwex/math/logb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Changes for long double by Ulrich Drepper <drepper@cygnus.com>
- * Public domain.
- */
-
-#include <math.h>
-
-double
-logb (double x)
-{
-  double res;
-  asm ("fxtract\n\t"
-       "fstp	%%st" : "=t" (res) : "0" (x));
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/logbf.c b/winsup/mingw/mingwex/math/logbf.c
deleted file mode 100644
index b5f57d2e1..000000000
--- a/winsup/mingw/mingwex/math/logbf.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Changes for long double by Ulrich Drepper <drepper@cygnus.com>
- * Public domain.
- */
-
-#include <math.h>
-
-float
-logbf (float x)
-{
-  float res;
-  asm ("fxtract\n\t"
-       "fstp	%%st" : "=t" (res) : "0" (x));
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/logbl.c b/winsup/mingw/mingwex/math/logbl.c
deleted file mode 100644
index f1448eb99..000000000
--- a/winsup/mingw/mingwex/math/logbl.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Changes for long double by Ulrich Drepper <drepper@cygnus.com>
- * Public domain.
- */
-
-#include <math.h>
-
-long double
-logbl (long double x)
-{
-  long double res;
-
-  asm ("fxtract\n\t"
-       "fstp	%%st" : "=t" (res) : "0" (x));
-  return res;
-}
diff --git a/winsup/mingw/mingwex/math/logf.S b/winsup/mingw/mingwex/math/logf.S
deleted file mode 100644
index 32119ecde..000000000
--- a/winsup/mingw/mingwex/math/logf.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- * Adapted for float by Ulrich Drepper <drepper@cygnus.com>.
- *
- * Changed to use fyl2xp1 for values near 1, <drepper@cygnus.com>.
- */
-
-	.file	"logf.S"
-	.text
-	.align 4
-one:	.double 1.0
-	/* It is not important that this constant is precise.  It is only
-	   a value which is known to be on the safe side for using the
-	   fyl2xp1 instruction.  */
-limit:	.double 0.29
-
-	.text
-	.align 4
-.globl _logf
-	.def	_logf;	.scl	2;	.type	32;	.endef
-_logf:
-	fldln2			// log(2)
-	flds	4(%esp)		// x : log(2)
-	fld	%st		// x : x : log(2)
-	fsubl	one		// x-1 : x : log(2)
-	fld	%st		// x-1 : x-1 : x : log(2)
-	fabs			// |x-1| : x-1 : x : log(2)
-	fcompl	limit		// x-1 : x : log(2)
-	fnstsw			// x-1 : x : log(2)
-	andb	$0x45, %ah
-	jz	2f
-	fstp	%st(1)		// x-1 : log(2)
-	fyl2xp1			// log(x)
-	ret
-
-2:	fstp	%st(0)		// x : log(2)
-	fyl2x			// log(x)
-	ret
diff --git a/winsup/mingw/mingwex/math/logl.S b/winsup/mingw/mingwex/math/logl.S
deleted file mode 100644
index 8dc144915..000000000
--- a/winsup/mingw/mingwex/math/logl.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- *
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-	.file	"logl.S"
-	.text
-	.align 4
-one:	.double 1.0
-	/* It is not important that this constant is precise.  It is only
-	   a value which is known to be on the safe side for using the
-	   fyl2xp1 instruction.  */
-limit:	.double 0.29
-
-	.text
-	.align 4
-.globl _logl
-	.def	_logl;	.scl	2;	.type	32;	.endef
-_logl:
-	fldln2			// log(2)
-	fldt	4(%esp)		// x : log(2)
-	fld	%st		// x : x : log(2)
-	fsubl	one		// x-1 : x : log(2)
-	fld	%st		// x-1 : x-1 : x : log(2)
-	fabs			// |x-1| : x-1 : x : log(2)
-	fcompl	limit		// x-1 : x : log(2)
-	fnstsw			// x-1 : x : log(2)
-	andb	$0x45, %ah
-	jz	2f
-	fstp	%st(1)		// x-1 : log(2)
-	fyl2xp1			// log(x)
-	ret
-
-2:	fstp	%st(0)		// x : log(2)
-	fyl2x			// log(x)
-	ret
diff --git a/winsup/mingw/mingwex/math/lrint.c b/winsup/mingw/mingwex/math/lrint.c
deleted file mode 100644
index 7dfa233a8..000000000
--- a/winsup/mingw/mingwex/math/lrint.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math.h>
-
-long lrint (double x) 
-{
-  long retval;  
-  __asm__ __volatile__							      \
-    ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/lrintf.c b/winsup/mingw/mingwex/math/lrintf.c
deleted file mode 100644
index 24b7a7d07..000000000
--- a/winsup/mingw/mingwex/math/lrintf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <math.h>
-
-long lrintf (float x) 
-{
-  long retval;
-  __asm__ __volatile__							      \
-    ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/lrintl.c b/winsup/mingw/mingwex/math/lrintl.c
deleted file mode 100644
index f55599332..000000000
--- a/winsup/mingw/mingwex/math/lrintl.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <math.h>
-
-long lrintl (long double x) 
-{
-  long retval;
-  __asm__ __volatile__							      \
-    ("fistpl %0"  : "=m" (retval) : "t" (x) : "st");				      \
-  return retval;
-}
-
diff --git a/winsup/mingw/mingwex/math/lround.c b/winsup/mingw/mingwex/math/lround.c
deleted file mode 100644
index 4b0b0d047..000000000
--- a/winsup/mingw/mingwex/math/lround.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-
-long
-lround (double x) {
-  long retval;
-  unsigned short saved_cw, _cw;
-  __asm__ (
-	"fnstcw %0;" : "=m" (saved_cw)
-	); /* save  control word  */
-  _cw = ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-     	  | (x > 0.0 ? FE_UPWARD : FE_DOWNWARD); /* round away from zero */
-  __asm__ (
-	"fldcw %0;" : : "m" (_cw)
-	);  /* load the rounding control */
-  __asm__ __volatile__ (
-	"fistpl %0"  : "=m" (retval) : "t" (x) : "st"
-	);
-  __asm__ (
-	"fldcw %0;" : : "m" (saved_cw)
-	); /* restore control word */
-  return retval;
-}
-
diff --git a/winsup/mingw/mingwex/math/lroundf.c b/winsup/mingw/mingwex/math/lroundf.c
deleted file mode 100644
index 40051bfcb..000000000
--- a/winsup/mingw/mingwex/math/lroundf.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-
-long
-lroundf (float x) {
-  long retval;
-  unsigned short saved_cw, _cw;
-  __asm__ (
-	"fnstcw %0;" : "=m" (saved_cw)
-	); /* save  control word  */
-  _cw = ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-     	  | (x > 0.0 ? FE_UPWARD : FE_DOWNWARD); /* round away from zero */
-  __asm__ (
-	"fldcw %0;" : : "m" (_cw)
-	);  /* load the rounding control */
-  __asm__ __volatile__ (
-	"fistpl %0"  : "=m" (retval) : "t" (x) : "st"
-	);
-  __asm__ (
-	"fldcw %0;" : : "m" (saved_cw)
-	); /* restore control word */
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/lroundl.c b/winsup/mingw/mingwex/math/lroundl.c
deleted file mode 100644
index 6e69c2fdd..000000000
--- a/winsup/mingw/mingwex/math/lroundl.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-
-long
-lroundl (long double x) {
-  long retval;
-  unsigned short saved_cw, _cw;
-  __asm__ (
-	"fnstcw %0;" : "=m" (saved_cw)
-	); /* save  control word  */
-  _cw = ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-     	  | (x > 0.0 ? FE_UPWARD : FE_DOWNWARD); /* round away from zero */
-  __asm__ (
-	"fldcw %0;" : : "m" (_cw)
-	);  /* load the rounding control */
-  __asm__ __volatile__ (
-	"fistpl %0"  : "=m" (retval) : "t" (x) : "st");
-  __asm__ (
-	"fldcw %0;" : : "m" (saved_cw)
-	); /* restore control word */
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/modff.c b/winsup/mingw/mingwex/math/modff.c
deleted file mode 100644
index 072faace0..000000000
--- a/winsup/mingw/mingwex/math/modff.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-#include <errno.h>
-#define FE_ROUNDING_MASK \
-  (FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-
-float
-modff (float value, float* iptr)
-{
-  float int_part;
-  unsigned short saved_cw;
-  unsigned short tmp_cw;
-  /* truncate */ 
-  asm ("fnstcw %0;" : "=m" (saved_cw)); /* save control word */
-  tmp_cw = (saved_cw & ~FE_ROUNDING_MASK) | FE_TOWARDZERO;
-  asm ("fldcw %0;" : : "m" (tmp_cw));
-  asm ("frndint;" : "=t" (int_part) : "0" (value)); /* round */
-  asm ("fldcw %0;" : : "m" (saved_cw)); /* restore saved cw */
-  if (iptr)
-    *iptr = int_part;
-  return (isinf (value) ?  0.0F : value - int_part);
-}
diff --git a/winsup/mingw/mingwex/math/modfl.c b/winsup/mingw/mingwex/math/modfl.c
deleted file mode 100644
index c7ea2cbce..000000000
--- a/winsup/mingw/mingwex/math/modfl.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-#include <errno.h>
-#define FE_ROUNDING_MASK \
-  (FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-
-long double
-modfl (long double value, long double* iptr)
-{
-  long double int_part;
-  unsigned short saved_cw;
-  unsigned short tmp_cw;
-  /* truncate */ 
-  asm ("fnstcw %0;" : "=m" (saved_cw)); /* save control word */
-  tmp_cw = (saved_cw & ~FE_ROUNDING_MASK) | FE_TOWARDZERO;
-  asm ("fldcw %0;" : : "m" (tmp_cw));
-  asm ("frndint;" : "=t" (int_part) : "0" (value)); /* round */
-  asm ("fldcw %0;" : : "m" (saved_cw)); /* restore saved cw */
-  if (iptr)
-    *iptr = int_part;
-  return (isinf (value) ?  0.0L : value - int_part);
-}
diff --git a/winsup/mingw/mingwex/math/nearbyint.S b/winsup/mingw/mingwex/math/nearbyint.S
deleted file mode 100644
index 9730aeebf..000000000
--- a/winsup/mingw/mingwex/math/nearbyint.S
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for use as nearbyint by Ulrich Drepper <drepper@cygnus.com>.
- *
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"nearbyint.S"
-	.text
-	.align 4
-.globl _nearbyint
-	.def	_nearbyint;	.scl	2;	.type	32;	.endef
-_nearbyint:
-	fldl	4(%esp)
-	pushl	%eax
-	pushl	%ecx
-	fnstcw	(%esp)
-	movl	(%esp), %eax
-	orl	$0x20, %eax
-	movl	%eax, 4(%esp)
-	fldcw	4(%esp)
-	frndint
-	fclex
-	fldcw	(%esp)
-	popl	%ecx
-	popl	%eax
-	ret
diff --git a/winsup/mingw/mingwex/math/nearbyintf.S b/winsup/mingw/mingwex/math/nearbyintf.S
deleted file mode 100644
index 1c5734084..000000000
--- a/winsup/mingw/mingwex/math/nearbyintf.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- * Adapted for use as nearbyint by Ulrich Drepper <drepper@cygnus.com>.
- * 
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"nearbyintf.S"
-	.text
-	.align 4
-.globl _nearbyintf
-	.def	_nearbyintf;	.scl	2;	.type	32;	.endef
-_nearbyintf:
-	flds	4(%esp)
-	pushl	%eax
-	pushl	%ecx
-	fnstcw	(%esp)
-	movl	(%esp), %eax
-	orl	$0x20, %eax
-	movl	%eax, 4(%esp)
-	fldcw	4(%esp)
-	frndint
-	fclex
-	fldcw	(%esp)
-	popl	%ecx
-	popl	%eax
-	ret
diff --git a/winsup/mingw/mingwex/math/nearbyintl.S b/winsup/mingw/mingwex/math/nearbyintl.S
deleted file mode 100644
index 7dbc2a8b7..000000000
--- a/winsup/mingw/mingwex/math/nearbyintl.S
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adaptedfor use as nearbyint by Ulrich Drepper <drepper@cygnus.com>.
- *
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"nearbyintl.S"
-	.text
-	.align 4
-.globl _nearbyintl
-	.def	_nearbyintl;	.scl	2;	.type	32;	.endef
-_nearbyintl:
-	fldt	4(%esp)
-	pushl	%eax
-	pushl	%ecx
-	fnstcw	(%esp)
-	movl	(%esp), %eax
-	orl	$0x20, %eax
-	movl	%eax, 4(%esp)
-	fldcw	4(%esp)
-	frndint
-	fclex
-	fldcw	(%esp)
-	popl	%ecx
-	popl	%eax
-	ret
diff --git a/winsup/mingw/mingwex/math/nextafterf.c b/winsup/mingw/mingwex/math/nextafterf.c
deleted file mode 100644
index ac1fbee26..000000000
--- a/winsup/mingw/mingwex/math/nextafterf.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <math.h>
-
-float
-nextafterf (float x, float y)
-{
-  union
-  {
-    float f;
-    unsigned int i;
-  } u;
-  if (isnan (y) || isnan (x))
-    return x + y;
-  if (x == y )
-     return x;
-  u.f = x; 
-  if (u.i == 0u)
-    {
-      if (y > 0.0F)
-	u.i = 1;
-      else
-	u.i = 0x80000001;
-      return u.f;
-    }
-   if (((x > 0.0F) ^ (y > x)) == 0)
-    u.i++;
-  else
-    u.i--;
-  return u.f;
-}
diff --git a/winsup/mingw/mingwex/math/pow.c b/winsup/mingw/mingwex/math/pow.c
deleted file mode 100644
index 1fa548e5e..000000000
--- a/winsup/mingw/mingwex/math/pow.c
+++ /dev/null
@@ -1,781 +0,0 @@
-/*							pow.c
- *
- *	Power function
- *
- *
- *
- * SYNOPSIS:
- *
- * double x, y, z, pow();
- *
- * z = pow( x, y );
- *
- *
- *
- * DESCRIPTION:
- *
- * Computes x raised to the yth power.  Analytically,
- *
- *      x**y  =  exp( y log(x) ).
- *
- * Following Cody and Waite, this program uses a lookup table
- * of 2**-i/16 and pseudo extended precision arithmetic to
- * obtain an extra three bits of accuracy in both the logarithm
- * and the exponential.
- *
- *
- *
- * ACCURACY:
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *    IEEE     -26,26       30000      4.2e-16      7.7e-17
- *    DEC      -26,26       60000      4.8e-17      9.1e-18
- * 1/26 < x < 26, with log(x) uniformly distributed.
- * -26 < y < 26, y uniformly distributed.
- *    IEEE     0,8700       30000      1.5e-14      2.1e-15
- * 0.99 < x < 1.01, 0 < y < 8700, uniformly distributed.
- *
- *
- * ERROR MESSAGES:
- *
- *   message         condition      value returned
- * pow overflow     x**y > MAXNUM      INFINITY
- * pow underflow   x**y < 1/MAXNUM       0.0
- * pow domain      x<0 and y noninteger  0.0
- *
- */
-
-/*
-Cephes Math Library Release 2.8:  June, 2000
-Copyright 1984, 1995, 2000 by Stephen L. Moshier
-*/
-
-/*
-Modified for mingw
-2002-09-27 Danny Smith <dannysmith@users.sourceforge.net>
-*/
-
-#ifdef __MINGW32__
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-static char fname[] = {"pow"};
-#endif
-
-#ifndef _SET_ERRNO
-#define _SET_ERRNO(x)
-#endif
-
-#define SQRTH 0.70710678118654752440
-
-#ifdef UNK
-static double P[] = {
-  4.97778295871696322025E-1,
-  3.73336776063286838734E0,
-  7.69994162726912503298E0,
-  4.66651806774358464979E0
-};
-static double Q[] = {
-/* 1.00000000000000000000E0, */
-  9.33340916416696166113E0,
-  2.79999886606328401649E1,
-  3.35994905342304405431E1,
-  1.39995542032307539578E1
-};
-/* 2^(-i/16), IEEE precision */
-static double A[] = {
-  1.00000000000000000000E0,
-  9.57603280698573700036E-1,
-  9.17004043204671215328E-1,
-  8.78126080186649726755E-1,
-  8.40896415253714502036E-1,
-  8.05245165974627141736E-1,
-  7.71105412703970372057E-1,
-  7.38413072969749673113E-1,
-  7.07106781186547572737E-1,
-  6.77127773468446325644E-1,
-  6.48419777325504820276E-1,
-  6.20928906036742001007E-1,
-  5.94603557501360513449E-1,
-  5.69394317378345782288E-1,
-  5.45253866332628844837E-1,
-  5.22136891213706877402E-1,
-  5.00000000000000000000E-1
-};
-static double B[] = {
- 0.00000000000000000000E0,
- 1.64155361212281360176E-17,
- 4.09950501029074826006E-17,
- 3.97491740484881042808E-17,
--4.83364665672645672553E-17,
- 1.26912513974441574796E-17,
- 1.99100761573282305549E-17,
--1.52339103990623557348E-17,
- 0.00000000000000000000E0
-};
-static double R[] = {
- 1.49664108433729301083E-5,
- 1.54010762792771901396E-4,
- 1.33335476964097721140E-3,
- 9.61812908476554225149E-3,
- 5.55041086645832347466E-2,
- 2.40226506959099779976E-1,
- 6.93147180559945308821E-1
-};
-
-#define douba(k) A[k]
-#define doubb(k) B[k]
-#define MEXP 16383.0
-#ifdef DENORMAL
-#define MNEXP -17183.0
-#else
-#define MNEXP -16383.0
-#endif
-#endif
-
-#ifdef DEC
-static unsigned short P[] = {
-0037776,0156313,0175332,0163602,
-0040556,0167577,0052366,0174245,
-0040766,0062753,0175707,0055564,
-0040625,0052035,0131344,0155636,
-};
-static unsigned short Q[] = {
-/*0040200,0000000,0000000,0000000,*/
-0041025,0052644,0154404,0105155,
-0041337,0177772,0007016,0047646,
-0041406,0062740,0154273,0020020,
-0041137,0177054,0106127,0044555,
-};
-static unsigned short A[] = {
-0040200,0000000,0000000,0000000,
-0040165,0022575,0012444,0103314,
-0040152,0140306,0163735,0022071,
-0040140,0146336,0166052,0112341,
-0040127,0042374,0145326,0116553,
-0040116,0022214,0012437,0102201,
-0040105,0063452,0010525,0003333,
-0040075,0004243,0117530,0006067,
-0040065,0002363,0031771,0157145,
-0040055,0054076,0165102,0120513,
-0040045,0177326,0124661,0050471,
-0040036,0172462,0060221,0120422,
-0040030,0033760,0050615,0134251,
-0040021,0141723,0071653,0010703,
-0040013,0112701,0161752,0105727,
-0040005,0125303,0063714,0044173,
-0040000,0000000,0000000,0000000
-};
-static unsigned short B[] = {
-0000000,0000000,0000000,0000000,
-0021473,0040265,0153315,0140671,
-0121074,0062627,0042146,0176454,
-0121413,0003524,0136332,0066212,
-0121767,0046404,0166231,0012553,
-0121257,0015024,0002357,0043574,
-0021736,0106532,0043060,0056206,
-0121310,0020334,0165705,0035326,
-0000000,0000000,0000000,0000000
-};
-
-static unsigned short R[] = {
-0034173,0014076,0137624,0115771,
-0035041,0076763,0003744,0111311,
-0035656,0141766,0041127,0074351,
-0036435,0112533,0073611,0116664,
-0037143,0054106,0134040,0152223,
-0037565,0176757,0176026,0025551,
-0040061,0071027,0173721,0147572
-};
-
-/*
-static double R[] = {
-0.14928852680595608186e-4,
-0.15400290440989764601e-3,
-0.13333541313585784703e-2,
-0.96181290595172416964e-2,
-0.55504108664085595326e-1,
-0.24022650695909537056e0,
-0.69314718055994529629e0
-};
-*/
-#define douba(k) (*(double *)&A[(k)<<2])
-#define doubb(k) (*(double *)&B[(k)<<2])
-#define MEXP 2031.0
-#define MNEXP -2031.0
-#endif
-
-#ifdef IBMPC
-static const unsigned short P[] = {
-0x5cf0,0x7f5b,0xdb99,0x3fdf,
-0xdf15,0xea9e,0xddef,0x400d,
-0xeb6f,0x7f78,0xccbd,0x401e,
-0x9b74,0xb65c,0xaa83,0x4012,
-};
-static const unsigned short Q[] = {
-/*0x0000,0x0000,0x0000,0x3ff0,*/
-0x914e,0x9b20,0xaab4,0x4022,
-0xc9f5,0x41c1,0xffff,0x403b,
-0x6402,0x1b17,0xccbc,0x4040,
-0xe92e,0x918a,0xffc5,0x402b,
-};
-static const unsigned short A[] = {
-0x0000,0x0000,0x0000,0x3ff0,
-0x90da,0xa2a4,0xa4af,0x3fee,
-0xa487,0xdcfb,0x5818,0x3fed,
-0x529c,0xdd85,0x199b,0x3fec,
-0xd3ad,0x995a,0xe89f,0x3fea,
-0xf090,0x82a3,0xc491,0x3fe9,
-0xa0db,0x422a,0xace5,0x3fe8,
-0x0187,0x73eb,0xa114,0x3fe7,
-0x3bcd,0x667f,0xa09e,0x3fe6,
-0x5429,0xdd48,0xab07,0x3fe5,
-0x2a27,0xd536,0xbfda,0x3fe4,
-0x3422,0x4c12,0xdea6,0x3fe3,
-0xb715,0x0a31,0x06fe,0x3fe3,
-0x6238,0x6e75,0x387a,0x3fe2,
-0x517b,0x3c7d,0x72b8,0x3fe1,
-0x890f,0x6cf9,0xb558,0x3fe0,
-0x0000,0x0000,0x0000,0x3fe0
-};
-static const unsigned short B[] = {
-0x0000,0x0000,0x0000,0x0000,
-0x3707,0xd75b,0xed02,0x3c72,
-0xcc81,0x345d,0xa1cd,0x3c87,
-0x4b27,0x5686,0xe9f1,0x3c86,
-0x6456,0x13b2,0xdd34,0xbc8b,
-0x42e2,0xafec,0x4397,0x3c6d,
-0x82e4,0xd231,0xf46a,0x3c76,
-0x8a76,0xb9d7,0x9041,0xbc71,
-0x0000,0x0000,0x0000,0x0000
-};
-static const unsigned short R[] = {
-0x937f,0xd7f2,0x6307,0x3eef,
-0x9259,0x60fc,0x2fbe,0x3f24,
-0xef1d,0xc84a,0xd87e,0x3f55,
-0x33b7,0x6ef1,0xb2ab,0x3f83,
-0x1a92,0xd704,0x6b08,0x3fac,
-0xc56d,0xff82,0xbfbd,0x3fce,
-0x39ef,0xfefa,0x2e42,0x3fe6
-};
-
-#define douba(k) (*(double *)&A[(k)<<2])
-#define doubb(k) (*(double *)&B[(k)<<2])
-#define MEXP 16383.0
-#ifdef DENORMAL
-#define MNEXP -17183.0
-#else
-#define MNEXP -16383.0
-#endif
-#endif
-
-#ifdef MIEEE
-static unsigned short P[] = {
-0x3fdf,0xdb99,0x7f5b,0x5cf0,
-0x400d,0xddef,0xea9e,0xdf15,
-0x401e,0xccbd,0x7f78,0xeb6f,
-0x4012,0xaa83,0xb65c,0x9b74
-};
-static unsigned short Q[] = {
-0x4022,0xaab4,0x9b20,0x914e,
-0x403b,0xffff,0x41c1,0xc9f5,
-0x4040,0xccbc,0x1b17,0x6402,
-0x402b,0xffc5,0x918a,0xe92e
-};
-static unsigned short A[] = {
-0x3ff0,0x0000,0x0000,0x0000,
-0x3fee,0xa4af,0xa2a4,0x90da,
-0x3fed,0x5818,0xdcfb,0xa487,
-0x3fec,0x199b,0xdd85,0x529c,
-0x3fea,0xe89f,0x995a,0xd3ad,
-0x3fe9,0xc491,0x82a3,0xf090,
-0x3fe8,0xace5,0x422a,0xa0db,
-0x3fe7,0xa114,0x73eb,0x0187,
-0x3fe6,0xa09e,0x667f,0x3bcd,
-0x3fe5,0xab07,0xdd48,0x5429,
-0x3fe4,0xbfda,0xd536,0x2a27,
-0x3fe3,0xdea6,0x4c12,0x3422,
-0x3fe3,0x06fe,0x0a31,0xb715,
-0x3fe2,0x387a,0x6e75,0x6238,
-0x3fe1,0x72b8,0x3c7d,0x517b,
-0x3fe0,0xb558,0x6cf9,0x890f,
-0x3fe0,0x0000,0x0000,0x0000
-};
-static unsigned short B[] = {
-0x0000,0x0000,0x0000,0x0000,
-0x3c72,0xed02,0xd75b,0x3707,
-0x3c87,0xa1cd,0x345d,0xcc81,
-0x3c86,0xe9f1,0x5686,0x4b27,
-0xbc8b,0xdd34,0x13b2,0x6456,
-0x3c6d,0x4397,0xafec,0x42e2,
-0x3c76,0xf46a,0xd231,0x82e4,
-0xbc71,0x9041,0xb9d7,0x8a76,
-0x0000,0x0000,0x0000,0x0000
-};
-static unsigned short R[] = {
-0x3eef,0x6307,0xd7f2,0x937f,
-0x3f24,0x2fbe,0x60fc,0x9259,
-0x3f55,0xd87e,0xc84a,0xef1d,
-0x3f83,0xb2ab,0x6ef1,0x33b7,
-0x3fac,0x6b08,0xd704,0x1a92,
-0x3fce,0xbfbd,0xff82,0xc56d,
-0x3fe6,0x2e42,0xfefa,0x39ef
-};
-
-#define douba(k) (*(double *)&A[(k)<<2])
-#define doubb(k) (*(double *)&B[(k)<<2])
-#define MEXP 16383.0
-#ifdef DENORMAL
-#define MNEXP -17183.0
-#else
-#define MNEXP -16383.0
-#endif
-#endif
-
-/* log2(e) - 1 */
-#define LOG2EA 0.44269504088896340736
-
-#define F W
-#define Fa Wa
-#define Fb Wb
-#define G W
-#define Ga Wa
-#define Gb u
-#define H W
-#define Ha Wb
-#define Hb Wb
-
-#ifdef __MINGW32__
-static __inline__ double reduc( double );
-extern double __powi ( double, int );
-extern double pow ( double x,  double y);
-
-#else /* __MINGW32__ */
-
-#ifdef ANSIPROT
-extern double floor ( double );
-extern double fabs ( double );
-extern double frexp ( double, int * );
-extern double ldexp ( double, int );
-extern double polevl ( double, void *, int );
-extern double p1evl ( double, void *, int );
-extern double __powi ( double, int );
-extern int signbit ( double );
-extern int isnan ( double );
-extern int isfinite ( double );
-static double reduc ( double );
-#else
-double floor(), fabs(), frexp(), ldexp();
-double polevl(), p1evl(), __powi();
-int signbit(), isnan(), isfinite();
-static double reduc();
-#endif
-extern double MAXNUM;
-#ifdef INFINITIES
-extern double INFINITY;
-#endif
-#ifdef NANS
-extern double NAN;
-#endif
-#ifdef MINUSZERO
-extern double NEGZERO;
-#endif
-
-#endif /* __MINGW32__ */
-
-double pow( x, y )
-double x, y;
-{
-double w, z, W, Wa, Wb, ya, yb, u;
-/* double F, Fa, Fb, G, Ga, Gb, H, Ha, Hb */
-double aw, ay, wy;
-int e, i, nflg, iyflg, yoddint;
-
-if( y == 0.0 )
-	return( 1.0 );
-#ifdef NANS
-if( isnan(x) || isnan(y) )
-	{
-	_SET_ERRNO (EDOM);
-	return( x + y );
-	}
-#endif
-if( y == 1.0 )
-	return( x );
-
-
-#ifdef INFINITIES
-if( !isfinite(y) && (x == 1.0 || x == -1.0) )
-	{
-	mtherr( "pow", DOMAIN );
-#ifdef NANS
-	return( NAN );
-#else
-	return( INFINITY );
-#endif
-	}
-#endif
-
-if( x == 1.0 )
-	return( 1.0 );
-
-if( y >= MAXNUM )
-	{
-	_SET_ERRNO (ERANGE);
-#ifdef INFINITIES
-	if( x > 1.0 )
-		return( INFINITY );
-#else
-	if( x > 1.0 )
-		return( MAXNUM );
-#endif
-	if( x > 0.0 && x < 1.0 )
-		return( 0.0);
-	if( x < -1.0 )
-		{
-#ifdef INFINITIES
-		return( INFINITY );
-#else
-		return( MAXNUM );
-#endif
-		}
-	if( x > -1.0 && x < 0.0 )
-		return( 0.0 );
-	}
-if( y <= -MAXNUM )
-	{
-	_SET_ERRNO (ERANGE);
-	if( x > 1.0 )
-		return( 0.0 );
-#ifdef INFINITIES
-	if( x > 0.0 && x < 1.0 )
-		return( INFINITY );
-#else
-	if( x > 0.0 && x < 1.0 )
-		return( MAXNUM );
-#endif
-	if( x < -1.0 )
-		return( 0.0 );
-#ifdef INFINITIES
-	if( x > -1.0 && x < 0.0 )
-		return( INFINITY );
-#else
-	if( x > -1.0 && x < 0.0 )
-		return( MAXNUM );
-#endif
-	}
-if( x >= MAXNUM )
-	{
-#if INFINITIES
-	if( y > 0.0 )
-		return( INFINITY );
-#else
-	if( y > 0.0 )
-		return( MAXNUM );
-#endif
-	return(0.0);
-	}
-/* Set iyflg to 1 if y is an integer.  */
-iyflg = 0;
-w = floor(y);
-if( w == y )
-	iyflg = 1;
-
-/* Test for odd integer y.  */
-yoddint = 0;
-if( iyflg )
-	{
-	ya = fabs(y);
-	ya = floor(0.5 * ya);
-	yb = 0.5 * fabs(w);
-	if( ya != yb )
-		yoddint = 1;
-	}
-
-if( x <= -MAXNUM )
-	{
-	if( y > 0.0 )
-		{
-#ifdef INFINITIES
-		if( yoddint )
-			return( -INFINITY );
-		return( INFINITY );
-#else
-		if( yoddint )
-			return( -MAXNUM );
-		return( MAXNUM );
-#endif
-		}
-	if( y < 0.0 )
-		{
-#ifdef MINUSZERO
-		if( yoddint )
-			return( NEGZERO );
-#endif
-		return( 0.0 );
-		}
- 	}
-
-nflg = 0;	/* flag = 1 if x<0 raised to integer power */
-if( x <= 0.0 )
-	{
-	if( x == 0.0 )
-		{
-		if( y < 0.0 )
-			{
-#ifdef MINUSZERO
-			if( signbit(x) && yoddint )
-				return( -INFINITY );
-#endif
-#ifdef INFINITIES
-			return( INFINITY );
-#else
-			return( MAXNUM );
-#endif
-			}
-		if( y > 0.0 )
-			{
-#ifdef MINUSZERO
-			if( signbit(x) && yoddint )
-				return( NEGZERO );
-#endif
-			return( 0.0 );
-			}
-		return( 1.0 );
-		}
-	else
-		{
-		if( iyflg == 0 )
-			{ /* noninteger power of negative number */
-			mtherr( fname, DOMAIN );
-			_SET_ERRNO (EDOM);
-#ifdef NANS
-			return(NAN);
-#else
-			return(0.0L);
-#endif
-			}
-		nflg = 1;
-		}
-	}
-
-/* Integer power of an integer.  */
-
-if( iyflg )
-	{
-	i = w;
-	w = floor(x);
-	if( (w == x) && (fabs(y) < 32768.0) )
-		{
-		w = __powi( x, (int) y );
-		return( w );
-		}
-	}
-
-if( nflg )
-	x = fabs(x);
-
-/* For results close to 1, use a series expansion.  */
-w = x - 1.0;
-aw = fabs(w);
-ay = fabs(y);
-wy = w * y;
-ya = fabs(wy);
-if((aw <= 1.0e-3 && ay <= 1.0)
-   || (ya <= 1.0e-3 && ay >= 1.0))
-	{
-	z = (((((w*(y-5.)/720. + 1./120.)*w*(y-4.) + 1./24.)*w*(y-3.)
-		+ 1./6.)*w*(y-2.) + 0.5)*w*(y-1.) )*wy + wy + 1.;
-	goto done;
-	}
-/* These are probably too much trouble.  */
-#if 0
-w = y * log(x);
-if (aw > 1.0e-3 && fabs(w) < 1.0e-3)
-  {
-    z = ((((((
-    w/7. + 1.)*w/6. + 1.)*w/5. + 1.)*w/4. + 1.)*w/3. + 1.)*w/2. + 1.)*w + 1.;
-    goto done;
-  }
-
-if(ya <= 1.0e-3 && aw <= 1.0e-4)
-  {
-    z = (((((
-	     wy*1./720.
-	     + (-w*1./48. + 1./120.) )*wy
-	    + ((w*17./144. - 1./12.)*w + 1./24.) )*wy
-	   + (((-w*5./16. + 7./24.)*w - 1./4.)*w + 1./6.) )*wy
-	  + ((((w*137./360. - 5./12.)*w + 11./24.)*w - 1./2.)*w + 1./2.) )*wy
-	 + (((((-w*1./6. + 1./5.)*w - 1./4)*w + 1./3.)*w -1./2.)*w ) )*wy
-	   + wy + 1.0;
-    goto done;
-  }
-#endif
-
-/* separate significand from exponent */
-x = frexp( x, &e );
-
-#if 0
-/* For debugging, check for gross overflow. */
-if( (e * y)  > (MEXP + 1024) )
-	goto overflow;
-#endif
-
-/* Find significand of x in antilog table A[]. */
-i = 1;
-if( x <= douba(9) )
-	i = 9;
-if( x <= douba(i+4) )
-	i += 4;
-if( x <= douba(i+2) )
-	i += 2;
-if( x >= douba(1) )
-	i = -1;
-i += 1;
-
-
-/* Find (x - A[i])/A[i]
- * in order to compute log(x/A[i]):
- *
- * log(x) = log( a x/a ) = log(a) + log(x/a)
- *
- * log(x/a) = log(1+v),  v = x/a - 1 = (x-a)/a
- */
-x -= douba(i);
-x -= doubb(i/2);
-x /= douba(i);
-
-
-/* rational approximation for log(1+v):
- *
- * log(1+v)  =  v  -  v**2/2  +  v**3 P(v) / Q(v)
- */
-z = x*x;
-w = x * ( z * polevl( x, P, 3 ) / p1evl( x, Q, 4 ) );
-w = w - ldexp( z, -1 );   /*  w - 0.5 * z  */
-
-/* Convert to base 2 logarithm:
- * multiply by log2(e)
- */
-w = w + LOG2EA * w;
-/* Note x was not yet added in
- * to above rational approximation,
- * so do it now, while multiplying
- * by log2(e).
- */
-z = w + LOG2EA * x;
-z = z + x;
-
-/* Compute exponent term of the base 2 logarithm. */
-w = -i;
-w = ldexp( w, -4 );	/* divide by 16 */
-w += e;
-/* Now base 2 log of x is w + z. */
-
-/* Multiply base 2 log by y, in extended precision. */
-
-/* separate y into large part ya
- * and small part yb less than 1/16
- */
-ya = reduc(y);
-yb = y - ya;
-
-
-F = z * y  +  w * yb;
-Fa = reduc(F);
-Fb = F - Fa;
-
-G = Fa + w * ya;
-Ga = reduc(G);
-Gb = G - Ga;
-
-H = Fb + Gb;
-Ha = reduc(H);
-w = ldexp( Ga+Ha, 4 );
-
-/* Test the power of 2 for overflow */
-if( w > MEXP )
-	{
-#ifndef INFINITIES
-	mtherr( fname, OVERFLOW );
-#endif
-#ifdef INFINITIES
-	if( nflg && yoddint )
-	  return( -INFINITY );
-	return( INFINITY );
-#else
-	if( nflg && yoddint )
-	  return( -MAXNUM );
-	return( MAXNUM );
-#endif
-	}
-
-if( w < (MNEXP - 1) )
-	{
-#ifndef DENORMAL
-	mtherr( fname, UNDERFLOW );
-#endif
-#ifdef MINUSZERO
-	if( nflg && yoddint )
-	  return( NEGZERO );
-#endif
-	return( 0.0 );
-	}
-
-e = w;
-Hb = H - Ha;
-
-if( Hb > 0.0 )
-	{
-	e += 1;
-	Hb -= 0.0625;
-	}
-
-/* Now the product y * log2(x)  =  Hb + e/16.0.
- *
- * Compute base 2 exponential of Hb,
- * where -0.0625 <= Hb <= 0.
- */
-z = Hb * polevl( Hb, R, 6 );  /*    z  =  2**Hb - 1    */
-
-/* Express e/16 as an integer plus a negative number of 16ths.
- * Find lookup table entry for the fractional power of 2.
- */
-if( e < 0 )
-	i = 0;
-else
-	i = 1;
-i = e/16 + i;
-e = 16*i - e;
-w = douba( e );
-z = w + w * z;      /*    2**-e * ( 1 + (2**Hb-1) )    */
-z = ldexp( z, i );  /* multiply by integer power of 2 */
-
-done:
-
-/* Negate if odd integer power of negative number */
-if( nflg && yoddint )
-	{
-#ifdef MINUSZERO
-	if( z == 0.0 )
-		z = NEGZERO;
-	else
-#endif
-		z = -z;
-	}
-return( z );
-}
-
-
-/* Find a multiple of 1/16 that is within 1/16 of x. */
-static __inline__ double reduc(x)
-double x;
-{
-double t;
-
-t = ldexp( x, 4 );
-t = floor( t );
-t = ldexp( t, -4 );
-return(t);
-}
diff --git a/winsup/mingw/mingwex/math/powf.c b/winsup/mingw/mingwex/math/powf.c
deleted file mode 100644
index 1af4d2d8f..000000000
--- a/winsup/mingw/mingwex/math/powf.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <math.h>
-float powf (float x, float y)
-  {return (float) pow (x, y);}
diff --git a/winsup/mingw/mingwex/math/powi.c b/winsup/mingw/mingwex/math/powi.c
deleted file mode 100644
index 9dd0c3d82..000000000
--- a/winsup/mingw/mingwex/math/powi.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*							powi.c
- *
- *	Real raised to integer power
- *
- *
- *
- * SYNOPSIS:
- *
- * double x, y, __powi();
- * int n;
- *
- * y = __powi( x, n );
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns argument x raised to the nth power.
- * The routine efficiently decomposes n as a sum of powers of
- * two. The desired power is a product of two-to-the-kth
- * powers of x.  Thus to compute the 32767 power of x requires
- * 28 multiplications instead of 32767 multiplications.
- *
- *
- *
- * ACCURACY:
- *
- *
- *                      Relative error:
- * arithmetic   x domain   n domain  # trials      peak         rms
- *    DEC       .04,26     -26,26    100000       2.7e-16     4.3e-17
- *    IEEE      .04,26     -26,26     50000       2.0e-15     3.8e-16
- *    IEEE        1,2    -1022,1023   50000       8.6e-14     1.6e-14
- *
- * Returns MAXNUM on overflow, zero on underflow.
- *
- */
-
-/*							powi.c	*/
-
-/*
-Cephes Math Library Release 2.8:  June, 2000
-Copyright 1984, 1995, 2000 by Stephen L. Moshier
-*/
-
-/*
-Modified for mingw
-2002-07-22 Danny Smith <dannysmith@users.sourceforge.net>
-*/
-
-#ifdef __MINGW32__
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-#ifdef ANSIPROT
-extern double log ( double );
-extern double frexp ( double, int * );
-extern int signbit ( double );
-#else
-double log(), frexp();
-int signbit();
-#endif
-extern double NEGZERO, INFINITY, MAXNUM, MAXLOG, MINLOG, LOGE2;
-#endif /* __MINGW32__ */
-
-#ifndef _SET_ERRNO
-#define _SET_ERRNO(x)
-#endif
-
-double __powi( x, nn )
-double x;
-int nn;
-{
-int n, e, sign, asign, lx;
-double w, y, s;
-
-/* See pow.c for these tests.  */
-if( x == 0.0 )
-	{
-	if( nn == 0 )
-		return( 1.0 );
-	else if( nn < 0 )
-	    return( INFINITY );
-	else
-	  {
-	    if( nn & 1 )
-	      return( x );
-	    else
-	      return( 0.0 );
-	  }
-	}
-
-if( nn == 0 )
-	return( 1.0 );
-
-if( nn == -1 )
-	return( 1.0/x );
-
-if( x < 0.0 )
-	{
-	asign = -1;
-	x = -x;
-	}
-else
-	asign = 0;
-
-
-if( nn < 0 )
-	{
-	sign = -1;
-	n = -nn;
-	}
-else
-	{
-	sign = 1;
-	n = nn;
-	}
-
-/* Even power will be positive. */
-if( (n & 1) == 0 )
-	asign = 0;
-
-/* Overflow detection */
-
-/* Calculate approximate logarithm of answer */
-s = frexp( x, &lx );
-e = (lx - 1)*n;
-if( (e == 0) || (e > 64) || (e < -64) )
-	{
-	s = (s - 7.0710678118654752e-1) / (s +  7.0710678118654752e-1);
-	s = (2.9142135623730950 * s - 0.5 + lx) * nn * LOGE2;
-	}
-else
-	{
-	s = LOGE2 * e;
-	}
-
-if( s > MAXLOG )
-	{
-	mtherr( "powi", OVERFLOW );
-	_SET_ERRNO(ERANGE);
-	y = INFINITY;
-	goto done;
-	}
-
-#if DENORMAL
-if( s < MINLOG )
-	{
-	y = 0.0;
-	goto done;
-	}
-
-/* Handle tiny denormal answer, but with less accuracy
- * since roundoff error in 1.0/x will be amplified.
- * The precise demarcation should be the gradual underflow threshold.
- */
-if( (s < (-MAXLOG+2.0)) && (sign < 0) )
-	{
-	x = 1.0/x;
-	sign = -sign;
-	}
-#else
-/* do not produce denormal answer */
-if( s < -MAXLOG )
-	return(0.0);
-#endif
-
-
-/* First bit of the power */
-if( n & 1 )
-	y = x;
-		
-else
-	y = 1.0;
-
-w = x;
-n >>= 1;
-while( n )
-	{
-	w = w * w;	/* arg to the 2-to-the-kth power */
-	if( n & 1 )	/* if that bit is set, then include in product */
-		y *= w;
-	n >>= 1;
-	}
-
-if( sign < 0 )
-	y = 1.0/y;
-
-done:
-
-if( asign )
-	{
-	/* odd power of negative number */
-	if( y == 0.0 )
-		y = NEGZERO;
-	else
-		y = -y;
-	}
-return(y);
-}
diff --git a/winsup/mingw/mingwex/math/powif.c b/winsup/mingw/mingwex/math/powif.c
deleted file mode 100644
index 160fb5476..000000000
--- a/winsup/mingw/mingwex/math/powif.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*							powi.c
- *
- *	Real raised to integer power
- *
- *
- *
- * SYNOPSIS:
- *
- * float x, y, __powif();
- * int n;
- *
- * y = powi( x, n );
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns argument x raised to the nth power.
- * The routine efficiently decomposes n as a sum of powers of
- * two. The desired power is a product of two-to-the-kth
- * powers of x.  Thus to compute the 32767 power of x requires
- * 28 multiplications instead of 32767 multiplications.
- *
- *
- *
- * ACCURACY:
- *
- *
- *                      Relative error:
- * arithmetic   x domain   n domain  # trials      peak         rms
- *    DEC       .04,26     -26,26    100000       2.7e-16     4.3e-17
- *    IEEE      .04,26     -26,26     50000       2.0e-15     3.8e-16
- *    IEEE        1,2    -1022,1023   50000       8.6e-14     1.6e-14
- *
- * Returns MAXNUM on overflow, zero on underflow.
- *
- */
-
-/*							powi.c	*/
-
-/*
-Cephes Math Library Release 2.8:  June, 2000
-Copyright 1984, 1995, 2000 by Stephen L. Moshier
-*/
-
-/*
-Modified for float from powi.c and adapted to mingw
-2002-10-01 Danny Smith <dannysmith@users.sourceforge.net>
-*/
-
-#ifdef __MINGW32__
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-#ifdef ANSIPROT
-extern float logf ( float );
-extern float frexpf ( float, int * );
-extern int signbitf ( float );
-#else
-float logf(), frexpf();
-int signbitf();
-#endif
-extern float NEGZEROF, INFINITYF, MAXNUMF, MAXLOGF, MINLOGF, LOGE2F;
-#endif /* __MINGW32__ */
-
-#ifndef _SET_ERRNO
-#define _SET_ERRNO(x)
-#endif
-
-float __powif( float x, int nn )
-{
-int n, e, sign, asign, lx;
-float w, y, s;
-
-/* See pow.c for these tests.  */
-if( x == 0.0F )
-	{
-	if( nn == 0 )
-		return( 1.0F );
-	else if( nn < 0 )
-	    return( INFINITYF );
-	else
-	  {
-	    if( nn & 1 )
-	      return( x );
-	    else
-	      return( 0.0 );
-	  }
-	}
-
-if( nn == 0 )
-	return( 1.0 );
-
-if( nn == -1 )
-	return( 1.0/x );
-
-if( x < 0.0 )
-	{
-	asign = -1;
-	x = -x;
-	}
-else
-	asign = 0;
-
-
-if( nn < 0 )
-	{
-	sign = -1;
-	n = -nn;
-	}
-else
-	{
-	sign = 1;
-	n = nn;
-	}
-
-/* Even power will be positive. */
-if( (n & 1) == 0 )
-	asign = 0;
-
-/* Overflow detection */
-
-/* Calculate approximate logarithm of answer */
-s = frexpf( x, &lx );
-e = (lx - 1)*n;
-if( (e == 0) || (e > 64) || (e < -64) )
-	{
-	s = (s - 7.0710678118654752e-1) / (s +  7.0710678118654752e-1);
-	s = (2.9142135623730950 * s - 0.5 + lx) * nn * LOGE2F;
-	}
-else
-	{
-	s = LOGE2F * e;
-	}
-
-if( s > MAXLOGF )
-	{
-	mtherr( "__powif", OVERFLOW );
-	_SET_ERRNO(ERANGE);
-	y = INFINITYF;
-	goto done;
-	}
-
-#if DENORMAL
-if( s < MINLOGF )
-	{
-	y = 0.0;
-	goto done;
-	}
-
-/* Handle tiny denormal answer, but with less accuracy
- * since roundoff error in 1.0/x will be amplified.
- * The precise demarcation should be the gradual underflow threshold.
- */
-if( (s < (-MAXLOGF+2.0)) && (sign < 0) )
-	{
-	x = 1.0/x;
-	sign = -sign;
-	}
-#else
-/* do not produce denormal answer */
-if( s < -MAXLOGF )
-	return(0.0);
-#endif
-
-
-/* First bit of the power */
-if( n & 1 )
-	y = x;
-		
-else
-	y = 1.0;
-
-w = x;
-n >>= 1;
-while( n )
-	{
-	w = w * w;	/* arg to the 2-to-the-kth power */
-	if( n & 1 )	/* if that bit is set, then include in product */
-		y *= w;
-	n >>= 1;
-	}
-
-if( sign < 0 )
-	y = 1.0/y;
-
-done:
-
-if( asign )
-	{
-	/* odd power of negative number */
-	if( y == 0.0 )
-		y = NEGZEROF;
-	else
-		y = -y;
-	}
-return(y);
-}
diff --git a/winsup/mingw/mingwex/math/powil.c b/winsup/mingw/mingwex/math/powil.c
deleted file mode 100644
index ec7a2866b..000000000
--- a/winsup/mingw/mingwex/math/powil.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*							__powil.c
- *
- *	Real raised to integer power, long double precision
- *
- *
- *
- * SYNOPSIS:
- *
- * long double x, y, __powil();
- * int n;
- *
- * y = __powil( x, n );
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns argument x raised to the nth power.
- * The routine efficiently decomposes n as a sum of powers of
- * two. The desired power is a product of two-to-the-kth
- * powers of x.  Thus to compute the 32767 power of x requires
- * 28 multiplications instead of 32767 multiplications.
- *
- *
- *
- * ACCURACY:
- *
- *
- *                      Relative error:
- * arithmetic   x domain   n domain  # trials      peak         rms
- *    IEEE     .001,1000  -1022,1023  50000       4.3e-17     7.8e-18
- *    IEEE        1,2     -1022,1023  20000       3.9e-17     7.6e-18
- *    IEEE     .99,1.01     0,8700    10000       3.6e-16     7.2e-17
- *
- * Returns INFINITY on overflow, zero on underflow.
- *
- */
-
-/*							__powil.c	*/
-
-/*
-Cephes Math Library Release 2.2:  December, 1990
-Copyright 1984, 1990 by Stephen L. Moshier
-Direct inquiries to 30 Frost Street, Cambridge, MA 02140
-*/
-
-/*
-Modified for mingw
-2002-07-22 Danny Smith <dannysmith@users.sourceforge.net>
-*/
-
-#ifdef __MINGW32__
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-extern long double MAXNUML, MAXLOGL, MINLOGL;
-extern long double LOGE2L;
-#ifdef ANSIPROT
-extern long double frexpl ( long double, int * );
-#else
-long double frexpl();
-#endif
-#endif /* __MINGW32__ */
-
-#ifndef _SET_ERRNO
-#define _SET_ERRNO(x)
-#endif
-
-long double __powil( x, nn )
-long double x;
-int nn;
-{
-long double w, y;
-long double s;
-int n, e, sign, asign, lx;
-
-if( x == 0.0L )
-	{
-	if( nn == 0 )
-		return( 1.0L );
-	else if( nn < 0 )
-		return( INFINITYL );
-	else
-		return( 0.0L );
-	}
-
-if( nn == 0 )
-	return( 1.0L );
-
-
-if( x < 0.0L )
-	{
-	asign = -1;
-	x = -x;
-	}
-else
-	asign = 0;
-
-
-if( nn < 0 )
-	{
-	sign = -1;
-	n = -nn;
-	}
-else
-	{
-	sign = 1;
-	n = nn;
-	}
-
-/* Overflow detection */
-
-/* Calculate approximate logarithm of answer */
-s = x;
-s = frexpl( s, &lx );
-e = (lx - 1)*n;
-if( (e == 0) || (e > 64) || (e < -64) )
-	{
-	s = (s - 7.0710678118654752e-1L) / (s +  7.0710678118654752e-1L);
-	s = (2.9142135623730950L * s - 0.5L + lx) * nn * LOGE2L;
-	}
-else
-	{
-	s = LOGE2L * e;
-	}
-
-if( s > MAXLOGL )
-	{
-	mtherr( "__powil", OVERFLOW );
-	_SET_ERRNO(ERANGE);
-	y = INFINITYL;
-	goto done;
-	}
-
-if( s < MINLOGL )
-	{
-	mtherr( "__powil", UNDERFLOW );
-	_SET_ERRNO(ERANGE);
-	return(0.0L);
-	}
-/* Handle tiny denormal answer, but with less accuracy
- * since roundoff error in 1.0/x will be amplified.
- * The precise demarcation should be the gradual underflow threshold.
- */
-if( s < (-MAXLOGL+2.0L) )
-	{
-	x = 1.0L/x;
-	sign = -sign;
-	}
-
-/* First bit of the power */
-if( n & 1 )
-	y = x;
-		
-else
-	{
-	y = 1.0L;
-	asign = 0;
-	}
-
-w = x;
-n >>= 1;
-while( n )
-	{
-	w = w * w;	/* arg to the 2-to-the-kth power */
-	if( n & 1 )	/* if that bit is set, then include in product */
-		y *= w;
-	n >>= 1;
-	}
-
-
-done:
-
-if( asign )
-	y = -y; /* odd power of negative number */
-if( sign < 0 )
-	y = 1.0L/y;
-return(y);
-}
diff --git a/winsup/mingw/mingwex/math/powl.c b/winsup/mingw/mingwex/math/powl.c
deleted file mode 100644
index 2a09ae1e0..000000000
--- a/winsup/mingw/mingwex/math/powl.c
+++ /dev/null
@@ -1,775 +0,0 @@
-/*							powl.c
- *
- *	Power function, long double precision
- *
- *
- *
- * SYNOPSIS:
- *
- * long double x, y, z, powl();
- *
- * z = powl( x, y );
- *
- *
- *
- * DESCRIPTION:
- *
- * Computes x raised to the yth power.  Analytically,
- *
- *      x**y  =  exp( y log(x) ).
- *
- * Following Cody and Waite, this program uses a lookup table
- * of 2**-i/32 and pseudo extended precision arithmetic to
- * obtain several extra bits of accuracy in both the logarithm
- * and the exponential.
- *
- *
- *
- * ACCURACY:
- *
- * The relative error of pow(x,y) can be estimated
- * by   y dl ln(2),   where dl is the absolute error of
- * the internally computed base 2 logarithm.  At the ends
- * of the approximation interval the logarithm equal 1/32
- * and its relative error is about 1 lsb = 1.1e-19.  Hence
- * the predicted relative error in the result is 2.3e-21 y .
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *
- *    IEEE     +-1000       40000      2.8e-18      3.7e-19
- * .001 < x < 1000, with log(x) uniformly distributed.
- * -1000 < y < 1000, y uniformly distributed.
- *
- *    IEEE     0,8700       60000      6.5e-18      1.0e-18
- * 0.99 < x < 1.01, 0 < y < 8700, uniformly distributed.
- *
- *
- * ERROR MESSAGES:
- *
- *   message         condition      value returned
- * pow overflow     x**y > MAXNUM      INFINITY
- * pow underflow   x**y < 1/MAXNUM       0.0
- * pow domain      x<0 and y noninteger  0.0
- *
- */
-
-/*
-Cephes Math Library Release 2.7:  May, 1998
-Copyright 1984, 1991, 1998 by Stephen L. Moshier
-*/
-
-/*
-Modified for mingw
-2002-07-22 Danny Smith <dannysmith@users.sourceforge.net>
-*/
-
-#ifdef __MINGW32__
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-
-static char fname[] = {"powl"};
-#endif
-
-#ifndef _SET_ERRNO
-#define _SET_ERRNO(x)
-#endif
-
-
-/* Table size */
-#define NXT 32
-/* log2(Table size) */
-#define LNXT 5
-
-#ifdef UNK
-/* log(1+x) =  x - .5x^2 + x^3 *  P(z)/Q(z)
- * on the domain  2^(-1/32) - 1  <=  x  <=  2^(1/32) - 1
- */
-static long double P[] = {
- 8.3319510773868690346226E-4L,
- 4.9000050881978028599627E-1L,
- 1.7500123722550302671919E0L,
- 1.4000100839971580279335E0L,
-};
-static long double Q[] = {
-/* 1.0000000000000000000000E0L,*/
- 5.2500282295834889175431E0L,
- 8.4000598057587009834666E0L,
- 4.2000302519914740834728E0L,
-};
-/* A[i] = 2^(-i/32), rounded to IEEE long double precision.
- * If i is even, A[i] + B[i/2] gives additional accuracy.
- */
-static long double A[33] = {
- 1.0000000000000000000000E0L,
- 9.7857206208770013448287E-1L,
- 9.5760328069857364691013E-1L,
- 9.3708381705514995065011E-1L,
- 9.1700404320467123175367E-1L,
- 8.9735453750155359320742E-1L,
- 8.7812608018664974155474E-1L,
- 8.5930964906123895780165E-1L,
- 8.4089641525371454301892E-1L,
- 8.2287773907698242225554E-1L,
- 8.0524516597462715409607E-1L,
- 7.8799042255394324325455E-1L,
- 7.7110541270397041179298E-1L,
- 7.5458221379671136985669E-1L,
- 7.3841307296974965571198E-1L,
- 7.2259040348852331001267E-1L,
- 7.0710678118654752438189E-1L,
- 6.9195494098191597746178E-1L,
- 6.7712777346844636413344E-1L,
- 6.6261832157987064729696E-1L,
- 6.4841977732550483296079E-1L,
- 6.3452547859586661129850E-1L,
- 6.2092890603674202431705E-1L,
- 6.0762367999023443907803E-1L,
- 5.9460355750136053334378E-1L,
- 5.8186242938878875689693E-1L,
- 5.6939431737834582684856E-1L,
- 5.5719337129794626814472E-1L,
- 5.4525386633262882960438E-1L,
- 5.3357020033841180906486E-1L,
- 5.2213689121370692017331E-1L,
- 5.1094857432705833910408E-1L,
- 5.0000000000000000000000E-1L,
-};
-static long double B[17] = {
- 0.0000000000000000000000E0L,
- 2.6176170809902549338711E-20L,
--1.0126791927256478897086E-20L,
- 1.3438228172316276937655E-21L,
- 1.2207982955417546912101E-20L,
--6.3084814358060867200133E-21L,
- 1.3164426894366316434230E-20L,
--1.8527916071632873716786E-20L,
- 1.8950325588932570796551E-20L,
- 1.5564775779538780478155E-20L,
- 6.0859793637556860974380E-21L,
--2.0208749253662532228949E-20L,
- 1.4966292219224761844552E-20L,
- 3.3540909728056476875639E-21L,
--8.6987564101742849540743E-22L,
--1.2327176863327626135542E-20L,
- 0.0000000000000000000000E0L,
-};
-
-/* 2^x = 1 + x P(x),
- * on the interval -1/32 <= x <= 0
- */
-static long double R[] = {
- 1.5089970579127659901157E-5L,
- 1.5402715328927013076125E-4L,
- 1.3333556028915671091390E-3L,
- 9.6181291046036762031786E-3L,
- 5.5504108664798463044015E-2L,
- 2.4022650695910062854352E-1L,
- 6.9314718055994530931447E-1L,
-};
-
-#define douba(k) A[k]
-#define doubb(k) B[k]
-#define MEXP (NXT*16384.0L)
-/* The following if denormal numbers are supported, else -MEXP: */
-#ifdef DENORMAL
-#define MNEXP (-NXT*(16384.0L+64.0L))
-#else
-#define MNEXP (-NXT*16384.0L)
-#endif
-/* log2(e) - 1 */
-#define LOG2EA 0.44269504088896340735992L
-#endif
-
-
-#ifdef IBMPC
-static const unsigned short P[] = {
-0xb804,0xa8b7,0xc6f4,0xda6a,0x3ff4, XPD
-0x7de9,0xcf02,0x58c0,0xfae1,0x3ffd, XPD
-0x405a,0x3722,0x67c9,0xe000,0x3fff, XPD
-0xcd99,0x6b43,0x87ca,0xb333,0x3fff, XPD
-};
-static const unsigned short Q[] = {
-/* 0x0000,0x0000,0x0000,0x8000,0x3fff, */
-0x6307,0xa469,0x3b33,0xa800,0x4001, XPD
-0xfec2,0x62d7,0xa51c,0x8666,0x4002, XPD
-0xda32,0xd072,0xa5d7,0x8666,0x4001, XPD
-};
-static const unsigned short A[] = {
-0x0000,0x0000,0x0000,0x8000,0x3fff, XPD
-0x033a,0x722a,0xb2db,0xfa83,0x3ffe, XPD
-0xcc2c,0x2486,0x7d15,0xf525,0x3ffe, XPD
-0xf5cb,0xdcda,0xb99b,0xefe4,0x3ffe, XPD
-0x392f,0xdd24,0xc6e7,0xeac0,0x3ffe, XPD
-0x48a8,0x7c83,0x06e7,0xe5b9,0x3ffe, XPD
-0xe111,0x2a94,0xdeec,0xe0cc,0x3ffe, XPD
-0x3755,0xdaf2,0xb797,0xdbfb,0x3ffe, XPD
-0x6af4,0xd69d,0xfcca,0xd744,0x3ffe, XPD
-0xe45a,0xf12a,0x1d91,0xd2a8,0x3ffe, XPD
-0x80e4,0x1f84,0x8c15,0xce24,0x3ffe, XPD
-0x27a3,0x6e2f,0xbd86,0xc9b9,0x3ffe, XPD
-0xdadd,0x5506,0x2a11,0xc567,0x3ffe, XPD
-0x9456,0x6670,0x4cca,0xc12c,0x3ffe, XPD
-0x36bf,0x580c,0xa39f,0xbd08,0x3ffe, XPD
-0x9ee9,0x62fb,0xaf47,0xb8fb,0x3ffe, XPD
-0x6484,0xf9de,0xf333,0xb504,0x3ffe, XPD
-0x2590,0xd2ac,0xf581,0xb123,0x3ffe, XPD
-0x4ac6,0x42a1,0x3eea,0xad58,0x3ffe, XPD
-0x0ef8,0xea7c,0x5ab4,0xa9a1,0x3ffe, XPD
-0x38ea,0xb151,0xd6a9,0xa5fe,0x3ffe, XPD
-0x6819,0x0c49,0x4303,0xa270,0x3ffe, XPD
-0x11ae,0x91a1,0x3260,0x9ef5,0x3ffe, XPD
-0x5539,0xd54e,0x39b9,0x9b8d,0x3ffe, XPD
-0xa96f,0x8db8,0xf051,0x9837,0x3ffe, XPD
-0x0961,0xfef7,0xefa8,0x94f4,0x3ffe, XPD
-0xc336,0xab11,0xd373,0x91c3,0x3ffe, XPD
-0x53c0,0x45cd,0x398b,0x8ea4,0x3ffe, XPD
-0xd6e7,0xea8b,0xc1e3,0x8b95,0x3ffe, XPD
-0x8527,0x92da,0x0e80,0x8898,0x3ffe, XPD
-0x7b15,0xcc48,0xc367,0x85aa,0x3ffe, XPD
-0xa1d7,0xac2b,0x8698,0x82cd,0x3ffe, XPD
-0x0000,0x0000,0x0000,0x8000,0x3ffe, XPD
-};
-static const unsigned short B[] = {
-0x0000,0x0000,0x0000,0x0000,0x0000, XPD
-0x1f87,0xdb30,0x18f5,0xf73a,0x3fbd, XPD
-0xac15,0x3e46,0x2932,0xbf4a,0xbfbc, XPD
-0x7944,0xba66,0xa091,0xcb12,0x3fb9, XPD
-0xff78,0x40b4,0x2ee6,0xe69a,0x3fbc, XPD
-0xc895,0x5069,0xe383,0xee53,0xbfbb, XPD
-0x7cde,0x9376,0x4325,0xf8ab,0x3fbc, XPD
-0xa10c,0x25e0,0xc093,0xaefd,0xbfbd, XPD
-0x7d3e,0xea95,0x1366,0xb2fb,0x3fbd, XPD
-0x5d89,0xeb34,0x5191,0x9301,0x3fbd, XPD
-0x80d9,0xb883,0xfb10,0xe5eb,0x3fbb, XPD
-0x045d,0x288c,0xc1ec,0xbedd,0xbfbd, XPD
-0xeded,0x5c85,0x4630,0x8d5a,0x3fbd, XPD
-0x9d82,0xe5ac,0x8e0a,0xfd6d,0x3fba, XPD
-0x6dfd,0xeb58,0xaf14,0x8373,0xbfb9, XPD
-0xf938,0x7aac,0x91cf,0xe8da,0xbfbc, XPD
-0x0000,0x0000,0x0000,0x0000,0x0000, XPD
-};
-static const unsigned short R[] = {
-0xa69b,0x530e,0xee1d,0xfd2a,0x3fee, XPD
-0xc746,0x8e7e,0x5960,0xa182,0x3ff2, XPD
-0x63b6,0xadda,0xfd6a,0xaec3,0x3ff5, XPD
-0xc104,0xfd99,0x5b7c,0x9d95,0x3ff8, XPD
-0xe05e,0x249d,0x46b8,0xe358,0x3ffa, XPD
-0x5d1d,0x162c,0xeffc,0xf5fd,0x3ffc, XPD
-0x79aa,0xd1cf,0x17f7,0xb172,0x3ffe, XPD
-};
-
-/* 10 byte sizes versus 12 byte */
-#define douba(k) (*(long double *)(&A[(sizeof( long double )/2)*(k)]))
-#define doubb(k) (*(long double *)(&B[(sizeof( long double )/2)*(k)]))
-#define MEXP (NXT*16384.0L)
-#ifdef DENORMAL
-#define MNEXP (-NXT*(16384.0L+64.0L))
-#else
-#define MNEXP (-NXT*16384.0L)
-#endif
-static const
-union
-{
-  unsigned short L[6];
-  long double ld;
-} log2ea = {{0xc2ef,0x705f,0xeca5,0xe2a8,0x3ffd, XPD}};
-
-#define LOG2EA (log2ea.ld)
-/*
-#define LOG2EA 0.44269504088896340735992L
-*/
-#endif
-
-#ifdef MIEEE
-static long P[] = {
-0x3ff40000,0xda6ac6f4,0xa8b7b804,
-0x3ffd0000,0xfae158c0,0xcf027de9,
-0x3fff0000,0xe00067c9,0x3722405a,
-0x3fff0000,0xb33387ca,0x6b43cd99,
-};
-static long Q[] = {
-/* 0x3fff0000,0x80000000,0x00000000, */
-0x40010000,0xa8003b33,0xa4696307,
-0x40020000,0x8666a51c,0x62d7fec2,
-0x40010000,0x8666a5d7,0xd072da32,
-};
-static long A[] = {
-0x3fff0000,0x80000000,0x00000000,
-0x3ffe0000,0xfa83b2db,0x722a033a,
-0x3ffe0000,0xf5257d15,0x2486cc2c,
-0x3ffe0000,0xefe4b99b,0xdcdaf5cb,
-0x3ffe0000,0xeac0c6e7,0xdd24392f,
-0x3ffe0000,0xe5b906e7,0x7c8348a8,
-0x3ffe0000,0xe0ccdeec,0x2a94e111,
-0x3ffe0000,0xdbfbb797,0xdaf23755,
-0x3ffe0000,0xd744fcca,0xd69d6af4,
-0x3ffe0000,0xd2a81d91,0xf12ae45a,
-0x3ffe0000,0xce248c15,0x1f8480e4,
-0x3ffe0000,0xc9b9bd86,0x6e2f27a3,
-0x3ffe0000,0xc5672a11,0x5506dadd,
-0x3ffe0000,0xc12c4cca,0x66709456,
-0x3ffe0000,0xbd08a39f,0x580c36bf,
-0x3ffe0000,0xb8fbaf47,0x62fb9ee9,
-0x3ffe0000,0xb504f333,0xf9de6484,
-0x3ffe0000,0xb123f581,0xd2ac2590,
-0x3ffe0000,0xad583eea,0x42a14ac6,
-0x3ffe0000,0xa9a15ab4,0xea7c0ef8,
-0x3ffe0000,0xa5fed6a9,0xb15138ea,
-0x3ffe0000,0xa2704303,0x0c496819,
-0x3ffe0000,0x9ef53260,0x91a111ae,
-0x3ffe0000,0x9b8d39b9,0xd54e5539,
-0x3ffe0000,0x9837f051,0x8db8a96f,
-0x3ffe0000,0x94f4efa8,0xfef70961,
-0x3ffe0000,0x91c3d373,0xab11c336,
-0x3ffe0000,0x8ea4398b,0x45cd53c0,
-0x3ffe0000,0x8b95c1e3,0xea8bd6e7,
-0x3ffe0000,0x88980e80,0x92da8527,
-0x3ffe0000,0x85aac367,0xcc487b15,
-0x3ffe0000,0x82cd8698,0xac2ba1d7,
-0x3ffe0000,0x80000000,0x00000000,
-};
-static long B[51] = {
-0x00000000,0x00000000,0x00000000,
-0x3fbd0000,0xf73a18f5,0xdb301f87,
-0xbfbc0000,0xbf4a2932,0x3e46ac15,
-0x3fb90000,0xcb12a091,0xba667944,
-0x3fbc0000,0xe69a2ee6,0x40b4ff78,
-0xbfbb0000,0xee53e383,0x5069c895,
-0x3fbc0000,0xf8ab4325,0x93767cde,
-0xbfbd0000,0xaefdc093,0x25e0a10c,
-0x3fbd0000,0xb2fb1366,0xea957d3e,
-0x3fbd0000,0x93015191,0xeb345d89,
-0x3fbb0000,0xe5ebfb10,0xb88380d9,
-0xbfbd0000,0xbeddc1ec,0x288c045d,
-0x3fbd0000,0x8d5a4630,0x5c85eded,
-0x3fba0000,0xfd6d8e0a,0xe5ac9d82,
-0xbfb90000,0x8373af14,0xeb586dfd,
-0xbfbc0000,0xe8da91cf,0x7aacf938,
-0x00000000,0x00000000,0x00000000,
-};
-static long R[] = {
-0x3fee0000,0xfd2aee1d,0x530ea69b,
-0x3ff20000,0xa1825960,0x8e7ec746,
-0x3ff50000,0xaec3fd6a,0xadda63b6,
-0x3ff80000,0x9d955b7c,0xfd99c104,
-0x3ffa0000,0xe35846b8,0x249de05e,
-0x3ffc0000,0xf5fdeffc,0x162c5d1d,
-0x3ffe0000,0xb17217f7,0xd1cf79aa,
-};
-
-#define douba(k) (*(long double *)&A[3*(k)])
-#define doubb(k) (*(long double *)&B[3*(k)])
-#define MEXP (NXT*16384.0L)
-#ifdef DENORMAL
-#define MNEXP (-NXT*(16384.0L+64.0L))
-#else
-#define MNEXP (-NXT*16382.0L)
-#endif
-static long L[3] = {0x3ffd0000,0xe2a8eca5,0x705fc2ef};
-#define LOG2EA (*(long double *)(&L[0]))
-#endif
-
-
-#define F W
-#define Fa Wa
-#define Fb Wb
-#define G W
-#define Ga Wa
-#define Gb u
-#define H W
-#define Ha Wb
-#define Hb Wb
-
-#ifndef __MINGW32__
-extern long double MAXNUML;
-#endif
-
-static VOLATILE long double z;
-static long double w, W, Wa, Wb, ya, yb, u;
-
-#ifdef __MINGW32__
-static __inline__ long double reducl( long double );
-extern long double __powil ( long double, int );
-extern long double powl ( long double x, long double y);
-#else
-#ifdef ANSIPROT
-extern long double floorl ( long double );
-extern long double fabsl ( long double );
-extern long double frexpl ( long double, int * );
-extern long double ldexpl ( long double, int );
-extern long double polevll ( long double, void *, int );
-extern long double p1evll ( long double, void *, int );
-extern long double __powil ( long double, int );
-extern int isnanl ( long double );
-extern int isfinitel ( long double );
-static long double reducl( long double );
-extern int signbitl ( long double );
-#else
-long double floorl(), fabsl(), frexpl(), ldexpl();
-long double polevll(), p1evll(), __powil();
-static long double reducl();
-int isnanl(), isfinitel(), signbitl();
-#endif
-
-#ifdef INFINITIES
-extern long double INFINITYL;
-#else
-#define INFINITYL MAXNUML
-#endif
-
-#ifdef NANS
-extern long double NANL;
-#endif
-#ifdef MINUSZERO
-extern long double NEGZEROL;
-#endif
-
-#endif /* __MINGW32__ */
-
-long double powl( x, y )
-long double x, y;
-{
-/* double F, Fa, Fb, G, Ga, Gb, H, Ha, Hb */
-int i, nflg, iyflg, yoddint;
-long e;
-
-if( y == 0.0L )
-	return( 1.0L );
-
-#ifdef NANS
-if( isnanl(x) )
-	{
-	_SET_ERRNO (EDOM);
-	return( x );
-	}
-if( isnanl(y) )
-	{
-	_SET_ERRNO (EDOM);
-	return( y );
-	}
-#endif
-
-if( y == 1.0L )
-	return( x );
-
-if( isinfl(y) && (x == -1.0L || x == 1.0L) )
-	return( y );
-
-if( x == 1.0L )
-	return( 1.0L );
-
-if( y >= MAXNUML )
-	{
-	_SET_ERRNO (ERANGE);
-#ifdef INFINITIES
-	if( x > 1.0L )
-		return( INFINITYL );
-#else
-	if( x > 1.0L )
-		return( MAXNUML );
-#endif
-	if( x > 0.0L && x < 1.0L )
-		return( 0.0L );
-#ifdef INFINITIES
-	if( x < -1.0L )
-		return( INFINITYL );
-#else
-	if( x < -1.0L )
-		return( MAXNUML );
-#endif
-	if( x > -1.0L && x < 0.0L )
-		return( 0.0L );
-	}
-if( y <= -MAXNUML )
-	{
-	_SET_ERRNO (ERANGE);
-	if( x > 1.0L )
-		return( 0.0L );
-#ifdef INFINITIES
-	if( x > 0.0L && x < 1.0L )
-		return( INFINITYL );
-#else
-	if( x > 0.0L && x < 1.0L )
-		return( MAXNUML );
-#endif
-	if( x < -1.0L )
-		return( 0.0L );
-#ifdef INFINITIES
-	if( x > -1.0L && x < 0.0L )
-		return( INFINITYL );
-#else
-	if( x > -1.0L && x < 0.0L )
-		return( MAXNUML );
-#endif
-	}
-if( x >= MAXNUML )
-	{
-#if INFINITIES
-	if( y > 0.0L )
-		return( INFINITYL );
-#else
-	if( y > 0.0L )
-		return( MAXNUML );
-#endif
-	return( 0.0L );
-	}
-
-w = floorl(y);
-/* Set iyflg to 1 if y is an integer.  */
-iyflg = 0;
-if( w == y )
-	iyflg = 1;
-
-/* Test for odd integer y.  */
-yoddint = 0;
-if( iyflg )
-	{
-	ya = fabsl(y);
-	ya = floorl(0.5L * ya);
-	yb = 0.5L * fabsl(w);
-	if( ya != yb )
-		yoddint = 1;
-	}
-
-if( x <= -MAXNUML )
-	{
-	if( y > 0.0L )
-		{
-#ifdef INFINITIES
-		if( yoddint )
-			return( -INFINITYL );
-		return( INFINITYL );
-#else
-		if( yoddint )
-			return( -MAXNUML );
-		return( MAXNUML );
-#endif
-		}
-	if( y < 0.0L )
-		{
-#ifdef MINUSZERO
-		if( yoddint )
-			return( NEGZEROL );
-#endif
-		return( 0.0 );
-		}
- 	}
-
-
-nflg = 0;	/* flag = 1 if x<0 raised to integer power */
-if( x <= 0.0L )
-	{
-	if( x == 0.0L )
-		{
-		if( y < 0.0 )
-			{
-#ifdef MINUSZERO
-			if( signbitl(x) && yoddint )
-				return( -INFINITYL );
-#endif
-#ifdef INFINITIES
-			return( INFINITYL );
-#else
-			return( MAXNUML );
-#endif
-			}
-		if( y > 0.0 )
-			{
-#ifdef MINUSZERO
-			if( signbitl(x) && yoddint )
-				return( NEGZEROL );
-#endif
-			return( 0.0 );
-			}
-		if( y == 0.0L )
-			return( 1.0L );  /*   0**0   */
-		else  
-			return( 0.0L );  /*   0**y   */
-		}
-	else
-		{
-		if( iyflg == 0 )
-			{ /* noninteger power of negative number */
-			mtherr( fname, DOMAIN );
-			_SET_ERRNO (EDOM);
-#ifdef NANS
-			return(NANL);
-#else
-			return(0.0L);
-#endif
-			}
-		nflg = 1;
-		}
-	}
-
-/* Integer power of an integer.  */
-
-if( iyflg )
-	{
-	i = w;
-	w = floorl(x);
-	if( (w == x) && (fabsl(y) < 32768.0) )
-		{
-		w = __powil( x, (int) y );
-		return( w );
-		}
-	}
-
-
-if( nflg )
-	x = fabsl(x);
-
-/* separate significand from exponent */
-x = frexpl( x, &i );
-e = i;
-
-/* find significand in antilog table A[] */
-i = 1;
-if( x <= douba(17) )
-	i = 17;
-if( x <= douba(i+8) )
-	i += 8;
-if( x <= douba(i+4) )
-	i += 4;
-if( x <= douba(i+2) )
-	i += 2;
-if( x >= douba(1) )
-	i = -1;
-i += 1;
-
-
-/* Find (x - A[i])/A[i]
- * in order to compute log(x/A[i]):
- *
- * log(x) = log( a x/a ) = log(a) + log(x/a)
- *
- * log(x/a) = log(1+v),  v = x/a - 1 = (x-a)/a
- */
-x -= douba(i);
-x -= doubb(i/2);
-x /= douba(i);
-
-
-/* rational approximation for log(1+v):
- *
- * log(1+v)  =  v  -  v**2/2  +  v**3 P(v) / Q(v)
- */
-z = x*x;
-w = x * ( z * polevll( x, P, 3 ) / p1evll( x, Q, 3 ) );
-w = w - ldexpl( z, -1 );   /*  w - 0.5 * z  */
-
-/* Convert to base 2 logarithm:
- * multiply by log2(e) = 1 + LOG2EA
- */
-z = LOG2EA * w;
-z += w;
-z += LOG2EA * x;
-z += x;
-
-/* Compute exponent term of the base 2 logarithm. */
-w = -i;
-w = ldexpl( w, -LNXT );	/* divide by NXT */
-w += e;
-/* Now base 2 log of x is w + z. */
-
-/* Multiply base 2 log by y, in extended precision. */
-
-/* separate y into large part ya
- * and small part yb less than 1/NXT
- */
-ya = reducl(y);
-yb = y - ya;
-
-/* (w+z)(ya+yb)
- * = w*ya + w*yb + z*y
- */
-F = z * y  +  w * yb;
-Fa = reducl(F);
-Fb = F - Fa;
-
-G = Fa + w * ya;
-Ga = reducl(G);
-Gb = G - Ga;
-
-H = Fb + Gb;
-Ha = reducl(H);
-w = ldexpl( Ga+Ha, LNXT );
-
-/* Test the power of 2 for overflow */
-if( w > MEXP )
-	{
-/*	printf( "w = %.4Le ", w ); */
-	_SET_ERRNO (ERANGE);
-	mtherr( fname, OVERFLOW );
-	return( MAXNUML );
-	}
-
-if( w < MNEXP )
-	{
-/*	printf( "w = %.4Le ", w ); */
-	_SET_ERRNO (ERANGE);
-	mtherr( fname, UNDERFLOW );
-	return( 0.0L );
-	}
-
-e = w;
-Hb = H - Ha;
-
-if( Hb > 0.0L )
-	{
-	e += 1;
-	Hb -= (1.0L/NXT);  /*0.0625L;*/
-	}
-
-/* Now the product y * log2(x)  =  Hb + e/NXT.
- *
- * Compute base 2 exponential of Hb,
- * where -0.0625 <= Hb <= 0.
- */
-z = Hb * polevll( Hb, R, 6 );  /*    z  =  2**Hb - 1    */
-
-/* Express e/NXT as an integer plus a negative number of (1/NXT)ths.
- * Find lookup table entry for the fractional power of 2.
- */
-if( e < 0 )
-	i = 0;
-else
-	i = 1;
-i = e/NXT + i;
-e = NXT*i - e;
-w = douba( e );
-z = w * z;      /*    2**-e * ( 1 + (2**Hb-1) )    */
-z = z + w;
-z = ldexpl( z, i );  /* multiply by integer power of 2 */
-
-if( nflg )
-	{
-/* For negative x,
- * find out if the integer exponent
- * is odd or even.
- */
-	w = ldexpl( y, -1 );
-	w = floorl(w);
-	w = ldexpl( w, 1 );
-	if( w != y )
-		z = -z; /* odd exponent */
-	}
-
-return( z );
-}
-
-
-/* Find a multiple of 1/NXT that is within 1/NXT of x. */
-static __inline__ long double reducl(x)
-long double x;
-{
-long double t;
-
-t = ldexpl( x, LNXT );
-t = floorl( t );
-t = ldexpl( t, -LNXT );
-return(t);
-}
-
diff --git a/winsup/mingw/mingwex/math/remainder.S b/winsup/mingw/mingwex/math/remainder.S
deleted file mode 100644
index 01930d3ba..000000000
--- a/winsup/mingw/mingwex/math/remainder.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-	.file	"remainder.S"
-	.text
-	.align 4
-.globl _remainder
-	.def	_remainder;	.scl	2;	.type	32;	.endef
-_remainder:
-	fldl	12(%esp)
-	fldl	4(%esp)
-1:	fprem1
-	fstsw	%ax
-	sahf
-	jp	1b
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/remainderf.S b/winsup/mingw/mingwex/math/remainderf.S
deleted file mode 100644
index 81e78415a..000000000
--- a/winsup/mingw/mingwex/math/remainderf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-	.file	"remainderf.S"
-	.text
-	.align 4
-.globl _remainder
-	.def	_remainderf;	.scl	2;	.type	32;	.endef
-_remainderf:
-	flds	8(%esp)
-	flds	4(%esp)
-1:	fprem1
-	fstsw	%ax
-	sahf
-	jp	1b
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/remainderl.S b/winsup/mingw/mingwex/math/remainderl.S
deleted file mode 100644
index b5ce3736d..000000000
--- a/winsup/mingw/mingwex/math/remainderl.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"remainderl.S"
-	.text
-	.align 4
-.globl _remainderl
-	.def	_remainderl;	.scl	2;	.type	32;	.endef
-_remainderl:
-	fldt	16(%esp)
-	fldt	4(%esp)
-1:	fprem1
-	fstsw	%ax
-	sahf
-	jp	1b
-	fstp	%st(1)
-	ret
diff --git a/winsup/mingw/mingwex/math/remquo.S b/winsup/mingw/mingwex/math/remquo.S
deleted file mode 100644
index 987c37ca5..000000000
--- a/winsup/mingw/mingwex/math/remquo.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Written by Ulrich Drepper <drepper@cygnus.com>.
- * Based on e_remainder by J.T. Conklin <jtc@netbsd.org>.
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.ne
- * Public domain.
- */
-
-	.file	"remquo.S"
-        .text
-	.align 4;
-.globl _remquo;
-_remquo:     
-	fldl 4 +8(%esp)
-	fldl 4(%esp)
-1:	fprem1
-	fstsw %ax
-	sahf
-	jp 1b
-	fstp %st(1)
-	movl %eax, %ecx
-	shrl $8, %eax
-	shrl $12, %ecx
-	andl $4, %ecx
-	andl $3, %eax
-	orl %eax, %ecx
-	movl $0xef2960, %eax
-	shrl %cl, %eax
-	andl $3, %eax
-	movl 4 +8 +8(%esp), %ecx      
-	movl 4 +4(%esp), %edx
-	xorl 4 +8 +4(%esp), %edx
-	testl $0x80000000, %edx
-	jz 1f
-	negl %eax
-1:	movl %eax, (%ecx)
-
-	ret
diff --git a/winsup/mingw/mingwex/math/remquof.S b/winsup/mingw/mingwex/math/remquof.S
deleted file mode 100644
index af540ef5b..000000000
--- a/winsup/mingw/mingwex/math/remquof.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Written by Ulrich Drepper <drepper@cygnus.com>.
- * Based on e_remainder by J.T. Conklin <jtc@netbsd.org>.
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.ne
- * Public domain.
- */
-
-	.file	"remquo.S"
-	.text
-	.align 4;
-.globl _remquof;
-_remquof:     
-	flds 4 +4(%esp)
-	flds 4(%esp)
-1:	fprem1
-	fstsw %ax
-	sahf
-	jp 1b
-	fstp %st(1)
-	movl %eax, %ecx
-	shrl $8, %eax
-	shrl $12, %ecx
-	andl $4, %ecx
-	andl $3, %eax
-	orl %eax, %ecx
-	movl $0xef2960, %eax
-	shrl %cl, %eax
-	andl $3, %eax
-	movl 4 +4 +4(%esp), %ecx
-	movl 4(%esp), %edx
-	xorl 4 +4(%esp), %edx
-	testl $0x80000000, %edx
-	jz 1f
-	negl %eax
-1:	movl %eax, (%ecx)
-
-	ret
diff --git a/winsup/mingw/mingwex/math/remquol.S b/winsup/mingw/mingwex/math/remquol.S
deleted file mode 100644
index e6f1b5420..000000000
--- a/winsup/mingw/mingwex/math/remquol.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Written by Ulrich Drepper <drepper@cygnus.com>.
- * Based on e_remainder by J.T. Conklin <jtc@netbsd.org>.
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- * Public domain.
- */
-        .text
-	.align 4;
-.globl _remquol;
- _remquol:
-        fldt 4 +12(%esp)
-        fldt 4(%esp)
-1:	fprem1
-        fstsw %ax
-        sahf
-        jp 1b
-        fstp %st(1)
-        movl %eax, %ecx
-        shrl $8, %eax
-        shrl $12, %ecx
-        andl $4, %ecx
-        andl $3, %eax
-        orl %eax, %ecx
-        movl $0xef2960, %eax
-        shrl %cl, %eax
-        andl $3, %eax
-        movl 4 +12 +12(%esp), %ecx      
-        movl 4 +8(%esp), %edx
-        xorl 4 +12 +8(%esp), %edx
-        testl $0x8000, %edx
-        jz 1f
-        negl %eax
-1:	movl %eax, (%ecx)
-      
-        ret
diff --git a/winsup/mingw/mingwex/math/rint.c b/winsup/mingw/mingwex/math/rint.c
deleted file mode 100644
index 3198f4b26..000000000
--- a/winsup/mingw/mingwex/math/rint.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <math.h>
-double rint (double x){
-  double retval;
-  __asm__ ("frndint;" : "=t" (retval) : "0" (x));
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/rintf.c b/winsup/mingw/mingwex/math/rintf.c
deleted file mode 100644
index 0b05e8f89..000000000
--- a/winsup/mingw/mingwex/math/rintf.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-float rintf (float x){
-  float retval;
-  __asm__ ("frndint;": "=t" (retval) : "0" (x));
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/rintl.c b/winsup/mingw/mingwex/math/rintl.c
deleted file mode 100644
index ffc9d1107..000000000
--- a/winsup/mingw/mingwex/math/rintl.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <math.h>
-
-long double rintl (long double x){
-  long double retval;
-  __asm__ ("frndint;": "=t" (retval) : "0" (x));
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/round.c b/winsup/mingw/mingwex/math/round.c
deleted file mode 100644
index 9d8e949e4..000000000
--- a/winsup/mingw/mingwex/math/round.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <fenv.h>
-
-double
-round (double x) {
-  double retval;
-  unsigned short saved_cw, _cw;
-  __asm__ (
-	"fnstcw %0;"
-  	: "=m" (saved_cw)
-	); /* save  control word  */
-  _cw = ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-     	  | (x > 0.0 ? FE_UPWARD : FE_DOWNWARD); /* round away from zero */
-  __asm__ (
-	"fldcw %0;"
-	:
-	: "m" (_cw)
-	);  /* load the rounding control */
-  __asm__ (
-	"frndint;"
-	: "=t" (retval)
-	: "0" (x)
-	); /* do the rounding */
-  __asm__ (
-	"fldcw %0;"
-	:
-	: "m" (saved_cw)
-	); /* restore control word */
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/roundf.c b/winsup/mingw/mingwex/math/roundf.c
deleted file mode 100644
index 6ae81bdd8..000000000
--- a/winsup/mingw/mingwex/math/roundf.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <fenv.h>
-
-float
-roundf (float x) {
-  double retval;
-  unsigned short saved_cw, _cw;
-  __asm__ (
-	"fnstcw %0;"
-	: "=m" (saved_cw)
-	); /* save  control word  */
-  _cw = ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-         | (x > 0.0 ? FE_UPWARD : FE_DOWNWARD); /* round away from zero */
-  __asm__ (
-	"fldcw %0;"
-	:
-	: "m" (_cw)
-	);  /* load the rounding control */
-  __asm__ (
-	"frndint;"
-	: "=t" (retval)
-	: "0" (x)
-	); /* do the rounding */
-  __asm__ (
-	"fldcw %0;"
-	:
-	: "m" (saved_cw)
-	); /* restore control word */
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/roundl.c b/winsup/mingw/mingwex/math/roundl.c
deleted file mode 100644
index de3334a62..000000000
--- a/winsup/mingw/mingwex/math/roundl.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <fenv.h>
-
-long double
-roundl (long double x) {
-  long double retval;
-  unsigned short saved_cw, _cw;
-  __asm__ (
-	"fnstcw %0;"
-  	: "=m" (saved_cw)
-	); /* save  control word  */
-  _cw = ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO)
-     	  | (x > 0.0 ? FE_UPWARD : FE_DOWNWARD); /* round away from zero */
-  __asm__ (
-	"fldcw %0;"
-	:
-	: "m" (_cw)
-	);  /* load the rounding control */
-  __asm__ (
-	"frndint;"
-	: "=t" (retval)
-	: "0" (x)
-	); /* do the rounding */
-  __asm__ (
-	"fldcw %0;"
-	:
-	: "m" (saved_cw)
-	); /* restore control word */
-  return retval;
-}
-
diff --git a/winsup/mingw/mingwex/math/s_erf.c b/winsup/mingw/mingwex/math/s_erf.c
deleted file mode 100644
index 3cba24dd2..000000000
--- a/winsup/mingw/mingwex/math/s_erf.c
+++ /dev/null
@@ -1,345 +0,0 @@
-
-/* @(#)s_erf.c 1.3 95/01/18 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunSoft, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/* double erf(double x)
- * double erfc(double x)
- *			     x
- *		      2      |\
- *     erf(x)  =  ---------  | exp(-t*t)dt
- *	 	   sqrt(pi) \| 
- *			     0
- *
- *     erfc(x) =  1-erf(x)
- *  Note that 
- *		erf(-x) = -erf(x)
- *		erfc(-x) = 2 - erfc(x)
- *
- * Method:
- *	1. For |x| in [0, 0.84375]
- *	    erf(x)  = x + x*R(x^2)
- *          erfc(x) = 1 - erf(x)           if x in [-.84375,0.25]
- *                  = 0.5 + ((0.5-x)-x*R)  if x in [0.25,0.84375]
- *	   where R = P/Q where P is an odd poly of degree 8 and
- *	   Q is an odd poly of degree 10.
- *						 -57.90
- *			| R - (erf(x)-x)/x | <= 2
- *	
- *
- *	   Remark. The formula is derived by noting
- *          erf(x) = (2/sqrt(pi))*(x - x^3/3 + x^5/10 - x^7/42 + ....)
- *	   and that
- *          2/sqrt(pi) = 1.128379167095512573896158903121545171688
- *	   is close to one. The interval is chosen because the fix
- *	   point of erf(x) is near 0.6174 (i.e., erf(x)=x when x is
- *	   near 0.6174), and by some experiment, 0.84375 is chosen to
- * 	   guarantee the error is less than one ulp for erf.
- *
- *      2. For |x| in [0.84375,1.25], let s = |x| - 1, and
- *         c = 0.84506291151 rounded to single (24 bits)
- *         	erf(x)  = sign(x) * (c  + P1(s)/Q1(s))
- *         	erfc(x) = (1-c)  - P1(s)/Q1(s) if x > 0
- *			  1+(c+P1(s)/Q1(s))    if x < 0
- *         	|P1/Q1 - (erf(|x|)-c)| <= 2**-59.06
- *	   Remark: here we use the taylor series expansion at x=1.
- *		erf(1+s) = erf(1) + s*Poly(s)
- *			 = 0.845.. + P1(s)/Q1(s)
- *	   That is, we use rational approximation to approximate
- *			erf(1+s) - (c = (single)0.84506291151)
- *	   Note that |P1/Q1|< 0.078 for x in [0.84375,1.25]
- *	   where 
- *		P1(s) = degree 6 poly in s
- *		Q1(s) = degree 6 poly in s
- *
- *      3. For x in [1.25,1/0.35(~2.857143)], 
- *         	erfc(x) = (1/x)*exp(-x*x-0.5625+R1/S1)
- *         	erf(x)  = 1 - erfc(x)
- *	   where 
- *		R1(z) = degree 7 poly in z, (z=1/x^2)
- *		S1(z) = degree 8 poly in z
- *
- *      4. For x in [1/0.35,28]
- *         	erfc(x) = (1/x)*exp(-x*x-0.5625+R2/S2) if x > 0
- *			= 2.0 - (1/x)*exp(-x*x-0.5625+R2/S2) if -6<x<0
- *			= 2.0 - tiny		(if x <= -6)
- *         	erf(x)  = sign(x)*(1.0 - erfc(x)) if x < 6, else
- *         	erf(x)  = sign(x)*(1.0 - tiny)
- *	   where
- *		R2(z) = degree 6 poly in z, (z=1/x^2)
- *		S2(z) = degree 7 poly in z
- *
- *      Note1:
- *	   To compute exp(-x*x-0.5625+R/S), let s be a single
- *	   precision number and s := x; then
- *		-x*x = -s*s + (s-x)*(s+x)
- *	        exp(-x*x-0.5626+R/S) = 
- *			exp(-s*s-0.5625)*exp((s-x)*(s+x)+R/S);
- *      Note2:
- *	   Here 4 and 5 make use of the asymptotic series
- *			  exp(-x*x)
- *		erfc(x) ~ ---------- * ( 1 + Poly(1/x^2) )
- *			  x*sqrt(pi)
- *	   We use rational approximation to approximate
- *      	g(s)=f(1/x^2) = log(erfc(x)*x) - x*x + 0.5625
- *	   Here is the error bound for R1/S1 and R2/S2
- *      	|R1/S1 - f(x)|  < 2**(-62.57)
- *      	|R2/S2 - f(x)|  < 2**(-61.52)
- *
- *      5. For inf > x >= 28
- *         	erf(x)  = sign(x) *(1 - tiny)  (raise inexact)
- *         	erfc(x) = tiny*tiny (raise underflow) if x > 0
- *			= 2 - tiny if x<0
- *
- *      7. Special case:
- *         	erf(0)  = 0, erf(inf)  = 1, erf(-inf) = -1,
- *         	erfc(0) = 1, erfc(inf) = 0, erfc(-inf) = 2, 
- *	   	erfc/erf(NaN) is NaN
- */
-
-
-/* #include "fdlibm.h" */
-
-#include <math.h>
-#include <stdint.h>
-#include <errno.h>
-
-#define __ieee754_exp exp
-
-typedef union 
-{
-  double value;
-  struct 
-  {
-    uint32_t lsw;
-    uint32_t msw;
-  } parts;
-} ieee_double_shape_type;
-
-
-static inline int __get_hi_word(const double x)
-{
-  ieee_double_shape_type u;
-  u.value = x;
-  return u.parts.msw;
-}
-
-static inline void __trunc_lo_word(double *x)
-{
-  ieee_double_shape_type u;
-  u.value = *x;
-  u.parts.lsw = 0;
-  *x = u.value;
-}
-
-
-#ifdef __STDC__
-static const double
-#else
-static double
-#endif
-tiny	    = 1e-300,
-half=  5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-two =  2.00000000000000000000e+00, /* 0x40000000, 0x00000000 */
-	/* c = (float)0.84506291151 */
-erx =  8.45062911510467529297e-01, /* 0x3FEB0AC1, 0x60000000 */
-/*
- * Coefficients for approximation to  erf on [0,0.84375]
- */
-efx =  1.28379167095512586316e-01, /* 0x3FC06EBA, 0x8214DB69 */
-efx8=  1.02703333676410069053e+00, /* 0x3FF06EBA, 0x8214DB69 */
-pp0  =  1.28379167095512558561e-01, /* 0x3FC06EBA, 0x8214DB68 */
-pp1  = -3.25042107247001499370e-01, /* 0xBFD4CD7D, 0x691CB913 */
-pp2  = -2.84817495755985104766e-02, /* 0xBF9D2A51, 0xDBD7194F */
-pp3  = -5.77027029648944159157e-03, /* 0xBF77A291, 0x236668E4 */
-pp4  = -2.37630166566501626084e-05, /* 0xBEF8EAD6, 0x120016AC */
-qq1  =  3.97917223959155352819e-01, /* 0x3FD97779, 0xCDDADC09 */
-qq2  =  6.50222499887672944485e-02, /* 0x3FB0A54C, 0x5536CEBA */
-qq3  =  5.08130628187576562776e-03, /* 0x3F74D022, 0xC4D36B0F */
-qq4  =  1.32494738004321644526e-04, /* 0x3F215DC9, 0x221C1A10 */
-qq5  = -3.96022827877536812320e-06, /* 0xBED09C43, 0x42A26120 */
-/*
- * Coefficients for approximation to  erf  in [0.84375,1.25] 
- */
-pa0  = -2.36211856075265944077e-03, /* 0xBF6359B8, 0xBEF77538 */
-pa1  =  4.14856118683748331666e-01, /* 0x3FDA8D00, 0xAD92B34D */
-pa2  = -3.72207876035701323847e-01, /* 0xBFD7D240, 0xFBB8C3F1 */
-pa3  =  3.18346619901161753674e-01, /* 0x3FD45FCA, 0x805120E4 */
-pa4  = -1.10894694282396677476e-01, /* 0xBFBC6398, 0x3D3E28EC */
-pa5  =  3.54783043256182359371e-02, /* 0x3FA22A36, 0x599795EB */
-pa6  = -2.16637559486879084300e-03, /* 0xBF61BF38, 0x0A96073F */
-qa1  =  1.06420880400844228286e-01, /* 0x3FBB3E66, 0x18EEE323 */
-qa2  =  5.40397917702171048937e-01, /* 0x3FE14AF0, 0x92EB6F33 */
-qa3  =  7.18286544141962662868e-02, /* 0x3FB2635C, 0xD99FE9A7 */
-qa4  =  1.26171219808761642112e-01, /* 0x3FC02660, 0xE763351F */
-qa5  =  1.36370839120290507362e-02, /* 0x3F8BEDC2, 0x6B51DD1C */
-qa6  =  1.19844998467991074170e-02, /* 0x3F888B54, 0x5735151D */
-/*
- * Coefficients for approximation to  erfc in [1.25,1/0.35]
- */
-ra0  = -9.86494403484714822705e-03, /* 0xBF843412, 0x600D6435 */
-ra1  = -6.93858572707181764372e-01, /* 0xBFE63416, 0xE4BA7360 */
-ra2  = -1.05586262253232909814e+01, /* 0xC0251E04, 0x41B0E726 */
-ra3  = -6.23753324503260060396e+01, /* 0xC04F300A, 0xE4CBA38D */
-ra4  = -1.62396669462573470355e+02, /* 0xC0644CB1, 0x84282266 */
-ra5  = -1.84605092906711035994e+02, /* 0xC067135C, 0xEBCCABB2 */
-ra6  = -8.12874355063065934246e+01, /* 0xC0545265, 0x57E4D2F2 */
-ra7  = -9.81432934416914548592e+00, /* 0xC023A0EF, 0xC69AC25C */
-sa1  =  1.96512716674392571292e+01, /* 0x4033A6B9, 0xBD707687 */
-sa2  =  1.37657754143519042600e+02, /* 0x4061350C, 0x526AE721 */
-sa3  =  4.34565877475229228821e+02, /* 0x407B290D, 0xD58A1A71 */
-sa4  =  6.45387271733267880336e+02, /* 0x40842B19, 0x21EC2868 */
-sa5  =  4.29008140027567833386e+02, /* 0x407AD021, 0x57700314 */
-sa6  =  1.08635005541779435134e+02, /* 0x405B28A3, 0xEE48AE2C */
-sa7  =  6.57024977031928170135e+00, /* 0x401A47EF, 0x8E484A93 */
-sa8  = -6.04244152148580987438e-02, /* 0xBFAEEFF2, 0xEE749A62 */
-/*
- * Coefficients for approximation to  erfc in [1/.35,28]
- */
-rb0  = -9.86494292470009928597e-03, /* 0xBF843412, 0x39E86F4A */
-rb1  = -7.99283237680523006574e-01, /* 0xBFE993BA, 0x70C285DE */
-rb2  = -1.77579549177547519889e+01, /* 0xC031C209, 0x555F995A */
-rb3  = -1.60636384855821916062e+02, /* 0xC064145D, 0x43C5ED98 */
-rb4  = -6.37566443368389627722e+02, /* 0xC083EC88, 0x1375F228 */
-rb5  = -1.02509513161107724954e+03, /* 0xC0900461, 0x6A2E5992 */
-rb6  = -4.83519191608651397019e+02, /* 0xC07E384E, 0x9BDC383F */
-sb1  =  3.03380607434824582924e+01, /* 0x403E568B, 0x261D5190 */
-sb2  =  3.25792512996573918826e+02, /* 0x40745CAE, 0x221B9F0A */
-sb3  =  1.53672958608443695994e+03, /* 0x409802EB, 0x189D5118 */
-sb4  =  3.19985821950859553908e+03, /* 0x40A8FFB7, 0x688C246A */
-sb5  =  2.55305040643316442583e+03, /* 0x40A3F219, 0xCEDF3BE6 */
-sb6  =  4.74528541206955367215e+02, /* 0x407DA874, 0xE79FE763 */
-sb7  = -2.24409524465858183362e+01; /* 0xC03670E2, 0x42712D62 */
-
-#ifdef __STDC__
-	double erf(double x) 
-#else
-	double erf(x) 
-	double x;
-#endif
-{
-	int hx,ix,i;
-	double R,S,P,Q,s,y,z,r;
-	hx = __get_hi_word(x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) {		/* erf(nan)=nan */
-	    i = ((unsigned)hx>>31)<<1;
-	    return (double)(1-i)+one/x;	/* erf(+-inf)=+-1 */
-	}
-
-	if(ix < 0x3feb0000) {		/* |x|<0.84375 */
-	    if(ix < 0x3e300000) { 	/* |x|<2**-28 */
-	        if (ix < 0x00800000) 
-		    return 0.125*(8.0*x+efx8*x);  /*avoid underflow */
-		return x + efx*x;
-	    }
-	    z = x*x;
-	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*pp4)));
-	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*qq5))));
-	    y = r/s;
-	    return x + x*y;
-	}
-	if(ix < 0x3ff40000) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fabs(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if(hx>=0) return erx + P/Q; else return -erx - P/Q;
-	}
-	if (ix >= 0x40180000) {		/* inf>|x|>=6 */
-	    if(hx>=0) return one-tiny; else return tiny-one;
-	}
-	x = fabs(x);
- 	s = one/(x*x);
-	if(ix< 0x4006DB6E) {	/* |x| < 1/0.35 */
-	    R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(
-				ra5+s*(ra6+s*ra7))))));
-	    S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(
-				sa5+s*(sa6+s*(sa7+s*sa8)))))));
-	} else {	/* |x| >= 1/0.35 */
-	    R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(
-				rb5+s*rb6)))));
-	    S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(
-				sb5+s*(sb6+s*sb7))))));
-	}
-	z  = x;  
-	__trunc_lo_word(&z);
-	r  =  __ieee754_exp(-z*z-0.5625)*__ieee754_exp((z-x)*(z+x)+R/S);
-	if(hx>=0) return one-r/x; else return  r/x-one;
-}
-
-#ifdef __STDC__
-	double erfc(double x) 
-#else
-	double erfc(x) 
-	double x;
-#endif
-{
-	int hx,ix;
-	double R,S,P,Q,s,y,z,r;
-	hx = __get_hi_word(x);
-	ix = hx&0x7fffffff;
-	if(ix>=0x7ff00000) {			/* erfc(nan)=nan */
-						/* erfc(+-inf)=0,2 */
-	    return (double)(((unsigned)hx>>31)<<1)+one/x;
-	}
-
-	if(ix < 0x3feb0000) {		/* |x|<0.84375 */
-	    if(ix < 0x3c700000)  	/* |x|<2**-56 */
-		return one-x;
-	    z = x*x;
-	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*pp4)));
-	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*qq5))));
-	    y = r/s;
-	    if(hx < 0x3fd00000) {  	/* x<1/4 */
-		return one-(x+x*y);
-	    } else {
-		r = x*y;
-		r += (x-half);
-	        return half - r ;
-	    }
-	}
-	if(ix < 0x3ff40000) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fabs(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if(hx>=0) {
-	        z  = one-erx; return z - P/Q; 
-	    } else {
-		z = erx+P/Q; return one+z;
-	    }
-	}
-	if (ix < 0x403c0000) {		/* |x|<28 */
-	    x = fabs(x);
- 	    s = one/(x*x);
-	    if(ix< 0x4006DB6D) {	/* |x| < 1/.35 ~ 2.857143*/
-	        R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(
-				ra5+s*(ra6+s*ra7))))));
-	        S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(
-				sa5+s*(sa6+s*(sa7+s*sa8)))))));
-	    } else {			/* |x| >= 1/.35 ~ 2.857143 */
-		if(hx<0&&ix>=0x40180000) return two-tiny;/* x < -6 */
-	        R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(
-				rb5+s*rb6)))));
-	        S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(
-				sb5+s*(sb6+s*sb7))))));
-	    }
-	    z  = x;
-	    __trunc_lo_word(&z);
-	    r  =  __ieee754_exp(-z*z-0.5625)*
-			__ieee754_exp((z-x)*(z+x)+R/S);
-	    if(hx>0) return r/x; else return two-r/x;
-	} else {
-	    /* set range error */
-            errno = ERANGE;
-	    if(hx>0) return tiny*tiny; else return two-tiny;
-	}
-}
diff --git a/winsup/mingw/mingwex/math/scalbn.S b/winsup/mingw/mingwex/math/scalbn.S
deleted file mode 100644
index 76e2d396e..000000000
--- a/winsup/mingw/mingwex/math/scalbn.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-	.file	"scalbn.S"
-	.text
-	.align 4
-.globl _scalbn
-	.def	_scalbn;	.scl	2;	.type	32;	.endef
-_scalbn:
-	fildl	12(%esp)
-	fldl	4(%esp)
-	fscale
-	fstp	%st(1)
-	ret
-
-.globl _scalbln
-	.set	_scalbln,_scalbn
diff --git a/winsup/mingw/mingwex/math/scalbnf.S b/winsup/mingw/mingwex/math/scalbnf.S
deleted file mode 100644
index 1fe42a3de..000000000
--- a/winsup/mingw/mingwex/math/scalbnf.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-	.file	"scalbnf.S"
-	.text
-	.align 4
-.globl _scalbnf
-	.def	_scalbnf;	.scl	2;	.type	32;	.endef
-_scalbnf:
-	fildl	8(%esp)
-	flds	4(%esp)
-	fscale
-	fstp	%st(1)
-	ret
-
-.globl _scalblnf
-	.set	_scalblnf,_scalbnf
diff --git a/winsup/mingw/mingwex/math/scalbnl.S b/winsup/mingw/mingwex/math/scalbnl.S
deleted file mode 100644
index 77eaff7be..000000000
--- a/winsup/mingw/mingwex/math/scalbnl.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Changes for long double by Ulrich Drepper <drepper@cygnus.com>
- * Public domain.
- */
-
-	.file	"scalbnl.S"
-	.text
-	.align 4
-.globl _scalbnl
-	.def	_scalbnl;	.scl	2;	.type	32;	.endef
-_scalbnl:
-	fildl	16(%esp)
-	fldt	4(%esp)
-	fscale
-	fstp	%st(1)
-	ret
-
-.globl _scalblnl
-	.set	_scalblnl,_scalbnl
diff --git a/winsup/mingw/mingwex/math/sf_erf.c b/winsup/mingw/mingwex/math/sf_erf.c
deleted file mode 100644
index 1fca80e94..000000000
--- a/winsup/mingw/mingwex/math/sf_erf.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/* sf_erf.c -- float version of s_erf.c.
- * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
- * is preserved.
- * ====================================================
- */
-
-/*
-#include "fdlibm.h"
-*/
-#include <math.h>
-#include <stdint.h>
-#include <errno.h>
-
-#define __ieee754_expf expf
-
-
-
-typedef union
-{
-  float value;
-  uint32_t word;
-} ieee_float_shape_type;
-
-/* Get a 32 bit int from a float.  */
-
-static inline int
-__get_float_word(float d)
-{
-  ieee_float_shape_type u;
-  u.value = d;
-  return u.word;
-}
-
-/* Set a float from a 32 bit int.  */
-
-#define SET_FLOAT_WORD(d,i)					\
-do {								\
-  ieee_float_shape_type sf_u;					\
-  sf_u.word = (i);						\
-  (d) = sf_u.value;						\
-} while (0)
-
-static inline void __trunc_float_word(float * x)
-{
-  ieee_float_shape_type u;
-  u.value = * x;	  
-  u.word &= 0xfffff000;
-}
-
-#ifdef __v810__
-#define const
-#endif
-
-#ifdef __STDC__
-static const float
-#else
-static float
-#endif
-tiny	    = 1e-30,
-half=  5.0000000000e-01, /* 0x3F000000 */
-one =  1.0000000000e+00, /* 0x3F800000 */
-two =  2.0000000000e+00, /* 0x40000000 */
-	/* c = (subfloat)0.84506291151 */
-erx =  8.4506291151e-01, /* 0x3f58560b */
-/*
- * Coefficients for approximation to  erf on [0,0.84375]
- */
-efx =  1.2837916613e-01, /* 0x3e0375d4 */
-efx8=  1.0270333290e+00, /* 0x3f8375d4 */
-pp0  =  1.2837916613e-01, /* 0x3e0375d4 */
-pp1  = -3.2504209876e-01, /* 0xbea66beb */
-pp2  = -2.8481749818e-02, /* 0xbce9528f */
-pp3  = -5.7702702470e-03, /* 0xbbbd1489 */
-pp4  = -2.3763017452e-05, /* 0xb7c756b1 */
-qq1  =  3.9791721106e-01, /* 0x3ecbbbce */
-qq2  =  6.5022252500e-02, /* 0x3d852a63 */
-qq3  =  5.0813062117e-03, /* 0x3ba68116 */
-qq4  =  1.3249473704e-04, /* 0x390aee49 */
-qq5  = -3.9602282413e-06, /* 0xb684e21a */
-/*
- * Coefficients for approximation to  erf  in [0.84375,1.25] 
- */
-pa0  = -2.3621185683e-03, /* 0xbb1acdc6 */
-pa1  =  4.1485610604e-01, /* 0x3ed46805 */
-pa2  = -3.7220788002e-01, /* 0xbebe9208 */
-pa3  =  3.1834661961e-01, /* 0x3ea2fe54 */
-pa4  = -1.1089469492e-01, /* 0xbde31cc2 */
-pa5  =  3.5478305072e-02, /* 0x3d1151b3 */
-pa6  = -2.1663755178e-03, /* 0xbb0df9c0 */
-qa1  =  1.0642088205e-01, /* 0x3dd9f331 */
-qa2  =  5.4039794207e-01, /* 0x3f0a5785 */
-qa3  =  7.1828655899e-02, /* 0x3d931ae7 */
-qa4  =  1.2617121637e-01, /* 0x3e013307 */
-qa5  =  1.3637083583e-02, /* 0x3c5f6e13 */
-qa6  =  1.1984500103e-02, /* 0x3c445aa3 */
-/*
- * Coefficients for approximation to  erfc in [1.25,1/0.35]
- */
-ra0  = -9.8649440333e-03, /* 0xbc21a093 */
-ra1  = -6.9385856390e-01, /* 0xbf31a0b7 */
-ra2  = -1.0558626175e+01, /* 0xc128f022 */
-ra3  = -6.2375331879e+01, /* 0xc2798057 */
-ra4  = -1.6239666748e+02, /* 0xc322658c */
-ra5  = -1.8460508728e+02, /* 0xc3389ae7 */
-ra6  = -8.1287437439e+01, /* 0xc2a2932b */
-ra7  = -9.8143291473e+00, /* 0xc11d077e */
-sa1  =  1.9651271820e+01, /* 0x419d35ce */
-sa2  =  1.3765776062e+02, /* 0x4309a863 */
-sa3  =  4.3456588745e+02, /* 0x43d9486f */
-sa4  =  6.4538726807e+02, /* 0x442158c9 */
-sa5  =  4.2900814819e+02, /* 0x43d6810b */
-sa6  =  1.0863500214e+02, /* 0x42d9451f */
-sa7  =  6.5702495575e+00, /* 0x40d23f7c */
-sa8  = -6.0424413532e-02, /* 0xbd777f97 */
-/*
- * Coefficients for approximation to  erfc in [1/.35,28]
- */
-rb0  = -9.8649431020e-03, /* 0xbc21a092 */
-rb1  = -7.9928326607e-01, /* 0xbf4c9dd4 */
-rb2  = -1.7757955551e+01, /* 0xc18e104b */
-rb3  = -1.6063638306e+02, /* 0xc320a2ea */
-rb4  = -6.3756646729e+02, /* 0xc41f6441 */
-rb5  = -1.0250950928e+03, /* 0xc480230b */
-rb6  = -4.8351919556e+02, /* 0xc3f1c275 */
-sb1  =  3.0338060379e+01, /* 0x41f2b459 */
-sb2  =  3.2579251099e+02, /* 0x43a2e571 */
-sb3  =  1.5367296143e+03, /* 0x44c01759 */
-sb4  =  3.1998581543e+03, /* 0x4547fdbb */
-sb5  =  2.5530502930e+03, /* 0x451f90ce */
-sb6  =  4.7452853394e+02, /* 0x43ed43a7 */
-sb7  = -2.2440952301e+01; /* 0xc1b38712 */
-
-#ifdef __STDC__
-	float erff(float x) 
-#else
-	float erff(x) 
-	float x;
-#endif
-{
-	int32_t hx,ix,i;
-	float R,S,P,Q,s,y,z,r;
-	hx = __get_float_word(x);
-	ix = hx&0x7fffffff;
-	if(!(ix<0x7f800000L)) {		/* erf(nan)=nan */
-	    i = ((uint32_t)hx>>31)<<1;
-	    return (float)(1-i)+one/x;	/* erf(+-inf)=+-1 */
-	}
-
-	if(ix < 0x3f580000) {		/* |x|<0.84375 */
-	    if(ix < 0x31800000) { 	/* |x|<2**-28 */
-	        if (ix < 0x04000000) 
-		    /*avoid underflow */
-		    return (float)0.125*((float)8.0*x+efx8*x);
-		return x + efx*x;
-	    }
-	    z = x*x;
-	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*pp4)));
-	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*qq5))));
-	    y = r/s;
-	    return x + x*y;
-	}
-	if(ix < 0x3fa00000) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fabsf(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if(hx>=0) return erx + P/Q; else return -erx - P/Q;
-	}
-	if (ix >= 0x40c00000) {		/* inf>|x|>=6 */
-	    if(hx>=0) return one-tiny; else return tiny-one;
-	}
-	x = fabsf(x);
- 	s = one/(x*x);
-	if(ix< 0x4036DB6E) {	/* |x| < 1/0.35 */
-	    R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(
-				ra5+s*(ra6+s*ra7))))));
-	    S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(
-				sa5+s*(sa6+s*(sa7+s*sa8)))))));
-	} else {	/* |x| >= 1/0.35 */
-	    R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(
-				rb5+s*rb6)))));
-	    S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(
-				sb5+s*(sb6+s*sb7))))));
-	}
-	__trunc_float_word (&z);
-	r  =  __ieee754_expf(-z*z-(float)0.5625)*__ieee754_expf((z-x)*(z+x)+R/S);
-	if(hx>=0) return one-r/x; else return  r/x-one;
-}
-
-#ifdef __STDC__
-	float erfcf(float x) 
-#else
-	float erfcf(x) 
-	float x;
-#endif
-{
-	int32_t hx,ix;
-	float R,S,P,Q,s,y,z,r;
-	hx = __get_float_word(x);
-	ix = hx&0x7fffffff;
-	if(!(ix<0x7f800000L)) {			/* erfc(nan)=nan */
-						/* erfc(+-inf)=0,2 */
-	    return (float)(((uint32_t)hx>>31)<<1)+one/x;
-	}
-
-	if(ix < 0x3f580000) {		/* |x|<0.84375 */
-	    if(ix < 0x23800000)  	/* |x|<2**-56 */
-		return one-x;
-	    z = x*x;
-	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*pp4)));
-	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*qq5))));
-	    y = r/s;
-	    if(hx < 0x3e800000) {  	/* x<1/4 */
-		return one-(x+x*y);
-	    } else {
-		r = x*y;
-		r += (x-half);
-	        return half - r ;
-	    }
-	}
-	if(ix < 0x3fa00000) {		/* 0.84375 <= |x| < 1.25 */
-	    s = fabsf(x)-one;
-	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*pa6)))));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*qa6)))));
-	    if(hx>=0) {
-	        z  = one-erx; return z - P/Q; 
-	    } else {
-		z = erx+P/Q; return one+z;
-	    }
-	}
-
-	if (ix < 0x41e00000) {		/* |x|<28 */
-	    x = fabsf(x);
- 	    s = one/(x*x);
-	    if(ix< 0x4036DB6D) {	/* |x| < 1/.35 ~ 2.857143*/
-	        R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(
-				ra5+s*(ra6+s*ra7))))));
-	        S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(
-				sa5+s*(sa6+s*(sa7+s*sa8)))))));
-	    } else {			/* |x| >= 1/.35 ~ 2.857143 */
-		if(hx<0&&ix>=0x40c00000) return two-tiny;/* x < -6 */
-	        R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(
-				rb5+s*rb6)))));
-	        S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(
-				sb5+s*(sb6+s*sb7))))));
-	    }
-	    __trunc_float_word (&z);
-	    r  =  __ieee754_expf(-z*z-(float)0.5625)*
-			__ieee754_expf((z-x)*(z+x)+R/S);
-	    if(hx>0) return r/x; else return two-r/x;
-	} else {
-	    /* set range error */
-            errno = ERANGE;
-	    if(hx>0) return tiny*tiny; else return two-tiny;
-	}
-}
diff --git a/winsup/mingw/mingwex/math/signbit.c b/winsup/mingw/mingwex/math/signbit.c
deleted file mode 100644
index 7f86c86a3..000000000
--- a/winsup/mingw/mingwex/math/signbit.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#define __FP_SIGNBIT  0x0200
-
-int __signbit (double x) {
-  unsigned short sw;
-  __asm__ ("fxam; fstsw %%ax;"
-	   : "=a" (sw)
-	   : "t" (x) );
-  return sw & __FP_SIGNBIT;
-}
-
-#undef signbit
-int __attribute__ ((alias ("__signbit"))) signbit (double);
-
diff --git a/winsup/mingw/mingwex/math/signbitf.c b/winsup/mingw/mingwex/math/signbitf.c
deleted file mode 100644
index 5bbf675ad..000000000
--- a/winsup/mingw/mingwex/math/signbitf.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define __FP_SIGNBIT  0x0200
-
-int __signbitf (float x) {
-  unsigned short sw;
-  __asm__ ("fxam; fstsw %%ax;"
-	   : "=a" (sw)
-	   : "t" (x) );
-  return sw & __FP_SIGNBIT;
-}
-int __attribute__ ((alias ("__signbitf"))) signbitf (float);
diff --git a/winsup/mingw/mingwex/math/signbitl.c b/winsup/mingw/mingwex/math/signbitl.c
deleted file mode 100644
index 78f990350..000000000
--- a/winsup/mingw/mingwex/math/signbitl.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#define __FP_SIGNBIT  0x0200
-
-int __signbitl (long double x) {
-  unsigned short sw;
-  __asm__ ("fxam; fstsw %%ax;"
-	   : "=a" (sw)
-	   : "t" (x) );
-  return sw & __FP_SIGNBIT;
-}
-
-int __attribute__ ((alias ("__signbitl"))) signbitl (long double);
diff --git a/winsup/mingw/mingwex/math/sinf.S b/winsup/mingw/mingwex/math/sinf.S
deleted file mode 100644
index 23e986d11..000000000
--- a/winsup/mingw/mingwex/math/sinf.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- * 
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"sinf.S"
-	.text
-	.align 4
-.globl _sinf
-	.def	_sinf;	.scl	2;	.type	32;	.endef
-_sinf:
-	flds	4(%esp)
-	fsin
-	fnstsw	%ax
-	testl	$0x400,%eax
-	jnz	1f
-	ret
-1:	fldpi
-	fadd	%st(0)
-	fxch	%st(1)
-2:	fprem1
-	fnstsw	%ax
-	testl	$0x400,%eax
-	jnz	2b
-	fstp	%st(1)
-	fsin
-	ret
diff --git a/winsup/mingw/mingwex/math/sinhf.c b/winsup/mingw/mingwex/math/sinhf.c
deleted file mode 100644
index 3d6bcff41..000000000
--- a/winsup/mingw/mingwex/math/sinhf.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <math.h>
-float sinhf (float x)
-  {return (float) sinh (x);}
diff --git a/winsup/mingw/mingwex/math/sinhl.c b/winsup/mingw/mingwex/math/sinhl.c
deleted file mode 100644
index ca6a370b9..000000000
--- a/winsup/mingw/mingwex/math/sinhl.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*							sinhl.c
- *
- *	Hyperbolic sine, long double precision
- *
- *
- *
- * SYNOPSIS:
- *
- * long double x, y, sinhl();
- *
- * y = sinhl( x );
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns hyperbolic sine of argument in the range MINLOGL to
- * MAXLOGL.
- *
- * The range is partitioned into two segments.  If |x| <= 1, a
- * rational function of the form x + x**3 P(x)/Q(x) is employed.
- * Otherwise the calculation is sinh(x) = ( exp(x) - exp(-x) )/2.
- *
- *
- *
- * ACCURACY:
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *    IEEE       -2,2       10000       1.5e-19     3.9e-20
- *    IEEE     +-10000      30000       1.1e-19     2.8e-20
- *
- */
-
-/*
-Cephes Math Library Release 2.7:  January, 1998
-Copyright 1984, 1991, 1998 by Stephen L. Moshier
-*/
-
-/*
-Modified for mingw
-2002-07-22 Danny Smith <dannysmith@users.sourceforge.net>
-*/
-
-#ifdef __MINGW32__
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-#endif
-
-#ifndef _SET_ERRNO
-#define _SET_ERRNO(x)
-#endif
-
-#ifdef UNK
-static long double P[] = {
- 1.7550769032975377032681E-6L,
- 4.1680702175874268714539E-4L,
- 3.0993532520425419002409E-2L,
- 9.9999999999999999998002E-1L,
-};
-static long double Q[] = {
- 1.7453965448620151484660E-8L,
--5.9116673682651952419571E-6L,
- 1.0599252315677389339530E-3L,
--1.1403880487744749056675E-1L,
- 6.0000000000000000000200E0L,
-};
-#endif
-
-#ifdef IBMPC
-static const unsigned short P[] = {
-0xec6a,0xd942,0xfbb3,0xeb8f,0x3feb, XPD
-0x365e,0xb30a,0xe437,0xda86,0x3ff3, XPD
-0x8890,0x01f6,0x2612,0xfde6,0x3ff9, XPD
-0x0000,0x0000,0x0000,0x8000,0x3fff, XPD
-};
-static const unsigned short Q[] = {
-0x4edd,0x4c21,0xad09,0x95ed,0x3fe5, XPD
-0x4376,0x9b70,0xd605,0xc65c,0xbfed, XPD
-0xc8ad,0x5d21,0x3069,0x8aed,0x3ff5, XPD
-0x9c32,0x6374,0x2d4b,0xe98d,0xbffb, XPD
-0x0000,0x0000,0x0000,0xc000,0x4001, XPD
-};
-#endif
-
-#ifdef MIEEE
-static long P[] = {
-0x3feb0000,0xeb8ffbb3,0xd942ec6a,
-0x3ff30000,0xda86e437,0xb30a365e,
-0x3ff90000,0xfde62612,0x01f68890,
-0x3fff0000,0x80000000,0x00000000,
-};
-static long Q[] = {
-0x3fe50000,0x95edad09,0x4c214edd,
-0xbfed0000,0xc65cd605,0x9b704376,
-0x3ff50000,0x8aed3069,0x5d21c8ad,
-0xbffb0000,0xe98d2d4b,0x63749c32,
-0x40010000,0xc0000000,0x00000000,
-};
-#endif
-
-#ifndef __MINGW32__
-extern long double MAXNUML, MAXLOGL, MINLOGL, LOGE2L;
-#ifdef ANSIPROT
-extern long double fabsl ( long double );
-extern long double expl ( long double );
-extern long double polevll ( long double, void *, int );
-extern long double p1evll ( long double, void *, int );
-#else
-long double fabsl(), expl(), polevll(), p1evll();
-#endif
-#ifdef INFINITIES
-extern long double INFINITYL;
-#endif
-#ifdef NANS
-extern long double NANL;
-#endif
-#endif /* __MINGW32__ */
-
-long double sinhl(x)
-long double x;
-{
-long double a;
-
-#ifdef MINUSZERO
-if( x == 0.0 )
-	return(x);
-#endif
-#ifdef NANS
-if (isnanl(x))
-	{
-	_SET_ERRNO(EDOM);
-	}
-#endif
-a = fabsl(x);
-if( (x > (MAXLOGL + LOGE2L)) || (x > -(MINLOGL-LOGE2L) ) )
-	{
-	mtherr( "sinhl", DOMAIN );
-	_SET_ERRNO(ERANGE);
-#ifdef INFINITIES
-	if( x > 0.0L )
-		return( INFINITYL );
-	else
-		return( -INFINITYL );
-#else
-	if( x > 0.0L )
-		return( MAXNUML );
-	else
-		return( -MAXNUML );
-#endif
-	}
-if( a > 1.0L )
-	{
-	if( a >= (MAXLOGL - LOGE2L) )
-		{
-		a = expl(0.5L*a);
-		a = (0.5L * a) * a;
-		if( x < 0.0L )
-			a = -a;
-		return(a);
-		}
-	a = expl(a);
-	a = 0.5L*a - (0.5L/a);
-	if( x < 0.0L )
-		a = -a;
-	return(a);
-	}
-
-a *= a;
-return( x + x * a * (polevll(a,P,3)/polevll(a,Q,4)) );
-}
diff --git a/winsup/mingw/mingwex/math/sinl.S b/winsup/mingw/mingwex/math/sinl.S
deleted file mode 100644
index 16b2d9e50..000000000
--- a/winsup/mingw/mingwex/math/sinl.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- * 
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-	.file	"sinl.S"
-	.text
-	.align 4
-.globl _sinl
-	.def	_sinl;	.scl	2;	.type	32;	.endef
-_sinl:
-	fldt	4(%esp)
-	fsin
-	fnstsw	%ax
-	testl	$0x400,%eax
-	jnz	1f
-	ret
-1:	fldpi
-	fadd	%st(0)
-	fxch	%st(1)
-2:	fprem1
-	fnstsw	%ax
-	testl	$0x400,%eax
-	jnz	2b
-	fstp	%st(1)
-	fsin
-	ret
diff --git a/winsup/mingw/mingwex/math/sqrtf.c b/winsup/mingw/mingwex/math/sqrtf.c
deleted file mode 100644
index b1029cad8..000000000
--- a/winsup/mingw/mingwex/math/sqrtf.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <math.h>
-#include <errno.h>
-
-extern float  __QNANF;
-
-float
-sqrtf (float x)
-{
-  if (x < 0.0F )
-    {
-      errno = EDOM;
-      return __QNANF;
-    }
-  else
-    {
-      float res;
-      asm ("fsqrt" : "=t" (res) : "0" (x));
-      return res;
-    }
-}
diff --git a/winsup/mingw/mingwex/math/sqrtl.c b/winsup/mingw/mingwex/math/sqrtl.c
deleted file mode 100644
index dba68d878..000000000
--- a/winsup/mingw/mingwex/math/sqrtl.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <math.h>
-#include <errno.h>
-
-extern long double  __QNANL;
-
-long double
-sqrtl (long double x)
-{
-  if (x < 0.0L )
-    {
-      errno = EDOM;
-      return __QNANL;
-    }
-  else
-    {
-      long double res;
-      asm ("fsqrt" : "=t" (res) : "0" (x));
-      return res;
-    }
-}
diff --git a/winsup/mingw/mingwex/math/tanf.S b/winsup/mingw/mingwex/math/tanf.S
deleted file mode 100644
index 540fc6836..000000000
--- a/winsup/mingw/mingwex/math/tanf.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- * 
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-	.file	"tanf.S"
-	.text
-	.align 4
-.globl _tanf
-	.def	_tanf;	.scl	2;	.type	32;	.endef
-_tanf:
-	flds	4(%esp)
-	fptan
-	fnstsw	%ax
-	testl	$0x400,%eax
-	jnz	1f
-	fstp	%st(0)
-	ret
-1:	fldpi
-	fadd	%st(0)
-	fxch	%st(1)
-2:	fprem1
-	fstsw	%ax
-	testl	$0x400,%eax
-	jnz	2b
-	fstp	%st(1)
-	fptan
-	fstp	%st(0)
-	ret
diff --git a/winsup/mingw/mingwex/math/tanhf.c b/winsup/mingw/mingwex/math/tanhf.c
deleted file mode 100644
index b7c56f05c..000000000
--- a/winsup/mingw/mingwex/math/tanhf.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <math.h>
-float tanhf (float x)
-  {return (float) tanh (x);}
diff --git a/winsup/mingw/mingwex/math/tanhl.c b/winsup/mingw/mingwex/math/tanhl.c
deleted file mode 100644
index d5d86d0ae..000000000
--- a/winsup/mingw/mingwex/math/tanhl.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*							tanhl.c
- *
- *	Hyperbolic tangent, long double precision
- *
- *
- *
- * SYNOPSIS:
- *
- * long double x, y, tanhl();
- *
- * y = tanhl( x );
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns hyperbolic tangent of argument in the range MINLOGL to
- * MAXLOGL.
- *
- * A rational function is used for |x| < 0.625.  The form
- * x + x**3 P(x)/Q(x) of Cody _& Waite is employed.
- * Otherwise,
- *    tanh(x) = sinh(x)/cosh(x) = 1  -  2/(exp(2x) + 1).
- *
- *
- *
- * ACCURACY:
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *    IEEE      -2,2        30000       1.3e-19     2.4e-20
- *
- */
-
-/*
-Cephes Math Library Release 2.7:  May, 1998
-Copyright 1984, 1987, 1989, 1998 by Stephen L. Moshier
-*/
-
-/*
-Modified for mingw
-2002-07-22 Danny Smith <dannysmith@users.sourceforge.net>
-*/
-
-#ifdef __MINGW32__
-#include "cephes_mconf.h"
-#else
-#include "mconf.h"
-#endif
-
-#ifndef _SET_ERRNO
-#define _SET_ERRNO(x)
-#endif
-
-#ifdef UNK
-static long double P[] = {
--6.8473739392677100872869E-5L,
--9.5658283111794641589011E-1L,
--8.4053568599672284488465E1L,
--1.3080425704712825945553E3L,
-};
-static long double Q[] = {
-/* 1.0000000000000000000000E0L,*/
- 9.6259501838840336946872E1L,
- 1.8218117903645559060232E3L,
- 3.9241277114138477845780E3L,
-};
-#endif
-
-#ifdef IBMPC
-static unsigned short P[] = {
-0xd2a4,0x1b0c,0x8f15,0x8f99,0xbff1, XPD
-0x5959,0x9111,0x9cc7,0xf4e2,0xbffe, XPD
-0xb576,0xef5e,0x6d57,0xa81b,0xc005, XPD
-0xe3be,0xbfbd,0x5cbc,0xa381,0xc009, XPD
-};
-static unsigned short Q[] = {
-/*0x0000,0x0000,0x0000,0x8000,0x3fff,*/
-0x687f,0xce24,0xdd6c,0xc084,0x4005, XPD
-0x3793,0xc95f,0xfa2f,0xe3b9,0x4009, XPD
-0xd5a2,0x1f9c,0x0b1b,0xf542,0x400a, XPD
-};
-#endif
-
-#ifdef MIEEE
-static long P[] = {
-0xbff10000,0x8f998f15,0x1b0cd2a4,
-0xbffe0000,0xf4e29cc7,0x91115959,
-0xc0050000,0xa81b6d57,0xef5eb576,
-0xc0090000,0xa3815cbc,0xbfbde3be,
-};
-static long Q[] = {
-/*0x3fff0000,0x80000000,0x00000000,*/
-0x40050000,0xc084dd6c,0xce24687f,
-0x40090000,0xe3b9fa2f,0xc95f3793,
-0x400a0000,0xf5420b1b,0x1f9cd5a2,
-};
-#endif
-
-#ifndef __MINGW32__
-extern long double MAXLOGL;
-#ifdef ANSIPROT
-extern long double fabsl ( long double );
-extern long double expl ( long double );
-extern long double polevll ( long double, void *, int );
-extern long double p1evll ( long double, void *, int );
-#else
-long double fabsl(), expl(), polevll(), p1evll();
-#endif
-#endif /* __MINGW32__ */
-
-long double tanhl(x)
-long double x;
-{
-long double s, z;
-
-#ifdef MINUSZERO
-if( x == 0.0L )
-	return(x);
-#endif
-if (isnanl(x))
-	{
-	_SET_ERRNO (EDOM);
-	return x;
-	}
-
-z = fabsl(x);
-if( z > 0.5L * MAXLOGL )
-	{
-	_SET_ERRNO (ERANGE);
-	if( x > 0 )
-		return( 1.0L );
-	else
-		return( -1.0L );
-	}
-if( z >= 0.625L )
-	{
-	s = expl(2.0*z);
-	z =  1.0L  - 2.0/(s + 1.0L);
-	if( x < 0 )
-		z = -z;
-	}
-else
-	{
-	s = x * x;
-	z = polevll( s, P, 3 )/p1evll(s, Q, 3);
-	z = x * s * z;
-	z = x + z;
-	}
-return( z );
-}
diff --git a/winsup/mingw/mingwex/math/tanl.S b/winsup/mingw/mingwex/math/tanl.S
deleted file mode 100644
index fd30019a8..000000000
--- a/winsup/mingw/mingwex/math/tanl.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- *
- * Adapted for `long double' by Ulrich Drepper <drepper@cygnus.com>.
- * 
- * Removed header file dependency for use in libmingwex.a by
- *   Danny Smith <dannysmith@users.sourceforge.net>
- */
-	.file	"tanl.S"
-	.text
-	.align 4
-.globl _tanl
-	.def	_tanl;	.scl	2;	.type	32;	.endef
-_tanl:
-	fldt	4(%esp)
-	fptan
-	fnstsw	%ax
-	testl	$0x400,%eax
-	jnz	1f
-	fstp	%st(0)
-	ret
-1:	fldpi
-	fadd	%st(0)
-	fxch	%st(1)
-2:	fprem1
-	fstsw	%ax
-	testl	$0x400,%eax
-	jnz	2b
-	fstp	%st(1)
-	fptan
-	fstp	%st(0)
-	ret
diff --git a/winsup/mingw/mingwex/math/tgamma.c b/winsup/mingw/mingwex/math/tgamma.c
deleted file mode 100644
index d04a5f4a5..000000000
--- a/winsup/mingw/mingwex/math/tgamma.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/*							gamma.c
- *
- *	Gamma function
- *
- *
- *
- * SYNOPSIS:
- *
- * double x, y, __tgamma_r();
- * int* sgngam;
- * y = __tgamma_r( x, sgngam );
- * 
- * double x, y, tgamma();
- * y = tgamma( x)
- *
- *
- *
- * DESCRIPTION:
- *
- * Returns gamma function of the argument.  The result is
- * correctly signed. In the reentrant version the sign (+1 or -1)
- * is returned in the variable referenced by sgngam.
- *
- * Arguments |x| <= 34 are reduced by recurrence and the function
- * approximated by a rational function of degree 6/7 in the
- * interval (2,3).  Large arguments are handled by Stirling's
- * formula. Large negative arguments are made positive using
- * a reflection formula.  
- *
- *
- * ACCURACY:
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *    DEC      -34, 34      10000       1.3e-16     2.5e-17
- *    IEEE    -170,-33      20000       2.3e-15     3.3e-16
- *    IEEE     -33,  33     20000       9.4e-16     2.2e-16
- *    IEEE      33, 171.6   20000       2.3e-15     3.2e-16
- *
- * Error for arguments outside the test range will be larger
- * owing to error amplification by the exponential function.
- *
- */
-
-/*
-Cephes Math Library Release 2.8:  June, 2000
-Copyright 1984, 1987, 1989, 1992, 2000 by Stephen L. Moshier
-*/
-
-
-/*
- * 26-11-2002 Modified for mingw.
- * Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-
-#ifndef __MINGW32__
-#include "mconf.h"
-#else
-#include "cephes_mconf.h"
-#endif
-
-#ifdef UNK
-static const double P[] = {
-  1.60119522476751861407E-4,
-  1.19135147006586384913E-3,
-  1.04213797561761569935E-2,
-  4.76367800457137231464E-2,
-  2.07448227648435975150E-1,
-  4.94214826801497100753E-1,
-  9.99999999999999996796E-1
-};
-static const double Q[] = {
--2.31581873324120129819E-5,
- 5.39605580493303397842E-4,
--4.45641913851797240494E-3,
- 1.18139785222060435552E-2,
- 3.58236398605498653373E-2,
--2.34591795718243348568E-1,
- 7.14304917030273074085E-2,
- 1.00000000000000000320E0
-};
-#define MAXGAM 171.624376956302725
-static const double LOGPI = 1.14472988584940017414;
-#endif
-
-#ifdef DEC
-static const unsigned short P[] = {
-0035047,0162701,0146301,0005234,
-0035634,0023437,0032065,0176530,
-0036452,0137157,0047330,0122574,
-0037103,0017310,0143041,0017232,
-0037524,0066516,0162563,0164605,
-0037775,0004671,0146237,0014222,
-0040200,0000000,0000000,0000000
-};
-static const unsigned short Q[] = {
-0134302,0041724,0020006,0116565,
-0035415,0072121,0044251,0025634,
-0136222,0003447,0035205,0121114,
-0036501,0107552,0154335,0104271,
-0037022,0135717,0014776,0171471,
-0137560,0034324,0165024,0037021,
-0037222,0045046,0047151,0161213,
-0040200,0000000,0000000,0000000
-};
-#define MAXGAM 34.84425627277176174
-#endif
-
-#ifdef IBMPC
-static const unsigned short P[] = {
-0x2153,0x3998,0xfcb8,0x3f24,
-0xbfab,0xe686,0x84e3,0x3f53,
-0x14b0,0xe9db,0x57cd,0x3f85,
-0x23d3,0x18c4,0x63d9,0x3fa8,
-0x7d31,0xdcae,0x8da9,0x3fca,
-0xe312,0x3993,0xa137,0x3fdf,
-0x0000,0x0000,0x0000,0x3ff0
-};
-static const unsigned short Q[] = {
-0xd3af,0x8400,0x487a,0xbef8,
-0x2573,0x2915,0xae8a,0x3f41,
-0xb44a,0xe750,0x40e4,0xbf72,
-0xb117,0x5b1b,0x31ed,0x3f88,
-0xde67,0xe33f,0x5779,0x3fa2,
-0x87c2,0x9d42,0x071a,0xbfce,
-0x3c51,0xc9cd,0x4944,0x3fb2,
-0x0000,0x0000,0x0000,0x3ff0
-};
-#define MAXGAM 171.624376956302725
-#endif 
-
-#ifdef MIEEE
-static const unsigned short P[] = {
-0x3f24,0xfcb8,0x3998,0x2153,
-0x3f53,0x84e3,0xe686,0xbfab,
-0x3f85,0x57cd,0xe9db,0x14b0,
-0x3fa8,0x63d9,0x18c4,0x23d3,
-0x3fca,0x8da9,0xdcae,0x7d31,
-0x3fdf,0xa137,0x3993,0xe312,
-0x3ff0,0x0000,0x0000,0x0000
-};
-static const unsigned short Q[] = {
-0xbef8,0x487a,0x8400,0xd3af,
-0x3f41,0xae8a,0x2915,0x2573,
-0xbf72,0x40e4,0xe750,0xb44a,
-0x3f88,0x31ed,0x5b1b,0xb117,
-0x3fa2,0x5779,0xe33f,0xde67,
-0xbfce,0x071a,0x9d42,0x87c2,
-0x3fb2,0x4944,0xc9cd,0x3c51,
-0x3ff0,0x0000,0x0000,0x0000
-};
-#define MAXGAM 171.624376956302725
-#endif 
-
-/* Stirling's formula for the gamma function */
-#if UNK
-static const double STIR[5] = {
- 7.87311395793093628397E-4,
--2.29549961613378126380E-4,
--2.68132617805781232825E-3,
- 3.47222221605458667310E-3,
- 8.33333333333482257126E-2,
-};
-#define MAXSTIR 143.01608
-static const double SQTPI = 2.50662827463100050242E0;
-#endif
-#if DEC
-static const unsigned short STIR[20] = {
-0035516,0061622,0144553,0112224,
-0135160,0131531,0037460,0165740,
-0136057,0134460,0037242,0077270,
-0036143,0107070,0156306,0027751,
-0037252,0125252,0125252,0146064,
-};
-#define MAXSTIR 26.77
-static const unsigned short SQT[4] = {
-0040440,0066230,0177661,0034055,
-};
-#define SQTPI *(double *)SQT
-#endif
-#if IBMPC
-static const unsigned short STIR[20] = {
-0x7293,0x592d,0xcc72,0x3f49,
-0x1d7c,0x27e6,0x166b,0xbf2e,
-0x4fd7,0x07d4,0xf726,0xbf65,
-0xc5fd,0x1b98,0x71c7,0x3f6c,
-0x5986,0x5555,0x5555,0x3fb5,
-};
-#define MAXSTIR 143.01608
-static const unsigned short SQT[4] = {
-0x2706,0x1ff6,0x0d93,0x4004,
-};
-#define SQTPI *(double *)SQT
-#endif
-#if MIEEE
-static const unsigned short STIR[20] = {
-0x3f49,0xcc72,0x592d,0x7293,
-0xbf2e,0x166b,0x27e6,0x1d7c,
-0xbf65,0xf726,0x07d4,0x4fd7,
-0x3f6c,0x71c7,0x1b98,0xc5fd,
-0x3fb5,0x5555,0x5555,0x5986,
-};
-#define MAXSTIR 143.01608
-static const unsigned short SQT[4] = {
-0x4004,0x0d93,0x1ff6,0x2706,
-};
-#define SQTPI *(double *)SQT
-#endif
-
-#ifndef __MINGW32__
-int sgngam = 0;
-extern int sgngam;
-extern double MAXLOG, MAXNUM, PI;
-#ifdef ANSIPROT
-extern double pow ( double, double );
-extern double log ( double );
-extern double exp ( double );
-extern double sin ( double );
-extern double polevl ( double, void *, int );
-extern double p1evl ( double, void *, int );
-extern double floor ( double );
-extern double fabs ( double );
-extern int isnan ( double );
-extern int isfinite ( double );
-static double stirf ( double );
-double lgam ( double );
-#else
-double pow(), log(), exp(), sin(), polevl(), p1evl(), floor(), fabs();
-int isnan(), isfinite();
-static double stirf();
-double lgam();
-#endif
-#ifdef INFINITIES
-extern double INFINITY;
-#endif
-#ifdef NANS
-extern double NAN;
-#endif
-#else /* __MINGW32__ */
-static double stirf ( double );
-#endif
-
-/* Gamma function computed by Stirling's formula.
- * The polynomial STIR is valid for 33 <= x <= 172.
- */
-static double stirf(x)
-double x;
-{
-double y, w, v;
-
-w = 1.0/x;
-w = 1.0 + w * polevl( w, STIR, 4 );
-y = exp(x);
-if( x > MAXSTIR )
-	{ /* Avoid overflow in pow() */
-	v = pow( x, 0.5 * x - 0.25 );
-	y = v * (v / y);
-	}
-else
-	{
-	y = pow( x, x - 0.5 ) / y;
-	}
-y = SQTPI * y * w;
-return( y );
-}
-
-
-
-double __tgamma_r(double x, int* sgngam)
-{
-double p, q, z;
-int i;
-
-*sgngam = 1;
-#ifdef NANS
-if( isnan(x) )
-	return(x);
-#endif
-#ifdef INFINITIES
-#ifdef NANS
-if( x == INFINITY )
-	return(x);
-if( x == -INFINITY )
-	return(NAN);
-#else
-if( !isfinite(x) )
-	return(x);
-#endif
-#endif
-q = fabs(x);
-
-if( q > 33.0 )
-	{
-	if( x < 0.0 )
-		{
-		p = floor(q);
-		if( p == q )
-			{
-gsing:
-			_SET_ERRNO(EDOM);
-			mtherr( "tgamma", SING );
-#ifdef INFINITIES
-			return (INFINITY);
-#else
-			return (MAXNUM);
-#endif
-			}
-		i = p;
-		if( (i & 1) == 0 )
-			*sgngam = -1;
-		z = q - p;
-		if( z > 0.5 )
-			{
-			p += 1.0;
-			z = q - p;
-			}
-		z = q * sin( PI * z );
-		if( z == 0.0 )
-			{
-			_SET_ERRNO(ERANGE);
-			mtherr( "tgamma", OVERFLOW );
-#ifdef INFINITIES
-			return( *sgngam * INFINITY);
-#else
-			return( *sgngam * MAXNUM);
-#endif
-			}
-		z = fabs(z);
-		z = PI/(z * stirf(q) );
-		}
-	else
-		{
-		z = stirf(x);
-		}
-	return( *sgngam * z );
-	}
-
-z = 1.0;
-while( x >= 3.0 )
-	{
-	x -= 1.0;
-	z *= x;
-	}
-
-while( x < 0.0 )
-	{
-	if( x > -1.E-9 )
-		goto Small;
-	z /= x;
-	x += 1.0;
-	}
-
-while( x < 2.0 )
-	{
-	if( x < 1.e-9 )
-		goto Small;
-	z /= x;
-	x += 1.0;
-	}
-
-if( x == 2.0 )
-	return(z);
-
-x -= 2.0;
-p = polevl( x, P, 6 );
-q = polevl( x, Q, 7 );
-return( z * p / q );
-
-Small:
-if( x == 0.0 )
-	{
-	goto gsing;
-	}
-else
-	return( z/((1.0 + 0.5772156649015329 * x) * x) );
-}
-
-/* This is the C99 version */
-
-double tgamma(double x)
-{
-  int local_sgngam=0;
-  return (__tgamma_r(x, &local_sgngam));
-}
diff --git a/winsup/mingw/mingwex/math/tgammaf.c b/winsup/mingw/mingwex/math/tgammaf.c
deleted file mode 100644
index 07d294971..000000000
--- a/winsup/mingw/mingwex/math/tgammaf.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*							gammaf.c
- *
- *	Gamma function
- *
- *
- *
- * SYNOPSIS:
- *
- * float x, y, __tgammaf_r();
- * int* sgngamf;
- * y = __tgammaf_r( x, sgngamf );
- * 
- * float x, y, tgammaf();
- * y = tgammaf( x);
- *
- *
- * DESCRIPTION:
- *
- * Returns gamma function of the argument.  The result is
- * correctly signed. In the reentrant version the sign (+1 or -1)
- * is returned in the variable referenced by sgngamf.
- *
- * Arguments between 0 and 10 are reduced by recurrence and the
- * function is approximated by a polynomial function covering
- * the interval (2,3).  Large arguments are handled by Stirling's
- * formula. Negative arguments are made positive using
- * a reflection formula.  
- *
- *
- * ACCURACY:
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *    IEEE       0,-33      100,000     5.7e-7      1.0e-7
- *    IEEE       -33,0      100,000     6.1e-7      1.2e-7
- *
- *
- */
-
-/*
-Cephes Math Library Release 2.7:  July, 1998
-Copyright 1984, 1987, 1989, 1992, 1998 by Stephen L. Moshier
-*/
-
-
-/*
- * 26-11-2002 Modified for mingw.
- * Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-
-#ifndef __MINGW32__
-#include "mconf.h"
-#else 
-#include "cephes_mconf.h"
-#endif
-
-/* define MAXGAM 34.84425627277176174 */
-
-/* Stirling's formula for the gamma function
- * gamma(x) = sqrt(2 pi) x^(x-.5) exp(-x) ( 1 + 1/x P(1/x) )
- * .028 < 1/x < .1
- * relative error < 1.9e-11
- */
-static const float STIR[] = {
--2.705194986674176E-003,
- 3.473255786154910E-003,
- 8.333331788340907E-002,
-};
-static const float MAXSTIR = 26.77;
-static const float SQTPIF = 2.50662827463100050242; /* sqrt( 2 pi ) */
-
-#ifndef __MINGW32__
-
-extern float MAXLOGF, MAXNUMF, PIF;
-
-#ifdef ANSIC
-float expf(float);
-float logf(float);
-float powf( float, float );
-float sinf(float);
-float gammaf(float);
-float floorf(float);
-static float stirf(float);
-float polevlf( float, float *, int );
-float p1evlf( float, float *, int );
-#else
-float expf(), logf(), powf(), sinf(), floorf();
-float polevlf(), p1evlf();
-static float stirf();
-#endif
-
-#else /* __MINGW32__ */
-static float stirf(float);
-#endif
-
-/* Gamma function computed by Stirling's formula,
- * sqrt(2 pi) x^(x-.5) exp(-x) (1 + 1/x P(1/x))
- * The polynomial STIR is valid for 33 <= x <= 172.
- */
-static float stirf( float x )
-{
-float  y, w, v;
-
-w = 1.0/x;
-w = 1.0 + w * polevlf( w, STIR, 2 );
-y = expf( -x );
-if( x > MAXSTIR )
-	{ /* Avoid overflow in pow() */
-	v = powf( x, 0.5 * x - 0.25 );
-	y *= v;
-	y *= v;
-	}
-else
-	{
-	y = powf( x, x - 0.5 ) * y;
-	}
-y = SQTPIF * y * w;
-return( y );
-}
-
-
-/* gamma(x+2), 0 < x < 1 */
-static const float P[] = {
- 1.536830450601906E-003,
- 5.397581592950993E-003,
- 4.130370201859976E-003,
- 7.232307985516519E-002,
- 8.203960091619193E-002,
- 4.117857447645796E-001,
- 4.227867745131584E-001,
- 9.999999822945073E-001,
-};
-
-float __tgammaf_r( float x, int* sgngamf)
-{
-float p, q, z, nz;
-int i, direction, negative;
-
-#ifdef NANS
-if( isnan(x) )
-	return(x);
-#endif
-#ifdef INFINITIES
-#ifdef NANS
-if( x == INFINITYF )
-	return(x);
-if( x == -INFINITYF )
-	return(NANF);
-#else
-if( !isfinite(x) )
-	return(x);
-#endif
-#endif
-
-*sgngamf = 1;
-negative = 0;
-nz = 0.0;
-if( x < 0.0 )
-	{
-	negative = 1;
-	q = -x;
-	p = floorf(q);
-	if( p == q )
-		{
-gsing:
-		_SET_ERRNO(EDOM);
-		mtherr( "tgammaf", SING );
-#ifdef INFINITIES
-		return (INFINITYF);
-#else
-		return (MAXNUMF);
-#endif
-			}
-	i = p;
-	if( (i & 1) == 0 )
-		*sgngamf = -1;
-	nz = q - p;
-	if( nz > 0.5 )
-		{
-		p += 1.0;
-		nz = q - p;
-		}
-	nz = q * sinf( PIF * nz );
-	if( nz == 0.0 )
-		{
-		_SET_ERRNO(ERANGE);
-		mtherr( "tgamma", OVERFLOW );
-#ifdef INFINITIES
-		return( *sgngamf * INFINITYF);
-#else
-		return( *sgngamf * MAXNUMF);
-#endif
-		}
-	if( nz < 0 )
-		nz = -nz;
-	x = q;
-	}
-if( x >= 10.0 )
-	{
-	z = stirf(x);
-	}
-if( x < 2.0 )
-	direction = 1;
-else
-	direction = 0;
-z = 1.0;
-while( x >= 3.0 )
-	{
-	x -= 1.0;
-	z *= x;
-	}
-/*
-while( x < 0.0 )
-	{
-	if( x > -1.E-4 )
-		goto Small;
-	z *=x;
-	x += 1.0;
-	}
-*/
-while( x < 2.0 )
-	{
-	if( x < 1.e-4 )
-		goto Small;
-	z *=x;
-	x += 1.0;
-	}
-
-if( direction )
-	z = 1.0/z;
-
-if( x == 2.0 )
-	return(z);
-
-x -= 2.0;
-p = z * polevlf( x, P, 7 );
-
-gdone:
-
-if( negative )
-	{
-	p = *sgngamf * PIF/(nz * p );
-	}
-return(p);
-
-Small:
-if( x == 0.0 )
-	{
-	goto gsing;
-	}
-else
-	{
-	p = z / ((1.0 + 0.5772156649015329 * x) * x);
-	goto gdone;
-	}
-}
-
-/* This is the C99 version */
-
-float tgammaf(float x)
-{
-  int local_sgngamf=0;
-  return (__tgammaf_r(x, &local_sgngamf));
-}
diff --git a/winsup/mingw/mingwex/math/tgammal.c b/winsup/mingw/mingwex/math/tgammal.c
deleted file mode 100644
index 6db4e3af7..000000000
--- a/winsup/mingw/mingwex/math/tgammal.c
+++ /dev/null
@@ -1,501 +0,0 @@
-/*							gammal.c
- *
- *	Gamma function
- *
- *
- *
- * SYNOPSIS:
- *
- * long double x, y, __tgammal_r();
- * int* sgngaml;
- * y = __tgammal_r( x, sgngaml );
- * 
- * long double x, y, tgammal();
- * y = tgammal( x); *
- *
- *
- * DESCRIPTION:
- *
- * Returns gamma function of the argument.  The result is
- * correctly signed. In the reentrant version the sign (+1 or -1)
- * is returned in the variable referenced by sgngamf.
-  *
- * Arguments |x| <= 13 are reduced by recurrence and the function
- * approximated by a rational function of degree 7/8 in the
- * interval (2,3).  Large arguments are handled by Stirling's
- * formula. Large negative arguments are made positive using
- * a reflection formula.  
- *
- *
- * ACCURACY:
- *
- *                      Relative error:
- * arithmetic   domain     # trials      peak         rms
- *    IEEE     -40,+40      10000       3.6e-19     7.9e-20
- *    IEEE    -1755,+1755   10000       4.8e-18     6.5e-19
- *
- * Accuracy for large arguments is dominated by error in powl().
- *
- */
-
-/*
-Copyright 1994 by Stephen L. Moshier
-*/
-
-
-/*
- * 26-11-2002 Modified for mingw.
- * Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-
-#ifndef __MINGW32__
-#include "mconf.h"
-#else
-#include "cephes_mconf.h"
-#endif
-
-/*
-gamma(x+2)  = gamma(x+2) P(x)/Q(x)
-0 <= x <= 1
-Relative error
-n=7, d=8
-Peak error =  1.83e-20
-Relative error spread =  8.4e-23
-*/
-
-#if UNK
-static const long double P[8] = {
- 4.212760487471622013093E-5L,
- 4.542931960608009155600E-4L,
- 4.092666828394035500949E-3L,
- 2.385363243461108252554E-2L,
- 1.113062816019361559013E-1L,
- 3.629515436640239168939E-1L,
- 8.378004301573126728826E-1L,
- 1.000000000000000000009E0L,
-};
-static const long double Q[9] = {
--1.397148517476170440917E-5L,
- 2.346584059160635244282E-4L,
--1.237799246653152231188E-3L,
--7.955933682494738320586E-4L,
- 2.773706565840072979165E-2L,
--4.633887671244534213831E-2L,
--2.243510905670329164562E-1L,
- 4.150160950588455434583E-1L,
- 9.999999999999999999908E-1L,
-};
-#endif
-#if IBMPC
-static const unsigned short P[] = {
-0x434a,0x3f22,0x2bda,0xb0b2,0x3ff0, XPD
-0xf5aa,0xe82f,0x335b,0xee2e,0x3ff3, XPD
-0xbe6c,0x3757,0xc717,0x861b,0x3ff7, XPD
-0x7f43,0x5196,0xb166,0xc368,0x3ff9, XPD
-0x9549,0x8eb5,0x8c3a,0xe3f4,0x3ffb, XPD
-0x8d75,0x23af,0xc8e4,0xb9d4,0x3ffd, XPD
-0x29cf,0x19b3,0x16c8,0xd67a,0x3ffe, XPD
-0x0000,0x0000,0x0000,0x8000,0x3fff, XPD
-};
-static const unsigned short Q[] = {
-0x5473,0x2de8,0x1268,0xea67,0xbfee, XPD
-0x334b,0xc2f0,0xa2dd,0xf60e,0x3ff2, XPD
-0xbeed,0x1853,0xa691,0xa23d,0xbff5, XPD
-0x296e,0x7cb1,0x5dfd,0xd08f,0xbff4, XPD
-0x0417,0x7989,0xd7bc,0xe338,0x3ff9, XPD
-0x3295,0x3698,0xd580,0xbdcd,0xbffa, XPD
-0x75ef,0x3ab7,0x4ad3,0xe5bc,0xbffc, XPD
-0xe458,0x2ec7,0xfd57,0xd47c,0x3ffd, XPD
-0x0000,0x0000,0x0000,0x8000,0x3fff, XPD
-};
-#endif
-#if MIEEE
-static const long P[24] = {
-0x3ff00000,0xb0b22bda,0x3f22434a,
-0x3ff30000,0xee2e335b,0xe82ff5aa,
-0x3ff70000,0x861bc717,0x3757be6c,
-0x3ff90000,0xc368b166,0x51967f43,
-0x3ffb0000,0xe3f48c3a,0x8eb59549,
-0x3ffd0000,0xb9d4c8e4,0x23af8d75,
-0x3ffe0000,0xd67a16c8,0x19b329cf,
-0x3fff0000,0x80000000,0x00000000,
-};
-static const long Q[27] = {
-0xbfee0000,0xea671268,0x2de85473,
-0x3ff20000,0xf60ea2dd,0xc2f0334b,
-0xbff50000,0xa23da691,0x1853beed,
-0xbff40000,0xd08f5dfd,0x7cb1296e,
-0x3ff90000,0xe338d7bc,0x79890417,
-0xbffa0000,0xbdcdd580,0x36983295,
-0xbffc0000,0xe5bc4ad3,0x3ab775ef,
-0x3ffd0000,0xd47cfd57,0x2ec7e458,
-0x3fff0000,0x80000000,0x00000000,
-};
-#endif
-/*
-static const long double P[] = {
--3.01525602666895735709e0L,
--3.25157411956062339893e1L,
--2.92929976820724030353e2L,
--1.70730828800510297666e3L,
--7.96667499622741999770e3L,
--2.59780216007146401957e4L,
--5.99650230220855581642e4L,
--7.15743521530849602425e4L
-};
-static const long double Q[] = {
- 1.00000000000000000000e0L,
--1.67955233807178858919e1L,
- 8.85946791747759881659e1L,
- 5.69440799097468430177e1L,
--1.98526250512761318471e3L,
- 3.31667508019495079814e3L,
- 1.60577839621734713377e4L,
--2.97045081369399940529e4L,
--7.15743521530849602412e4L
-};
-*/
-#define MAXGAML 1755.455L
-/*static const long double LOGPI = 1.14472988584940017414L;*/
-
-/* Stirling's formula for the gamma function
-gamma(x) = sqrt(2 pi) x^(x-.5) exp(-x) (1 + 1/x P(1/x))
-z(x) = x
-13 <= x <= 1024
-Relative error
-n=8, d=0
-Peak error =  9.44e-21
-Relative error spread =  8.8e-4
-*/
-#if UNK
-static const long double STIR[9] = {
- 7.147391378143610789273E-4L,
--2.363848809501759061727E-5L,
--5.950237554056330156018E-4L,
- 6.989332260623193171870E-5L,
- 7.840334842744753003862E-4L,
--2.294719747873185405699E-4L,
--2.681327161876304418288E-3L,
- 3.472222222230075327854E-3L,
- 8.333333333333331800504E-2L,
-};
-#endif
-#if IBMPC
-static const unsigned short STIR[] = {
-0x6ede,0x69f7,0x54e3,0xbb5d,0x3ff4, XPD
-0xc395,0x0295,0x4443,0xc64b,0xbfef, XPD
-0xba6f,0x7c59,0x5e47,0x9bfb,0xbff4, XPD
-0x5704,0x1a39,0xb11d,0x9293,0x3ff1, XPD
-0x30b7,0x1a21,0x98b2,0xcd87,0x3ff4, XPD
-0xbef3,0x7023,0x6a08,0xf09e,0xbff2, XPD
-0x3a1c,0x5ac8,0x3478,0xafb9,0xbff6, XPD
-0xc3c9,0x906e,0x38e3,0xe38e,0x3ff6, XPD
-0xa1d5,0xaaaa,0xaaaa,0xaaaa,0x3ffb, XPD
-};
-#endif
-#if MIEEE
-static const long STIR[27] = {
-0x3ff40000,0xbb5d54e3,0x69f76ede,
-0xbfef0000,0xc64b4443,0x0295c395,
-0xbff40000,0x9bfb5e47,0x7c59ba6f,
-0x3ff10000,0x9293b11d,0x1a395704,
-0x3ff40000,0xcd8798b2,0x1a2130b7,
-0xbff20000,0xf09e6a08,0x7023bef3,
-0xbff60000,0xafb93478,0x5ac83a1c,
-0x3ff60000,0xe38e38e3,0x906ec3c9,
-0x3ffb0000,0xaaaaaaaa,0xaaaaa1d5,
-};
-#endif
-#define MAXSTIR 1024.0L
-static const long double SQTPI = 2.50662827463100050242E0L;
-
-/* 1/gamma(x) = z P(z)
- * z(x) = 1/x
- * 0 < x < 0.03125
- * Peak relative error 4.2e-23
- */
-#if UNK
-static const long double S[9] = {
--1.193945051381510095614E-3L,
- 7.220599478036909672331E-3L,
--9.622023360406271645744E-3L,
--4.219773360705915470089E-2L,
- 1.665386113720805206758E-1L,
--4.200263503403344054473E-2L,
--6.558780715202540684668E-1L,
- 5.772156649015328608253E-1L,
- 1.000000000000000000000E0L,
-};
-#endif
-#if IBMPC
-static const unsigned short S[] = {
-0xbaeb,0xd6d3,0x25e5,0x9c7e,0xbff5, XPD
-0xfe9a,0xceb4,0xc74e,0xec9a,0x3ff7, XPD
-0x9225,0xdfef,0xb0e9,0x9da5,0xbff8, XPD
-0x10b0,0xec17,0x87dc,0xacd7,0xbffa, XPD
-0x6b8d,0x7515,0x1905,0xaa89,0x3ffc, XPD
-0xf183,0x126b,0xf47d,0xac0a,0xbffa, XPD
-0x7bf6,0x57d1,0xa013,0xa7e7,0xbffe, XPD
-0xc7a9,0x7db0,0x67e3,0x93c4,0x3ffe, XPD
-0x0000,0x0000,0x0000,0x8000,0x3fff, XPD
-};
-#endif
-#if MIEEE
-static const long S[27] = {
-0xbff50000,0x9c7e25e5,0xd6d3baeb,
-0x3ff70000,0xec9ac74e,0xceb4fe9a,
-0xbff80000,0x9da5b0e9,0xdfef9225,
-0xbffa0000,0xacd787dc,0xec1710b0,
-0x3ffc0000,0xaa891905,0x75156b8d,
-0xbffa0000,0xac0af47d,0x126bf183,
-0xbffe0000,0xa7e7a013,0x57d17bf6,
-0x3ffe0000,0x93c467e3,0x7db0c7a9,
-0x3fff0000,0x80000000,0x00000000,
-};
-#endif
-/* 1/gamma(-x) = z P(z)
- * z(x) = 1/x
- * 0 < x < 0.03125
- * Peak relative error 5.16e-23
- * Relative error spread =  2.5e-24
- */
-#if UNK
-static const long double SN[9] = {
- 1.133374167243894382010E-3L,
- 7.220837261893170325704E-3L,
- 9.621911155035976733706E-3L,
--4.219773343731191721664E-2L,
--1.665386113944413519335E-1L,
--4.200263503402112910504E-2L,
- 6.558780715202536547116E-1L,
- 5.772156649015328608727E-1L,
--1.000000000000000000000E0L,
-};
-#endif
-#if IBMPC
-static const unsigned short SN[] = {
-0x5dd1,0x02de,0xb9f7,0x948d,0x3ff5, XPD
-0x989b,0xdd68,0xc5f1,0xec9c,0x3ff7, XPD
-0x2ca1,0x18f0,0x386f,0x9da5,0x3ff8, XPD
-0x783f,0x41dd,0x87d1,0xacd7,0xbffa, XPD
-0x7a5b,0xd76d,0x1905,0xaa89,0xbffc, XPD
-0x7f64,0x1234,0xf47d,0xac0a,0xbffa, XPD
-0x5e26,0x57d1,0xa013,0xa7e7,0x3ffe, XPD
-0xc7aa,0x7db0,0x67e3,0x93c4,0x3ffe, XPD
-0x0000,0x0000,0x0000,0x8000,0xbfff, XPD
-};
-#endif
-#if MIEEE
-static const long SN[27] = {
-0x3ff50000,0x948db9f7,0x02de5dd1,
-0x3ff70000,0xec9cc5f1,0xdd68989b,
-0x3ff80000,0x9da5386f,0x18f02ca1,
-0xbffa0000,0xacd787d1,0x41dd783f,
-0xbffc0000,0xaa891905,0xd76d7a5b,
-0xbffa0000,0xac0af47d,0x12347f64,
-0x3ffe0000,0xa7e7a013,0x57d15e26,
-0x3ffe0000,0x93c467e3,0x7db0c7aa,
-0xbfff0000,0x80000000,0x00000000,
-};
-#endif
-
-#ifndef __MINGW32__
-extern long double MAXLOGL, MAXNUML, PIL;
-/* #define PIL 3.14159265358979323846L */
-/* #define MAXNUML 1.189731495357231765021263853E4932L */
-
-#ifdef ANSIPROT
-extern long double fabsl ( long double );
-extern long double lgaml ( long double );
-extern long double logl ( long double );
-extern long double expl ( long double );
-extern long double gammal ( long double );
-extern long double sinl ( long double );
-extern long double floorl ( long double );
-extern long double powl ( long double, long double );
-extern long double polevll ( long double, void *, int );
-extern long double p1evll ( long double, void *, int );
-extern int isnanl ( long double );
-extern int isfinitel ( long double );
-static long double stirf ( long double );
-#else
-long double fabsl(), lgaml(), logl(), expl(), gammal(), sinl();
-long double floorl(), powl(), polevll(), p1evll(), isnanl(), isfinitel();
-static long double stirf();
-#endif
-#ifdef INFINITIES
-extern long double INFINITYL;
-#endif
-#ifdef NANS
-extern long double NANL;
-#endif
-
-#else /* __MINGW32__ */
-static long double stirf ( long double );
-#endif 
-
-
-/* Gamma function computed by Stirling's formula.  */
-
-static long double stirf(x)
-long double x;
-{
-long double y, w, v;
-
-w = 1.0L/x;
-/* For large x, use rational coefficients from the analytical expansion.  */
-if( x > 1024.0L )
-	w = (((((6.97281375836585777429E-5L * w
-		+ 7.84039221720066627474E-4L) * w
-		- 2.29472093621399176955E-4L) * w
-		- 2.68132716049382716049E-3L) * w
-		+ 3.47222222222222222222E-3L) * w
-		+ 8.33333333333333333333E-2L) * w
-		+ 1.0L;
-else
-	w = 1.0L + w * polevll( w, STIR, 8 );
-y = expl(x);
-if( x > MAXSTIR )
-	{ /* Avoid overflow in pow() */
-	v = powl( x, 0.5L * x - 0.25L );
-	y = v * (v / y);
-	}
-else
-	{
-	y = powl( x, x - 0.5L ) / y;
-	}
-y = SQTPI * y * w;
-return( y );
-}
-
-
-long double __tgammal_r(long double x, int* sgngaml)
-{
-long double p, q, z;
-int i;
-
-*sgngaml = 1;
-#ifdef NANS
-if( isnanl(x) )
-	return(NANL);
-#endif
-#ifdef INFINITIES
-#ifdef NANS
-if( x == INFINITYL )
-	return(x);
-if( x == -INFINITYL )
-	return(NANL);
-#else
-if( !isfinite(x) )
-	return(x);
-#endif
-#endif
-q = fabsl(x);
-
-if( q > 13.0L )
-	{
-	if( q > MAXGAML )
-		goto goverf;
-	if( x < 0.0L )
-		{
-		p = floorl(q);
-		if( p == q )
-			{
-gsing:
-			_SET_ERRNO(EDOM);
-			mtherr( "tgammal", SING );
-#ifdef INFINITIES
-			return (INFINITYL);
-#else
-			return( *sgngaml * MAXNUML);
-#endif
-			}
-		i = p;
-		if( (i & 1) == 0 )
-			*sgngaml = -1;
-		z = q - p;
-		if( z > 0.5L )
-			{
-			p += 1.0L;
-			z = q - p;
-			}
-		z = q * sinl( PIL * z );
-		z = fabsl(z) * stirf(q);
-		if( z <= PIL/MAXNUML )
-			{
-goverf:
-			_SET_ERRNO(ERANGE);
-			mtherr( "tgammal", OVERFLOW );
-#ifdef INFINITIES
-			return( *sgngaml * INFINITYL);
-#else
-			return( *sgngaml * MAXNUML);
-#endif
-			}
-		z = PIL/z;
-		}
-	else
-		{
-		z = stirf(x);
-		}
-	return( *sgngaml * z );
-	}
-
-z = 1.0L;
-while( x >= 3.0L )
-	{
-	x -= 1.0L;
-	z *= x;
-	}
-
-while( x < -0.03125L )
-	{
-	z /= x;
-	x += 1.0L;
-	}
-
-if( x <= 0.03125L )
-	goto Small;
-
-while( x < 2.0L )
-	{
-	z /= x;
-	x += 1.0L;
-	}
-
-if( x == 2.0L )
-	return(z);
-
-x -= 2.0L;
-p = polevll( x, P, 7 );
-q = polevll( x, Q, 8 );
-return( z * p / q );
-
-Small:
-if( x == 0.0L )
-	{
-	goto gsing;
-	}
-else
-	{
-	if( x < 0.0L )
-		{
-		x = -x;
-		q = z / (x * polevll( x, SN, 8 ));
-		}
-	else
-		q = z / (x * polevll( x, S, 8 ));
-	}
-return q;
-}
-
-
-/* This is the C99 version. */
-
-long double tgammal(long double x)
-{
-  int local_sgngaml=0;
-  return (__tgammal_r(x, &local_sgngaml));
-}
-
diff --git a/winsup/mingw/mingwex/math/trunc.c b/winsup/mingw/mingwex/math/trunc.c
deleted file mode 100644
index 5c7dc68cb..000000000
--- a/winsup/mingw/mingwex/math/trunc.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-
-double
-trunc (double _x){
-  double retval;
-  unsigned short saved_cw;
-  unsigned short tmp_cw;
-  __asm__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */
-  tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO))
-	    | FE_TOWARDZERO;
-  __asm__ ("fldcw %0;" : : "m" (tmp_cw));
-  __asm__ ("frndint;" : "=t" (retval)  : "0" (_x)); /* round towards zero */
-  __asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/truncf.c b/winsup/mingw/mingwex/math/truncf.c
deleted file mode 100644
index 8869e377f..000000000
--- a/winsup/mingw/mingwex/math/truncf.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-
-float
-truncf (float _x)
-{
-  float retval;
-  unsigned short saved_cw;
-  unsigned short tmp_cw;
-  __asm__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */
-  tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO))
-	    | FE_TOWARDZERO;
-  __asm__ ("fldcw %0;" : : "m" (tmp_cw));
-  __asm__ ("frndint;" : "=t" (retval)  : "0" (_x)); /* round towards zero */
-  __asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/math/truncl.c b/winsup/mingw/mingwex/math/truncl.c
deleted file mode 100644
index e34b21ba9..000000000
--- a/winsup/mingw/mingwex/math/truncl.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <fenv.h>
-#include <math.h>
-
-long double
-truncl (long double _x){
-  long double retval;
-  unsigned short saved_cw;
-  unsigned short tmp_cw;
-  __asm__ ("fnstcw %0;" : "=m" (saved_cw)); /* save FPU control word */
-  tmp_cw = (saved_cw & ~(FE_TONEAREST | FE_DOWNWARD | FE_UPWARD | FE_TOWARDZERO))
-	    | FE_TOWARDZERO;
-  __asm__ ("fldcw %0;" : : "m" (tmp_cw));
-  __asm__ ("frndint;" : "=t" (retval)  : "0" (_x)); /* round towards zero */
-  __asm__ ("fldcw %0;" : : "m" (saved_cw) ); /* restore saved control word */
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/mbsinit.c b/winsup/mingw/mingwex/mbsinit.c
deleted file mode 100644
index c130afebd..000000000
--- a/winsup/mingw/mingwex/mbsinit.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*	This source code was extracted from the Q8 package created and placed
-    in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-    Implements subclause 7.24 of ISO/IEC 9899:1999 (E).
-
-	It supports an encoding where all char codes are mapped
-	to the *same* code values within a wchar_t or wint_t,
-	so long as no other wchar_t codes are used by the program.
-
-*/
-
-#include	<wchar.h>
-
-int
-mbsinit(ps)
-	const mbstate_t *ps;
-	{
-	return 1;			/* don't have shift states */
-	}
-
diff --git a/winsup/mingw/mingwex/mingw-fseek.c b/winsup/mingw/mingwex/mingw-fseek.c
deleted file mode 100644
index 1ea011fa6..000000000
--- a/winsup/mingw/mingwex/mingw-fseek.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Workaround for limitations on win9x where a file contents are
- * not zero'd out if you seek past the end and then write.
- * Copied from ming local-patch to binutils/bfd/libbfd.c written by
- * Mumit Khan  <khan@xraylith.wisc.edu> 
- */
-
-#include <windows.h>
-#include <stdio.h>
-#include <io.h>
-#include <stdlib.h>
-
-#define ZEROBLOCKSIZE 512
-static int __mingw_fseek_called;
-
-/* The fseek in Win9x runtime does not zero out the file if seeking past
-   the end; if you don't want random stuff from your disk included in your
-   output DLL/executable, use this version instead. On WinNT/Win2k, it
-   just calls runtime fseek().  
-   
-   CHECK/FIXME: Does this work for both text and binary modes?? */ 
-
-
-int
-__mingw_fseek (FILE *fp, long offset, int whence)
-{
-# undef fseek 
-  __mingw_fseek_called = 1;
-  return fseek (fp, offset, whence);
-}
-
-int
-__mingw_fwrite (const void *buffer, size_t size, size_t count, FILE *fp)
-{
-# undef fwrite 
-  if ((_osver & 0x8000) &&  __mingw_fseek_called)
-    {
-      DWORD actual_length, current_position;
-      __mingw_fseek_called = 0;
-      fflush (fp);
-      actual_length = GetFileSize ((HANDLE) _get_osfhandle (fileno (fp)), 
-                                   NULL);
-      current_position = SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)),
-                                         0, 0, FILE_CURRENT);
-#ifdef DEBUG
-      printf ("__mingw_fwrite: current %ld, actual %ld\n", 
-	      current_position, actual_length);
-#endif /* DEBUG */
-      if (current_position > actual_length)
-	{
-	  static char __mingw_zeros[ZEROBLOCKSIZE];
-	  long numleft;
-
-	  SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)), 
-	                  0, 0, FILE_END);
-	  numleft = current_position - actual_length;
-
-#ifdef DEBUG
-	  printf ("__mingw_fwrite: Seeking %ld bytes past end\n", numleft);
-#endif /* DEBUG */
-	  while (numleft > 0)
-	    {
-	      DWORD nzeros = (numleft > ZEROBLOCKSIZE)
-	                     ? ZEROBLOCKSIZE : numleft;
-	      DWORD written;
-	      if (! WriteFile ((HANDLE) _get_osfhandle (fileno (fp)),
-	                       __mingw_zeros, nzeros, &written, NULL))
-	        {
-		  /* Best we can hope for, or at least DJ says so. */
-	          SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)), 
-	                          0, 0, FILE_BEGIN);
-		  return -1;
-		}
-	      if (written < nzeros)
-	        {
-		  /* Likewise. */
-	          SetFilePointer ((HANDLE) _get_osfhandle (fileno (fp)), 
-	                          0, 0, FILE_BEGIN);
-		  return -1;
-		}
-
-	      numleft -= written;
-	    }
-	    FlushFileBuffers ((HANDLE) _get_osfhandle (fileno (fp)));
-	}
-    }
-  return fwrite (buffer, size, count, fp);
-}
diff --git a/winsup/mingw/mingwex/sitest.c b/winsup/mingw/mingwex/sitest.c
deleted file mode 100644
index 9e06bf164..000000000
--- a/winsup/mingw/mingwex/sitest.c
+++ /dev/null
@@ -1,1527 +0,0 @@
-/*
-	sitest -- exercise features of C99 <stdint.h> and <inttypes.h>
-
-	This source code has been placed into the PUBLIC DOMAIN by its author.
-
-	last edit:	1999/11/05	gwyn@arl.mil
-
-	Tries to accommodate pre-C99 versions of <inttypes.h>.
-
-	Takes advantage of __Q8_* symbols defined by a particular
-	implementation of <stdint.h>, but doesn't require them.
-
-	NOTE:	This is not a thorough validation test of the facilities.
-*/
-
-#include	<errno.h>
-#include	<limits.h>		/* for CHAR_BIT */
-#include	<stdio.h>
-#include	<stddef.h>		/* for ptrdiff_t */
-#include	<stdlib.h>
-#include	<string.h>
-
-#include	<inttypes.h>		/* embeds <stdint.h> */
-#include	<signal.h>		/* for sig_atomic_t */
-#if	defined(INTMAX_MAX)		/* <inttypes.h> has C99 features */
-#include	<wchar.h>
-#endif
-
-#include	<inttypes.h>		/* test idempotency */
-
-#if	1 /* __STDC_VERSION__ >= 199901 */
-#ifndef	__Q8_QT
-#define	__Q8_QT	long long
-#endif
-#endif
-
-#ifdef	PRIdMAX
-#define	HAVE_PRIdMAX
-#ifndef	__Q8_MT
-#define	__Q8_MT	intmax_t
-#endif
-#else
-#ifdef	PRIdLEAST64
-#ifndef	__Q8_MT
-#define	__Q8_MT	int_least64_t
-#endif
-#define	PRIdMAX	PRIdLEAST64
-#else
-#ifndef	__Q8_MT
-#define	__Q8_MT	long
-#endif
-#define	PRIdMAX	"ld"
-#endif
-#endif
-
-#ifdef	PRIuMAX
-#define	HAVE_PRIuMAX
-#define	U__Q8_MT	uintmax_t
-#else
-#ifdef	PRIuLEAST64
-#define	U__Q8_MT	uint_least64_t
-#define	PRIuMAX	PRIuLEAST64
-#else
-#define	U__Q8_MT	unsigned long
-#define	PRIuMAX	"lu"
-#endif
-#endif
-
-#define	STR_SUB(s)	#s
-#define	STRINGIZE(s)	STR_SUB(s)	/* extra level to expand argument */
-
-#if	defined(SCNo32) || defined(PRIo32)
-static int32_t		int32;
-#endif
-static int_least16_t	intl16;
-static uint_least16_t	uintl16;
-static uint_fast16_t	uintf16;
-static intmax_t		intmax;
-static uintmax_t	uintmax;
-
-int
-main()	{
-	int	status = 0;		/* exit status to be returned */
-
-	/* <stdint.h> features: */
-
-	printf("CHAR_BIT=%u\n", (unsigned)CHAR_BIT );
-	printf("sizeof(char)=%u\n", (unsigned)sizeof(char));	/* s.b. 1 */
-	printf("sizeof(short)=%u\n", (unsigned)sizeof(short));
-	printf("sizeof(int)=%u\n", (unsigned)sizeof(int));
-	printf("sizeof(long)=%u\n", (unsigned)sizeof(long));
-#ifdef	__Q8_QT
-	printf("sizeof(long long)=%u\n", (unsigned)sizeof(__Q8_QT));
-#endif
-	printf("sizeof(intmax_t)=%u\n", (unsigned)sizeof(intmax_t));
-	printf("sizeof(ptrdiff_t)=%u\n", (unsigned)sizeof(ptrdiff_t));
-	printf("sizeof(size_t)=%u\n", (unsigned)sizeof(size_t));
-	printf("sizeof(sig_atomic_t)=%u\n", (unsigned)sizeof(sig_atomic_t));
-	printf("sizeof(wchar_t)=%u\n", (unsigned)sizeof(wchar_t));
-#if	defined(WINT_MAX) || __STDC_VERSION__ >= 199901
-	printf("sizeof(wint_t)=%u\n", (unsigned)sizeof(wint_t));
-#else
-	printf("*** wint_t isn't defined ***\n");
-	status = EXIT_FAILURE;
-#endif
-#ifdef	INT8_MAX
-	printf("sizeof(int8_t)=%u\n", (unsigned)sizeof(int8_t));
-	printf("sizeof(uint8_t)=%u\n", (unsigned)sizeof(uint8_t));
-#endif
-#ifdef	INT9_MAX
-	printf("sizeof(int9_t)=%u\n", (unsigned)sizeof(int9_t));
-	printf("sizeof(uint9_t)=%u\n", (unsigned)sizeof(uint9_t));
-#endif
-#ifdef	INT12_MAX
-	printf("sizeof(int12_t)=%u\n", (unsigned)sizeof(int12_t));
-	printf("sizeof(uint12_t)=%u\n", (unsigned)sizeof(uint12_t));
-#endif
-#ifdef	INT16_MAX
-	printf("sizeof(int16_t)=%u\n", (unsigned)sizeof(int16_t));
-	printf("sizeof(uint16_t)=%u\n", (unsigned)sizeof(uint16_t));
-#endif
-#ifdef	INT18_MAX
-	printf("sizeof(int18_t)=%u\n", (unsigned)sizeof(int18_t));
-	printf("sizeof(uint18_t)=%u\n", (unsigned)sizeof(uint18_t));
-#endif
-#ifdef	INT24_MAX
-	printf("sizeof(int24_t)=%u\n", (unsigned)sizeof(int24_t));
-	printf("sizeof(uint24_t)=%u\n", (unsigned)sizeof(uint24_t));
-#endif
-#ifdef	INT32_MAX
-	printf("sizeof(int32_t)=%u\n", (unsigned)sizeof(int32_t));
-	printf("sizeof(uint32_t)=%u\n", (unsigned)sizeof(uint32_t));
-#endif
-#ifdef	INT36_MAX
-	printf("sizeof(int36_t)=%u\n", (unsigned)sizeof(int36_t));
-	printf("sizeof(uint36_t)=%u\n", (unsigned)sizeof(uint36_t));
-#endif
-#ifdef	INT40_MAX
-	printf("sizeof(int40_t)=%u\n", (unsigned)sizeof(int40_t));
-	printf("sizeof(uint40_t)=%u\n", (unsigned)sizeof(uint40_t));
-#endif
-#ifdef	INT48_MAX
-	printf("sizeof(int48_t)=%u\n", (unsigned)sizeof(int48_t));
-	printf("sizeof(uint48_t)=%u\n", (unsigned)sizeof(uint48_t));
-#endif
-#ifdef	INT60_MAX
-	printf("sizeof(int60_t)=%u\n", (unsigned)sizeof(int60_t));
-	printf("sizeof(uint60_t)=%u\n", (unsigned)sizeof(uint60_t));
-#endif
-#ifdef	INT64_MAX
-	printf("sizeof(int64_t)=%u\n", (unsigned)sizeof(int64_t));
-	printf("sizeof(uint64_t)=%u\n", (unsigned)sizeof(uint64_t));
-#endif
-#ifdef	INT72_MAX
-	printf("sizeof(int72_t)=%u\n", (unsigned)sizeof(int72_t));
-	printf("sizeof(uint72_t)=%u\n", (unsigned)sizeof(uint72_t));
-#endif
-#ifdef	INT128_MAX
-	printf("sizeof(int128_t)=%u\n", (unsigned)sizeof(int128_t));
-	printf("sizeof(uint128_t)=%u\n", (unsigned)sizeof(uint128_t));
-#endif
-	printf("sizeof(int_least8_t)=%u\n", (unsigned)sizeof(int_least8_t));
-	printf("sizeof(uint_least8_t)=%u\n", (unsigned)sizeof(uint_least8_t));
-	printf("sizeof(int_least16_t)=%u\n", (unsigned)sizeof(int_least16_t));
-	printf("sizeof(uint_least16_t)=%u\n", (unsigned)sizeof(uint_least16_t));
-	printf("sizeof(int_least32_t)=%u\n", (unsigned)sizeof(int_least32_t));
-	printf("sizeof(uint_least32_t)=%u\n", (unsigned)sizeof(uint_least32_t));
-#ifdef	INT_LEAST64_MAX
-	printf("sizeof(int_least64_t)=%u\n", (unsigned)sizeof(int_least64_t));
-	printf("sizeof(uint_least64_t)=%u\n", (unsigned)sizeof(uint_least64_t));
-#else
-	printf("*** uint_least64_t isn't defined ***\n");
-	status = EXIT_FAILURE;
-#endif
-#ifdef	INT_LEAST128_MAX
-	printf("sizeof(int_least128_t)=%u\n", (unsigned)sizeof(int_least128_t));
-	printf("sizeof(uint_least128_t)=%u\n",
-		(unsigned)sizeof(uint_least128_t));
-#endif
-	printf("sizeof(int_fast8_t)=%u\n", (unsigned)sizeof(int_fast8_t));
-	printf("sizeof(uint_fast8_t)=%u\n", (unsigned)sizeof(uint_fast8_t));
-	printf("sizeof(int_fast16_t)=%u\n", (unsigned)sizeof(int_fast16_t));
-	printf("sizeof(uint_fast16_t)=%u\n", (unsigned)sizeof(uint_fast16_t));
-	printf("sizeof(int_fast32_t)=%u\n", (unsigned)sizeof(int_fast32_t));
-	printf("sizeof(uint_fast32_t)=%u\n", (unsigned)sizeof(uint_fast32_t));
-#ifdef	INT_FAST64_MAX
-	printf("sizeof(int_fast64_t)=%u\n", (unsigned)sizeof(int_fast64_t));
-	printf("sizeof(uint_fast64_t)=%u\n", (unsigned)sizeof(uint_fast64_t));
-#else
-	printf("*** int_fast64_t isn't defined ***\n");
-	status = EXIT_FAILURE;
-#endif
-#ifdef	INT_FAST128_MAX
-	printf("sizeof(int_fast128_t)=%u\n", (unsigned)sizeof(int_fast128_t));
-	printf("sizeof(uint_fast128_t)=%u\n", (unsigned)sizeof(uint_fast128_t));
-#endif
-#if	defined(INTPTR_MAX)
-	printf("sizeof(intptr_t)=%u\n", (unsigned)sizeof(intptr_t));
-#if	defined(UINTPTR_MAX)
-	printf("sizeof(uintptr_t)=%u\n", (unsigned)sizeof(uintptr_t));
-#else
-	printf("*** intptr_t is defined but uintptr_t isn't ***\n");
-	status = EXIT_FAILURE;
-#endif
-#elif	defined(UINTPTR_MAX)
-	printf("sizeof(uintptr_t)=%u\n", (unsigned)sizeof(uintptr_t));
-	printf("*** uintptr_t is defined but intptr_t isn't ***\n");
-	status = EXIT_FAILURE;
-#else
-	printf("*** neither intptr_t nor uintptr_t is defined ***\n");
-	status = EXIT_FAILURE;
-#endif
-#ifdef	INTMAX_MAX
-	printf("sizeof(intmax_t)=%u\n", (unsigned)sizeof(intmax_t));
-	printf("sizeof(uintmax_t)=%u\n", (unsigned)sizeof(uintmax_t));
-#else
-	printf("*** intmax_t isn't defined ***\n");
-	status = EXIT_FAILURE;
-#endif
-
-#ifdef	INT8_MAX
-	printf("INT8_MIN=%"PRIdMAX"\n", (__Q8_MT)INT8_MIN);
-	printf("INT8_MAX=%"PRIdMAX"\n", (__Q8_MT)INT8_MAX);
-	printf("UINT8_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT8_MAX);
-#endif
-#ifdef	INT9_MAX
-	printf("INT9_MIN=%"PRIdMAX"\n", (__Q8_MT)INT9_MIN);
-	printf("INT9_MAX=%"PRIdMAX"\n", (__Q8_MT)INT9_MAX);
-	printf("UINT9_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT9_MAX);
-#endif
-#ifdef	INT12_MAX
-	printf("INT12_MIN=%"PRIdMAX"\n", (__Q8_MT)INT12_MIN);
-	printf("INT12_MAX=%"PRIdMAX"\n", (__Q8_MT)INT12_MAX);
-	printf("UINT12_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT12_MAX);
-#endif
-#ifdef	INT16_MAX
-	printf("INT16_MIN=%"PRIdMAX"\n", (__Q8_MT)INT16_MIN);
-	printf("INT16_MAX=%"PRIdMAX"\n", (__Q8_MT)INT16_MAX);
-	printf("UINT16_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT16_MAX);
-#endif
-#ifdef	INT18_MAX
-	printf("INT18_MIN=%"PRIdMAX"\n", (__Q8_MT)INT18_MIN);
-	printf("INT18_MAX=%"PRIdMAX"\n", (__Q8_MT)INT18_MAX);
-	printf("UINT18_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT18_MAX);
-#endif
-#ifdef	INT24_MAX
-	printf("INT24_MIN=%"PRIdMAX"\n", (__Q8_MT)INT24_MIN);
-	printf("INT24_MAX=%"PRIdMAX"\n", (__Q8_MT)INT24_MAX);
-	printf("UINT24_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT24_MAX);
-#endif
-#ifdef	INT32_MAX
-	printf("INT32_MIN=%"PRIdMAX"\n", (__Q8_MT)INT32_MIN);
-	printf("INT32_MAX=%"PRIdMAX"\n", (__Q8_MT)INT32_MAX);
-	printf("UINT32_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT32_MAX);
-#endif
-#ifdef	INT36_MAX
-	printf("INT36_MIN=%"PRIdMAX"\n", (__Q8_MT)INT36_MIN);
-	printf("INT36_MAX=%"PRIdMAX"\n", (__Q8_MT)INT36_MAX);
-	printf("UINT36_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT36_MAX);
-#endif
-#ifdef	INT40_MAX
-	printf("INT40_MIN=%"PRIdMAX"\n", (__Q8_MT)INT40_MIN);
-	printf("INT40_MAX=%"PRIdMAX"\n", (__Q8_MT)INT40_MAX);
-	printf("UINT40_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT40_MAX);
-#endif
-#ifdef	INT48_MAX
-	printf("INT48_MIN=%"PRIdMAX"\n", (__Q8_MT)INT48_MIN);
-	printf("INT48_MAX=%"PRIdMAX"\n", (__Q8_MT)INT48_MAX);
-	printf("UINT48_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT48_MAX);
-#endif
-#ifdef	INT60_MAX
-	printf("INT60_MIN=%"PRIdMAX"\n", (__Q8_MT)INT60_MIN);
-	printf("INT60_MAX=%"PRIdMAX"\n", (__Q8_MT)INT60_MAX);
-	printf("UINT60_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT60_MAX);
-#endif
-#ifdef	INT64_MAX
-	printf("INT64_MIN=%"PRIdMAX"\n", (__Q8_MT)INT64_MIN);
-	printf("INT64_MAX=%"PRIdMAX"\n", (__Q8_MT)INT64_MAX);
-	printf("UINT64_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT64_MAX);
-#endif
-#ifdef	INT72_MAX
-	printf("INT72_MIN=%"PRIdMAX"\n", (__Q8_MT)INT72_MIN);
-	printf("INT72_MAX=%"PRIdMAX"\n", (__Q8_MT)INT72_MAX);
-	printf("UINT72_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT72_MAX);
-#endif
-#ifdef	INT128_MAX
-	printf("INT128_MIN=%"PRIdMAX"\n", (__Q8_MT)INT128_MIN);
-	printf("INT128_MAX=%"PRIdMAX"\n", (__Q8_MT)INT128_MAX);
-	printf("UINT128_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT128_MAX);
-#endif
-	printf("INT_LEAST8_MIN=%"PRIdMAX"\n", (__Q8_MT)INT_LEAST8_MIN);
-	printf("INT_LEAST8_MAX=%"PRIdMAX"\n", (__Q8_MT)INT_LEAST8_MAX);
-	printf("UINT_LEAST8_MAX=%"PRIuMAX"\n",
-		(U__Q8_MT)UINT_LEAST8_MAX);
-	printf("INT_LEAST16_MIN=%"PRIdMAX"\n", (__Q8_MT)INT_LEAST16_MIN);
-	printf("INT_LEAST16_MAX=%"PRIdMAX"\n", (__Q8_MT)INT_LEAST16_MAX);
-	printf("UINT_LEAST16_MAX=%"PRIuMAX"\n",
-		(U__Q8_MT)UINT_LEAST16_MAX);
-	printf("INT_LEAST32_MIN=%"PRIdMAX"\n", (__Q8_MT)INT_LEAST32_MIN);
-	printf("INT_LEAST32_MAX=%"PRIdMAX"\n", (__Q8_MT)INT_LEAST32_MAX);
-	printf("UINT_LEAST32_MAX=%"PRIuMAX"\n",
-		(U__Q8_MT)UINT_LEAST32_MAX);
-#ifdef	INT_LEAST64_MAX
-	printf("INT_LEAST64_MIN=%"PRIdMAX"\n", (__Q8_MT)INT_LEAST64_MIN);
-	printf("INT_LEAST64_MAX=%"PRIdMAX"\n", (__Q8_MT)INT_LEAST64_MAX);
-	printf("UINT_LEAST64_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT_LEAST64_MAX);
-#endif
-#ifdef	INT_LEAST128_MAX
-	printf("INT_LEAST128_MIN=%"PRIdMAX"\n", (__Q8_MT)INT_LEAST128_MIN);
-	printf("INT_LEAST128_MAX=%"PRIdMAX"\n", (__Q8_MT)INT_LEAST128_MAX);
-	printf("UINT_LEAST128_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT_LEAST128_MAX);
-#endif
-	printf("INT_FAST8_MIN=%"PRIdMAX"\n", (__Q8_MT)INT_FAST8_MIN);
-	printf("INT_FAST8_MAX=%"PRIdMAX"\n", (__Q8_MT)INT_FAST8_MAX);
-	printf("UINT_FAST8_MAX=%"PRIuMAX"\n",
-		(U__Q8_MT)UINT_FAST8_MAX);
-	printf("INT_FAST16_MIN=%"PRIdMAX"\n", (__Q8_MT)INT_FAST16_MIN);
-	printf("INT_FAST16_MAX=%"PRIdMAX"\n", (__Q8_MT)INT_FAST16_MAX);
-	printf("UINT_FAST16_MAX=%"PRIuMAX"\n",
-		(U__Q8_MT)UINT_FAST16_MAX);
-	printf("INT_FAST32_MIN=%"PRIdMAX"\n", (__Q8_MT)INT_FAST32_MIN);
-	printf("INT_FAST32_MAX=%"PRIdMAX"\n", (__Q8_MT)INT_FAST32_MAX);
-	printf("UINT_FAST32_MAX=%"PRIuMAX"\n",
-		(U__Q8_MT)UINT_FAST32_MAX);
-#ifdef	INT_FAST64_MAX
-	printf("INT_FAST64_MIN=%"PRIdMAX"\n", (__Q8_MT)INT_FAST64_MIN);
-	printf("INT_FAST64_MAX=%"PRIdMAX"\n", (__Q8_MT)INT_FAST64_MAX);
-	printf("UINT_FAST64_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT_FAST64_MAX);
-#endif
-#ifdef	INT_FAST128_MAX
-	printf("INT_FAST128_MIN=%"PRIdMAX"\n", (__Q8_MT)INT_FAST128_MIN);
-	printf("INT_FAST128_MAX=%"PRIdMAX"\n", (__Q8_MT)INT_FAST128_MAX);
-	printf("UINT_FAST128_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINT_FAST128_MAX);
-#endif
-#ifdef	INTPTR_MAX
-	printf("INTPTR_MIN=%"PRIdMAX"\n", (__Q8_MT)INTPTR_MIN);
-	printf("INTPTR_MAX=%"PRIdMAX"\n", (__Q8_MT)INTPTR_MAX);
-#endif
-#ifdef	UINTPTR_MAX
-	printf("UINTPTR_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINTPTR_MAX);
-#endif
-#ifdef	INTMAX_MAX
-	printf("INTMAX_MIN=%"PRIdMAX"\n", (__Q8_MT)INTMAX_MIN);
-	printf("INTMAX_MAX=%"PRIdMAX"\n", (__Q8_MT)INTMAX_MAX);
-	printf("UINTMAX_MAX=%"PRIuMAX"\n", (U__Q8_MT)UINTMAX_MAX);
-#endif
-#ifdef	PTRDIFF_MAX
-	printf("PTRDIFF_MIN=%"PRIdMAX"\n", (__Q8_MT)PTRDIFF_MIN);
-	printf("PTRDIFF_MAX=%"PRIdMAX"\n", (__Q8_MT)PTRDIFF_MAX);
-#endif
-#ifdef	SIG_ATOMIC_MAX
-#if	SIG_ATOMIC_MIN < 0
-	printf("SIG_ATOMIC_MIN=%"PRIdMAX"\n", (__Q8_MT)SIG_ATOMIC_MIN);
-	printf("SIG_ATOMIC_MAX=%"PRIdMAX"\n", (__Q8_MT)SIG_ATOMIC_MAX);
-#else
-	printf("SIG_ATOMIC_MIN=%"PRIuMAX"\n", (U__Q8_MT)SIG_ATOMIC_MIN);
-	printf("SIG_ATOMIC_MAX=%"PRIuMAX"\n", (U__Q8_MT)SIG_ATOMIC_MAX);
-#endif
-#endif
-#ifdef	SIZE_MAX
-	printf("SIZE_MAX=%"PRIuMAX"\n", (U__Q8_MT)SIZE_MAX);
-#endif
-
-#ifdef	WCHAR_MAX
-#if	WCHAR_MIN < 0
-	printf("WCHAR_MIN=%"PRIdMAX"\n", (__Q8_MT)WCHAR_MIN);
-	printf("WCHAR_MAX=%"PRIdMAX"\n", (__Q8_MT)WCHAR_MAX);
-#else
-	printf("WCHAR_MIN=%"PRIuMAX"\n", (U__Q8_MT)WCHAR_MIN);
-	printf("WCHAR_MAX=%"PRIuMAX"\n", (U__Q8_MT)WCHAR_MAX);
-#endif
-#endif
-#ifdef	WINT_MAX
-#if	WINT_MIN < 0
-	printf("WINT_MIN=%"PRIdMAX"\n", (__Q8_MT)WINT_MIN);
-	printf("WINT_MAX=%"PRIdMAX"\n", (__Q8_MT)WINT_MAX);
-#else
-	printf("WINT_MIN=%"PRIuMAX"\n", (U__Q8_MT)WINT_MIN);
-	printf("WINT_MAX=%"PRIuMAX"\n", (U__Q8_MT)WINT_MAX);
-#endif
-#endif
-
-	/*
-		7.18.4	Macros for integer constants
-	*/
-
-	/* INTn_C for n=8 and 16 were at one point unimplementable
-	   on most platforms, so they're treated as "optional": */
-#ifdef	INT8_C
-	if ( INT8_C(-123) != -123 )
-		printf("*** INT8_C(-123) produced %"PRIdMAX" ***\n",
-		       (__Q8_MT)INT8_C(-123)
-		      );
-	if ( UINT8_C(123) != 123 )
-		printf("*** UINT8_C(123) produced %"PRIuMAX" ***\n",
-		       (U__Q8_MT)UINT8_C(123)
-		      );
-#endif
-#ifdef	INT16_C
-	if ( INT16_C(-12345) != -12345 )
-		printf("*** INT16_C(-12345) produced %"PRIdMAX" ***\n",
-		       (__Q8_MT)INT16_C(-12345)
-		      );
-	if ( UINT16_C(12345) != 12345 )
-		printf("*** UINT16_C(12345) produced %"PRIuMAX" ***\n",
-		       (U__Q8_MT)UINT16_C(12345)
-		      );
-#endif
-	if ( INT32_C(-123456789) != -123456789 )
-		printf("*** INT32_C(-123456789) produced %"PRIdMAX" ***\n",
-		       (__Q8_MT)INT32_C(-123456789)
-		      );
-	if ( UINT32_C(123456789) != 123456789 )
-		printf("*** UINT32_C(123456789) produced %"PRIuMAX" ***\n",
-		       (U__Q8_MT)UINT32_C(123456789)
-		      );
-#ifdef	INT_LEAST64_MAX
-	if ( INT64_C(-1234567890123456789) != -1234567890123456789 )
-		printf("*** INT64_C(-1234567890123456789) produced %"PRIdMAX
-		       " ***\n",
-		       (__Q8_MT)INT64_C(-1234567890123456789)
-		      );
-	if ( UINT64_C(1234567890123456789) != 1234567890123456789 )
-		printf("*** UINT64_C(1234567890123456789) produced %"PRIuMAX
-		       " ***\n",
-		       (U__Q8_MT)UINT64_C(1234567890123456789)
-		      );
-#endif
-#ifdef	INTMAX_MAX
-	if ( INTMAX_C(-1234567890123456789) != -1234567890123456789 )
-		printf("*** INTMAX_C(-1234567890123456789) produced %"PRIdMAX
-		       " ***\n",
-		       (__Q8_MT)INTMAX_C(-1234567890123456789)
-		      );
-	if ( UINTMAX_C(1234567890123456789) != 1234567890123456789 )
-		printf("*** UINTMAX_C(1234567890123456789) produced %"PRIuMAX
-		       " ***\n",
-		       (U__Q8_MT)UINTMAX_C(1234567890123456789)
-		      );
-#endif
-
-	/* <inttypes.h> features: */
-
-#if	__STDC_VERSION__ >= 199901
-	printf("sizeof(imaxdiv_t)=%u\n", (unsigned)sizeof(imaxdiv_t));
-#endif
-
-	/*
-		7.8.1	Macros for format specifiers
-	*/
-
-	{
-	/* scanf these strings */
-	static const char	in_dn[] = "Z119bZ";
-	static const char	in_dmo[] = "Z-0119bZ";
-	static const char	in_dspx[] = "Z \t\n +0X119bZ";
-	static const char	in_dsmx[] = "Z \t\n -0x119bZ";
-	static const char	in_dsn[] = "Z \t\n 119bZ";
-	static const char	in_dp[] = "Z+119bZ";
-	static const char	in_dpx[] = "Z+0X119bz";
-
-	/* sprintf into this */
-	static char		buffer[1024];
-
-#define	SCAN(buf,fs,var,exp)	if ( sscanf(buf, "Z%" fs, &var) != 1 ) \
-					{ \
-					printf("*** " #fs "=" STR_SUB(fs) \
-					       " failed ***\n" \
-					      ); \
-					status = EXIT_FAILURE; \
-					} \
-				else if ( var != (exp) ) \
-					{ \
-					printf("*** " #fs "="  STR_SUB(fs) \
-					       " should be: " STR_SUB(exp) \
-					       ", was: %" fs " ***\n", var \
-					      ); \
-					status = EXIT_FAILURE; \
-					} \
-				else
-
-#define	PRINT(fs,var,exp)	if ( sprintf(buffer, "%" fs, var ) <= 0 ) \
-					{ \
-					printf("*** " #fs "=" STR_SUB(fs) \
-					       " failed ***\n" \
-					      ); \
-					status = EXIT_FAILURE; \
-					} \
-				else if ( strcmp(buffer, STR_SUB(exp)) != 0 ) \
-					{ \
-					printf("*** " #fs "="  STR_SUB(fs) \
-					       " should be: " STR_SUB(exp) \
-					       ", was: %s ***\n", buffer \
-					      ); \
-					status = EXIT_FAILURE; \
-					} \
-				else
-
-#ifdef	SCNo32
-	SCAN(in_dn, SCNo32, int32, 9);
-#endif
-#ifdef	PRIo32
-	PRINT(PRIo32, int32, 11);
-#endif
-	SCAN(in_dmo, SCNiLEAST16, intl16, -9);
-	SCAN(in_dspx, SCNdLEAST16, intl16, 0);
-	SCAN(in_dsmx, SCNiLEAST16, intl16, -4507);
-	PRINT(PRIdLEAST16, intl16, -4507);
-	PRINT(PRIiLEAST16, intl16, -4507);
-	SCAN(in_dsn, SCNxLEAST16, uintl16, 4507);
-	PRINT(PRIoLEAST16, uintl16, 10633);
-	PRINT(PRIuLEAST16, uintl16, 4507);
-	PRINT(PRIxLEAST16, uintl16, 119b);
-	PRINT(PRIXLEAST16, uintl16, 119B);
-	SCAN(in_dp, SCNxFAST16, uintf16, 4507);
-	PRINT(PRIxFAST16, uintf16, 119b);
-#ifdef	SCNdMAX
-	SCAN(in_dp, SCNdMAX, intmax, 119);
-#endif
-#ifdef	PRIiMAX
-	PRINT(PRIiMAX, intmax, 119);
-#endif
-#ifdef	SCNoMAX
-	SCAN(in_dpx, SCNoMAX, uintmax, 0);
-#endif
-#ifdef	PRIxMAX
-	PRINT(PRIxMAX, uintmax, 0);
-#endif
-	/* Obviously there should be a much larger battery of such tests. */
-	}
-
-#if	defined(INTMAX_MAX)		/* <inttypes.h> has C99 features */
-	/*
-		7.8.2	Functions for greatest-width integer types
-	*/
-
-	{
-	static struct
-		{
-		intmax_t	input;
-		intmax_t	expect;
-		}	abs_data[] =
-	{	
-#ifdef	INT8_MAX
-		{INT8_MAX,		INT8_MAX},
-		{-INT8_MAX,		INT8_MAX},
-		{UINT8_MAX,		UINT8_MAX},
-#endif
-
-#ifdef	INT16_MAX
-	{	INT16_MAX,		INT16_MAX},
-	{	-INT16_MAX,		INT16_MAX},
-	{	UINT16_MAX,		UINT16_MAX},
-#endif
-#ifdef	INT32_MAX
-	{	INT32_MAX,		INT32_MAX},
-	{	-INT32_MAX,		INT32_MAX},
-#ifdef	INT_LEAST64_MAX
-	{	UINT32_MAX,		UINT32_MAX},
-#endif
-#endif
-#ifdef	INT64_MAX
-	{	INT64_MAX,		INT64_MAX},
-	{	-INT64_MAX,		INT64_MAX},
-#endif
-	{	INT_LEAST8_MAX,		INT_LEAST8_MAX},
-	{	-INT_LEAST8_MAX,	INT_LEAST8_MAX},
-	{	UINT_LEAST8_MAX,	UINT_LEAST8_MAX},
-	{	INT_LEAST16_MAX,	INT_LEAST16_MAX},
-	{	-INT_LEAST16_MAX,	INT_LEAST16_MAX},
-	{	UINT_LEAST16_MAX,	UINT_LEAST16_MAX},
-	{	INT_LEAST32_MAX,	INT_LEAST32_MAX},
-	{	-INT_LEAST32_MAX,	INT_LEAST32_MAX},
-#ifdef	INT_LEAST64_MAX
-	{	UINT_LEAST32_MAX,	UINT_LEAST32_MAX},
-	{	INT_LEAST64_MAX,	INT_LEAST64_MAX},
-	{	-INT_LEAST64_MAX,	INT_LEAST64_MAX},
-#endif
-	{	INT_FAST8_MAX,		INT_FAST8_MAX},
-	{	-INT_FAST8_MAX,	INT_FAST8_MAX},
-	{	UINT_FAST8_MAX,	UINT_FAST8_MAX},
-	{	INT_FAST16_MAX,	INT_FAST16_MAX},
-	{	-INT_FAST16_MAX,	INT_FAST16_MAX},
-	{	UINT_FAST16_MAX,	UINT_FAST16_MAX},
-	{	INT_FAST32_MAX,	INT_FAST32_MAX},
-	{	-INT_FAST32_MAX,	INT_FAST32_MAX},
-#ifdef	INT_FAST64_MAX
-	{	UINT_FAST32_MAX,	UINT_FAST32_MAX},
-	{	INT_FAST64_MAX,	    INT_FAST64_MAX},
-	{	-INT_FAST64_MAX,	INT_FAST64_MAX},
-#endif
-#ifdef	INTPTR_MAX
-	{	INTPTR_MAX,		    INTPTR_MAX},
-	{	-INTPTR_MAX,		INTPTR_MAX},
-#endif
-#ifdef	UINTPTR_MAX
-	{	UINTPTR_MAX,		UINTPTR_MAX},
-#endif
-	{	INTMAX_MAX,		    INTMAX_MAX},
-#ifdef	PTRDIFF_MAX
-	{	PTRDIFF_MAX,		PTRDIFF_MAX},
-#endif
-#ifdef	SIG_ATOMIC_MAX
-	{	SIG_ATOMIC_MAX,		SIG_ATOMIC_MAX},
-#if	SIG_ATOMIC_MIN < 0
-	{	-SIG_ATOMIC_MAX,	SIG_ATOMIC_MAX},
-#endif
-#endif
-#ifdef	SIZE_MAX
-	{	SIZE_MAX,		SIZE_MAX},
-#endif
-#ifdef	WCHAR_MAX
-	{	WCHAR_MAX,		WCHAR_MAX},
-#if	WCHAR_MIN < 0
-	{	-WCHAR_MAX,		WCHAR_MAX},
-#endif
-#endif
-#ifdef	WINT_MAX
-	{	WINT_MAX,		WINT_MAX},
-#if	WINT_MIN < 0
-	{	-WINT_MAX,		WINT_MAX},
-#endif
-#endif
-	{	127,				127},
-	{	-127,				127},
-	{	128,				128},
-	{	-127-1,				128},
-	{	255,				255},
-	{	-256+1,				255},
-	{	256,				256},
-	{	-256,				256},
-	{	32767,				32767},
-	{	-32767,				32767},
-	{	32768,				32768},
-	{	-32767-1,			32768},
-	{	65535,				65535},
-	{	-65536+1,			65535},
-	{	65536,				65536},
-	{	-65536,				65536},
-	{	2147483647,			2147483647},
-	{	-2147483647,			2147483647},
-	{	2147483648LL,			2147483648LL},
-	{	-2147483647LL-1,			2147483648LL},
-#ifdef	INT_LEAST64_MAX
-	{	4294967295LL,			4294967295LL},
-	{	-4294967296LL+1,			4294967295LL},
-	{	4294967296LL,			4294967296LL},
-	{	-4294967296LL,			4294967296LL},
-	{	9223372036854775807LL,		9223372036854775807LL},
-	{	-9223372036854775807LL,		9223372036854775807LL},
-	{	1234567890123456789LL,		1234567890123456789LL},
-	{	-1234567890123456789LL,		1234567890123456789LL},
-#endif
-	{	1,				1},
-	{	-1,				1}, 
-	{	2,				2},
-	{	-2,				2},
-	{	10,				10},
-	{	-10,			10},
-	{	16,				16},
-	{	-16,				16},
-		/* Other test cases can be added here. */
-		{0,		0}	/* terminates the list */
-		},	*adp=abs_data;
-    int count=0;
-	do{
-    intmax = imaxabs(adp->input);
-    count++;
-    if (intmax  != adp->expect )
-			{
-            
-			printf("*** imaxabs(%"PRIdMAX") failed; should be: %"
-			       PRIdMAX", was: %"PRIdMAX" ***\n",
-			       adp->input, adp->expect, intmax
-			      );
-			status = EXIT_FAILURE;
-			}
-	}
-    while ( adp++->input != 0 );
-	}
-
-	{
-	imaxdiv_t	result;
-	static struct
-		{
-		intmax_t	numer;
-		intmax_t	denom;
-		intmax_t	exp_quot;
-		intmax_t	exp_rem;
-		}	div_data[] =
-		{
-	{	0, 1,				0, 0},
-	{	0, -1,				0, 0},
-	{	0, 2,				0, 0},
-	{	0, -2,				0, 0},
-	{	0, 5,				0, 0},
-	{	0, -5,				0, 0},
-	{	1, 1,				1, 0},
-	{	1, -1,				-1, 0},
-	{	1, 2,				0, 1},
-	{	1, -2,				0, 1},
-	{	1, 5,				0, 1},
-	{	1, -5,				0, 1},
-	{	-1, 1,				-1, 0},
-	{	-1, -1,				1, 0},
-	{	-1, 2,				0, -1},
-	{	-1, -2,				0, -1},
-	{	-1, 5,				0, -1},
-	{	-1, -5,				0, -1},
-	{	2, 1,				2, 0},
-	{	2, -1,				-2, 0},
-	{	2, 2,				1, 0},
-	{	2, -2,				-1, 0},
-	{	2, 5,				0, 2},
-	{	2, -5,				0, 2},
-	{	-2, 1,				-2, 0},
-	{	-2, -1,				2, 0},
-	{	-2, 2,				-1, 0},
-	{	-2, -2,				1, 0},
-	{	-2, 5,				0, -2},
-	{	-2, -5,				0, -2},
-	{	17, 5,				3, 2},
-	{	-17, -5,			3, -2},
-	{	17, -5,				-3, 2},
-	{	-17, 5,				-3, -2},
-	{	2147483647, 1,			2147483647, 0},
-	{	-2147483647LL, 1,			-2147483647LL, 0},
-	{	2147483648LL, 1LL,			2147483648LL, 0LL},
-	{	-2147483647-1LL, 1LL,		-2147483647-1LL, 0LL},
-	{	2147483647LL, 2LL,			1073741823LL, 1LL},
-	{	-2147483647LL, 2LL,			-1073741823LL, -1LL},
-	{	2147483648LL, 2LL,			1073741824LL, 0LL},
-	{	-2147483647-1LL, 2LL,		-1073741824LL, 0LL},
-#ifdef	INT_LEAST64_MAX			/* else might support only 32 bits */
-	{	4294967295LL, 1LL,			4294967295LL, 0LL},
-	{	-4294967296LL+1LL, 1LL,		-4294967296LL+1, 0},
-	{	4294967296LL, 1,			4294967296LL, 0},
-	{	-4294967296LL, 1LL,			-4294967296LL, 0LL},
-	{	4294967295LL, -1LL,			-4294967296+1LL, 0LL},
-	{	-4294967296+1LL, -1LL,		4294967295LL, 0LL},
-	{	4294967296LL, -1LL,			-4294967296LL, 0LL},
-	{	-4294967296LL, -1LL,		4294967296LL, 0LL},
-	{	4294967295LL, 2LL,			2147483647LL, 1LL},
-	{	-4294967296+1LL, 2LL,		-2147483647LL, -1LL},
-	{	4294967296LL, 2LL,			2147483648LL, 0LL},
-	{	-4294967296LL, 2LL,			-2147483647-1LL, 0LL},
-	{	4294967295LL, 2147483647LL,		2LL, 1LL},
-	{	-4294967296+1LL, 2147483647LL,	-2LL, -1LL},
-	{	4294967296LL, 2147483647LL,		2LL, 2LL},
-	{	-4294967296LL, 2147483647LL,	-2LL, -2LL},
-	{	4294967295LL, -2147483647LL,	-2LL, 1LL},
-	{	-4294967296+1LL, -2147483647LL,	2LL, -1LL},
-	{	4294967296LL, -2147483647LL,	-2LL, 2LL},
-	{	-4294967296LL, -2147483647LL,	2LL, -2LL},
-	{	4294967295LL, 2147483648LL,		1LL, 2147483647LL},
-	{	-4294967296+1LL, 2147483648LL,	-1LL, -2147483647LL},
-	{	4294967296LL, 2147483648LL,		2LL, 0LL},
-	{	-4294967296LL, 2147483648LL,	-2LL, 0LL},
-	{	4294967295LL, -2147483647-1LL,	-1LL, 2147483647LL},
-	{	-4294967296+1LL, -2147483647-1LL,	1LL, -2147483647LL},
-	{	4294967296LL, -2147483647-1LL,	-2LL, 0LL},
-	{	-4294967296LL, -2147483647-1LL,	2LL, 0LL},
-	{	9223372036854775807LL, 1LL,		9223372036854775807LL, 0LL},
-	{	-9223372036854775807LL, 1LL,	-9223372036854775807LL, 0LL},
-	{	9223372036854775807LL, 2LL,		4611686018427387903LL, 1LL},
-	{	-9223372036854775807LL, 2LL,	-4611686018427387903LL, -1LL},
-#endif
-		/* There should be a much larger battery of such tests. */
-    {	  0, 0,		0, 0}	/* 0 denom terminates the list */
-		},	*ddp;
-
-	for ( ddp = div_data; ddp->denom != 0; ++ddp )
-		if ( (result = imaxdiv(ddp->numer, ddp->denom)).quot
-		     != ddp->exp_quot || result.rem != ddp->exp_rem
-		   )	{
-			printf("*** imaxdiv(%"PRIdMAX",%"PRIdMAX
-			       ") failed; should be: (%"PRIdMAX",%"PRIdMAX
-			       "), was: (%"PRIdMAX",%"PRIdMAX") ***\n",
-			       ddp->numer, ddp->denom, ddp->exp_quot,
-			       ddp->exp_rem, result.quot, result.rem
-			      );
-			status = EXIT_FAILURE;
-			}
-	}
-
-	{
-	char		*endptr;
-	wchar_t		*wendptr;
-	static char	saved[64];	/* holds copy of input string */
-	static wchar_t	wnptr[64];	/* holds wide copy of test string */
-	static int	warned;		/* "warned for null endptr" flag */
-	register int	i;
-	static struct
-		{
-		char *		nptr;
-		int		base;
-		intmax_t	exp_val;
-		int		exp_len;
-		}	str_data[] =
-		{
-	{	"", 0,				0, 0},
-	{	"", 2,				0, 0},
-	{	"", 8,				0, 0},
-	{	"", 9,				0, 0},
-	{	"", 10,				0, 0},
-	{	"", 16,				0, 0},
-	{	"", 36,				0, 0},
-	{	"0", 0,				0, 1},
-	{	"0", 2,				0, 1},
-	{	"0", 8,				0, 1},
-	{	"0", 9,				0, 1},
-	{	"0", 10,			0, 1},
-	{	"0", 16,			0, 1},
-	{	"0", 36,			0, 1},
-	{	"+0", 0,			0, 2},
-	{	"+0", 2,			0, 2},
-	{	"+0", 8,			0, 2},
-	{	"+0", 9,			0, 2},
-	{	"+0", 10,			0, 2},
-	{	"+0", 16,			0, 2},
-	{	"+0", 36,			0, 2},
-	{	"-0", 0,			0, 2},
-	{	"-0", 2,			0, 2},
-	{	"-0", 8,			0, 2},
-	{	"-0", 9,			0, 2},
-	{	"-0", 10,			0, 2},
-	{	"-0", 16,			0, 2},
-	{	"-0", 36,			0, 2},
-	{	"Inf", 0,			0, 0},
-	{	"Inf", 2,			0, 0},
-	{	"Inf", 8,			0, 0},
-	{	"Inf", 9,			0, 0},
-	{	"Inf", 10,			0, 0},
-	{	"Inf", 16,			0, 0},
-	{	"Inf", 36,			24171, 3},
-	{	"+Inf", 0,			0, 0},
-	{	"+Inf", 2,			0, 0},
-	{	"+Inf", 8,			0, 0},
-	{	"+Inf", 9,			0, 0},
-	{	"+Inf", 10,			0, 0},
-	{	"+Inf", 16,			0, 0},
-	{	"+Inf", 36,			24171, 4},
-	{	"-Inf", 0,			0, 0},
-	{	"-Inf", 2,			0, 0},
-	{	"-Inf", 8,			0, 0},
-	{	"-Inf", 9,			0, 0},
-	{	"-Inf", 10,			0, 0},
-	{	"-Inf", 16,			0, 0},
-	{	"-Inf", 36,			-24171, 4},
-	{	"inf", 0,			0, 0},
-	{	"inf", 2,			0, 0},
-	{	"inf", 8,			0, 0},
-	{	"inf", 9,			0, 0},
-	{	"inf", 10,			0, 0},
-	{	"inf", 16,			0, 0},
-	{	"inf", 36,			24171, 3},
-	{	"+inf", 0,			0, 0},
-	{	"+inf", 2,			0, 0},
-	{	"+inf", 8,			0, 0},
-	{	"+inf", 9,			0, 0},
-	{	"+inf", 10,			0, 0},
-	{	"+inf", 16,			0, 0},
-	{	"+inf", 36,			24171, 4},
-	{	"-inf", 0,			0, 0},
-	{	"-inf", 2,			0, 0},
-	{	"-inf", 8,			0, 0},
-	{	"-inf", 9,			0, 0},
-	{	"-inf", 10,			0, 0},
-	{	"-inf", 16,			0, 0},
-	{	"-inf", 36,			-24171, 4},
-	{	"119b8Z", 0,			119, 3},
-	{	"119bZ", 0,			119, 3},
-	{	"-0119bZ", 0,			-9, 4},
-	{	" \t\n 0X119bZ", 0,		4507, 10},
-	{	" \t\n +0X119bZ", 0,		4507, 11},
-	{	" \t\n -0x119bZ", 0,		-4507, 11},
-	{	" \t\n 119bZ", 0,		119, 7},
-	{	"+119bZ", 0,			119, 4},
-	{	"+0X119bz", 0,			4507, 7},
-	{	"119b8Z", 2,			3, 2},
-	{	"119bZ", 2,			3, 2},
-	{	"-0119bZ", 2,			-3, 4},
-	{	" \t\n 0X119bZ", 2,		0, 5},
-	{	" \t\n +0X119bZ", 2,		0, 6},
-	{	" \t\n -0x119bZ", 2,		0, 6},
-	{	" \t\n 119bZ", 2,		3, 6},
-	{	"+119bZ", 2,			3, 3},
-	{	"+0X119bz", 2,			0, 2},
-	{	"119b8Z", 8,			9, 2},
-	{	"119bZ", 8,			9, 2},
-	{	"-0119bZ", 8,			-9, 4},
-	{	" \t\n 0X119bZ", 8,		0, 5},
-	{	" \t\n +0X119bZ", 8,		0, 6},
-	{	" \t\n -0x119bZ", 8,		0, 6},
-	{	" \t\n 119bZ", 8,		9, 6},
-	{	"+119bZ", 8,			9, 3},
-	{	"+0X119bz", 8,			0, 2},
-	{	"119b8Z", 9,			10, 2},
-	{	"119bZ", 9,			10, 2},
-	{	"-0119bZ", 9,			-10, 4},
-	{	" \t\n 0X119bZ", 9,		0, 5},
-	{	" \t\n +0X119bZ", 9,		0, 6},
-	{	" \t\n -0x119bZ", 9,		0, 6},
-	{	" \t\n 119bZ", 9,		10, 6},
-	{	"+119bZ", 9,			10, 3},
-	{	"+0X119bz", 9,			0, 2},
-	{	"119b8Z", 10,			119, 3},
-	{	"119bZ", 10,			119, 3},
-	{	"-0119bZ", 10,			-119, 5},
-	{	" \t\n 0X119bZ", 10,		0, 5},
-	{	" \t\n +0X119bZ", 10,		0, 6},
-	{	" \t\n -0x119bZ", 10,		0, 6},
-	{	" \t\n 119bZ", 10,		119, 7},
-	{	"+119bZ", 10,			119, 4},
-	{	"+0X119bz", 10,			0, 2},
-	{	"119b8Z", 16,			72120, 5},
-	{	"119bZ", 16,			4507, 4},
-	{	"-0119bZ", 16,			-4507, 6},
-	{	" \t\n 0X119bZ", 16,		4507, 10},
-	{	" \t\n +0X119bZ", 16,		4507, 11},
-	{	" \t\n -0x119bZ", 16,		-4507, 11},
-	{	" \t\n 119bZ", 16,		4507,8},
-	{	"+119bZ", 16,			4507, 5},
-	{	"+0X119bz", 16,			4507, 7},
-	{	"119b8Z", 36,			62580275, 6},
-	{	"119bZ", 36,			1738367, 5},
-	{	"-0119bZ", 36,			-1738367, 7},
-	{	" \t\n 0X119bZ", 36,		1997122175, 11},
-	{	" \t\n +0X119bZ", 36,		1997122175, 12},
-	{	" \t\n -0x119bZ", 36,		-1997122175, 12},
-	{	" \t\n 119bZ", 36,		1738367, 9},
-	{	"+119bZ", 36,			1738367, 6},
-	{	"+0X119bz", 36,			1997122175, 8},
-		/* There should be a much larger battery of such tests. */
-	{	"127", 0,			127, 3},
-	{	"-127", 0,			-127, 4},
-	{	"128", 0,			128, 3},
-	{	"-128", 0,			-127-1, 4},
-	{	"255", 0,			255, 3},
-	{	"-255", 0,			-255, 4},
-	{	"256", 0,			256, 3},
-	{	"-256", 0,			-255-1, 4},
-	{	"32767", 0,			32767, 5},
-	{	"-32767", 0,			-32767, 6},
-	{	"32768", 0,			32768, 5},
-	{	"-32768", 0,			-32767-1, 6},
-	{	"65535", 0,			65535, 5},
-	{	"-65535", 0,			-65536+1, 6},
-	{	"65536", 0,			65536, 5},
-	{	"-65536", 0,			-65536, 6},
-	{	"2147483647", 0,		2147483647, 10},
-	{	"-2147483647", 0,		-2147483647, 11},
-	{	"2147483648", 0,		2147483648LL, 10},
-	{	"-2147483648", 0,		-2147483647LL-1, 11},
-	{	"4294967295", 0,		4294967295LL, 10},
-	{	"-4294967295", 0,		-4294967296LL+1, 11},
-	{	"4294967296", 0,		4294967296LL, 10},
-	{	"-4294967296", 0,		-4294967296L, 11},
-	{	"9223372036854775807", 0,	9223372036854775807LL, 19},
-	{	"-9223372036854775807", 0,	-9223372036854775807LL, 20},
-	{	"1234567890123456789", 0,	1234567890123456789LL, 19},
-	{	"-1234567890123456789", 0,	-1234567890123456789LL, 20},
-	{	"1", 0,				1, 1},
-	{	"-1", 0,			-1, 2},
-	{	"2", 0,				2, 1},
-	{	"-2", 0,			-2, 2},
-	{	"10", 0,			10, 2},
-	{	"-10", 0,			-10, 3},
-	{	"16", 0,			16, 2},
-	{	"-16", 0,			-16, 3},
-		/* Other test cases can be added here. */
-	{	NULL, 0,	0, 0 }	/* terminates the list */
-		},	*sdp;
-
-	for ( sdp = str_data; sdp->nptr != NULL ; ++sdp )
-		{
-		/*
-			7.8.2.3	The strtoimax and strtoumax functions
-		*/
-
-		strcpy(saved, sdp->nptr);
-
-		errno = 0;		/* shouldn't be changed */
-
-		if ( (intmax = strtoimax(sdp->nptr, &endptr, sdp->base))
-		  != sdp->exp_val
-		   )	{
-			int	save = errno;
-
-			printf("*** strtoimax(%s,,%d) failed; should be: %"
-			       PRIdMAX", was: %"PRIdMAX" ***\n", sdp->nptr,
-			       sdp->base, sdp->exp_val, intmax
-			      );
-			status = EXIT_FAILURE;
-			errno = save;
-			}
-		else if ( endptr != sdp->nptr + sdp->exp_len )
-			{
-			int	save = errno;
-
-			printf("*** strtoimax(%s,,%d) returned wrong endptr"
-			       " ***\n", sdp->nptr, sdp->base
-			      );
-			status = EXIT_FAILURE;
-			errno = save;
-			}
-
-		if ( errno != 0 )
-			{
-			printf("*** strtoimax modified errno ***\n");
-			status = EXIT_FAILURE;
-			}
-
-		if ( strcmp(sdp->nptr, saved) != 0 )
-			{
-			printf("*** strtoimax modified its input ***\n");
-			status = EXIT_FAILURE;
-			strcpy(saved, sdp->nptr);
-			}
-
-		if ( sdp->exp_val >= 0 )	/* else some sign extension */
-			{
-			errno = 0;	/* shouldn't be changed */
-
-			if ( (uintmax = strtoumax(sdp->nptr, &endptr, sdp->base
-						 )
-			     ) != sdp->exp_val
-			   )	{
-				int	save = errno;
-
-				printf("*** strtoumax(%s,,%d) failed; "
-				       "should be: %"PRIuMAX", was: %"PRIuMAX
-				       " ***\n", sdp->nptr, sdp->base,
-				       sdp->exp_val, uintmax
-				      );
-				status = EXIT_FAILURE;
-				errno = save;
-				}
-			else if ( endptr != sdp->nptr + sdp->exp_len )
-				{
-				int	save = errno;
-
-				printf("*** strtoumax(%s,,%d) returned wrong "
-				       "endptr ***\n", sdp->nptr, sdp->base
-				      );
-				status = EXIT_FAILURE;
-				errno = save;
-				}
-
-			if ( errno != 0 )
-				{
-				printf("*** strtoumax modified errno ***\n");
-				status = EXIT_FAILURE;
-				}
-
-			if ( strcmp(sdp->nptr, saved) != 0 )
-				{
-				printf("*** strtoumax"
-				       " modified its input ***\n"
-				      );
-				status = EXIT_FAILURE;
-				strcpy(saved, sdp->nptr);
-				}
-			}
-
-		/* tests for null endptr */
-
-#define	WARN()	if (!warned) warned = 1, printf("*** Using null endptr: ***\n")
-
-		warned = 0;
-		errno = 0;		/* shouldn't be changed */
-
-		if ( (intmax = strtoimax(sdp->nptr, (char **)NULL, sdp->base))
-		  != sdp->exp_val
-		   )	{
-			int	save = errno;
-
-			WARN();
-			printf("*** strtoimax(%s,NULL,%d) failed; "
-			       "should be: %"PRIdMAX", was: %"PRIdMAX" ***\n",
-			       sdp->nptr, sdp->base, sdp->exp_val, intmax
-			      );
-			status = EXIT_FAILURE;
-			errno = save;
-			}
-
-		if ( errno != 0 )
-			{
-			WARN();
-			printf("*** strtoimax modified errno ***\n");
-			status = EXIT_FAILURE;
-			}
-
-		if ( strcmp(sdp->nptr, saved) != 0 )
-			{
-			WARN();
-			printf("*** strtoimax modified its input ***\n");
-			status = EXIT_FAILURE;
-			strcpy(saved, sdp->nptr);
-			}
-
-		if ( sdp->exp_val >= 0 )	/* else some sign extension */
-			{
-			errno = 0;	/* shouldn't be changed */
-
-			if ( (uintmax = strtoumax(sdp->nptr, (char **)NULL,
-						  sdp->base
-						 )
-			     ) != sdp->exp_val
-			   )	{
-				int	save = errno;
-
-				WARN();
-				printf("*** strtoumax(%s,NULL,%d) failed; "
-				       "should be: %"PRIuMAX", was: %"PRIuMAX
-				       " ***\n", sdp->nptr, sdp->base,
-				       sdp->exp_val, uintmax
-				      );
-				status = EXIT_FAILURE;
-				errno = save;
-				}
-
-			 if ( errno != 0 )
-				{
-				WARN();
-				printf("*** strtoumax modified errno ***\n");
-				status = EXIT_FAILURE;
-				}
-
-			 if ( strcmp(sdp->nptr, saved) != 0 )
-				{
-				WARN();
-				printf("*** strtoumax"
-				       " modified its input ***\n"
-				      );
-				status = EXIT_FAILURE;
-				strcpy(saved, sdp->nptr);
-				}
-			}
-
-		/*
-			7.8.2.4	The wcstoimax and wcstoumax functions
-		*/
-
-		for ( i = 0; i < 64; ++i )
-			if ( (wnptr[i] = sdp->nptr[i]) == '\0' )
-				break;
-
-		errno = 0;		/* shouldn't be changed */
-
-		if ( (intmax = wcstoimax(wnptr, &wendptr, sdp->base))
-		  != sdp->exp_val
-		   )	{
-			int	save = errno;
-
-			printf("*** wcstoimax(%s,,%d) failed; should be: %"
-			       PRIdMAX", was: %"PRIdMAX" ***\n", sdp->nptr,
-			       sdp->base, sdp->exp_val, intmax
-			      );
-			status = EXIT_FAILURE;
-			errno = save;
-			}
-		else if ( wendptr != wnptr + sdp->exp_len )
-			{
-			int	save = errno;
-
-			printf("*** wcstoimax(%s,,%d) returned wrong endptr"
-			       " ***\n", sdp->nptr, sdp->base
-			      );
-			status = EXIT_FAILURE;
-			errno = save;
-			}
-
-		if ( errno != 0 )
-			{
-			printf("*** wcstoimax modified errno ***\n");
-			status = EXIT_FAILURE;
-			}
-
-		for ( i = 0; i < 64; ++i )
-			if ( wnptr[i] != sdp->nptr[i] )
-				{
-				printf("*** wcstoimax modified its input ***\n"
-				      );
-				status = EXIT_FAILURE;
-
-				for ( ; i < 64; ++i )
-					if ( (wnptr[i] = sdp->nptr[i]) == '\0' )
-						break;
-
-				break;
-				}
-			else if ( wnptr[i] == '\0' )
-				break;
-
-		if ( sdp->exp_val >= 0 )	/* else some sign extension */
-			{
-			errno = 0;	/* shouldn't be changed */
-
-			if ( (uintmax = wcstoumax(wnptr, &wendptr, sdp->base)
-			     ) != sdp->exp_val
-			   )	{
-				int	save = errno;
-
-				printf("*** wcstoumax(%s,,%d) failed; "
-				       "should be: %"PRIuMAX", was: %"PRIuMAX
-				       " ***\n", sdp->nptr, sdp->base,
-				       sdp->exp_val, uintmax
-				      );
-				status = EXIT_FAILURE;
-				errno = save;
-				}
-			else if ( wendptr != wnptr + sdp->exp_len )
-				{
-				int	save = errno;
-
-				printf("*** wcstoumax(%s,,%d) returned wrong "
-				       "endptr ***\n", sdp->nptr, sdp->base
-				      );
-				status = EXIT_FAILURE;
-				errno = save;
-				}
-
-			if ( errno != 0 )
-				{
-				printf("*** wcstoumax modified errno ***\n");
-				status = EXIT_FAILURE;
-				}
-
-			for ( i = 0; i < 64; ++i )
-				if ( wnptr[i] != sdp->nptr[i] )
-					{
-					printf("*** wcstoumax"
-					       " modified its input ***\n"
-					      );
-					status = EXIT_FAILURE;
-
-					for ( ; i < 64; ++i )
-						if ( (wnptr[i] = sdp->nptr[i])
-						  == '\0'
-						   )
-							break;
-
-					break;
-					}
-				else if ( wnptr[i] == '\0' )
-					break;
-			}
-
-		/* tests for null endptr */
-
-		warned = 0;
-		errno = 0;		/* shouldn't be changed */
-
-		if ( (intmax = wcstoimax(wnptr, (wchar_t **)NULL, sdp->base))
-		  != sdp->exp_val
-		   )	{
-			int	save = errno;
-
-			WARN();
-			printf("*** wcstoimax(%s,NULL,%d) failed; should be: %"
-			       PRIdMAX", was: %"PRIdMAX" ***\n", sdp->nptr,
-			       sdp->base, sdp->exp_val, intmax
-			      );
-			status = EXIT_FAILURE;
-			errno = save;
-			}
-
-		if ( errno != 0 )
-			{
-			WARN();
-			printf("*** wcstoimax modified errno ***\n");
-			status = EXIT_FAILURE;
-			}
-
-		for ( i = 0; i < 64; ++i )
-			if ( wnptr[i] != sdp->nptr[i] )
-				{
-				WARN();
-				printf("*** wcstoimax modified its input ***\n"
-				      );
-				status = EXIT_FAILURE;
-
-				for ( ; i < 64; ++i )
-					if ( (wnptr[i] = sdp->nptr[i])
-					  == '\0'
-					   )
-						break;
-
-				break;
-				}
-			else if ( wnptr[i] == '\0' )
-				break;
-
-		if ( sdp->exp_val >= 0 )	/* else some sign extension */
-			{
-			errno = 0;	/* shouldn't be changed */
-
-			if ( (uintmax = wcstoumax(wnptr, (wchar_t **)NULL,
-						  sdp->base
-						 )
-			     ) != sdp->exp_val
-			   )	{
-				int	save = errno;
-
-				WARN();
-				printf("*** wcstoumax(%s,NULL,%d) failed; "
-				       "should be: %"PRIuMAX", was: %"PRIuMAX
-				       " ***\n", sdp->nptr, sdp->base,
-				       sdp->exp_val, uintmax
-				      );
-				status = EXIT_FAILURE;
-				errno = save;
-				}
-
-			 if ( errno != 0 )
-				{
-				WARN();
-				printf("*** wcstoumax modified errno ***\n");
-				status = EXIT_FAILURE;
-				}
-
-			for ( i = 0; i < 64; ++i )
-				if ( wnptr[i] != sdp->nptr[i] )
-					{
-					WARN();
-					printf("*** wcstoumax"
-					       " modified its input ***\n"
-					      );
-					status = EXIT_FAILURE;
-
-					for ( ; i < 64; ++i )
-						if ( (wnptr[i] = sdp->nptr[i])
-						  == '\0'
-						   )
-							break;
-
-					break;
-					}
-				else if ( wnptr[i] == '\0' )
-					break;
-			}
-		}
-
-	/*
-		7.8.2.3	The strtoimax and strtoumax functions (continued)
-	*/
-
-	if ( (intmax = strtoimax("1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890",
-				 &endptr, 0
-				)
-	     ) != INTMAX_MAX || errno != ERANGE
-	   )	{
-		printf("*** strtoimax failed overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	if ( (intmax = strtoimax("+1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890",
-				 &endptr, 0
-				)
-	     ) != INTMAX_MAX || errno != ERANGE
-	   )	{
-		printf("*** strtoimax failed +overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	if ( (intmax = strtoimax("-1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890",
-				 &endptr, 0
-				)
-	     ) != INTMAX_MIN || errno != ERANGE
-	   )	{
-		printf("*** strtoimax failed -overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	if ( (uintmax = strtoumax("1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890",
-				 &endptr, 0
-				)
-	     ) != UINTMAX_MAX || errno != ERANGE
-	   )	{
-		printf("*** strtoumax failed overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	if ( (uintmax = strtoumax("+1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890",
-				 &endptr, 0
-				)
-	     ) != UINTMAX_MAX || errno != ERANGE
-	   )	{
-		printf("*** strtoumax failed +overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	if ( (uintmax = strtoumax("-1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890"
-				 "1234567890123456789012345678901234567890",
-				 &endptr, 0
-				)
-	     ) != UINTMAX_MAX || errno != ERANGE
-	   )	{
-		printf("*** strtoumax failed -overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	/*
-		7.8.2.4	The wcstoimax and wcstoumax functions (continued)
-	*/
-
-	if ( (intmax = wcstoimax(L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890",
-				 &wendptr, 0
-				)
-	     ) != INTMAX_MAX || errno != ERANGE
-	   )	{
-		printf("*** wcstoimax failed overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	if ( (intmax = wcstoimax(L"+1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890",
-				 &wendptr, 0
-				)
-	     ) != INTMAX_MAX || errno != ERANGE
-	   )	{
-		printf("*** wcstoimax failed +overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	if ( (intmax = wcstoimax(L"-1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890",
-				 &wendptr, 0
-				)
-	     ) != INTMAX_MIN || errno != ERANGE
-	   )	{
-		printf("*** wcstoimax failed -overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	if ( (uintmax = wcstoumax(L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890",
-				 &wendptr, 0
-				)
-	     ) != UINTMAX_MAX || errno != ERANGE
-	   )	{
-		printf("*** wcstoumax failed overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	if ( (uintmax = wcstoumax(L"+1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890",
-				 &wendptr, 0
-				)
-	     ) != UINTMAX_MAX || errno != ERANGE
-	   )	{
-		printf("*** wcstoumax failed +overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-
-	if ( (uintmax = wcstoumax(L"-1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890"
-				 L"1234567890123456789012345678901234567890",
-				 &wendptr, 0
-				)
-	     ) != UINTMAX_MAX || errno != ERANGE
-	   )	{
-		printf("*** wcstoumax failed -overflow test ***\n");
-		status = EXIT_FAILURE;
-		}
-	}
-#endif	/* defined(INTMAX_MAX) */
-
-	if ( status != 0 )
-		fprintf(stderr, "sitest failed; see stdout for details\n");
-
-	return status;
-	}
diff --git a/winsup/mingw/mingwex/stdio/snprintf.c b/winsup/mingw/mingwex/stdio/snprintf.c
deleted file mode 100644
index c8d2a7b20..000000000
--- a/winsup/mingw/mingwex/stdio/snprintf.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <stdio.h>
-
-int snprintf(char* buffer, size_t n, const char* format, ...)
-{
-  int retval;
-  va_list argptr;
-         
-  va_start( argptr, format );
-  retval = _vsnprintf( buffer, n, format, argptr );
-  va_end( argptr );
-  return retval;
-}
diff --git a/winsup/mingw/mingwex/stdio/snwprintf.c b/winsup/mingw/mingwex/stdio/snwprintf.c
deleted file mode 100644
index 42b05b292..000000000
--- a/winsup/mingw/mingwex/stdio/snwprintf.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdarg.h>
-#include <wchar.h>
-
-int  snwprintf(wchar_t* buffer, size_t n, const wchar_t* format, ...)
-{
-    int retval;
-    va_list argptr;
-          
-    va_start( argptr, format );
-    retval = _vsnwprintf( buffer, n, format, argptr );
-    va_end( argptr );
-    return retval;
-}
diff --git a/winsup/mingw/mingwex/stdio/vfscanf.c b/winsup/mingw/mingwex/stdio/vfscanf.c
deleted file mode 100644
index 41549f9e4..000000000
--- a/winsup/mingw/mingwex/stdio/vfscanf.c
+++ /dev/null
@@ -1,40 +0,0 @@
-//  By aaronwl 2003-01-28 for mingw-msvcrt
-//  Public domain: all copyrights disclaimed, absolutely no warranties */
-
-#include <stdarg.h>
-#include <stdio.h>
-
-int vfscanf(FILE * __restrict__ stream, const char * __restrict__ format, va_list arg) {
-  int ret;
-
-  __asm__(
-
-    /* allocate stack (esp += frame - arg3 - (8[arg1,2] + 12)) */
-    "movl	%%esp, %%ebx\n\t"
-    "lea	0xFFFFFFEC(%%esp, %6), %%esp\n\t"
-    "subl	%5, %%esp\n\t"
-
-    // set up stack
-    "movl	%1, 0xC(%%esp)\n\t"  // stream
-    "movl	%2, 0x10(%%esp)\n\t"  // format
-    "lea	0x14(%%esp), %%edi\n\t"
-    "movl	%%edi, (%%esp)\n\t"  // memcpy dest
-    "movl	%5, 0x4(%%esp)\n\t"  // memcpy src
-    "movl	%5, 0x8(%%esp)\n\t"
-    "subl	%6, 0x8(%%esp)\n\t"  // memcpy len
-    "call	_memcpy\n\t"
-    "addl	$12, %%esp\n\t"
-
-    // call fscanf
-    "call	_fscanf\n\t"
-
-    // restore stack
-    "movl	%%ebx, %%esp\n\t"
-
-    : "=a"(ret), "=c"(stream), "=d"(format)
-    : "1"(stream), "2"(format), "S"(arg),
-      "a"(&ret)
-    : "ebx");
-
-  return ret;
-}
diff --git a/winsup/mingw/mingwex/stdio/vfwscanf.c b/winsup/mingw/mingwex/stdio/vfwscanf.c
deleted file mode 100644
index 8fa33376e..000000000
--- a/winsup/mingw/mingwex/stdio/vfwscanf.c
+++ /dev/null
@@ -1,42 +0,0 @@
-//  By aaronwl 2003-01-28 for mingw-msvcrt.
-//  Public domain: all copyrights disclaimed, absolutely no warranties.
-
-#include <stdarg.h>
-#include <wchar.h>
-
-int vfwscanf(FILE * __restrict__ stream, const wchar_t * __restrict__ format,
-  va_list arg) {
-
-  int ret;
-
-  __asm__(
-
-    // allocate stack (esp += frame - arg3 - (8[arg1,2] + 12))
-    "movl	%%esp, %%ebx\n\t"
-    "lea	0xFFFFFFEC(%%esp, %6), %%esp\n\t"
-    "subl	%5, %%esp\n\t"
-
-    // set up stack
-    "movl	%1, 0xC(%%esp)\n\t"  // stream
-    "movl	%2, 0x10(%%esp)\n\t"  // format
-    "lea	0x14(%%esp), %%edi\n\t"
-    "movl	%%edi, (%%esp)\n\t"  // memcpy dest
-    "movl	%5, 0x4(%%esp)\n\t"  // memcpy src
-    "movl	%5, 0x8(%%esp)\n\t"
-    "subl	%6, 0x8(%%esp)\n\t"  // memcpy len
-    "call	_memcpy\n\t"
-    "addl	$12, %%esp\n\t"
-
-    // call fscanf
-    "call	_fwscanf\n\t"
-
-    // restore stack
-    "movl	%%ebx, %%esp\n\t"
-
-    : "=a"(ret), "=c"(stream), "=d"(format)
-    : "1"(stream), "2"(format), "S"(arg),
-      "a"(&ret)
-    : "ebx");
-
-  return ret;
-}
diff --git a/winsup/mingw/mingwex/stdio/vscanf.c b/winsup/mingw/mingwex/stdio/vscanf.c
deleted file mode 100644
index 53f543442..000000000
--- a/winsup/mingw/mingwex/stdio/vscanf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-//  By aaronwl 2003-01-28 for mingw-msvcrt
-//  Public domain: all copyrights disclaimed, absolutely no warranties
-
-#include <stdarg.h>
-#include <stdio.h>
-
-int vscanf(const char * __restrict__ format, va_list arg) {
-  return vfscanf(stdin, format, arg);
-}
diff --git a/winsup/mingw/mingwex/stdio/vsnprintf.c b/winsup/mingw/mingwex/stdio/vsnprintf.c
deleted file mode 100644
index f3dce5b67..000000000
--- a/winsup/mingw/mingwex/stdio/vsnprintf.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdarg.h>
-#include <stdio.h>
-
-int vsnprintf (char* s, size_t n, const char* format, va_list arg)
-  { return _vsnprintf ( s, n, format, arg); }
diff --git a/winsup/mingw/mingwex/stdio/vsnwprintf.c b/winsup/mingw/mingwex/stdio/vsnwprintf.c
deleted file mode 100644
index 1b59a078b..000000000
--- a/winsup/mingw/mingwex/stdio/vsnwprintf.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdarg.h>
-#include <wchar.h>
-
-int  vsnwprintf(wchar_t *buffer,  size_t n, const wchar_t * format, va_list argptr)
-  { return _vsnwprintf( buffer, n, format, argptr );}
diff --git a/winsup/mingw/mingwex/stdio/vsscanf.c b/winsup/mingw/mingwex/stdio/vsscanf.c
deleted file mode 100644
index 33fd333ae..000000000
--- a/winsup/mingw/mingwex/stdio/vsscanf.c
+++ /dev/null
@@ -1,41 +0,0 @@
-//  By aaronwl 2003-01-28 for mingw-msvcrt.
-//  Public domain: all copyrights disclaimed, absolutely no warranties.
-
-#include <stdarg.h>
-#include <stdio.h>
-
-
-int vsscanf(const char * __restrict__ s, const char * __restrict__ format, va_list arg) {
-  int ret;
-
-  __asm__(
-
-    // allocate stack (esp += frame - arg3 - (8[arg1,2] + 12))
-    "movl	%%esp, %%ebx\n\t"
-    "lea	0xFFFFFFEC(%%esp, %6), %%esp\n\t"
-    "subl	%5, %%esp\n\t"
-
-    // set up stack
-    "movl	%1, 0xC(%%esp)\n\t"  // s
-    "movl	%2, 0x10(%%esp)\n\t"  // format
-    "lea	0x14(%%esp), %%edi\n\t"
-    "movl	%%edi, (%%esp)\n\t"  // memcpy dest
-    "movl	%5, 0x4(%%esp)\n\t"  // memcpy src
-    "movl	%5, 0x8(%%esp)\n\t"
-    "subl	%6, 0x8(%%esp)\n\t"  // memcpy len
-    "call	_memcpy\n\t"
-    "addl	$12, %%esp\n\t"
-
-    // call sscanf
-    "call	_sscanf\n\t"
-
-    // restore stack
-    "movl	%%ebx, %%esp\n\t"
-
-    : "=a"(ret), "=c"(s), "=d"(format)
-    : "1"(s), "2"(format), "S"(arg),
-      "a"(&ret)
-    : "ebx");
-
-  return ret;
-}
diff --git a/winsup/mingw/mingwex/stdio/vswscanf.c b/winsup/mingw/mingwex/stdio/vswscanf.c
deleted file mode 100644
index 20a0f85f5..000000000
--- a/winsup/mingw/mingwex/stdio/vswscanf.c
+++ /dev/null
@@ -1,43 +0,0 @@
-//  By aaronwl 2003-01-28 for mingw-msvcrt
-//  Public domain: all copyrights disclaimed, absolutely no warranties */
-
-#include <stdarg.h>
-#include <wchar.h>
-
-
-int vswscanf(const wchar_t * __restrict__ s, const wchar_t * __restrict__ format,
-  va_list arg) {
-
-  int ret;
-
-  __asm__(
-
-    // allocate stack (esp += frame - arg3 - (8[arg1,2] + 12))
-    "movl	%%esp, %%ebx\n\t"
-    "lea	0xFFFFFFEC(%%esp, %6), %%esp\n\t"
-    "subl	%5, %%esp\n\t"
-
-    // set up stack
-    "movl	%1, 0xC(%%esp)\n\t"  // s
-    "movl	%2, 0x10(%%esp)\n\t"  // format
-    "lea	0x14(%%esp), %%edi\n\t"
-    "movl	%%edi, (%%esp)\n\t"  // memcpy dest
-    "movl	%5, 0x4(%%esp)\n\t"  // memcpy src
-    "movl	%5, 0x8(%%esp)\n\t"
-    "subl	%6, 0x8(%%esp)\n\t"  // memcpy len
-    "call	_memcpy\n\t"
-    "addl	$12, %%esp\n\t"
-
-    // call sscanf
-    "call	_swscanf\n\t"
-
-    // restore stack
-    "movl	%%ebx, %%esp\n\t"
-
-    : "=a"(ret), "=c"(s), "=d"(format)
-    : "1"(s), "2"(format), "S"(arg),
-      "a"(&ret)
-    : "ebx");
-
-  return ret;
-}
diff --git a/winsup/mingw/mingwex/stdio/vwscanf.c b/winsup/mingw/mingwex/stdio/vwscanf.c
deleted file mode 100644
index c8f53eef2..000000000
--- a/winsup/mingw/mingwex/stdio/vwscanf.c
+++ /dev/null
@@ -1,9 +0,0 @@
-//  By aaronwl 2003-01-28 for mingw-msvcrt.
-//  Public domain: all copyrights disclaimed, absolutely no warranties.
-
-#include <stdarg.h>
-#include <wchar.h>
-
-int vwscanf(const wchar_t * __restrict__ format, va_list arg) {
-  return vfwscanf(stdin, format, arg);
-}
diff --git a/winsup/mingw/mingwex/strtof.c b/winsup/mingw/mingwex/strtof.c
deleted file mode 100644
index 62907cb19..000000000
--- a/winsup/mingw/mingwex/strtof.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdlib.h>
-
-float strtof( const char *nptr, char **endptr)
-{
-  return (strtod(nptr, endptr));
-}
diff --git a/winsup/mingw/mingwex/strtoimax.c b/winsup/mingw/mingwex/strtoimax.c
deleted file mode 100644
index 9072d4bbb..000000000
--- a/winsup/mingw/mingwex/strtoimax.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-    This source code was extracted from the Q8 package created and
-    placed in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-	Implements subclause 7.8.2 of ISO/IEC 9899:1999 (E).
-
-	This particular implementation requires the matching <inttypes.h>.
-	It also assumes that character codes for A..Z and a..z are in
-	contiguous ascending order; this is true for ASCII but not EBCDIC.
-*/
-#include <stdlib.h>
-#include <errno.h>
-#include <ctype.h>
-#include <inttypes.h>
-
-/* Helper macros */
-
-/* convert digit character to number, in any base */
-#define ToNumber(c)	(isdigit(c) ? (c) - '0' : \
-			 isupper(c) ? (c) - 'A' + 10 : \
-			 islower(c) ? (c) - 'a' + 10 : \
-			 -1		/* "invalid" flag */ \
-			)
-/* validate converted digit character for specific base */
-#define valid(n, b)	((n) >= 0 && (n) < (b))
-
-intmax_t
-strtoimax(nptr, endptr, base)
-	register const char * __restrict__	nptr;
-	char ** __restrict__			endptr;
-	register int				base;
-	{
-	register uintmax_t	accum;	/* accumulates converted value */
-	register int		n;	/* numeral from digit character */
-	int			minus;	/* set iff minus sign seen */
-	int			toobig;	/* set iff value overflows */
-
-	if ( endptr != NULL )
-		*endptr = (char *)nptr;	/* in case no conversion's performed */
-
-	if ( base < 0 || base == 1 || base > 36 )
-		{
-		errno = EDOM;
-		return 0;		/* unspecified behavior */
-		}
-
-	/* skip initial, possibly empty sequence of white-space characters */
-
-	while ( isspace(*nptr) )
-		++nptr;
-
-	/* process subject sequence: */
-
-	/* optional sign */
-	if ( (minus = *nptr == '-') || *nptr == '+' )
-		++nptr;
-
-	if ( base == 0 ) {
-		if ( *nptr == '0' ) {
-			if ( nptr[1] == 'X' || nptr[1] == 'x' )
-				base = 16;
-			else
-				base = 8;
-		}
-		else
-				base = 10;
-	}
-	/* optional "0x" or "0X" for base 16 */
-
-	if ( base == 16 && *nptr == '0' && (nptr[1] == 'X' || nptr[1] == 'x') )
-		nptr += 2;		/* skip past this prefix */
-
-	/* check whether there is at least one valid digit */
-
-	n = ToNumber(*nptr);
-	++nptr;
-
-	if ( !valid(n, base) )
-		return 0;		/* subject seq. not of expected form */
-
-	accum = n;
-
-	for ( toobig = 0; n = ToNumber(*nptr), valid(n, base); ++nptr )
-		if ( accum > (uintmax_t)(INTMAX_MAX / base + 2) ) /* major wrap-around */
-			toobig = 1;	/* but keep scanning */
-		else
-			accum = base * accum + n;
-
-	if ( endptr != NULL )
-		*endptr = (char *)nptr;	/* points to first not-valid-digit */
-
-	if ( minus )
-		{
-		if ( accum > (uintmax_t)INTMAX_MAX + 1 )
-			toobig = 1;
-		}
-	else
-	if ( accum > (uintmax_t)INTMAX_MAX )
-		toobig = 1;
-
-	if ( toobig )
-		{
-		errno = ERANGE;
-		return minus ? INTMAX_MIN : INTMAX_MAX;
-		}
-	else
-		return (intmax_t)(minus ? -accum : accum);
-	}
-
-long long __attribute__ ((alias ("strtoimax")))
-strtoll (const char* __restrict__ nptr, char ** __restrict__ endptr, int base);
diff --git a/winsup/mingw/mingwex/strtold.c b/winsup/mingw/mingwex/strtold.c
deleted file mode 100644
index 81db8a6f2..000000000
--- a/winsup/mingw/mingwex/strtold.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* This file is extracted from S L Moshier's  ioldoubl.c,
- * modified for use in MinGW 
- *
- * Extended precision arithmetic functions for long double I/O.
- * This program has been placed in the public domain.
- */
-
- 
-
-/*
- * Revision history:
- *
- *  5 Jan 84	PDP-11 assembly language version
- *  6 Dec 86	C language version
- * 30 Aug 88	100 digit version, improved rounding
- * 15 May 92    80-bit long double support
- *
- * Author:  S. L. Moshier.
- *
- * 6 Oct 02	Modified for MinGW by inlining utility routines,
- * 		removing global variables and splitting out strtold
- *		from _IO_ldtoa and _IO_ldtostr.
- *  
- *		Danny Smith <dannysmith@users.sourceforge.net> 
- */
-
-
-#include "math/cephes_emath.h"
-
-#if NE == 10
-
-/* 1.0E0 */
-static const unsigned short __eone[NE] =
- {0x0000, 0x0000, 0x0000, 0x0000,
-  0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x3fff,};
-#else
-static const unsigned short __eone[NE] = {
-0, 0000000,0000000,0000000,0100000,0x3fff,};
-#endif
-
-#if NE == 10
-static const unsigned short __etens[NTEN + 1][NE] =
-{
-  {0x6576, 0x4a92, 0x804a, 0x153f,
-   0xc94c, 0x979a, 0x8a20, 0x5202, 0xc460, 0x7525,},	/* 10**4096 */
-  {0x6a32, 0xce52, 0x329a, 0x28ce,
-   0xa74d, 0x5de4, 0xc53d, 0x3b5d, 0x9e8b, 0x5a92,},	/* 10**2048 */
-  {0x526c, 0x50ce, 0xf18b, 0x3d28,
-   0x650d, 0x0c17, 0x8175, 0x7586, 0xc976, 0x4d48,},
-  {0x9c66, 0x58f8, 0xbc50, 0x5c54,
-   0xcc65, 0x91c6, 0xa60e, 0xa0ae, 0xe319, 0x46a3,},
-  {0x851e, 0xeab7, 0x98fe, 0x901b,
-   0xddbb, 0xde8d, 0x9df9, 0xebfb, 0xaa7e, 0x4351,},
-  {0x0235, 0x0137, 0x36b1, 0x336c,
-   0xc66f, 0x8cdf, 0x80e9, 0x47c9, 0x93ba, 0x41a8,},
-  {0x50f8, 0x25fb, 0xc76b, 0x6b71,
-   0x3cbf, 0xa6d5, 0xffcf, 0x1f49, 0xc278, 0x40d3,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0xf020, 0xb59d, 0x2b70, 0xada8, 0x9dc5, 0x4069,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0400, 0xc9bf, 0x8e1b, 0x4034,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x2000, 0xbebc, 0x4019,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0x9c40, 0x400c,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0xc800, 0x4005,},
-  {0x0000, 0x0000, 0x0000, 0x0000,
-   0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0x4002,},	/* 10**1 */
-};
-#else
-static const unsigned short __etens[NTEN+1][NE] = {
-{0xc94c,0x979a,0x8a20,0x5202,0xc460,0x7525,},/* 10**4096 */
-{0xa74d,0x5de4,0xc53d,0x3b5d,0x9e8b,0x5a92,},/* 10**2048 */
-{0x650d,0x0c17,0x8175,0x7586,0xc976,0x4d48,},
-{0xcc65,0x91c6,0xa60e,0xa0ae,0xe319,0x46a3,},
-{0xddbc,0xde8d,0x9df9,0xebfb,0xaa7e,0x4351,},
-{0xc66f,0x8cdf,0x80e9,0x47c9,0x93ba,0x41a8,},
-{0x3cbf,0xa6d5,0xffcf,0x1f49,0xc278,0x40d3,},
-{0xf020,0xb59d,0x2b70,0xada8,0x9dc5,0x4069,},
-{0x0000,0x0000,0x0400,0xc9bf,0x8e1b,0x4034,},
-{0x0000,0x0000,0x0000,0x2000,0xbebc,0x4019,},
-{0x0000,0x0000,0x0000,0x0000,0x9c40,0x400c,},
-{0x0000,0x0000,0x0000,0x0000,0xc800,0x4005,},
-{0x0000,0x0000,0x0000,0x0000,0xa000,0x4002,}, /* 10**1 */
-};
-#endif
-
-int __asctoe64(const char * __restrict__ ss, short unsigned int * __restrict__ y)
-{
-unsigned short yy[NI], xt[NI], tt[NI];
-int esign, decflg, sgnflg, nexp, exp, prec, lost;
-int k, trail, c;
-long lexp;
-unsigned short nsign;
-const unsigned short *p;
-char *sp,  *lstr;
-char *s;
-
-char dec_sym = *(localeconv ()->decimal_point); 
-
-int lenldstr = 0;
-
-/* Copy the input string. */
-c = strlen (ss) + 2;
-lstr = (char *) alloca (c);
-s = (char *) ss;
-while( isspace ((int)(unsigned char)*s)) /* skip leading spaces */
-  {
-    ++s;
-    ++lenldstr;
-  }
-sp = lstr;
-for( k=0; k<c; k++ )
-	{
-	if( (*sp++ = *s++) == '\0' )
-		break;
-	}
-*sp = '\0';
-s = lstr;
-
-lost = 0;
-nsign = 0;
-decflg = 0;
-sgnflg = 0;
-nexp = 0;
-exp = 0;
-prec = 0;
-__ecleaz( yy );
-trail = 0;
-
-nxtcom:
-k = *s - '0';
-if( (k >= 0) && (k <= 9) )
-	{
-/* Ignore leading zeros */
-	if( (prec == 0) && (decflg == 0) && (k == 0) )
-		goto donchr;
-/* Identify and strip trailing zeros after the decimal point. */
-	if( (trail == 0) && (decflg != 0) )
-		{
-		sp = s;
-		while( (*sp >= '0') && (*sp <= '9') )
-			++sp;
-		--sp;
-		while( *sp == '0' )
-			*sp-- = 'z';
-		trail = 1;
-		if( *s == 'z' )
-			goto donchr;
-		}
-/* If enough digits were given to more than fill up the yy register,
- * continuing until overflow into the high guard word yy[2]
- * guarantees that there will be a roundoff bit at the top
- * of the low guard word after normalization.
- */
-	if( yy[2] == 0 )
-		{
-		if( decflg )
-			nexp += 1; /* count digits after decimal point */
-		__eshup1( yy );	/* multiply current number by 10 */
-		__emovz( yy, xt );
-		__eshup1( xt );
-		__eshup1( xt );
-		__eaddm( xt, yy );
-		__ecleaz( xt );
-		xt[NI-2] = (unsigned short )k;
-		__eaddm( xt, yy );
-		}
-	else
-		{
-		/* Mark any lost non-zero digit.  */
-		lost |= k;
-		/* Count lost digits before the decimal point.  */
-		if (decflg == 0)
-		        nexp -= 1;
-		}
-	prec += 1;
-	goto donchr;
-	}
-if (*s == dec_sym)
-  {
-    if( decflg )
-      goto daldone;
-    ++decflg;
-  }
-else
-  switch( *s )
-    {
-	case 'z':
-		break;
-	case 'E':
-	case 'e':
-		goto expnt;
-	case '-':
-		nsign = 0xffff;
-		if( sgnflg )
-			goto daldone;
-		++sgnflg;
-		break;
-	case '+':
-		if( sgnflg )
-			goto daldone;
-		++sgnflg;
-		break;
-	case 'i':
-	case 'I':
-    	{
-	  s++;
-	  if (*s != 'n' && *s != 'N')
-	    goto zero;
-	  s++;
-	  if (*s != 'f' && *s != 'F')
-	    goto zero;
-	  s++;
-	  if ((*s == 'i' || *s == 'I') && (s[1] == 'n' || s[1] == 'N')
-	       && (s[2] == 'i' || s[2] == 'I')
-	       && (s[3] == 't' || s[3] == 'T')
-	       && (s[4] == 'y' || s[4] == 'Y'))
-	    s += 5;
-	  goto infinite;
-    	}
-	case 'n':
-	case 'N':
-    	{
-	  s++;
-	  if (*s != 'a' && *s != 'A')
-	    goto zero;
-	  s++;
-	  if (*s != 'n' && *s != 'N')
-	    goto zero;
-	  s++;
-	  __enan_NI16( yy );
-	  goto aexit;
-    	}
-	default:
-	  goto daldone;
-    }
-donchr:
-++s;
-goto nxtcom;
-
-/* Exponent interpretation */
-expnt:
-
-esign = 1;
-exp = 0;
-++s;
-/* check for + or - */
-if( *s == '-' )
-	{
-	esign = -1;
-	++s;
-	}
-if( *s == '+' )
-	++s;
-while( (*s >= '0') && (*s <= '9') && exp < 4978)
-	{
-	exp *= 10;
-	exp += *s++ - '0';
-	}
-if( esign < 0 )
-	exp = -exp;
-if( exp > 4932 )
-	{
-	errno = ERANGE;
-infinite:
-	__ecleaz(yy);
-	yy[E] = 0x7fff;  /* infinity */
-	goto aexit;
-	}
-if( exp < -4977 )
-	{
-	errno = ERANGE;
-zero:
-	__ecleaz(yy);
-	goto aexit;
-	}
-
-daldone:
-nexp = exp - nexp;
-/* Pad trailing zeros to minimize power of 10, per IEEE spec. */
-while( (nexp > 0) && (yy[2] == 0) )
-	{
-	__emovz( yy, xt );
-	__eshup1( xt );
-	__eshup1( xt );
-	__eaddm( yy, xt );
-	__eshup1( xt );
-	if( xt[2] != 0 )
-		break;
-	nexp -= 1;
-	__emovz( xt, yy );
-	}
-if( (k = __enormlz(yy)) > NBITS )
-	{
-	__ecleaz(yy);
-	goto aexit;
-	}
-lexp = (EXONE - 1 + NBITS) - k;
-__emdnorm( yy, lost, 0, lexp, 64, NBITS );
-/* convert to external format */
-
-
-/* Multiply by 10**nexp.  If precision is 64 bits,
- * the maximum relative error incurred in forming 10**n
- * for 0 <= n <= 324 is 8.2e-20, at 10**180.
- * For 0 <= n <= 999, the peak relative error is 1.4e-19 at 10**947.
- * For 0 >= n >= -999, it is -1.55e-19 at 10**-435.
- */
-lexp = yy[E];
-if( nexp == 0 )
-	{
-	k = 0;
-	goto expdon;
-	}
-esign = 1;
-if( nexp < 0 )
-	{
-	nexp = -nexp;
-	esign = -1;
-	if( nexp > 4096 )
-		{ /* Punt.  Can't handle this without 2 divides. */
-		__emovi( __etens[0], tt );
-		lexp -= tt[E];
-		k = __edivm( tt, yy );
-		lexp += EXONE;
-		nexp -= 4096;
-		}
-	}
-p = &__etens[NTEN][0];
-__emov( __eone, xt );
-exp = 1;
-do
-	{
-	if( exp & nexp )
-		__emul( p, xt, xt );
-	p -= NE;
-	exp = exp + exp;
-	}
-while( exp <= MAXP );
-
-__emovi( xt, tt );
-if( esign < 0 )
-	{
-	lexp -= tt[E];
-	k = __edivm( tt, yy );
-	lexp += EXONE;
-	}
-else
-	{
-	lexp += tt[E];
-	k = __emulm( tt, yy );
-	lexp -= EXONE - 1;
-	}
-
-expdon:
-
-/* Round and convert directly to the destination type */
-
-__emdnorm( yy, k, 0, lexp, 64, 64 );
-
-aexit:
-
-yy[0] = nsign;
-__toe64( yy, y );
-return (lenldstr + s - lstr);
-}
-
-
-long double strtold (const char * __restrict__ s, char ** __restrict__ se)
-{
-  int lenldstr;
-  union
-  {
-    unsigned short int us[6];
-    long double ld;
-  } xx = {{0}};
- 
-  lenldstr =  __asctoe64( s, xx.us);
-  if (se)
-    *se = (char*)s + lenldstr;
-  return xx.ld;
-}
diff --git a/winsup/mingw/mingwex/strtoumax.c b/winsup/mingw/mingwex/strtoumax.c
deleted file mode 100644
index 2c052ac06..000000000
--- a/winsup/mingw/mingwex/strtoumax.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-    This source code was extracted from the Q8 package created and
-    placed in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-	Implements subclause 7.8.2 of ISO/IEC 9899:1999 (E).
-
-	This particular implementation requires the matching <inttypes.h>.
-	It also assumes that character codes for A..Z and a..z are in
-	contiguous ascending order; this is true for ASCII but not EBCDIC.
-*/
-#include <stdlib.h>
-#include <errno.h>
-#include <ctype.h>
-#include <inttypes.h>
-
-/* Helper macros */
-
-/* convert digit character to number, in any base */
-#define ToNumber(c)	(isdigit(c) ? (c) - '0' : \
-			 isupper(c) ? (c) - 'A' + 10 : \
-			 islower(c) ? (c) - 'a' + 10 : \
-			 -1		/* "invalid" flag */ \
-			)
-/* validate converted digit character for specific base */
-#define valid(n, b)	((n) >= 0 && (n) < (b))
-
-uintmax_t
-strtoumax(nptr, endptr, base)
-	register const char * __restrict__	nptr;
-	char ** __restrict__			endptr;
-	register int				base;
-	{
-	register uintmax_t	accum;	/* accumulates converted value */
-	register uintmax_t	next;	/* for computing next value of accum */
-	register int		n;	/* numeral from digit character */
-	int			minus;	/* set iff minus sign seen (yes!) */
-	int			toobig;	/* set iff value overflows */
-
-	if ( endptr != NULL )
-		*endptr = (char *)nptr;	/* in case no conversion's performed */
-
-	if ( base < 0 || base == 1 || base > 36 )
-		{
-		errno = EDOM;
-		return 0;		/* unspecified behavior */
-		}
-
-	/* skip initial, possibly empty sequence of white-space characters */
-
-	while ( isspace(*nptr) )
-		++nptr;
-
-	/* process subject sequence: */
-
-	/* optional sign (yes!) */
-
-	if ( (minus = *nptr == '-') || *nptr == '+' )
-		++nptr;
-
-	if ( base == 0 )
-        {
-		if ( *nptr == '0' )
-            {
-			if ( nptr[1] == 'X' || nptr[1] == 'x' )
-				base = 16;
-			else
-				base = 8;
-		    }
-		else
-				base = 10;
-		}
-
-    /* optional "0x" or "0X" for base 16 */
-    
-	if ( base == 16 && *nptr == '0' && (nptr[1] == 'X' || nptr[1] == 'x') )
-		nptr += 2;		/* skip past this prefix */
-
-	/* check whether there is at least one valid digit */
-
-	n = ToNumber(*nptr);
-	++nptr;
-
-	if ( !valid(n, base) )
-		return 0;		/* subject seq. not of expected form */
-
-	accum = n;
-
-	for ( toobig = 0; n = ToNumber(*nptr), valid(n, base); ++nptr )
-		if ( accum > UINTMAX_MAX / base + 1	/* major wrap-around */
-		  || (next = base * accum + n) < accum	/* minor wrap-around */
-		   )
-			toobig = 1;	/* but keep scanning */
-		else
-			accum = next;
-
-	if ( endptr != NULL )
-		*endptr = (char *)nptr;	/* points to first not-valid-digit */
-
-	if ( toobig )
-		{
-		errno = ERANGE;
-		return UINTMAX_MAX;
-		}
-	else
-		return minus ? -accum : accum;	/* (yes!) */
-	}
-
-unsigned long long __attribute__ ((alias ("strtoumax")))
-strtoull (const char* __restrict__ nptr, char ** __restrict__ endptr, int base);
diff --git a/winsup/mingw/mingwex/testwmem.c b/winsup/mingw/mingwex/testwmem.c
deleted file mode 100644
index 1310718c9..000000000
--- a/winsup/mingw/mingwex/testwmem.c
+++ /dev/null
@@ -1,104 +0,0 @@
-#include <memory.h>
-#include <wchar.h>
-#include <stdio.h>
-
-wchar_t fmt1[] =   L"         1         2         3         4         5";
-wchar_t fmt2[] =   L"12345678901234567890123456789012345678901234567890";
-
-void test_wmemchr( void )
-{
-   wchar_t* dest;
-   wint_t result;
-   wint_t ch = L'r';
-   wchar_t str[] =   L"lazy";
-   wchar_t string1[60] = L"The quick brown dog jumps over the lazy fox";
-
-   wprintf( L"Wmemchr\n" );
-   wprintf( L"String to be searched:\n\t\t%s\n", string1 );
-   wprintf( L"\t\t%s\n\t\t%s\n\n", fmt1, fmt2 );
-
-   wprintf( L"Search char:\t%c\n", ch );
-   dest = wmemchr( string1, ch, sizeof( string1 ) );
-   result = dest - string1 + 1;
-   if( dest != NULL )
-      wprintf( L"Result:\t\t%c found at position %d\n\n", ch, result );
-   else
-      wprintf( L"Result:\t\t%c not found\n\n" );
-return;
-}
-void test_wmemset( void )
-{/*                               1         2 
-                        0123456789012345678901234567890 */
-   wchar_t buffer[] = L"This is a test of the wmemset function";
-   wprintf( L"Before: %s\n", buffer );
-   wmemset( buffer+22, L'*', 7 );
-   wprintf( L"After:  %s\n\n", buffer );
-return;
-}
-
-void test_wmemmove( void )
-{
-    wchar_t string1[60] = L"The quick brown dog jumps over the lazy fox";
-    wchar_t string2[60] = L"The quick brown fox jumps over the lazy dog";
-
-    wprintf( L"Wmemcpy without overlap\n" );
-    wprintf( L"Source:\t\t%s\n", string1 + 40 );
-    wprintf( L"Destination:\t%s\n", string1 + 16 );
-    wmemcpy( string1 + 16, string1 + 40, 3 );
-    wprintf( L"Result:\t\t%s\n", string1 );
-    wprintf( L"Length:\t\t%d characters\n\n", wcslen( string1 ) );
-    wmemcpy( string1 + 16, string2 + 40, 3 );
-
-   wprintf( L"Wmemmove with overlap\n" );
-   wprintf( L"Source:\t\t%s\n", string2 + 4 );
-   wprintf( L"Destination:\t%s\n", string2 + 10 );
-   wmemmove( string2 + 10, string2 + 4, 40 );
-   wprintf( L"Result:\t\t%s\n", string2 );
-   wprintf( L"Length:\t\t%d characters\n\n", wcslen( string2 ) );
-
-   wprintf( L"Wmemcpy with overlap\n" );
-   wprintf( L"Source:\t\t%s\n", string1 + 4 );
-   wprintf( L"Destination:\t%s\n", string1 + 10 );
-   wmemcpy( string1 + 10, string1 + 4, 40 );
-   wprintf( L"Result:\t\t%s\n", string1 );
-   wprintf( L"Length:\t\t%d characters\n\n", wcslen( string1 ) );
-}
-
-
-void test_wmemcmp( void )
-{
-   wchar_t first[]  = L"12345678901234567890";
-   wchar_t second[] = L"12345678901234567891";
-   wint_t result;
-   wprintf(L"Wmemcmp\n"); 
-   wprintf( L"Compare '%.19s' to '%.19s':\n", first, second );
-   result = wmemcmp( first, second, 19 );
-   if( result < 0 )
-      wprintf( L"First is less than second.\n" );
-   else if( result == 0 )
-      wprintf( L"First is equal to second.\n" );
-   else if( result > 0 )
-      wprintf( L"First is greater than second.\n" );
-   wprintf( L"\nCompare '%.20s' to '%.20s':\n", first, second );
-   result = wmemcmp( first, second, 20 );
-   if( result < 0 )
-      wprintf( L"First is less than second.\n\n" );
-   else if( result == 0 )
-      wprintf( L"First is equal to second.\n\n" );
-   else if( result > 0 )
-      wprintf( L"First is greater than second.\n\n" );
-}
-
-
-
-int main(){
-test_wmemset();
-test_wmemmove();
-test_wmemchr();
-test_wmemcmp();
-return 0;
-}
-
-
-
-
diff --git a/winsup/mingw/mingwex/ulltoa.c b/winsup/mingw/mingwex/ulltoa.c
deleted file mode 100644
index 8e90de764..000000000
--- a/winsup/mingw/mingwex/ulltoa.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <stdlib.h>
-char* ulltoa(unsigned long long _n, char * _c, int _i)
-	{ return _ui64toa (_n, _c, _i); }
diff --git a/winsup/mingw/mingwex/ulltow.c b/winsup/mingw/mingwex/ulltow.c
deleted file mode 100644
index 8e4f228f1..000000000
--- a/winsup/mingw/mingwex/ulltow.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <stdlib.h>
-wchar_t* ulltow(unsigned long long _n, wchar_t * _w, int _i)
-	{ return _ui64tow (_n, _w, _i); }
diff --git a/winsup/mingw/mingwex/wcstof.c b/winsup/mingw/mingwex/wcstof.c
deleted file mode 100644
index 830f79416..000000000
--- a/winsup/mingw/mingwex/wcstof.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <wchar.h>
-
-float wcstof( const wchar_t *nptr, wchar_t **endptr)
-{
-  return (wcstod(nptr, endptr));
-}
diff --git a/winsup/mingw/mingwex/wcstoimax.c b/winsup/mingw/mingwex/wcstoimax.c
deleted file mode 100644
index 99bacf463..000000000
--- a/winsup/mingw/mingwex/wcstoimax.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-    This source code was extracted from the Q8 package created and
-    placed in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-
-    last edit:	1999/11/05	gwyn@arl.mil
-
-	Implements subclause 7.8.2 of ISO/IEC 9899:1999 (E).
-
-	This particular implementation requires the matching <inttypes.h>.
-	It also assumes that character codes for A..Z and a..z are in
-	contiguous ascending order; this is true for ASCII but not EBCDIC.
-*/
-
-#include <wchar.h>
-#include <errno.h>
-#include <ctype.h>
-#include <inttypes.h>
-
-/* convert digit wide character to number, in any base */
-
-#define ToWNumber(c)	(iswdigit(c) ? (c) - L'0' : \
-			 iswupper(c) ? (c) - L'A' + 10 : \
-			 iswlower(c) ? (c) - L'a' + 10 : \
-			 -1		/* "invalid" flag */ \
-			)
-
-/* validate converted digit character for specific base */
-#define valid(n, b)	((n) >= 0 && (n) < (b))
-
-intmax_t
-wcstoimax(nptr, endptr, base)
-	register const wchar_t * __restrict__	nptr;
-	wchar_t ** __restrict__				endptr;
-	register int					base;
-	{
-	register uintmax_t	accum;	/* accumulates converted value */
-	register int		n;	/* numeral from digit character */
-	int			minus;	/* set iff minus sign seen */
-	int			toobig;	/* set iff value overflows */
-
-	if ( endptr != NULL )
-		*endptr = (wchar_t *)nptr;	/* in case no conv performed */
-
-	if ( base < 0 || base == 1 || base > 36 )
-		{
-		errno = EDOM;
-		return 0;		/* unspecified behavior */
-		}
-
-	/* skip initial, possibly empty sequence of white-space w.characters */
-
-	while ( iswspace(*nptr) )
-		++nptr;
-
-	/* process subject sequence: */
-
-	/* optional sign */
-
-	if ( (minus = *nptr == L'-') || *nptr == L'+' )
-		++nptr;
-
-	if ( base == 0 )
-        {
-		if ( *nptr == L'0' )
-            {
-			if ( nptr[1] == L'X' || nptr[1] == L'x' )
-				base = 16;
-			else
-				base = 8;
-            }
-		else
-				base = 10;
-        }
-	/* optional "0x" or "0X" for base 16 */
-
-	if ( base == 16 && *nptr == L'0'
-	  && (nptr[1] == L'X' || nptr[1] == L'x')
-	   )
-		nptr += 2;		/* skip past this prefix */
-
-	/* check whether there is at least one valid digit */
-
-	n = ToWNumber(*nptr);
-	++nptr;
-
-	if ( !valid(n, base) )
-		return 0;		/* subject seq. not of expected form */
-
-	accum = n;
-
-	for ( toobig = 0; n = ToWNumber(*nptr), valid(n, base); ++nptr )
-		if ( accum > (uintmax_t)(INTMAX_MAX / base + 2) ) /* major wrap-around */
-			toobig = 1;	/* but keep scanning */
-		else
-			accum = base * accum + n;
-
-	if ( endptr != NULL )
-		*endptr = (wchar_t *)nptr;	/* -> first not-valid-digit */
-
-	if ( minus )
-		{
-		if ( accum > (uintmax_t)INTMAX_MAX + 1 )
-			toobig = 1;
-		}
-	else
-	if ( accum > (uintmax_t)INTMAX_MAX )
-		toobig = 1;
-
-	if ( toobig )
-		{
-		errno = ERANGE;
-		return minus ? INTMAX_MIN : INTMAX_MAX;
-		}
-	else
-		return (intmax_t)(minus ? -accum : accum);
-	}
-
-long long __attribute__ ((alias ("wcstoimax")))
-wcstoll (const wchar_t* __restrict__ nptr, wchar_t ** __restrict__ endptr, int base);
diff --git a/winsup/mingw/mingwex/wcstold.c b/winsup/mingw/mingwex/wcstold.c
deleted file mode 100644
index 85298807c..000000000
--- a/winsup/mingw/mingwex/wcstold.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  Wide char wrapper for strtold
- *  Revision history:
- *  6 Nov 2002	Initial version.
- *
- *  Contributor:   Danny Smith <dannysmith@users.sourceforege.net>
- */
-
- /* This routine has been placed in the public domain.*/
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <locale.h>
-#include <wchar.h>
-#include <stdlib.h>
-#include <string.h>
-
-extern int __asctoe64(const char * __restrict__ ss,
-	       short unsigned int * __restrict__ y);
-
-
-static __inline__ unsigned int get_codepage (void)
-{
-  char* cp;
-
-  /*
-    locale :: "lang[_country[.code_page]]" 
-               | ".code_page"
-  */
-  if ((cp = strchr(setlocale(LC_CTYPE, NULL), '.')))
-    return atoi( cp + 1);
-  else
-    return 0;
-}
-
-long double wcstold (const wchar_t * __restrict__ wcs, wchar_t ** __restrict__ wcse)
-{
-  char * cs;
-  int i;
-  int lenldstr;
-  union
-  {
-    unsigned short int us[6];
-    long double ld;
-  } xx;
-
-  unsigned int cp = get_codepage ();   
-  
-  /* Allocate enough room for (possibly) mb chars */
-  cs = (char *) malloc ((wcslen(wcs)+1) * MB_CUR_MAX);
-
-  if (cp == 0) /* C locale */
-    {
-      for (i = 0; (wcs[i] != 0) && wcs[i] <= 255; i++)
-        cs[i] = (char) wcs[i];                                                                                                                                                                                                                                                                                                   
-      cs[i]  = '\0';
-    }
-  else
-    {
-      int nbytes = -1;
-      int mb_len = 0;
-      /* loop through till we hit null or invalid character */
-      for (i = 0; (wcs[i] != 0) && (nbytes != 0); i++)
-	{
-     	  nbytes = WideCharToMultiByte(cp, WC_COMPOSITECHECK | WC_SEPCHARS,
-				       wcs + i, 1, cs + mb_len, MB_CUR_MAX,
-				       NULL, NULL);
-	  mb_len += nbytes;
-	}
-      cs[mb_len] = '\0';
-    }
-  lenldstr =  __asctoe64( cs, xx.us);
-  free (cs);
-  if (wcse)
-    *wcse = (wchar_t*) wcs + lenldstr;
-  return xx.ld;
-}
diff --git a/winsup/mingw/mingwex/wcstoumax.c b/winsup/mingw/mingwex/wcstoumax.c
deleted file mode 100644
index 9bd6cd704..000000000
--- a/winsup/mingw/mingwex/wcstoumax.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    This source code was extracted from the Q8 package created and
-    placed in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-
-    last edit:	1999/11/05	gwyn@arl.mil
-
-	Implements subclause 7.8.2 of ISO/IEC 9899:1999 (E).
-
-	This particular implementation requires the matching <inttypes.h>.
-	It also assumes that character codes for A..Z and a..z are in
-	contiguous ascending order; this is true for ASCII but not EBCDIC.
-*/
-
-#include <wchar.h>
-#include <errno.h>
-#include <ctype.h>
-#include <inttypes.h>
-
-/* convert digit wide character to number, in any base */
-
-#define ToWNumber(c)	(iswdigit(c) ? (c) - L'0' : \
-			 iswupper(c) ? (c) - L'A' + 10 : \
-			 iswlower(c) ? (c) - L'a' + 10 : \
-			 -1		/* "invalid" flag */ \
-			)
-
-/* validate converted digit character for specific base */
-#define valid(n, b)	((n) >= 0 && (n) < (b))
-
-uintmax_t
-wcstoumax(nptr, endptr, base)
-	register const wchar_t * __restrict__	nptr;
-	wchar_t ** __restrict__				endptr;
-	register int					base;
-	{
-	register uintmax_t	accum;	/* accumulates converted value */
-	register uintmax_t	next;	/* for computing next value of accum */
-	register int		n;	/* numeral from digit character */
-	int			minus;	/* set iff minus sign seen (yes!) */
-	int			toobig;	/* set iff value overflows */
-
-	if ( endptr != NULL )
-		*endptr = (wchar_t *)nptr;	/* in case no conv performed */
-
-	if ( base < 0 || base == 1 || base > 36 )
-		{
-		errno = EDOM;
-		return 0;		/* unspecified behavior */
-		}
-
-	/* skip initial, possibly empty sequence of white-space w.characters */
-
-	while ( iswspace(*nptr) )
-		++nptr;
-
-	/* process subject sequence: */
-
-	/* optional sign */
-
-	if ( (minus = *nptr == L'-') || *nptr == L'+' )
-		++nptr;
-
-	if ( base == 0 )
-        {
-		if ( *nptr == L'0' )
-            {
-			if ( nptr[1] == L'X' || nptr[1] == L'x' )
-				base = 16;
-			else
-				base = 8;
-            }
-		else
-				base = 10;
-        }
-	/* optional "0x" or "0X" for base 16 */
-
-	if ( base == 16 && *nptr == L'0'
-	  && (nptr[1] == L'X' || nptr[1] == L'x')
-	   )
-		nptr += 2;		/* skip past this prefix */
-
-	/* check whether there is at least one valid digit */
-
-	n = ToWNumber(*nptr);
-	++nptr;
-
-	if ( !valid(n, base) )
-		return 0;		/* subject seq. not of expected form */
-
-	accum = n;
-
-	for ( toobig = 0; n = ToWNumber(*nptr), valid(n, base); ++nptr )
-		if ( accum > UINTMAX_MAX / base + 1	/* major wrap-around */
-		  || (next = base * accum + n) < accum	/* minor wrap-around */
-		   )
-			toobig = 1;	/* but keep scanning */
-		else
-			accum = next;
-
-	if ( endptr != NULL )
-		*endptr = (wchar_t *)nptr;	/* -> first not-valid-digit */
-
-	if ( toobig )
-		{
-		errno = ERANGE;
-		return UINTMAX_MAX;
-		}
-	else
-		return minus ? -accum : accum;	/* (yes!) */
-	}
-
-unsigned long long __attribute__ ((alias ("wcstoumax")))
-wcstoull (const wchar_t* __restrict__ nptr, wchar_t ** __restrict__ endptr, int base);
diff --git a/winsup/mingw/mingwex/wdirent.c b/winsup/mingw/mingwex/wdirent.c
deleted file mode 100644
index 4b8cc5054..000000000
--- a/winsup/mingw/mingwex/wdirent.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#define _UNICODE 1
-#define UNICODE 1
-#include "dirent.c"
diff --git a/winsup/mingw/mingwex/wmemchr.c b/winsup/mingw/mingwex/wmemchr.c
deleted file mode 100644
index dc5cedd23..000000000
--- a/winsup/mingw/mingwex/wmemchr.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*	This source code was extracted from the Q8 package created and placed
-    in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-    Implements subclause 7.24 of ISO/IEC 9899:1999 (E).
-
-	It supports an encoding where all char codes are mapped
-	to the *same* code values within a wchar_t or wint_t,
-	so long as no other wchar_t codes are used by the program.
-
-*/
-
-#include	<wchar.h>
-
-wchar_t*
-wmemchr(s, c, n)
-	register const wchar_t	*s;
-	register wchar_t		c;
-	register size_t			n;
-	{
-	if ( s != NULL )
-		for ( ; n > 0; ++s, --n )
-			if ( *s == c )
-				return (wchar_t *)s;
-
-	return NULL;
-	}
-
diff --git a/winsup/mingw/mingwex/wmemcmp.c b/winsup/mingw/mingwex/wmemcmp.c
deleted file mode 100644
index e1e034c7b..000000000
--- a/winsup/mingw/mingwex/wmemcmp.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*	This source code was extracted from the Q8 package created and placed
-    in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-    Implements subclause 7.24 of ISO/IEC 9899:1999 (E).
-
-	It supports an encoding where all char codes are mapped
-	to the *same* code values within a wchar_t or wint_t,
-	so long as no other wchar_t codes are used by the program.
-
-*/
-
-#include	<wchar.h>
-
-int
-wmemcmp(s1, s2, n)
-	register const wchar_t	*s1;
-	register const wchar_t	*s2;
-	size_t				n;
-	{
-	if ( n == 0 || s1 == s2 )
-		return 0;		/* even for NULL pointers */
-
-	if ( (s1 != NULL) != (s2 != NULL) )
-		return s2 == NULL ? 1 : -1;	/* robust */
-
-	for ( ; n > 0; ++s1, ++s2, --n )
-		if ( *s1 != *s2 )
-			return *s1 - *s2;
-
-	return 0;
-	}
diff --git a/winsup/mingw/mingwex/wmemcpy.c b/winsup/mingw/mingwex/wmemcpy.c
deleted file mode 100644
index d7e7b4cb3..000000000
--- a/winsup/mingw/mingwex/wmemcpy.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*	This source code was extracted from the Q8 package created and placed
-    in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-    Implements subclause 7.24 of ISO/IEC 9899:1999 (E).
-
-	It supports an encoding where all char codes are mapped
-	to the *same* code values within a wchar_t or wint_t,
-	so long as no other wchar_t codes are used by the program.
-
-*/
-
-#include	<wchar.h>
-
-
-wchar_t *
-wmemcpy(s1, s2, n)
-	register wchar_t * __restrict__		s1;
-	register const wchar_t * __restrict__	s2;
-	register size_t					n;
-	{
-	wchar_t						*orig_s1 = s1;
-
-	if ( s1 == NULL || s2 == NULL || n == 0 )
-		return orig_s1;		/* robust */
-
-	for ( ; n > 0; --n )
-		*s1++ = *s2++;
-
-	return orig_s1;
-	}
-
diff --git a/winsup/mingw/mingwex/wmemmove.c b/winsup/mingw/mingwex/wmemmove.c
deleted file mode 100644
index 3c545ac32..000000000
--- a/winsup/mingw/mingwex/wmemmove.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	This source code was extracted from the Q8 package created and placed
-    in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-    Implements subclause 7.24 of ISO/IEC 9899:1999 (E).
-
-	It supports an encoding where all char codes are mapped
-	to the *same* code values within a wchar_t or wint_t,
-	so long as no other wchar_t codes are used by the program.
-
-*/
-
-#include	<errno.h>
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<wchar.h>
-
-wchar_t *
-wmemmove(s1, s2, n)
-	register wchar_t		*s1;
-	register const wchar_t	*s2;
-	register size_t			n;
-	{
-	wchar_t				*orig_s1 = s1;
-
-	if ( s1 == NULL || s2 == NULL || n == 0 )
-		return orig_s1;		/* robust */
-
-	/* XXX -- The following test works only within a flat address space! */
-	if ( s2 >= s1 )
-		for ( ; n > 0; --n )
-			*s1++ = *s2++;
-	else	{
-		s1 += n;
-		s2 += n;
-
-		for ( ; n > 0; --n )
-			*--s1 = *--s2;
-		}
-
-	return orig_s1;
-	}
-
diff --git a/winsup/mingw/mingwex/wmemset.c b/winsup/mingw/mingwex/wmemset.c
deleted file mode 100644
index dadd9fb07..000000000
--- a/winsup/mingw/mingwex/wmemset.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	This source code was extracted from the Q8 package created and placed
-    in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-    Implements subclause 7.24 of ISO/IEC 9899:1999 (E).
-
-	It supports an encoding where all char codes are mapped
-	to the *same* code values within a wchar_t or wint_t,
-	so long as no other wchar_t codes are used by the program.
-
-*/
-
-#include	<wchar.h>
-
-
-wchar_t *
-wmemset(s, c, n)
-	register wchar_t	*s;
-	register wchar_t	c;
-	register size_t		n;
-	{
-	wchar_t			*orig_s = s;
-
-	if ( s != NULL )
-		for ( ; n > 0; --n )
-			*s++ = c;
-
-	return orig_s;
-	}
-
diff --git a/winsup/mingw/mingwex/wtoll.c b/winsup/mingw/mingwex/wtoll.c
deleted file mode 100644
index 0bff278d1..000000000
--- a/winsup/mingw/mingwex/wtoll.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <stdlib.h>
-long long wtoll(const wchar_t * _w)
- 	{ return _wtoi64 (_w); }
diff --git a/winsup/mingw/mkinstalldirs b/winsup/mingw/mkinstalldirs
deleted file mode 100755
index cc8783edc..000000000
--- a/winsup/mingw/mkinstalldirs
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Last modified: 1994-03-25
-# Public domain
-
-errstatus=0
-
-for file in ${1+"$@"} ; do 
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d in ${1+"$@"} ; do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-        mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
-     fi
-
-     if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here
diff --git a/winsup/mingw/moldname.def.in b/winsup/mingw/moldname.def.in
deleted file mode 100644
index 8066275da..000000000
--- a/winsup/mingw/moldname.def.in
+++ /dev/null
@@ -1,154 +0,0 @@
-;
-; __FILENAME__
-;
-; Exports from the runtime except that these exports are actually preceeded
-; by a underscore in the actual DLL. These correspond to functions which
-; are non-ANSI and were prefixed with an underscore to avoid name space
-; clutter. However many, in fact most programs still use a few of these
-; functions without the underscore. This .def file is specially processed
-; to make those non-underscored name function calls call the equivalent
-; underscored functions.
-;
-; Contributors:
-;  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
-;  Maintained by Mumit Khan <khan@xraylith.wisc.edu>
-;
-;  THIS SOFTWARE IS NOT COPYRIGHTED
-;
-;  This source code is offered for use in the public domain. You may
-;  use, modify or distribute it freely.
-;
-;  This code is distributed in the hope that it will be useful but
-;  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
-;  DISCLAMED. This includes but is not limited to warrenties of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-;
-EXPORTS
-access
-beep
-chdir
-chmod
-chsize
-close
-creat
-cwait
-#if !(__CRTDLL__)
-daylight DATA
-#endif
-dup
-dup2
-ecvt
-eof
-execl
-execle
-execlp
-execlpe
-execv
-execve
-execvp
-execvpe
-fcvt
-fdopen
-fgetchar
-fgetwchar
-filelength
-fileno
-; Alias fpreset is set in CRT_fp10,c and CRT_fp8.c.
-; fpreset
-fputchar
-fputwchar
-fstat
-ftime
-gcvt
-getch
-getche
-getcwd
-getpid
-getw
-heapwalk
-isatty
-itoa
-kbhit
-lfind
-lsearch
-lseek
-ltoa
-memccpy
-memicmp
-mkdir
-mktemp
-open
-pclose
-popen
-putch
-putenv
-putw
-read
-rmdir
-rmtmp
-searchenv
-seterrormode
-setmode
-sleep
-sopen
-spawnl
-spawnle
-spawnlp
-spawnlpe
-spawnv
-spawnve
-spawnvp
-spawnvpe
-stat
-strcmpi
-strdup
-stricmp
-stricoll
-strlwr
-strnicmp
-strnset
-strrev
-strset
-strupr
-swab
-tell
-tempnam
-#if  !(__CRTDLL__)
-timezone DATA
-#endif
-; export tzname for both. See <time.h>
-tzname DATA
-tzset
-umask
-ungetch
-unlink
-utime
-wcsdup
-wcsicmp
-wcsicoll
-wcslwr
-wcsnicmp
-wcsnset
-wcsrev
-wcsset
-wcsupr
-#if  !(__CRTDLL__)
-wpopen
-#endif
-write
-; non-ANSI functions declared in math.h
-j0
-j1
-jn
-y0
-y1
-yn
-chgsign
-scalb
-finite
-fpclass
-; C99 functions
-cabs
-hypot
-logb
-nextafter
diff --git a/winsup/mingw/msvcrt.def.in b/winsup/mingw/msvcrt.def.in
deleted file mode 100644
index ad17e551f..000000000
--- a/winsup/mingw/msvcrt.def.in
+++ /dev/null
@@ -1,738 +0,0 @@
-;
-; __FILENAME__ 
-;    created from msvcrt.def.in
-;
-; Exports from msvcrt.dll. Msvcrt.dll appears to be distributed with
-; Internet Explorer 4.0, and may be more common in the future, but
-; right now it seems like a risky choice. There are differences, although
-; they seem to be minor overall, between the exports from msvcrt and msvcrt20.
-; However, for most purposes the two sets are interchangable.
-;
-; NOTE: All exports, except for what appeared to be C++ mangled names,
-;       are included. Not all functions have prototypes in the headers
-;       (and some are not functions at all).
-;
-; Contributors:
-;  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
-;
-;  THIS SOFTWARE IS NOT COPYRIGHTED
-;
-;  This source code is offered for use in the public domain. You may
-;  use, modify or distribute it freely.
-;
-;  This code is distributed in the hope that it will be useful but
-;  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
-;  DISCLAMED. This includes but is not limited to warrenties of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-;
-; $Revision$
-; $Author$
-; $Date$
-;
-EXPORTS
-_CIacos
-_CIasin
-_CIatan
-_CIatan2
-_CIcos
-_CIcosh
-_CIexp
-_CIfmod
-_CIlog
-_CIlog10
-_CIpow
-_CIsin
-_CIsinh
-_CIsqrt
-_CItan
-_CItanh
-_CxxThrowException
-_EH_prolog
-_Getdays
-_Getmonths
-_Gettnames
-_HUGE DATA
-_Strftime
-_XcptFilter
-__CxxFrameHandler
-__CxxLongjmpUnwind
-__RTCastToVoid
-__RTDynamicCast
-__RTtypeid
-__STRINGTOLD
-__argc DATA
-__argv DATA
-__badioinfo DATA
-__crtCompareStringA
-__crtGetLocaleInfoW
-__crtLCMapStringA
-__dllonexit
-__doserrno
-__fpecode
-__getmainargs
-__initenv DATA
-__isascii
-__iscsym
-__iscsymf
-__lc_codepage DATA
-__lc_handle DATA
-__lconv_init
-__mb_cur_max DATA
-__p___argc
-__p___argv
-__p___initenv
-__p___mb_cur_max
-__p___wargv
-__p___winitenv
-__p__acmdln
-__p__amblksiz
-__p__commode
-__p__daylight
-__p__dstbias
-__p__environ
-__p__fileinfo
-__p__fmode
-__p__iob
-__p__mbctype
-__p__osver
-__p__pctype
-__p__pgmptr
-__p__pwctype
-__p__timezone
-__p__tzname
-__p__wcmdln
-__p__wenviron
-__p__winmajor
-__p__winminor
-__p__winver
-__p__wpgmptr
-__pioinfo DATA
-__pxcptinfoptrs
-__set_app_type
-__setlc_active DATA
-__setusermatherr
-__threadhandle
-__threadid
-__toascii
-__unDName
-__unguarded_readlc_active DATA
-__wargv DATA
-__wgetmainargs
-__winitenv DATA
-_abnormal_termination
-_access
-_acmdln DATA
-_adj_fdiv_m16i
-_adj_fdiv_m32
-_adj_fdiv_m32i
-_adj_fdiv_m64
-_adj_fdiv_r
-_adj_fdivr_m16i
-_adj_fdivr_m32
-_adj_fdivr_m32i
-_adj_fdivr_m64
-_adj_fpatan
-_adj_fprem
-_adj_fprem1
-_adj_fptan
-_adjust_fdiv DATA
-_aexit_rtn DATA
-_amsg_exit
-_assert
-_atodbl
-_atoi64
-_atoldbl
-_beep
-_beginthread
-_beginthreadex
-_c_exit
-_cabs
-_callnewh
-_cexit
-_cgets
-_chdir
-_chdrive
-_chgsign
-_chmod
-_chsize
-_clearfp
-_close
-_commit
-_commode DATA
-_control87
-_controlfp
-_copysign
-_cprintf
-_cputs
-_creat
-_cscanf
-_ctype DATA
-_cwait
-_daylight DATA
-_dstbias DATA
-_dup
-_dup2
-_ecvt
-_endthread
-_endthreadex
-_environ DATA
-_eof
-_errno
-_except_handler2
-_except_handler3
-_execl
-_execle
-_execlp
-_execlpe
-_execv
-_execve
-_execvp
-_execvpe
-_exit
-_expand
-_fcloseall
-_fcvt
-_fdopen
-_fgetchar
-_fgetwchar
-_filbuf
-_fileinfo DATA
-_filelength
-_filelengthi64
-_fileno
-_findclose
-_findfirst
-_findfirsti64
-_findnext
-_findnexti64
-_finite
-_flsbuf
-_flushall
-_fmode DATA
-_fpclass
-_fpieee_flt
-_fpreset DATA
-_fputchar
-_fputwchar
-_fsopen
-_fstat
-_fstati64
-_ftime
-_ftol
-_fullpath
-_futime
-_gcvt
-_get_osfhandle
-_get_sbh_threshold
-_getch
-_getche
-_getcwd
-_getdcwd
-_getdiskfree
-_getdllprocaddr
-_getdrive
-_getdrives
-_getmaxstdio
-_getmbcp
-_getpid
-_getsystime
-_getw
-_getws
-_global_unwind2
-_heapadd
-_heapchk
-_heapmin
-_heapset
-_heapused
-_heapwalk
-_hypot
-_i64toa
-_i64tow
-_initterm
-_inp
-_inpd
-_inpw
-_iob DATA
-_isatty
-_isctype
-_ismbbalnum
-_ismbbalpha
-_ismbbgraph
-_ismbbkalnum
-_ismbbkana
-_ismbbkprint
-_ismbbkpunct
-_ismbblead
-_ismbbprint
-_ismbbpunct
-_ismbbtrail
-_ismbcalnum
-_ismbcalpha
-_ismbcdigit
-_ismbcgraph
-_ismbchira
-_ismbckata
-_ismbcl0
-_ismbcl1
-_ismbcl2
-_ismbclegal
-_ismbclower
-_ismbcprint
-_ismbcpunct
-_ismbcspace
-_ismbcsymbol
-_ismbcupper
-_ismbslead
-_ismbstrail
-_isnan
-_itoa
-_itow
-_j0
-_j1
-_jn
-_kbhit
-_lfind
-_loaddll
-_local_unwind2
-_lock
-_locking
-_logb
-_longjmpex
-_lrotl
-_lrotr
-_lsearch
-_lseek
-_lseeki64
-_ltoa
-_ltow
-_makepath
-_mbbtombc
-_mbbtype
-_mbccpy
-_mbcjistojms
-_mbcjmstojis
-_mbclen
-_mbctohira
-_mbctokata
-_mbctolower
-_mbctombb
-_mbctoupper
-_mbctype DATA
-_mbsbtype
-_mbscat
-_mbschr
-_mbscmp
-_mbscoll
-_mbscpy
-_mbscspn
-_mbsdec
-_mbsdup
-_mbsicmp
-_mbsicoll
-_mbsinc
-_mbslen
-_mbslwr
-_mbsnbcat
-_mbsnbcmp
-_mbsnbcnt
-_mbsnbcoll
-_mbsnbcpy
-_mbsnbicmp
-_mbsnbicoll
-_mbsnbset
-_mbsncat
-_mbsnccnt
-_mbsncmp
-_mbsncoll
-_mbsncpy
-_mbsnextc
-_mbsnicmp
-_mbsnicoll
-_mbsninc
-_mbsnset
-_mbspbrk
-_mbsrchr
-_mbsrev
-_mbsset
-_mbsspn
-_mbsspnp
-_mbsstr
-_mbstok
-_mbstrlen
-_mbsupr
-_memccpy
-_memicmp
-_mkdir
-_mktemp
-_msize
-_nextafter
-_onexit DATA
-_open
-_open_osfhandle
-_osver DATA
-_outp
-_outpd
-_outpw
-_pclose
-_pctype DATA
-_pgmptr DATA
-_pipe
-_popen
-_purecall
-_putch
-_putenv
-_putw
-_putws
-_pwctype DATA
-_read
-_rmdir
-_rmtmp
-_rotl
-_rotr
-_safe_fdiv
-_safe_fdivr
-_safe_fprem
-_safe_fprem1
-_scalb
-_searchenv
-_seh_longjmp_unwind
-_set_error_mode
-_set_sbh_threshold
-_seterrormode
-_setjmp
-_setjmp3
-_setmaxstdio
-_setmbcp
-_setmode
-_setsystime
-_sleep
-_snprintf
-_snwprintf
-_sopen
-_spawnl
-_spawnle
-_spawnlp
-_spawnlpe
-_spawnv
-_spawnve
-_spawnvp
-_spawnvpe
-_splitpath
-_stat
-_stati64
-_statusfp
-_strcmpi
-_strdate
-_strdup
-_strerror
-_stricmp
-_stricoll
-_strlwr
-_strncoll
-_strnicmp
-_strnicoll
-_strnset
-_strrev
-_strset
-_strtime
-_strupr
-_swab
-_sys_errlist DATA
-_sys_nerr DATA
-_tell
-_telli64
-_tempnam
-_timezone DATA
-_tolower
-_toupper
-_tzname DATA
-_tzset
-_ui64toa
-_ui64tow
-_ultoa
-_ultow
-_umask
-_ungetch
-_unlink
-_unloaddll
-_unlock
-_utime
-_vsnprintf
-_vsnwprintf
-_waccess
-_wasctime
-_wchdir
-_wchmod
-_wcmdln DATA
-_wcreat
-_wcsdup
-_wcsicmp
-_wcsicoll
-_wcslwr
-_wcsncoll
-_wcsnicmp
-_wcsnicoll
-_wcsnset
-_wcsrev
-_wcsset
-_wcsupr
-_wctime
-_wenviron DATA
-_wexecl
-_wexecle
-_wexeclp
-_wexeclpe
-_wexecv
-_wexecve
-_wexecvp
-_wexecvpe
-_wfdopen
-_wfindfirst
-_wfindfirsti64
-_wfindnext
-_wfindnexti64
-_wfopen
-_wfreopen
-_wfsopen
-_wfullpath
-_wgetcwd
-_wgetdcwd
-_wgetenv
-_winmajor DATA
-_winminor DATA
-_winver DATA
-_wmakepath
-_wmkdir
-_wmktemp
-_wopen
-_wperror
-_wpgmptr DATA
-_wpopen
-_wputenv
-_wremove
-_wrename
-_write
-_wrmdir
-_wsearchenv
-_wsetlocale
-_wsopen
-_wspawnl
-_wspawnle
-_wspawnlp
-_wspawnlpe
-_wspawnv
-_wspawnve
-_wspawnvp
-_wspawnvpe
-_wsplitpath
-_wstat
-_wstati64
-_wstrdate
-_wstrtime
-_wsystem
-_wtempnam
-_wtmpnam
-_wtoi
-_wtoi64
-_wtol
-_wunlink
-_wutime
-_y0
-_y1
-_yn
-abort
-abs
-acos
-asctime
-asin
-atan
-atan2
-atexit DATA
-atof
-atoi
-atol
-bsearch
-calloc
-ceil
-clearerr
-clock
-cos
-cosh
-ctime
-difftime
-div
-exit
-exp
-fabs
-fclose
-feof
-ferror
-fflush
-fgetc
-fgetpos
-fgets
-fgetwc
-fgetws
-floor
-fmod
-fopen
-fprintf
-fputc
-fputs
-fputwc
-fputws
-fread
-free
-freopen
-frexp
-fscanf
-fseek
-fsetpos
-ftell
-fwprintf
-fwrite
-fwscanf
-getc
-getchar
-getenv
-gets
-getwc
-getwchar
-gmtime
-is_wctype
-isalnum
-isalpha
-iscntrl
-isdigit
-isgraph
-isleadbyte
-islower
-isprint
-ispunct
-isspace
-isupper
-iswalnum
-iswalpha
-iswascii
-iswcntrl
-iswctype
-iswdigit
-iswgraph
-iswlower
-iswprint
-iswpunct
-iswspace
-iswupper
-iswxdigit
-isxdigit
-labs
-ldexp
-ldiv
-localeconv
-localtime
-log
-log10
-longjmp
-malloc
-mblen
-mbstowcs
-mbtowc
-memchr
-memcmp
-memcpy
-memmove
-memset
-mktime
-modf
-perror
-pow
-printf
-putc
-putchar
-puts
-putwc
-putwchar
-qsort
-raise
-rand
-realloc
-remove
-rename
-rewind
-scanf
-setbuf
-setlocale
-setvbuf
-signal
-sin
-sinh
-sprintf
-sqrt
-srand
-sscanf
-strcat
-strchr
-strcmp
-strcoll
-strcpy
-strcspn
-strerror
-strftime
-strlen
-strncat
-strncmp
-strncpy
-strpbrk
-strrchr
-strspn
-strstr
-strtod
-strtok
-strtol
-strtoul
-strxfrm
-swprintf
-swscanf
-system
-tan
-tanh
-time
-tmpfile
-tmpnam
-tolower
-toupper
-towlower
-towupper
-ungetc
-ungetwc
-vfprintf
-vfwprintf
-vprintf
-vsprintf
-vswprintf
-vwprintf
-wcscat
-wcschr
-wcscmp
-wcscoll
-wcscpy
-wcscspn
-wcsftime
-wcslen
-wcsncat
-wcsncmp
-wcsncpy
-wcspbrk
-wcsrchr
-wcsspn
-wcsstr
-wcstod
-wcstok
-wcstol
-wcstombs
-wcstoul
-wcsxfrm
-wctomb
-wprintf
-wscanf
-
diff --git a/winsup/mingw/mthr.c b/winsup/mingw/mthr.c
deleted file mode 100644
index f28236432..000000000
--- a/winsup/mingw/mthr.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * mthr.c
- *
- * Implement Mingw thread-support DLL .
- *
- * This file is used iff the following conditions are met:
- *  - gcc uses -mthreads option 
- *  - user code uses C++ exceptions
- *
- * The sole job of the Mingw thread support DLL (MingwThr) is to catch 
- * all the dying threads and clean up the data allocated in the TLSs 
- * for exception contexts during C++ EH. Posix threads have key dtors, 
- * but win32 TLS keys do not, hence the magic. Without this, there's at 
- * least `6 * sizeof (void*)' bytes leaks for each catch/throw in each
- * thread. The only public interface is __mingwthr_key_dtor(). 
- *
- * Created by Mumit Khan  <khan@nanotech.wisc.edu>
- *
- */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <stdlib.h>
-
-/* To protect the thread/key association data structure modifications. */
-CRITICAL_SECTION __mingwthr_cs;
-
-typedef struct __mingwthr_key __mingwthr_key_t;
-
-/* The list of threads active with key/dtor pairs. */
-struct __mingwthr_key {
-  DWORD key;
-  void (*dtor) (void *);
-  __mingwthr_key_t *next;
-};
-
-
-static __mingwthr_key_t *key_dtor_list;
-
-/*
- * __mingwthr_key_add:
- *
- * Add key/dtor association for this thread. If the thread entry does not
- * exist, create a new one and add to the head of the threads list; add
- * the new assoc at the head of the keys list. 
- *
- */
-
-static int
-___mingwthr_add_key_dtor ( DWORD key, void (*dtor) (void *))
-{
-  __mingwthr_key_t *new_key;
-
-  new_key = (__mingwthr_key_t *) calloc (1, sizeof (__mingwthr_key_t));
-  if (new_key == NULL)
-    return -1;
-  
-  new_key->key = key;
-  new_key->dtor = dtor;
-
-  EnterCriticalSection (&__mingwthr_cs);
-
-  new_key->next = key_dtor_list;
-  key_dtor_list = new_key;
-
-  LeaveCriticalSection (&__mingwthr_cs);
-
-#ifdef DEBUG
-  printf ("%s: allocating: (%ld, %x)\n", 
-          __FUNCTION__, key, dtor);
-#endif
-
-  return 0;
-}
-
-static int
-___mingwthr_remove_key_dtor ( DWORD key )
-{
-  __mingwthr_key_t *prev_key;
-  __mingwthr_key_t *cur_key;
-
-  EnterCriticalSection (&__mingwthr_cs);
-
-  prev_key = NULL;
-  cur_key = key_dtor_list;
-
-  while( cur_key != NULL )
-  {
-     if( cur_key->key == key )
-     {
-// take key/dtor out of list
-        if( prev_key == NULL )
-        {
-           key_dtor_list = cur_key->next;
-        }
-        else
-        {
-           prev_key->next = cur_key->next;
-        }
-
-#ifdef DEBUG
-        printf ("%s: removing: (%ld)\n", 
-                __FUNCTION__, key );
-#endif
-
-        free( cur_key );
-        break;
-     }
-
-     prev_key = cur_key;
-     cur_key = cur_key->next;
-  }
-
-  LeaveCriticalSection (&__mingwthr_cs);
-
-  return 0;
-}
-
-/*
- * __mingwthr_run_key_dtors (void):
- *
- * Callback from DllMain when thread detaches to clean up the key
- * storage. 
- *
- * Note that this does not delete the key itself, but just runs
- * the dtor if the current value are both non-NULL. Note that the
- * keys with NULL dtors are not added by __mingwthr_key_dtor, the
- * only public interface, so we don't need to check. 
- *
- */
-
-void
-__mingwthr_run_key_dtors (void)
-{
-  __mingwthr_key_t *keyp;
-
-#ifdef DEBUG
-  printf ("%s: Entering Thread id %ld\n", __FUNCTION__, GetCurrentThreadId() );
-#endif
-
-  EnterCriticalSection (&__mingwthr_cs);
-
-  for (keyp = key_dtor_list; keyp; )
-  {
-     LPVOID value = TlsGetValue (keyp->key);
-     if (GetLastError () == ERROR_SUCCESS)
-     {
-#ifdef DEBUG
-        printf ("   (%ld, %x)\n", keyp->key, keyp->dtor);
-#endif
-        if (value)
-           (*keyp->dtor) (value);
-     }
-#ifdef DEBUG
-     else
-     {
-        printf ("   TlsGetValue FAILED  (%ld, %x)\n", 
-                keyp->key, keyp->dtor);
-     }
-#endif
-     keyp = keyp->next;
-  }
-  
-  LeaveCriticalSection (&__mingwthr_cs);
-
-#ifdef DEBUG
-  printf ("%s: Exiting Thread id %ld\n", __FUNCTION__, GetCurrentThreadId() );
-#endif
-}
-  
-/*
- * __mingwthr_register_key_dtor (DWORD key, void (*dtor) (void *))
- *
- * Public interface called by C++ exception handling mechanism in
- * libgcc (cf: __gthread_key_create).
- *
- */
-
-__declspec(dllexport)
-int
-__mingwthr_key_dtor (DWORD key, void (*dtor) (void *))
-{
-  if (dtor)
-    {
-      return ___mingwthr_add_key_dtor (key, dtor);
-    }
-
-  return 0;
-}
-
-__declspec(dllexport)
-int
-__mingwthr_remove_key_dtor (DWORD key )
-{
-   return ___mingwthr_remove_key_dtor ( key );
-}
diff --git a/winsup/mingw/mthr_init.c b/winsup/mingw/mthr_init.c
deleted file mode 100644
index 5c8c8bbe8..000000000
--- a/winsup/mingw/mthr_init.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * mthr_init.c
- *
- * Do the thread-support DLL initialization.
- *
- * This file is used iff the following conditions are met:
- *  - gcc uses -mthreads option 
- *  - user code uses C++ exceptions
- *
- * The sole job of the Mingw thread support DLL (MingwThr) is to catch 
- * all the dying threads and clean up the data allocated in the TLSs 
- * for exception contexts during C++ EH. Posix threads have key dtors, 
- * but win32 TLS keys do not, hence the magic. Without this, there's at 
- * least `24 * sizeof (void*)' bytes leaks for each catch/throw in each
- * thread.
- * 
- * See mthr.c for all the magic.
- *  
- * Created by Mumit Khan  <khan@nanotech.wisc.edu>
- *
- */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <stdio.h>
-
-BOOL APIENTRY DllMain (HANDLE hDllHandle, DWORD reason, 
-                       LPVOID reserved /* Not used. */ );
-
-/*
- *----------------------------------------------------------------------
- *
- * DllMain --
- *
- *	This routine is called by the Mingw32, Cygwin32 or VC++ C run 
- *	time library init code, or the Borland DllEntryPoint routine. It 
- *	is responsible for initializing various dynamically loaded 
- *	libraries.
- *
- * Results:
- *      TRUE on sucess, FALSE on failure.
- *
- * Side effects:
- *
- *----------------------------------------------------------------------
- */
-BOOL APIENTRY
-DllMain (HANDLE hDllHandle /* Library instance handle. */,
-	 DWORD reason /* Reason this function is being called. */,
-	 LPVOID reserved /* Not used. */)
-{
-
-  extern CRITICAL_SECTION __mingwthr_cs;
-  extern void __mingwthr_run_key_dtors( void );
-
-#ifdef DEBUG
-  printf ("%s: reason %d\n", __FUNCTION__, reason );
-#endif
-
-  switch (reason)
-    {
-    case DLL_PROCESS_ATTACH:
-       InitializeCriticalSection (&__mingwthr_cs);
-       break;
-
-    case DLL_PROCESS_DETACH:
-      __mingwthr_run_key_dtors();
-       DeleteCriticalSection (&__mingwthr_cs);
-      break;
-
-    case DLL_THREAD_ATTACH:
-      break;
-
-    case DLL_THREAD_DETACH:
-      __mingwthr_run_key_dtors();
-      break;
-    }
-  return TRUE;
-}
diff --git a/winsup/mingw/mthr_stub.c b/winsup/mingw/mthr_stub.c
deleted file mode 100644
index cb926c16c..000000000
--- a/winsup/mingw/mthr_stub.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * mthr_stub.c
- *
- * Implement Mingw thread-support stubs for single-threaded C++ apps.
- *
- * This file is used by if gcc is built with --enable-threads=win32 and
- * iff gcc does *NOT* use -mthreads option. 
- *
- * The -mthreads implementation is in mthr.c.
- *
- * Created by Mumit Khan  <khan@nanotech.wisc.edu>
- *
- */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <assert.h>
-
-/*
- * __mingwthr_register_key_dtor (DWORD key, void (*dtor) (void *))
- *
- * Public interface called by C++ exception handling mechanism in
- * libgcc (cf: __gthread_key_create).
- *
- * THIS SHOULD NEVER BE CALLED!
- *
- */
-
-int
-__mingwthr_key_dtor (DWORD key, void (*dtor) (void *))
-{
-  assert (0);
-  /* NOTREACHED */
-  return 0;
-}
-
-
-int
-__mingwthr_remove_key_dtor (DWORD key )
-{
-  assert (0);
-  /* NOTREACHED */
-  return 0;
-}
diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in
deleted file mode 100644
index d6038d591..000000000
--- a/winsup/mingw/profile/Makefile.in
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# mingw/profile/Makefile.in: This file is part of Mingw runtime.
-#
-# This makefile requires GNU make.
-
-VPATH = @srcdir@
-srcdir = @srcdir@
-objdir = .
-
-target_alias = @target_alias@
-prefix = @prefix@
-
-program_transform_name = @program_transform_name@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-datadir = @datadir@
-infodir = @infodir@
-includedir = @includedir@
-
-SHELL = /bin/sh
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-mkinstalldirs = $(SHELL) $(srcdir)/../mkinstalldirs
-DISTFILES = Makefile.in configure configure.in gcrt0.c gmon.c gmon.h mcount.c \
-profil.c profil.h profile.h
-
-CC = @CC@
-# FIXME: Which is it, CC or CC_FOR_TARGET?
-CC_FOR_TARGET = $(CC)
-AS_FOR_TARGET = $(AS)
-CFLAGS = @CFLAGS@
-CXXFLAGS = @CXXFLAGS@
-
-# compiling with Cygwin?
-MNO_CYGWIN = @MNO_CYGWIN@
-
-# Either crtdll (CRT_ID 1) or msvcrt (CRT_ID 2).
-RUNTIME = @RUNTIME@
-CRT_ID = @CRT_ID@
-
-# Needed for threading dll.
-THREAD_DLL = @THREAD_DLL@
-THREAD_DLL_VERSION = 10
-THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
-
-W32API_INCLUDE = @W32API_INCLUDE@
-INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
-  -nostdinc -nostdinc++ \
-  -iwithprefixbefore include
-ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
-ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-AR_FLAGS = rcv
-RANLIB = @RANLIB@
-DLLTOOL = @DLLTOOL@
-DLLTOOLFLAGS = 
-DLLTOOL_FOR_TARGET = $(DLLTOOL)
-DLLTOOL_FLAGS = --as $(AS_FOR_TARGET)
-
-LIBGMON_A = @LIBGMON_A@
-LIBGMON_OBJS = gmon.o mcount.o profil.o
-CRT0S = @CRT0S@
-ALL_CRT0S = gcrt0.o gcrt1.o gcrt2.o
-
-LIBS = $(LIBGMON_A)
-DLLS = 
-
-all: $(LIBGMON_A)
-
-$(LIBGMON_A): $(LIBGMON_OBJS) $(CRT0S)
-	$(AR) $(ARFLAGS) $@ $(LIBGMON_OBJS)
-	$(RANLIB) $@
-
-# FIXME: These are really the same, but gcc specs want different names.
-# The only CRT dependency is atexit.
-gcrt0.o: gcrt0.c
-	$(CC)  -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $?
-
-gcrt1.o: gcrt0.c
-	$(CC) -U__MSVCRT__ -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $?
-
-gcrt2.o: gcrt0.c
-	$(CC) -D__MSVCRT__ -c -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $?
-
-#
-# Dependancies
-#
-gmon.o: gmon.c gmon.h profile.h profil.h
-mcount.o: mcount.c gmon.h profile.h
-profil.o: profil.c profil.h
-
-Makefile: Makefile.in config.status configure
-	$(SHELL) config.status
-
-config.status: configure
-	$(SHELL) config.status --recheck
-
-info:
-
-info-html:
-
-install-info: info
-
-install: all
-	$(mkinstalldirs) $(inst_libdir) 
-	for i in $(LIBS); do \
-		$(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
-	done
-	for i in $(CRT0S); do \
-		$(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
-	done
-	for sub in . ; do \
-	$(mkinstalldirs) $(inst_includedir)/$$sub ; \
-		for i in $(srcdir)/$$sub/*.h ; do \
-		  $(INSTALL_DATA) $$i $(inst_includedir)/$$sub/`basename $$i` ; \
-		done ; \
-	done
-
-clean:
-	-rm -f $(LIBGMON_OBJS) $(ALL_CRT0S) $(LIBGMON_A)
-
-distclean:
-	-rm -f *.o *.a *~ core a.out
-	-rm -f config.cache config.status config.log 
-	-rm -f Makefile
-.c.o:
-	$(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) $< -o $@
-
-dist:
-	mkdir $(distdir)/profile
-	chmod 755 $(distdir)/profile
-	@for i in $(DISTFILES); do\
-		cp -p $(srcdir)/$$i $(distdir)/profile/$$i ; \
-	done
-
diff --git a/winsup/mingw/profile/configure b/winsup/mingw/profile/configure
deleted file mode 100755
index 31ce5fcd9..000000000
--- a/winsup/mingw/profile/configure
+++ /dev/null
@@ -1,1035 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=gcrt0.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-CC=${CC-cc}
-
-AS=${AS-as}
-
-AR=${AR-ar}
-
-LD=${LD-ld}
-
-RANLIB=${RANLIB-ranlib}
-
-DLLTOOL=${DLLTOOL-dlltool}
-
-DLLWRAP=${DLLWRAP-dllwrap}
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:587: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:608: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:626: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-LIBGMON_A=libgmon.a
-
-case "$target_os" in
-*mingw32crt*)
-  CRT_ID=1
-  MNO_CYGWIN=
-  RUNTIME=crtdll
-  CRT0S="gcrt1.o gcrt2.o"
-  ;;
-*cygwin*)
-  CRT_ID=2
-  MNO_CYGWIN=-mno-cygwin
-  RUNTIME=msvcrt
-  CRT0S=gcrt0.o
-  # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
-  # overwrite Cygwin's one. Likewise for libgmon.a.
-  ;;
-*)
-  # Build it for MSVCRT by default.
-  CRT_ID=2
-  MNO_CYGWIN=
-  RUNTIME=msvcrt
-  CRT0S="gcrt1.o gcrt2.o"
-  ;;
-esac
-
-W32API_INCLUDE='-I $(srcdir)/../../w32api/include'
-
-
-
-
-
-
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:696: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@CC@%$CC%g
-s%@AS@%$AS%g
-s%@AR@%$AR%g
-s%@LD@%$LD%g
-s%@RANLIB@%$RANLIB%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@DLLWRAP@%$DLLWRAP%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CRT_ID@%$CRT_ID%g
-s%@RUNTIME@%$RUNTIME%g
-s%@MNO_CYGWIN@%$MNO_CYGWIN%g
-s%@LIBGMON_A@%$LIBGMON_A%g
-s%@CRT0S@%$CRT0S%g
-s%@W32API_INCLUDE@%$W32API_INCLUDE%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
-
diff --git a/winsup/mingw/profile/configure.in b/winsup/mingw/profile/configure.in
deleted file mode 100644
index 9e66cbf63..000000000
--- a/winsup/mingw/profile/configure.in
+++ /dev/null
@@ -1,75 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-dnl This file is part of Mingw runtime.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-AC_PREREQ(2.13)
-AC_INIT(gcrt0.c)
-
-CC=${CC-cc}
-AC_SUBST(CC)
-AS=${AS-as}
-AC_SUBST(AS)
-AR=${AR-ar}
-AC_SUBST(AR)
-LD=${LD-ld}
-AC_SUBST(LD)
-RANLIB=${RANLIB-ranlib}
-AC_SUBST(RANLIB)
-DLLTOOL=${DLLTOOL-dlltool}
-AC_SUBST(DLLTOOL)
-DLLWRAP=${DLLWRAP-dllwrap}
-AC_SUBST(DLLWRAP)
-AC_CANONICAL_SYSTEM
-
-LIBGMON_A=libgmon.a
-
-case "$target_os" in
-*mingw32crt*)
-  CRT_ID=1
-  MNO_CYGWIN=
-  RUNTIME=crtdll
-  CRT0S="gcrt1.o gcrt2.o"
-  ;;
-*cygwin*)
-  CRT_ID=2
-  MNO_CYGWIN=-mno-cygwin
-  RUNTIME=msvcrt
-  CRT0S=gcrt0.o
-  # Do not build libm.a when building under Cygwin winsup. Otherwise, it'll
-  # overwrite Cygwin's one. Likewise for libgmon.a.
-  ;;
-*)
-  # Build it for MSVCRT by default.
-  CRT_ID=2
-  MNO_CYGWIN=
-  RUNTIME=msvcrt
-  CRT0S="gcrt1.o gcrt2.o"
-  ;;
-esac
-
-W32API_INCLUDE='-I $(srcdir)/../../w32api/include'
-
-AC_SUBST(CRT_ID)
-AC_SUBST(RUNTIME)
-AC_SUBST(MNO_CYGWIN)
-AC_SUBST(LIBGMON_A)
-AC_SUBST(CRT0S)
-AC_SUBST(W32API_INCLUDE)
-
-AC_PROG_INSTALL
-AC_OUTPUT(Makefile)
-
diff --git a/winsup/mingw/profile/gcrt0.c b/winsup/mingw/profile/gcrt0.c
deleted file mode 100644
index 20f3c7ced..000000000
--- a/winsup/mingw/profile/gcrt0.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* gcrt0.c
-
-   Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/*
- * This file is taken from Cygwin distribution. Please keep it in sync.
- * The differences should be within __MINGW32__ guard.
- */
-
-#include <sys/types.h>
-#include <stdlib.h>
-
-#ifdef __MINGW32__
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef unsigned int u_int;
-typedef unsigned long u_long;
-#endif
-
-extern u_char etext asm ("etext");
-extern u_char eprol asm ("__eprol");
-extern void _mcleanup (void);
-extern void monstartup (u_long, u_long);
-void _monstartup (void) __attribute__((__constructor__));
-
-/* startup initialization for -pg support */
-
-void
-_monstartup (void)
-{
-  static int called;
-
-  /* Guard against multiple calls that may happen if DLLs are linked
-     with profile option set as well. Addede side benefit is that it
-     makes profiling backward compatible (GCC used to emit a call to
-     _monstartup when compiling main with profiling enabled).  */
-  if (called++)
-    return;
-
-  monstartup ((u_long) &eprol, (u_long) &etext);
-  atexit (&_mcleanup);
-}
-
-asm (".text");
-asm ("__eprol:");
-
diff --git a/winsup/mingw/profile/gmon.c b/winsup/mingw/profile/gmon.c
deleted file mode 100644
index b68f31818..000000000
--- a/winsup/mingw/profile/gmon.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*-
- * Copyright (c) 1983, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if !defined(lint) && defined(LIBC_SCCS)
-static char rcsid[] = "$OpenBSD: gmon.c,v 1.8 1997/07/23 21:11:27 kstailey Exp $";
-#endif
-
-/*
- * This file is taken from Cygwin distribution. Please keep it in sync.
- * The differences should be within __MINGW32__ guard.
- */
-
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#ifndef __MINGW32__
-#include <unistd.h>
-#include <sys/param.h>
-#endif
-#include <sys/types.h>
-#include <gmon.h>
-
-#include <profil.h>
-
-/* XXX needed? */
-//extern char *minbrk __asm ("minbrk");
-
-#ifdef __MINGW32__
-#define bzero(ptr,size) memset (ptr, 0, size);
-#endif
-
-struct gmonparam _gmonparam = { GMON_PROF_OFF };
-
-static int	s_scale;
-/* see profil(2) where this is describe (incorrectly) */
-#define		SCALE_1_TO_1	0x10000L
-
-#define ERR(s) write(2, s, sizeof(s))
-
-void	moncontrol __P((int));
-
-static void *
-fake_sbrk(int size)
-{
-    return malloc(size);
-}
-
-void
-monstartup(lowpc, highpc)
-	u_long lowpc;
-	u_long highpc;
-{
-	register int o;
-	char *cp;
-	struct gmonparam *p = &_gmonparam;
-
-	/*
-	 * round lowpc and highpc to multiples of the density we're using
-	 * so the rest of the scaling (here and in gprof) stays in ints.
-	 */
-	p->lowpc = ROUNDDOWN(lowpc, HISTFRACTION * sizeof(HISTCOUNTER));
-	p->highpc = ROUNDUP(highpc, HISTFRACTION * sizeof(HISTCOUNTER));
-	p->textsize = p->highpc - p->lowpc;
-	p->kcountsize = p->textsize / HISTFRACTION;
-	p->hashfraction = HASHFRACTION;
-	p->fromssize = p->textsize / p->hashfraction;
-	p->tolimit = p->textsize * ARCDENSITY / 100;
-	if (p->tolimit < MINARCS)
-		p->tolimit = MINARCS;
-	else if (p->tolimit > MAXARCS)
-		p->tolimit = MAXARCS;
-	p->tossize = p->tolimit * sizeof(struct tostruct);
-
-	cp = fake_sbrk(p->kcountsize + p->fromssize + p->tossize);
-	if (cp == (char *)-1) {
-		ERR("monstartup: out of memory\n");
-		return;
-	}
-
-	/* zero out cp as value will be added there */
-	bzero(cp, p->kcountsize + p->fromssize + p->tossize);
-
-	p->tos = (struct tostruct *)cp;
-	cp += p->tossize;
-	p->kcount = (u_short *)cp;
-	cp += p->kcountsize;
-	p->froms = (u_short *)cp;
-
-        /* XXX minbrk needed? */
-	//minbrk = fake_sbrk(0);
-	p->tos[0].link = 0;
-
-	o = p->highpc - p->lowpc;
-	if (p->kcountsize < o) {
-#ifndef notdef
-		s_scale = ((float)p->kcountsize / o ) * SCALE_1_TO_1;
-#else /* avoid floating point */
-		int quot = o / p->kcountsize;
-
-		if (quot >= 0x10000)
-			s_scale = 1;
-		else if (quot >= 0x100)
-			s_scale = 0x10000 / quot;
-		else if (o >= 0x800000)
-			s_scale = 0x1000000 / (o / (p->kcountsize >> 8));
-		else
-			s_scale = 0x1000000 / ((o << 8) / p->kcountsize);
-#endif
-	} else
-		s_scale = SCALE_1_TO_1;
-
-	moncontrol(1);
-}
-
-void
-_mcleanup()
-{
-	int fd;
-	int hz;
-	int fromindex;
-	int endfrom;
-	u_long frompc;
-	int toindex;
-	struct rawarc rawarc;
-	struct gmonparam *p = &_gmonparam;
-	struct gmonhdr gmonhdr, *hdr;
-	char *proffile;
-#ifdef DEBUG
-	int log, len;
-	char dbuf[200];
-#endif
-
-	if (p->state == GMON_PROF_ERROR)
-		ERR("_mcleanup: tos overflow\n");
-
-        hz = PROF_HZ;
-	moncontrol(0);
-
-#ifdef nope
-	if ((profdir = getenv("PROFDIR")) != NULL) {
-		extern char *__progname;
-		char *s, *t, *limit;
-		pid_t pid;
-		long divisor;
-
-		/* If PROFDIR contains a null value, no profiling
-		   output is produced */
-		if (*profdir == '\0') {
-			return;
-		}
-
-		limit = buf + sizeof buf - 1 - 10 - 1 -
-		    strlen(__progname) - 1;
-		t = buf;
-		s = profdir;
-		while((*t = *s) != '\0' && t < limit) {
-			t++;
-			s++;
-		}
-		*t++ = '/';
-
-		/*
-		 * Copy and convert pid from a pid_t to a string.  For
-		 * best performance, divisor should be initialized to
-		 * the largest power of 10 less than PID_MAX.
-		 */
-		pid = getpid();
-		divisor=10000;
-		while (divisor > pid) divisor /= 10;	/* skip leading zeros */
-		do {
-			*t++ = (pid/divisor) + '0';
-			pid %= divisor;
-		} while (divisor /= 10);
-		*t++ = '.';
-
-		s = __progname;
-		while ((*t++ = *s++) != '\0')
-			;
-
-		proffile = buf;
-	} else {
-		proffile = "gmon.out";
-	}
-#else
-	proffile = "gmon.out";
-#endif
-
-	fd = open(proffile , O_CREAT|O_TRUNC|O_WRONLY|O_BINARY, 0666);
-	if (fd < 0) {
-		perror( proffile );
-		return;
-	}
-#ifdef DEBUG
-	log = open("gmon.log", O_CREAT|O_TRUNC|O_WRONLY, 0664);
-	if (log < 0) {
-		perror("mcount: gmon.log");
-		return;
-	}
-	len = sprintf(dbuf, "[mcleanup1] kcount 0x%x ssiz %d\n",
-	    p->kcount, p->kcountsize);
-	write(log, dbuf, len);
-#endif
-	hdr = (struct gmonhdr *)&gmonhdr;
-	hdr->lpc = p->lowpc;
-	hdr->hpc = p->highpc;
-	hdr->ncnt = p->kcountsize + sizeof(gmonhdr);
-	hdr->version = GMONVERSION;
-	hdr->profrate = hz;
-	write(fd, (char *)hdr, sizeof *hdr);
-	write(fd, p->kcount, p->kcountsize);
-	endfrom = p->fromssize / sizeof(*p->froms);
-	for (fromindex = 0; fromindex < endfrom; fromindex++) {
-		if (p->froms[fromindex] == 0)
-			continue;
-
-		frompc = p->lowpc;
-		frompc += fromindex * p->hashfraction * sizeof(*p->froms);
-		for (toindex = p->froms[fromindex]; toindex != 0;
-		     toindex = p->tos[toindex].link) {
-#ifdef DEBUG
-			len = sprintf(dbuf,
-			"[mcleanup2] frompc 0x%x selfpc 0x%x count %d\n" ,
-				frompc, p->tos[toindex].selfpc,
-				p->tos[toindex].count);
-			write(log, dbuf, len);
-#endif
-			rawarc.raw_frompc = frompc;
-			rawarc.raw_selfpc = p->tos[toindex].selfpc;
-			rawarc.raw_count = p->tos[toindex].count;
-			write(fd, &rawarc, sizeof rawarc);
-		}
-	}
-	close(fd);
-}
-
-/*
- * Control profiling
- *	profiling is what mcount checks to see if
- *	all the data structures are ready.
- */
-void
-moncontrol(mode)
-	int mode;
-{
-	struct gmonparam *p = &_gmonparam;
-
-	if (mode) {
-		/* start */
-		profil((char *)p->kcount, p->kcountsize, p->lowpc,
-		    s_scale);
-		p->state = GMON_PROF_ON;
-	} else {
-		/* stop */
-		profil((char *)0, 0, 0, 0);
-		p->state = GMON_PROF_OFF;
-	}
-}
-
-
diff --git a/winsup/mingw/profile/gmon.h b/winsup/mingw/profile/gmon.h
deleted file mode 100644
index 1f01bf418..000000000
--- a/winsup/mingw/profile/gmon.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*	$OpenBSD: gmon.h,v 1.3 1996/04/21 22:31:46 deraadt Exp $	*/
-/*	$NetBSD: gmon.h,v 1.5 1996/04/09 20:55:30 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1982, 1986, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- */
-
-/*
- * This file is taken from Cygwin distribution. Please keep it in sync.
- * The differences should be within __MINGW32__ guard.
- */
-
-#ifndef _SYS_GMON_H_
-#define _SYS_GMON_H_
-
-#ifndef __P
-#define __P(x) x
-#endif
-
-#include <profile.h>
-
-#ifdef __MINGW32__
-#ifndef _BSDTYPES_DEFINED
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef unsigned int u_int;
-typedef unsigned long u_long;
-#define _BSDTYPES_DEFINED
-#endif /* _BSDTYPES_DEFINED */
-#endif /* __MINGW32__*/
-
-/*
- * Structure prepended to gmon.out profiling data file.
- */
-struct gmonhdr {
-	u_long	lpc;		/* base pc address of sample buffer */
-	u_long	hpc;		/* max pc address of sampled buffer */
-	int	ncnt;		/* size of sample buffer (plus this header) */
-	int	version;	/* version number */
-	int	profrate;	/* profiling clock rate */
-	int	spare[3];	/* reserved */
-};
-#define GMONVERSION	0x00051879
-
-/*
- * histogram counters are unsigned shorts (according to the kernel).
- */
-#define	HISTCOUNTER	unsigned short
-
-/*
- * fraction of text space to allocate for histogram counters here, 1/2
- */
-#define	HISTFRACTION	2
-
-/*
- * Fraction of text space to allocate for from hash buckets.
- * The value of HASHFRACTION is based on the minimum number of bytes
- * of separation between two subroutine call points in the object code.
- * Given MIN_SUBR_SEPARATION bytes of separation the value of
- * HASHFRACTION is calculated as:
- *
- *	HASHFRACTION = MIN_SUBR_SEPARATION / (2 * sizeof(short) - 1);
- *
- * For example, on the VAX, the shortest two call sequence is:
- *
- *	calls	$0,(r0)
- *	calls	$0,(r0)
- *
- * which is separated by only three bytes, thus HASHFRACTION is
- * calculated as:
- *
- *	HASHFRACTION = 3 / (2 * 2 - 1) = 1
- *
- * Note that the division above rounds down, thus if MIN_SUBR_FRACTION
- * is less than three, this algorithm will not work!
- *
- * In practice, however, call instructions are rarely at a minimal
- * distance.  Hence, we will define HASHFRACTION to be 2 across all
- * architectures.  This saves a reasonable amount of space for
- * profiling data structures without (in practice) sacrificing
- * any granularity.
- */
-#define	HASHFRACTION	2
-
-/*
- * percent of text space to allocate for tostructs with a minimum.
- */
-#define ARCDENSITY	2
-#define MINARCS		50
-#define MAXARCS		((1 << (8 * sizeof(HISTCOUNTER))) - 2)
-
-struct tostruct {
-	u_long	selfpc;
-	long	count;
-	u_short	link;
-	u_short pad;
-};
-
-/*
- * a raw arc, with pointers to the calling site and
- * the called site and a count.
- */
-struct rawarc {
-	u_long	raw_frompc;
-	u_long	raw_selfpc;
-	long	raw_count;
-};
-
-/*
- * general rounding functions.
- */
-#define ROUNDDOWN(x,y)	(((x)/(y))*(y))
-#define ROUNDUP(x,y)	((((x)+(y)-1)/(y))*(y))
-
-/*
- * The profiling data structures are housed in this structure.
- */
-struct gmonparam {
-	int		state;
-	u_short		*kcount;
-	u_long		kcountsize;
-	u_short		*froms;
-	u_long		fromssize;
-	struct tostruct	*tos;
-	u_long		tossize;
-	long		tolimit;
-	u_long		lowpc;
-	u_long		highpc;
-	u_long		textsize;
-	u_long		hashfraction;
-};
-extern struct gmonparam _gmonparam;
-
-/*
- * Possible states of profiling.
- */
-#define	GMON_PROF_ON	0
-#define	GMON_PROF_BUSY	1
-#define	GMON_PROF_ERROR	2
-#define	GMON_PROF_OFF	3
-
-/*
- * Sysctl definitions for extracting profiling information from the kernel.
- */
-#define	GPROF_STATE	0	/* int: profiling enabling variable */
-#define	GPROF_COUNT	1	/* struct: profile tick count buffer */
-#define	GPROF_FROMS	2	/* struct: from location hash bucket */
-#define	GPROF_TOS	3	/* struct: destination/count structure */
-#define	GPROF_GMONPARAM	4	/* struct: profiling parameters (see above) */
-#endif /* !_SYS_GMONH_ */
diff --git a/winsup/mingw/profile/mcount.c b/winsup/mingw/profile/mcount.c
deleted file mode 100644
index 296f8c891..000000000
--- a/winsup/mingw/profile/mcount.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*-
- * Copyright (c) 1983, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if !defined(lint) && !defined(_KERNEL) && defined(LIBC_SCCS)
-static char rcsid[] = "$OpenBSD: mcount.c,v 1.6 1997/07/23 21:11:27 kstailey Exp $";
-#endif
-
-/*
- * This file is taken from Cygwin distribution. Please keep it in sync.
- * The differences should be within __MINGW32__ guard.
- */
-
-#ifndef __MINGW32__
-#include <sys/param.h>
-#endif
-#include <sys/types.h>
-#include <gmon.h>
-
-/*
- * mcount is called on entry to each function compiled with the profiling
- * switch set.  _mcount(), which is declared in a machine-dependent way
- * with _MCOUNT_DECL, does the actual work and is either inlined into a
- * C routine or called by an assembly stub.  In any case, this magic is
- * taken care of by the MCOUNT definition in <machine/profile.h>.
- *
- * _mcount updates data structures that represent traversals of the
- * program's call graph edges.  frompc and selfpc are the return
- * address and function address that represents the given call graph edge.
- *
- * Note: the original BSD code used the same variable (frompcindex) for
- * both frompcindex and frompc.  Any reasonable, modern compiler will
- * perform this optimization.
- */
-//_MCOUNT_DECL __P((u_long frompc, u_long selfpc));
-_MCOUNT_DECL(frompc, selfpc)	/* _mcount; may be static, inline, etc */
-	register u_long frompc, selfpc;
-{
-	register u_short *frompcindex;
-	register struct tostruct *top, *prevtop;
-	register struct gmonparam *p;
-	register long toindex;
-
-	p = &_gmonparam;
-	/*
-	 * check that we are profiling
-	 * and that we aren't recursively invoked.
-	 */
-	if (p->state != GMON_PROF_ON)
-		return;
-	p->state = GMON_PROF_BUSY;
-	/*
-	 * check that frompcindex is a reasonable pc value.
-	 * for example:	signal catchers get called from the stack,
-	 *		not from text space.  too bad.
-	 */
-	frompc -= p->lowpc;
-	if (frompc > p->textsize)
-		goto done;
-
-#if (HASHFRACTION & (HASHFRACTION - 1)) == 0
-	if (p->hashfraction == HASHFRACTION)
-		frompcindex =
-		    &p->froms[frompc / (HASHFRACTION * sizeof(*p->froms))];
-	else
-#endif
-		frompcindex =
-		    &p->froms[frompc / (p->hashfraction * sizeof(*p->froms))];
-	toindex = *frompcindex;
-	if (toindex == 0) {
-		/*
-		 *	first time traversing this arc
-		 */
-		toindex = ++p->tos[0].link;
-		if (toindex >= p->tolimit)
-			/* halt further profiling */
-			goto overflow;
-
-		*frompcindex = toindex;
-		top = &p->tos[toindex];
-		top->selfpc = selfpc;
-		top->count = 1;
-		top->link = 0;
-		goto done;
-	}
-	top = &p->tos[toindex];
-	if (top->selfpc == selfpc) {
-		/*
-		 * arc at front of chain; usual case.
-		 */
-		top->count++;
-		goto done;
-	}
-	/*
-	 * have to go looking down chain for it.
-	 * top points to what we are looking at,
-	 * prevtop points to previous top.
-	 * we know it is not at the head of the chain.
-	 */
-	for (; /* goto done */; ) {
-		if (top->link == 0) {
-			/*
-			 * top is end of the chain and none of the chain
-			 * had top->selfpc == selfpc.
-			 * so we allocate a new tostruct
-			 * and link it to the head of the chain.
-			 */
-			toindex = ++p->tos[0].link;
-			if (toindex >= p->tolimit)
-				goto overflow;
-
-			top = &p->tos[toindex];
-			top->selfpc = selfpc;
-			top->count = 1;
-			top->link = *frompcindex;
-			*frompcindex = toindex;
-			goto done;
-		}
-		/*
-		 * otherwise, check the next arc on the chain.
-		 */
-		prevtop = top;
-		top = &p->tos[top->link];
-		if (top->selfpc == selfpc) {
-			/*
-			 * there it is.
-			 * increment its count
-			 * move it to the head of the chain.
-			 */
-			top->count++;
-			toindex = prevtop->link;
-			prevtop->link = top->link;
-			top->link = *frompcindex;
-			*frompcindex = toindex;
-			goto done;
-		}
-	}
-done:
-	p->state = GMON_PROF_ON;
-	return;
-overflow:
-	p->state = GMON_PROF_ERROR;
-	return;
-}
-
-/*
- * Actual definition of mcount function.  Defined in <machine/profile.h>,
- * which is included by <sys/gmon.h>
- */
-MCOUNT
-
diff --git a/winsup/mingw/profile/profil.c b/winsup/mingw/profile/profil.c
deleted file mode 100644
index dae59d7fd..000000000
--- a/winsup/mingw/profile/profil.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* profil.c -- win32 profil.c equivalent
-
-   Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-/*
- * This file is taken from Cygwin distribution. Please keep it in sync.
- * The differences should be within __MINGW32__ guard.
- */
-
-#include <windows.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <math.h>
-
-#include <profil.h>
-
-#define SLEEPTIME (1000 / PROF_HZ)
-
-/* global profinfo for profil() call */
-static struct profinfo prof;
-
-/* Get the pc for thread THR */
-
-static u_long
-get_thrpc (HANDLE thr)
-{
-  CONTEXT ctx;
-  u_long pc;
-  int res;
-
-  res = SuspendThread (thr);
-  if (res == -1)
-    return (u_long) - 1;
-  ctx.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
-  pc = (u_long) - 1;
-  if (GetThreadContext (thr, &ctx))
-    pc = ctx.Eip;
-  ResumeThread (thr);
-  return pc;
-}
-
-/* Display cell of profile buffer */
-#if 0
-static void
-print_prof (struct profinfo *p)
-{
-  printf ("profthr %x\ttarget thr %x\n", p->profthr, p->targthr);
-  printf ("pc: %x - %x\n", p->lowpc, p->highpc);
-  printf ("scale: %x\n", p->scale);
-  return;
-}
-#endif
-
-/* Everytime we wake up use the main thread pc to hash into the cell in the 
-   profile buffer ARG. */
-
-static DWORD CALLBACK
-profthr_func (LPVOID arg)
-{
-  struct profinfo *p = (struct profinfo *) arg;
-  u_long pc, idx;
-
-  for (;;)
-    {
-      pc = (u_long) get_thrpc (p->targthr);
-      if (pc >= p->lowpc && pc < p->highpc)
-	{
-	  idx = PROFIDX (pc, p->lowpc, p->scale);
-	  p->counter[idx]++;
-	}
-#if 0
-      print_prof (p);
-#endif
-      Sleep (SLEEPTIME);
-    }
-  return 0;
-}
-
-/* Stop profiling to the profiling buffer pointed to by P. */
-
-static int
-profile_off (struct profinfo *p)
-{
-  if (p->profthr)
-    {
-      TerminateThread (p->profthr, 0);
-      CloseHandle (p->profthr);
-    }
-  if (p->targthr)
-    CloseHandle (p->targthr);
-  return 0;
-}
-
-/* Create a timer thread and pass it a pointer P to the profiling buffer. */
-
-static int
-profile_on (struct profinfo *p)
-{
-  DWORD thrid;
-
-  /* get handle for this thread */
-  if (!DuplicateHandle (GetCurrentProcess (), GetCurrentThread (),
-			GetCurrentProcess (), &p->targthr, 0, FALSE,
-			DUPLICATE_SAME_ACCESS))
-    {
-      errno = ESRCH;
-      return -1;
-    }
-
-  p->profthr = CreateThread (0, 0, profthr_func, (void *) p, 0, &thrid);
-
-  /* Set profiler thread priority to highest to be sure that it gets the
-     processor as soon it request it (i.e. when the Sleep terminate) to get
-     the next data out of the profile. */
-
-  SetThreadPriority (p->profthr, THREAD_PRIORITY_TIME_CRITICAL);
-
-  if (!p->profthr)
-    {
-      CloseHandle (p->targthr);
-      p->targthr = 0;
-      errno = EAGAIN;
-      return -1;
-    }
-  return 0;
-}
-
-/*
- * start or stop profiling
- *
- * profiling goes into the SAMPLES buffer of size SIZE (which is treated
- * as an array of u_shorts of size size/2)
- * 
- * each bin represents a range of pc addresses from OFFSET.  The number
- * of pc addresses in a bin depends on SCALE.  (A scale of 65536 maps
- * each bin to two addresses, A scale of 32768 maps each bin to 4 addresses,
- * a scale of 1 maps each bin to 128k addreses).  Scale may be 1 - 65536,
- * or zero to turn off profiling
- */
-int
-profile_ctl (struct profinfo * p, char *samples, size_t size,
-	     u_long offset, u_int scale)
-{
-  u_long maxbin;
-
-  if (scale > 65536)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-  profile_off (p);
-  if (scale)
-    {
-      memset (samples, 0, size);
-      memset (p, 0, sizeof *p);
-      maxbin = size >> 1;
-      prof.counter = (u_short *) samples;
-      prof.lowpc = offset;
-      prof.highpc = PROFADDR (maxbin, offset, scale);
-      prof.scale = scale;
-
-      return profile_on (p);
-    }
-  return 0;
-}
-
-/* Equivalent to unix profil() 
-   Every SLEEPTIME interval, the user's program counter (PC) is examined: 
-   offset is subtracted and the result is multiplied by scale.  
-   The word pointed to by this address is incremented.  Buf is unused. */
-
-int
-profil (char *samples, size_t size, u_long offset, u_int scale)
-{
-  return profile_ctl (&prof, samples, size, offset, scale);
-}
-
diff --git a/winsup/mingw/profile/profil.h b/winsup/mingw/profile/profil.h
deleted file mode 100644
index 9245dd25a..000000000
--- a/winsup/mingw/profile/profil.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* profil.h: gprof profiling header file
-
-   Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/*
- * This file is taken from Cygwin distribution. Please keep it in sync.
- * The differences should be within __MINGW32__ guard.
- */
-
-/* profiling frequency.  (No larger than 1000) */
-#define PROF_HZ			100
-
-/* convert an addr to an index */
-#define PROFIDX(pc, base, scale)	\
-  ({									\
-    size_t i = (pc - base) / 2;				\
-    if (sizeof (unsigned long long int) > sizeof (size_t))		\
-      i = (unsigned long long int) i * scale / 65536;			\
-    else								\
-      i = i / 65536 * scale + i % 65536 * scale / 65536;		\
-    i;									\
-  })
-
-/* convert an index into an address */
-#define PROFADDR(idx, base, scale)		\
-  ((base)					\
-   + ((((unsigned long long)(idx) << 16)	\
-       / (unsigned long long)(scale)) << 1))
-
-/* convert a bin size into a scale */
-#define PROFSCALE(range, bins)		(((bins) << 16) / ((range) >> 1))
-
-typedef void *_WINHANDLE;
-
-struct profinfo {
-    _WINHANDLE targthr;			/* thread to profile */
-    _WINHANDLE profthr;			/* profiling thread */
-    u_short *counter;			/* profiling counters */
-    u_long lowpc, highpc;		/* range to be profiled */
-    u_int scale;			/* scale value of bins */
-};
-
-int profile_ctl(struct profinfo *, char *, size_t, u_long, u_int);
-int profil(char *, size_t, u_long, u_int);
-
diff --git a/winsup/mingw/profile/profile.h b/winsup/mingw/profile/profile.h
deleted file mode 100644
index 6c198d742..000000000
--- a/winsup/mingw/profile/profile.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$NetBSD: profile.h,v 1.6 1995/03/28 18:17:08 jtc Exp $	*/
-
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- */
-
-/*
- * This file is taken from Cygwin distribution. Please keep it in sync.
- * The differences should be within __MINGW32__ guard.
- */
-
-#define	_MCOUNT_DECL static inline void _mcount
-
-#define	MCOUNT \
-void									\
-mcount()								\
-{									\
-	 u_long selfpc, frompcindex;					\
-	/*								\
-	 * find the return address for mcount,				\
-	 * and the return address for mcount's caller.			\
-	 *								\
-	 * selfpc = pc pushed by mcount call				\
-	 */								\
-	/* __asm volatile ("movl 4(%%ebp),%0" : "=r" (selfpc));	*/	\
-	selfpc = (u_long) __builtin_return_address (0);			\
-	/*								\
-	 * frompcindex = pc pushed by call into self.			\
-	 */								\
-	/* __asm ("movl (%%ebp),%0;movl 4(%0),%0" : "=r" (frompcindex)); */	\
-	frompcindex = (u_long) __builtin_return_address (1);		\
-	_mcount(frompcindex, selfpc);					\
-}
-
diff --git a/winsup/mingw/pseudo-reloc-list.c b/winsup/mingw/pseudo-reloc-list.c
deleted file mode 100644
index 87a2be247..000000000
--- a/winsup/mingw/pseudo-reloc-list.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/*  Define here in .bss in case not defined by linker script. */
-char __RUNTIME_PSEUDO_RELOC_LIST_END__ = 0;
-char __RUNTIME_PSEUDO_RELOC_LIST__ = 0;
diff --git a/winsup/mingw/pseudo-reloc.c b/winsup/mingw/pseudo-reloc.c
deleted file mode 100644
index 9fe607d2c..000000000
--- a/winsup/mingw/pseudo-reloc.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* pseudo-reloc.c
-
-   Written by Egor Duda <deo@logos-m.ru>
-   THIS SOFTWARE IS NOT COPYRIGHTED
-
-   This source code is offered for use in the public domain. You may
-   use, modify or distribute it freely.
-
-   This code is distributed in the hope that it will be useful but
-   WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
-   DISCLAMED. This includes but is not limited to warrenties of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#include <windows.h>
-
-extern char __RUNTIME_PSEUDO_RELOC_LIST__;
-extern char __RUNTIME_PSEUDO_RELOC_LIST_END__;
-extern char _image_base__;
-
-typedef struct
-  {
-    DWORD addend;
-    DWORD target;
-  }
-runtime_pseudo_reloc;
-
-static void
-do_pseudo_reloc (void* start, void* end, void* base)
-{
-  DWORD reloc_target;
-  runtime_pseudo_reloc* r;
-  for (r = (runtime_pseudo_reloc*) start; r < (runtime_pseudo_reloc*) end; r++)
-    {
-      reloc_target = (DWORD) base + r->target;
-      *((DWORD*) reloc_target) += r->addend;
-    }
-}
-
-void
-_pei386_runtime_relocator ()
-{
-  do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,
-		   &__RUNTIME_PSEUDO_RELOC_LIST_END__,
-		   &_image_base__);
-}
diff --git a/winsup/mingw/readme.txt b/winsup/mingw/readme.txt
deleted file mode 100644
index 4b680df48..000000000
--- a/winsup/mingw/readme.txt
+++ /dev/null
@@ -1,685 +0,0 @@
-                      Minimalist GNU-Win32 Readme
-                            version 0.1.3
-                           March 20, 1997
-             Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
-
-
-0. Introduction
-
-Mingw32 is short for the Minimalist GNU-Win32 package, and it is a 
-package which allows you to use GCC (as supplied by Cygnus in their GNU-
-Win32 or Cygwin32 package) the GNU compiler, on Win32 platforms like 
-Windows 95 or NT, to compile "native" programs.
-
-In this case "native" means programs which don't require extra DLLs like 
-the cygwin DLL. Mingw32 programs use CRTDLL.DLL to provide their C run 
-time library functions, and CRTDLL.DLL is supplied with all current 
-Win32 platforms. Thus the programs are light weight and easy to 
-distribute, they also do not automatically fall under the GNU Public 
-License as programs written with the GPL version of Cygwin32 do.
-
-
-0.1 Archive Contents
-
-Mingw32 version 0.1.3 is distributed in two files, mingw32_013.tar.gz 
-and mingsrc013.tar.gz. The first file contains the following components:
-
-	- Import libraries for building programs which use the
-	  CRTDLL.DLL C run time library supplied with Win32 platforms.
-
-	- crt0.o and dllcrt0.o, two "startup code" object files that
-	  perform program or DLL initialization without using
-	  CRTDLL.DLL (instead of CYGWIN.DLL).
-
-	- specs, a configuration file for GCC which defines appropriate
-	  options for creating executables which use the CRTDLL.DLL C
-	  run time library.
-
-	- Include files with appropriate type and macro definitions,
-	  and function prototypes for use with CRTDLL.DLL.
-
-The source distribution (mingsrc013.tar.gz) contains the .def files and 
-source files used to create the various import libraries and object 
-files in the above list.
-
-
-0.2 Usage Notes
-
-Unlike some previous releases of Mingw32 the current version defaults to 
-building console applications, the same way that GCC normally does when 
-installed from the Cygnus distribution. The Mingw32 specs file also 
-introduces two command line arguments to GCC which can be used to 
-conveniently specify a console or GUI type build. When building console 
-programs "-console" can be used on the GCC command line, while GUI 
-programs can be built by specifying "-windows" (I tried defining -gui, 
-and it works, but produces an annoying warning about -gui not being 
-supported (?)). For example:
-
-	gcc -o hellogui.exe hellogui.c -luser32 -windows
-
-Although using different "crt0" files for GUI and console applications 
-has been suggested I have left the system more-or-less as it was in 
-0.1.1: crt0 sets up for and calls main, and if you don't supply a main 
-there is one in libmingw32.a, which in turn calls WinMain (actually 
-WinMain@16). This allows either main or WinMain entry points in console 
-or GUI applications, but if you don't supply main or WinMain, or don't 
-prototype WinMain as __stdcall__ you will get a linker error about an 
-"unresolved reference to WinMain@16." This is unfortunately cryptic, but 
-otherwise the system works quite well.
-
-An important note if you want to rebuild from the sources of Mingw32 or 
-otherwise use the special version of Jam made for Mingw32: you need to 
-have a version of "rm", the UNIX equivalent of del, somewhere in your 
-path to use the current Jambase (which is built into the Jam 
-executable). The version that comes with the Cygnus files is perfectly 
-adequate.
-
-
-0.3 Fixes and Improvements
-
-Numerous small bug fixes have been made in the header files.
-
-Floating point initialization, originally added in version 0.1.2, has 
-been modified to use the _fpreset function from CRTDLL.DLL instead of 
-cryptic and possibly less portable assembly code.
-
-A new DLL-building option has been added to the specs file so that the 
-following link line will appropriately link in dllcrt0.o instead of the 
-normal crt0.o, and set the entry point correctly:
-
-	gcc -dll -o dll.dll dll.o -Wl,dll.exp
-
-A bug that would cause the wrong include files to be included in dual 
-installations of Cygwin32 and Mingw32 has been fixed (I hope) in the 
-Mingw32 specs file.
-
-Alongside this release is a new release of Jam specially built for use 
-with Mingw32. It should be available from the same place you got this 
-file. This release of Jam includes rules for building DLLs, including 
-resources in your executables and creating import libraries. I also 
-intend to distribute a small set of example files showing how to do all 
-of these things with Mingw32 and Jam.
-
-In the "coming soon" category I have a version of the GNU Standard C++ 
-library ported to Mingw32. This means you can use iostreams, complex 
-numbers and all those neat STL (Standard Template Library) things 
-without needing the Cygwin DLL. I hope to put this port up for 
-downloading soon (along with the source of course).
-
-
-
-1. Installing
-
-1.1 Download and Unpack GNU-Win32 Beta 17.1
-
-Because of the enormous size of the beta 17.1 release from Cygnus this 
-process will require about 85 MB or more of free disk space. The first 
-step, after downloading the Mingw32 package, is to download the GCC 
-binary distribution, all.tar.gz, from Cygnus (or a mirror), which is 
-about 10 MB. (Of course, if you just want the Cygwin32 install and are 
-not actually interested in adding on Mingw32 you don't need the Mingw32 
-package at all.)
-
-Just to be safe, and if you have the 10 MB to spare, you should probably 
-copy the all.tar.gz file to a reasonably safe place at this point. This 
-will save you from the pain of downloading it again if something goes 
-wrong later.
-
-To complete this step you need a gzip program (or just gunzip) and a tar 
-program. You can use the ones supplied by Cygnus (although some people 
-seem to have trouble with them, especially if you try to use pipes) or 
-one of the other ports available from your favorite freeware/shareware 
-software site.
-
-First un-gzip the file with a command line like:
-	gunzip all.tar.gz
-or
-	gzip -d all.tar.gz
-
-This will produce a all.tar file and erase the all.tar.gz file (there 
-are options for gzip if you want to keep the original around). The tar 
-file is about 40 MB.
-
-Make a directory for the cygnus stuff, such as C:\cygnus for example. 
-Move the tar file there (e.g. move \tmp\all.tar \cygnus). Don�t copy it 
-unless you like waiting and wasting 40 MB of disk space.
-
-Unpack the tar file into your new directory with a command line like:
-	tar xvf all.tar
-
-Run from the new directory (now containing the tar file). This is the 
-step where disk space usage reaches its peak, since the tar extraction 
-does not delete the all.tar file, and the amount of space taken by the 
-extracted files plus the tar file itself is well in excess of 80 MB 
-(mainly because, on my system at least, the files which are symbolic 
-links in the tar archive are copied as they are expanded onto the FAT 
-filesystem, so for example, a symbolic link to cygwin.dll, a 3 MB file, 
-takes an extra 3 MB, since the file is simply duplicated in the new 
-location). I could not actually do this on my laptop and had to extract 
-the tar file from a mounted network drive!
-
-NOTE: From here on I will refer to files as if you had installed in 
-C:\cygnus. If you installed somewhere else then just replace C:\cygnus 
-with the appropriate path wherever it occurs.
-
-
-1.2 Setup Cygwin32
-
-This step is not 100% necessary, but it helps at this point to determine 
-if you�ve gotten this far without any major problems. Also, if you 
-intend to use both Cygwin32 and Mingw32 you will have to do some of 
-these steps eventually.
-
-GCC and the other programs in the compiler suite all require cygwin.dll 
-to run. There are two copies of this file: one in C:\cygnus\H-i386-
-cygwin32\bin (this might be a symbolic link), and one in C:\cygnus\H-
-i386-cygwin32\i386-cygwin32\lib (the original). Since this DLL is 
-required by all Cygwin32 programs it makes sense to put one copy of it 
-in your C:\Windows\System directory (or equivalent) and remove the extra 
-copies. This will also save you headaches when the next release comes 
-along and you have to make sure that everything is using the latest 
-release of the DLL.
-
-After doing that run the cygwin32.bat batch file included with this 
-distribution, or otherwise perform the following settings:
-
-	PATH=%PATH%;C:\cygnus\H-i386-cygwin32\bin
-	SET GCC_EXEC_PREFIX=C:\cygnus\H-i386-cygwin32\lib\gcc-lib\i386-
-		cygwin32\cygnus-2.7.2-961023
-	SET LIBRARY_PATH=/cygnus/H-i386-cygwin32/lib/gcc-lib/i386-
-		cygwin32/cygnus-2.7.2-961023:/cygnus/H-i386-cygwin32/i386-
-		cygwin32/lib:/cygnus/H-i386-cygwin32/lib
-	SET C_INCLUDE_PATH=/cygnus/H-i386-cygwin32/lib/gcc-lib/i386-
-		cygwin32/cygnus-2.7.2-961023/include:/cygnus/H-i386-
-		cygwin32/i386-cygwin32/include:/cygnus/include
-	SET CPLUS_INCLUDE_PATH=%C_INCLUDE_PATH%
-
-NOTE: You may need to increase the amount of environment space available 
-at the command prompt to get these extremely long environment variables 
-set. You can do this under Windows 95 by modifying the properties of the 
-command prompt shortcut you use under the "Program" tab, adding a 
-/e:#### argument to the command line COMMAND.COM, where #### is the 
-number of bytes to set aside for the environment.
-
-NOTE: Under Windows 95 changes made in your autoexec.bat file will not 
-show up in new DOS boxes unless you reboot your machine.
-
-Now write and compile a small test hello world program like this:
-
-#include <stdio.h>
-
-int
-main ()
-{
-	printf ("Hello, world!\n");
-	return 0;
-}
-
-Then compile it like this (assuming your file is called hello.c):
-
-	gcc -o hello.exe hello.c
-
-The compile should proceed without problems and you should be able to 
-run the hello program at the end. It should print "Hello, world!" 
-(without the quotes) to the console and then return to the command 
-prompt.
-
-If you wanted a full Cygwin32 install you now have it. With this setup 
-(say, by adding those lines above to your autoexec.bat or global 
-settings) you can port a great deal of UNIX code to run under Win32 
-systems. No more steps are necessary.
-
-If you are a minimalist or otherwise want to save disk space you should 
-continue from here. Also if you intend to use the Minimalist GNU-Win32 
-files to compile programs which don't use the Cygwin32 API you will need 
-to do some of the things mentioned below.
-
-If the compile didn't work for some reason check very carefully that you 
-followed the instructions above correctly and then check whether one or 
-more of the files in the download got corrupted. If neither of these 
-seems to be the case then your system is not behaving like my system. 
-Try looking at the troubleshooting section later in this file, and if 
-none of that helps then you can email me (colin@bird.fu.is.saga-
-u.ac.jp), though I can't promise I'll be a lot of help.
-
-
-1.3 Separating the Win32 API Files
-
-Mingw32 and Cygwin32 share the same set of Win32 API include files and 
-import libraries as included in the GCC distribution from Cygnus. In 
-order to use the Win32 API with a dual setup or with Mingw32 alone you 
-will have to separate those files from the bulk of the Cygwin32 API 
-files.
-
-Make a new directory to serve as the root for the Win32 API files. I put 
-mine under C:\cygnus and called it win32, but you can put it where you 
-like and just replace later references to C:\cygnus\win32 with your own 
-root directory.
-
-Move the following from C:\cygnus\H-i386-cygwin32\i386-cygwin32\include 
-to a new C:\cygnus\win32\include directory:
-
-windows.h, winadvapi.h, winbase.h, wincon.h, windef.h, windowsx.h, 
-winerror.h, wingdi.h, winkernel.h, winnt.h, wintypes.h, winuser.h, 
-winversion.h, commdlg.h, ddeml.h and the Windows32 sub-directory and all 
-its contents.
-
-Move the following files from C:\cygnus\H-i386-cygwin32\i386-
-cygwin32\lib to a new C:\cygnus\win32\lib directory:
-
-libadvapi32.a, libcomctl32.a, libcomdlg32.a, libctl3d32.a, libgdi32.a, 
-libglaux.a, libglu32.a, libimm32.a, libkernel32.a, liblz32.a, 
-libmapi32.a, libmfcuia32.a, libmgmtapi.a, libmpr.a, libmsacm32.a, 
-libnddeapi.a, libnetapi32.a, libodbc32.a, libodbccp32.a, libole32.a, 
-liboleaut32.a, liboledlg.a, libolepro32.a, libopengl32.a, libpenwin32.a, 
-libpkpd32.a, librasapi32.a, librpcdce4.a, librpcndr.a, librpcns4.a, 
-librpcrt4.a, libscrnsave.a, libshell32.a, libsnmp.a, libsvrapi.a, 
-libtapi32.a, libth32.a, libthunk32.a, liburl.a libuser32.a, libvdmdbg.a, 
-libversion.a, libvfw32.a, libwin32spl.a, libwinmm.a, libwinserve.a, 
-libwinspool.a, libwinstrm.a, libwow32.a, libwsock32.a, libwst.a.
-
-That list is quite excessive for most basic Windows programming, which 
-will only require kernel32, user32, gdi32, shell32 and possibly a couple 
-of others like the common control and dialog libraries or advapi32. You 
-may not need the ODBC support, or OLE, or Pen Windows, TAPI and on and 
-on. Still, if you have the space and intend to use the Win32 API you 
-might as well keep the ones you�re not sure you�ll ever use around.
-
-The lists above can also act as lists of files you can safely delete if 
-you are never going to use the Win32 API in your programs except that 
-libkernel32.a is still required even if you don�t use the Win32 API 
-yourself. Note that this means that libkernel32.a must be on the library 
-path as well, even if you don�t use the Win32 API. (Actually this 
-appears to be an artifact of the specs file supplied with Cygwin32. If 
-you like, and feel up to it, you can play around with the specs file and 
-remove the reference to kernel32.)
-
-Here are the variable settings you need to make to allow GCC to find the 
-Win32 API files in their new positions:
-
-	SET LIBRARY_PATH=%LIBRARY_PATH%:/cygnus/win32/lib
-	SET C_INCLUDE_PATH=%C_INCLUDE_PATH%:/cygnus/win32/include
-	SET CPLUS_INCLUDE_PATH=%CPLUS_INCLUDE_PATH%:/cygnus/win32/include
-
-The file win32-api.bat performs these settings. Run it after you run 
-cygwin32.bat (or mingw32.bat below).
-
-At this point you should be able to compile programs that use the Win32 
-API, just as you could before. You might want to do a simple test 
-compile to find out, for example this code:
-
-#include <windows.h>
-
-int STDCALL
-WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
-{
-	MessageBox (NULL, "Test message", "Test", MB_OK);
-	return 0;
-}
-
-Should compile with the following command line:
-	gcc -o test.exe test.c -lkernel32 -luser32 -Wl,--subsystem,windows
-
-It will produce a warning at link time about not finding 
-_WinMainCRTStartup, but this is harmless.
-
-If you have trouble check the troubleshooting section later in this 
-file.
-
-
-1.4 Specs
-
-The file C:\cygnus\H-i386-cygwin32\lib\gcc-lib\i386-cygwin32\cygnus-
-2.7.2-961023\specs includes a set of options and defaults for GCC, 
-including such things as which libraries are automatically linked into 
-executables and such. A different specs file is required depending on 
-whether you use Cygwin32 or Mingw32.
-
-To avoid GCC accidentally using the wrong specs file move specs to 
-C:\cygnus\H-i386-cygwin32\i386-cygwin32\lib.
-
-You can verify what specs file is being used by attempting a compile 
-with the -v option to gcc. Note that if no specs file is mentioned the 
-compiler will default to Cygwin32 behavior.
-
-
-1.5 The Mingw32 Files
-
-Now we can install the Mingw32 files and start making programs which 
-don�t use cygwin.dll or the Cygwin32 API. I install my copy under a 
-separate directory called C:\mingw32, but you could put them wherever 
-you like (e.g. C:\cygnus\mingw32). Again simply replace references to 
-C:\mingw32 with the directory where you perform your installation.
-
-After making the install directory copy mingw32_012.tgz to that 
-directory and run a command like this:
-	gunzip -d mingw32_012.tgz
-
-in that directory, followed by:
-	tar xvf mingw32_012.tar
-
-This will unpack the required files. Then you can use the following 
-environment variable settings (as included in mingw32.bat) to setup for 
-compiles using Mingw32:
-
-	PATH=%PATH%;C:\cygnus\H-i386-cygwin32\bin
-	SET GCC_EXEC_PREFIX=C:\cygnus\H-i386-cygwin32\lib\gcc-lib\i386-
-		cygwin32\cygnus-2.7.2-961023\
-	SET LIBRARY_PATH=/mingw32/lib
-	SET C_INCLUDE_PATH=/mingw32/include:/mingw32/include/nonansi
-	SET CPLUS_INCLUDE_PATH=%C_INCLUDE_PATH%
-
-The mingw32.bat file can be used the same way as the cygwin32.bat file. 
-Depending on which one you run you will be able to do Mingw32 compiles 
-or Cygwin32 compiles. Note that whichever one you use you must follow it 
-with an invocation of win32-api.bat so that libkernel32.a will be in the 
-library path.
-
-Setup is now complete, you have complete working Mingw32 and Cygwin32 
-compiles available along with the bash shell, tons of UNIX-like 
-utilities.
-
-If you had trouble with any of the steps above then the next section is 
-for you.
-
-
-
-2. Troubleshooting Setup Problems
-
-If you ran into trouble at any stage in the section 1 here are a few 
-general guidelines as well as some solutions to common problems.
-
-2.1 Winzip, gunzip or tar Complains of Errors
-
-Winzip may complain that it could not create a file with garbage 
-characters in it's name. Gunzip, gzip or tar may complain about 
-formatting errors. Usually this means that the downloaded file is 
-corrupted. As of this writing this problem was most commonly caused when 
-downloading the files from Geocities using Netscape Navigator for 
-Windows 95 or NT. A combination of a badly set MIME type at Geocities 
-and a bug in Netscape will corrupt files saved with "Save Link As" (and 
-clicking on the links would display the files as garbage text). At this 
-time the only solutions are to use another browser (IE, or Netscape for 
-UNIX or Apple systems) or to download from the Japanese mirror 
-(http://www.fu.is.saga-u.ac.jp/~colin/gcc.html). Hopefully Geocities 
-will eventually fix their problem.
-
-
-2.2 Compile and Link Time Problems: General Steps
-
-First, evaluate that your environment variables are what you expect them 
-to be by running the SET command with no arguments (if you are using the 
-bash shell then the output of env might also be illuminating). Do this 
-immediately before you attempt a compile in the same window as the 
-compile.
-
-Secondly include the '-v' option on the gcc command line. This will give 
-you far more information on what happens during the compile, especially 
-important are which specs file is being used and what include file 
-directories are being read, as well as the arguments to cpp and ld.
-
-If you send me email about a problem the output of these two general 
-steps will be very helpful in making a diagnosis.
-
-
-2.3 Cannot exec 'cpp'
-
-On compiling you get an error message like this:
-
-	GCC.EXE: installation problem, cannot exec `cpp': No such file
-	or directory
-	GCC.EXE: Internal compiler error: program cpp got fatal signal 127
-
-This means more or less what it says. The program cpp is the C 
-preprocessor (it strips comments and interprets all those lines 
-beginning in '#') and running it is the first step in compiling a C or 
-C++ program. The problem here is that GCC.EXE cannot find CPP.EXE. 
-Normally CPP.EXE is in the directory C:\cygnus\H-i386-cygwin32\lib\gcc-
-lib\i386-cygwin32\cygnus-2.7.2-961023\. If the file is there then 
-probably the GCC_EXEC_PREFIX environment variable is not correctly set.
-
-
-2.4 Can't Find Include Files
-
-You get an error like this:
-
-	hello.c:2: No include path in which to find stdio.h
-
-This, again, means what it says (more or less). The compiler cannot find 
-the file stdio.h which is #included in the source file hello.c at line 
-2. Of course the particular file names may differ in your case. If this 
-is not simply a case of including a really non-existent file or 
-misspelling the file name then probably your C_INCLUDE_PATH or 
-CPLUS_INCLUDE_PATH environment variable is wrong. (If not, see "But the 
-environment variables are right" below.)
-
-
-2.5 Can't Find Libraries
-
-At link time you get an error like this:
-
-	ld: cannot open -lkernel32: No such file or directory
-
-This one is a bit cryptic, mainly because the name of the file that 
-can't be opened is not "-lkernel32" but "libkernel32.a". "-lname" is the 
-ld command line syntax for linking the library named "libname.a". So 
-basically this error is saying it can't find libkernel32.a (or whatever 
-library matches the error you got). If you weren't trying to manually 
-link in a library that doesn't exist or was misspelled (by accidentally 
-including the 'lib' or '.a' on the command line for example) then 
-probably your LIBRARY_PATH environment variable is wrong. (If not, see 
-"But the environment variables are right" below.)
-
-
-2.6 But the Environment Variables are Right!
-
-You had one of the problems with not finding include files or libraries 
-but the environment variables all seem to be pointing at the right 
-places and the files are all there.
-
-If you installed on a drive other than C: drive this may be your 
-problem. The Cygwin DLL, and thus all the basic compiler tools, 
-automatically map C: drive to (UNIX-style) '/'. Thus /cygnus is actually 
-C:\cygnus. There are a few ways to fix this (without reinstalling on C: 
-drive):
-
-    - Map your actual install directory to /cygnus using mount
-      (mount.exe is included with the Cygnus distribution). Simply
-      type "mount D:\mydir /cygnus" (assuming you installed in the
-      directory \mydir on D: drive). Similar tricks can be used for
-      other directories which you may have installed on other drives.
-
-    - Change the mount of C: to / to the actual install drive. This is
-      possible by using the registry editor (regedit) included with
-      Windows. Start the editor and go to the key (or folder) "My
-      Computer\HKEY_CURRENT_USER\Software\Cygnus Support\CYGWIN.DLL
-      setup\b15.0\mounts". Under this key there are several numbered
-      keys. One of them will have the variables "native" set to "c:" and
-      "unix" set to "/". Change the value of "native" to whatever drive
-      you did your install on and everything should be fixed. NOTE: You
-      should probably do this after a fresh boot with no Cygnus based
-      programs running.
-
-
-2.7 Unresolved References to _impure_ptr and/or _ctype_ etc.
-
-At link time your code produces unresolved references to _impure_ptr, 
-_ctype_ and/or _errno, among others.
-
-This is the result of using the Cygwin header files but linking against 
-the Mingw32 libraries. I have hopefully managed to fix the bug that used 
-to cause this problem on any dual installation, but perhaps I haven't. 
-To check you can run gcc with the -v option and see if the list of 
-directories searched for include files contains any include directories 
-with Cygwin headers in them. If everything is working correctly you 
-should only see the directories on your C_INCLUDE_PATH in this list.
-
-If you have this problem then you may have to modify the Mingw32 specs 
-file, specifically the part that says:
-
-*cpp:
-%{posix:-D_POSIX_SOURCE} -iprefix /mingw32/include/
-
-These are options that get passed to the C preprocessor by gcc. Consult 
-the documentation for cpp and try options other than -iprefix. You may 
-have to use -nostdinc and/or -nostdinc++ plus -I options to get the 
-correct behavior.
-
-
-2.8 My Program Doesn't Print Any Output OR My Windows Program Creates
-    A Console Window
-
-Your console application runs, but doesn't print any output, or your GUI 
-application runs fine, but always creates an extra console window when 
-run from Explorer or by double clicking on an icon.
-
-These are basically two sides of the same coin. You have created a GUI 
-(or console) application when you meant to create a console (or GUI) 
-application. By default gcc creates console applications. If you make a 
-windows GUI application with a WinMain and all that you will still get a 
-console application if you don't tell gcc what to do at link time. The 
-relevant options are "-windows" "-Wl,--subsystem,windows" or "-Wl,--
-subsystem,console". The first two, if used on a gcc link line, will 
-create a proper GUI application. The last will make sure you are making 
-a console application.
-
-
-
-3. Optimizing and Reducing Disk Space Usage
-
-There are still vast amounts of disk space used by the Cygwin32 
-installation on your hard-drive, and much of it can be removed while 
-still maintaining a fully functional compiler system. The following 
-sections point out which files you actually need for certain tasks, so 
-that you won�t delete them.
-
-
-3.1 Bare Minimum
-
-For C only, Mingw32 compiles which don�t use the Win32 API, and if you 
-don�t want to produce DLLs or do debugging with any of the GNU tools the 
-list of files required is as follows:
-
-In C:\cygnus\H-i386-cygwin32\bin:
-	ar.exe, as.exe, gcc.exe, ld.exe
-
-In C:\cygnus\H-i386-cygwin32\lib\gcc-lib\i386-cygwin32\cygnus-2.7.2-
-961023:
-	cc1.exe, cpp.exe, libgcc.a
-
-In C:\cygnus\win32\lib:
-	libkernel32.a
-
-Plus all the files in C:\mingw32\lib and C:\mingw32\include and their 
-subdirectories.
-
-
-3.2 C++ Support
-
-To add C++ Support to the above the following extra files are required:
-
-In C:\cygnus\H-i386-cygwin32\lib\gcc-lib\i386-cygwin32\cygnus-2.7.2-
-961023:
-	cc1plus.exe
-
-Note that this does not include support for the standard C++ libraries 
-(only the C run time libraries) or for iostreams. That support is still 
-only available with the Cygwin32 API.
-
-
-3.3 Extra Utilities of Extreme Usefulness
-
-Even if you do not use the bash shell or UNIX utilities in general some 
-of the utilities in C:\cygnus\H-i386-cygwin32\bin are extremely useful 
-for debugging and probably shouldn�t be deleted if you intend to do any 
-actual programming using the system.
-
-These include:
-	dlltool.exe, gdb.exe, nm.exe, and strip.exe.
-
-
-3.4 Jam
-
-Jam is a make replacement program that I use pretty much exclusively, 
-which is why you don't find any Makefile, makefile, makefile.mk or all 
-that in the stuff that I do. You do find jamfiles and the occaisional 
-mk.bat file. The executable of Jam is only 80 KB and the program is 
-incredibly useful, so I would encourage you do download the special 
-Mingw32 version and check it out. The Mingw32 version has built in rules 
-for adding resources, building DLLs and import libraries as well as 
-normal C and C++ files. The source code is, of course, freely available.
-
-The actual point of this section though, is to point out that to use Jam 
-you need not only the Jam executable but also rm.exe from the Cygwin 
-distribution. You also might want to download rcl.exe and res2coff.exe 
-as these are the helper programs Jam expects to use for resource script 
-handling.
-
-
-4. Legalities
-
-All of the code in the Mingw32 package is available as public domain 
-source. You may use and modify the code as you like. Of course I 
-encourage you to write software which is free, either public domain or 
-under the GNU Public License for example, but that is up to you. Linking 
-with the libraries included with Mingw32 similarly does not impose any 
-licensing restrictions on your code or binaries.
-
-The library libgcc.a, which is linked into all code produced with GCC, 
-is under a special version of the LGPL (as far as I know, you should 
-check for yourself) which allows the distribution of programs which are 
-simply linked with unmodified versions of libgcc.a with no licensing 
-restrictions.
-
-Thus, using Mingw32, you should be able to produce code with no 
-licensing restrictions imposed by use of the compiler or libraries. The 
-Cygwin32 API, and the GNU libraries are another matter and you should 
-consult their license agreements.
-
-Again I must stress that I am not a lawyer and the above statements only 
-reflect my personal understanding of the situation. You would be well 
-advised to consult the actual text of the appropriate copyright notices 
-and license agreements if you have any concerns.
-
-
-5. Support
-
-First of all, the Mingw32 code is supplied AS IS with NO WARRANTY either 
-EXPRESS or IMPLIED.
-
-There is also no support staff standing by to take your calls. There 
-are, however, a few people, including myself, using Mingw32 who might be 
-able to help you. If you have problems you can email me at 
-colin@bird.fu.is.saga-u.ac.jp and I will try to get back to you. No 
-guarantees, but I will do my best.
-
-
-6. Suggestions and Contributions
-
-If you find a bug in the Mingw32 files themselves then feel free to 
-report it, or even better to supply a fix, by emailing me at 
-colin@bird.fu.is.saga-u.ac.jp. Any fixes I receive will probably go into 
-the next release, and if they seem high-priority I may put the patched 
-files on my web page until I can make a complete release. Please note 
-that if you supply code it must be in the public domain or I cannot 
-include it in Mingw32. Please attach an appropriate legal message to the 
-code or otherwise make sure that there are no copyright issues. Of 
-course if you just suggest a possible method for solving a problem or 
-point out a bug then there should be no need for all that.
-
-Note that the Win32 API header files are not actually part of the 
-Mingw32 package. I know there are many bugs and omissions, and I try to 
-keep informed about them, so I do appreciate mail pointing them out. 
-However I can�t fix these problems at the source. You should send email 
-to Scott Christley (the author of the GPL windows32-api) or possibly to 
-Cygnus. Sending email to me might get me to mention it on my homepage or 
-fix it in my personal copy of the header files, but that�s about it 
-(sorry).
-
-Aside from bug reports, suggestions for improvements, testing of the 
-header files and otherwise praise or criticism is all welcome in my 
-inbox.
-
-Good luck,
-Colin Peters (colin@bird.fu.is.saga-u.ac.jp)
-
diff --git a/winsup/mingw/samples/dirent/jamfile b/winsup/mingw/samples/dirent/jamfile
deleted file mode 100644
index c920ffe9b..000000000
--- a/winsup/mingw/samples/dirent/jamfile
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Main test.exe : test.c ;
-
diff --git a/winsup/mingw/samples/dirent/test.c b/winsup/mingw/samples/dirent/test.c
deleted file mode 100644
index 9ff4267ee..000000000
--- a/winsup/mingw/samples/dirent/test.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * A test which demonstrates the use of opendir and related functions
- * declared in dirent.h.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include <dirent.h>
-
-int
-main (int argc, char* argv[])
-{
-	int 		i;
-	struct dirent*	de;
-	DIR*		dir;
-	long		lPos;
-
-	if (argc == 2)
-	{
-		printf ("Opening directory \"%s\"\n", argv[1]);
-		dir = opendir(argv[1]);
-	}
-	else
-	{
-		printf ("Opening \".\"\n");
-		dir = opendir(".");
-	}
-
-	if (!dir)
-	{
-		printf ("Directory open failed!\n");
-		if (errno)
-		{
-			printf ("Error : %s\n", strerror(errno));
-		}
-		return 1;
-	}
-
-	i = 0;
-	lPos = -1;
-
-	while (de = readdir (dir))
-	{
-		i++;
-		printf ("%d : \"%s\" (tell %ld)\n", i, de->d_name,
-			telldir(dir));
-
-		if (i == 3)
-		{
-			printf ("We will seek here later.\n");
-			lPos = telldir (dir);
-		}
-	}
-
-	printf ("Rewind directory.\n");
-	rewinddir (dir);
-
-	if (de = readdir (dir))
-	{
-		printf ("First entry : \"%s\"\n", de->d_name);
-	}
-	else
-	{
-		printf ("Empty directory.\n");
-	}
-
-	if (lPos != -1)
-	{
-		printf ("Seeking to fourth entry.\n");
-		seekdir (dir, lPos);
-
-		if (de = readdir (dir))
-		{
-			printf ("Fourth entry : \"%s\"\n", de->d_name);
-		}
-		else
-		{
-			printf ("No fourth entry.\n");
-		}
-	}
-	else
-	{
-		printf ("Seek position is past end of directory.\n");
-	}
-
-	printf ("Closing directory.\n");
-	closedir (dir);
-}
-
diff --git a/winsup/mingw/samples/dirent/wtest.c b/winsup/mingw/samples/dirent/wtest.c
deleted file mode 100644
index 798544374..000000000
--- a/winsup/mingw/samples/dirent/wtest.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * A test which demonstrates the use of _wopendir and related
- * wide	char functions declared in dirent.h. 
- *
- * TODO: Make this _UNICODE neutral using tchar.h mappings.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <dirent.h>
-
-int
-main (int argc, char* argv[])
-{
-	int 		i;
-	struct _wdirent*	de;
-	_WDIR*		dir;
-	long		lPos;
-
-	if (argc == 2)
-	{
-		size_t len = strlen(argv[1]) + 1;
-	        wchar_t* wpath = (wchar_t*) malloc(len *sizeof(wchar_t));
-		mbstowcs(wpath, argv[1], len); 
-		wprintf (L"Opening directory \"%s\"\n", wpath);
-		dir = _wopendir(wpath);
-		free (wpath);
-	}
-	else
-	{
-		wprintf (L"Opening \".\"\n");
-		dir = _wopendir(L".");
-	}
-
-	if (!dir)
-	{
-		wprintf (L"Directory open failed!\n");
-		if (errno)
-		{
-			wprintf (L"Error : %S\n", strerror(errno));
-		}
-		return 1;
-	}
-
-	i = 0;
-	lPos = -1;
-
-	while ((de = _wreaddir (dir)))
-	{
-		i++;
-		wprintf (L"%d : \"%s\" (tell %ld)\n", i, de->d_name,
-			_wtelldir(dir));
-
-		if (i == 3)
-		{
-			wprintf (L"We will seek here later.\n");
-			lPos = _wtelldir (dir);
-		}
-	}
-
-	printf ("Rewind directory.\n");
-	_wrewinddir (dir);
-
-	if ((de = _wreaddir (dir)))
-	{
-		wprintf (L"First entry : \"%s\"\n", de->d_name);
-	}
-	else
-	{
-		wprintf (L"Empty directory.\n");
-	}
-
-	if (lPos != -1)
-	{
-		wprintf (L"Seeking to fourth entry.\n");
-		_wseekdir (dir, lPos);
-
-		if ((de = _wreaddir (dir)))
-		{
-			wprintf (L"Fourth entry : \"%s\"\n", de->d_name);
-		}
-		else
-		{
-			wprintf (L"No fourth entry.\n");
-		}
-	}
-	else
-	{
-		wprintf (L"Seek position is past end of directory.\n");
-	}
-
-	wprintf (L"Closing directory.\n");
-	_wclosedir (dir);
-return 0;
-}
-
diff --git a/winsup/mingw/samples/dlltest/dll.c b/winsup/mingw/samples/dlltest/dll.c
deleted file mode 100644
index 257b1b8ff..000000000
--- a/winsup/mingw/samples/dlltest/dll.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Source code of the functions inside our test DLL. Note that DllMain is
- * not required (it will be provided by the stub in libmingw32.a).
- */
-
-#if 0
-#include <windows.h>
-#endif
-
-int Add (int x, int y)
-{
-	printf ("In add!\nx = %d\ny = %d\n", x, y);
-	return (x + y);
-}
-
-
-double __attribute__((stdcall)) Sub (double x, double y) 
-{
-	printf ("In sub!\nx = %f\ny = %f\n", x, y);
-	return (x - y);
-}
-
diff --git a/winsup/mingw/samples/dlltest/dll.def b/winsup/mingw/samples/dlltest/dll.def
deleted file mode 100644
index b20a405d8..000000000
--- a/winsup/mingw/samples/dlltest/dll.def
+++ /dev/null
@@ -1,3 +0,0 @@
-EXPORTS
-Add
-Sub@16
diff --git a/winsup/mingw/samples/dlltest/dll.h b/winsup/mingw/samples/dlltest/dll.h
deleted file mode 100644
index 8fac5332b..000000000
--- a/winsup/mingw/samples/dlltest/dll.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-int Add (int x, int y);
-double __attribute__((stdcall)) Sub (double x, double y);
-
diff --git a/winsup/mingw/samples/dlltest/exe.c b/winsup/mingw/samples/dlltest/exe.c
deleted file mode 100644
index d778348e4..000000000
--- a/winsup/mingw/samples/dlltest/exe.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <stdio.h>
-
-#include "dll.h"
-
-int main()
-{
-	int i, j, k;
-	double	dk;
-
-	i = 10;
-	j = 13;
-
-	k = Add(i, j);
-
-	printf ("%d + %d = %d\n", i, j, k);
-    
-	dk = Sub(i, j);
-
-	printf ("%d - %d = %f\n", i, j, dk);
-
-	return 0;
-}
-
diff --git a/winsup/mingw/samples/dlltest/exe.exp b/winsup/mingw/samples/dlltest/exe.exp
deleted file mode 100644
index 887fdb0ac..000000000
--- a/winsup/mingw/samples/dlltest/exe.exp
+++ /dev/null
@@ -1,8 +0,0 @@
-In add!
-x = 10
-y = 13
-10 + 13 = 23
-In sub!
-x = 10
-y = 13
-10 - 13 = -3
diff --git a/winsup/mingw/samples/dlltest/expexe.c b/winsup/mingw/samples/dlltest/expexe.c
deleted file mode 100644
index d94ea1e7e..000000000
--- a/winsup/mingw/samples/dlltest/expexe.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#include <stdio.h>
-
-int
-ExportedFromExe ()
-{
-	printf ("This output produced by ExportedFromExe.\n");
-	return 0;
-}
-
-int main()
-{
-	printf ("Hello, world\n");
-
-	return 0;
-}
-
diff --git a/winsup/mingw/samples/dlltest/expexe.def b/winsup/mingw/samples/dlltest/expexe.def
deleted file mode 100644
index 309f1508f..000000000
--- a/winsup/mingw/samples/dlltest/expexe.def
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPORTS
-ExportedFromExe
diff --git a/winsup/mingw/samples/dlltest/jamfile b/winsup/mingw/samples/dlltest/jamfile
deleted file mode 100644
index 5278d0379..000000000
--- a/winsup/mingw/samples/dlltest/jamfile
+++ /dev/null
@@ -1,46 +0,0 @@
-

-# This option is required to successfully return doubles via STDCALL as in

-# Sub function in dll.c.

-CCFLAGS = -mno-fp-ret-in-387 ;

-

-Main exe.exe : exe.c ;

-

-LinkLibraries exe.exe : libdll.a ;

-

-DEPENDS exe.exe : dll.dll ;

-

-LINKFLAGS on exe.exe = $(LINKFLAGS) -L. ;

-

-

-Main loaddll.exe : loaddll.c ;

-

-DEPENDS loaddll.exe : dll.dll ;

-

-

-Dll dll.dll : dll.c ;

-

-ImportLib libdll.a : dll.def ;

-

-

-Main expexe.exe : expexe.c ;

-

-# Force the executable to include the expexe.def file.

-Exports expexe.exe : expexe.def ;

-

-Main loadexe.exe : loadexe.c ;

-

-DEPENDS loadexe.exe : expexe.exe ;

-

-

-Main silly.exe : silly.cpp ;

-

-LinkLibraries silly.exe : libsilly.a ;

-

-DEPENDS silly.exe : silly.dll ;

-

-LINKFLAGS on silly.exe += -L. ;

-

-Dll silly.dll : sillydll.cpp ;

-

-ImportLib libsilly.a : silly.def ;

-

diff --git a/winsup/mingw/samples/dlltest/loaddll.c b/winsup/mingw/samples/dlltest/loaddll.c
deleted file mode 100644
index ec69c9a7e..000000000
--- a/winsup/mingw/samples/dlltest/loaddll.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This version attempts to load dll.dll dynamically, get the address of the
- * Add function, and then call it.
- */
-
-#include <stdio.h>
-#include <windows.h>
-
-int (*Add)(int x, int y);
-
-int main()
-{
-	HINSTANCE	hDll;
-	int i, j, k;
-
-	hDll = LoadLibrary ("dll.dll");
-	if (!hDll)
-	{
-		printf ("Error %d loading dll.\n", GetLastError());
-		exit (-1);
-	}
-
-	if (!(Add = GetProcAddress (hDll, "Add")))
-	{
-		printf ("Error %d getting Add function.\n", GetLastError());
-		exit (-1);
-	}
-
-	i = 10;
-	j = 13;
-
-	k = Add(i, j);
-
-	printf ("i %d, j %d, k %d\n", i, j, k);
-
-	FreeLibrary (hDll);
-    
-	return 0;
-}
-
diff --git a/winsup/mingw/samples/dlltest/loadexe.c b/winsup/mingw/samples/dlltest/loadexe.c
deleted file mode 100644
index 2ee4e8483..000000000
--- a/winsup/mingw/samples/dlltest/loadexe.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * This program attempts to load expexe.exe dynamically, get the address of the
- * ExportedFromExe function, and then call it.
- *
- * This example DOES NOT WORK! I don't know exactly what can be done, but
- * it simply seems that LoadLibrary refuses to load executables.
- */
-
-#include <stdio.h>
-#include <windows.h>
-
-int (*ExportedFromExe)();
-
-int main()
-{
-	HINSTANCE	hDll;
-	int i, j, k;
-
-	hDll = LoadLibrary ("expexe.exe");
-	if (!hDll)
-	{
-		printf ("Error %d loading exe.\n", GetLastError());
-		exit (-1);
-	}
-
-	if (!(ExportedFromExe = GetProcAddress (hDll, "ExportedFromExe")))
-	{
-		printf ("Error %d getting ExportedFromExe function.\n",
-			GetLastError());
-		exit (-1);
-	}
-	else
-	{
-		ExportedFromExe ();
-	}
-
-	/* NOTE: Unlike a DLL the exe doesn't have an entry point which
-	 *       initializes global objects and adds __do_global_dtors to
-	 *       the atexit list. Thus it should be safe(?) to free the
-	 *       library. Of course, this also makes it unsafe to use
-	 *       executables at all in this manner.
-	 */
-	FreeLibrary (hDll);
-
-	return 0;
-}
-
diff --git a/winsup/mingw/samples/dlltest/readme.txt b/winsup/mingw/samples/dlltest/readme.txt
deleted file mode 100644
index 3d3101326..000000000
--- a/winsup/mingw/samples/dlltest/readme.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-This directory contains two examples of building DLLs. The exe.c and dll.c
-files are used to build a very simple example DLL with a function that
-adds two numbers together (and prints some text at the same time). The
-exe.c program links to the DLL and prints the results of the function
-call.
-
-The C++ example "silly" is more interesting because it involves a DLL which
-contains the code for a C++ class. The CSilly class has all of its code in
-the sillydll.cpp source file, which is used to build the silly.dll. The
-silly.cpp source code builds the main silly.exe executable which makes a
-dynamic instance of the object and calls its member functions.
-
-The C++ silly.def file was generated by doing a nm of sillydll.o after it
-was generated and then getting the symbol names from that. Removing the
-leading underscore produces the appropriate name to include in the EXPORTS
-section. Notice there are a few weird functions.
-
-Since there are now several different versions of the GNU compiler capable
-of doing this, and they each seem to have different requirements for exports
-for classes, it has gotten kind of messy. The silly.def file here is for
-use with the native Mingw32 build of the EGCS version of GCC. The silly.def.old
-file was the def file I used when I was using Jan-Jaap's Mingw32 native port
-of GCC. The Cygnus version is different again, if I recall correctly, but I
-don't have it hanging around anymore.
-
-The jamfile builds all the components from the raw sources.
-
-The expected output of exe.exe and silly.exe are in the files exe.exp
-and silly.exp.
-
-
-The source code in this directory is in the PUBLIC DOMAIN and can be
-used or abused as you see fit.  There is NO WARRANTY for this code,
-including (but not limited to) implied warranties of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
-
diff --git a/winsup/mingw/samples/dlltest/silly.cpp b/winsup/mingw/samples/dlltest/silly.cpp
deleted file mode 100644
index ee9e1fe77..000000000
--- a/winsup/mingw/samples/dlltest/silly.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// C++ test of a dll which contains a C++ class.
-//
-
-#include <stdlib.h>
-#include <stdio.h>
-
-// Interface of class.
-#include "silly.h"
-
-#ifdef	DERIVED_TEST
-// Here is a derived class too.
-class CMoreSilly : public CSilly
-{
-  public:
-	CMoreSilly (char* szNewName) : CSilly (szNewName) {};
-	~CMoreSilly ();
-
-	WhatsYourName();
-};
-
-CMoreSilly::
-~CMoreSilly ()
-{
-	printf ("In CMoreSilly \"%s\" destructor!\n", szName);
-}
-
-CMoreSilly::
-WhatsYourName ()
-{
-	printf ("I'm more silly and my name is \"%s\"\n", szName);
-}
-#endif
-
-int
-main ()
-{
-	CSilly*	psilly = new CSilly("silly");
-
-	psilly->WhatsYourName();
-	psilly->Poke();		// Poke him, he should say "Ouch!"
-	psilly->Stab(4);	// Stab him four times he should say "Ugh!!!!"
-
-	delete psilly;
-
-#ifdef DERIVED_TEST
-	psilly = new CMoreSilly("more silly");
-	psilly->WhatsYourName();
-	psilly->Stab(5);
-	delete psilly;
-#endif
-
-	return 0;
-}
-
diff --git a/winsup/mingw/samples/dlltest/silly.def b/winsup/mingw/samples/dlltest/silly.def
deleted file mode 100644
index a766ff94f..000000000
--- a/winsup/mingw/samples/dlltest/silly.def
+++ /dev/null
@@ -1,11 +0,0 @@
-EXPORTS
-DllMain@12
-Poke__6CSilly
-Stab__6CSillyi
-WhatsYourName__6CSilly
-_$_6CSilly
-__6CSilly
-__6CSillyPc
-__tf6CSilly
-__ti6CSilly
-_vt$6CSilly
diff --git a/winsup/mingw/samples/dlltest/silly.exp b/winsup/mingw/samples/dlltest/silly.exp
deleted file mode 100644
index ab544f97f..000000000
--- a/winsup/mingw/samples/dlltest/silly.exp
+++ /dev/null
@@ -1,8 +0,0 @@
-I'm silly.
-Ouch!
-Ugh!!!!
-In CSilly destructor.
-I'm more silly and my name is "more silly"
-Ugh!!!!!
-In CMoreSilly "more silly" destructor!
-In CSilly destructor.
diff --git a/winsup/mingw/samples/dlltest/silly.h b/winsup/mingw/samples/dlltest/silly.h
deleted file mode 100644
index d3f99bed8..000000000
--- a/winsup/mingw/samples/dlltest/silly.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#define	DERIVED_TEST	1
-
-class CSilly
-{
-  protected:
-	char*	szName;
-
-  public:
-	CSilly();
-	CSilly(char* szName);
-#ifdef DERIVED_TEST
-	virtual ~CSilly();
-#else
-	~CSilly();
-#endif
-
-	Poke ();
-	Stab (int nTimes);
-#ifdef DERIVED_TEST
-	virtual WhatsYourName ();
-#else
-	WhatsYourName ();
-#endif
-
-};
-
diff --git a/winsup/mingw/samples/dlltest/sillydll.cpp b/winsup/mingw/samples/dlltest/sillydll.cpp
deleted file mode 100644
index 87385e584..000000000
--- a/winsup/mingw/samples/dlltest/sillydll.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <windows.h>
-
-
-#if 0
-#define	STREAMS_VERSION
-#endif
-
-#if	defined(STREAMS_VERSION)
-#include <iostream.h>
-#endif
-
-#include "silly.h"
-
-extern "C"
-BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
-{
-    return TRUE;
-}
-
-CSilly::
-CSilly()
-{
-	szName = NULL;
-}
-
-CSilly::
-CSilly(char* new_szName)
-{
-	szName = new char[strlen(new_szName)+1];
-
-	if (szName)
-	{
-		strcpy (szName, new_szName);
-	}
-}
-
-CSilly::
-~CSilly()
-{
-	printf ("In CSilly destructor.\n");
-	if (szName)
-	{
-		delete szName;
-	}
-}
-
-CSilly::
-Poke ()
-{
-#ifndef	STREAMS_VERSION
-	printf ("Ouch!\n");
-#else
-	cout << "Ouch!" << endl;
-#endif
-}
-
-CSilly::
-Stab (int nTimes)
-{
-#ifndef	STREAMS_VERSION
-	printf ("Ugh");
-#else
-	cout << "Ugh";
-#endif
-
-	int i;
-	for (i = 0; i < nTimes; i++)
-	{
-#ifndef	STREAMS_VERSION
-		putchar('!');
-#else
-		cout << '!' ;
-#endif
-	}
-
-#ifndef	STREAMS_VERSION
-	putchar('\n');
-#else
-	cout << endl;
-#endif
-}
-
-CSilly::
-WhatsYourName ()
-{
-	if (szName)
-	{
-#ifndef	STREAMS_VERSION
-		printf ("I'm %s.\n", szName);
-#else
-		cout << "I'm " << szName << "." << endl;
-#endif
-	}
-	else
-	{
-#ifndef	STREAMS_VERSION
-		printf ("I have no name.\n");
-#else
-		cout << "I have no name." << endl;
-#endif
-	}
-}
-
diff --git a/winsup/mingw/samples/filehand/filehand.c b/winsup/mingw/samples/filehand/filehand.c
deleted file mode 100644
index 2af69b371..000000000
--- a/winsup/mingw/samples/filehand/filehand.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * An example showing how you can obtain the UNIX-ish file number from a
- * FILE* and in turn how you can get the Win32 HANDLE of the file from
- * the file number.
- *
- * This code is in the PUBLIC DOMAIN and has NO WARRANTY.
- *
- * Colin Peters <colin@fu.is.saga-u.ac.jp>
- */
-
-#include <stdio.h>
-#include <io.h>
-#include <windows.h>
-
-int
-main (int argc, char* argv[])
-{
-	char*	szFileName;
-	FILE*	fileIn;
-	int	fnIn;
-	HANDLE	hFileIn;
-	char	caBuf[81];
-	int	nRead;
-
-	if (argc >= 2)
-	{
-		szFileName = argv[1];
-	}
-	else
-	{
-		szFileName = "junk.txt";
-	}
-
-	fileIn = fopen (szFileName, "r");
-
-	if (!fileIn)
-	{
-		printf ("Could not open %s for reading\n", szFileName);
-		exit(1);
-	}
-
-	fnIn = fileno (fileIn);
-	hFileIn = (HANDLE) _get_osfhandle (fnIn);
-
-	printf ("OS file handle %d\n", (int) hFileIn);
-
-	ReadFile (hFileIn, caBuf, 80, &nRead, NULL);
-
-	printf ("Read %d bytes using ReadFile.\n", nRead);
-
-	caBuf[nRead] = '\0';
-
-	printf ("\"%s\"\n", caBuf);
-
-	fclose (fileIn);
-}
-
diff --git a/winsup/mingw/samples/filehand/jamfile b/winsup/mingw/samples/filehand/jamfile
deleted file mode 100644
index 3b2c726de..000000000
--- a/winsup/mingw/samples/filehand/jamfile
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Main filehand.exe : filehand.c ;
-
diff --git a/winsup/mingw/samples/filehand/junk.txt b/winsup/mingw/samples/filehand/junk.txt
deleted file mode 100644
index 6de7b8c69..000000000
--- a/winsup/mingw/samples/filehand/junk.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a test file.
diff --git a/winsup/mingw/samples/fixargv/fixargv.c b/winsup/mingw/samples/fixargv/fixargv.c
deleted file mode 100644
index c2e2a41e6..000000000
--- a/winsup/mingw/samples/fixargv/fixargv.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * fixargv.c
- *
- * A special function which "fixes" an argv array by replacing arguments
- * that need quoting with quoted versions.
- *
- * NOTE: In order to be reasonably consistent there is some misuse of the
- *       const keyword here-- which leads to compilation warnings. These
- *       should be ok to ignore.
- *
- * This is a sample distributed as part of the Mingw32 package.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <string.h>
-#include "fixargv.h"
-
-/*
- * This takes a single string and fixes it, enclosing it in quotes if it
- * contains any spaces and/or escaping the quotes it contains.
- */
-char*
-fix_arg (const char* szArg)
-{
-	int	nQuoteAll;	/* Does the whole arg need quoting? */
-	int	nBkSlRun;	/* How may backslashes in a row? */
-	char*	sz;
-	char*	szNew;
-	size_t	sizeLen;
-
-	nQuoteAll = 0;
-	nBkSlRun = 0;
-	sz = szArg;
-	sizeLen = 1;
-
-	/* First we figure out how much bigger the new string has to be
-	 * than the old one. */
-	while (*sz != '\0')
-	{
-		/*
-		 * Arguments containing whitespace of wildcards will be
-		 * quoted to preserve tokenization and/or those special
-		 * characters (i.e. wildcarding will NOT be done at the
-		 * other end-- they will get the * and ? characters as is).
-		 * TODO: Is this the best way? Do we want to enable wildcards?
-		 *       If so, when?
-		 */
-		if (!nQuoteAll &&
-		    (*sz == ' ' || *sz == '\t' || *sz == '*' || *sz == '?'))
-		{
-			nQuoteAll = 1;
-		}
-		else if (*sz == '\\')
-		{
-			nBkSlRun++;
-		}
-		else
-		{
-			if (*sz == '\"')
-			{
-				sizeLen += nBkSlRun + 1;
-			}
-			nBkSlRun = 0;
-		}
-
-		sizeLen++;
-		sz++;
-	}
-
-	if (nQuoteAll)
-	{
-		sizeLen += 2;
-	}
-
-	/*
-	 * Make a new string big enough.
-	 */
-	szNew = (char*) malloc (sizeLen);
-	if (!szNew)
-	{
-		return NULL;
-	}
-	sz = szNew;
-
-	/* First enclosing quote for fully quoted args. */
-	if (nQuoteAll)
-	{
-		*sz = '\"';
-		sz++;
-	}
-
-	/*
-	 * Go through the string putting backslashes in front of quotes,
-	 * and doubling all backslashes immediately in front of quotes.
-	 */
-	nBkSlRun = 0;
-	while (*szArg != '\0')
-	{
-		if (*szArg == '\\')
-		{
-			nBkSlRun++;
-		}
-		else
-		{
-			if (*szArg == '\"')
-			{
-				while (nBkSlRun > 0)
-				{
-					*sz = '\\';
-					sz++;
-					nBkSlRun--;
-				}
-				*sz = '\\';
-				sz++;
-			}
-			nBkSlRun = 0;
-		}
-
-		*sz = *szArg;
-		sz++;
-		szArg++;
-	}
-
-	/* Closing quote for fully quoted args. */
-	if (nQuoteAll)
-	{
-		*sz = '\"';
-		sz++;
-	}
-
-	*sz = '\0';
-	return szNew;
-}
-
-/*
- * Takes argc and argv and returns a new argv with escaped members. Pass
- * this fixed argv (along with the old one) to free_fixed_argv after
- * you finish with it. Pass in an argc of -1 and make sure the argv vector
- * ends with a null pointer to have fix_argv count the arguments for you.
- */
-char* const*
-fix_argv (int argc, char* const* szaArgv)
-{
-	char**	szaNew;
-	char*	sz;
-	int	i;
-
-	if (!szaArgv)
-	{
-		return NULL;
-	}
-
-	/*
-	 * Count the arguments if asked.
-	 */
-	if (argc == -1)
-	{
-		for (i = 0; szaArgv[i]; i++)
-			;
-
-		argc = i;
-	}
-
-	/*
-	 * If there are no args or only one arg then do no escaping.
-	 */
-	if (argc < 2)
-	{
-		return szaArgv;
-	}
-
-	for (i = 1, szaNew = NULL; i < argc; i++)
-	{
-		sz = szaArgv[i];
-
-		/*
-		 * If an argument needs fixing, then fix it.
-		 */
-		if (strpbrk (sz, "\" \t*?"))
-		{
-			/*
-			 * If we haven't created a new argv list already
-			 * then make one.
-			 */
-			if (!szaNew)
-			{
-				szaNew = (char**) malloc ((argc + 1) *
-					sizeof (char*));
-				if (!szaNew)
-				{
-					return NULL;
-				}
-
-				/*
-				 * Copy previous args from old to new.
-				 */
-				memcpy (szaNew, szaArgv, sizeof(char*) * i);
-			}
-
-			/*
-			 * Now do the fixing.
-			 */
-			szaNew[i] = fix_arg (sz);
-			if (!szaNew[i])
-			{
-				/* Fixing failed, free up and return error. */
-				free_fixed_argv (szaNew, szaArgv);
-				return NULL;
-			}
-		}
-		else if (szaNew)
-		{
-			szaNew[i] = sz;
-		}
-	}
-
-	if (szaNew)
-	{
-		/* If we have created a new argv list then we might as well
-		 * terminate it nicely. (And we depend on it in
-		 * free_fixed_argv.) */
-		szaNew[argc] = NULL;
-	}
-	else
-	{
-		/* If we didn't create a new argv list then return the
-		 * original. */
-		return szaArgv;
-	}
-
-	return szaNew;
-}
-
-void
-free_fixed_argv (char* const* szaFixed, char* const* szaOld)
-{
-	char* const*	sza;
-
-	/*
-	 * Check for error conditions. Also note that if no corrections
-	 * were required the fixed argv will actually be the same as
-	 * the old one, and we don't need to do anything.
-	 */
-	if (!szaFixed || !szaOld || szaFixed == szaOld)
-	{
-		return;
-	}
-
-	/*
-	 * Go through all members of the argv list. If any of the
-	 * members in the fixed list are different from the old
-	 * list we free those members.
-	 * NOTE: The first member is never modified, so we don't need to
-	 * check.
-	 */
-	sza = szaFixed + 1;
-	szaOld++;
-	while (*sza)
-	{
-		if (*sza != *szaOld)
-		{
-			free (*sza);
-		}
-		sza++;
-		szaOld++;
-	}
-
-	/*
-	 * Now we can free the array of char pointers itself.
-	 */
-	free (szaFixed);
-}
-
diff --git a/winsup/mingw/samples/fixargv/fixargv.h b/winsup/mingw/samples/fixargv/fixargv.h
deleted file mode 100644
index e4a83fae1..000000000
--- a/winsup/mingw/samples/fixargv/fixargv.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * fixargv.h
- *
- * Prototypes of utility functions for 'properly' escaping argv vectors.
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#ifndef _FIXARGV_H_
-#define _FIXARGV_H_
-
-char* fix_arg (const char* szArg);
-char* const* fix_argv (int argc, char* const* szaArgv);
-void free_fixed_argv (char* const* szaFixed, char* const* szaOld);
-
-#endif
diff --git a/winsup/mingw/samples/fixargv/readme.txt b/winsup/mingw/samples/fixargv/readme.txt
deleted file mode 100644
index 555ef9bde..000000000
--- a/winsup/mingw/samples/fixargv/readme.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-
-This code is a utility function I was considering adding to Mingw32. The
-Microsoft versions of argc, argv construction use quotes and backslashes
-to allow the user to pass arguments containing spaces (or quotes) to 
-programs they invoke. The rules are
-
- - Arguments containing spaces must be enclosed in quotes.
- - A quote can be passed by preceeding it with a backslash.
- - Backslashes immediately preceeding a quote must be doubled to avoid
-   escaping the quote.
-
-Thus an argument like:
-
- -D="Foo Bar\\"
-
-needs to be mangled as:
-
- "-D\"Foo Bar\\\\\""
-
-in order to get to the program as what was intended above.
-
-The fix_argv set of functions is meant to be used with spawnv and the
-like to allow a program to set up an argv array for the spawned program
-and have that array duplicated *exactly* in the spawned program, no
-matter what it contains (it also quotes 'globbing' characters like *
-and ?, so it does not matter if the destination has globbing turned on
-or not; it might be a reasonable extension to allow a flag to allow
-globbing characters to pass through unmolested, but they would still
-be quoted if the string contained whitespace).
-
-The reason for writing this came up because of problems with arguments
-like -DBLAH="Foo Bar" to GCC (define BLAH as a preprocessor constant
-being the string "Foo Bar", including the quotes). Because GCC simply
-passes the argument directly to CPP (the preprocessor) it had to be
-escaped *twice*:
-
- "-DBLAH=\"\\\"Foo Bar\\\"\""
-
-This would reach GCC as
-
- -DBLAH="\"Foo Bar\""
-
-And that would reach CPP as the desired
-
- -DBLAH="Foo Bar"
-
-One level of quoting and escaping is to be expected (although MS's
-standard is, arguably, not very good), but forcing the user to know
-how many different programs the argument is going to pass through,
-and perform double quoting and escaping, seems unreasonable. If
-GCC and friends all used fix_argv (they use their own version of
-it now) then the original argument could be
-
- "-DBLAH=\"Foo Bar\""
-
-And that would work fine, no matter how many different tools it
-passed through.
-
-The only basic limitation with this code is that it assumes that all
-the spawned programs use Microsoft-type escaping when interpreting
-their command line. Most programs on Win32 machines do (anything
-compiled with Mingw32 will).
-
-For now, this code has been relegated to 'sample' status. If you want
-to use it, feel free (it is public domain after all).
-
-Colin.
-
-P.S. Just out of interest you might try writing your own little program
-     to look at the interaction of wildcards and quotes. Use the glob.exe
-     program in ../globbing and see what it does with
-
-      glob "foo*.txt"
-
-     even if there are files foo.txt and foobar.txt in the same directory.
-
-     Note that
-
-      del "My *.txt"
-
-     works (i.e. it deletes all files starting with My<space>). This could
-     not be done unless del does globbing *after* processing escapes and
-     quotes, which is not the way it seems to work normally (again see
-     the glob example).
-
diff --git a/winsup/mingw/samples/fmode/all.c b/winsup/mingw/samples/fmode/all.c
deleted file mode 100644
index f052b9306..000000000
--- a/winsup/mingw/samples/fmode/all.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * A sample program demonstrating how to use _CRT_fmode to change the default
- * file opening mode to binary AND change stdin, stdout and stderr. Redirect
- * stdout to a file from the command line to see the difference.
- *
- * Also try directing a file into stdin. If you type into stdin you will get
- * \r\n at the end of every line... unlike UNIX. But at least if you
- * redirect a file in you will get exactly the characters in the file as input.
- *
- * THIS CODE IS IN THE PUBLIC DOMAIN.
- *
- * Colin Peters <colin@fu.is.saga-u.ac.jp>
- */
-
-#include <stdio.h>
-#include <stdlib.h>	/* _fmode */
-#include <fcntl.h>	/*  _O_BINARY */
-#include <io.h>		/* _setmode */
-
-
-unsigned int _CRT_fmode = _O_BINARY;
-
-main ()
-{
-	char* sz = "This is line one.\nThis is line two.\n";
-	FILE*	fp;
-	int	c;
-
-	printf (sz);
-
-	/* Note how this fopen does NOT indicate "wb" to open the file in
-	 * binary mode. */
-	fp = fopen ("all.out", "w");
-
-	fprintf (fp, sz);
-
-	fclose (fp);
-
-	if (_isatty (_fileno(stdin)))
-	{
-		fprintf (stderr, "Waiting for input, press Ctrl-Z to finish.\n");
-	}
-
-	while ((c = fgetc(stdin)) != EOF)
-	{
-		printf ("\'%c\' %02X\n", (char) c, c);
-	}
-}
-
diff --git a/winsup/mingw/samples/fmode/jamfile b/winsup/mingw/samples/fmode/jamfile
deleted file mode 100644
index 5b7a1cb06..000000000
--- a/winsup/mingw/samples/fmode/jamfile
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Main test.exe : test.c ;
-
-Main test2.exe : test2.c ;
-
-Main all.exe : all.c ;
-
diff --git a/winsup/mingw/samples/fmode/readme.txt b/winsup/mingw/samples/fmode/readme.txt
deleted file mode 100644
index b865bfd4e..000000000
--- a/winsup/mingw/samples/fmode/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-These two demos show how _fmode and _CRT_fmode can be used to modify the
-default file opening mode (text vs. binary) and/or the mode of the standard
-file handles.
-
diff --git a/winsup/mingw/samples/fmode/test.c b/winsup/mingw/samples/fmode/test.c
deleted file mode 100644
index 0ec364534..000000000
--- a/winsup/mingw/samples/fmode/test.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * A sample program demonstrating how to use fmode to change the default
- * file opening mode to binary. NOTE: Does not change stdin, stdout or
- * stderr.
- *
- * THIS CODE IS IN THE PUBLIC DOMAIN.
- *
- * Colin Peters <colin@fu.is.saga-u.ac.jp>
- */
-
-#include <stdio.h>
-#include <stdlib.h>	/*  _fmode */
-#include <fcntl.h>	/*  _O_BINARY */
-
-main ()
-{
-	char* sz = "This is line one.\nThis is line two.\n";
-	FILE*	fp;
-
-	_fmode = _O_BINARY;
-
-	printf (sz);
-
-	/* Note how this fopen does NOT indicate "wb" to open the file in
-	 * binary mode. */
-	fp = fopen ("test.out", "w");
-
-	fprintf (fp, sz);
-
-	fclose (fp);
-}
-
diff --git a/winsup/mingw/samples/fmode/test2.c b/winsup/mingw/samples/fmode/test2.c
deleted file mode 100644
index b7d6b1891..000000000
--- a/winsup/mingw/samples/fmode/test2.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * A sample program demonstrating how to use fmode to change the default
- * file opening mode to binary.  Compare this file, which sets _fmode
- * at file level to test.c, which sets the dll variable directly within
- * main.
- * NOTE: Does not change stdin, stdout or stderr.
- *
- * THIS CODE IS IN THE PUBLIC DOMAIN.
- *
- * Colin Peters <colin@fu.is.saga-u.ac.jp>
- * Danny Smith <dannysmith@users.sourceforge.net>
- */
-
-#include <stdio.h>
-#include <stdlib.h>	/*  _fmode */
-#include <fcntl.h>	/*  _O_BINARY */
-
-#undef _fmode
-int _fmode = _O_BINARY;
-
-main ()
-{
-    
-	char* sz = "This is line one.\nThis is line two.\n";
-	FILE*	fp;
-
-	printf (sz);
-
-	/* Note how this fopen does NOT indicate "wb" to open the file in
-	 * binary mode. */
-	fp = fopen ("test2.out", "w");
-
-	fprintf (fp, sz);
-
-	fclose (fp);
-}
-
diff --git a/winsup/mingw/samples/globbing/glob.c b/winsup/mingw/samples/globbing/glob.c
deleted file mode 100644
index 6bf8acaee..000000000
--- a/winsup/mingw/samples/globbing/glob.c
+++ /dev/null
@@ -1,20 +0,0 @@
-

-#include <stdlib.h>

-#include <stdio.h>

-#include <windows.h>

-

-int

-main (int argc, char* argv[])

-{

-	int	i;

-

-	printf ("Command line (via GetCommandLine) \"%s\"\n",

-		GetCommandLine());

-

-	for (i = 0; i < argc; i++)

-	{

-		printf ("Argv[%d] \"%s\"\n", i, argv[i]);

-	}

-

-	return 0;

-}

diff --git a/winsup/mingw/samples/globbing/jamfile b/winsup/mingw/samples/globbing/jamfile
deleted file mode 100644
index ff3a585d6..000000000
--- a/winsup/mingw/samples/globbing/jamfile
+++ /dev/null
@@ -1,11 +0,0 @@
-

-Object glob.o : glob.c ;

-

-MainFromObjects glob.exe : glob.o ;

-

-Main noglob.exe : noglob.c ;

-

-LIBDIR = \\mingw32\\lib\\ ;

-

-MainFromObjects CRTnoglob.exe : glob.o $(LIBDIR)CRT_noglob.o ;

-

diff --git a/winsup/mingw/samples/globbing/noglob.c b/winsup/mingw/samples/globbing/noglob.c
deleted file mode 100644
index 8bc4c82a3..000000000
--- a/winsup/mingw/samples/globbing/noglob.c
+++ /dev/null
@@ -1,22 +0,0 @@
-

-#include <stdlib.h>

-#include <stdio.h>

-#include <windows.h>

-

-/* This line turns off automatic command line globbing. */

-int _CRT_glob = 0;

-

-int

-main (int argc, char* argv[])

-{

-	int	i;

-

-	printf ("Command line (via GetCommandLine) \"%s\"\n",

-		GetCommandLine());

-	for (i = 0; i < argc; i++)

-	{

-		printf ("Argv[%d] \"%s\"\n", i, argv[i]);

-	}

-

-	return 0;

-}

diff --git a/winsup/mingw/samples/globbing/readme.txt b/winsup/mingw/samples/globbing/readme.txt
deleted file mode 100644
index 5e20de826..000000000
--- a/winsup/mingw/samples/globbing/readme.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-

-This directory contains samples which demonstrate default (globbing on)

-behavior, how to turn the globbing off with the _CRT_glob variable, and

-how to turn it off with the CRT_noglob object file.

-

-Run jam and then run glob, noglob and CRTnoglob with an argument like

-*.* to see the difference.

-

-The code in this directory is in the PUBLIC DOMAIN. It has NO WARRANTY,

-including, but not restricted to, warranties of MERCHANTABILITY or

-FITNESS FOR A PARTICULAR PURPOSE.

-

-Colin Peters <colin@bird.fu.is.saga-u.ac.jp>.

-

diff --git a/winsup/mingw/samples/print/jamfile b/winsup/mingw/samples/print/jamfile
deleted file mode 100644
index b77e6d66b..000000000
--- a/winsup/mingw/samples/print/jamfile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# A simple example which prints a message on a selected printer. This won't
-# work right unless you make PRINTDLG a packed structure!
-#
-
-Main prntest.exe : prntest.c ;
-
-Gui prntest.exe ;
-
diff --git a/winsup/mingw/samples/print/prntest.c b/winsup/mingw/samples/print/prntest.c
deleted file mode 100644
index a70e7ed5d..000000000
--- a/winsup/mingw/samples/print/prntest.c
+++ /dev/null
@@ -1,65 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <windows.h>
-
-main ()
-{
-	PRINTDLG	pd;
-	DOCINFO		di;
-	char*		szMessage;
-
-	memset (&pd, 0, sizeof(PRINTDLG));
-	memset (&di, 0, sizeof(DOCINFO));
-
-	di.cbSize = sizeof(DOCINFO);
-	di.lpszDocName = "Test";
-
-	pd.lStructSize = sizeof(PRINTDLG);
-	pd.Flags = PD_PAGENUMS | PD_RETURNDC;
-	pd.nFromPage = 1;
-	pd.nToPage = 1;
-	pd.nMinPage = 1;
-	pd.nMaxPage = 1;
-
-	szMessage = 0;
-
-	if (PrintDlg (&pd))
-	{
-		if (pd.hDC)
-		{
-			if (StartDoc (pd.hDC, &di) != SP_ERROR)
-			{
-				StartPage (pd.hDC);
-
-				TextOut (pd.hDC, 0, 0, "Hello, printer!", 15);
-
-				EndPage (pd.hDC);
-
-				EndDoc (pd.hDC);
-
-				szMessage = "Printed.";
-			}
-			else
-			{
-				szMessage = "Could not start document.";
-			}
-		}
-		else
-		{
-			szMessage = "Could not create device context.";
-		}
-	}
-	else
-	{
-		szMessage = "Canceled or printer could not be setup.";
-	}
-
-	if (szMessage)
-	{
-		MessageBox (NULL, szMessage, "Print Test", MB_OK);
-	}
-
-	return 0;
-}
diff --git a/winsup/mingw/samples/seh/eh3.c b/winsup/mingw/samples/seh/eh3.c
deleted file mode 100644
index 49a06ceab..000000000
--- a/winsup/mingw/samples/seh/eh3.c
+++ /dev/null
@@ -1,112 +0,0 @@
-int
-__except_handler3(
-	struct _EXCEPTION_RECORD*	pExceptionRecord,
-	struct EXCEPTION_REGISTRATION*	pRegistrationFrame,
-	struct _CONTEXT*		pContextRecord,
-	void*				pDispatcherContext
-	)
-{
-	LONG	filterFuncRet;
-	LONG trylevel;
-	EXCEPTION_POINTERS exceptPtrs;
-	PSCOPETABLE pScopeTable;
-
-
-	CLD // Clear the direction flag (make no assumptions!)
-
-	// if neither the EXCEPTION_UNWINDING nor EXCEPTION_EXIT_UNWIND bit
-	// is set... This is true the first time through the handler (the
-	// non-unwinding case)
-
-	if ( ! (pExceptionRecord->ExceptionFlags
-		 & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)
-               ) )
-	{
-		// Build the EXCEPTION_POINTERS structure on the stack
-		exceptPtrs.ExceptionRecord = pExceptionRecord;
-		exceptPtrs.ContextRecord = pContextRecord;
-
-		// Put the pointer to the EXCEPTION_POINTERS 4 bytes below the
-		// establisher frame. See ASM code for GetExceptionInformation
-		*(PDWORD)((PBYTE)pRegistrationFrame - 4) = &exceptPtrs;
-
-		// Get initial "trylevel" value
-		trylevel = pRegistrationFrame->trylevel 
-
-		// Get a pointer to the scopetable array
-		scopeTable = pRegistrationFrame->scopetable;
-
-search_for_handler: 
-		if ( pRegistrationFrame->trylevel != TRYLEVEL_NONE )
-		{
-			if ( pRegistrationFrame->scopetable[trylevel].lpfnFilter )
-			{
-
-				PUSH EBP // Save this frame EBP
-
-			// !!!Very Important!!! Switch to original EBP. This is
-			// what allows all locals in the frame to have the same
-			// value as before the exception occurred.
-
-				EBP = &pRegistrationFrame->_ebp
-
-				// Call the filter function
-				filterFuncRet = scopetable[trylevel].lpfnFilter();
-
-				POP EBP // Restore handler frame EBP
-
-				if ( filterFuncRet != EXCEPTION_CONTINUE_SEARCH )
-				{
-					if ( filterFuncRet < 0 ) // EXCEPTION_CONTINUE_EXECUTION
-						return ExceptionContinueExecution;
-
-					// If we get here, EXCEPTION_EXECUTE_HANDLER was specified
-					scopetable == pRegistrationFrame->scopetable
-
-			// Does the actual OS cleanup of registration frames
-					// Causes this function to recurse
-					__global_unwind2( pRegistrationFrame );
-
-
-		// Once we get here, everything is all cleaned up, except
-		// for the last frame, where we'll continue execution
-					EBP = &pRegistrationFrame->_ebp
-
-					__local_unwind2( pRegistrationFrame, trylevel );
-
-		// NLG == "non-local-goto" (setjmp/longjmp stuff)
-					__NLG_Notify( 1 ); // EAX == scopetable->lpfnHandler
-
-		// Set the current trylevel to whatever SCOPETABLE entry
-		// was being used when a handler was found
-					pRegistrationFrame->trylevel = scopetable->previousTryLevel;
-
-		// Call the _except {} block. Never returns.
-					pRegistrationFrame->scopetable[trylevel].lpfnHandler();
-				}
-			}
-
-			scopeTable = pRegistrationFrame->scopetable;
-			trylevel = scopeTable->previousTryLevel
-
-			goto search_for_handler;
-		}
-		else // trylevel == TRYLEVEL_NONE
-		{
-			retvalue == DISPOSITION_CONTINUE_SEARCH;
-		}
-	}
-	else // EXCEPTION_UNWINDING or EXCEPTION_EXIT_UNWIND flags are set
-	{
-		PUSH EBP // Save EBP
-
-		EBP = pRegistrationFrame->_ebp // Set EBP for __local_unwind2
-
-		__local_unwind2( pRegistrationFrame, TRYLEVEL_NONE )
-
-		POP EBP // Restore EBP
-
-		retvalue == DISPOSITION_CONTINUE_SEARCH;
-	}
-}
-
diff --git a/winsup/mingw/samples/seh/exutil.c b/winsup/mingw/samples/seh/exutil.c
deleted file mode 100644
index 187242cd5..000000000
--- a/winsup/mingw/samples/seh/exutil.c
+++ /dev/null
@@ -1,68 +0,0 @@
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <excpt.h>
-#include <windows.h>
-
-#include "exutil.h"
-
-void
-WalkExceptionHandlers ()
-{
-	PEXCEPTION_REGISTRATION_RECORD	p;
-	int				i;
-
-	__asm__("movl %%fs:0,%%eax;movl %%eax,%0" : "=g" (p) : : "%eax");
-
-	i = 0;
-	while (p != (PEXCEPTION_REGISTRATION_RECORD) -1 && p)
-	{
-		printf ("Registration %d at %08x : ", i, p);
-		printf ("Handler = %08x ", p->handler);
-		printf ("Next Registration = %08x\n", p->prev);
-		p = p->prev;
-		i++;
-	}
-	printf ("End of exception handler list.\n");
-	fflush (stdout);
-}
-
-void
-DumpExceptionRecord (struct _EXCEPTION_RECORD* pExRec)
-{
-	printf ("Exception: Code = %08x Flags %08x", pExRec->ExceptionCode,
-		pExRec->ExceptionFlags);
-
-	if (pExRec->ExceptionFlags)
-	{
-		printf (" ( ");
-		if (pExRec->ExceptionFlags & EH_NONCONTINUABLE)
-		{
-			printf ("EH_NONCONTINUABLE ");
-		}
-		if (pExRec->ExceptionFlags & EH_UNWINDING)
-		{
-			printf ("EH_UNWINDING ");
-		}
-		if (pExRec->ExceptionFlags & EH_EXIT_UNWIND)
-		{
-			printf ("EH_EXIT_UNWIND ");
-		}
-		if (pExRec->ExceptionFlags & EH_STACK_INVALID)
-		{
-			printf ("EH_STACK_INVALID ");
-		}
-		if (pExRec->ExceptionFlags & EH_NESTED_CALL)
-		{
-			printf ("EH_NESTED_CALL ");
-		}
-		printf (")\n");
-	}
-	else
-	{
-		printf ("\n");
-	}
-
-	fflush(stdout);
-}
-
diff --git a/winsup/mingw/samples/seh/exutil.def b/winsup/mingw/samples/seh/exutil.def
deleted file mode 100644
index a474be7e5..000000000
--- a/winsup/mingw/samples/seh/exutil.def
+++ /dev/null
@@ -1,3 +0,0 @@
-EXPORTS
- WalkExceptionHandlers
- DumpExceptionRecord
diff --git a/winsup/mingw/samples/seh/exutil.h b/winsup/mingw/samples/seh/exutil.h
deleted file mode 100644
index a56155b96..000000000
--- a/winsup/mingw/samples/seh/exutil.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Definitions of some internal stuff for exception handling, including
- * a version of the all-important EXCEPTION_REGISTRATION_RECORD.
- */
-
-#ifndef _EXUTIL_H_
-#define _EXUTIL_H_
-
-#include <windows.h>
-#include <excpt.h>
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-void WalkExceptionHandlers ();
-void DumpExceptionRecord (struct _EXCEPTION_RECORD* pExRec);
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif
diff --git a/winsup/mingw/samples/seh/jamfile b/winsup/mingw/samples/seh/jamfile
deleted file mode 100644
index 04d83c770..000000000
--- a/winsup/mingw/samples/seh/jamfile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Dll exutil.dll : exutil.c ;
-
-ImportLib libexutil.a : exutil.def ;
-
-Main sehtest.exe : sehtest.c ;
-
-Main sehfix.exe : sehfix.c ;
-
-Main sehsub.exe : sehsub.c ;
-
-LinkLibraries sehtest.exe sehfix.exe sehsub.exe : libexutil.a ;
-
diff --git a/winsup/mingw/samples/seh/sehfix.c b/winsup/mingw/samples/seh/sehfix.c
deleted file mode 100644
index be527ab0d..000000000
--- a/winsup/mingw/samples/seh/sehfix.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * sehfix.c
- *
- * A test program involving an exception handler that fixes the exception
- * causing condition.
- *
- * In this code we install an exception handler my_handler and then a piece
- * of inline assembly attempts to write at the address marked in eax, after
- * setting eax to 10. This should produce an exception. The handler then
- * changes the eax register of the exception context to be the address of
- * a static variable and restarts the code. This should allow everything
- * to continue.
- */
-
-#include <windows.h>
-#include <excpt.h>
-
-#include "exutil.h"
-
-int	x;
-
-EXCEPTION_DISPOSITION
-my_handler (
-	struct _EXCEPTION_RECORD* pExceptionRec,
-	void* pEstablisherFrame,
-	struct _CONTEXT* pContextRecord,
-	void* pDispatcherContext
-	)
-{
-	printf ("In my exception handler!\n");
-	DumpExceptionRecord (pExceptionRec);
-	pContextRecord->Eax = (DWORD) &x;
-	return ExceptionContinueExecution;
-}
-
-main ()
-{
-	x = 2;
-
-	printf ("x = %d\n", x);
-
-	WalkExceptionHandlers();
-
-	__try1(my_handler)
-
-	WalkExceptionHandlers();
-
-	/* This assembly code should produce an exception. */
-	__asm__("movl $10,%%eax;movl $1,(%%eax);" : : : "%eax");
-
-	__except1
-
-	WalkExceptionHandlers();
-
-	printf ("x = %d\n", x);
-
-	printf ("Finished!\n");
-}
-
-
diff --git a/winsup/mingw/samples/seh/sehsub.c b/winsup/mingw/samples/seh/sehsub.c
deleted file mode 100644
index 466b2e8e4..000000000
--- a/winsup/mingw/samples/seh/sehsub.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * sehsub.c
- *
- * In an attempt to see what might be going on inside CRTDLL, this program
- * walks the exception list after creating a new thread with _beginthread.
- *
- * It turns out that _beginthread DOES install an exception handler, as
- * expected, but this handler is NOT exported by CRTDLL (it is certainly
- * not _except_handler2 or _XcptFilter)... an odd and unpleasant turn of
- * events.
- */
-
-#include <windows.h>
-#include <excpt.h>
-#include <process.h>
-
-#include "exutil.h"
-
-extern void* __imp__except_handler3;
-
-unsigned
-my_thread (void * p)
-{
-	printf ("In my thread.\n");
-	WalkExceptionHandlers();
-	return 0;
-}
-
-main ()
-{
-	unsigned long	h;
-	unsigned	id;
-	printf ("In main.\n");
-	WalkExceptionHandlers();
-
-	printf ("Except_handler3 %08x\n", __imp__except_handler3);
-	h = _beginthreadex (NULL, 0, my_thread, NULL, 0, &id);
-
-	WaitForSingleObject ((HANDLE) h, INFINITE);
-	CloseHandle ((HANDLE) h);
-	return;
-}
-
diff --git a/winsup/mingw/samples/seh/sehtest.c b/winsup/mingw/samples/seh/sehtest.c
deleted file mode 100644
index f1c18d05e..000000000
--- a/winsup/mingw/samples/seh/sehtest.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * This file tests some of the basics of structured exception handling as
- * implemented in excpt.h and the Windows API header files.
- *
- * The program installs two exception handlers, then attempts to write to
- * a pointer to an invalid address. This causes an exception which passes
- * through the exception handlers and on to the default system exception
- * handler. That handler brings up the dialog box all Windows users know
- * and love, and then the program is terminated.
- *
- * You might note that after the initial run up through our exception frames
- * we get a second run up through them with the exception code
- * STATUS_INVALID_DISPOSITION and the code EH_UNWINDING. This seems normal
- * except that the code got changed from the previous STATUS_ACCESS_VIOLATION.
- * I don't understand that bit particularly.
- */
-
-#include <stdio.h>
-#include <excpt.h>
-
-#include "exutil.h"
-
-EXCEPTION_DISPOSITION
-my_handler (
-	struct _EXCEPTION_RECORD* pExceptionRec,
-	void* pEstablisherFrame,
-	struct _CONTEXT* pContextRecord,
-	void* pDispatcherContext
-	)
-{
-	printf ("In my exception handler!\n");
-	DumpExceptionRecord (pExceptionRec);
-	return ExceptionContinueSearch;
-}
-
-EXCEPTION_DISPOSITION
-my_handler2 (
-	struct _EXCEPTION_RECORD* pExceptionRec,
-	void* pEstablisherFrame,
-	struct _CONTEXT* pContextRecord,
-	void* pDispatcherContext
-	)
-{
-	printf ("In top exception handler!\n");
-	DumpExceptionRecord (pExceptionRec);
-	return ExceptionContinueSearch;
-}
-
-main ()
-{
-	char*	x;
-
-	printf ("my_handler2 = %08x\n", my_handler2);
-	printf ("my_handler = %08x\n", my_handler);
-
-	WalkExceptionHandlers();
-
-	__try1(my_handler2)
-	x = (char*) 10;
-
-	WalkExceptionHandlers();
-
-	__try1(my_handler)
-
-	WalkExceptionHandlers();
-
-	*x = 1;
-	__except1
-	__except1
-	printf ("Finished!\n");
-}
-
diff --git a/winsup/mingw/samples/simpledll/dll.c b/winsup/mingw/samples/simpledll/dll.c
deleted file mode 100644
index c642af4d8..000000000
--- a/winsup/mingw/samples/simpledll/dll.c
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#include <windows.h>
-
-BOOL WINAPI
-DllMain (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
-{
-	switch (dwReason)
-	{
-		case DLL_PROCESS_ATTACH:
-			printf ("DLL Attached.\n");
-			break;
-
-		case DLL_PROCESS_DETACH:
-			printf ("DLL Detached.\n");
-			break;
-
-		case DLL_THREAD_ATTACH:
-			printf ("DLL Thread Attached.\n");
-			break;
-
-		case DLL_THREAD_DETACH:
-			printf ("DLL Thread Detached.\n");
-			break;
-	}
-	return TRUE;
-}
-
-void
-Test ()
-{
-	printf ("Test Function called!\n");
-}
-
diff --git a/winsup/mingw/samples/simpledll/dll.cpp b/winsup/mingw/samples/simpledll/dll.cpp
deleted file mode 100644
index cdf0dfb9f..000000000
--- a/winsup/mingw/samples/simpledll/dll.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// This is a C++ version of the code in dll.c. NOTE that you need to put
-// extern "C" { ... } around DllMain or it will not be called when your
-// Dll starts up! (It will get name mangled as a C++ function and the C
-// default version in libmingw32.a will get called instead.)
-//
-
-#include <windows.h>
-
-#include <iostream>
-
-extern "C" {
-
-BOOL WINAPI
-DllMain (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
-{
-	switch (dwReason)
-	{
-		case DLL_PROCESS_ATTACH:
-			cout << "Dll Attached" << endl ;
-			break;
-
-		case DLL_PROCESS_DETACH:
-			cout << "Dll Detached" << endl ;
-			break;
-
-		case DLL_THREAD_ATTACH:
-			printf ("DLL Thread Attached.\n");
-			break;
-
-		case DLL_THREAD_DETACH:
-			printf ("DLL Thread Detached.\n");
-			break;
-	}
-	return TRUE;
-}
-
-void
-Test ()
-{
-	printf ("Test Function called!\n");
-}
-
-};
diff --git a/winsup/mingw/samples/simpledll/dll.def b/winsup/mingw/samples/simpledll/dll.def
deleted file mode 100644
index 3cabd50a5..000000000
--- a/winsup/mingw/samples/simpledll/dll.def
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPORTS
-Test
diff --git a/winsup/mingw/samples/simpledll/exe.c b/winsup/mingw/samples/simpledll/exe.c
deleted file mode 100644
index af5bb41df..000000000
--- a/winsup/mingw/samples/simpledll/exe.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-
-extern void Test();
-
-int main()
-{
-	printf ("Program started.\n");
-	Test ();
-	printf ("Program ends.\n");
-
-	return 0;
-}
-
diff --git a/winsup/mingw/samples/simpledll/jamfile b/winsup/mingw/samples/simpledll/jamfile
deleted file mode 100644
index d1e2591be..000000000
--- a/winsup/mingw/samples/simpledll/jamfile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Dll dll.dll : dll.c ;
-
-ImportLib libdll.a : dll.def ;
-
-
-Main exe.exe : exe.c ;
-
-LinkLibraries exe.exe : libdll.a ;
-
-DEPENDS exe.exe : dll.dll ;
-
-LINKFLAGS on exe.exe = $(LINKFLAGS) -L. ;
-
diff --git a/winsup/mingw/samples/simpledll/makedll.bat b/winsup/mingw/samples/simpledll/makedll.bat
deleted file mode 100644
index c7f9b2ae8..000000000
--- a/winsup/mingw/samples/simpledll/makedll.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-rem *** Create the import library for the dll ***

-dlltool --dllname dll.dll --def dll.def --output-lib libdll.a  

-

-rem *** Compile the dll ***

-gcc -c -o dll.o  dll.c 

-

-rem *** Link the dll ***

-gcc -s -mdll -o dll.dll -Wl,--base-file,dll.b dll.o

-dlltool --dllname dll.dll --base-file dll.b --output-exp dll.e --def dll.def 

-gcc -s -mdll -o dll.dll -Wl,--base-file,dll.b dll.o -Wl,dll.e 

-dlltool --dllname dll.dll --base-file dll.b --output-exp dll.e --def dll.def 

-gcc -s -mdll -o dll.dll dll.o -Wl,dll.e 

-

-rem *** Delete temporary files from dll linking ***

-del dll.b 

-del dll.e 

-

-rem *** Compile exe, which uses dll. ***

-gcc -c -o exe.o exe.c 

-

-rem *** Link exe.exe, which uses dll.dll ***

-gcc -s -L. -o exe.exe exe.o libdll.a

-

diff --git a/winsup/mingw/samples/test/jamfile b/winsup/mingw/samples/test/jamfile
deleted file mode 100644
index 2fc7b84af..000000000
--- a/winsup/mingw/samples/test/jamfile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# A very simple example with which you can test your compiler/jam setup.
-# Also an interesting example of a hybrid console/GUI application.
-#
-
-Main test.exe : test.c ;
-
-GuiLibs test.exe ;
-
diff --git a/winsup/mingw/samples/test/test.c b/winsup/mingw/samples/test/test.c
deleted file mode 100644
index 82ca6b0fc..000000000
--- a/winsup/mingw/samples/test/test.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This source code is in the PUBLIC DOMAIN and has NO WARRANTY.
- *
- * Colin Peters <colin@bird.fu.is.saga-u.ac.jp>, April 15, 1997.
- */
-
-#include <windows.h>
-#include <stdio.h>
-
-int STDCALL
-WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
-{
-	char text[80];
-
-	printf ("Enter message box text:");
-	fgets(text, 80, stdin);
-	MessageBox (NULL, text, "Test", MB_OK);
-	printf ("\nHello after message box.\n");
-	return 0;
-}
diff --git a/winsup/mingw/samples/wintest/jamfile b/winsup/mingw/samples/wintest/jamfile
deleted file mode 100644
index b2f783118..000000000
--- a/winsup/mingw/samples/wintest/jamfile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# A example of Win32 GUI programming in C.
-#
-
-Main test.exe : test.c ;
-
-Gui test.exe ;
-
diff --git a/winsup/mingw/samples/wintest/test.c b/winsup/mingw/samples/wintest/test.c
deleted file mode 100644
index 056888ffc..000000000
--- a/winsup/mingw/samples/wintest/test.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * A basic example of Win32 programming in C.
- *
- * This source code is in the PUBLIC DOMAIN and has NO WARRANTY.
- *
- * Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- */
-
-#include <windows.h>
-#include <string.h>
-
-/*
- * This is the window function for the main window. Whenever a message is
- * dispatched using DispatchMessage (or sent with SendMessage) this function
- * gets called with the contents of the message.
- */
-LRESULT CALLBACK
-MainWndProc (HWND hwnd, UINT nMsg, WPARAM wParam, LPARAM lParam)
-{
-	/* The window handle for the "Click Me" button. */
-	static	HWND	hwndButton = 0;
-	static int	cx, cy;	/* Height and width of our button. */
-
-	HDC		hdc;	/* A device context used for drawing */
-	PAINTSTRUCT	ps;	/* Also used during window drawing */
-	RECT		rc;	/* A rectangle used during drawing */
-
-	/*
-	 * Perform processing based on what kind of message we got.
-	 */
-	switch (nMsg)
-	{
-		case WM_CREATE:
-		{
-			/* The window is being created. Create our button
-			 * window now. */
-			TEXTMETRIC	tm;
-
-			/* First we use the system fixed font size to choose
-			 * a nice button size. */
-			hdc = GetDC (hwnd);
-			SelectObject (hdc, GetStockObject (SYSTEM_FIXED_FONT));
-			GetTextMetrics (hdc, &tm);
-			cx = tm.tmAveCharWidth * 30;
-			cy = (tm.tmHeight + tm.tmExternalLeading) * 2;
-			ReleaseDC (hwnd, hdc);
-
-			/* Now create the button */
-			hwndButton = CreateWindow (
-				"button",	/* Builtin button class */
-				"Click Here",
-				WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON,
-				0, 0, cx, cy,
-				hwnd,		/* Parent is this window. */
-				(HMENU) 1,	/* Control ID: 1 */
-				((LPCREATESTRUCT) lParam)->hInstance,
-				NULL
-				);
-
-			return 0;
-			break;
-		}
-
-		case WM_DESTROY:
-			/* The window is being destroyed, close the application
-			 * (the child button gets destroyed automatically). */
-			PostQuitMessage (0);
-			return 0;
-			break;
-
-		case WM_PAINT:
-			/* The window needs to be painted (redrawn). */
-			hdc = BeginPaint (hwnd, &ps);
-			GetClientRect (hwnd, &rc);
-
-			/* Draw "Hello, World" in the middle of the upper
-			 * half of the window. */
-			rc.bottom = rc.bottom / 2;
-			DrawText (hdc, "Hello, World", -1, &rc,
-				DT_SINGLELINE | DT_CENTER | DT_VCENTER);
-
-			EndPaint (hwnd, &ps);
-			return 0;
-			break;
-
-		case WM_SIZE:
-			/* The window size is changing. If the button exists
-			 * then place it in the center of the bottom half of
-			 * the window. */
-			if (hwndButton &&
-				(wParam == SIZEFULLSCREEN ||
-				 wParam == SIZENORMAL)
-			   )
-			{
-				rc.left = (LOWORD(lParam) - cx) / 2;
-				rc.top = HIWORD(lParam) * 3 / 4 - cy / 2;
-				MoveWindow (
-					hwndButton,
-					rc.left, rc.top, cx, cy, TRUE);
-			}
-			break;
-
-		case WM_COMMAND:
-			/* Check the control ID, notification code and
-			 * control handle to see if this is a button click
-			 * message from our child button. */
-			if (LOWORD(wParam) == 1 &&
-			    HIWORD(wParam) == BN_CLICKED &&
-			    (HWND) lParam == hwndButton)
-			{
-				/* Our button was clicked. Close the window. */
-				DestroyWindow (hwnd);
-			}
-			return 0;
-			break;
-	}
-
-	/* If we don't handle a message completely we hand it to the system
-	 * provided default window function. */
-	return DefWindowProc (hwnd, nMsg, wParam, lParam);
-}
-
-
-int STDCALL
-WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
-{
-	HWND		hwndMain;	/* Handle for the main window. */
-	MSG		msg;		/* A Win32 message structure. */
-	WNDCLASSEX	wndclass;	/* A window class structure. */
-	char*		szMainWndClass = "WinTestWin";
-					/* The name of the main window class */
-
-	/*
-	 * First we create a window class for our main window.
-	 */
-
-	/* Initialize the entire structure to zero. */
-	memset (&wndclass, 0, sizeof(WNDCLASSEX));
-
-	/* This class is called WinTestWin */
-	wndclass.lpszClassName = szMainWndClass;
-
-	/* cbSize gives the size of the structure for extensibility. */
-	wndclass.cbSize = sizeof(WNDCLASSEX);
-
-	/* All windows of this class redraw when resized. */
-	wndclass.style = CS_HREDRAW | CS_VREDRAW;
-
-	/* All windows of this class use the MainWndProc window function. */
-	wndclass.lpfnWndProc = MainWndProc;
-
-	/* This class is used with the current program instance. */
-	wndclass.hInstance = hInst;
-
-	/* Use standard application icon and arrow cursor provided by the OS */
-	wndclass.hIcon = LoadIcon (NULL, IDI_APPLICATION);
-	wndclass.hIconSm = LoadIcon (NULL, IDI_APPLICATION);
-	wndclass.hCursor = LoadCursor (NULL, IDC_ARROW);
-
-	/* Color the background white */
-	wndclass.hbrBackground = (HBRUSH) GetStockObject (WHITE_BRUSH);
-
-	/*
-	 * Now register the window class for use.
-	 */
-	RegisterClassEx (&wndclass);
-
-	/*
-	 * Create our main window using that window class.
-	 */
-	hwndMain = CreateWindow (
-		szMainWndClass,		/* Class name */
-		"Hello",		/* Caption */
-		WS_OVERLAPPEDWINDOW,	/* Style */
-		CW_USEDEFAULT,		/* Initial x (use default) */
-		CW_USEDEFAULT,		/* Initial y (use default) */
-		CW_USEDEFAULT,		/* Initial x size (use default) */
-		CW_USEDEFAULT,		/* Initial y size (use default) */
-		NULL,			/* No parent window */
-		NULL,			/* No menu */
-		hInst,			/* This program instance */
-		NULL			/* Creation parameters */
-		);
-	
-	/*
-	 * Display the window which we just created (using the nShow
-	 * passed by the OS, which allows for start minimized and that
-	 * sort of thing).
-	 */
-	ShowWindow (hwndMain, nShow);
-	UpdateWindow (hwndMain);
-
-	/*
-	 * The main message loop. All messages being sent to the windows
-	 * of the application (or at least the primary thread) are retrieved
-	 * by the GetMessage call, then translated (mainly for keyboard
-	 * messages) and dispatched to the appropriate window procedure.
-	 * This is the simplest kind of message loop. More complex loops
-	 * are required for idle processing or handling modeless dialog
-	 * boxes. When one of the windows calls PostQuitMessage GetMessage
-	 * will return zero and the wParam of the message will be filled
-	 * with the argument to PostQuitMessage. The loop will end and
-	 * the application will close.
-         */
-	while (GetMessage (&msg, NULL, 0, 0))
-	{
-		TranslateMessage (&msg);
-		DispatchMessage (&msg);
-	}
-	return msg.wParam;
-}
-
diff --git a/winsup/mingw/strcasecmp.c b/winsup/mingw/strcasecmp.c
deleted file mode 100644
index ce5351c2c..000000000
--- a/winsup/mingw/strcasecmp.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * strcasecmp.c
- *
- * Oldnames from ANSI header string.h
- *
- * Some wrapper functions for those old name functions whose appropriate
- * equivalents are not simply underscore prefixed.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <string.h>
-
-int
-strcasecmp (const char *sz1, const char *sz2)
-{
-  return _stricmp (sz1, sz2);
-}
-
diff --git a/winsup/mingw/strncasecmp.c b/winsup/mingw/strncasecmp.c
deleted file mode 100644
index 49ead5f68..000000000
--- a/winsup/mingw/strncasecmp.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * strncasecmp.c
- *
- * Oldnames from ANSI header string.h
- *
- * Some wrapper functions for those old name functions whose appropriate
- * equivalents are not simply underscore prefixed.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <string.h>
-
-int
-strncasecmp (const char *sz1, const char *sz2, size_t sizeMaxCompare)
-{
-  return _strnicmp (sz1, sz2, sizeMaxCompare);
-}
-
diff --git a/winsup/mingw/test_headers.c b/winsup/mingw/test_headers.c
deleted file mode 100644
index 62402a6f0..000000000
--- a/winsup/mingw/test_headers.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <_mingw.h>
-#include <assert.h>
-#include <conio.h>
-#include <ctype.h>
-#include <dir.h>
-#include <direct.h>
-#include <dirent.h>
-#include <dos.h>
-#include <errno.h>
-#include <excpt.h>
-#include <fcntl.h>
-#include <fenv.h>
-#include <float.h>
-#include <inttypes.h>
-#include <io.h>
-#include <limits.h>
-#include <locale.h>
-#include <malloc.h>
-#include <math.h>
-#include <mbctype.h>
-#include <mbstring.h>
-#include <mem.h>
-#include <memory.h>
-#include <process.h>
-#include <search.h>
-#include <setjmp.h>
-#include <share.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <tchar.h>
-#include <time.h>
-#include <unistd.h>
-#include <values.h>
-#include <wchar.h>
-#include <wctype.h>
-#include <sys/fcntl.h>
-#include <sys/file.h>
-#include <sys/locking.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/timeb.h>
-#include <sys/types.h>
-#include <sys/unistd.h>
-#include <sys/utime.h>
-
-int main()
-{return 0;}
diff --git a/winsup/mingw/toascii.c b/winsup/mingw/toascii.c
deleted file mode 100644
index 7eebbe885..000000000
--- a/winsup/mingw/toascii.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * toascii.c
- *
- * Oldnames from ANSI header ctype.h
- *
- * Some wrapper functions for those old name functions whose appropriate
- * equivalents are not simply underscore prefixed.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <ctype.h>
-
-
-int
-toascii (int c)
-{
-	return __toascii(c);
-}
-
diff --git a/winsup/mingw/txtmode.c b/winsup/mingw/txtmode.c
deleted file mode 100644
index 077174697..000000000
--- a/winsup/mingw/txtmode.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <fcntl.h>
-
-/* Set default file mode to text */
-
-/* Is this correct?  Default value of  _fmode in msvcrt.dll is 0. */
-
-int _fmode = _O_TEXT; 
diff --git a/winsup/mingw/wcscmpi.c b/winsup/mingw/wcscmpi.c
deleted file mode 100644
index a97f78e62..000000000
--- a/winsup/mingw/wcscmpi.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * wcscmpi.c
- *
- * Oldnames from ANSI header string.h
- *
- * Some wrapper functions for those old name functions whose appropriate
- * equivalents are not simply underscore prefixed.
- *
- * Contributors:
- *  Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
- *
- *  THIS SOFTWARE IS NOT COPYRIGHTED
- *
- *  This source code is offered for use in the public domain. You may
- *  use, modify or distribute it freely.
- *
- *  This code is distributed in the hope that it will be useful but
- *  WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
- *  DISCLAMED. This includes but is not limited to warrenties of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $Revision$
- * $Author$
- * $Date$
- *
- */
-
-#include <string.h>
-
-int
-wcscmpi (const wchar_t * ws1, const wchar_t * ws2)
-{
-  return _wcsicmp (ws1, ws2);
-}
-
diff --git a/winsup/subauth/ChangeLog b/winsup/subauth/ChangeLog
deleted file mode 100644
index 385d6cc11..000000000
--- a/winsup/subauth/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2001-10-12  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Comment out install for now.
-
-2001-10-12  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Accomodate changes to w32api_include macro.
-
-Sun May 20 00:24:36 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Use 'rm -f' when cleaning.
-
-Fri May  4 15:06:00  Corinna Vinschen <corinna@vinschen.de>
-
-	Initial release of the Cygwin subauthentication DLL.
-	* ChangeLog: New file.
-	* Makefile.in: Ditto.
-	* configure: Ditto. Generated from configure.in.
-	* configure.in: Ditto.
-	* cygsuba.c: Ditto.
-	* cygsuba.din: Ditto.
diff --git a/winsup/subauth/Makefile.in b/winsup/subauth/Makefile.in
deleted file mode 100644
index ae64de496..000000000
--- a/winsup/subauth/Makefile.in
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (c) 2001, Red Hat, Inc.
-#
-#     This program is free software; you can redistribute it and/or modify
-#     it under the terms of the GNU General Public License as published by
-#     the Free Software Foundation; either version 2 of the License, or
-#     (at your option) any later version.
-#
-#     A copy of the GNU General Public License can be found at
-#     http://www.gnu.org/
-#
-# Written by Corinna Vinschen <vinschen@redhat.de>
-#
-# Makefile for Cygwin subauthentication DLL.
-
-SHELL := @SHELL@
-
-srcdir          := @srcdir@
-VPATH           := @srcdir@
-prefix          := @prefix@
-exec_prefix     := @exec_prefix@
-
-bindir          := @bindir@
-etcdir          := $(exec_prefix)/etc
-
-program_transform_name := @program_transform_name@
-
-INSTALL         := @INSTALL@
-INSTALL_PROGRAM := @INSTALL_PROGRAM@
-INSTALL_DATA    := @INSTALL_DATA@
-
-CC              := @CC@
-CC_FOR_TARGET   := $(CC)
-
-CFLAGS          := @CFLAGS@ -nostdinc
-
-include $(srcdir)/../Makefile.common
-
-WIN32_COMMON	:= -mno-cygwin
-WIN32_INCLUDES  := -I. -I$(srcdir) $(w32api_include)
-WIN32_CFLAGS    := $(CFLAGS) $(WIN32_COMMON) $(WIN32_INCLUDES)
-WIN32_LDFLAGS	:= $(CFLAGS) $(WIN32_COMMON) -L$(mingw_build) -nostdlib -Wl,-shared
-
-STARTFILE	:= $(mingw_build)/dllcrt2.o
-LIBS		:= -lmingw32 -lkernel32
-
-DLL	:=	cygsuba.dll
-DEF_FILE:=	cygsuba.def
-
-OBJ	=	cygsuba.o
-
-.SUFFIXES:
-.NOEXPORT:
-
-all: Makefile $(DLL)
-
-$(DEF_FILE): cygsuba.din config.status
-	$(SHELL) config.status
-
-$(DLL): $(OBJ) $(DEF_FILE)
-ifdef VERBOSE
-	$(CC) -s $(WIN32_LDFLAGS) -o $@ $(DEF_FILE) $(STARTFILE) $(OBJ) $(LIBS)
-else
-	@echo $(CC) .. -o $@ $(OBJ)
-	@$(CC) -s $(WIN32_LDFLAGS) -o $@ $(DEF_FILE) $(STARTFILE) $(OBJ) $(LIBS)
-endif
-
-.PHONY: all install clean realclean
-
-realclean: clean
-	rm -f  Makefile config.cache
-
-clean:
-	rm -f *.o *.dll
-
-install: all
-	# $(SHELL) $(updir1)/mkinstalldirs $(bindir)
-	# for i in $(PROGS) ; do \
-	#   n=`echo $$i | sed '$(program_transform_name)'`; \
-	#   $(INSTALL_PROGRAM) $$i $(bindir)/$$n; \
-	# done || exit 0
-
-%.o: %.c
-ifdef VERBOSE
-	$(CC) $(WIN32_CFLAGS) -c -o $@ $<
-else
-	@echo $(CC) -c $(CFLAGS) ... $(<F)
-	@$(CC) $(WIN32_CFLAGS) -c -o $@ $<
-endif
-
diff --git a/winsup/subauth/configure b/winsup/subauth/configure
deleted file mode 100755
index 1c3c9cc2f..000000000
--- a/winsup/subauth/configure
+++ /dev/null
@@ -1,1253 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.in
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:578: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:599: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:617: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:643: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:673: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:722: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:746: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
-set dummy ${ac_tool_prefix}g++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:782: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="${ac_tool_prefix}g++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CXX"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "g++", so it can be a program name with args.
-set dummy g++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:814: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="g++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CXX" && ac_cv_prog_CXX="g++"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CXX="g++"
-fi
-fi
-
-if test -z "$CXX"; then
-  # Extract the first word of "c++", so it can be a program name with args.
-set dummy c++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:850: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="c++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-CXXFLAGS='$(CFLAGS)'
-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-if test "x$cross_compiling" = "xyes"; then
-  if test "x$program_transform_name" = "xs,x,x,"; then
-    program_transform_name=""
-  fi
-  if test "x$program_transform_name" = "x"; then
-    program_transform_name="s,^,$host-,"
-  else
-    program_transform_name="$program_transform_name -e s,^,$host-,"
-  fi
-fi
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:925: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile cygsuba.def:cygsuba.din" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CC@%$CC%g
-s%@CXX@%$CXX%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile cygsuba.def:cygsuba.din"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/winsup/subauth/configure.in b/winsup/subauth/configure.in
deleted file mode 100644
index 7e76ea7b7..000000000
--- a/winsup/subauth/configure.in
+++ /dev/null
@@ -1,91 +0,0 @@
-dnl Copyright (c) 2001, Red Hat, Inc.
-dnl
-dnl     This program is free software; you can redistribute it and/or modify
-dnl     it under the terms of the GNU General Public License as published by
-dnl     the Free Software Foundation; either version 2 of the License, or
-dnl     (at your option) any later version.
-dnl
-dnl     A copy of the GNU General Public License can be found at
-dnl     http://www.gnu.org/
-dnl
-dnl Written by Christopher Faylor <cgf@redhat.com>
-dnl Changed for subauth subdir by Corinna Vinschen <vinschen@redhat.com>
-
-dnl Autoconf configure script for Cygwin utilities.
-dnl
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.12)
-
-AC_INIT(Makefile.in)
-
-dnl FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-dnl copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-dnl are probably using a cross compiler, which will not be able to fully
-dnl link an executable.  This should really be fixed in autoconf
-dnl itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-AC_DEFUN(LIB_AC_PROG_CXX,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CXX, g++, g++)
-if test -z "$CXX"; then
-  AC_CHECK_PROG(CXX, c++, c++, , , )
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-CXXFLAGS='$(CFLAGS)'
-])
-
-AC_CANONICAL_SYSTEM
-
-LIB_AC_PROG_CC
-LIB_AC_PROG_CXX
-
-AC_ARG_PROGRAM
-
-if test "x$cross_compiling" = "xyes"; then
-  if test "x$program_transform_name" = "xs,x,x,"; then
-    program_transform_name=""
-  fi
-  if test "x$program_transform_name" = "x"; then
-    program_transform_name="s,^,$host-,"
-  else
-    program_transform_name="$program_transform_name -e s,^,$host-,"
-  fi
-fi
-
-AC_PROG_INSTALL
-
-AC_OUTPUT(Makefile cygsuba.def:cygsuba.din)
diff --git a/winsup/subauth/cygsuba.c b/winsup/subauth/cygsuba.c
deleted file mode 100644
index d79209fa8..000000000
--- a/winsup/subauth/cygsuba.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* cygsuba.c: Minimal subauthentication functionality to support
-              logon without password.
-
-   Copyright 2001 Red Hat, Inc.
-
-Written by Corinna Vinschen <vinschen@redhat.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <windows.h>
-#include <subauth.h>
-#include <ntsecapi.h>
-
-NTSTATUS NTAPI
-Msv1_0SubAuthenticationRoutine (NETLOGON_LOGON_INFO_CLASS logon_level,
-				VOID *logon_inf,
-				ULONG flags,
-				USER_ALL_INFORMATION *usr_inf,
-				ULONG *which,
-				ULONG *usr_flags,
-				BOOLEAN *auth,
-				LARGE_INTEGER *logoff,
-				LARGE_INTEGER *kickoff)
-{
-  ULONG valid_account = USER_NORMAL_ACCOUNT;
-  if (!(flags & MSV1_0_PASSTHRU))
-    valid_account |= USER_TEMP_DUPLICATE_ACCOUNT;
-
-  *which = *usr_flags = 0;
-
-  /* Not a Network logon? 
-     TODO: How do I manage an interactive logon using a subauthentication
-     package??? The logon_level "interactive" is available but I never
-     got it working. I assume that's the reason I don't get a legal
-     logon session so that I can connect to network drives. */
-  if (logon_level != NetlogonNetworkInformation)
-    {
-      *auth = TRUE;
-      return STATUS_INVALID_INFO_CLASS;
-    }
-
-  /* Account type ok? */
-  if (!(usr_inf->UserAccountControl & valid_account))
-    {
-      *auth = FALSE;
-      return STATUS_NO_SUCH_USER;
-    }
-
-  /* Guest logon? */
-  if (flags & MSV1_0_GUEST_LOGON)
-    *usr_flags = LOGON_GUEST;
-
-#if defined (SSHD)
-  /* The same code could be used to allow the DLL checking for
-     SSH RSA/DSA keys. For that purpose, SSH would need it's
-     own implementation with the below field used to transport
-     the keys which have to be checked. This could be used to
-     allow secure logon with RSA/DSA instead of passwords.
-     Of course that needs lots of additions to the code... */
-  {
-    PNETLOGON_NETWORK_INFO nw_inf = (PNETLOGON_NETWORK_INFO) logon_inf;
-
-    /*
-        nw_inf->LmChallenge.data <=>
-			MSV1_0_LM20_LOGON::ChallengeToClient
-        nw_inf->NtChallengeResponse <=>
-			MSV1_0_LM20_LOGON::CaseSensitiveChallengeResponse
-        nw_inf->LmChallengeResponse <=>
-			MSV1_0_LM20_LOGON::CaseInsensitiveChallengeResponse
-    */
-    if (authentication_failed)
-      {
-        *auth = (usr_inf->UserAccountControl & USER_ACCOUNT_DISABLED) ?
-		         FALSE : TRUE;
-        return STATUS_WRONG_PASSWORD;
-      }
-  }
-#endif
-
-  /* All accounts except for the local admin are checked for being
-     locked out or disabled or expired. */
-  if (usr_inf->UserId != DOMAIN_USER_RID_ADMIN)
-    {
-      SYSTEMTIME CurrentTime;
-      LARGE_INTEGER LogonTime;
-
-      /* Account locked out? */
-      if (usr_inf->UserAccountControl & USER_ACCOUNT_AUTO_LOCKED)
-	{
-	  *auth = (usr_inf->UserAccountControl & USER_ACCOUNT_DISABLED) ?
-			   FALSE : TRUE;
-	  return STATUS_ACCOUNT_LOCKED_OUT;
-	}
-
-      /* Account disabled? */
-      if (usr_inf->UserAccountControl & USER_ACCOUNT_DISABLED)
-        {
-          *auth = FALSE;
-          return STATUS_ACCOUNT_DISABLED;
-        }
-
-      /* Account expired? */
-      GetSystemTime (&CurrentTime);
-      SystemTimeToFileTime(&CurrentTime, (LPFILETIME) &LogonTime);
-      if (usr_inf->AccountExpires.QuadPart &&
-          LogonTime.QuadPart >= usr_inf->AccountExpires.QuadPart)
-	{
-          *auth = TRUE;
-          return STATUS_ACCOUNT_EXPIRED;
-        }
-    }
-
-  /* Don't force logout. */
-  logoff->HighPart = 0x7FFFFFFF;
-  logoff->LowPart = 0xFFFFFFFF;
-  kickoff->HighPart = 0x7FFFFFFF;
-  kickoff->LowPart = 0xFFFFFFFF;
-
-  *auth = TRUE;
-  return STATUS_SUCCESS;
-}
-
-NTSTATUS NTAPI
-Msv1_0SubAuthenticationFilter (NETLOGON_LOGON_INFO_CLASS logon_level,
-			       VOID *logon_inf,
-			       ULONG flags,
-			       USER_ALL_INFORMATION *usr_inf,
-			       ULONG *which,
-			       ULONG *usr_flags,
-			       BOOLEAN *auth,
-			       LARGE_INTEGER *logoff,
-			       LARGE_INTEGER *kickoff)
-{
-  return Msv1_0SubAuthenticationRoutine (logon_level, logon_inf, flags,
-  					 usr_inf, which, usr_flags,
-					 auth, logoff, kickoff);
-}
diff --git a/winsup/subauth/cygsuba.din b/winsup/subauth/cygsuba.din
deleted file mode 100644
index 82ddcfe9b..000000000
--- a/winsup/subauth/cygsuba.din
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY "cygsuba"

-

-EXPORTS

-Msv1_0SubAuthenticationRoutine = Msv1_0SubAuthenticationRoutine@36

-Msv1_0SubAuthenticationFilter = Msv1_0SubAuthenticationFilter@36

diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
deleted file mode 100644
index 353bfb00e..000000000
--- a/winsup/testsuite/ChangeLog
+++ /dev/null
@@ -1,599 +0,0 @@
-2003-12-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.api/known_bugs.tcl: Remove fcntl09 and fcntl10.  These
-	tests had a compatibility bug.
-	* winsup.api/ltp/fcntl09.c: Don't use F_RDLCK | F_WRLCK but only
-	F_WRLCK to set a write lock.
-	* winsup.api/ltp/fcntl10.c: Ditto.
-
-2003-11-25  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.api/known_bugs.tcl: Remove lseek10 since mknod now works.
-
-2003-11-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.api/msgtest.c (main): Revert to use the SIGSYS signal handler.
-	* winsup.api/semtest.c (main): Ditto.
-	* winsup.api/shmtest.c (main): Ditto.
-
-2003-11-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.api/msgtest.c: New file derived from FreeBSD, testing
-	XSI Message Queue support.
-	* winsup.api/semtest.c: Ditto, testing XSI Semaphore support.
-	* winsup.api/shmtest.c: Ditto, testing XSI Shared Memory support.
-
-2003-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.api/known_bugs.tcl: Remove gethostid01 from list of known
-	bugs.
-
-2003-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Remove .dat files when cleaning.
-
-2003-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Remove .d files when cleaning.
-
-2003-05-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* libltp/include/test.h: Remove gethostid declaration.
-
-2003-04-08  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/condvar9.c: Fix test.
-
-2003-03-27  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/rwlock1.c: Remove pthreads-win32 header.
-	* winsup.api/pthread/rwlock2.c: Ditto.
-	* winsup.api/pthread/rwlock3.c: Ditto.
-	* winsup.api/pthread/rwlock4.c: Ditto.
-	* winsup.api/pthread/rwlock5.c: Ditto.
-	* winsup.api/pthread/rwlock6.c: Ditto.
-
-2003-03-27  Brian Ford  <ford@vss.fsi.com>
-
-	* winsup.api/pthread/condvar7.c (mythread): Cast
-	pthread_mutex_unlock argument of pthread_cleanup_push
-	to void *, preventing a	compiler warning / testsuite failure.
-	* winsup.api/pthread/condvar9.c (mythread): Likewise.
-	* winsup.api/pthread/rwlock7.c (main): Use ftime instead of
-	_ftime.
-
-2003-03-18  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/rwlock1.c: New test.
-	* winsup.api/pthread/rwlock2.c: Ditto.
-	* winsup.api/pthread/rwlock3.c: Ditto.
-	* winsup.api/pthread/rwlock4.c: Ditto.
-	* winsup.api/pthread/rwlock5.c: Ditto.
-	* winsup.api/pthread/rwlock6.c: Ditto.
-	* winsup.api/pthread/rwlock7.c: Ditto.
-
-2003-03-18  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/condvar7.c: New test.
-	* winsup.api/pthread/condvar9.c: Ditto.
-
-2003-03-18  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/mutex1n.c: New test.
-	* winsup.api/pthread/mutex6n.c: Ditto.
-	* winsup.api/pthread/mutex7n.c: Ditto.
-
-2003-03-09  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.api/winsup.exp: Use -nostdinc when compiling.
-	* Makefile.in: Specifically search compiler include directory since it
-	is now stripped via -nostdinc.
-
-2003-03-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.api/ltp/fork10.c (main): Remove non-portable declaration
-	of lseek.
-
-2003-03-09  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Use "cygwin0" rather than "new-cygwin" to denote
-	in-build-tree version of library or dll.
-	* config/default.exp: Ditto.
-	* winsup.api/winsup.exp: Ditto.
-
-2003-03-07  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.api/known_bugs.tcl: Remove fsync01, setregid01 and setreuid01
-	from list of known bugs.
-
-2003-02-19  Vaclav Haisman  <V.Haisman@sh.cvut.cz>
-
-	* winsup.api/crlf.c: Fix C signed/unsigned compare warning.
-	* winsup.api/mmaptest01.c: Ditto.
-	* winsup.api/ltp/chmod01.c: Ditto.
-	* winsup.api/ltp/fork04.c: Ditto.
-	* winsup.api/ltp/lseek03.c: Ditto.
-	* winsup.api/ltp/lseek06.c: Ditto.
-	* winsup.api/ltp/lseek07.c: Ditto.
-	* winsup.api/ltp/lseek08.c: Ditto.
-	* winsup.api/ltp/mmap001.c: Ditto.
-	* winsup.api/ltp/mmap02.c: Ditto.
-	* winsup.api/ltp/mmap03.c: Ditto.
-	* winsup.api/ltp/mmap04.c: Ditto.
-	* winsup.api/ltp/mmap05.c: Ditto.
-	* winsup.api/ltp/mmap06.c: Ditto.
-	* winsup.api/ltp/mmap07.c: Ditto.
-	* winsup.api/ltp/mmap08.c: Ditto.
-	* winsup.api/ltp/pipe11.c: Ditto.
-	* winsup.api/ltp/poll01.c: Ditto.
-	* winsup.api/ltp/sync02.c: Ditto.   
-	* winsup.api/ltp/times03.c: Ditto.
-	* winsup.api/ltp/umask03.c: Ditto.
-	* winsup.api/ltp/getpgid01.c: Remove unused obsolete include.
-	* winsup.api/ltp/getpgid02.c: Ditto.
-
-2003-02-08  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.api/winsup.exp (ws_spawn): Tweak slightly to work with tcl
-	8.4.1.
-
-2003-02-07  Christopher Faylor  <cgf@redhat.com>
-
-	* libltp/lib/parse_opts.c: Deal with C warnings.
-	* winsup.api/pthread/cancel12.c: Ditto.
-	* winsup.api/winsup.exp: Don't use -g3.
-
-2003-02-04  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/cancel11.c: New test.
-	* winsup.api/pthread/cancel12.c: Ditto.
-
-2003-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Don't filter out -g.  Actually pass correct CFLAGS to
-	site.exp.
-	* winsup.api/winsup.exp: Use -g flag from CFLAGS.
-
-2003-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Turn off all optimizations.
-	* libltp/lib/parse_opts.c (TEST_VALID_ENO): Move define outside of
-	conditional.
-	(TEST_ERRNO): Ditto.
-	(btime): Ditto.
-	(etime): Ditto.
-	(tmptime): Ditto.
-
-2003-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	* libltp/include/usctest.h: Add externs to some variables that need it.
-	* winsup.api/ltp/mmap05.c (main): Make file_content volatile to avoid
-	optimization glitch.
-
-2003-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.api/mmaptest03.c (main): Mark variables as volatile to avoid
-	optimization induced problems.
-
-2003-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile (check): Add cygrun.exe dependency.
-
-2003-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	Perform more C warning fixup on all C source files and headers.
-
-2003-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	* libltp/include/test.h: Fix C warnings.
-	* winsup.api/checksignal.c: Ditto.
-	* winsup.api/crlf.c: Ditto.
-	* winsup.api/devzero.c: Ditto.
-	* winsup.api/iospeed.c: Ditto.
-	* winsup.api/mmaptest01.c: Ditto.
-	* winsup.api/mmaptest02.c: Ditto.
-	* winsup.api/mmaptest03.c: Ditto.
-	* winsup.api/mmaptest04.c: Ditto.
-	* winsup.api/nullgetcwd.c: Ditto.
-	* winsup.api/sigchld.c: Ditto.
-	* winsup.api/signal-into-win32-api.c: Ditto.
-	* winsup.api/systemcall.c: Ditto.
-	* winsup.api/waitpid.c: Ditto.
-	* winsup.api/pthread/mainthreadexits.c: Ditto.
-	* winsup.api/pthread/test.h: Ditto.
-	* winsup.api/pthread/threadidafterfork.c: Ditto.
-
-	* Makefile.in: Remove cygrun.exe from RUNTIME since it is built here
-	now.
-
-2003-01-23  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Use ALL_CFLAGS to build test programs so that correct
-	libraries and other options are used.
-
-2003-01-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygrun.c: Move here from ../cygwin.
-	* Makefile.in: Build cygrun.exe.
-	* winsup.api/winsup.exp: Expect cygrun.exe in $rootme.
-
-2003-01-21  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Find tcl library in the right place.
-
-2003-01-21  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/cancel9.c: Make child pid static global.
-	(main): Wait in mainthread until child process has terminated.
-
-2003-01-14  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/cancel10.c: New test.
-
-2003-01-14  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/cancel9.c: New test.
-
-2003-01-14  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/cancel7.c: New test.
-	* winsup.api/pthread/cancel8.c: Ditto.
-
-2003-01-14  Thomas Pfaff  <tpfaff@gmx.net>
-
-	* winsup.api/pthread/cancel6.c: New test.
-
-2003-01-09  Thomas Pfaff  <tpfaff@gmx.net>
-	
-	* winsup.api/pthread/mutex1d.c: New test. Port from pthreads-win32 
-	project.
-	* winsup.api/pthread/mutex1e.c: Ditto.
-	* winsup.api/pthread/mutex4.c: Ditto.
-	* winsup.api/pthread/mutex5.c: Ditto.
-	* winsup.api/pthread/mutex6d.c: Ditto.
-	* winsup.api/pthread/mutex6e.c: Ditto.
-	* winsup.api/pthread/mutex7.c: Ditto.
-	* winsup.api/pthread/mutex7d.c: Ditto.
-	* winsup.api/pthread/mutex7e.c: Ditto.
-	* winsup.api/pthread/mutex7r.c: Ditto.
-
-2002-11-25  Robert Collins  <rbtcollins@hotmail.com>
-
-	* readme: Document running portions of the test suite (Thanks Egor!).
-	* winsup.api/pthread/mainthreadexits.c: New file, derived from 
-	Thomas Pfaff's test cases.
-	* winsup.api/pthread/threadidafterfork.c: Ditto.
-
-2002-08-25  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (RUNTEST): Use Makefile's srcdir and bupdir* macros,
-	where appropriate.
-	* winsup.api/winsup.exp: Use -nodefaultlibs when linking executable to
-	avoid potentially linking installed dll.
-
-2002-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* testsuite/winsup.api/winsup.exp: Add -mwin32 to gcc flags so
-	windows.h will be found.
-
-2002-07-04  Egor Duda  <deo@logos-m.ru>
-
-	* winsup.api/pthread/cancel1.c: New test. Port from pthreads-win32 
-	project.
-	* winsup.api/pthread/cancel2.c: Ditto.
-	* winsup.api/pthread/cancel3.c: Ditto.
-	* winsup.api/pthread/cancel4.c: Ditto.
-	* winsup.api/pthread/cancel5.c: Ditto.
-
-2002-07-03  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Eliminate unneeded Makefile recreation rule.
-
-2002-02-27  Christopher Faylor  <cgf@redhat.com>
-
-	* winsup.api/systemcall.c (main): Ensure that stdin is redirected.
-
-2001-11-18  Egor Duda  <deo@logos-m.ru>
-
-	* winsup.api/pthread/condvar3_1.c: Fix debugging output.
-
-2001-11-15  Egor Duda  <deo@logos-m.ru>
-
-	* winsup.api/pthread/: New directory. Ports of pthread functionality
-	tests from pthreads-win32 project.
-	* winsup.api/pthread/test.h: Commmon declaraions for pthread tests.
-	* winsup.api/pthread/cleanup2.c: New test.
-	* winsup.api/pthread/cleanup3.c: Ditto.
-	* winsup.api/pthread/condvar1.c: Ditto.
-	* winsup.api/pthread/condvar2.c: Ditto.
-	* winsup.api/pthread/condvar2_1.c: Ditto.
-	* winsup.api/pthread/condvar3.c: Ditto.
-	* winsup.api/pthread/condvar3_1.c: Ditto.
-	* winsup.api/pthread/condvar3_2.c: Ditto.
-	* winsup.api/pthread/condvar3_3.c: Ditto.
-	* winsup.api/pthread/condvar4.c: Ditto.
-	* winsup.api/pthread/condvar5.c: Ditto.
-	* winsup.api/pthread/condvar6.c: Ditto.
-	* winsup.api/pthread/condvar8.c: Ditto.
-	* winsup.api/pthread/count1.c: Ditto.
-	* winsup.api/pthread/create1.c: Ditto.
-	* winsup.api/pthread/create2.c: Ditto.
-	* winsup.api/pthread/equal1.c: Ditto.
-	* winsup.api/pthread/exit1.c: Ditto.
-	* winsup.api/pthread/exit2.c: Ditto.
-	* winsup.api/pthread/exit3.c: Ditto.
-	* winsup.api/pthread/inherit1.c: Ditto.
-	* winsup.api/pthread/join0.c: Ditto.
-	* winsup.api/pthread/join1.c: Ditto.
-	* winsup.api/pthread/join2.c: Ditto.
-	* winsup.api/pthread/mutex1.c: Ditto.
-	* winsup.api/pthread/mutex1r.c: Ditto.
-	* winsup.api/pthread/mutex2.c: Ditto.
-	* winsup.api/pthread/mutex3.c: Ditto.
-	* winsup.api/pthread/mutex6r.c: Ditto.
-	* winsup.api/pthread/once1.c: Ditto.
-	* winsup.api/pthread/priority1.c: Ditto.
-	* winsup.api/pthread/priority2.c: Ditto.
-	* winsup.api/pthread/self1.c: Ditto.
-	* winsup.api/pthread/self2.c: Ditto.
-	* winsup.api/pthread/tsd1.c: Ditto.
-
-2001-11-08  Corinna Vinschen <corinna@vinschen.de>
-
-	* checksignal.c: New testcase.
-
-2001-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Oops.  Revert previous change.  Add Makefile/Makefile.in
-	dependency.
-
-2001-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Add check target.
-
-2001-11-02  Egor Duda  <deo@logos-m.ru>
-
-	* libltp/lib/forker.c: Include proper header to avoid compiler
-	warning.
-
-2001-10-29  Egor Duda  <deo@logos-m.ru>
-
-	* winsup.api/ltp/stat03.c: Supress compiler warning.
-
-2001-10-29  Egor Duda  <deo@logos-m.ru>
-
-	* winsup.api/signal-into-win32-api.c: Supress compiler warning.
-
-Mon Oct  8 14:15:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* winsup.api/mmaptest01.c: Add several tests on mmaps.  Use libltp.
-	* winsup.api/winsup.exp: Link all tests agains libltp.
-
-Fri Oct  5 11:15:55 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.api/nullgetcwd.c: New file.  Check that NULL first argument to
-	getcwd works.
-
-Thu Oct  4 22:47:51 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.api/systemcall.c (main): Change some messages for clarity.
-
-Thu Oct  4 22:19:39 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* winsup.api/systemcall.c: New file.  Check for system call problems.
-
-2001-09-20  Egor Duda  <deo@logos-m.ru>
-
-	* libltp/lib/get_high_address.c (get_high_address): Get inaccessible
-	address more robustly.
-	* winsup.api/ltp/stat06.c (high_address_setup): Use generic function
-	from ltp library to obtain inaccessible address.
-
-2001-09-15  Egor Duda  <deo@logos-m.ru>
-
-	* winsup.api/ltp/sbrk01.c (main): Force output at startup to
-	make sure that stdio file buffer get allocated.
-	* winsup.api/ltp/stat06.c (high_address_setup): On cygwin, area
-	after sbrk(0) may be available, use 0xffff0000 as "high address".
-	* winsup.api/ltp/symlink01.c: Perform all tests. Mark those tests that
-	don't work on cygwin with '-1'. Close open files so that temporary
-	directory can be deleted on exit.
-	* winsup.api/ltp/vfork01.c: New test.
-
-2001-09-13  Egor Duda  <deo@logos-m.ru>
-
-	* winsup.api/winsup.exp: Run only selected test if environment
-	variable CYGWIN_TESTSUITE_TESTS is set. Use its value as regular
-	expression to filter test names.
-	* winsup.api/ltp/symlink01.c (creat_path_max): Provide explicit
-	buffer to getcwd to conform to standards and avoid memory leak.
-	(do_chdir): Ditto.
-
-2001-09-13  Egor Duda  <deo@logos-m.ru>
-
-	* libltp/lib/tst_sig.c: Pass SIGSEGV to application to consider
-	whether it's expected or not.
-	* winsup.api/known_bugs.tcl: lseek10 is known to fail because mknod
-	is not implemented.
-	* winsup.api/ltp/rename02.c: Fix formatting.
-	* libltp/lib/libtestsuite.c: New file.
-	* winsup.api/signal-into-win32-api.c: New test.
-	* winsup.api/ltp/access04.c: Ditto.
-	* winsup.api/ltp/access05.c: Ditto.
-	* winsup.api/ltp/alarm07.c: Ditto.
-	* winsup.api/ltp/chdir04.c: Ditto.
-	* winsup.api/ltp/chmod01.c: Ditto.
-	* winsup.api/ltp/close01.c: Ditto.
-	* winsup.api/ltp/close02.c: Ditto.
-	* winsup.api/ltp/creat01.c: Ditto.
-	* winsup.api/ltp/creat03.c: Ditto.
-	* winsup.api/ltp/exit01.c: Ditto.
-	* winsup.api/ltp/exit02.c: Ditto.
-	* winsup.api/ltp/fchdir01.c: Ditto.
-	* winsup.api/ltp/fchdir02.c: Ditto.
-	* winsup.api/ltp/fork02.c: Ditto.
-	* winsup.api/ltp/fork03.c: Ditto.
-	* winsup.api/ltp/fork06.c: Ditto.
-	* winsup.api/ltp/fork07.c: Ditto.
-	* winsup.api/ltp/fork09.c: Ditto.
-	* winsup.api/ltp/fork10.c: Ditto.
-	* winsup.api/ltp/fork11.c: Ditto.
-	* winsup.api/ltp/fstat02.c: Ditto.
-	* winsup.api/ltp/fstat03.c: Ditto.
-	* winsup.api/ltp/fstat04.c: Ditto.
-	* winsup.api/ltp/ftruncate01.c: Ditto.
-	* winsup.api/ltp/ftruncate02.c: Ditto.
-	* winsup.api/ltp/ftruncate03.c: Ditto.
-	* winsup.api/ltp/getgid02.c: Ditto.
-	* winsup.api/ltp/getgid03.c: Ditto.
-	* winsup.api/ltp/getpgid01.c: Ditto.
-	* winsup.api/ltp/getpgid02.c: Ditto.
-	* winsup.api/ltp/getpid02.c: Ditto.
-	* winsup.api/ltp/getppid02.c: Ditto.
-	* winsup.api/ltp/getuid02.c: Ditto.
-	* winsup.api/ltp/getuid03.c: Ditto.
-	* winsup.api/ltp/kill01.c: Ditto.
-	* winsup.api/ltp/kill02.c: Ditto.
-	* winsup.api/ltp/kill03.c: Ditto.
-	* winsup.api/ltp/kill04.c: Ditto.
-	* winsup.api/ltp/lseek06.c: Ditto.
-	* winsup.api/ltp/lseek07.c: Ditto.
-	* winsup.api/ltp/lseek08.c: Ditto.
-	* winsup.api/ltp/lseek09.c: Ditto.
-	* winsup.api/ltp/lseek10.c: Ditto.
-	* winsup.api/ltp/mmap02.c: Ditto.
-	* winsup.api/ltp/mmap03.c: Ditto.
-	* winsup.api/ltp/mmap04.c: Ditto.
-	* winsup.api/ltp/mmap05.c: Ditto.
-	* winsup.api/ltp/mmap06.c: Ditto.
-	* winsup.api/ltp/mmap07.c: Ditto.
-	* winsup.api/ltp/mmap08.c: Ditto.
-	* winsup.api/ltp/munmap01.c: Ditto.
-	* winsup.api/ltp/munmap02.c: Ditto.
-	* winsup.api/ltp/open02.c: Ditto.
-	* winsup.api/ltp/pipe01.c: Ditto.
-	* winsup.api/ltp/pipe08.c: Ditto.
-	* winsup.api/ltp/pipe09.c: Ditto.
-	* winsup.api/ltp/pipe10.c: Ditto.
-	* winsup.api/ltp/pipe11.c: Ditto.
-	* winsup.api/ltp/poll01.c: Ditto.
-	* winsup.api/ltp/read04.c: Ditto.
-	* winsup.api/ltp/readlink01.c: Ditto.
-	* winsup.api/ltp/readlink03.c: Ditto.
-	* winsup.api/ltp/rename01.c: Ditto.
-	* winsup.api/ltp/rename08.c: Ditto.
-	* winsup.api/ltp/rename10.c: Ditto.
-	* winsup.api/ltp/rmdir01.c: Ditto.
-	* winsup.api/ltp/stat01.c: Ditto.
-	* winsup.api/ltp/stat02.c: Ditto.
-	* winsup.api/ltp/stat03.c: Ditto.
-	* winsup.api/ltp/symlink03.c: Ditto.
-	* winsup.api/ltp/symlink04.c: Ditto.
-	* winsup.api/ltp/symlink05.c: Ditto.
-	* winsup.api/ltp/sync02.c: Ditto.
-	* winsup.api/ltp/time02.c: Ditto.
-	* winsup.api/ltp/times02.c: Ditto.
-	* winsup.api/ltp/times03.c: Ditto.
-	* winsup.api/ltp/truncate01.c: Ditto.
-	* winsup.api/ltp/truncate02.c: Ditto.
-	* winsup.api/ltp/umask02.c: Ditto.
-	* winsup.api/ltp/umask03.c: Ditto.
-	* winsup.api/ltp/wait401.c: Ditto.
-	* winsup.api/ltp/wait402.c: Ditto.
-	* winsup.api/ltp/write02.c: Ditto.
-	* winsup.api/ltp/write03.c: Ditto.
-
-2001-09-09  Egor Duda  <deo@logos-m.ru>
-
-	* winsup.api/ltp/dup03.c: New test.
-	* winsup.api/ltp/lseek03.c: Ditto.
-	* winsup.api/ltp/mmap001.c: Ditto.
-	* winsup.api/ltp/read01.c: Ditto.
-	* winsup.api/ltp/readdir01.c: Ditto.
-	* winsup.api/ltp/rmdir05.c: Ditto.
-	* winsup.api/ltp/sbrk01.c: Ditto.
-	* winsup.api/ltp/select02.c: Ditto.
-	* winsup.api/ltp/select03.c: Ditto.
-	* winsup.api/ltp/signal03.c: Ditto.
-	* winsup.api/ltp/stat06.c: Ditto.
-	* winsup.api/ltp/unlink08.c: Ditto.
-	* winsup.api/known_bugs.tcl: Update to reflect new test's known
-	failures.
-	* winsup.api/winsup.exp: Don't delete executable in case of
-	unexpected pass, as well as in case of unexpected failure.
-	* README: Update paragraph about expected failures.
-
-2001-05-21  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.api/mmaptest01.c: Add log output.
-	* winsup.api/mmaptest02.c: Write log output to stdout.
-	* winsup.api/mmaptest03.c: Ditto.
-
-2001-05-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.api/winsup.exp: Force linking all tests against binmode.o.
-
-2001-04-27  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.api/mmaptest04.c: Take care for binmode explicitely.
-
-2001-04-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.api/mmaptest02.c: New test.
-	* winsup.api/mmaptest03.c: Ditto.
-	* winsup.api/mmaptest04.c: Ditto.
-
-2001-04-03  Corinna Vinschen  <corinna@vinschen.de>
-
-	* winsup.api/mmaptest01.c: New test.
-
-2001-03-10  Egor Duda  <deo@logos-m.ru>
-
-	* winsup.api/ltp/access01.c: Avoid compilation error if X_OK
-	isn't declared as a constant.
-
-2001-03-09  Egor Duda  <deo@logos-m.ru>
-
-	* config/default.exp: Remove unneeded debugging output.
-	* Makefile.in: Use correct path to find dejagnu in local tree.
-
-2000-09-06  Egor Duda  <deo@logos-m.ru>
-
-	Add 'const' qualifiers where needed to avoid compiler warnings.
-	* libltp/lib/tst_sig.c (tst_sig): Don't attempt to cleanup on
-	fatal errors.
-	* libltp/lib/parse_opts.c (parse_opts): Initialize allocated
-	string to prevent heap corruption.
-
-2000-09-04  Egor Duda  <deo@logos-m.ru>
-
-	*  Makefile.in: Always add libltp headers directory to headers
-	search path.
-
-2000-09-02  Egor Duda  <deo@logos-m.ru>
-
-	* moved here everything from cygwin/testsuite/
-	* configure.in: New file
-	* configure: New file, generated from configure.in
-	with autoconf 2.13
-	* Makefile.in: New file
-	* libltp/: New directory. Contains a support library
-	and headers for tests in winsup.api/ltp/
-	* config/default.exp: Print value of CYGWIN environment
-	variable when test completed
-	* winsup.api/samples/xf-sample-fail.c renamed to
-	winsup.api/samples/sample-fail.c
-	* winsup.api/samples/xf-sample-miscompile.c renamed to
-	winsup.api/samples/sample-miscompile.c
-	* winsup.api/known_bugs.tcl: New file.
-	* winsup.api/winsup.exp: Xfail test if its name is in
-	list from known_bugs.tcl
-	* winsup.api/winsup.exp: Don't stop if compiled test executable
-	can't be deleted
-	* winsup.api/winsup.exp: If in verbose mode, write test	output
-	to <testname>.log
-	* winsup.api/ltp/: New directory. Contains cygwin port of testsuite
-	from Linux Testing Project
-	* winsup.api/sigchld.c: New file. Test if process recieves SIGCHLD
-	signal when its child terminates.
-	* winsup.api/waitpid.c: New file. Test if waitpid function works
diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in
deleted file mode 100644
index 2e6d1aace..000000000
--- a/winsup/testsuite/Makefile.in
+++ /dev/null
@@ -1,195 +0,0 @@
-# Makefile.in for Cygwin's testsuite.
-# Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.
-#
-# This file is part of Cygwin.
-#
-# This software is a copyrighted work licensed under the terms of the
-# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-# details.
-
-# This makefile requires GNU make.
-
-SHELL:=@SHELL@
-srcdir:=@srcdir@
-objdir:=.
-libltp_srcdir=$(srcdir)/libltp
-
-VPATH:=$(srcdir):$(libltp_srcdir)/lib
-
-target_alias:=@target_alias@
-build_alias:=@build_alias@
-host_alias:=@host_alias@
-prefix:=@prefix@
-
-program_transform_name:=@program_transform_name@
-exec_prefix:=@exec_prefix@
-bindir:=@bindir@
-libdir:=@libdir@
-ifeq ($(target_alias),$(host_alias))
-ifeq ($(build_alias),$(host_alias))
-tooldir:=$(exec_prefix)
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-datadir:=@datadir@
-infodir:=@infodir@
-includedir:=@includedir@
-
-TESTSUP_INCLUDES:=-I$(libltp_srcdir)/include
-
-INSTALL:=@INSTALL@
-INSTALL_PROGRAM:=@INSTALL_PROGRAM@
-
-#
-# --enable options from configure
-#
-
-CC:=@CC@
-# FIXME: Which is it, CC or CC_FOR_TARGET?
-CC_FOR_TARGET:=$(CC)
-ifneq (,$(CFLAGS))
-  override CFLAGS+= -MD $(TESTSUP_INCLUDES)
-else
-  CFLAGS:=@CFLAGS@ -MD $(TESTSUP_INCLUDES)
-endif
-CXXFLAGS:=@CXXFLAGS@
-
-AR:=@AR@
-AR_FLAGS:=qv
-RANLIB:=@RANLIB@
-LD:=@LD@
-DLLTOOL:=@DLLTOOL@
-WINDRES:=@WINDRES@
-AS:=@AS@
-
-#
-# Include common definitions for winsup directory
-#
-include $(srcdir)/../Makefile.common
-
-override CC:=$(CC) $(GCC_INCLUDE)
-export CC
-
-INSTALL_DATA:=$(SHELL) $(updir1)/install-sh -c
-
-# Setup the testing framework, if you have one
-EXPECT = `if [ -f $${rootme}/../../expect/expect$(EXEEXT) ] ; then \
-            echo $${rootme}/../../expect/expect$(EXEEXT) ; \
-          else echo expect ; fi`
-
-RUNTEST = `if [ -f ${srcdir}/../../dejagnu/runtest ] ; then \
-	       echo ${srcdir}/../../dejagnu/runtest ; \
-	    else echo runtest; fi`
-RUNTESTFLAGS =
-
-ifdef VERBOSE
-    RUNTESTFLAGS = -v
-endif
-
-RUNTIME=$(cygwin_build)/cygwin0.dll $(cygwin_build)/libcygwin0.a
-
-TESTSUP_LIB_NAME:=libltp.a
-TESTSUP_OFILES:=${sort ${addsuffix .o,${basename ${notdir ${wildcard $(libltp_srcdir)/lib/*.c}}}}}
-
-override ALL_CFLAGS:=${filter-out -O%,$(ALL_CFLAGS)}
-override COMPILE_CC:=${filter-out -O%,$(COMPILE_CC)}
-override CFLAGS:=${filter-out -O%,$(CFLAGS)}
-export CFLAGS
-
-.PHONY: all force dll_ofiles install all_target install_target all_host install_host
-
-.SUFFIXES:
-.SUFFIXES: .c .cc .def .a .o .d
-
-all_host=@all_host@
-install_host=@install_host@
-
-all: $(TESTSUP_LIB_NAME)
-
-force:
-
-install:
-
-install_host:
-
-clean:
-	-rm -f *.o *.dll *.a *.exp junk *.bak *.base *.exe testsuite/* *.d *.dat
-
-maintainer-clean realclean: clean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	-rm -fr configure
-
-# Rule to build libltp.a
-
-$(TESTSUP_LIB_NAME): $(TESTSUP_OFILES)
-	$(AR) rcv temp.a $(TESTSUP_OFILES)
-	mv temp.a $(TESTSUP_LIB_NAME)
-
-$(RUNTIME) : $(cygwin_build)/Makefile
-	@$(MAKE) --no-print-dir -C $(@D) $(@F)
-
-# Rule to make stub library used by "make check"
-
-#
-
-# These targets are for the dejagnu testsuites. The file site.exp
-# contains global variables that all the testsuites will use.
-
-# Set to $(target_alias)/ for cross.
-target_subdir = @target_subdir@
-
-site.exp: ./config.status Makefile
-	@echo "Making a new config file..."
-	-@rm -f ./tmp?
-	@touch site.exp
-	-@mv site.exp site.bak
-	@echo "## these variables are automatically generated by make ##" > ./tmp0
-	@echo "# Do not edit here. If you wish to override these values" >> ./tmp0
-	@echo "# add them to the last section" >> ./tmp0
-	@echo "set rootme \"`pwd`\"" >> ./tmp0
-	@echo "set runtime_root \"\$$rootme/../cygwin\"" >> ./tmp0
-	@echo "set srcdir \"`cd ${srcdir}; pwd`\"" >> ./tmp0
-	@echo "set host_triplet $(host_canonical)" >> ./tmp0
-	@echo "set build_triplet $(build_canonical)" >> ./tmp0
-	@echo "set target_triplet $(target)" >> ./tmp0
-	@echo "set target_alias $(target_alias)" >> ./tmp0
-	@echo "set CC \"$(CC)\"" >> ./tmp0
-# CFLAGS is set even though it's empty to show we reserve the right to set it.
-	@echo "set CFLAGS \"$(ALL_CFLAGS)\"" >> ./tmp0
-	echo "set tmpdir $(objdir)/testsuite" >> ./tmp0
-	@echo "set ltp_includes \"$(libltp_srcdir)/include\"" >> ./tmp0
-	@echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0
-	@cat ./tmp0 > site.exp
-	@cat site.bak | sed \
-		-e '1,/^## All variables above are.*##/ d' >> site.exp
-	-@rm -f ./tmp?
-
-testsuite/site.exp: site.exp
-	if [ -d testsuite ]; then \
-	  true; \
-	else \
-	  mkdir testsuite; \
-	fi
-	rm -rf testsuite/site.exp
-	cp site.exp testsuite/site.exp
-
-# Note: we set the PATH so that we can pick up cygwin0.dll
-
-check: $(TESTSUP_LIB_NAME) $(RUNTIME) cygrun.exe testsuite/site.exp
-	cd testsuite; \
-	EXPECT=${EXPECT} ; export EXPECT ; \
-	if [ -f $(bupdir2)/expect/expect ] ; then  \
-	   TCL_LIBRARY=`cd .. ; cd ${srcdir}/../../tcl/library ; pwd` ; \
-	    export TCL_LIBRARY ; fi ; \
-	PATH=$(bupdir)/cygwin:$${PATH} ;\
-	$(RUNTEST) --tool winsup $(RUNTESTFLAGS)
-
-cygrun.o: cygrun.c
-	$(CC) $(MINGW_CFLAGS) -o $@ -c $<
-
-cygrun.exe : cygrun.o
-	$(CC) ${MINGW_LDFLAGS} -mno-cygwin -o $@ $<
diff --git a/winsup/testsuite/README b/winsup/testsuite/README
deleted file mode 100644
index 2f6749bb8..000000000
--- a/winsup/testsuite/README
+++ /dev/null
@@ -1,40 +0,0 @@
-1999-12-23  DJ Delorie  <dj@cygnus.com>
-
-Here are some notes about adding and using this testsuite.
-
-First, all the programs are linked with libcygwin0.a, which is just
-like libcygwin.a, except that it wants cygwin0.dll, not
-cygwin1.dll.  The testsuite adds the winsup build directory to the
-PATH so that cygwin0.dll can be found by windows during testing.
-
-Because we'll probably run into complaints about using two DLLs, we
-run cygrun.exe for each test.  All this does is run the test with
-CreateProcess() so that we don't attempt to do the special code for
-when a cygwin program calls another cygwin program, as this might be a
-"multiple cygwins" problem.
-
-Any test that needs to test command line args or redirection needs to
-run such a child program itself, as the testsuite will not do any
-arguments or redirection for it.  Same for fork, signals, etc.
-
-The testsuite/winsup.api subdirectory is for testing the API to
-cygwin1.dll ONLY.  Create other subdirs under testsuite/ for other
-classes of testing.
-
-Tests in winsup.api/*.c or winsup.api/*/*.c (only one subdirectory
-level is allowed) either compile, run, and exit(0) or they fail.
-Either abort or exit with a non-zero code to indicate failure.  Don't
-print anything to the screen if you can avoid it (except for failure
-reasons, of course).  One .c file per test, no compile options are
-allowed (we're testing the api, not the compiler).
-
-Tests whose filename is mentioned in known-bugs.tcl will be *expected*
-to fail, and will "fail" if they compile, run, and return zero.
-
-"make check" will only work if you run it *on* an NT machine.
-Cross-checking is not supported.
-
-To test a subset of the test-suite, use
-$ make check CYGWIN_TESTSUITE_TESTS=regexp
-
-
diff --git a/winsup/testsuite/config/default.exp b/winsup/testsuite/config/default.exp
deleted file mode 100644
index 3936979a6..000000000
--- a/winsup/testsuite/config/default.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-proc winsup_version {} {
-    global env
-    global rootme
-    clone_output "\n[exec grep ^%%% $rootme/../cygwin/cygwin0.dll]\n"
-    if { [info exists env(CYGWIN)] } {
-        clone_output "CYGWIN=$env(CYGWIN)\n"
-    } else {
-        clone_output "CYGWIN=\n"
-    }
-}
-
-proc winsup_exit {} {
-}
diff --git a/winsup/testsuite/configure b/winsup/testsuite/configure
deleted file mode 100644
index c57fde2cc..000000000
--- a/winsup/testsuite/configure
+++ /dev/null
@@ -1,1193 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=Makefile.in
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:529: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:559: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:610: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:642: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 653 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:684: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:689: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:717: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:749: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 764 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 781 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 798 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:854: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:875: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:901: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@CC@%$CC%g
-s%@CPP@%$CPP%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@AR@%$AR%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/winsup/testsuite/configure.in b/winsup/testsuite/configure.in
deleted file mode 100755
index 6d198437d..000000000
--- a/winsup/testsuite/configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl Autoconf configure script for Cygwin's testsuite.
-dnl Copyright 2000 Red Hat, Inc.
-dnl
-dnl This file is part of Cygwin.
-dnl
-dnl This software is a copyrighted work licensed under the terms of the
-dnl Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-dnl details.
-dnl
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.12)
-AC_INIT(Makefile.in)
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_CHECK_TOOL(AR,ar)
-
-AC_OUTPUT(Makefile)
diff --git a/winsup/testsuite/cygrun.c b/winsup/testsuite/cygrun.c
deleted file mode 100644
index 63d9863f7..000000000
--- a/winsup/testsuite/cygrun.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* cygrun.c: testsuite support program
-
-   Copyright 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* This program is intended to be used only by the testsuite.  It runs
-   programs without using the cygwin api, so that the just-built dll
-   can be tested without interference from the currently installed
-   dll. */
-
-#include <stdio.h>
-#include <windows.h>
-#include <stdlib.h>
-
-int
-main (int argc, char **argv)
-{
-  STARTUPINFO sa;
-  PROCESS_INFORMATION pi;
-  DWORD ec = 1;
-  char *p;
-
-  if (argc < 2)
-    {
-      fprintf (stderr, "Usage: cygrun [program]\n");
-      exit (0);
-    }
-
-  SetEnvironmentVariable ("CYGWIN_TESTING", "1");
-  if ((p = getenv ("CYGWIN")) == NULL || (strstr (p, "ntsec") == NULL))
-    {
-      char buf[4096];
-      if (!p)
-	{
-	  p = buf;
-	  p[0] = '\0';
-	}
-      else
-	{
-	  strcpy (buf, p);
-	  strcat (buf, " ");
-	}
-      strcat(buf, "ntsec");
-      SetEnvironmentVariable ("CYGWIN", buf);
-    }
-
-  memset (&sa, 0, sizeof (sa));
-  memset (&pi, 0, sizeof (pi));
-  if (!CreateProcess (0, argv[1], 0, 0, 1, 0, 0, 0, &sa, &pi))
-    {
-      fprintf (stderr, "CreateProcess %s failed\n", argv[1]);
-      exit (1);
-    }
-
-  WaitForSingleObject (pi.hProcess, INFINITE);
-
-  GetExitCodeProcess (pi.hProcess, &ec);
-
-  CloseHandle (pi.hProcess);
-  CloseHandle (pi.hThread);
-  return ec;
-}
diff --git a/winsup/testsuite/libltp/include/dataascii.h b/winsup/testsuite/libltp/include/dataascii.h
deleted file mode 100644
index cd75245e4..000000000
--- a/winsup/testsuite/libltp/include/dataascii.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#ifndef _DATAASCII_H_
-#define _DATAASCII_H_
-
-/***********************************************************************
- * int dataasciigen(listofchars, buffer, size, offset)
- *
- * This function fills buffer with ascii characters.
- * The ascii characters are obtained from listofchars or the CHARS array
- *  if listofchars is NULL.
- * Each char is selected by an index.  The index is the remainder
- *  of count divided by the array size. 
- * This method allows more than one process to write to a location
- *  in a file without corrupting it for another process' point of view.
- *
- * The return value will be the number of character written in buffer
- *  (size).
- *
- ***********************************************************************/
-int dataasciigen(char *, char *, int, int);
-
-/***********************************************************************
- * int dataasciichk(listofchars, buffer, size, count, errmsg)
- *
- * This function checks the contents of a buffer produced by
- *  dataasciigen.
- *
- * return values:
- *	>= 0 : error at character count
- *	< 0  : no error
- ***********************************************************************/
-
-int dataasciichk(char *, char *, int, int, char**);
-
-#endif
diff --git a/winsup/testsuite/libltp/include/databin.h b/winsup/testsuite/libltp/include/databin.h
deleted file mode 100644
index b71fbc0c1..000000000
--- a/winsup/testsuite/libltp/include/databin.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _DATABIN_H_
-#define _DATABIN_H_
-
-/*******************************************************************************
-* NAME
-*       databingen - fill a buffer with a data pattern
-*
-* SYNOPSIS
-*       (void) databingen(mode, buffer, bsize, offset)
-*       int     mode;
-*       char    *buffer;
-*       int     bsize;
-*	int 	offset;
-*
-* DESCRIPTION
-*       datagen fills the buffer pointed to by 'buffer' with 'bsize' bytes
-*       of data of the form indicated by 'mode'.  
-*	All modes (expect r -random) are file offset based.
-*	This allows more than process to do writing to the file without
-*	corrupting it if the same modes were used.
-*	They data modes to choose from, these are:
-*
-*               'a' - writes an alternating bit pattern (i.e. 0x5555555...)
-*
-*               'c' - writes a checkerboard pattern (i.e. 0xff00ff00ff00...)
-*
-*		'C' - writes counting pattern (i.e. 0 - 07, 0 - 07, ...);
-*
-*		'o' - writes all bits set (i.e. 0xffffffffffffff...)
-*
-*		'z' - writes all bits cleared (i.e. 0x000000000...);
-*
-*               'r' - writes random integers
-*
-* RETURN VALUE
-*       None
-*
-*******************************************************************************/
-
-void databingen( int mode, unsigned char *buffer, int bsize, int offset );
-
-void databinchedk( int mode, unsigned char *buffer, int bsize, int offset, char **errmsg);
-
-#endif
diff --git a/winsup/testsuite/libltp/include/file_lock.h b/winsup/testsuite/libltp/include/file_lock.h
deleted file mode 100644
index 8c9a94835..000000000
--- a/winsup/testsuite/libltp/include/file_lock.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#ifndef _FILE_LOCK_H_
-#define _FILE_LOCK_H_
-
-extern char Fl_syscall_str[128];
-
-int file_lock( int , int, char ** );
-int record_lock( int , int , int , int , char ** );
-
-#endif /* _FILE_LOCK_H_ */
diff --git a/winsup/testsuite/libltp/include/forker.h b/winsup/testsuite/libltp/include/forker.h
deleted file mode 100644
index effd5d66e..000000000
--- a/winsup/testsuite/libltp/include/forker.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#ifndef _FORKER_H_
-#define _FORKER_H_
-
-#define FORKER_MAX_PIDS	4098
-
-extern int Forker_pids[FORKER_MAX_PIDS];      /* holds pids of forked processes */
-extern int Forker_npids;               /* number of entries in Forker_pids */
-
-/*
- * This function will fork and the parent will exit zero and
- * the child will return.  This will orphan the returning process
- * putting it in the background.
- */
-int background( char * );
-
-/*
- * Forker will fork ncopies-1 copies of self. 
- *
- * arg 1: Number of copies of the process to be running after return.
- *        This value minus one is the number of forks performed. 
- * arg 2: mode: 0 - all children are first generation descendents.
- *              1 - each subsequent child is a descendent of another
- *              descendent, resulting in only one direct descendent of the
- *              parent and each other child is a child of another child in
- *              relation to the parent.
- * arg 3: prefix: string to preceed any error messages.  A value of NULL
- *              results in no error messages on failure.
- * returns: returns to parent the number of children forked.
- */
-int forker( int , int , char * );
-
-#endif /* _FORKER_H_ */
diff --git a/winsup/testsuite/libltp/include/open_flags.h b/winsup/testsuite/libltp/include/open_flags.h
deleted file mode 100644
index 87fe6ff1d..000000000
--- a/winsup/testsuite/libltp/include/open_flags.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#ifndef _OPEN_FLAGS_H_
-#define _OPEN_FLAGS_H_
-
-/***********************************************************************
- * This function attempts to convert open flag bits into human readable
- * symbols (i.e. O_TRUNC).  If there are more than one symbol,
- * the <sep> string will be placed as a separator between symbols.
- * Commonly used separators would be a comma "," or pipe "|".
- * If <mode> is one and not all <openflags> bits can be converted to
- * symbols, the "UNKNOWN" symbol will be added to return string.
- * 
- * Return Value
- * openflags2symbols will return the indentified symbols.
- * If no symbols are recognized the return value will be a empty
- * string or the "UNKNOWN" symbol.
- *
- * Limitations
- * Currently (05/96) all known symbols are coded into openflags2symbols.
- * If new open flags are added this code will have to updated
- * to know about them or they will not be recognized.
- *
- * The Open_symbols must be large enough to hold all possible symbols
- * for a given system.
- *
- ***********************************************************************/
-char *openflags2symbols( int, char *, int );
-
-/***********************************************************************
- * This function will take a string of comma separated open flags symbols
- * and translate them into an open flag bitmask.
- * If any symbol is not valid, -1 is returned.  On this error condition
- * the badname pointer is updated if not NULL.  badname will point
- * to the beginning location of where the invalid symbol was found.
- * string will be returned unchanged. 
- *
- * A signal received while parsing string could cause the string to
- * contain a NULL character in the middle of it.
- *
- ***********************************************************************/
-int parse_open_flags( char *, char ** );
-
-#endif
diff --git a/winsup/testsuite/libltp/include/pattern.h b/winsup/testsuite/libltp/include/pattern.h
deleted file mode 100644
index 74f841cae..000000000
--- a/winsup/testsuite/libltp/include/pattern.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#ifndef _PATTERN_H_
-#define _PATTERN_H_
-
-/*
- * pattern_check(buf, buflen, pat, patlen, patshift)
- *
- * Check a buffer of length buflen against repeated occurrances of
- * a pattern whose length is patlen.  Patshift can be used to rotate
- * the pattern by patshift bytes to the left.
- *
- * Patshift may be greater than patlen, the pattern will be rotated by
- * (patshift % patshift) bytes.
- *
- * pattern_check returns -1 if the buffer does not contain repeated
- * occurrances of the indicated pattern (shifted by patshift).
- *
- * The algorithm used to check the buffer relies on the fact that buf is 
- * supposed to be repeated copies of pattern.  The basic algorithm is
- * to validate the first patlen bytes of buf against the pat argument
- * passed in - then validate the next patlen bytes against the 1st patlen
- * bytes - the next (2*patlen) bytes against the 1st (2*pathen) bytes, and
- * so on.  This algorithm only works when the assumption of a buffer full
- * of repeated copies of a pattern holds, and gives MUCH better results
- * then walking the buffer byte by byte.
- *
- * Performance wise, It appears to be about 5% slower than doing a straight
- * memcmp of 2 buffers, but the big win is that it does not require a
- * 2nd comparison buffer, only the pattern.
- */
-int pattern_check( char * , int , char * , int , int );
-
-/*
- * pattern_fill(buf, buflen, pat, patlen, patshift)
- *
- * Fill a buffer of length buflen with repeated occurrances of
- * a pattern whose length is patlen.  Patshift can be used to rotate
- * the pattern by patshift bytes to the left.
- *
- * Patshift may be greater than patlen, the pattern will be rotated by
- * (patshift % patlen) bytes.
- *
- * If buflen is not a multiple of patlen, a partial pattern will be written
- * in the last part of the buffer.  This implies that a buffer which is
- * shorter than the pattern length will receive only a partial pattern ...
- *
- * pattern_fill always returns 0 - no validation of arguments is done.
- *
- * The algorithm used to fill the buffer relies on the fact that buf is 
- * supposed to be repeated copies of pattern.  The basic algorithm is
- * to fill the first patlen bytes of buf with the pat argument
- * passed in - then copy the next patlen bytes with the 1st patlen
- * bytes - the next (2*patlen) bytes with the 1st (2*pathen) bytes, and
- * so on.  This algorithm only works when the assumption of a buffer full
- * of repeated copies of a pattern holds, and gives MUCH better results
- * then filling the buffer 1 byte at a time.
- */
-int pattern_fill( char * , int , char * , int , int );
-
-#endif
diff --git a/winsup/testsuite/libltp/include/random_range.h b/winsup/testsuite/libltp/include/random_range.h
deleted file mode 100644
index d3e1cceb8..000000000
--- a/winsup/testsuite/libltp/include/random_range.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#ifndef _RANDOM_RANGE_H_
-#define _RANDOM_RANGE_H_
-
-int       parse_ranges     ( char *, int, int, int, int (*)(), char **, char ** );
-int       range_min        ( char *, int );
-int       range_max        ( char *, int );
-int       range_mult       ( char *, int );
-long      random_range     ( int, int, int, char ** );
-long      random_rangel    ( long, long, long, char ** );
-long long random_rangell   ( long long, long long, long long, char ** );
-void      random_range_seed( long );
-long      random_bit       ( long );
-
-#endif
diff --git a/winsup/testsuite/libltp/include/rmobj.h b/winsup/testsuite/libltp/include/rmobj.h
deleted file mode 100644
index 4808ca258..000000000
--- a/winsup/testsuite/libltp/include/rmobj.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _RMOBJ_H_
-#define _RMOBJ_H_
-
-/*
- * rmobj() - Remove the specified object.  If the specified object is a
- *           directory, recursively remove everything inside of it.  If
- *           there are any problems, set errmsg (if it is not NULL) and
- *           return -1.  Otherwise return 0.
- */
-int rmobj( char *object , char **errmesg );
-
-#endif
diff --git a/winsup/testsuite/libltp/include/search_path.h b/winsup/testsuite/libltp/include/search_path.h
deleted file mode 100644
index 58b7a36d2..000000000
--- a/winsup/testsuite/libltp/include/search_path.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-
-/* $Id$ */
-
-
-int search_path(const char *cmd, const char *res_path, int access_mode, int fullpath);
diff --git a/winsup/testsuite/libltp/include/str_to_bytes.h b/winsup/testsuite/libltp/include/str_to_bytes.h
deleted file mode 100644
index 100d37df5..000000000
--- a/winsup/testsuite/libltp/include/str_to_bytes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#ifndef _STR_TO_BYTES_
-#define _STR_TO_BYTES_
-
-int       str_to_bytes  ( char * );
-long      str_to_lbytes ( char * );
-long long str_to_llbytes( char * );
-
-#endif
diff --git a/winsup/testsuite/libltp/include/string_to_tokens.h b/winsup/testsuite/libltp/include/string_to_tokens.h
deleted file mode 100644
index 9c0935ec5..000000000
--- a/winsup/testsuite/libltp/include/string_to_tokens.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#ifndef _STRING_TO_TOKENS_H_
-#define _STRING_TO_TOKENS_H_
-
-/*
- * string_to_tokens() 
- *
- * This function parses the string 'arg_string', placing pointers to
- * the 'separator' separated tokens into the elements of 'arg_array'.
- * The array is terminated with a null pointer.
- *
- * NOTE: This function uses strtok() to parse 'arg_string', and thus
- * physically alters 'arg_string' by placing null characters where the
- * separators originally were.
- */
-int string_to_tokens(char *, char **, int, char *);
-
-#endif
diff --git a/winsup/testsuite/libltp/include/test.h b/winsup/testsuite/libltp/include/test.h
deleted file mode 100644
index 8cffea4cb..000000000
--- a/winsup/testsuite/libltp/include/test.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *. 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-
-/* $Id$ */
-
-#ifndef __TEST_H__
-#define __TEST_H__
-
-#define execve execve_foo
-#define execv execv_foo
-#define execvp execvp_foo
-#include <stdio.h>
-#include <signal.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#undef execvp
-#undef execv
-#undef execve
-
-int execve(const char *, const char * const [], char * const *);
-int execv(const char *, const char * const []);
-int execvp(const char *, const char * const []);
-
-/* CGF: Avoid compilation warnings for undefined functions */
-extern int setregid (gid_t, gid_t);
-int setreuid (uid_t, uid_t);
-
-#define TPASS    0    /* Test passed flag */
-#define TFAIL    1    /* Test failed flag */
-#define TBROK    2    /* Test broken flag */
-#define TWARN    4    /* Test warning flag */
-#define TRETR    8    /* Test retire flag */
-#define TINFO    16   /* Test information flag */
-#define TCONF    32   /* Test not appropriate for configuration flag */
-
-/*
- * To determine if you are on a Umk or Unicos system,
- * use sysconf(_SC_CRAY_SYSTEM).  But since _SC_CRAY_SYSTEM
- * is not defined until 90, it will be define here if not already
- * defined.
- * if ( sysconf(_SC_CRAY_SYSTEM) == 1 )
- *    on UMK
- * else   # returned 0 or -1 
- *    on Unicos
- * This is only being done on CRAY systems.
- */
-#ifdef CRAY
-#ifndef _SC_CRAY_SYSTEM
-#define _SC_CRAY_SYSTEM  140
-#endif /* ! _SC_CRAY_SYSTEM */
-#endif /* CRAY */
-
-/*
- * Ensure that NUMSIGS is defined.
- * It should be defined in signal.h or sys/signal.h on
- * UNICOS/mk and IRIX systems.   On UNICOS systems,
- * it is not defined, thus it is being set to UNICOS's NSIG.
- * Note:  IRIX's NSIG (signals are 1-(NSIG-1)) 
- *      is not same meaning as UNICOS/UMK's NSIG  (signals 1-NSIG)
- */
-#ifndef NUMSIGS
-#define NUMSIGS NSIG
-#endif
-
-
-/* defines for unexpected signal setup routine (set_usig.c) */
-#define FORK    1		/* SIGCLD is to be ignored */
-#define NOFORK  0		/* SIGCLD is to be caught */
-#define DEF_HANDLER 0	/* tells set_usig() to use default signal handler */
-
-/*
- * The following defines are used to control tst_res and t_result reporting.
- */
-
-#define TOUTPUT	   "TOUTPUT"		/* The name of the environment variable */
-					/* that can be set to one of the following */
-					/* strings to control tst_res output */
-					/* If not set, TOUT_VERBOSE_S is assumed */
-
-#define TOUT_VERBOSE_S  "VERBOSE"	/* All test cases reported */
-#define TOUT_CONDENSE_S "CONDENSE"	/* ranges are used where identical messages*/
-					/* occur for sequential test cases */
-#define TOUT_NOPASS_S   "NOPASS"	/* No pass test cases are reported */
-#define TOUT_DISCARD_S  "DISCARD"	/* No output is reported */
-
-#define TST_NOBUF	"TST_NOBUF"	/* The name of the environment variable */
-					/* that can be set to control whether or not */
-					/* tst_res will buffer output into 4096 byte */
-					/* blocks of output */
-					/* If not set, buffer is done.  If set, no */
-					/* internal buffering will be done in tst_res */
-					/* t_result does not have internal buffering */
-
-/*
- * The following defines are used to control tst_tmpdir, tst_wildcard and t_mkchdir
- */
-
-#define TDIRECTORY  "TDIRECTORY"	/* The name of the environment variable */
-					/* that if is set, the value (directory) */
-					/* is used by all tests as their working */
-					/* directory.  tst_rmdir and t_rmdir will */
-					/* not attempt to clean up. */
-					/* This environment variable should only */
-					/* be set when doing system testing since */
-					/* tests will collide and break and fail */
-					/* because of setting it. */
-
-#define TEMPDIR	"/tmp"			/* This is the default temporary directory. */
-					/* The environment variable TMPDIR is */
-					/* used prior to this valid by tempnam(3). */
-					/* To control the base location of the */
-					/* temporary directory, set the TMPDIR */
-					/* environment variable to desired path */
-
-/*
- * The following contains support for error message passing.
- * See test_error.c for details.
- */
-#define  TST_ERR_MESG_SIZE      1023    /* max size of error message */
-#define  TST_ERR_FILE_SIZE      511     /* max size of module name used by compiler */
-#define  TST_ERR_FUNC_SIZE      127     /* max size of func name */
-
-typedef struct {
-    int  te_line;                       /* line where last error was reported.  Use */
-                                        /* "__LINE__" and let compiler do the rest */
-    int  te_level;                      /* If set, will prevent current stored */
-                                        /* error to not be overwritten */
-    char te_func[TST_ERR_FUNC_SIZE+1];  /* name of function of last error */
-                                        /* Name of function or NULL */
-    char te_file[TST_ERR_FILE_SIZE+1];  /* module of last error.  Use */
-                                        /* "__FILE__" and let compiler do the rest */
-    char te_mesg[TST_ERR_MESG_SIZE+1];  /* string of last error */
-
-} _TST_ERROR;
-
-extern _TST_ERROR Tst_error;            /* defined in test_error.c */
-#if __STDC__
-extern void tst_set_error(char *file, int line, char *func, char *fmt, ...);
-#else
-extern void tst_set_error();
-#endif
-extern void tst_clear_error();
-
-
-/*
- * The following define contains the name of an environmental variable
- * that can be used to specify the number of iterations.
- * It is supported in parse_opts.c and USC_setup.c.
- */
-#define USC_ITERATION_ENV       "USC_ITERATIONS"
-
-/*
- * The following define contains the name of an environmental variable
- * that can be used to specify to iteration until desired time
- * in floating point seconds has gone by.
- * Supported in USC_setup.c.
- */
-#define USC_LOOP_WALLTIME	"USC_LOOP_WALLTIME"
-
-/*
- * The following define contains the name of an environmental variable
- * that can be used to specify that no functional checks are wanted.
- * It is supported in parse_opts.c and USC_setup.c.
- */
-#define USC_NO_FUNC_CHECK	"USC_NO_FUNC_CHECK"
-
-/*
- * The following define contains the name of an environmental variable
- * that can be used to specify the delay between each loop iteration.
- * The value is in seconds (fractional numbers are allowed).
- * It is supported in parse_opts.c.
- */
-#define USC_LOOP_DELAY		"USC_LOOP_DELAY"
-
-/*
- * The following prototypes are needed to remove compile errors
- * on IRIX systems when compiled with -n32 and -64.
- */
-extern void tst_res(int ttype, const char *fname, const char *arg_fmt, ...);
-extern void tst_resm(int ttype, const char *arg_fmt, ...);
-extern void tst_brk(int ttype, char *fname, void (*func)(), 
-							const char *arg_fmt, ...);
-extern void tst_brkloop(int ttype, char *fname, void (*func)(), 
-							const char *arg_fmt, ...);
-extern void tst_brkm(int ttype, void (*func)(), const char *arg_fmt, ...);
-extern void tst_brkloopm(int ttype, void (*func)(), const char *arg_fmt, ...);
-
-extern int  tst_environ();
-extern void tst_exit() __attribute__ ((noreturn));
-extern void tst_flush();
-
-/* prototypes for the t_res.c functions */
-extern void t_result(char *tcid, int tnum, int ttype, char *tmesg);
-extern void tt_exit();
-extern int  t_environ();
-extern void t_breakum(char *tcid, int total, int typ, char *msg, void (*fnc)());
-
-extern void tst_sig(int fork_flag, void (*handler)(), void (*cleanup)());
-extern void tst_tmpdir();
-extern void tst_rmdir();
-
-#endif	/* end of __TEST_H__ */
diff --git a/winsup/testsuite/libltp/include/tlibio.h b/winsup/testsuite/libltp/include/tlibio.h
deleted file mode 100644
index ac0d5705c..000000000
--- a/winsup/testsuite/libltp/include/tlibio.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-
-#define LIO_IO_SYNC             00001   /* read/write */
-#define LIO_IO_ASYNC            00002   /* reada/writea/aio_write/aio_read */
-#define LIO_IO_SLISTIO          00004   /* single stride sync listio */
-#define LIO_IO_ALISTIO          00010   /* single stride async listio */
-#define LIO_IO_SYNCV            00020   /* single-buffer readv/writev */
-#define LIO_IO_SYNCP            00040   /* pread/pwrite */
-
-#ifdef sgi
-#define LIO_IO_ATYPES           00077   /* all io types */
-#define LIO_IO_TYPES            00061   /* all io types, non-async */
-#endif /* sgi */
-#ifdef linux
-#define LIO_IO_TYPES            00021   /* all io types */
-#endif /* linux */
-#ifdef CRAY
-#define LIO_IO_TYPES            00017   /* all io types */
-#endif /* CRAY */
-
-#define LIO_WAIT_NONE           00010000 /* return asap -- use with care */
-#define LIO_WAIT_ACTIVE         00020000 /* spin looking at iosw fields, or EINPROGRESS */
-#define LIO_WAIT_RECALL         00040000 /* call recall(2)/aio_suspend(3) */
-#define LIO_WAIT_SIGPAUSE       00100000 /* call pause */
-#define LIO_WAIT_SIGACTIVE      00200000 /* spin waiting for signal */
-#ifdef sgi
-#define LIO_WAIT_CBSUSPEND      00400000 /* aio_suspend waiting for callback */
-#define LIO_WAIT_SIGSUSPEND     01000000 /* aio_suspend waiting for signal */
-#define LIO_WAIT_ATYPES         01760000 /* all async wait types, except nowait */
-#define LIO_WAIT_TYPES          00020000 /* all sync wait types (sorta) */
-#endif /* sgi */
-#ifdef linux
-#define LIO_WAIT_TYPES          00300000 /* all wait types, except nowait */
-#endif /* linux */
-#ifdef CRAY
-#define LIO_WAIT_TYPES          00360000 /* all wait types, except nowait */
-#endif /* CRAY */
-
-/* meta wait io  */
-/*  00  000 0000 */
-
-#ifdef sgi
-/* all callback wait types */
-#define LIO_WAIT_CBTYPES	(LIO_WAIT_CBSUSPEND)
-/* all signal wait types */
-#define LIO_WAIT_SIGTYPES	(LIO_WAIT_SIGPAUSE|LIO_WAIT_SIGACTIVE|LIO_WAIT_SIGSUSPEND)
-/* all aio_{read,write} or lio_listio */
-#define LIO_IO_ASYNC_TYPES	(LIO_IO_ASYNC|LIO_IO_SLISTIO|LIO_IO_ALISTIO)
-#endif /* sgi */
-#ifdef linux
-/* all signal wait types */
-#define LIO_WAIT_SIGTYPES	(LIO_WAIT_SIGPAUSE)
-#endif /* linux */
-#ifdef CRAY
-/* all signal wait types */
-#define LIO_WAIT_SIGTYPES	(LIO_WAIT_SIGPAUSE|LIO_WAIT_SIGACTIVE)
-#endif /* CRAY */
-
-/*
- * This bit provides a way to randomly pick an io type and wait method.
- * lio_read_buffer() and lio_write_buffer() functions will call
- * lio_random_methods() with the given method.
- */
-#define LIO_RANDOM              010000000
-
-/*
- * This bit provides a way for the programmer to use async i/o with
- * signals and to use their own signal handler.  By default,
- * the signal will only be given to the system call if the wait
- * method is LIO_WAIT_SIGPAUSE or LIO_WAIT_SIGACTIVE.
- * Whenever these wait methods are used, libio signal handler
- * will be used.
- */
-#define LIO_USE_SIGNAL          020000000
-
-/*
- * prototypes/structures for functions in the libio.c module.  See comments
- * in that module, or man page entries for information on the individual
- * functions.
- */
-
-int  stride_bounds(int offset, int stride, int nstrides,
-		      int bytes_per_stride, int *min_byte, int *max_byte);
-
-int  lio_set_debug(int level);
-int  lio_parse_io_arg1(char *string);
-void lio_help1(char *prefex);
-int  lio_parse_io_arg2(char *string, char **badtoken);
-void lio_help2(char *prefex);
-int  lio_write_buffer(int fd, int method, char *buffer, int size,
-		      int sig, char **errmsg, long wrd);
-
-int  lio_read_buffer(int fd, int method, char *buffer, int size,
-		     int sig, char **errmsg, long wrd);
-int  lio_random_methods(long mask);
-
-#if CRAY
-#include <sys/iosw.h>
-int  lio_wait4asyncio(int method, int fd, struct iosw **statptr);
-int  lio_check_asyncio(char *io_type, int size, struct iosw *status);
-#endif /* CRAY */
-#ifdef sgi
-#include <aio.h>
-int  lio_wait4asyncio(int method, int fd, aiocb_t *aiocbp);
-int  lio_check_asyncio(char *io_type, int size, aiocb_t *aiocbp, int method);
-#endif /* sgi */
-
-/*
- * Define the structure that contains the infomation that is used
- * by the parsing and help functions.
- */
-struct lio_info_type {
-    char *token;
-    int  bits;
-    char *desc;
-};
-
-
diff --git a/winsup/testsuite/libltp/include/usctest.h b/winsup/testsuite/libltp/include/usctest.h
deleted file mode 100644
index 6a095db1c..000000000
--- a/winsup/testsuite/libltp/include/usctest.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-
-/* $Id$ */
-
-/**********************************************************
- * 
- *    IRIX/Linux Feature Test and Evaluation - Silicon Graphics, Inc.
- * 
- *    FUNCTION NAME 	: usctest.h
- * 
- *    FUNCTION TITLE	: System Call Test Macros
- * 
- *    SYNOPSIS:
- *	See DESCRIPTION below.
- * 
- *    AUTHOR		: William Roske
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    DESCRIPTION
- * 	TEST(SCALL) - calls a system call
- *	TEST_VOID(SCALL) - same as TEST() but for syscalls with no return value.
- *	TEST_CLEANUP - print the log of errno return counts if STD_ERRNO_LOG 
- *		       is set.
- *	TEST_PAUSEF(HAND) - Pause for SIGUSR1 if the pause flag is set.
- *		      Use "hand" as the interrupt handling function
- *	TEST_PAUSE -  Pause for SIGUSR1 if the pause flag is set.
- *		      Use internal function to do nothing on signal and go on.
- *	TEST_LOOPING(COUNTER) - Conditional to check if test should
- *		      loop.  Evaluates to TRUE (1) or FALSE (0).
- *	TEST_ERROR_LOG(eno) - log that this errno was received,
- *		      if STD_ERRNO_LOG is set.
- *	TEST_EXP_ENOS(array) - set the bits in TEST_VALID_ENO array at
- *		      positions specified in integer "array"
- *
- *    RETURN VALUE
- * 	TEST(SCALL) - Global Variables set:
- *			int TEST_RETURN=return code from SCALL
- *			int TEST_ERRNO=value of errno at return from SCALL
- * 	TEST_VOID(SCALL) - Global Variables set:
- *			int TEST_ERRNO=value of errno at return from SCALL
- *	TEST_CLEANUP - None.
- *	TEST_PAUSEF(HAND) -  None.
- *	TEST_PAUSE -  None.
- *	TEST_LOOPING(COUNTER) - True if COUNTER < STD_LOOP_COUNT or
- *			STD_INFINITE is set.
- *	TEST_ERROR_LOG(eno) - None
- *	TEST_EXP_ENOS(array) - None
- *
- *    KNOWN BUGS
- *      If you use the TEST_PAUSE or TEST_LOOPING macros, you must
- *	link in parse_opts.o, which contains the code for those functions.
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#ifndef  __USCTEST_H__
-#define __USCTEST_H__ 1
-
-#ifndef _SC_CLK_TCK
-#include <unistd.h>
-#endif
-
-#include <sys/param.h>
-
-/* 
- * Ensure that PATH_MAX is defined 
- */
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX  MAXPATHLEN
-#else
-#define PATH_MAX  1024
-#endif
-#endif
-
-#ifndef CRAY
-#ifndef BSIZE 
-#define BSIZE BBSIZE
-#endif
-#endif
-
-/***********************************************************************
- * Define option_t structure type.
- * Entries in this struct are used by the parse_opts routine
- * to indicate valid options and return option arguments
- ***********************************************************************/
-typedef struct {		
-  const char *option;	/* Valid option string (one option only) like "a:" */
-  int  *flag;		/* pointer to location to set true if option given */
-  char **arg;		/* pointer to location to place argument, if needed */
-} option_t;
-
-/***********************************************************************
- * The following globals are defined in parse_opts.c but must be 
- * externed here because they are used in the macros defined below.
- ***********************************************************************/
-extern int STD_FUNCTIONAL_TEST,	/* turned off by -f to not do functional test */
-           STD_TIMING_ON,	/* turned on by -t to print timing stats */
-           STD_PAUSE,		/* turned on by -p to pause before loop */
-           STD_INFINITE,	/* turned on by -c0 to loop forever */
-           STD_LOOP_COUNT,	/* changed by -cn to set loop count to n */
-           STD_ERRNO_LOG,	/* turned on by -e to log errnos returned */
-           STD_ERRNO_LIST[],	/* counts of errnos returned.  indexed by errno */
-	   STD_COPIES,
-	   STD_argind;
-
-extern float STD_LOOP_DURATION, /* wall clock time to iterate */
-	     STD_LOOP_DELAY;    /* delay time after each iteration */
-
-#define USC_MAX_ERRNO	2000
-    
-/**********************************************************************
- * Prototype for parse_opts routine
- **********************************************************************/
-extern const char *parse_opts(int ac, char **av, option_t *user_optarr, void (*uhf)());
-
-
-/*
- * define a structure 
- */
-struct usc_errno_t {
-    int flag;
-};
-
-/***********************************************************************
- ****
- **** 
- ****
- **********************************************************************/
-#ifdef  _USC_LIB_
-
-extern int TEST_RETURN;
-extern int TEST_ERRNO;
-
-#else
-/***********************************************************************
- * Global array of bit masks to indicate errnos that are expected.
- * Bits set by TEST_EXP_ENOS() macro and used by TEST_CLEANUP() macro.
- ***********************************************************************/
-extern struct usc_errno_t TEST_VALID_ENO[USC_MAX_ERRNO];
-
-/***********************************************************************
- * Globals for returning the return code and errno from the system call
- * test macros.
- ***********************************************************************/
-extern int TEST_RETURN;
-extern int TEST_ERRNO;
-
-/***********************************************************************
- * temporary variables for determining max and min times in TEST macro
- ***********************************************************************/
-extern long btime, etime, tmptime;	
-
-#endif  /* _USC_LIB_ */
-
-/***********************************************************************
- * structure for timing accumulator and counters 
- ***********************************************************************/
-struct tblock {
-    long tb_max;
-    long tb_min;
-    long tb_total;
-    long tb_count;
-};
-
-/***********************************************************************
- * The following globals are externed here so that they are accessable
- * in the macros that follow.
- ***********************************************************************/
-extern struct tblock tblock;
-extern void STD_go();
-extern int (*_TMP_FUNC)(void);
-extern void STD_opts_help();
-
-
-/***********************************************************************
- * TEST: calls a system call 
- * 
- * parameters:
- *	SCALL = system call and parameters to execute
- *
- ***********************************************************************/
-#define TEST(SCALL) TEST_RETURN = (unsigned) SCALL;  TEST_ERRNO=errno;
-
-/***********************************************************************
- * TEST_VOID: calls a system call
- * 
- * parameters:
- *	SCALL = system call and parameters to execute
- *
- * Note: This is IDENTICAL to the TEST() macro except that it is intended
- * for use with syscalls returning no values (void syscall()).  The 
- * Typecasting nothing (void) into an unsigned integer causes compilation
- * errors.
- *
- ***********************************************************************/
-#define TEST_VOID(SCALL)  SCALL; TEST_ERRNO=errno;
-
-/***********************************************************************
- * TEST_CLEANUP: print system call timing stats and errno log entries
- * to stdout if STD_TIMING_ON and STD_ERRNO_LOG are set, respectively.
- * Do NOT print ANY information if no system calls logged.
- * 
- * parameters:
- *	none
- *
- ***********************************************************************/
-#define TEST_CLEANUP 	\
-if ( STD_ERRNO_LOG ) {						\
-	for (tmptime=0; tmptime<USC_MAX_ERRNO; tmptime++) {		\
-	     if ( STD_ERRNO_LIST[tmptime] )	{			\
-	         if ( TEST_VALID_ENO[tmptime].flag )			\
-		     tst_resm(TINFO, "ERRNO %d:\tReceived %d Times",	\
-			      tmptime, STD_ERRNO_LIST[tmptime]);	\
-	         else							\
-		     tst_resm(TINFO,					\
-			      "ERRNO %d:\tReceived %d Times ** UNEXPECTED **",	\
-			      tmptime, STD_ERRNO_LIST[tmptime]);	\
-	     }								\
-	}								\
-}
-
-/***********************************************************************
- * TEST_PAUSEF: Pause for SIGUSR1 if the pause flag is set.
- * 		 Set the user specified function as the interrupt
- *		 handler instead of "STD_go"
- * 
- * parameters:
- *	none
- *
- ***********************************************************************/
-#define TEST_PAUSEF(HANDLER) 					\
-if ( STD_PAUSE ) { 					\
-    _TMP_FUNC = (int (*)())signal(SIGUSR1, HANDLER); 	\
-    pause(); 						\
-    signal(SIGUSR1, (void (*)())_TMP_FUNC);		\
-}
-
-/***********************************************************************
- * TEST_PAUSE: Pause for SIGUSR1 if the pause flag is set.
- *	       Just continue when signal comes in.
- * 
- * parameters:
- *	none
- *
- ***********************************************************************/
-#define TEST_PAUSE usc_global_setup_hook();
-int usc_global_setup_hook();
-
-/***********************************************************************
- * TEST_LOOPING now call the usc_test_looping function.
- * The function will return 1 if the test should continue
- * iterating.
- *
- ***********************************************************************/
-#define TEST_LOOPING usc_test_looping
-int usc_test_looping(int counter);
-
-/***********************************************************************
- * TEST_ERROR_LOG(eno): log this errno if STD_ERRNO_LOG flag set
- * 
- * parameters:
- *	int eno: the errno location in STD_ERRNO_LIST to log.
- *
- ***********************************************************************/
-#define TEST_ERROR_LOG(eno)		\
-    if ( STD_ERRNO_LOG )		\
-        if ( eno < USC_MAX_ERRNO )		\
-            STD_ERRNO_LIST[eno]++;	\
-
-
-/***********************************************************************
- * TEST_EXP_ENOS(array): set the bits associated with the nput errnos
- *	in the TEST_VALID_ENO array.
- * 
- * parameters:
- *	int array[]: a zero terminated array of errnos expected.
- *
- ***********************************************************************/
-#define TEST_EXP_ENOS(array)				\
-    tmptime=0;						\
-    while (array[tmptime] != 0) {			\
-	if (array[tmptime] < USC_MAX_ERRNO)		\
-	    TEST_VALID_ENO[array[tmptime]].flag=1;	\
-	tmptime++;					\
-    }
-					
-
-#endif  /* end of __USCTEST_H__ */
diff --git a/winsup/testsuite/libltp/include/write_log.h b/winsup/testsuite/libltp/include/write_log.h
deleted file mode 100644
index 784d5b3eb..000000000
--- a/winsup/testsuite/libltp/include/write_log.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#ifndef _WRITE_LOG_H_
-#define _WRITE_LOG_H_
-
-/*
- * Constants defining the max size of various wlog_rec fields.  ANY SIZE
- * CHANGES HERE MUST BE REFLECTED IN THE WLOG_REC_DISK STRUCTURE DEFINED
- * BELOW.
- */
-
-#define WLOG_MAX_PATH		128
-#define WLOG_MAX_PATTERN	64
-#define WLOG_MAX_HOST           8
-#define WLOG_REC_MAX_SIZE	(sizeof(struct wlog_rec)+WLOG_MAX_PATH+WLOG_MAX_PATTERN+WLOG_MAX_HOST+2)
-
-/*
- * User view of a write log record.  Note that this is not necessiliary
- * how the data is formatted on disk (signifigant compression occurrs), so
- * don't expect to od the write log file and see things formatted this way.
- */
-
-struct wlog_rec {
-    int	    w_pid;	    /* pid doing the write  	    */
-    int	    w_offset;       /* file offset  	    	    */
-    int	    w_nbytes;	    /* # bytes written	    	    */
-    int	    w_oflags;       /* low-order open() flags	    */
-    int	    w_done;	    /* 1 if io confirmed done	    */
-    int	    w_async;	    /* 1 if async write	(writea)    */
-
-    char    w_host[WLOG_MAX_HOST+1];		/* host doing write -	*/
-						/* null terminated */
-    int	    w_hostlen;				/* host name length	*/
-    char    w_path[WLOG_MAX_PATH+1];		/* file written to -	*/
-						/* null terminated */
-    int	    w_pathlen;				/* file name length	*/
-    char    w_pattern[WLOG_MAX_PATTERN+1];	/* pattern written -	*/
-						/* null terminated */
-    int	    w_patternlen;			/* pattern length	*/
-};
-
-#ifndef uint
-#define uint	unsigned int
-#endif
-
-/*
- * On-disk structure of a wlog_rec.  Actually, the record consists of
- * 3 parts:  [wlog_rec_disk structure][variable length data][length]
- * where length is a 2 byte field containing the total record length
- * (including the 2 bytes).  It is used for scanning the logfile in reverse
- * order.
- *
- * The variable length data includes the path, host, and pattern (in that
- * order).  The lengths of these pieces of data are held in the
- * wlog_rec_disk structure.  Thus, the actual on-disk record looks like
- * this (top is lower byte offset):
- *
- *		struct wlog_rec_disk
- *		path    (w_pathlen bytes - not null terminated)
- *		host    (w_hostlen bytes - not null terminated)
- *		pattern (w_patternlen bytes - not null terminated)
- *		2-byte record length
- *
- * Another way of looking at it is:
- *
- * <struct wlog_rec_disk><path (wpathlen bytes)>-->
- * --><host (w_hostlen bytes)><pattern (w_patternlen bytes)><length (2 bytes)>
- *
- * The maximum length of this record is defined by the WLOG_REC_MAX_SIZE
- * record.  Note that the 2-byte record length forces this to be
- * <= 64k bytes.
- *
- * Note that there is lots of bit-masking done here.  The w_pathlen,
- * w_hostlen, and w_patternlen fields MUST have enough bits to hold
- * WLOG_MAX_PATH, WLOG_MAX_HOST, and WLOG_MAX_PATTERN bytes respectivly.
- */
-
-struct wlog_rec_disk {
-#ifdef CRAY
-    uint    w_offset    : 44;	    /* file offset  	    	    */
-    uint    w_extra0    : 20;       /* EXTRA BITS IN WORD 0         */
-#else
-    uint    w_offset    : 32;	    /* file offset  	    	    */
-    uint    w_extra0    : 32;       /* EXTRA BITS IN WORD 0         */
-#endif
-
-    uint    w_nbytes    : 32;	    /* # bytes written	    	    */
-    uint    w_oflags	: 32;	    /* low-order open() flags	    */
-
-    uint    w_pid       : 17;	    /* pid doing the write  	    */
-    uint    w_pathlen	:  7;	    /* length of file path  	    */
-    uint    w_patternlen:  6;	    /* length of pattern            */
-    uint    w_hostlen   :  4;       /* length of host               */
-    uint    w_done      :  1;	    /* 1 if io confirmed done	    */
-    uint    w_async     :  1;	    /* 1 if async write	(writea)    */
-    uint    w_extra2 	: 28;	    /* EXTRA BITS IN WORD 2 	    */
-};
-
-/*
- * write log file datatype.  wlog_open() initializes this structure
- * which is then passed around to the various wlog_xxx routines.
- */
-
-struct wlog_file {
-    int		w_afd;			/* append fd			*/
-    int		w_rfd;			/* random-access fd		*/
-    char	w_file[1024];		/* name of the write_log	*/
-};
-
-/*
- * return value defines for the user-supplied function to
- * wlog_scan_backward().
- */
-
-#define WLOG_STOP_SCAN		0
-#define WLOG_CONTINUE_SCAN	1
-
-/*
- * wlog prototypes
- */
-
-#if __STDC__
-extern int	wlog_open(struct wlog_file *wfile, int trunc, int mode);
-extern int	wlog_close(struct wlog_file *wfile);
-extern int	wlog_record_write(struct wlog_file *wfile,
-				  struct wlog_rec *wrec, long offset);
-extern int	wlog_scan_backward(struct wlog_file *wfile, int nrecs,
-				   int (*func)(struct wlog_rec *rec),
-				   long data);
-#else
-int	wlog_open();
-int	wlog_close();
-int	wlog_record_write();
-int	wlog_scan_backward();
-#endif
-
-extern char	Wlog_Error_String[];
-
-#endif /* _WRITE_LOG_H_ */
-
diff --git a/winsup/testsuite/libltp/lib/dataascii.c b/winsup/testsuite/libltp/lib/dataascii.c
deleted file mode 100644
index 5bc201852..000000000
--- a/winsup/testsuite/libltp/lib/dataascii.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#include <stdio.h>
-#include <string.h>
-#include "dataascii.h"
-
-#define CHARS		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghjiklmnopqrstuvwxyz\n"
-#define CHARS_SIZE	sizeof(CHARS)
-
-#ifdef UNIT_TEST
-#include <stdlib.h> /* malloc */
-#endif
-
-static char Errmsg[80];
-
-int
-dataasciigen(listofchars, buffer, bsize, offset)
-char *listofchars;	/* a null terminated list of characters */
-char *buffer;
-int bsize;
-int offset;
-{
-   int cnt;
-   int total;
-   int ind;	/* index into CHARS array */
-   char *chr;
-   int chars_size;
-   const char *charlist;
-
-	chr=buffer;
-	total=offset+bsize;
-
-	if ( listofchars == NULL ) {
-	    charlist=CHARS;
-	    chars_size=CHARS_SIZE;
-	}
-	else {
-	    charlist=listofchars;
-	    chars_size=strlen(listofchars);
-	}
-
-	for(cnt=offset; cnt<total;  cnt++) {
-		ind=cnt%chars_size;
-		*chr++=charlist[ind];
-	}
-
-	return bsize;
-
-}	/* end of dataasciigen */
-
-int
-dataasciichk(listofchars, buffer, bsize, offset, errmsg)
-char *listofchars;	/* a null terminated list of characters */
-char *buffer;
-int bsize;
-int offset;
-char **errmsg;
-{
-   int cnt;
-   int total;
-   int ind;	/* index into CHARS array */
-   char *chr;
-   int chars_size;
-   const char *charlist;
-
-	chr=buffer;
-	total=offset+bsize;
-
-	if ( listofchars == NULL ) {
-	    charlist=CHARS;
-	    chars_size=CHARS_SIZE;
-	}
-	else {
-	    charlist=listofchars;
-	    chars_size=strlen(listofchars);
-	}
-
-	if ( errmsg != NULL ) {
-	    *errmsg = Errmsg;
-	}
-
-	for(cnt=offset; cnt<total;  chr++, cnt++) {
-	    ind=cnt%chars_size;
-	    if ( *chr != charlist[ind] ) {
-		sprintf(Errmsg,
-		    "data mismatch at offset %d, exp:%#o, act:%#o", cnt,
-		    charlist[ind], *chr);
-		return cnt;
-	    }
-	}
-
-	sprintf(Errmsg, "all %d bytes match desired pattern", bsize);
-	return -1;	/* buffer is ok */
-
-}	/* end of dataasciichk */
-
-
-#if UNIT_TEST
-
-/***********************************************************************
- * main for doing unit testing
- ***********************************************************************/
-int
-main(ac, ag)
-int ac;
-char **ag;
-{
-
-int size=1023;
-char *buffer;
-int ret;
-char *errmsg;
-
-    if ((buffer=(char *)malloc(size)) == NULL ) {
-        perror("malloc");
-        exit(2);
-    }
-
-    dataasciigen(NULL, buffer, size, 0);
-    printf("dataasciigen(NULL, buffer, %d, 0)\n", size);
-
-    ret=dataasciichk(NULL, buffer, size, 0, &errmsg);
-    printf("dataasciichk(NULL, buffer, %d, 0, &errmsg) returned %d %s\n",
-        size, ret, errmsg);
-
-    if ( ret == -1 )
-        printf("\tPASS return value is -1 as expected\n");
-    else
-        printf("\tFAIL return value is %d, expected -1\n", ret);
-
-    ret=dataasciichk(NULL, &buffer[1], size-1, 1, &errmsg);
-    printf("dataasciichk(NULL, &buffer[1], %d, 1, &errmsg) returned %d %s\n",
-        size-1, ret, errmsg);
-
-    if ( ret == -1 )
-        printf("\tPASS return value is -1 as expected\n");
-    else
-        printf("\tFAIL return value is %d, expected -1\n", ret);
-
-    buffer[25]= 0x0;
-    printf("changing char 25\n");
-
-    ret=dataasciichk(NULL, &buffer[1], size-1, 1, &errmsg);
-    printf("dataasciichk(NULL, &buffer[1], %d, 1, &errmsg) returned %d %s\n",
-        size-1, ret, errmsg);
-
-    if ( ret == 25 )
-	printf("\tPASS return value is 25 as expected\n");
-    else
-	printf("\tFAIL return value is %d, expected 25\n", ret);
-
-    dataasciigen("this is a test of the my string" , buffer, size, 0);
-    printf("dataasciigen(\"this is a test of the my string\", buffer, %d, 0)\n", size);
-
-    ret=dataasciichk("this is a test of the my string", buffer, size, 0, &errmsg);
-    printf("dataasciichk(\"this is a test of the my string\", buffer, %d, 0, &errmsg) returned %d %s\n",
-        size, ret, errmsg);
-
-    if ( ret == -1 )
-        printf("\tPASS return value is -1 as expected\n");
-    else
-        printf("\tFAIL return value is %d, expected -1\n", ret);
-
-    ret=dataasciichk("this is a test of the my string", &buffer[1], size-1, 1, &errmsg);
-    printf("dataasciichk(\"this is a test of the my string\", &buffer[1], %d, 1, &errmsg) returned %d %s\n",
-        size-1, ret, errmsg);
-
-    if ( ret == -1 )
-        printf("\tPASS return value is -1 as expected\n");
-    else
-        printf("\tFAIL return value is %d, expected -1\n", ret);
-
-    buffer[25]= 0x0;
-    printf("changing char 25\n");
-
-    ret=dataasciichk("this is a test of the my string", &buffer[1], size-1, 1, &errmsg);
-    printf("dataasciichk(\"this is a test of the my string\", &buffer[1], %d, 1, &errmsg) returned %d %s\n",
-        size-1, ret, errmsg);
-
-    if ( ret == 25 )
-	printf("\tPASS return value is 25 as expected\n");
-    else
-	printf("\tFAIL return value is %d, expected 25\n", ret);
-
-    exit(0);
-}
-
-#endif
-
diff --git a/winsup/testsuite/libltp/lib/databin.c b/winsup/testsuite/libltp/lib/databin.c
deleted file mode 100644
index f09c2c86c..000000000
--- a/winsup/testsuite/libltp/lib/databin.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#include <stdio.h>
-#include <sys/param.h>
-#include <string.h> /* memset */
-#include <stdlib.h> /* rand */
-#include "databin.h"
-
-#if UNIT_TEST
-#include <malloc.h>
-#endif
-
-static char Errmsg[80];
-
-void
-databingen (mode, buffer, bsize, offset)
-int mode;	/* either a, c, r, o, z or C */
-unsigned char *buffer;	/* buffer pointer */
-int bsize;	/* size of buffer */
-int offset;	/* offset into the file where buffer starts */
-{
-int ind;
-
-        switch (mode)
-        {
-        default:
-        case 'a':	/* alternating bit pattern */
-                memset(buffer,0x55,bsize);
-                break;
-
-        case 'c':	/* checkerboard pattern */
-                memset(buffer,0xf0,bsize);
-                break;
-
-	case 'C':	/* */
-                for (ind=0;ind< bsize;ind++) {
-		    buffer[ind] = ((offset+ind)%8 & 0177);
-		}
-		break;
-
-	case 'o':
-		memset(buffer,0xff,bsize);
-		break;
-
-	case 'z':
-		memset(buffer,0x0,bsize);
-		break;
-
-        case 'r':	/* random */
-                for (ind=0;ind< bsize;ind++) {
-		    buffer[ind] = (rand () & 0177) | 0100;
-		}
-        }
-}
-
-/***********************************************************************
- *
- * return values:
- *      >= 0 : error at byte offset into the file, offset+buffer[0-(bsize-1)]
- *      < 0  : no error
- ***********************************************************************/
-int
-databinchk(mode, buffer, bsize, offset, errmsg)
-int mode;	/* either a, c, r, z, o, or C */
-unsigned char *buffer;	/* buffer pointer */
-int bsize;	/* size of buffer */
-int offset;	/* offset into the file where buffer starts */
-char **errmsg;
-{
-    int cnt;
-    unsigned char *chr;
-    int total;
-    long expbits;
-    long actbits;
-
-	chr=buffer;
-	total=bsize;
-
-	if ( errmsg != NULL ) {
-	    *errmsg = Errmsg;
-	}
-	
-        switch (mode)
-        {
-        default:
-        case 'a':	/* alternating bit pattern */
-		expbits=0x55;
-                break;
-
-        case 'c':	/* checkerboard pattern */
-		expbits=0xf0;
-                break;
-
-	case 'C':	/* counting pattern */
-                for (cnt=0;cnt< bsize;cnt++) {
-		    expbits = ((offset+cnt)%8 & 0177);
-
-		    if ( buffer[cnt] != expbits ) {
-			sprintf(Errmsg,
-			    "data mismatch at offset %d, exp:%#lo, act:%#o",
-			    offset+cnt, expbits, buffer[cnt]);
-			return offset+cnt;
-		    }
-		}
-		sprintf(Errmsg, "all %d bytes match desired pattern", bsize);
-		return -1;
-
-	case 'o':
-		expbits=0xff;
-		break;
-
-	case 'z':
-		expbits=0;
-		break;
-
-        case 'r':
-		return -1;	/* no check can be done for random */
-        }
-
-	for (cnt=0; cnt<bsize; chr++, cnt++) {
-	    actbits = (long)*chr;
-
-	    if ( actbits != expbits ) {
-		sprintf(Errmsg, "data mismatch at offset %d, exp:%#lo, act:%#lo",
-		    offset+cnt, expbits, actbits);
-		return offset+cnt;
-	    }
-	}
-
-	sprintf(Errmsg, "all %d bytes match desired pattern", bsize);
-	return -1; /* all ok */
-}
-
-#if UNIT_TEST
-
-/***********************************************************************
- * main for doing unit testing
- ***********************************************************************/
-int
-main(ac, ag)
-int ac;
-char **ag;
-{
-
-    int size=1023;
-    int offset;
-    int number;
-    unsigned char *buffer;
-    int ret;
-    char *errmsg;
-
-    if ((buffer=(unsigned char *)malloc(size)) == NULL ) {
-	perror("malloc");
-	exit(2);
-    }
-
-
-printf("***** for a ****************************\n");
-    databingen('a', buffer, size, 0);
-    printf("databingen('a', buffer, %d, 0)\n", size);
-
-    ret=databinchk('a', buffer, size, 0, &errmsg);
-    printf("databinchk('a', buffer, %d, 0, &errmsg) returned %d: %s\n",
-	size, ret, errmsg);
-    if ( ret == -1 )
-	printf("\tPASS return value of -1 as expected\n");
-    else
-	printf("\tFAIL return value %d, expected -1\n", ret);
-
-    offset=232400;
-    ret=databinchk('a', &buffer[1], size-1, offset, &errmsg);
-    printf("databinchk('a', &buffer[1], %d, %d, &errmsg) returned %d: %s\n",
-	size, offset, ret, errmsg);
-    if ( ret == -1 )
-	printf("\tPASS return value of -1 as expected\n");
-    else
-	printf("\tFAIL return value %d, expected -1\n", ret);
-
-    buffer[15]= 0x0;
-    printf("changing char 15 (offset (%d+15) = %d) to 0x0\n", offset, offset+15);
-    number=offset+15;
-
-    ret=databinchk('a', &buffer[1], size-1, offset+1, &errmsg);
-    printf("databinchk('a', &buffer[1], %d, %d, &errmsg) returned %d: %s\n",
-	size-1, offset+1, ret, errmsg);
-    if ( ret == number )
-	printf("\tPASS return value of %d as expected\n", number);
-    else
-	printf("\tFAIL return value %d, expected %d\n", ret, number);
-
-
-
-printf("***** for c ****************************\n");
-    databingen('c', buffer, size, 0);
-    printf("databingen('c', buffer, %d, 0)\n", size);
-
-    ret=databinchk('c', buffer, size, 0, &errmsg);
-    printf("databinchk('c', buffer, %d, 0, &errmsg) returned %d: %s\n",
-	size, ret, errmsg);
-    if ( ret == -1 )
-	printf("\tPASS return value of -1 as expected\n");
-    else
-	printf("\tFAIL return value %d, expected -1\n", ret);
-
-    offset=232400;
-    ret=databinchk('c', &buffer[1], size-1, offset, &errmsg);
-    printf("databinchk('c', &buffer[1], %d, %d, &errmsg) returned %d: %s\n",
-	size, offset, ret, errmsg);
-    if ( ret == -1 )
-	printf("\tPASS return value of -1 as expected\n");
-    else
-	printf("\tFAIL return value %d, expected -1\n", ret);
-
-    buffer[15]= 0x0;
-    printf("changing char 15 (offset (%d+15) = %d) to 0x0\n", offset, offset+15);
-    number=offset+15;
-
-    ret=databinchk('c', &buffer[1], size-1, offset+1, &errmsg);
-    printf("databinchk('c', &buffer[1], %d, %d, &errmsg) returned %d: %s\n",
-	size-1, offset+1, ret, errmsg);
-    if ( ret == number )
-	printf("\tPASS return value of %d as expected\n", number);
-    else
-	printf("\tFAIL return value %d, expected %d\n", ret, number);
-
-printf("***** for C ****************************\n");
-
-    databingen('C', buffer, size, 0);
-    printf("databingen('C', buffer, %d, 0)\n", size);
-
-    ret=databinchk('C', buffer, size, 0, &errmsg);
-    printf("databinchk('C', buffer, %d, 0, &errmsg) returned %d: %s\n",
-	size, ret, errmsg);
-    if ( ret == -1 )
-	printf("\tPASS return value of -1 as expected\n");
-    else
-	printf("\tFAIL return value %d, expected -1\n", ret);
-
-    offset=18;
-    ret=databinchk('C', &buffer[18], size-18, 18, &errmsg);
-    printf("databinchk('C', &buffer[18], %d, 18, &errmsg) returned %d: %s\n",
-	size-18, ret, errmsg);
-    if ( ret == -1 )
-	printf("\tPASS return value of -1 as expected\n");
-    else
-	printf("\tFAIL return value %d, expected -1\n", ret);
-
-    buffer[20]= 0x0;
-    buffer[21]= 0x0;
-    printf("changing char 20 and 21 to 0x0 (offset %d and %d)\n", 20,
-	21);
-
-    ret=databinchk('C', &buffer[18], size-18, 18, &errmsg);
-    printf("databinchk('C', &buffer[18], %d, 18, &errmsg) returned %d: %s\n",
-	size-18, ret, errmsg);
-
-    if ( ret == 20 || ret == 21 )
-	printf("\tPASS return value of %d or %d as expected\n",
-	    20, 21);
-    else
-	printf("\tFAIL return value %d, expected %d or %d\n", ret,
-	    20, 21 );
-
-    exit(0);
-
-}
-
-#endif
-
diff --git a/winsup/testsuite/libltp/lib/datapid.c b/winsup/testsuite/libltp/lib/datapid.c
deleted file mode 100644
index 9414eae90..000000000
--- a/winsup/testsuite/libltp/lib/datapid.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/************
-
-64 bits in a Cray word
-
-				12345678901234567890123456789012
-1234567890123456789012345678901234567890123456789012345678901234
-________________________________________________________________
-<    pid       >< word-offset in file (same #) ><    pid       >
-
-1234567890123456789012345678901234567890123456789012345678901234
-________________________________________________________________
-<    pid       >< offset in file of this word  ><    pid       >
-
-
-8 bits to a bytes == character
- NBPW            8 
-************/
-
-#include <stdio.h>
-#include <sys/param.h>
-#ifdef UNIT_TEST
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-static char Errmsg[80];
-
-#define LOWER16BITS(X)	(X & 0177777)
-#define LOWER32BITS(X)	(X & 0xffffffff)
-
-/***
-#define HIGHBITS(WRD, bits) ( (-1 << (64-bits)) & WRD)
-#define LOWBITS(WRD, bits) ( (-1 >> (64-bits)) & WRD)
-****/
-
-#define NBPBYTE		8		/* number bits per byte */
-
-#ifndef DEBUG
-#define DEBUG	0
-#endif
-
-/***********************************************************************
- *
- * 
- * 1   2   3   4   5   6   7   8   9   10  11  12  13  14  14  15	bytes
- * 1234567890123456789012345678901234567890123456789012345678901234	bits
- * ________________________________________________________________	1 word
- * <    pid       >< offset in file of this word  ><    pid       >
- * 
- * the words are put together where offset zero is the start.
- * thus, offset 16 is the start of  the second full word
- * Thus, offset 8 is in middle of word 1
- ***********************************************************************/
-int
-datapidgen(pid, buffer, bsize, offset)
-int pid;
-char *buffer;
-int bsize;
-int offset;
-{
-#if CRAY
-	
-   int cnt;
-   int tmp;
-   char *chr;
-   long *wptr;
-   long word;
-   int woff;	/* file offset for the word */
-   int boff;	/* buffer offset or index */
-   int num_full_words;
-
-    num_full_words = bsize/NBPW;
-    boff = 0;
-
-    if ( cnt=(offset % NBPW) ) {	/* partial word */
-
-	woff = offset - cnt;
-#if DEBUG
-printf("partial at beginning, cnt = %d, woff = %d\n", cnt, woff);
-#endif
-
-	word = ((LOWER16BITS(pid) << 48) | (LOWER32BITS(woff) << 16) | LOWER16BITS(pid));
-
-	chr = (char *)&word;
-
-	for (tmp=0; tmp<cnt; tmp++) {   /* skip unused bytes */
-	    chr++;
-        }
-
-	for (; boff<(NBPW-cnt) && boff<bsize; boff++, chr++) {
-	    buffer[boff] = *chr;
-	}
-    }
-
-    /*
-     * full words 
-     */
-
-    num_full_words = (bsize-boff)/NBPW;
-	
-    woff = offset+boff;
-	
-    for (cnt=0; cnt<num_full_words; woff += NBPW, cnt++ ) {
-
-	word = ((LOWER16BITS(pid) << 48) | (LOWER32BITS(woff) << 16) | LOWER16BITS(pid));
-
-	chr = (char *)&word;
-	for(tmp=0; tmp<NBPW; tmp++, chr++) {
-	    buffer[boff++] = *chr;
-	}
-/****** Only if wptr is a word ellined
-	wptr = (long *)&buffer[boff];
-	*wptr = word;
-	boff += NBPW;
-*****/
-
-    }
-
-    /*
-     * partial word at end of buffer
-     */
-
-    if ( cnt=((bsize-boff) % NBPW) ) {
-#if DEBUG
-printf("partial at end\n");
-#endif
-	word = ((LOWER16BITS(pid) << 48) | (LOWER32BITS(woff) << 16) | LOWER16BITS(pid));
-
-	chr = (char *)&word;
-
-	for (tmp=0; tmp<cnt && boff<bsize; tmp++, chr++) {
-	    buffer[boff++] = *chr;
-	}
-    }
-
-    return bsize;
-
-#else
-	return -1;	/* not support on non-64 bits word machines  */
-
-#endif
-
-} 
-
-/***********************************************************************
- *
- *
- ***********************************************************************/
-int
-datapidchk(pid, buffer, bsize, offset, errmsg)
-int pid;
-char *buffer;
-int bsize;
-int offset;
-char **errmsg;
-{
-#if CRAY
-	
-   int cnt;
-   int tmp;
-   char *chr;
-   long *wptr;
-   long word;
-   int woff;	/* file offset for the word */
-   int boff;	/* buffer offset or index */
-   int num_full_words;
-
-
-    if ( errmsg != NULL ) {
-        *errmsg = Errmsg;
-    }
-
-
-    num_full_words = bsize/NBPW;
-    boff = 0;
-
-    if ( cnt=(offset % NBPW) ) {	/* partial word */
-	woff = offset - cnt;
-	word = ((LOWER16BITS(pid) << 48) | (LOWER32BITS(woff) << 16) | LOWER16BITS(pid));
-
-	chr = (char *)&word;
-
-	for (tmp=0; tmp<cnt; tmp++) {   /* skip unused bytes */
-	    chr++;
-        }
-
-	for (; boff<(NBPW-cnt) && boff<bsize; boff++, chr++) {
-	    if (buffer[boff] != *chr) {
-		sprintf(Errmsg, "Data mismatch at offset %d, exp:%#o, act:%#o",
-		    offset+boff, *chr, buffer[boff]);
-		return offset+boff;
-	    }
-	}
-    }
-
-    /*
-     * full words 
-     */
-
-    num_full_words = (bsize-boff)/NBPW;
-	
-    woff = offset+boff;
-	
-    for (cnt=0; cnt<num_full_words; woff += NBPW, cnt++ ) {
-	word = ((LOWER16BITS(pid) << 48) | (LOWER32BITS(woff) << 16) | LOWER16BITS(pid));
-
-	chr = (char *)&word;
-	for(tmp=0; tmp<NBPW; tmp++, boff++, chr++) {
-	    if ( buffer[boff] != *chr ) {
-	        sprintf(Errmsg, "Data mismatch at offset %d, exp:%#o, act:%#o",
-	            woff, *chr, buffer[boff]);
-	        return woff;
-	    }
-	}
-
-/****** only if a word elined
-	wptr = (long *)&buffer[boff];
-	if ( *wptr != word ) {
-	    sprintf(Errmsg, "Data mismatch at offset %d, exp:%#o, act:%#o",
-	        woff, word, *wptr);
-	    return woff;
-	}
-	boff += NBPW;
-******/
-    }
-
-    /*
-     * partial word at end of buffer
-     */
-
-    if ( cnt=((bsize-boff) % NBPW) ) {
-#if DEBUG
-printf("partial at end\n");
-#endif
-	word = ((LOWER16BITS(pid) << 48) | (LOWER32BITS(woff) << 16) | LOWER16BITS(pid));
-
-	chr = (char *)&word;
-
-
-	for (tmp=0; tmp<cnt && boff<bsize; boff++, tmp++, chr++) {
-	    if ( buffer[boff] != *chr ) {
-		sprintf(Errmsg, "Data mismatch at offset %d, exp:%#o, act:%#o",
-		    offset+boff, *chr, buffer[boff]);
-		return offset+boff;
-	    }
-	}
-    }
-
-    sprintf(Errmsg, "all %d bytes match desired pattern", bsize);
-    return -1;      /* buffer is ok */
-
-#else
-	
-    if ( errmsg != NULL ) {
-        *errmsg = Errmsg;
-    }
-    sprintf(Errmsg, "Not supported on this OS.");
-    return 0;
-
-#endif
-
-
-}       /* end of datapidchk */
-
-#if UNIT_TEST
-
-/***********************************************************************
- * main for doing unit testing
- ***********************************************************************/
-int
-main(ac, ag)
-int ac;
-char **ag;
-{
-
-int size=1234;
-char *buffer;
-int ret;
-char *errmsg;
-
-    if ((buffer=(char *)malloc(size)) == NULL ) {
-        perror("malloc");
-        exit(2);
-    }
-
-
-    datapidgen(-1, buffer, size, 3);
-
-/***
-fwrite(buffer, size, 1, stdout);
-fwrite("\n", 1, 1, stdout);
-****/
-
-    printf("datapidgen(-1, buffer, size, 3)\n");
-
-    ret=datapidchk(-1, buffer, size, 3, &errmsg);
-    printf("datapidchk(-1, buffer, %d, 3, &errmsg) returned %d %s\n",
-        size, ret, errmsg);
-    ret=datapidchk(-1, &buffer[1], size-1, 4, &errmsg);
-    printf("datapidchk(-1, &buffer[1], %d, 4, &errmsg) returned %d %s\n",
-        size-1, ret, errmsg);
-
-    buffer[25]= 0x0;
-    buffer[26]= 0x0;
-    buffer[27]= 0x0;
-    buffer[28]= 0x0;
-    printf("changing char 25-28\n");
-
-    ret=datapidchk(-1, &buffer[1], size-1, 4, &errmsg);
-    printf("datapidchk(-1, &buffer[1], %d, 4, &errmsg) returned %d %s\n",
-        size-1, ret, errmsg);
-
-printf("------------------------------------------\n");
-
-    datapidgen(getpid(), buffer, size, 5);
-
-/*******
-fwrite(buffer, size, 1, stdout);
-fwrite("\n", 1, 1, stdout);
-******/
-
-    printf("\ndatapidgen(getpid(), buffer, size, 5)\n");
-
-    ret=datapidchk(getpid(), buffer, size, 5, &errmsg);
-    printf("datapidchk(getpid(), buffer, %d, 5, &errmsg) returned %d %s\n",
-        size, ret, errmsg);
-
-    ret=datapidchk(getpid(), &buffer[1], size-1, 6, &errmsg);
-    printf("datapidchk(getpid(), &buffer[1], %d, 6, &errmsg) returned %d %s\n",
-        size-1, ret, errmsg);
-
-    buffer[25]= 0x0;
-    printf("changing char 25\n");
-
-    ret=datapidchk(getpid(), &buffer[1], size-1, 6, &errmsg);
-    printf("datapidchk(getpid(), &buffer[1], %d, 6, &errmsg) returned %d %s\n",
-        size-1, ret, errmsg);
-
-    exit(0);
-}
-
-#endif
-
diff --git a/winsup/testsuite/libltp/lib/forker.c b/winsup/testsuite/libltp/lib/forker.c
deleted file mode 100644
index 99bc58550..000000000
--- a/winsup/testsuite/libltp/lib/forker.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/**************************************************************
- *
- *    OS Testing - Silicon Graphics, Inc.
- *
- *    FUNCTION NAME     : forker
- *			  background
- *
- *    FUNCTION TITLE    : fork desired number of copies of the current process
- *			  fork a process and return control to caller
- *
- *    SYNOPSIS:
- *      int forker(ncopies, mode, prefix)
- *      int ncopies;
- *	int mode;
- *	char *prefix;
- *
- *	int background(prefix);
- *	char *prefix;
- *
- *	extern int Forker_pids[];
- *	extern int Forker_npids;
- *
- *    AUTHOR            : Richard Logan
- *
- *    CO-PILOT(s)       : Dean Roehrich
- *
- *    INITIAL RELEASE   : UNICOS 8.0
- *
- *    DESIGN DESCRIPTION
- *	The background function will do a fork of the current process.
- *	The parent process will then exit, thus orphaning the
- *	child process.  Doing this will not nice the child process
- *	like executing a cmd in the background using "&" from the shell.
- *	If the fork fails and prefix is not NULL, a error message is printed
- *      to stderr and the process will exit with a value of errno.
- *
- *	The forker function will fork <ncopies> minus one copies
- *	of the current process.  There are two modes in how the forks
- *	will be done.  Mode 0 (default) will have all new processes
- *	be childern of the parent process.    Using Mode 1,
- *	the parent process will have one child and that child will
- *	fork the next process, if necessary, and on and on.
- *	The forker function will return the number of successful
- *	forks.  This value will be different for the parent and each child.
- *	Using mode 0, the parent will get the total number of successful
- *	forks.  Using mode 1, the newest child will get the total number
- *	of forks.  The parent will get a return value of 1.
- *
- *	The forker function also updates the global variables
- *	Forker_pids[] and Forker_npids.  The Forker_pids array will
- *      be updated to contain the pid of each new process.  The
- *	Forker_npids variable contains the number of entries
- *	in Forker_pids.  Note, not all processes will have
- *	access to all pids via Forker_pids.  If using mode 0, only the
- *	parent process and the last process will have all information.
- *      If using mode 1, only the last child process will have all information.
- *
- *	If the prefix parameter is not NULL and the fork system call fails,
- *      a error message will be printed to stderr.  The error message
- *      the be preceeded with prefix string.  If prefix is NULL,
- *      no error message is printed.
- *
- *    SPECIAL REQUIREMENTS
- *	None.
- *
- *    UPDATE HISTORY
- *      This should contain the description, author, and date of any
- *      "interesting" modifications (i.e. info should helpful in
- *      maintaining/enhancing this module).
- *      username     description
- *      ----------------------------------------------------------------
- *	rrl	    This functions will first written during
- *		the SFS testing days, 1993.
- *
- *    BUGS/LIMITATIONS
- *     The child pids are stored in the fixed array, Forker_pids.
- *     The array only has space for 4098 pids.  Only the first
- *     4098 pids will be stored in the array.
- *
- **************************************************************/
-
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h> /* fork, getpid, sleep */
-#include <string.h>
-#include <stdlib.h>
-#include "forker.h"
-
-extern int errno;
-
-int Forker_pids[FORKER_MAX_PIDS];      /* holds pids of forked processes */
-int Forker_npids=0;             /* number of entries in Forker_pids */
-
-/***********************************************************************
- *
- * This function will fork and the parent will exit zero and
- * the child will return.  This will orphan the returning process
- * putting it in the background.
- *
- * Return Value
- *   0 : if fork did not fail
- *  !0 : if fork failed, the return value will be the errno.
- ***********************************************************************/
-int
-background(prefix)
-char *prefix;
-{
-  switch (fork()) {
-  case -1:
-    if ( prefix != NULL )
-        fprintf(stderr, "%s: In %s background(), fork() failed, errno:%d %s\n",
-	    prefix, __FILE__, errno, strerror(errno));
-    exit(errno);
-
-  case 0:	/* child process */
-    break;
-
-  default:	
-    exit(0);
-  }
-
-  return 0;
-
-}	/* end of background */
-
-/***********************************************************************
- * Forker will fork ncopies-1 copies of self. 
- * 
- ***********************************************************************/
-int
-forker(ncopies, mode, prefix)
-int ncopies;
-int mode;	/* 0 - all childern of parent, 1 - only 1 direct child */
-char *prefix;   /* if ! NULL, an message will be printed to stderr */
-		/* if fork fails.  The prefix (program name) will */
-	        /* preceed the message */
-{
-    int cnt;
-    int pid;
-    static int ind = 0;
-
-    Forker_pids[ind]=0;
-
-    for ( cnt=1; cnt < ncopies; cnt++ ) {
-
-	switch ( mode ) {
-        case 1  :	/* only 1 direct child */
-	    if ( (pid = fork()) == -1 ) {
-		if ( prefix != NULL ) 
-		    fprintf(stderr, "%s: %s,forker(): fork() failed, errno:%d %s\n",
-			prefix, __FILE__, errno, strerror(errno));
-	        return 0;
-	    }
-	    Forker_npids++;
-	    
-	    switch (pid ) {
-            case 0:     /* child - continues the forking */
-	        
-		if ( Forker_npids < FORKER_MAX_PIDS )
-                    Forker_pids[Forker_npids-1]=getpid();
-                break;
-
-            default:    /* parent - stop the forking */
-		if ( Forker_npids < FORKER_MAX_PIDS )
-                    Forker_pids[Forker_npids-1]=pid;
-                return cnt-1;      
-            }
-
-	    break;
-
-	default :	/* all new processes are childern of parent */
-	    if ( (pid = fork()) == -1 ) {
-		if ( prefix != NULL ) 
-		    fprintf(stderr, "%s: %s,forker(): fork() failed, errno:%d %s\n",
-			prefix, __FILE__, errno, strerror(errno));
-	        return cnt-1;
-	    }
-	    Forker_npids++;
-	    
-	    switch (pid ) {
-	    case 0:	/* child - stops the forking */
-		if ( Forker_npids < FORKER_MAX_PIDS )
-                    Forker_pids[Forker_npids-1]=getpid();
-	        return cnt;	
-
-	    default:	/* parent - continues the forking */
-		if ( Forker_npids < FORKER_MAX_PIDS )
-                    Forker_pids[Forker_npids-1]=pid;
-                break;
-            }
-	    break;
-	}
-    }
-
-    if ( Forker_npids < FORKER_MAX_PIDS )
-        Forker_pids[Forker_npids]=0;
-    return cnt-1;
-
-}	/* end of forker */
-
-
-#if UNIT_TEST
-
-/*
- * The following is a unit test main for the background and forker
- * functions.
- */
-
-int
-main(argc, argv)
-int argc;
-char **argv;
-{
-    int ncopies=1;
-    int mode=0;
-    int ret;
-    int ind;
-
-    if ( argc == 1 ) {
-	printf("Usage: %s ncopies [mode]\n", argv[0]);
-	exit(1);
-    }
-
-    if ( sscanf(argv[1], "%i", &ncopies) != 1 ) {
-	printf("%s: ncopies argument must be integer\n", argv[0]);
-	exit(1);
-    }
-
-    if ( argc == 3 )
-	if ( sscanf(argv[2], "%i", &mode) != 1 ) {
-        printf("%s: mode argument must be integer\n", argv[0]);
-        exit(1);
-    }
-
-    printf("Starting Pid = %d\n", getpid());
-    ret=background(argv[0]);
-    printf("After background() ret:%d, pid = %d\n", ret, getpid());
-
-    ret=forker(ncopies, mode, argv[0]);
-
-    printf("forker(%d, %d, %s) ret:%d, pid = %d, sleeping 30 seconds.\n", 
-	ncopies, mode, argv[0], ret, getpid());
-
-    printf("%d My version of Forker_pids[],  Forker_npids = %d\n", 
-	getpid(), Forker_npids);
-
-    for (ind=0; ind<Forker_npids; ind++){
-	printf("%d ind:%-2d pid:%d\n", getpid(), ind, Forker_pids[ind]);
-    }
-    
-    sleep(30);
-    exit(0);
-}
-
-#endif  /* UNIT_TEST */
diff --git a/winsup/testsuite/libltp/lib/get_high_address.c b/winsup/testsuite/libltp/lib/get_high_address.c
deleted file mode 100644
index 5fe1e81b2..000000000
--- a/winsup/testsuite/libltp/lib/get_high_address.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- *	(C) COPYRIGHT CRAY RESEARCH, INC.
- *	UNPUBLISHED PROPRIETARY INFORMATION.
- *	ALL RIGHTS RESERVED.
- */
-
-#include <unistd.h> 
-#ifdef __CYGWIN__
-#include <windows.h>
-#endif
-
-char *
-get_high_address()
-{
-#ifdef __CYGWIN__
-       return VirtualAlloc (NULL, 4096, MEM_COMMIT, PAGE_NOACCESS) + 2048;
-#else
-       return (char *)sbrk(0) + 16384;
-#endif
-}
diff --git a/winsup/testsuite/libltp/lib/libtestsuite.c b/winsup/testsuite/libltp/lib/libtestsuite.c
deleted file mode 100644
index e741d25f6..000000000
--- a/winsup/testsuite/libltp/lib/libtestsuite.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	libtestsuite.c
- *
- * DESCRIPTION
- *	file containing generic routines which are used by some of the LTP
- *	testsuite tests. Currently, the following routines are present in
- *	this library:
- *
- *	my_getpwnam(), do_file_setup()
- *
- */
-#include <pwd.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include "test.h"
-#include "usctest.h"
-
-struct passwd *
-my_getpwnam(char *name)
-{
-	struct passwd *saved_pwent;
-	struct passwd *pwent;
-
-	if ((pwent = getpwnam(name)) == NULL) {
-		perror("getpwnam");
-		tst_brkm(TBROK, NULL, "getpwnam() failed");
-	}
-	saved_pwent = (struct passwd *)malloc(sizeof(struct passwd));
-
-	*saved_pwent = *pwent;
-
-	return(saved_pwent);
-}
-
-void
-do_file_setup(char *fname)
-{
-	int fd;
-
-	if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-		tst_resm(TBROK, "open(%s, O_RDWR|O_CREAT,0700) Failed, "
-			 "errno=%d : %s", fname, errno, strerror(errno));
-	}
-
-	if (close(fd) == -1) {
-		tst_resm(TWARN, "close(%s) Failed on file create, errno=%d : "
-			 "%s", fname, errno, strerror(errno));
-	}
-}
diff --git a/winsup/testsuite/libltp/lib/open_flags.c b/winsup/testsuite/libltp/lib/open_flags.c
deleted file mode 100644
index 3105955d4..000000000
--- a/winsup/testsuite/libltp/lib/open_flags.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/**************************************************************
- *
- *    OS Testing - Silicon Graphics, Inc.
- *
- *    FUNCTION NAME     : parse_open_flags
- *			  openflags2symbols
- *
- *    FUNCTION TITLE    : converts open flag symbols into bitmask
- *			  converts open flag bitmask into symbols
- *
- *    SYNOPSIS:
- *      int parse_open_flags(symbols, badname)
- *	char *symbols;
- *	char **badname;
- *
- *      char *openflags2symbols(openflags, sep, mode)
- *	int openflags;
- *	char *sep;
- *	int mode;
- *
- *    AUTHOR            : Richard Logan
- *
- *    CO-PILOT(s)       : Dean Roehrich
- *
- *    INITIAL RELEASE   : UNICOS 8.0
- *
- *    DESIGN DESCRIPTION
- *	The parse_open_flags function can be used to convert
- *	a list of comma separated open(2) flag symbols (i.e. O_TRUNC)
- *	into the bitmask that can be used by open(2).
- *	If a symbol is unknown and <badname> is not NULL, <badname>
- *	will updated to point that symbol in <string>.
- *	Parse_open_flags will return -1 on this error.
- *      Otherwise parse_open_flags will return the open flag bitmask.
- *	If parse_open_flags returns, <string> will left unchanged.
- *
- * 	The openflags2symbols function attempts to convert open flag
- *	bits into human readable  symbols (i.e. O_TRUNC).  If there 
- *	are more than one symbol, the <sep> string will be placed as
- *	a separator between symbols.  Commonly used separators would
- *	be a comma "," or pipe "|".  If <mode> is one and not all 
- *	<openflags> bits can be converted to symbols, the "UNKNOWN"
- *	symbol will be added to return string.
- * 	Openflags2symbols will return the indentified symbols.
- * 	If no symbols are recognized the return value will be a empty
- * 	string or the "UNKNOWN" symbol.
- *
- *    SPECIAL REQUIREMENTS
- *	None.
- *
- *    UPDATE HISTORY
- *      This should contain the description, author, and date of any
- *      "interesting" modifications (i.e. info should helpful in
- *      maintaining/enhancing this module).
- *      username     description
- *      ----------------------------------------------------------------
- *	rrl    This code was first created during the beginning
- *		of the SFS testing days.  I think that was in 1993.
- *	       This code was updated in 05/96.
- *		(05/96)  openflags2symbols was written.
- *
- *    BUGS/LIMITATIONS
- * 	Currently (05/96) all known symbols are coded into openflags2symbols.
- * 	If new open flags are added this code will have to updated
- * 	to know about them or they will not be recognized.
- *
- **************************************************************/
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/param.h>
-#include <string.h> /* strcat */
-#include "open_flags.h"
-
-#define UNKNOWN_SYMBOL	"UNKNOWN"
-
-static char Open_symbols[512];	  /* space for openflags2symbols return value */
-
-struct open_flag_t {
-    const char *symbol;
-    int  flag;
-};
-
-static struct open_flag_t Open_flags[] = {
-    { "O_RDONLY",	O_RDONLY },
-    { "O_WRONLY",	O_WRONLY },
-    { "O_RDWR",		O_RDWR },
-    { "O_SYNC",		O_SYNC },
-    { "O_CREAT",	O_CREAT },
-    { "O_TRUNC",	O_TRUNC },
-    { "O_EXCL",		O_EXCL },
-    { "O_APPEND",	O_APPEND },
-    { "O_NONBLOCK",	O_NONBLOCK },
-#if O_NOCTTY
-    { "O_NOCTTY",	O_NOCTTY },
-#endif
-#if O_DSYNC
-    { "O_DSYNC",	O_DSYNC },
-#endif
-#if O_RSYNC
-    { "O_RSYNC",	O_RSYNC },
-#endif
-#if O_ASYNC
-    { "O_ASYNC",	O_ASYNC },
-#endif
-#if O_PTYIGN
-    { "O_PTYIGN",	O_PTYIGN },
-#endif
-#if O_NDELAY
-    { "O_NDELAY",	O_NDELAY },
-#endif
-#if O_RAW
-    { "O_RAW",		O_RAW },
-#endif
-#ifdef O_SSD
-    { "O_SSD",		O_SSD },
-#endif
-#if O_BIG
-    { "O_BIG",		O_BIG },
-#endif
-#if O_PLACE
-    { "O_PLACE",	O_PLACE },
-#endif
-#if O_RESTART
-    { "O_RESTART",	O_RESTART },
-#endif
-#if O_SFSXOP
-    { "O_SFSXOP",	O_SFSXOP },
-#endif
-#if O_SFS_DEFER_TM
-    { "O_SFS_DEFER_TM",	O_SFS_DEFER_TM },
-#endif
-#if O_WELLFORMED
-    { "O_WELLFORMED",	O_WELLFORMED },
-#endif
-#if O_LDRAW
-    { "O_LDRAW",	O_LDRAW },
-#endif
-#if O_T3D
-    { "O_T3D",	O_T3D },
-#endif /* O_T3D */
-#if O_PARALLEL
-    { "O_PARALLEL",	O_PARALLEL },
-    { "O_FSA",	O_PARALLEL|O_WELLFORMED|O_RAW },	/* short cut */
-#endif /* O_PARALLEL */
-#ifdef O_LARGEFILE
-    { "O_LARGEFILE",	O_LARGEFILE },
-#endif
-#ifdef O_DIRECT
-    { "O_DIRECT",	O_DIRECT },
-#endif
-#ifdef O_PRIV
-    { "O_PRIV",		O_PRIV },
-#endif
-
-};
-
-int 
-parse_open_flags(char *string, char **badname)
-{
-   int  bits = 0;
-   char *name;
-   char *cc;
-   char savecc;
-   int  found;
-   int  ind;
-
-   name=string;
-   cc=name;
-
-   while ( 1 ) {
-
-      for(; ((*cc != ',') && (*cc != '\0')); cc++);
-      savecc = *cc;
-      *cc = '\0';
-
-      found = 0;
-
-      for(ind=0; ind < sizeof(Open_flags)/sizeof(struct open_flag_t); ind++) {
-          if ( strcmp(name, Open_flags[ind].symbol) == 0 ) {
-              bits |= Open_flags[ind].flag;
-	      found=1;
-	      break;
-	  }
-      }
-
-      *cc = savecc;	/* restore string */
-
-      if ( found == 0 ) {	/* invalid name */
-         if ( badname != NULL )
-           *badname = name;
-         return -1;
-      }
-
-      if ( savecc == '\0' )
-	break;
-
-      name = ++cc;
-
-   }	/* end while */
-
-   return bits;
-
-}	/* end of parse_open_flags */
-
-
-char *
-openflags2symbols(int openflags, char *sep, int mode)
-{
-    int ind;
-    int size;
-    int bits = openflags;
-    int havesome=0;
-
-    Open_symbols[0]='\0';
-
-    size=sizeof(Open_flags)/sizeof(struct open_flag_t);
-
-    /*
-     * Deal with special case of O_RDONLY.  If O_WRONLY nor O_RDWR
-     * bits are not set, assume O_RDONLY.
-     */
-
-    if ( (bits & (O_WRONLY | O_RDWR)) == 0 ) {
-	strcat(Open_symbols, "O_RDONLY");
-	havesome=1;
-    }
-
-    /*
-     *  Loop through all but O_RDONLY elments of Open_flags
-     */
-    for(ind=1; ind < size; ind++) {
-	  
-	if ( (bits & Open_flags[ind].flag) == Open_flags[ind].flag ) {
-	    if ( havesome ) 
-		strcat(Open_symbols, sep);
-
-	    strcat(Open_symbols, Open_flags[ind].symbol);
-	    havesome++;
-
-	    /* remove flag bits from bits */
-	    bits = bits & (~Open_flags[ind].flag);
-	}
-    }
-
-    /*
-     * If not all bits were identified and mode was equal to 1,
-     * added UNKNOWN_SYMBOL to return string
-     */
-    if ( bits && mode == 1 )  {    /* not all bits were identified */
-        if ( havesome )
-            strcat(Open_symbols, sep);
-	strcat(Open_symbols,  UNKNOWN_SYMBOL);
-    }
-
-    return Open_symbols;
-
-}   /* end of openflags2symbols */
-
-
-#ifdef UNIT_TEST
-
-/*
- * The following code provides a UNIT test main for
- * parse_open_flags and openflags2symbols functions.
- */
-
-int
-main(argc, argv)
-int argc;
-char **argv;
-{
-    int bits;
-    int ret;
-    char *err;
-
-    if (argc == 1 ) {
-	printf("Usage: %s openflagsbits\n\t%s symbols\n", argv[0], argv[0]);
-	exit(1);
-    }
-
-    if ( sscanf(argv[1], "%i", &bits) == 1 ) {
-	printf("openflags2symbols(%#o, \",\", 1) returned %s\n",
-	    bits, openflags2symbols(bits, ",", 1));
-	
-    } else {
-	ret=parse_open_flags(argv[1], &err);
-	if ( ret == -1 )
-	    printf("parse_open_flags(%s, &err) returned -1, err = %s\n", 
-	        argv[0], err);
-        else
-	    printf("parse_open_flags(%s, &err) returned %#o\n", argv[0], ret);
-    }
-
-    exit(0);
-}
-
-#endif /* end of UNIT_TEST */
diff --git a/winsup/testsuite/libltp/lib/parse_opts.c b/winsup/testsuite/libltp/lib/parse_opts.c
deleted file mode 100644
index 4a8058938..000000000
--- a/winsup/testsuite/libltp/lib/parse_opts.c
+++ /dev/null
@@ -1,876 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-
-/* $Id$ */
-
-/**********************************************************
- * 
- *    OS Testing - Silicon Graphics, Inc.
- * 
- *    FUNCTION NAME 	: parse_opts
- * 
- *    FUNCTION TITLE	: parse standard & user options for system call tests
- * 
- *    SYNOPSIS:
- *	#include "usctest.h"
- *
- * 	char *parse_opts(ac, av, user_optarr, uhf)
- *	int    ac;
- * 	char **av;
- *	option_t user_optarr[];
- *	void (*uhf)();
- * 
- *    AUTHOR		: William Roske/Richard Logan
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    DESCRIPTION
- * 	The parse_opts library routine takes that argc and argv parameters
- *	recevied by main() and an array of structures defining user options.
- *	It parses the command line setting flag and argument locations
- *      associated with the options.  It uses getopt to do the actual cmd line
- *      parsing.  uhf() is a function to print user define help
- *
- *      This module contains the functions usc_global_setup_hook and
- *      usc_test_looping, which are called by marcos defined in usctest.h.
- * 
- *    RETURN VALUE
- * 	parse_opts returns a pointer to an error message if an error occurs.
- *	This pointer is (char *)NULL if parsing is successful.
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-#include <errno.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#ifdef __CYGWIN__
-#include <getopt.h>
-#endif
-
-
-#if UNIT_TEST
-#include <time.h>
-#endif /* UNIT_TEST */
-
-#include "test.h"
-#define _USC_LIB_   1	/* indicates we are the library to the usctest.h include */
-#include "usctest.h"
-
-#ifndef USC_COPIES
-#define USC_COPIES   "USC_COPIES"
-#endif
-
-#ifndef UNIT_TEST
-#define UNIT_TEST	0
-#endif
-
-#ifndef DEBUG
-#define DEBUG	0
-#endif
-
-/*
- * Code from usctest.h that not part of this file since we are the library.
- */
-
-struct usc_errno_t TEST_VALID_ENO[USC_MAX_ERRNO];
-
-  /***********************************************************************
-   * Globals for returning the return code and errno from the system call
-   * test macros.
-   ***********************************************************************/
-int TEST_RETURN;
-int TEST_ERRNO;
-
-  /***********************************************************************
-   * temporary variables for determining max and min times in TEST macro
-   ***********************************************************************/
-long btime, etime, tmptime;
-
-/* The timing information block. */
-struct tblock tblock={0,((long) -1)>>1,0,0};
-
-
-/* Define flags and args for standard options */
-int STD_FUNCTIONAL_TEST=1,	/* flag indicating to do functional testing code */
-    STD_TIMING_ON=0,		/* flag indicating to print timing stats */
-    STD_PAUSE=0,		/* flag indicating to pause before actual start, */
-				/* for contention mode */
-    STD_INFINITE=0,		/* flag indciating to loop forever */
-    STD_LOOP_COUNT=1,		/* number of iterations */
-    STD_COPIES=1,		/* number of copies */
-    STD_ERRNO_LOG=0;		/* flag indicating to do errno logging */
-
-float STD_LOOP_DURATION=0.0,    /* duration value in fractional seconds */
-      STD_LOOP_DELAY=0.0;	/* loop delay value in fractional seconds */
-
-
-char **STD_opt_arr = NULL;	/* array of option strings */
-int    STD_nopts=0,		/* number of elements in STD_opt_arr */
-       STD_argind=1;		/* argv index to next argv element */
-				/* (first argument) */
-				/* To getopt users, it is like optind */
-
-/*
- * The following variables are to support system testing additions.
- */
-static int  STD_TP_barrier=0;	/* flag to do barrier in TEST_PAUSE */
-				/* 2 - wait_barrier(), 3 - set_barrier(), * - barrier() */
-static int  STD_LP_barrier=0;	/* flag to do barrier in TEST_LOOPING */
-				/* 2 - wait_barrier(), 3 - set_barrier(), * - barrier() */
-static int  STD_TP_shmem_sz=0;	/* shmalloc this many words per pe in TEST_PAUSE */
-static int  STD_LD_shmem=0; 	/* flag to do shmem_puts and shmem_gets during delay */
-static int  STD_LP_shmem=0; 	/* flag to do shmem_puts and gets during TEST_LOOPING */
-static int  STD_LD_recfun=0;	/* do recressive function calls in loop delay */
-static int  STD_LP_recfun=0;	/* do recressive function calls in TEST_LOOPING */
-static int  STD_TP_sbrk=0;	/* do sbrk in TEST_PAUSE */
-static int  STD_LP_sbrk=0;	/* do sbrk in TEST_LOOPING */
-static char *STD_start_break=0; /* original sbrk size */
-static int  Debug=0;
-
-struct std_option_t {
-    const char *optstr;
-    const char *help;
-    char *flag;
-    char **arg;
-} std_options[] = {
-    { "c:", "  -c n    Run n copies concurrently\n", NULL, NULL},
-    { "e" , "  -e      Turn on errno logging\n", NULL, NULL},
-    { "f" , "  -f      Turn off functional testing\n", NULL, NULL},
-    { "h" , "  -h      Show this help screen\n", NULL, NULL},
-    { "i:", "  -i n    Execute test n times\n", NULL, NULL},
-    { "I:", "  -I x    Execute test for x seconds\n", NULL, NULL},
-    { "p" , "  -p      Pause for SIGUSR1 before starting\n", NULL, NULL}, 
-    { "P:", "  -P x    Pause for x seconds between iterations\n", NULL, NULL},
-    { "t" , "  -t      Turn on syscall timing\n", NULL, NULL},
-    {NULL, NULL, NULL, NULL}};
-
-void print_help(void (*user_help)());
-
-/*
- * Structure for usc_recressive_func argument
- */
-struct usc_bigstack_t {
-   char space[4096];
-};
-
-static struct usc_bigstack_t *STD_bigstack=NULL;
-
-/*
- * Counter of errnos returned (-e option).  Indexed by errno.
- * Make the array USC_MAX_ERRNO long.  That is the first Fortran
- * Lib errno.  No syscall should return an errno that high.
- */
-int STD_ERRNO_LIST[USC_MAX_ERRNO];
-
-/* define the string length for Mesg and Mesg2 strings */
-#define STRLEN 2048
-
-static char Mesg2[STRLEN];	/* holds possible return string */
-static void usc_recressive_func();
-
-/*
- * Define bits for options that might have env variable default
- */
-#define  OPT_iteration 		01
-#define  OPT_nofunccheck	02
-#define  OPT_duration		04
-#define  OPT_delay		010
-#define  OPT_copies		020
-
-
-/**********************************************************************
- * parse_opts: 
- **********************************************************************/
-const char *
-parse_opts(int ac, char **av, option_t *user_optarr, void (*uhf)())
-{
-    int found;		/* flag to indicate that an option specified was */
-			/* found in the user's list */
-    int k;		/* scratch integer for returns and short time usage */
-    float  ftmp;	/* tmp float for parsing env variables */
-    char *ptr;		/* used in getting env variables */
-    int options=0;	/* no options specified */
-    int optstrlen, i;
-    char *optionstr;
-    int opt;		/* return of getopt */
-
-    /*
-     * If not the first time this function is called, release the old STD_opt_arr
-     * vector.
-     */
-
-    if ( STD_opt_arr != NULL ) {
-	free(STD_opt_arr);
-	STD_opt_arr=NULL;
-    }
-    /* Calculate how much space we need for the option string */
-    optstrlen = 0;
-    for (i = 0; std_options[i].optstr; ++i) 
-	optstrlen += strlen(std_options[i].optstr);
-    if (user_optarr)
-	for (i = 0; user_optarr[i].option; ++i) {
-	    if (strlen(user_optarr[i].option) > 2)
-		return "parse_opts: ERROR - Only short options are allowed";
-	    optstrlen += strlen(user_optarr[i].option);
-	}
-    optstrlen += 1;
-
-    /* Create the option string for getopt */
-    optionstr = (char *)malloc(optstrlen);
-    if (!optionstr) 
-	return "parse_opts: ERROR - Could not allocate memory for optionstr";
-
-    optionstr[0] = '\0';
-
-    for (i = 0; std_options[i].optstr; ++i)
-	strcat(optionstr, std_options[i].optstr);
-    if (user_optarr)
-	for (i = 0; user_optarr[i].option; ++i)
-	    /* only add the option if it wasn't there already */
-	    if (strchr(optionstr, user_optarr[i].option[0]) == NULL) 
-		strcat(optionstr, user_optarr[i].option);
-
-#if DEBUG > 1
-    printf("STD_nopts = %d\n", STD_nopts);
-#endif
-
-    /*
-     *  Loop through av parsing options.
-     */
-    while ( (opt = getopt(ac, av, optionstr)) > 0) {
-
-	STD_argind = optind;
-#if DEBUG > 0
-	printf("parse_opts: getopt returned '%c'\n", opt);
-#endif
-
-	switch (opt) {
-		case '?': /* Unknown option */
-			return "Unknown option";
-			break;
-		case ':': /* Missing Arg */
-			return "Missing argument";
-			break;
-		case 'i': /* Iterations */
-			options |= OPT_iteration;
-			STD_LOOP_COUNT = atoi(optarg);
-			if (STD_LOOP_COUNT == 0) STD_INFINITE = 1;
-			break;
-		case 'P': /* Delay between iterations */
-			options |= OPT_delay;
-			STD_LOOP_DELAY = atof(optarg);
-			break;
-		case 'I': /* Time duration */
-			options |= OPT_duration;
-			STD_LOOP_DURATION = atof(optarg);
-			if ( STD_LOOP_DURATION == 0.0 ) STD_INFINITE=1; 
-			break;
-		case 'c': /* Copies */
-			options |= OPT_copies;
-			STD_COPIES = atoi(optarg);
-			break;
-		case 'f': /* Functional testing */
-			STD_FUNCTIONAL_TEST = 0;
-			break;
-		case 'p': /* Pause for SIGUSR1 */
-			STD_PAUSE = 1;
-			break;
-		case 't': /* syscall timing */
-			STD_TIMING_ON = 1;
-			break;
-		case 'e': /* errno loggin */
-			STD_ERRNO_LOG = 1;
-			break;
-		case 'h': /* Help */
-			print_help(uhf);
-			exit(0);
-			break;
-		default:
-			
-            /* Check all the user specified options */
-            found=0;
-	    for(i = 0; user_optarr[i].option; ++i) {
-
-		if (opt == user_optarr[i].option[0]) {
-                    /* Yup, This is a user option, set the flag and look for argument */
-		    if ( user_optarr[i].flag ) {
-                        *user_optarr[i].flag=1;
-		    }
-                    found++;
-
-		    /* save the argument at the user's location */
-                    if ( user_optarr[i].option[strlen(user_optarr[i].option)-1] == ':' ) {  
-                        *user_optarr[i].arg=optarg;
-                    }
-                    break;  /* option found - break out of the for loop */
-                }
-            }
-	    /* This condition "should never happen".  SO CHECK FOR IT!!!! */
-            if ( ! found ) { 
-                sprintf(Mesg2,
-		    "parse_opts: ERROR - option:\"%c\" NOT FOUND... INTERNAL ERROR", opt);
-                return(Mesg2);
-            }
-	}
-
-    }    /* end of while */
-
-    STD_argind = optind;
-
-    /*
-     * Turn on debug
-     */
-    if ( (ptr=getenv("USC_DEBUG")) != NULL ) {
-	Debug=1;
-        printf("env USC_DEBUG is defined, turning on debug\n");
-    }
-    if ( (ptr=getenv("USC_VERBOSE")) != NULL ) {
-	Debug=1;
-        printf("env USC_VERBOSE is defined, turning on debug\n");
-    }
-
-    /*
-     * If the USC_ITERATION_ENV environmental variable is set to
-     * a number, use that number as iteration count (same as -c option).
-     * The -c option with arg will be used even if this env var is set.
-     */
-    if ( !(options & OPT_iteration) && (ptr=getenv(USC_ITERATION_ENV)) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1) {
-            if ( k == 0 ) {   /* if arg is 0, set infinite loop flag */
-                STD_INFINITE=1;
-		if ( Debug )
-		   printf("Using env %s, set STD_INFINITE to 1\n",
-			USC_ITERATION_ENV);
-            } else {            /* else, set the loop count to the arguement */
-                STD_LOOP_COUNT=k;
-		if ( Debug )
-		   printf("Using env %s, set STD_LOOP_COUNT to %d\n",
-			USC_ITERATION_ENV, k);
-            }
-        }
-    }
-
-    /*
-     * If the USC_NO_FUNC_CHECK environmental variable is set, we'll
-     * unset the STD_FUNCTIONAL_TEST variable.
-     */
-    if ( !(options & OPT_nofunccheck) && (ptr=getenv(USC_NO_FUNC_CHECK)) != NULL ) {
-        STD_FUNCTIONAL_TEST=0; /* Turn off functional testing */
-	if ( Debug )
-	    printf("Using env %s, set STD_FUNCTIONAL_TEST to 0\n",
-		USC_NO_FUNC_CHECK);
-    }
-
-    /*
-     * If the USC_LOOP_WALLTIME environmental variable is set,
-     * use that number as duration (same as -I option).
-     * The -I option with arg will be used even if this env var is set.
-     */
-
-    if ( !(options & OPT_duration) && (ptr=getenv(USC_LOOP_WALLTIME)) != NULL ) {
-        if ( sscanf(ptr, "%f", &ftmp) == 1 && ftmp >= 0.0 ) {
-	    STD_LOOP_DURATION=ftmp;
-	    if ( Debug )
-	        printf("Using env %s, set STD_LOOP_DURATION to %f\n",
-		    USC_LOOP_WALLTIME, ftmp);
-            if ( STD_LOOP_DURATION == 0.0 ) {   /* if arg is 0, set infinite loop flag */
-                STD_INFINITE=1;
-	        if ( Debug )
-	            printf("Using env %s, set STD_INFINITE to 1\n", USC_LOOP_WALLTIME);
-	    }
-        }
-    }
-    if ( !(options & OPT_duration) && (ptr=getenv("USC_DURATION")) != NULL ) {
-        if ( sscanf(ptr, "%f", &ftmp) == 1 && ftmp >= 0.0 ) {
-	    STD_LOOP_DURATION=ftmp;
-	    if ( Debug )
-	        printf("Using env USC_DURATION, set STD_LOOP_DURATION to %f\n", ftmp);
-            if ( STD_LOOP_DURATION == 0.0 ) {   /* if arg is 0, set infinite loop flag */
-                STD_INFINITE=1;
-	        if ( Debug )
-	            printf("Using env USC_DURATION, set STD_INFINITE to 1\n");
-	    }
-        }
-    }
-    /*
-     * If the USC_LOOP_DELAY environmental variable is set,
-     * use that number as delay in factional seconds (same as -P option).
-     * The -P option with arg will be used even if this env var is set.
-     */
-    if ( !(options & OPT_delay) && (ptr=getenv(USC_LOOP_DELAY)) != NULL ) {
-        if ( sscanf(ptr, "%f", &ftmp) == 1 && ftmp >= 0.0 ) {
-	    STD_LOOP_DELAY=ftmp;
-	    if ( Debug )
-		printf("Using env %s, set STD_LOOP_DELAY = %f\n",
-		    USC_LOOP_DELAY, ftmp);
-        }
-    }
-
-    /*
-     * If the USC_COPIES environmental variable is set,
-     * use that number as copies (same as -c option).
-     * The -c option with arg will be used even if this env var is set.
-     */
-    if ( !(options & OPT_copies) && (ptr=getenv(USC_COPIES)) != NULL ) {
-        if ( sscanf(ptr, "%d", &STD_COPIES) == 1 && STD_COPIES >= 0 ) {
-	    if ( Debug )
-		printf("Using env %s, set STD_COPIES = %d\n",
-		    USC_COPIES, STD_COPIES);
-        }
-    }
-
-    /*
-     * The following are special system testing envs to turn on special
-     * hooks in the code.
-     */
-    if ( (ptr=getenv("USC_TP_BARRIER")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
-	    STD_TP_barrier=k;
-	}
-        else
-	    STD_TP_barrier=1;
-	if ( Debug )
-	    printf("using env USC_TP_BARRIER, Set STD_TP_barrier to %d\n",
-	        STD_TP_barrier);
-    }
-
-    if ( (ptr=getenv("USC_LP_BARRIER")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
-	    STD_LP_barrier=k;
-	}
-        else
-	    STD_LP_barrier=1;
-	if ( Debug ) 
-	    printf("using env USC_LP_BARRIER, Set STD_LP_barrier to %d\n",
-	        STD_LP_barrier);
-    }
-
-    if ( (ptr=getenv("USC_TP_SHMEM")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
-            STD_TP_shmem_sz=k;
-	    if ( Debug )
-	        printf("Using env USC_TP_SHMEM, Set STD_TP_shmem_sz to %d\n",
-		    STD_TP_shmem_sz);
-        }
-    }
-
-    if ( (ptr=getenv("USC_LP_SHMEM")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
-            STD_LP_shmem=k;
-	    if ( Debug )
-	        printf("Using env USC_LP_SHMEM, Set STD_LP_shmem to %d\n",
-		    STD_LP_shmem);
-        }
-    }
-
-    if ( (ptr=getenv("USC_LD_SHMEM")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
-            STD_LD_shmem=k;
-	    if ( Debug )
-	        printf("Using env USC_LD_SHMEM, Set STD_LD_shmem to %d\n",
-		    STD_LD_shmem);
-        }
-    }
-
-    if ( (ptr=getenv("USC_TP_SBRK")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
-            STD_TP_sbrk=k;
-	    if ( Debug )
-	        printf("Using env USC_TP_SBRK, Set STD_TP_sbrk to %d\n",
-		    STD_TP_sbrk);
-        }
-    }
-
-    if ( (ptr=getenv("USC_LP_SBRK")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
-            STD_LP_sbrk=k;
-	    if ( Debug )
-	        printf("Using env USC_LP_SBRK, Set STD_LP_sbrk to %d\n",
-		    STD_LP_sbrk);
-        }
-    }
-
-    if ( (ptr=getenv("USC_LP_RECFUN")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
-	    STD_LP_recfun=k;
-	    if ( STD_bigstack != (struct usc_bigstack_t *)NULL )
-		STD_bigstack=(struct usc_bigstack_t *)
-			malloc(sizeof(struct usc_bigstack_t));
-	    if ( Debug )
-                printf("Using env USC_LP_RECFUN, Set STD_LP_recfun to %d\n",
-		    STD_LP_recfun);
-        }
-    }
-
-    if ( (ptr=getenv("USC_LD_RECFUN")) != NULL ) {
-        if ( sscanf(ptr, "%i", &k) == 1 && k >= 0 ) {
-	    STD_LD_recfun=k;
-	    if ( STD_bigstack != (struct usc_bigstack_t *)NULL )
-		STD_bigstack=(struct usc_bigstack_t *)
-			malloc(sizeof(struct usc_bigstack_t));
-	    if ( Debug )
-                printf("Using env USC_LD_RECFUN, Set STD_LD_recfun to %d\n",
-		    STD_LD_recfun);
-        }
-    }
- 
-#if UNIT_TEST
-    printf("The following variables after option and env parsing:\n");
-    printf("STD_FUNCTIONAL_TEST = %d\n", STD_FUNCTIONAL_TEST);
-    printf("STD_LOOP_DURATION   = %f\n", STD_LOOP_DURATION);
-    printf("STD_LOOP_DELAY      = %f\n", STD_LOOP_DELAY);
-    printf("STD_COPIES          = %d\n", STD_COPIES);
-    printf("STD_LOOP_COUNT      = %d\n", STD_LOOP_COUNT);
-    printf("STD_INFINITE        = %d\n", STD_INFINITE);
-    printf("STD_TIMING_ON       = %d\n", STD_TIMING_ON);
-    printf("STD_ERRNO_LOG       = %d\n", STD_ERRNO_LOG);
-    printf("STD_PAUSE           = %d\n", STD_PAUSE);
-#endif
-
-    return((char *) NULL);
-
-}    /* end of parse_opts */
-
-/*********************************************************************
- * print_help() - print help message and user help message
- *********************************************************************/
-void print_help(void (*user_help)())
-{
-    STD_opts_help();
-
-    if (user_help) user_help();
-}
-
-/*********************************************************************
- * STD_opts_help() - return a help string for the STD_OPTIONS.
- *********************************************************************/
-void
-STD_opts_help()
-{
-    int i;
-
-    for(i = 0; std_options[i].optstr; ++i) {
-	if (std_options[i].help)
-	    printf(std_options[i].help);
-    }
-}
-
-/* 
- * routine to goto when we get the SIGUSR1 for STD_PAUSE
- */
-void STD_go(int sig)
-{
-   return;
-}
-
-/***********************************************************************
- * This function will do desired end of global setup test
- * hooks.
- * Currently it will only do a pause waiting for sigusr1 if
- * STD_PAUSE is set.
- *
- ***********************************************************************/
-int
-usc_global_setup_hook()
-{
-    int cnt;
-    /* temp variable to store old signal action to be restored after pause */
-    int (*_TMP_FUNC)(void);
-
-    /*
-     * Fork STD_COPIES-1 copies.
-     */
-    for(cnt=1;cnt<STD_COPIES;cnt++) {
-        switch(fork() ) {
-	    case -1:
-		fprintf(stderr, "%s: fork() failed, errno:%d %s\n",
-                __FILE__, errno, strerror(errno));
-		break;
-	    case 0:  /* child */
-	        cnt=STD_COPIES;   /* to stop the forking */
-		break;
-
-	    default: /* parent */
-		break;
-	}
-    }
-    
-    /*
-     * pause waiting for sigusr1.
-     */
-    if ( STD_PAUSE ) {                                      
-        _TMP_FUNC = (int (*)())signal(SIGUSR1, STD_go);   
-        pause();                                          
-        signal(SIGUSR1, (void (*)())_TMP_FUNC);          
-    }
-
-
-    if ( STD_TP_sbrk || STD_LP_sbrk) {
-	STD_start_break=sbrk(0);	/* get original sbreak size */
-    }
-
-    if ( STD_TP_sbrk ) {
-	sbrk(STD_TP_sbrk);
-	if ( Debug ) 
-	    printf("after sbrk(%d)\n", STD_TP_sbrk);
-    }
-    return 0;
-}
-
-#define USECS_PER_SEC	1000000  /* microseconds per second */
-
-/***********************************************************************
- * This function returns the number of get_current_time()'s return
- * per second.
- ***********************************************************************/
-
-static int
-get_timepersec()
-{
-    return  USECS_PER_SEC;   /* microseconds per second */
-
-}
-
-/***********************************************************************
- * this function will get current time in microseconds since 1970.
- ***********************************************************************/
-static int
-get_current_time()
-{
-    struct timeval curtime;
-
-    gettimeofday(&curtime, NULL);
-
-    /* microseconds since 1970 */
-    return (curtime.tv_sec*USECS_PER_SEC) + curtime.tv_usec;
-
-
-}
-
-/***********************************************************************
- *
- * This function will determine if test should continue iterating
- * If the STD_INFINITE flag is set, return 1.
- * If the STD_LOOP_COUNT variable is set, compare it against
- * the counter.
- * If the STD_LOOP_DURATION variable is set, compare current time against
- * calculated stop_time.
- * This function will return 1 until all desired looping methods
- * have been met.  
- *
- * counter integer is supplied by the user program.
- ***********************************************************************/
-int
-usc_test_looping(counter)
-int counter;
-{
-    static int first_time = 1;
-    static int stop_time = 0;	/* stop time in rtc or usecs */
-    static int delay;		/* delay in clocks or usecs  */
-    int hz=0;			/* clocks per second or usecs per second */
-    int ct, end;		/* current time, end delay time */
-    int keepgoing=0;		/* used to determine return value */
-
-    /*
-     * If this is the first iteration and we are looping for 
-     * duration of STD_LOOP_DURATION seconds (fractional) or
-     * doing loop delays, get the clocks per second.
-     */
-    if ( first_time ) {
-
-	first_time=0;
-	if ( STD_LOOP_DELAY || STD_LOOP_DURATION ) {
-	    hz = get_timepersec();
-	}
-
-	/*
-	 * If looping for duration, calculate stop time in
-	 * clocks.
-	 */
-	
-	if ( STD_LOOP_DURATION) {
-	    ct=get_current_time();
-	    stop_time=(int)((float)hz * STD_LOOP_DURATION) + ct;
-	}
-
-	/*
-	 * If doing delay each iteration, calcuate the number
-	 * of clocks for each delay.
-	 */
-	if ( STD_LOOP_DELAY ) {
-	    delay=(int)((float)hz * STD_LOOP_DELAY);
-	}
-
-    }
-	
-    /*
-     * if delay each iteration, loop for delay clocks.
-     * This will not be done on first iteration.
-     * The delay will happen before determining if
-     * there will be another iteration.
-     */
-    else if ( STD_LOOP_DELAY ) {
-	ct=get_current_time();
-        end=ct+delay;
-        while ( ct < end ) {
-	    /*
-	     * The following are special test hooks in the delay loop.
-	     */
-	    if ( STD_LD_recfun ) {
-		if ( Debug )
-		    printf("calling usc_recressive_func(0, %d, &STD_bigstack)\n", 
-		        STD_LD_recfun);
-		usc_recressive_func(0, STD_LD_recfun, &STD_bigstack);
-	    }
-
-	    ct=get_current_time();
-	}
-    }
-
-    if ( STD_INFINITE ) {
-	keepgoing++;
-    }
-
-    if ( STD_LOOP_COUNT && counter < STD_LOOP_COUNT ) {
-	keepgoing++;
-    }
-
-    if ( STD_LOOP_DURATION != 0.0 && get_current_time() < stop_time ) {
-	keepgoing++;
-    }
-
-    if ( keepgoing == 0 )
-	return 0;
-
-    /*
-     * The following code allows special system testing hooks.
-     */
-
-    if ( STD_LP_recfun ) {
-	if ( Debug )
-	    printf("calling usc_recressive_func(0, %d, &STD_bigstack)\n", 
-	        STD_LP_recfun);
-	usc_recressive_func(0, STD_LP_recfun, &STD_bigstack);
-    }
-
-    if ( STD_LP_sbrk ) {
-	if ( Debug )
-	    printf("about to do sbrk(%d)\n", STD_LP_sbrk);
-	sbrk(STD_LP_sbrk);
-    }
-
-
-    if ( keepgoing )
-	return 1;
-    else
-        return 0;	/* done - stop iterating */
-}
-
-
-/*
- * This function recressively calls itself max times.
- */ 
-static void
-usc_recressive_func(cnt, max, bstack)
-int cnt;
-int max;
-struct usc_bigstack_t bstack;
-{
-    if ( cnt < max )
-	usc_recressive_func(cnt+1, max, bstack);
-
-}
-
-#if UNIT_TEST
-/******************************************************************************
- * UNIT TEST CODE
- * UNIT TEST CODE
- * 
- * this following code is provide so that unit testing can
- * be done fairly easily.
- ******************************************************************************/
-
-int Help = 0;
-int Help2 = 0;
-char *ptr;
-
-
-
-/* for test specific parse_opts options */
-option_t Options[] = {
-        { "help",  &Help2, NULL },      /* -help option */
-        { "h",  &Help, NULL },          /* -h option */
- 	{ TIMING, NULL, NULL},		/* disable -timing option */
-
-#if INVALID_TEST_CASES
- 	{ "missingflag", NULL, &ptr },  /* error */
- 	{ "missingarg:", &Help, NULL },  /* error */
-#endif  /* INVALID_TEST_CASES */
-
-        { NULL, NULL, NULL }
-};
-
-
-main(argc, argv)
-int argc;
-char **argv;
-{
-    int lc;
-    char *msg;
-    struct timeval t;
-    int cnt;
-
-    if ( (msg=parse_opts(argc, argv,
-			(option_t *) Options)) != (char *) NULL ) {
-	printf("ERROR : %s\n", msg);
-	exit(1);
-    }
-
-    TEST_PAUSE;
-
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-    
-        TEST( gettimeofday(&t, NULL) );
-        printf("iter=%d: sec:%d, usec:%6.6d %s", lc+1, t.tv_sec,
-	    t.tv_usec, ctime(&t.tv_sec));
-    }
-
-
-    TEST_CLEANUP;
-
-    exit(0);
-}
-
-#endif /* UNIT_TEST */
diff --git a/winsup/testsuite/libltp/lib/pattern.c b/winsup/testsuite/libltp/lib/pattern.c
deleted file mode 100644
index 7f4d5873e..000000000
--- a/winsup/testsuite/libltp/lib/pattern.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#include <string.h>
-#include "pattern.h"
-
-/*
- * The routines in this module are used to fill/check a data buffer
- * with/against a known pattern.
- */
-
-int
-pattern_check(buf, buflen, pat, patlen, patshift)
-char	*buf;
-int	buflen;
-char	*pat;
-int	patlen;
-int	patshift;
-{
-    int		nb, ncmp, nleft;
-    char	*cp;
-
-    if (patlen)
-	patshift = patshift % patlen;
-
-    cp = buf;
-    nleft = buflen;
-
-    /*
-     * The following 2 blocks of code are to compare the first patlen
-     * bytes of buf.  We need 2 checks if patshift is > 0 since we
-     * must check the last (patlen - patshift) bytes, and then the
-     * first (patshift) bytes.
-     */
-
-    nb = patlen - patshift;
-    if (nleft < nb) {
-	return (memcmp(cp, pat + patshift, nleft) ? -1 : 0);
-    } else {
-        if (memcmp(cp, pat + patshift, nb))
-	    return -1;
-
-	nleft -= nb;
-	cp += nb;
-    }
-
-    if (patshift > 0) {
-	nb = patshift;
-	if (nleft < nb) {
-	    return (memcmp(cp, pat, nleft) ? -1 : 0);
-	} else {
-	    if (memcmp(cp, pat, nb))
-		return -1;
-
-	    nleft -= nb;
-	    cp += nb;
-	}
-    }
-
-    /*
-     * Now, verify the rest of the buffer using the algorithm described
-     * in the function header.
-     */
-
-    ncmp = cp - buf;
-    while (ncmp < buflen) {
-	nb = (ncmp < nleft) ? ncmp : nleft;
-	if (memcmp(buf, cp, nb))
-	    return -1;
-
-	cp += nb;
-	ncmp += nb;
-	nleft -= nb;
-    }
-
-    return 0;
-}
-
-int
-pattern_fill(buf, buflen, pat, patlen, patshift)
-char	*buf;
-int	buflen;
-char	*pat;
-int	patlen;
-int	patshift;
-{
-    int		trans, ncopied, nleft;
-    char	*cp;
-
-    if (patlen)
-	patshift = patshift % patlen;
-
-    cp = buf;
-    nleft = buflen;
-
-    /*
-     * The following 2 blocks of code are to fill the first patlen
-     * bytes of buf.  We need 2 sections if patshift is > 0 since we
-     * must first copy the last (patlen - patshift) bytes into buf[0]...,
-     * and then the first (patshift) bytes of pattern following them.
-     */
-
-    trans = patlen - patshift;
-    if (nleft < trans) {
-	memcpy(cp, pat + patshift, nleft);
-	return 0;
-    } else {
-	memcpy(cp, pat + patshift, trans);
-	nleft -= trans;
-	cp += trans;
-    }
-
-    if (patshift > 0) {
-        trans = patshift;
-	if (nleft < trans) {
-	    memcpy(cp, pat, nleft);
-	    return 0;
-	} else {
-	    memcpy(cp, pat, trans);
-	    nleft -= trans;
-	    cp += trans;
-	}
-    }
-
-    /*
-     * Now, fill the rest of the buffer using the algorithm described
-     * in the function header comment.
-     */
-
-    ncopied = cp - buf;
-    while (ncopied < buflen) {
-	trans = (ncopied < nleft) ? ncopied : nleft;
-	memcpy(cp, buf, trans);
-	cp += trans;
-	ncopied += trans;
-	nleft -= trans;
-    }
-
-    return(0);
-}
diff --git a/winsup/testsuite/libltp/lib/rmobj.c b/winsup/testsuite/libltp/lib/rmobj.c
deleted file mode 100644
index 63122c446..000000000
--- a/winsup/testsuite/libltp/lib/rmobj.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-
-/* $Id$ */
-
-/**********************************************************
- *
- *    OS Testing - Silicon Graphics, Inc.
- *
- *    FUNCTION NAME     : rmobj()
- *
- *    FUNCTION TITLE    : Remove an object
- *
- *    SYNOPSIS:
- *      int rmobj(char *obj, char **errmsg)
- *
- *    AUTHOR            : Kent Rogers
- *
- *    INITIAL RELEASE   : UNICOS 7.0
- *
- *    USER DESCRIPTION
- *      This routine will remove the specified object.  If the specified
- *      object is a directory, it will recursively remove the directory
- *      and everything underneath it.  It assumes that it has privilege
- *      to remove everything that it tries to remove.  If rmobj() encounters
- *      any problems, and errmsg is not NULL, errmsg is set to point to a
- *      string explaining the error.
- *
- *    DETAILED DESCRIPTION
- *      Allocate space for the directory and its contents
- *      Open the directory to get access to what is in it
- *      Loop through the objects in the directory:
- *        If the object is not "." or "..":
- *          Determine the file type by calling lstat()
- *          If the object is not a directory:
- *            Remove the object with unlink()
- *         Else:
- *            Call rmobj(object) to remove the object's contents
- *            Determine the link count on object by calling lstat()
- *            If the link count >= 3:
- *              Remove the directory with unlink()
- *            Else
- *               Remove the directory with rmdir()
- *      Close the directory and free the pointers
- *
- *    RETURN VALUE
- *      If there are any problems, rmobj() will set errmsg (if it was not
- *      NULL) and return -1.  Otherwise it will return 0.
- *
- ************************************************************/
-#include <errno.h>         /* for errno */
-#include <stdio.h>         /* for NULL */
-#include <stdlib.h>        /* for malloc() */
-#include <string.h>        /* for string function */
-#include <limits.h>        /* for PATH_MAX */
-#include <sys/types.h>     /* for opendir(), readdir(), closedir(), stat() */
-#include <sys/stat.h>      /* for [l]stat() */
-#include <dirent.h>        /* for opendir(), readdir(), closedir() */
-#include <unistd.h>        /* for rmdir(), unlink() */
-#include "rmobj.h"
-
-#define SYSERR strerror(errno)
-
-int
-rmobj(char *obj, char **errmsg)
-{
-   int           ret_val = 0;       /* return value from this routine */
-   DIR           *dir;              /* pointer to a directory */
-   struct dirent *dir_ent;          /* pointer to directory entries */
-   char          dirobj[PATH_MAX];  /* object inside directory to modify */
-   struct stat   statbuf;           /* used to hold stat information */
-   static char   err_msg[1024];     /* error message */
-
-   /* Determine the file type */
-   if ( lstat(obj, &statbuf) < 0 ) {
-      if ( errmsg != NULL ) {
-         sprintf(err_msg, "lstat(%s) failed; errno=%d: %s",
-                 obj, errno, SYSERR);
-         *errmsg = err_msg;
-      }
-      return -1;
-   }
-
-   /* Take appropriate action, depending on the file type */
-   if ( (statbuf.st_mode & S_IFMT) == S_IFDIR ) {
-      /* object is a directory */
-
-      /* Do NOT perform the request if the directory is "/" */
-      if ( !strcmp(obj, "/") ) {
-         if ( errmsg != NULL ) {
-            sprintf(err_msg, "Cannot remove /");
-            *errmsg = err_msg;
-         }
-         return -1;
-      }
-
-      /* Open the directory to get access to what is in it */
-      if ( (dir = opendir(obj)) == NULL ) {
-         if ( rmdir(obj) != 0 ) {
-            if ( errmsg != NULL ) {
-               sprintf(err_msg, "rmdir(%s) failed; errno=%d: %s",
-                       obj, errno, SYSERR);
-               *errmsg = err_msg;
-            }
-            return -1;
-         } else {
-            return 0;
-         }
-      }
-
-      /* Loop through the entries in the directory, removing each one */
-      for ( dir_ent = (struct dirent *)readdir(dir);
-            dir_ent != NULL;
-            dir_ent = (struct dirent *)readdir(dir)) {
-
-         /* Don't remove "." or ".." */
-         if ( !strcmp(dir_ent->d_name, ".") || !strcmp(dir_ent->d_name, "..") )
-            continue;
-
-         /* Recursively call this routine to remove the current entry */
-         sprintf(dirobj, "%s/%s", obj, dir_ent->d_name);
-         if ( rmobj(dirobj, errmsg) != 0 )
-            ret_val = -1;
-      }
-
-      /* Close the directory */
-      closedir(dir);
-
-      /* If there were problems removing an entry, don't attempt to
-         remove the directory itself */
-      if ( ret_val == -1 )
-         return -1;
-
-      /* Get the link count, now that all the entries have been removed */
-      if ( lstat(obj, &statbuf) < 0 ) {
-         if ( errmsg != NULL ) {
-            sprintf(err_msg, "lstat(%s) failed; errno=%d: %s",
-                    obj, errno, SYSERR);
-            *errmsg = err_msg;
-         }
-         return -1;
-      }
-
-      /* Remove the directory itself */
-      if ( statbuf.st_nlink >= 3 ) {
-         /* The directory is linked; unlink() must be used */
-         if ( unlink(obj) < 0 ) {
-            if ( errmsg != NULL ) {
-               sprintf(err_msg, "unlink(%s) failed; errno=%d: %s",
-                       obj, errno, SYSERR);
-               *errmsg = err_msg;
-            }
-            return -1;
-         }
-      } else {
-         /* The directory is not linked; rmdir() can be used */
-         if ( rmdir(obj) < 0 ) {
-            if ( errmsg != NULL ) {
-               sprintf(err_msg, "rmdir(%s) failed; errno=%d: %s",
-                       obj, errno, SYSERR);
-               *errmsg = err_msg;
-            }
-            return -1;
-         }
-      }
-   } else {
-      /* object is not a directory; just use unlink() */
-      if ( unlink(obj) < 0 ) {
-         if ( errmsg != NULL ) {
-            sprintf(err_msg, "unlink(%s) failed; errno=%d: %s",
-                    obj, errno, SYSERR);
-            *errmsg = err_msg;
-         }
-         return -1;
-      }
-   }  /* if obj is a directory */
-
-   /*
-    * Everything must have went ok.
-    */
-   return 0;
-}  /* rmobj() */
diff --git a/winsup/testsuite/libltp/lib/search_path.c b/winsup/testsuite/libltp/lib/search_path.c
deleted file mode 100644
index 775c7b1a6..000000000
--- a/winsup/testsuite/libltp/lib/search_path.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- *	(C) COPYRIGHT CRAY RESEARCH, INC.
- *	UNPUBLISHED PROPRIETARY INFORMATION.
- *	ALL RIGHTS RESERVED.
- */
-/**********************************************************
- * 
- *    UNICOS Feature Test and Evaluation - Cray Research, Inc.
- * 
- *    FUNCTION NAME 	: search_path 
- * 
- *    FUNCTION TITLE	: search PATH locations for desired filename
- * 
- *    SYNOPSIS:
- *	int search_path(cmd, res_path, access_mode, fullpath)
- *	char *cmd;
- *	char *res_path;
- *	int access_mode;
- *	int fullpath;
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    DESCRIPTION
- *	Search_path will walk through PATH and attempt to find "cmd".  If cmd is
- *	a full or relative path, it is checked but PATH locations are not scanned.
- *	search_path will put the resulting path in res_path.  It is assumed
- *	that res_path points to a string that is at least PATH_MAX
- *	(or MAXPATHLEN on the suns) in size.  Access_mode is just as is
- *	says, the mode to be used on access to determine if cmd can be found.
- *	If fullpath is set, res_path will contain the full path to cmd.
- *	If it is not set, res_path may or may not contain the full path to cmd.
- *	If fullpath is not set, the path in PATH prepended to cmd is used,
- *	which could be a relative path.  If fullpath is set, the current
- *	directory is prepended to path/cmd before access is called.
- *	If cmd is found, search_path will return 0.  If cmd cannot be
- *	found, 1 is returned.  If an error has occurred, -1 is returned
- *	and an error mesg is placed in res_path. 
- *	If the length of path/cmd is larger then PATH_MAX, then that path
- *	location is skipped.
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/errno.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-
-extern int errno;
-
-struct stat stbuf;
-
-#ifndef AS_CMD
-#define AS_CMD	0
-#endif
-
-/*
- * Make sure PATH_MAX is defined.  Define it to MAXPATHLEN, if set. Otherwise
- * set it to 1024.
- */
-#ifndef PATH_MAX
-#ifndef MAXPATHLEN
-#define PATH_MAX     1024
-#else  /* MAXPATHLEN */
-#define PATH_MAX     MAXPATHLEN
-#endif  /* MAXPATHLEN */
-#endif  /* PATH_MAX */
-
-
-#if AS_CMD
-main(argc, argv)
-int argc;
-char **argv;
-{
-    char path[PATH_MAX];
-    int ind;
-
-    if (argc <= 1 ) {
-	printf("missing argument\n");
-	exit(1);
-    }
-
-    for(ind=1;ind < argc; ind++) {
-	if ( search_path(argv[ind], path, F_OK, 0) < 0 ) {
-	    printf("ERROR: %s\n", path);
-	}
-	else {
-	    printf("path of %s is %s\n", argv[ind], path);
-	}
-    }
-    
-}
-
-#endif
-
-/*
- */
-int
-search_path(cmd, res_path, access_mode, fullpath)
-const char *cmd;	/* The requested filename */
-char *res_path; /* The resulting path or error mesg */
-int access_mode; /* the mode used by access(2) */
-int fullpath;	/* if set, cwd will be prepended to all non-full paths */
-{
-    char *cp;   /* used to scan PATH for directories */
-    int ret;      /* return value from access */
-    char *pathenv;
-    char tmppath[PATH_MAX];
-    char curpath[PATH_MAX];
-    char *path;
-    int lastpath;
-    int toolong=0;
-
-#if DEBUG
-printf("search_path: cmd = %s, access_mode = %d, fullpath = %d\n", cmd, access_mode, fullpath);
-#endif
-
-    /*
-     * full or relative path was given
-     */
-    if ( (cmd[0] == '/') || ( (cp=strchr(cmd, '/')) != NULL )) {  
-	if ( access(cmd, access_mode) == 0 ) {
-
-	    if ( cmd[0] != '/' ) { /* relative path */
-		if ( getcwd(curpath, PATH_MAX) == NULL ) {
-		    strcpy(res_path, curpath);
-		    return -1;
-		}
-		if ( (strlen(curpath) + strlen(cmd) + 1) > (size_t)PATH_MAX ) {
-		    sprintf(res_path, "cmd (as relative path) and cwd is longer than %d",
-			PATH_MAX);
-		    return -1;
-		}
-		sprintf(res_path, "%s/%s", curpath, cmd);
-	    }
-	    else
-	        strcpy(res_path, cmd);
-	    return 0;
-        }
-	else {
-	    sprintf(res_path, "file %s not found", cmd);
-	    return -1;
-	}
-    }
-
-    /* get the PATH variable */
-    if ( (pathenv=getenv("PATH")) == NULL) {
-        /* no path to scan, return */
-	sprintf(res_path, "Unable to get PATH env. variable");
-        return -1;
-    }
-
-    /*
-     * walk through each path in PATH. 
-     * Each path in PATH is placed in tmppath.  
-     * pathenv cannot be modified since it will affect PATH.
-     * If a signal came in while we have modified the PATH
-     * memory, we could create a problem for the caller.
-     */
-
-    curpath[0]='\0';
-
-    cp = pathenv;
-    path = pathenv;
-    lastpath = 0;
-    for (;;) {
-
-	if ( lastpath )
-	    break;
-
-	if ( cp != pathenv )
-	    path = ++cp;	 /* already set on first iteration */
-
-	/* find end of current path */
-
-	for (; ((*cp != ':') && (*cp != '\0')); cp++);
-
-	/*
-	 * copy path to tmppath so it can be NULL terminated
-	 * and so we do not modify path memory.
-	 */
-	strncpy(tmppath, path, (cp-path) );
-	tmppath[cp-path]='\0';
-#if DEBUG
-printf("search_path: tmppath = %s\n", tmppath);
-#endif
-
-	if ( *cp == '\0' )
-	    lastpath=1;		/* this is the last path entry */
-
-	/* Check lengths so not to overflow res_path */
-	if ( strlen(tmppath) + strlen(cmd) + 2 > (size_t)PATH_MAX ) {
-	    toolong++;
-	    continue;
-	}
-
-	sprintf(res_path, "%s/%s", tmppath, cmd);
-#if DEBUG
-printf("search_path: res_path = '%s'\n", res_path);
-#endif
-
-
-	    /* if the path is not full at this point, prepend the current
-	     * path to get the full path.
-	     * Note:  this could not be wise to do when under a protected
-	     * directory.  
-	     */
-
-	if ( fullpath && res_path[0] != '/' ) {	/* not a full path */
-	    if ( curpath[0] == '\0' ) {
-		if ( getcwd(curpath, PATH_MAX) == NULL ) {
-                    strcpy(res_path, curpath);
-                    return -1;
-	 	}
-            }
-            if ( (strlen(curpath) + strlen(res_path) + 2) > (size_t)PATH_MAX ) {
-		toolong++;
-	        continue;
-            }
-            sprintf(tmppath, "%s/%s", curpath, res_path);
-	    strcpy(res_path, tmppath);
-#if DEBUG
-printf("search_path: full res_path= '%s'\n", res_path);
-#endif
-
-	}
-
-
-	if ( (ret=access(res_path, access_mode)) == 0 ) {
-#if DEBUG
-printf("search_path: found res_path = %s\n", res_path);
-#endif
-	    return 0;
-	}
-    }
-
-    /* return failure */
-    if ( toolong )
-        sprintf(res_path,
-	    "Unable to find file, %d path/file strings were too long", toolong);
-    else
-        strcpy(res_path, "Unable to find file");
-    return 1;	/* not found */
-}
-
diff --git a/winsup/testsuite/libltp/lib/str_to_bytes.c b/winsup/testsuite/libltp/lib/str_to_bytes.c
deleted file mode 100644
index beecb71b6..000000000
--- a/winsup/testsuite/libltp/lib/str_to_bytes.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-#include <stdio.h>
-#include <sys/param.h>
-#include "str_to_bytes.h"
-
-/****************************************************************************
- * str_to_bytes(s)
- *
- * Computes the number of bytes described by string s.  s is assumed to be
- * a base 10 positive (ie. >= 0) number followed by an optional single
- * character multiplier.  The following multipliers are supported:
- *
- *              char    mult
- *              -----------------
- *              b       BSIZE  or BBSIZE
- *              k       1024 bytes
- *              K       1024 * sizeof(long)
- *              m       2^20 (1048576)
- *              M       2^20 (1048576 * sizeof(long)
- *              g       2^30 (1073741824)
- *              G       2^30 (1073741824) * sizeof(long)
- *
- * for instance, "1k" and "1024" would both cause str_to_bytes to return 1024.
- *
- * Returns -1 if mult is an invalid character, or if the integer portion of
- * s is not a positive integer.
- *
- ****************************************************************************/
-
-#if CRAY
-#define B_MULT	BSIZE		/* block size */
-#elif sgi
-#define B_MULT	BBSIZE		/* block size */
-#elif linux
-#define B_MULT	DEV_BSIZE	/* block size */
-#elif __CYGWIN__
-#include <sys/stat.h>
-#define B_MULT S_BLKSIZE	/* block size */
-#endif
-
-
-#define K_MULT	1024		/* Kilo or 2^10 */
-#define M_MULT	1048576		/* Mega or 2^20 */
-#define G_MULT	1073741824	/* Giga or 2^30 */
-#define T_MULT	1099511627776	/* tera or 2^40 */
-
-int
-str_to_bytes(s)
-char    *s;
-{
-    char    mult, junk;
-    int	    nconv;
-    float   num;
-
-    nconv = sscanf(s, "%f%c%c", &num, &mult, &junk);
-    if (nconv == 0 || nconv == 3 )
-	return -1;
-
-    if (nconv == 1)
-	return num;
-
-    switch (mult) {
-    case 'b':
-		return (int)(num * (float)B_MULT);
-    case 'k':
-		return (int)(num * (float)K_MULT);
-    case 'K':
-		return (int)((num * (float)K_MULT) * sizeof(long));
-    case 'm':
-		return (int)(num * (float)M_MULT);
-    case 'M':
-		return (int)((num * (float)M_MULT) * sizeof(long));
-    case 'g':
-		return (int)(num * (float)G_MULT);
-    case 'G':	
-    		return (int)((num * (float)G_MULT) * sizeof(long));
-    default:
-	return -1;
-    }
-}
-
-long
-str_to_lbytes(s)
-char    *s;
-{
-    char    mult, junk;
-    long    nconv;
-    float   num;
-
-    nconv = sscanf(s, "%f%c%c", &num, &mult, &junk);
-    if (nconv == 0 || nconv == 3 )
-	return -1;
-
-    if (nconv == 1)
-	return (long)num;
-
-    switch (mult) {
-    case 'b':
-		return (long)(num * (float)B_MULT);
-    case 'k':
-		return (long)(num * (float)K_MULT);
-    case 'K':
-		return (long)((num * (float)K_MULT) * sizeof(long));
-    case 'm':
-		return (long)(num * (float)M_MULT);
-    case 'M':
-		return (long)((num * (float)M_MULT) * sizeof(long));
-    case 'g':
-		return (long)(num * (float)G_MULT);
-    case 'G':	
-    		return (long)((num * (float)G_MULT) * sizeof(long));
-    default:
-	return -1;
-    }
-}
-
-/*
- * Force 64 bits number when compiled as 32 IRIX binary.
- * This allows for a number bigger than 2G.
- */
-
-long long
-str_to_llbytes(s)
-char    *s;
-{
-    char    mult, junk;
-    long    nconv;
-    double  num;
-
-    nconv = sscanf(s, "%lf%c%c", &num, &mult, &junk);
-    if (nconv == 0 || nconv == 3 )
-	return -1;
-
-    if (nconv == 1)
-	return (long long)num;
-
-    switch (mult) {
-    case 'b':
-		return (long long)(num * (float)B_MULT);
-    case 'k':
-		return (long long)(num * (float)K_MULT);
-    case 'K':
-		return (long long)((num * (float)K_MULT) * sizeof(long long));
-    case 'm':
-		return (long long)(num * (float)M_MULT);
-    case 'M':
-		return (long long)((num * (float)M_MULT) * sizeof(long long));
-    case 'g':
-		return (long long)(num * (float)G_MULT);
-    case 'G':	
-    		return (long long)((num * (float)G_MULT) * sizeof(long long));
-    default:
-	return -1;
-    }
-}
-
-#ifdef UNIT_TEST
-
-main(int argc, char **argv)
-{
-    int ind;
-
-    if (argc == 1 ) {
-	fprintf(stderr, "missing str_to_bytes() parameteres\n");
-	exit(1);
-    }
-   
-    for (ind=1; ind<argc; ind++) {
-
-	printf("str_to_bytes(%s) returned %d\n", 
-	    argv[ind], str_to_bytes(argv[ind]));
-
-	printf("str_to_lbytes(%s) returned %ld\n", 
-	    argv[ind], str_to_lbytes(argv[ind]));
-
-	printf("str_to_llbytes(%s) returned %lld\n", 
-	    argv[ind], str_to_llbytes(argv[ind]));
-    }
-}
-
-#endif
diff --git a/winsup/testsuite/libltp/lib/string_to_tokens.c b/winsup/testsuite/libltp/lib/string_to_tokens.c
deleted file mode 100644
index 6f0d775dd..000000000
--- a/winsup/testsuite/libltp/lib/string_to_tokens.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/**********************************************************
- * 
- *    OS Testing - Silicon Graphics, Inc.
- * 
- *    FUNCTION NAME     : string_to_tokens
- * 
- *    FUNCTION TITLE    : Break a string into its tokens
- * 
- *    SYNOPSIS:
- *
- * int string_to_tokens(arg_string, arg_array, array_size, separator)
- *    char *arg_string;
- *    char *arg_array[];
- *    int array_size;
- *    char *separator;
- * 
- *    AUTHOR            : Richard Logan
- *
- *    DATE		: 10/94
- *
- *    INITIAL RELEASE   : UNICOS 7.0
- * 
- *    DESCRIPTION
- * This function parses the string 'arg_string', placing pointers to
- * the 'separator' separated tokens into the elements of 'arg_array'.
- * The array is terminated with a null pointer.
- * 'arg_array' must contains at least 'array_size' elements.
- * Only the first 'array_size' minus one tokens will be placed into
- * 'arg_array'.  If there are more than 'array_size'-1 tokens, the rest are
- * ignored by this routine.
- *
- *    RETURN VALUE
- * This function returns the number of 'separator' separated tokens that
- * were found in 'arg_string'.
- * If 'arg_array' or 'separator' is NULL or 'array_size' is less than 2, -1 is returned.
- * 
- *    WARNING
- * This function uses strtok() to parse 'arg_string', and thus
- * physically alters 'arg_string' by placing null characters where the
- * separators originally were.
- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-#include <stdio.h>         
-#include <string.h>        /* for string functions */
-#include "string_to_tokens.h"
-
-int
-string_to_tokens(char *arg_string, char *arg_array[], int array_size, char *separator)
-{
-   int num_toks = 0;  /* number of tokens found */
-   char *strtok();
-	
-   if ( arg_array == NULL || array_size <= 1 || separator == NULL )
-	return -1;
-
-   /*
-    * Use strtok() to parse 'arg_string', placing pointers to the
-    * individual tokens into the elements of 'arg_array'.
-    */
-   if ( (arg_array[num_toks] = strtok(arg_string, separator)) == NULL ) {
-	return 0;
-   }
-
-   for (num_toks=1;num_toks<array_size; num_toks++) {
-	if ( (arg_array[num_toks] = strtok(NULL, separator)) == NULL )
-	    break;
-   }
-
-   if ( num_toks == array_size )
-	arg_array[num_toks] = NULL;
-
-   /*
-    * Return the number of tokens that were found in 'arg_string'.
-    */
-   return(num_toks);
-
-} /* end of string_to_tokens */
diff --git a/winsup/testsuite/libltp/lib/tst_res.c b/winsup/testsuite/libltp/lib/tst_res.c
deleted file mode 100644
index 99767ec9b..000000000
--- a/winsup/testsuite/libltp/lib/tst_res.c
+++ /dev/null
@@ -1,960 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-
-
-/* $Id$ */
-
-/**********************************************************
- *
- *    OS Testing - Silicon Graphics, Inc.
- *
- *    FUNCTION NAME     :
- *      tst_res() -       Print result message (include file contents)
- *      tst_resm() -      Print result message
- *      tst_brk() -       Print result message (include file contents)
- *                        and break remaining test cases
- *      tst_brkm() -      Print result message and break remaining test
- *                        cases
- *      tst_brkloop() -   Print result message (include file contents)
- *                        and break test cases remaining in current loop
- *      tst_brkloopm() -  Print result message and break test case
- *                        remaining in current loop
- *      tst_flush() -     Print any messages pending because of
- *                        CONDENSE mode, and flush output stream
- *      tst_exit() -      Exit test with a meaningful exit value.
- *      tst_environ() -   Keep results coming to original stdout
- *
- *    FUNCTION TITLE    : Standard automated test result reporting mechanism
- *
- *    SYNOPSIS:
- *      #include "test.h"
- *
- *      void tst_res(ttype, fname, tmesg [,arg]...)
- *      int  ttype;
- *      char *fname;
- *      char *tmesg;
- *
- *      void tst_resm(ttype, tmesg [,arg]...)
- *      int  ttype;
- *      char *tmesg;
- *
- *      void tst_brk(ttype, fname, cleanup, tmesg, [,argv]...)
- *      int  ttype;
- *      char *fname;
- *      void (*cleanup)();
- *      char *tmesg;
- *
- *      void tst_brkm(ttype, cleanup, tmesg [,arg]...)
- *      int  ttype;
- *      void (*cleanup)();
- *      char *tmesg;
- *
- *      void tst_brkloop(ttype, fname, cleanup, char *tmesg, [,argv]...)
- *      int  ttype;
- *      char *fname;
- *      void (*cleanup)();
- *      char *tmesg;
- *
- *      void tst_brkloopm(ttype, cleanup, tmesg [,arg]...)
- *      int  ttype;
- *      void (*cleanup)();
- *      char *tmesg;
- *
- *      void tst_flush()
- *
- *      void tst_exit()
- *
- *      int  tst_environ()
- *
- *    AUTHOR            : Kent Rogers (from Dave Fenner's original)
- *
- *    CO-PILOT          : Rich Logan
- *
- *    DATE STARTED      : 05/01/90 (rewritten 1/96)
- *
- *    DESCRIPTION
- *      See the man page(s).
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-#include <errno.h>
-#include <stdarg.h>        /* for varargs stuff */
-#include "test.h"          /* for output display mode & result type */
-                           /* defines */
-
-/*
- * Define some useful macros.
- */
-#define VERBOSE      1     /* flag values for the T_mode variable */
-#define CONDENSE     2
-#define NOPASS       3
-#define DISCARD      4
-
-#define MAXMESG      80    /* max length of internal messages */
-#define USERMESG     2048  /* max length of user message */
-#define TRUE         1
-#define FALSE        0
-
-/*
- * EXPAND_VAR_ARGS - Expand the variable portion (arg_fmt) of a result
- *                   message into the specified string.
- */
-#define EXPAND_VAR_ARGS(arg_fmt, str) {   \
-   va_list ap; /* varargs mechanism */    \
-                                          \
-   if ( arg_fmt != NULL ) {               \
-      if ( Expand_varargs == TRUE ) {     \
-         va_start(ap, arg_fmt);           \
-         vsprintf(str, arg_fmt, ap);      \
-         va_end(ap);                      \
-         Expand_varargs = FALSE;          \
-      } else {                            \
-         strcpy(str, arg_fmt);            \
-      }                                   \
-   } else {                               \
-      str[0] = '\0';                      \
-   }                                      \
-}  /* EXPAND_VAR_ARGS() */
-
-/*
- * Define local function prototypes.
- */
-static void check_env();
-static void tst_condense(int tnum, int ttype, char *tmesg);
-static void tst_print(char *tcid, int tnum, int trange, int ttype, const char *tmesg);
-static void cat_file(const char *filename);
-
-
-/*
- * Define some static/global variables.
- */
-static FILE *T_out = NULL;    /* tst_res() output file descriptor */
-static const char *File;      /* file whose contents is part of result */
-static int  T_exitval = 0;    /* exit value used by tst_exit() */
-static int  T_mode = VERBOSE; /* flag indicating print mode: VERBOSE, */
-                              /* CONDENSE, NOPASS, DISCARD */
-
-static int  Expand_varargs = TRUE;  /* if TRUE, expand varargs stuff */
-static char Warn_mesg[MAXMESG];  /* holds warning messages */
-
-/*
- * These are used for condensing output when NOT in verbose mode.
- */
-static int  Buffered = FALSE; /* TRUE if condensed output is currently */
-                              /* buffered (i.e. not yet printed) */
-static char *Last_tcid;       /* previous test case id */
-static int  Last_num;         /* previous test case number */
-static int  Last_type;        /* previous test result type */
-static char *Last_mesg;       /* previous test result message */
-
-
-/*
- * These globals may be externed by the test.
- */
-int Tst_count = 0;      /* current count of test cases executed; NOTE: */
-                        /* Tst_count may be externed by other programs */
-int Tst_lptotal = 0;    /* tst_brkloop() external */
-int Tst_lpstart = 0;    /* tst_brkloop() external */
-int Tst_range = 1;      /* for specifying multiple results */
-int Tst_nobuf = 1;      /* this is a no-op; buffering is never done, but */
-                        /* this will stay for compatibility reasons */
-
-/*
- * These globals must be defined in the test.
- */
-extern char *TCID;      /* Test case identifier from the test source */
-extern int  TST_TOTAL;  /* Total number of test cases from the test */
-                        /* source */
-
-/*
- * This global is used by the temp. dir. maintenance functions,
- * tst_tmpdir()/tst_rmdir(), tst_wildcard()/tst_tr_rmdir().  It is the
- * name of the directory created (if any).  It is defined here, so that
- * it only has to be declared once and can then be referenced from more
- * than one module.  Also, since the temp. dir. maintenance functions
- * rely on the tst_res.c package this seemed like a reasonable place.
- */
-char *TESTDIR = NULL;
-
-/*
- * tst_res() - Main result reporting function.  Handle test information
- *             appropriately depending on output display mode.  Call
- *             tst_condense() or tst_print() to actually print results.
- *             All result functions (tst_resm(), tst_brk(), etc.)
- *             eventually get here to print the results.
- */
-void
-tst_res(int ttype, const char *fname, const char *arg_fmt, ...)
-{
-   int  i;
-   char tmesg[USERMESG];     /* expanded message */
-
-#if DEBUG
-   printf("IN tst_res; Tst_count = %d; Tst_range = %d\n",
-          Tst_count, Tst_range); fflush(stdout);
-#endif
-
-   /*
-    * Expand the arg_fmt string into tmesg, if necessary.
-    */
-   EXPAND_VAR_ARGS(arg_fmt, tmesg);
-
-   /*
-    * Save the test result type by ORing ttype into the current exit
-    * value (used by tst_exit()).
-    */
-   T_exitval |= ttype;
-
-   /*
-    * Unless T_out has already been set by tst_environ(), make tst_res()
-    * output go to standard output.
-    */
-   if ( T_out == NULL )
-       T_out = stdout;
-
-   /*
-    * Check TOUTPUT environment variable (if first time) and set T_mode
-    * flag.
-    */
-   check_env();
-
-   /*
-    * A negative or NULL range is invalid.
-    */
-   if ( Tst_range <= 0 ) {
-      Tst_range = 1;
-      tst_print(TCID, 0, 1, TWARN,
-                "tst_res(): Tst_range must be positive");
-   }
-
-   /*
-    * If a filename was specified, set 'File' if it exists.
-    */
-   if ( fname != NULL && access(fname, F_OK) == 0 )
-      File = fname;
-
-   /*
-    * Set the test case number and print the results, depending on the
-    * display type.
-    */
-   if ( ttype == TWARN || ttype == TINFO ) {
-      /*
-       * Handle WARN and INFO results (test case number is 0).
-       */
-      if ( Tst_range > 1 ) {
-         tst_print(TCID, 0, 1, TWARN,
-                   "tst_res(): Range not valid for TINFO or TWARN types");
-      }
-      tst_print(TCID, 0, 1, ttype, tmesg);
-   } else {
-      /*
-       * Handle all other types of results other than WARN and INFO.
-       */
-      if ( Tst_count < 0 )
-         tst_print(TCID, 0, 1, TWARN,
-                   "tst_res(): Tst_count < 0 is not valid");
-
-      /*
-       * Process each display type.
-       */
-      switch ( T_mode ) {
-      case DISCARD:
-         /* do not print any results */
-         break;
-
-      case NOPASS:   /* passing result types are filtered by tst_print() */
-      case CONDENSE:
-         tst_condense(Tst_count + 1, ttype, tmesg);
-         break;
-
-      default: /* VERBOSE */
-         for ( i = 1 ; i <= Tst_range ; i++ )
-            tst_print(TCID, Tst_count + i, Tst_range, ttype, tmesg);
-         break;
-      }  /* end switch() */
-
-      /*
-       * Increment Tst_count.
-       */
-      Tst_count += Tst_range;
-   }  /* if ( ttype == TWARN || ttype == TINFO ) */
-
-   /*
-    * Reset some values.
-    */
-   Tst_range = 1;
-   Expand_varargs = TRUE;
-}  /* tst_res() */
-
-
-/*
- * tst_condense() - Handle test cases in CONDENSE or NOPASS mode (i.e.
- *                  buffer the current result and print the last result
- *                  if different than the current).  If a file was
- *                  specified, print the current result and do not
- *                  buffer it.
- */
-static void
-tst_condense(int tnum, int ttype, char *tmesg)
-{
-   const char *file;
-
-#if DEBUG
-   printf("IN tst_condense: tcid = %s, tnum = %d, ttype = %d, tmesg = %s\n",
-          TCID, tnum, ttype, tmesg);
-   fflush(stdout);
-#endif
-
-   /*
-    * If this result is the same as the previous result, return.
-    */
-   if ( Buffered == TRUE ) {
-      if ( strcmp(Last_tcid, TCID) == 0 && Last_type == ttype &&
-           strcmp(Last_mesg, tmesg) == 0 && File == NULL )
-         return;
-
-      /*
-       * This result is different from the previous result.  First,
-       * print the previous result.
-       */
-      file = File;
-      File = NULL;
-      tst_print(Last_tcid, Last_num, tnum - Last_num, Last_type,
-                Last_mesg);
-      free(Last_tcid);
-      free(Last_mesg);
-      File = file;
-   }  /* if ( Buffered == TRUE ) */
-
-   /*
-    * If a file was specified, print the current result since we have no
-    * way of retaining the file contents for comparing with future
-    * results.  Otherwise, buffer the current result info for next time.
-    */
-   if ( File != NULL ) {
-      tst_print(TCID, tnum, Tst_range, ttype, tmesg);
-      Buffered = FALSE;
-   } else {
-      Last_tcid = (char *)malloc(strlen(TCID) + 1);
-      strcpy(Last_tcid, TCID);
-      Last_num = tnum;
-      Last_type = ttype;
-      Last_mesg = (char *)malloc(strlen(tmesg) + 1);
-      strcpy(Last_mesg, tmesg);
-      Buffered = TRUE;
-   }
-}  /* tst_condense() */
-
-
-/*
- * tst_flush() - Print any messages pending because of CONDENSE mode,
- *               and flush T_out.
- */
-void
-tst_flush()
-{
-#if DEBUG
-   printf("IN tst_flush\n");
-   fflush(stdout);
-#endif
-
-   /*
-    * Print out last line if in CONDENSE or NOPASS mode.
-    */
-   if ( Buffered == TRUE && (T_mode == CONDENSE || T_mode == NOPASS) ) {
-      tst_print(Last_tcid, Last_num, Tst_count - Last_num + 1,
-                Last_type, Last_mesg);
-      Buffered = FALSE;
-   }
-   fflush(T_out);
-}  /* tst_flush() */
-
-
-/*
- * tst_print() - Actually print a line or range of lines to the output
- *               stream.
- */
-static void
-tst_print(char *tcid, int tnum, int trange, int ttype, const char *tmesg)
-{
-   char type[5];
-
-#if DEBUG
-   printf("IN tst_print: tnum = %d, trange = %d, ttype = %d, tmesg = %s\n",
-          tnum, trange, ttype, tmesg);
-   fflush(stdout);
-#endif
-
-   /*
-    * Save the test result type by ORing ttype into the current exit
-    * value (used by tst_exit()).  This is already done in tst_res(), but
-    * is also done here to catch internal warnings.  For internal warnings, 
-    * tst_print() is called directly with a case of TWARN.
-    */
-   T_exitval |= ttype;
-
-   /*
-    * If output mode is DISCARD, or if the output mode is NOPASS and
-    * this result is not one of FAIL, BROK, or WARN, just return.  This
-    * check is necessary even though we check for DISCARD mode inside of
-    * tst_res(), since occasionally we get to this point without going
-    * through tst_res() (e.g. internal TWARN messages).
-    */
-   if ( T_mode == DISCARD || (T_mode == NOPASS && ttype != TFAIL &&
-                              ttype != TBROK && ttype != TWARN) )
-      return;
-
-   /*
-    * Fill in the type string according to ttype.
-    */
-   switch ( ttype ) {
-   case TPASS:
-      strcpy(type, "PASS");
-      break;
-   case TFAIL:
-      strcpy(type, "FAIL");
-      break;
-   case TBROK:
-      strcpy(type, "BROK");
-      break;
-   case TRETR:
-      strcpy(type, "RETR");
-      break;
-   case TCONF:
-      strcpy(type, "CONF");
-      break;
-   case TWARN:
-      strcpy(type, "WARN");
-      break;
-   case TINFO:
-      strcpy(type, "INFO");
-      break;
-   default:
-      strcpy(type, "????");
-      break;
-   }  /* switch ( ttype ) */
-
-   /*
-    * Build the result line and print it.
-    */
-   if ( T_mode == VERBOSE ) {
-      fprintf(T_out, "%-8s %4d  %s  :  %s\n", tcid, tnum, type, tmesg);
-   } else {
-      /* condense results if a range is specified */
-      if ( trange > 1 )
-         fprintf(T_out, "%-8s %4d-%-4d  %s  :  %s\n",
-                 tcid, tnum, tnum + trange - 1, type, tmesg);
-      else
-         fprintf(T_out, "%-8s %4d       %s  :  %s\n",
-                 tcid, tnum, type, tmesg);
-   }
-
-   /*
-    * If tst_res() was called with a file, append file contents to the
-    * end of last printed result.
-    */
-   if ( File != NULL )
-      cat_file(File);
-   File = NULL;
-}  /* tst_print() */
-
-
-/*
- * check_env() - Check the value of the environment variable TOUTPUT and
- *               set the global variable T_mode.  The TOUTPUT environment
- *               variable should be set to "VERBOSE", "CONDENSE",
- *               "NOPASS", or "DISCARD".  If TOUTPUT does not exist or
- *               is not set to a valid value, the default is "VERBOSE".
- */
-static void
-check_env()
-{
-   static int first_time = 1;
-   char       *value;      /* value of TOUTPUT environment variable */
-
-#if DEBUG
-   printf("IN check_env\n");
-   fflush(stdout);
-#endif
-
-   if ( !first_time )
-      return;
-
-   first_time = 0;
-
-   if ( (value = getenv(TOUTPUT)) == NULL ) {
-      /* TOUTPUT not defined, use default */
-      T_mode = VERBOSE;
-   } else if ( strcmp(value, TOUT_CONDENSE_S) == 0 ) {
-      T_mode = CONDENSE;
-   } else if ( strcmp(value, TOUT_NOPASS_S) == 0 ) {
-      T_mode = NOPASS;
-   } else if ( strcmp(value, TOUT_DISCARD_S) == 0 ) {
-      T_mode = DISCARD;
-   } else {
-      /* default */
-      T_mode = VERBOSE;
-   }
-
-   return;
-}  /* check_env() */
-
-
-/*
- * tst_exit() - Call exit() with the value T_exitval, set up by
- *              tst_res().  T_exitval has a bit set for most of the
- *              result types that were seen (including TPASS, TFAIL,
- *              TBROK, TWARN, TCONF).  Also, print the last result (if
- *              necessary) before exiting.
- */
-void
-tst_exit()
-{
-#if DEBUG
-   printf("IN tst_exit\n"); fflush(stdout);
-   fflush(stdout);
-#endif
-
-   /*
-    * Call tst_flush() flush any ouput in the buffer or the last
-    * result not printed because of CONDENSE mode.
-    */
-   tst_flush();
-
-   /*
-    * Mask out TRETR, TINFO, and TCONF results from the exit status.
-    */
-   exit(T_exitval & ~(TRETR | TINFO | TCONF));
-}  /* tst_exit() */
-
-
-/*
- * tst_environ() - Preserve the tst_res() output location, despite any
- *                 changes to stdout.
- */
-int
-tst_environ()
-{
-   FILE *fdopen();
-
-   if ( (T_out = fdopen(dup(fileno(stdout)), "w")) == NULL )
-      return(-1);
-   else
-      return(0);
-}  /* tst_environ() */
-
-
-/*
- * tst_brk() - Fail or break current test case, and break the remaining
- *             tests cases.
- */
-void
-tst_brk(int ttype, char *fname, void (*func)(), const char *arg_fmt, ...)
-{
-   char    tmesg[USERMESG];      /* expanded message */
-
-#if DEBUG
-   printf("IN tst_brk\n"); fflush(stdout);
-   fflush(stdout);
-#endif
-
-   /*
-    * Expand the arg_fmt string into tmesg, if necessary.
-    */
-   EXPAND_VAR_ARGS(arg_fmt, tmesg);
-
-   /*
-    * Only FAIL, BROK, CONF, and RETR are supported by tst_brk().
-    */
-   if ( ttype != TFAIL && ttype != TBROK && ttype != TCONF &&
-        ttype != TRETR ) {
-      sprintf(Warn_mesg, "tst_brk(): Invalid Type: %d.  Using TBROK",
-              ttype);
-      tst_print(TCID, 0, 1, TWARN, Warn_mesg);
-      ttype = TBROK;
-   }
-
-   /*
-    * Print the first result, if necessary.
-    */
-   if ( Tst_count < TST_TOTAL )
-      tst_res(ttype, fname, tmesg);
-
-   /*
-    * Determine the number of results left to report.
-    */
-   Tst_range = TST_TOTAL - Tst_count;
-
-   /*
-    * Print the rest of the results, if necessary.
-    */
-   if ( Tst_range > 0 ) {
-      if ( ttype == TCONF )
-         tst_res(ttype, NULL,
-                 "Remaining cases not appropriate for configuration");
-      else if ( ttype == TRETR )
-         tst_res(ttype, NULL, "Remaining cases retired");
-      else
-         tst_res(TBROK, NULL, "Remaining cases broken");
-   } else {
-      Tst_range = 1;
-      Expand_varargs = TRUE;
-   }  /* if ( Tst_range > 0 ) */
-
-   /*
-    * If no cleanup function was specified, just return to the caller.
-    * Otherwise call the specified function.  If specified function
-    * returns, call tst_exit().
-    */
-   if ( func != NULL ) {
-      (*func)();
-      tst_exit();
-   }
-
-   return;
-}  /* tst_brk() */
-
-
-/*
- * tst_brkloop() - Fail or break current test case, and break the
- *                 remaining test cases within test case loop.
- */
-void
-tst_brkloop(int ttype, char *fname, void (*func)(), const char *arg_fmt, ...)
-{
-   char    tmesg[USERMESG];      /* expanded message */
-
-#if DEBUG
-   printf("IN tst_brkloop\n"); fflush(stdout);
-   fflush(stdout);
-#endif
-
-   /*
-    * Expand the arg_fmt string into tmesg.
-    */
-   EXPAND_VAR_ARGS(arg_fmt, tmesg);
-
-   /*
-    * Verify that Tst_lpstart & Tst_lptotal are valid.
-    */
-   if ( Tst_lpstart < 0 || Tst_lptotal < 0 ) {
-      tst_print(TCID, 0, 1, TWARN,
-                "tst_brkloop(): Tst_lpstart & Tst_lptotal must both be assigned non-negative values");
-      Expand_varargs = TRUE;
-      return;
-   }
-
-   /*
-    * Only FAIL, BROK, CONF, and RETR are supported by tst_brkloop().
-    */
-   if ( ttype != TFAIL && ttype != TBROK && ttype != TCONF &&
-        ttype != TRETR ) {
-      sprintf(Warn_mesg,
-              "tst_brkloop(): Invalid Type: %d.  Using TBROK",
-              ttype);
-      tst_print(TCID, 0, 1, TWARN, Warn_mesg);
-      ttype = TBROK;
-   }
-
-   /*
-    * Print the first result, if necessary.
-    */
-   if ( Tst_count < Tst_lpstart + Tst_lptotal )
-      tst_res(ttype, fname, tmesg);
-
-   /*
-    * Determine the number of results left to report.
-    */
-   Tst_range = Tst_lptotal + Tst_lpstart - Tst_count;
-
-   /*
-    * Print the rest of the results, if necessary.
-    */
-   if ( Tst_range > 0 ) {
-      if ( ttype == TCONF )
-         tst_res(ttype, NULL,
-                 "Remaining cases in loop not appropriate for configuration");
-      else if ( ttype == TRETR )
-         tst_res(ttype, NULL, "Remaining cases in loop retired");
-      else
-         tst_res(TBROK, NULL, "Remaining cases in loop broken");
-   } else {
-      Tst_range = 1;
-      Expand_varargs = TRUE;
-   }  /* if ( Tst_range > 0 ) */
-
-   /*
-    * If a cleanup function was specified, call it.
-    */
-   if ( func != NULL )
-      (*func)();
-}  /* tst_brkloop() */
-
-
-/*
- * tst_resm() - Interface to tst_res(), with no filename.
- */
-void
-tst_resm(int ttype, const char *arg_fmt, ...)
-{
-   char    tmesg[USERMESG];      /* expanded message */
-
-#if DEBUG
-   printf("IN tst_resm\n"); fflush(stdout);
-   fflush(stdout);
-#endif
-
-   /*
-    * Expand the arg_fmt string into tmesg.
-    */
-   EXPAND_VAR_ARGS(arg_fmt, tmesg);
-
-   /*
-    * Call tst_res with a null filename argument.
-    */
-   tst_res(ttype, NULL, tmesg);
-}  /* tst_resm() */
-
-
-/*
- * tst_brkm() - Interface to tst_brk(), with no filename.
- */
-void
-tst_brkm(int ttype, void (*func)(), const char *arg_fmt, ...)
-{
-   char    tmesg[USERMESG];      /* expanded message */
-
-#if DEBUG
-   printf("IN tst_brkm\n"); fflush(stdout);
-   fflush(stdout);
-#endif
-
-   /*
-    * Expand the arg_fmt string into tmesg.
-    */
-   EXPAND_VAR_ARGS(arg_fmt, tmesg);
-
-   /*
-    * Call tst_brk with a null filename argument.
-    */
-   tst_brk(ttype, NULL, func, tmesg);
-}  /* tst_brkm() */
-
-
-/*
- * tst_brkloopm() - Interface to tst_brkloop(), with no filename.
- */
-void
-tst_brkloopm(int ttype, void (*func)(), const char *arg_fmt, ...)
-{
-   char    tmesg[USERMESG];      /* expanded message */
-
-#if DEBUG
-   printf("IN tst_brkloopm\n");
-   fflush(stdout);
-#endif
-
-   /*
-    * Expand the arg_fmt string into tmesg.
-    */
-   EXPAND_VAR_ARGS(arg_fmt, tmesg);
-
-   /*
-    * Call tst_brkloop with a null filename argument.
-    */
-   tst_brkloop(ttype, NULL, func, tmesg);
-}  /* tst_brkloopm() */
-
-
-/*
- * cat_file() - Print the contents of a file to standard out.
- */
-static void
-cat_file(const char *filename)
-{
-   FILE *fp;                  /* file pointer */
-   int  b_read;               /* number of bytes read with read() */
-   int  b_written;            /* number of bytes written with write() */
-   char buffer[BUFSIZ];       /* read/write buffer; BUFSIZ defined in */
-                              /* stdio.h */
-
-#if DEBUG
-   printf("IN cat_file\n"); fflush(stdout);
-#endif
-
-   /*
-    * Open the file for reading.
-    */
-   if ( (fp = fopen(filename, "r")) == NULL ) {
-      sprintf(Warn_mesg,
-              "tst_res(): fopen(%s, \"r\") failed; errno = %d: %s",
-              filename, errno, strerror(errno));
-      tst_print(TCID, 0, 1, TWARN, Warn_mesg);
-      return;
-   }  /* if ( fopen(filename, "r") == -1 ) */
-
-   /*
-    * While something to read, continue to read blocks.
-    * From fread(3) man page: 
-    *   If an error occurs, or the end-of-file is reached, the return
-    *   value is zero.
-    */
-   errno = 0;
-   while ( (b_read = fread((void *)buffer, 1, BUFSIZ, fp)) != (size_t)0 ) {
-      /*
-       * Write what was read to the result output stream.
-       */
-      if ( (b_written = fwrite((void *)buffer, 1, b_read, T_out)) !=
-           b_read ) {
-         sprintf(Warn_mesg,
-                 "tst_res(): While trying to cat \"%s\", fwrite() wrote only %d of %d bytes",
-                 filename, b_written, b_read);
-         tst_print(TCID, 0, 1, TWARN, Warn_mesg);
-         break;
-      }  /* if ( b_written != b_read ) */
-   }  /* while ( fread() != 0 ) */
-
-   /*
-    * Check for an fread() error.
-    */
-   if ( !feof(fp) ) {
-      sprintf(Warn_mesg,
-              "tst_res(): While trying to cat \"%s\", fread() failed, errno = %d: %s",
-              filename, errno, strerror(errno));
-      tst_print(TCID, 0, 1, TWARN, Warn_mesg);
-   }  /* if ( !feof() ) */
-
-   /*
-    * Close the file.
-    */
-   if ( fclose(fp) == EOF ) {
-      sprintf(Warn_mesg,
-              "tst_res(): While trying to cat \"%s\", fclose() failed, errno = %d: %s",
-              filename, errno, strerror(errno));
-      tst_print(TCID, 0, 1, TWARN, Warn_mesg);
-   }  /* if ( fclose(fp) == EOF ) */
-}  /* cat_file() */
-
-
-
-#ifdef UNIT_TEST
-/****************************************************************************
- * Unit test code: Takes input from stdin and can make the following
- *                 calls: tst_res(), tst_resm(), tst_brk(), tst_brkm(),
- *                 tst_flush_buf(), tst_exit().
- ****************************************************************************/
-int  TST_TOTAL = 10;
-char *TCID = "TESTTCID";
-
-#define RES  "tst_res.c UNIT TEST message; ttype = %d; contents of \"%s\":"
-#define RESM "tst_res.c UNIT TEST message; ttype = %d"
-
-main()
-{
-   int  ttype;
-   int  range;
-   char *chrptr;
-   char chr;
-   char fname[MAXMESG];
-
-   printf("UNIT TEST of tst_res.c.  Options for ttype:\n\
-   -1 : call tst_exit()\n\
-   -2 : call tst_flush()\n\
-   -3 : call tst_brk()\n\
-   -4 : call tst_brkloop()\n\
-   -5 : call tst_res() with a range\n\
-    0 : call tst_res(TPASS, ...)\n\
-    1 : call tst_res(TFAIL, ...)\n\
-    2 : call tst_res(TBROK, ...)\n\
-    4 : call tst_res(TWARN, ...)\n\
-    8 : call tst_res(TRETR, ...)\n\
-   16 : call tst_res(TINFO, ...)\n\
-   32 : call tst_res(TCONF, ...)\n\n");
-
-   while ( 1 ) {
-      printf("Enter ttype (-5,-4,-3,-2,-1,0,1,2,4,8,16,32): ");
-      (void) scanf("%d%c", &ttype, &chr);
-
-
-      switch ( ttype ) {
-      case -1:
-         tst_exit();
-         break;
-
-      case -2:
-         tst_flush();
-         break;
-
-      case -3:
-         printf("Enter the current type (1=FAIL, 2=BROK, 8=RETR, 32=CONF): ");
-         (void) scanf("%d%c", &ttype, &chr);
-         printf("Enter file name (<cr> for none): ");
-         gets(fname);
-         if ( strcmp(fname, "") == 0 )
-            tst_brkm(ttype, tst_exit, RESM, ttype);
-         else
-            tst_brk(ttype, fname, tst_exit, RES, ttype, fname);
-         break;
-
-      case -4:
-         printf("Enter the size of the loop: ");
-         (void) scanf("%d%c", &range, &chr);
-         Tst_lpstart = Tst_count;
-         Tst_lptotal = range;
-         printf("Enter the current type (1=FAIL, 2=BROK, 8=RETR, 32=CONF): ");
-         (void) scanf("%d%c", &ttype, &chr);
-         printf("Enter file name (<cr> for none): ");
-         gets(fname);
-         if ( strcmp(fname, "") == 0 )
-            tst_brkloopm(ttype, NULL, RESM, ttype);
-         else
-            tst_brkloop(ttype, fname, NULL, RES, ttype, fname);
-         break;
-
-      case -5:
-         printf("Enter the size of the range: ");
-         (void) scanf("%d%c", &Tst_range, &chr);
-         printf("Enter the current type (0,1,2,4,8,16,32): ");
-         (void) scanf("%d%c", &ttype, &chr);
-         /* fall through to tst_res() call */
-
-      default:
-         printf("Enter file name (<cr> for none): ");
-         gets(fname);
-         if ( strcmp(fname, "") == 0 )
-            tst_resm(ttype, RESM, ttype);
-         else
-            tst_res(ttype, fname, RES, ttype, fname);
-         break;
-      }  /* switch() */
-   }  /* while() */
-}
-#endif  /* UNIT_TEST */
diff --git a/winsup/testsuite/libltp/lib/tst_sig.c b/winsup/testsuite/libltp/lib/tst_sig.c
deleted file mode 100644
index f5b64b666..000000000
--- a/winsup/testsuite/libltp/lib/tst_sig.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-
-/* $Id$ */
-
-/*****************************************************************************
-	OS Testing  - Silicon Graphics, Inc.
-
-	FUNCTION IDENTIFIER : tst_sig  Set up for unexpected signals.
-
-	AUTHOR          : David D. Fenner
-
-	CO-PILOT        : Bill Roske
-
-	DATE STARTED    : 06/06/90
-
-	This module may be linked with c-modules requiring unexpected
-	signal handling.  The parameters to tst_sig are as follows:
-
-		fork_flag - set to FORK or NOFORK depending upon whether the
-			calling program executes a fork() system call.  It
-			is normally the case that the calling program treats
-			SIGCLD as an expected signal if fork() is being used.
-
-		handler - a pointer to the unexpected signal handler to
-			be executed after an unexpected signal has been
-			detected.  If handler is set to DEF_HANDLER, a 
-			default handler is used.  This routine should be
-			declared as function returning an int.
-
-		cleanup - a pointer to a cleanup routine to be executed
-			by the unexpected signal handler before tst_exit is
-			called.  This parameter is set to NULL if no cleanup
-			routine is required.  An external variable, T_cleanup
-			is set so that other user-defined handlers have 
-			access to the cleanup routine.  This routine should be
-			declared as returning type void.
-
-***************************************************************************/
-
-#ifndef CRAY
-#define _BSD_SIGNALS	1	/* Specify that we are using BSD signal interface */
-#endif
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-
-#define MAXMESG 150		/* size of mesg string sent to tst_res */
-
-void (*T_cleanup)();		/* pointer to cleanup function */
-
-extern int errno;
-static void def_handler();		/* default signal handler */
-
-/****************************************************************************
- * tst_sig() : set-up to catch unexpected signals.  fork_flag is set to NOFORK
- *    if SIGCLD is to be an "unexpected signal", otherwise it is set to
- *    FORK.  cleanup points to a cleanup routine to be executed before
- *    tst_exit is called (cleanup is set to NULL if no cleanup is desired).
- *    handler is a pointer to the signal handling routine (if handler is
- *    set to NULL, a default handler is used).
- ***************************************************************************/
-
-void
-tst_sig(int fork_flag, void (*handler)(), void (*cleanup)())
-{
-	char mesg[MAXMESG];		/* message buffer for tst_res */
-	int sig;
-
-	/*
-	 * save T_cleanup and handler function pointers
-	 */
-	T_cleanup = cleanup;		/* used by default handler */
-
-	if (handler == DEF_HANDLER) {
-		/* use default handler */
-		handler = def_handler;
-	}
-
-	/*
-	 * now loop through all signals and set the handlers
-	 */
-
-	for (sig = 1; sig < NSIG; sig++) {
-	    /*
-	     * SIGKILL is never unexpected.
-	     * SIGCLD is only unexpected when
-	     *    no forking is being done.
-	     * SIGINFO is used for file quotas and should be expected
-	     */
-
-	    switch (sig) {
-	        case SIGKILL:
-	        case SIGSTOP:
-	        case SIGCONT:
-#ifdef CRAY
-	        case SIGINFO:
-	        case SIGRECOVERY:	/* allow chkpnt/restart */
-#endif  /* CRAY */
-
-#ifdef SIGSWAP
-  case SIGSWAP:
-#endif /* SIGSWAP */
-
-#ifdef SIGCKPT
-	        case SIGCKPT:
-#endif
-#ifdef SIGRESTART
-	        case SIGRESTART:
-#endif
-                /*
-                 * pthread-private signals SIGPTINTR and SIGPTRESCHED.
-                 * Setting a handler for these signals is disallowed when
-                 * the binary is linked against libpthread.
-                 */
-#ifdef SIGPTINTR
-                case SIGPTINTR:
-#endif /* SIGPTINTR */
-#ifdef SIGPTRESCHED
-                case SIGPTRESCHED:
-#endif /* SIGPTRESCHED */
-#ifdef __CYGWIN__
-		case SIGILL:
-		case SIGTRAP:
-		case SIGABRT:
-		case SIGEMT:
-		case SIGFPE:
-		case SIGBUS:
-#endif
-	            break;
-
-	        case SIGCLD:
-	            if ( fork_flag == FORK )
-		        continue;
-
-	        default:
-		    if (signal(sig, handler) == SIG_ERR) {
-		        (void) sprintf(mesg,
-			    "signal() failed for signal %d. error:%d %s.",
-			    sig, errno, strerror(errno));
-		        tst_resm(TWARN, mesg);
-		    }
-		break;
-            }
-#ifdef __sgi
-	    /* On irix  (07/96), signal() fails when signo is 33 or higher */
-	    if ( sig+1 >= 33 )
-		break;
-#endif  /*  __sgi */
-
-	} /* endfor */
-}
-
-
-
-/****************************************************************************
- * def_handler() : default signal handler that is invoked when
- *      an unexpected signal is caught.
- ***************************************************************************/
-
-static void
-def_handler(int sig)
-{
-	char mesg[MAXMESG];		/* holds tst_res message */
-
-	/* first reset trap for this signal (except SIGCLD - its weird) */
-	if ((sig != SIGCLD) && (sig != SIGSTOP) && (sig != SIGCONT)) {
-		if (signal(sig, def_handler) == SIG_ERR) {
-			(void) sprintf(mesg,
-				"def_handler: signal() failed for signal %d. error:%d %s.",
-				sig, errno, strerror(errno));
-			tst_resm(TWARN, mesg);
-		}
-	}
-
-	(void) sprintf(mesg, "Unexpected signal %d received.", sig);
-
-	/*
-         * Break remaining test cases, do any cleanup, then exit
-	 */
-	tst_brkm(TBROK, 0, mesg);
-
-	/* now cleanup and exit */
-	if (T_cleanup) {
-		(*T_cleanup)();
-	}
-
-	tst_exit();
-}
diff --git a/winsup/testsuite/libltp/lib/tst_tmpdir.c b/winsup/testsuite/libltp/lib/tst_tmpdir.c
deleted file mode 100644
index cd9d9c8b8..000000000
--- a/winsup/testsuite/libltp/lib/tst_tmpdir.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-
-/* $Id$ */
-
-/**********************************************************
- *
- *    OS Testing - Silicon Graphics, Inc.
- *
- *    FUNCTION NAME     : tst_tmpdir, tst_rmdir
- *
- *    FUNCTION TITLE    : Create/remove a testing temp dir
- *
- *    SYNOPSIS:
- *      void tst_tmpdir();
- *      void tst_rmdir();
- *
- *    AUTHOR            : Dave Fenner
- *
- *    INITIAL RELEASE   : UNICOS 8.0
- *
- *    DESCRIPTION
- *      tst_tmpdir() is used to create a unique, temporary testing
- *      directory, and make it the current working directory.
- *      tst_rmdir() is used to remove the directory created by
- *      tst_tmpdir().
- *
- *      Setting the env variable "TDIRECTORY" will override the creation
- *      of a new temp dir.  The directory specified by TDIRECTORY will
- *      be used as the temporary directory, and no removal will be done
- *      in tst_rmdir().
- *
- *    RETURN VALUE
- *      Neither tst_tmpdir() or tst_rmdir() has a return value.
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-#include <errno.h>
-#include <sys/types.h>     /* for mkdir() */
-#include <sys/stat.h>      /* for mkdir() */
-#include "test.h"
-#include "rmobj.h"
-
-/*
- * Define some useful macros.
- */
-#define PREFIX_SIZE     4
-#define STRING_SIZE     256
-#define DIR_MODE        0777  /* mode of tmp dir that will be created */
-
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-
-/*
- * Define function prototypes.
- */
-static void tmpdir_cleanup();
-
-/*
- * Define global variables.
- */
-extern char *TCID;            /* defined/initialized in main() */
-extern int  TST_TOTAL;        /* defined/initialized in main() */
-extern char *TESTDIR;         /* the directory created; defined in */
-                              /* tst_res.c */
-
-/*
- * tst_tmpdir() - Create a unique temporary directory and chdir() to it.
- *                It expects the caller to have defined/initialized the
- *                TCID/TST_TOTAL global variables.  The TESTDIR global
- *                variable will be set to the directory that gets used
- *                as the testing directory.
- *
- *                NOTE: This function must be called BEFORE any activity
- *                that would require CLEANUP.  If tst_tmpdir() fails, it
- *                cleans up afer itself and calls tst_exit() (i.e. does
- *                not return).
- */
-#undef   FN_NAME
-#define  FN_NAME  "tst_tmpdir()"
-
-void
-tst_tmpdir()
-{
-   char prefix[PREFIX_SIZE];     /* first three characters from TCID */
-   int  no_cleanup = 0;          /* !0 means TDIRECTORY env var was set */
-
-   /*
-    * If the TDIRECTORY env variable is not set, a temp dir will be
-    * created.
-    */
-   if ( (TESTDIR = getenv(TDIRECTORY)) == NULL ) {
-      /*
-       * Create a unique name based on the first three characters of the
-       * TCID.  The last byte in "prefix" is for the null.
-       */
-      strncpy(prefix, TCID, PREFIX_SIZE - 1);
-      prefix[PREFIX_SIZE-1] = '\0';
-      if ( (TESTDIR = tempnam(TEMPDIR, prefix)) == NULL )
-         tst_brkm(TBROK, tmpdir_cleanup, "%s: tempnam(%s, %s) failed",
-                  FN_NAME, TEMPDIR, prefix);
-
-      /*
-       * Create the temporary directory.
-       */
-      if ( mkdir(TESTDIR, DIR_MODE) == -1 )
-         tst_brkm(TBROK, tmpdir_cleanup,
-                  "%s: mkdir(%s, %#o) failed; errno = %d: %s", 
-                  FN_NAME, TESTDIR, DIR_MODE, errno, strerror(errno));
-
-      /*
-       * Change the group on this temporary directory to be that of the
-       * gid of the person running the tests.
-       */
-      if ( chown(TESTDIR, -1, getgid()) == -1 )
-         tst_brkm(TBROK, tmpdir_cleanup,
-                  "chown(%s, -1, %d) failed; errno = %d: %s", 
-                  TESTDIR, getgid(), errno, strerror(errno));
-   } else {
-      /*
-       * The TDIRECTORY env. variable is set, so no temp dir is created.
-       * Also, no clean up will be done via tst_rmdir().
-       */
-      no_cleanup++;
-#if UNIT_TEST
-      printf("TDIRECTORY env var is set\n");
-#endif
-   }
-
-#if UNIT_TEST
-      printf("TESTDIR = %s\n", TESTDIR);
-#endif
-
-   /*
-    * Change to the temporary directory.  If the chdir() fails, issue
-    * TBROK messages for all test cases, attempt to remove the
-    * directory (if it was created), and exit.  If the removal also
-    * fails, also issue a TWARN message.   
-    */
-   if ( chdir(TESTDIR) == -1 ) {
-      tst_brkm(TBROK, NULL, "%s: chdir(%s) failed; errno = %d: %s",
-               FN_NAME, TESTDIR, errno, strerror(errno) );
-
-      /* Try to remove the directory */
-      if ( !no_cleanup && rmdir(TESTDIR) == -1 )
-         tst_resm(TWARN, "%s: rmdir(%s) failed; errno = %d: %s",
-                  FN_NAME, TESTDIR, errno, strerror(errno) );
-
-      tmpdir_cleanup();
-   }
-
-#if UNIT_TEST
-   printf("CWD is %s\n", getcwd((char *)NULL, PATH_MAX));
-#endif
-
-   /*
-    *  If we made through all this stuff, return.
-    */
-   return;
-}  /* tst_tmpdir() */
-
-
-/*
- *
- * tst_rmdir() - Recursively remove the temporary directory created by
- *               tst_tmpdir().  This function is intended ONLY as a
- *               companion to tst_tmpdir().  If the TDIRECTORY
- *               environment variable is set, no cleanup will be
- *               attempted.
- */ 
-#undef   FN_NAME
-#define  FN_NAME  "tst_rmdir()"
-
-void
-tst_rmdir()
-{
-   char *errmsg;
-   char *tdirectory;
-   char current_dir[PATH_MAX];   /* current working directory */
-   char parent_dir[PATH_MAX];    /* directory above TESTDIR */
-   char *basename;               /* basename of the TESTDIR */
-
-   /*
-    * If the TDIRECTORY env variable is set, this indicates that no
-    * temp dir was created by tst_tmpdir().  Thus no cleanup will be
-    * necessary.
-    */
-   if ( (tdirectory = getenv(TDIRECTORY)) != NULL ) {
-#if UNIT_TEST
-      printf("\"TDIRECORY\" env variable is set; no cleanup was performed\n");
-#endif
-      return;
-   }
-   
-   /*
-    * Check that TESTDIR is not NULL.
-    */
-   if ( TESTDIR == NULL ) {
-      tst_resm(TWARN, "%s: TESTDIR was NULL; no removal attempted",
-               FN_NAME);
-      return;
-   }
-
-   /*
-    * Check that the value of TESTDIR is not "*" or "/".  These could
-    * have disastrous effects in a test run by root.
-    */
-   if ( strcmp(TESTDIR, "/") == 0 ) {
-      tst_resm(TWARN,
-               "%s: Recursive remove of root directory not attempted",
-               FN_NAME);
-      return;
-   }
-
-   if ( strchr(TESTDIR, '*') != NULL ) {
-      tst_resm(TWARN, "%s: Recursive remove of '*' not attempted",
-               FN_NAME);
-      return;
-   }
-
-   /*
-    * Get the directory name of TESTDIR.  If TESTDIR is a relative path,
-    * get full path.
-    */
-   if ( TESTDIR[0] != '/' ) {
-      if ( getcwd(current_dir,PATH_MAX) == NULL )
-         strcpy(parent_dir, TESTDIR);
-      else
-         sprintf(parent_dir, "%s/%s", current_dir, TESTDIR);
-   } else {
-      strcpy(parent_dir, TESTDIR);
-   }
-   if ( (basename = strrchr(parent_dir, '/')) != NULL ) {
-      *basename='\0';   /* terminate at end of parent_dir */
-   }
-
-   /*
-    * Change directory to parent_dir (The dir above TESTDIR).
-    */
-   if ( chdir(parent_dir) != 0 )
-      tst_resm(TWARN,
-               "%s: chdir(%s) failed; errno = %d: %s\nAttempting to remove temp dir anyway",
-               FN_NAME, parent_dir, errno, strerror(errno));
-   
-   /*
-    * Attempt to remove the "TESTDIR" directory, using rmobj().
-    */
-   if ( rmobj(TESTDIR, &errmsg) == -1 )
-      tst_resm(TWARN, "%s: rmobj(%s) failed: %s",
-               FN_NAME, TESTDIR, errmsg);
-
-   return;
-}  /* tst_rmdir() */
-
-
-/*
- * tmpdir_cleanup() - This function is used when tst_tmpdir()
- *                    encounters an error, and must cleanup and exit.
- *                    It prints a warning message via tst_resm(), and
- *                    then calls tst_exit().
- */
-#undef  FN_NAME
-#define FN_NAME "tst_tmpdir()"
-
-static void
-tmpdir_cleanup()
-{
-   /*
-    * Print a warning message and call tst_exit() to exit the test.
-    */
-   tst_resm(TWARN, "%s: No user cleanup function called before exiting",
-            FN_NAME);
-   tst_exit();
-}  /* tmpdir_cleanup() */
-
-
-#ifdef UNIT_TEST
-/****************************************************************************
- * Unit test code: Takes input from stdin and can make the following
- *                 calls: tst_tmpdir(), tst_rmdir().
- ****************************************************************************/
-int  TST_TOTAL = 10;
-char *TCID = "TESTTCID";
-
-main()
-{
-   int  option;
-   char *chrptr;
-
-   printf("UNIT TEST of tst_tmpdir.c.  Options to try:\n\
-   -1 : call tst_exit()\n\
-    0 : call tst_tmpdir()\n\
-    1 : call tst_rmdir()\n\n");
-
-   while ( 1 ) {
-      printf("Enter options (-1, 0, 1): ");
-      (void) scanf("%d%c", &option, &chrptr);
-
-      switch ( option ) {
-      case -1:
-         tst_exit();
-         break;
-
-      case 0:
-         tst_tmpdir();
-         break;
-
-      case 1:
-         tst_rmdir();
-         break;
-      }  /* switch() */
-   }  /* while() */
-}
-#endif  /* UNIT_TEST */
diff --git a/winsup/testsuite/libltp/lib/write_log.c b/winsup/testsuite/libltp/lib/write_log.c
deleted file mode 100644
index 316dfe79b..000000000
--- a/winsup/testsuite/libltp/lib/write_log.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/*
- * This module contains code for logging writes to files, and for
- * perusing the resultant logfile.  The main intent of all this is
- * to provide a 'write history' of a file which can be examined to
- * judge the state of a file (ie. whether it is corrupted or not) based
- * on the write activity.
- *
- * The main abstractions available to the user are the wlog_file, and
- * the wlog_rec.  A wlog_file is a handle encapsulating a write logfile.
- * It is initialized with the wlog_open() function.  This handle is
- * then passed to the various wlog_xxx() functions to provide transparent
- * access to the write logfile.
- *
- * The wlog_rec datatype is a structure which contains all the information
- * about a file write.  Examples include the file name, offset, length,
- * pattern, etc.  In addition there is a bit which is cleared/set based
- * on whether or not the write has been confirmed as complete.  This 
- * allows the write logfile to contain information on writes which have
- * been initiated, but not yet completed (as in async io).
- *
- * There is also a function to scan a write logfile in reverse order.
- *
- * NOTE:	For target file analysis based on a write logfile, the
- * 		assumption is made that the file being written to is
- * 		locked from simultaneous access, so that the order of
- * 		write completion is predictable.  This is an issue when
- * 		more than 1 process is trying to write data to the same
- *		target file simultaneously.
- *
- * The history file created is a collection of variable length records
- * described by scruct wlog_rec_disk in write_log.h.  See that module for
- * the layout of the data on disk.
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include "write_log.h"
-
-#ifndef BSIZE
-#ifdef linux
-#define BSIZE DEV_BSIZE
-#else
-#ifdef __CYGWIN__
-#define BSIZE S_BLKSIZE
-#else
-#define BSIZE BBSIZE
-#endif
-#endif
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX          255
-/*#define PATH_MAX pathconf("/", _PC_PATH_MAX)*/
-#endif
-
-char	Wlog_Error_String[256];
-
-#if __STDC__
-static int	wlog_rec_pack(struct wlog_rec *wrec, char *buf, int flag);
-static int	wlog_rec_unpack(struct wlog_rec *wrec, char *buf);
-#else
-static int	wlog_rec_pack();
-static int	wlog_rec_unpack();
-#endif
-
-/*
- * Initialize a write logfile.  wfile is a wlog_file structure that has
- * the w_file field filled in.  The rest of the information in the
- * structure is initialized by the routine.
- *
- * The trunc flag is used to indicate whether or not the logfile should
- * be truncated if it currently exists.  If it is non-zero, the file will
- * be truncated, otherwise it will be appended to.
- *
- * The mode argument is the [absolute] mode which the file will be
- * given if it does not exist.  This mode is not affected by your process
- * umask.
- */
-
-int
-wlog_open(wfile, trunc, mode)
-struct wlog_file	*wfile;
-int			trunc;
-int			mode;
-{
-	int	omask, oflags;
-
-	if (trunc)
-		trunc = O_TRUNC;
-
-	omask = umask(0);
-
-	/*
-	 * Open 1 file descriptor as O_APPEND
-	 */
-
-	oflags = O_WRONLY | O_APPEND | O_CREAT | trunc;
-	wfile->w_afd =
-		open(wfile->w_file, oflags, mode);
-	umask(omask);
-
-	if (wfile->w_afd == -1) {
-		sprintf(Wlog_Error_String,
-			"Could not open write_log - open(%s, %#o, %#o) failed:  %s\n",
-			wfile->w_file, oflags, mode, strerror(errno));
-		return -1;
-	}
-
-	/*
-	 * Open the next fd as a random access descriptor
-	 */
-
-	oflags = O_RDWR;
-	if ((wfile->w_rfd = open(wfile->w_file, oflags)) == -1) {
-		sprintf(Wlog_Error_String,
-			"Could not open write log - open(%s, %#o) failed:  %s\n",
-			wfile->w_file, oflags, strerror(errno));
-		close(wfile->w_afd);
-		wfile->w_afd = -1;
-		return -1;
-	}
-    
-	return 0;
-}
-
-/*
- * Release all resources associated with a wlog_file structure allocated
- * with the wlog_open() call.
- */
-
-int
-wlog_close(wfile)
-struct wlog_file	*wfile;
-{
-	close(wfile->w_afd);
-	close(wfile->w_rfd);
-	return 0;
-}
-
-/*
- * Write a wlog_rec structure to a write logfile.  Offset is used to
- * control where the record will be written.  If offset is < 0, the
- * record will be appended to the end of the logfile.  Otherwise, the
- * record which exists at the indicated offset will be overlayed.  This
- * is so that we can record writes which are outstanding (with the w_done
- * bit in wrec cleared), but not completed, and then later update the
- * logfile when the write request completes (as with async io).  When
- * offset is >= 0, only the fixed length portion of the record is 
- * rewritten.  See text in write_log.h for details on the format of an
- * on-disk record.
- * 
- * The return value of the function is the byte offset in the logfile
- * where the record begins.
- *
- * Note:  It is the callers responsibility to make sure that the offset
- * parameter 'points' to a valid record location when a record is to be
- * overlayed.  This is guarenteed by saving the return value of a previous
- * call to wlog_record_write() which wrote the record to be overlayed.
- *
- * Note2:  The on-disk version of the wlog_rec is MUCH different than
- * the user version.  Don't expect to od the logfile and see data formatted
- * as it is in the wlog_rec structure.  Considerable data packing takes
- * place before the record is written.
- */
-
-int
-wlog_record_write(wfile, wrec, offset)
-struct wlog_file	*wfile;
-struct wlog_rec		*wrec;
-long			offset;
-{
-    int		reclen;
-    char	wbuf[WLOG_REC_MAX_SIZE + 2];
-
-    /*
-     * If offset is -1, we append the record at the end of file
-     *
-     * Otherwise, we overlay wrec at the file offset indicated and assume
-     * that the caller passed us the correct offset.  We do not record the
-     * fname in this case.
-     */
-
-    reclen = wlog_rec_pack(wrec, wbuf, (offset < 0));
-
-    if (offset < 0) {
-	/*
-	 * Since we're writing a complete new record, we must also tack
-	 * its length onto the end so that wlog_scan_backward() will work.
-	 * Length is asumed to fit into 2 bytes.
-	 */
-	    
-	    wbuf[reclen] = reclen / 256;
-	    wbuf[reclen+1] = reclen % 256;
-	    reclen += 2;
-
-	    write(wfile->w_afd, wbuf, reclen);
-	    offset = lseek(wfile->w_afd, 0, SEEK_CUR) - reclen;
-    } else {
-	    lseek(wfile->w_rfd, offset, SEEK_SET);
-	    write(wfile->w_rfd, wbuf, reclen);
-    }
-    
-    return offset;
-}
-
-/*
- * Function to scan a logfile in reverse order.  Wfile is a valid
- * wlog_file structure initialized by wlog_open().  nrecs is the number
- * of records to scan (all records are scanned if nrecs is 0).  func is
- * a user-supplied function to call for each record found.  The function
- * will be passed a single parameter - a wlog_rec structure .
- */
-
-int
-wlog_scan_backward(wfile, nrecs, func, data)
-struct wlog_file	*wfile;
-int 			nrecs;
-int 			(*func)();
-long			data;
-{
-	int			fd, leftover, nbytes, offset, recnum, reclen, rval;
-	char    		buf[BSIZE*32], *bufend, *cp, *bufstart;
-	char		albuf[WLOG_REC_MAX_SIZE];
-	struct wlog_rec	wrec;
-
-	fd = wfile->w_rfd;
-
-	/*
-	 * Move to EOF.  offset will always hold the current file offset
-	 */
-
-	lseek(fd, 0, SEEK_END);
-	offset = lseek(fd, 0, SEEK_CUR);
-
-	bufend = buf + sizeof(buf);
-	bufstart = buf;
-
-	recnum = 0;
-	leftover = 0;
-	while ((!nrecs || recnum < nrecs) && offset > 0) {
-		/*
-		 * Check for beginning of file - if there aren't enough bytes
-		 * remaining to fill buf, adjust bufstart.
-		 */
-
-		if (offset + leftover < sizeof(buf)) {
-			bufstart = bufend - (offset + leftover);
-			offset = 0;
-		} else {
-			offset -= sizeof(buf) - leftover;
-		}
-
-		/* 
-		 * Move to the proper file offset, and read into buf
-		 */
-
-		lseek(fd, offset, SEEK_SET);
-		nbytes = read(fd, bufstart, bufend - bufstart - leftover);
-
-		if (nbytes == -1) {
-			sprintf(Wlog_Error_String,
-				"Could not read history file at offset %d - read(%d, %#o, %d) failed:  %s\n",
-				offset, fd, (int)bufstart,
-				bufend - bufstart - leftover, strerror(errno));
-			return -1;
-		}
-
-		cp = bufend;
-		leftover = 0;
-
-		while (cp >= bufstart) {
-
-			/*
-			 * If cp-bufstart is not large enough to hold a piece
-			 * of record length information, copy remainder to end
-			 * of buf and continue reading the file.
-			 */
-
-			if (cp - bufstart < 2) {
-				leftover = cp - bufstart;
-				memcpy(bufend - leftover, bufstart, leftover);
-				break;
-			}
-
-			/*
-			 * Extract the record length.  We must do it this way
-			 * instead of casting cp to an int because cp might
-			 * not be word aligned.
-			 */
-
-			reclen = (*(cp-2) * 256) + *(cp -1);
-
-			/*
-			 * If cp-bufstart isn't large enough to hold a
-			 * complete record, plus the length information, copy
-			 * the leftover bytes to the end of buf and continue
-			 * reading.
-			 */
-
-			if (cp - bufstart < reclen + 2) {
-				leftover = cp - bufstart;
-				memcpy(bufend - leftover, bufstart, leftover);
-				break;
-			}
-
-			/*
-			 * Adjust cp to point at the start of the record.
-			 * Copy the record into wbuf so that it is word
-			 * aligned and pass the record to the user supplied
-			 * function.
-			 */
-
-			cp -= reclen + 2;
-			memcpy(albuf, cp, reclen);
-
-			wlog_rec_unpack(&wrec, albuf);
-
-			/*
-			 * Call the user supplied function -
-			 * stop if instructed to.
-			 */
-
-			if ((rval = (*func)(&wrec, data)) == WLOG_STOP_SCAN) {
-				break;
-			}
-
-			recnum++;
-
-			if (nrecs && recnum >= nrecs)
-				break;
-		}
-	}
-
-	return 0;
-}
-
-/*
- * The following 2 routines are used to pack and unpack the user
- * visible wlog_rec structure to/from a character buffer which is
- * stored or read from the write logfile.  Any changes to either of
- * these routines must be reflected in the other.
- */
-
-static int
-wlog_rec_pack(wrec, buf, flag)
-struct wlog_rec	*wrec;
-char		*buf;
-int             flag;
-{
-	char			*file, *host, *pattern;
-	struct wlog_rec_disk	*wrecd;
-
-	wrecd = (struct wlog_rec_disk *)buf;
-
-	wrecd->w_pid = (uint)wrec->w_pid;
-	wrecd->w_offset = (uint)wrec->w_offset;
-	wrecd->w_nbytes = (uint)wrec->w_nbytes;
-	wrecd->w_oflags = (uint)wrec->w_oflags;
-	wrecd->w_done = (uint)wrec->w_done;
-	wrecd->w_async = (uint)wrec->w_async;
-
-	wrecd->w_pathlen = (wrec->w_pathlen > 0) ? (uint)wrec->w_pathlen : 0;
-	wrecd->w_hostlen = (wrec->w_hostlen > 0) ? (uint)wrec->w_hostlen : 0;
-	wrecd->w_patternlen = (wrec->w_patternlen > 0) ? (uint)wrec->w_patternlen : 0;
-
-	/*
-	 * If flag is true, we should also pack the variable length parts
-	 * of the wlog_rec.  By default, we only pack the fixed length
-	 * parts.
-	 */
-
-	if (flag) {
-		file = buf + sizeof(struct wlog_rec_disk);
-		host = file + wrecd->w_pathlen;
-		pattern = host + wrecd->w_hostlen;
-	
-		if (wrecd->w_pathlen > 0)
-			memcpy(file, wrec->w_path, wrecd->w_pathlen);
-	
-		if (wrecd->w_hostlen > 0)
-			memcpy(host, wrec->w_host, wrecd->w_hostlen);
-	
-		if (wrecd->w_patternlen > 0)
-			memcpy(pattern, wrec->w_pattern, wrecd->w_patternlen);
-
-		return (sizeof(struct wlog_rec_disk) +
-			wrecd->w_pathlen + wrecd->w_hostlen + wrecd->w_patternlen);
-	} else {
-		return sizeof(struct wlog_rec_disk);
-	}
-}
-
-static int
-wlog_rec_unpack(wrec, buf)
-struct wlog_rec	*wrec;
-char		*buf;
-{
-	char			*file, *host, *pattern;
-	struct wlog_rec_disk	*wrecd;
-
-	bzero((char *)wrec, sizeof(struct wlog_rec));
-	wrecd = (struct wlog_rec_disk *)buf;
-
-	wrec->w_pid = wrecd->w_pid;
-	wrec->w_offset = wrecd->w_offset;
-	wrec->w_nbytes = wrecd->w_nbytes;
-	wrec->w_oflags = wrecd->w_oflags;
-	wrec->w_hostlen = wrecd->w_hostlen;
-	wrec->w_pathlen = wrecd->w_pathlen;
-	wrec->w_patternlen = wrecd->w_patternlen;
-	wrec->w_done = wrecd->w_done;
-	wrec->w_async = wrecd->w_async;
-
-	if (wrec->w_pathlen > 0) {
-		file = buf + sizeof(struct wlog_rec_disk);
-		memcpy(wrec->w_path, file, wrec->w_pathlen);
-	}
-
-	if (wrec->w_hostlen > 0) {
-		host = buf + sizeof(struct wlog_rec_disk) + wrec->w_pathlen;
-		memcpy(wrec->w_host, host, wrec->w_hostlen);
-	}
-
-	if (wrec->w_patternlen > 0) {
-		pattern = buf + sizeof(struct wlog_rec_disk) +
-			wrec->w_pathlen + wrec->w_hostlen;
-		memcpy(wrec->w_pattern, pattern, wrec->w_patternlen);
-	}
-
-	return 0;
-}
diff --git a/winsup/testsuite/winsup.api/checksignal.c b/winsup/testsuite/winsup.api/checksignal.c
deleted file mode 100644
index edf720c87..000000000
--- a/winsup/testsuite/winsup.api/checksignal.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <errno.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "checksignal";    	/* Test program identifier. */
-int TST_TOTAL = 3;              /* Total number of test cases. */
-extern int Tst_count;           /* Test Case counter for tst_* routines */
-
-void
-sig_handler (int signo)
-{
-  errno = EINVAL;
-}
-
-int
-main ()
-{
-  int n, ret;
-  int fds[2];
-  char buf[10];
-  struct sigaction act;
-
-  Tst_count = 0;
-
-  if (pipe (fds) < 0)
-    tst_brk (TBROK, NULL, NULL, "Create pipe");
-
-  /* Reset SA_RESTART flag. */
-  while ((ret = sigaction (SIGALRM, NULL, &act)) == EINTR)
-    ;
-  if (ret)
-    tst_brk (TBROK, NULL, NULL, "Get signal action structure");
-  act.sa_flags &= ~SA_RESTART;
-  while ((ret = sigaction (SIGALRM, &act, NULL)) == EINTR)
-    ;
-  if (ret)
-    tst_brk (TBROK, NULL, NULL, "Reset SA_RESTART");
-
-  /* Set signal handler using signal(2) call... */
-  if (signal (SIGALRM, sig_handler) < 0)
-    tst_brk (TBROK, NULL, NULL, "Call signal() to install signal handler");
-  /* ...and check if signal(2) sets SA_RESTART again. */
-  while ((ret = sigaction (SIGALRM, NULL, &act)) == EINTR)
-    ;
-  if (ret)
-    tst_brk (TBROK, NULL, NULL, "Get signal action structure");
-  tst_resm (act.sa_flags & SA_RESTART ? TPASS : TFAIL,
-	    "signal() sets SA_RESTART");
-
-  /* Reset SA_RESTART flag again. */
-  act.sa_handler = sig_handler;
-  act.sa_flags &= ~SA_RESTART;
-  while ((ret = sigaction (SIGALRM, &act, NULL)) == EINTR)
-    ;
-  if (ret)
-    tst_brk (TBROK, NULL, NULL, "Reset SA_RESTART");
-
-  /* Start timer to force a SIGALRM. */
-  alarm (1);
-
-  /* Call read(2) to check if the EINTR errno is correctly preserved,
-     even if the signal handler routine changes errno. */
-  n = read(fds[0], buf, 10);
-  tst_resm (n < 0 && errno == EINTR ? TPASS : TFAIL,
-	    "Set EINTR on interrupted read() call");
-
-  /* Check if another errno is correctly returned (here EBADF). */
-  close (fds[0]);
-  n = read(fds[0], buf, 10);
-  tst_resm (n < 0 && errno == EBADF ? TPASS : TFAIL,
-  	    "Set EBADF on closed file descriptor");
-
-  tst_exit ();
-}
diff --git a/winsup/testsuite/winsup.api/crlf.c b/winsup/testsuite/winsup.api/crlf.c
deleted file mode 100644
index ea79122f0..000000000
--- a/winsup/testsuite/winsup.api/crlf.c
+++ /dev/null
@@ -1,527 +0,0 @@
-typedef enum {
-  Nop=100000,	/* 	; do nothing */
-  New1,		/*	; reset and begin new  test */
-  Open,		/* 	; open test file */
-  Read,		/* [askfor] [get] ; read bytes into buffer */
-  Write,	/* [expect] [bytestream] ; write to file (expect 0 = ignore)*/
-  Compare,	/* [bytestream] ; compare buffer to given bytes */
-  Verify,	/* [bytestream] ; compare file to given bytes */
-  Seek,		/* [offset] [whence] ; seek in file */
-  Tell,		/* [offset] ; compare file positions */
-  BufSize,	/* [size] ; change the stdio buffer size */
-  Flush,	/*	; flush the stdio stream */
-  Text,		/* 	; switch file to text mode */
-  Binary,	/* 	; switch file to binary mode */
-  Rep,		/* [count] ; repeat 'R' bytes (used in bytestream) */
-  Fill,		/* [posn] ; fill 'F' until given byte position */
-  Start,	/*	; for Seek */
-  Current,	/*	; for Seek */
-  End,		/* 	; for Seek, or end of byte stream */
-  Max } Opcode;
-
-#define New New1,__LINE__
-
-/* Byte streams are just inserted into the command stream, and must
-   end in an End code. */
-
-int commands[] = {
-#ifndef __DJGPP__
-  New,
-  Write, 1605, Rep, 1600, 'h', 'e', 'l', 'l', 'o', End,
-  Tell, 1605,
-
-  Open,
-  BufSize, 16,
-  Read, 1605, 1605,
-  Compare, Rep, 1600, 'h', 'e', 'l', 'l', 'o', End,
-  Tell, 1605,
-  Flush,
-  Tell, 1605,
-  Seek, 1000, Start,
-  Tell, 1000,
-
-  New,
-  Text,
-  Write, 2, 'x', 10, End,
-  Verify, 'x', 13, 10, End,
-
-  New,
-  Binary,
-  Write, 2, 'x', 10, End,
-  Verify, 'x', 10, End,
-
-  BufSize, 16,
-
-  New,
-  Binary,
-  Write, 0, Fill, 15, 13, 10, 'x', End,
-  Text,  Open,
-  Read, 17, 17,
-  Compare, Fill, 15, 10, 'x', End,
-  Tell, 18,
-
-  New,
-  Binary,
-  Write, 0, Fill, 14, 13, 10, 'x', End,
-  Text,  Open,
-  Read, 16, 16,
-  Compare, Fill, 14, 10, 'x', End,
-  Tell, 17,
-
-  New,
-  Binary,
-  Write, 0, 13, 10, 'a', 'b', End,
-  Text, Open,
-  Read, 2, 2,
-  Compare, 10, 'a', End,
-  Tell, 3,
-
-  New,
-  Binary,
-  Write, 0, 10, 'a', 'b', End,
-  Text, Open,
-  Read, 2, 2,
-  Compare, 10, 'a', End,
-  Tell, 2,
-
-  New,
-  Binary,
-  Write, 0, 13, 'a', 'b', End,
-  Text, Open,
-  Read, 2, 2,
-  Compare, 13, 'a', End,
-  Tell, 2,
-
-  New,
-  Binary,
-  Write, 0, 13, 13, 10, 'a', End,
-  Text, Open,
-  Read, 2, 2,
-  Compare, 13, 10, End,
-  Tell, 3,
-
-  New,
-  Binary,
-  Write, 0, 13, 10, 'a', 13, End,
-  Text, Open,
-  Read, 2, 2,
-  Compare, 10, 'a', End,
-  Tell, 3,
-
-  New,
-  Binary,
-  Write, 0, 13, 10, 'a', 10, End,
-  Text, Open,
-  Read, 2, 2,
-  Compare, 10, 'a', End,
-  Tell, 3,
-
-  New,
-  Binary,
-  Write, 0, 13, 13, 13, 10, 'a', 10, 10, 10, End,
-  Text, Open,
-  Read, 4, 4,
-  Compare, 13, 13, 10, 'a', End,
-  Tell, 5,
-#endif
-
-  New,
-  Binary,
-  Write, 0, 13, 13, 13, 10, 'a', 'b', 13, 10, 13, 10, End,
-  Text, Open,
-  Read, 4, 4,
-  Compare, 13, 13, 10, 'a', End,
-  Tell, 5,
-
-  };
-
-/*==========================================================================*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-#ifndef O_TEXT
-#define O_TEXT 0
-#endif
-
-int errors = 0;
-
-#define num_commands (int)(sizeof(commands)/sizeof(commands[0]))
-
-int pc;
-int askfor, get, expect, count, posn, whence, size;
-
-typedef struct {
-  unsigned char *bytes;
-  int max, count;
-} Buffer;
-
-Buffer rw_buf={0,0,0}, cmp_buf={0,0,0}, vfy_buf={0,0,0};
-
-void
-expand_buf(Buffer *buf, int len)
-{
-  if (buf->max < len)
-    {
-      buf->max = len+20;
-      if (buf->bytes)
-	buf->bytes = (unsigned char *)realloc(buf->bytes, buf->max);
-      else
-	buf->bytes = (unsigned char *)malloc(buf->max);
-    }
-}
-
-void
-get_bytestream(Buffer *buf)
-{
-  int tpc;
-  int len = 0, rep, byte;
-  unsigned char *bp;
-
-  for (tpc = pc+1; tpc < num_commands && commands[tpc] != End; tpc++)
-    {
-      switch (commands[tpc])
-	{
-	case Rep:
-	  len += commands[tpc+1];
-	  tpc ++;
-	  break;
-	case Fill:
-	  if (len < commands[tpc+1])
-	    len = commands[tpc+1];
-	  tpc ++;
-	  break;
-	default:
-	  len ++;
-	  break;
-	}
-    }
-
-  expand_buf(buf, len);
-
-  len = 0;
-  bp = buf->bytes;
-
-  for (tpc = pc+1; tpc < num_commands && commands[tpc] != End; tpc++)
-    {
-      switch (commands[tpc])
-	{
-	case Rep:
-	  rep = commands[++tpc];
-	  byte = 'R';
-	  while (rep--) *bp++ = byte;
-	  break;
-	case Fill:
-	  rep = commands[++tpc];
-	  byte = 'F';
-	  while (bp-buf->bytes < rep) *bp++ = byte;
-	  break;
-	default:
-	  *bp++ = commands[tpc];
-	  break;
-	}
-    }
-  buf->count = bp - buf->bytes;
-  pc = tpc;
-}
-
-char dataname[] = "crlf.dat";
-
-int verbose=0;
-void
-v(char *fmt, ...)
-{
-  va_list ap;
-  if (!verbose) return;
-  va_start(ap, fmt);
-  vfprintf(stdout, fmt, ap);
-  va_end(ap);
-  printf("\n");
-}
-
-void
-vp(const char *fmt, ...)
-{
-  va_list ap;
-  if (!verbose) return;
-  printf("%08x: ", pc);
-  va_start(ap, fmt);
-  vfprintf(stdout, fmt, ap);
-  va_end(ap);
-  printf("\n");
-}
-
-void
-errorq(int use_errno, const char *fmt, ...)
-{
-  va_list ap;
-  fprintf(stderr, "crlf: Error at pc=%d: ", pc);
-  va_start(ap, fmt);
-  vfprintf(stderr, fmt, ap);
-  va_end(ap);
-  fprintf(stderr, "\n");
-  if (use_errno)
-    perror("The error was");
-  errors++;
-}
-
-void
-error(int use_errno, const char *fmt, ...)
-{
-  va_list ap;
-  fprintf(stderr, "crlf: Error at pc=%d: ", pc);
-  va_start(ap, fmt);
-  vfprintf(stderr, fmt, ap);
-  va_end(ap);
-  fprintf(stderr, "\n");
-  if (use_errno)
-    perror("The error was");
-  fprintf(stderr, "FAIL\n");
-  exit(1);
-}
-
-void
-display_buf(const char *which, Buffer *buf, int ofs)
-{
-  int i;
-  fprintf(stderr, "%s %04x:", which, ofs);
-  for (i=0; i<8; i++)
-    if (i+ofs < buf->count)
-      {
-	unsigned char b = buf->bytes[i+ofs];
-	fprintf(stderr, " %02x", b);
-	if (isgraph(b))
-	  fprintf(stderr, " %c ", b);
-	else
-	  fprintf(stderr, " . "/*, b*/);
-      }
-  fprintf(stderr, "\n");
-}
-
-void
-compare_bufs(const char *name, Buffer *actual, Buffer *expected)
-{
-  int i, got_one=0;
-  for (i=0; i<actual->count && i<expected->count; i++)
-    if (actual->bytes[i] != expected->bytes[i])
-      {
-	errorq(0, "%s: byte mismatch at offset 0x%x", name, i);
-	got_one = 1;
-	break;
-      }
-  if (!got_one)
-    {
-      if (actual->count < expected->count)
-	errorq(0, "%s: too few bytes (0x%x vs 0x%x)", name,
-	      actual->count, expected->count);
-      else if (actual->count > expected->count)
-	errorq(0, "%s: too many bytes (0x%x vs 0x%x)", name,
-	      actual->count, expected->count);
-      else
-	return;
-    }
-
-  i -= 4;
-  if (i<0) i = 0;
-  display_buf("Actual  ", actual, i);
-  display_buf("Expected", expected, i);
-}
-
-int
-main(int argc, char **argv)
-{
-  const char *readmode = "rb";
-  const char *writemode = "wb";
-  FILE *file = 0;
-  int i;
-  struct stat st;
-  const char *str = "";
-
-  while (argc > 1 && argv[1][0] == '-')
-    {
-      if (strcmp(argv[1], "-v") == 0)
-	verbose++;
-      argc--;
-      argv++;
-    }
-
-  size = 0;
-
-  for (pc=0; pc<num_commands; pc++)
-    {
-      switch (commands[pc])
-	{
-	case Nop:
-	  vp("Nop");
-	  break;
-
-	case New1:
-	  i = commands[++pc];
-	  vp("New %d", i);
-	  if (file) fclose(file);
-	  file = 0;
-	  remove(dataname);
-	  break;
-
-	case Open:
-	  vp("Open");
-	  if (file) fclose(file);
-	  file = 0;
-	  break;
-
-	case Read:
-	  if (!file)
-	    {
-	      file = fopen(dataname, readmode);
-	      if (size)
-		setvbuf(file, 0, _IOFBF, size);
-	    }
-	  if (!file)
-	    error(1, "cannot open %s, mode %s", dataname, readmode);
-	  askfor = commands[++pc];
-	  get = commands[++pc];
-	  vp("Read %d %d", askfor, get);
-	  expand_buf(&rw_buf, askfor);
-	  if (askfor == 1)
-	    {
-	      i = getc(file);
-	      rw_buf.bytes[0] = i;
-	      i = (i == EOF) ? 0 : 1;
-	    }
-	  else
-	    i = fread(rw_buf.bytes, 1, askfor, file);
-	  if (i != get)
-	    error(0, "read wrong number of bytes (%d vs %d)", i, get);
-	  rw_buf.count = i;
-	  break;
-
-	case Write:
-	  if (!file)
-	    {
-	      file = fopen(dataname, writemode);
-	      if (size)
-		setvbuf(file, 0, _IOFBF, size);
-	    }
-	  if (!file)
-	    error(1, "cannot open %s, mode %s\n", dataname, writemode);
-	  expect = commands[++pc];
-	  get_bytestream(&rw_buf);
-	  vp("Write %d %d", rw_buf.count, expect);
-	  if (askfor == 1)
-	    {
-	      i = putc(rw_buf.bytes[0], file);
-	      i = (i == EOF) ? 0 : 1;
-	    }
-	  else
-	    i = fwrite(rw_buf.bytes, 1, rw_buf.count, file);
-	  if (expect && (i != expect))
-	    error(0, "wrote wrong number of bytes (%d vs %d)", i, expect);
-	  break;
-
-	case Compare:
-	  get_bytestream(&cmp_buf);
-	  vp("Compare %d/%d", rw_buf.count, cmp_buf.count);
-	  compare_bufs("Compare", &rw_buf, &cmp_buf);
-	  break;
-
-	case Verify:
-	  if (file) fclose(file);
-	  file = 0;
-	  get_bytestream(&cmp_buf);
-	  vp("Verify %s", dataname);
-	  if (stat(dataname, &st))
-	    error(1, "Can't stat %s", dataname);
-	  expand_buf(&vfy_buf, st.st_size);
-	  i = open(dataname, O_RDONLY|O_BINARY, 0);
-	  vfy_buf.count = read(i, vfy_buf.bytes, st.st_size);
-	  close(i);
-	  compare_bufs("Verify", &vfy_buf, &cmp_buf);
-	  break;
-
-	case Seek:
-	  posn = commands[++pc];
-	  whence = commands[++pc];
-	  switch (whence)
-	    {
-	    case Start:
-	      whence = SEEK_SET;
-	      str = "Start";
-	      break;
-	    case Current:
-	      whence = SEEK_CUR;
-	      str = "Current";
-	      break;
-	    case End:
-	      whence = SEEK_END;
-	      str = "End";
-	      break;
-	    }
-	  vp("Seek 0x%x %s", posn, str);
-	  i = fseek(file, posn, whence);
-	  if (i)
-	    error(1, "fseek failed");
-	  break;
-
-	case Tell:
-	  posn = commands[++pc];
-	  vp("Tell 0x%x", posn);
-	  i = ftell(file);
-	  if (i != posn)
-	    error(0, "ftell failed, got 0x%x expected 0x%x", i, posn);
-	  break;
-
-	case BufSize:
-	  size = commands[++pc];
-	  vp("BufSize 0x%x", size);
-	  if (file)
-	    {
-	      fflush(file);
-	      setvbuf(file, 0, _IOFBF, size);
-	    }
-	  break;
-
-	case Flush:
-	  vp("Flush");
-	  if (file)
-	    fflush(file);
-	  break;
-
-	case Text:
-	  vp("Text");
-	  readmode = "rt";
-	  writemode = "wt";
-	  break;
-
-	case Binary:
-	  vp("Binary");
-	  readmode = "rb";
-	  writemode = "wb";
-	  break;
-
-	default:
-	  printf("Invalid command code %d at offset %d\n", commands[pc], pc);
-	  exit(1);
-	}
-    }
-
-  if (file) fclose(file);
-
-  if (errors)
-    printf("FAIL: %d error%s\n", errors, errors==1?"":"s");
-  else
-    {
-      printf("PASS\n");
-      unlink (dataname);
-    }
-  return errors;
-}
diff --git a/winsup/testsuite/winsup.api/devzero.c b/winsup/testsuite/winsup.api/devzero.c
deleted file mode 100644
index 948b0bff5..000000000
--- a/winsup/testsuite/winsup.api/devzero.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-int
-main(int argc, char **argv)
-{
-  int fd, r, l;
-  char buf[1024];
-  char *v;
-
-  fd = open("/dev/zero", O_RDONLY);
-  if (fd < 0)
-    {
-      fprintf(stderr, "Unable to open /dev/zero for reading\n");
-      perror("The error was");
-      exit(1);
-    }
-
-  l = read(fd, buf, 1024);
-  if (l != 1024)
-    {
-      fprintf(stderr, "Asked to read 1024 bytes, got %d\n", l);
-      exit(1);
-    }
-
-  for (r=0; r<1024; r++)
-    if (buf[r] != 0)
-      {
-	fprintf(stderr, "/dev/zero returned a byte of %02x at offset %d\n",
-		buf[r], r);
-	exit(1);
-      }
-
-  l = lseek(fd, 4096, 0);
-  if (l != 0)
-    {
-      fprintf(stderr, "l == %d\n", l);
-      exit(1);
-    }
-
-  l = close(fd);
-  if (l != 0)
-    {
-      fprintf(stderr, "close: returned %d\n", l);
-      perror("The error was");
-      exit(1);
-    }
-
-  fd = open("/dev/zero", O_WRONLY);
-  if (fd < 0)
-    {
-      fprintf(stderr, "Unable to open /dev/zero for writing\n");
-      perror("The error was");
-      exit(1);
-    }
-
-  l = write(fd, buf, 1024);
-  if (l != 1024)
-    {
-      fprintf(stderr, "Asked to write 1024 bytes, got %d\n", l);
-      exit(1);
-    }
-
-  l = close(fd);
-  if (l != 0)
-    {
-      fprintf(stderr, "close: returned %d\n", l);
-      perror("The error was");
-      exit(1);
-    }
-
-  fd = open("/dev/zero", O_RDWR);
-  v = (char *)mmap(0, 65536, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
-  if (v == (char *)-1)
-    {
-      fprintf(stderr, "mmap r/w /dev/zero failed\n");
-      perror("The error was");
-      exit(1);
-    }
-
-  for (r=0; r<65536; r++)
-    if (v[r] != 0)
-      {
-	fprintf(stderr, "mmap'd r/w /dev/zero has byte %d at offset %d\n",
-		v[r], r);
-	exit(1);
-      }
-  munmap(v, 65536);
-  close(fd);
-
-  fd = open("/dev/zero", O_RDONLY);
-  v = (char *)mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);
-  if (v == (char *)-1)
-    {
-      fprintf(stderr, "mmap /dev/zero r/o failed\n");
-      perror("The error was");
-      exit(1);
-    }
-
-  for (r=0; r<65536; r++)
-    if (v[r] != 0)
-      {
-	fprintf(stderr, "mmap'd r/o /dev/zero has byte %d at offset %d\n",
-		v[r], r);
-	exit(1);
-      }
-  munmap(v, 65536);
-  close(fd);
-
-  exit(0);
-}
diff --git a/winsup/testsuite/winsup.api/iospeed.c b/winsup/testsuite/winsup.api/iospeed.c
deleted file mode 100644
index 56bf715cf..000000000
--- a/winsup/testsuite/winsup.api/iospeed.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <windows.h>
-
-int verbose = 0;
-
-void
-v(char *fmt, ...)
-{
-  va_list ap;
-  if (!verbose) return;
-  va_start(ap, fmt);
-  vfprintf(stdout, fmt, ap);
-  va_end(ap);
-}
-
-#define TSIZE (1024 * 1024 * 16)
-
-unsigned long start_tic;
-
-void
-start(FILE *f)
-{
-  fseek(f, 0, SEEK_SET);
-  start_tic = GetTickCount();
-}
-
-void
-end()
-{
-  unsigned long end_tic = GetTickCount();
-  printf("%6ld", end_tic - start_tic);
-}
-
-void
-test(int linesz, int cr)
-{
-  FILE *f = fopen("iospeed.dat", "wb");
-  char buf[65536];
-  int i, fd;
-
-  memset(buf, 'x', linesz);
-  buf[linesz-1] = '\n';
-  if (cr)
-    buf[linesz-2] = '\r';
-  for (i=0; i<TSIZE; i += linesz)
-    fwrite(buf, 1, linesz, f);
-  fclose(f);
-
-  f = fopen("iospeed.dat", "rt");
-  fd = fileno(f);
-
-  printf("%6d%6d", linesz, cr);
-  for (i=0; i<TSIZE; i+= 65536)
-    read(fd, buf, 65536);
-
-  start(f);
-  while (getc(f) != EOF);
-  end();
-
-  start(f);
-  while (fread(buf, 1, 256, f) > 0);
-  end();
-
-  start(f);
-  while (fgets(buf, 64436, f));
-  end();
-
-  f = fopen("iospeed.dat", "rb");
-  fd = fileno(f);
-
-  for (i=0; i<TSIZE; i+= 65536)
-    read(fd, buf, 65536);
-
-  start(f);
-  while (getc(f) != EOF);
-  end();
-
-  start(f);
-  while (fread(buf, 1, 256, f) > 0);
-  end();
-
-  start(f);
-  while (fgets(buf, 64436, f));
-  end();
-
-  printf("\n");
-}
-
-int
-main(int argc, char **argv)
-{
-  if (argc > 1 && strcmp(argv[1],"-v") == 0)
-    verbose = 1;
-
-  setbuf(stdout, 0);
-
-  printf("              ----- text -----  ---- binary ----\n");
-  printf("linesz    cr  getc fread fgets  getc fread fgets\n");
-
-  test(4, 0);
-  test(64, 0);
-  test(4096, 0);
-  test(4, 1);
-  test(64, 1);
-  test(4096, 1);
-
-  remove ("iospeed.dat");
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/known_bugs.tcl b/winsup/testsuite/winsup.api/known_bugs.tcl
deleted file mode 100644
index f3fc01527..000000000
--- a/winsup/testsuite/winsup.api/known_bugs.tcl
+++ /dev/null
@@ -1,8 +0,0 @@
-set xfail_list [list dup03 dup05 \
-    fcntl05 fcntl07B \
-    lseek04 mknod01 select03 \
-    setgroups01 setuid02 \
-    ulimit01 unlink06 unlink08 \
-    sample-fail sample-miscompile]
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/access01.c b/winsup/testsuite/winsup.api/ltp/access01.c
deleted file mode 100644
index ae9be948a..000000000
--- a/winsup/testsuite/winsup.api/ltp/access01.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: access01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for access(2) using F_OK,
- *                        R_OK, W_OK and X_OK arguments.
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 6
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) access(2) returns 0 for F_OK...(See Description)
- * 	2.) access(2) returns 0 for R_OK...(See Description)
- * 	3.) access(2) returns 0 for W_OK...(See Description)
- * 	4.) access(2) returns 0 for X_OK...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- * 	The libcuts.a and libsys.a libraries must be included in 
- *	the compilation of this test.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the access(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	access(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- *	  Create a temp directory and cd to it.
- *	  Creat a temp file wil read, write and execute permissions.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- *	  Execute system call with F_OK on tmp file
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- *	  Execute system call with X_OK on tmp file...
- *	  Execute system call with W_OK on tmp file...
- * 	  Execute system call with R_OK on tmp file...
- * 
- * 	Cleanup:
- * 	  Print errno log
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include "test.h"
-#include "usctest.h"
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID="access01"; 	/* Test program identifier.    */
-int TST_TOTAL=4;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-
-char Fname[255];
-
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int main(int ac, char **av)
-{
-    struct test_case_t {
-        char *file;
-        unsigned mode;
-        const char *string;
-        int experrno;
-    } Test_cases[] = {
-        { Fname, F_OK,  "F_OK", 0 },
-        { Fname, X_OK,  "X_OK", 0 },
-        { Fname, W_OK,  "W_OK", 0 },
-        { Fname, R_OK,  "R_OK", 0 },
-    };
-
-    int Ntc = sizeof(Test_cases) / sizeof(struct test_case_t);
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    int tc;
-
-    TST_TOTAL=Ntc;
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	for (tc=0; tc<Ntc; tc++) {
-	    /* 
-	     * Call access(2) 
-	     */
-	    TEST(access(Test_cases[tc].file, Test_cases[tc].mode));
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 && Test_cases[tc].experrno == 0 ) {
-	        tst_resm(TFAIL, "access(%s, %s) Failed, errno=%d : %s", 
-		     Test_cases[tc].file, Test_cases[tc].string, 
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-
-	    } else if ( TEST_RETURN != -1 && Test_cases[tc].experrno != 0 ) {
-		tst_resm(TFAIL, "access(%s, %s) returned %d, exp -1, errno:%d",
-		    Test_cases[tc].file, Test_cases[tc].string,
-		    TEST_RETURN, Test_cases[tc].experrno);
-	    } else {
-
-	        /***************************************************************
-	         * only perform functional verification if flag set (-f not given)
-	         ***************************************************************/
-	        if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "access(%s, %s) returned %d", 
-			Test_cases[tc].file, Test_cases[tc].string, 
-		        TEST_RETURN);
-	        } 
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{ 
-    int fd;
-    struct stat stbuf;
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    umask(0);	/* reset umask avoid it affects on modes */
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* 
-     * Since files inherit group ids, make sure our dir has a valid grp
-     * to us.
-     */
-    chown(".", -1, getgid());
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(Fname,"accessfile");
-
-    if ((fd = open(Fname, O_RDWR|O_CREAT, 06777)) == -1) {
-        tst_brkm(TBROK, cleanup, "open(%s, O_RDWR|O_CREAT,06777) Failed, errno=%d : %s",
-	    Fname, errno, strerror(errno));
-    }
-    else if (close(fd) == -1) {
-        tst_resm(TINFO, "close(%s) Failed, errno=%d : %s",
-	    Fname, errno, strerror(errno));
-    }
-
-    /*
-     * force the mode to be set to 6777
-     */
-    if (chmod(Fname, 06777) == -1 ) {
-	tst_brkm(TBROK, cleanup, "chmod(%s, 06777) failed, errno:%d %s\n",
-	    Fname, errno, strerror(errno));
-    }
-
-    stat(Fname, &stbuf);
-
-    if ( (stbuf.st_mode & 06777) != 06777 ) {
-	/*
-	 * file can not be properly setup
-	 */
-    }
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove the temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/access03.c b/winsup/testsuite/winsup.api/ltp/access03.c
deleted file mode 100644
index f0870a6fa..000000000
--- a/winsup/testsuite/winsup.api/ltp/access03.c
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: access03
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: EFAULT error testing for access(2)
- * 
- *    PARENT DOCUMENT	: acstds01
- * 
- *    TEST CASE TOTAL	: 8
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Kathy Olmsted
- * 
- *    CO-PILOT		: Tom Hampson
- * 
- *    DATE STARTED	: 05/13/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	access(2) test for errno(s) EFAULT.
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    DETAILED DESCRIPTION
- *
- * 	Setup:
- * 	  Setup signal handling.
- *        Make and change to a temporary directory.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno.
- *        If doing functional test
- *            check the errno returned and print result message
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- *        Remove the temporary directory and exit. 
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
- 
-#include "test.h"
-#include "usctest.h"
-
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-char *get_high_address();
-
-const char *TCID="access03";		/* Test program identifier.    */
-int TST_TOTAL=8;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={EFAULT, 0};  /* List must end with 0 */
-
-int main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-     
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos. */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *  R_OK on low pointer (-1) for path
-	 */
-	 
-
-	/* Call access(2) */
-	TEST(access( (char *)-1,R_OK));
-	
-
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS, 
-		       "access((char *)-1,R_OK) failed as expected with errno %d (EFAULT) : %s",
-		       TEST_ERRNO, strerror(TEST_ERRNO));
-	    }
-	    else {
-	      tst_resm(TFAIL, 
-		       "access((char *)-1,R_OK) failed with errno %d : %s but expected %d (EFAULT)",
-		       TEST_ERRNO, strerror(TEST_ERRNO),EFAULT);
-	    }
-	  }
-	  else {
-	    tst_resm(TFAIL,
-		       "access((char *)-1,R_OK) succeeded unexpectedly.");
-
-	  }
-	} 
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  W_OK on low pointer (-1) for path
-	 */
-	 
-
-	/* Call access(2) */
-	TEST(access( (char *)-1,W_OK));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS, 
-		       "access((char *)-1,W_OK) failed as expected with errno %d (EFAULT) : %s",
-		       TEST_ERRNO, strerror(TEST_ERRNO));
-	    }
-	    else {
-	      tst_resm(TFAIL, 
-		       "access((char *)-1,W_OK) failed with errno %d : %s but expected %d (EFAULT)",
-		       TEST_ERRNO, strerror(TEST_ERRNO),EFAULT);
-	    }
-	  }
-	  else {
-	    tst_resm(TFAIL,
-		       "access((char *)-1,W_OK) succeeded unexpectedly.");
-
-	  }
-	} 
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  X_OK on low pointer (-1) for path
-	 */
-	 
-
-	/* Call access(2) */
-	TEST(access( (char *)-1,X_OK));
-	
-
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS, 
-		       "access((char*)-1,X_OK) failed as expected with errno %d (EFAULT) : %s",
-		       TEST_ERRNO, strerror(TEST_ERRNO));
-	    }
-	    else {
-	      tst_resm(TFAIL, 
-		       "access((char*)-1,X_OK) failed with errno %d : %s but expected %d (EFAULT)",
-		       TEST_ERRNO, strerror(TEST_ERRNO),EFAULT);
-	    }
-	  }
-	  else {
-	    tst_resm(TFAIL,
-		       "access((char*)-1,X_OK) succeeded unexpectedly.");
-
-	  }
-	} 
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  F_OK on low pointer (-1) for path
-	 */
-	 
-
-	/* Call access(2) */
-	TEST(access( (char *)-1,F_OK));
-	
-
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS, 
-		       "access((char*)-1,F_OK) failed as expected with errno %d (EFAULT) : %s",
-		       TEST_ERRNO, strerror(TEST_ERRNO));
-	    }
-	    else {
-	      tst_resm(TFAIL, 
-		       "access((char*)-1,F_OK) failed with errno %d : %s but expected %d (EFAULT)",
-		       TEST_ERRNO, strerror(TEST_ERRNO),EFAULT);
-	    }
-	  }
-	  else {
-	    tst_resm(TFAIL,
-		       "access((char*)-1,F_OK) succeeded unexpectedly.");
-
-	  }
-	} 
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  R_OK on high pointer (sbrk(0)+1) for path
-	 */
-	 
-
-	/* Call access(2) */
-	TEST(access(get_high_address(),R_OK));
-	
-
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS, 
-		       "access((char*)sbrk(0)+1,R_OK) failed as expected with errno %d (EFAULT) : %s",
-		       TEST_ERRNO, strerror(TEST_ERRNO));
-	    }
-	    else {
-	      tst_resm(TFAIL, 
-		       "access((char*)sbrk(0)+1,R_OK) failed with errno %d : %s but expected %d (EFAULT)",
-		       TEST_ERRNO, strerror(TEST_ERRNO),EFAULT);
-	    }
-	  }
-	  else {
-	    tst_resm(TFAIL,
-		       "access((char*)sbrk(0)+1,R_OK) succeeded unexpectedly.");
-
-	  }
-	} 
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  W_OK on high pointer (sbrk(0)+1) for path
-	 */
-	 
-
-	/* Call access(2) */
-	TEST(access(get_high_address(),W_OK));
-	
-
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS, 
-		       "access((char*)sbrk(0)+1,W_OK) failed as expected with errno %d (EFAULT) : %s",
-		       TEST_ERRNO, strerror(TEST_ERRNO));
-	    }
-	    else {
-	      tst_resm(TFAIL, 
-		       "access((char*)sbrk(0)+1,W_OK) failed with errno %d : %s but expected %d (EFAULT)",
-		       TEST_ERRNO, strerror(TEST_ERRNO),EFAULT);
-	    }
-	  }
-	  else {
-	    tst_resm(TFAIL,
-		       "access((char*)sbrk(0)+1,W_OK) succeeded unexpectedly.");
-
-	  }
-	} 
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  X_OK on high pointer (sbrk(0)+1) for path
-	 */
-	 
-
-	/* Call access(2) */
-	TEST(access(get_high_address(),X_OK));
-	
-
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS, 
-		       "access(high_address,X_OK) failed as expected with errno %d (EFAULT) : %s",
-		       TEST_ERRNO, strerror(TEST_ERRNO));
-	    }
-	    else {
-	      tst_resm(TFAIL, 
-		       "access(high_address,X_OK) failed with errno %d : %s but expected %d (EFAULT)",
-		       TEST_ERRNO, strerror(TEST_ERRNO),EFAULT);
-	    }
-	  }
-	  else {
-	    tst_resm(TFAIL,
-		       "access(high_address,X_OK) succeeded unexpectedly.");
-
-	  }
-	} 
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  F_OK on high pointer (sbrk(0)+1) for path
-	 */
-	 
-
-	/* Call access(2) */
-	TEST(access(get_high_address(),F_OK));
-	
-
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS, 
-		       "access((char*)sbrk(0)+1,F_OK) failed as expected with errno %d (EFAULT) : %s",
-		       TEST_ERRNO, strerror(TEST_ERRNO));
-	    }
-	    else {
-	      tst_resm(TFAIL, 
-		       "access((char*)sbrk(0)+1,F_OK) failed with errno %d : %s but expected %d (EFAULT)",
-		       TEST_ERRNO, strerror(TEST_ERRNO),EFAULT);
-	    }
-	  }
-	  else {
-	    tst_resm(TFAIL,
-		       "access((char*)sbrk(0)+1,F_OK) succeeded unexpectedly.");
-
-	  }
-	} 
-	
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make and change to a temporary directory */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove the temporary directory and exit with 
-       return code appropriate for results */
-    tst_rmdir();
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/access04.c b/winsup/testsuite/winsup.api/ltp/access04.c
deleted file mode 100644
index 069458886..000000000
--- a/winsup/testsuite/winsup.api/ltp/access04.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: access01
- *
- * Test Description:
- *  Verify that access() succeeds to check the existance of a file if
- *  search access is permitted on the pathname of the specified file.
- *
- * Expected Result:
- *  access() should return 0 value and the specified file should exist
- *  on the file system.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  access01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- *
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TESTDIR		"testdir"
-#define TESTFILE	"testdir/testfile"
-#define DIR_MODE	S_IRWXU | S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-
-const char *TCID="access01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* struct buffer for stat(2) */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *)NULL, NULL);
-	if (msg != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call access(2) to check the existence of a
-		 * file under specified path.
-		 */
-		TEST(access(TESTFILE, F_OK));
-
-		/* check return code of access(2) */
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL,
-				 "access(%s, F_OK) Failed, errno=%d : %s",
-				 TESTFILE, TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Use stat(2) to cross-check the
-			 * existance of testfile under
-			 * specified path.
-			 */
-			if (stat(TESTFILE, &stat_buf) < 0) {
-				tst_resm(TFAIL, "stat() on %s Failed, errno=%d",
-					 TESTFILE, TEST_ERRNO);
-			} else {
-				tst_resm(TPASS, "Functionality of access(%s, "
-					 "F_OK) successful", TESTFILE);
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *
- *  Create a temporary directory and change directory to it.
- *  Create a test directory and a file under test directory.
- *  Modify the mode permissions of testfile.
- */
-void 
-setup()
-{
-	int fd;			/* File handle for testfile */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Check that the test process id is not root/super-user */
-	if (geteuid() == 0) {
-		tst_brkm(TBROK, NULL, "Must be non-root/super for this test!");
-		tst_exit();
-	}
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a test directory under temporary directory */
-	if (mkdir(TESTDIR, DIR_MODE) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "mkdir(%s, %#o) Failed, errno=%d : %s",
-			 TESTDIR, DIR_MODE, errno, strerror(errno));
-	}
-
-	/* Make sure test directory has search permissions set */
-	if (chmod(TESTDIR, DIR_MODE) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "chmod(%s, %#o) Failed, errno=%d : %s",
-			 TESTDIR, DIR_MODE, errno, strerror(errno));
-	}
-
-	/* Creat a test file under above directory created */
-	if ((fd = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Close the testfile created above */
-	if (close(fd) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	}
-
-	/* Change the mode permissions on the testfile */
-	if (chmod(TESTFILE, 0) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "chmod(%s, 0) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	}
-}
-
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * Delete the test directory/file and temporary directory
-	 * created in the setup.
-	 */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/access05.c b/winsup/testsuite/winsup.api/ltp/access05.c
deleted file mode 100644
index 757c64f33..000000000
--- a/winsup/testsuite/winsup.api/ltp/access05.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: access03
- *
- * Test Description:
- *  Verify that,
- *   1. access() fails with -1 return value and sets errno to EACCES
- *      if the permission bits of the file mode do not permit the
- *	 requested (Read/Write/Execute) access.
- *   2. access() fails with -1 return value and sets errno to EINVAL
- *	if the specified access mode argument is invalid.
- *   3. access() fails with -1 return value and sets errno to EFAULT
- *	if the pathname points outside allocate address space for the
- *	process.
- *   4. access() fails with -1 return value and sets errno to ENOENT
- *	if the specified file doesn't exist (or pathname is NULL).
- *   5. access() fails with -1 return value and sets errno to ENAMETOOLONG
- *      if the pathname size is > PATH_MAX characters.
- *
- * Expected Result:
- *  access() should fail with return value -1 and set expected errno.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	if errno set == expected errno
- *   		Issue sys call fails with expected return value and errno.
- *   	Otherwise,
- *		Issue sys call fails with unexpected errno.
- *   Otherwise,
- *	Issue sys call returns unexpected value.
- *
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory(s)/file(s) created.
- *
- * Usage:  <for command-line>
- *  access03 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  This test should be run by 'non-super-user' only.
- * 
- */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define INV_OK		-1
-#define TEST_FILE1	"test_file1"
-#define TEST_FILE2	"test_file2"
-#define TEST_FILE3	"test_file3"
-#define TEST_FILE4	"test_file4"
-
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-
-int no_setup();
-int setup1();			/* setup() to test access() for EACCES */
-int setup2();			/* setup() to test access() for EACCES */
-int setup3();			/* setup() to test access() for EACCES */
-int setup4();			/* setup() to test access() for EINVAL */
-int longpath_setup();	/* setup function to test access() for ENAMETOOLONG */
-
-char Longpathname[PATH_MAX+2];
-char High_address_node[64];
-
-struct test_case_t {		/* test case structure */
-	const char *pathname;
-	int a_mode;
-	const char *desc;
-	int exp_errno;
-	int (*setupfunc)();
-} Test_cases[] = {
-	{ TEST_FILE1, R_OK, "Read Access denied on file", EACCES, setup1 },
-	{ TEST_FILE2, W_OK, "Write Access denied on file", EACCES, setup2 },
-	{ TEST_FILE3, X_OK, "Execute Access denied on file", EACCES, setup3 },
-	{ TEST_FILE4, INV_OK, "Access mode invalid", EINVAL, setup4 },
-	{ High_address_node, R_OK, "Address beyond address space", EFAULT, no_setup },
-	{ (char *)-1, R_OK, "Negative address", EFAULT, no_setup },
-	{ "", W_OK, "Pathname is empty", ENOENT, no_setup },
-	{ Longpathname, R_OK, "Pathname too long", ENAMETOOLONG, longpath_setup },
-	{ NULL, 0, NULL, 0, no_setup }
-};
-
-const char *TCID="access03";		/* Test program identifier.    */
-int TST_TOTAL=8;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={EACCES, EFAULT, EINVAL, ENOENT, ENAMETOOLONG, 0};
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-char *get_high_address (void);
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	const char *file_name;	/* name of the testfile */
-	const char *test_desc;	/* test specific message */
-	int access_mode;	/* specified access mode for testfile */
-	int ind;		/* counter for testcase looping */
-
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-
-		for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
-			file_name = Test_cases[ind].pathname;
-			access_mode = Test_cases[ind].a_mode;
-			test_desc = Test_cases[ind].desc;
-
-			if (file_name == High_address_node) {
-				file_name = (char *)get_high_address();
-			}
-
-			/* 
-			 * Call access(2) to test different test conditions.
-			 * verify that it fails with -1 return value and
-			 * sets appropriate errno.
-			 */
-			TEST(access(file_name, access_mode));
-
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "access() returned %d, "
-					 "expected -1, errno:%d", TEST_RETURN,
-					 Test_cases[ind].exp_errno);
-				continue;
-			}
-
-			TEST_ERROR_LOG(TEST_ERRNO);
-
-			/*
-			 * Call a function to verify whether
-			 * the specified file has specified 
-			 * access mode.
-			 */
-			if (TEST_ERRNO == Test_cases[ind].exp_errno) {
-				tst_resm(TPASS, "access() fails, %s, errno:%d",
-					 test_desc, TEST_ERRNO);
-			} else {
-				tst_resm(TFAIL, "access() fails, %s, errno:%d, "
-					 "expected errno:%d", test_desc,
-					 TEST_ERRNO, Test_cases[ind].exp_errno);
-			}
-		}	/* Test Case Looping */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *
- *  Create a temporary directory and change directory to it.
- *  Call individual test specific setup functions.
- */
-void 
-setup()
-{
-	int ind;			/* counter for testsetup functions */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Check that the test process id is not root/super-user */
-	if (geteuid() == 0) {
-		tst_brkm(TBROK, NULL, "Must be non-root/super for this test!");
-		tst_exit();
-	}
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* call individual setup functions */
-	for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
-		Test_cases[ind].setupfunc();
-	}
-}
-
-/*
- * no_setup() - some test conditions do not need any setup.
- *		Hence, this function simply returns 0.
- */
-int
-no_setup()
-{
-	return 0;
-}
-
-/*
- * setup1() - Setup function to test access() for return value -1
- *	      and errno EACCES when read access denied for specified
- *	      testfile.
- *
- *   Creat/open a testfile and close it.
- *   Deny read access permissions on testfile.
- *   This function returns 0.
- */
-int
-setup1()
-{
-	int fd1;			/* file handle for testfile */
-
-	/* Creat a test file under above directory created */
-	if ((fd1 = open(TEST_FILE1, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEST_FILE1, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Close the testfile created above */
-	if (close(fd1) == -1) {
-		tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s",
-			 TEST_FILE1, errno, strerror(errno));
-	}
-
-	/* Change mode permissions on testfile */
-	if (chmod(TEST_FILE1, 0333) < 0) { 
-		tst_brkm(TBROK, cleanup, "chmod() failed on %s, errno=%d",
-			 TEST_FILE1, errno);
-	}
-
-	return 0;
-}
-
-/*
- * setup2() - Setup function to test access() for return value -1 and
- *	      errno EACCES when write access denied on testfile.
- *
- *   Creat/open a testfile and close it.
- *   Deny write access permissions on testfile.
- *   This function returns 0.
- */
-int
-setup2()
-{
-	int fd2;			/* file handle for testfile */
-
-	/* Creat a test file under above directory created */
-	if ((fd2 = open(TEST_FILE2, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEST_FILE2, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Close the testfile created above */
-	if (close(fd2) == -1) {
-		tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s",
-			 TEST_FILE2, errno, strerror(errno));
-	}
-
-	/* Change mode permissions on testfile */
-	if (chmod(TEST_FILE2, 0555) < 0) { 
-		tst_brkm(TBROK, cleanup, "chmod() failed on %s, errno=%d",
-			 TEST_FILE2, errno);
-	}
-
-	return 0;
-}
-
-/*
- * setup3() - Setup function to test access() for return value -1 and
- *	      errno EACCES when execute access denied on testfile.
- *
- *   Creat/open a testfile and close it.
- *   Deny search access permissions on testfile.
- *   This function returns 0.
- */
-int
-setup3()
-{
-	int fd3;			/* file handle for testfile */
-
-	/* Creat a test file under above directory created */
-	if ((fd3 = open(TEST_FILE3, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEST_FILE3, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Close the testfile created above */
-	if (close(fd3) == -1) {
-		tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s",
-			 TEST_FILE3, errno, strerror(errno));
-	}
-
-	/* Change mode permissions on testfile */
-	if (chmod(TEST_FILE3, 0666) < 0) { 
-		tst_brkm(TBROK, cleanup, "chmod() failed on %s, errno=%d",
-			 TEST_FILE3, errno);
-	}
-
-	return 0;
-}
-
-/*
- * setup4() - Setup function to test access() for return value -1
- *	      and errno EINVAL when specified access mode argument is
- *	      invalid.
- *
- *   Creat/open a testfile and close it.
- *   This function returns 0.
- */
-int
-setup4()
-{
-	int fd4;			/* file handle for testfile */
-
-	/* Creat a test file under above directory created */
-	if ((fd4 = open(TEST_FILE4, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEST_FILE4, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Close the testfile created above */
-	if (close(fd4) == -1) {
-		tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s",
-			 TEST_FILE4, errno, strerror(errno));
-	}
-
-	return 0;
-}
-
-/*
- * longpath_setup() - setup to create a node with a name length exceeding
- * 		      the MAX. length of PATH_MAX.
- */
-int
-longpath_setup()
-{
-	int ind;
-
-	for (ind = 0; ind <= (PATH_MAX + 1); ind++) {
-		Longpathname[ind] = 'a';
-	}
-
-	return 0;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * Delete the test directory/file and temporary directory
-	 * created in the setup.
-	 */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/alarm01.c b/winsup/testsuite/winsup.api/ltp/alarm01.c
deleted file mode 100644
index 187e488c9..000000000
--- a/winsup/testsuite/winsup.api/ltp/alarm01.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: alarm01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for alarm(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) alarm(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- * 	The libcuts.a and libsys.a libraries must be included in 
- *	the compilation of this test.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the alarm(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	alarm(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="alarm01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-        tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call alarm(2)
-	 */
-	TEST(alarm(1));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    tst_resm(TFAIL, "alarm(1) Failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "alarm(1) returned %d", TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    void trapper();
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    signal(SIGALRM, trapper);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-void
-trapper(sig)
-int sig;
-{
-   signal(SIGALRM, trapper);
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/alarm02.c b/winsup/testsuite/winsup.api/ltp/alarm02.c
deleted file mode 100644
index 03a41b4f7..000000000
--- a/winsup/testsuite/winsup.api/ltp/alarm02.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/* $Id$ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER   : alarm02
- *
- *    TEST TITLE        : Boundary Value Test for alarm(2)
- *
- *    PARENT DOCUMENT   : almtds02
- *
- *    TEST CASE TOTAL   : 3
- *
- *    WALL CLOCK TIME   : 1
- *
- *    CPU TYPES         : ALL
- *
- *    BINARY LOCATION   : CUTS_BIN/rf_tests/sys
- *
- *    SOURCE LOCATION   : CUTS_SRC/src/tests/sys
- *
- *    AUTHOR            : Billy Jean Horne
- *
- *    CO-PILOT          : Kathy Olmsted
- *
- *    DATE STARTED      : 06/01/92
- *
- *    INITIAL RELEASE   : UNICOS 7.0
- *
- *    TEST CASES
- *      Test Case One - A call to alarm() shall not return an error if 
- *       seconds is a -1.
- *       Test FAILS if a non-zero value is returned.
- *      Test Case Two - A call to alarm() shall not return an error if
- *       seconds is the maximum unsigned integer (2**63).
- *       Test FAILS if a non-zero value is returned.
- *      Test Case Three - A call to alarm() shall not return an error if
- *       seconds is the maximum unsigned integer plus 1 ((2**63)+1).
- *       Test FAILS if a non-zero value is returned.
- *
- *    ENVIRONMENTAL NEEDS
- *      The libcuts.a and libsys.a libraries must be included in
- *      the compilation of this test.
- *
- *    DETAILED DESCRIPTION
- *
- *      Setup:
- *        Define a cleanup function.
- *
- *      Test:
- *       Loop for each test case.
- *        Execute alarm (0) system call to clear previous alarm.
- *        Check return code, if system call failed (return=-1)
- *           Issue a BROK message and exit the test.
- *        Call alarm() with boundary values for seconds.
- *        Verify that returned value is as expected.
- *        Report results.
- *
- *      Cleanup:
- *
- */
-#include <sys/types.h>
-#include <errno.h>
-#include <sys/signal.h>
-#include <limits.h>
-#include "test.h"
-#include "usctest.h"             /* required for usctest   */
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-void alarm_received();
-
-
-
-const char *TCID="alarm02";          /* Test program identifier.    */
-int TST_TOTAL=3;                /* Total number of test cases. */
-extern int Tst_count;      /* Test Case counter for tst_ * routines */
-
-int received_alarm = 0;   /* Indicates a SIGALRM was received */
-
-/************************************************************
- * Main program
- ***********************************************************/
-
-int
-main(int ac, char **av)
-{
-
-    /* Parameters for usc code  */
-    int lc;             /* loop counter */
-    const char *msg;          /* message returned from parse_opts */
-
-    /* Parameters for alarm test */
-    const char *buf[] = { "-1", "ULONG_MAX", "ULONG_MAX+1"};
-    unsigned long int sec[] = {-1, ULONG_MAX, ULONG_MAX+1};
-    int exp[]                   = {0,0,0};
-    int i;   
-     
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-        tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-
-    setup();
-
-   /***************************************************************
-    * check looping state 
-    ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-      
-        /* reset Tst_count in case we are looping. */
-      
-        Tst_count=0;
-      
-	for (i=0;i<TST_TOTAL;i++) {
-
-	    /* capture an SIGALRM signal */
-	    received_alarm = 0;
-	    signal(SIGALRM, alarm_received);
-
-	    TEST (alarm (sec[i]));
-	    /* reset the alarm */
-	    alarm (0);
-	    if (TEST_RETURN != 0) {
-		tst_resm(TFAIL, 
-		    "alarm(%u) returned %u, when %u was expected for value %s.", 
-		     sec[i], TEST_RETURN, exp[i], buf[i]);
- 
-	    }
-            /***************************************************************
-             * only perform functional verification if flag set (-f not given)
-             ***************************************************************/
-	    else if (STD_FUNCTIONAL_TEST) {
-		if (received_alarm == 1) {
-		    tst_resm (TFAIL,
-			"alarm(%u) returned %u but an alarm signal was received for value %s.",
-			 sec[i], TEST_RETURN, buf[i]);
-		} else  {
-		    tst_resm (TPASS, 
-			"alarm(%u) returned %u as expected for value %s.", 
-			sec[i], TEST_RETURN, buf[i]);
-		}
-
-	    } /* End of STD_FUNCTIONAL_TEST */
-        }   /* End of for loop */
-        /*
-         *  Reset alarm before cleanup.
-         */
-      
-        alarm(0);
-      
-    }   /* End for TEST_LOOPING */
-    
-    cleanup();
-
-    return 0;
-}
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-
-void
-setup()
-{
-
-     /* capture signals */
-     tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-     /* Pause if that option was specified */
-     TEST_PAUSE;
-
-     /* End setup() */
-
-}
-
-/***********************************************************
- * Cleanup:
- *  exit using tst_exit.
- ***********************************************************/
-
-void
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-
-    tst_exit();
-}
-
-void alarm_received()
-{
-  received_alarm = 1;
-}
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/alarm03.c b/winsup/testsuite/winsup.api/ltp/alarm03.c
deleted file mode 100644
index 871f6fabf..000000000
--- a/winsup/testsuite/winsup.api/ltp/alarm03.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: alarm03
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: alarm(2) cleared by a fork
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: Dennis Arason
- * 
- *    DATE STARTED	: 08/96
- * 
- * 
- *    TEST CASES
- * 
- * 	1.) alarm(100), fork, child's alarm(0) shall return 0;
- *	2.) alarm(100), fork, parent's alarm(0) shall return non-zero.
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the alarm(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	alarm(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-const char *TCID="alarm03"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-        tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call alarm(2)
-	 */
-	TEST(alarm(100));
-	
-        switch ( fork()) {
-	case -1:
-		tst_brkm(TBROK, cleanup, "fork failed, errno:%d %s",
-			errno, strerror(errno));
-		break;
-
-	case  0:
-	    TEST( alarm(0) );
-
-	    if ( TEST_RETURN != 0 )
-		tst_resm(TFAIL,
-		    "alarm(100), fork, alarm(0) child's alarm returned %d",
-                    TEST_RETURN);
-	    else if ( STD_FUNCTIONAL_TEST )
-		tst_resm(TPASS,
-		    "alarm(100), fork, alarm(0) child's alarm returned %d",
-		    TEST_RETURN);
-
-	     exit(0);
-	     break;
-
-	default:
-	    Tst_count++;
-	    TEST( alarm(0) );
-	    if ( TEST_RETURN <= 0 || TEST_RETURN > 100 )
-                tst_resm(TFAIL,
-		    "alarm(100), fork, alarm(0) parent's alarm returned %d",
-                    TEST_RETURN);
-
-	    else if ( STD_FUNCTIONAL_TEST )
-                tst_resm(TPASS,
-		    "alarm(100), fork, alarm(0) parent's alarm returned %d",
-                    TEST_RETURN);
-
-        }
-	
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    void trapper();
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    signal(SIGALRM, trapper);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-void
-trapper(sig)
-int sig;
-{
-   signal(SIGALRM, trapper);
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/alarm07.c b/winsup/testsuite/winsup.api/ltp/alarm07.c
deleted file mode 100644
index a9f269522..000000000
--- a/winsup/testsuite/winsup.api/ltp/alarm07.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: alarm03
- *
- * Test Description:
- *  Check the functionality of the alarm() when the time input
- *  parameter is non-zero and the process does a fork.
- *
- * Expected Result:
- *  The alarm request should be cleared in the child process.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *
- * Usage:  <for command-line>
- *  alarm03 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID="alarm03";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int almreceived = 0;		/* flag to indicate SIGALRM received or not */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-void sigproc(int sig);		/* signal catching function */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	int time_sec = 3;	/* time for which alarm is set */
-	int sleep_time = 5;	/* waiting time for the SIGALRM signal */
-	pid_t cpid;		/* child process id */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *)NULL, NULL);
-	if (msg != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call First alarm() with non-zero time parameter 
-		 * 'time_sec' to send SIGALRM to the process.
-		 */
-		TEST(alarm(time_sec));
-
-		/* Now, fork a child process */
-		cpid = fork();
-		if (cpid < 0) {
-			tst_resm(TFAIL, "fork() fails to create child, "
-				 "errno:%d", errno);
-		}
-
-		/* Wait for signal SIGALRM to be generated */
-		sleep(sleep_time);
-
-		if (STD_FUNCTIONAL_TEST) { 
-			if (cpid == 0) {	/* Child process */
-				/*
-				 * For child process if almreceived is 0
-				 * means alarm request is cleared.
-				 */
-				if (almreceived == 0) {
-					tst_resm(TPASS, "Functionality of "
-					 	 "alarm(%u) successful",
-						 time_sec);
-				} else {
-					tst_resm(TFAIL, "alarm request not "
-						 "cleared in child, "
-						 "almreceived:%d", almreceived);
-				}
-			} else {		/* Parent process */
-				/* Wait for child to complete execution */
-				wait(0);
-			}
-		} else {
-			tst_resm(TPASS, "call returned %d", TEST_RETURN);
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *  Setup signal handler to catch SIGALRM signal.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Set the signal catching function */
-	if (signal(SIGALRM, sigproc) == SIG_ERR) {
-		tst_brkm(TFAIL, cleanup,
-			 "signal() fails to catch SIGALARM, errno=%d",
-			 errno);
-	}
-}
-
-
-/*
- * sigproc(int) - This function defines the action that has to be taken
- *	          when the SIGALRM signal is caught.
- *   It also sets the variable which is used to check whether the
- *   alarm system call was successful.
- */
-void
-sigproc(int sig)
-{
-	almreceived = almreceived + 1;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/asyncio02.c b/winsup/testsuite/winsup.api/ltp/asyncio02.c
deleted file mode 100644
index 36c03b449..000000000
--- a/winsup/testsuite/winsup.api/ltp/asyncio02.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/************************************************************
- * OS Test - Silicon Graphics, Inc.
- * Mendota Heights, Minnesota
- * 
- * TEST IDENTIFIER:  aiotcs02:  write/close flushes data to the file
- * 
- * PARENT DOCUMENT:  aiotds01:  kernel i/o
- * 
- * AUTHOR: Barrie Kletscher
- * 
- * CO-PILOT: Dave Baumgartner
- * 
- * TEST ITEMS:
- * 	for each open flags set used:
- * 	1. Multiple writes to a file work as specified for
- * 	   more than BUFSIZ bytes.
- * 	2. Multiple writes to a file work as specified for
- * 	   BUFSIZ bytes.
- * 	3. Multiple writes to a file work as specified for
- * 	   lower than BUFSIZ bytes.
- * 
- * INPUT SPECIFICATIONS:
- * 	Standard parse_opts supported options.
- *  
- * OUTPUT SPECIFICATIONS
- * 	Standard tst_res output format
- * 
- * ENVIRONMENTAL NEEDS:
- * 	This program uses the environment variable TMPDIR for the location
- * 	of the temporary directory.
- * 
- * 
- * SPECIAL PROCEDURAL REQUIREMENTS:
- * 	The program must be linked with tst_*.o and parse_opts.o.
- * 
- * INTERCASE DEPENDENCIES:
- * 	NONE.
- * 
- * DETAILED DESCRIPTION:
- * 	Attempt to get some memory to work with.
- * 	Call testrun writing (BUFSIZ + 1) bytes
- * 	Call testrun writing BUFSIZ bytes
- * 	Repeated call to testrun() with decreasing write sizes
- * 		less than BUFSIZ
- * 	End
- * 
- * 	Start testrun()
- * 	Attempt to open a temporary file.
- * 	Write the memory to the file.
- * 	Attempt to close the file which also flushes the buffers.
- * 	Now check to see if the number of bytes written is the
- * 		same as the number of bytes in the file.
- * 	Cleanup
- * 
- * BUGS:
- * 	NONE.
- * 
-************************************************************/
-
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/signal.h>
-#include <errno.h>
-#include "test.h"
-#include "usctest.h"
-
-#define FLAG O_RDWR | O_CREAT | O_TRUNC	/* Flags used when opening temp tile */
-#define MODE  0777			/* Mode to open file with */
-#define WRITES 10			/* Number of times buffer is written */
-#define DECR 1000			/* Number of bytes decremented between */
-					/* Calls to testrun() */
-#define OK -1				/* Return value from testrun() */
-
-#define FNAME1	"aio02.1"
-#define FNAME2	"aio02.2"
-#define FNAME3	"aio02.3"
-
-#define ERR_MSG1 "Bytes in file not equal to bytes written."
-#define ERR_MSG2 "Bytes in file (%d) not equal to bytes written (%d)."
-
-char	*dp;	/* pointer to area of memory */
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-int testrun(int flag, int bytes, int ti);
-
-const char *TCID="asyncio02";         /* Test program identifier.    */
-int TST_TOTAL=6;                /* Total number of test cases. */
-extern int Tst_count;           /* Test Case counter for tst_* routines */
-extern int Tst_nobuf;           /* variable used to turn off tst_res buffering */
-
-extern int errno;
-
-int exp_enos[]={0};             /* Array of expected errnos */
-char mesg[150];
-const char *filename;		/* name of the temporary file */
-
-char *Progname;
-int Open_flags;
-
-int Flags[] = {
-	O_RDWR | O_CREAT | O_TRUNC,
-	O_RDWR | O_CREAT | O_TRUNC
-};
-
-int Num_flags;
-
-/***********************************************************************
- * MAIN
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-
-    int	i;		/* counter */
-    int ret_val;	/* return value from testrun call */
-    int eok;		/* everything is ok flag */
-    int lc;             /* loop counter */
-    const char *msg;          /* message returned from parse_opts */
-    int flag_cnt;
-
-    Tst_nobuf=1;
-    Num_flags = sizeof(Flags)/sizeof(int);
-    TST_TOTAL= 3 * Num_flags;
-
-    /***************************************************************
-     * parse standard options, and exit if there is an error
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-        tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-        tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-        /* reset Tst_count in case we are looping. */
-        Tst_count=0;
-
-	for (flag_cnt=0; flag_cnt<Num_flags; flag_cnt++) {
-
-	/*
- 	 * call testrun writing (BUFSIZ + 1) byte chunks
- 	 */
-
-	filename=FNAME1;
-	if( testrun(Flags[flag_cnt],BUFSIZ+1,1) != OK)
-	    tst_resm(TFAIL,ERR_MSG1);
-
-	else if ( STD_FUNCTIONAL_TEST ) {
-	        tst_resm(TPASS,
-		    "More than BUFSIZE bytes multiple synchronous writes to a file check out ok");
-	}
-
-	/*
- 	 * call testrun writing BUFSIZ byte chunks
- 	 */
-
-	filename=FNAME2;
-	if(testrun(Flags[flag_cnt],BUFSIZ,2) != OK) {
-	    tst_resm(TFAIL,ERR_MSG1);
-	}
-	else if ( STD_FUNCTIONAL_TEST ) {
-	    tst_resm(TPASS,
-		"BUFSIZE bytes multiple synchronous writes to a file checks out ok");
-	}
-
-	/*
- 	 * while the byte chunks are greater than 0
- 	 *	call testrun() with decreasing chunk sizes
- 	 */
-
-	filename=FNAME3;
-	eok=1;
-	for(i = BUFSIZ-1; i >= 0; i -= DECR) {
-	    if((ret_val = testrun(Flags[flag_cnt],i,3)) != OK) {
-		char output[80];	/* local output char string */
-
-		(void)sprintf(output,ERR_MSG2,ret_val,i*WRITES);
-		tst_resm(TFAIL,output);
-	    }
-	}
-
-	if ( eok && STD_FUNCTIONAL_TEST ) 
-	    tst_resm(TPASS,
-		"Less than BUFSIZE bytes multiple synchronous writes to a file checks out ok");
-
-	}
-    }
-    cleanup();
-
-    return 0;
-}	/* end main() */
-
-/***********************************************************
- *
- *	This function does the actual running of the tests.
- *
- ***********************************************************/
-int
-testrun(int flag, int bytes, int ti)
-{
-
-	void cleanup();
-
-	int	fildes,		/* temporary file's descriptor */
-		i;		/* counter */
-
-	int ret;
-
-	struct	stat buffer;	/* buffer of memory required for stat command */
-
-	/*
- 	 *	Attempt to open a temporary file.
- 	 */
-
-	if((fildes = open(filename,flag,MODE)) == -1) {
-	    sprintf(mesg, "open failed, errno:%d", errno);
-                    tst_brkm(TBROK, cleanup, mesg);
-	}
-
-	/*
- 	 *	Write the memory to the file.
- 	 */
-
-	for(i = 0; i < WRITES; i++) {
-		TEST( write(fildes,dp,(unsigned)bytes) );
-		
-		if( TEST_RETURN == -1) {
-		    sprintf(mesg, "write failed, errno:%d", errno);
-            	    tst_brkm(TBROK, cleanup, mesg);
-		}
-	}	/* end for() */
-
-	/*
- 	 *	Attempt to close the file which also flushes the buffers.
- 	 */
-
-	if(close(fildes) == -1) {
-	    sprintf(mesg, "close failed, errno:%d", errno);
-            tst_brkm(TBROK, cleanup, mesg);
-	}
-
-        ret=OK;
-	if ( STD_FUNCTIONAL_TEST ) {
-
-	    /*
- 	     *	Now check to see if the number of bytes written is the
- 	     *	same as the number of bytes in the file.
- 	     */
-
-	    if(stat(filename,&buffer) == -1) {
-	        sprintf(mesg, "stat failed, errno:%d", errno);
-	        tst_brkm(TBROK, cleanup, mesg);
-	    }
-
-
-	    if(buffer.st_size != (off_t)(bytes * WRITES)) {
-		    ret=(int)buffer.st_size;
-	    }
-	}
-
-	if ( unlink(filename) == -1 ) {
-	    sprintf(mesg, "unlink failed, errno:%d", errno);
-	    tst_brkm(TBROK, cleanup, mesg);
-        }
-
-	return ret;
-
-}	/* end testrun() */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* create a temporary directory and go to it */
-    tst_tmpdir();
-
-    /* Indicate which errnos are expected */
-    TEST_EXP_ENOS(exp_enos);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    /*
-     *	Attempt to get some memory to work with.
-     */
-
-    if((dp = (char *)malloc((unsigned)BUFSIZ+1)) == NULL) {
-        sprintf(mesg, "malloc failed, errno:%d", errno);
-        tst_brkm(TBROK, cleanup, mesg);
-    }
-
-
-}       /* End setup() */
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *              completion or premature exit.
- ***************************************************************/
-void
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove temporary directory and all files in it. */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}       /* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/chdir02.c b/winsup/testsuite/winsup.api/ltp/chdir02.c
deleted file mode 100644
index 552f912ac..000000000
--- a/winsup/testsuite/winsup.api/ltp/chdir02.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: chdir02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for chdir(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) chdir(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the chdir(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	chdir(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-const char *TCID="chdir02"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-const char *dirs[2] = { "/", "/tmp" };
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call chdir(2)
-	 */
-	TEST(chdir(dirs[lc%2]));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "chdir(%s) Failed, errno=%d : %s", dirs[lc%2],
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "chdir(%s) returned %d", dirs[lc%2], TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/chdir04.c b/winsup/testsuite/winsup.api/ltp/chdir04.c
deleted file mode 100644
index da2b0ace9..000000000
--- a/winsup/testsuite/winsup.api/ltp/chdir04.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	chdir02.c
- *
- * DESCRIPTION
- *	Testcase to test whether chdir(2) sets errno correctly.
- * 
- * ALGORITHM
- *	1.	Test for ENAMETOOLONG:
- *		Create a bad directory name with length more than
- *
- *		VFS_MAXNAMELEN (Linux kernel variable), and attempt to
- *		chdir(2) to it.
- *
- *	2.	Test for ENOENT:
- *		Attempt to chdir(2) on a non-existent directory
- *
- *	3.	Test for EFAULT:
- *		Pass an address which lies outside the address space of the
- *		process, and expect an EFAULT.
- *
- * USAGE:  <for command-line>
- * chdir02 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	NONE
- */
-
-#include <errno.h>
-#include <sys/stat.h>
-#include <test.h>
-#include <usctest.h>
-
-const char *TCID = "chdir02";
-int TST_TOTAL = 3;
-extern int Tst_count;
-
-int exp_enos[] = {ENAMETOOLONG, ENOENT, EFAULT, 0};
-
-char bad_dir[] = "abcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyz"; 
-
-char noexist_dir[] = "/tmp/noexistdir";
-
-struct test_case_t {
-	char *dname;
-	int error;
-} TC[] = {
-	/*
- 	 * to test whether chdir() is setting ENAMETOOLONG if the
-	 * directory is more than VFS_MAXNAMELEN
- 	 */
-	{bad_dir, ENAMETOOLONG},
-
-	/*
-	 * to test whether chdir() is setting ENOENT if the
-	 * directory is not existing.
-	 */
-	{noexist_dir, ENOENT},
-
-	/*
-	 * to test whether chdir() is setting EFAULT if the
-	 * directory is an invalid address.
-	 */
-	{(void *)-1, EFAULT}
-};
-
-int flag;
-#define	FAILED	1
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	int i;
-	const char *msg;		/* message returned from parse_opts */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();
-
-	/* set up the expected errnos */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* check looping state if -i option is given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		/* loop through the test cases */
-		for (i=0; i<TST_TOTAL; i++) {
-
-			TEST(chdir(TC[i].dname));
-
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "call succeeded unexpectedly");
-				continue;
-			}
-
-			TEST_ERROR_LOG(TEST_ERRNO);
-
-			if (TEST_ERRNO == TC[i].error) {
-				tst_resm(TPASS, "expected failure - "
-					 "errno = %d : %s", TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-			} else {
-				tst_resm(TFAIL, "unexpected error - %d : %s - "
-					 "expected %d", TEST_ERRNO,
-					 strerror(TEST_ERRNO), TC[i].error);
-			}
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temporary directory and cd to it */
-	tst_tmpdir();
-}
-
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * Delete the test directory created in setup().
-	 */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/chmod01.c b/winsup/testsuite/winsup.api/ltp/chmod01.c
deleted file mode 100644
index c20e6172e..000000000
--- a/winsup/testsuite/winsup.api/ltp/chmod01.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* 
- * Test Name: chmod01
- *
- * Test Description:
- *  Verify that, chmod(2) succeeds when used to change the mode permissions
- *  of a file. 
- *
- * Expected Result:
- *  chmod(2) should return 0 and the mode permissions set on file should match 
- *  the specified mode.
- *	
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  chmod01 [-c n] [-e] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- *
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define TESTFILE	"testfile"
-
-const char *TCID="chmod01";		/* Test program identifier.    */
-int TST_TOTAL=8;		/* Total number of test conditions */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int Modes[] = {0, 07, 070, 0700, 0777, 02777, 04777, 06777};
-
-void setup();			/* setup function for the test */
-void cleanup() __attribute__ ((noreturn));/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat(2) struct contents */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	int ind;		/* counter variable for chmod(2) tests */
-	unsigned mode;		/* file mode permission */
-    
-	TST_TOTAL = sizeof(Modes) / sizeof(int);
-
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-
-		for (ind = 0; ind < TST_TOTAL; ind++) {
-			mode = Modes[ind];
-
-			/* 
-			 * Call chmod(2) with different mode permission
-			 * bits to set it for "testfile".
-		 	 */
-			TEST(chmod(TESTFILE, mode));
-
-			/* check return code of chmod(2) */
-			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL,
-					 "chmod(%s, %#o) Failed, errno=%d : %s",
-					 TESTFILE, mode, TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-				continue;
-			}
-			/*
-			 * Perform functional verification if test
-			 * executed without (-f) option.
-			 */
-			if (STD_FUNCTIONAL_TEST) {
-				/*
-			 	 * Get the testfile information using
-				 * stat(2).
-				 */
-				if (stat(TESTFILE, &stat_buf) < 0) {
-					tst_brkm(TFAIL, cleanup, "stat(2) of "
-						 "%s failed, errno:%d",
-						 TESTFILE, TEST_ERRNO);
-				}
-				stat_buf.st_mode &= ~S_IFREG;
-
-				/*
-				 * Check for expected mode permissions
-				 * on testfile.
-				 */
-				if (stat_buf.st_mode == mode) {
-					tst_resm(TPASS, "Functionality of "
-					 	 "chmod(%s, %#o) successful",
-						 TESTFILE, mode);
-				} else {
-					tst_resm(TFAIL, "%s: Incorrect "
-						 "modes 0%03o, Expected 0%03o",
-						 TESTFILE, stat_buf.st_mode,
-						 mode);
-				}
-			} else {
-				tst_resm(TPASS, "call succeeded");
-			}
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and change directory to it.
- *  Create a test file under temporary directory and close it
- */
-void 
-setup()
-{
-	int fd;
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a test file under temporary directory and close it */
-	if ((fd = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	}
-	if (close(fd) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	}
-
-}	/* End setup() */
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/chmod02.c b/winsup/testsuite/winsup.api/ltp/chmod02.c
deleted file mode 100644
index 8026768ae..000000000
--- a/winsup/testsuite/winsup.api/ltp/chmod02.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: chmod02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for chmod(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 8
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) chmod(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- * 	The libcuts.a and libsys.a libraries must be included in 
- *	the compilation of this test.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the chmod(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	chmod(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="chmod02"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-char fname[255];
-const char *buf = "file contents\n";
-
-int Modes[] = {0, 07, 070, 0700, 0777, 02777, 04777, 06777};
-
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    int ind;
-    int mode;
-    
-    TST_TOTAL = sizeof(Modes) / sizeof(int);
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	for (ind=0; ind<TST_TOTAL; ind++) { 
-	    mode=Modes[ind];
-
-	    /* 
-	     * Call chmod(2) with mode argument on fname
-	     */
-	    TEST(chmod(fname, mode));
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-	        tst_resm(TFAIL, "chmod(%s, %#o) Failed, errno=%d : %s", fname,
-		     mode, TEST_ERRNO, strerror(TEST_ERRNO));
-	    } else {
-	    
-	        /***************************************************************
-	         * only perform functional verification if flag set (-f not given)
-	         ***************************************************************/
-	        if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		    tst_resm(TPASS, "chmod(%s, %#o) returned %d", fname, 
-			mode, TEST_RETURN);
-	        } 
-		else
-		    Tst_count++;
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    int fd;
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    strcat(fname, "tfile");
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-	tst_brkm(TBROK, cleanup,
-		 "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		 fname, errno, strerror(errno));
-    } else if (write(fd, &buf, strlen(buf)) == -1) {
-	tst_brkm(TBROK, cleanup,
-		 "write(%s, &buf, strlen(buf)) Failed, errno=%d : %s",
-		 fname, errno, strerror(errno));
-    } else if (close(fd) == -1) {
-	tst_brkm(TBROK, cleanup,
-		 "close(%s) Failed, errno=%d : %s",
-		 fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
diff --git a/winsup/testsuite/winsup.api/ltp/chown01.c b/winsup/testsuite/winsup.api/ltp/chown01.c
deleted file mode 100644
index b3cd08811..000000000
--- a/winsup/testsuite/winsup.api/ltp/chown01.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: chown01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for chown(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) chown(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the chown(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	chown(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="chown01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd, uid, gid;
-const char *buf = "davef";
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call chown(2) 
-	 */
-	TEST(chown(fname, uid,gid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "chown(%s, %d,%d) Failed, errno=%d : %s", fname, uid, gid,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "chown(%s, %d,%d) returned %d", fname, uid, gid, TEST_RETURN);
-	    }
-	}	/* end else */
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* create a temp dir and cd to it. */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    /* set uid and gid */
-    uid=geteuid();
-    gid=getegid();
-
-    sprintf(fname,"t_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup, "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    } else if (write(fd, &buf, strlen(buf)) == -1) {
-       tst_brkm(TBROK, cleanup, "write(%s, &buf, strlen(buf)) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    } else if (close(fd) == -1) {
-       tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove temp dir and files */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/close01.c b/winsup/testsuite/winsup.api/ltp/close01.c
deleted file mode 100644
index 4d4059823..000000000
--- a/winsup/testsuite/winsup.api/ltp/close01.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	close01.c
- *
- * DESCRIPTION
- * 	Test that closing a regular file and a pipe works correctly
- *
- * ALGORITHM
- * 	Creat a file, and dup() a fildes
- * 	Open a pipe
- *	call close() using the TEST macro
- *	if the call fails
- *	   issue a FAIL message and continue
- *	else if STD_FUNCTIONAL_TEST
- *	   attempt to close the file/pipe again
- *	   if there is an error
- *	      issue a PASS message
- *	   else
- *	      issue a FAIL message
- *	else
- *	   issue a PASS message
- *	
- *
- * USAGE:  <for command-line>
- *  close01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include "test.h"
-#include "usctest.h"
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID = "close01()";
-int TST_TOTAL = 2;
-extern int Tst_count;
-
-char fname[40] = "";
-
-int fild = -1;
-int newfd = -1;
-int pipefildes[2];
-
-struct test_case_t {
-        int *fd;
-	const char *type;
-} TC[] = {
-	/* file descriptor for a regular file */
-        {&newfd, "file"},
-
-	/* file descriptor for a pipe */
-        {&pipefildes[0], "pipe"}
-};
-
-int
-main(int ac, char **av)
-{
-
-	int i;
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();			/* global setup */
-
-	/* The following loop checks looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		/* set up the file and pipe for the test */
-		if ((fild = creat(fname, 0777)) == -1) {
-			perror (fname);
-			tst_brkm(TBROK, cleanup, "can't open file %s", fname);
-		}
-
-		if ((newfd = dup(fild)) == -1) {
-			tst_brkm(TBROK, cleanup, "can't dup the file des");
-		}
-
-		if (pipe(pipefildes) == -1) {
-			tst_brkm(TBROK, cleanup, "can't open pipe");
-		}
-
-		/* loop through the test cases */
-
-		for (i = 0; i < TST_TOTAL; i++) {
-
-			TEST(close(*TC[i].fd));
-
-                        if (TEST_RETURN == -1) {
-                                tst_resm(TFAIL, "call failed unexpectedly");
-                                continue;
-                        }
-
-			if (STD_FUNCTIONAL_TEST) {
-				/* attempt to close the fd again */
-				if (close(*TC[i].fd) == -1) {
-					tst_resm(TPASS, "%s appears closed",
-						 TC[i].type);
-				} else {
-					tst_resm(TFAIL, "%s close succeeded on"
-						 "second attempt", TC[i].type);
-				}
-			} else {
-				tst_resm(TPASS, "call succeeded");
-			}
-		}
-
-	}
-	cleanup();
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	int mypid;
-
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	umask(0);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	mypid = getpid();
-	sprintf(fname, "fname.%d", mypid);
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing status if that option was specified.
-	 * print errno log if that option was specified
-	 */
-	TEST_CLEANUP;
-
-	if (fild >= 0)
-		close (fild);
-	if (newfd >= 0)
-		close (newfd);
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/close02.c b/winsup/testsuite/winsup.api/ltp/close02.c
deleted file mode 100644
index 72ecf8181..000000000
--- a/winsup/testsuite/winsup.api/ltp/close02.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	close02.c
- *
- * DESCRIPTION
- * 	Check that an invalid file descriptor returns EBADF
- *
- * ALGORITHM
- *	loop if that option is specified
- * 	   call close using the TEST macro and passing in an invalid fd
- *	   if the call succeedes
- *	      issue a FAIL message
- *	   else
- *	      log the errno
- *	      if the errno == EBADF
- *	         issue a PASS message
- *	      else
- *	         issue a FAIL message
- *	cleanup
- *
- * USAGE:  <for command-line>
- *  close02 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <errno.h>
-#include <sys/stat.h>
-#include "test.h"
-#include "usctest.h"
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-int exp_enos[] = {EBADF, 0};
-
-const char *TCID = "close02()";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();			/* global setup */
-
-	/* set up expected errnos */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* The following loop checks looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(close(-1));
-
-		if (TEST_RETURN != -1) {
-			tst_resm(TFAIL, "Closed a non existent fildes");
-		} else {
-			TEST_ERROR_LOG(TEST_ERRNO);
-
-			if (TEST_ERRNO != EBADF) {
-				tst_resm(TFAIL, "close() FAILED to set errno "
-					 "to EBADF on an invalid fd, got %d",
-					 errno);
-			} else {
-				tst_resm(TPASS, "call returned EBADF");
-			}
-		}
-	}
-	cleanup();
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	umask(0);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * or premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing status if that option was specified.
-	 * print errno log if that option was specified
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/close08.c b/winsup/testsuite/winsup.api/ltp/close08.c
deleted file mode 100644
index 3fbcc3be8..000000000
--- a/winsup/testsuite/winsup.api/ltp/close08.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: close08
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for close(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) close(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the close(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	close(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="close08"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-        if ((fd=open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-           tst_brkm(TBROK, cleanup,
-		    "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		    fname, TEST_ERRNO, strerror(TEST_ERRNO));
-        }
-	/* 
-	 * Call close(2)
-	 */
-	TEST(close(fd));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "close(%s) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "close(%s) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-   
-        if (unlink(fname) == -1) {
-           tst_brkm(TBROK, cleanup, "unlink(%s) Failed, errno=%d : %s",
-		    fname, errno, strerror(errno));
-        }
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/creat01.c b/winsup/testsuite/winsup.api/ltp/creat01.c
deleted file mode 100644
index 6f891701e..000000000
--- a/winsup/testsuite/winsup.api/ltp/creat01.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	creat01.c
- *
- * DESCRIPTION
- *	Testcase to check the basic functionality of the creat(2) system call.
- *
- * ALGORITHM
- * 	1.	creat() a file using 0444 mode, write to the fildes, write
- * 		should return a positive count.
- *
- * 	2.	creat() should truncate a file to 0 bytes if it already
- *		exists, and should not fail.
- *
- * USAGE:  <for command-line>
- *  creat01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-void functest1(void);
-void functest2(void);
-
-const char *TCID = "creat01";
-int TST_TOTAL = 2;
-extern int Tst_count;
-
-char filename[40];
-
-#define MODE1 0644
-#define MODE2 0444
-
-struct test_case_t {
-	char *fname;
-	int mode;
-	void (*functest)();
-} TC[] = {
-	/* creat() the file and write to it */
-	{filename, MODE1, functest1},
-
-	/* creat() the same file and check that it is now 0 length */
-	{filename, MODE2, functest2}
-};
-
-int
-main(int ac, char **av)
-{
-	int i;
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();		/* set "tstdir", and "testfile" variables */
-
-	/* check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		/* loop through the test cases */
-
-		for (i=0; i<TST_TOTAL; i++) {
-			TEST(creat(filename, TC[i].mode));
-
-			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL, "Could not creat file %s",
-					 filename);
-				continue;
-			}
-
-			if (STD_FUNCTIONAL_TEST) {
-				(*TC[i].functest)();
-			} else {
-				tst_resm(TPASS, "call succeeded");
-			}
-			if (TEST_RETURN >= 0) {
-				close(TEST_RETURN);
-			}
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * functest1() - check the functionality of the first test by making sure
- *		 that a write to the file succeeds
- */
-void
-functest1()
-{
-	if (write(TEST_RETURN, "A", 1) != 1) {
-		tst_resm(TFAIL, "write was unsuccessful");
-	} else {
-		tst_resm(TPASS, "file was created and written to successfully");
-	}
-}
-
-/*
- * functest2() - check the functionality of the second test by making sure
- *		 that the file is now 0 length
- */
-void
-functest2()
-{
-	struct stat buf;
-
-	if (stat(filename, &buf) < 0) {
-		tst_brkm(TBROK, cleanup, "failed to stat test file");
-		/*NOTREACHED*/
-	}
-	if (buf.st_size != 0) {
-		tst_resm(TFAIL, "creat() FAILED to truncate "
-			 "file to zero bytes");
-	} else {
-		tst_resm(TPASS, "creat() truncated existing file to 0 bytes");
-	}
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	if (geteuid() == 0) {
-		tst_brkm(TBROK, tst_exit, "Must not run this as root");
-		/*NOTREACHED*/
-	}
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	umask(0);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	tst_tmpdir();
-
-	sprintf(filename, "creat01.%d", getpid());
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	unlink(filename);
-
-	/* delete the test directory created in setup() */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/creat03.c b/winsup/testsuite/winsup.api/ltp/creat03.c
deleted file mode 100644
index 2ca21f1e0..000000000
--- a/winsup/testsuite/winsup.api/ltp/creat03.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	creat03.c
- *
- * DESCRIPTION
- *	Testcase to check whether the sticky bit cleared.
- *
- * ALGORITHM
- * 	Creat a new file, fstat.st_mode should have the 01000 bit off
- *
- * USAGE:  <for command-line>
- *  creat03 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "creat03";			/* Test program identifier */
-int TST_TOTAL = 1;			/* Total number of test cases */
-extern int Tst_count;			/* Test case counter */
-
-char pfilname[40] = "";
-#define FMODE	0444
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int ac, char **av)
-{
-	struct stat statbuf;
-	unsigned short filmode;
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();
-
-	/* check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(creat(pfilname, FMODE));
-
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "Cannot creat %s", pfilname);
-			continue;
-			/*NOTREACHED*/
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-			if (fstat(TEST_RETURN, &statbuf) == -1) {
-				tst_brkm(TBROK, cleanup, "fstat() failed");
-			}
-			filmode = statbuf.st_mode;
-			tst_resm(TINFO, "Created file has mode = 0%o", filmode);
-			if ((filmode & S_ISVTX) != 0) {
-				tst_resm(TFAIL, "save text bit not cleared");
-			} else {
-				tst_resm(TPASS, "save text bit cleared");
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-
-		if (TEST_RETURN >= 0) {
-			close(TEST_RETURN);
-		}
-
-		/* clean up things in case we are looping */
-		if (unlink(pfilname) == -1) {
-			tst_brkm(TBROK, cleanup, "couldn't remove file");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp dir and cd to it */
-	tst_tmpdir();
-
-	sprintf(pfilname, "./creat4.%d", getpid());
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at completion or
- *	       premature exit
- */
-void
-cleanup(void)
-{
-	TEST_CLEANUP;
-
-	/* remove the tmp dir and all its files */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/creat09.c b/winsup/testsuite/winsup.api/ltp/creat09.c
deleted file mode 100644
index c3c88a7c6..000000000
--- a/winsup/testsuite/winsup.api/ltp/creat09.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: creat09
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for creat(2) using 0700 argument.
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) creat(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the creat(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	creat(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="creat09"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-         *******************************************
-	 * Call creat(2) with 0700 argument on fname
-         *******************************************
-	 */
-	TEST(creat(fname, 0700));
-	
-	/* check return code */
-
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "creat(%s, 0700) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "creat(%s, 0700) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-
-	/* close and remove file, possibly for next loop */
-        if (close(TEST_RETURN) == -1) {
-	    tst_brkm(TBROK, cleanup,
-		     "close(%s) Failed, errno=%d : %s",
-		     fname, errno, strerror(errno));
-        } else if (unlink(fname) == -1) {
-	    tst_resm(TWARN, "unlink(%s) Failed, errno=%d : %s",
-		     fname, errno, strerror(errno));
-        }
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/dup01.c b/winsup/testsuite/winsup.api/ltp/dup01.c
deleted file mode 100644
index 521df6a78..000000000
--- a/winsup/testsuite/winsup.api/ltp/dup01.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: dup01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for dup(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) dup(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the dup(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	dup(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-const char *TCID="dup01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char Fname[255];
-int Fd;
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call dup(2)
-	 */
-	TEST( dup(Fd) );
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "dup(%s) Failed, errno=%d : %s", Fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "dup(%s) returned %d", Fname, TEST_RETURN);
-	    } 
-
-	    /* close the new file so loops do not open too many files */
-            if (close(TEST_RETURN) == -1) {
-               tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s",
-		    Fname, errno, strerror(errno));
-            }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /*
-     * Initialize Fd in case we get a quick signal
-     */
-    Fd=-1;
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(Fname, "dupfile");
-    if ((Fd = open(Fname,O_RDWR|O_CREAT,0700)) == -1) {
-	tst_brkm(TBROK, cleanup,
-		 "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		 Fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the open file we've been dup'ing */
-    if (Fd != -1) {
-	if (close(Fd) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-			Fname, errno, strerror(errno));
-    	}
-	Fd=-1;
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/dup02.c b/winsup/testsuite/winsup.api/ltp/dup02.c
deleted file mode 100644
index ee759b89b..000000000
--- a/winsup/testsuite/winsup.api/ltp/dup02.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: dup02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Negative test for dup(2) with bad fd.
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 06/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1-?.) dup(2) returns -1 with errno set to EBADF...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- *	Standard tst_res formatted output
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- *	  Loop through the test cases
- * 	   Execute system call
- *	   Check return code, if system call failed (return=-1)
- *		if doing functional check
- *		   check if errno set correctly, report results
- *	  Otherwise, Issue a FAIL message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-const char *TCID="dup02"; 		/* Test program identifier.    */
-int TST_TOTAL=2;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int Fds[] = { -1, 1500 };
-
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    int nfds = sizeof(Fds) / sizeof(int);
-    int ind;
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	for (ind=0; ind<nfds; ind++) {
-
-	    /* 
-	     * Call dup(2)
-	     */
-	    TEST( dup(Fds[ind]) );
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-	        if ( STD_FUNCTIONAL_TEST ) {
-		    if ( TEST_ERRNO == EBADF ) {
-	                tst_resm(TPASS, "dup(%d) Failed, errno=%d : %s", Fds[ind],
-		            TEST_ERRNO, strerror(TEST_ERRNO));
-		    }
-		    else  {
-	                tst_resm(TFAIL,
-			    "dup(%d) Failed, errno=%d %s, expected %d (EBADF)",
-			    Fds[ind], TEST_ERRNO, strerror(TEST_ERRNO), EBADF);
-		    }
-	        }
-	    } else {
-	        tst_resm(TFAIL, "dup(%d) returned %d, expected -1, errno:%d (EBADF)",
-		    Fds[ind], TEST_RETURN, EBADF);
-
-	        /* close the new file so loops do not open too many files */
-                if (close(TEST_RETURN) == -1) {
-                   tst_brkm(TBROK, cleanup, "close(%d) Failed, errno=%d : %s",
-		        TEST_RETURN, errno, strerror(errno));
-                }
-	    }
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/dup03.c b/winsup/testsuite/winsup.api/ltp/dup03.c
deleted file mode 100644
index bcc347aac..000000000
--- a/winsup/testsuite/winsup.api/ltp/dup03.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: dup03
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Negative test for dup(2) (too many fds)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 06/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) dup(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID="dup03"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-
-char Fname[255];
-int *Fd = NULL;
-int Nfds=0;
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call dup(2)
-	 */
-	TEST( dup(Fd[0]) );
-	
-        /* check return code */
-        if ( TEST_RETURN == -1 ) {
-            if ( STD_FUNCTIONAL_TEST ) {
-                if ( TEST_ERRNO == EMFILE ) {
-                    tst_resm(TPASS, "dup(%d) Failed, errno=%d : %s", Fd[0],
-                        TEST_ERRNO, strerror(TEST_ERRNO));
-		}
-                else {
-                    tst_resm(TFAIL, "dup(%d) Failed, errno=%d %s, expected %d (EMFILE)",
-                        Fd[0], TEST_ERRNO, strerror(TEST_ERRNO), EMFILE);
-		}
-            }
-        } else {
-            tst_resm(TFAIL, "dup(%d) returned %d, expected -1, errno:%d (EMFILE)",
-                Fd[0], TEST_RETURN, EMFILE);
-
-            /* close the new file so loops do not open too many files */
-            if (close(TEST_RETURN) == -1) {
-               tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s",
-                    Fname, errno, strerror(errno));
-            }
-        }
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    long maxfds;
-
-    /*
-     * Initialize Fd in case we get a quick signal
-     */
-    maxfds = sysconf(_SC_OPEN_MAX);
-    if (maxfds < 1) {
-	tst_brkm(TBROK, cleanup,
-	    		"sysconf(_SC_OPEN_MAX) Failed, errno=%d : %s",
-	    		errno, strerror(errno));
-    }
-    
-    Fd = (int *)malloc(maxfds*sizeof(int));
-    Fd[0]=-1;
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    /*
-     * open the file as many times as it takes to use up all fds
-     */
-    sprintf(Fname, "dupfile");
-    for (Nfds=1; Nfds<=maxfds; Nfds++) {
-        if ((Fd[Nfds-1] = open(Fname,O_RDWR|O_CREAT,0700)) == -1) {
-
-	    Nfds--;	/* on a open failure, decrement the counter */
-	    if ( errno == EMFILE ) {
-		break;
-	    }
-	    else { 	/* open failed for some other reason */
-	        tst_brkm(TBROK, cleanup,
-		    "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		    Fname, errno, strerror(errno));
-	    }
-	}
-    }
-
-    /*
-     * make sure at least one was open and that all fds were opened.
-     */
-    if ( Nfds == 0 ) {
-	tst_brkm(TBROK, cleanup, "Unable to open at least one file");
-    }
-    if ( Nfds > maxfds ) {
-	tst_brkm(TBROK, cleanup,
-	    "Unable to open enough files to use all file descriptors, tried %d",
-	    maxfds);
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the open file we've been dup'ing */
-    if (Fd) {
-    	for (; Nfds >0 ; Nfds--) {
-    	    if (close(Fd[Nfds-1]) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-				Fname, errno, strerror(errno));
-	    }
-	    Fd[Nfds]=-1;
-	}
-	free(Fd);
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/dup04.c b/winsup/testsuite/winsup.api/ltp/dup04.c
deleted file mode 100644
index 1c4eaf188..000000000
--- a/winsup/testsuite/winsup.api/ltp/dup04.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: dup04
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for dup(2) of a system pipe descriptor
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 06/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) dup(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the dup(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	dup(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-const char *TCID="dup04"; 		/* Test program identifier.    */
-int TST_TOTAL=2;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int Fd[2];
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call dup(2) for read side
-	 */
-	TEST( dup(Fd[0]) );
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "dup(%d) read side of syspipe Failed, errno=%d : %s", Fd[0],
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "dup(%d) read side of syspipe returned %d", Fd[0],
-		    TEST_RETURN);
-
-	    } 
-	    else
-		Tst_count++;
-
-	    /* close the new file so loops do not open too many files */
-            if (close(TEST_RETURN) == -1) {
-               tst_brkm(TBROK, cleanup, "close(%d) Failed, errno=%d : %s",
-	            TEST_RETURN, errno, strerror(errno));
-            }
-	}
-
-	/* 
-	 * Call dup(2) for write side
-	 */
-	TEST( dup(Fd[1]) );
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "dup(%d) write side of syspipe Failed, errno=%d : %s", Fd[1],
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "dup(%d) write side of syspipe returned %d", Fd[1],
-		    TEST_RETURN);
-
-	    } 
-	    else
-		Tst_count++;
-
-	    /* close the new file so loops do not open too many files */
-            if (close(TEST_RETURN) == -1) {
-               tst_brkm(TBROK, cleanup, "close(%d) Failed, errno=%d : %s",
-	            TEST_RETURN, errno, strerror(errno));
-            }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /*
-     * Initialize Fd in case we get a quick signal
-     */
-    Fd[0]=-1;
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    if ( pipe(Fd) == -1 ) {
-	tst_brkm(TBROK, cleanup, "pipe(&Fd) Failed, errno=%d : %s",
-	    errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    int ind;
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the open file we've been dup'ing */
-    if (Fd[0] != -1) {
-	for (ind=0; ind<2; ind++) {
-	    if (close(Fd[ind]) == -1) {
-		tst_resm(TWARN, "close(%d) Failed, errno=%d : %s",
-			Fd[ind], errno, strerror(errno));
-    	    }
-	    Fd[ind]=-1;
-	}
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/dup05.c b/winsup/testsuite/winsup.api/ltp/dup05.c
deleted file mode 100644
index 097688353..000000000
--- a/winsup/testsuite/winsup.api/ltp/dup05.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: dup05
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for dup(2) of a named pipe descriptor
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 06/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) dup(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the dup(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	dup(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-const char *TCID="dup05"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char Fname[255];
-int Fd;
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call dup(2)
-	 */
-	TEST( dup(Fd) );
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "dup(%s) Failed, errno=%d : %s", Fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "dup(%s) returned %d", Fname, TEST_RETURN);
-	    } 
-
-	    /* close the new file so loops do not open too many files */
-            if (close(TEST_RETURN) == -1) {
-               tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s",
-		    Fname, errno, strerror(errno));
-            }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /*
-     * Initialize Fd in case we get a quick signal
-     */
-    Fd=-1;
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(Fname, "dupfile");
-    if ( mkfifo(Fname, 0777) == -1 ) {
-	tst_brkm(TBROK, cleanup,
-	    "mkfifo(%s, 0700) Failed, errno=%d : %s",
-	    Fname, errno, strerror(errno));
-    }
-    if ((Fd = open(Fname, O_RDWR, 0700)) == -1) {
-	tst_brkm(TBROK, cleanup,
-	    "open(%s, O_RDWR, 0700) Failed, errno=%d : %s",
-	    Fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the open file we've been dup'ing */
-    if (Fd != -1) {
-	if (close(Fd) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-			Fname, errno, strerror(errno));
-    	}
-	Fd=-1;
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/execl01.c b/winsup/testsuite/winsup.api/ltp/execl01.c
deleted file mode 100644
index f91b0a820..000000000
--- a/winsup/testsuite/winsup.api/ltp/execl01.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: execl01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for execl(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 06/01/02
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) execl(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the execl(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	execl(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="execl01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-extern int Tst_nobuf;		/* used to turn off buffering in tst_ routines */
-
-int exp_enos[]={0, 0};		/* Zero terminated list of expected errnos */
-
-int pid;		/* process id from fork */
-int status;		/* status returned from waitpid */
-
-
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    Tst_nobuf=1;	/* turn off buffering in tst_ routines */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *   fork, then call execl from child 
-	 */
-	switch(pid=fork()) {
-	case 0: 	/* CHILD - Call execl(2) */
-	    execl("test", "test", NULL);
-	    /* should not get here!! if we do, the parent will fail the Test Case */
-	    exit(errno);	
-	case -1:	/* ERROR!!! exit now!!*/
-	    tst_brkm(TBROK, cleanup, 
-			"Unable to fork a child process to exec over!  Errno:%d,:%s",
-			errno, strerror(errno));
-	    break;
-	default:
-	    waitpid(pid, &status, 0);
-	    if ( WIFEXITED(status) ) {
-		/***************************************************************
-		 * only perform functional verification if flag set (-f not given)
-		 ***************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "execl - properly exec's a simple program..");
-		} 
-	    } else {
-		TEST_ERROR_LOG(WEXITSTATUS(status));
-		tst_resm(TFAIL, "Child process did not terminate properly, status=%d", status);
-	    }
-	    break;
-	}	/* switch */
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-    
-    /*
-     * Send out info message that timing and errnolog info is not
-     * available because of the use of a child process for each exec
-     */
-    if ( STD_TIMING_ON )
-        tst_resm(TINFO, "There are NO timing statistics produced by this test.\n\
-This is because the test forks to create a child process which then calls execl.\n\
-The TEST macro is NOT used.");
-
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/execle01.c b/winsup/testsuite/winsup.api/ltp/execle01.c
deleted file mode 100644
index f7fcc8237..000000000
--- a/winsup/testsuite/winsup.api/ltp/execle01.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: execle01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for execle(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 06/01/02
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) execle(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the execle(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	execle(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="execle01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-extern int Tst_nobuf;		/* used to turn off buffering in tst_ routines */
-
-int exp_enos[]={0, 0};		/* Zero terminated list of expected errnos */
-
-int pid;		/* process id from fork */
-int status;		/* status returned from waitpid */
-extern char **environ;	/* pointer to this processes env, to pass along */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    Tst_nobuf=1;	/* turn off buffering in tst_ routines */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *   fork, then call execle from child 
-	 */
-	switch(pid=fork()) {
-	case 0: 	/* CHILD - Call execle(2) */
-	    execle("test", "test", 0, environ);
-	    /* should not get here!! if we do, the parent will fail the Test Case */
-	    exit(errno);	
-	case -1:	/* ERROR!!! exit now!!*/
-	    tst_brkm(TBROK, cleanup, 
-			"Unable to fork a child process to exec over!  Errno:%d,:%s",
-			errno, strerror(errno));
-	    break;
-	default:
-	    waitpid(pid, &status, 0);
-	    if ( WIFEXITED(status) ) {
-		/***************************************************************
-		 * only perform functional verification if flag set (-f not given)
-		 ***************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "execle - properly exec's a simple program..");
-		} 
-	    } else {
-		TEST_ERROR_LOG(WEXITSTATUS(status));
-		tst_resm(TFAIL, "Child process did not terminate properly, status=%d", status);
-	    }
-	    break;
-	}	/* switch */
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-    
-    /*
-     * Send out info message that timing and errnolog info is not
-     * available because of the use of a child process for each exec
-     */
-    if ( STD_TIMING_ON )
-        tst_resm(TINFO, "There are NO timing statistics produced by this test.\n\
-This is because the test forks to create a child process which then calls execle.\n\
-The TEST macro is NOT used.");
-
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/execlp01.c b/winsup/testsuite/winsup.api/ltp/execlp01.c
deleted file mode 100644
index 383223c07..000000000
--- a/winsup/testsuite/winsup.api/ltp/execlp01.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: execlp01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for execlp(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 06/01/02
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) execlp(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the execlp(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	execlp(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="execlp01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-extern int Tst_nobuf;		/* used to turn off buffering in tst_ routines */
-
-int exp_enos[]={0, 0};		/* Zero terminated list of expected errnos */
-
-int pid;		/* process id from fork */
-int status;		/* status returned from waitpid */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    Tst_nobuf=1;	/* turn off buffering in tst_ routines */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *   fork, then call execlp from child 
-	 */
-	switch(pid=fork()) {
-	case 0: 	/* CHILD - Call execlp(2) */
-	    execlp("/usr/bin/test", "/usr/bin/test", 0);
-	    /* should not get here!! if we do, the parent will fail the Test Case */
-	    exit(errno);	
-	case -1:	/* ERROR!!! exit now!!*/
-	    tst_brkm(TBROK, cleanup, 
-			"Unable to fork a child process to exec over!  Errno:%d,:%s",
-			errno, strerror(errno));
-	    break;
-	default:
-	    waitpid(pid, &status, 0);
-	    if ( WIFEXITED(status) ) {
-		/***************************************************************
-		 * only perform functional verification if flag set (-f not given)
-		 ***************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "execlp - properly exec's a simple program..");
-		} 
-	    } else {
-		TEST_ERROR_LOG(WEXITSTATUS(status));
-		tst_resm(TFAIL, "Child process did not terminate properly, status=%d", status);
-	    }
-	    break;
-	}	/* switch */
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-    
-    /*
-     * Send out info message that timing and errnolog info is not
-     * available because of the use of a child process for each exec
-     */
-    if ( STD_TIMING_ON )
-        tst_resm(TINFO, "There are NO timing statistics produced by this test.\n\
-This is because the test forks to create a child process which then calls execlp.\n\
-The TEST macro is NOT used.");
-
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/execv01.c b/winsup/testsuite/winsup.api/ltp/execv01.c
deleted file mode 100644
index f59f29702..000000000
--- a/winsup/testsuite/winsup.api/ltp/execv01.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: execv01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for execv(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 06/01/02
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) execv(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the execv(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	execv(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-void cleanup();
-
-const char *TCID="execv01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-extern int Tst_nobuf;		/* used to turn off buffering in tst_ routines */
-
-int exp_enos[]={0, 0};		/* Zero terminated list of expected errnos */
-
-int pid;		/* process id from fork */
-int status;		/* status returned from waitpid */
-const char * const args[2]={"/usr/bin/test", 0};	/* argument list for execv call */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    Tst_nobuf=1;	/* turn off buffering in tst_ routines */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *   fork, then call execv from child 
-	 */
-	switch(pid=fork()) {
-	case 0: 	/* CHILD - Call execv(2) */
-	    execv("/usr/bin/test", args);
-	    /* should not get here!! if we do, the parent will fail the Test Case */
-	    exit(errno);	
-	case -1:	/* ERROR!!! exit now!!*/
-	    tst_brkm(TBROK, cleanup, 
-			"Unable to fork a child process to exec over!  Errno:%d,:%s",
-			errno, strerror(errno));
-	    break;
-	default:
-	    waitpid(pid, &status, 0);
-	    if ( WIFEXITED(status) ) {
-		/***************************************************************
-		 * only perform functional verification if flag set (-f not given)
-		 ***************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "execv - properly exec's a simple program..");
-		} 
-	    } else {
-		TEST_ERROR_LOG(WEXITSTATUS(status));
-		tst_resm(TFAIL, "Child process did not terminate properly, status=%d", status);
-	    }
-	    break;
-	}	/* switch */
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-    
-    /*
-     * Send out info message that timing and errnolog info is not
-     * available because of the use of a child process for each exec
-     */
-    if ( STD_TIMING_ON )
-        tst_resm(TINFO, "There are NO timing statistics produced by this test.\n\
-This is because the test forks to create a child process which then calls execv.\n\
-The TEST macro is NOT used.");
-
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/execve01.c b/winsup/testsuite/winsup.api/ltp/execve01.c
deleted file mode 100644
index 2584bdf05..000000000
--- a/winsup/testsuite/winsup.api/ltp/execve01.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: execve01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for execve(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 06/01/02
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) execve(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the execve(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	execve(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="execve01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-extern int Tst_nobuf;		/* used to turn off buffering in tst_ routines */
-
-int exp_enos[]={0, 0};		/* Zero terminated list of expected errnos */
-
-int pid;			/* process id from fork */
-int status;			/* status returned from waitpid */
-const char *const args[2]={"/usr/bin/test", 0};	/* argument list for execve call */
-extern char **environ;		/* pointer to this processes env, to pass along */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    Tst_nobuf=1;	/* turn off buffering in tst_ routines */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *   fork, then call execve from child 
-	 */
-	switch(pid=fork()) {
-	case 0: 	/* CHILD - Call execve(2) */
-	    execve("/usr/bin/test", args, environ);
-	    /* should not get here!! if we do, the parent will fail the Test Case */
-	    exit(errno);	
-	case -1:	/* ERROR!!! exit now!!*/
-	    tst_brkm(TBROK, cleanup, 
-			"Unable to fork a child process to exec over!  Errno:%d,:%s",
-			errno, strerror(errno));
-	    break;
-	default:
-	    waitpid(pid, &status, 0);
-	    if ( WIFEXITED(status) ) {
-		/***************************************************************
-		 * only perform functional verification if flag set (-f not given)
-		 ***************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "execve - properly exec's a simple program..");
-		} 
-	    } else {
-		TEST_ERROR_LOG(WEXITSTATUS(status));
-		tst_resm(TFAIL, "Child process did not terminate properly, status=%d", status);
-	    }
-	    break;
-	}	/* switch */
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-    
-    /*
-     * Send out info message that timing and errnolog info is not
-     * available because of the use of a child process for each exec
-     */
-    if ( STD_TIMING_ON )
-        tst_resm(TINFO, "There are NO timing statistics produced by this test.\n\
-This is because the test forks to create a child process which then calls execve.\n\
-The TEST macro is NOT used.");
-
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/execvp01.c b/winsup/testsuite/winsup.api/ltp/execvp01.c
deleted file mode 100644
index 8a1726a21..000000000
--- a/winsup/testsuite/winsup.api/ltp/execvp01.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: execvp01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for execvp(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 06/01/02
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) execvp(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the execvp(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	execvp(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="execvp01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-extern int Tst_nobuf;		/* used to turn off buffering in tst_ routines */
-
-int exp_enos[]={0, 0};		/* Zero terminated list of expected errnos */
-
-int pid;		/* process id from fork */
-int status;		/* status returned from waitpid */
-const char *const args[2]={"/usr/bin/test", 0};	/* argument list for execvp call */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    Tst_nobuf=1;	/* turn off buffering in tst_ routines */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *   fork, then call execvp from child 
-	 */
-	switch(pid=fork()) {
-	case 0: 	/* CHILD - Call execvp(2) */
-	    execvp("/usr/bin/test", args);
-	    /* should not get here!! if we do, the parent will fail the Test Case */
-	    exit(errno);	
-	case -1:	/* ERROR!!! exit now!!*/
-	    tst_brkm(TBROK, cleanup, 
-			"Unable to fork a child process to exec over!  Errno:%d,:%s",
-			errno, strerror(errno));
-	    break;
-	default:
-	    waitpid(pid, &status, 0);
-	    if ( WIFEXITED(status) ) {
-		/***************************************************************
-		 * only perform functional verification if flag set (-f not given)
-		 ***************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "execvp - properly exec's a simple program..");
-		} 
-	    } else {
-		TEST_ERROR_LOG(WEXITSTATUS(status));
-		tst_resm(TFAIL, "Child process did not terminate properly, status=%d", status);
-	    }
-	    break;
-	}	/* switch */
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-    
-    /*
-     * Send out info message that timing and errnolog info is not
-     * available because of the use of a child process for each exec
-     */
-    if ( STD_TIMING_ON )
-        tst_resm(TINFO, "There are NO timing statistics produced by this test.\n\
-This is because the test forks to create a child process which then calls execvp.\n\
-The TEST macro is NOT used.");
-
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/exit01.c b/winsup/testsuite/winsup.api/ltp/exit01.c
deleted file mode 100644
index 74e6c093b..000000000
--- a/winsup/testsuite/winsup.api/ltp/exit01.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	exit01.c
- *
- * DESCRIPTION
- *	Check that exit returns the correct values to the waiting parent
- *
- * ALGORITHM
- * 	Fork a process that immediately calls exit() with a known
- * 	value. Check for that value in the parent.
- *
- * USAGE
- * 	exit01
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <signal.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID = "exit01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-int
-main(int ac, char **av)
-{
-	int pid, npid, sig, nsig, exno, nexno, status;
-	int rval = 0;
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSIkNG ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();		/* global setup for test */
-
-	/* check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping. */
-		Tst_count = 0;
-
-		sig = 0;
-		exno = 1;
-
-		if ((pid = fork()) == -1) {
-			tst_brkm(TBROK, cleanup, "fork failed, errno=%d",
-				 errno, strerror(errno));
-		}
-
-		if (pid == 0) {		/* parent */
-			exit(exno);
-		} else {
-			sleep(1);	/* let child start */
-			npid = wait(&status);
-
-			if (npid != pid) {
-				tst_resm(TFAIL, "wait error: "
-					 "unexpected pid returned");
-				rval = 1;
-			}
-
-			nsig = status % 256;
-
-			/*
-			 * Check if the core dump bit has been set, bit # 7
-			 */
-			if (nsig >= 128) {
-				nsig = nsig - 128;
-			}
-
-			/*
-			 * nsig is the signal number returned by wait
-			 */
-			if (nsig != sig) {
-				tst_resm(TFAIL, "wait error: "
-					 "unexpected signal returned");
-				rval = 1;
-			}
-
-			/*
-			 * nexno is the exit number returned by wait
-			 */
-			nexno = status / 256;
-			if (nexno != exno) {
-				tst_resm(TFAIL, "wait error: "
-					 "unexpected exit number returned");
-				rval = 1;
-			}
-		}
-
-		if (rval != 1) {
-			tst_resm(TPASS, "exit() test PASSED");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	umask(0);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at completion or
- * 	       premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/exit02.c b/winsup/testsuite/winsup.api/ltp/exit02.c
deleted file mode 100644
index 1503106e9..000000000
--- a/winsup/testsuite/winsup.api/ltp/exit02.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	exit02.c
- *
- * DESCRIPTION
- *	Check that exit flushes output file buffers and closes files upon
- *	exitting
- *
- * ALGORITHM
- * 	Fork a process that creates a file and writes a few bytes, and
- * 	calls exit WITHOUT calling close(). The parent then reads the
- * 	file.  If everything that was written is present in the file, then
- *	the test passes.
- *
- * USAGE
- * 	exit02
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <errno.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID = "exit02";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-#define READ  0
-#define WRITE 1
-#define MODE 0666
-
-char filen[40];
-
-int
-main(int ac, char **av)
-{
-	int pid, npid, sig, nsig, exno, nexno, status;
-	int filed;
-	char wbuf[BUFSIZ], rbuf[BUFSIZ];
-	int len, rlen;
-	int rval = 0;
-	char *strcpy();
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();			/* global setup for test */
-
-	/*
-	 * The following loop checks looping state if -i option given
-	 */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/*
-		 * reset Tst_count in case we are looping.
-		 */
-		Tst_count = 0;
-
-		strcpy(wbuf, "abcd");
-		len = strlen(wbuf);
-
-		exno = sig = 0;
-
-		if ((pid = fork()) == -1) {
-			tst_brkm(TBROK, cleanup, "fork failed, error no = %d",
-				 errno, strerror(errno));
-		}
-
-		if (pid == 0) {		/* child */
-			sleep(1);
-			if ((filed = creat(filen, MODE)) == -1) {
-				tst_resm(TINFO, "creat error: unable to"
-					 "open output file");
-				exit(2);
-			}
-			if (write(filed, wbuf, len) != len) {
-				tst_resm(TINFO, "write error");
-				exit(2);
-			}
-			close(filed);
-			exit(exno);
-		} else {		/* parent */
-			npid = wait(&status);
-
-			if (npid != pid) {
-				tst_resm(TFAIL, "wait error: "
-					 "unexpected pid returned");
-				rval = 1;
-			}
-
-			nsig = status % 256;
-
-			/* 
-			 * to check if the core dump bit has been
-			 * set, bit # 7
-			 */
-			if (nsig >= 128)
-				nsig = nsig - 128;
-
-			/*
-			 * nsig is the signal number returned by
-			 * wait
-			 */
-			if (nsig != sig) {
-				tst_resm(TFAIL, "wait error: unexpected "
-					 "signal returned %d", nsig);
-				rval = 1;
-			}
-
-			/*
-			 * nexno is the exit number returned by wait
-			 */
-			nexno = status / 256;
-			if (nexno != exno) {
-				tst_resm(TFAIL, "wait error: unexpected exit "
-					 "number %d", nexno);
-				rval = 1;
-			}
-
-			sleep(2);	/* let child's exit close opened file */
-
-			filed = open(filen, O_RDONLY, READ);
-			if (filed == -1) {
-				tst_resm(TFAIL, "open error: "
-					 "unable to open input file");
-				rval = 1;
-			} else {
-				rlen = read(filed, rbuf, len);
-				if (len != rlen) {
-					tst_resm(TFAIL, "exit error: file "
-						 "buffer was not flushed");
-					rval = 1;
-				} else if (memcmp(rbuf, wbuf, rlen) != 0) {
-					tst_resm(TFAIL, "exit error: file "
-						 "buffer was not flushed");
-					rval = 1;
-				}
-			}
-			close(filed);
-			unlink(filen);
-		}
-		if (!rval) {
-			tst_resm(TPASS, "exit() test PASSED");
-		}
-	}
-	cleanup();
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - perform all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	umask(0);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	sprintf(filen, "tfile_%d",getpid());
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at completion or
- *	       premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * Remove tmp dir and all files in it
-	 */
-	tst_rmdir();
-
-	/*
-	 * exit with return code appropriate for results
-	 */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/fchdir01.c b/winsup/testsuite/winsup.api/ltp/fchdir01.c
deleted file mode 100644
index bd70c01b3..000000000
--- a/winsup/testsuite/winsup.api/ltp/fchdir01.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	fchdir01.c
- *
- * DESCRIPTION
- *	fchdir01 - create a directory and cd into it.
- *
- * ALGORITHM
- *	create a new directory
- *	open the directory and get a file descriptor
- *	loop if that option was specified
- *	fchdir() into the directory
- *	check the return code
- *	  if failure, issue a FAIL message.
- *	otherwise,
- *	  if doing functionality testing, call check_functionality()
- *	  	if correct,
- *			issue a PASS message
- *		otherwise
- *			issue a FAIL message
- *	call cleanup
- *
- * USAGE:  <for command-line>
- *  fchdir01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	03/2001 - Written by Wayne Boyer
- *
- * RESTRICTIONS
- *	none
- */
-
-#include "test.h"
-#include "usctest.h"
-
-#include <errno.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID = "fchdir01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-int fd = -1;
-char temp_dir_buf [PATH_MAX];
-char* temp_dir;
-const char *TEST_DIR = "alpha";
-
-#define MODES	S_IRWXU
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-	void check_functionality(void);
-	int r_val;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();			/* global setup */
-
-	/* The following loop checks looping state if -i option given */
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		/* get the name of the test dirctory */
-		if ((temp_dir = (getcwd(temp_dir_buf, sizeof (temp_dir_buf)))) == NULL) {
-			tst_brkm(TBROK, cleanup, "%s - getcwd() in main() "
-				 "failed", TCID);
-		}
-	
-		/*
-		 * create a new directory and open it
-		 */
-	
-		if ((r_val = mkdir(TEST_DIR, MODES)) == -1){
-			tst_brkm(TBROK, cleanup, "%s - mkdir() in main() "
-				 "failed", TCID);
-		}
-	
-		if ((fd = open(TEST_DIR, O_RDONLY)) == -1) {
-			tst_brkm(TBROK, cleanup, "open of directory failed");
-		}
-
-		/*
-		 * Use TEST macro to make the call
-		 */
-	
-		TEST(fchdir(fd));
-	
-		if (TEST_RETURN == -1) {
-			tst_brkm(TFAIL, cleanup, "%s call failed - errno = %d :"
-				 " %s", TCID, TEST_ERRNO, strerror(TEST_ERRNO));
-		} else {
-			if (STD_FUNCTIONAL_TEST) {
-				check_functionality();
-			} else {
-				tst_resm(TPASS, "call succeeded");
-			}
-		}
-
-		/*
-		 * clean up things in case we are looping
-		 */
-
-		/*
-		 * NOTE: in case of failure here, we need to use "tst_resm()"
-		 * and not "tst_brkm()".  This is because if we get to this
-		 * point, we have already set a PASS or FAIL for the test
-		 * and "tst_brkm()" won't report as we might expect.
-		 */
-
-		/* chdir back to our temporary work directory */
-		if ((r_val = chdir("..")) == -1){
-			tst_resm(TBROK, "fchdir failed - errno = %d : %s",
-				 errno, strerror(errno));
-		}
-
-		if ((r_val = rmdir(TEST_DIR)) == -1){
-			tst_resm(TBROK, "rmdir failed - errno = %d : %s",
-				 errno, strerror(errno));
-		}
-
-		/*
-		 * clean up things in case we are looping
-		 */
-		/* free(temp_dir); */
-		temp_dir = NULL;
-	}
-
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * check_functionality() - check that we are in the correct directory.
- */
-void
-check_functionality(void)
-{
-	char buf [PATH_MAX];
-	char *cwd;
-	char **bufptr = &cwd;
-	char *dir;
-
-	/*
-	 * Get the current directory path.
-	 */
-	if ((cwd = (getcwd(buf, sizeof (buf)))) == NULL) {
-		tst_brkm(TBROK, cleanup, "%s - getcwd() in "
-			 "check_functionality() failed", TCID);
-	}
-
-	/*
-	 * strip off all but the last directory name in the
-	 * current working directory.
-	 */
-	do {
-		if ((dir = strsep(bufptr, "/")) == NULL) {
-			tst_brkm(TBROK, cleanup, "%s - strsep() in "
-				 "check_functionality() failed", TCID);
-		}
-	} while(*bufptr != NULL);
-
-	/*
-	 * Make sure we are in the right place.
-	 */
-	if (strcmp(TEST_DIR, dir) == 0) {
-		tst_resm(TPASS, "%s call succeeded", TCID);
-	} else {
-		tst_resm(TFAIL, "%s functionality test failed", TCID);
-	}
-}
-
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* create a test directory and cd into it */
-	tst_tmpdir();
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void
-cleanup(void)
-{
-        if (fd >= 0)
-		close (fd);
-
-	/* remove the test directory */
-	tst_rmdir();
-
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/fchdir02.c b/winsup/testsuite/winsup.api/ltp/fchdir02.c
deleted file mode 100644
index 4e1d9e74a..000000000
--- a/winsup/testsuite/winsup.api/ltp/fchdir02.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	fchdir02.c
- *
- * DESCRIPTION
- *	fchdir02 - try to cd into a bad directory (bad fd).
- *
- * CALLS
- *	fchdir()
- *
- * ALGORITHM
- *	loop if that option was specified
- *	call fchdir() with an invalid file descriptor
- *	check the errno value
- *	  issue a PASS message if we get EBADF - errno 9
- *	otherwise, the tests fails
- *	  issue a FAIL message
- *	  break any remaining tests
- *	  call cleanup
- *
- * USAGE:  <for command-line>
- *  fchdir02 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	03/2001 - Written by Wayne Boyer
- *
- * RESTRICTIONS
- *	none
- */
-
-#include "test.h"
-#include "usctest.h"
-
-#include <errno.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID = "fchdir02";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-int exp_enos[] = {9, 0};	/* 0 terminated list of expected errnos */
-
-int
-main(int ac, char **av)
-{
-	const int bad_fd = -5;
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();			/* global setup */
-
-	/* The following loop checks looping state if -i option given */
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		/*
-		 * Look for a failure by using an invalid number for fd
-		 */
-	
-		TEST(fchdir(bad_fd));
-	
-		if (TEST_RETURN != -1) {
-			tst_brkm(TFAIL, cleanup, "call succeeded with bad "
-				 "file descriptor");
-		}
-	
-		TEST_ERROR_LOG(TEST_ERRNO);
-
-		switch(TEST_ERRNO) {
-		case EBADF:
-			tst_resm(TPASS, "expected failure - errno = %d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
-			break;
-		default:
-			tst_brkm(TFAIL, cleanup, "call failed with an "
-				 "unexpected error - %d : %s", TEST_ERRNO,
-				 strerror(TEST_ERRNO));
-		}
-	}
-
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* create a test directory and cd into it */
-	tst_tmpdir();
-
-	/* Set up the expected error numbers for -e option */
-	TEST_EXP_ENOS(exp_enos);
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void
-cleanup(void)
-{
-	/* remove the test directory */
-	tst_rmdir();
-
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/fchmod01.c b/winsup/testsuite/winsup.api/ltp/fchmod01.c
deleted file mode 100644
index e2db7162a..000000000
--- a/winsup/testsuite/winsup.api/ltp/fchmod01.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fchmod01
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fchmod(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fchmod(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fchmod(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="fchmod01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-const char *buf = "davef";
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call fchmod(2)
-	 */
-	TEST(fchmod(fd, 0700));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "fchmod(%s, 0700) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "fchmod(%s, 0700) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup, "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    } else if (write(fd, &buf, strlen(buf)) == -1) {
-           tst_brkm(TBROK, cleanup, "write(%s, &buf, strlen(buf)) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the open file wev'e been chmoding */
-    if (close(fd) == -1) {
-	tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s",
-		 fname, errno, strerror(errno));
-    } 
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/fchown01.c b/winsup/testsuite/winsup.api/ltp/fchown01.c
deleted file mode 100644
index d692bfc74..000000000
--- a/winsup/testsuite/winsup.api/ltp/fchown01.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fchown01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fchown(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 02/14/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fchown(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fchown(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fchown(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="fchown01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int Fd;		/* file descriptor for fchown */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* Call fchown(2) just once */
-	TEST(fchown(Fd, geteuid(), getegid()));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL,
-		     "fchown(Fd, geteuid(), getegid()) failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* Perform functional verification here */
-		tst_resm(TPASS,
-			 "fchown(Fd, geteuid(), getegid()) returned %d",
-			 TEST_RETURN);
-	    }
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    char fname[1024];
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a tempdir and change to it */
-    tst_tmpdir();
-
-    /* open a file for read/write */
-    sprintf(fname, "./tmpfile.%d", getpid());
-    if ( (Fd=open(fname, O_RDWR|O_CREAT, 0700)) == -1 )
-	tst_brkm(TBROK, cleanup,
-		 "Unable to open %s for read/write.  Error:%d, %s",
-		 fname, errno, strerror(errno));	/* this exits */
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    close(Fd);
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove temp dir and files */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/fcntl02.c b/winsup/testsuite/winsup.api/ltp/fcntl02.c
deleted file mode 100644
index cbdd08545..000000000
--- a/winsup/testsuite/winsup.api/ltp/fcntl02.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fcntl02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fcntl(2) using F_DUPFD argument.
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fcntl(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fcntl(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fcntl(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="fcntl02"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call fcntl(2) with F_DUPFD argument on fname
-	 */
-	TEST(fcntl(fd, F_DUPFD, 0));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "fcntl(%s, F_DUPFD, 0) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "fcntl(%s, F_DUPFD, 0) returned %d", fname, TEST_RETURN);
-	    } 
-	    if (close(TEST_RETURN) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the file we've had open */
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fcntl03.c b/winsup/testsuite/winsup.api/ltp/fcntl03.c
deleted file mode 100644
index 8199469c3..000000000
--- a/winsup/testsuite/winsup.api/ltp/fcntl03.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fcntl03
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fcntl(2) using F_GETFD argument.
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fcntl(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fcntl(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fcntl(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="fcntl03"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call fcntl(2) with F_GETFD argument on fname
-	 */
-	TEST(fcntl(fd, F_GETFD, 0));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "fcntl(%s, F_GETFD, 0) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "fcntl(%s, F_GETFD, 0) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fcntl04.c b/winsup/testsuite/winsup.api/ltp/fcntl04.c
deleted file mode 100644
index 7af778936..000000000
--- a/winsup/testsuite/winsup.api/ltp/fcntl04.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fcntl04
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fcntl(2) using F_GETFL argument.
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fcntl(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fcntl(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fcntl(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="fcntl04"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call fcntl(2) with F_GETFL argument on fname
-	 */
-	TEST(fcntl(fd, F_GETFL, 0));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "fcntl(%s, F_GETFL, 0) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "fcntl(%s, F_GETFL, 0) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, TEST_ERRNO, strerror(TEST_ERRNO));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fcntl05.c b/winsup/testsuite/winsup.api/ltp/fcntl05.c
deleted file mode 100644
index 80cfe8c89..000000000
--- a/winsup/testsuite/winsup.api/ltp/fcntl05.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fcntl05
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fcntl(2) using F_GETLK argument.
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fcntl(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fcntl(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fcntl(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="fcntl05"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-struct flock flocks;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-        flocks.l_type = F_RDLCK;
-	/* 
-	 * Call fcntl(2) with F_GETLK argument on fname
-	 */
-	TEST(fcntl(fd, F_GETLK, &flocks));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "fcntl(%s, F_GETLK, &flocks) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "fcntl(%s, F_GETLK, &flocks) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-
-    /* set needed flags in the flocks structure */
-    flocks.l_whence=1;
-    flocks.l_start=0;
-    flocks.l_len=0;
-    flocks.l_pid=getpid();
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Close the file we have open */
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fcntl07.c b/winsup/testsuite/winsup.api/ltp/fcntl07.c
deleted file mode 100644
index d62eb7967..000000000
--- a/winsup/testsuite/winsup.api/ltp/fcntl07.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fcntl07
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Close-On-Exec functional test
- * 
- *    PARENT DOCUMENT	: none
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 5
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Glen Overby
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 08/11/93
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) test close-on-exec with a regular file
- * 	2.) test close-on-exec with a system pipe
- * 
- *    INPUT SPECIFICATIONS
- *	
- *	Standard arguments accepted by parse_opts(3).
- *
- *	The -t (timing) and -e options apply to the fcntl(.., F_SETFD, ..)
- *	system call.
- *
- *	-T fd	  : If this option is given, the program runs as "test_open",
- *		    testing <fd> to see if it is open or not and exiting
- *		    accordingly:
- *			0	not open (EBADF from fcntl(..., F_GETFD, ...))
- *			3	no error from fcntl
- *			errno	fcntl returned an error other than EBADF
- *
- *	-F name   : File to open.  Must be an absolute path
- *		    and the file must be writable;
- *	-n program: path to the 'test_open' program
- *
- *    OUTPUT SPECIFICATIONS
- *        This test uses the cuts-style test_res format output consisting of:
- *
- *                 test-name   PASS/FAIL/BROK	message
- *
- *        the message will tell what type of test and, if it failed, indicate
- *        what the failure was.
- * 	
- *    DURATION
- * 	Terminates
- * 
- *    SIGNALS
- * 	None
- * 
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *	If this test is not called with a full pathname, it must be able
- *	to find itself on $PATH
- * 
- *    INTERCASE DEPENDENCIES
- *	none
- * 
- *    DETAILED DESCRIPTION
- * 
- * 	Setup:
- * 	  Setup signal handling.
- * 	  Create and make current a temporary directory.
- * 	  Open a regular file for writing
- *	  Create a system pipe
- *	  Create a named pipe and open it for writing
- * 
- * 	Test:
- *	  Set the file descriptor for close-on-exec
- *	  Fork
- *		Child execlp's the program "test_open".
- *		If the exec fails, exit "2"
- *	        Parent waits
- * 	  Report results.
- * 
- * 	Cleanup:
- * 	  Close file and pipes
- * 	  Remove the temporary directory  
- * 
- *    BUGS
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-#include <limits.h>
-
-#include "test.h"
-#include "usctest.h"
-#include "search_path.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-void help();
-
-const char *TCID="fcntl07";		/* Test program identifier.    */
-int TST_TOTAL=2;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-
-
-/* for parse_opts */
-int fflag, Tflag;		/* binary flags: opt or not */
-char *fopt, *Topt;		/* option arguments */
-
-option_t options[] = {
-	{ "F:", &fflag, &fopt },	/* -F filename */
-	{ "T:",	&Tflag, &Topt },	/* -T <fd>  exec'ed by test: test FD */
-	{ NULL, NULL, NULL }
-};
-
-int stat_loc;			/* for waitpid() */
-
-int file_fd, pipe_fds[2];
-	/* file descriptors for a file and a system pipe */
-#define DEFAULT_FILE "DefaultFileName"
-const char *File1 = DEFAULT_FILE;
-
-#define DEFAULT_SUBPROG "test_open"
-const char *openck = DEFAULT_SUBPROG;	/* support program name to check for open FD */
-char subprog_path[_POSIX_PATH_MAX];	/* path to exec "openck" with */
-#define STRSIZE 255
-
-int *testfds[] = {
-    &file_fd,	&pipe_fds[1],	0
-    };
-
-const char *testfdtypes[] = {
-    "regular file",
-    "write side of system pipe",
-    };
-
-int test_open(const char *arg);
-int do_exec(const char *prog, int fd, const char *tcd);
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    int exec_return;	/* return from do_exec */
-    int **tcp;		/* testcase pointer (pointer to FD) */
-    const char **tcd;		/* testcase description pointer */
-    
-    /***************************************************************
-     * parse standard options, and exit if there is an error
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, options, &help)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-    
-    if(fflag)		/* -F option */
-	File1 = fopt;
-    
-    if(Tflag) {		/* -T option */
-	exit(test_open(Topt));
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup(av[0]);
-    
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	for(tcp = testfds, tcd = testfdtypes; *tcp; tcp++, tcd++) {
-
-	    TEST(fcntl(**tcp, F_SETFD, FD_CLOEXEC));
-
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-		TEST_ERROR_LOG(TEST_ERRNO);
-		tst_resm(TFAIL, "fcntl(%s[%d], F_SETFD, FD_CLOEXEC) Failed, errno=%d : %s",
-			 *tcd, **tcp, TEST_ERRNO, strerror(TEST_ERRNO));
-	    } else {
-		
-		/*************************************************************
-		 * only perform functional verification if flag set 
-		 * (-f not given)
-		 *************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    
-		    exec_return = do_exec(subprog_path, **tcp, *tcd);
-		    
-		    switch(exec_return) {
-		    case -1:
-			tst_resm(TBROK, "fork failed.  Errno %s [%d]", 
-				 strerror(errno), errno);
-			break;
-		    case 1:
-			tst_resm(TBROK, "waitpid return was 0%o", stat_loc);
-			break;
-		    case 2:
-			tst_resm(TBROK, "exec failed");	/* errno was in child */
-			break;
-		    case 0:
-			tst_resm(TPASS, "%s child exited 0, indicating that the file was closed",
-				 *tcd);
-			break;
-		    default:
-			tst_resm(TFAIL, "%s child exited non-zero, %d", *tcd, 
-				 exec_return);
-			break;
-		    }
-		}
-	    }
-	}
-    }	/* End for TEST_LOOPING */
-    
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup(char *path)
-{
-    search_path(path, subprog_path, X_OK, 1);
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* create a temporary directory and go to it */
-    tst_tmpdir();
-
-    /* set up a regular file */
-    if((file_fd=open(File1, O_CREAT|O_RDWR, 0666)) == -1) {
-	tst_brkm(TBROK, cleanup, "Open of file %s failed errno %d (%s)\n", File1, errno, strerror(errno));
-    }
-
-    /* set up a system pipe (write side gets CLOSE-ON-EXEC) */
-    pipe(pipe_fds);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close everything */
-    close(file_fd);
-    close(pipe_fds[0]);
-    close(pipe_fds[1]);
-
-    /* remove temporary directory and all files in it. */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-/***************************************************************************
- * issue a help message
- ***************************************************************************/
-void
-help()
-{
-    printf("-T fd     : If this option is given, the program runs as 'test_open'\n");
-    printf("            testing <fd> to see if it is open or not and exiting accordingly\n");
-    printf("-F name   : File to open.  Must be an absolute path,\n");
-    printf("            and the file must be writable\n");
-    printf("-n program: path to the 'test_open' program\n");
-}
-
-/*---------------------------------------------------------------------------*/
-/* Perform an exec, then wait for the child to terminate.
- * The child's termination status determines the success of the test
- *
- * Return codes:
- *	-1	BROK	fork failed
- *	1	BROK	waitpid returned != exit status
- *	<else>	????	exit code from child:
- *	2	BROK	exec failed
- *	0	PASS	fd was properly closed
- *	
- */
-
-int
-do_exec(const char *prog, int fd, const char *tcd)
-{
-    int pid;
-    char pidname[STRSIZE];
-#ifdef DEBUG
-    int rc, status; /* for the fcntl */
-#endif
-
-    /* set up arguments to exec'ed child */
-    sprintf(pidname, "%d", fd);
-
-#ifdef DEBUG
-    rc = fcntl(fd, F_GETFD, &status);
-    printf("%s: fd = %d rc = %d status= %d, errno= %d\n", tcd, fd, rc, status, errno);
-#endif
-
-    switch(pid=fork()) {
-    case -1:
-	return(-1);
-    case 0:				/* child */
-	execlp(prog, openck, "-T", pidname, 0);
-
-	/* the ONLY reason to do this is to get the errno printed out */
-	fprintf(stderr, "exec(%s, %s, -T, %s) failed.  Errno %s [%d]\n",
-		prog, openck, pidname, strerror(errno), errno);
-	exit(2);
-    default:				/* parent */
-	waitpid(pid, &stat_loc, 0);
-	if(WIFEXITED(stat_loc)) {
-	    return(WEXITSTATUS(stat_loc));
-	} else {
-	    return(1);
-	}
-    }
-}
-
-/*
- *    PROGRAM TITLE	: Test if a named file descriptor is open
- *    This function is called when fcntcs07 is called with the -T option.
- *    It tests if a file descriptor is open and exits accordingly.
- */
-int
-test_open(const char *arg)
-{
-    int fd, rc;
-    int status;
-    
-    fd = atoi(arg);
-
-    rc = fcntl(fd, F_GETFD, &status);
-
-#ifdef DEBUG_T
-    printf("%s: fd = %d rc = %d status= %d, errno= %d\n", openck, fd, rc,
-	   status, errno);
-#endif
-
-    if(rc == -1 && errno == EBADF) {
-	exit(0);
-    }
-
-    if(rc != -1)
-	exit(3);
-
-    exit(errno);
-    return -1;   /* to remove compiler warning on IRIX */
-}
diff --git a/winsup/testsuite/winsup.api/ltp/fcntl07B.c b/winsup/testsuite/winsup.api/ltp/fcntl07B.c
deleted file mode 100644
index 405bf6127..000000000
--- a/winsup/testsuite/winsup.api/ltp/fcntl07B.c
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fcntl07B
- *			  <same
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Close-On-Exec of named pipe functional test
- * 
- *    PARENT DOCUMENT	: none
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 5
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan :copied from fcntcs07 written by Glen Overby 
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 08/11/93
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- *	1.) test close-on-exec with a named pipe
- * 
- *    INPUT SPECIFICATIONS
- *	
- *	Standard arguments accepted by parse_opts(3).
- *
- *	The -t (timing) and -e options apply to the fcntl(.., F_SETFD, ..)
- *	system call.
- *
- *	-T fd	  : If this option is given, the program runs as "test_open",
- *		    testing <fd> to see if it is open or not and exiting
- *		    accordingly:
- *			0	not open (EBADF from fcntl(..., F_GETFD, ...))
- *			3	no error from fcntl
- *			errno	fcntl returned an error other than EBADF
- *
- *	-F name   : File to open.  Must be an absolute path
- *		    and the file must be writable;
- *	-n program: path to the 'test_open' program
- *
- *    OUTPUT SPECIFICATIONS
- *        This test uses the cuts-style test_res format output consisting of:
- *
- *                 test-name   PASS/FAIL/BROK	message
- *
- *        the message will tell what type of test and, if it failed, indicate
- *        what the failure was.
- * 	
- *    DURATION
- * 	Terminates
- * 
- *    SIGNALS
- * 	None
- * 
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *	If this test is not called with a full pathname, it must be able
- *	to find itself on $PATH
- * 
- *    INTERCASE DEPENDENCIES
- *	none
- * 
- *    DETAILED DESCRIPTION
- * 
- * 	Setup:
- * 	  Setup signal handling.
- * 	  Create and make current a temporary directory.
- *	  Create a named pipe and open it for writing
- * 
- * 	Test:
- *	  Set the file descriptor for close-on-exec
- *	  Fork
- *		Child execlp's the program "test_open".
- *		If the exec fails, exit "2"
- *	        Parent waits
- * 	  Report results.
- * 
- * 	Cleanup:
- * 	  Close file and pipes
- * 	  Remove the temporary directory  
- * 
- *    BUGS
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-#include <limits.h>
-
-#include "test.h"
-#include "usctest.h"
-#include "search_path.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-void help();
-
-const char *TCID="fcntl07B";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-
-/* for parse_opts */
-int fflag, Tflag;	/* binary flags: opt or not */
-char *fopt, *Topt;		/* option arguments */
-
-option_t options[] = {
-	{ "F:", &fflag, &fopt },	/* -F filename */
-	{ "T:",	&Tflag, &Topt },	/* -T <fd>  exec'ed by test: test FD */
-	{ NULL, NULL, NULL }
-};
-
-int stat_loc;			/* for waitpid() */
-
-int npipe_fd;
-	/* file descriptors for a named pipe */
-#define DEFAULT_FILE "DefaultFileName"
-const char *File1 = DEFAULT_FILE;
-
-#define DEFAULT_SUBPROG "test_open"
-const char *openck = DEFAULT_SUBPROG;	/* support program name to check for open FD */
-const char subprog_path[_POSIX_PATH_MAX];/* path to exec "openck" with */
-#define STRSIZE 255
-#define FIFONAME "FiFo"
-
-int *testfds[] = {
-    &npipe_fd,	0
-    };
-
-const char *testfdtypes[] = {
-    "named pipe"
-    };
-
-int test_open(char *arg);
-int do_exec(const char *prog, int fd, const char *tcd);
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    int exec_return;	/* return from do_exec */
-    int **tcp;		/* testcase pointer (pointer to FD) */
-    const char **tcd;	/* testcase description pointer */
-    
-    /***************************************************************
-     * parse standard options, and exit if there is an error
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, options, &help)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-    
-    if(fflag)		/* -F option */
-	File1 = fopt;
-    
-    if(Tflag) {		/* -T option */
-	exit(test_open(Topt));
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup(av[0]);
-    
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	for(tcp = testfds, tcd = testfdtypes; *tcp; tcp++, tcd++) {
-
-	    TEST(fcntl(**tcp, F_SETFD, FD_CLOEXEC));
-
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-		TEST_ERROR_LOG(TEST_ERRNO);
-		tst_resm(TFAIL, "fcntl(%s[%d], F_SETFD, FD_CLOEXEC) Failed, errno=%d : %s",
-			 *tcd, **tcp, TEST_ERRNO, strerror(TEST_ERRNO));
-	    } else {
-		
-		/*************************************************************
-		 * only perform functional verification if flag set 
-		 * (-f not given)
-		 *************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    
-		    exec_return = do_exec(subprog_path, **tcp, *tcd);
-		    
-		    switch(exec_return) {
-		    case -1:
-			tst_resm(TBROK, "fork failed.  Errno %s [%d]", 
-				 strerror(errno), errno);
-			break;
-		    case 1:
-			tst_resm(TBROK, "waitpid return was 0%o", stat_loc);
-			break;
-		    case 2:
-			tst_resm(TBROK, "exec failed");	/* errno was in child */
-			break;
-		    case 0:
-			tst_resm(TPASS, "%s child exited 0, indicating that the file was closed",
-				 *tcd);
-			break;
-		    default:
-			tst_resm(TFAIL, "%s child exited non-zero, %d", *tcd, 
-				 exec_return);
-			break;
-		    }
-		}
-	    }
-	}
-    }	/* End for TEST_LOOPING */
-    
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup(char *path)
-{
-    search_path(path, subprog_path, X_OK, 1);
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* create a temporary directory and go to it */
-    tst_tmpdir();
-
-    /* set up a named pipe (write side gets CLOSE-ON-EXEC) */
-    if(mkfifo(FIFONAME, 0666) == -1) {
-	tst_brkm(TBROK, cleanup, "mkfifo of named pipe %s failed errno %d (%s)\n", FIFONAME, errno, strerror(errno));
-    }
-
-    if((npipe_fd=open(FIFONAME, O_RDWR, 0666)) == -1) {
-	tst_brkm(TBROK, cleanup, "Open of named pipe %s failed errno %d (%s)\n", File1, errno, strerror(errno));
-    }
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close everything */
-    close(npipe_fd);
-
-    /* remove temporary directory and all files in it. */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-/***************************************************************************
- * issue a help message
- ***************************************************************************/
-void
-help()
-{
-    printf("-T fd     : If this option is given, the program runs as 'test_open'\n");
-    printf("            testing <fd> to see if it is open or not and exiting accordingly\n");
-    printf("-F name   : File to open.  Must be an absolute path,\n");
-    printf("            and the file must be writable\n");
-    printf("-n program: path to the 'test_open' program\n");
-
-}
-
-/*---------------------------------------------------------------------------*/
-/* Perform an exec, then wait for the child to terminate.
- * The child's termination status determines the success of the test
- *
- * Return codes:
- *	-1	BROK	fork failed
- *	1	BROK	waitpid returned != exit status
- *	<else>	????	exit code from child:
- *	2	BROK	exec failed
- *	0	PASS	fd was properly closed
- *	
- */
-
-int
-do_exec(const char *prog, int fd, const char *tcd)
-{
-    int pid;
-    char pidname[STRSIZE];
-#ifdef DEBUG
-    int rc, status; /* for the fcntl */
-#endif
-
-    /* set up arguments to exec'ed child */
-    sprintf(pidname, "%d", fd);
-
-#ifdef DEBUG
-    rc = fcntl(fd, F_GETFD, &status);
-    printf("%s: fd = %d rc = %d status= %d, errno= %d\n", tcd, fd, rc, status, errno);
-#endif
-
-    switch(pid=fork()) {
-    case -1:
-	return(-1);
-    case 0:				/* child */
-	execlp(prog, openck, "-T", pidname, 0);
-
-	/* the ONLY reason to do this is to get the errno printed out */
-	fprintf(stderr, "exec(%s, %s, -T, %s) failed.  Errno %s [%d]\n",
-		prog, openck, pidname, strerror(errno), errno);
-	exit(2);
-    default:				/* parent */
-	waitpid(pid, &stat_loc, 0);
-	if(WIFEXITED(stat_loc)) {
-	    return(WEXITSTATUS(stat_loc));
-	} else {
-	    return(1);
-	}
-    }
-}
-
-/*
- *    PROGRAM TITLE	: Test if a named file descriptor is open
- *    This function is called when fcntcs07 is called with the -T option.
- *    It tests if a file descriptor is open and exits accordingly.
- */
-int
-test_open(char *arg)
-{
-    int fd, rc;
-    int status;
-    
-    fd = atoi(arg);
-
-    rc = fcntl(fd, F_GETFD, &status);
-
-#ifdef DEBUG_T
-    printf("%s: fd = %d rc = %d status= %d, errno= %d\n", openck, fd, rc,
-	   status, errno);
-#endif
-
-    if(rc == -1 && errno == EBADF) {
-	exit(0);
-    }
-
-    if(rc != -1)
-	exit(3);
-
-    exit(errno);
-    return -1;   /* To remove compiler warning on IRIX */
-}
diff --git a/winsup/testsuite/winsup.api/ltp/fcntl08.c b/winsup/testsuite/winsup.api/ltp/fcntl08.c
deleted file mode 100644
index eaf22436b..000000000
--- a/winsup/testsuite/winsup.api/ltp/fcntl08.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fcntl08
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fcntl(2) using F_SETFL argument.
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fcntl(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fcntl(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fcntl(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- *        close file
- *        remove temp directory
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-#ifndef O_NDELAY
-#define O_NDELAY 0
-#endif
-
-const char *TCID="fcntl08"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-char fname[255];
-int arg, fd;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call fcntl(2) with F_SETFL argument on fname
-	 */
-	TEST(fcntl(fd, F_SETFL, arg));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    tst_resm(TFAIL, "fcntl(%s, F_SETFL, %d) Failed, errno=%d : %s", 
-		fname, arg, TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "fcntl(%s, F_SETFL, %d) returned %d", 
-		    fname, arg, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-
-    /* set the flags to be used */
-#ifdef CRAY
-    arg = (O_NDELAY | O_APPEND | O_RAW | O_NONBLOCK);
-#else
-    arg = (O_NDELAY | O_APPEND | O_NONBLOCK);
-#endif   /* ! CRAY */
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the file we have open */
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", 
-	  fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fcntl09.c b/winsup/testsuite/winsup.api/ltp/fcntl09.c
deleted file mode 100644
index 3a827e149..000000000
--- a/winsup/testsuite/winsup.api/ltp/fcntl09.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fcntl09
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fcntl(2) using F_SETLK argument.
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fcntl(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fcntl(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fcntl(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="fcntl09"; 		/* Test program identifier.    */
-int TST_TOTAL=2;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-struct flock flocks;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-#if 0
-	/* Ouch!  Either read *or* write lock, but not both!
-	   This code depends on F_RDLCK being 0. */
-	flocks.l_type = F_RDLCK | F_WRLCK;
-#else
-	flocks.l_type = F_WRLCK;
-#endif
-	/* 
-	 * Call fcntl(2) with F_SETLK argument on fname
-	 */
-	TEST(fcntl(fd, F_SETLK, &flocks));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL,
-		     "fcntl(%s, F_SETLK, &flocks) flocks.l_type = F_RDLCK | F_WRLCK Failed, errno=%d : %s",
-		     fname, TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS,
-			 "fcntl(%s, F_SETLK, &flocks) flocks.l_type = F_RDLCK | F_WRLCK returned %d",
-			 fname, TEST_RETURN);
-	    } 
-	}
-
-	flocks.l_type = F_UNLCK;
-	/* 
-	 * Call fcntl(2) with F_SETLK argument on fname
-	 */
-	TEST(fcntl(fd, F_SETLK, &flocks));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL,
-		     "fcntl(%s, F_SETLK, &flocks) flocks.l_type = F_UNLCK Failed, errno=%d : %s",
-		      fname, TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS,
-			 "fcntl(%s, F_SETLK, &flocks) flocks.l_type = F_UNLCK returned %d",
-			 fname, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"./file_%d",getpid());
-    if (creat(fname, 02644) == -1) {
-       tst_brkm(TBROK, cleanup, "creat(%s, 02644) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    } else if (close(fd) == -1) {
-       tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    } else if ((fd = open(fname,O_RDWR,0700)) == -1) {
-       tst_brkm(TBROK, cleanup, "open(%s, O_RDWR,0700) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-    flocks.l_whence=1;
-    flocks.l_start=0;
-    flocks.l_len=0;
-    flocks.l_pid=getpid();
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    } else if (unlink(fname) == -1) {
-       tst_resm(TWARN, "unlink(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-      
-    }
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fcntl10.c b/winsup/testsuite/winsup.api/ltp/fcntl10.c
deleted file mode 100644
index e2de44bef..000000000
--- a/winsup/testsuite/winsup.api/ltp/fcntl10.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fcntl10
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fcntl(2) using F_SETLKW argument.
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fcntl(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fcntl(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fcntl(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="fcntl10"; 		/* Test program identifier.    */
-int TST_TOTAL=2;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-struct flock flocks;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-#if 0
-	/* Ouch!  Either read *or* write lock, but not both!
-	   This code depends on F_RDLCK being 0. */
-	flocks.l_type = F_RDLCK | F_WRLCK;
-#else
-	flocks.l_type = F_WRLCK;
-#endif
-	/* 
-	 * Call fcntl(2) with F_SETLKW flocks.l_type = F_UNLCK argument on fname
-	 */
-	TEST(fcntl(fd, F_SETLKW, &flocks));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL,
-		     "fcntl(%s, F_SETLKW, &flocks) flocks.l_type = F_RDLCK | F_WRLCK Failed, errno=%d : %s",
-		     fname, TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS,
-			 "fcntl(%s, F_SETLKW, &flocks) flocks.l_type = F_RDLCK | F_WRLCK returned %d",
-			 fname, TEST_RETURN);
-	    } 
-	}
-
-	flocks.l_type = F_UNLCK;
-	/* 
-	 * Call fcntl(2) with F_SETLKW flocks.l_type = F_UNLCK argument on fname
-	 */
-	TEST(fcntl(fd, F_SETLKW, &flocks));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL,
-		     "fcntl(%s, F_SETLKW, &flocks) flocks.l_type = F_UNLCK Failed, errno=%d : %s",
-		     fname, TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS,
-			 "fcntl(%s, F_SETLKW, &flocks) flocks.l_type = F_UNLCK returned %d",
-			 fname, TEST_RETURN);
-	    } 
-	}
-	
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = creat(fname, 02644)) == -1) {
-       tst_brkm(TBROK, cleanup, "creat(%s, 02644) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    } else if (close(fd) == -1) {
-       tst_brkm(TBROK, cleanup, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    } else if ((fd = open(fname,O_RDWR,0700)) == -1) {
-       tst_brkm(TBROK, cleanup, "open(%s, O_RDWR,0700) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-
-    /* set needed fields in the flocks structure */
-    flocks.l_whence=1;
-    flocks.l_start=0;
-    flocks.l_len=0;
-    flocks.l_pid=getpid();
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fork01.c b/winsup/testsuite/winsup.api/ltp/fork01.c
deleted file mode 100644
index 2aac2d427..000000000
--- a/winsup/testsuite/winsup.api/ltp/fork01.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fork01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fork(2)
- * 
- *    PARENT DOCUMENT	: frktds02
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Kathy Olmsted
- * 
- *    CO-PILOT		: Steve Shaw
- * 
- *    DATE STARTED	: 06/17/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fork returns without error
- *      2.) fork returns the pid of the child
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- *        fork()
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- *        CHILD:
- *           determine PID
- *           write to PID to a file and close the file
- *           exit
- *        PARENT:
- *           wait for child to exit
- *           read child PID from file
- *           compare child PID to fork() return code and report
- *           results
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-#define	KIDEXIT	42
-extern void setup();
-extern void cleanup();
-
-#define LINE_SZ	20		/* size of the line written/read to the file */
-#define FILENAME	"childpid"
-
-
-
-const char *TCID="fork01"; 		/* Test program identifier.    */
-int TST_TOTAL=2;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-/***************************************************************
- * child_pid - the child side of the test
- *        determine the PID and write to a file
- ***************************************************************/
-void child_pid()
-{
-  
-  int fildes;
-  char tmp_line[LINE_SZ];
-  
-  fildes = creat(FILENAME,0700);
-  sprintf(tmp_line,"%d\n",getpid());
-  write(fildes,tmp_line,LINE_SZ);
-  close(fildes);
-
-}
-
-/***************************************************************
- * parent_pid - the parent side of the test
- *        read the value determined by the child
- *        compare and report results
- ***************************************************************/
-void parent_pid()
-{
-  
-  int fildes;
-  char tmp_line[LINE_SZ];
-  pid_t child_id;
-		
-  if ((fildes = open(FILENAME,O_RDWR)) == -1) {
-    tst_brkm(TBROK, cleanup,
-	     "parent open failed. errno: %d (%s)\n",
-	     errno, strerror(errno));
-  }
-  else {
-    if (read(fildes,tmp_line,LINE_SZ) == 0) {
-      tst_brkm(TBROK,cleanup, "fork(): parent failed to read PID from file errno: %d (%s)",
-	       errno, strerror(errno));
-    }
-    else {
-      child_id = atoi(tmp_line);
-      if (TEST_RETURN != child_id) {
-	tst_resm(TFAIL,"child reported a pid of %d. parent received %d from fork()",
-		 child_id,TEST_RETURN);
-      } else {
-	tst_resm(TPASS,"child pid and fork() return agree: %d",child_id);
-      }
-    }
-    close(fildes);
-  }
-}
-
-/***************************************************************
- * main() - performs tests
- *	
- ***************************************************************/
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    int fails;
-    int kid_status, wait_status; 
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-      /* reset Tst_count in case we are looping. */
-      Tst_count=0;
-      fails = 0;
-      
-      /* 
-       * Call fork(2)
-       */
-      TEST(fork());
-      
-      /* check return code */
-      if ( TEST_RETURN == -1 ) {
-	TEST_ERROR_LOG(TEST_ERRNO);
-	if ( STD_FUNCTIONAL_TEST ) {
-	  tst_resm(TFAIL, "fork() Failed, errno=%d : %s",
-		   TEST_ERRNO, strerror(TEST_ERRNO));
-	  tst_resm(TBROK,"unable to continue");
-	}
-      } 
-      if (TEST_RETURN == 0) {
-	/* child */
-	if ( STD_FUNCTIONAL_TEST ) {
-	  child_pid();
-	}
-	exit(KIDEXIT);
-      } else {
-	/* parent */
-	if ( STD_FUNCTIONAL_TEST ) {
-	  tst_resm(TPASS, "fork() returned %d", TEST_RETURN);
-	}
-	/* wait for the child to complete */
-	wait_status = wait(&kid_status);
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if (wait_status == TEST_RETURN) {
-	    if (kid_status != KIDEXIT << 8) {
-	      tst_resm(TBROK,
-		       "incorrect child status returned on wait(): %d", 
-		       kid_status);
-	      fails++;
-	    }
-	  }
-	  else {
-	    tst_resm(TBROK, 
-		     "wait() for child status failed with %d errno: %d : %s", 
-		     wait_status,errno,strerror(errno));
-	    fails++;
-	  }
-	  if (fails == 0 ) {
-	    /* verification tests */
-	    parent_pid();
-	  }
-	}	 	  /* STD_FUNCTIONAL_TEST */
-      }  /* TEST_RETURN */
-    }	/* End for TEST_LOOPING */
-    
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-  setup()
-{
-  /* capture signals */
-  tst_sig(FORK, DEF_HANDLER, cleanup);
-  
-  tst_tmpdir();
-
-  /* Pause if that option was specified */
-  TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-  cleanup()
-{
-  /*
-   * print timing stats if that option was specified.
-   * print errno log if that option was specified.
-   */
-  TEST_CLEANUP;
-
-  /* exit with return code appropriate for results */
-  tst_rmdir();
-  tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fork02.c b/winsup/testsuite/winsup.api/ltp/fork02.c
deleted file mode 100644
index eeec828ec..000000000
--- a/winsup/testsuite/winsup.api/ltp/fork02.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	fork02.c
- *
- * DESCRIPTION
- *	Test correct operation of fork:
- * 		pid == 0 in child;
- * 		pid > 0 in parent from wait;
- *
- * ALGORITHM
- * 	Fork one process, check for pid == 0 in child.
- * 	Check for pid > 0 in parent after wait.
- *
- * USAGE
- * 	fork02
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID = "fork02";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-int
-main(int ac, char **av)
-{
-	int pid1, pid2, status;
-
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * perform global setup for the test
-	 */
-	setup();
-
-	/*
-	 * check looping state if -i option is given
-	 */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/*
-		 * reset Tst_count in case we are looping.
-		 */
-		Tst_count = 0;
-
-		if ((pid1 = fork()) == -1) {
-			tst_brkm(TBROK, cleanup, "fork() failed");
-		}
-
-		if (pid1 == 0) {
-			tst_resm(TINFO, "Inside child");
-			_exit(0);
-		} else {
-			tst_resm(TINFO, "Inside parent");
-			pid2 = wait(&status);
-			tst_resm(TINFO, "exit status of wait %d", status);
-
-			if (pid1 == pid2) {
-				tst_resm(TPASS, "test 1 PASSED");
-			} else {
-				tst_resm(TFAIL, "test 1 FAILED");
-			}
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/*
-	 * capture signals
-	 */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/*
-	 * Pause if that option was specified
-	 */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/fork03.c b/winsup/testsuite/winsup.api/ltp/fork03.c
deleted file mode 100644
index fbc23bb37..000000000
--- a/winsup/testsuite/winsup.api/ltp/fork03.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	fork03.c
- *
- * DESCRIPTION
- *	Check that child can use a large text space and do a large
- *	number of operations.	
- *
- * ALGORITHM
- * 	Fork one process, check for pid == 0 in child.
- * 	Check for pid > 0 in parent after wait.
- *
- * USAGE
- * 	fork03
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID = "fork03";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int ac, char **av)
-{
-	float fl1, fl2;
-	int i;
-	int pid1, pid2, status;
-
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * perform global setup for the test
-	 */
-	setup();
-
-	/*
-	 * check looping state if -i option is given
-	 */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/*
-		 * reset Tst_count in case we are looping.
-		 */
-		Tst_count = 0;
-
-		if ((pid1 = fork()) == -1) {
-			tst_brkm(TBROK, cleanup, "fork() failed");
-		}
-
-		if (pid1 == 0) {	/* child */
-			/* child uses some cpu cycles */
-			for (i = 1; i < 32767; i++) {
-				fl1 = 0.000001;
-				fl1 = fl2 = 0.000001;
-				fl1 = fl1 * 10.0;
-				fl2 = fl1 / 1.232323;
-				fl1 = fl2 - fl2;
-				fl1 = fl2;
-			}
-
-			/* Pid must always be zero in child  */
-
-			if (pid1 != 0) {
-				exit(1);
-			} else {
-				exit(0);
-			}
-		} else {			/* parent */
-			tst_resm(TINFO, "process id in parent of child from "
-				 "fork : %d", pid1);
-			pid2 = wait(&status);	/* wait for child */
-
-			if (pid1 != pid2) {
-				tst_resm(TFAIL, "pids don't match : %d vs %d",
-					 pid1, pid2);
-				continue;
-			}
-
-			if ((status >> 8) != 0) {
-				tst_resm(TFAIL, "child exited with failure");
-				continue;
-			}
-
-			tst_resm(TPASS, "test 1 PASSED");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/*
-	 * capture signals
-	 */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/*
-	 * Pause if that option was specified
-	 */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/fork04.c b/winsup/testsuite/winsup.api/ltp/fork04.c
deleted file mode 100644
index 84bac0579..000000000
--- a/winsup/testsuite/winsup.api/ltp/fork04.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fork04
- * 
- *    TEST TITLE	: Child inheritance of Environment Variables after fork()
- * 
- *    PARENT DOCUMENT	: frktds01
- * 
- *    TEST CASE TOTAL	: 3
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Kathy Olmsted
- * 
- *    CO-PILOT		: Steve Shaw
- * 
- *    DATE STARTED	: 06/17/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- *       Test these environment variables correctly inherited by child:
- *       1. TERM 
- *       2. NoTSetzWq
- *       3. TESTPROG 
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    DETAILED DESCRIPTION
- *
- * 	Setup:
- * 	  Setup signal handling.
- *        Make and change to a temporary directory.
- *	  Pause for SIGUSR1 if option specified.
- *        Add TESTPROG variable to the environment
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- *	 fork()
- *	 Check return code, if system call failed (return=-1)
- *		Log the errno
- *	   CHILD:
- *              open a temp file
- *		Determine environment values and write to file
- *		close file containing test values.
- *		exit.
- *	    PARENT:
- *		Wait for child to exit.
- *              Verify exit status
- *		Open file containing test values.
- *		For each test case:
- *			Read the value from the file.
- *			Determine and report PASS/FAIL result.
- *
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- *        Remove the temporary directory and exit. 
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <string.h>
-#include <sys/param.h>
-#include <signal.h>		/*Includes signal information. */
-#include <errno.h>
-#include "test.h"    
-#include "usctest.h"
-
-const char *TCID="fork04";		/* Test program identifier.    */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-
-
-#define	KIDEXIT	42		/* Known value for child exit status */
-#define MAX_LINE_LENGTH 256
-#define OUTPUT_FILE  "env.out"
-#define ENV_NOT_SET  "getenv() does not find variable set"
-
-/* list of environment variables to test */
-const char *environ_list[] = {"TERM","NoTSetzWq","TESTPROG"};
-#define NUMBER_OF_ENVIRON (int)(sizeof(environ_list)/sizeof(char *))
-int TST_TOTAL=NUMBER_OF_ENVIRON;		/* Total number of test cases. */
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-  /*
-   * print timing stats if that option was specified.
-   * print errno log if that option was specified.
-   */
-  TEST_CLEANUP;
-
-  /* remove the temporary directory and exit with 
-       return code appropriate for results */
-  tst_rmdir();
-  tst_exit();
-
-}	/* End cleanup() */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-  tst_sig(FORK, DEF_HANDLER, cleanup);
-
-  /* make and change to a temporary directory */
-  tst_tmpdir();
-
-  /* add a variable to the environment */
-  putenv("TESTPROG=FRKTCS04");
-
-  /* Pause if that option was specified */
-  TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * child_environment - the child side of the environment tests
- *        determine values for the variables and write to a file
- ***************************************************************/
-void child_environment()
-{
-  
-  int fildes;
-  int index;
-  char msg[MAX_LINE_LENGTH];
-  char *var;
-  
-  fildes = creat(OUTPUT_FILE,0700);
-
-  
-  for (index=0;index<NUMBER_OF_ENVIRON;index++) {
-      memset(msg, 0, MAX_LINE_LENGTH);
-
-      if ( (var=getenv(environ_list[index])) == NULL ) 
-          (void)sprintf(msg,"%s:%s",environ_list[index], ENV_NOT_SET);
-      else
-          (void)sprintf(msg,"%s:%s",environ_list[index], var);
-
-      write(fildes,msg,sizeof(msg));   /* includes extra null chars */
-  }
-  
-  close(fildes);
-
-}
-
-/***********************************************************************
- *
- * Compare parent env string to child's string.
- * Each string is in the format:  <env var>:<value>
- *
- ***********************************************************************/
-int
-cmp_env_strings(char *pstring, char *cstring)
-{
-   char *penv, *cenv, *pvalue, *cvalue;
-
-   /*
-    * Break pstring into env and value
-    */
-   penv=pstring;
-   if ( (pvalue=strchr(pstring, ':'))  == NULL )  {
-       tst_resm(TBROK, 
-           "internal error - parent's env string not in correct format:'%s'",
-	   pstring);
-       return -1;
-   } else {
-       *pvalue='\0';
-       pvalue++;
-       if ( *pvalue == '\0' ) {
-	   tst_resm(TBROK, "internal error - missing parent's env value");
-	   return -1;
-       }
-   }
-
-   /*
-    * Break cstring into env and value
-    */
-   cenv=cstring;
-   if ( (cvalue=strchr(cstring, ':'))  == NULL )  {
-       tst_resm(TBROK, 
-           "internal error - parent's env string not in correct format:'%s'",
-	   cstring);
-       return -1;
-   } else {
-       *cvalue='\0';
-       cvalue++;
-       if ( *cvalue == '\0' ) {
-	   tst_resm(TBROK, "internal error - missing child's env value");
-	   return -1;
-       }
-   }
-
-   if ( strcmp(penv, cenv) != 0 ) {
-       tst_resm(TBROK, "internal error - parent(%s) != child (%s) env",
-	penv, cenv);
-       return -1;
-   }
-
-   if ( strcmp(pvalue, cvalue) != 0 ) {
-      tst_resm(TFAIL, "Env var %s changed after fork(), parent's %s, child's %s",
-	penv, pvalue, cvalue);
-   } else {
-      tst_resm(TPASS, "Env var %s unchanged after fork(): %s",
-	penv, cvalue);
-   }
-   return 0;
-   
-}
-
-/***************************************************************
- * parent_environment - the parent side of the environment tests
- *        determine values for the variables
- *        read the values determined by the child
- *        compare values 
- ***************************************************************/
-void parent_environment()
-{
-  
-  int fildes;
-  char tmp_line[MAX_LINE_LENGTH];
-  char parent_value[MAX_LINE_LENGTH];
-  int index;
-  int ret;
-  char *var;
-  
-  if ((fildes = open(OUTPUT_FILE,O_RDWR)) == -1) {
-    tst_brkm(TBROK, cleanup,
-		 "fork() test. Parent open of temporary file failed. errno %d (%s)\n",
-		 errno, strerror(errno));
-  }
-  for (index=0;index<NUMBER_OF_ENVIRON;index++) 
-    {
-      if ((ret=read(fildes,tmp_line,MAX_LINE_LENGTH)) == 0) {
-	tst_resm(TBROK,"fork() test. parent_environment: failed to read from file with %d (%s)",
-		errno,strerror(errno));
-      }
-      else {
-
-	if ( (var=getenv(environ_list[index])) == NULL ) 
-            sprintf(parent_value,"%s:%s", environ_list[index], ENV_NOT_SET);
-	else
-            sprintf(parent_value,"%s:%s", environ_list[index], var);
-
-        cmp_env_strings(parent_value, tmp_line);
-	
-      }
-    }
-  close(fildes);
-
-}
-
-/***************************************************************
- * main() - performs tests
- *	
- ***************************************************************/
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    int kid_status;     /* status returned from child */
-    int wait_status;    /* status of wait system call in parent */
-    int fails;          /* indicates whether to continue with tests */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count and fail indicator in case we are looping. */
-	Tst_count=0;
-	fails = 0;
-
-	/* make the call to fork */
-	TEST(fork());
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	  /* fork failed */
-	  if ( STD_FUNCTIONAL_TEST ) {
-	    tst_brkm(TFAIL, cleanup, "fork() failed with %d (%s)",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	  }
-	}
-	else if (TEST_RETURN == 0) {
-	  /* child */
-	  if ( STD_FUNCTIONAL_TEST ) {
-	    /* determine environment variables */
-	    child_environment();
-	  }
-	  /* exit with known value */
-	  exit(KIDEXIT);
-	} else {
-	  /* parent of successful fork */
-	  /* wait for the child to complete */
-	  wait_status = wait(&kid_status);
-	  if ( STD_FUNCTIONAL_TEST ) {
-	    /* validate the child exit status */
-	    if (wait_status == TEST_RETURN) {
-	      if (kid_status != KIDEXIT << 8) {
-		tst_brkm(TBROK, cleanup,
-			     "fork(): Incorrect child status returned on wait(): %d", 
-			     kid_status);
-		fails++;
-	      }
-	    }
-	    else {
-	      tst_brkm(TBROK, cleanup,
-		       "fork(): wait() for child status failed with %d errno: %d : %s", 
-		       wait_status,errno,strerror(errno));
-	      fails++;
-	    }
-	  
-	    if (fails == 0 ) {
-	      /* verification tests */
-	      parent_environment();
-	    }
-	  }
-	}
-
-      }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
diff --git a/winsup/testsuite/winsup.api/ltp/fork06.c b/winsup/testsuite/winsup.api/ltp/fork06.c
deleted file mode 100644
index 9755e503b..000000000
--- a/winsup/testsuite/winsup.api/ltp/fork06.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	fork06.c
- *
- * DESCRIPTION
- *	Test that a process can fork children a large number of
- *	times in succession
- *
- * ALGORITHM
- *	Attempt to fork a child that exits immediately
- *	Repeat it many times(1000), counting the number of successes and
- *	failures
- *
- * USAGE
- * 	fork06
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "fork06";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-#define NUMFORKS 1000
-
-int
-main(int ac, char **av)
-{
-	int i, pid, status, childpid, succeed, fail;
-
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * perform global setup for the test
-	 */
-	setup();
-
-	/*
-	 * check looping state if -i option is given
-	 */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/*
-		 * reset Tst_count in case we are looping.
-		 */
-		Tst_count = 0;
-
-		succeed = 0;
-		fail = 0;
-
-		for (i = 0; i < NUMFORKS; i++) {
-			if ((pid = fork()) == -1) {
-				fail++;
-				continue;
-			}
-
-			if (pid == 0) {	/* child */
-				_exit(0);
-			}
-
-			/* parent */
-			childpid = wait(&status);
-			if (pid != childpid) {
-				tst_resm(TFAIL, "pid from wait %d", childpid);
-			}
-			succeed++;
-		}
-
-		tst_resm(TINFO, "tries %d", i);
-		tst_resm(TINFO, "successes %d", succeed);
-		tst_resm(TINFO, "failures %d", fail);
-
-		if ((wait(&status)) == -1) {
-			tst_resm(TINFO, "There were no children to wait for");
-		} else {
-			tst_resm(TINFO, "There were children left");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/*
-	 * capture signals
-	 */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/*
-	 * Pause if that option was specified
-	 */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- * 	       completion or premature exit
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/fork07.c b/winsup/testsuite/winsup.api/ltp/fork07.c
deleted file mode 100644
index 7e06db7a1..000000000
--- a/winsup/testsuite/winsup.api/ltp/fork07.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	fork07.c
- *
- * DESCRIPTION
- *	Check that all children inherit parent's file descriptor
- *
- * ALGORITHM
- * 	Parent opens a file, writes to it; forks processes until
- * 	-1 is returned. Each child attempts to read the file then returns.
- *
- * USAGE
- * 	fork07
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "fork07";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-char pbuf[10];
-char fnamebuf[40];
-
-int
-main(int ac, char **av)
-{
-	int status, count, forks, pid1;
-	int ch_r_stat;
-	FILE *rea = NULL, *writ = NULL;
-
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * perform global setup for the test
-	 */
-	setup();
-
-	/*
-	 * check looping state if -i option is given
-	 */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/*
-		 * reset Tst_count in case we are looping.
-		 */
-		Tst_count = 0;
-
-		if ((writ = fopen(fnamebuf, "w")) == NULL)
-			tst_resm(TFAIL, "failed to fopen file for write");
-		if ((rea = fopen(fnamebuf, "r")) == NULL)
-			tst_resm(TFAIL, "failed to fopen file for read");
-
-		fprintf(writ,"abcdefghijklmnopqrstuv") ;
-		fflush(writ);
-		sleep(1);
-
-		if ((getc(rea)) != 'a') 
-			tst_resm(TFAIL, "getc from read side was confused");
-
-		forks = 0;
-
-forkone:
-		++forks;
-                pid1 = -1;
-		if ( forks >= 1000 || (pid1 = fork()) != 0) {	/* parent */
-			if (pid1 > 0) {
-				goto forkone;
-			} else if (pid1 < 0) {
-				tst_resm(TINFO, "last child forked");
-			} 
-		} else {			/* child */
-			ch_r_stat = getc(rea);
-#ifdef DEBUG
-			tst_resm(TINFO, "Child got char: %c", ch_r_stat);
-			tst_resm(TINFO, "integer value of getc in child "
-				 "expected %d got %d", 'b', ch_r_stat);
-#endif
-			if (ch_r_stat != EOF) {	/* for error or EOF */
-				tst_resm(TPASS, "test passed in child no %d",
-					 forks);
-				exit(0);
-			} else {
-				tst_resm(TFAIL, "Test failed in child no. %d",
-					 forks);
-				exit(-1);
-			}
-		}
-
-		/* parent */
-		--forks;
-		for (count = 0; count <= forks; count++) {
-			wait(&status);
-#ifdef DEBUG
-			tst_resm(TINFO, " exit status of wait "
-				 " expected 0 got %d", status);
-#endif
-			if (status == 0) {
-				tst_resm(TPASS, "parent test passed");
-			} else {
-				tst_resm(TFAIL, "parent test failed");
-			}
-		}
-		tst_resm(TINFO, "Number of processes forked is %d", forks);
-	}
-        fclose (writ);
-        fclose (rea);
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/*
-	 * capture signals
-	 */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	umask(0);
-
-	/*
-	 * Pause if that option was specified
-	 */
-	TEST_PAUSE;
-
-	/*
-	 * make a temp directory and cd to it
-	 */
-	tst_tmpdir();
-	
-	strcpy(fnamebuf, "fork07.");
-	sprintf(pbuf, "%d", getpid());
-	strcat(fnamebuf, pbuf);
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * remove tmp dir and all files in it
-	 */
-	unlink(fnamebuf);
-	tst_rmdir();
-
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/fork09.c b/winsup/testsuite/winsup.api/ltp/fork09.c
deleted file mode 100644
index 233acc76e..000000000
--- a/winsup/testsuite/winsup.api/ltp/fork09.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	fork01.c
- *
- * DESCRIPTION
- *	Check that child has access to a full set of files.
- *
- * ALGORITHM
- * 	Parent opens a maximum number of files
- * 	Child closes one and attempts to open another, it should be
- * 	available
- *
- * USAGE
- * 	fork01
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <errno.h>
-#include <limits.h>	/* for OPEN_MAX */
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "fork01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-char filname[40], childfile[40];
-int first;
-FILE **fildeses;			/* file streams */
-int mypid, nfiles;
-
-int
-main(int ac, char **av)
-{
-	int pid, status, nf;
-	
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * perform global setup for the test
-	 */
-	setup();
-
-	fildeses = (FILE**)malloc((OPEN_MAX + 10) * sizeof(FILE *));
-	if (fildeses == NULL) {
-		tst_brkm(TBROK, cleanup, "malloc failed");
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * check looping state if -i option is given
-	 */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/*
-		 * reset Tst_count in case we are looping.
-		 */
-		Tst_count = 0;
-
-		mypid = getpid();
-
-		tst_resm(TINFO, "OPEN_MAX is %d", OPEN_MAX);
-
-		/* establish first free file */
-		sprintf(filname, "fork01.%d", mypid);
-		if ((first = creat(filname, 0660)) == -1) {
-			tst_brkm(TBROK, cleanup, "Cannot open first file %s, "
-				 "errno = %d", filname, errno);
-			/*NOTREACHED*/
-		}
-		close(first);
-
-		tst_resm(TINFO, "first file descriptor is %d ", first);
-
-		if (unlink(filname) == -1) {
-			tst_brkm(TBROK, cleanup, "Cannot unlink file %s, "
-				 "errno = %d", filname, errno);
-			/*NOTREACHED*/
-		}
-
-		/*
-		 * now open all the files for the test
-		 */
-		for (nfiles = first; nfiles < OPEN_MAX; nfiles++) {
-			sprintf(filname, "file%d.%d", nfiles, mypid);
-			if ((fildeses[nfiles] = fopen(filname, "a")) == NULL) {
-				tst_brkm(TBROK, cleanup, "Parent: cannot open "
-					 "file %d %s errno = %d", nfiles,
-					 filname, errno);
-				/*NOTREACHED*/
-			}
-#ifdef DEBUG
-			tst_resm(TINFO, "filname: %s", filname);
-#endif
-		}
-
-		tst_resm(TINFO, "Parent reporting %d files open", nfiles - 1);
-
-		if ((pid = fork()) == -1) {
-			tst_brkm(TBROK, cleanup, "Fork failed");
-			/*NOTREACHED*/
-		}
-
-		if (pid == 0) {		/* child */
-			nfiles--;
-			if (fclose(fildeses[nfiles]) == -1) {
-				tst_resm(TINFO, "Child could not close file "
-					 "#%d, errno = %d", nfiles, errno);
-				exit(1);
-				/*NOTREACHED*/
-			} else {
-				sprintf(childfile, "cfile.%d", getpid());
-				if ((fildeses[nfiles] =
-				     fopen(childfile, "a")) == NULL) {
-					tst_resm(TINFO, "Child could not open "
-						 "file %s, errno = %d",
-						 childfile, errno);
-					exit(1);
-					/*NOTREACHED*/
-				} else {
-					tst_resm(TINFO, "Child opened new "
-						 "file #%d", nfiles); 
-					unlink(childfile);
-					exit(0);
-				}
-			}
-		} else {		/* parent */
-			wait(&status);
-			if (status >> 8 != 0) {
-				tst_resm(TFAIL, "test 1 FAILED");
-			} else {
-				tst_resm(TPASS, "test 1 PASSED");
-			}
-		}
-
-		/* clean up things in case we are looping */
-		for (nf = first; nf < nfiles; nf++) {
-			fclose(fildeses[nf]);
-			sprintf(filname, "file%d.%d", nf, mypid);
-			unlink(filname);
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-	
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/*
-	 * capture signals
-	 */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	umask(0);
-
-	/*
-	 * Pause if that option was specified
-	 */
-	TEST_PAUSE;
-
-	/*
-	 * make a temp directory and cd to it
-	 */
-	tst_tmpdir();
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or at premature exit
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * remove tmp dir and all files in it
-	 */
-	tst_rmdir();
-
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/fork10.c b/winsup/testsuite/winsup.api/ltp/fork10.c
deleted file mode 100644
index 9dcbbb3b5..000000000
--- a/winsup/testsuite/winsup.api/ltp/fork10.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	fork04.c
- *
- * DESCRIPTION
- *	Check inheritance of file descriptor by children, they
- * 	should all be refering to the same file.
- *
- * ALGORITHM
- *	Child reads several chars and exits. 
- *	Parent forks another child, have the child and parent attempt to use
- *	that location
- *
- * USAGE
- * 	fork04
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "fork04";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-char pidbuf[10];
-char fnamebuf[40];
-
-int
-main(int ac, char **av)
-{
-	int status, pid, fildes;
-	char parchar[2];
-	char chilchar[2];
-
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * perform global setup for the test
-	 */
-	setup();
-
-	/*
-	 * check looping state if -i option is given
-	 */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/*
-		 * reset Tst_count in case we are looping.
-		 */
-		Tst_count = 0;
-
-		if ((fildes = creat(fnamebuf, 0600)) < 0) {
-			tst_brkm(TBROK, cleanup, "Parent: cannot open %s for "
-				 "write, errno = %d", fnamebuf, errno);
-			/*NOTREACHED*/
-		}
-		write(fildes, "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n", 27);
-		close(fildes);
-
-		if ((fildes = open(fnamebuf, 0)) == -1) {
-			tst_brkm(TBROK, cleanup, "Parent: cannot open %s for "
-				 "reading", fnamebuf);
-			/*NOTREACHED*/
-		}
-
-		if ((pid = fork()) == -1) {
-			tst_brkm(TBROK, cleanup, "fork() #1 failed");
-			/*NOTREACHED*/
-		}
-
-		if (pid == 0) {			/* child */
-			tst_resm(TINFO, "fork child A");
-			if (lseek(fildes, 10L, 0) == -1L) {
-				tst_resm(TFAIL, "bad lseek by child");
-				exit(1);
-			}
-			exit(0);
-		} else {			/* parent */
-			wait(&status);
-
-			/* parent starts second child */
-			if ((pid = fork()) == -1) {
-				tst_brkm(TBROK, cleanup, "fork() #2 failed");
-				/*NOTREACHED*/
-			}
-
-			if (pid == 0) {	/* child */
-				if (read(fildes, chilchar, 1) <= 0) {
-					tst_resm(TFAIL, "Child can't read "
-						 "file");
-					exit(1);
-				} else {
-					if (chilchar[0] != 'K') {
-						chilchar[1] = '\n';
-						exit(1);
-					} else {
-						exit(0);
-					}
-				}
-			} else {		/* parent */
-				(void)wait(&status);
-				if (status >> 8 != 0) {
-					tst_resm(TFAIL, "Bad return from "
-						 "second child");
-					continue;
-				}
-				/* parent reads */
-				if (read(fildes, parchar, 1) <= 0) {
-					tst_resm(TFAIL, "Parent cannot read "
-						 "file");
-					continue;
-				} else {
-					write(fildes, parchar, 1);
-					if (parchar[0] != 'L') {
-						parchar[1] = '\n';
-						tst_resm(TFAIL, "Test failed");
-						continue;
-					}
-				}
-			}
-		}
-		tst_resm(TPASS, "test 1 PASSED");
-                close (fildes);
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/*
-	 * capture signals
-	 */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	umask(0);
-
-	/*
-	 * Pause if that option was specified
-	 */
-	TEST_PAUSE;
-
-	/*
-	 * make a temp directory and cd to it
-	 */
-	tst_tmpdir();
-	
-	strcpy(fnamebuf, "fork04.");
-	sprintf(pidbuf, "%d", getpid());
-	strcat(fnamebuf, pidbuf);
-}
-
-/*
- * cleanup() -	performs all ONE TIME cleanup for this test at
- *	        completion or premature exit
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * remove tmp dir and all files in it
-	 */
-	tst_rmdir();
-
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/fork11.c b/winsup/testsuite/winsup.api/ltp/fork11.c
deleted file mode 100644
index 2b1035230..000000000
--- a/winsup/testsuite/winsup.api/ltp/fork11.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	fork05.c
- *
- * DESCRIPTION
- *	Test that parent gets a pid from each child when doing wait
- *
- * ALGORITHM
- *	Fork NUMFORKS children that do nothing.
- *
- * USAGE
- * 	fork05
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <errno.h>
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "fork05";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-#define NUMFORKS 100
-
-int
-main(int ac, char **av)
-{
-	int i, pid, cpid, status;
-
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * perform global setup for the test
-	 */
-	setup();
-
-	/*
-	 * check looping state if -i option is given
-	 */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/*
-		 * reset Tst_count in case we are looping.
-		 */
-		Tst_count = 0;
-
-		for (i=0; i<NUMFORKS; i++) {
-			if ((pid = fork()) == 0) {	/* child */
-				exit(0);
-			}
-
-			if (pid > 0) {			/* parent */
-				cpid = wait(&status);
-				if (cpid == pid) {
-					tst_resm(TPASS, "fork #%d passed", i+1);
-				} else {
-					tst_resm(TFAIL, "fork #%d failed", i+1);
-				}
-			} else {
-				tst_resm(TFAIL, "fork #%d failed", i+1);
-				break;
-			}
-		}
-		tst_resm(TINFO, "Number of processes forked = %d", i);
-		tst_resm(TINFO, "Exit test 1");
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/*
-	 * capture signals
-	 */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/*
-	 * Pause if that option was specified
-	 */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/fpathconf01.c b/winsup/testsuite/winsup.api/ltp/fpathconf01.c
deleted file mode 100644
index 37fbe9689..000000000
--- a/winsup/testsuite/winsup.api/ltp/fpathconf01.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fpathconf01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fpathconf(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 7
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fpathconf(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fpathconf(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fpathconf(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="fpathconf01"; 	/* Test program identifier.    */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-#define FILENAME	"fpafile01"
-
-int exp_enos[]={0, 0};
-
-int i;
-
-struct pathconf_args
-{
-   const char *define_tag;
-   int value;
-   int defined;   /* Some of these are undefined on regular files.
-		   * Cancer does a slightly better job with these already,
-		   * so this is all I'll do to this test.  11/19/98 roehrich
-		   */
-} args[] = {
-    {"_PC_MAX_CANON", _PC_MAX_CANON, 0},
-    {"_PC_MAX_INPUT", _PC_MAX_INPUT, 0},
-    {"_PC_VDISABLE", _PC_VDISABLE, 0},
-    {"_PC_LINK_MAX", _PC_LINK_MAX, 1},
-    {"_PC_NAME_MAX", _PC_NAME_MAX, 1},
-    {"_PC_PATH_MAX", _PC_PATH_MAX, 1},
-    {"_PC_PIPE_BUF", _PC_PIPE_BUF, 0}
-};
-
-int TST_TOTAL=((sizeof(args)/sizeof(args[0])));
-int fd;		/* temp file for fpathconf */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	for (i=0; i<TST_TOTAL; i++) {
-	    /* 
-	     * Call fpathconf(2) with one of the valid arguments in the args array
-	     */
-	    TEST(fpathconf(fd,args[i].value));
-	    
-	    /* check return code -- if the return value is defined */
-	    if ( (TEST_RETURN == -1) && args[i].defined ) {
-		TEST_ERROR_LOG(TEST_ERRNO);
-		tst_resm(TFAIL, "fpathconf(fd, %s) Failed, errno=%d : %s", args[i].define_tag,
-			 TEST_ERRNO, strerror(TEST_ERRNO));
-	    } else {
-		
-		/***************************************************************
-		 * only perform functional verification if flag set (-f not given)
-		 ***************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "fpathconf(fd, %s) returned %d", args[i].define_tag, TEST_RETURN);
-		} 
-	    }
-	}	/* End for i */
-    }	/* End for TEST_LOOPING */
-    
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    tst_tmpdir();
-
-    if ( (fd=open(FILENAME, O_RDWR|O_CREAT, 0700)) == -1 )
-	tst_brkm(TBROK, cleanup, "Unable to open temp file %s!", FILENAME);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    close(fd);
-
-    /* exit with return code appropriate for results */
-    tst_rmdir();
-    tst_exit();
-
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fstat01.c b/winsup/testsuite/winsup.api/ltp/fstat01.c
deleted file mode 100644
index d76684104..000000000
--- a/winsup/testsuite/winsup.api/ltp/fstat01.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fstat01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fstat(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fstat(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fstat(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fstat(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-const char *TCID="fstat01"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-struct stat statter;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call fstat(2) 
-	 */
-	TEST(fstat(fd, &statter));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "fstat(%s, &statter) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "fstat(%s, &statter) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup, "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fstat02.c b/winsup/testsuite/winsup.api/ltp/fstat02.c
deleted file mode 100644
index 224caf0d7..000000000
--- a/winsup/testsuite/winsup.api/ltp/fstat02.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: fstat02
- *
- * Test Description:
- *  Verify that, fstat(2) succeeds to get the status of a file and fills
- *  the stat structure elements though file pointed to by file descriptor
- *  not opened for reading.
- *
- * Expected Result:
- *  fstat() should return value 0 on success and the stat structure elements
- *  should be filled with specified 'file' information.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  fstat02 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  This test should be run by 'non-super-user' only.
- *
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define FILE_MODE	0644
-#define TESTFILE	"testfile"
-#define FILE_SIZE       1024
-#define BUF_SIZE	256
-#define MASK		0777
-
-const char *TCID="fstat02"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-uid_t User_id;			/* user id/group id of test process */
-gid_t Group_id;
-int fildes;			/* File descriptor of testfile */
-
-void setup();			/* Setup function for the test */
-void cleanup() __attribute__((noreturn));/* Cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat structure buffer */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */ 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-	
-		/* 
-		 * Call fstat(2) to get the status of
-		 * specified 'file' pointed to by 'fd'
-		 * into stat structure.
-		 */
-		TEST(fstat(fildes, &stat_buf));
-	
-		/* check return code of fstat(2) */
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL,
-				 "fstat on %s Failed, errno=%d : %s",
-				 TESTFILE, TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Verify the data returned by fstat(2)
-			 * aganist the expected data.
-			 */
-			if ((stat_buf.st_uid != User_id) ||
-			    (stat_buf.st_gid != Group_id) ||
-			    (stat_buf.st_size != FILE_SIZE) ||
-			    ((stat_buf.st_mode & MASK) != FILE_MODE)) {
-				tst_resm(TFAIL, "Functionality of fstat(2) on "
-					 "'%s' Failed", TESTFILE);
-			} else {
-				tst_resm(TPASS, "Functionality of fstat(2) on "
-					 "'%s' Succcessful", TESTFILE);
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * void
- * setup() -  Performs setup function for the test.
- *  Creat a temporary directory and chdir to it.
- *  Creat a temporary file and write some known data into it.
- *  Get the effective uid/gid of test process.
- */
-void 
-setup()
-{
-	int i;
-	char tst_buff[BUF_SIZE];
-	int wbytes;
-	int write_len = 0;
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-    
-	/* Check that the test process id is not super/root  */
-	if (geteuid() == 0) {
-		tst_brkm(TBROK, NULL, "Must be non-super/root for this test!");
-		tst_exit();
-	}
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-    
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-    
-	if ((fildes = open(TESTFILE, O_WRONLY|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Fill the test buffer with the known data */
-	for (i = 0; i < BUF_SIZE; i++) {
-		tst_buff[i] = 'a';
-	}
-	
-	/* Write to the file 1k data from the buffer */
-	while (write_len < FILE_SIZE) {
-		if ((wbytes = write(fildes, tst_buff, sizeof(tst_buff))) <= 0) {
-			tst_brkm(TBROK, cleanup,
-				 "write(2) on %s Failed, errno=%d : %s",
-				 TESTFILE, errno, strerror(errno));
-		} else {
-			write_len += wbytes;
-		}
-	}
-
-	/* Get the uid/gid of the process */
-	User_id = getuid();
-	Group_id = getgid();
-
-}	/* End setup() */
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- *  Close the test file and remove the test file and temporary directory.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the test file */
-	if (close(fildes) == -1) {
-		tst_brkm(TFAIL, NULL, "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fstat03.c b/winsup/testsuite/winsup.api/ltp/fstat03.c
deleted file mode 100644
index 47982ed47..000000000
--- a/winsup/testsuite/winsup.api/ltp/fstat03.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Test Name: fstat03
- *
- * Test Description:
- *   Verify that, fstat(2) returns -1 and sets errno to EBADF if the file 
- *   pointed to by file descriptor is not valid.
- *
- * Expected Result:
- *  fstat() should fail with return value -1 and set expected errno.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	if errno set == expected errno
- *   		Issue sys call fails with expected return value and errno.
- *   	Otherwise,
- *		Issue sys call fails with unexpected errno.
- *   Otherwise,
- *	Issue sys call returns unexpected value.
- *
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory(s)/file(s) created.
- *
- * Usage:  <for command-line>
- *  fstat03 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  This test should be executed by 'non-super-user' only.
- *
- */
-
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define TEST_FILE	"testfile"
-
-const char *TCID="fstat03";	/* Test program identifier.    */
-int TST_TOTAL = 1;		/* Total number of test cases. */
-extern int Tst_count;           /* Test Case counter for tst_* routines */
-int exp_enos[]={EBADF, 0};
-int fildes;			/* testfile descriptor */
-
-void setup();			/* Main setup function for the tests */
-void cleanup() __attribute__((noreturn));/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat structure buffer */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/*
-	 * Invoke setup function to create a testfile under temporary
-	 * directory.
-	 */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-		/*
-		 * Call fstat(2) to get the status information
-		 * of a closed testfile pointed to by 'fd'.
-		 * verify that fstat fails with -1 return value and
-		 * sets appropriate errno.
-		 */
-		TEST(fstat(fildes, &stat_buf));
-	
-		/* Check return code from fstat(2) */
-		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			if (TEST_ERRNO == EBADF) {
-				tst_resm(TPASS, "fstat() fails with "
-					 "expected error EBADF");
-			} else {
-				tst_resm(TFAIL, "fstat() fails with "
-					 "wrong errno:%d", TEST_ERRNO);
-			}
-		} else {
-			tst_resm(TFAIL, "fstat() returned %d, "
-				 "expected -1, error EBADF");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/*
-	 * Invoke cleanup() to delete the test directory/file(s) created
-	 * in the setup().
-	 */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * void 
- * setup(void) - performs all ONE TIME setup for this test.
- * 	Exit the test program on receipt of unexpected signals.
- *	Create a temporary directory and change directory to it.
- *      Create a testfile under temporary directory.
- *      Close the testfile.
- */
-void
-setup()
-{
-	/* Capture unexpected signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Make a temp dir and cd to it */
-	tst_tmpdir();
-
-	/* Create a testfile under temporary directory */
-	if ((fildes = open(TEST_FILE, O_RDWR|O_CREAT, 0666)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, 0666) failed, errno=%d : %s",
-			 TEST_FILE, errno, strerror(errno));
-	}
-
-	if (close(fildes) == -1) {
-		tst_brkm(TBROK, cleanup,
-		 	 "close(%s) Failed, errno=%d : %s",
-		 	 TEST_FILE, errno, strerror(errno));
-	}
-}	/* End of setup */
-
-/*
- * void
- * cleanup() - Performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *	Print test timing stats and errno log if test executed with options.
- *	Close the testfile if still opened.
- *	Remove temporary directory and sub-directories/files under it
- *	created during setup().
- *	Exit the test program with normal exit code.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-	
-	/* Remove files and temporary directory created */
-	tst_rmdir();
-  
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fstat04.c b/winsup/testsuite/winsup.api/ltp/fstat04.c
deleted file mode 100644
index 1de507e62..000000000
--- a/winsup/testsuite/winsup.api/ltp/fstat04.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: fstat01
- *
- * Test Description:
- *  Verify that, fstat(2) succeeds to get the status of a file pointed by
- *  file descriptor and fills the stat structure elements.
- *
- * Expected Result:
- *  fstat() should return value 0 on success and the stat structure should
- *  be filled with specified 'file' information.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  fstat01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  This test should be run by 'non-super-user' only.
- * 
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define FILE_MODE	0644
-#define TESTFILE	"testfile"
-#define FILE_SIZE       1024
-#define BUF_SIZE	256
-#define MASK		0777
-
-const char *TCID="fstat01"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-uid_t User_id;			/* user id/group id of test process */
-gid_t Group_id;
-int fildes;			/* File descriptor of testfile */
-
-void setup();			/* Setup function for the test */
-void cleanup() __attribute__((noreturn));/* Cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat structure buffer */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */ 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-	
-		/* 
-		 * Call fstat(2) to get the status of
-		 * specified 'file' pointed to 'fd'
-		 * into stat structure.
-		 */
-		TEST(fstat(fildes, &stat_buf));
-	
-		/* check return code of fstat(2) */
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL,
-				 "fstat on %s Failed, errno=%d : %s",
-				 TESTFILE, TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Verify the data returned by fstat(2)
-			 * aganist the expected data.
-			 */
-			if ((stat_buf.st_uid != User_id) ||
-			    (stat_buf.st_gid != Group_id) ||
-			    (stat_buf.st_size != FILE_SIZE) ||
-			    ((stat_buf.st_mode & MASK) != FILE_MODE)) {
-				tst_resm(TFAIL, "Functionality of fstat(2) on "
-					 "'%s' Failed", TESTFILE);
-			} else {
-				tst_resm(TPASS, "Functionality of fstat(2) on "
-					 "'%s' Succcessful", TESTFILE);
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * void
- * setup() -  Performs setup function for the test.
- *  Creat a temporary directory and chdir to it.
- *  Creat a test file and write some data into it.
- *  Get the user/group id info. of test process.
- */
-void 
-setup()
-{
-	int i;					/* counter */
-	char tst_buff[BUF_SIZE];		/* data buffer */
-	int wbytes;				/* no. of bytes written */
-	int write_len = 0;			/* data length */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-    
-	/* Check that the test process id is not super/root  */
-	if (geteuid() == 0) {
-		tst_brkm(TBROK, NULL, "Must be non-super/root for this test!");
-		tst_exit();
-	}
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-    
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-    
-	if ((fildes = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Fill the test buffer with the known data */
-	for (i = 0; i < BUF_SIZE; i++) {
-		tst_buff[i] = 'a';
-	}
-	
-	/* Write to the file 1k data from the buffer */
-	while (write_len < FILE_SIZE) {
-		if ((wbytes = write(fildes, tst_buff, sizeof(tst_buff))) <= 0) {
-			tst_brkm(TBROK, cleanup,
-				 "write(2) on %s Failed, errno=%d : %s",
-				 TESTFILE, errno, strerror(errno));
-		} else {
-			write_len += wbytes;
-		}
-	}
-
-	/* Get the uid/gid of the process */
-	User_id = getuid();
-	Group_id = getgid();
-
-}	/* End setup() */
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- *  Close the testfile opened for reading/writing.
- *  Delete the testfile and temporary directory.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the test file */
-	if (close(fildes) == -1) {
-		tst_brkm(TFAIL, NULL, "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/fsync01.c b/winsup/testsuite/winsup.api/ltp/fsync01.c
deleted file mode 100644
index 261ea0dbb..000000000
--- a/winsup/testsuite/winsup.api/ltp/fsync01.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: fsync01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for fsync(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) fsync(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the fsync(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	fsync(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/statfs.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="fsync01"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-const char *buf = "davef";
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* write sone data to get fsync'd out */
-        if (write(fd, &buf, strlen(buf)) == -1) {
-           tst_brkm(TBROK, cleanup,
-		    "write(%s, &buf, strlen(buf)) Failed, errno=%d : %s",
-		    fname, TEST_ERRNO, strerror(TEST_ERRNO));
-        }
-	/* 
-	 * Call fsync(2) 
-	 */
-	TEST(fsync(fd));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "fsync(%s) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "fsync(%s) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the file we have open */
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/ftruncate01.c b/winsup/testsuite/winsup.api/ltp/ftruncate01.c
deleted file mode 100644
index a45c167aa..000000000
--- a/winsup/testsuite/winsup.api/ltp/ftruncate01.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* 
- * Test Name: ftruncate01
- *
- * Test Description:
- *  Verify that, ftruncate(2) succeeds to truncate a file to a specified
- *  length if the file indicated by file descriptor opened for writing.
- *
- * Expected Result:
- *  ftruncate(2) should return a value 0 and the length of the file after 
- *  truncation should be equal to the length it is truncated to.
- *	
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  ftruncate01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  This test should be run by 'non-super-user' only.
- *
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TESTFILE	"testfile"		/* file under test */
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define BUF_SIZE	256			/* buffer size */
-#define FILE_SIZE	1024			/* test file size */
-#define TRUNC_LEN	256			/* truncation length */
-
-const char *TCID="ftruncate01";	/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test conditions */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int fildes;			/* file descriptor for test file */
-
-void setup();			/* setup function for the test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat(2) struct contents */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	off_t file_length;	/* test file length */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-
-		/* 
-		 * Call ftruncate(2) to truncate a test file to a 
-		 * specified length.
-		 */
-		TEST(ftruncate(fildes, TRUNC_LEN));
-
-		/* check return code of ftruncate(2) */
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL,
-				 "ftruncate() of %s Failed, errno=%d : %s",
-				 TESTFILE, TEST_ERRNO,
-				 strerror(TEST_ERRNO));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-		 	 * Get the testfile information using
-			 * fstat(2).
-			 */
-			if (fstat(fildes, &stat_buf) < 0) {
-				tst_brkm(TFAIL, cleanup,
-					 "stat(2) of %s failed, error:%d",
-					 TESTFILE, errno);
-			}
-			stat_buf.st_mode &= ~S_IFREG;
-			file_length = stat_buf.st_size;
-
-			/*
-			 * Check for expected size of testfile after
-			 * truncate(2) on it.
-			 */
-			if (file_length != TRUNC_LEN) {
-				tst_resm(TFAIL, "%s: Incorrect file size %d, "
-					 "Expected %d", TESTFILE, file_length,
-					 TRUNC_LEN);
-			} else {
-				tst_resm(TPASS, "Functionality of ftruncate() "
-					 "on %s successful", TESTFILE);
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and change directory to it.
- *  Create a test file under temporary directory and write some
- *  data into it.
- */
-void 
-setup()
-{
-	int i;				/* counter for for loop() */
-	int c, c_total = 0;		/* bytes to be written to file */
-	char tst_buff[BUF_SIZE];	/* buffer to hold data */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Fill the test buffer with the known data */
-	for (i = 0; i < BUF_SIZE; i++) {
-		tst_buff[i] = 'a';
-	}
-
-	/* open a file for reading/writing */
-	if ((fildes = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Write to the file 1k data from the buffer */
-	while (c_total < FILE_SIZE) {
-		if ((c = write(fildes, tst_buff, sizeof(tst_buff))) <= 0) {
-			tst_brkm(TBROK, cleanup,
-				 "write(2) on %s Failed, errno=%d : %s",
-				 TESTFILE, errno, strerror(errno));
-		} else {
-			c_total += c;
-		}
-	}
-}	/* End setup() */
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- *  Close the temporary file.
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the testfile after writing data into it */
-	if (close(fildes) == -1) {
-		tst_brkm(TFAIL, NULL,
-			 "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/ftruncate02.c b/winsup/testsuite/winsup.api/ltp/ftruncate02.c
deleted file mode 100644
index 2b4e72326..000000000
--- a/winsup/testsuite/winsup.api/ltp/ftruncate02.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* 
- * Test Name: ftruncate02
- *
- * Test Description:
- *  Verify that, ftruncate(2) succeeds to truncate a file to a certain length,
- *  but the attempt to read past the truncated length will fail.  
- *
- * Expected Result:
- *  ftruncate(2) should return a value 0 and the attempt to read past the 
- *  truncated length will fail. In case where the file before  truncation was 
- *  shorter, the bytes between the old and new should  be all zeroes.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  ftruncate02 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  This test should be run by 'non-super-user' only.
- *	
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TESTFILE	"testfile"		/* file under test */
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define BUF_SIZE	256			/* buffer size */
-#define FILE_SIZE	1024			/* test file size */
-#define TRUNC_LEN1	256			/* truncation length */
-#define TRUNC_LEN2	512			/* truncation length */
-
-const char *TCID="ftruncate02";	/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test conditions */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int fd;				/* file descriptor of testfile */
-char tst_buff[BUF_SIZE];	/* buffer to hold testfile contents */
-
-void setup();			/* setup function for the test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat(2) struct contents */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	off_t file_length2;	/* test file length */
-	off_t file_length1;	/* test file length */
-	int rbytes, i;		/* bytes read from testfile */
-	int read_len = 0;	/* total no. of bytes read from testfile */
-	int err_flag = 0;	/* error indicator flag */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-
-		/* 
-		 * Call ftruncate(2) to truncate a test file to a 
-		 * specified length (TRUNC_LEN1).
-		 */
-		TEST(ftruncate(fd, TRUNC_LEN1));
-
-		/* check return code of ftruncate(2) */
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "ftruncate of %s to size %d Failed, "
-				 "errno=%d : %s", TESTFILE, TRUNC_LEN1,
-				 TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-		 	 * Get the testfile information using
-			 * fstat(2).
-			 */
-			if (fstat(fd, &stat_buf) < 0) {
-				tst_brkm(TFAIL, cleanup, "fstat(2) of %s failed"
-					 " after 1st truncate, error:%d",
-					 TESTFILE, errno);
-			}
-			stat_buf.st_mode &= ~S_IFREG;
-			file_length1 = stat_buf.st_size;
-
-			/*
-			 * Set the file pointer of testfile to the 
-			 * beginning of the file.
-			 */
-			if (lseek(fd, 0, SEEK_SET) < 0) {
-				tst_brkm(TFAIL, cleanup, "lseek(2) on %s failed"
-					 " after 1st ftruncate, error:%d",
-					 TESTFILE, errno);
-			}
-
-			/* Read the testfile from the beginning. */
-			while ((rbytes = read(fd, tst_buff,
-					      sizeof(tst_buff))) > 0) {
-				read_len += rbytes;
-			}
-
-			/*
-			 * Execute ftruncate(2) again to truncate
-			 * testfile to a size TRUNC_LEN2.
-			 */
-			TEST(ftruncate(fd, TRUNC_LEN2));
-
-			/* check return code of ftruncate(2) */
-			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL, "ftruncate of %s to size %d "
-					 "Failed, errno=%d : %s", TESTFILE,
-					 TRUNC_LEN2, TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-				continue;
-			}
-
-			/*
-			 * Get the testfile information using
-			 * fstat(2)
-			 */
-			if (fstat(fd, &stat_buf) < 0) {
-				tst_brkm(TFAIL, cleanup, "fstat(2) of %s failed"
-					 " after 2nd truncate, error:%d",
-					 TESTFILE, errno);
-			}
-			stat_buf.st_mode &= ~S_IFREG;
-			file_length2 = stat_buf.st_size;
-
-			/*
-			 * Set the file pointer of testfile to the 
-			 * offset TRUNC_LEN1 of testfile.
-			 */
-			if (lseek(fd, TRUNC_LEN1, SEEK_SET) < 0) {
-				tst_brkm(TFAIL, cleanup, "lseek(2) on %s failed"
-					 " after 2nd ftruncate, error:%d",
-					 TESTFILE, errno);
-			}
-
-			/* Read the testfile contents till EOF */
-			while((rbytes = read(fd, tst_buff,
-			       sizeof(tst_buff))) > 0) {
-				for (i = 0; i < rbytes; i++) {
-					if (tst_buff[i] != 0) {
-						err_flag++;
-					}
-				}
-			}
-
-			/*
-			 * Check for expected size of testfile after
-			 * issuing ftruncate(2) on it.
-			 */
-			if ((file_length1 != TRUNC_LEN1) ||
-			    (file_length2 != TRUNC_LEN2) ||
-			    (read_len != TRUNC_LEN1) ||
-			    (err_flag != 0)) {
-				tst_resm(TFAIL, "Functionality of ftruncate(2) "
-					 "on %s Failed", TESTFILE);
-			} else {
-				tst_resm(TPASS, "Functionality of ftruncate(2) "
-					 "on %s successful", TESTFILE);
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and change directory to it.
- *  Create a test file under temporary directory and write some
- *  data into it.
- */
-void 
-setup()
-{
-	int i;			/* counter variable */
-	int wbytes;		/* bytes written to testfile */
-	int write_len = 0;	/* total no. of bytes written to testfile */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Fill the test buffer with the known data */
-	for (i = 0; i < BUF_SIZE; i++) {
-		tst_buff[i] = 'a';
-	}
-	/* open a file for reading/writing */
-	if ((fd = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Write to the file 1k data from the buffer */
-	while (write_len < FILE_SIZE) {
-		if ((wbytes = write(fd, tst_buff, sizeof(tst_buff))) <= 0) {
-			tst_brkm(TBROK, cleanup,
-				 "write(2) on %s Failed, errno=%d : %s",
-				 TESTFILE, errno, strerror(errno));
-		} else {
-			write_len += wbytes;
-		}
-	}
-}	/* End setup() */
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- *  Close the testfile.
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the testfile after writing data into it */
-	if (close(fd) == -1) {
-		tst_brkm(TFAIL, NULL, "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/ftruncate03.c b/winsup/testsuite/winsup.api/ltp/ftruncate03.c
deleted file mode 100644
index 279b4e88f..000000000
--- a/winsup/testsuite/winsup.api/ltp/ftruncate03.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* 
- * Test Name: ftruncate03
- *
- * Test Description:
- *  Verify that,
- *  1) ftruncate(2) returns -1 and sets errno to EINVAL if the specified
- *     truncate length is less than 0.
- *  2) ftruncate(2) returns -1 and sets errno to EBADF if the file descriptor
- *     of the specified file is not valid.
- *
- * Expected Result:
- *  ftruncate() should fail with return value -1 and set expected errno.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	if errno set == expected errno
- *   		Issue sys call fails with expected return value and errno.
- *   	Otherwise,
- *		Issue sys call fails with unexpected errno.
- *   Otherwise,
- *	Issue sys call returns unexpected value.
- *
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory(s)/file(s) created.
- *
- * Usage:  <for command-line>
- *  ftruncate03 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  This test should be executed by 'non-super-user'  only.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEST_FILE1	"test_file1"		/* file under test */
-#define TEST_FILE2	"test_file2"		/* file under test */
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define BUF_SIZE	256			/* buffer size */
-#define FILE_SIZE	1024			/* test file size */
-
-int no_setup();
-int setup1();			/* setup function to test chmod for EBADF */
-int setup2();			/* setup function to test chmod for EINVAL */
-
-int fd1;			/* File descriptor for testfile1 */
-int fd2;			/* File descriptor for testfile2 */
-
-struct test_case_t {		/* test case struct. to hold ref. test cond's*/
-	int fd;
-	const char *desc;
-	int exp_errno;
-	int len;
-	int (*setupfunc)();
-} Test_cases[] = {
-	{ 1, "Length argument is -ve", EINVAL, -1, setup1 },
-	{ 2, "File descriptor is not valid", EBADF, 256, setup2 },
-	{ 0, NULL, 0, 0, no_setup }
-};
-
-const char *TCID="ftruncate03";	/* Test program identifier.    */
-int TST_TOTAL=2;		/* Total number of test conditions */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={EINVAL, EBADF, 0};
-
-void setup();			/* Main setup function for the test */
-void cleanup(void) __attribute__((noreturn));			/* Main cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	const char *test_desc;	/* test specific error message */
-	int fildes;		/* File descriptor of testfile */
-	off_t trunc_len;	/* truncate length */
-	int ind;
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/*
-	 * Perform global setup for test to call individual test specific
-	 * setup functions.
-	 */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-
-		for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
-			fildes = Test_cases[ind].fd;
-			test_desc = Test_cases[ind].desc;
-			trunc_len = Test_cases[ind].len;
-
-			if (fildes == 1) {
-				fildes = fd1;
-			} else {
-				fildes = fd2;
-			}
-
-			/* 
-			 * Call ftruncate(2) to test different test conditions.
-			 * verify that it fails with return code -1 and sets
-			 * appropriate errno.
-			 */
-			TEST(ftruncate(fildes, trunc_len));
-
-			/* check return code of ftruncate(2) */
-			if (TEST_RETURN == -1) {
-				TEST_ERROR_LOG(TEST_ERRNO);
-				if (TEST_ERRNO == Test_cases[ind].exp_errno) {
-					tst_resm(TPASS, "ftruncate() fails, %s,"
-						 " errno=%d", test_desc,
-						 TEST_ERRNO);
-				} else {
-					tst_resm(TFAIL, "ftruncate() fails, %s,"
-						 " errno=%d, expected errno:%d",
-						 test_desc, TEST_ERRNO,
-						 Test_cases[ind].exp_errno);
-				}
-			} else {
-				tst_resm(TFAIL, "ftruncate() returned %d, "
-					 "expected -1, errno:%d", TEST_RETURN,
-					 Test_cases[ind].exp_errno);
-			}
-		}	/* End of TEST CASE LOOPING. */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and change directory to it.
- *  Fill the test buffer with some date used to fill test file(s).
- *  Call individual test specific setup functions.
- */
-void 
-setup()
-{
-	int ind;
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Check that the test process id is not root/super-user */
-	if (geteuid() == 0) {
-		tst_brkm(TBROK, NULL, "Must be non-root/super for this test!");
-		tst_exit();
-	}
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* call individual setup functions */
-	for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
-		Test_cases[ind].setupfunc();
-	}
-}	/* End of setup */
-
-/*
- * int
- * setup1() - setup function for a test condition for which ftruncate(2)
- *	      returns -1 and sets errno to EINVAL.
- *  Create a test file and open it for writing only.
- */
-int
-setup1()
-{
-	/* Open the testfile in write-only mode */
-	if ((fd1 = open(TEST_FILE1, O_WRONLY|O_CREAT, 0644)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_WRONLY) Failed, errno=%d : %s",
-			 TEST_FILE1, errno, strerror(errno));
-	}
-	return 0;
-}	/* End setup1() */
-
-/*
- * int
- * setup2() - setup function for a test condition for which ftruncate(2)
- *            returns -1 and sets errno to EBADF.
- *  Create a test file and open it for reading/writing, and fill the
- *  testfile with the contents of test buffer.
- *  Close the test file.
- *
- */
-int
-setup2()
-{
-	int c, i, c_total = 0;
-	char tst_buff[BUF_SIZE];	/* buffer to hold testfile contents */
-
-	/* Fill the test buffer with the known data */
-	for (i = 0; i < BUF_SIZE; i++) {
-		tst_buff[i] = 'a';
-	}
-
-	/* open a testfile for reading/writing */
-	if ((fd2 = open(TEST_FILE2, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
-			 TEST_FILE2, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Write to the file 1k data from the buffer */
-	while (c_total < FILE_SIZE) {
-		if ((c = write(fd2, tst_buff, sizeof(tst_buff))) <= 0) {
-			tst_brkm(TBROK, cleanup,
-				 "write(2) on %s Failed, errno=%d : %s",
-				 TEST_FILE2, errno, strerror(errno));
-		} else {
-			c_total += c;
-		}
-	}
-
-	/* Close the testfile after writing data into it */
-	if (close(fd2) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "close(%s) Failed, errno=%d : %s",
-			 TEST_FILE2, errno, strerror(errno));
-	}
-	return 0;
-}	/* End of setup2 */
-
-/*
- * int
- * no_setup() - This function just returns 0.
- */
-int
-no_setup()
-{
-	return 0;
-}
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- *  Close the temporary file.
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the testfile after opening it read-only in setup1 */
-	if (close(fd1) == -1) {
-		tst_brkm(TFAIL, NULL,
-			 "close(%s) Failed, errno=%d : %s",
-			 TEST_FILE1, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/getegid01.c b/winsup/testsuite/winsup.api/ltp/getegid01.c
deleted file mode 100644
index 942201067..000000000
--- a/winsup/testsuite/winsup.api/ltp/getegid01.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: getegid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for getegid(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) getegid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the getegid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	getegid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="getegid01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0};		/* must be a 0 terminated list */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    ;
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *  Get effective group id.
-	 */
-	;
-
-	/* Call getegid(2) */
-	TEST(getegid( ));
-	
-	/* check return code */
-	if ( TEST_RETURN < 0 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "getegid -  Get effective group id. failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	    continue;	/* next loop for MTKERNEL */
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	    /* No Verification test, yet... */
-	    tst_resm(TPASS, "getegid -  Get effective group id. returned %d", TEST_RETURN);
-	} 
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/geteuid01.c b/winsup/testsuite/winsup.api/ltp/geteuid01.c
deleted file mode 100644
index 82a681ec5..000000000
--- a/winsup/testsuite/winsup.api/ltp/geteuid01.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: geteuid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for geteuid(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) geteuid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the geteuid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	geteuid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="geteuid01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0};		/* must be a 0 terminated list */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    ;
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *  Get effective user id.
-	 */
-	;
-
-	/* Call geteuid(2) */
-	TEST(geteuid( ));
-	
-	/* check return code */
-	if ( TEST_RETURN < 0 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "geteuid -  Get effective user id. failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	    continue;	/* next loop for MTKERNEL */
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	    /* No Verification test, yet... */
-	    tst_resm(TPASS, "geteuid -  Get effective user id. returned %d", TEST_RETURN);
-	} 
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/getgid01.c b/winsup/testsuite/winsup.api/ltp/getgid01.c
deleted file mode 100644
index e5b138c8a..000000000
--- a/winsup/testsuite/winsup.api/ltp/getgid01.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: getgid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for getgid(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) getgid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the getgid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	getgid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="getgid01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call getgid(2) 
-	 */
-	TEST(getgid());
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "getgid() Failed, errno=%d : %s", 
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "getgid() returned %d", TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/getgid02.c b/winsup/testsuite/winsup.api/ltp/getgid02.c
deleted file mode 100644
index 5efbda521..000000000
--- a/winsup/testsuite/winsup.api/ltp/getgid02.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	getgid02.c
- *
- * DESCRIPTION
- *	Testcase to check the basic functionality of getegid().
- *
- * ALGORITHM
- *	call setup
- *	loop if that option was specified
- *	Execute getegid() call using TEST macro
- *	if not expected value
- *	   break remaining tests and cleanup
- *	if STD_FUNCTIONAL_TEST
- *	   Execute geteuid() call
- *	   Execute getpwduid() call
- *	   if the passwd entry is NULL
- *	      break the remaining tests and cleanup
- *	   else if pwent->pw_gid != TEST_RETURN
- *	      print failure message
- *	   else
- *	      print pass message
- *	else
- *	   print pass message
- *      call cleanup
- *
- * USAGE:  <for command-line>
- *  getgid02 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	none
- */
-
-#include <pwd.h>
-#include <errno.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID= "getgid02";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-int
-main(int ac, char **av)
-{
-	int lc;                         /* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-	int euid;
-	struct passwd *pwent;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();                        /* global setup */
-
-	/* The following loop checks looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(getegid());
-
-		if (TEST_RETURN < 0) {
-			tst_brkm(TBROK, cleanup, "This should never happen");
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-			euid = geteuid();
-
-			pwent = getpwuid(euid);
-
-			if (pwent == NULL) {
-				tst_brkm(TBROK, cleanup, "geteuid() returned "
-					 "unexpected value %d", euid);
-			} else {
-				if (pwent->pw_gid != TEST_RETURN) {
-					tst_resm(TFAIL, "getegid() return value"
-						" %d unexpected - expected %d",
-						TEST_RETURN, pwent->pw_gid);
-				} else {
-					tst_resm(TPASS, "effective group id %d "
-						 "is correct", TEST_RETURN);
-				}
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing status if that option was specified.
-	 * print errno log if that option was specified
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/getgid03.c b/winsup/testsuite/winsup.api/ltp/getgid03.c
deleted file mode 100644
index ef0eaea14..000000000
--- a/winsup/testsuite/winsup.api/ltp/getgid03.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	getgid01.c
- *
- * DESCRIPTION
- *	Testcase to check the basic functionality of getgid().
- *
- * ALGORITHM
- *	call setup
- *	loop if that option was specified
- *	Execute getgid() call using TEST macro
- *	if not expected value
- *	   break remaining tests and cleanup
- *	if STD_FUNCTIONAL_TEST
- *	   Execute getuid() call
- *	   Execute getpwduid() call
- *	   if the passwd entry is NULL
- *	      break the remaining tests and cleanup
- *	   else if pwent->pw_gid != TEST_RETURN
- *	      print failure message
- *	   else
- *	      print pass message
- *	else
- *	   print pass message
- *	call cleanup
- *
- * USAGE:  <for command-line>
- *  getgid01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	none
- */
-
-#include <pwd.h>
-#include <errno.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID= "getgid01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-int
-main(int ac, char **av)
-{
-	int lc;                         /* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-	int uid;
-	struct passwd *pwent;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();                        /* global setup */
-
-	/* The following loop checks looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(getgid());
-
-		if (TEST_RETURN < 0) {
-			tst_brkm(TBROK, cleanup, "This should never happen");
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-			uid = getuid();
-			pwent = getpwuid(uid);
-
-			if (pwent == NULL) {
-				tst_brkm(TBROK, cleanup, "getuid() returned "
-					 "unexpected value %d", uid);
-			} else {
-				if (pwent->pw_gid != TEST_RETURN) {
-					tst_resm(TFAIL, "getgid() return value "
-						"%d unexpected - expected %d",
-						TEST_RETURN, pwent->pw_gid);
-				} else {
-					tst_resm(TPASS, "group id %d returned "
-						 "correctly", TEST_RETURN);
-				}
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing status if that option was specified.
-	 * print errno log if that option was specified
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/getgroups01.c b/winsup/testsuite/winsup.api/ltp/getgroups01.c
deleted file mode 100644
index db9f942f6..000000000
--- a/winsup/testsuite/winsup.api/ltp/getgroups01.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/***********************************************************************
-TEST IDENTIFIER:  getgroups01 :	Getgroups system call critical test
-
-PARENT DOCUMENT:  ggrtds01:  Getgroups system call test design spec
-
-AUTHOR: Barrie Kletscher
-	Rewrote :  11-92 by Richard Logan
-
-CO-PILOT: Dave Baumgartner
-
-TEST ITEMS:
-	1. Check to see if getgroups(-1, gidset) fails and sets errno to EINVAL
-	2. Check to see if getgroups(0, gidset) does not return -1 and gidset is
-		not modified.
-	3. Check to see if getgroups(x, gigset) fails and sets errno to EINVAL,
-		where x is one less then what is returned by getgroups(0, gidset).
-	4. Check to see if getgroups() succeeds and gidset contains
-		group id returned from getgid().
-
-INPUT SPECIFICATIONS:
-	NONE
-
-OUTPUT SPECIFICATIONS:
-	Standard tst_res output format
-
-ENVIRONMENTAL NEEDS:
-	NONE.
-
-SPECIAL PROCEDURAL REQUIREMENTS:
-	None
-
-INTERCASE DEPENDENCIES:
-	Test case #3 depends on test case #2.
-
-DETAILED DESCRIPTION:
-	Set up the signal handling capabilities.
-	execute tests
-	exit
-
-BUGS:
-	None known.
-
-************************************************************/
-
-#include <signal.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/param.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID="getgroups01";          /* Test program identifier.    */
-int TST_TOTAL=4;                /* Total number of test cases. */
-extern int Tst_count;           /* Test Case counter for tst_* routines */
-
-/***********************************************************************
- * MAIN
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;             /* loop counter */
-    const char *ptr;          /* message returned from parse_opts */
-
-    int	i,			/* counter */
-	group,			/* return value from Getgid() call */
-	entries;		/* number of group entries */
-
-    gid_t gidset[NGROUPS];	/* storage for all group ids */
-    gid_t cmpset[NGROUPS];
-    int ret;
-    int ret2;
-    int errors = 0;
-    char msg[500];
-
-    /***************************************************************
-     * parse standard options, and exit if there is an error
-     ***************************************************************/
-    if ( (ptr=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-        tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", ptr);
-        tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-        /* reset Tst_count in case we are looping. */
-        Tst_count=0;
-
-
-        /*
-         * Check to see if getgroups() fails on erraneous condition.
-         */
-	TEST( getgroups(-1,gidset) );
-	
-	if((ret=TEST_RETURN) != -1) {
-		sprintf(msg,
-		    "getgroups(-1,gidset) returned %d, expected -1 and errno = EINVAL",
-		    ret);
-		tst_resm(TFAIL,msg);
-		errors++;
-	}
-	else if ( STD_FUNCTIONAL_TEST ) {
-		if(errno != EINVAL) {
-		    sprintf(msg,
-			"getgroups(-1,gidset) returned %d, errno = %d, expected errno %d (EINVAL)",
-			ret, errno, EINVAL);
-		    tst_resm(TFAIL,msg);
-		    errors++;
-	        }
-		else {
-		    sprintf(msg,
-		    "getgroups(-1,gidset) returned %d and error = %d (EINVAL) as expected",
-		    ret, errno);
-		    tst_resm(TPASS, msg);
-	        }
-	}
-
-	/*
-	 * Check that if ngrps is zero that the number of groups is return and
-	 * the the gidset array is not modified.
-	 * This is a POSIX special case.
-	 */
-
-	memset(gidset, 052, NGROUPS);
-	memset(cmpset, 052, NGROUPS);
-
-	TEST( getgroups(0,gidset) );
-	if((ret=TEST_RETURN) < 0) {
-		sprintf(msg,
-		    "getgroups(0,gidset) returned %d with errno = %d, expected num gids with no change to gidset",
-		    ret, errno);
-		tst_resm(TFAIL,msg);
-		errors++;
-	}
-	else if ( STD_FUNCTIONAL_TEST ) {
-	    /*
-	     * check that gidset was unchanged
-	     */
-	    if ( memcmp(cmpset, gidset, NGROUPS) != 0 ) {
-		sprintf(msg,
-		    "getgroups(0,gidset) returned %d, the gidset array was modified",
-		    ret);
-	        tst_resm(TFAIL,msg);
-		errors++;
-	    }
-	    else {
-		sprintf(msg,
-		    "getgroups(0,gidset) returned %d, the gidset array not was modified",
-		    ret);
-	        tst_resm(TPASS, msg);
-	    }
-	}
-
-	/*
-	 * Check to see that is -1 is returned and errno is set to EINVAL when
-	 * ngroups is not big enough to hold all groups.
-	 */
-
-	if ( ret <= 1 ) {
-	    sprintf(msg, "getgroups(0,gidset) returned %d, Unable to test that\nusing ngrps >=1 but less than number of grps", ret);
-	    tst_resm(TCONF, msg);
-	    errors++;
-	}
-	else {
-	    TEST( getgroups(ret-1, gidset) );
-	    if ((ret2 = TEST_RETURN) == -1 ) {
-	        if ( STD_FUNCTIONAL_TEST ) {
-		    if (  errno != EINVAL ) {
-		        sprintf(msg,
-			    "getgroups(%d, gidset) returned -1, but not errno %d (EINVAL) but %d",
-			    ret-1, EINVAL, errno);
-	                tst_resm(TFAIL, msg);
-	                errors++;
-		    }
-		    else {
-		        sprintf(msg,
-                            "getgroups(%d, gidset) returned -1, and errno %d (EINVAL) when %d grps",
-			    ret-1, errno, ret);
-	                tst_resm(TPASS, msg);
-		    }
-		}
-	    }
-	    else {
-		sprintf(msg,
-		    "getgroups(%d, gidset) returned %d, expected -1 and errno EINVAL.",
-		    ret-1, ret2);
-	        tst_resm(TFAIL, msg);
-	        errors++;
-	    }
-	}
-
-	/*
- 	 * Check to see if getgroups() succeeds and contains getgid's gid.
- 	 */
-
-	TEST( getgroups(NGROUPS,gidset) );
-	if((entries = TEST_RETURN) == -1) {
-	    sprintf(msg, "getgroups(NGROUPS,gidset) returned -1 and errno = %d", errno);
-	    tst_resm(TFAIL, msg);
-	    errors++;
-	}
-	else if ( STD_FUNCTIONAL_TEST ) {
-
-	    /*
-	     * Check to see if getgroups() contains getgid().
-	     */
-
-	    group = getgid();
-
-	    for(i = 0; i < entries; i++)
-	    {
-		if(gidset[i] == group)
-		{
-		    sprintf(msg,
-		    "getgroups(NGROUPS,gidset) ret %d contains gid %d (from getgid)",
-		    entries, group);
-		    tst_resm(TPASS, msg);
-		    break;
-		}
-	    }
-
-	    if( i == entries ) {
-		sprintf(msg,
-		    "getgroups(NGROUPS,gidset) ret %d, does not contain gid %d (from getgid)",
-		    entries, group);
-		tst_resm(TFAIL,msg);
-	        errors++;
-	    }
-	}
-
-    }
-    cleanup();
-
-    return 0;
-}	/* end main() */
-
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}       /* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *              completion or premature exit.
- ***************************************************************/
-void
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}       /* End cleanup() */
-
diff --git a/winsup/testsuite/winsup.api/ltp/getgroups02.c b/winsup/testsuite/winsup.api/ltp/getgroups02.c
deleted file mode 100644
index e05258935..000000000
--- a/winsup/testsuite/winsup.api/ltp/getgroups02.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: getgroups02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for getgroups(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) getgroups(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the getgroups(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	getgroups(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="getgroups02"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-/* define array size for gids */
-#define GID_ARRAY_SIZE 100
-
-gid_t gidset[GID_ARRAY_SIZE];	/* array of gids */
-
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call getgroups(2) 
-	 */
-	TEST(getgroups(GID_ARRAY_SIZE, gidset));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "getgroups() Failed, errno=%d : %s", 
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "getgroups() returned %d", TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/gethostid01.c b/winsup/testsuite/winsup.api/ltp/gethostid01.c
deleted file mode 100644
index ebb6d1724..000000000
--- a/winsup/testsuite/winsup.api/ltp/gethostid01.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: gethostid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for gethostid(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) gethostid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the gethostid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	gethostid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="gethostid01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0};		/* must be a 0 terminated list */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    ;
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *  Get host name
-	 */
-	;
-
-	/* Call gethostid(2) */
-	TEST(gethostid( ));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "gethostid -  Get host name failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	    continue;	/* next loop for MTKERNEL */
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	    /* No Verification test, yet... */
-	    tst_resm(TPASS, "gethostid -  Get host name returned %d", TEST_RETURN);
-	} 
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/gethostname01.c b/winsup/testsuite/winsup.api/ltp/gethostname01.c
deleted file mode 100644
index 0e765bfad..000000000
--- a/winsup/testsuite/winsup.api/ltp/gethostname01.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: gethostname01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for gethostname(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) gethostname(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the gethostname(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	gethostname(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-  
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="gethostname01";/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0};		/* must be a 0 terminated list */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    char hname[100];	/* host name */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *  Get host name
-	 */
-	;
-
-	/* Call gethostname(2) */
-	TEST(gethostname(hname, sizeof(hname) ));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "gethostname -  Get host name failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	    continue;	/* next loop for MTKERNEL */
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	    /* No Verification test, yet... */
-	    tst_resm(TPASS, "gethostname -  Get host name returned %d", TEST_RETURN);
-	} 
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/getpgid01.c b/winsup/testsuite/winsup.api/ltp/getpgid01.c
deleted file mode 100644
index 88907f413..000000000
--- a/winsup/testsuite/winsup.api/ltp/getpgid01.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	getpgid01.c
- *
- * DESCRIPTION
- *	Testcase to check the basic functionality of getpgid().
- *
- * ALGORITHM
- * 	block1: Does getpgid(0), and checks for error.
- * 	block2: Does getpgid(getpid()) and checks for error.
- * 	block3: Does getpgid(getppid()) and checks for error.
- * 	block4: Verifies that getpgid(getpgid(0)) == getpgid(0).
- * 	block5: Does getpgid(1) and checks for error.
- *
- * USAGE
- * 	getpgid01
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	Expects that there are no EPERM limitations on getting the
- *	process group ID from proc 1 (init).
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <test.h>
-#include <usctest.h>
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID = "getpgid01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned by parse_opts */
-
-	register int 	pgid_0, pgid_1;
-	register int	my_pid, my_ppid;
-	int ex_stat, fail = 0;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();
-
-	/* check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		if ((pgid_0 = fork()) < 0) {
-			tst_brkm(TBROK, cleanup, "fork() failed");
-		}
-		if (pgid_0 > 0) {		/* parent */
-			/*
-			 * parent process waits for child to exit, and then
-			 * exits itself.
-			 */
-			while ((pgid_0 = wait(&ex_stat)) > 0);
-
-			if (WEXITSTATUS(ex_stat) == 0) {
-				tst_resm(TINFO, "%s PASSED", TCID);
-			} else {
-				tst_resm(TINFO, "%s FAILED", TCID);
-			}
-
-			/* let the child carry on */
-			exit(0);
-		}
-
-		/* child */
-		tst_resm(TINFO, "Enter block 1");
-		fail = 0;
-		if ((pgid_0 = getpgid(0)) < 0) {
-			perror("getpgid");
-			tst_resm(TFAIL, "getpgid(0) failed");
-			fail = 1;
-		}
-
-		if (fail) {
-			tst_resm(TINFO, "Test block 1: getpgid(0) FAILED");
-		} else {
-			tst_resm(TPASS, "Test block 1: getpgid(0) PASSED");
-		}
-		tst_resm(TINFO, "Exit block 1");
-
-		tst_resm(TINFO, "Enter block 2");
-		fail = 0;
-
-		my_pid = getpid();
-		if ((pgid_1 = getpgid(my_pid)) < 0) {
-			perror("getpgid");
-			tst_resm(TFAIL, "getpgid(my_pid=%d) failed", my_pid);
-			tst_exit();
-		}
-		if (pgid_0 != pgid_1) {
-			tst_resm(TFAIL, "getpgid(my_pid=%d) != getpgid(0) "
-				 "[%d != %d]", my_pid, pgid_1, pgid_0);
-			fail = 1;
-		}
-		if (fail) {
-			tst_resm(TINFO, "Test block 2: getpgid(getpid()) "
-				 "FAILED");
-		} else {
-			tst_resm(TPASS, "Test blcok 2: getpgid(getpid()) "
-				 "PASSED");
-		}
-		tst_resm(TINFO, "Exit block 2");
-
-		tst_resm(TINFO, "Enter block 3");
-		fail = 0;
-
-		my_ppid = getppid();
-		if ((pgid_1 = getpgid(my_ppid)) < 0) {
-			perror("getpgid");
-			tst_resm(TFAIL, "getpgid(my_ppid=%d) failed",
-				 my_ppid);
-			tst_exit();
-		}
-		if (pgid_0 != pgid_1) {
-			tst_resm(TFAIL, "getpgid(my_ppid=%d) != getpgid(0) "
-				 "[%d != %d]", my_ppid, pgid_1, pgid_0);
-			fail = 1;
-		}
-
-		if (fail) {
-			tst_resm(TINFO, "Test block 3: getpgid(getppid()) "
-				 "FAILED");
-		} else {
-			tst_resm(TPASS, "Test block 3: getpgid(getppid()) "
-				 "PASSED");
-		}
-		tst_resm(TINFO, "Exit block 3");
-
-		tst_resm(TINFO, "Enter block 4");
-		fail = 0;
-
-		if ((pgid_1 = getpgid(pgid_0)) < 0) {
-			perror("getpgid");
-			tst_resm(TFAIL, "getpgid(my_pgid=%d) failed", pgid_0);
-			tst_exit();
-		}
-		if (pgid_0 != pgid_1) {
-			tst_resm(TFAIL, "getpgid(my_pgid=%d) != getpgid(0) "
-				 "[%d != %d]", pgid_0, pgid_1, pgid_0);
-			fail = 1;
-		}
-
-		if (fail) {
-			tst_resm(TINFO, "Test block 4: getpgid(1) FAILED");
-		} else {
-			tst_resm(TPASS, "Test block 4: getpgid(1) PASSED");
-		}
-		tst_resm(TINFO, "Exit block 4");
-#ifndef __CYGWIN__
-block5:
-		tst_resm(TINFO, "Enter block 5");
-		fail = 0;
-
-		if (getpgid(1) < 0) {
-			perror("getpgid");
-			tst_resm(TFAIL, "getpgid(1) failed");
-			fail = 1;
-		}
-
-		if (fail) {
-			tst_resm(TINFO, "Test block 5: getpgid(1) FAILED");
-		} else {
-			tst_resm(TPASS, "Test block 5: getpgid(1) PASSED");
-		}
-		tst_resm(TINFO, "Exit block 5");
-#endif
-	}
-	cleanup();
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/getpgid02.c b/winsup/testsuite/winsup.api/ltp/getpgid02.c
deleted file mode 100644
index f6eaec6f6..000000000
--- a/winsup/testsuite/winsup.api/ltp/getpgid02.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	getpgid02.c
- *
- * DESCRIPTION
- *	Testcase to check the basic functionality of getpgid().
- *
- * ALGORITHM
- * 	test 1: Does getpgid(-99) and expects ESRCH.
- * 	test 2: Searches an unused pid and expects ESRCH.
- *
- * USAGE:  <for command-line>
- *  getpgid02 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	none
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <test.h>
-#include <usctest.h>
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID = "getpgid01";
-int TST_TOTAL = 2;
-extern int Tst_count;
-
-int 	pgid_0, pgid_1;
-#define BADPID -99
-
-int exp_enos[]={ESRCH, 0};
-
-struct test_case_t {
-        int *id;
-        int error;
-} TC[] = {
-	/* The pid value is negative */
-        {&pgid_0, ESRCH},
-
-	/* The pid value does not match any process */
-        {&pgid_1, ESRCH}
-};
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	int i;
-	const char *msg;		/* message returned by parse_opts */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();
-
-	/* set up the expected errnos */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-
-		/* loop through the test cases */
-		for (i = 0; i < TST_TOTAL; i++) {
-
-			TEST(getpgid(*TC[i].id));
-
-                        if (TEST_RETURN != -1) {
-                                tst_resm(TFAIL, "call succeeded unexpectedly");
-                                continue;
-                        }
-
-                        TEST_ERROR_LOG(TEST_ERRNO);
-
-                        if (TEST_ERRNO == TC[i].error) {
-                                tst_resm(TPASS, "expected failure - "
-                                         "errno = %d : %s", TEST_ERRNO,
-                                         strerror(TEST_ERRNO));
-                        } else {
-                                tst_resm(TFAIL, "unexpected error - %d : %s - "
-                                         "expected %d", TEST_ERRNO,
-                                         strerror(TEST_ERRNO), TC[i].error);
-			}
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	pgid_0 = BADPID;
-
-	/*
-	 * Find a pid that isn't currently being used.  Start
-	 * at 'our pid - 1' and go backwards until we find one.
-	 * In this way, we can be reasonably sure that the pid
-	 * we find won't be reused for a while as new pids are
-	 * allocated counting up to PID_MAX.
-	 */
-	for (pgid_1 = getpid() - 1; --pgid_1 > 0; ) {
-		if (kill(pgid_1, 0) < 0 && errno == ESRCH) {
-			break;
-		}
-	}
-}
-
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/getpgrp01.c b/winsup/testsuite/winsup.api/ltp/getpgrp01.c
deleted file mode 100644
index 6997be264..000000000
--- a/winsup/testsuite/winsup.api/ltp/getpgrp01.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: getpgrp01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for getpgrp(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) getpgrp(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the getpgrp(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	getpgrp(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="getpgrp01"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call getpgrp(2) 
-	 */
-	TEST(getpgrp());
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "getpgrp() Failed, errno=%d : %s", 
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "getpgrp() returned %d", TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/getpid01.c b/winsup/testsuite/winsup.api/ltp/getpid01.c
deleted file mode 100644
index df8197d28..000000000
--- a/winsup/testsuite/winsup.api/ltp/getpid01.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: getpid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for getpid(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) getpid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the getpid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	getpid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="getpid01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call getpid(2) 
-	 */
-	TEST(getpid());
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "getpid() Failed, errno=%d : %s", 
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "getpid() returned %d", TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/getpid02.c b/winsup/testsuite/winsup.api/ltp/getpid02.c
deleted file mode 100644
index 06d80b38d..000000000
--- a/winsup/testsuite/winsup.api/ltp/getpid02.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: getpid01
- *
- * Test Description:
- *  Verify that getpid() system call gets the process ID of the of the
- *  calling process.
- *
- * Expected Result:
- *  getpid() should return pid of the process on success.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *
- * Usage:  <for command-line>
- *  getpid01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-const char *TCID="getpid01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	pid_t proc_id;		/* process id of the test process */
-	pid_t pid;		/* process id of the child process */
-	pid_t pproc_id;		/* parent process id */
-	int status;		/* exit status of child process */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Invoke getpid() to get the process id of
-		 * the test process.
-		 */
-		TEST(getpid());
-
-		/* Save the process id returned by getpid() */
-		proc_id = TEST_RETURN;
-
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/* Fork a child now */
-			if ((pid = fork()) < 0) {
-				tst_resm(TFAIL, "fork() failed to create child,"
-					 " error=%d", TEST_ERRNO);
-			} else if (pid == 0) {	/* Child process */
-				/* Get the parent process id */
-				pproc_id = getppid();
-
-				/* Verify if the two process IDs match */
-				if (pproc_id != proc_id) {
-					exit(1);
-				}
-				exit(0);
-			} else {	/* parent process */
-				wait(&status);
-
-				/* Check exit status of child */
-				if (WEXITSTATUS(status) != 0) {
-					tst_resm(TFAIL, "getpid() returned "
-						 "invalid pid %d", proc_id);
-				} else {
-					tst_resm(TPASS, "Functionality of "
-						 "getpid() successful");
-				}
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- * 	     Setup signal catching function.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/getppid01.c b/winsup/testsuite/winsup.api/ltp/getppid01.c
deleted file mode 100644
index d0e6032c0..000000000
--- a/winsup/testsuite/winsup.api/ltp/getppid01.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: getppid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for getppid(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01 
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) getppid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the getppid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	getppid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="getppid01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call getppid(2) 
-	 */
-	TEST(getppid());
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "getppid() Failed, errno=%d : %s", 
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "getppid() returned %d", TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/getppid02.c b/winsup/testsuite/winsup.api/ltp/getppid02.c
deleted file mode 100644
index 50a72e470..000000000
--- a/winsup/testsuite/winsup.api/ltp/getppid02.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	getppid01.c
- *
- * DESCRIPTION
- * 	Testcase to check the basic functionality of the getppid() syscall.
- *
- * USAGE:  <for command-line>
- *  getppid01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <errno.h>
-#include <test.h>
-#include <usctest.h>
-#include <sys/wait.h>
-
-const char *TCID = "getppid01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int ac, char **av)
-{
-	int pid, ppid;
-
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();
-
-	/*
-	 * check looping state if -i option is given
-	 */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/*
-		 * reset Tst_count in case we are looping.
-		 */
-		Tst_count = 0;
-
-		ppid = getpid();
-		pid = fork();
-		if (pid < 0) {
-			tst_brkm(TBROK, cleanup, "fork() failed");
-		}
-
-		if (pid == 0) {			/* child */
-			TEST(getppid());
-
-			if (TEST_RETURN < 0)  {
-				tst_resm(TFAIL, "something is really broken");
-				continue;
-			}
-
-			if (STD_FUNCTIONAL_TEST) {
-				if (TEST_RETURN != ppid) {
-					tst_resm(TFAIL, "getppid() failed");
-				} else {
-					tst_resm(TPASS, "return value = "
-						 "parent's pid value");
-				}
-			} else {
-				tst_resm(TPASS, "call succeeded");
-			}
-
-		} else {
-			wait(NULL);
-
-			/* let the child carry on */
-			exit(0);
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/getuid01.c b/winsup/testsuite/winsup.api/ltp/getuid01.c
deleted file mode 100644
index cd3dff769..000000000
--- a/winsup/testsuite/winsup.api/ltp/getuid01.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: getuid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for getuid(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) getuid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the getuid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	getuid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="getuid01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call getuid(2) 
-	 */
-	TEST(getuid());
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "getuid() Failed, errno=%d : %s", 
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "getuid() returned %d", TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/getuid02.c b/winsup/testsuite/winsup.api/ltp/getuid02.c
deleted file mode 100644
index 966b55290..000000000
--- a/winsup/testsuite/winsup.api/ltp/getuid02.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	getuid02.c
- *
- * DESCRIPTION
- *	Testcase to check the basic functionality of the geteuid() system call.
- *
- * USAGE:  <for command-line>
- *  getuid02 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <pwd.h>
-#include <errno.h>
-#include <test.h>
-#include <usctest.h>
-
-const char *TCID = "getuid02";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned by parse_opts */
-
-	struct passwd *pwent;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();
-
-	/* check looping state if -i option is given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(geteuid());
-
-		if (TEST_RETURN < 0) {
-			tst_brkm(TBROK, cleanup, "This should never happen");
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-
-			pwent = getpwuid(TEST_RETURN);
-			if (pwent == NULL) {
-				tst_resm(TFAIL, "geteuid() returned unexpected "
-					 "value %d", TEST_RETURN);
-			} else {
-				if (pwent->pw_uid != TEST_RETURN) {
-					tst_resm(TFAIL, "getpwuid() value, %d, "
-						 "does not match geteuid() "
-						 "value, %d", pwent->pw_uid,
-						 TEST_RETURN);
-				} else {
-					tst_resm(TPASS, "values from geteuid()"
-						 " and getpwuid() match");
-				}
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/getuid03.c b/winsup/testsuite/winsup.api/ltp/getuid03.c
deleted file mode 100644
index e18c366f4..000000000
--- a/winsup/testsuite/winsup.api/ltp/getuid03.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	getuid01.c
- *
- * DESCRIPTION
- *	Testcase to check the basic functionality of the getuid() system call.
- *
- * USAGE:  <for command-line>
- *  getuid01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-
-#include <pwd.h>
-#include <errno.h>
-#include <test.h>
-#include <usctest.h>
-
-const char *TCID = "getuid01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned by parse_opts */
-
-	struct passwd *pwent;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();
-
-	/* check looping state if -i option is given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(getuid());
-
-		if (TEST_RETURN < 0) {
-			tst_brkm(TBROK, cleanup, "This should never happen");
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-
-			pwent = getpwuid(TEST_RETURN);
-			if (pwent == NULL) {
-				tst_resm(TFAIL, "getuid() returned unexpected "
-					 "value %d", TEST_RETURN);
-			} else {
-				if (pwent->pw_uid != TEST_RETURN) {
-					tst_resm(TFAIL, "getpwuid() value, %d, "
-						 "does not match getuid() "
-						 "value, %d", pwent->pw_uid, 
-						 TEST_RETURN);
-				} else {
-					tst_resm(TPASS, "values from getuid()"
-						 " and getpwuid() match");
-				}
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/kill01.c b/winsup/testsuite/winsup.api/ltp/kill01.c
deleted file mode 100644
index 042899173..000000000
--- a/winsup/testsuite/winsup.api/ltp/kill01.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	kill01.c
- *
- * DESCRIPTION
- *	Test case to check the basic functionality of kill().
- *
- * ALGORITHM
- *	call setup
- *	loop if the -i option was given
- *	fork a child
- *	execute the kill system call
- *	check the return value
- *	if return value is -1
- *		issue a FAIL message, break remaining tests and cleanup
- *	if we are doing functional testing
- *		if the process was terminated with the expected signal.
- *			issue a PASS message
- *		otherwise
- *			issue a FAIL message
- *	call cleanup
- *
- * USAGE
- *  kill01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	This test should be ran as a non-root user.
- */
-
-#include "test.h"
-#include "usctest.h"
-
-#include <signal.h>
-#include <errno.h>
-#include <sys/wait.h>
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID= "kill01()";
-int TST_TOTAL = 1;
-
-extern int Tst_count;
-
-#define TEST_SIG SIGKILL
-
-int
-main(int ac, char **av)
-{
-	int lc;                         /* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-	pid_t pid;			
-	int exno, status, nsig;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();                        /* global setup */
-
-	/* The following loop checks looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-		status = 1;
-		exno = 1;
-		pid = fork();
-		if (pid < 0) {
-			tst_brkm(TBROK, cleanup, "Fork of child failed");
-		} else if (pid == 0) {
-			pause();
-			/*NOTREACHED*/
-			exit(exno);
-		} else {
-			TEST(kill(pid, TEST_SIG));
-			waitpid(pid, &status, 0);
-		}
-
-		if (TEST_RETURN == -1) {
-			tst_brkm(TFAIL, cleanup, "%s failed - errno = %d : %s",
-				TCID, TEST_ERRNO, strerror(TEST_ERRNO));
-			/*NOTREACHED*/
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Check to see if the process was terminated with the
-			 * expected signal.
-			 */
-			nsig = WTERMSIG(status);
-			if (nsig == TEST_SIG) {
-				tst_resm(TPASS, "received expected signal %d",
-					nsig);
-			} else {
-				tst_resm(TFAIL, "expected signal %d received %d"					,TEST_SIG,nsig);
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * or premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing status if that option was specified.
-	 * print errno log if that option was specified
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/kill02.c b/winsup/testsuite/winsup.api/ltp/kill02.c
deleted file mode 100644
index eba47cc6a..000000000
--- a/winsup/testsuite/winsup.api/ltp/kill02.c
+++ /dev/null
@@ -1,857 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/***********************************************************************************
-
-    OS Test -  Silicon Graphics, Inc.
-
-    TEST IDENTIFIER :  kill02  Sending a signal to processes with the same process group ID.
-
-    PARENT DOCUMENT :  kiltds01  Kill System Call.
-		
-    AUTHOR          :  Dave Baumgartner
-
-    CO-PILOT        :  Barrie Kletscher
-
-    DATE STARTED    :  12/30/85
-
-    TEST ITEMS
-
-	1. Sending a signal to pid of zero sends to all processes whose process
-	   group ID is equal to the process group ID as the sender.
-
-	2. Sending a signal to pid of zero does not send to processes in another process group.
-
-
-    OUTPUT SPECIFICATIONS
-
-	PASS :
-		kiltcs02 1 PASS The signal was sent to all processes in the process group.
-		kiltcs02 2 PASS The signal was not sent to selective processes that were not in the process group.
-
-	FAIL :
-		kiltcs02 1 FAIL The signal was not sent to all processes in the process group.
-		kiltcs02 2 FAIL The signal was sent to a process that was not in the process group.
-
-	BROK :
-		kiltcs02 # BROK System call XXX failed. Errno:X, Error message:XXX.
-		kiltcs02 # BROK Setting to catch unexpected signal %d failed. Errno: %d, Error message %s.
-		kiltcs02 # BROK Setting to ignore signal %d failed. Errno: %d, Error message %s.
-
-	WARN :
-		kiltcs02 0 WARN Unexpected signal X was caught.
-
-    SPECIAL PROCEDURAL REQUIREMENTS
-
-	The program must be linked with tst_res.o.
-
-    DETAILED DESCRIPTION
-
-	**Setup**
-	Set up unexpected signal handling.
-	Set up one pipe for each process to be created with no blocking for read.
-	
-	**MAIN**
-	If setup fails exit.
-	Fork 2 children(1 & 2).
-	Wait for set up complete messages from the 1st and 2nd child.
-	Send the signal SIGUSR1 with pid equal to zero.
-	Sleep a reasonable amount of time so that each child has been swapped in
-	to process the signal.
-	Now decide the outcome of the test items by reading from each pipe to find
-	out if the child was interrupted by the signal and wrote to it.
-	Remove the second child.
-	Tell the first child it is time to remove it's child B because the decisions have been made.
-	Exit.
-
-	**First Child**
-	Set to catch SIGUSR1 with an int_rout1.
-	Set up to handle the message from the parent to remove child B.
-	Fork two children(A & B).
-	Wait for set up complete messages from child A & child B.
-	Send a set up complete message to the parent.
-	Pause until the signal SIGUSR1 comes in from the parent.
-	Pause until the parent says it is time to remove the child.
-	Exit.
-
-	**Second Child**
-	Set to catch SIGUSR1 with an int_rout2.
-	Set the process group to be something different than the parents.
-	Send a set up complete message to the parent.
-	Pause until killed by parent because this child shouldn't receive signal SIGUSR1.
-
-	**Child A**
-	Set to catch SIGUSR1 with an int_routA.
-	Send a set up complete message to the parent(First Child).
-	Pause until the signal SIGUSR1 comes in from the parent.
-	Exit.
-
-	**Child B**
-	Set to catch SIGUSR1 with an int_routB.
-	Set the process group to be something different than the parents(First Child's).
-	Send a set up complete message to the parent.
-	Pause until killed by parent because this child shouldn't receive signal SIGUSR1.
-
-	**usr1_rout-Used by all children**
-	Write to the appropriate pipe that the signal SIGUSR1 was caught.
-
-	**usr2_rout**
-	Remove child B.
-
-******************************************************************************/
-#include <sys/param.h>
-#include <signal.h>
-#include <errno.h>   
-#include <fcntl.h>
-#include <string.h>
-#include "test.h"    
-#include "usctest.h"
-
-#define MAXMESG 150		/*The maximum message that can be created.		*/
-#define CHAR_SET_FAILED	"0"	/*Set up failing status transferred through the pipe.	*/
-#define CHAR_SET_PASSED	"1"	/*Set up passing status transferred through the pipe.	*/
-#define SIG_CAUGHT	"2"	/*Indicates that the signal SIGUSR1 was caught.		*/
-#define SIG_RECEIVED	1	/*Integer value that indicates that the signal SIGUSR1	*/
-				/*was caught.						*/
-#define SIG_NOT_RECD	0	/*Integer value that indicates that the signal SIGUSR1	*/
-				/*was caught.						*/
-#define INT_SET_FAILED	0	/*Set up failing status transferred through the pipe.	*/
-#define INT_SET_PASSED	1	/*Set up passing status transferred through the pipe.	*/
-#define SLEEP_TIME	10	/*Amount of time the children get to catch the signal 	*/
-#define TRUE	 	40	/*Child exits with this if execution was as	*/
-				/*expected.						*/
-#define FALSE	 	50	/*Child exits with this if it timed out waiting for the 	*/
-				/*parents signal.					*/
-#define TIMEOUT		60	/*Amount of time given in alarm calls.			*/
-#define CHILD_EXIT(VAR) ((VAR >> 8) & 0377)  /*Exit value from the child.		*/
-#define CHILD_SIG(VAR) (VAR & 0377) /*Signal value from the termination of child.	*/
-				/*from the parent.					*/
-#define SYS_FAIL	"The system call %s failed. Errno: %d, Error message: %s."
-
-int pid1;			/*Return value from 1st fork. Global so that it can be	*/
-				/*used in interrupt handling routines.			*/
-int pid2;			/*Return value from 2nd fork. Global so that it can be	*/
-				/*used in interrupt handling routines.			*/
-int pidA;			/*Return value from 1st fork in child 1. Global so that it 	*/
-				/*can be used in interrupt handling routines.		*/
-int pidB;			/*Return value from 2nd fork in child 1. Global so that it 	*/
-				/*can be used in interrupt handling routines.		*/
-extern int errno;		/*Error number returned by a system call.		*/
-int pipe1_fd[2];		/*Pipe file descriptors used for communication  	*/
-				/*between child 1 and the 1st parent.			*/
-int pipe2_fd[2];		/*Pipe file descriptors used for communication  	*/
-				/*between child 2 and the 1st parent.			*/
-int pipeA_fd[2];		/*Pipe file descriptors used for communication  	*/
-				/*between child A and the 1st parent.			*/
-int pipeB_fd[2];		/*Pipe file descriptors used for communication  	*/
-				/*between child B and the 1st parent.			*/
-char pipe_buf[10];		/*Pipe buffer.					 	*/
-char buf_tmp1[2],buf_tmp2[2];	/*Temp hold for info read into pipe_buf.		*/
-int read1_stat = 0;		/*Number of characters read from pipe 1.		*/
-int read2_stat = 0;		/*Number of characters read from pipe 2.		*/
-int readA_stat = 0;		/*Number of characters read from pipe A.		*/
-int readB_stat = 0;		/*Number of characters read from pipe B.		*/
-int alarm_flag = FALSE;		/*This flag indicates an alarm time out.			*/
-char who_am_i = '0';		/*This indicates which process is which when using	*/
-				/*interrupt routine usr1_rout.				*/
-
-void notify_timeout();		/*Signal handler that the parent enters if it times out	*/
-				/*waiting for the child to indicate its set up status.	*/
-void parent_rout();		/*This is the parents routine.				*/
-void child1_rout();		/*This is child 1's routine.				*/
-void child2_rout();		/*This is child 2's routine.				*/
-void childA_rout();		/*This is child A's routine.				*/
-void childB_rout();		/*This is child B's routine.				*/
-void usr1_rout();		/*This routine is used by all children to indicate that	*/
-				/*they have caught signal SIGUSR1.			*/
-void par_kill();		/*This routine is called by the original parent to	*/
-				/*remove child 2 and to indicate to child 1 to 		*/
-				/*remove its children.					*/
-void chld1_kill();		/*This routine is used by child 1 to remove itself and	*/
-				/*its children A and B.					*/
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID="kill02";          /* Test program identifier.    */
-int TST_TOTAL=2;                /* Total number of test cases. */
-extern int Tst_count;           /* Test Case counter for tst_* routines */
-extern int Tst_nobuf;           /* var. used to turn off tst_res buffering */
-
-int exp_enos[]={0};             /* Array of expected errnos */
-
-/***********************************************************************
- * MAIN
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-  char mesg[MAXMESG];	/* Holds messages to pass to tst_res.		 */
-
-    int lc;             /* loop counter */
-    const char *msg;	/* message returned from parse_opts */
-
-    Tst_nobuf=1;
-
-    /***************************************************************
-     * parse standard options, and exit if there is an error
-     * the -t and -f options not support yet.
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-        tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-        tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-        /* reset Tst_count in case we are looping. */
-        Tst_count=0;
-
-	if ((pid1 = fork()) > 0)
-	{
-	    /*
-	     *  This is the parent, fork again to create child 2.
-	     */
-	     if ((pid2 = fork()) > 0) {
-		/*
-		 *  This is the parent.
-		 */
-		 (void) parent_rout();
-	     }
-	     else if (pid2 == 0) {
-		/*
-		 *  This is child 2.
-		 */
-		 (void) child2_rout();
-	     }
-	     else {
-		/*
-		 *  The second fork failed kill the first child.
-		 */
-		 if (kill(pid1,SIGKILL) == -1 && errno != ESRCH) {
-			tst_resm(TWARN,"Child process may not have been killed.");
-		 }
-		 (void) sprintf(mesg,SYS_FAIL,"fork",errno,strerror(errno));
-		 tst_brkm(TBROK,cleanup,mesg);
-	    }
-
-	}
-	else if (pid1 == 0) {
-	    /*
-	     *  This is child 1.
-	     */
-	     (void) child1_rout();
-	}
-	else {
-	    /*
-	     * Fork failed.
-	     */
-	     (void) sprintf(mesg,SYS_FAIL,"fork",errno,strerror(errno)); 
-	     tst_brkm(TBROK,cleanup,mesg);
-	 }
-   }
-
-   cleanup();
-
-   return 0;
-} /* END OF MAIN.*/
-
-/******************************************************************************
- *  This is the parents routine.  The parent waits for the children 1 and 2 to
- *  get set up. Then sends the signal and checks the outcome.
- *********************************************************************************/
-void parent_rout()
-{
-	char mesg[MAXMESG];	/*Used to buffer messages for tst_resm.	*/
-
-  /*
-   *  Set to catch the alarm signal SIGALRM.
-   */
-   if (signal(SIGALRM,notify_timeout) == SIG_ERR) {
-	(void) par_kill();
-	tst_brkm(TBROK, NULL,
-	    "Could not set to catch the parents time out alarm.");
-	tst_exit();
-   }
-
-  /*
-   *  Setting to catch the timeout alarm worked now let the children start up.
-   *  Set an alarm which causes a time out on the read pipe loop.
-   *  The children will notify the parent that set up is complete
-   *  and the pass/fail status of set up.
-   */
-   (void) alarm(TIMEOUT);
-
-   while ((read(pipe1_fd[0],pipe_buf,1) != 1) && (alarm_flag == FALSE))
-	/*EMPTY*/;
-   strncpy(buf_tmp1,pipe_buf,1);
-   (void) alarm(TIMEOUT);
-
-   while ((read(pipe2_fd[0],pipe_buf,1) != 1) && (alarm_flag == FALSE))
-	/*EMPTY*/;
-   (void) alarm(0);	/*Reset the alarm clock.*/
-   strncpy(buf_tmp2,pipe_buf,1);
-
-  /*
-   *  Check the alarm flag.
-   */
-   if (alarm_flag == TRUE) {
-	 tst_brkm(TBROK,NULL,"The set up of the children failed by timing out.");
-	 (void) par_kill();
-	 cleanup();
-   }
-
-  /*
-   *  Check to see if either child failed in the set up.
-   */
-   if ( (strncmp(buf_tmp1,CHAR_SET_FAILED,1) == 0) ||
-	(strncmp(buf_tmp2,CHAR_SET_FAILED,1) == 0)) {
-	/*
-	 * Problems were encountered in the set up of one of the children.
-	 * The error message has been displayed by the child.
-	 */
-	 (void) par_kill();
-	 cleanup();
-   }
-
-  /*
-   *  Setup passed, now send SIGUSR1 to process id of zero.
-   */
-   TEST( kill(0,SIGUSR1) );
-  
-   if ( TEST_RETURN == -1)
-   {
-	(void) sprintf(mesg,SYS_FAIL,"kill",errno,strerror(errno));
-	tst_brkm(TBROK,NULL,mesg);
-	(void) par_kill();
-	cleanup();
-   }
-
-  /*
-   *  Sleep for a while to allow the children to get a chance to 
-   *  catch the signal.
-   */
-   (void) sleep(SLEEP_TIME);
-	
-  /*
-   *  The signal was sent above and time has run out for child response,
-   *  check the outcomes.
-   */
-   read1_stat = read(pipe1_fd[0],pipe_buf,1);
-   if (read1_stat == -1 && errno == EAGAIN) read1_stat = 0;
-   read2_stat = read(pipe2_fd[0],pipe_buf,1);
-   if (read2_stat == -1 && errno == EAGAIN) read2_stat = 0;
-   readA_stat = read(pipeA_fd[0],pipe_buf,1);
-   if (readA_stat == -1 && errno == EAGAIN) readA_stat = 0;
-   readB_stat = read(pipeB_fd[0],pipe_buf,1);
-   if (readB_stat == -1 && errno == EAGAIN) readB_stat = 0;
-
-   if (read1_stat == -1 || read2_stat == -1 || 
-		   readA_stat == -1 || readB_stat == -1) {
-	/*
-	 * The read system call failed.
-	 */
-	 (void) sprintf(mesg,SYS_FAIL,"read",errno,strerror(errno));
-	 tst_brkm(TBROK,NULL,mesg);
-	 (void) par_kill();
-	 cleanup();
-   }
-
-   /*
-    * Check the processes that were supposed to get the signal.
-    */
-    if (read1_stat == SIG_RECEIVED) {
-	if (readA_stat == SIG_RECEIVED) {
-	    /*
-	     *  Both processes, 1 and A, that were supposed to receive
-	     *  the signal did receive the signal.
-	     */
-	    if ( STD_FUNCTIONAL_TEST )
-	        tst_resm(TPASS,
-		    "The signal was sent to all processes in the process group.");
-	    else
-		Tst_count++;
-	}
-	else { /*Process A didn't receive the signal.*/
-	    tst_resm(TFAIL,"Process A did not receive the signal.");
-	}
-
-    }
-    else { /*Process 1 didn't receive the signal.*/
-	tst_resm(TFAIL,"Process 1 did not receive the signal.");
-    }
-
-   /*
-    * Check the processes that were not supposed to get the signal.
-    */
-    if (read2_stat == SIG_NOT_RECD) {
-	if (readB_stat == SIG_NOT_RECD) {
-	    /*
-	     *  Both processes, 2 and B did not receive the signal.
-	     */
-	    if ( STD_FUNCTIONAL_TEST )
-	        tst_resm(TPASS,
-		    "The signal was not sent to selective processes that were not in the process group.");
-	    else
-		Tst_count++;
-	}
-	else { /*Process B received the signal.*/
-	    tst_resm(TFAIL,"Process B received the signal.");
-	}
-
-   }
-
-   else /*Process 2 received the signal.*/
-   {
-	 tst_resm(TFAIL,"Process 2 received the signal.");
-   }
-
-   (void) par_kill();
-  return;	
-}  /*End of parent_rout*/
-
-/*******************************************************************************
- * This is child 1's routine.  It creates children A & B, checks their set up,
- * reports to the parent set up pass/fail info., then waits for
- * the parents signal.
- ******************************************************************************/
-void child1_rout()
-{
-	char mesg[MAXMESG];	/*Used to buffer messages for tst_resm.	*/
-   who_am_i = '1';
-
-  /*
-   *  Set to catch the SIGUSR1 with int1_rout.
-   */
-   if (signal(SIGUSR1,usr1_rout) == SIG_ERR)
-   {
-	tst_brkm(TBROK,NULL,"Could not set to catch the childrens signal.");
-	(void) write(pipe1_fd[1],CHAR_SET_FAILED,1);
-	exit(0);
-   }
-
-  /*
-   *  Create children A & B.
-   */
-   if ((pidA = fork()) > 0) {
-	/*
-	 *  This is the parent(child1), fork again to create child B.
-	 */
-	 if ((pidB = fork()) == 0) {
-	     /* This is child B. */
-	     (void) childB_rout();
-	 }
-
-	 else if (pidB == -1) {
-		/*
-		 *  The fork of child B failed kill child A.
-		 */
-		 if (kill(pidA,SIGKILL) == -1)
-			tst_resm(TWARN,"Child process may not have been killed.");
-		 (void) sprintf(mesg,SYS_FAIL,"fork",errno,strerror(errno)); 
-		 tst_brkm(TBROK,NULL,mesg);
-		 (void) write(pipe2_fd[1],CHAR_SET_FAILED,1);
-		 exit(0);
-	 }
-   }
-
-   else if (pidA == 0) {
-	/* This is child A. */
-	(void) childA_rout();
-
-   }
-
-   else if (pidA == -1) {
-	/*
-	 *  The fork of child A failed.
-	 */
-	 (void) sprintf(mesg,SYS_FAIL,"fork",errno,strerror(errno)); 
-	 tst_brkm(TBROK,NULL,mesg);
-	 (void) write(pipe1_fd[1],CHAR_SET_FAILED,1);
-	 exit(0);
-   }
-
-  /*
-   *  Set to catch the SIGUSR2 with chld1_kill.
-   */
-   if (signal(SIGUSR2,chld1_kill) == SIG_ERR) {
-	tst_brkm(TBROK,NULL,"Could not set to catch the parents signal.");
-	(void) write(pipe1_fd[1],CHAR_SET_FAILED,1);
-	(void) chld1_kill();
-	exit(0);
-   }
-
-  /*
-   *  Set to catch the alarm signal SIGALRM.
-   */
-   if (signal(SIGALRM,notify_timeout) == SIG_ERR) {
-	tst_brkm(TBROK,NULL,"Could not set to catch the childs time out alarm.");
-	(void) write(pipe1_fd[1],CHAR_SET_FAILED,1);
-	(void) chld1_kill();
-	exit(0);
-   }
-
-  /*
-   *  Setting to catch the signals worked now let the children start up.
-   *  Set an alarm which causes a time out on the pipe read loop.
-   *  The children A & B will notify the parent(child1) that set up is complete
-   *  and the pass/fail status of set up.
-   */
-   (void) alarm(TIMEOUT-40);
-
-   while ((read(pipeA_fd[0],pipe_buf,1) != 1) && (alarm_flag == FALSE))
-	/*EMPTY*/;
-   (void) alarm(TIMEOUT-40);
-
-   while ((read(pipeB_fd[0],pipe_buf,1) != 1) && (alarm_flag == FALSE))
-	/*EMPTY*/;
-   (void) alarm(0);	/*Reset the alarm clock.*/
-
-  /*
-   *  Check the alarm flag.
-   */
-   if (alarm_flag == TRUE) {
-	tst_brkm(TBROK,NULL,"The set up of the children failed by timing out.");
-	(void) chld1_kill();
-	(void) write(pipe1_fd[1],CHAR_SET_FAILED,1);
-	exit(0);
-   }
-
-  /*
-   *  Send a set up complete message to the parent.
-   */
-   (void) write(pipe1_fd[1],CHAR_SET_PASSED,1);
-
-  /*
-   *  Pause until the signal SIGUSR1 or SIGUSR2 is sent from the parent.
-   */
-   (void) pause();
-
-  /*
-   *  Pause until signal SIGUSR2 is sent from the parent.
-   *  This pause will only be executed if SIGUSR2 has not been received yet.
-   */
-   while (1) {
-	sleep(1);
-   }
-
-} /*End of child1_rout*/
-
-/*******************************************************************************
- *  This is the routine for child 2, which should not receive the parents signal.
- ******************************************************************************/
-void child2_rout()
-{
-   who_am_i = '2';
-
-  /*
-   * Set the process group of this process to be different
-   * than the other processes.
-   */
-   (void) setpgrp();
-
-  /*
-   *  Set to catch the SIGUSR1 with usr1_rout.
-   */
-   if (signal(SIGUSR1,usr1_rout) == SIG_ERR) {
-	tst_brkm(TBROK,cleanup,"Could not set to catch the parents signal.");
-	(void) write(pipe2_fd[1],CHAR_SET_FAILED,1);
-	exit(0);
-   }
-
-  /* Send a set up complete message to parent.*/
-   (void) write(pipe2_fd[1],CHAR_SET_PASSED,1);
-
-  /*
-   *  Pause until killed by the parent or SIGUSR1 is received.
-   */
-   (void) pause();
-}
-
-
-/*******************************************************************************
- *  This is the routine for child A, which should receive the parents signal.
- ******************************************************************************/
-void childA_rout()
-{
-   who_am_i = 'A';
-
-  /* Send a set up complete message to parent.*/
-   write(pipeA_fd[1],CHAR_SET_PASSED,1);
-
-  /*
-   *  Pause until killed by the parent or SIGUSR1 is received.
-   */
-   (void) pause();
-
-   exit(0);
-} /*End of childA_rout*/
-
-/*******************************************************************************
- *  This is the routine for child B, which should not receive the parents signal.
- ******************************************************************************/
-void childB_rout()
-{
-   who_am_i = 'B';
-
-  /*
-   * Set the process group of this process to be different
-   * than the other processes.
-   */
-   (void) setpgrp();
-
-  /* Send a set up complete message to parent(child 1).*/
-   write(pipeB_fd[1],CHAR_SET_PASSED,1);
-
-  /*
-   *  Pause until killed by the parent(child 1) or SIGUSR1 is received.
-   */
-   (void) pause();
-
-  exit(0);
-}
-
-/*******************************************************************************
- *  This routine sets up the interprocess communication pipes, signal handling,
- *  and process group information.
- ******************************************************************************/
-void
-setup()
-{
-	int errno_buf = 0;	/*indicates the errno if pipe set up fails.		*/
-	int err_flag = FALSE;	/*Indicates if an error has occurred in pipe set up.	*/
-	char mesg[MAXMESG];	/*Used to buffer messages for tst_res.			*/
-
-  /*
-   *  Set the process group ID to be equal between the parent and children.
-   */
-   (void) setpgrp();
-
-  /*
-   *  Set to catch unexpected signals.
-   *  SIGCLD is set to be ignored because we do not wait for termination status.
-   *  SIGUSR1 is set to be ignored because this is the signal we are using for
-   *  the test and we are not concerned with the parent getting it.
-   */
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	if (signal(SIGUSR1,SIG_IGN) == SIG_ERR) {
-	    (void) sprintf(mesg,
-		"Setting to ignore signal SIGCLD failed. Errno: %d, Error message %s.",
-		errno,strerror(errno));
-	    tst_brkm(TBROK,NULL,mesg);
-	    tst_exit();
-	}
-
-	if (signal(SIGCLD,SIG_IGN) == SIG_ERR) {
-	    (void) sprintf(mesg,
-		"Setting to ignore signal SIGCLD failed. Errno: %d, Error message %s.",
-		errno,strerror(errno));
-	    tst_brkm(TBROK,NULL,mesg);
-	    tst_exit();
-	}
-
-    /* Indicate which errnos are expected */
-    TEST_EXP_ENOS(exp_enos);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-
-  /*
-   *  Set up pipe1, pipe2, pipeA, and pipeB.
-   */
-   if ((pipe(pipe1_fd) == -1) || (fcntl(pipe1_fd[0],F_SETFL,O_NDELAY) == -1))
-   {
-	errno_buf = errno;
-	err_flag = TRUE;
-   }
-
-   if ((pipe(pipe2_fd) == -1) || (fcntl(pipe2_fd[0],F_SETFL,O_NDELAY) == -1))
-   {
-	errno_buf = errno;
-	err_flag = TRUE;
-   }
-
-   if ((pipe(pipeA_fd) == -1) || (fcntl(pipeA_fd[0],F_SETFL,O_NDELAY) == -1))
-   {
-	errno_buf = errno;
-	err_flag = TRUE;
-   }
-
-   if ((pipe(pipeB_fd) == -1) || (fcntl(pipeB_fd[0],F_SETFL,O_NDELAY) == -1))
-   {
-	errno_buf = errno;
-	err_flag = TRUE;
-   }
-
-  /*
-   *  Check for errors.
-   */
-   if (err_flag == TRUE)
-   {
-	(void) sprintf(mesg,SYS_FAIL,"pipe",errno_buf,strerror(errno_buf));
-	tst_brkm(TBROK, NULL, mesg);
-	tst_exit();
-   }
-   return;
-
-}
-
-/***********************************************************
- *  This routine indicates that the process caught SIGUSR1.
- **********************************************************/
-void usr1_rout()
-{
-	char mesg[MAXMESG];	/*Used to buffer messages for tst_res.	*/
-
-   switch (who_am_i)
-   {
-	case '1': if (write(pipe1_fd[1],SIG_CAUGHT,1) == -1)
-			tst_resm(TWARN,"Writing signal catching status failed in child 1.");
-		  break;
-	case '2': if (write(pipe2_fd[1],SIG_CAUGHT,1) == -1)
-			tst_resm(TWARN,"Writing signal catching status failed in child 2.");
-		  break;
-	case 'A': if (write(pipeA_fd[1],SIG_CAUGHT,1) == -1)
-			tst_resm(TWARN,"Writing signal catching status failed in child A.");
-		  break;
-	case 'B': if (write(pipeB_fd[1],SIG_CAUGHT,1) == -1)
-			tst_resm(TWARN,"Writing signal catching status failed in child B.");
-		  break;
-	default:
-		  sprintf(mesg,"Unexpected value %d for who_am_i in usr1_rout().",who_am_i);
-		  tst_resm(TWARN,mesg);
-		  break;
-   }
-
-} /*End of usr1_rout*/
-
-
-/***********************************************************
- *  This routine handles the timeout alarm in the parent,
- *  which occurs when the child fails to notify the parent
- *  the status of set up.
- **********************************************************/
-void notify_timeout()
-{
-  alarm_flag = TRUE;
-
-} /*End of notify_timeout*/
-
-/***********************************************************
- *  This routine handles the procedure for removing the 
- *  children forked off during this test.
- **********************************************************/
-void par_kill()
-{
-	char mesg[MAXMESG];	/*Used to buffer messages for tst_res.	*/
-  /*
-   *  Indicate to child1 that it can remove it's children and itself now.
-   */
-   if (kill(pid1,SIGUSR2) == -1 && errno != ESRCH)
-   {
-	(void) sprintf(mesg,SYS_FAIL,"kill",errno,strerror(errno));
-	tst_resm(TWARN,mesg);
-	tst_resm(TWARN,"Child 1 and it's children may still be alive.");
-   }
-
-  /*
-   *  Remove child 2.
-   */
-   if (kill(pid2,SIGKILL) == -1 && errno != ESRCH)
-	tst_resm(TWARN,"Child2 may still be alive.");
-
-  return;
-	
-} /*End of par_kill*/
-
-
-/*********************************************************************
- *  This routine is executed by child 1 when the parent tells it to
- *  remove it's children and itself.
- ********************************************************************/
-void chld1_kill()
-{
-	char mesg[MAXMESG];	/*Used to buffer messages for tst_resm.	*/
-
-  /*
-   *  Remove children A & B.
-   */
-   if (kill(pidA,SIGKILL) == -1 && errno != ESRCH)
-   {
-	(void) sprintf(mesg,
-		"The system call kill failed. Child 1's(A) child may still be alive. Errno: %d, Error message %s.",
-		errno,strerror(errno));
-	tst_resm(TWARN,mesg);
-   }
-   if (kill(pidB,SIGKILL) == -1 && errno != ESRCH)
-   {
-	(void) sprintf(mesg,
-		"The system call kill failed. Child 1's(B) child may still be alive. Errno: %d, Error message %s.",
-		errno,strerror(errno));
-	tst_resm(TWARN,mesg);
-   }
-
-  exit(0);
-
-} /*End of chld1_kill*/
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *              completion or premature exit.
- ***************************************************************/
-void
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}       /* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/kill03.c b/winsup/testsuite/winsup.api/ltp/kill03.c
deleted file mode 100644
index 1de727fd7..000000000
--- a/winsup/testsuite/winsup.api/ltp/kill03.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	kill03.c
- *
- * DESCRIPTION
- *	Test case to check that kill fails when given an invalid signal.
- *
- * ALGORITHM
- *	call setup
- *	loop if the -i option was given
- *	fork a child
- *	execute the kill system call with an invalid signal
- *	check the return value
- *	if return value is not -1
- *		issue a FAIL message, break remaining tests and cleanup
- *	if we are doing functional testing
- *		if the errno was set to 22 (invalid argument).
- *			issue a PASS message
- *		otherwise
- *			issue a FAIL message
- *	call cleanup
- *
- * USAGE
- *  kill03 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	none
- */
-
-#include "test.h"
-#include "usctest.h"
-
-#include <signal.h>
-#include <errno.h>
-#include <sys/wait.h>
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID= "kill03()";
-int TST_TOTAL = 1;
-
-extern int Tst_count;
-
-int exp_enos[] = {EINVAL, 0};
-
-#define TEST_SIG 2000
-
-int
-main(int ac, char **av)
-{
-	int lc;                         /* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-	pid_t pid;			
-	int exno, status;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();                        /* global setup */
-
-	TEST_EXP_ENOS(exp_enos);
-
-	/* The following loop checks looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-		status = 1;
-		exno = 1;
-		pid = fork();
-		if (pid < 0) {
-			tst_brkm(TBROK, cleanup, "Fork of child failed");
-		} else if (pid == 0) {
-			pause();
-			/*NOTREACHED*/
-			exit(exno);
-		} else {
-			TEST(kill(pid, TEST_SIG));
-			kill(pid, SIGKILL);
-			waitpid(pid, &status, 0);
-		}
-
-		if (TEST_RETURN != -1) {
-			tst_brkm(TFAIL, cleanup, "%s failed - errno = %d : %s "
-				"Expected a return value of -1 got %d",
-				TCID, TEST_ERRNO, strerror(TEST_ERRNO)),
-				TEST_RETURN;
-			/*NOTREACHED*/
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Check to see if the errno was set to the expected
-			 * value of 22 : EINVAL.
-			 */
-			TEST_ERROR_LOG(TEST_ERRNO);
-			if (TEST_ERRNO == EINVAL) {
-				tst_resm(TPASS, "errno set to %d : %s, as "
-					"expected", TEST_ERRNO,
-					strerror(TEST_ERRNO));
-			} else {
-				tst_resm(TFAIL, "errno set to %d : %s expected "
-					"%d : %s", TEST_ERRNO,
-					strerror(TEST_ERRNO), 22, strerror(22));
-			}
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * or premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing status if that option was specified.
-	 * print errno log if that option was specified
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/kill04.c b/winsup/testsuite/winsup.api/ltp/kill04.c
deleted file mode 100644
index a7b3274c3..000000000
--- a/winsup/testsuite/winsup.api/ltp/kill04.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	kill04.c
- *
- * DESCRIPTION
- *	Test case to check that kill() fails when passed a non-existant pid.
- *
- * ALGORITHM
- *	call setup
- *	loop if the -i option was given
- *	fork a child
- *	execute the kill system call with a non-existant PID
- *	check the return value
- *	if return value is not -1
- *		issue a FAIL message, break remaining tests and cleanup
- *	if we are doing functional testing
- *		if the errno was set to 3 (No such proccess)
- *			issue a PASS message
- *		otherwise
- *			issue a FAIL message
- *	call cleanup
- *
- * USAGE
- *  kill04 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	This test should be run by a non-root user
- */
-
-#include "test.h"
-#include "usctest.h"
-
-#include <signal.h>
-#include <errno.h>
-#include <sys/wait.h>
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID= "kill04()";
-int TST_TOTAL = 1;
-
-extern int Tst_count;
-
-int exp_enos[] = {ESRCH, 0};
-
-#define TEST_SIG SIGKILL
-
-int
-main(int ac, char **av)
-{
-	int lc;                         /* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-	pid_t pid, fake_pid;
-	int exno, status, fake_status, nsig;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();                        /* global setup */
-
-	TEST_EXP_ENOS(exp_enos);
-
-	/* The following loop checks looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-		status = 1;
-		exno = 1;
-		pid = fork();
-		if (pid < 0) {
-			tst_brkm(TBROK, cleanup, "Fork failed");
-		} else if (pid == 0) {
-			pause();
-			/*NOTREACHED*/
-			exit(exno);
-		} else {
-			fake_pid = fork();
-			if (fake_pid < 0) {
-				tst_brkm(TBROK, cleanup, "Second fork failed");
-			} else if (fake_pid == 0) {
-				pause();
-				/*NOTREACHED*/
-				exit(exno);
-			}
-			kill(fake_pid, TEST_SIG);
-			waitpid(fake_pid, &fake_status, 0);
-			TEST(kill(fake_pid, TEST_SIG));
-			kill(pid, TEST_SIG);
-			waitpid(pid, &status, 0);
-		}
-
-		if (TEST_RETURN != -1) {
-			tst_brkm(TFAIL, cleanup, "%s failed - errno = %d : %s "
-				"Expected a return value of -1 got %d",
-				TCID, TEST_ERRNO, strerror(TEST_ERRNO)),
-				TEST_RETURN;
-			/*NOTREACHED*/
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Check to see if the errno was set to the expected
-			 * value of 3 : ESRCH
-			 */
-			nsig = WTERMSIG(status);
-			TEST_ERROR_LOG(TEST_ERRNO);
-			if (TEST_ERRNO == ESRCH) {
-				tst_resm(TPASS, "errno set to %d : %s, as "
-					"expected", TEST_ERRNO,
-					strerror(TEST_ERRNO));
-			} else {
-				tst_resm(TFAIL, "errno set to %d : %s expected "
-					"%d : %s", TEST_ERRNO,
-					strerror(TEST_ERRNO), 3, strerror(3));
-			}
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * or premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing status if that option was specified.
-	 * print errno log if that option was specified
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/kill09.c b/winsup/testsuite/winsup.api/ltp/kill09.c
deleted file mode 100644
index 3b4c24fb5..000000000
--- a/winsup/testsuite/winsup.api/ltp/kill09.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: kill09
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for kill(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) kill(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the kill(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	kill(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-void alarm_handler(int sig);
-
-
-
-
-const char *TCID="kill09"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int fork_pid;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    int status;
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* make a child process so we can kill it */
-	/* If we cannot fork => we cannot test kill, so break and exit */
-        if ((fork_pid=fork()) == -1) {
-           tst_brkm(TBROK, cleanup,
-		    "fork() Failure. errno=%d : %s",
-		    errno, strerror(errno));
-        }
-
-	if (fork_pid == 0) {
-	    /* CHILD */
-	    /*
-	     * Setup alarm signal if we don't get the signal to prevent this process
-	     * from hanging around forever.
-	     */
-	    signal(SIGALRM, alarm_handler);
-	    alarm(20);
-            pause();
-            exit(1);
-        }
-
-	/* PARENT */
-	/* 
-	 * Call kill(2)
-	 */
-	TEST(kill(fork_pid, SIGKILL));
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "kill(%d, SIGKILL) Failed, errno=%d : %s", fork_pid,
-	 	     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "kill(%d, SIGKILL) returned %d", fork_pid, TEST_RETURN);
-	    } 
-	}
-
-	/*
-	 * wait for process to cleanup zombies.
-	 * 
-	 */
-	waitpid(0, &status, WNOHANG);
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    (void) signal(SIGCHLD, SIG_IGN);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-void
-alarm_handler(int sig)
-{
-    exit(8);
-}
diff --git a/winsup/testsuite/winsup.api/ltp/link02.c b/winsup/testsuite/winsup.api/ltp/link02.c
deleted file mode 100644
index 84c53c23c..000000000
--- a/winsup/testsuite/winsup.api/ltp/link02.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: link02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for link(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) link(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the link(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	link(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="link02"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char Fname[255], Lname[255];
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    struct stat fbuf, lbuf;
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-        /*
-	 *  Call link(2)
-	 */
-	TEST(link(Fname, Lname));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "link(%s, %s) Failed, errno=%d : %s",
-		     Fname, Lname, TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		stat(Fname, &fbuf);
-		stat(Lname, &lbuf);
-		if ( fbuf.st_nlink > 1 && lbuf.st_nlink > 1 &&
-			fbuf.st_nlink == lbuf.st_nlink )
-
-		    tst_resm(TPASS, "link(%s, %s) returned %d and link cnts match",
-			 Fname, Lname, TEST_RETURN);
-		else {
-		    tst_resm(TFAIL,
-			"link(%s, %s) returned %d, stat link cnts do not match %d %d",
-			Fname, Lname, TEST_RETURN, fbuf.st_nlink,
-			lbuf.st_nlink);
-		}
-	    } 
-	    if (unlink(Lname) == -1) {
-		tst_resm(TWARN, "unlink(%s) Failed, errno=%d : %s",
-			Fname, errno, strerror(errno));
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    int fd;
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    strcpy(Fname, "tfile");
-    if ((fd = open(Fname, O_RDWR|O_CREAT, 0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT, 0700) Failed, errno=%d : %s",
-		Fname, errno, strerror(errno));
-    } else if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-	       Fname, errno, strerror(errno));
-    }
-    strcpy(Lname, "lfile");
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/link03.c b/winsup/testsuite/winsup.api/ltp/link03.c
deleted file mode 100644
index 38c16af72..000000000
--- a/winsup/testsuite/winsup.api/ltp/link03.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: link03
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: multi links tests
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 03/31/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) link(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- *	-N #links : Use #links links every iteration
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the link(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	link(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup(); 
-void help();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="link03";		/* Test program identifier.    */
-int TST_TOTAL=2;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-extern int Tst_nobuf;
-
-int exp_enos[]={0, 0};
-
-#define BASENAME	"lkfile"
-
-char Basename[255];
-char Fname[255];
-int Nlinks=0;
-char *Nlinkarg;
-
-int Nflag=0;
-
-
-/* for test specific parse_opts options */
-option_t options[] = {
-        { "N:",  &Nflag, &Nlinkarg },   /* -N #links */
-        { NULL, NULL, NULL }
-};
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    struct stat fbuf, lbuf;
-    int cnt;
-    int nlinks;
-    char lname[255];
-
-    Tst_nobuf=1;
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, options, &help)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    if ( Nflag ) {
-	if (sscanf(Nlinkarg, "%i", &Nlinks) != 1 ) {
-	    tst_brkm(TBROK, NULL, "--N option arg is not a number");
-	    tst_exit();
-	}
-	if ( Nlinks > 1000 ) {
-	    tst_resm(TWARN, "--N option arg > 1000 - may get errno:%d (EMLINK)",
-		EMLINK);
-	}
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	if ( Nlinks )
-	    nlinks = Nlinks;
-	else
-	    /* min of 10 links and max of a 100 links */
-	    nlinks = (lc%90)+10;
-
-	for(cnt=1; cnt < nlinks; cnt++) {
-	
-	    sprintf(lname, "%s%d", Basename, cnt);
-            /*
-	     *  Call link(2)
-	     */
-	    TEST(link(Fname, lname));
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-	        TEST_ERROR_LOG(TEST_ERRNO);
-	        tst_brkm(TFAIL, cleanup, "link(%s, %s) Failed, errno=%d : %s",
-		     Fname, lname, TEST_ERRNO, strerror(TEST_ERRNO));
-	    } 
-	}
-	    
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	    stat(Fname, &fbuf);
-
-	    for(cnt=1; cnt < nlinks; cnt++) {
-                sprintf(lname, "%s%d", Basename, cnt);
-
-		stat(lname, &lbuf);
-		if ( fbuf.st_nlink <= 1 || lbuf.st_nlink <= 1 ||
-			(fbuf.st_nlink != lbuf.st_nlink) ) {
-
-		    tst_resm(TFAIL,
-			"link(%s, %s[1-%d]) ret %d for %d files, stat values do not match %d %d",
-			Fname, Basename, nlinks, TEST_RETURN, nlinks,
-			fbuf.st_nlink, lbuf.st_nlink);
-		    break;
-		}
-	    }
-	    if ( cnt >= nlinks ) {
-		tst_resm(TPASS,
-		    "link(%s, %s[1-%d]) ret %d for %d files, stat linkcounts match %d",
-		    Fname, Basename, nlinks, TEST_RETURN, nlinks,
-		    fbuf.st_nlink);
-	    }
-	} 
-	else
-	    Tst_count++;
-
-	for(cnt=1; cnt < nlinks; cnt++) {
-        
-            sprintf(lname, "%s%d", Basename, cnt);
-
-	    if (unlink(lname) == -1) {
-		tst_res(TWARN, "unlink(%s) Failed, errno=%d : %s",
-			Fname, errno, strerror(errno));
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * help
- ***************************************************************/
-void
-help()
-{
-    printf("  -N #links : create #links hard links every iteration\n");
-}
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    int fd;
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(Fname,"%s_%d", BASENAME, getpid());
-    if ((fd = open(Fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		Fname, errno, strerror(errno));
-    } else if (close(fd) == -1) {
-       tst_res(TWARN, "close(%s) Failed, errno=%d : %s",
-	       Fname, errno, strerror(errno));
-    }
-    sprintf(Basename, "%s_%d.", BASENAME, getpid());
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/link04.c b/winsup/testsuite/winsup.api/ltp/link04.c
deleted file mode 100644
index b3453b5d0..000000000
--- a/winsup/testsuite/winsup.api/ltp/link04.c
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: link04
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Negative test cases for link(2).
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 14
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 03/30/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1-14.) link(2) returns...(See Test_cases structure below)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- *	Standard tst_res output formt.
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the link(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	link(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/param.h>		/* for PATH_MAX */
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-extern char *get_high_address();
-
-const char *TCID="link04"; 		/* Test program identifier.    */
-int TST_TOTAL=14;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int longpath_setup();
-int no_setup();
-int filepath_setup();
-int filepath2_setup();
-char Longpathname[PATH_MAX+2];
-char High_address[64];
-int dir_setup();
-
-struct test_case_t {
-   const char *file1;
-   const char *desc1;
-   const char *file2;
-   const char *desc2;
-   int exp_errno;
-   int (*setupfunc1)();
-   int (*setupfunc2)();
-} Test_cases[] = {
-    /* This test program should contain test cases where link */
-    /* will fail regardless of who executed it (i.e. joe-user or root) */
-
-    /* first path is invalid */
-
-    { "nonexistfile", "non-existent file", "nefile", "nefile",
-	ENOENT, no_setup, no_setup},
-
-    { "", "path is empty string", "nefile", "nefile",
-	ENOENT, no_setup, no_setup},
-
-    { "neefile/file", "path contains a non-existent file",  "nefile", "nefile",
-        ENOENT, no_setup, no_setup },
-
-#ifndef __CYGWIN__
-    { "regfile/file", "path contains a regular file",  "nefile", "nefile",
-        ENOTDIR, filepath_setup, no_setup },
-#endif
-
-    { Longpathname, "pathname too long", "nefile", "nefile",
-	ENAMETOOLONG, longpath_setup, no_setup },
-
-    { High_address, "address beyond address space", "nefile", "nefile",
-	EFAULT, no_setup, no_setup },
-
-    { (char *)-1, "negative address", "nefile", "nefile",
-	EFAULT, no_setup, no_setup },
-
-    /* second path is invalid */
-
-    { "regfile", "regfile", "", "empty string",
-	ENOENT, no_setup, no_setup},
-
-    { "regfile", "regfile", "neefile/file", "path contains a non-existent file",
-	ENOENT, filepath_setup, no_setup},
-
-    { "regfile", "regfile", "file/file", "path contains a regular file",
-	ENOENT, filepath_setup, no_setup},
-
-    { "regfile", "regfile", Longpathname, "pathname too long",
-	ENAMETOOLONG, no_setup, longpath_setup },
-
-    { "regfile", "regfile", High_address, "address beyond address space",
-	EFAULT, no_setup, no_setup },
-
-    { "regfile", "regfile", (char *)-1, "negative address",
-	EFAULT, no_setup, no_setup},
-
-    /* two existing files */
-
-    { "regfile", "regfile", "regfile2", "regfile2",
-	EEXIST, filepath_setup, filepath2_setup },
-
-    { NULL, NULL, NULL, NULL, 0, no_setup, no_setup }
-};
-
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    const char *fname1, *fname2;
-    const char *desc1, *desc2;
-    int ind;
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-        for (ind=0; Test_cases[ind].desc1 != NULL; ind++ ) {
-
-            fname1 = Test_cases[ind].file1;
-            desc1 = Test_cases[ind].desc1;
-            fname2 = Test_cases[ind].file2;
-            desc2 = Test_cases[ind].desc2;
-
-	    if ( fname1 == High_address )
-		fname1 = get_high_address();
-
-	    if ( fname2 == High_address )
-		fname2 = get_high_address();
-
-            /*
-             *  Call link(2)
-             */
-            TEST(link(fname1, fname2));
-
-            /* check return code */
-            if ( TEST_RETURN == -1 ) {
-                if ( STD_FUNCTIONAL_TEST ) {
-                    if ( TEST_ERRNO == Test_cases[ind].exp_errno )
-                        tst_resm(TPASS, "link(<%s>, <%s>) Failed, errno=%d",
-                            desc1, desc2, TEST_ERRNO);
-                    else
-                        tst_resm(TFAIL,
-                            "link(<%s>, <%s>) Failed, errno=%d, expected errno:%d",
-                            desc1, desc2, TEST_ERRNO, Test_cases[ind].exp_errno);
-                }
-                else
-                   Tst_count++;
-            } else  {
-                tst_resm(TFAIL,
-                    "link(<%s>, <%s>) returned %d, expected -1, errno:%d",
-                    desc1, desc2, TEST_RETURN, Test_cases[ind].exp_errno);
-            }
-        }
-
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    int ind;
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    for (ind=0; Test_cases[ind].desc1 != NULL; ind++ ) {
-        Test_cases[ind].setupfunc1();
-        Test_cases[ind].setupfunc2();
-    }
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-/******************************************************************
- *
- ******************************************************************/
-int
-no_setup()
-{
-    return 0;
-}
-
-/******************************************************************
- *
- ******************************************************************/
-int
-longpath_setup()
-{
-   int ind;
-
-    static int alreadycalled = 0;
-
-    if ( alreadycalled ) 
-	return 0;
-    alreadycalled++;
-	
-    for(ind=0; ind<= PATH_MAX+1; ind++) {
-        Longpathname[ind] = 'a';
-    }
-    return 0;
-
-}
-
-/******************************************************************
- *
- ******************************************************************/
-int
-filepath2_setup()
-{
-    int fd;
-    static int alreadycalled = 0;
-
-    if ( alreadycalled ) 
-	return 0;
-    alreadycalled++;
-
-    if ( (fd=creat("regfile2", 0777)) == -1 ) {
-        tst_brkm(TBROK, cleanup, "creat(regfile2, 0777) failed, errno:%d %s",
-            errno, strerror(errno));
-    }
-    close(fd);
-    return 0;
-}
-/******************************************************************
- *
- ******************************************************************/
-int
-filepath_setup()
-{
-    int fd;
-    static int alreadycalled = 0;
-
-    if ( alreadycalled ) 
-	return 0;
-    alreadycalled++;
-
-    if ( (fd=creat("regfile", 0777)) == -1 ) {
-        tst_brkm(TBROK, cleanup, "creat(regfile, 0777) failed, errno:%d %s",
-            errno, strerror(errno));
-    }
-    close(fd);
-    return 0;
-}
-
-/******************************************************************
- *
- ******************************************************************/
-int
-dir_setup()
-{
-    static int alreadycalled = 0;
-
-    if ( alreadycalled ) 
-	return 0;
-    alreadycalled++;
-
-    if ( mkdir("dir", 0777) == -1 ) {
-        tst_brkm(TBROK, cleanup,
-	    "mkdir(dir, 0700) Failed, errno=%d : %s",
-	    errno, strerror(errno));
-    }
-
-    return 0;
-}
diff --git a/winsup/testsuite/winsup.api/ltp/link05.c b/winsup/testsuite/winsup.api/ltp/link05.c
deleted file mode 100644
index 9387c25a8..000000000
--- a/winsup/testsuite/winsup.api/ltp/link05.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: link05
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: multi links (EMLINK) negative test
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 3
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 03/31/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) link(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the link(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	link(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-void help();
-
-
-
-const char *TCID="link05"; 	/* Test program identifier.    */
-#ifdef CRAY
-int TST_TOTAL=2;    		/* Total number of test cases. */
-#else
-int TST_TOTAL=1;    		/* Total number of test cases. */
-#endif
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-#define BASENAME	"lkfile"
-
-char Basename[255];
-char Fname[255];
-
-int Nflag=0;
-char *Noptlinks;
-
-/* for test specific parse_opts options */
-option_t options[] = {
-        { "N:", &Nflag, &Noptlinks },  /* -N option */
-        { NULL, NULL, NULL }
-};
-
-int nlinks = 1000;
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    struct stat fbuf, lbuf;
-    int cnt;
-    char lname[255];
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, options, &help)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    if ( Nflag ) {
-	if ( sscanf(Noptlinks, "%i", &nlinks) != 1 ) {
-	    tst_brkm(TBROK, cleanup, "-N option invalid, must be numeric");
-	}
-    } 
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	for(cnt=1; cnt < nlinks; cnt++) {
-	
-	    sprintf(lname, "%s%d", Basename, cnt);
-            /*
-	     *  Call link(2)
-	     */
-	    TEST(link(Fname, lname));
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-	        tst_resm(TFAIL, "link(%s, %s) Failed, errno=%d : %s",
-		     Fname, lname, TEST_ERRNO, strerror(TEST_ERRNO));
-	    } 
-	}
-	    
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	    stat(Fname, &fbuf);
-
-	    for(cnt=1; cnt < nlinks; cnt++) {
-                sprintf(lname, "%s%d", Basename, cnt);
-
-		stat(lname, &lbuf);
-		if ( fbuf.st_nlink <= 1 || lbuf.st_nlink <= 1 ||
-			(fbuf.st_nlink != lbuf.st_nlink) ) {
-
-		    tst_resm(TFAIL,
-			"link(%s, %s[1-%d]) ret %d for %d files, stat values do not match %d %d",
-			Fname, Basename, nlinks, TEST_RETURN, nlinks,
-			fbuf.st_nlink, lbuf.st_nlink);
-		    break;
-		}
-	    }
-	    if ( cnt >= nlinks ) {
-		tst_resm(TPASS,
-		    "link(%s, %s[1-%d]) ret %d for %d files, stat linkcounts match %d",
-		    Fname, Basename, nlinks, TEST_RETURN, nlinks,
-		    fbuf.st_nlink);
-	    }
-	} 
-	else
-	    Tst_count++;
-
-#ifdef CRAY
-/*
- * IRIX (xfs) systems do not have the 1000 link limit.
- * I tried 100000 links on 2/97 without error on IRIX 6.4.
- */
-	/*
-	 * Now check that one more link will put you over the top
-	 */
-        sprintf(lname, "%s%d", Basename, cnt);
-
-        /*
-         *  Call link(2)
-         */
-        TEST(link(Fname, lname));
-
-        /* check return code */
-        if ( TEST_RETURN == -1 ) {
-	    if ( STD_FUNCTIONAL_TEST ) {
-		if ( TEST_ERRNO == EMLINK ) {
-	            tst_resm(TPASS,
-			"link(%s, %s) ret %d on %d link, errno:%d",
-	                Fname, lname, TEST_RETURN, nlinks+1, EMLINK);
-		}
-		else {
-	            tst_resm(TFAIL,
-			"link(%s, %s) ret %d on %d link, errno:%d, expected -1, errno:%d",
-	                Fname, lname, TEST_RETURN, nlinks+1, 
-			TEST_ERRNO, EMLINK);
-		}
-	    }
-	    else
-		Tst_count++;
-	}
-	else {
-	    tst_resm(TFAIL, "link(%s, %s) ret %d on %d link, expected -1, errno:%d",
-	        Fname, lname, TEST_RETURN, nlinks+1, EMLINK);
-	}
-#endif /* CRAY */
-
-	for(cnt=1; cnt < nlinks; cnt++) {
-        
-            sprintf(lname, "%s%d", Basename, cnt);
-
-	    if (unlink(lname) == -1) {
-		tst_res(TWARN, "unlink(%s) Failed, errno=%d : %s",
-			Fname, errno, strerror(errno));
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * help
- ***************************************************************/
-void
-help()
-{
-    printf("  -N #links : create #links hard links every iteration\n");
-}
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    int fd;
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(Fname,"%s_%d", BASENAME, getpid());
-    if ((fd = open(Fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		Fname, errno, strerror(errno));
-    } else if (close(fd) == -1) {
-       tst_res(TWARN, "close(%s) Failed, errno=%d : %s",
-	       Fname, errno, strerror(errno));
-    }
-    sprintf(Basename, "%s_%d.", BASENAME, getpid());
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/lseek01.c b/winsup/testsuite/winsup.api/ltp/lseek01.c
deleted file mode 100644
index 22d0c6c39..000000000
--- a/winsup/testsuite/winsup.api/ltp/lseek01.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: lseek01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for lseek(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 3
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) lseek(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the lseek(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	lseek(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="lseek01"; 		/* Test program identifier.    */
-int TST_TOTAL=3;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char Fname[255];
-int Fd;
-
-int Whence[] = {SEEK_SET, SEEK_CUR, SEEK_END, -1};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-
-    int ind;
-    int offset;
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	offset=(lc%100)*4096;	/* max size is 100 blocks */
-
-	for (ind=0; Whence[ind] >= 0; ind++) {
-
-            /*
-             *  Call lseek(2)
-             */
-	    TEST(lseek(Fd, (long)offset, Whence[ind]));
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-	        TEST_ERROR_LOG(TEST_ERRNO);
-	        tst_resm(TFAIL, "lseek(%s, %ld, 0) Failed, errno=%d : %s",
-		    Fname, offset, TEST_ERRNO, strerror(TEST_ERRNO));
-	    } else {
-	    
-	        /***************************************************************
-	         * only perform functional verification if flag set (-f not given)
-	         ***************************************************************/
-	        if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "lseek(%s, %ld, %d) returned %d", Fname,
-		        offset, Whence[ind], TEST_RETURN);
-	        } 
-	        else
-		    Tst_count++;
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(Fname, "tfile_%d",getpid());
-    if ((Fd = open(Fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		Fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the file we have open */
-    if (close(Fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", Fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/lseek02.c b/winsup/testsuite/winsup.api/ltp/lseek02.c
deleted file mode 100644
index 04fa3f10f..000000000
--- a/winsup/testsuite/winsup.api/ltp/lseek02.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: lseek02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Negative test for lseek(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 04/25/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) lseek(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the lseek(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	lseek(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="lseek02"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-
-int Whence[] = {SEEK_SET, SEEK_CUR, SEEK_END, -1};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-        /*
-         *  Call lseek(2)
-         */
-	TEST( lseek(-1, (long)1, SEEK_SET) );
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    if ( STD_FUNCTIONAL_TEST ) {
-
-		if ( TEST_ERRNO == EBADF )
-
-	            tst_resm(TPASS,
-			"lseek(-1, 1, SEEK_SET) Failed, errno=%d : %s",
-		        TEST_ERRNO, strerror(TEST_ERRNO));
-		else
-	            tst_resm(TFAIL,
-			"lseek(-1, 1, SEEK_SET) Failed, errno=%d : %s, expected %d(EBADF)",
-		        TEST_ERRNO, strerror(TEST_ERRNO), EBADF);
-		
-	    }
-	    else
-		Tst_count++;
-
-	} else {
-	    
-	    tst_resm(TFAIL, "lseek(-1, 1, SEEK_SET) returned %d", 
-		TEST_RETURN);
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/lseek03.c b/winsup/testsuite/winsup.api/ltp/lseek03.c
deleted file mode 100644
index 51c303d85..000000000
--- a/winsup/testsuite/winsup.api/ltp/lseek03.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: lseek03
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Negative test for lseek(2) whence
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 04/25/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) lseek(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the lseek(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	lseek(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-void rec_sigsys(int);
-
-const char *TCID="lseek03"; 		/* Test program identifier.    */
-int TST_TOTAL=3;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-char fname[255];
-int fd;
-int Rec_sigsys = 0;
-
-int Whences[] = { 4, -1, 7 };
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-
-    unsigned ind;
-    int whence;
-
-    TST_TOTAL=sizeof(Whences)/sizeof(int);
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-
-    signal(SIGSYS, rec_sigsys);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	for (ind=0; ind<sizeof(Whences)/sizeof(int); ind++) {
-		
-	    whence=Whences[ind];
-
-	    /*
-	     * On IRIX systems, the SIGSYS signal is also sent.
-	     */
-	    Rec_sigsys=0;
-
-            /*
-             *  Call lseek(2)
-             */
-	    TEST(lseek(fd, (long)1, whence));
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-		if ( STD_FUNCTIONAL_TEST ) {
-
-	          if ( TEST_ERRNO == EINVAL )
-#if defined(sgi)
-		    if ( Rec_sigsys ) {
-	                tst_resm(TPASS,
-			    "lseek(%s, 1, %d) Failed as expected, errno=%d : %s\n\
-and SIGSYS signal was received.",
-		            fname, whence, TEST_ERRNO, strerror(TEST_ERRNO));
-		    } else {
-	                tst_resm(TFAIL,
-			    "lseek(%s, 1, %d) Failed as expected, errno=%d : %s\n\
-But SIGSYS signal was NOT received.",
-		            fname, whence, TEST_ERRNO, strerror(TEST_ERRNO));
-		    }
-#elif defined(linux) || defined (__CYGWIN__)
-	            tst_resm(TPASS,
-			    "lseek(%s, 1, %d) Failed, errno=%d : %s",
-		            fname, whence, TEST_ERRNO, strerror(TEST_ERRNO));
-#endif
-		  else
-	            tst_resm(TFAIL,
-			"lseek(%s, 1, %d) Failed, errno=%d %s, expected %d(EINVAL)",
-		        fname, whence, TEST_ERRNO, strerror(TEST_ERRNO),
-			EINVAL);
-		}
-	 
-		else
-		    Tst_count++;
-	    } else {
-	    
-	        tst_resm(TFAIL, "lseek(%s, 1, %d) returned %d",
-		    fname, whence, TEST_RETURN);
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/*
- * signal handler for the SIGSYS signal.
- */
-void
-rec_sigsys(int sig)
-{
-    Rec_sigsys++;
-
-    signal(sig, rec_sigsys);
-}
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the file we have open */
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/lseek04.c b/winsup/testsuite/winsup.api/ltp/lseek04.c
deleted file mode 100644
index faba3f1bf..000000000
--- a/winsup/testsuite/winsup.api/ltp/lseek04.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: lseek04
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Negative test for lseek(2) of a fifo
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 04/25/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) lseek(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the lseek(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	lseek(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="lseek04";		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char Fname[255];
-int Fd;
-
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-        /*
-         *  Call lseek(2)
-         */
-	TEST(lseek(Fd, (long)1, SEEK_SET));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    if ( STD_FUNCTIONAL_TEST ) {
-
-	        if ( TEST_ERRNO == ESPIPE )
-	            tst_resm(TPASS,
-		        "lseek(fifofd, 1, SEEK_SET) Failed, errno=%d : %s",
-		        TEST_ERRNO, strerror(TEST_ERRNO));
-	         else
-	            tst_resm(TFAIL,
-			"lseek(fifofd, 1, SEEK_SET) Failed, errno=%d %s, expected %d(ESPIPE)",
-		        TEST_ERRNO, strerror(TEST_ERRNO),
-			EINVAL);
-	    }
-	    else
-	       Tst_count++;
-	} else {
-	    
-	        tst_resm(TFAIL, "lseek(fifofd, 1, SEEK_SET) returned %d",
-		    TEST_RETURN);
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(Fname,"tfile_%d",getpid());
-    if ( mkfifo(Fname,0700) == -1) {
-        tst_brkm(TBROK, cleanup,
-	    "mkfifo(%s, 0700) Failed, errno=%d : %s",
-	    Fname, errno, strerror(errno));
-    }
-
-    if ( (Fd=open(Fname, O_RDWR, 0777)) == -1) {
-        tst_brkm(TBROK, cleanup,
-	    "open(%s, O_RDWR, 0777) Failed, errno=%d : %s",
-	    Fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the file we have open */
-    if (close(Fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", Fname, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/lseek05.c b/winsup/testsuite/winsup.api/ltp/lseek05.c
deleted file mode 100644
index 8867086bd..000000000
--- a/winsup/testsuite/winsup.api/ltp/lseek05.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: lseek05
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Negative test for lseek(2) of a pipe
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 04/25/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) lseek(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the lseek(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	lseek(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="lseek05";		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int Fd;
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-        /*
-         *  Call lseek(2)
-         */
-	TEST(lseek(Fd, (long)1, SEEK_SET));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    if ( STD_FUNCTIONAL_TEST ) {
-
-	        if ( TEST_ERRNO == ESPIPE )
-	            tst_resm(TPASS,
-		        "lseek(pipefd, 1, SEEK_SET) Failed, errno=%d : %s",
-		        TEST_ERRNO, strerror(TEST_ERRNO));
-	         else
-	            tst_resm(TFAIL,
-			"lseek(pipefd, 1, SEEK_SET) Failed, errno=%d %s, expected %d(ESPIPE)",
-		        TEST_ERRNO, strerror(TEST_ERRNO),
-			EINVAL);
-	    }
-	    else
-	       Tst_count++;
-	} else {
-	    
-	        tst_resm(TFAIL, "lseek(pipefd, 1, SEEK_SET) returned %d",
-		    TEST_RETURN);
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    int fds[2];
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    if ( pipe(fds) == -1) {
-	tst_brkm(TBROK, cleanup,
-	    "pipe(&fds) Failed, errno=%d : %s", errno, strerror(errno));
-    }
-    Fd = fds[0];
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the file we have open */
-    if (close(Fd) == -1) {
-       tst_resm(TWARN, "close(%d) Failed, errno=%d : %s", Fd, errno, strerror(errno));
-    }
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/lseek06.c b/winsup/testsuite/winsup.api/ltp/lseek06.c
deleted file mode 100644
index f62c3422c..000000000
--- a/winsup/testsuite/winsup.api/ltp/lseek06.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: lseek01
- *
- * Test Description:
- *  Verify that, lseek() call succeeds to set the file pointer position 
- *  to less  than  or equal to the file size, when a file is opened for
- *  read or write.
- *
- * Expected Result:
- *  lseek() should return the offset from the beginning of the file measured
- *  in bytes. Also check if able to read valid data from this location.
- *   
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *   Create temporary directory.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  lseek01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <utime.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define OFFSET		4
-#define TEMP_FILE	"tmp_file"
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-
-const char *TCID="lseek01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int fildes;			/* file handle for temp file */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	char read_buf[1];	/* data read from temp. file */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Invoke lseek(2) to move the read/write file
-		 * pointer/handle by OFFSET bytes.
-		 */
-		TEST(lseek(fildes, OFFSET, SEEK_SET));
-
-		/* check return code of lseek(2) */
-		if (TEST_RETURN == (off_t)-1) {
-			tst_resm(TFAIL, "lseek on (%s) Failed, errno=%d : %s",
-				 TEMP_FILE, TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Check if the return value from lseek(2)
-			 * is equal to the specified OFFSET value.
-			 */
-			if (TEST_RETURN != OFFSET) {
-				tst_resm(TFAIL, "lseek() returned incorrect "
-					 "value %d, expected %d",
-					 TEST_RETURN, OFFSET);
-				continue;
-			}
-			/*
-			 * The return value is good, now check data.
-			 * Read the data byte from this location.
-			 */
-			if (read(fildes, &read_buf, sizeof(read_buf)) < 0) {
-				tst_brkm(TFAIL, cleanup, "read() failed "
-					 "on %s, error=%d", TEMP_FILE, errno);
-			} else {
-				/*
-				 * Check if read byte is the expected character.
-				 * For pos 4 ---> 'e'
-				 */
-				if (read_buf[0] != 'e') {
-					tst_resm(TFAIL, "Incorrect data read "
-						 "from file %s", TEMP_FILE);
-				} else {
-					tst_resm(TPASS, "Functionality "
-						 "of lseek() on %s "
-						 "successful", TEMP_FILE);
-				}
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *	     Create a temporary directory and change directory to it.
- *	     Create a test file under temporary directory and write some
- *	     data into it. 
- */
-void 
-setup()
-{
-	char write_buf[BUFSIZ];		/* buffer to hold data */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Get the data to be written to temporary file */
-	strcpy(write_buf, "abcdefg");
-
-	/* Creat/open a temporary file under above directory */
-	if ((fildes = open(TEMP_FILE, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEMP_FILE, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Write data into temporary file */
-	if(write(fildes, write_buf, strlen(write_buf)) != (int)strlen(write_buf)) {
-		tst_brkm(TBROK, cleanup, "write(2) on %s Failed, errno=%d : %s",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *	       Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the temporary file created */
-	if (close(fildes) < 0) {
-		tst_brkm(TFAIL, NULL, "close(%s) Failed, errno=%d : %s:",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/lseek07.c b/winsup/testsuite/winsup.api/ltp/lseek07.c
deleted file mode 100644
index c5a27b5b3..000000000
--- a/winsup/testsuite/winsup.api/ltp/lseek07.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: lseek02
- *
- * Test Description:
- *  Verify that, lseek() call succeeds to set the file pointer position
- *  to more than the file size, when a file is opened for reading/writing.
- *
- * Expected Result:
- *  lseek() should return n+1, where n is the size of the file.
- *  Also when some data is written into this file it should start
- *  from that offset.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *   Create temporary directory.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  lseek02 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <utime.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMP_FILE	"tmp_file"
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-
-const char *TCID="lseek02";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int fildes;			/* file handle for temp file */
-size_t  file_size;		/* size of temporary file */
-char write_buf1[BUFSIZ];	/* buffer to hold data */
-char write_buf2[BUFSIZ];	/* buffer to hold data */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	char read_buf[BUFSIZ];	/* data read from temp. file */
-	off_t offset;		/* byte position in temporary file */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* Set the offset position */
-		offset = file_size + (lc * strlen(write_buf2));
-
-		/* 
-		 * Invoke lseek(2) to move the write file
-		 * pointer/handle by the specified offset value.
-		 */
-		TEST(lseek(fildes, offset, SEEK_SET));
-
-		/* check return code of lseek(2) */
-		if (TEST_RETURN == (off_t)-1) {
-			tst_resm(TFAIL, "lseek on (%s) Failed, errno=%d : %s",
-				 TEMP_FILE, TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Check if the return value from lseek(2)
-			 * is equal to the specified offset value.
-			 */
-			if (TEST_RETURN != offset) {
-				tst_resm(TFAIL, "lseek() returned "
-					 "incorrect value %d, expected "
-					 "%d", TEST_RETURN, offset);
-				continue;
-			}
-			/*
-			 * The return value is okay, now write some data at
-			 * the current offset position.
-			 */
-			if (write(fildes, write_buf2, strlen(write_buf2)) !=
-				       (int)strlen(write_buf2)) {
-				tst_brkm(TFAIL, cleanup, "write() failed to "
-					 "write additional data, error = %d",
-					 errno);
-			}
-
-			/*
-			 * Now close the file and open it again
-			 * and read all of the data.
-			 */
-			if (close(fildes) < 0) {
-				tst_brkm(TFAIL, cleanup, "close() on %s Failed,"
-					 " errno = %d", TEMP_FILE, errno);
-			}
-
-			/* Open the file again in read/write mode */
-			if ((fildes = open(TEMP_FILE, O_RDWR)) < 0) {
-				tst_brkm(TFAIL, cleanup, "Could not open the "
-					 "%s readonly, error = %d",
-					 TEMP_FILE, errno);
-			}
-
-			/*
-			 * Now read all of the data.  The size should be the
-			 * offset + strlen(write_buf2).
-			 */
-			if (read(fildes, &read_buf, (offset + 
-				  strlen(write_buf2))) < 0) {
-				tst_brkm(TFAIL, cleanup, "read() failed on %s, "
-					 "error=%d", TEMP_FILE, errno);
-			} else {
-				/*
-				 * Check data read is the complete data and not
-				 * the only portion written.
-				 */
-				if ((strncmp(read_buf, write_buf1,
-				     strlen(write_buf1))) != 0) {
-					tst_brkm(TFAIL, cleanup,
-						 "Incorrect data read #1 from "
-						 "file %s", TEMP_FILE);
-				}
-				if ((strncmp(&read_buf[offset], write_buf2,
-				     strlen(write_buf2))) != 0) {
-					tst_brkm(TFAIL, cleanup,
-						 "Incorrect data read #2 from "
-						 "file %s", TEMP_FILE);
-				}
-				tst_resm(TPASS, "Functionality of "
-					 "lseek() on %s successful", TEMP_FILE);
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *	     Create a temporary directory and change directory to it.
- *	     Create a test file under temporary directory and write some
- *	     data into it.
- *	     Get the size of the file using fstat().
- */
-void 
-setup()
-{
-	struct stat stat_buf;		/* struct buffer for stat(2) */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Get the data to be written to temporary file */
-	strcpy(write_buf1, "abcdefg");
-	strcpy(write_buf2, "ijk");
-
-	/* Creat/open a temporary file for writing under above directory */
-	if ((fildes = open(TEMP_FILE, O_WRONLY | O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_WRONLY|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEMP_FILE, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Write data into temporary file */
-	if(write(fildes, write_buf1, strlen(write_buf1)) !=
-						     (int)strlen(write_buf1)) {
-		tst_brkm(TBROK, cleanup, "write(2) on %s Failed, errno=%d : %s",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	/* Get the size of the temporary file after writing data */
-	if (fstat(fildes, &stat_buf) < 0) {
-		tst_brkm(TBROK, cleanup, "fstat() on %s Failed, errno=%d : %s",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	file_size = stat_buf.st_size;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *	       Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the temporary file created */
-	if (close(fildes) < 0) {
-		tst_brkm(TFAIL, NULL, "close(%s) Failed, errno=%d : %s:",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/lseek08.c b/winsup/testsuite/winsup.api/ltp/lseek08.c
deleted file mode 100644
index 32fdcc0e4..000000000
--- a/winsup/testsuite/winsup.api/ltp/lseek08.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: lseek03
- *
- * Test Description:
- *  Verify that, lseek() call succeeds to set the file pointer position 
- *  to the end of the file when 'whence' value set to SEEK_END and any
- *  attempts to read from that position should fail.
- *
- * Expected Result:
- *  lseek() should return the offset which is set to the file size measured 
- *  in bytes. read() attempt should fail with -1 return value.
- *   
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  lseek03 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <utime.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMP_FILE	"tmp_file"
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-
-const char *TCID="lseek03";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int fildes;			/* file handle for temp file */
-ssize_t file_size;		/* size of the temporary file */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	char read_buf[1];	/* data read from temp. file */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Invoke lseek(2) to move the read/write file
-		 * pointer/handle to the END of the file.
-		 */
-		TEST(lseek(fildes, 0, SEEK_END));
-
-		/* check return code of lseek(2) */
-		if (TEST_RETURN == (off_t)-1) {
-			tst_resm(TFAIL, "lseek on (%s) Failed, errno=%d : %s",
-				 TEMP_FILE, TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Check if the return value from lseek(2)
-			 * is equal to the file_size.
-			 */
-			if (TEST_RETURN != file_size) {
-				tst_resm(TFAIL, "lseek() returned incorrect "
-					 "value %d, expected %d",
-					 TEST_RETURN, file_size);
-				continue;
-			}
-			/*
-			 * The return value is okay, now attempt to read data
-			 * from the file.  This should fail as the file pointer
-			 * should be pointing to END OF FILE.
-			 */
-			read_buf[0] = '\0';
-			if (read(fildes, &read_buf, sizeof(read_buf)) > 0) {
-				tst_resm(TFAIL, "read() successful on %s",
-					 TEMP_FILE);
-			} else {
-				tst_resm(TPASS, "Functionality of lseek() on "
-					 "%s successful", TEMP_FILE);
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/* NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *	     Create a temporary directory and change directory to it.
- *	     Create a test file under temporary directory and write some
- *	     data into it.
- *	     Get the size of the file using fstat().
- */
-void 
-setup()
-{
-	struct stat stat_buf;		/* struct. buffer for stat(2) */
-	char write_buf[BUFSIZ];		/* buffer to hold data */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Get the data to be written to temporary file */
-	strcpy(write_buf, "abcdefg\n");
-
-	/* Creat/open a temporary file under above directory */
-	if ((fildes = open(TEMP_FILE, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEMP_FILE, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Write data into temporary file */
-	if(write(fildes, write_buf, strlen(write_buf)) <= 0) {
-		tst_brkm(TBROK, cleanup,
-			 "write(2) on %s Failed, errno=%d : %s",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	/* Get the size of the file using fstat */
-	if (fstat(fildes, &stat_buf) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "fstat(2) on %s Failed, errno=%d : %s",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	file_size = stat_buf.st_size;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *	       Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the temporary file created */
-	if (close(fildes) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "close(%s) Failed, errno=%d : %s:",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/lseek09.c b/winsup/testsuite/winsup.api/ltp/lseek09.c
deleted file mode 100644
index 36688c656..000000000
--- a/winsup/testsuite/winsup.api/ltp/lseek09.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: lseek04
- *
- * Test Description:
- *  Verify that, lseek() call succeeds to set the file pointer position 
- *  to the current specified location, when 'whence' value is set to
- *  SEEK_CUR and the data read from the specified location should match
- *  the expected data.
- *
- * Expected Result:
- *  lseek() should return the specified offset from the beginning of the file 
- *  measured in bytes. The data read from this location should match the
- *  expected data.
- *  
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  lseek04 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <utime.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMP_FILE	"tmp_file"
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-
-const char *TCID="lseek04";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int fildes;			/* file handle for temp file */
-size_t file_size;		/* total size of file after data write */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	char read_buf[BUFSIZ];	/* data read from temp. file */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Invoke lseek(2) to set the file
-		 * pointer/handle from the current location
-		 * of the file descriptor + specified offset.
-		 */
-		TEST(lseek(fildes, 1, SEEK_CUR));
-
-		/* check return code of lseek(2) */
-		if (TEST_RETURN == (off_t)-1) {
-			tst_resm(TFAIL, "lseek on (%s) Failed, errno=%d : %s",
-				 TEMP_FILE, TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Check if the return value from lseek(2) is equal
-			 * to the 3 positions from the beginning of the file.
-			 * ie, 2 positions from lseek() in the setup +
-			 * 1 position from above above.
-			 */
-			if (TEST_RETURN != 3) {
-				tst_resm(TFAIL, "lseek() returned incorrect "
-					 "value %d, expected 4", TEST_RETURN);
-				continue;
-			}
-			/*
-			 * Read the data byte from this location.
-			 */
-			read_buf[0] = '\0';
-			if (read(fildes, &read_buf, (file_size - 3)) < 0) {
-				tst_brkm(TFAIL, cleanup,
-					 "read() failed on %s, error=%d",
-					 TEMP_FILE, errno);
-			} else {
-				/*
-				 * Check if read data contains
-				 * expected characters
-				 * From pos 4 ---> 'defg'.
-				 */
-				if (memcmp(read_buf, "defg", 4)) {
-					tst_resm(TFAIL, "Incorrect data read "
-						 "from file %s", TEMP_FILE);
-				} else {
-					tst_resm(TPASS, "Functionality of "
-						 "lseek() on %s successful",
-						 TEMP_FILE);
-				}
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-
-		/* reset file pointer in case we are looping */
-		if (lseek(fildes, 2, SEEK_SET) == -1) {
-			tst_brkm(TBROK, cleanup, "lseek failed - could not "
-				 "reset file pointer");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *	     Create a temporary directory and change directory to it.
- *	     Create a test file under temporary directory and write some
- *	     data into it.
- *	     Get the size of the file using fstat().
- */
-void 
-setup()
-{
-	struct stat stat_buf;		/* buffer to hold stat info. */
-	char write_buf[BUFSIZ];		/* buffer to hold data */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Get the data to be written to temporary file */
-	strcpy(write_buf, "abcdefg");
-
-	/* Creat/open a temporary file under above directory */
-	if ((fildes = open(TEMP_FILE, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEMP_FILE, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Write data into temporary file */
-	if(write(fildes, write_buf, strlen(write_buf)) <= 0) {
-		tst_brkm(TBROK, cleanup, "write(2) on %s Failed, errno=%d : %s",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	/* Get the temporary file information */
-	if (fstat(fildes, &stat_buf) < 0) {
-		tst_brkm(TBROK, cleanup, "fstat(2) on %s Failed, errno=%d : %s",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	file_size = stat_buf.st_size;
-
-	/*
-	 * Reset the file pointer position to the specified offset
-	 * from the beginning of the file.
-	 */
-	if (lseek(fildes, 2, SEEK_SET) != 2) {
-		tst_brkm(TBROK, cleanup,
-			 "lseek() fails to set file ptr. to specified offset");
-	}
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *	       Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the temporary file created */
-	if (close(fildes) < 0) {
-		tst_brkm(TFAIL, NULL, "close(%s) Failed, errno=%d : %s:",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/lseek10.c b/winsup/testsuite/winsup.api/ltp/lseek10.c
deleted file mode 100644
index ab3cc6ba3..000000000
--- a/winsup/testsuite/winsup.api/ltp/lseek10.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: lseek05
- *
- * Test Description:
- *  Verify that,
- *  1. lseek() returns -1 and sets errno to ESPIPE, if the file handle of
- *     the specified file is associated with a pipe, socket, or  FIFO.	
- *  2. lseek() returns -1 and sets errno to EINVAL, if the 'Whence' argument
- *     is not a proper value.
- *  3. lseek() returns -1 and sets errno to EBADF, if the file handle of
- *     the specified file is not valid.
- *
- * Expected Result:
- *  lseek() should fail with return value -1 and set expected errno.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	if errno set == expected errno
- *   		Issue sys call fails with expected return value and errno.
- *   	Otherwise,
- *		Issue sys call fails with unexpected errno.
- *   Otherwise,
- *	Issue sys call returns unexpected value.
- *
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory(s)/file(s) created.
- *
- * Usage:  <for command-line>
- *  lseek05 [-c n] [-e] [-i n] [-I x] [-p x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <utime.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMP_FILE1	"tmp_file1"
-#define TEMP_FILE2	"tmp_file2"
-#define TEMP_FILE3	"tmp_file3"
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define PIPE_MODE	S_IFIFO | S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define SEEK_TOP	10
-
-const char *TCID="lseek05";		/* Test program identifier.    */
-int TST_TOTAL=3;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={ESPIPE, EINVAL, EBADF, 0};
-
-int no_setup();
-int setup1();			/* setup function to test lseek() for ESPIPE */
-int setup2();			/* setup function to test lseek() for EINVAL */
-int setup3();			/* setup function to test lseek() for EBADF */
-
-int fd1;			/* file handle for testfile1  */
-int fd2;			/* file handle for testfile2  */
-int fd3;			/* file handle for testfile3  */
-
-struct test_case_t {		/* test case struct. to hold ref. test cond's*/
-	int fd;
-	int Whence;
-	const char *desc;
-	int exp_errno;
-	int (*setupfunc)();
-} Test_cases[] = {
-	{ 1, SEEK_SET, "'fd' associated with a pipe/fifo", ESPIPE, setup1 },
-	{ 2, SEEK_TOP, "'whence' argument is not valid", EINVAL, setup2 },
-	{ 3, SEEK_SET, "'fd' is not an open file descriptor", EBADF, setup3 },
-	{ 0, 0, NULL, 0, no_setup }
-};
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	int fildes;		/* file handle for testfile */
-	int whence;		/* position of file handle in the file */
-	const char *test_desc;	/* test specific error message */
-	int ind;		/* counter to test different test conditions */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
-			fildes = Test_cases[ind].fd;
-			test_desc = Test_cases[ind].desc;
-			whence = Test_cases[ind].Whence;
-	
-			/* Assign the 'fd' values appropriatly */
-			if (fildes == 1) {
-				fildes = fd1;
-			} else if (fildes == 2) {
-				fildes = fd2;
-			} else {
-				fildes = fd3;
-			}
-			/* 
-		 	 * Invoke lseek(2) to test different test conditions.
-		 	 * Verify that it fails with -1 return value and
-			 * sets appropriate errno.
-		 	 */
-			TEST(lseek(fildes, 0, whence));
-
-			/* check return code of lseek(2) */
-			if (TEST_RETURN != (off_t)-1) {
-				tst_resm(TFAIL, "lseek() returned %d, expected "
-					 "-1, errno:%d", TEST_RETURN,
-					 Test_cases[ind].exp_errno);
-				continue;
-			}
-			TEST_ERROR_LOG(TEST_ERRNO);
-			if (TEST_ERRNO == Test_cases[ind].exp_errno) {
-				tst_resm(TPASS, "lseek() fails, %s, errno:%d",
-					 test_desc, TEST_ERRNO);
-			} else {
-				tst_resm(TFAIL, "lseek() fails, %s, errno:%d, "
-					 "expected errno:%d", test_desc,
-					 TEST_ERRNO, Test_cases[ind].exp_errno);
-			}
-		}
-	}
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *	     Create a temporary directory and change directory to it.
- *	     Invoke individual test setup functions according to the order
- *	     set in test struct. definition.
- */
-void 
-setup()
-{
-	int ind;			/* counter for test setup function */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* call individual setup functions */
-	for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
-		Test_cases[ind].setupfunc();
-	}
-}
-
-/*
- * no_setup() - This is a dummy function which simply returns 0.
- */
-int
-no_setup()
-{
-	return 0;
-}
-
-/*
- * setup1() - setup function for a test condition for which lseek(2) 
- *	      returns -1 and sets errno to ESPIPE.
- *	      Creat a named pipe/fifo using mknod() and open it for
- *	      reading/writing.
- *	      This function returns 0 on success.
- */
-int
-setup1()
-{
-	/* Creat a named pipe/fifo using mknod() */
-	if (mknod(TEMP_FILE1, PIPE_MODE, 0) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "mknod(%s, %#o, 0) Failed, errno=%d :%s",
-			 TEMP_FILE1, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Open the named pipe/fifo for reading/writing */
-	if ((fd1 = open(TEMP_FILE1, O_RDWR)) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR) Failed, errno=%d, :%s",
-			 TEMP_FILE1, errno, strerror(errno));
-	}
-
-	return 0;
-}
-
-/*
- * setup2() - setup function for a test condition for which lseek(2)
- *	      returns -1 and sets errno to EINVAL.
- *	      Creat a temporary file for reading/writing and write some data
- *	      into it.
- *	      This function returns 0 on success.
- */
-int
-setup2()
-{
-	char write_buff[BUFSIZ];	/* buffer to hold data */
-
-	/* Get the data to be written to temporary file */
-	strcpy(write_buff, "abcdefg");
-
-	/* Creat/open a temporary file under above directory */
-	if ((fd2 = open(TEMP_FILE2, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEMP_FILE2, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Write data into temporary file */
-	if(write(fd2, write_buff, sizeof(write_buff)) <= 0) {
-		tst_brkm(TBROK, cleanup,
-			 "write(2) on %s Failed, errno=%d : %s",
-			 TEMP_FILE2, errno, strerror(errno));
-	}
-
-	return 0;
-}
-
-/*
- * setup3() - setup function for a test condition for which lseek(2)
- *	      returns -1 and sets errno to EBADF.
- *	      Creat a temporary file for reading/writing and close it.
- *	      This function returns 0 on success.
- */
-int
-setup3()
-{
-	/* Creat/open a temporary file under above directory */
-	if ((fd3 = open(TEMP_FILE3, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEMP_FILE3, FILE_MODE, errno, strerror(errno));
-	}
-
-	/* Close the temporary file created above */
-	if (close(fd3) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "close(%s) Failed, errno=%d : %s:",
-			 TEMP_FILE3, errno, strerror(errno));
-	}
-
-	return 0;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *	       Remove the test directory and testfile(s) created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the temporary file(s) created in setup1/setup2*/
-	if (close(fd1) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "close(%s) Failed, errno=%d : %s:",
-			 TEMP_FILE1, errno, strerror(errno));
-	}
-	if (close(fd2) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "close(%s) Failed, errno=%d : %s:",
-			 TEMP_FILE2, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/lstat02.c b/winsup/testsuite/winsup.api/ltp/lstat02.c
deleted file mode 100644
index eed8f78c7..000000000
--- a/winsup/testsuite/winsup.api/ltp/lstat02.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: lstat02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for lstat(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) lstat(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the lstat(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	lstat(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="lstat02"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255], lname[255], symlnk[255], buf[255];
-int fd;
-struct stat statter;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-        /*
-	 *  Call lstat(2)
-	 */
-	TEST(lstat(symlnk, &statter));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "lstat(%s, &statter) Failed, errno=%d : %s", symlnk,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "lstat(%s, &statter) returned %d", symlnk, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-    
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-	tst_brkm(TBROK, cleanup,
-		 "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		 fname, errno, strerror(errno));
-    } else if (close(fd) == -1) {
-	tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-    
-    sprintf(symlnk,"lnfile_%d",getpid());
-    if (symlink(fname, symlnk) == -1) {
-	tst_resm(TWARN, "symlink(%s, %s) Failed, errno=%d : %s",
-		fname, symlnk,  errno, strerror(errno));
-    } else if (readlink(symlnk, buf, 255) == -1) {
-	tst_resm(TWARN, "readlink(%s, buf, 255) Failed, errno=%d : %s",
-		symlnk,  errno, strerror(errno));
-    } else if (strcmp(buf, fname) != 0) {
-	tst_resm(TWARN,
-		"Setup Failure : Expected symbolic link contents of %s : Actual is %s",
-		fname, buf);
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/mkdir01.c b/winsup/testsuite/winsup.api/ltp/mkdir01.c
deleted file mode 100644
index 5772f0683..000000000
--- a/winsup/testsuite/winsup.api/ltp/mkdir01.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: mkdir01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic errno test for mkdir(2)
- * 
- *    PARENT DOCUMENT	: mkstds02
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Bill Branum
- * 
- *    CO-PILOT		: Kathy Olmsted
- * 
- *    DATE STARTED	: 4/15/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	mkdir(2) test for errno(s) EFAULT.
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    DETAILED DESCRIPTION
- *	This test will verify that mkdir(2) returns a value of
- *	-1 and sets errno to EFAULT when the path argument points
- *	outside (above/below) the allocated address space of the
- *	process.
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Create and make current a temporary directory.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno.
- *        If doing functional test
- *            check the errno returned and print result message
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- *	  Remove the temporary directory.
- *	  Exit.
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-char *get_high_address();
-
-const char *TCID="mkdir01";	/* Test program identifier.    */
-int TST_TOTAL=2;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={EFAULT, 0};	/* List must end with 0 */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * TEST CASE: 1
-	 * mkdir() call with pointer below allocated address space.
-	 */
-
-	/* Call mkdir(2) */
-	TEST(mkdir((char *)-1,0777));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS, "mkdir - path argument pointing below allocated address space failed as expected with errno %d : %s", TEST_ERRNO, strerror(TEST_ERRNO));
-	    }
-	    else {
-	      tst_resm(TFAIL, "mkdir - path argument pointing below allocated address space failed with errno %d : %s but expected %d (EFAULT)", TEST_ERRNO, strerror(TEST_ERRNO),EFAULT);
-	    }
-	  }
-	  else {
-	    tst_resm(TFAIL, "mkdir - path argument pointing below allocated address space succeeded unexpectedly.");
-
-	  }
-	} 
-	
-
-	/* 
-	 * TEST CASE: 2
-	 * mkdir() call with pointer above allocated address space.
-	 */
-
-	/* Call mkdir(2) */
-	TEST(mkdir(get_high_address(),0777));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS, "mkdir - path argument pointing above allocated address space failed as expected with errno %d : %s", TEST_ERRNO, strerror(TEST_ERRNO));
-	    }
-	    else {
-	      tst_resm(TFAIL, "mkdir - path argument pointing above allocated address space failed with errno %d : %s but expected %d (EFAULT)", TEST_ERRNO, strerror(TEST_ERRNO),EFAULT);
-	    }
-	  }
-	  else {
-	    tst_resm(TFAIL, "mkdir - path argument pointing above allocated address space succeeded unexpectedly.");
-
-	  }
-	} 
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Create a temporary directory and make it current. */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /*
-     * Remove the temporary directory.
-     */
-    tst_rmdir();
-
-    /*
-     * Exit with return code appropriate for results.
-     */
-    tst_exit();
-
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/mkdir08.c b/winsup/testsuite/winsup.api/ltp/mkdir08.c
deleted file mode 100644
index d1cc19344..000000000
--- a/winsup/testsuite/winsup.api/ltp/mkdir08.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: mkdir08
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for mkdir(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) mkdir(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the mkdir(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	mkdir(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="mkdir08"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call mkdir(2)
-	 */
-	TEST(mkdir(fname, 0777));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "mkdir(%s) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "mkdir(%s) returned %d", fname, TEST_RETURN);
-	    } 
-	    if(rmdir(fname) == -1) {
-		tst_brkm(TBROK, cleanup, "rmdir(%s) Failed, errno=%d : %s",
-			 fname, errno, strerror(errno));
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname, "./dir_%d", getpid());
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/mknod01.c b/winsup/testsuite/winsup.api/ltp/mknod01.c
deleted file mode 100644
index 6cfe4885a..000000000
--- a/winsup/testsuite/winsup.api/ltp/mknod01.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: mknod01
- * 
- *    EXECUTED BY	: root
- * 
- *    TEST TITLE	: Basic test for mknod(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 4
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 05/13/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) mknod(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the mknod(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	mknod(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="mknod01";		/* Test program identifier.    */
-int TST_TOTAL;			/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-char Path[1024];		/* path to create */
-int i;			/* counter for test case loop */
-int tcases[] = {	/* modes to give nodes created (1 per text case) */
-       S_IFREG|0777,	/* ordinary file with mode 0777 */
-       S_IFIFO|0777, 	/* fifo special with mode 0777 */
-       S_IFCHR|0777,    /* character special with mode 0777 */
-       S_IFBLK|0777,    /* block special with mode 0777 */
-
-       S_IFREG|04700,	/* ordinary file with mode 04700 (suid) */
-       S_IFREG|02700,	/* ordinary file with mode 02700 (sgid) */
-       S_IFREG|06700,	/* ordinary file with mode 06700 (sgid & suid) */
-
-#ifdef CRAY
-       S_IFDIR|0777,	/* Direcory */
-       S_IRESTART|0400, /* restartbit  */
-#ifdef S_IFOFD
-       S_IFOFD|0777,	/* off line, with data  */
-#endif
-#ifdef S_IFOFL
-	S_IFOFL|0777,	/* off line, with no data   */
-#endif
-#endif /* CRAY */
-
-};
-
-
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    TST_TOTAL=(sizeof(tcases)/sizeof(tcases[0]));
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASES:
-	 *  Make nodes in tcases array
-	 */
-	for(i=0; i<TST_TOTAL; i++) {
-	    /* Call mknod(2) */
-	    TEST(mknod(Path, tcases[i], 0));
-	    
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-		TEST_ERROR_LOG(TEST_ERRNO);
-		tst_resm(TFAIL, "mknod(%s, %#o, 0) failed, errno=%d : %s",
-			 Path, tcases[i], TEST_ERRNO, strerror(TEST_ERRNO));
-	    } else {
-		/***************************************************************
-		 * only perform functional verification if flag set (-f not given)
-		 ***************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "mknod(%s, %#o, 0) returned %d",
-			     Path, tcases[i], TEST_RETURN);
-		} 
-	    }
-	    
-	    /* remove the node for the next go `round */
-	    if (unlink(Path) == -1 ) {
-		if ( rmdir(Path) == -1 ) {
-		   tst_resm(TWARN, "unlink(%s) & rmdir(%s) failed, errno:%d %s",
-			Path, Path, errno, strerror(errno));
-		}
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-
-    /* Check that user is root */
-    if ( geteuid() != 0 )
-	tst_brkm(TBROK, cleanup, "Must be root for this test!");
-
-    /* build a temp node name to bre created my mknod */
-    sprintf(Path, "./tnode_%d", getpid());
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/mmap001.c b/winsup/testsuite/winsup.api/ltp/mmap001.c
deleted file mode 100644
index 6c47d49c1..000000000
--- a/winsup/testsuite/winsup.api/ltp/mmap001.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * mmap001.c - Tests mmapping a big file and writing it once
- *
- * Copyright (C) 2000 Juan Quintela <quintela@fi.udc.es>
- *                    Aaron Laffin <alaffin@sgi.com>
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <errno.h>
-#include <string.h>
-
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID="mmap001";
-int TST_TOTAL=5;
-extern int Tst_count;
-static char *filename=NULL;
-static int m_opt = 0;
-static char *m_copt;
-
-void cleanup()
-{
-  /*
-   * remove the tmp directory and exit
-   */
-
-  if ( filename )
-    free(filename);
-
-  TEST_CLEANUP;
-
-  tst_rmdir();
-
-  tst_exit();
-}
-
-void setup()
-{
-  char buf[1024];
-  /*
-   * setup a default signal hander and a
-   * temporary working directory.
-   */
-  tst_sig(FORK, DEF_HANDLER, cleanup);
-
-  tst_tmpdir();
-
-  TEST_PAUSE;
-
-  snprintf(buf,1024,"testfile.%d",getpid());
-
-  filename = strdup(buf);
-}
-
-void help()
-{
-  printf("  -m x    size of mmap in pages (default 1000)\n");
-}
-
-/*
- * add the -m option whose parameter is the
- * pages that should be mapped.
- */
-option_t options[] = 
-{
-  { "m:", &m_opt, &m_copt },
-  { NULL, NULL, NULL }
-};
-
-int main(int argc, char * argv[])
-{
-  char *array;
-  const char *msg;
-  int i,lc;
-  int fd;
-  int pages,memsize;
-
-  if ( (msg=parse_opts(argc, argv, options, help)) != (char *) NULL )
-   tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-  if ( m_opt )
-  {
-    memsize = pages = atoi( m_copt );
-
-    if (memsize < 1)
-    {
-      tst_brkm(TBROK, cleanup, "Invalid arg for -m: %s",m_copt);
-    }
-
-    memsize *= getpagesize(); /* N PAGES */
-
-  }
-  else
-  {
-    /*
-     * default size 1000 pages;
-     */
-    memsize = pages = 1000;
-    memsize *= getpagesize();
-  }
-
-  tst_resm(TINFO,"mmap()ing file of %u pages or %u bytes", pages,memsize);
-
-  setup();
-
-  for (lc=0; TEST_LOOPING(lc); lc++)
-  {
-    Tst_count=0;
-
-    fd = open(filename, O_RDWR | O_CREAT, 0666);
-    if ((fd == -1))
-      tst_brkm(TBROK, cleanup, "Problems opening files");
-        
-    if (lseek(fd, memsize, SEEK_SET) != memsize)
-    {
-      close(fd);
-      tst_brkm(TBROK, cleanup, "Problems doing the lseek: %d: %s",
-          errno,strerror(errno));
-    }
-
-    if (write(fd,"\0",1) !=1)
-    {
-      close(fd);
-      tst_brkm(TBROK, cleanup, "Problems writing: %d: %s",
-        errno,strerror(errno));
-    }
- 
-    array = mmap(0, memsize, PROT_WRITE, MAP_SHARED,fd,0);
-    if (array == (char *)MAP_FAILED)
-    {
-      tst_resm(TFAIL, "mmap() failed: %d: %s",
-        errno,strerror(errno));
-      tst_exit();
-    }
-    else
-    {
-      tst_resm(TPASS, "mmap() completed successfully.");
-    }
-
-    if ( STD_FUNCTIONAL_TEST )
-    {
-      tst_resm(TINFO,"touching mmaped memory");
-
-      for(i = 0; i < memsize; i++)
-      {
-       array[i] = (char) i;
-      } 
- 
-      /*
-      * seems that if the map area was bad, we'd get SEGV, hence we can
-      * indicate a PASS.
-      */
-      tst_resm(TPASS, "we're still here, mmaped area must be good");
-
-      TEST( msync(array, memsize, MS_SYNC) );
-
-      if ( TEST_RETURN == -1 )
-      {
-        tst_resm(TFAIL, "msync() failed: errno: %d: %s",
-          TEST_ERRNO, strerror(TEST_ERRNO));
-      }
-      else
-      {
-        tst_resm(TPASS, "msync() was successful");
-      }
-
-    } /* STD_FUNCTIONAL_TEST */
-
-    TEST( munmap(array, memsize) );
-
-    if ( TEST_RETURN == -1 )
-    {
-      tst_resm(TFAIL, "munmap() failed: errno: %d: %s",
-        TEST_ERRNO, strerror(TEST_ERRNO));
-    }
-    else
-    {
-      tst_resm(TPASS, "munmap() was successful");
-    }
-
-    close(fd);
-    unlink(filename);
-  }
-  cleanup();
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/ltp/mmap02.c b/winsup/testsuite/winsup.api/ltp/mmap02.c
deleted file mode 100644
index 33a12738c..000000000
--- a/winsup/testsuite/winsup.api/ltp/mmap02.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: mmap02
- *
- * Test Description:
- *  Call mmap() with prot parameter set to PROT_READ and with the file
- *  descriptor being open for read, to  map a file creating mapped memory
- *  with read access. The minimum file permissions should be 0444.
- *
- *  The call should succeed to create the mapped region with required
- *  attributes.
- *
- * Expected Result:
- *  mmap() should succeed returning the address of the mapped region,
- *  the mapped region should contain the contents of the mapped file.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *   Create temporary directory.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  mmap02 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMPFILE	"mmapfile"
-
-const char *TCID="mmap02";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-char *addr;			/* addr of memory mapped region */
-char *dummy;			/* dummy string */
-size_t page_sz;			/* system page size */
-int fildes = -1;		/* file descriptor for temporary file */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call mmap to map the temporary file 'TEMPFILE'
-	 	 * with read access.
-		 */
-		TEST(mmap(0, page_sz, PROT_READ,
-			    MAP_FILE|MAP_SHARED, fildes, 0));
-
-		/* Check for the return value of mmap() */
-		if (TEST_RETURN == (int)MAP_FAILED) {
-			tst_resm(TFAIL, "mmap() Failed on %s, errno=%d : %s",
-				 TEMPFILE, errno, strerror(errno));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/* Get the mmap return value */
-			addr = (char *)TEST_RETURN;
-
-			/*
-			 * Read the file contents into the dummy
-			 * string.
-			 */
-			if (read(fildes, dummy, page_sz) < 0) {
-				tst_brkm(TFAIL, cleanup, "read() on %s Failed, "
-					 "error:%d", TEMPFILE, errno);
-			}
-
-			/*
-			 * Check whether mapped memory region has
-			 * the file contents.
-			 */
-			if (memcmp(dummy, addr, page_sz)) {
-				tst_resm(TFAIL, "mapped memory area contains "
-					 "invalid data");
-			} else {
-				tst_resm(TPASS,
-					 "Functionality of mmap() successful");
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-
-		/* Clean up things in case we are looping */
-		/* Unmap the mapped memory */
-		if (munmap(addr, page_sz) != 0) {
-			tst_brkm(TFAIL, NULL, "munmap() fails to unmap the "
-				 "memory, errno=%d", errno);
-		}
-
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *
- * 	Get system page size, allocate and initialize the string dummy.
- * 	Initialize addr such that it is more than one page below the break
- * 	address of the process, and initialize one page region from addr
- * 	with char 'A'.
- * 	Create a temporary directory a file under it.
- * 	Write some known data into file and close it.
- * 	Change mode permissions on file to 0444. 
- */
-void 
-setup()
-{
-	char *tst_buff;			/* test buffer to hold known data */
-
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Get the system page size */
-	if ((page_sz = getpagesize()) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "getpagesize() fails to get system page size");
-		tst_exit();
-	}
-
-	/* Allocate space for the test buffer */
-	if ((tst_buff = (char *)calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, NULL,
-			 "calloc() failed to allocate space for tst_buff");
-		tst_exit();
-	}
-
-	/* Fill the test buffer with the known data */
-	memset(tst_buff, 'A', page_sz);
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a temporary file used for mapping */
-	if ((fildes = open(TEMPFILE, O_RDWR | O_CREAT, 0666)) < 0) {
-		tst_brkm(TFAIL, NULL, "open() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Write test buffer contents into temporary file */
-	if (write(fildes, tst_buff, sizeof(tst_buff)) < (int)sizeof(tst_buff)) {
-		tst_brkm(TFAIL, NULL, "write() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-	
-	/* Free the memory allocated for test buffer */
-	free(tst_buff);
-
-	/* Close the temporary file */
-	if (close(fildes) < 0) {
-		tst_brkm(TFAIL, cleanup, "close() Failed on %s, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-	}
-
-	/* Change Mode permissions on Temporary file */
-	if (chmod(TEMPFILE, 0444) < 0) {
-		tst_brkm(TFAIL, cleanup, "chmod(%s, 0444) Failed, errno=%d : "
-			 "%s", TEMPFILE, errno, strerror(errno));
-	}
-
-	/* Open the temporary file again, - Readonly mode */
-	if ((fildes = open(TEMPFILE, O_RDONLY)) < 0) {
-		tst_brkm(TFAIL, cleanup, "open(%s, O_RDONLY) Failed, errno=%d "
-			 ": %s", TEMPFILE, errno, strerror(errno));
-	}
-
-
-	/* Allocate and initialize dummy string of system page size bytes */
-	if ((dummy = (char *)calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, NULL, "calloc() failed to allocate space");
-		tst_exit();
-	}
-
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- * 	       Free the memory allocated to dummy variable.
- * 	       Remove the temporary directory created.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Free the memory allocated for dummy string */
-	if (dummy) {
-		free(dummy);
-	}
-
-        if (fildes >= 0)
-		close (fildes);
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/mmap03.c b/winsup/testsuite/winsup.api/ltp/mmap03.c
deleted file mode 100644
index 9302d335d..000000000
--- a/winsup/testsuite/winsup.api/ltp/mmap03.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: mmap03
- *
- * Test Description:
- *  Call mmap() to map a file creating a mapped region with execute access
- *  under the following conditions -
- *	- The prot parameter is set to PROT_EXE
- *	- The file descriptor is open for read
- *	- The file being mapped has execute permission bit set.
- *	- The minimum file permissions should be 0555.
- *
- *  The call should succeed to map the file creating mapped memory with the
- *  required attributes.
- *
- * Expected Result:
- *  mmap() should succeed returning the address of the mapped region,
- *  and the mapped region should contain the contents of the mapped file.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *   Create temporary directory.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  mmap03 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMPFILE	"mmapfile"
-
-const char *TCID="mmap03";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-size_t page_sz;			/* system page size */
-char *addr;			/* addr of memory mapped region */
-char *dummy;			/* dummy variable to hold temp file contents */
-int fildes = -1;		/* file descriptor for temporary file */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call mmap to map the temporary file 'TEMPFILE'
-	 	 * with execute access.
-		 */
-		TEST(mmap(0, page_sz, PROT_EXEC,
-			    MAP_FILE|MAP_SHARED, fildes, 0));
-
-		/* Check for the return value of mmap() */
-		if (TEST_RETURN == (int)MAP_FAILED) {
-			tst_resm(TFAIL, "mmap() Failed on %s, errno=%d : %s",
-				 TEMPFILE, errno, strerror(errno));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/* Get the mmap return value */
-			addr = (char *)TEST_RETURN;
-
-			/*
-			 * Read the file contents into the dummy
-			 * variable.
-			 */
-			if (read(fildes, dummy, page_sz) < 0) {
-				tst_brkm(TFAIL, cleanup, "read() on %s Failed, "
-					 "error:%d", TEMPFILE, errno);
-			}
-
-			/*
-			 * Check whether the mapped memory region
-			 * has the file contents.
-			 */
-			if (memcmp(dummy, addr, page_sz)) {
-				tst_resm(TFAIL, "mapped memory region contains "
-					 "invalid data");
-			} else {
-				tst_resm(TPASS, 
-					 "Functionality of mmap() successful");
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-
-		/* Clean up things in case we are looping */
-		/* Unmap the mapped memory */
-		if (munmap(addr, page_sz) != 0) {
-			tst_brkm(TFAIL, NULL, "munmap() fails to unmap the "
-				 "memory, errno=%d", errno);
-		}
-
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *	     Get the system page size.
- *	     Create a temporary directory and a file under it.
- *	     Write some known data into file and close it.
- *	     Change the mode permissions on file to 0555.
- *	     Re-open the file for reading.
- */
-void 
-setup()
-{
-	char *tst_buff;			/* test buffer to hold known data */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Get the system page size */
-	if ((page_sz = getpagesize()) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "getpagesize() fails to get system page size");
-		tst_exit();
-	}
-
-	/* Allocate space for the test buffer */
-	if ((tst_buff = (char *)calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, NULL,
-			 "calloc() failed to allocate space for tst_buff");
-		tst_exit();
-	}
-
-	/* Fill the test buffer with the known data */
-	memset(tst_buff, 'A', page_sz);
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a temporary file used for mapping */
-	if ((fildes = open(TEMPFILE, O_WRONLY | O_CREAT, 0666)) < 0) {
-		tst_brkm(TFAIL, NULL, "open() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Write test buffer contents into temporary file */
-	if (write(fildes, tst_buff, strlen(tst_buff)) < (int)strlen(tst_buff)) {
-		tst_brkm(TFAIL, NULL, "write() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Free the memory allocated for test buffer */
-	free(tst_buff);
-
-	/* Make sure proper permissions set on file */
-	if (chmod(TEMPFILE, 0555) < 0) {
-		tst_brkm(TFAIL, cleanup, "chmod() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-	}
-
-	/* Close the temporary file opened for write */
-	if (close(fildes) < 0) {
-		tst_brkm(TFAIL, cleanup, "close() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-	}
-
-	/* Allocate and initialize dummy string of system page size bytes */
-	if ((dummy = (char *)calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, cleanup,
-			 "calloc() failed to allocate memory for dummy");
-	}
-
-	/* Open the temporary file again for reading */
-	if ((fildes = open(TEMPFILE, O_RDONLY)) < 0) {
-		tst_brkm(TFAIL, cleanup, "open(%s) with read-only Failed, "
-			 "errno:%d", TEMPFILE, errno);
-	}
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
-	       Free the memory allocated to dummy variable.
- * 	       Remove the temporary directory created.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Free the memory space allocated for dummy variable */
-	if (dummy) {
-		free(dummy);
-	}
-
-        if (fildes >= 0)
-		close (fildes);
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/mmap04.c b/winsup/testsuite/winsup.api/ltp/mmap04.c
deleted file mode 100644
index 64d3a8ebe..000000000
--- a/winsup/testsuite/winsup.api/ltp/mmap04.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: mmap04
- *
- * Test Description:
- *  Call mmap() to map a file creating a mapped region with read/exec access
- *  under the following conditions -
- *	- The prot parameter is set to PROT_READ|PROT_EXEC
- *	- The file descriptor is open for read
- *	- The file being mapped has read and execute permission bit set.
- *	- The minimum file permissions should be 0555.
- *
- *  The call should succeed to map the file creating mapped memory with the
- *  required attributes.
- *
- * Expected Result:
- *  mmap() should succeed returning the address of the mapped region,
- *  and the mapped region should contain the contents of the mapped file.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *   Create temporary directory.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  mmap04 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMPFILE	"mmapfile"
-
-const char *TCID="mmap04";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-size_t page_sz;			/* system page size */
-char *addr;			/* addr of memory mapped region */
-char *dummy;			/* dummy variable to hold temp file contents */
-int fildes = -1;		/* file descriptor for temporary file */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call mmap to map the temporary file 'TEMPFILE'
-	 	 * with read and execute access.
-		 */
-		TEST(mmap(0, page_sz, PROT_READ|PROT_EXEC,
-			    MAP_FILE|MAP_SHARED, fildes, 0));
-
-		/* Check for the return value of mmap() */
-		if (TEST_RETURN == (int)MAP_FAILED) {
-			tst_resm(TFAIL, "mmap() Failed on %s, errno=%d : %s",
-				 TEMPFILE, errno, strerror(errno));
-			continue;
-		}
-
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/* Get the mmap return value */
-			addr = (char *)TEST_RETURN;
-
-			/*
-			 * Read the file contents into the dummy
-			 * variable.
-			 */
-			if (read(fildes, dummy, page_sz) < 0) {
-				tst_brkm(TFAIL, cleanup, "read() on %s Failed, "
-					 "error:%d", TEMPFILE, errno);
-			}
-
-			/*
-			 * Check whether the mapped memory region
-			 * has the file contents.
-			 */
-			if (memcmp(dummy, addr, page_sz)) {
-				tst_resm(TFAIL, "mapped memory region contains "
-					 "invalid data");
-			} else {
-				tst_resm(TPASS,
-					 "Functionality of mmap() successful");
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-		/* Clean up things in case we are looping. */
-		/* Unmap the mapped memory */
-		if (munmap(addr, page_sz) != 0) {
-			tst_brkm(TFAIL, NULL, "munmap() fails to unmap the "
-				 "memory, errno=%d", errno);
-		}
-
-
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *  	     Get the system page size.
- *  	     Create a temporary directory and a file under it.
- *  	     Write some known data into file and close it.
- *  	     Change the mode permissions on file to 0555.
- *  	     Re-open the file for reading.
- */
-void 
-setup()
-{
-	char *tst_buff;			/* test buffer to hold known data */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Get the system page size */
-	if ((page_sz = getpagesize()) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "getpagesize() fails to get system page size");
-		tst_exit();
-	}
-
-	if ((tst_buff = (char *)calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, NULL,
-			 "calloc() failed to allocate space for tst_buff");
-		tst_exit();
-	}
-
-	/* Fill the test buffer with the known data */
-	memset(tst_buff, 'A', page_sz);
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a temporary file used for mapping */
-	if ((fildes = open(TEMPFILE, O_WRONLY | O_CREAT, 0666)) < 0) {
-		tst_brkm(TFAIL, NULL, "open() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Write test buffer contents into temporary file */
-	if (write(fildes, tst_buff, strlen(tst_buff)) < (int)strlen(tst_buff)) {
-		tst_brkm(TFAIL, NULL, "write() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Free the memory allocated for test buffer */
-	free(tst_buff);
-
-	/* Make sure proper permissions set on file */
-	if (chmod(TEMPFILE, 0555) < 0) {
-		tst_brkm(TFAIL, cleanup, "chmod() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-	}
-
-	/* Close the temporary file opened for write */
-	if (close(fildes) < 0) {
-		tst_brkm(TFAIL, cleanup, "close() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-	}
-
-	/* Allocate and initialize dummy string of system page size bytes */
-	if ((dummy = (char *)calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, cleanup,
-			 "calloc() failed to allocate memory for dummy");
-	}
-
-	/* Open the temporary file again for reading */
-	if ((fildes = open(TEMPFILE, O_RDONLY)) < 0) {
-		tst_brkm(TFAIL, cleanup, "open(%s) with read-only Failed, "
-			 "errno:%d", TEMPFILE, errno);
-	}
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- * 	       Free the memeory allocated to dummy variable.
- * 	       Remove the temporary directory created.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Free the memory space allocated for dummy variable */
-	if (dummy) {
-		free(dummy);
-	}
-
-        if (fildes >= 0)
-		close (fildes);
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/mmap05.c b/winsup/testsuite/winsup.api/ltp/mmap05.c
deleted file mode 100644
index bcdfd0cd8..000000000
--- a/winsup/testsuite/winsup.api/ltp/mmap05.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: mmap05
- *
- * Test Description:
- *  Call mmap() to map a file creating mapped memory with no access under
- *  the following conditions -
- *	- The prot parameter is set to PROT_NONE
- *	- The file descriptor is open for read(any mode other than write)
- *	- The minimum file permissions should be 0444.
- *
- *  The call should succeed to map the file creating mapped memory with the
- *  required attributes.
- *
- * Expected Result:
- *  mmap() should succeed returning the address of the mapped region,
- *  and an attempt to access the contents of the mapped region should give
- *  rise to the signal SIGSEGV.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *   Create temporary directory.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  mmap05 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <setjmp.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMPFILE	"mmapfile"
-
-const char *TCID="mmap05";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-size_t page_sz;			/* system page size */
-char *addr;			/* addr of memory mapped region */
-int fildes = -1;		/* file descriptor for temporary file */
-int pass=0;			/* pass flag perhaps set to 1 in sig_handler */
-sigjmp_buf env;			/* environment for sigsetjmp/siglongjmp */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-void sig_handler();		/* signal handler to catch SIGSEGV */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	volatile char file_content;	/* tempfile content */
-	
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call mmap to map the temporary file 'TEMPFILE'
-	 	 * with no access.
-		 */
-		
-		TEST(mmap(0, page_sz, PROT_NONE,
-			  MAP_FILE|MAP_SHARED, fildes, 0));
-
-		/* Check for the return value of mmap() */
-		if (TEST_RETURN == (int)MAP_FAILED) {
-			tst_resm(TFAIL, "mmap() Failed on %s, errno=%d : %s",
-				 TEMPFILE, errno, strerror(errno));
-			continue;
-		}
-
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-
-			/*
-			 * Try to access the mapped region.  This should 
-			 * generate a SIGSEGV which will be caught below.
-			 *
-			 * This is wrapped by the sigsetjmp() call that will
-			 * take care of restoring the program's context in an
-			 * elegant way in conjunction with the call to 
-			 * siglongjmp() in the signal handler.
-			 */
-			if (sigsetjmp(env, 1) == 0) {
-				file_content = addr[0];
-			}
-
-			if (pass) {
-				tst_resm(TPASS, "Got SIGSEGV as expected");
-			} else {
-				tst_resm(TFAIL, "Mapped memory region with NO "
-					 "access is accessible");
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-
-		/* Unmap mapped memory and reset pass in case we are looping */
-		if (munmap(addr, page_sz) != 0) {
-			tst_brkm(TFAIL, cleanup, "munmap() fails to unmap the "
-				 "memory, errno=%d", errno);
-		}
-		pass = 0;
-
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *  	     Get the system page size.
- *  	     Create a temporary directory and a file under it.
- *  	     Write some known data into file and close it.
- *  	     Change the mode permissions on file to 0444
- *  	     Re-open the file for reading.
- */
-void 
-setup()
-{
-	char *tst_buff;			/* test buffer to hold known data */
-
-	/* capture signals */
-	tst_sig(NOFORK, sig_handler, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Get the system page size */
-	if ((page_sz = getpagesize()) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "getpagesize() fails to get system page size");
-		tst_exit();
-	}
-
-	/* Allocate space for the test buffer */
-	if ((tst_buff = (char *)calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, NULL,
-			 "calloc() failed to allocate space for tst_buff");
-		tst_exit();
-	}
-
-	/* Fill the test buffer with the known data */
-	memset(tst_buff, 'A', page_sz);
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a temporary file used for mapping */
-	if ((fildes = open(TEMPFILE, O_WRONLY | O_CREAT, 0666)) < 0) {
-		tst_brkm(TFAIL, NULL, "open() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Write test buffer contents into temporary file */
-	if (write(fildes, tst_buff, strlen(tst_buff))
-	    != (int)strlen(tst_buff)) {
-		tst_brkm(TFAIL, NULL, "write() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Free the memory allocated for test buffer */
-	free(tst_buff);
-
-	/* Close the temporary file opened for write */
-	if (close(fildes) < 0) {
-		tst_brkm(TFAIL, cleanup, "close() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-	}
-
-	/* Make sure proper permissions set on file */
-	if (chmod(TEMPFILE, 0444) < 0) {
-		tst_brkm(TFAIL, cleanup, "chmod() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-	}
-
-	/* Open the temporary file again for reading */
-	if ((fildes = open(TEMPFILE, O_RDONLY)) < 0) {
-		tst_brkm(TFAIL, cleanup, "open(%s) with read-only Failed, "
-			 "errno:%d", TEMPFILE, errno);
-	}
-}
-
-/*
- * sig_handler() - Signal Cathing function.
- *   This function gets executed when the test process receives
- *   the signal SIGSEGV while trying to access the contents of memory which
- *   is not accessible.
- */
-void
-sig_handler(sig)
-{
-	if (sig == SIGSEGV) {
-		/* set the global variable and jump back */
-		pass = 1;
-		siglongjmp(env, 1);
-	} else {
-		tst_brkm(TBROK, cleanup, "received an unexpected signal");
-	}
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- * 	       Remove the temporary directory created.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-        if (fildes >= 0)
-		close (fildes);
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/mmap06.c b/winsup/testsuite/winsup.api/ltp/mmap06.c
deleted file mode 100644
index ec113c077..000000000
--- a/winsup/testsuite/winsup.api/ltp/mmap06.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: mmap06
- *
- * Test Description:
- *  Call mmap() to map a file creating a mapped region with read access
- *  under the following conditions -
- *	- The prot parameter is set to PROT_READ
- *	- The file descriptor is open for writing.
- *
- *  The call should fail to map the file.
- *
- * Expected Result:
- *  mmap() should fail returning -1 and errno should get set to EACCES.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *   Create temporary directory.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	if errno set == expected errno
- *   		Issue sys call fails with expected return value and errno.
- *   	Otherwise,
- *		Issue sys call fails with unexpected errno.
- *   Otherwise,
- *	Issue sys call returns unexpected value.
- *
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory(s)/file(s) created.
- *
- * Usage:  <for command-line>
- *  mmap06 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMPFILE	"mmapfile"
-
-const char *TCID="mmap06";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={EACCES, 0};
-
-size_t page_sz;			/* system page size */
-char *addr;			/* addr of memory mapped region */
-int fildes = -1;		/* file descriptor for temporary file */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call mmap to map the temporary file 'TEMPFILE'
-	 	 * with read access.
-		 */
-		TEST(mmap(0, page_sz, PROT_READ,
-			    MAP_FILE|MAP_SHARED, fildes, 0));
-
-		/* Check for the return value of mmap() */
-		if (TEST_RETURN != (int)MAP_FAILED) {
-			tst_resm(TFAIL, "mmap() returned invalid value, "
-				 "expected: -1");
-			/* Unmap the mapped memory */
-			if (munmap(addr, page_sz) != 0) {
-				tst_brkm(TBROK, cleanup, "munmap() failed");
-			}
-			continue;
-		}
-		TEST_ERROR_LOG(TEST_ERRNO);
-		if (TEST_ERRNO == EACCES) {
-			tst_resm(TPASS, "mmap() fails, 'fd' doesn't allow "
-				 "desired access, errno:%d", errno);
-		} else {
-			tst_resm(TFAIL, "mmap() fails, 'fd' doesn't allow "
-				 "desired access, invalid errno:%d", errno);
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *	     Get the system page size.
- *	     Create a temporary directory and a file under it.
- *	     Write some known data into file.
- */
-void 
-setup()
-{
-	char *tst_buff;                 /* test buffer to hold known data */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Get the system page size */
-	if ((page_sz = getpagesize()) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "getpagesize() fails to get system page size");
-		tst_exit();
-	}
-
-	/* Allocate space for the test buffer */
-	if ((tst_buff = (char *)calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, NULL,
-			 "calloc() failed to allocate space for tst_buff");
-		tst_exit();
-	}
-
-	/* Fill the test buffer with the known data */
-	memset(tst_buff, 'A', page_sz);
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a temporary file used for mapping */
-	if ((fildes = open(TEMPFILE, O_WRONLY | O_CREAT, 0666)) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "open() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Write test buffer contents into temporary file */
-	if (write(fildes, tst_buff, strlen(tst_buff)) < (int)strlen(tst_buff)) {
-		tst_brkm(TFAIL, NULL,
-			 "write() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Free the memory allocated for test buffer */
-	free(tst_buff);
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *	       Remove the temporary directory created.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-        if (fildes >= 0)
-		close (fildes);
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/mmap07.c b/winsup/testsuite/winsup.api/ltp/mmap07.c
deleted file mode 100644
index ab989f443..000000000
--- a/winsup/testsuite/winsup.api/ltp/mmap07.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: mmap07
- *
- * Test Description:
- *  Call mmap() to map a file creating a mapped region with read access
- *  under the following conditions -
- *	- The prot parameter is set to PROT_WRITE
- *	- The file descriptor is open for writing.
- *	- The flags parameter has MAP_PRIVATE set.
- *
- *  The call should fail to map the file.
- *
- * Expected Result:
- *  mmap() should fail returning -1 and errno should get set to EACCES.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *   Create temporary directory.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	if errno set == expected errno
- *   		Issue sys call fails with expected return value and errno.
- *   	Otherwise,
- *		Issue sys call fails with unexpected errno.
- *   Otherwise,
- *	Issue sys call returns unexpected value.
- *
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory(s)/file(s) created.
- *
- * Usage:  <for command-line>
- *  mmap07 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMPFILE	"mmapfile"
-
-const char *TCID="mmap07";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={EACCES, 0};
-
-size_t page_sz;			/* system page size */
-char *addr;			/* addr of memory mapped region */
-int fildes = -1;		/* file descriptor for temporary file */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call mmap to map the temporary file 'TEMPFILE'
-	 	 * with write access.
-		 */
-		TEST(mmap(0, page_sz, PROT_WRITE,
-			    MAP_FILE|MAP_PRIVATE, fildes, 0));
-
-		/* Check for the return value of mmap() */
-		if (TEST_RETURN != (int)MAP_FAILED) {
-			tst_resm(TFAIL, "mmap() returned invalid value, "
-				 "expected: -1");
-			/* Unmap the mapped memory */
-			if (munmap(addr, page_sz) != 0) {
-				tst_brkm(TBROK, cleanup, "munmap() failed");
-			}
-			continue;
-		}
-		TEST_ERROR_LOG(TEST_ERRNO);
-		if (TEST_ERRNO == EACCES) {
-			tst_resm(TPASS, "mmap() fails, 'fd' doesn't allow "
-				 "desired access, errno:%d", errno);
-		} else {
-			tst_resm(TFAIL, "mmap() fails, 'fd' doesn't allow "
-				 "desired access, invalid errno:%d", errno);
-		}
-
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- * 	     Get the system page size.
- * 	     Create a temporary directory and a file under it.
- * 	     Write some known data into file.
- */
-void 
-setup()
-{
-	char *tst_buff;			/* test buffer to hold known data */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Get the system page size */
-	if ((page_sz = getpagesize()) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "getpagesize() fails to get system page size");
-		tst_exit();
-	}
-
-	/* Allocate space for the test buffer */
-	if ((tst_buff = (char *)calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, NULL,
-			 "calloc() failed to allocate space for tst_buff");
-		tst_exit();
-	}
-
-	/* Fill the test buffer with the known data */
-	memset(tst_buff, 'A', page_sz);
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a temporary file used for mapping */
-	if ((fildes = open(TEMPFILE, O_WRONLY | O_CREAT, 0666)) < 0) {
-		tst_brkm(TFAIL, NULL, "open() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Write test buffer contents into temporary file */
-	if (write(fildes, tst_buff, strlen(tst_buff)) < (int)strlen(tst_buff)) {
-		tst_brkm(TFAIL, NULL, "write() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Free the memory allocated for test buffer */
-	free(tst_buff);
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- * 	       Remove the temporary directory created.
- */
-void 
-cleanup()
-{
-	/*
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-        if (fildes >= 0)
-		close (fildes);
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/mmap08.c b/winsup/testsuite/winsup.api/ltp/mmap08.c
deleted file mode 100644
index 543c5397b..000000000
--- a/winsup/testsuite/winsup.api/ltp/mmap08.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: mmap08
- *
- * Test Description:
- *  Verify that mmap() fails to map a file creating a mapped region 
- *  when the file specified by file descriptor is not valid.
- *
- * Expected Result:
- *  mmap() should fail returning -1 and errno should get set to EBADF.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *   Create temporary directory.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	if errno set == expected errno
- *   		Issue sys call fails with expected return value and errno.
- *   	Otherwise,
- *		Issue sys call fails with unexpected errno.
- *   Otherwise,
- *	Issue sys call returns unexpected value.
- *
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory(s)/file(s) created.
- *
- * Usage:  <for command-line>
- *  mmap08 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMPFILE	"mmapfile"
-
-const char *TCID="mmap08";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={EBADF, 0};
-
-size_t page_sz;			/* system page size */
-char *addr;			/* addr of memory mapped region */
-int fildes = -1;		/* file descriptor for temporary file */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call mmap to map the temporary file 'TEMPFILE'
-	 	 * which is already closed. so, fildes is not valid.
-		 */
-		TEST(mmap(0, page_sz, PROT_WRITE,
-			    MAP_FILE|MAP_SHARED, fildes, 0));
-
-		/* Check for the return value of mmap() */
-		if (TEST_RETURN != (int)MAP_FAILED) {
-			tst_resm(TFAIL, "mmap() returned invalid value, "
-				 "expected: -1");
-			/* Unmap the mapped memory */
-			if (munmap(addr, page_sz) != 0) {
-				tst_brkm(TBROK, cleanup, "munmap() failed");
-			}
-			continue;
-		}
-		TEST_ERROR_LOG(TEST_ERRNO);
-		if (TEST_ERRNO == EBADF) {
-			tst_resm(TPASS, "mmap() fails, 'fd' is not valid, "
-				 "errno:%d", errno);
-		} else {
-			tst_resm(TFAIL, "mmap() fails, 'fd' is not valid, "
-				 "invalid errno:%d", errno);
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *	     Get the system page size.
- *	     Create a temporary directory and a file under it.
- *	     Write some known data into file and close it.
- */
-void 
-setup()
-{
-	char *tst_buff;			/* test buffer to hold known data */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Get the system page size */
-	if ((page_sz = getpagesize()) < 0) {
-		tst_brkm(TFAIL, NULL,
-			 "getpagesize() fails to get system page size");
-		tst_exit();
-	}
-
-	if ((tst_buff = (char *)calloc(page_sz, sizeof(char))) == NULL) {
-		tst_brkm(TFAIL, NULL,
-			 "calloc() failed to allocate space for tst_buff");
-		tst_exit();
-	}
-
-	/* Fill the test buffer with the known data */
-	memset(tst_buff, 'A', page_sz);
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a temporary file used for mapping */
-	if ((fildes = open(TEMPFILE, O_WRONLY | O_CREAT, 0666)) < 0) {
-		tst_brkm(TFAIL, NULL, "open() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Write test buffer contents into temporary file */
-	if (write(fildes, tst_buff, strlen(tst_buff))
-	    != (int)strlen(tst_buff)) {
-		tst_brkm(TFAIL, NULL, "write() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		free(tst_buff);
-		cleanup();
-	}
-
-	/* Free the memory allocated for test buffer */
-	free(tst_buff);
-
-	/* Close the temporary file opened for writing */
-	if (close(fildes) < 0) {
-		tst_brkm(TFAIL, cleanup, "close() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-	}
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *	       Remove the temporary directory created.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-        if (fildes >= 0)
-		close (fildes);
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/munmap01.c b/winsup/testsuite/winsup.api/ltp/munmap01.c
deleted file mode 100644
index 0527201be..000000000
--- a/winsup/testsuite/winsup.api/ltp/munmap01.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: munmap01
- *
- * Test Description:
- *  Verify that, munmap call will succeed to unmap a mapped file or
- *  anonymous shared memory region from the calling process's address space
- *  and after successful completion of munmap, the unmapped region is no
- *  longer accessible.
- *
- * Expected Result:
- *  munmap call should succeed to unmap a mapped file or anonymous shared
- *  memory region from the process's address space and it returns with a
- *  value 0, further reference to the unmapped region should result in a
- *  segmentation fault (SIGSEGV).
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  munmap01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.  
- */
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMPFILE	"mmapfile"
-
-const char *TCID="munmap01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-char *addr;			/* addr of memory mapped region */
-int fildes;			/* file descriptor for tempfile */
-unsigned int map_len;		/* length of the region to be mapped */
-
-void setup();			/* Main setup function of test */
-void cleanup(void);		/* cleanup function for the test */
-void sig_handler();		/* signal catching function */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *)NULL, NULL);
-	if (msg != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* Perform global setup for test */
-		setup();
-
-		/* 
-		 * Call munmap to unmap the mapped region of the 
-	 	 * temporary file from the calling process's address space.
-		 */
-		TEST(munmap(addr, map_len));
-
-		/* Check for the return value of munmap() */
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "munmap() fails, errno=%d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Check whether further reference is possible
-			 * to the unmapped memory region by writing
-			 * to the first byte of region with
-			 * some arbitrary number.
-			 */
-			*addr = 50; 
-
-			/* This message is printed if no SIGSEGV */
-			tst_resm(TFAIL, "process succeeds to refer unmapped "
-				 "memory region");
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-
-		/* Call cleanup() to undo setup done for the test. */
-		cleanup();
-
-	}	/* End for TEST_LOOPING */
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *
- * Set up signal handler to catch SIGSEGV.
- * Get system page size, create a temporary file for reading/writing,
- * write one byte data into it, map the open file for the specified
- * map length.
- */
-void 
-setup()
-{
-	size_t page_sz;			/* system page size */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* call signal function to trap the signal generated */
-	if (signal(SIGSEGV, sig_handler) == SIG_ERR) {
-		tst_brkm(TBROK, cleanup, "signal fails to catch signal");
-		tst_exit();
-	}
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Get the system page size */
-	if ((page_sz = getpagesize()) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "getpagesize() fails to get system page size");
-		tst_exit();
-	}
-
-	/*
-	 * Get the length of the open file to be mapped into process
-	 * address space.
-	 */
-	map_len = 3 * page_sz;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a temporary file used for mapping */
-	if ((fildes = open(TEMPFILE, O_RDWR | O_CREAT, 0666)) < 0) {
-		tst_brkm(TBROK, cleanup, "open() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		tst_exit();
-	}
-
-	/*
-	 * move the file pointer to maplength position from the beginning
-	 * of the file.
-	 */
-	if (lseek(fildes, map_len, SEEK_SET) == -1) {
-		tst_brkm(TBROK, cleanup, "lseek() fails on %s, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		tst_exit();
-	}
-
-	/* Write one byte into temporary file */
-	if (write(fildes, "a", 1) != 1) {
-		tst_brkm(TBROK, cleanup, "write() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		tst_exit();
-	}
-	
-	/*
-	 * map the open file 'TEMPFILE' from its beginning up to the maplength
-	 * into the calling process's address space at the system choosen
-	 * with read/write permissions to the the mapped region.
-	 */
-	addr = mmap(0, map_len, PROT_READ | PROT_WRITE, \
-		    MAP_FILE | MAP_SHARED, fildes, 0);
-
-	/* check for the return value of mmap system call */
-	if (addr == (char *)MAP_FAILED) {
-		tst_brkm(TBROK, cleanup, "mmap() Failed on %s, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		tst_exit();
-	}
-}
-
-/*
- * sig_handler() - signal catching function.
- *   This function is used to trap the signal generated when tried to read or
- *   write to the memory mapped region which is already detached from the
- *   calling process address space.
- *   this function is invoked when SIGSEGV generated and it calls test
- *   cleanup function and exit the program.
- */
-void
-sig_handler()
-{
-	tst_resm(TPASS, "Functionality of munmap() successful");
-
-	/* Invoke test cleanup function and exit */
-	cleanup();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *  	       Close the temporary file.
- *  	       Remove the temporary directory.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the temporary file */
-	if (close(fildes) < 0) {
-		tst_brkm(TFAIL, NULL, "close() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-	}
-
-	/* Remove the temporary directory and all files in it */
-	tst_rmdir();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/munmap02.c b/winsup/testsuite/winsup.api/ltp/munmap02.c
deleted file mode 100644
index 7345e73e0..000000000
--- a/winsup/testsuite/winsup.api/ltp/munmap02.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: munmap02
- *
- * Test Description:
- *  Verify that, munmap call will succeed to unmap a mapped file or
- *  anonymous shared memory region from the calling process's address space
- *  if the region specified by the address and the length is part or all of
- *  the mapped region.
- *
- * Expected Result:
- *  munmap call should succeed to unmap a part or all of mapped region of a
- *  file or anonymous shared memory from the process's address space and it
- *  returns with a value 0, 
- *  further reference to the unmapped region should result in a segmentation
- *  fault (SIGSEGV).
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  munmap01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMPFILE	"mmapfile"
-
-const char *TCID="munmap02";	/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-size_t page_sz;			/* system page size */
-char *addr;			/* addr of memory mapped region */
-int fildes;			/* file descriptor for tempfile */
-unsigned int map_len;		/* length of the region to be mapped */
-
-void setup();			/* Main setup function of test */
-void cleanup(void);		/* cleanup function for the test */
-void sig_handler();		/* signal catching function */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *)NULL, NULL);
-	if (msg != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* Perform global setup for test */
-		setup();
-
-		/* 
-		 * Call munmap to unmap the part of the mapped region of the
-		 * temporary file from the address and length that is part of
-		 * the mapped region.
-		 */
-		TEST(munmap(addr, map_len));
-
-		/* Check for the return value of munmap() */
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "munmap() fails, errno=%d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Check whether further reference is possible
-			 * to the unmapped memory region by writing
-			 * to the first byte of region with
-			 * some arbitrary number.
-			 */
-			*addr = 50; 
-
-			/* This message is printed if no SIGSEGV */
-			tst_resm(TFAIL, "process succeeds to refer unmapped "
-				 "memory region");
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-
-		/* Call cleanup() to undo setup done for the test. */
-		cleanup();
-
-	}	/* End for TEST_LOOPING */
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- * Setup signal handler to catch SIGSEGV.
- * Get system page size, create a temporary file for reading/writing,
- * write one byte data into it, map the open file for the specified
- * map length.
- */
-void 
-setup()
-{
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* call signal function to trap the signal generated */
-	if (signal(SIGSEGV, sig_handler) == SIG_ERR) {
-		tst_brkm(TBROK, cleanup, "signal fails to catch signal");
-		tst_exit();
-	}
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Get the system page size */
-	if ((page_sz = getpagesize()) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "getpagesize() fails to get system page size");
-		tst_exit();
-	}
-
-	/*
-	 * Get the length of the open file to be mapped into process
-	 * address space.
-	 */
-	map_len = 3 * page_sz;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Creat a temporary file used for mapping */
-	if ((fildes = open(TEMPFILE, O_RDWR | O_CREAT, 0666)) < 0) {
-		tst_brkm(TBROK, cleanup, "open() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		tst_exit();
-	}
-
-	/*
-	 * move the file pointer to maplength position from the beginning
-	 * of the file.
-	 */
-	if (lseek(fildes, map_len, SEEK_SET) == -1) {
-		tst_brkm(TBROK, cleanup, "lseek() fails on %s, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		tst_exit();
-	}
-
-	/* Write one byte into temporary file */
-	if (write(fildes, "a", 1) != 1) {
-		tst_brkm(TBROK, cleanup, "write() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		tst_exit();
-	}
-	
-	/*
-	 * map the open file 'TEMPFILE' from its beginning up to the maplength
-	 * into the calling process's address space at the system choosen
-	 * with read/write permissions to the the mapped region.
-	 */
-	addr = mmap(0, map_len, PROT_READ | PROT_WRITE,
-		    MAP_FILE | MAP_SHARED, fildes, 0);
-
-	/* check for the return value of mmap system call */
-	if (addr == (char *)MAP_FAILED) {
-		tst_brkm(TBROK, cleanup, "mmap() Failed on %s, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-		tst_exit();
-	}
-
-	/*
-	 * increment the start address of the region at which the file is
-	 * mapped to a maplength of 3 times the system page size by the value
-	 * of system  page size and decrement the maplength value by the value
-	 * of system page size.
-	 */
-	addr = (char *)((long)addr + page_sz);
-	map_len = map_len - page_sz;
-}
-
-/*
- * void
- * sig_handler() - signal catching function.
- *   This function is used to trap the signal generated when tried to read or
- *   write to the memory mapped region which is already detached from the
- *   calling process address space.
- *   this function is invoked when SIGSEGV generated and it calls test
- *   cleanup function and exit the program.
- */
-void
-sig_handler()
-{
-	tst_resm(TPASS, "Functionality of munmap() successful");
-
-	/* Invoke test cleanup function and exit */
-	cleanup();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *  Unmap the portion of the region of the file left unmapped.
- *  Close the temporary file.
- *  Remove the temporary directory.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * get the start address and length of the portion of
-	 * the mapped region of the file.
-	 */
-	addr = (char *)((long)addr - page_sz);
-	map_len = map_len - page_sz;
-
-	/* unmap the portion of the region of the file left unmapped */
-	if (munmap(addr, map_len) < 0) {
-		tst_brkm(TBROK, NULL,
-			 "munmap() fails to unmap portion of mapped region");
-	}
-
-	/* Close the temporary file */
-	if (close(fildes) < 0) {
-		tst_brkm(TBROK, NULL, "close() on %s Failed, errno=%d : %s",
-			 TEMPFILE, errno, strerror(errno));
-	}
-
-	/* Remove the temporary directory and all files in it */
-	tst_rmdir();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/nice05.c b/winsup/testsuite/winsup.api/ltp/nice05.c
deleted file mode 100644
index 1246e7fbd..000000000
--- a/winsup/testsuite/winsup.api/ltp/nice05.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: nice05
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for nice(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) nice(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the nice(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	nice(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="nice05"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int val;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-        val = lc % 39;
-	/* 
-	 * Call nice(2)
-	 */
-	TEST(nice(val));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "nice(%d) Failed, errno=%d : %s", val,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "nice(%d) returned %d", val, TEST_RETURN);
-	    } 
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/open02.c b/winsup/testsuite/winsup.api/ltp/open02.c
deleted file mode 100644
index 594ab5b1c..000000000
--- a/winsup/testsuite/winsup.api/ltp/open02.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	open02.c 
- *
- * DESCRIPTION
- * 	Test if open without O_CREAT returns -1 if a file does not exist.
- *
- * ALGORITHM
- *	1. open a new file without O_CREAT, test for return value of -1
- *
- * USAGE:  <for command-line>
- *  open02 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <sys/fcntl.h>
-#include <test.h>
-#include <usctest.h>
-
-const char *TCID = "open02";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-char pfilname[40] = "";
-
-int exp_enos[] = {ENOENT, 0};
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	/*
-	 * parse standard command line options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		 tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();			/* global setup for test */
-
-	TEST_EXP_ENOS(exp_enos);
-
-	/*
-	 * check looping state if -i option given on the command line
-	 */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		Tst_count = 0;		/* reset Tst_count while looping. */
-
-		TEST(open(pfilname, O_RDWR, 0444));
-
-		if (TEST_RETURN != -1) {
-			tst_resm(TFAIL, "opened non-existent file");
-			continue;
-		}
-
-		TEST_ERROR_LOG(TEST_ERRNO);
-
-		if (TEST_ERRNO != ENOENT) {
-			tst_resm(TFAIL, "open(2) set invalid errno: "
-				 "expected ENOENT, got %d", TEST_ERRNO);
-		} else {
-			tst_resm(TPASS, "open returned ENOENT");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	umask(0);
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that options was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	sprintf(pfilname, "./open3.%d", getpid());
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at completion or
- *	       premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/open03.c b/winsup/testsuite/winsup.api/ltp/open03.c
deleted file mode 100644
index 6a699bad1..000000000
--- a/winsup/testsuite/winsup.api/ltp/open03.c
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: open03
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for open(2)
- * 
- *    PARENT DOCUMENT	: xxxtds01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) open(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the open(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	open(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="open03"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call open(2)
-	 */
-	TEST(open(fname,O_RDWR|O_CREAT,0700));
-	
-	fd=TEST_RETURN;
-
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "open(%s,O_RDWR|O_CREAT,0700) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "open(%s, O_RDWR|O_CREAT,0700) returned %d",
-			 fname, TEST_RETURN);
-	    } 
-	    
-	    if (close(fd) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "close(%s) Failed, errno=%d : %s",
-			 fname, errno, strerror(errno));
-	    } else if (unlink(fname) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "unlink(%s) Failed, errno=%d : %s",
-			 fname, errno, strerror(errno));
-	    }
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/pathconf01.c b/winsup/testsuite/winsup.api/ltp/pathconf01.c
deleted file mode 100644
index 466875f21..000000000
--- a/winsup/testsuite/winsup.api/ltp/pathconf01.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: pathconf01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for pathconf(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 6
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) pathconf(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the pathconf(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	pathconf(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="pathconf01"; 	/* Test program identifier.    */
-int TST_TOTAL;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int i;
-const char *path = "/tmp";
-
-struct pathconf_args
-{
-   const char *define_tag;
-   int value;
-} args[] = {
-    {"_PC_LINK_MAX", _PC_LINK_MAX},
-    {"_PC_NAME_MAX", _PC_NAME_MAX},
-    {"_PC_PATH_MAX", _PC_PATH_MAX},
-    {"_PC_PIPE_BUF", _PC_PIPE_BUF},
-    {"_PC_CHOWN_RESTRICTED", _PC_CHOWN_RESTRICTED},
-    {"_PC_NO_TRUNC", _PC_NO_TRUNC},
-    {NULL, 0}
-};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    TST_TOTAL=(sizeof(args)/sizeof(args[0]))-1;
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-        for (i=0; i<TST_TOTAL; i++) {
-
-	    errno=-4;
-
-	    /* 
-	     * Call pathconf(2)
-	     */
-	    TEST(pathconf(path, args[i].value));
-	    
-	    /* 
-	     * A test case can only fail if -1 is returned and the errno
-	     * was set.  If the errno remains unchanged, the
-	     * system call did not fail.
-	     */
-	    if ( TEST_RETURN == -1 && errno != -4 ) {
-		tst_resm(TFAIL, "pathconf(%s, %s) Failed, errno=%d : %s",
-			 path, args[i].define_tag,
-			 TEST_ERRNO, strerror(TEST_ERRNO));
-	    } else {
-		
-		/***************************************************************
-		 * only perform functional verification if flag set (-f not given)
-		 ***************************************************************/
-		if ( STD_FUNCTIONAL_TEST ) {
-		    /* No Verification test, yet... */
-		    tst_resm(TPASS, "pathconf(%s, %s) returned %d",
-			     path, args[i].define_tag, TEST_RETURN);
-		} 
-	    }
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/pause01.c b/winsup/testsuite/winsup.api/ltp/pause01.c
deleted file mode 100644
index 1c3b94607..000000000
--- a/winsup/testsuite/winsup.api/ltp/pause01.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: pause01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for pause(2)
- * 
- *    PARENT DOCUMENT	: xxxtds01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 2
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) pause(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the pause(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	pause(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="pause01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={EINTR, 0};
-void go();
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-        (void) signal(SIGALRM, go);
-        alarm(1);
-	/* 
-	 * Call pause(2)
-	 */
-	TEST(pause());
-	
-	/* check return code.  Pause returns -1 and EINTR errno */
-	if (TEST_RETURN != -1) {
-	    tst_resm(TFAIL,
-		     "pause() returned WITHOUT an error return code : %d",
-		     TEST_ERRNO);
-	} else {
-	    /* log the errno */
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* check the errno */
-		if (TEST_ERRNO == EINTR)
-		    tst_resm(TPASS, "pause() returned %d", TEST_RETURN);
-		else
-		    tst_resm(TFAIL, "pause() returned %d. Expected %d (EINTR)",
-			     TEST_RETURN, EINTR);
-	    } 
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-/* routine to catch the alarm signal */
-void
-go()
-{
-}
diff --git a/winsup/testsuite/winsup.api/ltp/pipe01.c b/winsup/testsuite/winsup.api/ltp/pipe01.c
deleted file mode 100644
index cc01cc988..000000000
--- a/winsup/testsuite/winsup.api/ltp/pipe01.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	pipe01.c
- *
- * DESCRIPTION
- *	Testcase to check the basic functionality of the pipe(2) syscall:
- *	Check that both ends of the pipe (both file descriptors) are
- *	available to a process opening the pipe.
- *
- * ALGORITHM
- *	Write a string of characters down a pipe; read the string from the
- *	other file descriptor. Test passes if both can be done, as reported
- *	by the number of characters written and read.
- *
- * USAGE:  <for command-line>
- *  pipe01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * RESTRICITONS
- *	NONE
- */
-#include <errno.h>
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "pipe01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	int fildes[2];			/* fds for pipe read and write */
-	char wrbuf[BUFSIZ], rebuf[BUFSIZ];
-	int red, written;		/* no. of chars read/written to pipe */
-	int greater, length;
-	char *strcpy();
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(pipe(fildes));
-
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "pipe() failed unexpectedly - errno %d",
-				 TEST_ERRNO);
-			continue;
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-
-			strcpy(wrbuf, "abcdefghijklmnopqrstuvwxyz");
-			length = strlen(wrbuf);
-
-			if ((written = write(fildes[1], wrbuf, length)) == -1) {
-				tst_brkm(TBROK, cleanup, "write() failed");
-			}
-
-			if ((written < 0) || (written > 26)) {
-				tst_resm(TFAIL, "Condition #1 test failed");
-				continue;
-			}
-
-			if ((red = read(fildes[0], rebuf, written)) == -1) {
-				tst_brkm(TBROK, cleanup, "read() failed");
-			}
-
-			if ((red < 0) || (red > written)) {
-				tst_resm(TFAIL, "Condition #2 test failed");
-				continue;
-			}
-
-			/* are the strings written and read equal */
-			if ((greater = memcmp(rebuf, wrbuf, red)) != 0) {
-				tst_resm(TFAIL, "Condition #3 test failed");
-				continue;
-			}
-			tst_resm(TPASS, "pipe() functionality is correct");
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/pipe08.c b/winsup/testsuite/winsup.api/ltp/pipe08.c
deleted file mode 100644
index 70d61dab8..000000000
--- a/winsup/testsuite/winsup.api/ltp/pipe08.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	pipe08.c
- *
- * DESCRIPTION
- *	Check that a SIGPIPE signal is generated when a write is
- *	attempted on an empty pipe.
- *
- * ALGORITHM
- *	1. Write to a pipe after closing the read side.
- *	2. Check for the signal SIGPIPE to be received.
- *
- * USAGE:  <for command-line>
- *  pipe08 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * USAGE
- *	pipe08
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	None
- */
-#include <errno.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "pipe08";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-void sighandler(int);
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	int pipefd[2];			/* fds for pipe read/write */
-	char wrbuf[BUFSIZ];
-	int written, length;
-	int close_stat;			/*  exit status of close(read fd) */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	if (!STD_FUNCTIONAL_TEST) {
-		tst_resm(TWARN, "-f option should not be used");
-	}
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(pipe(pipefd));
-
-		if (TEST_RETURN != 0) {
-			tst_resm(TFAIL, "call failed unexpectedly");
-			continue;
-		}
-
-		if ((close_stat = close(pipefd[0])) == -1) {
-			tst_brkm(TBROK, cleanup, "close of read side failed");
-		}
-
-		strcpy(wrbuf, "abcdefghijklmnopqrstuvwxyz\0");
-		length = strlen(wrbuf);
-
-		/*
-		 * the SIGPIPE signal will be caught here or else
-		 * the program will dump core when the signal is
-		 * sent
-		 */
-		written = write(pipefd[1], wrbuf, length);
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * sighandler - catch signals and look for SIGPIPE
- */
-void
-sighandler(int sig)
-{
-	if (sig != SIGPIPE) {
-		tst_resm(TFAIL, "expected SIGPIPE, got %d", sig);
-	} else {
-		tst_resm(TPASS, "got expected SIGPIPE signal");
-	}
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, sighandler, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/pipe09.c b/winsup/testsuite/winsup.api/ltp/pipe09.c
deleted file mode 100644
index eb21bb601..000000000
--- a/winsup/testsuite/winsup.api/ltp/pipe09.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	pipe09.c
- *
- * DESCRIPTION
- *	Check that two processes can use the same pipe at the same time.
- *
- * ALGORITHM
- *	1. Open a  pipe
- *	2. Fork a child which writes to the pipe
- *	3. Fork another child which writes a different character to the pipe
- *	4. Have the parent read from the pipe
- *	5. It should get the characters from both children.
- *
- * USAGE:  <for command-line>
- *  pipe09 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	None
- */
-#include <signal.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include "test.h"
-#include "usctest.h"
-
-#define	PIPEWRTCNT	100		/* must be an even number */
-
-const char *TCID = "pipe09";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	int i, red, wtstatus;
-	int pipefd[2];			/* fds for pipe read/write */
-	char rebuf[BUFSIZ];
-	int Acnt = 0, Bcnt = 0;		/* count 'A' and 'B' */
-	int fork_1, fork_2;		/* ret values in parent */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(pipe(pipefd));
-
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "pipe() call failed");
-			continue;
-		}
-
-		if (!STD_FUNCTIONAL_TEST) {
-			tst_resm(TWARN, "-f option should not be used");
-			tst_resm(TPASS, "call succeeded");
-			continue;
-		}
-
-		if ((fork_1 = fork()) == -1) {
-			tst_brkm(TBROK, cleanup, "fork() #1 failed");
-			/*NOTREACHED*/
-		}
-
-		if (fork_1 == 0) {	/* 1st child */
-			if (close(pipefd[0]) != 0) {
-				tst_resm(TWARN, "pipefd[0] close failed, "
-					 "errno = %d", errno);
-				exit(1);
-			}
-
-			for (i = 0; i < PIPEWRTCNT / 2; ++i) {
-				if (write(pipefd[1], "A", 1) != 1) {
-					tst_resm(TWARN, "write to pipe failed");
-					exit(1);
-				}
-			}
-			exit(0);
-		}
-
-		/* parent */
-
-		waitpid(fork_1, &wtstatus, 0);
-		if (WEXITSTATUS(wtstatus) != 0) {
-			tst_brkm(TBROK, cleanup, "problem detected in child, "
-				 "wait status %d, errno = %d", wtstatus, errno);
-		}
-
-		if ((fork_2 = fork()) == -1) {
-			tst_brkm(TBROK, cleanup, "fork() #2 failed");
-			/*NOTREACHED*/
-		}
-
-		if (fork_2 == 0) {	/* 2nd child */
-			if (close(pipefd[0]) != 0) {
-				tst_resm(TWARN, "pipefd[0] close "
-					 "failed, errno = %d", errno);
-				exit(1);
-			}
-
-			for (i = 0; i < PIPEWRTCNT / 2; ++i) {
-				if (write(pipefd[1], "B", 1) != 1) {
-					tst_resm(TWARN, "write to pipe failed");
-					exit(1);
-				}
-			}
-			exit(0);
-		}
-
-		/* parent */
-
-		waitpid(fork_2, &wtstatus, 0);
-		if (WEXITSTATUS(wtstatus) != 0) {
-			tst_brkm(TBROK, cleanup, "problem detected in child, "
-				 "wait status %d, errno = %d", wtstatus, errno);
-		}
-
-		if (close(pipefd[1]) != 0) {
-			tst_brkm(TBROK, cleanup, "pipefd[1] close failed, "
-				 "errno = %d", errno);
-			/*NOTREACHED*/
-		}
-
-		while ((red = read(pipefd[0], rebuf, 100)) > 0) {
-			for (i = 0; i < red; i++) {
-				if (rebuf[i] == 'A') {
-					Acnt++;
-					continue;
-				}
-				if (rebuf[i] == 'B') {
-					Bcnt++;
-					continue;
-				}
-				tst_resm(TFAIL, "got bogus '%c' character",
-					 rebuf[i]);
-				break;
-			}
-		}
-
-		if (red == -1) {
-			tst_brkm(TBROK, cleanup, "Failure reading pipefd pipe, "
-				 "errno = %d", errno);
-		}
-
-		if (Bcnt == Acnt && Bcnt == (PIPEWRTCNT / 2)) {
-			tst_resm(TPASS, "functionality appears to be correct");
-		} else {
-			tst_resm(TFAIL, "functionality is not correct - Acnt "
-				 "= %d, Bcnt = %d", Acnt, Bcnt);
-		}
-
-		/* clean up things in case we are looping */
-		Acnt = Bcnt = 0;
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/pipe10.c b/winsup/testsuite/winsup.api/ltp/pipe10.c
deleted file mode 100644
index 52ac5d94e..000000000
--- a/winsup/testsuite/winsup.api/ltp/pipe10.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	pipe10.c
- *
- * DESCRIPTION
- *	Check that parent can open a pipe and have a child read from it
- *
- * ALGORITHM
- *	Parent opens pipe, child reads. Passes if child can read all the
- *	characters written by the parent.
- *
- * USAGE:  <for command-line>
- *  pipe10 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	None
- */
-#include <errno.h>
-#include <sys/wait.h>
-#include <test.h>
-#include <usctest.h>
-
-const char *TCID = "pipe10";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	int fd[2];			/* fds for pipe read/write */
-	char wrbuf[BUFSIZ], rebuf[BUFSIZ];
-	int red, written;		/* no of chars read and */ 
-					/* written to pipe */
-	int length, greater, forkstat;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(pipe(fd));
-
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "pipe creation failed");
-			continue;
-		}
-
-		if (!STD_FUNCTIONAL_TEST) {
-			tst_resm(TPASS, "call succeeded");
-			continue;
-		}
-
-		strcpy(wrbuf, "abcdefghijklmnopqrstuvwxyz\0");
-		length = strlen(wrbuf);
-
-		written = write(fd[1], wrbuf, length);
-
-		/* did write write at least some chars */
-		if ((written < 0) || (written > length)) {
-			tst_brkm(TBROK, cleanup, "write to pipe failed");
-		}
-
-		forkstat = fork();
-
-		if (forkstat == -1) {
-			tst_brkm(TBROK, cleanup, "fork() failed");
-			/*NOTREACHED*/
-		}
-
-		if (forkstat == 0) {		/* child */
-			red = read(fd[0], rebuf, written);
-
-			/* did read , get at least some chars */
-			if ((red < 0) || (red > written)) {
-				tst_brkm(TBROK, cleanup, "read pipe failed");
-			}
-
-			greater = memcmp(rebuf, wrbuf, red);
-
-			/* are the strings written and read equal */
-			if (greater == 0) {
-				tst_resm(TPASS, "functionality is correct");
-			} else {
-				tst_resm(TFAIL, "read & write strings do "
-					 "not match");
-			}
-		} else {	/* parent */
-			/* let the child carry on */
-			exit(0);
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/pipe11.c b/winsup/testsuite/winsup.api/ltp/pipe11.c
deleted file mode 100644
index 558e70a96..000000000
--- a/winsup/testsuite/winsup.api/ltp/pipe11.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	pipe11.c
- *
- * DESCRIPTION
- *	Check if many children can read what is written to a pipe by the
- *	parent.
- *
- * ALGORITHM
- *	1. Open a pipe and write to it
- *	2. Fork a large number of children
- *	3. Have the children read the pipe and check how many characters
- *	   each got
- *
- * USAGE:  <for command-line>
- *  pipe11 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	None
- */
-#include <errno.h>
-#include <limits.h>
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "pipe11";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-#define	NUMCHILD	50
-#define	NCPERCHILD	50
-char rawchars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890";
-int kidid;
-int numchild;			/* no of children to fork */
-int ncperchild;			/* no of chars child should read */
-int szcharbuf;			/* size of char buf */
-int pipewrcnt;			/* chars written to pipe */
-char *wrbuf, *rdbuf;
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	int fd[2];			/* fds for pipe read/write */
-	int i;
-	int fork_ret, status;
-	int nread, written;		/* no of chars read and written */
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(pipe(fd));
-
-		if (TEST_RETURN != 0) {
-			tst_resm(TFAIL, "pipe creation failed");
-			continue;
-		}
-
-		if (!STD_FUNCTIONAL_TEST) {
-			tst_resm(TPASS, "call succeeded");
-			continue;
-		}
-
-		written = write(fd[1], wrbuf, szcharbuf);
-		if (written != szcharbuf) {
-			tst_brkm(TBROK, cleanup, "write to pipe failed");
-		}
-
-refork:
-		++kidid;
-		fork_ret = fork();
-
-		if (fork_ret < 0) {
-			tst_brkm(TBROK, cleanup, "fork() failed");
-			/*NOTREACHED*/
-		}
-
-		if ((fork_ret != 0) && (fork_ret != -1) && (kidid < numchild)) {
-			goto refork;
-		}
-
-		if (fork_ret == 0) {		/* child */
-			if (close(fd[1])) {
-				tst_resm(TINFO, "child %d " "could not close "
-					 "pipe", kidid);
-				exit(0);
-			}
-			nread = read(fd[0], rdbuf, ncperchild);
-			if (nread == ncperchild) {
-				tst_resm(TINFO, "child %d " "got %d chars",
-					 kidid, nread);
-				exit(0);
-			} else {
-				tst_resm(TFAIL, "child %d did not receive "
-					 "expected no of characters, got %d "
-					 "characters", kidid, nread);
-				exit(1);
-			}
-		}
-
-		/* parent */
-		sleep(5);
-		tst_resm(TINFO, "There are %d children to wait for", kidid);
-		for (i = 1; i <= kidid; ++i) {
-			wait(&status);
-			if (status == 0) {
-				tst_resm(TPASS, "child %d exitted successfully",
-					 i);
-			} else {
-				tst_resm(TFAIL, "child %d exitted with bad "
-					 "status", i);
-			}
-		}
-	}
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void
-setup()
-{
-	int i, j;
-
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	numchild = NUMCHILD;
-	ncperchild = NCPERCHILD;
-
-	kidid = 0;
-
-	/* allocate read and write buffers */
-	szcharbuf = numchild * ncperchild;
-
-	/* make sure pipe write doesn't block */
-	if (szcharbuf == PIPE_BUF) {
-		/* adjust number of characters per child */
-		ncperchild = szcharbuf / numchild;
-	}
-
-	if ((wrbuf = (char *)malloc(szcharbuf)) == (char *)0) {
-		tst_brkm(TBROK, cleanup, "malloc failed");
-		/*NOTREACHED*/
-	}
-
-	if ((rdbuf = (char *)malloc(szcharbuf)) == (char *)0) {
-		tst_brkm(TBROK, cleanup, "malloc of rdbuf failed");
-		/*NOTREACHED*/
-	}
-
-	/* initialize wrbuf */
-	j = 0;
-	for (i = 0; i < szcharbuf; ) {
-		wrbuf[i++] = rawchars[j++];
-		if (j >= (int)sizeof(rawchars)) {
-			j = 0;
-		}
-	}
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/poll01.c b/winsup/testsuite/winsup.api/ltp/poll01.c
deleted file mode 100644
index 704b738a2..000000000
--- a/winsup/testsuite/winsup.api/ltp/poll01.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: poll01
- *
- * Test Description:
- *  Verify that valid open file descriptor must be provided to poll() to
- *  succeed.
- *
- * Expected Result:
- *  poll should return the correct values when an valid file descriptor is
- *  provided.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *
- * Usage:  <for command-line>
- *  poll01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  None.
- */
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-#include <sys/poll.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define BUF_SIZE	512
-
-const char *TCID="poll01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int fildes[2];			/* file descriptors of the pipe. */
-struct pollfd fds[1];		/* struct. for poll() */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-	pid_t cpid;			/* child process id */
-	char write_buf[] = "Testing\0";	/* buffer string for write */
-	char read_buf[BUF_SIZE];	/* buffer for read-end of pipe */
-	int status;			/* exit status of child process */
-	int rval;
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *)NULL, NULL);
-	if (msg != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-
-		/* 
-		 * Call poll() with the TEST macro.
-		 */
-		TEST(poll(fds, 1, -1));
-
-		/* check return code of poll() */
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "poll() failed on write, errno=%d"
-				 " : %s", TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-
-		/* write the message to the pipe */
-		if (write(fildes[1], write_buf, strlen(write_buf))
-						< (int)strlen(write_buf)) {
-			tst_brkm(TBROK, cleanup, "write() failed on write "
-				 "to pipe, error:%d", errno);
-		}
-
-		/* Fork child process */
-		if ((cpid = fork()) == -1) {
-			tst_brkm(TBROK, cleanup, "fork() failed");
-		}
-
-		if (cpid == 0) {	/* Child process */
-			/*
-			 * close writing end of pipe and read from 
-			 * the pipe
-			 */
-			if (close(fildes[1]) == -1) {
-				tst_brkm(TFAIL, NULL, "close() failed on write "
-					 "endof pipe, errno:%d", errno);
-				exit(1);
-			}
-
-			/*
-			 * Set poll() data structures to check
-			 * if data is present on read
-			 */
-			fds[0].fd = fildes[0];
-			fds[0].events = POLLIN;
-
-			/*
-			 * If data are present, then read the data.  If poll()
-			 * and read() return expected values, then the
-			 * functionality of poll() is correct.
-			 */
-			rval = (poll(fds, 1, -1));
-
-			if (rval == -1) {
-				tst_resm(TFAIL, "poll() failed on read - "
-					 "errno=%d : %s",
-					 TEST_ERRNO, strerror(errno));
-				exit(1);
-			}
-
-			/* Read data from read end of pipe */
-			if (read(fildes[0], read_buf, sizeof(read_buf)) !=
-				     (int)strlen(write_buf)) {
-				tst_brkm(TFAIL, NULL, "read() failed - "
-					 "error:%d", errno);
-				exit(1);
-			}
-
-			/* Now, do the actual comparision */
-			if (memcmp(read_buf, write_buf, strlen(write_buf))) {
-				tst_resm(TFAIL, "Data from reading pipe "
-					 "are different");
-				exit(1);
-			}
-
-			/* Everything is fine, exit normally */
-			exit(0);
-		} else {		/* Parent process */
-			/* Wait for child to complete execution */
-			wait(&status);
-
-			if (WEXITSTATUS(status) == 1) {
-				tst_resm(TFAIL, "child exited abnormally");
-			} else {
-				tst_resm(TPASS,
-					 "Functionality of poll() successful");
-			}
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- * 	     Creat read/write pipe using pipe().
- * 	     Set poll data structures to check writing to the pipe.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Creat read/write pipe */
-	if (pipe(fildes) < 0) {
-		tst_brkm(TBROK, tst_exit,
-			 "pipe() failed to create interprocess channel");
-	}
-
-	/* Set poll data structures */
-	fds[0].fd = fildes[1];
-	fds[0].events = POLLOUT;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- * 	       close read end of pipe if still open.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* close read end of pipe if still open */
-	if (close(fildes[0]) < 0) {
-		tst_brkm(TFAIL, NULL, "close() failed on read-end of pipe, "
-			 "errno:%d", errno);
-	}
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/read01.c b/winsup/testsuite/winsup.api/ltp/read01.c
deleted file mode 100644
index 332b939a7..000000000
--- a/winsup/testsuite/winsup.api/ltp/read01.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: read01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for read(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) read(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the read(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	read(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/param.h>
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include "test.h"
-#include "usctest.h"
-
-/*
- * Set READ_BLOCK_SIZE to the block size of the system.
- */
-#ifdef linux
-#define READ_BLOCK_SIZE DEV_BSIZE
-#else
-#ifdef __CYGWIN__
-#define READ_BLOCK_SIZE S_BLKSIZE
-#else
-#define READ_BLOCK_SIZE BSIZE
-#endif
-#endif
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="read01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-char fname[255];
-int fd, i;
-int offset=0;
-char *s;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-    
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-    
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-    
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-        if (write(fd, s, READ_BLOCK_SIZE) == -1) {
-	    tst_brkm(TBROK, cleanup,
-		     "write(%s, %s, %d) Failed, errno=%d : %s",
-		     fname, s, READ_BLOCK_SIZE, errno, strerror(errno));
-        }
-        offset+=READ_BLOCK_SIZE;
-        if (lseek(fd, (long)(offset-READ_BLOCK_SIZE), 0) == -1) {
-	    tst_brkm(TBROK, cleanup,
-		     "lseek(%s, %ld, 0) Failed, errno=%d : %s",
-		     fname, (long)(offset-READ_BLOCK_SIZE), errno, strerror(errno));
-        }
-	/* 
-	 * Call read(2)
-	 */
-	TEST(read(fd, s, READ_BLOCK_SIZE));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "read(fd, s, READ_BLOCK_SIZE) Failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "read(pfds) returned %d", TEST_RETURN);
-	    } 
-	}
-	
-    }	/* End for TEST_LOOPING */
-    
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-    
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-    
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-    
-    if ((s = malloc(READ_BLOCK_SIZE)) == NULL) {
-	tst_brkm(TBROK, cleanup,
-		 "malloc(%d) Failed, errno=%d : %s",
-		 READ_BLOCK_SIZE, errno, strerror(errno));
-    }
-    (void) memset(s, '*', READ_BLOCK_SIZE);
-    for (i=0; i < READ_BLOCK_SIZE; i++) {
-        if ( s[i] != '*' ) {
-	    tst_brkm(TBROK, cleanup,
-		     "File Data pattern not setup correctly : expected * at s[%d] : found %c",
-		     i, s[i]);
-        }
-    }
-    sprintf(fname,"./tfile_%d",getpid());
-    if ((fd=open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-	tst_brkm(TBROK, cleanup,
-		 "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		 fname, errno, strerror(errno));
-    }
-    
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-    
-    if (close(fd) == -1 ) {
-	tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-		 fname, errno, strerror(errno));
-    }
-    
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-    
-    /* exit with return code appropriate for results */
-    tst_exit();
-    
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/read04.c b/winsup/testsuite/winsup.api/ltp/read04.c
deleted file mode 100644
index c976cd6a4..000000000
--- a/winsup/testsuite/winsup.api/ltp/read04.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	read01.c
- *
- * DESCRIPTION
- *	Testcase to check if read returns the number of bytes read correctly.
- *
- * ALGORITHM
- *	Create a file and write some bytes out to it.
- *	Attempt to read more than written.
- *	Check the return count, and the read buffer. The read buffer should be
- *	same as the write buffer.
- *
- * USAGE:  <for command-line>
- *  read01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -i n : Execute test n times.
- *             -I x : Execute test for x seconds.
- *             -P x : Pause for x seconds between iterations.
- *             -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	None
- */
-#include <fcntl.h>
-#include <errno.h>
-#include "test.h"
-#include "usctest.h"
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID = "read01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-#define TST_SIZE	26		/* could also do strlen(palfa) */
-char    fname[255];
-char    palfa[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" ;
-int fild;
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	int rfild;
-	char prbuf[BUFSIZ];
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg = parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL){
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();		/* global setup for test */
-
-	/* check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		Tst_count = 0;		/* reset Tst_count while looping */
-
-		if ((rfild = open(fname, O_RDONLY)) == -1) {
-			tst_brkm(TBROK, cleanup, "can't open for reading");
-			/*NOTREACHED*/
-		}
-		TEST(read(rfild, prbuf, BUFSIZ));
-
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "call failed unexpectedly");
-			continue;
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-			if (TEST_RETURN != TST_SIZE) {
-				tst_resm(TFAIL, "Bad read count - got %d - "
-					 "expected %d", TEST_RETURN, TST_SIZE);
-				continue;
-			}
-			if (memcmp(palfa, prbuf, TST_SIZE) != 0) {
-				tst_resm(TFAIL, "read buffer not equal "
-					 "to write buffer");
-				continue;
-			}
-			tst_resm(TPASS, "functionality of read() is correct");
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-		if (close(rfild) == -1) {
-			tst_brkm(TBROK, cleanup, "close() failed");
-			/*NOTREACHED*/
-		}
-	}
-	cleanup();
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test 
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	umask(0);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	sprintf(fname,"tfile_%d",getpid());
-
-	if ((fild = creat(fname, 0777)) == -1) {
-		tst_brkm(TBROK, cleanup, "creat(%s, 0777) Failed, errno = %d"
-			 " : %s", fname, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-	if (write(fild, palfa, TST_SIZE) != TST_SIZE) {
-		tst_brkm(TBROK, cleanup, "can't write to Xread");
-		/*NOTREACHED*/
-	}
-        close (fild);
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at completion or
- *	       premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Remove tmp dir and all files in it */
-	unlink(fname);
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/readdir01.c b/winsup/testsuite/winsup.api/ltp/readdir01.c
deleted file mode 100644
index c77e90680..000000000
--- a/winsup/testsuite/winsup.api/ltp/readdir01.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: readdir01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: write multiple files and try to find them with readdir
- * 
- *    TEST CASE TOTAL	:
- * 
- *    WALL CLOCK TIME	:
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Nate Straz
- * 
- *    CO-PILOT		:
- * 
- *    DATE STARTED	: 02/16/2001
- * 
- *    INITIAL RELEASE	: Linux 2.4.x
- * 
- *    TEST CASES
- * 
- * 	1.) Create n files and check that readdir() finds n files
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the readdir(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	readdir(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
- /* test.h and usctest.h are the two header files that are required by the
-  * quickhit package.  They contain function and macro declarations which you
-  * can use in your test programs
-  */
-#include "test.h"
-#include "usctest.h"
-
- /* The setup and cleanup functions are basic parts of a test case.  These
-  * steps are usually put in separate functions for clarity.  The help function
-  * is only needed when you are adding new command line options.
-  */
-void setup(); 
-void help();
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID="readdir01";		/* Test program identifier.    */
-int TST_TOTAL=2;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-extern int Tst_nobuf;
-
-int exp_enos[]={0, 0};
-
-#define BASENAME	"readdirfile"
-
-char Basename[255];
-char Fname[255];
-int Nfiles=0;
-
-/* To add command line options you need to declare a structure to pass to
- * parse_opts().  options is the structure used in this example.  The format is
- * the string that should be added to optstring in getopt(3), an integer that
- * will be used as a flag if the option is given, and a pointer to a string that
- * should receive the optarg parameter from getopt(3).  Here we add a -N
- * option.  Long options are not supported at this time. 
- */
-char *Nfilearg;
-int Nflag=0;
-
-/* for test specific parse_opts options */
-option_t options[] = {
-        { "N:",  &Nflag, &Nfilearg },   /* -N #files */
-        { NULL, NULL, NULL }
-};
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;	/* message returned from parse_opts */
-    int cnt;
-    int nfiles, fd;
-    char fname[255];
-    DIR *test_dir;
-    struct dirent *dptr;
-
-    Tst_nobuf=1;
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    /* start off by parsing the command line options.  We provide a function
-     * that understands many common options to control looping.  If you are not
-     * adding any new options, pass NULL in place of options and &help.
-     */
-    if ( (msg=parse_opts(ac, av, options, &help)) ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    if ( Nflag ) {
-	if (sscanf(Nfilearg, "%i", &Nfiles) != 1 ) {
-	    tst_brkm(TBROK, NULL, "--N option arg is not a number");
-	    tst_exit();
-	}
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    /* Next you should run a setup routine to make sure your environment is
-     * sane.
-     */
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state 
-     ***************************************************************/
-    /* TEST_LOOPING() is a macro that will make sure the test continues
-     * looping according to the standard command line args. 
-     */
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	if ( Nfiles )
-	    nfiles = Nfiles;
-	else
-	    /* min of 10 links and max of a 100 links */
-	    nfiles = (lc%90)+10;
-
-	/* create a bunch of files to look at */
-	for(cnt=0; cnt < nfiles; cnt++) {
-	
-	    sprintf(fname, "%s%d", Basename, cnt);
-	    if ((fd = open(fname, O_RDWR|O_CREAT, 0700)) == -1) {
-		tst_brkm(TBROK, cleanup,
-				"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s", fname, errno, strerror(errno));
-	    } else if (write(fd, "hello\n", 6) < 0) {
-		tst_brkm(TBROK, cleanup,
-				"write(%s, \"hello\\n\", 6) Failed, errno=%d : %s", fname, errno, strerror(errno));
-	    } else if (close(fd) < 0) {
-		tst_res(TWARN, "close(%s) Failed, errno=%d : %s",
-				fname, errno, strerror(errno));
-	    }
-	}
-
-	if ((test_dir = opendir(".")) == NULL) {
-	    tst_resm(TFAIL, "opendir(\".\") Failed, errno=%d : %s",
-			    errno, strerror(errno));
-	} else {
-	    /* count the entries we find to see if any are missing */
-	    cnt = 0;
-            errno = 0;
-	    while ( (dptr = readdir(test_dir)) ) {
-		if (strcmp(dptr->d_name, ".") && strcmp(dptr->d_name, ".."))
-		    cnt++;
-	    }
-
-	    if (errno != 0) {
-		tst_resm(TFAIL, "readir(test_dir) Failed on try %d, errno=%d : %s",
-				cnt, errno, strerror(errno));
-	    }
-	    if (cnt == nfiles) {
-		tst_resm(TPASS, "found all %d that were created", nfiles);
-	    } else if (cnt > nfiles) {
-		tst_resm(TFAIL, "found more files than were created");
-		tst_resm(TINFO, "created: %d, found: %d", nfiles, cnt);
-	    } else {
-		tst_resm(TFAIL, "found less files than were created");
-		tst_resm(TINFO, "created: %d, found: %d", nfiles, cnt);
-	    }
-	}
-
-	/* Here we clean up after the test case so we can do another iteration.
-	 */
-	for(cnt=0; cnt < nfiles; cnt++) {
-        
-            sprintf(fname, "%s%d", Basename, cnt);
-
-	    if (unlink(fname) == -1) {
-		tst_res(TWARN, "unlink(%s) Failed, errno=%d : %s",
-			Fname, errno, strerror(errno));
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * help
- ***************************************************************/
-/* The custom help() function is really simple.  Just write your help message to
- * standard out.  Your help function will be called after the standard options
- * have been printed
- */
-void
-help()
-{
-    printf("  -N #files : create #files files every iteration\n");
-}
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* You will want to enable some signal handling so you can capture
-     * unexpected signals like SIGSEGV. 
-     */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    /* One cavet that hasn't been fixed yet.  TEST_PAUSE contains the code to
-     * fork the test with the -c option.  You want to make sure you do this
-     * before you create your temporary directory.
-     */
-    TEST_PAUSE;
-
-    /* If you are doing any file work, you should use a temporary directory.  We
-     * provide tst_tmpdir() which will create a uniquely named temporary
-     * directory and cd into it.  You can now create files in the current
-     * directory without worrying.
-     */
-    tst_tmpdir();
-
-    sprintf(Basename, "%s_%d.", BASENAME, getpid());
-}
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* If you use a temporary directory, you need to be sure you remove it. Use
-     * tst_rmdir() to do it automatically.  
-     */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/readlink01.c b/winsup/testsuite/winsup.api/ltp/readlink01.c
deleted file mode 100644
index 744fff02a..000000000
--- a/winsup/testsuite/winsup.api/ltp/readlink01.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name : readlink01
- *
- * Test Description :
- *  Verify that, readlink will succeed to read the contents of the symbolic
- *  link created the process.
- * 
- * Expected Result:
- *  readlink() should return the contents of symbolic link path in the buffer
- *  on success.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  readlink01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  This test should be run by 'non-super-user' only.
- *
- */
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/stat.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TESTFILE	"testfile"
-#define SYMFILE		"slink_file"
-#define FILE_MODE       S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define MAX_SIZE	256
-
-const char *TCID="readlink01";	/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_val;			/* strlen of testfile */
-
-void setup();			/* Setup function for the test */
-void cleanup(void) __attribute__((noreturn));			/* Cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	char buffer[MAX_SIZE];	/* temporary buffer to hold symlink contents*/
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *)NULL, NULL);
-	if (msg != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-	
-		/* 
-		 * Call readlink(2) to read the contents of
-		 * symlink into a buffer.
-		 */
-		TEST(readlink(SYMFILE, buffer, sizeof(buffer)));
-	
-		/* Check return code of readlink(2) */
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "readlink() on %s failed, errno=%d : %s"
-				 , SYMFILE, TEST_ERRNO, strerror(TEST_ERRNO));
-			continue;
-		}
-
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * Compare the return value of readlink()
-			 * with the expected value which is the
-			 * strlen() of testfile.
-			 */
-			if (TEST_RETURN == exp_val) {
-				/* Check for the contents of buffer */
-				if (memcmp(buffer, TESTFILE, exp_val) != 0)  {
-					tst_resm(TFAIL, "Pathname %s and buffer"
-						 " contents %s differ",
-						 TESTFILE, buffer);
-				} else {
-					tst_resm(TPASS, "readlink() "
-						 "functionality on '%s' is "
-						 "correct", SYMFILE);
-				}
-			} else {
-				tst_resm(TFAIL, "readlink() return value %d "
-					 "does't match, Expected %d",
-					 TEST_RETURN, exp_val);
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *
- *  Create a temporary directory and change directory to it.
- *  Create a test file under temporary directory and close it
- *  Create a symbolic link of testfile.
- */
-void 
-setup()
-{
-	int fd;			/* file handle for testfile */
-
-	/* make sure test is not being run as root */
-	if (0 == geteuid()) {
-		tst_brkm(TBROK, tst_exit, "Must not run test as root");
-	}
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	if ((fd = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-	}
-
-	if (close(fd) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-		TESTFILE, errno, strerror(errno));
-	}
-
-	/* Create a symlink of testfile under temporary directory */
-	if (symlink(TESTFILE, SYMFILE) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "symlink(%s, %s) failed, errno=%d : %s",
-			 TESTFILE, SYMFILE, errno, strerror(errno));
-	}
-
-	/* Get the strlen of testfile */
-	exp_val = strlen(TESTFILE);
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/readlink02.c b/winsup/testsuite/winsup.api/ltp/readlink02.c
deleted file mode 100644
index 4ef6ffa11..000000000
--- a/winsup/testsuite/winsup.api/ltp/readlink02.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: readlink02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for readlink(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) readlink(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the readlink(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	readlink(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="readlink02"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-char fname[255], buf[255], symlnk[255];
-int fd;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * Call readlink(2)
-	 */
-	TEST(readlink(symlnk, buf, 255));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "readlink(%s, buf, 255) Failed, errno=%d : %s", symlnk,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "readlink(%s, buf, 255) returned %d", symlnk, TEST_RETURN);
-	    } 
-	}
-	
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"./tfile_%d",getpid());
-    if ((fd=open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-    if (close(fd) == -1 ) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-    sprintf(symlnk,"./sl_%d",getpid());
-    if (symlink(fname, symlnk) == -1) {
-       tst_resm(TWARN, "symlnk(%s, %s) Failed, errno=%d : %s",
-		fname, symlnk, errno, strerror(errno));
-    }
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/readlink03.c b/winsup/testsuite/winsup.api/ltp/readlink03.c
deleted file mode 100644
index 41cf4bbe9..000000000
--- a/winsup/testsuite/winsup.api/ltp/readlink03.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name : readlink03
- *
- * Test Description :
- *   Verify that,
- *   1) readlink(2) returns -1 and sets errno to EACCES if search/write
- *	permission is denied in the directory where the symbolic link
- *	resides.
- *   2) readlink(2) returns -1 and sets errno to EINVAL if the buffer size
- *	is not positive.
- *   3) readlink(2) returns -1 and sets errno to EINVAL if the specified
- *	file is not a symbolic link file.
- *   4) readlink(2) returns -1 and sets errno to ENAMETOOLONG if the 
- *	pathname component of symbolic link is too long (ie, > PATH_MAX).
- *   5) readlink(2) returns -1 and sets errno to ENOENT if the component of
- *	symbolic link points to an empty string.
- * 
- * Expected Result:
- *  readlink() should fail with return value -1 and set expected errno.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	if errno set == expected errno
- *   		Issue sys call fails with expected return value and errno.
- *   	Otherwise,
- *		Issue sys call fails with unexpected errno.
- *   Otherwise,
- *	Issue sys call returns unexpected value.
- *
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory(s)/file(s) created.
- *
- * Usage:  <for command-line>
- *  readlink03 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -e   : Turn on errno logging.
- *	       -i n : Execute test n times.
- *	       -I x : Execute test for x seconds.
- *	       -P x : Pause for x seconds between iterations.
- *	       -t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS:
- *  This test should be executed by 'non-super-user'  only.
- */
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define MODE_RWX        S_IRWXU | S_IRWXG | S_IRWXO
-#define FILE_MODE       S_IRUSR | S_IRGRP | S_IROTH
-#define DIR_TEMP        "testdir_1"
-#define TESTFILE	"testfile"
-#define TEST_FILE1      "testdir_1/tfile_1"
-#define SYM_FILE1	"testdir_1/sfile_1"
-#define TEST_FILE2      "tfile_2"
-#define SYM_FILE2	"sfile_2"
-#define MAX_SIZE	256
-
-const char *TCID="readlink03";	/* Test program identifier.    */
-int TST_TOTAL=5;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={EACCES, EINVAL, ENAMETOOLONG, ENOENT, 0};
-
-int no_setup();
-int setup1();			/* setup function to test symlink for EACCES */
-int setup2();			/* setup function to test symlink for EEXIST */
-int lpath_setup();	   /* setup function to test chmod for ENAMETOOLONG */
-
-char Longpathname[PATH_MAX+2];
-
-struct test_case_t {		/* test case struct. to hold ref. test cond's*/
-	const char *link;
-	const char *desc;
-	int exp_errno;
-	size_t buf_siz;
-	int (*setupfunc)();
-} Test_cases[] = {
-#ifndef __CYGWIN__
-	{ SYM_FILE1, "No Search permissions to process", EACCES, 1, setup1 },
-	{ SYM_FILE2, "Buffer size is not positive", EINVAL, -1, setup2 },
-	{ TEST_FILE2, "File is not symbolic link", EINVAL, 1, no_setup },
-#else
-	{ TEST_FILE2, "File is not symbolic link", EINVAL, 1, setup2 },
-#endif
-	{ Longpathname, "Symlink path too long", ENAMETOOLONG, 1, lpath_setup },
-	{ "", "Symlink Pathname is empty", ENOENT, 1, no_setup },
-	{ NULL, NULL, 0, 0, no_setup }
-};
-
-extern void setup();		/* Setup function for the test */
-void cleanup() __attribute__((noreturn));/* Cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	char buffer[MAX_SIZE];  /* temporary buffer to hold symlink contents*/
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	const char *sym_file;		/* symbolic link file name */
-	const char *test_desc;	/* test specific error message */
-	int i;			/* counter to test different test conditions */
-	size_t buf_size;	/* size of buffer for readlink */
-
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *)NULL, NULL);
-	if (msg != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/*
-	 * Invoke setup function to call individual test setup functions
-	 * to simulate test conditions.
-	 */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-	
-		for (i = 0; Test_cases[i].desc != NULL; i++) {
-			sym_file = Test_cases[i].link;
-			test_desc = Test_cases[i].desc;
-			buf_size = Test_cases[i].buf_siz;
-
-			if (buf_size == 1) {
-				buf_size = sizeof(buffer);
-			}
-
-			/* 
-			 * Call readlink(2) to test different test conditions.
-	 		 * verify that it fails with -1 return value and sets
-			 * appropriate errno.
-			 */
-			TEST(readlink(sym_file, buffer, buf_size));
-	
-			/* Check return code of readlink(2) */
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "readlink() returned %d, "
-					 "expected -1, errno:%d", TEST_RETURN,
-					 Test_cases[i].exp_errno);
-				continue;
-			}
-
-			TEST_ERROR_LOG(TEST_ERRNO);
-
-			if (TEST_ERRNO == Test_cases[i].exp_errno) {
-				tst_resm(TPASS, "readlink(), %s, returned "
-					 "errno %d", test_desc, TEST_ERRNO);
-				tst_resm(TPASS, "readlink(), %s, returned "
-					 "errno %d", test_desc, TEST_ERRNO);
-			} else {
-				tst_resm(TFAIL, "readlink() failed, %s, "
-					 "errno=%d, expected errno=%d",
-					 test_desc, TEST_ERRNO,	
-					 Test_cases[i].exp_errno);
-			}
-		}	/* End of TEST CASE LOOPING. */
-	}	/* End for TEST_LOOPING */
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-
-	/*NOTREACHED*/
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- *
- *  Create a temporary directory and change directory to it.
- *  Call test specific setup functions.
- */
-void 
-setup()
-{
-	int i;
-
-	/* make sure test is not being run as root */
-	if (0 == geteuid()) {
-		tst_brkm(TBROK, tst_exit, "Must not run test as root");
-	}
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* call individual setup functions */
-	for (i = 0; Test_cases[i].desc != NULL; i++) {
-		Test_cases[i].setupfunc();
-	}
-}
-
-/*
- * no_setup() - Some test conditions for readlink(2) do not any setup.
- */
-int
-no_setup()
-{
-        return 0;
-}
-
-/*
- * setup1() - setup function for a test condition for which readlink(2)
- *            returns -1 and sets errno to EACCES.
- *
- *  Create a test directory under temporary directory and create a test file
- *  under this directory with mode "0666" permissions.
- *  Create a symlink of testfile under test directory.
- *  Modify the mode permissions on test directory such that process will not
- *  have search permissions on test directory.
- */
-int
-setup1()
-{
-        int fd;                 /* file handle for testfile */
-
-        if (mkdir(DIR_TEMP, MODE_RWX) < 0) {
-                tst_brkm(TBROK, cleanup, "mkdir(2) of %s failed", DIR_TEMP);
-        }
-
-        if ((fd = open(TEST_FILE1, O_RDWR|O_CREAT, 0666)) == -1) {
-                tst_brkm(TBROK, cleanup,
-                         "open(%s, O_RDWR|O_CREAT, 0666) failed, errno=%d : %s",
-                         TEST_FILE1, errno, strerror(errno));
-        }
-        if (close(fd) == -1) {
-                tst_brkm(TBROK, cleanup, "close(%s) failed, errno=%d : %s",
-                         TEST_FILE1, errno, strerror(errno));
-        }
-
-	/* Creat a symbolic link of testfile under test directory */
-	if (symlink(TEST_FILE1, SYM_FILE1) < 0) {
-		tst_brkm(TBROK, cleanup, "symlink of %s failed", TEST_FILE1);
-	}
-
-	/* Modify mode permissions on test directory */
-        if (chmod(DIR_TEMP, FILE_MODE) < 0) {
-                tst_brkm(TBROK, cleanup, "chmod(2) of %s failed", DIR_TEMP);
-        }
-        return 0;
-}
-
-/*
- * setup2() -  setup function for a test condition for which readlink(2)
- *	       returns -1 and sets errno to EINVAL.
- *
- *	Create a testfile under temporary directory and create a symlink
- *	file of it.
- */
-int
-setup2()
-{
-	int fd;			/* file handle for testfile */
-
-	/* Creat a testfile and close it */
-        if ((fd = open(TEST_FILE2, O_RDWR|O_CREAT, 0666)) == -1) {
-                tst_brkm(TBROK, cleanup,
-                         "open(%s, O_RDWR|O_CREAT, 0666) failed, errno=%d : %s",
-                         TEST_FILE2, errno, strerror(errno));
-        }
-        if (close(fd) == -1) {
-                tst_brkm(TBROK, cleanup, "close(%s) failed, errno=%d : %s",
-                         TEST_FILE2, errno, strerror(errno));
-        }
-	
-	/* Creat a symlink of testfile created above */
-	if (symlink(TEST_FILE2, SYM_FILE2) < 0) {
-		tst_brkm(TBROK, cleanup, "symlink() failed to create %s in "
-			 "setup2, error=%d", SYM_FILE2, errno);
-	}
-	return 0;
-}
-
-/*
- * lpath_setup() - setup to create a node with a name length exceeding
- *		   the MAX. length of PATH_MAX.
- */
-int
-lpath_setup()
-{
-        int i;                /* counter variable */
-
-        for (i = 0; i <= (PATH_MAX + 1); i++) {
-                Longpathname[i] = 'a';
-        }
-        return 0;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *
- *  Restore the mode permissions on test directory.
- *  Remove the temporary directory created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-        /* Restore mode permissions on test directory created in setup2() */
-        if (chmod(DIR_TEMP, MODE_RWX) < 0) {
-                tst_brkm(TBROK, NULL, "chmod(2) of %s failed", DIR_TEMP);
-        }
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/rename01.c b/winsup/testsuite/winsup.api/ltp/rename01.c
deleted file mode 100644
index 14ae1f245..000000000
--- a/winsup/testsuite/winsup.api/ltp/rename01.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	rename01
- * 
- * DESCRIPTION
- *	This test will verify the rename(2) syscall basic functionality.
- *	Verify rename() works when the "new" file or directory does not exist.
- *
- * ALGORITHM
- *	Setup:
- *		Setup signal handling.
- *		Create temporary directory.
- *		Pause for SIGUSR1 if option specified.
- *
- *	Test:
- *		Loop if the proper options are given.
- *              1.  "old" is plain file, new does not exists
- *                  create the "old" file, make sure the "new" file 
- *                  dose not exist
- *                  rename the "old" to the "new" file
- *                  verify the "new" file points to the "old" file
- *                  verify the "old" file does not exist
- *
- *              2.  "old" is a directory,"new" does not exists
- *                  create the "old" directory, make sure "new" 
- *                  dose not exist
- *                  rename the "old" to the "new"
- *                  verify the "new" points to the "old" 
- *                  verify the "old" does not exist
- *	Cleanup:
- *		Print errno log and/or timing stats if options given
- *		Delete the temporary directory created.
- *
- * USAGE
- *	rename01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	None.
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-extern void do_file_setup(char *);
-
-const char *TCID="rename01";		/* Test program identifier.    */
-int TST_TOTAL=2;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-char fname[255], mname[255];
-char fdir[255], mdir[255];
-struct stat buf1;
-dev_t f_olddev, d_olddev;
-ino_t f_oldino, d_oldino;
-
-struct test_case_t {
-	const char *name1;
-	const char *name2;
-	const char *desc;
-	dev_t *olddev;
-	ino_t *oldino;
-} TC[] = {
-	/* comment goes here */
-	{fname, mname, "file", &f_olddev, &f_oldino},
-
-	/* comment goes here */
-	{fdir, mdir, "directory", &d_olddev, &d_oldino}
-};
- 
-int
-main(int ac, char **av)
-{
-	int lc;             /* loop counter */
-	const char *msg;    /* message returned from parse_opts */
-	int i;
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/*
-	 * perform global setup for test
-	 */
-	setup();
-	
-	/*
-	 * check looping state if -i option given
-	 */
-	for (lc=0; TEST_LOOPING(lc); lc++) {
-	  
-		/* reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* loop through the test cases */
-		for (i=0; i<TST_TOTAL; i++) {
-
-			TEST(rename(TC[i].name1, TC[i].name2));
-
-			if (TEST_RETURN == -1) {
-				tst_resm(TFAIL, "call failed unexpectedly");
-				continue;
-			}
-
-			if (STD_FUNCTIONAL_TEST) {
-				if (stat(TC[i].name2, &buf1) == -1) {
-					tst_brkm(TBROK, cleanup, "stat of %s "
-				 		"failed", TC[i].desc);
-					/* NOTREACHED */
-				} 
-
-				/*
-				 * verify the new file or directory is the
-				 * same as the old one
-				 */
-				if (buf1.st_dev != *TC[i].olddev || 
-						buf1.st_ino != *TC[i].oldino) {
-					tst_resm(TFAIL, "rename() failed: the "
-						"new %s points to a different "
-						"inode/location", TC[i].desc);
-					continue;
-				}
-				/*
-				 * verify that the old file or directory
-				 * does not exist
-				 */
-				if (stat(fname, &buf1) != -1) {
-					tst_resm(TFAIL, "the old %s still " 
-						 "exists", TC[i].desc);
-					continue;
-				} 
-
-				tst_resm(TPASS, "functionality is correct "
-					 "for renaming a %s", TC[i].desc);
-			} else {
-				tst_resm(TPASS, "call succeeded on %s rename",
-					 TC[i].desc);
-			}
-		}
-		/* reset things in case we are looping */
-		if (rename(mname, fname) == -1) {
-			tst_brkm(TBROK, cleanup, "file rename failed");
-		}
-
-		if (rename(mdir, fdir) == -1) {
-			tst_brkm(TBROK, cleanup, "directory rename failed");
-		}
-	}   /* End for TEST_LOOPING */
-	
-	/*
-	 * cleanup and exit
-	 */
-	cleanup();
-	/*NOTREACHED*/	
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE; 
-
-	/* Create a temporary directory and make it current. */
-	tst_tmpdir();
-	
-	sprintf(fname,"./tfile_%d",getpid());
-	sprintf(mname,"./rnfile_%d",getpid());
-	sprintf(fdir,"./tdir_%d",getpid());
-	sprintf(mdir,"./rndir_%d",getpid());
-
-	/* create the "old" file */
-	do_file_setup(fname);
-
-	if (stat(fname, &buf1)== -1) {
-		tst_brkm(TBROK,cleanup, "failed to stat file %s"
-			 "in setup()", fname);
-		/* NOTREACHED */
-	} 
-
-	f_olddev = buf1.st_dev;
-	f_oldino = buf1.st_ino;
-
-	/* create "old" directory */
-	if (mkdir(fdir, 00770) == -1) {
-		tst_brkm(TBROK, cleanup, "Could not create directory %s", fdir);
-		/*NOTREACHED*/
-	}
-						
-	if (stat(fdir, &buf1) == -1) {
-		tst_brkm(TBROK, cleanup, "failed to stat directory %s"
-			 "in setup()", fname);
-		/* NOTREACHED */
-	}
-
-	d_olddev = buf1.st_dev;
-	d_oldino = buf1.st_ino;
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * Remove the temporary directory.
-	 */
-	tst_rmdir();
-	
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/rename02.c b/winsup/testsuite/winsup.api/ltp/rename02.c
deleted file mode 100644
index d34cd104a..000000000
--- a/winsup/testsuite/winsup.api/ltp/rename02.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: rename02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for rename(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) rename(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the rename(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	rename(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-void do_file_setup();
-
-
-
-const char *TCID="rename02"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-int fd;
-char fname[255], mname[255];
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;	/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call rename(2)
-	 */
-	TEST(rename(fname, mname));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "rename(%s, %s) Failed, errno=%d : %s", fname, mname, 
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "rename(%s, %s) returned %d", fname, mname, TEST_RETURN);
-	    } 
-	    if (unlink(mname) == -1) {
-		tst_resm(TWARN, "unlink(%s) Failed, errno=%d : %s", mname, errno, strerror(errno));
-	    }
-	    do_file_setup();
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"./tfile_%d",getpid());
-    sprintf(mname,"./rnfile_%d",getpid());
-    do_file_setup();
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}	/* End cleanup() */
-
-void
-do_file_setup()
-{
-    if ((fd=open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-
-    if (close(fd) == -1 )
-       tst_resm(TWARN, "close(%s) Failed on file create, errno=%d : %s", 
-		fname, errno, strerror(errno));
-
-}
diff --git a/winsup/testsuite/winsup.api/ltp/rename08.c b/winsup/testsuite/winsup.api/ltp/rename08.c
deleted file mode 100644
index 0788ddc98..000000000
--- a/winsup/testsuite/winsup.api/ltp/rename08.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	rename08
- *
- * DESCRIPTION
- *	This test will verify that rename(2) syscall failed in EFAULT
- *
- * ALGORITHM
- *	Setup:
- *		Setup signal handling.
- *		Create temporary directory.
- *		Pause for SIGUSR1 if option specified.
- *		Create a valid file to use in the rename() call.
- *
- *	Test:
- *		Loop if the proper options are given.
- *              1.  "old" is a valid file, newpath points to address
- *                   outside allocated address space
- *                  rename the "old" to the "new" file
- *                  verify rename() failed with error EFAULT
- *
- *              2.  "old" points to address outside allocated address space
- *                  ,"new" is a valid file
- *                  rename the "old" to the "new"
- *                  verify rename() failed with error EFAULT
- *
- *              3.  oldpath and newpath are all NULL
- *                  try to rename NULL to NULL
- *                  verify rename() failed with error EFAULT
- *	Cleanup:
- *		Print errno log and/or timing stats if options given
- *		Delete the temporary directory created.*
- * USAGE
- *	rename08 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	None.
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-extern void do_file_setup(char *);
-
-const char *TCID="rename08";		/* Test program identifier.    */
-int TST_TOTAL=3;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={EFAULT, 0};     /* List must end with 0 */
-
-int fd;
-char fname[255];
-
-struct test_case_t {
-	char *fd;
-	char *fd2;
-	int error;
-} TC[] = {
-	/* "new" file is invalid - EFAULT */
-	{fname, (char *)-1, EFAULT},
-
-	/* "old" file is invalid - EFAULT */
-	{(char *)-1, fname, EFAULT},
-
-	/* both files are NULL - EFAULT */
-	{NULL, NULL, EFAULT}
-};
-
-int
-main(int ac, char **av)
-{
-	int lc;             /* loop counter */
-	const char *msg;    /* message returned from parse_opts */
-	int i;
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/*
-	 * perform global setup for test
-	 */
-	setup();
-	
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-	
-	/*
-	 * check looping state if -i option given
-	 */
-	for (lc=0; TEST_LOOPING(lc); lc++) {
-	  
-		/* reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* loop through the test cases */
-		for (i = 0; i < TST_TOTAL; i++) {
-
-			TEST(rename(TC[i].fd, TC[i].fd2));
-
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "call succeeded unexpectedly");
-				continue;
-			}
-
-			TEST_ERROR_LOG(TEST_ERRNO);
-
-			if (TEST_ERRNO == TC[i].error) {
-				tst_resm(TPASS, "expected failure - "
-					 "errno = %d : %s", TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-			} else {
-				tst_resm(TFAIL, "unexpected error - %d : %s - "
-					 "expected %d", TEST_ERRNO,
-					 strerror(TEST_ERRNO), TC[i].error);
-			}
-		}
-	}   /* End for TEST_LOOPING */
-	
-	/*
-	 * cleanup and exit
-	 */
-	cleanup();
-	/*NOTREACHED*/	
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE; 
-
-	/* Create a temporary directory and make it current. */
-	tst_tmpdir();
-	
-	sprintf(fname,"./tfile_%d",getpid());
-
-	do_file_setup(fname);
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *              completion or premature exit.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * Remove the temporary directory.
-	 */
-	tst_rmdir();
-	
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/rename10.c b/winsup/testsuite/winsup.api/ltp/rename10.c
deleted file mode 100644
index 438ef3725..000000000
--- a/winsup/testsuite/winsup.api/ltp/rename10.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	rename10
- *
- * DESCRIPTION
- *	This test will verify that rename(2) syscall fails with ENAMETOOLONG
- *      and ENOENT
- *
- * ALGORITHM
- *	Setup:
- *		Setup signal handling.
- *		Create temporary directory.
- *		Pause for SIGUSR1 if option specified.
- *              create the "old" file
- *
- *	Test:
- *		Loop if the proper options are given.
- *              1.  rename the "old" to the "new" file
- *                  verify rename() failed with error ENAMETOOLONG
- *
- *              2.  "new" path contains a directory that does not exist
- *                  rename the "old" to the "new"
- *                  verify rename() failed with error ENOENT
- *	Cleanup:
- *		Print errno log and/or timing stats if options given
- *		Delete the temporary directory created.*
- *
- * USAGE
- *	rename10 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	None.
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-extern void do_file_setup(char *);
-
-const char *TCID="rename10";		/* Test program identifier.    */
-int TST_TOTAL=2;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-char badmname[] = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyzabcdefghijklmnopqrstmnopqrstuvwxyz";
-
-int exp_enos[]={ENAMETOOLONG, ENOENT, 0};     /* List must end with 0 */
-
-int fd;
-char fname[255], mname[255];
-char mdir[255];
-
-struct test_case_t {
-	char *fd1;
-	char *fd2;
-	int error;
-} TC[] = {
-	/* badmname is too long for a file name - ENAMETOOLONG */
-	{fname, badmname, ENAMETOOLONG},
-
-	/* mname contains a directory component which does not exist - ENOENT */
-	{fname, mname, ENOENT}
-};
-
-int
-main(int ac, char **av)
-{
-	int lc;             /* loop counter */
-	const char *msg;    /* message returned from parse_opts */
-	int i;
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/*
-	 * perform global setup for test
-	 */
-	setup();
-	
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-	
-	/*
-	 * check looping state if -i option given
-	 */
-	for (lc=0; TEST_LOOPING(lc); lc++) {
-	  
-		/* reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* loop through the test cases */
-		for (i=0; i < TST_TOTAL; i++) {
-
-			TEST(rename(TC[i].fd1, TC[i].fd2));
-
-			if (TEST_RETURN != -1) {
-				tst_resm(TFAIL, "call succeeded unexpectedly");
-				continue;
-			}
-
-			TEST_ERROR_LOG(TEST_ERRNO);
-
-			if (TEST_ERRNO == TC[i].error) {
-				tst_resm(TPASS, "expected failure - "
-					 "errno = %d : %s", TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-			} else {
-				tst_resm(TFAIL, "unexpected error - %d : %s - "
-					 "expected %d", TEST_ERRNO,
-					 strerror(TEST_ERRNO), TC[i].error);
-			}
-		}
-	}   /* End for TEST_LOOPING */
-	
-	/*
-	 * cleanup and exit
-	 */
-	cleanup();
-
-	/*NOTREACHED*/	
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE; 
-
-	/* Create a temporary directory and make it current. */
-	tst_tmpdir();
-	
-	sprintf(fname,"./tfile_%d",getpid());
-	sprintf(mdir,"./rndir_%d",getpid());
-	sprintf(mname,"%s/rnfile_%d",mdir,getpid());
-
-	do_file_setup(fname);
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * Remove the temporary directory.
-	 */
-	tst_rmdir();
-	
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/rmdir01.c b/winsup/testsuite/winsup.api/ltp/rmdir01.c
deleted file mode 100644
index 1d41f1c13..000000000
--- a/winsup/testsuite/winsup.api/ltp/rmdir01.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	rmdir01
- *
- * DESCRIPTION
- *	This test will verify that rmdir(2) syscall basic functionality.
- *	verify rmdir(2) returns a value of 0 and the directory being
- *	removed 
- *
- * ALGORITHM
- *	Setup:
- *		Setup signal handling.
- *		Create temporary directory.
- *		Pause for SIGUSR1 if option specified.
- *
- *	Test:
- *		Loop if the proper options are given.
- *                 make a directory tstdir
- *                 call rmdir(tstdir), check the return value
- *                 verify the directory tstdir does not exists.
- *
- *	Cleanup:
- *		Print errno log and/or timing stats if options given
- *		Delete the temporary directory created.*
- * USAGE
- *	rmdir01 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	None.
- */
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include "test.h" 
-#include "usctest.h"
-
-void setup();
-void cleanup() __attribute__((noreturn));
-
-#define PERMS		0777
-
-const char *TCID="rmdir01";	/* Test program identifier.    */
-int TST_TOTAL=1;                /* Total number of test cases. */
-extern int Tst_count;           /* Test Case counter for tst_* routines */
-
-char tstdir [100];
-
-int
-main(int ac, char **av)
-{
-	int lc;             /* loop counter */
-	const char *msg;    /* message returned from parse_opts */
-	struct stat buf;	
-
-	/*
-	 * parse standard options
-	 */
-	if ((msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *)NULL) {
-		tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	/*
-	 * perform global setup for test
-	 */
-	setup();
-	
-	/*
-	 * check looping state if -i option given
-	 */
-	for (lc=0; TEST_LOOPING(lc); lc++) {
-	  
-		/* reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/*
-		 * TEST rmdir() base functionality
-		 */
-
-		/* Initialize the test directory name */
-
-		/* create a directory */
-		if ( mkdir(tstdir, PERMS) == -1 ) {
-			tst_brkm(TBROK, cleanup, "mkdir(%s, %#o) Failed",
-				 tstdir, PERMS);
-			/*NOTREACHED*/
-		}
-		/* call rmdir using TEST macro */
-
-		TEST(rmdir(tstdir));
-
-		if (TEST_RETURN == -1 ) {
-			tst_resm(TFAIL, "rmdir(%s) Failed", tstdir);
-			continue;
-		}
-
-		if (STD_FUNCTIONAL_TEST) {
-			/* check whether tstdir been removed */
-			if (stat(tstdir, &buf) != -1) {
-		      		tst_resm(TFAIL, "directory %s still exists",
-					 tstdir);
-				continue;  
-			} else {
-				tst_resm(TPASS, "directory has been removed");
-			}
-		} else {
-			tst_resm(TPASS, "call succeeded");
-		}
-	
-	}   /* End for TEST_LOOPING */
-	
-	/*
-	 * cleanup and exit
-	 */
-	cleanup();
-
-	/*NOTREACHED*/	
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/* Create a temporary directory and make it current. */
-	tst_tmpdir();
-	
-	sprintf(tstdir,"./tstdir_%d",getpid());	
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *              completion or premature exit.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * Remove the temporary directory.
-	 */
-	tst_rmdir();
-	
-	/*
-	 * Exit with return code appropriate for results.
-	 */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/rmdir04.c b/winsup/testsuite/winsup.api/ltp/rmdir04.c
deleted file mode 100644
index ece6a9ff4..000000000
--- a/winsup/testsuite/winsup.api/ltp/rmdir04.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: rmdir04
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for rmdir(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) rmdir(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the rmdir(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	rmdir(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <fcntl.h>
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="rmdir04"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-char *cwd;
-char fname[255];
-
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-        if (mkdir(fname, 0777) == -1) {
-	    tst_brkm(TBROK, cleanup,
-		     "mkdir(%s) Failure. errno=%d : %s", fname, errno, strerror(errno));
-        }
-	/* 
-	 * Call rmdir(2)
-	 */
-	TEST(rmdir(fname));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "rmdir(%s) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "rmdir(%s) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname, "./dir_%d", getpid());
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/rmdir05.c b/winsup/testsuite/winsup.api/ltp/rmdir05.c
deleted file mode 100644
index ff19b3a81..000000000
--- a/winsup/testsuite/winsup.api/ltp/rmdir05.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: rmdir05
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Functionality Tests for rmdir(2)
- * 
- *    PARENT DOCUMENT	: rmstds02
- * 
- *    TEST CASE TOTAL	: 6
- * 
- *    WALL CLOCK TIME	: 2
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Bill Branum
- * 
- *    CO-PILOT		: Steve Shaw
- * 
- *    DATE STARTED	: 4/23/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 	rmdir(2) test for errno(s) EINVAL, EMLINK, EFAULT
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    DETAILED DESCRIPTION
- *	Verify that rmdir(2) returns a value of -1 and sets errno
- *	to indicate the error.
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Create a temporary directory and make it current.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno.
- *        If doing functional test
- *            check the errno returned and print result message
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given.
- *	  Remove the temporary directory.
- *	  Exit.
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include "test.h"
-#include "usctest.h"
-
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-extern char *get_high_address();
-
-const char *TCID="rmdir05";	/* Test program identifier.    */
-int TST_TOTAL=6;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines. */
-struct stat stat_buf;   	/* Stat buffer used for verification. */
-char dir_name[256];		/* Array to hold directory name. */
-
-
-int
-main(int argc, char **argv)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(argc, argv, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-	/* 
-	 * TEST CASE: 1
-	 * path points to the current directory
-	 */
-
-	/* Call rmdir(2) */
-	TEST(rmdir("."));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-
-	  if ( TEST_RETURN == -1 ) {
-#if defined(sgi)
-	    if (TEST_ERRNO == EINVAL) {
-#elif defined(linux) || defined (__CYGWIN__)
-	    if (TEST_ERRNO & (EBUSY | ENOTEMPTY)) {
-#endif
-
-	      /* For functionality tests, verify that the 
-	       * directory wasn't removed.
-	       */
-	      if (stat(".",&stat_buf) == -1){
-	        tst_resm(TFAIL,"rmdir(\".\") removed the current working directory when it should have failed.");
-	      } else {
-	        tst_resm(TPASS,"rmdir(\".\") failed to remove the current working directory. Returned %d : %s",TEST_ERRNO,strerror(TEST_ERRNO));
-	      }
-	    } else {
-#if defined(sgi)
-	      tst_resm(TFAIL,"rmdir(\".\") failed with errno %d : %s but expected %d (EINVAL)",TEST_ERRNO,strerror(TEST_ERRNO),EINVAL);
-#elif defined(linux) || defined (__CYGWIN__)
-	      tst_resm(TFAIL,"rmdir(\".\") failed with errno %d : %s but expected %d (EBUSY)",TEST_ERRNO,strerror(TEST_ERRNO),EBUSY);
-#endif
-	    }
-	  } else {
-	    tst_resm(TFAIL,"rmdir(\".\") succeeded unexpectedly.");
-	  }
-	} 
-	
-	
-	/* 
-	 * TEST CASE: 2
-	 * path points to the "." (dot) entry of a directory 
-	 */
-#if defined(linux) || defined (__CYGWIN__)
-        tst_resm(TCONF, "rmdir on \"dir/.\" supported on Linux");
-#elif defined(sgi) 
-	/* Call rmdir(2) */
-	TEST(rmdir("dir1/."));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EINVAL) {
-
-	      /* For functionality tests, verify that the 
-	       * directory wasn't removed.
-	       */
-	      if (stat("dir1/.",&stat_buf) == -1){
-	        tst_resm(TFAIL,"rmdir(\"dir1/.\") removed the \".\" entry of a directory when it should have failed.");
-	      } else {
-	        tst_resm(TPASS,"rmdir(\"dir1/.\") failed to remove the \".\" entry of a directory. Returned %d : %s",TEST_ERRNO,strerror(TEST_ERRNO));
-	      }
-	    } else {
-	      tst_resm(TFAIL,"rmdir(\"dir1/.\") failed with errno %d : %s but expected %d (EINVAL)",TEST_ERRNO,strerror(TEST_ERRNO),EINVAL);
-	    }
-	  } else {
-	    tst_resm(TFAIL,"rmdir(\"dir1/.\") - path points to the \".\" entry of a directory succeeded unexpectedly.");
-	  }
-	} 
-#endif
-	
-#if defined(sgi)
-	/* 
-	 * TEST CASE: 3
-	 * the directory has been linked
-	 */
-        tst_resm(TCONF, "linked directories not valid on IRIX");
-#elif defined(linux)
-	tst_resm(TCONF, "linked directories test not implemented on Linux");
-#elif defined(CRAY)
-
-
-	/* Call rmdir(2) */
-	TEST(rmdir("dir2"));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EMLINK) {
-	      /* For functionality tests, verify that the directory wasn't
-	       * removed.
-	       */
-	      if (stat("dir2",&stat_buf) == -1){
-	        tst_resm(TFAIL,"rmdir(\"dir2\") removed a directory with multiple links when it should have failed.");
-	      } else {
-	        tst_resm(TPASS,"rmdir(\"dir2\") failed to remove a directory with multiple links. Returned %d : %s",TEST_ERRNO,strerror(TEST_ERRNO));
-	      }
-	    } else {
-	      tst_resm(TFAIL,"rmdir(\"dir2\") failed with errno %d : %s but expected %d (EMLINK)",TEST_ERRNO,strerror(TEST_ERRNO),EMLINK);
-	    }
-	  } else {
-	    tst_resm(TFAIL,"rmdir(\"dir2\") - the directory has been linked succeeded unexpectedly.");
-	  }
-	} 
-#endif  /* linux */
-	
-	
-	/* 
-	 * TEST CASE: 4
-	 * path argument points below the minimum allocated address space
-	 */
-
-
-	/* Call rmdir(2) */
-	TEST(rmdir((char *)-1));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS,"rmdir() - path argument points below the minimum allocated address space failed as expected with errno %d : %s",TEST_ERRNO,strerror(TEST_ERRNO));
-	    } else {
-	      tst_resm(TFAIL,"rmdir() - path argument points below the minimum allocated address space failed with errno %d : %s but expected %d (EFAULT)",TEST_ERRNO,strerror(TEST_ERRNO),EFAULT);
-	    }
-	  } else {
-	    tst_resm(TFAIL,"rmdir() - path argument points below the minimum allocated address space succeeded unexpectedly.");
-	  }
-	} 
-	
-	/* 
-	 * TEST CASE: 5
-	 * path argument points above the maximum allocated address space
-	 */
-
-
-	/* Call rmdir(2) */
-	TEST(rmdir( get_high_address()));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	
-	  if ( TEST_RETURN == -1 ) {
-	    if (TEST_ERRNO == EFAULT) {
-	      tst_resm(TPASS,"rmdir() - path argument points above the maximum allocated address space failed as expected with errno %d : %s",TEST_ERRNO,strerror(TEST_ERRNO));
-	    } else {
-	      tst_resm(TFAIL,"rmdir() - path argument points above the maximum allocated address space failed with errno %d : %s but expected %d (EFAULT)",TEST_ERRNO,strerror(TEST_ERRNO),EFAULT);
-	    }
-	  } else {
-	    tst_resm(TFAIL,"rmdir() - path argument points above the maximum allocated address space succeeded unexpectedly.");
-	  }
-	} 
-
-	/* 
-	 * TEST CASE: 6
-	 * able to remove a directory
-	 */
-
-	/* Create a directory. */
-	if (mkdir(dir_name,0777) != 0){
-	  tst_brkm(TBROK,cleanup,"mkdir(\"%s\") failed with errno %d : %s",dir_name,errno,strerror(errno));
-	}
-
-	/* Call rmdir(2) */
-	TEST(rmdir(dir_name));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL,"rmdir(\"%s\") failed when it should have passed. Returned %d : %s",dir_name,TEST_ERRNO,strerror(TEST_ERRNO));
-	} else {
-
-	  /***************************************************************
-	   * only perform functional verification if flag set (-f not given)
-	   ***************************************************************/
-	  if ( STD_FUNCTIONAL_TEST ) {
-	
-	    /* Verify the directory was removed. */
-	    if (stat(dir_name,&stat_buf) != 0){
-	      tst_resm(TPASS,"rmdir(\"%s\") removed the directory as expected.",dir_name);
-	    } else {
-	      tst_resm(TFAIL,"rmdir(\"%s\") returned a zero exit status but failed to remove the directory.",dir_name);
-	    }
-	  } 
-	}
-	
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* Create a temporary directory and make it current. */
-    tst_tmpdir();
-
-    /* Create a directory. */
-    if (mkdir("dir1",0777) == -1){
-	tst_brkm(TBROK,cleanup,"mkdir() failed to create dir1.");
-    }
-
-#if defined(CRAY)
-    /* NOTE: linking directories is NOT valid on IRIX  */
-
-    /* Create a directory that has multiple links to it. */
-    if (mkdir("dir2",0777) == -1){
-	tst_brkm(TBROK,cleanup,"mkdir() failed to create dir2.");
-    } else {
-	if (system("runcmd `get_attrib -A link` dir2 mlink_dir > link.out 2>&1") != 0){
-	    tst_brk(TBROK,"link.out",cleanup,"link failed to link dir2 and mlink_dir.");
-	}
-    }
-
-#endif
-
-    /* Create a unique directory name. */
-    sprintf(dir_name,"./dir_%d",getpid());
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-#if defined(CRAY)
-    /* NOTE: setup was not done on IRIX */
-    /* Unlink the directory. */
-    if (system("runcmd `get_attrib -A unlink` dir2 > unlink.out 2>&1") != 0){
-	tst_res(TWARN,"unlink.out","unlink failed to unlink dir2.");
-    }
-#endif
-
-    /* 
-     * Remove the temporary directory.
-     */
-    tst_rmdir();
-
-    /* 
-     * Exit with a return value appropriate for the results.
-     */
-    tst_exit();
-
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/sbrk01.c b/winsup/testsuite/winsup.api/ltp/sbrk01.c
deleted file mode 100644
index 700fb6b17..000000000
--- a/winsup/testsuite/winsup.api/ltp/sbrk01.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: sbrk01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for sbrk(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 2
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 06/05/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) sbrk(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the sbrk(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	sbrk(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="sbrk01";		/* Test program identifier.    */
-int TST_TOTAL=2;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int Increment;		/* Amount to make change size by */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;	/* message returned from parse_opts */
-    long tret;
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit(0);
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-#ifdef __CYGWIN__
-    /* we need to initialize output buffer before first sbrk.
-       otherwise, when memory is freed bu second sbrk, fwrite will
-       fail */
-    tst_resm(TINFO, "Entering test");
-#endif
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 * Increase by 8192 bytes
-	 */
-	Increment = 8192;
-
-	/* Call sbrk(2) */
-#if defined(sgi)
-	tret=(long)sbrk(Increment);   /* Remove -64 IRIX compiler warning */
-	TEST_ERRNO=errno;
-#else
-	TEST(sbrk(Increment));
-	tret=TEST_RETURN;
-#endif
-	
-	/* check return code */
-	if ( tret == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "sbrk - Increase by 8192 bytes failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "sbrk - Increase by 8192 bytes returned %d", 
-		    tret);
-	    } 
-	}
-	
-	
-	/* 
-	 * TEST CASE:
-	 * Decrease to original size
-	 */
-	Increment=(Increment * -1);
-
-	/* Call sbrk(2) */
-#ifdef CRAY
-	TEST(sbrk(Increment));
-	tret=TEST_RETURN;
-#else
-	tret=(long)sbrk(Increment);
-	TEST_ERRNO=errno;
-#endif
-	
-	/* check return code */
-	if ( tret == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "sbrk - Decrease to original size failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "sbrk - Decrease to original size returned %d", tret);
-	    } 
-	}
-	
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-     
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/select01.c b/winsup/testsuite/winsup.api/ltp/select01.c
deleted file mode 100644
index 3b81f93db..000000000
--- a/winsup/testsuite/winsup.api/ltp/select01.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER   : select01
- *
- *    EXECUTED BY       : anyone
- *
- *    TEST TITLE        : select to a file
- *
- *    PARENT DOCUMENT   : usctpl01
- *
- *    TEST CASE TOTAL   : 3
- *
- *    WALL CLOCK TIME   : 1
- *
- *    CPU TYPES         : ALL
- *
- *    AUTHOR            : Richard Logan
- *
- *    CO-PILOT          : William Roske
- *
- *    DATE STARTED      : 02/24/93
- *
- *    INITIAL RELEASE   : UNICOS 7.0
- *
- *    TEST CASES
- *
- *      1.) select(2) to a fd of regular file with no I/O and small timeout
- *
- *    INPUT SPECIFICATIONS
- *      The standard options for system call tests are accepted.
- *      (See the parse_opts(3) man page).
- *
- *    OUTPUT SPECIFICATIONS
- *
- *    DURATION
- *      Terminates - with frequency and infinite modes.
- *
- *    SIGNALS
- *      Uses SIGUSR1 to pause before test if option set.
- *      (See the parse_opts(3) man page).
- *
- *    RESOURCES
- *      None
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *    SPECIAL PROCEDURAL REQUIREMENTS
- *      None
- *
- *    INTERCASE DEPENDENCIES
- *      None
- *
- *    DETAILED DESCRIPTION
- *      This is a Phase I test for the select(2) system call.  It is intended
- *      to provide a limited exposure of the system call, for now.  It
- *      should/will be extended when full functional tests are written for
- *      join(2).
- *
- *      Setup:
- *        Setup signal handling.
- *        Pause for SIGUSR1 if option specified.
- *
- *      Test:
- *       Loop if the proper options are given.
- *        Execute system call
- *        Check return code, if system call failed (return=-1)
- *              Log the errno and Issue a FAIL message.
- *        Otherwise, Issue a PASS message.
- *
- *      Cleanup:
- *        Print errno log and/or timing stats if options given
- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <signal.h>
-#include <fcntl.h>              /* For open system call parameters.  */
-#include <signal.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#ifdef __CYGWIN__
-/*
-  FIXME: workaround for bug in newlib -- FD_ZERO is defined via bzero and
-  if we don't include strings.h compiler warns about implicit declaration
-*/
-#include <strings.h>
-#endif
-
-#include "test.h"
-#include "usctest.h"
-
-#define FILENAME	"select01"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID="select01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int Fd;
-fd_set Readfds;
-
-/***********************************************************************
- * MAIN
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    struct timeval timeout; 
-    long test_time = 0;	/* in usecs */
-
-
-    /***************************************************************
-     * parse standard options, and exit if there is an error
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-        /*
-         * Assigning the specified seconds within the timeval structure.
-         */
-	test_time = ((lc%2000)*100000);		/* 100 milli-seconds */
-
-	/*
-	 * Bound the time to a value less than 60 seconds
-	 */
-
-	if ( test_time > 1000000 * 60 )
-	    test_time = test_time % (1000000 * 60);
-	
-        timeout.tv_sec = test_time / 1000000;
-        timeout.tv_usec = test_time - (timeout.tv_sec * 1000000);
-
-
-	/* Call the system call being tested. */
-	TEST(select(4, &Readfds, 0, 0, &timeout));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL,
-		"%d select(4, &Readfds, 0, 0, &timeout), timeout = %ld usecs, errno=%d",
-		lc, test_time, errno);
-	}
-
-	/***************************************************************
-	 * only perform functional verification if flag set (-f not given)
-	 ***************************************************************/
-	if ( STD_FUNCTIONAL_TEST ) {
-	    /* Perform functional verification here */
-	    tst_resm(TPASS,
-		"select(4, &Readfds, 0, 0, &timeout) timeout = %ld usecs",
-		test_time);
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* create a temporary directory and go to it */
-    tst_tmpdir();
-
-    if ((Fd=open(FILENAME, O_CREAT | O_RDWR)) == -1) {
-	tst_brkm(TBROK, cleanup,
-	    "open(%s, O_CREAT | O_RDWR) failed: errno:%d\n",
-	    errno);
-    }
-
-    /*
-     * Initializing and assigning the standard output file descriptor to
-     * fd_set for select.
-     */
-
-    FD_ZERO(&Readfds);
-    FD_SET(Fd, &Readfds);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    close(Fd);
-
-    /* remove temporary directory and all files in it. */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/select02.c b/winsup/testsuite/winsup.api/ltp/select02.c
deleted file mode 100644
index 935f4b273..000000000
--- a/winsup/testsuite/winsup.api/ltp/select02.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER   : select02
- *
- *    EXECUTED BY       : anyone
- *
- *    TEST TITLE        : select of system pipe fds
- *
- *    PARENT DOCUMENT   : usctpl01
- *
- *    TEST CASE TOTAL   : 1
- *
- *    WALL CLOCK TIME   : 1
- *
- *    CPU TYPES         : ALL
- *
- *    AUTHOR            : Richard Logan
- *
- *    CO-PILOT          : Glen Overby
- *
- *    DATE STARTED      : 02/24/93
- *
- *    INITIAL RELEASE   : UNICOS 7.0
- *
- *    TEST CASES
- *
- *      1.) select(2) to fd of system pipe with no I/O and small timeout
- *
- *    INPUT SPECIFICATIONS
- *      The standard options for system call tests are accepted.
- *      (See the parse_opts(3) man page).
- *
- *    OUTPUT SPECIFICATIONS
- *
- *    DURATION
- *      Terminates - with frequency and infinite modes.
- *
- *    SIGNALS
- *      Uses SIGUSR1 to pause before test if option set.
- *      (See the parse_opts(3) man page).
- *
- *    RESOURCES
- *      None
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *    SPECIAL PROCEDURAL REQUIREMENTS
- *      None
- *
- *    INTERCASE DEPENDENCIES
- *      None
- *
- *    DETAILED DESCRIPTION
- *      This is a Phase I test for the select(2) system call.  It is intended
- *      to provide a limited exposure of the system call, for now.
- *
- *      Setup:
- *        Setup signal handling.
- *        Pause for SIGUSR1 if option specified.
- *
- *      Test:
- *       Loop if the proper options are given.
- *        Execute system call
- *        Check return code, if system call failed (return=-1)
- *              Log the errno and Issue a FAIL message.
- *        Otherwise, Issue a PASS message.
- *
- *      Cleanup:
- *        Print errno log and/or timing stats if options given
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <signal.h>
-#include <fcntl.h>              /* For open system call parameters.  */
-#include <signal.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID="select02";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int Fd[2];
-fd_set saved_Readfds, saved_Writefds;
-fd_set Readfds, Writefds;
-
-/***********************************************************************
- * MAIN
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;	/* message returned from parse_opts */
-    struct timeval timeout; 
-    long test_time = 0;	/* in usecs */
-
-
-    /***************************************************************
-     * parse standard options, and exit if there is an error
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-        /*
-         * Assigning the specified seconds within the timeval structure.
-         */
-
-	test_time = ((lc%2000)*100000);	/* 100 milli-seconds */
-
-        /*
-         * Bound the time to a value less than 60 seconds
-         */
-
-        if ( test_time > 1000000 * 60 )
-            test_time = test_time % (1000000 * 60);
-
-        timeout.tv_sec = test_time / 1000000;
-        timeout.tv_usec = test_time - (timeout.tv_sec * 1000000);
-
-	Readfds = saved_Readfds;
-	Writefds = saved_Writefds;
-
-	/* Call the system call being tested. */
-
-	TEST(select(5, &Readfds, &Writefds, 0, &timeout));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL,
-		"%d select(5, &Readfds, &Writefds, 0, &timeout) failed, errno=%d\n",
-		lc, errno);
-	} else {
-
-    	    /***************************************************************
-    	     * only perform functional verification if flag set (-f not given)
-    	     ***************************************************************/
-    	    if ( STD_FUNCTIONAL_TEST ) {
-    		/* Perform functional verification here */
-    		tst_resm(TPASS,
-				"select(5, &Readfds, &Writefds, 0, &timeout) timeout = %ld usecs",
-				test_time);
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* create a temporary directory and go to it */
-    tst_tmpdir();
-
-    if (pipe(Fd) == -1 ) {
-	tst_brkm(TBROK, cleanup, "pipe(&Fd) failed, errno=%d", errno);
-    }
-
-    /*
-     * Initializing and assigning the standard output file descriptor to
-     * fd_set for select.
-     */
-
-    FD_ZERO(&saved_Readfds);
-    FD_ZERO(&saved_Writefds);
-    FD_SET(Fd[0], &saved_Readfds);
-    FD_SET(Fd[1], &saved_Writefds);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove temporary directory and all files in it. */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/select03.c b/winsup/testsuite/winsup.api/ltp/select03.c
deleted file mode 100644
index 225ef19a7..000000000
--- a/winsup/testsuite/winsup.api/ltp/select03.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER   : select03
- *
- *    EXECUTED BY       : anyone
- *
- *    TEST TITLE        : select of fd of a named-pipe (FIFO)
- *
- *    PARENT DOCUMENT   : usctpl01
- *
- *    TEST CASE TOTAL   : 1
- *
- *    WALL CLOCK TIME   : 1
- *
- *    CPU TYPES         : ALL
- *
- *    AUTHOR            : Richard Logan
- *
- *    CO-PILOT          : Glen Overby
- *
- *    DATE STARTED      : 02/24/93
- *
- *    INITIAL RELEASE   : UNICOS 7.0
- *
- *    TEST CASES
- *
- *      1.) select(2) of fd of a named-pipe (FIFO) with no I/O and small timeout value
- *
- *    INPUT SPECIFICATIONS
- *      The standard options for system call tests are accepted.
- *      (See the parse_opts(3) man page).
- *
- *    OUTPUT SPECIFICATIONS
- *
- *    DURATION
- *      Terminates - with frequency and infinite modes.
- *
- *    SIGNALS
- *      Uses SIGUSR1 to pause before test if option set.
- *      (See the parse_opts(3) man page).
- *
- *    RESOURCES
- *      None
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *    SPECIAL PROCEDURAL REQUIREMENTS
- *      None
- *
- *    INTERCASE DEPENDENCIES
- *      None
- *
- *    DETAILED DESCRIPTION
- *      This is a Phase I test for the select(2) system call.  It is intended
- *      to provide a limited exposure of the system call, for now.
- *
- *      Setup:
- *        Setup signal handling.
- *        Pause for SIGUSR1 if option specified.
- *
- *      Test:
- *       Loop if the proper options are given.
- *        Execute system call
- *        Check return code, if system call failed (return=-1)
- *              Log the errno and Issue a FAIL message.
- *        Otherwise, Issue a PASS message.
- *
- *      Cleanup:
- *        Print errno log and/or timing stats if options given
- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <signal.h>
-#include <fcntl.h>              /* For open system call parameters.  */
-#include <signal.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-
-
-#include "test.h"
-#include "usctest.h"
-
-#define FILENAME	"select03"
-
-extern void setup();
-extern void cleanup();
-
-const char *TCID="select03";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int Fd;
-fd_set saved_Readfds, saved_Writefds;
-fd_set Readfds, Writefds;
-
-
-/***********************************************************************
- * MAIN
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;	/* message returned from parse_opts */
-    struct timeval timeout; 
-    long test_time = 0;	/* in usecs */
-
-
-    /***************************************************************
-     * parse standard options, and exit if there is an error
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-        /*
-         * Assigning the specified seconds within the timeval structure.
-         */
-
-	test_time = ((lc%2000)*100000);	/* 100 milli-seconds */
-	
-        /*
-         * Bound the time to a value less than 60 seconds
-         */
-
-        if ( test_time > 1000000 * 60 )
-            test_time = test_time % (1000000 * 60);
-
-        timeout.tv_sec = test_time / 1000000;
-        timeout.tv_usec = test_time - (timeout.tv_sec * 1000000);
-
-        Readfds = saved_Readfds;
-        Writefds = saved_Writefds;
-
-	/* Call the system call being tested. */
-
-        TEST(select(5, &Readfds, &Writefds, 0, &timeout));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL,
-		"%d select(5, &Readfds, &Writefds, 0, &timeout) failed errno=%d\n",
-		lc, errno);
-	} else {
-
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* Perform functional verification here */
-		tst_resm(TPASS,
-				"select(5, &Readfds, &Writefds, 0, &timeout) timeout = %ld usecs",
-				test_time);
-	    }
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* create a temporary directory and go to it */
-    tst_tmpdir();
-
-
-    /* make and open FIFO */
-    if ( mkfifo(FILENAME, 0777) == -1 ) {
-	tst_brkm(TBROK, cleanup, "mkfifo(%s, 0777) failed, errno=%d",
-	    FILENAME, errno);
-    }
-
-    if ((Fd=open(FILENAME, O_RDWR)) == -1 ) {
-	tst_brkm(TBROK, cleanup, "open(%s, O_RDWR) failed, errno=%d",
-	    FILENAME, errno);
-    }
-
-    /*
-     * Initializing and assigning the standard output file descriptor to
-     * fd_set for select.
-     */
-
-    FD_ZERO(&saved_Readfds);
-    FD_ZERO(&saved_Writefds);
-    FD_SET(Fd, &saved_Readfds);
-    FD_SET(Fd, &saved_Writefds);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove temporary directory and all files in it. */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/setgid01.c b/winsup/testsuite/winsup.api/ltp/setgid01.c
deleted file mode 100644
index a75e88a1d..000000000
--- a/winsup/testsuite/winsup.api/ltp/setgid01.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: setgid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for setgid(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) setgid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the setgid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	setgid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="setgid01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-int gid;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call setgid(2) 
-	 */
-	TEST(setgid(gid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setgid(%d) Failed, errno=%d : %s", gid,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setgid(%d) returned %d", gid, TEST_RETURN);
-	    } 
-	}
-	
-    }	/* End for TEST_LOOPING */
-    
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    gid = getgid();
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/setgroups01.c b/winsup/testsuite/winsup.api/ltp/setgroups01.c
deleted file mode 100644
index ee1c54b63..000000000
--- a/winsup/testsuite/winsup.api/ltp/setgroups01.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: setgroups01
- * 
- *    EXECUTED BY	: root
- * 
- *    TEST TITLE	: Basic test for setgroups(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) setgroups(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the setgroups(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	setgroups(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/param.h>
-#include <grp.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="setgroups01"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int len = NGROUPS; 
-gid_t list[NGROUPS];
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call setgroups(2) 
-	 */
-	TEST(setgroups(len, list));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setgroups(%d, list) Failed, errno=%d : %s", len,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setgroups(%d, list) returned %d", len, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    if ( geteuid() != 0 )
-	tst_brkm(TBROK, cleanup, "Must be ROOT to run this test.");
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    if (getgroups(len, list) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"getgroups(%d, list) Failure. errno=%d : %s",
-		len, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/setpgid01.c b/winsup/testsuite/winsup.api/ltp/setpgid01.c
deleted file mode 100644
index 0835c66a3..000000000
--- a/winsup/testsuite/winsup.api/ltp/setpgid01.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: setpgid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for setpgid(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) setpgid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the setpgid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	setpgid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup() __attribute__ ((noreturn));
-
-const char *TCID="setpgid01";	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-int pgid, pid;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call setpgid(2) 
-	 */
-	TEST(setpgid(pid, pgid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setpgid(%d, %d) Failed, errno=%d : %s", pid, pgid,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setpgid(%d, %d) returned %d", pid, pgid,  TEST_RETURN);
-	    } 
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    int	status;
-
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    /*
-     * Make sure current process is NOT a session or pgrp leader
-     */
-
-    pgid=getpgrp();
-    pid=getpid();
-
-    if (pgid == pid) {
-	if ((pid = fork()) == -1) {
-	    tst_brkm(TBROK, cleanup, "fork() in setup() failed - errno %d",
-		     errno);
-	}
-
-	if (pid != 0) {	    	    /* parent - sits and waits */
-	    wait(&status);
-	    exit(WEXITSTATUS(status));
-	} else {    	    	    /* child - continues with test */
-	    pid = getpid();
-	}
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/setregid01.c b/winsup/testsuite/winsup.api/ltp/setregid01.c
deleted file mode 100644
index e4251f04e..000000000
--- a/winsup/testsuite/winsup.api/ltp/setregid01.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: setregid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for setregid(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 5
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 05/13/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) setregid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the setregid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	setregid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="setregid01";	/* Test program identifier.    */
-int TST_TOTAL=5;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};		/* Zero terminated list of expected errnos */
-
-int gid, egid;			/* current real and effective group id */
-
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *  Dont change either real or effective gid
-	 */
-	gid=getgid();
-	egid=getegid();
-
-
-	/* Call setregid(2) */
-	TEST(setregid(-1, -1));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setregid -  Dont change either real or effective gid failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setregid -  Dont change either real or effective gid returned %d", TEST_RETURN);
-	    } 
-	}
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  change effective to effective gid
-	 */
-	 
-
-	/* Call setregid(2) */
-	TEST(setregid(-1, egid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setregid -  change effective to effective gid failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setregid -  change effective to effective gid returned %d", TEST_RETURN);
-	    } 
-	}
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  change real to real gid
-	 */
-	 
-
-	/* Call setregid(2) */
-	TEST(setregid(gid, -1));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setregid -  change real to real gid failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setregid -  change real to real gid returned %d", TEST_RETURN);
-	    } 
-	}
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  change effective to real gid
-	 */
-	 
-
-	/* Call setregid(2) */
-	TEST(setregid(-1, gid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setregid -  change effective to real gid failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setregid -  change effective to real gid returned %d", TEST_RETURN);
-	    } 
-	}
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  try to change real to current real
-	 */
-	 
-
-	/* Call setregid(2) */
-	TEST(setregid(gid, gid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setregid -  try to change real to current real failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setregid -  try to change real to current real returned %d", TEST_RETURN);
-	    } 
-	}
-	
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/setreuid01.c b/winsup/testsuite/winsup.api/ltp/setreuid01.c
deleted file mode 100644
index 05467c80f..000000000
--- a/winsup/testsuite/winsup.api/ltp/setreuid01.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: setreuid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for setreuid(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 5
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 05/14/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) setreuid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the setreuid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	setreuid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="setreuid01";	/* Test program identifier.    */
-int TST_TOTAL=5;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};		/* Zero terminated list of expected errnos */
-
-int ruid, euid;	/* real and effective user ids */
-
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *  Don't change either real or effective uid
-	 */
-	ruid=getuid();	/* get real uid */
-	euid=geteuid();		/* get effective uid */
-
-
-	/* Call setreuid(2) */
-	TEST(setreuid(-1, -1));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setreuid -  Don't change either real or effective uid failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setreuid -  Don't change either real or effective uid returned %d", TEST_RETURN);
-	    } 
-	}
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  change effective to effective uid
-	 */
-	 
-
-	/* Call setreuid(2) */
-	TEST(setreuid(-1, euid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setreuid -  change effective to effective uid failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setreuid -  change effective to effective uid returned %d", TEST_RETURN);
-	    } 
-	}
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  change real to real uid
-	 */
-	 
-
-	/* Call setreuid(2) */
-	TEST(setreuid(ruid, -1));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setreuid -  change real to real uid failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setreuid -  change real to real uid returned %d", TEST_RETURN);
-	    } 
-	}
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  change effective to real uid
-	 */
-	 
-
-	/* Call setreuid(2) */
-	TEST(setreuid(-1, ruid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setreuid -  change effective to real uid failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setreuid -  change effective to real uid returned %d", TEST_RETURN);
-	    } 
-	}
-	
-	
-	/* 
-	 * TEST CASE:
-	 *  try to change real to current real
-	 */
-	 
-
-	/* Call setreuid(2) */
-	TEST(setreuid(ruid, ruid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setreuid -  try to change real to current real failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setreuid -  try to change real to current real returned %d", TEST_RETURN);
-	    } 
-	}
-	
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/setuid01.c b/winsup/testsuite/winsup.api/ltp/setuid01.c
deleted file mode 100644
index 37e18fd51..000000000
--- a/winsup/testsuite/winsup.api/ltp/setuid01.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: setuid01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for setuid(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 05/14/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) setuid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- * 	The libcuts.a and libsys.a libraries must be included in 
- *	the compilation of this test.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the setuid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	setuid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="setuid01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int uid;		/* current user id */
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-		
-	/* 
-	 * TEST CASE:
-	 *  Set the effective user ID to the current real uid
-	 */
-	uid=getuid();
-
-	/* Call setuid(2) */
-	TEST(setuid(uid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setuid -  Set the effective user ID to the current real uid failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setuid -  Set the effective user ID to the current real uid returned %d", TEST_RETURN);
-	    } 
-	}
-	
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/setuid02.c b/winsup/testsuite/winsup.api/ltp/setuid02.c
deleted file mode 100644
index ee55ae19b..000000000
--- a/winsup/testsuite/winsup.api/ltp/setuid02.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: setuid02
- * 
- *    EXECUTED BY	: root
- * 
- *    TEST TITLE	: Basic test for setuid(2) as root
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 05/14/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) setuid(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the setuid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	setuid(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include <sys/types.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="setuid02";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};		/* Zero terminated list of expected errnos */
-
-int uid;		/* current user id */
-
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    uid=getuid();
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-
-		
-	/* 
-	 * TEST CASE:
-	 *  Set the effective user ID to the current real uid
-	 */
-
-	/* Call setuid(2) */
-	TEST(setuid(uid));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "setuid -  Set the effective user ID to the current real uid failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "setuid -  Set the effective user ID to the current real uid returned %d", TEST_RETURN);
-	    } 
-	}
-	
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp dir and cd to it */
-    tst_tmpdir();
-
-    /* must be root */
-    if ( geteuid() != 0 )
-	tst_brkm(TBROK, cleanup, "Must be root for this test!");
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove files and temp dir */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/signal03.c b/winsup/testsuite/winsup.api/ltp/signal03.c
deleted file mode 100644
index 2a0923ca2..000000000
--- a/winsup/testsuite/winsup.api/ltp/signal03.c
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/***********************************************************************************
- * 
- * OS Test   -  Silicon Graphics, Inc.  Eagan, Minnesota
- * 
- * TEST IDENTIFIER :  signal03  Boundary value and other invalid value checking
- * 				 of signal setup and signal sending.
- * 
- * PARENT DOCUMENT :  sgntds01  Signal System Call
- * 		
- * AUTHOR           :  Dave Baumgartner
- * 		    :  Rewrote 12/92 by Richard Logan
- * 
- * CO-PILOT         :  Barrie Kletscher
- * 
- * DATE STARTED     :  10/17/85
- * 
- * TEST ITEMS
- * 
- * 	1. SIGKILL can not be set to be caught, errno:EINVAL (POSIX).
- * 	2. SIGKILL can not be caught.
- * 	3. SIGKILL can not be set to be ignored, errno:EINVAL (POSIX).
- * 	4. SIGKILL can not be ignored.
- * 	5. SIGKILL can not be reset to default, errno:EINVAL (POSIX.
- * 
- * ENVIRONMENTAL NEEDS
- * 
- * 	NONE
- * 
- * SPECIAL PROCEDURAL REQUIREMENTS
- * 
- * 	None
- * 
- * INTERCASE DEPENDENCIES
- * 
- * 	2 depends on 1 and 4 on 3.
- * 
- * DETAILED DESCRIPTION
- * 
- * 	main()
- * 	Call catch_test to test setup and catching of SIGKILL.
- * 
- * 
- * 	Call ignore_test to test setup and ignoring of SIGKILL.
- * 
- * 
- * 	Call sigdfl_test to test setting SIGKILL to default.
- * 
- * 	* END OF MAIN *
- * 
- * 
- * 	catch_test()
- * 
- * 	fork a child
- * 	if this is the parent
- * 		sleep to let child start.
- * 		send sig to child.
- * 		wait for the child to terminate.
- * 
- * 		if the termination status of the child equals the signal sent to it
- * 			Test item 1 PASSED the child was killed.
- * 		else if status equals the exit value of SIG_CAUGHT
- * 			Test item 2 FAILED sig was caught.
- * 		else 
- * 			Test item 2 FAILED because the child was not killed
- * 			but sig was not caught either.
- * 
- * 	else this the child
- * 		set exit_val to SIG_NOT_CAUGHT.
- * 		set to catch sig, where the interrupt routine just sets 
- * 		exit_val to SIG_CAUGHT.
- * 
- * 		If the return value and errno, after trying to set to catch sig,
- * 		do not indicate that an error has occurred.
- * 			Test item 1 FAILED bad return, return value:X, errno:X.
- * 		else
- * 			Test item 1 PASSED sig was not set to be caught.
- * 
- * 		pause until the parent sends a signal.
- * 		The child should be killed by the signal but if not exit
- * 		with exit_val.
- * 
- * 	* End of catch_test. *
- * 
- * 
- * 	ignore_test()
- * 
- * 	fork a child
- * 	if this is the parent
- * 		sleep to let child start.
- * 		send SIGKILL to child.
- * 		wait for the child to terminate.
- * 
- * 		if the termination status of the child equals SIGKILL
- * 			Test item 4 PASSED the child was killed.
- * 		else if the status equals the exit value of SIG_IGNORED
- * 			Test item 4 FAILED SIGKILL was ignored.
- * 
- * 	else this the child
- * 
- * 		If the return value and errno, after trying to set to ignore SIGKILL,
- * 		do not indicate that an error has occurred.
- * 			Test item 3 FAILED bad return, return value:X, errno:X.
- * 		else
- * 			Test item 3 PASSED SIGKILL was not set to be ignored.
- * 
- * 		pause until the parent sends SIGKILL.
- * 		The child should be killed by the signal but if not exit
- * 		with SIG_IGNORED.
- * 
- * 	* End of ignore_test. *
- * 
- * 
- * 	sigdfl_test()
- * 
- * 	If the return value and errno, after trying to set to SIGKILL to default,
- * 	do not indicate that an error has occurred.
- * 		Test item 5 FAILED bad return, return value:X, errno:X.
- * 	else
- * 		Test item 5 PASSED SIGKILL was not set to default.
- * 
- * 	* End of sigdfl_test. *
- * 
- * BUGS/NOTES
- * 	Since the system call under test is executed in the child, no
- *	timings on this system call will be reported.
- * 
-***********************************************************************************/
-
-#include <signal.h>
-#include <errno.h>  
-#include <fcntl.h>
-#include <string.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-void do_test();
-void sigdfl_test();
-void update_timings();
-
-#if defined(linux)
-# define SIG_PF sig_t  /* This might need to be sighandler_t on some systems */
-#elif defined(__CYGWIN__)
-typedef void (*sighandler_t) (int);
-#define SIG_PF sighandler_t
-#endif
-
-#define SIG_CAUGHT	1
-#define SIG_NOT_CAUGHT	0
-#define SIG_IGNORED	5
-#define TIMED_OUT	99
-
-#define TIMEOUT		20
-
-#define GO_FLAG		1
-#define ERROR_FLAG	2
-#define PASS_FLAG	3
-#define FAIL_FLAG	4
-
-#define IGNORE_TEST	1
-#define CATCH_TEST	2
-
-#define MAXMESG 150	/* The Maximum message that can be created.	*/
-
-int exit_val;		/* Global variable, used to tell whether the	*/
-			/* child exited instead of being killed.	*/
-extern int errno;	/* errno holds the error value returned by	*/
-			/* a system call.                        	*/
-char mesg[MAXMESG];	/* Holds messages to pass to tst_res.		*/ 
-
-struct ipc_t {
-    int status;
-    char mesg[MAXMESG];
-    struct tblock timings;
-} Ipc_info;
-
-const char *TCID = "signal03";
-int TST_TOTAL = 5;
-extern int Tst_count;           /* count of test items completed */
-
-int Pid;		/* Return value from fork.			 */
-
-long Tret;
-
-/***********************************************************************
- *   M A I N
- ***********************************************************************/
-int
-main(argc, argv)
-int argc;
-char **argv;
-{
-    int lc;
-    const char *msg;
-
-    /***************************************************************
-    * parse standard options
-    ***************************************************************/
-    if ( (msg=parse_opts(argc, argv, (option_t *) NULL, NULL)) != (char *) NULL ) {
-        tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-        /* reset Tst_count in case we are looping. */
-        Tst_count=0;
-
-	errno=-4;
-
-	/*
-	 * Call catch_test to test setup and catching of SIGKILL.
-	 */
-	(void) do_test(CATCH_TEST, Tst_count);
-
-	/*
-	 * Call ignore_test to test setup and ignoring of SIGKILL.
-	 */
-	(void) do_test(IGNORE_TEST, Tst_count);
-
-	/*
-	 * Call sigdfl_test to test setting SIGKILL to default.
-	 */
-	(void) sigdfl_test();
-
-    }
-
-    cleanup();
-
-    return 0;
-} /*End of main*/
-
-/***********************************************************************
- *
- ***********************************************************************/
-void
-do_test(test_case, tst_count)
-int test_case;
-int tst_count;
-{
-  int term_stat;	/* Termination status of the child returned to	 */
-			/* the parent.					 */
-  char string[30];
-  int fd1[2];		/* ipc */
-  int rd_sz;		/* size of read */
-  void p_timeout_handler();
-  void c_timeout_handler();
-  void catchsig();
-
-  Tst_count = tst_count;
-
-  /*
-   * Create a pipe of ipc
-   */
-  if ( pipe(fd1) == -1 ) {
-	 sprintf(mesg,
-	 "pipe system call failed, Errno: %d, Error message: %s",
-			errno,strerror(errno)); 
-	 tst_resm(TBROK,mesg);
-	 tst_resm(TBROK,mesg);
-	 return;
-  }
-
-  /*
-   * Cause the read to return 0 once EOF is encountered and the
-   * read to return -1 if pipe is empty.
-   */
-
-  if ( fcntl(fd1[0], F_SETFL, O_NONBLOCK) == -1 ) {
-	sprintf(mesg, "fcntl(fd1[0], F_SETFL, O_NONBLOCK) failed: errno=%d",
-	    errno);
-	tst_resm(TBROK,mesg);
-        tst_resm(TBROK,mesg);
-	close(fd1[0]);
-	close(fd1[1]);
-	return;
-  }
-
-  if ((Pid = fork()) > 0) {	/* parent */
-
-	signal(SIGALRM, p_timeout_handler);
-
-	alarm(TIMEOUT);
-
-	close(fd1[1]);      /* close write side */
-
-	/*
-	 * Deal with child's messages.
-	 * Only the GO_FLAG status will allow parent to
-	 * go on.  All pipe io will be in the ipc_t structure sizes 
-	 * to avoid reading part of next message.
-	 */
-        while ( 1 ) {
-
-	    while ( (rd_sz=read(fd1[0], (char *)&Ipc_info, sizeof(Ipc_info))) != 0 ) {
-	        if ( rd_sz > 0 )
-	            break;	/* read something */
-	    }
-
-	    if ( rd_sz == 0 ) {		/* if EOF encountered */
-		sprintf(mesg, "child's pipe is closed before 'go' message received");
-		tst_resm(TBROK, Ipc_info.mesg);
-		tst_resm(TBROK, Ipc_info.mesg);
-		close(fd1[0]);
-	 	return;
-	    }
-
-	    else if ( Ipc_info.status == GO_FLAG ) {
-	 	break;	/* go on */
-	    }
-	    else if ( Ipc_info.status == ERROR_FLAG ) {
-		tst_resm(TBROK, "From child: %s", Ipc_info.mesg);
-		tst_resm(TBROK, "From child: %s", Ipc_info.mesg);
-		close(fd1[0]);
-	 	return;
-	    }
-	    else if ( Ipc_info.status == PASS_FLAG ) {
-		
-		if ( STD_FUNCTIONAL_TEST )
-		    tst_resm(TPASS, "From child: %s", Ipc_info.mesg);
-		else
-		    Tst_count++;
-		update_timings(Ipc_info.timings);
-	    }
-	    else if ( Ipc_info.status == FAIL_FLAG ) {
-		tst_resm(TFAIL, "From child: %s", Ipc_info.mesg);
-		update_timings(Ipc_info.timings);
-            }   
-	    else {
-		tst_resm(TINFO, "Unknown message from child: %s", mesg);
-	    }
-	}
-
-	/*
-	 * Send the signal SIGKILL to the child.
-	 */
-	 if (kill(Pid,SIGKILL) == -1)
-	 {
-		/*
-		 * The kill system call failed.
-		 */
-	       	 sprintf(mesg,
-		 "kill(Pid,SIGKILL) failed, Errno: %d, Error message: %s",
-				errno,strerror(errno)); 
-		 tst_resm(TBROK,mesg);
-		 tst_resm(TBROK,mesg);
-		 close(fd1[0]);
-	 	 return;
-	}
-
-	/*
-	 * Wait for the child to terminate and check the termination status.
-	 */
-	if (wait(&term_stat) == -1) {
-		/*
-		 * The wait system call failed.
-		 */
-	       	 sprintf(mesg,
-		 "Wait system call failed. Errno: %d, Error message: %s",
-				errno,strerror(errno)); 
-		 tst_resm(TBROK,mesg);
-		 tst_resm(TBROK,mesg);
-		 close(fd1[0]);
-	 	 return;
-	}
-	else if ( STD_FUNCTIONAL_TEST ) {
-	    if ((term_stat & 0377) == SIGKILL) {
-		/*
-		 * The child was killed by the signal sent,
-		 * which is correct.
-		 */
-		 tst_resm(TPASS,"The child was killed by SIGKILL.");
-	    }
-	    else if ( (term_stat >> 8) == TIMED_OUT ) {
-	        sprintf(mesg, "child exited with a timed out exit status");
-	        tst_resm(TBROK,mesg);
-	    }
-	    else {
-	        if ((term_stat >> 8) == SIG_IGNORED && test_case == IGNORE_TEST ) {
-		    sprintf(mesg, 
-		        "SIGKILL was ignored by child after sent by parent.");
-	        }
-	        else if ((term_stat >> 8) == SIG_CAUGHT && test_case == CATCH_TEST ) {
-		    sprintf(mesg,
-		        "SIGKILL was caught by child after sent by parent.");
-	        }
-	        else {
-	            sprintf(mesg,
-		        "Child's termination status is unexpected. Status: %d (%#o).",
-		        term_stat, term_stat);
-	        }
-	        tst_resm(TFAIL, mesg);
-	    }
-	}
-	else {
-	    Tst_count++;	/* increment test counter */
-	}
-	close(fd1[0]);
-
-    }	/* End of parent. */
-    else if (Pid == 0) {	
-	/*
-	 * This is the child.
-	 * Set up to ignore/catch SIGKILL and check the return values.
-	 */
-	errno=0;
-	if ( test_case == IGNORE_TEST ) {
-	    exit_val = SIG_IGNORED;
-	    strcpy(string, "signal(SIGKILL, SIG_IGN)");
-
-	    Tret=(long)signal(SIGKILL, SIG_IGN);
-	    TEST_ERRNO=errno;
-	}
-	else {
-	    exit_val = SIG_NOT_CAUGHT;
-	    strcpy(string, "signal(SIGKILL, catchsig)");
-	    Tret=(long)signal(SIGKILL, catchsig);
-	    TEST_ERRNO=errno;
-	}
-	Ipc_info.timings=tblock;	
-
-	if ( (SIG_PF)Tret == SIG_ERR  ) {
-	    if ( TEST_ERRNO == EINVAL ) {
-	        sprintf(Ipc_info.mesg, "%s ret:%ld SIG_ERR (%ld) as expected",
-		    string, Tret, (long)SIG_ERR);
-		Ipc_info.status = PASS_FLAG;
-	    }
-	    else {
-	        sprintf(Ipc_info.mesg,
-		    "%s ret:%ld, errno:%d expected ret:%ld, errno:%d",
-		    string, Tret, TEST_ERRNO, (long)SIG_ERR, EINVAL);
-		Ipc_info.status = FAIL_FLAG;
-	    }
-		
-	    write(fd1[1], (char *)&Ipc_info, sizeof(Ipc_info));
-	}
-	else {
-	    /*
-	     * The child was not allowed to set the signal to 
-	     * be ignored and errno was correct.
-	     */
-	    sprintf(Ipc_info.mesg,
-		"%s ret:%ld, errno:%d expected ret:%ld, errno:%d",
-		string, Tret, TEST_ERRNO, (long)SIG_ERR, EINVAL);
-	    Ipc_info.status = FAIL_FLAG;
-	    write(fd1[1], (char *)&Ipc_info, sizeof(Ipc_info));
-	}
-
-	/*
-	 * tell parent we are ready - setup by child is done
-	 */
-	Ipc_info.status = GO_FLAG;
-	write(fd1[1], (char *)&Ipc_info, sizeof(Ipc_info));
-
-	/*
-	 * Set the alarm to wake up from the pause below if
-	 * the parents signal is ignored.
-	 */
-	signal(SIGALRM, p_timeout_handler);
-	alarm(TIMEOUT);
-
-	/*
-	 * Pause until the parent sends a signal or until alarm is received.
-	 */
-	pause();
-
-	exit(exit_val);
-
-
-    }	/* End of child. */
-    else {
-	/*
-	 * The fork system call failed.
-	 */
-	 sprintf(mesg,
-		"Fork system call failed. Errno: %d, Error message: %s",
-			errno,strerror(errno)); 
-	 tst_resm(TBROK,mesg);
-	 tst_resm(TBROK,mesg);
- 	 close(fd1[0]);
-         close(fd1[1]);
-	 return;
-    }
-
-} /* End of do_test. */
-
-/***********************************************************************
- * sigdfl_test - test for attempt to set SIGKILL to default 
- ***********************************************************************/
-void
-sigdfl_test()
-{
-  /*
-   * Try to set SIGKILL to default and check the return values.
-   */
-   errno=-4;
-
-   Tret=(long)signal(SIGKILL,SIG_DFL);
-   TEST_RETURN=Tret;
-   TEST_ERRNO=errno;
-
-
-    if ( (SIG_PF)TEST_RETURN == SIG_ERR  ) {
-	if ( STD_FUNCTIONAL_TEST ) {
-	    if ( TEST_ERRNO != EINVAL ) {
-	        sprintf(mesg,
-	            "signal(SIGKILL,SIG_DFL) ret:%d, errno:%d expected ret:-1, errno:%d",
-	            TEST_RETURN, TEST_ERRNO, EINVAL);
-	        tst_resm(TFAIL, mesg);
-	    }
-	    else {
-	        sprintf(mesg,
-	            "signal(SIGKILL,SIG_DFL) ret:%d, errno:%d as expected.",
-	            TEST_RETURN, TEST_ERRNO);
-	        tst_resm(TPASS, mesg);
-	    }
-	}
-	else
-	    Tst_count++;
-    }
-    else {
-	sprintf(mesg,
-	    "signal(SIGKILL,SIG_DFL) ret:%d, errno:%d expected ret:-1, errno:%d",
-	    TEST_RETURN, TEST_ERRNO, EINVAL);
-	tst_resm(TFAIL, mesg);
-    }
-
-}	/* End of sigdfl_test. */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* make and change to a temporary directory */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}       /* End setup() */
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *              completion or premature exit.
- ***************************************************************/
-void
-cleanup()
-{
-
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-
-    TEST_CLEANUP;
-
-    /*
-     * remove the temporary directory and exit with
-     * return code appropriate for results 
-     */
-
-    tst_rmdir();
-
-    tst_exit();
-
-}       /* End cleanup() */
-
-/***********************************************************************
- *  Signal handler routine that used by the parent to handler
- *  a time out situation.  It will attempt to kill the child and
- *  call cleanup.
- ***********************************************************************/
-void
-p_timeout_handler()
-{
-    kill(Pid, SIGKILL);
-    cleanup();
-}
-
-/***********************************************************************
- * Signal handler routine that used by the child to handle
- * a time out situation.  It will set a global varaible and return
- * if called.
- ***********************************************************************/
-void
-c_timeout_handler()
-{
-    exit_val = TIMED_OUT;
-    return;
-}
-
-/***********************************************************************
- * This signal handling routine will set a global variable and return
- * if called.
- ***********************************************************************/
-void
-catchsig()
-{
-   exit_val = SIG_CAUGHT;
-   return;
-}
-
-/***********************************************************************
- * Update timing information
- ***********************************************************************/
-void
-update_timings(atblock)
-struct tblock atblock;
-{
-    tblock.tb_max += atblock.tb_max;
-    tblock.tb_min += atblock.tb_min;
-    tblock.tb_total += atblock.tb_total;
-    tblock.tb_count += atblock.tb_count;
-}
diff --git a/winsup/testsuite/winsup.api/ltp/stat01.c b/winsup/testsuite/winsup.api/ltp/stat01.c
deleted file mode 100644
index da3596e17..000000000
--- a/winsup/testsuite/winsup.api/ltp/stat01.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: stat01
- *
- * Test Description:
- *  Verify that, stat(2) succeeds to get the status of a file and fills the
- *  stat structure elements.
- *
- * Expected Result:
- *  stat() should return value 0 on success and fills the stat structure
- *  elements with the specified 'file' information.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  stat01 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <pwd.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define FILE_MODE	0644
-#define TESTFILE	"testfile"
-#define FILE_SIZE       1024
-#define BUF_SIZE	256
-#define MASK		0777
-
-const char *TCID="stat01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={0};
-uid_t User_id;			/* Owner id of the test file */
-gid_t Group_id;			/* Group id of the test file */
-char nobody_uid[] = "nobody";
-struct passwd *ltpuser;
-
-void setup();			/* Setup function for the test */
-void cleanup(void) __attribute__((noreturn));			/* Cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat structure buffer */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-		/*NOTREACHED*/
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */ 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-	
-		/* 
-		 * Call stat(2) to get the status of
-		 * specified 'file' into stat structure.
-		 */
-		TEST(stat(TESTFILE, &stat_buf));
-	
-		/* check return code of stat(2) */
-		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, \
-				 "stat(%s, &stat_buf) Failed, errno=%d : %s",
-				 TESTFILE, TEST_ERRNO, strerror(TEST_ERRNO));
-		} else {
-			/*
-			 * Perform functional verification if test
-			 * executed without (-f) option.
-			 */
-			if (STD_FUNCTIONAL_TEST) {
-				stat_buf.st_mode &= ~S_IFREG;
-				/*
-				 * Verify the data returned by stat(2)
-				 * aganist the expected data.
-				 */
-				if ((stat_buf.st_uid != User_id) || \
-					(stat_buf.st_gid != Group_id) || \
-					(stat_buf.st_size != FILE_SIZE) || \
-					((stat_buf.st_mode & MASK) != FILE_MODE)) {
-					tst_resm(TFAIL, "Functionality of "
-						"stat(2) on '%s' Failed",
-						TESTFILE);
-				} else {
-					tst_resm(TPASS, "Functionality of "
-						"stat(2) on '%s' Succcessful",
-						TESTFILE);
-				}
-			} else {
-				tst_resm(TINFO, "Call succeeded");
-			}
-		}
-		Tst_count++;		/* incr. TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * void
- * setup() -  Performs setup function for the test.
- *  Creat a temporary directory and change directory to it.
- *  Creat a testfile and write some known data into it.
- *  Get the effective uid/gid of test process.
- */
-void 
-setup()
-{
-	int i, fd;
-	char tst_buff[BUF_SIZE];
-	int wbytes;
-	int write_len = 0;
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-#if 0    
-	/* Switch to nobody user for correct error code collection */
-        if (geteuid() != 0) {
-                tst_brkm(TBROK, tst_exit, "Test must be run as root");
-        }
-         ltpuser = getpwnam(nobody_uid);
-         if (setuid(ltpuser->pw_uid) == -1) {
-                tst_resm(TINFO, "setuid failed to "
-                         "to set the effective uid to %d",
-                         ltpuser->pw_uid);
-                perror("setuid");
-         }
-#endif
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-    
-	if ((fd = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-
-	/* Fill the test buffer with the known data */
-	for (i = 0; i < BUF_SIZE; i++) {
-		tst_buff[i] = 'a';
-	}
-	
-	/* Write to the file 1k data from the buffer */
-	while (write_len < FILE_SIZE) {
-		if ((wbytes = write(fd, tst_buff, sizeof(tst_buff))) <= 0) {
-			tst_brkm(TBROK, cleanup,
-				 "write(2) on %s Failed, errno=%d : %s",
-				 TESTFILE, errno, strerror(errno));
-			/*NOTREACHED*/
-		} else {
-			write_len += wbytes;
-		}
-	}
-
-	/* Close the testfile created */
-	if (close(fd) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	}
-
-	/* Get the uid/gid of the process */
-	User_id = getuid();
-	Group_id = getgid();
-
-}	/* End setup() */
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- *  Remove the test file and temporary directory created.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/stat02.c b/winsup/testsuite/winsup.api/ltp/stat02.c
deleted file mode 100644
index 745476fa0..000000000
--- a/winsup/testsuite/winsup.api/ltp/stat02.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: stat02
- *
- * Test Description:
- *  Verify that, stat(2) succeeds to get the status of a file and fills the
- *  stat structure elements though process doesn't have read access to the
- *  file.
- *
- * Expected Result:
- *  stat() should return value 0 on success and the stat structure elements
- *  should be filled with specified 'file' information.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  stat02 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <pwd.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define TESTFILE	"testfile"
-#define FILE_SIZE       1024
-#define BUF_SIZE	256
-#define NEW_MODE	0222
-#define MASK		0777
-
-const char *TCID="stat02"; 		/* Test program identifier.    */
-int TST_TOTAL=1;			/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={0};
-uid_t User_id;			/* eff. user id/group id of test process */
-gid_t Group_id;
-char nobody_uid[] = "nobody";
-struct passwd *ltpuser;
-
-void setup();			/* Setup function for the test */
-void cleanup(void) __attribute__((noreturn));			/* Cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat structure buffer */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */ 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-
-		/* 
-		 * Call stat(2) to get the status of
-		 * specified 'file' into stat structure.
-		 */
-		TEST(stat(TESTFILE, &stat_buf));
-
-		/* check return code of stat(2) */
-		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL,
-				 "stat(%s, &stat_buf) Failed, errno=%d : %s",
-				 TESTFILE, TEST_ERRNO, strerror(TEST_ERRNO));
-		} else {
-			/*
-			 * Perform functional verification if test
-			 * executed without (-f) option.
-			 */
-			if (STD_FUNCTIONAL_TEST) {
-				stat_buf.st_mode &= ~S_IFREG;
-				/*
-				 * Verify the data returned by stat(2)
-				 * aganist the expected data.
-				 */
-				if ((stat_buf.st_uid != User_id) || \
-				    (stat_buf.st_gid != Group_id) || \
-				    (stat_buf.st_size != FILE_SIZE) || \
-				    ((stat_buf.st_mode & MASK) != NEW_MODE)) {
-					tst_resm(TFAIL, "Functionality of "
-						"stat(2) on '%s' Failed",
-						TESTFILE);
-				} else {
-					tst_resm(TPASS, "Functionality of "
-						"stat(2) on '%s' Succcessful",
-						TESTFILE);
-				}
-			} else {
-				tst_resm(TPASS, "Call succeeded");
-			}
-		}
-		Tst_count++;			/* incr TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * void
- * setup() -  Performs setup function for the test.
- *  Creat a temporary directory and change directory to it.
- *  Creat a testfile and write some data into it.
- *  Modify the mode permissions of testfile such that test process
- *  has read-only access to testfile.
- */
-void 
-setup()
-{
-	int i, fd;			/* counter, file handle for file */
-	char tst_buff[BUF_SIZE];	/* data buffer for file */
-	int wbytes;			/* no. of bytes written to file */
-	int write_len = 0;
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-#if 0
-	/* Switch to nobody user for correct error code collection */
-        if (geteuid() != 0) {
-                tst_brkm(TBROK, tst_exit, "Test must be run as root");
-        }
-         ltpuser = getpwnam(nobody_uid);
-         if (setuid(ltpuser->pw_uid) == -1) {
-                tst_resm(TINFO, "setuid failed to "
-                         "to set the effective uid to %d",
-                         ltpuser->pw_uid);
-                perror("setuid");
-         }
-#endif
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	if ((fd = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-
-	/* Fill the test buffer with the known data */
-	for (i = 0; i < BUF_SIZE; i++) {
-		tst_buff[i] = 'a';
-	}
-	
-	/* Write to the file 1k data from the buffer */
-	while (write_len < FILE_SIZE) {
-		if ((wbytes = write(fd, tst_buff, sizeof(tst_buff))) <= 0) {
-			tst_brkm(TBROK, cleanup,
-				 "write(2) on %s Failed, errno=%d : %s",
-				 TESTFILE, errno, strerror(errno));
-			/*NOTREACHED*/
-		} else {
-			write_len += wbytes;
-		}
-	}
-
-	if (close(fd) == -1) {
-		tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	}
-
-	/* Modify mode permissions on the testfile */
-	if (chmod(TESTFILE, NEW_MODE) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "chmod(2) on %s Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-			
-	/* Get the uid/gid of the process */
-	User_id = getuid();
-	Group_id = getgid();
-
-}	/* End setup() */
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- *  Remove the temporary directory and file created.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/stat03.c b/winsup/testsuite/winsup.api/ltp/stat03.c
deleted file mode 100644
index dcddfd2a0..000000000
--- a/winsup/testsuite/winsup.api/ltp/stat03.c
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: stat03
- *
- * Test Description:
- *   Verify that,
- *   1) stat(2) returns -1 and sets errno to EACCES if search permission is
- *      denied on a component of the path prefix.
- *   2) stat(2) returns -1 and sets errno to ENOENT if the specified file
- *	does not exists or empty string.
- *   3) stat(2) returns -1 and sets errno to EFAULT if pathname points
- *	outside user's accessible address space.
- *   4) stat(2) returns -1 and sets errno to ENAMETOOLONG if the pathname
- *	component is too long.
- *   5) stat(2) returns -1 and sets errno to ENOTDIR if the directory
- *	component in pathname is not a directory.
- *
- * Expected Result:
- *  stat() should fail with return value -1 and set expected errno.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	if errno set == expected errno
- *   		Issue sys call fails with expected return value and errno.
- *   	Otherwise,
- *		Issue sys call fails with unexpected errno.
- *   Otherwise,
- *	Issue sys call returns unexpected value.
- *
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory(s)/file(s) created.
- *
- * Usage:  <for command-line>
- *  stat03 [-c n] [-e] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *
- */
-
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <pwd.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define MODE_RWX	S_IRWXU | S_IRWXG | S_IRWXO
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define DIR_TEMP	"testdir_1"
-#define TEST_FILE1	"testdir_1/tfile_1"
-#define TEST_FILE2	"t_file/tfile_2"
-
-int no_setup();
-int setup1();			/* setup function to test chmod for EACCES */
-int setup2();			/* setup function to test chmod for ENOTDIR */
-int longpath_setup();	/* setup function to test chmod for ENAMETOOLONG */
-char nobody_uid[] = "nobody";
-struct passwd *ltpuser;
-
-
-char Longpathname[PATH_MAX+2];
-char High_address_node[64];
-
-struct test_case_t {		/* test case struct. to hold ref. test cond's*/
-	const char *pathname;
-	const char *desc;
-	int exp_errno;
-	int (*setupfunc)();
-} Test_cases[] = {
-#ifndef __CYGWIN__
-	{ TEST_FILE1,  "No Search permissions to process", EACCES, setup1 },
-#endif
-	{ High_address_node, "Address beyond address space", EFAULT, no_setup },
-	{ (char *)-1, "Negative address", EFAULT, no_setup },
-	{ Longpathname, "Pathname too long", ENAMETOOLONG, longpath_setup },
-	{ "", "Pathname is empty", ENOENT, no_setup },
-#ifndef __CYGWIN__
-	{ TEST_FILE2, "Path contains regular file", ENOTDIR, setup2 },
-#endif
-	{ NULL, NULL, 0, no_setup }
-};
-
-const char *TCID="stat03";           /* Test program identifier.    */
-int TST_TOTAL = 6;		/* Total number of test cases. */
-extern int Tst_count;           /* Test Case counter for tst_* routines */
-int exp_enos[]={EACCES, EFAULT, ENAMETOOLONG, ENOENT, ENOTDIR, 0};
-
-void setup();			/* Main setup function for the tests */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-char *get_high_address(void);
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat structure buffer */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	const char *file_name;	/* ptr. for file name whose mode is modified*/
-	const char *test_desc;	/* test specific error message */
-	int ind;		/* counter to test different test conditions */
-
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * Invoke setup function to call individual test setup functions
-	 * to simulate test conditions.
-	 */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
-			file_name = Test_cases[ind].pathname;
-			test_desc = Test_cases[ind].desc;
-
-			if (file_name == High_address_node) {
-				file_name = (char *)get_high_address();
-			}
-
-			/*
-			 * Call stat(2) to test different test conditions.
-			 * verify that it fails with -1 return value and
-			 * sets appropriate errno.
-			 */
-			TEST(stat(file_name, &stat_buf));
-	
-			/* Check return code from stat(2) */
-			if (TEST_RETURN == -1) {
-				TEST_ERROR_LOG(TEST_ERRNO);
-				if (TEST_ERRNO == Test_cases[ind].exp_errno) {
-					tst_resm(TPASS,
-						 "stat() fails, %s, errno:%d",
-						 test_desc, TEST_ERRNO);
-				} else {
-					tst_resm(TFAIL, "stat() fails, %s,"
-						" errno:%d, expected errno:%d",
-						test_desc, TEST_ERRNO,
-						Test_cases[ind].exp_errno);
-				}
-			} else {
-				tst_resm(TFAIL, "stat(2) returned %d,"
-					" expected -1, errno:%d", TEST_RETURN,
-					 Test_cases[ind].exp_errno);
-			}
-		}	/* End of TEST CASE LOOPING. */
-		Tst_count++;			/* incr TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/*
-	 * Invoke cleanup() to delete the test directory/file(s) created
-	 * in the setup().
-	 */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * void 
- * setup(void) - performs all ONE TIME setup for this test.
- * 	Exit the test program on receipt of unexpected signals.
- *	Create a temporary directory and change directory to it.
- *	Invoke individual test setup functions according to the order
- *	set in struct. definition.
- */
-void
-setup()
-{
-	int ind;			/* counter for setup functions */
-
-	/* Capture unexpected signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-#if 0
-	/* Switch to nobody user for correct error code collection */
-        if (geteuid() != 0) {
-                tst_brkm(TBROK, tst_exit, "Test must be run as root");
-        }
-         ltpuser = getpwnam(nobody_uid);
-         if (setuid(ltpuser->pw_uid) == -1) {
-                tst_resm(TINFO, "setuid failed to "
-                         "to set the effective uid to %d",
-                         ltpuser->pw_uid);
-                perror("setuid");
-         }
-#endif
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* Make a temp dir and cd to it */
-	tst_tmpdir();
-
-	/* call individual setup functions */
-	for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
-		Test_cases[ind].setupfunc();
-	}
-}	/* End setup() */
-
-/*
- * int
- * no_setup() - Some test conditions for stat(2) do not any setup.
- *              Hence, this function just returns 0.
- *  This function simply returns 0.
- */
-int
-no_setup()
-{
-        return 0;
-}
-
-
-/*
- * int
- * setup1() - setup function for a test condition for which stat(2)
- *	      returns -1 and sets errno to EACCES.
- *  Create a test directory under temporary directory and create a test file
- *  under this directory with mode "0666" permissions.
- *  Modify the mode permissions on test directory such that process will not
- *  have search permissions on test directory.
- *
- *  The function returns 0.
- */
-int
-setup1()
-{
-	int fd;			/* file handle for testfile */
-
-	/* Creat a test directory */
-	if (mkdir(DIR_TEMP, MODE_RWX) < 0) {
-		tst_brkm(TBROK, cleanup, "mkdir(2) of %s failed", DIR_TEMP);
-		/*NOTREACHED*/
-	}
-
-	/* Creat a test file under above test directory */
-	if ((fd = open(TEST_FILE1, O_RDWR|O_CREAT, 0666)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, 0666) failed, errno=%d : %s",
-			 TEST_FILE1, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-	/* Close the test file */
-	if (close(fd) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "close(%s) Failed, errno=%d : %s",
-			 TEST_FILE1, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-
-	/* Modify mode permissions on test directory */
-	if (chmod(DIR_TEMP, FILE_MODE) < 0) {
-		tst_brkm(TBROK, cleanup, "chmod(2) of %s failed", DIR_TEMP);
-		/*NOTREACHED*/
-	}
-	return 0;
-}
-
-/*
- * int
- * setup2() - setup function for a test condition for which stat(2)
- *	     returns -1 and sets errno to ENOTDIR.
- * 
- *  Create a test file under temporary directory so that test tries to
- *  change mode of a testfile "tfile_2" under "t_file" which happens to be
- *  another regular file.
- */
-int
-setup2()
-{
-	int fd;				/* File handle for test file */
-	
-	/* Creat a test file under temporary directory */
-	if ((fd = open("t_file", O_RDWR|O_CREAT, MODE_RWX)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(2) on t_file failed, errno=%d : %s",
-			 errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-	/* Close the test file created above */
-	if (close(fd) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "close(t_file) Failed, errno=%d : %s",
-			 errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-	return 0;
-}
-
-/*
- * int
- * longpath_setup() - setup to create a node with a name length exceeding
- *                    the MAX. length of PATH_MAX.
- *   This function retruns 0.
- */
-int
-longpath_setup()
-{
-	int ind;                /* counter variable */
-
-	for (ind = 0; ind <= (PATH_MAX + 1); ind++) {
-		Longpathname[ind] = 'a';
-	}
-	return 0;
-}
-
-/*
- * void
- * cleanup() - Performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *	Print test timing stats and errno log if test executed with options.
- *	Remove temporary directory and sub-directories/files under it
- *	created during setup().
- *	Exit the test program with normal exit code.
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-#ifndef __CYGWIN__	
-	/* Restore mode permissions on test directory created in setup2() */
-	if (chmod(DIR_TEMP, MODE_RWX) < 0) {
-		tst_brkm(TFAIL, NULL, "chmod(2) of %s failed", DIR_TEMP);
-	}
-#endif
-
-	/* Remove files and temporary directory created */
-	tst_rmdir();
-  
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/stat05.c b/winsup/testsuite/winsup.api/ltp/stat05.c
deleted file mode 100644
index 5c0964a93..000000000
--- a/winsup/testsuite/winsup.api/ltp/stat05.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: stat05
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for stat(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) stat(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the stat(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	stat(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="stat05"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-struct stat statter;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-    
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-    
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-    
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call stat(2) with F_CLRALF argument on fname
-	 */
-	TEST(stat(fname, &statter));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "stat(%s, &statter) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "stat(%s, &statter) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-    
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-    
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-    
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-	tst_brkm(TBROK, cleanup,
-		 "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		 fname, errno, strerror(errno));
-    }
-    
-    if (close(fd) == -1) {
-	tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/stat06.c b/winsup/testsuite/winsup.api/ltp/stat06.c
deleted file mode 100644
index c5fae6fe5..000000000
--- a/winsup/testsuite/winsup.api/ltp/stat06.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: stat06
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: stat(2) negative path testcases
- * 
- *    PARENT DOCUMENT	: None
- * 
- *    TEST CASE TOTAL	: 7
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 03/30/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1-7) See Testcases structure below.
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- *      -h  : print help and exit
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- * 	The libcuts.a and libsys.a libraries must be included in 
- *	the compilation of this test.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the stat(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	stat(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <setjmp.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-const char *TCID="stat06";		/* Test program identifier.    */
-int TST_TOTAL=8;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-extern char *get_high_address();
-
-int exp_enos[]={0, 0};
-
-int high_address_setup();
-int longpath_setup();
-int no_setup();
-int filepath_setup();
-char Longpathname[PATH_MAX+2];
-char High_address[64];
-struct stat statbuf;
-jmp_buf sig11_recover;
-void sig11_handler(int sig);
-
-struct test_case_t {
-   const char *pathname;
-   struct stat *stbuf;
-   const char *desc;
-   int exp_errno;
-   int (*setupfunc)();
-} Test_cases[] = {
-    { "nonexistfile", &statbuf, "non-existent file", ENOENT, no_setup},
-    { "", &statbuf, "path is empty string", ENOENT, no_setup},
-    { "nefile/file", &statbuf, "path contains a non-existent file",
-		ENOENT, no_setup },
-#ifndef __CYGWIN__
-    { "file/file", &statbuf, "path contains a regular file",
-		ENOTDIR, filepath_setup },
-#endif
-    { Longpathname, &statbuf, "pathname too long", ENAMETOOLONG, longpath_setup },
-    { High_address, &statbuf, "address beyond address space", EFAULT, high_address_setup },
-    { (char *)-1, &statbuf, "negative address", EFAULT, no_setup },
-    { "file", (struct stat *)-1, "invalid struct stat address", EFAULT, filepath_setup },
-    { NULL, NULL, NULL, 0, no_setup }
-};
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;	/* message returned from parse_opts */
-    const char *fname;
-    const char *desc;
-    int ind;
-    struct stat *stbuf;
-    struct sigaction sa, osa;
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-
-        for (ind=0; Test_cases[ind].desc != NULL; ind++ ) {
-
-	    fname = Test_cases[ind].pathname;
-	    desc = Test_cases[ind].desc;
-	    stbuf = Test_cases[ind].stbuf;
-       
-	    if (stbuf == (struct stat *)-1) {
-		/* special sig11 case */
-		sa.sa_handler = &sig11_handler;
-		sigemptyset(&sa.sa_mask);
-		sa.sa_flags = 0;
-
-		sigaction(SIGSEGV, NULL, &osa);
-		sigaction(SIGSEGV, &sa, NULL);
-
-		if (setjmp(sig11_recover)) {
-		    TEST_RETURN = -1;
-		    TEST_ERRNO = EFAULT;
-		} else {
-		    TEST(stat(fname, stbuf));
-		}
-		sigaction(SIGSEGV, &osa, NULL);
-	    } else {
-		/*
-		 *  Call stat(2)
-		 */
-
-		TEST(stat(fname, stbuf));
-	    }
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-	        if ( STD_FUNCTIONAL_TEST ) {
-		    if ( TEST_ERRNO == Test_cases[ind].exp_errno )
-	                tst_resm(TPASS, "stat(<%s>, &stbuf) Failed, errno=%d",
-			    desc, TEST_ERRNO);
-		    else
-			tst_resm(TFAIL,
-			    "stat(<%s>, &stbuf) Failed, errno=%d, expected errno:%d",
-                            desc, TEST_ERRNO, Test_cases[ind].exp_errno);
-	        }
-		else
-		   Tst_count++;
-	    } else  {
-	        tst_resm(TFAIL,
-		    "stat(<%s>, &stbuf) returned %d, expected -1, errno:%d",
-		    desc, TEST_RETURN, Test_cases[ind].exp_errno);
-	    }
-	}
-	
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    int ind;
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    for (ind=0; Test_cases[ind].desc != NULL; ind++ ) {
-	Test_cases[ind].setupfunc();
-    }
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}	/* End cleanup() */
-
-/******************************************************************
- * no_setup() - does nothing
- ******************************************************************/
-int
-no_setup()
-{
-    return 0;
-}
-
-/******************************************************************
- * high_address_setup() - generates an address that should cause a segfault
- ******************************************************************/
-int
-high_address_setup()
-{
-    int ind;
-
-    for (ind=0; Test_cases[ind].desc != NULL; ind++ ) {
-	if ( Test_cases[ind].pathname == High_address ) {
-	/*if ( strcmp(Test_cases[ind].pathname, HIGH_ADDRESS) == 0 ) { ***/
-	    Test_cases[ind].pathname = get_high_address();
-	    break;
-	}
-    }
-    return 0;
-
-}
-
-/******************************************************************
- * longpath_setup() - creates a filename that is too long
- ******************************************************************/
-int
-longpath_setup()
-{
-   int ind;
-
-    for(ind=0; ind<= PATH_MAX+1; ind++) {
-	Longpathname[ind] = 'a';
-    }
-    return 0;
-
-}
-
-/******************************************************************
- * filepath_setup() creates a file the exists that we will treat as a directory
- ******************************************************************/
-int
-filepath_setup()
-{
-    int fd;
-
-    if ( (fd=creat("file", 0777)) == -1 ) {
-	tst_brkm(TBROK, cleanup, "creat(file) failed, errno:%d %s",
-	    errno, strerror(errno));
-    }
-    close(fd);
-    return 0;
-}
-
-/******************************************************************
- * sig11_handler() - our segfault recover hack
- ******************************************************************/
-void 
-sig11_handler(int sig)
-{
-    longjmp(sig11_recover, 1);
-}
diff --git a/winsup/testsuite/winsup.api/ltp/symlink01.c b/winsup/testsuite/winsup.api/ltp/symlink01.c
deleted file mode 100644
index 660a6d2e6..000000000
--- a/winsup/testsuite/winsup.api/ltp/symlink01.c
+++ /dev/null
@@ -1,2032 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/* $Id$ */
-/**********************************************************
-* 
-*    OS Test - Silicon Graphics, Inc.
-* 
-*    TEST IDENTIFIER	: symlink01 (symlink)
-* 
-*    TEST TITLE		: Make a Symbolic Link to a File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 5
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: readlink01 (readlink)
-* 
-*    TEST TITLE		: Reads Value of a Symbolic Link
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 4
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: stat04  (stat)
-* 
-*    TEST TITLE		: Gets File Status Indirectly From a Symbolic Link 
-*                         File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 3
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: lstat01 (lstat)
-* 
-*    TEST TITLE		: Get file Status About a Symbolic Link File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 3
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: mkdir05 (mkdir)
-* 
-*    TEST TITLE		: Fail When Making a Directory File Indirectly From
-*                         a Symbolic Link File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 1
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: rmdir03 (rmdir)
-* 
-*    TEST TITLE		: Fail When Removing a Directory File Indirectly 
-*                         From a Symbolic Link File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 1
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: chdir01 (chdir)
-* 
-*    TEST TITLE		: Changes Current Working DIrectory Location 
-*                         Indirectly From a Symbolic Link File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 3
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: link01 (link)
-* 
-*    TEST TITLE		: Creates a Link To a File Indirectly From a 
-*                         Symbolic Link File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 3
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: unlink01 (unlink)
-* 
-*    TEST TITLE		: Removes a Link To a File And Not Any Object File
-*                         Which Maybe Pointed At
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 1
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: chmod01 (chmod)
-* 
-*    TEST TITLE		: Change Object File Permissions Indirectly From a
-*                         Symbolic Link File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 3
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: utime01 (utime)
-* 
-*    TEST TITLE		: Set File Access And Modify Object File Times
-*                         Indirectly From a Symbolic Link File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 3
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: rename01 (rename)
-* 
-*    TEST TITLE		: Rename a Symbolic Link File And Not Any Object
-*                         File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 3
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    TEST IDENTIFIER	: open01 (open)
-* 
-*    TEST TITLE		: Create/Open a File For Reading Or Writing
-*                         Indirectly From a Symbolic Link File
-* 
-*    PARENT DOCUMENT	: symtds01
-* 
-*    TEST CASE TOTAL	: 5
-* 
-*    WALL CLOCK TIME	: 3
-*
-*    EXECUTED BY	: whom ever
-* 
-*    CPU TYPES		: ALL
-* 
-*    AUTHOR		: David Fenner
-* 
-*    CO-PILOT		: Jon Hendrickson
-* 
-*    DATE STARTED	: 07/25/90
-* 
-*    INITIAL RELEASE	: UNICOS 6.0
-* 
-*    TEST CASES
-* 
-*       For symlink
-*
-*         1. Create symbolic link with abnormal object name path
-*         2. Create symbolic link with normal object name path
-*         3. Create symbolic link with path to an existing object file
-*         4. Receive EEXIST error when creating an already existing symbolic link file.
-*         5. Receive ENAMETOOLONG error when creating symbolic link which exceeds PATH_MAX in length
-* 
-*       For readlink
-*
-*         1. Read a symbolic link file which points at no object file
-*         2. Read a symbolic link file which points at an object file
-*         3. Receive ENAMETOOLONG error when reading symbolic link which exceeds PATH_MAX in length
-*         4. Receive an EINVAL error when reading a file which is not a symbolic
-*            link file.
-* 
-*       For stat
-* 
-*         1. Get object file status through symbolic link file
-*         2. Receive ENOENT error when accessing non-existent object file through symbolic link file
-*         3. Receive ELOOP error when nesting of symbolic links exceed maximum
-*
-*       For lstat
-* 
-*         1. Get symbolic link file status when pointing at no object file
-*         2. Get symbolic link file status when pointing at an object file
-*         3. Get object file status when argument is not a symbolic link
-*            file.
-*
-*       For mkdir
-*
-*         1. Receive EEXIST error when creating a directory through a symbolic link file
-* 
-*       For rmdir
-*
-*         1. Receive ENOTDIR error when removing an existing directory through a symbolic link file
-* 
-*       For chdir
-*
-*         1. Change current working directory through a symbolic link file
-*         2. Receive ENOENT error when accessing non-existent directory through symbolic link file
-*         3. Receive ELOOP error when nesting of symbolic links exceed maximum
-* 
-*       For link
-* 
-*         1. Link an object file to a new file through symbolic link file
-*         2. Receive ENOENT error when accessing non-existent object file through symbolic link file
-*         3. Receive ELOOP error when nesting of symbolic links exceed maximum
-*
-*       For unlink
-*
-*         1. Delete a symbolic link file and not the object file which it points at
-* 
-*       For chmod
-* 
-*         1. Change file permissions of object file through a symbolic link file
-*         2. Receive ENOENT error when accessing non-existent directory through symbolic link file
-*         3. Receive ELOOP error when nesting of symbolic links exceed maximum
-* 
-*       For utime
-*
-*         1. Change inode times of object file through a symbolic link file
-*         2. Receive ENOENT error when accessing non-existent directory through symbolic link file
-*         3. Receive ELOOP error when nesting of symbolic links exceed maximum
-* 
-*       For rename
-*
-*         1. Rename a symbolic link file which points at no object file
-*         2. Rename a symbolic link file which points at an object file without any object file alterations.
-*         3. Receive EXDEV when trying to rename a symbolic link file to an address outside of current file system
-*
-*       For open
-*
-*         1. Create an object file through a symbolic link file
-*         2. Open an object file through a symbolic link file
-*         3. Receive EEXIST error when exclusively creating an object file through a symbolic link file
-*         4. Receive ENOENT error when accessing non-existent object file through symbolic link file
-*         5. Receive ELOOP error when nesting of symbolic links exceed maximum
-*
-*    ENVIRONMENTAL NEEDS
-*	None
-* 
-*    DETAILED DESCRIPTION
-*
-*       Self-documenting code so see below
-*
-*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <signal.h>
-#include <string.h>
-#include <fcntl.h>             /* open(2) system call */
-#include <errno.h>
-#include <sys/types.h>
-#include <utime.h>             /* utime(2) system call */
-#include <sys/param.h>
-#include <sys/stat.h>          /* stat(2) and lstat(2) system calls */
-
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-void help();
-void delete_files();
-void do_EEXIST();
-void do_ENOENT();
-void do_ELOOP();
-void do_ENOTDIR();
-void do_EXDEV();
-void do_ENAMETOOLONG();
-void do_EINVAL();
-void do_readlink();
-void do_stat();
-void do_chdir();
-void do_link();
-void do_unlink();
-void do_chmod();
-void do_utime();
-void do_rename();
-void do_open();
-
-#define S_FILE "symbolic"    /* Name of symbolic link file */
-#define O_FILE "object"      /* Name of object file */
-#define A_S_FILE "asymbolic" /* Another name for a symbolic link file */
-#define Y_A_S_FILE "/NiCkEr" /* Yet another symbolic link file */
-#define BIG_STRING "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
-
-#define DEFAULT_TCID  "symlink01"
-#define ALL 1
-
-#define SYMLINK "symlink01"
-#define READLINK "readlink01"
-#define STAT "stat04"
-#define LSTAT "lstat01"
-#define MKDIR "mkdir05"
-#define RMDIR "rmdir03"
-#define CHDIR "chdir01"
-#define LINK "link01"
-#define UNLINK "unlink01"
-#define CHMOD "chmod01"
-#define UTIME "utime01"
-#define RENAME "rename01"
-#define OPEN "open01"
-
-#define cktcsid(s1,s2) (!strcmp(s1,s2))
-#define BUFMAX 512
-#define MODE 0700
-#define MASK 0100777           /* A regular file with r,w,x for all mask */
-
-/*
- * Lets be optimistic and only define messages for passing test cases
- */
-const char *msgs[] = {
- "Creation of symbolic link file to no object file is ok",
- "Creation of symbolic link file and object file via symbolic link is ok", 
- "Creating an existing symbolic link file error is caught", 
- "Creating a symbolic link which exceeds maximum pathname error is caught",
- "Reading of symbolic link file contents checks out ok",
- "Reading a symbolic link which exceeds maximum pathname error is caught",
- "Getting stat info about object file through symbolic link file is ok",
- "Stat(2) error when accessing non-existent object through symbolic link is caught",
- "lstat(2) of symbolic link file which points to no object file is ok",
- "lstat(2) of symbolic link file which points at an object file is ok",
- "mkdir(2) of object file through symbolic link file failed as expected", 
- "rmdir(2) of object file through symbolic link file failed as expected", 
- "chdir(2) to object file location through symbolic link file is ok", 
- "chdir(2) to non-existent object file location through symbolic link file failed as expected", 
- "link(2) to a symbolic link, which is pointing to an existing object file worked - file created and link count adjusted",
- "link(2) to a symbolic link, which is pointing to a non-existing object file worked ok - file created and link count adjusted.",
- "unlink(2) of symbolic link file with no object file removal is ok",
- "chmod(2) of object file permissions through symbolic link file is ok",
- "chmod(2) error when accessing non-existent object through symbolic link is caught",
- "utime(2) change of object file access and modify times through symbolic link file is ok",
- "utime(2) error when accessing non-existent object through symbolic link is caught",
- "rename(3) of symbolic link file name which points at no object file is ok",
- "rename(3) of symbolic link file name which points at object file is ok",
- "rename(3) error of symbolic link file name across file systems is caught",
- "open(2) with (O_CREAT | O_RDWR) to create object file through symbolic link file and all writes, reads, and lseeks are ok",
- "open(2) with O_RDWR of existing  object file through symbolic link file and all writes, reads, and lseeks are ok",
- "open(2) with (O_CREAT | O_EXCL) error  is caught when creating object file through symbolic link file",
- "open(2) error with O_RDWR is caught when processing symbolic link file which points at no object file",
- "Nested symbolic link access condition caught.  ELOOP is returned",
- "Reading a nonsymbolic link file error condition is caught.  EINVAL is returned",
- "lstat(2) of object file returns object file inode information",
- "NULL"
-};
-
-/*
- * Define test object setup and validation functions
- */
-int creat_both(), creat_symlink(), creat_path_max(), ck_symlink(),
-    creat_object(), ck_object(), ck_both(), ck_path_max();
-
-
-/*
- *  Define test cases
- */
-struct all_test_cases
-{
-    const char *tcid;
-    int test_fail;
-    int errno_val;
-    int pass_msg;
-    int (*test_setup)();
-    int (*ck_test)();
-    const char *fn_arg[3];
-    
-} test_objects[] = {
-    {SYMLINK, 0, 0, 0, creat_symlink, ck_symlink, {"%bc+eFhi!k", S_FILE, NULL}},
-    {SYMLINK, 0, 0, 0, creat_symlink, ck_symlink,  {O_FILE, S_FILE, NULL}},
-    {SYMLINK, 0, 0, 1, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {SYMLINK, 1, EEXIST, 2, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {SYMLINK, 1, ENAMETOOLONG, 3, creat_path_max, ck_path_max, {O_FILE, S_FILE, NULL}},
-    {READLINK, 0, 0, 4, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {READLINK, 0, 0, 4, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {READLINK, 1, ENAMETOOLONG, 5, creat_path_max, ck_path_max, {O_FILE, S_FILE, NULL}},
-    {READLINK, 1, EINVAL, 29, creat_object, ck_object, {O_FILE, NULL, NULL}},
-    {STAT, 0, 0, 6, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {STAT, 1, ENOENT, 7, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {STAT, 1, ELOOP, 28, creat_symlink, ck_symlink, {S_FILE, S_FILE, NULL}},
-    {LSTAT, 0, 0, 8, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {LSTAT, 0, 0, 9, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {LSTAT, 0, 0, 30, creat_object, ck_object, {O_FILE, NULL, NULL}},
-    {MKDIR, 1, EEXIST, 10, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {RMDIR, 1, ENOTDIR, 11, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {CHDIR, 0, 0, 12, creat_symlink, ck_symlink, {O_FILE, S_FILE, O_FILE}},
-    {CHDIR, 1, ENOENT, 13, creat_symlink, ck_symlink, {"%bc+eFhi!k", S_FILE, NULL}},
-    {CHDIR, 1, ELOOP, 28, creat_symlink, ck_symlink, {S_FILE, S_FILE, NULL}},
-    {LINK, 0, 0, 14, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {LINK, 0, 0, 15, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    /* The following link test case is invalid - leaving it defined so */
-    /* I don't have to change all the entries in the all_tcses array after link */
-    {LINK, -1, -1, -1, creat_symlink, ck_symlink, {NULL, NULL, NULL}},
-    {UNLINK, 0, 0, 16, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {CHMOD, 0, 0, 17, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {CHMOD, 1, ENOENT, 18, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {CHMOD, 1, ELOOP, 28, creat_symlink, ck_symlink, {S_FILE, S_FILE, NULL}},
-    {UTIME, 0, 0, 19, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {UTIME, 1, ENOENT, 20, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {UTIME, 1, ELOOP, 28, creat_symlink, ck_symlink, {S_FILE, S_FILE, NULL}},
-    {RENAME, 0, 0, 21, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {RENAME, 0, 0, 22, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {RENAME, -1, EXDEV, 23, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {OPEN, 0, 0, 24, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {OPEN, 0, 0, 25, creat_both, ck_both, {O_FILE, S_FILE, O_FILE}},
-    {OPEN, -1, EEXIST, 26, creat_symlink, ck_symlink, {O_FILE, S_FILE, O_FILE}},
-    {OPEN, 1, ENOENT, 27, creat_symlink, ck_symlink, {O_FILE, S_FILE, NULL}},
-    {OPEN, 1, ELOOP, 28, creat_symlink, ck_symlink, {S_FILE, S_FILE, NULL}}
-};
-
-/*
- * Define tcses
- */
-struct tcses
-{
-    const char *tcid;
-    const char *syscall;
-    int test_cases;		/* number of entries in test_objects array */
-    struct all_test_cases *tc_ptr;
-    const char *desc;
-} all_tcses[] = {
-
-   { SYMLINK,  "symlink",  5, &test_objects[0],
-		"Make a Symbolic Link to a File" },
-   { READLINK, "readlink", 4, &test_objects[5],
-		"Reads Value of a Symbolic Link" },
-   { STAT,     "stat",     3, &test_objects[9],
-		"Gets File Status Indirectly From a Symbolic Link file" },
-   { LSTAT,    "lstat",    3, &test_objects[12],
-		"Get file Status About a Symbolic Link File" },
-   { MKDIR,    "mkdir",    1, &test_objects[15],
-		"Fail When Making a Directory File Indirectly from a symlink" },
-   { RMDIR,    "rmdir",    1, &test_objects[16],
-		"Fail When Removing a Directory File Indirectly from a symlink" },
-   { CHDIR,    "chdir",    3, &test_objects[17],
-		"Changes CWD Location Indirectly from a symlink" },
-   { LINK,     "link",     2, &test_objects[20],
-		"Creates a Link To a File Indirectly From a Symbolic" },
-   { UNLINK,   "unlink",   1, &test_objects[23],
-		"Removes a Link To a File but not the Object File" },
-   { CHMOD,    "chmod",    3, &test_objects[24],
-		"Change Object File Permissions Indirectly From a Symbolic" },
-   { UTIME,    "utime",    3, &test_objects[27],
-		"Set File Access And Modify Object File Times via symlink" },
-   { RENAME,   "rename",   3, &test_objects[30],
-		"Rename a Symbolic Link File And Not Any Object file" },
-   { OPEN,     "open",     5, &test_objects[33],
-		"Create/Open a File For Reading Or Writing via symlink" },
-};
-
-/*
- * Define GLOBAL variables
- */
-
-int TST_TOTAL;
-int TEST_RESULT;
-time_t a_time_value = 100;
-const char  *TCID = NULL;
-char  *Selectedtests = NULL;		/* Name (tcid) of selected test cases */
-char test_msg[BUFMAX];
-char full_path[PATH_MAX+1];
-extern int Tst_count;
-extern char *TESTDIR;
-extern char *strrchr();
-extern int errno;
-
-struct stat asymlink, statter;
-char Buffer[1024];
-char Buf[1024];
-
-char *Tcid = NULL;
-
-option_t Options[] = {
-    { "T:",  NULL, &Tcid },	    /* -T tcid option */
-    { NULL, NULL, NULL }
-};
-
-/***********************************************************************
- * MAIN
- ***********************************************************************/
-int
-main(int argc, char *argv[])
-{
-    struct tcses *tcs_ptr, *get_tcs_info();
-    int do_syscalltests();
-    void cleanup();
-    int lc;             /* loop counter */
-    const char *msg;          /* message returned from parse_opts */
-
-
-   /***************************************************************
-    * parse standard options, and exit if there is an error
-    ***************************************************************/
-   if ( (msg=parse_opts(argc, argv, Options, &help)) != (char *) NULL ) {
-        tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-        tst_exit();
-   }
-
-   /*
-    * If the -T option was used, use that TCID or use the default
-    */
-   if ( Tcid != NULL ) {
-       TCID = Tcid;
-       Selectedtests=Tcid;
-
-   }
-   else {
-       TCID = DEFAULT_TCID;
-#ifndef ALL
-       Selectedtests = DEFAULT_TCID;
-#else
-       Selectedtests = NULL;
-#endif
-    }
-
-   /*
-    * Get test case specification information and assign TST_TOTAL
-    */
-   if ((tcs_ptr=get_tcs_info(Selectedtests)) == NULL) {
-      TST_TOTAL=1;
-      tst_brkm(TBROK, cleanup,
-	"Unknown symbolic link test case specification executed");
-   }
-
-   /***************************************************************
-    * perform global setup for test
-    ***************************************************************/
-
-   setup();
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-        /* reset Tst_count in case we are looping. */
-        Tst_count=0;
-
-        /*
-         * Execute tcs testing function and all defined test cases
-         */
-        do_syscalltests(tcs_ptr);
-
-    }   /* End for TEST_LOOPING */
-
-    /*
-     * End appropriately
-     */
-    cleanup();
-
-    return 0;
-}
-
-/***********************************************************************
- *  This function maps the name of the process to a test case specification
- *  defined in the all_tcses array of tcses structures.  Either a pointer
- *  to the mapped test case specification information is returned or a
- *  null pointer.
- *
- *      Argument is path to program name.
- ***********************************************************************/
-struct tcses *get_tcs_info(ptr)
-char *ptr;
-{
-    unsigned ctr;
-    struct tcses *tcs_ptr;
-
-#if ALL
-    if ( ptr == NULL ) {
-
-	TST_TOTAL=0;
-	for (ctr=1; ctr < sizeof(all_tcses)/sizeof(struct tcses); ctr++)
-	TST_TOTAL += all_tcses[ctr].test_cases;
-	return all_tcses;
-    }
-#endif
-
-    
-    for(ctr=0; ctr < (sizeof(all_tcses)/sizeof(struct tcses)); ctr++) {
-       if ( strcmp(ptr, all_tcses[ctr].tcid) == 0 || 
-	    strcmp(ptr, all_tcses[ctr].syscall) == 0 ) {
-          tcs_ptr = &all_tcses[ctr];
-	  TCID = all_tcses[ctr].tcid;
-          TST_TOTAL=tcs_ptr->test_cases;
-          return(tcs_ptr);
-       }
-       
-    }
-    return(NULL);
-}
-
-/***********************************************************************
- *  Determines if what path points at is a symbolic link file
- *
- *      Argument is path to symbolic link file.
- *
- *  Return status is one if a symbolic link file.  Zero if not a symbolic
- *  link file and a minus one if the path doesn't point at a file.
- ***********************************************************************/
-int
-see_if_a_symlink(path)
-char *path;
-{
-   if (lstat(path, &asymlink) < 0)
-      return(-1);
-
-   if ((asymlink.st_mode & S_IFMT) == S_IFLNK)
-      return(1);
-   else
-      return(0);
-}
-
-/***********************************************************************
- * This function performs without any hesitation, file(s) deletions
- ***********************************************************************/
-void
-delete_files(path1, path2)
-char *path1, *path2;
-{
-   unlink(path1);
-   unlink(path2);
-}
-
-/***********************************************************************
- *
- * This routine creates a symbolic link file.
- *
- *      Argument one is symbolic link pathname to point at.
- *      Argument two is name of symbolic link file.
- *
- ***********************************************************************/
-int
-creat_symlink(path1, path2)
-char *path1, *path2;
-{
-   TEST( symlink(path1, path2) );
-   errno=TEST_ERRNO;
-   if (TEST_RETURN == -1) {
-      TEST_RESULT=TBROK;
-      sprintf(test_msg,
-	"symlink(2) Failure when creating setup %s object file: errno:%d %s",
-	path1, errno, strerror(errno));
-      return(0);
-   } 
-   else {
-	sprintf(Buf, "symlink(%s, %s) was succesful.\n", path1, path2);
-	strcat(Buffer, Buf);
-#if DEBUG
-	tst_resm(TPASS, "symlink(%s, %s) was succesful.", path1, path2);
-#endif
-   }
-   return(1);
-}
-
-/***********************************************************************
- *
- * This routine creates a regular file.
- *
- *      Argument one is a pathname
- *
- ***********************************************************************/
-int
-creat_object(path1)
-char *path1;
-{
-   int fd;
-   if ((fd=creat(path1, MODE)) == -1) {
-      TEST_RESULT=TBROK;
-      sprintf(test_msg,
-	"creat(2) Failure when creating setup %s object file: errno:%d %s",
-	path1, errno, strerror(errno));
-      return(0);
-   } 
-   else {
-	sprintf(Buf, "creat(%s, %#o) was succesful.\n", path1, MODE);
-	strcat(Buffer, Buf);
-#if DEBUG
-	tst_resm(TPASS, "creat(%s, %#o) was succesful.", path1, MODE);
-#endif
-   }
-   if (close(fd) == -1) {
-      TEST_RESULT=TBROK;
-      sprintf(test_msg,
-	"close(2) Failure when closing setup %s object file: errno:%d %s",
-	path1, errno, strerror(errno));
-      return(0);
-   }
-   return(1);
-}
-
-/***********************************************************************
- *
- * This routine creates a symbolic link file and a regular file.
- *
- *      Argument one is a pathname of object file
- *      Argument two is symbolic link file name
- *      Argument three is regular file name
- *
- ***********************************************************************/
-int
-creat_both(path1, path2, path3)
-char *path1, *path2, *path3;
-{
-   if (creat_symlink(path1, path2) == -1)
-      return(0);
-   else if (creat_object(path3) == -1)
-      return(0);
-   return(1);
-}
-
-/***********************************************************************
- *
- * This routine checks if symbolic link file is a symbolic link file.
- *
- *      Argument one is a pathname of object file
- *      Argument two is symbolic link file name
- *      Argument three is regular file name
- *
- ***********************************************************************/
-int
-ck_symlink(path1, path2, path3)
-char *path1, *path2, *path3;
-{
-   int ret;
-
-   if ((ret=see_if_a_symlink(path2)) == -1) {
-      TEST_RESULT=TBROK;
-      sprintf(test_msg,
-	"lstat(2) Failure when accessing %s symbolic link file which should contain %s path to %s file ",
-	path2, path1, path3);
-      return(0);
-   }
-   else if (ret == 0) {
-      TEST_RESULT=TBROK;
-      sprintf(test_msg,
-	"%s is not a symbolic link file which contains %s path to %s file",
-	path2, path1, path3);
-      return(0);
-   }
-   return(1);
-}
-
-/***********************************************************************
- *
- * This routine checks if symbolic link file points at object file.
- *
- *      Argument one is a pathname of object file
- *      Argument two is symbolic link file name
- *      Argument three is regular file name
- *
- ***********************************************************************/
-int
-ck_both(path1, path2, path3)
-char *path1, *path2, *path3;
-{
-   if (ck_symlink(path1, path2, path3) == 0)
-      return(0);
-   else if ((stat(path3, &statter) == -1) && (errno == ENOENT)) {
-      TEST_RESULT=TBROK;
-      sprintf(test_msg, "stat(2) Failure when accessing %s object file ", path3);
-      return(0);
-   }
-   else if ((stat(path2, &asymlink) == -1) && (errno == ENOENT)) {
-      TEST_RESULT=TBROK;
-      sprintf(test_msg, "stat(2) Failure when accessing %s symbolic link file ",
-	path2);
-      return(0);
-   }
-   else if (statter.st_ino != asymlink.st_ino) {
-      TEST_RESULT=TBROK;
-      sprintf(test_msg,
-	"stat(2) Failure when accessing %s object file through %s symbolic link file ",
-	path3, path2);
-      return(0);
-   }
-   return(1);
-   
-}
-
-/***********************************************************************
- * This routine populates full_path with a pathname whose length exceeds
- * the PATH_MAX define value in param.h
- *
- *      Argument one is a pathname of object file
- *      Argument two is symbolic link file name
- *      Argument three is regular file name
- ***********************************************************************/
-int
-creat_path_max(path1, path2, path3)
-char *path1, *path2, *path3;
-{
-   int ctr, to_go, size, whole_chunks;
-   char buf [PATH_MAX];
-   char *cwd;
-
-   if ((cwd = getcwd(buf, sizeof (buf))) == NULL)
-   {
-      TEST_RESULT=TBROK;
-      sprintf(test_msg,
-	"getcwd(3) Failure in setup of %s %s %s test case object elements",
-	path1, path2, path3);
-      return(0);
-   }
-   size = strlen(cwd);
-
-   to_go = PATH_MAX - size;
-   size = strlen(path1);
-   whole_chunks = to_go / size;
-   strcpy(full_path, cwd);
-   for (ctr=0; ctr < whole_chunks; ctr++) {
-       strcat(full_path, path1);
-   }
-   size= strlen(full_path);
-   to_go = PATH_MAX - size;
-   strcat(full_path, "/");
-   for (ctr=0; ctr < to_go; ctr++)
-       strcat(full_path, "Z");
-
-   return(1);
-}
-
-/***********************************************************************
- * This routine checks that full_path's  length exceeds the PATH_MAX
- * define value in param.h
- *
- *      Argument one is a pathname of object file
- *      Argument two is symbolic link file name
- *      Argument three is regular file name
- ***********************************************************************/
-int
-ck_path_max(path1, path2, path3)
-char *path1, *path2, *path3;
-{
-   if (strlen(full_path) == (PATH_MAX+1))
-      return(1);
-   else
-   {
-      TEST_RESULT=TBROK;
-      sprintf(test_msg, "%s %d %s %s %s %s",
-	"full_path character array length was not", (PATH_MAX+1),
-	"characters long for test case object elements",
-	path1, path2, path3);
-      return(0);
-   }
-}
-
-/***********************************************************************
- * This routine checks if the stat(2) and lstat(2) calls return the same
- * information when the path is not a symbolic link file
- *
- *      Argument one is a pathname of object file
- *      Argument two is symbolic link file name
- *      Argument three is regular file name
- *
- ***********************************************************************/
-int
-ck_object(path1, path2, path3)
-char *path1, *path2, *path3;
-{
-    int ret;
-
-    if ((ret=see_if_a_symlink(path1)) < 0) {
-       TEST_RESULT=TFAIL;
-       sprintf(test_msg,
-	   "lstat(2) failed to return inode information for a regular object file");
-       return(0);
-    }
-    else if (ret == 1) {
-       TEST_RESULT=TFAIL;
-       sprintf(test_msg, 
-	   "lstat(2) detected a regular object file as a symbolic link file");
-       return(0);
-    }
-    else if (stat(path1, &statter) == -1) {
-       TEST_RESULT=TBROK;
-       sprintf(test_msg,
-	   "stat(2) failed to return inode information for a regular object file");
-       return(0);
-    }
-    else if (bcmp((char *)&statter, (char *)&asymlink, sizeof(statter)) != 0) {
-       TEST_RESULT=TFAIL;
-       sprintf(test_msg,
-	   "lstat(2) and stat(2) do not return same inode information for an object file");
-       return(0);
-        
-    }
-    return(1);
-}
-
-/***********************************************************************
- * Main test case processing function
- *
- *  Argument is a ptr into the all_tcses array of structures of type tcses
- ***********************************************************************/
-int
-do_syscalltests(tcs)
-struct tcses *tcs;
-{
-   int ctr, ret;
-   struct all_test_cases *tc_ptr;
-
-   /*
-    * loop through desired number of test cases
-    */
-   for (ctr=0, tc_ptr=tcs->tc_ptr; ctr < TST_TOTAL; ctr++, tc_ptr++) {
-
-       if (tc_ptr->test_fail < 0) continue;
-
-       Buffer[0]='\0';
-
-       /*
-	* If running all test cases for all tcid, set the TCID if needed.
-        */
-       if ( Selectedtests == NULL ) {
-	   if ( !TCID || strcmp(TCID, tc_ptr->tcid) != 0 ) {
-               TCID = tc_ptr->tcid;
-               Tst_count=0;
-	   }
-       }
-       /*
-        * Insure that we are executing the correct tcs test case
-        */
-       if (strcmp(TCID, tc_ptr->tcid) != 0) {
-          tst_resm(TBROK, "%s TCID attempted to execute %s %d %d test case",
-	     TCID, tc_ptr->tcid, tc_ptr->test_fail, tc_ptr->errno_val);
-          continue;
-       }
-       TEST_RESULT=TPASS;
-       delete_files(S_FILE, O_FILE);
-       /* 
-        * Perform test case setup
-        */
-       ret = (tc_ptr->test_setup)(tc_ptr->fn_arg[0], tc_ptr->fn_arg[1],
-	   tc_ptr->fn_arg[2], tc_ptr->errno_val);
-
-       /* If an expected error, try it out */
-
-       if (tc_ptr->test_fail) {
-          /* 
-           * Try to perform test verification function
-           */
-          if (! (tc_ptr->ck_test)(tc_ptr->fn_arg[0], tc_ptr->fn_arg[1],
-			tc_ptr->fn_arg[2], tc_ptr->errno_val))
-             tst_resm(TEST_RESULT, test_msg);
-          else if (tc_ptr->errno_val == EEXIST)
-             do_EEXIST(tc_ptr);
-          else if (tc_ptr->errno_val == ENOENT)
-             do_ENOENT(tc_ptr);
-          else if (tc_ptr->errno_val == ELOOP)
-             do_ELOOP(tc_ptr);
-          else if (tc_ptr->errno_val == ENOTDIR)
-             do_ENOTDIR(tc_ptr);
-          else if (tc_ptr->errno_val == EXDEV)
-             do_EXDEV(tc_ptr);
-          else if (tc_ptr->errno_val == ENAMETOOLONG)
-             do_ENAMETOOLONG(tc_ptr);
-          else if (tc_ptr->errno_val == EINVAL)
-             do_EINVAL(tc_ptr);
-          else
-             tst_resm(TBROK, "Test Case Declaration Error");
-       }
-       else if (ret == 1) {  /*  No setup function error */
- 
-          if (tc_ptr->errno_val != 0)
-             tst_resm(TBROK, "Test Case Declaration Error");
-          else {
-             /* 
-              * Perform test verification function
-              */
-             ret=(tc_ptr->ck_test)(tc_ptr->fn_arg[0], tc_ptr->fn_arg[1],
-		tc_ptr->fn_arg[2], tc_ptr->errno_val);
-
-             /* Perform requested symbolic link system call test */
-
-             if ((cktcsid(tc_ptr->tcid, SYMLINK)) ||
-				(cktcsid(tc_ptr->tcid, LSTAT))) {
-                if (ret == 1)
-                   tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);   
-                else
-                   tst_resm(TEST_RESULT, test_msg);
-             }
-             else if (ret == 0)
-                tst_resm(TEST_RESULT, test_msg);
-             else if (cktcsid(tc_ptr->tcid, READLINK))
-                do_readlink(tc_ptr);
-             else if (cktcsid(tc_ptr->tcid, STAT))
-                do_stat(tc_ptr);
-             else if (cktcsid(tc_ptr->tcid, CHDIR))
-                do_chdir(tc_ptr);
-             else if (cktcsid(tc_ptr->tcid, LINK))
-                do_link(tc_ptr);
-             else if (cktcsid(tc_ptr->tcid, UNLINK))
-                do_unlink(tc_ptr);
-             else if (cktcsid(tc_ptr->tcid, CHMOD))
-                do_chmod(tc_ptr);
-             else if (cktcsid(tc_ptr->tcid, UTIME))
-                do_utime(tc_ptr);
-             else if (cktcsid(tc_ptr->tcid, RENAME))
-                do_rename(tc_ptr);
-             else if (cktcsid(tc_ptr->tcid, OPEN))
-                do_open(tc_ptr);
-             else
-                tst_resm(TBROK, "Unknown test case processing actions declared");
-          }
-       }
-       else
-          tst_resm(TBROK, "Test Case Declaration Error");
-   }
-   return(0);
-}
-
-/***********************************************************************
- * This routine checks for the return of EEXIST errno from requested
- * system call
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_EEXIST(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-    if (cktcsid(tc_ptr->tcid, SYMLINK)) {
-
-       TEST( symlink(tc_ptr->fn_arg[0], tc_ptr->fn_arg[1]) );
-	errno=TEST_ERRNO;
-       if ((TEST_RETURN == -1) && (errno == EEXIST))
-	   if ( STD_FUNCTIONAL_TEST )
-               tst_resm(TPASS, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-       else
-           tst_resm(TFAIL, "%s %s",
-		"Expected EEXIST error when creating a symbolic link file",
-		"which already existed");
-     }
-     else if (cktcsid(tc_ptr->tcid, MKDIR)) {
-
-	TEST ( mkdir(tc_ptr->fn_arg[1],MODE) );
-	errno=TEST_ERRNO;
-        if ((TEST_RETURN == -1) && (errno == EEXIST))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else {
-
-           tst_resm(TFAIL, "%s %s",
-		"Expected EEXIST error when creating a directory by a symbolic",
-		"link file which pointed at no object file");
-           rmdir(tc_ptr->fn_arg[1]);
-        }
-     }
-     else if (cktcsid(tc_ptr->tcid, OPEN)) {
-
-        TEST( open(tc_ptr->fn_arg[1], (O_EXCL | O_CREAT)) )
- 	errno=TEST_ERRNO;
-        if ((TEST_RETURN == -1) && (errno == EEXIST))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-           tst_resm(TFAIL, "%s %s errno:%d %s",
-	        "Expected EEXIST error for exclusively opening an object file",
-		"through a symbolic link file was not received:",
-		errno, strerror(errno));
-        close (TEST_RETURN);
-     }
-     else
-        tst_resm(TBROK, "Unknown test case processing actions declared");
-}
-
-/***********************************************************************
- * This routine checks for the return of ENOENT errno from requested
- * system call
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_ENOENT(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     if (cktcsid(tc_ptr->tcid, STAT)) {
-
-        if ((stat(tc_ptr->fn_arg[1], &asymlink) == -1) && (errno == ENOENT))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-           tst_resm(TFAIL, "%s %s errno:%d %s",
-		"Expected ENOENT error for stating a non-existent directory",
-		"through a symbolic link file was not received:",
-	  	errno, strerror(errno));
-     }
-     else if (cktcsid(tc_ptr->tcid, CHDIR)) {
-        if ((chdir(tc_ptr->fn_arg[1]) == -1) && (errno == ENOENT))
-	    if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else {
-           tst_resm(TFAIL, "%s %s errno:%d %s",
-		"Expected ENOENT error for changing to a non-existent",
-		"directory through a symbolic link file was not received:",
-		errno, strerror(errno));
-           chdir(TESTDIR);
-        }
-     }
-     else if (cktcsid(tc_ptr->tcid, LINK)) {
-
-        if ((link(tc_ptr->fn_arg[1], "nick") == -1) && (errno == ENOENT))
-	  if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-             tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-        {
-           tst_resm(TFAIL, "%s %s errno:%d %s",
-		"Expected ENOENT error condition when link(2) a symbolic",
-		"link which pointed at no object:", errno, strerror(errno));
-           delete_files("nick", NULL);
-        }
-     }
-     else if (cktcsid(tc_ptr->tcid, CHMOD)) {
-
-        if ((chmod(tc_ptr->fn_arg[1], MODE) == -1) && (errno == ENOENT))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-           tst_resm(TFAIL, "%s %s errno:%d %s",
-		"Expected ENOENT error condition when chmod(2) a symbolic",
-		"link which pointed at no object,", errno, strerror(errno));
-     }
-     else if (cktcsid(tc_ptr->tcid, UTIME)) {
-
-        if ((utime(tc_ptr->fn_arg[1], NULL) == -1) && (errno == ENOENT))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-           tst_resm(TFAIL, "%s %s errno:%d %s",
-		"Expected ENOENT error condition when utime(2) a symbolic",
-		"link which pointed at no object:", errno, strerror(errno));
-     }
-     else if (cktcsid(tc_ptr->tcid, OPEN)) {
-
-        if ((open(tc_ptr->fn_arg[1], O_RDWR) == -1) && (errno == ENOENT))
-	    if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-           tst_resm(TFAIL, "%s %s errno:%d %s",
-		"Expected ENOENT error for opening a non-existent object",
-		" file through a symbolic link file was not received,",
-		errno, strerror(errno));
-        close (TEST_RETURN);
-     }
-     else
-        tst_resm(TBROK, "Unknown test case processing actions declared");
-}
-
-/***********************************************************************
- * This routine checks for the return of ELOOP errno from requested
- * system call
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_ELOOP(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     if (cktcsid(tc_ptr->tcid, STAT)) {
-
-	TEST( stat(tc_ptr->fn_arg[1], &asymlink) );
-	errno=TEST_ERRNO;
-        if ((TEST_RETURN == -1) && (errno == ELOOP))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-              tst_resm(TEST_RESULT, "%s errno:%d %s",
-	  	"Expected ELOOP errno from stat(2) (nested symb link),",
-		 errno, strerror(errno));
-	   else
-		Tst_count++;
-     }
-     else if (cktcsid(tc_ptr->tcid, CHDIR)) {
-
-	TEST( chdir(tc_ptr->fn_arg[1]) );
-	errno=TEST_ERRNO;
-        if ((TEST_RETURN == -1) && (errno == ELOOP))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-              tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else {
-
-           tst_resm(TFAIL, "%s errno:%d %s",
-		"Expected ELOOP error condition when chdir(2) a nested symbolic link:",
-		errno, strerror(errno));
-           chdir(TESTDIR);
-        }
-     }
-     else if (cktcsid(tc_ptr->tcid, LINK)) {
-
-	TEST ( link(tc_ptr->fn_arg[1], O_FILE) );
-	errno=TEST_ERRNO;
-        if ((TEST_RETURN == -1) && (errno == ELOOP))
-	    if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-           tst_resm(TFAIL, "%s errno:%d %s",
-		"Expected ELOOP error condition when link(2) a nested symbolic link:",
-		errno, strerror(errno));
-     }
-     else if (cktcsid(tc_ptr->tcid, CHMOD)) {
-
-	TEST ( chmod(tc_ptr->fn_arg[1], MODE) );
-	errno=TEST_ERRNO;
-        if ((TEST_RETURN == -1) && (errno == ELOOP))
-	    if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	    else
-		Tst_count++;
-        else
-           tst_resm(TFAIL, "%s errno:%d %s",
-		"Expected ELOOP error condition when chmod(2) a nested symbolic link:",
-		errno, strerror(errno));
-        return;
-     }
-     else if (cktcsid(tc_ptr->tcid, UTIME)) {
-
-	TEST( utime(tc_ptr->fn_arg[1], NULL) );
-	errno=TEST_ERRNO;
-
-        if ((TEST_RETURN == -1) && (errno == ELOOP))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-           tst_resm(TFAIL, "%s errno:%d %s",
-		"Expected ELOOP error condition when utime(2) a nested symbolic link:",
-		errno, strerror(errno));
-     }
-     else if (cktcsid(tc_ptr->tcid, OPEN)) {
-
-        int fd;
-        TEST( open(tc_ptr->fn_arg[1], O_CREAT) );
-	fd=TEST_RETURN;
-	errno=TEST_ERRNO;
-        if ((fd == -1) && (errno == ELOOP))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-           tst_resm(TFAIL, "%s errno:%d %s",
-		"Expected ELOOP error condition when open(2) a nested symbolic link:",
-		errno, strerror(errno));
-	close (fd);
-     }
-     else
-        tst_resm(TBROK, "Unknown test case processing actions declared");
-}
-
-/***********************************************************************
- * This routine checks for the return of ENOTDIR errno from requested
- * system call
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_ENOTDIR(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     if (cktcsid(tc_ptr->tcid, RMDIR)) {
-
-	TEST( mkdir(tc_ptr->fn_arg[0], MODE) );
-	errno=TEST_ERRNO;
-        if (TEST_RETURN == -1)
-            tst_resm(TBROK, "mkdir(2) Failure when creating %s",
-		tc_ptr->fn_arg[0]);
-        else if ((rmdir(tc_ptr->fn_arg[1]) == -1) && (errno == ENOTDIR)) {
-
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-           rmdir(tc_ptr->fn_arg[0]);
-        }
-        else
-           tst_resm(TFAIL, "%s %s errno:%d %s",
-		"Expected ENOTDIR error for removing a non-existent",
-		"directory through a symbolic link file was not received,",
-		errno, strerror(errno));
-     }
-     else
-        tst_resm(TBROK, "Unknown test case processing actions declared");
-}
-
-/***********************************************************************
- * This routine checks for the return of EXDEV errno from requested
- * system call
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_EXDEV(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     if (cktcsid(tc_ptr->tcid, RENAME)) {
-
-	TEST( rename(tc_ptr->fn_arg[1], Y_A_S_FILE) );
-	errno=TEST_ERRNO;
-        if ((TEST_RETURN == -1) && (errno == EXDEV)) {
-           if (see_if_a_symlink(Y_A_S_FILE) == -1)
-	      if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                  tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	      else
-		  Tst_count++;
-           else
-              tst_resm(TFAIL, "%s %s %s file outside of current file system",
-		"rename(3) returned -1 when trying to move symbolic link file",
-		"outside of current file system, but created", Y_A_S_FILE);
-        }
-        else {
-           tst_resm(TFAIL, "%s %s errno:%d %s",
-		"Expected EXDEV error for renaming an existing symbolic",
-		"link file to a location outside of existing file system,",
-		errno, strerror(errno));
-           delete_files("/NiCkEr", NULL);
-        }
-     }
-     else
-        tst_resm(TBROK, "Unknown test case processing actions declared");
-}
-
-/***********************************************************************
- * This routine checks for the return of ENAMETOOLONG errno from requested
- * system call
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_ENAMETOOLONG(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     int ret;
-
-     if (cktcsid(tc_ptr->tcid, SYMLINK)) {
-
-	TEST( symlink(tc_ptr->fn_arg[0], full_path) );
-	errno=TEST_ERRNO;
-        if ((TEST_RETURN == -1) && (errno == ENAMETOOLONG))
-           if (see_if_a_symlink(full_path) == -1)
-	      if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                  tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	      else
-		  Tst_count++;
-           else
-              tst_resm(TFAIL, "%s %s %d %s",
-		"symlink(2) returned -1 when trying to create a symbolic",
-		"link file whose name exceeded", (PATH_MAX+1),
-		"characters, but it created the symbolic link file");
-        else
-           tst_resm(TFAIL,
-		"Expected ENAMETOOLONG error when creating %s symbolic link file with a path exceeding %d characters: errno:%d %s",
-		tc_ptr->fn_arg[1], (PATH_MAX+1), errno, strerror(errno));
-     }
-     else if (cktcsid(tc_ptr->tcid, READLINK)) {
-
-        char scratch[PATH_MAX+1];
-
-	ret=readlink(full_path, scratch, strlen(full_path));
-        if (( ret == -1) && (errno == ENAMETOOLONG))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  ) 
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-           tst_resm(TFAIL,
-	       "Expected ENAMETOOLONG error when reading %s symbolic link file with a path exceeding %d characters: errno:%d %s",
-		tc_ptr->fn_arg[1], (PATH_MAX+1), errno, strerror(errno));
-     }
-     else
-        tst_resm(TBROK, "Unknown test case processing actions declared");
-}
-
-/***********************************************************************
- * This routine checks for the return of EINVAL errno from requested
- * system call
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_EINVAL(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     if (cktcsid(tc_ptr->tcid, READLINK)) {
-	TEST( readlink(tc_ptr->fn_arg[0], test_msg, BUFMAX) );
-	errno=TEST_ERRNO;
-        if (TEST_RETURN == -1) {
-           if (errno == EINVAL) {
-	      if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                  tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	      else
-		Tst_count++;
-           } else
-              tst_resm(TFAIL, "readlink(2) ret:-1, errno:%d, : Exp errno:%d",
-		errno, EINVAL);
-        }
-        else {
-           tst_resm(TFAIL, "readlink(2) did not returned -1 when reading %s",
-		"a file which is not a symbolic link file");
-	}
-     }
-     else
-        tst_resm(TBROK, "Unknown test case processing actions declared");
-}
-
-/***********************************************************************
- * This routine checks out the readlink(2) system call for a successful
- * invocation
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_readlink(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     char scratch[PATH_MAX];
-     int ret;
-
-     ret=readlink(tc_ptr->fn_arg[1], scratch, strlen(tc_ptr->fn_arg[0]));
-
-     /*** the TEST macro cannot be used here for some reason ****/
-
-     if (ret == -1) {
-        tst_resm(TFAIL,
-	    "readlink(2) failure on %s symbolic link file, errno=%d",
-	    tc_ptr->fn_arg[1], errno);
-
-     }
-     else if (strncmp(tc_ptr->fn_arg[0], scratch,
-			strlen(tc_ptr->fn_arg[0])) != 0) {
-
-        /* Must null terminate scratch because readlink(2) doesn't */
-
-        scratch[strlen(tc_ptr->fn_arg[0])] = '\0';
- 
-        tst_resm(TFAIL,
-	   "readlink(2) Error : Expected %s symbolic link file contents but %s actual contents were returned",
-	   tc_ptr->fn_arg[0], scratch);
-     }
-     else if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-        tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-     else
-	Tst_count++;
-}
-
-/***********************************************************************
- * This routine checks out the stat(2) system call for a successful
- * invocation
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_stat(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-    if (statter.st_dev != asymlink.st_dev)
-        tst_resm(TFAIL,
-	    "stat of symbolic link reference to object device info %ld != stat of object file device info %ld",
-	    statter.st_dev, asymlink.st_dev);
-
-    else if (statter.st_mode != asymlink.st_mode)
-        tst_resm(TFAIL,
-	    "stat of symbolic link reference to object file permissions %ld != stat of object file permissions %ld",
-	    statter.st_mode, asymlink.st_mode);
-
-    else if (statter.st_nlink != asymlink.st_nlink)
-        tst_resm(TFAIL,
-	    "stat of symbolic link reference to object file link count %ld != stat of object file link count %ld",
-	    statter.st_nlink, asymlink.st_nlink);
-
-    else if (statter.st_uid != asymlink.st_uid)
-        tst_resm(TFAIL,
-	    "stat of symbolic link reference to object file uid %ld != stat of object file uid %ld",
-	    statter.st_uid, asymlink.st_uid);
-
-    else if (statter.st_gid != asymlink.st_gid)
-        tst_resm(TFAIL,
-	    "stat of symbolic link reference to object file gid %ld != stat of object file gid %ld",
-	    statter.st_gid, asymlink.st_gid);
-
-    else if (statter.st_size != asymlink.st_size)
-        tst_resm(TFAIL,
-	    "stat of symbolic link reference to object file size %ld != stat of object file size %ld",
-	    statter.st_size, asymlink.st_size);
-
-    else if (statter.st_atime != asymlink.st_atime)
-        tst_resm(TFAIL,
-	    "stat of symbolic link reference to object access time %ld != stat of object file access time %ld",
-	    statter.st_atime, asymlink.st_atime);
-
-    else if (statter.st_mtime != asymlink.st_mtime)
-        tst_resm(TFAIL,
-	    "stat of symbolic link reference to object modify time %ld != stat of object file modify time %ld",
-	    statter.st_atime, asymlink.st_atime);
-
-    else if (statter.st_ctime != asymlink.st_ctime)
-        tst_resm(TFAIL,
-	    "stat of symbolic link reference to object change time %ld != stat of object file change time %ld",
-	    statter.st_atime, asymlink.st_atime);
-    else if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-        tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-     else
-	Tst_count++;
-}
-
-/***********************************************************************
- * This routine checks out the chdir(2) system call for a successful
- * invocation
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_chdir(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     if (mkdir(tc_ptr->fn_arg[2],MODE) == -1)
-        tst_resm(TFAIL, "Could not create a setup directory file");
-     else {
-
-	sprintf(Buf, "mkdir(%s, %#o) was successful\n", tc_ptr->fn_arg[2],MODE);
-	strcat(Buffer, Buf);
-
-        if (chdir(tc_ptr->fn_arg[1]) == -1)
-           tst_resm(TFAIL, "%sCould not change a directory file through a %s",
-		Buffer, "symbolic link which which pointed at object");
-        else {
-
-	   char buf [PATH_MAX];
-           char *cwd;
-           char expected_location[PATH_MAX];
-           /*
-           *  Build expected current directory position
-           */
-           strcpy(expected_location, TESTDIR);
-           strcat(expected_location, "/");
-           strcat(expected_location, tc_ptr->fn_arg[2]);
-
-           if ((cwd = getcwd(buf, sizeof (buf))) == NULL)
-              tst_resm(TFAIL, "getcwd(3) FAILURE");
-           else if (strcmp(cwd, expected_location) == 0)
-	      if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                  tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-     	      else
-		  Tst_count++;
-           else {
-              tst_resm(TFAIL, "%s%s %s %s not equal to expected %s", Buffer,
-		"chdir(2) returned successfully, but getcwd(3) indicated",
-		"new current working directory location", cwd, expected_location);
-           }
-           chdir(TESTDIR);
-        }
-        rmdir(tc_ptr->fn_arg[2]);
-     }
-}
-
-/***********************************************************************
- * This routine checks out the link(2) system call for a successful
- * invocation
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_link(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-    struct stat stbuf;
-
-    if (link(tc_ptr->fn_arg[1], "nick") == -1) {
-        tst_resm(TFAIL, "%slink(%s, \"nick\") failed, errno: %d\n%s %s",
-	    Buffer, tc_ptr->fn_arg[1], errno,
-	    "link of new file to object file via symbolic link file failed",
-	    "when expected not to");
-    }
-    else {
-	sprintf(Buf, "link(%s, \"nick\") was successful\n", tc_ptr->fn_arg[1]);
-	strcat(Buffer, Buf);
-
-	if ( STD_FUNCTIONAL_TEST ) {
-	  /*
-	   * Check that links counts were properly set
-	   */
-          if (lstat(tc_ptr->fn_arg[1], &asymlink) == -1) {
-            tst_resm(TBROK, "lstat(%s) failed. errno: %d",
-		tc_ptr->fn_arg[1], errno);
-
-          } else if (lstat("nick", &statter) == -1) {
-           tst_resm(TBROK, "lstat(nick) failed, errno:%d", errno);
-          } else {
-            if (statter.st_ino == asymlink.st_ino) {
-                if ((statter.st_nlink ==2) && (asymlink.st_nlink == 2)) {
-		   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                       tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-		   else
-			Tst_count++;
-                } else {
-		   lstat(tc_ptr->fn_arg[2], &stbuf);
-
-                   tst_resm(TFAIL, 
-		       "%slink(%s, %s) failed to adjust link count.\n\
-		count for nick is %d, count for %s is %d, count for %s is %d.",
-		       Buffer, tc_ptr->fn_arg[1], "nick",
-		       statter.st_nlink, tc_ptr->fn_arg[1], asymlink.st_nlink,
-			tc_ptr->fn_arg[2], stbuf.st_nlink);
-		}
-	    } else {
-		tst_resm(TFAIL, 
-		    "%sA lstat of %s (ino:%d) and of\n\t\t\
-%s (ino:%d), does not show them being the same ino.", Buffer,
-		   tc_ptr->fn_arg[1], asymlink.st_ino, "nick", statter.st_ino);
-	    }
-          }
-	}
-        delete_files("nick", NULL);
-    }
-}
-
-/***********************************************************************
- * This routine checks out the unlink(2) system call for a successful
- * invocation
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_unlink(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-    if (stat(tc_ptr->fn_arg[2], &asymlink) == -1)
-        tst_resm(TBROK,
-	    "stat(2) Failure when accessing %s object file", tc_ptr->fn_arg[2]);
-    else if (unlink(tc_ptr->fn_arg[1]) == -1)
-        tst_resm(TFAIL, "unlink(2) failed when removing symbolic link file");
-    else {
-	sprintf(Buf, "unlink(%s) was successful\n", tc_ptr->fn_arg[1]);
-	strcat(Buffer, Buf);
-	if (stat(tc_ptr->fn_arg[2], &statter) == -1)
-            tst_resm(TFAIL,"%s %s",
-	        "unlink(2) failed because it not only removed symbolic link",
-	        "file which pointed at object file, but object file as well");
-	
-        else
-            if ((statter.st_ino == asymlink.st_ino) &&
-		(statter.st_dev == asymlink.st_dev) &&
-		(statter.st_size == asymlink.st_size))
-
-	       if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                   tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	       else
-		    Tst_count++;
-            else
-               tst_resm(TFAIL, "%s%s %s %s", Buffer,
-		    "unlink(2) failed because it not only removed symbolic link",
-		    "file which pointed at object file, but it changed object",
-		    "file inode information");
-    }
-
-}
-
-/***********************************************************************
- * This routine checks out the chmod(2) system call for a successful
- * invocation
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_chmod(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-    if (stat(tc_ptr->fn_arg[2], &asymlink) == -1)
-        tst_resm(TBROK,
-	    "stat(2) Failure when accessing %s object file", tc_ptr->fn_arg[2]);
-    else if (chmod(tc_ptr->fn_arg[1], (MODE | MASK)) == -1) 
-        tst_resm(TFAIL, "%s%s %s", Buffer,
-	    "chmod(2) failed when changing file permission",
-	    "through symbolic link file");
-    else { 
-	sprintf(Buf, "chmod(%s, %#o) was successful\n", tc_ptr->fn_arg[1], 
-		(MODE | MASK));
-	strcat(Buffer, Buf);
-
-	if (stat(tc_ptr->fn_arg[2], &statter) == -1)
-            tst_resm(TBROK,
-	        "stat(2) Failure when accessing %s object file", tc_ptr->fn_arg[2]);
-        else
-            if ((statter.st_mode == (MODE | MASK)) &&
-			    (statter.st_mode != asymlink.st_mode))
-	       if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                   tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	       else
-		    Tst_count++;
-            else
-               tst_resm(TFAIL, "%s%s %o to %o %s", Buffer,
-		    "chmod(2) failed to change object file permissions from",
-		    asymlink.st_mode, (MODE | MASK),
-		    "through symbolic link file");
-    }
-
-}
-
-/***********************************************************************
- * This routine checks out the utime(2) system call for a successful
- * invocation
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_utime(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     struct utimbuf utimes;
-
-     if (stat(tc_ptr->fn_arg[2], &asymlink) == -1)
-        tst_resm(TBROK, "stat(2) Failure when accessing %s object file",
-	    tc_ptr->fn_arg[2]);
-     else {
-        /* Now add a few values to access and modify times */
-
-        utimes.actime = asymlink.st_atime + a_time_value;
-        utimes.modtime = asymlink.st_mtime + a_time_value;
-       
-        /* Now hand off to utime(2) via symbolic link file*/
-
-        if (utime(tc_ptr->fn_arg[1], &utimes) == -1)
-            tst_resm(TFAIL, "%s %s",
-	        "utime(2) failed to process object file access and modify",
-		"time updates through symbolic link");
-        else {
-           /* Now verify changes were made */
-
-           if (stat(tc_ptr->fn_arg[2], &statter) == -1)
-              tst_resm(TBROK,
-		"stat(2) Failure when accessing %s object file",
-		tc_ptr->fn_arg[2]);
-           else {
-              time_t temp, diff;
-
-              temp = statter.st_atime - asymlink.st_atime;
-              diff = (statter.st_mtime - asymlink.st_mtime) - temp;
-
-              if (! diff) 
-		 if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                     tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-		 else
-		     Tst_count++;
-              else
-                 tst_resm(TFAIL, "%s %s %d greater than original times",
-		    "utime(2) failed to change object file access and",
-		    "modify times through symbolic link to a value",
-		    a_time_value);
-           }
-        }
-     }
-}
-
-/***********************************************************************
- * This routine checks out the rename(2) system call for a successful
- * invocation
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_rename(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     int pts_at_object = 0;
-
-     
-     if (stat(tc_ptr->fn_arg[2], &statter) != -1)
-        pts_at_object=1;
-
-     TEST (rename(tc_ptr->fn_arg[1], A_S_FILE) );
-     errno=TEST_ERRNO;
-     if (TEST_RETURN == -1)
-        tst_resm(TFAIL, "rename(3) failed to rename %s symbolic link file to %s",
-	    tc_ptr->fn_arg[2], A_S_FILE);
-     else if (pts_at_object)
-        if (ck_both(tc_ptr->fn_arg[0], A_S_FILE, tc_ptr->fn_arg[2]))
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        else
-           tst_resm(TFAIL, test_msg);
-     else if ( ! ck_symlink(tc_ptr->fn_arg[0], A_S_FILE, NULL)) 
-        tst_resm(TFAIL, test_msg);
-     else if (stat(tc_ptr->fn_arg[1], &asymlink) != -1)
-        tst_resm(TFAIL,
-	    "rename(3) did not remove %s when renaming to %s",
-	    tc_ptr->fn_arg[1], A_S_FILE);
-     else if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-        tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-     else
-	Tst_count++;
-}
-
-/***********************************************************************
- * This routine checks out the open(2) system call for a successful
- * invocation
- *
- *   Argument is pointer to test_objects array of structures of type
- *   all_test_cases
- ***********************************************************************/
-void
-do_open(tc_ptr)
-struct all_test_cases *tc_ptr;
-{
-     int fd = -1;
-     int ret, pts_at_object = 0;
-     char scratch[PATH_MAX];
-
-     
-     if (stat(tc_ptr->fn_arg[2], &statter) != -1)
-        pts_at_object=1;
-
-     if (pts_at_object) {
-	TEST( open(tc_ptr->fn_arg[1], O_RDWR) );
-        errno=TEST_ERRNO;
-        if ((fd=TEST_RETURN) == -1) {
-           tst_resm(TFAIL,
-	       "open(2) Failure when opening object file through symbolic link file");
-           return;
-        }
-     }
-     else {
-	TEST(open(tc_ptr->fn_arg[1], (O_CREAT | O_RDWR), MODE) );
-	errno=TEST_ERRNO;
-        if ((fd=TEST_RETURN) == -1) {
-           tst_resm(TFAIL,
-	       "open(2) Failure when creating object file through symbolic link file");
-           return;
-        }
-     }
-     if ((ret=write(fd, BIG_STRING, strlen(BIG_STRING))) == -1) {
-        tst_resm(TFAIL,
-	    "write(2) Failure to object file opened through a symbolic link file: errno:%d",
-	    errno);
-     }
-     else if (ret != strlen(BIG_STRING)) {
-        tst_resm(TFAIL,
-	    "write(2) Failed to write %d bytes to object file opened through a symbolic link file",
-	    strlen(BIG_STRING));
-     }
-     else if (lseek(fd, 0L, 0) == -1) {
-        tst_resm(TFAIL,
-	    "lseek(2) Failed to position to beginning of object file opened through a symbolic link file: errno = %d",
-	    errno);
-     }
-     else if ((ret=read(fd, scratch, strlen(BIG_STRING))) == -1) {
-        tst_resm(TFAIL,
-	    "read(2) Failure of object file opened through a symbolic link file: errno = %d",
-	    errno);
-     }
-     else if (ret != strlen(BIG_STRING)) {
-        tst_resm(TFAIL,
-	    "read(2) Failed to read %d bytes to object file opened through a symbolic link file",
-	    strlen(BIG_STRING));
-     }
-     else if (strncmp(BIG_STRING, scratch, strlen(BIG_STRING)) != 0) {
-        tst_resm(TFAIL,
-	    "Content of write(2) and read(2) Failed to object file through symbolic link file was not as expected. Expected %s and read returned %s",
-	    BIG_STRING, scratch);
-     }
-     else {
-        /*
-         *  Close off symbolic link file to object file access
-         */
-        if (close(fd) == -1) {
-           tst_resm(TFAIL,
-	       "close(2) Failure when closing object file accessed symbolic link file");
-        }
-        /*
-         * Now, lets open up and read object file and compare contents
-        */
-        else if ((fd=open(tc_ptr->fn_arg[0], O_RDONLY)) == -1) {
-           tst_resm(TFAIL, "open(2) Failure when opening %s file: errno:%d %s",
-	       tc_ptr->fn_arg[0], errno, strerror(errno));
-        }
-        else if ((ret=read(fd, scratch, strlen(BIG_STRING))) == -1) {
-           tst_resm(TFAIL,
-	       "read(2) Failure of object file opened through a symbolic link file: errno:%d", errno);
-        }
-        else if (ret != strlen(BIG_STRING)) {
-           tst_resm(TFAIL,
-	       "read(2) Failed to read %d bytes to object file opened through a symbolic link file",
-		strlen(BIG_STRING));
-        }
-        else if (strncmp(BIG_STRING, scratch, strlen(BIG_STRING)) != 0) {
-           tst_resm(TFAIL,
-	       "Content of write(2) and read(2) Failed to object file through symbolic link file was not as expected. Expected %s and read returned %s",
-		BIG_STRING, scratch);
-        }
-        else if (pts_at_object) {
-	   if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-               tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	   else
-		Tst_count++;
-        }
-        else { /* Insure newly created object file is pointed at */
-           if (ck_both(tc_ptr->fn_arg[0], tc_ptr->fn_arg[1], tc_ptr->fn_arg[0]))
-	      if ( TEST_RESULT != TPASS || STD_FUNCTIONAL_TEST  )
-                  tst_resm(TEST_RESULT, msgs[tc_ptr->pass_msg]);
-	      else
-	 	  Tst_count++;
-           else
-              tst_resm(TFAIL, test_msg);
-        }
-        close(fd);
-     }
-}
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* create a temporary directory and go to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}       /* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *              completion or premature exit.
- ***************************************************************/
-void
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* remove temporary directory and all files in it. */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}       /* End cleanup() */
-
-
-/*
- *
- */
-void help()
-{
-    unsigned ind;
-
-    printf("   -T id  Determines which tests cases to execute:\n");
-
-    for (ind=0; ind<sizeof(all_tcses)/sizeof(struct tcses ); ind++) {
-	printf("  %s/%s - %s\n", all_tcses[ind].tcid, all_tcses[ind].syscall,
-	    all_tcses[ind].desc);
-    }
-}
diff --git a/winsup/testsuite/winsup.api/ltp/symlink02.c b/winsup/testsuite/winsup.api/ltp/symlink02.c
deleted file mode 100644
index 4157cea8a..000000000
--- a/winsup/testsuite/winsup.api/ltp/symlink02.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: symlink02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for symlink(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) symlink(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the symlink(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	symlink(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="symlink02"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255], symlnk[255];
-int fd;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call symlink(2)
-	 */
-	TEST(symlink(fname, symlnk));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "symlink(%s, %s) Failed, errno=%d : %s", 
-		     fname, symlnk, TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "symlink(%s, %s) returned %d",
-			 fname, symlnk, TEST_RETURN);
-	    } 
-	    if (unlink(symlnk) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "unlink(%s) Failed, errno=%d : %s",
-			 symlnk, errno, strerror(errno));
-	    }
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd=open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-	tst_brkm(TBROK, cleanup,
-		 "open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		 fname, errno, strerror(errno));
-    }
-
-    if (close(fd) == -1 ) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-    sprintf(symlnk,"st_%d",getpid());
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/symlink03.c b/winsup/testsuite/winsup.api/ltp/symlink03.c
deleted file mode 100644
index 4d0542768..000000000
--- a/winsup/testsuite/winsup.api/ltp/symlink03.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name : symlink03
- *
- * Test Description :
- *   Verify that,
- *   1) symlink(2) returns -1 and sets errno to EACCES if search/write
- *	permission is denied in the directory where the symbolic link is
- *	being created.
- *   2) symlink(2) returns -1 and sets errno to EEXIST if the specified 
- *	symbolic link already exists.
- *   3) symlink(2) returns -1 and sets errno to EFAULT if the specified
- *	file or symbolic link points to invalid address.
- *   4) symlink(2) returns -1 and sets errno to ENAMETOOLONG if the 
- *	pathname component of symbolic link is too long (ie, > PATH_MAX).
- *   5) symlink(2) returns -1 and sets errno to ENOTDIR if the directory
- *	component in pathname of symbolic link is not a directory.
- *   6) symlink(2) returns -1 and sets errno to ENOENT if the component of
- *	symbolic link points to an empty string.
- * 
- * Expected Result:
- *  symlink() should fail with return value -1 and set expected errno.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	if errno set == expected errno
- *   		Issue sys call fails with expected return value and errno.
- *   	Otherwise,
- *		Issue sys call fails with unexpected errno.
- *   Otherwise,
- *	Issue sys call returns unexpected value.
- *
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory(s)/file(s) created.
- *
- * Usage:  <for command-line>
- *  symlink03 [-c n] [-e] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *  This test should be executed by 'non-super-user' only.
- */
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define MODE_RWX        S_IRWXU | S_IRWXG | S_IRWXO
-#define FILE_MODE       S_IRUSR | S_IRGRP | S_IROTH
-#define DIR_TEMP        "testdir_1"
-#define TESTFILE	"testfile"
-#define TEST_FILE1      "testdir_1/tfile_1"
-#define SYM_FILE1	"testdir_1/sfile_1"
-#define TEST_FILE2      "tfile_2"
-#define SYM_FILE2	"sfile_2"
-#define TEST_FILE3      "tfile_3"
-#define SYM_FILE3	"t_file/sfile_3"
-
-const char *TCID="symlink03";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={ENOTDIR, ENOENT, ENAMETOOLONG, EFAULT,  EEXIST, EACCES, 0};
-
-int no_setup();
-int setup1();                   /* setup function to test symlink for EACCES */
-int setup2();                   /* setup function to test symlink for EEXIST */
-int setup3();                   /* setup function to test symlink for ENOTDIR */
-int longpath_setup();   /* setup function to test chmod for ENAMETOOLONG */
-
-char Longpathname[PATH_MAX+2];
-char High_address_node[64];
-
-struct test_case_t {		/* test case struct. to hold ref. test cond's*/
-	const char *file;
-	const char *link;
-	const char *desc;
-	int exp_errno;
-	int (*setupfunc)();
-} Test_cases[] = {
-	{ TEST_FILE1, SYM_FILE1, "No Search permissions to process", EACCES, setup1 },
-	{ TEST_FILE2, SYM_FILE2, "Specified symlink already exists", EEXIST, setup2 },
-	{ TESTFILE, High_address_node, "Address beyond address space", EFAULT, no_setup },
-	{ TESTFILE, (char *)-1, "Negative address", EFAULT, no_setup },
-	{ TESTFILE, Longpathname, "Symlink path too long", ENAMETOOLONG, longpath_setup },
-	{ TESTFILE, "", "Symlink Pathname is empty", ENOENT, no_setup },
-#ifndef __CYGWIN__
-	{ TEST_FILE3, SYM_FILE3, "Symlink Path contains regular file", ENOTDIR, setup3 },
-#endif
-	{ NULL, NULL, NULL, 0, no_setup }
-};
-
-extern void setup();		/* Setup function for the test */
-void cleanup() __attribute__((noreturn));/* Cleanup function for the test */
-char *get_high_address (void);
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	const char *test_file;	/* testfile name */
-	const char *sym_file;		/* symbolic link file name */
-	const char *test_desc;	/* test specific error message */
-	int ind;		/* counter to test different test conditions */
-
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * Invoke setup function to call individual test setup functions
-	 * to simulate test conditions.
-	 */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-	
-		for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
-			test_file = Test_cases[ind].file;
-			sym_file = Test_cases[ind].link;
-			test_desc = Test_cases[ind].desc;
-
-			if (sym_file == High_address_node) {
-				sym_file = (char *)get_high_address();
-			}
-			/* 
-			 * Call symlink(2) to test different test conditions.
-	 		 * verify that it fails with -1 return value and sets
-			 * appropriate errno.
-			 */
-			TEST(symlink(test_file, sym_file));
-	
-			/* Check return code of symlink(2) */
-			if (TEST_RETURN == -1) {
-				/*
-				 * Perform functional verification if
-				 * test executed without (-f) option.
-				 */
-				TEST_ERROR_LOG(TEST_ERRNO);
-				if (TEST_ERRNO == Test_cases[ind].exp_errno) {
-					tst_resm(TPASS, "symlink() Fails, %s, "
-						"errno=%d", test_desc,
-						TEST_ERRNO);
-				} else {
-					tst_resm(TFAIL, "symlink() Fails, %s, "
-						"errno=%d, expected errno=%d",
-						test_desc, TEST_ERRNO,	
-						Test_cases[ind].exp_errno);
-				}
-			} else {
-				tst_resm(TFAIL, "symlink() returned %d, "
-					"expected -1, errno:%d", TEST_RETURN,
-					Test_cases[ind].exp_errno);
-			}
-		}	/* End of TEST CASE LOOPING. */
-
-		Tst_count++;		/* incr. TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and change directory to it.
- *  Call test specific setup functions.
- */
-void 
-setup()
-{
-	int ind;
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* call individual setup functions */
-	for (ind = 0; Test_cases[ind].desc != NULL; ind++) {
-		Test_cases[ind].setupfunc();
-	}
-}	/* End setup() */
-
-/*
- * int
- * no_setup() - Some test conditions for mknod(2) do not any setup.
- *              Hence, this function just returns 0.
- *  This function simply returns 0.
- */
-int
-no_setup()
-{
-        return 0;
-}
-
-/*
- * int
- * setup1() - setup function for a test condition for which symlink(2)
- *            returns -1 and sets errno to EACCES.
- *  Create a test directory under temporary directory and create a test file
- *  under this directory with mode "0666" permissions.
- *  Modify the mode permissions on test directory such that process will not
- *  have search permissions on test directory.
- *
- *  The function returns 0.
- */
-int
-setup1()
-{
-        int fd;                 /* file handle for testfile */
-
-        if (mkdir(DIR_TEMP, MODE_RWX) < 0) {
-                tst_brkm(TBROK, cleanup, "mkdir(2) of %s failed", DIR_TEMP);
-		/*NOTREACHED*/
-        }
-
-        if ((fd = open(TEST_FILE1, O_RDWR|O_CREAT, 0666)) == -1) {
-                tst_brkm(TBROK, cleanup,
-                         "open(%s, O_RDWR|O_CREAT, 0666) failed, errno=%d : %s",
-                         TEST_FILE1, errno, strerror(errno));
-		/*NOTREACHED*/
-        }
-        if (close(fd) == -1) {
-                tst_brkm(TBROK, cleanup,
-                         "close(%s) Failed, errno=%d : %s",
-                         TEST_FILE1, errno, strerror(errno));
-		/*NOTREACHED*/
-        }
-
-	/* Modify mode permissions on test directory */
-        if (chmod(DIR_TEMP, FILE_MODE) < 0) {
-                tst_brkm(TBROK, cleanup, "chmod(2) of %s failed", DIR_TEMP);
-		/*NOTREACHED*/
-        }
-        return 0;
-}
-
-/*
- * int
- * setup2() - EEXIST
- */
-int
-setup2()
-{
-	int fd;			/* file handle for testfile */
-
-        if ((fd = open(TEST_FILE2, O_RDWR|O_CREAT, 0666)) == -1) {
-                tst_brkm(TBROK, cleanup,
-                         "open(%s, O_RDWR|O_CREAT, 0666) failed, errno=%d : %s",
-                         TEST_FILE1, errno, strerror(errno));
-		/*NOTREACHED*/
-		}
-		if (close(fd) == -1) {
-			tst_brkm(TBROK, cleanup,
-				"close(%s) Failed, errno=%d : %s",
-				TEST_FILE2, errno, strerror(errno));
-		/*NOTREACHED*/
-		}
-	
-	if (symlink(TEST_FILE2, SYM_FILE2) < 0) {
-		tst_brkm(TBROK, cleanup,
-			 "symlink() Fails to create %s in setup2, error=%d",
-			 SYM_FILE2, errno);
-		/*NOTREACHED*/
-	}
-	return 0;
-}
-
-/*
- * int
- * longpath_setup() - setup to create a node with a name length exceeding
- *                    the MAX. length of PATH_MAX.
- *   This function retruns 0.
- */
-int
-longpath_setup()
-{
-	int ind;                /* counter variable */
-
-	for (ind = 0; ind <= (PATH_MAX + 1); ind++) {
-		Longpathname[ind] = 'a';
-	}
-	return 0;
-}
-
-/*
- * int
- * setup3() - setup function for a test condition for which symlink(2)
- *           returns -1 and sets errno to ENOTDIR.
- *
- *  Create a symlink file under temporary directory so that test tries to
- *  create symlink file "tfile_3" under "t_file" which happens to be
- *  another symlink file.
- */
-int
-setup3()
-{
-	int fd;			/* file handle for testfile */
-
-	/* Creat/open a testfile and close it */
-	if ((fd = open("t_file", O_RDWR|O_CREAT, MODE_RWX)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			"open(2) on t_file failed, errno=%d : %s",
-			errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-	if (close(fd) == -1) {
-		tst_brkm(TBROK, cleanup, "close(t_file) Failed, errno=%d : %s",
-			errno, strerror(errno));
-		/*NOTREACHED*/
-        }
-	return 0;
-}
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *  Restore the mode permissions on test directory.
- *  Remove the temporary directory created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Restore mode permissions on test directory created in setup2() */
-	if (chmod(DIR_TEMP, MODE_RWX) < 0) {
-		tst_brkm(TBROK, NULL, "chmod(2) of %s failed", DIR_TEMP);
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/symlink04.c b/winsup/testsuite/winsup.api/ltp/symlink04.c
deleted file mode 100644
index c6ddd0630..000000000
--- a/winsup/testsuite/winsup.api/ltp/symlink04.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name : symlink01
- *
- * Test Description :
- *  Verify that, symlink will succeed to creat a symbolic link of an existing
- *  object name path.
- * 
- * Expected Result:
- *  symlink() should return value 0 on success and symbolic link of an
- *  existing object should be created.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  symlink01 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *  None.
- *
- */
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include "test.h"
-#include "usctest.h"
-
-#define  TESTFILE	"testfile"
-#define  SYMFILE	"slink_file"
-#define FILE_MODE       S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-
-const char *TCID="symlink01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={0};
-
-extern void setup();		/* Setup function for the test */
-void cleanup() __attribute__((noreturn));/* Cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat structure buffer */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-		/*NOTREACHED*/
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-	
-		/* 
-		 * Call symlink(2) to create a symlink of 
-		 * testfile.
-		 */
-		TEST(symlink(TESTFILE, SYMFILE));
-	
-		/* Check return code of symlink(2) */
-		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, "symlink(%s, %s) Failed, errno=%d : %s",
-				 TESTFILE, SYMFILE, TEST_ERRNO,
-				 strerror(TEST_ERRNO));
-		} else {
-			/*
-			 * Perform functional verification if test
-			 * executed without (-f) option.
-			 */
-			if (STD_FUNCTIONAL_TEST) {
-				/*
-				 * Get the symlink file status information
-				 * using lstat(2).
-				 */
-				if (lstat(SYMFILE, &stat_buf) < 0) {
-					tst_brkm(TFAIL, cleanup, "lstat(2) of "
-						"%s failed, error:%d", SYMFILE,
-						errno);
-					/*NOTREACHED*/
-				}
-
-				/* Check if the st_mode contains a link  */
-				if (!S_ISLNK(stat_buf.st_mode)) {
-					tst_resm(TFAIL,
-						 "symlink of %s doesn't exist",
-						 TESTFILE);
-				} else {
-					tst_resm(TPASS, "symlink(%s, %s) "
-						"functionality successful",
-						TESTFILE, SYMFILE);
-				}
-			} else {
-				tst_resm(TPASS, "Call succeeded");
-			}
-		}
-
-		/* Unlink the symlink file for next loop */
-		if (unlink(SYMFILE) == -1) {
-			tst_brkm(TBROK, cleanup,
-				 "unlink(%s) Failed, errno=%d : %s",
-				 SYMFILE, errno, strerror(errno));
-			/*NOTREACHED*/
-		}
-		Tst_count++;		/* incr TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and change directory to it.
- *  Create a test file under temporary directory and close it
- */
-void 
-setup()
-{
-	int fd;			/* file handle for testfile */
-
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* creat/open a testfile */
-	if ((fd = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %#o) Failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-
-	/* Close the temporary file created above */
-	if (close(fd) == -1) {
-		tst_resm(TBROK, "close(%s) Failed, errno=%d : %s",
-		TESTFILE, errno, strerror(errno));
-	}
-}	/* End setup() */
-
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/symlink05.c b/winsup/testsuite/winsup.api/ltp/symlink05.c
deleted file mode 100644
index 3b2bbcb8c..000000000
--- a/winsup/testsuite/winsup.api/ltp/symlink05.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name : symlink02
- *
- * Test Description :
- *  Verify that, symlink will succeed to creat a symbolic link of an
- *  non-existing object name path.
- * 
- * Expected Result:
- *  symlink() should return value 0 on success and symlink of an 
- *  non-existing object should be created.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  symlink02 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *  This test should be run by 'non-super-user' only.
- *
- */
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define  TESTFILE	"testfile"
-#define  SYMFILE	"slink_file"
-
-const char *TCID="symlink02";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={0};
-
-extern void setup();		/* Setup function for the test */
-void cleanup() __attribute__((noreturn));/* Cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat structure buffer */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-		/*NOTREACHED*/
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-	
-		/* 
-		 * Call symlink(2) to create a symlink of 
-		 * an non-existing testfile.
-		 */
-		TEST(symlink(TESTFILE, SYMFILE));
-	
-		/* Check return code of symlink(2) */
-		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, \
-				 "symlink(%s, %s) Failed, errno=%d : %s",
-				 TESTFILE, SYMFILE, TEST_ERRNO,
-				 strerror(TEST_ERRNO));
-		} else {
-			/*
-			 * Perform functional verification if test
-			 * executed without (-f) option.
-			 */
-			if (STD_FUNCTIONAL_TEST) {
-				/*
-				 * Get the symlink file status information
-				 * using lstat(2).
-				 */
-				if (lstat(SYMFILE, &stat_buf) < 0) {
-					tst_brkm(TFAIL, cleanup, "lstat(2) of "
-						"%s failed, error:%d",
-						SYMFILE, errno);
-					/*NOTREACHED*/
-				}
-
-				/* Check if the st_mode contains a link  */
-				if (!S_ISLNK(stat_buf.st_mode)) {
-					tst_resm(TFAIL, \
-						 "symlink of %s doesn't exist",
-						 TESTFILE);
-				} else {
-					tst_resm(TPASS, "symlink(%s, %s) "
-						"functionality successful",
-						TESTFILE, SYMFILE);
-				}
-			} else {
-				tst_resm(TPASS, "Call succeeded");
-			}
-		}
-
-		/* Unlink the symlink file for next loop */
-		if (unlink(SYMFILE) == -1) {
-			tst_brkm(TBROK, cleanup,
-				 "unlink(%s) Failed, errno=%d : %s",
-				 SYMFILE, errno, strerror(errno));
-		}
-		Tst_count++;		/* incr TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and change directory to it.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-}	/* End setup() */
-
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *  Remove the temporary directory created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/sync01.c b/winsup/testsuite/winsup.api/ltp/sync01.c
deleted file mode 100644
index c7df322ea..000000000
--- a/winsup/testsuite/winsup.api/ltp/sync01.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: sync01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for sync(2) 
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) sync(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the sync(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	sync(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="sync01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call sync(2) 
-	 */
-	TEST_VOID(sync());
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "sync() Failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "sync() returned %d", TEST_RETURN);
-	    } 
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/sync02.c b/winsup/testsuite/winsup.api/ltp/sync02.c
deleted file mode 100644
index 5535e1add..000000000
--- a/winsup/testsuite/winsup.api/ltp/sync02.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Test Name: sync01
- *
- * Test Description:
- *  Open a file for write; modify the file, then do a sync().
- *  Verify that the data has been written to disk by re-opening the file.
- *
- * Expected Result:
- *  sync() alawys returns 0 in Linux. The data written to the file should
- *  be updated to the disk.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  sync01 [-c n] [-f] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *  None.
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TEMP_FILE	"temp_file"
-#define FILE_MODE       S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-
-const char *TCID="sync01";		/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-char write_buffer[BUFSIZ];	/* buffer used to write data to file*/
-int fildes;			/* file descriptor for temporary file */
-
-void setup();			/* Main setup function of test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-	char read_buffer[BUFSIZ];	/* buffer used to read data from file*/
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call sync(2) to commit buffer data to disk.
-		 */
-		TEST_VOID(sync());
-
-		if (TEST_RETURN == -1) {
-			tst_resm(TFAIL, "%s, Failed, errno=%d : %s",
-				TCID, TEST_ERRNO, strerror(TEST_ERRNO));
-		} else {
-			/*
-			 * Perform functional verification if test
-			 * executed without (-f) option.
-			 */
-			if (STD_FUNCTIONAL_TEST) {
-				/* Set the file ptr to b'nning of file */
-				if (lseek(fildes, 0, SEEK_SET) < 0) {
-					tst_brkm(TFAIL, cleanup, "lseek() "
-						"failed on %s, error=%d",
-						 TEMP_FILE, errno);
-					/*NOTREACHED*/
-				}
-
-				/* Read the contents of file */
-				if (read(fildes, read_buffer, \
-						 sizeof(read_buffer)) > 0) {
-					if (memcmp(read_buffer, write_buffer, strlen(write_buffer))) {
-						tst_resm(TFAIL, "Data read "
-							"from %s doesn't match "
-							"with witten data",
-							TEMP_FILE);
-					} else {
-						tst_resm(TPASS, "Functionality "
-							"of sync() successful");
-					}
-				} else {
-					tst_brkm(TFAIL, cleanup,
-						 "read() Fails on %s, error=%d",
-						 TEMP_FILE, errno);
-						/*NOTREACHED*/
-				}
-			} else {
-				tst_resm(TPASS, "call succeeded");
-			}
-		}
-		Tst_count++;			/* incr. TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and change directory to it.
- *  Create a test file under temporary directory and write some
- *  data into it.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Copy some data into data buffer */
-	strcpy(write_buffer,  "abcdefghijklmnopqrstuvwxyz");
-
-	/* Creat a temporary file under above directory */
-	if ((fildes = open(TEMP_FILE, O_RDWR | O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR | O_CREAT, %#o) Failed, errno=%d :%s",
-			 TEMP_FILE, FILE_MODE, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-
-	/* Write the buffer data into file */
-	if (write(fildes, write_buffer, strlen(write_buffer)) != \
-				(int)strlen(write_buffer)) {
-		tst_brkm(TBROK, cleanup,
-			 "write() failed to write buffer data to %s",
-			 TEMP_FILE);
-		/*NOTREACHED*/
-	}
-	
-}	/* End setup() */
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the temporary file */
-	if (close(fildes) == -1) {
-		tst_brkm(TFAIL, NULL,
-			 "close(%s) Failed, errno=%d : %s",
-			 TEMP_FILE, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/time01.c b/winsup/testsuite/winsup.api/ltp/time01.c
deleted file mode 100644
index c5658e260..000000000
--- a/winsup/testsuite/winsup.api/ltp/time01.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: time01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for time(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) time(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the time(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	time(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <time.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="time01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-    
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call time(2)
-	 */
-	TEST(time(0));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "time(0) Failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "time(0) returned %d", TEST_RETURN);
-	    } 
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    void trapper();
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/time02.c b/winsup/testsuite/winsup.api/ltp/time02.c
deleted file mode 100644
index 011546e8f..000000000
--- a/winsup/testsuite/winsup.api/ltp/time02.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* 
- * Test Name: time01
- *
- * Test Description:
- *  Verify that time(2) returns the value of time in seconds since
- *  the Epoch and stores this value in the memory pointed to by the parameter.
- *	
- * Expected Result:
- *  time() should return the time (seconds) since the Epoch and this value
- *  should be equal to the value stored in the specified parameter.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *
- * Usage:  <for command-line>
- *  time01 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *  None.
- *
- */ 
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <time.h>
-#include <sys/types.h>
-
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();		/* setup function for the test */
-void cleanup(void) __attribute__((noreturn));/* cleanup function for the test */
-
-const char *TCID="time01";		/* Test program identifier.    */
-int TST_TOTAL = 1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={0};
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	time_t tloc;		/* time_t variables for time(2) */
-
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-    
-	/* Check looping state if -i option given */
-	for (lc=0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-	
-		/* 
-		 * Call time() to get the time in seconds  
-		 * since Epoch.
-		 */
-		TEST(time(&tloc));
-	
-		/* Check return code from time(2) */
-		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, "time(0) Failed, errno=%d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
-		} else {
-			/*
-			 * Perform functional verification if test executed
-			 * without (-f) option.
-			 */
-			if (STD_FUNCTIONAL_TEST) {
-				if (tloc == TEST_RETURN) {
-					tst_resm(TPASS, "time() returned value "
-						"%d, stored value %d are same",
-						TEST_RETURN, tloc);
-				} else {
-					tst_resm(TFAIL, "time() returned value "
-						"%d, stored value %d are "
-						"different", TEST_RETURN, tloc);
-				}
-			} else {
-				tst_resm(TPASS, "call succeeded");
-			}
-
-		}
-		Tst_count++;			/* incr. TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/* cleanup and exit */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * setup() - performs all ONE TIME setup for this test.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}	/* End setup() */
-
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- * 	       completion or premature exit.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/times01.c b/winsup/testsuite/winsup.api/ltp/times01.c
deleted file mode 100644
index a1bd1d838..000000000
--- a/winsup/testsuite/winsup.api/ltp/times01.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: times01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for times(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) times(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the times(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	times(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/times.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="times01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-struct tms mytimes;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call times(2)
-	 */
-	TEST(times(&mytimes));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "times(&mytimes) Failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "times(&mytimes) returned %d", TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    void trapper();
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/times02.c b/winsup/testsuite/winsup.api/ltp/times02.c
deleted file mode 100644
index 1dae36c5a..000000000
--- a/winsup/testsuite/winsup.api/ltp/times02.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	times02.c
- *
- * DESCRIPTION
- *	Testcase to test that times() sets errno correctly
- *
- * ALGORITHM
- *	block1:	Pass an invalid address as the "tms" structure, and expect
- *		that times() would return EFAULT.
- *
- * USAGE:  <for command-line>
- *	times02 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions
- *	NONE
- */
-
-#include <sys/times.h>
-#include <errno.h>
-#include <test.h>
-#include <usctest.h>
-
-const char *TCID = "times02";
-int TST_TOTAL = 1;
-extern int Tst_count;
-int exp_enos[]={EFAULT, 0};
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int argc, char **argv)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	/* parse standard options */
-	if ((msg = parse_opts(argc, argv, (option_t *)NULL, NULL)) !=
-		(char *)NULL) {
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();
-
-	/* check for looping state if -i option is given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		TEST(times((void *)-1));
-		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			if (errno != EFAULT) {
-				tst_resm(TFAIL, "Expected EFAULT, got %d",
-						errno);
-			} else {
-				tst_resm(TPASS, "Received EFAULT as expected");
-			}
-				
-		} else {
-			tst_resm(TFAIL, "times(2) failed to FAIL");
-		}
-
-	}
-	cleanup();
-	/*NOTREACHED*/
-}
-
-/*
- * setup()
- *	performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -c option.
-	 */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup()
- *	performs all ONE TIME cleanup for this test at
- *	completion or premature exit
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-	/*NOTREACHED*/
-}
diff --git a/winsup/testsuite/winsup.api/ltp/times03.c b/winsup/testsuite/winsup.api/ltp/times03.c
deleted file mode 100644
index 453d311cc..000000000
--- a/winsup/testsuite/winsup.api/ltp/times03.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	times01.c
- *
- * DESCRIPTION
- *	Testcase to check the basic functionality of the times() system call.
- *
- * ALGORITHM
- *	This testcase checks the values that times(2) system call returns.
- *	Start a process, and spend some CPU time by performing a spin in
- *	a for-loop. Then use the times() system call, to determine the
- *	cpu time/sleep time, and other statistics.
- *
- * USAGE:  <for command-line>
- *	times01 [-c n] [-f] [-P x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-f   : Turn off functionality Testing.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions
- *	NONE
- */
-
-#include <sys/types.h>
-#include <sys/times.h>
-#include <errno.h>
-#include <sys/wait.h>
-#include <test.h>
-#include <usctest.h>
-
-const char *TCID = "times01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-int exp_enos[]={0};
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int argc, char **argv)
-{
-	const char *msg;		/* message returned from parse_opts */
-
-	struct tms buf1, buf2;
-	time_t start_time, end_time;
-	int i, pid2, status, fail=0;
-
-	/* parse standard options */
-	if ((msg = parse_opts(argc, argv, (option_t *)NULL, NULL)) !=
-		(char *)NULL) {
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();
-
-
-	for (i = 0; i < 1000000; i++);
-	/*
-	 * At least some CPU time must be used. This is
-	 * achieved by executing the times(2) call for
-	 * atleast 5 secs. This logic makes it independant
-	 * of the processor speed.
-	 */
-	start_time = time(NULL);
-	for (;;) {
-		if (times(&buf1) == (clock_t)-1) {
-			TEST_ERROR_LOG(errno);
-			tst_resm(TFAIL, "Call to times(2) "
-				 "failed, errno = %d", errno);
-		}
-		end_time = time(NULL);
-		if ((end_time - start_time) > 5) {
-			break;
-		}
-	}
-	if (times(&buf1) == (clock_t)-1) {
-		TEST_ERROR_LOG(errno);
-		tst_resm(TFAIL, "Call to times(2) failed, "
-			 "errno = %d", errno);
-	} else {
-		/*
-		 * Perform functional verification if test
-		 * executed without (-f) option.
-		 */
-		if (STD_FUNCTIONAL_TEST) {
-			if (buf1.tms_utime == 0) {
-				tst_resm(TFAIL, "Error: times() report "
-					"0 user time");
-				fail=1;
-			}
-			if (buf1.tms_stime == 0) {
-				tst_resm(TFAIL, "Error: times() report "
-					"0 system time");
-				fail=1;
-			}
-			if (buf1.tms_cutime != 0) {
-				tst_resm(TFAIL, "Error: times() report "
-					"%d child user time",
-					buf1.tms_cutime);
-				fail=1;
-			}
-			if (buf1.tms_cstime != 0) {
-				tst_resm(TFAIL, "Error: times() report "							"%d child system time",
-						buf1.tms_cstime);
-				fail=1;
-			}
-
-			pid2 = fork();
-			if (pid2 < 0) {
-				tst_brkm(TFAIL, cleanup, "Fork failed");
-				/*NOTREACHED*/
-			} else if (pid2 == 0) {
-				for (i = 0; i < 2000000; i++);
-				/*
-				 * Atleast some CPU time must be used
-				 * even in the child process (thereby
-				 * making it independent of the
-				 * processor speed). In fact the child
-				 * uses twice as much CPU time.
-				 */
-				start_time = time(NULL);
-				for (;;) {
-					if (times(&buf2) == (clock_t)-1) {
-						tst_resm(TFAIL,
-							"Call to times "
-							"failed, "
-							"errno = %d",
-							errno);
-						exit(1);
-					}
-					end_time = time(NULL);
-					if ((end_time - start_time)
-							> 10) {
-						break;
-					}
-				}
-				exit(0);
-			}
-			waitpid(pid2, &status, 0);
-			if (WEXITSTATUS(status) != 0) {
-				tst_resm(TFAIL, "Call to times(2) "
-						"failed in child");
-			}
-			if (times(&buf2) == (clock_t)-1) {	
-				TEST_ERROR_LOG(TEST_ERRNO);
-				tst_resm(TFAIL, "Call to times failed "
-						"errno = %d", errno);
-				fail=1;
-			}
-			if (buf1.tms_utime > buf2.tms_utime) {
-				tst_resm(TFAIL, "Error: parents's "
-					 "user time(%d) before child "
-					 "> parent's user time (%d) "
-					 "after child",
-					 buf1.tms_utime,
-					 buf2.tms_utime);
-				fail=1;
-			}
-			if (buf2.tms_cutime == 0) {
-				tst_resm(TFAIL, "Error: times() "
-					 "report %d child user "
-					 "time should be > than "
-					 "zero", buf2.tms_cutime);
-				fail=1;
-			}
-			if (buf2.tms_cstime == 0) {
-				tst_resm(TFAIL, "Error: times() "
-					 "report %d child system time "
-					 "should be > than zero",
-					 buf2.tms_cstime);
-				fail=1;
-			}
-			if (fail == 0) {
-				tst_resm(TPASS, "%s: Functionality "
-				"test passed", TCID);
-			}
-					
-		} else {
-			tst_resm(TPASS, "%s call succeeded", TCID);
-		}
-	}
-	cleanup();
-	/*NOTREACHED*/
-}
-
-/*
- * setup()
- *	performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -c option.
-	 */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup()
- *	performs all ONE TIME cleanup for this test at
- *	completion or premature exit
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-	/*NOTREACHED*/
-}
diff --git a/winsup/testsuite/winsup.api/ltp/truncate01.c b/winsup/testsuite/winsup.api/ltp/truncate01.c
deleted file mode 100644
index 1e2931605..000000000
--- a/winsup/testsuite/winsup.api/ltp/truncate01.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* 
- * Test Name: truncate01
- *
- * Test Description:
- *  Verify that, truncate(2) succeeds to truncate a file to a specified
- *  length.
- *
- * Expected Result:
- *  truncate(2) should return a value 0 and the length of the file after 
- *  truncation should be equal to the length it is truncated to.
- *	
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  truncate01 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *  This test should be run by 'non-super-user' only.
- *
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TESTFILE	"testfile"		/* file under test */
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define BUF_SIZE	256			/* buffer size */
-#define FILE_SIZE	1024			/* test file size */
-#define TRUNC_LEN	256			/* truncation length */
-
-const char *TCID="truncate01";	/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test conditions */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={0};
-
-void setup();			/* setup function for the test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat(2) struct contents */
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	off_t file_length;	/* test file length */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-
-		/* 
-		 * Call truncate(2) to truncate a test file to a 
-		 * specified length.
-		 */
-		TEST(truncate(TESTFILE, TRUNC_LEN));
-
-		/* check return code of truncate(2) */
-		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL,
-				 "truncate(%s, %d) Failed, errno=%d : %s",
-				 TESTFILE, TRUNC_LEN, TEST_ERRNO,
-				 strerror(TEST_ERRNO));
-		} else {
-			/*
-			 * Perform functional verification if test
-			 * executed without (-f) option.
-			 */
-			if (STD_FUNCTIONAL_TEST) {
-				/*
-			 	 * Get the testfile information using
-				 * stat(2).
-				 */
-				if (stat(TESTFILE, &stat_buf) < 0) {
-					tst_brkm(TFAIL, cleanup, "stat(2) of "
-						"%s failed, error:%d",
-						 TESTFILE, errno);
-					/*NOTREACHED*/
-				}
-				stat_buf.st_mode &= ~S_IFREG;
-				file_length = stat_buf.st_size;
-
-				/*
-				 * Check for expected size of testfile after
-				 * truncate(2) on it.
-				 */
-				if (file_length != TRUNC_LEN) {
-					tst_resm(TFAIL, "%s: Incorrect file "
-						"size %d, Expected %d",
-						TESTFILE, file_length,
-						TRUNC_LEN);
-				} else {
-					tst_resm(TPASS, "Functionality of "
-						"truncate(%s, %d) successful",
-						 TESTFILE, TRUNC_LEN);
-				}
-			} else {
-				tst_resm(TPASS, "%s call succeeded", TCID);
-			}
-		}
-		Tst_count++;			/* incr TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and change directory to it.
- *  Fill the buffer with some arbitrary data to be written to a file.
- *  Create a test file under temporary directory and close it
- *  write arbitrary data into testfile.
- */
-void 
-setup()
-{
-	int fd, i;			/* file handler for testfile */
-	int c, c_total = 0;		/* no. bytes to be written to file */
-	char tst_buff[BUF_SIZE];	/* buffer to hold data */
-
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	/* Fill the test buffer with the known data */
-	for (i = 0; i < BUF_SIZE; i++) {
-		tst_buff[i] = 'a';
-	}
-
-	/* Creat a testfile under temporary directory */
-	if ((fd = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-
-	/* Write to the file 1k data from the buffer */
-	while (c_total < FILE_SIZE) {
-		if ((c = write(fd, tst_buff, sizeof(tst_buff))) <= 0) {
-			tst_brkm(TBROK, cleanup,
-				 "write(2) on %s Failed, errno=%d : %s",
-				 TESTFILE, errno, strerror(errno));
-			/*NOTREACHED*/
-		} else {
-			c_total += c;
-		}
-	}
-
-	/* Close the testfile after writing data into it */
-	if (close(fd) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-}	/* End setup() */
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/truncate02.c b/winsup/testsuite/winsup.api/ltp/truncate02.c
deleted file mode 100644
index 4ba802949..000000000
--- a/winsup/testsuite/winsup.api/ltp/truncate02.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* 
- * Test Name: truncate02
- *
- * Test Description:
- *  Verify that, truncate(2) succeeds to truncate a file to a certain length,
- *  but the attempt to read past the truncated length will fail.  
- *
- * Expected Result:
- *  truncate(2) should return a value 0 and the attempt to read past the 
- *  truncated length will fail. In case where the file before truncation was 
- *  shorter, the bytes between the old and new should  be all zeroes.
- *	
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Create temporary directory.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *   Delete the temporary directory created.
- *
- * Usage:  <for command-line>
- *  truncate02 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *  This test should be run by 'non-super-user' only.
- *
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "usctest.h"
-
-#define TESTFILE	"testfile"		/* file under test */
-#define FILE_MODE	S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
-#define BUF_SIZE	256			/* buffer size */
-#define FILE_SIZE	1024			/* test file size */
-#define TRUNC_LEN1	256			/* truncation length */
-#define TRUNC_LEN2	512			/* truncation length */
-
-const char *TCID="truncate02";	/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test conditions */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int fd;				/* file descriptor of testfile */
-char tst_buff[BUF_SIZE];	/* buffer to hold testfile contents */
-int exp_enos[]={0};
-
-void setup();			/* setup function for the test */
-void cleanup(void) __attribute__((noreturn));			/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	struct stat stat_buf;	/* stat(2) struct contents */
-	int lc, i;		/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	off_t file_length2;	/* test file length */
-	off_t file_length1;	/* test file length */
-	int rbytes;		/* bytes read from testfile */
-	int read_len = 0;	/* total no. of bytes read from testfile */
-	int err_flag = 0;	/* error indicator flag */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count = 0;
-
-		/* 
-		 * Call truncate(2) to truncate a test file to a 
-		 * specified length (TRUNC_LEN1).
-		 */
-		TEST(truncate(TESTFILE, TRUNC_LEN1));
-
-		/* check return code of truncate(2) */
-		if (TEST_RETURN == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, \
-				 "truncate(%s, %d) Failed, errno=%d : %s",
-				 TESTFILE, TRUNC_LEN1, TEST_ERRNO,
-				 strerror(TEST_ERRNO));
-		} else {
-			/*
-			 * Perform functional verification if test
-			 * executed without (-f) option.
-			 */
-			if (STD_FUNCTIONAL_TEST) {
-				/*
-			 	 * Get the testfile information using
-				 * stat(2).
-				 */
-				if (stat(TESTFILE, &stat_buf) < 0) {
-					tst_brkm(TFAIL, cleanup, "stat(2) of "
-						"%s failed after 1st truncate, "
-						"error:%d", TESTFILE, errno);
-					/*NOTREACHED*/
-				}
-				file_length1 = stat_buf.st_size;
-
-				/*
-				 * Set the file pointer of testfile to the 
-				 * beginning of the file.
-				 */
-				if (lseek(fd, 0, SEEK_SET) < 0) {
-					tst_brkm(TFAIL, cleanup, "lseek(2) on "
-						"%s failed after 1st truncate, "
-						"error:%d", TESTFILE, errno);
-					/*NOTREACHED*/
-				}
-
-				/* Read the testfile from the beginning. */
-				while ((rbytes = read(fd, tst_buff, \
-						      sizeof(tst_buff))) > 0) {
-					read_len += rbytes;
-				}
-
-				/*
-				 * Execute truncate(2) again to truncate
-				 * testfile to a size TRUNC_LEN2.
-				 */
-				TEST(truncate(TESTFILE, TRUNC_LEN2));
-
-				/* check return code of truncate(2) */
-				if (TEST_RETURN == -1) {
-					TEST_ERROR_LOG(TEST_ERRNO);
-					tst_resm(TFAIL, "truncate of %s to "
-						"size %d Failed, errno=%d : %s",
-						TESTFILE, TRUNC_LEN2,
-						TEST_ERRNO,
-						strerror(TEST_ERRNO));
-				}
-
-				/*
-				 * Get the testfile information using
-				 * stat(2)
-				 */
-				if (stat(TESTFILE, &stat_buf) < 0) {
-					tst_brkm(TFAIL, cleanup, "stat(2) of "
-						"%s failed after 2nd truncate, "
-						"error:%d", TESTFILE, errno);
-					/*NOTREACHED*/
-				}
-				file_length2 = stat_buf.st_size;
-
-				/*
-				 * Set the file pointer of testfile to the 
-				 * offset TRUNC_LEN1 of testfile.
-				 */
-				if (lseek(fd, TRUNC_LEN1, SEEK_SET) < 0) {
-					tst_brkm(TFAIL, cleanup, "lseek(2) on "
-						"%s failed after 2nd truncate, "
-						"error:%d", TESTFILE, errno);
-					/*NOTREACHED*/
-				}
-
-				/* Read the testfile contents till EOF */
-				while((rbytes = read(fd, tst_buff, \
-					sizeof(tst_buff))) > 0) {
-					for (i = 0; i < rbytes; i++) {
-						if (tst_buff[i] != 0) {
-							err_flag++;
-						}
-					}
-				}
-
-				/*
-				 * Check for expected size of testfile after
-				 * issuing truncate(2) on it.
-				 */
-				if ((file_length1 != TRUNC_LEN1) || \
-					(file_length2 != TRUNC_LEN2) || \
-					(read_len != TRUNC_LEN1) || \
-					(err_flag != 0)) {
-					tst_resm(TFAIL, "Functionality of "
-						"truncate(2) on %s Failed",
-						 TESTFILE);
-				} else {
-					tst_resm(TPASS, \
-					 	"Functionality of truncate(2) "
-						"on %s successful", TESTFILE);
-				}
-			} else {
-				tst_resm(TPASS, "%s call succeeded", TCID);
-			}
-		}
-		Tst_count++;			/* incr. TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  Create a temporary directory and change directory to it.
- *  Create a test file under temporary directory and write some
- *  data into it.
- */
-void 
-setup()
-{
-	int i;			/* counter variable */
-	int wbytes;		/* bytes written to testfile */
-	int write_len = 0;	/* total no. of bytes written to testfile */
-
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-
-	/* Fill the test buffer with the known data */
-	for (i = 0; i < BUF_SIZE; i++) {
-		tst_buff[i] = 'a';
-	}
-
-	/* Creat a testfile  and write some data into it */
-	if ((fd = open(TESTFILE, O_RDWR|O_CREAT, FILE_MODE)) == -1) {
-		tst_brkm(TBROK, cleanup,
-			 "open(%s, O_RDWR|O_CREAT, %o) Failed, errno=%d : %s",
-			 TESTFILE, FILE_MODE, errno, strerror(errno));
-		/*NOTREACHED*/
-	}
-
-	/* Write to the file 1k data from the buffer */
-	while (write_len < FILE_SIZE) {
-		if ((wbytes = write(fd, tst_buff, sizeof(tst_buff))) <= 0) {
-			tst_brkm(TBROK, cleanup,
-				 "write(2) on %s Failed, errno=%d : %s",
-				 TESTFILE, errno, strerror(errno));
-		} else {
-			write_len += wbytes;
-		}
-	}
-}	/* End setup() */
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *	       completion or premature exit.
- *  Close the temporary file opened for reading/writing.
- *  Remove the test directory and testfile created in the setup.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* Close the testfile after writing data into it */
-	if (close(fd) == -1) {
-		tst_brkm(TFAIL, NULL,
-			 "close(%s) Failed, errno=%d : %s",
-			 TESTFILE, errno, strerror(errno));
-	}
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/ulimit01.c b/winsup/testsuite/winsup.api/ltp/ulimit01.c
deleted file mode 100644
index c3f09fba3..000000000
--- a/winsup/testsuite/winsup.api/ltp/ulimit01.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: ulimit01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for ulimit(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 6
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) ulimit(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- * 	The libcuts.a and libsys.a libraries must be included in 
- *	the compilation of this test.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the ulimit(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	ulimit(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <ulimit.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="ulimit01"; 	/* Test program identifier.    */
-int TST_TOTAL=6;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int cmd;
-long limit;	/* saved limit */
-
-struct limits_t {
-   int cmd;
-   long newlimit;
-   int nlim_flag;	/* special flag for UL_SETFSIZE records  */
-   int exp_fail;
-} Scenarios[] = {
-
-  { UL_GETFSIZE, -1, 0, 0 },
-  { UL_SETFSIZE, -1, 0, 1 },	/* negative test */
-  { UL_SETFSIZE, -2, 1, 0 },	/* case case: must be after UL_GETFSIZE */
-  { UL_SETFSIZE, -2, 2, 0 },	/* case case: must be after UL_GETFSIZE */
-
-#if UL_GMEMLIM
-  { UL_GMEMLIM, -1, 0, 0 },
-#endif
-#if UL_GDESLIM
-  { UL_GDESLIM, -1, 0, 0 },
-#endif
-#if UL_GSHMEMLIM
-  { UL_GSHMEMLIM, -1, 0, 0 },
-#endif
-  
-};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    int i;		/* inner loop (test case) counter */
-    const char *msg;		/* message returned from parse_opts */
-    int tmp;
-
-    TST_TOTAL = sizeof(Scenarios)/sizeof(struct limits_t);
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	for ( i=0; i<TST_TOTAL; i++) {
-
-	    cmd=Scenarios[i].cmd;
-	    limit=Scenarios[i].newlimit;
-
-	    /* 
-	     * Call ulimit(2)
-	     */
-	    TEST(ulimit(cmd, limit));
-	    
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-		if ( Scenarios[i].exp_fail ) {
-		    if ( STD_FUNCTIONAL_TEST ) {
-			tst_resm(TPASS, "ulimit(%d, %d) Failed, errno=%d : %s", cmd, limit,
-					TEST_ERRNO, strerror(TEST_ERRNO));
-		    }
-		} else {
-		    tst_resm(TFAIL, "ulimit(%d, %d) Failed, errno=%d : %s", cmd, limit,
-			   	    TEST_ERRNO, strerror(TEST_ERRNO));
-		}
-	    } else {
-		if ( Scenarios[i].exp_fail ) {
-		    tst_resm(TFAIL, "ulimit(%d, %d) returned %d",
-		       		    cmd, limit, TEST_RETURN);
-		} else if ( STD_FUNCTIONAL_TEST ) {
-		    tst_resm(TPASS, "ulimit(%d, %d) returned %d",
-		       		    cmd, limit, TEST_RETURN);
-		}
-
-		/*
-		 * Save the UL_GETFSIZE return value in the newlimit field
-		 * for UL_SETFSIZE test cases.
-		 */
-		if ( cmd == UL_GETFSIZE ) {
-		    for (tmp=i+1; tmp<TST_TOTAL; tmp++) {
-			if ( Scenarios[tmp].nlim_flag == 1 ) {
-			    Scenarios[tmp].newlimit = TEST_RETURN;
-			}
-			if ( Scenarios[tmp].nlim_flag == 2 ) {
-			    Scenarios[tmp].newlimit = TEST_RETURN-1;
-			}
-		    }
-		}
-	    }
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/umask01.c b/winsup/testsuite/winsup.api/ltp/umask01.c
deleted file mode 100644
index fb86f0d31..000000000
--- a/winsup/testsuite/winsup.api/ltp/umask01.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: umask01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for umask(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) umask(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the umask(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	umask(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="umask01"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call umask(2)
-	 */
-	TEST(umask(022));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "umask(022) Failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "umask(022) returned %d", TEST_RETURN);
-	    } 
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    void trapper();
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/umask02.c b/winsup/testsuite/winsup.api/ltp/umask02.c
deleted file mode 100644
index 9a1c61c53..000000000
--- a/winsup/testsuite/winsup.api/ltp/umask02.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	umask02.c
- *
- * DESCRIPTION
- *	Check that umask changes the mask, and that the previous
- *	value of the mask is returned correctly for each value.
- *
- * ALGORITHM
- *	For each mask value (9 bits) set mask, and check that the return
- *	corresponds to the previous value set.
- *
- * USAGE:  <for command-line>
- *	umask02 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions
- *	None
- */
-
-#include <sys/stat.h>
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "umask02";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int argc, char **argv)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	int uret = 0, i, mskval = 0000;
-
-	/* parse standard options */
-	if ((msg = parse_opts(argc, argv, (option_t *)NULL, NULL)) !=
-		(char *) NULL) {
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();
-
-	/* Check for looping state if -i option is given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		for (umask(++mskval), i = 1; mskval < 01000;
-			uret = umask(++mskval), i++) {
-			if ((uret != mskval - 1) && (mskval != 0000)) {
-				tst_brkm(TBROK, cleanup, "bad mask value "
-					 "returned");
-				/*NOTREACHED*/
-			} else {
-				 tst_resm(TPASS, "umask(%d) susuccessfully "
-						"returned %d.", mskval, uret);
-			}
-		}
-	mskval = 0000;
-	uret = 0;
-	tst_resm(TINFO, "end of loop %d\n", lc);
-	}
-	cleanup();
-	/*NOTREACHED*/
-}
-
-/*
- * setup()
- *	performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -c option.
-	 */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup()
- *	performs all ONE TIME cleanup for this test at
- *	completion or premature exit
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-	/*NOTREACHED*/
-}
diff --git a/winsup/testsuite/winsup.api/ltp/umask03.c b/winsup/testsuite/winsup.api/ltp/umask03.c
deleted file mode 100644
index 341da7507..000000000
--- a/winsup/testsuite/winsup.api/ltp/umask03.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	umask01.c
- *
- * DESCRIPTION
- *	Check that umask changes the mask, and that the previous
- *	value of the mask is returned correctly for each value.
- *
- * ALGORITHM
- *	For each mask value (9 bits) set mask, and check that the return
- *	corresponds to the previous value set.
- *
- * USAGE:  <for command-line>
- *		umask01 [-c n] [-i n] [-I x] [-P x] [-t]
- *		where,  -c n : Run n copies concurrently.
- *			-i n : Execute test n times.
- *			-I x : Execute test for x seconds.
- *			-P x : Pause for x seconds between iterations.
- *			-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions
- *	None
- */
-
-#include "test.h"
-#include "usctest.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-const char *TCID = "umask01";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-char filname[40];
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int
-main(int argc, char **argv)
-{
-	int lc;
-	const char *msg;
-	
-	struct stat statbuf;
-	unsigned mskval = 0000;
-	int fildes, i;
-	unsigned low9mode;
-
-	/* parse standard options */
-	if ((msg = parse_opts(argc, argv, (option_t *) NULL, NULL))
-	    != (char *) NULL) {
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();			/* global setup */
-
-	/* check looping state if -i option is given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		for (umask(mskval = 0077), i = 1; mskval < 01000;
-				i++, umask(++mskval)) {
-			unlink(filname);
-			if ((fildes = creat(filname, 0777)) == -1) {
-				tst_resm(TBROK, "cannot create "
-					 "file with mskval 0%o %d",
-					 mskval, mskval);
-			} else {
-				if (fstat(fildes, &statbuf) != 0) {
-					tst_resm(TBROK, "cannot fstat file");
-				} else {
-					low9mode = statbuf.st_mode & 0777;
-					if (low9mode != (~mskval & 0777)) {
-						tst_brkm(TBROK, cleanup,
-							 "got %0 expected %o"
-							 "mask didnot take",
-							 low9mode,
-							 (~mskval & 0777));
-						/*NOTREACHED*/
-					} else {
-						tst_resm(TPASS, "Test "
-							"condition: %d, umask: "
-							"0%o", i, mskval);
-					}
-				}
-			}
-			close(fildes);
-		}
-	}
-	cleanup();
-	/*NOTREACHED*/
-}
-
-/*
- * setup
- *	performs all ONE TIME setup for this test
- */
-void
-setup()
-{
-	/* capture signals */
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* make temp dir and cd to it */
-	tst_tmpdir();
-
-	sprintf(filname, "umask2.%d", getpid());
-}
-
-/*
- * cleanup
- *	performs all ONE TIME cleanup for this test at completion or
- *	premature exit
- */
-void
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified
-	 * print errno log if that option was specified
-	 */
-	TEST_CLEANUP;
-
-	/*
-	 * cleanup the temporary files and the temporary directory
-	 */
-	unlink(filname);
-	tst_rmdir();
-
-	/*
-	 * exit with return code appropriate for results
-	 */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/uname01.c b/winsup/testsuite/winsup.api/ltp/uname01.c
deleted file mode 100644
index 36b166786..000000000
--- a/winsup/testsuite/winsup.api/ltp/uname01.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: uname01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for uname(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) uname(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the uname(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	uname(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/utsname.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="uname01"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-struct utsname un;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call uname(2)
-	 */
-	TEST(uname(&un));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "uname(&un) Failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "uname(&un) returned %d", TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    void trapper();
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/unlink05.c b/winsup/testsuite/winsup.api/ltp/unlink05.c
deleted file mode 100644
index 3aae0cf0d..000000000
--- a/winsup/testsuite/winsup.api/ltp/unlink05.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: unlink05
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for unlink(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) unlink(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the unlink(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	unlink(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-void create_file();
-
-
-
-const char *TCID="unlink05"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-        /*
-	 *  Call unlink(2)
-	 */
-	TEST(unlink(fname));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "unlink(%s) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "unlink(%s) returned %d", fname, TEST_RETURN);
-	    } 
-	    /* recreate file for next loop */
-	    create_file();
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    create_file();
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-void
-create_file()
-{
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-       tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s",
-	       fname, errno, strerror(errno));
-    }
-}
diff --git a/winsup/testsuite/winsup.api/ltp/unlink06.c b/winsup/testsuite/winsup.api/ltp/unlink06.c
deleted file mode 100644
index a62a268c0..000000000
--- a/winsup/testsuite/winsup.api/ltp/unlink06.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: unlink06
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: unlink(2) of a FIFO
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 03/30/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) unlink(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the unlink(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	unlink(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void create_file();
-void cleanup(void) __attribute__((noreturn));
-
-
-const char *TCID="unlink06"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char Fname[255];
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	create_file();
-
-        /*
-	 *  Call unlink(2)
-	 */
-	TEST(unlink(Fname));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "unlink(%s) Failed, errno=%d : %s", Fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else if ( STD_FUNCTIONAL_TEST ) {
-	    if ( access(Fname, F_OK) != -1 ) {
-	        tst_resm(TFAIL,
-	           "unlink(%s) returned %d, but access says file still exists.", 
-	           Fname, TEST_RETURN);
-	    }
-	    else {
-	        tst_resm(TPASS, "unlink(%s) returned %d", Fname, TEST_RETURN);
-	    }
-	}
-	else
-	    Tst_count++;
-	
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    sprintf(Fname, "fifo_unlink%d", getpid());
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}	/* End cleanup() */
-
-/******************************************************************
- *
- ******************************************************************/
-void
-create_file()
-{
-    if(mkfifo(Fname, 0777) == -1) {
-        tst_brkm(TBROK, cleanup,
-	   "mkfifo(%s, 0777) failed errno:%d %s\n", Fname,
-	   errno, strerror(errno));
-    }
-}
diff --git a/winsup/testsuite/winsup.api/ltp/unlink07.c b/winsup/testsuite/winsup.api/ltp/unlink07.c
deleted file mode 100644
index 133109621..000000000
--- a/winsup/testsuite/winsup.api/ltp/unlink07.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: unlink07
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: unlink(2) negative testcases
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 03/30/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1-8) See Testcases structure below.
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the unlink(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	unlink(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/param.h>		/* for PATH_MAX */
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-extern char *get_high_address();
-
-const char *TCID="unlink07";		/* Test program identifier.    */
-int TST_TOTAL=6;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int longpath_setup();
-int no_setup();
-int filepath_setup();
-char Longpathname[PATH_MAX+2];
-char High_address[64];
-
-struct test_case_t {
-   const char *pathname;
-   const char *desc;
-   int exp_errno;
-   int (*setupfunc)();
-} Test_cases[] = {
-    { "nonexistfile", "non-existent file", ENOENT, no_setup},
-    { "", "path is empty string", ENOENT, no_setup},
-    { "nefile/file", "path contains a non-existent file",
-		ENOENT, no_setup },
-    { High_address, "address beyond address space", EFAULT, no_setup },
-#ifndef __CYGWIN__
-    { "file/file", "path contains a regular file",
-		ENOTDIR, filepath_setup },
-#endif
-    { High_address, "address beyond address space", EFAULT, no_setup },
-    { Longpathname, "pathname too long", ENAMETOOLONG, longpath_setup },
-    { (char *)-1, "negative address", EFAULT, no_setup },
-    { NULL, NULL, 0, no_setup }
-};
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    const char *fname;
-    const char *desc;
-    int ind;
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-
-        for (ind=0; Test_cases[ind].desc != NULL; ind++ ) {
-
-	    fname = Test_cases[ind].pathname;
-	    desc = Test_cases[ind].desc;
-
-	    if ( fname == High_address )
-		fname = get_high_address();
-       
-            /*
-	     *  Call unlink(2)
-	     */
-	    TEST(unlink(fname));
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-	        if ( STD_FUNCTIONAL_TEST ) {
-		    if ( TEST_ERRNO == Test_cases[ind].exp_errno )
-	                tst_resm(TPASS, "unlink(<%s>) Failed, errno=%d",
-			    desc, TEST_ERRNO);
-		    else
-			tst_resm(TFAIL,
-			    "unlink(<%s>) Failed, errno=%d, expected errno:%d",
-                            desc, TEST_ERRNO, Test_cases[ind].exp_errno);
-	        }
-		else
-		   Tst_count++;
-	    } else  {
-	        tst_resm(TFAIL,
-		    "unlink(<%s>) returned %d, expected -1, errno:%d",
-		    desc, TEST_RETURN, Test_cases[ind].exp_errno);
-	    }
-	}
-	
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    int ind;
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    for (ind=0; Test_cases[ind].desc != NULL; ind++ ) {
-	Test_cases[ind].setupfunc();
-    }
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    chmod("unwrite_dir", 0777);
-    chmod("unsearch_dir", 0777);
-
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}	/* End cleanup() */
-
-/******************************************************************
- *
- ******************************************************************/
-int
-no_setup()
-{
-    return 0;
-}
-
-/******************************************************************
- *
- ******************************************************************/
-int
-longpath_setup()
-{
-   int ind;
-
-    for(ind=0; ind<= PATH_MAX+1; ind++) {
-	Longpathname[ind] = 'a';
-    }
-    return 0;
-
-}
-/******************************************************************
- *
- ******************************************************************/
-int
-filepath_setup()
-{
-    int fd;
-
-    if ( (fd=creat("file", 0777)) == -1 ) {
-	tst_brkm(TBROK, cleanup, "creat(file) failed, errno:%d %s",
-	    errno, strerror(errno));
-    }
-    close(fd);
-    return 0;
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/unlink08.c b/winsup/testsuite/winsup.api/ltp/unlink08.c
deleted file mode 100644
index e793b46f2..000000000
--- a/winsup/testsuite/winsup.api/ltp/unlink08.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: unlink08
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: unlink(2) negative testcases
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 3
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: Richard Logan
- * 
- *    CO-PILOT		: William Roske
- * 
- *    DATE STARTED	: 03/30/94
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1-3) See Testcases structure below.
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the unlink(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	unlink(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include "test.h"
-#include "usctest.h"
-
-void setup();
-void cleanup(void) __attribute__((noreturn));
-
-
-
-const char *TCID="unlink08";		/* Test program identifier.    */
-int TST_TOTAL=3;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int unwrite_dir_setup();
-int unsearch_dir_setup();
-int dir_setup();
-int no_setup();
-
-struct test_case_t {
-   const char *pathname;
-   const char *desc;
-   int (*setupfunc)();
-   int exp_ret;		/* -1 means error, 0 means != -1 */
-   int exp_errno;
-} Test_cases[] = {
-    { "unwrite_dir/file", "unwritable directory", unwrite_dir_setup,
-		-1, EACCES},
-    { "unsearch_dir/file", "unsearchable directory", unsearch_dir_setup,
-		-1, EACCES },
-#ifdef linux
-    { "regdir", "directory", dir_setup, -1, EISDIR},
-#else
-    { "regdir", "directory", dir_setup, -1, EPERM},
-#endif
-
-    { NULL, NULL, no_setup, -1, 0 }
-};
-
-/***********************************************************************
- * Main
- ***********************************************************************/
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;	/* message returned from parse_opts */
-    const char *fname;
-    const char *desc;
-    int ind;
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *)NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-
-        for (ind=0; Test_cases[ind].desc != NULL; ind++ ) {
-
-	    fname = Test_cases[ind].pathname;
-	    desc = Test_cases[ind].desc;
-       
-            /*
-	     *  Call unlink(2)
-	     */
-	    TEST(unlink(fname));
-	
-	    /* check return code */
-	    if ( TEST_RETURN == -1 ) {
-	        if ( Test_cases[ind].exp_ret == -1 ) { /* neg test */
-	            if ( STD_FUNCTIONAL_TEST ) {
-		        if ( TEST_ERRNO == Test_cases[ind].exp_errno )
-	                    tst_resm(TPASS, "unlink(<%s>) Failed, errno=%d",
-			        desc, TEST_ERRNO);
-		        else
-			    tst_resm(TFAIL,
-			        "unlink(<%s>) Failed, errno=%d, expected errno:%d",
-                                desc, TEST_ERRNO, Test_cases[ind].exp_errno);
-	            }
-		    else
-		       Tst_count++;
-		}
-		else {
-		    tst_resm(TFAIL, "unlink(<%s>) Failed, errno=%d",
-			desc, TEST_ERRNO);
-		}
-	    } else  {
-		if ( Test_cases[ind].exp_ret == -1 ) {
-	            tst_resm(TFAIL,
-		        "unlink(<%s>) returned %d, expected -1, errno:%d",
-		        desc, TEST_RETURN, Test_cases[ind].exp_errno);
-		}
-		else if ( STD_FUNCTIONAL_TEST ) {
-	            tst_resm(TPASS,
-		        "unlink(<%s>) returned %d",
-		        desc, TEST_RETURN);
-		}
-		else
-		    Tst_count++;
-		Test_cases[ind].setupfunc(1);
-	    }
-	}
-	
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    int ind;
-    int postest = 0;
-
-    /* capture signals */
-    tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    if ( geteuid() == 0 ) {
-	postest++;
-    }
-
-    for (ind=0; Test_cases[ind].desc != NULL; ind++ ) {
-	if ( Test_cases[ind].exp_errno == EACCES && postest )
-	    Test_cases[ind].exp_ret=0;	/* set as a pos test */
-	Test_cases[ind].setupfunc(0);
-    }
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    chmod("unwrite_dir", 0777);
-    chmod("unsearch_dir", 0777);
-
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-
-}	/* End cleanup() */
-
-/******************************************************************
- *
- ******************************************************************/
-int
-unwrite_dir_setup(flag)
-int flag;
-{
-    int fd;
-
-    if ( ! flag ) {	/* initial setup */
-        if (mkdir("unwrite_dir", 0777) == -1 ) {
-	    tst_brkm(TBROK, cleanup, 
-		"mkdir(unwrite_dir, 0777) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-
-        if ( (fd=creat("unwrite_dir/file", 0777)) == -1 ) {
-	    tst_brkm(TBROK, cleanup, 
-		"creat(unwrite_dir/file, 0777) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-        close(fd);
-
-        if ( chmod("unwrite_dir", 0555) == -1 ) {    
-	    tst_brkm(TBROK, cleanup, 
-		"chmod(unwrite_dir, 0555) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-    }
-    else {	/* resetup */
-        if ( chmod("unwrite_dir", 0777) == -1 ) {    
-	    tst_brkm(TBROK, cleanup, 
-		"chmod(unwrite_dir, 0777) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-
-        if ( (fd=creat("unwrite_dir/file", 0777)) == -1 ) {
-	    tst_brkm(TBROK, cleanup, 
-		"creat(unwrite_dir/file, 0777) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-        close(fd);
-
-        if ( chmod("unwrite_dir", 0555) == -1 ) {    
-	    tst_brkm(TBROK, cleanup, 
-		"chmod(unwrite_dir, 0555) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-    }
-    return 0;
-}
-
-/******************************************************************
- *
- ******************************************************************/
-int
-unsearch_dir_setup(flag)
-int flag;
-{
-    int fd;
-
-    if ( ! flag ) {	/* initial setup */
-        if (mkdir("unsearch_dir", 0777) == -1 ) {
-	    tst_brkm(TBROK, cleanup, 
-		"mkdir(unsearch_dir, 0777) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-
-        if ( (fd=creat("unsearch_dir/file", 0777)) == -1 ) {    
-	    tst_brkm(TBROK, cleanup, 
-		"creat(unsearch_dir/file, 0777) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-        close(fd);
-
-        if ( chmod("unsearch_dir", 0666) == -1 ) {    
-	    tst_brkm(TBROK, cleanup, 
-		"chmod(unsearch_dir, 0666) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-    }
-    else {	/* resetup */
-        if ( chmod("unsearch_dir", 0777) == -1 ) {    
-	    tst_brkm(TBROK, cleanup, 
-		"chmod(unsearch_dir, 0777) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-
-        if ( (fd=creat("unsearch_dir/file", 0777)) == -1 ) {    
-	    tst_brkm(TBROK, cleanup, 
-		"creat(unsearch_dir/file, 0777) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-        close(fd);
-
-        if ( chmod("unsearch_dir", 0666) == -1 ) {    
-	    tst_brkm(TBROK, cleanup, 
-		"chmod(unsearch_dir, 0666) failed, errno:%d %s",
-	        errno, strerror(errno));
-        }
-    }
-    return 0;
-}
-
-/******************************************************************
- *
- ******************************************************************/
-int
-dir_setup(flag)
-int flag;
-{
-    if (mkdir("regdir", 0777) == -1 ) {
-	tst_brkm(TBROK, cleanup, 
-	    "mkdir(unwrite_dir, 0777) failed, errno:%d %s",
-	    errno, strerror(errno));
-    }
-    return 0;
-}
-
-/******************************************************************
- *
- ******************************************************************/
-int
-no_setup(flag)
-int flag;
-{
-	return 0;
-}
diff --git a/winsup/testsuite/winsup.api/ltp/vfork01.c b/winsup/testsuite/winsup.api/ltp/vfork01.c
deleted file mode 100644
index 2792ce08b..000000000
--- a/winsup/testsuite/winsup.api/ltp/vfork01.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * Name: vfork01
- *
- * Test Description:
- *  Fork a process using vfork() and verify that, the attribute values like
- *  euid, ruid, suid, egid, rgid, sgid, umask, inode and device number of
- *  root and current working directories are same as that of the parent 
- *  process.
- *   
- * Expected Result:
- *  The attribute values like euid, ruid, suid, egid, rgid, sgid, umask, inode
- *  and device number of root and current working directory of the parent and
- *  child processes should be equal.
- *
- * Algorithm:
- *  Setup:
- *   Setup signal handling.
- *   Pause for SIGUSR1 if option specified.
- *
- *  Test:
- *   Loop if the proper options are given.
- *   Execute system call
- *   Check return code, if system call failed (return=-1)
- *   	Log the errno and Issue a FAIL message.
- *   Otherwise,
- *   	Verify the Functionality of system call	
- *      if successful,
- *      	Issue Functionality-Pass message.
- *      Otherwise,
- *		Issue Functionality-Fail message.
- *  Cleanup:
- *   Print errno log and/or timing stats if options given
- *
- * Usage:  <for command-line>
- *  vfork01 [-c n] [-e] [-f] [-i n] [-I x] [-p x] [-t]
- *	where,	-c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-f   : Turn off functionality Testing.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions:
- *  None.
- *
- */
-
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID="vfork01";	/* Test program identifier.    */
-int TST_TOTAL=1;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-int exp_enos[]={0};
-
-/* Variables to hold parent/child eff/real/saved uid/gid values */
-uid_t  Peuid, Ceuid, Csuid, Psuid, Pruid, Cruid;
-gid_t  Pegid, Cegid, Psgid, Csgid, Prgid, Crgid;
-mode_t Pumask,Cumask;
-
-char Pcwd_buf [PATH_MAX], Ccwd_buf [PATH_MAX];
-char  *Pcwd, *Ccwd;		/*
-				 * pathname of working directory of
-				 * child/parent process.
-				 */
-/* stat structure to hold directory/inode information for parent/child */
-struct stat StatPbuf;
-struct stat StatCbuf;
-struct stat Stat_cwd_Pbuf;
-struct stat Stat_cwd_Cbuf;
-
-void setup();			/* Main setup function of test */
-void cleanup() __attribute__((noreturn));/* cleanup function for the test */
-
-int
-main(int ac, char **av)
-{
-	int lc;			/* loop counter */
-	const char *msg;	/* message returned from parse_opts */
-	pid_t cpid;		/* process id of the child process */
-	int exit_status;	/* exit status of child process */
-    
-	/* Parse standard options given to run the test. */
-	msg = parse_opts(ac, av, (option_t *) NULL, NULL);
-	if (msg != (char *) NULL) {
-		tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-		tst_exit();
-	}
-
-	/* Perform global setup for test */
-	setup();
-
-	/* set the expected errnos... */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Check looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* Reset Tst_count in case we are looping. */
-		Tst_count=0;
-
-		/* 
-		 * Call vfork(2) to create a child process without
-		 * fully copying the address space of parent.
-		 */
-		TEST(vfork());
-
-		/* check return code of vfork() */
-		if ((cpid = TEST_RETURN) == -1) {
-			TEST_ERROR_LOG(TEST_ERRNO);
-			tst_resm(TFAIL, "vfork() Failed, errno=%d : %s",
-				 TEST_ERRNO, strerror(TEST_ERRNO));
-		} else if (cpid == 0) {		/* Child process */
-			/*
-			 * Perform functional verification if test
-			 * executed without (-f) option.
-			 */
-			if (STD_FUNCTIONAL_TEST) {
-				/*
-				 * Get the euid, ruid, egid, rgid, umask value
-				 * and the current working directory of the
-				 * child process
-				 */
-#if (linux)
-				if (getresuid(&Cruid, &Ceuid, &Csuid) < 0) {
-					tst_resm(TFAIL, "getresuid() fails to "
-						"get real/eff./saved uid of "
-						"child process");
-					_exit(1);
-				}
-
-				if (getresgid(&Crgid, &Cegid, &Csgid) < 0) {
-					tst_resm(TFAIL, "getresgid() fails to "
-						"get real/eff./saved gid of "
-						"child process");
-					_exit(1);
-				}
-#else
-				Cruid = getuid ();
-				Ceuid = geteuid ();
-				Csuid = 0;
-				Crgid = getgid ();
-				Cegid = getegid ();
-				Csgid = 0;
-#endif
-				/*
-				 * Get the file mode creation mask value of
-				 * child process by setting value zero and
-				 * restore the previous mask value.
-				 */
-				Cumask = umask(0);
-
-				/*
-				 * Restore the process mask of child to
-				 * previous value.
-				 */
-				umask(Cumask);
-
-				/*
-				 * Get the pathname of current working
-				 * directory for the child process.
-				 */
-				if ((Ccwd = (char *)getcwd(Ccwd_buf, \
-						BUFSIZ)) == NULL) {
-					tst_resm(TFAIL, "getcwd failed for the "
-						"child process");
-					_exit(1);
-				}
-
-				/*
-				 * Get the device number and the inode
-				 * number of "/" directory for the child
-				 * process.
-				 */
-				if (stat("/", &StatCbuf) < 0) {
-					tst_resm(TFAIL, "stat(2) failed to get "
-						"info. of'/' in the child "
-						"process");
-					_exit(1);
-				}
-
-				/*
-				 * Get the device/inode number of "."
-				 * (working directory) for the child process.
-				 */
-				if (stat(Ccwd, &Stat_cwd_Cbuf) < 0) {
-					tst_resm(TFAIL, "stat(2) failed to get "
-						"info. of working irectory in "
-						"the child");
-					_exit(1);
-				}
-
-				/* Now, do the actual comparision */
-				if (Peuid != Ceuid || Pegid != Cegid  || \
-					Psuid != Csuid || Psgid != Csgid  || \
-					Pruid != Cruid || Prgid != Crgid  || \
-					Pumask != Cumask) {
-					tst_resm(TFAIL, "Arribute values of "
-						"parent and child don't match");
-					_exit(1);
-				} else {
-					tst_resm(TINFO, "Arribute values of "
-						"parent and child match");
-				}
-
-				/* Check for the same working directories */
-				if (strcmp(Pcwd, Ccwd) != 0) {
-					tst_resm(TFAIL, "Working directories "
-						"of parent and child don't "
-						"match");
-					_exit(1);
-				} else {
-					tst_resm(TINFO, "Working directories "
-						"of parent and child match");
-				}
-
-				/*
-				 * Check for the same device/inode number of
-				 * '/' directory.
-				 */
-				if ((StatPbuf.st_ino != StatCbuf.st_ino) || \
-					(StatPbuf.st_dev != StatCbuf.st_dev)) {
-					tst_resm(TFAIL, "Device/inode number "
-						"of parent and childs '/' "
-						" don't match");
-					_exit(1);
-				} else {
-					tst_resm(TINFO, "Device/inode number "
-						"of parent and childs '/' "
-						"match");
-				}
-
-				/*
-				 * Check for the same device and inode number
-				 *  of "." (current working directory.
-				 */
-				if ((Stat_cwd_Pbuf.st_ino != \
-					Stat_cwd_Cbuf.st_ino) || \
-					(Stat_cwd_Pbuf.st_dev != \
-					Stat_cwd_Cbuf.st_dev)) {
-					tst_resm(TFAIL, "Device/inode number "
-						"of parent and childs '.' "
-						"don't match");
-					_exit(1);
-				} else {
-					tst_resm(TINFO, "Device/inode number "
-						"of parent and childs '.' "
-						"match");
-				}
-
-				/*
-				 * Exit with normal exit code if everything
-				 * fine
-				 */
-				_exit(0);
-			}
-		} else {	/* parent process */
-			/*
-			 * Let the parent process wait till child completes
-			 * its execution.
-			 */
-			wait(&exit_status);
-
-			/* Check for the exit status of child process */
-			if (WEXITSTATUS(exit_status) == 0) {
-				tst_resm(TPASS, \
-					 "Call of vfork() successful");
-			} else if (WEXITSTATUS(exit_status) == 1) {
-				tst_resm(TFAIL, \
-					 "Child process exited abnormally");
-			}
-		}
-		Tst_count++;			/* incr. TEST_LOOP counter */
-	}	/* End for TEST_LOOPING */
-
-	/* Call cleanup() to undo setup done for the test. */
-	cleanup();
-	/*NOTREACHED*/
-
-}	/* End main */
-
-/*
- * void
- * setup() - performs all ONE TIME setup for this test.
- *  This function gets real/effective/saved uid/gid, umask, the device/inode
- *  number of '/' and current working directory for the parent process.
- */
-void 
-setup()
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-
-	/*
-	 * Get the euid, ruid, egid, rgid, umask value
-	 * and the current working directory of the parent process.
-	 */
-#if (linux)
-	if (getresuid(&Pruid, &Peuid, &Psuid) < 0) {
-		tst_brkm(TFAIL, cleanup, "getresuid() fails to get "
-			"real/eff./saved uid of parent");
-	}
-
-	if (getresgid(&Prgid, &Pegid, &Psgid) < 0) {
-		tst_brkm(TFAIL, cleanup, "getresgid() fails to get "
-			"real/eff./saved gid of parent");
-	}
-#else
-	Pruid = getuid ();
-	Peuid = geteuid ();
-	Psuid = 0;
-	Prgid = getgid ();
-	Pegid = getegid ();
-	Psgid = 0;
-#endif
-	/* Get the process file mode creation mask by setting value 0 */
-	Pumask = umask(0);
-	umask(Pumask);			/*
-					 * Restore the mask value of the
-					 * process.
-					 */
-	/*
-	 * Get the pathname of current working directory of the parent
-	 * process.
-	 */
-	if ((Pcwd = (char *) getcwd(Pcwd_buf, BUFSIZ)) == NULL) {
-		tst_brkm(TFAIL, cleanup,
-			 "getcwd failed for the parent process");
-	}
-
-	/*
- 	 * Get the device and inode number of root directory for the
-	 * parent process.
-	 */
-	if (stat("/", &StatPbuf) == -1) {
-		tst_brkm(TFAIL, cleanup, "stat(2) failed to get info. of '/' "
-			"in parent process");
-	}
-
-	/*
-	 * Get the device number and the inode number of "." (current-
-	 * working directory) for the parent process.
-	 */
-	if (stat(Pcwd, &Stat_cwd_Pbuf) < 0) {
-		tst_brkm(TFAIL, cleanup, "stat(2) failed to get info. of "
-			"working directory in parent process");
-	}
-}	/* End setup() */
-
-/*
- * void
- * cleanup() - performs all ONE TIME cleanup for this test at
- *             completion or premature exit.
- */
-void 
-cleanup()
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}	/* End cleanup() */
diff --git a/winsup/testsuite/winsup.api/ltp/wait02.c b/winsup/testsuite/winsup.api/ltp/wait02.c
deleted file mode 100644
index a7de67a28..000000000
--- a/winsup/testsuite/winsup.api/ltp/wait02.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: wait02
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for wait(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) wait(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the wait(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	wait(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="wait02"; 		/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-int fork_pid, ret_code;
-void trapper();
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL )
-	tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-    
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* create a child to wait for */
-        if ((fork_pid=fork()) == -1) {
-	    tst_brkm(TBROK, cleanup, "fork() Failure. errno=%d : %s", errno, strerror(errno));
-        } else if (fork_pid == 0) {
-	    /* Child, sleep a second then exit */
-	    sleep(1);
-	    exit(1);
-        }
-
-	/* Parent, wait for child to die */
-	TEST(wait(&ret_code));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "wait(1) Failed, errno=%d : %s",
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "wait(&ret_code) returned %d", TEST_RETURN);
-	    } 
-	}
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/wait401.c b/winsup/testsuite/winsup.api/ltp/wait401.c
deleted file mode 100644
index 51f71da55..000000000
--- a/winsup/testsuite/winsup.api/ltp/wait401.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	wait401.c
- *
- * DESCRIPTION
- *	wait401 - check that a call to wait4() correctly waits for a child
- *		  process to exit
- *
- * ALGORITHM
- *	loop if that option was specified
- *	fork a child.
- *	issue the system call
- *	check the return value
- *	  if return value == -1
- *	    issue a FAIL message, break remaining tests and cleanup
- *	  if we are doing functional testing
- *	    issue a PASS message if the wait4 call returned the child's pid
- *	  else
- *	    issue a FAIL message
- *	call cleanup
- *
- * USAGE:  <for command-line>
- *      wait401 [-c n] [-f] [-e] [-i n] [-I x] [-P x] [-t]
- *      where,  -c n : Run n copies concurrently.
- *		-f   : Turn off functionality Testing.
- *              -i n : Execute test n times.
- *              -I x : Execute test for x seconds.
- *              -P x : Pause for x seconds between iterations.
- *              -t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions
- *	none
- */
-
-#include "test.h"
-#include "usctest.h"
-
-#include <errno.h>
-#define _USE_BSD
-#include <sys/types.h>
-#include <sys/resource.h>
-#include <sys/wait.h>
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID= "wait401()";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-	pid_t pid;
-	int status = 1;
-	struct rusage *rusage = NULL;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL) {
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();			/* global setup */
-
-	/* The following loop checks looping state if -i option given */
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		/*
-		 * Allocate some space for the rusage structure
-		 */
-	
-		if ((rusage = (struct rusage *)malloc(sizeof(struct rusage)))
-				== NULL) {
-			tst_brkm(TBROK, cleanup, "malloc() failed");
-		}
-	
-		pid = fork();
-	
-		if (pid == -1) {
-			tst_brkm(TBROK, cleanup, "fork() failed");
-		}
-	
-		if (pid == 0) {		/* this is the child */
-			/*
-			 * sleep for a moment to let us do the test
-			 */
-			sleep(1);
-			exit(0);
-		} else {		/* this is the parent */
-	
-			/* call wait4 with the TEST() macro */
-			TEST(wait4(pid, &status, 0, rusage));
-		}
-	
-		if (TEST_RETURN == -1) {
-			tst_brkm(TFAIL, cleanup, "%s call failed - errno = %d "
-				": %s", TCID, TEST_ERRNO, strerror(TEST_ERRNO));
-		}
-	
-		if (STD_FUNCTIONAL_TEST) {
-			/*
-			 * The return from this call should be non-zero.
-			 */
-			if (WIFEXITED(status) == 0) {
-				tst_brkm(TFAIL, cleanup, "%s call succeeded but "
-					"WIFEXITED() did not return expected value "
-					"- %d", TCID, WIFEXITED(status));
-			} else if (TEST_RETURN != pid) {
-				tst_resm(TFAIL, "%s did not return the "
-						"expected value. %d", TCID,
-						TEST_RETURN);
-			} else {
-	
-				tst_resm(TPASS, "Received child pid as expected.");
-			}
-		}
-		tst_resm(TPASS, "%s call succeeded", TCID);
-
-		/*
-		 * Clean up things in case we are looping.
-		 */
-		free(rusage);
-		rusage = NULL;
-	}
-
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/wait402.c b/winsup/testsuite/winsup.api/ltp/wait402.c
deleted file mode 100644
index 30f7500ac..000000000
--- a/winsup/testsuite/winsup.api/ltp/wait402.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	wait402.c
- *
- * DESCRIPTION
- *	wait402 - check for ECHILD errno when using an illegal pid value
- *
- * ALGORITHM
- *	loop if that option was specified
- *	issue the system call with an illegal pid value
- *	check the errno value
- *	  issue a PASS message if we get ECHILD
- *	otherwise, the tests fails
- *	  issue a FAIL message
- *	  break any remaining tests
- *	  call cleanup
- *
- * USAGE:  <for command-line>
- *  wait402 [-c n] [-e] [-i n] [-I x] [-p x] [-t]
- *	where,  -c n : Run n copies concurrently.
- *		-e   : Turn on errno logging.
- *		-i n : Execute test n times.
- *		-I x : Execute test for x seconds.
- *		-P x : Pause for x seconds between iterations.
- *		-t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions
- *	none
- */
-
-#include "test.h"
-#include "usctest.h"
-
-#include <errno.h>
-#define _USE_BSD
-#include <sys/types.h>
-#include <sys/resource.h>
-#include <sys/wait.h>
-
-/*
- * See the Makefile for comments about the following preprocessor code.
- */
-#if defined (__CYGWIN__)
-#define PID_MAX 0xfffffffd
-#else
-#ifndef _LTP_TASKS_H
-#include <linux/threads.h>	/* for PID_MAX value - new */
-#else
-#include <linux/tasks.h>	/* for PID_MAX value - old */
-#endif
-#endif
-
-void cleanup(void) __attribute__((noreturn));
-void setup(void);
-
-const char *TCID= "wait402()";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-int exp_enos[] = {10, 0};
-
-int
-main(int ac, char **av)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-	pid_t pid;
-	pid_t epid = PID_MAX + 1;
-	int status = 1;
-	struct rusage *rusage=NULL;
-
-	/* parse standard options */
-	if ((msg = parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL) {
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-	}
-
-	setup();			/* global setup */
-
-	/* The following loop checks looping state if -i option given */
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-
-		/*
-		 * Allocate some space for the rusage structure.
-		 */
-	
-		if ((rusage = (struct rusage *)malloc(sizeof(struct rusage)))
-				== NULL) {
-			tst_brkm(TBROK, cleanup, "malloc() failed");
-		}
-	
-		pid = fork();
-	
-		if (pid == -1) {
-			tst_brkm(TBROK, cleanup, "fork() failed");
-		}
-	
-		if (pid == 0) {		/* this is the child */
-			/*
-			 * sleep for a moment to let us do the test
-			 */
-			sleep(1);
-			exit(0);
-		} else {		/* this is the parent */
-			/*
-			 * call wait4 with the TEST() macro.  epid is set
-			 * to an illegal positive value.  This should give
-			 * an ECHILD error.
-			 */
-			TEST(wait4(epid, &status, 0, rusage));
-		}
-	
-		if (TEST_RETURN == 0) {
-			tst_brkm(TFAIL, cleanup, "call failed to produce expected error - errno = %d - %s", TEST_ERRNO, strerror(TEST_ERRNO));
-		}
-
-		TEST_ERROR_LOG(TEST_ERRNO);
-	
-		switch (TEST_ERRNO) {
-		case ECHILD:
-			tst_resm(TPASS, "received expected failure - errno = %d - %s",
-				TEST_ERRNO, strerror(TEST_ERRNO));
-			break;
-		default:
-			tst_brkm(TFAIL, cleanup, "call failed to produce expected "
-				"error - errno = %d - %s", TEST_ERRNO,
-				strerror(TEST_ERRNO));
-		}
-
-		/*
-		 * Clean up things in case we are looping.
-		 */
-		if (pid > 0) {
-			wait4(pid, &status, 0, rusage);
-		}
-		free(rusage);
-		rusage = NULL;
-	}
-
-	cleanup();
-
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all the ONE TIME setup for this test.
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Set up the expected error numbers for -e option */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Pause if that option was specified */
-	TEST_PAUSE;
-}
-
-/*
- * cleanup() - performs all the ONE TIME cleanup for this test at completion
- * 	       or premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
-
diff --git a/winsup/testsuite/winsup.api/ltp/write01.c b/winsup/testsuite/winsup.api/ltp/write01.c
deleted file mode 100644
index 355190af6..000000000
--- a/winsup/testsuite/winsup.api/ltp/write01.c
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 2000 Silicon Graphics, Inc.  All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- *
- * http://www.sgi.com
- *
- * For further information regarding this notice, see:
- *
- * http://oss.sgi.com/projects/GenInfo/NoticeExplan/
- *
- */
-/* $Id$ */
-/**********************************************************
- * 
- *    OS Test - Silicon Graphics, Inc.
- * 
- *    TEST IDENTIFIER	: write01
- * 
- *    EXECUTED BY	: anyone
- * 
- *    TEST TITLE	: Basic test for write(2)
- * 
- *    PARENT DOCUMENT	: usctpl01
- * 
- *    TEST CASE TOTAL	: 1
- * 
- *    WALL CLOCK TIME	: 1
- * 
- *    CPU TYPES		: ALL
- * 
- *    AUTHOR		: William Roske
- * 
- *    CO-PILOT		: Dave Fenner
- * 
- *    DATE STARTED	: 03/30/92
- * 
- *    INITIAL RELEASE	: UNICOS 7.0
- * 
- *    TEST CASES
- * 
- * 	1.) write(2) returns...(See Description)
- *	
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- * 
- *    OUTPUT SPECIFICATIONS
- * 	
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- * 
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- * 
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- * 
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- * 
- *    INTERCASE DEPENDENCIES
- * 	None
- * 
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the write(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	write(2).
- * 
- * 	Setup:
- * 	  Setup signal handling.
- *	  Pause for SIGUSR1 if option specified.
- * 
- * 	Test:
- *	 Loop if the proper options are given.
- * 	  Execute system call
- *	  Check return code, if system call failed (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- * 
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- * 
- *    UPDATE HISTORY
- *      user     date  description
- *      ------------------------------------------------------
- *      wermager 3/00  Switched sequence of calls to TEST_PAUSE
- *                     and tst_tmpdir() in setup().  
- * 
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-#include "usctest.h"
-
-extern void setup();
-extern void cleanup();
-
-
-
-const char *TCID="write01"; 	/* Test program identifier.    */
-int TST_TOTAL=1;    		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-int exp_enos[]={0, 0};
-
-char fname[255];
-int fd;
-char buf = 'w';
-
-int
-main(int ac, char **av)
-{
-    int lc;		/* loop counter */
-    const char *msg;		/* message returned from parse_opts */
-    
-    /***************************************************************
-     * parse standard options
-     ***************************************************************/
-    if ( (msg=parse_opts(ac, av, (option_t *) NULL, NULL)) != (char *) NULL ) {
-	tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
-	tst_exit();
-    }
-
-    /***************************************************************
-     * perform global setup for test
-     ***************************************************************/
-    setup();
-
-    /* set the expected errnos... */
-    TEST_EXP_ENOS(exp_enos);
-
-    /***************************************************************
-     * check looping state if -c option given
-     ***************************************************************/
-    for (lc=0; TEST_LOOPING(lc); lc++) {
-	
-	/* reset Tst_count in case we are looping. */
-	Tst_count=0;
-	
-	/* 
-	 * Call write(2)
-	 */
-	TEST(write(fd, &buf, 1));
-	
-	/* check return code */
-	if ( TEST_RETURN == -1 ) {
-	    TEST_ERROR_LOG(TEST_ERRNO);
-	    tst_resm(TFAIL, "write(%s, F_CLRALF, 1) Failed, errno=%d : %s", fname,
-		     TEST_ERRNO, strerror(TEST_ERRNO));
-	} else {
-	    /***************************************************************
-	     * only perform functional verification if flag set (-f not given)
-	     ***************************************************************/
-	    if ( STD_FUNCTIONAL_TEST ) {
-		/* No Verification test, yet... */
-		tst_resm(TPASS, "write(%s, F_CLRALF, 1) returned %d", fname, TEST_RETURN);
-	    } 
-	}
-
-    }	/* End for TEST_LOOPING */
-
-    /***************************************************************
-     * cleanup and exit
-     ***************************************************************/
-    cleanup();
-
-    return 0;
-}	/* End main */
-
-/***************************************************************
- * setup() - performs all ONE TIME setup for this test.
- ***************************************************************/
-void 
-setup()
-{
-    /* capture signals */
-    tst_sig(FORK, DEF_HANDLER, cleanup);
-
-
-    /* Pause if that option was specified */
-    TEST_PAUSE;
-
-    /* make a temp directory and cd to it */
-    tst_tmpdir();
-
-    sprintf(fname,"tfile_%d",getpid());
-    if ((fd = open(fname,O_RDWR|O_CREAT,0700)) == -1) {
-	tst_brkm(TBROK, cleanup,
-		"open(%s, O_RDWR|O_CREAT,0700) Failed, errno=%d : %s",
-		fname, errno, strerror(errno));
-    }
-}	/* End setup() */
-
-
-/***************************************************************
- * cleanup() - performs all ONE TIME cleanup for this test at
- *		completion or premature exit.
- ***************************************************************/
-void 
-cleanup()
-{
-    /*
-     * print timing stats if that option was specified.
-     * print errno log if that option was specified.
-     */
-    TEST_CLEANUP;
-
-    /* close the file we have open */
-    if (close(fd) == -1) {
-       tst_resm(TWARN, "close(%s) Failed, errno=%d : %s", fname, errno, strerror(errno));
-    }
-    
-    /* Remove tmp dir and all files in it */
-    tst_rmdir();
-
-    /* exit with return code appropriate for results */
-    tst_exit();
-}	/* End cleanup() */
-
-
diff --git a/winsup/testsuite/winsup.api/ltp/write02.c b/winsup/testsuite/winsup.api/ltp/write02.c
deleted file mode 100644
index a5675bd6d..000000000
--- a/winsup/testsuite/winsup.api/ltp/write02.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- * 	write02.c
- *
- * DESCRIPTION
- *	Basic functionality test: does the return from write match the count
- *	of the number of bytes written.
- *
- *
- * ALGORITHM
- * 	Create a file and write some bytes out to it.
- * 	Check the return count against the number returned.
- *
- * USAGE:  <for command-line>
- *      write02 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *      where,  -c n : Run n copies concurrently.
- *              -e   : Turn on errno logging.
- *              -i n : Execute test n times.
- *              -I x : Execute test for x seconds.
- *              -P x : Pause for x seconds between iterations.
- *              -t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions
- * 	None
- */
-
-#include <errno.h>
-#include "test.h"
-#include "usctest.h"
-#include <fcntl.h>
-
-const char *TCID = "write02()";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void cleanup(void) __attribute__ ((noreturn));
-void setup(void);
-
-char pfiln[40] = "";
-
-int
-main(int argc, char **argv)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	int cwrite;
-	int fild;
-	int iws;
-	int badcount = 0;
-	char pwbuf[BUFSIZ + 1];
-
-	/* parse standard options */
-	if ((msg = parse_opts(argc, argv, (option_t *) NULL, NULL))) {
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	setup();			/* global setup for test */
-
-	/* The following loop checks looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		tst_resm(TINFO, "Block 1: test to see write() returns proper "
-			 "write count");
-
-		for (iws = 0; iws < BUFSIZ; iws++) {
-			pwbuf[iws] = 'A' + (iws % 26);
-		}
-		pwbuf[BUFSIZ] = '\n';
-
-		if ((fild = creat(pfiln, 0777)) == -1) {
-			tst_brkm(TBROK, cleanup, "Can't creat Xwrit");
-			/*NOTREACHED*/
-		}
-		for (iws = BUFSIZ; iws > 0; iws--) {
-			if ((cwrite = write(fild, pwbuf, iws)) != iws) {
-				TEST_ERROR_LOG(errno);
-				badcount++;
-				tst_resm(TINFO, "bad write count");
-			}
-		}
-		if (badcount != 0) {
-			tst_resm(TFAIL, "write() FAILED to return proper cnt");
-		} else {
-			tst_resm(TPASS, "write() PASSED");
-		}
-		tst_resm(TINFO, "block 1 passed");
-		close(fild);
-	}
-	cleanup();
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	umask(0);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-         */
-	TEST_PAUSE;
-
-	/* make a temp directory and cd to it */
-	tst_tmpdir();
-
-	sprintf(pfiln, "./write1.%d", getpid());
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at completion or
- * premature exit.
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	unlink(pfiln);
-
-	/* Remove tmp dir and all files in it */
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-}
diff --git a/winsup/testsuite/winsup.api/ltp/write03.c b/winsup/testsuite/winsup.api/ltp/write03.c
deleted file mode 100644
index 7d6f1f945..000000000
--- a/winsup/testsuite/winsup.api/ltp/write03.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   This program is free software;  you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY;  without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
- *   the GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program;  if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/*
- * NAME
- *	write03.c
- *
- * DESCRIPTION
- *	Testcase to check that write(2) doesn't corrupt a file when it fails
- *
- * ALGORITHM
- *	Create a file for writing, write 100 bytes to it. Then make write(2)
- *	fail with some erroneous parameter, close the fd. Then reopen the
- *	file in RDONLY mode, and read the contents of the file. Compare the
- *	buffers, to see whether they are same.
- *
- * USAGE:  <for command-line>
- *      write03 [-c n] [-e] [-i n] [-I x] [-P x] [-t]
- *      where,  -c n : Run n copies concurrently.
- *              -e   : Turn on errno logging.
- *              -i n : Execute test n times.
- *              -I x : Execute test for x seconds.
- *              -P x : Pause for x seconds between iterations.
- *              -t   : Turn on syscall timing.
- *
- * History
- *	07/2001 John George
- *		-Ported
- *
- * Restrictions
- *	NONE
- */
-
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <test.h>
-#include <usctest.h>
-
-/* 0 terminated list of expected errnos */
-int exp_enos[] = {14,0};
-
-const char *TCID = "write03";
-int TST_TOTAL = 1;
-extern int Tst_count;
-
-void setup(void);
-void cleanup(void) __attribute__((noreturn));
-
-int fd = -1;
-char filename[100];
-
-int
-main(int argc, char **argv)
-{
-	int lc;				/* loop counter */
-	const char *msg;		/* message returned from parse_opts */
-
-	char wbuf[BUFSIZ], rbuf[BUFSIZ];
-
-	/* parse standard options */
-	if ((msg = parse_opts(argc, argv, (option_t *)NULL, NULL)) !=
-	    (char *)NULL) {
-		tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg);
-		/*NOTREACHED*/
-	}
-
-	/* global setup */
-	setup();
-
-	/* The following loop checks looping state if -i option given */
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		/* reset Tst_count in case we are looping */
-		Tst_count = 0;
-
-		tst_resm(TINFO, "Enter Block 1: test to check if write "
-			 "corrupts the file when write fails");
-
-		fd = creat(filename, 0644);
-		if (fd < 0) {
-			tst_resm(TBROK, "creating a new file failed");
-			cleanup();
-			/*NOTREACHED*/
-		}
-
-		(void)memset(wbuf, '0', 100);
-
-		if (write(fd, wbuf, 100) == -1) {
-			tst_resm(TFAIL, "failed to write to %s", filename);
-			cleanup();
-			/*NOTREACHED*/
-		}
-
-		if (write(fd, (void *)-1, 100) != -1) {
-			tst_resm(TFAIL, "write(2) failed to fail");
-			cleanup();
-			/*NOTREACHED*/
-		}
-		TEST_ERROR_LOG(errno);
-		close(fd);
-                fd = -1;
-
-		if ((fd = open(filename, O_RDONLY)) == -1) {
-			tst_resm(TBROK, "open(2) failed, errno: %d", errno);
-			cleanup();
-			/*NOTREACHED*/
-		}
-
-		if (read(fd, rbuf, 100) == -1) {
-			tst_resm(TBROK, "read(2) failed, errno: %d", errno);
-			cleanup();
-			/*NOTREACHED*/
-		}
-
-		if (memcmp(wbuf, rbuf, 100) == 0) {
-			tst_resm(TPASS, "failure of write(2) didnot corrupt "
-				 "the file");
-		} else {
-			tst_resm(TFAIL, "failure of write(2) corrupted the "
-				 "file");
-		}
-		tst_resm(TINFO, "Exit block 1");
-	}
-	cleanup();
-	/*NOTREACHED*/
-}
-
-/*
- * setup() - performs all ONE TIME setup for this test
- */
-void
-setup(void)
-{
-	/* capture signals */
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	/* Set up the expected error numbers for -e option */
-	TEST_EXP_ENOS(exp_enos);
-
-	/* Pause if that option was specified
-	 * TEST_PAUSE contains the code to fork the test with the -i option.
-	 * You want to make sure you do this before you create your temporary
-	 * directory.
-	 */
-	TEST_PAUSE;
-
-	/* Create a unique temporary directory and chdir() to it. */
-	tst_tmpdir();
-
-	sprintf(filename, "./write03.%d", getpid());
-}
-
-/*
- * cleanup() - performs all ONE TIME cleanup for this test at
- * 		completion or premature exit
- */
-void
-cleanup(void)
-{
-	/*
-	 * print timing stats if that option was specified.
-	 * print errno log if that option was specified.
-	 */
-	TEST_CLEANUP;
-
-	if (fd >= 0)
-		close (fd);
-
-	unlink(filename);
-	tst_rmdir();
-
-	/* exit with return code appropriate for results */
-	tst_exit();
-	/*NOTREACHED*/
-}
diff --git a/winsup/testsuite/winsup.api/mmaptest01.c b/winsup/testsuite/winsup.api/mmaptest01.c
deleted file mode 100644
index 99a7d2ef1..000000000
--- a/winsup/testsuite/winsup.api/mmaptest01.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-  Copyright 2001 Free Software Foundation, Inc.
-  Written by Michael Chastain, <chastain@redhat.com>
-  Changes by Corinna Vinschen, <corinna@vinschen.de>:
-  - Using mkstemp to generate filenames.
-  - Adding tests
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
-
-  This program demonstrates a bug in cygwin's mmap.
-  I open one file, mmap it, and close it.
-  I open a different file, mmap it, and close it.
-
-  The second file re-uses the file handle (which is OK),
-  but then it re-uses the buffer as well!  Ouch!
-
-  This bug occurs on cygwin1.dll dated 2001-01-31.
-  It causes gnu cpp to screw up its include file buffers.
-
-  Compile with "gcc -o y1 y1.c".
-
-  Output from a bad cygwin1.dll:
-
-    y1.txt: 3 0x4660000 y1 y1 y1 y1 y1 y1 y1
-    y2.txt: 3 0x4660000 y1 y1 y1 y1 y1 y1 y1
-
-  Output from a good cygwin1.dll:
-
-    y1.txt: 3 0x14060000 y1 y1 y1 y1 y1 y1 y1
-    y2.txt: 3 0x14070000 y2 y2 y2 y2 y2 y2 y2
-
-  Output from Red Hat Linux 7:
-
-    y1.txt: 3 0x40017000 y1 y1 y1 y1 y1 y1 y1
-    y2.txt: 3 0x40018000 y2 y2 y2 y2 y2 y2 y2
- */
-
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "mmaptest01";	/* Test program identifier. */
-int TST_TOTAL = 7;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-/* some systems have O_BINARY and some do not */
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-/* filler for file 1 */
-char const line1 [] = "y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1\n";
-#define size1 (sizeof(line1) - 1)
-#define count1 ((4096 / size1) + 1)
-
-/* filler for file 2 */
-char const line2 [] = "y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2 y2\n";
-#define size2 (sizeof(line2) - 1)
-#define count2 ((4096 / size2) + 1)
-
-int main ()
-{
-  char fnam1[32];
-  char fnam2[32];
-
-  int fd1;
-  char * buf1;
-
-  int fd2;
-  char * buf2;
-
-  char buf3[20];
-
-  unsigned i;
-
-  strcpy (fnam1, "mmaptest01.1.XXXXXX");
-  strcpy (fnam2, "mmaptest01.2.XXXXXX");
-
-  /* create file 1 */
-  //fd1  = open (fnam1, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644);
-  fd1 = mkstemp (fnam1);
-  for (i = 0; i < count1; i++)
-    write (fd1, line1, size1);
-  close (fd1);
-
-  /* create file 2 */
-  //fd2  = open (fnam2, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644);
-  fd2 = mkstemp (fnam2);
-  for (i = 0; i < count2; i++)
-    write (fd2, line2, size2);
-  close (fd2);
-
-  /* mmap file 1 */
-  fd1  = open (fnam1, O_RDONLY | O_BINARY, 0644);
-  buf1 = mmap (0, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd1, 0);
-  close (fd1);
-
-  /* mmap file 2 */
-  fd2  = open (fnam2, O_RDONLY | O_BINARY, 0644);
-  buf2 = mmap (0, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd2, 0);
-  close (fd2);
-
-  /* the buffers have to be different */
-  Tst_count = 0;
-  tst_resm (buf1 == buf2 || !memcmp (buf1, buf2, 20) ? TFAIL : TPASS,
-	"mmap uses unique buffers when mapping different already closed files");
-  munmap (buf2, 4096);
-
-  /* mmap file 1 twice with MAP_PRIVATE */
-  fd2  = open (fnam1, O_RDONLY | O_BINARY, 0644);
-  buf2 = mmap (0, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd2, 0);
-  close (fd2);
-
-  tst_resm (buf1 == buf2 ? TFAIL : TPASS,
-	    "mmap uses different buffers on MAP_PRIVATE mapping");
-
-  tst_resm (memcmp (buf1, buf2, 20) ? TFAIL : TPASS,
-	    "two private buffers of the same file are identical");
-
-  buf1[0] = 0x7f;
-  tst_resm (!memcmp (buf1, buf2, 20) ? TFAIL : TPASS,
-	    "changes are private in MAP_PRIVATE mappings");
-
-  munmap (buf1, 4096);
-  munmap (buf2, 4096);
-
-  /* mmap file 1 twice with MAP_SHARED */
-  fd1  = open (fnam1, O_RDWR | O_BINARY, 0644);
-  buf1 = mmap (0, 4096, PROT_READ|PROT_WRITE, MAP_SHARED, fd1, 0);
-  close (fd1);
-
-  fd2  = open (fnam1, O_RDWR | O_BINARY, 0644);
-  buf2 = mmap (0, 4096, PROT_READ|PROT_WRITE, MAP_SHARED, fd2, 0);
-  close (fd2);
-
-  tst_resm (memcmp (buf1, buf2, 20) ? TFAIL : TPASS,
-	    "two shared buffers of the same file are identical");
-
-  buf1[0] = 0x7f;
-  tst_resm (memcmp (buf1, buf2, 20) ? TFAIL : TPASS,
-	    "changes are shared between MAP_SHARED mappings of the same file");
-  munmap (buf2, 4096);
-
-  fd2  = open (fnam1, O_RDWR | O_BINARY, 0644);
-  memset (buf3, 0, 20);
-  read (fd2, buf3, 20);
-  close (fd2);
-
-  tst_resm (memcmp (buf1, buf3, 20) ? TFAIL : TPASS,
-	    "changes are propagated to the mapped file on MAP_SHARED mapping");
-
-  munmap (buf1, 4096);
-  unlink (fnam1);
-  unlink (fnam2);
-  tst_exit ();
-}
-
diff --git a/winsup/testsuite/winsup.api/mmaptest02.c b/winsup/testsuite/winsup.api/mmaptest02.c
deleted file mode 100644
index bec7c392c..000000000
--- a/winsup/testsuite/winsup.api/mmaptest02.c
+++ /dev/null
@@ -1,190 +0,0 @@
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-sigset_t unblock_sigsegv;
-jmp_buf r;
-size_t pg;
-
-int fd;
-
-/* Checks behaviour of anonymous mmap.
-
-   test_1: If we map a 2-page region and unmap its second page, the first page
-   must remain.
-
-   test_2: If we map a 2-page region and unmap its first page, the second
-   page must remain.
-
-   test_3: If we map two consecutive 1-page regions and unmap them both with
-   one munmap, both must go away.
-*/
-
-void
-perror_exit (const char *str, int code)
-{
-  printf ("%s: %s\n", str, strerror (errno));
-  exit (code);
-}
-
-void
-anonmap_init ()
-{
-  sigemptyset (&unblock_sigsegv);
-  sigaddset (&unblock_sigsegv, SIGSEGV);
-  pg = getpagesize ();
-  fd = open ("/dev/zero", O_RDWR);
-}
-
-char *
-anonmap (size_t size)
-{
-  return (char *) mmap (0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
-}
-
-void
-anonfree (char *loc, size_t size)
-{
-  munmap (loc, size);
-}
-     
-void
-sigsegv (int unused)
-{
-  sigprocmask (SIG_UNBLOCK, &unblock_sigsegv, 0);
-  longjmp (r, 1);
-}
-
-int
-compare_pointers (const void *a, const void *b)
-{
-  const char *x = *(const char *const *)a;
-  const char *y = *(const char *const *)b;
-
-  if (x > y)
-    return 1;
-  if (x < y)
-    return -1;
-  return 0;
-}
-
-void
-test_1 ()
-{
-  char *x = anonmap (pg * 2);
-  if (x == (char *)MAP_FAILED)
-    perror_exit ("test 1 mmap", 1);
-
-  signal (SIGSEGV, sigsegv);
-  if (setjmp (r))
-    perror_exit ("test 1 fault", 2);
-
-  x[0] = 1;
-  x[pg] = 1;
-
-  anonfree (x + pg, pg);
-  x[0] = 2;
-
-  if (setjmp (r) == 0)
-    {
-      x[pg] = 1;
-      perror_exit ("test 1 no fault", 3);
-    }
-}
-
-void
-test_2 ()
-{
-  char *x = anonmap (pg * 2);
-  if (x == (char *)MAP_FAILED)
-    perror_exit ("test 2 mmap", 4);
-
-  signal (SIGSEGV, sigsegv);
-  if (setjmp (r))
-    perror_exit ("test 2 fault", 5);
-
-  x[0] = 1;
-  x[pg] = 1;
-
-  anonfree (x, pg);
-  x[pg] = 2;
-
-  if (setjmp (r) == 0)
-    {
-      x[0] = 1;
-      perror_exit ("test 2 no fault", 6);
-    }
-}
-
-void
-test_3 ()
-{
-  char *x[10];
-  char *y;
-  int i;
-
-  /* There's no way to guarantee we get consecutive pages from the OS.  The
-     approach taken here is to allocate ten of them, sort the list, and
-     look for consecutive pages.  */
-  for (i = 0; i < 10; i++)
-    {
-      x[i] = anonmap (pg);
-      if (x[i] == (char *)MAP_FAILED)
-	perror_exit ("test 3 mmap 1", 7);
-    }
-  qsort (x, 10, sizeof (char *), compare_pointers);
-
-  y = 0;
-  for (i = 0; i < 9; i++)
-    if (x[i] + pg == x[i+1])
-      {
-	y = x[i];
-	break;
-      }
-  if (y == 0)
-    {
-      fputs ("test 3: couldn't get two consecutive pages, giving up\n", stdout);
-      exit (65);
-    }
-  
-  signal (SIGSEGV, sigsegv);
-  if (setjmp (r))
-    perror_exit ("test 3 fault", 8);
-
-  y[0] = 1;
-  y[pg] = 1;
-
-  anonfree (y, pg * 2);
-
-  if (setjmp (r) == 0)
-    {
-      y[0] = 1;
-      perror_exit ("test 3 no fault 1", 9);
-    }
-  
-  signal (SIGSEGV, sigsegv);
-  if (setjmp (r) == 0)
-    {
-      y[pg] = 1;
-      perror_exit ("test 3 no fault 2", 10);
-    }
-}
-
-int
-main ()
-{
-  anonmap_init();
-
-  test_1();
-  test_2();
-  test_3();
-
-  exit(0);
-}
diff --git a/winsup/testsuite/winsup.api/mmaptest03.c b/winsup/testsuite/winsup.api/mmaptest03.c
deleted file mode 100644
index 2af191237..000000000
--- a/winsup/testsuite/winsup.api/mmaptest03.c
+++ /dev/null
@@ -1,128 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <string.h>
-
-/* - Checks if mapping of already closed file survives fork()
-   - Checks if mapping the same region of the same file twice
-     is done correctly.
-*/
-
-sigset_t unblock_sigsegv;
-jmp_buf r;
-
-/* filler for file */
-char const line[] = "y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1";
-
-void
-perror_exit (const char *str)
-{    
-  printf ("%s: %s\n", str, strerror (errno));
-  exit (1);
-}
-
-void
-sigsegv (int unused)
-{ 
-  sigprocmask (SIG_UNBLOCK, &unblock_sigsegv, 0);
-  longjmp (r, 1);
-}
-
-int
-main(int argc, char **argv)
-{
-  int fd, status;
-  struct stat statbuf;
-  volatile char c, *buf1, *buf2;
-  pid_t pid;
-
-  /* Create data file */
-  if ((fd = open("y.txt", O_RDWR | O_CREAT | O_TRUNC, 0644)) == -1)
-    perror_exit ("Can't create data file");
-  write (fd, line, sizeof(line) - 1);
-  close (fd);
-
-  /* Open data file */
-  if ((fd = open("y.txt", O_RDONLY)) == -1)
-    perror_exit ("Can't open data file");
-
-  if (fstat(fd, &statbuf) < 0)
-    perror_exit ("fstat failed");
-
-  if (!statbuf.st_size)
-    perror_exit ("filesize is 0");
-
-  if ((buf1 = mmap(NULL, statbuf.st_size, PROT_READ, MAP_SHARED, fd, 0))
-      == MAP_FAILED)
-    perror_exit ("mmap 1 failed");
-
-  close(fd);
-
-  /* Open data file a second time */
-  if ((fd = open("y.txt", O_RDONLY)) == -1)
-    perror_exit ("Can't open data file in second run");
-
-  if ((buf2 = mmap(NULL, statbuf.st_size, PROT_READ, MAP_SHARED, fd, 0))
-      == MAP_FAILED)
-    perror_exit ("mmap 2 failed");
-
-  close(fd);
-
-  sigemptyset (&unblock_sigsegv);
-  sigaddset (&unblock_sigsegv, SIGSEGV);
-  signal (SIGSEGV, sigsegv);
-
-  if (setjmp (r))
-    perror_exit ("SEGV in fork");
-
-  pid = fork();
-
-  if (pid == -1)
-    perror_exit ("fork failed");
-
-  if (setjmp (r))
-    perror_exit (pid ? "SEGV in parent" : "SEGV in child");
-
-  c = buf1[0];
-  c = buf2[0];
-
-  if (setjmp (r))
-    perror_exit (pid ? "SEGV in parent's munmap" : "SEGV in child's munmap");
-
-  if (munmap((void *) buf1, statbuf.st_size))
-    perror_exit (pid ? "munmap failed in parent" : "munmap failed in child");
-
-  if (setjmp (r) == 0)
-    {
-      c = buf1[0];
-      perror_exit (pid ? "no SEGV in parent after munmap" : "no SEGV in child after munmap");
-    }
-
-  if (setjmp (r))
-    perror_exit (pid ? "SEGV in parent after munmap" : "SEGV in child after munmap");
-
-  c = buf2[0];
-
-  if (setjmp (r))
-    perror_exit (pid ? "SEGV in parent's munmap" : "SEGV in child's munmap");
-
-  if (munmap((void *) buf2, statbuf.st_size))
-    perror_exit (pid ? "munmap failed in parent" : "munmap failed in child");
-
-  if (pid)
-    {
-      waitpid (pid, &status, 0);
-      unlink ("y.txt");
-      if (!WIFEXITED (status) || WEXITSTATUS (status))
-        return 1;
-    }
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/mmaptest04.c b/winsup/testsuite/winsup.api/mmaptest04.c
deleted file mode 100644
index 52302bae1..000000000
--- a/winsup/testsuite/winsup.api/mmaptest04.c
+++ /dev/null
@@ -1,103 +0,0 @@
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-int
-main ()
-{
-  char *data, *data2 = NULL, *data3;
-  int i, pagesize;
-  int fd;
-
-  pagesize = 65536;		//getpagesize();
-
-  /*
-   * First, make a file with some known garbage in it.
-   */
-  data = (char *) malloc (pagesize);
-  if (!data)
-    exit (1);
-  for (i = 0; i < pagesize; ++i)
-    *(data + i) = rand ();
-  umask (0);
-  fd = open ("conftestmmap", O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0600);
-  if (fd < 0)
-    {
-      printf ("creat: %d\n", errno);
-      exit (1);
-    }
-  if (write (fd, data, pagesize) != pagesize)
-    {
-      printf ("write: %d\n", errno);
-      exit (1);
-    }
-  close (fd);
-
-  /*
-   * Next, try to mmap the file.
-   */
-  fd = open ("conftestmmap", O_RDWR | O_BINARY);
-  if (fd < 0)
-    {
-      printf ("write: %d\n", errno);
-      exit (1);
-    }
-  if ((data2 = mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-		     MAP_PRIVATE, fd, 0L)) == MAP_FAILED)
-    {
-      printf ("mmap: %d\n", errno);
-      exit (1);
-    }
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data2 + i))
-      {
-	printf ("check-if: %d\n", errno);
-	exit (1);
-      }
-
-  /*
-   * Finally, make sure that changes to the mapped area
-   * do not percolate back to the file as seen by read().
-   * (This is a bug on some variants of i386 svr4.0.)
-   */
-  for (i = 0; i < pagesize; ++i)
-    *(data2 + i) = *(data2 + i) + 1;
-  data3 = (char *) malloc (pagesize);
-  if (!data3)
-    {
-      printf ("malloc2: %d\n", errno);
-      exit (1);
-    }
-  if (read (fd, data3, pagesize) != pagesize)
-    {
-      printf ("read: %d\n", errno);
-      exit (1);
-    }
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data3 + i))
-      {
-	printf ("check-if2: %d\n", errno);
-	exit (1);
-      }
-  if (msync (data2, pagesize, MS_SYNC))
-    {
-      printf ("msync: %d\n", errno);
-      exit (1);
-    }
-  if (munmap (data2, pagesize))
-    {
-      printf ("munmap: %d\n", errno);
-      exit (1);
-    }
-  close (fd);
-  unlink ("conftestmmap");
-  exit (0);
-}
diff --git a/winsup/testsuite/winsup.api/msgtest.c b/winsup/testsuite/winsup.api/msgtest.c
deleted file mode 100644
index e002a7fda..000000000
--- a/winsup/testsuite/winsup.api/msgtest.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * 
- * Obtained from: $NetBSD: msgtest.c,v 1.7 2002/07/20 08:36:25 grant Exp $
- * $FreeBSD: /repoman/r/ncvs/src/tools/regression/sysvmsg/msgtest.c,v 1.1 2002/08/15 06:34:37 alfred Exp $
- */
-
-/*
- * Test the SVID-compatible Message Queue facility.
- */
-
-/*
- * CV, 2003-11-17: Add to Cygwin testsuite.
- */
-#include <sys/param.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <sys/wait.h>
-
-#include <err.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "msgtest";	/* Test program identifier. */
-int TST_TOTAL = 31;		/* Total number of test cases. */
-extern int Tst_count;		/* Test Case counter for tst_* routines */
-
-void	print_msqid_ds (struct msqid_ds *, mode_t);
-void	sigsys_handler(int);
-void	sigchld_handler (int);
-void	cleanup (void);
-void	receiver (void);
-
-#define	MESSAGE_TEXT_LEN	255
-
-/*
- * Define it as test_mymsg because we already have struct mymsg and we dont
- * want to conflict with it.  Also, regression fails when the default mymsg
- * struct is used, because mtext[] array is '1', so the passed string cannot
- * be processed.
- */
-struct test_mymsg {
-	long	mtype;
-	char	mtext[MESSAGE_TEXT_LEN];
-};
-
-const char *m1_str = "California is overrated.";
-const char *m2_str = "The quick brown fox jumped over the lazy dog.";
-
-#define	MTYPE_1		1
-#define	MTYPE_1_ACK	2
-
-#define	MTYPE_2		3
-#define	MTYPE_2_ACK	4
-
-int	sender_msqid = -1;
-pid_t	child_pid;
-
-key_t	msgkey;
-
-int
-main(int argc, char *argv[])
-{
-	struct sigaction sa;
-	struct msqid_ds m_ds;
-	struct test_mymsg m;
-	sigset_t sigmask;
-
-	Tst_count = 0;
-
-	/*
-	 * Install a SIGSYS handler so that we can exit gracefully if
-	 * System V Message Queue support isn't in the kernel.
-	 */
-	sa.sa_handler = sigsys_handler;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	if (sigaction(SIGSYS, &sa, NULL) == -1)
-		tst_brkm (TBROK, cleanup, "sigaction SIGSYS");
-
-	/*
-	 * Install and SIGCHLD handler to deal with all possible exit
-	 * conditions of the receiver.
-	 */
-	sa.sa_handler = sigchld_handler;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	if (sigaction(SIGCHLD, &sa, NULL) == -1)
-		tst_brkm (TBROK, cleanup, "sigaction SIGCHLD");
-
-	msgkey = ftok("/", 4160);
-	tst_resm (msgkey == (key_t)-1 ? TFAIL : TPASS,
-		  "ftok(\"/\") returns valid value");
-
-	/*
-	 * Initialize child_pid to ourselves to that the cleanup function
-	 * works before we create the receiver.
-	 */
-	child_pid = getpid();
-
-	sender_msqid = msgget(msgkey, IPC_CREAT | 0640);
-	tst_resm (sender_msqid == -1 ? TFAIL : TPASS, "sender calls msgget");
-
-	tst_resm (msgctl(sender_msqid, IPC_STAT, &m_ds) == -1 ? TFAIL : TPASS,
-		  "msgctl IPC_STAT");
-
-	print_msqid_ds(&m_ds, 0640);
-
-	m_ds.msg_perm.mode = (m_ds.msg_perm.mode & ~0777) | 0600;
-
-	tst_resm (msgctl(sender_msqid, IPC_SET, &m_ds) == -1 ? TFAIL : TPASS,
-		  "msgctl IPC_SET");
-
-	bzero(&m_ds, sizeof m_ds);
-
-	tst_resm (msgctl(sender_msqid, IPC_STAT, &m_ds) == -1 ? TFAIL : TPASS,
-		  "msgctl IPC_STAT");
-
-	tst_resm ((m_ds.msg_perm.mode & 0777) != 0600 ? TFAIL : TPASS,
-		  "IPC_SET of mode holds");
-
-	print_msqid_ds(&m_ds, 0600);
-
-	switch ((child_pid = fork())) {
-	case -1:
-		tst_brkm (TBROK, cleanup, "fork");
-		/* NOTREACHED */
-
-	case 0:
-		tst_resm (TPASS, "fork");
-		receiver();
-		break;
-
-	default:
-		Tst_count += 8;
-		break;
-	}
-
-	/*
-	 * Send the first message to the receiver and wait for the ACK.
-	 */
-	m.mtype = MTYPE_1;
-	strcpy(m.mtext, m1_str);
-	tst_resm (msgsnd(sender_msqid, &m, sizeof(m), 0) == -1 ? TFAIL : TPASS,
-		  "sender: msgsnd 1");
-
-	tst_resm (msgrcv(sender_msqid, &m, sizeof(m), MTYPE_1_ACK, 0)
-	          != sizeof(m) ? TFAIL : TPASS, "sender: msgrcv 1 ack");
-
-	print_msqid_ds(&m_ds, 0600);
-
-	/*
-	 * Send the second message to the receiver and wait for the ACK.
-	 */
-	m.mtype = MTYPE_2;
-	strcpy(m.mtext, m2_str);
-	tst_resm (msgsnd(sender_msqid, &m, sizeof(m), 0) == -1 ? TFAIL : TPASS,
-		  "sender: msgsnd 2");
-
-	tst_resm (msgrcv(sender_msqid, &m, sizeof(m), MTYPE_2_ACK, 0)
-		  != sizeof(m) ? TFAIL : TPASS, "sender: msgrcv 2 ack");
-
-	/*
-	 * Suspend forever; when we get SIGCHLD, the handler will exit.
-	 */
-	sigemptyset(&sigmask);
-	(void) sigsuspend(&sigmask);
-
-	/*
-	 * ...and any other signal is an unexpected error.
-	 */
-	tst_brkm (TBROK, cleanup, "sender: received unexpected signal");
-        exit (1);
-}
-
-void
-sigsys_handler(int signo)
-{
-
-	tst_brkm (TBROK, cleanup,
-		"System V Message Queue support is not present in the kernel");
-}
-
-void
-sigchld_handler(int signo)
-{
-	struct msqid_ds m_ds;
-	int cstatus;
-
-	/*
-	 * Reap the child; if it exited successfully, then the test passed!
-	 */
-	if (waitpid(child_pid, &cstatus, 0) != child_pid)
-		tst_brkm (TBROK, cleanup, "waitpid");
-
-	if (WIFEXITED(cstatus) == 0)
-		tst_brkm (TBROK, cleanup, "receiver exited abnormally");
-
-	if (WEXITSTATUS(cstatus) != 0)
-		tst_brkm (TBROK, cleanup, "receiver exited with status %d",
-			  WEXITSTATUS(cstatus));
-
-	/*
-	 * If we get here, the child has exited normally, and thus
-	 * we should exit normally too.  First, tho, we print out
-	 * the final stats for the message queue.
-	 */
-
-	tst_resm (msgctl(sender_msqid, IPC_STAT, &m_ds) == -1 ? TFAIL : TPASS,
-		  "msgctl IPC_STAT");
-
-	print_msqid_ds(&m_ds, 0600);
-
-	cleanup ();
-}
-
-void
-cleanup()
-{
-
-	/*
-	 * If we're the sender, and it exists, remove the message queue.
-	 */
-	if (child_pid != 0 && sender_msqid != -1) {
-		tst_resm (msgctl(sender_msqid, IPC_RMID, NULL) == -1
-			  ? TFAIL : TPASS, "msgctl IPC_RMID");
-	}
-	tst_exit ();
-}
-
-void
-print_msqid_ds(struct msqid_ds *mp, mode_t mode)
-{
-	uid_t uid = geteuid();
-	gid_t gid = getegid();
-
-	printf("PERM: uid %d, gid %d, cuid %d, cgid %d, mode 0%o\n",
-	    (int)mp->msg_perm.uid, (int)mp->msg_perm.gid,
-	    (int)mp->msg_perm.cuid, (int)mp->msg_perm.cgid,
-	    mp->msg_perm.mode & 0777);
-
-	printf("qnum %lu, qbytes %lu, lspid %d, lrpid %d\n",
-	    mp->msg_qnum, (u_long)mp->msg_qbytes, mp->msg_lspid,
-	    mp->msg_lrpid);
-
-	printf("stime: %s", ctime(&mp->msg_stime));
-	printf("rtime: %s", ctime(&mp->msg_rtime));
-	printf("ctime: %s", ctime(&mp->msg_ctime));
-
-	/*
-	 * Sanity check a few things.
-	 */
-
-	tst_resm (mp->msg_perm.uid != uid || mp->msg_perm.cuid != uid
-		  ? TFAIL : TPASS, "uid matches");
-
-	tst_resm (mp->msg_perm.gid != gid || mp->msg_perm.cgid != gid
-		  ? TFAIL : TPASS, "gid matches");
-
-	tst_resm ((mp->msg_perm.mode & 0777) != mode ? TFAIL : TPASS,
-		  "mode matches");
-}
-
-void
-receiver()
-{
-	struct test_mymsg m;
-	int msqid;
-
-	tst_resm ((msqid = msgget(msgkey, 0)) == -1 ? TFAIL : TPASS,
-		  "receiver: msgget");
-
-	/*
-	 * Receive the first message, print it, and send an ACK.
-	 */
-
-	tst_resm (msgrcv(msqid, &m, sizeof(m), MTYPE_1, 0) != sizeof(m)
-		   ? TFAIL : TPASS, "receiver: msgrcv 1");
-
-	printf("%s\n", m.mtext);
-	tst_resm (strcmp(m.mtext, m1_str) != 0 ? TFAIL : TPASS, 
-		  "receiver: message 1 data is correct");
-
-	m.mtype = MTYPE_1_ACK;
-
-	tst_resm (msgsnd(msqid, &m, sizeof(m), 0) == -1 ? TFAIL : TPASS, 
-		  "receiver: msgsnd ack 1");
-
-	/*
-	 * Receive the second message, print it, and send an ACK.
-	 */
-
-	tst_resm (msgrcv(msqid, &m, sizeof(m), MTYPE_2, 0) != sizeof(m)
-		  ? TFAIL : TPASS, "receiver: msgrcv 2");
-
-	printf("%s\n", m.mtext);
-	tst_resm (strcmp(m.mtext, m2_str) != 0 ? TFAIL : TPASS, 
-		  "receiver: message 2 data is correct");
-
-	m.mtype = MTYPE_2_ACK;
-
-	tst_resm (msgsnd(msqid, &m, sizeof(m), 0) == -1 ? TFAIL : TPASS, 
-		  "receiver: msgsnd ack 2");
-
-	/* Allow parent to receive message before getting SIGCHLD. */
-	sleep (1);
-	exit(0);
-}
diff --git a/winsup/testsuite/winsup.api/nullgetcwd.c b/winsup/testsuite/winsup.api/nullgetcwd.c
deleted file mode 100644
index 25bdf4514..000000000
--- a/winsup/testsuite/winsup.api/nullgetcwd.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-int
-main (int argc, char **argv)
-{
-  char *cwd = getcwd (NULL, 256);
-  if (cwd == NULL)
-    {
-      fprintf (stderr, "%s: getcwd returns NULL\n", argv[0]);
-      exit (1);
-    }
-
-  exit (0);
-}
-
diff --git a/winsup/testsuite/winsup.api/pthread/cancel1.c b/winsup/testsuite/winsup.api/pthread/cancel1.c
deleted file mode 100644
index 96ae390ce..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel1.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * File: cancel1.c
- *
- * Test Synopsis: Test setting cancel state and cancel type.
- * - 
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * - pthread_setcancelstate function
- * - pthread_setcanceltype function
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - pthread_create, pthread_self work.
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-/*
- * Create NUMTHREADS threads in addition to the Main thread.
- */
-enum {
-  NUMTHREADS = 10
-};
-
-typedef struct bag_t_ bag_t;
-struct bag_t_ {
-  int threadnum;
-  int started;
-  /* Add more per-thread state variables here */
-};
-
-static bag_t threadbag[NUMTHREADS + 1];
-
-void *
-mythread(void * arg)
-{
-  bag_t * bag = (bag_t *) arg;
-
-  assert(bag == &threadbag[bag->threadnum]);
-  assert(bag->started == 0);
-  bag->started = 1;
-
-  /* ... */
-  {
-    int oldstate;
-    int oldtype;
-
-    assert(pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldstate) == 0);
-    assert(oldstate == PTHREAD_CANCEL_ENABLE); /* Check default */
-    assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);
-    assert(pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL) == 0);
-    assert(pthread_setcancelstate(oldstate, &oldstate) == 0);
-    assert(oldstate == PTHREAD_CANCEL_DISABLE); /* Check setting */
-
-    assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &oldtype) == 0);
-    assert(oldtype == PTHREAD_CANCEL_DEFERRED); /* Check default */
-    assert(pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL) == 0);
-    assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);
-    assert(pthread_setcanceltype(oldtype, &oldtype) == 0);
-    assert(oldtype == PTHREAD_CANCEL_ASYNCHRONOUS); /* Check setting */
-  }
-
-  return 0;
-}
-
-int
-main()
-{
-  int failed = 0;
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      threadbag[i].started = 0;
-      threadbag[i].threadnum = i;
-      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
-    }
-
-  /*
-   * Code to control or munipulate child threads should probably go here.
-   */
-
-  /*
-   * Give threads time to run.
-   */
-  Sleep(NUMTHREADS * 1000);
-
-  /*
-   * Standard check that all threads started.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      failed = !threadbag[i].started;
-
-      if (failed)
-	{
-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-	}
-    }
-
-  assert(!failed);
-
-  /*
-   * Check any results here. Set "failed" and only print ouput on failure.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      /* ... */
-    }
-
-  assert(!failed);
-
-  /*
-   * Success.
-   */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/cancel10.c b/winsup/testsuite/winsup.api/pthread/cancel10.c
deleted file mode 100644
index 5e0cc6770..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel10.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * File: cancel10.c
- *
- * Test Synopsis: Test if system is a cancellation point.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_cancel, pthread_setcancelstate
- *   pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-static int cancelled = 0;
-
-static void *Thread(void *punused)
-{
-  while (!cancelled)
-    Sleep (0);
-
-  system (NULL);
-
-  return NULL;
-}
-
-int main (void)
-{
-  void * result;
-  pthread_t t;
-
-  assert (pthread_create (&t, NULL, Thread, NULL) == 0);
-  assert (pthread_cancel (t) == 0);
-  cancelled = 1;
-  assert (pthread_join (t, &result) == 0);
-  assert (result == PTHREAD_CANCELED);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/cancel11.c b/winsup/testsuite/winsup.api/pthread/cancel11.c
deleted file mode 100644
index b6554ed69..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel11.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * File: cancel11.c
- *
- * Test Synopsis: Test if system is a cancellation point.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_cancel, pthread_setcancelstate
- *   pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-static void sig_handler(int sig)
-{
-}
-
-static void *Thread(void *punused)
-{
-  system ("sleep 10");
-
-  return NULL;
-}
-
-int main (void)
-{
-  void * result;
-  pthread_t t;
-
-  signal (SIGINT, sig_handler);
-
-  assert (pthread_create (&t, NULL, Thread, NULL) == 0);
-  sleep (5);
-  assert (pthread_cancel (t) == 0);
-  assert (pthread_join (t, &result) == 0);
-  assert (result == PTHREAD_CANCELED);
-
-  assert ((void *)signal (SIGINT, NULL) == sig_handler);
-
-  /* Wait until child process has terminated */
-  sleep (10);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/cancel12.c b/winsup/testsuite/winsup.api/pthread/cancel12.c
deleted file mode 100644
index 12273d676..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel12.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * File: cancel12.c
- *
- * Test Synopsis: Test if system is a cancellation point.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_cancel, pthread_setcancelstate
- *   pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-static void sig_handler(int sig)
-{
-}
-
-static void *Thread(void *punused)
-{
-  signal (SIGINT, sig_handler);
-
-  system ("sleep 5");
-
-  assert ((void *)signal (SIGINT, NULL) == sig_handler);
-
-  return NULL;
-}
-
-int main (void)
-{
-  void * result;
-  pthread_t t;
-
-  assert (pthread_create (&t, NULL, Thread, NULL) == 0);
-  assert (pthread_join (t, &result) == 0);
-  assert (result == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/cancel2.c b/winsup/testsuite/winsup.api/pthread/cancel2.c
deleted file mode 100644
index 2d99c3414..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel2.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * File: cancel2.c
- *
- * Test Synopsis: Test SEH or C++ cancel exception handling within
- * application exception blocks.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_self, pthread_mutex_lock/unlock
- *   pthread_testcancel, pthread_cancel, pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-/*
- * Create NUMTHREADS threads in addition to the Main thread.
- */
-enum {
-  NUMTHREADS = 10
-};
-
-typedef struct bag_t_ bag_t;
-struct bag_t_ {
-  int threadnum;
-  int started;
-  /* Add more per-thread state variables here */
-};
-
-static bag_t threadbag[NUMTHREADS + 1];
-
-static pthread_mutex_t waitLock = PTHREAD_MUTEX_INITIALIZER;
-
-void *
-mythread(void * arg)
-{
-  int result = 0;
-  bag_t * bag = (bag_t *) arg;
-
-  assert(bag == &threadbag[bag->threadnum]);
-  assert(bag->started == 0);
-  bag->started = 1;
-
-  /* Set to known state and type */
-
-  assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);
-
-  switch (bag->threadnum % 2)
-    {
-    case 0:
-      assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);
-      result = 0;
-      break;
-    case 1:
-      assert(pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL) == 0);
-      result = 1;
-      break;
-    }
-
-  /* Wait for go from main */
-  assert(pthread_mutex_lock(&waitLock) == 0);
-  assert(pthread_mutex_unlock(&waitLock) == 0);
-  sched_yield();
-
-  for (;;)
-    {	  
-      pthread_testcancel();
-    }
-
-  return (void *) result;
-}
-
-int
-main()
-{
-  int failed = 0;
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-
-  assert((t[0] = pthread_self()) != NULL);
-  assert(pthread_mutex_lock(&waitLock) == 0);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      threadbag[i].started = 0;
-      threadbag[i].threadnum = i;
-      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
-    }
-
-  /*
-   * Code to control or munipulate child threads should probably go here.
-   */
-  Sleep(500);
-
-  assert(pthread_mutex_unlock(&waitLock) == 0);
-
-  Sleep(500);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      assert(pthread_cancel(t[i]) == 0);
-    }
-
-  /*
-   * Give threads time to run.
-   */
-  Sleep(NUMTHREADS * 100);
-
-  /*
-   * Standard check that all threads started.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      if (!threadbag[i].started)
-	{
-	  failed |= !threadbag[i].started;
-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-	}
-    }
-
-  assert(!failed);
-
-  /*
-   * Check any results here. Set "failed" and only print output on failure.
-   */
-  failed = 0;
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      int fail = 0;
-      int result = 0;
-
-      assert(pthread_join(t[i], (void **) &result) == 0);
-      fail = (result != (int) PTHREAD_CANCELED);
-      if (fail)
-	{
-	  fprintf(stderr, "Thread %d: started %d: location %d: cancel type %s\n",
-		  i,
-		  threadbag[i].started,
-		  result,
-		  ((result % 2) == 0) ? "ASYNCHRONOUS" : "DEFERRED");
-	}
-      failed |= fail;
-    }
-
-  assert(!failed);
-
-  /*
-   * Success.
-   */
-  return 0;
-}
-
diff --git a/winsup/testsuite/winsup.api/pthread/cancel3.c b/winsup/testsuite/winsup.api/pthread/cancel3.c
deleted file mode 100644
index 3ac03e4b6..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel3.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * File: cancel3.c
- *
- * Test Synopsis: Test asynchronous cancelation.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_self, pthread_mutex_lock/unlock
- *   pthread_testcancel, pthread_cancel, pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-/*
- * Create NUMTHREADS threads in addition to the Main thread.
- */
-enum {
-  NUMTHREADS = 10
-};
-
-typedef struct bag_t_ bag_t;
-struct bag_t_ {
-  int threadnum;
-  int started;
-  /* Add more per-thread state variables here */
-  int count;
-};
-
-static bag_t threadbag[NUMTHREADS + 1];
-
-void *
-mythread(void * arg)
-{
-  int result = ((int)PTHREAD_CANCELED + 1);
-  bag_t * bag = (bag_t *) arg;
-
-  assert(bag == &threadbag[bag->threadnum]);
-  assert(bag->started == 0);
-  bag->started = 1;
-
-  /* Set to known state and type */
-
-  assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);
-
-  assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);
-
-  /*
-   * We wait up to 10 seconds, waking every 0.1 seconds,
-   * for a cancelation to be applied to us.
-   */
-  for (bag->count = 0; bag->count < 100; bag->count++)
-    Sleep(100);
-
-  return (void *) result;
-}
-
-int
-main()
-{
-  int failed = 0;
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      threadbag[i].started = 0;
-      threadbag[i].threadnum = i;
-      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
-    }
-
-  /*
-   * Code to control or munipulate child threads should probably go here.
-   */
-  Sleep(500);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      assert(pthread_cancel(t[i]) == 0);
-    }
-
-  /*
-   * Give threads time to run.
-   */
-  Sleep(NUMTHREADS * 100);
-
-  /*
-   * Standard check that all threads started.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      if (!threadbag[i].started)
-	{
-	  failed |= !threadbag[i].started;
-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-	}
-    }
-
-  assert(!failed);
-
-  /*
-   * Check any results here. Set "failed" and only print output on failure.
-   */
-  failed = 0;
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      int fail = 0;
-      int result = 0;
-
-      /*
-       * The thread does not contain any cancelation points, so
-       * a return value of PTHREAD_CANCELED confirms that async
-       * cancelation succeeded.
-       */
-      assert(pthread_join(t[i], (void **) &result) == 0);
-
-      fail = (result != (int) PTHREAD_CANCELED);
-
-      if (fail)
-	{
-	  fprintf(stderr, "Thread %d: started %d: count %d\n",
-		  i,
-		  threadbag[i].started,
-		  threadbag[i].count);
-	}
-      failed = (failed || fail);
-    }
-
-  assert(!failed);
-
-  /*
-   * Success.
-   */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/cancel4.c b/winsup/testsuite/winsup.api/pthread/cancel4.c
deleted file mode 100644
index d6b2ffadf..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel4.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * File: cancel4.c
- *
- * Test Synopsis: Test cancelation does not occur in deferred
- *                cancelation threads with no cancelation points.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - pthread_create
- *   pthread_self
- *   pthread_cancel
- *   pthread_join
- *   pthread_setcancelstate
- *   pthread_setcanceltype
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-/*
- * Create NUMTHREADS threads in addition to the Main thread.
- */
-enum {
-  NUMTHREADS = 10
-};
-
-typedef struct bag_t_ bag_t;
-struct bag_t_ {
-  int threadnum;
-  int started;
-  /* Add more per-thread state variables here */
-  int count;
-};
-
-static bag_t threadbag[NUMTHREADS + 1];
-
-void *
-mythread(void * arg)
-{
-  int result = ((int)PTHREAD_CANCELED + 1);
-  bag_t * bag = (bag_t *) arg;
-
-  assert(bag == &threadbag[bag->threadnum]);
-  assert(bag->started == 0);
-  bag->started = 1;
-
-  /* Set to known state and type */
-
-  assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);
-
-  assert(pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL) == 0);
-
-  /*
-   * We wait up to 10 seconds, waking every 0.1 seconds,
-   * for a cancelation to be applied to us.
-   */
-  for (bag->count = 0; bag->count < 100; bag->count++)
-    Sleep(100);
-
-  return (void *) result;
-}
-
-int
-main()
-{
-  int failed = 0;
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      threadbag[i].started = 0;
-      threadbag[i].threadnum = i;
-      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
-    }
-
-  /*
-   * Code to control or munipulate child threads should probably go here.
-   */
-  Sleep(500);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      assert(pthread_cancel(t[i]) == 0);
-    }
-
-  /*
-   * Give threads time to run.
-   */
-  Sleep(NUMTHREADS * 100);
-
-  /*
-   * Standard check that all threads started.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      if (!threadbag[i].started)
-	{
-	  failed |= !threadbag[i].started;
-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-	}
-    }
-
-  assert(!failed);
-
-  /*
-   * Check any results here. Set "failed" and only print output on failure.
-   */
-  failed = 0;
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      int fail = 0;
-      int result = 0;
-
-      /*
-       * The thread does not contain any cancelation points, so
-       * a return value of PTHREAD_CANCELED indicates that async
-       * cancelation occurred.
-       */
-      assert(pthread_join(t[i], (void **) &result) == 0);
-
-      fail = (result == (int) PTHREAD_CANCELED);
-
-      if (fail)
-	{
-	  fprintf(stderr, "Thread %d: started %d: count %d\n",
-		  i,
-		  threadbag[i].started,
-		  threadbag[i].count);
-	}
-      failed = (failed || fail);
-    }
-
-  assert(!failed);
-
-  /*
-   * Success.
-   */
-  return 0;
-}
-
diff --git a/winsup/testsuite/winsup.api/pthread/cancel5.c b/winsup/testsuite/winsup.api/pthread/cancel5.c
deleted file mode 100644
index 9dd579543..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel5.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*

- * File: cancel5.c

- *

- * Test Synopsis: Test calling pthread_cancel from the main thread

- *                without calling pthread_self() in main.

- *

- * Test Method (Validation or Falsification):

- * - 

- *

- * Requirements Tested:

- * -

- *

- * Features Tested:

- * - 

- *

- * Cases Tested:

- * - 

- *

- * Description:

- * - 

- *

- * Environment:

- * - 

- *

- * Input:

- * - None.

- *

- * Output:

- * - File name, Line number, and failed expression on failure.

- * - No output on success.

- *

- * Assumptions:

- * - have working pthread_create, pthread_self, pthread_mutex_lock/unlock

- *   pthread_testcancel, pthread_cancel, pthread_join

- *

- * Pass Criteria:

- * - Process returns zero exit status.

- *

- * Fail Criteria:

- * - Process returns non-zero exit status.

- */

-

-#include "test.h"

-

-/*

- * Create NUMTHREADS threads in addition to the Main thread.

- */

-enum {

-  NUMTHREADS = 10

-};

-

-typedef struct bag_t_ bag_t;

-struct bag_t_ {

-  int threadnum;

-  int started;

-  /* Add more per-thread state variables here */

-  int count;

-};

-

-static bag_t threadbag[NUMTHREADS + 1];

-

-void *

-mythread(void * arg)

-{

-  int result = ((int)PTHREAD_CANCELED + 1);

-  bag_t * bag = (bag_t *) arg;

-

-  assert(bag == &threadbag[bag->threadnum]);

-  assert(bag->started == 0);

-  bag->started = 1;

-

-  /* Set to known state and type */

-

-  assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);

-

-  assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);

-

-  /*

-   * We wait up to 10 seconds, waking every 0.1 seconds,

-   * for a cancelation to be applied to us.

-   */

-  for (bag->count = 0; bag->count < 100; bag->count++)

-    Sleep(100);

-

-  return (void *) result;

-}

-

-int

-main()

-{

-  int failed = 0;

-  int i;

-  pthread_t t[NUMTHREADS + 1];

-

-  for (i = 1; i <= NUMTHREADS; i++)

-    {

-      threadbag[i].started = 0;

-      threadbag[i].threadnum = i;

-      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);

-    }

-

-  /*

-   * Code to control or munipulate child threads should probably go here.

-   */

-  Sleep(500);

-

-  for (i = 1; i <= NUMTHREADS; i++)

-    {

-      assert(pthread_cancel(t[i]) == 0);

-    }

-

-  /*

-   * Give threads time to run.

-   */

-  Sleep(NUMTHREADS * 100);

-

-  /*

-   * Standard check that all threads started.

-   */

-  for (i = 1; i <= NUMTHREADS; i++)

-    { 

-      if (!threadbag[i].started)

-	{

-	  failed |= !threadbag[i].started;

-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);

-	}

-    }

-

-  assert(!failed);

-

-  /*

-   * Check any results here. Set "failed" and only print output on failure.

-   */

-  failed = 0;

-  for (i = 1; i <= NUMTHREADS; i++)

-    {

-      int fail = 0;

-      int result = 0;

-

-      /*

-       * The thread does not contain any cancelation points, so

-       * a return value of PTHREAD_CANCELED confirms that async

-       * cancelation succeeded.

-       */

-      assert(pthread_join(t[i], (void **) &result) == 0);

-

-      fail = (result != (int) PTHREAD_CANCELED);

-

-      if (fail)

-	{

-	  fprintf(stderr, "Thread %d: started %d: count %d\n",

-		  i,

-		  threadbag[i].started,

-		  threadbag[i].count);

-	}

-      failed = (failed || fail);

-    }

-

-  assert(!failed);

-

-  /*

-   * Success.

-   */

-  return 0;

-}

diff --git a/winsup/testsuite/winsup.api/pthread/cancel6.c b/winsup/testsuite/winsup.api/pthread/cancel6.c
deleted file mode 100644
index 8f0bdd849..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel6.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * File: cancel6.c
- *
- * Test Synopsis: Test if pause is a cancellation point.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_cancel, pthread_setcancelstate
- *   pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-static void *Thread(void *punused)
-{
-  pause ();
-
-  return NULL;
-}
-
-int main (void)
-{
-  void * result;
-  pthread_t t;
-
-  assert (pthread_create (&t, NULL, Thread, NULL) == 0);
-  assert (pthread_cancel (t) == 0);
-  assert (pthread_join (t, &result) == 0);
-  assert (result == PTHREAD_CANCELED);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/cancel7.c b/winsup/testsuite/winsup.api/pthread/cancel7.c
deleted file mode 100644
index 7a631f695..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel7.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * File: cancel7.c
- *
- * Test Synopsis: Test if sleep is a cancellation point.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_cancel, pthread_setcancelstate
- *   pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-static int has5secsleeped = 0;
-
-static void *Thread(void *punused)
-{
-  assert (pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL) == 0);
-  /* thread should sleep 5 seconds and not get canceled */
-  sleep(5);
-  has5secsleeped = 1;
-  assert (pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL) == 0);
-  /* thread should cancel here */
-  sleep (5);
-
-  return NULL;
-}
-
-int main (void)
-{
-  void * result;
-  pthread_t t;
-
-  assert (pthread_create (&t, NULL, Thread, NULL) == 0);
-  assert (pthread_cancel (t) == 0);
-  assert (pthread_join (t, &result) == 0);
-  assert (has5secsleeped == 1);
-  assert (result == PTHREAD_CANCELED);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/cancel8.c b/winsup/testsuite/winsup.api/pthread/cancel8.c
deleted file mode 100644
index fb30fd93b..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel8.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * File: cancel8.c
- *
- * Test Synopsis: Test if usleep is a cancellation point.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_cancel, pthread_setcancelstate
- *   pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-static int has5secsleeped = 0;
-
-static void *Thread(void *punused)
-{
-  assert (pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL) == 0);
-  /* thread should usleep 5 seconds and not get canceled */
-  usleep(5000000);
-  has5secsleeped = 1;
-  assert (pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, NULL) == 0);
-  /* thread should cancel here */
-  usleep(5000000);
-
-  return NULL;
-}
-
-int main (void)
-{
-  void * result;
-  pthread_t t;
-
-  assert (pthread_create (&t, NULL, Thread, NULL) == 0);
-  assert (pthread_cancel (t) == 0);
-  assert (pthread_join (t, &result) == 0);
-  assert (has5secsleeped == 1);
-  assert (result == PTHREAD_CANCELED);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/cancel9.c b/winsup/testsuite/winsup.api/pthread/cancel9.c
deleted file mode 100644
index 1cbf62d2c..000000000
--- a/winsup/testsuite/winsup.api/pthread/cancel9.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * File: cancel9.c
- *
- * Test Synopsis: Test if waitpid is a cancellation point.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_cancel, pthread_setcancelstate
- *   pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <assert.h>
-#include <sys/wait.h>
-
-static pid_t pid;
-
-static void *Thread(void *punused)
-{
-  int res;
-
-  pid = fork ();
-  assert (pid != -1);
-  switch (pid)
-    {
-    case 0:
-      sleep (10);
-      break;
-    default:
-      assert (waitpid (pid, &res, 0) != -1);
-    }
-
-  return NULL;
-}
-
-int main (void)
-{
-  int res;
-
-  void * result;
-  pthread_t t;
-
-  assert (pthread_create (&t, NULL, Thread, NULL) == 0);
-  sleep (5);
-  assert (pthread_cancel (t) == 0);
-  assert (pthread_join (t, &result) == 0);
-  assert (result == PTHREAD_CANCELED);
-  assert (waitpid (pid, &res, 0) != -1);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/cleanup2.c b/winsup/testsuite/winsup.api/pthread/cleanup2.c
deleted file mode 100644
index bcbaad3a7..000000000
--- a/winsup/testsuite/winsup.api/pthread/cleanup2.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * File: cleanup2.c
- *
- * Test Synopsis: Test cleanup handler executes (when thread is not canceled).
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_self, pthread_mutex_lock/unlock
- *   pthread_testcancel, pthread_cancel, pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-/*
- * Create NUMTHREADS threads in addition to the Main thread.
- */
-enum {
-  NUMTHREADS = 10
-};
-
-typedef struct bag_t_ bag_t;
-struct bag_t_ {
-  int threadnum;
-  int started;
-  /* Add more per-thread state variables here */
-  int count;
-};
-
-static bag_t threadbag[NUMTHREADS + 1];
-
-static int pop_count = 0;
-
-static void
-increment_pop_count(void * arg)
-{
-  int * c = (int *) arg;
-
-  (*c)++;
-}
-
-void *
-mythread(void * arg)
-{
-  int result = 0;
-  bag_t * bag = (bag_t *) arg;
-
-  assert(bag == &threadbag[bag->threadnum]);
-  assert(bag->started == 0);
-  bag->started = 1;
-
-  pthread_cleanup_push(increment_pop_count, (void *) &pop_count);
-
-  sched_yield();
-
-  pthread_cleanup_pop(1);
-
-  return (void *) result;
-}
-
-int
-main()
-{
-  int failed = 0;
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      threadbag[i].started = 0;
-      threadbag[i].threadnum = i;
-      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
-    }
-
-  /*
-   * Code to control or munipulate child threads should probably go here.
-   */
-  Sleep(1000);
-
-  /*
-   * Standard check that all threads started.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      if (!threadbag[i].started)
-	{
-	  failed |= !threadbag[i].started;
-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-	}
-    }
-
-  assert(!failed);
-
-  /*
-   * Check any results here. Set "failed" and only print output on failure.
-   */
-  failed = 0;
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      int fail = 0;
-      int result = 0;
-
-      assert(pthread_join(t[i], (void **) &result) == 0);
-
-      fail = (result != 0);
-
-      if (fail)
-	{
-	  fprintf(stderr, "Thread %d: started %d: result: %d\n",
-		  i,
-		  threadbag[i].started,
-		  result);
-	}
-      failed = (failed || fail);
-    }
-
-  assert(!failed);
-
-  assert(pop_count == NUMTHREADS);
-
-  /*
-   * Success.
-   */
-  return 0;
-}
-
diff --git a/winsup/testsuite/winsup.api/pthread/cleanup3.c b/winsup/testsuite/winsup.api/pthread/cleanup3.c
deleted file mode 100644
index f8201faa0..000000000
--- a/winsup/testsuite/winsup.api/pthread/cleanup3.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * File: cleanup3.c
- *
- * Test Synopsis: Test cleanup handler does not execute (when thread is
- * not canceled).
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - have working pthread_create, pthread_self, pthread_mutex_lock/unlock
- *   pthread_testcancel, pthread_cancel, pthread_join
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-/*
- * Create NUMTHREADS threads in addition to the Main thread.
- */
-enum {
-  NUMTHREADS = 10
-};
-
-typedef struct bag_t_ bag_t;
-struct bag_t_ {
-  int threadnum;
-  int started;
-  /* Add more per-thread state variables here */
-  int count;
-};
-
-static bag_t threadbag[NUMTHREADS + 1];
-
-static int pop_count = 0;
-
-static void
-increment_pop_count(void * arg)
-{
-  int * c = (int *) arg;
-
-  (*c)++;
-}
-
-void *
-mythread(void * arg)
-{
-  int result = 0;
-  bag_t * bag = (bag_t *) arg;
-
-  assert(bag == &threadbag[bag->threadnum]);
-  assert(bag->started == 0);
-  bag->started = 1;
-
-  pthread_cleanup_push(increment_pop_count, (void *) &pop_count);
-
-  sched_yield();
-
-  pop_count--;
-
-  pthread_cleanup_pop(0);
-
-  return (void *) result;
-}
-
-int
-main()
-{
-  int failed = 0;
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      threadbag[i].started = 0;
-      threadbag[i].threadnum = i;
-      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
-    }
-
-  /*
-   * Code to control or munipulate child threads should probably go here.
-   */
-  Sleep(1000);
-
-  /*
-   * Standard check that all threads started.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      if (!threadbag[i].started)
-	{
-	  failed |= !threadbag[i].started;
-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-	}
-    }
-
-  assert(!failed);
-
-  /*
-   * Check any results here. Set "failed" and only print output on failure.
-   */
-  failed = 0;
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      int fail = 0;
-      int result = 0;
-
-      assert(pthread_join(t[i], (void **) &result) == 0);
-
-      fail = (result != 0);
-
-      if (fail)
-	{
-	  fprintf(stderr, "Thread %d: started %d: result: %d\n",
-		  i,
-		  threadbag[i].started,
-		  result);
-	}
-      failed = (failed || fail);
-    }
-
-  assert(!failed);
-
-  assert(pop_count == -(NUMTHREADS));
-
-  /*
-   * Success.
-   */
-  return 0;
-}
-
diff --git a/winsup/testsuite/winsup.api/pthread/condvar1.c b/winsup/testsuite/winsup.api/pthread/condvar1.c
deleted file mode 100644
index daa0f420e..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar1.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * File: condvar1.c
- *
- * Test Synopsis:
- * - Test initialisation and destruction of a CV.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Creates and then imediately destroys a CV. Does not
- *   test the CV.
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - pthread_cond_init returns 0, and
- * - pthread_cond_destroy returns 0.
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - pthread_cond_init returns non-zero, or
- * - pthread_cond_destroy returns non-zero.
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-static pthread_cond_t cv = NULL;
-
-int
-main()
-{
-  assert(cv == NULL);
-
-  assert(pthread_cond_init(&cv, NULL) == 0);
-
-  assert(cv != NULL);
-
-  assert(pthread_cond_destroy(&cv) == 0);
-
-  assert(cv == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar2.c b/winsup/testsuite/winsup.api/pthread/condvar2.c
deleted file mode 100644
index 309f5dfdf..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar2.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * File: condvar2.c
- *
- * Test Synopsis:
- * - Test timed wait on a CV.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Because the CV is never signaled, we expect the wait to time out.
- *
- * Environment:
- * -
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - pthread_cond_timedwait returns ETIMEDOUT.
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - pthread_cond_timedwait does not return ETIMEDOUT.
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-pthread_cond_t cv;
-pthread_mutex_t mutex;
-
-int
-main()
-{
-  struct timespec abstime = { 0, 0 };
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-  int result;
-
-  assert(pthread_cond_init(&cv, NULL) == 0);
-
-  assert(pthread_mutex_init(&mutex, NULL) == 0);
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  /* get current system time */
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  abstime.tv_sec += 5;
-
-  assert(pthread_cond_timedwait(&cv, &mutex, &abstime) == ETIMEDOUT);
-  
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  result = pthread_cond_destroy(&cv);
-  assert(result == 0);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar2_1.c b/winsup/testsuite/winsup.api/pthread/condvar2_1.c
deleted file mode 100644
index da3416203..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar2_1.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * File: condvar2_1.c
- *
- * Test Synopsis:
- * - Test timeout of multiple waits on a CV with no signal/broadcast.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Because the CV is never signaled, we expect the waits to time out.
- *
- * Environment:
- * -
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - pthread_cond_timedwait returns ETIMEDOUT.
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - pthread_cond_timedwait does not return ETIMEDOUT.
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-static pthread_cond_t cv;
-static pthread_mutex_t mutex;
-static struct timespec abstime = { 0, 0 };
-
-enum {
-  NUMTHREADS = 60
-};
-
-void *
-mythread(void * arg)
-{
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  assert(pthread_cond_timedwait(&cv, &mutex, &abstime) == ETIMEDOUT);
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  return arg;
-}
-
-int
-main()
-{
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-  int result = 0;
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-  assert(pthread_cond_init(&cv, NULL) == 0);
-
-  assert(pthread_mutex_init(&mutex, NULL) == 0);
-
-  /* get current system time */
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  abstime.tv_sec += 5;
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      assert(pthread_create(&t[i], NULL, mythread, (void *) i) == 0);
-    }
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      assert(pthread_join(t[i], (void **) &result) == 0);
-      assert(result == i);
-    }
-
-  result = pthread_cond_destroy(&cv);
-  assert(result == 0);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar3.c b/winsup/testsuite/winsup.api/pthread/condvar3.c
deleted file mode 100644
index 249e260aa..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar3.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * File: condvar3.c
- *
- * Test Synopsis:
- * - Test basic function of a CV
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - The primary thread takes the lock before creating any threads.
- *   The secondary thread blocks on the lock allowing the primary
- *   thread to enter the cv wait state which releases the lock.
- *   The secondary thread then takes the lock and signals the waiting
- *   primary thread.
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - pthread_cond_timedwait returns 0.
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - pthread_cond_timedwait returns ETIMEDOUT.
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-static pthread_cond_t cv;
-static pthread_mutex_t mutex;
-static int shared = 0;
-
-enum {
-  NUMTHREADS = 2         /* Including the primary thread. */
-};
-
-void *
-mythread(void * arg)
-{
-  int result = 0;
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  shared++;
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  if ((result = pthread_cond_signal(&cv)) != 0)
-    {
-      printf("Error = %s\n", error_string[result]);
-    }
-  assert(result == 0);
-
-  return (void *) 0;
-}
-
-int
-main()
-{
-  pthread_t t[NUMTHREADS];
-  struct timespec abstime = { 0, 0 };
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  assert(pthread_cond_init(&cv, NULL) == 0);
-
-  assert(pthread_mutex_init(&mutex, NULL) == 0);
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  /* get current system time */
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  assert(pthread_create(&t[1], NULL, mythread, (void *) 1) == 0);
-
-  abstime.tv_sec += 5;
-
-  while (! (shared > 0))
-    assert(pthread_cond_timedwait(&cv, &mutex, &abstime) == 0);
-
-  assert(shared > 0);
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  assert(pthread_cond_destroy(&cv) == 0);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar3_1.c b/winsup/testsuite/winsup.api/pthread/condvar3_1.c
deleted file mode 100644
index b08b04889..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar3_1.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * File: condvar3_1.c
- *
- * Test Synopsis:
- * - Test timeout of multiple waits on a CV with some signaled.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Because some CVs are never signaled, we expect their waits to time out.
- *   Some are signaled, the rest time out. Pthread_cond_destroy() will fail
- *   unless all are accounted for, either signaled or timedout.
- *
- * Environment:
- * -
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - pthread_cond_timedwait returns ETIMEDOUT.
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - pthread_cond_timedwait does not return ETIMEDOUT.
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-static pthread_cond_t cv;
-static pthread_cond_t cv1;
-static pthread_mutex_t mutex;
-static struct timespec abstime = { 0, 0 };
-static int timedout = 0;
-static int signaled = 0;
-static int awoken = 0;
-static int waiting = 0;
-
-enum {
-  NUMTHREADS = 60
-};
-
-void *
-mythread(void * arg)
-{
-  int result;
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  if ( ++waiting == NUMTHREADS)
-    assert(pthread_cond_signal(&cv1) == 0);
-
-  result = pthread_cond_timedwait(&cv, &mutex, &abstime);
-  if (result == ETIMEDOUT)
-    {
-      timedout++;
-    }
-  else
-    {
-      awoken++;
-    }
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  return arg;
-}
-
-int
-main()
-{
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-  int result = 0;
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-  assert(pthread_cond_init(&cv, NULL) == 0);
-  assert(pthread_cond_init(&cv1, NULL) == 0);
-
-  assert(pthread_mutex_init(&mutex, NULL) == 0);
-
-  /* get current system time */
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  abstime.tv_sec += 5;
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      assert(pthread_create(&t[i], NULL, mythread, (void *) i) == 0);
-    }
-
-  do {
-    assert(pthread_cond_wait(&cv1,&mutex) == 0);
-  } while ( NUMTHREADS != waiting );
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  for (i = NUMTHREADS/3; i <= 2*NUMTHREADS/3; i++)
-    {
-      assert(pthread_cond_signal(&cv) == 0);
-      signaled++;
-    }
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      assert(pthread_join(t[i], (void **) &result) == 0);
-        assert(result == i);
-    }
-
-  printf("awk = %d\n", awoken);
-  printf("sig = %d\n", signaled);
-  printf("tot = %d\n", timedout);
-
-  assert(signaled == awoken);
-  assert(timedout == NUMTHREADS - signaled);
-
-  result = pthread_cond_destroy(&cv);
-  assert(result == 0);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar3_2.c b/winsup/testsuite/winsup.api/pthread/condvar3_2.c
deleted file mode 100644
index 57e7eb439..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar3_2.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * File: condvar3_2.c
- *
- * Test Synopsis:
- * - Test timeout of multiple waits on a CV with remainder broadcast awoken.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Because some CVs are never signaled, we expect their waits to time out.
- *   Some time out, the rest are broadcast signaled. Pthread_cond_destroy() will fail
- *   unless all are accounted for, either signaled or timedout.
- *
- * Environment:
- * -
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - pthread_cond_timedwait returns ETIMEDOUT.
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - pthread_cond_timedwait does not return ETIMEDOUT.
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-static pthread_cond_t cv;
-static pthread_mutex_t mutex;
-static struct timespec abstime = { 0, 0 };
-static struct timespec abstime2 = { 0, 0 };
-static int timedout = 0;
-static int awoken = 0;
-
-enum {
-  NUMTHREADS = 60
-};
-
-void *
-mythread(void * arg)
-{
-  int result;
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  abstime2.tv_sec = abstime.tv_sec;
-
-  if ((int) arg % 3 == 0)
-    {
-      abstime2.tv_sec += 2;
-    }
-
-  result = pthread_cond_timedwait(&cv, &mutex, &abstime2);
-  if (result == ETIMEDOUT)
-    {
-      timedout++;
-    }
-  else
-    {
-      awoken++;
-    }
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  return arg;
-}
-
-int
-main()
-{
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-  int result = 0;
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-  assert(pthread_cond_init(&cv, NULL) == 0);
-
-  assert(pthread_mutex_init(&mutex, NULL) == 0);
-
-  /* get current system time */
-  ftime(&currSysTime);
-
-  abstime.tv_sec = abstime.tv_sec = currSysTime.time + 5;
-  abstime.tv_nsec = abstime2.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      assert(pthread_create(&t[i], NULL, mythread, (void *) i) == 0);
-    }
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      assert(pthread_join(t[i], (void **) &result) == 0);
-	assert(result == i);
-      /*
-       * Approximately 2/3rds of the threads are expected to time out.
-       * Signal the remainder after some threads have woken up and exited
-       * and while some are still waking up after timeout.
-       * Also tests that redundant broadcasts don't return errors.
-       */
-      if (awoken > NUMTHREADS/3)
-        {
-          assert(pthread_cond_broadcast(&cv) == 0);
-        }
-    }
-
-  assert(awoken == NUMTHREADS - timedout);
-
-  result = pthread_cond_destroy(&cv);
-  assert(result == 0);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar3_3.c b/winsup/testsuite/winsup.api/pthread/condvar3_3.c
deleted file mode 100644
index f6bcca9fa..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar3_3.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * File: condvar3_3.c
- *
- * Test Synopsis:
- * - Test timeouts and lost signals on a CV.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * -
- *
- * Environment:
- * -
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - pthread_cond_timedwait returns ETIMEDOUT.
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - pthread_cond_timedwait does not return ETIMEDOUT.
- * - Process returns non-zero exit status.
- */
-
-/* Timur Aydin (taydin@snet.net) */
-
-#include "test.h"
-
-#include <sys/timeb.h>
-
-pthread_cond_t cnd;
-pthread_mutex_t mtx;
-
-int main()
-{
-   int rc;
-
-   struct timespec abstime = { 0, 0 };
-   struct timeb currSysTime;
-   const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-   assert(pthread_cond_init(&cnd, 0) == 0);
-   assert(pthread_mutex_init(&mtx, 0) == 0);
-
-   /* get current system time */
-   ftime(&currSysTime);
-
-   abstime.tv_sec = currSysTime.time;
-   abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-   abstime.tv_sec += 1;
-
-   /* Here pthread_cond_timedwait should time out after one second. */
-
-   assert(pthread_mutex_lock(&mtx) == 0);
-
-   assert((rc = pthread_cond_timedwait(&cnd, &mtx, &abstime)) == ETIMEDOUT);
-
-   assert(pthread_mutex_unlock(&mtx) == 0);
-
-   /* Here, the condition variable is signaled, but there are no
-      threads waiting on it. The signal should be lost and
-      the next pthread_cond_timedwait should time out too. */
-
-   assert(pthread_mutex_lock(&mtx) == 0);
-
-   assert((rc = pthread_cond_signal(&cnd)) == 0);
-
-   assert(pthread_mutex_unlock(&mtx) == 0);
-
-   assert(pthread_mutex_lock(&mtx) == 0);
-
-   abstime.tv_sec = currSysTime.time;
-   abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-   abstime.tv_sec += 1;
-
-   assert((rc = pthread_cond_timedwait(&cnd, &mtx, &abstime)) == ETIMEDOUT);
-
-   assert(pthread_mutex_unlock(&mtx) == 0);
-
-   return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar4.c b/winsup/testsuite/winsup.api/pthread/condvar4.c
deleted file mode 100644
index 7a2007a4a..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar4.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * File: condvar4.c
- *
- * Test Synopsis:
- * - Test PTHREAD_COND_INITIALIZER.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Test basic CV function but starting with a static initialised
- *   CV.
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - pthread_cond_timedwait returns 0.
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - pthread_cond_timedwait returns ETIMEDOUT.
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-typedef struct cvthing_t_ cvthing_t;
-
-struct cvthing_t_ {
-  pthread_cond_t notbusy;
-  pthread_mutex_t lock;
-  int shared;
-};
-
-static cvthing_t cvthing = {
-  PTHREAD_COND_INITIALIZER,
-  PTHREAD_MUTEX_INITIALIZER,
-  0
-};
-
-enum {
-  NUMTHREADS = 2
-};
-
-void *
-mythread(void * arg)
-{
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  cvthing.shared++;
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  assert(pthread_cond_signal(&cvthing.notbusy) == 0);
-
-  return (void *) 0;
-}
-
-int
-main()
-{
-  pthread_t t[NUMTHREADS];
-  struct timespec abstime = { 0, 0 };
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-  cvthing.shared = 0;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  assert(cvthing.notbusy == PTHREAD_COND_INITIALIZER);
-
-  assert(cvthing.lock == PTHREAD_MUTEX_INITIALIZER);
-
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  assert(cvthing.lock != PTHREAD_MUTEX_INITIALIZER);
-
-  /* get current system time */
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  abstime.tv_sec += 5;
-
-  assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == ETIMEDOUT);
-  
-  assert(cvthing.notbusy != PTHREAD_COND_INITIALIZER);
-
-  assert(pthread_create(&t[1], NULL, mythread, (void *) 1) == 0);
-
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  abstime.tv_sec += 5;
-
-  while (! (cvthing.shared > 0))
-    assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
-
-  assert(cvthing.shared > 0);
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  assert(pthread_mutex_destroy(&cvthing.lock) == 0);
-
-  assert(cvthing.lock == NULL);
-
-  assert(pthread_cond_destroy(&cvthing.notbusy) == 0);
-
-  assert(cvthing.notbusy == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar5.c b/winsup/testsuite/winsup.api/pthread/condvar5.c
deleted file mode 100644
index b493ab136..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar5.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * File: condvar5.c
- *
- * Test Synopsis:
- * - Test pthread_cond_broadcast.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Test broadcast with one waiting CV.
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - pthread_cond_timedwait returns 0.
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - pthread_cond_timedwait returns ETIMEDOUT.
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-typedef struct cvthing_t_ cvthing_t;
-
-struct cvthing_t_ {
-  pthread_cond_t notbusy;
-  pthread_mutex_t lock;
-  int shared;
-};
-
-static cvthing_t cvthing = {
-  PTHREAD_COND_INITIALIZER,
-  PTHREAD_MUTEX_INITIALIZER,
-  0
-};
-
-enum {
-  NUMTHREADS = 2
-};
-
-void *
-mythread(void * arg)
-{
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  cvthing.shared++;
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  assert(pthread_cond_broadcast(&cvthing.notbusy) == 0);
-
-  return (void *) 0;
-}
-
-int
-main()
-{
-  pthread_t t[NUMTHREADS];
-  struct timespec abstime = { 0, 0 };
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-  cvthing.shared = 0;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  assert(cvthing.notbusy == PTHREAD_COND_INITIALIZER);
-
-  assert(cvthing.lock == PTHREAD_MUTEX_INITIALIZER);
-
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  assert(cvthing.lock != PTHREAD_MUTEX_INITIALIZER);
-
-  /* get current system time */
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  abstime.tv_sec += 5;
-
-  assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == ETIMEDOUT);
-  
-  assert(cvthing.notbusy != PTHREAD_COND_INITIALIZER);
-
-  assert(pthread_create(&t[1], NULL, mythread, (void *) 1) == 0);
-
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  abstime.tv_sec += 5;
-
-  while (! (cvthing.shared > 0))
-    assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
-
-  assert(cvthing.shared > 0);
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  assert(pthread_mutex_destroy(&cvthing.lock) == 0);
-
-  assert(cvthing.lock == NULL);
-
-  assert(pthread_cond_destroy(&cvthing.notbusy) == 0);
-
-  assert(cvthing.notbusy == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar6.c b/winsup/testsuite/winsup.api/pthread/condvar6.c
deleted file mode 100644
index f011bea13..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar6.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * File: 
- *
- * Test Synopsis:
- * - Test pthread_cond_broadcast.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Test broadcast with NUMTHREADS (=5) waiting CVs.
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-/*
- * Create NUMTHREADS threads in addition to the Main thread.
- */
-enum {
-  NUMTHREADS = 5
-};
-
-typedef struct bag_t_ bag_t;
-struct bag_t_ {
-  int threadnum;
-  int started;
-  /* Add more per-thread state variables here */
-};
-
-static bag_t threadbag[NUMTHREADS + 1];
-
-typedef struct cvthing_t_ cvthing_t;
-
-struct cvthing_t_ {
-  pthread_cond_t notbusy;
-  pthread_mutex_t lock;
-  int shared;
-};
-
-static cvthing_t cvthing = {
-  PTHREAD_COND_INITIALIZER,
-  PTHREAD_MUTEX_INITIALIZER,
-  0
-};
-
-static pthread_mutex_t start_flag = PTHREAD_MUTEX_INITIALIZER;
-
-static struct timespec abstime = { 0, 0 };
-
-static int awoken;
-
-void *
-mythread(void * arg)
-{
-  bag_t * bag = (bag_t *) arg;
-
-  assert(bag == &threadbag[bag->threadnum]);
-  assert(bag->started == 0);
-  bag->started = 1;
-
-  /* Wait for the start gun */
-  assert(pthread_mutex_lock(&start_flag) == 0);
-  assert(pthread_mutex_unlock(&start_flag) == 0);
-
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  while (! (cvthing.shared > 0))
-    assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
-
-  assert(cvthing.shared > 0);
-
-  awoken++;
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  return (void *) 0;
-}
-
-int
-main()
-{
-  int failed = 0;
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-  cvthing.shared = 0;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  assert(cvthing.notbusy == PTHREAD_COND_INITIALIZER);
-
-  assert(cvthing.lock == PTHREAD_MUTEX_INITIALIZER);
-
-  assert(pthread_mutex_lock(&start_flag) == 0);
-
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  abstime.tv_sec += 5;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  awoken = 0;
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      threadbag[i].started = 0;
-      threadbag[i].threadnum = i;
-      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
-    }
-
-  /*
-   * Code to control or munipulate child threads should probably go here.
-   */
-
-  assert(pthread_mutex_unlock(&start_flag) == 0);
-
-  /*
-   * Give threads time to start.
-   */
-  Sleep(2000);
-
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  cvthing.shared++;
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  assert(pthread_cond_broadcast(&cvthing.notbusy) == 0);
-
-  /*
-   * Give threads time to complete.
-   */
-  Sleep(2000);
-
-  /* 
-   * Cleanup the CV.
-   */
-  
-  assert(pthread_mutex_destroy(&cvthing.lock) == 0);
-
-  assert(cvthing.lock == NULL);
-
-  assert(pthread_cond_destroy(&cvthing.notbusy) == 0);
-
-  assert(cvthing.notbusy == NULL);
-
-  /*
-   * Standard check that all threads started.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      failed = !threadbag[i].started;
-
-      if (failed)
-	{
-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-	}
-    }
-
-  assert(!failed);
-
-  /*
-   * Check any results here.
-   */
-
-  assert(awoken == NUMTHREADS);
-
-  /*
-   * Success.
-   */
-  return 0;
-}
-
-
diff --git a/winsup/testsuite/winsup.api/pthread/condvar7.c b/winsup/testsuite/winsup.api/pthread/condvar7.c
deleted file mode 100644
index 8e9808f48..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar7.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * File: condvar7.c
- *
- *
- * Test Synopsis:
- * - Test pthread_cond_broadcast with thread cancelation.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Test broadcast with NUMTHREADS (=5) waiting CVs, one is canceled while waiting.
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-/*
- * Create NUMTHREADS threads in addition to the Main thread.
- */
-enum {
-  NUMTHREADS = 5
-};
-
-typedef struct bag_t_ bag_t;
-struct bag_t_ {
-  int threadnum;
-  int started;
-  /* Add more per-thread state variables here */
-};
-
-static bag_t threadbag[NUMTHREADS + 1];
-
-typedef struct cvthing_t_ cvthing_t;
-
-struct cvthing_t_ {
-  pthread_cond_t notbusy;
-  pthread_mutex_t lock;
-  int shared;
-};
-
-static cvthing_t cvthing = {
-  PTHREAD_COND_INITIALIZER,
-  PTHREAD_MUTEX_INITIALIZER,
-  0
-};
-
-static pthread_mutex_t start_flag = PTHREAD_MUTEX_INITIALIZER;
-
-static struct timespec abstime = { 0, 0 };
-
-static int awoken;
-
-void *
-mythread(void * arg)
-{
-  bag_t * bag = (bag_t *) arg;
-
-  assert(bag == &threadbag[bag->threadnum]);
-  assert(bag->started == 0);
-  bag->started = 1;
-
-  /* Wait for the start gun */
-  assert(pthread_mutex_lock(&start_flag) == 0);
-  assert(pthread_mutex_unlock(&start_flag) == 0);
-
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-#ifdef _MSC_VER
-#pragma inline_depth(0)
-#endif
-  pthread_cleanup_push((void *) pthread_mutex_unlock, (void *) &cvthing.lock);
-
-  while (! (cvthing.shared > 0))
-    assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
-
-  pthread_cleanup_pop(0);
-#ifdef _MSC_VER
-#pragma inline_depth()
-#endif
-
-  assert(cvthing.shared > 0);
-
-  awoken++;
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  return (void *) 0;
-}
-
-int
-main()
-{
-  int failed = 0;
-  int i;
-  pthread_t t[NUMTHREADS + 1];
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-  cvthing.shared = 0;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  assert(cvthing.notbusy == PTHREAD_COND_INITIALIZER);
-
-  assert(cvthing.lock == PTHREAD_MUTEX_INITIALIZER);
-
-  assert(pthread_mutex_lock(&start_flag) == 0);
-
-  /* get current system time */
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  abstime.tv_sec += 10;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  awoken = 0;
-
-  for (i = 1; i <= NUMTHREADS; i++)
-    {
-      threadbag[i].started = 0;
-      threadbag[i].threadnum = i;
-      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
-    }
-
-  /*
-   * Code to control or munipulate child threads should probably go here.
-   */
-
-  assert(pthread_mutex_unlock(&start_flag) == 0);
-
-  /*
-   * Give threads time to start.
-   */
-  Sleep(1000);
-
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  cvthing.shared++;
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  /*
-   * Cancel one of the threads.
-   */
-  assert(pthread_cancel(t[3]) == 0);
-  Sleep(500);
-
-  /*
-   * Signal all remaining waiting threads.
-   */
-  assert(pthread_cond_broadcast(&cvthing.notbusy) == 0);
-
-  /*
-   * Give threads time to complete.
-   */
-  Sleep(2000);
-
-  /* 
-   * Cleanup the CV.
-   */
-  
-  assert(pthread_mutex_destroy(&cvthing.lock) == 0);
-
-  assert(cvthing.lock == NULL);
-
-  assert(pthread_cond_destroy(&cvthing.notbusy) == 0);
-
-  assert(cvthing.notbusy == NULL);
-
-  /*
-   * Standard check that all threads started.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      failed = !threadbag[i].started;
-
-      if (failed)
-	{
-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-	}
-    }
-
-  assert(!failed);
-
-  /*
-   * Check any results here.
-   */
-
-  assert(awoken == (NUMTHREADS - 1));
-
-  /*
-   * Success.
-   */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar8.c b/winsup/testsuite/winsup.api/pthread/condvar8.c
deleted file mode 100644
index 771d91cb5..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar8.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * File: condvar8.c
- *
- * Test Synopsis:
- * - Test multiple pthread_cond_broadcasts.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Make NUMTHREADS threads wait on CV, broadcast signal them, and then repeat.
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-/*
- * Create NUMTHREADS threads in addition to the Main thread.
- */
-enum {
-  NUMTHREADS = 5
-};
-
-typedef struct bag_t_ bag_t;
-struct bag_t_ {
-  int threadnum;
-  int started;
-  /* Add more per-thread state variables here */
-};
-
-static bag_t threadbag[NUMTHREADS + 1];
-
-typedef struct cvthing_t_ cvthing_t;
-
-struct cvthing_t_ {
-  pthread_cond_t notbusy;
-  pthread_mutex_t lock;
-  int shared;
-};
-
-static cvthing_t cvthing = {
-  PTHREAD_COND_INITIALIZER,
-  PTHREAD_MUTEX_INITIALIZER,
-  0
-};
-
-static pthread_mutex_t start_flag = PTHREAD_MUTEX_INITIALIZER;
-
-static struct timespec abstime = { 0, 0 };
-
-static int awoken;
-
-static void *
-mythread(void * arg)
-{
-  bag_t * bag = (bag_t *) arg;
-
-  assert(bag == &threadbag[bag->threadnum]);
-  assert(bag->started == 0);
-  bag->started = 1;
-
-  /* Wait for the start gun */
-  assert(pthread_mutex_lock(&start_flag) == 0);
-  assert(pthread_mutex_unlock(&start_flag) == 0);
-
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  pthread_cleanup_push((__cleanup_routine_type)pthread_mutex_unlock,
-		       (void *) &cvthing.lock);
-
-  while (! (cvthing.shared > 0))
-    assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
-
-  pthread_cleanup_pop(0);
-
-  assert(cvthing.shared > 0);
-
-  awoken++;
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  return (void *) 0;
-}
-
-int
-main()
-{
-  int failed = 0;
-  int i;
-  int first, last;
-  pthread_t t[NUMTHREADS + 1];
-
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  assert(cvthing.notbusy == PTHREAD_COND_INITIALIZER);
-
-  assert(cvthing.lock == PTHREAD_MUTEX_INITIALIZER);
-
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
-
-  abstime.tv_sec += 10;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  awoken = 0;
-
-  for (first = 1, last = NUMTHREADS / 2;
-       first < NUMTHREADS;
-       first = last + 1, last = NUMTHREADS)
-    {
-      assert(pthread_mutex_lock(&start_flag) == 0);
-
-      for (i = first; i <= last; i++)
-	{
-	  threadbag[i].started = 0;
-	  threadbag[i].threadnum = i;
-	  assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
-	  assert(pthread_detach(t[i]) == 0);
-	}
-
-      /*
-       * Code to control or munipulate child threads should probably go here.
-       */
-      cvthing.shared = 0;
-
-      assert(pthread_mutex_unlock(&start_flag) == 0);
-
-      /*
-       * Give threads time to start.
-       */
-      Sleep(1000);
-
-      assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-      cvthing.shared++;
-
-      assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-      assert(pthread_cond_broadcast(&cvthing.notbusy) == 0);
-
-      /*
-       * Give threads time to complete.
-       */
-      Sleep(1000);
-
-      assert(awoken == (i - 1));
-    }
-
-
-  /*
-   * Standard check that all threads started.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      failed = !threadbag[i].started;
-
-      if (failed)
-        {
-          fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-        }
-    }
-
-  /* 
-   * Cleanup the CV.
-   */
-  
-  assert(pthread_mutex_destroy(&cvthing.lock) == 0);
-
-  assert(cvthing.lock == NULL);
-
-  assert(pthread_cond_destroy(&cvthing.notbusy) == 0);
-
-  assert(cvthing.notbusy == NULL);
-
-  assert(!failed);
-
-  /*
-   * Check any results here.
-   */
-
-  assert(awoken == NUMTHREADS);
-
-  /*
-   * Success.
-   */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/condvar9.c b/winsup/testsuite/winsup.api/pthread/condvar9.c
deleted file mode 100644
index 294556266..000000000
--- a/winsup/testsuite/winsup.api/pthread/condvar9.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * File: condvar9.c
- *
- *
- * Test Synopsis:
- * - Test multiple pthread_cond_broadcasts with thread cancelation.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Make NUMTHREADS threads wait on CV, broadcast signal them, cancel them
- *   and then repeat.
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-/*
- * Create NUMTHREADS threads in addition to the Main thread.
- */
-enum {
-  NUMTHREADS = 9
-};
-
-typedef struct bag_t_ bag_t;
-struct bag_t_ {
-  int threadnum;
-  int started;
-  /* Add more per-thread state variables here */
-};
-
-static bag_t threadbag[NUMTHREADS + 1];
-
-typedef struct cvthing_t_ cvthing_t;
-
-struct cvthing_t_ {
-  pthread_cond_t notbusy;
-  pthread_mutex_t lock;
-  int shared;
-};
-
-static cvthing_t cvthing = {
-  PTHREAD_COND_INITIALIZER,
-  PTHREAD_MUTEX_INITIALIZER,
-  0
-};
-
-static pthread_mutex_t start_flag = PTHREAD_MUTEX_INITIALIZER;
-
-static struct timespec abstime = { 0, 0 };
-
-static int awoken;
-static int not_canceled;
-
-static void *
-mythread(void * arg)
-{
-  bag_t * bag = (bag_t *) arg;
-
-  assert(bag == &threadbag[bag->threadnum]);
-  assert(bag->started == 0);
-  bag->started = 1;
-
-  /* Wait for the start gun */
-  assert(pthread_mutex_lock(&start_flag) == 0);
-  assert(pthread_mutex_unlock(&start_flag) == 0);
-
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  /*
-   * pthread_cond_timedwait is a cancelation point and we
-   * going to cancel one deliberately.
-   */
-#ifdef _MSC_VER
-#pragma inline_depth(0)
-#endif
-  pthread_cleanup_push((void *) pthread_mutex_unlock, (void *) &cvthing.lock);
-
-  while (! (cvthing.shared > 0))
-    assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
-
-  assert(cvthing.shared > 0);
-
-  awoken++;
-
-  pthread_testcancel();
-
-  pthread_cleanup_pop(0);
-#ifdef _MSC_VER
-#pragma inline_depth()
-#endif
-
-  not_canceled++;
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  return (void *) 0;
-}
-
-int
-main()
-{
-  int failed = 0;
-  int i;
-  int first, last;
-  pthread_t t[NUMTHREADS + 1];
-  struct timeb currSysTime;
-  const DWORD NANOSEC_PER_MILLISEC = 1000000;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  assert(cvthing.notbusy == PTHREAD_COND_INITIALIZER);
-
-  assert(cvthing.lock == PTHREAD_MUTEX_INITIALIZER);
-
-  /* get current system time */
-  ftime(&currSysTime);
-
-  abstime.tv_sec = currSysTime.time;
-  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;
- 
-  abstime.tv_sec += 5;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  awoken = 0;
-  not_canceled = 0;
-
-  for (first = 1, last = NUMTHREADS / 2;
-       first < NUMTHREADS;
-       first = last + 1, last = NUMTHREADS)
-    {
-      assert(pthread_mutex_lock(&start_flag) == 0);
-
-      for (i = first; i <= last; i++)
-	{
-	  threadbag[i].started = 0;
-	  threadbag[i].threadnum = i;
-	  assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
-	  assert(pthread_detach(t[i]) == 0);
-	}
-
-      /*
-       * Code to control or munipulate child threads should probably go here.
-       */
-      cvthing.shared = 0;
-
-      assert(pthread_mutex_unlock(&start_flag) == 0);
-
-      /*
-       * Give threads time to start.
-       */
-      Sleep(1000);
-
-      assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-      cvthing.shared++;
-
-      assert(pthread_cond_broadcast(&cvthing.notbusy) == 0);
-      for (i = first; i <= last; i++)
-        assert(pthread_cancel(t[i]) == 0);
-
-      assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-      /*
-       * Give threads time to complete.
-       */
-      Sleep(1000);
-    }
-
-
-  /*
-   * Standard check that all threads started.
-   */
-  for (i = 1; i <= NUMTHREADS; i++)
-    { 
-      failed = !threadbag[i].started;
-
-      if (failed)
-	{
-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-	}
-    }
-
-  /* 
-   * Cleanup the CV.
-   */
-  
-  assert(pthread_mutex_destroy(&cvthing.lock) == 0);
-
-  assert(cvthing.lock == NULL);
-
-  assert(pthread_cond_destroy(&cvthing.notbusy) == 0);
-
-  assert(cvthing.notbusy == NULL);
-
-  assert(!failed);
-
-  /*
-   * Check any results here.
-   */
-
-  assert(awoken == NUMTHREADS);
-  assert(not_canceled == 0);
-
-  /*
-   * Success.
-   */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/count1.c b/winsup/testsuite/winsup.api/pthread/count1.c
deleted file mode 100644
index ae30ed0a2..000000000
--- a/winsup/testsuite/winsup.api/pthread/count1.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * count1.c
- *
- * Description:
- * Test some basic assertions about the number of threads at runtime.
- */
-
-#include "test.h"
-
-#if ! defined (__MINGW32__) || defined (__MSVCRT__)
-#define NUMTHREADS (60)
-#else
-#define NUMTHREADS (59)
-#endif
-
-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_t threads[NUMTHREADS];
-static unsigned numThreads = 0;
-
-void *
-myfunc(void *arg)
-{
-  pthread_mutex_lock(&lock);
-  numThreads++;
-  pthread_mutex_unlock(&lock);
-
-  Sleep(1000);
-  return 0;
-}
-int
-main()
-{
-  int i;
-  int maxThreads = sizeof(threads) / sizeof(pthread_t);
-
-  /*
-   * Spawn NUMTHREADS threads. Each thread should increment the
-   * numThreads variable, sleep for one second.
-   */
-  for (i = 0; i < maxThreads; i++)
-    {
-      assert(pthread_create(&threads[i], NULL, myfunc, 0) == 0);
-    }
-  
-  /*
-   * Wait for all the threads to exit.
-   */
-  for (i = 0; i < maxThreads; i++)
-    {
-      assert(pthread_join(threads[i], NULL) == 0);
-    }
-
-  /* 
-   * Check the number of threads created.
-   */
-  assert((int) numThreads == maxThreads);
-  
-  /*
-   * Success.
-   */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/create1.c b/winsup/testsuite/winsup.api/pthread/create1.c
deleted file mode 100644
index 192e52d9d..000000000
--- a/winsup/testsuite/winsup.api/pthread/create1.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * create1.c
- *
- * Description:
- * Create a thread and check that it ran.
- *
- * Depends on API functions: None.
- */
-
-#include "test.h"
-
-static int washere = 0;
-
-void * func(void * arg)
-{
-  washere = 1;
-  return 0; 
-}
- 
-int
-main()
-{
-  pthread_t t;
-
-  assert(pthread_create(&t, NULL, func, NULL) == 0);
-
-  /* A dirty hack, but we cannot rely on pthread_join in this
-     primitive test. */
-  Sleep(2000);
-
-  assert(washere == 1);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/create2.c b/winsup/testsuite/winsup.api/pthread/create2.c
deleted file mode 100644
index 40e637b9d..000000000
--- a/winsup/testsuite/winsup.api/pthread/create2.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * File: create2.c
- *
- * Test Synopsis:
- * - Test that threads have a Win32 handle when started.
- *
- * Test Method (Validation or Falsification):
- * - Statistical, not absolute (depends on sample size).
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * -
- *
- * Cases Tested:
- * -
- *
- * Description:
- * -
- *
- * Environment:
- * -
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * -
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-const int NUMTHREADS = 10000;
-
-static int washere = 0;
-
-void * func(void * arg)
-{
-  washere = 1;
-  return (void *) 0; 
-}
- 
-int
-main()
-{
-  pthread_t t;
-  pthread_attr_t attr;
-  void * result = NULL;
-  int i;
-
-  pthread_attr_init(&attr);
-  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
-
-  for (i = 0; i < NUMTHREADS; i++)
-    {
-      washere = 0;
-      assert(pthread_create(&t, &attr, func, NULL) == 0);
-      pthread_join(t, &result);
-      assert(washere == 1);
-    }
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/equal1.c b/winsup/testsuite/winsup.api/pthread/equal1.c
deleted file mode 100644
index 617a95664..000000000
--- a/winsup/testsuite/winsup.api/pthread/equal1.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Test for pthread_equal.
- *
- * Depends on functions: pthread_create().
- */
-
-#include "test.h"
-
-void * func(void * arg)
-{
-  Sleep(2000);
-  return 0;
-}
-
-int 
-main()
-{
-  pthread_t t1, t2;
-
-  assert(pthread_create(&t1, NULL, func, (void *) 1) == 0);
-
-  assert(pthread_create(&t2, NULL, func, (void *) 2) == 0);
-
-  assert(pthread_equal(t1, t2) == 0);
-
-  assert(pthread_equal(t1,t1) != 0);
-
-  /* This is a hack. We don't want to rely on pthread_join
-     yet if we can help it. */
-   Sleep(4000);
-
-  /* Success. */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/exit1.c b/winsup/testsuite/winsup.api/pthread/exit1.c
deleted file mode 100644
index 06b7692de..000000000
--- a/winsup/testsuite/winsup.api/pthread/exit1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Test for pthread_exit().
- *
- * Depends on API functions: None.
- */
-
-#include "test.h"
-
-int
-main(int argc, char * argv[])
-{
-	/* A simple test first. */
-	pthread_exit((void *) 0);
-
-	/* Not reached */
-	assert(0);
-	return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/exit2.c b/winsup/testsuite/winsup.api/pthread/exit2.c
deleted file mode 100644
index 684305b40..000000000
--- a/winsup/testsuite/winsup.api/pthread/exit2.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Test for pthread_exit().
- *
- * Depends on API functions:
- *	pthread_create()
- *	pthread_exit()
- */
-
-#include "test.h"
-
-void *
-func(void * arg)
-{
-	pthread_exit(arg);
-
-	/* Never reached. */
-	assert(0);
-}
-
-int
-main(int argc, char * argv[])
-{
-  pthread_t t;
-
-  assert(pthread_create(&t, NULL, func, (void *) NULL) == 0);
-
-  Sleep(1000);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/exit3.c b/winsup/testsuite/winsup.api/pthread/exit3.c
deleted file mode 100644
index 0b6ec31c5..000000000
--- a/winsup/testsuite/winsup.api/pthread/exit3.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Test for pthread_exit().
- *
- * Depends on API functions: pthread_create().
- */
-
-#include "test.h"
-
-void *
-func(void * arg)
-{
-	pthread_exit(arg);
-
-	/* Never reached. */
-	assert(0);
-}
-
-int
-main(int argc, char * argv[])
-{
-	pthread_t id[4];
-	int i;
-
-	/* Create a few threads and then exit. */
-	for (i = 0; i < 4; i++)
-	  {
-	    assert(pthread_create(&id[i], NULL, func, (void *) i) == 0);
-	  }
-
-	Sleep(1000);
-
-	/* Success. */
-	return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/inherit1.c b/winsup/testsuite/winsup.api/pthread/inherit1.c
deleted file mode 100644
index a909eb763..000000000
--- a/winsup/testsuite/winsup.api/pthread/inherit1.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * File: inherit1.c
- *
- * Test Synopsis:
- * - Test thread priority inheritance.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * -
- *
- * Cases Tested:
- * -
- *
- * Description:
- * -
- *
- * Environment:
- * -
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * -
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-void * func(void * arg)
-{
-  int policy;
-  struct sched_param param;
-
-  assert(pthread_getschedparam(pthread_self(), &policy, &param) == 0);
-  return (void *) param.sched_priority;
-}
-
-int
-main()
-{
-  pthread_t t;
-  pthread_t mainThread = pthread_self();
-  pthread_attr_t attr;
-  void * result = NULL;
-  struct sched_param param;
-  struct sched_param mainParam;
-  int maxPrio;
-  int minPrio;
-  int prio;
-  int policy;
-  int inheritsched = -1;
-
-  assert((maxPrio = sched_get_priority_max(SCHED_OTHER)) != -1);
-  assert((minPrio = sched_get_priority_min(SCHED_OTHER)) != -1);
-
-  assert(pthread_attr_init(&attr) == 0);
-  assert(pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED) == 0);
-  assert(pthread_attr_getinheritsched(&attr, &inheritsched) == 0);
-  assert(inheritsched == PTHREAD_INHERIT_SCHED);
-
-  for (prio = minPrio; prio < maxPrio; prio++)
-    {
-      mainParam.sched_priority = prio;
-
-      /* Change the main thread priority */
-      assert(pthread_setschedparam(mainThread, SCHED_OTHER, &mainParam) == 0);
-      assert(pthread_getschedparam(mainThread, &policy, &mainParam) == 0);
-      assert(policy == SCHED_OTHER);
-      assert(mainParam.sched_priority == prio);
-
-      for (param.sched_priority = prio;
-           param.sched_priority <= maxPrio;
-           param.sched_priority++)
-        {
-          /* The new thread create should ignore this new priority */
-          assert(pthread_attr_setschedparam(&attr, &param) == 0);
-          assert(pthread_create(&t, &attr, func, NULL) == 0);
-          pthread_join(t, &result);
-          assert((int) result == mainParam.sched_priority);
-        }
-    }
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/join0.c b/winsup/testsuite/winsup.api/pthread/join0.c
deleted file mode 100644
index 54b0bee6b..000000000
--- a/winsup/testsuite/winsup.api/pthread/join0.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Test for pthread_join().
- *
- * Depends on API functions: pthread_create(), pthread_exit().
- */
-
-#include "test.h"
-
-void *
-func(void * arg)
-{
-  Sleep(2000);
-
-  pthread_exit(arg);
-
-  /* Never reached. */
-  exit(1);
-}
-
-int
-main(int argc, char * argv[])
-{
-  pthread_t id;
-  int result;
-
-  /* Create a single thread and wait for it to exit. */
-  assert(pthread_create(&id, NULL, func, (void *) 123) == 0);
-
-  assert(pthread_join(id, (void **) &result) == 0);
-
-#if ! defined (__MINGW32__) || defined (__MSVCRT__)
-  assert(result == 123);
-#else
-# warning pthread_join not fully supported in this configuration.
-  assert(result == 0);
-#endif
-
-  /* Success. */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/join1.c b/winsup/testsuite/winsup.api/pthread/join1.c
deleted file mode 100644
index d74e0c484..000000000
--- a/winsup/testsuite/winsup.api/pthread/join1.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Test for pthread_join().
- *
- * Depends on API functions: pthread_create(), pthread_join(), pthread_exit().
- */
-
-#include "test.h"
-
-void *
-func(void * arg)
-{
-    int i = (int) arg;
-
-    Sleep(i * 500);
-
-    pthread_exit(arg);
-
-    /* Never reached. */
-    exit(1);
-}
-
-int
-main(int argc, char * argv[])
-{
-	pthread_t id[4];
-	int i;
-	int result;
-
-	/* Create a few threads and then exit. */
-	for (i = 0; i < 4; i++)
-	  {
-	    assert(pthread_create(&id[i], NULL, func, (void *) i) == 0);
-	  }
-
-	/* Some threads will finish before they are joined, some after. */
-	Sleep(1000);
-
-	for (i = 0; i < 4; i++)
-	  {
-	    assert(pthread_join(id[i], (void **) &result) == 0);
-#if ! defined (__MINGW32__) || defined (__MSVCRT__)
-	    assert(result == i);
-#else
-# warning pthread_join not fully supported in this configuration.
-	    assert(result == 0);
-#endif
-	  }
-
-	/* Success. */
-	return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/join2.c b/winsup/testsuite/winsup.api/pthread/join2.c
deleted file mode 100644
index cdc8ca2d9..000000000
--- a/winsup/testsuite/winsup.api/pthread/join2.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Test for pthread_join() returning return value from threads.
- *
- * Depends on API functions: pthread_create().
- */
-
-#include "test.h"
-
-void *
-func(void * arg)
-{
-	Sleep(1000);
-	return arg;
-}
-
-int
-main(int argc, char * argv[])
-{
-	pthread_t id[4];
-	int i;
-	int result;
-
-	/* Create a few threads and then exit. */
-	for (i = 0; i < 4; i++)
-	  {
-	    assert(pthread_create(&id[i], NULL, func, (void *) i) == 0);
-	  }
-
-	for (i = 0; i < 4; i++)
-	  {
-	    assert(pthread_join(id[i], (void **) &result) == 0);
-#if ! defined (__MINGW32__) || defined (__MSVCRT__)
-	    /* CRTDLL _beginthread doesn't support return value, so
-	       the assertion is guaranteed to fail. */
-	    assert(result == i);
-#endif
-	  }
-
-	/* Success. */
-	return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mainthreadexits.c b/winsup/testsuite/winsup.api/pthread/mainthreadexits.c
deleted file mode 100644
index b3a3653b8..000000000
--- a/winsup/testsuite/winsup.api/pthread/mainthreadexits.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-static void * Thread (void *);
-
-static pthread_t main_thread;
-static pthread_t secondThread;
-static int result = 2;
-
-int main(void)
-{
-  main_thread = pthread_self ();
-
-  if (pthread_create (&secondThread, NULL, Thread, NULL))
-      exit (1);
-  sleep (5);
-  pthread_exit (&result);
-  /* If pthread_exit doesm't (which would be a bug) then we do */
-  return 1;
-}
-
-static void * Thread (void *not_used)
-{
-  void *myresult;
-  /* We should be able to join this */
-  if (pthread_join (main_thread, &myresult))
-      exit (1);
-
-  if (*(int *)myresult != 2)
-      exit (1);
-
-  exit (0);
-}
-/*
-This valid code doesn't work at all. The mainthread object in MTinterface
-is not properly initialized, the cancel_event is NULL and the win32_obj_id
-is NULL because myself->hProcess is NULL when MTinterface is initialized
-(and i don't think that a process handle can be used as thread handle).
-Even if the handles would be valid the pthread_join call would try to
-delete a thread object that is created static which would result in a
-corrupted heap.
-
-Concept test Contributed by Thomas Pfaff <tpfaff@gmx.net>
-Scriptable test by Robert Collins <rbtcollins@hotmail.com>
-
-*/
diff --git a/winsup/testsuite/winsup.api/pthread/mutex1.c b/winsup/testsuite/winsup.api/pthread/mutex1.c
deleted file mode 100644
index b7f6b6f15..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex1.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* 
- * mutex1.c
- *
- * Create a simple mutex object, lock it, and then unlock it again.
- * This is the simplest test of the pthread mutex family that we can do.
- *
- * Depends on API functions:
- * 	pthread_mutex_init()
- *	pthread_mutex_lock()
- *	pthread_mutex_unlock()
- *	pthread_mutex_destroy()
- */
-
-#include "test.h"
-
-pthread_mutex_t mutex = NULL;
-
-int
-main()
-{
-  assert(mutex == NULL);
-
-  assert(pthread_mutex_init(&mutex, NULL) == 0);
-
-  assert(mutex != NULL);
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-
-  assert(mutex == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex1d.c b/winsup/testsuite/winsup.api/pthread/mutex1d.c
deleted file mode 100644
index 354b106d1..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex1d.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 
- * mutex1d.c
- *
- * As for mutex1.c but with type set to PTHREAD_MUTEX_DEFAULT.
- *
- * Create a simple mutex object, lock it, unlock it, then destroy it.
- * This is the simplest test of the pthread mutex family that we can do.
- *
- * Depends on API functions:
- *	pthread_mutexattr_settype()
- * 	pthread_mutex_init()
- *	pthread_mutex_destroy()
- */
-
-#include "test.h"
-
-pthread_mutex_t mutex = NULL;
-pthread_mutexattr_t mxAttr;
-
-int
-main()
-{
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_DEFAULT) == 0);
-
-  assert(mutex == NULL);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(mutex != NULL);
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-
-  assert(mutex == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex1e.c b/winsup/testsuite/winsup.api/pthread/mutex1e.c
deleted file mode 100644
index 2feb16c08..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex1e.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 
- * mutex1e.c
- *
- * As for mutex1.c but with type set to PTHREAD_MUTEX_ERRORCHECK.
- *
- * Create a simple mutex object, lock it, unlock it, then destroy it.
- * This is the simplest test of the pthread mutex family that we can do.
- *
- * Depends on API functions:
- *	pthread_mutexattr_settype()
- * 	pthread_mutex_init()
- *	pthread_mutex_destroy()
- */
-
-#include "test.h"
-
-pthread_mutex_t mutex = NULL;
-pthread_mutexattr_t mxAttr;
-
-int
-main()
-{
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_ERRORCHECK) == 0);
-
-  assert(mutex == NULL);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(mutex != NULL);
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-
-  assert(mutex == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex1n.c b/winsup/testsuite/winsup.api/pthread/mutex1n.c
deleted file mode 100644
index 9af3d5f5c..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex1n.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 
- * mutex1n.c
- *
- * As for mutex1.c but with type set to PTHREAD_MUTEX_NORMAL.
- *
- * Create a simple mutex object, lock it, unlock it, then destroy it.
- * This is the simplest test of the pthread mutex family that we can do.
- *
- * Depends on API functions:
- *	pthread_mutexattr_settype()
- * 	pthread_mutex_init()
- *	pthread_mutex_destroy()
- */
-
-#include "test.h"
-
-pthread_mutex_t mutex = NULL;
-pthread_mutexattr_t mxAttr;
-
-int
-main()
-{
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_NORMAL) == 0);
-
-  assert(mutex == NULL);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(mutex != NULL);
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-
-  assert(mutex == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex1r.c b/winsup/testsuite/winsup.api/pthread/mutex1r.c
deleted file mode 100644
index b5131bb0e..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex1r.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 
- * mutex1r.c
- *
- * As for mutex1.c but with type set to PTHREAD_MUTEX_RECURSIVE.
- *
- * Create a simple mutex object, lock it, unlock it, then destroy it.
- * This is the simplest test of the pthread mutex family that we can do.
- *
- * Depends on API functions:
- *	pthread_mutexattr_settype()
- * 	pthread_mutex_init()
- *	pthread_mutex_destroy()
- */
-
-#include "test.h"
-
-pthread_mutex_t mutex = NULL;
-pthread_mutexattr_t mxAttr;
-
-int
-main()
-{
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_RECURSIVE) == 0);
-
-  assert(mutex == NULL);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(mutex != NULL);
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-
-  assert(mutex == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex2.c b/winsup/testsuite/winsup.api/pthread/mutex2.c
deleted file mode 100644
index 731c47fab..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex2.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 
- * mutex2.c
- *
- * Declare a static mutex object, lock it, 
- * and then unlock it again.
- *
- * Depends on API functions: 
- *	pthread_mutex_lock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
- 
-pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-
-int
-main()
-{
-  assert(mutex == PTHREAD_MUTEX_INITIALIZER);
-
-  assert(pthread_mutex_lock(&mutex) == 0);
-
-  assert(mutex != PTHREAD_MUTEX_INITIALIZER);
-
-  assert(mutex != NULL);
-
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-
-  assert(mutex == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex3.c b/winsup/testsuite/winsup.api/pthread/mutex3.c
deleted file mode 100644
index 07e75b187..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex3.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* 
- * mutex3.c
- *
- * Declare a static mutex object, lock it, trylock it, 
- * and then unlock it again.
- *
- * Depends on API functions: 
- *	pthread_mutex_lock()
- *	pthread_mutex_trylock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
- 
-pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER;
-
-static int washere = 0;
-
-void * func(void * arg)
-{
-  assert(pthread_mutex_trylock(&mutex1) == EBUSY);
-
-  washere = 1;
-
-  return 0; 
-}
- 
-int
-main()
-{
-  pthread_t t;
-
-  assert(pthread_mutex_lock(&mutex1) == 0);
-
-  assert(pthread_create(&t, NULL, func, NULL) == 0);
-  assert(pthread_join(t, NULL) == 0);
-
-  assert(pthread_mutex_unlock(&mutex1) == 0);
-
-  assert(washere == 1);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex4.c b/winsup/testsuite/winsup.api/pthread/mutex4.c
deleted file mode 100644
index 2cc858015..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex4.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* 
- * mutex4.c
- *
- * Thread A locks mutex - thread B tries to unlock.
- *
- * Depends on API functions: 
- *	pthread_mutex_lock()
- *	pthread_mutex_trylock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
-
-static int wasHere = 0;
-
-static pthread_mutex_t mutex1;
- 
-void * unlocker(void * arg)
-{
-  int expectedResult = (int) arg;
-
-  wasHere++;
-  assert(pthread_mutex_unlock(&mutex1) == expectedResult);
-  wasHere++;
-  return NULL;
-}
- 
-int
-main()
-{
-  pthread_t t;
-  pthread_mutexattr_t ma;
-
-  assert(pthread_mutexattr_init(&ma) == 0);
-
-  wasHere = 0;
-  assert(pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_DEFAULT) == 0);
-  assert(pthread_mutex_init(&mutex1, &ma) == 0);
-  assert(pthread_mutex_lock(&mutex1) == 0);
-  assert(pthread_create(&t, NULL, unlocker, (void *) EPERM) == 0);
-  assert(pthread_join(t, NULL) == 0);
-  assert(pthread_mutex_unlock(&mutex1) == 0);
-  assert(pthread_mutex_destroy(&mutex1) == 0);
-  assert(wasHere == 2);
-
-  wasHere = 0;
-  assert(pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_ERRORCHECK) == 0);
-  assert(pthread_mutex_init(&mutex1, &ma) == 0);
-  assert(pthread_mutex_lock(&mutex1) == 0);
-  assert(pthread_create(&t, NULL, unlocker, (void *) EPERM) == 0);
-  assert(pthread_join(t, NULL) == 0);
-  assert(pthread_mutex_unlock(&mutex1) == 0);
-  assert(pthread_mutex_destroy(&mutex1) == 0);
-  assert(wasHere == 2);
-
-  wasHere = 0;
-  assert(pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE) == 0);
-  assert(pthread_mutex_init(&mutex1, &ma) == 0);
-  assert(pthread_mutex_lock(&mutex1) == 0);
-  assert(pthread_create(&t, NULL, unlocker, (void *) EPERM) == 0);
-  assert(pthread_join(t, NULL) == 0);
-  assert(pthread_mutex_unlock(&mutex1) == 0);
-  assert(pthread_mutex_destroy(&mutex1) == 0);
-  assert(wasHere == 2);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex5.c b/winsup/testsuite/winsup.api/pthread/mutex5.c
deleted file mode 100644
index 5cb1478b8..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex5.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 
- * mutex5.c
- *
- * Confirm the equality/inequality of the various mutex types,
- * and the default not-set value.
- */
-
-#include "test.h"
-
-static pthread_mutexattr_t mxAttr;
-
-int
-main()
-{
-  int mxType = -1;
-  int success = 0;   /* Use to quell GNU compiler warnings. */
-
-  assert(success = PTHREAD_MUTEX_DEFAULT == PTHREAD_MUTEX_ERRORCHECK);
-  assert(success = PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_RECURSIVE);
-  assert(success = PTHREAD_MUTEX_RECURSIVE != PTHREAD_MUTEX_ERRORCHECK);
-
-  if (success == success)
-    {
-      assert(pthread_mutexattr_init(&mxAttr) == 0);
-      assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0);
-      assert(mxType == PTHREAD_MUTEX_ERRORCHECK);
-    }
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex6d.c b/winsup/testsuite/winsup.api/pthread/mutex6d.c
deleted file mode 100644
index bcbcd9767..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex6d.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* 
- * mutex6d.c
- *
- * Tests PTHREAD_MUTEX_DEFAULT mutex type.
- * The thread should behave the same way than an errorchecking mutex.
- *
- * Depends on API functions: 
- *      pthread_create()
- *      pthread_mutexattr_init()
- *      pthread_mutexattr_settype()
- *      pthread_mutexattr_gettype()
- *      pthread_mutex_init()
- *	pthread_mutex_lock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
-
-static int lockCount = 0;
-
-static pthread_mutex_t mutex;
-static pthread_mutexattr_t mxAttr;
-
-void * locker(void * arg)
-{
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_lock(&mutex) == EDEADLK);
-  lockCount++;
-  assert(pthread_mutex_unlock(&mutex) == 0);
-  assert(pthread_mutex_unlock(&mutex) == EPERM);
- 
-  return (void *) 555;
-}
- 
-int
-main()
-{
-  pthread_t t;
-  int result = 0;
-  int mxType = -1;
-
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_DEFAULT) == 0);
-  assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0);
-  assert(mxType == PTHREAD_MUTEX_DEFAULT);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(pthread_create(&t, NULL, locker, NULL) == 0);
- 
-  assert(pthread_join(t, (void **) &result) == 0);
-  assert(result == 555);
-
-  assert(lockCount == 2);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-  assert(pthread_mutexattr_destroy(&mxAttr) == 0);
-
-  exit(0);
-
-  /* Never reached */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex6e.c b/winsup/testsuite/winsup.api/pthread/mutex6e.c
deleted file mode 100644
index e22550f7a..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex6e.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* 
- * mutex6e.c
- *
- * Tests PTHREAD_MUTEX_ERRORCHECK mutex type.
- * Thread locks mutex twice (recursive lock).
- * This should fail with an EDEADLK error.
- * The second unlock attempt should fail with an EPERM error.
- *
- * Depends on API functions: 
- *      pthread_create()
- *      pthread_join()
- *      pthread_mutexattr_init()
- *      pthread_mutexattr_destroy()
- *      pthread_mutexattr_settype()
- *      pthread_mutexattr_gettype()
- *      pthread_mutex_init()
- *      pthread_mutex_destroy()
- *	pthread_mutex_lock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
-
-static int lockCount = 0;
-
-static pthread_mutex_t mutex;
-static pthread_mutexattr_t mxAttr;
-
-void * locker(void * arg)
-{
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_lock(&mutex) == EDEADLK);
-  lockCount++;
-  assert(pthread_mutex_unlock(&mutex) == 0);
-  assert(pthread_mutex_unlock(&mutex) == EPERM);
-
-  return (void *) 555;
-}
- 
-int
-main()
-{
-  pthread_t t;
-  int result = 0;
-  int mxType = -1;
-
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_ERRORCHECK) == 0);
-  assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0);
-  assert(mxType == PTHREAD_MUTEX_ERRORCHECK);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(pthread_create(&t, NULL, locker, NULL) == 0);
-
-  assert(pthread_join(t, (void **) &result) == 0);
-  assert(result == 555);
-
-  assert(lockCount == 2);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-  assert(pthread_mutexattr_destroy(&mxAttr) == 0);
-
-  exit(0);
-
-  /* Never reached */
-  return 0;
-}
-
diff --git a/winsup/testsuite/winsup.api/pthread/mutex6n.c b/winsup/testsuite/winsup.api/pthread/mutex6n.c
deleted file mode 100644
index 38cbba034..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex6n.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* 
- * mutex6n.c
- *
- * Tests PTHREAD_MUTEX_NORMAL mutex type.
- * Thread locks mutex twice (recursive lock).
- * The thread should deadlock.
- *
- * Depends on API functions: 
- *      pthread_create()
- *      pthread_mutexattr_init()
- *      pthread_mutexattr_settype()
- *      pthread_mutexattr_gettype()
- *      pthread_mutex_init()
- *	pthread_mutex_lock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
-
-static int lockCount = 0;
-
-static pthread_mutex_t mutex;
-static pthread_mutexattr_t mxAttr;
-
-void * locker(void * arg)
-{
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-
-  /* Should wait here (deadlocked) */
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  return (void *) 555;
-}
- 
-int
-main()
-{
-  pthread_t t;
-  int mxType = -1;
-
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_NORMAL) == 0);
-  assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0);
-  assert(mxType == PTHREAD_MUTEX_NORMAL);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(pthread_create(&t, NULL, locker, NULL) == 0);
-
-  Sleep(1000);
-
-  assert(lockCount == 1);
-
-  /*
-   * Should succeed even though we don't own the lock
-   * because FAST mutexes don't check ownership.
-   */
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  Sleep (1000);
-
-  assert(lockCount == 2);
-
-  exit(0);
-
-  /* Never reached */
-  return 0;
-}
-
diff --git a/winsup/testsuite/winsup.api/pthread/mutex6r.c b/winsup/testsuite/winsup.api/pthread/mutex6r.c
deleted file mode 100644
index 586cc841b..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex6r.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* 
- * mutex6r.c
- *
- * Tests PTHREAD_MUTEX_RECURSIVE mutex type.
- * Thread locks mutex twice (recursive lock).
- * Both locks and unlocks should succeed.
- *
- * Depends on API functions: 
- *      pthread_create()
- *      pthread_join()
- *      pthread_mutexattr_init()
- *      pthread_mutexattr_destroy()
- *      pthread_mutexattr_settype()
- *      pthread_mutexattr_gettype()
- *      pthread_mutex_init()
- *      pthread_mutex_destroy()
- *	pthread_mutex_lock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
-
-static int lockCount = 0;
-
-static pthread_mutex_t mutex;
-static pthread_mutexattr_t mxAttr;
-
-void * locker(void * arg)
-{
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_unlock(&mutex) == 0);
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  return (void *) 555;
-}
- 
-int
-main()
-{
-  pthread_t t;
-  int result = 0;
-  int mxType = -1;
-
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_RECURSIVE) == 0);
-  assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0);
-  assert(mxType == PTHREAD_MUTEX_RECURSIVE);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(pthread_create(&t, NULL, locker, NULL) == 0);
-
-  assert(pthread_join(t, (void **) &result) == 0);
-  assert(result == 555);
-
-  assert(lockCount == 2);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-  assert(pthread_mutexattr_destroy(&mxAttr) == 0);
-
-  exit(0);
-
-  /* Never reached */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex7.c b/winsup/testsuite/winsup.api/pthread/mutex7.c
deleted file mode 100644
index d2c9f8bee..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex7.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* 
- * mutex7.c
- *
- * Test the default (type not set) mutex type.
- * Should be the same as PTHREAD_MUTEX_ERRORCHECK.
- * Thread locks then trylocks mutex (attempted recursive lock).
- * The thread should lock first time and EBUSY second time.
- *
- * Depends on API functions: 
- *	pthread_mutex_lock()
- *	pthread_mutex_trylock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
-
-static int lockCount = 0;
-
-static pthread_mutex_t mutex;
-
-void * locker(void * arg)
-{
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_trylock(&mutex) == EBUSY);
-  lockCount++;
-  assert(pthread_mutex_unlock(&mutex) == 0);
-  assert(pthread_mutex_unlock(&mutex) == EPERM);
-
-  return 0;
-}
- 
-int
-main()
-{
-  pthread_t t;
-
-  assert(pthread_mutex_init(&mutex, NULL) == 0);
-
-  assert(pthread_create(&t, NULL, locker, NULL) == 0);
-
-  Sleep(1000);
-
-  assert(lockCount == 2);
-
-  exit(0);
-
-  /* Never reached */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex7d.c b/winsup/testsuite/winsup.api/pthread/mutex7d.c
deleted file mode 100644
index 906d0f043..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex7d.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* 
- * mutex7d.c
- *
- * Test the default (type not set) mutex type.
- * Should be the same as PTHREAD_MUTEX_ERRORCHECK.
- * Thread locks then trylocks mutex (attempted recursive lock).
- * The thread should lock first time and EBUSY second time.
- *
- * Depends on API functions: 
- *	pthread_mutex_lock()
- *	pthread_mutex_trylock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
-
-static int lockCount = 0;
-
-static pthread_mutex_t mutex;
-
-void * locker(void * arg)
-{
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_trylock(&mutex) == EBUSY);
-  lockCount++;
-  assert(pthread_mutex_unlock(&mutex) == 0);
-  assert(pthread_mutex_unlock(&mutex) == EPERM);
-
-  return 0;
-}
- 
-int
-main()
-{
-  int result = 0; 
-  pthread_t t;
-
-  assert(pthread_mutex_init(&mutex, NULL) == 0);
-
-  assert(pthread_create(&t, NULL, locker, NULL) == 0);
-
-  assert(pthread_join(t, (void **) &result) == 0); 
-
-  assert(lockCount == 2);
-
-  exit(0);
-
-  /* Never reached */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/mutex7e.c b/winsup/testsuite/winsup.api/pthread/mutex7e.c
deleted file mode 100644
index 05722512d..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex7e.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* 
- * mutex7e.c
- *
- * Tests PTHREAD_MUTEX_ERRORCHECK mutex type.
- * Thread locks and then trylocks mutex (attempted recursive lock).
- * Trylock should fail with an EBUSY error.
- * The second unlock attempt should fail with an EPERM error.
- *
- * Depends on API functions: 
- *      pthread_create()
- *      pthread_join()
- *      pthread_mutexattr_init()
- *      pthread_mutexattr_destroy()
- *      pthread_mutexattr_settype()
- *      pthread_mutexattr_gettype()
- *      pthread_mutex_init()
- *      pthread_mutex_destroy()
- *	pthread_mutex_lock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
-
-static int lockCount = 0;
-
-static pthread_mutex_t mutex;
-static pthread_mutexattr_t mxAttr;
-
-void * locker(void * arg)
-{
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_trylock(&mutex) == EBUSY);
-  lockCount++;
-  assert(pthread_mutex_unlock(&mutex) == 0);
-  assert(pthread_mutex_unlock(&mutex) == EPERM);
-
-  return (void *) 555;
-}
- 
-int
-main()
-{
-  pthread_t t;
-  int result = 0;
-  int mxType = -1;
-
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_ERRORCHECK) == 0);
-  assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0);
-  assert(mxType == PTHREAD_MUTEX_ERRORCHECK);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(pthread_create(&t, NULL, locker, NULL) == 0);
-
-  assert(pthread_join(t, (void **) &result) == 0);
-  assert(result == 555);
-
-  assert(lockCount == 2);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-  assert(pthread_mutexattr_destroy(&mxAttr) == 0);
-
-  exit(0);
-
-  /* Never reached */
-  return 0;
-}
-
diff --git a/winsup/testsuite/winsup.api/pthread/mutex7n.c b/winsup/testsuite/winsup.api/pthread/mutex7n.c
deleted file mode 100644
index e9a36fec0..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex7n.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* 
- * mutex7n.c
- *
- * Tests PTHREAD_MUTEX_NORMAL mutex type.
- * Thread locks then trylocks mutex (attempted recursive lock).
- * The thread should lock first time and EBUSY second time.
- *
- * Depends on API functions: 
- *      pthread_create()
- *      pthread_mutexattr_init()
- *      pthread_mutexattr_settype()
- *      pthread_mutexattr_gettype()
- *      pthread_mutex_init()
- *	pthread_mutex_lock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
-
-static int lockCount = 0;
-
-static pthread_mutex_t mutex;
-static pthread_mutexattr_t mxAttr;
-
-void * locker(void * arg)
-{
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_trylock(&mutex) == EBUSY);
-  lockCount++;
-  assert(pthread_mutex_unlock(&mutex) == 0);
-  assert(pthread_mutex_unlock(&mutex) == EPERM);
-
-  return (void *) 555;
-}
- 
-int
-main()
-{
-  pthread_t t;
-  int mxType = -1;
-
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_NORMAL) == 0);
-  assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0);
-  assert(mxType == PTHREAD_MUTEX_NORMAL);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(pthread_create(&t, NULL, locker, NULL) == 0);
-
-  Sleep(1000);
-
-  assert(lockCount == 2);
-
-  exit(0);
-
-  /* Never reached */
-  return 0;
-}
-
diff --git a/winsup/testsuite/winsup.api/pthread/mutex7r.c b/winsup/testsuite/winsup.api/pthread/mutex7r.c
deleted file mode 100644
index 6f9ed744b..000000000
--- a/winsup/testsuite/winsup.api/pthread/mutex7r.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* 
- * mutex7r.c
- *
- * Tests PTHREAD_MUTEX_RECURSIVE mutex type.
- * Thread locks mutex then trylocks mutex (recursive lock twice).
- * Both locks and unlocks should succeed.
- *
- * Depends on API functions: 
- *      pthread_create()
- *      pthread_join()
- *      pthread_mutexattr_init()
- *      pthread_mutexattr_destroy()
- *      pthread_mutexattr_settype()
- *      pthread_mutexattr_gettype()
- *      pthread_mutex_init()
- *      pthread_mutex_destroy()
- *	pthread_mutex_lock()
- *	pthread_mutex_unlock()
- */
-
-#include "test.h"
-
-static int lockCount = 0;
-
-static pthread_mutex_t mutex;
-static pthread_mutexattr_t mxAttr;
-
-void * locker(void * arg)
-{
-  assert(pthread_mutex_lock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_trylock(&mutex) == 0);
-  lockCount++;
-  assert(pthread_mutex_unlock(&mutex) == 0);
-  assert(pthread_mutex_unlock(&mutex) == 0);
-
-  return (void *) 555;
-}
- 
-int
-main()
-{
-  pthread_t t;
-  int result = 0;
-  int mxType = -1;
-
-  assert(pthread_mutexattr_init(&mxAttr) == 0);
-  assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_RECURSIVE) == 0);
-  assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0);
-  assert(mxType == PTHREAD_MUTEX_RECURSIVE);
-
-  assert(pthread_mutex_init(&mutex, &mxAttr) == 0);
-
-  assert(pthread_create(&t, NULL, locker, NULL) == 0);
-
-  assert(pthread_join(t, (void **) &result) == 0);
-  assert(result == 555);
-
-  assert(lockCount == 2);
-
-  assert(pthread_mutex_destroy(&mutex) == 0);
-  assert(pthread_mutexattr_destroy(&mxAttr) == 0);
-
-  exit(0);
-
-  /* Never reached */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/once1.c b/winsup/testsuite/winsup.api/pthread/once1.c
deleted file mode 100644
index 91dc03832..000000000
--- a/winsup/testsuite/winsup.api/pthread/once1.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * once1.c
- *
- * Create a static pthread_once and test that it calls myfunc once.
- *
- * Depends on API functions:
- *	pthread_once()
- *	pthread_create()
- */
-
-#include "test.h"
-
-pthread_once_t once = PTHREAD_ONCE_INIT;
-
-static int washere = 0;
-
-void
-myfunc(void)
-{
-  washere++;
-}
-
-void *
-mythread(void * arg)
-{
-   assert(pthread_once(&once, myfunc) == 0);
-
-   return 0;
-}
-
-int
-main()
-{
-  pthread_t t1, t2;
-  
-  assert(pthread_create(&t1, NULL, mythread, NULL) == 0);
-
-  assert(pthread_create(&t2, NULL, mythread, NULL) == 0);
-
-  Sleep(2000);
-
-  assert(washere == 1);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/priority1.c b/winsup/testsuite/winsup.api/pthread/priority1.c
deleted file mode 100644
index a31102895..000000000
--- a/winsup/testsuite/winsup.api/pthread/priority1.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * File: priority1.c
- *
- * Test Synopsis:
- * - Test thread priority explicit setting using thread attribute.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * -
- *
- * Cases Tested:
- * -
- *
- * Description:
- * -
- *
- * Environment:
- * -
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * -
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-void * func(void * arg)
-{
-  int policy;
-  struct sched_param param;
-
-  assert(pthread_getschedparam(pthread_self(), &policy, &param) == 0);
-  assert(policy == SCHED_OTHER);
-  return (void *) param.sched_priority;
-}
- 
-int
-main()
-{
-  pthread_t t;
-  pthread_attr_t attr;
-  void * result = NULL;
-  struct sched_param param;
-  int maxPrio = sched_get_priority_max(SCHED_OTHER);
-  int minPrio = sched_get_priority_min(SCHED_OTHER);
-
-  assert(pthread_attr_init(&attr) == 0);
-  assert(pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED) == 0);
-
-  for (param.sched_priority = minPrio;
-       param.sched_priority <= maxPrio;
-       param.sched_priority++)
-    {
-      assert(pthread_attr_setschedparam(&attr, &param) == 0);
-      assert(pthread_create(&t, &attr, func, NULL) == 0);
-      pthread_join(t, &result);
-      assert((int) result == param.sched_priority);
-    }
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/priority2.c b/winsup/testsuite/winsup.api/pthread/priority2.c
deleted file mode 100644
index 4dcf3859f..000000000
--- a/winsup/testsuite/winsup.api/pthread/priority2.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * File: priority2.c
- *
- * Test Synopsis:
- * - Test thread priority setting after creation.
- *
- * Test Method (Validation or Falsification):
- * - 
- *
- * Requirements Tested:
- * -
- *
- * Features Tested:
- * -
- *
- * Cases Tested:
- * -
- *
- * Description:
- * -
- *
- * Environment:
- * -
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * -
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-pthread_mutex_t startMx = PTHREAD_MUTEX_INITIALIZER;
-
-void * func(void * arg)
-{
-  int policy;
-  struct sched_param param;
-
-  assert(pthread_mutex_lock(&startMx) == 0);
-  assert(pthread_getschedparam(pthread_self(), &policy, &param) == 0);
-  assert(pthread_mutex_unlock(&startMx) == 0);
-  assert(policy == SCHED_OTHER);
-  return (void *) param.sched_priority;
-}
- 
-int
-main()
-{
-  pthread_t t;
-  void * result = NULL;
-  struct sched_param param;
-  int maxPrio = sched_get_priority_max(SCHED_OTHER);
-  int minPrio = sched_get_priority_min(SCHED_OTHER);
-
-  for (param.sched_priority = minPrio;
-       param.sched_priority <= maxPrio;
-       param.sched_priority++)
-    {
-      assert(pthread_mutex_lock(&startMx) == 0);
-      assert(pthread_create(&t, NULL, func, NULL) == 0);
-      assert(pthread_setschedparam(t, SCHED_OTHER, &param) == 0);
-      assert(pthread_mutex_unlock(&startMx) == 0);
-      pthread_join(t, &result);
-      assert((int) result == param.sched_priority);
-    }
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/rwlock1.c b/winsup/testsuite/winsup.api/pthread/rwlock1.c
deleted file mode 100644
index 25e29f6ac..000000000
--- a/winsup/testsuite/winsup.api/pthread/rwlock1.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* 
- * rwlock1.c
- *
- * Create a simple rwlock object and then destroy it.
- *
- * Depends on API functions:
- * 	pthread_rwlock_init()
- *	pthread_rwlock_destroy()
- */
-
-#include "test.h"
-
-pthread_rwlock_t rwlock = NULL;
-
-int
-main()
-{
-  assert(rwlock == NULL);
-
-  assert(pthread_rwlock_init(&rwlock, NULL) == 0);
-
-  assert(rwlock != NULL);
-
-  assert(pthread_rwlock_destroy(&rwlock) == 0);
-
-  assert(rwlock == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/rwlock2.c b/winsup/testsuite/winsup.api/pthread/rwlock2.c
deleted file mode 100644
index cfb32282c..000000000
--- a/winsup/testsuite/winsup.api/pthread/rwlock2.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 
- * rwlock2.c
- *
- * Declare a static rwlock object, lock it, 
- * and then unlock it again.
- *
- * Depends on API functions: 
- *	pthread_rwlock_rdlock()
- *	pthread_rwlock_unlock()
- */
-
-#include "test.h"
- 
-pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER;
-
-int
-main()
-{
-  assert(rwlock == PTHREAD_RWLOCK_INITIALIZER);
-
-  assert(pthread_rwlock_rdlock(&rwlock) == 0);
-
-  assert(rwlock != PTHREAD_RWLOCK_INITIALIZER);
-
-  assert(rwlock != NULL);
-
-  assert(pthread_rwlock_unlock(&rwlock) == 0);
-
-  assert(pthread_rwlock_destroy(&rwlock) == 0);
-
-  assert(rwlock == NULL);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/rwlock3.c b/winsup/testsuite/winsup.api/pthread/rwlock3.c
deleted file mode 100644
index 0703c1a2d..000000000
--- a/winsup/testsuite/winsup.api/pthread/rwlock3.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 
- * rwlock3.c
- *
- *
- * Declare a static rwlock object, wrlock it, trywrlock it, 
- * and then unlock it again.
- *
- * Depends on API functions: 
- *	pthread_rwlock_wrlock()
- *	pthread_rwlock_trywrlock()
- *	pthread_rwlock_unlock()
- */
-
-#include "test.h"
- 
-pthread_rwlock_t rwlock1 = PTHREAD_RWLOCK_INITIALIZER;
-
-static int washere = 0;
-
-void * func(void * arg)
-{
-  assert(pthread_rwlock_trywrlock(&rwlock1) == EBUSY);
-
-  washere = 1;
-
-  return 0; 
-}
- 
-int
-main()
-{
-  pthread_t t;
-
-  assert(pthread_rwlock_wrlock(&rwlock1) == 0);
-
-  assert(pthread_create(&t, NULL, func, NULL) == 0);
-
-  Sleep(2000);
-
-  assert(pthread_rwlock_unlock(&rwlock1) == 0);
-
-  assert(washere == 1);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/rwlock4.c b/winsup/testsuite/winsup.api/pthread/rwlock4.c
deleted file mode 100644
index 8cae52e6f..000000000
--- a/winsup/testsuite/winsup.api/pthread/rwlock4.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* 
- * rwlock4.c
- *
- * Declare a static rwlock object, rdlock it, trywrlock it, 
- * and then unlock it again.
- *
- * Depends on API functions: 
- *	pthread_rwlock_rdlock()
- *	pthread_rwlock_trywrlock()
- *	pthread_rwlock_unlock()
- */
-
-#include "test.h"
- 
-pthread_rwlock_t rwlock1 = PTHREAD_RWLOCK_INITIALIZER;
-
-static int washere = 0;
-
-void * func(void * arg)
-{
-  assert(pthread_rwlock_trywrlock(&rwlock1) == EBUSY);
-
-  washere = 1;
-
-  return 0; 
-}
- 
-int
-main()
-{
-  pthread_t t;
-
-  assert(pthread_rwlock_rdlock(&rwlock1) == 0);
-
-  assert(pthread_create(&t, NULL, func, NULL) == 0);
-
-  Sleep(2000);
-
-  assert(pthread_rwlock_unlock(&rwlock1) == 0);
-
-  assert(washere == 1);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/rwlock5.c b/winsup/testsuite/winsup.api/pthread/rwlock5.c
deleted file mode 100644
index 3ada946e3..000000000
--- a/winsup/testsuite/winsup.api/pthread/rwlock5.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* 
- * rwlock5.c
- *
- *
- * Declare a static rwlock object, rdlock it, tryrdlock it, 
- * and then unlock it again.
- *
- * Depends on API functions: 
- *	pthread_rwlock_rdlock()
- *	pthread_rwlock_tryrdlock()
- *	pthread_rwlock_unlock()
- */
-
-#include "test.h"
- 
-pthread_rwlock_t rwlock1 = PTHREAD_RWLOCK_INITIALIZER;
-
-static int washere = 0;
-
-void * func(void * arg)
-{
-  assert(pthread_rwlock_tryrdlock(&rwlock1) == 0);
-
-  assert(pthread_rwlock_unlock(&rwlock1) == 0);
-
-  washere = 1;
-
-  return 0; 
-}
- 
-int
-main()
-{
-  pthread_t t;
-
-  assert(pthread_rwlock_rdlock(&rwlock1) == 0);
-
-  assert(pthread_create(&t, NULL, func, NULL) == 0);
-
-  Sleep(2000);
-
-  assert(pthread_rwlock_unlock(&rwlock1) == 0);
-
-  assert(washere == 1);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/rwlock6.c b/winsup/testsuite/winsup.api/pthread/rwlock6.c
deleted file mode 100644
index d5f2320d0..000000000
--- a/winsup/testsuite/winsup.api/pthread/rwlock6.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * rwlock6.c
- *
- * Check writer and reader locking
- *
- * Depends on API functions:
- *      pthread_rwlock_rdlock()
- *      pthread_rwlock_wrlock()
- *      pthread_rwlock_unlock()
- */
-
-#include "test.h"
-
-static pthread_rwlock_t rwlock1 = PTHREAD_RWLOCK_INITIALIZER;
-
-static int bankAccount = 0;
-
-void * wrfunc(void * arg)
-{
-  int ba;
-
-  assert(pthread_rwlock_wrlock(&rwlock1) == 0);
-  Sleep(2000);
-  bankAccount += 10;
-  ba = bankAccount;
-  assert(pthread_rwlock_unlock(&rwlock1) == 0);
-
-  return ((void *) ba);
-}
-
-void * rdfunc(void * arg)
-{
-  int ba;
-
-  assert(pthread_rwlock_rdlock(&rwlock1) == 0);
-  ba = bankAccount;
-  assert(pthread_rwlock_unlock(&rwlock1) == 0);
-
-  return ((void *) ba);
-}
-
-int
-main()
-{
-  pthread_t wrt1;
-  pthread_t wrt2;
-  pthread_t rdt;
-  int wr1Result = 0;
-  int wr2Result = 0;
-  int rdResult = 0;
-
-  bankAccount = 0;
-
-  assert(pthread_create(&wrt1, NULL, wrfunc, NULL) == 0);
-  Sleep(500);
-  assert(pthread_create(&rdt, NULL, rdfunc, NULL) == 0);
-  Sleep(500);
-  assert(pthread_create(&wrt2, NULL, wrfunc, NULL) == 0);
-
-  assert(pthread_join(wrt1, (void **) &wr1Result) == 0);
-  assert(pthread_join(rdt, (void **) &rdResult) == 0);
-  assert(pthread_join(wrt2, (void **) &wr2Result) == 0);
-
-  assert(wr1Result == 10);
-  assert(rdResult == 20);
-  assert(wr2Result == 20);
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/rwlock7.c b/winsup/testsuite/winsup.api/pthread/rwlock7.c
deleted file mode 100644
index 5b0727d99..000000000
--- a/winsup/testsuite/winsup.api/pthread/rwlock7.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * rwlock7.c
- *
- * Hammer on a bunch of rwlocks to test robustness and fairness.
- * Printed stats should be roughly even for each thread.
- */
-
-#include "test.h"
-#include <sys/time.h>
-#include <sys/timeb.h>
-
-#ifdef __GNUC__
-#include <stdlib.h>
-#endif
-
-#define THREADS         5
-#define DATASIZE        15
-#define ITERATIONS      1000000
-
-#define rand_r( _seed ) \
-	( _seed == _seed? rand() : rand() )
-
-/*
- * Keep statistics for each thread.
- */
-typedef struct thread_tag {
-  int         thread_num;
-  pthread_t   thread_id;
-  int         updates;
-  int         reads;
-  int         interval;
-} thread_t;
-
-/*
- * Read-write lock and shared data
- */
-typedef struct data_tag {
-  pthread_rwlock_t    lock;
-  int                 data;
-  int                 updates;
-} data_t;
-
-static thread_t threads[THREADS];
-static data_t data[DATASIZE];
-
-/*
- * Thread start routine that uses read-write locks
- */
-void *thread_routine (void *arg)
-{
-  thread_t *self = (thread_t*)arg;
-  int repeats = 0;
-  int iteration;
-  int element = 0;
-
-  for (iteration = 0; iteration < ITERATIONS; iteration++)
-    {
-      if (iteration % (ITERATIONS / 10) == 0)
-        {
-          putchar('.');
-          fflush(stdout);
-        }
-      /*
-       * Each "self->interval" iterations, perform an
-       * update operation (write lock instead of read
-       * lock).
-       */
-      if ((iteration % self->interval) == 0)
-        {
-          assert(pthread_rwlock_wrlock (&data[element].lock) == 0);
-          data[element].data = self->thread_num;
-          data[element].updates++;
-          self->updates++;
-          assert(pthread_rwlock_unlock (&data[element].lock) == 0);
-        } else {
-          /*
-           * Look at the current data element to see whether
-           * the current thread last updated it. Count the
-           * times, to report later.
-           */
-          assert(pthread_rwlock_rdlock (&data[element].lock) == 0);
-
-          self->reads++;
-
-          if (data[element].data == self->thread_num)
-            {
-              repeats++;
-            }
-
-          assert(pthread_rwlock_unlock (&data[element].lock) == 0);
-        }
-
-      element++;
-
-      if (element >= DATASIZE)
-        {
-          element = 0;
-        }
-    }
-
-  if (repeats > 0)
-    {
-      printf ("\nThread %d found unchanged elements %d times",
-              self->thread_num, repeats);
-      fflush(stdout);
-    }
-
-  return NULL;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int count;
-  int data_count;
-  int thread_updates = 0;
-  int data_updates = 0;
-  int seed = 1;
-
-  struct timeb currSysTime1;
-  struct timeb currSysTime2;
-
-  /*
-   * Initialize the shared data.
-   */
-  for (data_count = 0; data_count < DATASIZE; data_count++)
-    {
-      data[data_count].data = 0;
-      data[data_count].updates = 0;
-
-      assert(pthread_rwlock_init (&data[data_count].lock, NULL) == 0);
-    }
-
-  ftime(&currSysTime1);
-
-  /*
-   * Create THREADS threads to access shared data.
-   */
-  for (count = 0; count < THREADS; count++)
-    {
-      threads[count].thread_num = count;
-      threads[count].updates = 0;
-      threads[count].reads = 0;
-      threads[count].interval = rand_r (&seed) % 71;
-
-      assert(pthread_create (&threads[count].thread_id,
-                             NULL, thread_routine, (void*)&threads[count]) == 0);
-    }
-
-  /*
-   * Wait for all threads to complete, and collect
-   * statistics.
-   */
-  for (count = 0; count < THREADS; count++)
-    {
-      assert(pthread_join (threads[count].thread_id, NULL) == 0);
-      thread_updates += threads[count].updates;
-      printf ("%02d: interval %d, updates %d, reads %d\n",
-              count, threads[count].interval,
-              threads[count].updates, threads[count].reads);
-    }
-
-  putchar('\n');
-  fflush(stdout);
-
-  /*
-   * Collect statistics for the data.
-   */
-  for (data_count = 0; data_count < DATASIZE; data_count++)
-    {
-      data_updates += data[data_count].updates;
-      printf ("data %02d: value %d, %d updates\n",
-              data_count, data[data_count].data, data[data_count].updates);
-      assert(pthread_rwlock_destroy (&data[data_count].lock) == 0);
-    }
-
-  printf ("%d thread updates, %d data updates\n",
-          thread_updates, data_updates);
-
-  ftime(&currSysTime2);
-
-  printf( "\nstart: %ld/%d, stop: %ld/%d, duration:%ld\n",
-          currSysTime1.time,currSysTime1.millitm,
-          currSysTime2.time,currSysTime2.millitm,
-          (currSysTime2.time*1000+currSysTime2.millitm) -
-          (currSysTime1.time*1000+currSysTime1.millitm));
-
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/self1.c b/winsup/testsuite/winsup.api/pthread/self1.c
deleted file mode 100644
index d46081830..000000000
--- a/winsup/testsuite/winsup.api/pthread/self1.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * self1.c
- *
- * Test for pthread_self().
- *
- * Depends on API functions:
- *	pthread_self()
- *
- * Implicitly depends on:
- *	pthread_getspecific()
- *	pthread_setspecific()
- */
-
-#include "test.h"
-
-int
-main(int argc, char * argv[])
-{
-	/*
-	 * This should always succeed unless the system has no
-	 * resources (memory) left.
-	 */
-	assert(pthread_self() != NULL);
-
-	return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/self2.c b/winsup/testsuite/winsup.api/pthread/self2.c
deleted file mode 100644
index 83339f101..000000000
--- a/winsup/testsuite/winsup.api/pthread/self2.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * self2.c
- *
- * Test for pthread_self().
- *
- * Depends on API functions:
- *	pthread_create()
- *	pthread_self()
- *
- * Implicitly depends on:
- *	pthread_getspecific()
- *	pthread_setspecific()
- */
-
-#include "test.h"
-#include <string.h>
-
-static pthread_t me;
-
-void *
-entry(void * arg)
-{
-  me = pthread_self();
-
-  return arg;
-}
-
-int
-main()
-{
-  pthread_t t;
-
-  assert(pthread_create(&t, NULL, entry, NULL) == 0);
-
-  Sleep(2000);
-
-  /*
-   * Not much more we can do here but bytewise compare t with
-   * what pthread_self returned.
-   */
-  assert(t == me);
-  assert(memcmp((const void *) t, (const void *) me, sizeof t) == 0);
-
-  /* Success. */
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/pthread/test.h b/winsup/testsuite/winsup.api/pthread/test.h
deleted file mode 100644
index 0e7246420..000000000
--- a/winsup/testsuite/winsup.api/pthread/test.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* 
- * test.h
- *
- * Useful definitions and declarations for tests.
- */
-
-#ifndef _PTHREAD_TEST_H_
-#define _PTHREAD_TEST_H_
-
-#include <pthread.h>
-#include <sched.h>
-#include <semaphore.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <assert.h>
-#include <windows.h>
-
-/* #define assert(x) do { fprint (stderr, "assertion failed\n"); exit(1) } while (0) */
-
-const char * error_string[] = {
-  "ZERO_or_EOK",
-  "EPERM",
-  "ENOFILE_or_ENOENT",
-  "ESRCH",
-  "EINTR",
-  "EIO",
-  "ENXIO",
-  "E2BIG",
-  "ENOEXEC",
-  "EBADF",
-  "ECHILD",
-  "EAGAIN",
-  "ENOMEM",
-  "EACCES",
-  "EFAULT",
-  "UNKNOWN_15",
-  "EBUSY",
-  "EEXIST",
-  "EXDEV",
-  "ENODEV",
-  "ENOTDIR",
-  "EISDIR",
-  "EINVAL",
-  "ENFILE",
-  "EMFILE",
-  "ENOTTY",
-  "UNKNOWN_26",
-  "EFBIG",
-  "ENOSPC",
-  "ESPIPE",
-  "EROFS",
-  "EMLINK",
-  "EPIPE",
-  "EDOM",
-  "ERANGE",
-  "UNKNOWN_35",
-  "EDEADLOCK_or_EDEADLK",
-  "UNKNOWN_37",
-  "ENAMETOOLONG",
-  "ENOLCK",
-  "ENOSYS",
-  "ENOTEMPTY",
-  "EILSEQ",
-};
-
-/*
- * The Mingw32 assert macro calls the CRTDLL _assert function
- * which pops up a dialog. We want to run in batch mode so
- * we define our own assert macro.
- */
-#ifdef assert
-# undef assert
-#endif
-
-#ifdef NDEBUG
-
-# define assert(e) ((void)0)
-
-#else /* NDEBUG */
-
-#ifndef ASSERT_TRACE
-# define ASSERT_TRACE 0
-#else
-# undef ASSERT_TRACE
-# define ASSERT_TRACE 1
-#endif
-
-# define assert(e) \
-   ((e) ? ((ASSERT_TRACE) ? fprintf(stderr, \
-                                    "Assertion succeeded: (%s), file %s, line %d\n", \
-			            #e, __FILE__, (int) __LINE__), \
-	                            fflush(stderr) : \
-                             0) : \
-          (fprintf(stderr, "Assertion failed: (%s), file %s, line %d\n", \
-                   #e, __FILE__, (int) __LINE__), exit(1), 0))
-
-#endif /* NDEBUG */
-
-
-#endif
diff --git a/winsup/testsuite/winsup.api/pthread/threadidafterfork.c b/winsup/testsuite/winsup.api/pthread/threadidafterfork.c
deleted file mode 100644
index 473eaecfd..000000000
--- a/winsup/testsuite/winsup.api/pthread/threadidafterfork.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-static void * TestThread ( void * );
-
-int main (void)
-{
-  pthread_t t;
-
-  pthread_create (&t, NULL, TestThread, NULL);
-  pthread_join (t, NULL);
-
-  return 0;
-}
-
-static void * TestThread ( void *not_used )
-{
-  pthread_t iAm = pthread_self();
-  int status;
-  switch (fork ())
-    {
-    case -1:
-      exit(1);
-    case 0:
-      if (iAm != pthread_self())
-	  exit (1);
-      else
-	  exit (0);
-      break;
-    default:
-      wait (&status);
-      if (status != 0)
-	  exit (1);
-    }
-  exit(0);
-}
-
-/*
-The forked child will not get the same thread handle as its parent, it
-will get the thread handle from the main thread instead. The child will
-not terminate because the threadcount is still 2 after the fork (it is
-set to 1 in MTinterface::Init and then set back to 2 after the childs
-memory gets overwritten by the parent).
-
-concept test by Thomas Pfaff <tpfaff@gmx.net>
-scritable test by Robert Collins <rbtcollins@hotmail.com>
-*/
diff --git a/winsup/testsuite/winsup.api/pthread/tsd1.c b/winsup/testsuite/winsup.api/pthread/tsd1.c
deleted file mode 100644
index a65cf66c8..000000000
--- a/winsup/testsuite/winsup.api/pthread/tsd1.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * tsd1.c
- *
- * Test Thread Specific Data (TSD) key creation and destruction.
- *
- * Description:
- * - 
- *
- * Test Method (validation or falsification):
- * - validation
- *
- * Requirements Tested:
- * - keys are created for each existing thread including the main thread
- * - keys are created for newly created threads
- * - keys are thread specific
- * - destroy routine is called on each thread exit including the main thread
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - none
- *
- * Output:
- * - text to stdout
- *
- * Assumptions:
- * - already validated:     pthread_create()
- *                          pthread_once()
- * - main thread also has a POSIX thread identity
- *
- * Pass Criteria:
- * - stdout matches file reference/tsd1.out
- *
- * Fail Criteria:
- * - fails to match file reference/tsd1.out
- * - output identifies failed component
- */
-
-#include <sched.h>
-#include "test.h"
-
-static pthread_key_t key = NULL;
-static int accesscount[10];
-static int thread_set[10];
-static int thread_destroyed[10];
-
-static void
-destroy_key(void * arg)
-{
-  int * j = (int *) arg;
-
-  (*j)++;
-
-  assert(*j == 2);
-
-  thread_destroyed[j - accesscount] = 1;
-}
-
-static void
-setkey(void * arg)
-{
-  int * j = (int *) arg;
-
-  thread_set[j - accesscount] = 1;
-
-  assert(*j == 0);
-
-  assert(pthread_getspecific(key) == NULL);
-
-  assert(pthread_setspecific(key, arg) == 0);
-
-  assert(pthread_getspecific(key) == arg);
-
-  (*j)++;
-
-  assert(*j == 1);
-}
-
-static void *
-mythread(void * arg)
-{
-  while (key == NULL)
-    {
-	sched_yield();
-    }
-
-  setkey(arg);
-
-  return 0;
-
-  /* Exiting the thread will call the key destructor. */
-}
-
-int
-main()
-{
-  int i;
-  int fail = 0;
-  pthread_t thread[10];
-
-  for (i = 1; i < 5; i++)
-    {
-	accesscount[i] = thread_set[i] = thread_destroyed[i] = 0;
-      assert(pthread_create(&thread[i], NULL, mythread, (void *)&accesscount[i]) == 0);
-    }
-
-  Sleep(2000);
-
-  /*
-   * Here we test that existing threads will get a key created
-   * for them.
-   */
-  assert(pthread_key_create(&key, destroy_key) == 0);
-
-  /*
-   * Test main thread key.
-   */
-  accesscount[0] = 0;
-  setkey((void *) &accesscount[0]);
-
-  /*
-   * Here we test that new threads will get a key created
-   * for them.
-   */
-  for (i = 5; i < 10; i++)
-    {
-	accesscount[i] = thread_set[i] = thread_destroyed[i] = 0;
-      assert(pthread_create(&thread[i], NULL, mythread, (void *)&accesscount[i]) == 0);
-    }
-
-  /*
-   * Wait for all threads to complete.
-   */
-  for (i = 1; i < 10; i++)
-    {
-	int result = 0;
-
-	assert(pthread_join(thread[i], (void **) &result) == 0);
-    }
-
-  assert(pthread_key_delete(key) == 0);
-
-  for (i = 1; i < 10; i++)
-    {
-	/*
-	 * The counter is incremented once when the key is set to
-	 * a value, and again when the key is destroyed. If the key
-	 * doesn't get set for some reason then it will still be
-	 * NULL and the destroy function will not be called, and
-	 * hence accesscount will not equal 2.
-	 */
-	if (accesscount[i] != 2)
-	  {
-	    fail++;
-	    fprintf(stderr, "Thread %d key, set = %d, destroyed = %d\n",
-			i, thread_set[i], thread_destroyed[i]);
-	  }
-    }
-
-  fflush(stderr);
-
-  return (fail);
-}
diff --git a/winsup/testsuite/winsup.api/samples/sample-fail.c b/winsup/testsuite/winsup.api/samples/sample-fail.c
deleted file mode 100644
index d0d3e4a6a..000000000
--- a/winsup/testsuite/winsup.api/samples/sample-fail.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int
-main()
-{
-  return 1;
-}
diff --git a/winsup/testsuite/winsup.api/samples/sample-miscompile.c b/winsup/testsuite/winsup.api/samples/sample-miscompile.c
deleted file mode 100644
index bc0d21d2e..000000000
--- a/winsup/testsuite/winsup.api/samples/sample-miscompile.c
+++ /dev/null
@@ -1 +0,0 @@
-foo bar grill
diff --git a/winsup/testsuite/winsup.api/samples/sample-pass.c b/winsup/testsuite/winsup.api/samples/sample-pass.c
deleted file mode 100644
index 8e8f518aa..000000000
--- a/winsup/testsuite/winsup.api/samples/sample-pass.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int
-main()
-{
-  return 0;
-}
diff --git a/winsup/testsuite/winsup.api/semtest.c b/winsup/testsuite/winsup.api/semtest.c
deleted file mode 100644
index dfb8c08eb..000000000
--- a/winsup/testsuite/winsup.api/semtest.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Obtained from: $NetBSD: semtest.c,v 1.4 2002/07/20 08:36:25 grant Exp $
- * $FreeBSD: /repoman/r/ncvs/src/tools/regression/sysvsem/semtest.c,v 1.1 2002/08/15 06:34:37 alfred Exp $
- */
-
-/*
- * Test the SVID-compatible Semaphore facility.
- */
-
-/*
- * CV, 2003-11-17: Add to Cygwin testsuite.
- */
-#include <sys/param.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <sys/wait.h>
-
-#include <err.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "semtest";   /* Test program identifier. */
-int TST_TOTAL = 54;             /* Total number of test cases. */
-extern int Tst_count;           /* Test Case counter for tst_* routines */
-
-int	main (int, char *[]);
-void	print_semid_ds (struct semid_ds *, mode_t);
-void	sigsys_handler (int);
-void	sigchld_handler(int);
-void	cleanup (void);
-void	waiter (void);
-
-int	sender_semid = -1;
-pid_t	child_pid;
-int	child_count;
-int	signal_was_sigchld;
-
-key_t	semkey;
-
-/*
- * This is the original semun union used by the sysvsem utility.
- * It is deliberately kept here under #if 0'ed condition for future
- * reference. PLEASE DO NOT REMOVE.  The {SET,GET}ALL in FreeBSD
- * are signed values, so the default version in sys/sem.h suffices.
- */
-#if 1 /*0*/
-union semun {
-	int	val;		/* value for SETVAL */
-	struct	semid_ds *buf;	/* buffer for IPC_{STAT,SET} */
-	u_short	*array;		/* array for GETALL & SETALL */
-};
-#endif
-
-int
-main(int argc, char *argv[])
-{
-	struct sigaction sa;
-	union semun sun;
-	struct semid_ds s_ds;
-	sigset_t sigmask;
-	int i;
-
-	Tst_count = 0;
-
-	/*
-	 * Install a SIGSYS handler so that we can exit gracefully if
-	 * System V Semaphore support isn't in the kernel.
-	 */
-	sa.sa_handler = sigsys_handler;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	if (sigaction(SIGSYS, &sa, NULL) == -1)
-		tst_brkm (TBROK, cleanup, "sigaction SIGSYS");
-
-	/*
-	 * Install and SIGCHLD handler to deal with all possible exit
-	 * conditions of the receiver.
-	 */
-	sa.sa_handler = sigchld_handler;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	if (sigaction(SIGCHLD, &sa, NULL) == -1)
-		tst_brkm (TBROK, cleanup, "sigaction SIGCHLD");
-
-	semkey = ftok("/", 4160);
-	tst_resm (semkey == (key_t)-1 ? TFAIL : TPASS,
-		  "ftok(\"/\") returns valid value");
-
-	/*
-	 * Initialize child_pid to ourselves to that the cleanup function
-	 * works before we create the receiver.
-	 */
-	child_pid = getpid();
-
-	sender_semid = semget(semkey, 1, IPC_CREAT | 0640);
-	tst_resm (sender_semid == -1 ? TFAIL : TPASS, "sender calls semget");
-	
-	sun.buf = &s_ds;
-	tst_resm (semctl(sender_semid, 0, IPC_STAT, sun) == -1 ? TFAIL : TPASS, 
-		  "semctl IPC_STAT");
-
-	print_semid_ds(&s_ds, 0640);
-
-	s_ds.sem_perm.mode = (s_ds.sem_perm.mode & ~0777) | 0600;
-
-	sun.buf = &s_ds;
-	tst_resm (semctl(sender_semid, 0, IPC_SET, sun) == -1 ? TFAIL : TPASS, 
-		  "semctl IPC_SET");
-
-	memset(&s_ds, 0, sizeof(s_ds));
-
-	sun.buf = &s_ds;
-	tst_resm (semctl(sender_semid, 0, IPC_STAT, sun) == -1 ? TFAIL : TPASS, 
-		  "semctl IPC_STAT");
-
-	tst_resm ((s_ds.sem_perm.mode & 0777) != 0600 ? TFAIL : TPASS, 
-		  "IPC_SET of mode holds");
-
-	print_semid_ds(&s_ds, 0600);
-
-	for (child_count = 0; child_count < 5; child_count++) {
-		switch ((child_pid = fork())) {
-		case -1:
-			tst_brkm (TBROK, cleanup, "fork");
-			/* NOTREACHED */
-
-		case 0:
-			Tst_count += 22 + child_count * 4;
-			tst_resm (TPASS, "fork");
-			waiter();
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	/*
-	 * Wait for all of the waiters to be attempting to acquire the
-	 * semaphore.
-	 */
-	for (;;) {
-		i = semctl(sender_semid, 0, GETNCNT);
-		if (i == -1)
-			tst_brkm (TBROK, cleanup, "semctl GETNCNT");
-		if (i == 5)
-			break;
-	}
-
-	/*
-	 * Now set the thundering herd in motion by initializing the
-	 * semaphore to the value 1.
-	 */
-	sun.val = 1;
-	tst_resm (semctl(sender_semid, 0, SETVAL, sun) == -1 ? TFAIL : TPASS,
-		  "sender: semctl SETVAL to 1");
-
-	/*
-	 * Suspend forever; when we get SIGCHLD, the handler will exit.
-	 */
-	sigemptyset(&sigmask);
-	for (;;) {
-		(void) sigsuspend(&sigmask);
-		if (signal_was_sigchld)
-			signal_was_sigchld = 0;
-		else
-			break;
-	}
-
-	/*
-	 * ...and any other signal is an unexpected error.
-	 */
-
-	tst_brkm (TBROK, cleanup, "sender: received unexpected signal");
-	exit (1);
-}
-
-void
-sigsys_handler(int signo)
-{
-
-	tst_brkm (TBROK, cleanup,
-		  "System V Semaphore support is not present in the kernel");
-}
-
-void
-sigchld_handler(int signo)
-{
-	union semun sun;
-	struct semid_ds s_ds;
-	int cstatus;
-
-	/*
-	 * Reap the child; if it exited successfully, then we're on the
-	 * right track!
-	 */
-	if (wait(&cstatus) == -1)
-		tst_brkm (TBROK, cleanup, "wait");
-
-	if (WIFEXITED(cstatus) == 0)
-		tst_brkm (TBROK, cleanup, "receiver exited abnormally");
-
-	if (WEXITSTATUS(cstatus) != 0)
-		tst_brkm (TBROK, cleanup, "receiver exited with status %d",
-			  WEXITSTATUS(cstatus));
-
-	/*
-	 * If we get here, the child has exited normally, and we should
-	 * decrement the child count.  If the child_count reaches 0, we
-	 * should exit.
-	 */
-
-	sun.buf = &s_ds;
-	tst_resm (semctl(sender_semid, 0, IPC_STAT, sun) == -1 ? TFAIL : TPASS,
-		  "semctl IPC_STAT");
-
-	print_semid_ds(&s_ds, 0600);
-
-	if (--child_count != 0) {
-		signal_was_sigchld = 1;
-		return;
-	}
-
-	cleanup ();
-}
-
-void
-cleanup()
-{
-
-	/*
-	 * If we're the sender, and it exists, remove the message queue.
-	 */
-	if (child_pid != 0 && sender_semid != -1) {
-		tst_resm (semctl(sender_semid, 0, IPC_RMID) == -1
-			  ? TFAIL : TPASS, "semctl IPC_RMID");
-	}
-	tst_exit ();
-}
-
-void
-print_semid_ds(struct semid_ds *sp, mode_t mode)
-{
-	uid_t uid = geteuid();
-	gid_t gid = getegid();
-
-	printf("PERM: uid %d, gid %d, cuid %d, cgid %d, mode 0%o\n",
-	    (int)sp->sem_perm.uid, (int)sp->sem_perm.gid,
-	    (int)sp->sem_perm.cuid, (int)sp->sem_perm.cgid,
-	    sp->sem_perm.mode & 0777);
-
-	printf("nsems %u\n", sp->sem_nsems);
-
-	printf("otime: %s", ctime(&sp->sem_otime));
-	printf("ctime: %s", ctime(&sp->sem_ctime));
-
-	/*
-	 * Sanity check a few things.
-	 */
-
-	tst_resm (sp->sem_perm.uid != uid || sp->sem_perm.cuid != uid
-		  ? TFAIL : TPASS, "uid matches");
-
-	tst_resm (sp->sem_perm.gid != gid || sp->sem_perm.cgid != gid
-		  ? TFAIL : TPASS, "gid matches");
-
-	tst_resm ((sp->sem_perm.mode & 0777) != mode
-		  ? TFAIL : TPASS, "mode matches");
-}
-
-void
-waiter()
-{
-	struct sembuf s;
-	int semid;
-
-	tst_resm ((semid = semget(semkey, 1, 0)) == -1 ? TFAIL : TPASS,
-		  "waiter: semget");
-
-	/*
-	 * Attempt to acquire the semaphore.
-	 */
-	s.sem_num = 0;
-	s.sem_op = -1;
-	s.sem_flg = SEM_UNDO;
-
-	tst_resm (semop(semid, &s, 1) == -1 ? TFAIL : TPASS,
-		  "waiter: semop -1");
-
-	printf("WOO!  GOT THE SEMAPHORE!\n");
-	sleep(1);
-
-	/*
-	 * Release the semaphore and exit.
-	 */
-	s.sem_num = 0;
-	s.sem_op = 1;
-	s.sem_flg = SEM_UNDO;
-
-	tst_resm (semop(semid, &s, 1) == -1 ? TFAIL : TPASS,
-		  "waiter: semop +1");
-
-	/* Allow parent to receive message before getting SIGCHLD. */
-	sleep (1);
-	exit(0);
-}
diff --git a/winsup/testsuite/winsup.api/shmtest.c b/winsup/testsuite/winsup.api/shmtest.c
deleted file mode 100644
index 54a2493a8..000000000
--- a/winsup/testsuite/winsup.api/shmtest.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Obtained from: $NetBSD: shmtest.c,v 1.3 2002/07/20 08:36:26 grant Exp $
- * $FreeBSD: /repoman/r/ncvs/src/tools/regression/sysvshm/shmtest.c,v 1.1 2002/08/15 06:34:37 alfred Exp $
- */
-
-/*
- * Test the SVID-compatible Shared Memory facility.
- */
-
-#include <sys/param.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/wait.h>
-
-#include <err.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "test.h"
-#include "usctest.h"
-
-const char *TCID = "shmtest";   /* Test program identifier. */
-int TST_TOTAL = 22;             /* Total number of test cases. */
-extern int Tst_count;           /* Test Case counter for tst_* routines */
-
-int	main __P((int, char *[]));
-void	print_shmid_ds __P((struct shmid_ds *, mode_t));
-void	sigsys_handler __P((int));
-void	sigchld_handler __P((int));
-void	cleanup __P((void));
-void	receiver __P((void));
-
-const char *m_str = "The quick brown fox jumped over the lazy dog.";
-
-int	sender_shmid = -1;
-pid_t	child_pid;
-
-key_t	shmkey;
-
-size_t	pgsize;
-
-int
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	struct sigaction sa;
-	struct shmid_ds s_ds;
-	sigset_t sigmask;
-	char *shm_buf;
-
-	Tst_count = 0;
-
-	/*
-	 * Install a SIGSYS handler so that we can exit gracefully if
-	 * System V Shared Memory support isn't in the kernel.
-	 */
-	sa.sa_handler = sigsys_handler;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	if (sigaction(SIGSYS, &sa, NULL) == -1)
-		tst_brkm (TBROK, cleanup, "sigaction SIGSYS");
-
-	/*
-	 * Install and SIGCHLD handler to deal with all possible exit
-	 * conditions of the receiver.
-	 */
-	sa.sa_handler = sigchld_handler;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	if (sigaction(SIGCHLD, &sa, NULL) == -1)
-		tst_brkm (TBROK, cleanup, "sigaction SIGCHLD");
-
-	pgsize = sysconf(_SC_PAGESIZE);
-
-	shmkey = ftok("/", 4160);
-	tst_resm (shmkey == (key_t)-1 ? TFAIL : TPASS,
-		  "ftok(\"/\") returns valid value");
-
-	/*
-	 * Initialize child_pid to ourselves to that the cleanup function
-	 * works before we create the receiver.
-	 */
-	child_pid = getpid();
-
-	sender_shmid = shmget(shmkey, pgsize, IPC_CREAT | 0640);
-	tst_resm (sender_shmid == -1 ? TFAIL : TPASS, "sender calls shmget");
-
-	tst_resm (shmctl(sender_shmid, IPC_STAT, &s_ds) == -1 ? TFAIL : TPASS,
-		  "shmctl IPC_STAT");
-
-	print_shmid_ds(&s_ds, 0640);
-
-	s_ds.shm_perm.mode = (s_ds.shm_perm.mode & ~0777) | 0600;
-
-	tst_resm (shmctl(sender_shmid, IPC_SET, &s_ds) == -1 ? TFAIL : TPASS,
-		  "shmctl IPC_SET");
-
-	memset(&s_ds, 0, sizeof(s_ds));
-
-	tst_resm (shmctl(sender_shmid, IPC_STAT, &s_ds) == -1 ? TFAIL : TPASS,
-		  "shmctl IPC_STAT");
-
-	tst_resm ((s_ds.shm_perm.mode & 0777) != 0600 ? TFAIL : TPASS,
-		  "IPC_SET of mode holds");
-
-	print_shmid_ds(&s_ds, 0600);
-
-	tst_resm ((shm_buf = shmat(sender_shmid, NULL, 0)) == (void *) -1
-		  ? TFAIL : TPASS, "sender: shmat");
-
-	/*
-	 * Write the test pattern into the shared memory buffer.
-	 */
-	strcpy(shm_buf, m_str);
-
-	switch ((child_pid = fork())) {
-	case -1:
-		tst_brkm (TBROK, cleanup, "fork");
-		/* NOTREACHED */
-
-	case 0:
-		tst_resm (TPASS, "fork");
-		receiver();
-		break;
-
-	default:
-		Tst_count += 4;
-		break;
-	}
-
-	/*
-	 * Suspend forever; when we get SIGCHLD, the handler will exit.
-	 */
-	sigemptyset(&sigmask);
-	(void) sigsuspend(&sigmask);
-
-	/*
-	 * ...and any other signal is an unexpected error.
-	 */
-	tst_brkm (TBROK, cleanup, "sender: received unexpected signal");
-	exit (1);
-}
-
-void
-sigsys_handler(signo)
-	int signo;
-{
-
-	tst_brkm (TBROK, cleanup,
-		"System V Shared Memory support is not present in the kernel");
-}
-
-void
-sigchld_handler(signo)
-	int signo;
-{
-	struct shmid_ds s_ds;
-	int cstatus;
-
-	/*
-	 * Reap the child; if it exited successfully, then the test passed!
-	 */
-	if (waitpid(child_pid, &cstatus, 0) != child_pid)
-		tst_brkm (TBROK, cleanup, "waitpid");
-
-	if (WIFEXITED(cstatus) == 0)
-		tst_brkm (TBROK, cleanup, "receiver exited abnormally");
-
-	if (WEXITSTATUS(cstatus) != 0)
-		tst_brkm (TBROK, cleanup, "receiver exited with status %d",
-			  WEXITSTATUS(cstatus));
-
-	/*
-	 * If we get here, the child has exited normally, and thus
-	 * we should exit normally too.  First, tho, we print out
-	 * the final stats for the message queue.
-	 */
-
-	tst_resm (shmctl(sender_shmid, IPC_STAT, &s_ds) == -1 ? TFAIL : TPASS,
-		  "shmctl IPC_STAT");
-
-	print_shmid_ds(&s_ds, 0600);
-
-	cleanup ();
-}
-
-void
-cleanup()
-{
-
-	/*
-	 * If we're the sender, and it exists, remove the shared memory area.
-	 */
-	if (child_pid != 0 && sender_shmid != -1) {
-		tst_resm (shmctl(sender_shmid, IPC_RMID, NULL) == -1
-			  ? TFAIL : TPASS, "shmctl IPC_RMID");
-	}
-	tst_exit ();
-}
-
-void
-print_shmid_ds(sp, mode)
-	struct shmid_ds *sp;
-	mode_t mode;
-{
-	uid_t uid = geteuid();
-	gid_t gid = getegid();
-
-	printf("PERM: uid %d, gid %d, cuid %d, cgid %d, mode 0%o\n",
-	    (int)sp->shm_perm.uid, (int)sp->shm_perm.gid,
-	    (int)sp->shm_perm.cuid, (int)sp->shm_perm.cgid,
-	    sp->shm_perm.mode & 0777);
-
-	printf("segsz %lu, lpid %d, cpid %d, nattch %u\n",
-	    (u_long)sp->shm_segsz, sp->shm_lpid, sp->shm_cpid,
-	    sp->shm_nattch);
-
-	printf("atime: %s", ctime(&sp->shm_atime));
-	printf("dtime: %s", ctime(&sp->shm_dtime));
-	printf("ctime: %s", ctime(&sp->shm_ctime));
-
-	/*
-	 * Sanity check a few things.
-	 */
-
-	tst_resm (sp->shm_perm.uid != uid || sp->shm_perm.cuid != uid
-		  ? TFAIL : TPASS, "uid matches");
-
-	tst_resm (sp->shm_perm.gid != gid || sp->shm_perm.cgid != gid
-		  ? TFAIL : TPASS, "gid matches");
-
-	tst_resm ((sp->shm_perm.mode & 0777) != mode ? TFAIL : TPASS,
-		  "mode matches");
-}
-
-void
-receiver()
-{
-	int shmid;
-	void *shm_buf;
-
-	tst_resm ((shmid = shmget(shmkey, pgsize, 0)) == -1 ? TFAIL : TPASS,
-		  "receiver: shmget");
-
-	tst_resm ((shm_buf = shmat(shmid, NULL, 0)) == (void *) -1
-		  ? TFAIL : TPASS, "receiver: shmat");
-
-	printf("%s\n", (const char *)shm_buf);
-	tst_resm (strcmp((const char *)shm_buf, m_str) != 0 ? TFAIL : TPASS,
-		  "receiver: data is correct");
-
-	exit(0);
-}
diff --git a/winsup/testsuite/winsup.api/sigchld.c b/winsup/testsuite/winsup.api/sigchld.c
deleted file mode 100644
index b12876d4a..000000000
--- a/winsup/testsuite/winsup.api/sigchld.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdlib.h>
-
-int no_signal_caught = 1;
-
-void handler ( int signo )
-{
-  no_signal_caught = 0;
-}
-
-int
-main()
-{
-  pid_t pid;
-  signal ( SIGCHLD, handler );
-  pid = fork();
-  if ( pid == 0 ) exit ( 0 );
-  sleep ( 2 );
-  exit ( no_signal_caught );
-}
diff --git a/winsup/testsuite/winsup.api/signal-into-win32-api.c b/winsup/testsuite/winsup.api/signal-into-win32-api.c
deleted file mode 100755
index 26d0cd8e0..000000000
--- a/winsup/testsuite/winsup.api/signal-into-win32-api.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Test if signal is delivered to the application which is
- * currently inside of native syscall 
- */
-
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <windows.h>
-
-int saw_sigchld = 0;
-int sleep_stage = -1;
-
-void
-handle_child (int signo)
-{
-  printf ( "saw SIGCHLD, %d", sleep_stage);
-  saw_sigchld = 1; 
-}
-
-int
-main (int argc, char** argv)
-{
-  pid_t pid;
-  if (argc > 1)
-    {
-      Sleep (200);
-      return 0;
-    }
-
-  signal (SIGCHLD, handle_child);
-  pid = fork ();
-  if (pid < 0) 
-    {
-      perror ( "fork" );
-      return 2;
-    }
-  else if (pid == 0)
-    execl ( argv[0], argv[0], "child", 0 );
-  else
-    {
-      sleep_stage = 0;
-      Sleep (3000);
-      sleep_stage = 1;
-      sleep (10);
-      sleep_stage = 2;
-      if (!saw_sigchld)
-        {
-          printf ( "oops\n" );
-          kill (pid, SIGTERM);
-          return 1;
-        }
-      else
-        return 0;
-    }
-    exit (0);
-}
diff --git a/winsup/testsuite/winsup.api/systemcall.c b/winsup/testsuite/winsup.api/systemcall.c
deleted file mode 100644
index 91dd748c0..000000000
--- a/winsup/testsuite/winsup.api/systemcall.c
+++ /dev/null
@@ -1,68 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/wait.h>
-
-int
-main (int argc, char **argv)
-{
-  int fd, pid, n;
-  int fds[2];
-  static char buf[4096];
-
-  close (0);
-  if ((fd = open ("/dev/null", O_WRONLY)) != 0)
-    {
-      fprintf (stderr, "couldn't redirect stdin to /dev/null, fd %d - %s\n", fd, strerror (errno));
-      exit (1);
-    }
-
-  close (1);
-  if ((fd = open ("/dev/null", O_WRONLY)) != 1)
-    {
-      fprintf (stderr, "couldn't redirect stdout to /dev/null, fd %d - %s\n", fd, strerror (errno));
-      exit (1);
-    }
-  if (pipe (fds))
-    {
-      fprintf (stderr, "pipe call failed - %s\n", strerror (errno));
-      exit (1);
-    }
-  if ((pid = fork ()) == 0)
-    {
-      close (fds[0]);
-      if (dup2 (fds[1], 2) != 2)
-	{
-	  fprintf (stderr, "couldn't redirect stderr to pipe - %s\n", strerror (errno));
-	  exit (1);
-	}
-      exit (system ("ls"));
-    }
-  else if (pid < 0)
-    {
-      perror ("couldn't fork");
-      exit (1);
-    }
-
-  close (fds[1]);
-  if (read (fds[0], buf, 4096) != 0)
-    {
-      fprintf (stderr, "system() call failed?\n%s\n", buf);
-      exit (1);
-    }
-
-  if (waitpid (pid, &n, 0) < 0)
-    {
-      perror ("waitpid failed");
-      exit (1);
-    }
-  if (n != 0)
-    {
-      fprintf (stderr, "system() call returned %p\n", (void *) n);
-      exit (1);
-    }
-  exit (0);
-}
diff --git a/winsup/testsuite/winsup.api/waitpid.c b/winsup/testsuite/winsup.api/waitpid.c
deleted file mode 100644
index ee2925c4c..000000000
--- a/winsup/testsuite/winsup.api/waitpid.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <stdio.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-int
-main (int argc, char **argv)
-{
-  int pid, n;
-  if ((pid = fork ()) == 0)
-    exit (0);
-  sleep (2);
-  if ((n = waitpid (pid, NULL, 0)) != pid)
-    {
-      printf ("wait pid failed, pid %d, n %d, errno %d\n", pid, n, errno);
-      exit(1);
-    }
-  else
-    {
-      printf ("wait pid succeeded, pid %d, n %d, errno %d\n", pid, n, errno);
-      exit (0);
-    }
-}
diff --git a/winsup/testsuite/winsup.api/winsup.exp b/winsup/testsuite/winsup.api/winsup.exp
deleted file mode 100644
index e8eafad2e..000000000
--- a/winsup/testsuite/winsup.api/winsup.exp
+++ /dev/null
@@ -1,81 +0,0 @@
-source "site.exp"
-source "$srcdir/winsup.api/known_bugs.tcl"
-
-if { ! [isnative] } {
-    verbose "skipping winsup.api because it's not native"
-    return
-}
-
-set rv ""
-
-set ltp_includes "-I$ltp_includes"
-set ltp_libs "$rootme/libltp.a"
-
-set add_includes $ltp_includes
-set add_libs $ltp_libs
-
-set test_filter ""
-
-if { [info exists env(CYGWIN_TESTSUITE_TESTS)] } {
-    set test_filter "$env(CYGWIN_TESTSUITE_TESTS)"
-}
-
-proc ws_spawn {cmd args} {
-    global rv
-    verbose "running $cmd\n"
-    catch "exec $cmd" rv
-    verbose send "catchCode = $rv\n"
-}
-
-verbose "Filter: $test_filter"
-
-foreach src [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.c] {
-    if { $test_filter != "" && ! [regexp $test_filter $src] } {
-	verbose -log "Skipping $src"
-	continue
-    }
-
-    regsub "^$srcdir/$subdir/" $src "" testcase
-    regsub ".c$" $testcase "" base
-    regsub ".*/" $base "" basename
-    regsub "/" $base "-" base
-
-    if { [lsearch -exact $xfail_list $basename] >= 0 } {
-        set xfail_expected 1
-	setup_xfail "*-*-*"
-    } else {
-        set xfail_expected 0
-	clear_xfail
-    }
-
-    ws_spawn "$CC -nodefaultlibs -nostdinc -mwin32 $CFLAGS $src $add_includes $add_libs $runtime_root/binmode.o -lgcc $runtime_root/libcygwin0.a -lkernel32 -luser32 -o $base.exe"
-    if { $rv != "" } {
-	verbose -log "$rv"
-	fail "$testcase (compile)"
-    } else {
-        if { $verbose } {
-           set redirect_output "./$base.log"
-        } else {
-           set redirect_output /dev/null
-        }
-        ws_spawn "$rootme/cygrun ./$base.exe > $redirect_output"
-        if { $rv != "" } {
-	    verbose -log "$testcase: $rv"
-	    fail "$testcase (execute)"
-            if { $xfail_expected } {
-  	        catch { file delete "$base.exe" } err
-                if { $err != "" } {
-                    note "error deleting $base.exe: $err"
-                }
-            }
-	} else {
-	    pass "$testcase"
-            if { ! $xfail_expected } {
-		catch { file delete "$base.exe" } err
-		if { $err != "" } {
-                    note "error deleting $base.exe: $err"
-		}
-	    }
-	}
-    }
-}
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
deleted file mode 100644
index 677ab6edd..000000000
--- a/winsup/utils/ChangeLog
+++ /dev/null
@@ -1,1323 +0,0 @@
-2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkgroup.c (main): Print "root" group with local admins group sid
-	and gid 0.
-
-2003-11-19  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in: Add rules to build ipcrm and ipcs.
-	* ipcrm.c: New file.
-	* ipcs.c: New file.
-
-2003-11-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkgroup.c: Avoid compiler warnings throughout.
-	* mkpasswd.c: Ditto.
-	* passwd.c: Ditto.
-
-2003-11-07  Mark Blackburn  <marklist@fangorn.ca>
-
-	* cygpath.cc (main): Allow multiple pathnames on command line.
-
-2003-11-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* passwd.c (PrintPW): Turn around meaning printed for "Password not
-	required" option to be in line with Windows meaning.
-	(main): Use more appropriate 1008 option when calling
-	NetUserSetInfo to change flag values.
-
-2003-11-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* passwd.c (UF_LOCKOUT): Remove (defined in lmaccess.h).
-	(version): Bump version number to 1.5.
-	(longopts): Add -c, -C, -e, -E, -p, -P options.
-	(opts): Ditto.
-	(PrintPW): Print values of UF_PASSWD_CANT_CHANGE and
-	UF_DONT_EXPIRE_PASSWD flags. Slightly reformat output. Don't suppress
-	correct system password settings just because the account has admin
-	privileges.
-	(usage): Define as "noreturn" function. Restructure and rephrase
-	output. Accomodate new options.
-	(print_version): Fix copyright dates.
-	(main): Accomodate new options for setting UF_PASSWD_CANT_CHANGE,
-	UF_DONT_EXPIRE_PASSWD and UF_PASSWD_NOTREQD settings.
-
-2003-10-17  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc (pretty_id): Don't exec if `id' program is not found.
-
-2003-09-20  Christopher Faylor  <cgf@redhat.com>
-
-	* kill.cc (main): Allow negative pids (indicates process groups).
-
-2003-09-17  Christopher Faylor  <cgf@redhat.com>
-
-	* parse_pe.cc (exclusion::sort_and_check): Make error message a little
-	more explicit and ignore (hopefully) harmless region overlap.
-
-2003-09-13  Christopher Faylor  <cgf@redhat.com>
-
-	* kill.c (forcekill): Wait for process to terminate even if
-	TerminateProcess says it failed.
-
-2003-09-11  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Tweak mingw libz.a detection to make it more reliably
-	detect when libz.a is not available.
-
-2003-09-11  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-
-	* cygcheck.cc (dump_only): New global variable.
-	(usage): Add "--dump-only" option, fix "--verbose" line.
-	(longopts, opts): Add "--dump-only" option.
-	(main): Process the "--dump-only" flag.  Add new semantic check.
-	Pass dump_only information to dump_setup().
-
-2003-09-11  Corinna Vinschen  <corinna@vinschen.de>
-
-	* getfacl (main): Remove extern declaration of optind.
-	* setfacl (main): Remove extern declaration of optarg and optind.
-
-2003-09-10  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (cygcheck.o): Use MINGW_CXX for compilation.
-	* cygcheck.cc: Just include <getopt.h> rather than cygwin version.
-	(pretty_id): Avoid compiler warnings.
-	* cygpath.cc (usage): Ditto.
-
-2003-09-10  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (MINGW_CXX): Define and use for mingw-compiled files.
-	* path.cc: Include more path info in cygwin-specific includes since the
-	cygwin directory is no longer included by default.
-
-2003-09-10  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: More fixups to adjust for the fact that mingw_getopt.o
-	is no longer built.
-
-2003-09-10  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Remove references to getopt since it is now part of
-	mingwex.
-
-2003-09-08  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Rename libz.h -> zlib.h.
-
-2003-09-07  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Detect existence of mingw zlib headers and libraries.
-	Build cygcheck without package checking if they are unavailable.
-	* dump_setup.cc: Generate dummy zlib macros when zlib is not available.
-	(open_package_list): Use zlib functions to uncompress package lists.
-	Return gzFile rather than FILE *.
-	(check_package_files): Change fp to gzFile to accommodate zlib
-	functions.  Use gzgets to read from package file.  Use gzclose to close
-	the handle.
-	(package_list): Ditto.
-	(package_find): Ditto.
-
-2003-09-05  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-
-	* dump_setup.cc (check_package_files): Don't fail on empty package.
-
-2003-09-01  AJ Reins  <reinsaj@yahoo.com>
-
-	* mount.cc (mount_commands): Ensure user mode is actually user mode and
-	not the default system mode.
-
-2003-08-31  Christopher Faylor  <cgf@redhat.com>
-
-	* kill.cc (forcekill): Silence some compiler warnings.
-
-2003-08-31  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Oops.  Put the '...' in the right place.
-
-2003-08-31  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Display "..." when not-verbose.
-
-	* kill.cc (forcekill): Default to entered pid when pinfo fails.  Issue
-	some warnings when things don't work.
-
-2003-08-17  David Rothenberger  <daveroth@acm.org>
-
-	* dump_setup.cc (check_package_files): Strip leading / and ./ from
-	package file names.
-
-2003-08-16  David Rothenberger  <daveroth@acm.org>
-
-	* dump_setup.cc (package_find): Don't stop searching on missing
-	file list.
-	(package_list): Ditto.
-
-2003-08-16  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-
-	* dump_setup.cc: (package_list): Make output terse unless
-	verbose requested.  Fix formatting.
-	(package_find): Ditto.
-
-2003-08-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygcheck.cc (main): Fix some formatting and help text printing.
-
-2003-08-15  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-
-	* cygcheck.cc (find_package,list_package): New global
-	variables.
-	(usage): Add "--find-package" and "--list-package" options,
-	reformat output.
-	(longopts, opts): Add "--find-package" and "--list-package"
-	options.
-	(main): Process the "--find-package" and "--list-package"
-	flags.  Add new semantic checks.  Add calls to find_package()
-	and list_package().
-	* dump_setup.cc: Fix header comment.
-	(match_argv): Change return type to int to distinguish
-	between real matches and default ones.
-	(open_package_list): New static function.
-	(check_package_files): Factor out opening the package list
-	file into open_package_list().
-	(get_packages): New static function.
-	(dump_setup): Factor out getting a list of packages into
-	get_packages().
-	(package_list, package_find): New global functions.
-
-2003-08-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* regtool.cc (usage): Add missing linefeed.  Move example to --help
-	text.  Fix forward slash description.
-
-2003-08-13  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-
-	* dump_setup.cc (check_package_files): Fix extra '/' in filename.
-	Resize command buffer.  Fix buffer overflow bug.
-
-2003-08-09  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* dump_setup.cc (dump_setup): Check for the existence of the package
-	list file.  Rework slightly to use static buffer for popen commands.
-
-2003-08-07  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* dump_setup.cc (version_len): New static variable.
-	(could_not_access,directory_exists): New static function.
-	(file_exists): Ditto.
-	(check_package_files): Ditto.
-	(dump_setup): Check the contents of each package if check_files is true
-	and output the result in the "Status" column.  Flush output after each
-	package.
-
-2003-08-07  Igor Pechtchanski  <pechtcha@cs.nyu.edu>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* dump_setup.cc (dump_setup): Remove redundant null check.  Add
-	informative message if package info not found.
-
-2003-07-26  Christopher Faylor  <cgf@redhat.com>
-
-	* mount.cc (do_mount): Issue warning when using managed mount option on
-	non-empty directory.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Use 'install-sh -c'.
-	* configure: Regenerate.
-
-2003-07-25  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Always use install-sh.
-	* configure: Regenerate.
-
-2003-07-03  Christopher Faylor  <cgf@redhat.com>
-
-	* mount.cc (struct opt): Remove posix option.
-
-2003-07-03  Christopher Faylor  <cgf@redhat.com>
-
-	* mount.cc (longopts): Add long "options" keyword.
-	(opts): Add -o option.
-	(usage): Display -o option.
-	(struct opt): New.
-	(concat3): New function.
-	(main): Handle -o flag.
-
-2003-06-12  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc (pretty_id): Rework slightly to not rely on spaces.
-
-2003-06-12  Christopher Faylor  <cgf@redhat.com>
-
-	* cygpath.cc: Throughout, always return error when GetShortPathName
-	returns 0.
-
-2003-04-26  Joshua Daniel Franklin <joshuadfranklin at yahoo dot com>
-
-	* mkpasswd.c (usage) Remove extra newline from description output.
-
-2003-04-26  Joshua Daniel Franklin <joshuadfranklin at yahoo dot com>
-
-	* cygcheck.cc (usage) Add description output.
-	* cygpath.cc (usage) Add description output.
-	* dumper.cc (usage) Add newline to description output.
-	* kill.cc (usage) Add description output.
-	* mkgroup.c (usage) Grammatical change to description output.
-	* mkpasswd.c (usage) Grammatical change to description output.
-	* mount.cc (usage) Add description output.
-	* passwd.c (usage) Add description output.
-	* ps.cc (usage) Add description output.
-	* regtool.cc (usage) Add description output.
-	* setfacl.c (usage) Remove extra newline from description output.
-	* ssp.c (usage) Add description output.
-	* strace.cc (usage) Add description output.
-	* umount.cc (usage) Add description output.
-
-2003-04-10  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* mkpasswd.c (current_user): print uid and gid as unsigned.
-	(enum_users): Ditto. Do not free servername.
-	(usage): Update to allow several domains and improve -p.
-	(main): On Win9x limit uids to 1000. Only print specials
-	when -l is specified. Add a loop to allow several domains
-	and free servername in the loop.
-	* mkgroup.c (enum_groups): Do not free servername.
-	(usage): Update to allow several domains. Change uid to gid.
-	(main): Only print specials when -l is specified. Add a
-	loop to allow several domains and free servername in the loop.
-
-2003-03-24  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc (dump_sysinfo): Ensure that CYGWIN environment variable
-	is correctly set.
-
-2003-03-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* getfacl.c (username): Fix ambiguous printf calls.
-	(groupname): Ditto.
-	(main): Ditto.
-
-2003-03-04  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (strace.exe): Include mingw_getopt.o in link line.
-	* cygcheck.cc (print_version): Update copyright.
-	* strace.cc (print_version): Ditto.
-	(main): Allow cygwin paths for -o option.
-	(create_child): Allow cygwin path as argv[0].
-	* path.cc (path.cc): Allow UNC paths.
-
-2003-03-01  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* mkpasswd.cc (main): On Win95, output both a default line and a
-	line for the current user (if known) with a pseudorandom uid. If
-	the -u switch is given, produce a line for the specified user.
-	* mkgroup.cc (main): On Win95 change the group name from "unknown" to
-	"all".
-
-2003-02-28  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (cygcheck.o): Fix so that actual mingw include files are
-	used.
-	* cygcheck.cc (find_on_path): Translate from cygwin path when qualified
-	path name found.
-	(pretty_id): New function.  Dump output of id command.
-	(dump_sysinfo): Call pretty_id for CYGWIN=ntsec and CYGWIN=nontsec cases.
-
-2003-02-12  Christopher Faylor  <cgf@redhat.com>
-
-	* cygpath.cc (doit): Allocate more space for non-path filename.
-
-2003-02-07  Christopher Faylor  <cgf@redhat.com>
-
-	* dump_setup.cc (compar): Use case insensitive comparisons.
-	(dump_setup): Calculate package_len based on already used "len".  Don't
-	bother with version_len.
-
-2003-02-07  Igor Pechtchanski <pechtcha@cs.nyu.edu>
-
-	* dump_setup.cc (dump_setup): Compute the longest package name
-	and align columns properly.
-
-2003-02-06  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc (common_apps): Add some more apps.
-	* path.cc (get_cygdrive): Correctly set system flag.
-
-2003-01-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* Makefile.in (ALL_LDFLAGS): Remove newlib/libm from tools paths.
-	(MINGW_LDFLAGS): Remove in favor of definition from Makefile.common.
-
-2003-01-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkgroup.c: Fix copyright date.
-	* mkpasswd.c: Ditto.
-	* setfacl.c: Ditto.
-
-2003-01-09  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* setfacl.c (usage): Remove double ":" for mask and other.
-
-2003-01-07  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* mkpasswd.c (current_user): Create.
-	(usage): Reorganize to support Win95/98/ME.
-	(main): Add option for -c. Reorganize to parse options for
-	Win95/98/ME and to call current_user. Add username in gecos field
-	on Win95/98/ME.
-	* mkgroup.c (enum_groups): Print gid with %u.
-	(print_win_error): Create from passwd.cc.
-	(current_group): Create.
-	(usage): Reorganize to support Win95/98/ME.
-	(main): Add option for -c. Reorganize to parse options for
-	Win95/98/ME and to call current_group.
-
-2002-12-14  Pierre Humblet <pierre.humblet@ieee.org>
-
-	* setfacl.c (main): Place a single : after other and mask.
-	* getfacl.c (getaclentry): Allow both : and :: for other and mask.
-	(main): Remove extraneous break.
-
-2002-11-25  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkpasswd.c (main): Set pw_passwd field to '*' on 9x/Me.
-
-2002-11-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* setfacl.c (getperm): Set only `other' permission bits.
-	(getaclentry): Set a_id to -1 by default.
-
-2002-11-24  Corinna Vinschen  <corinna@vinschen.de>
-
-	* getfacl.c (permstr): Use `other' permission bits for requesting
-	ace permissions.
-
-2002-11-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* setfacl.c (usage): Add missing LF.
-
-2002-10-30  Christopher Faylor  <cgf@redhat.com>
-
-	* cygpath.cc (get_long_path_name_w32impl): Define similarly to
-	GetLongPathName.
-	(get_long_name): Correctly prototype GetLongPathName.
-	(get_long_paths): Implement using get_long_name to cut down on code
-	duplication.
-	(doit): Do various things to make path output work predictably.
-
-2002-10-19  Christopher Faylor  <cgf@redhat.com>
-
-	* mount.cc (usage): Correctly report default mode.
-	* strace.cc (main): Use strtoul as appropriate.
-
-2002-09-29  Christopher Faylor  <cgf@redhat.com>
-
-	* cygpath.cc (close_arg): Remove unused static.
-	* mkgroup.c (enum_local_users): Avoid compiler warning.
-	(enum_users): Ditto.
-	* mkpasswd.c: Ditto throughout.
-	* ssp.c: Ditto throughout.
-
-2002-09-18  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc: Include sys/time.h rather than time.h to avoid a
-	compiler error.
-
-2002-09-17  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc: Reorder includes to avoid compiler error.
-
-2002-09-15  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* cygcheck.cc (print_version) Add final newline.
-	* getfacl.c (print_version) Add final newline.
-	* kill.cc (print_version) Add final newline.
-	* mkgroup.c (print_version) Add final newline.
-	* mkpasswd.c (print_version) Add final newline.
-	* mount.cc (print_version) Add final newline.
-	* passwd.c (print_version) Add final newline.
-	* ps.cc (print_version) Add final newline.
-	* regtool.cc (print_version) Add final newline.
-	* setfacl.c (print_version) Add final newline.
-	* ssp.c (print_version) Add final newline.
-	* strace.cc (print_version) Add final newline.
-	* umount.cc (print_version) Add final newline.
-
-2002-09-12  Igor Pechtchanski <pechtcha@cs.nyu.edu>
-
-	* cygpath.cc (options) New global variable.
-	(main) Make short options global for easier change.
-	(print_version) Add a missing newline.
-
-2002-08-07  Igor Pechtchanski <pechtcha@cs.nyu.edu>
-
-	* regtool.cc (find_key): Add support for custom key separator.
-	(usage): Document it.
-
-2002-08-02  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkgroup.c (main): Don't print an entry for "Everyone".
-	* mkpasswd.c (print_special): Set pw_gid to 544 for SYSTEM user.
-	(main): Don't print an entry for "Everyone".
-
-2002-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* configure.in: Check for libiconv.a.
-	* configure: Regenerate.
-	* Makefile.in: Add libiconv.a to libraries required for dumper.exe.
-
-2002-07-06  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Use MINGW stuff from Makefile.common.
-
-2002-07-01  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkgroup.c: Add function pointers for functions from advapi32.dll.
-	(load_netapi): Load used functions from advapi32.dll.
-	(main): Use function pointers instead of statically linked functions
-	from advapi32.dll.
-
-2002-07-01  Christopher Faylor  <cgf@redhat.com>
-
-	* mount.cc (main): Ensure that mount_already_exists() also gets default
-	flag that is passed to do_mount.
-
-2002-06-22  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* cygpath.cc (long_options): Add "dos" and "mixed", correct "close",
-	"file" and "type" to use NULL flag.
-	(usage): Clean up usage output (more), accomodate new options.
-	(main): Add --dos and --mixed options; accomodate all output forms in
-	--type.  Make UNIXy output default.
-
-2002-06-18  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
-
-	* cygpath.cc (usage): Clean up usage output.
-	(dowin): Correct output of -t mixed for -ADHPSW options.
-
-2002-06-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* passwd.c: Rearrange includes to avoid unnecessary warnings.
-	(GetPW): Add parameter to (dis)allow printing of Windows username.
-	Use defines instead of numerical constants where possible.
-	Try avoiding impersonation problem.  Rearrange to print Windows
-	username only if it's different from Cygwin username.
-	(ChangePW): Use defines instead of numerical constants where possible.
-	(main): Call GetPW with additional parameter.  Change error text.
-
-2002-06-14  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* passwd.c (GetPW): Handle case of user-edited /etc/passwd
-	with cygwin_internal (CW_EXTRACT_DOMAIN_AND_USER, ...).
-
-2002-06-09  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (cygpath): Change MOUNT_AUTO to MOUNT_CYGDRIVE.
-	(getmntent): Ditto.
-
-2002-06-09  Christopher Faylor  <cgf@redhat.com>
-
-	* mount.cc (main): Use default system/user flag for cygdrive stuff,
-	too.
-	(change_cygdrive_prefix): Change MOUNT_AUTO to MOUNT_CYGDRIVE.
-	* umount.cc (remove_cygdrive_prefix): Ditto.
-	(main): Use default system/user flag for cygdrive stuff, too.
-
-2002-06-08  Christopher Faylor  <cgf@redhat.com>
-
-	* mount.cc (opts): Remove '-i' option.
-	(usage): Ditto.
-	(main): Ditto.
-	(longopts): Remove --import-old-mounts option.
-
-2002-06-07  David Peterson  <chief@mail.idrive.com>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	* cygpath.cc: Add option to output windows paths in different formats:
-	"dos" and "mixed".
-	(main): Process options.
-	(doit): Check new options flags.
-
-2002-06-06  Egor Duda <deo@logos-m.ru>
-
-	* regtool.cc (Fail): Be more verbose.
-	(find_key): Add support for remote registry access.
-	(usage): Document it.
-	* utils.sgml: Document it.
-
-2002-06-06  Christopher Faylor  <cgf@redhat.com>
-
-	* strace.cc (main): Make toggle a local variable.
-
-2002-06-07  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* strace.cc (toggle): New global variable.
-	(error): Use exit instead of ExitProcess so that stdio buffers get
-	flushed.
-	(create_child): Remove command line error checking.
-	(dostrace): Ditto.
-	(dotoggle): New function.
-	(usage): Add entry for new option -T|--toggle.  Alphabetize.
-	(longopts): Add new option -T|--toggle.
-	(opts): Ditto.
-	(main): Handle new -T|--toggle option.  Move all command line checking
-	here from other functions.
-	* utils.sgml: Update section for strace.
-
-2002-06-05  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* strace.cc (version): New global variable.
-	(usage): Accommodate stdout output.
-	(print_version): New function.
-
-2002-06-03  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* ssp.c (version): New global variable.
-	(longopts): Ditto.
-	(opts): Ditto.
-	(run_program): Correct cmd_line typos to cmdline.
-	(usage): New function.  Standardize usage output.  Add ssp.txt to
-	--help output.
-	(print_version): New function.
-	(main): Accommodate getopt.
-
-2002-06-03  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* umount.cc (version): New global variable.
-	(longopts): Accommodate new --version option.
-	(opts): Ditto.
-	(usage): Standardize usage output.
-	(print_version): New function.
-	(main): Accommodate --help, --version options.
-
-2002-06-02  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
-
-	* regtool.cc (prog_name): New global variable.
-	(longopts): Ditto.
-	(opts): Ditto.
-	(usage): Standardize usage output.  Rearrange/add descriptions.
-	(print_version): New function.
-	(main): Accommodate longopts and new --help, --version options.  Add
-	check for (_argv[optind+1] == NULL).
-
-2002-06-02  Christopher Faylor  <cgf@redhat.com>
-
-	* strace.cc (forkdebug): Make true by default.
-	(attach_process): Use window pid if cygwin pid isn't available (yet).
-	(create_child): Use either DEBUG_ONLY_THIS_PROCESS or DEBUG_PROCESS,
-	exclusively. (Suggested by Conrad.Scott@dsl.pipex.com)
-
-2002-05-30  Christopher Faylor  <cgf@redhat.com>
-
-	* mkpasswd.cc (main): Don't reset to binmode if stdout is a terminal.
-
-2002-05-29  Christopher Faylor  <cgf@redhat.com>
-
-	* mount.cc (main): Make -b the default.
-
-2002-05-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* ps.cc (main): Use uid or uid32 member of struct external_pinfo
-	dependent of the value of the struct's version member.
-
-2002-05-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* ps.cc (main): Change print format for uid to unsigned.  Use uid32
-	member of struct external_pinfo instead of uid.
-
-2002-05-28  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* passwd.c (prog_name): New global variable.
-	(longopts): Ditto.
-	(opts): Ditto.
-	(usage): Standardize output. Accommodate new options.
-	(print_version): New function.
-	(main): Accommodate longopts and new --help, --version options.
-
-2002-05-28  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* ps.cc (usage): Fix typo.
-
-2002-05-27  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* ps.cc (prog_name): New global variable.
-	(longopts): Ditto.
-	(opts): Ditto.
-	(usage): New function.
-	(print_version): New function.
-	(main): Accommodate longopts and new --help, --version options.
-
-2002-05-26  Christopher Faylor  <cgf@redhat.com>
-
-	* strace.cc (attach_process): Don't tell process to start stracing
-	here.
-	(proc_child): Do it here, instead, after first debug event.  This
-	should work around inexplicable races with DebugActiveProcess.
-	(dostrace): Pass any pid argument to proc_child.
-
-2002-05-23  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* getfacl.c (usage): Standardize usage output. Change return type to
-	static void.
-	(print_version): New function.
-	(longopts): Added longopts for all options.
-	(main): Accommodate new help and version options.
-
-2002-05-22  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* mount.cc (version): New global variable.
-	(usage): Standardize usage output.  Accommodate new version option.
-	(print_version): New function.
-	(longopts): Accommodate new version option.
-	(opts): Ditto.
-	(main): Ditto.
-
-2002-05-22  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygpath.cc (usage): Change usage output slightly.
-
-2002-05-20  Joerg Schaible <joerg.schaible@gmx.de>
-
-	* cygpath.cc (main): Add option l to support conversion to
-	Windows long file names.  Refactured code for capital options.
-	Support of options from file for capital options.
-	(dowin): New function.  Refactured from main.
-	(doit): Call long path conversion.
-	(get_long_name): New function.
-	(get_long_paths): New function.
-	(get_long_path_name_w32impl): New function.  Reimplementation
-	of Windows API function GetLongPathName (only 98/Me/2000/XP or
-	higher).
-	(get_short_name): Call GetShortPathName only once.
-	(get_short_paths): Fix calculating buffer size.
-	* utils.sgml: Update cygpath section for l option.
-
-2002-05-18  Christopher Faylor  <cgf@redhat.com>
-
-	* strace.cc (add_child): Use calloc since new requires working
-	libstdc++.a.
-	(remove_child): Ditto for delete/free.
-
-2002-05-15  Mark Blackburn  <marklist@fangorn.ca>
-
-	* cygpath.cc (get_short_paths): Fix more error checking.
-	(get_short_name): Ditto.
-
-2002-05-14  Joerg Schaible <joerg.schaible@gmx.de>
-
-	* cygpath.cc (main): Add option H to show the Windows' profiles
-	directory.  Support short names for options DPSW.  Clean up
-	copied code lines.
-	* utils.sgml: Update cygpath section for H option and s support.
-
-2002-05-14  Mark Blackburn  <marklist@fangorn.ca>
-
-	* cygpath.cc (get_short_paths): Fix error checking.
-
-2002-05-13  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* kill.cc (prog_name): New global variable.
-	(usage): Standardize usage output.  Add descriptions.
-	(print_version): New function.
-	(longopts): Accommodate new version option.
-	(opts): Ditto.
-	(main): Ditto.
-
-2002-05-13  Christopher Faylor  <cgf@redhat.com>
-
-	* kill.cc (listsig): Display numeric id when given symbolic input.
-
-2002-05-13  Christopher Faylor  <cgf@redhat.com>
-
-	* kill.cc (usage): Show new options.  Allow specification of output
-	stream.
-	(main): Implement 'h' option.
-
-2002-05-13  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (kill.exe): Add as a specific target.
-	* kill.cc (longopts): New.
-	(opts): Ditto.
-	(get_sig): Accept const char * parameter.  Return -1 on unknown signal.
-	(test_for_unknown_sig): New function.
-	(listsig): New function.
-	(main): Use getopt_long for option parsing.  Implement -l, and -s
-	options.  Use test_for_unknown_sig() to test for signal validity.
-
-	* mount.cc (longopts): Make static.
-	(opts): Ditto.
-
-2002-05-12  Christopher Faylor  <cgf@redhat.com>
-
-	* mount.cc (do_mount): Default to non-exec option for remote drives.
-	Report warnings before attempting a mount.
-	(longopts): Add no-executable option.
-	(mount_commands): Ditto.
-	(opts): Ditto.
-	(usage): Ditto.  Indicate that system mount is now the default.
-	(main): Accommodate no-executable option.  Make system mount the
-	default.
-	* umount.cc (usage): Indicate that system umount is now the default.
-	(main): Make system umount the default.
-
-2002-05-07  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* dumper.cc (usage): Standardize usage output.  Generalize to allow use
-	for help.
-	(longopts): New struct.  Added longopts for all options.
-	(print_version): New function.
-	(main): Change getopt to getopt_long.  Accommodate new help and version
-	options.
-
-2002-03-29  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkgroup.c (main): Change call to exit() to a return statement.
-	* mkpasswd.c (main): Ditto.
-
-2002-03-27  Joshua Daniel Franklin  joshuadfranklin@yahoo.com
-
-	* mkpasswd.c (usage): Simplify usage output.  Generalize to allow use
-	for help. Correct '?' typo to 'h'.
-	(longopts): Add version option.
-	(opts): Add 'v' version option.
-	(print_version): New function.
-	(main): Accommodate new version option.  Accommodate usage parameter
-	changes.
-
-2002-03-19  Christopher Faylor  <cgf@redhat.com>
-
-	* mkgroup.c (usage): Use one just fprintf + string concatenation for
-	output message.
-	(print_version): Add void to function type and update copyright.
-
-2002-03-16  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* mkgroup.c (usage): Simplify usage output.  Generalize to allow use
-	for help. Correct '?' typo to 'h'.
-	(longopts): Add version option.
-	(opts): Add 'v' version option.
-	(print_version): New function.
-	(main): Accommodate new version option.  Accommodate usage parameter
-	changes.  Use usage to output help message.
-
-2002-03-15  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkgroup.c (main): When generating group 513, check for computer's
-	primary domain instead of current user's domain.
-
-2002-03-14  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkgroup.c (main): When generating group 513, check for domain SID
-	if computer name isn't mapped to a SID.
-
-2001-03-11 Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* kill.cc (usage): Move to top of file.
-	(getsig): Ditto.
-	(forcekill): Ditto.
-
-2002-03-06  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc: Reformat.
-
-2002-03-06  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc (longopts): Use correct short option for --version.
-
-2002-03-06  Christopher Faylor  <cgf@redhat.com>
-
-	* cygpath.cc: Reformat.
-
-2002-02-27 Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-
-	* cygpath.cc (print_version): New function.
-	(main): Accommodate new version function.  Initialize 'o' to prevent
-	warning.
-
-2002-02-27  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc (main): Eliminate non-GNU formatting glitch.
-
-2002-02-27  Christopher Faylor  <cgf@redhat.com>
-
-	* ssp.c (help_desk): Fix compiler warning.
-
-2002-02-27  Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
-	    Christopher Faylor  <cgf@redhat.com>
-
-	Change appropriate globals to statics throughout.
-	* cygcheck.cc (usage): Simplify usage output.  Generalize to allow use
-	for help.
-	(longopts): Add version option.
-	(opts): Add 'V" version option.
-	(print_version): New function.
-	(main): Accommodate new version option.  Accommodate usage parameter
-	changes.  Use usage to output help message.
-
-002-02-19  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (CXXFLAGS): Add override so that HAVE_DECL_GETOPT is
-	defined.
-	(libbfd): Use -B rather than -L so that bfd from build directory is
-	correctly found.
-	(libintl): Ditto.
-
-2002-02-15  Christopher Faylor  <cgf@redhat.com>
-
-	* mount.cc (usage): Fix typo in output.
-
-2002-02-14  Christopher Faylor  <cgf@redhat.com>
-
-	* strace.cc (attach_process): Change CW_STRACE_ON to CW_STRACE_TOGGLE.
-
-2002-01-31  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkpasswd.c (main): Set default home path for 9x/Me if --path-to-home
-	isn't given.
-
-2002-01-30  Corinna Vinschen  <corinna@vinschen.de>
-
-	* passwd.cc (ChangePW): Add parameter to differ between called for
-	checking old password and called for changing password.  If called
-	for checking old password, return non-zero only if password is surely
-	incorrect.
-	(main): Call ChangePW() with additional parameter.
-
-2002-01-29  Christopher Faylor  <cgf@redhat.com>
-
-	* dump_setup.cc (parse_filename): Don't consider '_' part of the
-	version.
-
-2002-01-28  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc: Fix typo.  Remove uid_t kludge.  Rely on kludge in
-	sys/cygwin.h instead.
-	* getfacl.c: Add include to remove warning.
-	* mkgroup.c (main): Assign variables outside of parameter passing.
-	This seems to eliminate some compiler warnings.
-
-2002-01-28  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc: Use specific cygwin includes, as required.
-
-2002-01-28  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (MINGW_INCLUDES): Change cygwin include.
-	* strace.cc: Use specific cygwin includes, as required.
-	(load_cygwin): New function.  Loads cygwin DLL, if necessary.
-	(attach_process): Attaches strace to a running process.
-	(dostrace): Accept pid argument.  Attach to pid if supplied.
-	(usage): Describe -p option.  Correct system description.
-	(longopts): Alphabetize.
-	(opts): Ditto.
-	(main): Ditto.  Handle -p option.
-
-2002-01-21  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (CXXFLAGS): Ensure that important settings are preserved
-	even when overriden by command line.
-
-2002-01-21  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Build intermediate cygcheck.o to force use of MINGW_CXXFLAGS.
-	* cygcheck.cc (cygwin_info): Intitialize variable to quiet g++ warning.
-	(dump_sysinfo): Make variables unsigned to quiet g++ warnings.
-	* strace.cc (version_string): Rename from SCCSid.
-	(add_child): Remove unused variable.
-	(version): Use version_string.  Avoid use of fprintf.
-
-2002-01-21  DJ Delorie  <dj@redhat.com>
-
-	* Makefile.in: Use CXX instead of CC to compile C++ sources.
-
-2002-01-17  DJ Delorie  <dj@redhat.com>
-
-	* cygcheck.cc (already_did): Avoid default constructors, which may
-	require exception support.
-
-2001-01-16  Joshua Daniel Franklin  <joshuadfranklin@yahoo.com>
-
-	* cygpath.cc (main): Add options to show Desktop and Start
-	Menu's Programs directory for current user or all users.
-	Move bulk of DPWS options outside the getopt case statement.
-	* utils.sgml: Update cygpath section for ADPWS options.
-
-2002-01-15  Joerg Schaible <joerg.schaible@gmx.de>
-
-	* cygpath.cc (doit): Empty file ignored using option -i.
-
-2002-01-15  Mark Bradshaw  <bradshaw@crosswalk.com>
-
-	* mkpasswd.c (print_win_error): Add a new function.
-	(enum_users): Use print_win_error.
-	(enum_local_groups): Ditto.
-	(main): Ditto.
-
-2001-12-26  Jonathan Kamens  <jik@curl.com>
-
-	* cygpath.cc (doit): Detect and warn about an empty path.  Detect and
-	warn about errors converting a path.
-	(main): Set prog_name correctly -- don't leave an extra slash or
-	backslash at the beginning of it.
-
-Fri Dec 14 14:04:37 2001  Jason Tishler <jason@tishler.net>
-
-	* mkpasswd.c (enum_users): Change to unconditionally use
-	the --path-to-home option, if supplied by the user.  Use default
-	--path-to-home option value, if appropriate.
-	(usage): Change usage statement to reflect new semantics.
-	(main): Remove defaulting of the --path-to-home option.
-
-Fri Dec 14 12:10:39 2001  Jason Tishler <jason@tishler.net>
-
-	* mkpasswd.c (opts): Add indication that '-p' option requires an
-	argument.
-
-2001-12-11  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Add define to CXXFLAGS.
-
-2001-12-03  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc (usage): Add -c description.
-	* cygpath.cc (usage): Alphabetize options.
-	* strace.cc (usage): Ditto.
-
-2001-11-21  Christopher Faylor  <cgf@redhat.com>
-
-	* path.cc (cygpath): Don't consider cygdrive stuff when trying to derive
-	native paths.
-
-2001-11-20  Mark Bradshaw  <bradshaw@staff.crosswalk.com>
-
-	* mkpasswd.c: include lmerr.h
-	(main): New -u option to allow specifying a
-	specific user.  If specified, groups aren't displayed and
-	output is limited to only the specified user.
-	(enum_users): If specific user is specified, via -u option,
-	display only that user's record.  With -u use NetUserGetInfo
-	instead of NetUserEnum.
-	(load_netapi): Added netusergetinfo.
-
-2001-11-15  Gary R. Van Sickle  <g.r.vansickle@worldnet.att.net>
-
-	* strace.cc (main): Change getopt() to getopt_long().
-	Add support for help and version info.
-	Use new parse_mask() function for -m/--mask option.
-	(longopts): Add long options structure.
-	(opts): Move options string from getopts call to static var.
-	(usage): Print usage information.
-	(SCCSid): Version info.
-	(version): New function for displaying version info.
-	(parse_mask): New function supporting parsing of mnemonics,
-	hex, and basic expressions in masks.
-	(mnemonic2ul): New mnemonic parsing function.
-	(tag_mask_mnemonic): New type.
-	(mnemonic_table): New table of mnemonics for mnemonic2ul() to
-	search through.
-
-2001-11-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygcheck.cc (dump_sysinfo): Redefine output format slightly.
-	Print correct build number on 9x/ME systems.
-
-2001-11-12  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc (main): Slight formatting tweak.
-
-2001-11-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygcheck.cc (dump_sysinfo): Add some more details.
-
-2001-11-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygcheck.cc (dump_sysinfo): Print more detailed OS information string
-	using OSVERSIONINFOEX information.
-
-2001-11-11  Christopher Faylor  <cgf@redhat.com>
-
-	* path.h: New file.
-
-2001-11-11  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc (scan_registry): Open registry with read-only access.
-	(main): Reflect argument change for dump_setup.
-	* dump_setup.cc (dump_setup): Add preliminary extra argument for future
-	use.
-	* path.cc (read_mounts): Open registry with read-only access.
-
-2001-11-11  Christopher Faylor  <cgf@redhat.com>
-
-	* cygcheck.cc (main): Display package info when '-s' is specified.
-	* dump_setup.cc (dump_setup): Change header.  Remove typo.  Always sort
-	packages output.
-
-2001-11-11  Christopher Faylor  <cgf@redhat.com>
-
-	* dump_setup.cc: New file.
-	* Makefile.in: Add info for dump_setup.o.
-	* cygcheck.cc (main): Recognize '-c' option for checking setup
-	installed base.
-	* path.cc (cygpath): Read mount table if not loaded.
-
-2001-11-10  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in (cygcheck.exe): Compile as -mno-cygwin executable.
-	* path.cc: New file.
-	* cygcheck.cc (init_paths): Use MS-DOS path syntax.
-	(cygwin_info): Properly display cygwin version numbers.  Prettify some
-	output.
-	(dump_sysinfo): Calculate max names of posix and ms-dos paths for
-	prettier output.
-
-2001-11-09  Corinna Vinschen  <corinna@vinschen.de>
-
-	* cygcheck.cc (dump_sysinfo): Print more detailed OS information string.
-
-2001-11-04  Corinna Vinschen  <corinna@vinschen.de>
-
-	* getfacl.c (username): New function.
-	(groupname): Ditto.
-	(usage): Ditto.  Add more user friendly help text.
-	(main): Add -n and --help option.  Print names instead of IDs
-	unless -n option is given.
-	* setfacl.c (getperm): Tolerate whitespace and comment chars in input.
-	(getaclentry): Fix several input string misdetections.
-	(getaclentries): Allow - as input file name to read from stdin.
-	Tolerate whitespace and comment chars in input.
-	(usage): Add more user friendly help text.
-	(main): Add --help option.
-
-2001-11-04  Egor Duda  <deo@logos-m.ru>
-
-	* strace.cc (main): New option '-w'. Start traced process in separate
-	window. New option '-S x'. Flush buffered output every x seconds.
-	(create_child): Start child process in new window, when requested.
-	When requested, periodically flush debugging output.
-
-2001-10-24  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Remove EXEEXT consideration.  We always need .exe
-	extensions.
-
-2001-10-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* mkgroup.c: Avoid compiler warnings.
-	(print_special): New function.
-	(main): Print special accounts by calling print_special().
-	* mkpasswd.c: Avoid compiler warnings.
-	(enum_users): Print additional U-domain\username info in gecos
-	field when SIDs are printed.
-	(print_special): New function.
-	(main): Print special accounts by calling print_special().
-
-2001-10-15  Christopher Faylor  <cgf@redhat.com>
-
-	* mkpasswd.cc (enum_users): Shorten "unused" passwd field.
-
-2001-10-13  Christopher Faylor  <cgf@redhat.com>
-
-	* Makefile.in: Allow stdinc searching for dumper.
-
-Tue Oct  9 21:59:00 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in (MINGW_INCLUDES): Accommodate changes in Makefile.common.
-
-Sun Oct  7 23:06:39 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* kill.cc (main): Set exit value to 1 on invalid pid.  Perform minor
-	cleanup.
-
-Fri Sep 21 20:40:30 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in (mingw_getopt.o): Ensure that newlib include directories
-	are not searched.
-
-Thu Sep 20 21:00:20 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in (MINGW_INCLUDES): Still need cygwin/include directory.
-
-Wed Sep 19 12:22:08 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Filter newlib includes from mingw compilation.
-
-2001-09-14  Egor Duda  <deo@logos-m.ru>
-
-	* dumper.cc (dumper::dumper): Print error code in case of error.
-	(dumper::add_thread): Ditto.
-	(dumper::collect_memory_sections): Ditto.
-	(dumper::dump_memory_region): Ditto.
-	(dumper::collect_process_information): Ditto.
-	(print_section_name): Fix formatting.
-
-2001-09-13  Egor Duda  <deo@logos-m.ru>
-
-	* dumper.cc (main): Properly recognize negative pids (used by w9x).
-
-2001-09-09  Egor Duda  <deo@logos-m.ru>
-
-	* dumper.cc (main): Change command-line arguments format to be
-	similar to gdb. Allow adding error_start=x:\path\to\dumper.exe to
-	CYGWIN environment variable to perform core dumping in case of
-	program crash.
-	(usage): Ditto.
-
-Wed Sep  5 22:37:21 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in (dumper): Change logic for libbfd and libintl so that
-	they will be found either in the build tree or the installed directory.
-	* mkpasswd.c (enum_users): Add a comment as a password for NT.
-
-2001-09-03  Michael A Chase <mchase@ix.netcom.com>
-
-	* mount.cc (mount_commands): Don't write /cygdrive/u mount points.
-
-2001-09-03  Michael A Chase <mchase@ix.netcom.com>
-
-	* mount.cc (longopts): Add mount-commands to options list.
-	(usage): Add mount-commands option.
-	(mount_commands): New function.  Write commands to recreate current
-	mounts.
-
-Sat Sep  1 15:58:11 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* mount.cc (main): Eliminate excess arguments in printf.
-
-2001-08-30  Egor Duda  <deo@logos-m.ru>
-
-	* dumper.h: Update copyright notice.
-	* dumper.cc: Ditto.
-	* dumper.cc: (dumper::print_core_section_list): New function.
-	* dumper.h: (dumper::print_core_section_list): Declare it.
-	* dumper.cc (print_section_name): New function.
-	(dumper::collect_process_information): Augment debugging output.
-	Stop debugee processing if it posts double exception.
-	(usage): Fix typo in option name.
-
-Tue Aug 28 14:45:02 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* mount.cc (main): Issue correct warning for 'not enough arguments'.
-
-2001-08-14  Joerg Schaible <joerg.schaible@gmx.de>
-
-	* cygpath.cc (main): Support -w for Windows (System) directories and
-	return physical correct orthography for the Windows System dir.
-
-2001-07-14   Chris Genly  <chgenly@alum.mit.edu>
-
-	* regtool.cc (find_key): Handle keys with only one subkey.
-
-Wed Jun 27 22:46:10 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* regtool.cc (find_key): Revert previous change.
-
-Wed Jun 27 13:37:41 2001  Keith Starsmeare" <keith_starsmeare@yahoo.co.uk>
-
-	* regtool.cc (find_key): Allow '/' as a synonym for '\\'.
-
-Fri Jun 15 00:49:21 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* mkpasswd.c (main): Output passwd file in binary mode so that there
-	are no CRs in the file.
-	* umount.cc (remove_all_user_mounts): Don't try to remove /cygdrive
-	mounts.
-
-Tue May  1 10:50:48 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* mkpasswd.c (enum_users): Use /bin/bash as the default shell.
-	(main): Ditto.
-
-Sat Apr 28 22:32:01 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* passwd.cc (ttymnam): New function.
-	(main): Use ttynam() to report name of tty.
-
-2001-04-19  Egor Duda  <deo@logos-m.ru>
-
-	* dumper.cc (dumper::init_core_dump): Set architecture field in dump
-	header.
-
-Mon Apr 16 15:08:00 2001  Corinna Vinschen <vinschen@redhat.com>
-
-	* mkgroup.c: Add function pointers `netlocalgroupgetmembers' and
-	`netgroupgetusers'.
-	(load_netapi): Load function pointers `netlocalgroupgetmembers'
-	and `netgroupgetusers'.
-	(enum_local_users): New function.
-	(enum_local_groups): Call `enum_local_users' for each group if
-	`print_users' is set.
-	(enum_users): New function.
-	(enum_groups): Call `enum_users' for each group if `print_users' is set.
-	(usage): Add usage text for `-u/--users'.
-	(longopts): Add option `--users'.
-	(opts): Add option character `u'.
-	(main): Set `print_users' according to option `-u/--users'.
-	Call `enum_local_groups' and `enum_groups' with additional parameter
-	`print_users'.
-
-2001-04-15  Michael A Chase <mchase@ix.netcom.com>
-
-	* mount.cc (longopts): Add help to options list.
-	(opts): Add 'h' to options string.
-	* umount.cc (longopts): Add help to options list.
-	(opts): Add 'h' to options string and change 'R' to 'A'.
-
-2001-04-13  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
-
-	* mkgroup.c (enum_groups): Use RID + offset specified an additional
-	argument as ID.
-	(usage): Add description of -o option.
-	(longopts, opts): Add specifications of -o/--id-offset option.
-	(main): Add -o option.  Invoke enum_groups with specified offset.
-	* mkpasswd.c (enum_users): Just like mkgroup.c.
-	(usage, longopts, opts): Ditto.
-	(main): Add -o option.  Invoke enum_users with specified offset only
-	against domain accounts.
-
-2001-04-11  Egor Duda  <deo@logos-m.ru>
-
-	* mkgroup.c (uni2ansi): Use native method to convert from Unicode
-	to multi-byte strings.
-	* mkpasswd.c (uni2ansi): Ditto.
-	(enum_users): Pass buffer size when converting string.
-	(enum_local_groups): Ditto.
-	* mkgroup.c (enum_groups): Ditto.
-	(enum_local_groups): Ditto.
-
-Mon Apr  2 22:41:33 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* mount.cc (main): Use getopt_long for parsing arguments.
-	(usage): Reformat, show long and short options.
-	* umount.cc (main): Ditto, all of the above.
-
-Mon Apr  2 10:58:26 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* mount.cc (show_mounts): Change format string to more closely resemble
-	UNIX when displaying mount table.
-
-Sat Mar 17 21:46:06 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* kill.cc (forcekill): Use dwProcessId when opening a process, not the
-	Cygwin pid.
-
-Mon Mar  5 18:50:00 2001  Corinna Vinschen <vinschen@redhat.com>
-
-	* getfacl.c: Add copyright hint.
-	* setfacl.c: Ditto.
-	* strace.cc: Ditto.
-
-Tue Jan 09 10:26:23 2001  Tony Sideris  <tonys1110@home.com>
-
-	* regtool.cc (cmd_list): Add new registry display options.
-	(cmd_list): Add code to implement -p, -k, and -l options.
-
-	* regtool.cc (Fail): Add call to LocalFree to free memory allocated by
-	FormatMessage.
-
-Wed Jan 10 09:16:57 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* regtool.cc (translate): Ensure that 'c' is initialized.
-	(cmd_set): Ditto for rv.
diff --git a/winsup/utils/ChangeLog-2000 b/winsup/utils/ChangeLog-2000
deleted file mode 100644
index 7ea5ae186..000000000
--- a/winsup/utils/ChangeLog-2000
+++ /dev/null
@@ -1,347 +0,0 @@
-Fri Dec 15 23:41:48 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygcheck.cc (cygwin_info): Add some more bounds checking.
-
-Fri Dec 15 23:41:34 2000  Christopher Faylor <cgf@cygnus.com>
-
-	From Matt Harget <matt@use.net>:
-	* utils/cygcheck.cc (keyeprint): Move declaration before other
-	functions so it could be used by all functions to report error
-	messages. Add comment.
-	(add_path): Check for NULL return from malloc.
-	(find_on_path): Check initial uses of pointers for NULL.
-	(rva_to_offset): Ditto.
-	(init_paths): Add checking for return values of Win32 calls.
-	(get_dword): Ditto.
-	(get_word): Ditto.
-	(dll_info): Ditto, also add NULL pointer checks.
-	(scan_registry): Ditto.
-	(check_keys): Ditto.
-	(dump_sysinfo): Ditto. Add default case to switch. Add error
-	reporting if GetVolumeInformation fails, except when it
-	returns ERROR_NOT_READY.
-	(track_down): Add checking for NULL pointers and
-	return values of Win32 calls.
-	(cygwin_info): Ditto.  Correct small memory leak.
-
-Sun Dec 10 19:08:58 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Compile/link dumper.exe with c++.
-
-Tue Dec  7 11:15:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* mkpasswd.c: Slight formatting changes to the below patch.
-	(longopts): Fix typo in `local-groups' option.
-	(main): Initialize `passed_home_path' before first usage.
-
-Tue Dec  7 11:15:00 2000  Chris Abbey <cabbey@bresnanlink.net>
-
-	* mkpasswd.c: make default home directory /home/$user if one
-	can't be found in user registry. Allow user to override
-	that with command line arg.
-
-Sun Dec  3 00:40:47 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Use CXX to build the DLL.
-	* configure.in: Find correct c++ compiler.
-	* configure: Regenerate.
-
-Sat Nov 18 23:53:59 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* utils.sgml: Document new options for ps and strace.
-
-Wed Nov  8 08:49:27 2000 Jason Tishler <jt@dothill.com>
-
-	* mount.cc (main): Call show_cygdrive_info instead of
-	show_cygdrive_prefixes.
-	* mount.cc (show_cygdrive_prefixes): Remove function.
-	* mount.cc (show_cygdrive_info): New function.  Actually,
-	show_cygdrive_info is really an enhanced version of
-	show_cygdrive_prefixes renamed to show_cygdrive_info that also displays
-	the user and system flags.
-
-Wed Nov  8 15:52:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* mkgroup.c (load_netapi): New function to load netapi32.dll functions
-	dynamically so that mkgroup works on 9x/ME as well.
-	Use corresponding function pointers throughout.
-	(usage): Change to `int'. Change text to be conformant to mkpasswd.
-	(main): Use `getlongopt' to process options.
-	Special handling to create a group entry on 9x/ME.
-	* mkpasswd.c (load_netapi): New function to load netapi32.dll functions
-	dynamically so that mkpasswd works on 9x/ME as well.
-	Use corresponding function pointers throughout.
-	(usage): Change to `int'. Change text to be conformant to mkgroup.
-	(main): Use `getlongopt' to process options.
-	Special handling to create a passwd entry on 9x/ME.
-	Change conditional to create an entry for the local administrators
-	group when appropriate.
-
-Thu Nov  2  2:01:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* kill.cc (main): Return 1 in case of errors.
-
-Sat Oct 28 01:37:55 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Accomodate newer gcc's which require linking of c++
-	programs with g++.  Fixup output for some compilations.
-	* cygcheck.cc: Respond to compiler warnings.
-	* dumper.cc (main): Ditto.
-	* parse_pe.cc (exclusion::sort_and_check): Ditto.
-	* setfacl.cc (getaclentry): Ditto.
-
-Fri Oct 27 20:20:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* strace.cc (main): Add a '-b' option.
-
-2000-10-18  DJ Delorie  <dj@redhat.com>
-
-	* ssp.c: new
-	* ssp.txt: new
-	* Makefile.in: build ssp.exe
-
-Wed Oct 18 18:57:46 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* ps.cc (main): Add some extra space to Windows pid output for
-	Windows 95.
-
-Tue Oct 17 23:49:04 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* ps.cc (main): Add some extra space to pid output for Windows 95.
-
-Tue Oct 17  1:09:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	Patch suggested by Brad Town <btown@ceddec.com>:
-	* cygcheck.cc (main): Fix argument counting.
-
-Sat Oct 14 23:42:58 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* ps.cc (main): Accomodate new PID_ constant.
-
-Thu Oct 12 02:19:12 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* strace.cc (proc_child): Handle exceptions correctly.
-
-Sun Oct  8 23:11:17 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* ps.cc (main): Change order of reporting slightly so that windows pids
-	are more obvious.
-	* strace.cc (add_child): Just add child's pid directly.
-	(remove_child): No need to close the child process pid since
-	ContinueDebugEvent does that automatically.
-	(proc_child): Ditto for child thread.
-
-Fri Sep 29 13:12:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygcheck.cc (keyeprint): New function.
-	(check_keys): New function. Perform checking keycodes.
-	(main): Add option `-k' for invoking check_keys.
-	Change option processing to use long options and getopt_long.
-	* cygkeycheck.cc: Removed. Functionality moved to `cygcheck.cc'.
-	* Makefile.in: Remove cygkeycheck from the dependencies.
-
-Wed Sep 27 16:24:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* cygkeycheck.cc: New file. Utility to retrieve keycodes.
-	* Makefile.in: Add cygkeycheck to the dependencies.
-
-2000-09-15  Joerg Schaible <joerg.schaible@gmx.de>
-
-	* cygpath.cc: Add new options: -s and -i.
-	* utils.sgml: Document the new options.
-
-Tue Sep 12 22:45:28 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* kill.cc (main): Change behavior of -f so that it will force the
-	killing of a cygwin process after waiting 2 tenths of a second for it
-	to terminate.
-	(forcekill): Add an extra argument determining whether to wait for the
-	process to exit.
-
-Sun Sep 10 12:50:02 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Refine dumper.exe message.
-
-Mon Aug 28 21:55:56 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* kill.c (main): Avoid skipping next argument when a signal number is
-	specified.
-	* Makefile.in: Always clean dumper.exe.
-
-Fri Aug 25 12:41:53 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Only build dumper.exe when all of its library and
-	include dependencies are available.
-
-Fri Aug 25 11:44:29 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Make failure to build dumper.exe a non-error.
-
-Thu Aug 24 18:02:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* ps.cc (main): Always print a cygwin process using cygwin paths.
-
-2000-08-24  Egor Duda  <deo@logos-m.ru>
-
-	* Makefile.in: Add dumper.exe target and associated mechanisms for building it.
-	* dumper.cc: New file.
-	* dumper.h: New file.
-	* module_info.cc: New file.
-	* parse_pe.cc: New file.
-
-Mon Jul 31 15:12:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* passwd.c (main): Initialize oldpwd before beeing used.
-
-Sat Jul 29 00:44:46 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* kill.cc (main): Add '-f' option to force termination of a process.
-	(forcekill): New function.
-	* ps.cc (main): Add '-W' option to list Windows pids as well as Cygwin
-	pids.
-	(dummyprocessmodules): New function.
-	(GetModuleFileNameEx95): New function.
-	(init_win): New function.
-	(to_time_t): New function.
-
-Thu Jul 27 22:54:28 2000  Jason Tishler <jt@dothill.com>
-
-	* utils/mount.cc (main): Add --show-cygdrive-prefixes option.
-	(show_cygdrive_prefixes): New function.
-	* utils/umount.cc (main): Add --remove-cygdrive-prefix option.
-	(error): Change signature from 'char *' to 'const char *'.
-	(remove_cygdrive_prefix): New function.
-
-Thu Jul 13 22:24:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* mount.cc (mount_already_exists): Slightly rearrange.
-	Change message texts.
-
-Thu Jul 13 13:02:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* mount.cc (mount_already_exists): Additional warning message
-	if mount point exists with another mount type.
-
-Sat Jul  1 00:19:27 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Find getopt.c in cygwin/lib subdirectory.
-
-Sat Jun 24 23:16:33 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygcheck.cc (cygwin_info): New function.  Scans DLL for Cygwin
-	version info.
-	(dll_info): Add path parameter for checking "cygwin1.dll".
-	(track_down): Accomodate additional parameter for dll_info.
-	(ls): Ditto.
-	(dump_sys_info): Always print cygwin1.dll last.
-
-2000-06-07  Kazuhiro Fujieda <fujieda@jaist.ac.jp>
-
-	* mount.cc (error): New function to report an error and exit.
-	* umount.cc (error): Ditto.
-	(remove_all_automounts): Check return status of cygwin_umount.
-	(remove_all_user_mounts): Ditto.
-	(remove_all_system_mounts): Ditto.
-
-2000-06-05  DJ Delorie  <dj@cygnus.com>
-
-	* mount.cc: add stdlib.h for exit
-	* umount.cc: ditto
-	* strace.cc: add #define for alloca
-
-Fri May 20  0:01:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* regtool.cc (find_key): Add parameter `access'.
-	Call `RegOpenKeyEx' with that desired access.
-	(cmd_add, cmd_remove, cmd_set, cmd_unset): Call
-	`find_key' with KEY_ALL_ACCESS access.
-	(cmd_list, cmd_check, cmd_get): Call `find_key'
-	with KEY_READ access.
-
-2000-05-19  DJ Delorie  <dj@cygnus.com>
-
-	* cygpath.cc: add --windir/--sysdir options
-	* utils.sgml: and document them
-
-Thu May 18 14:38:26 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Eliminate WINSUP_DEPS.
-	* cygpath.cc: Reorganize includes to accomodate sys/cygwin.h changes.
-	* mkgroup.c: Ditto.
-	* mkpasswd.c: Ditto.
-	* mount.cc: Ditto. Eliminate use of cygwin source specific includes.
-	* ps.cc: Ditto.
-	* cygwin.cc: Eliminate obsolete file.
-
-Wed Apr 26 23:43:25 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* mount.cc (main): Add "-X" option to specify a "Cygwin executable".
-
-Sat Apr 15 23:34:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* mkpasswd.c (main): Use GetDCName instead of GetAnyDCName.
-	Don't create extra passwd entry for administrators group
-	if local_groups is set.
-	(usage): Change usage text slightly.
-	(enum_users): Loop while ERROR_MORE_DATA is returned.
-	(enum_local_groups): Ditto.
-	* mkgroup.c (enum_local_groups): Ditto.
-	(enum_groups) Ditto.
-	(usage): Change usage text slightly.
-
-Thu Apr 13 01:22:35 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygpath.cc (main): Add -a -o and -c options.
-	(doit): Ditto.
-
-Mon Apr 10 22:56:07 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* cygpath.cc (main): Add -f option for processing a group of paths from
-	a file.
-	(doit): New function.
-
-Sat Mar 18 22:52:37 2000  Christopher Faylor <cgf@cygnus.com>
-
-	Patch suggested by Mumit Khan  <khan@xraylith.wisc.edu>:
-	* strace.cc (_impure_ptr): New global variable to make strace build
-	under Cygwin gcc.
-
-Sat Mar 18 12:45:10 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Make CXXFLAGS consistent with cygwin.
-
-Wed Mar 15 00:53:58 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* Makefile.in: Use MINGW_CXXFLAGS when compiling strace.
-
-Sun Mar 12 21:22:25 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* strace.cc: Throughout, track information like start_time, etc.  on a
-	per-process basis.
-
-Sun Feb 27 23:37:32 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* strace.cc (handle_output_debug_string): Parse strace output to allow
-	various types of time output.
-
-Fri Jan 21 02:10:26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* utils/regtool.cc (translate): Added unix like backslash
-	processing.
-
-2000-01-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* regtool.cc: allow forward slashes as key separators
-
-2000-01-19  DJ Delorie  <dj@redhat.com>
-
-	* regtool.cc: New file.
-	* Makefile.in: add regtool
-	* utils.sgml: add regtool
-
-Sat Jan  8 17:13:51 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* getfacl.c: New file.
-	* setfacl.c: New file.
-	* Makefile.in: Add getfacl.exe and setfacl.exe to list of PROGS.
-	Fix link flags in MINGW case.
diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
deleted file mode 100644
index c0a0c1470..000000000
--- a/winsup/utils/Makefile.in
+++ /dev/null
@@ -1,217 +0,0 @@
-# Makefile for Cygwin utilities
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-# This file is part of Cygwin.
-
-# This software is a copyrighted work licensed under the terms of the
-# Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-# details.
-
-SHELL:=@SHELL@
-
-srcdir:=@srcdir@
-VPATH:=@srcdir@
-prefix:=@prefix@
-exec_prefix:=@exec_prefix@
-
-bindir:=@bindir@
-etcdir:=$(exec_prefix)/etc
-program_transform_name:=@program_transform_name@
-
-override INSTALL:=@INSTALL@
-override INSTALL_PROGRAM:=@INSTALL_PROGRAM@
-override INSTALL_DATA:=@INSTALL_DATA@
-
-EXEEXT:=@EXEEXT@
-EXEEXT_FOR_BUILD:=@EXEEXT_FOR_BUILD@
-
-CC:=@CC@
-CC_FOR_TARGET:=$(CC)
-CXX:=@CXX@
-CXX_FOR_TARGET:=$(CXX)
-
-CFLAGS:=@CFLAGS@
-CXXFLAGS:=@CXXFLAGS@
-override CXXFLAGS+=-fno-exceptions -fno-rtti -DHAVE_DECL_GETOPT=0
-
-include $(srcdir)/../Makefile.common
-
-libbfd:=${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a}
-libintl:=${shell $(CC) -B$(bupdir2)/intl/ --print-file-name=libintl.a}
-build_dumper:=${shell test -r $(libbfd) && test -r ${libintl} &&  echo 1}
-
-libz:=${shell x=$$($(CC) -mno-cygwin --print-file-name=libz.a); cd $$(dirname $$x); dir=$$(pwd); case "$$dir" in *mingw*) echo $$dir/libz.a ;; esac}
-zlib_h:=-include ${patsubst %/lib/mingw/libz.a,%/include/zlib.h,${patsubst %/lib/libz.a,%/include/zlib.h,$(libz)}}
-zconf_h:=${patsubst %/zlib.h,%/zconf.h,$(zlib_h)}
-ifeq "${libz}" ""
-zlib_h:=
-zconf_h:=
-libz:=
-endif
-
-DUMPER_INCLUDES:=-I$(bupdir2)/bfd -I$(updir1)/include
-
-libcygwin:=$(cygwin_build)/libcygwin.a
-libuser32:=$(w32api_lib)/libuser32.a
-libkernel32:=$(w32api_lib)/libkernel32.a
-ALL_DEP_LDLIBS:=$(libcygwin) $(w32api_lib)/libnetapi32.a \
-		$(w32api_lib)/libadvapi32.a $(w32api_lib)/libkernel32.a \
-		$(w32api_lib)/libuser32.a
-
-ALL_LDLIBS:=${patsubst $(w32api_lib)/lib%.a,-l%,\
-	      ${filter-out $(libuser32),\
-	       ${filter-out $(libkernel32),\
-		${filter-out $(libcygwin), $(ALL_DEP_LDLIBS)}}}}
-
-LIBICONV:=@libiconv@
-MINGW_LIB:=$(mingw_build)/libmingw32.a
-DUMPER_LIB:=${libbfd} ${libintl} -L$(bupdir1)/libiberty $(LIBICONV) -liberty
-MINGW_LDLIBS:=${filter-out $(libcygwin),$(ALL_LDLIBS) $(MINGW_LIB)}
-MINGW_DEP_LDLIBS:=${ALL_DEP_LDLIBS} ${MINGW_LIB}
-ALL_LDFLAGS:=-B$(newlib_build)/libc -B$(w32api_lib) $(LDFLAGS) $(ALL_LDLIBS)
-DUMPER_LDFLAGS:=$(ALL_LDFLAGS) $(DUMPER_LIB)
-MINGW_CXX:=${patsubst %/cygwin/include,%/mingw/include,${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)}} -I$(updir)
-
-PROGS:=	cygcheck.exe cygpath.exe getfacl.exe kill.exe mkgroup.exe \
-	mkpasswd.exe mount.exe passwd.exe ps.exe regtool.exe setfacl.exe \
-	ssp.exe strace.exe umount.exe ipcrm.exe ipcs.exe
-
-CLEAN_PROGS:=$(PROGS)
-ifndef build_dumper
-PROGS:=warn_dumper $(PROGS)
-else
-PROGS+=dumper$(EXEEXT)
-CLEAN_PROGS+=dumper.exe
-endif
-
-.SUFFIXES:
-.NOEXPORT:
-
-.PHONY: all install clean realclean warn_dumper
-
-all: Makefile $(PROGS)
-
-strace.exe: strace.o path.o $(MINGW_DEP_LDLIBS)
-ifdef VERBOSE
-	$(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
-else
-	@echo $(CXX) -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\
-	$(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
-endif
-
-cygcheck.exe: cygcheck.o path.o dump_setup.o $(MINGW_DEP_LDLIBS)
-ifeq "$(libz)" ""
-	@echo '*** Building cygcheck without package content checking due to missing mingw libz.a.'
-endif
-ifdef VERBOSE
-	$(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz)
-else
-	@echo $(CXX) -o $@ ${wordlist 1,3,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)} $(libz);\
-	$(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz)
-endif
-
-dumper.o: dumper.cc dumper.h
-ifdef VERBOSE
-	${filter-out -nostdinc,$(COMPILE_CXX)} $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
-else
-	@echo $(CXX) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
-	${filter-out -nostdinc,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
-endif
-
-module_info.o: module_info.cc
-ifdef VERBOSE
-	${filter-out -nostdinc,$(COMPILE_CXX)} $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
-else
-	@echo $(CXX) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
-	${filter-out -nostdinc,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
-endif
-
-parse_pe.o: parse_pe.cc dumper.h
-ifdef VERBOSE
-	${filter-out -nostdinc,$(COMPILE_CXX)} $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
-else
-	@echo $(CXX) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
-	${filter-out -nostdinc,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
-endif
-
-path.o: path.cc
-ifdef VERBOSE
-	$(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
-else
-	@echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\
-	${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
-endif
-
-dump_setup.o: dump_setup.cc
-ifdef VERBOSE
-	$(MINGW_CXX) $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
-else
-	@echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\
-	$(MINGW_CXX) $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
-endif
-
-cygcheck.o: cygcheck.cc
-ifdef VERBOSE
-	${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
-else
-	@echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\
-	${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
-endif
-
-strace.o: strace.cc
-ifdef VERBOSE
-	$(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
-else
-	@echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\
-	$(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
-endif
-
-kill.exe: kill.o $(bupdir1)/libiberty/strsignal.o
-ifdef VERBOSE
-	$(CXX) -o $@ $^ -B$(cygwin_build)/ $(ALL_LDFLAGS) $(KILL_LIB)
-else
-	@echo $(CXX) -o $@ $^ ${filter-out -B%, $(ALL_LDFLAGS)};\
-	$(CXX) -o $@ $^ -B$(cygwin_build)/ $(ALL_LDFLAGS) $(KILL_LIB)
-endif
-
-clean:
-	rm -f *.o $(CLEAN_PROGS)
-
-realclean: clean
-	rm -f  Makefile config.cache
-
-install: all
-	$(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir)
-	for i in $(PROGS) ; do \
-	  n=`echo $$i | sed '$(program_transform_name)'`; \
-	  $(INSTALL_PROGRAM) $$i $(bindir)/$$n; \
-	done
-
-$(cygwin_build)/libcygwin.a: $(cygwin_build)/Makefile
-	@$(MAKE) -C $(@D) $(@F)
-
-$(mingw_build)/libmingw32.a: $(mingw_build)/Makefile
-	@$(MAKE) -C $(@D) $(@F)
-
-warn_dumper:
-	@echo '*** Not building dumper.exe since some required libraries are'
-	@echo '*** missing: libbfd.a and libintl.a.'
-	@echo '*** If you need this program, check out the naked-bfd and naked-intl'
-	@echo '*** sources from sources.redhat.com.  Then, configure and build these'
-	@echo '*** libraries.  Otherwise, you can safely ignore this warning.'
-
-dumper.exe: module_info.o parse_pe.o dumper.o $(ALL_DEP_LDLIBS)
-ifdef VERBOSE
-	$(CXX) -o $@ ${wordlist 1,3,$^} -B$(cygwin_build)/ $(DUMPER_LDFLAGS)
-else
-	@echo $(CXX) -o $@ ${wordlist 1,3,$^} ${filter-out -B%, $(DUMPER_LDFLAGS)};\
-	$(CXX) -o $@ ${wordlist 1,3,$^} -B$(cygwin_build)/ $(DUMPER_LDFLAGS)
-endif
-
-%.exe: %.o $(ALL_DEP_LDLIBS)
-ifdef VERBOSE
-	$(CXX) -o $@ ${firstword $^} -B$(cygwin_build)/ $(ALL_LDFLAGS)
-else
-	@echo $(CXX) -o $@ ${firstword $^} ... ${filter-out -B%, $(ALL_LDFLAGS)};\
-	$(CXX) -o $@ ${firstword $^} -B$(cygwin_build)/ $(ALL_LDFLAGS)
-endif
diff --git a/winsup/utils/aclocal.m4 b/winsup/utils/aclocal.m4
deleted file mode 100644
index 754f640bb..000000000
--- a/winsup/utils/aclocal.m4
+++ /dev/null
@@ -1,78 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3b
-
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-# Check to see if we're running under Win32, without using
-# AC_CANONICAL_*.  If so, set output variable EXEEXT to ".exe".
-# Otherwise set it to "".
-
-dnl AM_EXEEXT()
-dnl This knows we add .exe if we're building in the Cygwin
-dnl environment. But if we're not, then it compiles a test program
-dnl to see if there is a suffix for executables.
-AC_DEFUN(AM_EXEEXT,
-[AC_REQUIRE([AM_CYGWIN])
-AC_REQUIRE([AM_MINGW32])
-AC_MSG_CHECKING([for executable suffix])
-AC_CACHE_VAL(am_cv_exeext,
-[if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-am_cv_exeext=.exe
-else
-cat > am_c_test.c << 'EOF'
-int main() {
-/* Nothing needed here */
-}
-EOF
-${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5
-am_cv_exeext=
-for file in am_c_test.*; do
-   case $file in
-    *.c) ;;
-    *.o) ;;
-    *) am_cv_exeext=`echo $file | sed -e s/am_c_test//` ;;
-   esac
-done
-rm -f am_c_test*])
-test x"${am_cv_exeext}" = x && am_cv_exeext=no
-fi
-EXEEXT=""
-test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext}
-AC_MSG_RESULT(${am_cv_exeext})
-AC_SUBST(EXEEXT)])
-
-# Check to see if we're running under Cygwin, without using
-# AC_CANONICAL_*.  If so, set output variable CYGWIN to "yes".
-# Otherwise set it to "no".
-
-dnl AM_CYGWIN()
-AC_DEFUN(AM_CYGWIN,
-[AC_CACHE_CHECK(for Cygwin environment, am_cv_cygwin,
-[AC_TRY_COMPILE(,[return __CYGWIN32__;],
-am_cv_cygwin=yes, am_cv_cygwin=no)
-rm -f conftest*])
-CYGWIN=
-test "$am_cv_cygwin" = yes && CYGWIN=yes])
-
-
-
-# Check to see if we're running under Mingw, without using
-# AC_CANONICAL_*.  If so, set output variable MINGW32 to "yes".
-# Otherwise set it to "no".
-
-dnl AM_MINGW32()
-AC_DEFUN(AM_MINGW32,
-[AC_CACHE_CHECK(for Mingw32 environment, am_cv_mingw32,
-[AC_TRY_COMPILE(,[return __MINGW32__;],
-am_cv_mingw32=yes, am_cv_mingw32=no)
-rm -f conftest*])
-MINGW32=
-test "$am_cv_mingw32" = yes && MINGW32=yes])
-
diff --git a/winsup/utils/configure b/winsup/utils/configure
deleted file mode 100755
index 85502a9be..000000000
--- a/winsup/utils/configure
+++ /dev/null
@@ -1,1391 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=mount.cc
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:578: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:599: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:617: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:643: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:673: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:722: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:746: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
-set dummy ${ac_tool_prefix}g++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:782: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="${ac_tool_prefix}g++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_CXX"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "g++", so it can be a program name with args.
-set dummy g++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:814: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="g++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_CXX" && ac_cv_prog_CXX="g++"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  CXX="g++"
-fi
-fi
-
-if test -z "$CXX"; then
-  # Extract the first word of "c++", so it can be a program name with args.
-set dummy c++; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:850: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="c++"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-CXXFLAGS='$(CFLAGS)'
-
-
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-echo "configure:903: checking for libiconv in -liconv" >&5
-ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-liconv  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 911 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char libiconv();
-
-int main() {
-libiconv()
-; return 0; }
-EOF
-if { (eval echo configure:922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  libiconv=-liconv
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-if test "x$cross_compiling" = "xyes"; then
-  if test "x$program_transform_name" = "xs,x,x,"; then
-    program_transform_name=""
-  fi
-  if test "x$program_transform_name" = "x"; then
-    program_transform_name="s,^,$host-,"
-  else
-    program_transform_name="$program_transform_name -e s,^,$host-,"
-  fi
-fi
-
-INSTALL="/bin/sh "`cd $srcdir/../..; echo $(pwd)/install-sh -c`
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:969: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1023: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'am_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1028 "configure"
-#include "confdefs.h"
-
-int main() {
-return __CYGWIN32__;
-; return 0; }
-EOF
-if { (eval echo configure:1035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  am_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  am_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$am_cv_cygwin" 1>&6
-CYGWIN=
-test "$am_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6
-echo "configure:1052: checking for Mingw32 environment" >&5
-if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1057 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:1064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  am_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  am_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$am_cv_mingw32" 1>&6
-MINGW32=
-test "$am_cv_mingw32" = yes && MINGW32=yes
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1083: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-am_cv_exeext=.exe
-else
-cat > am_c_test.c << 'EOF'
-int main() {
-/* Nothing needed here */
-}
-EOF
-${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5
-am_cv_exeext=
-for file in am_c_test.*; do
-   case $file in
-    *.c) ;;
-    *.o) ;;
-    *) am_cv_exeext=`echo $file | sed -e s/am_c_test//` ;;
-   esac
-done
-rm -f am_c_test*
-fi
-
-test x"${am_cv_exeext}" = x && am_cv_exeext=no
-fi
-EXEEXT=""
-test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext}
-echo "$ac_t""${am_cv_exeext}" 1>&6
-
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CC@%$CC%g
-s%@CXX@%$CXX%g
-s%@libiconv@%$libiconv%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@EXEEXT@%$EXEEXT%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/winsup/utils/configure.in b/winsup/utils/configure.in
deleted file mode 100644
index 83d639a02..000000000
--- a/winsup/utils/configure.in
+++ /dev/null
@@ -1,92 +0,0 @@
-dnl Autoconf configure script for Cygwin utilities.
-dnl Copyright 1996, 1997, 1998, 1999, 2000 Cygnus Solutions.
-dnl
-dnl This file is part of Cygwin.
-dnl
-dnl This software is a copyrighted work licensed under the terms of the
-dnl Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-dnl details.
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.12)
-
-AC_INIT(mount.cc)
-
-dnl FIXME: We temporarily define our own version of AC_PROG_CC.  This is
-dnl copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS.  We
-dnl are probably using a cross compiler, which will not be able to fully
-dnl link an executable.  This should really be fixed in autoconf
-dnl itself.
-
-AC_DEFUN(LIB_AC_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_PROG(CC, gcc, gcc)
-if test -z "$CC"; then
-  AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-dnl Check whether -g works, even if CFLAGS is set, in case the package
-dnl plays around with CFLAGS (such as to build both debugging and
-dnl normal versions of a library), tasteless as that idea is.
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  AC_PROG_CC_G
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-O2"
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-])
-
-AC_DEFUN(LIB_AC_PROG_CXX,
-[AC_BEFORE([$0], [AC_PROG_CPP])dnl
-AC_CHECK_TOOL(CXX, g++, g++)
-if test -z "$CXX"; then
-  AC_CHECK_PROG(CXX, c++, c++, , , )
-  test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
-fi
-
-CXXFLAGS='$(CFLAGS)'
-])
-
-AC_CANONICAL_SYSTEM
-
-LIB_AC_PROG_CC
-LIB_AC_PROG_CXX
-
-AC_ARG_PROGRAM
-
-AC_CHECK_LIB(iconv, libiconv, libiconv=-liconv)
-AC_SUBST(libiconv)
-
-if test "x$cross_compiling" = "xyes"; then
-  if test "x$program_transform_name" = "xs,x,x,"; then
-    program_transform_name=""
-  fi
-  if test "x$program_transform_name" = "x"; then
-    program_transform_name="s,^,$host-,"
-  else
-    program_transform_name="$program_transform_name -e s,^,$host-,"
-  fi
-fi
-
-INSTALL="/bin/sh "`cd $srcdir/../..; echo $(pwd)/install-sh -c`
-
-AC_PROG_INSTALL
-
-AM_EXEEXT
-
-AC_OUTPUT(Makefile)
diff --git a/winsup/utils/cygcheck.cc b/winsup/utils/cygcheck.cc
deleted file mode 100644
index 7adc4c1ec..000000000
--- a/winsup/utils/cygcheck.cc
+++ /dev/null
@@ -1,1487 +0,0 @@
-/* cygcheck.cc
-
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <ctype.h>
-#include <io.h>
-#include <windows.h>
-#include "path.h"
-#include <getopt.h>
-#include "cygwin/include/sys/cygwin.h"
-#include "cygwin/include/mntent.h"
-
-int verbose = 0;
-int registry = 0;
-int sysinfo = 0;
-int givehelp = 0;
-int keycheck = 0;
-int check_setup = 0;
-int dump_only = 0;
-int find_package = 0;
-int list_package = 0;
-
-#ifdef __GNUC__
-typedef long long longlong;
-#else
-typedef __int64 longlong;
-#endif
-
-void dump_setup (int, char **, bool);
-void package_find (int, char **);
-void package_list (int, char **);
-
-static const char version[] = "$Revision$";
-
-static const char *known_env_vars[] = {
-  "c_include_path",
-  "compiler_path",
-  "cxx_include_path",
-  "cygwin",
-  "cygwin32",
-  "dejagnu",
-  "expect",
-  "gcc_default_options",
-  "gcc_exec_prefix",
-  "home",
-  "ld_library_path",
-  "library_path",
-  "login",
-  "lpath",
-  "make_mode",
-  "makeflags",
-  "path",
-  "pwd",
-  "strace",
-  "tcl_library",
-  "user",
-  0
-};
-
-struct
-{
-  const char *name;
-  int missing_is_good;
-}
-static common_apps[] = {
-  {"awk", 0},
-  {"bash", 0},
-  {"cat", 0},
-  {"cp", 0},
-  {"cpp", 1},
-  {"find", 0},
-  {"gcc", 0},
-  {"gdb", 0},
-  {"grep", 0},
-  {"ld", 0},
-  {"ls", 0},
-  {"make", 0},
-  {"mv", 0},
-  {"rm", 0},
-  {"sed", 0},
-  {"sh", 0},
-  {"tar", 0},
-  {0, 0}
-};
-
-static int num_paths = 0, max_paths = 0;
-static char **paths = 0;
-
-/*
- * keyeprint() is used to report failure modes
- */
-static int
-keyeprint (const char *name)
-{
-  fprintf (stderr, "cygcheck: %s failed: %lu\n", name, GetLastError ());
-  return 1;
-}
-
-static void
-add_path (char *s, int maxlen)
-{
-  if (num_paths >= max_paths)
-    {
-      max_paths += 10;
-      if (paths)
-	paths = (char **) realloc (paths, max_paths * sizeof (char *));
-      else
-	paths = (char **) malloc (max_paths * sizeof (char *));
-    }
-  paths[num_paths] = (char *) malloc (maxlen + 1);
-  if (paths[num_paths] == NULL)
-    {
-      keyeprint ("add_path: malloc()");
-      return;
-    }
-  memcpy (paths[num_paths], s, maxlen);
-  paths[num_paths][maxlen] = 0;
-  char *e = paths[num_paths] + strlen (paths[num_paths]);
-  if (e[-1] == '\\' && e[-2] != ':')
-    *--e = 0;
-  for (int i = 1; i < num_paths; i++)
-    if (strcasecmp (paths[num_paths], paths[i]) == 0)
-      return;
-  num_paths++;
-}
-
-static void
-init_paths ()
-{
-  char tmp[4000], *sl;
-  add_path ((char *) ".", 1);	/* to be replaced later */
-  add_path ((char *) ".", 1);	/* the current directory */
-  if (GetSystemDirectory (tmp, 4000))
-    add_path (tmp, strlen (tmp));
-  else
-    keyeprint ("init_paths: GetSystemDirectory()");
-  sl = strrchr (tmp, '\\');
-  if (sl)
-    {
-      strcpy (sl, "\\SYSTEM");
-      add_path (tmp, strlen (tmp));
-    }
-  GetWindowsDirectory (tmp, 4000);
-  add_path (tmp, strlen (tmp));
-
-  char *wpath = getenv ("PATH");
-  if (wpath)
-    {
-      char *b, *e;
-      b = wpath;
-      while (1)
-	{
-	  for (e = b; *e && *e != ';'; e++);
-	  add_path (b, e - b);
-	  if (!*e)
-	    break;
-	  b = e + 1;
-	}
-    }
-  else
-    printf ("WARNING: PATH is not set at all!\n");
-}
-
-static char *
-find_on_path (char *file, char *default_extension,
-	      int showall = 0, int search_sysdirs = 0)
-{
-  static char rv[4000];
-  char tmp[4000], *ptr = rv;
-
-  if (!file)
-    {
-      keyeprint ("find_on_path: NULL pointer for file");
-      return 0;
-    }
-
-  if (default_extension == NULL)
-    {
-      keyeprint ("find_on_path: NULL pointer for default_extension");
-      return 0;
-    }
-
-  if (strchr (file, ':') || strchr (file, '\\') || strchr (file, '/'))
-    return cygpath (file, NULL);
-
-  if (strchr (file, '.'))
-    default_extension = (char *) "";
-
-  for (int i = 0; i < num_paths; i++)
-    {
-      if (!search_sysdirs && (i == 0 || i == 2 || i == 3))
-	continue;
-      if (i == 0 || !search_sysdirs || strcasecmp (paths[i], paths[0]))
-	{
-	  sprintf (ptr, "%s\\%s%s", paths[i], file, default_extension);
-	  if (GetFileAttributes (ptr) != (DWORD) - 1)
-	    {
-	      if (showall)
-		printf ("Found: %s\n", ptr);
-	      if (ptr == tmp && verbose)
-		printf ("Warning: %s hides %s\n", rv, ptr);
-	      ptr = tmp;
-	    }
-	}
-    }
-
-  if (ptr == tmp)
-    return rv;
-
-  return 0;
-}
-
-#define DID_NEW		1
-#define DID_ACTIVE	2
-#define DID_INACTIVE	3
-
-struct Did
-{
-  Did *next;
-  char *file;
-  int state;
-};
-static Did *did = 0;
-
-static Did *
-already_did (char *file)
-{
-  Did *d;
-  for (d = did; d; d = d->next)
-    if (strcasecmp (d->file, file) == 0)
-      return d;
-  d = (Did *) malloc (sizeof (Did));
-  d->file = strdup (file);
-  d->next = did;
-  d->state = DID_NEW;
-  did = d;
-  return d;
-}
-
-static int
-get_word (HANDLE fh, int offset)
-{
-  short rv;
-  unsigned r;
-
-  if (SetFilePointer (fh, offset, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER
-      && GetLastError () != NO_ERROR)
-    keyeprint ("get_word: SetFilePointer()");
-
-  if (!ReadFile (fh, &rv, 2, (DWORD *) &r, 0))
-    keyeprint ("get_word: Readfile()");
-
-  return rv;
-}
-
-static int
-get_dword (HANDLE fh, int offset)
-{
-  int rv;
-  unsigned r;
-
-  if (SetFilePointer (fh, offset, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER
-      && GetLastError () != NO_ERROR)
-    keyeprint ("get_word: SetFilePointer()");
-
-  if (!ReadFile (fh, &rv, 4, (DWORD *) &r, 0))
-    keyeprint ("get_dword: Readfile()");
-
-  return rv;
-}
-
-struct Section
-{
-  char name[8];
-  int virtual_size;
-  int virtual_address;
-  int size_of_raw_data;
-  int pointer_to_raw_data;
-};
-
-static int
-rva_to_offset (int rva, char *sections, int nsections, int *sz)
-{
-  int i;
-
-  if (sections == NULL)
-    {
-      keyeprint ("rva_to_offset: NULL passed for sections");
-      return 0;
-    }
-
-  for (i = 0; i < nsections; i++)
-    {
-      Section *s = (Section *) (sections + i * 40);
-#if 0
-      printf ("%08x < %08x < %08x ? %08x\n",
-	      s->virtual_address, rva,
-	      s->virtual_address + s->virtual_size, s->pointer_to_raw_data);
-#endif
-      if (rva >= s->virtual_address
-	  && rva < s->virtual_address + s->virtual_size)
-	{
-	  if (sz)
-	    *sz = s->virtual_address + s->virtual_size - rva;
-	  return rva - s->virtual_address + s->pointer_to_raw_data;
-	}
-    }
-  return 0;			/* punt */
-}
-
-struct ExpDirectory
-{
-  int flags;
-  int timestamp;
-  short major_ver;
-  short minor_ver;
-  int name_rva;
-};
-
-struct ImpDirectory
-{
-  unsigned characteristics;
-  unsigned timestamp;
-  unsigned forwarder_chain;
-  unsigned name_rva;
-  unsigned iat_rva;
-};
-
-
-static void track_down (char *file, char *suffix, int lvl);
-
-#define CYGPREFIX (sizeof ("%%% Cygwin ") - 1)
-static void
-cygwin_info (HANDLE h)
-{
-  char *buf, *bufend, *buf_start = NULL;
-  const char *hello = "    Cygwin DLL version info:\n";
-  DWORD size = GetFileSize (h, NULL);
-  DWORD n;
-
-  if (size == 0xffffffff)
-    return;
-
-  buf_start = buf = (char *) calloc (1, size + 1);
-  if (buf == NULL)
-    {
-      keyeprint ("cygwin_info: malloc()");
-      return;
-    }
-
-  (void) SetFilePointer (h, 0, NULL, FILE_BEGIN);
-  if (!ReadFile (h, buf, size, &n, NULL))
-    {
-      free (buf_start);
-      return;
-    }
-
-  static char dummy[] = "\0\0\0\0\0\0\0";
-  char *dll_major = dummy;
-  bufend = buf + size;
-  while (buf < bufend)
-    if ((buf = (char *) memchr (buf, '%', bufend - buf)) == NULL)
-      break;
-    else if (strncmp ("%%% Cygwin ", buf, CYGPREFIX) != 0)
-      buf++;
-    else
-      {
-	char *p = strchr (buf += CYGPREFIX, '\n');
-	if (!p)
-	  break;
-	if (strncasecmp (buf, "dll major:", 10) == 0)
-	  {
-	    dll_major = buf + 11;
-	    continue;
-	  }
-	char *s, pbuf[80];
-	int len;
-	len = 1 + p - buf;
-	if (strncasecmp (buf, "dll minor:", 10) != 0)
-	  s = buf;
-	else
-	  {
-	    char c = dll_major[1];
-	    dll_major[1] = '\0';
-	    int maj = atoi (dll_major);
-	    dll_major[1] = c;
-	    int min = atoi (dll_major + 1);
-	    sprintf (pbuf, "DLL version: %d.%d.%.*s", maj, min, len - 11,
-		     buf + 11);
-	    len = strlen (s = pbuf);
-	  }
-	if (strncmp (s, "dll", 3) == 0)
-	  memcpy (s, "DLL", 3);
-	else if (strncmp (s, "api", 3) == 0)
-	  memcpy (s, "API", 3);
-	else if (islower (*s))
-	  *s = toupper (*s);
-	fprintf (stdout, "%s        %.*s", hello, len, s);
-	hello = "";
-      }
-
-  if (!*hello)
-    puts ("");
-
-  free (buf_start);
-  return;
-}
-
-static void
-dll_info (const char *path, HANDLE fh, int lvl, int recurse)
-{
-  DWORD junk;
-  int i;
-  int pe_header_offset = get_dword (fh, 0x3c);
-  int opthdr_ofs = pe_header_offset + 4 + 20;
-  unsigned short v[6];
-
-  if (path == NULL)
-    {
-      keyeprint ("dll_info: NULL passed for path");
-      return;
-    }
-
-  if (SetFilePointer (fh, opthdr_ofs + 40, 0, FILE_BEGIN) ==
-      INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR)
-    keyeprint ("dll_info: SetFilePointer()");
-
-  if (!ReadFile (fh, &v, sizeof (v), &junk, 0))
-    keyeprint ("dll_info: Readfile()");
-
-  if (verbose)
-    printf (" - os=%d.%d img=%d.%d sys=%d.%d\n",
-	    v[0], v[1], v[2], v[3], v[4], v[5]);
-  else
-    printf ("\n");
-
-  int num_entries = get_dword (fh, opthdr_ofs + 92);
-  int export_rva = get_dword (fh, opthdr_ofs + 96);
-  int export_size = get_dword (fh, opthdr_ofs + 100);
-  int import_rva = get_dword (fh, opthdr_ofs + 104);
-  int import_size = get_dword (fh, opthdr_ofs + 108);
-
-  int nsections = get_word (fh, pe_header_offset + 4 + 2);
-  char *sections = (char *) malloc (nsections * 40);
-
-  if (SetFilePointer (fh, pe_header_offset + 4 + 20 +
-		      get_word (fh, pe_header_offset + 4 + 16), 0,
-		      FILE_BEGIN) == INVALID_SET_FILE_POINTER
-      && GetLastError () != NO_ERROR)
-    keyeprint ("dll_info: SetFilePointer()");
-
-  if (!ReadFile (fh, sections, nsections * 40, &junk, 0))
-    keyeprint ("dll_info: Readfile()");
-
-  if (verbose && num_entries >= 1 && export_size > 0)
-    {
-      int expsz;
-      int expbase = rva_to_offset (export_rva, sections, nsections, &expsz);
-
-      if (expbase)
-	{
-	  if (SetFilePointer (fh, expbase, 0, FILE_BEGIN) ==
-	      INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR)
-	    keyeprint ("dll_info: SetFilePointer()");
-
-	  unsigned char *exp = (unsigned char *) malloc (expsz);
-
-	  if (!ReadFile (fh, exp, expsz, &junk, 0))
-	    keyeprint ("dll_info: Readfile()");
-
-	  ExpDirectory *ed = (ExpDirectory *) exp;
-	  int ofs = ed->name_rva - export_rva;
-	  struct tm *tm = localtime ((const time_t *) &(ed->timestamp));
-	  if (tm->tm_year < 60)
-	    tm->tm_year += 2000;
-	  if (tm->tm_year < 200)
-	    tm->tm_year += 1900;
-	  printf ("%*c", lvl + 2, ' ');
-	  printf ("\"%s\" v%d.%d ts=", exp + ofs,
-		  ed->major_ver, ed->minor_ver);
-	  printf ("%d/%d/%d %d:%02d\n",
-		  tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
-		  tm->tm_hour, tm->tm_min);
-	}
-    }
-
-  if (num_entries >= 2 && import_size > 0 && recurse)
-    {
-      int impsz;
-      int impbase = rva_to_offset (import_rva, sections, nsections, &impsz);
-      if (impbase)
-	{
-	  if (SetFilePointer (fh, impbase, 0, FILE_BEGIN) ==
-	      INVALID_SET_FILE_POINTER && GetLastError () != NO_ERROR)
-	    keyeprint ("dll_info: SetFilePointer()");
-
-	  unsigned char *imp = (unsigned char *) malloc (impsz);
-	  if (imp == NULL)
-	    {
-	      keyeprint ("dll_info: malloc()");
-	      return;
-	    }
-
-	  if (!ReadFile (fh, imp, impsz, &junk, 0))
-	    keyeprint ("dll_info: Readfile()");
-
-	  ImpDirectory *id = (ImpDirectory *) imp;
-	  for (i = 0; id[i].name_rva; i++)
-	    {
-	      /* int ofs = id[i].name_rva - import_rva; */
-	      track_down ((char *) imp + id[i].name_rva - import_rva,
-			  (char *) ".dll", lvl + 2);
-	    }
-	}
-    }
-  if (strstr (path, "\\cygwin1.dll"))
-    cygwin_info (fh);
-}
-
-static void
-track_down (char *file, char *suffix, int lvl)
-{
-  if (file == NULL)
-    {
-      keyeprint ("track_down: malloc()");
-      return;
-    }
-
-  if (suffix == NULL)
-    {
-      keyeprint ("track_down: malloc()");
-      return;
-    }
-
-  char *path = find_on_path (file, suffix, 0, 1);
-  if (!path)
-    {
-      printf ("Error: could not find %s\n", file);
-      return;
-    }
-
-  Did *d = already_did (file);
-  switch (d->state)
-    {
-    case DID_NEW:
-      break;
-    case DID_ACTIVE:
-      if (verbose)
-	{
-	  if (lvl)
-	    printf ("%*c", lvl, ' ');
-	  printf ("%s", path);
-	  printf (" (recursive)\n");
-	}
-      return;
-    case DID_INACTIVE:
-      if (verbose)
-	{
-	  if (lvl)
-	    printf ("%*c", lvl, ' ');
-	  printf ("%s", path);
-	  printf (" (already done)\n");
-	}
-      return;
-    default:
-      break;
-    }
-
-  if (lvl)
-    printf ("%*c", lvl, ' ');
-
-  if (!path)
-    {
-      printf ("%s not found\n", file);
-      return;
-    }
-
-  printf ("%s", path);
-
-  HANDLE fh =
-    CreateFile (path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
-		NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-  if (fh == INVALID_HANDLE_VALUE)
-    {
-      printf (" - Cannot open\n");
-      return;
-    }
-
-  d->state = DID_ACTIVE;
-
-  dll_info (path, fh, lvl, 1);
-  d->state = DID_INACTIVE;
-  if (!CloseHandle (fh))
-    keyeprint ("track_down: CloseHandle()");
-}
-
-static void
-ls (char *f)
-{
-  HANDLE h = CreateFile (f, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
-			 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-  BY_HANDLE_FILE_INFORMATION info;
-
-  if (!GetFileInformationByHandle (h, &info))
-    keyeprint ("ls: GetFileInformationByHandle()");
-
-  SYSTEMTIME systime;
-
-  if (!FileTimeToSystemTime (&info.ftLastWriteTime, &systime))
-    keyeprint ("ls: FileTimeToSystemTime()");
-  printf ("%5dk %04d/%02d/%02d %s",
-	  (((int) info.nFileSizeLow) + 512) / 1024,
-	  systime.wYear, systime.wMonth, systime.wDay, f);
-  dll_info (f, h, 16, 0);
-  if (!CloseHandle (h))
-    keyeprint ("ls: CloseHandle()");
-}
-
-static void
-cygcheck (char *app)
-{
-  char *papp = find_on_path (app, (char *) ".exe", 1, 0);
-  if (!papp)
-    {
-      printf ("Error: could not find %s\n", app);
-      return;
-    }
-  char *s = strdup (papp);
-  char *sl = 0, *t;
-  for (t = s; *t; t++)
-    if (*t == '/' || *t == '\\' || *t == ':')
-      sl = t;
-  if (sl == 0)
-    paths[0] = (char *) ".";
-  else
-    {
-      *sl = 0;
-      paths[0] = s;
-    }
-  did = 0;
-  track_down (papp, (char *) ".exe", 0);
-}
-
-
-extern char **environ;
-
-struct RegInfo
-{
-  RegInfo *prev;
-  char *name;
-  HKEY key;
-};
-
-static void
-show_reg (RegInfo * ri, int nest)
-{
-  if (!ri)
-    return;
-  show_reg (ri->prev, 1);
-  if (nest)
-    printf ("%s\\", ri->name);
-  else
-    printf ("%s\n", ri->name);
-}
-
-static void
-scan_registry (RegInfo * prev, HKEY hKey, char *name, int cygnus)
-{
-  RegInfo ri;
-  ri.prev = prev;
-  ri.name = name;
-  ri.key = hKey;
-
-  char *cp;
-  for (cp = name; *cp; cp++)
-    if (strncasecmp (cp, "cygnus", 6) == 0)
-      cygnus = 1;
-
-  DWORD num_subkeys, max_subkey_len, num_values;
-  DWORD max_value_len, max_valdata_len, i;
-  if (RegQueryInfoKey (hKey, 0, 0, 0, &num_subkeys, &max_subkey_len, 0,
-		       &num_values, &max_value_len, &max_valdata_len, 0, 0)
-      != ERROR_SUCCESS)
-    {
-#if 0
-      char tmp[400];
-      FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, 0, GetLastError (),
-		     MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), tmp, 400, 0);
-      printf ("RegQueryInfoKey: %s\n", tmp);
-#endif
-      return;
-    }
-
-  if (cygnus)
-    {
-      show_reg (&ri, 0);
-
-      char *value_name = (char *) malloc (max_value_len + 1);
-      if (value_name == NULL)
-	{
-	  keyeprint ("scan_registry: malloc()");
-	  return;
-	}
-
-      char *value_data = (char *) malloc (max_valdata_len + 1);
-      if (value_data == NULL)
-	{
-	  keyeprint ("scan_registry: malloc()");
-	  return;
-	}
-
-      for (i = 0; i < num_values; i++)
-	{
-	  DWORD dlen = max_valdata_len + 1;
-	  DWORD nlen = max_value_len + 1;
-	  DWORD type;
-	  RegEnumValue (hKey, i, value_name, &nlen, 0,
-			&type, (BYTE *) value_data, &dlen);
-	  {
-	    printf ("  %s = ", i ? value_name : "(default)");
-	    switch (type)
-	      {
-	      case REG_DWORD:
-		printf ("0x%08x\n", *(unsigned *) value_data);
-		break;
-	      case REG_EXPAND_SZ:
-	      case REG_SZ:
-		printf ("`%s'\n", value_data);
-		break;
-	      default:
-		printf ("(unsupported type)\n");
-		break;
-	      }
-	  }
-	}
-      free (value_name);
-      free (value_data);
-    }
-
-  char *subkey_name = (char *) malloc (max_subkey_len + 1);
-  for (i = 0; i < num_subkeys; i++)
-    {
-      if (RegEnumKey (hKey, i, subkey_name, max_subkey_len + 1) ==
-	  ERROR_SUCCESS)
-	{
-	  HKEY sKey;
-	  if (RegOpenKeyEx (hKey, subkey_name, 0, KEY_READ, &sKey)
-	      == ERROR_SUCCESS)
-	    {
-	      scan_registry (&ri, sKey, subkey_name, cygnus);
-	      if (RegCloseKey (sKey) != ERROR_SUCCESS)
-		keyeprint ("scan_registry: RegCloseKey()");
-	    }
-	}
-    }
-  free (subkey_name);
-}
-
-void
-pretty_id (const char *s, char *cygwin, size_t cyglen)
-{
-  char *groups[16384];
-
-  strcpy (cygwin + cyglen++, " ");
-  strcpy (cygwin + cyglen, s);
-  putenv (cygwin);
-
-  char *id = cygpath ("/bin/id.exe", NULL);
-  for (char *p = id; (p = strchr (p, '/')); p++)
-    *p = '\\';
-
-  if (access (id, X_OK))
-    fprintf (stderr, "`id' program not found\n");
-
-  FILE *f = popen (id, "rt");
-
-  char buf[16384];
-  fgets (buf, sizeof (buf), f);
-  char *uid = strtok (buf, ")") + strlen ("uid=");
-  char *gid = strtok (NULL, ")") + strlen ("gid=") + 1;
-  char **ng;
-  size_t sz = 0;
-  for (ng = groups; (*ng = strtok (NULL, ",")); ng++)
-    {
-      char *p = strchr (*ng, '\n');
-      if (p)
-	*p = '\0';
-      if (ng == groups)
-	*ng += strlen (" groups=");
-      size_t len = strlen (*ng);
-      if (sz < len)
-	sz = len;
-    }
-
-  printf ("\nOutput from %s (%s)\n", id, s);
-  size_t szmaybe = strlen ("UID: ") + strlen (uid);
-  if (sz < szmaybe)
-    sz = szmaybe;
-  sz += 1;
-  int n = 80 / (int) sz;
-  sz = -sz;
-  ng[0] += strlen ("groups=");
-  printf ("UID: %.*s) GID: %s)\n", sz + (sizeof ("UID: ") - 1), uid, gid);
-  int i = 0;
-  for (char **g = groups; g < ng; g++)
-    {
-      if (i < n)
-	i++;
-      else
-	{
-	  i = 0;
-	  puts ("");
-	}
-      if (++i <= n && g != (ng - 1))
-	printf ("%*s ", sz, *g);
-      else
-	{
-	  printf ("%s\n", *g);
-	  i = 0;
-	}
-    }
-}
-
-static void
-dump_sysinfo ()
-{
-  int i, j;
-  char tmp[4000];
-  time_t now;
-  char *found_cygwin_dll;
-
-  printf ("\nCygwin Win95/NT Configuration Diagnostics\n");
-  time (&now);
-  printf ("Current System Time: %s\n", ctime (&now));
-
-  OSVERSIONINFO osversion;
-  osversion.dwOSVersionInfoSize = sizeof (osversion);
-  if (!GetVersionEx (&osversion))
-    keyeprint ("dump_sysinfo: GetVersionEx()");
-  char *osname = (char *) "unknown OS";
-  switch (osversion.dwPlatformId)
-    {
-    case VER_PLATFORM_WIN32s:
-      osname = (char *) "32s";
-      break;
-    case VER_PLATFORM_WIN32_WINDOWS:
-      switch (osversion.dwMinorVersion)
-	{
-	case 0:
-	  if (strchr (osversion.szCSDVersion, 'C'))
-	    osname = (char *) "95 OSR2";
-	  else
-	    osname = (char *) "95";
-	  break;
-	case 10:
-	  if (strchr (osversion.szCSDVersion, 'A'))
-	    osname = (char *) "98 SE";
-	  else
-	    osname = (char *) "98";
-	  break;
-	case 90:
-	  osname = (char *) "ME";
-	  break;
-	default:
-	  osname = (char *) "9X";
-	  break;
-	}
-      break;
-    case VER_PLATFORM_WIN32_NT:
-      if (osversion.dwMajorVersion == 5)
-	{
-	  BOOL more_info = FALSE;
-	  OSVERSIONINFOEX osversionex;
-	  osversionex.dwOSVersionInfoSize = sizeof (osversionex);
-	  if (GetVersionEx ((OSVERSIONINFO *) &osversionex))
-	    more_info = TRUE;
-	  if (osversion.dwMinorVersion == 0)
-	    {
-	      if (!more_info)
-		osname = (char *) "2000";
-	      else if (osversionex.wProductType == VER_NT_SERVER
-		       || osversionex.wProductType ==
-		       VER_NT_DOMAIN_CONTROLLER)
-		{
-		  if (osversionex.wSuiteMask &VER_SUITE_DATACENTER)
-		    osname = (char *) "2000 Datacenter Server";
-		  else if (osversionex.wSuiteMask & VER_SUITE_ENTERPRISE)
-		    osname = (char *) "2000 Advanced Server";
-		  else
-		    osname = (char *) "2000 Server";
-		}
-	      else
-		osname = (char *) "2000 Professional";
-	    }
-	  else
-	    {
-	      if (!more_info)
-		osname = (char *) "XP";
-	      else if (osversionex.wProductType == VER_NT_SERVER
-		       || osversionex.wProductType ==
-		       VER_NT_DOMAIN_CONTROLLER)
-		{
-		  if (osversionex.wSuiteMask & VER_SUITE_ENTERPRISE)
-		    osname = (char *) ".NET Enterprise Server";
-		  else
-		    osname = (char *) ".NET Server";
-		}
-	      else if (osversionex.wSuiteMask & VER_SUITE_PERSONAL)
-		osname = (char *) "XP Home Edition";
-	      else
-		osname = (char *) "XP Professional";
-
-	    }
-	}
-      else
-	osname = (char *) "NT";
-      break;
-    default:
-      osname = (char *) "??";
-      break;
-    }
-  printf ("Windows %s Ver %lu.%lu Build %lu %s\n\n", osname,
-	  osversion.dwMajorVersion, osversion.dwMinorVersion,
-	  osversion.dwPlatformId == VER_PLATFORM_WIN32_NT ?
-	  osversion.dwBuildNumber : (osversion.dwBuildNumber & 0xffff),
-	  osversion.dwPlatformId == VER_PLATFORM_WIN32_NT ?
-	  osversion.szCSDVersion : "");
-
-  printf ("Path:");
-  char *s = getenv ("PATH"), *e;
-  char sep = strchr (s, ';') ? ';' : ':';
-  int count_path_items = 0;
-  while (1)
-    {
-      for (e = s; *e && *e != sep; e++);
-      printf ("\t%.*s\n", e - s, s);
-      count_path_items++;
-      if (!*e)
-	break;
-      s = e + 1;
-    }
-
-  fflush (stdout);
-
-  char *cygwin = getenv ("CYGWIN");
-  if (cygwin)
-    cygwin -= strlen ("CYGWIN=");
-  else
-    cygwin = const_cast <char *> ("CYGWIN=");
-  size_t cyglen = strlen (cygwin);
-  cygwin = strcpy ((char *) malloc (cyglen + sizeof (" nontsec")), cygwin);
-  pretty_id ("nontsec", cygwin, cyglen);
-  pretty_id ("ntsec", cygwin, cyglen);
-  cygwin[cyglen] = 0;
-  putenv (cygwin);
-
-  if (!GetSystemDirectory (tmp, 4000))
-    keyeprint ("dump_sysinfo: GetSystemDirectory()");
-  printf ("\nSysDir: %s\n", tmp);
-
-  GetWindowsDirectory (tmp, 4000);
-  printf ("WinDir: %s\n\n", tmp);
-
-
-  if (givehelp)
-    printf ("Here's some environment variables that may affect cygwin:\n");
-  for (i = 0; environ[i]; i++)
-    {
-      char *eq = strchr (environ[i], '=');
-      if (!eq)
-	continue;
-      /* int len = eq - environ[i]; */
-      for (j = 0; known_env_vars[j]; j++)
-	{
-	  *eq = 0;
-	  if (strcmp (environ[i], "PATH") == 0)
-	    continue;		/* we handle this one specially */
-	  if (strcasecmp (environ[i], known_env_vars[j]) == 0)
-	    printf ("%s = `%s'\n", environ[i], eq + 1);
-	  *eq = '=';
-	}
-    }
-  printf ("\n");
-
-  if (verbose)
-    {
-      if (givehelp)
-	printf ("Here's the rest of your environment variables:\n");
-      for (i = 0; environ[i]; i++)
-	{
-	  int found = 0;
-	  char *eq = strchr (environ[i], '=');
-	  if (!eq)
-	    continue;
-	  /* int len = eq - environ[i]; */
-	  for (j = 0; known_env_vars[j]; j++)
-	    {
-	      *eq = 0;
-	      if (strcasecmp (environ[i], known_env_vars[j]) == 0)
-		found = 1;
-	      *eq = '=';
-	    }
-	  if (!found)
-	    {
-	      *eq = 0;
-	      printf ("%s = `%s'\n", environ[i], eq + 1);
-	      *eq = '=';
-	    }
-	}
-      printf ("\n");
-    }
-
-  if (registry)
-    {
-      if (givehelp)
-	printf ("Scanning registry for keys with `Cygnus' in them...\n");
-#if 0
-      /* big and not generally useful */
-      scan_registry (0, HKEY_CLASSES_ROOT, (char *) "HKEY_CLASSES_ROOT", 0);
-#endif
-      scan_registry (0, HKEY_CURRENT_CONFIG,
-		     (char *) "HKEY_CURRENT_CONFIG", 0);
-      scan_registry (0, HKEY_CURRENT_USER, (char *) "HKEY_CURRENT_USER", 0);
-      scan_registry (0, HKEY_LOCAL_MACHINE, (char *) "HKEY_LOCAL_MACHINE", 0);
-#if 0
-      /* the parts we need are duplicated in HKEY_CURRENT_USER anyway */
-      scan_registry (0, HKEY_USERS, (char *) "HKEY_USERS", 0);
-#endif
-      printf ("\n");
-    }
-  else
-    printf ("Use `-r' to scan registry\n\n");
-
-  if (givehelp)
-    {
-      printf ("Listing available drives...\n");
-      printf ("Drv Type        Size   Free Flags              Name\n");
-    }
-  int prev_mode =
-    SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
-  int drivemask = GetLogicalDrives ();
-
-  HINSTANCE k32 = LoadLibrary ("kernel32.dll");
-  BOOL (WINAPI * gdfse) (LPCSTR, long long *, long long *, long long *) =
-    (BOOL (WINAPI *) (LPCSTR, long long *, long long *, long long *))
-    GetProcAddress (k32, "GetDiskFreeSpaceExA");
-
-  for (i = 0; i < 26; i++)
-    {
-      if (!(drivemask & (1 << i)))
-	continue;
-      char drive[4], name[200], fsname[200];
-      DWORD serno = 0, maxnamelen = 0, flags = 0;
-      name[0] = name[0] = fsname[0] = 0;
-      sprintf (drive, "%c:\\", i + 'a');
-      /* Report all errors, except if the Volume is ERROR_NOT_READY. 
-         ERROR_NOT_READY is returned when removeable media drives are empty
-         (CD, floppy, etc.) */
-      if (!GetVolumeInformation
-	  (drive, name, sizeof (name), &serno, &maxnamelen, &flags, fsname,
-	   sizeof (fsname)) && GetLastError () != ERROR_NOT_READY)
-	keyeprint ("dump_sysinfo: GetVolumeInformation()");
-
-      int dtype = GetDriveType (drive);
-      char drive_type[4] = "unk";
-      switch (dtype)
-	{
-	case DRIVE_REMOVABLE:
-	  strcpy (drive_type, "fd ");
-	  break;
-	case DRIVE_FIXED:
-	  strcpy (drive_type, "hd ");
-	  break;
-	case DRIVE_REMOTE:
-	  strcpy (drive_type, "net");
-	  break;
-	case DRIVE_CDROM:
-	  strcpy (drive_type, "cd ");
-	  break;
-	case DRIVE_RAMDISK:
-	  strcpy (drive_type, "ram");
-	  break;
-	default:
-	  strcpy (drive_type, "unk");
-	}
-
-      long capacity_mb = -1;
-      int percent_full = -1;
-
-      long long free_me = 0ULL, free_bytes = 0ULL, total_bytes = 1ULL;
-      if (gdfse != NULL && gdfse (drive, &free_me, &total_bytes, &free_bytes))
-	{
-	  capacity_mb = total_bytes / (1024L * 1024L);
-	  percent_full = 100 - (int) ((100.0 * free_me) / total_bytes);
-	}
-      else
-	{
-	  DWORD spc = 0, bps = 0, fc = 0, tc = 1;
-	  if (GetDiskFreeSpace (drive, &spc, &bps, &fc, &tc))
-	    {
-	      capacity_mb = (spc * bps * tc) / (1024 * 1024);
-	      percent_full = 100 - (int) ((100.0 * fc) / tc);
-	    }
-	}
-
-      printf ("%.2s  %s %-6s ", drive, drive_type, fsname);
-      if (capacity_mb >= 0)
-	printf ("%5dMb %3d%% ", (int) capacity_mb, (int) percent_full);
-      else
-	printf ("  N/A    N/A ");
-      printf ("%s %s %s %s %s %s  %s\n",
-	      flags & FS_CASE_IS_PRESERVED ? "CP" : "  ",
-	      flags & FS_CASE_SENSITIVE ? "CS" : "  ",
-	      flags & FS_UNICODE_STORED_ON_DISK ? "UN" : "  ",
-	      flags & FS_PERSISTENT_ACLS ? "PA" : "  ",
-	      flags & FS_FILE_COMPRESSION ? "FC" : "  ",
-	      flags & FS_VOL_IS_COMPRESSED ? "VC" : "  ",
-#if 0
-	      flags & FILE_SUPPORTS_ENCRYPTION ? "EN" : "  ",
-	      flags & FILE_SUPPORTS_OBJECT_IDS ? "OI" : "  ",
-	      flags & FILE_SUPPORTS_REPARSE_POINTS ? "RP" : "  ",
-	      flags & FILE_SUPPORTS_SPARSE_FILES ? "SP" : "  ",
-	      flags & FILE_VOLUME_QUOTAS ? "QU" : "  ",
-#endif
-	      name);
-    }
-
-  if (!FreeLibrary (k32))
-    keyeprint ("dump_sysinfo: FreeLibrary()");
-  SetErrorMode (prev_mode);
-  if (givehelp)
-    {
-      printf ("fd=floppy, hd=hard drive, cd=CD-ROM, net=Network Share\n");
-      printf ("CP=Case Preserving, CS=Case Sensitive, UN=Unicode\n");
-      printf
-	("PA=Persistent ACLS, FC=File Compression, VC=Volume Compression\n");
-    }
-  printf ("\n");
-
-  unsigned ml_fsname = 4, ml_dir = 7, ml_type = 6;
-
-  struct mntent *mnt;
-  setmntent (0, 0);
-  while ((mnt = getmntent (0)))
-    {
-      unsigned n = (int) strlen (mnt->mnt_fsname);
-      if (ml_fsname < n)
-	ml_fsname = n;
-      n = (int) strlen (mnt->mnt_dir);
-      if (ml_dir < n)
-	ml_dir = n;
-    }
-
-  if (givehelp)
-    {
-      printf
-	("Mount entries: these map POSIX directories to your NT drives.\n");
-      printf ("%-*s  %-*s  %-*s  %s\n", ml_fsname, "-NT-", ml_dir, "-POSIX-",
-	      ml_type, "-Type-", "-Flags-");
-    }
-
-  setmntent (0, 0);
-  while ((mnt = getmntent (0)))
-    {
-      printf ("%-*s  %-*s  %-*s  %s\n",
-	      ml_fsname, mnt->mnt_fsname,
-	      ml_dir, mnt->mnt_dir, ml_type, mnt->mnt_type, mnt->mnt_opts);
-    }
-  printf ("\n");
-
-  add_path ((char *) "\\bin", 4);	/* just in case */
-
-  if (givehelp)
-    printf
-      ("Looking to see where common programs can be found, if at all...\n");
-  for (i = 0; common_apps[i].name; i++)
-    if (!find_on_path ((char *) common_apps[i].name, (char *) ".exe", 1, 0))
-      {
-	if (common_apps[i].missing_is_good)
-	  printf ("Not Found: %s (good!)\n", common_apps[i].name);
-	else
-	  printf ("Not Found: %s\n", common_apps[i].name);
-      }
-  printf ("\n");
-
-  if (givehelp)
-    printf ("Looking for various Cygnus DLLs...  (-v gives version info)\n");
-  for (i = 0; i < num_paths; i++)
-    {
-      WIN32_FIND_DATA ffinfo;
-      sprintf (tmp, "%s/*.*", paths[i]);
-      HANDLE ff = FindFirstFile (tmp, &ffinfo);
-      int found = (ff != INVALID_HANDLE_VALUE);
-      found_cygwin_dll = NULL;
-      while (found)
-	{
-	  char *f = ffinfo.cFileName;
-	  if (strcasecmp (f + strlen (f) - 4, ".dll") == 0)
-	    {
-	      if (strncasecmp (f, "cyg", 3) == 0)
-		{
-		  sprintf (tmp, "%s\\%s", paths[i], f);
-		  if (strcasecmp (f, "cygwin1.dll") == 0)
-		    found_cygwin_dll = strdup (tmp);
-		  else
-		    ls (tmp);
-		}
-	    }
-	  found = FindNextFile (ff, &ffinfo);
-	}
-      if (found_cygwin_dll)
-	{
-	  ls (found_cygwin_dll);
-	  free (found_cygwin_dll);
-	}
-
-      FindClose (ff);
-    }
-}
-
-static int
-check_keys ()
-{
-  HANDLE h = CreateFileA ("CONIN$", GENERIC_READ | GENERIC_WRITE,
-			  FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
-			  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-  if (h == INVALID_HANDLE_VALUE || h == NULL)
-    return (keyeprint ("check_key: Opening CONIN$"));
-
-  DWORD mode;
-
-  if (!GetConsoleMode (h, &mode))
-    keyeprint ("check_keys: GetConsoleMode()");
-  else
-    {
-      mode &= ~ENABLE_PROCESSED_INPUT;
-      if (!SetConsoleMode (h, mode))
-	keyeprint ("check_keys: GetConsoleMode()");
-    }
-
-  fputs ("\nThis key check works only in a console window,", stderr);
-  fputs (" _NOT_ in a terminal session!\n", stderr);
-  fputs ("Abort with Ctrl+C if in a terminal session.\n\n", stderr);
-  fputs ("Press `q' to exit.\n", stderr);
-
-  INPUT_RECORD in, prev_in;
-
-  // Drop first <RETURN> key
-  ReadConsoleInput (h, &in, 1, &mode);
-
-  memset (&in, 0, sizeof in);
-
-  do
-    {
-      prev_in = in;
-      if (!ReadConsoleInput (h, &in, 1, &mode))
-	keyeprint ("ReadConsoleInput");
-
-      if (!memcmp (&in, &prev_in, sizeof in))
-	continue;
-
-      switch (in.EventType)
-	{
-	case KEY_EVENT:
-	  printf ("%s %ux VK: 0x%02x VS: 0x%02x A: 0x%02x CTRL: ",
-		  in.Event.KeyEvent.bKeyDown ? "Pressed " : "Released",
-		  in.Event.KeyEvent.wRepeatCount,
-		  in.Event.KeyEvent.wVirtualKeyCode,
-		  in.Event.KeyEvent.wVirtualScanCode,
-		  (unsigned char) in.Event.KeyEvent.uChar.AsciiChar);
-	  fputs (in.Event.KeyEvent.dwControlKeyState & CAPSLOCK_ON ?
-		 "CL " : "-- ", stdout);
-	  fputs (in.Event.KeyEvent.dwControlKeyState & ENHANCED_KEY ?
-		 "EK " : "-- ", stdout);
-	  fputs (in.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED ?
-		 "LA " : "-- ", stdout);
-	  fputs (in.Event.KeyEvent.dwControlKeyState & LEFT_CTRL_PRESSED ?
-		 "LC " : "-- ", stdout);
-	  fputs (in.Event.KeyEvent.dwControlKeyState & NUMLOCK_ON ?
-		 "NL " : "-- ", stdout);
-	  fputs (in.Event.KeyEvent.dwControlKeyState & RIGHT_ALT_PRESSED ?
-		 "RA " : "-- ", stdout);
-	  fputs (in.Event.KeyEvent.dwControlKeyState & RIGHT_CTRL_PRESSED ?
-		 "RC " : "-- ", stdout);
-	  fputs (in.Event.KeyEvent.dwControlKeyState & SCROLLLOCK_ON ?
-		 "SL " : "-- ", stdout);
-	  fputs (in.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED ?
-		 "SH " : "-- ", stdout);
-	  fputc ('\n', stdout);
-	  break;
-
-	default:
-	  break;
-	}
-    }
-  while (in.EventType != KEY_EVENT ||
-	 in.Event.KeyEvent.bKeyDown != FALSE ||
-	 in.Event.KeyEvent.uChar.AsciiChar != 'q');
-
-  CloseHandle (h);
-  return 0;
-}
-
-static void
-usage (FILE * stream, int status)
-{
-  fprintf (stream, "\
-Usage: cygcheck [OPTIONS] [PROGRAM...]\n\
-Check system information or PROGRAM library dependencies\n\
-\n\
- -c, --check-setup   check packages installed via setup.exe\n\
- -d, --dump-only     no integrity checking of package contents (requires -c)\n\
- -s, --sysinfo       system information (not with -k)\n\
- -v, --verbose       verbose output (indented) (for -[cfls] or programs)\n\
- -r, --registry      registry search (requires -s)\n\
- -k, --keycheck      perform a keyboard check session (not with -[scfl])\n\
- -f, --find-package  find installed packages containing files (not with -[cl])\n\
- -l, --list-package  list the contents of installed packages (not with -[cf])\n\
- -h, --help          give help about the info (not with -[cfl])\n\
- -V, --version       output version information and exit\n\
-You must at least give either -s or -k or a program name\n");
-  exit (status);
-}
-
-struct option longopts[] = {
-  {"check-setup", no_argument, NULL, 'c'},
-  {"dump-only", no_argument, NULL, 'd'},
-  {"sysinfo", no_argument, NULL, 's'},
-  {"registry", no_argument, NULL, 'r'},
-  {"verbose", no_argument, NULL, 'v'},
-  {"keycheck", no_argument, NULL, 'k'},
-  {"find-package", no_argument, NULL, 'f'},
-  {"list-package", no_argument, NULL, 'l'},
-  {"help", no_argument, NULL, 'h'},
-  {"version", no_argument, 0, 'V'},
-  {0, no_argument, NULL, 0}
-};
-
-static char opts[] = "cdfhklrsvV";
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-cygcheck version %.*s\n\
-System Checker for Cygwin\n\
-Copyright 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.\n\
-Compiled on %s\n\
-", len, v, __DATE__);
-}
-
-int
-main (int argc, char **argv)
-{
-  int i;
-
-  while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
-    switch (i)
-      {
-      case 's':
-	sysinfo = 1;
-	break;
-      case 'c':
-	check_setup = 1;
-	break;
-      case 'd':
-	dump_only = 1;
-	break;
-      case 'r':
-	registry = 1;
-	break;
-      case 'v':
-	verbose = 1;
-	break;
-      case 'k':
-	keycheck = 1;
-	break;
-      case 'f':
-	find_package = 1;
-	break;
-      case 'l':
-	list_package = 1;
-	break;
-      case 'h':
-	givehelp = 1;
-	break;
-      case 'V':
-	print_version ();
-	exit (0);
-      default:
-	usage (stderr, 1);
-       /*NOTREACHED*/}
-  argc -= optind;
-  argv += optind;
-
-  if (argc == 0 && !sysinfo && !keycheck && !check_setup)
-    if (givehelp)
-      usage (stdout, 0);
-    else
-      usage (stderr, 1);
-
-  if ((check_setup || sysinfo || find_package || list_package) && keycheck)
-    usage (stderr, 1);
-
-  if ((find_package || list_package) && check_setup)
-    usage (stderr, 1);
-
-  if (dump_only && !check_setup)
-    usage (stderr, 1);
-
-  if (find_package && list_package)
-    usage (stderr, 1);
-
-  if (keycheck)
-    return check_keys ();
-
-  init_paths ();
-
-  /* FIXME: Add help for check_setup and {list,find}_package */
-  if (argc >= 1 && givehelp && !check_setup && !find_package && !list_package)
-    {
-      printf("Here is where the OS will find your program%s, and which dlls\n",
-	     argc > 1 ? "s" : "");
-      printf ("will be used for it.  Use -v to see DLL version info\n");
-
-      if (!sysinfo)
-	printf ("\n");
-    }
-
-  if (check_setup)
-    {
-      dump_setup (verbose, argv, !dump_only);
-    }
-  else if (find_package)
-    {
-      package_find (verbose, argv);
-    }
-  else if (list_package)
-    {
-      package_list (verbose, argv);
-    }
-  else
-    for (i = 0; i < argc; i++)
-      {
-	if (i)
-	  puts ("");
-	cygcheck (argv[i]);
-      }
-
-  if (sysinfo)
-    {
-      dump_sysinfo ();
-      if (!check_setup)
-	{
-	  puts ("");
-	  dump_setup (verbose, NULL, false);
-	}
-
-      if (!givehelp)
-	puts ("Use -h to see help about each section");
-    }
-
-  return 0;
-}
diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
deleted file mode 100644
index e1942be34..000000000
--- a/winsup/utils/cygpath.cc
+++ /dev/null
@@ -1,760 +0,0 @@
-/* cygpath.cc -- convert pathnames between Windows and Unix format
-   Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#define NOCOMATTRIBUTE
-
-#define _WIN32_IE 0x0400
-
-#include <shlobj.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <getopt.h>
-#include <windows.h>
-#include <io.h>
-#include <sys/fcntl.h>
-#include <sys/cygwin.h>
-#include <ctype.h>
-
-static const char version[] = "$Revision$";
-
-static char *prog_name;
-static char *file_arg;
-static int path_flag, unix_flag, windows_flag, absolute_flag;
-static int shortname_flag, longname_flag;
-static int ignore_flag, allusers_flag, output_flag;
-static int mixed_flag;
-static const char *format_type_arg;
-
-static struct option long_options[] = {
-  {(char *) "absolute", no_argument, NULL, 'a'},
-  {(char *) "close", required_argument, NULL, 'c'},
-  {(char *) "dos", no_argument, NULL, 'd'},
-  {(char *) "file", required_argument, NULL, 'f'},
-  {(char *) "help", no_argument, NULL, 'h'},
-  {(char *) "ignore", no_argument, NULL, 'i'},
-  {(char *) "long-name", no_argument, NULL, 'l'},
-  {(char *) "mixed", no_argument, NULL, 'm'},
-  {(char *) "option", no_argument, NULL, 'o'},
-  {(char *) "path", no_argument, NULL, 'p'},
-  {(char *) "short-name", no_argument, NULL, 's'},
-  {(char *) "type", required_argument, NULL, 't'},
-  {(char *) "unix", no_argument, NULL, 'u'},
-  {(char *) "version", no_argument, NULL, 'v'},
-  {(char *) "windows", no_argument, NULL, 'w'},
-  {(char *) "allusers", no_argument, NULL, 'A'},
-  {(char *) "desktop", no_argument, NULL, 'D'},
-  {(char *) "homeroot", no_argument, NULL, 'H'},
-  {(char *) "smprograms", no_argument, NULL, 'P'},
-  {(char *) "sysdir", no_argument, NULL, 'S'},
-  {(char *) "windir", no_argument, NULL, 'W'},
-  {0, no_argument, 0, 0}
-};
-
-static char options[] = "ac:df:hilmopst:uvwADHPSW";
-
-static void
-usage (FILE * stream, int status)
-{
-  if (!ignore_flag || !status)
-    fprintf (stream, "\
-Usage: %s (-d|-m|-u|-w|-t TYPE) [-c HANDLE] [-f FILE] [options] NAME\n\
-       %s [-ADHPSW] \n\
-Convert Unix and Windows format paths, or output system path information\n\
-\n\
-Output type options:\n\
-  -d, --dos	        print DOS (short) form of NAME (C:\\PROGRA~1\\)\n\
-  -m, --mixed           like --windows, but with regular slashes (C:/WINNT)\n\
-  -u, --unix	        (default) print Unix form of NAME (/cygdrive/c/winnt)\n\
-  -w, --windows         print Windows form of NAME (C:\\WINNT)\n\
-  -t, --type TYPE       print TYPE form: 'dos', 'mixed', 'unix', or 'windows'\n\
-Path conversion options:\n\
-  -a, --absolute        output absolute path\n\
-  -l, --long-name	print Windows long form of NAME (with -w, -m only)\n\
-  -p, --path	        NAME is a PATH list (i.e., '/bin:/usr/bin')\n\
-  -s, --short-name	print DOS (short) form of NAME (with -w, -m only)\n\
-System information:\n\
-  -A, --allusers        use `All Users' instead of current user for -D, -P\n\
-  -D, --desktop		output `Desktop' directory and exit\n\
-  -H, --homeroot        output `Profiles' directory (home root) and exit\n\
-  -P, --smprograms	output Start Menu `Programs' directory and exit\n\
-  -S, --sysdir		output system directory and exit\n\
-  -W, --windir		output `Windows' directory and exit\n\
-", prog_name, prog_name);
-  if (stream == stdout)
-    {
-    fprintf (stream, "\
-Other options:\n\
-  -f, --file FILE       read FILE for input; use - to read from STDIN\n\
-  -o, --option          read options from FILE as well (for use with --file)\n\
-  -c, --close HANDLE    close HANDLE (for use in captured process)\n\
-  -i, --ignore		ignore missing argument\n\
-  -h, --help            output usage information and exit\n\
-  -v, --version		output version information and exit\n\
-");
-    }
-  else
-    fprintf(stream, "Try `%s --help' for more information.\n", prog_name);
-  exit (ignore_flag ? 0 : status);
-}
-
-static char *
-get_short_paths (char *path)
-{
-  char *sbuf;
-  char *sptr;
-  char *next;
-  char *ptr = path;
-  char *end = strrchr (path, 0);
-  DWORD acc = 0;
-  DWORD len;
-
-  while (ptr != NULL)
-    {
-      next = ptr;
-      ptr = strchr (ptr, ';');
-      if (ptr)
-	*ptr++ = 0;
-      len = GetShortPathName (next, NULL, 0);
-      if (!len)
-	{
-	  fprintf (stderr, "%s: cannot create short name of %s\n", prog_name,
-		   next);
-	  exit (2);
-	}
-      acc += len + 1;
-    }
-  sptr = sbuf = (char *) malloc (acc + 1);
-  if (sbuf == NULL)
-    {
-      fprintf (stderr, "%s: out of memory\n", prog_name);
-      exit (1);
-    }
-  ptr = path;
-  for (;;)
-    {
-      len = GetShortPathName (ptr, sptr, acc);
-      if (!len)
-	{
-	  fprintf (stderr, "%s: cannot create short name of %s\n", prog_name,
-		   ptr);
-	  exit (2);
-	}
-
-      ptr = strrchr (ptr, 0);
-      sptr = strrchr (sptr, 0);
-      if (ptr == end)
-	break;
-      *sptr = ';';
-      ++ptr, ++sptr;
-      acc -= len + 1;
-    }
-  return sbuf;
-}
-
-static char *
-get_short_name (const char *filename)
-{
-  char *sbuf, buf[MAX_PATH];
-  DWORD len = GetShortPathName (filename, buf, MAX_PATH);
-  if (!len)
-    {
-      fprintf (stderr, "%s: cannot create short name of %s\n", prog_name,
-	       filename);
-      exit (2);
-    }
-  sbuf = (char *) malloc (++len);
-  if (sbuf == NULL)
-    {
-      fprintf (stderr, "%s: out of memory\n", prog_name);
-      exit (1);
-    }
-  return strcpy (sbuf, buf);
-}
-
-static DWORD WINAPI
-get_long_path_name_w32impl (LPCSTR src, LPSTR sbuf, DWORD)
-{
-  char buf1[MAX_PATH], buf2[MAX_PATH], *ptr;
-  const char *pelem, *next;
-  WIN32_FIND_DATA w32_fd;
-  int len;
-
-  strcpy (buf1, src);
-  *buf2 = 0;
-  pelem = src;
-  ptr = buf2;
-  while (pelem)
-    {
-      next = pelem;
-      if (*next == '\\')
-	{
-	  strcat (ptr++, "\\");
-	  pelem++;
-	  if (!*pelem)
-	    break;
-	  continue;
-	}
-      pelem = strchr (next, '\\');
-      len = pelem ? (pelem++ - next) : strlen (next);
-      strncpy (ptr, next, len);
-      ptr[len] = 0;
-      if (next[1] != ':' && strcmp(next, ".") && strcmp(next, ".."))
-	{
-	  if (FindFirstFile (buf2, &w32_fd) != INVALID_HANDLE_VALUE)
-	    strcpy (ptr, w32_fd.cFileName);
-	}
-      ptr += strlen (ptr);
-      if (pelem)
-	{
-	  *ptr++ = '\\';
-	  *ptr = 0;
-	}
-    }
-  if (sbuf)
-    strcpy (sbuf, buf2);
-  SetLastError (0);
-  return strlen (buf2) + (sbuf ? 0 : 1);
-}
-
-static char *
-get_long_name (const char *filename, DWORD& len)
-{
-  char *sbuf, buf[MAX_PATH];
-  static HINSTANCE k32 = LoadLibrary ("kernel32.dll");
-  static DWORD (WINAPI *GetLongPathName) (LPCSTR, LPSTR, DWORD) =
-    (DWORD (WINAPI *) (LPCSTR, LPSTR, DWORD)) GetProcAddress (k32, "GetLongPathName");
-  if (!GetLongPathName)
-    GetLongPathName = get_long_path_name_w32impl;
-
-  len = GetLongPathName (filename, buf, MAX_PATH);
-  if (len == 0 && GetLastError () == ERROR_INVALID_PARAMETER)
-    {
-      fprintf (stderr, "%s: cannot create long name of %s\n", prog_name,
-	       filename);
-      exit (2);
-    }
-  sbuf = (char *) malloc (len + 1);
-  if (!sbuf)
-    {
-      fprintf (stderr, "%s: out of memory\n", prog_name);
-      exit (1);
-    }
-  return strcpy (sbuf, buf);
-}
-
-static char *
-get_long_paths (char *path)
-{
-  char *sbuf;
-  char *ptr;
-  int n = 1;
-
-  ptr = path;
-  while ((ptr = strchr (ptr, ';')))
-    {
-      ptr++;
-      n++;
-    }
-
-  char *paths[n];
-  DWORD acc = 0;
-  int i;
-  if (!n)
-    return strdup ("");
-
-  for (i = 0, ptr = path; ptr; i++)
-    {
-      DWORD len;
-      char *next = ptr;
-      ptr = strchr (ptr, ';');
-      if (ptr)
-	*ptr++ = 0;
-      paths[i] = get_long_name (next, len);
-      acc += len + 1;
-    }
-
-  sbuf = (char *) malloc (acc + 1);
-  if (sbuf == NULL)
-    {
-      fprintf (stderr, "%s: out of memory\n", prog_name);
-      exit (1);
-    }
-
-  sbuf[0] = '\0';
-  for (i = 0; i < n; i++)
-    {
-      strcat (strcat (sbuf, paths[i]), ";");
-      free (paths[i]);
-    }
-
-  strchr (sbuf, '\0')[-1] = '\0';
-  return sbuf;
-}
-
-static void
-convert_slashes (char* name)
-{
-  while ((name = strchr (name, '\\')) != NULL)
-    {
-      if (*name == '\\')
-	*name = '/';
-       name++;
-   }
-}
-
-static char *
-get_mixed_name (const char* filename)
-{
-  char* mixed_buf = strdup (filename);
-
-  if (mixed_buf == NULL)
-    {
-      fprintf (stderr, "%s: out of memory\n", prog_name);
-      exit (1);
-    }
-
-  convert_slashes (mixed_buf);
-
-  return mixed_buf;
-}
-
-static void
-dowin (char option)
-{
-  char *buf, buf1[MAX_PATH], buf2[MAX_PATH];
-  DWORD len = MAX_PATH;
-  WIN32_FIND_DATA w32_fd;
-  HINSTANCE k32;
-  BOOL (*GetProfilesDirectoryAPtr) (LPSTR, LPDWORD) = 0;
-
-  buf = buf1;
-  switch (option)
-    {
-    case 'D':
-      if (!SHGetSpecialFolderPath (NULL, buf, allusers_flag ?
-	      CSIDL_COMMON_DESKTOPDIRECTORY : CSIDL_DESKTOPDIRECTORY, FALSE))
-	SHGetSpecialFolderPath (NULL, buf, CSIDL_DESKTOPDIRECTORY, FALSE);
-      break;
-
-    case 'P':
-      if (!SHGetSpecialFolderPath (NULL, buf, allusers_flag ?
-			    CSIDL_COMMON_PROGRAMS : CSIDL_PROGRAMS, FALSE))
-	SHGetSpecialFolderPath (NULL, buf, CSIDL_PROGRAMS, FALSE);
-      break;
-
-    case 'H':
-      k32 = LoadLibrary ("userenv");
-      if (k32)
-	GetProfilesDirectoryAPtr = (BOOL (*) (LPSTR, LPDWORD))
-	  GetProcAddress (k32, "GetProfilesDirectoryA");
-      if (GetProfilesDirectoryAPtr)
-	(*GetProfilesDirectoryAPtr) (buf, &len);
-      else
-	{
-	  GetWindowsDirectory (buf, MAX_PATH);
-	  strcat (buf, "\\Profiles");
-	}
-      break;
-
-    case 'S':
-      GetSystemDirectory (buf, MAX_PATH);
-      FindFirstFile (buf, &w32_fd);
-      strcpy (strrchr (buf, '\\') + 1, w32_fd.cFileName);
-      break;
-
-    case 'W':
-      GetWindowsDirectory (buf, MAX_PATH);
-      break;
-
-    default:
-      usage (stderr, 1);
-    }
-
-  if (!windows_flag)
-    {
-      cygwin_conv_to_posix_path (buf, buf2);
-      buf = buf2;
-    }
-  else
-    {
-      if (shortname_flag)
-	buf = get_short_name (buf);
-      if (mixed_flag)
-	buf = get_mixed_name (buf);
-    }
-  printf ("%s\n", buf);
-  exit (0);
-}
-
-static void
-doit (char *filename)
-{
-  char *buf;
-  DWORD len;
-  int retval;
-  int (*conv_func) (const char *, char *);
-
-  if (!path_flag)
-    {
-      len = strlen (filename);
-      if (len)
-	len += MAX_PATH + 1001;
-      else if (ignore_flag)
-	exit (0);
-      else
-	{
-	  fprintf (stderr, "%s: can't convert empty path\n", prog_name);
-	  exit (1);
-	}
-    }
-  else if (unix_flag)
-    len = cygwin_win32_to_posix_path_list_buf_size (filename);
-  else
-    len = cygwin_posix_to_win32_path_list_buf_size (filename);
-
-  buf = (char *) malloc (len);
-  if (buf == NULL)
-    {
-      fprintf (stderr, "%s: out of memory\n", prog_name);
-      exit (1);
-    }
-
-  if (path_flag)
-    {
-      if (unix_flag)
-	cygwin_win32_to_posix_path_list (filename, buf);
-      else
-	{
-	  cygwin_posix_to_win32_path_list (filename, buf);
-	  if (shortname_flag)
-	    buf = get_short_paths (buf);
-	  if (longname_flag)
-	    buf = get_long_paths (buf);
-	  if (mixed_flag)
-	    buf = get_mixed_name (buf);
-	}
-    }
-  else
-    {
-      if (unix_flag)
-	conv_func = (absolute_flag ? cygwin_conv_to_full_posix_path :
-		     cygwin_conv_to_posix_path);
-      else
-	conv_func = (absolute_flag ? cygwin_conv_to_full_win32_path :
-		     cygwin_conv_to_win32_path);
-      retval = conv_func (filename, buf);
-      if (mixed_flag)
-	buf = get_mixed_name (buf);
-      if (retval < 0)
-	{
-	  fprintf (stderr, "%s: error converting \"%s\"\n",
-		   prog_name, filename);
-	  exit (1);
-	}
-      if (!unix_flag)
-	{
-	  if (shortname_flag)
-	    buf = get_short_name (buf);
-	  if (longname_flag)
-	    buf = get_long_name (buf, len);
-	}
-    }
-
-  puts (buf);
-}
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-cygpath (cygwin) %.*s\n\
-Path Conversion Utility\n\
-Copyright 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s\n\
-", len, v, __DATE__);
-}
-
-int
-main (int argc, char **argv)
-{
-  int c, o = 0;
-  int options_from_file_flag;
-  char *filename;
-
-  prog_name = strrchr (argv[0], '/');
-  if (prog_name == NULL)
-    prog_name = strrchr (argv[0], '\\');
-  if (prog_name == NULL)
-    prog_name = argv[0];
-  else
-    prog_name++;
-
-  path_flag = 0;
-  unix_flag = 1;
-  windows_flag = 0;
-  shortname_flag = 0;
-  longname_flag = 0;
-  mixed_flag = 0;
-  ignore_flag = 0;
-  options_from_file_flag = 0;
-  allusers_flag = 0;
-  output_flag = 0;
-  while ((c = getopt_long (argc, argv, options,
-			   long_options, (int *) NULL)) != EOF)
-    {
-      switch (c)
-	{
-	case 'a':
-	  absolute_flag = 1;
-	  break;
-
-	case 'c':
-	  CloseHandle ((HANDLE) strtoul (optarg, NULL, 16));
-	  break;
-
-	case 'd':
-	  if (windows_flag)
-	    usage (stderr, 1);
-	  unix_flag = 0;
-	  windows_flag = 1;
-	  shortname_flag = 1;
-	  break;
-
-	case 'f':
-	  file_arg = optarg;
-	  break;
-
-	case 'o':
-	  options_from_file_flag = 1;
-	  break;
-
-	case 'p':
-	  path_flag = 1;
-	  break;
-
-	case 'u':
-	  if (windows_flag || mixed_flag)
-	    usage (stderr, 1);
-	  unix_flag = 1;
-	  break;
-
-	case 'w':
-	  if (windows_flag || mixed_flag)
-	    usage (stderr, 1);
-	  unix_flag = 0;
-	  windows_flag = 1;
-	  break;
-
-	 case 'm':
-	  unix_flag = 0;
-	  windows_flag = 1;
-	  mixed_flag = 1;
-	  break;
-
-	case 'l':
-	  longname_flag = 1;
-	  break;
-
-	case 's':
-	  shortname_flag = 1;
-	  break;
-
-	 case 't':
-	  if (optarg == NULL)
-	    usage (stderr, 1);
-
-	  format_type_arg = (*optarg == '=') ? (optarg + 1) : (optarg);
-	  if (strcasecmp (format_type_arg, "dos") == 0)
-	    {
-	    if (windows_flag || longname_flag)
-	      usage (stderr, 1);
-	    unix_flag = 0;
-	    windows_flag = 1;
-	    shortname_flag = 1;
-	    }
-	  else if (strcasecmp (format_type_arg, "mixed") == 0)
-	    {
-	    unix_flag = 0;
-	    mixed_flag = 1;
-	    }
-	  else if (strcasecmp (format_type_arg, "unix") == 0)
-	    {
-	    if (windows_flag)
-	      usage (stderr, 1);
-	    unix_flag = 1;
-	    }
-	  else if (strcasecmp (format_type_arg, "windows") == 0)
-	    {
-	    if (mixed_flag)
-	      usage (stderr, 1);
-	    unix_flag = 0;
-	    windows_flag = 1;
-	    }
-	  else
-	    usage (stderr, 1);
-	  break;
-
-	case 'A':
-	  allusers_flag = 1;
-	  break;
-
-	case 'D':
-	case 'H':
-	case 'P':
-	case 'S':
-	case 'W':
-	  if (output_flag)
-	    usage (stderr, 1);
-	  output_flag = 1;
-	  o = c;
-	  break;
-
-	case 'i':
-	  ignore_flag = 1;
-	  break;
-
-	case 'h':
-	  usage (stdout, 0);
-	  break;
-
-	case 'v':
-	  print_version ();
-	  exit (0);
-
-	default:
-	  usage (stderr, 1);
-	  break;
-	}
-    }
-
-  if (options_from_file_flag && !file_arg)
-    usage (stderr, 1);
-
-  if (longname_flag && !windows_flag)
-    usage (stderr, 1);
-
-  if (shortname_flag && !windows_flag)
-    usage (stderr, 1);
-
-  if (!unix_flag && !windows_flag && !mixed_flag && !options_from_file_flag)
-    usage (stderr, 1);
-
-  if (!file_arg)
-    {
-      if (output_flag)
-	dowin (o);
-
-      if (optind > argc - 1)
-	usage (stderr, 1);
-
-      for (int i=optind; argv[i]; i++) {
-	filename = argv[i];
-	doit (filename);
-      }
-    }
-  else
-    {
-      FILE *fp;
-      char buf[PATH_MAX * 2 + 1];
-
-      if (argv[optind])
-	usage (stderr, 1);
-
-      if (strcmp (file_arg, "-") != 0)
-	fp = fopen (file_arg, "rt");
-      else
-	{
-	  fp = stdin;
-	  setmode (0, O_TEXT);
-	}
-      if (fp == NULL)
-	{
-	  perror ("cygpath");
-	  exit (1);
-	}
-
-      setbuf (stdout, NULL);
-      while (fgets (buf, sizeof (buf), fp) != NULL)
-	{
-	  char *s = buf;
-	  char *p = strchr (s, '\n');
-	  if (p)
-	    *p = '\0';
-	  if (options_from_file_flag && *s == '-')
-	    {
-	      char c;
-	      for (c = *++s; c && !isspace (c); c = *++s)
-		switch (c)
-		  {
-		  case 'a':
-		    absolute_flag = 1;
-		    break;
-		  case 'i':
-		    ignore_flag = 1;
-		    break;
-		  case 's':
-		    shortname_flag = 1;
-		    longname_flag = 0;
-		    break;
-		  case 'l':
-		    shortname_flag = 0;
-		    longname_flag = 1;
-		    break;
-		  case 'm':
-		    unix_flag = 0;
-		    windows_flag = 1;
-		    mixed_flag = 1;
-		  case 'w':
-		    unix_flag = 0;
-		    windows_flag = 1;
-		    break;
-		  case 'u':
-		    windows_flag = 0;
-		    unix_flag = 1;
-		    break;
-		  case 'p':
-		    path_flag = 1;
-		    break;
-		  case 'D':
-		  case 'H':
-		  case 'P':
-		  case 'S':
-		  case 'W':
-		    output_flag = 1;
-		    o = c;
-		    break;
-		  }
-	      if (*s)
-		do
-		  s++;
-		while (*s && isspace (*s));
-	    }
-	  if (*s && !output_flag)
-	    doit (s);
-	  if (!*s && output_flag)
-	    dowin (o);
-	}
-    }
-
-  exit (0);
-}
diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/dump_setup.cc
deleted file mode 100644
index 11d32c4af..000000000
--- a/winsup/utils/dump_setup.cc
+++ /dev/null
@@ -1,502 +0,0 @@
-/* dump_setup.cc
-
-   Copyright 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <windows.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <io.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include "path.h"
-#if 0
-#include "zlib.h"
-#endif
-
-#ifndef ZLIB_VERSION
-typedef void * gzFile;
-#define gzgets(fp, buf, size) ({0;})
-#define gzclose(fp) ({0;})
-#endif
-
-static int package_len = 20;
-static unsigned int version_len = 10;
-
-
-typedef struct
-{
-  char pkgtar[MAX_PATH + 1];
-  char pkg[MAX_PATH + 1];
-  char ver[MAX_PATH + 1];
-  char tail[MAX_PATH + 1];
-  char what[16];
-} fileparse;
-
-static int
-find_tar_ext (const char *path)
-{
-  char *p = strchr (path, '\0') - 7;
-  if (p <= path)
-    return 0;
-  if (*p == '.')
-    {
-      if (strcmp (p, ".tar.gz") != 0)
-	return 0;
-    }
-  else if (--p <= path || strcmp (p, ".tar.bz2") != 0)
-    return 0;
-
-  return p - path;
-}
-
-static char *
-base (const char *s)
-{
-  if (!s)
-    return 0;
-  const char *rv = s;
-  while (*s)
-    {
-      if ((*s == '/' || *s == ':' || *s == '\\') && s[1])
-	rv = s + 1;
-      s++;
-    }
-  return (char *) rv;
-}
-
-/* Parse a filename into package, version, and extension components. */
-int
-parse_filename (const char *in_fn, fileparse& f)
-{
-  char *p, *ver;
-  char fn[strlen (in_fn) + 1];
-
-  strcpy (fn, in_fn);
-  int n = find_tar_ext (fn);
-
-  if (!n)
-    return 0;
-
-  strcpy (f.tail, fn + n);
-  fn[n] = '\0';
-  f.pkg[0] = f.what[0] = '\0';
-  p = base (fn);
-  for (ver = p; *ver; ver++)
-    if (*ver == '-')
-      if (isdigit (ver[1]))
-	{
-	  *ver++ = 0;
-	  strcpy (f.pkg, p);
-	  break;
-	}
-      else if (strcasecmp (ver, "-src") == 0 ||
-	       strcasecmp (ver, "-patch") == 0)
-	{
-	  *ver++ = 0;
-	  strcpy (f.pkg, p);
-	  strcpy (f.what, strlwr (ver));
-	  strcpy (f.pkgtar, p);
-	  strcat (f.pkgtar, f.tail);
-	  ver = strchr (ver, '\0');
-	  break;
-	}
-
-  if (!f.pkg[0])
-    strcpy (f.pkg, p);
-
-  if (!f.what[0])
-    {
-      int n;
-      p = strchr (ver, '\0');
-      strcpy (f.pkgtar, in_fn);
-      if ((p -= 4) >= ver && strcasecmp (p, "-src") == 0)
-	n = 4;
-      else if ((p -= 2) >= ver && strcasecmp (p, "-patch") == 0)
-	n = 6;
-      else
-	n = 0;
-      if (n)
-	{
-	  strcpy (f.what, p + 1);
-	  *p = '\0';
-	  p = f.pkgtar + (p - fn) + n;
-	  memmove (p - 4, p, strlen (p));
-	}
-    }
-
-  strcpy (f.ver, *ver ? ver : "0.0");
-  return 1;
-}
-
-static bool
-dump_file (const char *msg, const char *fn)
-{
-  char *path = cygpath ("/etc/setup/", fn, NULL);
-  FILE *fp = fopen (path, "rt");
-  bool printed;
-  char buf[4096];
-  if (!fp)
-    printed = false;
-  else if (!fgets (buf, 4096, fp))
-    printed = false;
-    {
-      char *p = strchr (buf, '\0');
-      printf ("%s%s%s", msg, buf, (p == buf) || p[-1] != '\n' ? "\n" : "");
-      printed = true;
-    }
-  if (fp)
-    fclose (fp);
-  return printed;
-}
-
-struct pkgver
-{
-  char *name;
-  char *ver;
-};
-
-extern "C" {
-int
-compar (const void *a, const void *b)
-{
-  const pkgver *pa = (const pkgver *) a;
-  const pkgver *pb = (const pkgver *) b;
-  return strcasecmp (pa->name, pb->name);
-}
-}
-
-int
-match_argv (char **argv, const char *name)
-{
-  if (!argv || !*argv)
-    return -1;
-  for (char **a = argv; *a; a++)
-    if (strcasecmp (*a, name) == 0)
-      return a - argv + 1;
-  return 0;
-}
-
-static bool
-could_not_access (int verbose, char *filename, char *package, const char *type)
-{
-  switch (errno)
-    {
-      case ENOTDIR:
-        break;
-      case ENOENT:
-        if (verbose)
-          printf ("Missing %s: /%s from package %s\n",
-                  type, filename, package);
-        return true;
-      case EACCES:
-        if (verbose)
-          printf ("Unable to access %s /%s from package %s\n",
-                  type, filename, package);
-        return true;
-    }
-  return false;
-}
-
-static bool
-directory_exists (int verbose, char *filename, char *package)
-{
-  struct stat status;
-  if (stat(cygpath("/", filename, ".", NULL), &status))
-    {
-      if (could_not_access (verbose, filename, package, "directory"))
-        return false;
-    }
-  else if (!S_ISDIR(status.st_mode))
-    {
-      if (verbose)
-        printf ("Directory/file mismatch: /%s from package %s\n", filename, package);
-      return false;
-    }
-  return true;
-}
-
-static bool
-file_exists (int verbose, char *filename, const char *alt, char *package)
-{
-  struct stat status;
-  if (stat(cygpath("/", filename, NULL), &status) &&
-      (!alt || stat(cygpath("/", filename, alt, NULL), &status)))
-    {
-      if (could_not_access (verbose, filename, package, "file"))
-        return false;
-    }
-  else if (!S_ISREG(status.st_mode))
-    {
-      if (verbose)
-        printf ("File type mismatch: /%s from package %s\n", filename, package);
-      return false;
-    }
-  return true;
-}
-
-static gzFile
-open_package_list (char *package)
-{
-  char filelist[MAX_PATH + 1] = "/etc/setup/";
-  strcat (strcat (filelist, package), ".lst.gz");
-  if (!file_exists (false, filelist + 1, NULL, NULL))
-    return NULL;
-
-  gzFile fp;
-#ifndef ZLIB_VERSION
-  fp = NULL;
-#else
-  char *fn = cygpath (filelist, NULL);
-  fp = gzopen (fn, "rb9");
-  free (fn);
-#endif
-
-  return fp;
-}
-
-static bool
-check_package_files (int verbose, char *package)
-{
-  gzFile fp = open_package_list (package);
-  if (!fp)
-    {
-      if (verbose)
-	printf ("Empty package %s\n", package);
-      return true;
-    }
-
-  bool result = true;
-  char buf[MAX_PATH + 1];
-  while (gzgets (fp, buf, MAX_PATH))
-    {
-      char *filename = strtok(buf, "\n");
-
-      if (*filename == '/')
-	++filename;
-      else if (!strncmp (filename, "./", 2))
-	filename += 2;
-
-      if (filename[strlen (filename) - 1] == '/')
-        {
-          if (!directory_exists (verbose, filename, package))
-            result = false;
-        }
-      else if (!strncmp (filename, "etc/postinstall/", 16))
-        {
-          if (!file_exists (verbose, filename, ".done", package))
-            result = false;
-        }
-      else
-        {
-          if (!file_exists (verbose, filename, ".lnk", package))
-            result = false;
-        }
-    }
-
-  gzclose (fp);
-  return result;
-}
-
-/**
- * Returns a calloc'd sorted list of packages or NULL if no info.
- * The last entry in the list is {NULL,NULL}.
- */
-static pkgver *
-get_packages (char **argv) {
-  char *setup = cygpath ("/etc/setup/installed.db", NULL);
-  FILE *fp = fopen (setup, "rt");
-
-  if (fp == NULL)
-    return NULL;
-
-  int nlines;
-  nlines = 0;
-  char buf[4096];
-  while (fgets (buf, 4096, fp))
-    nlines += 2;	/* potentially binary + source */
-  if (!nlines)
-    {
-      fclose (fp);
-      return NULL;
-    }
-  rewind (fp);
-
-  pkgver *packages;
-
-  packages = (pkgver *) calloc (nlines + 1, sizeof(packages[0]));
-  int n;
-  for (n = 0; fgets (buf, 4096, fp) && n < nlines;)
-    {
-      char *package = strtok (buf, " ");
-      if (!package || !*package || !match_argv (argv, package))
-	continue;
-      for (int i = 0; i < 2; i++)
-	{
-	  fileparse f;
-	  char *tar = strtok (NULL, " ");
-	  if (!tar || !*tar || !parse_filename (tar, f))
-	    break;
-
-	  int len = strlen (package);
-	  if (f.what[0])
-	    len += strlen (f.what) + 1;
-	  if (len > package_len)
-	    package_len = len;
-	  packages[n].name = (char *) malloc (len + 1);
-	  strcpy (packages[n].name , package);
-	  if (f.what[0])
-	    strcat (strcat (packages[n].name, "-"), f.what);
-	  packages[n].ver = strdup (f.ver);
-	  if (strlen(f.ver) > version_len)
-	    version_len = strlen(f.ver);
-	  n++;
-	  if (strtok (NULL, " ") == NULL)
-	    break;
-	}
-    }
-
-  packages[n].name = packages[n].ver = NULL;
-
-  qsort (packages, n, sizeof (packages[0]), compar);
-
-  fclose (fp);
-
-  return packages;
-}
-
-void
-dump_setup (int verbose, char **argv, bool check_files)
-{
-  pkgver *packages = get_packages(argv);
-
-  puts ("Cygwin Package Information");
-  if (packages == NULL)
-    {
-      puts ("No setup information found");
-      return;
-    }
-
-  if (verbose)
-    {
-      bool need_nl = dump_file ("Last downloaded files to: ", "last-cache");
-      if (dump_file ("Last downloaded files from: ", "last-mirror") || need_nl)
-	puts ("");
-    }
-
-  printf ("%-*s %-*s     %s\n", package_len, "Package", version_len, "Version", check_files?"Status":"");
-  for (int i = 0; packages[i].name; i++)
-    {
-      printf ("%-*s %-*s     %s\n", package_len, packages[i].name, version_len,
-	      packages[i].ver, check_files ?
-	      (check_package_files (verbose, packages[i].name) ? "OK" : "Incomplete") : "");
-      fflush(stdout);
-    }
-
-  free (packages);
-
-  return;
-}
-
-void
-package_list (int verbose, char **argv)
-{
-  pkgver *packages = get_packages(argv);
-  if (packages == NULL)
-    {
-      puts ("No setup information found");
-      return;
-    }
-
-  for (int i = 0; packages[i].name; i++)
-    {
-      gzFile fp = open_package_list (packages[i].name);
-      if (!fp)
-	{
-	  if (verbose)
-	    printf ("Can't open file list /etc/setup/%s.lst.gz for package %s\n",
-		packages[i].name, packages[i].name);
-	  continue;
-	}
-
-      if (verbose)
-	printf ("Package: %s-%s\n", packages[i].name, packages[i].ver);
-
-      char buf[MAX_PATH + 1];
-      while (gzgets (fp, buf, MAX_PATH))
-	{
-	  char *lastchar = strchr(buf, '\n');
-	  if (lastchar[-1] != '/')
-	    printf ("%s/%s", (verbose?"    ":""), buf);
-	}
-
-      gzclose (fp);
-    }
-
-  free (packages);
-
-  return;
-}
-
-void
-package_find (int verbose, char **argv)
-{
-  pkgver *packages = get_packages(NULL);
-  if (packages == NULL)
-    {
-      puts ("No setup information found");
-      return;
-    }
-
-  for (int i = 0; packages[i].name; i++)
-    {
-      gzFile fp = open_package_list (packages[i].name);
-      if (!fp)
-	continue;
-
-      char buf[MAX_PATH + 2];
-      buf[0] = '/';
-      while (gzgets (fp, buf + 1, MAX_PATH))
-	{
-	  char *filename = strtok(buf, "\n");
-	  int flen = strlen (filename);
-	  if (filename[flen - 1] != '/')
-	    {
-	      // FIXME: verify that /bin is mounted on /usr/bin; ditto for /lib
-	      bool is_alias = !strncmp(filename, "/usr/bin/", 9) ||
-			      !strncmp(filename, "/usr/lib", 9);
-	      int a = match_argv (argv, filename);
-	      if (!a && is_alias)
-		a = match_argv (argv, filename + 4);
-	      if (!a && !strcmp(filename + flen - 4, ".exe"))
-		{
-		  filename[flen - 4] = '\0';
-		  a = match_argv (argv, filename);
-		}
-	      if (!a && is_alias)
-		a = match_argv (argv, filename + 4);
-	      if (a > 0)
-		{
-		  if (verbose)
-		    printf ("%s: found in package ", filename);
-		  printf ("%s-%s\n", packages[i].name, packages[i].ver);
-		}
-	    }
-	}
-
-      gzclose (fp);
-    }
-
-  free (packages);
-
-  return;
-}
-
diff --git a/winsup/utils/dumper.cc b/winsup/utils/dumper.cc
deleted file mode 100644
index 5a9beec93..000000000
--- a/winsup/utils/dumper.cc
+++ /dev/null
@@ -1,881 +0,0 @@
-/* dumper.cc
-
-   Copyright 1999, 2001, 2002 Red Hat Inc.
-
-   Written by Egor Duda <deo@logos-m.ru>
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include <bfd.h>
-#include <elf/common.h>
-#include <elf/external.h>
-#include <sys/procfs.h>
-#include <sys/cygwin.h>
-#include <getopt.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <windows.h>
-
-#include "dumper.h"
-
-#define NOTE_NAME_SIZE 16
-
-typedef struct _note_header
-  {
-    Elf_External_Note elf_note_header;
-    char name[NOTE_NAME_SIZE - 1];	/* external note contains first byte of data */
-  }
-#ifdef __GNUC__
-__attribute__ ((packed))
-#endif
-  note_header;
-
-static const char version[] = "$Revision$";
-
-BOOL verbose = FALSE;
-
-int deb_printf (const char *format,...)
-{
-  if (!verbose)
-    return 0;
-  va_list va;
-  va_start (va, format);
-  int ret_val = vprintf (format, va);
-  va_end (va);
-  return ret_val;
-}
-
-dumper::dumper (DWORD pid, DWORD tid, const char *file_name)
-{
-  this->file_name = strdup (file_name);
-
-  this->pid = pid;
-  this->tid = tid;
-  core_bfd = NULL;
-  excl_list = new exclusion (20);
-
-  list = last = NULL;
-
-  status_section = NULL;
-
-  memory_num = module_num = thread_num = 0;
-
-  hProcess = OpenProcess (PROCESS_ALL_ACCESS,
-			  FALSE,	/* no inheritance */
-			  pid);
-  if (!hProcess)
-    {
-      fprintf (stderr, "Failed to open process #%lu, error %ld\n", pid, GetLastError ());
-      return;
-    }
-
-  init_core_dump ();
-
-  if (!sane ())
-    dumper_abort ();
-}
-
-dumper::~dumper ()
-{
-  close ();
-  free (file_name);
-}
-
-void
-dumper::dumper_abort ()
-{
-  close ();
-  unlink (file_name);
-}
-
-void
-dumper::close ()
-{
-  if (core_bfd)
-    bfd_close (core_bfd);
-  if (excl_list)
-    delete excl_list;
-  if (hProcess)
-    CloseHandle (hProcess);
-  core_bfd = NULL;
-  hProcess = NULL;
-  excl_list = NULL;
-}
-
-int
-dumper::sane ()
-{
-  if (hProcess == NULL || core_bfd == NULL || excl_list == NULL)
-    return 0;
-  return 1;
-}
-
-void
-print_section_name (bfd* abfd, asection* sect, PTR obj)
-{
-  deb_printf (" %s", bfd_get_section_name (abfd, sect));
-}
-
-void
-dumper::print_core_section_list ()
-{
-  deb_printf ("current sections:");
-  bfd_map_over_sections (core_bfd, &print_section_name, NULL);
-  deb_printf ("\n");
-}
-
-process_entity *
-dumper::add_process_entity_to_list (process_entity_type type)
-{
-  if (!sane ())
-    return NULL;
-
-  process_entity *new_entity = (process_entity *) malloc (sizeof (process_entity));
-  if (new_entity == NULL)
-    return NULL;
-  new_entity->next = NULL;
-  new_entity->section = NULL;
-  if (last == NULL)
-    list = new_entity;
-  else
-    last->next = new_entity;
-  last = new_entity;
-  return new_entity;
-}
-
-int
-dumper::add_thread (DWORD tid, HANDLE hThread)
-{
-  if (!sane ())
-    return 0;
-
-  CONTEXT *pcontext;
-
-  process_entity *new_entity = add_process_entity_to_list (pr_ent_thread);
-  if (new_entity == NULL)
-    return 0;
-  new_entity->type = pr_ent_thread;
-  thread_num++;
-
-  new_entity->u.thread.tid = tid;
-  new_entity->u.thread.hThread = hThread;
-
-  pcontext = &(new_entity->u.thread.context);
-  pcontext->ContextFlags = CONTEXT_FULL | CONTEXT_FLOATING_POINT;
-  if (!GetThreadContext (hThread, pcontext))
-    {
-      deb_printf ("Failed to read thread context (tid=%x), error %ld\n", tid, GetLastError ());
-      return 0;
-    }
-
-  deb_printf ("added thread %u\n", tid);
-  return 1;
-}
-
-int
-dumper::add_mem_region (LPBYTE base, DWORD size)
-{
-  if (!sane ())
-    return 0;
-
-  if (base == NULL || size == 0)
-    return 1;			// just ignore empty regions
-
-  process_entity *new_entity = add_process_entity_to_list (pr_ent_memory);
-  if (new_entity == NULL)
-    return 0;
-  new_entity->type = pr_ent_memory;
-  memory_num++;
-
-  new_entity->u.memory.base = base;
-  new_entity->u.memory.size = size;
-
-  deb_printf ("added memory region %08x-%08x\n", (DWORD) base, (DWORD) base + size);
-  return 1;
-}
-
-/* split_add_mem_region scans list of regions to be excluded from dumping process
-   (excl_list) and removes all "excluded" parts from given region. */
-int
-dumper::split_add_mem_region (LPBYTE base, DWORD size)
-{
-  if (!sane ())
-    return 0;
-
-  if (base == NULL || size == 0)
-    return 1;			// just ignore empty regions
-
-  LPBYTE last_base = base;
-
-  for (process_mem_region * p = excl_list->region;
-       p < excl_list->region + excl_list->last;
-       p++)
-    {
-      if (p->base >= base + size || p->base + p->size <= base)
-	continue;
-
-      if (p->base <= base)
-	{
-	  last_base = p->base + p->size;
-	  continue;
-	}
-
-      add_mem_region (last_base, p->base - last_base);
-      last_base = p->base + p->size;
-    }
-
-  if (last_base < base + size)
-    add_mem_region (last_base, base + size - last_base);
-
-  return 1;
-}
-
-int
-dumper::add_module (LPVOID base_address)
-{
-  if (!sane ())
-    return 0;
-
-  char *module_name = psapi_get_module_name (hProcess, (DWORD) base_address);
-  if (module_name == NULL)
-    return 1;
-
-  process_entity *new_entity = add_process_entity_to_list (pr_ent_module);
-  if (new_entity == NULL)
-    return 0;
-  new_entity->type = pr_ent_module;
-  module_num++;
-
-  new_entity->u.module.base_address = base_address;
-  new_entity->u.module.name = module_name;
-
-  parse_pe (module_name, excl_list);
-
-  deb_printf ("added module %08x %s\n", base_address, module_name);
-  return 1;
-}
-
-#define PAGE_BUFFER_SIZE 4096
-
-int
-dumper::collect_memory_sections ()
-{
-  if (!sane ())
-    return 0;
-
-  LPBYTE current_page_address;
-  LPBYTE last_base = (LPBYTE) 0xFFFFFFFF;
-  DWORD last_size = 0;
-  DWORD done;
-
-  char mem_buf[PAGE_BUFFER_SIZE];
-
-  MEMORY_BASIC_INFORMATION mbi;
-
-  if (hProcess == NULL)
-    return 0;
-
-  for (current_page_address = 0; current_page_address < (LPBYTE) 0xFFFF0000;)
-    {
-      if (!VirtualQueryEx (hProcess, current_page_address, &mbi, sizeof (mbi)))
-	break;
-
-      int skip_region_p = 0;
-
-      if (mbi.Protect & (PAGE_NOACCESS | PAGE_GUARD) ||
-	  mbi.State != MEM_COMMIT)
-	skip_region_p = 1;
-
-      if (!skip_region_p)
-	{
-	  /* just to make sure that later we'll be able to read it.
-	     According to MS docs either region is all-readable or
-	     all-nonreadable */
-	  if (!ReadProcessMemory (hProcess, current_page_address, mem_buf, sizeof (mem_buf), &done))
-	    {
-	      DWORD err = GetLastError ();
-	      const char *pt[10];
-	      pt[0] = (mbi.Protect & PAGE_READONLY) ? "RO " : "";
-	      pt[1] = (mbi.Protect & PAGE_READWRITE) ? "RW " : "";
-	      pt[2] = (mbi.Protect & PAGE_WRITECOPY) ? "WC " : "";
-	      pt[3] = (mbi.Protect & PAGE_EXECUTE) ? "EX " : "";
-	      pt[4] = (mbi.Protect & PAGE_EXECUTE_READ) ? "EXRO " : "";
-	      pt[5] = (mbi.Protect & PAGE_EXECUTE_READWRITE) ? "EXRW " : "";
-	      pt[6] = (mbi.Protect & PAGE_EXECUTE_WRITECOPY) ? "EXWC " : "";
-	      pt[7] = (mbi.Protect & PAGE_GUARD) ? "GRD " : "";
-	      pt[8] = (mbi.Protect & PAGE_NOACCESS) ? "NA " : "";
-	      pt[9] = (mbi.Protect & PAGE_NOCACHE) ? "NC " : "";
-	      char buf[10 * 6];
-	      buf[0] = '\0';
-	      for (int i = 0; i < 10; i++)
-		strcat (buf, pt[i]);
-
-	      deb_printf ("warning: failed to read memory at %08x-%08x (protect = %s), error %ld.\n",
-			  (DWORD) current_page_address,
-			  (DWORD) current_page_address + mbi.RegionSize,
-			  buf, err);
-	      skip_region_p = 1;
-	    }
-	}
-
-      if (!skip_region_p)
-	{
-	  if (last_base + last_size == current_page_address)
-	    last_size += mbi.RegionSize;
-	  else
-	    {
-	      split_add_mem_region (last_base, last_size);
-	      last_base = (LPBYTE) mbi.BaseAddress;
-	      last_size = mbi.RegionSize;
-	    }
-	}
-      else
-	{
-	  split_add_mem_region (last_base, last_size);
-	  last_base = NULL;
-	  last_size = 0;
-	}
-
-      current_page_address += mbi.RegionSize;
-    }
-
-  /* dump last sections, if any */
-  split_add_mem_region (last_base, last_size);
-  return 1;
-};
-
-int
-dumper::dump_memory_region (asection * to, process_mem_region * memory)
-{
-  if (!sane ())
-    return 0;
-
-  DWORD size = memory->size;
-  DWORD todo;
-  DWORD done;
-  LPBYTE pos = memory->base;
-  DWORD sect_pos = 0;
-
-  if (to == NULL || memory == NULL)
-    return 0;
-
-  char mem_buf[PAGE_BUFFER_SIZE];
-
-  while (size > 0)
-    {
-      todo = min (size, PAGE_BUFFER_SIZE);
-      if (!ReadProcessMemory (hProcess, pos, mem_buf, todo, &done))
-	{
-	  deb_printf ("Failed to read process memory at %x(%x), error %ld\n", pos, todo, GetLastError ());
-	  return 0;
-	}
-      size -= done;
-      pos += done;
-      if (!bfd_set_section_contents (core_bfd, to, mem_buf, sect_pos, done))
-	{
-	  bfd_perror ("writing memory region to bfd");
-	  dumper_abort ();
-	  return 0;
-	};
-      sect_pos += done;
-    }
-  return 1;
-}
-
-int
-dumper::dump_thread (asection * to, process_thread * thread)
-{
-  if (!sane ())
-    return 0;
-
-  if (to == NULL || thread == NULL)
-    return 0;
-
-  win32_pstatus thread_pstatus;
-
-  note_header header;
-  bfd_putl32 (NOTE_NAME_SIZE, header.elf_note_header.namesz);
-  bfd_putl32 (sizeof (thread_pstatus), header.elf_note_header.descsz);
-  bfd_putl32 (NT_WIN32PSTATUS, header.elf_note_header.type);
-  strncpy ((char *) &header.elf_note_header.name, "win32thread", NOTE_NAME_SIZE);
-
-  thread_pstatus.data_type = NOTE_INFO_THREAD;
-  thread_pstatus.data.thread_info.tid = thread->tid;
-
-  if (tid == 0)
-    {
-      /* this is a special case. we don't know, which thread
-         was active when exception occured, so let's blame
-         the first one */
-      thread_pstatus.data.thread_info.is_active_thread = TRUE;
-      tid = (DWORD) - 1;
-    }
-  else if (tid > 0 && thread->tid == tid)
-    thread_pstatus.data.thread_info.is_active_thread = TRUE;
-  else
-    thread_pstatus.data.thread_info.is_active_thread = FALSE;
-
-  memcpy (&(thread_pstatus.data.thread_info.thread_context),
-	  &(thread->context),
-	  sizeof (thread->context));
-
-  if (!bfd_set_section_contents (core_bfd, to, &header,
-				 0,
-				 sizeof (header)) ||
-      !bfd_set_section_contents (core_bfd, to, &thread_pstatus,
-				 sizeof (header),
-				 sizeof (thread_pstatus)))
-    {
-      bfd_perror ("writing thread info to bfd");
-      dumper_abort ();
-      return 0;
-    };
-  return 1;
-}
-
-int
-dumper::dump_module (asection * to, process_module * module)
-{
-  if (!sane ())
-    return 0;
-
-  if (to == NULL || module == NULL)
-    return 0;
-
-  struct win32_pstatus *module_pstatus_ptr;
-
-  int note_length = sizeof (struct win32_pstatus) + strlen (module->name);
-
-  char *buf = (char *) malloc (note_length);
-
-  if (!buf)
-    {
-      fprintf (stderr, "Error alloating memory. Dumping aborted.\n");
-      goto out;
-    };
-
-  module_pstatus_ptr = (struct win32_pstatus *) buf;
-
-  note_header header;
-  bfd_putl32 (NOTE_NAME_SIZE, header.elf_note_header.namesz);
-  bfd_putl32 (note_length, header.elf_note_header.descsz);
-  bfd_putl32 (NT_WIN32PSTATUS, header.elf_note_header.type);
-  strncpy ((char *) &header.elf_note_header.name, "win32module", NOTE_NAME_SIZE);
-
-  module_pstatus_ptr->data_type = NOTE_INFO_MODULE;
-  module_pstatus_ptr->data.module_info.base_address = module->base_address;
-  module_pstatus_ptr->data.module_info.module_name_size = strlen (module->name) + 1;
-  strcpy (module_pstatus_ptr->data.module_info.module_name, module->name);
-
-  if (!bfd_set_section_contents (core_bfd, to, &header,
-				 0,
-				 sizeof (header)) ||
-      !bfd_set_section_contents (core_bfd, to, module_pstatus_ptr,
-				 sizeof (header),
-				 note_length))
-    {
-      bfd_perror ("writing module info to bfd");
-      goto out;
-    };
-  return 1;
-
-out:
-  if (buf)
-    free (buf);
-  dumper_abort ();
-  return 0;
-
-}
-
-int
-dumper::collect_process_information ()
-{
-  int exception_level = 0;
-
-  if (!sane ())
-    return 0;
-
-  if (!DebugActiveProcess (pid))
-    {
-      fprintf (stderr, "Cannot attach to process #%lu, error %ld", pid, GetLastError ());
-      return 0;
-    }
-
-  char event_name[sizeof ("cygwin_error_start_event") + 20];
-  sprintf (event_name, "cygwin_error_start_event%16lx", pid);
-  HANDLE sync_with_debugee = OpenEvent (EVENT_MODIFY_STATE, FALSE, event_name);
-
-  DEBUG_EVENT current_event;
-
-  while (1)
-    {
-      if (!WaitForDebugEvent (&current_event, 20000))
-	return 0;
-
-      deb_printf ("got debug event %d\n", current_event.dwDebugEventCode);
-
-      switch (current_event.dwDebugEventCode)
-	{
-	case CREATE_THREAD_DEBUG_EVENT:
-
-	  if (!add_thread (current_event.dwThreadId,
-			   current_event.u.CreateThread.hThread))
-	    goto failed;
-
-	  break;
-
-	case CREATE_PROCESS_DEBUG_EVENT:
-
-	  if (!add_module (current_event.u.CreateProcessInfo.lpBaseOfImage) ||
-	      !add_thread (current_event.dwThreadId,
-			   current_event.u.CreateProcessInfo.hThread))
-	    goto failed;
-
-	  break;
-
-	case EXIT_PROCESS_DEBUG_EVENT:
-
-	  deb_printf ("debugee quits");
-	  ContinueDebugEvent (current_event.dwProcessId,
-			      current_event.dwThreadId,
-			      DBG_CONTINUE);
-
-	  return 1;
-
-	  break;
-
-	case LOAD_DLL_DEBUG_EVENT:
-
-	  if (!add_module (current_event.u.LoadDll.lpBaseOfDll))
-	    goto failed;
-
-	  break;
-
-	case EXCEPTION_DEBUG_EVENT:
-
-	  exception_level++;
-	  if (exception_level == 2)
-	    break;
-	  else if (exception_level > 2)
-	    return 0;
-
-	  collect_memory_sections ();
-
-	  /* got all info. time to dump */
-
-	  if (!prepare_core_dump ())
-	    {
-	      fprintf (stderr, "Failed to prepare core dump\n");
-	      goto failed;
-	    };
-
-	  if (!write_core_dump ())
-	    {
-	      fprintf (stderr, "Failed to write core dump\n");
-	      goto failed;
-	    };
-
-	  /* signal a debugee that we've finished */
-	  if (sync_with_debugee)
-	    SetEvent (sync_with_debugee);
-
-	  break;
-
-	default:
-
-	  break;
-
-	}
-
-      ContinueDebugEvent (current_event.dwProcessId,
-			  current_event.dwThreadId,
-			  DBG_CONTINUE);
-    }
-failed:
-  /* set debugee free */
-  if (sync_with_debugee)
-    SetEvent (sync_with_debugee);
-
-  return 0;
-}
-
-int
-dumper::init_core_dump ()
-{
-  bfd_init ();
-
-  core_bfd = bfd_openw (file_name, "elf32-i386");
-  if (core_bfd == NULL)
-    {
-      bfd_perror ("opening bfd");
-      goto failed;
-    }
-
-  if (!bfd_set_format (core_bfd, bfd_core))
-    {
-      bfd_perror ("setting bfd format");
-      goto failed;
-    }
-
-  if (!bfd_set_arch_mach (core_bfd, bfd_arch_i386, 0))
-    {
-      bfd_perror ("setting bfd architecture");
-      goto failed;
-    }
-
-  return 1;
-
-failed:
-  dumper_abort ();
-  return 0;
-
-}
-
-int
-dumper::prepare_core_dump ()
-{
-  if (!sane ())
-    return 0;
-
-  int sect_no = 0;
-  char sect_name[50];
-
-  flagword sect_flags;
-  DWORD sect_size;
-  bfd_vma sect_vma;
-
-  asection *new_section;
-
-  for (process_entity * p = list; p != NULL; p = p->next)
-    {
-      sect_no++;
-
-      switch (p->type)
-	{
-	case pr_ent_memory:
-	  sprintf (sect_name, ".mem/%u", sect_no);
-	  sect_flags = SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD;
-	  sect_size = p->u.memory.size;
-	  sect_vma = (bfd_vma) (p->u.memory.base);
-
-	  break;
-
-	case pr_ent_thread:
-	  sprintf (sect_name, ".note/%u", sect_no);
-	  sect_flags = SEC_HAS_CONTENTS | SEC_LOAD;
-	  sect_size = sizeof (note_header) + sizeof (struct win32_pstatus);
-	  sect_vma = 0;
-	  break;
-
-	case pr_ent_module:
-	  sprintf (sect_name, ".note/%u", sect_no);
-	  sect_flags = SEC_HAS_CONTENTS | SEC_LOAD;
-	  sect_size = sizeof (note_header) + sizeof (struct win32_pstatus) +
-	    (bfd_size_type) (strlen (p->u.module.name));
-	  sect_vma = 0;
-	  break;
-
-	default:
-	  continue;
-	}
-
-      if (p->type == pr_ent_module && status_section != NULL)
-	{
-	  if (!bfd_set_section_size (core_bfd,
-				     status_section,
-				     status_section->_raw_size + sect_size))
-	    {
-	      bfd_perror ("resizing status section");
-	      goto failed;
-	    };
-	  continue;
-	}
-
-      deb_printf ("creating section (type%u) %s(%u), flags=%08x\n",
-		  p->type, sect_name, sect_size, sect_flags);
-
-      bfd_set_error (bfd_error_no_error);
-      char *buf = strdup (sect_name);
-      new_section = bfd_make_section (core_bfd, buf);
-      if (new_section == NULL)
-	{
-	  if (bfd_get_error () == bfd_error_no_error)
-	    fprintf (stderr, "error creating new section (%s), section already exists.\n", buf);
-	  else
-	    bfd_perror ("creating section");
-	  goto failed;
-	}
-
-      if (!bfd_set_section_flags (core_bfd, new_section, sect_flags) ||
-	  !bfd_set_section_size (core_bfd, new_section, sect_size))
-	{
-	  bfd_perror ("setting section attributes");
-	  goto failed;
-	};
-
-      new_section->vma = sect_vma;
-      new_section->output_section = new_section;
-      new_section->output_offset = 0;
-      p->section = new_section;
-    }
-
-  return 1;
-
-failed:
-  dumper_abort ();
-  return 0;
-}
-
-int
-dumper::write_core_dump ()
-{
-  if (!sane ())
-    return 0;
-
-  for (process_entity * p = list; p != NULL; p = p->next)
-    {
-      if (p->section == NULL)
-	continue;
-
-      deb_printf ("writing section type=%u base=%08x size=%08x flags=%08x\n",
-		  p->type,
-		  p->section->vma,
-		  p->section->_raw_size,
-		  p->section->flags);
-
-      switch (p->type)
-	{
-	case pr_ent_memory:
-	  dump_memory_region (p->section, &(p->u.memory));
-	  break;
-
-	case pr_ent_thread:
-	  dump_thread (p->section, &(p->u.thread));
-	  break;
-
-	case pr_ent_module:
-	  dump_module (p->section, &(p->u.module));
-	  break;
-
-	default:
-	  continue;
-
-	}
-    }
-  return 1;
-}
-
-static void
-usage (FILE *stream, int status)
-{
-  fprintf (stream, "\
-Usage: dumper [OPTION] FILENAME WIN32PID\n\
-Dump core from WIN32PID to FILENAME.core\n\
-\n\
- -d, --verbose  be verbose while dumping\n\
- -h, --help     output help information and exit\n\
- -q, --quiet    be quiet while dumping (default)\n\
- -v, --version  output version information and exit\n\
-");
-  exit (status);
-}
-
-struct option longopts[] = {
-  {"verbose", no_argument, NULL, 'd'},
-  {"help", no_argument, NULL, 'h'},
-  {"quiet", no_argument, NULL, 'q'},
-  {"version", no_argument, 0, 'v'},
-  {0, no_argument, NULL, 0}
-};
-
-static void 
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-dumper (cygwin) %.*s\n\
-Core Dumper for Cygwin\n\
-Copyright 1999, 2001, 2002 Red Hat, Inc.\n", len, v);
-}
-
-int
-main (int argc, char **argv)
-{
-  int opt;
-  const char *p = "";
-  DWORD pid;
-  char win32_name [MAX_PATH];
-
-  while ((opt = getopt_long (argc, argv, "dqhv", longopts, NULL) ) != EOF)
-    switch (opt)
-      {
-      case 'd':
-	verbose = TRUE;
-	break;
-      case 'q':
-	verbose = FALSE;
-	break;
-      case 'h':
-	usage (stdout, 0);
-      case 'v':
-       print_version ();
-       exit (0);
-      default:
-	usage (stderr, 1);
-	break;
-      }
-
-  if (argv && *(argv + optind) && *(argv + optind +1))
-    {
-      *win32_name = '\0';
-      cygwin_conv_to_win32_path (*(argv + optind), win32_name);
-      if ((p = strrchr (win32_name, '\\')))
-	p++;
-      else
-	p = win32_name;
-      pid = strtoul (*(argv + optind + 1), NULL, 10);
-    }
-  else
-    {
-      usage (stderr, 1);
-      return -1;
-    }
-
-  char *core_file = (char *) malloc (strlen (p) + sizeof (".core"));
-  if (!core_file)
-    {
-      fprintf (stderr, "error allocating memory\n");
-      return -1;
-    }
-  sprintf (core_file, "%s.core", p);
-
-  DWORD tid = 0;
-
-  if (verbose)
-    printf ("dumping process #%lu to %s\n", pid, core_file);
-
-  dumper d (pid, tid, core_file);
-  if (!d.sane ())
-    return -1;
-  d.collect_process_information ();
-  free (core_file);
-
-  return 0;
-};
diff --git a/winsup/utils/dumper.h b/winsup/utils/dumper.h
deleted file mode 100644
index 2a1841e78..000000000
--- a/winsup/utils/dumper.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* dumper.h
-
-   Copyright 1999,2001 Red Hat Inc.
-
-   Written by Egor Duda <deo@logos-m.ru>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#ifndef _DUMPER_H_
-#define _DUMPER_H_
-
-#include <windows.h>
-
-typedef struct
-{
-  LPBYTE base;
-  DWORD size;
-} process_mem_region;
-
-typedef struct
-{
-  DWORD tid;
-  HANDLE hThread;
-  CONTEXT context;
-} process_thread;
-
-typedef struct
-{
-  LPVOID base_address;
-  char* name;
-} process_module;
-
-enum process_entity_type
-{
-  pr_ent_memory,
-  pr_ent_thread,
-  pr_ent_module
-};
-
-typedef struct _process_entity
-{
-  process_entity_type type;
-  union
-    {
-      process_thread thread;
-      process_mem_region memory;
-      process_module module;
-    } u;
-  asection* section;
-  struct _process_entity* next;
-} process_entity;
-
-class exclusion
-{
-public:
-  int last;
-  int size;
-  int step;
-  process_mem_region* region;
-
-  exclusion ( int step ) { last = size = 0;
-			   this->step = step;
-			   region = NULL; }
-  ~exclusion () { free ( region ); }
-  int add ( LPBYTE mem_base, DWORD mem_size );
-  int sort_and_check ();
-};
-
-#define PAGE_BUFFER_SIZE 4096
-
-class dumper
-{
-  DWORD pid;
-  DWORD tid; /* thread id of active thread */
-  HANDLE hProcess;
-  process_entity* list;
-  process_entity* last;
-  exclusion* excl_list;
-
-  char* file_name;
-  bfd* core_bfd;
-
-  asection* status_section;
-
-  int memory_num;
-  int module_num;
-  int thread_num;
-
-  void close ();
-  void dumper_abort ();
-
-  process_entity* add_process_entity_to_list ( process_entity_type type );
-  int add_thread ( DWORD tid, HANDLE hThread );
-  int add_mem_region ( LPBYTE base, DWORD size );
-
-  /* break mem_region by excl_list and add add all subregions */
-  int split_add_mem_region ( LPBYTE base, DWORD size );
-
-  int add_module ( LPVOID base_address );
-
-  int collect_memory_sections ();
-  int dump_memory_region ( asection* to, process_mem_region* memory );
-  int dump_thread ( asection* to, process_thread* thread );
-  int dump_module ( asection* to, process_module* module );
-
-public:
-  int sane ();
-
-  int collect_process_information ();
-  void print_core_section_list ();
-
-  dumper ( DWORD pid, DWORD tid, const char* name );
-  ~dumper ();
-
-  int init_core_dump ();
-  int prepare_core_dump ();
-  int write_core_dump ();
-};
-
-extern int deb_printf ( const char* format, ... );
-
-extern char* psapi_get_module_name ( HANDLE hProcess, DWORD BaseAddress );
-
-extern int parse_pe ( const char* file_name, exclusion* excl_list );
-
-extern BOOL verbose;
-
-#endif
diff --git a/winsup/utils/getfacl.c b/winsup/utils/getfacl.c
deleted file mode 100644
index a4a3e0df1..000000000
--- a/winsup/utils/getfacl.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* getfacl.c
-
-   Copyright 2000, 2001, 2002 Red Hat Inc.
-
-   Written by Corinna Vinschen <vinschen@redhat.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <pwd.h>
-#include <grp.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <sys/types.h>
-#include <sys/acl.h>
-#include <sys/stat.h>
-#include <string.h>
-
-static const char version[] = "$Revision$";
-static char *prog_name;
-
-char *
-permstr (mode_t perm)
-{
-  static char pbuf[4];
-
-  pbuf[0] = (perm & S_IROTH) ? 'r' : '-';
-  pbuf[1] = (perm & S_IWOTH) ? 'w' : '-';
-  pbuf[2] = (perm & S_IXOTH) ? 'x' : '-';
-  pbuf[3] = '\0';
-  return pbuf;
-}
-
-const char *
-username (uid_t uid)
-{
-  static char ubuf[256];
-  struct passwd *pw;
-
-  if ((pw = getpwuid (uid)))
-    strcpy (ubuf, pw->pw_name);
-  else
-    sprintf (ubuf, "%lu <unknown>", (unsigned long)uid);
-  return ubuf;
-}
-
-const char *
-groupname (gid_t gid)
-{
-  static char gbuf[256];
-  struct group *gr;
-
-  if ((gr = getgrgid (gid)))
-    strcpy (gbuf, gr->gr_name);
-  else
-    sprintf (gbuf, "%lu <unknown>", (unsigned long)gid);
-  return gbuf;
-}
-
-static void
-usage (FILE * stream)
-{
-  fprintf (stream, "Usage: %s [-adn] FILE [FILE2...]\n"
-            "Display file and directory access control lists (ACLs).\n"
-            "\n"
-            "  -a, --all      display the filename, the owner, the group, and\n"
-            "                 the ACL of the file\n"
-            "  -d, --dir      display the filename, the owner, the group, and\n"
-            "                 the default ACL of the directory, if it exists\n"
-            "  -h, --help     output usage information and exit\n"
-            "  -n, --noname   display user and group IDs instead of names\n"
-            "  -v, --version  output version information and exit\n"
-            "\n"
-            "When multiple files are specified on the command line, a blank\n"
-            "line separates the ACLs for each file.\n", prog_name);
-  if (stream == stdout) 
-    {
-      fprintf (stream, ""
-            "For each argument that is a regular file, special file or\n"
-            "directory, getfacl displays the owner, the group, and the ACL.\n"
-            "For directories getfacl displays additionally the default ACL.\n"
-            "\n"
-            "With no options specified, getfacl displays the filename, the\n"
-            "owner, the group, and both the ACL and the default ACL, if it\n"
-            "exists.\n"
-            "\n"
-            "The format for ACL output is as follows:\n"
-            "     # file: filename\n"
-            "     # owner: name or uid\n"
-            "     # group: name or uid\n"
-            "     user::perm\n"
-            "     user:name or uid:perm\n"
-            "     group::perm\n"
-            "     group:name or gid:perm\n"
-            "     mask:perm\n"
-            "     other:perm\n"
-            "     default:user::perm\n"
-            "     default:user:name or uid:perm\n"
-            "     default:group::perm\n"
-            "     default:group:name or gid:perm\n"
-            "     default:mask:perm\n"
-            "     default:other:perm\n"
-            "\n");
-    }
-}
-
-struct option longopts[] = {
-  {"all", no_argument, NULL, 'a'},
-  {"dir", no_argument, NULL, 'd'},
-  {"help", no_argument, NULL, 'h'},
-  {"noname", no_argument, NULL, 'n'},
-  {"version", no_argument, NULL, 'v'},
-  {0, no_argument, NULL, 0}
-};
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-getfacl (cygwin) %.*s\n\
-ACL Utility\n\
-Copyright (c) 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s\n\
-", len, v, __DATE__);
-}
-
-int
-main (int argc, char **argv)
-{
-  int c, i;
-  int aopt = 0;
-  int dopt = 0;
-  int nopt = 0;
-  int first = 1;
-  struct stat st;
-  aclent_t acls[MAX_ACL_ENTRIES];
-
-  prog_name = strrchr (argv[0], '/');
-  if (prog_name == NULL)
-    prog_name = strrchr (argv[0], '\\');
-  if (prog_name == NULL)
-    prog_name = argv[0];
-  else
-    prog_name++;
-
-  while ((c = getopt_long (argc, argv, "adhnv", longopts, NULL)) != EOF)
-    switch (c)
-      {
-      case 'a':
-	aopt = 1;
-	break;
-      case 'd':
-	dopt = 1;
-	break;
-      case 'h':
-	usage (stdout);
-	return 0;
-      case 'n':
-	nopt = 1;
-	break;
-      case 'v':
-	print_version ();
-	return 0;
-      default:
-	usage (stderr);
-	return 1;
-      }
-  if (optind > argc - 1)
-    {
-      usage (stderr);
-      return 1;
-    }
-  while ((c = optind++) < argc)
-    {
-      if (stat (argv[c], &st))
-	{
-	  perror (argv[0]);
-	  continue;
-	}
-      if (!first)
-	putchar ('\n');
-      first = 0;
-      printf ("# file: %s\n", argv[c]);
-      if (nopt)
-        {
-	  printf ("# owner: %lu\n", (unsigned long)st.st_uid);
-	  printf ("# group: %lu\n", (unsigned long)st.st_gid);
-	}
-      else
-        {
-	  printf ("# owner: %s\n", username (st.st_uid));
-	  printf ("# group: %s\n", groupname (st.st_gid));
-	}
-      if ((c = acl (argv[c], GETACL, MAX_ACL_ENTRIES, acls)) < 0)
-	{
-	  perror (argv[0]);
-	  continue;
-	}
-      for (i = 0; i < c; ++i)
-	{
-	  if (acls[i].a_type & ACL_DEFAULT)
-	    {
-	      if (aopt)
-		continue;
-	      printf ("default:");
-	    }
-	  else if (dopt)
-	    continue;
-	  switch (acls[i].a_type & ~ACL_DEFAULT)
-	    {
-	    case USER_OBJ:
-	      printf ("user::");
-	      break;
-	    case USER:
-	      if (nopt)
-		printf ("user:%lu\n", (unsigned long)acls[i].a_id);
-	      else
-		printf ("user:%s:", username (acls[i].a_id));
-	      break;
-	    case GROUP_OBJ:
-	      printf ("group::");
-	      break;
-	    case GROUP:
-	      if (nopt)
-		printf ("group:%lu\n", (unsigned long)acls[i].a_id);
-	      else
-		printf ("group:%s:", groupname (acls[i].a_id));
-	      break;
-	    case CLASS_OBJ:
-	      printf ("mask:");
-	      break;
-	    case OTHER_OBJ:
-	      printf ("other:");
-	      break;
-	    }
-	  printf ("%s\n", permstr (acls[i].a_perm));
-	}
-    }
-  return 0;
-}
diff --git a/winsup/utils/ipcrm.c b/winsup/utils/ipcrm.c
deleted file mode 100644
index bc17b6ad4..000000000
--- a/winsup/utils/ipcrm.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 1994 Adam Glass
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Adam Glass.
- * 4. The name of the Author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Adam Glass ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Adam Glass BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef __FBSDID
-#define __FBSDID(s)	const char version[] = (s)
-#endif
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/ipcrm/ipcrm.c,v 1.11 2002/09/04 23:29:02 dwmalone Exp $");
-
-#include <ctype.h>
-#include <err.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#ifndef _KERNEL
-#define _KERNEL 1
-#endif
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <sys/sem.h>
-#include <sys/shm.h>
-
-#ifdef __GNUC__
-#define __unused __attribute__((unused))
-#endif
-
-#define IPC_TO_STR(x) (x == 'Q' ? "msq" : (x == 'M' ? "shm" : "sem"))
-#define IPC_TO_STRING(x) (x == 'Q' ? "message queue" : \
-	(x == 'M' ? "shared memory segment" : "semaphore"))
-
-int signaled;
-
-void usage(void);
-int msgrm(key_t, int);
-int shmrm(key_t, int);
-int semrm(key_t, int);
-void not_configured(int);
-
-void usage(void)
-{
-	fprintf(stderr, "%s\n%s\n",
-		"usage: ipcrm [-q msqid] [-m shmid] [-s semid]",
-		"             [-Q msgkey] [-M shmkey] [-S semkey] ...");
-	exit(1);
-}
-
-int msgrm(key_t key, int id)
-{
-    if (key) {
-	id = msgget(key, 0);
-	if (id == -1)
-	    return -1;
-    }
-    return msgctl(id, IPC_RMID, NULL);
-}
-
-int shmrm(key_t key, int id)
-{
-    if (key) {
-	id = shmget(key, 0, 0);
-	if (id == -1)
-	    return -1;
-    }
-    return shmctl(id, IPC_RMID, NULL);
-}
-
-int semrm(key_t key, int id)
-{
-    union semun arg;
-
-    if (key) {
-	id = semget(key, 0, 0);
-	if (id == -1)
-	    return -1;
-    }
-    return semctl(id, 0, IPC_RMID, arg);
-}
-
-void not_configured(int signo __unused)
-{
-    signaled++;
-}
-
-int main(int argc, char *argv[])
-{
-    int c, result, errflg, target_id;
-    key_t target_key;
-
-    errflg = 0;
-    signal(SIGSYS, not_configured);
-    while ((c = getopt(argc, argv, ":q:m:s:Q:M:S:")) != -1) {
-
-	signaled = 0;
-	switch (c) {
-	case 'q':
-	case 'm':
-	case 's':
-	    target_id = atoi(optarg);
-	    if (c == 'q')
-		result = msgrm(0, target_id);
-	    else if (c == 'm')
-		result = shmrm(0, target_id);
-	    else
-		result = semrm(0, target_id);
-	    if (result < 0) {
-		errflg++;
-		if (!signaled)
-		    warn("%sid(%d): ", IPC_TO_STR(toupper(c)), target_id);
-		else
-		    warnx("%ss are not configured in the running kernel",
-			  IPC_TO_STRING(toupper(c)));
-	    }
-	    break;
-	case 'Q':
-	case 'M':
-	case 'S':
-	    target_key = strtoull(optarg, NULL, 10);
-	    if (target_key == IPC_PRIVATE) {
-		warnx("can't remove private %ss", IPC_TO_STRING(c));
-		continue;
-	    }
-	    if (c == 'Q')
-		result = msgrm(target_key, 0);
-	    else if (c == 'M')
-		result = shmrm(target_key, 0);
-	    else
-		result = semrm(target_key, 0);
-	    if (result < 0) {
-		errflg++;
-		if (!signaled)
-		    warn("%ss(%lld): ", IPC_TO_STR(c), target_key);
-		else
-		    warnx("%ss are not configured in the running kernel",
-			  IPC_TO_STRING(c));
-	    }
-	    break;
-	case ':':
-	    fprintf(stderr, "option -%c requires an argument\n", optopt);
-	    usage();
-	case '?':
-	    fprintf(stderr, "unrecognized option: -%c\n", optopt);
-	    usage();
-	}
-    }
-
-    if (optind != argc) {
-	    fprintf(stderr, "unknown argument: %s\n", argv[optind]);
-	    usage();
-    }
-    exit(errflg);
-}
-
diff --git a/winsup/utils/ipcs.c b/winsup/utils/ipcs.c
deleted file mode 100644
index 229330b99..000000000
--- a/winsup/utils/ipcs.c
+++ /dev/null
@@ -1,872 +0,0 @@
-/*
- * Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-#ifndef __FBSDID
-#define __FBSDID(s)	const char version[] = (s)
-#endif
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/ipcs/ipcs.c,v 1.22 2003/10/30 16:52:14 iwasaki Exp $");
-
-#include <assert.h>
-#include <err.h>
-#include <fcntl.h>
-#include <grp.h>
-#ifndef __CYGWIN__
-#include <kvm.h>
-#include <nlist.h>
-#endif /* __CYGWIN__ */
-#include <limits.h>
-#include <paths.h>
-#include <pwd.h>
-#ifdef __CYGWIN__
-#include <grp.h>
-#endif /* __CYGWIN__ */
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#ifndef __CYGWIN__
-#include <sys/proc.h>
-#include <sys/sysctl.h>
-#endif /* __CYGWIN__ */
-#define _KERNEL
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <sys/shm.h>
-#include <sys/msg.h>
-
-/* SysCtlGatherStruct structure. */
-struct scgs_vector {
-	const char *sysctl;
-	off_t offset;
-	size_t size;
-};
-
-int	use_sysctl = 1;
-struct semid_ds	*sema;
-struct seminfo	seminfo;
-struct msginfo	msginfo;
-struct msqid_ds	*msqids;
-struct shminfo	shminfo;
-struct shmid_ds	*shmsegs;
-
-char   *fmt_perm(u_short);
-void	cvt_time(time_t, char *);
-void	sysctlgatherstruct(void *addr, size_t size, struct scgs_vector *vec);
-void	kget(int idx, void *addr, size_t size);
-void	usage(void);
-#ifdef __CYGWIN__
-void help() __attribute__ ((noreturn));
-#endif /* __CYGWIN__ */
-
-#ifdef __CYGWIN__
-#define _POSIX2_LINE_MAX 255
-typedef int kvm_t;
-#define kvm_openfiles(a,b,c,d,e) NULL
-#define kvm_nlist(a,b) -1
-#define kvm_close(a)
-#define kvm_read(a,b,c,d) 0
-#define kvm_geterr(a) ""
-#define sysctlbyname(a,b,c,d,e) -1
-
-struct nlist {
-  const char *n_name;
-  int n_type;
-  int n_value;
-};
-#endif /* __CYGWIN__ */
-
-static struct nlist symbols[] = {
-	{"sema"},
-#define X_SEMA		0
-	{"seminfo"},
-#define X_SEMINFO	1
-	{"msginfo"},
-#define X_MSGINFO	2
-	{"msqids"},
-#define X_MSQIDS	3
-	{"shminfo"},
-#define X_SHMINFO	4
-	{"shmsegs"},
-#define X_SHMSEGS	5
-#ifdef __CYGWIN__
-	{"msgstat"},
-#define X_MSGSTAT	6
-	{"semstat"},
-#define X_SEMSTAT	7
-	{"shmstat"},
-#define X_SHMSTAT	8
-#endif /* __CYGWIN__ */
-	{NULL}
-};
-
-#define	SHMINFO_XVEC				\
-X(shmmax, sizeof(int))				\
-X(shmmin, sizeof(int))				\
-X(shmmni, sizeof(int))				\
-X(shmseg, sizeof(int))				\
-X(shmall, sizeof(int))
-
-#define	SEMINFO_XVEC				\
-X(semmap, sizeof(int))				\
-X(semmni, sizeof(int))				\
-X(semmns, sizeof(int))				\
-X(semmnu, sizeof(int))				\
-X(semmsl, sizeof(int))				\
-X(semopm, sizeof(int))				\
-X(semume, sizeof(int))				\
-X(semusz, sizeof(int))				\
-X(semvmx, sizeof(int))				\
-X(semaem, sizeof(int))
-
-#define	MSGINFO_XVEC				\
-X(msgmax, sizeof(int))				\
-X(msgmni, sizeof(int))				\
-X(msgmnb, sizeof(int))				\
-X(msgtql, sizeof(int))				\
-X(msgssz, sizeof(int))				\
-X(msgseg, sizeof(int))
-
-#define	X(a, b)	{ "kern.ipc." #a, offsetof(TYPEC, a), (b) },
-#define	TYPEC	struct shminfo
-struct scgs_vector shminfo_scgsv[] = { SHMINFO_XVEC { NULL } };
-#undef	TYPEC
-#define	TYPEC	struct seminfo
-struct scgs_vector seminfo_scgsv[] = { SEMINFO_XVEC { NULL } };
-#undef	TYPEC
-#define	TYPEC	struct msginfo
-struct scgs_vector msginfo_scgsv[] = { MSGINFO_XVEC { NULL } };
-#undef	TYPEC
-#undef	X
-
-static kvm_t *kd;
-
-#ifdef __CYGWIN__
-const char *
-user_from_uid (uid_t uid, uid_t dummy)
-{
-  struct passwd *pwd = getpwuid (uid);
-  return pwd ? pwd->pw_name : "???";
-}
-
-const char *
-group_from_gid (gid_t gid, gid_t dummy)
-{
-  struct group *grp = getgrgid (gid);
-  return grp ? grp->gr_name : "???";
-}
-#endif /* __CYGWIN__ */
-
-char   *
-fmt_perm(mode)
-	u_short mode;
-{
-	static char buffer[100];
-
-	buffer[0] = '-';
-	buffer[1] = '-';
-	buffer[2] = ((mode & 0400) ? 'r' : '-');
-	buffer[3] = ((mode & 0200) ? 'w' : '-');
-	buffer[4] = ((mode & 0100) ? 'a' : '-');
-	buffer[5] = ((mode & 0040) ? 'r' : '-');
-	buffer[6] = ((mode & 0020) ? 'w' : '-');
-	buffer[7] = ((mode & 0010) ? 'a' : '-');
-	buffer[8] = ((mode & 0004) ? 'r' : '-');
-	buffer[9] = ((mode & 0002) ? 'w' : '-');
-	buffer[10] = ((mode & 0001) ? 'a' : '-');
-	buffer[11] = '\0';
-	return (&buffer[0]);
-}
-
-void
-cvt_time(t, buf)
-	time_t  t;
-	char   *buf;
-{
-	struct tm *tm;
-
-	if (t == 0) {
-		strcpy(buf, "no-entry");
-	} else {
-		tm = localtime(&t);
-		sprintf(buf, "%2d:%02d:%02d",
-			tm->tm_hour, tm->tm_min, tm->tm_sec);
-	}
-}
-#define	SHMINFO		1
-#define	SHMTOTAL	2
-#define	MSGINFO		4
-#define	MSGTOTAL	8
-#define	SEMINFO		16
-#define	SEMTOTAL	32
-
-#define BIGGEST		1
-#define CREATOR		2
-#define OUTSTANDING	4
-#define PID		8
-#define TIME		16
-#ifdef __CYGWIN__
-#define STATUS		32
-#endif /* __CYGWIN__ */
-
-int
-main(argc, argv)
-	int     argc;
-	char   *argv[];
-{
-	int     display = SHMINFO | MSGINFO | SEMINFO;
-	int     option = 0;
-	char   *core = NULL, *namelist = NULL;
-	char	kvmoferr[_POSIX2_LINE_MAX];  /* Error buf for kvm_openfiles. */
-	int     i;
-
-#ifdef __CYGWIN__
-	while ((i = getopt(argc, argv, "MmQqSsabchoptTu")) != -1)
-#else
-	while ((i = getopt(argc, argv, "MmQqSsabC:cN:optTy")) != -1)
-#endif /* __CYGWIN__ */
-		switch (i) {
-		case 'M':
-			display = SHMTOTAL;
-			break;
-		case 'm':
-			display = SHMINFO;
-			break;
-		case 'Q':
-			display = MSGTOTAL;
-			break;
-		case 'q':
-			display = MSGINFO;
-			break;
-		case 'S':
-			display = SEMTOTAL;
-			break;
-		case 's':
-			display = SEMINFO;
-			break;
-		case 'T':
-			display = SHMTOTAL | MSGTOTAL | SEMTOTAL;
-			break;
-		case 'a':
-			option |= BIGGEST | CREATOR | OUTSTANDING | PID | TIME;
-			break;
-		case 'b':
-			option |= BIGGEST;
-			break;
-#ifndef __CYGWIN__
-		case 'C':
-			core = optarg;
-			break;
-#endif /* __CYGWIN__ */
-		case 'c':
-			option |= CREATOR;
-			break;
-#ifndef __CYGWIN__
-		case 'N':
-			namelist = optarg;
-			break;
-#endif /* __CYGWIN__ */
-		case 'o':
-			option |= OUTSTANDING;
-			break;
-		case 'p':
-			option |= PID;
-			break;
-		case 't':
-			option |= TIME;
-			break;
-#ifdef __CYGWIN__
-		case 'h':
-			help();
-		case 'u':
-			option |= STATUS;
-			break;
-#endif /* __CYGWIN__ */
-#ifndef __CYGWIN__
-		case 'y':
-			use_sysctl = 0;
-			break;
-#endif /* __CYGWIN__ */
-		default:
-			usage();
-		}
-
-	/*
-	 * If paths to the exec file or core file were specified, we
-	 * aren't operating on the running kernel, so we can't use
-	 * sysctl.
-	 */
-	if (namelist != NULL || core != NULL)
-		use_sysctl = 0;
-
-	if (!use_sysctl) {
-		kd = kvm_openfiles(namelist, core, NULL, O_RDONLY, kvmoferr);
-		if (kd == NULL)
-			errx(1, "kvm_openfiles: %s", kvmoferr);
-		switch (kvm_nlist(kd, symbols)) {
-		case 0:
-			break;
-		case -1:
-			errx(1, "unable to read kernel symbol table");
-		default:
-#ifdef notdef		/* they'll be told more civilly later */
-			warnx("nlist failed");
-			for (i = 0; symbols[i].n_name != NULL; i++)
-				if (symbols[i].n_value == 0)
-					warnx("symbol %s not found",
-					    symbols[i].n_name);
-#endif
-			break;
-		}
-	}
-
-	kget(X_MSGINFO, &msginfo, sizeof(msginfo));
-	if ((display & (MSGINFO | MSGTOTAL))) {
-		if (display & MSGTOTAL) {
-			printf("msginfo:\n");
-			printf("\tmsgmax: %8ld\t(max characters in a message)\n",
-			    msginfo.msgmax);
-			printf("\tmsgmni: %8ld\t(# of message queues)\n",
-			    msginfo.msgmni);
-			printf("\tmsgmnb: %8ld\t(max characters in a message queue)\n",
-			    msginfo.msgmnb);
-			printf("\tmsgtql: %8ld\t(max # of messages in system)\n",
-			    msginfo.msgtql);
-			printf("\tmsgssz: %8ld\t(size of a message segment)\n",
-			    msginfo.msgssz);
-			printf("\tmsgseg: %8ld\t(# of message segments in system)\n\n",
-			    msginfo.msgseg);
-		}
-		if (display & MSGINFO) {
-			struct msqid_ds *xmsqids;
-			size_t xmsqids_len;
-
-
-			xmsqids_len = sizeof(struct msqid_ds) * msginfo.msgmni;
-			xmsqids = malloc(xmsqids_len);
-			kget(X_MSQIDS, xmsqids, xmsqids_len);
-
-			printf("Message Queues:\n");
-			printf("T     ID               KEY        MODE       OWNER    GROUP");
-			if (option & CREATOR)
-				printf("  CREATOR   CGROUP");
-			if (option & OUTSTANDING)
-				printf(" CBYTES   QNUM");
-			if (option & BIGGEST)
-				printf(" QBYTES");
-			if (option & PID)
-				printf("  LSPID  LRPID");
-			if (option & TIME)
-				printf("    STIME    RTIME    CTIME");
-			printf("\n");
-			for (i = 0; i < msginfo.msgmni; i += 1) {
-				if (xmsqids[i].msg_qbytes != 0) {
-					char    stime_buf[100], rtime_buf[100],
-					        ctime_buf[100];
-					struct msqid_ds *msqptr = &xmsqids[i];
-
-					cvt_time(msqptr->msg_stime, stime_buf);
-					cvt_time(msqptr->msg_rtime, rtime_buf);
-					cvt_time(msqptr->msg_ctime, ctime_buf);
-
-					printf("q %6d %20llu %s %8s %8s",
-					    IXSEQ_TO_IPCID(i, msqptr->msg_perm),
-					    msqptr->msg_perm.key,
-					    fmt_perm(msqptr->msg_perm.mode),
-					    user_from_uid(msqptr->msg_perm.uid, 0),
-					    group_from_gid(msqptr->msg_perm.gid, 0));
-
-					if (option & CREATOR)
-						printf(" %8s %8s",
-						    user_from_uid(msqptr->msg_perm.cuid, 0),
-						    group_from_gid(msqptr->msg_perm.cgid, 0));
-
-					if (option & OUTSTANDING)
-						printf(" %6lu %6lu",
-						    msqptr->msg_cbytes,
-						    msqptr->msg_qnum);
-
-					if (option & BIGGEST)
-						printf(" %6lu",
-						    msqptr->msg_qbytes);
-
-					if (option & PID)
-						printf(" %6d %6d",
-						    msqptr->msg_lspid,
-						    msqptr->msg_lrpid);
-
-					if (option & TIME)
-						printf(" %s %s %s",
-						    stime_buf,
-						    rtime_buf,
-						    ctime_buf);
-
-					printf("\n");
-				}
-			}
-			printf("\n");
-		}
-#ifdef __CYGWIN__
-		if (option & STATUS) {
-			struct msg_info msg_info;
-			kget(X_MSGSTAT, &msg_info, sizeof msg_info);
-			printf("Message Queue Usage:\n");
-			printf("\tmsg_ids: %7ld\t(no. of allocated queues)\n",
-			    msg_info.msg_ids);
-			printf("\tmsg_num: %7ld\t(no. of messages in system)\n",
-			    msg_info.msg_num);
-			printf("\tmsg_tot: %7ld\t(size in bytes of messages in system)\n",
-			    msg_info.msg_tot);
-			printf("\n");
-		}
-#endif /* __CYGWIN__ */
-	} else
-		if (display & (MSGINFO | MSGTOTAL)) {
-			fprintf(stderr,
-			    "SVID messages facility not configured in the system\n");
-		}
-
-	kget(X_SHMINFO, &shminfo, sizeof(shminfo));
-	if ((display & (SHMINFO | SHMTOTAL))) {
-		if (display & SHMTOTAL) {
-			printf("shminfo:\n");
-			printf("\tshmmax: %8ld\t(max shared memory segment size)\n",
-			    shminfo.shmmax);
-			printf("\tshmmin: %8ld\t(min shared memory segment size)\n",
-			    shminfo.shmmin);
-			printf("\tshmmni: %8ld\t(max number of shared memory identifiers)\n",
-			    shminfo.shmmni);
-			printf("\tshmseg: %8ld\t(max shared memory segments per process)\n",
-			    shminfo.shmseg);
-			printf("\tshmall: %8ld\t(max amount of shared memory in pages)\n\n",
-			    shminfo.shmall);
-		}
-		if (display & SHMINFO) {
-			struct shmid_ds *xshmids;
-			size_t xshmids_len;
-
-			xshmids_len = sizeof(struct shmid_ds) * shminfo.shmmni;
-			xshmids = malloc(xshmids_len);
-			kget(X_SHMSEGS, xshmids, xshmids_len);
-
-			printf("Shared Memory:\n");
-			printf("T     ID               KEY        MODE       OWNER    GROUP");
-			if (option & CREATOR)
-				printf("  CREATOR   CGROUP");
-			if (option & OUTSTANDING)
-				printf(" NATTCH");
-			if (option & BIGGEST)
-				printf("  SEGSZ");
-			if (option & PID)
-				printf("  CPID  LPID");
-			if (option & TIME)
-				printf("    ATIME    DTIME    CTIME");
-			printf("\n");
-			for (i = 0; i < shminfo.shmmni; i += 1) {
-				if (xshmids[i].shm_perm.mode & 0x0800) {
-					char    atime_buf[100], dtime_buf[100],
-					        ctime_buf[100];
-					struct shmid_ds *shmptr = &xshmids[i];
-
-					cvt_time(shmptr->shm_atime, atime_buf);
-					cvt_time(shmptr->shm_dtime, dtime_buf);
-					cvt_time(shmptr->shm_ctime, ctime_buf);
-
-					printf("m %6d %20llu %s %8s %8s",
-					    IXSEQ_TO_IPCID(i, shmptr->shm_perm),
-					    shmptr->shm_perm.key,
-					    fmt_perm(shmptr->shm_perm.mode),
-					    user_from_uid(shmptr->shm_perm.uid, 0),
-					    group_from_gid(shmptr->shm_perm.gid, 0));
-
-					if (option & CREATOR)
-						printf(" %8s %8s",
-						    user_from_uid(shmptr->shm_perm.cuid, 0),
-						    group_from_gid(shmptr->shm_perm.cgid, 0));
-
-					if (option & OUTSTANDING)
-						printf(" %6d",
-						    shmptr->shm_nattch);
-
-					if (option & BIGGEST)
-						printf(" %6d",
-						    shmptr->shm_segsz);
-
-					if (option & PID)
-						printf(" %6d %6d",
-						    shmptr->shm_cpid,
-						    shmptr->shm_lpid);
-
-					if (option & TIME)
-						printf(" %s %s %s",
-						    atime_buf,
-						    dtime_buf,
-						    ctime_buf);
-
-					printf("\n");
-				}
-			}
-			printf("\n");
-		}
-#ifdef __CYGWIN__
-		if (option & STATUS) {
-			struct shm_info shm_info;
-			kget(X_SHMSTAT, &shm_info, sizeof shm_info);
-			printf("Shared Memory Usage:\n");
-			printf("\tshm_ids:  %7ld\t(no. of allocated segments)\n",
-			    shm_info.shm_ids);
-			printf("\tshm_tot:  %7ld\t(size in bytes of allocated segments)\n",
-			    shm_info.shm_tot);
-			printf("\tshm_atts: %7ld\t(no. of attached segments in system)\n",
-			    shm_info.shm_atts);
-			printf("\n");
-		}
-#endif /* __CYGWIN__ */
-	} else
-		if (display & (SHMINFO | SHMTOTAL)) {
-			fprintf(stderr,
-			    "SVID shared memory facility not configured in the system\n");
-		}
-
-	kget(X_SEMINFO, &seminfo, sizeof(seminfo));
-	if ((display & (SEMINFO | SEMTOTAL))) {
-		struct semid_ds *xsema;
-		size_t xsema_len;
-
-		if (display & SEMTOTAL) {
-			printf("seminfo:\n");
-			printf("\tsemmap: %8ld\t(# of entries in semaphore map)\n",
-			    seminfo.semmap);
-			printf("\tsemmni: %8ld\t(# of semaphore identifiers)\n",
-			    seminfo.semmni);
-			printf("\tsemmns: %8ld\t(# of semaphores in system)\n",
-			    seminfo.semmns);
-			printf("\tsemmnu: %8ld\t(# of undo structures in system)\n",
-			    seminfo.semmnu);
-			printf("\tsemmsl: %8ld\t(max # of semaphores per id)\n",
-			    seminfo.semmsl);
-			printf("\tsemopm: %8ld\t(max # of operations per semop call)\n",
-			    seminfo.semopm);
-			printf("\tsemume: %8ld\t(max # of undo entries per process)\n",
-			    seminfo.semume);
-			printf("\tsemusz: %8ld\t(size in bytes of undo structure)\n",
-			    seminfo.semusz);
-			printf("\tsemvmx: %8ld\t(semaphore maximum value)\n",
-			    seminfo.semvmx);
-			printf("\tsemaem: %8ld\t(adjust on exit max value)\n\n",
-			    seminfo.semaem);
-		}
-		if (display & SEMINFO) {
-			xsema_len = sizeof(struct semid_ds) * seminfo.semmni;
-			xsema = malloc(xsema_len);
-			kget(X_SEMA, xsema, xsema_len);
-
-			printf("Semaphores:\n");
-			printf("T     ID               KEY        MODE       OWNER    GROUP");
-			if (option & CREATOR)
-				printf("  CREATOR   CGROUP");
-			if (option & BIGGEST)
-				printf(" NSEMS");
-			if (option & TIME)
-				printf("    OTIME    CTIME");
-			printf("\n");
-			for (i = 0; i < seminfo.semmni; i += 1) {
-				if ((xsema[i].sem_perm.mode & SEM_ALLOC) != 0) {
-					char    ctime_buf[100], otime_buf[100];
-					struct semid_ds *semaptr = &xsema[i];
-
-					cvt_time(semaptr->sem_otime, otime_buf);
-					cvt_time(semaptr->sem_ctime, ctime_buf);
-
-					printf("s %6d %20llu %s %8s %8s",
-					    IXSEQ_TO_IPCID(i, semaptr->sem_perm),
-					    semaptr->sem_perm.key,
-					    fmt_perm(semaptr->sem_perm.mode),
-					    user_from_uid(semaptr->sem_perm.uid, 0),
-					    group_from_gid(semaptr->sem_perm.gid, 0));
-
-					if (option & CREATOR)
-						printf(" %8s %8s",
-						    user_from_uid(semaptr->sem_perm.cuid, 0),
-						    group_from_gid(semaptr->sem_perm.cgid, 0));
-
-					if (option & BIGGEST)
-						printf(" %6d",
-						    semaptr->sem_nsems);
-
-					if (option & TIME)
-						printf(" %s %s",
-						    otime_buf,
-						    ctime_buf);
-
-					printf("\n");
-				}
-			}
-
-			printf("\n");
-		}
-#ifdef __CYGWIN__
-		if (option & STATUS) {
-			struct sem_info sem_info;
-			kget(X_SEMSTAT, &sem_info, sizeof sem_info);
-			printf("Semaphore Usage:\n");
-			printf("\tsem_ids: %7ld\t(no. of allocated semaphore sets)\n",
-			    sem_info.sem_ids);
-			printf("\tsem_num: %7ld\t(no. of allocated semaphores)\n",
-			    sem_info.sem_num);
-			printf("\n");
-		}
-#endif /* __CYGWIN__ */
-	} else
-		if (display & (SEMINFO | SEMTOTAL)) {
-			fprintf(stderr, "SVID semaphores facility not configured in the system\n");
-		}
-	if (!use_sysctl)
-		kvm_close(kd);
-
-	exit(0);
-}
-
-void
-sysctlgatherstruct(addr, size, vecarr)
-	void *addr;
-	size_t size;
-	struct scgs_vector *vecarr;
-{
-	struct scgs_vector *xp;
-	size_t tsiz;
-	int rv;
-
-	for (xp = vecarr; xp->sysctl != NULL; xp++) {
-		assert(xp->offset <= size);
-		tsiz = xp->size;
-		rv = sysctlbyname(xp->sysctl, (char *)addr + xp->offset,
-		    &tsiz, NULL, 0);
-		if (rv == -1)
-			errx(1, "sysctlbyname: %s", xp->sysctl);
-		if (tsiz != xp->size)
-			errx(1, "%s size mismatch (expected %d, got %d)",
-			    xp->sysctl, xp->size, tsiz);
-	}
-}
-
-void
-kget(idx, addr, size)
-	int idx;
-	void *addr;
-	size_t size;
-{
-	const char *symn;			/* symbol name */
-	size_t tsiz;
-	int rv;
-	unsigned long kaddr;
-	const char *sym2sysctl[] = {	/* symbol to sysctl name table */
-		"kern.ipc.sema",
-		"kern.ipc.seminfo",
-		"kern.ipc.msginfo",
-		"kern.ipc.msqids",
-		"kern.ipc.shminfo",
-		"kern.ipc.shmsegs" };
-
-#ifndef __CYGWIN__
-	assert((unsigned)idx <= sizeof(sym2sysctl) / sizeof(*sym2sysctl));
-#endif /* __CYGWIN__ */
-#ifdef __CYGWIN__
-        if (1) {
-		union semun su;
-		switch (idx) {
-		case X_MSGINFO:
-			if (msgctl(0, IPC_INFO, (struct msqid_ds *)addr) < 0)
-			  err(1, "msgctl");
-			break;
-		case X_SEMINFO:
-			su.buf = (struct semid_ds *)addr;
-			if (semctl(0, 0, IPC_INFO, su) < 0)
-			  err(1, "semctl");
-			break;
-			break;
-		case X_SHMINFO:
-			if (shmctl(0, IPC_INFO, (struct shmid_ds *)addr) < 0)
-			  err(1, "shmctl");
-			break;
-		case X_MSQIDS:
-			if (msgctl(size / sizeof(struct msqid_ds), IPC_INFO,
-				   (struct msqid_ds *)addr) < 0)
-			  err(1, "msgctl");
-			break;
-		case X_SEMA:
-			su.buf = (struct semid_ds *)addr;
-			if (semctl(size / sizeof(struct semid_ds), 0,
-				   IPC_INFO, su) < 0)
-			  err(1, "semctl");
-			break;
-		case X_SHMSEGS:
-			if (shmctl(size / sizeof(struct shmid_ds), IPC_INFO,
-				   (struct shmid_ds *)addr) < 0)
-			  err(1, "shmctl");
-			break;
-		case X_MSGSTAT:
-			if (msgctl(0, MSG_INFO, (struct msqid_ds *)addr) < 0)
-			  err(1, "msgctl");
-			break;
-		case X_SEMSTAT:
-			su.buf = (struct semid_ds *)addr;
-			if (semctl(0, 0, SEM_INFO, su) < 0)
-			  err(1, "semctl");
-			break;
-			break;
-		case X_SHMSTAT:
-			if (shmctl(0, SHM_INFO, (struct shmid_ds *)addr) < 0)
-			  err(1, "shmctl");
-			break;
-		}
-	} else
-#endif /* __CYGWIN__ */
-	if (!use_sysctl) {
-		symn = symbols[idx].n_name;
-		if (*symn == '_')
-			symn++;
-		if (symbols[idx].n_type == 0 || symbols[idx].n_value == 0)
-			errx(1, "symbol %s undefined", symn);
-		/*
-		 * For some symbols, the value we retreieve is
-		 * actually a pointer; since we want the actual value,
-		 * we have to manually dereference it.
-		 */
-		switch (idx) {
-		case X_MSQIDS:
-			tsiz = sizeof(msqids);
-			rv = kvm_read(kd, symbols[idx].n_value,
-			    &msqids, tsiz);
-			kaddr = (u_long)msqids;
-			break;
-		case X_SHMSEGS:
-			tsiz = sizeof(shmsegs);
-			rv = kvm_read(kd, symbols[idx].n_value,
-			    &shmsegs, tsiz);
-			kaddr = (u_long)shmsegs;
-			break;
-		case X_SEMA:
-			tsiz = sizeof(sema);
-			rv = kvm_read(kd, symbols[idx].n_value,
-			    &sema, tsiz);
-			kaddr = (u_long)sema;
-			break;
-		default:
-			rv = tsiz = 0;
-			kaddr = symbols[idx].n_value;
-			break;
-		}
-		if ((unsigned)rv != tsiz)
-			errx(1, "%s: %s", symn, kvm_geterr(kd));
-		if ((unsigned)kvm_read(kd, kaddr, addr, size) != size)
-			errx(1, "%s: %s", symn, kvm_geterr(kd));
-	} else {
-		switch (idx) {
-		case X_SHMINFO:
-			sysctlgatherstruct(addr, size, shminfo_scgsv);
-			break;
-		case X_SEMINFO:
-			sysctlgatherstruct(addr, size, seminfo_scgsv);
-			break;
-		case X_MSGINFO:
-			sysctlgatherstruct(addr, size, msginfo_scgsv);
-			break;
-		default:
-			tsiz = size;
-			rv = sysctlbyname(sym2sysctl[idx], addr, &tsiz,
-			    NULL, 0);
-			if (rv == -1)
-				err(1, "sysctlbyname: %s", sym2sysctl[idx]);
-			if (tsiz != size)
-				errx(1, "%s size mismatch "
-				    "(expected %d, got %d)",
-				    sym2sysctl[idx], size, tsiz);
-			break;
-		}
-	}
-}
-
-void
-usage()
-{
-
-	fprintf(stderr,
-#ifdef __CYGWIN__
-	    "usage: ipcs [-abchmopqstuMQST]\n"
-	    "Try `ipcs -h' for more information.\n");
-#else
-	    "usage: ipcs [-abcmopqstyMQST] [-C corefile] [-N namelist]\n");
-#endif /* __CYGWIN__ */
-	exit(1);
-}
-
-#ifdef __CYGWIN__
-void
-help()
-{	puts(
-"usage: ipcs [-abchmopqstuMQST]\n"
-"ipcs prints information for IPC resources for which you have read access.\n"
-"  -a   Show the maximum amount of information possible when displaying\n"
-"       active semaphores, message queues and shared memory segments\n"
-"       (This is shorthand for specifying -bcopt).\n"
-"  -b   Show the maximum allowed sizes for active semaphores, message queues\n"
-"       and shared memory segments.  The maximum allowed size is the maximum\n"
-"       number of bytes in a message on a message queue, the size of a shared\n"
-"       memory segment, or the number of semaphores in a set of semaphores.\n"
-"  -c   Show the creator's name and group for active semaphores, message\n"
-"       queues, and shared memory segments.\n"
-"  -h   This help.\n"
-"  -m   Display information about active shared memory segments.\n"
-"  -o   Show outstanding usage for active message queues and shared memory\n"
-"       segments.  The outstanding usage is the number of messages in a\n"
-"       message queue, or the number of processes attached to a shared memory\n"
-"       segment.\n"
-"  -p   Show the process ID information for active semaphores, message queues\n"
-"       and shared memory segments.  The process ID information is the last\n"
-"       process to send a message to or receive a message from a message\n"
-"       queue, the process that created a semaphore, or the last process to\n"
-"       attach or detach a shared memory segment.\n"
-"  -q   Display information about active message queues.\n"
-"  -s   Display information about active semaphores.\n"
-"  -t   Show access times for active semaphores, message queues and shared\n"
-"  -u   Show system wide usage of IPC resources.  This information is added\n"
-"       as a list after the appropriate shared memory, messages queue or\n"
-"       semaphore information output\n"
-"  -M   Display system information about shared memory.\n"
-"  -Q   Display system information about messages queues.\n"
-"  -S   Display system information about semaphores.\n"
-"  -T   Display system information about shared memory, message queues and\n"
-"       semaphores.\n");
-	exit(0);
-}
-#endif /* __CYGWIN__ */
diff --git a/winsup/utils/kill.cc b/winsup/utils/kill.cc
deleted file mode 100644
index a4dba050d..000000000
--- a/winsup/utils/kill.cc
+++ /dev/null
@@ -1,256 +0,0 @@
-/* kill.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-#include <windows.h>
-#include <sys/cygwin.h>
-#include <getopt.h>
-
-static const char version[] = "$Revision$";
-static char *prog_name;
-
-static struct option longopts[] =
-{
-  {"help", no_argument, NULL, 'h' },
-  {"list", optional_argument, NULL, 'l'},
-  {"force", no_argument, NULL, 'f'},
-  {"signal", required_argument, NULL, 's'},
-  {"version", no_argument, NULL, 'v'},
-  {NULL, 0, NULL, 0}
-};
-
-static char opts[] = "hl::fs:v";
-
-extern "C" const char *strsigno (int);
-
-static void
-usage (FILE *where = stderr)
-{
-  fprintf (where , ""
-	"Usage: %s [-f] [-signal] [-s signal] pid1 [pid2 ...]\n"
-	"       %s -l [signal]\n"
-	"Send signals to processes\n"
-	"\n"
-	" -f, --force     force, using win32 interface if necessary\n"
-	" -l, --list      print a list of signal names\n"
-	" -s, --signal    send signal (use %s --list for a list)\n"
-	" -h, --help      output usage information and exit\n"
-	" -v, --version   output version information and exit\n"
-	"", prog_name, prog_name, prog_name);
-  exit (where == stderr ? 1 : 0);
-}
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-%s (cygwin) %.*s\n\
-Process Signaller\n\
-Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s\n\
-", prog_name, len, v, __DATE__);
-}
-
-static int
-getsig (const char *in_sig)
-{
-  const char *sig;
-  char buf[80];
-  int intsig;
-
-  if (strncmp (in_sig, "SIG", 3) == 0)
-    sig = in_sig;
-  else
-    {
-      sprintf (buf, "SIG%s", in_sig);
-      sig = buf;
-    }
-  intsig = strtosigno (sig) ?: atoi (in_sig);
-  char *p;
-  if (!intsig && (strcmp (buf, "SIG0") != 0 && (strtol (in_sig, &p, 10) != 0 || *p)))
-    intsig = -1;
-  return intsig;
-}
-
-static void
-test_for_unknown_sig (int sig, const char *sigstr)
-{
-  if (sig < 0 || sig > NSIG)
-    {
-      fprintf (stderr, "%s: unknown signal: %s\n", prog_name, sigstr);
-      usage ();
-      exit (1);
-    }
-}
-
-static void
-listsig (const char *in_sig)
-{
-  int sig;
-  if (!in_sig)
-    for (sig = 1; sig < NSIG; sig++)
-      printf ("%s%c", strsigno (sig) + 3, (sig < NSIG - 1) ? ' ' : '\n');
-  else
-    {
-      sig = getsig (in_sig);
-      test_for_unknown_sig (sig, in_sig);
-      if (atoi (in_sig) == sig)
-	puts (strsigno (sig) + 3);
-      else
-	printf ("%d\n", sig);
-    }
-}
-
-static void __stdcall
-forcekill (int pid, int sig, int wait)
-{
-  external_pinfo *p = (external_pinfo *) cygwin_internal (CW_GETPINFO_FULL, pid);
-  DWORD dwpid = p ? p->dwProcessId : (DWORD) pid;
-  HANDLE h = OpenProcess (PROCESS_TERMINATE, FALSE, (DWORD) dwpid);
-  if (!h)
-    {
-      fprintf (stderr, "couldn't open pid %u\n", (unsigned) dwpid);
-      return;
-    }
-  if (!wait || WaitForSingleObject (h, 200) != WAIT_OBJECT_0)
-    if (!TerminateProcess (h, sig << 8)
-	&& WaitForSingleObject (h, 200) != WAIT_OBJECT_0)
-      fprintf (stderr, "couldn't kill pid %u, %u\n", (unsigned) dwpid,
-	       (unsigned) GetLastError ());
-  CloseHandle (h);
-}
-
-int
-main (int argc, char **argv)
-{
-  int sig = SIGTERM;
-  int force = 0;
-  int ret = 0;
-  char *gotasig = NULL;
-
-  prog_name = strrchr (argv[0], '/');
-  if (prog_name == NULL)
-    prog_name = strrchr (argv[0], '\\');
-  if (prog_name == NULL)
-    prog_name = argv[0];
-  else
-    prog_name++;
-
-  if (argc == 1)
-    usage ();
-
-  opterr = 0;
-
-  char *p;
-  int pid = 0;
-
-  for (;;)
-    {
-      int ch;
-      char **av = argv + optind;
-      if ((ch = getopt_long (argc, argv, opts, longopts, NULL)) == EOF)
-	break;
-      switch (ch)
-	{
-	case 's':
-	  gotasig = optarg;
-	  sig = getsig (gotasig);
-	  break;
-	case 'l':
-	  if (!optarg)
-	    {
-	      optarg = argv[optind];
-	      if (optarg)
-		{
-		  optind++;
-		  optreset = 1;
-		}
-	    }
-	  if (argv[optind])
-	    usage ();
-	  listsig (optarg);
-	  break;
-	case 'f':
-	  force = 1;
-	  break;
-	case 'h':
-	  usage (stdout);
-	  break;
-	case 'v':
-	  print_version ();
-	  break;
-	case '?':
-	  if (gotasig)
-	    {
-	      pid = strtol (argv[optind], &p, 10);
-	      if (pid < 0)
-		goto out;
-	      usage ();
-	    }
-	  optreset = 1;
-	  optind = 1 + av - argv;
-	  gotasig = *av + 1;
-	  sig = getsig (gotasig);
-	  break;
-	default:
-	  usage ();
-	  break;
-	}
-    }
-
-out:
-  test_for_unknown_sig (sig, gotasig);
-
-  argv += optind;
-  while (*argv != NULL)
-    {
-      if (!pid)
-	pid = strtol (*argv, &p, 10);
-      if (*p != '\0')
-	{
-	  fprintf (stderr, "%s: illegal pid: %s\n", prog_name, *argv);
-	  ret = 1;
-	}
-      else if (kill (pid, sig) == 0)
-	{
-	  if (force)
-	    forcekill (pid, sig, 1);
-	}
-      else if (force && sig != 0)
-	forcekill (pid, sig, 0);
-      else
-	{
-	  char buf[1000];
-	  sprintf (buf, "%s %d", prog_name, pid);
-	  perror (buf);
-	  ret = 1;
-	}
-      argv++;
-      pid = 0;
-    }
-  return ret;
-}
diff --git a/winsup/utils/mkgroup.c b/winsup/utils/mkgroup.c
deleted file mode 100644
index 82039e58c..000000000
--- a/winsup/utils/mkgroup.c
+++ /dev/null
@@ -1,725 +0,0 @@
-/* mkgroup.c:
-
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <stdio.h>
-#include <windows.h>
-#include <sys/cygwin.h>
-#include <getopt.h>
-#include <lmaccess.h>
-#include <lmapibuf.h>
-#include <ntsecapi.h>
-#include <ntdef.h>
-
-static const char version[] = "$Revision$";
-
-SID_IDENTIFIER_AUTHORITY sid_world_auth = {SECURITY_WORLD_SID_AUTHORITY};
-SID_IDENTIFIER_AUTHORITY sid_nt_auth = {SECURITY_NT_AUTHORITY};
-
-NET_API_STATUS WINAPI (*netapibufferfree)(PVOID);
-NET_API_STATUS WINAPI (*netgroupenum)(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI (*netlocalgroupenum)(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI (*netlocalgroupgetmembers)(LPWSTR,LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI (*netgetdcname)(LPWSTR,LPWSTR,PBYTE*);
-NET_API_STATUS WINAPI (*netgroupgetusers)(LPWSTR,LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-
-NTSTATUS NTAPI (*lsaclose)(LSA_HANDLE);
-NTSTATUS NTAPI (*lsaopenpolicy)(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE);
-NTSTATUS NTAPI (*lsaqueryinformationpolicy)(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*);
-NTSTATUS NTAPI (*lsafreememory)(PVOID);
-
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
-#endif
-
-BOOL
-load_netapi ()
-{
-  HANDLE h = LoadLibrary ("netapi32.dll");
-
-  if (!h)
-    return FALSE;
-
-  if (!(netapibufferfree = (void *) GetProcAddress (h, "NetApiBufferFree")))
-    return FALSE;
-  if (!(netgroupenum = (void *) GetProcAddress (h, "NetGroupEnum")))
-    return FALSE;
-  if (!(netgroupgetusers = (void *) GetProcAddress (h, "NetGroupGetUsers")))
-    return FALSE;
-  if (!(netlocalgroupenum = (void *) GetProcAddress (h, "NetLocalGroupEnum")))
-    return FALSE;
-  if (!(netlocalgroupgetmembers = (void *) GetProcAddress (h, "NetLocalGroupGetMembers")))
-    return FALSE;
-  if (!(netgetdcname = (void *) GetProcAddress (h, "NetGetDCName")))
-    return FALSE;
-
-  if (!(h = LoadLibrary ("advapi32.dll")))
-    return FALSE;
-
-  if (!(lsaclose = (void *) GetProcAddress (h, "LsaClose")))
-    return FALSE;
-  if (!(lsaopenpolicy = (void *) GetProcAddress (h, "LsaOpenPolicy")))
-    return FALSE;
-  if (!(lsaqueryinformationpolicy = (void *) GetProcAddress (h, "LsaQueryInformationPolicy")))
-    return FALSE;
-  if (!(lsafreememory = (void *) GetProcAddress (h, "LsaFreeMemory")))
-    return FALSE;
-
-  return TRUE;
-}
-
-char *
-put_sid (PSID sid)
-{
-  static char s[512];
-  char t[32];
-  DWORD i;
-
-  strcpy (s, "S-1-");
-  sprintf(t, "%u", GetSidIdentifierAuthority (sid)->Value[5]);
-  strcat (s, t);
-  for (i = 0; i < *GetSidSubAuthorityCount (sid); ++i)
-    {
-      sprintf(t, "-%lu", *GetSidSubAuthority (sid, i));
-      strcat (s, t);
-    }
-  return s;
-}
-
-void
-psx_dir (char *in, char *out)
-{
-  if (isalpha (in[0]) && in[1] == ':')
-    {
-      sprintf (out, "/cygdrive/%c", in[0]);
-      in += 2;
-      out += strlen (out);
-    }
-
-  while (*in)
-    {
-      if (*in == '\\')
-	*out = '/';
-      else
-	*out = *in;
-      in++;
-      out++;
-    }
-
-  *out = '\0';
-}
-
-void
-uni2ansi (LPWSTR wcs, char *mbs, int size)
-{
-  if (wcs)
-    WideCharToMultiByte (CP_ACP, 0, wcs, -1, mbs, size, NULL, NULL);
-  else
-    *mbs = '\0';
-}
-
-void
-enum_local_users (LPWSTR groupname)
-{
-  LOCALGROUP_MEMBERS_INFO_1 *buf1;
-  DWORD entries = 0;
-  DWORD total = 0;
-  DWORD reshdl = 0;
-
-  if (!netlocalgroupgetmembers (NULL, groupname,
-				1, (void *) &buf1,
-				MAX_PREFERRED_LENGTH,
-				&entries, &total, &reshdl))
-    {
-      unsigned i, first = 1;
-
-      for (i = 0; i < entries; ++i)
-	if (buf1[i].lgrmi1_sidusage == SidTypeUser)
-	  {
-	    char user[256];
-
-	    if (!first)
-	      printf (",");
-	    first = 0;
-	    uni2ansi (buf1[i].lgrmi1_name, user, sizeof (user));
-	    printf ("%s", user);
-	  }
-      netapibufferfree (buf1);
-    }
-}
-
-int
-enum_local_groups (int print_sids, int print_users)
-{
-  LOCALGROUP_INFO_0 *buffer;
-  DWORD entriesread = 0;
-  DWORD totalentries = 0;
-  DWORD resume_handle = 0;
-  DWORD rc;
-
-  do
-    {
-      DWORD i;
-
-      rc = netlocalgroupenum (NULL, 0, (void *) &buffer, 1024,
-			      &entriesread, &totalentries, &resume_handle);
-      switch (rc)
-	{
-	case ERROR_ACCESS_DENIED:
-	  fprintf (stderr, "Access denied\n");
-	  exit (1);
-
-	case ERROR_MORE_DATA:
-	case ERROR_SUCCESS:
-	  break;
-
-	default:
-	  fprintf (stderr, "NetLocalGroupEnum() failed with %ld\n", rc);
-	  exit (1);
-	}
-
-      for (i = 0; i < entriesread; i++)
-	{
-	  char localgroup_name[100];
-	  char domain_name[100];
-	  DWORD domname_len = 100;
-	  char psid_buffer[1024];
-	  PSID psid = (PSID) psid_buffer;
-	  DWORD sid_length = 1024;
-	  DWORD gid;
-	  SID_NAME_USE acc_type;
-	  uni2ansi (buffer[i].lgrpi0_name, localgroup_name, sizeof (localgroup_name));
-
-	  if (!LookupAccountName (NULL, localgroup_name, psid,
-				  &sid_length, domain_name, &domname_len,
-				  &acc_type))
-	    {
-	      fprintf (stderr, "LookupAccountName(%s) failed with %ld\n",
-		       localgroup_name, GetLastError ());
-	      continue;
-	    }
-          else if (acc_type == SidTypeDomain)
-            {
-              char domname[356];
-
-              strcpy (domname, domain_name);
-              strcat (domname, "\\");
-              strcat (domname, localgroup_name);
-              sid_length = 1024;
-              domname_len = 100;
-              if (!LookupAccountName (NULL, domname,
-                                      psid, &sid_length,
-                                      domain_name, &domname_len,
-                                      &acc_type))
-                {
-                  fprintf (stderr,
-                           "LookupAccountName(%s) failed with error %ld\n",
-                           localgroup_name, GetLastError ());
-                  continue;
-                }
-            }
-
-	  gid = *GetSidSubAuthority (psid, *GetSidSubAuthorityCount(psid) - 1);
-
-	  printf ("%s:%s:%ld:", localgroup_name,
-                                print_sids ? put_sid (psid) : "",
-                                gid);
-	  if (print_users)
-	    enum_local_users (buffer[i].lgrpi0_name);
-	  printf ("\n");
-	}
-
-      netapibufferfree (buffer);
-
-    }
-  while (rc == ERROR_MORE_DATA);
-
-  return 0;
-}
-
-void
-enum_users (LPWSTR servername, LPWSTR groupname)
-{
-  GROUP_USERS_INFO_0 *buf1;
-  DWORD entries = 0;
-  DWORD total = 0;
-  DWORD reshdl = 0;
-
-  if (!netgroupgetusers (servername, groupname,
-			 0, (void *) &buf1,
-			 MAX_PREFERRED_LENGTH,
-			 &entries, &total, &reshdl))
-    {
-      unsigned i, first = 1;
-
-      for (i = 0; i < entries; ++i)
-	{
-	  char user[256];
-
-	  if (!first)
-	    printf (",");
-	  first = 0;
-	  uni2ansi (buf1[i].grui0_name, user, sizeof (user));
-	  printf ("%s", user);
-	}
-      netapibufferfree (buf1);
-    }
-}
-
-void
-enum_groups (LPWSTR servername, int print_sids, int print_users, int id_offset)
-{
-  GROUP_INFO_2 *buffer;
-  DWORD entriesread = 0;
-  DWORD totalentries = 0;
-  DWORD resume_handle = 0;
-  DWORD rc;
-  char ansi_srvname[256];
-
-  if (servername)
-    uni2ansi (servername, ansi_srvname, sizeof (ansi_srvname));
-
-  do
-    {
-      DWORD i;
-
-      rc = netgroupenum (servername, 2, (void *) & buffer, 1024,
-		         &entriesread, &totalentries, &resume_handle);
-      switch (rc)
-	{
-	case ERROR_ACCESS_DENIED:
-	  fprintf (stderr, "Access denied\n");
-	  exit (1);
-
-	case ERROR_MORE_DATA:
-	case ERROR_SUCCESS:
-	  break;
-
-	default:
-	  fprintf (stderr, "NetGroupEnum() failed with %ld\n", rc);
-	  exit (1);
-	}
-
-      for (i = 0; i < entriesread; i++)
-	{
-	  char groupname[100];
-	  char domain_name[100];
-	  DWORD domname_len = 100;
-	  char psid_buffer[1024];
-	  PSID psid = (PSID) psid_buffer;
-	  DWORD sid_length = 1024;
-	  SID_NAME_USE acc_type;
-
-	  int gid = buffer[i].grpi2_group_id;
-	  uni2ansi (buffer[i].grpi2_name, groupname, sizeof (groupname));
-          if (print_sids)
-            {
-              if (!LookupAccountName (servername ? ansi_srvname : NULL,
-                                      groupname,
-                                      psid, &sid_length,
-                                      domain_name, &domname_len,
-			              &acc_type))
-                {
-                  fprintf (stderr,
-                           "LookupAccountName (%s, %s) failed with error %ld\n",
-                           servername ? ansi_srvname : "NULL",
-                           groupname,
-                           GetLastError ());
-                  continue;
-                }
-              else if (acc_type == SidTypeDomain)
-                {
-                  char domname[356];
-
-                  strcpy (domname, domain_name);
-                  strcat (domname, "\\");
-                  strcat (domname, groupname);
-                  sid_length = 1024;
-                  domname_len = 100;
-                  if (!LookupAccountName (servername ? ansi_srvname : NULL,
-                                          domname,
-                                          psid, &sid_length,
-                                          domain_name, &domname_len,
-			                  &acc_type))
-                    {
-                      fprintf (stderr,
-                               "LookupAccountName(%s,%s) failed with error %ld\n",
-                               servername ? ansi_srvname : "NULL",
-                               domname,
-                               GetLastError ());
-                      continue;
-                    }
-                }
-            }
-	  printf ("%s:%s:%u:", groupname,
-                               print_sids ? put_sid (psid) : "",
-                               gid + id_offset);
-	  if (print_users)
-	    enum_users (servername, buffer[i].grpi2_name);
-	  printf ("\n");
-	}
-
-      netapibufferfree (buffer);
-
-    }
-  while (rc == ERROR_MORE_DATA);
-}
-
-void
-print_special (int print_sids,
-	       PSID_IDENTIFIER_AUTHORITY auth, BYTE cnt,
-	       DWORD sub1, DWORD sub2, DWORD sub3, DWORD sub4,
-	       DWORD sub5, DWORD sub6, DWORD sub7, DWORD sub8)
-{
-  char name[256], dom[256];
-  DWORD len, len2, rid;
-  PSID sid;
-  SID_NAME_USE use;
-
-  if (AllocateAndInitializeSid (auth, cnt, sub1, sub2, sub3, sub4,
-  				sub5, sub6, sub7, sub8, &sid))
-    {
-      if (LookupAccountSid (NULL, sid,
-			    name, (len = 256, &len),
-			    dom, (len2 = 256, &len),
-			    &use))
-	{
-	  if (sub8)
-	    rid = sub8;
-	  else if (sub7)
-	    rid = sub7;
-	  else if (sub6)
-	    rid = sub6;
-	  else if (sub5)
-	    rid = sub5;
-	  else if (sub4)
-	    rid = sub4;
-	  else if (sub3)
-	    rid = sub3;
-	  else if (sub2)
-	    rid = sub2;
-	  else
-	    rid = sub1;
-	  printf ("%s:%s:%lu:\n", name,
-				 print_sids ? put_sid (sid) : "",
-				 rid);
-        }
-      FreeSid (sid);
-    }
-}
-
-void
-print_win_error(DWORD code)
-{
-  char buf[4096];
-
-  if (FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM
-      | FORMAT_MESSAGE_IGNORE_INSERTS,
-      NULL,
-      code,
-      MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
-      (LPTSTR) buf, sizeof (buf), NULL))
-    fprintf (stderr, "mkgroup: [%lu] %s", code, buf);
-  else
-    fprintf (stderr, "mkgroup: error %lu", code);
-}
-
-void
-current_group (int print_sids, int print_users, int id_offset)
-{
-  char name[UNLEN + 1], *envname, *envdomain;
-  DWORD len;
-  HANDLE ptok;
-  int errpos = 0;
-  struct {
-    PSID psid;
-    int buffer[10];
-  } tg;
-
-
-  if ((!GetUserName (name, (len = sizeof (name), &len)) && (errpos = __LINE__))
-      || !name[0]
-      || !(envname = getenv("USERNAME"))
-      || strcasecmp (envname, name)
-      || (!GetComputerName (name, (len = sizeof (name), &len))
-	  && (errpos = __LINE__))
-      || !(envdomain = getenv("USERDOMAIN"))
-      || !envdomain[0]
-      || !strcasecmp (envdomain, name)
-      || (!OpenProcessToken (GetCurrentProcess (), TOKEN_QUERY, &ptok)
-	  && (errpos = __LINE__))
-      || (!GetTokenInformation (ptok, TokenPrimaryGroup, &tg, sizeof tg, &len)
-	  && (errpos = __LINE__))
-      || (!CloseHandle (ptok) && (errpos = __LINE__)))
-    {
-      if (errpos)
-	{
-	  print_win_error (GetLastError ());
-	  fprintf(stderr, " on line %d\n", errpos);
-	}
-      return;
-    }
-
-  int gid = *GetSidSubAuthority (tg.psid, *GetSidSubAuthorityCount(tg.psid) - 1);
-
-  printf ("mkgroup_l_d:%s:%u:", print_sids ? put_sid (tg.psid) : "",
-                                gid + id_offset);
-  if (print_users)
-    printf("%s", envname);
-  printf ("\n");
-}
-
-int
-usage (FILE * stream, int isNT)
-{
-  fprintf (stream, "Usage: mkgroup [OPTION]... [domain]...\n"
-	           "Print /etc/group file to stdout\n\n"
-	           "Options:\n");
-  if (isNT)
-    fprintf (stream, "   -l,--local             print local group information\n"
-	             "   -c,--current           print current group, if a domain account\n"
-		     "   -d,--domain            print global group information (from current\n"
-	             "                          domain if no domains specified)\n"
-		     "   -o,--id-offset offset  change the default offset (10000) added to gids\n"
-		     "                          in domain accounts.\n"
-		     "   -s,--no-sids           don't print SIDs in pwd field\n"
-		     "                          (this affects ntsec)\n"
-	             "   -u,--users             print user list in gr_mem field\n");
-  fprintf (stream, "   -h,--help              print this message\n"
-	           "   -v,--version           print version information and exit\n\n");
-  if (isNT)
-    fprintf (stream, "One of `-l' or `-d' must be given.\n");
-
-  return 1;
-}
-
-struct option longopts[] = {
-  {"local", no_argument, NULL, 'l'},
-  {"current", no_argument, NULL, 'c'},
-  {"domain", no_argument, NULL, 'd'},
-  {"id-offset", required_argument, NULL, 'o'},
-  {"no-sids", no_argument, NULL, 's'},
-  {"users", no_argument, NULL, 'u'},
-  {"help", no_argument, NULL, 'h'},
-  {"version", no_argument, NULL, 'v'},
-  {0, no_argument, NULL, 0}
-};
-
-char opts[] = "lcdo:suhv";
-
-void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-mkgroup (cygwin) %.*s\n\
-group File Generator\n\
-Copyright 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s\n\
-", len, v, __DATE__);
-}
-
-int
-main (int argc, char **argv)
-{
-  LPWSTR servername;
-  DWORD rc = ERROR_SUCCESS;
-  WCHAR domain_name[100];
-  int print_local = 0;
-  int print_current = 0;
-  int print_domain = 0;
-  int print_sids = 1;
-  int print_users = 0;
-  int domain_specified = 0;
-  int id_offset = 10000;
-  int isNT;
-  int i;
-
-  char name[256], dom[256];
-  DWORD len, len2;
-  char buf[1024];
-  PSID psid = NULL;
-  SID_NAME_USE use;
-
-  LSA_OBJECT_ATTRIBUTES oa = { 0, 0, 0, 0, 0, 0 };
-  LSA_HANDLE lsa = INVALID_HANDLE_VALUE;
-  NTSTATUS ret;
-  PPOLICY_PRIMARY_DOMAIN_INFO pdi;
-
-  isNT = (GetVersion () < 0x80000000);
-
-  if (isNT && argc == 1)
-    return usage(stderr, isNT);
-  else
-    {
-      while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
-	switch (i)
-	{
-	case 'l':
-	  print_local = 1;
-	  break;
-	case 'c':
-	  print_current = 1;
-	  break;
-	case 'd':
-	  print_domain = 1;
-	  break;
-	case 'o':
-	  id_offset = strtol (optarg, NULL, 10);
-	  break;
-	case 's':
-	  print_sids = 0;
-	  break;
-	case 'u':
-	  print_users = 1;
-	  break;
-	case 'h':
-	  usage (stdout, isNT);
-	  return 0;
-	case 'v':
-	  print_version ();
-	  return 0;
-	default:
-	  fprintf (stderr, "Try `%s --help' for more information.\n", argv[0]);
-	  return 1;
-	}
-    }
-
-  /* This takes Windows 9x/ME into account. */
-  if (!isNT)
-    {
-      printf ("all::%ld:\n", DOMAIN_ALIAS_RID_ADMINS);
-      return 0;
-    }
-
-  if (!print_local && !print_domain)
-    {
-      fprintf (stderr, "%s: Specify one of `-l' or `-d'\n", argv[0]);
-      return 1;
-    }
-  if (optind < argc)
-    {
-      if (!print_domain)
-        {
-	  fprintf (stderr, "%s: A domain name is only accepted "
-		   "when `-d' is given.\n", argv[0]);
-	  return 1;
-	}
-      domain_specified = 1;
-    }
-  if (!load_netapi ())
-    {
-      fprintf (stderr, "Failed loading symbols from netapi32.dll "
-      		       "with error %lu\n", GetLastError ());
-      return 1;
-    }
-
-  if (print_local)
-    {
-      /*
-       * Very special feature for the oncoming future:
-       * Create a "root" group account, being actually the local
-       * Administrators group.  Since user name, sid and gid are
-       * fixed, there's no need to call print_special() for this.
-       */
-      printf ("root:S-1-5-32-544:0:\n");
-
-      /*
-       * Get `system' group
-       */
-      print_special (print_sids, &sid_nt_auth, 1, SECURITY_LOCAL_SYSTEM_RID,
-		     0, 0, 0, 0, 0, 0, 0);
-      /*
-       * Get `None' group
-      */
-      len = 256;
-      GetComputerName (name, &len);
-      len = 1024;
-      len2 = 256;
-      if (LookupAccountName (NULL, name, (PSID) buf, &len, dom, &len, &use))
-	psid = (PSID) buf;
-      else
-        {
-	  ret = lsaopenpolicy (NULL, &oa, POLICY_VIEW_LOCAL_INFORMATION, &lsa);
-	  if (ret == STATUS_SUCCESS && lsa != INVALID_HANDLE_VALUE)
-	    {
-	      ret = lsaqueryinformationpolicy (lsa,
-					       PolicyPrimaryDomainInformation,
-					       (void *) &pdi);
-	      if (ret == STATUS_SUCCESS)
-	        {
-		  if (pdi->Sid)
-		    {
-		      CopySid (1024, (PSID) buf, pdi->Sid);
-		      psid = (PSID) buf;
-		    }
-		  lsafreememory (pdi);
-		}
-	      lsaclose (lsa);
-	    }
-	}
-      if (!psid)
-        fprintf (stderr,
-	        "WARNING: Group 513 couldn't get retrieved.  Try mkgroup -d\n");
-      else
-	print_special (print_sids, GetSidIdentifierAuthority (psid), 5,
-				   *GetSidSubAuthority (psid, 0),
-				   *GetSidSubAuthority (psid, 1),
-				   *GetSidSubAuthority (psid, 2),
-				   *GetSidSubAuthority (psid, 3),
-				   513,
-				   0,
-				   0,
-				   0);
-
-      enum_local_groups (print_sids, print_users);
-    }
-
-  i = 1;
-  if (print_domain) 
-    do
-      {
-	if (domain_specified)
-          {
-	    mbstowcs (domain_name, argv[optind], (strlen (argv[optind]) + 1));
-	    rc = netgetdcname (NULL, domain_name, (void *) &servername);
-	  }
-	else
-	  rc = netgetdcname (NULL, NULL, (void *) &servername);
-	
-	if (rc != ERROR_SUCCESS)
-	  {
-	    fprintf (stderr, "Cannot get PDC, code = %ld\n", rc);
-	    return 1;
-	  }
-
-	enum_groups (servername, print_sids, print_users, id_offset * i++);
-	netapibufferfree (servername);	
-      }
-    while (++optind < argc);
-
-  if (print_current && !print_domain)
-    current_group (print_sids, print_users, id_offset);
-
-  return 0;
-}
diff --git a/winsup/utils/mkpasswd.c b/winsup/utils/mkpasswd.c
deleted file mode 100644
index d2493b47d..000000000
--- a/winsup/utils/mkpasswd.c
+++ /dev/null
@@ -1,743 +0,0 @@
-/* mkpasswd.c:
-
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <stdio.h>
-#include <windows.h>
-#include <io.h>
-#include <unistd.h>
-#include <sys/cygwin.h>
-#include <getopt.h>
-#include <lmaccess.h>
-#include <lmapibuf.h>
-#include <sys/fcntl.h>
-#include <lmerr.h>
-#include <lmcons.h>
-
-static const char version[] = "$Revision$";
-
-SID_IDENTIFIER_AUTHORITY sid_world_auth = {SECURITY_WORLD_SID_AUTHORITY};
-SID_IDENTIFIER_AUTHORITY sid_nt_auth = {SECURITY_NT_AUTHORITY};
-
-NET_API_STATUS WINAPI (*netapibufferfree)(PVOID);
-NET_API_STATUS WINAPI (*netuserenum)(LPWSTR,DWORD,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI (*netlocalgroupenum)(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI (*netgetdcname)(LPWSTR,LPWSTR,PBYTE*);
-NET_API_STATUS WINAPI (*netusergetinfo)(LPWSTR,LPWSTR,DWORD,PBYTE*);
-
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
-#endif
-
-BOOL
-load_netapi ()
-{
-  HANDLE h = LoadLibrary ("netapi32.dll");
-
-  if (!h)
-    return FALSE;
-
-  if (!(netapibufferfree = (void *) GetProcAddress (h, "NetApiBufferFree")))
-    return FALSE;
-  if (!(netuserenum = (void *) GetProcAddress (h, "NetUserEnum")))
-    return FALSE;
-  if (!(netlocalgroupenum = (void *) GetProcAddress (h, "NetLocalGroupEnum")))
-    return FALSE;
-  if (!(netgetdcname = (void *) GetProcAddress (h, "NetGetDCName")))
-    return FALSE;
-  if (!(netusergetinfo = (void *) GetProcAddress (h, "NetUserGetInfo")))
-    return FALSE;
-
-  return TRUE;
-}
-
-char *
-put_sid (PSID sid)
-{
-  static char s[512];
-  char t[32];
-  DWORD i;
-
-  strcpy (s, "S-1-");
-  sprintf(t, "%u", GetSidIdentifierAuthority (sid)->Value[5]);
-  strcat (s, t);
-  for (i = 0; i < *GetSidSubAuthorityCount (sid); ++i)
-    {
-      sprintf(t, "-%lu", *GetSidSubAuthority (sid, i));
-      strcat (s, t);
-    }
-  return s;
-}
-
-void
-psx_dir (char *in, char *out)
-{
-  if (isalpha (in[0]) && in[1] == ':')
-    {
-      sprintf (out, "/cygdrive/%c", in[0]);
-      in += 2;
-      out += strlen (out);
-    }
-
-  while (*in)
-    {
-      if (*in == '\\')
-	*out = '/';
-      else
-	*out = *in;
-      in++;
-      out++;
-    }
-
-  *out = '\0';
-}
-
-void
-uni2ansi (LPWSTR wcs, char *mbs, int size)
-{
-  if (wcs)
-    WideCharToMultiByte (CP_ACP, 0, wcs, -1, mbs, size, NULL, NULL);
-  else
-    *mbs = '\0';
-}
-
-void
-print_win_error(DWORD code)
-{
-  char buf[4096];
-
-  if (FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM
-      | FORMAT_MESSAGE_IGNORE_INSERTS,
-      NULL,
-      code,
-      MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
-      (LPTSTR) buf, sizeof (buf), NULL))
-    fprintf (stderr, "mkpasswd: [%lu] %s", code, buf);
-  else
-    fprintf (stderr, "mkpasswd: error %lu", code);
-}
-
-void
-current_user (int print_sids, int print_cygpath,
-	      const char * passed_home_path, int id_offset, const char * disp_username)
-{
-  char name[UNLEN + 1], *envname, *envdomain;
-  DWORD len;
-  HANDLE ptok;
-  int errpos = 0;
-  struct {
-    PSID psid;
-    int buffer[10];
-  } tu, tg;
-
-
-  if ((!GetUserName (name, (len = sizeof (name), &len)) && (errpos = __LINE__))
-      || !name[0]
-      || !(envname = getenv("USERNAME"))
-      || strcasecmp (envname, name)
-      || (disp_username && strcasecmp(envname, disp_username))
-      || (!GetComputerName (name, (len = sizeof (name), &len))
-	  && (errpos = __LINE__))
-      || !(envdomain = getenv("USERDOMAIN"))
-      || !envdomain[0]
-      || !strcasecmp (envdomain, name)
-      || (!OpenProcessToken (GetCurrentProcess (), TOKEN_QUERY, &ptok)
-	  && (errpos = __LINE__))
-      || (!GetTokenInformation (ptok, TokenUser, &tu, sizeof tu, &len)
-	  && (errpos = __LINE__))
-      || (!GetTokenInformation (ptok, TokenPrimaryGroup, &tg, sizeof tg, &len)
-	  && (errpos = __LINE__))
-      || (!CloseHandle (ptok) && (errpos = __LINE__)))
-    {
-      if (errpos)
-	{
-	  print_win_error (GetLastError ());
-	  fprintf(stderr, " on line %d\n", errpos);
-	}
-      return;
-    }
-
-  int uid = *GetSidSubAuthority (tu.psid, *GetSidSubAuthorityCount(tu.psid) - 1);
-  int gid = *GetSidSubAuthority (tg.psid, *GetSidSubAuthorityCount(tg.psid) - 1);
-  char homedir_psx[MAX_PATH] = {0}, homedir_w32[MAX_PATH] = {0};
-
-  char *envhomedrive = getenv ("HOMEDRIVE");
-  char *envhomepath = getenv ("HOMEPATH");
-
-  if (passed_home_path[0] == '\0')
-    {
-      if (envhomepath && envhomepath[0])
-        {
-	  if (envhomedrive)
-	    strlcpy (homedir_w32, envhomedrive, sizeof (homedir_w32));
-	  if (envhomepath[0] != '\\')
-	    strlcat (homedir_w32, "\\", sizeof (homedir_w32));
-	  strlcat (homedir_w32, envhomepath, sizeof (homedir_w32));
-	  if (print_cygpath)
-	    cygwin_conv_to_posix_path (homedir_w32, homedir_psx);
-	  else
-	    psx_dir (homedir_w32, homedir_psx);
-	}
-      else
-        {
-	  strlcpy (homedir_psx, "/home/", sizeof (homedir_psx));
-	  strlcat (homedir_psx, envname, sizeof (homedir_psx));
-	}
-    }
-  else
-    {
-      strlcpy (homedir_psx, passed_home_path, sizeof (homedir_psx));
-      strlcat (homedir_psx, envname, sizeof (homedir_psx));
-    }
-
-  printf ("%s:unused_by_nt/2000/xp:%u:%u:%s%s%s%s%s%s%s%s:%s:/bin/bash\n",
-	  envname,
-	  uid + id_offset,
-	  gid + id_offset,
-	  envname,
-	  print_sids ? "," : "",
-	  print_sids ? "U-" : "",
-	  print_sids ? envdomain : "",
-	  print_sids ? "\\" : "",
-	  print_sids ? envname : "",
-	  print_sids ? "," : "",
-	  print_sids ? put_sid (tu.psid) : "",
-	  homedir_psx);
-}
-
-int
-enum_users (LPWSTR servername, int print_sids, int print_cygpath,
-	    const char * passed_home_path, int id_offset, char *disp_username)
-{
-  USER_INFO_3 *buffer;
-  DWORD entriesread = 0;
-  DWORD totalentries = 0;
-  DWORD resume_handle = 0;
-  DWORD rc;
-  char ansi_srvname[256];
-  WCHAR uni_name[512];
-
-  if (servername)
-    uni2ansi (servername, ansi_srvname, sizeof (ansi_srvname));
-
-  do
-    {
-      DWORD i;
-
-    if (disp_username != NULL)
-      {
-	MultiByteToWideChar (CP_ACP, 0, disp_username, -1, uni_name, 512 );
-	rc = netusergetinfo(servername, (LPWSTR) & uni_name, 3,
-			    (void *) &buffer );
-	entriesread=1;
-      }
-    else 
-      rc = netuserenum (servername, 3, FILTER_NORMAL_ACCOUNT,
-			(void *) &buffer, 1024,
-			&entriesread, &totalentries, &resume_handle);
-      switch (rc)
-	{
-	case ERROR_ACCESS_DENIED:
-	  print_win_error(rc);
-	  exit (1);
-
-	case ERROR_MORE_DATA:
-	case ERROR_SUCCESS:
-	  break;
-
-	default:
-	  print_win_error(rc);
-	  exit (1);
-	}
-
-      for (i = 0; i < entriesread; i++)
-	{
-	  char username[100];
-	  char fullname[100];
-	  char homedir_psx[MAX_PATH];
-	  char homedir_w32[MAX_PATH];
-	  char domain_name[100];
-	  DWORD domname_len = 100;
-	  char psid_buffer[1024];
-	  PSID psid = (PSID) psid_buffer;
-	  DWORD sid_length = 1024;
-	  SID_NAME_USE acc_type;
-
-	  int uid = buffer[i].usri3_user_id;
-	  int gid = buffer[i].usri3_primary_group_id;
-	  uni2ansi (buffer[i].usri3_name, username, sizeof (username));
-	  uni2ansi (buffer[i].usri3_full_name, fullname, sizeof (fullname));
-	  homedir_w32[0] = homedir_psx[0] = '\0';
-	  if (passed_home_path[0] == '\0')
-	    {
-	      uni2ansi (buffer[i].usri3_home_dir, homedir_w32,
-			sizeof (homedir_w32));
-	      if (homedir_w32[0] != '\0')
-		{
-		  if (print_cygpath)
-		    cygwin_conv_to_posix_path (homedir_w32, homedir_psx);
-		  else
-		    psx_dir (homedir_w32, homedir_psx);
-		}
-	      else
-		{
-		  strcpy (homedir_psx, "/home/");
-		  strcat (homedir_psx, username);
-		}
-	    }
-	  else
-	    {
-	      strcpy (homedir_psx, passed_home_path);
-	      strcat (homedir_psx, username);
-	    }
-
-	  if (print_sids)
-	    {
-	      if (!LookupAccountName (servername ? ansi_srvname : NULL,
-				      username,
-				      psid, &sid_length,
-				      domain_name, &domname_len,
-				      &acc_type))
-		{
-	  	  print_win_error(GetLastError ());
-		  continue;
-		}
-	      else if (acc_type == SidTypeDomain)
-		{
-		  char domname[356];
-
-		  strcpy (domname, domain_name);
-		  strcat (domname, "\\");
-		  strcat (domname, username);
-		  sid_length = 1024;
-		  domname_len = 100;
-		  if (!LookupAccountName (servername ? ansi_srvname : NULL,
-					  domname,
-					  psid, &sid_length,
-					  domain_name, &domname_len,
-					  &acc_type))
-		    {
-		      print_win_error(GetLastError ());
-		      continue;
-		    }
-		}
-	    }
-	  printf ("%s:unused_by_nt/2000/xp:%u:%u:%s%s%s%s%s%s%s%s:%s:/bin/bash\n",
-	  	  username,
-		  uid + id_offset,
-		  gid + id_offset,
-		  fullname,
-		  print_sids && fullname[0] ? "," : "",
-		  print_sids ? "U-" : "",
-		  print_sids ? domain_name : "",
-		  print_sids && domain_name[0] ? "\\" : "",
-		  print_sids ? username : "",
-		  print_sids ? "," : "",
-		  print_sids ? put_sid (psid) : "",
-		  homedir_psx);
-	}
-
-      netapibufferfree (buffer);
-
-    }
-  while (rc == ERROR_MORE_DATA);
-
-  return 0;
-}
-
-int
-enum_local_groups (int print_sids)
-{
-  LOCALGROUP_INFO_0 *buffer;
-  DWORD entriesread = 0;
-  DWORD totalentries = 0;
-  DWORD resume_handle = 0;
-  DWORD rc ;
-
-  do
-    {
-      DWORD i;
-
-      rc = netlocalgroupenum (NULL, 0, (void *) &buffer, 1024,
-			      &entriesread, &totalentries, &resume_handle);
-      switch (rc)
-	{
-	case ERROR_ACCESS_DENIED:
-	  print_win_error(rc);
-	  exit (1);
-
-	case ERROR_MORE_DATA:
-	case ERROR_SUCCESS:
-	  break;
-
-	default:
-	  print_win_error(rc);
-	  exit (1);
-	}
-
-      for (i = 0; i < entriesread; i++)
-	{
-	  char localgroup_name[100];
-	  char domain_name[100];
-	  DWORD domname_len = 100;
-	  char psid_buffer[1024];
-	  PSID psid = (PSID) psid_buffer;
-	  DWORD sid_length = 1024;
-	  DWORD gid;
-	  SID_NAME_USE acc_type;
-	  uni2ansi (buffer[i].lgrpi0_name, localgroup_name, sizeof (localgroup_name));
-
-	  if (!LookupAccountName (NULL, localgroup_name, psid,
-				  &sid_length, domain_name, &domname_len,
-				  &acc_type))
-	    {
-	      print_win_error(GetLastError ());
-	      continue;
-	    }
-	  else if (acc_type == SidTypeDomain)
-	    {
-	      char domname[356];
-
-	      strcpy (domname, domain_name);
-	      strcat (domname, "\\");
-	      strcat (domname, localgroup_name);
-	      sid_length = 1024;
-	      domname_len = 100;
-	      if (!LookupAccountName (NULL, domname,
-				      psid, &sid_length,
-				      domain_name, &domname_len,
-				      &acc_type))
-		{
-		  print_win_error(GetLastError ());
-		  continue;
-		}
-	    }
-
-	  gid = *GetSidSubAuthority (psid, *GetSidSubAuthorityCount(psid) - 1);
-
-	  printf ("%s:*:%ld:%ld:%s%s::\n", localgroup_name, gid, gid,
-		  print_sids ? "," : "",
-		  print_sids ? put_sid (psid) : "");
-	}
-
-      netapibufferfree (buffer);
-
-    }
-  while (rc == ERROR_MORE_DATA);
-
-  return 0;
-}
-
-void
-print_special (int print_sids,
-	       PSID_IDENTIFIER_AUTHORITY auth, BYTE cnt,
-	       DWORD sub1, DWORD sub2, DWORD sub3, DWORD sub4,
-	       DWORD sub5, DWORD sub6, DWORD sub7, DWORD sub8)
-{
-  char name[256], dom[256];
-  DWORD len, len2, rid;
-  PSID sid;
-  SID_NAME_USE use;
-
-  if (AllocateAndInitializeSid (auth, cnt, sub1, sub2, sub3, sub4,
-  				sub5, sub6, sub7, sub8, &sid))
-    {
-      if (LookupAccountSid (NULL, sid,
-			    name, (len = 256, &len),
-			    dom, (len2 = 256, &len),
-			    &use))
-	{
-	  if (sub8)
-	    rid = sub8;
-	  else if (sub7)
-	    rid = sub7;
-	  else if (sub6)
-	    rid = sub6;
-	  else if (sub5)
-	    rid = sub5;
-	  else if (sub4)
-	    rid = sub4;
-	  else if (sub3)
-	    rid = sub3;
-	  else if (sub2)
-	    rid = sub2;
-	  else
-	    rid = sub1;
-	  printf ("%s:*:%lu:%lu:%s%s::\n",
-		  name, rid, rid == 18 ? 544 : rid, /* SYSTEM hack */
-		  print_sids ? "," : "",
-		  print_sids ? put_sid (sid) : "");
-        }
-      FreeSid (sid);
-    }
-}
-
-int
-usage (FILE * stream, int isNT)
-{
-  fprintf (stream, "Usage: mkpasswd [OPTION]... [domain]...\n"
-	           "Print /etc/passwd file to stdout\n\n"
-	           "Options:\n");
-  if (isNT)
-    fprintf (stream, "   -l,--local              print local user accounts\n"
-	             "   -c,--current            print current account, if a domain account\n"
-                     "   -d,--domain             print domain accounts (from current domain\n"
-                     "                           if no domains specified)\n"
-                     "   -o,--id-offset offset   change the default offset (10000) added to uids\n"
-                     "                           in domain accounts.\n"
-                     "   -g,--local-groups       print local group information too\n"
-                     "                           if no domain specified\n"
-                     "   -m,--no-mount           don't use mount points for home dir\n"
-                     "   -s,--no-sids            don't print SIDs in GCOS field\n"
-	             "                           (this affects ntsec)\n");
-  fprintf (stream, "   -p,--path-to-home path  use specified path and not user account home dir or /home\n"
-                   "   -u,--username username  only return information for the specified user\n"
-                   "   -h,--help               displays this message\n"
-	           "   -v,--version            version information and exit\n\n");
-  if (isNT)
-    fprintf (stream, "One of `-l', `-d' or `-g' must be given.\n");
-  return 1;
-}
-
-struct option longopts[] = {
-  {"local", no_argument, NULL, 'l'},
-  {"current", no_argument, NULL, 'c'},
-  {"domain", no_argument, NULL, 'd'},
-  {"id-offset", required_argument, NULL, 'o'},
-  {"local-groups", no_argument, NULL, 'g'},
-  {"no-mount", no_argument, NULL, 'm'},
-  {"no-sids", no_argument, NULL, 's'},
-  {"path-to-home", required_argument, NULL, 'p'},
-  {"username", required_argument, NULL, 'u'},
-  {"help", no_argument, NULL, 'h'},
-  {"version", no_argument, NULL, 'v'},
-  {0, no_argument, NULL, 0}
-};
-
-char opts[] = "lcdo:gsmhp:u:v";
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-mkpasswd (cygwin) %.*s\n\
-passwd File Generator\n\
-Copyright 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s\n\
-", len, v, __DATE__);
-}
-
-int
-main (int argc, char **argv)
-{
-  LPWSTR servername = NULL;
-  DWORD rc = ERROR_SUCCESS;
-  WCHAR domain_name[200];
-  int print_local = 0;
-  int print_current = 0;
-  int print_domain = 0;
-  int print_local_groups = 0;
-  int domain_name_specified = 0;
-  int print_sids = 1;
-  int print_cygpath = 1;
-  int id_offset = 10000;
-  int i;
-  int isNT;
-  char *disp_username = NULL;
-  char name[256], passed_home_path[MAX_PATH];
-  DWORD len;
-
-  isNT = (GetVersion () < 0x80000000);
-  passed_home_path[0] = '\0';
-  if (!isatty (1))
-    setmode (1, O_BINARY);
-
-  if (isNT && argc == 1)
-    return usage (stderr, isNT);
-  else
-    {
-      while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
-	switch (i)
-	  {
-	  case 'l':
-	    print_local = 1;
-	    break;
-	  case 'c':
-	    print_current = 1;
-	    break;
-	  case 'd':
-	    print_domain = 1;
-	    break;
-	  case 'o':
-	    id_offset = strtol (optarg, NULL, 10);
-	    break;
-	  case 'g':
-	    print_local_groups = 1;
-	    break;
-	  case 's':
-	    print_sids = 0;
-	    break;
-	  case 'm':
-	    print_cygpath = 0;
-	    break;
-	  case 'p':
-	    if (optarg[0] != '/')
-	    {
-	      fprintf (stderr, "%s: `%s' is not a fully qualified path.\n",
-		       argv[0], optarg);
-	      return 1;
-	    }
-	    strcpy (passed_home_path, optarg);
-	    if (optarg[strlen (optarg)-1] != '/')
-	      strcat (passed_home_path, "/");
-	    break;
-	  case 'u':
-	    disp_username = optarg;
-	    break;
-	  case 'h':
-	    usage (stdout, isNT);
-	    return 0;
-	  case 'v':
-	    print_version ();
-	    return 0;
-	  default:
-	    fprintf (stderr, "Try `%s --help' for more information.\n", argv[0]);
-	    return 1;
-	  }
-    }
-  if (!isNT)
-    {
-      /* This takes Windows 9x/ME into account. */
-      if (passed_home_path[0] == '\0')
-	strcpy (passed_home_path, "/home/");
-      if (!disp_username)
-        {
-	  printf ("admin:use_crypt:%lu:%lu:Administrator:%sadmin:/bin/bash\n", 
-		  DOMAIN_USER_RID_ADMIN,
-		  DOMAIN_ALIAS_RID_ADMINS,
-		  passed_home_path);
-	  if (GetUserName (name, (len = 256, &len)))
-	    disp_username = name;
-	}
-      if (disp_username && disp_username[0])
-        {
-	  /* Create a pseudo random uid */
-	  unsigned long uid = 0, i;
-	  for (i = 0; disp_username[i]; i++)
-	    uid += toupper (disp_username[i]) << ((6 * i) % 25);
-	  uid = (uid % (1000 - DOMAIN_USER_RID_ADMIN - 1)) 
-	    + DOMAIN_USER_RID_ADMIN + 1;
-    	  
-	  printf ("%s:use_crypt:%lu:%lu:%s:%s%s:/bin/bash\n", 
-		  disp_username,
-		  uid,
-		  DOMAIN_ALIAS_RID_ADMINS,
-		  disp_username,
-		  passed_home_path,
-		  disp_username);
-	}
-      return 0;
-    }
-  if (!print_local && !print_domain && !print_local_groups)
-    {
-      fprintf (stderr, "%s: Specify one of `-l', `-d' or `-g'\n", argv[0]);
-      return 1;
-    }
-  if (optind < argc)
-    {
-      if (!print_domain)
-        {
-	  fprintf (stderr, "%s: A domain name is only accepted "
-		   "when `-d' is given.\n", argv[0]);
-	  return 1;
-	}
-      domain_name_specified = 1;
-    }
-  if (!load_netapi ())
-    {
-      print_win_error(GetLastError ());
-      return 1;
-    }
-
-  if (disp_username == NULL)
-    {
-      if (print_local)
-        {
-#if 0
-	  /*
-	   * Get `Everyone' group
-	   */
-	  print_special (print_sids, &sid_world_auth, 1, SECURITY_WORLD_RID,
-			 0, 0, 0, 0, 0, 0, 0);
-#endif
-	  /*
-	   * Get `system' group
-	   */
-	  print_special (print_sids, &sid_nt_auth, 1, SECURITY_LOCAL_SYSTEM_RID,
-			 0, 0, 0, 0, 0, 0, 0);
-	  /*
-	   * Get `administrators' group
-	   */
-	  if (!print_local_groups)
-	    print_special (print_sids, &sid_nt_auth, 2, SECURITY_BUILTIN_DOMAIN_RID,
-			   DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0);
-	}
-      if (print_local_groups)
-	enum_local_groups (print_sids);
-    }
-
-  if (print_local)
-    enum_users (NULL, print_sids, print_cygpath, passed_home_path, 0,
-    		disp_username);
-
-  i = 1;
-  if (print_domain) 
-    do 
-      {
-	if (domain_name_specified)
-	  {
-	    mbstowcs (domain_name, argv[optind], (strlen (argv[optind]) + 1));
-	    rc = netgetdcname (NULL, domain_name, (void *) &servername);
-	  }
-	else
-	  rc = netgetdcname (NULL, NULL, (void *) &servername);
-	
-	if (rc != ERROR_SUCCESS)
-	  {
-	    print_win_error(rc);
-	    return 1;
-	  }
-
-	enum_users (servername, print_sids, print_cygpath, passed_home_path,
-		    id_offset * i++, disp_username);
-	netapibufferfree (servername);
-      }
-    while (++optind < argc);
-
-  if (print_current && !print_domain)
-    current_user(print_sids, print_cygpath, passed_home_path,
-		 id_offset, disp_username);
-
-  return 0;
-}
diff --git a/winsup/utils/module_info.cc b/winsup/utils/module_info.cc
deleted file mode 100644
index c0e7079cc..000000000
--- a/winsup/utils/module_info.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-/* module_info.cc
-
-   Copyright 1999,2000,2001 Red Hat, Inc.
-
-   Written by Egor Duda <deo@logos-m.ru>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <stdlib.h>
-#include <windows.h>
-#include <psapi.h>
-
-static int psapi_loaded = 0;
-static HMODULE psapi_module_handle = NULL;
-
-typedef BOOL WINAPI (tf_EnumProcessModules) (HANDLE, HMODULE *, DWORD,
-					     LPDWORD);
-typedef BOOL WINAPI (tf_GetModuleInformation) (HANDLE, HMODULE, LPMODULEINFO,
-					       DWORD);
-typedef DWORD WINAPI (tf_GetModuleFileNameExA) (HANDLE, HMODULE, LPSTR,
-						DWORD);
-
-static tf_EnumProcessModules *psapi_EnumProcessModules = NULL;
-static tf_GetModuleInformation *psapi_GetModuleInformation = NULL;
-static tf_GetModuleFileNameExA *psapi_GetModuleFileNameExA = NULL;
-
-/* Returns full name of Dll, which is loaded by hProcess at BaseAddress.
-   Uses psapi.dll. */
-
-char *
-psapi_get_module_name (HANDLE hProcess, DWORD BaseAddress)
-{
-  DWORD len;
-  MODULEINFO mi;
-  unsigned int i;
-  HMODULE dh_buf[1];
-  HMODULE *DllHandle = dh_buf;
-  DWORD cbNeeded;
-  BOOL ok;
-
-  char name_buf[MAX_PATH + 1];
-
-  if (!psapi_loaded ||
-      psapi_EnumProcessModules == NULL ||
-      psapi_GetModuleInformation == NULL ||
-      psapi_GetModuleFileNameExA == NULL)
-    {
-      if (psapi_loaded)
-	goto failed;
-      psapi_loaded = 1;
-      psapi_module_handle = LoadLibrary ("psapi.dll");
-      if (!psapi_module_handle)
-	goto failed;
-      psapi_EnumProcessModules =
-	(tf_EnumProcessModules *) GetProcAddress (psapi_module_handle,
-						  "EnumProcessModules");
-      psapi_GetModuleInformation =
-	(tf_GetModuleInformation *) GetProcAddress (psapi_module_handle,
-						    "GetModuleInformation");
-      psapi_GetModuleFileNameExA =
-	(tf_GetModuleFileNameExA *) GetProcAddress (psapi_module_handle,
-						    "GetModuleFileNameExA");
-      if (psapi_EnumProcessModules == NULL
-	  || psapi_GetModuleInformation == NULL
-	  || psapi_GetModuleFileNameExA == NULL)
-	goto failed;
-    }
-
-  ok = (*psapi_EnumProcessModules) (hProcess,
-				    DllHandle, sizeof (HMODULE), &cbNeeded);
-
-  if (!ok || !cbNeeded)
-    goto failed;
-  DllHandle = (HMODULE *) malloc (cbNeeded);
-  if (!DllHandle)
-    goto failed;
-  ok = (*psapi_EnumProcessModules) (hProcess, DllHandle, cbNeeded, &cbNeeded);
-  if (!ok)
-    {
-      free (DllHandle);
-      goto failed;
-    }
-
-  for (i = 0; i < cbNeeded / sizeof (HMODULE); i++)
-    {
-      if (!(*psapi_GetModuleInformation) (hProcess,
-					  DllHandle[i], &mi, sizeof (mi)))
-	{
-	  free (DllHandle);
-	  goto failed;
-	}
-
-      len = (*psapi_GetModuleFileNameExA) (hProcess,
-					   DllHandle[i], name_buf, MAX_PATH);
-      if (len == 0)
-	{
-	  free (DllHandle);
-	  goto failed;
-	}
-
-      if ((DWORD) (mi.lpBaseOfDll) == BaseAddress)
-	{
-	  free (DllHandle);
-	  return strdup (name_buf);
-	}
-    }
-
-failed:
-  return NULL;
-}
diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc
deleted file mode 100644
index 5c84280f7..000000000
--- a/winsup/utils/mount.cc
+++ /dev/null
@@ -1,558 +0,0 @@
-/* mount.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <stdio.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <mntent.h>
-#include <windows.h>
-#include <sys/cygwin.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <dirent.h>
-
-#ifdef errno
-#undef errno
-#endif
-#include <errno.h>
-
-#define EXEC_FLAGS (MOUNT_EXEC | MOUNT_NOTEXEC | MOUNT_CYGWIN_EXEC)
-
-static void mount_commands (void);
-static void show_mounts (void);
-static void show_cygdrive_info (void);
-static void change_cygdrive_prefix (const char *new_prefix, int flags);
-static int mount_already_exists (const char *posix_path, int flags);
-
-// static short create_missing_dirs = FALSE;
-static short force = FALSE;
-
-static const char version[] = "$Revision$";
-static const char *progname;
-
-static void
-error (const char *path)
-{
-  fprintf (stderr, "%s: %s: %s\n", progname, path,
-	   (errno == EMFILE) ? "Too many mount entries" : strerror (errno));
-  exit (1);
-}
-
-/* FIXME: do_mount should also print a warning message if the dev arg
-   is a non-existent Win32 path. */
-
-static void
-do_mount (const char *dev, const char *where, int flags)
-{
-  struct stat statbuf;
-  char win32_path[MAX_PATH];
-  int statres;
-
-  cygwin_conv_to_win32_path (where, win32_path);
-
-  statres = stat (win32_path, &statbuf);
-
-#if 0
-  if (statres == -1)
-    {
-      /* FIXME: this'll fail if mount dir is missing any parent dirs */
-      if (create_missing_dirs == TRUE)
-	{
-	  if (mkdir (where, 0755) == -1)
-	    fprintf (stderr, "Warning: unable to create %s!\n", where);
-	  else
-	    statres = 0; /* Pretend stat succeeded if we could mkdir. */
-	}
-    }
-#endif
-
-  if (statres == -1)
-    {
-      if (!force)
-	fprintf (stderr, "%s: warning - %s does not exist.\n", progname, where);
-    }
-  else if (!(statbuf.st_mode & S_IFDIR))
-    {
-      if (!force)
-	fprintf (stderr, "%s: warning: %s is not a directory.\n", progname, where);
-    }
-
-  if (!force && !(flags & EXEC_FLAGS) && strlen (dev))
-    {
-      char devtmp[1 + 2 * strlen (dev)];
-      strcpy (devtmp, dev);
-      char c = strchr (devtmp, '\0')[-1];
-      if (c == '/' || c == '\\')
-	strcat (devtmp, ".");
-      /* Use a curious property of Windows which allows the use of \.. even
-         on non-directory paths. */
-      for (const char *p = dev; (p = strpbrk (p, "/\\")); p++)
-	strcat (devtmp, "\\..");
-      strcat (devtmp, "\\");
-      if (GetDriveType (devtmp) == DRIVE_REMOTE)
-	{
-	  fprintf (stderr, "%s: defaulting to '--no-executable' flag for speed since native path\n"
-		   "%*creferences a remote share.  Use '-f' option to override.\n", progname,
-		   strlen(progname) + 2, ' ');
-	  flags |= MOUNT_NOTEXEC;
-	}
-    }
-
-  if (!force && flags & MOUNT_ENC)
-    {
-      DIR *dd = opendir (dev);
-      if (dd)
-	{
-	  struct dirent *d;
-	  while ((d = readdir (dd)))
-	    {
-	      if (d->d_name[0] != '.')
-		/* fall through */;
-	      else if (d->d_name[1] == '\0'
-		       || (d->d_name[1] == '.' && d->d_name[2] == '\0'))
-		continue;
-	      fprintf (stderr, "%s: error: don't use \"-o managed\" on non-empty directories\n", progname);
-	      exit (1);
-	    }
-	}
-    }
-
-  if (mount (dev, where, flags))
-    error (where);
-
-  exit (0);
-}
-
-static struct option longopts[] =
-{
-  {"binary", no_argument, NULL, 'b'},
-  {"change-cygdrive-prefix", no_argument, NULL, 'c'},
-  {"cygwin-executable", no_argument, NULL, 'X'},
-  {"executable", no_argument, NULL, 'x'},
-  {"force", no_argument, NULL, 'f'},
-  {"help", no_argument, NULL, 'h' },
-  {"mount-commands", no_argument, NULL, 'm'},
-  {"no-executable", no_argument, NULL, 'E'},
-  {"options", required_argument, NULL, 'E'},
-  {"show-cygdrive-prefix", no_argument, NULL, 'p'},
-  {"system", no_argument, NULL, 's'},
-  {"text", no_argument, NULL, 't'},
-  {"user", no_argument, NULL, 'u'},
-  {"version", no_argument, NULL, 'v'},
-  {NULL, 0, NULL, 0}
-};
-
-static char opts[] = "bcfhmpstuvxEXo:";
-
-static void
-usage (FILE *where = stderr)
-{
-  fprintf (where, "Usage: %s [OPTION] [<win32path> <posixpath>]\n\
-Display information about mounted filesystems, or mount a filesystem\n\
-\n\
-  -b, --binary     (default)    text files are equivalent to binary files\n\
-				(newline = \\n)\n\
-  -c, --change-cygdrive-prefix  change the cygdrive path prefix to <posixpath>\n\
-  -f, --force                   force mount, don't warn about missing mount\n\
-				point directories\n\
-  -h, --help                    output usage information and exit\n\
-  -m, --mount-commands          write mount commands to replace user and\n\
-				system mount points and cygdrive prefixes\n\
-  -o, --options X[,X...]	specify mount options\n\
-  -p, --show-cygdrive-prefix    show user and/or system cygdrive path prefix\n\
-  -s, --system     (default)    add system-wide mount point\n\
-  -t, --text                    text files get \\r\\n line endings\n\
-  -u, --user                    add user-only mount point\n\
-  -v, --version                 output version information and exit\n\
-  -x, --executable              treat all files under mount point as executables\n\
-  -E, --no-executable           treat all files under mount point as \n\
-				non-executables\n\
-  -X, --cygwin-executable       treat all files under mount point as cygwin\n\
-				executables\n\
-", progname);
-  exit (where == stderr ? 1 : 0);
-}
-
-struct opt
-{
-  const char *name;
-  unsigned val;
-  bool clear;
-} oopts[] =
-{
-  {"user", MOUNT_SYSTEM, 1},
-  {"system", MOUNT_SYSTEM, 0},
-  {"binary", MOUNT_BINARY, 0},
-  {"text", MOUNT_BINARY, 1},
-  {"exec", MOUNT_EXEC, 0},
-  {"notexec", MOUNT_NOTEXEC, 0},
-  {"cygexec", MOUNT_CYGWIN_EXEC, 0},
-  {"nosuid", 0, 0},
-  {"managed", MOUNT_ENC, 0}
-};
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-%s (cygwin) %.*s\n\
-Filesystem Utility\n\
-Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s\n\
-", progname, len, v, __DATE__);
-}
-
-static char *
-concat3 (char *a, const char *b, const char *c)
-{
-  size_t totlen = strlen (a) + strlen (b) + strlen (c) + 1;
-  a = (char *) realloc (a, totlen);
-  return strcat (strcat (a, b), c);
-}
-
-int
-main (int argc, char **argv)
-{
-  int i;
-  int flags = MOUNT_BINARY;
-  int default_flag = MOUNT_SYSTEM;
-  char *options = strdup ("");
-  enum do_what
-  {
-    nada,
-    saw_change_cygdrive_prefix,
-    saw_show_cygdrive_prefix,
-    saw_mount_commands
-  } do_what = nada;
-
-  progname = strrchr (argv[0], '/');
-  if (progname == NULL)
-    progname = strrchr (argv[0], '\\');
-  if (progname == NULL)
-    progname = argv[0];
-  else
-    progname++;
-
-  if (argc == 1)
-    {
-      show_mounts ();
-      exit (0);
-    }
-
-  while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
-    switch (i)
-      {
-      case 'b':
-	flags |= MOUNT_BINARY;
-	break;
-      case 'c':
-	if (do_what == nada)
-	  do_what = saw_change_cygdrive_prefix;
-	else
-	  usage ();
-	break;
-      case 'f':
-	force = TRUE;
-	break;
-      case 'h':
-	usage (stdout);
-	break;
-      case 'm':
-	if (do_what == nada)
-	  do_what = saw_mount_commands;
-	else
-	  usage ();
-	break;
-      case 'o':
-	if (*options)
-	  options = concat3 (options, ",", optarg);
-	else
-	  options = strdup (optarg);
-	break;
-      case 'p':
-	if (do_what == nada)
-	  do_what = saw_show_cygdrive_prefix;
-	else
-	  usage ();
-	break;
-      case 's':
-	flags |= MOUNT_SYSTEM;
-	break;
-      case 't':
-	flags &= ~MOUNT_BINARY;
-	break;
-      case 'u':
-	flags &= ~MOUNT_SYSTEM;
-	default_flag = 0;
-	break;
-      case 'v':
-	print_version ();
-	return 0;
-	break;
-      case 'x':
-	flags |= MOUNT_EXEC;
-	break;
-      case 'E':
-	flags |= MOUNT_NOTEXEC;
-	break;
-      case 'X':
-	flags |= MOUNT_CYGWIN_EXEC;
-	break;
-      default:
-	usage ();
-      }
-
-  while (*options)
-    {
-      char *p = strchr (options, ',');
-      if (p)
-	*p++ = '\0';
-      else
-	p = strchr (options, '\0');
-
-      for (opt *o = oopts; o < (oopts + (sizeof (oopts) / sizeof (oopts[0]))); o++)
-	if (strcmp (options, o->name) == 0)
-	  {
-	    if (o->clear)
-	      flags &= ~o->val;
-	    else
-	      flags |= o->val;
-	    goto gotit;
-	  }
-      fprintf (stderr, "%s: invalid option - '%s'\n", progname, options);
-      exit (1);
-
-    gotit:
-      options = p;
-    }
-
-  if (flags & MOUNT_NOTEXEC && flags & (MOUNT_EXEC | MOUNT_CYGWIN_EXEC))
-    {
-      fprintf (stderr, "%s: invalid combination of executable options\n", progname);
-      exit (1);
-    }
-
-  argc--;
-  switch (do_what)
-    {
-    case saw_change_cygdrive_prefix:
-      if (optind != argc)
-	usage ();
-      change_cygdrive_prefix (argv[optind], flags | default_flag);
-      break;
-    case saw_show_cygdrive_prefix:
-      if (optind <= argc)
-	usage ();
-      show_cygdrive_info ();
-      break;
-    case saw_mount_commands:
-      if (optind <= argc)
-	usage ();
-      mount_commands ();
-      break;
-    default:
-      if (optind != (argc - 1))
-	{
-	  if (optind >= argc)
-	    fprintf (stderr, "%s: not enough arguments\n", progname);
-	  else
-	    fprintf (stderr, "%s: too many arguments\n", progname);
-	  usage ();
-	}
-      if (force || !mount_already_exists (argv[optind + 1], flags | default_flag))
-	do_mount (argv[optind], argv[optind + 1], flags | default_flag);
-      else
-	{
-	  errno = EBUSY;
-	  error (argv[optind + 1]);
-	}
-    }
-
-  /* NOTREACHED */
-  return 0;
-}
-
-static void
-mount_commands (void)
-{
-  FILE *m = setmntent ("/-not-used-", "r");
-  struct mntent *p;
-  char *c;
-  const char *format_mnt = "mount%s \"%s\" \"%s\"\n";
-  const char *format_cyg = "mount%s --change-cygdrive-prefix \"%s\"\n";
-  char opts[MAX_PATH];
-  char user[MAX_PATH];
-  char system[MAX_PATH];
-  char user_flags[MAX_PATH];
-  char system_flags[MAX_PATH];
-
-  // write mount commands for user and system mount points
-  while ((p = getmntent (m)) != NULL)
-    // Only list non-cygdrives
-    if (!strstr (p->mnt_opts, ",noumount"))
-      {
-	strcpy(opts, " -f");
-	if      (p->mnt_type[0] == 'u')
-	  strcat (opts, " -u");
-	else if (p->mnt_type[0] == 's')
-	  strcat (opts, " -s");
-	if      (p->mnt_opts[0] == 'b')
-	  strcat (opts, " -b");
-	else if (p->mnt_opts[0] == 't')
-	  strcat (opts, " -t");
-	if (strstr (p->mnt_opts, ",exec"))
-	  strcat (opts, " -x");
-	if (strstr (p->mnt_opts, ",noexec"))
-	  strcat (opts, " -E");
-	if (strstr (p->mnt_opts, ",managed"))
-	  strcat (opts, " -o managed");
-	while ((c = strchr (p->mnt_fsname, '\\')) != NULL)
-	  *c = '/';
-	printf (format_mnt, opts, p->mnt_fsname, p->mnt_dir);
-      }
-  endmntent (m);
-
-  // write mount commands for cygdrive prefixes
-  cygwin_internal (CW_GET_CYGDRIVE_INFO, user, system, user_flags,
-		   system_flags);
-
-  if (strlen (user) > 0)
-    {
-      strcpy (opts, " -u");
-      if (user_flags[0] == 'b')
-	strcat (opts, " -b");
-      else if (user_flags[0] == 't')
-	strcat (opts, " -t");
-      printf (format_cyg, opts, user);
-    }
-
-  if (strlen (system) > 0)
-    {
-      strcpy (opts, " -s");
-      if (system_flags[0] == 'b')
-	strcat (opts, " -b");
-      else if (system_flags[0] == 't')
-	strcat (opts, " -t");
-      printf (format_cyg, opts, system);
-    }
-
-  exit(0);
-}
-
-static void
-show_mounts (void)
-{
-  FILE *m = setmntent ("/-not-used-", "r");
-  struct mntent *p;
-  const char *format = "%s on %s type %s (%s)\n";
-
-  // printf (format, "Device", "Directory", "Type", "Flags");
-  while ((p = getmntent (m)) != NULL)
-    printf (format, p->mnt_fsname, p->mnt_dir, p->mnt_type, p->mnt_opts);
-  endmntent (m);
-}
-
-/* Return 1 if mountpoint from the same registry area is already in
-   mount table.  Otherwise return 0. */
-static int
-mount_already_exists (const char *posix_path, int flags)
-{
-  int found_matching = 0;
-
-  FILE *m = setmntent ("/-not-used-", "r");
-  struct mntent *p;
-
-  while ((p = getmntent (m)) != NULL)
-    {
-      /* if the paths match, and they're both the same type of mount. */
-      if (strcmp (p->mnt_dir, posix_path) == 0)
-	{
-	  if (p->mnt_type[0] == 'u')
-	    {
-	      if (!(flags & MOUNT_SYSTEM)) /* both current_user */
-		found_matching = 1;
-	      else
-		fprintf (stderr,
-			 "%s: warning: system mount point of '%s' "
-			 "will always be masked by user mount.\n",
-			 progname, posix_path);
-	      break;
-	    }
-	  else if (p->mnt_type[0] == 's')
-	    {
-	      if (flags & MOUNT_SYSTEM) /* both system */
-		found_matching = 1;
-	      else
-		fprintf (stderr,
-			 "%s: warning: user mount point of '%s' "
-			 "masks system mount.\n",
-			 progname, posix_path);
-	      break;
-	    }
-	  else
-	    {
-	      fprintf (stderr, "%s: warning: couldn't determine mount type.\n", progname);
-	      break;
-	    }
-	}
-    }
-  endmntent (m);
-
-  return found_matching;
-}
-
-/* change_cygdrive_prefix: Change the cygdrive prefix */
-static void
-change_cygdrive_prefix (const char *new_prefix, int flags)
-{
-  flags |= MOUNT_CYGDRIVE;
-
-  if (mount (NULL, new_prefix, flags))
-    error (new_prefix);
-
-  exit (0);
-}
-
-/* show_cygdrive_info: Show the user and/or cygdrive info, i.e., prefix and
-   flags.*/
-static void
-show_cygdrive_info ()
-{
-  /* Get the cygdrive info */
-  char user[MAX_PATH];
-  char system[MAX_PATH];
-  char user_flags[MAX_PATH];
-  char system_flags[MAX_PATH];
-  cygwin_internal (CW_GET_CYGDRIVE_INFO, user, system, user_flags,
-		   system_flags);
-
-  /* Display the user and system cygdrive path prefix, if necessary
-     (ie, not empty) */
-  const char *format = "%-18s  %-11s  %s\n";
-  printf (format, "Prefix", "Type", "Flags");
-  if (strlen (user) > 0)
-    printf (format, user, "user", user_flags);
-  if (strlen (system) > 0)
-    printf (format, system, "system", system_flags);
-
-  exit (0);
-}
diff --git a/winsup/utils/parse_pe.cc b/winsup/utils/parse_pe.cc
deleted file mode 100644
index 4dc7d4f0a..000000000
--- a/winsup/utils/parse_pe.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/* parse_pe.cc
-
-   Copyright 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Egor Duda <deo@logos-m.ru>
-
-   This file is part of Cygwin.
-
-   This software is a copyrighted work licensed under the terms of the
-   Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-   details. */
-
-#include <bfd.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "dumper.h"
-
-int
-exclusion::add (LPBYTE mem_base, DWORD mem_size)
-{
-  while (last >= size)
-    size += step;
-  region = (process_mem_region *) realloc (region, size * sizeof (process_mem_region));
-  if (region == NULL)
-    return 0;
-  region[last].base = mem_base;
-  region[last].size = mem_size;
-  last++;
-  return 1;
-};
-
-int 
-cmp_regions (const void *r1, const void *r2)
-{
-  if (((process_mem_region *) r1)->base < ((process_mem_region *) r2)->base)
-    return -1;
-  if (((process_mem_region *) r1)->base > ((process_mem_region *) r2)->base)
-    return 1;
-  return 0;
-}
-
-int
-exclusion::sort_and_check ()
-{
-  qsort (region, last, sizeof (process_mem_region), &cmp_regions);
-  for (process_mem_region * p = region; p < region + last - 1; p++)
-    {
-      process_mem_region *q = p + 1;
-      if (q == p + 1)
-	continue;
-      if (p->base + size > q->base)
-	{
-	  fprintf (stderr, "region error @ (%8p + %d) > %8p\n", (unsigned) p->base, size, q->base);
-	  return 0;
-	}
-    }
-  return 1;
-}
-
-static void
-select_data_section (bfd * abfd, asection * sect, PTR obj)
-{
-  exclusion *excl_list = (exclusion *) obj;
-
-  if ((sect->flags & (SEC_CODE | SEC_DEBUGGING)) &&
-      sect->vma && sect->_raw_size)
-    {
-      excl_list->add ((LPBYTE) sect->vma, (DWORD) sect->_raw_size);
-      deb_printf ("excluding section: %20s %08lx\n", sect->name, sect->_raw_size);
-    }
-}
-
-int
-parse_pe (const char *file_name, exclusion * excl_list)
-{
-  if (file_name == NULL || excl_list == NULL)
-    return 0;
-
-  bfd *abfd = bfd_openr (file_name, "pei-i386");
-  if (abfd == NULL)
-    {
-      bfd_perror ("failed to open file");
-      return 0;
-    }
-
-  bfd_check_format (abfd, bfd_object);
-  bfd_map_over_sections (abfd, &select_data_section, (PTR) excl_list);
-  excl_list->sort_and_check ();
-
-  bfd_close (abfd);
-  return 1;
-}
diff --git a/winsup/utils/passwd.c b/winsup/utils/passwd.c
deleted file mode 100644
index d0f3289cb..000000000
--- a/winsup/utils/passwd.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/* passwd.c: Changing passwords and managing account information
-
-   Copyright 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.
-
-   Written by Corinna Vinschen <corinna.vinschen@cityweb.de>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <windows.h>
-#include <wininet.h>
-#include <lmaccess.h>
-#include <lmerr.h>
-#include <lmcons.h>
-#include <lmapibuf.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <pwd.h>
-#include <sys/cygwin.h>
-#include <sys/types.h>
-#include <time.h>
-
-#define USER_PRIV_ADMIN		 2
-
-static const char version[] = "$Revision$";
-static char *prog_name;
-
-static struct option longopts[] =
-{
-  {"cannot-change", no_argument, NULL, 'c'},
-  {"can-change", no_argument, NULL, 'C'},
-  {"never-expires", no_argument, NULL, 'e'},
-  {"expires", no_argument, NULL, 'E'},
-  {"help", no_argument, NULL, 'h' },
-  {"inactive", required_argument, NULL, 'i'},
-  {"lock", no_argument, NULL, 'l'},
-  {"minage", required_argument, NULL, 'n'},
-  {"pwd-not-required", no_argument, NULL, 'p'},
-  {"pwd-required", no_argument, NULL, 'P'},
-  {"unlock", no_argument, NULL, 'u'},
-  {"version", no_argument, NULL, 'v'},
-  {"maxage", required_argument, NULL, 'x'},
-  {"length", required_argument, NULL, 'L'},
-  {"status", no_argument, NULL, 'S'},
-  {NULL, 0, NULL, 0}
-};
-
-static char opts[] = "cCeEhi:ln:pPuvx:L:S";
-
-int
-eprint (int with_name, const char *fmt, ...)
-{
-  va_list ap;
-
-  if (with_name)
-    fprintf(stderr, "%s: ", prog_name);
-  va_start (ap, fmt);
-  vfprintf (stderr, fmt, ap);
-  va_end (ap);
-  fprintf(stderr, "\n");
-  return 1;
-}
-
-int
-EvalRet (int ret, const char *user)
-{
-  switch (ret)
-    {
-    case NERR_Success:
-      return 0;
-
-    case ERROR_ACCESS_DENIED:
-      if (! user)
-        eprint (0, "You may not change password expiry information.");
-      else
-        eprint (0, "You may not change the password for %s.", user);
-      break;
-
-      eprint (0, "Bad password: Invalid.");
-      break;
-
-    case NERR_PasswordTooShort:
-      eprint (0, "Bad password: Too short.");
-      break;
-
-    case NERR_UserNotFound:
-      eprint (1, "unknown user %s", user);
-      break;
-
-    case ERROR_INVALID_PASSWORD:
-    case NERR_BadPassword:
-      eprint (0, "Incorrect password for %s.", user);
-      eprint (0, "The password for %s is unchanged.", user);
-      break;
-
-    default:
-      eprint (1, "unrecoverable error %d", ret);
-      break;
-    }
-  return 1;
-}
-
-PUSER_INFO_3
-GetPW (char *user, int print_win_name)
-{
-  char usr_buf[UNLEN + 1];
-  WCHAR name[2 * (UNLEN + 1)];
-  DWORD ret;
-  PUSER_INFO_3 ui;
-  struct passwd *pw;
-  char *domain = (char *) alloca (INTERNET_MAX_HOST_NAME_LENGTH + 1);
-     
-  /* Try getting a Win32 username in case the user edited /etc/passwd */
-  if ((pw = getpwnam (user)))
-    {
-      cygwin_internal (CW_EXTRACT_DOMAIN_AND_USER, pw, domain, usr_buf);
-      if (strcasecmp (pw->pw_name, usr_buf))
-	{
-	  /* Hack to avoid problem with LookupAccountSid after impersonation */
-	  if (strcasecmp (usr_buf, "SYSTEM"))
-	    {
-	      user = usr_buf;
-	      if (print_win_name)
-		printf ("Windows username : %s\n", user);
-	    }
-	}
-    }
-  MultiByteToWideChar (CP_ACP, 0, user, -1, name, 2 * (UNLEN + 1));
-  ret = NetUserGetInfo (NULL, name, 3, (void *) &ui);
-  return EvalRet (ret, user) ? NULL : ui;
-}
-
-int
-ChangePW (const char *user, const char *oldpwd, const char *pwd, int justcheck)
-{
-  WCHAR name[2 * (UNLEN + 1)], oldpass[512], pass[512];
-  DWORD ret;
-
-  MultiByteToWideChar (CP_ACP, 0, user, -1, name, 2 * (UNLEN + 1));
-  MultiByteToWideChar (CP_ACP, 0, pwd, -1, pass, 512);
-  if (! oldpwd)
-    {
-      USER_INFO_1003 ui;
-
-      ui.usri1003_password = pass;
-      ret = NetUserSetInfo (NULL, name, 1003, (LPBYTE) &ui, NULL);
-    }
-  else
-    {
-      MultiByteToWideChar (CP_ACP, 0, oldpwd, -1, oldpass, 512);
-      ret = NetUserChangePassword (NULL, name, oldpass, pass);
-    }
-  if (justcheck && ret != ERROR_INVALID_PASSWORD)
-    return 0;
-  if (! EvalRet (ret, user) && ! justcheck)
-    {
-      eprint (0, "Password changed.");
-    }
-  return ret;
-}
-
-void
-PrintPW (PUSER_INFO_3 ui)
-{
-  time_t t = time (NULL) - ui->usri3_password_age;
-  int ret;
-  PUSER_MODALS_INFO_0 mi;
-
-  printf ("Account disabled           : %s",
-  	(ui->usri3_flags & UF_ACCOUNTDISABLE) ? "yes\n" : "no\n");
-  printf ("Password not required      : %s",
-  	(ui->usri3_flags & UF_PASSWD_NOTREQD) ? "yes\n" : "no\n");
-  printf ("User can't change password : %s",
-  	(ui->usri3_flags & UF_PASSWD_CANT_CHANGE) ? "yes\n" : "no\n");
-  printf ("Password never expires     : %s",
-  	(ui->usri3_flags & UF_DONT_EXPIRE_PASSWD) ? "yes\n" : "no\n");
-  printf ("Password expired           : %s",
-	(ui->usri3_password_expired) ? "yes\n" : "no\n");
-  printf ("Latest password change     : %s", ctime(&t));
-  ret = NetUserModalsGet (NULL, 0, (void *) &mi);
-  if (! ret)
-    {
-      if (mi->usrmod0_max_passwd_age == TIMEQ_FOREVER)
-        mi->usrmod0_max_passwd_age = 0;
-      if (mi->usrmod0_min_passwd_age == TIMEQ_FOREVER)
-        mi->usrmod0_min_passwd_age = 0;
-      if (mi->usrmod0_force_logoff == TIMEQ_FOREVER)
-        mi->usrmod0_force_logoff = 0;
-      if (ui->usri3_priv == USER_PRIV_ADMIN)
-        mi->usrmod0_min_passwd_len = 0;
-      printf ("\nSystem password settings:\n");
-      printf ("Max. password age %ld days\n",
-              mi->usrmod0_max_passwd_age / ONE_DAY);
-      printf ("Min. password age %ld days\n",
-              mi->usrmod0_min_passwd_age / ONE_DAY);
-      printf ("Force logout after %ld days\n",
-              mi->usrmod0_force_logoff / ONE_DAY);
-      printf ("Min. password length: %ld\n",
-              mi->usrmod0_min_passwd_len);
-    }
-}
-
-int
-SetModals (int xarg, int narg, int iarg, int Larg)
-{
-  int ret;
-  PUSER_MODALS_INFO_0 mi;
-
-  ret = NetUserModalsGet (NULL, 0, (void *) &mi);
-  if (! ret)
-    {
-      if (xarg == 0)
-	mi->usrmod0_max_passwd_age = TIMEQ_FOREVER;
-      else if (xarg > 0)
-	mi->usrmod0_max_passwd_age = xarg * ONE_DAY;
-
-      if (narg == 0)
-	{
-	  mi->usrmod0_min_passwd_age = TIMEQ_FOREVER;
-	  mi->usrmod0_password_hist_len = 0;
-	}
-      else if (narg > 0)
-	mi->usrmod0_min_passwd_age = narg * ONE_DAY;
-
-      if (iarg == 0)
-	mi->usrmod0_force_logoff = TIMEQ_FOREVER;
-      else if (iarg > 0)
-	mi->usrmod0_force_logoff = iarg * ONE_DAY;
-
-      if (Larg >= 0)
-	mi->usrmod0_min_passwd_len = Larg;
-
-      ret = NetUserModalsSet (NULL, 0, (LPBYTE) mi, NULL);
-      NetApiBufferFree (mi);
-    }
-  return EvalRet (ret, NULL);
-}
-
-static void usage (FILE * stream, int status) __attribute__ ((noreturn));
-static void
-usage (FILE * stream, int status)
-{
-  fprintf (stream, ""
-  "Usage: %s [OPTION] [USER]\n"
-  "Change USER's password or password attributes.\n"
-  "\n"
-  "User operations:\n"
-  "  -l, --lock               lock USER's account.\n"
-  "  -u, --unlock             unlock USER's account.\n"
-  "  -c, --cannot-change      USER can't change password.\n"
-  "  -C, --can-change         USER can change password.\n"
-  "  -e, --never-expires      USER's password never expires.\n"
-  "  -E, --expires            USER's password expires according to system's\n"
-  "                           password aging rule.\n"
-  "  -p, --pwd-not-required   no password required for USER.\n"
-  "  -P, --pwd-required       password is required for USER.\n"
-  "\n"
-  "System operations:\n"
-  "  -i, --inactive NUM       set NUM of days before inactive accounts are disabled\n"
-  "                           (inactive accounts are those with expired passwords).\n"
-  "  -n, --minage DAYS        set system minimum password age to DAYS days.\n"
-  "  -x, --maxage DAYS        set system maximum password age to DAYS days.\n"
-  "  -L, --length LEN         set system minimum password length to LEN.\n"
-  "\n"
-  "Other options:\n"
-  "  -S, --status             display password status for USER (locked, expired,\n"
-  "                           etc.) plus global system password settings.\n"
-  "  -h, --help               output usage information and exit.\n"
-  "  -v, --version            output version information and exit.\n"
-  "\n"
-  "If no option is given, change USER's password.  If no user name is given,\n"
-  "operate on current user.  System operations must not be mixed with user\n"
-  "operations.  Don't specify a USER when triggering a system operation. \n"
-  "\n"
-  "Report bugs to <cygwin@cygwin.com>\n", prog_name);
-  exit (status);
-}
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-%s (cygwin) %.*s\n\
-Password Utility\n\
-Copyright 1999, 2000, 2001, 2002, 2003 Red Hat, Inc.\n\
-Compiled on %s\n\
-", prog_name, len, v, __DATE__);
-}
-
-int
-main (int argc, char **argv)
-{
-  char *c;
-  char user[64], oldpwd[64], newpwd[64];
-  int ret = 0;
-  int cnt = 0;
-  int opt;
-  int Larg = -1;
-  int xarg = -1;
-  int narg = -1;
-  int iarg = -1;
-  int lopt = 0;
-  int uopt = 0;
-  int copt = 0;
-  int Copt = 0;
-  int eopt = 0;
-  int Eopt = 0;
-  int popt = 0;
-  int Popt = 0;
-  int Sopt = 0;
-  PUSER_INFO_3 ui, li;
-
-  prog_name = strrchr (argv[0], '/');
-  if (prog_name == NULL)
-    prog_name = strrchr (argv[0], '\\');
-  if (prog_name == NULL)
-    prog_name = argv[0];
-  else
-    prog_name++;
-  c = strrchr (prog_name, '.');
-  if (c)
-    *c = '\0';
-
-  while ((opt = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
-    switch (opt)
-      {
-      case 'h':
-	usage (stdout, 0);
-        break;
-
-      case 'i':
-	if (lopt || uopt || copt || Copt || eopt || Eopt || popt || Popt || Sopt)
-	  usage (stderr, 1);
-	if ((iarg = atoi (optarg)) < 0 || iarg > 999)
-	  return eprint (1, "Force logout time must be between 0 and 999.");
-        break;
-
-      case 'l':
-	if (xarg >= 0 || narg >= 0 || iarg >= 0 || Larg >= 0 || uopt || Sopt)
-	  usage (stderr, 1);
-	lopt = 1;
-        break;
-
-      case 'n':
-	if (lopt || uopt || copt || Copt || eopt || Eopt || popt || Popt || Sopt)
-	  usage (stderr, 1);
-	if ((narg = atoi (optarg)) < 0 || narg > 999)
-	  return eprint (1, "Minimum password age must be between 0 and 999.");
-	if (xarg >= 0 && narg > xarg)
-	  return eprint (1, "Minimum password age must be less than "
-	                    "maximum password age.");
-        break;
-
-      case 'u':
-	if (xarg >= 0 || narg >= 0 || iarg >= 0 || Larg >= 0 || lopt || Sopt)
-	  usage (stderr, 1);
-	uopt = 1;
-        break;
-
-      case 'c':
-	if (xarg >= 0 || narg >= 0 || iarg >= 0 || Larg >= 0 || Sopt)
-	  usage (stderr, 1);
-	copt = 1;
-        break;
-
-      case 'C':
-	if (xarg >= 0 || narg >= 0 || iarg >= 0 || Larg >= 0 || Sopt)
-	  usage (stderr, 1);
-	Copt = 1;
-        break;
-
-      case 'e':
-	if (xarg >= 0 || narg >= 0 || iarg >= 0 || Larg >= 0 || Sopt)
-	  usage (stderr, 1);
-	eopt = 1;
-        break;
-
-      case 'E':
-	if (xarg >= 0 || narg >= 0 || iarg >= 0 || Larg >= 0 || Sopt)
-	  usage (stderr, 1);
-	Eopt = 1;
-        break;
-
-      case 'p':
-	if (xarg >= 0 || narg >= 0 || iarg >= 0 || Larg >= 0 || Sopt)
-	  usage (stderr, 1);
-	popt = 1;
-        break;
-
-      case 'P':
-	if (xarg >= 0 || narg >= 0 || iarg >= 0 || Larg >= 0 || Sopt)
-	  usage (stderr, 1);
-	Popt = 1;
-        break;
-
-      case 'v':
-	print_version ();
-        exit (0);
-        break;
-
-      case 'x':
-	if (lopt || uopt || copt || Copt || eopt || Eopt || popt || Popt || Sopt)
-	  usage (stderr, 1);
-	if ((xarg = atoi (optarg)) < 0 || xarg > 999)
-	  return eprint (1, "Maximum password age must be between 0 and 999.");
-	if (narg >= 0 && xarg < narg)
-	  return eprint (1, "Maximum password age must be greater than "
-	                    "minimum password age.");
-        break;
-
-      case 'L':
-	if (lopt || uopt || copt || Copt || eopt || Eopt || popt || Popt || Sopt)
-	  usage (stderr, 1);
-	if ((Larg = atoi (optarg)) < 0 || Larg > LM20_PWLEN)
-	  return eprint (1, "Minimum password length must be between "
-	                    "0 and %d.", LM20_PWLEN);
-        break;
-
-      case 'S':
-	if (xarg >= 0 || narg >= 0 || iarg >= 0 || Larg >= 0 || lopt || uopt
-	    || copt || Copt || eopt || Eopt || popt || Popt)
-	  usage (stderr, 1);
-	Sopt = 1;
-        break;
-
-      default:
-        usage (stderr, 1);
-      }
-  if (Larg >= 0 || xarg >= 0 || narg >= 0 || iarg >= 0)
-    {
-      if (optind < argc)
-        usage (stderr, 1);
-      return SetModals (xarg, narg, iarg, Larg);
-    }
-
-  strcpy (user, optind >= argc ? getlogin () : argv[optind]);
-
-  li = GetPW (getlogin (), 0);
-  if (! li)
-    return 1;
-
-  ui = GetPW (user, 1);
-  if (! ui)
-    return 1;
-
-  if (lopt || uopt || copt || Copt || eopt || Eopt || popt || Popt || Sopt)
-    {
-      USER_INFO_1008 uif;
-
-      if (li->usri3_priv != USER_PRIV_ADMIN)
-        return eprint (0, "You have no maintenance privileges.");
-      uif.usri1008_flags = ui->usri3_flags;
-      if (lopt)
-        {
-	  if (ui->usri3_priv == USER_PRIV_ADMIN)
-	    return eprint (0, "Locking an admin account is disallowed.");
-          uif.usri1008_flags |= UF_ACCOUNTDISABLE;
-        }
-      if (uopt)
-        uif.usri1008_flags &= ~UF_ACCOUNTDISABLE;
-      if (copt)
-        uif.usri1008_flags |= UF_PASSWD_CANT_CHANGE;
-      if (Copt)
-        uif.usri1008_flags &= ~UF_PASSWD_CANT_CHANGE;
-      if (eopt)
-        uif.usri1008_flags |= UF_DONT_EXPIRE_PASSWD;
-      if (Eopt)
-        uif.usri1008_flags &= ~UF_DONT_EXPIRE_PASSWD;
-      if (popt)
-        uif.usri1008_flags |= UF_PASSWD_NOTREQD;
-      if (Popt)
-        uif.usri1008_flags &= ~UF_PASSWD_NOTREQD;
-
-      if (lopt || uopt || copt || Copt || eopt || Eopt || popt || Popt)
-	{
-          ret = NetUserSetInfo (NULL, ui->usri3_name, 1008, (LPBYTE) &uif,
-	  			NULL);
-          return EvalRet (ret, NULL);
-	}
-      // Sopt
-      PrintPW (ui);
-      return 0;
-    }
-
-  if (li->usri3_priv != USER_PRIV_ADMIN && strcmp (getlogin (), user))
-    return eprint (0, "You may not change the password for %s.", user);
-
-  eprint (0, "Enter the new password (minimum of 5, maximum of 8 characters).");
-  eprint (0, "Please use a combination of upper and lower case letters and numbers.");
-
-  oldpwd[0] = '\0';
-  if (li->usri3_priv != USER_PRIV_ADMIN)
-    {
-      strcpy (oldpwd, getpass ("Old password: "));
-      if (ChangePW (user, oldpwd, oldpwd, 1))
-        return 1;
-    }
-
-  do
-    {
-      strcpy (newpwd, getpass ("New password: "));
-      if (strcmp (newpwd, getpass ("Re-enter new password: ")))
-        eprint (0, "Password is not identical.");
-      else if (! ChangePW (user, *oldpwd ? oldpwd : NULL, newpwd, 0))
-        ret = 1;
-      if (! ret && cnt < 2)
-        eprint (0, "Try again.");
-    }
-  while (! ret && ++cnt < 3);
-  return ! ret;
-}
diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc
deleted file mode 100644
index 2c475fde3..000000000
--- a/winsup/utils/path.cc
+++ /dev/null
@@ -1,352 +0,0 @@
-/* path.cc
-
-   Copyright 2001 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-/* The purpose of this file is to hide all the details about accessing
-   Cygwin's mount table.  If the format or location of the mount table
-   changes, this is the file to change to match it. */
-
-#define str(a) #a
-#define scat(a,b) str(a##b)
-#include <windows.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "cygwin/include/cygwin/version.h"
-#include "cygwin/include/sys/mount.h"
-#include "cygwin/include/mntent.h"
-
-/* Used when treating / and \ as equivalent. */
-#define SLASH_P(ch) \
-  ({ \
-      char __c = (ch); \
-      ((__c) == '/' || (__c) == '\\'); \
-   })
-
-
-static struct mnt
-  {
-    const char *native;
-    char *posix;
-    unsigned flags;
-    int issys;
-  } mount_table[255];
-
-struct mnt *root_here = NULL;
-
-static char *
-find2 (HKEY rkey, unsigned *flags, char *what)
-{
-  char *retval = 0;
-  DWORD retvallen = 0;
-  DWORD type;
-  HKEY key;
-
-  if (RegOpenKeyEx (rkey, what, 0, KEY_READ, &key) != ERROR_SUCCESS)
-    return 0;
-
-  if (RegQueryValueEx (key, "native", 0, &type, 0, &retvallen)
-      == ERROR_SUCCESS)
-    {
-      retval = (char *) malloc (MAX_PATH + 1);
-      if (RegQueryValueEx (key, "native", 0, &type, (BYTE *) retval, &retvallen)
-	  != ERROR_SUCCESS)
-	{
-	  free (retval);
-	  retval = 0;
-	}
-    }
-
-  retvallen = sizeof (flags);
-  RegQueryValueEx (key, "flags", 0, &type, (BYTE *)flags, &retvallen);
-
-  RegCloseKey (key);
-
-  return retval;
-}
-
-static LONG
-get_cygdrive0 (HKEY key, const char *what, void *val, DWORD len)
-{
-  LONG status = RegQueryValueEx (key, what, 0, 0, (BYTE *)val, &len);
-  return status;
-}
-
-static mnt *
-get_cygdrive (HKEY key, mnt *m, int issystem)
-{
-  if (get_cygdrive0 (key, CYGWIN_INFO_CYGDRIVE_FLAGS, &m->flags,
-		     sizeof (m->flags)) != ERROR_SUCCESS) {
-    free (m->posix);
-    return m;
-  }
-  get_cygdrive0 (key, CYGWIN_INFO_CYGDRIVE_PREFIX, m->posix, MAX_PATH);
-  m->native = strdup (".");
-  m->issys = issystem;
-  return m + 1;
-}
-
-static void
-read_mounts ()
-{
-  DWORD posix_path_size;
-  int res;
-  struct mnt *m = mount_table;
-  DWORD disposition;
-  char buf[10000];
-
-  root_here = NULL;
-  for (mnt *m1 = mount_table; m1->posix; m1++)
-    {
-      free (m1->posix);
-      if (m1->native)
-	free ((char *) m1->native);
-      m1->posix = NULL;
-    }
-
-  /* Loop through subkeys */
-  /* FIXME: we would like to not check MAX_MOUNTS but the heap in the
-     shared area is currently statically allocated so we can't have an
-     arbitrarily large number of mounts. */
-  for (int issystem = 0; issystem <= 1; issystem++)
-    {
-      sprintf (buf, "Software\\%s\\%s\\%s",
-	       CYGWIN_INFO_CYGNUS_REGISTRY_NAME,
-	       CYGWIN_INFO_CYGWIN_REGISTRY_NAME,
-	       CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME);
-
-      HKEY key = issystem ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-      if (RegCreateKeyEx (key, buf, 0, (LPTSTR) "Cygwin", 0, KEY_READ,
-			  0, &key, &disposition) != ERROR_SUCCESS)
-	break;
-      for (int i = 0; ;i++, m++)
-	{
-	  m->posix = (char *) malloc (MAX_PATH + 1);
-	  posix_path_size = MAX_PATH;
-	  /* FIXME: if maximum posix_path_size is 256, we're going to
-	     run into problems if we ever try to store a mount point that's
-	     over 256 but is under MAX_PATH. */
-	  res = RegEnumKeyEx (key, i, m->posix, &posix_path_size, NULL,
-			      NULL, NULL, NULL);
-
-	  if (res == ERROR_NO_MORE_ITEMS)
-	    {
-	      m = get_cygdrive (key, m, issystem);
-	      m->posix = NULL;
-	      break;
-	    }
-
-	  if (!*m->posix)
-	    goto no_go;
-	  else if (res != ERROR_SUCCESS)
-	    break;
-	  else
-	    {
-	      m->native = find2 (key, &m->flags, m->posix);
-	      m->issys = issystem;
-	      if (!m->native)
-		goto no_go;
-	    }
-	  continue;
-	no_go:
-	  free (m->posix);
-	  m->posix = NULL;
-	  m--;
-	}
-      RegCloseKey (key);
-    }
-}
-
-/* Return non-zero if PATH1 is a prefix of PATH2.
-   Both are assumed to be of the same path style and / vs \ usage.
-   Neither may be "".
-   LEN1 = strlen (PATH1).  It's passed because often it's already known.
-
-   Examples:
-   /foo/ is a prefix of /foo  <-- may seem odd, but desired
-   /foo is a prefix of /foo/
-   / is a prefix of /foo/bar
-   / is not a prefix of foo/bar
-   foo/ is a prefix foo/bar
-   /foo is not a prefix of /foobar
-*/
-
-static int
-path_prefix_p (const char *path1, const char *path2, int len1)
-{
-  /* Handle case where PATH1 has trailing '/' and when it doesn't.  */
-  if (len1 > 0 && SLASH_P (path1[len1 - 1]))
-    len1--;
-
-  if (len1 == 0)
-    return SLASH_P (path2[0]) && !SLASH_P (path2[1]);
-
-  if (strncasecmp (path1, path2, len1) != 0)
-    return 0;
-
-  return SLASH_P (path2[len1]) || path2[len1] == 0 || path1[len1 - 1] == ':';
-}
-
-static char *
-vconcat (const char *s, va_list v)
-{
-  int len;
-  char *rv, *arg;
-  va_list save_v = v;
-  int unc;
-
-  if (!s)
-    return 0;
-
-  len = strlen (s);
-
-  unc = SLASH_P (*s) && SLASH_P (s[1]);
-
-  while (1)
-    {
-      arg = va_arg (v, char *);
-      if (arg == 0)
-	break;
-      len += strlen (arg);
-    }
-  va_end (v);
-
-  rv = (char *) malloc (len + 1);
-  strcpy (rv, s);
-  v = save_v;
-  while (1)
-  {
-    arg = va_arg (v, char *);
-    if (arg == 0)
-      break;
-    strcat (rv, arg);
-  }
-  va_end (v);
-
-  char *d, *p;
-  for (p = rv; *p; p++)
-    if (*p == '\\')
-      *p = '/';
-
-  /* concat is only used for urls and files, so we can safely
-     canonicalize the results */
-  for (p = d = rv; *p; p++)
-    {
-      *d++ = *p;
-      /* special case for URLs */
-      if (*p == ':' && p[1] == '/' && p[2] == '/' && p > rv + 1)
-	{
-	  *d++ = *++p;
-	  *d++ = *++p;
-	}
-      else if (*p == '/' || *p == '\\')
-	{
-	  if (p == rv && unc)
-	    *d++ = *p++;
-	  while (p[1] == '/')
-	    p++;
-	}
-    }
-  *d = 0;
-
-  return rv;
-}
-
-static char *
-concat (const char *s, ...)
-{
-  va_list v;
-
-  va_start (v, s);
-
-  return vconcat (s, v);
-}
-
-char *
-cygpath (const char *s, ...)
-{
-  va_list v;
-  int max_len = -1;
-  struct mnt *m, *match = NULL;
-
-  if (!mount_table[0].posix)
-    read_mounts ();
-  va_start (v, s);
-  char *path = vconcat (s, v);
-  if (strncmp (path, "./", 2) == 0)
-    memmove (path, path + 2, strlen (path + 2) + 1);
-  if (strncmp (path, "/./", 3) == 0)
-    memmove (path + 1, path + 3, strlen (path + 3) + 1);
-
-  for (m = mount_table; m->posix ; m++)
-    {
-      if (m->flags & MOUNT_CYGDRIVE)
-	continue;
-
-      int n = strlen (m->posix);
-      if (n < max_len || !path_prefix_p (m->posix, path, n))
-	continue;
-      max_len = n;
-      match = m;
-    }
-
-  char *native;
-  if (match == NULL)
-    native = strdup (path);
-  else if (max_len == (int) strlen (path))
-    native = strdup (match->native);
-  else
-    native = concat (match->native, "/", path + max_len, NULL);
-  free (path);
-
-  return native;
-}
-
-static mnt *m = NULL;
-
-extern "C" FILE *
-setmntent (const char *, const char *)
-{
-  m = mount_table;
-  if (!m->posix)
-    read_mounts ();
-  return NULL;
-}
-
-extern "C" struct mntent *
-getmntent (FILE *)
-{
-  static mntent mnt;
-  if (!m->posix)
-    return NULL;
-
-  mnt.mnt_fsname = (char *) m->native;
-  mnt.mnt_dir = (char *) m->posix;
-  if (!mnt.mnt_type)
-    mnt.mnt_type = (char *) malloc (1024);
-  if (!mnt.mnt_opts)
-    mnt.mnt_opts = (char *) malloc (1024);
-  if (!m->issys)
-    strcpy (mnt.mnt_type, (char *) "user");
-  else
-    strcpy (mnt.mnt_type, (char *) "system");
-  if (!(m->flags & MOUNT_BINARY))
-    strcpy (mnt.mnt_opts, (char *) "textmode");
-  else
-    strcpy (mnt.mnt_opts, (char *) "binmode");
-  if (m->flags & MOUNT_CYGWIN_EXEC)
-    strcat (mnt.mnt_opts, (char *) ",cygexec");
-  else if (m->flags & MOUNT_EXEC)
-    strcat (mnt.mnt_opts, (char *) ",exec");
-  if ((m->flags & MOUNT_CYGDRIVE))             /* cygdrive */
-    strcat (mnt.mnt_opts, (char *) ",cygdrive");
-  mnt.mnt_freq = 1;
-  mnt.mnt_passno = 1;
-  m++;
-  return &mnt;
-}
diff --git a/winsup/utils/path.h b/winsup/utils/path.h
deleted file mode 100644
index bfc3c699e..000000000
--- a/winsup/utils/path.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* path.h
-
-   Copyright 2001, 2002, 2003 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-char *cygpath (const char *s, ...);
diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc
deleted file mode 100644
index b6307fd33..000000000
--- a/winsup/utils/ps.cc
+++ /dev/null
@@ -1,408 +0,0 @@
-/* ps.cc
-
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <stdio.h>
-#include <windows.h>
-#include <time.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <pwd.h>
-#include <sys/cygwin.h>
-#include <tlhelp32.h>
-#include <psapi.h>
-
-static const char version[] = "$Revision$";
-static char *prog_name;
-
-static struct option longopts[] =
-{
-  {"all", no_argument, NULL, 'a' },
-  {"everyone", no_argument, NULL, 'e' },
-  {"full", no_argument, NULL, 'f' },
-  {"help", no_argument, NULL, 'h' },
-  {"long", no_argument, NULL, 'l' },
-  {"summary", no_argument, NULL, 's' },
-  {"user", required_argument, NULL, 'u'},
-  {"version", no_argument, NULL, 'v'},
-  {"windows", no_argument, NULL, 'W'},
-  {NULL, 0, NULL, 0}
-};
-
-static char opts[] = "aefhlsu:vW";
-
-typedef BOOL (WINAPI *ENUMPROCESSMODULES)(
-  HANDLE hProcess,      // handle to the process
-  HMODULE * lphModule,  // array to receive the module handles
-  DWORD cb,             // size of the array
-  LPDWORD lpcbNeeded    // receives the number of bytes returned
-);
-
-typedef DWORD (WINAPI *GETMODULEFILENAME)(
-  HANDLE hProcess,
-  HMODULE hModule,
-  LPTSTR lpstrFileName,
-  DWORD nSize
-);
-
-typedef HANDLE (WINAPI *CREATESNAPSHOT)(
-    DWORD dwFlags,
-    DWORD th32ProcessID
-);
-
-// Win95 functions
-typedef BOOL (WINAPI *PROCESSWALK)(
-    HANDLE hSnapshot,
-    LPPROCESSENTRY32 lppe
-);
-
-ENUMPROCESSMODULES myEnumProcessModules;
-GETMODULEFILENAME myGetModuleFileNameEx;
-CREATESNAPSHOT myCreateToolhelp32Snapshot;
-PROCESSWALK myProcess32First;
-PROCESSWALK myProcess32Next;
-
-static BOOL WINAPI dummyprocessmodules (
-  HANDLE hProcess,      // handle to the process
-  HMODULE * lphModule,  // array to receive the module handles
-  DWORD cb,             // size of the array
-  LPDWORD lpcbNeeded    // receives the number of bytes returned
-)
-{
-  lphModule[0] = (HMODULE) *lpcbNeeded;
-  *lpcbNeeded = 1;
-  return 1;
-}
-
-static DWORD WINAPI GetModuleFileNameEx95 (
-  HANDLE hProcess,
-  HMODULE hModule,
-  LPTSTR lpstrFileName,
-  DWORD n
-)
-{
-  HANDLE h;
-  DWORD pid = (DWORD) hModule;
-
-  h = myCreateToolhelp32Snapshot (TH32CS_SNAPPROCESS, 0);
-  if (!h)
-    return 0;
-
-  PROCESSENTRY32 proc;
-  proc.dwSize = sizeof (proc);
-  if (myProcess32First(h, &proc))
-    do
-      if (proc.th32ProcessID == pid)
-	{
-	  CloseHandle (h);
-	  strcpy (lpstrFileName, proc.szExeFile);
-	  return 1;
-	}
-    while (myProcess32Next (h, &proc));
-  CloseHandle (h);
-  return 0;
-}
-
-int
-init_win ()
-{
-  OSVERSIONINFO os_version_info;
-
-  memset (&os_version_info, 0, sizeof os_version_info);
-  os_version_info.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
-  GetVersionEx (&os_version_info);
-
-  HMODULE h;
-  if (os_version_info.dwPlatformId == VER_PLATFORM_WIN32_NT)
-    {
-      h = LoadLibrary ("psapi.dll");
-      if (!h)
-	return 0;
-      myEnumProcessModules = (ENUMPROCESSMODULES) GetProcAddress (h, "EnumProcessModules");
-      myGetModuleFileNameEx = (GETMODULEFILENAME) GetProcAddress (h, "GetModuleFileNameExA");
-      if (!myEnumProcessModules || !myGetModuleFileNameEx)
-	return 0;
-      return 1;
-    }
-
-  h = GetModuleHandle("KERNEL32.DLL");
-  myCreateToolhelp32Snapshot = (CREATESNAPSHOT)GetProcAddress (h, "CreateToolhelp32Snapshot");
-  myProcess32First = (PROCESSWALK)GetProcAddress (h, "Process32First");
-  myProcess32Next  = (PROCESSWALK)GetProcAddress (h, "Process32Next");
-  if (!myCreateToolhelp32Snapshot || !myProcess32First || !myProcess32Next)
-    return 0;
-
-  myEnumProcessModules = dummyprocessmodules;
-  myGetModuleFileNameEx = GetModuleFileNameEx95;
-  return 1;
-}
-
-static char *
-start_time (external_pinfo *child)
-{
-  time_t st = child->start_time;
-  time_t t = time (NULL);
-  static char stime[40] = {'\0'};
-  char now[40];
-
-  strncpy (stime, ctime (&st) + 4, 15);
-  strcpy (now, ctime (&t) + 4);
-
-  if ((t - st) < (24 * 3600))
-    return (stime + 7);
-
-  stime[6] = '\0';
-
-  return stime;
-}
-
-#define FACTOR (0x19db1ded53ea710LL)
-#define NSPERSEC 10000000LL
-
-/* Convert a Win32 time to "UNIX" format. */
-long __stdcall
-to_time_t (FILETIME *ptr)
-{
-  /* A file time is the number of 100ns since jan 1 1601
-     stuffed into two long words.
-     A time_t is the number of seconds since jan 1 1970.  */
-
-  long rem;
-  long long x = ((long long) ptr->dwHighDateTime << 32) + ((unsigned)ptr->dwLowDateTime);
-  x -= FACTOR;                  /* number of 100ns between 1601 and 1970 */
-  rem = x % ((long long)NSPERSEC);
-  rem += (NSPERSEC / 2);
-  x /= (long long) NSPERSEC;            /* number of 100ns in a second */
-  x += (long long) (rem / NSPERSEC);
-  return x;
-}
-
-static const char *
-ttynam (int ntty)
-{
-  static char buf[5];
-  if (ntty < 0)
-    return "   ?";
-  if (ntty == TTY_CONSOLE)
-    return " con";
-  sprintf (buf, "%4d", ntty);
-  return buf;
-}
-
-static void
-usage (FILE * stream, int status)
-{
-  fprintf (stream, "\
-Usage: %s [-aefls] [-u UID]\n\
-Report process status\n\
-\n\
- -a, --all       show processes of all users\n\
- -e, --everyone  show processes of all users\n\
- -f, --full      show process uids, ppids\n\
- -h, --help      output usage information and exit\n\
- -l, --long      show process uids, ppids, pgids, winpids\n\
- -s, --summary   show process summary\n\
- -u, --user      list processes owned by UID\n\
- -v, --version   output version information and exit\n\
- -W, --windows   show windows as well as cygwin processes\n\
-With no options, %s outputs the long format by default\n",
-	   prog_name, prog_name);
-  exit (status);
-}
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-%s (cygwin) %.*s\n\
-Process Statistics\n\
-Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s\n\
-", prog_name, len, v, __DATE__);
-}
-
-int
-main (int argc, char *argv[])
-{
-  external_pinfo *p;
-  int aflag, lflag, fflag, sflag, uid;
-  cygwin_getinfo_types query = CW_GETPINFO;
-  const char *dtitle = "    PID TTY     STIME COMMAND\n";
-  const char *dfmt   = "%7d%4s%10s %s\n";
-  const char *ftitle = "     UID     PID    PPID TTY     STIME COMMAND\n";
-  const char *ffmt   = "%8.8s%8d%8d%4s%10s %s\n";
-  const char *ltitle = "      PID    PPID    PGID     WINPID  TTY  UID    STIME COMMAND\n";
-  const char *lfmt   = "%c %7d %7d %7d %10u %4s %4u %8s %s\n";
-  char ch;
-
-  aflag = lflag = fflag = sflag = 0;
-  uid = getuid ();
-  lflag = 1;
-
-  prog_name = strrchr (argv[0], '/');
-  if (prog_name == NULL)
-    prog_name = strrchr (argv[0], '\\');
-  if (prog_name == NULL)
-    prog_name = argv[0];
-  else
-    prog_name++;
-
-  while ((ch = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
-    switch (ch)
-      {
-      case 'a':
-      case 'e':
-        aflag = 1;
-        break;
-      case 'f':
-        fflag = 1;
-        break;
-      case 'h':
-        usage (stdout, 0);
-      case 'l':
-        lflag = 1;
-        break;
-      case 's':
-	sflag = 1;
-	break;
-      case 'u':
-        uid = atoi (optarg);
-        if (uid == 0)
-          {
-            struct passwd *pw;
-
-            if ((pw = getpwnam (optarg)))
-              uid = pw->pw_uid;
-            else
-              {
-                fprintf (stderr, "%s: user %s unknown\n", prog_name, optarg);
-                exit (1);
-              }
-          }
-        break;
-      case 'v':
-        print_version ();
-        exit (0);
-        break;
-      case 'W':
-	query = CW_GETPINFO_FULL;
-	aflag = 1;
-	break;
-
-      default:
-        usage (stderr, 1);
-      }
-
-  if (sflag)
-    printf (dtitle);
-  else if (fflag)
-    printf (ftitle);
-  else if (lflag)
-    printf (ltitle);
-
-  (void) cygwin_internal (CW_LOCK_PINFO, 1000);
-
-  if (query == CW_GETPINFO_FULL && !init_win ())
-    query = CW_GETPINFO;
-
-  for (int pid = 0;
-       (p = (external_pinfo *) cygwin_internal (query, pid | CW_NEXTPID));
-       pid = p->pid)
-    {
-      if (!aflag)
-        if (p->version >= EXTERNAL_PINFO_VERSION_32_BIT)
-	  {
-	    if (p->uid32 != (__uid32_t) uid)
-	      continue;
-          }
-	else if (p->uid != uid)
-	  continue;
-      char status = ' ';
-      if (p->process_state & PID_STOPPED)
-        status = 'S';
-      else if (p->process_state & PID_TTYIN)
-        status = 'I';
-      else if (p->process_state & PID_TTYOU)
-        status = 'O';
-
-      char pname[MAX_PATH];
-      if (p->process_state & (PID_ZOMBIE | PID_EXITED))
-        strcpy (pname, "<defunct>");
-      else if (p->ppid)
-	{
-	  char *s;
-	  pname[0] = '\0';
-	  cygwin_conv_to_posix_path (p->progname, pname);
-	  s = strchr (pname, '\0') - 4;
-	  if (s > pname && strcasecmp (s, ".exe") == 0)
-	    *s = '\0';
-	}
-      else if (query == CW_GETPINFO_FULL)
-	{
-	  HANDLE h = OpenProcess (PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
-	  			  FALSE, p->dwProcessId);
-	  if (!h)
-	    continue;
-	  HMODULE hm[1000];
-	  DWORD n = p->dwProcessId;
-	  if (!myEnumProcessModules (h, hm, sizeof (hm), &n))
-	    n = 0;
-	  if (!n || !myGetModuleFileNameEx (h, hm[0], pname, MAX_PATH))
-	    strcpy (pname, "*** unknown ***");
-	  FILETIME ct, et, kt, ut;
-	  if (GetProcessTimes (h, &ct, &et, &kt, &ut))
-	    p->start_time = to_time_t (&ct);
-	  CloseHandle (h);
-	}
-
-      char uname[128];
-
-      if (fflag)
-        {
-          struct passwd *pw;
-
-          if ((pw = getpwuid (p->version >= EXTERNAL_PINFO_VERSION_32_BIT ?
-	                      p->uid32 : p->uid)))
-            strcpy (uname, pw->pw_name);
-          else
-            sprintf (uname, "%u", (unsigned)
-	             (p->version >= EXTERNAL_PINFO_VERSION_32_BIT ?
-		      p->uid32 : p->uid));
-        }
-
-      if (sflag)
-        printf (dfmt, p->pid, ttynam (p->ctty), start_time (p), pname);
-      else if (fflag)
-        printf (ffmt, uname, p->pid, p->ppid, ttynam (p->ctty), start_time (p),
-	        pname);
-      else if (lflag)
-        printf (lfmt, status, p->pid, p->ppid, p->pgid,
-                p->dwProcessId, ttynam (p->ctty),
-		p->version >= EXTERNAL_PINFO_VERSION_32_BIT ? p->uid32 : p->uid,
-		start_time (p), pname);
-
-    }
-  (void) cygwin_internal (CW_UNLOCK_PINFO);
-
-  return 0;
-}
-
diff --git a/winsup/utils/regtool.cc b/winsup/utils/regtool.cc
deleted file mode 100644
index 5f2396cd9..000000000
--- a/winsup/utils/regtool.cc
+++ /dev/null
@@ -1,697 +0,0 @@
-/* regtool.cc
-
-   Copyright 2000, 2001, 2002 Red Hat Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <getopt.h>
-#include <windows.h>
-
-#define DEFAULT_KEY_SEPARATOR '\\'
-
-enum
-{
-  KT_AUTO, KT_INT, KT_STRING, KT_EXPAND, KT_MULTI
-} key_type = KT_AUTO;
-
-char key_sep = DEFAULT_KEY_SEPARATOR;
-
-#define LIST_KEYS	0x01
-#define LIST_VALS	0x02
-#define LIST_ALL	(LIST_KEYS | LIST_VALS)
-
-static const char version[] = "$Revision$";
-static char *prog_name;
-
-static struct option longopts[] =
-{
-  {"expand-string", no_argument, NULL, 'e' },
-  {"help", no_argument, NULL, 'h' },
-  {"integer", no_argument, NULL, 'i' },
-  {"keys", no_argument, NULL, 'k'},
-  {"list", no_argument, NULL, 'l'},
-  {"multi-string", no_argument, NULL, 'm'},
-  {"postfix", no_argument, NULL, 'p'},
-  {"quiet", no_argument, NULL, 'q'},
-  {"string", no_argument, NULL, 's'},
-  {"verbose", no_argument, NULL, 'v'},
-  {"version", no_argument, NULL, 'V'},
-  {"key-separator", required_argument, NULL, 'K'},
-  {NULL, 0, NULL, 0}
-};
-
-static char opts[] = "ehiklmpqsvVK::";
-
-int listwhat = 0;
-int postfix = 0;
-int verbose = 0;
-int quiet = 0;
-char **argv;
-
-HKEY key;
-char *value;
-
-static void
-usage (FILE *where = stderr)
-{
-  fprintf (where, ""
-  "Usage: %s [OPTION] (add | check | get | list | remove | unset) KEY\n"
-  "View or edit the Win32 registry\n"
-  "\n"
-  "", prog_name);
-  if (where == stdout)
-    fprintf (where, ""
-    "Actions:\n"
-    " add KEY\\SUBKEY             add new SUBKEY\n"
-    " check KEY                  exit 0 if KEY exists, 1 if not\n"
-    " get KEY\\VALUE              prints VALUE to stdout\n"
-    " list KEY                   list SUBKEYs and VALUEs\n"
-    " remove KEY                 remove KEY\n"
-    " set KEY\\VALUE [data ...]   set VALUE\n"
-    " unset KEY\\VALUE            removes VALUE from KEY\n"
-    "\n");
-  fprintf (where, ""
-  "Options for 'list' Action:\n"
-  " -k, --keys           print only KEYs\n"
-  " -l, --list           print only VALUEs\n"
-  " -p, --postfix        like ls -p, appends '\\' postfix to KEY names\n"
-  "\n"
-  "Options for 'set' Action:\n"
-  " -e, --expand-string  set type to REG_EXPAND_SZ\n"
-  " -i, --integer        set type to REG_DWORD\n"
-  " -m, --multi-string   set type to REG_MULTI_SZ\n"
-  " -s, --string         set type to REG_SZ\n"
-  "\n"
-  "Options for 'set' and 'unset' Actions:\n"
-  " -K<c>, --key-separator[=]<c>  set key separator to <c> instead of '\\'\n"
-  "\n"
-  "Other Options:\n"
-  " -h, --help     output usage information and exit\n"
-  " -q, --quiet    no error output, just nonzero return if KEY/VALUE missing\n"
-  " -v, --verbose  verbose output, including VALUE contents when applicable\n"
-  " -V, --version  output version information and exit\n"
-  "\n");
-  if (where == stdout)
-    {
-      fprintf (where, ""
-      "KEY is in the format [host]\\prefix\\KEY\\KEY\\VALUE, where host is optional\n"
-      "remote host in either \\\\hostname or hostname: format and prefix is any of:\n"
-      "  root     HKCR  HKEY_CLASSES_ROOT (local only)\n"
-      "  config   HKCC  HKEY_CURRENT_CONFIG (local only)\n"
-      "  user     HKCU  HKEY_CURRENT_USER (local only)\n"
-      "  machine  HKLM  HKEY_LOCAL_MACHINE\n"
-      "  users    HKU   HKEY_USERS\n"
-      "\n"
-      "If the keyname starts with a forward slash ('/'), the forward slash is used\n"
-      "as separator and the backslash can be used as escape character.\n");
-      fprintf (where, ""
-      "Example:\n"
-      "%s list '/machine/SOFTWARE/Classes/MIME/Database/Content Type/audio\\/wav'\n", prog_name);
-    }
-  if (where == stderr)
-    fprintf (where, "Try '%s --help' for more information.\n", prog_name);
-  exit (where == stderr ? 1 : 0);
-}
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-%s (cygwin) %.*s\n\
-Registry Tool\n\
-Copyright 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s\n\
-", prog_name, len, v, __DATE__);
-}
-
-void
-Fail (DWORD rv)
-{
-  char *buf;
-  if (!quiet)
-    {
-      FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER
-		     | FORMAT_MESSAGE_FROM_SYSTEM,
-		     0, rv, 0, (CHAR *) & buf, 0, 0);
-      fprintf (stderr, "Error (%ld): %s\n", rv, buf);
-      LocalFree (buf);
-    }
-  exit (1);
-}
-
-struct
-{
-  const char *string;
-  HKEY key;
-} wkprefixes[] =
-{
-  {"root", HKEY_CLASSES_ROOT},
-  {"HKCR", HKEY_CLASSES_ROOT},
-  {"HKEY_CLASSES_ROOT", HKEY_CLASSES_ROOT},
-  {"config", HKEY_CURRENT_CONFIG},
-  {"HKCC", HKEY_CURRENT_CONFIG},
-  {"HKEY_CURRENT_CONFIG", HKEY_CURRENT_CONFIG},
-  {"user", HKEY_CURRENT_USER},
-  {"HKCU", HKEY_CURRENT_USER},
-  {"HKEY_CURRENT_USER", HKEY_CURRENT_USER},
-  {"machine", HKEY_LOCAL_MACHINE},
-  {"HKLM", HKEY_LOCAL_MACHINE},
-  {"HKEY_LOCAL_MACHINE", HKEY_LOCAL_MACHINE},
-  {"users", HKEY_USERS},
-  {"HKU", HKEY_USERS},
-  {"HKEY_USERS", HKEY_USERS},
-  {0, 0}
-};
-
-void
-translate (char *key)
-{
-#define isodigit(c) (strchr("01234567", c))
-#define tooct(c)    ((c)-'0')
-#define tohex(c)    (strchr(_hs,tolower(c))-_hs)
-  static char _hs[] = "0123456789abcdef";
-
-  char *d = key;
-  char *s = key;
-  char c;
-
-  while (*s)
-    {
-      if (*s == '\\')
-	switch (*++s)
-	  {
-	  case 'a':
-	    *d++ = '\007';
-	    break;
-	  case 'b':
-	    *d++ = '\b';
-	    break;
-	  case 'e':
-	    *d++ = '\033';
-	    break;
-	  case 'f':
-	    *d++ = '\f';
-	    break;
-	  case 'n':
-	    *d++ = '\n';
-	    break;
-	  case 'r':
-	    *d++ = '\r';
-	    break;
-	  case 't':
-	    *d++ = '\t';
-	    break;
-	  case 'v':
-	    *d++ = '\v';
-	    break;
-	  case '0':
-	  case '1':
-	  case '2':
-	  case '3':
-	  case '4':
-	  case '5':
-	  case '6':
-	  case '7':
-	    c = tooct (*s);
-	    if (isodigit (s[1]))
-	      {
-		c = (c << 3) | tooct (*++s);
-		if (isodigit (s[1]))
-		  c = (c << 3) | tooct (*++s);
-	      }
-	    *d++ = c;
-	    break;
-	  case 'x':
-	    if (!isxdigit (s[1]))
-	      c = '0';
-	    else
-	      {
-		c = tohex (*++s);
-		if (isxdigit (s[1]))
-		  c = (c << 4) | tohex (*++s);
-	      }
-	    *d++ = c;
-	    break;
-	  default:		/* before non-special char: just add the char */
-	    *d++ = *s;
-	    break;
-	  }
-      else if (*s == '/')
-	*d++ = '\\';
-      else
-	*d++ = *s;
-      ++s;
-    }
-  *d = '\0';
-}
-
-void
-find_key (int howmanyparts, REGSAM access)
-{
-  HKEY base;
-  int rv;
-  char *n = argv[0], *e, *h, c;
-  char* host = NULL;
-  int i;
-  if (*n == '/')
-    translate (n);
-  if (*n != '\\')
-    {
-      /* expect host:/key/value format */
-      host = (char*) malloc (strlen (n) + 1);
-      host[0] = host [1] = '\\'; 
-      for (e = n, h = host + 2; *e && *e != ':'; e++, h++)
-        *h = *e;
-      *h = 0;
-      n = e + 1;
-      if (*n == '/')
-        translate (n);
-    }
-  else if (n[0] == '\\' && n[1] == '\\')
-    {
-      /* expect //host/key/value format */
-      host = (char*) malloc (strlen (n) + 1);
-      host[0] = host[1] = '\\'; 
-      for (e = n + 2, h = host + 2; *e && *e != '\\'; e++, h++)
-        *h = *e;
-      *h = 0;
-      n = e;
-    }
-  while (*n != '\\')
-    n++;
-  *n++ = 0;
-  for (e = n; *e && *e != '\\'; e++);
-  c = *e;
-  *e = 0;
-  for (i = 0; wkprefixes[i].string; i++)
-    if (strcmp (wkprefixes[i].string, n) == 0)
-      break;
-  if (!wkprefixes[i].string)
-    {
-      fprintf (stderr, "Unknown key prefix.  Valid prefixes are:\n");
-      for (i = 0; wkprefixes[i].string; i++)
-	fprintf (stderr, "\t%s\n", wkprefixes[i].string);
-      exit (1);
-    }
-
-  n = e;
-  *e = c;
-  while (*n && *n == '\\')
-    n++;
-  e = n + strlen (n);
-  if (howmanyparts > 1)
-    {
-      while (n < e && *e != key_sep)
-	e--;
-      if (*e != key_sep)
-	{
-	  key = wkprefixes[i].key;
-	  value = n;
-	  return;
-	}
-      else
-        {
-	  *e = 0;
-	  value = e + 1;
-	}
-    }
-  if (host)
-    {
-      rv = RegConnectRegistry (host, wkprefixes[i].key, &base);
-      if (rv != ERROR_SUCCESS)
-	Fail (rv);
-      free (host);
-    }
-  else
-    base = wkprefixes[i].key;
-
-  if (n[0] == 0)
-    key = base;
-  else
-    {
-      rv = RegOpenKeyEx (base, n, 0, access, &key);
-      if (rv != ERROR_SUCCESS)
-	Fail (rv);
-    }
-  //printf("key `%s' value `%s'\n", n, value);
-}
-
-
-int
-cmd_list ()
-{
-  DWORD num_subkeys, maxsubkeylen, num_values, maxvalnamelen, maxvaluelen;
-  DWORD maxclasslen;
-  char *subkey_name, *value_name, *class_name;
-  unsigned char *value_data, *vd;
-  DWORD i, j, m, n, t;
-  int v;
-
-  find_key (1, KEY_READ);
-  RegQueryInfoKey (key, 0, 0, 0, &num_subkeys, &maxsubkeylen, &maxclasslen,
-		   &num_values, &maxvalnamelen, &maxvaluelen, 0, 0);
-
-  subkey_name = (char *) malloc (maxsubkeylen + 1);
-  class_name = (char *) malloc (maxclasslen + 1);
-  value_name = (char *) malloc (maxvalnamelen + 1);
-  value_data = (unsigned char *) malloc (maxvaluelen + 1);
-
-  if (!listwhat)
-    listwhat = LIST_ALL;
-
-  if (listwhat & LIST_KEYS)
-    for (i = 0; i < num_subkeys; i++)
-      {
-	m = maxsubkeylen + 1;
-	n = maxclasslen + 1;
-	RegEnumKeyEx (key, i, subkey_name, &m, 0, class_name, &n, 0);
-	printf ("%s%s", subkey_name, (postfix || verbose) ? "\\" : "");
-
-	if (verbose)
-	  printf (" (%s)", class_name);
-
-	puts ("");
-      }
-
-  if (listwhat & LIST_VALS)
-    for (i = 0; i < num_values; i++)
-      {
-	m = maxvalnamelen + 1;
-	n = maxvaluelen + 1;
-	RegEnumValue (key, i, value_name, &m, 0, &t, (BYTE *) value_data, &n);
-	if (!verbose)
-	  printf ("%s\n", value_name);
-	else
-	  {
-	    printf ("%s = ", value_name);
-	    switch (t)
-	      {
-	      case REG_BINARY:
-		for (j = 0; j < 8 && j < n; j++)
-		  printf ("%02x ", value_data[j]);
-		printf ("\n");
-		break;
-	      case REG_DWORD:
-		printf ("0x%08lx (%lu)\n", *(DWORD *) value_data,
-			*(DWORD *) value_data);
-		break;
-	      case REG_DWORD_BIG_ENDIAN:
-		v = ((value_data[0] << 24)
-		     | (value_data[1] << 16)
-		     | (value_data[2] << 8) | (value_data[3]));
-		printf ("0x%08x (%d)\n", v, v);
-		break;
-	      case REG_EXPAND_SZ:
-	      case REG_SZ:
-		printf ("\"%s\"\n", value_data);
-		break;
-	      case REG_MULTI_SZ:
-		vd = value_data;
-		while (vd && *vd)
-		  {
-		    printf ("\"%s\"", vd);
-		    vd = vd + strlen ((const char *) vd) + 1;
-		    if (*vd)
-		      printf (", ");
-		  }
-		printf ("\n");
-		break;
-	      default:
-		printf ("? (type %d)\n", (int) t);
-	      }
-	  }
-      }
-  return 0;
-}
-
-int
-cmd_add ()
-{
-  find_key (2, KEY_ALL_ACCESS);
-  HKEY newkey;
-  DWORD newtype;
-  int rv = RegCreateKeyEx (key, value, 0, (char *) "", REG_OPTION_NON_VOLATILE,
-			   KEY_ALL_ACCESS, 0, &newkey, &newtype);
-  if (rv != ERROR_SUCCESS)
-    Fail (rv);
-
-  if (verbose)
-    {
-      if (newtype == REG_OPENED_EXISTING_KEY)
-	printf ("Key %s already exists\n", value);
-      else
-	printf ("Key %s created\n", value);
-    }
-  return 0;
-}
-
-int
-cmd_remove ()
-{
-  find_key (2, KEY_ALL_ACCESS);
-  DWORD rv = RegDeleteKey (key, value);
-  if (rv != ERROR_SUCCESS)
-    Fail (rv);
-  if (verbose)
-    printf ("subkey %s deleted\n", value);
-  return 0;
-}
-
-int
-cmd_check ()
-{
-  find_key (1, KEY_READ);
-  if (verbose)
-    printf ("key %s exists\n", argv[0]);
-  return 0;
-}
-
-int
-cmd_set ()
-{
-  int i, n;
-  DWORD v, rv;
-  char *a = argv[1], *data;
-  find_key (2, KEY_ALL_ACCESS);
-
-  if (key_type == KT_AUTO)
-    {
-      char *e;
-      strtoul (a, &e, 0);
-      if (a[0] == '%')
-	key_type = KT_EXPAND;
-      else if (a[0] && !*e)
-	key_type = KT_INT;
-      else if (argv[2])
-	key_type = KT_MULTI;
-      else
-	key_type = KT_STRING;
-    }
-
-  switch (key_type)
-    {
-    case KT_INT:
-      v = strtoul (a, 0, 0);
-      rv = RegSetValueEx (key, value, 0, REG_DWORD, (const BYTE *) &v,
-			  sizeof (v));
-      break;
-    case KT_STRING:
-      rv = RegSetValueEx (key, value, 0, REG_SZ, (const BYTE *) a, strlen (a));
-      break;
-    case KT_EXPAND:
-      rv = RegSetValueEx (key, value, 0, REG_EXPAND_SZ, (const BYTE *) a,
-			  strlen (a));
-      break;
-    case KT_MULTI:
-      for (i = 1, n = 1; argv[i]; i++)
-	n += strlen (argv[i]) + 1;
-      data = (char *) malloc (n);
-      for (i = 1, n = 0; argv[i]; i++)
-	{
-	  strcpy (data + n, argv[i]);
-	  n += strlen (argv[i]) + 1;
-	}
-      data[n] = 0;
-      rv = RegSetValueEx (key, value, 0, REG_MULTI_SZ, (const BYTE *) data,
-			  n + 1);
-      break;
-    case KT_AUTO:
-      rv = ERROR_SUCCESS;
-      break;
-    default:
-      rv = ERROR_INVALID_CATEGORY;
-      break;
-    }
-
-  if (rv != ERROR_SUCCESS)
-    Fail (rv);
-
-  return 0;
-}
-
-int
-cmd_unset ()
-{
-  find_key (2, KEY_ALL_ACCESS);
-  DWORD rv = RegDeleteValue (key, value);
-  if (rv != ERROR_SUCCESS)
-    Fail (rv);
-  if (verbose)
-    printf ("value %s deleted\n", value);
-  return 0;
-}
-
-int
-cmd_get ()
-{
-  find_key (2, KEY_READ);
-  DWORD vtype, dsize, rv;
-  char *data, *vd;
-  rv = RegQueryValueEx (key, value, 0, &vtype, 0, &dsize);
-  if (rv != ERROR_SUCCESS)
-    Fail (rv);
-  dsize++;
-  data = (char *) malloc (dsize);
-  rv = RegQueryValueEx (key, value, 0, &vtype, (BYTE *) data, &dsize);
-  if (rv != ERROR_SUCCESS)
-    Fail (rv);
-  switch (vtype)
-    {
-    case REG_BINARY:
-      fwrite (data, dsize, 0, stdout);
-      break;
-    case REG_DWORD:
-      printf ("%lu\n", *(DWORD *) data);
-      break;
-    case REG_SZ:
-      printf ("%s\n", data);
-      break;
-    case REG_EXPAND_SZ:
-      if (key_type == KT_EXPAND)	// hack
-	{
-	  char *buf;
-	  DWORD bufsize;
-	  bufsize = ExpandEnvironmentStrings (data, 0, 0);
-	  buf = (char *) malloc (bufsize + 1);
-	  ExpandEnvironmentStrings (data, buf, bufsize + 1);
-	  data = buf;
-	}
-      printf ("%s\n", data);
-      break;
-    case REG_MULTI_SZ:
-      vd = data;
-      while (vd && *vd)
-	{
-	  printf ("%s\n", vd);
-	  vd = vd + strlen ((const char *) vd) + 1;
-	}
-      break;
-    }
-  return 0;
-}
-
-struct
-{
-  const char *name;
-  int (*func) ();
-} commands[] =
-{
-  {"list", cmd_list},
-  {"add", cmd_add},
-  {"remove", cmd_remove},
-  {"check", cmd_check},
-  {"set", cmd_set},
-  {"unset", cmd_unset},
-  {"get", cmd_get},
-  {0, 0}
-};
-
-int
-main (int argc, char **_argv)
-{
-  int g;
-
-  prog_name = strrchr (_argv[0], '/');
-  if (prog_name == NULL)
-    prog_name = strrchr (_argv[0], '\\');
-  if (prog_name == NULL)
-    prog_name = _argv[0];
-  else
-    prog_name++;
-
-  while ((g = getopt_long (argc, _argv, opts, longopts, NULL)) != EOF)
-    switch (g)
-	{
-	case 'e':
-	  key_type = KT_EXPAND;
-	  break;
-	case 'k':
-	  listwhat |= LIST_KEYS;
-	  break;
-	case 'h':
-	  usage (stdout);
-	case 'i':
-	  key_type = KT_INT;
-	  break;
-	case 'l':
-	  listwhat |= LIST_VALS;
-	  break;
-	case 'm':
-	  key_type = KT_MULTI;
-	  break;
-	case 'p':
-	  postfix++;
-	  break;
-	case 'q':
-	  quiet++;
-	  break;
-	case 's':
-	  key_type = KT_STRING;
-	  break;
-	case 'v':
-	  verbose++;
-	  break;
-	case 'V':
-	  print_version ();
-	  exit (0);
-	case 'K':
-	  key_sep = *optarg;
-	  break;
-	default :
-	  usage ();
-	}
-
-  if ((_argv[optind] == NULL) || (_argv[optind+1] == NULL))
-    usage ();
-
-  argv = _argv + optind;
-  int i;
-  for (i = 0; commands[i].name; i++)
-    if (strcmp (commands[i].name, argv[0]) == 0)
-      {
-	argv++;
-	return commands[i].func ();
-      }
-  usage ();
-
-  return 0;
-}
diff --git a/winsup/utils/setfacl.c b/winsup/utils/setfacl.c
deleted file mode 100644
index 996b5ec7f..000000000
--- a/winsup/utils/setfacl.c
+++ /dev/null
@@ -1,566 +0,0 @@
-/* setfacl.c
-
-   Copyright 2000, 2001, 2002, 2003 Red Hat Inc.
-
-   Written by Corinna Vinschen <vinschen@redhat.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/types.h>
-#include <sys/acl.h>
-
-#ifndef BOOL
-#define BOOL int
-#endif
-
-#ifndef TRUE
-#define TRUE (1)
-#endif
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#ifndef ILLEGAL_MODE
-#define ILLEGAL_MODE ((mode_t)0xffffffff)
-#endif
-
-static const char version[] = "$Revision$";
-static char *prog_name;
-
-typedef enum {
-  NoAction,
-  Set,
-  Modify,
-  Delete,
-  ModNDel,
-  SetFromFile
-} action_t;
-
-mode_t getperm (char *in)
-{
-  if (isdigit (*in) && !in[1])
-    {
-      int i = atoi (in);
-      if (i < 0 || i > 7)
-        return ILLEGAL_MODE;
-      return i << 6 | i << 3 | i;
-    }
-  if (strlen (in) > 3 && strchr (" \t\n\r#", in[3]))
-    in[3] = '\0';
-  if (strlen (in) != 3)
-    return ILLEGAL_MODE;
-  if (!strchr ("r-", in[0])
-      || !strchr ("w-", in[1])
-      || !strchr ("x-", in[2]))
-    return ILLEGAL_MODE;
-  return (in[0] == 'r' ? S_IROTH : 0)
-         | (in[1] == 'w' ? S_IWOTH : 0)
-         | (in[2] == 'x' ? S_IXOTH : 0);
-}
-
-BOOL
-getaclentry (action_t action, char *c, aclent_t *ace)
-{
-  char *c2;
-
-  ace->a_type = 0;
-  ace->a_id = -1;
-  ace->a_perm = 0;
-
-  if (!strncmp (c, "default:", 8)
-      || !strncmp (c, "d:", 2))
-    {
-      ace->a_type = ACL_DEFAULT;
-      c = strchr (c, ':') + 1;
-    }
-  if (!strncmp (c, "user:", 5)
-      || !strncmp (c, "u:", 2))
-    {
-      ace->a_type |= USER_OBJ;
-      c = strchr (c, ':') + 1;
-    }
-  else if (!strncmp (c, "group:", 6)
-           || !strncmp (c, "g:", 2))
-    {
-      ace->a_type |= GROUP_OBJ;
-      c = strchr (c, ':') + 1;
-    }
-  else if (!strncmp (c, "mask:", 5)
-           || !strncmp (c, "m:", 2))
-    {
-      ace->a_type |= CLASS_OBJ;
-      c = strchr (c, ':') + 1;
-    }
-  else if (!strncmp (c, "other:", 6)
-           || !strncmp (c, "o:", 2))
-    {
-      ace->a_type |= OTHER_OBJ;
-      c = strchr (c, ':') + 1;
-    }
-  else
-    return FALSE;
-  if (ace->a_type & (USER_OBJ | GROUP_OBJ))
-    {
-      if ((c2 = strchr (c, ':')))
-        {
-          if (action == Delete)
-            return FALSE;
-          *c2 = '\0';
-        }
-      else if (action != Delete)
-        return FALSE;
-      if (c2 == c)
-        {
-          if (action == Delete)
-            return FALSE;
-        }
-      else if (isdigit (*c))
-        {
-          char *c3;
-
-          ace->a_id = strtol (c, &c3, 10);
-          if (*c3)
-            return FALSE;
-        }
-      else if (ace->a_type & USER_OBJ)
-        {
-          struct passwd *pw = getpwnam (c);
-          if (!pw)
-            return FALSE;
-          ace->a_id = pw->pw_uid;
-        }
-      else
-        {
-          struct group *gr = getgrnam (c);
-          if (!gr)
-            return FALSE;
-          ace->a_id = gr->gr_gid;
-        }
-      if (c2 != c)
-        {
-	  if (ace->a_type & USER_OBJ)
-	    {
-	      ace->a_type &= ~USER_OBJ;
-	      ace->a_type |= USER;
-	    }
-	  else
-	    {
-	      ace->a_type &= ~GROUP_OBJ;
-	      ace->a_type |= GROUP;
-	    }
-	}
-      if (c2)
-        c = c2 + 1;
-    }
-  /* FIXME: currently allow both :: and : */
-  else if (*c == ':')
-    c++;
-  if (action == Delete)
-    {
-      if ((ace->a_type & (CLASS_OBJ | OTHER_OBJ))
-          && *c)
-        return FALSE;
-      ace->a_perm = ILLEGAL_MODE;
-      return TRUE;
-    }
-  if ((ace->a_perm = getperm (c)) == ILLEGAL_MODE)
-    return FALSE;
-  return TRUE;
-}
-
-BOOL
-getaclentries (action_t action, char *buf, aclent_t *acls, int *idx)
-{
-  char *c;
-
-  if (action == SetFromFile)
-    {
-      FILE *fp;
-      char fbuf[256], *fb;
-
-      if (!strcmp (buf, "-"))
-        fp = stdin;
-      else if (! (fp = fopen (buf, "r")))
-        return FALSE;
-      while ((fb = fgets (fbuf, 256, fp)))
-        {
-	  while (strchr (" \t", *fb))
-	    ++fb;
-	  if (strchr ("\n\r#", *fb))
-	    continue;
-          if (!getaclentry (action, fb, acls + (*idx)++))
-            {
-              fclose (fp);
-              return FALSE;
-            }
-        }
-      if (fp != stdin)
-	fclose (fp);
-    }
-  else
-    for (c = strtok (buf, ","); c; c = strtok (NULL, ","))
-      if (!getaclentry (action, c, acls + (*idx)++))
-        return FALSE;
-  return TRUE;
-}
-
-int
-searchace (aclent_t *aclp, int nentries, int type, int id)
-{
-  int i;
-
-  for (i = 0; i < nentries; ++i)
-    if ((aclp[i].a_type == type && (id < 0 || aclp[i].a_id == id))
-        || !aclp[i].a_type)
-      return i;
-  return -1;
-}
-
-int
-modacl (aclent_t *tgt, int tcnt, aclent_t *src, int scnt)
-{
-  int t, s, i;
-
-  for (s = 0; s < scnt; ++s)
-    {
-      t = searchace (tgt, MAX_ACL_ENTRIES, src[s].a_type,
-                     (src[s].a_type & (USER | GROUP)) ? src[s].a_id : -1);
-      if (t < 0)
-        return -1;
-      if (src[s].a_perm == ILLEGAL_MODE)
-        {
-          if (t < tcnt)
-            {
-              for (i = t + 1; i < tcnt; ++i)
-                tgt[i - 1] = tgt[i];
-              --tcnt;
-            }
-        }
-      else
-        {
-          tgt[t] = src[s];
-          if (t >= tcnt)
-            ++tcnt;
-        }
-    }
-  return tcnt;
-}
-
-void
-setfacl (action_t action, char *path, aclent_t *acls, int cnt)
-{
-  aclent_t lacl[MAX_ACL_ENTRIES];
-  int lcnt;
-
-  memset (lacl, 0, sizeof lacl);
-  if (action == Set)
-    {
-      if (acl (path, SETACL, cnt, acls))
-        perror (prog_name);
-      return;
-    }
-  if ((lcnt = acl (path, GETACL, MAX_ACL_ENTRIES, lacl)) < 0
-      || (lcnt = modacl (lacl, lcnt, acls, cnt)) < 0
-      || (lcnt = acl (path, SETACL, lcnt, lacl)) < 0)
-    perror (prog_name);
-}
-
-static void
-usage (FILE * stream)
-{
-  fprintf (stream, ""
-            "Usage: %s [-r] (-f ACL_FILE | -s acl_entries) FILE...\n"
-            "       %s [-r] ([-d acl_entries] [-m acl_entries]) FILE...\n"
-            "Modify file and directory access control lists (ACLs)\n"
-            "\n"
-            "  -d, --delete     delete one or more specified ACL entries\n"
-            "  -f, --file       set ACL entries for FILE to ACL entries read\n"
-            "                   from a ACL_FILE\n"
-            "  -m, --modify     modify one or more specified ACL entries\n"
-            "  -r, --replace    replace mask entry with maximum permissions\n"
-            "                   needed for the file group class\n"
-            "  -s, --substitute substitute specified ACL entries for the\n"
-            "                   ACL of FILE\n"
-            "  -h, --help       output usage information and exit\n"
-            "  -v, --version    output version information and exit\n"
-            "\n"
-            "At least one of (-d, -f, -m, -s) must be specified\n"
-            "\n"
-            "", prog_name, prog_name);
-  if (stream == stdout) 
-  {
-    printf(""
-            "     Acl_entries are one or more comma-separated ACL entries \n"
-            "     from the following list:\n"
-            "\n"
-            "         u[ser]::perm\n"
-            "         u[ser]:uid:perm\n"
-            "         g[roup]::perm\n"
-            "         g[roup]:gid:perm\n"
-            "         m[ask]:perm\n"
-            "         o[ther]:perm\n"
-            "\n"
-            "     Default entries are like the above with the additional\n"
-            "     default identifier. For example: \n"
-            "\n"
-            "         d[efault]:u[ser]:uid:perm\n"
-            "\n"
-            "     `perm' is either a 3-char permissions string in the form\n"
-            "     \"rwx\" with the character - for no permission\n"
-            "     or it is the octal representation of the permissions, a\n"
-            "     value from 0 (equivalent to \"---\") to 7 (\"rwx\").\n"
-            "     `uid' is a user name or a numerical uid.\n"
-            "     `gid' is a group name or a numerical gid.\n"
-            "\n"
-            "\n"
-            "For each file given as parameter, %s will either replace its\n"
-            "complete ACL (-s, -f), or it will add, modify, or delete ACL\n"
-            "entries.\n"
-            "\n"
-            "The following options are supported:\n"
-            "\n"
-            "-d   Delete one or more specified entries from the file's ACL.\n"
-            "     The owner, group and others entries must not be deleted.\n"
-            "     Acl_entries to be deleted should be specified without\n"
-            "     permissions, as in the following list:\n"
-            "\n"
-            "         u[ser]:uid\n"
-            "         g[roup]:gid\n"
-            "         d[efault]:u[ser]:uid\n"
-            "         d[efault]:g[roup]:gid\n"
-            "         d[efault]:m[ask]:\n"
-            "         d[efault]:o[ther]:\n"
-            "\n"
-            "-f   Take the Acl_entries from ACL_FILE one per line. Whitespace\n"
-            "     characters are ignored, and the character \"#\" may be used\n"
-            "     to start a comment.  The special filename \"-\" indicates\n"
-            "     reading from stdin.\n"
-            "     Required entries are\n"
-            "     - One user entry for the owner of the file.\n"
-            "     - One group entry for the group of the file.\n"
-            "     - One other entry.\n"
-            "     If additional user and group entries are given:\n"
-            "     - A mask entry for the file group class of the file.\n"
-            "     - No duplicate user or group entries with the same uid/gid.\n"
-            "     If it is a directory:\n"
-            "     - One default user entry for the owner of the file.\n"
-            "     - One default group entry for the group of the file.\n"
-            "     - One default mask entry for the file group class.\n"
-            "     - One default other entry.\n"
-            "\n"
-            "-m   Add or modify one or more specified ACL entries.\n"
-            "     Acl_entries is a comma-separated list of entries from the \n"
-            "     same list as above.\n"
-            "\n"
-            "-r   Causes the permissions specified in the mask entry to be\n"
-            "     ignored and replaced by the maximum permissions needed for\n"
-            "     the file group class.\n"
-            "\n"
-            "-s   Like -f, but substitute the file's ACL with Acl_entries\n" 
-            "     specified in a comma-separated list on the command line.\n"
-            "\n"
-            "While the -d and -m options may be used in the same command, the\n"
-            "-f and -s options may be used only exclusively.\n"
-            "\n"
-            "Directories may contain default ACL entries.  Files created\n"
-            "in a directory that contains default ACL entries will have\n"
-            "permissions according to the combination of the current umask,\n"
-            "the explicit permissions requested and the default ACL entries\n"
-            "Note: Under Cygwin, the default ACL entries are not taken into\n"
-            "account currently.\n", prog_name);
-  }
-  else
-    fprintf(stream, "Try `%s --help' for more information.\n", prog_name);
-}
-
-struct option longopts[] = {
-  {"delete", required_argument, NULL, 'd'},
-  {"file", required_argument, NULL, 'f'},
-  {"modify", required_argument, NULL, 'm'},
-  {"replace", no_argument, NULL, 'r'},
-  {"substitute", required_argument, NULL, 's'},
-  {"help", no_argument, NULL, 'h'},
-  {"version", no_argument, NULL, 'v'},
-  {0, no_argument, NULL, 0}
-};
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-setfacl (cygwin) %.*s\n\
-ACL Modification Utility\n\
-Copyright 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s\n\
-", len, v, __DATE__);
-}
-
-int
-main (int argc, char **argv)
-{
-  int c;
-  action_t action = NoAction;
-  int ropt = 0;
-  aclent_t acls[MAX_ACL_ENTRIES];
-  int aclidx = 0;
-
-  prog_name = strrchr (argv[0], '/');
-  if (prog_name == NULL)
-    prog_name = strrchr (argv[0], '\\');
-  if (prog_name == NULL)
-    prog_name = argv[0];
-  else
-    prog_name++;
-
-  memset (acls, 0, sizeof acls);
-  while ((c = getopt_long (argc, argv, "d:f:hm:rs:v", longopts, NULL)) != EOF)
-    switch (c)
-      {
-      case 'd':
-        if (action == NoAction)
-          action = Delete;
-        else if (action == Modify)
-          action = ModNDel;
-        else
-          {
-            usage (stderr);
-            return 1;
-	  }
-        if (! getaclentries (Delete, optarg, acls, &aclidx))
-          {
-            fprintf (stderr, "%s: illegal acl entries\n", prog_name);
-            return 2;
-          }
-        break;
-      case 'f':
-        if (action == NoAction)
-          action = Set;
-        else
-          {
-            usage (stderr);
-            return 1;
-	  }
-        if (! getaclentries (SetFromFile, optarg, acls, &aclidx))
-          {
-            fprintf (stderr, "%s: illegal acl entries\n", prog_name);
-            return 2;
-          }
-        break;
-      case 'h':
-        usage (stdout);
-        return 0;
-      case 'm':
-        if (action == NoAction)
-          action = Modify;
-        else if (action == Delete)
-          action = ModNDel;
-        else
-          {
-            usage (stderr);
-            return 1;
-	  }
-        if (! getaclentries (Modify, optarg, acls, &aclidx))
-          {
-            fprintf (stderr, "%s: illegal acl entries\n", prog_name);
-            return 2;
-          }
-        break;
-      case 'r':
-        if (!ropt)
-          ropt = 1;
-        else
-          {
-            usage (stderr);
-            return 1;
-	  }
-        break;
-      case 's':
-        if (action == NoAction)
-          action = Set;
-        else
-          {
-            usage (stderr);
-            return 1;
-	  }
-        if (! getaclentries (Set, optarg, acls, &aclidx))
-          {
-            fprintf (stderr, "%s: illegal acl entries\n", prog_name);
-            return 2;
-          }
-        break;
-      case 'v':
-        print_version ();
-        return 0;
-      default:
-        usage (stderr);
-        return 1;
-      }
-  if (action == NoAction)
-    {
-      usage (stderr);
-      return 1;
-    }
-  if (optind > argc - 1)
-    {
-      usage (stderr);
-      return 1;
-    }
-  if (action == Set)
-    switch (aclcheck (acls, aclidx, NULL))
-      {
-      case GRP_ERROR:
-        fprintf (stderr, "%s: more than one group entry.\n", prog_name);
-        return 2;
-      case USER_ERROR:
-        fprintf (stderr, "%s: more than one user entry.\n", prog_name);
-        return 2;
-      case CLASS_ERROR:
-        fprintf (stderr, "%s: more than one mask entry.\n", prog_name);
-        return 2;
-      case OTHER_ERROR:
-        fprintf (stderr, "%s: more than one other entry.\n", prog_name);
-        return 2;
-      case DUPLICATE_ERROR:
-        fprintf (stderr, "%s: duplicate additional user or group.\n", prog_name);
-        return 2;
-      case ENTRY_ERROR:
-        fprintf (stderr, "%s: invalid entry type.\n", prog_name);
-        return 2;
-      case MISS_ERROR:
-        fprintf (stderr, "%s: missing entries.\n", prog_name);
-        return 2;
-      case MEM_ERROR:
-        fprintf (stderr, "%s: out of memory.\n", prog_name);
-        return 2;
-      default:
-        break;
-      }
-  for (c = optind; c < argc; ++c)
-    setfacl (action, argv[c], acls, aclidx);
-  return 0;
-}
diff --git a/winsup/utils/ssp.c b/winsup/utils/ssp.c
deleted file mode 100644
index aadfa5cfe..000000000
--- a/winsup/utils/ssp.c
+++ /dev/null
@@ -1,951 +0,0 @@
-/*
- * Copyright (c) 2000, 2001, 2002 Red Hat, Inc.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by DJ Delorie <dj@redhat.com>
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <time.h>
-#include <ctype.h>
-#include <windows.h>
-#include <getopt.h>
-
-static const char version[] = "$Revision$";
-static char *prog_name;
-
-static struct option longopts[] =
-{
-  {"console-trace", no_argument, NULL, 'c' },
-  {"disable", no_argument, NULL, 'd' },
-  {"enable", no_argument, NULL, 'e' },
-  {"help", no_argument, NULL, 'h' },
-  {"dll", no_argument, NULL, 'l' },
-  {"sub-threads", no_argument, NULL, 's' },
-  {"trace-eip", no_argument, NULL, 't' },
-  {"verbose", no_argument, NULL, 'v' },
-  {"version", no_argument, NULL, 'V' },
-  {NULL, 0, NULL, 0}
-};
-
-static char opts[] = "cdehlstvV";
-
-#define KERNEL_ADDR 0x77000000
-
-#define TRACE_SSP 0
-
-#define VERBOSE	1
-#define TIMES	1000
-
-/* from winsup/gmon.h */
-struct gmonhdr {
-	unsigned long	lpc;	/* base pc address of sample buffer */
-	unsigned long	hpc;	/* max pc address of sampled buffer */
-	int	ncnt;		/* size of sample buffer (plus this header) */
-	int	version;	/* version number */
-	int	profrate;	/* profiling clock rate */
-	int	spare[3];	/* reserved */
-};
-#define GMONVERSION	0x00051879
-#define HISTCOUNTER unsigned short
-
-typedef struct {
-  unsigned int base_address;
-  int pcount;
-  int scount;
-  char *name;
-} DllInfo;
-
-typedef struct {
-  unsigned int address;
-  unsigned char real_byte;
-} PendingBreakpoints;
-
-unsigned low_pc=0, high_pc=0;
-unsigned last_pc=0, pc, last_sp=0, sp;
-int total_cycles, count;
-HANDLE hProcess;
-PROCESS_INFORMATION procinfo;
-STARTUPINFO startup;
-CONTEXT context;
-HISTCOUNTER *hits=0;
-struct gmonhdr hdr;
-int running = 1, profiling = 1;
-char dll_name[1024], *dll_ptr, *cp;
-int eip;
-unsigned opcode_count = 0;
-
-int stepping_enabled = 1;
-int tracing_enabled = 0;
-int trace_console = 0;
-int trace_all_threads = 0;
-int dll_counts = 0;
-int verbose = 0;
-
-#define MAXTHREADS 100
-DWORD active_thread_ids[MAXTHREADS];
-HANDLE active_threads[MAXTHREADS];
-DWORD thread_step_flags[MAXTHREADS];
-DWORD thread_return_address[MAXTHREADS];
-int num_active_threads = 0;
-int suspended_count=0;
-
-#define MAXDLLS 100
-DllInfo dll_info[MAXDLLS];
-int num_dlls=0;
-
-#define MAXPENDS 100
-PendingBreakpoints pending_breakpoints[MAXPENDS];
-int num_breakpoints=0;
-
-static void
-add_breakpoint (unsigned int address)
-{
-  int i;
-  DWORD rv;
-  static char int3[] = { 0xcc };
-  for (i=0; i<num_breakpoints; i++)
-    {
-      if (pending_breakpoints[i].address == address)
-	return;
-      if (pending_breakpoints[i].address == 0)
-	break;
-    }
-  if (i == MAXPENDS)
-    return;
-  pending_breakpoints[i].address = address;
-  ReadProcessMemory (hProcess,
-		    (void *)address,
-		    &(pending_breakpoints[i].real_byte),
-		    1, &rv);
-
-  WriteProcessMemory (hProcess,
-		     (void *)address,
-		     (LPVOID)int3, 1, &rv);
-  if (i >= num_breakpoints)
-    num_breakpoints = i+1;
-}
-
-static int
-remove_breakpoint (unsigned int address)
-{
-  int i;
-  DWORD rv;
-  for (i=0; i<num_breakpoints; i++)
-    {
-      if (pending_breakpoints[i].address == address)
-	{
-	  pending_breakpoints[i].address = 0;
-	  WriteProcessMemory (hProcess,
-			     (void *)address,
-			     &(pending_breakpoints[i].real_byte),
-			     1, &rv);
-	  return 1;
-	}
-    }
-  return 0;
-}
-
-static HANDLE
-lookup_thread_id (DWORD threadId, int *tix)
-{
-  int i;
-  for (i=0; i<num_active_threads; i++)
-    if (active_thread_ids[i] == threadId)
-      {
-	if (tix) *tix = i;
-	return active_threads[i];
-      }
-  return 0;
-}
-
-static void
-set_step_threads (int threadId, int trace)
-{
-  int rv, tix;
-  HANDLE thread = lookup_thread_id (threadId, &tix);
-
-  rv = GetThreadContext (thread, &context);
-  if (rv != -1)
-    {
-      thread_step_flags[tix] = trace;
-      if (trace)
-	context.EFlags |= 0x100; /* TRAP (single step) flag */
-      else
-	context.EFlags &= ~0x100; /* TRAP (single step) flag */
-      SetThreadContext (thread, &context);
-    }
-}
-
-static void
-set_steps ()
-{
-  int i, s;
-  for (i=0; i<num_active_threads; i++)
-    {
-      GetThreadContext (active_threads[i], &context);
-      s = context.EFlags & 0x0100;
-      if (!s && thread_step_flags[i])
-	{
-	  set_step_threads (active_thread_ids[i], 1);
-	}
-    }
-}
-
-static int
-dll_sort (const void *va, const void *vb)
-{
-  DllInfo *a = (DllInfo *)va;
-  DllInfo *b = (DllInfo *)vb;
-  if (a->base_address < b->base_address)
-    return -1;
-  return 1;
-}
-
-static char *
-addr2dllname (unsigned int addr)
-{
-  int i;
-  for (i=num_dlls-1; i>=0; i--)
-    {
-      if (dll_info[i].base_address < addr)
-	{
-	  return dll_info[i].name;
-	}
-    }
-  return (char *)"";
-}
-
-static void
-dump_registers (HANDLE thread)
-{
-  context.ContextFlags = CONTEXT_FULL;
-  GetThreadContext (thread, &context);
-  printf ("eax %08lx ebx %08lx ecx %08lx edx %08lx eip\n",
-	  context.Eax, context.Ebx, context.Ecx, context.Edx);
-  printf ("esi %08lx edi %08lx ebp %08lx esp %08lx %08lx\n",
-	  context.Esi, context.Esi, context.Ebp, context.Esp, context.Eip);
-}
-
-typedef struct Edge {
-  struct Edge *next;
-  unsigned int from_pc;
-  unsigned int to_pc;
-  unsigned int count;
-} Edge;
-
-Edge *edges[4096];
-
-void
-store_call_edge (unsigned int from_pc, unsigned int to_pc)
-{
-  Edge *e;
-  unsigned int h = ((from_pc + to_pc)>>4) & 4095;
-  for (e=edges[h]; e; e=e->next)
-    if (e->from_pc == from_pc && e->to_pc == to_pc)
-      break;
-  if (!e)
-    {
-      e = (Edge *)malloc (sizeof (Edge));
-      e->next = edges[h];
-      edges[h] = e;
-      e->from_pc = from_pc;
-      e->to_pc = to_pc;
-      e->count = 0;
-    }
-  e->count++;
-}
-
-void
-write_call_edges (FILE *f)
-{
-  int h;
-  Edge *e;
-  for (h=0; h<4096; h++)
-    for (e=edges[h]; e; e=e->next)
-      fwrite (&(e->from_pc), 1, 3*sizeof (unsigned int), f);
-}
-
-char *
-wide_strdup (char *cp)
-{
-  unsigned short *s = (unsigned short *)cp;
-  int len;
-  char *rv;
-  for (len=0; s[len]; len++);
-  rv = (char *)malloc (len+1);
-  for (len=0; s[len]; len++)
-    rv[len] = s[len];
-  rv[len] = 0;
-  return rv;
-}
-
-void
-run_program (char *cmdline)
-{
-  FILE *tracefile = 0;
-  int tix, i;
-  HANDLE hThread;
-  char *string;
-
-  memset (&startup, 0, sizeof (startup));
-  startup.cb = sizeof (startup);
-
-  if (!CreateProcess (0, cmdline, 0, 0, 0,
-		     CREATE_NEW_PROCESS_GROUP
-		     | CREATE_SUSPENDED
-		     | DEBUG_PROCESS
-		     | DEBUG_ONLY_THIS_PROCESS,
-		     0, 0, &startup, &procinfo))
-    {
-      fprintf (stderr, "Can't create process: error %ld\n", GetLastError ());
-      exit (1);
-    }
-
-  hProcess = procinfo.hProcess;
-#if 0
-  printf ("procinfo: %08x %08x %08x %08x\n",
-	 hProcess, procinfo.hThread, procinfo.dwProcessId, procinfo.dwThreadId);
-#endif
-
-  active_threads[0] = procinfo.hThread;
-  active_thread_ids[0] = procinfo.dwThreadId;
-  thread_step_flags[0] = stepping_enabled;
-  num_active_threads = 1;
-
-  dll_info[0].base_address = 0;
-  dll_info[0].pcount = 0;
-  dll_info[0].scount = 0;
-  dll_info[0].name = cmdline;
-  num_dlls = 1;
-
-  SetThreadPriority (procinfo.hThread, THREAD_PRIORITY_IDLE);
-
-  context.ContextFlags = CONTEXT_FULL;
-
-  ResumeThread (procinfo.hThread);
-
-  total_cycles = 0;
-
-  if (tracing_enabled)
-    {
-      tracefile = fopen ("trace.ssp", "w");
-      if (!tracefile)
-	{
-	  tracing_enabled = 0;
-	  perror ("trace.ssp");
-	}
-    }
-
-  running = 1;
-  while (running)
-    {
-      int src, dest;
-      DWORD rv;
-      DEBUG_EVENT event;
-      int contv = DBG_CONTINUE;
-
-      event.dwDebugEventCode = -1;
-      if (!WaitForDebugEvent (&event, INFINITE))
-	{
-	  printf ("idle...\n");
-	}
-
-      hThread = lookup_thread_id (event.dwThreadId, &tix);
-
-#if 0
-      printf ("DE: %x/%d %d %d ",
-	     hThread, tix,
-	     event.dwDebugEventCode, num_active_threads);
-      for (src=0; src<num_active_threads; src++)
-	{
-	  int sc = SuspendThread (active_threads[src]);
-	  int rv = GetThreadContext (active_threads[src], &context);
-	  ResumeThread (active_threads[src]);
-	  printf (" [%x,%x,%x]",
-		 active_threads[src], context.Eip, active_thread_ids[src]);
-	}
-      printf ("\n");
-#endif
-
-      switch (event.dwDebugEventCode)
-	{
-
-	case CREATE_PROCESS_DEBUG_EVENT:
-	  break;
-
-	case CREATE_THREAD_DEBUG_EVENT:
-	  if (verbose)
-	    printf ("create thread %08lx at %08x %s\n",
-		   event.dwThreadId,
-		   (int)event.u.CreateThread.lpStartAddress,
-		   addr2dllname ((unsigned int)event.u.CreateThread.lpStartAddress));
-
-	  active_thread_ids[num_active_threads] = event.dwThreadId;
-	  active_threads[num_active_threads] = event.u.CreateThread.hThread;
-	  thread_return_address[num_active_threads] = 0;
-	  num_active_threads++;
-
-	  if (trace_all_threads && stepping_enabled)
-	    {
-	      thread_step_flags[num_active_threads-1] = stepping_enabled;
-	      add_breakpoint ((int)event.u.CreateThread.lpStartAddress);
-	    }
-
-	  break;
-
-	case EXIT_THREAD_DEBUG_EVENT:
-	  if (verbose)
-	    printf ("exit thread %08lx, code=%ld\n",
-		   event.dwThreadId,
-		   event.u.ExitThread.dwExitCode);
-
-	  for (src=0, dest=0; src<num_active_threads; src++)
-	    if (active_thread_ids[src] != event.dwThreadId)
-	      {
-		active_thread_ids[dest] = active_thread_ids[src];
-		active_threads[dest] = active_threads[src];
-		dest++;
-	      }
-	  num_active_threads = dest;
-	  break;
-
-	case EXCEPTION_DEBUG_EVENT:
-	  rv = GetThreadContext (hThread, &context);
-	  switch (event.u.Exception.ExceptionRecord.ExceptionCode)
-	    {
-	    case STATUS_BREAKPOINT:
-	      if (remove_breakpoint ((int)event.u.Exception.ExceptionRecord.ExceptionAddress))
-		{
-		  context.Eip --;
-		  if (!rv)
-		    SetThreadContext (hThread, &context);
-		  if (ReadProcessMemory (hProcess, (void *)context.Esp, &rv, 4, &rv))
-		      thread_return_address[tix] = rv;
-		}
-	      set_step_threads (event.dwThreadId, stepping_enabled);
-	    case STATUS_SINGLE_STEP:
-	      opcode_count++;
-	      pc = (unsigned int)event.u.Exception.ExceptionRecord.ExceptionAddress;
-	      sp = (unsigned int)context.Esp;
-	      if (tracing_enabled)
-		fprintf (tracefile, "%08x %08lx\n", pc, event.dwThreadId);
-	      if (trace_console)
-		{
-		  printf ("%d %08x\n", tix, pc);
-		  fflush (stdout);
-		}
-
-	      if (dll_counts)
-		{
-		  int i;
-		  for (i=num_dlls-1; i>=0; i--)
-		    {
-		      if (dll_info[i].base_address < context.Eip)
-			{
-			  if (hThread == procinfo.hThread)
-			    dll_info[i].pcount++;
-			  else
-			    dll_info[i].scount++;
-			  break;
-			}
-		    }
-		}
-
-	      if (pc < last_pc || pc > last_pc+10)
-		{
-		  static int ncalls=0;
-		  static int qq=0;
-		  if (++qq % 100 == 0)
-		    fprintf (stderr, " %08x %d %d \r",
-			    pc, ncalls, opcode_count);
-
-		  if (sp == last_sp-4)
-		    {
-		      ncalls++;
-		      store_call_edge (last_pc, pc);
-		      if (last_pc < KERNEL_ADDR && pc > KERNEL_ADDR)
-			{
-			  int retaddr;
-			  DWORD rv;
-			  ReadProcessMemory (hProcess,
-					    (void *)sp,
-					    (LPVOID)&(retaddr),
-					    4, &rv);
-#if 0
-			  printf ("call last_pc = %08x pc = %08x rv = %08x\n",
-				 last_pc, pc, retaddr);
-			  /* experimental - try to skip kernel calls for speed */
-			  add_breakpoint (retaddr);
-			  set_step_threads (event.dwThreadId, 0);
-#endif
-			}
-		    }
-		}
-
-	      total_cycles++;
-	      last_sp = sp;
-	      last_pc = pc;
-	      if (pc >= low_pc && pc < high_pc)
-		hits[(pc - low_pc)/2] ++;
-	      break;
-	    default:
-	      if (verbose)
-		{
-		  printf ("exception %ld, ", event.u.Exception.dwFirstChance);
-		  printf ("code: %lx flags: %lx\n",
-			 event.u.Exception.ExceptionRecord.ExceptionCode,
-			 event.u.Exception.ExceptionRecord.ExceptionFlags);
-		  if (event.u.Exception.dwFirstChance == 1)
-		    dump_registers (hThread);
-		}
-	      contv = DBG_EXCEPTION_NOT_HANDLED;
-	      running = 0;
-	      break;
-	    }
-
-	  if (!rv)
-	    {
-	      if (pc == thread_return_address[tix])
-		{
-		  if (context.EFlags & 0x100)
-		    {
-		      context.EFlags &= ~0x100; /* TRAP (single step) flag */
-		      SetThreadContext (hThread, &context);
-		    }
-		}
-	      else if (stepping_enabled)
-		{
-		  if (!(context.EFlags & 0x100))
-		    {
-		      context.EFlags |= 0x100; /* TRAP (single step) flag */
-		      SetThreadContext (hThread, &context);
-		    }
-		}
-	    }
-	  break;
-
-	case OUTPUT_DEBUG_STRING_EVENT:
-	  string = (char *)malloc (event.u.DebugString.nDebugStringLength+1);
-	  i = ReadProcessMemory (hProcess,
-			    event.u.DebugString.lpDebugStringData,
-			    (LPVOID)string,
-			    event.u.DebugString.nDebugStringLength,
-			    &rv);
-	  if (!i)
-	    {
-	      printf ("error reading memory: %ld %ld\n", rv, GetLastError ());
-	    }
-	  if (verbose)
-	    printf ("ODS: %x/%d \"%s\"\n",
-		   (int)hThread, tix, string);
-
-	  if (strcmp (string, "ssp on") == 0)
-	    {
-	      stepping_enabled = 1;
-	      set_step_threads (event.dwThreadId, 1);
-	    }
-
-	  if (strcmp (string, "ssp off") == 0)
-	    {
-	      stepping_enabled = 0;
-	      set_step_threads (event.dwThreadId, 0);
-	    }
-
-	  break;
-
-
-	case LOAD_DLL_DEBUG_EVENT:
-	  if (verbose)
-	    printf ("load dll %08x:",
-		   (int)event.u.LoadDll.lpBaseOfDll);
-
-	  dll_ptr = (char *)"( u n k n o w n ) \0\0";
-	  if (event.u.LoadDll.lpImageName)
-	    {
-	      ReadProcessMemory (hProcess,
-				event.u.LoadDll.lpImageName,
-				(LPVOID)&src,
-				sizeof (src),
-				&rv);
-	      if (src)
-		{
-		  ReadProcessMemory (hProcess,
-				    (void *)src,
-				    (LPVOID)dll_name,
-				    sizeof (dll_name),
-				    &rv);
-		  dll_name[rv] = 0;
-		  dll_ptr = dll_name;
-		  for (cp=dll_name; *cp; cp++)
-		    {
-		      if (*cp == '\\' || *cp == '/')
-			{
-			  dll_ptr = cp+1;
-			}
-		      *cp = tolower (*cp);
-		    }
-		}
-	    }
-
-
-	  dll_info[num_dlls].base_address
-	    = (unsigned int)event.u.LoadDll.lpBaseOfDll;
-	  dll_info[num_dlls].pcount = 0;
-	  dll_info[num_dlls].scount = 0;
-	  dll_info[num_dlls].name = wide_strdup (dll_ptr);
-	  if (verbose)
-	    printf (" %s\n", dll_info[num_dlls].name);
-	  num_dlls++;
-	  qsort (dll_info, num_dlls, sizeof (DllInfo), dll_sort);
-
-	  break;
-
-	case UNLOAD_DLL_DEBUG_EVENT:
-	  if (verbose)
-	    printf ("unload dll\n");
-	  break;
-
-	case EXIT_PROCESS_DEBUG_EVENT:
-	  if (verbose)
-	    printf ("process %08lx %08lx exit %ld\n",
-		   event.dwProcessId, event.dwThreadId,
-		   event.u.ExitProcess.dwExitCode);
-
-	  running = 0;
-	  break;
-	}
-
-      set_steps ();
-      ContinueDebugEvent (event.dwProcessId, event.dwThreadId, contv);
-    }
-
-  count = 0;
-  for (pc=low_pc; pc<high_pc; pc+=2)
-    {
-      count += hits[(pc - low_pc)/2];
-    }
-  printf ("total cycles: %d, counted cycles: %d\n", total_cycles, count);
-
-  if (tracing_enabled)
-    fclose (tracefile);
-
-}
-
-static void
-usage (FILE * stream)
-{
-  fprintf (stream , ""
-  "Usage: %s [options] low_pc high_pc command...\n"
-  "Single-step profile COMMAND\n"
-  "\n"
-  " -c, --console-trace  trace every EIP value to the console. *Lots* slower.\n"
-  " -d, --disable        disable single-stepping by default; use\n"
-  "                      OutputDebugString (\"ssp on\") to enable stepping\n"
-  " -e, --enable         enable single-stepping by default; use\n"
-  "                      OutputDebugString (\"ssp off\") to disable stepping\n"
-  " -h, --help           output usage information and exit\n"
-  " -l, --dll            enable dll profiling.  A chart of relative DLL usage\n"
-  "                      is produced after the run.\n"
-  " -s, --sub-threads    trace sub-threads too.  Dangerous if you have\n" 
-  "                      race conditions.\n"
-  " -t, --trace-eip      trace every EIP value to a file TRACE.SSP.  This\n"
-  "                      gets big *fast*.\n"
-  " -v, --verbose        output verbose messages about debug events.\n"
-  " -V, --version        output version information and exit\n"
-  "\n"
-  "Example: %s 0x401000 0x403000 hello.exe\n"
-  "\n"
-  "", prog_name, prog_name);
-  if (stream == stdout)
-    fprintf (stream , ""
-    "SSP - The Single Step Profiler\n"
-    "\n"
-    "Original Author:  DJ Delorie <dj@redhat.com>\n"
-    "\n"
-    "The SSP is a program that uses the Win32 debug API to run a program\n"
-    "one ASM instruction at a time.  It records the location of each\n"
-    "instruction used, how many times that instruction is used, and all\n"
-    "function calls.  The results are saved in a format that is usable by\n"
-    "the profiling program \"gprof\", although gprof will claim the values\n"
-    "are seconds, they really are instruction counts.  More on that later.\n"
-    "\n"
-    "Because the SSP was originally designed to profile the cygwin DLL, it\n"
-    "does not automatically select a block of code to report statistics on.\n"
-    "You must specify the range of memory addresses to keep track of\n"
-    "manually, but it's not hard to figure out what to specify.  Use the\n"
-    "\"objdump\" program to determine the bounds of the target's \".text\"\n"
-    "section.  Let's say we're profiling cygwin1.dll.  Make sure you've\n"
-    "built it with debug symbols (else gprof won't run) and run objdump\n"
-    "like this:\n"
-    "\n"
-    "	objdump -h cygwin1.dll\n"
-    "\n"
-    "It will print a report like this:\n"
-    "\n"
-    "cygwin1.dll:     file format pei-i386\n"
-    "\n"
-    "Sections:\n"
-    "Idx Name          Size      VMA       LMA       File off  Algn\n"
-    "  0 .text         0007ea00  61001000  61001000  00000400  2**2\n"
-    "                  CONTENTS, ALLOC, LOAD, READONLY, CODE, DATA\n"
-    "  1 .data         00008000  61080000  61080000  0007ee00  2**2\n"
-    "                  CONTENTS, ALLOC, LOAD, DATA\n"
-    "  . . .\n"
-    "\n"
-    "The only information we're concerned with are the VMA of the .text\n"
-    "section and the VMA of the section after it (sections are usually\n"
-    "contiguous; you can also add the Size to the VMA to get the end\n"
-    "address).  In this case, the VMA is 0x61001000 and the ending address\n"
-    "is either 0x61080000 (start of .data method) or 0x0x6107fa00 (VMA+Size\n"
-    "method).\n"
-    "\n"
-    "There are two basic ways to use SSP - either profiling a whole\n"
-    "program, or selectively profiling parts of the program.\n"
-    "\n"
-    "To profile a whole program, just run ssp without options.  By default,\n"
-    "it will step the whole program.  Here's a simple example, using the\n"
-    "numbers above:\n"
-    "\n"
-    "	ssp 0x61001000 0x61080000 hello.exe\n"
-    "\n"
-    "This will step the whole program.  It will take at least 8 minutes on\n"
-    "a PII/300 (yes, really).  When it's done, it will create a file called\n"
-    "\"gmon.out\".  You can turn this data file into a readable report with\n"
-    "gprof:\n"
-    "\n"
-    "	gprof -b cygwin1.dll\n"
-    "\n"
-    "The \"-b\" means 'skip the help pages'.  You can omit this until you're\n"
-    "familiar with the report layout.  The gprof documentation explains\n"
-    "a lot about this report, but ssp changes a few things.  For example,\n"
-    "the first part of the report reports the amount of time spent in each\n"
-    "function, like this:\n"
-    "\n"
-    "Each sample counts as 0.01 seconds.\n"
-    "  %%   cumulative   self              self     total\n"
-    " time   seconds   seconds    calls  ms/call  ms/call  name\n"
-    " 10.02    231.22    72.43       46  1574.57  1574.57  strcspn\n"
-    "  7.95    288.70    57.48      130   442.15   442.15  strncasematch\n"
-    "\n"
-    "The \"seconds\" columns are really CPU opcodes, 1/100 second per opcode.\n"
-    "So, \"231.22\" above means 23,122 opcodes.  The ms/call values are 10x\n"
-    "too big; 1574.57 means 157.457 opcodes per call.  Similar adjustments\n"
-    "need to be made for the \"self\" and \"children\" columns in the second\n"
-    "part of the report.\n"
-    "\n"
-    "OK, so now we've got a huge report that took a long time to generate,\n"
-    "and we've identified a spot we want to work on optimizing.  Let's say\n"
-    "it's the time() function.  We can use SSP to selectively profile this\n"
-    "function by using OutputDebugString() to control SSP from within the\n"
-    "program.  Here's a sample program:\n"
-    "\n"
-    "	#include <windows.h>\n"
-    "	main()\n"
-    "	{\n"
-    "	  time_t t;\n"
-    "	  OutputDebugString(\"ssp on\");\n"
-    "	  time(&t);\n"
-    "	  OutputDebugString(\"ssp off\");\n"
-    "	}\n"
-    "\n"
-    "Then, add the \"-d\" option to ssp to default to *disabling* profiling.\n"
-    "The program will run at full speed until the first OutputDebugString,\n"
-    "then step until the second.\n"
-    "\n"
-    "	ssp -d 0x61001000 0x61080000 hello.exe\n"
-    "\n"
-    "You can then use gprof (as usual) to see the performance profile for\n"
-    "just that portion of the program's execution.\n"
-    "\n"
-    "There are many options to ssp.  Since step-profiling makes your\n"
-    "program run about 1,000 times slower than normal, it's best to\n"
-    "understand all the options so that you can narrow down the parts\n"
-    "of your program you need to single-step.\n"
-    "\n"
-    "\"-v\" - verbose.  This prints messages about threads starting and\n"
-    "stopping, OutputDebugString calls, DLLs loading, etc.\n"
-    "\n"
-    "\"-t\" and \"-c\" - tracing.  With -t, *every* step's address is written\n"
-    "to the file \"trace.ssp\".  This can be used to help debug functions,\n"
-    "since it can trace multiple threads.  Clever use of scripts can match\n"
-    "addresses with disassembled opcodes if needed.  Warning: creates\n"
-    "*huge* files, very quickly.  \"-c\" prints each address to the console,\n"
-    "useful for debugging key chunks of assembler.\n"
-    "Use \"addr2line -C -f -s -e foo.exe < trace.ssp > lines.ssp\" and then\n"
-    "\"perl cvttrace\" to convert to symbolic traces.\n"
-    "\n"
-    "\"-s\" - subthreads.  Usually, you only need to trace the main thread,\n"
-    "but sometimes you need to trace all threads, so this enables that.\n"
-    "It's also needed when you want to profile a function that only a\n"
-    "subthread calls.  However, using OutputDebugString automatically\n"
-    "enables profiling on the thread that called it, not the main thread.\n"
-    "\n"
-    "\"-l\" - dll profiling.  Generates a pretty table of how much time was\n"
-    "spent in each dll the program used.  No sense optimizing a function in\n"
-    "your program if most of the time is spent in the DLL.\n"
-    "\n"
-    "I usually use the -v, -s, and -l options:\n"
-    "\n"
-    "	ssp -v -s -l -d 0x61001000 0x61080000 hello.exe\n"
-    "\n");
-  if (stream == stderr)
-    fprintf (stream, "Try '%s --help' for more information.", prog_name);
-  exit (stream == stderr ? 1 : 0);
-}
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-%s (cygwin) %.*s\n\
-Single-Step Profiler\n\
-Copyright 2000, 2001, 2002 Red Hat, Inc.\n\
-Compiled on %s\n\
-", prog_name, len, v, __DATE__);
-}
-
-int
-main (int argc, char **argv)
-{
-  int c, i;
-  int total_pcount = 0, total_scount = 0;
-  FILE *gmon;
-
-  setbuf (stdout, 0);
-
-  prog_name = strrchr (argv[0], '/');
-  if (prog_name == NULL)
-    prog_name = strrchr (argv[0], '\\');
-  if (prog_name == NULL)
-    prog_name = argv[0];
-  else
-    prog_name++;
-
-  while ((c = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
-    switch (c)
-    {
-      case 'c':
-        printf ("tracing *all* $eip to the console\n");
-        trace_console = 1;
-        break;
-      case 'd':
-        printf ("stepping disabled; enable via OutputDebugString (\"ssp on\")\n");
-        stepping_enabled = 0;
-        break;
-      case 'e':
-        printf ("stepping enabled; disable via OutputDebugString (\"ssp off\")\n");
-        stepping_enabled = 1;
-        break;
-      case 'h':
-        usage (stdout);
-        break;
-      case 'l':
-        printf ("profiling dll usage\n");
-        dll_counts = 1;
-        break;
-      case 's':
-        printf ("tracing all sub-threads too, not just the main one\n");
-        trace_all_threads = 1;
-        break;
-      case 't':
-        printf ("tracing all $eip to trace.ssp\n");
-        tracing_enabled = 1;
-        break;
-      case 'v':
-        printf ("verbose messages enabled\n");
-        verbose = 1;
-        break;
-      case 'V':
-        print_version ();
-        exit (0);
-      default:  
-        usage (stderr);
-    }
-
-  if ( (argc - optind) < 3 )
-    usage (stderr);
-  sscanf (argv[optind++], "%i", &low_pc); 
-  sscanf (argv[optind++], "%i", &high_pc); 
-
-  if (low_pc > high_pc-8)
-    {
-      fprintf (stderr, "Hey, low_pc must be lower than high_pc\n");
-      exit (1);
-    }
-
-  hits = (HISTCOUNTER *)malloc (high_pc-low_pc+4);
-  memset (hits, 0, high_pc-low_pc+4);
-
-  fprintf (stderr, "prun: [%08x,%08x] Running `%s'\n",
-	  low_pc, high_pc, argv[optind]);
-
-  run_program (argv[optind]);
-
-  hdr.lpc = low_pc;
-  hdr.hpc = high_pc;
-  hdr.ncnt = high_pc-low_pc + sizeof (hdr);
-  hdr.version = GMONVERSION;
-  hdr.profrate = 100;
-
-  gmon = fopen ("gmon.out", "wb");
-  fwrite (&hdr, 1, sizeof (hdr), gmon);
-  fwrite (hits, 1, high_pc-low_pc, gmon);
-  write_call_edges (gmon);
-  fclose (gmon);
-
-  if (dll_counts)
-    {
-      /*      1234567 123% 1234567 123% 12345678 xxxxxxxxxxx */
-      printf (" Main-Thread Other-Thread BaseAddr DLL Name\n");
-
-      total_pcount = 0;
-      total_scount = 0;
-      for (i=0; i<num_dlls; i++)
-	{
-	  total_pcount += dll_info[i].pcount;
-	  total_scount += dll_info[i].scount;
-	}
-
-      if (total_pcount == 0) total_pcount++;
-      if (total_scount == 0) total_scount++;
-
-      for (i=0; i<num_dlls; i++)
-	if (dll_info[i].pcount || dll_info[i].scount)
-	  {
-	    printf ("%7d %3d%% %7d %3d%% %08x %s\n",
-		   dll_info[i].pcount,
-		   (dll_info[i].pcount*100)/opcode_count,
-		   dll_info[i].scount,
-		   (dll_info[i].scount*100)/opcode_count,
-		   dll_info[i].base_address,
-		   dll_info[i].name);
-	  }
-    }
-
-  exit (0);
-}
-
diff --git a/winsup/utils/ssp.txt b/winsup/utils/ssp.txt
deleted file mode 100644
index e73880e90..000000000
--- a/winsup/utils/ssp.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-
-SSP - The Single Step Profiler
-
-Original Author:  DJ Delorie <dj@redhat.com>
-
-The SSP is a program that uses the Win32 debug API to run a program
-one ASM instruction at a time.  It records the location of each
-instruction used, how many times that instruction is used, and all
-function calls.  The results are saved in a format that is usable by
-the profiling program "gprof", although gprof will claim the values
-are seconds, they really are instruction counts.  More on that later.
-
-Because the SSP was originally designed to profile the cygwin DLL, it
-does not automatically select a block of code to report statistics on.
-You must specify the range of memory addresses to keep track of
-manually, but it's not hard to figure out what to specify.  Use the
-"objdump" program to determine the bounds of the target's ".text"
-section.  Let's say we're profiling cygwin1.dll.  Make sure you've
-built it with debug symbols (else gprof won't run) and run objdump
-like this:
-
-	objdump -h cygwin1.dll
-
-It will print a report like this:
-
-cygwin1.dll:     file format pei-i386
-
-Sections:
-Idx Name          Size      VMA       LMA       File off  Algn
-  0 .text         0007ea00  61001000  61001000  00000400  2**2
-                  CONTENTS, ALLOC, LOAD, READONLY, CODE, DATA
-  1 .data         00008000  61080000  61080000  0007ee00  2**2
-                  CONTENTS, ALLOC, LOAD, DATA
-  . . .
-
-The only information we're concerned with are the VMA of the .text
-section and the VMA of the section after it (sections are usually
-contiguous; you can also add the Size to the VMA to get the end
-address).  In this case, the VMA is 0x61001000 and the ending address
-is either 0x61080000 (start of .data method) or 0x0x6107fa00 (VMA+Size
-method).
-
-There are two basic ways to use SSP - either profiling a whole
-program, or selectively profiling parts of the program.
-
-To profile a whole program, just run ssp without options.  By default,
-it will step the whole program.  Here's a simple example, using the
-numbers above:
-
-	ssp 0x61001000 0x61080000 hello.exe
-
-This will step the whole program.  It will take at least 8 minutes on
-a PII/300 (yes, really).  When it's done, it will create a file called
-"gmon.out".  You can turn this data file into a readable report with
-gprof:
-
-	gprof -b cygwin1.dll
-
-The "-b" means "skip the help pages".  You can omit this until you're
-familiar with the report layout.  The gprof documentation explains
-a lot about this report, but ssp changes a few things.  For example,
-the first part of the report reports the amount of time spent in each
-function, like this:
-
-Each sample counts as 0.01 seconds.
-  %   cumulative   self              self     total
- time   seconds   seconds    calls  ms/call  ms/call  name
- 10.02    231.22    72.43       46  1574.57  1574.57  strcspn
-  7.95    288.70    57.48      130   442.15   442.15  strncasematch
-
-The "seconds" columns are really CPU opcodes, 1/100 second per opcode.
-So, "231.22" above means 23,122 opcodes.  The ms/call values are 10x
-too big; 1574.57 means 157.457 opcodes per call.  Similar adjustments
-need to be made for the "self" and "children" columns in the second
-part of the report.
-
-OK, so now we've got a huge report that took a long time to generate,
-and we've identified a spot we want to work on optimizing.  Let's say
-it's the time() function.  We can use SSP to selectively profile this
-function by using OutputDebugString() to control SSP from within the
-program.  Here's a sample program:
-
-	#include <windows.h>
-	main()
-	{
-	  time_t t;
-	  OutputDebugString("ssp on");
-	  time(&t);
-	  OutputDebugString("ssp off");
-	}
-
-Then, add the "-d" option to ssp to default to *disabling* profiling.
-The program will run at full speed until the first OutputDebugString,
-then step until the second.
-
-	ssp -d 0x61001000 0x61080000 hello.exe
-
-You can then use gprof (as usual) to see the performance profile for
-just that portion of the program's execution.
-
-OK, now for the other ssp options, and when to use them:
-
-"-v" - verbose.  This prints messages about threads starting and
-stopping, OutputDebugString calls, DLLs loading, etc.
-
-"-t" and "-tc" - tracing.  With -t, *every* step's address is written
-to the file "trace.ssp".  This can be used to help debug functions,
-since it can trace multiple threads.  Clever use of scripts can match
-addresses with disassembled opcodes if needed.  Warning: creates
-*huge* files, very quickly.  "-tc" prints each address to the console,
-useful for debugging key chunks of assembler.
-
-"-s" - subthreads.  Usually, you only need to trace the main thread,
-but sometimes you need to trace all threads, so this enables that.
-It's also needed when you want to profile a function that only a
-subthread calls.  However, using OutputDebugString automatically
-enables profiling on the thread that called it, not the main thread.
-
-"-dll" - dll profiling.  Generates a pretty table of how much time was
-spent in each dll the program used.  No sense optimizing a function in
-your program if most of the time is spent in the DLL.
-
-I usually use the -v, -s, and -dll options:
-
-	ssp -v -s -dll -d 0x61001000 0x61080000 hello.exe
diff --git a/winsup/utils/strace.cc b/winsup/utils/strace.cc
deleted file mode 100644
index 47e5aa6cc..000000000
--- a/winsup/utils/strace.cc
+++ /dev/null
@@ -1,1012 +0,0 @@
-/* strace.cc
-
-   Copyright 2000, 2001, 2002, 2003 Red Hat Inc.
-
-   Written by Chris Faylor <cgf@redhat.com>
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#define cygwin_internal cygwin_internal_dontuse
-#include <stdio.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <windows.h>
-#include <signal.h>
-#include <errno.h>
-#include "cygwin/include/sys/strace.h"
-#include "cygwin/include/sys/cygwin.h"
-#include "path.h"
-#undef cygwin_internal
-
-/*  GCC runtime library's C++ EH code unfortunately pulls in stdio, and we
-   get undefine references to __impure_ptr, and hence the following
-   hack. It should be reasonably safe however as long as this file
-   is built using -mno-cygwin as is intended.  */
-int _impure_ptr;
-
-/* we *know* we're being built with GCC */
-#define alloca __builtin_alloca
-
-// Version string.
-static const char version[] = "$Revision$";
-
-static const char *pgm;
-static int forkdebug = 1;
-static int numerror = 1;
-static int usecs = 1;
-static int delta = 1;
-static int hhmmss = 0;
-static int bufsize = 0;
-static int new_window = 0;
-static long flush_period = 0;
-
-static BOOL close_handle (HANDLE h, DWORD ok);
-
-#define CloseHandle(h) close_handle(h, 0)
-
-struct child_list
-{
-  DWORD id;
-  HANDLE hproc;
-  int saw_stars;
-  char nfields;
-  long long start_time;
-  DWORD last_usecs;
-  struct child_list *next;
-    child_list ():id (0), hproc (NULL), saw_stars (0), nfields (0),
-    start_time (0), last_usecs (0), next (NULL)
-  {
-  }
-};
-
-child_list children;
-
-static void
-warn (int geterrno, const char *fmt, ...)
-{
-  va_list args;
-  char buf[4096];
-
-  va_start (args, fmt);
-  sprintf (buf, "%s: ", pgm);
-  vsprintf (strchr (buf, '\0'), fmt, args);
-  if (geterrno)
-    perror (buf);
-  else
-    {
-      fputs (buf, stderr);
-      fputs ("\n", stderr);
-    }
-}
-
-static void __attribute__ ((noreturn))
-error (int geterrno, const char *fmt, ...)
-{
-  va_list args;
-  char buf[4096];
-
-  va_start (args, fmt);
-  sprintf (buf, "%s: ", pgm);
-  vsprintf (strchr (buf, '\0'), fmt, args);
-  if (geterrno)
-    perror (buf);
-  else
-    {
-      fputs (buf, stderr);
-      fputs ("\n", stderr);
-    }
-  exit (1);
-}
-
-DWORD lastid = 0;
-HANDLE lasth;
-
-#define PROCFLAGS \
- PROCESS_ALL_ACCESS		/*(PROCESS_DUP_HANDLE | PROCESS_TERMINATE | PROCESS_VM_READ | PROCESS_VM_WRITE) */
-static void
-add_child (DWORD id, HANDLE hproc)
-{
-  child_list *c = children.next;
-  children.next = (child_list *) calloc (1, sizeof (child_list));
-  children.next->next = c;
-  lastid = children.next->id = id;
-  lasth = children.next->hproc = hproc;
-}
-
-static child_list *
-get_child (DWORD id)
-{
-  child_list *c;
-  for (c = &children; (c = c->next) != NULL;)
-    if (c->id == id)
-      return c;
-
-  error (0, "no process id %d found", id);
-}
-
-static void
-remove_child (DWORD id)
-{
-  child_list *c;
-  if (id == lastid)
-    lastid = 0;
-  for (c = &children; c->next != NULL; c = c->next)
-    if (c->next->id == id)
-      {
-	child_list *c1 = c->next;
-	c->next = c1->next;
-	free (c1);
-	return;
-      }
-
-  error (0, "no process id %d found", id);
-}
-
-#define LINE_BUF_CHUNK 128
-
-class linebuf
-{
-  size_t alloc;
-public:
-    size_t ix;
-  char *buf;
-  linebuf ()
-  {
-    ix = 0;
-    alloc = 0;
-    buf = NULL;
-  }
- ~linebuf ()
-  {
-    if (buf)
-      free (buf);
-  }
-  void add (const char *what, int len);
-  void add (const char *what)
-  {
-    add (what, strlen (what));
-  }
-  void prepend (const char *what, int len);
-};
-
-void
-linebuf::add (const char *what, int len)
-{
-  size_t newix;
-  if ((newix = ix + len) >= alloc)
-    {
-      alloc += LINE_BUF_CHUNK + len;
-      buf = (char *) realloc (buf, alloc + 1);
-    }
-  memcpy (buf + ix, what, len);
-  ix = newix;
-  buf[ix] = '\0';
-}
-
-void
-linebuf::prepend (const char *what, int len)
-{
-  int buflen;
-  size_t newix;
-  if ((newix = ix + len) >= alloc)
-    {
-      alloc += LINE_BUF_CHUNK + len;
-      buf = (char *) realloc (buf, alloc + 1);
-      buf[ix] = '\0';
-    }
-  if ((buflen = strlen (buf)))
-    memmove (buf + len, buf, buflen + 1);
-  else
-    buf[newix] = '\0';
-  memcpy (buf, what, len);
-  ix = newix;
-}
-
-static void
-make_command_line (linebuf & one_line, char **argv)
-{
-  for (; *argv; argv++)
-    {
-      char *p = NULL;
-      const char *a = *argv;
-
-      int len = strlen (a);
-      if (len != 0 && !(p = strpbrk (a, " \t\n\r\"")))
-	one_line.add (a, len);
-      else
-	{
-	  one_line.add ("\"", 1);
-	  for (; p; a = p, p = strchr (p, '"'))
-	    {
-	      one_line.add (a, ++p - a);
-	      if (p[-1] == '"')
-		one_line.add ("\"", 1);
-	    }
-	  if (*a)
-	    one_line.add (a);
-	  one_line.add ("\"", 1);
-	}
-      one_line.add (" ", 1);
-    }
-
-  if (one_line.ix)
-    one_line.buf[one_line.ix - 1] = '\0';
-  else
-    one_line.add ("", 1);
-}
-
-static DWORD child_pid;
-
-static BOOL WINAPI
-ctrl_c (DWORD)
-{
-  static int tic = 1;
-  if ((tic ^= 1) && !GenerateConsoleCtrlEvent (CTRL_C_EVENT, 0))
-    error (0, "couldn't send CTRL-C to child, win32 error %d\n",
-	   GetLastError ());
-  return TRUE;
-}
-
-DWORD (*cygwin_internal) (int, ...);
-
-static int
-load_cygwin ()
-{
-  static HMODULE h;
-
-  if (cygwin_internal)
-    return 1;
-
-  if (h)
-    return 0;
-
-  if (!(h = LoadLibrary ("cygwin1.dll")))
-    {
-      errno = ENOENT;
-      return 0;
-    }
-  if (!(cygwin_internal = (DWORD (*) (int, ...)) GetProcAddress (h, "cygwin_internal")))
-    {
-      errno = ENOSYS;
-      return 0;
-    }
-  return 1;
-}
-
-static void
-attach_process (pid_t pid)
-{
-  load_cygwin ();
-  child_pid = (DWORD) cygwin_internal (CW_CYGWIN_PID_TO_WINPID, pid);
-  if (!child_pid)
-    {
-      warn (0, "no such cygwin pid - %d", pid);
-      child_pid = pid;
-    }
-
-  if (!DebugActiveProcess (child_pid))
-    error (0, "couldn't attach to pid %d<%d> for debugging", pid, child_pid);
-
-  printf ("Attached to pid %d (windows pid %u)\n", pid, (unsigned) child_pid);
-  return;
-}
-
-
-static void
-create_child (char **argv)
-{
-  linebuf one_line;
-
-  STARTUPINFO si;
-  PROCESS_INFORMATION pi;
-  BOOL ret;
-  DWORD flags;
-
-  *argv = cygpath (*argv, NULL);
-  memset (&si, 0, sizeof (si));
-  si.cb = sizeof (si);
-
-  flags = CREATE_DEFAULT_ERROR_MODE
-	  | (forkdebug ? DEBUG_PROCESS : DEBUG_ONLY_THIS_PROCESS);
-  if (new_window)
-    flags |= CREATE_NEW_CONSOLE | CREATE_NEW_PROCESS_GROUP;
-
-  make_command_line (one_line, argv);
-
-  SetConsoleCtrlHandler (NULL, 0);
-  ret = CreateProcess (0, one_line.buf,	/* command line */
-		       NULL,	/* Security */
-		       NULL,	/* thread */
-		       TRUE,	/* inherit handles */
-		       flags,	/* start flags */
-		       NULL, NULL,	/* current directory */
-		       &si, &pi);
-  if (!ret)
-    error (0, "error creating process %s, (error %d)", *argv,
-	   GetLastError ());
-
-  CloseHandle (pi.hThread);
-  CloseHandle (pi.hProcess);
-  child_pid = pi.dwProcessId;
-  SetConsoleCtrlHandler (ctrl_c, 1);
-}
-
-static int
-output_winerror (FILE *ofile, char *s)
-{
-  char *winerr = strstr (s, "Win32 error ");
-  if (!winerr)
-    return 0;
-
-  DWORD errnum = atoi (winerr + sizeof ("Win32 error ") - 1);
-  if (!errnum)
-    return 0;
-
-  /*
-   * NOTE: Currently there is no policy for how long the
-   * the buffers are, and looks like 256 is a smallest one
-   * (dlfcn.cc). Other than error 1395 (length 213) and
-   * error 1015 (length 249), the rest are all under 188
-   * characters, and so I'll use 189 as the buffer length.
-   * For those longer error messages, FormatMessage will
-   * return FALSE, and we'll get the old behaviour such as
-   * ``Win32 error 1395'' etc.
-   */
-  char buf[4096];
-  if (!FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM
-		      | FORMAT_MESSAGE_IGNORE_INSERTS,
-		      NULL,
-		      errnum,
-		      MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
-		      (LPTSTR) buf, sizeof (buf), NULL))
-    return 0;
-
-  /* Get rid the trailing CR/NL pair. */
-  char *p = strchr (buf, '\0');
-  p[-2] = '\n';
-  p[-1] = '\0';
-
-  *winerr = '\0';
-  fputs (s, ofile);
-  fputs (buf, ofile);
-  return 1;
-}
-
-static SYSTEMTIME *
-syst (long long t)
-{
-  FILETIME n;
-  static SYSTEMTIME st;
-  long long now = t + ((long long) usecs * 10);
-  n.dwHighDateTime = now >> 32;
-  n.dwLowDateTime = now & 0xffffffff;
-  FileTimeToSystemTime (&n, &st);
-  return &st;
-}
-
-static void __stdcall
-handle_output_debug_string (DWORD id, LPVOID p, unsigned mask, FILE *ofile)
-{
-  int len;
-  int special;
-  char alen[3 + 8 + 1];
-  DWORD nbytes;
-  child_list *child = get_child (id);
-  HANDLE hchild = child->hproc;
-#define INTROLEN (sizeof (alen) - 1)
-
-  if (id == lastid && hchild != lasth)
-    warn (0, "%p != %p", hchild, lasth);
-
-  alen[INTROLEN] = '\0';
-  if (!ReadProcessMemory (hchild, p, alen, INTROLEN, &nbytes))
-#ifndef DEBUGGING
-    return;
-#else
-    error (0,
-	   "couldn't get message length from subprocess %d<%p>, windows error %d",
-	   id, hchild, GetLastError ());
-#endif
-
-  if (strncmp (alen, "cYg", 3))
-    return;
-  len = (int) strtoul (alen + 3, NULL, 16);
-  if (!len)
-    return;
-
-  if (len > 0)
-    special = 0;
-  else
-    {
-      special = len;
-      if (special == _STRACE_INTERFACE_ACTIVATE_ADDR)
-	len = 17;
-    }
-
-  char *buf;
-  buf = (char *) alloca (len + 65) + 10;
-
-  if (!ReadProcessMemory (hchild, ((char *) p) + INTROLEN, buf, len, &nbytes))
-    error (0, "couldn't get message from subprocess, windows error %d",
-	   GetLastError ());
-
-  buf[len] = '\0';
-  char *s = strtok (buf, " ");
-
-  unsigned n = strtoul (s, NULL, 16);
-
-  s = strchr (s, '\0') + 1;
-
-  if (special == _STRACE_INTERFACE_ACTIVATE_ADDR)
-    {
-      DWORD new_flag = 1;
-      if (!WriteProcessMemory (hchild, (LPVOID) n, &new_flag,
-			       sizeof (new_flag), &nbytes))
-	error (0,
-	       "couldn't write strace flag to subprocess, windows error %d",
-	       GetLastError ());
-      return;
-    }
-
-  char *origs = s;
-
-  if (mask & n)
-    /* got it */ ;
-  else if (!(mask & _STRACE_ALL) || (n & _STRACE_NOTALL))
-    return;			/* This should not be included in "all" output */
-
-  DWORD dusecs, usecs;
-  char *ptusec, *ptrest;
-
-  dusecs = strtoul (s, &ptusec, 10);
-  char *q = ptusec;
-  while (*q == ' ')
-    q++;
-  if (*q != '[')
-    {
-      usecs = strtoul (q, &ptrest, 10);
-      while (*ptrest == ' ')
-	ptrest++;
-    }
-  else
-    {
-      ptrest = q;
-      ptusec = s;
-      usecs = dusecs;
-    }
-
-  if (child->saw_stars == 0)
-    {
-      FILETIME st;
-      char *news;
-
-      GetSystemTimeAsFileTime (&st);
-      FileTimeToLocalFileTime (&st, &st);
-      child->start_time = st.dwHighDateTime;
-      child->start_time <<= 32;
-      child->start_time |= st.dwLowDateTime;
-      if (*(news = ptrest) != '[')
-	child->saw_stars = 2;
-      else
-	{
-	  child->saw_stars++;
-	  while ((news = strchr (news, ' ')) != NULL && *++news != '*')
-	    child->nfields++;
-	  if (news == NULL)
-	    child->saw_stars++;
-	  else
-	    {
-	      s = news;
-	      child->nfields++;
-	    }
-	}
-    }
-  else if (child->saw_stars < 2)
-    {
-      int i;
-      char *news;
-      if (*(news = ptrest) != '[')
-	child->saw_stars = 2;
-      else
-	{
-	  for (i = 0; i < child->nfields; i++)
-	    if ((news = strchr (news, ' ')) == NULL)
-	      break;		// Should never happen
-	    else
-	      news++;
-
-	  if (news == NULL)
-	    child->saw_stars = 2;
-	  else
-	    {
-	      s = news;
-	      if (*s == '*')
-		{
-		  SYSTEMTIME *st = syst (child->start_time);
-		  fprintf (ofile,
-			   "Date/Time:    %d-%02d-%02d %02d:%02d:%02d\n",
-			   st->wYear, st->wMonth, st->wDay, st->wHour,
-			   st->wMinute, st->wSecond);
-		  child->saw_stars++;
-		}
-	    }
-	}
-    }
-
-  long long d = usecs - child->last_usecs;
-  char intbuf[40];
-
-  if (child->saw_stars < 2 || s != origs)
-    /* Nothing */ ;
-  else if (hhmmss)
-    {
-      s = ptrest - 9;
-      SYSTEMTIME *st = syst (child->start_time + (long long) usecs * 10);
-      sprintf (s, "%02d:%02d:%02d", st->wHour, st->wMinute, st->wSecond);
-      *strchr (s, '\0') = ' ';
-    }
-  else if (!delta)
-    s = ptusec;
-  else
-    {
-      s = ptusec;
-      sprintf (intbuf, "%5d ", (int) d);
-      int len = strlen (intbuf);
-
-      memcpy ((s -= len), intbuf, len);
-    }
-
-  child->last_usecs = usecs;
-  if (numerror || !output_winerror (ofile, s))
-    fputs (s, ofile);
-  if (!bufsize)
-    fflush (ofile);
-}
-
-static void
-proc_child (unsigned mask, FILE *ofile, pid_t pid)
-{
-  DEBUG_EVENT ev;
-  int processes = 0;
-  time_t cur_time, last_time;
-
-  SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_HIGHEST);
-  last_time = time (NULL);
-  while (1)
-    {
-      BOOL debug_event = WaitForDebugEvent (&ev, 1000);
-      DWORD status = DBG_CONTINUE;
-
-      if (bufsize && flush_period > 0 &&
-	  (cur_time = time (NULL)) >= last_time + flush_period)
-	{
-	  last_time = cur_time;
-	  fflush (ofile);
-	}
-
-      if (!debug_event)
-	continue;
-
-      if (pid)
-	{
-	  (void) cygwin_internal (CW_STRACE_TOGGLE, pid);
-	  pid = 0;
-	}
-
-      switch (ev.dwDebugEventCode)
-	{
-	case CREATE_PROCESS_DEBUG_EVENT:
-	  if (ev.u.CreateProcessInfo.hFile)
-	    CloseHandle (ev.u.CreateProcessInfo.hFile);
-	  add_child (ev.dwProcessId, ev.u.CreateProcessInfo.hProcess);
-	  processes++;
-	  break;
-
-	case CREATE_THREAD_DEBUG_EVENT:
-	  break;
-
-	case LOAD_DLL_DEBUG_EVENT:
-	  if (ev.u.LoadDll.hFile)
-	    CloseHandle (ev.u.LoadDll.hFile);
-	  break;
-
-	case OUTPUT_DEBUG_STRING_EVENT:
-	  handle_output_debug_string (ev.dwProcessId,
-				      ev.u.DebugString.lpDebugStringData,
-				      mask, ofile);
-	  break;
-
-	case EXIT_PROCESS_DEBUG_EVENT:
-	  remove_child (ev.dwProcessId);
-	  break;
-	case EXCEPTION_DEBUG_EVENT:
-	  if (ev.u.Exception.ExceptionRecord.ExceptionCode !=
-	      STATUS_BREAKPOINT)
-	    {
-	      status = DBG_EXCEPTION_NOT_HANDLED;
-#if 0
-	      fprintf (stderr, "exception %p at %p\n",
-		       ev.u.Exception.ExceptionRecord.ExceptionCode,
-		       ev.u.Exception.ExceptionRecord.ExceptionAddress);
-#endif
-	    }
-	  break;
-	}
-      if (!ContinueDebugEvent (ev.dwProcessId, ev.dwThreadId, status))
-	error (0, "couldn't continue debug event, windows error %d",
-	       GetLastError ());
-      if (ev.dwDebugEventCode == EXIT_PROCESS_DEBUG_EVENT && --processes == 0)
-	break;
-    }
-}
-
-static void
-dotoggle (pid_t pid)
-{
-  load_cygwin ();
-  child_pid = (DWORD) cygwin_internal (CW_CYGWIN_PID_TO_WINPID, pid);
-  if (!child_pid)
-    {
-      warn (0, "no such cygwin pid - %d", pid);
-      child_pid = pid;
-    }
-  if (cygwin_internal (CW_STRACE_TOGGLE, child_pid))
-    error (0, "failed to toggle tracing for process %d<%d>", pid, child_pid);
-
-  return;
-}
-
-static void
-dostrace (unsigned mask, FILE *ofile, pid_t pid, char **argv)
-{
-  if (!pid)
-    create_child (argv);
-  else
-    attach_process (pid);
-  proc_child (mask, ofile, pid);
-
-  return;
-}
-
-typedef struct tag_mask_mnemonic
-{
-  unsigned long val;
-  const char *text;
-}
-mask_mnemonic;
-
-static const mask_mnemonic mnemonic_table[] = {
-  {_STRACE_ALL, "all"},
-  {_STRACE_FLUSH, "flush"},
-  {_STRACE_INHERIT, "inherit"},
-  {_STRACE_UHOH, "uhoh"},
-  {_STRACE_SYSCALL, "syscall"},
-  {_STRACE_STARTUP, "startup"},
-  {_STRACE_DEBUG, "debug"},
-  {_STRACE_PARANOID, "paranoid"},
-  {_STRACE_TERMIOS, "termios"},
-  {_STRACE_SELECT, "select"},
-  {_STRACE_WM, "wm"},
-  {_STRACE_SIGP, "sigp"},
-  {_STRACE_MINIMAL, "minimal"},
-  {_STRACE_EXITDUMP, "exitdump"},
-  {_STRACE_SYSTEM, "system"},
-  {_STRACE_NOMUTEX, "nomutex"},
-  {_STRACE_MALLOC, "malloc"},
-  {_STRACE_THREAD, "thread"},
-  {0, NULL}
-};
-
-static unsigned long
-mnemonic2ul (const char *nptr, char **endptr)
-{
-  // Look up mnemonic in table, return value.
-  // *endptr = ptr to char that breaks match.
-  const mask_mnemonic *mnp = mnemonic_table;
-
-  while (mnp->text != NULL)
-    {
-      if (strcmp (mnp->text, nptr) == 0)
-	{
-	  // Found a match.
-	  if (endptr != NULL)
-	    {
-	      *endptr = ((char *) nptr) + strlen (mnp->text);
-	    }
-	  return mnp->val;
-	}
-      mnp++;
-    }
-
-  // Didn't find it.
-  if (endptr != NULL)
-    {
-      *endptr = (char *) nptr;
-    }
-  return 0;
-}
-
-static unsigned long
-parse_mask (const char *ms, char **endptr)
-{
-  const char *p = ms;
-  char *newp;
-  unsigned long retval = 0, thisval;
-  const size_t bufsize = 16;
-  char buffer[bufsize];
-  size_t len;
-
-  while (*p != '\0')
-    {
-      // First extract the term, terminate it, and lowercase it.
-      strncpy (buffer, p, bufsize);
-      buffer[bufsize - 1] = '\0';
-      len = strcspn (buffer, "+,\0");
-      buffer[len] = '\0';
-      strlwr (buffer);
-
-      // Check if this is a mnemonic.  We have to do this first or strtoul()
-      // will false-trigger on anything starting with "a" through "f".
-      thisval = mnemonic2ul (buffer, &newp);
-      if (buffer == newp)
-	{
-	  // This term isn't mnemonic, check if it's hex.
-	  thisval = strtoul (buffer, &newp, 16);
-	  if (newp != buffer + len)
-	    {
-	      // Not hex either, syntax error.
-	      *endptr = (char *) p;
-	      return 0;
-	    }
-	}
-
-      p += len;
-      retval += thisval;
-
-      // Handle operators
-      if (*p == '\0')
-	break;
-      if ((*p == '+') || (*p == ','))
-	{
-	  // For now these both equate to addition/ORing.  Until we get
-	  // fancy and add things like "all-<something>", all we need do is
-	  // continue the looping.
-	  p++;
-	  continue;
-	}
-      else
-	{
-	  // Syntax error
-	  *endptr = (char *) p;
-	  return 0;
-	}
-    }
-
-  *endptr = (char *) p;
-  return retval;
-}
-
-static void
-usage (FILE *where = stderr)
-{
-  fprintf (where, "\
-Usage: %s [OPTIONS] <command-line>\n\
-Usage: %s [OPTIONS] -p <pid>\n\
-Trace system calls and signals\n\
-\n\
-  -b, --buffer-size=SIZE       set size of output file buffer\n\
-  -d, --no-delta               don't display the delta-t microsecond timestamp\n\
-  -f, --trace-children         trace child processes (toggle - default true)\n\
-  -h, --help                   output usage information and exit\n\
-  -m, --mask=MASK              set message filter mask\n\
-  -n, --crack-error-numbers    output descriptive text instead of error\n\
-                               numbers for Windows errors\n\
-  -o, --output=FILENAME        set output file to FILENAME\n\
-  -p, --pid=n                  attach to executing program with cygwin pid n\n\
-  -S, --flush-period=PERIOD    flush buffered strace output every PERIOD secs\n\
-  -t, --timestamp              use an absolute hh:mm:ss timestamp insted of \n\
-                               the default microsecond timestamp.  Implies -d\n\
-  -T, --toggle                 toggle tracing in a process already being\n\
-                               traced. Requires -p <pid>\n\
-  -v, --version                output version information and exit\n\
-  -w, --new-window             spawn program under test in a new window\n\
-\n", pgm, pgm);
-  if ( where == stdout)
-    fprintf (stdout, "\
-    MASK can be any combination of the following mnemonics and/or hex values\n\
-    (0x is optional).  Combine masks with '+' or ',' like so:\n\
-\n\
-                      --mask=wm+system,malloc+0x00800\n\
-\n\
-    Mnemonic Hex     Corresponding Def  Description\n\
-    =========================================================================\n\
-    all      0x00001 (_STRACE_ALL)      All strace messages.\n\
-    flush    0x00002 (_STRACE_FLUSH)    Flush output buffer after each message.\n\
-    inherit  0x00004 (_STRACE_INHERIT)  Children inherit mask from parent.\n\
-    uhoh     0x00008 (_STRACE_UHOH)     Unusual or weird phenomenon.\n\
-    syscall  0x00010 (_STRACE_SYSCALL)  System calls.\n\
-    startup  0x00020 (_STRACE_STARTUP)  argc/envp printout at startup.\n\
-    debug    0x00040 (_STRACE_DEBUG)    Info to help debugging. \n\
-    paranoid 0x00080 (_STRACE_PARANOID) Paranoid info.\n\
-    termios  0x00100 (_STRACE_TERMIOS)  Info for debugging termios stuff.\n\
-    select   0x00200 (_STRACE_SELECT)   Info on ugly select internals.\n\
-    wm       0x00400 (_STRACE_WM)       Trace Windows msgs (enable _strace_wm).\n\
-    sigp     0x00800 (_STRACE_SIGP)     Trace signal and process handling.\n\
-    minimal  0x01000 (_STRACE_MINIMAL)  Very minimal strace output.\n\
-    exitdump 0x04000 (_STRACE_EXITDUMP) Dump strace cache on exit.\n\
-    system   0x08000 (_STRACE_SYSTEM)   Serious error; goes to console and log.\n\
-    nomutex  0x10000 (_STRACE_NOMUTEX)  Don't use mutex for synchronization.\n\
-    malloc   0x20000 (_STRACE_MALLOC)   Trace malloc calls.\n\
-    thread   0x40000 (_STRACE_THREAD)   Thread-locking calls.\n\
-");
-  if (where == stderr)
-    fprintf (stderr, "Try '%s --help' for more information.\n", pgm);
-  exit (where == stderr ? 1 : 0 );
-}
-
-struct option longopts[] = {
-  {"buffer-size", required_argument, NULL, 'b'},
-  {"help", no_argument, NULL, 'h'},
-  {"flush-period", required_argument, NULL, 'S'},
-  {"mask", required_argument, NULL, 'm'},
-  {"new-window", no_argument, NULL, 'w'},
-  {"output", required_argument, NULL, 'o'},
-  {"no-delta", no_argument, NULL, 'd'},
-  {"pid", required_argument, NULL, 'p'},
-  {"timestamp", no_argument, NULL, 't'},
-  {"toggle", no_argument, NULL, 'T'},
-  {"trace-children", no_argument, NULL, 'f'},
-  {"translate-error-numbers", no_argument, NULL, 'n'},
-  {"usecs", no_argument, NULL, 'u'},
-  {"version", no_argument, NULL, 'v'},
-  {NULL, 0, NULL, 0}
-};
-
-static const char *const opts = "b:dhfm:no:p:S:tTuvw";
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-%s (cygwin) %.*s\n\
-System Trace\n\
-Copyright 2000, 2001, 2002, 2003 Red Hat, Inc.\n\
-Compiled on %s\n\
-", pgm, len, v, __DATE__);
-}
-
-int
-main (int argc, char **argv)
-{
-  unsigned mask = 0;
-  FILE *ofile = NULL;
-  pid_t pid = 0;
-  int opt;
-  int toggle = 0;
-
-  if (!(pgm = strrchr (*argv, '\\')) && !(pgm = strrchr (*argv, '/')))
-    pgm = *argv;
-  else
-    pgm++;
-
-  while ((opt = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
-    switch (opt)
-      {
-      case 'b':
-	bufsize = atoi (optarg);
-	break;
-      case 'd':
-	delta ^= 1;
-	break;
-      case 'f':
-	forkdebug ^= 1;
-	break;
-      case 'h':
-	// Print help and exit
-	usage (stdout);
-	break;
-      case 'm':
-	{
-	  char *endptr;
-	  mask = parse_mask (optarg, &endptr);
-	  if (*endptr != '\0')
-	    {
-	      // Bad mask expression.
-	      error (0, "syntax error in mask expression \"%s\" near \
-character #%d.\n", optarg, (int) (endptr - optarg), endptr);
-	    }
-	  break;
-	}
-      case 'n':
-	numerror ^= 1;
-	break;
-      case 'o':
-	if ((ofile = fopen (cygpath (optarg, NULL), "w")) == NULL)
-	  error (1, "can't open %s", optarg);
-#ifdef F_SETFD
-	(void) fcntl (fileno (ofile), F_SETFD, 0);
-#endif
-	break;
-      case 'p':
-	pid = strtoul (optarg, NULL, 10);
-	break;
-      case 'S':
-	flush_period = strtoul (optarg, NULL, 10);
-	break;
-      case 't':
-	hhmmss ^= 1;
-	break;
-      case 'T':
-	toggle ^= 1;
-	break;
-      case 'u':
-	// FIXME: currently unimplemented
-	usecs ^= 1;
-	break;
-      case 'v':
-	// Print version info and exit
-	print_version ();
-	return 0;
-      case 'w':
-	new_window ^= 1;
-	break;
-      case '?':
-	fprintf (stderr, "Try '%s --help' for more information.\n", pgm);
-	exit (1);
-      }
-
-  if (pid && argv[optind])
-    error (0, "cannot provide both a command line and a process id");
-
-  if (!pid && !argv[optind])
-    error (0, "must provide either a command line or a process id");
-
-  if (toggle && !pid)
-    error (0, "must provide a process id to toggle tracing");
-
-  if (!mask)
-    mask = 1;
-
-  if (bufsize)
-    setvbuf (ofile, (char *) alloca (bufsize), _IOFBF, bufsize);
-
-  if (!ofile)
-    ofile = stdout;
-
-  if (toggle)
-    dotoggle (pid);
-  else
-    dostrace (mask, ofile, pid, argv + optind);
-}
-
-#undef CloseHandle
-
-static BOOL
-close_handle (HANDLE h, DWORD ok)
-{
-  child_list *c;
-  for (c = &children; (c = c->next) != NULL;)
-    if (c->hproc == h && c->id != ok)
-      error (0, "Closing child handle %p", h);
-  return CloseHandle (h);
-}
diff --git a/winsup/utils/umount.cc b/winsup/utils/umount.cc
deleted file mode 100644
index bae371ba0..000000000
--- a/winsup/utils/umount.cc
+++ /dev/null
@@ -1,254 +0,0 @@
-/* umount.cc
-
-   Copyright 1996, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-
-This file is part of Cygwin.
-
-This software is a copyrighted work licensed under the terms of the
-Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
-details. */
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/mount.h>
-#include <mntent.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <getopt.h>
-
-static void remove_all_mounts ();
-static void remove_all_user_mounts ();
-static void remove_all_system_mounts ();
-static void remove_cygdrive_prefix (int flags);
-
-static const char version[] = "$Revision$";
-static const char *progname;
-
-struct option longopts[] =
-{
-  {"help", no_argument, NULL, 'h' },
-  {"remove-all-mounts", no_argument, NULL, 'A'},
-  {"remove-cygdrive-prefix", no_argument, NULL, 'c'},
-  {"remove-system-mounts", no_argument, NULL, 'S'},
-  {"remove-user-mounts", no_argument, NULL, 'U'},
-  {"system", no_argument, NULL, 's'},
-  {"user", no_argument, NULL, 'u'},
-  {"version", no_argument, NULL, 'v'},
-  {NULL, 0, NULL, 0}
-};
-
-char opts[] = "AchsSuUv";
-
-static void
-usage (FILE *where = stderr)
-{
-  fprintf (where, "\
-Usage: %s [OPTION] [<posixpath>]\n\
-Unmount filesystems\n\
-\n\
-  -A, --remove-all-mounts       remove all mounts\n\
-  -c, --remove-cygdrive-prefix  remove cygdrive prefix\n\
-  -h, --help                    output usage information and exit\n\
-  -s, --system                  remove system mount (default)\n\
-  -S, --remove-system-mounts    remove all system mounts\n\
-  -u, --user                    remove user mount\n\
-  -U, --remove-user-mounts      remove all user mounts\n\
-  -v, --version                 output version information and exit\n\
-", progname);
-  exit (where == stderr ? 1 : 0);
-}
-
-static void
-error (const char *path)
-{
-  fprintf (stderr, "%s: %s: %s\n", progname, path, strerror (errno));
-  exit (1);
-}
-
-static void
-print_version ()
-{
-  const char *v = strchr (version, ':');
-  int len;
-  if (!v)
-    {
-      v = "?";
-      len = 1;
-    }
-  else
-    {
-      v += 2;
-      len = strchr (v, ' ') - v;
-    }
-  printf ("\
-%s (cygwin) %.*s\n\
-Filesystem Utility\n\
-Copyright 1996, 1998, 1999, 2000, 2001, 2002\n\
-Compiled on %s\n\
-", progname, len, v, __DATE__);
-}
-
-int
-main (int argc, char **argv)
-{
-  int i;
-  int flags = 0;
-  int default_flag = MOUNT_SYSTEM;
-  enum do_what
-  {
-    nada,
-    saw_remove_all_mounts,
-    saw_remove_cygdrive_prefix,
-    saw_remove_all_system_mounts,
-    saw_remove_all_user_mounts
-  } do_what = nada;
-
-  progname = strrchr (argv[0], '/');
-  if (progname == NULL)
-    progname = strrchr (argv[0], '\\');
-  if (progname == NULL)
-    progname = argv[0];
-  else
-    progname++;
-
-  if (argc == 1)
-    usage ();
-
-  while ((i = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
-    switch (i)
-      {
-      case 'A':
-	if (do_what != nada)
-	  usage ();
-	do_what = saw_remove_all_mounts;
-	break;
-      case 'c':
-	if (do_what != nada)
-	  usage ();
-	do_what = saw_remove_cygdrive_prefix;
-	break;
-      case 'h':
-	usage (stdout);
-      case 's':
-	flags |= MOUNT_SYSTEM;
-	break;
-      case 'S':
-	if (do_what != nada)
-	  usage ();
-	do_what = saw_remove_all_system_mounts;
-	break;
-      case 'u':
-	flags &= ~MOUNT_SYSTEM;
-	default_flag = 0;
-	break;
-      case 'U':
-	if (do_what != nada)
-	  usage ();
-	do_what = saw_remove_all_user_mounts;
-	break;
-      case 'v':
-	print_version ();
-	exit (0);
-      default:
-	usage ();
-      }
-
-  switch (do_what)
-    {
-    case saw_remove_all_mounts:
-      if (optind != argc)
-	usage ();
-      remove_all_mounts ();
-      break;
-    case saw_remove_cygdrive_prefix:
-      if (optind != argc)
-	usage ();
-      remove_cygdrive_prefix (flags | default_flag);
-      break;
-    case saw_remove_all_system_mounts:
-      if (optind != argc)
-	usage ();
-      remove_all_system_mounts ();
-      break;
-    case saw_remove_all_user_mounts:
-      if (optind != argc)
-	usage ();
-      remove_all_user_mounts ();
-      break;
-    default:
-      if (optind != argc - 1)
-	usage ();
-      if (cygwin_umount (argv[optind], flags | default_flag) != 0)
-	error (argv[optind]);
-    }
-
-  return 0;
-}
-
-/* remove_all_mounts: Unmount all mounts. */
-static void
-remove_all_mounts ()
-{
-  remove_all_user_mounts ();
-  remove_all_system_mounts ();
-}
-
-/* remove_all_user_mounts: Unmount all user mounts. */
-static void
-remove_all_user_mounts ()
-{
-  FILE *m = setmntent ("/-not-used-", "r");
-  struct mntent *p;
-
-  while ((p = getmntent (m)) != NULL)
-    {
-      /* Remove the mount if it's a user mount. */
-      if (strncmp (p->mnt_type, "user", 4) == 0 &&
-	  strstr (p->mnt_opts, "noumount") == NULL)
-	{
-	  if (cygwin_umount (p->mnt_dir, 0))
-	    error (p->mnt_dir);
-
-	  /* We've modified the table so we need to start over. */
-	  endmntent (m);
-	  m = setmntent ("/-not-used-", "r");
-	}
-    }
-
-  endmntent (m);
-}
-
-/* remove_all_system_mounts: Unmount all system mounts. */
-static void
-remove_all_system_mounts ()
-{
-  FILE *m = setmntent ("/-not-used-", "r");
-  struct mntent *p;
-
-  while ((p = getmntent (m)) != NULL)
-    {
-      /* Remove the mount if it's a system mount. */
-      if (strncmp (p->mnt_type, "system", 6) == 0 &&
-	  strstr (p->mnt_opts, "noumount") == NULL)
-	{
-	  if (cygwin_umount (p->mnt_dir, MOUNT_SYSTEM))
-	    error (p->mnt_dir);
-
-	  /* We've modified the table so we need to start over. */
-	  endmntent (m);
-	  m = setmntent ("/-not-used-", "r");
-	}
-    }
-
-  endmntent (m);
-}
-
-/* remove_cygdrive_prefix: Remove cygdrive user or system path prefix. */
-static void
-remove_cygdrive_prefix (int flags)
-{
-  int res = cygwin_umount (NULL, flags | MOUNT_CYGDRIVE);
-  if (res)
-    error ("remove_cygdrive_prefix");
-  exit (0);
-}
diff --git a/winsup/utils/utils.sgml b/winsup/utils/utils.sgml
deleted file mode 100644
index ec80be8c2..000000000
--- a/winsup/utils/utils.sgml
+++ /dev/null
@@ -1,1433 +0,0 @@
-<sect1 id="using-utils"><title>Cygwin Utilities</title>
-
-<para>Cygwin comes with a number of command-line utilities that are
-used to manage the UNIX emulation portion of the Cygwin environment.
-While many of these reflect their UNIX counterparts, each was written
-specifically for Cygwin.  You may use the long or short option names 
-interchangeably; for example, <literal>--help</literal> and 
-<literal>-h</literal> function identically. All of the Cygwin 
-command-line utilities support the <literal>--help</literal> and
-<literal>--version</literal> options. 
-</para>
-
-<sect2 id="cygcheck"><title>cygcheck</title>
-
-<screen>
-Usage: cygcheck [OPTIONS] [program ...]
-Check system information or PROGRAM library dependencies
-
- -c, --check-setup  check packages installed via setup.exe
- -s, --sysinfo      system information (not with -k)
- -v, --verbose      verbose output (indented) (for -s or programs)
- -r, --registry     registry search (requires -s)
- -k, --keycheck     perform a keyboard check session (not with -s)
- -h, --help         give help about the info (not with -c)
- -V, --version      output version information and exit
-You must at least give either -s or -k or a program name
-</screen>
-
-<para>The <command>cygcheck</command> program is a diagnostic utility
-that examines your system and reports the information that is
-significant to the proper operation of Cygwin programs.  It can give
-information about specific programs or libraries you are trying to
-run, general system information, or both.  If you list one or more
-programs on the command line, it will diagnose the runtime environment
-of that program or programs, providing the names of DLL files on which
-the program depends.  If you specify the <literal>-s</literal>
-option, it will give general system information.  If you specify
-<literal>-s</literal> and list one or more programs on the command line,
-it reports on both.</para>
-
-<para>The <literal>-h</literal> option prints additional helpful
-messages in the report, at the beginning of each section.  It also
-adds table column headings.  While this is useful information, it also
-adds some to the size of the report, so if you want a compact report
-or if you know what everything is already, just leave this out.</para>
-
-<para>The <literal>-v</literal> option causes the output to be more
-verbose.  What this means is that additional information will be
-reported which is usually not interesting, such as the internal
-version numbers of DLLs, additional information about recursive DLL
-usage, and if a file in one directory in the PATH also occurs in other
-directories on the PATH.  </para>
-
-<para>The <literal>-r</literal> option causes
-<command>cygcheck</command> to search your registry for information
-that is relevent to Cygwin programs.  These registry entries are the
-ones that have "Cygwin" in the name.  If you are paranoid about
-privacy, you may remove information from this report, but please keep
-in mind that doing so makes it harder to diagnose your problems.</para>
-
-<para>The <literal>-c</literal> option causes the arguments
-to be interpreted as package names.  <command>cygcheck</command> will
-report the current version of the package that you specify, or with no
-arguments, on all packages.</para>
-
-<para>The <command>cygcheck</command> program should be used to send
-information about your system for troubleshooting when requested.  
-When asked to run this command save the output so that you can email it,
-for example:</para>
-
-<screen>
-<prompt>C:\cygwin&gt;</prompt> <userinput>cygcheck -s -v -r -h &gt; cygcheck_output.txt</userinput>
-</screen>
-
-</sect2>
-
-<sect2 id="cygpath"><title>cygpath</title>
-
-<screen>
-Usage: cygpath (-d|-m|-u|-w|-t TYPE) [-c HANDLE] [-f FILE] [options] NAME
-       cygpath [-ADHPSW] 
-Convert Unix and Windows format paths, or output system path information
-
-Output type options:
-  -d, --dos             print DOS (short) form of NAME (C:\PROGRA~1\)
-  -m, --mixed           like --windows, but with regular slashes (C:/WINNT)
-  -u, --unix            (default) print Unix form of NAME (/cygdrive/c/winnt)
-  -w, --windows         print Windows form of NAME (C:\WINNT)
-  -t, --type TYPE       print TYPE form: 'dos', 'mixed', 'unix', or 'windows'
-Path conversion options:
-  -a, --absolute        output absolute path
-  -l, --long-name       print Windows long form of NAME (with -w, -m only)
-  -p, --path            NAME is a PATH list (i.e., '/bin:/usr/bin')
-  -s, --short-name      print DOS (short) form of NAME (with -w, -m only)
-System information:
-  -A, --allusers        use `All Users' instead of current user for -D, -P
-  -D, --desktop         output `Desktop' directory and exit
-  -H, --homeroot        output `Profiles' directory (home root) and exit
-  -P, --smprograms      output Start Menu `Programs' directory and exit
-  -S, --sysdir          output system directory and exit
-  -W, --windir          output `Windows' directory and exit
-</screen>
-
-<para>The <command>cygpath</command> program is a utility that
-converts Windows native filenames to Cygwin POSIX-style pathnames and
-vice versa.  It can be used when a Cygwin program needs to pass a file 
-name to a native Windows program, or expects to get a file name from a
-native Windows program.  Alternatively, <command>cygpath</command> can 
-output information about the location of important system directories 
-in either format.  
-</para>
-
-<para>The <literal>-u</literal> and <literal>-w</literal> options
-indicate whether you want a conversion to UNIX (POSIX) format 
-(<literal>-u</literal>) or to Windows format (<literal>-w</literal>).  
-Use the <literal>-d</literal> to get DOS-style (8.3) file and path names.
-The <literal>-m</literal> option will output Windows-style format
-but with forward slashes instead of backslashes.  This option is 
-especially useful in shell scripts, which use backslashes as an escape 
-character.</para>
-
-<para> In combination with the <literal>-w</literal> option, you can use
-the <literal>-l</literal> and <literal>-s</literal> options to use normal
-(long) or DOS-style (short) form. The <literal>-d</literal> option is 
-identical to <literal>-w</literal> and <literal>-s</literal> together.
-</para>
-
-<para>Caveat: The <literal>-l</literal> option does not work if the
-<emphasis>check_case</emphasis> parameter of <emphasis>CYGWIN</emphasis> 
-is set to <emphasis>strict</emphasis>, since Cygwin is not able to match 
-any Windows short path in this mode.
-</para>
-
-<para>The <literal>-p</literal> option means that you want to convert
-a path-style string rather than a single filename.  For example, the
-PATH environment variable is semicolon-delimited in Windows, but
-colon-delimited in UNIX.  By giving <literal>-p</literal> you are
-instructing <command>cygpath</command> to convert between these
-formats.</para>
-
-<para>The <literal>-i</literal> option supresses the print out of the
-usage message if no filename argument was given.  It can be used in
-make file rules converting variables that may be omitted
-to a proper format.  Note that <command>cygpath</command> output may 
-contain spaces (C:\Program Files) so should be enclosed in quotes.
-</para>
-
-
-<example><title>Example cygpath usage</title>
-<screen>
-#!/bin/sh
-if [ "${1}" = "" ];
-	then
-		XPATH=".";
-	else
-		XPATH="$(cygpath -w "${1}")";
-	fi
-	explorer $XPATH &
-</screen>
-</example>
-
-<para>The capital options 
-<literal>-D</literal>, <literal>-H</literal>, <literal>-P</literal>, 
-<literal>-S</literal>, and <literal>-W</literal> output directories used 
-by Windows that are not the same on all systems, for example 
-<literal>-S</literal> might output C:\WINNT\SYSTEM32 or C:\WINDOWS\SYSTEM. 
-The <literal>-H</literal> shows the Windows profiles directory that can 
-be used as root of home.  The <literal>-A</literal> option forces use of 
-the "All Users" directories instead of the current user for the 
-<literal>-D</literal> and <literal>-P</literal> options. 
-On Win9x systems with only a single user, <literal>-A</literal> has no
-effect; <literal>-D</literal> and <literal>-AD</literal> would have the
-same output.  By default the output is in UNIX (POSIX) format; 
-use the <literal>-w</literal> or <literal>-d</literal> options to get
-other formats.</para>
-
-</sect2>
-
-<sect2 id="dumper"><title>dumper</title>
-
-<screen>
-Usage: dumper [OPTION] FILENAME WIN32PID
-Dump core from WIN32PID to FILENAME.core
-
--d, --verbose  be verbose while dumping
--h, --help     output help information and exit
--q, --quiet    be quiet while dumping (default)
--v, --version  output version information and exit
-</screen>
-
-<para>The <command>dumper</command> utility can be used to create a
-core dump of running Windows process. This core dump can be later loaded
-to <command>gdb</command> and analyzed. One common way to use 
-<command>dumper</command> is to plug it into cygwin's Just-In-Time 
-debugging facility by adding
-
-<screen>
-error_start=x:\path\to\dumper.exe
-</screen>
-
-to the <emphasis>CYGWIN</emphasis> environment variable. Please note that
-<literal>x:\path\to\dumper.exe</literal> is Windows-style and not cygwin
-path. If <literal>error_start</literal> is set this way, then dumper will
-be started whenever some program encounters a fatal error.
-</para>
-
-<para>
-<command>dumper</command> can be also be started from the command line to 
-create a core dump of any running process. Unfortunately, because of a Windows 
-API limitation, when a core dump is created and <command>dumper</command> 
-exits, the target process is terminated too.
-</para>
-
-<para>
-To save space in the core dump, <command>dumper</command> doesn't write those
-portions of target process' memory space that are loaded from executable and
-dll files and are unchangeable, such as program code and debug info. Instead,
-<command>dumper</command> saves paths to files which contain that data. When a
-core dump is loaded into gdb, it uses these paths to load appropriate files.
-That means that if you create a core dump on one machine and try to debug it on
-another, you'll need to place identical copies of the executable and dlls in 
-the same directories as on the machine where the core dump was created.
-</para>
-
-</sect2>
-
-<sect2 id="getfacl"><title>getfacl</title>
-
-<screen>
-Usage: getfacl [-adn] FILE [FILE2...]
-Display file and directory access control lists (ACLs).
-
-  -a, --all      display the filename, the owner, the group, and
-                 the ACL of the file
-  -d, --dir      display the filename, the owner, the group, and
-                 the default ACL of the directory, if it exists
-  -h, --help     output usage information and exit
-  -n, --noname   display user and group IDs instead of names
-  -v, --version  output version information and exit
-
-When multiple files are specified on the command line, a blank
-line separates the ACLs for each file.
-</screen>
-
-<para>
-For each argument that is a regular file, special file or
-directory, <command>getfacl</command> displays the owner, the group, and the 
-ACL.  For directories <command>getfacl</command> displays additionally the 
-default ACL.  With no options specified, <command>getfacl</command> displays 
-the filename, the owner, the group, and both the ACL and the default ACL, if 
-it exists. For more information on Cygwin and Windows ACLs, see
-see <Xref Linkend="ntsec"> in the Cygwin User's Guide.
-The format for ACL output is as follows:
-<screen>
-     # file: filename
-     # owner: name or uid
-     # group: name or uid
-     user::perm
-     user:name or uid:perm
-     group::perm
-     group:name or gid:perm
-     mask:perm
-     other:perm
-     default:user::perm
-     default:user:name or uid:perm
-     default:group::perm
-     default:group:name or gid:perm
-     default:mask:perm
-     default:other:perm
-</screen>
-</para>
-</sect2>
-
-<sect2 id="kill"><title>kill</title>
-
-<screen>
-Usage: kill [-f] [-signal] [-s signal] pid1 [pid2 ...]
-       kill -l [signal]
-Send signals to processes
-
- -f, --force     force, using win32 interface if necessary
- -l, --list      print a list of signal names
- -s, --signal    send signal (use kill --list for a list)
- -h, --help      output usage information and exit
- -v, --version   output version information and exit
-</screen>
-
-<para>The <command>kill</command> program allows you to send arbitrary
-signals to other Cygwin programs.  The usual purpose is to end a
-running program from some other window when ^C won't work, but you can
-also send program-specified signals such as SIGUSR1 to trigger actions
-within the program, like enabling debugging or re-opening log files.
-Each program defines the signals they understand.</para>
-
-<para>You may need to specify the full path to use <command>kill</command> 
-from within some shells, including <command>bash</command>, the default Cygwin
-shell. This is because <command>bash</command> defines a 
-<command>kill</command> builtin function; see the <command>bash</command>
-man page under <emphasis>BUILTIN COMMANDS</emphasis> for more information.
-To make sure you are using the Cygwin version, try
-
-<screen>
-$ /bin/kill --version
-</screen>
-
-which should give the Cygwin <command>kill</command> version number and
-copyright information.
-</para>
-
-<para>Unless you specific the <literal>-f</literal> option, the "pid" values 
-used by <command>kill</command> are the Cygwin pids, not the Windows pids.  
-To get a list of running programs and their Cygwin pids, use the Cygwin
-<command>ps</command> program. <command>ps -W</command> will display
-<emphasis>all</emphasis> windows pids.</para>
-
-<para>The <command>kill -l</command> option prints the name of the
-given signal, or a list of all signal names if no signal is given.</para>
-
-<para>To send a specific signal, use the <literal>-signN</literal>
-option, either with a signal number or a signal name (minus the "SIG"
-part), like these examples:</para>
-
-<example><title>Using the kill command</title>
-<screen>
-<prompt>$</prompt> <userinput>kill 123</userinput>
-<prompt>$</prompt> <userinput>kill -1 123</userinput>
-<prompt>$</prompt> <userinput>kill -HUP 123</userinput>
-<prompt>$</prompt> <userinput>kill -f 123</userinput>
-</screen>
-</example>
-
-<para>Here is a list of available signals, their numbers, and some
-commentary on them, from the file
-<literal>&lt;sys/signal.h&gt;</literal>, which should be considered
-the official source of this information.</para>
-
-<screen>
-SIGHUP       1    hangup
-SIGINT       2    interrupt
-SIGQUIT      3    quit
-SIGILL       4    illegal instruction (not reset when caught)
-SIGTRAP      5    trace trap (not reset when caught)
-SIGABRT      6    used by abort
-SIGEMT       7    EMT instruction
-SIGFPE       8    floating point exception
-SIGKILL      9    kill (cannot be caught or ignored)
-SIGBUS      10    bus error
-SIGSEGV     11    segmentation violation
-SIGSYS      12    bad argument to system call
-SIGPIPE     13    write on a pipe with no one to read it
-SIGALRM     14    alarm clock
-SIGTERM     15    software termination signal from kill
-SIGURG      16    urgent condition on IO channel
-SIGSTOP     17    sendable stop signal not from tty
-SIGTSTP     18    stop signal from tty
-SIGCONT     19    continue a stopped process
-SIGCHLD     20    to parent on child stop or exit
-SIGTTIN     21    to readers pgrp upon background tty read
-SIGTTOU     22    like TTIN for output if (tp-&gt;t_local&amp;LTOSTOP)
-SIGPOLL     23    System V name for SIGIO
-SIGXCPU     24    exceeded CPU time limit
-SIGXFSZ     25    exceeded file size limit
-SIGVTALRM   26    virtual time alarm
-SIGPROF     27    profiling time alarm
-SIGWINCH    28    window changed
-SIGLOST     29    resource lost (eg, record-lock lost)
-SIGUSR1     30    user defined signal 1
-SIGUSR2     31    user defined signal 2
-</screen>
-
-</sect2>
-
-<sect2 id="mkgroup"><title>mkgroup</title>
-
-<screen>
-Usage: mkgroup [OPTION]... [domain]...
-Prints /etc/group file to stdout
-
-Options:
-   -l,--local             print local group information
-   -c,--current           print current group, if a domain account
-   -d,--domain            print global group information (from current
-                          domain if no domains specified).
-   -o,--id-offset offset  change the default offset (10000) added to gids
-                          in domain accounts.
-   -s,--no-sids           don't print SIDs in pwd field
-                          (this affects ntsec)
-   -u,--users             print user list in gr_mem field
-   -h,--help              print this message
-
-   -v,--version           print version information and exit
-
-One of `-l' or `-d' must be given on NT/W2K.
-</screen>
-
-<para>The <command>mkgroup</command> program can be used to help
-configure your Windows system to be more UNIX-like by creating an
-initial <filename>/etc/group</filename>.
-Its use is essential on the NT series (Windows NT, 2000, and XP) to
-include Windows security information.
-It can also be used on the Win9x series (Windows 95, 98, and Me) to
-create a file with the correct format.
-To initially set up your machine if you are a local user, you'd do
-something like this:</para>
-  
-<example><title>Setting up the groups file for local accounts</title>
-<screen>
-<prompt>$</prompt> <userinput>mkdir /etc</userinput>
-<prompt>$</prompt> <userinput>mkgroup -l &gt; /etc/group</userinput>
-</screen>
-</example>
-
-<para>Note that this information is static.  If you change the group
-information in your system, you'll need to regenerate the group file
-for it to have the new information.</para>
-
-<para>The <literal>-d</literal> and <literal>-l</literal> options
-allow you to specify where the information comes from, the
-local machine or the domain (default or given), or both.
-With the  <literal>-d</literal> option the program contacts the Domain
-Controller, which my be unreachable or have restricted access.
-An entry for the current domain user can then be created by using the
-option <literal>-c</literal> together with <literal>-l</literal>,
-but <literal>-c</literal> has no effect when used with <literal>-d</literal>.
-The <literal>-o</literal> option allows for special cases
-(such as multiple domains) where the GIDs might match otherwise.
-The <literal>-s</literal>
-option omits the NT Security Identifier (SID).  For more information on 
-SIDs, see <Xref Linkend="ntsec"> in the Cygwin User's Guide.  The
-<literal>-u</literal> option causes <command>mkgroup</command> to 
-enumerate the users for each group, placing the group members in the 
-gr_mem (last) field.  Note that this can greatly increase
-the time for <command>mkgroup</command> to run in a large domain.
-Having gr_mem fields is helpful when a domain user logs in remotely
-while the local machine is disconnected from the Domain Controller.
-</para>
-
-</sect2>
-
-<sect2 id="mkpasswd"><title>mkpasswd</title>
-
-<screen>
-Usage: mkpasswd [OPTION]... [domain]...
-Prints /etc/passwd file to stdout
-
-Options:
-   -l,--local              print local user accounts
-   -c,--current            print current account, if a domain account
-   -d,--domain             print domain accounts (from current domain
-                           if no domains specified)
-   -o,--id-offset offset   change the default offset (10000) added to uids
-                           in domain accounts.
-   -g,--local-groups       print local group information too
-                           if no domains specified
-   -m,--no-mount           don't use mount points for home dir
-   -s,--no-sids            don't print SIDs in GCOS field
-                           (this affects ntsec)
-   -p,--path-to-home path  use specified path and not user account home dir or /home
-   -u,--username username  only return information for the specified user
-   -h,--help               displays this message
-   -v,--version            version information and exit
-
-One of `-l', `-d' or `-g' must be given on NT/W2K.
-</screen>
-
-<para>The <command>mkpasswd</command> program can be used to help
-configure your Windows system to be more UNIX-like by creating an
-initial <filename>/etc/passwd</filename> from your system information.
-Its use is essential on the NT series (Windows NT, 2000, and XP) to
-include Windows security information, but the actual passwords are
-determined by Windows, not by the content of <filename>/etc/passwd</filename>.
-On the Win9x series (Windows 95, 98, and Me) the password field must be
-replaced by the output of <userinput>crypt your_password</userinput>
-if remote access is desired.
-To initially set up your machine if you are a local user, you'd do
-something like this:</para>
-  
-<example><title>Setting up the passwd file for local accounts</title>
-<screen>
-<prompt>$</prompt> <userinput>mkdir /etc</userinput>
-<prompt>$</prompt> <userinput>mkpasswd -l &gt; /etc/passwd</userinput>
-</screen>
-</example>
-
-<para>Note that this information is static.  If you change the user
-information in your system, you'll need to regenerate the passwd file
-for it to have the new information.</para>
-
-<para>The <literal>-d</literal> and <literal>-l</literal> options
-allow you to specify where the information comes from, the
-local machine or the domain (default or given), or both.
-With the  <literal>-d</literal> option the program contacts the Domain
-Controller, which my be unreachable or have restricted access.
-An entry for the current domain user can then be created by using the
-option <literal>-c</literal> together with <literal>-l</literal>,
-but <literal>-c</literal> has no effect when used with <literal>-d</literal>.
-The <literal>-o</literal> option allows for special cases
-(such as multiple domains) where the UIDs might match otherwise.
-The <literal>-g</literal> option creates a local
-user that corresponds to each local group. This is because NT assigns groups
-file ownership.  The <literal>-m</literal> option bypasses the current
-mount table so that, for example, two users who have a Windows home 
-directory of H: could mount them differently.  The <literal>-s</literal>
-option omits the NT Security Identifier (SID).  For more information on
-SIDs, see <Xref Linkend="ntsec"> in the Cygwin User's Guide.  The
-<literal>-p</literal> option causes <command>mkpasswd</command> to
-use the specified prefix instead of the account home dir or <literal>/home/
-</literal>. For example, this command:
-
-<example><title>Using an alternate home root</title>
-<screen>
-<prompt>$</prompt> <userinput>mkpasswd -l -p "$(cygpath -H)" &gt; /etc/passwd</userinput>
-</screen>
-</example>
-
-would put local users' home directories in the Windows 'Profiles' directory. 
-On Win9x machines the <literal>-u</literal> option creates an entry for
-the specified user. On the NT series it restricts the output to that user,
-greatly reducing the amount of time it takes in a large domain.</para>
-
-</sect2>
-
-<sect2 id="mount"><title>mount</title>
-
-<screen>
-Usage: mount [OPTION] [&lt;win32path&gt; &lt;posixpath&gt;]
-Display information about mounted filesystems, or mount a filesystem
-
-  -b, --binary     (default)    text files are equivalent to binary files
-                                (newline = \n)
-  -c, --change-cygdrive-prefix  change the cygdrive path prefix to &lt;posixpath&gt;
-  -f, --force                   force mount, don't warn about missing mount
-                                point directories
-  -h, --help                    output usage information and exit
-  -m, --mount-commands          write mount commands to replace user and
-                                system mount points and cygdrive prefixes
-  -o, --options X[,X...]        specify mount options
-  -p, --show-cygdrive-prefix    show user and/or system cygdrive path prefix
-  -s, --system     (default)    add system-wide mount point
-  -t, --text                    text files get \r\n line endings
-  -u, --user                    add user-only mount point
-  -v, --version                 output version information and exit
-  -x, --executable              treat all files under mount point as executables
-  -E, --no-executable           treat all files under mount point as 
-                                non-executables
-  -X, --cygwin-executable       treat all files under mount point as cygwin
-                                executables
-</screen>
-
-<para>The <command>mount</command> program is used to map your drives
-and shares onto Cygwin's simulated POSIX directory tree, much like as is
-done by mount commands on typical UNIX systems.  Please see
-<Xref Linkend="mount-table"> for more information on the concepts
-behind the Cygwin POSIX file system and strategies for using
-mounts. To remove mounts, use <command>umount</command></para>
-
-<sect3><title>Using mount</title>
-
-<para>If you just type <command>mount</command> with no parameters, it
-will display the current mount table for you.</para>
-
-<example>
-<title>Displaying the current set of mount points</title>
-<screen>
-<prompt>c:\cygwin\&gt;</prompt> <userinput>mount</userinput>
-c:\cygwin\bin on /usr/bin type system (binmode)
-c:\cygwin\lib on /usr/lib type system (binmode)
-c:\cygwin on / type system (binmode)
-c: on /c type user (binmode,noumount)
-d: on /d type user (binmode,noumount)
-</screen>
-</example>
-
-<para>In this example, c:\cygwin is the POSIX root and D drive is mapped to
-<filename>/d</filename>.  Note that in this case, the root mount is a
-system-wide mount point that is visible to all users running Cygwin
-programs, whereas the <filename>/d</filename> mount is only visible
-to the current user.</para>
-
-<para>The <command>mount</command> utility is also the mechanism for
-adding new mounts to the mount table.  The following example
-demonstrates how to mount the directory
-<filename>\\pollux\home\joe\data</filename> to <filename>/data</filename>.
-</para>
-
-<example>
-<title>Adding mount points</title>
-<screen>
-<prompt>c:\cygwin\&gt;</prompt> <userinput>ls /data</userinput>
-ls: /data: No such file or directory
-<prompt>c:\cygwin\&gt;</prompt> <userinput>mount \\pollux\home\joe\data /data</userinput>
-mount: warning - /data does not exist!
-<prompt>c:\cygwin\&gt;</prompt> <userinput>mount</userinput>
-\\pollux\home\joe\data on /data type sytem (binmode)
-c:\cygwin\bin on /usr/bin type system (binmode)
-c:\cygwin\lib on /usr/lib type system (binmode)
-c:\cygwin on / type system (binmode)
-c: on /c type user (binmode,noumount)
-d: on /d type user (binmode,noumount)
-</screen>
-</example>
-
-<para>Note that <command>mount</command> was invoked from the Windows
-command shell in the previous example.  In many Unix shells, including
-bash, it is legal and convenient to use the forward "/" in Win32
-pathnames since the "\" is the shell's escape character. </para>
-
-<para>The <literal>-s</literal> flag to <command>mount</command> is used to add a mount
-in the system-wide mount table used by all Cygwin users on the system,
-instead of the user-specific one.  System-wide mounts are displayed
-by <command>mount</command> as being of the "system" type, as is the
-case for the <filename>/</filename> partition in the last example.
-Under Windows NT, only those users with Administrator priviledges are
-permitted to modify the system-wide mount table.</para>
-
-<para>Note that a given POSIX path may only exist once in the user
-table and once in the global, system-wide table.  Attempts to replace
-the mount will fail with a busy error.  The <literal>-f</literal> (force) flag causes
-the old mount to be silently replaced with the new one.  It will also
-silence warnings about the non-existence of directories at the Win32
-path location.</para>
-
-<para>The <literal>-b</literal> flag is used to instruct Cygwin to treat binary and
-text files in the same manner by default.  Binary mode mounts are
-marked as "binmode" in the Flags column of <command>mount</command>
-output.  By default, mounts are in text mode ("textmode" in the Flags
-column).</para>
-
-<para>Normally, files ending in certain extensions (.exe, .com, .bat, .cmd) 
-are assumed to be executable.  Files whose first two characters begin with 
-'#!' are also considered to be executable.  
-The <literal>-x</literal> flag is used to instruct Cygwin that the 
-mounted file is "executable".  If the <literal>-x</literal> flag is used 
-with a directory then all files in the directory are executable.  
-This option allows other files to be marked as executable and avoids the 
-overhead of opening each file to check for a '#!'.  The <literal>-X</literal>
-option is very similar to <literal>-x</literal>, but also prevents Cygwin
-from setting up commands and environment variables for a normal Windows 
-program, adding another small performance gain.  The opposite of these 
-flags is the <literal>-E</literal> flag, which means that no files should be 
-marked as executable.  </para>
-
-<para>
-The <literal>-m</literal> option causes the <command>mount</command> utility
-to output a series of commands that could recreate both user and system mount 
-points. You can save this output as a backup when experimenting with the
-mount table. It also makes moving your settings to a different machine
-much easier.
-</para>
-
-<para>
-The <literal>-o</literal> option is the method via which various options about
-the mount point may be recorded.  The following options are available (note that
-most of the options are duplicates of other mount flags):</para>
-
-<screen>
-  user       - mount lives user-specific mount
-  system     - mount lives in system table (default)
-  binary     - files default to binary mode (default)
-  text       - files default to CRLF text mode line endings
-  exec       - files below mount point are all executable
-  notexec    - files below mount point are not executable
-  cygexec    - files below mount point are all cygwin executables
-  nosuid     - no suid files are allowed (currently unimplemented)
-  managed    - directory is managed by cygwin.  Mixed case and special
-               characters in filenames are allowed.
-</screen>
-</sect3>
-
-<sect3><title>Cygdrive mount points</title>
-
-<para>Whenever Cygwin cannot use any of the existing mounts to convert
-from a particular Win32 path to a POSIX one, Cygwin will, instead,
-convert to a POSIX path using a default mount point:
-<filename>/cygdrive</filename>.  For example, if Cygwin accesses
-<filename>z:\foo</filename> and the z drive is not currently in the
-mount table, then <filename>z:\</filename> will be accessible as
-<filename>/cygdrive/z</filename>.  The <command>mount</command> utility 
-can be used to change this default automount prefix through the use of the
-"--change-cygdrive-prefix" option.  In the following example, we will
-set the automount prefix to <filename>/</filename>:</para>
-
-<example>
-<title>Changing the default prefix</title>
-<screen>
-<prompt>c:\cygwin\&gt;</prompt> <userinput>mount --change-cygdrive-prefix /</userinput>
-</screen>
-</example>
-
-<para>Note that if you set a new prefix in this manner, you can
-specify the <literal>-s</literal> flag to make this the system-wide default 
-prefix.  By default, the cygdrive-prefix applies only to the system-wide setting.  
-You can always see the user and system cygdrive prefixes with the 
-<literal>-p</literal> option.  Using the <literal>-b</literal>
-flag with <literal>--change-cygdrive-prefix</literal> makes all new 
-automounted filesystems default to binary mode file accesses.</para>
-
-</sect3>
-
-<sect3><title>Limitations</title>
-
-<para>Limitations: there is a hard-coded limit of 30 mount
-points.  Also, although you can mount to pathnames that do not start
-with "/", there is no way to make use of such mount points.</para>
-
-<para>Normally the POSIX mount point in Cygwin is an existing empty
-directory, as in standard UNIX. If this is the case, or if there is a
-place-holder for the mount point (such as a file, a symbolic link
-pointing anywhere, or a non-empty directory), you will get the expected
-behavior. Files present in a mount point directory before the mount
-become invisible to Cygwin programs.
-</para>
-
-<para>It is sometimes desirable to mount to a non-existent directory,
-for example to avoid cluttering the root directory with names
-such as
-<filename>a</filename>, <filename>b</filename>, <filename>c</filename>
-pointing to disks.
-Although <command>mount</command> will give you a warning, most
-everything will work properly when you refer to the mount point
-explicitly.  Some strange effects can occur however.
-For example if your current working directory is
-<filename>/dir</filename>,
-say, and <filename>/dir/mtpt</filename> is a mount point, then
-<filename>mtpt</filename> will not show up in an <command>ls</command>
-or
-<command>echo *</command> command and <command>find .</command> will
-not
-find <filename>mtpt</filename>.
-</para>
-
-</sect3>
-
-</sect2>
-
-<sect2 id="passwd"><title>passwd</title>
-
-<screen>
-Usage: passwd (-l|-u|-S) [USER]
-       passwd [-i NUM] [-n MINDAYS] [-x MAXDAYS] [-L LEN]
-Change USER's password or password attributes
-
-User operations:
- -l, --lock      lock USER's account
- -u, --unlock    unlock USER's account
- -S, --status    display password status for USER (locked, expired, etc.)
-
-System operations:
- -i, --inactive  set NUM of days before inactive accounts are disabled
-                 (inactive accounts are those with expired passwords)
- -n, --minage    set system minimum password age to MINDAYS
- -x, --maxage    set system maximum password age to MAXDAYS
- -L, --length    set system minimum password length to LEN
-
-Other options:
- -h, --help      output usage information and exit
- -v, --version   output version information and exit
-</screen>
-
-<para> <command>passwd</command> changes passwords for user accounts.
-A normal user may only change the password for their own account,
-but administrators may change passwords on any account.
-<command>passwd</command> also changes account information, such as
-password expiry dates and intervals.</para>
-
-<para>Password changes: The user is first prompted for their old
-password, if one is present.  This password is then encrypted and
-compared against the stored password.  The user has only one chance to
-enter the correct password.  The administrators are permitted to
-bypass this step so that forgotten passwords may be changed.</para>
-
-<para>The user is then prompted for a replacement password.
-<command>passwd</command> will prompt twice for this replacement and 
-compare the second entry against the first.  Both entries are require to 
-match in order for the password to be changed.</para>
-
-<para>After the password has been entered, password aging information
-is checked to see if the user is permitted to change their password
-at this time.  If not, <command>passwd</command> refuses to change the
-password and exits.</para>
-
-<para>Account maintenance: User accounts may be locked and unlocked with the
-<literal>-l</literal> and <literal>-u</literal> flags.  The
-<literal>-l</literal> option disables an account.  The <literal>-u</literal>
-option re-enables an account.</para>
-
-<para>The account status may be given with the <literal>-S</literal>
-option.  The status information is self explanatory.</para>
-
-<para>Administrators can also use <command>passwd</command> to change
-system-wide password expiry and length requirements with the
-<literal>-i</literal>, <literal>-n</literal>, <literal>-x</literal>,
-and <literal>-L</literal> options.  The <literal>-i</literal>
-option is used to disable an account after the password has been expired
-for a number of days.  After a user account has had an expired password
-for <emphasis>NUM</emphasis> days, the user may no longer sign on to
-the account.  The <literal>-n</literal> option is
-used to set the minimum number of days before a password may be changed.
-The user will not be permitted to change the password until
-<emphasis>MINDAYS</emphasis> days have elapsed.  The
-<literal>-x</literal> option is used to set the maximum number of days
-a password remains valid.  After <emphasis>MAXDAYS</emphasis> days, the
-password is required to be changed.  Allowed values for the above options 
-are 0 to 999.  The <literal>-L</literal> option sets the minimum length of 
-allowed passwords for users who don't belong to the administrators group
-to <emphasis>LEN</emphasis> characters.  Allowed values for the minimum
-password length are 0 to 14.  In any of the above cases, a value of 0
-means `no restrictions'.</para>
-
-<para>Limitations: Users may not be able to change their password on
-some systems.</para>
-
-</sect2>
-
-<sect2 id="ps"><title>ps</title>
-
-<screen>
-Usage: ps [-aefls] [-u UID]
-Report process status
-
- -a, --all       show processes of all users
- -e, --everyone  show processes of all users
- -f, --full      show process uids, ppids
- -h, --help      output usage information and exit
- -l, --long      show process uids, ppids, pgids, winpids
- -s, --summary   show process summary
- -u, --user      list processes owned by UID
- -v, --version   output version information and exit
- -W, --windows   show windows as well as cygwin processes
-With no options, ps outputs the long format by default
-</screen>
-
-<para>The <command>ps</command> program gives the status of all the
-Cygwin processes running on the system (ps = "process status").  Due
-to the limitations of simulating a POSIX environment under Windows,
-there is little information to give.  
-</para>
-
-<para>
-The PID column is the process ID you need to give to the 
-<command>kill</command> command. The PPID is the parent process ID,
-and PGID is the process group ID.  The WINPID column is the process 
-ID displayed by NT's Task Manager program. The TTY column gives which 
-pseudo-terminal a process is running on, or a <literal>'?'</literal>
-for services. The UID column shows which user owns each process. 
-STIME is the time the process was started, and COMMAND gives the name
-of the program running.
-</para>
-
-<para>
-By default <command>ps</command> will only show processes owned by the
-current user. With either the <literal>-a</literal> or <literal>-e</literal>
-option, all user's processes (and system processes) are listed. There are
-historical UNIX reasons for the synonomous options, which are functionally
-identical. The <literal>-f</literal> option outputs a "full" listing with
-usernames for UIDs. The <literal>-l</literal> option is the default display
-mode, showing a "long" listing with all the above columns. The other display
-option is <literal>-s</literal>, which outputs a shorter listing of just
-PID, TTY, STIME, and COMMAND. The <literal>-u</literal> option allows you
-to show only processes owned by a specific user. The <literal>-W</literal>
-option causes <command>ps</command> show non-Cygwin Windows processes as 
-well as Cygwin processes. The WINPID is also the PID, and they can be killed
-with the Cygwin <command>kill</command> command's <literal>-f</literal>
-option.
-</para>
-
-</sect2>
-
-<sect2 id="regtool"><title>regtool</title>
-
-<screen>
-Usage: regtool.exe [OPTION] (add | check | get | list | remove | unset) KEY
-View or edit the Win32 registry
-
-Actions:
- add KEY\SUBKEY             add new SUBKEY
- check KEY                  exit 0 if KEY exists, 1 if not
- get KEY\VALUE              prints VALUE to stdout
- list KEY                   list SUBKEYs and VALUEs
- remove KEY                 remove KEY
- set KEY\VALUE [data ...]   set VALUE
- unset KEY\VALUE            removes VALUE from KEY
-
-Options for 'list' Action:
- -k, --keys           print only KEYs
- -l, --list           print only VALUEs
- -p, --postfix        like ls -p, appends '\' postfix to KEY names
-
-Options for 'set' Action:
- -e, --expand-string  set type to REG_EXPAND_SZ
- -i, --integer        set type to REG_DWORD
- -m, --multi-string   set type to REG_MULTI_SZ
- -s, --string         set type to REG_SZ
-
-Options for 'set' and 'unset' Actions:
- -K&lt;c&gt;, --key-separator[=]&lt;c&gt;  set key separator to &lt;c&gt; instead of '\'
-
-Other Options:
- -h, --help     output usage information and exit
- -q, --quiet    no error output, just nonzero return if KEY/VALUE missing
- -v, --verbose  verbose output, including VALUE contents when applicable
- -V, --version  output version information and exit
-
-KEY is in the format [host]\prefix\KEY\KEY\VALUE, where host is optional
-remote host in either \\hostname or hostname: format and prefix is any of:
-  root     HKCR  HKEY_CLASSES_ROOT (local only)
-  config   HKCC  HKEY_CURRENT_CONFIG (local only)
-  user     HKCU  HKEY_CURRENT_USER (local only)
-  machine  HKLM  HKEY_LOCAL_MACHINE
-  users    HKU   HKEY_USERS
-
-You can use forward slash ('/') as a separator instead of backslash, in
-that case backslash is treated as escape character
-Example: regtool.exe get '\user\software\Microsoft\Clock\iFormat'
-</screen>
-
-<para>The <command>regtool</command> program allows shell scripts
-to access and modify the Windows registry.  Note that modifying the
-Windows registry is dangerous, and carelessness here can result
-in an unusable system.  Be careful.</para>
-
-<para>The <literal>-v</literal> option means "verbose".  For most
-commands, this causes additional or lengthier messages to be printed.
-Conversely, the <literal>-q</literal> option supresses error messages,
-so you can use the exit status of the program to detect if a key
-exists or not (for example).</para>
-
-<para>You must provide <command>regtool</command> with an 
-<emphasis>action</emphasis> following options (if any). Currently,
-the action must be <literal>add</literal>, <literal>set</literal>,
-<literal>check</literal>, <literal>get</literal>, <literal>list</literal>,
-<literal>remove</literal>, <literal>set</literal>, or <literal>unset</literal>.
-</para>
-
-<para>The <literal>add</literal> action adds a new key.  The 
-<literal>check</literal> action checks to see if a key exists (the 
-exit code of the program is zero if it does, nonzero if it does not).
-The <literal>get</literal> action gets the value of a value of a key,
-and prints it (and nothing else) to stdout.  Note: if the value
-doesn't exist, an error message is printed and the program returns a
-non-zero exit code.  If you give <literal>-q</literal>, it doesn't
-print the message but does return the non-zero exit code.</para>
-
-<para>
-The <literal>list</literal> action lists the subkeys and values
-belonging to the given key. With <literal>list</literal>, the 
-<literal>-k</literal> option instructs <command>regtool</command>
-to print only KEYs, and the <literal>-l</literal> option to print
-only VALUEs. The <literal>-p</literal> option postfixes a 
-<literal>'/'</literal> to each KEY, but leave VALUEs with no
-postfix.  The <literal>remove</literal> action 
-removes a key.  Note that you may need to remove everything in the key 
-before you may remove it, but don't rely on this stopping you from 
-accidentally removing too much.  
-</para>
-
-<para>The <literal>set</literal> action sets a value within a key.
-<literal>-e</literal> means it's an expanding string (REG_EXPAND_SZ)
-that contains embedded environment variables.  
-<literal>-i</literal> means the value is an integer (REG_DWORD).
-<literal>-m</literal> means it's a multi-string (REG_MULTI_SZ).  
-<literal>-s</literal> means the value is a string (REG_SZ).
-If you don't specify one of these, <command>regtool</command> tries to
-guess the type based on the value you give.  If it looks like a
-number, it's a DWORD.  If it starts with a percent, it's an expanding
-string.  If you give multiple values, it's a multi-string.  Else, it's
-a regular string.
-The <literal>unset</literal> action removes a value from a key.
-</para>
-
-<para>
-By default, the last "\" or "/" is assumed to be the separator between the
-key and the value.  You can use the <literal>-K</literal> option to provide 
-an alternate key/value separator character.
-</para>
-
-</sect2>
-
-<sect2 id="setfacl"><title>setfacl</title>
-
-<screen>
-Usage: setfacl [-r] (-f ACL_FILE | -s acl_entries) FILE...
-       setfacl [-r] ([-d acl_entries] [-m acl_entries]) FILE...
-Modify file and directory access control lists (ACLs)
-
-  -d, --delete     delete one or more specified ACL entries
-  -f, --file       set ACL entries for FILE to ACL entries read
-                   from a ACL_FILE
-  -m, --modify     modify one or more specified ACL entries
-  -r, --replace    replace mask entry with maximum permissions
-                   needed for the file group class
-  -s, --substitute substitute specified ACL entries for the
-                   ACL of FILE
-  -h, --help       output usage information and exit
-  -v, --version    output version information and exit
-
-At least one of (-d, -f, -m, -s) must be specified
-</screen>
-
-<para>
-For each file given as parameter, <command>setfacl</command> will 
-either replace its complete ACL (<literal>-s</literal>, <literal>-f</literal>), 
-or it will add, modify, or delete ACL entries.
-For more information on Cygwin and Windows ACLs, see
-see <Xref Linkend="ntsec"> in the Cygwin User's Guide.
-</para>
-
-<para>
-Acl_entries are one or more comma-separated ACL entries 
-from the following list:
-<screen>
-         u[ser]::perm
-         u[ser]:uid:perm
-         g[roup]::perm
-         g[roup]:gid:perm
-         m[ask]::perm
-         o[ther]::perm
-</screen>
-Default entries are like the above with the additional
-default identifier. For example: 
-<screen>
-         d[efault]:u[ser]:uid:perm
-</screen>
-</para>
-
-<para>
-<emphasis>perm</emphasis> is either a 3-char permissions string in the form
-"rwx" with the character <literal>'-'</literal> for no permission
-or it is the octal representation of the permissions, a
-value from 0 (equivalent to "---") to 7 ("rwx").
-<emphasis>uid</emphasis> is a user name or a numerical uid.
-<emphasis>gid</emphasis> is a group name or a numerical gid.
-</para>
-
-<para>
-The following options are supported:
-</para>
-
-<para>
-<literal>-d</literal>
-Delete one or more specified entries from the file's ACL.
-The owner, group and others entries must not be deleted.
-Acl_entries to be deleted should be specified without
-permissions, as in the following list:
-<screen>
-         u[ser]:uid
-         g[roup]:gid
-         d[efault]:u[ser]:uid
-         d[efault]:g[roup]:gid
-         d[efault]:m[ask]:
-         d[efault]:o[ther]:
-</screen>
-</para>
-
-<para>
-<literal>-f</literal>
-Take the Acl_entries from ACL_FILE one per line. Whitespace
-characters are ignored, and the character "#" may be used
-to start a comment.  The special filename "-" indicates
-reading from stdin. Note that you can use this with 
-<command>getfacl</command> and <command>setfacl</command> to copy 
-ACLs from one file to another:
-<screen>
-$ getfacl source_file | setfacl -f - target_file
-</screen>
-</para>
-
-<para>
-Required entries are: 
-one user entry for the owner of the file,
-one group entry for the group of the file, and
-one other entry.
-</para>
-
-<para>
-If additional user and group entries are given:
-a mask entry for the file group class of the file, and 
-no duplicate user or group entries with the same uid/gid.
-</para>
-
-<para>
-If it is a directory:
-one default user entry for the owner of the file,
-one default group entry for the group of the file,
-one default mask entry for the file group class, and
-one default other entry.
-</para>
-
-<para>
-<literal>-m</literal>
-Add or modify one or more specified ACL entries.  Acl_entries is a 
-comma-separated list of entries from the same list as above.
-</para>
-
-<para>
-<literal>-r</literal>   
-Causes the permissions specified in the mask 
-entry to be ignored and replaced by the maximum permissions needed for 
-the file group class.
-</para>
-
-<para>
-<literal>-s</literal>   
-Like <literal>-f</literal>, but substitute the 
-file's ACL with Acl_entries specified in a comma-separated list on the 
-command line.
-</para>
-
-<para>
-While the <literal>-d</literal> and <literal>-m</literal> options may be used 
-in the same command, the <literal>-f</literal> and <literal>-s</literal> 
-options may be used only exclusively.
-</para>
-
-<para>
-Directories may contain default ACL entries.  Files created
-in a directory that contains default ACL entries will have
-permissions according to the combination of the current umask,
-the explicit permissions requested and the default ACL entries
-</para>
-
-<para>
-Limitations: Under Cygwin, the default ACL entries are not taken into
-account currently.
-</para>
-
-</sect2>
-
-<sect2 id="ssp"><title>ssp</title>
-
-<screen>
-Usage: ssp [options] low_pc high_pc command...
-Single-step profile COMMAND
-
- -c, --console-trace  trace every EIP value to the console. *Lots* slower.
- -d, --disable        disable single-stepping by default; use
-                      OutputDebugString ("ssp on") to enable stepping
- -e, --enable         enable single-stepping by default; use
-                      OutputDebugString ("ssp off") to disable stepping
- -h, --help           output usage information and exit
- -l, --dll            enable dll profiling.  A chart of relative DLL usage
-                      is produced after the run.
- -s, --sub-threads    trace sub-threads too.  Dangerous if you have
-                      race conditions.
- -t, --trace-eip      trace every EIP value to a file TRACE.SSP.  This
-                      gets big *fast*.
- -v, --verbose        output verbose messages about debug events.
- -V, --version        output version information and exit
-
-Example: ssp 0x401000 0x403000 hello.exe
-</screen>
-
-<para>
-SSP - The Single Step Profiler
-</para>
-
-<para>
-Original Author:  DJ Delorie 
-</para>
-
-<para>
-The SSP is a program that uses the Win32 debug API to run a program
-one ASM instruction at a time.  It records the location of each
-instruction used, how many times that instruction is used, and all
-function calls.  The results are saved in a format that is usable by
-the profiling program <command>gprof</command>, although 
-<command>gprof</command> will claim the values
-are seconds, they really are instruction counts.  More on that later.
-</para>
-
-<para>
-Because the SSP was originally designed to profile the cygwin DLL, it
-does not automatically select a block of code to report statistics on.
-You must specify the range of memory addresses to keep track of
-manually, but it's not hard to figure out what to specify.  Use the
-"objdump" program to determine the bounds of the target's ".text"
-section.  Let's say we're profiling cygwin1.dll.  Make sure you've
-built it with debug symbols (else <command>gprof</command> won't run) 
-and run objdump like this:
-
-<screen>
-$ objdump -h cygwin1.dll
-</screen>
-
-It will print a report like this:
-<screen>
-cygwin1.dll:     file format pei-i386
-
-Sections:
-Idx Name          Size      VMA       LMA       File off  Algn
-  0 .text         0007ea00  61001000  61001000  00000400  2**2
-                  CONTENTS, ALLOC, LOAD, READONLY, CODE, DATA
-  1 .data         00008000  61080000  61080000  0007ee00  2**2
-                  CONTENTS, ALLOC, LOAD, DATA
-  . . .
-</screen>
-</para>
-
-<para>
-The only information we're concerned with are the VMA of 
-the .text section and the VMA of the section after it 
-(sections are usually contiguous; you can also add the 
-Size to the VMA to get the end address).  In this case, 
-the VMA is 0x61001000 and the ending address is either 
-0x61080000 (start of .data method) or 0x0x6107fa00 (VMA+Size
-method).
-</para>
-
-<para>
-There are two basic ways to use SSP - either profiling a whole
-program, or selectively profiling parts of the program.
-</para>
-
-<para>
-To profile a whole program, just run <command>ssp</command> without options.  
-By default, it will step the whole program.  Here's a simple example, using 
-the numbers above:
-
-<screen>
-$ ssp 0x61001000 0x61080000 hello.exe
-</screen>
-
-This will step the whole program.  It will take at least 8 minutes on
-a PII/300 (yes, really).  When it's done, it will create a file called
-"gmon.out".  You can turn this data file into a readable report with
-<command>gprof</command>:
-
-<screen>
-$ gprof -b cygwin1.dll
-</screen>
-
-The "-b" means 'skip the help pages'.  You can omit this until you're
-familiar with the report layout.  The <command>gprof</command> documentation 
-explains a lot about this report, but <command>ssp</command> changes a few 
-things.  For example, the first part of the report reports the amount of time 
-spent in each function, like this:
-
-<screen>
-Each sample counts as 0.01 seconds.
-  %   cumulative   self              self     total
- time   seconds   seconds    calls  ms/call  ms/call  name
- 10.02    231.22    72.43       46  1574.57  1574.57  strcspn
-  7.95    288.70    57.48      130   442.15   442.15  strncasematch
-</screen>
-
-The "seconds" columns are really CPU opcodes, 1/100 second per opcode.
-So, "231.22" above means 23,122 opcodes.  The ms/call values are 10x
-too big; 1574.57 means 157.457 opcodes per call.  Similar adjustments
-need to be made for the "self" and "children" columns in the second
-part of the report.
-</para>
-
-<para>
-OK, so now we've got a huge report that took a long time to generate,
-and we've identified a spot we want to work on optimizing.  Let's say
-it's the time() function.  We can use SSP to selectively profile this
-function by using OutputDebugString() to control SSP from within the
-program.  Here's a sample program:
-
-<screen>
-	#include &lt;windows.h&gt;
-	main()
-	{
-	  time_t t;
-	  OutputDebugString("ssp on");
-	  time(&amp;t);
-	  OutputDebugString("ssp off");
-	}
-</screen>
-</para>
-
-<para>
-Then, add the <literal>-d</literal> option to ssp to default to 
-*disabling* profiling.  The program will run at full speed until the first 
-OutputDebugString, then step until the second.
-You can then use <command>gprof</command> (as usual) to see the performance 
-profile for just that portion of the program's execution.
-</para>
-
-<para>
-There are many options to ssp.  Since step-profiling makes your
-program run about 1,000 times slower than normal, it's best to
-understand all the options so that you can narrow down the parts
-of your program you need to single-step.
-</para>
-
-<para>
-<literal>-v</literal> - verbose.  This prints messages about threads 
-starting and stopping, OutputDebugString calls, DLLs loading, etc.
-</para>
-
-<para>
-<literal>-t</literal> and <literal>-c</literal> - tracing.  
-With <literal>-t</literal>, *every* step's address is written
-to the file "trace.ssp".  This can be used to help debug functions,
-since it can trace multiple threads.  Clever use of scripts can match
-addresses with disassembled opcodes if needed.  Warning: creates
-*huge* files, very quickly.  <literal>-c</literal> prints each address to 
-the console, useful for debugging key chunks of assembler.  Use 
-<literal>addr2line -C -f -s -e foo.exe &lt; trace.ssp &gt; lines.ssp</literal>
-and then <literal>perl cvttrace</literal> to convert to symbolic traces.
-</para>
-
-<para>
-<literal>-s</literal> - subthreads.  Usually, you only need to trace the 
-main thread, but sometimes you need to trace all threads, so this enables that.
-It's also needed when you want to profile a function that only a
-subthread calls.  However, using OutputDebugString automatically
-enables profiling on the thread that called it, not the main thread.
-</para>
-
-<para>
-<literal>-l</literal> - dll profiling.  Generates a pretty table of how much 
-time was spent in each dll the program used.  No sense optimizing a function in
-your program if most of the time is spent in the DLL.
-I usually use the <literal>-v</literal>, <literal>-s</literal>, and 
-<literal>-l</literal> options:
-
-<screen>
-$ ssp <literal>-v</literal> <literal>-s</literal> <literal>-l</literal> <literal>-d</literal> 0x61001000 0x61080000 hello.exe
-</screen>
-</para>
-</sect2>
-
-<sect2 id="strace"><title>strace</title>
-
-<screen>
-Usage: strace.exe [OPTIONS] &lt;command-line&gt;
-Usage: strace.exe [OPTIONS] -p &lt;pid&gt;
-Trace system calls and signals
-
-  -b, --buffer-size=SIZE       set size of output file buffer
-  -d, --no-delta               don't display the delta-t microsecond timestamp
-  -f, --trace-children         trace child processes (toggle - default true)
-  -h, --help                   output usage information and exit
-  -m, --mask=MASK              set message filter mask
-  -n, --crack-error-numbers    output descriptive text instead of error
-                               numbers for Windows errors
-  -o, --output=FILENAME        set output file to FILENAME
-  -p, --pid=n                  attach to executing program with cygwin pid n
-  -S, --flush-period=PERIOD    flush buffered strace output every PERIOD secs
-  -t, --timestamp              use an absolute hh:mm:ss timestamp insted of 
-                               the default microsecond timestamp.  Implies -d
-  -T, --toggle                 toggle tracing in a process already being
-                               traced. Requires -p &lt;pid&gt;
-  -v, --version                output version information and exit
-  -w, --new-window             spawn program under test in a new window
-
-    MASK can be any combination of the following mnemonics and/or hex values
-    (0x is optional).  Combine masks with '+' or ',' like so:
-
-                      --mask=wm+system,malloc+0x00800
-
-    Mnemonic Hex     Corresponding Def  Description
-    =========================================================================
-    all      0x00001 (_STRACE_ALL)      All strace messages.
-    flush    0x00002 (_STRACE_FLUSH)    Flush output buffer after each message.
-    inherit  0x00004 (_STRACE_INHERIT)  Children inherit mask from parent.
-    uhoh     0x00008 (_STRACE_UHOH)     Unusual or weird phenomenon.
-    syscall  0x00010 (_STRACE_SYSCALL)  System calls.
-    startup  0x00020 (_STRACE_STARTUP)  argc/envp printout at startup.
-    debug    0x00040 (_STRACE_DEBUG)    Info to help debugging. 
-    paranoid 0x00080 (_STRACE_PARANOID) Paranoid info.
-    termios  0x00100 (_STRACE_TERMIOS)  Info for debugging termios stuff.
-    select   0x00200 (_STRACE_SELECT)   Info on ugly select internals.
-    wm       0x00400 (_STRACE_WM)       Trace Windows msgs (enable _strace_wm).
-    sigp     0x00800 (_STRACE_SIGP)     Trace signal and process handling.
-    minimal  0x01000 (_STRACE_MINIMAL)  Very minimal strace output.
-    exitdump 0x04000 (_STRACE_EXITDUMP) Dump strace cache on exit.
-    system   0x08000 (_STRACE_SYSTEM)   Serious error; goes to console and log.
-    nomutex  0x10000 (_STRACE_NOMUTEX)  Don't use mutex for synchronization.
-    malloc   0x20000 (_STRACE_MALLOC)   Trace malloc calls.
-    thread   0x40000 (_STRACE_THREAD)   Thread-locking calls.
-</screen>
-
-<para>The <command>strace</command> program executes a program, and
-optionally the children of the program, reporting any Cygwin DLL output
-from the program(s) to stdout, or to a file with the <literal>-o</literal>
-option.  With the <literal>-w</literal> option, you can start an strace
-session in a new window, for example:
-
-<screen>
-$ strace -o tracing_output -w sh -c 'while true; do echo "tracing..."; done' &
-</screen>
-This is particularly useful for <command>strace</command> sessions that
-take a long time to complete.
-</para>
-
-<para>
-Note that <command>strace</command> is a standalone Windows program and so does 
-not rely on the Cygwin DLL itself (you can verify this with 
-<command>cygcheck</command>). As a result it does not understand POSIX
-pathnames or symlinks.  This program is mainly useful for debugging the 
-Cygwin DLL itself.</para>
-
-</sect2>
-
-<sect2 id="umount"><title>umount</title>
-
-<screen>
-Usage: umount.exe [OPTION] [&lt;posixpath&gt;]
-Unmount filesystems
-
-  -A, --remove-all-mounts       remove all mounts
-  -c, --remove-cygdrive-prefix  remove cygdrive prefix
-  -h, --help                    output usage information and exit
-  -s, --system                  remove system mount (default)
-  -S, --remove-system-mounts    remove all system mounts
-  -u, --user                    remove user mount
-  -U, --remove-user-mounts      remove all user mounts
-  -v, --version                 output version information and exit
-</screen>
-
-<para>The <command>umount</command> program removes mounts from the
-mount table.  If you specify a POSIX path that corresponds to a
-current mount point, <command>umount</command> will remove it from the
-system registry area.  (Administrator priviledges are required).
-The <literal>-u</literal> flag may be used to specify removing the mount 
-from the user-specific registry area instead.</para>
-
-<para>The <command>umount</command> utility may also be used to remove
-all mounts of a particular type.  With the extended options it is
-possible to remove all mounts (<literal>-A</literal>), all 
-cygdrive automatically-mounted mounts (<literal>-c</literal>), all
-mounts in the current user's registry area (<literal>-U</literal>), 
-or all mounts in the system-wide registry area (<literal>-S</literal>) 
-(with Administrator privileges).</para>
-
-<para>See <Xref Linkend="mount"> for more information on the mount
-table.</para>
-</sect2>
-
-</sect1>
diff --git a/winsup/w32api/CONTRIBUTIONS b/winsup/w32api/CONTRIBUTIONS
deleted file mode 100644
index 1c3df0e14..000000000
--- a/winsup/w32api/CONTRIBUTIONS
+++ /dev/null
@@ -1,5 +0,0 @@
-2000-10-23  Danny R. Smith  <danny_r_smith_2001@yahoo.co.nz>
-   * include/basetsd.h
-   * include/ras.h
-   * include/raserror.h
-   * include/rassapi.h
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
deleted file mode 100644
index 64ac9e894..000000000
--- a/winsup/w32api/ChangeLog
+++ /dev/null
@@ -1,7206 +0,0 @@
-2003-12-08  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (DISPLAY_DEVICE_*): Remove defines.
-	* include/wingdi.h  (DISPLAY_DEVICE_REMOVABLE,
-	DISPLAY_DEVICE_MODESPRINED): Add defines.
-
-2003-12-08  Hartmut Honisch  <hhonisch@users.sourceforge.net>
-
-	* include/commctrl.h (ListView_Get_State, ListView_Check_State):
-	Add macros.
-	* include/wingdi.h  (DISPLAY_DEVICE_*): Add multi-monitor
-	constants.
-	* include/shlobj.h (SHCOLUMNINIT); Add structure.
-	(SHCOLUMNDAT): Likwise.
-	(SHCOLUMNID): Likewise.
-	(SHCOLUMNINFO): Likewise.
-	(SHCOLSTATE): Add enum.
-	(IColumnProvider): Add COM interface.
-	(IQueryInfo): Likewise.
-	(IShellIconOverlayIdentifier): Likewise. 
-  	* include/shlguid.h (IID_IColumnProvider) Declare.
-	(IID_IQueryInfo): Likweise.
-	(IID_IShellIconOverlayIdentifier): Likwise. 
-	* lib/shell32.c (IID_IColumnProvider) Define.
-	(IID_IQueryInfo): Likweise.
-	(IID_IShellIconOverlayIdentifier): Likwise.
-
-2003-12-08  Roald Ribe <rrib@users.sourceforge.net>
-
-	* include/winuser.h (RT_MANIFEST): Add define.
-
-2003-12-08  Pascal Buhler <pbuhler@users.sourceforge.net>
-
-	* include/oleidl.h (IViewObject2): Inherit from IViewObject.
-
-2003-12-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (GetCurrentFiber): Remove duplicate prototype.
-	(GetFiberData); Likewise.
-	(GetCurrentFiber): Change volatile to __volatile__.
-	(GetFiberData); Likewise.
-
-2003-11-27  Christopher Faylor  <cgf@redhat.com>
-
-	* lib/Makefile.in: Use make function to locate .mri file to allow
-	building in directory other than source directory.
-
-2003-11-27  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/vfw32.def: Remove, replacing with ...
-	* lib/msvfw32.def: New file.
-	* lib/avicap32.def: New file.
-	* lib/avifil32.def: New file.
-	* lib/vfw32.mri: New file.
-	* Makefile.in: (MRI_FILES, MIMPLIBS): New vars for
-	import libs with multiple dll's.
-	(LIBS): Add MIMPLIBS.
-	(DISTFILES): Add MRI_FILES.
-	(libvfw32.a): Build using mri script.
-
-2003-11-23  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (PAGE_*): Group defines together. Change
-	constants to hex notation.
-
-2003-11-15  Manu B  <manubee@users.sourceforge.net>
-
-	* include/commctrl.h (TabCtrl_GetImageList): Add macro.
-
-2003-11-13 Martin Fuchs  <martin-fuchs@gmx.net>
-
-	* include/shlobj.h (ILAppendID, ILClone, ILCloneFirst, ILCombine,
-	ILFindChild, ILFindLastID, ILFree, ILGetNext, ILGetSize, ILIsEqual,
-	ILIsParent, ILLoadFromStream, ILRemoveLastID, ILSaveToStream):
-	Add prototypes.
-	* lib/shell32.def: Add stubs.
-
-	* include/commctrl.h (ListView_FindItem): Add type cast to avoid
-	compiler warnings.
-
-2003-11-13  Hans Leidekker <hans@it.vu.nl>
-
-	* include/winbase.h (WIN32_STREAM_ID): Correct typedef.
-
-2003-10-13  Andre Auzi  <aauzi@users.sourceforge.net>
-
-	* include/windows.h (CopyCursor): Define as macro.
-
-2003-10-13  Steven Edwards  <Steven_Ed4153@yahoo.com>
-
-	* include/winnt.h (CONTAINING_RECORD): Add macro.
-
-2003-10-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h: (FILE_SUPERSEDED, FILE_OPENED, FILE_CREATED,
-	FILE_OVERWRITTEN, FILE_EXISTS, FILE_DOES_NOT_EXIST): Remove
-	defines.
-
-2003-10-13  Filip Navara  <xnavara@volny.cz>
-
-	* include/commctrl.h: (DSA_*):Add prototypes, typedefs and
-	defines for Dynamic Storage Arrays.
-	(DPA_*): Likewise, for Dynamic Pointer Arrays.
-	(FlatSB_*, InitializeFlatSB, InitializeFlatSB): Add prototypes
-	and defines for Flat ScrollBars.
-	(SetWindowSubclass, GetWindowSubclass, RemoveWindowSubclass,
-	DefSubclassProc): Add prototypes for subclassing.
-	(DrawShadowText) Add prototype.
-	(COMCTL32_VERSION): Define.
-
-2003-10-13  Martin Fuchs  <Martin-Fuchs@gmx.net>
-
-	* include/shlobj.h (CFSTR_FILENAME, CFSTR_FILEDESCRIPTOR,
-	CFSTR_FILENAMEMAP, CFSTR_SHELLURL): Correct UNICODE definitions.
-
-2003-10-13  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* include/winnt.h (SM_REMOTESESSION): Add define.
-	* include/winuser.h (SE_CREATE_GLOBAL_NAME): Ditto.
-
-2003-10-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wincrypt (KP_IV, KP_SALT, KP_PADDING, KP_MODE,
-	KP_MODE_BITS, KP_PERMISSIONS, KP_ALGID, KP_BLOCKLEN): Remove
-	duplicate definitions.
-	(KP_X, KP_Y): Correct typos.
-
-2003-10-11  Manu B  <manubee@users.sourceforge.net>
-
-	* include/afxres.h: New file.
-
-	* include/richedit.h (ES_NOOLEDRAGDROP, ENM_DRAGDROPDONE,
-	ENM_IMECHANGE, ENM_LANGCHANGE, ENM_OBJECTPOSITIONS,
-	ENM_SCROLLEVENTS): Add constants.
-
-	* include/richedit.h (ES_SELECTIONBAR, ENM_LINK): Sort constants.
-
-2003-10-09  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/errorep.h: New file.
-
-	* lib/faultrep.def: New file.
-
-2003-10-09  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winbase.h (AddVectoredExceptionHandler): Define if
-	_WIN32_WINNT >= 0x0500.
-
-	* include/winnt.h (PVECTORED_EXCEPTION_HANDLER): Define if
-	_WIN32_WINNT >= 0x0500.
-
-2003-10-08  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/winbase.h (AddVectoredExceptionHandler): Only define if
-	_WIN32_WINNT >= 0x0501.
-
-2003-10-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0500] (SetComputerNameEx[AW],
-	UnregisterWaitEx): Add functions.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0500]
-	(AddVectoredExceptionHandler, RemoveVectoredExceptionHandler): Add
-	or guard function. The MSDN says it is available on Windows XP and
-	better, and then it says it is declared for _WIN32_WINNT >= 0x0500.
-	Huh?
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501] (AddRefActCtx,
-	CreateActCtx[AW], SetFileShortName[AW], SetFileValidData,
-	ZombifyActCtx, QueryActCtxW): Add functions.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501]
-	(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX,
-	QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE,
-	QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS): Add constants.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0502] (SetDllDirectory[AW],
-	SetFirmwareEnvironmentVariable[AW]): Add functions.
-
-	* include/winnt.h [_WIN32_WINNT >= 0x0500] (VER_BUILDNUMBER,
-	VER_MAJORVERSION, VER_MINORVERSION, VER_PLATFORMID,
-	VER_SERVICEPACKMAJOR, VER_SERVICEPACKMINOR, VER_SUITENAME,
-	VER_PRODUCT_TYPE, VER_EQUAL, VER_GREATER, VER_GREATER_EQUAL,
-	VER_LESS, VER_LESS_EQUAL, VER_AND, VER_OR): Add constants.
-
-	* include/winnt.h [_WIN32_WINNT >= 0x0501]
-	(PVECTORED_EXCEPTION_HANDLER): Add callback.
-
-	* include/winnt.h [_WIN32_WINNT >= 0x0501]
-	(ACTIVATION_CONTEXT_INFO_CLASS,
-	ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION,
-	ACTIVATION_CONTEXT_DETAILED_INFORMATION,
-	ACTIVATION_CONTEXT_QUERY_INDEX, ASSEMBLY_FILE_DETAILED_INFORMATION):
-	Add structures.
-
-	* lib/user32.def (AddRefActCtx, AddVectoredExceptionHandler,
-	CreateActCtx[AW], SetComputerNameEx[AW], SetDllDirectory[AW],
-	SetFileShortName[AW], SetFileValidData,
-	SetFirmwareEnvironmentVariable[AW], UnregisterWaitEx,
-	VerSetConditionMask, ZombifyActCtx, QueryActCtxW): Add functions.
-
-2003-10-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winbase.h (GetWriteWatch, IsSystemResumeAutomatic,
-	ResetWriteWatch): Add function.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0500]
-	(GetSystemWindowsDirectory[AW], ProcessIdToSessionId, ReplaceFile[AW]):
-	Add functions.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501]
-	(GetSystemWow64Directory[AW], HeapQueryInformation,
-	HeapSetInformation, InitializeSListHead, InterlockedFlushSList,
-	InterlockedPopEntrySList, InterlockedPushEntrySList, IsProcessInJob,
-	IsWow64Process, QueryMemoryResourceNotification, ReleaseActCtx,
-	RemoveVectoredExceptionHandler): Add functions.
-
-	* include/winnt.h [_WIN32_WINNT >= 0x0501] (HEAP_INFORMATION_CLASS):
-	Add enumeration.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0502] (GetThreadIOPendingFlag):
-	Add function.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0510] (RestoreLastError):
-	Add function. The MSDN Magazine of June 2003 reads:
-		RestoreLastError is an enigma. It's code is identical to
-		SetLastError. It's unclear to me why it was made into a
-		separate API.
-
-	* lib/user32.def (GetSystemWindowsDirectory[AW],
-	GetSystemWow64Directory[AW], GetThreadIOPendingFlag,
-	HeapQueryInformation, HeapSetInformation, InitializeSListHead,
-	InterlockedFlushSList, InterlockedPopEntrySList,
-	InterlockedPushEntrySList, IsSystemResumeAutomatic, IsWow64Process,
-	ProcessIdToSessionId, QueryMemoryResourceNotification, ReleaseActCtx,
-	RemoveVectoredExceptionHandler, ReplaceFile[AW], ResetWriteWatch,
-	RestoreLastError): Add functions.
-
-2003-10-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0500] (GetComputerNameEx[AW],
-	GetProcessIoCounters): Add functions.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0500] (COMPUTER_NAME_FORMAT):
-	Move around, needed by GetComputerNameEx.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501] (FindActCtxSectionGuid,
-	FindActCtxSectionString[AW], GetCurrentActCtx, GetNativeSystemInfo):
-	Add functions.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501]
-	(ACTCTX_SECTION_KEYED_DATA): Add structure.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0502] (GetDllDirectory[AW],
-	GetFirmwareEnvironmentVariable[AW], GetProcessHandleCount,
-	GetProcessId, GetSystemRegistryQuota): Add functions, available on
-	Windows XP SP1 and better.
-
-	* include/winnt.h [_WIN32_WINNT >= 0x0501]
-	(ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION,
-	ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION,
-	ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION,
-	ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION,
-	ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION,
-	ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION,
-	ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION,
-	ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES): Add constants.
-
-	* lib/user32.def (FindActCtxSectionGuid, FindActCtxSectionString[AW],
-	GetComputerNameEx[AW], GetCurrentActCtx, GetDllDirectory[AW],
-	GetFirmwareEnvironmentVariable[AW], GetModuleHandleEx[AW],
-	GetNativeSystemInfo, GetProcessHandleCount, GetProcessIoCounters):
-	Add functions.
-
-2003-10-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501]
-	(CheckRemoteDebuggerPresent, DebugActiveProcessStop, DebugBreakProcess,
-	DebugSetProcessKillOnExit): Add functions.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0500] (DeleteTimerQueue,
-	DeleteTimerQueueEx, DeleteTimerQueueTimer,
-	DnsHostnameToComputerName[AW]): Add functions.
-
-	* lib/user32.def (CheckRemoteDebuggerPresent, DebugActiveProcessStop,
-	DebugBreakProcess, DebugSetProcessKillOnExit, DeleteTimerQueueEx,
-	DeleteTimerQueueTimer, DnsHostnameToComputerName[AW]): Add functions.
-
-2003-10-07  Kobun Fujimori  <kobun@users.sourceforge.net>
-
-	* include/winbase.h (GetVolumePathNamesForVolumeName): Available
-	on Windows XP and later.
-
-2003-10-07  Manu B  <manubee@users.sourceforge.net>
-
-	* include/commctrl.h (TreeView_Select): Returns BOOL.
-
-2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winbase.h (CancelDeviceWakeupRequest): Add function.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501]
-	(CreateMemoryResourceNotification, DeactivateActCtx): Add functions.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0500] (CreateTimerQueue,
-	CreateTimerQueueTimer): Add function.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501]
-	(MEMORY_RESOURCE_NOTIFICATION_TYPE): Add enumeration.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501]
-	(DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION): Add constant.
-
-	* include/winnt.h (WT_*): Add constants.
-
-	* lib/user32.def (CancelDeviceWakeupRequest,
-	CreateMemoryResourceNotification, CreateTimerQueueTimer,
-	DeactivateActCtx): Add functions.
-
-2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0400] (ConvertFiberToThread):
-	Add function. Sometimes I don't understand MSDN. This function is
-	available on Windows XP and Server 2003, but the SDK is supposed to
-	make it available when _WIN32_WINNT >= 0x0400, or so says the MSDN.
-	Mmmh...
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0400] (CreateFiberEx):
-	Guard function. Same remark as above.
-
-	* lib/user32.def (ConvertFiberToThread, CreateFiberEx):
-	Add functions.
-
-2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501] (ACTCTX_FLAG_*):
-	Add constants.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501] (ACTCTX[AW]): Add
-	structures.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501] (ActivateActCtx): Add
-	function. MSDN says the first argument is HACTCTX but I'm not sure
-	where such a specialized handle is defined, so use HANDLE instead.
-
-	* include/winbase.h [_WIN32_WINNT >= 0x0501] (AttachConsole,
-	CheckNameLegalDOS8Dot3[AW]): Add functions.
-
-	* lib/user32.def (ActivateActCtx, AttachConsole,
-	CheckNameLegalDOS8Dot3[AW]): Add functions.
-
-	* lib/user32.def (AddLocalAlternateComputerName[AW]): Add functions.
-	Unfortunately I don't know which header to put the declarations in.
-
-2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winnls.h (CTRY_KYRGYZSTAN, CTRY_MALDIVES, CTRY_MONGOLIA):
-	Add constants.
-
-	* include/winnls.h (NLS_FUNCTION, SYSGEOCLASS, SYSGEOTYPE): Add
-	constants for National Language Support.
-
-	* include/winnls.h (NLSVERSIONINFO): Add structure for National
-	Language Support.
-
-	* include/winnls.h (GEO_ENUMPROC): Add callback for National
-	Language Support.
-
-	* include/winnls.h (EnumSystemGeoID, GetCalendarInfo[AW],
-	GetGeoInfo[AW], GetUserGeoID, SetCalendarInfo[AW], SetUserGeoID):
-	Add functions.
-
-	* include/winnls.h (IsNLSDefinedString, GetNLSVersion): Add
-	functions. Strange... I am unable to find which library contains
-	these functions. Can't find anything with pexports. Any clue?
-
-	* lib/user32.def (EnumSystemGeoID, GetGeoInfo[AW], GetUserGeoID,
-	SetUserGeoID): Add functions.
-
-2003-10-06  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winnt.h (LANG_KYRGYZ, LANG_MONGOLIAN, LANG_GALICIAN,
-	LANG_SYRIAC, LANG_INVARIANT, SUBLANG_KASHMIRI_SASIA): Add constants.
-
-	* include/winnt.h (SUBLANG_AZERI_LATIN, SUBLANG_AZERI_CYRILLIC,
-	SUBLANG_ENGLISH_ZIMBABWE, SUBLANG_ENGLISH_PHILIPPINES): Fix wrong
-	value for constants.
-
-2003-10-03  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/wincrypt.h (SCHANNEL_MAC_KEY, SCHANNEL_ENC_KEY,
-	INTERNATIONAL_USAGE, KP_SCHANNEL_ALG): Add constants. Specifying
-	the algorithms.
-
-2003-10-03  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/wincrypt.h (CRYPT_FLAGS_*): Add constants. Protocol flags.
-
-2003-10-03  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/wincrypt.h (KP_*): Add constants. Needed by
-	CryptSetKeyParam() and other functions.
-
-2003-10-03  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0501] (EVENT_*, CONSOLE_*):
-	Add constants, related to Console Accessibility.
-
-2003-10-03  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [WINVER >= 0x0500] (EVENT_MAX): Ooops...
-	wrong value for constant.
-
-2003-10-03  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [WINVER >= 0x0500] (EVENT_*): Add constants.
-
-	* include/uxtheme.h: Cleanup.
-	* include/tmschema.h: Cleanup.
-
-2003-10-02  Luke Dunstan  <infidel@users.sourceforge.net>
-
-	* include/winspool.h (GetDefaultPrinter[AW]): Add functions.
-	* lib/winspool.def (GetDefaultPrinter[AW]): Add stubs.
-
-2003-10-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (INVALID_FILE_ATTRIBUTES): Fix define.
-
-2003-09-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (BSF_*, BSM_*):  Sync constants defined in
-	both winuser.h and dbt.h.
-	* include/dbt.h (BSF_*, BSM_*): Likewise.
-
-	* include/winuser.h (struct tagRAWINPUT): Remove
-	_ANONYMOUS_UNION tag from named union.
-	(struct tagRAWMOUSE): Add _ANONYMOUS_STRUCT to nameless struct.
-
-2003-09-30  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/dhcpcdsk.h: New file.
-	Note that MSDN is confused about whether it should start constant
-	and structure names with DHCPCAPI or DHCPAPI. It's using both but
-	experience suggests it's DHCPCAPI with `C'.
-
-	* lib/dhcpcsvc.def: New file.
-
-2003-09-30  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_INPUT,
-	RIM_INPUTSINK): Add constants, for use by WM_INPUT notification.
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0501] (RIDEV_REMOVE,
-	RIDEV_EXCLUDE, RIDEV_PAGEONLY, RIDEV_NOLEGACY, RIDEV_INPUTSINK,
-	RIDEV_CAPTUREMOUSE, RIDEV_NOHOTKEYS, RIDEV_APPKEYS): Add constants,
-	for use in RAWINPUTDEVICE.
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0501]
-	(GetRawInputDeviceInfo[AW]): Ooops... there are
-	ANSI/Unicode versions of this function.
-
-	* lib/user32.def (GetRawInputDeviceInfo[AW]): Ooops... there
-	are ANSI/Unicode versions of this function.
-
-2003-09-29  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_TYPEMOUSE,
-	RIM_TYPEKEYBOARD, RIM_TYPEHID, MOUSE_MOVE_RELATIVE,
-	MOUSE_MOVE_ABSOLUTE, MOUSE_VIRTUAL_DESKTOP,
-	MOUSE_ATTRIBUTES_CHANGED, RI_MOUSE_LEFT_BUTTON_DOWN,
-	RI_MOUSE_LEFT_BUTTON_UP, RI_MOUSE_RIGHT_BUTTON_DOWN,
-	RI_MOUSE_RIGHT_BUTTON_UP, RI_MOUSE_MIDDLE_BUTTON_DOWN,
-	RI_MOUSE_MIDDLE_BUTTON_UP, RI_MOUSE_BUTTON_1_DOWNT_BUTTON_DOWN,
-	RI_MOUSE_BUTTON_1_UP, RI_MOUSE_BUTTON_2_DOWNHT_BUTTON_DOWN,
-	RI_MOUSE_BUTTON_2_UP, RI_MOUSE_BUTTON_3_DOWNDLE_BUTTON_DOWN,
-	RI_MOUSE_BUTTON_3_UP, RI_MOUSE_BUTTON_4_DOWN,
-	RI_MOUSE_BUTTON_4_UP, RI_MOUSE_BUTTON_5_DOWN,
-	RI_MOUSE_BUTTON_5_UP, RI_MOUSE_WHEEL, KEYBOARD_OVERRUN_MAKE_CODE,
-	RI_KEY_MAKE, RI_KEY_BREAK, RI_KEY_E0, RI_KEY_E1,
-	RI_KEY_TERMSRV_SET_LED, RI_KEY_TERMSRV_SHADOW, RID_INPUT,
-	RID_HEADER, RIDI_PREPARSEDDATA, RIDI_DEVICENAME, 
-	RIDI_DEVICEINFO): Add constants.
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0501] (RAWINPUTHEADER,
-	RAWMOUSE, RAWKEYBOARD, RAWHID, RAWINPUT, RAWINPUTDEVICE,
-	RAWINPUTDEVICELIST): Add structures.
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0501] (DefRawInputProc,
-	GetRawInputBuffer, GetRawInputData, GetRawInputDeviceInfo,
-	GetRawInputDeviceList, GetRegisteredRawInputDevices): Add functions.
-
-	* lib/user32.def (DefRawInputProc, GetRawInputBuffer,
-	GetRawInputData, GetRawInputDeviceInfo, GetRawInputDeviceList,
-	GetRegisteredRawInputDevices): Add functions.
-
-2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winable.h (BlockInput): Add function.
-
-	* include/winable.h (WS_ACTIVECAPTION): Add constant.
-	For use with WINDOWINFO structure.
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0500] (LockWorkStation):
-	Add function.
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0501] (IsWinEventHookInstalled):
-	Add function.
-
-	* include/winuser.h [WINVER >= 0x0500] (UnhookWinEvent):
-	Add function...
-
-	* include/winable.h [WINVER < 0x0500] (UnhookWinEvent):
-	...and duplicate.
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0403] (SendInput):
-	Guard function...
-
-	* include/winable.h [_WIN32_WINNT < 0x0403] (SendInput):
-	...and duplicate.
-
-	* include/winuser.h [WINVER >= 0x0500] (NotifyWinEvent):
-	Guard function...
-
-	* include/winable.h [WINVER < 0x0500] (NotifyWinEvent):
-	...and duplicate.
-
-	* include/winuser.h [WINVER >= 0x0500] (MOUSEINPUT, KEYBDINPUT,
-	HARDWAREINPUT, INPUT): Guard structures...
-
-	* include/winable.h [WINVER < 0x0500] (MOUSEINPUT, KEYBDINPUT,
-	HARDWAREINPUT, INPUT): ...and duplicate.
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0403] (INPUT_MOUSE,
-	INPUT_KEYBOARD, INPUT_HARDWARE): Guard constants...
-
-	* include/winable.h [_WIN32_WINNT < 0x0403] (INPUT_MOUSE,
-	INPUT_KEYBOARD, INPUT_HARDWARE): ...and duplicate.
-
-	* include/winuser.h: Move around some lines. Reformat according
-	to recommended or dominant style. Remove FAR keyword.
-
-	* include/winable.h: Move around some lines.
-
-	* lib/user32.def (BlockInput, IsWinEventHookInstalled,
-	LockWorkStation, UnhookWinEvent): Add functions.
-
-2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0501] (PrintWindow,
-	PW_CLIENTONLY): Add function and constant.
-
-	* lib/user32.def (PrintWindow): Add function.
-
-2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h (RealGetWindowClassA[AW]): Add function.
-
-	* lib/user32.def (RealGetWindowClassA[AW]): Add function.
-
-2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [WINVER >= 0x0500] (RegisterDeviceNotification[AW],
-	DEVICE_NOTIFY_WINDOW_HANDLE, DEVICE_NOTIFY_SERVICE_HANDLE,
-	DEVICE_NOTIFY_ALL_INTERFACE_CLASSES): Add function and constants.
-
-	* lib/user32.def (RegisterDeviceNotification[AW]): Add function.
-
-2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [WINVER >= 0x0500] (SetWinEventHook, WINEVENTPROC,
-	WINEVENT_OUTOFCONTEXT, WINEVENT_SKIPOWNTHREAD, WINEVENT_SKIPOWNPROCESS,
-	WINEVENT_INCONTEXT): Add function, typedef, and constants.
-
-	* include/winable.h [WINVER < 0x0500] (SetWinEventHook, WINEVENTPROC,
-	WINEVENT_OUTOFCONTEXT, WINEVENT_SKIPOWNTHREAD, WINEVENT_SKIPOWNPROCESS,
-	WINEVENT_INCONTEXT): Add function, typedef, and constants.
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0500] (UserHandleGrantAccess):
-	Add function.
-
-	* lib/user32.def (SetWinEventHook, UserHandleGrantAccess):
-	Add functions.
-
-2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winnt.h (ACE_INHERITED_OBJECT_TYPE_PRESENT,
-	ACE_OBJECT_TYPE_PRESENT): Add constants.
-	For use with OBJECTS_AND_NAME structure.
-
-2003-09-26  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/aclapi.h [_WIN32_WINNT >= 0x0501] (GetInheritanceSource[AW]):
-	Add functions. Don't know what PFN_OBJECT_MGR_FUNCTS is so use
-	void* instead.
-
-	* include/accctrl.h [_WIN32_WINNT >= 0x0501] (INHERITED_FROM[AW],
-	PINHERITED_FROM[AW]): Add structures.
-
-	* lib/user32.def (GetInheritanceSource[AW]): Add functions.
-
-2003-09-26  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/winuser.h (FLASHWINFO, PFLASHWINFO): Define for 98/Me, too.
-
-2003-09-25  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/version.def (LIBRARY): Quote name.
-
-2003-09-25  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h (GetClipboardSequenceNumber): Add functions
-	and constants.
-
-	* include/winuser.h (GetGuiResources, GR_GDIOBJECTS,
-	GR_USEROBJECTS): Add functions and constants.
-
-	* include/winuser.h (GetMouseMovePointsEx, GMMP_USE_DISPLAY_POINTS,
-	GMMP_USE_HIGH_RESOLUTION_POINTS): Add functions and constants.
-
-	* include/winuser.h (InSendMessageEx, ISMEX_NOSEND, ISMEX_CALLBACK,
-	ISMEX_NOTIFY, ISMEX_REPLIED, ISMEX_SEND): Add functions and
-	constants.
-
-	* lib/user32.def (GetClipboardSequenceNumber, GetGuiResources,
-	GetMouseMovePointsEx, InSendMessageEx): Add functions.
-
-2003-09-25  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h (BroadcastSystemMessage, BroadcastSystemMessageA,
-	BroadcastSystemMessageW, BroadcastSystemMessageEx,
-	BroadcastSystemMessageExA, BroadcastSystemMessageExW,
-	BSMINFO, BSF_ALLOWSFW, BSF_SENDNOTIFYMESSAGE, BSF_LUID,
-	BSF_RETURNHDESK): Add functions and constants.
-
-	* include/winuser.h (EnumDisplaySettingsEx, EnumDisplaySettingsExA,
-	EnumDisplaySettingsExW, EDS_RAWMODE): Add functions and constant.
-
-	* include/winuser.h (IsGUIThread, IsHungAppWindow, FlashWindowEx,
-	GetProcessDefaultLayout, SetProcessDefaultLayout,
-	RealChildWindowFromPoint, SetProcessDefaultLayout,
-	SwitchToThisWindow): Add functions.
-
-	* lib/user32.def (BroadcastSystemMessageA, BroadcastSystemMessageW,
-	BroadcastSystemMessageExA, BroadcastSystemMessageExW,
-	EnumDisplaySettingsExA, EnumDisplaySettingsExW, FlashWindowEx,
-	GetProcessDefaultLayout, IsGUIThread, IsHungAppWindow,
-	RealChildWindowFromPoint, SetProcessDefaultLayout,
-	SwitchToThisWindow): Add function.
-
-2003-09-25  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h (DeregisterShellHookWindow): Add function.
-
-	* include/winuser.h [_WIN32_WINNT >= 0x0500] (EndTask): Add function.
-
-	* lib/user32.def (EndTask): Add function.
-
-	* include/winuser.h (WINVER, _WIN32_WINNT): It's better (?) to
-	use _WIN32_WINNT instead of WINVER to test for Windows 2000.
-
-	* include/winable.h: Reorder target macros.
-
-	* lib/*.def: Cleanup.
-
-2003-09-25  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [WINVER >= 0x0500] (AnimateWindow): Add
-	function.
-
-	* lib/user32.def (AnimateWindow): Add function. By the way
-	there are ~ 140 symbols missing from this file when comparing
-	to user32.dll on Windows XP.
-
-2003-09-25  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [WINVER >= 0x0500] (AW_SLIDE, AW_ACTIVATE,
-	AW_BLEND, AW_HIDE, AW_CENTER, AW_HOR_POSITIVE, AW_HOR_NEGATIVE,
-	AW_VER_POSITIVE, AW_VER_NEGATIVE): Add constants. For use by
-	AnimateWindow().
-
-2003-09-25  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [WINVER >= 0x0500] (GetGUIThreadInfo,
-	LPGUITHREADINFO): Add function and associated typedef...
-
-	* include/winable.h [WINVER < 0x0500] (GetGUIThreadInfo,
-	LPGUITHREADINFO): ...and duplicate them in <winable.h> as
-	seems to be required on older versions of Windows.
-
-2003-09-24  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/GL/glu.h (gluErrorUnicodeStringWIN): Add macro
-	function. MSDN suggests using gluErrorUnicodeStringWIN
-	instead of gluErrorString, as it allows both ANSI and Unicode
-	error strings.
-
-	* include/GL/glu.h (gluErrorUnicodeStringEXT): Make the
-	returned pointer const for consistency reasons.
-
-2003-09-24  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/GL/glu.h (gluErrorUnicodeStringEXT): Add function.
-	Function exists in glu32.def but is undocumented on MSDN.
-	A Google search came up with this declaration.
-
-2003-09-24  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/GL/glu.h: Rewritten from scratch. Started from GLU 1.3
-	headers from OpenGL Sample Implementation. Windows ships with
-	GLU 1.2 so some constants and functions were removed. Then some
-	typedef's and function declarations were reworked to look like
-	the previous GL/glu.h.
-
-2003-09-24  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/uxtheme.h (PROPERTYORIGIN): the documentation of
-	PROPERTYORIGIN suggests it's `PROPERTYORIGIN' but experimentation
-	suggests it's actually `enum PROPERTYORIGIN'. Keep both.
-
-	* include/uxtheme.h (THEME_SIZE, THEMESIZE): MSDN suggests
-	it's either `THEME_SIZE' or `THEMESIZE' but experimentation
-	suggests it's actually `enum THEMESIZE'. Keep `THEME_SIZE'
-	and `enum THEMESIZE'.
-
-2003-09-24  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/uxtheme.h: New file.
-	* include/tmschema.h: New file.
-	* include/uxtheme.def: New file.
-	* lib/test.c: Include uxtheme.h, tmschema.h.
-
-2003-09-23  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h (KEYEVENTF_UNICODE, KEYEVENTF_SCANCODE):
-	Add defines.
-
-2003-09-23  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winable.h [_WIN32_WINNT < 0x0403] (INPUT_MOUSE,
-	INPUT_KEYBOARD, INPUT_HARDWARE): Duplicate defines in
-	<winable.h> as seems to be required on older versions of
-	Windows.
-
-2003-09-23  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [WINVER >= 0x0500] (CHILDID_SELF,
-	GUI_CARETBLINKING, GUI_INMOVESIZE, GUI_INMENUMODE,
-	GUI_SYSTEMMENUMODE, GUI_POPUPMENUMODE, GUI_16BITTASK):
-	Add defines, the last one only on Windows XP...
-
-	* include/winable.h [WINVER < 0x0500] (CHILDID_SELF,
-	GUI_CARETBLINKING, GUI_INMOVESIZE, GUI_INMENUMODE,
-	GUI_SYSTEMMENUMODE, GUI_POPUPMENUMODE): ...and duplicate
-	them in <winable.h> as seems to be required on older
-	versions of Windows.
-
-2003-09-23  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
-
-	* include/winuser.h [WINVER >= 0x0500] (GUITHREADINFO,
-	OBJID_WINDOW, OBJID_SYSMENU, OBJID_TITLEBAR, OBJID_MENU,
-	OBJID_CLIENT, OBJID_VSCROLL, OBJID_HSCROLL, OBJID_SIZEGRIP,
-	OBJID_CARET, OBJID_CURSOR, OBJID_ALERT, OBJID_SOUND): Bring
-	back into <winuser.h>...
-
-	* include/winable.h [WINVER < 0x0500] (GUITHREADINFO,
-	OBJID_WINDOW, OBJID_SYSMENU, OBJID_TITLEBAR, OBJID_MENU,
-	OBJID_CLIENT, OBJID_VSCROLL, OBJID_HSCROLL, OBJID_SIZEGRIP,
-	OBJID_CARET, OBJID_CURSOR, OBJID_ALERT, OBJID_SOUND): ...and
-	comment out in <winable.h>. MSDN may say <winable.h> but this
-	breaks many programs. It seems it used to be <winable.h> on
-	older versions of Windows.
-
-2003-09-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (UpdateLayeredWindow): Protect against NOGDI.
-	Thanks to Will Levine  <willll@users.sourceforge.net>
-
-2003-09-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ws2spi.h (LPWSPBIND): Change CONST LPSOCKADDR to
-	const struct sockaddr*.
-	(LPWSPCONNECT): Likewise.
-	(LPWSPJOINLEAF): Likewise.
-	(LPWSPSENDTO): Likewise.
-	Tanks to Sebastian Nowak  <snowak1@users.spourceforge.net>
-
-2003-09-15  Filip Navara  <xnavara@volny.cz>
-
-	* include/commctrl.h (TCIS_BUTTONPRESSED, TCIS_HIGHLIGHTED):
-	Add definitions.
-
-2003-09-15  Sascha Brawer  <brawer@dandelis.ch>
-
-	* include/winuser.h (DISPLAY_DEVICE_ATTACHED_TO_DESKTOP,
-	DISPLAY_DEVICE_PRIMARY_DEVICE, DISPLAY_DEVICE_MIRRORING_DRIVER,
-	DISPLAY_DEVICE_VGA_COMPATIBLE, DISPLAY_DEVICE_REMOVABLE,
-	DISPLAY_DEVICE_MODESPRUNED): Define constants.
-	(ChangeDisplaySettingsEx[A,W]): Add prototype.
-
-	* lib/user32.def (ChangeDisplaySettingsEx[A,W]): Add exports.
-	(EnumDisplayDevices[A,W]): Likewise.
-
-2003-09-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include.commctrl.h (_WIN32_WINNT): Change _WXP to 0x0501,
-	throughout.
-
-2003-09-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/olectl.h (TEXTMETRICOLE, LPERRORLOG, LPPROPERTYBAG,
-	LPENUMCONNECTIONPOINTS, LPCONNECTIONPOINT, LPENUMCONNECTIONS,
-	LPPROPERTYPAGESITE, LPFONT, LPFONTDISP, OLE_COLOR, HIMETRIC,
-	OLE_YPOS_HIMETRIC, OLE_XSIZE_HIMETRIC, OLE_YSIZE_HIMETRIC,
-	OLE_YSIZE_CONTAINER, OLE_HANDLE, POINTF,LPPOINTF, CONTROLINFO,
-	LPCONTROLINFO, CONNECTDATA, LPCONNECTDATA, LICINFO, LPLICINFO,
-	CAUUID, LPCAUUID, CALPOLESTR, LPCALPOLESTR, CADWORD, LPCADWORD,
-	PROPPAGEINFO, LPPROPPAGEINFO): Remove from here ...
-	* include/ocidl.h: (TEXTMETRICOLE, LPERRORLOG, LPPROPERTYBAG,
-	LPENUMCONNECTIONPOINTS, LPCONNECTIONPOINT, LPENUMCONNECTIONS,
-	LPPROPERTYPAGESITE, LPFONT, LPFONTDISP, OLE_COLOR, HIMETRIC,
-	OLE_YPOS_HIMETRIC, OLE_XSIZE_HIMETRIC, OLE_YSIZE_HIMETRIC,
-	OLE_YSIZE_CONTAINER, OLE_HANDLE, POINTF, LPPOINTF, CONTROLINFO,
-	LPCONTROLINFO, CONNECTDATA, LPCONNECTDATA, LICINFO, LPLICINFO,
-	CAUUID, LPCAUUID, CALPOLESTR, LPCALPOLESTR, CADWORD, LPCADWORD,
-	PROPPAGEINFO, LPPROPPAGEINFO): ... to here, for consistency
-	with documentation.
-	* include/olectl.h: Do #include <ocidl.h>.
-	* include/ocidl.h: Don't #include <olectl.h>.
-
-2003-09-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (_WIN32_WINNT, _WIN32_WINDOWS, WINVER):
-	Change guards to use numeric constants, throughout.
-
-2003-09-15  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/w32api.h: Increment version to 2.5.
-	* Makefile.in: Ditto.
-
-2003-09-08  Justin Forest <vhex@users.sourceforge.net>
-
-	* include/winuser.h (PM_QS_INPUT, PM_QS_POSTMESSAGE,
-	PM_QS_PAINT, PM_QS_SENDMESSAGE): Add defines.
-
-2003-09-08  Filip Navara  <xnavara@volny.cz>
-
-	* include/wingdi.h (GRADIENT_FILL_RECT_H, GRADIENT_FILL_RECT_V,
-	GRADIENT_FILL_TRIANGLE, GRADIENT_FILL_OP_FLAG): Add defines.
-
-2003-09-05  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/w32api.h (_NT5, etc): Reverse the changes of 2003-07-01.
-	* include/winbase.h (_NT5, etc): Ditto.
-	
-2003-09-02  Bart Oldeman  <bartoldeman@users.sourceforge.net>
-
-	* lib/snmpapi.def (LIBRARY) Add library name.
-	Remove '\r', throughout.
-	* lib/wsnmp32.def: Remove '\r', throughout.
-	* lib/igmpagnt.def: Likewise.
-
-2003-08-29  Steve Cleary  <scleary@jerviswebb.com>
-
-	* include/winuser.h (QS_ALLPOSTMESSAGE, QS_RAWINPUT): Add defines.
-	(QS_INPUT, QS_ALLINPUT, QS_ALLEVENTS): Adjust by OR'ing	with
-	QS_RAWINPUT for _WIN32_WINNT >= 0x0501.
-	(MWMO_*): Add flags.
-
-	* include/wincrypt.h (MS_ENHANCED_PROV[AW], MS_STRONG_PROV[AW],
-	MS_DEF_RSA_SIG_PROV[AW], MS_DEF_RSA_SCHANNEL_PROV[AW],
-	MS_DEF_DSS_PROV[AW], MS_DEF_DSS_DH_PROV[AW], MS_ENH_DSS_DH_PROV[AW],
-	MS_DEF_DH_SCHANNEL_PROV[AW], MS_SCARD_PROV[AW]): Add definitions.
-
-2003-08-26  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* lib/test.c: Add vfw.h to includes.
-	* include/mmsystem.h: Add #ifndef guard to definition of
-	mmioFOURCC macro.
-	* include/vfw.h: Protect __OBJC__ from COM declarations.
-
-2003-08-26  Filip Navara  <xnavara@volny.cz>
-
-	* include/vfw.h: New file.
-
-2003-08-26  Filip Navara  <xnavara@volny.cz>
-
-	* include/ddk/winddk.h (RTL_REGISTRY_*): Add defines.
-	(IoSetCompletionRoutine): Cast _CompletionRoutine arg to
-	PIO_COMPLETION_ROUTINE.
-
-2003-08-26  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* lib/test.c: Add snmp.h, winsnmp.h amd mgmtapi.h to
-	includes.
-
-2003-08-26  Filip Navara  <xnavara@volny.cz>
-
-	* include/snmp.h: New file.
-	* include/winsnmp.h: New file.
-	* include/mgmtapi.h: New file.
-	* lib/snmpapi.def: New file.
-	* lib/wsnmp32.def: New file.
-	* lib/igmpagnt.def: New file.
-	* lib/mgmtapi.def (SnmpMgrCtl) Add stub.
-	(SnmpMgrGetTrapEx): Ditto.
-	(SnmpMgrMIB2Disk): Remove.
-	(dbginit): Remove.
-
-2003-08-25  Steven Edwards  <Steven_Ed4153@yahoo.com>
-
-	* include/ddk/ntifs.h: Change all C++ style comments to C.
-	* include/GL/gl.h: Ditto.
-
-2003-08-25  Martin Fuchs  <Martin-Fuchs@gmx.net>
-
-	* include/shlobj.h (SFGAO_GHOSTED): Correct.
-	(SFGAO_HIDDEN): Add define.
-
-2003-08-25  Filip Navara  <xnavara@volny.cz>
-
-	* include/commctrl.h (ILCF_*): Add defines.
-	(ILD_*): Ditto.
-	(HDS_*); Ditto.
-	(IPN_FIRST, IPN_LAST): Cast to UINT.
-	(SBN_FIRST, SBN_LAST): Add defines.
-	(PGN_*): Ditto.
-	(HDF_JUSTIFYMASK): Fix typo.
-	(HDM_*): Add defines.
-	(HICF_*): Ditto.
-	(I_INDENTCALLBACK,I_IMAGENONE): Ditto.
-	(TBSTATE_MARKED): Add define.
-	(TBSTYLE_EX_*): Add defines.
-	(TBCDRF_*): Ditto.
-	(IDB_HIST_SMALL_COLOR,IDB_HIST_LARGE_COLOR): Ditto.
-	(TB_*): Ditto.
-	(TBN_*): Ditto.
-	(TBNRF_*): Ditto.
-	(TTF_*): Ditto.
-	(TBCD_*): Ditto.
-	(TBDDRET_*): Ditto.
-	(TBIMHT_*): Ditto.
-	(TTM_*): Ditto.
-	(UDM_*): Ditto.
-	(TBIF_BYINDEX): Define as hex constant.
-	(CDIS_*): Add defines.
-	(CDDS_SUBITEM): Add define.
-	(LVIF_*): Add defines.
-	(LVM_*): Ditto.
-	(LVGIT_UNFOLDED): Add define.
-	(TVM_): Add defines.
-	(TVE_EXPANDPARTIAL): Add define.
-	(TVGN_LASTVISIBLE): Ditto.
-	(TVN_*): Add defines.
-	(TVNRET_*): Add defines.
-	(TCIF_STATE): Add define.
-	(NM_TOOLTIPSCREATED): Ditto.
-	(CCM_*): Add defines.
-	(INFOTIPSIZE): Add numeric value.
-	(ODT_LISTVIEW): Ditto.
-	(MCM_GETMAXTODAYWIDTH): Ditto.
-	(MCHT_*): Add defines.
-	(UDM_SETRANGE32,UDM_GETRANGE32): Define in terms of WM_USER.
-	(PGF_*): Add defines.
-	(PGM_*): Ditto.
-	(TBINSERTMARK): Add structure.
-	(LPIMAGEINFO) Add typedef.
-	(LPHDHITTESTINFO): Ditto.
-	(NMLVGETINFOTIP[AW]: Add structures.
-	(NMTBCUSTOMDRAW): Add structure.
-	(TTTOOLINFOA_V*_SIZE): Add macros.
-	(TTTOOLINFOW_V1_SIZE): Ditto.
-	(IMAGELISTDRAWPARAMS): Add new members for WXP.
-	(LVITEM[AW]: Ditto.
-	(TCITEM[AW]):Ditto.
-	(CCSIZEOF_STRUCT): Correct macro definition.
-	(ListView_*): Add new macros.
-	(HIMAGELIST): Correct typedef.
-	(HTREEITEM): Ditto.
-
-2003-08-25   Danny Smith <dannysmith@users.sourceforge.net>
-
-	* commctrl.h (TC_HITTESTINFO): Remove. Add defines for
-	TCHITTESTINFO for backward compatibility.
-	(TC_ITEM[AW]): Rename to TCITEM[AW]. Add defines for backward
-	compatibility.
-
-2003-08-24   Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/objidl.h (COBJMACROS): Define macros only
-	if using C interace.
-	* include/unknwn.h: Ditto.
-	* include/comcat.h: Ditto.
-
-2003-08-24  Filip Navara  <xnavara@volny.cz>
-
-	* include/prsht.h (PSH_WIZARDHASFINISH, PSH_WIZARD_LITE,
-	PSH_NOCONTEXTHELP): Define.
-	(PSH_WIZARD97): Fix definition for _WIN32_IE >= 0x500.
-	* include/winuser.h (DFCS_TRANSPARENT, DFCS_HOT): Define.
-	(LPDLGTEMPLATE[AW]): Add typedefs.
-
-2003-08-22  Filip Navara  <xnavara@volny.cz>
-
-	* include/aclapi.h (BuildImpersonateExplicitAccessWithName[AW]):
-	Add prototypes.
-	BuildImpersonateTrustee[AW]): Add prototypes.
-	GetMultipleTrustee[AW]): Add prototypes.
-	GetMultipleTrusteeOperation[AW]): Add prototypes.
-
-2003-08-22   Danny Smith <dannysmith@users.sourceforge.net>
-
-        * include/winnt.h (IMAGE_SUBSYSTEM_XBOX): Add define. 
-
-2003-08-22  Mihai Preda <mihai_preda@users.sourceforge.net>
-
-	* include/shlobj.h (IPersistFolder::GetClassID):
-	Correct declaration.
-	(CMF_*) Add missing defines.
-
-2003-08-22   Danny Smith <dannysmith@users.sourceforge.net>
-
-        * include/winuser.h (DC_BUTTONS): Add define.
-
-2003-08-22  Andrew Greenwood  <lists@silverblade.co.uk>
-
-        * include/winuser.h (DC_GRADIENT): Add define.
-
-2003-08-22  Martin Fuchs  <Martin-Fuchs@gmx.net>
-
-	* include/commctrl.h (BTNS_*): Define BTNS_* as successors to the
-	older TBSTYLE_* constants.
-
-2003-08-18  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (TB_*) Group defines together. 
-
-2003-08-18  Martin Fuchs  <Martin-Fuchs@gmx.net>
-
-	* include/winuser.h (ICON_SMALL2): Define.
-	* include/commctrl.h (TB_SETBUTTONWIDTH, TB_SETDRAWTEXTFLAGS):
-	Define.
-	* include/shlobj.h (SHDRAGIMAGE): Define structure.
-	(IDragSourceHelper) Define interface.
-  	(IDropTargetHelper): Likewise.
-	(IExtractIcon): Unicode it.
-	(ICommDlgBrowser): Use IShellView type as param in OnDefaultCommand,
-	OnStateChange and IncludeObject methods.
-
-2003-08-17  Martin Fuchs  <Martin-Fuchs@gmx.net>
-
-	* include/commctrl.h (TreeView_GetScrollTime,
-	TreeView_SetScrollTime): Define macros.
-	* include/winuser.h (GetShellWindow): Add prototype.
-	* include/objidl.h (STGMEDIUM): Correct lpszFileName type.
-
-2003-08-15  Martin Fuchs  <Martin-Fuchs@gmx.net>
-
-	* include/shguid.h (CLSID_DragDropHelper, IID_IDropTargetHelper,
-	IID_IDragSourceHelper): Declare.
-	* lib/shell32.c (CLSID_DragDropHelper, IID_IDropTargetHelper,
-	IID_IDragSourceHelper): Define.
-
-2003-08-15  Andrew Greenwood  <lists@silverblade.co.uk>
-
-	* include/wingdi.h (DEVMODE[AW]) Correct structure definition.
-	* include/ddk/ntapi.h (LPC_TYPE): Add LPC_CONNECTION_REFUSED.
-	* include/ddk/winddk.h (IRP_*): Add constants as anonymous enum.
-
-2003-08-10  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* lib/uuid.c (CGID_Explorer, CGID_ShellDocView,
-	CGID_ShellServiceObject): Remove definitions.
-	* lib/shell32.c (CGID_ShellServiceObject): Add definition.
-
-2003-08-10  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/shlobj.h (SHELLSTATE): Add structure.
-	(SHGetSetSettings): Add prototype.
-	(SHGetSettings): Add prototype.
-	* lib/shell32.def (SHGetSetSettings): Add stub.
-
-2003-08-10  Phil Krylov  <likewolf@users.sourceforge.net>
-
-	* include/commctrl.h (HDM_ORDERTOINDEX): Add define.
-	(Header_OrderToIndex): Add macro.
-	(Header_GetOrderArray): Add macro.
-
-	* include/commdlg.h (FR_MATCHALEFHAMZA,
-	FR_MATCHDIAC, FR_MATCHKASHIDA): Add defines.
-
-2003-08-10  Martin Fuchs  <Martin-Fuchs@gmx.net>
-
-	* include/commctrl.h (TVM_GETSCROLLTIME,
-	TVM_SETSCROLLTIME): Add defines.
-
-2003-08-01  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/shlobj.h (SHELLFLAGSTATE): Add structure.
-	(SHGetInstanceExplorer): Correct return type.
-	(SHGetFolderPath[AW]): Likewise.
-	Thanks to Magnus Olsen  <greatlord@sourceforge.users.net>
-	for report.
-
-2003-08-01  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* lib/test.c: Include winldap.h, ntldap.h, winber.h.
-
-2003-08-01  Filip Navara  <xnavara@volny.cz>
-
-	* include/winldap.h: New file.
-	* include/ntldap.h: New file.
-	* include/winber.h: New file.
-	* lib/winldap32.def: New file.
-
-2003-08-01  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/ddk/atm.h: Remove stray '.';
-
-2003-08-01  Gisle Vanem  <gvanem@broadpark.no>
-
-	* include/ddk/winddk.h; Remove trailing ';' from macros,
-	throughout. Add () around defines with cast returns, throughout.
-
-2003-07-31  Martin Fuchs  <Martin-Fuchs@gmx.net>
-
-	* include/shlobj.h (SFGAO_COMPRESSED): Add define.
-	(SFGAOF, SHGDNF): Add typedef's. 
-	(SHCONTF): Extend enum.
-
-2003-07-31  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/shellapi.h: Include all structs within pshpack2.h/
-	poppack.h block.
-
-2003-07-26  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (ASFW_ANY, LSFW_LOCK, LSFW_UNLOCK,
-	LWA_COLORKEY, LWA_ALPHA): Guard with _WIN32_WINNT,
-	_WIN32_WINDOWS, not WINVER.
-	(AllowSetForegroundWindow,LockSetForegroundWindow,
-	SetLayeredWindowAttributes): Likewise.
-	(GetLayeredWindowAttributes,UpdateLayeredWindow): Add prototypes.
-	* lib/user32.def (GetLayeredWindowAttributes,UpdateLayeredWindow):
-	Add stubs.
-
-2003-07-26  Eric R. Krause  <ekrause_98@users.sourceforge.net>
-
-	* include/objidl.h (IMalloc): Fix typo.
-
-2003-07-24  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/dkk/ntifs.h: Fix typo in guard for
-	#pragma GCC system_header.
-
-2003-07-22  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/objidl.h (PropVariant): Add CHAR cVal field
-	to union.
-	(FMTID_SummaryInformation, FMTID_DocSummaryInformation,
-	FMTID_UserDefinedProperties): Declare.
-
-2003-07-22  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (GetModuleHandleEx[AW]): Add prototypes.
-
-2003-07-22  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (DUPLICATE_CLOSE_SOURCE,
-	DUPLICATE_SAME_ACCESS): Remove defines.
-	(HANDLE_FLAG_INHERIT, HANDLE_FLAG_PROTECT_FROM_CLOSE): Sync with
-	ddk/ntapi.h defines.
-	(SEM_*) : Likewise.
-	* include/winnt.h (COMPRESSION_*, ACCESS_*, SYSTEM_*): Sync with 
-	ddk/ntifs.h defines.
-	(FILE_*): Likewise.
-	(MEM_IMAGE, SEC_*): Likewise. 
-	(DUPLICATE_CLOSE_SOURCE, DUPLICATE_SAME_ACCESS, 
-	DUPLICATE_SAME_ATTRIBUTES): Sync with ddk/winddk.h defines.
-	(TOKEN_*): Sync with ddk/ntifs.h defines. 
-	* include/ddk/ntapi.h: Add comments noting definitions in
-	winbase.h.
-	* include/ddk/ntifs.h: Add comments noting definitions in
-	winnt.h.
-	* include/ddk/winddk.h: Add comments noting definitions in
-	winnt.h.
- 
-2003-07-18  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (FILE_*): Sync with ddk/winddk.h.
-	* include/winioctl.h (FILE_*): Sync with ddk/winddk.h.
-
-2003-07-17  Pierre Humblet  <pierre.humblet@ieee.org>
-
-	* include/mmsystem.h (TIME_KILL_SYNCHRONOUS): Add define.
-
-2003-07-17  Danny Smith <dannysmith@users.sourceforge.net>
-
-	Clean up warnings in ddk.
-
-	* include/ddk/atm.h (_ATM_AAL_OOB_INFO): Add _ANONYMOUS_UNION,
-	conditional on  __cplusplus.
-	* include/ddk/scsi.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT
-	defines, throughout.
-	(_CDB): Add _ANONYMOUS_UNION, conditional on __cplusplus.
-	* include/ddk/cfg.h (_PNP_VETO_TYPE): Remove extra comma.
-	* include/ddk/cfgmgr32.h: Change C++ comment style to ISO C.
-	* include/ddk/ddkmapi.h (_DDLOCKOUT): Add _ANONYMOUS_UNION defines.
-	* include/ddk/hidpi.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT
-	defines, throughout.
-	* include/ddk/ndis.h: Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT
-	defines, throughout. Remove trailing semicolon from *_S 'structure'
-	macro expansion, throughout. Remove trailing semicolon from
-	DECLARE_UNKNOWN_STRUCT macro expansion.
-	* include/ddk/ndiswan.h (_NDIS_WAN_COMPRESS_INFO): Add
-	_ANONYMOUS_UNION.
-	* include/ddk/ntapi.h (_PROCESS_DEVICEMAP_INFORMATION,
-	_PROCESS_SESSION_INFORMATION): Add _ANONYMOUS_UNION.
-	* include/ddk/ntddcdrm.h (CDROM_TOC_CD_TEXT_DATA_BLOCK): 
-	Add _ANONYMOUS_UNION.
-	* include/ddk/ntdddisk.h: Add _ANONYMOUS_UNION, throughout.
-	* include/ddk/ntddmou.h:  Add _ANONYMOUS_UNION, throughout.
-	* include/ddk/ntifs.h:  Add _ANONYMOUS_UNION, throughout.
-	(ZwQueryObject): Change 2nd param to OBJECT_INFORMATION_CLASS, to
-	match proto in ntapi.h.
-	(ZwSetInformationObject): Likewise.
-	* include/ddk/srb.h (SCSI_REQUEST_BLOCK): Add _ANONYMOUS_UNION.
-	(SCSI_ADAPTER_CONTROL_TYPE): Add __extension__.
-	* include/ddk/tdikrnl.h (TDI20_CLIENT_INTERFACE_INFO): Add
-	_ANONYMOUS_UNION and _ANONYMOUS_STRUCT.
-	* include/ddk/usb.h (USB): Add _ANONYMOUS_UNION.
-	* include/ddk/usbcamdi.h (USBCAMD_CamControlFlags): Remove
-	last comma.
-	* include/ddk/video.h (STATUS_BLOCK): Add _ANONYMOUS_UNION.
-	* include/ddk/winddk.h (DECLARE_INTERNAL_OBJECT): Remove
-	trailing semicolon when expanding macro.
-	(GENERAL_LOOKASIDE_S): Likewise.
-	Add _ANONYMOUS_UNION and _ANONYMOUS_STRUCT, throughout.
-	Change inline to __inline, throughout.
-	* include/ddk/winnt4.h: Change inline to __inline, throughout.
-
-2003-07-13  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/ddk/ntifs.h (KeInsertQueueApc): Make return type
-	BOOLEAN. Name parameter 4 PriorityBoost and make it of type
-	KPRIORITY.
-	* include/ddk/winddk.h (_KPCR): Put IDT field on next line.
-	* include/ddk/winddk.h (_IO_STATUS_BLOCK, _IRP, _OWNER_ENTRY,
-	_ERESOURCE, _IMAGE_INFO, _CREATE_DISK, _DISK_SIGNATURE, _KPCR_TIB):
-	Apply _ANONYMOUS_UNION to anonymous unions and _ANONYMOUS_STRUCT
-	to anonymous structs.
-
-2003-07-12  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (PVOID): Move to before HANDLE typedef.
-
-	* include/winuser.h (mouse_event): Correct type of fifth param,
-	Thanks to: Andrew Jones <guln at users dot sourceforge dot net>
-
-2003-07-11  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/winnt.h (HANDLE): Define based on STRICT filter.
-	(THREAD_BASE_PRIORITY_MIN): Use parens around negative value.
-	(THREAD_BASE_PRIOIRTY_IDLE): Ditto.
-
-2003-07-08  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (NMTVDISPINFO[AW]): Replace obsolete struct
-	names _TV_DISPINFO[AW] and typedefs. Add defines for backward
-	compatability. Thanks to Magnus Olsen <greatlord@users.sf.net>
-	for report.
-
-2003-07-03  Earnie Boyd  <earnie@users.sf.net>
-
-	* config.guess, config.sub: Update with new versions from ftp.gnu.org.
-
-2003-07-03  Luke Dunstan  <infidel@users.sf.net>
-
-	* include/commdlg.h (CommDlg_OpenSave_*): Add parentheses around
-	macro arguments. Thanks to Tom Bishop <tombishop@users.sf.net>.
-	* include/winuser.h (MONITOR_DEFAULTTONULL, MONITOR_DEFAULTTOPRIMARY,
-	MONITOR_DEFAULTTONEAREST, MONITORINFOF_PRIMARY): Add defines.
-	(TPM_RECURSE): Add guard for Win98/Win2K.
-	Thanks to Magnus Olsen <greatlord@users.sf.net>.
-
-2003-07-01  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/basetyps.h (small, hyper): Change to __small and __hyper to
-	avoid user namespace conflicts.
-
-2003-07-01  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/w32api.h (_NT4, _W98, _WME, _NT5, _W2000, _WXP, _W2003,
-	_IE3, _IE4, _IE5, _IE6): Add definitions.
-	* include/winbase.h (GetLongPathName[AW]): Add guard for OS >= NT5 or
-	>= Win98.
-	Change existing guards to use the above macro names as appropriate.
-	* include/basetyps.h (__int32, __int16, __int8, small, hyper): Define.
-	Note: Also added to mingw/include/_mingw.h.
-
-2003-06-28  Steven Edwards  <Steven_Ed4153@yahoo.com>
-
-	* include/shlwapi.h (UrlGetLocationA, UrlGetLocationW,
-	PathFindSuffixArrayA, PathFindSuffixArrayW,
-	PathFindExtensionA, PathFindExtensionW, StrStrW
-	StrStrA): Change unicode-macro'd LP[C]TSTR return values to
-	explicit type.
-
-2003-06-26  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/richedit.h (PARAFORMAT2): Add definition.
-	* include/richedit.h (PFA_*, PFE_*, PFM_*): Add some
-	missing constants.
-
-2003-06-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/shellapi.h (SHQUERYRBINFO): Add structure,
-	(SHQueryRecycleBin[AW]. SHEmptyRecycleBin[AW]):Add prototypes.
-	(SHERB_NOCONFIRMATION, SHERB_NOPROGRESSUI, SHERB_NOSOUND):
-	Add defines. Thanks to Brett Hart <brett at ncubedtech dot com>
-
-2003-06-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (GlobalCompact, GlobalFix, GlobalFlags,
-	GlobalUnfix, GlobalUnWire, GlobalWire, LocalCompact,
-	LocalFlags, LocalShrink, LockSegment, UnlockSegment): Add comment
-	that these are obsolete no-ops.
-
-2003-06-17  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* include/winbase.h (GetProcessWorkingSetSize,
-	GlobalCompact, LocalAlloc, LocalCompact, LocalReAlloc,
-	LocalShrink, SignalObjectAndWait, WriteProcessMemory):
-	Correct prototypes.
-
-2003-06-18  Steven Edwards  <Steven_Ed4153@yahoo.com>
-
-	* include/winuser.h (TPM_RECURSE): Add define.
-
-2003-06-06  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/test.c: #include <powrprof.h>.
-
-2003-06-06  James E. Lucas  <xelloss@sourceforge.net>
-
-	* include/powerprof.h: New file.
-	* lib/powerprof.def: New file.
-
-2003-06-06  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt (SLIST_HEADER): Add C90 anonymous struct
-	protection.
-
-2003-06-05  Luke Dunstan  <infidel@users.sourceforge.net>
-
-	* include/winuser.h (WNDCLASS[AW], WNDCLASSEX[AW]): Change type of
-	hInstance members to HINSTANCE.
-	Thanks to: Brenden T. <brenden@rcsis.com>
-
-2003-06-05  Bart Oldeman  <bartoldeman@users.sourceforge.net>
-
-	* include/lmaccess.h (UF_MNS_LOGON_ACCOUNT): Add define.
-	* include/wingdi.h (LPRGBTRIPLE, LPRGBQUAD): Add typedefs.
-
-2003-06-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ddk/ntpoapi.h (POWER_INFORMATION_LEVEL): Remove.
-	* include/winnt.h (POWER_INFORMATION_LEVEL): Add.
-	* include/ddk/winddk.h (SINGLE_LIST_ENTRY,SLIST_HEADER):
-	Remove.
-	* include/ddk/ndis.h (NdisAllocateSpinLock): Add missing '\'.
-
-2003-05-30  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* lib/oleacc.def: New file.
-	* include/winable.h: New file.
-	* include/oleacc.h: Add extern "C" guard.
-	(NAVDIR_*, ROLE_*, STATE_*): Add missing constants.
-	(AccessibleChildren, AccessibleObjectFromEvent,
-	AccessibleObjectFromPoint, AccessibleObjectFromWindow,
-	CreateStdAccessibleProxy[AW], GetOleaccVersionInfo, GetRoleText[AW],
-	GetStateText[AW], LresultFromObject, ObjectFromLresult,
-	WindowFromAccessibleObject): Add prototypes and UNICODE mappings.
-	* include/winuser.h (NotifyWinEvent): Add prototype.
-	(OBJID_WINDOW, OBJID_SYSMENU, OBJID_TITLEBAR,
-	OBJID_MENU, OBJID_CLIENT, OBJID_VSCROLL, OBJID_HSCROLL,
-	OBJID_SIZEGRIP, OBJID_CARET, OBJID_CURSOR, OBJID_ALERT,
-	OBJID_SOUND): Move from here to...
-	* include/winable.h (OBJID_WINDOW, OBJID_SYSMENU, OBJID_TITLEBAR,
-	OBJID_MENU, OBJID_CLIENT, OBJID_VSCROLL, OBJID_HSCROLL,
-	OBJID_SIZEGRIP, OBJID_CARET, OBJID_CURSOR, OBJID_ALERT,
-	OBJID_SOUND): Here, as per documentation.
-	* lib/test.c: Include winable.h.
-	* lib/user32.def (NotifyWinEvent): Add missing export.
-
-2003-05-30  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* include/winbase.h (HeapCompact): Correct prototype.
-	* include/winnt.h (SINGLE_LIST_ENTRY, SLIST_ENTRY,
-	SLIST_HEADER): Add.
-
-2003-05-27  Andrew C. Stadt <acstadt@sympatico.ca>
-
-	* include/winuser.h (LWA_COLORKEY, LWA_ALPHA): Add defines.
-
-2003-05-25  Bill C. Riemers  <cygwin@docbill.net>
-
-	* include/winuser.h (EnumDisplayDevicesW): Fix typo.
-
-2003-05-23  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (EnumDisplayDevices[AW]): Add prototypes.
-	* include/wingdi.h (DISPLAY_DEVICE): UNICODE it.
-
-2003-05-23  Andrew Dunbar <hippietrail@users.sourceforge.net>
-
-	* include/wingdi.h (GCP_RESULTS[AW]) Correct type of
-	lpGlyphs field to LPWSTR.
-
-2003-05-21  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wincrypt.h (PLAINTEXTKEYBLOB, OPAQUEKEYBLOB,
-	PUBLICKEYBLOBEX, SYMMETRICWRAPKEYBLOB) Add defines.
-	(PP_*): Add defines.
-	(CryptContextAddRef): Add prototype.
-	Thanks to: Shura Zam  <debil_urod@users.sourceforge.net>
-
-2003-05-18  Manu B  <manubee@users.sourceforge.net>
-	
-	* include/commctrl.h (TVSORTCB): Rename old TV_SORTCB structure.
-
-2003-05-18  Bang Jun-Young <junyoung@netbsd.org>
-
-	* include/winbase.h (CREATE_DEFAULT_ERROR_MODE,
-	DEBUG_PROCESS, DEBUG_ONLY_THIS_PROCESS, CREATE_SUSPENDED,
-	DETACHED_PROCESS, CREATE_NEW_CONSOLE, NORMAL_PRIORITY_CLASS,
-	IDLE_PRIORITY_CLASS, HIGH_PRIORITY_CLASS, REALTIME_PRIORITY_CLASS,
-	CREATE_NEW_PROCESS_GROUP, CREATE_UNICODE_ENVIRONMENT,
-	CREATE_SEPARATE_WOW_VDM, CREATE_SHARED_WOW_VDM, CREATE_FORCEDOS,
-	CREATE_NO_WINDOW): Convert to hexadecimal form for better
-	readability.
-	(BELOW_NORMAL_PRIORITY_CLASS, ABOVE_NORMAL_PRIORITY_CLASS,
-	CREATE_BREAKAWAY_FROM_JOB, CREATE_WITH_USERPROFILE): Add.
-
-2003-05-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ddk/ndis.h (NDIS30_MINIPORT_CHARACTERISTICS_S):
-	Unname anonymous unions if NONAMELESSUNION not defined.
-
-2003-05-14  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* include/winbase.h (GMEM_VALID_FLAGS): Add.
-
-2003-05-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/prsht.h (PROPSHEETHEADER[AW]: Mark
-	anonymous unions as GCC extension.
-
-2003-05-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/oleidl.h  (LPENUMOLEDOCUMENTVIEWS): Remove typedef.
-	(IEnumOleDocumentViews): Remove commented out DECLARE_ENUMERATOR.
-	* include/docobj.h  (LPENUMOLEDOCUMENTVIEWS): Add typedef (previously
-	commented out).
-	(IEnumOleDocumentViews): Add definition using DECLARE_ENUMERATOR.
-
-2003-05-12  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/commctrl.h: (MCSC_BACKGROUND, MCSC_TEXT, MCSC_TITLEBK,
-	MCSC_TITLETEXT, MCSC_MONTHBK, MCSCTRAILTEXT): Define.
-	Thanks to: Robert Wishlaw  <rwishlaw @ shaw . ca>
-
-2003-05-12  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/olectl.h (IOleControl,IOleControlSite,ISimpleFrameSite,
-	IErrorLog,IPropertyBag,IPersistPropertyBag,IPersistStreamInit,
-	IPersistMemory,IPropertyNotifySink,IProvideClassInfo,
-	IProvideClassInfo2,IConnectionPointContainer,
-	IEnumConnectionPoints,IConnectionPoint,IEnumConnections,
-	IClassFactory2,ISpecifyPropertyPages,IPerPropertyBrowsing,
-	IPropertyPageSite,IPropertyPage,IPropertyPage2,IFont,IFontDisp,
-	IPicture,IPictureDisp): Move from here to...
-	* include/ocidl.h (IOleControl,IOleControlSite,ISimpleFrameSite,
-	IErrorLog,IPropertyBag,IPersistPropertyBag,IPersistStreamInit,
-	IPersistMemory,IPropertyNotifySink,IProvideClassInfo,
-	IProvideClassInfo2,IConnectionPointContainer,
-	IEnumConnectionPoints,IConnectionPoint,IEnumConnections,
-	IClassFactory2,ISpecifyPropertyPages,IPerPropertyBrowsing,
-	IPropertyPageSite,IPropertyPage,IPropertyPage2,IFont,IFontDisp,
-	IPicture,IPictureDisp): Here, as per documentation.
-
-2003-05-12  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/oleauto.h (VarR8FromDec, VarDecFromR8): Add prototypes.
-	* include/winbase.h (TerminateJobObject,
-	AssignProcessToJobObject): Likewise.
-	* include/servprov.h: New header.
-	* lib/test.c: Include servprov.h.
-
-2003-05-10  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/shlguid.h (CGID_ShellServiceObject): Declare.
-	* lib/uuid.c (CGID_ShellServiceObject): Define guid.
-	Thanks to Chris Sutcliffe  <ir0nh34d#users.sourceforge.net> 
-	* include/winuser.h (SetLayeredWindowAttributes): Add prototype.
-	* lib/user32.def (SetLayeredWindowAttributes): Add stub.
-	* lib/uuid.c (CGID_Explorer, CGID_ShellDocView): Define guids.
-
-2003-05-05  Danny Smith  <dannysmith@users.sourceforge.net>
-
- 	* include/commctrl.h (STATUSCLASSNAME, TOOLBARCLASSNAME,
-	TOOLTIPS_CLASS, TRACKBAR_CLASS, UPDOWN_CLASS, PROGRESS_CLASS,
-	HOTKEY_CLASS): Remove dupicate defines for UNICODE case.
-
-2003-05-02  Steven Edwards  <Steven_Ed4153@yahoo.com>
-
-	* include/richedit.h (EM_FINDTEXTEXW, EM_FINDTEXTW,
-	EM_GETAUTOURLDETECT, EM_GETBIDIOPTIONS, EM_GETEDITSTYLE,
-	EM_GETIMECOLOR, EM_GETIMEOPTIONS, EM_GETPUNCTUATION,
-	EM_GETWORDWRAPMODE, EM_RECONVERSION, EM_SETBIDIOPTIONS,
-	EM_SETEDITSTYLE, EM_SETIMECOLOR, EM_SETIMEOPTIONS,
-	EM_SETPALETTE, EM_SETPUNCTUATION, EM_SETTEXTEX,
-	EM_SETWORDWRAPMODE, RICHEDIT_CLASS10A): Add defines.
-
-2003-05-02  Francois Ferrand  <typz@sourceforge.users.net>
-
-	* include/commctrl.h (TBM_*): Add missing trackbar defines.
-
-2003-05-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/cplext.h (CPLPAGE_MOUSE_WHEEL,
-	CPLPAGE_DISPLAY_BACKGROUND): Add defines.
-
-2003-04-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wingdi.h (DC_PEN, DC_BRUSH): Add defines.
-	(SetDCPenColor, SetDCBrushColor): Add prototypes.
-	* lib/gdi32.def (SetDCPenColor, SetDCBrushColor): Add stubs.
-
-2003-04-26  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* include/winioctl.h (DEVICE_TYPE_FROM_CTL_CODE): Add macro.
-
-2003-04-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/oaidl.h (ITypeMarshal): Add interface.
-
-2003-04-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winioctl.h: Clean up formatting.
-	(RETRIEVAL_POINTERS_BUFFER): Add fields to Extents[1] struct.
-	(CREATE_DISK): Add _ANONYMOUS_UNION macro.
-	(DISK_CACHE_INFORMATION): Likewise.
-	(DISK_DETECTION_INFO): Likewise.
-	(DISK_PARTITION_INFO): Likewise.
-	(PARTITION_INFORMATION_EX): Likewise.
-	(DRIVE_LAYOUT_INFORMATION_EX): Likewise.
-
-2003-04-26  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/winbase.h (DeleteVolumeMountPoint[AW],
-	FindFirstVolumeMountPoint[AW], FindNextVolumeMountPoint[AW],
-	FindVolumeMountPointClose, GetVolumeNameForVolumeMountPoint[AW],
-	GetVolumePathName[AW], GetVolumePathNamesForVolumeName[AW],
-	SetVolumeMountPoint[AW]): Add prototypes.
-	* include/winioctl.h (IOCTL_DISK_GET_PARTITION_INFO_EX,
-	IOCTL_DISK_SET_PARTITION_INFO_EX,
-	IOCTL_DISK_GET_DRIVE_LAYOUT_EX,
-	IOCTL_DISK_SET_DRIVE_LAYOUT_EX, IOCTL_DISK_CREATE_DISK,
-	IOCTL_DISK_GET_LENGTH_INFO, IOCTL_DISK_PERFORMANCE_OFF,
-	IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_DISK_GROW_PARTITION,
-	IOCTL_DISK_GET_CACHE_INFORMATION,
-	IOCTL_DISK_SET_CACHE_INFORMATION,
-	IOCTL_DISK_DELETE_DRIVE_LAYOUT, IOCTL_DISK_UPDATE_PROPERTIES,
-	FSCTL_GET_VOLUME_BITMAP, FSCTL_GET_RETRIEVAL_POINTERS,
-	FSCTL_MOVE_FILE): Define.
-	(CREATE_DISK_GPT, CREATE_DISK_MBR, CREATE_DISK,
-	DISK_CACHE_INFORMATION,
-	DETECTION_TYPE, DISK_INT13_INFO, DISK_EX_INT13_INFO,
-	DISK_DETECTION_INFO, DISK_GEOMETRY_EX, DISK_GROW_PARTITION,
-	DISK_PARTITION_INFO, DISKQUOTA_USER_INFORMATION,
-	GET_LENGTH_INFORMATION, DISK_EXTENT, VOLUME_DISK_EXTENTS,
-	DRIVE_LAYOUT_INFORMATION_GPT, DRIVE_LAYOUT_INFORMATION_MBR,
-	PARTITION_INFORMATION_MBR, PARTITION_INFORMATION_GPT,
-	PARTITION_INFORMATION_EX, DRIVE_LAYOUT_INFORMATION_EX,
-	MOVE_FILE_DATA,
-	RETRIEVAL_POINTERS_BUFFER, STARTING_LCN_INPUT_BUFFER,
-	STARTING_VCN_INPUT_BUFFER, VOLUME_BITMAP_BUFFER): Add structs.
-	(PARTITION_STYLE, DISK_CACHE_RETENTION_PRIORITY): Add enums.
-	(MEDIA_TYPE): Add F3_120M_512, F3_640_512, F5_640_512,
-	F5_720_512, F3_1Pt2_512, F3_1Pt23_1024, F5_1Pt23_1024,
-	F3_128Mb_512, F3_230Mb_512, F8_256_128, F3_200Mb_512,
-	F3_240M_512, and F3_32M_512.
-	* lib/kernel32.def (GetVolumePathNamesForVolumeName[AW]): Add
-	stubs.
-
-2003-04-16  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/wingdi.h (DM_SPECVERSION): Define.
-	Thanks to Sinitsyn Valentime <valentine.sinitsyn@usu.ru>
-	* include/rpcdce.h (UuidCreateSequential): Properly guard with
-	appropriate _WIN32_WINNT values.
-
-2003-04-15  Chris January <chris@atomice.net>
-
-	* include/rpcdce.h: Add declaration for UuidCreateSequential.
-	* lib/rpcrt4.def: Add entry for UuidCreateSequential.
-
-2003-04-14  Phil Krylov  <likewolf@users.sourceforge.net>
-
-	* include/winuser.h (VK_*): Add missing defines.
-
-2003-04-14  Vincent B�ron  <papineau@users.sourceforge.net>
-
-	* include/commctrl.h (NMUPDOWN, LPNMUPDOWN): Use currently
-	documented typedefs for struct _NM_UPDOWN.
-	Add defines for backward comapatibility.
-	* include/commdlg.h (OFN_ENABLESIZING): Add define.
-	* include/wininet.h (IRF_*): Add missing defines.
-
-2003-04-14  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* lib/ntdll.def (Csr*, Dbg*, Ki*, Ldr*, Rtl*): Add W2K exports.
-
-2003-04-11  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/sspi.h: Add comment for FreeCredentialsHandle.
-
-2003-04-07  Marcel Telka <telka@users.sourceforge.net>
-
-	* include/ddk/winddk.h (KIRQL): Typedef as UCHAR, not ULONG.
-
-2003-03-30  Hans E. Molin  <kvasi@users.sourceforge.net>
-
-	* include/olectl.h (OleLoadPicturePath): Correct prototype.
-
-2003-03-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/uuid.c (IID_IHTML*): Move definitions to...
-	* lib/mshtml-uuid.c: New file.
-	* lib/Makefile.in: Add mshtml-uuid.o to libuuid.a
-
-2003-03-30  Michael Sazonov  <traip@comset.net>
-
-	* lib/uuid.c (IID_IHTML*): Add new GUID definitions.
-	* include/mshtml.h (IHTMLElementCollection, IHTMLLinkElement,
-	IHTMLImgElement): Add interface definitions.
-
-2003-03-29  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (ANIMATE_CLASS,HOTKEY_CLASS,PROGRESS_CLASS,
-	STATUSCLASSNAME,TOOLBARCLASSNAME,TOOLTIPS_CLASS,TRACKBAR_CLASS,
-	UPDOWN_CLASS,WC_COMBOBOXEX,WC_HEADER,WC_IPADDRESS,WC_LISTVIEW,
-	WC_TABCONTROL,WC_TREEVIEW): Move UNICODE mappings out of
-	RC_INVOKED guard. 
- 	(WC_PAGESCROLLER,WC_NATIVEFONTCTL,WC_BUTTON,WC_STATIC,WC_EDIT,
-	WC_LISTBOX,WC_COMBOBOX,WC_SCROLLBAR): Add defines.
-
-2003-03-28  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* include/winnt.h (WAITORTIMERCALLBACKFUNC): Add typedef.
-
-2003-03-27  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/secext.h (GetComputerObjectName[AW],GetUserNameEx[AW],
-	TranslateName[AW]): Add prototypes.
-	* lib/sec32.def (GetComputerObjectName[AW],GetUserNameEx[AW],
-	TranslateName[AW]): Add stubs.
-	* lib/test.c: Include secext.h.
-
-2003-03-27  Vladimir Michl  <michlv@users.sourceforge.net>
-
-	* include/ddk/ndis.h (NdisAllocateSpinLock,NdisFreeSpinLock,
-	NdisAcquireSpinLock,NdisReleaseSpinLock,NdisDprAcquireSpinLock,
-	NdisDprReleaseSpinLock): Change macro argument from SpinLock to
-	_SpinLock.
-
-2003-03-26  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/w32api.h: Increment version to 2.4.
-	* Makefile.in: Ditto.
-
-2003-03-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ddk/batclass.h (BATTERY_REPORTING_SCALE)
-	Move structure from here...
-	* include/winnt.h (BATTERY_REPORTING_SCALE): To here.
-
-	* include/ddk/ntapi.h (JOBOBJECT_*):
-	Remove structures and enums definitions.
-  	(JOB_OBJECT*): Move defines from here...
-	* include/winnt.h (JOB_OBJECT* ): To here.
-
-	* include/ddk/ntpoapi.h (LATENCY_TIME, POWER_ACTION_POLICY,
-	SYSTEM_POWER_LEVEL, SYSTEM_POWER_POLICY,
-	PROCESSOR_POWER_POLICY_INFO, PROCESSOR_POWER_POLICY,
-	ADMINISTRATOR_POWER_POLICY, SYSTEM_POWER_INFORMATION,
-	PROCESSOR_POWER_INFORMATION, SYSTEM_BATTERY_STATE,
-	SYSTEM_POWER_CAPABILITIES): Move enums, structures
-	and associated defines from here ...
-	* include/winnt.h: (LATENCY_TIME, POWER_ACTION_POLICY,
-	SYSTEM_POWER_LEVEL, SYSTEM_POWER_POLICY,
-	PROCESSOR_POWER_POLICY_INFO, PROCESSOR_POWER_POLICY,
-	ADMINISTRATOR_POWER_POLICY, SYSTEM_POWER_INFORMATION,
-	PROCESSOR_POWER_INFORMATION, SYSTEM_BATTERY_STATE,
-	SYSTEM_POWER_CAPABILITIES):To here.
-
-	* include/ddk/winddk.h (DEVICE_POWER_STATE,
-	SYSTEM_POWER_STATE, POWER_ACTION): Move enums
-	from here...
-	* include/winnt.h (DEVICE_POWER_STATE,
-	SYSTEM_POWER_STATE, POWER_ACTION): To here.
-
-2003-03-19  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	*lib/ndis.def (NdisAllocateMemory): Correct stdcall suffix.
-	Thanks to: Vladimir Michl <michlv@users.sourceforge.net>
-	(NdisUpdateSharedMemory): Likewise.
-	(NdisMFreeSharedMemory: Likewise. 
-	(NdisMMapIoSpace: Likewise.
-
-2003-03-18  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/lmaccess.h (UF_LOCKOUT): Correct name from UF_LOCK.
-	Thanks to: Fabricio D. Rossi  <gurusoda@users.sourceforge.net>
- 	(UF_SETTABLE_BITS): Correct UF_LOCKOUT here too. 
-
-2003-03-17  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* include/winbase.h (EnumResourceLanguages[AW]): Correct prototypes.
-	(EnumResourceNames[AW]): Ditto.
-	(EnumResourceTypes[AW]): Ditto.
-	* include/wincon.h (CONSOLE_FONT_INFO): Add struct.
-
-2003-03-16  Toby Malone  <malone@users.sourceforge.net>
-
-	* include/winuser.h (SendInput): Add prototype.
-	* lib/user32.def (SendInput): Add stub.
-
-2003-03-16  Vadim Yegorov  <zg@bmg.lv>
-
-	* winioctl.h (FSCTL_SET_REPARSE_POINT: Correct macro.
-	(FSCTL_DELETE_REPARSE_POINT): Likewise.
-
-2003-03-15  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* winnt.h (JOBOBJECTINFOCLASS): Define enum.
-	(JOBOBJECT_*): Define corresponding structures.
-
-2003-03-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ddk/winddk.h (PCUNICODE_STRING): Remove incorrect
-	typedef.
-
-2003-03-13  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* lib/kernel32.def (Module32{First,Next}{,W}): Add missing exports.
-	(Process32{First,Next}{,W}): Ditto.
-	(Thread32{First,Next}): Ditto.
-	* include/ntdef.h (PCUNICODE_STRING): Add typedef.
-
-2003-03-12  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/mswsock.h: Correct invalid filter for _WINSOCK2_H.
-	Thanks to Jim Barton <jmbarton@users.sf.net>.
-
-2003-03-12  Ranjit Mathew  <rmathew@hotmail.com>
-
-        * include/winnt.h (_IMAGE_SEPARATE_DEBUG_HEADER): Expose
-        member SectionAlignment.
-
-2003-03-11  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/winsvc.h (SERVICE_NO_CHANGE): Use hex constant to avoid
-	warnings.
-	Thanks to Fabricio D. Rossi <gurusoda@users.sf.net>.
-	* Makefile.in (bindist): Correct process.
-	* lib/Makefile.in (install): Ditto.
-	Thanks to Jeff Bonnggren <jbon@users.sf.net>.
-
-2003-03-10  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/rasdlg.h: New file.
-	* lib/rasdlg.def: New file.
-	* lib/test.c: Include rasdlg.h.
-
-2003-03-06  Christopher January  <chris@atomice.net>
-
-	* include/winbase.h (FindFirstVolume): Add declaration.
-	(FindNextVolume): Add declaration.
-	(FindVolumeClose): Add declaration.
-	(GetSystemTimes): Add declaration.
-	* include/winnt.h: Add define for PF_XMMI64_INSTRUCTIONS_AVAILABLE.
-
-2003-03-06  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	*lib/kernel32.def (GetSystemTimes): Add stub.
-
-2003-03-04  Heiko Gerdau  <hg@technosis.de>
-
-	* oleidl.h (IOleObject): Correct GetUserType prototype.
-	(IViewObject2): Correct GetExtent prototype.
-	* olectl.h (DISPIP_): Add new defines
-	* ocidl.h (IOleInPlaceSiteWindowless): Add new interface.
-
-2003-03-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/olectl.h (OleLoadPictureEx) Add prototype.
-	(OleLoadPictureFile): Ditto.
-	(OleLoadPictureFileEx): Ditto.
-	(OleLoadPicturePath): Ditto.
-	(OleSavePictureFile): Ditto.
-
-2003-03-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/objbase.h (CoAddRefServerProcess): Add prototype.
-	(CoAddReleaseServerProcess): Ditto.
-	(CoResumeClassObjects): Ditto.
-	(CoSuspendClassObjects): Ditto.
-	* include/oleauto.h (V_I1): Define.
-	Thanks to: "Timofei"  <mmttmm@users.sourceforge.net>
-
-2003-03-01  Heiko Gerdau  <hg@technosis.de> 
-
-	* include/oleidl.h (USERCLASSTYPE): Add enum.
-	* include/ocidl.h (IObjectWithSite): Add interface.
-
-2003-02-28  Roland Schwingel  <roland.schwingel@onevision.de>
-
-	Fixup UNICODE thinko in 2003-02-22 patch.
-	* include/wingdi.h (AddFontMemResourceEx): Add.
-	(RemoveFontMemResourceEx): Ditto.
-	(AddFontMemResourceEx[AW]): Remove.
-	(RemoveFontMemResourceEx[AW]): Ditto
-	* lib/gdi32.def: (AddFontResourceEx): Add.
-	(RemoveFontMemResourceEx): Ditto.
-	(AddFontMemResourceEx[AW]): Remove.
-	(RemoveFontResourceEx[AW]): Ditto.
-
-2003-02-23  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (EVENTLOG_SUCCESS): Add define.
-	Thanks to: Thomas Weber  <thomasweber@sourceforge.net>
-
-2003-02-22  Roland Schwingel  <roland.schwingel@onevision.de>
-
-	* include/wingdi.h (AddFontMemResourceEx[AW]): Add.
-	(RemoveFontMemResourceEx[AW]): Ditto
-	* lib/gdi32.def (AddFontMemResourceEx[AW]): Add.
-	(RemoveFontMemResourceEx[AW]): Ditto.
-
-2003-02-22  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* lib/ntdll.def (NT*, RTL*, ZW*): Add missing exports.
-	(NtCurrentTeb): Remove.
-
-2003-02-22  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wsahelp.h: Remove ';' after closing
-	#ifdef __cplusplus brace.
-	* include/ws2spi.h: Likewise.
-
-2003-02-22  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (MEMORYSTATUSEX): Add structure.
-	(GlobalMemoryStatusEx): Add prototype.
-	* lib/kernel32.def (GlobalMemoryStatusEx): Add stub.
-
-2003-02-17 Vaclav Haisman <V.Haisman@sh.cvut.cz>
-
-	* include/winioctl.h (FSCTL_SET_SPARSE): Define.
-
-2003-02-12  Roland Schwingel  <roland.schwingel@onevision.de>
-
-	* include/wingdi.h (AddFontResourceEx[AW]): Add.
-	(RemoveFontResourceEx[AW]): Ditto
-	(FR_PRIVATE): Define.
-	(FR_NOT_ENUM): Define.
-	* lib/gdi32.def (AddFontResourceEx[AW]): Add.
-	(RemoveFontResourceEx[AW]): Ditto.
-
-2003-02-10  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/w32api.h: Increment version to 2.3.
-	* Makefile.in: Ditto.
-
-2003-02-09  Earnie Boyd  <earnie@users.sf.net>
-
-	* lib/ddk/ntoskrnl.def (Ke386IoSetAccessProcess): Activate export.
-	(Ke386QueryToAccessMap): Ditto.
-	(Ke386SetIoAccessMap): Ditto.
-	Thanks to Marcel Telka <telka@users.sf.net>
-	* include/secext.h: New file. Declare EXTENDED_NAME_FORMAT.
-	* include/security.h: Include secext.h.
-	* include/winbase.h: Declare COMPUTER_NAME_FORMAT.
-	Thanks to Dimitri Papadopoulos <dimitri_at@users.sf.net>
-	* include/GL/gl.h: Remove include of glext.h.
-	Thanks to Greg Couch <gregcouch@users.sf.net>
-
-2003-02-05  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/basetypes.h (_GUID_DEFINED): Add deprecation warning, start
-	using GUID_DEFINED instead.
-	* include/sqltypes.h: Ditto.
-	* include/winnt.h: Ditto.
-	* include/ddk/scsiwmi.h: Ditto.
-
-2003-02-04  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/shlwapi.h (PathRelativePathTo[AW]): Correct
-	prototypes.
-	Thanks to: John Dallaway  <jld@ecoscentric.com>.
-
-2003-02-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (TCM_*): Add missing defines.
-
-2003-02-01  Jesus Alvarez  <jesus_alvarez@users.sourceforge.net>
-	    Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/prsht.h (PSP_*, PSH_*): Add missing defines.
-	(PROPSHEETPAGE[AW]): Add pszHeaderTitle, pszHeaderSubTitle
-	for (_WIN32_IE >= 0x0400).
-	(PROPSHEETHEADER[AW]): Add hplWatermark and anonymous union
-	fields for (_WIN32_IE >= 0x0400).
-
-2003-01-31  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (CreateFiber): Change first parameter
-	to SIZE_T.
-	(CreateJobObject[AW], CreateHardLink[AW]):Guard with
-	if (_WIN32_WINNT >= 0x0500). 
-
-2003-01-31  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* include/winbase.h (PWIN32_FIND_DATAA, PWIN32_FIND_DATAW):
-	Add missing typedefs.
-	(CreateFiberEx, CreateJobObjectA,CreateJobObjectW): Add missing
-	prototypes.
-	(CreateHardLinkA, CreateHardLinkW): Return BOOL, not HANDLE.
-
-2003-01-27  Krzysztof Nikiel  <kni@poczta.onet.pl>
-
-	* include/mmsystem.h (MIXERCONTROL_CONTROLF_MULTIPLE): Correct
-	define.
-	* lib/largeint.c (LargeIntegerAdd): Add, don't multiply.
-
-2003-01-27  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/rpcnterr.h (RPC_X_INVALID_PIPE_OPERATION): Add
-	define.
-	* include/winbase.h (WAIT_TIMEOUT): Guard against prior
-	definition.
-	(WAIT_FAILED): Cast to DWORD.
-	* include/winerror.h (WAIT_TIMEOUT): Guard against prior
-	definition.
-
-2003-01-27  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* include/winerror.h: Protect against multiple
-	definition of WSA* error codes.
-	* include/winsock.h: Likewise.
-	* include/winsock2.h: Likewise.
-
-2003-01-27  Bang Dong-Heui
-	    Bang Jun-Young  <junyoung@netbsd.org>
-
-	* include/winerror.h (ERROR_*, SEC_E_*,RPC_S_*, FRS_ERR_*,
-	DNS_*, WSA*, WAIT_TIMEOUT): Add missing error codes.
-	(RPC_X_INVALID_PIPE_OPERATION): Remove define.
-
-
-2003-01-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ras.h (RASCONN[AW]): Add dwSessionId for
-	(WINVER >= 0x501).
-
-2003-01-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ras.h (RASCONN[AW]): Guard szDeviceType,
-	szDeviceName fields with (WINVER >= 0x400). Add dwFlags, luid
-	fields for (WINVER >= 0x501).
-
-2003-01-23  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/ws2_32.def (getaddrinfo, freeaddrinfo and getnameinfo):
-	Add stubs.
-	* include/ws2tcpip.h (IPV6_*) Add IPPROTO_IPV6 level socket
-	options.
-
-2003-01-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (IMAGE_FILE_AGGRESIVE_WS_TRIM
-	IMAGE_FILE_LARGE_ADDRESS_AWARE): Add defines.
-
-2003-01-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/accctrl.h (enum _SE_OBJECT_TYPE): Add
-	SE_REGISTRY_WOW64_32KEY.
-	Reported by: Dimitri Papadopoulos  <dimitri_at@sourceforge.users.net>
-
-2003-01-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (HDN_GETDISPINFO[AW]: Add defines.
-	(tagNMHDDISPINFO[AW}: Add structures and typedefs.
-	Reported by: Mat Nieuwenhoven  <matnieuw@users.sourceforge.net>
-
-2003-01-10  Christopher Faylor  <cgf@redhat.com>
-
-	* include/winsock2.h: Remove gethostname from INSIDE_CYGWIN protection.
-
-2003-01-08  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/dxguid.c: Don't #include <objbase.h>.
-	* include/unknwn.h: Partially revert change of 2002-12-26.
-	Don't include <ole2.h>.
-
-2003-01-08  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/dinput.c: Don't #include <objbase.h>.
-
-2003-01-08  Bart Oldeman  <bartoldeman@users.sourceforge.net>
-
-	* include/windows.h (ole2.h):Do #include for
-	__WATCOMC__.
-
-2003-01-05  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (SPI_SETWHEELSCROLLLINES) Add define.
-	* include/zmouse.h (WHEEL_DELTA): Guard against prior
-	definition.
-	(WHEEL_PAGESCROLL): Likewise.
-	(SPI_SETWHEELSCROLLLINES): Define, if not already done.
-
-2003-01-04  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (SPI_GETWHEELSCROLLLINES) Add define.
-	(WHEEL_PAGESCROLL): Add define.
-
-2003-01-04  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (tagNMTOOLBAR[AW]): Replace obsolete struct
-	names tagTBNOTIFY[AW] and typedefs. Add defines for backward
-	compatability. Add RECT field. Add UNICODE mappings for new
-	names.
-	(tagNMREBARCHEVRON): Add struct and typedefs for
-	_WIN32_IE >= 0x0500.
-
-2003-01-04  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (TOOLINFO[AW]): Update structures.
-	(LVHITTESTINFO): Likewise.
-
-	* include/wingdi.h (GRADIENT_TRIANGLE): Add structure.
-	(GRADIENT_RECT): Likewise.
-
-2003-01-03  Bang Jun-Young  <junyoung@netbsd.org>
-
-	* include/winerror.h (ERROR_OPLOCK_NOT_GRANTED,
-	ERROR_INVALID_OPLOCK_PROTOCOL, ERROR_SOURCE_ELEMENT_EMPTY,
-	ERROR_DESTINATION_ELEMENT_FULL, ERROR_ILLEGAL_ELEMENT_ADDRESS,
-	ERROR_MAGAZINE_NOT_PRESENT, ERROR_DEVICE_REINITIALIZATION_NEEDED,
-	ERROR_DEVICE_REQUIRES_CLEANING, ERROR_DEVICE_DOOR_OPEN,
-	ERROR_DEVICE_NOT_CONNECTED, ERROR_NOT_FOUND, ERROR_NO_MATCH,
-	ERROR_SET_NOT_FOUND, ERROR_NO_TRACKING_SERVICE,
-	ERROR_JOURNAL_DELETE_IN_PROGRESS, ERROR_JOURNAL_NOT_ACTIVE,
-	ERROR_JOURNAL_ENTRY_DELETED, ERROR_ONLY_IF_CONNECTED,
-	ERROR_NOT_SUPPORTED_ON_SBS, ERROR_SERVER_SHUTDOWN_IN_PROGRESS,
-	ERROR_MUTUAL_AUTH_FAILED, ERROR_TIME_SKEW, ERROR_DEVICE_REMOVED,
-	RPC_S_INVALID_ASYNC_HANDLE, RPC_S_INVALID_ASYNC_CALL,
-	RPC_X_PIPE_CLOSED, RPC_X_PIPE_DISCIPLINE_ERROR, RPC_X_PIPE_EMPTY,
-	ERROR_CANT_ACCESS_FILE, ERROR_CANT_RESOLVE_FILENAME,
-	ERROR_WMI_GUID_NOT_FOUND, ERROR_WMI_INSTANCE_NOT_FOUND,
-	ERROR_WMI_ITEMID_NOT_FOUND, ERROR_WMI_TRY_AGAIN, ERROR_WMI_READ_ONLY,
-	ERROR_WMI_SET_FAILURE, ERROR_TRANSPORT_FULL, ERROR_FILE_OFFLINE,
-	ERROR_REMOTE_STORAGE_NOT_ACTIVE, ERROR_REMOTE_STORAGE_MEDIA_ERROR,
-	ERROR_NOT_A_REPARSE_POINT, ERROR_REPARSE_ATTRIBUTE_CONFLICT,
-	ERROR_INVALID_REPARSE_DATA, ERROR_REPARSE_TAG_INVALID,
-	ERROR_REPARSE_TAG_MISMATCH, ERROR_FILE_ENCRYPTED,
-	ERROR_FILE_NOT_ENCRYPTED, ERROR_NOT_EXPORT_FORMAT,
-	ERROR_CTX_WINSTATION_NAME_INVALID, ERROR_CTX_INVALID_PD,
-	ERROR_CTX_PD_NOT_FOUND, ERROR_CTX_WD_NOT_FOUND,
-	ERROR_CTX_CLOSE_PENDING, ERROR_CTX_NO_OUTBUF,
-	ERROR_CTX_MODEM_INF_NOT_FOUND, ERROR_CTX_INVALID_MODEMNAME,
-	ERROR_CTX_MODEM_RESPONSE_ERROR, ERROR_CTX_MODEM_RESPONSE_TIMEOUT,
-	ERROR_CTX_MODEM_RESPONSE_NO_CARRIER,
-	ERROR_CTX_MODEM_RESPONSE_NO_DIALTONE, ERROR_CTX_MODEM_RESPONSE_BUSY,
-	ERROR_CTX_MODEM_RESPONSE_VOICE, ERROR_CTX_TD_ERROR,
-	ERROR_CTX_WINSTATION_NOT_FOUND, ERROR_CTX_WINSTATION_ALREADY_EXISTS,
-	ERROR_CTX_WINSTATION_BUSY, ERROR_CTX_BAD_VIDEO_MODE,
-	ERROR_CTX_GRAPHICS_INVALID, ERROR_CTX_NOT_CONSOLE,
-	ERROR_CTX_CLIENT_QUERY_TIMEOUT, ERROR_CTX_CONSOLE_DISCONNECT,
-	ERROR_CTX_CONSOLE_CONNECT, ERROR_CTX_SHADOW_DENIED,
-	ERROR_CTX_WINSTATION_ACCESS_DENIED, ERROR_CTX_INVALID_WD,
-	ERROR_CTX_SHADOW_INVALID, ERROR_CTX_SHADOW_DISABLED,
-	ERROR_CTX_CLIENT_LICENSE_IN_USE, ERROR_CTX_CLIENT_LICENSE_NOT_SET,
-	ERROR_CTX_LICENSE_NOT_AVAILABLE, ERROR_CTX_LICENSE_CLIENT_INVALID,
-	ERROR_CTX_LICENSE_EXPIRED, ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY,
-	ERROR_DS_NO_ATTRIBUTE_OR_VALUE, ERROR_DS_INVALID_ATTRIBUTE_SYNTAX,
-	ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED, ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS,
-	ERROR_DS_BUSY, ERROR_DS_UNAVAILABLE, ERROR_DS_NO_RIDS_ALLOCATED,
-	ERROR_DS_NO_MORE_RIDS, ERROR_DS_INCORRECT_ROLE_OWNER,
-	ERROR_DS_RIDMGR_INIT_ERROR, ERROR_DS_OBJ_CLASS_VIOLATION,
-	ERROR_DS_CANT_ON_NON_LEAF, ERROR_DS_CANT_ON_RDN,
-	ERROR_DS_CANT_MOD_OBJ_CLASS, ERROR_DS_CROSS_DOM_MOVE_ERROR,
-	ERROR_DS_GC_NOT_AVAILABLE, ERROR_SHARED_POLICY,
-	ERROR_POLICY_OBJECT_NOT_FOUND, ERROR_POLICY_ONLY_IN_DS,
-	ERROR_DS_ADMIN_LIMIT_EXCEEDED, ERROR_DS_DS_REQUIRED,
-	ERROR_DS_SAM_INIT_FAILURE, ERROR_DS_SENSITIVE_GROUP_VIOLATION,
-	ERROR_DS_CANT_MOD_PRIMARYGROUPID, ERROR_DS_INVALID_GROUP_TYPE,
-	ERROR_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN,
-	ERROR_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN,
-	ERROR_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER,
-	ERROR_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER,
-	ERROR_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER,
-	ERROR_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER,
-	ERROR_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER,
-	ERROR_DS_HAVE_PRIMARY_MEMBERS, ERROR_DS_SAM_NEED_BOOTKEY_PASSWORD,
-	ERROR_DS_SAM_NEED_BOOTKEY_FLOPPY, ERROR_DS_CANT_START,
-	ERROR_DS_INIT_FAILURE, ERROR_SAM_INIT_FAILURE, ERROR_DS_GC_REQUIRED,
-	ERROR_DS_LOCAL_MEMBER_OF_LOCAL_ONLY,
-	ERROR_DS_NO_FPO_IN_UNIVERSAL_GROUPS,
-	ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED):
-	Add missing error codes.
-
-2003-01-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/kernel32.c (GetCurrentFiber): Remove blank input field in
-	asm code.
-	(GetFiberData): Likewise.
-
-2003-01-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (GetCurrentFiber): Remove blank input field in
-	asm code.
-	(GetFiberData): Likewise.
-
-2003-01-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winerror.h (ERROR_DIFFERENT_SERVICE_ACCOUNT,
-	ERROR_EXE_MACHINE_TYPE_MISMATCH, ERROR_HOOK_TYPE_NOT_ALLOWED,
-	ERROR_INVALID_KEYBOARD_HANDLE, ERROR_INVALID_PRINT_MONITOR,
-	ERROR_PRINT_MONITOR_IN_USE, ERROR_PRINTER_HAS_JOBS_QUEUED,
-	ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION,
-	ERROR_SUCCESS_REBOOT_REQUIRED, ERROR_SUCCESS_RESTART_REQUIRED,
-	ERROR_TIMEOUT, OR_INVALID_OID, OR_INVALID_OXID,
-	OR_INVALID_SET, RPC_X_INVALID_PIPE_OPERATION): Add missing
-	error codes.
-	Re-sort codes.
-
-2003-01-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winspool.h (PRINTER_INFO_6): Add.
-	Reported by: Mat Nieuwenhoven  <matnieuw@users.sourceforge.net>
-
-2002-12-30  Hartmut Honisch <hhonisch@users.sourceforge.net>
-
-	* include/winbase.h (NMPWAIT_WAIT_FOREVER): Cast to DWORD.
-
-	* lib/ntdll.def (NtConnectPort, NtOpenEvent,
-	NtRequestWaitReplyPort, NtWaitForSingleObject,ZwConnectPort,
-	ZwOpenEvent, ZwRequestWaitReplyPort, ZwWaitForSingleObject):
-	Add stubs.
-
-2002-12-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wingdi.h (wglGetLayerPaletteEntries): Correct
-	prototype. Thanks to: Joe Krahn  <jkrahn at nc dot rr dot com>.
-
-2002-12-26  Dimitri Papadopoulos  <dimitri_at@sourceforge.users.net>
-
-	* include/wingdi.h (DOCINFOA): Replace LPCTSTR with LPCSTR.
-
-2002-12-26  Dimitri Papadopoulos  <dimitri_at@sourceforge.users.net>
-
-	* include/wingdi.h (BALTIC_CHARSET, JOHAB_CHARSET,
-	VIETNAMESE_CHARSET): Remove duplicate defines. 
-	* lib/comctl32.def (ImageList_SetImageCount): Add stub.
-
-2002-12-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/dbt.h (DEV_BROADCAST_PORT): Add UNICODE version.
-	Thanks to: Dimitri Papadopoulos  <dimitri_at@sourceforge.users.net>
-
-2002-12-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
- 	* include/unknwn.h: Include windows.h and ole2.h before header
-	guard to avoid circular inclusion of COM headers.
-
-2002-12-26  Dimitri Papadopoulos  <dimitri_at@sourceforge.users.net>
-
-	* include/dde.h (PackDDElParam, UnpackDDElParam,FreeDDElParam,
-	ReuseDDElParam): Use __WIN64 compatible typedefs.
-
-2002-12-26  Dimitri Papadopoulos  <dimitri_at@sourceforge.users.net>
-
-	* include/accctrl.h (ACTRL_ACCESS_ENTRY[AW]): Make
-	lpInheritProperty member const.
-	(ACTRL_PROPERTY_ENTRY[AW]): Make lpProperty member
-	const.
-
-2002-12-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commcat.h: Don't include windows.h or ole2.h ifdef
-	COM_NO_WINDOWS_H.
-	* include/unknwn.h: Ditto.
-	
-2002-12-26  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/imm.h (ImmGetCompositionFont[AW],
-	ImmSetCompositionFont[AW]): Add NOGDI guard.
-
-2002-12-19  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ddk/hidusage.h: Remove unneccessary #pragma pack's.
-	* include/ddk/miniport.h (EMULATOR_PORT_ACCESS_TYPE): Define
-	before using.
-	(VIDEO_ACCESS_RANGE): Guard against prior definition.
-	* include/ddk/minitape.h (INQUIRYDATA): Guard against prior
-	definition.
-	* include/ddk/ndis.h (DECLARE_UNKNOWN_PROTOTYPE): Correct macro.
-	* include/ddk/ndisguid.h: Remove unneccessary #pragma pack's.
-	* include/ddk/scsi.h (INQUIRYDATA): Guard against prior
-	definition.
-	* include/ddk/scsiwmi.h (GUID): Define if not already done.
-	(LPCGUID): Likewise.
-	* include/ddk/tdi.h: Close "Listen flags" comment.
-	* include/ddk/tdistat.h: Remove unneccessary #pragma pack's.
-	* include/ddk/video.h:	Add #pragma pack(push,4) to balance.
-	(VIDEO_ACCESS_RANGE): Guard against prior definition.
-	* include/ddk/videoagp.h:Add #pragma pack(push,4) to balance.
-	* include/ddk/win2k.h: Likewise.
-	* include/ddk/winddi.h: Likewise.
-	* include/ddk/winddk.h: Likewise.
-	* include/ddk/winnt4.h: Likewise.
-	* include/ddk/ws2san.h: Likewise.
-	* include/ddk/xfilter.h: Remove unbalanced #pragma pack(pop).
-	* include/ddk/video.h: Don't process rest of file ifdef
-	__WINDDI_H.
-	* include/ddk/winddi.h: Don't process rest of file ifdef
-	__VIDEO_H.
-	* include/ddk/usb.h: Don't process rest of file ifdef
-	__USBDI_H.
-	* include/ddk/usbdi.h: Don't process rest of file ifdef
-	__USB_H.
-	* include/ddk/usbcamdi.h: Don't process rest of file if
-	!defined(__USB_H) && !defined(__USBDI_H)
-
-2002-12-18  James E. Lucas  <xelloss@users.sourceforge.net>
-
-	* include/winnetwk.h (WNetResourceInformation[AW]): Correct
-	prototypes.
-	* include/winuser.h (GetAncestor) Add prototype.
-	(GA_PARENT, GA_ROOT, GA_ROOTOWNER): Add defines.
-	(EWX_FORCEIFHUNG): Add define for _WIN32_WINNT >= 0x0500.
-	(SPI_GETACTIVEWINDOWTRACKING, SPI_GETACTIVEWNDTRKZORDER,
-	SPI_GETACTIVEWNDTRKTIMEOUT, SPI_SETACTIVEWINDOWTRACKING
-	SPI_SETACTIVEWNDTRKZORDER, SPI_SETACTIVEWNDTRKTIMEOUT): Add
-	defines.
-	* lib/user32.def (GetAncestor@8): Add stub.
-
-2002-12-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/windows.h: Guard inclusion of wingdi.h,
-	commdlg.h, winspool.h, ole2.h with NOGDI.
- 	* include/winuser.h (ICONMETRICS, NONCLIENTMETRICS,
-	ChangeDisplaySettings, CreateDesktop, EnumDisplaySettings):
-	Guard with NOGDI.
-
-2002-12-12  Dimitri Papadopoulos  <dimitri_at@sourceforge.users.net>
-
-	* include/oleacc.h (SELFLAG_*): Change to enum.
-
-2002-12-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/shlobj.h (IShellLinkW::GetPath): Correct prototype.
-	Thanks to: Dimitri Papadopoulos <dimitri_at@sourceforge.users.net>
-
-2002-12-09  Danny Smith  <dannysmith@users.sourceforge.net>
-	
-	* include/shellapi.h (ExtractIconEx[AW]): Correct return type
-	to UINT.
-	Thanks to: Dimitri Papadopoulos <dimitri_at@sourceforge.users.net>
-
-2002-12-07  Danny Smith  <dannysmith@users.sourveforge.net>
-	
-	* include/winuser.h (AllowSetForegroundWindow,
-	LockSetForegroundWindow): Add prototypes.
-	(ASFW_ANY, LSFW_LOCK, LSFW_UNLOCK) Add defines.
-	Thanks to:  Pat Thoyts  <patthoyts@users.sourceforge.net>
-	* lib/winuser.def (AllowSetForegroundWindow,
-	LockSetForegroundWindow): Add stubs. 
-
-2002-12-06  Ken Fitlike  <kenfitlike@users.sourceforge.net>
-
-	* include/commctrl.h (TN_GETDISPINFO[AW]): Add defines and
-	UNICODE mappings.
-	(tagNMTTDISPINFO[AW]): Replace obsolete struct names
-	tagTOOLTIPTEXT[AW] and typedefs. Add defines for backward
-	compatability. Add lParam field. Add UNICODE mappings for new
-	names.
-
-2002-12-02  Andrew Stadt  <acstadt@sympatico.ca>
-
-	* include/shellapi.h (_SHFILEOPSTRUCTA,_SHFILEOPSTRUCTW):
-	Wrap with pshpack2.h/poppack.h to correct alignment.
-
-2002-12-02  Ken Fitlike  <kenfitlike@users.sourceforge.net>
-
-	* include/commctrl.h (LVBKIF_*): Add defines.
-	(LVM_SETIMAGE[AW]): Add defines and UNICODE mappings.
-	(LVM_GETIMAGE[AW]): Add defines and UNICODE mappings.
-	(LVBKIMAGE[AW]): Add defines and UNICODE mappings.
-	(LPLVBKIMAGE[AW]): Add defines and UNICODE mappings.
-	(LVM_GETBKIMAGE[AW]): Add defines and UNICODE mappings.
-	(LVM_SETBKIMAGE[AW]): Add defines and UNICODE mappings.
-	(ListView_GetBkImage): Add define.
-	(ListView_SetBkImage): Add define.
-	(LVBKIMAGE): Add structures and typedefs.
-
-2002-11-25  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/w32api.h: Increment to version 2.2
-	* Makefile.in: Ditto.
-
-2002-11-25  Earnie Boyd  <earnie@users.sf.net>
-
-	* lib/Makefile.in (dist, install): Correct the install destinations.
-	* lib/ddk/Makefile.in (dist, install): Ditto.
-
-2002-11-16  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/uuid.c (CATID_InternetAware,CLSID_HttpSProtocol,
-	CLSID_PSUrlMonProxy,CLSID_StdURLMoniker,IID_IObjectWithSite,
-	IID_IPersistMoniker,IID_IProgressNotify): Correct off-by-one bug
-	in definitions.
-	(CLSID_CFontPropPage00, GUID_FONTUNDERSCORE11,
-	IID_IOleControlSite89): Remove.
-
-2002-11-15  Christopher Faylor  <cgf@redhat.com>
-
-	* lib/uuid.c (IID_IRunnableObject): Remove duplicate definition.
-	(IID_IStdMarshalInfo): Ditto.
-
-2002-11-15  Christopher Faylor  <cgf@redhat.com>
-
-	* lib/uuid.c (IID_IOleInPlaceSite): Remove duplicate definition.
-	(IID_IPersistStorage): Ditto.
-
-2002-11-15  Weiqi Gao  <weiqigao@users.sourceforge.net>
-
-	* lib/uuid.c (CLSID_PSClassObject, CLSID_PSEnumerators,
-	IID_IClassActivator, IID_IClientSecurity, IID_ICreateTypeInfo,
-	IID_ICreateTypeLib2, IID_IOleInPlaceSite, IID_IPersistStorage,
-	IID_IRunnableObject, IID_IServerSecurity, IID_IStdMarshalInfo):
-	Correct definitions.
-
-2002-11-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ddk/(atm.h, batclass.h, cfg.h, cfgmgr32.h, d4drvif.h,
-	d4iface.h, ddkmapi.h, hidclass.h, hidpi.h, hidusage.h, mcd.h,
-	miniport.h, minitape.h, mountdev.h, mountmgr.h, ndis.h,
-	ndisquid.h, ndistapi.h, ndisvan.h, netevent.h, netpnp.h,
-	netdev.h, ntapi.h, ntdd8042.h, ntddbeep.h, ntddcdrm.h,
-	ntddcdvd.h, ntddchgr.h, ntdddisk.h, ntddk.h, ntddkbd.h,
-	ntddmou.h, ntddndis.h, ntddpar.h, ntddpcm.h, ntddscsi.h,
-	ntddser.h, ntddstor.h, ntddtape.h, ntddtdi.h, ntddvdeo.h,
-	ntddvol.h, ntifs.h, ntpoapi.h, ntstatus.h, parallel.h, pfhook.h,
-	poclass.h, scsi.h, scsiscan.h, scsiwmi.h, smbus.h, srb.h,
-	storport.h, tdi.h, tdiinfo.h, tdikrnl.h, tdistat.h, tvout.h,
-	upssvc.h, usb.h, usb100.h, usbcamdi.h, usbdi.h, usbioctl.h,
-	usbiodef.h, usbscan.h, usbuser.h, video.h, videoagp.h, win2k.h,
-	winddi.h, winddk.h, winnt4.h, winxp.h, ws2san.h, 
-	xfilter.h): Change comment to refer w32api package, not MinGW.
-
-2002-11-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ddk/ntddk.h: Include winnt.h as system header.
-
-2002-11-12  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ddk/(atm.h, batclass.h, cfg.h, cfgmgr32.h, d4drvif.h,
-	d4iface.h, ddkmapi.h, hidclass.h, hidpi.h, hidusage.h, mcd.h,
-	miniport.h, minitape.h, mountdev.h, mountmgr.h, ndis.h,
-	ndisquid.h, ndistapi.h, ndisvan.h, netevent.h, netpnp.h,
-	netdev.h, ntapi.h, ntdd8042.h, ntddbeep.h, ntddcdrm.h,
-	ntddcdvd.h, ntddchgr.h, ntdddisk.h, ntddk.h, ntddkbd.h,
-	ntddmou.h, ntddndis.h, ntddpar.h, ntddpcm.h, ntddscsi.h,
-	ntddser.h, ntddstor.h, ntddtape.h, ntddtdi.h, ntddvdeo.h,
-	ntddvol.h, ntifs.h, ntpoapi.h, ntstatus.h, parallel.h, pfhook.h,
-	poclass.h, scsi.h, scsiscan.h, scsiwmi.h, smbus.h, srb.h,
-	storport.h, tdi.h, tdiinfo.h, tdikrnl.h, tdistat.h, tvout.h,
-	upssvc.h, usb.h, usb100.h, usbcamdi.h, usbdi.h, usbioctl.h,
-	usbiodef.h, usbscan.h, usbuser.h, video.h, videoagp.h, win2k.h,
-	winddi.h, winddk.h, winnt4.h, winxp.h, ws2san.h, 
-	xfilter.h): Fix typo in disclaimer comment.
-
-2002-11-12  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/exdisp.h: Include oaidl.h as system header.
-
-2002-11-12  Earnie Boyd <earnie@users.sf.net>
-
-	* include/w32api.h (__W32API_VERSION): Fix.
-
-2002-11-09  Weiqi Gao  <weiqigao@users.sourceforge.net>
-
-	* lib/uuid.c (IID_ICatInformation): Correct definition.
-
-2002-11-07  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/oleauto.h (DeregisterTypeLib): Remove.
-	(UnRegisterTypeLib): Add prototype.
-
-2002-11-07  Christopher January  <chris@atomice.net>
-
-	* include/winioctl.h: Add definition for IOCTL_DISK_UPDATE_DRIVE_SIZE.
-
-2002-11-04  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (VerSetConditionMask): Add prototype.
-	* lib/kernel32.def (VerifyVersionInfo[AW]): Add stubs.
-
-2002-10-16  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (MONITORINFOEX[AW]): Add structure
-	definitions and ANSI/UNICODE mappings.
-	Cleanup whitespace.
-
-2002-10-14  Earnie Boyd  <earnie@users.sf.net>
-
-	* Makefile.in: Add components for lib/ddk.  Adjust for autoconf-2.53.
-	* configure.in: Ditto.
-	* lib/Makefile.in: Ditto.
-	* lib/ddk/Makefile.in: Correct installation procedure.  Adjust for
-	autoconf-2.53.
-	* configure: Regenerate.
-
-2002-10-14  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/windows.h: Don't include basetyps.h.
-	* include/objfwd.h: Do include basetyps.h.
-
-2002-10-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/objbase.h: Include rpc.h and rpcndr.h
-	before header guard.
-
-2002-10-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/olectl.h (PROPPAGEINFO): Change type of
-	field cb to ULONG.
-
-2002-10-11  Steven Edwards  <Steven_Ed4153@yahoo.com>
-
-	* lib/ntdll.def (RtlAcquireResourceExclusive,
-	RtlAcquireResourceShared, RtlDeleteResource,
-	RtlInitializeResource, RtlReleaseResource,
-	RtlTimeToSecondsSince1970) : Added missing exports.
-
-2002-10-08  Heiko Gerdau  <hg@technosis.de>
-
-	* include/oleacc.h: New file.
-	* include/winuser.h (ENDSESSION_LOGOFF) Add define.
-	(OBJID_*) Add defines.
-	* lib/uuid.c: Add DEFINE_GUID for IID_IAccessible.
-	* lib/test.c: Include oleacc.h.
-
-2002-10-06  Casper Hornstrup  <chorns@it.dk>
-
-	* include/ddk: New subdir.
-	* lib/ddk: Ditto.
-	* include/ddk/(atm.h, batclass.h, cfg.h, cfgmgr32.h, d4drvif.h,
-	d4iface.h, ddkmapi.h, hidclass.h, hidpi.h, hidusage.h, mcd.h,
-	miniport.h, minitape.h, mountdev.h, mountmgr.h, ndis.h,
-	ndisquid.h, ndistapi.h, ndisvan.h, netevent.h, netpnp.h,
-	netdev.h, ntapi.h, ntdd8042.h, ntddbeep.h, ntddcdrm.h,
-	ntddcdvd.h, ntddchgr.h, ntdddisk.h, ntddk.h, ntddkbd.h,
-	ntddmou.h, ntddndis.h, ntddpar.h, ntddpcm.h, ntddscsi.h,
-	ntddser.h, ntddstor.h, ntddtape.h, ntddtdi.h, ntddvdeo.h,
-	ntddvol.h, ntifs.h, ntpoapi.h, ntstatus.h, parallel.h, pfhook.h,
-	poclass.h, scsi.h, scsiscan.h, scsiwmi.h, smbus.h, srb.h,
-	storport.h, tdi.h, tdiinfo.h, tdikrnl.h, tdistat.h, tvout.h,
-	upssvc.h, usb.h, usb100.h, usbcamdi.h, usbdi.h, usbioctl.h,
-	usbiodef.h, usbscan.h, usbuser.h, video.h, videoagp.h, win2k.h,
-	winddi.h, winddk.h, winnt4.h, winxp.h, ws2san.h, 
-	xfilter.h): New files.
-	* lib/ddk/(Makefile.in, apcups.def, cfgmgr32.def, dxapi.def,
-	hal.def, hid.def, hidparse.def, mcd.def, ndis.def, ntoskrnl.def,
-	scsiport.def, tdi.def, usbcamd.def, usbcamd2.def, videoprt.def,
-	win32k.def): Ditto.
-
-2002-10-04  Steven Edwards  <Steven_Ed4153@yahoo.com>
-
-	* lib/ntdll.def (NtAccessCheck, NtAdjustPrivilegesToken,
-	NtCreateKey, NtDeleteKey, NtDeleteValueKey, NtEnumerateKey,
-	NtEnumerateValueKey, NtOpenKey, NtOpenProcessToken,
-	NtOpenThreadToken, NtQueryInformationToken, NtQueryKey,
-	NtQueryValueKey, NtSetSecurityObject, NtSetValueKey,
-	RtlAddAccessAllowedAce, RtlCreateAcl,
-	RtlCreateSecurityDescriptor, RtlCreateUnicodeStringFromAsciiz,
-	RtlGetAce, RtlGetControlSecurityDescriptor,
-	RtlGetDaclSecurityDescriptor,RtlGetGroupSecurityDescriptor,
-	RtlGetOwnerSecurityDescriptor,RtlGetSaclSecurityDescriptor,
-	RtlImpersonateSelf, RtlIsTextUnicode, RtlLargeIntegerAdd,
-	RtlLengthSecurityDescriptor, RtlMakeSelfRelativeSD,  
-	RtlMultiByteToUnicodeN RtlMultiByteToUnicodeSize,
-	RtlOpenCurrentUser, RtlSetDaclSecurityDescriptor,
-	RtlSetGroupSecurityDescriptor, RtlSetOwnerSecurityDescriptor,
-	RtlSetSaclSecurityDescriptor, RtlValidSecurityDescriptor,
-	ZwAccessCheck, ZwAdjustPrivilegesToken, ZwCreateKey,
-	ZwDeleteValueKey, ZwEnumerateKey, ZwEnumerateValueKey,
-	ZwOpenKey, ZwOpenProcessToken, ZwOpenThreadToken,
-	ZwQueryInformationToken, ZwQueryKey, ZwQueryValueKey
-	ZwSetSecurityObject, ZwSetValueKey): Added missing exports.
-
-2002-10-04  "KJK::Hyperion"  <noog@libero.it>
-
-	*include/windef.h (WPARAM): Update typedef.
-	(LPARAM): Ditto.
-	(LRESULT): Ditto.
-
-2002-10-04  "KJK::Hyperion"  <noog@libero.it>
-
-	* include/shlobj.h (CSIDL_*): Add defines.
-
-2002-09-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ws2tcpip.h: Throw error if winsock.h, not winsock2.h
-	has been included first.
-
-2002-09-24  Ren� M�ller Fonseca  <fonseca@users.sourceforge.net>
-
-	* include/winbase.h (FindFirstFileEx): Fixed ANSI mode.
-	* include/wingdi.h (PFD_SWAP_LAYER_BUFFERS):Added define.
-	* include/winuser.h (AppendMenu[AW]): Fixed prototypes.
-
-2002-09-18  Eric R. Krause  <ekrause_98@users.sourceforge.net>
-
-	* include/winuser.h (DS_SHELLFONT): Define.
-
-2002-09-17  Daniel Schlyder  <daniel@dascdev.net>
-
-	* include/winnt.h (VER_SUITE_BLADE): Define.
-
-2002-09-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/shlobj.h (SHGetSpecialFolderPath[AW]):
-	Add _WIN32_IE guard. Correct prototype for wide version.
-	(SHGetFolderPath): Add comment on shfolder.dll.
-	(SHGetFolderLocation): Add prototyope for WinME and W2K.
-	(SHGetFolderPathAndSubDir[AW]): Add prototypes for XP.
-
-2002-09-16  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/shell32.def (SHGetFolderPath[AW]): Add comment.
-	* lib/shfolder.def: New file.
-
-2002-09-12  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winsock.h (timeval): Guard struct and associated
-	macros with _TIMEVAL_DEFINED.
-	* include/winsock2.h (timeval): Likewise.
-
-2002-09-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/shell32.def (SHBindtoParent,SHCreateDirectoryEx[AW],
-	SHCreateProcessAsUserW,SHCreateQueryCancelAutoPlayMoniker,
-	SHCreateShellItem,SHEmptyRecycleBin[AW],
-	SHEnumerateUnreadMailAccountsW,SHExtractIconsW,
-	SHGetDataFromIDList[AW],SHGetDiskFreeSpace[AW],
-	SHGetDiskFreeSpaceEx[AW],SHGetFolderLocation,
-	SHGetFolderPathAndSubDir[AW],SHGetIconOverlayIndex[AW],
-	SHGetNewLinkInfo[AW],SHGetSettings,SHGetUnreadMailCountW,
-	SHInvokePrinterCommand[AW],SHIsFileAvailableOffline,
-	SHLoadNonloadedIconOverlayIdentifiers,
-	SHOpenFolderAndSelectItems,SHParseDisplayName,
-	SHPathPrepareForWrite[AW],SHQueryRecycleBin[AW],
-	SHSetLocalizedName,SHSetUnreadMailCountW,
-	SHUpdateRecycleBinIcon: Add missing stubs.
-
-2002-09-07  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/windef.h (WINVER): Add documentation.
-	(_WIN32_WINNT): Ditto.
-	Special thanks to Paul Schmidt <paul@tricattechnologies.com>
-
-2002-09-06  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/Makefile.in (TEST_OPTIONS): Define WINVER to 0x0666.
-
-2002-09-04  Kevin Chase  <kevincha99@hotmail.com>
-
-	* include/winbase.h (AllocateUserPhysicalPages,
-	MapUserPhysicalPages, MapUserPhysicalPagesScatter,
-	FreeUserPhysicalPages): Add prototypes.
-	* lib/kernel32.def: Add function stubs for above.
-
-2002-09-03  Ren� M�ller Fonseca  <fonseca@users.sourceforge.net>
-
-	* include/winuser.h (IDTRYAGAIN,IDCONTINUE): Add defines.
-	Add WINVER guards for dialog box command id defines.
-
-2002-09-03  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/wincon.h (GetConsoleWindow): Add _WIN32_WINNT >= 0x0500 guard.
-
-2002-08-30  Christopher January <ccj00@doc.ic.ac.uk>
-
-	* include/wincon.h: Define GetConsoleWindow(void).
-
-2002-08-28  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/w32api.h: Increment version to 2.1.
-	* Makefile.in: Ditto.
-
-2002-08-26  Bart Oldeman  <bart.oldeman@btinternet.com>
-
-	* include/winsock2.h (SOCKET_ADDRESS): Define if
-	__CSADDR_T_DEFINED is not defined (copied from nspapi.h)
-	(CSADDR_INFO): Ditto.
-	(nspapi.h) : Don't include. Removed FIXME comment.
-	* include/nspapi.h (SOCKET_ADDRESS) Only define if
-	__CSADDR_T_DEFINED is not defined.
-	(CSADDR_INFO): Ditto.
-	(BLOB): Add structure and typedef if not already defined.
-	(NS_*): Add defines.
-	(SERVICE_*): Ditto.
-	(SERVICE_ADDRESS): Add structure and typedefs.
- 	(SERVICE_ADDRESSES): Ditto.
-	(SERVICE_INFO[AW]): Ditto, and add UNICODE mappings.
-	(LPSERVICE_ASYNC_INFO): Add typedef.
-	(SetService[AW], GetAddressByName[AW]): Add prototypes and UNICODE
-	mappings.
-	* include/wsipx.h: New file.
-	* include/svcguid.h: New file.
-	* lib/test.c: Include wspix.h and svcguid.h.
-
-2002-08-26  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/wsahelp.h: New file.
-	* lib/test.c: Include wsahelp.h.
-
-2002-08-21  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/commctrl.h (NMCUSTOMDRAW): Fix lItemlParam.
-	Thanks to: "Phil Dempster" <p_dempster@yahoo.co.uk>.
-
-2002-08-20  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ws2spi.h: Modify comment about being part of
-	mingw32 package.
-	(winsock2.h): Change "" to <>.
-
-2002-08-20  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/ws2spi.h: New file.
-	* lib/test.c: Include ws2spi.h.
-
-2002-08-20  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winsock2.h (WSAIsBlocking,WSAUnhookBlockingHook,
-	WSASetBlockingHook,WSACancelBlockingCall): Expose deprecated
-	functions.
-
-2002-08-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (CURSOR_SHOWING) Add define.
-	Thanks to: Jan Hlavat�  <hlavac@users.sourceforge.net>
-
-2002-08-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winerror.h: Cast OLE error codes to HRESULT.
-	Thanks to: Gunnar Degnbol <gdegnbol@users.sourceforge.net>
-
-2002-08-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wincrypt.h (ALG_*): Add defines.
-	(CALG_*): Ditto.
-	(CRYPT_*): Ditto.
-	(PP_*): Ditto.
-	(PROV_*): Ditto.
-	(PRIVATEKEYBLOB): Add define.
-
-2002-08-14  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/shlobj.h (SHGetFolderPath): Add define.
-	* lib/shell32.def (SHGetSpecialFolderPath): Add export.
-	(SHGetFolderPath): Ditto.
-
-2002-08-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commdlg.h: Don't include COM headers or use
-	COM-dependent symbols if __OBJC__.
-
-2002-08-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wincrypt.h (CryptDuplicateHash, CryptDuplicateKey):
-	Add prototypes.
-
-2002-08-12  Andriy Palamarchuk  <apa3a@yahoo.com>
-
-	* include/shellapi.h (FOF_NOERRORUI): Add define.
-
-2002-08-12  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/objidl.h (IEnumMoniker): Put 'interface' back.
-
-2002-08-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/objidl.h (IEnumMoniker): Correct declaration.
-
-2002-08-09  Mark Schreiber  <mark7@users.sourceforge.net>
-
-	* include/wincrypt.h (CRYPT_NOHASHOID): Add define.
-
-2002-08-09  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h: Whitespace change.
-
-2002-08-09  Lars Munch  <lars@segv.dk>
-
-	* include/commctrl.h (tagTVHITTESTINFO): Replace obsolete
-	struct name _TVHITTESTINFO and typedefs and add defines for
-	backward compatability.
-	(ListView_SetExtendedListViewStyleEx): Add macro.
-
-2002-08-05  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wingdi.h (AlphaBlend,GradientFill,TransparentBlt):
-	Add prototypes.
-	* lib/msimg32.def: New file, with stubs for above.
-
-2002-08-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (AddAccessAllowedAceEx,AddAccessDeniedAceEx,
-	GetFileSizeEx, SetFilePointerEx): Add prototypes.
-	(EncryptFile[AW], FileEncryptionStatus[AW]): Add prototypes
-	and UNICODE mappings.
-
-2002-08-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (ReadFileScatter, WriteFileGather):
-	Change second parameter to pointer.
-
-2002-07-31  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wininet.h (InternetReadFileEx[AW]). Add prototypes and
-	UNICODE mappings.
-	* lib/wininet.def: Regenerate.
-
-2002-07-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/windef.h (PVOID): Move typedef to...
-	* include/winnt: ...here.
-	(PVOID64): New typedef.
-
-	* include/winnt,h (FILE_SEGMENT_ELEMENT): Define union.
-	* include/winbase.h (ReadFileScatter, WriteFileGather):
-	Add prototypes.
-
-	* include/winnt,h (PROCESSOR_ARCHITECTURE_*): Add defines.
-	(PROCESSOR_INTEL_IA64): Add define.
-
-2002-07-25  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/oleidl.h (MK_ALT): Define.
-
-2002-07-26  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/exdisp.h: New file.
-	* include/exdispid.h: New file.
-	* include/mshtml.h: New file.
-	* lib/test.c: #include exdisp.h and mshtml.h
-	* lib/uuid.c (CLSID_WebBrowser, DIID_DWebBrowserEvents,
-	DIID_DWebBrowserEvents2, IID_IHTMLDocument, IID_IHTMLDocument2,
-	IID_IHTMLElement, IID_IHTMLSelectionObject, IID_IHTMLTxtRange,
-	IID_IWebBrowser, IID_IWebBrowser2, IID_IWebBrowserApp):
-	New GUIDs.
-
-2002-07-26  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/docobj.h: New file.
-	* include/idispids.h: New file.
-	* include/objidl.h (IID_IMoniker): Declare.
-	* include/ocidl.h (READYSTATE): New enum.
-	(IOleInPlaceSiteEx): New interface.
-	* include/olectlid.h (IID_IEnumSTATSTG): New interface
-	identifier.
-	* include/oleidl.h (IOleItemContainer, IOleInPlaceObject,
-	IOleInPlaceSite): New interfaces.
-	* lib/test.c: #include docobj.h,idispids.h,
-
-2002-07-25  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/shlobj.h (BFFM_VALIDATEFAILED[AW]): Add defines.
-	(BFFM_SETSTATUSTEXT, BFFM_SETSELECTION): UNICODE them.
-
-2002-07-25  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/commctrl.h: Avoid redefinition of CDN_FIRST/LAST.
-	* include/commdlg.h: Likewise.
-
-2002-07-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/oleauto.h (V_UNION): Correct definition for case of
-	NONAMELESSUNION:
-	(V_VT): Likewise.
-
-2002-07-23  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/oleauto.h (V_BOOL): Define in terms of boolVal,
-	not bool, for C as well as C++.
-
-2002-07-22  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/shlwapi.h: New file.
-	Thanks to: Mattia Barbon  <mbarbon@dsi.unive.it> and
-	Victor Porton  <porton@narod.ru> for contributions.
-	* lib/shlwapi.def: New file.
-	* lib/test.c: #include shlwapi.h.
-
-2002-07-21  Bart Oldeman  <bart.oldeman@btinternet.com>
-
-	* include/shlobj.h (FCIDM_MENU_FAVORITES): Remove bogus
-	character.
-	* include/winsock2.h (struct sockaddr): Use __int64 instead of
-	long long.
-	* lib/kernel32.c (GetCurrentFiber, GetFiberData): Watcom
-	does not need external *Fiber library functions.
-
-2002-07-20  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/winbase.h (GetEnvironmentStringsA): Remove duplicate
-	definition.
-	(Interlocked*): Wrap in #ifndef __INTERLOCKED_DECLARED to
-	avoid compile error when already defined.
-
-2002-07-20  Steven Edwards  <Steven_Ed4153@yahoo.com>
-
-	* include/winuser.h (WM_MENURBUTTONUP): Add define.
-
-2002-07-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commdlg.h: Define CDN_* notification message constants
-	as UINT.
-
-2002-07-17  Mattia Barbon  <mbarbon@users.sourceforge.net>
-
-	* include/commctrl.h: Define notification message constants for
-	NMHDR.code as UINT.
-
-2002-07-17   Bart Oldeman  <bart.oldeman@btinternet.com>
-
-	* include/ddeml.h (MH_*) Add defines.
-	(MONHSZSTRUCT): Add structure and typedefs.
-	(MONLINKSTRUCT): Ditto.
-	(MONCONVSTRUCT): Ditto.
-	(MONCBSTRUCT): Ditto.
-	(MONERRSTRUCT): Ditto.
-	(MONMSGSTRUCT): Ditto.
-	* include/windef.h: Don't define __cdecl or _cdecl for
-	__WATCOM__.
-	Don't define _export or __export for __WATCOM__.
-	* include/windows.h (imm.h): #include.
-	* include/winnt.h (LPEXCEPTION_RECORD): Add typedef.
-
-2002-07-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wtypes.h: Remove duplicate #includes of rpc.h and
-	rpcndr.h.
-
-2002-07-05  Luke Dunstan  <infidel@users.sourceforge.net>
-
-	* include/winbase.h (OpenThread): Add prototype.
-	* lib/kernel32.def (OpenThread): Add symbol.
-
-2002-07-04  Luke Dunstan  <infidel@users.sourceforge.net>
-
-	* include/wtypes.h (HMETAFILEPICT): Add typedef.
-
-2002-07-04  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/rpc.h: Conditionally include <windows.h> before
-	header guard.
-	* include/wtypes.h: Include <rpc.h> and <rpcndr.h> before
-	header guard.
-
-2002-07-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (WC_*): Remove some duplicate defines.
-
-2002-07-02  Ken Fitlike  <kenfitlike@hotmail.com>
-
-	* include/commctrl.h (WC_IPADDRESS[AW]): Add defines and
-	UNICODE mappings.
-	(IPM*): Add defines.
-	(IPN_*): Add defines.
-	(NMIPADDRESS): Add structure and typedefs.
-	(MAKEIPADDRESS): Add macro.
-	(MAKEIPRANGE): Add macro.
-	(FIRST_IPADDRESS): Add macro.
-	(SECOND_IPADDRESS): Add macro.
-	(THIRD_IPADDRESS): Add macro.
-	(FOURTH_IPADDRESS): Add macro.
-
-2002-06-25  Conrad Scott  <conrad.scott@dsl.pipex.com>
-
-	* include/winbase.h (FILE_FLAG_FIRST_PIPE_INSTANCE): Add constant.
-
-2002-06-26  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/winbase.h (WINBASEAPI): Don't define if prior
-	definition.
-
-	* include/winioctl.h (PARTITION_FAT32, PARTITION_FAT32_XINT13,
-	PARTITION_XINT13, PARTITION_XINT13_EXTENDED, PARTITION_LDM,
-	PARTITION_UNIX): Add defines.
-	(PDRIVE_LAYOUT_INFORMATION): Add typedef.
-	(IsRecognizedPartition): Also check for PARTITION_FAT32,
-	PARTITION_FAT32_XINT13 and PARTITION_XINT13.
-	(IsContainerPartition): Add macro.
-
-2002-06-25  Ken Fitlike  <kenfitlike@hotmail.com>
-
-	* include/commctrl.h: (CBEIF_*): Add defines.
-	(CBEN_*): Add defines and UNICODE mappings
-	(WC_COMBOBOXEX[AW]): Add defines and UNICODE mappings.
-	(CBEMAXSTRLEN): Add define.
-	(COMBOBOXEXITEM[AW]): Add structures and typedefs.
-	(NMCOMBOBOXEX[AW]): Add structures and typedefs.
-	(NMCBEDRAGBEGIN[AW]): Add structure and typedefs.
-	(NMCBEENDEDIT[AW]): Add structure and typedefs.
-
-2002-06-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/objidl.h (struct tagPROPVARIANT): Kill obsolete
-	union member _VARIANT_BOOL bool.
-	
-2002-06-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winioctl.h (FILE_SPECIAL_ACCESS): Add define.
-
-2002-06-24  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/winnt.h (PCCHAR, FCHAR, FSHORT, FLONG,
-	PLUID_AND_ATTRIBUTES,PSECURITY_IMPERSONATION_LEVEL,
-	PSID_AND_ATTRIBUTES, PTOKEN_TYPE, PTOKEN_STATISTICS):
-	Add typedefs.
-	(CCHAR): Correct typedef.
-	(PROCESS_SET_SESSIONID, SECURITY_*,SECTION_MAP_EXECUTE):
-	Add defines.
-
-2002-06-24  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* README.w32api: Correct spelling error.
-
-2002-06-19  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/winuser.h (FLASHW_*,INPUT_MOUSE,INPUT_KEYBOARD,
-	INPUT_HARDWARE): Add defines.
-	(HDEVNOTIFY): Add typedef.
-	(FLASHWINFO,tagMOUSEMOVEPOINT,tagMOUSEINPUT,tagKEYBDINPUT,
-	tagHARDWAREINPUT,tagINPUT,tagGUITHREADINFO): Define structs and
-	typedefs.
-	(CreateDesktop[AW],CreateMDIWindow[AW],GetClassInfo[AW],
-	GetClassInfoEx[AW],GetKeyboardLayoutList,
-	MessageBoxIndirect[AW],MsgWaitForMultipleObjects,
-	MsgWaitForMultipleObjectsEx, RegisterClass[AW],
-	RegisterClassEx[AW]): Correct prototypes.
-
-2002-06-19  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/ddeml.h (DdeCreateStringHandle{AW]:Correct
-	prototypes.
-	* include/winsvc.h (StartServiceW): Correct prototype.
-	* include/winbase.h (BackupRead,BackupSeek,BackupWrite,
-	FileTimeToLocalFileTime, GetAce,GetPrivateProfileStruct[AW],
-	GetTickCount,InterlockedExchangeAdd,
-	WritePrivateProfileStruct[AW]: Correct prototypes.
-	(GetEnvironmentStrings): Correct mapping to
-	GetEnvironmentStringsA.
-	* include/winver.h (VerQueryValueA,VerQueryValueW):
-	Correct prototypes.
-	* include/wincon.h (CreateConsoleScreenBuffer): Correct
-	prototype.
-	* include/winreg.h (RegQueryMultipleValues[AW],
-	RegQueryValueEx[AW]):Correct prototypes.
-	* include/wingdi.h (PXFORM, PLOGBRUSH, PLOGPEN, PPOLYTEXTA,
-	PPOLYTEXTW): Add typedefs.
-	(_DESIGNVECTOR,COLOR16, _TRIVERTEX, _DISPLAY_DEVICE): Add
-	structures and typedefs.
-	(MM_MAX_NUMAXES): Add define.
-	(EnumFontsW,GetEnhMetaFilePixelFormat,
-	wglGetLayerPaletteEntries): Correct prototypes.
-	* include/winerror.h (RPC_X_INVALID_PIPE_OBJECT,
-	RPC_X_WRONG_PIPE_ORDER,RPC_X_WRONG_PIPE_VERSION,
-	RPC_S_SEND_INCOMPLETE): Add defines.
-
-2002-06-17  Casper S. Hornstrup  <chorns@users.sourceforge.net>
-
-	* include/windef.h (_fastcall, __fastcall, FASTCALL):
-	Add defines.
-
-2002-06-16  Egor Duda  <deo@logos-m.ru>
-
-	* include/ntdll.h: New file.
-	* lib/ntdll.def: Add NtShutdownSystem.
-
-2002-06-16  Steven Edwards  <Steven_Ed4153@yahoo.com>
-
-	* lib/dinput.def (DirectInputCreateEx): Add stub.
-	* lib/ntdll.def: New file.
-
-2002-06-14  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/w32api.h: Change to version 2.0 to reflect the change
-	in the license.
-	* README: Renamed.
-	* README.w32api: Renamed from README.  Modified license to remove
-	the restriction of notifying the author based on the fact that the
-	author is unreachable at the notified address.
-	* Makefile.in (VERSION): Change to 2.0.
-
-2002-06-14  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/wingdi.h (GetEnhMetaFileBits): Correct typo.
-	* Makefile.in (bindist): Correct the MinGW distribution.
-
-2002-06-13  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/winuser.h (MOUSEHOOKSTRUCT): Define structure.
-	* include/wingdi.h (GetEnhMetaFileBits): Define prototype.
-
-2002-06-13  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/test.c: #include comcat.h.
-
-2002-06-13  John K. Hohm <jhohm@acm.org>
-
-	* include/comcat.h: New file.
-
-2002-06-09  Gunnar Degnbol <gdegnbol@users.sourceforge.net>
-
-	* include/richedit.h (EM_*, TM_*, GT_*): Add new defines.
-	(GETTEXTEX): Add structure definition.
-
-2002-06-08  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/windows.h (ole2.h): #include if !__OBJC__ and
-	__GNUC__ >=3 and !WIN32_LEAN_AND_MEAN.
-
-2002-06-07  Gunnar Degnbol <gdegnbol@users.sourceforge.net>
-
-	* include/mapi.h: Change LPTSTR to LPSTR throughout.
-
-2002-06-05  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (PACE_HEADER, PACCESS_ALLOWED_ACE,
-	PACCESS_DENIED_ACE): Add typedefs.
-
-2002-06-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/thunk32.def (LIBRARY): Change to KERNEL32.dll.
-
-2002-06-03 Steven Edwards  <Steven_Ed4153@yahoo.com>
-
-	* lib/kernel32.def (ConvertToGlobalHandle): Add stub.
-
-2002-06-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/windef.h: Fix typo in last change.
-
-2002-06-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/windef.h: Add no-op __try, __except, __finally
-	defines from ...
-	* include/excpt.h: Remove file.
-	* include/windows.h: Don't include excpt.h.
-
-2002-05-30  Christopher January  <chris@atomice.net>
-
-	* include/ntdef.h (ANSI_STRING, PANSI_STRING, OEM_STRING, POEM_STRING):
-	Add missing typedefs.
-
-2002-05-28  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/w32api.h: Increment version to 1.5
-	* Makefile.in: Ditto.
-
-
-2002-05-27  Ren� M�ller Fonseca  <fonseca@users.sourceforge.net> 
-
-	* include/winreg.h: (RegConnectRegistry[AW]): Replace
-	LP[W]STR with LPC[W]STR.
-	(REG_QWORD, REG_QWORD_LITTLE_ENDIAN): Add defines.
-	Clean up whitespace.
-
-2002-05-27  Rick Rankin  <rick_rankin@yahoo.com>
-
-	* include/winnls.h: Add #define for LOCALE_RETURN_NUMBER.
-
-2002-05-21  Earnie Boyd  <earnie@users.sf.net>
-
-	* Makefile.in: Increment VERSION to 1.4.
-	(conf_prefix): New variable.
-	(bindist): Modify target to use $(conf_prefix).
-
-2002-05-20  Philip Aston  <philipa@mail.com>
-
-	* include/pbt.h (PBT_APMRESUMESUSPEND): Correct value is 7.
-
-2002-05-20  Ren� M�ller Fonseca  <fonseca@users.sourceforge.net>
-
-	* include/lmaccess.h: (NetAccess*, NetGroup*,
-	NetLocalGroup*, NetUser*, NetGet*, INetLogonControl[2],
-	NetQueryDisplayInfotmationIndex): Replace LPWSTR with LPCWSTR.
-
-2002-05-08  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (ImageList_DragShowNolock): Remove
-	conflicting redeclaration.
-
-2002-05-07  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/windows.h: Move ANONYMOUS_UNION, _ANONYMOUS_STRUCT,
-	STRICT and related defines to ...
-	* include/windef.h: Here.
-
-2002-05-03  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winsock2.h (int32): Remove typedef.
-	(SERVICETYPE): Add typedef.
-	(struct _flowspec):Revise struct definition,  Comment
-	on types used for members.
-
-2002-05-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (EVENT_*, SEMAPHORE_*,MUTEX_*): Remove
-	more defines added in earlier change.
-	* lib/Makefile.in (TEST_OPTIONS): Add -Wsystem-headers flag.
-
-2002-05-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (THREAD_PRIORITY_*): Remove defines
-	added in last change.
-
-2002-05-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (THREAD_*, EVENT_*, MUTANT_*,
-	SEMAPHORE_*, MUTEX_*, TIMER_*): Add new defines.
-
-2002-05-01  Manu B  <contact.manu@wanadoo.fr>
-
-	* include/commctrl.h (SNDMSG): Define and use throughout
-	in other macros instead of SendMessage.
-	* include/commdlg.h (SNDMSG): Ditto.
-
-2002-04-22  Jos� Fonseca  <jrfonseca@users.sf.net>
-
-	* include/GL/gl.h: New file.
-	* include/GL/glext.h: Ditto.
-	* include/GL/glu.h: Ditto.
-
-2002-04-09  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/w32api.h: Increment version.
-	* Makefile.in: Ditto.
-
-2002-04-09  Earnie Boyd  <earnie@users.sf.net>
-
-	* Makefile.in (bindist): Use * instead of . for file list for tar
-	command.
-
-2002-04-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wtypes.h (enum tagCLSCTX): Change formatting.
-
-2002-04-02  Pat Thoyts  <patthoyts@users.sourceforge.net>
-
-	* include/objidl.h (IRunningObjectTable.Register): Correct
-	prototype.
-	* include/wtypes.h (ROTFLAGS_REGISTRATIONKEEPSALIVE,
-	ROTFLAGS_ALLOWANYCLIENT): Add defines.
-
-2002-03-31  Victor Porton  <porton@narod.ru>
-
-	* include/shellapi.h (SHGFI_ATTR_SPECIFIED): Add define.
-
-2002-03-29  David Robinow  <drobinow@yahoo.com>
-
-	* include/wingdi.h (SetPixelFormat): Correct prototype.
-
-2002-03-29  Phil Krylov  <likewolf@users.sourceforge.net>
-
-	* include/richedit.h (EM_SHOWSCROLLBAR): Add define.
-
-2002-03-26  Phil Krylov  <likewolf@users.sourceforge.net>
-
-	* include/richedit.h (EM_GETSCROLLPOS, EM_SETSCROLLPSPOS):
-	Add defines.
-
-2002-03-14  Gunnar Degnbol <gdegnbol@users.sourceforge.net>
-
-	* include/richedit.h (RICHEDIT_CLASS): UNICODE it.
-	* include/shlobj.h (IContextMenu2): Put methods in right order.
-	* include/basetyps.h (REFGUID, REFIID, REFCLSID): Check for
-	CINTERFACE before defining.
-
-2002-03-09  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/accctrl.h: Add #pragma GCC system_header
-	if __GNUC__ >= 3.
-	* include/aclapi.h: Same.
-	* include/basetsd.h: Same.
-	* include/basetyps.h: Same.
-	* include/cderr.h: Same.
-	* include/cguid.h: Same.
-	* include/commctrl.h: Same.
-	* include/commdlg.h: Same.
-	* include/cpl.h: Same.
-	* include/cplext.h: Same.
-	* include/custcntl.h: Same.
-	* include/dbt.h: Same.
-	* include/dde.h: Same.
-	* include/ddeml.h: Same.
-	* include/dlgs.h: Same.
-	* include/excpt.h: Same.
-	* include/httpext.h: Same.
-	* include/imagehlp.h: Same.
-	* include/imm.h: Same.
-	* include/initguid.h: Same.
-	* include/intshcut.h: Same.
-	* include/ipexport.h: Same.
-	* include/iphlpapi.h: Same.
-	* include/ipifcons.h: Same.
-	* include/iprtrmib.h: Same.
-	* include/iptypes.h: Same.
-	* include/isguids.h: Same.
-	* include/largeint.h: Same.
-	* include/lm.h: Same.
-	* include/lmaccess.h: Same.
-	* include/lmalert.h: Same.
-	* include/lmapibuf.h: Same.
-	* include/lmat.h: Same.
-	* include/lmaudit.h: Same.
-	* include/lmbrowsr.h: Same.
-	* include/lmchdev.h: Same.
-	* include/lmconfig.h: Same.
-	* include/lmcons.h: Same.
-	* include/lmerr.h: Same.
-	* include/lmerrlog.h: Same.
-	* include/lmmsg.h: Same.
-	* include/lmremutl.h: Same.
-	* include/lmrepl.h: Same.
-	* include/lmserver.h: Same.
-	* include/lmshare.h: Same.
-	* include/lmsname.h: Same.
-	* include/lmstats.h: Same.
-	* include/lmsvc.h: Same.
-	* include/lmuse.h: Same.
-	* include/lmuseflg.h: Same.
-	* include/lmwksta.h: Same.
-	* include/lzexpand.h: Same.
-	* include/mapi.h: Same.
-	* include/mciavi.h: Same.
-	* include/mcx.h: Same.
-	* include/mmsystem.h: Same.
-	* include/mswsock.h: Same.
-	* include/nb30.h: Same.
-	* include/nddeapi.h: Same.
-	* include/nspapi.h: Same.
-	* include/ntdef.h: Same.
-	* include/ntsecapi.h: Same.
-	* include/ntsecpkg.h: Same.
-	* include/oaidl.h: Same.
-	* include/objbase.h: Same.
-	* include/objfwd.h: Same.
-	* include/objidl.h: Same.
-	* include/odbcinst.h: Same.
-	* include/ole.h: Same.
-	* include/ole2.h: Same.
-	* include/ole2ver.h: Same.
-	* include/oleauto.h: Same.
-	* include/olectl.h: Same.
-	* include/olectlid.h: Same.
-	* include/oledlg.h: Same.
-	* include/oleidl.h: Same.
-	* include/pbt.h: Same.
-	* include/prsht.h: Same.
-	* include/psapi.h: Same.
-	* include/rapi.h: Same.
-	* include/ras.h: Same.
-	* include/raserror.h: Same.
-	* include/rassapi.h: Same.
-	* include/regstr.h: Same.
-	* include/richedit.h: Same.
-	* include/richole.h: Same.
-	* include/rpc.h: Same.
-	* include/rpcdce.h: Same.
-	* include/rpcdce2.h: Same.
-	* include/rpcdcep.h: Same.
-	* include/rpcndr.h: Same.
-	* include/rpcnsi.h: Same.
-	* include/rpcnsip.h: Same.
-	* include/rpcnterr.h: Same.
-	* include/rpcproxy.h: Same.
-	* include/schannel.h: Same.
-	* include/schnlsp.h: Same.
-	* include/scrnsave.h: Same.
-	* include/security.h: Same.
-	* include/setupapi.h: Same.
-	* include/shellapi.h: Same.
-	* include/shlguid.h: Same.
-	* include/shlobj.h: Same.
-	* include/sql.h: Same.
-	* include/sqlext.h: Same.
-	* include/sqltypes.h: Same.
-	* include/sqlucode.h: Same.
-	* include/sspi.h: Same.
-	* include/subauth.h: Same.
-	* include/tlhelp32.h: Same.
-	* include/unknwn.h: Same.
-	* include/userenv.h: Same.
-	* include/w32api.h: Same.
-	* include/winbase.h: Same.
-	* include/wincon.h: Same.
-	* include/wincrypt.h: Same.
-	* include/windef.h: Same.
-	* include/windows.h: Same.
-	* include/windowsx.h: Same.
-	* include/winerror.h: Same
-	* include/wingdi.h: Same.
-	* include/wininet.h: Same.
-	* include/winioctl.h: Same.
-	* include/winnetwk.h: Same.
-	* include/winnls.h: Same.
-	* include/winnt.h: Same.
-	* include/winperf.h: Same.
-	* include/winreg.h: Same.
-	* include/winresrc.h: Same.
-	* include/winsock.h: Same.
-	* include/winsock2.h: Same.
-	* include/winspool.h: Same.
-	* include/winsvc.h: Same.
-	* include/winuser.h: Same.
-	* include/winver.h: Same.
-	* include/ws2tcpip.h: Same.
-	* include/wsnetbs.h: Same.
-	* include/wtypes.h: Same.
-	* include/zmouse.h: Same.
-	* include/mapi.h: Change header guard name to _MAPI_H  for
-	consistency.
-
-2002-03-08  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/accctrl.h (_ACCCTRL_H): Correct typo.
-	Remove unnecessary inclusion of <wtypes.h>.
-	* ChangeLog: Fix omission of name in recent entries.
-
-2002-03-08  Antony Blakey  <antony.blakey@ihug.com.au>
-
-	* include/initguid.h (DEFINE_GUID): Add GUID_EXT to define.
-
-2002-03-06  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/mswsock.h: Group winsock2 dependants
-	together and protect with #ifdef _WINSOCK2_H.
-	* lib/test.c: Only test ws2tcpip.h if winsock2.h
-	has been included.
-
-2002-03-05  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/mswsock.h (TP_*): Add new defines.
-	(TRANSMIT_PACKETS_ELEMENT): Define new structure.
-	(WSAMSG): Likewise.
-	(WSACMSGHDR): Likewise.
-	(DisconnectEx): Add new prototype.
-	(WSARecvMsg): Likewise.
-	(WSA_CMSG_*) Add empty macros, guarded by #if 0.
-
-2002-03-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* ChangeLog: Fix typo in last entry. 
-	* include/winsock2.h (IPPROTO_*): Add IPv6 defines.
-	* include/ws2tcpip.h: (IP_*): Add new defines.
-	(INET_ADDRSTRLEN, INET6_ADDRSTRLEN): Add defines.
-	(NI_*): Add getnameinfo constants and bitmasks.
-	(AI_*): Add getaddrinfo flags.
-	(EAI_*): Add getaddrinfo error codes.
-	(ip_mreq_source): Add new structure.
-	(ip_msfilter): Add new structure.
-	(IP_MSFILTER_SIZE): Add new macro.
-	(in_pktinfo): Add new structure.
-	Add preliminary IPv6 support.
-	(in6_addr): Add new structure and some defines.
-	(sockaddr_in6): Add new structure.
-	(in6addr_any, in6addr_loopback): Declare extern structures.
-	(IN6ADDR_ANY_INIT,IN6ADDR_LOOPBACK_INIT): Add
-	initialization macros for above.
-	(IN6_ARE_ADDR_EQUAL): Define macro.
-	(IN6_IS_ADDR_*): Define address testing macros.
-	(socklen_t) Add new typedef.
-	(ipv6_mreq): Add new structure.
-	(in6_pktinfo): Same.
-	(addrinfo): Same.
-	(freeaddrinfo):Add new prototype.
-	(getaddrinfo): Same.
-	(gai_strerror[AW]): Same.
-	(getnameinfo): Same.
-	(sockaddr_in6_old): Add structure.
-	(sockaddr_gen): Add union definition.
-	(INTERFACE_INFO): Use sockaddr_gen as members.
-	(INTERFACE_INFO_OLD): Add comment on workaround for problems
-	with INTERFACE_INFO on NT4 prior to sp4.
-
-2002-02-28  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/windows.h; Remove test for __W32API_MAJOR_VERSION
-	when selecting winsock interface.
-	* include/winsock2.h (SOCKET_ADDRESS_LIST): Add structure
-	and typedefs. Thanks to: 'Lorenzo' <conte0@infinito.it>.
-	Expand FIXME comment.
-	(WSACOMPLETIONTYPE): Add enum.
-	(WSACOMPLETION): Add structure and typedefs.
-	(WSANSPIoctl): Add function prototpe and callback typedef.
-	(SIO_NSP_NOTIFY_CHANGE): Add define.
-	(sockaddr_storage): Add structure and typedefs.
-
-2002-02-16  Andriy Palamarchuk  <apa3a@yahoo.com>
-
-	* include/winuser.h (OIC_*): Add resource constants.
-
-2002-02-14 Mattia Barbon  <mbarbon@users.sourceforge.net>
-
-	* include/ntsecpkg.h: New file.
-	* include/schannel.h: New file.
-	* include/schnlsp.h: New file.
-	* include/security.h: New file.
-	* include/sspi.h: New file.
-	* include/ntsecapi.h (KERB_WRAP_NO_ENCRYPT,
-	MICROSOFT_KERBEROS_NAME_[AW]): Add missing constants
-	* include/wincrypt.h (CALG_*, X509_ASN_ENCODING.
-	PKCS_7_ASN_ENCODING, CERT_*, USAGE_MATCH_TYPE_AND,
-	USAGE_MATCH_TYPE_OR, szOID_*): Add missing constants
-	(struct _CRYPTOAPI_BLOB): Add structure and typedefs.
-	(SSL_EXTRA_CERT_CHAIN_POLICY_PARA,HTTPSPolicyCallbackData,
-	CERT_CHAIN_POLICY_PARA,CERT_CHAIN_POLICY_STATUS,
-	CRYPT_ALGORITHM_IDENTIFIER, CRYPT_BIT_BLOB,
-	CERT_PUBLIC_KEY_INFO, CERT_EXTENSION, CERT_INFO, CERT_CONTEXT,
-	CTL_USAGE, CERT_ENHKEY_USAGE, CERT_USAGE_MATCH,
-	CERT_CHAIN_PARA, CERT_CHAIN_FIND_BY_ISSUER_PARA,
-	CERT_TRUST_STATUS, CRL_ENTRY, CRL_INFO, CRL_CONTEXT,
-	CERT_REVOCATION_CRL_INFO, CERT_REVOCATION_INFO,
-	CERT_CHAIN_ELEMENT, CRYPT_ATTRIBUTE, CTL_ENTRY, CTL_INFO,
-	CTL_CONTEXT, CERT_TRUST_LIST_INFO, CERT_SIMPLE_CHAIN,
-	CERT_CHAIN_CONTEXT): Add missing structures.
-	(CertCloseStore, CertGetCertificateChain,
-	CertVerifyCertificateChainPolicy, CertFreeCertificateChain,
-	CertNameToStr[AW], CertOpenSystemStore[AW], CertOpenStore,
-	CertFindCertificateInStore, CertFreeCertificateContext,
-	CertGetIssuerCertificateFromStore,
-	CertFindChainInStore): Add missing functions.
-	(CertNameToStr, CertOpenSystemStore, CERT_FIND_SUBJECT_STR,
-	CERT_FIND_ISSUER_STR): Add Unicode mappings.
-	* lib/crypt32.def: New file.
-	* lib/secur32.def: Add mising stubs.
-	* lib/test.c: Include new headers.
-
-2002-02-14  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/windef.h (PROC,FARPROC,NEARPROC): Remove void
-	parameter.
-
-2002-01-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/test.c: Include mapi.h.
-	* include/commctrl.h (TBSTYLE_*): Add missing defines.
-	Thanks to: "Ron"  <ron@debian.org> 
-
-2002-01-30  John Fattaruso  <fattaruso@ieee.org>
-
-	* include/mapi.h: New file.
-	* lib/mapi.def: Add missing function stubs.	
-	
-2002-01-28  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (GetWindowLongPtr[AW],
-	SetWindowLongPtr[AW]): Add prototypes for _WIN64.
-
-2002-01-28  Mattia Barbon  <mbarbon@users.sourceforge.net>
-
-	* include/winuser.h (GWLP_*,DWLP_*): Add missing constants.
-	(GetWindowLongPtr[AW], SetWindowLongPtr[AW]): Map them to
-	{Get Set}WindowLong[AW], as in Win32 they are equivalent.
-	(GetWindowLongPtr, SetWindowLongPtr): Add Unicode mappings.
-
-2002-01-28  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/test.c: Include wsnetbs.h.
-
-2002-01-28  Kai Henningsen  <kai-henningsen@users.sourceforge.net>
-
-	* include/wsnetbs.h: New file.
-
-2002-01-25  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/winnt.h: Remove merge conflict.
-
-2002-01-25  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (_TCHAR): Add typedefs.
-
-2002-01-25  Tim Hughes  <tjh@delcam.com>
-
-	* include/wininet.h (SECURITY_FLAG_IGNORE_*): Add missing
-	defines.
-
-2002-01-25  Andriy Palamarchuk  <apa3a@yahoo.com>
-
-	* include/winsuser.h (ATF_AVAILABLE, SERKF_ACTIVE):
-	Add defines.
-	(LPACCESSTIMEOUT): Add typedef.
-
-2002-01-24  Phillip Susi  <psusi@cfl.rr.com> 
-
-	* include/commctrl.h: Add missing HDM_*,HDN_*,LVSICF_* defines.
-
-2002-01-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (HDITEM[AW]): Rename _HD_ITEM[AW] to
-	_HDITEM[AW], with parallel changes to typedefs.	Use defines for
-	backward compatability with old names. Update UNICODE mappings.
-	(HDLAYOUT): Remove struct _HD_LAYOUT_XP.  Use new typedefs
-	for struct _HD_LAYOUT and add defines for backward
-	compatability with old names.
-	(NMLISTVIEW): Rename _NM_LISTVIEW to tagNMLISTVIEW, with
-	parallel chages to typedefs. Add defines for backward
-	compatability with old names.
-	(TCHITTESTINFO, IMAGELISTDRAWPARAMS): Fix _WIN32_IE guard.
-
-2002-01-21  Robert Collins  <rbtcollins@hotmail.com>
-
-	* include/winnt.h: Add missing MEM_ defines, and convert existing to 
-	hex for readability.
-
-2002-01-17  Marcus Geelnard  <marcus.geelnard@home.se>
-
-	* include/winsuser.h (tagKBDLLHOOKSTRUCT): Define struct
-	and typedefs.
-	(SPI_SETSCREENSAVERRUNNING): Add define.
-	(LLKHF_ALTDOWN): Add define.
-	* include/wingdi.h (PFD_GENERIC_ACCELERATED,
-	PFD_DEPTH_DONTCARE): Add defines.
-
-2002-01-17  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/objbase.h (CoGetObject): Add prototype.
-
-2002-01-14  Timothy J. Wood  <tjw@omnigroup.com>
-
-	* include/winuser.h (ENUM_CURRENT_SETTINGS,
-	ENUM_REGISTRY_SETTINGS): Add defines.
-
-2002-01-14  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (FILE_ATTRIBUTE_ENCRYPTED): Correct constant.
-	(FILE_ATTRIBUTE_DEVICE): Add define.
-
-2002-01-14  Corinna Vinschen  <vinschen@redhat.com>
-
-	* include/winnt.h: Add INVALID_FILE_ATTRIBUTES.
-
-2002-01-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* ChangeLog: correct date in last entry. 
-
-2002-01-11  Timothy J. Wood  <tjw@omnigroup.com>
-
-	* include/winuser.h (MONITORENUMPROC): Add typedef.
-	(EnumDisplayMonitors): Add prototype.
-	* lib/user32.def (EnumDisplayMonitors): Add stub.
-	
-2002-01-11 Ralf Habacker  <Ralf.Habacker@freenet.de>
-
-	* include/ntsecapi.h:  Fixed missing void parameter type in some 
-	prototypes.
-	* include/objbase.h: Ditto.
-	* include/rapi.h: Ditto.
-	* include/rpc.h: Ditto.
-	* include/rpcdce.h: Ditto.
-	* include/rpcdcep.h: Ditto.
-	* include/rpcndr.h: Ditto.
-	* include/rpcnsip.h: Ditto.
-	* include/rpcproxy.h: Ditto.
-	* include/windef.h: Ditto.
-
-2002-01-07  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/vfw32.def (LIBRARY): Change to MSVFW32.DLL.
-
-2002-01-04  TAMURA Kent  <tkent@users.sourceforge.net>
-
-	* include/wingdi.h (BI_JPEG, BI_PNG, GGO_BEZIER,GGO_UNHINTED,
-	 LAYOUT_RTL, LAYOUT_BITMAPORIENTATIONPRESERVED): Add defines.
-	* include/winuser.h (HWND_MESSAGE, WS_EX_COMPOSITED,
-	WS_EX_LAYERED, WS_EX_LAYOUTRTL, WS_EX_NOACTIVATE,
-	WS_EX_NOINHERITLAYOUT): Add defines.
-	* include/winnt.h (PF_RDTSC_INSTRUCTION_AVAILABLE,
-	PF_PAE_ENABLED, MEM_PHYSICAL, MEM_RESET, MEM_TOP_DOWN,
-	MEM_WRITE_WATCH): Add defines.
-
-
-2002-01-04  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (InitializeCriticalSectionAndSpinCount):
-	Add prototype.
-	(SetCriticalSectionSpinCount): Likewise.
-
-2001-12-30  Guido Serassio <serassio@libero.it>
-
-	* include/winsvc.h: Add EnumServiceStatusEx(),
-	QueryServiceStatusEx()
-	& RegisterServiceCtrlHandlerEx()
-  
-2001-12-21  Robert Collins  <rbtcollins@hotmail.com>
-
-	* include/wingdi.h: Add GetRandomRgn and SYSRGN.
-
-2001-12-20  Christopher Faylor  <cgf@redhat.com>
-
-	* lib/Makefile.in: Revert inst_installdir definitions to working
-	versions.
-
-2001-12-17  Guido Serassio <serassio@libero.it>
-
-	* include/winsvc.h: Add ChangeServiceConfig2() &
-	QueryServiceConfig2() definition
-	
-2001-12-17  Robert Collins  <rbtcollins@hotmail.com>
-
-	* include/commctrl.h: New typedefs for HDLAYOUT and LPHDLAYOUT based
-	on MSDN documentation for XP.
-	
-2001-12-15  Andrew Begel  <abegel@eecs.berkeley.edu>
-
-	*include/winbase.h (CreateHardLink): Correct typo in UNICODE
-	mappings.
-
-2001-12-11  Phillip Susi  <psusi@cfl.rr.com>
-
-	* include/commctrl.h (ACS_*): Add new defines.
-	(PGS_*): Ditto.
-	(CBES_*): Ditto.
-	(TBSTYLE_*): Ditto.
-	(TB_*): Ditto.
-	(TTS_*): Ditto.
-	(UDS_HOTTRACK): Add define.
-	(SBT_TOOLTIPS): Ditto.
-	(TBS_*): Add new defines.
-	(HDS_*): Ditto.
-	(LVS_EX_*) Ditto.
-	(LVKF_*): Ditto.
-	(TCM_GETEXTENDEDSTYLE): Add define.
-	(TVS_NOHSCROLL): Ditto.
-	(TVIF_INTEGRAL): Ditto.
-	(DTS_SHORTDATECENTURYFORMAT): Ditto.
-	(TCS_*): Add new defines.
-	(CBEM_*): Add defines.
-	(tagNMITEMACTIVATE): Add structure definition and typedefs.
-	(tagTVITEMEX[AW]: Ditto.
-	(tagTVINSERTSTRUCT[AW]: Add union member.
-	* include/winbase.h (VirtualAllocEx): Add prototype.
-	* include/winuser.h (SS_*): Add new defines.
-
-2001-12-07  Earnie Boyd  <earnie@users.sf.net>
-
-	* Makefile.in: Increment VERSION.
-	* include/w32api.h: Ditto.
-
-2001-12-07  Earnie Boyd  <earnie@users.sf.net>
-
-	* Makefile.in: Increment VERSION.
-	* include/w32api.h: Ditto.
-
-2001-12-07  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/setupi.h (SetupDiCreateDeviceInterfaceRegKey[AW],
-	SetupDiCreateDevRegKey[AW],SetupDiDeleteDeviceInterfaceRegKey,
-	SetupDiDeleteDevRegKey,SetupDiOpenClassRegKey,
-	SetupDiOpenClassRegKeyEx[AW],SetupDiOpenDeviceInterfaceRegKey,
-	SetupDiOpenDevRegKey): Correct function names.
-
-2001-12-04  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/winuser.h (IDC_STATIC): Don't define.
-
-2001-12-04  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	Cleanup merge between SourceForge and winsup CVS.
-	* include/winbase.h (OSVERSIONINFO[AW], OSVERSIONINFOEX[AW]: Remove 
-	definitions.
-	* include/winnt.h (VER_NT*): Remove duplicate defines.
-	(VER_SUITE*): Group with VER_PLATFORM*, VER_NT* defines.
-
-2001-12-03  Earnie Boyd  <earnie@users.sf.net>
-
-	* include/accctrl.h: Change \r\n to \n.
-
-2001-11-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/ipexport.h (IP_UNIDIRECTIONAL_ADAPTER_ADDRESS):
-	Add structure definition.
-	* include/iptypes.h (IP_PER_ADAPTER_INFO): Ditto.
-	* include/iphlpapi.h (AddIPAddress,CreateProxyArpEntry,
-	DeleteIPAddress,DeleteProxyArpEntry,EnableRouter,
-	FlushIpNetTable,GetAdapterIndex,GetPerAdapterInfo,
-	GetUniDirectionalAdapterInfo,SendARP,SetAdapterIpAddress,
-	UnenableRouter) Declare functions.
-	* lib/iphlpapi.def: Add function names to import lib.
-
-2001-11-24  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (PACCESS_MASK): Add typedef.
-	* include/aclapi.h: New file.
-	* include/acctrl.h: New file.
-	* lib/advapi32.def: Add missing symbols.
-	* lib/test.c: Add #include <aclapi.h>.
-
-2001-11-23  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (OSVERSIONINFO[AW],VER_PLATFORM_WIN32s,
-	VER_PLATFORM_WIN32_WINDOWS,VER_PLATFORM_WIN32_NT): Move from
-	here ...
-	* include/winnt.h: ... to here.
-	* include/winbase.h (VerifyVersionInfo[AW]): Add declaration.
-	* include/winnt.h (OSVERSIONINFOEX[AW]): Add structure definitions
-	and typedefs.
-	(VER_NT_WORKSTATION,VER_NT_DOMAIN_CONTROLLER,VER_NT_SERVER):
-	Add defines.
-
-2001-11-19  Pierre Muller  <muller@ics.u-strasbg.fr>
-
-	* w32api/include/winnt.h: prepare SSE register support.
-	(CONTEXT_EXTENDED_REGISTERS): Add new define.
-	(MAXIMUM_SUPPORTED_EXTENSION): New define.
-	(struct CONTEXT): ExtendedRegisters field added.
-
-2001-11-16  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (tagALTTABINFO, tagCOMBOBOXINFO, 
-	tagCURSORINFO, tagMENUBARINFO, tagMENUINFO, tagMONITORINFO
-	tagSCROLLBARINFO, tagTITLEBARINFO. tagWINDOWINFO,
-	tagLASTINPUTINFO ): Define new structures. 
-	(EndMenu, GetAltTabInfo[AW],GetComboBoxInfo,GetCursorInfo,
-	GetLastInputInfo, GetListBoxInfo, GetMenuBarInfo,
-	GetMonitorInfo[AW], GetScrollBarInfo, GetTitleBarInfo,
-	GetWindowInfo, GetWindowModuleFileName[AW],GetMenuInfo
-	SetMenuInfo): Add new prototypes.
-	* lib/user32.def: Add import stubs for above functions.
-
-	* include/winuser.h (IDC_STATIC): Protect against prior
-	definition.
-
-2001-11-12  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/winbase.h (OSVERSIONINFOEX): Add definition.
-	* include/winnt.h: Add VER_NT_* and VER_SUITE_* defines.
-
-2001-11-10  Robert Collins  <rbtcollins@hotmail.com>
-
-	* include/winnt.h: Add Danny Smith's text comment about gcc compiler 
-	warnings with _AUTHORITY #defines.
-
-2001-11-09  Robert Collins  <rbtcollins@hotmail.com>
-
-	* include/winnt.h (GetCurrentFiber): Create a prototype before the 
-	implementation;
-	(GetFiberData): Ditto.
-
-2001-11-09  Robert Collins  <rbtcollins@hotmail.com>
-
-	* include/winnt.h: Backout last change.
-
-2001-11-08  Robert Collins  <rbtcollins@hotmail.com>
-
-	* include/winnt.h: Define *_SID_AUTHORITY appropriately,
-	GetCurrentFiber: Create a prototype before the implementation;
-	GetFiberData: Ditto.
-
-2001-11-06  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (IDC_STATIC): Add define.
-	Thanks to: Benoit Laniel.
-
-2001-11-05  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commdlg.h: Include <unknwn.h> rather than local
-	definition of LPUKNOWN. 
-	* include/rpcproxy.h: Don't include if ndef CINTERFACE.
-	Emit warning.
-
-2001-11-05  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/windef.h (DECLSPEC_NORTEURN): Add an empty version
-	for Watcom.
-	(DECLARE_STDCALL_P): Use it to add __stdcall decoration for
-	functions of the form 'type * function(...)' in a way compatible
-	with both Watcom and GCC.
-	* include/rpcdcep.h (I_RpcAllocate): Use DECLARE_STDCALL_P.
-	* include/rpcproxy.h (CInterfaceProxyVtbl): Do not declare
-	zero-sized arrays for Watcom. Mark as __extension for __GNUC__.
-	* include/windows.h: Watcom can use anonymous structs/unions.
-	* include/winnt.h: Watcom can use 64 bit ints.
-	(GetCurrentFiber): Add another inline definition using
-	Watcom inline assembly syntax.
-	(GetFiberData): Likewise.
-	* include/winsock.h (inet_ntoa): Use DECLARE_STDCALL_P.
-	(gethostbyname): Likewise.
-	(gethostbyaddr}: Likewise.
-	(getservbyport}: Likewise.
-	(getservbyname}: Likewise.
-	(getprotobynumber}: Likewise.
-	(getprotobyname}: Likewise.
-	* include/winsock2.h (inet_ntoa): Use DECLARE_STDCALL_P.
-	(gethostbyname}: Likewise.
-	(gethostbyaddr}: Likewise.
-	(getservbyport}: Likewise.
-	(getservbyname}: Likewise.
-	(getprotobynumber}: Likewise.
-	(getprotobyname}: Likewise.
-	* lib/diinut.c: Correction for Watcom.
-	* lib/kernel32.c (GetCurrentFiber): Add another definition
-	using Watcom inline assembly syntax.
-	(GetFiberData): Likewise.
-	* lib/scrnsave.c (WinMain): Add break after default:
-	clause.
-
-2001-11-04  "stefan"  <stefan@lkcc.org>
-
-	* include/winnt.h (GetCurrentFiber): Add prototype.
-	(GetFiberData): Likewise.
-
-2001-11-04  Christopher Faylor  <cgf@redhat.com>
-
-	* lib/Makefile.in: Add .NOTPARALLEL target since dlltool cannot run in
-	parallel invocations.
-
-2001-11-03  Christopher Faylor  <cgf@redhat.com>
-
-	* lib/scrnsave.c (WinMain): Trivial change to avoid a compiler warning.
-
-2001-11-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/basetyps.h (DECLARE_INTERFACE): Don't add
-	__attribute__((com_interface)) for __GNUC__ >= 3. 
-
-2001-11-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commdlg.h (PRINTPAGERANGE): Add structure
-	definition.
-	(PRINTDLGEX[AW]): Likewise.
-	(PrintDlgEx[AW]): Add function declaration.
-	* lib/comdlg32.def (PrintDlgEx[AW]): Add function stubs.
-	* ChangeLog: Fix typo in last entry.
-
-2001-11-01  TAMURA Kent  <tkent@users.sourceforge.net>
-
-	* include/objbase.h (CoGetClassObject): Change third parameter
-	to COSERVERINFO*.
-
-2001-10-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (MOUSEEVENTF_WHEEL): Define.
-	Thanks to: Kim Saunders.
-	* include/oleauto.h: Define VARIANT* flags for VariantChangeType.
-	Thanks to: Pat Thoyts.
-	* include/winnt.h: Change C++ style comment to C style.
- 	* include/shlobj.h: Ditto.
-	* include/objbase.h (enum tagCOINIT): Remove comma at end of
-	list.
-	* include/oledlg.h (enum tagOLEUIPASTEFLAG): Ditto.
-	* include/oleidl.h (enum tagDROPEFFECT): Mark as __extension__
-	(enum not limited to range of int).
-	* include/oaidl.h (struct tagVARIANT): Mark as __extension__
-	(struct with no named members), ifndef NONAMELESSUNION. 
-
-2001-10-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (CREATESTRUCT): UNICODE it.
-	(CBT_CREATEWND): Likewise.
-
-2001-10-20  Corinna Vinschen  <corinna@vinschen.de>
-
-	* include/winnetwk.h (WNetGetResourceInformationA): Add declaration.
-	(WNetGetResourceInformationW): Ditto.
-	(WNetGetResourceInformation): Add define.
-
-2001-10-12  Pedro A Aranda  <paaguti@hotmail.com>
-
-	* include/winuser.h (POINTSTOPOINT): Use explicit casts
-	before extracting words.
-
-2001-10-04  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h: Add PF_* defines.
-	Thanks to: "Wizord"  <wizord@argoslabs.com>
-
-2001-09-18  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (_[U]LARGE_INTEGER): Mark nameless structure
-	field as _ANONYMOUS_STRUCT.
-	* include/setupapi.h (SP_DEVINSTALL_PARAMS): Add missing typedef
-	for UNICODE.
-	* include/ipexport.h (icmp_echo_reply): Remove extra ';'.
-	* lib/makefile.in: Add -pedantic switch to TEST_OPTIONS for header
-	test.
- 
-2001-09-17  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/commctrl.h: Add some ListView constants.
-
-2001-09-17  Earnie Boyd  <earnie@sf.net>
-
-	* lib/Makefile.in (inst_includedir): Add FIXME and remove the usr/
-	portion of the directory from the install.
-	(inst_libdir): Ditto.
-	* Makefile.in (VERSION): Increment.
-	* include/w32api.h: Increment version.
-
-2001-09-13  Earnie Boyd  <earnie@SF.net>
-
-	* lib/Makefile.in (inst_includedir): Change to always use w32api
-	subdirectory for target == cygwin.
-	(inst_libdir): Ditto.
-
-2001-09-13  Earnie Boyd  <earnie@SF.net>
-
-	* lib/Makefile.in (config_prefix): New variable.
-	(inst_includedir): Manipulate special value only if target == cygwin
-	and build == target and prefix != config_prefix.
-	(inst_libdir): Ditto.
-
-2001-09-12  Earnie Boyd  <earnie@SF.net>
-
-	* Makefile.in (TARFLAGS): New variable.
-	(TARFILEEXT): Ditto.
-
-2001-09-12  Earnie Boyd  <earnie@SF.net>
-
-	* Makefile.in: Increment version.
-	* include/w32api.h: Ditto.
-	* lib/Makefile.in: Add usr/ to install directory special for cygwin.
-
-2001-09-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
- 	* include/winnt.h (_[U]LARGE_INTEGER): Protect nameless struct with
-	!defined(NONAMELESSUNION), rather than defined(_ANONYMOUS_STRUCT).
-	(_REPARSE_DATA_BUFFER): Name union field DUMMYUNIONNAME.
-
-2001-09-05  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wininet.h (InternetAutodial): Add prototype. 
-	(InternetAutodialHangup): Ditto.
-	(InternetDial): Ditto.
-	(InternetGetConnectedState): Ditto.
-	(InternetGoOnline): Ditto.
-	(InternetHangUp): Ditto. 
-	(InternetSetDialState): Ditto.
-	Add associated INTERNET_* auto dial flags.
-	Guard typedefs and prototypes with #ifndef RC_INVOKED.
-
-2001-09-04  Earnie Boyd  <earnie@SF.Net>
-
-	* lib/Makefile.in: Move the setting of variable libdir to after the
-	setting of exec_prefix since the value of libdir is dependant on it.
-
-Tue Sep  4 14:15:59 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winbase.h: Add missing closing parentheses to
-	InterlockedExchangePointer declaration.
-
-2001-09-01  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/shlobj.h (CFSTR_* ): Add new defines.
-	Thanks to: "Ron" <ron@debian.org> . 
-	Unicode them.
-
-Sat Sep  1 10:40:37 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winnt.h: Use defined(_ANONYMOUS_STRUCT) to determine if
-	anonymous structs are available rather than just testing preprocessor
-	variable directly.
-
-Fri Aug 31 21:46:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/winnt.h: Change definition of `SYSTEM_LUID' to comply
-	with new `LARGE_INTEGER' definition.
- 
-Thu Aug 30 09:35:51 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winsock2.h: Remove "extra token" after #endif.
-
-2001-08-31  Earnie Boyd  <earnie@SF.Net>
-
-	* config.guess: Remove the \r from the end of line.
-	* config.sub: Ditto.
-
-2001-08-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h: Allow anonymous struct in [U]LARGE_INTEGER
-	if __cplusplus as well as if _ANONYMOUS_STRUCT.
-
-2001-08-29  Earnie Boyd  <earnie@SF.Net>
-
-	* config.guess: Add the MSYS system.
-	* config.sub: Ditto.
-	* include/winsock.h: Add the __INSIDE_MSYS__ protections.
-	* incldue/winsock2.h: Ditto.
-
-2001-08-29  Eric Kohl  <ekohl@users.sourceforge.net>
-
-	* include/winnt.h: Allow anonymous (Xxx.LowPart) or
-	non-anonymous (Xxx.u.LowPart) access to HighPart and
-	LowPart of a LARGE_INTEGER or ULARGE_INTEGER.
-
-2001-08-24  TAMURA Kent  <tkent@users.sourceforge.net>
-
-	* include/wingdi.h (HANGUL_CHARSET): Add define.
-
-2001-08-21  Earnie Boyd  <earnie@SF.Net>
-
-	* include/setupapi.h: Formatting.
-
-2001-08-21  Earnie Boyd  <earnie@SF.Net>
-
-	* include/shlobj.h: Remove \r from the line endings.
-
-2001-08-21  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/setupapi.h : New file.
-	* lib/setupapi.def:New file.
-	* lib/test.c: Include setupapi.h.
-
-2001-08-21  Danny Smith  <dannysmith@users.sourceforge.net>
-	* include/winioctl.h (_DISK_PERFORMANCE): Correct typo.
-
-2001-08-21  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/richedit.h (ENLINK): Add structure definition.
-	(EM_AUTOURLDETECT, EN_LINK, ENM_LINK): Add defines.
-
-2001-08-21  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/shlobj.h (CMIC_*): Remove duplicate defines.
-	(CMDSTR_*): Remove duplicates; UNICODE string constants.
-	(GCS_*): Make UNICODE.
-	(CSIDL_*): Add more defines.
-	* include/winioctl.h (_MEDIA_TYPE): Add pointer typedef.
-	(_DISK_GEOMETRY): Ditto.
-	(_DISK_PERFORMANCE): Ditto.
-	* include/winbase.h (HasOverlappedIoCompleted): Add macro.
-
-2001-08-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h: Move CHAR, SHORT and LONG typedefs outside
-	of block protected by #ifndef VOID.
-	(This reverts 1998-12-01 Anders Norlander change.)
-	* include/odbcinst.h: End file with newline.
-	* include/raserror.h: Ditto.	
-
-2001-08-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winsock2.h (#include <wtypes.h): Don't.
-	(_BLOB): Define instead, if not already done.
-	(__BLOB_T_DEFINED: New define for guarding _BLOB.
-	* include/wtypes.h (_BLOB): Guard against prior definition. 
-
-2001-08-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/oaidl.h (tagVARIANT): Mark anonymous structs and unions
-	 as 	__extension__.
-	(tagTYPEDESC): Ditto.
-	(_wireBRECORD): Add structure definition.
-	(_wireSAFEARR_BRECORD): Ditto.
-	(_wireSAFEARR_HAVEIID): Ditto.
-	(_wireSAFEARRAY_UNION.u): Add fields SAFEARR_BRECORD RecordStr,
-	SAFEARR_HAVEIID HaveIidStr.
-	(tagVariant): Add fields _VARIANT_BOOL bool,*pbool. 
-	(_wireVARIANT): Change field parray to type wirePSAFEARRAY,
-	pparray to wirePSAFEARRAY*.
-	(_wireVARIANT): Add field wireBRECORD brecVal.
-	(wireVARIANT): Change typedef to struct _wireVariant*.
-	(IRecordInfo): Add interface definition.
-	(LPRECORDINFO): Add typedef for IRecordInfo*.
-	(IID_IRecordInfo): Add forward decalaration.
-
-2001-08-15  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/lmcons.h: Guard CNLEN and UNCLEN against prior definition.
-	* include/nddeapi.h: Likewise.
-
-2001-08-10  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/test.c (Win32_Winsock): Replace with __USE_W32_SOCKETS.
-	Add more includes of w32api headers.
-
-2001-08-10  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winnt.h (GetCurrentFiber): Change __inline to __inline__.
-	Swap asm code with that of GetFiberData.
-	(GetFiberData): Ditto.
-	* lib/kernel32.c: New file, containing library versions of
-	GetCurrentFiber and GetFiberData.
-	* lib/makefile.in: Add kernel32.o as static object to libkernal32.a.
-
-2001-08-08  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (GET_WHEEL_DELTA_WPARAM): Add macro.
-	Thanks to: Harold Hunt <Harold@compasstechnologies.com>.
-
-2001-08-08  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/oleaut32.def: Regenerate.
-
-2001-08-04  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wtypes.h (DECIMAL_SETZERO): Correct typo.
-
-2001-08-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	Apply Dmitry Bely  <dbely@mail.ru> patch 437834 (with additions).
- 	* include/oleidl.h (ISupportErrorInfo, ICreateInfo): Move from here
-	* include/oaidl.h: ... to here.
-	* include/oaidl.h ICreateErrorInfo): Add interface definition.
-	(IErrorInfo::GetGUID): Change arg to GUID.
-	(LPSUPPORTERRORINFO): Add typedef.
-	(IID_ISupportErrorInfo): Change forward decl. of type to IID.
-
-2001-08-02  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winsock2.h (WSAGET* and WSAMAKE*): Remove duplicate
-	defines.
-
-2001-07-30  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h (TreeView_SetIndent): Correct typo.
-
-2001-07-30  Danny Smith  <dannysmith@users.sourceforge.net>
- 
-	* include/commctrl.h (TBSTYPE_FLAT): Remove define.
-	Thanks to: Jason Craig  <jacraig@softhome.net>
-
-2001-07-30  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/commctrl.h (TBBUTTONINFO[AW]): Add struct definitions,
-	and UNICODE mappings, if _WIN32_IE >= 0x400.
-	(TBIF_* and TB_SETBUTTONINFO): Add defines, if _WIN32_IE >= 0x400.
-	(CDIS_*,CDDS_*,CDRF_*) : Add defines.
-	(tagNMCUSTOMDRAWINFO): Add struct definition and typedefs.
-	(tagNMLVCUSTOMDRAW): Likewise.
-	(tagNMTVCUSTOMDRAW): Likewise.
-	(tagNMLVCACHEHINT): Likewise.
-	
-2001-07-06  Danny Smith  <dannysmith@users.sourceforge.net>
- 
-	* include/basetsd.h (#include <_mingw.h>): Remove.
-	(__int64): Define.
-
-2001-06-28  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/wingdi.h (AC_SRC_OVER): Add define.
-	(struct _BLENDFUNCTION): Add.
-
-2001-06-28  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/shlobj.h:  Add BIF_* defines.
-
-2001-06-27  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winerror.h (E_PENDING): Add error code define.
-
-2001-06-27  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/basetsd.h (#include <_mingw.h>): Add directive.
-
-2001-06-25  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/winbase.h (InterlockedCompareExchange): Change args
-	and return value from PVOID to LONG.
-	(InterlockedExchange): Change first arg to LPLONG.
-	(InterlockedCompareExchangePointer): New macro.
-	(InterlockedExchangePointer): New macro.
-
-2001-06-19  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* lib/kernel32.def: Add LanguageGroup and UILanguage symbols.
-	Thanks to Kevin Chase <kevincha99@hotmail.com>. 
-
-2001.06.11  TAMURA Kent  <tkent@users.sourceforge.net>
-
-	* objidl.h (IMalloc::ReAlloc()): Correct declaration.
-	(IMalloc::Free()): Ditto.
-
-2001-06-11  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/shlobj.h (REGSTR_PATH_EXPLORER): Unicode it. 
-	(REGSTR_PATH_SPECIAL_FOLDERS): Ditto.
-	* include/regstr.h (REGSTR_PATH_EXPLORER): Add #ifndef guard. 
-
-2001-06-11  Mattia Barbon  <mbarbon@dsi.unive.it>
-
-	* include/shlobj.h (struct _browseinfo): UNICODE it.
-	(SHBrowseForFolder): Ditto.
-	(SHGetPathFromIDList): Ditto.
-
-2001.06.11  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/basetsd.h: RC_INVOKED protection and realignment.
-	Thanks to: Colin Peters <colinpeters@users.sourceforge.net>
-
-2001.06.06  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* Makefile.in (bindist): Reassign value of exec_prefix on make command
-	line. 
-
-Tue May 22 18:58:27 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* lib/mapi32.def: Add MAPISendMail.
-
-2001-05-22  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/w32api.h: Update version.
-	* Makefile.in: Ditto.
-
-Thu May 17 23:12:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/winnt.h: Define SE_GROUP_LOGON_ID as unsigned to avoid
-	compiler warnings.
-
-Thu May 17 17:12:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/ntdef.h: Protect definition of OBJECT_ATTRIBUTES against
-	previous definition in include/ntsecapi.h.
-	* include/ntsecapi.h: Vice versa.
-
-Wed May 16 17:59:00 2001  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/winnt.h: Add defines for group attributes.
-	Add define for SYSTEM_LUID.
-	Add missing types `PTOKEN_DEFAULT_DACL', `PTOKEN_OWNER' and
-	`PTOKEN_PRIMARY_GROUP'.
-
-Tue Apr 24 23:51:07 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* lib/Makefile.in: Install libraries in /usr/lib/w32api when building
-	for cygwin.
-
-Tue Apr 24 16:18:42 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winsock2.h: Protect one *more* newlib defines when compiling
-	cygwin.
-
-Mon Apr 23 23:41:36 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winsock2.h: Protect some more newlib defines when compiling
-	cygwin.
-
-Mon Apr 23 13:17:32 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winsock.h: Protect some more newlib defines when compiling
-	cygwin.
-
-2001-04-17  Egor Duda  <deo@logos-m.ru>
-
-	* include/windows.h: Define _ANONYMOUS_STRUCT and _ANONYMOUS_UNION
-	as __extenstion__ when appropriate.
-	* include/mmsystem.h: Mark anonymous structs and unions as
-	__extension__ to prevent compiler warning when invoked with
-	-pedantic
-	* include/oaidl.h: Ditto.
-	* include/objidl.h: Ditto.
-	* include/olectl.h: Ditto.
-	* include/prsht.h: Ditto.
-	* include/shlobj.h: Ditto.
-	* include/winbase.h: Ditto.
-	* include/winnt.h: Ditto.
-	* include/wtypes.h: Ditto.
-
-2001-04-11  Danny Smith  <dannysmith@users.sourceforge.net>
-
-	* include/windows.h (#include <winsock.h>): Include <winsock2.h>
-	instead if (_WIN32_WINNT >= 0x0400)&&(__W32API_MAJOR_VERSION > 0).
- 
-2001-04-11  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-
-	* include/winuser.h (WM_IME_*): Remove defines (now in imm.h).
-
-2001-04-11  John Fortin  <fortinj@attglobal.net>
-
-	* include/windef.h (*PBOOL): Unprotect from XFree86Server.
-	(*LPBOOL): Ditto.
-
-Sun Apr  8 20:48:01 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winnt.h (GetCurrentFiber): Make "external __inline" or asm
-	code will be included in every module which includes this header.
-	(GetFiberData): Ditto.
-
-2001-04-08  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/winnt.h (GetCurrentFiber): Fix typo.
-
-2001-04-08  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/shellapi.h: (CommandLineToArgvW): Add WINAPI declaration.
-	* include/winbase.h: (GetFileAttributesExW): Fix typo.
-	* include/wingdi.h: (StartDocA): Change LPDOCINFOA to DOCINFOA*.
-	(StartDocB): Chage LNPDOCINFOB to DOCINFOB*.
-	Thanks To: Kent Tamura  <tkent@users.sourceforge.net>
-
-	* include/winnt.h: (GetFiberData): Add __inline assembler coding.
-	(GetCurrentFiber): Ditto.
-	Thanks to: Andy Younger  <AndyY@redlemon.com>
-
-	* include/windef.h: (HMONITOR_DECLARED): New definition to stop
-	DirectX 8 from complaining.
-	Thanks to: Sigbj�rn Lund Olsen  <mosikos@online.no>
-
-2001-04-08  Michael Soderstrom <ichaelsoderstro@hotmail.com>
-
-	* include/commctrl.h Updated TreeView and ListView defines and macros.
-
-2001-04-08  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/winuser.h (MB_SERVICE_NOTIFICATION): Correct value for NT4
-	and above.
-
-2001-03-30  Earnie Boyd  <earnie@users.sourceforge.net>
-	* include/winuser.h (VK_KANA): New definition.
-	Thanks to: "Harold Hunt" <huntharo@msu.edu>
-
-2001-03-29  Earnie Boyd  <earnie@users.sourceforge.net
-
-	* include/winuser.h (RT_CURSOR): Add protection for XFree86Server.
-	(RT_FONT): Ditto.
-	* include/basetsd.h (INT32): Ditto.
-	* include/windef.h (ATOM): Ditto.
-	(BOOL): Ditto.
-	(BYTE): Ditto.
-	* include/winbase.h (FreeResource): Ditto.
-	Thanks to: "Harold Hunt" <huntharo@msu.edu>
-
-2001-03-20  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/winsock.h (_SYS_TYPES_H macro guard for int types): Remove;
-	use only _BSDTYPES_DEFINED macro now defined in newlib sys/types.h.
-	(SYS_TYPES_H macro guard for fd_set): Replace with_SYS_TYPES_FD_SET
-	macro now defined in newlib sys/types.h.  Emit warning if defined.
-	* include/winsock2.h: Ditto.
-	* include/windows.h (Win32_Winsock): Replace with new macros
-	__USE_W32_SOCKETS and warn of deprecation.
-
-2001-03-13  Earnie Boyd  <earnie@users.sourceforge.net
-
-	* include/wingdi.h: (DOCINFO) Ansi version defined incorrectly.
-	Thanks to: Mattia Barbon <mbarbon@dsi.unive.it>
-
-2001-03-12  Earnie Boyd  <earnie@users.sourceforge.net
-
-	* include/commctrl.h (TBSTYLE_FLAT): New definition.
-	(TB_GETBUTTONSIZE): Ditto.
-	(TCS_HOTTRACK): Ditto.
-	Thanks to: Chris Hansen <popeofpop@softhome.net>
-
-2001-03-01  Earnie Boyd  <earnie@users.sourceforge.net
-
-	* Makefile.in: (snapshot): Add target.
-	* lib/Makefile.in: (install-headers): Use installdir variable.
-	(installdir): Set value based on target-alias.
-
-2001-02-21  Earnie Boyd  <earnie@users.sourceforge.net
-
-	* include/w32api.h: (_W32API_VERSION): Remove.
-	(__W32API_VERSION): Add.
-	(__W32API_MAJOR_VERSION): Ditto.
-	(__W32API_MINOR_VERSION): Ditto.
-
-2001-02-21  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/wingdi.h (struct _DOCINFO[AW]): UNICODE it.
-	(StartDoc[AW]): Use UNICODE'd LPDOCINFO[AW] 
-	* include/winuser.h (struct tagMOUSEKEYS): Define new structure.
-	* include/winerror.h (NTE_*): Add CryptoAPI error codes. 
-
-2001-02-21  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/mswsock.h: New file.
-	* include/ws2tcpip.h: New file.
-	* include/winsock.h (IPPROTO_IGMP): New define.
-	(IPPROTO_GGP): Correct value.
-	(SO_* macros): Remove mswsock defines.
-	(TCP_BSDURGENT): Likewise.
-	(IP_* macros): Add comment warning of WinSock2 incompatibility
-	(WSARecvEx): Remove mswsock prototype.
-	(TransmitFile): Likewise.
-	(AcceptEx): Likewise.
-	(GetAcceptExSockaddrs): Likewise.
-	(struct _TRANSMIT_FILE_BUFFERS): Remove mswsock definition.
-	(#include <mswsock.h>): Add directive and explanatory comment
-	* include/winsock2.h (header guard): add guard for  _WINSOCK_H 
-	(_WINSOCK_H): Define to prevent later inclusion of winsock.h
-	(#include <winsock.h>): Replace directive with winsock.h file content
-	The following changes apply to the merged file: 
-	(FD_SET): Keep winsock2.h definition, delete winsock.h definition
-	(SOMAXCONN): Likewise
-	(#include <nspapi.h>): Move - don't include until LPSOCKADDR defined
-	(IP_* macros): Delete WinSock1 definitions (WinSock2 definitions now 
-	in ws2tcpip.h)
-	(struct ip_mreq): Delete (now defined in ws2tcpip.h for WinSock2)
-	(FD_*_BIT and FD_* defines): Place together and extend to 
-	FD_MAX_EVENTS 10
-	(AF* defines): Extend to AF_MAX 10
-	(WSAIsBlocking): #if 0 out prototype (N/A in WinSock2)
-	(WSAUnhookBlockingHook): Likewise.
-	(WSASetBlockingHook): Likewise.
-	(WSACancelBlockingCall): Likewise.
-	(WSAEINPROGRESS): Comment as not raised in WinSock2.
-	(#include <mswsock.h>): Delete directive inherited from winsock.h
-	(WSA_QOS* defines): Add QualityOfService error codes.
-	(SIO_* defines): Add new macros
-	* include/ipexport.h (IP_STATUS flags): Add definitions.
-	(IP_FLAG_DF): Likewise.
-	(IP_OPT_* ): Likewise.
-	(struct ip_option_information): Likewise.
-	(struct icmp_echo_reply): Likewise.
-
-2001-02-21  Danny Smith <dannysmith@users.sourceforge.net>
-
-	* include/commctrl.h: Revert TEXT change.
-	* include/lmalert.h: Ditto.
-	* include/lmcons.h: Ditto.
-	* include/lmsname.h: Ditto.
-	* include/lmsvc.h: Ditto.
-	* include/ntsecapi.h: Ditto.
-	* include/oledlg.h: Ditto.
-	* include/ras.h: Ditto.
-	* include/regstr.h: Ditto.
-	* include/richedit.h: Ditto.
-	* include/wininet.h: Ditto.
-	* include/winnt.h: Ditto.
-
-2001-02-15  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/commctrl.h: Use _TEXT() instead of TEXT() throughout.
-	* include/lmalert.h: Ditto.
-	* include/lmcons.h: Ditto.
-	* include/lmsname.h: Ditto.
-	* include/lmsvc.h: Ditto.
-	* include/ntsecapi.h: Ditto.
-	* include/oledlg.h: Ditto.
-	* include/ras.h: Ditto.
-	* include/regstr.h: Ditto.
-	* include/richedit.h: Ditto.
-	* include/wininet.h: Ditto.
-	* include/w32api.h: New File.
-
-Tue Feb 13 22:38:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/shlobj.h: Add missing SLR_* flags.
-
-2001-02-12:  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* lib/Makefile.in: (host_alias): Add variable.
-	(host_build): Ditto:
-	(xinstall): Removed
-	(xinstall-libraries): Ditto.
-	(xinstall-headers): Ditto.
-	(xuninstall): Ditto.
-	(xuninstall-libraries): Ditto.
-	(xuninstall-headers): Ditto.
-	* Makefile.in: (host_alias): Add variable.
-	(build_alias): Ditto.
-
-Fri Feb  2 13:08:09  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/winnt.h: (__TEXT): Add private macro.
-	(_TEXT): Modify definition to use __TEXT.
-	(_T): Ditto.
-	This change allows the passing of a MACRO as an argument and have that
-	MACRO resolved first.
-	Thanks to: Eric PAIRE <eric.paire@ri.silicomp.com>
-
-Wed Jan 31 17:35:59  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* Makefile.in: Increment VERSION to 0.5
-	* include/winnt.h: Change TEXT to _TEXT throughout.
-	(SID_RELEASE): Define.
-	Thanks to: Eric PAIRE <eric.paire@ri.silicomp.com>
-
-Tue Jan 30 10:42:28  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* Apply Phil Krylov patches.
-	2001-01-19  Phil Krylov  <phil@mail.ru>
-	* include/commctrl.h: (HDI_IMAGE) New definition.
-	(HDI_DI_SETITEM) Ditto.
-	(HDI_ORDER) Ditto.
-	(HDI_FILTER) Ditto.
-	(HDF_BITMAP_ON_RIGHT) Ditto.
-	(HDF_IMAGE) Ditto.
-	(HDM_SETORDERARRAY) Ditto.
-	(Header_SetOrderArray) Ditto.
-	(ICC_BAR_CLASSES) Ditto.
-	(struct _HD_ITEMA) Change definition.
-	(struct _HD_ITEMW) Ditto.
-	(struct tagINITCOMMONCONTROLSEX) Enclose in _WIN32_IE braces.
-	(InitCommonControlsEx()) Ditto.
-	2001-01-23  Phil Krylov  <phil@mail.ru>
-	* include/richedit.h: Many Richedit 2.0 definitions.
-
-Tue Jan 30 09:56:50  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/winuser.h: (IDC_HAND)  New resource identifier.
-	Thanks to: Mark Jordon <mark_jordan@ieee.org>
-
-Tue Jan 30 09:35:30  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/iptypes.h: Include <sys/types.h> for time_t declaration.
-	Fix typo's.
-
-Tue Jan 30 08:30:33  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/objidl.h: (GetClassID): Argument needs to be a pointer.
-	(GetUnmarshalClass): CLSID argument needs to be a pointer.
-	Thanks To: <bge@users.sourceforge.net>
-
-Tue Jan 30 07:52:54  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* Apply Danny Smith patch 102386
-	2000-11-15  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	* lib/rasapi32.def: add symbols available in NT4 and W2k
-
-Sun Jan 28 12:47:31  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* Apply Danny Smith patch 102382
-	2000-11-15  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	* lib/mswsock.def: remove leading underscores from symbol names
-
-Sun Jan 28 11:16:39  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* Apply Danny Smith patch 102446
-	2000-11-20  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	* include/sql.h (ODBCVER): change default to 0x0351.
-	(SQLSetScrollOptions): non-core function, move prototype to sqlext.h.
-	(SQLColAttributes): likewise.
-	(SQLBindParam): add prototype for ODBC 3.x function.
-	(SQLCloseCursor): likewise.
-	(SQLColAttribute): likewise.
-	(SQLCopyDesc):likewise.
-	(SQLEndTran): likewise.
-	(SQLFetchScroll): likewise.
-	(SQLGetConnectAttr): likewise.
-	(SQLGetDescField): likewise.
-	(SQLGetDescRec): likewise.
-	(SQLGetDiagField): likewise.
-	(SQLGetDiagRec): likewise.
-	(SQLGetEnvAttr): likewise.
-	(SQLGetStmtAttr): likewise.
-	(SQLSetConnectAttr): likewise.
-	(SQLSetDescField):likewise.
-	(SQLSetDescRec): likewise.
-	(SQLSetEnvAttr): likewise.
-	(SQLSetStmtAttr): likewise.
-	(SQLINTENGER and SQLUINTEGER): replace with SQLLEN and SQLULEN for 
-	_WIN64 compatability; 
-	(SQL_ACCESS_MODE): Move define to sqlext.h (used in non-core functions).
-	(SQL_ACTIVE_CONNECTIONS): likewise.
-	(SQL_ACTIVE_STATEMENTS): likewise.
-	(SQL_ALL_EXCEPT_LIKE): likewise.
-	(SQL_API_ALL_FUNCTIONS): likewise.
-	(SQL_API_LOADBYORDINAL): likewise.
-	(SQL_API_SQLBINDPARAMETER): likewise.
-	(SQL_API_SQLBROWSECONNECT): likewise.
-	(SQL_API_SQLCOLATTRIBUTES): likewise.
-	(SQL_API_SQLCOLUMNPRIVILEGES): likewise.
-	(SQL_API_SQLDESCRIBEPARAM): likewise.
-	(SQL_API_SQLDRIVERCONNECT): likewise.
-	(SQL_API_SQLDRIVERS): likewise.
-	(SQL_API_SQLEXTENDEDFETCH): likewise.
-	(SQL_API_SQLFOREIGNKEYS): likewise.
-	(SQL_API_SQLMORERESULTS): likewise.
-	(SQL_API_SQLNATIVESQL): likewise.
-	(SQL_API_SQLNUMPARAMS): likewise.
-	(SQL_API_SQLPARAMOPTIONS): likewise.
-	(SQL_API_SQLPRIMARYKEYS): likewise.
-	(SQL_API_SQLPROCEDURECOLUMNS): likewise.
-	(SQL_API_SQLPROCEDURES): likewise.
-	(SQL_API_SQLSETPOS): likewise.
-	(SQL_API_SQLSETSCROLLOPTIONS): likewise.
-	(SQL_API_SQLTABLEPRIVILEGES): likewise.
-	(SQL_ASYNC_ENABLE): likewise.
-	(SQL_ASYNC_ENABLE_DEFAULT): likewise.
-	(SQL_ASYNC_ENABLE_OFF): likewise.
-	(SQL_ASYNC_ENABLE_ON): likewise.
-	(SQL_ATTR_READONLY): likewise.
-	(SQL_ATTR_READWRITE_UNKNOWN): likewise.
-	(SQL_ATTR_WRITE): likewise.
-	(SQL_AUTOCOMMIT): likewise.
-	(SQL_AUTOCOMMIT_DEFAULT): likewise.
-	(SQL_AUTOCOMMIT_OFF): likewise.
-	(SQL_AUTOCOMMIT_ON): likewise.
-	(SQL_BEST_ROWID): likewise.
-	(SQL_BIGINT): likewise.
-	(SQL_BINARY): likewise.
-	(SQL_BIND_BY_COLUMN): likewise.
-	(SQL_BIND_TYPE): likewise.
-	(SQL_BIND_TYPE_DEFAULT): likewise.
-	(SQL_BIT): likewise.
-	(SQL_BOOKMARK_PERSISTENCE): likewise.
-	(SQL_BP_CLOSE): likewise.
-	(SQL_BP_DELETE): likewise.
-	(SQL_BP_DROP): likewise.
-	(SQL_BP_OTHER_HSTMT): likewise.
-	(SQL_BP_SCROLL): likewise.
-	(SQL_BP_TRANSACTION): likewise.
-	(SQL_BP_UPDATE): likewise.
-	(SQL_C_BINARY): likewise.
-	(SQL_C_BIT): likewise.
-	(SQL_C_BOOKMARK): likewise.
-	(SQL_C_CHAR): likewise.
-	(SQL_C_DATE): likewise.
-	(SQL_C_DEFAULT): likewise.
-	(SQL_C_DOUBLE): likewise.
-	(SQL_C_FLOAT): likewise.
-	(SQL_C_LONG): likewise.
-	(SQL_C_SHORT): likewise.
-	(SQL_C_SLONG): likewise.
-	(SQL_C_SSHORT): likewise.
-	(SQL_C_STINYINT): likewise.
-	(SQL_C_TIME): likewise.
-	(SQL_C_TIMESTAMP): likewise.
-	(SQL_C_TINYINT): likewise.
-	(SQL_C_ULONG): likewise.
-	(SQL_C_USHORT): likewise.
-	(SQL_C_UTINYINT): likewise.
-	(SQL_CB_NON_NULL): likewise.
-	(SQL_CB_NULL): likewise.
-	(SQL_CC_CLOSE): likewise.
-	(SQL_CC_DELETE): likewise.
-	(SQL_CC_PRESERVE): likewise.
-	(SQL_CN_ANY): likewise.
-	(SQL_CN_DIFFERENT): likewise.
-	(SQL_CN_NONE): likewise.
-	(SQL_COLATT_OPT_MAX): likewise.
-	(SQL_COLATT_OPT_MIN): likewise.
-	(SQL_COLUMN_ALIAS): likewise.
-	(SQL_COLUMN_AUTO_INCREMENT): likewise.
-	(SQL_COLUMN_CASE_SENSITIVE): likewise.
-	(SQL_COLUMN_COUNT): likewise.
-	(SQL_COLUMN_DISPLAY_SIZE): likewise.
-	(SQL_COLUMN_DRIVER_START): likewise.
-	(SQL_COLUMN_LABEL): likewise.
-	(SQL_COLUMN_LENGTH): likewise.
-	(SQL_COLUMN_MONEY): likewise.
-	(SQL_COLUMN_NAME): likewise.
-	(SQL_COLUMN_NULLABLE): likewise.
-	(SQL_COLUMN_OWNER_NAME): likewise.
-	(SQL_COLUMN_PRECISION): likewise.
-	(SQL_COLUMN_QUALIFIER_NAME): likewise.
-	(SQL_COLUMN_SCALE): likewise.
-	(SQL_COLUMN_SEARCHABLE): likewise.
-	(SQL_COLUMN_TABLE_NAME): likewise.
-	(SQL_COLUMN_TYPE): likewise.
-	(SQL_COLUMN_TYPE_NAME): likewise.
-	(SQL_COLUMN_UNSIGNED): likewise.
-	(SQL_COLUMN_UPDATABLE): likewise.
-	(SQL_CONCAT_NULL_BEHAVIOR): likewise.
-	(SQL_CONCUR_DEFAULT): likewise.
-	(SQL_CONCUR_LOCK): likewise.
-	(SQL_CONCUR_READ_ONLY): likewise.
-	(SQL_CONCUR_ROWVER): likewise.
-	(SQL_CONCUR_TIMESTAMP): likewise.
-	(SQL_CONCUR_VALUES): likewise.
-	(SQL_CONCURRENCY): likewise.
-	(SQL_CONN_OPT_MAX): likewise.
-	(SQL_CONN_OPT_MIN): likewise.
-	(SQL_CONNECT_OPT_DRVR_START): likewise.
-	(SQL_CONVERT_BIGINT): likewise.
-	(SQL_CONVERT_BINARY): likewise.
-	(SQL_CONVERT_BIT): likewise.
-	(SQL_CONVERT_CHAR): likewise.
-	(SQL_CONVERT_DATE): likewise.
-	(SQL_CONVERT_DECIMAL): likewise.
-	(SQL_CONVERT_DOUBLE): likewise.
-	(SQL_CONVERT_FLOAT): likewise.
-	(SQL_CONVERT_FUNCTIONS): likewise.
-	(SQL_CONVERT_INTEGER): likewise.
-	(SQL_CONVERT_LONGVARBINARY): likewise.
-	(SQL_CONVERT_LONGVARCHAR): likewise.
-	(SQL_CONVERT_NUMERIC): likewise.
-	(SQL_CONVERT_REAL): likewise.
-	(SQL_CONVERT_SMALLINT): likewise.
-	(SQL_CONVERT_TIME): likewise.
-	(SQL_CONVERT_TIMESTAMP): likewise.
-	(SQL_CONVERT_TINYINT): likewise.
-	(SQL_CONVERT_VARBINARY): likewise.
-	(SQL_CONVERT_VARCHAR): likewise.
-	(SQL_CORRELATION_NAME): likewise.
-	(SQL_CR_CLOSE): likewise.
-	(SQL_CR_DELETE): likewise.
-	(SQL_CR_PRESERVE): likewise.
-	(SQL_CUR_DEFAULT): likewise.
-	(SQL_CUR_USE_DRIVER): likewise.
-	(SQL_CUR_USE_IF_NEEDED): likewise.
-	(SQL_CUR_USE_ODBC): likewise.
-	(SQL_CURRENT_QUALIFIER): likewise.
-	(SQL_CURSOR_DYNAMIC): likewise.
-	(SQL_CURSOR_FORWARD_ONLY): likewise.
-	(SQL_CURSOR_KEYSET_DRIVEN): likewise.
-	(SQL_CURSOR_ROLLBACK_BEHAVIOR): likewise.
-	(SQL_CURSOR_STATIC): likewise.
-	(SQL_CURSOR_TYPE): likewise.
-	(SQL_CURSOR_TYPE_DEFAULT): likewise.
-	(SQL_CVT_BIGINT): likewise.
-	(SQL_CVT_BINARY): likewise.
-	(SQL_CVT_BIT): likewise.
-	(SQL_CVT_CHAR): likewise.
-	(SQL_CVT_DATE): likewise.
-	(SQL_CVT_DECIMAL): likewise.
-	(SQL_CVT_DOUBLE): likewise.
-	(SQL_CVT_FLOAT): likewise.
-	(SQL_CVT_INTEGER): likewise.
-	(SQL_CVT_LONGVARBINARY): likewise.
-	(SQL_CVT_LONGVARCHAR): likewise.
-	(SQL_CVT_NUMERIC): likewise.
-	(SQL_CVT_REAL): likewise.
-	(SQL_CVT_SMALLINT): likewise.
-	(SQL_CVT_TIME): likewise.
-	(SQL_CVT_TIMESTAMP): likewise.
-	(SQL_CVT_TINYINT): likewise.
-	(SQL_CVT_VARBINARY): likewise.
-	(SQL_CVT_VARCHAR): likewise.
-	(SQL_DATABASE_NAME): likewise.
-	(SQL_DATE): likewise.
-	(SQL_DRIVER_HDBC): likewise.
-	(SQL_DRIVER_HENV): likewise.
-	(SQL_DRIVER_HLIB): likewise.
-	(SQL_DRIVER_HSTMT): likewise.
-	(SQL_DRIVER_NAME): likewise.
-	(SQL_DRIVER_ODBC_VER): likewise.
-	(SQL_DRIVER_VER): likewise.
-	(SQL_ENSURE): likewise.
-	(SQL_EXPRESSIONS_IN_ORDERBY): likewise.
-	(SQL_EXT_API_LAST): likewise.
-	(SQL_EXT_API_START): likewise.
-	(SQL_FD_FETCH_BOOKMARK): likewise.
-	(SQL_FD_FETCH_PREV): likewise.
-	(SQL_FD_FETCH_RESUME): likewise.
-	(SQL_FETCH_PREV): likewise.
-	(SQL_FETCH_RESUME): likewise.
-	(SQL_FILE_NOT_SUPPORTED): likewise.
-	(SQL_FILE_QUALIFIER): likewise.
-	(SQL_FILE_TABLE): likewise.
-	(SQL_FILE_USAGE): likewise.
-	(SQL_FN_CVT_CONVERT): likewise.
-	(SQL_FN_NUM_ABS): likewise.
-	(SQL_FN_NUM_ACOS): likewise.
-	(SQL_FN_NUM_ASIN): likewise.
-	(SQL_FN_NUM_ATAN): likewise.
-	(SQL_FN_NUM_ATAN2): likewise.
-	(SQL_FN_NUM_CEILING): likewise.
-	(SQL_FN_NUM_COS): likewise.
-	(SQL_FN_NUM_COT): likewise.
-	(SQL_FN_NUM_DEGREES): likewise.
-	(SQL_FN_NUM_EXP): likewise.
-	(SQL_FN_NUM_FLOOR): likewise.
-	(SQL_FN_NUM_LOG): likewise.
-	(SQL_FN_NUM_LOG10): likewise.
-	(SQL_FN_NUM_MOD): likewise.
-	(SQL_FN_NUM_PI): likewise.
-	(SQL_FN_NUM_POWER): likewise.
-	(SQL_FN_NUM_RADIANS): likewise.
-	(SQL_FN_NUM_RAND): likewise.
-	(SQL_FN_NUM_ROUND): likewise.
-	(SQL_FN_NUM_SIGN): likewise.
-	(SQL_FN_NUM_SIN): likewise.
-	(SQL_FN_NUM_SQRT): likewise.
-	(SQL_FN_NUM_TAN): likewise.
-	(SQL_FN_NUM_TRUNCATE): likewise.
-	(SQL_FN_STR_ASCII): likewise.
-	(SQL_FN_STR_CHAR): likewise.
-	(SQL_FN_STR_CONCAT): likewise.
-	(SQL_FN_STR_DIFFERENCE): likewise.
-	(SQL_FN_STR_INSERT): likewise.
-	(SQL_FN_STR_LCASE): likewise.
-	(SQL_FN_STR_LEFT): likewise.
-	(SQL_FN_STR_LENGTH): likewise.
-	(SQL_FN_STR_LOCATE): likewise.
-	(SQL_FN_STR_LOCATE_2): likewise.
-	(SQL_FN_STR_LTRIM): likewise.
-	(SQL_FN_STR_REPEAT): likewise.
-	(SQL_FN_STR_REPLACE): likewise.
-	(SQL_FN_STR_RIGHT): likewise.
-	(SQL_FN_STR_RTRIM): likewise.
-	(SQL_FN_STR_SOUNDEX): likewise.
-	(SQL_FN_STR_SPACE): likewise.
-	(SQL_FN_STR_SUBSTRING): likewise.
-	(SQL_FN_STR_UCASE): likewise.
-	(SQL_FN_SYS_DBNAME): likewise.
-	(SQL_FN_SYS_IFNULL): likewise.
-	(SQL_FN_SYS_USERNAME): likewise.
-	(SQL_FN_TD_CURDATE): likewise.
-	(SQL_FN_TD_CURTIME): likewise.
-	(SQL_FN_TD_DAYNAME): likewise.
-	(SQL_FN_TD_DAYOFMONTH): likewise.
-	(SQL_FN_TD_DAYOFWEEK): likewise.
-	(SQL_FN_TD_DAYOFYEAR): likewise.
-	(SQL_FN_TD_HOUR): likewise.
-	(SQL_FN_TD_MINUTE): likewise.
-	(SQL_FN_TD_MONTH): likewise.
-	(SQL_FN_TD_MONTHNAME): likewise.
-	(SQL_FN_TD_NOW): likewise.
-	(SQL_FN_TD_QUARTER): likewise.
-	(SQL_FN_TD_SECOND): likewise.
-	(SQL_FN_TD_TIMESTAMPadd): likewise.
-	(SQL_FN_TD_TIMESTAMPDIFF): likewise.
-	(SQL_FN_TD_WEEK): likewise.
-	(SQL_FN_TD_YEAR): likewise.
-	(SQL_FN_TSI_DAY): likewise.
-	(SQL_FN_TSI_FRAC_SECOND): likewise.
-	(SQL_FN_TSI_HOUR): likewise.
-	(SQL_FN_TSI_MINUTE): likewise.
-	(SQL_FN_TSI_MONTH): likewise.
-	(SQL_FN_TSI_QUARTER): likewise.
-	(SQL_FN_TSI_SECOND): likewise.
-	(SQL_FN_TSI_WEEK): likewise.
-	(SQL_FN_TSI_YEAR): likewise.
-	(SQL_GB_GROUP_BY_CONTAINS_SELECT): likewise.
-	(SQL_GB_GROUP_BY_EQUALS_SELECT): likewise.
-	(SQL_GB_NO_RELATION): likewise.
-	(SQL_GB_NOT_SUPPORTED): likewise.
-	(SQL_GD_BLOCK): likewise.
-	(SQL_GD_BOUND): likewise.
-	(SQL_GET_BOOKMARK): likewise.
-	(SQL_GROUP_BY): likewise.
-	(SQL_INFO_DRIVER_START): likewise.
-	(SQL_INFO_FIRST): likewise.
-	(SQL_INFO_LAST): likewise.
-	(SQL_INTERVAL_DAY): likewise.
-	(SQL_INTERVAL_DAY_TO_HOUR): likewise.
-	(SQL_INTERVAL_DAY_TO_MINUTE): likewise.
-	(SQL_INTERVAL_DAY_TO_SECOND): likewise.
-	(SQL_INTERVAL_HOUR): likewise.
-	(SQL_INTERVAL_HOUR_TO_MINUTE): likewise.
-	(SQL_INTERVAL_HOUR_TO_SECOND): likewise.
-	(SQL_INTERVAL_MINUTE): likewise.
-	(SQL_INTERVAL_MINUTE_TO_SECOND): likewise.
-	(SQL_INTERVAL_MONTH): likewise.
-	(SQL_INTERVAL_SECOND): likewise.
-	(SQL_INTERVAL_YEAR): likewise.
-	(SQL_INTERVAL_YEAR_TO_MONTH): likewise.
-	(SQL_KEYSET_SIZE): likewise.
-	(SQL_KEYSET_SIZE_DEFAULT): likewise.
-	(SQL_KEYWORDS): likewise.
-	(SQL_LCK_EXCLUSIVE): likewise.
-	(SQL_LCK_NO_CHANGE): likewise.
-	(SQL_LCK_UNLOCK): likewise.
-	(SQL_LIKE_ESCAPE_CLAUSE): likewise.
-	(SQL_LIKE_ONLY): likewise.
-	(SQL_LOCK_TYPES): likewise.
-	(SQL_LOGIN_TIMEOUT): likewise.
-	(SQL_LOGIN_TIMEOUT_DEFAULT): likewise.
-	(SQL_LONGVARBINARY): likewise.
-	(SQL_LONGVARCHAR): likewise.
-	(SQL_MAX_BINARY_LITERAL_LEN): likewise.
-	(SQL_MAX_CHAR_LITERAL_LEN): likewise.
-	(SQL_MAX_DSN_LENGTH): likewise.
-	(SQL_MAX_LENGTH): likewise.
-	(SQL_MAX_LENGTH_DEFAULT): likewise.
-	(SQL_MAX_OPTION_STRING_LENGTH): likewise.
-	(SQL_MAX_OWNER_NAME_LEN): likewise.
-	(SQL_MAX_PROCEDURE_NAME_LEN): likewise.
-	(SQL_MAX_QUALIFIER_NAME_LEN): likewise.
-	(SQL_MAX_ROW_SIZE_INCLUDES_LONG): likewise.
-	(SQL_MAX_ROWS): likewise.
-	(SQL_MAX_ROWS_DEFAULT): likewise.
-	(SQL_MODE_DEFAULT): likewise.
-	(SQL_MODE_READ_ONLY): likewise.
-	(SQL_MODE_READ_WRITE): likewise.
-	(SQL_MULT_RESULT_SETS): likewise.
-	(SQL_MULTIPLE_ACTIVE_TXN): likewise.
-	(SQL_NC_END): likewise.
-	(SQL_NC_START): likewise.
-	(SQL_NEED_LONG_DATA_LEN): likewise.
-	(SQL_NNC_NON_NULL): likewise.
-	(SQL_NNC_NULL): likewise.
-	(SQL_NO_TOTAL): likewise.
-	(SQL_NON_NULLABLE_COLUMNS): likewise.
-	(SQL_NOSCAN): likewise.
-	(SQL_NOSCAN_DEFAULT): likewise.
-	(SQL_NOSCAN_OFF): likewise.
-	(SQL_NOSCAN_ON): likewise.
-	(SQL_NUM_EXTENSIONS): likewise.
-	(SQL_NUM_FUNCTIONS): likewise.
-	(SQL_NUMERIC_FUNCTIONS): likewise.
-	(SQL_OAC_LEVEL1): likewise.
-	(SQL_OAC_LEVEL2): likewise.
-	(SQL_OAC_NONE): likewise.
-	(SQL_ODBC_API_CONFORMANCE): likewise.
-	(SQL_ODBC_CURSORS): likewise.
-	(SQL_ODBC_KEYWORDS): likewise.
-	(SQL_ODBC_SAG_CLI_CONFORMANCE): likewise.
-	(SQL_ODBC_SQL_CONFORMANCE): likewise.
-	(SQL_ODBC_SQL_OPT_IEF): likewise.
-	(SQL_ODBC_VER): likewise.
-	(SQL_OPT_TRACE): likewise.
-	(SQL_OPT_TRACE_DEFAULT): likewise.
-	(SQL_OPT_TRACE_FILE_DEFAULT): likewise.
-	(SQL_OPT_TRACE_OFF): likewise.
-	(SQL_OPT_TRACE_ON): likewise.
-	(SQL_OPT_TRACEFILE): likewise.
-	(SQL_OSC_CORE): likewise.
-	(SQL_OSC_EXTENDED): likewise.
-	(SQL_OSC_MINIMUM): likewise.
-	(SQL_OSCC_COMPLIANT): likewise.
-	(SQL_OSCC_NOT_COMPLIANT): likewise.
-	(SQL_OU_DML_STATEMENTS): likewise.
-	(SQL_OU_INDEX_DEFINITION): likewise.
-	(SQL_OU_PRIVILEGE_DEFINITION): likewise.
-	(SQL_OU_PROCEDURE_INVOCATION): likewise.
-	(SQL_OU_TABLE_DEFINITION): likewise.
-	(SQL_OUTER_JOINS): likewise.
-	(SQL_OWNER_TERM): likewise.
-	(SQL_OWNER_USAGE): likewise.
-	(SQL_PACKET_SIZE): likewise.
-	(SQL_PC_NOT_PSEUDO): likewise.
-	(SQL_POS_add): likewise.
-	(SQL_POS_DELETE): likewise.
-	(SQL_POS_OPERATIONS): likewise.
-	(SQL_POS_POSITION): likewise.
-	(SQL_POS_REFRESH): likewise.
-	(SQL_POS_UPDATE): likewise.
-	(SQL_POSITIONED_STATEMENTS): likewise.
-	(SQL_PROCEDURE_TERM): likewise.
-	(SQL_PROCEDURES): likewise.
-	(SQL_PS_POSITIONED_DELETE): likewise.
-	(SQL_PS_POSITIONED_UPDATE): likewise.
-	(SQL_PS_SELECT_FOR_UPDATE): likewise.
-	(SQL_QL_END): likewise.
-	(SQL_QL_START): likewise.
-	(SQL_QU_DML_STATEMENTS): likewise.
-	(SQL_QU_INDEX_DEFINITION): likewise.
-	(SQL_QU_PRIVILEGE_DEFINITION): likewise.
-	(SQL_QU_PROCEDURE_INVOCATION): likewise.
-	(SQL_QU_TABLE_DEFINITION): likewise.
-	(SQL_QUALIFIER_LOCATION): likewise.
-	(SQL_QUALIFIER_NAME_SEPARATOR): likewise.
-	(SQL_QUALIFIER_TERM): likewise.
-	(SQL_QUALIFIER_USAGE): likewise.
-	(SQL_QUERY_TIMEOUT): likewise.
-	(SQL_QUERY_TIMEOUT_DEFAULT): likewise.
-	(SQL_QUICK): likewise.
-	(SQL_QUIET_MODE): likewise.
-	(SQL_QUOTED_IDENTIFIER_CASE): likewise.
-	(SQL_RD_DEFAULT): likewise.
-	(SQL_RD_OFF): likewise.
-	(SQL_RD_ON): likewise.
-	(SQL_RETRIEVE_DATA): likewise.
-	(SQL_ROW_NUMBER): likewise.
-	(SQL_ROW_UPDATES): likewise.
-	(SQL_ROWSET_SIZE): likewise.
-	(SQL_ROWSET_SIZE_DEFAULT): likewise.
-	(SQL_ROWVER): likewise.
-	(SQL_SC_NON_UNIQUE): likewise.
-	(SQL_SC_TRY_UNIQUE): likewise.
-	(SQL_SC_UNIQUE): likewise.
-	(SQL_SCCO_OPT_TIMESTAMP): likewise.
-	(SQL_SCROLL_DYNAMIC): likewise.
-	(SQL_SCROLL_FORWARD_ONLY): likewise.
-	(SQL_SCROLL_KEYSET_DRIVEN): likewise.
-	(SQL_SCROLL_OPTIONS): likewise.
-	(SQL_SCROLL_STATIC): likewise.
-	(SQL_SEARCHABLE): likewise.
-	(SQL_SIGNED_OFFSET): likewise.
-	(SQL_SIMULATE_CURSOR): likewise.
-	(SQL_SO_DYNAMIC): likewise.
-	(SQL_SO_FORWARD_ONLY): likewise.
-	(SQL_SO_KEYSET_DRIVEN): likewise.
-	(SQL_SO_MIXED): likewise.
-	(SQL_SO_STATIC): likewise.
-	(SQL_SPEC_MAJOR): likewise.
-	(SQL_SPEC_MINOR): likewise.
-	(SQL_SPEC_STRING): likewise.
-	(SQL_SQ_COMPARISON): likewise.
-	(SQL_SQ_CORRELATED_SUBQUERIES): likewise.
-	(SQL_SQ_EXISTS): likewise.
-	(SQL_SQ_IN): likewise.
-	(SQL_SQ_QUANTIFIED): likewise.
-	(SQL_SQLSTATE_SIZE): likewise.
-	(SQL_SS_addITIONS): likewise.
-	(SQL_SS_DELETIONS): likewise.
-	(SQL_SS_UPDATES): likewise.
-	(SQL_STATIC_SENSITIVITY): likewise.
-	(SQL_STMT_OPT_MAX): likewise.
-	(SQL_STMT_OPT_MIN): likewise.
-	(SQL_STRING_FUNCTIONS): likewise.
-	(SQL_SUBQUERIES): likewise.
-	(SQL_SYSTEM_FUNCTIONS): likewise.
-	(SQL_TABLE_STAT): likewise.
-	(SQL_TABLE_TERM): likewise.
-	(SQL_TIME): likewise.
-	(SQL_TIMEDATE_add_INTERVALS): likewise.
-	(SQL_TIMEDATE_DIFF_INTERVALS): likewise.
-	(SQL_TIMEDATE_FUNCTIONS): likewise.
-	(SQL_TIMESTAMP): likewise.
-	(SQL_TINYINT): likewise.
-	(SQL_TRANSLATE_DLL): likewise.
-	(SQL_TRANSLATE_OPTION): likewise.
-	(SQL_TXN_ISOLATION): likewise.
-	(SQL_TXN_VERSIONING): likewise.
-	(SQL_TYPE_DRIVER_END): likewise.
-	(SQL_TYPE_DRIVER_START): likewise.
-	(SQL_TYPE_MAX): likewise.
-	(SQL_TYPE_MIN): likewise.
-	(SQL_TYPE_NULL): likewise.
-	(SQL_U_UNION): likewise.
-	(SQL_U_UNION_ALL): likewise.
-	(SQL_UB_DEFAULT): likewise.
-	(SQL_UB_OFF): likewise.
-	(SQL_UB_ON): likewise.
-	(SQL_UNICODE): likewise.
-	(SQL_UNICODE_CHAR): likewise.
-	(SQL_UNICODE_LONGVARCHAR): likewise.
-	(SQL_UNICODE_VARCHAR): likewise.
-	(SQL_UNION): likewise.
-	(SQL_UNSEARCHABLE): likewise.
-	(SQL_UNSIGNED_OFFSET): likewise.
-	(SQL_USE_BOOKMARKS): likewise.
-	(SQL_VARBINARY): likewise.
-	(SQL_TRUE): add define for ODBC3.x.
-	(SQL_FALSE): likewise.
-	(SQL_AM_CONNECTION): likewise.
-	(SQL_AM_NONE): likewise.
-	(SQL_AM_STATEMENT): likewise.
-	(SQL_API_SQLALLOCHANDLE): likewise.
-	(SQL_API_SQLBINDPARAM): likewise.
-	(SQL_API_SQLCLOSECURSOR): likewise.
-	(SQL_API_SQLCOLATTRIBUTE): likewise.
-	(SQL_API_SQLCOPYDESC): likewise.
-	(SQL_API_SQLENDTRAN): likewise.
-	(SQL_API_SQLFETCHSCROLL): likewise.
-	(SQL_API_SQLFREEHANDLE): likewise.
-	(SQL_API_SQLGETCONNECTATTR): likewise.
-	(SQL_API_SQLGETDESCFIELD): likewise.
-	(SQL_API_SQLGETDESCREC): likewise.
-	(SQL_API_SQLGETDIAGFIELD): likewise.
-	(SQL_API_SQLGETDIAGREC): likewise.
-	(SQL_API_SQLGETENVATTR): likewise.
-	(SQL_API_SQLGETSTMTATTR): likewise.
-	(SQL_API_SQLSETCONNECTATTR): likewise.
-	(SQL_API_SQLSETDESCFIELD): likewise.
-	(SQL_API_SQLSETDESCREC): likewise.
-	(SQL_API_SQLSETENVATTR): likewise.
-	(SQL_API_SQLSETSTMTATTR): likewise.
-	(SQL_ARD_TYPE): likewise.
-	(SQL_AT_add_CONSTRAINT): likewise.
-	(SQL_ATTR_APP_PARAM_DESC): likewise.
-	(SQL_ATTR_APP_ROW_DESC): likewise.
-	(SQL_ATTR_AUTO_IPD): likewise.
-	(SQL_ATTR_CURSOR_SCROLLABLE): likewise.
-	(SQL_ATTR_CURSOR_SENSITIVITY): likewise.
-	(SQL_ATTR_IMP_PARAM_DESC): likewise.
-	(SQL_ATTR_IMP_ROW_DESC): likewise.
-	(SQL_ATTR_METADATA_ID): likewise.
-	(SQL_ATTR_OUTPUT_NTS): likewise.
-	(SQL_CATALOG_NAME): likewise.
-	(SQL_CODE_DATE): likewise.
-	(SQL_CODE_TIME): likewise.
-	(SQL_CODE_TIMESTAMP): likewise.
-	(SQL_COLLATION_SEQ): likewise.
-	(SQL_CURSOR_SENSITIVITY): likewise.
-	(SQL_DATE_LEN): likewise.
-	(SQL_DATETIME): likewise.
-	(SQL_DEFAULT): likewise.
-	(SQL_DESC_ALLOC_AUTO): likewise.
-	(SQL_DESC_ALLOC_TYPE): likewise.
-	(SQL_DESC_ALLOC_USER): likewise.
-	(SQL_DESC_COUNT): likewise.
-	(SQL_DESC_DATA_PTR): likewise.
-	(SQL_DESC_DATETIME_INTERVAL_CODE): likewise.
-	(SQL_DESC_INDICATOR_PTR): likewise.
-	(SQL_DESC_LENGTH): likewise.
-	(SQL_DESC_NAME): likewise.
-	(SQL_DESC_NULLABLE): likewise.
-	(SQL_DESC_OCTET_LENGTH): likewise.
-	(SQL_DESC_OCTET_LENGTH_PTR): likewise.
-	(SQL_DESC_PRECISION): likewise.
-	(SQL_DESC_SCALE): likewise.
-	(SQL_DESC_TYPE): likewise.
-	(SQL_DESC_UNNAMED): likewise.
-	(SQL_DESCRIBE_PARAMETER): likewise.
-	(SQL_DIAG_ALTER_DOMAIN): likewise.
-	(SQL_DIAG_ALTER_TABLE): likewise.
-	(SQL_DIAG_CALL): likewise.
-	(SQL_DIAG_CLASS_ORIGIN): likewise.
-	(SQL_DIAG_CONNECTION_NAME): likewise.
-	(SQL_DIAG_CREATE_ASSERTION): likewise.
-	(SQL_DIAG_CREATE_CHARACTER_SET): likewise.
-	(SQL_DIAG_CREATE_COLLATION): likewise.
-	(SQL_DIAG_CREATE_DOMAIN): likewise.
-	(SQL_DIAG_CREATE_INDEX): likewise.
-	(SQL_DIAG_CREATE_SCHEMA): likewise.
-	(SQL_DIAG_CREATE_TABLE): likewise.
-	(SQL_DIAG_CREATE_TRANSLATION): likewise.
-	(SQL_DIAG_CREATE_VIEW): likewise.
-	(SQL_DIAG_DELETE_WHERE): likewise.
-	(SQL_DIAG_DROP_ASSERTION): likewise.
-	(SQL_DIAG_DROP_CHARACTER_SET): likewise.
-	(SQL_DIAG_DROP_COLLATION): likewise.
-	(SQL_DIAG_DROP_DOMAIN): likewise.
-	(SQL_DIAG_DROP_INDEX): likewise.
-	(SQL_DIAG_DROP_SCHEMA): likewise.
-	(SQL_DIAG_DROP_TABLE): likewise.
-	(SQL_DIAG_DROP_TRANSLATION): likewise.
-	(SQL_DIAG_DROP_VIEW): likewise.
-	(SQL_DIAG_DYNAMIC_DELETE_CURSOR): likewise.
-	(SQL_DIAG_DYNAMIC_FUNCTION): likewise.
-	(SQL_DIAG_DYNAMIC_FUNCTION_CODE): likewise.
-	(SQL_DIAG_DYNAMIC_UPDATE_CURSOR): likewise.
-	(SQL_DIAG_GRANT): likewise.
-	(SQL_DIAG_INSERT): likewise.
-	(SQL_DIAG_MESSAGE_TEXT): likewise.
-	(SQL_DIAG_NATIVE): likewise.
-	(SQL_DIAG_NUMBER): likewise.
-	(SQL_DIAG_RETURNCODE): likewise.
-	(SQL_DIAG_REVOKE): likewise.
-	(SQL_DIAG_ROW_COUNT): likewise.
-	(SQL_DIAG_SELECT_CURSOR): likewise.
-	(SQL_DIAG_SERVER_NAME): likewise.
-	(SQL_DIAG_SQLSTATE): likewise.
-	(SQL_DIAG_SUBCLASS_ORIGIN): likewise.
-	(SQL_DIAG_UNKNOWN_STATEMENT): likewise.
-	(SQL_DIAG_UPDATE_WHERE): likewise.
-	(SQL_FALSE): likewise.
-	(SQL_FETCH_ABSOLUTE): likewise.
-	(SQL_FETCH_LAST): likewise.
-	(SQL_FETCH_PRIOR): likewise.
-	(SQL_FETCH_RELATIVE): likewise.
-	(SQL_HANDLE_DBC): likewise.
-	(SQL_HANDLE_DESC): likewise.
-	(SQL_HANDLE_ENV): likewise.
-	(SQL_HANDLE_STMT): likewise.
-	(SQL_INSENSITIVE): likewise.
-	(SQL_INTEGRITY): likewise.
-	(SQL_MAX_CATALOG_NAME_LEN): likewise.
-	(SQL_MAX_CONCURRENT_ACTIVITIES): likewise.
-	(SQL_MAX_DRIVER_CONNECTIONS): likewise.
-	(SQL_MAX_IDENTIFIER_LEN): likewise.
-	(SQL_MAX_SCHEMA_NAME_LEN): likewise.
-	(SQL_MAXIMUM_CATALOG_NAME_LENGTH): likewise.
-	(SQL_MAXIMUM_COLUMN_NAME_LENGTH): likewise.
-	(SQL_MAXIMUM_COLUMNS_IN_GROUP_BY): likewise.
-	(SQL_MAXIMUM_COLUMNS_IN_INDEX): likewise.
-	(SQL_MAXIMUM_COLUMNS_IN_ORDER_BY): likewise.
-	(SQL_MAXIMUM_COLUMNS_IN_SELECT): likewise.
-	(SQL_MAXIMUM_CONCURRENT_ACTIVITIES): likewise.
-	(SQL_MAXIMUM_CURSOR_NAME_LENGTH): likewise.
-	(SQL_MAXIMUM_DRIVER_CONNECTIONS): likewise.
-	(SQL_MAXIMUM_IDENTIFIER_LENGTH): likewise.
-	(SQL_MAXIMUM_INDEX_SIZE): likewise.
-	(SQL_MAXIMUM_ROW_SIZE): likewise.
-	(SQL_MAXIMUM_SCHEMA_NAME_LENGTH): likewise.
-	(SQL_MAXIMUM_STATEMENT_LENGTH): likewise.
-	(SQL_MAXIMUM_TABLES_IN_SELECT): likewise.
-	(SQL_MAXIMUM_USER_NAME_LENGTH): likewise.
-	(SQL_NAMED): likewise.
-	(SQL_NONSCROLLABLE): likewise.
-	(SQL_NTSL): likewise.
-	(SQL_NULL_HANDLE): likewise.
-	(SQL_NULL_HDESC): likewise.
-	(SQL_OUTER_JOIN_CAPABILITIES): likewise.
-	(SQL_PRED_BASIC): likewise.
-	(SQL_PRED_CHAR): likewise.
-	(SQL_PRED_NONE): likewise.
-	(SQL_ROW_IDENTIFIER): likewise.
-	(SQL_SCROLLABLE): likewise.
-	(SQL_SENSITIVE): likewise.
-	(SQL_SUCCEEDED(rc)): likewise.
-	(SQL_TIME_LEN): likewise.
-	(SQL_TIMESTAMP_LEN): likewise.
-	(SQL_TRANSACTION_CAPABLE): likewise.
-	(SQL_TRANSACTION_ISOLATION_OPTION): likewise.
-	(SQL_TRANSACTION_READ_COMMITTED): likewise.
-	(SQL_TRANSACTION_READ_UNCOMMITTED): likewise.
-	(SQL_TRANSACTION_REPEATABLE_READ): likewise.
-	(SQL_TRANSACTION_SERIALIZABLE): likewise.
-	(SQL_TYPE_DATE): likewise.
-	(SQL_TYPE_TIME): likewise.
-	(SQL_TYPE_TIMESTAMP): likewise.
-	(SQL_UNKNOWN_TYPE): likewise.
-	(SQL_UNNAMED): likewise.
-	(SQL_UNSPECIFIED): likewise.
-	(SQL_XOPEN_CLI_YEAR): likewise.
-	(SQLAllocConnect): add comment marking as deperecated.
-	(SQLAllocEnv): likewise.
-	(SQLAllocStmt): likewise.
-	(SQLFreeConnect): likewise.
-	(SQLFreeEnv): likewise.
-	(SQLGetConnectOption): likewise.
-	(SQLGetStmtOption): likewise.
-
-	* include/sqlext.h (#include <sqlucode.h>): add directive.
-	(SQLSetScrollOptions): non-core function, move prototype from sql.h.
-	(SQLColAttributes): likewise.
-	(SQLBulkOperations): add function prototype.
-	(SQLAllocHandleStd): likewise
-	(TraceReturn): add Trace API prototype.
-	(TraceVersion): likewise.
-	(ODBCGetTryWaitValue):likewise.
-	(ODBCSetTryWaitValue): likewise.
-	(SQL_LOCK_RECORD): correct function macro.
-	(SQL_REFRESH_RECORD): likewise.
-	(SQLINTENGER and SQLUINTEGER): replace with SQLLEN and SQLULEN for 
-	_WIN64 compatability.
-	move defines for non-core functions from sql.h to sqlext.h (refer 
-	changes for sql.h)
-	(SQL_ACTIVE_ENVIRONMENTS): new ODBC3.x define
-	(SQL_AD_ADD_CONSTRAINT_DEFERRABLE): likewise.
-	(SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED): likewise.
-	(SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
-	(SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE): likewise.
-	(SQL_AD_ADD_DOMAIN_CONSTRAINT): likewise.
-	(SQL_AD_ADD_DOMAIN_DEFAULT): likewise.
-	(SQL_AD_CONSTRAINT_NAME_DEFINITION): likewise.
-	(SQL_AD_DROP_DOMAIN_CONSTRAINT): likewise.
-	(SQL_AD_DROP_DOMAIN_DEFAULT): likewise.
-	(SQL_AF_ALL): likewise.
-	(SQL_AF_AVG): likewise.
-	(SQL_AF_COUNT): likewise.
-	(SQL_AF_DISTINCT): likewise.
-	(SQL_AF_MAX): likewise.
-	(SQL_AF_MIN): likewise.
-	(SQL_AF_SUM): likewise.
-	(SQL_AGGREGATE_FUNCTIONS): likewise.
-	(SQL_ALL_CATALOGS): likewise.
-	(SQL_ALL_SCHEMAS): likewise.
-	(SQL_ALL_TABLE_TYPES): likewise.
-	(SQL_ALTER_DOMAIN): likewise.
-	(SQL_AM_CONNECTION): likewise.
-	(SQL_AM_NONE): likewise.
-	(SQL_AM_STATEMENT): likewise.
-	(SQL_API_ODBC3_ALL_FUNCTIONS): likewise.
-	(SQL_API_ODBC3_ALL_FUNCTIONS_SIZE): likewise.
-	(SQL_API_SQLALLOCHANDLESTD): likewise.
-	(SQL_API_SQLBULKOPERATIONS): likewise.
-	(SQL_ASYNC_MODE): likewise.
-	(SQL_AT_ADD_COLUMN_COLLATION): likewise.
-	(SQL_AT_ADD_COLUMN_DEFAULT): likewise.
-	(SQL_AT_ADD_COLUMN_SINGLE): likewise.
-	(SQL_AT_ADD_TABLE_CONSTRAINT): likewise.
-	(SQL_AT_CONSTRAINT_DEFERRABLE): likewise.
-	(SQL_AT_CONSTRAINT_INITIALLY_DEFERRED): likewise.
-	(SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
-	(SQL_AT_CONSTRAINT_NAME_DEFINITION): likewise.
-	(SQL_AT_CONSTRAINT_NON_DEFERRABLE): likewise.
-	(SQL_AT_DROP_COLUMN_CASCADE): likewise.
-	(SQL_AT_DROP_COLUMN_DEFAULT): likewise.
-	(SQL_AT_DROP_COLUMN_RESTRICT): likewise.
-	(SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE): likewise.
-	(SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT): likewise.
-	(SQL_AT_SET_COLUMN_DEFAULT): likewise.
-	(SQL_ATTR_ACCESS_MODE): likewise.
-	(SQL_ATTR_ASYNC_ENABLE): likewise.
-	(SQL_ATTR_AUTOCOMMIT): likewise.
-	(SQL_ATTR_CONCURRENCY): likewise.
-	(SQL_ATTR_CONNECTION_POOLING): likewise.
-	(SQL_ATTR_CONNECTION_TIMEOUT): likewise.
-	(SQL_ATTR_CP_MATCH): likewise.
-	(SQL_ATTR_CURRENT_CATALOG): likewise.
-	(SQL_ATTR_CURSOR_TYPE): likewise.
-	(SQL_ATTR_DISCONNECT_BEHAVIOR): likewise.
-	(SQL_ATTR_ENABLE_AUTO_IPD): likewise.
-	(SQL_ATTR_ENLIST_IN_DTC): likewise.
-	(SQL_ATTR_ENLIST_IN_XA): likewise.
-	(SQL_ATTR_FETCH_BOOKMARK_PTR): likewise.
-	(SQL_ATTR_KEYSET_SIZE): likewise.
-	(SQL_ATTR_LOGIN_TIMEOUT): likewise.
-	(SQL_ATTR_MAX_LENGTH): likewise.
-	(SQL_ATTR_MAX_ROWS): likewise.
-	(SQL_ATTR_NOSCAN): likewise.
-	(SQL_ATTR_ODBC_CURSORS): likewise.
-	(SQL_ATTR_ODBC_VERSION): likewise.
-	(SQL_ATTR_PACKET_SIZE): likewise.
-	(SQL_ATTR_PARAM_BIND_OFFSET_PTR): likewise.
-	(SQL_ATTR_PARAM_BIND_TYPE): likewise.
-	(SQL_ATTR_PARAM_OPERATION_PTR): likewise.
-	(SQL_ATTR_PARAM_STATUS_PTR): likewise.
-	(SQL_ATTR_PARAMS_PROCESSED_PTR): likewise.
-	(SQL_ATTR_PARAMSET_SIZE): likewise.
-	(SQL_ATTR_QUERY_TIMEOUT): likewise.
-	(SQL_ATTR_QUIET_MODE): likewise.
-	(SQL_ATTR_RETRIEVE_DATA): likewise.
-	(SQL_ATTR_ROW_ARRAY_SIZE): likewise.
-	(SQL_ATTR_ROW_BIND_OFFSET_PTR): likewise.
-	(SQL_ATTR_ROW_BIND_TYPE): likewise.
-	(SQL_ATTR_ROW_NUMBER): likewise.
-	(SQL_ATTR_ROW_OPERATION_PTR): likewise.
-	(SQL_ATTR_ROW_STATUS_PTR): likewise.
-	(SQL_ATTR_ROWS_FETCHED_PTR): likewise.
-	(SQL_ATTR_SIMULATE_CURSOR): likewise.
-	(SQL_ATTR_TRACE): likewise.
-	(SQL_ATTR_TRACEFILE): likewise.
-	(SQL_ATTR_TRANSLATE_LIB): likewise.
-	(SQL_ATTR_TRANSLATE_OPTION): likewise.
-	(SQL_ATTR_TXN_ISOLATION): likewise.
-	(SQL_ATTR_USE_BOOKMARKS): likewise.
-	(SQL_BATCH_ROW_COUNT): likewise.
-	(SQL_BATCH_SUPPORT): likewise.
-	(SQL_BRC_EXPLICIT): likewise.
-	(SQL_BRC_PROCEDURES): likewise.
-	(SQL_BRC_ROLLED_UP): likewise.
-	(SQL_BS_ROW_COUNT_EXPLICIT): likewise.
-	(SQL_BS_ROW_COUNT_PROC): likewise.
-	(SQL_BS_SELECT_EXPLICIT): likewise.
-	(SQL_BS_SELECT_PROC): likewise.
-	(SQL_C_INTERVAL_DAY): likewise.
-	(SQL_C_INTERVAL_DAY_TO_HOUR): likewise.
-	(SQL_C_INTERVAL_DAY_TO_MINUTE): likewise.
-	(SQL_C_INTERVAL_DAY_TO_SECOND): likewise.
-	(SQL_C_INTERVAL_HOUR): likewise.
-	(SQL_C_INTERVAL_HOUR_TO_MINUTE): likewise.
-	(SQL_C_INTERVAL_HOUR_TO_SECOND): likewise.
-	(SQL_C_INTERVAL_MINUTE): likewise.
-	(SQL_C_INTERVAL_MINUTE_TO_SECOND): likewise.
-	(SQL_C_INTERVAL_MONTH): likewise.
-	(SQL_C_INTERVAL_SECOND): likewise.
-	(SQL_C_INTERVAL_YEAR): likewise.
-	(SQL_C_INTERVAL_YEAR_TO_MONTH): likewise.
-	(SQL_C_NUMERIC): likewise.
-	(SQL_C_SBIGINT): likewise.
-	(SQL_C_TYPE_DATE): likewise.
-	(SQL_C_TYPE_TIME): likewise.
-	(SQL_C_TYPE_TIMESTAMP): likewise.
-	(SQL_C_UBIGINT): likewise.
-	(SQL_C_VARBOOKMARK): likewise.
-	(SQL_CA_CONSTRAINT_DEFERRABLE): likewise.
-	(SQL_CA_CONSTRAINT_INITIALLY_DEFERRED): likewise.
-	(SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
-	(SQL_CA_CONSTRAINT_NON_DEFERRABLE): likewise.
-	(SQL_CA_CREATE_ASSERTION): likewise.
-	(SQL_CA1_ABSOLUTE): likewise.
-	(SQL_CA1_BOOKMARK): likewise.
-	(SQL_CA1_BULK_ADD): likewise.
-	(SQL_CA1_BULK_DELETE_BY_BOOKMARK): likewise.
-	(SQL_CA1_BULK_FETCH_BY_BOOKMARK): likewise.
-	(SQL_CA1_BULK_UPDATE_BY_BOOKMARK): likewise.
-	(SQL_CA1_LOCK_EXCLUSIVE): likewise.
-	(SQL_CA1_LOCK_NO_CHANGE): likewise.
-	(SQL_CA1_LOCK_UNLOCK): likewise.
-	(SQL_CA1_NEXT): likewise.
-	(SQL_CA1_POS_DELETE): likewise.
-	(SQL_CA1_POS_POSITION): likewise.
-	(SQL_CA1_POS_REFRESH): likewise.
-	(SQL_CA1_POS_UPDATE): likewise.
-	(SQL_CA1_POSITIONED_DELETE): likewise.
-	(SQL_CA1_POSITIONED_UPDATE): likewise.
-	(SQL_CA1_RELATIVE): likewise.
-	(SQL_CA1_SELECT_FOR_UPDATE): likewise.
-	(SQL_CA2_CRC_APPROXIMATE): likewise.
-	(SQL_CA2_CRC_EXACT): likewise.
-	(SQL_CA2_LOCK_CONCURRENCY): likewise.
-	(SQL_CA2_MAX_ROWS_AFFECTS_ALL): likewise.
-	(SQL_CA2_MAX_ROWS_CATALOG): likewise.
-	(SQL_CA2_MAX_ROWS_DELETE): likewise.
-	(SQL_CA2_MAX_ROWS_INSERT): likewise.
-	(SQL_CA2_MAX_ROWS_SELECT): likewise.
-	(SQL_CA2_MAX_ROWS_UPDATE): likewise.
-	(SQL_CA2_OPT_ROWVER_CONCURRENCY): likewise.
-	(SQL_CA2_OPT_VALUES_CONCURRENCY): likewise.
-	(SQL_CA2_READ_ONLY_CONCURRENCY): likewise.
-	(SQL_CA2_SENSITIVITY_ADDITIONS): likewise.
-	(SQL_CA2_SENSITIVITY_DELETIONS): likewise.
-	(SQL_CA2_SENSITIVITY_UPDATES): likewise.
-	(SQL_CA2_SIMULATE_NON_UNIQUE): likewise.
-	(SQL_CA2_SIMULATE_TRY_UNIQUE): likewise.
-	(SQL_CA2_SIMULATE_UNIQUE): likewise.
-	(SQL_CATALOG_LOCATION): likewise.
-	(SQL_CATALOG_NAME_SEPARATOR): likewise.
-	(SQL_CATALOG_TERM): likewise.
-	(SQL_CATALOG_USAGE): likewise.
-	(SQL_CCOL_CREATE_COLLATION): likewise.
-	(SQL_CCS_COLLATE_CLAUSE): likewise.
-	(SQL_CCS_CREATE_CHARACTER_SET): likewise.
-	(SQL_CCS_LIMITED_COLLATION): likewise.
-	(SQL_CDO_COLLATION): likewise.
-	(SQL_CDO_CONSTRAINT): likewise.
-	(SQL_CDO_CONSTRAINT_DEFERRABLE): likewise.
-	(SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED): likewise.
-	(SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
-	(SQL_CDO_CONSTRAINT_NAME_DEFINITION): likewise.
-	(SQL_CDO_CONSTRAINT_NON_DEFERRABLE): likewise.
-	(SQL_CDO_CREATE_DOMAIN): likewise.
-	(SQL_CDO_DEFAULT): likewise.
-	(SQL_CL_END): likewise.
-	(SQL_CL_START): likewise.
-	(SQL_COL_PRED_BASIC): likewise.
-	(SQL_COL_PRED_CHAR): likewise.
-	(SQL_COLUMN_DRIVER_START): likewise.
-	(SQL_COLUMN_IGNORE): likewise.
-	(SQL_COLUMN_NUMBER_UNKNOWN): likewise.
-	(SQL_CONVERT_GUID): likewise.
-	(SQL_CONVERT_INTERVAL_DAY_TIME): likewise.
-	(SQL_CONVERT_INTERVAL_YEAR_MONTH): likewise.
-	(SQL_CONVERT_WCHAR): likewise.
-	(SQL_CONVERT_WLONGVARCHAR): likewise.
-	(SQL_CONVERT_WVARCHAR): likewise.
-	(SQL_CP_DEFAULT): likewise.
-	(SQL_CP_MATCH_DEFAULT): likewise.
-	(SQL_CP_OFF): likewise.
-	(SQL_CP_ONE_PER_DRIVER): likewise.
-	(SQL_CP_ONE_PER_HENV): likewise.
-	(SQL_CP_RELAXED_MATCH): likewise.
-	(SQL_CP_STRICT_MATCH): likewise.
-	(SQL_CREATE_ASSERTION): likewise.
-	(SQL_CREATE_CHARACTER_SET): likewise.
-	(SQL_CREATE_COLLATION): likewise.
-	(SQL_CREATE_DOMAIN): likewise.
-	(SQL_CREATE_SCHEMA): likewise.
-	(SQL_CREATE_TABLE): likewise.
-	(SQL_CREATE_TRANSLATION): likewise.
-	(SQL_CREATE_VIEW): likewise.
-	(SQL_CS_AUTHORIZATION): likewise.
-	(SQL_CS_CREATE_SCHEMA): likewise.
-	(SQL_CS_DEFAULT_CHARACTER_SET): likewise.
-	(SQL_CT_COLUMN_COLLATION): likewise.
-	(SQL_CT_COLUMN_CONSTRAINT): likewise.
-	(SQL_CT_COLUMN_DEFAULT): likewise.
-	(SQL_CT_COMMIT_DELETE): likewise.
-	(SQL_CT_COMMIT_PRESERVE): likewise.
-	(SQL_CT_CONSTRAINT_DEFERRABLE): likewise.
-	(SQL_CT_CONSTRAINT_INITIALLY_DEFERRED): likewise.
-	(SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE): likewise.
-	(SQL_CT_CONSTRAINT_NAME_DEFINITION): likewise.
-	(SQL_CT_CONSTRAINT_NON_DEFERRABLE): likewise.
-	(SQL_CT_CREATE_TABLE): likewise.
-	(SQL_CT_GLOBAL_TEMPORARY): likewise.
-	(SQL_CT_LOCAL_TEMPORARY): likewise.
-	(SQL_CT_TABLE_CONSTRAINT): likewise.
-	(SQL_CTR_CREATE_TRANSLATION): likewise.
-	(SQL_CU_DML_STATEMENTS): likewise.
-	(SQL_CU_INDEX_DEFINITION): likewise.
-	(SQL_CU_PRIVILEGE_DEFINITION): likewise.
-	(SQL_CU_PROCEDURE_INVOCATION): likewise.
-	(SQL_CU_TABLE_DEFINITION): likewise.
-	(SQL_CVT_GUID): likewise.
-	(SQL_CVT_INTERVAL_DAY_TIME): likewise.
-	(SQL_CVT_INTERVAL_YEAR_MONTH): likewise.
-	(SQL_CVT_WCHAR): likewise.
-	(SQL_CVT_WLONGVARCHAR): likewise.
-	(SQL_CVT_WVARCHAR): likewise.
-	(SQL_DA_DROP_ASSERTION): likewise.
-	(SQL_DATETIME_LITERALS): likewise.
-	(SQL_DB_DEFAULT): likewise.
-	(SQL_DB_DISCONNECT): likewise.
-	(SQL_DB_RETURN_TO_POOL): likewise.
-	(SQL_DC_DROP_COLLATION): likewise.
-	(SQL_DCS_DROP_CHARACTER_SET): likewise.
-	(SQL_DD_CASCADE): likewise.
-	(SQL_DD_DROP_DOMAIN): likewise.
-	(SQL_DD_RESTRICT): likewise.
-	(SQL_DDL_INDEX): likewise.
-	(SQL_DELETE_BY_BOOKMARK): likewise.
-	(SQL_DESC_ARRAY_SIZE): likewise.
-	(SQL_DESC_ARRAY_STATUS_PTR): likewise.
-	(SQL_DESC_AUTO_UNIQUE_VALUE): likewise.
-	(SQL_DESC_BASE_COLUMN_NAME): likewise.
-	(SQL_DESC_BASE_TABLE_NAME): likewise.
-	(SQL_DESC_BIND_OFFSET_PTR): likewise.
-	(SQL_DESC_BIND_TYPE): likewise.
-	(SQL_DESC_CASE_SENSITIVE): likewise.
-	(SQL_DESC_CATALOG_NAME): likewise.
-	(SQL_DESC_CONCISE_TYPE): likewise.
-	(SQL_DESC_DATETIME_INTERVAL_PRECISION): likewise.
-	(SQL_DESC_DISPLAY_SIZE): likewise.
-	(SQL_DESC_FIXED_PREC_SCALE): likewise.
-	(SQL_DESC_LABEL): likewise.
-	(SQL_DESC_LITERAL_PREFIX): likewise.
-	(SQL_DESC_LITERAL_SUFFIX): likewise.
-	(SQL_DESC_LOCAL_TYPE_NAME): likewise.
-	(SQL_DESC_MAXIMUM_SCALE): likewise.
-	(SQL_DESC_MINIMUM_SCALE): likewise.
-	(SQL_DESC_NUM_PREC_RADIX): likewise.
-	(SQL_DESC_PARAMETER_TYPE): likewise.
-	(SQL_DESC_ROWS_PROCESSED_PTR): likewise.
-	(SQL_DESC_SCHEMA_NAME): likewise.
-	(SQL_DESC_SEARCHABLE): likewise.
-	(SQL_DESC_TABLE_NAME): likewise.
-	(SQL_DESC_TYPE_NAME): likewise.
-	(SQL_DESC_UNSIGNED): likewise.
-	(SQL_DESC_UPDATABLE): likewise.
-	(SQL_DI_CREATE_INDEX): likewise.
-	(SQL_DI_DROP_INDEX): likewise.
-	(SQL_DIAG_COLUMN_NUMBER): likewise.
-	(SQL_DIAG_CURSOR_ROW_COUNT): likewise.
-	(SQL_DIAG_ROW_NUMBER): likewise.
-	(SQL_DL_SQL92_DATE): likewise.
-	(SQL_DL_SQL92_INTERVAL_DAY): likewise.
-	(SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR): likewise.
-	(SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE): likewise.
-	(SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND): likewise.
-	(SQL_DL_SQL92_INTERVAL_HOUR): likewise.
-	(SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE): likewise.
-	(SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND): likewise.
-	(SQL_DL_SQL92_INTERVAL_MINUTE): likewise.
-	(SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND): likewise.
-	(SQL_DL_SQL92_INTERVAL_MONTH): likewise.
-	(SQL_DL_SQL92_INTERVAL_SECOND): likewise.
-	(SQL_DL_SQL92_INTERVAL_YEAR): likewise.
-	(SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH): likewise.
-	(SQL_DL_SQL92_TIME): likewise.
-	(SQL_DL_SQL92_TIMESTAMP): likewise.
-	(SQL_DM_VER): likewise.
-	(SQL_DRIVER_HDESC): likewise.
-	(SQL_DROP_ASSERTION): likewise.
-	(SQL_DROP_CHARACTER_SET): likewise.
-	(SQL_DROP_COLLATION): likewise.
-	(SQL_DROP_DOMAIN): likewise.
-	(SQL_DROP_SCHEMA): likewise.
-	(SQL_DROP_TABLE): likewise.
-	(SQL_DROP_TRANSLATION): likewise.
-	(SQL_DROP_VIEW): likewise.
-	(SQL_DS_CASCADE): likewise.
-	(SQL_DS_DROP_SCHEMA): likewise.
-	(SQL_DS_RESTRICT): likewise.
-	(SQL_DT_CASCADE): likewise.
-	(SQL_DT_DROP_TABLE): likewise.
-	(SQL_DT_RESTRICT): likewise.
-	(SQL_DTC_DONE): likewise.
-	(SQL_DTR_DROP_TRANSLATION): likewise.
-	(SQL_DV_CASCADE): likewise.
-	(SQL_DV_DROP_VIEW): likewise.
-	(SQL_DV_RESTRICT): likewise.
-	(SQL_DYNAMIC_CURSOR_ATTRIBUTES1): likewise.
-	(SQL_DYNAMIC_CURSOR_ATTRIBUTES2): likewise.
-	(SQL_EXT_API_LAST): likewise.
-	(SQL_EXT_API_START): likewise.
-	(SQL_FETCH_BY_BOOKMARK): likewise.
-	(SQL_FETCH_FIRST_SYSTEM): likewise.
-	(SQL_FETCH_FIRST_USER): likewise.
-	(SQL_FN_CVT_CAST): likewise.
-	(SQL_FN_STR_BIT_LENGTH): likewise.
-	(SQL_FN_STR_CHAR_LENGTH): likewise.
-	(SQL_FN_STR_CHARACTER_LENGTH): likewise.
-	(SQL_FN_STR_OCTET_LENGTH): likewise.
-	(SQL_FN_STR_POSITION): likewise.
-	(SQL_FN_TD_CURRENT_DATE): likewise.
-	(SQL_FN_TD_CURRENT_TIME): likewise.
-	(SQL_FN_TD_CURRENT_TIMESTAMP): likewise.
-	(SQL_FN_TD_EXTRACT): likewise.
-	(SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1): likewise.
-	(SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2): likewise.
-	(SQL_FUNC_EXISTS(exists,api)): likewise.
-	(SQL_GB_COLLATE): likewise.
-	(SQL_HANDLE_SENV): likewise.
-	(SQL_IK_ALL): likewise.
-	(SQL_IK_ASC): likewise.
-	(SQL_IK_DESC): likewise.
-	(SQL_IK_NONE): likewise.
-	(SQL_INDEX_KEYWORDS): likewise.
-	(SQL_INFO_DRIVER_START): likewise.
-	(SQL_INFO_LAST): likewise.
-	(SQL_INFO_SCHEMA_VIEWS): likewise.
-	(SQL_INITIALLY_DEFERRED): likewise.
-	(SQL_INITIALLY_IMMEDIATE): likewise.
-	(SQL_INSERT_STATEMENT): likewise.
-	(SQL_INTERVAL): likewise.
-	(SQL_IS_INSERT_LITERALS): likewise.
-	(SQL_IS_INSERT_SEARCHED): likewise.
-	(SQL_IS_INTEGER): likewise.
-	(SQL_IS_POINTER): likewise.
-	(SQL_IS_SELECT_INTO): likewise.
-	(SQL_IS_SMALLINT): likewise.
-	(SQL_IS_UINTEGER): likewise.
-	(SQL_IS_USMALLINT): likewise.
-	(SQL_ISV_ASSERTIONS): likewise.
-	(SQL_ISV_CHARACTER_SETS): likewise.
-	(SQL_ISV_CHECK_CONSTRAINTS): likewise.
-	(SQL_ISV_COLLATIONS): likewise.
-	(SQL_ISV_COLUMN_DOMAIN_USAGE): likewise.
-	(SQL_ISV_COLUMN_PRIVILEGES): likewise.
-	(SQL_ISV_COLUMNS): likewise.
-	(SQL_ISV_CONSTRAINT_COLUMN_USAGE): likewise.
-	(SQL_ISV_CONSTRAINT_TABLE_USAGE): likewise.
-	(SQL_ISV_DOMAIN_CONSTRAINTS): likewise.
-	(SQL_ISV_DOMAINS): likewise.
-	(SQL_ISV_KEY_COLUMN_USAGE): likewise.
-	(SQL_ISV_REFERENTIAL_CONSTRAINTS): likewise.
-	(SQL_ISV_SCHEMATA): likewise.
-	(SQL_ISV_SQL_LANGUAGES): likewise.
-	(SQL_ISV_TABLE_CONSTRAINTS): likewise.
-	(SQL_ISV_TABLE_PRIVILEGES): likewise.
-	(SQL_ISV_TABLES): likewise.
-	(SQL_ISV_TRANSLATIONS): likewise.
-	(SQL_ISV_USAGE_PRIVILEGES): likewise.
-	(SQL_ISV_VIEW_COLUMN_USAGE): likewise.
-	(SQL_ISV_VIEW_TABLE_USAGE): likewise.
-	(SQL_ISV_VIEWS): likewise.
-	(SQL_KEYSET_CURSOR_ATTRIBUTES1): likewise.
-	(SQL_KEYSET_CURSOR_ATTRIBUTES2): likewise.
-	(SQL_MAX_ASYNC_CONCURRENT_STATEMENTS): likewise.
-	(SQL_NO_COLUMN_NUMBER): likewise.
-	(SQL_NO_ROW_NUMBER): likewise.
-	(SQL_NOT_DEFERRABLE): likewise.
-	(SQL_NUM_EXTENSIONS): likewise.
-	(SQL_NUM_FUNCTIONS): likewise.
-	(SQL_ODBC_INTERFACE_CONFORMANCE): likewise.
-	(SQL_OIC_CORE): likewise.
-	(SQL_OIC_LEVEL1): likewise.
-	(SQL_OIC_LEVEL2): likewise.
-	(SQL_OV_ODBC2): likewise.
-	(SQL_OV_ODBC3): likewise.
-	(SQL_PARAM_ARRAY_ROW_COUNTS): likewise.
-	(SQL_PARAM_ARRAY_SELECTS): likewise.
-	(SQL_PARAM_BIND_BY_COLUMN): likewise.
-	(SQL_PARAM_BIND_TYPE_DEFAULT): likewise.
-	(SQL_PARAM_DIAG_UNAVAILABLE): likewise.
-	(SQL_PARAM_ERROR): likewise.
-	(SQL_PARAM_IGNORE): likewise.
-	(SQL_PARAM_PROCEED): likewise.
-	(SQL_PARAM_SUCCESS): likewise.
-	(SQL_PARAM_SUCCESS_WITH_INFO): likewise.
-	(SQL_PARAM_UNUSED): likewise.
-	(SQL_PARC_BATCH): likewise.
-	(SQL_PARC_NO_BATCH): likewise.
-	(SQL_PAS_BATCH): likewise.
-	(SQL_PAS_NO_BATCH): likewise.
-	(SQL_PAS_NO_SELECT): likewise.
-	(SQL_ROW_IGNORE): likewise.
-	(SQL_ROW_NUMBER_UNKNOWN): likewise.
-	(SQL_ROW_PROCEED): likewise.
-	(SQL_ROW_SUCCESS_WITH_INFO): likewise.
-	(SQL_SC_FIPS127_2_TRANSITIONAL): likewise.
-	(SQL_SC_SQL92_ENTRY): likewise.
-	(SQL_SC_SQL92_FULL): likewise.
-	(SQL_SC_SQL92_INTERMEDIATE): likewise.
-	(SQL_SCC_ISO92_CLI): likewise.
-	(SQL_SCC_XOPEN_CLI_VERSION1): likewise.
-	(SQL_SCHEMA_TERM): likewise.
-	(SQL_SCHEMA_USAGE): likewise.
-	(SQL_SDF_CURRENT_DATE): likewise.
-	(SQL_SDF_CURRENT_TIME): likewise.
-	(SQL_SDF_CURRENT_TIMESTAMP): likewise.
-	(SQL_SFKD_CASCADE): likewise.
-	(SQL_SFKD_NO_ACTION): likewise.
-	(SQL_SFKD_SET_DEFAULT): likewise.
-	(SQL_SFKD_SET_NULL): likewise.
-	(SQL_SFKU_CASCADE): likewise.
-	(SQL_SFKU_NO_ACTION): likewise.
-	(SQL_SFKU_SET_DEFAULT): likewise.
-	(SQL_SFKU_SET_NULL): likewise.
-	(SQL_SG_DELETE_TABLE): likewise.
-	(SQL_SG_INSERT_COLUMN): likewise.
-	(SQL_SG_INSERT_TABLE): likewise.
-	(SQL_SG_REFERENCES_COLUMN): likewise.
-	(SQL_SG_REFERENCES_TABLE): likewise.
-	(SQL_SG_SELECT_TABLE): likewise.
-	(SQL_SG_UPDATE_COLUMN): likewise.
-	(SQL_SG_UPDATE_TABLE): likewise.
-	(SQL_SG_USAGE_ON_CHARACTER_SET): likewise.
-	(SQL_SG_USAGE_ON_COLLATION): likewise.
-	(SQL_SG_USAGE_ON_DOMAIN): likewise.
-	(SQL_SG_USAGE_ON_TRANSLATION): likewise.
-	(SQL_SG_WITH_GRANT_OPTION): likewise.
-	(SQL_SNVF_BIT_LENGTH): likewise.
-	(SQL_SNVF_CHAR_LENGTH): likewise.
-	(SQL_SNVF_CHARACTER_LENGTH): likewise.
-	(SQL_SNVF_EXTRACT): likewise.
-	(SQL_SNVF_OCTET_LENGTH): likewise.
-	(SQL_SNVF_POSITION): likewise.
-	(SQL_SP_BETWEEN): likewise.
-	(SQL_SP_COMPARISON): likewise.
-	(SQL_SP_EXISTS): likewise.
-	(SQL_SP_IN): likewise.
-	(SQL_SP_ISNOTNULL): likewise.
-	(SQL_SP_ISNULL): likewise.
-	(SQL_SP_LIKE): likewise.
-	(SQL_SP_MATCH_FULL): likewise.
-	(SQL_SP_MATCH_PARTIAL): likewise.
-	(SQL_SP_MATCH_UNIQUE_FULL): likewise.
-	(SQL_SP_MATCH_UNIQUE_PARTIAL): likewise.
-	(SQL_SP_OVERLAPS): likewise.
-	(SQL_SP_QUANTIFIED_COMPARISON): likewise.
-	(SQL_SP_UNIQUE): likewise.
-	(SQL_SQL_CONFORMANCE): likewise.
-	(SQL_SQL92_DATETIME_FUNCTIONS): likewise.
-	(SQL_SQL92_FOREIGN_KEY_DELETE_RULE): likewise.
-	(SQL_SQL92_FOREIGN_KEY_UPDATE_RULE): likewise.
-	(SQL_SQL92_GRANT): likewise.
-	(SQL_SQL92_NUMERIC_VALUE_FUNCTIONS): likewise.
-	(SQL_SQL92_PREDICATES): likewise.
-	(SQL_SQL92_RELATIONAL_JOIN_OPERATORS): likewise.
-	(SQL_SQL92_REVOKE): likewise.
-	(SQL_SQL92_ROW_VALUE_CONSTRUCTOR): likewise.
-	(SQL_SQL92_STRING_FUNCTIONS): likewise.
-	(SQL_SQL92_VALUE_EXPRESSIONS): likewise.
-	(SQL_SR_CASCADE): likewise.
-	(SQL_SR_DELETE_TABLE): likewise.
-	(SQL_SR_GRANT_OPTION_FOR): likewise.
-	(SQL_SR_INSERT_COLUMN): likewise.
-	(SQL_SR_INSERT_TABLE): likewise.
-	(SQL_SR_REFERENCES_COLUMN): likewise.
-	(SQL_SR_REFERENCES_TABLE): likewise.
-	(SQL_SR_RESTRICT): likewise.
-	(SQL_SR_SELECT_TABLE): likewise.
-	(SQL_SR_UPDATE_COLUMN): likewise.
-	(SQL_SR_UPDATE_TABLE): likewise.
-	(SQL_SR_USAGE_ON_CHARACTER_SET): likewise.
-	(SQL_SR_USAGE_ON_COLLATION): likewise.
-	(SQL_SR_USAGE_ON_DOMAIN): likewise.
-	(SQL_SR_USAGE_ON_TRANSLATION): likewise.
-	(SQL_SRJO_CORRESPONDING_CLAUSE): likewise.
-	(SQL_SRJO_CROSS_JOIN): likewise.
-	(SQL_SRJO_EXCEPT_JOIN): likewise.
-	(SQL_SRJO_FULL_OUTER_JOIN): likewise.
-	(SQL_SRJO_INNER_JOIN): likewise.
-	(SQL_SRJO_INTERSECT_JOIN): likewise.
-	(SQL_SRJO_LEFT_OUTER_JOIN): likewise.
-	(SQL_SRJO_NATURAL_JOIN): likewise.
-	(SQL_SRJO_RIGHT_OUTER_JOIN): likewise.
-	(SQL_SRJO_UNION_JOIN): likewise.
-	(SQL_SRVC_DEFAULT): likewise.
-	(SQL_SRVC_NULL): likewise.
-	(SQL_SRVC_ROW_SUBQUERY): likewise.
-	(SQL_SRVC_VALUE_EXPRESSION): likewise.
-	(SQL_SSF_CONVERT): likewise.
-	(SQL_SSF_LOWER): likewise.
-	(SQL_SSF_SUBSTRING): likewise.
-	(SQL_SSF_TRANSLATE): likewise.
-	(SQL_SSF_TRIM_BOTH): likewise.
-	(SQL_SSF_TRIM_LEADING): likewise.
-	(SQL_SSF_TRIM_TRAILING): likewise.
-	(SQL_SSF_UPPER): likewise.
-	(SQL_STANDARD_CLI_CONFORMANCE): likewise.
-	(SQL_STATIC_CURSOR_ATTRIBUTES1): likewise.
-	(SQL_STATIC_CURSOR_ATTRIBUTES2): likewise.
-	(SQL_SU_DML_STATEMENTS): likewise.
-	(SQL_SU_INDEX_DEFINITION): likewise.
-	(SQL_SU_PRIVILEGE_DEFINITION): likewise.
-	(SQL_SU_PROCEDURE_INVOCATION): likewise.
-	(SQL_SU_TABLE_DEFINITION): likewise.
-	(SQL_SVE_CASE): likewise.
-	(SQL_SVE_CAST): likewise.
-	(SQL_SVE_COALESCE): likewise.
-	(SQL_SVE_NULLIF): likewise.
-	(SQL_UB_FIXED): likewise.
-	(SQL_UB_VARIABLE): likewise.
-	(SQL_UNION_STATEMENT): likewise.
-	(SQL_UPDATE_BY_BOOKMARK): likewise.
-	(SQL_US_UNION): likewise.
-	(SQL_US_UNION_ALL): likewise.
-	(SQL_DESC_ROWVER): likewise.
-	(SQL_GUID): likewise.
-	(SQL_C_GUID): likewise.
-	(ODBC_STD): likewise.
-	(SQLAllocHandle): likewise.
-	(SQLAllocEnv(p)): likewise.
-	(SQL_YEAR): likewise.
-	(SQL_MONTH): likewise.
-	(SQL_DAY): likewise.
-	(SQL_HOUR): likewise.
-	(SQL_MINUTE): likewise.
-	(SQL_SECOND): likewise.
-	(SQL_YEAR_TO_MONTH): likewise.
-	(SQL_DAY_TO_HOUR): likewise.
-	(SQL_DAY_TO_MINUTE): likewise.
-	(SQL_DAY_TO_SECOND): likewise.
-	(SQL_HOUR_TO_MINUTE): likewise.
-	(SQL_HOUR_TO_SECOND): likewise.
-	(SQL_MINUTE_TO_SECOND): likewise.
-	(SQL_ATTR_ANSI_APP): likewise.
-	(SQL_AA_TRUE): likewise.
-	(SQL_AA_FALSE): likewise.
-
-	* include/sqltypes.h (#pragma pack(push,1), #pragma pack(pop)): remove.
-	(struct tagSQL_YEAR_MONTH): add for ODBC3.x.
-	(struct tagSQL_DAY_SECOND): likewise.
-	(struct	tagSQL_INTERVAL_STRUCT): likewise.
-	(struct tagSQL_NUMERIC_STRUCT): likewise.
-	(struct tagSQLGUID): add for 0DBC3.50.
-	(enum SQLINTERVAL): add for ODBC3.x.
-	(SQLWCHAR): add typedef.
-	(SQLTCHAR): add typedef, conditional on UNICODE.
-	(SQLLEN): add typedef for _WIN64, define for _WIN32.
-	(SQLULEN): likewise.
-	(SQLROWOFFSET): likewise.
-	(SQLROWCOUNT): likewise.
-	(SQLTRANSID): likewise.
-	(SQLSETPOSIROW): likewise.
-	(SQLHANDLE): add ODBC3.x typedef.	
-	(SQLHDESC): likewise.	
-	(SQLDATE): likewise.
-	(SQLDECIMAL): likewise.
-	(SQLDOUBLE): likewise.
-	(SQLFLOAT): likewise.
-	(SQLNUMERIC): likewise.
-	(SQLREAL): likewise.
-	(SQLTIME): likewise.
-	(SQLTIMESTAMP): likewise.
-	(SQLVARCHAR): likewise.
-	(SQLBIGINT): likewise.
-	(SQLUBIGINT): likewise.
-	(SQL_DATE_STRUCT): likewise.
-	(SQL_TIME_STRUCT): likewise.
-	(SQL_TIMESTAMP_STRUCT): likewise.
-	(ODBCINT64): add ODBC3.x define.
-
-	* lib/odbc32.def : regenerate.
-
-Fri Jan 26 15:59:31  2001  Earnie Boyd  <earnie@users.sourceforge.net
-
-	* Apply Danny Smith patch 102275
-	2000-11-05  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	* include/objbase.h: (COM_RIGHTS): Add definition.
-	(tagSTDMSHLFLAGS): add enumeration. 
-	(CoInitializeEx): Add prototypes.
-	(CoGetStdMarshalEx): ditto.
-	(CoCreateInstanceEx): ditto.
-	(CoInitializeSecurity): ditto.
-	(CoGetCallContext): ditto.
-	(CoQueryProxyBlanket): ditto.
-	(CoSetProxyBlanket): ditto.
-	(CoCopyProxy): ditto.
-	(CoQueryClientBlanket): ditto.
-	(CoImpersonateClient): ditto.
-	(CoRevertToSelf): ditto.
-	(CoQueryAuthenticationServices): ditto.
-	(CoSwitchCallContext): ditto.
-	(CoGetInstanceFromFile): ditto.
-	(CoGetInstanceFromIStorage): ditto.
-	* include/objidl.h: (SOLE_AUTHENTICATION_SERVICE): Add structure.
-	(SOLE_AUTHENTICATION_INFO): ditto.
-	(EOLE_AUTHENTICATION_CAPABILITIES): Add enumeration.
-	(COLE_DEFAULT_PRINCIPAL): Add definition.
-	(COLE_DEFAULT_AUTHINFO): Ditto.
-	* include/rpcdce.h: (RPC_C_AUTHZ_DEFAULT): Add definition.
-	(RPC_PROTSEQ_VECTOR) Fix typo.
-	(RpcRaiseException): add DECLSPEC_NORETURN attribute.
-	* include/winbase.h: (FreeLibraryAndExitThread): add DECLSPEC_NORETURN 
-	attribute.
-
-Fri Jan 26 13:34:55  2001  Earnie Boyde  <earnie@users.sourceforge.net>
-
-	* lib/msvcp60.def: Apply Danny Smith patch 103321.
-	2001-01-17  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>.
-	New file.
-
-Fri Jan 26 11:34:04 2001  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winnt.h: Add PTOKEN_USER.
-
-Tue Jan 16 13:53:30  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/sqlucode.h: Apply Danny Smith patch 102443
-	2000-11-20  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	New file.
-
-Tue Jan 16 13:36:45  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* lib/odbccp32.def: Apply Danny Smith patch 102442
-	2000-11-20  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	New file.
-
-Tue Jan 16 12:45:20  2001  Earnie Boyd  <earnie@users.sourceforge.net>
-
-	* include/odbcinst.h: Apply Danny Smith patch 102441
-	2000-11-20  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	New file.
-
-Mon Dec 25 12:22:19 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* lib/Makefile.in: Don't make "links" to include/w32api directory.
-
-Wed Dec 20 13:34:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/winbase.h: Add prototype for SetSecurityDescriptorControl.
-
-Mon Dec 11 13:11:36 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* lib/Makefile.in: Install headers and libraries in tooldir.
-
-2000-12-04  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-
-	* include/winnls.h: NORM_IGNORE* remove duplicate defines. 
-	SORT_STRINGSORT: ditto. 
-	CMAP*: ditto. 
-	CTRY_*: add new defines. 
-	LGRPID_*: ditto. 
-	LCMAP*: change defines to hex notation. 
-	CALID: change from ULONG to DWORD. 
-	CALTYPE: ditto. 
-	_cpinfoex[AW]: add structure. 
-	FoldString: correct Unicode mappings. 
-	GetCPInfoEx[AW]: add prototypes. 
-	EnumCalendarInfoEx[AW]: ditto. 
-	EnumDateFormatsEx[AW]: ditto. 
-	EnumSystemLanguageGroups[AW]: ditto. 
-	EnumLanguageGroupLocales[AW]: ditto. 
-	EnumUILanguages[AW]: ditto. 
-	GetSystemDefaultUILanguage[AW]: ditto. 
-	GetUserDefaultUILanguage[AW]: ditto. 
-	IsValidLanguageGroup[AW]: ditto. 
-	CALINFO_ENUMPROCEX[AW]: add function pointer typedef 
-	LANGUAGEGROUP_ENUMPROC[AW]: ditto 
-	LANGGROUPLOCALE_ENUMPROC[AW]: ditto 
-	UILANGUAGE_ENUMPROC[AW]: ditto 
-	DATEFMT_ENUMPROCEX[AW]: ditto 
-	LPCURRENCYFMT[AW]: add structure pointer typedef 
-	LPNUMBERFMT[AW]: ditto 
-
-Sun Dec 02 14:21:02 2000  Matt Hargett <matt@use.net>
-
-	* include/winbase.h: Added a define for INVALID_SET_FILE_POINTER, a 
-	possible return code for the SetFilePointer() win32 API call.
-
-Mon Oct  9 11:49:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/winnt.h: Add missing FILE_NAMED_STREAMS define.
-
-2000-11-06  Earnie Boyd  <earnie_boyd@yahoo.com>
-
-	* Makefile.in: increment VERSION.  
-	(dist:) Rename to srcdist.  Create new dist target to call
-	srcdist and bindist targets.
-	(srcdist:) New target.
-	(clean-top:) add call to mostlyclean-top and add rm of distribution
-	tarballs.
-	* lib/Makefile.in: (uninstall:) modify to remove files from the
-	new w32api subdirectory and to remove w32api subdirectory.
-	(xuninstall:) Ditto.
-	TODO: Add a task to redo the clean targets of Makefile.in
-
-Fri Nov  3 21:50:47 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* lib/Makefile.in: Install header files in w32api subdirectory.
-
-2000-10-31  Earnie Boyd  <earnie_boyd@yahoo.com>
-
-	* CONTRIBUTIONS: New file.
-	* README: Change the maintained by header.
-	* TODO: Add a note about checking the TODO.
-
-2000-10-31  Earnie Boyd  <earnie_boyd@yahoo.com>
-
-	* Merge in accepted changes from 
-	2000-10-23  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
-	* include/basetyps.h: add comment for GUID_DEFINED 
-	* include/lm.h: add includes for lmerr.h and lmserver.h
-	* include/lmcons.h: add W2K typedefs LMSTR, LMCSTR
-	* include/lmerr.h:  add error codes
-	* include/lmserver.h: replace LPTSTR with LPWSTR,
-	LPTCSTR with LPWCSTR in structures and prototypes
-	* include/lmshare.h: ditto
-	* include/lmuse.h: ditto
-	* include/lmstats.h: ditto
-	* include/oleauto.h: add function prototype SystemTimeToVariantTime
-	* include/winbase.h: change first argument of CommConfigDialog to const
-	* include/windowsx.h: add macros  defining FAR versions of
-	mem and string functions for porting from Win16 code
-	* include/winioctl.h:  added IOCTL_STORAGE defines
-	* include/winnetwk.h:  added WNNC_NET flags
-	* include/winnt.h: add include of <basetsd.h>;
-	add structs; add pointer typedefs  for TOKEN structs
-	* include/winsock.h: add guard around BSD-ish typedefs
-	* include/wtypes.h: new VARENUM enums, new WIN32/WIN64 compat. macros
-	* include/basetsd.h: new file
-	* include/raserror.h: ditto
-	* include/rassapi.h: ditto
-	* include/ras.h: ditto
-	comment from Earnie: replaced original ras.h contribution with Danny's
-	contribution as it is more complete.
-	* include/rpcndr.h: add default definition for __RPCNDR_H_VERSION__
-
-Mon Oct 19 13:55:00 2000  Earnie Boyd <earnie_boyd@yahoo.com>
-
-	* Makefile.in: increment VERSION.  Change tar file name for dist and
-	bindist targets to be more standard.
-	* config.guess: Update with the currently published file.
-	* config.sub: ditto.
-	* configure.in: Use value of build_alias instead of testing for
-	directory names to set BUILDENV.
-	* configure: ditto.
-	* lib/Makefile.in: Change the name of the targets install,
-	install-headers and install-libraries to xinstall, xinstall-headers
-	and xinstall-libraries for system target specified installation.  
-	Recreate targets install, install-headers and install-libraries for
-	exec-prefix specified installation.  Ditto for the uninstall targets of
-	the same name.
-
-Mon Oct  9 11:49:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/iprtrmib.h: Further layout changes according to standard.
-	* include/iptypes.h: Ditto.
-	* include/ntdef.h: Ditto.
-	* include/ntsecapi.h: Ditto.
-	* include/subauth.h: Ditto.
-
-Mon Oct  9 11:32:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/ntsecapi.h: Fix PLSA_UNICODE_STRING define.
-
-Sun Oct  8 18:26:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/ntsecapi.h: New file.
-	* include/subauth.h: Ditto.
-	* include/ipexport.h: Fix global header define not to contain
-	trailing underscore. Change layout according to standard.
-	* include/iphlpapi.h: Ditto.
-	* include/ipifcons.h: Ditto.
-	* include/iprtrmib.h: Ditto.
-	* include/iptypes.h: Ditto.
-	* include/ntdef.h: Ditto. Define conditional datatypes dependent
-	of inclusion of ntsecapi.h and subauth.h.
-	* lib/secur32.def: New stub for secur32.dll.
-
-Mon Oct  2 11:15:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/ras.h: New file.
-	* lib/rasapi32.def: Add symbols for RasEnumDevicesA and
-	RasEnumDevicesW.
-
-Mon Oct  2 10:56:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/ntdef.h: Add define for NTAPI.
-
-Sun Oct  1 23:55:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/ipexport.h: Add missing `extern "C"' directives.
-	* include/iphlpapi.h: Ditto.
-	* include/iprtrmib.h: Ditto.
-	* include/iptypes.h: Ditto.
-
-Sun Oct  1 22:09:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/ipifcons.h: New header file.
-	* include/iprtrmib.h: Move operational states to ipifcons.h.
-	* include/iphlpapi.h: Add missing parameters to GetIfTable()
-	declaration.
-
-Sun Oct  1 16:30:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/iprtrmib.h: Add missing MIB_IF_OPER_STATUS_xxx definitions.
-
-Sun Oct  1 16:13:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* lib/iphlpapi.def: New stub for iphlpapi.dll.
-	* include/iptypes.h: New header file.
-	* include/ipexport.h: Ditto.
-	* include/iphlpapi.h: Ditto.
-	* include/iprtrmib.h: Ditto.
-
-Sun Oct  1  2:54:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/ntdef.h: New file.
-
-Fri Aug 18 17:17:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/winnt.h:Add enums for TokenRestrictedSids and TokenSessionId
-	to TOKEN_INFORMATION_CLASS type.
-	Add QUOTA_LIMITS type.
-
-Tue Aug  8 21:29:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/userenv.h: New header file.
-	* lib/userenv.def: New stub for userenv.dll.
-
-Tue Aug  8 10:25:14 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winuser.h: Correct PCWPSTRUCT typo.
-	(discovered by Axel Riese)
-
-2000-07-27  DJ Delorie  <dj@redhat.com>
-
-	* include/windows.h: optimize non-inclusion of repeat headers
-	
-Fri Jul 21 12:10:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/winnt.h: Add missing typedefs for PTOKEN_SOURCE and
-	LPTOKEN_SOURCE.
-
-2000-07-11  DJ Delorie  <dj@cygnus.com>
-
-	* include/shlobj.h: add CSIDL_COMMON_*
-
-Tue Jun 27 19:35:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/winbase.h: Add stream ids BACKUP_OBJECT_ID,
-	BACKUP_REPARSE_DATA and BACKUP_SPARSE_BLOCK.
-	Add file open flags FILE_FLAG_OPEN_REPARSE_POINT and
-	FILE_FLAG_OPEN_NO_RECALL.
-	* winioctl.h: Add device io control codes FSCTL_GET_REPARSE_POINT,
-	FSCTL_SET_REPARSE_POINT and FSCTL_DELETE_REPARSE_POINT.
-	* winnt.h: Add typedef for GUID.
-	Add file attributes FILE_ATTRIBUTE_ENCRYPTED,
-	FILE_ATTRIBUTE_SPARSE_FILE, FILE_ATTRIBUTE_REPARSE_POINT and
-	FILE_ATTRIBUTE_NOT_CONTENT_INDEXED.
-	Add volume attributes FILE_VOLUME_QUOTAS, FILE_SUPPORTS_SPARSE_FILES,
-	FILE_SUPPORTS_REPARSE_POINTS, FILE_SUPPORTS_REMOTE_STORAGE,
-	FILE_SUPPORTS_OBJECT_IDS and FILE_SUPPORTS_ENCRYPTION.
-	Add several reparse point defines and typedefs for REPARSE_DATA_BUFFER,
-	REPARSE_GUID_DATA_BUFFER and REPARSE_POINT_INFORMATION.
-	* lib/psapi.def: New file.
-
-Thu Jun 22 14:36:19 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* rpcdce.h: Protect OPTIONAL definition since it may be (legally)
-	previously defined.
-	* windef.h : Ditto.
-
-2000-06-14  Kazuhiro Fujieda <fujieda@jaist.ac.jp>
-
-	* include/winnt.h: Add some missing defines related to locale
-	identifiers.  Translate values of LANG_* and SUBLANG_* into hexadecimal.
-
-Thu May 27 15:57:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/wincrypt.h: Add missing CRYPT_MACHINE_KEYSET define.
-
-Thu May 18 11:37:00 2000  Corinna Vinschen <corinna@vinschen.de>
-
-	* include/winnt.h: Add some missing TAPE_DRIVE_* defines.
-
-Wed Apr 26 11:04:18 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/wininet.h: Add another "INTERNET_OPTIONS".
-
-2000-04-25  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/winspool.h: Add 2 more PRINTER_ATTRIBUTE_* macros.
-
-2000-04-25  Martin Kotulla  <martin-k@softmaker.de>
-
-	* include/ddeml.h (DdeCreateStringHandle{A,W}): Fix prototype.
-	* include/shlobj.h (IShellLink{A,W}::GetPath): Fix prototype.
-	* include/wingdi.h: Add LPFNDEVMODE and LPFNDEVCAPS callbacks.
-	* include/winuser.h: Add WM_* macros. Add PCOPYDATASTRUCT typedef.
-
-Mon Apr 10 22:58:25 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winbase.h: Change first argument of ENUMRES* types to
-	coincide with Microsoft usage.
-
-Sat Apr  1 20:51:47 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/wininet.h: Add three more "INTERNET_OPTIONS".
-
-2000-03-30  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/winbase.h (CreateHardLink{A,W}): Add prototypes.
-	* include/winerror.h (ERROR_TOO_MANY_LINKS): Add macro.
-	* include/winnt.h (SEC_*): Add macros.
-	* lib/th32.def: Use Kernel32.dll instead of TH32.DLL.
-	* include/ole.h: Workaround for C++ parser bug.
-	* include/rpcdcep.h: Likewise.
-	* include/winsock.h: Likewise.
-
-Sun Mar 26 13:41:47 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/winnt.h: Eliminate duplicate PCONTEXT and LPCONTEXT typedefs.
-
-2000-02-28  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	Patches from Jan Nijtmans <j.nijtmans@chello.nl>:
-	* include/wtypes.h (PBLOB, LPBLOB): Define.
-	* include/winsock2.h: Much more complete version.
-	(FD_SET, SOMAXCONN): Protect common macros defined by winsock.h.
-
-	Patches from Jan Nijtmans <j.nijtmans@chello.nl>:
-	* include/winsock.h (FD_CLR): Add missing ')'.
-	(timercmp): Fix macro to handle all 6 comparison operators.
-	(AF_FIREFOX, AF_UNKNOWN1, AF_BAN, AF_ATM, AF_INET6): Define.
-	(AF_MAX): Update.
-	(PF_FIREFOX, PF_UNKNOWN1, PF_BAN, PF_ATM, PF_INET6): Define.
-
-	* include/largeint.h: Rename HAVE_INT64 macro to _HAVE_INT64 to avoid
-	namespace pollution.
-	* include/rpcndr.h: Likewise.
-	* include/winnt.h: Likewise.
-	* include/shlobj.h (SHGetDataFromIDList{A,W}): Fix typo.
-	(SHGetSpecialFolderPath{A,W}): Add prototypes.
-	* lib/ole32.def: Add missing exports.
-	* include/winbase.h (TLS_MINIMUM_AVAILABLE): Move macro from here
-	* include/winnt.h (TLS_MINIMUM_AVAILABLE): to here.
-	(NT_TIB): Define.
-	* include/tlhelp32.h: New file.
-
-Mon Feb 28 17:08:03 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* include/rapi.h: New file.
-	* lib/rapi.def: New file.
-
-2000-02-11  Axel Riese  <ariese@andromeda.risc.uni-linz.ac.at>
-
-	* oaidl.h (LPTYPECOMP): Remove multiple definition.
-
-2000-02-03  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Snapshot 2000-02-03.
-
-2000-01-21  Chris Faylor  <cgf@cygnus.com>
-
-	* include/winnt.h: Add ARM support.
-
-2000-01-19  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	From Greg Primes <gregory.l.priem@intel.com>:
-	* include/oaidl.h (DESCKIND): Define macro.
-	(ITypeComp): Define interface.
-	(ITypeComp): Likewise.
-	* rpcndr.h (DECLSPEC_UUID): Define macro.
-	(MIDL_INTERFACE): Likewise.
-
-	* include/psapi.h: New file.
-	* include/imagehlp.h: New file.
-	* lib/imagehlp.def: New file.
-
-	* include/oaidl.h (tagVARIANT): Update fields.
-
-	From Craig Lanning <CraigL@DyCon.com>:
-	* include/commctrl.h: Add some TCS_* macros.
-	* include/winnls.h (IsValidLocale): Add prototype.
-
-2000-01-18  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/oaidl.h: OLE Patches from "Fifer, Eric"
-	<EFifer@sanwaint.com> needed to build Win32::OLE perl module.
-	* include/objbase.h: Likewise.
-	* include/objidl.h: Likewise.
-	* include/ocidl.h: New file.
-	* include/oleauto.h: Likewise.
-	* include/wtypes.h: Likewise.
-	* lib/oleaut32.def: Likewise.
-
-	* include/lmserver.h (NetServerTransportAddEx): Fix prototype.
-	Thanks to "Jon Leichter" <jon@symas.com>.
-	* include/commctrl.h (LVM_FINDITEM): Fix typo in macro.
-	* include/winbase.h: Add GetLongPathName{A,W} prototypes.
-	* include/shellapi.h (SHGetFileInfo): Add macro. Thanks to
-	"Axel Riese" <ariese@andromeda.risc.uni-linz.ac.at>.
-	(CommandLineToArgvW): Fix prototype. Thanks to "Frans E. van
-	Dorsselaer" <frans@bia-bv.demon.nl>.
-	* include/httpext.h: New file. Thanks to Jan Nijtmans
-	<j.nijtmans@chello.nl>.
-	* include/mmsystem.h (WAVEFORMATEX): Guard definition to avoid
-	redefinition of LPCWAVEFORMATEX in DirectX headers.
-	(CALLBACK_NULL): Define to be 0. Thanks to Krzysztof Nikiel
-	<krzych00@priv7.onet.pl>.
-	* include/sqlext.h (SQLDriverConnnect): Fix prototype.
-	* include/windef.h (HRESULT): Guard definition to avoid
-	redefinition in DirectX headers.
-	* include/winnt.h: Add target macros from windows.h.
-	* include/windows.h: Update synch comment for target macros.
-	(_ANONYMOUS_STRUCT): Define for GCC 2.95 and newer.
-	(_ANONYMOUS_UNION): Likewise.
-	* include/wingdi.h (AbortPrinter): Move from here ...
-	* include/winspool.h (AbortPrinter): to here and fix linkage.
-	(MONITOR_INFO_2{A,W}): Define.
-	* include/winsock.h (htons): Fix argument.
-	(htonl): Likewise.
-	* include/winsock2.h (SO_*, MAX_*, WSA_*): Add macros.
-	(GROUP): Define.
-	(GUID): Define conditionally.
-	(WSAPROTOCOLCHAIN, WSAPROTOCOL_INFO): Define.
-	(WSASocket*): Declare.
-	* include/basetyps.h (GUID): Guard REGUID and LPGUID as well.
-
-	* lib/dsetup.def: Remove leading underscore.
-	* lib/dsound.def: Likewise.
-	* lib/ws2_32.def: Likewise.
-
-Wed Dec 22 02:53:22 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/windef.h (HMONITOR, HTERMINAL, HWINEVENTHOOK): Define
-	handles.
-
-	* lib/Makefile.in (EXTRA_OBJS): Add dinput.o.
-	* lib/dinput.c: Include windows.h for GCC.
-	* lib/dxguid.c: Likewise.
-	(INITGUID): Define macro.
-
-	* include/objidl.h (ISequentialStream): Define interface.
-	(IStream): Derive from ISequentialStream.
-
-	* include/objidl.h (IStream::{LockRegion, UnlockRegion, Stat,
-	Clone}): Mark as PURE.
-	(IDataObject::EnumDAdvise): Likewise.
-	* include/oleidl.h (IDropSource::GiveFeedback): Likewise.
-	(IViewObject::Unfreeze): Likewise.
-	(IViewObject2::Unfreeze): Likewise.
-
-	* include/objidl.h: Add various IID_ declarations.
-	* include/olectl.h: Likewise.
-	* include/oleidl.h: Likewise.
-
-Tue Dec 21 02:22:14 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Snapshot 1999-12-21.
-
-	* include/winbase.h (CancelIO): Rename to CancelIo.
-	* include/winsvc.h (LPHANDLER_FUNCTION): Fix prototype.
-	* include/winuser.h (PEVENTMSG, LPEVENTMSG): Declare.
-
-	* Merge with winsup-19991218.
-	* include/winnt.h: Add defines for W2K ACL control flags.
-
-	* Merge with Anders Norlander's 19991130 snapshot.
-
-	* include/windows.h: #include mmsystem.h ifndef WIN32_LEAN_AND_MEAN.
-	* include/winbase.h (EXCEPTION_INVALID_HANDLE): Define.
-
-	Patch from Harold Weissfield
-	* include/shellapi.h: Added some ABN_* defines.
-
-	* include/commctrl.h (_TrackMouseEvent): Add prototype.
-	* lib/comctl32.def (_TrackMouseEvent): Import.
-	* include/winuser.h: Misc. fixes from Sang Cho
-	<sangcho@alpha94.chongju.ac.kr>.
-	* include/winuser.h (SM_CMETRICS): Define to 76 or 83 depending on
-	value of _WIN32_WINNT.
-	* include/winuser.h: Reorganize SM_* defines in numerical order.
-
-Tue Dec 14 21:58:03 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/windef.h: Make RECTL a distinct type from RECT.
-	* include/windows.h: Define upto 8 DUMMYUNIONNAMEs for DirectX.
-	* include/winuser.h (CDS_): Update (Franco Bez <franco.bez@gmx.de>).
-	(COMPAREITEMSTRUCT): Fix fields.
-	(SERIALKEYSA): Likewise.
-	(SERIALKEYSW): Likewise..
-	* include/winbase.h (CRITICAL_SECTION_DEBUG): Likewise.
-	(WIN32_FIND_DATAA): Likewise.
-	(WIN32_FIND_DATAW): Likewise.
-	* include/commdlg.h (SNDMSG): Define.
-	* include/winsock.h (SO_UPDATE_ACCEPT_CONTEXT): Define.
-	(SO_CONNECT_TIME): Likewise.
-	(AcceptEx): Declare.
-	(GetAcceptExSockaddrs): Likewise.
-	* include/winsock2.h: Fix typo in #ifdef __cplusplus.
-	* include/winspool.h: Add RC_INVOKED guard.
-	* lib/wsock32.def (AcceptEx@32): Export.
-	(GetAcceptExSockaddrs@32): Likewise.
-
-Thu Nov 18 00:12:43 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* Snapshot 1999-11-18.
-
-	* include/oaidl.h (tagVARIANT): Rename pbool to pboolVal needed by
-	Octopod C++ IDE (and MSVC compatibility).
-	* include/oleauto.h (V_BOOLREF(X)): Likewise.
-	* include/shellapi.h (ShellAbout*): Fix typo.
-	* wingdi.h (FW_ULTRABOLD): Likewise.
-	* include/winnt.h (_TAPE_ERASE, _TAPE_PREPARE, _TAPE_SET_POSITION,
-	_TAPE_WRITE_MARKS): Add missing fields and fix existing ones.
-	Add packing directives for various structures. All structure
-	sizes now conform to MSVC.
-
-Sun Nov  7 02:50:09 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	Released 1999-11-07.
-
-Sat Nov  6 21:25:48 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/winsock2.h: New file. Mostly a stub for now.
-	* include/winbase.h (DllMain): Delete prototype.
-	* include/commctrl.h (Header_SetItem): Fix macro.
-	* include/{isguids.h, lmerrlog.h, mcx.h, objfwd.h, olectl.h,
-	regstr.h, richole.h, rpcdce.h, rpcdcep.h, rpcnsi.h, rpcproxy.h,
-	shlguid.h, sqltypes.h, winperf.h}: Enclose in extern "C" if c++.
-
-	Merge in changes from wxWindows.
-	* include/basetyps.h (GUID_DEFINED, UUID_DEFINED): Add guards.
-	* include/oaidl.h (DISPID_*): Add macros.
-	(IID_ITypeLib, IID_ICreateTypeInfo, IID_ICreateTypeInfo2,
-	IID_ICreateTypeLib, IID_ICreateTypeLib2, IID_ITypeInfo,
-	IID_IErrorInfo, IID_IDispatch, IID_ICreateErrorInfo): Declare.
-	* include/objidl.h (IDataObject): Fix EnumFormatEtc parameter.
-
-	Merge in changes from Octopod C++ IDE group.
-	* include/commctrl.h (NMHEADERA, NMHEADERW): Define.
-	(Header_InsertItem): Fix macro.
-	* include/oaidl.h (IID_IDispatch): Declare.
-	(IID_ISupportErrorInfo): Likewise.
-	(IDispatch): Rename Invoked to Invoke.
-	* include/objidl.h (IPersist): Fix GetClassID.
-	* include/oleauto.h (VectorFromBstr): Declare.
-	(BstrFromVector): Likewise.
-	* include/olectl.h (OLEMISC_*): Update.
-	* include/olectlid.h (IID_IDispatch): Declare.
-	* include/oleidl.h (IOleObject): Fix GetExtent and SetExtent.
-	(IOleInPlaceFrame): Fix.
-	(ISupportErrorInfo): Define.
-	(IErrorInfo): Define.
-	* include/winuser.h (SIF_TRACKPOS): Define.
-
-Wed Nov  3 19:34:12 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	Fix Merge errors:
-	* include/winnt.h (PSID): Uncomment definition.
-	(PISID): Rename from PSID.
-	(struct _TAPE_GET_MEDIA_PARAMETER): Remove reserved field.
-	(struct _SECURITY_ATTRIBUTES): Remove multiple definition.
-
-	* include/lmalert.h, include/lmbrowsr.h, include/lmchdev.h,
-	include/lmconfig.h, include/lmerrlog.h, include/lmmsg.h,
-	include/lmremutl.h, include/lmrepl.h, include/lmserver.h,
-	include/lmsvc.h, include/lmwksta.h, include/oaidl.h,
-	include/shellapi.h, include/winbase.h, include/wingdi.h,
-	include/winnt.h, include/winsock.h: Merged with winsup-19991026.
-
-Sun Oct 31 00:23:50 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/wingdi.h (PHYSICAL*, SCALINGFACTOR*): New. From
-	Marius Kjeldahl <kjeldahl@hotmail.com>.
-
-Sun Aug 29 18:07:42 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/winnt.h (APPLICATION_ERROR_MASK): Add macros.
-	(ERROR_SEVERITY_*): Likewise.
-
-Tue Aug 17 21:05:21 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/winbase.h (TLS_OUT_OF_INDEXES): Add macro.
-	(DllMain): Fix prototype.
-
-Mon Aug  2 23:31:30 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/commdlg.h: Enclose within pack(push,1) and pack(pop).
-	(cderr.h): Don't include.
-	* include/winuser.h: Fix macro definitions.
-
-Mon Aug 02 14:31:37 1999  Anders Norlander  <anorland@hem2.passagen.se>
-
-	Merge with winsup 1999-07-29:
-	* include/wincon.h (MOUSE_WHEELED): Define.
-	* include/winnt.h (PSECURITY_ATTRIBUTES): Add type.
-	(SECURITY_DESCRIPTOR): Add struct type.
-	(PSECURITY_DESCRIPTOR): Pointer to above type. BEWARE: this type
-	is equal to PVOID in the Platform SDK! So don't depend on accessing
-	members through ->.
-
-Mon Aug 02 13:58:52 1999  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* lib/Makefile.in (install-headers): Don't @ commands.
-	(install-libraries): Ditto.
-
-Mon Aug 02 13:49:01 1999  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/sqlext.h: Use #include <sql.h> instead of "sql.h".
-
-Mon Aug 02 13:47:15 1999  Anders Norlander  <anorland@hem2.passagen.se>
-
-	Patch from Mumit Khan:
-	* include/windows.h: Fix typo in winsock.h include guard and add
-	_UWIN to the list.
-	* include/winnt.h (__int64): Undefine first.
-	(struct _SID): Declare.
-
-Mon Aug 02 13:40:28 1999  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winnt.h: Add some REG_* defines reported by Boris Lantrewitz.
-
-Mon Aug 02 13:33:11 1999  Anders Norlander  <anorland@hem2.passagen.se>
-
-	Patch from Mumit Khan:
-	* Makefile.in: Do the right thing when cross-compiling.
-	* include/windef.h: Don't define _export and __export if already
-	defined.
-
-Mon Aug 02 13:24:43 1999  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/basetyps.h (DECLARE_INTERFACE): Use com_interface attribute.
-	(DECLARE_INTERFACE_): Ditto.
-
-Mon Aug 02 13:17:26 1999  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/mmsystem.h (HWAVEOUT): Fix missing ')'
-
-	Reported by Brad Porter
-	* include/wingdi.h (FW_ULTRALIGHT): Add.
-	(FW_DEMIBOLD): Add.
-	(FW_ULTRABOLD): Add.
-	(FW_BLACK): Add.
-	(JOHAB_CHARSET): Add.
-	(VIETNAMESE_CHARSET): Add.
-	
-
-1999-05-15  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* lib/scrnsave.c (WinMain): Remove dependencies on C library.
-	* lib/Makefile.in (Makefile): Regenerate.
-	* include/pshpack[1248].h: New files, if a program would use any of
-	them.
-	* include/poppack.h: Ditto.
-	* include/windef.h (_WIN32_WINNT): Define
-	* include/windows.h: Remove DUMMYUNIONNAME[45].
-	* include/windows.h: Correctly define _M_IX86 to reflect the target
-	processor.
-	* include/windows.h: Add preliminary support for other architectures.
-	* include/winnt.h: Add CONTEXT structure for PPC and ALPHA.
-	* include/winnt.h: Remove PACKED from U/LARGE_INTEGER
-	* include/winnt.h (LUID_AND_ATTRIBUTES): Use pack(4) to solve alignment
-	issue with LARGE_INTEGER.
-	(ANSI_NULL): Define.
-	(PSZ): Define.
-	(ACL_REVISION[1234]): Define.
-	(MIN/MAX_ACL_REVISION): Define.
-	(PTCHAR): Define.
-	(LANG_USER_DEFAULT): Define.
-	(LANG_SYSTEM_DEFAULT): Define.
-	(LOCALE_NEUTRAL): Define.
-	(SORTVERSIONFROMLCID): Define.
-	* include/windef.h (UNREFERENCED_PARAMETER): Define.
-	(UNREFERENCED_LOCAL_VARIABLE): Define.
-	(DBG_UNREFERENCED_PARAMETER): Define.
-	(DBG_UNREFERENCED_LOCAL_VARIABLE): Define.
-	* lib/mswsock.def: New file. Imports for mswsock.dll.
-	* include/custcntl.h: New file. Necessary to compile some SDK
-	samples.
-	* include/winuser.h (SM_MOUSEWHEELPRESENT): Define.
-	(WM_MOUSEWHEEL): Define.
-	(WHEEL_DELTA): Define.
-	(WM_MOUSELAST): Redefine to reflect WM_MOUSEWHEEL.
-	(WM_NEXTMENU): Define.
-	(CharNextA): Fix prototype.
-	(CharNextW): Ditto.
-
-1999-05-14  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winsock.h: Enclose in extern "C" if C++, huh?
-	* include/winuser.h(WM_SYNCPAINT): Define. From fltk.
-
-1999-05-13  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/windef.h (NULL): Define only ifndef
-	(TRUE): Ditto, was previously only defined ifndef FALSE
-	(PASCAL): Define as _pascal
-	(__pascal): Define
-	(WINAPIV): Define
-	(min,max): Define only ifndef NOMINMAX
-
-1999-05-10  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/commctrl.h: Support for Date/Calendar controls + IE controls.
-	You must define _WIN32_IE if you want support for it.
-	Modified patch from Nirmal Prasad  <nprasad@truept.com>.
-
-1999-05-10  Ron Aaron   <v-ronaar@Exchange.Microsoft.com>
-
-	* include/wincon.h: Add some ButtonState flags and EventFlags.
-
-1999-05-10  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/basetyps.h: Don't support COM when __OBJC__ defined because
-	interface define causes mayhem.
-	(DEFINE_INTERFACE): Use comobject attribute only if HAVE_COMOBJECT is
-	defined.
-	* include/windows.h: Undefine BOOL if __OBJC__ defined
-
-1999-05-09  Chris Faylor  <cgf@cygnus.com>
-
-	* include/winnls.h: Define additional code pages.
-
-1999-05-09  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winbase.h(RtlFillMemory): Parameters got passed in wrong
-	order, corrected.
-	(RtlZeroMemory): Use RtlFillMemory
-
-1999-05-04  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winnt.h: Add PACKED to LARGE_INTEGER and ULARGE_INTEGER
-	to get the correct size when used in some structs.
-	(ULARGE_INTEGER): Ditto.
-	* include/winnt.h (TAPE_CREATE_PARTITION): Add struct.
-	* include/winnt.h: Add TAPE_* pointer types PTAPE_*
-
-1999-05-02  Nirmal Prasad  <nprasad@truept.com>
-
-	* include/wininet.h: Enclose in extern "C" if c++
-	(INTERNET_BUFFERSA/W): Define struct
-	* include/wininet.h: Add some HSR_* defines
-	
-1999-05-02  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winnt.h (IMAGE_FIRST_SECTION): Prepend missing paren
-	* include/winnt.h (UNALIGNED): Define
-	* include/windef.h (DECLSPEC_NORETURN): Define
-
-	* include/wininet.h (INTERNET_MAX_NAME): Remove
-	(INTERNET_MAX_SCHEME_LENGTH): Define
-	(INTERNET_MAX_URL_LENGTH): Use INTERNET_MAX_SCHEME_LENGTH
-	* include/wininet.def: Completely redone, it was losing badly.
-
-1999-05-01  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* lib/dplayx.def: Remove '_' prefixes
-	* lib/shell32.def: Remove imports for IID_ContextMenu
-
-1999-04-29  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* Makefile.in (dist): Support dist target
-	* lib/Makefile.in (dist): Likewise
-	* lib/Makefile.in (uninstall-headers): Fix command
-	* Makefile.in (bindist): Target to build a prebuilt dist
-
-	* lib/ws2_32.def: Winsock2 implib
-
-	* include/largeint.h: New header
-	* include/largeint.c: Large integer support library
-	* lib/Makefile.in(EXTRA_LIBS): Add liblargeint.a
-	(EXTRA_OBJS): Add largeint.o
-
-	* include/Makefile: Remove
-	* lib/Makefile: Remove
-	* Makefile: Remove
-	* configure.in: New autoconf script
-	* configure: generated configure script
-	* Makefile.in: autoconf makefile template
-	* lib/Makefile.in: Ditto
-	* include/test.c: mv to lib/test.c
-	* include/res.rc: mv to lib/res.rc
-	* include/TODO: mv to .
-	* include/Notes: mv to ./NOTES
-
-1999-04-28  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/zmouse.h (WHEEL_DELTA): Define
-
-Mon Apr 26 16:36:49 1999  Mumit Khan  <khan@xraylith.wisc.edu>
-
-	* include/ddeml.h (HSZPAIR): Declare.
-	* include/zmouse.h: New file.
-	
-1999-04-27  Daniel Guerrero Miralles  <daniel.guerrero@upcnet.upc.es>
-
-	* lib/d3dim.def: New implib
-	* lib/d3drm.def: Ditto
-	* lib/d3dxof.def: Ditto
-	* lib/ddraw.def: Ditto
-	* lib/dinput.def: Ditto
-	* lib/dplayx.def: Ditto
-	* lib/dsetup.def: Ditto
-	* lib/dsound.def: Ditto
-	* lib/dinput.c: Guid library for DirectInput
-	* lib/dxguid.c: Guid library for DirectX
-	
-1999-04-21  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/windowsx.h (GET_X_LPARAM): Missing macro added (reported
-	by Ron Aaron).
-	* include/windowsx.h (GET_Y_LPARAM): Also missing
-	* include/winnls.h (IsValidCodePage): Missing prototype added (reported
-	by Mumit Khan).
-
-1999-04-18  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/scrnsave.h: New header file for screen saver library
-	* lib/scrnsave.c: New file: screen saver library
-
-1999-04-17  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/regstr.h: Enclosed all strings in TEXT() macros so it
-	works well in when UNICODE is defined
-
-1999-04-17  Nirmal Prasad  <nprasad@truept.com>
-
-	* include/winuser.h(STYLESTRUCT): New struct
-	* include/wingdi.h:(GOBJENUMPROC): This function type should
-	return void.
-
-1999-04-17  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/basetyps.h (LPGUID): New typedef
-	* lib/glut.def: Import library defintions for glut.dll
-	* lib/glu32.def: Ditto for glut32.dll
-	* include/winnt.h: Fixed handling of wchar_t typedef
-	* include/sql.h(SQL_NO_DATA_FOUND): Replace with SQL_NO_DATA
-	* include/sqlext.h(SQL_NO_DATA_FOUND): Define as SQL_NO_DATA
-
-1999-03-20  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winbase.h(AbnormalTermination): Define as FALSE
-	* include/commctrl.h: Support for new progress bar messages/styles
-
-1999-03-20  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/commdlg.h(PageSetupDlg): New define
-	* include/richedit.h: Missing SCF_* defines
-	* include/winnt.h: Lots o' defines
-	* include/winbase.h(AllocateAndInitializeSid): Corrected prototype
-
-1999-03-09  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/commdlg.h: Removed pack pragma
-	* lib/comctl32.def(InitCommonControlsEx@4): Added import
-
-1999-03-08  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* Makefile: Set version to 0.1.5
-	* lib/Makefile (clean): Fix typo
-
-	* include/commctrl.h: Removed pack pragma
-	* include/cpl.h: Likewise
-	* include/dbt.h: Likewise
-	* include/dde.h: Likewise
-	* include/nddeapi.h: Likewise
-	* include/shellapi.h: Likewise
-	* include/wincrypt.h: Likewise
-	* include/lmaccess.h: Fixed USER_PRIV_ADMIN typo
-
-	* include/winsock.h (netent): Define only ifndef __INSIDE_CYGWIN__
-	(servent): Likewise
-	(protoent): Likewise
-
-	* include/windows.h: Prevent inclusion of winsock.h if we are
-	using or compiling cygwin. Define Win32_Winsock to force inclusion.
-
-1999-01-08  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winbase.h (CREATE_FORCEDOS): New define
-
-1999-01-07  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/wincon.h(KEY_EVENT_RECORD): Fixed packing problem on
-	(COORD): Likewise
-	* include/wingdi.h (BITMAPFILEHEADER): Fixed packing
-	* include/windows.h: Added DUMMYUNIONNAME4 and 5
-	* include/winnt.h (LUID_AND_ATTRIBUTES_ARRAY): New type
-	(PLUID_AND_ATTRIBUTES_ARRAY): New type
-	
-	* include/ddeml.h: Removed unnecessary `#pragma pack'
-	* include/imm.h: Likewise
-	* include/nddeapi.h: Likewise
-	* include/nspapi.h: Likewise
-	* include/regstr.h: Likewise
-	* include/wincon.h: Likewise
-	* include/windef.h: Likewise
-	* include/winioctl.h: Likewise
-	* include/winnls.h: Likewise
-	* include/winsvc.h: Likewise
-	* include/winuser.h: Likewise
-	* include/winver.h: Likewise
-	* include/wtypes.h: Likewise
-
-1999-01-05  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* Makefile (VERSION): Set to 0.1.4
-	* include/basetyps.h: Check for NOCOMOBJECT
-	* include/Makefile: Pass -DNOCOMOBJECT to g++ to avoid warnings
-	on comobject attribute.
-	* lib/kernel32.def: Added a few functions
-	* include/windef.h (DWORD): Changed back to unsigned long
-
-	* include/windows.h: Include only winresrc.h if RC_INVOKED is defined,
-	winresrc.h in turn includes the necessary headers. This makes things
-	much simpler, no need to protect blocks of code in headers that
-	should not be seen by the resource compiler.
-
-1999-01-05  Geoffrey Noer  <noer@cygnus.com>
-
-	* include/winbase.h (STATUS_INVALID_HANDLE): Added define
-	* include/wincon.h: Added console event type flags
-	* include/winnt.h (FILE_SHARE_DELETE): Added
-	  (SECURITY_DESCRIPTOR): typedef as DWORD
-	
-	* include/winuser.h (WM_PENWINFIRST): Fixed typo
-	* include/winsock.h: Protect some blocks with __INSIDE_CYGWIN_ and
-	define u_* types only if _SYS_TYPES_H is not defined.
-
-1999-01-02  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* COPYING.LIB: Deleted
-	* README: Updated to reflect license changes
-	* include/shlobj.h: Remove extra comma on some enums
-	* include/windef.h: Changed DWORD typedef from unsigned long to
-	unsigned int in order to avoid warnings on bit fields that
-	use DWORD.
-	* include/Makefile (test): Compile with all warnings
-	* include/unknwn.h: Include objfwd.h
-	* include/winsock.h: Added missing copyright notices.
-
-1999-01-01  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* lib/winmm.def: Corrected LIBRARY statement
-	* include/mmsystem.h: Define mmioSeek codes if not already defined
-	* include/commctrl.h (CreateStatusWindowA): Corrected prototype
-	(CreateStatusWindowW): Likewise
-
-	* include/winresrc.h: Include only files necessary instead of windows.h
-	* include/dde.h: Allow inclusion in resource scripts.
-	* include/winnt.h: Likewise
-	* include/commctrl.h: Likewise
-	* include/prsht.h: Likewise
-	* README: Updated
-
-1998-12-10  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/sqltypes.h (SQLHANDLE): Added this type
-	(SQLHDESC): Likewise
-	* include/sql.h (SQLFreeHandle): Added this prototype
-	(SQLAllocHandle): Likewise
-
-1998-12-08  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winsock.h: Define _GNU_H_WINDOWS32_SOCKETS to avoid
-	conflicts with cygwin headers.
-
-1998-12-06  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* Makefile: Changed VERSION to 0.1.3
-	* Makefile (dist-lib): New target to make import library only
-	distribution
-	* Makefile (dist-hdr): New target to make headers only distribution
-	* Makefile (dist): Now depends on dist-lib and dist-hdr instead of
-	building one single distribution file.
-	* dist.mak: Deleted
-
-	* include/lm.h: New file
-	* include/lmcons.h: New file
-	* include/lmalert.h: New file
-	* include/lmaudit.h: New file
-	* include/lmconfig.h: New file
-	* include/lmapibuf.h: New file
-	* include/lmaccess.h: New file
-	* include/lmchdev.h: New file
-	* include/lmremutl.h: New file
-	* include/lmrepl.h: New file
-	* include/lmerrlog.h: New file
-	* include/lmat.h: New file
-	* include/lmuse.h: New file
-	* include/lmuseflg.h: New file
-	* include/lmserver.h: New file
-	* include/lmerr.h: New file
-	* include/lmsname.h: New file
-	* include/lmstats.h: New file
-	* include/lmsvc.h: New file
-	* include/lmwksta.h: New file
-	* include/lmbrowsr.h: New file
-
-1998-12-05  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/unknwn.h: Fixed IClassFactory declaration; INTERFACE was missing
-	* include/unknwn.h: Added extern declaration for IID_IClassFactory
-
-	* include/initguid.h: New file
-
-	* include/rpcndr.h: Defined hyper and MIDL_hyper as double if 64 bit
-	int not supported
-
-	* include/winnt.h: Added USN
-	* include/winnt.h: Changed handling of 64 bit int support
-
-	* include/windows.h: Added support for BC,LCC and MSVC
-
-	* include/windows.h: Changed handling machine architecture defines
-
-	* include/olectl.h: New file
-
-1998-12-04  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/oleidl.h: Added IViewObject and IViewObject2
-
-	* include/objidl: Corrected prototype for IStorage::DestroyElement and
-	IStorage::MoveElement
-
-	* include/oledlg.h: New file
-
-	* include/winresrc.h: New file
-
-	* include/wingdi.h: Added LPDOCINFO
-
-	* include/commctrl.h: Added SBARS_SIZEGRIP and TVM_SETINDENT
-	* include/commctrl.h: Added TCM_SETITEM to UNICODE/ANSI block
-	* include/commctrl.h: Added ListView_GetSelectedCount, ListView_GetItemSpacing,
-	TabCtrl_SetImageList and TabCtrl_GetItemCount
-	* include/commctrl.h: Added TVM_FIRST, HDM_FIRST and TV_FIRST
-
-	* include/windowsx.h: Added missing ListBox_xx ComboBox_xx etc. macros
-
-	* include/wingdi.h: Added (L)PBITMAP,(L)PBITMAPCOREHEADER,
-	PBITMAPINFOHEADER, (L)PBITMAPCOREINFO and (L)PBITMAPFILEHEADER.
-
-	* include/commdlg.h: Added LPDEVNAMES
-
-	* include/windows.h: Include excpt.h
-
-	* include/excpt.h: New file. This file just contains some
-	stubs for SEH that do nothing.
-	
-	* include/commctrl.h: Added general WM_NOTIFY codes
-
-	* include/winuser.h: Added ICON_SMALL and ICON_BIG
-	* include/winuser.h: Removed VK_0-VK_9 VK_A-VK_Z; they should obviously
-	not be in the headers.
-	* include/winuser.h: Added LPCBTACTIVATESTRUCT and LPCLIENTCREATESTRUCT
-	* include/winuser.h: Added old WM_SIZE parameter names so
-	wxWindows compiles.
-	* include/winuser.h: Added IDC_SIZE and IDC_ICON
-	* include/winuser.h: Added LPDLGITEMTEMPLATE
-	* include/winuser.h: HTCAPTION was missing value
-	* include/winuser.h: Added WM_ACTIVE flags
-
-	* include/windowsx.h: Added _fmemcpy so V compiles; also added
-	_fxx defines for memmove, memset and memcmp
-
-	* include/windef.h: Changed _export and __export to empty defines
-
-	* include/shellapi.h: Corrected prototypes for ExtractIcon functions.
-	String parameters were not const and ExtractAssociatedIcon takes
-	a WORD pointer not DWORD pointer as last parameter.
-
-	* Makefile: Changed VERSION to 0.1.2
-
-	* include/ole2ver.h: New file
-
-	* Makefile: Removed all dependencies on GLUT
-	
-	* include/GL/glut.h: Removed file because of decision to remove
-	files that are not part of the library.
-	* lib/glut.def: Likewise
-	* lib/glut32.def: Likewise
-	
-	* include/windows.h: Include winperf.h
-	
-	* include/winperf.h: New file
-
-	* lib/gdi32.def: Added GetEnhMetaFilePixelFormat
-
-	* include/winnls.h: Added calendar types
-	* include/winnls.h: Added country codes
-
-1998-12-03  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/windef.h: Added PROC and NEARPROC
-
-	* include/wingdi.h: Added ChoosePixelFormat, DescribePixelFormat
-	* include/wingdi.h: Added OpenGL types and prototypes
-	* include/wingdi.h: Added ENHMETA_STOCK_OBJECT
-	* include/wingdi.h: Added DCTT_DOWNLOAD_OUTLINE
-	* include/wingdi.h: Added POINTFX, TTPOLYCURVE and TTPOLYGONHEADER
-	* include/wingdi.h: Added truetype character outline types
-	* include/wingdi.h: Added DEVMODE initialization flags
-	* include/wingdi.h: Added panose codes
-	* include/wingdi.h: Added missing character sets
-	* include/wingdi.h: Added ANTIALIASED_QUALITY and
-	NONANTIALIASED_QUALITY
-	* include/wingdi.h: Added ENUMLOGFONTA/W and ENUMLOGFONTEXA/W
-	* include/wingdi.h: Added pointer types for EXTLOGPEN
-	* include/wingdi.h: Added PATTERN type
-	* include/wingdi.h: Added NEWTEXTMETRICA/W and NEWTEXTMETRICEXA/W
-	* include/wingdi.h: Added new text metric flags
-	* include/wingdi.h: Added pitch and family flags
-	* include/wingdi.h: Moved BCHAR defintion from winnt.h here
-	* include/wingdi.h: Added METAHEADER
-	* include/wingdi.h: Fixed packing of RGBTRIPLE and BITMAPFILEHEADER
-	* include/wingdi.h: Added TA_MASK
-	* include/wingdi.h: Added MAXSTRETCHBLTMODE
-	* include/wingdi.h: Added error codes
-
-	* include/winuser.h: Added missing winhelp structures
-	* include/winuser.h: Added dialog flags/styles/messages
-	* include/winuser.h: Added EM_SETMARGIN codes
-	* include/winuser.h: Made it possiblie to use IDI_XX values
-	in resource files.
-	* include/winuser.h: Added missing LoadImage load flags
-	* include/winuser.h: Added missing message box flags
-	* include/winuser.h: Added ScrollWindow codes
-	* include/winuser.h: Added DT_WORD_ELLIPSIS
-	* include/winuser.h: Added drag and drop support
-	* include/winuser.h: Added WM_MENUCHAR return codes
-	* include/winuser.h: Added DLGWINDOWEXTRA
-	* include/winuser.h: Added missing SetWindowPos flags.
-	* include/winuser.h: Added BSF_NOTIMEOUTIFNOTHUNG
-	* include/winuser.h: Added IDHOT_xx defines
-	* include/winuser.h: Added MOD_WIN
-	* include/winuser.h: Added missing defines and structs for owner draw
-	controls.
-	* include/winuser.h: Added WPF_RESTORETOMAXIMIZED and
-	WPF_SETMINPOSITION
-	* include/winuser.h: Added DrawAnimatedRects flags
-	* include/winuser.h: Added WM_PRINT codes
-	* include/winuser.h: Added CS_IME class style
-	* include/winuser.h: Added WM_SIZE codes
-	* include/winuser.h: Added WM_MOUSEACTIVATE return codes
-	* include/winuser.h: Added WM_NCHITTEST return codes
-	* include/winuser.h: Added WM_SIZING parameters
-	* include/winuser.h: Added WM_NEXTMENU and MDINEXTMENU
-	* include/winuser.h: Added menu loop codes.
-	* include/winuser.h: Added NFR_ANSI, NFR_UNICODE, NF_QUERY and
-	NF_REQUERY
-	* include/winuser.h: Added WM_POWER flags
-	* include/winuser.h: Added KL_NAMELENGTH, WSF_VISIBLE
-	* include/winuser.h: Added missing message filter codes
-	* include/winuser.h: Added WM_KEYXX message flags
-	* include/winuser.h: Added WM_SHOWMESSAGE flags
-	* include/winuser.h: Added old ShowWindow commands
-	* include/winuser.h: Fixed packing of DLGITEMTEMPLATE and DLGTEMPLATE
-	structures.
-
-	* include/mciavi.h: New file for the MCI AVI driver that for some
-	reason is not in mmsystem.h.
-
-	* include/winbase.h: Added PIPE_UNLIMITED_INSTANCES and INVALID_FILE_SIZE
-	* include/winbase.h: Added SECURITY_xx for CreateFile
-	* include/winbase.h: Added RTS and DTS control values
-	* include/winbase.h: Fixed SYSTEM_INFO structure
-	* include/winbase.h: Added CREATE_NO_WINDOW, CREATE_SHARED_WOW_VDM
-	* include/winbase.h: Added FILE_TYPE_REMOTE
-	* include/winbase.h: Added modem status flags
-	* include/winbase.h: Added HINSTANCE_ERROR
-	* include/winbase.h: Added DefineDosDevice defines
-	* include/winbase.h: Added power management flags AC_xx BATTERY_xx
-	* include/winbase.h: Added STARTF_XX flags
-	* include/winbase.h: Fixed typo on _lcreat prototype.
-	* include/winbase.h: Moved DBG_XX to winnt.h
-	* include/winbase.h: Moved TOKEN_XX, DLL_PROCESS_XX and DLL_THREAD_XX to
-	winnt.h
-
-	* include/unknwn.h: Added extern declaration of IID_IUnknown
-
-	* include/windowsx.h: Added hmemcpy.
-
-	* include/winnt.h: Added dummy member to DECLARE_HANDLE struct
-	* include/winnt.h: Added PACCESS_TOKEN
-	* include/winnt.h: Added TAPE_XX defines and moved some from winbase.h
-	* include/winnt.h: Added SE_IMPERSONATION_STATE and TOKEN_SOURCE_LENGTH
-	* include/winnt.h: Added SE_PRIVILEGE_ENABLED_BY_DEFAULT, SE_PRIVILEGE_ENABLED,
-	SE_PRIVILEGE_USED_FOR_ACCESS, PRIVILEGE_SET_ALL_NECESSARY,
-	SECURITY_MAX_IMPERSONATION_LEVEL, DEFAULT_IMPERSONATION_LEVEL,
-	SECURITY_DYNAMIC_TRACKING and SECURITY_STATIC_TRACKING.
-
-	* include/winnt.h: Added SE_OWNER_DEFAULTED, SE_GROUP_DEFAULTED, SE_DACL_XX,
-	SE_SACL_XX, SE_SELF_RELATIVE, SECURITY_DESCRIPTOR_MIN_LENGTH,
-	SECURITY_DESCRIPTOR_REVISION and SECURITY_DESCRIPTOR_REVISION1.
-
-	* include/winsvc.h: Removed conflicting defines which were supposed
-	to be in winnt.h
-	
-	* include/winnt.h: Added SERVICE_NODE_TYPE, SERVICE_LOAD_TYPE
-	and SERVICE_ERROR_TYPE.
-	
-	* include/winnt.h: Added SERVICE_XX defines.
-	* include/winsvc.h: Added SERVICES_ACTIVE_DATABASEA/W,
-	SERVICES_FAILED_DATABASEA/W and SC_GROUP_IDENTIFIERA/W.
-
-	* include/winsvc.h: Added SERVICE_STATE_ALL, SERVICE_QUERY_CONFIG,
-	SERVICE_CHANGE_CONFIG, SERVICE_QUERY_STATUS, SERVICE_ENUMERATE_DEPENDENTS,
-	SERVICE_START, SERVICE_STOP, SERVICE_PAUSE_CONTINUE,
-	SERVICE_USER_DEFINED_CONTROL and SERVICE_ALL_ACCESS
-
-1998-12-02  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winbase.h: Corrected prototype for CreateProcessA
-
-	* include/mmsystem.h: Added CAPS1 and C1_TRANSPARENT for display
-	driver extensions.
-
-	* include/shlobj.h: Corrected prototype for SHGetDesktopFolder, should
-	be LPSHELLFOLDER* not LPSHELLFOLDER.	
-
-	* include/windows.h: Include commdlg.h
-
-	* include/winuser.h: Added MDICREATESTRUCT
-
-	* include/winuser.h: Added LB_ERR, LB_ERRSPACE, LB_OKAY, CB_ERR,
-	CB_ERRSPACE, and CB_OKAY
-
-	* include/wingdi.h: Added LPBITMAPINFOHEADER
-
-	* include/rpcproxy.h: Removed IN, OUT and OPTIONAL since they
-	are meaningless.
-	* include/rpcdce2.h: Likewise.
-
-	* lib/shell32.c: Moved GUID defintions from shlguid.h to this file.
-
-	* include/richole.h: Replaced DEFINE_GUID with extern const GUID
-	* include/olectlid.h: Likewise
-	* include/shlguid.h: Likewise
-
-	* include/coguid.h: Delete file since it was for 16 bit windows only.
-
-	* lib/*.def: Appended .dll to library name where needed.
-
-	* include/windef.h: Define _stdcall and __stdcall only if not
-	previously defined instead of undefining first.
-
-	* include/dlgs.h: Put RC_INVOKED around structure defs
-
-	* include/intshcut.h: New file
-	* include/isguids.h: New file
-
-	* lib/uuid.c: Added all COM/OLE GUIDS I know and do not know about.
-
-1998-12-01  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winnt.h: Added check if _T is defined before defining it
-
-	* include/windows.h: Include dlgs.h if WIN32_LEAN_AND_MEAN not defined
-
-	* include/dlgs.h: New file
-
-	* include/winbase.h: Removed DllEntryPoint define
-
-	* include/winbase.h: Added SetupComm prototype
-
-	* include/rpc.h: SEH RPC functions no longer defined since they weren't
-	supported anyway.
-
-	* include/basetyps.h: Removed use of COMOBJECT define, instead
-	DECLARE_INTERFACE directly uses comobject attribute when GCC
-	is used.
-
-	* include/wtypes.h: STGC enum was missing typedef
-
-	* include/objidl.h: ADVC enum was missing typedef
-
-	* include/winnt.h: Moved CHAR, SHORT and LONG definitions so
-	they are nested within the VOID definition.
-
-	* include/winbase.h: Added stream ids and attributes
-
-	* include/winbase.h: Changed WIN32_STREAM_ID member cStreamName
-	to an ANYSIZE_ARRAY array.
-
-1998-11-26  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/windef.h: defined _declspec as __declspec since
-	some programs (like VWCL) use _declspec instead of __declspec
-
-	* include/winnt.h: added COMPRESS_FORMAT defines
-
-	* include/winbase.h: moved IS_TEXT_XXX defines to winnt.h
-
-	* include/winnt.h: added HEAP_XXXX defines
-
-	* include/winbase.h: moved HEAP_XXXX defines to winnt.h
-
-	* include/winnt.h: added defintions for PE/COFF from the PE and COFF
-	specification.
-
-	* include/winnt.h: added NTAPI define
-
-1998-11-25  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winnt.h: defined TBYTE,LPTSTR etc in terms of TCHAR
-	instead of CHAR or WCHAR.
-
-	* include/winnt.h: added _T define
-
-	* include/winnt.h: added test for _TCHAR_DEFINED
-
-	* include/winnt.h: included string.h for memory macros
-
-	* include/prsht.h: added PSM_SETFINISHTEXT to UNICODE/ANSI test
-
-	* include/prsht.h: moved PSM_SETTITLEA/W to UNICODE test at end of file
-
-	* include/prsht.h: added PropSheet_XXX macros
-
-
-1998-11-24  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* include/winspool.h: Changed DeletePrinterProcessor and
-	DeletePrinterProvidor to DeletePrintXX.
-
-	* include/wingdi.h: Changed EMRCREATECOLORSPACE lcs member type to
-	LOGCOLORSPACEW.
-
-	* include/wingdi.h: Changed prototype for CreateColorSpace to A and W
-	variants
-
-	* include/wingdi.h: Likewise for GetLogColorSpace
-	
-	* include/wingdi.h: Changed LOGCOLORSPACE to LOGCOLORSPACEA/W.
-
-	* include/richedit.h: Added missing defines and structures
-
-	* include/winuser.h: Moved EDITWORDBREAKPROCEX to include/richedit.h
-
-	* include/winuser.h: Added HWND_DESKTOP
-
-1998-11-23  Anders Norlander  <anorland@hem2.passagen.se>
-
-	* Makefile: Include ChangeLog when building source
-	distribution (srcdist)
-
-	* include/oleauto.h: Changed WINOLEAUTAPI and WINOLEAUTAPI_ so they
-	are always defined as STDAPI and STDAPI_
-
-	* include/objbase.h: Changed WINOLEAPI and WINOLEAPI_ so they
-	are always defined as STDAPI and STDAPI_
-
-	* include/objidl.h: Removed extra ';' on IStorage SetClass method
-
-	* include/rpcndr.h: Removed all IN and OUT from function prototypes
-
-	* ChangeLog started
diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
deleted file mode 100644
index f93fde420..000000000
--- a/winsup/w32api/Makefile.in
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-#	Makefile.in
-#
-#	This file is part of a free library for the Win32 API.
-# 
-#	This library is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# start config section
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-build_alias = @build@
-host_alias = @host@
-target_alias = @target@
-prefix = @prefix@
-conf_prefix = @prefix@
-
-program_transform_name = @program_transform_name@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-datadir = @datadir@
-infodir = @infodir@
-includedir = @includedir@
-
-CC = @CC@
-CC_FOR_TARGET = $(CC)
-CFLAGS = @CFLAGS@
-
-DLLTOOL = @DLLTOOL@
-AS = @AS@
-AS_FOR_TARGET = $(AS_FOR_TARGET)
-WINDRES = @WINDRES@
-
-RANLIB = @RANLIB@
-AR = @AR@
-LD = @LD@
-
-TAR = tar
-TARFLAGS = z
-TARFILEEXT = .tar.gz
-
-FLAGS_TO_PASS = \
-	AS="$(AS)" \
-	CC="$(CC)" \
-	CPPFLAGS="$(CPPFLAGS)" \
-	CFLAGS="$(CFLAGS)" \
-	CXXFLAGS="$(CXXFLAGS)" \
-	AR="$(AR)" \
-	RANLIB="$(RANLIB)" \
-	LD="$(LD)" \
-	DLLTOOL="$(DLLTOOL)" \
-	TAR="$(TAR)" \
-	TARFLAGS="$(TARFLAGS)" \
-	TARFILEEXT="$(TARFILEEXT)" \
-	WINDRES="$(WINDRES)"
-
-# end config section
-
-SUBDIRS = lib
-
-PACKAGE = w32api
-VERSION = 2.5
-CYGRELEASE = 1
-
-DIST_FILES = Makefile.in configure.in configure config.guess config.sub \
-install-sh README.w32api ChangeLog TODO CONTRIBUTIONS
-
-all: lib
-
-%-subdirs:
-	for i in $(SUBDIRS); do \
-	  $(MAKE) $(FLAGS_TO_PASS) -C $$i $*; \
-	done
-
-lib:
-	$(MAKE) $(FLAGS_TO_PASS) -C $@
-
-test:
-	$(MAKE) -C lib test $(FLAGS_TO_PASS)
-
-install uninstall:
-	for i in $(SUBDIRS); do \
-		(cd $$i; $(MAKE) $@); \
-	done
-
-ifdef SNAPDATE
-    distdir = $(PACKAGE)-$(VERSION)-$(SNAPDATE)
-else
-   ifneq (,$(findstring cygwin, $(target_alias)))
-      distdir=$(PACKAGE)-$(VERSION)-$(CYGRELEASE)
-   else
-      distdir=$(PACKAGE)-$(VERSION)
-   endif
-endif
-
-ifneq (,$(findstring mingw, $(target_alias)))
-    dist_prefix=
-else
-    dist_prefix=/$(conf_prefix)
-endif
-
-ifneq (,$(findstring cygwin, $(target_alias)))
-  TARFLAGS = j
-  TARFILEEXT = .tar.bz2
-endif
-
-dist: srcdist bindist
-
-srcdist:
-	rm -rf $(distdir)
-	mkdir $(distdir)
-	chmod 755 $(distdir)
-	for i in $(DIST_FILES); do \
-		cp -p $(srcdir)/$$i $(distdir)/$$i ; \
-	done
-	for i in $(SUBDIRS); do \
-		(cd $$i; $(MAKE) distdir=../$(distdir) dist); \
-	done
-	rm -f $(distdir)-src$(TARFILEEXT)
-	$(TAR) $(TARFLAGS)cf $(distdir)-src$(TARFILEEXT) $(distdir)
-
-bindist:
-	rm -rf $(distdir)
-	mkdir $(distdir)
-	chmod 755 $(distdir)
-	$(MAKE) install prefix=`pwd`/$(distdir)$(dist_prefix) exec_prefix=`pwd`/$(distdir)$(dist_prefix)
-	rm -f $(distdir)$(TARFILEEXT)
-	cd $(distdir); $(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) *
-
-snapshot:
-	make dist SNAPDATE=$(shell date '+%Y%m%d')
-
-Makefile: Makefile.in config.status configure
-	$(SHELL) config.status
-
-mostlyclean-top:
-	rm -f *~
-clean-top: mostlyclean-top
-	rm -rf $(distdir)
-	rm -f $(distdir)*$(TARFILEEXT)
-maintainer-clean-top:
-
-mostlyclean: mostlyclean-top mostlyclean-subdirs
-clean: mostlyclean-top clean-subdirs
-distclean: clean-top
-	rm -f Makefile config.status config.log config.cache TAGS *~
-	$(MAKE) -C lib distclean
-maintainer-clean: maintainer-clean-subdirs
-
-.PHONY: lib test 
diff --git a/winsup/w32api/README.w32api b/winsup/w32api/README.w32api
deleted file mode 100644
index 6cf2a6a3c..000000000
--- a/winsup/w32api/README.w32api
+++ /dev/null
@@ -1,93 +0,0 @@
-        Free headers and libraries for the Win32 API
-
-        Originally written by Anders Norlander 
-	Last known and not working email: <anorland@hem2.passagen.se>
-
-	Now maintained by MinGW Developers
-        Send bug reports and questions to MinGW-users@lists.sourceforge.net
-	URL: http://www.mingw.org
-
-* License 2.0
-
-  You are free to use, modify and copy this package as long as this
-  README.w32api file is included unmodified with any distribution, source or
-  binary, of this package.  No restrictions are imposed on any package or 
-  product using or incorporating this package.  You are free to license your 
-  package as you see fit.
-  
-  You may not restrict others freedoms as set forth in the above paragraph.
-  You may distribute this library as part of another package or as a
-  modified package if and only if you do *not* restrict others freedoms as
-  set forth in the above paragraph as it concerns this package.  You do have
-  the right to restrict uses of any package using this package.
-
-  This package is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-* What is it?
-
-  This is a free set of headers and import libraries for the Win32
-  API.  The library differs from the GNU Windows32 library in that I
-  have tried to use a file structure that mirrors Microsoft's.  I
-  don't like having *all* definitions in one single header as in the
-  GNU Windows32 library, I want a clean separation between different
-  parts of the API.
-
-  Daniel Guerrero Miralles contributed the DirectX 6.1 import
-  libraries and DirectX GUID definitions.
-
-  See the files NOTES and TODO for what needs to be done.
-
-* Size does matter
-
-  Since the WIN32 API is severely bloated (as most MS products seem to
-  be) the headers are designed to be as compact as possible, while
-  still being readable, in order to minimize parsing time.
-
-  The convention is to omit parameter names for function prototypes,
-  no excessive white space. Struct/union members are indented with tab
-  characters to make them readable. Comment only when necessary.
-
-  If you are contributing a patch please follow the above mentioned
-  convention. Make sure your editor does not convert tabs to spaces.
-
-* What do I need to use it?
-
-  The library is intended for use with egcs 1.1 or later but it is
-  possible to use with some other tools as well (although it is not
-  very useful). LCC-Win32, MSVC and Borland C++ 5.01 or higher may
-  work as well. The import libraries are for GNU tools only.
-
-  The library requires egcs 1.1 or later, since the `#pragma pack'
-  feature is used. Mumit Khan provides egcs patches and binaries for
-  win32 at `http://www.xraylith.wisc.edu/~khan/software/gnu-win32/'.
-
-  If you are going to use C++ COM objects, you will need a version of
-  egcs that recognizes the `comobject' attribute and then define
-  HAVE_COMOBJECT when compiling your program. Antonio Mendes de
-  Oliveira Neto has a prebuilt version at
-  `http://li.facens.br/EGCS-WIN32/english/index.html'. Note that this
-  is very experimental. If you want to use COM objects in C++ but with
-  C interfaces you must define CINTERFACE.
-
-  Objective-C programs cannot use COM functionality because of
-  conflicts between the interface define and the Objective-C
-  @interface directive.  There is also a conflict between the windows
-  Obj-C BOOL types. To avoid this conflict you should use WINBOOL in
-  all places where you would use BOOL in a C/C++ windows program. If
-  you include any windows headers *after* `windows.h' you must use the
-  method outlined below:
-
-  /* non-windows includes */
-  #include <objc/objc.h>
-  ...
-  /* windows specific headers */
-  #include <windows.h>
-  #define BOOL WINBOOL
-  #include <commctrl.h>
-  ...
-  #undef BOOL
-  ...
-  /* include other headers */
-
diff --git a/winsup/w32api/TODO b/winsup/w32api/TODO
deleted file mode 100644
index 9acfbbe71..000000000
--- a/winsup/w32api/TODO
+++ /dev/null
@@ -1,62 +0,0 @@
-Makefile.in: Need to redo the clean targets
-
-**Check to see if the rest of this is still valid?**
-
-winsock2.h - Possible to merge with winsock.h?
-listview control
-_WIN32_IE issue
-
-Missing functions/defines/structs
-=================================
-ATF_AVAILABLE
-SERKF_ACTIVE
-TIMER_ALL_ACCESS,TIMER_MODIFY_STATE (new style Win32 Access Control: accctrl)
-AbnormalTermination and other low-level exception handling macros/functions.
-GetExceptionCode
-GetExceptionInformation
-GetAuditedPermissionsFromAcl
-GetEffectiveRightsFromAcl
-GetExplicitEntriesFromAcl
-AcsLan
-BuildExplicitAccessWithName
-BuildImpersonateExplicitAccessWithName
-BuildImpersonateTrustee
-BuildSecurityDescriptor
-BuildTrusteeWithName
-BuildTrusteeWithSid
-GetMultipleTrustee
-GetMultipleTrusteeOperation
-GetNamedSecurityInfo
-GetSecurityInfo
-GetTrusteeForm
-GetTrusteeName
-GetTrusteeType
-PF_XXXX defines for IsProcessorFeaturePresent
-LookupSecurityDescriptorParts
-LSXXXX lsapi functions/types
-RASADFunc through RasValidateEntryName (RASAPI ras.h)
-SetEntriesInAcl
-SetNamedSecurityInfo
-SetSecurityInfo
-SetServiceBits
-SnmpExtensionInit through SnmpUtilVarBindListFree (mgmtapi.h/snmp.h
-	Simple Network Management Protocol(SNMP))
-SOBailOut through SUUserSaveData, VwStreamCloseFunc through VwStreamTellFunc
-	(File viewer/parser (quick view))
-WinSubmitCertificate (wintrust.h)
-WinTrustProviderClientInitialize through WinVerifyTrust
-EXPLICIT_ACCESS
-INotifyReplica (reconcil)
-
-OLE/COM:
-========
-oleidl.h
-oaidl.h
-ocidl.h
-Some GUIDs should be in libole32.a instead of libuuid.a
-
-Low priority
-============
-RASAPI
-MAPI
-directx (what about existing ports?)
diff --git a/winsup/w32api/config.guess b/winsup/w32api/config.guess
deleted file mode 100755
index 0e30d56e9..000000000
--- a/winsup/w32api/config.guess
+++ /dev/null
@@ -1,1407 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-07-02'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/winsup/w32api/config.sub b/winsup/w32api/config.sub
deleted file mode 100755
index 0bdc33431..000000000
--- a/winsup/w32api/config.sub
+++ /dev/null
@@ -1,1504 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2003-06-17'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/winsup/w32api/configure b/winsup/w32api/configure
deleted file mode 100755
index d6804a271..000000000
--- a/winsup/w32api/configure
+++ /dev/null
@@ -1,2726 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53.
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-# NLS nuisances.
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
-    { $as_unset LANG || test "${LANG+set}" != set; } ||
-      { LANG=C; export LANG; }
-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
-      { LC_ALL=C; export LC_ALL; }
-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
-      { LC_TIME=C; export LC_TIME; }
-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
-      { LC_CTYPE=C; export LC_CTYPE; }
-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
-      { LANGUAGE=C; export LANGUAGE; }
-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
-      { LC_COLLATE=C; export LC_COLLATE; }
-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
-      { LC_NUMERIC=C; export LC_NUMERIC; }
-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
-      { LC_MESSAGES=C; export LC_MESSAGES; }
-
-
-# Name of the executable.
-as_me=`(basename "$0") 2>/dev/null ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conftest.sh
-  echo  "exit 0"   >>conftest.sh
-  chmod +x conftest.sh
-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conftest.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="lib/scrnsave.c"
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-ac_prev=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-              localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$0" : 'X\(//\)[^/]' \| \
-         X"$0" : 'X\(//\)$' \| \
-         X"$0" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
-  cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-           test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.53.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell meta-characters.
-ac_configure_args=
-ac_sep=
-for ac_arg
-do
-  case $ac_arg in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n ) continue ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    continue ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  case " $ac_configure_args " in
-    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-       ac_sep=" " ;;
-  esac
-  # Get rid of the leading space.
-done
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core core.* *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-        ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6
-if test "${ac_cv_target+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_target_alias=$target_alias
-test "x$ac_cv_target_alias" = "x" &&
-  ac_cv_target_alias=$ac_cv_host_alias
-ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6
-target=$ac_cv_target
-target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-          if test $ac_prog = install &&
-            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-            # AIX install.  It has an incompatible calling convention.
-            :
-          elif test $ac_prog = install &&
-            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-            # program-specific install script used by HP pwplus--don't use.
-            :
-          else
-            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-            break 3
-          fi
-        fi
-      done
-    done
-    ;;
-esac
-done
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-CFLAGS=${CFLAGS-"-O2 -g"}
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_CC" && ac_cv_prog_ac_ct_CC="gcc"
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  AR=$ac_ct_AR
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  echo "$as_me:$LINENO: result: $AS" >&5
-echo "${ECHO_T}$AS" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AS="as"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="as"
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-echo "${ECHO_T}$ac_ct_AS" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  AS=$ac_ct_AS
-else
-  AS="$ac_cv_prog_AS"
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB="ranlib"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  RANLIB=$ac_ct_RANLIB
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ld; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$LD"; then
-  ac_cv_prog_LD="$LD" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LD="${ac_tool_prefix}ld"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-LD=$ac_cv_prog_LD
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_LD"; then
-  ac_ct_LD=$LD
-  # Extract the first word of "ld", so it can be a program name with args.
-set dummy ld; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_LD"; then
-  ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LD="ld"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_LD" && ac_cv_prog_ac_ct_LD="ld"
-fi
-fi
-ac_ct_LD=$ac_cv_prog_ac_ct_LD
-if test -n "$ac_ct_LD"; then
-  echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
-echo "${ECHO_T}$ac_ct_LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  LD=$ac_ct_LD
-else
-  LD="$ac_cv_prog_LD"
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  DLLTOOL=$ac_ct_DLLTOOL
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
-set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$WINDRES"; then
-  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-WINDRES=$ac_cv_prog_WINDRES
-if test -n "$WINDRES"; then
-  echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_WINDRES"; then
-  ac_ct_WINDRES=$WINDRES
-  # Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_WINDRES"; then
-  ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_WINDRES="windres"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_WINDRES" && ac_cv_prog_ac_ct_WINDRES="windres"
-fi
-fi
-ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
-if test -n "$ac_ct_WINDRES"; then
-  echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  WINDRES=$ac_ct_WINDRES
-else
-  WINDRES="$ac_cv_prog_WINDRES"
-fi
-
-
-
-echo "$as_me:$LINENO: checking for build environment" >&5
-echo $ECHO_N "checking for build environment... $ECHO_C" >&6
-case "$build_alias" in
-*-mingw*) BUILDENV=mingw;;
-*-cygwin*) BUILDENV=cygwin;;
-esac
-if test -z "$BUILDENV"; then
-        echo "$as_me:$LINENO: result: standard" >&5
-echo "${ECHO_T}standard" >&6
-else
-        echo "$as_me:$LINENO: result: $BUILDENV" >&5
-echo "${ECHO_T}$BUILDENV" >&6
-fi
-
-
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/ddk/Makefile"
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overriden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-        "s/'/'\\\\''/g;
-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if cmp -s $cache_file confcache; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ 	]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ 	]*$//;
-}'
-fi
-
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
-t quote
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
-
-
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-
-# NLS nuisances.
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
-    { $as_unset LANG || test "${LANG+set}" != set; } ||
-      { LANG=C; export LANG; }
-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
-      { LC_ALL=C; export LC_ALL; }
-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
-      { LC_TIME=C; export LC_TIME; }
-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
-      { LC_CTYPE=C; export LC_CTYPE; }
-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
-      { LANGUAGE=C; export LANGUAGE; }
-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
-      { LC_COLLATE=C; export LC_COLLATE; }
-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
-      { LC_NUMERIC=C; export LC_NUMERIC; }
-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
-      { LC_MESSAGES=C; export LC_MESSAGES; }
-
-
-# Name of the executable.
-as_me=`(basename "$0") 2>/dev/null ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conftest.sh
-  echo  "exit 0"   >>conftest.sh
-  chmod +x conftest.sh
-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conftest.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by $as_me, which was
-generated by GNU Autoconf 2.53.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-
-Configuration files:
-$config_files
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-config.status
-configured by $0, generated by GNU Autoconf 2.53,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    shift
-    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
-    shift
-    ;;
-  -*);;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_need_defaults=false;;
-  esac
-
-  case $1 in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    shift
-    CONFIG_FILES="$CONFIG_FILES $1"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $1"
-    ac_need_defaults=false;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-_ACEOF
-
-
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-  "lib/ddk/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/ddk/Makefile" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-fi
-
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-: ${TMPDIR=/tmp}
-{
-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=$TMPDIR/cs$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CC@,$CC,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@AS@,$AS,;t t
-s,@ac_ct_AS@,$ac_ct_AS,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@LD@,$LD,;t t
-s,@ac_ct_LD@,$ac_ct_LD,;t t
-s,@DLLTOOL@,$DLLTOOL,;t t
-s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
-s,@WINDRES@,$WINDRES,;t t
-s,@ac_ct_WINDRES@,$ac_ct_WINDRES,;t t
-s,@BUILDENV@,$BUILDENV,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-        cat >$tmp/stdin
-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_file" : 'X\(//\)[^/]' \| \
-         X"$ac_file" : 'X\(//\)$' \| \
-         X"$ac_file" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { case "$ac_dir" in
-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-  *)                      as_incr_dir=.;;
-esac
-as_dummy="$ac_dir"
-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
-  case $as_mkdir_dir in
-    # Skip DOS drivespec
-    ?:) as_incr_dir=$as_mkdir_dir ;;
-    *)
-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
-      test -d "$as_incr_dir" ||
-        mkdir "$as_incr_dir" ||
-	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }
-    ;;
-  esac
-done; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-                                     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-         # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-         echo $f;;
-      *) # Relative
-         if test -f "$f"; then
-           # Build tree
-           echo $f
-         elif test -f "$srcdir/$f"; then
-           # Source tree
-           echo $srcdir/$f
-         else
-           # /dev/null tree
-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-         fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/winsup/w32api/configure.in b/winsup/w32api/configure.in
deleted file mode 100644
index 1f252e0a1..000000000
--- a/winsup/w32api/configure.in
+++ /dev/null
@@ -1,50 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-dnl This file is part of a free win32 library
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-
-AC_PREREQ(2.12)
-AC_INIT(lib/scrnsave.c)
-
-AC_CANONICAL_SYSTEM
-
-dnl Find install command
-AC_PROG_INSTALL
-
-dnl check for cc and CFLAGS
-CFLAGS=${CFLAGS-"-O2 -g"}
-AC_CHECK_TOOL(CC, gcc, gcc)
-AC_SUBST(CC)
-AC_SUBST(CFLAGS)
-
-dnl check for various tools
-AC_CHECK_TOOL(AR, ar, ar)
-AC_SUBST(AR)
-AC_CHECK_TOOL(AS, as, as)
-AC_SUBST(AS)
-AC_CHECK_TOOL(RANLIB, ranlib, ranlib)
-AC_SUBST(RANLIB)
-AC_CHECK_TOOL(LD, ld, ld)
-AC_SUBST(LD)
-AC_CHECK_TOOL(DLLTOOL, dlltool, dlltool)
-AC_SUBST(DLLTOOL)
-AC_CHECK_TOOL(WINDRES, windres, windres)
-AC_SUBST(WINDRES)
-
-AC_MSG_CHECKING([for build environment])
-case "$build_alias" in
-*-mingw*) BUILDENV=mingw;;
-*-cygwin*) BUILDENV=cygwin;;
-esac
-if test -z "$BUILDENV"; then
-        AC_MSG_RESULT(standard)
-else
-        AC_MSG_RESULT($BUILDENV)
-fi
-AC_SUBST(BUILDENV)
-
-AC_OUTPUT(Makefile lib/Makefile lib/ddk/Makefile)
diff --git a/winsup/w32api/include/GL/gl.h b/winsup/w32api/include/GL/gl.h
deleted file mode 100644
index f11188ef1..000000000
--- a/winsup/w32api/include/GL/gl.h
+++ /dev/null
@@ -1,1472 +0,0 @@
-/* $Id$ */
-
-/*
- * Mesa 3-D graphics library
- * Version:  4.0
- *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-/************************************************************************
- * 2002-Apr-22, Jos� Fonseca:
- *   Removed non Win32 system-specific stuff
- *
- * 2002-Apr-17, Marcus Geelnard:
- *   For win32, OpenGL 1.2 & 1.3 definitions are not made in this file
- *   anymore, since under Windows those are regarded as extensions, and
- *   are better defined in glext.h (especially the function prototypes may
- *   conflict with extension function pointers). A few "cosmetical"
- *   changes were also made to this file.
- *
- * 2002-Apr-15, Marcus Geelnard:
- *   Modified this file to better fit a wider range of compilers, removed
- *   Mesa specific stuff, and removed extension definitions (this file now
- *   relies on GL/glext.h). Hopefully this file should now function as a
- *   generic OpenGL gl.h include file for most compilers and environments.
- *   Changed GLAPIENTRY to APIENTRY (to be consistent with GL/glext.h).
- ************************************************************************/
-
-
-#ifndef __gl_h_
-#define __gl_h_
-
-
-
-/************************************************************************
- * Begin system-specific stuff.
- */
-/* __WIN32__ */
-#if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__))
-#  define __WIN32__
-#endif
-
-/* GLAPI, part 1 (use WINGDIAPI, if defined) */
-#if defined(__WIN32__) && defined(WINGDIAPI)
-#  define GLAPI WINGDIAPI
-#endif
-
-/* GLAPI, part 2 */
-#if !defined(GLAPI)
-#  if defined(_MSC_VER)                        /* Microsoft Visual C++ */
-#    define GLAPI __declspec(dllimport)
-#  elif defined(__LCC__) && defined(__WIN32__) /* LCC-Win32 */
-#    define GLAPI __stdcall
-#  else                                        /* Others (e.g. MinGW, Cygwin, non-win32) */
-#    define GLAPI extern
-#  endif
-#endif
-
-/* APIENTRY */
-#if !defined(APIENTRY)
-#  if defined(__WIN32__)
-#    define APIENTRY __stdcall
-#  else
-#    define APIENTRY
-#  endif
-#endif
-/*
- * End system-specific stuff.
- ************************************************************************/
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-#define GL_VERSION_1_1   1
-
-#if !defined(__WIN32__)
-#define GL_VERSION_1_2   1
-#define GL_VERSION_1_3   1
-#define GL_ARB_imaging   1
-#endif
-
-
-/*
- *
- * Datatypes
- *
- */
-#ifdef CENTERLINE_CLPP
-#define signed
-#endif
-typedef unsigned int    GLenum;
-typedef unsigned char   GLboolean;
-typedef unsigned int    GLbitfield;
-typedef void            GLvoid;
-typedef signed char     GLbyte;         /* 1-byte signed */
-typedef short           GLshort;        /* 2-byte signed */
-typedef int             GLint;          /* 4-byte signed */
-typedef unsigned char   GLubyte;        /* 1-byte unsigned */
-typedef unsigned short  GLushort;       /* 2-byte unsigned */
-typedef unsigned int    GLuint;         /* 4-byte unsigned */
-typedef int             GLsizei;        /* 4-byte signed */
-typedef float           GLfloat;        /* single precision float */
-typedef float           GLclampf;       /* single precision float in [0,1] */
-typedef double          GLdouble;       /* double precision float */
-typedef double          GLclampd;       /* double precision float in [0,1] */
-
-
-
-/************************************************************************
- *
- * Constants
- *
- ************************************************************************/
-
-/* Boolean values */
-#define GL_FALSE                                0x0
-#define GL_TRUE                                 0x1
-
-/* Data types */
-#define GL_BYTE                                 0x1400
-#define GL_UNSIGNED_BYTE                        0x1401
-#define GL_SHORT                                0x1402
-#define GL_UNSIGNED_SHORT                       0x1403
-#define GL_INT                                  0x1404
-#define GL_UNSIGNED_INT                         0x1405
-#define GL_FLOAT                                0x1406
-#define GL_DOUBLE                               0x140A
-#define GL_2_BYTES                              0x1407
-#define GL_3_BYTES                              0x1408
-#define GL_4_BYTES                              0x1409
-
-/* Primitives */
-#define GL_POINTS                               0x0000
-#define GL_LINES                                0x0001
-#define GL_LINE_LOOP                            0x0002
-#define GL_LINE_STRIP                           0x0003
-#define GL_TRIANGLES                            0x0004
-#define GL_TRIANGLE_STRIP                       0x0005
-#define GL_TRIANGLE_FAN                         0x0006
-#define GL_QUADS                                0x0007
-#define GL_QUAD_STRIP                           0x0008
-#define GL_POLYGON                              0x0009
-
-/* Vertex Arrays */
-#define GL_VERTEX_ARRAY                         0x8074
-#define GL_NORMAL_ARRAY                         0x8075
-#define GL_COLOR_ARRAY                          0x8076
-#define GL_INDEX_ARRAY                          0x8077
-#define GL_TEXTURE_COORD_ARRAY                  0x8078
-#define GL_EDGE_FLAG_ARRAY                      0x8079
-#define GL_VERTEX_ARRAY_SIZE                    0x807A
-#define GL_VERTEX_ARRAY_TYPE                    0x807B
-#define GL_VERTEX_ARRAY_STRIDE                  0x807C
-#define GL_NORMAL_ARRAY_TYPE                    0x807E
-#define GL_NORMAL_ARRAY_STRIDE                  0x807F
-#define GL_COLOR_ARRAY_SIZE                     0x8081
-#define GL_COLOR_ARRAY_TYPE                     0x8082
-#define GL_COLOR_ARRAY_STRIDE                   0x8083
-#define GL_INDEX_ARRAY_TYPE                     0x8085
-#define GL_INDEX_ARRAY_STRIDE                   0x8086
-#define GL_TEXTURE_COORD_ARRAY_SIZE             0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE             0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE           0x808A
-#define GL_EDGE_FLAG_ARRAY_STRIDE               0x808C
-#define GL_VERTEX_ARRAY_POINTER                 0x808E
-#define GL_NORMAL_ARRAY_POINTER                 0x808F
-#define GL_COLOR_ARRAY_POINTER                  0x8090
-#define GL_INDEX_ARRAY_POINTER                  0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER          0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER              0x8093
-#define GL_V2F                                  0x2A20
-#define GL_V3F                                  0x2A21
-#define GL_C4UB_V2F                             0x2A22
-#define GL_C4UB_V3F                             0x2A23
-#define GL_C3F_V3F                              0x2A24
-#define GL_N3F_V3F                              0x2A25
-#define GL_C4F_N3F_V3F                          0x2A26
-#define GL_T2F_V3F                              0x2A27
-#define GL_T4F_V4F                              0x2A28
-#define GL_T2F_C4UB_V3F                         0x2A29
-#define GL_T2F_C3F_V3F                          0x2A2A
-#define GL_T2F_N3F_V3F                          0x2A2B
-#define GL_T2F_C4F_N3F_V3F                      0x2A2C
-#define GL_T4F_C4F_N3F_V4F                      0x2A2D
-
-/* Matrix Mode */
-#define GL_MATRIX_MODE                          0x0BA0
-#define GL_MODELVIEW                            0x1700
-#define GL_PROJECTION                           0x1701
-#define GL_TEXTURE                              0x1702
-
-/* Points */
-#define GL_POINT_SMOOTH                         0x0B10
-#define GL_POINT_SIZE                           0x0B11
-#define GL_POINT_SIZE_GRANULARITY               0x0B13
-#define GL_POINT_SIZE_RANGE                     0x0B12
-
-/* Lines */
-#define GL_LINE_SMOOTH                          0x0B20
-#define GL_LINE_STIPPLE                         0x0B24
-#define GL_LINE_STIPPLE_PATTERN                 0x0B25
-#define GL_LINE_STIPPLE_REPEAT                  0x0B26
-#define GL_LINE_WIDTH                           0x0B21
-#define GL_LINE_WIDTH_GRANULARITY               0x0B23
-#define GL_LINE_WIDTH_RANGE                     0x0B22
-
-/* Polygons */
-#define GL_POINT                                0x1B00
-#define GL_LINE                                 0x1B01
-#define GL_FILL                                 0x1B02
-#define GL_CW                                   0x0900
-#define GL_CCW                                  0x0901
-#define GL_FRONT                                0x0404
-#define GL_BACK                                 0x0405
-#define GL_POLYGON_MODE                         0x0B40
-#define GL_POLYGON_SMOOTH                       0x0B41
-#define GL_POLYGON_STIPPLE                      0x0B42
-#define GL_EDGE_FLAG                            0x0B43
-#define GL_CULL_FACE                            0x0B44
-#define GL_CULL_FACE_MODE                       0x0B45
-#define GL_FRONT_FACE                           0x0B46
-#define GL_POLYGON_OFFSET_FACTOR                0x8038
-#define GL_POLYGON_OFFSET_UNITS                 0x2A00
-#define GL_POLYGON_OFFSET_POINT                 0x2A01
-#define GL_POLYGON_OFFSET_LINE                  0x2A02
-#define GL_POLYGON_OFFSET_FILL                  0x8037
-
-/* Display Lists */
-#define GL_COMPILE                              0x1300
-#define GL_COMPILE_AND_EXECUTE                  0x1301
-#define GL_LIST_BASE                            0x0B32
-#define GL_LIST_INDEX                           0x0B33
-#define GL_LIST_MODE                            0x0B30
-
-/* Depth buffer */
-#define GL_NEVER                                0x0200
-#define GL_LESS                                 0x0201
-#define GL_EQUAL                                0x0202
-#define GL_LEQUAL                               0x0203
-#define GL_GREATER                              0x0204
-#define GL_NOTEQUAL                             0x0205
-#define GL_GEQUAL                               0x0206
-#define GL_ALWAYS                               0x0207
-#define GL_DEPTH_TEST                           0x0B71
-#define GL_DEPTH_BITS                           0x0D56
-#define GL_DEPTH_CLEAR_VALUE                    0x0B73
-#define GL_DEPTH_FUNC                           0x0B74
-#define GL_DEPTH_RANGE                          0x0B70
-#define GL_DEPTH_WRITEMASK                      0x0B72
-#define GL_DEPTH_COMPONENT                      0x1902
-
-/* Lighting */
-#define GL_LIGHTING                             0x0B50
-#define GL_LIGHT0                               0x4000
-#define GL_LIGHT1                               0x4001
-#define GL_LIGHT2                               0x4002
-#define GL_LIGHT3                               0x4003
-#define GL_LIGHT4                               0x4004
-#define GL_LIGHT5                               0x4005
-#define GL_LIGHT6                               0x4006
-#define GL_LIGHT7                               0x4007
-#define GL_SPOT_EXPONENT                        0x1205
-#define GL_SPOT_CUTOFF                          0x1206
-#define GL_CONSTANT_ATTENUATION                 0x1207
-#define GL_LINEAR_ATTENUATION                   0x1208
-#define GL_QUADRATIC_ATTENUATION                0x1209
-#define GL_AMBIENT                              0x1200
-#define GL_DIFFUSE                              0x1201
-#define GL_SPECULAR                             0x1202
-#define GL_SHININESS                            0x1601
-#define GL_EMISSION                             0x1600
-#define GL_POSITION                             0x1203
-#define GL_SPOT_DIRECTION                       0x1204
-#define GL_AMBIENT_AND_DIFFUSE                  0x1602
-#define GL_COLOR_INDEXES                        0x1603
-#define GL_LIGHT_MODEL_TWO_SIDE                 0x0B52
-#define GL_LIGHT_MODEL_LOCAL_VIEWER             0x0B51
-#define GL_LIGHT_MODEL_AMBIENT                  0x0B53
-#define GL_FRONT_AND_BACK                       0x0408
-#define GL_SHADE_MODEL                          0x0B54
-#define GL_FLAT                                 0x1D00
-#define GL_SMOOTH                               0x1D01
-#define GL_COLOR_MATERIAL                       0x0B57
-#define GL_COLOR_MATERIAL_FACE                  0x0B55
-#define GL_COLOR_MATERIAL_PARAMETER             0x0B56
-#define GL_NORMALIZE                            0x0BA1
-
-/* User clipping planes */
-#define GL_CLIP_PLANE0                          0x3000
-#define GL_CLIP_PLANE1                          0x3001
-#define GL_CLIP_PLANE2                          0x3002
-#define GL_CLIP_PLANE3                          0x3003
-#define GL_CLIP_PLANE4                          0x3004
-#define GL_CLIP_PLANE5                          0x3005
-
-/* Accumulation buffer */
-#define GL_ACCUM_RED_BITS                       0x0D58
-#define GL_ACCUM_GREEN_BITS                     0x0D59
-#define GL_ACCUM_BLUE_BITS                      0x0D5A
-#define GL_ACCUM_ALPHA_BITS                     0x0D5B
-#define GL_ACCUM_CLEAR_VALUE                    0x0B80
-#define GL_ACCUM                                0x0100
-#define GL_ADD                                  0x0104
-#define GL_LOAD                                 0x0101
-#define GL_MULT                                 0x0103
-#define GL_RETURN                               0x0102
-
-/* Alpha testing */
-#define GL_ALPHA_TEST                           0x0BC0
-#define GL_ALPHA_TEST_REF                       0x0BC2
-#define GL_ALPHA_TEST_FUNC                      0x0BC1
-
-/* Blending */
-#define GL_BLEND                                0x0BE2
-#define GL_BLEND_SRC                            0x0BE1
-#define GL_BLEND_DST                            0x0BE0
-#define GL_ZERO                                 0x0
-#define GL_ONE                                  0x1
-#define GL_SRC_COLOR                            0x0300
-#define GL_ONE_MINUS_SRC_COLOR                  0x0301
-#define GL_SRC_ALPHA                            0x0302
-#define GL_ONE_MINUS_SRC_ALPHA                  0x0303
-#define GL_DST_ALPHA                            0x0304
-#define GL_ONE_MINUS_DST_ALPHA                  0x0305
-#define GL_DST_COLOR                            0x0306
-#define GL_ONE_MINUS_DST_COLOR                  0x0307
-#define GL_SRC_ALPHA_SATURATE                   0x0308
-#define GL_CONSTANT_COLOR                       0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR             0x8002
-#define GL_CONSTANT_ALPHA                       0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA             0x8004
-
-/* Render Mode */
-#define GL_FEEDBACK                             0x1C01
-#define GL_RENDER                               0x1C00
-#define GL_SELECT                               0x1C02
-
-/* Feedback */
-#define GL_2D                                   0x0600
-#define GL_3D                                   0x0601
-#define GL_3D_COLOR                             0x0602
-#define GL_3D_COLOR_TEXTURE                     0x0603
-#define GL_4D_COLOR_TEXTURE                     0x0604
-#define GL_POINT_TOKEN                          0x0701
-#define GL_LINE_TOKEN                           0x0702
-#define GL_LINE_RESET_TOKEN                     0x0707
-#define GL_POLYGON_TOKEN                        0x0703
-#define GL_BITMAP_TOKEN                         0x0704
-#define GL_DRAW_PIXEL_TOKEN                     0x0705
-#define GL_COPY_PIXEL_TOKEN                     0x0706
-#define GL_PASS_THROUGH_TOKEN                   0x0700
-#define GL_FEEDBACK_BUFFER_POINTER              0x0DF0
-#define GL_FEEDBACK_BUFFER_SIZE                 0x0DF1
-#define GL_FEEDBACK_BUFFER_TYPE                 0x0DF2
-
-/* Selection */
-#define GL_SELECTION_BUFFER_POINTER             0x0DF3
-#define GL_SELECTION_BUFFER_SIZE                0x0DF4
-
-/* Fog */
-#define GL_FOG                                  0x0B60
-#define GL_FOG_MODE                             0x0B65
-#define GL_FOG_DENSITY                          0x0B62
-#define GL_FOG_COLOR                            0x0B66
-#define GL_FOG_INDEX                            0x0B61
-#define GL_FOG_START                            0x0B63
-#define GL_FOG_END                              0x0B64
-#define GL_LINEAR                               0x2601
-#define GL_EXP                                  0x0800
-#define GL_EXP2                                 0x0801
-
-/* Logic Ops */
-#define GL_LOGIC_OP                             0x0BF1
-#define GL_INDEX_LOGIC_OP                       0x0BF1
-#define GL_COLOR_LOGIC_OP                       0x0BF2
-#define GL_LOGIC_OP_MODE                        0x0BF0
-#define GL_CLEAR                                0x1500
-#define GL_SET                                  0x150F
-#define GL_COPY                                 0x1503
-#define GL_COPY_INVERTED                        0x150C
-#define GL_NOOP                                 0x1505
-#define GL_INVERT                               0x150A
-#define GL_AND                                  0x1501
-#define GL_NAND                                 0x150E
-#define GL_OR                                   0x1507
-#define GL_NOR                                  0x1508
-#define GL_XOR                                  0x1506
-#define GL_EQUIV                                0x1509
-#define GL_AND_REVERSE                          0x1502
-#define GL_AND_INVERTED                         0x1504
-#define GL_OR_REVERSE                           0x150B
-#define GL_OR_INVERTED                          0x150D
-
-/* Stencil */
-#define GL_STENCIL_TEST                         0x0B90
-#define GL_STENCIL_WRITEMASK                    0x0B98
-#define GL_STENCIL_BITS                         0x0D57
-#define GL_STENCIL_FUNC                         0x0B92
-#define GL_STENCIL_VALUE_MASK                   0x0B93
-#define GL_STENCIL_REF                          0x0B97
-#define GL_STENCIL_FAIL                         0x0B94
-#define GL_STENCIL_PASS_DEPTH_PASS              0x0B96
-#define GL_STENCIL_PASS_DEPTH_FAIL              0x0B95
-#define GL_STENCIL_CLEAR_VALUE                  0x0B91
-#define GL_STENCIL_INDEX                        0x1901
-#define GL_KEEP                                 0x1E00
-#define GL_REPLACE                              0x1E01
-#define GL_INCR                                 0x1E02
-#define GL_DECR                                 0x1E03
-
-/* Buffers, Pixel Drawing/Reading */
-#define GL_NONE                                 0x0
-#define GL_LEFT                                 0x0406
-#define GL_RIGHT                                0x0407
-/*GL_FRONT                                      0x0404 */
-/*GL_BACK                                       0x0405 */
-/*GL_FRONT_AND_BACK                             0x0408 */
-#define GL_FRONT_LEFT                           0x0400
-#define GL_FRONT_RIGHT                          0x0401
-#define GL_BACK_LEFT                            0x0402
-#define GL_BACK_RIGHT                           0x0403
-#define GL_AUX0                                 0x0409
-#define GL_AUX1                                 0x040A
-#define GL_AUX2                                 0x040B
-#define GL_AUX3                                 0x040C
-#define GL_COLOR_INDEX                          0x1900
-#define GL_RED                                  0x1903
-#define GL_GREEN                                0x1904
-#define GL_BLUE                                 0x1905
-#define GL_ALPHA                                0x1906
-#define GL_LUMINANCE                            0x1909
-#define GL_LUMINANCE_ALPHA                      0x190A
-#define GL_ALPHA_BITS                           0x0D55
-#define GL_RED_BITS                             0x0D52
-#define GL_GREEN_BITS                           0x0D53
-#define GL_BLUE_BITS                            0x0D54
-#define GL_INDEX_BITS                           0x0D51
-#define GL_SUBPIXEL_BITS                        0x0D50
-#define GL_AUX_BUFFERS                          0x0C00
-#define GL_READ_BUFFER                          0x0C02
-#define GL_DRAW_BUFFER                          0x0C01
-#define GL_DOUBLEBUFFER                         0x0C32
-#define GL_STEREO                               0x0C33
-#define GL_BITMAP                               0x1A00
-#define GL_COLOR                                0x1800
-#define GL_DEPTH                                0x1801
-#define GL_STENCIL                              0x1802
-#define GL_DITHER                               0x0BD0
-#define GL_RGB                                  0x1907
-#define GL_RGBA                                 0x1908
-
-/* Implementation limits */
-#define GL_MAX_LIST_NESTING                     0x0B31
-#define GL_MAX_ATTRIB_STACK_DEPTH               0x0D35
-#define GL_MAX_MODELVIEW_STACK_DEPTH            0x0D36
-#define GL_MAX_NAME_STACK_DEPTH                 0x0D37
-#define GL_MAX_PROJECTION_STACK_DEPTH           0x0D38
-#define GL_MAX_TEXTURE_STACK_DEPTH              0x0D39
-#define GL_MAX_EVAL_ORDER                       0x0D30
-#define GL_MAX_LIGHTS                           0x0D31
-#define GL_MAX_CLIP_PLANES                      0x0D32
-#define GL_MAX_TEXTURE_SIZE                     0x0D33
-#define GL_MAX_PIXEL_MAP_TABLE                  0x0D34
-#define GL_MAX_VIEWPORT_DIMS                    0x0D3A
-#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH        0x0D3B
-
-/* Gets */
-#define GL_ATTRIB_STACK_DEPTH                   0x0BB0
-#define GL_CLIENT_ATTRIB_STACK_DEPTH            0x0BB1
-#define GL_COLOR_CLEAR_VALUE                    0x0C22
-#define GL_COLOR_WRITEMASK                      0x0C23
-#define GL_CURRENT_INDEX                        0x0B01
-#define GL_CURRENT_COLOR                        0x0B00
-#define GL_CURRENT_NORMAL                       0x0B02
-#define GL_CURRENT_RASTER_COLOR                 0x0B04
-#define GL_CURRENT_RASTER_DISTANCE              0x0B09
-#define GL_CURRENT_RASTER_INDEX                 0x0B05
-#define GL_CURRENT_RASTER_POSITION              0x0B07
-#define GL_CURRENT_RASTER_TEXTURE_COORDS        0x0B06
-#define GL_CURRENT_RASTER_POSITION_VALID        0x0B08
-#define GL_CURRENT_TEXTURE_COORDS               0x0B03
-#define GL_INDEX_CLEAR_VALUE                    0x0C20
-#define GL_INDEX_MODE                           0x0C30
-#define GL_INDEX_WRITEMASK                      0x0C21
-#define GL_MODELVIEW_MATRIX                     0x0BA6
-#define GL_MODELVIEW_STACK_DEPTH                0x0BA3
-#define GL_NAME_STACK_DEPTH                     0x0D70
-#define GL_PROJECTION_MATRIX                    0x0BA7
-#define GL_PROJECTION_STACK_DEPTH               0x0BA4
-#define GL_RENDER_MODE                          0x0C40
-#define GL_RGBA_MODE                            0x0C31
-#define GL_TEXTURE_MATRIX                       0x0BA8
-#define GL_TEXTURE_STACK_DEPTH                  0x0BA5
-#define GL_VIEWPORT                             0x0BA2
-
-/* Evaluators */
-#define GL_AUTO_NORMAL                          0x0D80
-#define GL_MAP1_COLOR_4                         0x0D90
-#define GL_MAP1_GRID_DOMAIN                     0x0DD0
-#define GL_MAP1_GRID_SEGMENTS                   0x0DD1
-#define GL_MAP1_INDEX                           0x0D91
-#define GL_MAP1_NORMAL                          0x0D92
-#define GL_MAP1_TEXTURE_COORD_1                 0x0D93
-#define GL_MAP1_TEXTURE_COORD_2                 0x0D94
-#define GL_MAP1_TEXTURE_COORD_3                 0x0D95
-#define GL_MAP1_TEXTURE_COORD_4                 0x0D96
-#define GL_MAP1_VERTEX_3                        0x0D97
-#define GL_MAP1_VERTEX_4                        0x0D98
-#define GL_MAP2_COLOR_4                         0x0DB0
-#define GL_MAP2_GRID_DOMAIN                     0x0DD2
-#define GL_MAP2_GRID_SEGMENTS                   0x0DD3
-#define GL_MAP2_INDEX                           0x0DB1
-#define GL_MAP2_NORMAL                          0x0DB2
-#define GL_MAP2_TEXTURE_COORD_1                 0x0DB3
-#define GL_MAP2_TEXTURE_COORD_2                 0x0DB4
-#define GL_MAP2_TEXTURE_COORD_3                 0x0DB5
-#define GL_MAP2_TEXTURE_COORD_4                 0x0DB6
-#define GL_MAP2_VERTEX_3                        0x0DB7
-#define GL_MAP2_VERTEX_4                        0x0DB8
-#define GL_COEFF                                0x0A00
-#define GL_DOMAIN                               0x0A02
-#define GL_ORDER                                0x0A01
-
-/* Hints */
-#define GL_FOG_HINT                             0x0C54
-#define GL_LINE_SMOOTH_HINT                     0x0C52
-#define GL_PERSPECTIVE_CORRECTION_HINT          0x0C50
-#define GL_POINT_SMOOTH_HINT                    0x0C51
-#define GL_POLYGON_SMOOTH_HINT                  0x0C53
-#define GL_DONT_CARE                            0x1100
-#define GL_FASTEST                              0x1101
-#define GL_NICEST                               0x1102
-
-/* Scissor box */
-#define GL_SCISSOR_TEST                         0x0C11
-#define GL_SCISSOR_BOX                          0x0C10
-
-/* Pixel Mode / Transfer */
-#define GL_MAP_COLOR                            0x0D10
-#define GL_MAP_STENCIL                          0x0D11
-#define GL_INDEX_SHIFT                          0x0D12
-#define GL_INDEX_OFFSET                         0x0D13
-#define GL_RED_SCALE                            0x0D14
-#define GL_RED_BIAS                             0x0D15
-#define GL_GREEN_SCALE                          0x0D18
-#define GL_GREEN_BIAS                           0x0D19
-#define GL_BLUE_SCALE                           0x0D1A
-#define GL_BLUE_BIAS                            0x0D1B
-#define GL_ALPHA_SCALE                          0x0D1C
-#define GL_ALPHA_BIAS                           0x0D1D
-#define GL_DEPTH_SCALE                          0x0D1E
-#define GL_DEPTH_BIAS                           0x0D1F
-#define GL_PIXEL_MAP_S_TO_S_SIZE                0x0CB1
-#define GL_PIXEL_MAP_I_TO_I_SIZE                0x0CB0
-#define GL_PIXEL_MAP_I_TO_R_SIZE                0x0CB2
-#define GL_PIXEL_MAP_I_TO_G_SIZE                0x0CB3
-#define GL_PIXEL_MAP_I_TO_B_SIZE                0x0CB4
-#define GL_PIXEL_MAP_I_TO_A_SIZE                0x0CB5
-#define GL_PIXEL_MAP_R_TO_R_SIZE                0x0CB6
-#define GL_PIXEL_MAP_G_TO_G_SIZE                0x0CB7
-#define GL_PIXEL_MAP_B_TO_B_SIZE                0x0CB8
-#define GL_PIXEL_MAP_A_TO_A_SIZE                0x0CB9
-#define GL_PIXEL_MAP_S_TO_S                     0x0C71
-#define GL_PIXEL_MAP_I_TO_I                     0x0C70
-#define GL_PIXEL_MAP_I_TO_R                     0x0C72
-#define GL_PIXEL_MAP_I_TO_G                     0x0C73
-#define GL_PIXEL_MAP_I_TO_B                     0x0C74
-#define GL_PIXEL_MAP_I_TO_A                     0x0C75
-#define GL_PIXEL_MAP_R_TO_R                     0x0C76
-#define GL_PIXEL_MAP_G_TO_G                     0x0C77
-#define GL_PIXEL_MAP_B_TO_B                     0x0C78
-#define GL_PIXEL_MAP_A_TO_A                     0x0C79
-#define GL_PACK_ALIGNMENT                       0x0D05
-#define GL_PACK_LSB_FIRST                       0x0D01
-#define GL_PACK_ROW_LENGTH                      0x0D02
-#define GL_PACK_SKIP_PIXELS                     0x0D04
-#define GL_PACK_SKIP_ROWS                       0x0D03
-#define GL_PACK_SWAP_BYTES                      0x0D00
-#define GL_UNPACK_ALIGNMENT                     0x0CF5
-#define GL_UNPACK_LSB_FIRST                     0x0CF1
-#define GL_UNPACK_ROW_LENGTH                    0x0CF2
-#define GL_UNPACK_SKIP_PIXELS                   0x0CF4
-#define GL_UNPACK_SKIP_ROWS                     0x0CF3
-#define GL_UNPACK_SWAP_BYTES                    0x0CF0
-#define GL_ZOOM_X                               0x0D16
-#define GL_ZOOM_Y                               0x0D17
-
-/* Texture mapping */
-#define GL_TEXTURE_ENV                          0x2300
-#define GL_TEXTURE_ENV_MODE                     0x2200
-#define GL_TEXTURE_1D                           0x0DE0
-#define GL_TEXTURE_2D                           0x0DE1
-#define GL_TEXTURE_WRAP_S                       0x2802
-#define GL_TEXTURE_WRAP_T                       0x2803
-#define GL_TEXTURE_MAG_FILTER                   0x2800
-#define GL_TEXTURE_MIN_FILTER                   0x2801
-#define GL_TEXTURE_ENV_COLOR                    0x2201
-#define GL_TEXTURE_GEN_S                        0x0C60
-#define GL_TEXTURE_GEN_T                        0x0C61
-#define GL_TEXTURE_GEN_MODE                     0x2500
-#define GL_TEXTURE_BORDER_COLOR                 0x1004
-#define GL_TEXTURE_WIDTH                        0x1000
-#define GL_TEXTURE_HEIGHT                       0x1001
-#define GL_TEXTURE_BORDER                       0x1005
-#define GL_TEXTURE_COMPONENTS                   0x1003
-#define GL_TEXTURE_RED_SIZE                     0x805C
-#define GL_TEXTURE_GREEN_SIZE                   0x805D
-#define GL_TEXTURE_BLUE_SIZE                    0x805E
-#define GL_TEXTURE_ALPHA_SIZE                   0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE               0x8060
-#define GL_TEXTURE_INTENSITY_SIZE               0x8061
-#define GL_NEAREST_MIPMAP_NEAREST               0x2700
-#define GL_NEAREST_MIPMAP_LINEAR                0x2702
-#define GL_LINEAR_MIPMAP_NEAREST                0x2701
-#define GL_LINEAR_MIPMAP_LINEAR                 0x2703
-#define GL_OBJECT_LINEAR                        0x2401
-#define GL_OBJECT_PLANE                         0x2501
-#define GL_EYE_LINEAR                           0x2400
-#define GL_EYE_PLANE                            0x2502
-#define GL_SPHERE_MAP                           0x2402
-#define GL_DECAL                                0x2101
-#define GL_MODULATE                             0x2100
-#define GL_NEAREST                              0x2600
-#define GL_REPEAT                               0x2901
-#define GL_CLAMP                                0x2900
-#define GL_S                                    0x2000
-#define GL_T                                    0x2001
-#define GL_R                                    0x2002
-#define GL_Q                                    0x2003
-#define GL_TEXTURE_GEN_R                        0x0C62
-#define GL_TEXTURE_GEN_Q                        0x0C63
-
-/* Utility */
-#define GL_VENDOR                               0x1F00
-#define GL_RENDERER                             0x1F01
-#define GL_VERSION                              0x1F02
-#define GL_EXTENSIONS                           0x1F03
-
-/* Errors */
-#define GL_NO_ERROR                             0x0
-#define GL_INVALID_VALUE                        0x0501
-#define GL_INVALID_ENUM                         0x0500
-#define GL_INVALID_OPERATION                    0x0502
-#define GL_STACK_OVERFLOW                       0x0503
-#define GL_STACK_UNDERFLOW                      0x0504
-#define GL_OUT_OF_MEMORY                        0x0505
-
-/* glPush/PopAttrib bits */
-#define GL_CURRENT_BIT                          0x00000001
-#define GL_POINT_BIT                            0x00000002
-#define GL_LINE_BIT                             0x00000004
-#define GL_POLYGON_BIT                          0x00000008
-#define GL_POLYGON_STIPPLE_BIT                  0x00000010
-#define GL_PIXEL_MODE_BIT                       0x00000020
-#define GL_LIGHTING_BIT                         0x00000040
-#define GL_FOG_BIT                              0x00000080
-#define GL_DEPTH_BUFFER_BIT                     0x00000100
-#define GL_ACCUM_BUFFER_BIT                     0x00000200
-#define GL_STENCIL_BUFFER_BIT                   0x00000400
-#define GL_VIEWPORT_BIT                         0x00000800
-#define GL_TRANSFORM_BIT                        0x00001000
-#define GL_ENABLE_BIT                           0x00002000
-#define GL_COLOR_BUFFER_BIT                     0x00004000
-#define GL_HINT_BIT                             0x00008000
-#define GL_EVAL_BIT                             0x00010000
-#define GL_LIST_BIT                             0x00020000
-#define GL_TEXTURE_BIT                          0x00040000
-#define GL_SCISSOR_BIT                          0x00080000
-#define GL_ALL_ATTRIB_BITS                      0x000FFFFF
-
-
-/* OpenGL 1.1 */
-#define GL_PROXY_TEXTURE_1D                     0x8063
-#define GL_PROXY_TEXTURE_2D                     0x8064
-#define GL_TEXTURE_PRIORITY                     0x8066
-#define GL_TEXTURE_RESIDENT                     0x8067
-#define GL_TEXTURE_BINDING_1D                   0x8068
-#define GL_TEXTURE_BINDING_2D                   0x8069
-#define GL_TEXTURE_INTERNAL_FORMAT              0x1003
-#define GL_ALPHA4                               0x803B
-#define GL_ALPHA8                               0x803C
-#define GL_ALPHA12                              0x803D
-#define GL_ALPHA16                              0x803E
-#define GL_LUMINANCE4                           0x803F
-#define GL_LUMINANCE8                           0x8040
-#define GL_LUMINANCE12                          0x8041
-#define GL_LUMINANCE16                          0x8042
-#define GL_LUMINANCE4_ALPHA4                    0x8043
-#define GL_LUMINANCE6_ALPHA2                    0x8044
-#define GL_LUMINANCE8_ALPHA8                    0x8045
-#define GL_LUMINANCE12_ALPHA4                   0x8046
-#define GL_LUMINANCE12_ALPHA12                  0x8047
-#define GL_LUMINANCE16_ALPHA16                  0x8048
-#define GL_INTENSITY                            0x8049
-#define GL_INTENSITY4                           0x804A
-#define GL_INTENSITY8                           0x804B
-#define GL_INTENSITY12                          0x804C
-#define GL_INTENSITY16                          0x804D
-#define GL_R3_G3_B2                             0x2A10
-#define GL_RGB4                                 0x804F
-#define GL_RGB5                                 0x8050
-#define GL_RGB8                                 0x8051
-#define GL_RGB10                                0x8052
-#define GL_RGB12                                0x8053
-#define GL_RGB16                                0x8054
-#define GL_RGBA2                                0x8055
-#define GL_RGBA4                                0x8056
-#define GL_RGB5_A1                              0x8057
-#define GL_RGBA8                                0x8058
-#define GL_RGB10_A2                             0x8059
-#define GL_RGBA12                               0x805A
-#define GL_RGBA16                               0x805B
-#define GL_CLIENT_PIXEL_STORE_BIT               0x00000001
-#define GL_CLIENT_VERTEX_ARRAY_BIT              0x00000002
-#define GL_ALL_CLIENT_ATTRIB_BITS               0xFFFFFFFF
-#define GL_CLIENT_ALL_ATTRIB_BITS               0xFFFFFFFF
-
-
-/* Under Windows, we do not define OpenGL 1.2 & 1.3 functionality, since
-   it is treated as extensions (defined in glext.h) */
-#if !defined(__WIN32__)
-
-/* OpenGL 1.2 */
-#define GL_RESCALE_NORMAL                       0x803A
-#define GL_CLAMP_TO_EDGE                        0x812F
-#define GL_MAX_ELEMENTS_VERTICES                0x80E8
-#define GL_MAX_ELEMENTS_INDICES                 0x80E9
-#define GL_BGR                                  0x80E0
-#define GL_BGRA                                 0x80E1
-#define GL_UNSIGNED_BYTE_3_3_2                  0x8032
-#define GL_UNSIGNED_BYTE_2_3_3_REV              0x8362
-#define GL_UNSIGNED_SHORT_5_6_5                 0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV             0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4               0x8033
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV           0x8365
-#define GL_UNSIGNED_SHORT_5_5_5_1               0x8034
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV           0x8366
-#define GL_UNSIGNED_INT_8_8_8_8                 0x8035
-#define GL_UNSIGNED_INT_8_8_8_8_REV             0x8367
-#define GL_UNSIGNED_INT_10_10_10_2              0x8036
-#define GL_UNSIGNED_INT_2_10_10_10_REV          0x8368
-#define GL_LIGHT_MODEL_COLOR_CONTROL            0x81F8
-#define GL_SINGLE_COLOR                         0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR              0x81FA
-#define GL_TEXTURE_MIN_LOD                      0x813A
-#define GL_TEXTURE_MAX_LOD                      0x813B
-#define GL_TEXTURE_BASE_LEVEL                   0x813C
-#define GL_TEXTURE_MAX_LEVEL                    0x813D
-#define GL_SMOOTH_POINT_SIZE_RANGE              0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY        0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE              0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY        0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE             0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE             0x846E
-#define GL_PACK_SKIP_IMAGES                     0x806B
-#define GL_PACK_IMAGE_HEIGHT                    0x806C
-#define GL_UNPACK_SKIP_IMAGES                   0x806D
-#define GL_UNPACK_IMAGE_HEIGHT                  0x806E
-#define GL_TEXTURE_3D                           0x806F
-#define GL_PROXY_TEXTURE_3D                     0x8070
-#define GL_TEXTURE_DEPTH                        0x8071
-#define GL_TEXTURE_WRAP_R                       0x8072
-#define GL_MAX_3D_TEXTURE_SIZE                  0x8073
-#define GL_TEXTURE_BINDING_3D                   0x806A
-
-/* OpenGL 1.2 imaging subset */
-/* GL_EXT_color_table */
-#define GL_COLOR_TABLE                          0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE         0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE        0x80D2
-#define GL_PROXY_COLOR_TABLE                    0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE   0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE  0x80D5
-#define GL_COLOR_TABLE_SCALE                    0x80D6
-#define GL_COLOR_TABLE_BIAS                     0x80D7
-#define GL_COLOR_TABLE_FORMAT                   0x80D8
-#define GL_COLOR_TABLE_WIDTH                    0x80D9
-#define GL_COLOR_TABLE_RED_SIZE                 0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE               0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE                0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE               0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE           0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE           0x80DF
-/* GL_EXT_convolution and GL_HP_convolution_border_modes */
-#define GL_CONVOLUTION_1D                       0x8010
-#define GL_CONVOLUTION_2D                       0x8011
-#define GL_SEPARABLE_2D                         0x8012
-#define GL_CONVOLUTION_BORDER_MODE              0x8013
-#define GL_CONVOLUTION_FILTER_SCALE             0x8014
-#define GL_CONVOLUTION_FILTER_BIAS              0x8015
-#define GL_REDUCE                               0x8016
-#define GL_CONVOLUTION_FORMAT                   0x8017
-#define GL_CONVOLUTION_WIDTH                    0x8018
-#define GL_CONVOLUTION_HEIGHT                   0x8019
-#define GL_MAX_CONVOLUTION_WIDTH                0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT               0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE           0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE         0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE          0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE         0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS            0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS          0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS           0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS          0x8023
-#define GL_CONSTANT_BORDER                      0x8151
-#define GL_REPLICATE_BORDER                     0x8153
-#define GL_CONVOLUTION_BORDER_COLOR             0x8154
-/* GL_SGI_color_matrix */
-#define GL_COLOR_MATRIX                         0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH             0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH         0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE          0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE        0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE         0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE        0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS           0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS         0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS          0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS         0x80BB
-/* GL_EXT_histogram */
-#define GL_HISTOGRAM                            0x8024
-#define GL_PROXY_HISTOGRAM                      0x8025
-#define GL_HISTOGRAM_WIDTH                      0x8026
-#define GL_HISTOGRAM_FORMAT                     0x8027
-#define GL_HISTOGRAM_RED_SIZE                   0x8028
-#define GL_HISTOGRAM_GREEN_SIZE                 0x8029
-#define GL_HISTOGRAM_BLUE_SIZE                  0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE                 0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE             0x802C
-#define GL_HISTOGRAM_SINK                       0x802D
-#define GL_MINMAX                               0x802E
-#define GL_MINMAX_FORMAT                        0x802F
-#define GL_MINMAX_SINK                          0x8030
-#define GL_TABLE_TOO_LARGE                      0x8031
-/* GL_EXT_blend_color, GL_EXT_blend_minmax */
-#define GL_BLEND_EQUATION                       0x8009
-#define GL_MIN                                  0x8007
-#define GL_MAX                                  0x8008
-#define GL_FUNC_ADD                             0x8006
-#define GL_FUNC_SUBTRACT                        0x800A
-#define GL_FUNC_REVERSE_SUBTRACT                0x800B
-#define GL_BLEND_COLOR                          0x8005
-
-
-/* OpenGL 1.3 */
-/* multitexture */
-#define GL_TEXTURE0                             0x84C0
-#define GL_TEXTURE1                             0x84C1
-#define GL_TEXTURE2                             0x84C2
-#define GL_TEXTURE3                             0x84C3
-#define GL_TEXTURE4                             0x84C4
-#define GL_TEXTURE5                             0x84C5
-#define GL_TEXTURE6                             0x84C6
-#define GL_TEXTURE7                             0x84C7
-#define GL_TEXTURE8                             0x84C8
-#define GL_TEXTURE9                             0x84C9
-#define GL_TEXTURE10                            0x84CA
-#define GL_TEXTURE11                            0x84CB
-#define GL_TEXTURE12                            0x84CC
-#define GL_TEXTURE13                            0x84CD
-#define GL_TEXTURE14                            0x84CE
-#define GL_TEXTURE15                            0x84CF
-#define GL_TEXTURE16                            0x84D0
-#define GL_TEXTURE17                            0x84D1
-#define GL_TEXTURE18                            0x84D2
-#define GL_TEXTURE19                            0x84D3
-#define GL_TEXTURE20                            0x84D4
-#define GL_TEXTURE21                            0x84D5
-#define GL_TEXTURE22                            0x84D6
-#define GL_TEXTURE23                            0x84D7
-#define GL_TEXTURE24                            0x84D8
-#define GL_TEXTURE25                            0x84D9
-#define GL_TEXTURE26                            0x84DA
-#define GL_TEXTURE27                            0x84DB
-#define GL_TEXTURE28                            0x84DC
-#define GL_TEXTURE29                            0x84DD
-#define GL_TEXTURE30                            0x84DE
-#define GL_TEXTURE31                            0x84DF
-#define GL_ACTIVE_TEXTURE                       0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE                0x84E1
-#define GL_MAX_TEXTURE_UNITS                    0x84E2
-/* texture_cube_map */
-#define GL_NORMAL_MAP                           0x8511
-#define GL_REFLECTION_MAP                       0x8512
-#define GL_TEXTURE_CUBE_MAP                     0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP             0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X          0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X          0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y          0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y          0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z          0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z          0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP               0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE            0x851C
-/* texture_compression */
-#define GL_COMPRESSED_ALPHA                     0x84E9
-#define GL_COMPRESSED_LUMINANCE                 0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA           0x84EB
-#define GL_COMPRESSED_INTENSITY                 0x84EC
-#define GL_COMPRESSED_RGB                       0x84ED
-#define GL_COMPRESSED_RGBA                      0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT             0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE        0x86A0
-#define GL_TEXTURE_COMPRESSED                   0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS       0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS           0x86A3
-/* multisample */
-#define GL_MULTISAMPLE                          0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE             0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE                  0x809F
-#define GL_SAMPLE_COVERAGE                      0x80A0
-#define GL_SAMPLE_BUFFERS                       0x80A8
-#define GL_SAMPLES                              0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE                0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT               0x80AB
-#define GL_MULTISAMPLE_BIT                      0x20000000
-/* transpose_matrix */
-#define GL_TRANSPOSE_MODELVIEW_MATRIX           0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX          0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX             0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX               0x84E6
-/* texture_env_combine */
-#define GL_COMBINE                              0x8570
-#define GL_COMBINE_RGB                          0x8571
-#define GL_COMBINE_ALPHA                        0x8572
-#define GL_SOURCE0_RGB                          0x8580
-#define GL_SOURCE1_RGB                          0x8581
-#define GL_SOURCE2_RGB                          0x8582
-#define GL_SOURCE0_ALPHA                        0x8588
-#define GL_SOURCE1_ALPHA                        0x8589
-#define GL_SOURCE2_ALPHA                        0x858A
-#define GL_OPERAND0_RGB                         0x8590
-#define GL_OPERAND1_RGB                         0x8591
-#define GL_OPERAND2_RGB                         0x8592
-#define GL_OPERAND0_ALPHA                       0x8598
-#define GL_OPERAND1_ALPHA                       0x8599
-#define GL_OPERAND2_ALPHA                       0x859A
-#define GL_RGB_SCALE                            0x8573
-#define GL_ADD_SIGNED                           0x8574
-#define GL_INTERPOLATE                          0x8575
-#define GL_SUBTRACT                             0x84E7
-#define GL_CONSTANT                             0x8576
-#define GL_PRIMARY_COLOR                        0x8577
-#define GL_PREVIOUS                             0x8578
-/* texture_env_dot3 */
-#define GL_DOT3_RGB                             0x86AE
-#define GL_DOT3_RGBA                            0x86AF
-/* texture_border_clamp */
-#define GL_CLAMP_TO_BORDER                      0x812D
-
-#endif /* __WIN32__ */
-
-
-
-/************************************************************************
- *
- * Function prototypes
- *
- ************************************************************************/
-
-/* Miscellaneous */
-GLAPI void APIENTRY glClearIndex( GLfloat c );
-GLAPI void APIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
-GLAPI void APIENTRY glClear( GLbitfield mask );
-GLAPI void APIENTRY glIndexMask( GLuint mask );
-GLAPI void APIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
-GLAPI void APIENTRY glAlphaFunc( GLenum func, GLclampf ref );
-GLAPI void APIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor );
-GLAPI void APIENTRY glLogicOp( GLenum opcode );
-GLAPI void APIENTRY glCullFace( GLenum mode );
-GLAPI void APIENTRY glFrontFace( GLenum mode );
-GLAPI void APIENTRY glPointSize( GLfloat size );
-GLAPI void APIENTRY glLineWidth( GLfloat width );
-GLAPI void APIENTRY glLineStipple( GLint factor, GLushort pattern );
-GLAPI void APIENTRY glPolygonMode( GLenum face, GLenum mode );
-GLAPI void APIENTRY glPolygonOffset( GLfloat factor, GLfloat units );
-GLAPI void APIENTRY glPolygonStipple( const GLubyte *mask );
-GLAPI void APIENTRY glGetPolygonStipple( GLubyte *mask );
-GLAPI void APIENTRY glEdgeFlag( GLboolean flag );
-GLAPI void APIENTRY glEdgeFlagv( const GLboolean *flag );
-GLAPI void APIENTRY glScissor( GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glClipPlane( GLenum plane, const GLdouble *equation );
-GLAPI void APIENTRY glGetClipPlane( GLenum plane, GLdouble *equation );
-GLAPI void APIENTRY glDrawBuffer( GLenum mode );
-GLAPI void APIENTRY glReadBuffer( GLenum mode );
-GLAPI void APIENTRY glEnable( GLenum cap );
-GLAPI void APIENTRY glDisable( GLenum cap );
-GLAPI GLboolean APIENTRY glIsEnabled( GLenum cap );
-GLAPI void APIENTRY glEnableClientState( GLenum cap );  /* 1.1 */
-GLAPI void APIENTRY glDisableClientState( GLenum cap );  /* 1.1 */
-GLAPI void APIENTRY glGetBooleanv( GLenum pname, GLboolean *params );
-GLAPI void APIENTRY glGetDoublev( GLenum pname, GLdouble *params );
-GLAPI void APIENTRY glGetFloatv( GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetIntegerv( GLenum pname, GLint *params );
-GLAPI void APIENTRY glPushAttrib( GLbitfield mask );
-GLAPI void APIENTRY glPopAttrib( void );
-GLAPI void APIENTRY glPushClientAttrib( GLbitfield mask );  /* 1.1 */
-GLAPI void APIENTRY glPopClientAttrib( void );  /* 1.1 */
-GLAPI GLint APIENTRY glRenderMode( GLenum mode );
-GLAPI GLenum APIENTRY glGetError( void );
-GLAPI const GLubyte* APIENTRY glGetString( GLenum name );
-GLAPI void APIENTRY glFinish( void );
-GLAPI void APIENTRY glFlush( void );
-GLAPI void APIENTRY glHint( GLenum target, GLenum mode );
-
-/* Depth Buffer */
-GLAPI void APIENTRY glClearDepth( GLclampd depth );
-GLAPI void APIENTRY glDepthFunc( GLenum func );
-GLAPI void APIENTRY glDepthMask( GLboolean flag );
-GLAPI void APIENTRY glDepthRange( GLclampd near_val, GLclampd far_val );
-
-/* Accumulation Buffer */
-GLAPI void APIENTRY glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
-GLAPI void APIENTRY glAccum( GLenum op, GLfloat value );
-
-/* Transformation */
-GLAPI void APIENTRY glMatrixMode( GLenum mode );
-GLAPI void APIENTRY glOrtho( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val );
-GLAPI void APIENTRY glFrustum( GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val );
-GLAPI void APIENTRY glViewport( GLint x, GLint y, GLsizei width, GLsizei height );
-GLAPI void APIENTRY glPushMatrix( void );
-GLAPI void APIENTRY glPopMatrix( void );
-GLAPI void APIENTRY glLoadIdentity( void );
-GLAPI void APIENTRY glLoadMatrixd( const GLdouble *m );
-GLAPI void APIENTRY glLoadMatrixf( const GLfloat *m );
-GLAPI void APIENTRY glMultMatrixd( const GLdouble *m );
-GLAPI void APIENTRY glMultMatrixf( const GLfloat *m );
-GLAPI void APIENTRY glRotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z );
-GLAPI void APIENTRY glRotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z );
-GLAPI void APIENTRY glScaled( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void APIENTRY glScalef( GLfloat x, GLfloat y, GLfloat z );
-GLAPI void APIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void APIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z );
-
-/* Display Lists */
-GLAPI GLboolean APIENTRY glIsList( GLuint list );
-GLAPI void APIENTRY glDeleteLists( GLuint list, GLsizei range );
-GLAPI GLuint APIENTRY glGenLists( GLsizei range );
-GLAPI void APIENTRY glNewList( GLuint list, GLenum mode );
-GLAPI void APIENTRY glEndList( void );
-GLAPI void APIENTRY glCallList( GLuint list );
-GLAPI void APIENTRY glCallLists( GLsizei n, GLenum type, const GLvoid *lists );
-GLAPI void APIENTRY glListBase( GLuint base );
-
-/* Drawing Functions */
-GLAPI void APIENTRY glBegin( GLenum mode );
-GLAPI void APIENTRY glEnd( void );
-GLAPI void APIENTRY glVertex2d( GLdouble x, GLdouble y );
-GLAPI void APIENTRY glVertex2f( GLfloat x, GLfloat y );
-GLAPI void APIENTRY glVertex2i( GLint x, GLint y );
-GLAPI void APIENTRY glVertex2s( GLshort x, GLshort y );
-GLAPI void APIENTRY glVertex3d( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void APIENTRY glVertex3f( GLfloat x, GLfloat y, GLfloat z );
-GLAPI void APIENTRY glVertex3i( GLint x, GLint y, GLint z );
-GLAPI void APIENTRY glVertex3s( GLshort x, GLshort y, GLshort z );
-GLAPI void APIENTRY glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
-GLAPI void APIENTRY glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
-GLAPI void APIENTRY glVertex4i( GLint x, GLint y, GLint z, GLint w );
-GLAPI void APIENTRY glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
-GLAPI void APIENTRY glVertex2dv( const GLdouble *v );
-GLAPI void APIENTRY glVertex2fv( const GLfloat *v );
-GLAPI void APIENTRY glVertex2iv( const GLint *v );
-GLAPI void APIENTRY glVertex2sv( const GLshort *v );
-GLAPI void APIENTRY glVertex3dv( const GLdouble *v );
-GLAPI void APIENTRY glVertex3fv( const GLfloat *v );
-GLAPI void APIENTRY glVertex3iv( const GLint *v );
-GLAPI void APIENTRY glVertex3sv( const GLshort *v );
-GLAPI void APIENTRY glVertex4dv( const GLdouble *v );
-GLAPI void APIENTRY glVertex4fv( const GLfloat *v );
-GLAPI void APIENTRY glVertex4iv( const GLint *v );
-GLAPI void APIENTRY glVertex4sv( const GLshort *v );
-GLAPI void APIENTRY glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz );
-GLAPI void APIENTRY glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz );
-GLAPI void APIENTRY glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz );
-GLAPI void APIENTRY glNormal3i( GLint nx, GLint ny, GLint nz );
-GLAPI void APIENTRY glNormal3s( GLshort nx, GLshort ny, GLshort nz );
-GLAPI void APIENTRY glNormal3bv( const GLbyte *v );
-GLAPI void APIENTRY glNormal3dv( const GLdouble *v );
-GLAPI void APIENTRY glNormal3fv( const GLfloat *v );
-GLAPI void APIENTRY glNormal3iv( const GLint *v );
-GLAPI void APIENTRY glNormal3sv( const GLshort *v );
-GLAPI void APIENTRY glIndexd( GLdouble c );
-GLAPI void APIENTRY glIndexf( GLfloat c );
-GLAPI void APIENTRY glIndexi( GLint c );
-GLAPI void APIENTRY glIndexs( GLshort c );
-GLAPI void APIENTRY glIndexub( GLubyte c );  /* 1.1 */
-GLAPI void APIENTRY glIndexdv( const GLdouble *c );
-GLAPI void APIENTRY glIndexfv( const GLfloat *c );
-GLAPI void APIENTRY glIndexiv( const GLint *c );
-GLAPI void APIENTRY glIndexsv( const GLshort *c );
-GLAPI void APIENTRY glIndexubv( const GLubyte *c );  /* 1.1 */
-GLAPI void APIENTRY glColor3b( GLbyte red, GLbyte green, GLbyte blue );
-GLAPI void APIENTRY glColor3d( GLdouble red, GLdouble green, GLdouble blue );
-GLAPI void APIENTRY glColor3f( GLfloat red, GLfloat green, GLfloat blue );
-GLAPI void APIENTRY glColor3i( GLint red, GLint green, GLint blue );
-GLAPI void APIENTRY glColor3s( GLshort red, GLshort green, GLshort blue );
-GLAPI void APIENTRY glColor3ub( GLubyte red, GLubyte green, GLubyte blue );
-GLAPI void APIENTRY glColor3ui( GLuint red, GLuint green, GLuint blue );
-GLAPI void APIENTRY glColor3us( GLushort red, GLushort green, GLushort blue );
-GLAPI void APIENTRY glColor4b( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha );
-GLAPI void APIENTRY glColor4d( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha );
-GLAPI void APIENTRY glColor4f( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
-GLAPI void APIENTRY glColor4i( GLint red, GLint green, GLint blue, GLint alpha );
-GLAPI void APIENTRY glColor4s( GLshort red, GLshort green, GLshort blue, GLshort alpha );
-GLAPI void APIENTRY glColor4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha );
-GLAPI void APIENTRY glColor4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha );
-GLAPI void APIENTRY glColor4us( GLushort red, GLushort green, GLushort blue, GLushort alpha );
-GLAPI void APIENTRY glColor3bv( const GLbyte *v );
-GLAPI void APIENTRY glColor3dv( const GLdouble *v );
-GLAPI void APIENTRY glColor3fv( const GLfloat *v );
-GLAPI void APIENTRY glColor3iv( const GLint *v );
-GLAPI void APIENTRY glColor3sv( const GLshort *v );
-GLAPI void APIENTRY glColor3ubv( const GLubyte *v );
-GLAPI void APIENTRY glColor3uiv( const GLuint *v );
-GLAPI void APIENTRY glColor3usv( const GLushort *v );
-GLAPI void APIENTRY glColor4bv( const GLbyte *v );
-GLAPI void APIENTRY glColor4dv( const GLdouble *v );
-GLAPI void APIENTRY glColor4fv( const GLfloat *v );
-GLAPI void APIENTRY glColor4iv( const GLint *v );
-GLAPI void APIENTRY glColor4sv( const GLshort *v );
-GLAPI void APIENTRY glColor4ubv( const GLubyte *v );
-GLAPI void APIENTRY glColor4uiv( const GLuint *v );
-GLAPI void APIENTRY glColor4usv( const GLushort *v );
-GLAPI void APIENTRY glTexCoord1d( GLdouble s );
-GLAPI void APIENTRY glTexCoord1f( GLfloat s );
-GLAPI void APIENTRY glTexCoord1i( GLint s );
-GLAPI void APIENTRY glTexCoord1s( GLshort s );
-GLAPI void APIENTRY glTexCoord2d( GLdouble s, GLdouble t );
-GLAPI void APIENTRY glTexCoord2f( GLfloat s, GLfloat t );
-GLAPI void APIENTRY glTexCoord2i( GLint s, GLint t );
-GLAPI void APIENTRY glTexCoord2s( GLshort s, GLshort t );
-GLAPI void APIENTRY glTexCoord3d( GLdouble s, GLdouble t, GLdouble r );
-GLAPI void APIENTRY glTexCoord3f( GLfloat s, GLfloat t, GLfloat r );
-GLAPI void APIENTRY glTexCoord3i( GLint s, GLint t, GLint r );
-GLAPI void APIENTRY glTexCoord3s( GLshort s, GLshort t, GLshort r );
-GLAPI void APIENTRY glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
-GLAPI void APIENTRY glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q );
-GLAPI void APIENTRY glTexCoord4i( GLint s, GLint t, GLint r, GLint q );
-GLAPI void APIENTRY glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
-GLAPI void APIENTRY glTexCoord1dv( const GLdouble *v );
-GLAPI void APIENTRY glTexCoord1fv( const GLfloat *v );
-GLAPI void APIENTRY glTexCoord1iv( const GLint *v );
-GLAPI void APIENTRY glTexCoord1sv( const GLshort *v );
-GLAPI void APIENTRY glTexCoord2dv( const GLdouble *v );
-GLAPI void APIENTRY glTexCoord2fv( const GLfloat *v );
-GLAPI void APIENTRY glTexCoord2iv( const GLint *v );
-GLAPI void APIENTRY glTexCoord2sv( const GLshort *v );
-GLAPI void APIENTRY glTexCoord3dv( const GLdouble *v );
-GLAPI void APIENTRY glTexCoord3fv( const GLfloat *v );
-GLAPI void APIENTRY glTexCoord3iv( const GLint *v );
-GLAPI void APIENTRY glTexCoord3sv( const GLshort *v );
-GLAPI void APIENTRY glTexCoord4dv( const GLdouble *v );
-GLAPI void APIENTRY glTexCoord4fv( const GLfloat *v );
-GLAPI void APIENTRY glTexCoord4iv( const GLint *v );
-GLAPI void APIENTRY glTexCoord4sv( const GLshort *v );
-GLAPI void APIENTRY glRasterPos2d( GLdouble x, GLdouble y );
-GLAPI void APIENTRY glRasterPos2f( GLfloat x, GLfloat y );
-GLAPI void APIENTRY glRasterPos2i( GLint x, GLint y );
-GLAPI void APIENTRY glRasterPos2s( GLshort x, GLshort y );
-GLAPI void APIENTRY glRasterPos3d( GLdouble x, GLdouble y, GLdouble z );
-GLAPI void APIENTRY glRasterPos3f( GLfloat x, GLfloat y, GLfloat z );
-GLAPI void APIENTRY glRasterPos3i( GLint x, GLint y, GLint z );
-GLAPI void APIENTRY glRasterPos3s( GLshort x, GLshort y, GLshort z );
-GLAPI void APIENTRY glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
-GLAPI void APIENTRY glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
-GLAPI void APIENTRY glRasterPos4i( GLint x, GLint y, GLint z, GLint w );
-GLAPI void APIENTRY glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w );
-GLAPI void APIENTRY glRasterPos2dv( const GLdouble *v );
-GLAPI void APIENTRY glRasterPos2fv( const GLfloat *v );
-GLAPI void APIENTRY glRasterPos2iv( const GLint *v );
-GLAPI void APIENTRY glRasterPos2sv( const GLshort *v );
-GLAPI void APIENTRY glRasterPos3dv( const GLdouble *v );
-GLAPI void APIENTRY glRasterPos3fv( const GLfloat *v );
-GLAPI void APIENTRY glRasterPos3iv( const GLint *v );
-GLAPI void APIENTRY glRasterPos3sv( const GLshort *v );
-GLAPI void APIENTRY glRasterPos4dv( const GLdouble *v );
-GLAPI void APIENTRY glRasterPos4fv( const GLfloat *v );
-GLAPI void APIENTRY glRasterPos4iv( const GLint *v );
-GLAPI void APIENTRY glRasterPos4sv( const GLshort *v );
-GLAPI void APIENTRY glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 );
-GLAPI void APIENTRY glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
-GLAPI void APIENTRY glRecti( GLint x1, GLint y1, GLint x2, GLint y2 );
-GLAPI void APIENTRY glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 );
-GLAPI void APIENTRY glRectdv( const GLdouble *v1, const GLdouble *v2 );
-GLAPI void APIENTRY glRectfv( const GLfloat *v1, const GLfloat *v2 );
-GLAPI void APIENTRY glRectiv( const GLint *v1, const GLint *v2 );
-GLAPI void APIENTRY glRectsv( const GLshort *v1, const GLshort *v2 );
-
-/* Lighting */
-GLAPI void APIENTRY glShadeModel( GLenum mode );
-GLAPI void APIENTRY glLightf( GLenum light, GLenum pname, GLfloat param );
-GLAPI void APIENTRY glLighti( GLenum light, GLenum pname, GLint param );
-GLAPI void APIENTRY glLightfv( GLenum light, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glLightiv( GLenum light, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glGetLightfv( GLenum light, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetLightiv( GLenum light, GLenum pname, GLint *params );
-GLAPI void APIENTRY glLightModelf( GLenum pname, GLfloat param );
-GLAPI void APIENTRY glLightModeli( GLenum pname, GLint param );
-GLAPI void APIENTRY glLightModelfv( GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glLightModeliv( GLenum pname, const GLint *params );
-GLAPI void APIENTRY glMaterialf( GLenum face, GLenum pname, GLfloat param );
-GLAPI void APIENTRY glMateriali( GLenum face, GLenum pname, GLint param );
-GLAPI void APIENTRY glMaterialfv( GLenum face, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glMaterialiv( GLenum face, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glGetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params );
-GLAPI void APIENTRY glColorMaterial( GLenum face, GLenum mode );
-
-/* Raster functions */
-GLAPI void APIENTRY glPixelZoom( GLfloat xfactor, GLfloat yfactor );
-GLAPI void APIENTRY glPixelStoref( GLenum pname, GLfloat param );
-GLAPI void APIENTRY glPixelStorei( GLenum pname, GLint param );
-GLAPI void APIENTRY glPixelTransferf( GLenum pname, GLfloat param );
-GLAPI void APIENTRY glPixelTransferi( GLenum pname, GLint param );
-GLAPI void APIENTRY glPixelMapfv( GLenum map, GLint mapsize, const GLfloat *values );
-GLAPI void APIENTRY glPixelMapuiv( GLenum map, GLint mapsize, const GLuint *values );
-GLAPI void APIENTRY glPixelMapusv( GLenum map, GLint mapsize, const GLushort *values );
-GLAPI void APIENTRY glGetPixelMapfv( GLenum map, GLfloat *values );
-GLAPI void APIENTRY glGetPixelMapuiv( GLenum map, GLuint *values );
-GLAPI void APIENTRY glGetPixelMapusv( GLenum map, GLushort *values );
-GLAPI void APIENTRY glBitmap( GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap );
-GLAPI void APIENTRY glReadPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels );
-GLAPI void APIENTRY glDrawPixels( GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glCopyPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum type );
-
-/* Stenciling */
-GLAPI void APIENTRY glStencilFunc( GLenum func, GLint ref, GLuint mask );
-GLAPI void APIENTRY glStencilMask( GLuint mask );
-GLAPI void APIENTRY glStencilOp( GLenum fail, GLenum zfail, GLenum zpass );
-GLAPI void APIENTRY glClearStencil( GLint s );
-
-/* Texture mapping */
-GLAPI void APIENTRY glTexGend( GLenum coord, GLenum pname, GLdouble param );
-GLAPI void APIENTRY glTexGenf( GLenum coord, GLenum pname, GLfloat param );
-GLAPI void APIENTRY glTexGeni( GLenum coord, GLenum pname, GLint param );
-GLAPI void APIENTRY glTexGendv( GLenum coord, GLenum pname, const GLdouble *params );
-GLAPI void APIENTRY glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glTexGeniv( GLenum coord, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glGetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
-GLAPI void APIENTRY glGetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetTexGeniv( GLenum coord, GLenum pname, GLint *params );
-GLAPI void APIENTRY glTexEnvf( GLenum target, GLenum pname, GLfloat param );
-GLAPI void APIENTRY glTexEnvi( GLenum target, GLenum pname, GLint param );
-GLAPI void APIENTRY glTexEnvfv( GLenum target, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glTexEnviv( GLenum target, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetTexEnviv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glTexParameterf( GLenum target, GLenum pname, GLfloat param );
-GLAPI void APIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param );
-GLAPI void APIENTRY glTexParameterfv( GLenum target, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glTexParameteriv( GLenum target, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glGetTexParameterfv( GLenum target, GLenum pname, GLfloat *params);
-GLAPI void APIENTRY glGetTexParameteriv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glGetTexLevelParameterfv( GLenum target, GLint level, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetTexLevelParameteriv( GLenum target, GLint level, GLenum pname, GLint *params );
-GLAPI void APIENTRY glTexImage1D( GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glTexImage2D( GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glGetTexImage( GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels );
-
-/* Evaluators */
-GLAPI void APIENTRY glMap1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points );
-GLAPI void APIENTRY glMap1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points );
-GLAPI void APIENTRY glMap2d( GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points );
-GLAPI void APIENTRY glMap2f( GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points );
-GLAPI void APIENTRY glGetMapdv( GLenum target, GLenum query, GLdouble *v );
-GLAPI void APIENTRY glGetMapfv( GLenum target, GLenum query, GLfloat *v );
-GLAPI void APIENTRY glGetMapiv( GLenum target, GLenum query, GLint *v );
-GLAPI void APIENTRY glEvalCoord1d( GLdouble u );
-GLAPI void APIENTRY glEvalCoord1f( GLfloat u );
-GLAPI void APIENTRY glEvalCoord1dv( const GLdouble *u );
-GLAPI void APIENTRY glEvalCoord1fv( const GLfloat *u );
-GLAPI void APIENTRY glEvalCoord2d( GLdouble u, GLdouble v );
-GLAPI void APIENTRY glEvalCoord2f( GLfloat u, GLfloat v );
-GLAPI void APIENTRY glEvalCoord2dv( const GLdouble *u );
-GLAPI void APIENTRY glEvalCoord2fv( const GLfloat *u );
-GLAPI void APIENTRY glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 );
-GLAPI void APIENTRY glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 );
-GLAPI void APIENTRY glMapGrid2d( GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2 );
-GLAPI void APIENTRY glMapGrid2f( GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2 );
-GLAPI void APIENTRY glEvalPoint1( GLint i );
-GLAPI void APIENTRY glEvalPoint2( GLint i, GLint j );
-GLAPI void APIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 );
-GLAPI void APIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
-
-/* Fog */
-GLAPI void APIENTRY glFogf( GLenum pname, GLfloat param );
-GLAPI void APIENTRY glFogi( GLenum pname, GLint param );
-GLAPI void APIENTRY glFogfv( GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glFogiv( GLenum pname, const GLint *params );
-
-/* Selection and Feedback */
-GLAPI void APIENTRY glFeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
-GLAPI void APIENTRY glPassThrough( GLfloat token );
-GLAPI void APIENTRY glSelectBuffer( GLsizei size, GLuint *buffer );
-GLAPI void APIENTRY glInitNames( void );
-GLAPI void APIENTRY glLoadName( GLuint name );
-GLAPI void APIENTRY glPushName( GLuint name );
-GLAPI void APIENTRY glPopName( void );
-
-
-/* 1.1 functions */
-/* texture objects */
-GLAPI void APIENTRY glGenTextures( GLsizei n, GLuint *textures );
-GLAPI void APIENTRY glDeleteTextures( GLsizei n, const GLuint *textures);
-GLAPI void APIENTRY glBindTexture( GLenum target, GLuint texture );
-GLAPI void APIENTRY glPrioritizeTextures( GLsizei n, const GLuint *textures, const GLclampf *priorities );
-GLAPI GLboolean APIENTRY glAreTexturesResident( GLsizei n, const GLuint *textures, GLboolean *residences );
-GLAPI GLboolean APIENTRY glIsTexture( GLuint texture );
-/* texture mapping */
-GLAPI void APIENTRY glTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glCopyTexImage1D( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border );
-GLAPI void APIENTRY glCopyTexImage2D( GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border );
-GLAPI void APIENTRY glCopyTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width );
-GLAPI void APIENTRY glCopyTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height );
-/* vertex arrays */
-GLAPI void APIENTRY glVertexPointer( GLint size, GLenum type, GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glNormalPointer( GLenum type, GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glColorPointer( GLint size, GLenum type, GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glIndexPointer( GLenum type, GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glTexCoordPointer( GLint size, GLenum type, GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glEdgeFlagPointer( GLsizei stride, const GLvoid *ptr );
-GLAPI void APIENTRY glGetPointerv( GLenum pname, GLvoid **params );
-GLAPI void APIENTRY glArrayElement( GLint i );
-GLAPI void APIENTRY glDrawArrays( GLenum mode, GLint first, GLsizei count );
-GLAPI void APIENTRY glDrawElements( GLenum mode, GLsizei count, GLenum type, const GLvoid *indices );
-GLAPI void APIENTRY glInterleavedArrays( GLenum format, GLsizei stride, const GLvoid *pointer );
-
-
-
-/* Under Windows, we do not define OpenGL 1.2 & 1.3 functionality, since
-   it is treated as extensions (defined in glext.h) */
-#if !defined(__WIN32__)
-
-/* 1.2 functions */
-GLAPI void APIENTRY glDrawRangeElements( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
-GLAPI void APIENTRY glTexImage3D( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
-GLAPI void APIENTRY glTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-GLAPI void APIENTRY glCopyTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
-
-/* 1.2 imaging extension functions */
-GLAPI void APIENTRY glColorTable( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table );
-GLAPI void APIENTRY glColorSubTable( GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data );
-GLAPI void APIENTRY glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params);
-GLAPI void APIENTRY glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params);
-GLAPI void APIENTRY glCopyColorSubTable( GLenum target, GLsizei start, GLint x, GLint y, GLsizei width );
-GLAPI void APIENTRY glCopyColorTable( GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
-GLAPI void APIENTRY glGetColorTable( GLenum target, GLenum format, GLenum type, GLvoid *table );
-GLAPI void APIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glBlendEquation( GLenum mode );
-GLAPI void APIENTRY glBlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
-GLAPI void APIENTRY glHistogram( GLenum target, GLsizei width, GLenum internalformat, GLboolean sink );
-GLAPI void APIENTRY glResetHistogram( GLenum target );
-GLAPI void APIENTRY glGetHistogram( GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values );
-GLAPI void APIENTRY glGetHistogramParameterfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetHistogramParameteriv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glMinmax( GLenum target, GLenum internalformat, GLboolean sink );
-GLAPI void APIENTRY glResetMinmax( GLenum target );
-GLAPI void APIENTRY glGetMinmax( GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values );
-GLAPI void APIENTRY glGetMinmaxParameterfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetMinmaxParameteriv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glConvolutionFilter1D( GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image );
-GLAPI void APIENTRY glConvolutionFilter2D( GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image );
-GLAPI void APIENTRY glConvolutionParameterf( GLenum target, GLenum pname, GLfloat params );
-GLAPI void APIENTRY glConvolutionParameterfv( GLenum target, GLenum pname, const GLfloat *params );
-GLAPI void APIENTRY glConvolutionParameteri( GLenum target, GLenum pname, GLint params );
-GLAPI void APIENTRY glConvolutionParameteriv( GLenum target, GLenum pname, const GLint *params );
-GLAPI void APIENTRY glCopyConvolutionFilter1D( GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
-GLAPI void APIENTRY glCopyConvolutionFilter2D( GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glGetConvolutionFilter( GLenum target, GLenum format, GLenum type, GLvoid *image );
-GLAPI void APIENTRY glGetConvolutionParameterfv( GLenum target, GLenum pname, GLfloat *params );
-GLAPI void APIENTRY glGetConvolutionParameteriv( GLenum target, GLenum pname, GLint *params );
-GLAPI void APIENTRY glSeparableFilter2D( GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column );
-GLAPI void APIENTRY glGetSeparableFilter( GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
-
-/* 1.3 functions */
-GLAPI void APIENTRY glActiveTexture( GLenum texture );
-GLAPI void APIENTRY glClientActiveTexture( GLenum texture );
-GLAPI void APIENTRY glCompressedTexImage1D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glCompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glCompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glCompressedTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glCompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glCompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
-GLAPI void APIENTRY glGetCompressedTexImage( GLenum target, GLint lod, GLvoid *img );
-GLAPI void APIENTRY glMultiTexCoord1d( GLenum target, GLdouble s );
-GLAPI void APIENTRY glMultiTexCoord1dv( GLenum target, const GLdouble *v );
-GLAPI void APIENTRY glMultiTexCoord1f( GLenum target, GLfloat s );
-GLAPI void APIENTRY glMultiTexCoord1fv( GLenum target, const GLfloat *v );
-GLAPI void APIENTRY glMultiTexCoord1i( GLenum target, GLint s );
-GLAPI void APIENTRY glMultiTexCoord1iv( GLenum target, const GLint *v );
-GLAPI void APIENTRY glMultiTexCoord1s( GLenum target, GLshort s );
-GLAPI void APIENTRY glMultiTexCoord1sv( GLenum target, const GLshort *v );
-GLAPI void APIENTRY glMultiTexCoord2d( GLenum target, GLdouble s, GLdouble t );
-GLAPI void APIENTRY glMultiTexCoord2dv( GLenum target, const GLdouble *v );
-GLAPI void APIENTRY glMultiTexCoord2f( GLenum target, GLfloat s, GLfloat t );
-GLAPI void APIENTRY glMultiTexCoord2fv( GLenum target, const GLfloat *v );
-GLAPI void APIENTRY glMultiTexCoord2i( GLenum target, GLint s, GLint t );
-GLAPI void APIENTRY glMultiTexCoord2iv( GLenum target, const GLint *v );
-GLAPI void APIENTRY glMultiTexCoord2s( GLenum target, GLshort s, GLshort t );
-GLAPI void APIENTRY glMultiTexCoord2sv( GLenum target, const GLshort *v );
-GLAPI void APIENTRY glMultiTexCoord3d( GLenum target, GLdouble s, GLdouble t, GLdouble r );
-GLAPI void APIENTRY glMultiTexCoord3dv( GLenum target, const GLdouble *v );
-GLAPI void APIENTRY glMultiTexCoord3f( GLenum target, GLfloat s, GLfloat t, GLfloat r );
-GLAPI void APIENTRY glMultiTexCoord3fv( GLenum target, const GLfloat *v );
-GLAPI void APIENTRY glMultiTexCoord3i( GLenum target, GLint s, GLint t, GLint r );
-GLAPI void APIENTRY glMultiTexCoord3iv( GLenum target, const GLint *v );
-GLAPI void APIENTRY glMultiTexCoord3s( GLenum target, GLshort s, GLshort t, GLshort r );
-GLAPI void APIENTRY glMultiTexCoord3sv( GLenum target, const GLshort *v );
-GLAPI void APIENTRY glMultiTexCoord4d( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
-GLAPI void APIENTRY glMultiTexCoord4dv( GLenum target, const GLdouble *v );
-GLAPI void APIENTRY glMultiTexCoord4f( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
-GLAPI void APIENTRY glMultiTexCoord4fv( GLenum target, const GLfloat *v );
-GLAPI void APIENTRY glMultiTexCoord4i( GLenum target, GLint s, GLint t, GLint r, GLint q );
-GLAPI void APIENTRY glMultiTexCoord4iv( GLenum target, const GLint *v );
-GLAPI void APIENTRY glMultiTexCoord4s( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
-GLAPI void APIENTRY glMultiTexCoord4sv( GLenum target, const GLshort *v );
-GLAPI void APIENTRY glLoadTransposeMatrixd( const GLdouble m[16] );
-GLAPI void APIENTRY glLoadTransposeMatrixf( const GLfloat m[16] );
-GLAPI void APIENTRY glMultTransposeMatrixd( const GLdouble m[16] );
-GLAPI void APIENTRY glMultTransposeMatrixf( const GLfloat m[16] );
-GLAPI void APIENTRY glSampleCoverage( GLclampf value, GLboolean invert );
-GLAPI void APIENTRY glSamplePass( GLenum pass );
-
-#endif /* __WIN32__ */
-
-
-/* Include external definitions of OpenGL extensions */
-/* Removed, see this bug report for reference:
- * http://sourceforge.net/tracker/index.php?func=detail&aid=610178&group_id=2435&atid=102435
- * 
- * #include <GL/glext.h>
- */
-
-
-/************************************************************************
- * Begin system-specific stuff
- */
-/*
- * End system-specific stuff
- ************************************************************************/
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __gl_h_ */
diff --git a/winsup/w32api/include/GL/glext.h b/winsup/w32api/include/GL/glext.h
deleted file mode 100644
index c4b4baa09..000000000
--- a/winsup/w32api/include/GL/glext.h
+++ /dev/null
@@ -1,4623 +0,0 @@
-#ifndef __glext_h_
-#define __glext_h_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-*/
-
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
-#define WIN32_LEAN_AND_MEAN 1
-#include <windows.h>
-#endif
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef GLAPI
-#define GLAPI extern
-#endif
-
-/*************************************************************/
-
-/* Header file version number, required by OpenGL ABI for Linux */
-/* glext.h last updated 2002/03/22 */
-/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */
-#define GL_GLEXT_VERSION 11
-
-#ifndef GL_VERSION_1_2
-#define GL_CONSTANT_COLOR                 0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-#define GL_CONSTANT_ALPHA                 0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
-#define GL_BLEND_COLOR                    0x8005
-#define GL_FUNC_ADD                       0x8006
-#define GL_MIN                            0x8007
-#define GL_MAX                            0x8008
-#define GL_BLEND_EQUATION                 0x8009
-#define GL_FUNC_SUBTRACT                  0x800A
-#define GL_FUNC_REVERSE_SUBTRACT          0x800B
-#define GL_CONVOLUTION_1D                 0x8010
-#define GL_CONVOLUTION_2D                 0x8011
-#define GL_SEPARABLE_2D                   0x8012
-#define GL_CONVOLUTION_BORDER_MODE        0x8013
-#define GL_CONVOLUTION_FILTER_SCALE       0x8014
-#define GL_CONVOLUTION_FILTER_BIAS        0x8015
-#define GL_REDUCE                         0x8016
-#define GL_CONVOLUTION_FORMAT             0x8017
-#define GL_CONVOLUTION_WIDTH              0x8018
-#define GL_CONVOLUTION_HEIGHT             0x8019
-#define GL_MAX_CONVOLUTION_WIDTH          0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
-#define GL_HISTOGRAM                      0x8024
-#define GL_PROXY_HISTOGRAM                0x8025
-#define GL_HISTOGRAM_WIDTH                0x8026
-#define GL_HISTOGRAM_FORMAT               0x8027
-#define GL_HISTOGRAM_RED_SIZE             0x8028
-#define GL_HISTOGRAM_GREEN_SIZE           0x8029
-#define GL_HISTOGRAM_BLUE_SIZE            0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
-#define GL_HISTOGRAM_SINK                 0x802D
-#define GL_MINMAX                         0x802E
-#define GL_MINMAX_FORMAT                  0x802F
-#define GL_MINMAX_SINK                    0x8030
-#define GL_TABLE_TOO_LARGE                0x8031
-#define GL_UNSIGNED_BYTE_3_3_2            0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
-#define GL_UNSIGNED_INT_8_8_8_8           0x8035
-#define GL_UNSIGNED_INT_10_10_10_2        0x8036
-#define GL_RESCALE_NORMAL                 0x803A
-#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
-#define GL_UNSIGNED_SHORT_5_6_5           0x8363
-#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
-#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
-#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
-#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
-#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
-#define GL_COLOR_MATRIX                   0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
-#define GL_COLOR_TABLE                    0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
-#define GL_PROXY_COLOR_TABLE              0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
-#define GL_COLOR_TABLE_SCALE              0x80D6
-#define GL_COLOR_TABLE_BIAS               0x80D7
-#define GL_COLOR_TABLE_FORMAT             0x80D8
-#define GL_COLOR_TABLE_WIDTH              0x80D9
-#define GL_COLOR_TABLE_RED_SIZE           0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
-#define GL_BGR                            0x80E0
-#define GL_BGRA                           0x80E1
-#define GL_MAX_ELEMENTS_VERTICES          0x80E8
-#define GL_MAX_ELEMENTS_INDICES           0x80E9
-#define GL_CLAMP_TO_EDGE                  0x812F
-#define GL_TEXTURE_MIN_LOD                0x813A
-#define GL_TEXTURE_MAX_LOD                0x813B
-#define GL_TEXTURE_BASE_LEVEL             0x813C
-#define GL_TEXTURE_MAX_LEVEL              0x813D
-#define GL_IGNORE_BORDER                  0x8150
-#define GL_CONSTANT_BORDER                0x8151
-#define GL_WRAP_BORDER                    0x8152
-#define GL_REPLICATE_BORDER               0x8153
-#define GL_CONVOLUTION_BORDER_COLOR       0x8154
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
-#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
-#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
-#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
-#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
-#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_TEXTURE0                       0x84C0
-#define GL_TEXTURE1                       0x84C1
-#define GL_TEXTURE2                       0x84C2
-#define GL_TEXTURE3                       0x84C3
-#define GL_TEXTURE4                       0x84C4
-#define GL_TEXTURE5                       0x84C5
-#define GL_TEXTURE6                       0x84C6
-#define GL_TEXTURE7                       0x84C7
-#define GL_TEXTURE8                       0x84C8
-#define GL_TEXTURE9                       0x84C9
-#define GL_TEXTURE10                      0x84CA
-#define GL_TEXTURE11                      0x84CB
-#define GL_TEXTURE12                      0x84CC
-#define GL_TEXTURE13                      0x84CD
-#define GL_TEXTURE14                      0x84CE
-#define GL_TEXTURE15                      0x84CF
-#define GL_TEXTURE16                      0x84D0
-#define GL_TEXTURE17                      0x84D1
-#define GL_TEXTURE18                      0x84D2
-#define GL_TEXTURE19                      0x84D3
-#define GL_TEXTURE20                      0x84D4
-#define GL_TEXTURE21                      0x84D5
-#define GL_TEXTURE22                      0x84D6
-#define GL_TEXTURE23                      0x84D7
-#define GL_TEXTURE24                      0x84D8
-#define GL_TEXTURE25                      0x84D9
-#define GL_TEXTURE26                      0x84DA
-#define GL_TEXTURE27                      0x84DB
-#define GL_TEXTURE28                      0x84DC
-#define GL_TEXTURE29                      0x84DD
-#define GL_TEXTURE30                      0x84DE
-#define GL_TEXTURE31                      0x84DF
-#define GL_ACTIVE_TEXTURE                 0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
-#define GL_MAX_TEXTURE_UNITS              0x84E2
-#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
-#define GL_MULTISAMPLE                    0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
-#define GL_SAMPLE_COVERAGE                0x80A0
-#define GL_SAMPLE_BUFFERS                 0x80A8
-#define GL_SAMPLES                        0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
-#define GL_MULTISAMPLE_BIT                0x20000000
-#define GL_NORMAL_MAP                     0x8511
-#define GL_REFLECTION_MAP                 0x8512
-#define GL_TEXTURE_CUBE_MAP               0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
-#define GL_COMPRESSED_ALPHA               0x84E9
-#define GL_COMPRESSED_LUMINANCE           0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
-#define GL_COMPRESSED_INTENSITY           0x84EC
-#define GL_COMPRESSED_RGB                 0x84ED
-#define GL_COMPRESSED_RGBA                0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
-#define GL_TEXTURE_COMPRESSED             0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
-#define GL_CLAMP_TO_BORDER                0x812D
-#define GL_CLAMP_TO_BORDER_SGIS           0x812D
-#define GL_COMBINE                        0x8570
-#define GL_COMBINE_RGB                    0x8571
-#define GL_COMBINE_ALPHA                  0x8572
-#define GL_SOURCE0_RGB                    0x8580
-#define GL_SOURCE1_RGB                    0x8581
-#define GL_SOURCE2_RGB                    0x8582
-#define GL_SOURCE0_ALPHA                  0x8588
-#define GL_SOURCE1_ALPHA                  0x8589
-#define GL_SOURCE2_ALPHA                  0x858A
-#define GL_OPERAND0_RGB                   0x8590
-#define GL_OPERAND1_RGB                   0x8591
-#define GL_OPERAND2_RGB                   0x8592
-#define GL_OPERAND0_ALPHA                 0x8598
-#define GL_OPERAND1_ALPHA                 0x8599
-#define GL_OPERAND2_ALPHA                 0x859A
-#define GL_RGB_SCALE                      0x8573
-#define GL_ADD_SIGNED                     0x8574
-#define GL_INTERPOLATE                    0x8575
-#define GL_SUBTRACT                       0x84E7
-#define GL_CONSTANT                       0x8576
-#define GL_PRIMARY_COLOR                  0x8577
-#define GL_PREVIOUS                       0x8578
-#define GL_DOT3_RGB                       0x86AE
-#define GL_DOT3_RGBA                      0x86AF
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_TEXTURE0_ARB                   0x84C0
-#define GL_TEXTURE1_ARB                   0x84C1
-#define GL_TEXTURE2_ARB                   0x84C2
-#define GL_TEXTURE3_ARB                   0x84C3
-#define GL_TEXTURE4_ARB                   0x84C4
-#define GL_TEXTURE5_ARB                   0x84C5
-#define GL_TEXTURE6_ARB                   0x84C6
-#define GL_TEXTURE7_ARB                   0x84C7
-#define GL_TEXTURE8_ARB                   0x84C8
-#define GL_TEXTURE9_ARB                   0x84C9
-#define GL_TEXTURE10_ARB                  0x84CA
-#define GL_TEXTURE11_ARB                  0x84CB
-#define GL_TEXTURE12_ARB                  0x84CC
-#define GL_TEXTURE13_ARB                  0x84CD
-#define GL_TEXTURE14_ARB                  0x84CE
-#define GL_TEXTURE15_ARB                  0x84CF
-#define GL_TEXTURE16_ARB                  0x84D0
-#define GL_TEXTURE17_ARB                  0x84D1
-#define GL_TEXTURE18_ARB                  0x84D2
-#define GL_TEXTURE19_ARB                  0x84D3
-#define GL_TEXTURE20_ARB                  0x84D4
-#define GL_TEXTURE21_ARB                  0x84D5
-#define GL_TEXTURE22_ARB                  0x84D6
-#define GL_TEXTURE23_ARB                  0x84D7
-#define GL_TEXTURE24_ARB                  0x84D8
-#define GL_TEXTURE25_ARB                  0x84D9
-#define GL_TEXTURE26_ARB                  0x84DA
-#define GL_TEXTURE27_ARB                  0x84DB
-#define GL_TEXTURE28_ARB                  0x84DC
-#define GL_TEXTURE29_ARB                  0x84DD
-#define GL_TEXTURE30_ARB                  0x84DE
-#define GL_TEXTURE31_ARB                  0x84DF
-#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
-#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
-#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
-#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_MULTISAMPLE_ARB                0x809D
-#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
-#define GL_SAMPLE_COVERAGE_ARB            0x80A0
-#define GL_SAMPLE_BUFFERS_ARB             0x80A8
-#define GL_SAMPLES_ARB                    0x80A9
-#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
-#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
-#define GL_MULTISAMPLE_BIT_ARB            0x20000000
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_NORMAL_MAP_ARB                 0x8511
-#define GL_REFLECTION_MAP_ARB             0x8512
-#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_COMPRESSED_ALPHA_ARB           0x84E9
-#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
-#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
-#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
-#define GL_COMPRESSED_RGB_ARB             0x84ED
-#define GL_COMPRESSED_RGBA_ARB            0x84EE
-#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
-#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
-#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
-#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
-#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_CLAMP_TO_BORDER_ARB            0x812D
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_POINT_SIZE_MIN_ARB             0x8126
-#define GL_POINT_SIZE_MIN_EXT             0x8126
-#define GL_POINT_SIZE_MIN_SGIS            0x8126
-#define GL_POINT_SIZE_MAX_ARB             0x8127
-#define GL_POINT_SIZE_MAX_EXT             0x8127
-#define GL_POINT_SIZE_MAX_SGIS            0x8127
-#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
-#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
-#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
-#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
-#define GL_DISTANCE_ATTENUATION_EXT       0x8129
-#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
-#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
-#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
-#define GL_VERTEX_BLEND_ARB               0x86A7
-#define GL_CURRENT_WEIGHT_ARB             0x86A8
-#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
-#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
-#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
-#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
-#define GL_WEIGHT_ARRAY_ARB               0x86AD
-#define GL_MODELVIEW0_ARB                 0x1700
-#define GL_MODELVIEW1_ARB                 0x850A
-#define GL_MODELVIEW2_ARB                 0x8722
-#define GL_MODELVIEW3_ARB                 0x8723
-#define GL_MODELVIEW4_ARB                 0x8724
-#define GL_MODELVIEW5_ARB                 0x8725
-#define GL_MODELVIEW6_ARB                 0x8726
-#define GL_MODELVIEW7_ARB                 0x8727
-#define GL_MODELVIEW8_ARB                 0x8728
-#define GL_MODELVIEW9_ARB                 0x8729
-#define GL_MODELVIEW10_ARB                0x872A
-#define GL_MODELVIEW11_ARB                0x872B
-#define GL_MODELVIEW12_ARB                0x872C
-#define GL_MODELVIEW13_ARB                0x872D
-#define GL_MODELVIEW14_ARB                0x872E
-#define GL_MODELVIEW15_ARB                0x872F
-#define GL_MODELVIEW16_ARB                0x8730
-#define GL_MODELVIEW17_ARB                0x8731
-#define GL_MODELVIEW18_ARB                0x8732
-#define GL_MODELVIEW19_ARB                0x8733
-#define GL_MODELVIEW20_ARB                0x8734
-#define GL_MODELVIEW21_ARB                0x8735
-#define GL_MODELVIEW22_ARB                0x8736
-#define GL_MODELVIEW23_ARB                0x8737
-#define GL_MODELVIEW24_ARB                0x8738
-#define GL_MODELVIEW25_ARB                0x8739
-#define GL_MODELVIEW26_ARB                0x873A
-#define GL_MODELVIEW27_ARB                0x873B
-#define GL_MODELVIEW28_ARB                0x873C
-#define GL_MODELVIEW29_ARB                0x873D
-#define GL_MODELVIEW30_ARB                0x873E
-#define GL_MODELVIEW31_ARB                0x873F
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_MATRIX_PALETTE_ARB             0x8840
-#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
-#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
-#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
-#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
-#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
-#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
-#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
-#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
-#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_COMBINE_ARB                    0x8570
-#define GL_COMBINE_RGB_ARB                0x8571
-#define GL_COMBINE_ALPHA_ARB              0x8572
-#define GL_SOURCE0_RGB_ARB                0x8580
-#define GL_SOURCE1_RGB_ARB                0x8581
-#define GL_SOURCE2_RGB_ARB                0x8582
-#define GL_SOURCE0_ALPHA_ARB              0x8588
-#define GL_SOURCE1_ALPHA_ARB              0x8589
-#define GL_SOURCE2_ALPHA_ARB              0x858A
-#define GL_OPERAND0_RGB_ARB               0x8590
-#define GL_OPERAND1_RGB_ARB               0x8591
-#define GL_OPERAND2_RGB_ARB               0x8592
-#define GL_OPERAND0_ALPHA_ARB             0x8598
-#define GL_OPERAND1_ALPHA_ARB             0x8599
-#define GL_OPERAND2_ALPHA_ARB             0x859A
-#define GL_RGB_SCALE_ARB                  0x8573
-#define GL_ADD_SIGNED_ARB                 0x8574
-#define GL_INTERPOLATE_ARB                0x8575
-#define GL_SUBTRACT_ARB                   0x84E7
-#define GL_CONSTANT_ARB                   0x8576
-#define GL_PRIMARY_COLOR_ARB              0x8577
-#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_DOT3_RGB_ARB                   0x86AE
-#define GL_DOT3_RGB_EXT                   0x86AE
-#define GL_DOT3_RGBA_ARB                  0x86AF
-#define GL_DOT3_RGBA_EXT                  0x86AF
-#endif
-
-#ifndef GL_ARB_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_ARB            0x8370
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
-#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
-#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
-#endif
-
-#ifndef GL_ARB_window_pos
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_ABGR_EXT                       0x8000
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_CONSTANT_COLOR_EXT             0x8001
-#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
-#define GL_CONSTANT_ALPHA_EXT             0x8003
-#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
-#define GL_BLEND_COLOR_EXT                0x8005
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_POLYGON_OFFSET_EXT             0x8037
-#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
-#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_ALPHA4_EXT                     0x803B
-#define GL_ALPHA8_EXT                     0x803C
-#define GL_ALPHA12_EXT                    0x803D
-#define GL_ALPHA16_EXT                    0x803E
-#define GL_LUMINANCE4_EXT                 0x803F
-#define GL_LUMINANCE8_EXT                 0x8040
-#define GL_LUMINANCE12_EXT                0x8041
-#define GL_LUMINANCE16_EXT                0x8042
-#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
-#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
-#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
-#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
-#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
-#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
-#define GL_INTENSITY_EXT                  0x8049
-#define GL_INTENSITY4_EXT                 0x804A
-#define GL_INTENSITY8_EXT                 0x804B
-#define GL_INTENSITY12_EXT                0x804C
-#define GL_INTENSITY16_EXT                0x804D
-#define GL_RGB2_EXT                       0x804E
-#define GL_RGB4_EXT                       0x804F
-#define GL_RGB5_EXT                       0x8050
-#define GL_RGB8_EXT                       0x8051
-#define GL_RGB10_EXT                      0x8052
-#define GL_RGB12_EXT                      0x8053
-#define GL_RGB16_EXT                      0x8054
-#define GL_RGBA2_EXT                      0x8055
-#define GL_RGBA4_EXT                      0x8056
-#define GL_RGB5_A1_EXT                    0x8057
-#define GL_RGBA8_EXT                      0x8058
-#define GL_RGB10_A2_EXT                   0x8059
-#define GL_RGBA12_EXT                     0x805A
-#define GL_RGBA16_EXT                     0x805B
-#define GL_TEXTURE_RED_SIZE_EXT           0x805C
-#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
-#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
-#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
-#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
-#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
-#define GL_REPLACE_EXT                    0x8062
-#define GL_PROXY_TEXTURE_1D_EXT           0x8063
-#define GL_PROXY_TEXTURE_2D_EXT           0x8064
-#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_PACK_SKIP_IMAGES               0x806B
-#define GL_PACK_SKIP_IMAGES_EXT           0x806B
-#define GL_PACK_IMAGE_HEIGHT              0x806C
-#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
-#define GL_UNPACK_SKIP_IMAGES             0x806D
-#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
-#define GL_UNPACK_IMAGE_HEIGHT            0x806E
-#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
-#define GL_TEXTURE_3D                     0x806F
-#define GL_TEXTURE_3D_EXT                 0x806F
-#define GL_PROXY_TEXTURE_3D               0x8070
-#define GL_PROXY_TEXTURE_3D_EXT           0x8070
-#define GL_TEXTURE_DEPTH                  0x8071
-#define GL_TEXTURE_DEPTH_EXT              0x8071
-#define GL_TEXTURE_WRAP_R                 0x8072
-#define GL_TEXTURE_WRAP_R_EXT             0x8072
-#define GL_MAX_3D_TEXTURE_SIZE            0x8073
-#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_FILTER4_SGIS                   0x8146
-#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
-#endif
-
-#ifndef GL_EXT_subtexture
-#endif
-
-#ifndef GL_EXT_copy_texture
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_HISTOGRAM_EXT                  0x8024
-#define GL_PROXY_HISTOGRAM_EXT            0x8025
-#define GL_HISTOGRAM_WIDTH_EXT            0x8026
-#define GL_HISTOGRAM_FORMAT_EXT           0x8027
-#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
-#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
-#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
-#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
-#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
-#define GL_HISTOGRAM_SINK_EXT             0x802D
-#define GL_MINMAX_EXT                     0x802E
-#define GL_MINMAX_FORMAT_EXT              0x802F
-#define GL_MINMAX_SINK_EXT                0x8030
-#define GL_TABLE_TOO_LARGE_EXT            0x8031
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_CONVOLUTION_1D_EXT             0x8010
-#define GL_CONVOLUTION_2D_EXT             0x8011
-#define GL_SEPARABLE_2D_EXT               0x8012
-#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
-#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
-#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
-#define GL_REDUCE_EXT                     0x8016
-#define GL_CONVOLUTION_FORMAT_EXT         0x8017
-#define GL_CONVOLUTION_WIDTH_EXT          0x8018
-#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
-#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
-#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
-#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
-#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
-#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
-#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
-#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
-#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
-#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
-#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
-#endif
-
-#ifndef GL_SGI_color_matrix
-#define GL_COLOR_MATRIX_SGI               0x80B1
-#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
-#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
-#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
-#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
-#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
-#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
-#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
-#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
-#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
-#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_COLOR_TABLE_SGI                0x80D0
-#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
-#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
-#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
-#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
-#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
-#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
-#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
-#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
-#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
-#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
-#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
-#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
-#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
-#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
-#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_PIXEL_TEXTURE_SGIS             0x8353
-#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
-#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
-#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_PIXEL_TEX_GEN_SGIX             0x8139
-#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
-#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
-#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
-#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
-#define GL_TEXTURE_4D_SGIS                0x8134
-#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
-#define GL_TEXTURE_4DSIZE_SGIS            0x8136
-#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
-#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
-#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
-#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_CMYK_EXT                       0x800C
-#define GL_CMYKA_EXT                      0x800D
-#define GL_PACK_CMYK_HINT_EXT             0x800E
-#define GL_UNPACK_CMYK_HINT_EXT           0x800F
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_TEXTURE_PRIORITY_EXT           0x8066
-#define GL_TEXTURE_RESIDENT_EXT           0x8067
-#define GL_TEXTURE_1D_BINDING_EXT         0x8068
-#define GL_TEXTURE_2D_BINDING_EXT         0x8069
-#define GL_TEXTURE_3D_BINDING_EXT         0x806A
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
-#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
-#define GL_LINEAR_DETAIL_SGIS             0x8097
-#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
-#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
-#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
-#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
-#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_LINEAR_SHARPEN_SGIS            0x80AD
-#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
-#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
-#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
-#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
-#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
-#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
-#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
-#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
-#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
-#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_MULTISAMPLE_SGIS               0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
-#define GL_SAMPLE_MASK_SGIS               0x80A0
-#define GL_1PASS_SGIS                     0x80A1
-#define GL_2PASS_0_SGIS                   0x80A2
-#define GL_2PASS_1_SGIS                   0x80A3
-#define GL_4PASS_0_SGIS                   0x80A4
-#define GL_4PASS_1_SGIS                   0x80A5
-#define GL_4PASS_2_SGIS                   0x80A6
-#define GL_4PASS_3_SGIS                   0x80A7
-#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
-#define GL_SAMPLES_SGIS                   0x80A9
-#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
-#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
-#define GL_SAMPLE_PATTERN_SGIS            0x80AC
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_RESCALE_NORMAL_EXT             0x803A
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_VERTEX_ARRAY_EXT               0x8074
-#define GL_NORMAL_ARRAY_EXT               0x8075
-#define GL_COLOR_ARRAY_EXT                0x8076
-#define GL_INDEX_ARRAY_EXT                0x8077
-#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
-#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
-#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
-#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
-#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
-#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
-#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
-#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
-#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
-#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
-#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
-#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
-#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
-#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
-#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
-#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
-#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
-#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
-#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
-#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
-#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
-#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
-#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
-#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
-#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
-#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
-#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
-#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_GENERATE_MIPMAP_SGIS           0x8191
-#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
-#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
-#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
-#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
-#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
-#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
-#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
-#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
-#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
-#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
-#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
-#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_TEXTURE_COMPARE_SGIX           0x819A
-#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
-#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
-#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_CLAMP_TO_EDGE_SGIS             0x812F
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_FUNC_ADD_EXT                   0x8006
-#define GL_MIN_EXT                        0x8007
-#define GL_MAX_EXT                        0x8008
-#define GL_BLEND_EQUATION_EXT             0x8009
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_FUNC_SUBTRACT_EXT              0x800A
-#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_INTERLACE_SGIX                 0x8094
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
-#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
-#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
-#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
-#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
-#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
-#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
-#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
-#endif
-
-#ifndef GL_SGIS_texture_select
-#define GL_DUAL_ALPHA4_SGIS               0x8110
-#define GL_DUAL_ALPHA8_SGIS               0x8111
-#define GL_DUAL_ALPHA12_SGIS              0x8112
-#define GL_DUAL_ALPHA16_SGIS              0x8113
-#define GL_DUAL_LUMINANCE4_SGIS           0x8114
-#define GL_DUAL_LUMINANCE8_SGIS           0x8115
-#define GL_DUAL_LUMINANCE12_SGIS          0x8116
-#define GL_DUAL_LUMINANCE16_SGIS          0x8117
-#define GL_DUAL_INTENSITY4_SGIS           0x8118
-#define GL_DUAL_INTENSITY8_SGIS           0x8119
-#define GL_DUAL_INTENSITY12_SGIS          0x811A
-#define GL_DUAL_INTENSITY16_SGIS          0x811B
-#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
-#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
-#define GL_QUAD_ALPHA4_SGIS               0x811E
-#define GL_QUAD_ALPHA8_SGIS               0x811F
-#define GL_QUAD_LUMINANCE4_SGIS           0x8120
-#define GL_QUAD_LUMINANCE8_SGIS           0x8121
-#define GL_QUAD_INTENSITY4_SGIS           0x8122
-#define GL_QUAD_INTENSITY8_SGIS           0x8123
-#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
-#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SPRITE_SGIX                    0x8148
-#define GL_SPRITE_MODE_SGIX               0x8149
-#define GL_SPRITE_AXIS_SGIX               0x814A
-#define GL_SPRITE_TRANSLATION_SGIX        0x814B
-#define GL_SPRITE_AXIAL_SGIX              0x814C
-#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
-#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
-#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
-#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
-#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
-#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_FRAMEZOOM_SGIX                 0x818B
-#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
-#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#endif
-
-#ifndef GL_FfdMaskSGIX
-#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
-#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
-#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
-#define GL_DEFORMATIONS_MASK_SGIX         0x8196
-#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_REFERENCE_PLANE_SGIX           0x817D
-#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
-#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
-#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_FOG_FUNC_SGIS                  0x812A
-#define GL_FOG_FUNC_POINTS_SGIS           0x812B
-#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_FOG_OFFSET_SGIX                0x8198
-#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_IMAGE_SCALE_X_HP               0x8155
-#define GL_IMAGE_SCALE_Y_HP               0x8156
-#define GL_IMAGE_TRANSLATE_X_HP           0x8157
-#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
-#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
-#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
-#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
-#define GL_IMAGE_MAG_FILTER_HP            0x815C
-#define GL_IMAGE_MIN_FILTER_HP            0x815D
-#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
-#define GL_CUBIC_HP                       0x815F
-#define GL_AVERAGE_HP                     0x8160
-#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
-#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
-#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_IGNORE_BORDER_HP               0x8150
-#define GL_CONSTANT_BORDER_HP             0x8151
-#define GL_REPLICATE_BORDER_HP            0x8153
-#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
-#endif
-
-#ifndef GL_INGR_palette_buffer
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
-#endif
-
-#ifndef GL_EXT_color_subtable
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
-#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
-#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
-#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
-#define GL_COLOR3_BIT_PGI                 0x00010000
-#define GL_COLOR4_BIT_PGI                 0x00020000
-#define GL_EDGEFLAG_BIT_PGI               0x00040000
-#define GL_INDEX_BIT_PGI                  0x00080000
-#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
-#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
-#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
-#define GL_MAT_EMISSION_BIT_PGI           0x00800000
-#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
-#define GL_MAT_SHININESS_BIT_PGI          0x02000000
-#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
-#define GL_NORMAL_BIT_PGI                 0x08000000
-#define GL_TEXCOORD1_BIT_PGI              0x10000000
-#define GL_TEXCOORD2_BIT_PGI              0x20000000
-#define GL_TEXCOORD3_BIT_PGI              0x40000000
-#define GL_TEXCOORD4_BIT_PGI              0x80000000
-#define GL_VERTEX23_BIT_PGI               0x00000004
-#define GL_VERTEX4_BIT_PGI                0x00000008
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
-#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
-#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
-#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
-#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
-#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
-#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
-#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
-#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
-#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
-#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
-#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
-#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
-#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
-#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
-#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
-#define GL_CLIP_NEAR_HINT_PGI             0x1A220
-#define GL_CLIP_FAR_HINT_PGI              0x1A221
-#define GL_WIDE_LINE_HINT_PGI             0x1A222
-#define GL_BACK_NORMALS_HINT_PGI          0x1A223
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_COLOR_INDEX1_EXT               0x80E2
-#define GL_COLOR_INDEX2_EXT               0x80E3
-#define GL_COLOR_INDEX4_EXT               0x80E4
-#define GL_COLOR_INDEX8_EXT               0x80E5
-#define GL_COLOR_INDEX12_EXT              0x80E6
-#define GL_COLOR_INDEX16_EXT              0x80E7
-#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_LIST_PRIORITY_SGIX             0x8182
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_IR_INSTRUMENT1_SGIX            0x817F
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
-#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
-#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SHADOW_AMBIENT_SGIX            0x80BF
-#endif
-
-#ifndef GL_EXT_index_texture
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_INDEX_MATERIAL_EXT             0x81B8
-#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
-#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_INDEX_TEST_EXT                 0x81B5
-#define GL_INDEX_TEST_FUNC_EXT            0x81B6
-#define GL_INDEX_TEST_REF_EXT             0x81B7
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_IUI_V2F_EXT                    0x81AD
-#define GL_IUI_V3F_EXT                    0x81AE
-#define GL_IUI_N3F_V2F_EXT                0x81AF
-#define GL_IUI_N3F_V3F_EXT                0x81B0
-#define GL_T2F_IUI_V2F_EXT                0x81B1
-#define GL_T2F_IUI_V3F_EXT                0x81B2
-#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
-#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
-#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_CULL_VERTEX_EXT                0x81AA
-#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
-#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_YCRCB_422_SGIX                 0x81BB
-#define GL_YCRCB_444_SGIX                 0x81BC
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
-#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
-#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
-#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
-#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
-#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
-#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
-#define GL_LIGHT_ENV_MODE_SGIX            0x8407
-#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
-#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
-#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
-#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
-#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
-#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
-#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
-#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
-#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
-#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
-#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
-#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
-#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
-#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
-#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_PHONG_WIN                      0x80EA
-#define GL_PHONG_HINT_WIN                 0x80EB
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_FRAGMENT_MATERIAL_EXT          0x8349
-#define GL_FRAGMENT_NORMAL_EXT            0x834A
-#define GL_FRAGMENT_COLOR_EXT             0x834C
-#define GL_ATTENUATION_EXT                0x834D
-#define GL_SHADOW_ATTENUATION_EXT         0x834E
-#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
-#define GL_TEXTURE_LIGHT_EXT              0x8350
-#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
-#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
-/* reuse GL_FRAGMENT_DEPTH_EXT */
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_ALPHA_MIN_SGIX                 0x8320
-#define GL_ALPHA_MAX_SGIX                 0x8321
-#endif
-
-#ifndef GL_SGIX_impact_pixel_texture
-#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX   0x8184
-#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX     0x8185
-#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX     0x8186
-#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187
-#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188
-#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX    0x8189
-#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX    0x818A
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_BGR_EXT                        0x80E0
-#define GL_BGRA_EXT                       0x80E1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_ASYNC_MARKER_SGIX              0x8329
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
-#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
-#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
-#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
-#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
-#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
-#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
-#endif
-
-#ifndef GL_INTEL_texture_scissor
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
-#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
-#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
-#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
-#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_OCCLUSION_TEST_HP              0x8165
-#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
-#define GL_PIXEL_MAG_FILTER_EXT           0x8331
-#define GL_PIXEL_MIN_FILTER_EXT           0x8332
-#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
-#define GL_CUBIC_EXT                      0x8334
-#define GL_AVERAGE_EXT                    0x8335
-#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
-#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
-#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_COLOR_SUM_EXT                  0x8458
-#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
-#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
-#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
-#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
-#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
-#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_PERTURB_EXT                    0x85AE
-#define GL_TEXTURE_NORMAL_EXT             0x85AF
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
-#define GL_FOG_COORDINATE_EXT             0x8451
-#define GL_FRAGMENT_DEPTH_EXT             0x8452
-#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
-#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
-#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
-#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
-#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_SCREEN_COORDINATES_REND        0x8490
-#define GL_INVERTED_SCREEN_W_REND         0x8491
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_TANGENT_ARRAY_EXT              0x8439
-#define GL_BINORMAL_ARRAY_EXT             0x843A
-#define GL_CURRENT_TANGENT_EXT            0x843B
-#define GL_CURRENT_BINORMAL_EXT           0x843C
-#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
-#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
-#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
-#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
-#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
-#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
-#define GL_MAP1_TANGENT_EXT               0x8444
-#define GL_MAP2_TANGENT_EXT               0x8445
-#define GL_MAP1_BINORMAL_EXT              0x8446
-#define GL_MAP2_BINORMAL_EXT              0x8447
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_COMBINE_EXT                    0x8570
-#define GL_COMBINE_RGB_EXT                0x8571
-#define GL_COMBINE_ALPHA_EXT              0x8572
-#define GL_RGB_SCALE_EXT                  0x8573
-#define GL_ADD_SIGNED_EXT                 0x8574
-#define GL_INTERPOLATE_EXT                0x8575
-#define GL_CONSTANT_EXT                   0x8576
-#define GL_PRIMARY_COLOR_EXT              0x8577
-#define GL_PREVIOUS_EXT                   0x8578
-#define GL_SOURCE0_RGB_EXT                0x8580
-#define GL_SOURCE1_RGB_EXT                0x8581
-#define GL_SOURCE2_RGB_EXT                0x8582
-#define GL_SOURCE0_ALPHA_EXT              0x8588
-#define GL_SOURCE1_ALPHA_EXT              0x8589
-#define GL_SOURCE2_ALPHA_EXT              0x858A
-#define GL_OPERAND0_RGB_EXT               0x8590
-#define GL_OPERAND1_RGB_EXT               0x8591
-#define GL_OPERAND2_RGB_EXT               0x8592
-#define GL_OPERAND0_ALPHA_EXT             0x8598
-#define GL_OPERAND1_ALPHA_EXT             0x8599
-#define GL_OPERAND2_ALPHA_EXT             0x859A
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_TRANSFORM_HINT_APPLE           0x85B1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_FOG_SCALE_SGIX                 0x81FC
-#define GL_FOG_SCALE_VALUE_SGIX           0x81FD
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
-#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_GLOBAL_ALPHA_SUN               0x81D9
-#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_RESTART_SUN                    0x0001
-#define GL_REPLACE_MIDDLE_SUN             0x0002
-#define GL_REPLACE_OLDEST_SUN             0x0003
-#define GL_TRIANGLE_LIST_SUN              0x81D7
-#define GL_REPLACEMENT_CODE_SUN           0x81D8
-#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
-#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
-#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
-#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
-#define GL_R1UI_V3F_SUN                   0x85C4
-#define GL_R1UI_C4UB_V3F_SUN              0x85C5
-#define GL_R1UI_C3F_V3F_SUN               0x85C6
-#define GL_R1UI_N3F_V3F_SUN               0x85C7
-#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
-#define GL_R1UI_T2F_V3F_SUN               0x85C9
-#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
-#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
-#endif
-
-#ifndef GL_SUN_vertex
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_BLEND_DST_RGB_EXT              0x80C8
-#define GL_BLEND_SRC_RGB_EXT              0x80C9
-#define GL_BLEND_DST_ALPHA_EXT            0x80CA
-#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_RED_MIN_CLAMP_INGR             0x8560
-#define GL_GREEN_MIN_CLAMP_INGR           0x8561
-#define GL_BLUE_MIN_CLAMP_INGR            0x8562
-#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
-#define GL_RED_MAX_CLAMP_INGR             0x8564
-#define GL_GREEN_MAX_CLAMP_INGR           0x8565
-#define GL_BLUE_MAX_CLAMP_INGR            0x8566
-#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INTERLACE_READ_INGR            0x8568
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_INCR_WRAP_EXT                  0x8507
-#define GL_DECR_WRAP_EXT                  0x8508
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_422_EXT                        0x80CC
-#define GL_422_REV_EXT                    0x80CD
-#define GL_422_AVERAGE_EXT                0x80CE
-#define GL_422_REV_AVERAGE_EXT            0x80CF
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NORMAL_MAP_NV                  0x8511
-#define GL_REFLECTION_MAP_NV              0x8512
-#endif
-
-#ifndef GL_EXT_texture_cube_map
-#define GL_NORMAL_MAP_EXT                 0x8511
-#define GL_REFLECTION_MAP_EXT             0x8512
-#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
-#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
-#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
-#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
-#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
-#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_WRAP_BORDER_SUN                0x81D4
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
-#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
-#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
-#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_MODELVIEW0_STACK_DEPTH_EXT     GL_MODELVIEW_STACK_DEPTH
-#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
-#define GL_MODELVIEW0_MATRIX_EXT          GL_MODELVIEW_MATRIX
-#define GL_MODELVIEW1_MATRIX_EXT          0x8506
-#define GL_VERTEX_WEIGHTING_EXT           0x8509
-#define GL_MODELVIEW0_EXT                 GL_MODELVIEW
-#define GL_MODELVIEW1_EXT                 0x850A
-#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
-#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
-#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
-#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
-#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
-#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_MAX_SHININESS_NV               0x8504
-#define GL_MAX_SPOT_EXPONENT_NV           0x8505
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
-#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
-#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
-#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
-#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_REGISTER_COMBINERS_NV          0x8522
-#define GL_VARIABLE_A_NV                  0x8523
-#define GL_VARIABLE_B_NV                  0x8524
-#define GL_VARIABLE_C_NV                  0x8525
-#define GL_VARIABLE_D_NV                  0x8526
-#define GL_VARIABLE_E_NV                  0x8527
-#define GL_VARIABLE_F_NV                  0x8528
-#define GL_VARIABLE_G_NV                  0x8529
-#define GL_CONSTANT_COLOR0_NV             0x852A
-#define GL_CONSTANT_COLOR1_NV             0x852B
-#define GL_PRIMARY_COLOR_NV               0x852C
-#define GL_SECONDARY_COLOR_NV             0x852D
-#define GL_SPARE0_NV                      0x852E
-#define GL_SPARE1_NV                      0x852F
-#define GL_DISCARD_NV                     0x8530
-#define GL_E_TIMES_F_NV                   0x8531
-#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
-#define GL_UNSIGNED_IDENTITY_NV           0x8536
-#define GL_UNSIGNED_INVERT_NV             0x8537
-#define GL_EXPAND_NORMAL_NV               0x8538
-#define GL_EXPAND_NEGATE_NV               0x8539
-#define GL_HALF_BIAS_NORMAL_NV            0x853A
-#define GL_HALF_BIAS_NEGATE_NV            0x853B
-#define GL_SIGNED_IDENTITY_NV             0x853C
-#define GL_SIGNED_NEGATE_NV               0x853D
-#define GL_SCALE_BY_TWO_NV                0x853E
-#define GL_SCALE_BY_FOUR_NV               0x853F
-#define GL_SCALE_BY_ONE_HALF_NV           0x8540
-#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
-#define GL_COMBINER_INPUT_NV              0x8542
-#define GL_COMBINER_MAPPING_NV            0x8543
-#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
-#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
-#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
-#define GL_COMBINER_MUX_SUM_NV            0x8547
-#define GL_COMBINER_SCALE_NV              0x8548
-#define GL_COMBINER_BIAS_NV               0x8549
-#define GL_COMBINER_AB_OUTPUT_NV          0x854A
-#define GL_COMBINER_CD_OUTPUT_NV          0x854B
-#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
-#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
-#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
-#define GL_COLOR_SUM_CLAMP_NV             0x854F
-#define GL_COMBINER0_NV                   0x8550
-#define GL_COMBINER1_NV                   0x8551
-#define GL_COMBINER2_NV                   0x8552
-#define GL_COMBINER3_NV                   0x8553
-#define GL_COMBINER4_NV                   0x8554
-#define GL_COMBINER5_NV                   0x8555
-#define GL_COMBINER6_NV                   0x8556
-#define GL_COMBINER7_NV                   0x8557
-/* reuse GL_TEXTURE0_ARB */
-/* reuse GL_TEXTURE1_ARB */
-/* reuse GL_ZERO */
-/* reuse GL_NONE */
-/* reuse GL_FOG */
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_FOG_DISTANCE_MODE_NV           0x855A
-#define GL_EYE_RADIAL_NV                  0x855B
-#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
-/* reuse GL_EYE_PLANE */
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_EMBOSS_LIGHT_NV                0x855D
-#define GL_EMBOSS_CONSTANT_NV             0x855E
-#define GL_EMBOSS_MAP_NV                  0x855F
-#endif
-
-#ifndef GL_NV_blend_square
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_COMBINE4_NV                    0x8503
-#define GL_SOURCE3_RGB_NV                 0x8583
-#define GL_SOURCE3_ALPHA_NV               0x858B
-#define GL_OPERAND3_RGB_NV                0x8593
-#define GL_OPERAND3_ALPHA_NV              0x859B
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#endif
-
-#ifndef GL_MESA_window_pos
-#endif
-
-#ifndef GL_EXT_texture_compression_s3tc
-#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
-#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
-#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
-#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_CULL_VERTEX_IBM                103050
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_VERTEX_ARRAY_LIST_IBM          103070
-#define GL_NORMAL_ARRAY_LIST_IBM          103071
-#define GL_COLOR_ARRAY_LIST_IBM           103072
-#define GL_INDEX_ARRAY_LIST_IBM           103073
-#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
-#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
-#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
-#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
-#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
-#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
-#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
-#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
-#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
-#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
-#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
-#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
-#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
-#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
-#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
-#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_YCRCB_SGIX                     0x8318
-#define GL_YCRCBA_SGIX                    0x8319
-#endif
-
-#ifndef GL_SGI_depth_pass_instrument
-#define GL_DEPTH_PASS_INSTRUMENT_SGIX     0x8310
-#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311
-#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
-#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_MULTISAMPLE_3DFX               0x86B2
-#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
-#define GL_SAMPLES_3DFX                   0x86B4
-#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_MULTISAMPLE_EXT                0x809D
-#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
-#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
-#define GL_SAMPLE_MASK_EXT                0x80A0
-#define GL_1PASS_EXT                      0x80A1
-#define GL_2PASS_0_EXT                    0x80A2
-#define GL_2PASS_1_EXT                    0x80A3
-#define GL_4PASS_0_EXT                    0x80A4
-#define GL_4PASS_1_EXT                    0x80A5
-#define GL_4PASS_2_EXT                    0x80A6
-#define GL_4PASS_3_EXT                    0x80A7
-#define GL_SAMPLE_BUFFERS_EXT             0x80A8
-#define GL_SAMPLES_EXT                    0x80A9
-#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
-#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
-#define GL_SAMPLE_PATTERN_EXT             0x80AC
-#define GL_MULTISAMPLE_BIT_EXT            0x20000000
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_VERTEX_PRECLIP_SGIX            0x83EE
-#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_CONVOLUTION_HINT_SGIX          0x8316
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_PACK_RESAMPLE_SGIX             0x842C
-#define GL_UNPACK_RESAMPLE_SGIX           0x842D
-#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
-#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
-#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
-#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
-#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
-#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
-#define GL_EYE_POINT_SGIS                 0x81F4
-#define GL_OBJECT_POINT_SGIS              0x81F5
-#define GL_EYE_LINE_SGIS                  0x81F6
-#define GL_OBJECT_LINE_SGIS               0x81F7
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
-#endif
-
-#ifndef GL_NV_fence
-#define GL_ALL_COMPLETED_NV               0x84F2
-#define GL_FENCE_STATUS_NV                0x84F3
-#define GL_FENCE_CONDITION_NV             0x84F4
-#endif
-
-#ifndef GL_IBM_texture_mirrored_repeat
-#define GL_MIRRORED_REPEAT_IBM            0x8370
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_EVAL_2D_NV                     0x86C0
-#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
-#define GL_MAP_TESSELLATION_NV            0x86C2
-#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
-#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
-#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
-#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
-#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
-#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
-#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
-#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
-#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
-#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
-#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
-#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
-#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
-#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
-#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
-#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
-#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
-#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
-#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
-#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
-#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_DEPTH_STENCIL_NV               0x84F9
-#define GL_UNSIGNED_INT_24_8_NV           0x84FA
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_PER_STAGE_CONSTANTS_NV         0x8535
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_TEXTURE_RECTANGLE_NV           0x84F5
-#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
-#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
-#define GL_MAX_TEXTURE_RECTANGLE_SIZE_NV  0x84F8
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
-#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
-#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
-#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
-#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
-#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
-#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
-#define GL_SHADER_CONSISTENT_NV           0x86DD
-#define GL_TEXTURE_SHADER_NV              0x86DE
-#define GL_SHADER_OPERATION_NV            0x86DF
-#define GL_CULL_MODES_NV                  0x86E0
-#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
-#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
-#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
-#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    GL_OFFSET_TEXTURE_MATRIX_NV
-#define GL_OFFSET_TEXTURE_2D_SCALE_NV     GL_OFFSET_TEXTURE_SCALE_NV
-#define GL_OFFSET_TEXTURE_2D_BIAS_NV      GL_OFFSET_TEXTURE_BIAS_NV
-#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
-#define GL_CONST_EYE_NV                   0x86E5
-#define GL_PASS_THROUGH_NV                0x86E6
-#define GL_CULL_FRAGMENT_NV               0x86E7
-#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
-#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
-#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
-#define GL_DOT_PRODUCT_NV                 0x86EC
-#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
-#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
-#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
-#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
-#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
-#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
-#define GL_HILO_NV                        0x86F4
-#define GL_DSDT_NV                        0x86F5
-#define GL_DSDT_MAG_NV                    0x86F6
-#define GL_DSDT_MAG_VIB_NV                0x86F7
-#define GL_HILO16_NV                      0x86F8
-#define GL_SIGNED_HILO_NV                 0x86F9
-#define GL_SIGNED_HILO16_NV               0x86FA
-#define GL_SIGNED_RGBA_NV                 0x86FB
-#define GL_SIGNED_RGBA8_NV                0x86FC
-#define GL_SIGNED_RGB_NV                  0x86FE
-#define GL_SIGNED_RGB8_NV                 0x86FF
-#define GL_SIGNED_LUMINANCE_NV            0x8701
-#define GL_SIGNED_LUMINANCE8_NV           0x8702
-#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
-#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
-#define GL_SIGNED_ALPHA_NV                0x8705
-#define GL_SIGNED_ALPHA8_NV               0x8706
-#define GL_SIGNED_INTENSITY_NV            0x8707
-#define GL_SIGNED_INTENSITY8_NV           0x8708
-#define GL_DSDT8_NV                       0x8709
-#define GL_DSDT8_MAG8_NV                  0x870A
-#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
-#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
-#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
-#define GL_HI_SCALE_NV                    0x870E
-#define GL_LO_SCALE_NV                    0x870F
-#define GL_DS_SCALE_NV                    0x8710
-#define GL_DT_SCALE_NV                    0x8711
-#define GL_MAGNITUDE_SCALE_NV             0x8712
-#define GL_VIBRANCE_SCALE_NV              0x8713
-#define GL_HI_BIAS_NV                     0x8714
-#define GL_LO_BIAS_NV                     0x8715
-#define GL_DS_BIAS_NV                     0x8716
-#define GL_DT_BIAS_NV                     0x8717
-#define GL_MAGNITUDE_BIAS_NV              0x8718
-#define GL_VIBRANCE_BIAS_NV               0x8719
-#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
-#define GL_TEXTURE_HI_SIZE_NV             0x871B
-#define GL_TEXTURE_LO_SIZE_NV             0x871C
-#define GL_TEXTURE_DS_SIZE_NV             0x871D
-#define GL_TEXTURE_DT_SIZE_NV             0x871E
-#define GL_TEXTURE_MAG_SIZE_NV            0x871F
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_VERTEX_PROGRAM_NV              0x8620
-#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
-#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
-#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
-#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
-#define GL_CURRENT_ATTRIB_NV              0x8626
-#define GL_PROGRAM_LENGTH_NV              0x8627
-#define GL_PROGRAM_STRING_NV              0x8628
-#define GL_MODELVIEW_PROJECTION_NV        0x8629
-#define GL_IDENTITY_NV                    0x862A
-#define GL_INVERSE_NV                     0x862B
-#define GL_TRANSPOSE_NV                   0x862C
-#define GL_INVERSE_TRANSPOSE_NV           0x862D
-#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
-#define GL_MAX_TRACK_MATRICES_NV          0x862F
-#define GL_MATRIX0_NV                     0x8630
-#define GL_MATRIX1_NV                     0x8631
-#define GL_MATRIX2_NV                     0x8632
-#define GL_MATRIX3_NV                     0x8633
-#define GL_MATRIX4_NV                     0x8634
-#define GL_MATRIX5_NV                     0x8635
-#define GL_MATRIX6_NV                     0x8636
-#define GL_MATRIX7_NV                     0x8637
-#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
-#define GL_CURRENT_MATRIX_NV              0x8641
-#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
-#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
-#define GL_PROGRAM_PARAMETER_NV           0x8644
-#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
-#define GL_PROGRAM_TARGET_NV              0x8646
-#define GL_PROGRAM_RESIDENT_NV            0x8647
-#define GL_TRACK_MATRIX_NV                0x8648
-#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
-#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
-#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
-#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
-#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
-#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
-#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
-#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
-#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
-#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
-#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
-#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
-#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
-#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
-#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
-#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
-#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
-#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
-#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
-#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
-#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
-#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
-#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
-#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
-#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
-#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
-#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
-#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
-#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
-#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
-#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
-#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
-#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
-#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
-#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
-#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
-#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
-#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
-#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
-#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
-#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
-#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
-#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
-#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
-#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
-#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
-#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
-#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
-#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
-#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
-#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
-#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
-#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SCALEBIAS_HINT_SGIX            0x8322
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_INTERLACE_OML                  0x8980
-#define GL_INTERLACE_READ_OML             0x8981
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
-#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
-#endif
-
-#ifndef GL_OML_resample
-#define GL_PACK_RESAMPLE_OML              0x8984
-#define GL_UNPACK_RESAMPLE_OML            0x8985
-#define GL_RESAMPLE_REPLICATE_OML         0x8986
-#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
-#define GL_RESAMPLE_AVERAGE_OML           0x8988
-#define GL_RESAMPLE_DECIMATE_OML          0x8989
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
-#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_BUMP_ROT_MATRIX_ATI            0x8775
-#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
-#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
-#define GL_BUMP_TEX_UNITS_ATI             0x8778
-#define GL_DUDV_ATI                       0x8779
-#define GL_DU8DV8_ATI                     0x877A
-#define GL_BUMP_ENVMAP_ATI                0x877B
-#define GL_BUMP_TARGET_ATI                0x877C
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_FRAGMENT_SHADER_ATI            0x8920
-#define GL_REG_0_ATI                      0x8921
-#define GL_REG_1_ATI                      0x8922
-#define GL_REG_2_ATI                      0x8923
-#define GL_REG_3_ATI                      0x8924
-#define GL_REG_4_ATI                      0x8925
-#define GL_REG_5_ATI                      0x8926
-#define GL_REG_6_ATI                      0x8927
-#define GL_REG_7_ATI                      0x8928
-#define GL_REG_8_ATI                      0x8929
-#define GL_REG_9_ATI                      0x892A
-#define GL_REG_10_ATI                     0x892B
-#define GL_REG_11_ATI                     0x892C
-#define GL_REG_12_ATI                     0x892D
-#define GL_REG_13_ATI                     0x892E
-#define GL_REG_14_ATI                     0x892F
-#define GL_REG_15_ATI                     0x8930
-#define GL_REG_16_ATI                     0x8931
-#define GL_REG_17_ATI                     0x8932
-#define GL_REG_18_ATI                     0x8933
-#define GL_REG_19_ATI                     0x8934
-#define GL_REG_20_ATI                     0x8935
-#define GL_REG_21_ATI                     0x8936
-#define GL_REG_22_ATI                     0x8937
-#define GL_REG_23_ATI                     0x8938
-#define GL_REG_24_ATI                     0x8939
-#define GL_REG_25_ATI                     0x893A
-#define GL_REG_26_ATI                     0x893B
-#define GL_REG_27_ATI                     0x893C
-#define GL_REG_28_ATI                     0x893D
-#define GL_REG_29_ATI                     0x893E
-#define GL_REG_30_ATI                     0x893F
-#define GL_REG_31_ATI                     0x8940
-#define GL_CON_0_ATI                      0x8941
-#define GL_CON_1_ATI                      0x8942
-#define GL_CON_2_ATI                      0x8943
-#define GL_CON_3_ATI                      0x8944
-#define GL_CON_4_ATI                      0x8945
-#define GL_CON_5_ATI                      0x8946
-#define GL_CON_6_ATI                      0x8947
-#define GL_CON_7_ATI                      0x8948
-#define GL_CON_8_ATI                      0x8949
-#define GL_CON_9_ATI                      0x894A
-#define GL_CON_10_ATI                     0x894B
-#define GL_CON_11_ATI                     0x894C
-#define GL_CON_12_ATI                     0x894D
-#define GL_CON_13_ATI                     0x894E
-#define GL_CON_14_ATI                     0x894F
-#define GL_CON_15_ATI                     0x8950
-#define GL_CON_16_ATI                     0x8951
-#define GL_CON_17_ATI                     0x8952
-#define GL_CON_18_ATI                     0x8953
-#define GL_CON_19_ATI                     0x8954
-#define GL_CON_20_ATI                     0x8955
-#define GL_CON_21_ATI                     0x8956
-#define GL_CON_22_ATI                     0x8957
-#define GL_CON_23_ATI                     0x8958
-#define GL_CON_24_ATI                     0x8959
-#define GL_CON_25_ATI                     0x895A
-#define GL_CON_26_ATI                     0x895B
-#define GL_CON_27_ATI                     0x895C
-#define GL_CON_28_ATI                     0x895D
-#define GL_CON_29_ATI                     0x895E
-#define GL_CON_30_ATI                     0x895F
-#define GL_CON_31_ATI                     0x8960
-#define GL_MOV_ATI                        0x8961
-#define GL_ADD_ATI                        0x8963
-#define GL_MUL_ATI                        0x8964
-#define GL_SUB_ATI                        0x8965
-#define GL_DOT3_ATI                       0x8966
-#define GL_DOT4_ATI                       0x8967
-#define GL_MAD_ATI                        0x8968
-#define GL_LERP_ATI                       0x8969
-#define GL_CND_ATI                        0x896A
-#define GL_CND0_ATI                       0x896B
-#define GL_DOT2_ADD_ATI                   0x896C
-#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
-#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
-#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
-#define GL_NUM_PASSES_ATI                 0x8970
-#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
-#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
-#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
-#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
-#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
-#define GL_SWIZZLE_STR_ATI                0x8976
-#define GL_SWIZZLE_STQ_ATI                0x8977
-#define GL_SWIZZLE_STR_DR_ATI             0x8978
-#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
-#define GL_SWIZZLE_STRQ_ATI               0x897A
-#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
-#define GL_RED_BIT_ATI                    0x00000001
-#define GL_GREEN_BIT_ATI                  0x00000002
-#define GL_BLUE_BIT_ATI                   0x00000004
-#define GL_2X_BIT_ATI                     0x00000001
-#define GL_4X_BIT_ATI                     0x00000002
-#define GL_8X_BIT_ATI                     0x00000004
-#define GL_HALF_BIT_ATI                   0x00000008
-#define GL_QUARTER_BIT_ATI                0x00000010
-#define GL_EIGHTH_BIT_ATI                 0x00000020
-#define GL_SATURATE_BIT_ATI               0x00000040
-#define GL_COMP_BIT_ATI                   0x00000002
-#define GL_NEGATE_BIT_ATI                 0x00000004
-#define GL_BIAS_BIT_ATI                   0x00000008
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_PN_TRIANGLES_ATI               0x87F0
-#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
-#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
-#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
-#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
-#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
-#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
-#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
-#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_STATIC_ATI                     0x8760
-#define GL_DYNAMIC_ATI                    0x8761
-#define GL_PRESERVE_ATI                   0x8762
-#define GL_DISCARD_ATI                    0x8763
-#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
-#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
-#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
-#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_VERTEX_SHADER_EXT              0x8780
-#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
-#define GL_OP_INDEX_EXT                   0x8782
-#define GL_OP_NEGATE_EXT                  0x8783
-#define GL_OP_DOT3_EXT                    0x8784
-#define GL_OP_DOT4_EXT                    0x8785
-#define GL_OP_MUL_EXT                     0x8786
-#define GL_OP_ADD_EXT                     0x8787
-#define GL_OP_MADD_EXT                    0x8788
-#define GL_OP_FRAC_EXT                    0x8789
-#define GL_OP_MAX_EXT                     0x878A
-#define GL_OP_MIN_EXT                     0x878B
-#define GL_OP_SET_GE_EXT                  0x878C
-#define GL_OP_SET_LT_EXT                  0x878D
-#define GL_OP_CLAMP_EXT                   0x878E
-#define GL_OP_FLOOR_EXT                   0x878F
-#define GL_OP_ROUND_EXT                   0x8790
-#define GL_OP_EXP_BASE_2_EXT              0x8791
-#define GL_OP_LOG_BASE_2_EXT              0x8792
-#define GL_OP_POWER_EXT                   0x8793
-#define GL_OP_RECIP_EXT                   0x8794
-#define GL_OP_RECIP_SQRT_EXT              0x8795
-#define GL_OP_SUB_EXT                     0x8796
-#define GL_OP_CROSS_PRODUCT_EXT           0x8797
-#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
-#define GL_OP_MOV_EXT                     0x8799
-#define GL_OUTPUT_VERTEX_EXT              0x879A
-#define GL_OUTPUT_COLOR0_EXT              0x879B
-#define GL_OUTPUT_COLOR1_EXT              0x879C
-#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
-#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
-#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
-#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
-#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
-#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
-#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
-#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
-#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
-#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
-#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
-#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
-#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
-#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
-#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
-#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
-#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
-#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
-#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
-#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
-#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
-#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
-#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
-#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
-#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
-#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
-#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
-#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
-#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
-#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
-#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
-#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
-#define GL_OUTPUT_FOG_EXT                 0x87BD
-#define GL_SCALAR_EXT                     0x87BE
-#define GL_VECTOR_EXT                     0x87BF
-#define GL_MATRIX_EXT                     0x87C0
-#define GL_VARIANT_EXT                    0x87C1
-#define GL_INVARIANT_EXT                  0x87C2
-#define GL_LOCAL_CONSTANT_EXT             0x87C3
-#define GL_LOCAL_EXT                      0x87C4
-#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
-#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
-#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
-#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
-#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INARIANTS_EXT 0x87CD
-#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
-#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
-#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
-#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
-#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
-#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
-#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
-#define GL_X_EXT                          0x87D5
-#define GL_Y_EXT                          0x87D6
-#define GL_Z_EXT                          0x87D7
-#define GL_W_EXT                          0x87D8
-#define GL_NEGATIVE_X_EXT                 0x87D9
-#define GL_NEGATIVE_Y_EXT                 0x87DA
-#define GL_NEGATIVE_Z_EXT                 0x87DB
-#define GL_NEGATIVE_W_EXT                 0x87DC
-#define GL_ZERO_EXT                       0x87DD
-#define GL_ONE_EXT                        0x87DE
-#define GL_NEGATIVE_ONE_EXT               0x87DF
-#define GL_NORMALIZED_RANGE_EXT           0x87E0
-#define GL_FULL_RANGE_EXT                 0x87E1
-#define GL_CURRENT_VERTEX_EXT             0x87E2
-#define GL_MVP_MATRIX_EXT                 0x87E3
-#define GL_VARIANT_VALUE_EXT              0x87E4
-#define GL_VARIANT_DATATYPE_EXT           0x87E5
-#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
-#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
-#define GL_VARIANT_ARRAY_EXT              0x87E8
-#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
-#define GL_INVARIANT_VALUE_EXT            0x87EA
-#define GL_INVARIANT_DATATYPE_EXT         0x87EB
-#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
-#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
-#define GL_VERTEX_STREAM0_ATI             0x876C
-#define GL_VERTEX_STREAM1_ATI             0x876D
-#define GL_VERTEX_STREAM2_ATI             0x876E
-#define GL_VERTEX_STREAM3_ATI             0x876F
-#define GL_VERTEX_STREAM4_ATI             0x8770
-#define GL_VERTEX_STREAM5_ATI             0x8771
-#define GL_VERTEX_STREAM6_ATI             0x8772
-#define GL_VERTEX_STREAM7_ATI             0x8773
-#define GL_VERTEX_SOURCE_ATI              0x8774
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ELEMENT_ARRAY_ATI              0x8768
-#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
-#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_QUAD_MESH_SUN                  0x8614
-#define GL_TRIANGLE_MESH_SUN              0x8615
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SLICE_ACCUM_SUN                0x85CC
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_DEPTH_CLAMP_NV                 0x864F
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_PIXEL_COUNTER_BITS_NV          0x8864
-#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
-#define GL_PIXEL_COUNT_NV                 0x8866
-#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_POINT_SPRITE_NV                0x8861
-#define GL_COORD_REPLACE_NV               0x8862
-#define GL_POINT_SPRITE_R_MODE_NV         0x8863
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
-#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
-#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
-#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
-#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
-#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
-#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
-#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
-#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
-#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
-#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
-#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
-#define GL_HILO8_NV                       0x885E
-#define GL_SIGNED_HILO8_NV                0x885F
-#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#endif
-
-
-/*************************************************************/
-
-#ifndef GL_VERSION_1_2
-#define GL_VERSION_1_2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf);
-GLAPI void APIENTRY glBlendEquation (GLenum);
-GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogram (GLenum);
-GLAPI void APIENTRY glResetMinmax (GLenum);
-GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-typedef void (APIENTRY * PFNGLBLENDEQUATIONPROC) (GLenum mode);
-typedef void (APIENTRY * PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-typedef void (APIENTRY * PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRY * PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRY * PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRY * PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-typedef void (APIENTRY * PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRY * PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRY * PFNGLRESETHISTOGRAMPROC) (GLenum target);
-typedef void (APIENTRY * PFNGLRESETMINMAXPROC) (GLenum target);
-typedef void (APIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_VERSION_1_3
-#define GL_VERSION_1_3 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTexture (GLenum);
-GLAPI void APIENTRY glClientActiveTexture (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *);
-GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *);
-GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean);
-GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, void *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRY * PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRY * PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRY * PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRY * PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
-typedef void (APIENTRY * PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
-typedef void (APIENTRY * PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, void *img);
-#endif
-
-#ifndef GL_ARB_multitexture
-#define GL_ARB_multitexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glActiveTextureARB (GLenum);
-GLAPI void APIENTRY glClientActiveTextureARB (GLenum);
-GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint);
-GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort);
-GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *);
-GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *);
-GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *);
-GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *);
-GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-#endif
-
-#ifndef GL_ARB_transpose_matrix
-#define GL_ARB_transpose_matrix 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *);
-GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *);
-GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRY * PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-typedef void (APIENTRY * PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
-typedef void (APIENTRY * PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
-#endif
-
-#ifndef GL_ARB_multisample
-#define GL_ARB_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
-#endif
-
-#ifndef GL_ARB_texture_env_add
-#define GL_ARB_texture_env_add 1
-#endif
-
-#ifndef GL_ARB_texture_cube_map
-#define GL_ARB_texture_cube_map 1
-#endif
-
-#ifndef GL_ARB_texture_compression
-#define GL_ARB_texture_compression 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, void *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-typedef void (APIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, void *img);
-#endif
-
-#ifndef GL_ARB_texture_border_clamp
-#define GL_ARB_texture_border_clamp 1
-#endif
-
-#ifndef GL_ARB_point_parameters
-#define GL_ARB_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_ARB_vertex_blend
-#define GL_ARB_vertex_blend 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *);
-GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *);
-GLAPI void APIENTRY glWeightivARB (GLint, const GLint *);
-GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *);
-GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *);
-GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexBlendARB (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
-typedef void (APIENTRY * PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
-typedef void (APIENTRY * PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
-typedef void (APIENTRY * PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
-typedef void (APIENTRY * PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
-typedef void (APIENTRY * PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
-typedef void (APIENTRY * PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
-typedef void (APIENTRY * PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
-typedef void (APIENTRY * PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRY * PFNGLVERTEXBLENDARBPROC) (GLint count);
-#endif
-
-#ifndef GL_ARB_matrix_palette
-#define GL_ARB_matrix_palette 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint);
-GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *);
-GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *);
-GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *);
-GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
-typedef void (APIENTRY * PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
-typedef void (APIENTRY * PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
-typedef void (APIENTRY * PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
-typedef void (APIENTRY * PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_ARB_texture_env_combine
-#define GL_ARB_texture_env_combine 1
-#endif
-
-#ifndef GL_ARB_texture_env_crossbar
-#define GL_ARB_texture_env_crossbar 1
-#endif
-
-#ifndef GL_ARB_texture_env_dot3
-#define GL_ARB_texture_env_dot3 1
-#endif
-
-#ifndef GL_ARB_texture_mirror_repeat
-#define GL_ARB_texture_mirror_repeat 1
-#endif
-
-#ifndef GL_ARB_depth_texture
-#define GL_ARB_depth_texture 1
-#endif
-
-#ifndef GL_ARB_shadow
-#define GL_ARB_shadow 1
-#endif
-
-#ifndef GL_ARB_shadow_ambient
-#define GL_ARB_shadow_ambient 1
-#endif
-
-#ifndef GL_ARB_window_pos
-#define GL_ARB_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svARB (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivARB (const GLint *);
-GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svARB (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_EXT_abgr
-#define GL_EXT_abgr 1
-#endif
-
-#ifndef GL_EXT_blend_color
-#define GL_EXT_blend_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-#endif
-
-#ifndef GL_EXT_polygon_offset
-#define GL_EXT_polygon_offset 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
-#endif
-
-#ifndef GL_EXT_texture
-#define GL_EXT_texture 1
-#endif
-
-#ifndef GL_EXT_texture3D
-#define GL_EXT_texture3D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGIS_texture_filter4
-#define GL_SGIS_texture_filter4 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
-typedef void (APIENTRY * PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
-#endif
-
-#ifndef GL_EXT_subtexture
-#define GL_EXT_subtexture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_EXT_copy_texture
-#define GL_EXT_copy_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint);
-GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-typedef void (APIENTRY * PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRY * PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-#endif
-
-#ifndef GL_EXT_histogram
-#define GL_EXT_histogram 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean);
-GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean);
-GLAPI void APIENTRY glResetHistogramEXT (GLenum);
-GLAPI void APIENTRY glResetMinmaxEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRY * PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
-typedef void (APIENTRY * PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
-typedef void (APIENTRY * PFNGLRESETMINMAXEXTPROC) (GLenum target);
-#endif
-
-#ifndef GL_EXT_convolution
-#define GL_EXT_convolution 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei);
-GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *);
-GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRY * PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
-typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
-typedef void (APIENTRY * PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-typedef void (APIENTRY * PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
-typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-typedef void (APIENTRY * PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-#endif
-
-#ifndef GL_EXT_color_matrix
-#define GL_EXT_color_matrix 1
-#endif
-
-#ifndef GL_SGI_color_table
-#define GL_SGI_color_table 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei);
-GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-typedef void (APIENTRY * PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
-typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_SGIX_pixel_texture
-#define GL_SGIX_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenSGIX (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
-#endif
-
-#ifndef GL_SGIS_pixel_texture
-#define GL_SGIS_pixel_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint);
-GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *);
-GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_texture4D
-#define GL_SGIS_texture4D 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-typedef void (APIENTRY * PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels);
-#endif
-
-#ifndef GL_SGI_texture_color_table
-#define GL_SGI_texture_color_table 1
-#endif
-
-#ifndef GL_EXT_cmyka
-#define GL_EXT_cmyka 1
-#endif
-
-#ifndef GL_EXT_texture_object
-#define GL_EXT_texture_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint);
-GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRY * PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
-typedef void (APIENTRY * PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
-typedef void (APIENTRY * PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
-typedef void (APIENTRY * PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
-typedef GLboolean (APIENTRY * PFNGLISTEXTUREEXTPROC) (GLuint texture);
-typedef void (APIENTRY * PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
-#endif
-
-#ifndef GL_SGIS_detail_texture
-#define GL_SGIS_detail_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRY * PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_SGIS_sharpen_texture
-#define GL_SGIS_sharpen_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
-typedef void (APIENTRY * PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
-#endif
-
-#ifndef GL_EXT_packed_pixels
-#define GL_EXT_packed_pixels 1
-#endif
-
-#ifndef GL_SGIS_texture_lod
-#define GL_SGIS_texture_lod 1
-#endif
-
-#ifndef GL_SGIS_multisample
-#define GL_SGIS_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternSGIS (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRY * PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_EXT_rescale_normal
-#define GL_EXT_rescale_normal 1
-#endif
-
-#ifndef GL_EXT_vertex_array
-#define GL_EXT_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glArrayElementEXT (GLint);
-GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei);
-GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *);
-GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *);
-GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLARRAYELEMENTEXTPROC) (GLint i);
-typedef void (APIENTRY * PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRY * PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
-typedef void (APIENTRY * PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
-typedef void (APIENTRY * PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params);
-typedef void (APIENTRY * PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRY * PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRY * PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-typedef void (APIENTRY * PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_misc_attribute
-#define GL_EXT_misc_attribute 1
-#endif
-
-#ifndef GL_SGIS_generate_mipmap
-#define GL_SGIS_generate_mipmap 1
-#endif
-
-#ifndef GL_SGIX_clipmap
-#define GL_SGIX_clipmap 1
-#endif
-
-#ifndef GL_SGIX_shadow
-#define GL_SGIX_shadow 1
-#endif
-
-#ifndef GL_SGIS_texture_edge_clamp
-#define GL_SGIS_texture_edge_clamp 1
-#endif
-
-#ifndef GL_SGIS_texture_border_clamp
-#define GL_SGIS_texture_border_clamp 1
-#endif
-
-#ifndef GL_EXT_blend_minmax
-#define GL_EXT_blend_minmax 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendEquationEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_blend_subtract
-#define GL_EXT_blend_subtract 1
-#endif
-
-#ifndef GL_EXT_blend_logic_op
-#define GL_EXT_blend_logic_op 1
-#endif
-
-#ifndef GL_SGIX_interlace
-#define GL_SGIX_interlace 1
-#endif
-
-#ifndef GL_SGIX_pixel_tiles
-#define GL_SGIX_pixel_tiles 1
-#endif
-
-#ifndef GL_SGIX_texture_select
-#define GL_SGIX_texture_select 1
-#endif
-
-#ifndef GL_SGIX_sprite
-#define GL_SGIX_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint);
-GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_texture_multi_buffer
-#define GL_SGIX_texture_multi_buffer 1
-#endif
-
-#ifndef GL_EXT_point_parameters
-#define GL_EXT_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIS_point_parameters
-#define GL_SGIS_point_parameters 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat);
-GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_instruments
-#define GL_SGIX_instruments 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
-GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *);
-GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *);
-GLAPI void APIENTRY glReadInstrumentsSGIX (GLint);
-GLAPI void APIENTRY glStartInstrumentsSGIX (void);
-GLAPI void APIENTRY glStopInstrumentsSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLint (APIENTRY * PFNGLGETINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRY * PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
-typedef GLint (APIENTRY * PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
-typedef void (APIENTRY * PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
-typedef void (APIENTRY * PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
-typedef void (APIENTRY * PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
-#endif
-
-#ifndef GL_SGIX_texture_scale_bias
-#define GL_SGIX_texture_scale_bias 1
-#endif
-
-#ifndef GL_SGIX_framezoom
-#define GL_SGIX_framezoom 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFrameZoomSGIX (GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
-#endif
-
-#ifndef GL_SGIX_tag_sample_buffer
-#define GL_SGIX_tag_sample_buffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTagSampleBufferSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_polynomial_ffd
-#define GL_SGIX_polynomial_ffd 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *);
-GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *);
-GLAPI void APIENTRY glDeformSGIX (GLbitfield);
-GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
-typedef void (APIENTRY * PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
-typedef void (APIENTRY * PFNGLDEFORMSGIXPROC) (GLbitfield mask);
-typedef void (APIENTRY * PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
-#endif
-
-#ifndef GL_SGIX_reference_plane
-#define GL_SGIX_reference_plane 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
-#endif
-
-#ifndef GL_SGIX_flush_raster
-#define GL_SGIX_flush_raster 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushRasterSGIX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLFLUSHRASTERSGIXPROC) (void);
-#endif
-
-#ifndef GL_SGIX_depth_texture
-#define GL_SGIX_depth_texture 1
-#endif
-
-#ifndef GL_SGIS_fog_function
-#define GL_SGIS_fog_function 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *);
-GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
-typedef void (APIENTRY * PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
-#endif
-
-#ifndef GL_SGIX_fog_offset
-#define GL_SGIX_fog_offset 1
-#endif
-
-#ifndef GL_HP_image_transform
-#define GL_HP_image_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_HP_convolution_border_modes
-#define GL_HP_convolution_border_modes 1
-#endif
-
-#ifndef GL_SGIX_texture_add_env
-#define GL_SGIX_texture_add_env 1
-#endif
-
-#ifndef GL_EXT_color_subtable
-#define GL_EXT_color_subtable 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-typedef void (APIENTRY * PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-#endif
-
-#ifndef GL_PGI_vertex_hints
-#define GL_PGI_vertex_hints 1
-#endif
-
-#ifndef GL_PGI_misc_hints
-#define GL_PGI_misc_hints 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glHintPGI (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLHINTPGIPROC) (GLenum target, GLint mode);
-#endif
-
-#ifndef GL_EXT_paletted_texture
-#define GL_EXT_paletted_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *);
-GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *);
-GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-typedef void (APIENTRY * PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data);
-typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_EXT_clip_volume_hint
-#define GL_EXT_clip_volume_hint 1
-#endif
-
-#ifndef GL_SGIX_list_priority
-#define GL_SGIX_list_priority 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat);
-GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *);
-GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint);
-GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_SGIX_ir_instrument1
-#define GL_SGIX_ir_instrument1 1
-#endif
-
-#ifndef GL_SGIX_calligraphic_fragment
-#define GL_SGIX_calligraphic_fragment 1
-#endif
-
-#ifndef GL_SGIX_texture_lod_bias
-#define GL_SGIX_texture_lod_bias 1
-#endif
-
-#ifndef GL_SGIX_shadow_ambient
-#define GL_SGIX_shadow_ambient 1
-#endif
-
-#ifndef GL_EXT_index_texture
-#define GL_EXT_index_texture 1
-#endif
-
-#ifndef GL_EXT_index_material
-#define GL_EXT_index_material 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_EXT_index_func
-#define GL_EXT_index_func 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
-#endif
-
-#ifndef GL_EXT_index_array_formats
-#define GL_EXT_index_array_formats 1
-#endif
-
-#ifndef GL_EXT_compiled_vertex_array
-#define GL_EXT_compiled_vertex_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei);
-GLAPI void APIENTRY glUnlockArraysEXT (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
-typedef void (APIENTRY * PFNGLUNLOCKARRAYSEXTPROC) (void);
-#endif
-
-#ifndef GL_EXT_cull_vertex
-#define GL_EXT_cull_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *);
-GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
-typedef void (APIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_SGIX_ycrcb
-#define GL_SGIX_ycrcb 1
-#endif
-
-#ifndef GL_SGIX_fragment_lighting
-#define GL_SGIX_fragment_lighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum);
-GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint);
-GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *);
-GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
-#endif
-
-#ifndef GL_IBM_rasterpos_clip
-#define GL_IBM_rasterpos_clip 1
-#endif
-
-#ifndef GL_HP_texture_lighting
-#define GL_HP_texture_lighting 1
-#endif
-
-#ifndef GL_EXT_draw_range_elements
-#define GL_EXT_draw_range_elements 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-#endif
-
-#ifndef GL_WIN_phong_shading
-#define GL_WIN_phong_shading 1
-#endif
-
-#ifndef GL_WIN_specular_fog
-#define GL_WIN_specular_fog 1
-#endif
-
-#ifndef GL_EXT_light_texture
-#define GL_EXT_light_texture 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glApplyTextureEXT (GLenum);
-GLAPI void APIENTRY glTextureLightEXT (GLenum);
-GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
-typedef void (APIENTRY * PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
-typedef void (APIENTRY * PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
-#endif
-
-#ifndef GL_SGIX_blend_alpha_minmax
-#define GL_SGIX_blend_alpha_minmax 1
-#endif
-
-#ifndef GL_EXT_bgra
-#define GL_EXT_bgra 1
-#endif
-
-#ifndef GL_SGIX_async
-#define GL_SGIX_async 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint);
-GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *);
-GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *);
-GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei);
-GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei);
-GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
-typedef GLint (APIENTRY * PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
-typedef GLint (APIENTRY * PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
-typedef GLuint (APIENTRY * PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
-typedef void (APIENTRY * PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
-typedef GLboolean (APIENTRY * PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
-#endif
-
-#ifndef GL_SGIX_async_pixel
-#define GL_SGIX_async_pixel 1
-#endif
-
-#ifndef GL_SGIX_async_histogram
-#define GL_SGIX_async_histogram 1
-#endif
-
-#ifndef GL_INTEL_parallel_arrays
-#define GL_INTEL_parallel_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *);
-GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *);
-GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRY * PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRY * PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-typedef void (APIENTRY * PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_HP_occlusion_test
-#define GL_HP_occlusion_test 1
-#endif
-
-#ifndef GL_EXT_pixel_transform
-#define GL_EXT_pixel_transform 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint);
-GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat);
-GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
-#endif
-
-#ifndef GL_EXT_pixel_transform_color_table
-#define GL_EXT_pixel_transform_color_table 1
-#endif
-
-#ifndef GL_EXT_shared_texture_palette
-#define GL_EXT_shared_texture_palette 1
-#endif
-
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#endif
-
-#ifndef GL_EXT_secondary_color
-#define GL_EXT_secondary_color 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *);
-GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *);
-GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *);
-GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *);
-GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort);
-GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *);
-GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
-typedef void (APIENTRY * PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
-typedef void (APIENTRY * PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_perturb_normal
-#define GL_EXT_texture_perturb_normal 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureNormalEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
-#endif
-
-#ifndef GL_EXT_multi_draw_arrays
-#define GL_EXT_multi_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei);
-GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
-typedef void (APIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
-#endif
-
-#ifndef GL_EXT_fog_coord
-#define GL_EXT_fog_coord 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFogCoordfEXT (GLfloat);
-GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *);
-GLAPI void APIENTRY glFogCoorddEXT (GLdouble);
-GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *);
-GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
-typedef void (APIENTRY * PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
-typedef void (APIENTRY * PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
-typedef void (APIENTRY * PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
-typedef void (APIENTRY * PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_REND_screen_coordinates
-#define GL_REND_screen_coordinates 1
-#endif
-
-#ifndef GL_EXT_coordinate_frame
-#define GL_EXT_coordinate_frame 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glTangent3ivEXT (const GLint *);
-GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glTangent3svEXT (const GLshort *);
-GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *);
-GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *);
-GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *);
-GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint);
-GLAPI void APIENTRY glBinormal3ivEXT (const GLint *);
-GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glBinormal3svEXT (const GLshort *);
-GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
-typedef void (APIENTRY * PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRY * PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
-typedef void (APIENTRY * PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRY * PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
-typedef void (APIENTRY * PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRY * PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
-typedef void (APIENTRY * PFNGLTANGENT3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRY * PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
-typedef void (APIENTRY * PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRY * PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
-typedef void (APIENTRY * PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
-typedef void (APIENTRY * PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
-typedef void (APIENTRY * PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
-typedef void (APIENTRY * PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
-typedef void (APIENTRY * PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
-typedef void (APIENTRY * PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
-typedef void (APIENTRY * PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
-typedef void (APIENTRY * PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
-typedef void (APIENTRY * PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
-typedef void (APIENTRY * PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRY * PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_EXT_texture_env_combine
-#define GL_EXT_texture_env_combine 1
-#endif
-
-#ifndef GL_APPLE_specular_vector
-#define GL_APPLE_specular_vector 1
-#endif
-
-#ifndef GL_APPLE_transform_hint
-#define GL_APPLE_transform_hint 1
-#endif
-
-#ifndef GL_SGIX_fog_scale
-#define GL_SGIX_fog_scale 1
-#endif
-
-#ifndef GL_SUNX_constant_data
-#define GL_SUNX_constant_data 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFinishTextureSUNX (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLFINISHTEXTURESUNXPROC) (void);
-#endif
-
-#ifndef GL_SUN_global_alpha
-#define GL_SUN_global_alpha 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte);
-GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort);
-GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint);
-GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat);
-GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble);
-GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte);
-GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort);
-GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
-typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
-typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
-typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
-typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
-typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
-typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
-typedef void (APIENTRY * PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
-#endif
-
-#ifndef GL_SUN_triangle_list
-#define GL_SUN_triangle_list 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint);
-GLAPI void APIENTRY glReplacementCodeusSUN (GLushort);
-GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte);
-GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *);
-GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *);
-GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *);
-GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer);
-#endif
-
-#ifndef GL_SUN_vertex
-#define GL_SUN_vertex 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLenum *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLenum, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLenum *, const GLubyte *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *, const GLfloat *);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLenum, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLenum *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
-typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRY * PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRY * PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRY * PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRY * PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRY * PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLenum rc, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *v);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLenum rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLenum *rc, const GLubyte *c, const GLfloat *v);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLenum rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *c, const GLfloat *v);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLenum rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *tc, const GLfloat *v);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLenum rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLenum *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
-#endif
-
-#ifndef GL_EXT_blend_func_separate
-#define GL_EXT_blend_func_separate 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-typedef void (APIENTRY * PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-#endif
-
-#ifndef GL_INGR_color_clamp
-#define GL_INGR_color_clamp 1
-#endif
-
-#ifndef GL_INGR_interlace_read
-#define GL_INGR_interlace_read 1
-#endif
-
-#ifndef GL_EXT_stencil_wrap
-#define GL_EXT_stencil_wrap 1
-#endif
-
-#ifndef GL_EXT_422_pixels
-#define GL_EXT_422_pixels 1
-#endif
-
-#ifndef GL_NV_texgen_reflection
-#define GL_NV_texgen_reflection 1
-#endif
-
-#ifndef GL_SUN_convolution_border_modes
-#define GL_SUN_convolution_border_modes 1
-#endif
-
-#ifndef GL_EXT_texture_env_add
-#define GL_EXT_texture_env_add 1
-#endif
-
-#ifndef GL_EXT_texture_lod_bias
-#define GL_EXT_texture_lod_bias 1
-#endif
-
-#ifndef GL_EXT_texture_filter_anisotropic
-#define GL_EXT_texture_filter_anisotropic 1
-#endif
-
-#ifndef GL_EXT_vertex_weighting
-#define GL_EXT_vertex_weighting 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexWeightfEXT (GLfloat);
-GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *);
-GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
-typedef void (APIENTRY * PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
-typedef void (APIENTRY * PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_light_max_exponent
-#define GL_NV_light_max_exponent 1
-#endif
-
-#ifndef GL_NV_vertex_array_range
-#define GL_NV_vertex_array_range 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
-GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
-typedef void (APIENTRY * PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer);
-#endif
-
-#ifndef GL_NV_register_combiners
-#define GL_NV_register_combiners 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *);
-GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat);
-GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *);
-GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean);
-GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
-typedef void (APIENTRY * PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRY * PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
-typedef void (APIENTRY * PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
-typedef void (APIENTRY * PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_NV_fog_distance
-#define GL_NV_fog_distance 1
-#endif
-
-#ifndef GL_NV_texgen_emboss
-#define GL_NV_texgen_emboss 1
-#endif
-
-#ifndef GL_NV_blend_square
-#define GL_NV_blend_square 1
-#endif
-
-#ifndef GL_NV_texture_env_combine4
-#define GL_NV_texture_env_combine4 1
-#endif
-
-#ifndef GL_MESA_resize_buffers
-#define GL_MESA_resize_buffers 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glResizeBuffersMESA (void);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLRESIZEBUFFERSMESAPROC) (void);
-#endif
-
-#ifndef GL_MESA_window_pos
-#define GL_MESA_window_pos 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint);
-GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *);
-GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *);
-GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *);
-GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *);
-GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
-typedef void (APIENTRY * PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRY * PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRY * PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRY * PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRY * PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
-typedef void (APIENTRY * PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRY * PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
-#endif
-
-#ifndef GL_IBM_cull_vertex
-#define GL_IBM_cull_vertex 1
-#endif
-
-#ifndef GL_IBM_multimode_draw_arrays
-#define GL_IBM_multimode_draw_arrays 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMultiModeDrawArraysIBM (GLenum, const GLint *, const GLsizei *, GLsizei, GLint);
-GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* *, GLsizei, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-typedef void (APIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, GLint modestride);
-#endif
-
-#ifndef GL_IBM_vertex_array_lists
-#define GL_IBM_vertex_array_lists 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint);
-GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRY * PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride);
-typedef void (APIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-typedef void (APIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride);
-#endif
-
-#ifndef GL_SGIX_subsample
-#define GL_SGIX_subsample 1
-#endif
-
-#ifndef GL_SGIX_ycrcba
-#define GL_SGIX_ycrcba 1
-#endif
-
-#ifndef GL_SGIX_ycrcb_subsample
-#define GL_SGIX_ycrcb_subsample 1
-#endif
-
-#ifndef GL_SGIX_depth_pass_instrument
-#define GL_SGIX_depth_pass_instrument 1
-#endif
-
-#ifndef GL_3DFX_texture_compression_FXT1
-#define GL_3DFX_texture_compression_FXT1 1
-#endif
-
-#ifndef GL_3DFX_multisample
-#define GL_3DFX_multisample 1
-#endif
-
-#ifndef GL_3DFX_tbuffer
-#define GL_3DFX_tbuffer 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTbufferMask3DFX (GLuint);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
-#endif
-
-#ifndef GL_EXT_multisample
-#define GL_EXT_multisample 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean);
-GLAPI void APIENTRY glSamplePatternEXT (GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
-typedef void (APIENTRY * PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
-#endif
-
-#ifndef GL_SGIX_vertex_preclip
-#define GL_SGIX_vertex_preclip 1
-#endif
-
-#ifndef GL_SGIX_convolution_accuracy
-#define GL_SGIX_convolution_accuracy 1
-#endif
-
-#ifndef GL_SGIX_resample
-#define GL_SGIX_resample 1
-#endif
-
-#ifndef GL_SGIS_point_line_texgen
-#define GL_SGIS_point_line_texgen 1
-#endif
-
-#ifndef GL_SGIS_texture_color_mask
-#define GL_SGIS_texture_color_mask 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-#endif
-
-#ifndef GL_SGIX_igloo_interface
-#define GL_SGIX_igloo_interface 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params);
-#endif
-
-#ifndef GL_NV_fence
-#define GL_NV_fence 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *);
-GLAPI GLboolean APIENTRY glIsFenceNV (GLuint);
-GLAPI GLboolean APIENTRY glTestFenceNV (GLuint);
-GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glFinishFenceNV (GLuint);
-GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
-typedef void (APIENTRY * PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
-typedef GLboolean (APIENTRY * PFNGLISFENCENVPROC) (GLuint fence);
-typedef GLboolean (APIENTRY * PFNGLTESTFENCENVPROC) (GLuint fence);
-typedef void (APIENTRY * PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLFINISHFENCENVPROC) (GLuint fence);
-typedef void (APIENTRY * PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
-#endif
-
-#ifndef GL_NV_evaluators
-#define GL_NV_evaluators 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *);
-GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *);
-GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *);
-GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
-typedef void (APIENTRY * PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
-typedef void (APIENTRY * PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
-typedef void (APIENTRY * PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
-#endif
-
-#ifndef GL_NV_packed_depth_stencil
-#define GL_NV_packed_depth_stencil 1
-#endif
-
-#ifndef GL_NV_register_combiners2
-#define GL_NV_register_combiners2 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
-typedef void (APIENTRY * PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
-#endif
-
-#ifndef GL_NV_texture_compression_vtc
-#define GL_NV_texture_compression_vtc 1
-#endif
-
-#ifndef GL_NV_texture_rectangle
-#define GL_NV_texture_rectangle 1
-#endif
-
-#ifndef GL_NV_texture_shader
-#define GL_NV_texture_shader 1
-#endif
-
-#ifndef GL_NV_texture_shader2
-#define GL_NV_texture_shader2 1
-#endif
-
-#ifndef GL_NV_vertex_array_range2
-#define GL_NV_vertex_array_range2 1
-#endif
-
-#ifndef GL_NV_vertex_program
-#define GL_NV_vertex_program 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *);
-GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint);
-GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *);
-GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *);
-GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *);
-GLAPI GLboolean APIENTRY glIsProgramNV (GLuint);
-GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *);
-GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *);
-GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *);
-GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *);
-GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *);
-GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum);
-GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *);
-GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble);
-GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat);
-GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort);
-GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *);
-GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte);
-GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *);
-GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *);
-GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *);
-GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLboolean (APIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
-typedef void (APIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
-typedef void (APIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRY * PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
-typedef void (APIENTRY * PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
-typedef void (APIENTRY * PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRY * PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
-typedef void (APIENTRY * PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRY * PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer);
-typedef GLboolean (APIENTRY * PFNGLISPROGRAMNVPROC) (GLuint id);
-typedef void (APIENTRY * PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
-typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
-typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRY * PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
-typedef void (APIENTRY * PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v);
-typedef void (APIENTRY * PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v);
-typedef void (APIENTRY * PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-typedef void (APIENTRY * PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-typedef void (APIENTRY * PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
-typedef void (APIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-#endif
-
-#ifndef GL_SGIX_texture_coordinate_clamp
-#define GL_SGIX_texture_coordinate_clamp 1
-#endif
-
-#ifndef GL_SGIX_scalebias_hint
-#define GL_SGIX_scalebias_hint 1
-#endif
-
-#ifndef GL_OML_interlace
-#define GL_OML_interlace 1
-#endif
-
-#ifndef GL_OML_subsample
-#define GL_OML_subsample 1
-#endif
-
-#ifndef GL_OML_resample
-#define GL_OML_resample 1
-#endif
-
-#ifndef GL_NV_copy_depth_to_color
-#define GL_NV_copy_depth_to_color 1
-#endif
-
-#ifndef GL_ATI_envmap_bumpmap
-#define GL_ATI_envmap_bumpmap 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *);
-GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
-typedef void (APIENTRY * PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
-typedef void (APIENTRY * PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
-typedef void (APIENTRY * PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
-#endif
-
-#ifndef GL_ATI_fragment_shader
-#define GL_ATI_fragment_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint);
-GLAPI void APIENTRY glBindFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint);
-GLAPI void APIENTRY glBeginFragmentShaderATI (void);
-GLAPI void APIENTRY glEndFragmentShaderATI (void);
-GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum);
-GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRY * PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
-typedef void (APIENTRY * PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRY * PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
-typedef void (APIENTRY * PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRY * PFNGLENDFRAGMENTSHADERATIPROC) (void);
-typedef void (APIENTRY * PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
-typedef void (APIENTRY * PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
-typedef void (APIENTRY * PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRY * PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRY * PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRY * PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
-typedef void (APIENTRY * PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
-typedef void (APIENTRY * PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
-typedef void (APIENTRY * PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
-#endif
-
-#ifndef GL_ATI_pn_triangles
-#define GL_ATI_pn_triangles 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint);
-GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_vertex_array_object
-#define GL_ATI_vertex_array_object 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum);
-GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint);
-GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum);
-GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glDeleteObjectBufferATI (GLuint);
-GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *);
-GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint);
-GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef GLuint (APIENTRY * PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
-typedef GLboolean (APIENTRY * PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRY * PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
-typedef void (APIENTRY * PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLDELETEOBJECTBUFFERATIPROC) (GLuint buffer);
-typedef void (APIENTRY * PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRY * PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
-typedef void (APIENTRY * PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
-typedef void (APIENTRY * PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
-#endif
-
-#ifndef GL_EXT_vertex_shader
-#define GL_EXT_vertex_shader 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glBeginVertexShaderEXT (void);
-GLAPI void APIENTRY glEndVertexShaderEXT (void);
-GLAPI void APIENTRY glBindVertexShaderEXT (GLuint);
-GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint);
-GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint);
-GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum);
-GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint);
-GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint);
-GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint);
-GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const void *);
-GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const void *);
-GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *);
-GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *);
-GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *);
-GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *);
-GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *);
-GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *);
-GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *);
-GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *);
-GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const void *);
-GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint);
-GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint);
-GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum);
-GLAPI GLuint APIENTRY glBindParameterEXT (GLenum);
-GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum);
-GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *);
-GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *);
-GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *);
-GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLBEGINVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRY * PFNGLENDVERTEXSHADEREXTPROC) (void);
-typedef void (APIENTRY * PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
-typedef GLuint (APIENTRY * PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
-typedef void (APIENTRY * PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
-typedef void (APIENTRY * PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
-typedef void (APIENTRY * PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
-typedef void (APIENTRY * PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
-typedef void (APIENTRY * PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRY * PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
-typedef void (APIENTRY * PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef void (APIENTRY * PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
-typedef GLuint (APIENTRY * PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
-typedef void (APIENTRY * PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const void *addr);
-typedef void (APIENTRY * PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const void *addr);
-typedef void (APIENTRY * PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
-typedef void (APIENTRY * PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
-typedef void (APIENTRY * PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
-typedef void (APIENTRY * PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
-typedef void (APIENTRY * PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
-typedef void (APIENTRY * PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
-typedef void (APIENTRY * PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
-typedef void (APIENTRY * PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
-typedef void (APIENTRY * PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const void *addr);
-typedef void (APIENTRY * PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef void (APIENTRY * PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
-typedef GLuint (APIENTRY * PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
-typedef GLuint (APIENTRY * PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
-typedef GLuint (APIENTRY * PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
-typedef GLuint (APIENTRY * PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
-typedef GLuint (APIENTRY * PFNGLBINDPARAMETEREXTPROC) (GLenum value);
-typedef GLboolean (APIENTRY * PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
-typedef void (APIENTRY * PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRY * PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRY * PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRY * PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data);
-typedef void (APIENTRY * PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRY * PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRY * PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-typedef void (APIENTRY * PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
-typedef void (APIENTRY * PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
-typedef void (APIENTRY * PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
-#endif
-
-#ifndef GL_ATI_vertex_streams
-#define GL_ATI_vertex_streams 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort);
-GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat);
-GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble);
-GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint);
-GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint);
-GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte);
-GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *);
-GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort);
-GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *);
-GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint);
-GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *);
-GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat);
-GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *);
-GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble);
-GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *);
-GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum);
-GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint);
-GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-typedef void (APIENTRY * PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRY * PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
-typedef void (APIENTRY * PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
-typedef void (APIENTRY * PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
-typedef void (APIENTRY * PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
-typedef void (APIENTRY * PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
-typedef void (APIENTRY * PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
-typedef void (APIENTRY * PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
-typedef void (APIENTRY * PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
-typedef void (APIENTRY * PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
-typedef void (APIENTRY * PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
-typedef void (APIENTRY * PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
-typedef void (APIENTRY * PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
-#endif
-
-#ifndef GL_ATI_element_array
-#define GL_ATI_element_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *);
-GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei);
-GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer);
-typedef void (APIENTRY * PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
-typedef void (APIENTRY * PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
-#endif
-
-#ifndef GL_SUN_mesh_array
-#define GL_SUN_mesh_array 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
-#endif
-
-#ifndef GL_SUN_slice_accum
-#define GL_SUN_slice_accum 1
-#endif
-
-#ifndef GL_NV_multisample_filter_hint
-#define GL_NV_multisample_filter_hint 1
-#endif
-
-#ifndef GL_NV_depth_clamp
-#define GL_NV_depth_clamp 1
-#endif
-
-#ifndef GL_NV_occlusion_query
-#define GL_NV_occlusion_query 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *);
-GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *);
-GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint);
-GLAPI void APIENTRY glEndOcclusionQueryNV (void);
-GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *);
-GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
-typedef void (APIENTRY * PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
-typedef GLboolean (APIENTRY * PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRY * PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
-typedef void (APIENTRY * PFNGLENDOCCLUSIONQUERYNVPROC) (void);
-typedef void (APIENTRY * PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
-typedef void (APIENTRY * PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
-#endif
-
-#ifndef GL_NV_point_sprite
-#define GL_NV_point_sprite 1
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint);
-GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *);
-#endif /* GL_GLEXT_PROTOTYPES */
-typedef void (APIENTRY * PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
-typedef void (APIENTRY * PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
-#endif
-
-#ifndef GL_NV_texture_shader3
-#define GL_NV_texture_shader3 1
-#endif
-
-#ifndef GL_NV_vertex_program1_1
-#define GL_NV_vertex_program1_1 1
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/winsup/w32api/include/GL/glu.h b/winsup/w32api/include/GL/glu.h
deleted file mode 100644
index 7c6ee748b..000000000
--- a/winsup/w32api/include/GL/glu.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.1 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-** 
-** http://oss.sgi.com/projects/FreeB
-** 
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-** 
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-** 
-** Additional Notice Provisions: This software was created using the
-** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
-** not been independently verified as being compliant with the OpenGL(R)
-** version 1.2.1 Specification.
-*/
-
-#ifndef __glu_h__
-#define __glu_h__
-#define _GLU_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#include <GL/gl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*************************************************************/
-
-/* Boolean */
-#define GLU_FALSE                          0
-#define GLU_TRUE                           1
-
-/* Version */
-#define GLU_VERSION_1_1                    1
-#define GLU_VERSION_1_2                    1
-
-/* StringName */
-#define GLU_VERSION                        100800
-#define GLU_EXTENSIONS                     100801
-
-/* ErrorCode */
-#define GLU_INVALID_ENUM                   100900
-#define GLU_INVALID_VALUE                  100901
-#define GLU_OUT_OF_MEMORY                  100902
-#define GLU_INVALID_OPERATION              100904
-
-/* NurbsDisplay */
-/*      GLU_FILL */
-#define GLU_OUTLINE_POLYGON                100240
-#define GLU_OUTLINE_PATCH                  100241
-
-/* NurbsError */
-#define GLU_NURBS_ERROR1                   100251
-#define GLU_NURBS_ERROR2                   100252
-#define GLU_NURBS_ERROR3                   100253
-#define GLU_NURBS_ERROR4                   100254
-#define GLU_NURBS_ERROR5                   100255
-#define GLU_NURBS_ERROR6                   100256
-#define GLU_NURBS_ERROR7                   100257
-#define GLU_NURBS_ERROR8                   100258
-#define GLU_NURBS_ERROR9                   100259
-#define GLU_NURBS_ERROR10                  100260
-#define GLU_NURBS_ERROR11                  100261
-#define GLU_NURBS_ERROR12                  100262
-#define GLU_NURBS_ERROR13                  100263
-#define GLU_NURBS_ERROR14                  100264
-#define GLU_NURBS_ERROR15                  100265
-#define GLU_NURBS_ERROR16                  100266
-#define GLU_NURBS_ERROR17                  100267
-#define GLU_NURBS_ERROR18                  100268
-#define GLU_NURBS_ERROR19                  100269
-#define GLU_NURBS_ERROR20                  100270
-#define GLU_NURBS_ERROR21                  100271
-#define GLU_NURBS_ERROR22                  100272
-#define GLU_NURBS_ERROR23                  100273
-#define GLU_NURBS_ERROR24                  100274
-#define GLU_NURBS_ERROR25                  100275
-#define GLU_NURBS_ERROR26                  100276
-#define GLU_NURBS_ERROR27                  100277
-#define GLU_NURBS_ERROR28                  100278
-#define GLU_NURBS_ERROR29                  100279
-#define GLU_NURBS_ERROR30                  100280
-#define GLU_NURBS_ERROR31                  100281
-#define GLU_NURBS_ERROR32                  100282
-#define GLU_NURBS_ERROR33                  100283
-#define GLU_NURBS_ERROR34                  100284
-#define GLU_NURBS_ERROR35                  100285
-#define GLU_NURBS_ERROR36                  100286
-#define GLU_NURBS_ERROR37                  100287
-
-/* NurbsSampling */
-#define GLU_PATH_LENGTH                    100215
-#define GLU_PARAMETRIC_ERROR               100216
-#define GLU_DOMAIN_DISTANCE                100217
-
-/* NurbsTrim */
-#define GLU_MAP1_TRIM_2                    100210
-#define GLU_MAP1_TRIM_3                    100211
-
-/* QuadricDrawStyle */
-#define GLU_POINT                          100010
-#define GLU_LINE                           100011
-#define GLU_FILL                           100012
-#define GLU_SILHOUETTE                     100013
-
-/* QuadricCallback */
-/*      GLU_ERROR */
-
-/* QuadricNormal */
-#define GLU_SMOOTH                         100000
-#define GLU_FLAT                           100001
-#define GLU_NONE                           100002
-
-/* QuadricOrientation */
-#define GLU_OUTSIDE                        100020
-#define GLU_INSIDE                         100021
-
-/* TessCallback */
-#define GLU_TESS_BEGIN                     100100
-#define GLU_BEGIN                          100100
-#define GLU_TESS_VERTEX                    100101
-#define GLU_VERTEX                         100101
-#define GLU_TESS_END                       100102
-#define GLU_END                            100102
-#define GLU_TESS_ERROR                     100103
-#define GLU_TESS_EDGE_FLAG                 100104
-#define GLU_EDGE_FLAG                      100104
-#define GLU_TESS_COMBINE                   100105
-#define GLU_TESS_BEGIN_DATA                100106
-#define GLU_TESS_VERTEX_DATA               100107
-#define GLU_TESS_END_DATA                  100108
-#define GLU_TESS_ERROR_DATA                100109
-#define GLU_TESS_EDGE_FLAG_DATA            100110
-#define GLU_TESS_COMBINE_DATA              100111
-
-/* TessContour */
-#define GLU_CW                             100120
-#define GLU_CCW                            100121
-#define GLU_INTERIOR                       100122
-#define GLU_EXTERIOR                       100123
-#define GLU_UNKNOWN                        100124
-
-/* TessProperty */
-#define GLU_TESS_WINDING_RULE              100140
-#define GLU_TESS_BOUNDARY_ONLY             100141
-#define GLU_TESS_TOLERANCE                 100142
-
-/* TessError */
-#define GLU_TESS_ERROR1                    100151
-#define GLU_TESS_ERROR2                    100152
-#define GLU_TESS_ERROR3                    100153
-#define GLU_TESS_ERROR4                    100154
-#define GLU_TESS_ERROR5                    100155
-#define GLU_TESS_ERROR6                    100156
-#define GLU_TESS_ERROR7                    100157
-#define GLU_TESS_ERROR8                    100158
-#define GLU_TESS_MISSING_BEGIN_POLYGON     100151
-#define GLU_TESS_MISSING_BEGIN_CONTOUR     100152
-#define GLU_TESS_MISSING_END_POLYGON       100153
-#define GLU_TESS_MISSING_END_CONTOUR       100154
-#define GLU_TESS_COORD_TOO_LARGE           100155
-#define GLU_TESS_NEED_COMBINE_CALLBACK     100156
-
-/* TessWinding */
-#define GLU_TESS_WINDING_ODD               100130
-#define GLU_TESS_WINDING_NONZERO           100131
-#define GLU_TESS_WINDING_POSITIVE          100132
-#define GLU_TESS_WINDING_NEGATIVE          100133
-#define GLU_TESS_WINDING_ABS_GEQ_TWO       100134
-
-/* Obsolete. For compatibility with previous Sun OpenGL versions */
-#define GLU_INCOMPATIBLE_GL_VERSION        100903
-
-
-/*************************************************************/
-
-
-#ifdef __cplusplus
-class GLUnurbs;
-class GLUquadric;
-class GLUtesselator;
-#else
-typedef struct GLUnurbs GLUnurbs;
-typedef struct GLUquadric GLUquadric;
-typedef struct GLUtesselator GLUtesselator;
-#endif
-
-typedef GLUnurbs GLUnurbsObj;
-typedef GLUquadric GLUquadricObj;
-typedef GLUtesselator GLUtesselatorObj;
-typedef GLUtesselator GLUtriangulatorObj;
-
-#define GLU_TESS_MAX_COORD 1.0e150
-
-/* Internal convenience typedefs */
-typedef void (APIENTRY *_GLUfuncptr)();
-
-GLAPI void APIENTRY gluBeginCurve (GLUnurbs* nurb);
-GLAPI void APIENTRY gluBeginPolygon (GLUtesselator* tess);
-GLAPI void APIENTRY gluBeginSurface (GLUnurbs* nurb);
-GLAPI void APIENTRY gluBeginTrim (GLUnurbs* nurb);
-GLAPI GLint APIENTRY gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data);
-GLAPI GLint APIENTRY gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data);
-GLAPI void APIENTRY gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks);
-GLAPI void APIENTRY gluDeleteNurbsRenderer (GLUnurbs* nurb);
-GLAPI void APIENTRY gluDeleteQuadric (GLUquadric* quad);
-GLAPI void APIENTRY gluDeleteTess (GLUtesselator* tess);
-GLAPI void APIENTRY gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops);
-GLAPI void APIENTRY gluEndCurve (GLUnurbs* nurb);
-GLAPI void APIENTRY gluEndPolygon (GLUtesselator* tess);
-GLAPI void APIENTRY gluEndSurface (GLUnurbs* nurb);
-GLAPI void APIENTRY gluEndTrim (GLUnurbs* nurb);
-GLAPI const GLubyte * APIENTRY gluErrorString (GLenum error);
-GLAPI const wchar_t * APIENTRY gluErrorUnicodeStringEXT (GLenum error);
-GLAPI void APIENTRY gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data);
-GLAPI const GLubyte * APIENTRY gluGetString (GLenum name);
-GLAPI void APIENTRY gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data);
-GLAPI void APIENTRY gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view);
-GLAPI void APIENTRY gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ);
-GLAPI GLUnurbs* APIENTRY gluNewNurbsRenderer (void);
-GLAPI GLUquadric* APIENTRY gluNewQuadric (void);
-GLAPI GLUtesselator* APIENTRY gluNewTess (void);
-GLAPI void APIENTRY gluNextContour (GLUtesselator* tess, GLenum type);
-GLAPI void APIENTRY gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc);
-GLAPI void APIENTRY gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type);
-GLAPI void APIENTRY gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value);
-GLAPI void APIENTRY gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type);
-GLAPI void APIENTRY gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top);
-GLAPI void APIENTRY gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep);
-GLAPI void APIENTRY gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar);
-GLAPI void APIENTRY gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport);
-GLAPI GLint APIENTRY gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ);
-GLAPI void APIENTRY gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type);
-GLAPI void APIENTRY gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc);
-GLAPI void APIENTRY gluQuadricDrawStyle (GLUquadric* quad, GLenum draw);
-GLAPI void APIENTRY gluQuadricNormals (GLUquadric* quad, GLenum normal);
-GLAPI void APIENTRY gluQuadricOrientation (GLUquadric* quad, GLenum orientation);
-GLAPI void APIENTRY gluQuadricTexture (GLUquadric* quad, GLboolean texture);
-GLAPI GLint APIENTRY gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut);
-GLAPI void APIENTRY gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks);
-GLAPI void APIENTRY gluTessBeginContour (GLUtesselator* tess);
-GLAPI void APIENTRY gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data);
-GLAPI void APIENTRY gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc);
-GLAPI void APIENTRY gluTessEndContour (GLUtesselator* tess);
-GLAPI void APIENTRY gluTessEndPolygon (GLUtesselator* tess);
-GLAPI void APIENTRY gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ);
-GLAPI void APIENTRY gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data);
-GLAPI void APIENTRY gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data);
-GLAPI GLint APIENTRY gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ);
-GLAPI GLint APIENTRY gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW);
-
-#ifdef UNICODE
-#define gluErrorStringWIN gluErrorUnicodeStringEXT
-#else
-#define gluErrorStringWIN gluErrorString
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __glu_h__ */
diff --git a/winsup/w32api/include/accctrl.h b/winsup/w32api/include/accctrl.h
deleted file mode 100644
index 6f969042f..000000000
--- a/winsup/w32api/include/accctrl.h
+++ /dev/null
@@ -1,329 +0,0 @@
-#ifndef _ACCCTRL_H
-#define _ACCCTRL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define AccFree LocalFree
-#define ACTRL_RESERVED            0x00000000
-#define ACTRL_ACCESS_PROTECTED    0x00000001
-#define ACTRL_ACCESS_ALLOWED      0x00000001
-#define ACTRL_ACCESS_DENIED       0x00000002
-#define ACTRL_AUDIT_SUCCESS       0x00000004
-#define ACTRL_AUDIT_FAILURE       0x00000008
-#define ACTRL_SYSTEM_ACCESS       0x04000000
-#define ACTRL_DELETE              0x08000000
-#define ACTRL_READ_CONTROL        0x10000000
-#define ACTRL_CHANGE_ACCESS       0x20000000
-#define ACTRL_CHANGE_OWNER        0x40000000
-#define ACTRL_SYNCHRONIZE         0x80000000
-#define ACTRL_STD_RIGHTS_ALL      0xf8000000
-
-#define ACTRL_FILE_READ           0x00000001
-#define ACTRL_FILE_WRITE          0x00000002
-#define ACTRL_FILE_APPEND         0x00000004
-#define ACTRL_FILE_READ_PROP      0x00000008
-#define ACTRL_FILE_WRITE_PROP     0x00000010
-#define ACTRL_FILE_EXECUTE        0x00000020
-#define ACTRL_FILE_READ_ATTRIB    0x00000080
-#define ACTRL_FILE_WRITE_ATTRIB   0x00000100
-#define ACTRL_FILE_CREATE_PIPE    0x00000200
-#define ACTRL_DIR_LIST            0x00000001
-#define ACTRL_DIR_CREATE_OBJECT   0x00000002
-#define ACTRL_DIR_CREATE_CHILD    0x00000004
-#define ACTRL_DIR_DELETE_CHILD    0x00000040
-#define ACTRL_DIR_TRAVERSE        0x00000020
-#define ACTRL_KERNEL_TERMINATE    0x00000001
-#define ACTRL_KERNEL_THREAD       0x00000002
-#define ACTRL_KERNEL_VM           0x00000004
-#define ACTRL_KERNEL_VM_READ      0x00000008
-#define ACTRL_KERNEL_VM_WRITE     0x00000010
-#define ACTRL_KERNEL_DUP_HANDLE   0x00000020
-#define ACTRL_KERNEL_PROCESS      0x00000040
-#define ACTRL_KERNEL_SET_INFO     0x00000080
-#define ACTRL_KERNEL_GET_INFO     0x00000100
-#define ACTRL_KERNEL_CONTROL      0x00000200
-#define ACTRL_KERNEL_ALERT        0x00000400
-#define ACTRL_KERNEL_GET_CONTEXT  0x00000800
-#define ACTRL_KERNEL_SET_CONTEXT  0x00001000
-#define ACTRL_KERNEL_TOKEN        0x00002000
-#define ACTRL_KERNEL_IMPERSONATE  0x00004000
-#define ACTRL_KERNEL_DIMPERSONATE 0x00008000
-#define ACTRL_PRINT_SADMIN        0x00000001
-#define ACTRL_PRINT_SLIST         0x00000002
-#define ACTRL_PRINT_PADMIN        0x00000004
-#define ACTRL_PRINT_PUSE          0x00000008
-#define ACTRL_PRINT_JADMIN        0x00000010
-#define ACTRL_SVC_GET_INFO        0x00000001
-#define ACTRL_SVC_SET_INFO        0x00000002
-#define ACTRL_SVC_STATUS          0x00000004
-#define ACTRL_SVC_LIST            0x00000008
-#define ACTRL_SVC_START           0x00000010
-#define ACTRL_SVC_STOP            0x00000020
-#define ACTRL_SVC_PAUSE           0x00000040
-#define ACTRL_SVC_INTERROGATE     0x00000080
-#define ACTRL_SVC_UCONTROL        0x00000100
-#define ACTRL_REG_QUERY           0x00000001
-#define ACTRL_REG_SET             0x00000002
-#define ACTRL_REG_CREATE_CHILD    0x00000004
-#define ACTRL_REG_LIST            0x00000008
-#define ACTRL_REG_NOTIFY          0x00000010
-#define ACTRL_REG_LINK            0x00000020
-#define ACTRL_WIN_CLIPBRD         0x00000001
-#define ACTRL_WIN_GLOBAL_ATOMS    0x00000002
-#define ACTRL_WIN_CREATE          0x00000004
-#define ACTRL_WIN_LIST_DESK       0x00000008
-#define ACTRL_WIN_LIST            0x00000010
-#define ACTRL_WIN_READ_ATTRIBS    0x00000020
-#define ACTRL_WIN_WRITE_ATTRIBS   0x00000040
-#define ACTRL_WIN_SCREEN          0x00000080
-#define ACTRL_WIN_EXIT            0x00000100
-#define ACTRL_ACCESS_NO_OPTIONS                 0x00000000
-#define ACTRL_ACCESS_SUPPORTS_OBJECT_ENTRIES    0x00000001
-#define ACCCTRL_DEFAULT_PROVIDERA   "Windows NT Access Provider"
-#define ACCCTRL_DEFAULT_PROVIDERW  L"Windows NT Access Provider"
-#define TRUSTEE_ACCESS_ALLOWED    0x00000001L
-#define TRUSTEE_ACCESS_READ       0x00000002L
-#define TRUSTEE_ACCESS_WRITE      0x00000004L
-#define TRUSTEE_ACCESS_EXPLICIT   0x00000001L
-#define TRUSTEE_ACCESS_READ_WRITE   (TRUSTEE_ACCESS_READ | TRUSTEE_ACCESS_WRITE)
-#define TRUSTEE_ACCESS_ALL        0xFFFFFFFFL
-#define NO_INHERITANCE	          0x0
-#define SUB_OBJECTS_ONLY_INHERIT  0x1
-#define SUB_CONTAINERS_ONLY_INHERIT 0x2
-#define SUB_CONTAINERS_AND_OBJECTS_INHERIT  0x3
-#define INHERIT_NO_PROPAGATE      0x4
-#define INHERIT_ONLY              0x8
-#define INHERITED_ACCESS_ENTRY    0x10
-#define INHERITED_PARENT          0x10000000
-#define INHERITED_GRANDPARENT     0x20000000
-
-typedef ULONG INHERIT_FLAGS, *PINHERIT_FLAGS;
-typedef ULONG ACCESS_RIGHTS, *PACCESS_RIGHTS;
-
-typedef enum _ACCESS_MODE {
-	NOT_USED_ACCESS = 0,
-	GRANT_ACCESS,
-	SET_ACCESS,
-	DENY_ACCESS,
-	REVOKE_ACCESS,
-	SET_AUDIT_SUCCESS,
-	SET_AUDIT_FAILURE
-} ACCESS_MODE;
-typedef enum _SE_OBJECT_TYPE {
-	SE_UNKNOWN_OBJECT_TYPE = 0,
-	SE_FILE_OBJECT,
-	SE_SERVICE,
-	SE_PRINTER,
-	SE_REGISTRY_KEY,
-	SE_LMSHARE,
-	SE_KERNEL_OBJECT,
-	SE_WINDOW_OBJECT,
-	SE_DS_OBJECT,
-	SE_DS_OBJECT_ALL,
-	SE_PROVIDER_DEFINED_OBJECT,
-	SE_WMIGUID_OBJECT,
-	SE_REGISTRY_WOW64_32KEY
-} SE_OBJECT_TYPE;
-typedef enum _TRUSTEE_TYPE {
-	TRUSTEE_IS_UNKNOWN,
-	TRUSTEE_IS_USER,
-	TRUSTEE_IS_GROUP,
-	TRUSTEE_IS_DOMAIN,
-	TRUSTEE_IS_ALIAS,
-	TRUSTEE_IS_WELL_KNOWN_GROUP,
-	TRUSTEE_IS_DELETED,
-	TRUSTEE_IS_INVALID,
-	TRUSTEE_IS_COMPUTER
-} TRUSTEE_TYPE;
-typedef enum _TRUSTEE_FORM {
-	TRUSTEE_IS_SID,
-	TRUSTEE_IS_NAME,
-	TRUSTEE_BAD_FORM,
-	TRUSTEE_IS_OBJECTS_AND_SID,
-	TRUSTEE_IS_OBJECTS_AND_NAME
-} TRUSTEE_FORM;
-typedef enum _MULTIPLE_TRUSTEE_OPERATION {
-	NO_MULTIPLE_TRUSTEE,
-	TRUSTEE_IS_IMPERSONATE
-} MULTIPLE_TRUSTEE_OPERATION;
-typedef struct _TRUSTEE_A {
-	struct _TRUSTEE_A          *pMultipleTrustee;
-	MULTIPLE_TRUSTEE_OPERATION  MultipleTrusteeOperation;
-	TRUSTEE_FORM                TrusteeForm;
-	TRUSTEE_TYPE                TrusteeType;
-	LPSTR                       ptstrName;
-} TRUSTEE_A, *PTRUSTEE_A, TRUSTEEA, *PTRUSTEEA;
-typedef struct _TRUSTEE_W {
-	struct _TRUSTEE_W          *pMultipleTrustee;
-	MULTIPLE_TRUSTEE_OPERATION  MultipleTrusteeOperation;
-	TRUSTEE_FORM                TrusteeForm;
-	TRUSTEE_TYPE                TrusteeType;
-	LPWSTR                      ptstrName;
-} TRUSTEE_W, *PTRUSTEE_W, TRUSTEEW, *PTRUSTEEW;
-typedef struct _ACTRL_ACCESS_ENTRYA {
-	TRUSTEE_A       Trustee;
-	ULONG           fAccessFlags;
-	ACCESS_RIGHTS   Access;
-	ACCESS_RIGHTS   ProvSpecificAccess;
-	INHERIT_FLAGS   Inheritance;
-	LPCSTR          lpInheritProperty;
-} ACTRL_ACCESS_ENTRYA, *PACTRL_ACCESS_ENTRYA;
-typedef struct _ACTRL_ACCESS_ENTRYW {
-	TRUSTEE_W       Trustee;
-	ULONG           fAccessFlags;
-	ACCESS_RIGHTS   Access;
-	ACCESS_RIGHTS   ProvSpecificAccess;
-	INHERIT_FLAGS   Inheritance;
-	LPCWSTR         lpInheritProperty;
-} ACTRL_ACCESS_ENTRYW, *PACTRL_ACCESS_ENTRYW;
-typedef struct _ACTRL_ACCESS_ENTRY_LISTA {
-	ULONG                  cEntries;
-	ACTRL_ACCESS_ENTRYA    *pAccessList;
-} ACTRL_ACCESS_ENTRY_LISTA, *PACTRL_ACCESS_ENTRY_LISTA;
-typedef struct _ACTRL_ACCESS_ENTRY_LISTW {
-	ULONG                  cEntries;
-	ACTRL_ACCESS_ENTRYW    *pAccessList;
-} ACTRL_ACCESS_ENTRY_LISTW, *PACTRL_ACCESS_ENTRY_LISTW;
-typedef struct _ACTRL_PROPERTY_ENTRYA {
-	LPCSTR                      lpProperty;
-	PACTRL_ACCESS_ENTRY_LISTA   pAccessEntryList;
-	ULONG                       fListFlags;
-} ACTRL_PROPERTY_ENTRYA, *PACTRL_PROPERTY_ENTRYA;
-typedef struct _ACTRL_PROPERTY_ENTRYW {
-	LPCWSTR                     lpProperty;
-	PACTRL_ACCESS_ENTRY_LISTW   pAccessEntryList;
-	ULONG                       fListFlags;
-} ACTRL_PROPERTY_ENTRYW, *PACTRL_PROPERTY_ENTRYW;
-typedef struct _ACTRL_ALISTA {
-	ULONG                       cEntries;
-	PACTRL_PROPERTY_ENTRYA      pPropertyAccessList;
-} ACTRL_ACCESSA, *PACTRL_ACCESSA, ACTRL_AUDITA, *PACTRL_AUDITA;
-typedef struct _ACTRL_ALISTW {
-	ULONG                       cEntries;
-	PACTRL_PROPERTY_ENTRYW      pPropertyAccessList;
-} ACTRL_ACCESSW, *PACTRL_ACCESSW, ACTRL_AUDITW, *PACTRL_AUDITW;
-typedef struct _TRUSTEE_ACCESSA { 
-	LPSTR           lpProperty;
-	ACCESS_RIGHTS   Access;
-	ULONG           fAccessFlags;
-	ULONG           fReturnedAccess;
-} TRUSTEE_ACCESSA, *PTRUSTEE_ACCESSA;
-typedef struct _TRUSTEE_ACCESSW {
-	LPWSTR          lpProperty;
-	ACCESS_RIGHTS   Access;
-	ULONG           fAccessFlags;
-	ULONG           fReturnedAccess;
-} TRUSTEE_ACCESSW, *PTRUSTEE_ACCESSW;
-typedef struct _ACTRL_OVERLAPPED {
-	_ANONYMOUS_UNION
-	union {
-	    PVOID Provider;
-	    ULONG Reserved1;
-	} DUMMYUNIONNAME;
-	ULONG       Reserved2;
-	HANDLE      hEvent;
-} ACTRL_OVERLAPPED, *PACTRL_OVERLAPPED;
-typedef struct _ACTRL_ACCESS_INFOA {
-	ULONG       fAccessPermission;
-	LPSTR       lpAccessPermissionName;
-} ACTRL_ACCESS_INFOA, *PACTRL_ACCESS_INFOA;
-typedef struct _ACTRL_ACCESS_INFOW {
-	ULONG       fAccessPermission;
-	LPWSTR      lpAccessPermissionName;
-} ACTRL_ACCESS_INFOW, *PACTRL_ACCESS_INFOW;
-typedef struct _ACTRL_CONTROL_INFOA {
-	LPSTR       lpControlId;
-	LPSTR       lpControlName;
-} ACTRL_CONTROL_INFOA, *PACTRL_CONTROL_INFOA;
-typedef struct _ACTRL_CONTROL_INFOW {
-	LPWSTR      lpControlId;
-	LPWSTR      lpControlName;
-} ACTRL_CONTROL_INFOW, *PACTRL_CONTROL_INFOW;
-typedef struct _EXPLICIT_ACCESS_A {
-	DWORD        grfAccessPermissions;
-	ACCESS_MODE  grfAccessMode;
-	DWORD        grfInheritance;
-	TRUSTEE_A    Trustee;
-} EXPLICIT_ACCESS_A, *PEXPLICIT_ACCESS_A, EXPLICIT_ACCESSA, *PEXPLICIT_ACCESSA;
-typedef struct _EXPLICIT_ACCESS_W {
-	DWORD        grfAccessPermissions;
-	ACCESS_MODE  grfAccessMode;
-	DWORD        grfInheritance;
-	TRUSTEE_W    Trustee;
-} EXPLICIT_ACCESS_W, *PEXPLICIT_ACCESS_W, EXPLICIT_ACCESSW, *PEXPLICIT_ACCESSW;
-typedef struct _OBJECTS_AND_SID {
-	DWORD   ObjectsPresent;
-	GUID    ObjectTypeGuid;
-	GUID    InheritedObjectTypeGuid;
-	SID     * pSid;
-} OBJECTS_AND_SID, *POBJECTS_AND_SID;
-typedef struct _OBJECTS_AND_NAME_A {
-	DWORD    ObjectsPresent;
-	SE_OBJECT_TYPE ObjectType;
-	LPSTR    ObjectTypeName;
-	LPSTR    InheritedObjectTypeName;
-	LPSTR    ptstrName;
-} OBJECTS_AND_NAME_A, *POBJECTS_AND_NAME_A;
-typedef struct _OBJECTS_AND_NAME_W {
-	DWORD          ObjectsPresent;
-	SE_OBJECT_TYPE ObjectType;
-	LPWSTR   ObjectTypeName;
-	LPWSTR   InheritedObjectTypeName;
-	LPWSTR   ptstrName;
-} OBJECTS_AND_NAME_W, *POBJECTS_AND_NAME_W;
-#if (_WIN32_WINNT >= 0x0501)
-typedef struct {
-	LONG     GenerationGap;
-	LPSTR    AncestorName;
-} INHERITED_FROMA, *PINHERITED_FROMA;
-typedef struct {
-	LONG     GenerationGap;
-	LPWSTR   AncestorName;
-} INHERITED_FROMW, *PINHERITED_FROMW;
-#endif /* (_WIN32_WINNT >= 0x0501) */
-
-#ifdef UNICODE
-#define ACCCTRL_DEFAULT_PROVIDER ACCCTRL_DEFAULT_PROVIDERW
-typedef TRUSTEE_W TRUSTEE_, *PTRUSTEE_;
-typedef TRUSTEEW TRUSTEE, *PTRUSTEE;
-typedef ACTRL_ACCESSW ACTRL_ACCESS, *PACTRL_ACCESS;
-typedef ACTRL_ACCESS_ENTRY_LISTW ACTRL_ACCESS_ENTRY_LIST, *PACTRL_ACCESS_ENTRY_LIST;
-typedef ACTRL_ACCESS_INFOW ACTRL_ACCESS_INFO, *PACTRL_ACCESS_INFO;
-typedef ACTRL_ACCESS_ENTRYW ACTRL_ACCESS_ENTRY, *PACTRL_ACCESS_ENTRY;
-typedef ACTRL_AUDITW ACTRL_AUDIT, *PACTRL_AUDIT;
-typedef ACTRL_CONTROL_INFOW ACTRL_CONTROL_INFO, *PACTRL_CONTROL_INFO;
-typedef EXPLICIT_ACCESS_W EXPLICIT_ACCESS_, *PEXPLICIT_ACCESS_;
-typedef EXPLICIT_ACCESSW EXPLICIT_ACCESS, *PEXPLICIT_ACCESS;
-typedef TRUSTEE_ACCESSW TRUSTEE_ACCESS, *PTRUSTEE_ACCESS;
-typedef OBJECTS_AND_NAME_W OBJECTS_AND_NAME_, *POBJECTS_AND_NAME_;
-#if (_WIN32_WINNT >= 0x0501)
-typedef INHERITED_FROMW INHERITED_FROM, *PINHERITED_FROM;
-#endif
-#else
-#define ACCCTRL_DEFAULT_PROVIDER ACCCTRL_DEFAULT_PROVIDERA
-typedef TRUSTEE_A TRUSTEE_, *PTRUSTEE_;
-typedef TRUSTEEA TRUSTEE, *PTRUSTEE;
-typedef ACTRL_ACCESSA ACTRL_ACCESS, *PACTRL_ACCESS;
-typedef ACTRL_ACCESS_ENTRY_LISTA ACTRL_ACCESS_ENTRY_LIST, *PACTRL_ACCESS_ENTRY_LIST;
-typedef ACTRL_ACCESS_INFOA ACTRL_ACCESS_INFO, *PACTRL_ACCESS_INFO;
-typedef ACTRL_ACCESS_ENTRYA ACTRL_ACCESS_ENTRY, *PACTRL_ACCESS_ENTRY;
-typedef ACTRL_AUDITA ACTRL_AUDIT, *PACTRL_AUDIT;
-typedef ACTRL_CONTROL_INFOA ACTRL_CONTROL_INFO, *PACTRL_CONTROL_INFO;
-typedef EXPLICIT_ACCESS_A EXPLICIT_ACCESS_, *PEXPLICIT_ACCESS_;
-typedef EXPLICIT_ACCESSA EXPLICIT_ACCESS, *PEXPLICIT_ACCESS;
-typedef TRUSTEE_ACCESSA TRUSTEE_ACCESS, *PTRUSTEE_ACCESS;
-typedef OBJECTS_AND_NAME_A OBJECTS_AND_NAME_, *POBJECTS_AND_NAME_;
-#if (_WIN32_WINNT >= 0x0501)
-typedef INHERITED_FROMA INHERITED_FROM, *PINHERITED_FROM;
-#endif
-#endif /* UNICODE */
-
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/aclapi.h b/winsup/w32api/include/aclapi.h
deleted file mode 100644
index d4ef6a794..000000000
--- a/winsup/w32api/include/aclapi.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef _ACLAPI_H
-#define _ACLAPI_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#include <windows.h>
-#include <accctrl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-VOID WINAPI BuildExplicitAccessWithNameA(PEXPLICIT_ACCESS_A,LPSTR,DWORD,ACCESS_MODE,DWORD);
-VOID WINAPI BuildExplicitAccessWithNameW(PEXPLICIT_ACCESS_W,LPWSTR,DWORD,ACCESS_MODE,DWORD);
-DWORD WINAPI BuildSecurityDescriptorA(PTRUSTEE_A,PTRUSTEE_A ,ULONG,PEXPLICIT_ACCESS_A,
-  ULONG,PEXPLICIT_ACCESS_A,PSECURITY_DESCRIPTOR,PULONG,PSECURITY_DESCRIPTOR*);
-DWORD WINAPI BuildSecurityDescriptorW(PTRUSTEE_W,PTRUSTEE_W ,ULONG,PEXPLICIT_ACCESS_W,
-  ULONG,PEXPLICIT_ACCESS_W,PSECURITY_DESCRIPTOR,PULONG,PSECURITY_DESCRIPTOR*);
-VOID WINAPI BuildTrusteeWithNameA(PTRUSTEE_A,LPSTR);
-VOID WINAPI BuildTrusteeWithNameW(PTRUSTEE_W,LPWSTR);
-VOID WINAPI BuildTrusteeWithObjectsAndNameA(PTRUSTEE_A,POBJECTS_AND_NAME_A,SE_OBJECT_TYPE,
-  LPSTR,LPSTR,LPSTR);
-VOID WINAPI BuildTrusteeWithObjectsAndNameW(PTRUSTEE_W,POBJECTS_AND_NAME_W,SE_OBJECT_TYPE,
-  LPWSTR,LPWSTR,LPWSTR);
-VOID WINAPI BuildTrusteeWithObjectsAndSidA(PTRUSTEE_A,POBJECTS_AND_SID,GUID*,GUID*,PSID);
-VOID WINAPI BuildTrusteeWithObjectsAndSidW(PTRUSTEE_W,POBJECTS_AND_SID,GUID*,GUID*,PSID);
-VOID WINAPI BuildTrusteeWithSidA(PTRUSTEE_A,PSID);
-VOID WINAPI BuildTrusteeWithSidW(PTRUSTEE_W,PSID);
-DWORD WINAPI GetAuditedPermissionsFromAclA(PACL,PTRUSTEE_A,PACCESS_MASK,PACCESS_MASK);
-DWORD WINAPI GetAuditedPermissionsFromAclW(PACL,PTRUSTEE_W,PACCESS_MASK,PACCESS_MASK);
-DWORD WINAPI GetEffectiveRightsFromAclA(PACL,PTRUSTEE_A,PACCESS_MASK);
-DWORD WINAPI GetEffectiveRightsFromAclW(PACL,PTRUSTEE_W,PACCESS_MASK);
-DWORD WINAPI GetExplicitEntriesFromAclA(PACL,PULONG,PEXPLICIT_ACCESS_A*);
-DWORD WINAPI GetExplicitEntriesFromAclW(PACL,PULONG,PEXPLICIT_ACCESS_W*);
-#if (_WIN32_WINNT >= 0x0501)
-DWORD WINAPI GetInheritanceSourceA(LPSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,BOOL,GUID**,DWORD,PACL,void*,PGENERIC_MAPPING,PINHERITED_FROMA);
-DWORD WINAPI GetInheritanceSourceW(LPWSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,BOOL,GUID**,DWORD,PACL,void*,PGENERIC_MAPPING,PINHERITED_FROMW);
-#endif
-DWORD WINAPI GetNamedSecurityInfoA(LPSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,
-  PSID*,PSID*,PACL*,PACL*,PSECURITY_DESCRIPTOR*);
-DWORD WINAPI GetNamedSecurityInfoW(LPWSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,
-  PSID*,PSID*,PACL*,PACL*,PSECURITY_DESCRIPTOR*);
-DWORD WINAPI GetSecurityInfo(HANDLE,SE_OBJECT_TYPE,SECURITY_INFORMATION,
-  PSID*,PSID*,PACL*,PACL*,PSECURITY_DESCRIPTOR*);
-TRUSTEE_FORM WINAPI GetTrusteeFormA(PTRUSTEE_A);
-TRUSTEE_FORM WINAPI GetTrusteeFormW(PTRUSTEE_W);
-LPSTR WINAPI GetTrusteeNameA(PTRUSTEE_A);
-LPWSTR WINAPI GetTrusteeNameW(PTRUSTEE_W);
-TRUSTEE_TYPE WINAPI GetTrusteeTypeA(PTRUSTEE_A);
-TRUSTEE_TYPE WINAPI GetTrusteeTypeW(PTRUSTEE_W);
-DWORD WINAPI LookupSecurityDescriptorPartsA(PTRUSTEE_A*,PTRUSTEE_A*,PULONG,PEXPLICIT_ACCESS_A*,
-  PULONG,PEXPLICIT_ACCESS_A*,PSECURITY_DESCRIPTOR);
-DWORD WINAPI LookupSecurityDescriptorPartsW(PTRUSTEE_W*,PTRUSTEE_W*,PULONG,PEXPLICIT_ACCESS_W*,
-  PULONG,PEXPLICIT_ACCESS_W*,PSECURITY_DESCRIPTOR);
-DWORD WINAPI SetEntriesInAclA(ULONG,PEXPLICIT_ACCESS_A,PACL,PACL*);
-DWORD WINAPI SetEntriesInAclW(ULONG,PEXPLICIT_ACCESS_W,PACL,PACL*);
-DWORD WINAPI SetNamedSecurityInfoA(LPSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,PSID,PSID,PACL,PACL);
-DWORD WINAPI SetNamedSecurityInfoW(LPWSTR,SE_OBJECT_TYPE,SECURITY_INFORMATION,PSID,PSID,PACL,PACL);
-DWORD WINAPI SetSecurityInfo(HANDLE,SE_OBJECT_TYPE,SECURITY_INFORMATION,PSID,PSID,PACL,PACL);
-VOID WINAPI BuildImpersonateExplicitAccessWithNameA(PEXPLICIT_ACCESS_A,LPSTR,PTRUSTEE_A,DWORD,ACCESS_MODE,DWORD);
-VOID WINAPI BuildImpersonateExplicitAccessWithNameW(PEXPLICIT_ACCESS_W,LPWSTR,PTRUSTEE_W,DWORD,ACCESS_MODE,DWORD);
-VOID WINAPI BuildImpersonateTrusteeA(PTRUSTEE_A,PTRUSTEE_A);
-VOID WINAPI BuildImpersonateTrusteeW(PTRUSTEE_W,PTRUSTEE_W);
-PTRUSTEE_A WINAPI GetMultipleTrusteeA(PTRUSTEE_A);
-PTRUSTEE_W WINAPI GetMultipleTrusteeW(PTRUSTEE_W);
-MULTIPLE_TRUSTEE_OPERATION WINAPI GetMultipleTrusteeOperationA(PTRUSTEE_A);
-MULTIPLE_TRUSTEE_OPERATION WINAPI GetMultipleTrusteeOperationW(PTRUSTEE_W);
-
-#ifdef UNICODE
-#define BuildExplicitAccessWithName  BuildExplicitAccessWithNameW
-#define BuildSecurityDescriptor  BuildSecurityDescriptorW
-#define BuildTrusteeWithName  BuildTrusteeWithNameW
-#define BuildTrusteeWithObjectsAndName  BuildTrusteeWithObjectsAndNameW
-#define BuildTrusteeWithObjectsAndSid  BuildTrusteeWithObjectsAndSidW
-#define BuildTrusteeWithSid  BuildTrusteeWithSidW
-#define GetAuditedPermissionsFromAcl  GetAuditedPermissionsFromAclW
-#define GetEffectiveRightsFromAcl  GetEffectiveRightsFromAclW
-#define GetExplicitEntriesFromAcl  GetExplicitEntriesFromAclW
-#define GetNamedSecurityInfo  GetNamedSecurityInfoW
-#define GetTrusteeForm  GetTrusteeFormW
-#define GetTrusteeName  GetTrusteeNameW
-#define GetTrusteeType  GetTrusteeTypeW
-#define LookupSecurityDescriptorParts  LookupSecurityDescriptorPartsW
-#define SetEntriesInAcl  SetEntriesInAclW
-#define SetNamedSecurityInfo  SetNamedSecurityInfoW
-#define BuildImpersonateExplicitAccessWithName  BuildImpersonateExplicitAccessWithNameW
-#define BuildImpersonateTrustee  BuildImpersonateTrusteeW
-#define GetMultipleTrustee  GetMultipleTrusteeW
-#define GetMultipleTrusteeOperation  GetMultipleTrusteeOperationW
-#else
-#define BuildExplicitAccessWithName  BuildExplicitAccessWithNameA
-#define BuildSecurityDescriptor  BuildSecurityDescriptorA
-#define BuildTrusteeWithName  BuildTrusteeWithNameA
-#define BuildTrusteeWithObjectsAndName  BuildTrusteeWithObjectsAndNameA
-#define BuildTrusteeWithObjectsAndSid  BuildTrusteeWithObjectsAndSidA
-#define BuildTrusteeWithSid  BuildTrusteeWithSidA
-#define GetAuditedPermissionsFromAcl  GetAuditedPermissionsFromAclA
-#define GetEffectiveRightsFromAcl  GetEffectiveRightsFromAclA
-#define GetExplicitEntriesFromAcl  GetExplicitEntriesFromAclA
-#define GetNamedSecurityInfo  GetNamedSecurityInfoA
-#define GetTrusteeForm  GetTrusteeFormA
-#define GetTrusteeName  GetTrusteeNameA
-#define GetTrusteeType  GetTrusteeTypeA
-#define LookupSecurityDescriptorParts  LookupSecurityDescriptorPartsA
-#define SetEntriesInAcl  SetEntriesInAclA
-#define SetNamedSecurityInfo  SetNamedSecurityInfoA
-#define BuildImpersonateExplicitAccessWithName  BuildImpersonateExplicitAccessWithNameA
-#define BuildImpersonateTrustee  BuildImpersonateTrusteeA
-#define GetMultipleTrustee  GetMultipleTrusteeA
-#define GetMultipleTrusteeOperation  GetMultipleTrusteeOperationA
-#endif /* UNICODE */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/afxres.h b/winsup/w32api/include/afxres.h
deleted file mode 100644
index 8c3f01a9a..000000000
--- a/winsup/w32api/include/afxres.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _AFXRES_H
-#define _AFXRES_H
-#if __GNUC__ >= 3

-#pragma GCC system_header

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#ifndef _WINDOWS_H
-#include <windows.h>

-#endif
-

-/* IDC_STATIC is documented in winuser.h, but not defined. */
-#ifndef IDC_STATIC

-#define IDC_STATIC (-1)

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-#endif

diff --git a/winsup/w32api/include/basetsd.h b/winsup/w32api/include/basetsd.h
deleted file mode 100644
index d9c375dd9..000000000
--- a/winsup/w32api/include/basetsd.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef _BASETSD_H
-#define _BASETSD_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __GNUC__
-#ifndef __int64
-#define __int64 long long
-#endif
-#endif
-
-#if defined(_WIN64)
-#define __int3264   __int64
-#define ADDRESS_TAG_BIT 0x40000000000UI64
-#else /*  !_WIN64 */
-#define __int3264   __int32
-#define ADDRESS_TAG_BIT 0x80000000UL
-#define HandleToUlong( h ) ((ULONG)(ULONG_PTR)(h) )
-#define HandleToLong( h ) ((LONG)(LONG_PTR) (h) )
-#define LongToHandle( h) ((HANDLE)(LONG_PTR) (h))
-#define PtrToUlong( p ) ((ULONG)(ULONG_PTR) (p) )
-#define PtrToLong( p ) ((LONG)(LONG_PTR) (p) )
-#define PtrToUint( p ) ((UINT)(UINT_PTR) (p) )
-#define PtrToInt( p ) ((INT)(INT_PTR) (p) )
-#define PtrToUshort( p ) ((unsigned short)(ULONG_PTR)(p) )
-#define PtrToShort( p ) ((short)(LONG_PTR)(p) )
-#define IntToPtr( i )    ((VOID*)(INT_PTR)((int)i))
-#define UIntToPtr( ui )  ((VOID*)(UINT_PTR)((unsigned int)ui))
-#define LongToPtr( l )   ((VOID*)(LONG_PTR)((long)l))
-#define ULongToPtr( ul )  ((VOID*)(ULONG_PTR)((unsigned long)ul))
-#endif /* !_WIN64 */
-
-#define UlongToPtr(ul) ULongToPtr(ul)
-#define UintToPtr(ui) UIntToPtr(ui)
-#define MAXUINT_PTR  (~((UINT_PTR)0))
-#define MAXINT_PTR   ((INT_PTR)(MAXUINT_PTR >> 1))
-#define MININT_PTR   (~MAXINT_PTR)
-#define MAXULONG_PTR (~((ULONG_PTR)0))
-#define MAXLONG_PTR  ((LONG_PTR)(MAXULONG_PTR >> 1))
-#define MINLONG_PTR  (~MAXLONG_PTR)
-#define MAXUHALF_PTR ((UHALF_PTR)~0)
-#define MAXHALF_PTR  ((HALF_PTR)(MAXUHALF_PTR >> 1))
-#define MINHALF_PTR  (~MAXHALF_PTR)
-
-#ifndef RC_INVOKED
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef int LONG32, *PLONG32;
-#ifndef XFree86Server
-typedef int INT32, *PINT32;
-#endif /* ndef XFree86Server */
-typedef unsigned int ULONG32, *PULONG32;
-typedef unsigned int DWORD32, *PDWORD32;
-typedef unsigned int UINT32, *PUINT32;
-
-#if defined(_WIN64)
-typedef __int64 INT_PTR, *PINT_PTR;
-typedef unsigned __int64 UINT_PTR, *PUINT_PTR;
-typedef __int64 LONG_PTR, *PLONG_PTR;
-typedef unsigned __int64 ULONG_PTR, *PULONG_PTR;
-typedef unsigned __int64 HANDLE_PTR;
-typedef unsigned int UHALF_PTR, *PUHALF_PTR;
-typedef int HALF_PTR, *PHALF_PTR;
-
-#if 0 /* TODO when WIN64 is here */
-inline unsigned long HandleToUlong(const void* h )
-    { return((unsigned long) h ); }
-inline long HandleToLong( const void* h )
-    { return((long) h ); }
-inline void* LongToHandle( const long h )
-    { return((void*) (INT_PTR) h ); }
-inline unsigned long PtrToUlong( const void* p)
-    { return((unsigned long) p ); }
-inline unsigned int PtrToUint( const void* p )
-    { return((unsigned int) p ); }
-inline unsigned short PtrToUshort( const void* p )
-    { return((unsigned short) p ); }
-inline long PtrToLong( const void* p )
-    { return((long) p ); }
-inline int PtrToInt( const void* p )
-    { return((int) p ); }
-inline short PtrToShort( const void* p )
-    { return((short) p ); }
-inline void* IntToPtr( const int i )
-    { return( (void*)(INT_PTR)i ); }
-inline void* UIntToPtr(const unsigned int ui)
-    { return( (void*)(UINT_PTR)ui ); }
-inline void* LongToPtr( const long l )
-    { return( (void*)(LONG_PTR)l ); }
-inline void* ULongToPtr( const unsigned long ul )
-    { return( (void*)(ULONG_PTR)ul ); }
-#endif /* 0_ */
-
-#else /*  !_WIN64 */
-typedef  int INT_PTR, *PINT_PTR;
-typedef  unsigned int UINT_PTR, *PUINT_PTR;
-typedef  long LONG_PTR, *PLONG_PTR;
-typedef  unsigned long ULONG_PTR, *PULONG_PTR;
-typedef unsigned short UHALF_PTR, *PUHALF_PTR;
-typedef short HALF_PTR, *PHALF_PTR;
-typedef unsigned long HANDLE_PTR;
-#endif /* !_WIN64 */
-
-typedef ULONG_PTR SIZE_T, *PSIZE_T;
-typedef LONG_PTR SSIZE_T, *PSSIZE_T;
-typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR;
-typedef __int64 LONG64, *PLONG64;
-typedef __int64 INT64,  *PINT64;
-typedef unsigned __int64 ULONG64, *PULONG64;
-typedef unsigned __int64 DWORD64, *PDWORD64;
-typedef unsigned __int64 UINT64,  *PUINT64;
-#ifdef __cplusplus
-}
-#endif
-#endif /* !RC_INVOKED */
-
-#endif /* _BASETSD_H */
diff --git a/winsup/w32api/include/basetyps.h b/winsup/w32api/include/basetyps.h
deleted file mode 100644
index 9f4e604a9..000000000
--- a/winsup/w32api/include/basetyps.h
+++ /dev/null
@@ -1,166 +0,0 @@
-#ifndef _BASETYPS_H
-#define _BASETYPS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifndef __OBJC__
-# ifdef __cplusplus
-#  define EXTERN_C extern "C"
-# else
-#  define EXTERN_C extern
-# endif  /* __cplusplus */ 
-# ifndef __int64
-#  define __int64 long long
-# endif
-# ifndef __int32
-#  define __int32 long
-# endif
-# ifndef __int16
-#  define __int16 int
-# endif
-# ifndef __int8
-#  define __int8 char
-# endif
-# ifndef __small
-#  define __small char
-# endif
-# ifndef __hyper
-#  define __hyper long long
-# endif
-# define STDMETHODCALLTYPE	__stdcall
-# define STDMETHODVCALLTYPE	__cdecl
-# define STDAPICALLTYPE	__stdcall
-# define STDAPIVCALLTYPE	__cdecl
-# define STDAPI	EXTERN_C HRESULT STDAPICALLTYPE
-# define STDAPI_(t)	EXTERN_C t STDAPICALLTYPE
-# define STDMETHODIMP	HRESULT STDMETHODCALLTYPE
-# define STDMETHODIMP_(t)	t STDMETHODCALLTYPE
-# define STDAPIV	EXTERN_C HRESULT STDAPIVCALLTYPE
-# define STDAPIV_(t)	EXTERN_C t STDAPIVCALLTYPE
-# define STDMETHODIMPV	HRESULT STDMETHODVCALLTYPE
-# define STDMETHODIMPV_(t)	t STDMETHODVCALLTYPE
-# define interface	struct
-# if defined(__cplusplus) && !defined(CINTERFACE)
-#  define STDMETHOD(m)	virtual HRESULT STDMETHODCALLTYPE m
-#  define STDMETHOD_(t,m)	virtual t STDMETHODCALLTYPE m
-#  define PURE	=0
-#  define THIS_
-#  define THIS	void
-/*
-  __attribute__((com_interface)) is obsolete in __GNUC__ >= 3
-  g++ vtables are now COM-compatible by default
-*/
-#  if defined(__GNUC__) &&  __GNUC__ < 3 && !defined(NOCOMATTRIBUTE)
-#   define DECLARE_INTERFACE(i) interface __attribute__((com_interface)) i
-#   define DECLARE_INTERFACE_(i,b) interface __attribute__((com_interface)) i : public b
-#  else
-#   define DECLARE_INTERFACE(i) interface i
-#   define DECLARE_INTERFACE_(i,b) interface i : public b
-#  endif
-# else
-#  define STDMETHOD(m)	HRESULT(STDMETHODCALLTYPE *m)
-#  define STDMETHOD_(t,m)	t(STDMETHODCALLTYPE *m)
-#  define PURE
-#  define THIS_	INTERFACE *,
-#  define THIS	INTERFACE *
-#  ifndef CONST_VTABLE
-#   define CONST_VTABLE
-#  endif
-#  define DECLARE_INTERFACE(i) \
-   typedef interface i { CONST_VTABLE struct i##Vtbl *lpVtbl; } i; \
-   typedef CONST_VTABLE struct i##Vtbl i##Vtbl; \
-   CONST_VTABLE struct i##Vtbl
-#  define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i)
-# endif
-# define BEGIN_INTERFACE
-# define END_INTERFACE
-
-# define FWD_DECL(i) typedef interface i i
-# if defined(__cplusplus) && !defined(CINTERFACE)
-#  define IENUM_THIS(T)
-#  define IENUM_THIS_(T)
-# else
-#  define IENUM_THIS(T) T*
-#  define IENUM_THIS_(T) T*,
-# endif
-# define DECLARE_ENUMERATOR_(I,T) \
-         DECLARE_INTERFACE_(I,IUnknown) \
-         { \
-	  STDMETHOD(QueryInterface)(IENUM_THIS_(I) REFIID,PVOID*) PURE; \
-	  STDMETHOD_(ULONG,AddRef)(IENUM_THIS(I)) PURE; \
-	  STDMETHOD_(ULONG,Release)(IENUM_THIS(I)) PURE; \
-	  STDMETHOD(Next)(IENUM_THIS_(I) ULONG,T*,ULONG*) PURE; \
-	  STDMETHOD(Skip)(IENUM_THIS_(I) ULONG) PURE; \
-	  STDMETHOD(Reset)(IENUM_THIS(I)) PURE; \
-	  STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \
-         }
-# define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T)
-
-#endif /* __OBJC__ */
-
-#ifdef _GUID_DEFINED
-# warning _GUID_DEFINED is deprecated, use GUID_DEFINED instead
-#endif
-
-#if ! (defined _GUID_DEFINED || defined GUID_DEFINED) /* also defined in winnt.h */
-#define GUID_DEFINED
-typedef struct _GUID
-{
-    unsigned long Data1;
-    unsigned short Data2;
-    unsigned short Data3;
-    unsigned char Data4[8];
-} GUID,*REFGUID,*LPGUID;
-#endif /* GUID_DEFINED */
-#ifndef UUID_DEFINED
-#define UUID_DEFINED
-typedef GUID UUID;
-#endif /* UUID_DEFINED */
-typedef GUID IID;
-typedef GUID CLSID;
-typedef CLSID *LPCLSID;
-typedef IID *LPIID;
-typedef IID *REFIID;
-typedef CLSID *REFCLSID;
-typedef GUID FMTID;
-typedef FMTID *REFFMTID;
-typedef unsigned long error_status_t;
-#define uuid_t UUID
-typedef unsigned long PROPID;
-
-#ifndef _REFGUID_DEFINED
-#if defined (__cplusplus) && !defined (CINTERFACE)
-#define REFGUID const GUID&
-#define REFIID const IID&
-#define REFCLSID const CLSID&
-#else
-#define REFGUID const GUID* const
-#define REFIID const IID* const
-#define REFCLSID const CLSID* const
-#endif
-#define _REFGUID_DEFINED
-#define _REFGIID_DEFINED
-#define _REFCLSID_DEFINED
-#endif
-#ifndef GUID_SECTION
-#define GUID_SECTION ".text"
-#endif
-#ifdef __GNUC__
-#define GUID_SECT __attribute__ ((section (GUID_SECTION)))
-#else
-#define GUID_SECT
-#endif
-#if !defined(INITGUID) || (defined(INITGUID) && defined(__cplusplus))
-#define GUID_EXT EXTERN_C
-#else
-#define GUID_EXT
-#endif
-#ifdef INITGUID
-#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) GUID_EXT const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-#define DEFINE_OLEGUID(n,l,w1,w2) DEFINE_GUID(n,l,w1,w2,0xC0,0,0,0,0,0,0,0x46)
-#else
-#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) GUID_EXT const GUID n
-#define DEFINE_OLEGUID(n,l,w1,w2) DEFINE_GUID(n,l,w1,w2,0xC0,0,0,0,0,0,0,0x46)
-#endif
-#endif
diff --git a/winsup/w32api/include/cderr.h b/winsup/w32api/include/cderr.h
deleted file mode 100644
index e9a5b0570..000000000
--- a/winsup/w32api/include/cderr.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _CDERR_H
-#define _CDERR_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define CDERR_DIALOGFAILURE	0xFFFF
-#define CDERR_GENERALCODES	0x0000
-#define CDERR_STRUCTSIZE	0x0001
-#define CDERR_INITIALIZATION	0x0002
-#define CDERR_NOTEMPLATE	0x0003
-#define CDERR_NOHINSTANCE	0x0004
-#define CDERR_LOADSTRFAILURE	0x0005
-#define CDERR_FINDRESFAILURE	0x0006
-#define CDERR_LOADRESFAILURE	0x0007
-#define CDERR_LOCKRESFAILURE	0x0008
-#define CDERR_MEMALLOCFAILURE	0x0009
-#define CDERR_MEMLOCKFAILURE	0x000A
-#define CDERR_NOHOOK	0x000B
-#define CDERR_REGISTERMSGFAIL	0x000C
-#define PDERR_PRINTERCODES	0x1000
-#define PDERR_SETUPFAILURE	0x1001
-#define PDERR_PARSEFAILURE	0x1002
-#define PDERR_RETDEFFAILURE	0x1003
-#define PDERR_LOADDRVFAILURE	0x1004
-#define PDERR_GETDEVMODEFAIL	0x1005
-#define PDERR_INITFAILURE	0x1006
-#define PDERR_NODEVICES	0x1007
-#define PDERR_NODEFAULTPRN	0x1008
-#define PDERR_DNDMMISMATCH	0x1009
-#define PDERR_CREATEICFAILURE	0x100A
-#define PDERR_PRINTERNOTFOUND	0x100B
-#define PDERR_DEFAULTDIFFERENT	0x100C
-#define CFERR_CHOOSEFONTCODES	0x2000
-#define CFERR_NOFONTS	0x2001
-#define CFERR_MAXLESSTHANMIN	0x2002
-#define FNERR_FILENAMECODES	0x3000
-#define FNERR_SUBCLASSFAILURE	0x3001
-#define FNERR_INVALIDFILENAME	0x3002
-#define FNERR_BUFFERTOOSMALL	0x3003
-#define FRERR_FINDREPLACECODES	0x4000
-#define FRERR_BUFFERLENGTHZERO	0x4001
-#define CCERR_CHOOSECOLORCODES	0x5000
-#endif
diff --git a/winsup/w32api/include/cguid.h b/winsup/w32api/include/cguid.h
deleted file mode 100644
index a9f2f8df5..000000000
--- a/winsup/w32api/include/cguid.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef _CGUID_H
-#define _CGUID_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern const IID GUID_NULL;
-extern const IID IID_IRpcChannel;
-extern const IID IID_IRpcStub;
-extern const IID IID_IStubManager;
-extern const IID IID_IRpcProxy;
-extern const IID IID_IProxyManager;
-extern const IID IID_IPSFactory;
-extern const IID IID_IInternalMoniker;
-extern const IID IID_IDfReserved1;
-extern const IID IID_IDfReserved2;
-extern const IID IID_IDfReserved3;
-extern const CLSID CLSID_StdMarshal;
-extern const IID IID_IStub;
-extern const IID IID_IProxy;
-extern const IID IID_IEnumGeneric;
-extern const IID IID_IEnumHolder;
-extern const IID IID_IEnumCallback;
-extern const IID IID_IOleManager;
-extern const IID IID_IOlePresObj;
-extern const IID IID_IDebug;
-extern const IID IID_IDebugStream;
-extern const CLSID CLSID_PSGenObject;
-extern const CLSID CLSID_PSClientSite;
-extern const CLSID CLSID_PSClassObject;
-extern const CLSID CLSID_PSInPlaceActive;
-extern const CLSID CLSID_PSInPlaceFrame;
-extern const CLSID CLSID_PSDragDrop;
-extern const CLSID CLSID_PSBindCtx;
-extern const CLSID CLSID_PSEnumerators;
-extern const CLSID CLSID_StaticMetafile;
-extern const CLSID CLSID_StaticDib;
-extern const CLSID CID_CDfsVolume;
-extern const CLSID CLSID_CCDFormKrnl;
-extern const CLSID CLSID_CCDPropertyPage;
-extern const CLSID CLSID_CCDFormDialog;
-extern const CLSID CLSID_CCDCommandButton;
-extern const CLSID CLSID_CCDComboBox;
-extern const CLSID CLSID_CCDTextBox;
-extern const CLSID CLSID_CCDCheckBox;
-extern const CLSID CLSID_CCDLabel;
-extern const CLSID CLSID_CCDOptionButton;
-extern const CLSID CLSID_CCDListBox;
-extern const CLSID CLSID_CCDScrollBar;
-extern const CLSID CLSID_CCDGroupBox;
-extern const CLSID CLSID_CCDGeneralPropertyPage;
-extern const CLSID CLSID_CCDGenericPropertyPage;
-extern const CLSID CLSID_CCDFontPropertyPage;
-extern const CLSID CLSID_CCDColorPropertyPage;
-extern const CLSID CLSID_CCDLabelPropertyPage;
-extern const CLSID CLSID_CCDCheckBoxPropertyPage;
-extern const CLSID CLSID_CCDTextBoxPropertyPage;
-extern const CLSID CLSID_CCDOptionButtonPropertyPage;
-extern const CLSID CLSID_CCDListBoxPropertyPage;
-extern const CLSID CLSID_CCDCommandButtonPropertyPage;
-extern const CLSID CLSID_CCDComboBoxPropertyPage;
-extern const CLSID CLSID_CCDScrollBarPropertyPage;
-extern const CLSID CLSID_CCDGroupBoxPropertyPage;
-extern const CLSID CLSID_CCDXObjectPropertyPage;
-extern const CLSID CLSID_CStdPropertyFrame;
-extern const CLSID CLSID_CFormPropertyPage;
-extern const CLSID CLSID_CGridPropertyPage;
-extern const CLSID CLSID_CWSJArticlePage;
-extern const CLSID CLSID_CSystemPage;
-extern const CLSID CLSID_IdentityUnmarshal;
-extern const CLSID CLSID_InProcFreeMarshaler;
-extern const CLSID CLSID_Picture_Metafile;
-extern const CLSID CLSID_Picture_EnhMetafile;
-extern const CLSID CLSID_Picture_Dib;
-extern const GUID GUID_TRISTATE;
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/comcat.h b/winsup/w32api/include/comcat.h
deleted file mode 100644
index e264ac999..000000000
--- a/winsup/w32api/include/comcat.h
+++ /dev/null
@@ -1,177 +0,0 @@
-#ifndef _COMCAT_H
-#define _COMCAT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifndef COM_NO_WINDOWS_H
-#include <windows.h>
-#include <ole2.h>
-#endif
-
-#ifndef _RC_INVOKED
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-
-EXTERN_C const IID IID_IEnumGUID;
-typedef interface IEnumGUID *LPENUMGUID;
-
-#undef INTERFACE
-#define INTERFACE IEnumGUID
-DECLARE_INTERFACE_(IEnumGUID,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Next)(THIS_ ULONG,GUID*,ULONG*) PURE;
-	STDMETHOD(Skip)(THIS_ ULONG) PURE;
-	STDMETHOD(Reset)(THIS) PURE;
-	STDMETHOD(Clone)(THIS_ LPENUMGUID*) PURE;
-};
-#undef INTERFACE
-#if (!defined (__cplusplus) || defined (CINTERFACE)) \
-    && defined (COBJMACROS)
-#define IEnumGUID_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IEnumGUID_AddRef(p)             (p)->lpVtbl->AddRef(p)
-#define IEnumGUID_Release(p)            (p)->lpVtbl->Release(p)
-#define IEnumGUID_Next(p,a,b,c)         (p)->lpVtbl->Next(p,a,b,c)
-#define IEnumGUID_Skip(p,a)             (p)->lpVtbl->Skip(p,a)
-#define IEnumGUID_Reset(p)              (p)->lpVtbl->Reset(p)
-#define IEnumGUID_Clone(p,a)            (p)->lpVtbl->Clone(p,a)
-#endif
-
-typedef GUID CATID;
-typedef REFGUID REFCATID;
-#define CATID_NULL GUID_NULL
-#define IsEqualCATID(a, b) IsEqualGUID(a, b)
-
-typedef struct tagCATEGORYINFO {
-    CATID   catid;		/* category identifier for component */
-    LCID    lcid;		/* locale identifier */
-    OLECHAR szDescription[128];	/* description of the category */
-} CATEGORYINFO, *LPCATEGORYINFO;
-
-EXTERN_C const CATID CATID_Insertable;
-EXTERN_C const CATID CATID_Control;
-EXTERN_C const CATID CATID_Programmable;
-EXTERN_C const CATID CATID_IsShortcut;
-EXTERN_C const CATID CATID_NeverShowExt;
-EXTERN_C const CATID CATID_DocObject;
-EXTERN_C const CATID CATID_Printable;
-EXTERN_C const CATID CATID_RequiresDataPathHost;
-EXTERN_C const CATID CATID_PersistsToMoniker;
-EXTERN_C const CATID CATID_PersistsToStorage;
-EXTERN_C const CATID CATID_PersistsToStreamInit;
-EXTERN_C const CATID CATID_PersistsToStream;
-EXTERN_C const CATID CATID_PersistsToMemory;
-EXTERN_C const CATID CATID_PersistsToFile;
-EXTERN_C const CATID CATID_PersistsToPropertyBag;
-EXTERN_C const CATID CATID_InternetAware;
-EXTERN_C const CATID CATID_DesignTimeUIActivatableControl;
-
-#define IEnumCATID IEnumGUID
-#define LPENUMCATID LPENUMGUID
-#define IID_IEnumCATID IID_IEnumGUID
-
-#define IEnumCLSID IEnumGUID
-#define LPENUMCLSID LPENUMGUID
-#define IID_IEnumCLSID IID_IEnumGUID
-
-EXTERN_C const IID IID_ICatInformation;
-typedef interface ICatInformation *LPCATINFORMATION;
-
-EXTERN_C const IID IID_ICatRegister;
-typedef interface ICatRegister *LPCATREGISTER;
-
-EXTERN_C const IID IID_IEnumCATEGORYINFO;
-typedef interface IEnumCATEGORYINFO *LPENUMCATEGORYINFO;
-
-EXTERN_C const CLSID CLSID_StdComponentCategoriesMgr;
-
-#define INTERFACE ICatInformation
-DECLARE_INTERFACE_(ICatInformation,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(EnumCategories)(THIS_ LCID,LPENUMCATEGORYINFO*) PURE;
-	STDMETHOD(GetCategoryDesc)(THIS_ REFCATID,LCID,PWCHAR*) PURE;
-	STDMETHOD(EnumClassesOfCategories)(THIS_ ULONG,CATID*,ULONG,CATID*,LPENUMCLSID*) PURE;
-	STDMETHOD(IsClassOfCategories)(THIS_ REFCLSID,ULONG,CATID*,ULONG,CATID*) PURE;
-	STDMETHOD(EnumImplCategoriesOfClass)(THIS_ REFCLSID,LPENUMCATID*) PURE;
-	STDMETHOD(EnumReqCategoriesOfClass)(THIS_ REFCLSID,LPENUMCATID*) PURE;
-};
-#undef INTERFACE
-#if (!defined (__cplusplus) || defined (CINTERFACE)) \
-    && defined (COBJMACROS)
-#define ICatInformation_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define ICatInformation_AddRef(p)             (p)->lpVtbl->AddRef(p)
-#define ICatInformation_Release(p)            (p)->lpVtbl->Release(p)
-#define ICatInformation_EnumCategories(p,a,b) (p)->lpVtbl->EnumCategories(p,a,b)
-#define ICatInformation_GetCategoryDesc(p,a,b,c) (p)->lpVtbl->GetCategoryDesc(p,a,b,c)
-#define ICatInformation_EnumClassesOfCategories(p,a,b,c,d,e) (p)->lpVtbl->EnumClassesOfCategories(p,a,b,c,d,e)
-#define ICatInformation_IsClassOfCategories(p,a,b,c,d,e) (p)->lpVtbl->IsClassOfCategories(p,a,b,c,d,e)
-#define ICatInformation_EnumImplCategoriesOfClass(p,a,b) (p)->lpVtbl->EnumImplCategoriesOfClass(p,a,b)
-#define ICatInformation_EnumReqCategoriesOfClass(p,a,b) (p)->lpVtbl->EnumReqCategoriesOfClass(p,a,b)
-#endif
-
-#define INTERFACE ICatRegister
-DECLARE_INTERFACE_(ICatRegister,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(RegisterCategories)(THIS_ ULONG,CATEGORYINFO*) PURE;
-	STDMETHOD(UnRegisterCategories)(THIS_ ULONG,CATID*) PURE;
-	STDMETHOD(RegisterClassImplCategories)(THIS_ REFCLSID,ULONG,CATID*) PURE;
-	STDMETHOD(UnRegisterClassImplCategories)(THIS_ REFCLSID,ULONG,CATID*) PURE;
-	STDMETHOD(RegisterClassReqCategories)(THIS_ REFCLSID,ULONG,CATID*) PURE;
-	STDMETHOD(UnRegisterClassReqCategories)(THIS_ REFCLSID,ULONG,CATID*) PURE;
-};
-#undef INTERFACE
-#if (!defined (__cplusplus) || defined (CINTERFACE)) \
-    && defined (COBJMACROS)
-#define ICatRegister_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define ICatRegister_AddRef(p)             (p)->lpVtbl->AddRef(p)
-#define ICatRegister_Release(p)            (p)->lpVtbl->Release(p)
-#define ICatRegister_RegisterCategories(p,a,b) (p)->lpVtbl->RegisterCategories(p,a,b)
-#define ICatRegister_UnRegisterCategories(p,a,b) (p)->lpVtbl->UnRegisterCategories(p,a,b)
-#define ICatRegister_RegisterClassImplCategories(p,a,b,c) (p)->lpVtbl->RegisterClassImplCategories(p,a,b,c)
-#define ICatRegister_UnRegisterClassImplCategories(p,a,b,c) (p)->lpVtbl->UnRegisterClassImplCategories(p,a,b,c)
-#define ICatRegister_RegisterClassReqCategories(p,a,b,c) (p)->lpVtbl->RegisterClassReqCategories(p,a,b,c)
-#define ICatRegister_UnRegisterClassReqCategories(p,a,b,c) (p)->lpVtbl->UnRegisterClassReqCategories(p,a,b,c)
-#endif
-
-EXTERN_C const IID IID_IEnumCATEGORYINFO;
-#undef INTERFACE
-#define INTERFACE IEnumCATEGORYINFO
-DECLARE_INTERFACE_(IEnumCATEGORYINFO,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Next)(THIS_ ULONG,CATEGORYINFO*,ULONG*) PURE;
-	STDMETHOD(Skip)(THIS_ ULONG) PURE;
-	STDMETHOD(Reset)(THIS) PURE;
-	STDMETHOD(Clone)(THIS_ LPENUMCATEGORYINFO*) PURE;
-};
-#undef INTERFACE
-#if (!defined (__cplusplus) || defined (CINTERFACE)) \
-    && defined (COBJMACROS)
-#define IEnumCATEGORYINFO_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
-#define IEnumCATEGORYINFO_AddRef(p)             (p)->lpVtbl->AddRef(p)
-#define IEnumCATEGORYINFO_Release(p)            (p)->lpVtbl->Release(p)
-#define IEnumCATEGORYINFO_Next(p,a,b,c)         (p)->lpVtbl->Next(p,a,b,c)
-#define IEnumCATEGORYINFO_Skip(p,a)             (p)->lpVtbl->Skip(p,a)
-#define IEnumCATEGORYINFO_Reset(p)              (p)->lpVtbl->Reset(p)
-#define IEnumCATEGORYINFO_Clone(p,a)            (p)->lpVtbl->Clone(p,a)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RC_INVOKED */
-#endif
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
deleted file mode 100644
index 064dead66..000000000
--- a/winsup/w32api/include/commctrl.h
+++ /dev/null
@@ -1,3483 +0,0 @@
-#ifndef _COMMCTRL_H
-#define _COMMCTRL_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#include <prsht.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifndef _WIN32_IE
-/* define _WIN32_IE if you really want it */
-#if 0
-#define _WIN32_IE	0x0300
-#endif
-#endif
-
-#ifndef SNDMSG
-#ifdef __cplusplus
-#define SNDMSG ::SendMessage
-#else
-#define SNDMSG SendMessage
-#endif
-#endif /* ifndef SNDMSG */
-
-#define DRAGLISTMSGSTRING TEXT("commctrl_DragListMsg")
-#define HOTKEY_CLASSA	"msctls_hotkey32"
-#define HOTKEY_CLASSW	L"msctls_hotkey32"
-#define PROGRESS_CLASSA	"msctls_progress32"
-#define PROGRESS_CLASSW	L"msctls_progress32"
-#define STATUSCLASSNAMEA	"msctls_statusbar32"
-#define STATUSCLASSNAMEW	L"msctls_statusbar32"
-#define TOOLBARCLASSNAMEA	"ToolbarWindow32"
-#define TOOLBARCLASSNAMEW	L"ToolbarWindow32"
-#define TOOLTIPS_CLASSA	"tooltips_class32"
-#define TOOLTIPS_CLASSW	L"tooltips_class32"
-#define TRACKBAR_CLASSA	"msctls_trackbar32"
-#define TRACKBAR_CLASSW	L"msctls_trackbar32"
-#define UPDOWN_CLASSA	"msctls_updown32"
-#define UPDOWN_CLASSW	L"msctls_updown32"
-#define ANIMATE_CLASSA	"SysAnimate32"
-#define ANIMATE_CLASSW	L"SysAnimate32"
-#define DATETIMEPICK_CLASSW L"SysDateTimePick32"
-#define DATETIMEPICK_CLASSA "SysDateTimePick32"
-#define MONTHCAL_CLASSW L"SysMonthCal32"
-#define MONTHCAL_CLASSA "SysMonthCal32"
-#define REBARCLASSNAMEW L"ReBarWindow32"
-#define REBARCLASSNAMEA "ReBarWindow32"
-#define WC_COMBOBOXEXW	L"ComboBoxEx32"
-#define WC_COMBOBOXEXA	"ComboBoxEx32"
-#define WC_IPADDRESSW	L"SysIPAddress32"
-#define WC_IPADDRESSA	"SysIPAddress32"
-#define WC_LISTVIEWA	"SysListView32"
-#define WC_LISTVIEWW	L"SysListView32"
-#define WC_TABCONTROLA	"SysTabControl32"
-#define WC_TABCONTROLW	L"SysTabControl32"
-#define WC_TREEVIEWA	("SysTreeView32")
-#define WC_TREEVIEWW	L"SysTreeView32"
-#define WC_HEADERA	"SysHeader32"
-#define WC_HEADERW 	L"SysHeader32"
-#define WC_PAGESCROLLERW	L"SysPager"
-#define WC_PAGESCROLLERA	"SysPager"
-#define WC_NATIVEFONTCTLW	L"NativeFontCtl"
-#define WC_NATIVEFONTCTLA	"NativeFontCtl"
-#define WC_BUTTONA	"Button"
-#define WC_BUTTONW	L"Button"
-#define WC_STATICA	"Static"
-#define WC_STATICW	L"Static"
-#define WC_EDITA	"Edit"
-#define WC_EDITW	L"Edit"
-#define WC_LISTBOXA	"ListBox"
-#define WC_LISTBOXW	L"ListBox"
-#define WC_COMBOBOXA	"ComboBox"
-#define WC_COMBOBOXW	L"ComboBox"
-#define WC_SCROLLBARA	"ScrollBar"
-#define WC_SCROLLBARW	L"ScrollBar"
-
-#ifdef UNICODE
-#define HOTKEY_CLASS HOTKEY_CLASSW
-#define PROGRESS_CLASS PROGRESS_CLASSW
-#define STATUSCLASSNAME STATUSCLASSNAMEW
-#define TOOLBARCLASSNAME TOOLBARCLASSNAMEW
-#define TOOLTIPS_CLASS TOOLTIPS_CLASSW
-#define TRACKBAR_CLASS TRACKBAR_CLASSW
-#define UPDOWN_CLASS UPDOWN_CLASSW
-#define ANIMATE_CLASS ANIMATE_CLASSW
-#define DATETIMEPICK_CLASS DATETIMEPICK_CLASSW
-#define MONTHCAL_CLASS MONTHCAL_CLASSW
-#define REBARCLASSNAME REBARCLASSNAMEW
-#define WC_COMBOBOXEX WC_COMBOBOXEXW
-#define WC_HEADER WC_HEADERW
-#define WC_IPADDRESS WC_IPADDRESSW
-#define WC_LISTVIEW WC_LISTVIEWW
-#define WC_TABCONTROL WC_TABCONTROLW
-#define WC_TREEVIEW WC_TREEVIEWW
-#define WC_PAGESCROLLER WC_PAGESCROLLERW
-#define WC_NATIVEFONTCTL WC_NATIVEFONTCTLW
-#define WC_BUTTON WC_BUTTONW
-#define WC_STATIC WC_STATICW
-#define WC_EDIT WC_EDITW
-#define WC_LISTBOX WC_LISTBOXW
-#define WC_COMBOBOX WC_COMBOBOXW
-#define WC_SCROLLBAR WC_SCROLLBARW
-#else
-#define ANIMATE_CLASS ANIMATE_CLASSA
-#define HOTKEY_CLASS HOTKEY_CLASSA
-#define PROGRESS_CLASS PROGRESS_CLASSA
-#define STATUSCLASSNAME STATUSCLASSNAMEA
-#define TOOLBARCLASSNAME TOOLBARCLASSNAMEA
-#define TOOLTIPS_CLASS TOOLTIPS_CLASSA
-#define TRACKBAR_CLASS TRACKBAR_CLASSA
-#define UPDOWN_CLASS UPDOWN_CLASSA
-#define DATETIMEPICK_CLASS DATETIMEPICK_CLASSA
-#define MONTHCAL_CLASS MONTHCAL_CLASSA
-#define REBARCLASSNAME REBARCLASSNAMEA
-#define WC_COMBOBOXEX WC_COMBOBOXEXA
-#define WC_HEADER WC_HEADERA
-#define WC_IPADDRESS WC_IPADDRESSA
-#define WC_LISTVIEW WC_LISTVIEWA
-#define WC_TABCONTROL WC_TABCONTROLA
-#define WC_TREEVIEW WC_TREEVIEWA
-#define WC_PAGESCROLLER WC_PAGESCROLLERA
-#define WC_NATIVEFONTCTL WC_NATIVEFONTCTLA
-#define WC_BUTTON WC_BUTTONA
-#define WC_STATIC WC_STATICA
-#define WC_EDIT WC_EDITA
-#define WC_LISTBOX WC_LISTBOXA
-#define WC_COMBOBOX WC_COMBOBOXA
-#define WC_SCROLLBAR WC_SCROLLBARA
-#endif
-
-#if (_WIN32_IE >= 0x0500)
-#if (_WIN32_WINNT >= 0x0501)
-#define COMCTL32_VERSION 6
-#else
-#define COMCTL32_VERSION 5
-#endif
-#endif
-
-#define LVM_FIRST 0x1000
-#define TV_FIRST 0x1100
-#define HDM_FIRST 0x1200
-#define ACM_OPENA	(WM_USER+100)
-#define ACM_PLAY	(WM_USER+101)
-#define ACM_STOP	(WM_USER+102)
-#define ACM_OPENW	(WM_USER+103)
-#define ACN_START	1
-#define ACN_STOP	2
-#define CBEIF_TEXT	0x00000001
-#define CBEIF_IMAGE	0x00000002
-#define CBEIF_SELECTEDIMAGE	0x00000004
-#define CBEIF_OVERLAY	0x00000008
-#define CBEIF_INDENT	0x00000010
-#define CBEIF_LPARAM	0x00000020
-#define CBEIF_DI_SETITEM	0x10000000
-#define CBEN_INSERTITEM	(CBEN_FIRST - 1)
-#define CBEN_DELETEITEM	(CBEN_FIRST - 2)
-#define CBEN_BEGINEDIT	(CBEN_FIRST - 4)
-#define CBEN_ENDEDITA	(CBEN_FIRST - 5)
-#define CBEN_ENDEDITW	(CBEN_FIRST - 6)
-#define CBENF_KILLFOCUS	1
-#define CBENF_RETURN	2
-#define CBENF_ESCAPE	3
-#define CBENF_DROPDOWN	4
-#define CBEMAXSTRLEN 260
-#define DL_BEGINDRAG	1157
-#define DL_CANCELDRAG	1160
-#define DL_DRAGGING	1158
-#define DL_DROPPED	1159
-#define DL_CURSORSET	0
-#define DL_STOPCURSOR	1
-#define DL_COPYCURSOR	2
-#define DL_MOVECURSOR	3
-#define CCS_TOP	1
-#define CCS_NOMOVEY	2
-#define CCS_BOTTOM	3
-#define CCS_NORESIZE	4
-#define CCS_NOPARENTALIGN	8
-#define CCS_ADJUSTABLE	32
-#define CCS_NODIVIDER	64
-#if (_WIN32_IE >= 0x0300)
-#define CCS_VERT 128
-#define CCS_LEFT 129
-#define CCS_NOMOVEX 130
-#define CCS_RIGHT 131
-#endif
-#define ACS_CENTER	0x0001
-#define ACS_TRANSPARENT	0x0002
-#define ACS_AUTOPLAY	0x0004
-#define ACS_TIMER	0x0008
-#define PGS_VERT	0x00000000
-#define PGS_HORZ	0x00000001
-#define PGS_AUTOSCROLL	0x00000002
-#define PGS_DRAGNDROP	0x00000004
-#define CMB_MASKED	2
-#define MINSYSCOMMAND	SC_SIZE
-#define SBT_OWNERDRAW	0x1000
-#define SBT_NOBORDERS	256
-#define SBT_POPOUT	512
-#define SBT_RTLREADING	1024
-#define SB_SETTEXTA	(WM_USER+1)
-#define SB_SETTEXTW	(WM_USER+11)
-#define SB_GETTEXTA	(WM_USER+2)
-#define SB_GETTEXTW	(WM_USER+13)
-#define SB_GETTEXTLENGTHA	(WM_USER+3)
-#define SB_GETTEXTLENGTHW	(WM_USER+12)
-#define SB_SETPARTS	(WM_USER+4)
-#define SB_GETPARTS	(WM_USER+6)
-#define SB_GETBORDERS	(WM_USER+7)
-#define SB_SETMINHEIGHT	(WM_USER+8)
-#define SB_SIMPLE	(WM_USER+9)
-#define SB_GETRECT	(WM_USER+10)
-#define MSGF_COMMCTRL_BEGINDRAG	0x4200
-#define MSGF_COMMCTRL_SIZEHEADER	0x4201
-#define MSGF_COMMCTRL_DRAGSELECT	0x4202
-#define MSGF_COMMCTRL_TOOLBARCUST	0x4203
-#define ILC_COLOR 0
-#define ILC_COLOR4 4
-#define ILC_COLOR8 8
-#define ILC_COLOR16 16
-#define ILC_COLOR24 24
-#define ILC_COLOR32 32
-#define ILC_COLORDDB 254
-#define ILC_MASK 1
-#define ILC_PALETTE 2048
-#define ILCF_MOVE 0
-#define ILCF_SWAP 1
-#define ILS_NORMAL 0
-#define ILS_GLOW 1
-#define ILS_SHADOW 2
-#define ILS_SATURATE 4
-#define ILS_ALPHA 8
-#define ILD_BLEND25 2
-#define ILD_BLEND50 4
-#define ILD_SELECTED 4
-#define ILD_BLEND 4
-#define ILD_FOCUS 2
-#define ILD_MASK 16
-#define ILD_NORMAL 0
-#define ILD_TRANSPARENT 1
-#define ILD_IMAGE 0x0020
-#define ILD_ROP 0x0040
-#define ILD_OVERLAYMASK 0x0F00
-#define ILD_PRESERVEALPHA 0x1000
-#define ILD_SCALE 0x2000
-#define ILD_DPISCALE 0x4000
-#define HDS_HORZ	0
-#define HDS_BUTTONS	2
-#define HDS_HIDDEN	8
-#if (_WIN32_IE > 0x0300)
-#define HDS_HOTTRACK	4
-#define HDS_DRAGDROP	0x0040
-#define HDS_FULLDRAG	0x0080
-#endif /* _WIN32_IE > 0x0300 */
-#if (_WIN32_IE >= 0x0500)
-#define HDS_FILTERBAR	0x0100
-#endif /* _WIN32_IE >= 0x0500 */
-#define NM_FIRST	0
-#define NM_LAST	((UINT)-99)
-#define LVN_FIRST	((UINT)-100)
-#define LVN_LAST	((UINT)-199)
-#define HDN_FIRST	((UINT)-300)
-#define HDN_LAST	((UINT)-399)
-#define TVN_FIRST	((UINT)-400)
-#define TVN_LAST	((UINT)-499)
-#define TTN_FIRST	((UINT)-520)
-#define TTN_LAST	((UINT)-549)
-#define TCN_FIRST	((UINT)-550)
-#define TCN_LAST	((UINT)-580)
-#ifndef CDN_FIRST
-#define CDN_FIRST	((UINT)-601) /* also in commdlg.h */
-#define CDN_LAST	((UINT)-699)
-#endif
-#define TBN_FIRST	((UINT)-700)
-#define TBN_LAST	((UINT)-720)
-#define UDN_FIRST	((UINT)-721)
-#define UDN_LAST	((UINT)-740)
-#if (_WIN32_IE >= 0x0300)
-#define RBN_FIRST	((UINT)-831)
-#define RBN_LAST	((UINT)-859)
-#define MCN_FIRST	((UINT)-750)
-#define MCN_LAST	((UINT)-759)
-#define DTN_FIRST	((UINT)-760)
-#define DTN_LAST	((UINT)-799)
-#define CBEN_FIRST	((UINT)-800)
-#define CBEN_LAST	((UINT)-830)
-#endif /* _WIN32_IE */
-#if (_WIN32_IE >= 0x0400)
-#define IPN_FIRST	((UINT)-860)
-#define IPN_LAST	((UINT)-879)
-#define IPN_FIELDCHANGED	(IPN_FIRST-0)
-#define SBN_FIRST	((UINT)-880U)
-#define SBN_LAST	((UINT)-899U)
-#define PGN_FIRST	((UINT)-900U)
-#define PGN_LAST	((UINT)-950U)
-#define PGN_SCROLL	(PGN_FIRST-1)
-#define PGN_CALCSIZE	(PGN_FIRST-2)
-#endif /* _WIN32_IE >= 0x0400 */
-#define HDI_WIDTH	1
-#define HDI_HEIGHT	1
-#define HDI_TEXT	2
-#define HDI_FORMAT	4
-#define HDI_LPARAM	8
-#define HDI_BITMAP	16
-#if (_WIN32_IE >= 0x0300)
-#define HDI_IMAGE	32
-#define HDI_DI_SETITEM	64
-#define HDI_ORDER	128
-#endif
-#define CBES_EX_NOEDITIMAGE	0x00000001
-#define CBES_EX_NOEDITIMAGEINDENT	0x00000002
-#define CBES_EX_PATHWORDBREAKPROC	0x00000004
-#if (_WIN32_IE >= 0x0400)
-#define CBES_EX_NOSIZELIMIT	0x00000008
-#define CBES_EX_CASESENSITIVE	0x00000010
-#define CBEN_GETDISPINFOA	(CBEN_FIRST - 0)
-#define CBEN_GETDISPINFOW	(CBEN_FIRST - 7)
-#define CBEN_DRAGBEGINA	(CBEN_FIRST - 8)
-#define CBEN_DRAGBEGINW	(CBEN_FIRST - 9)
-#endif /* _WIN32_IE >= 0x0400 */
-#if (_WIN32_IE >= 0x0500)
-#define HDI_FILTER	256
-#endif
-#define HDF_LEFT	0
-#define HDF_RIGHT	1
-#define HDF_CENTER	2
-#define HDF_JUSTIFYMASK	3
-#define HDF_RTLREADING	4
-#define HDF_OWNERDRAW	0x8000
-#define HDF_STRING	0x4000
-#define HDF_BITMAP	0x2000
-#if (_WIN32_IE >= 0x0300)
-#define HDF_BITMAP_ON_RIGHT	0x1000
-#define HDF_IMAGE	0x0800
-#endif
-#define HDM_GETITEMCOUNT	HDM_FIRST
-#define HDM_INSERTITEMA	(HDM_FIRST+1)
-#define HDM_INSERTITEMW	(HDM_FIRST+10)
-#define HDM_DELETEITEM	(HDM_FIRST+2)
-#define HDM_GETITEMA	(HDM_FIRST+3)
-#define HDM_GETITEMW	(HDM_FIRST+11)
-#define HDM_SETITEMA	(HDM_FIRST+4)
-#define HDM_SETITEMW	(HDM_FIRST+12)
-#define HDM_LAYOUT	(HDM_FIRST+5)
-#if (_WIN32_IE >= 0x0300)
-#define HDM_GETITEMRECT (HDM_FIRST+7)
-#define HDM_SETIMAGELIST	(HDM_FIRST+8)
-#define HDM_GETIMAGELIST	(HDM_FIRST+9)
-#define HDM_ORDERTOINDEX	(HDM_FIRST+15)
-#define HDM_CREATEDRAGIMAGE	(HDM_FIRST+16)
-#define HDM_GETORDERARRAY	(HDM_FIRST+17)
-#define HDM_SETORDERARRAY	(HDM_FIRST+18)
-#define HDM_SETHOTDIVIDER	(HDM_FIRST+19)
-#endif
-#if (_WIN32_IE >= 0x0400)
-#define HDM_GETUNICODEFORMAT	CCM_GETUNICODEFORMAT
-#define HDM_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
-#endif
-#define HHT_NOWHERE	1
-#define HHT_ONHEADER	2
-#define HHT_ONDIVIDER	4
-#define HHT_ONDIVOPEN	8
-#define HHT_ABOVE	256
-#define HHT_BELOW	512
-#define HHT_TORIGHT	1024
-#define HHT_TOLEFT	2048
-#define HDM_HITTEST	(HDM_FIRST+6)
-#define HDN_ITEMCHANGINGA	(HDN_FIRST-0)
-#define HDN_ITEMCHANGINGW	(HDN_FIRST-20)
-#define HDN_ITEMCHANGEDA	(HDN_FIRST-1)
-#define HDN_ITEMCHANGEDW	(HDN_FIRST-21)
-#define HDN_ITEMCLICKA	(HDN_FIRST-2)
-#define HDN_ITEMCLICKW	(HDN_FIRST-22)
-#define HDN_ITEMDBLCLICKA	(HDN_FIRST-3)
-#define HDN_ITEMDBLCLICKW	(HDN_FIRST-23)
-#define HDN_DIVIDERDBLCLICKA	(HDN_FIRST-5)
-#define HDN_DIVIDERDBLCLICKW	(HDN_FIRST-25)
-#define HDN_BEGINTRACKA	(HDN_FIRST-6)
-#define HDN_BEGINTRACKW	(HDN_FIRST-26)
-#define HDN_ENDTRACKA	(HDN_FIRST-7)
-#define HDN_ENDTRACKW	(HDN_FIRST-27)
-#define HDN_TRACKA	(HDN_FIRST-8)
-#define HDN_TRACKW	(HDN_FIRST-28)
-#if _WIN32_IE >= 0x0300
-#define HDN_ENDDRAG	(HDN_FIRST-11)
-#define HDN_BEGINDRAG	(HDN_FIRST-10)
-#define HDN_GETDISPINFOA (HDN_FIRST-9)
-#define HDN_GETDISPINFOW (HDN_FIRST-29)
-#endif
-#if (_WIN32_IE >= 0x0400)
-#define HICF_OTHER 0x00
-#define HICF_MOUSE 0x01
-#define HICF_ARROWKEYS 0x02
-#define HICF_ACCELERATOR 0x04
-#define HICF_DUPACCEL 0x08
-#define HICF_ENTERING 0x10
-#define HICF_LEAVING 0x20
-#define HICF_RESELECT 0x40
-#define HICF_LMOUSE 0x80
-#define HICF_TOGGLEDROPDOWN 0x100
-#endif /* _WIN32_IE >= 0x0400 */
-#define IPM_CLEARADDRESS	(WM_USER+100)
-#define IPM_SETADDRESS	(WM_USER+101)
-#define IPM_GETADDRESS	(WM_USER+102)
-#define IPM_SETRANGE	(WM_USER+103)
-#define IPM_SETFOCUS	(WM_USER+104)
-#define IPM_ISBLANK	(WM_USER+105)
-#if (_WIN32_IE >= 0x0500)
-#define I_INDENTCALLBACK (-1)
-#define I_IMAGENONE (-2)
-#endif
-#define CMB_MASKED 2
-#define TBSTATE_CHECKED	1
-#define TBSTATE_PRESSED	2
-#define TBSTATE_ENABLED	4
-#define TBSTATE_HIDDEN	8
-#define TBSTATE_INDETERMINATE	16
-#define TBSTATE_WRAP	32
-#if (_WIN32_IE >= 0x0400)
-#define TBSTATE_MARKED	0x0080
-#endif
-#define TBSTYLE_BUTTON	0
-#define TBSTYLE_SEP	1
-#define TBSTYLE_CHECK	2
-#define TBSTYLE_GROUP	4
-#define TBSTYLE_CHECKGROUP	(TBSTYLE_GROUP|TBSTYLE_CHECK)
-#if (_WIN32_IE >= 0x0300)
-#define TBSTYLE_DROPDOWN	8
-#endif
-#if (_WIN32_IE >= 0x0400)
-#define TBSTYLE_AUTOSIZE	16
-#define TBSTYLE_NOPREFIX	32
-#endif
-#define TBSTYLE_TOOLTIPS	256
-#define TBSTYLE_WRAPABLE	512
-#define TBSTYLE_ALTDRAG	1024
-#if (_WIN32_IE >= 0x0300)
-#define TBSTYLE_FLAT 2048
-#define TBSTYLE_LIST 4096
-#define TBSTYLE_CUSTOMERASE 8192
-#endif
-#if (_WIN32_IE >= 0x0400)
-#define TBSTYLE_REGISTERDROP	0x4000
-#define TBSTYLE_TRANSPARENT	0x8000
-#define TBSTYLE_EX_DRAWDDARROWS	0x00000001
-#endif /* _WIN32_IE >= 0x0400 */
-#if (_WIN32_IE >= 0x0501)
-#define TBSTYLE_EX_MIXEDBUTTONS 8
-#define TBSTYLE_EX_HIDECLIPPEDBUTTONS 16
-#endif /* _WIN32_IE >= 0x0501 */
-#if (_WIN32_WINNT >= 0x0501)
-#define TBSTYLE_EX_DOUBLEBUFFER	0x80
-#endif /* _WIN32_WINNT >= 0x0501 */
-#if (_WIN32_IE >= 0x0500)
-#define BTNS_BUTTON	TBSTYLE_BUTTON
-#define BTNS_SEP	TBSTYLE_SEP
-#define BTNS_CHECK	TBSTYLE_CHECK
-#define BTNS_GROUP	TBSTYLE_GROUP
-#define BTNS_CHECKGROUP	TBSTYLE_CHECKGROUP
-#define BTNS_DROPDOWN	TBSTYLE_DROPDOWN
-#define BTNS_AUTOSIZE	TBSTYLE_AUTOSIZE
-#define BTNS_NOPREFIX	TBSTYLE_NOPREFIX
-#define BTNS_WHOLEDROPDOWN	0x0080
-#endif  /* _WIN32_IE >= 0x0500 */
-#if _WIN32_IE >= 0x0501
-#define BTNS_SHOWTEXT	0x0040
-#endif
-#if (_WIN32_IE >= 0x0400)
-#define TBCDRF_NOEDGES	0x10000
-#define TBCDRF_HILITEHOTTRACK	0x20000
-#define TBCDRF_NOOFFSET	0x40000
-#define TBCDRF_NOMARK	0x80000
-#define TBCDRF_NOETCHEDEFFECT	0x100000
-#endif /* _WIN32_IE >= 0x0400 */
-#define HINST_COMMCTRL	((HINSTANCE)-1)
-#define IDB_STD_SMALL_COLOR	0
-#define IDB_STD_LARGE_COLOR	1
-#define IDB_VIEW_SMALL_COLOR	4
-#define IDB_VIEW_LARGE_COLOR	5
-#if (_WIN32_IE >= 0x0300)
-#define IDB_HIST_SMALL_COLOR	8
-#define IDB_HIST_LARGE_COLOR	9
-#endif
-#define STD_CUT	0
-#define STD_COPY	1
-#define STD_PASTE	2
-#define STD_UNDO	3
-#define STD_REDOW	4
-#define STD_DELETE	5
-#define STD_FILENEW	6
-#define STD_FILEOPEN	7
-#define STD_FILESAVE	8
-#define STD_PRINTPRE	9
-#define STD_PROPERTIES	10
-#define STD_HELP	11
-#define STD_FIND	12
-#define STD_REPLACE	13
-#define STD_PRINT	14
-#define VIEW_LARGEICONS	0
-#define VIEW_SMALLICONS	1
-#define VIEW_LIST	2
-#define VIEW_DETAILS	3
-#define VIEW_SORTNAME	4
-#define VIEW_SORTSIZE	5
-#define VIEW_SORTDATE	6
-#define VIEW_SORTTYPE	7
-#define VIEW_PARENTFOLDER	8
-#define VIEW_NETCONNECT	9
-#define VIEW_NETDISCONNECT	10
-#define VIEW_NEWFOLDER	11
-#define TB_ENABLEBUTTON	(WM_USER+1)
-#define TB_CHECKBUTTON	(WM_USER+2)
-#define TB_PRESSBUTTON	(WM_USER+3)
-#define TB_HIDEBUTTON	(WM_USER+4)
-#define TB_INDETERMINATE	(WM_USER+5)
-#define TB_ISBUTTONENABLED	(WM_USER+9)
-#define TB_ISBUTTONCHECKED	(WM_USER+10)
-#define TB_ISBUTTONPRESSED	(WM_USER+11)
-#define TB_ISBUTTONHIDDEN	(WM_USER+12)
-#define TB_ISBUTTONINDETERMINATE	(WM_USER+13)
-#if (_WIN32_IE >= 0x0400)
-#define TB_ISBUTTONHIGHLIGHTED	(WM_USER+14)
-#endif
-#define TB_SETSTATE	(WM_USER+17)
-#define TB_GETSTATE	(WM_USER+18)
-#define TB_ADDBITMAP	(WM_USER+19)
-#if (_WIN32_IE >= 0x0400)
-#define TB_ADDBUTTONSA	(WM_USER+20)
-#define TB_INSERTBUTTONA	(WM_USER+21)
-#else
-#define TB_ADDBUTTONS	(WM_USER+20)
-#define TB_INSERTBUTTON	(WM_USER+21)
-#endif
-#define TB_DELETEBUTTON	(WM_USER+22)
-#define TB_GETBUTTON	(WM_USER+23)
-#define TB_BUTTONCOUNT	(WM_USER+24)
-#define TB_COMMANDTOINDEX	(WM_USER+25)
-#define TB_SAVERESTOREA	(WM_USER+26)
-#define TB_SAVERESTOREW	(WM_USER+76)
-#define TB_CUSTOMIZE	(WM_USER+27)
-#define TB_ADDSTRINGA	(WM_USER+28)
-#define TB_ADDSTRINGW	(WM_USER+77)
-#define TB_GETITEMRECT	(WM_USER+29)
-#define TB_BUTTONSTRUCTSIZE	(WM_USER+30)
-#define TB_SETBUTTONSIZE	(WM_USER+31)
-#define TB_SETBITMAPSIZE	(WM_USER+32)
-#define TB_AUTOSIZE	(WM_USER+33)
-#define TB_GETTOOLTIPS	(WM_USER+35)
-#define TB_SETTOOLTIPS	(WM_USER+36)
-#define TB_SETPARENT	(WM_USER+37)
-#define TB_SETROWS	(WM_USER+39)
-#define TB_GETROWS	(WM_USER+40)
-#define TB_GETBITMAPFLAGS	(WM_USER+41)
-#define TB_SETCMDID	(WM_USER+42)
-#define TB_CHANGEBITMAP	(WM_USER+43)
-#define TB_GETBITMAP	(WM_USER+44)
-#define TB_GETBUTTONTEXTA	(WM_USER+45)
-#define TB_GETBUTTONTEXTW	(WM_USER+75)
-#define TB_REPLACEBITMAP	(WM_USER+46)
-#define TB_GETBUTTONSIZE	(WM_USER+58)
-#define TB_SETBUTTONWIDTH	(WM_USER+59)
-#if (_WIN32_IE >= 0x0300)
-#define TB_SETINDENT	(WM_USER+47)
-#define TB_SETIMAGELIST	(WM_USER+48)
-#define TB_GETIMAGELIST	(WM_USER+49)
-#define TB_LOADIMAGES	(WM_USER+50)
-#define TB_GETRECT	(WM_USER+51)
-#define TB_SETHOTIMAGELIST	(WM_USER+52)
-#define TB_GETHOTIMAGELIST	(WM_USER+53)
-#define TB_SETDISABLEDIMAGELIST (WM_USER+54)
-#define TB_GETDISABLEDIMAGELIST	(WM_USER+55)
-#define TB_SETSTYLE	(WM_USER+56)
-#define TB_GETSTYLE	(WM_USER+57)
-#define TB_GETBUTTONSIZE	(WM_USER+58)
-#define TB_SETBUTTONWIDTH	(WM_USER+59)
-#define TB_SETMAXTEXTROWS	(WM_USER+60)
-#define TB_GETTEXTROWS	(WM_USER+61)
-#endif
-#if _WIN32_IE >= 0x400
-#define TB_GETOBJECT	(WM_USER+62)
-#define TB_GETBUTTONINFOW	(WM_USER+63)
-#define TB_SETBUTTONINFOW	(WM_USER+64)
-#define TB_GETBUTTONINFOA	(WM_USER+65)
-#define TB_SETBUTTONINFOA	(WM_USER+66)
-#define TB_INSERTBUTTONW	(WM_USER+67)
-#define TB_ADDBUTTONSW	(WM_USER+68)
-#define TB_HITTEST	(WM_USER+69)
-#define TB_SETEXTENDEDSTYLE	(WM_USER+84)
-#define TB_GETEXTENDEDSTYLE	(WM_USER+85)
-#define TB_SETDRAWTEXTFLAGS	(WM_USER+70)
-#define TB_GETHOTITEM	(WM_USER+71)
-#define TB_SETHOTITEM	(WM_USER+72)
-#define TB_SETANCHORHIGHLIGHT	(WM_USER+73)
-#define TB_GETANCHORHIGHLIGHT	(WM_USER+74)
-#define TB_MAPACCELERATORA	(WM_USER+78)
-#define TB_GETINSERTMARK	(WM_USER+79)
-#define TB_SETINSERTMARK	(WM_USER+80)
-#define TB_INSERTMARKHITTEST	(WM_USER+81)
-#define TB_MOVEBUTTON		(WM_USER+82)
-#define TB_GETMAXSIZE		(WM_USER+83)
-#define TB_SETEXTENDEDSTYLE	(WM_USER+84)
-#define TB_GETEXTENDEDSTYLE	(WM_USER+85)
-#define TB_GETPADDING		(WM_USER+86)
-#define TB_SETPADDING		(WM_USER+87)
-#define TB_SETINSERTMARKCOLOR	(WM_USER+88)
-#define TB_GETINSERTMARKCOLOR	(WM_USER+89)
-#define TB_MAPACCELERATORW	(WM_USER+90)
-#define TB_SETCOLORSCHEME	CCM_SETCOLORSCHEME
-#define TB_GETCOLORSCHEME	CCM_GETCOLORSCHEME
-#define TB_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
-#define TB_GETUNICODEFORMAT	CCM_GETUNICODEFORMAT
-#endif
-#define TBBF_LARGE 1
-#define TBN_GETBUTTONINFOA	(TBN_FIRST-0)
-#define TBN_BEGINDRAG	(TBN_FIRST-1)
-#define TBN_ENDDRAG	(TBN_FIRST-2)
-#define TBN_BEGINADJUST	(TBN_FIRST-3)
-#define TBN_ENDADJUST	(TBN_FIRST-4)
-#define TBN_RESET	(TBN_FIRST-5)
-#define TBN_QUERYINSERT	(TBN_FIRST-6)
-#define TBN_QUERYDELETE	(TBN_FIRST-7)
-#define TBN_TOOLBARCHANGE	(TBN_FIRST-8)
-#define TBN_CUSTHELP	(TBN_FIRST-9)
-#if (_WIN32_IE >= 0x0300)
-#define TBN_DROPDOWN	(TBN_FIRST-10)
-#endif
-#if (_WIN32_IE >= 0x0400)
-#define TBN_HOTITEMCHANGE	(TBN_FIRST-13)
-#define TBN_DRAGOUT	(TBN_FIRST-14)
-#define TBN_DELETINGBUTTON	(TBN_FIRST-15)
-#define TBN_GETDISPINFOA	(TBN_FIRST-16)
-#define TBN_GETDISPINFOW	(TBN_FIRST-17)
-#define TBN_GETINFOTIPA	(TBN_FIRST-18)
-#define TBN_GETINFOTIPW	(TBN_FIRST-19)
-#define TBN_GETBUTTONINFOW	(TBN_FIRST-20)
-#endif
-#if (_WIN32_IE >= 0x0500)
-#define TBN_RESTORE	(TBN_FIRST-21)
-#define TBN_SAVE	(TBN_FIRST-22)
-#define TBN_INITCUSTOMIZE	(TBN_FIRST-23)
-#define TBNRF_HIDEHELP	1
-#define TBNRF_ENDCUSTOMIZE	2
-#define TBNF_IMAGE	1
-#define TBNF_TEXT	2
-#define TBNF_DI_SETITEM	0x10000000
-#endif /* _WIN32_IE >= 0x0500 */
-#define TTS_ALWAYSTIP	1
-#define TTS_NOPREFIX	2
-#if( _WIN32_IE >= 0x0500 )
-#define TTS_NOANIMATE	0x10
-#define TTS_NOFADE	0x20
-#define TTS_BALLOON	0x40
-#define TTS_CLOSE	0x80
-#endif /* _WIN32_IE >= 0x0500 */
-#define TTF_IDISHWND	1
-#define TTF_CENTERTIP	2
-#define TTF_RTLREADING	4
-#define TTF_SUBCLASS	16
-#if (_WIN32_IE >= 0x0300)
-#define TTF_TRACK 0x0020
-#define TTF_ABSOLUTE 0x0080
-#define TTF_TRANSPARENT 0x0100
-#if (_WIN32_IE >= 0x0501)
-#define TTF_PARSELINKS 0x1000
-#endif
-#define TTF_DI_SETITEM 0x8000
-#define TBCD_TICS 1
-#define TBCD_THUMB 2
-#define TBCD_CHANNEL 3
-#endif /* _WIN32_IE >= 0x0300 */
-#if (_WIN32_IE >= 0x0400)
-#define TBDDRET_DEFAULT 0
-#define TBDDRET_NODEFAULT 1
-#define TBDDRET_TREATPRESSED 2
-#define TBIMHT_AFTER 1
-#define TBIMHT_BACKGROUND 2
-#endif
-#define TTDT_AUTOMATIC	0
-#define TTDT_RESHOW	1
-#define TTDT_AUTOPOP	2
-#define TTDT_INITIAL	3
-#define TTM_ACTIVATE	(WM_USER+1)
-#define TTM_SETDELAYTIME	(WM_USER+3)
-#define TTM_ADDTOOLA	(WM_USER+4)
-#define TTM_ADDTOOLW	(WM_USER+50)
-#define TTM_DELTOOLA	(WM_USER+5)
-#define TTM_DELTOOLW	(WM_USER+51)
-#define TTM_NEWTOOLRECTA	(WM_USER+6)
-#define TTM_NEWTOOLRECTW	(WM_USER+52)
-#define TTM_RELAYEVENT	(WM_USER+7)
-#define TTM_GETTOOLINFOA	(WM_USER+8)
-#define TTM_GETTOOLINFOW	(WM_USER+53)
-#define TTM_SETTOOLINFOA	(WM_USER+9)
-#define TTM_SETTOOLINFOW	(WM_USER+54)
-#define TTM_HITTESTA	(WM_USER+10)
-#define TTM_HITTESTW	(WM_USER+55)
-#define TTM_GETTEXTA	(WM_USER+11)
-#define TTM_GETTEXTW	(WM_USER+56)
-#define TTM_UPDATETIPTEXTA	(WM_USER+12)
-#define TTM_UPDATETIPTEXTW	(WM_USER+57)
-#define TTM_GETTOOLCOUNT	(WM_USER+13)
-#define TTM_ENUMTOOLSA	(WM_USER+14)
-#define TTM_ENUMTOOLSW	(WM_USER+58)
-#define TTM_GETCURRENTTOOLA	(WM_USER+15)
-#define TTM_GETCURRENTTOOLW	(WM_USER+59)
-#define TTM_WINDOWFROMPOINT	(WM_USER+16)
-#if (_WIN32_IE >= 0x0300)
-#define TTM_TRACKACTIVATE	  (WM_USER+17)  
-#define TTM_TRACKPOSITION	  (WM_USER+18)  
-#define TTM_SETTIPBKCOLOR	  (WM_USER+19)
-#define TTM_SETTIPTEXTCOLOR	(WM_USER+20)
-#define TTM_GETDELAYTIME	   (WM_USER+21)
-#define TTM_GETTIPBKCOLOR	  (WM_USER+22)
-#define TTM_GETTIPTEXTCOLOR	(WM_USER+23)
-#define TTM_SETMAXTIPWIDTH	 (WM_USER+24)
-#define TTM_GETMAXTIPWIDTH	 (WM_USER+25)
-#define TTM_SETMARGIN		 (WM_USER+26)  
-#define TTM_GETMARGIN		 (WM_USER+27)  
-#define TTM_POP			  (WM_USER+28)
-#endif /* _WIN32_IE */
-#if (_WIN32_IE >= 0x0400)			/* IE4.0 ??? */
-#define TTM_UPDATE		    (WM_USER+29)
-#define TTM_GETBUBBLESIZE	(WM_USER+30)
-#define TTM_ADJUSTRECT	(WM_USER+31)
-#define TTM_SETTITLEA	(WM_USER+32)
-#define TTM_SETTITLEW	(WM_USER+33)
-#endif
-#define TTN_GETDISPINFOA    (TTN_FIRST - 0)
-#define TTN_GETDISPINFOW    (TTN_FIRST - 10)
-#define TTN_NEEDTEXTA	TTN_GETDISPINFOA
-#define TTN_NEEDTEXTW	TTN_GETDISPINFOW
-#define TTN_SHOW	(TTN_FIRST-1)
-#define TTN_POP	(TTN_FIRST-2)
-#define UD_MAXVAL	0x7fff
-#define UD_MINVAL	(-UD_MAXVAL)
-#define UDN_DELTAPOS (UDN_FIRST-1)
-#define UDS_WRAP	1
-#define UDS_SETBUDDYINT	2
-#define UDS_ALIGNRIGHT	4
-#define UDS_ALIGNLEFT	8
-#define UDS_AUTOBUDDY	16
-#define UDS_ARROWKEYS	32
-#define UDS_HORZ	64
-#define UDS_NOTHOUSANDS	128
-#if ( _WIN32_IE >= 0x0300 )
-#define UDS_HOTTRACK	0x0100
-#endif /* _WIN32_IE >= 0x0300 */
-#define UDM_SETRANGE	(WM_USER+101)
-#define UDM_GETRANGE	(WM_USER+102)
-#define UDM_SETPOS	(WM_USER+103)
-#define UDM_GETPOS	(WM_USER+104)
-#define UDM_SETBUDDY	(WM_USER+105)
-#define UDM_GETBUDDY	(WM_USER+106)
-#define UDM_SETACCEL	(WM_USER+107)
-#define UDM_GETACCEL	(WM_USER+108)
-#define UDM_SETBASE	(WM_USER+109)
-#define UDM_GETBASE	(WM_USER+110)
-#if (_WIN32_IE >= 0x0400)
-#define UDM_SETRANGE32	(WM_USER+111)
-#define UDM_GETRANGE32	(WM_USER+112)
-#define UDM_SETPOS32	(WM_USER+113)
-#define UDM_GETPOS32	(WM_USER+114)
-#endif
-#if (_WIN32_IE >= 0x0500)
-#define UDM_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
-#define UDM_GETUNICODEFORMAT	CCM_GETUNICODEFORMAT
-#endif
-#define SB_SETTEXTA	(WM_USER+1)
-#define SB_SETTEXTW	(WM_USER+11)
-#define SB_GETTEXTA	(WM_USER+2)
-#define SB_GETTEXTW	(WM_USER+13)
-#define SB_GETTEXTLENGTHA	(WM_USER+3)
-#define SB_GETTEXTLENGTHW	(WM_USER+12)
-#define SB_SETPARTS	(WM_USER+4)
-#define SB_GETPARTS	(WM_USER+6)
-#define SB_GETBORDERS	(WM_USER+7)
-#define SB_SETMINHEIGHT	(WM_USER+8)
-#define SB_SIMPLE	(WM_USER+9)
-#define SB_GETRECT	(WM_USER+10)
-#define SBT_OWNERDRAW	0x1000
-#define SBT_NOBORDERS	256
-#define SBT_POPOUT	512
-#define SBT_RTLREADING	1024
-#if( _WIN32_IE >= 0x0400 )
-#define SBT_TOOLTIPS	0x0800
-#define SBN_SIMPLEMODECHANGE	(SBN_FIRST)
-#endif /* _WIN32_IE >= 0x0400 */
-#define TBS_AUTOTICKS	1
-#define TBS_VERT	2
-#define TBS_HORZ	0
-#define TBS_TOP	4
-#define TBS_BOTTOM	0
-#define TBS_LEFT	4
-#define TBS_RIGHT	0
-#define TBS_BOTH	8
-#define TBS_NOTICKS	16
-#define TBS_ENABLESELRANGE	32
-#define TBS_FIXEDLENGTH	64
-#define TBS_NOTHUMB	128
-#if (_WIN32_IE >= 0x0300)
-#define TBS_TOOLTIPS 0x0100
-#define TBTS_TOP 0
-#define TBTS_LEFT 1
-#define TBTS_BOTTOM 2
-#define TBTS_RIGHT 3
-#endif
-#if (_WIN32_IE >= 0x0500)
-#define TBS_REVERSED 0x0200
-#endif
-#if (_WIN32_IE >= 0x0501)
-#define TBS_DOWNISLEFT 0x0400
-#endif
-#if _WIN32_IE >= 0x400
-#define TBIF_BYINDEX 0x80000000
-#define TBIF_COMMAND 32
-#define TBIF_IMAGE 1
-#define TBIF_LPARAM 16
-#define TBIF_SIZE 64
-#define TBIF_STATE 4
-#define TBIF_STYLE 8
-#define TBIF_TEXT 2
-#endif
-#define TBM_GETPOS	(WM_USER)
-#define TBM_GETRANGEMIN	(WM_USER+1)
-#define TBM_GETRANGEMAX	(WM_USER+2)
-#define TBM_GETTIC	(WM_USER+3)
-#define TBM_SETTIC	(WM_USER+4)
-#define TBM_SETPOS	(WM_USER+5)
-#define TBM_SETRANGE	(WM_USER+6)
-#define TBM_SETRANGEMIN	(WM_USER+7)
-#define TBM_SETRANGEMAX	(WM_USER+8)
-#define TBM_CLEARTICS	(WM_USER+9)
-#define TBM_SETSEL	(WM_USER+10)
-#define TBM_SETSELSTART	(WM_USER+11)
-#define TBM_SETSELEND	(WM_USER+12)
-#define TBM_GETPTICS	(WM_USER+14)
-#define TBM_GETTICPOS	(WM_USER+15)
-#define TBM_GETNUMTICS	(WM_USER+16)
-#define TBM_GETSELSTART	(WM_USER+17)
-#define TBM_GETSELEND	(WM_USER+18)
-#define TBM_CLEARSEL	(WM_USER+19)
-#define TBM_SETTICFREQ	(WM_USER+20)
-#define TBM_SETPAGESIZE	(WM_USER+21)
-#define TBM_GETPAGESIZE	(WM_USER+22)
-#define TBM_SETLINESIZE	(WM_USER+23)
-#define TBM_GETLINESIZE	(WM_USER+24)
-#define TBM_GETTHUMBRECT	(WM_USER+25)
-#define TBM_GETCHANNELRECT	(WM_USER+26)
-#define TBM_SETTHUMBLENGTH	(WM_USER+27)
-#define TBM_GETTHUMBLENGTH	(WM_USER+28)
-#define TBM_SETTOOLTIPS	(WM_USER+29)
-#define TBM_GETTOOLTIPS	(WM_USER+30)
-#define TBM_SETTIPSIDE	(WM_USER+31)
-#define TBM_SETBUDDY	(WM_USER+32)
-#define TBM_GETBUDDY	(WM_USER+33)
-#define TBM_GETUNICODEFORMAT	CCM_GETUNICODEFORMAT 
-#define TBM_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
-#define TB_LINEUP	0
-#define TB_LINEDOWN	1
-#define TB_PAGEUP	2
-#define TB_PAGEDOWN	3
-#define TB_THUMBPOSITION	4
-#define TB_THUMBTRACK	5
-#define TB_TOP	6
-#define TB_BOTTOM	7
-#define TB_ENDTRACK	8
-#define HOTKEYF_SHIFT	1
-#define HOTKEYF_CONTROL	2
-#define HOTKEYF_ALT	4
-#define HOTKEYF_EXT	8
-#define HKCOMB_NONE	1
-#define HKCOMB_S	2
-#define HKCOMB_C	4
-#define HKCOMB_A	8
-#define HKCOMB_SC	16
-#define HKCOMB_SA	32
-#define HKCOMB_CA	64
-#define HKCOMB_SCA	128
-#define HKM_SETHOTKEY	(WM_USER+1)
-#define HKM_GETHOTKEY	(WM_USER+2)
-#define HKM_SETRULES	(WM_USER+3)
-#define PBM_SETRANGE	(WM_USER+1)
-#define PBM_SETPOS	(WM_USER+2)
-#define PBM_DELTAPOS	(WM_USER+3)
-#define PBM_SETSTEP	(WM_USER+4)
-#define PBM_STEPIT	(WM_USER+5)
-#define PBM_SETRANGE32	1030
-#define PBM_GETRANGE	1031
-#define PBM_GETPOS	1032
-#define PBM_SETBARCOLOR	1033
-#define PBM_SETBKCOLOR	CCM_SETBKCOLOR
-#define PBS_SMOOTH	1
-#define PBS_VERTICAL	4
-#define LVS_ICON	0
-#define LVS_REPORT	1
-#define LVS_SMALLICON	2
-#define LVS_LIST	3
-#define LVS_TYPEMASK	3
-#define LVS_SINGLESEL	4
-#define LVS_SHOWSELALWAYS	8
-#define LVS_SORTASCENDING	16
-#define LVS_SORTDESCENDING	32
-#define LVS_SHAREIMAGELISTS	64
-#define LVS_NOLABELWRAP	128
-#define LVS_AUTOARRANGE	256
-#define LVS_EDITLABELS	512
-#define LVS_NOSCROLL	0x2000
-#define LVS_TYPESTYLEMASK	0xfc00
-#define LVS_ALIGNTOP	0
-#define LVS_ALIGNLEFT	0x800
-#define LVS_ALIGNMASK	0xc00
-#define LVS_OWNERDRAWFIXED	0x400
-#define LVS_NOCOLUMNHEADER	0x4000
-#define LVS_NOSORTHEADER	0x8000
-#if (_WIN32_IE >= 0x0300)
-#define CDIS_CHECKED 8
-#define CDIS_DEFAULT 32
-#define CDIS_DISABLED 4
-#define CDIS_FOCUS 16
-#define CDIS_GRAYED 2
-#define CDIS_HOT 64
-#define CDIS_SELECTED 1
-#define CDIS_MARKED 128
-#define CDIS_INDETERMINATE 256
-#if (_WIN32_WINNT >= 0x0501)
-#define CDIS_SHOWKEYBOARDCUES 512
-#endif
-#define CDDS_POSTERASE 4
-#define CDDS_POSTPAINT 2
-#define CDDS_PREERASE 3
-#define CDDS_PREPAINT 1
-#define CDDS_ITEM 65536
-#define CDDS_ITEMPOSTERASE 65540
-#define CDDS_ITEMPOSTPAINT 65538
-#define CDDS_ITEMPREERASE 65539
-#define CDDS_ITEMPREPAINT 65537
-#if (_WIN32_IE >= 0x0400)
-#define CDDS_SUBITEM 0x20000
-#endif
-/* FIXME: missing CDRF_NOTIFYSUBITEMDRAW */
-#define CDRF_DODEFAULT 0
-#define CDRF_NOTIFYITEMDRAW 32
-#define CDRF_NOTIFYITEMERASE 128
-#define CDRF_NOTIFYPOSTERASE 64
-#define CDRF_NOTIFYPOSTPAINT 16
-#define CDRF_NEWFONT 2
-#define CDRF_SKIPDEFAULT 4
-#if (_WIN32_IE >= 0x0400)
-#define LVBKIF_SOURCE_NONE      0x00000000
-#define LVBKIF_SOURCE_HBITMAP   0x00000001
-#define LVBKIF_SOURCE_URL       0x00000002
-#define LVBKIF_SOURCE_MASK      0x00000003
-#define LVBKIF_STYLE_NORMAL     0x00000000
-#define LVBKIF_STYLE_TILE       0x00000010
-#define LVBKIF_STYLE_MASK       0x00000010
-#endif /* _WIN32_IE >=0x0400 */
-#if (_WIN32_WINNT >= 0x501)
-#define LVBKIF_FLAG_TILEOFFSET  0x00000100
-#define LVBKIF_TYPE_WATERMARK   0x10000000
-#endif /* _WIN32_WINNT >= 0x501 */
-#define LVS_OWNERDATA 4096
-#define LVS_EX_CHECKBOXES 4
-#define LVS_EX_FULLROWSELECT 32
-#define LVS_EX_GRIDLINES 1
-#define LVS_EX_HEADERDRAGDROP 16
-#define LVS_EX_ONECLICKACTIVATE 64
-#define LVS_EX_SUBITEMIMAGES 2
-#define LVS_EX_TRACKSELECT 8
-#define LVS_EX_TWOCLICKACTIVATE 128
-#define LVSICF_NOINVALIDATEALL	0x00000001
-#define LVSICF_NOSCROLL	0x00000002
-#if( _WIN32_IE >= 0x0400 )
-#define LVS_EX_FLATSB	0x00000100
-#define LVS_EX_REGIONAL	0x00000200
-#define LVS_EX_INFOTIP	0x00000400
-#define LVS_EX_UNDERLINEHOT	0x00000800
-#define LVS_EX_UNDERLINECOLD	0x00001000
-#define LVS_EX_MULTIWORKAREAS	0x00002000
-#endif /* _WIN32_IE >=0x0400 */
-#if( _WIN32_IE >= 0x0500 )
-#define LVS_EX_LABELTIP	0x00004000
-#define LVS_EX_BORDERSELECT	0x00008000
-#endif  /* _WIN32_IE >= 0x0500 */
-#endif  /* _WIN32_IE >= 0x0300 */
-#define LVSIL_NORMAL	0
-#define LVSIL_SMALL	1
-#define LVSIL_STATE	2
-#define LVM_GETBKCOLOR	LVM_FIRST
-#define LVM_SETBKCOLOR	(LVM_FIRST+1)
-#define LVM_GETIMAGELIST	(LVM_FIRST+2)
-#define LVM_SETIMAGELIST	(LVM_FIRST+3)
-#define LVM_GETITEMCOUNT	(LVM_FIRST+4)
-#define LVIF_TEXT	1
-#define LVIF_IMAGE	2
-#define LVIF_PARAM	4
-#define LVIF_STATE	8
-#if (_WIN32_IE >= 0x0300)
-#define LVIF_INDENT 16
-#define LVIF_NORECOMPUTE 2048
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-#define LVIF_GROUPID 128
-#define LVIF_COLUMNS 256
-#endif
-#define LVIS_FOCUSED	1
-#define LVIS_SELECTED	2
-#define LVIS_CUT	4
-#define LVIS_DROPHILITED	8
-#define LVIS_OVERLAYMASK	0xF00
-#define LVIS_STATEIMAGEMASK	0xF000
-#define LPSTR_TEXTCALLBACKW	((LPWSTR)-1)
-#define LPSTR_TEXTCALLBACKA	((LPSTR)-1)
-#define I_IMAGECALLBACK	(-1)
-#define LVM_GETITEMA	(LVM_FIRST+5)
-#define LVM_GETITEMW	(LVM_FIRST+75)
-#define LVM_SETITEMA	(LVM_FIRST+6)
-#define LVM_SETITEMW	(LVM_FIRST+76)
-#define LVM_INSERTITEMA	(LVM_FIRST+7)
-#define LVM_INSERTITEMW	(LVM_FIRST+77)
-#define LVM_DELETEITEM	(LVM_FIRST+8)
-#define LVM_DELETEALLITEMS	(LVM_FIRST+9)
-#define LVM_GETCALLBACKMASK	(LVM_FIRST+10)
-#define LVM_SETCALLBACKMASK	(LVM_FIRST+11)
-#if( _WIN32_IE >= 0x0400 )
-#define LVM_SETBKIMAGEA	(LVM_FIRST + 68)
-#define LVM_SETBKIMAGEW	(LVM_FIRST + 138)
-#define LVM_GETBKIMAGEA	(LVM_FIRST + 69)
-#define LVM_GETBKIMAGEW	(LVM_FIRST + 139)
-#define LV_MAX_WORKAREAS	16
-#define LVM_SETWORKAREAS	(LVM_FIRST+65)
-#define LVM_GETWORKAREAS	(LVM_FIRST+70)
-#define LVM_GETNUMBEROFWORKAREAS	(LVM_FIRST+73)
-#define LVM_GETSELECTIONMARK	(LVM_FIRST+66)
-#define LVM_SETSELECTIONMARK	(LVM_FIRST+67)
-#define LVM_SETHOVERTIME	(LVM_FIRST+71)
-#define LVM_GETHOVERTIME	(LVM_FIRST+72)
-#define LVM_SETTOOLTIPS	(LVM_FIRST+74)
-#define LVM_GETTOOLTIPS	(LVM_FIRST+78)
-#endif /* _WIN32_IE >= 0x0400 */
-#define LVNI_ALL	0
-#define LVNI_FOCUSED	1
-#define LVNI_SELECTED	2
-#define LVNI_CUT	4
-#define LVNI_DROPHILITED	8
-#define LVNI_ABOVE	256
-#define LVNI_BELOW	512
-#define LVNI_TOLEFT	1024
-#define LVNI_TORIGHT	2048
-#define LVM_GETNEXTITEM	(LVM_FIRST+12)
-#define LVFI_PARAM	1
-#define LVFI_STRING	2
-#define LVFI_PARTIAL	8
-#define LVFI_WRAP	32
-#define LVFI_NEARESTXY	64
-#define LVIF_DI_SETITEM	0x1000
-#define LVM_FINDITEMA	(LVM_FIRST+13)
-#define LVM_FINDITEMW	(LVM_FIRST+83)
-#define LVIR_BOUNDS	0
-#define LVIR_ICON	1
-#define LVIR_LABEL	2
-#define LVIR_SELECTBOUNDS	3
-#define LVM_GETITEMRECT	(LVM_FIRST+14)
-#define LVM_SETITEMPOSITION	(LVM_FIRST+15)
-#define LVM_GETITEMPOSITION	(LVM_FIRST+16)
-#define LVM_GETSTRINGWIDTHA	(LVM_FIRST+17)
-#define LVM_GETSTRINGWIDTHW	(LVM_FIRST+87)
-#define LVHT_NOWHERE	1
-#define LVHT_ONITEMICON	2
-#define LVHT_ONITEMLABEL	4
-#define LVHT_ONITEMSTATEICON	8
-#define LVHT_ONITEM	(LVHT_ONITEMICON|LVHT_ONITEMLABEL|LVHT_ONITEMSTATEICON)
-#define LVHT_ABOVE	8
-#define LVHT_BELOW	16
-#define LVHT_TORIGHT	32
-#define LVHT_TOLEFT	64
-#define LVM_HITTEST	(LVM_FIRST+18)
-#define LVM_ENSUREVISIBLE	(LVM_FIRST+19)
-#define LVM_SCROLL	(LVM_FIRST+20)
-#define LVM_REDRAWITEMS	(LVM_FIRST+21)
-#define LVA_DEFAULT	0
-#define LVA_ALIGNLEFT	1
-#define LVA_ALIGNTOP	2
-#define LVA_SNAPTOGRID	5
-#define LVM_ARRANGE	(LVM_FIRST+22)
-#define LVM_EDITLABELA	(LVM_FIRST+23)
-#define LVM_EDITLABELW	(LVM_FIRST+118)
-#define LVM_GETEDITCONTROL	(LVM_FIRST+24)
-#define LVCF_FMT	1
-#define LVCF_WIDTH	2
-#define LVCF_TEXT	4
-#define LVCF_SUBITEM	8
-#if (_WIN32_IE >= 0x0300)
-#define LVCF_IMAGE 16
-#define LVCF_ORDER 32
-#endif
-#define LVCFMT_LEFT	0
-#define LVCFMT_RIGHT	1
-#define LVCFMT_CENTER	2
-#define LVCFMT_JUSTIFYMASK	3
-#if (_WIN32_IE >= 0x0300)
-#define LVCFMT_BITMAP_ON_RIGHT 4096
-#define LVCFMT_COL_HAS_IMAGES  32768
-#define LVCFMT_IMAGE 2048 
-#endif
-#define LVM_GETCOLUMNA	(LVM_FIRST+25)
-#define LVM_GETCOLUMNW	(LVM_FIRST+95)
-#define LVM_SETCOLUMNA	(LVM_FIRST+26)
-#define LVM_SETCOLUMNW	(LVM_FIRST+96)
-#define LVM_INSERTCOLUMNA	(LVM_FIRST+27)
-#define LVM_INSERTCOLUMNW	(LVM_FIRST+97)
-#define LVM_DELETECOLUMN	(LVM_FIRST+28)
-#define LVM_GETCOLUMNWIDTH	(LVM_FIRST+29)
-#define LVSCW_AUTOSIZE	(-1)
-#define LVSCW_AUTOSIZE_USEHEADER	(-2)
-#define LVM_SETCOLUMNWIDTH	(LVM_FIRST+30)
-#define LVM_CREATEDRAGIMAGE	(LVM_FIRST+33)
-#define LVM_GETVIEWRECT	(LVM_FIRST+34)
-#define LVM_GETTEXTCOLOR	(LVM_FIRST+35)
-#define LVM_SETTEXTCOLOR	(LVM_FIRST+36)
-#define LVM_GETTEXTBKCOLOR	(LVM_FIRST+37)
-#define LVM_SETTEXTBKCOLOR	(LVM_FIRST+38)
-#define LVM_GETTOPINDEX	(LVM_FIRST+39)
-#define LVM_GETCOUNTPERPAGE	(LVM_FIRST+40)
-#define LVM_GETORIGIN	(LVM_FIRST+41)
-#define LVM_GETORIGIN	(LVM_FIRST+41)
-#define LVM_UPDATE	(LVM_FIRST+42)
-#define LVM_SETITEMSTATE	(LVM_FIRST+43)
-#define LVM_GETITEMSTATE	(LVM_FIRST+44)
-#define LVM_GETITEMTEXTA	(LVM_FIRST+45)
-#define LVM_GETITEMTEXTW	(LVM_FIRST+115)
-#define LVM_SETITEMTEXTA	(LVM_FIRST+46)
-#define LVM_SETITEMTEXTW	(LVM_FIRST+116)
-#define LVM_SETITEMCOUNT	(LVM_FIRST+47)
-#define LVM_SORTITEMS	(LVM_FIRST+48)
-#define LVM_SETITEMPOSITION32	(LVM_FIRST+49)
-#define LVM_GETSELECTEDCOUNT	(LVM_FIRST+50)
-#define LVM_GETITEMSPACING	(LVM_FIRST+51)
-#define LVM_GETISEARCHSTRINGA	(LVM_FIRST+52)
-#define LVM_GETISEARCHSTRINGW	(LVM_FIRST+117)
-#if (_WIN32_IE >= 0x0300)
-#define LVM_APPROXIMATEVIEWRECT (LVM_FIRST+64)
-#define LVM_SETEXTENDEDLISTVIEWSTYLE (LVM_FIRST+54)
-#define LVM_GETEXTENDEDLISTVIEWSTYLE (LVM_FIRST+55)
-#define LVM_SETCOLUMNORDERARRAY (LVM_FIRST+58)
-#define LVM_GETCOLUMNORDERARRAY (LVM_FIRST+59)
-#define LVM_GETHEADER (LVM_FIRST+31)
-#define LVM_GETHOTCURSOR (LVM_FIRST+63)
-#define LVM_GETHOTITEM (LVM_FIRST+61)
-#define LVM_GETSUBITEMRECT (LVM_FIRST+56)
-#define LVM_SETHOTCURSOR (LVM_FIRST+62)
-#define LVM_SETHOTITEM (LVM_FIRST+60)
-#define LVM_SETICONSPACING (LVM_FIRST+53)
-#define LVM_SUBITEMHITTEST (LVM_FIRST+57)
-#endif
-#define LVN_ITEMCHANGING	LVN_FIRST
-#define LVN_ITEMCHANGED	(LVN_FIRST-1)
-#define LVN_INSERTITEM	(LVN_FIRST-2)
-#define LVN_DELETEITEM	(LVN_FIRST-3)
-#define LVN_DELETEALLITEMS	(LVN_FIRST-4)
-#define LVN_BEGINLABELEDITA	(LVN_FIRST-5)
-#define LVN_BEGINLABELEDITW	(LVN_FIRST-75)
-#define LVN_ENDLABELEDITA	(LVN_FIRST-6)
-#define LVN_ENDLABELEDITW	(LVN_FIRST-76)
-#define LVN_COLUMNCLICK	(LVN_FIRST-8)
-#define LVN_BEGINDRAG	(LVN_FIRST-9)
-#define LVN_BEGINRDRAG	(LVN_FIRST-11)
-#define LVN_GETDISPINFOA	(LVN_FIRST-50)
-#define LVN_GETDISPINFOW	(LVN_FIRST-77)
-#define LVN_SETDISPINFOA	(LVN_FIRST-51)
-#define LVN_SETDISPINFOW	(LVN_FIRST-78)
-#define LVN_KEYDOWN	(LVN_FIRST-55)
-#if (_WIN32_IE >= 0x0400)
-#define LVN_GETINFOTIPA	(LVN_FIRST-57)
-#define LVN_GETINFOTIPW	(LVN_FIRST-58)
-#define LVKF_ALT	0x0001
-#define LVKF_CONTROL	0x0002
-#define LVKF_SHIFT	0x0004
-#define LVGIT_UNFOLDED  1
-#endif
-#define TVS_HASBUTTONS	1
-#define TVS_HASLINES	2
-#define TVS_LINESATROOT	4
-#define TVS_EDITLABELS	8
-#define TVS_DISABLEDRAGDROP	16
-#define TVS_SHOWSELALWAYS	32
-#if (_WIN32_IE >= 0x0300)
-#define TVS_CHECKBOXES 256
-#define TVS_NOTOOLTIPS 128
-#define TVS_RTLREADING 64
-#define TVS_TRACKSELECT 512
-#endif
-#if (_WIN32_IE >= 0x0400)
-#define TVS_FULLROWSELECT 4096
-#define TVS_INFOTIP 2048
-#define TVS_NONEVENHEIGHT 16384
-#define TVS_NOSCROLL 8192
-#define TVS_SINGLEEXPAND 1024
-#endif
-#if( _WIN32_IE >= 0x0500 )
-#define TVS_NOHSCROLL	0x8000
-#endif /* _WIN32_IE >= 0x0500 */
-#define TVIF_TEXT	1
-#define TVIF_IMAGE	2
-#define TVIF_PARAM	4
-#define TVIF_STATE	8
-#define TVIF_HANDLE	16
-#define TVIF_SELECTEDIMAGE	32
-#define TVIF_CHILDREN	64
-#if (_WIN32_IE >= 0x0400)
-#define TVIF_INTEGRAL	0x0080
-#endif /* _WIN32_IE >= 0x0400 */
-#define TVIS_FOCUSED	1
-#define TVIS_SELECTED	2
-#define TVIS_CUT	4
-#define TVIS_DROPHILITED	8
-#define TVIS_BOLD	16
-#define TVIS_EXPANDED	32
-#define TVIS_EXPANDEDONCE	64
-#define TVIS_OVERLAYMASK	0xF00
-#define TVIS_STATEIMAGEMASK	0xF000
-#define TVIS_USERMASK	0xF000
-#define I_CHILDRENCALLBACK	(-1)
-#define TVI_ROOT	((HTREEITEM)0xFFFF0000)
-#define TVI_FIRST	((HTREEITEM)0xFFFF0001)
-#define TVI_LAST	((HTREEITEM)0xFFFF0002)
-#define TVI_SORT	((HTREEITEM)0xFFFF0003)
-#define TVSIL_NORMAL	0
-#define TVSIL_STATE	2
-#define TVM_INSERTITEMA	TV_FIRST
-#define TVM_INSERTITEMW	(TV_FIRST+50)
-#define TVM_DELETEITEM	(TV_FIRST+1)
-#define TVM_EXPAND	(TV_FIRST+2)
-#define TVM_GETITEMRECT	(TV_FIRST+4)
-#define TVM_GETCOUNT	(TV_FIRST+5)
-#define TVM_GETINDENT	(TV_FIRST+6)
-#define TVM_SETINDENT	(TV_FIRST+7)
-#define TVM_GETIMAGELIST	(TV_FIRST+8)
-#define TVM_SETIMAGELIST	(TV_FIRST+9)
-#define TVM_GETNEXTITEM	(TV_FIRST+10)
-#define TVM_SELECTITEM	(TV_FIRST+11)
-#define TVM_GETITEMA	(TV_FIRST+12)
-#define TVM_GETITEMW	(TV_FIRST+62)
-#define TVM_SETITEMA	(TV_FIRST+13)
-#define TVM_SETITEMW	(TV_FIRST+63)
-#define TVM_EDITLABELA	(TV_FIRST+14)
-#define TVM_EDITLABELW	(TV_FIRST+65)
-#define TVM_GETEDITCONTROL	(TV_FIRST+15)
-#define TVM_GETVISIBLECOUNT	(TV_FIRST+16)
-#define TVM_HITTEST	(TV_FIRST+17)
-#define TVM_CREATEDRAGIMAGE	(TV_FIRST+18)
-#define TVM_SORTCHILDREN	(TV_FIRST+19)
-#define TVM_ENSUREVISIBLE	(TV_FIRST+20)
-#define TVM_SORTCHILDRENCB	(TV_FIRST+21)
-#define TVM_ENDEDITLABELNOW	(TV_FIRST+22)
-#define TVM_GETISEARCHSTRINGA	(TV_FIRST+23)
-#define TVM_GETISEARCHSTRINGW	(TV_FIRST+64)
-#if (_WIN32_IE >= 0x0300)
-#define TVM_GETTOOLTIPS (TV_FIRST+25)
-#define TVM_SETTOOLTIPS (TV_FIRST+24)
-#endif
-#if (_WIN32_IE >= 0x0400)
-#define TVM_GETBKCOLOR (TV_FIRST+31)
-#define TVM_GETINSERTMARKCOLOR (TV_FIRST+38)
-#define TVM_GETITEMHEIGHT (TV_FIRST+28)
-#define TVM_GETSCROLLTIME (TV_FIRST+34)
-#define TVM_GETTEXTCOLOR (TV_FIRST+32)
-#define TVM_SETBKCOLOR (TV_FIRST+29)
-#define TVM_SETINSERTMARK (TV_FIRST+26)
-#define TVM_SETINSERTMARKCOLOR (TV_FIRST+37)
-#define TVM_SETITEMHEIGHT (TV_FIRST+27)
-#define TVM_SETSCROLLTIME (TV_FIRST+33)
-#define TVM_SETTEXTCOLOR (TV_FIRST+30)
-#define TVM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT
-#define TVM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT
-#endif
-#if (_WIN32_IE >= 0x0500)
-#define TVM_GETITEMSTATE (TV_FIRST+39)
-#define TVM_SETLINECOLOR (TV_FIRST+40)
-#define TVM_GETLINECOLOR (TV_FIRST+41)
-#endif
-#define TVE_COLLAPSE	1
-#define TVE_EXPAND	2
-#define TVE_TOGGLE	3
-#define TVE_COLLAPSERESET	0x8000
-#if (_WIN32_IE >= 0x0300)
-#define TVE_EXPANDPARTIAL	0x4000
-#endif
-#define TVC_UNKNOWN	0
-#define TVC_BYMOUSE	1
-#define TVC_BYKEYBOARD	2
-#define TVGN_ROOT	0
-#define TVGN_NEXT	1
-#define TVGN_PREVIOUS	2
-#define TVGN_PARENT	3
-#define TVGN_CHILD	4
-#define TVGN_FIRSTVISIBLE	5
-#define TVGN_NEXTVISIBLE	6
-#define TVGN_PREVIOUSVISIBLE	7
-#define TVGN_DROPHILITE	8
-#define TVGN_CARET	9
-#if (_WIN32_IE >= 0x0400)
-#define TVGN_LASTVISIBLE	10
-#endif
-#define TVN_SELCHANGINGA	(TVN_FIRST-1)
-#define TVN_SELCHANGINGW	(TVN_FIRST-50)
-#define TVN_SELCHANGEDA	(TVN_FIRST-2)
-#define TVN_SELCHANGEDW	(TVN_FIRST-51)
-#define TVN_GETDISPINFOA	(TVN_FIRST-3)
-#define TVN_GETDISPINFOW	(TVN_FIRST-52)
-#define TVN_SETDISPINFOA	(TVN_FIRST-4)
-#define TVN_SETDISPINFOW	(TVN_FIRST-53)
-#define TVN_ITEMEXPANDINGA	(TVN_FIRST-5)
-#define TVN_ITEMEXPANDINGW	(TVN_FIRST-54)
-#define TVN_ITEMEXPANDEDA	(TVN_FIRST-6)
-#define TVN_ITEMEXPANDEDW	(TVN_FIRST-55)
-#define TVN_BEGINDRAGA	(TVN_FIRST-7)
-#define TVN_BEGINDRAGW	(TVN_FIRST-56)
-#define TVN_BEGINRDRAGA	(TVN_FIRST-8)
-#define TVN_BEGINRDRAGW	(TVN_FIRST-57)
-#define TVN_DELETEITEMA	(TVN_FIRST-9)
-#define TVN_DELETEITEMW	(TVN_FIRST-58)
-#define TVN_BEGINLABELEDITA	(TVN_FIRST-10)
-#define TVN_BEGINLABELEDITW	(TVN_FIRST-59)
-#define TVN_ENDLABELEDITA	(TVN_FIRST-11)
-#define TVN_ENDLABELEDITW	(TVN_FIRST-60)
-#define TVN_KEYDOWN	(TVN_FIRST-12)
-#if (_WIN32_IE >= 0x0400)
-#define TVN_GETINFOTIPA	(TVN_FIRST-13)
-#define TVN_GETINFOTIPW	(TVN_FIRST-14)
-#define TVN_SINGLEEXPAND	(TVN_FIRST-15)
-#define TVNRET_DEFAULT 0
-#define TVNRET_SKIPOLD 1
-#define TVNRET_SKIPNEW 2
-#endif /* _WIN32_IE >= 0x0400 */
-#define TVIF_DI_SETITEM	0x1000
-#define TVHT_NOWHERE	1
-#define TVHT_ONITEMICON	2
-#define TVHT_ONITEMLABEL	4
-#define TVHT_ONITEM	(TVHT_ONITEMICON|TVHT_ONITEMLABEL|TVHT_ONITEMSTATEICON)
-#define TVHT_ONITEMINDENT	8
-#define TVHT_ONITEMBUTTON	16
-#define TVHT_ONITEMRIGHT	32
-#define TVHT_ONITEMSTATEICON	64
-#define TVHT_ABOVE	256
-#define TVHT_BELOW	512
-#define TVHT_TORIGHT	1024
-#define TVHT_TOLEFT	2048
-#define TCHT_NOWHERE	1
-#define TCHT_ONITEMICON	2
-#define TCHT_ONITEMLABEL	4
-#define TCHT_ONITEM	(TCHT_ONITEMICON|TCHT_ONITEMLABEL)
-#define TCS_FORCEICONLEFT	16
-#define TCS_FORCELABELLEFT	32
-#define TCS_TABS	0
-#define TCS_BUTTONS	256
-#define TCS_SINGLELINE	0
-#define TCS_MULTILINE	512
-#define TCS_RIGHTJUSTIFY	0
-#define TCS_FIXEDWIDTH	1024
-#define TCS_RAGGEDRIGHT	2048
-#define TCS_FOCUSONBUTTONDOWN	0x1000
-#define TCS_OWNERDRAWFIXED	0x2000
-#define TCS_TOOLTIPS	0x4000
-#define TCS_FOCUSNEVER	0x8000
-#if (_WIN32_IE >= 0x0300)
-#define TCS_BOTTOM	2
-#define TCS_RIGHT	2
-#define TCS_VERTICAL	128
-#define TCS_SCROLLOPPOSITE	0x0001
-#define TCS_HOTTRACK	0x0040
-#define TCS_MULTISELECT	0x0004
-#endif
-#if( _WIN32_IE >= 0x0400 )
-#define TCS_FLATBUTTONS	0x0008
-#define TCS_EX_FLATSEPARATORS	0x00000001
-#define TCS_EX_REGISTERDROP	0x00000002
-#endif /* _WIN32_IE >= 0x0400 */
-#define TCIF_TEXT	1
-#define TCIF_IMAGE	2
-#define TCIF_RTLREADING	4
-#define TCIF_PARAM	8
-#if (_WIN32_IE >= 0x0400)
-#define TCIF_STATE	16
-#endif
-#define TCIS_BUTTONPRESSED 1
-#if (_WIN32_IE >= 0x0400)
-#define TCIS_HIGHLIGHTED 2
-#endif
-#define TCM_FIRST	0x1300
-#define TCM_GETIMAGELIST	(TCM_FIRST+2)
-#define TCM_SETIMAGELIST	(TCM_FIRST+3)
-#define TCM_GETITEMCOUNT	(TCM_FIRST+4)
-#define TCM_GETITEMA	(TCM_FIRST+5)
-#define TCM_GETITEMW	(TCM_FIRST+60)
-#define TCM_SETITEMA	(TCM_FIRST+6)
-#define TCM_SETITEMW	(TCM_FIRST+61)
-#define TCM_INSERTITEMA	(TCM_FIRST+7)
-#define TCM_INSERTITEMW	(TCM_FIRST+62)
-#define TCM_DELETEITEM	(TCM_FIRST+8)
-#define TCM_DELETEALLITEMS	(TCM_FIRST+9)
-#define TCM_GETITEMRECT	(TCM_FIRST+10)
-#define TCM_GETCURSEL	(TCM_FIRST+11)
-#define TCM_SETCURSEL	(TCM_FIRST+12)
-#define TCM_HITTEST	(TCM_FIRST+13)
-#define TCM_SETITEMEXTRA	(TCM_FIRST+14)
-
-#define TCM_ADJUSTRECT	(TCM_FIRST+40)
-#define TCM_SETITEMSIZE	(TCM_FIRST+41)
-#define TCM_REMOVEIMAGE	(TCM_FIRST+42)
-#define TCM_SETPADDING	(TCM_FIRST+43)
-#define TCM_GETROWCOUNT	(TCM_FIRST+44)
-#define TCM_GETTOOLTIPS	(TCM_FIRST+45)
-#define TCM_SETTOOLTIPS	(TCM_FIRST+46)
-#define TCM_GETCURFOCUS	(TCM_FIRST+47)
-#define TCM_SETCURFOCUS	(TCM_FIRST+48)
-#define TCM_SETMINTABWIDTH	(TCM_FIRST + 49)
-#define TCM_DESELECTALL	(TCM_FIRST + 50)
-#if (_WIN32_IE >=0x0400)
-#define TCM_HIGHLIGHTITEM	(TCM_FIRST + 51)
-#define TCM_SETEXTENDEDSTYLE	(TCM_FIRST + 52)
-#define TCM_GETEXTENDEDSTYLE	(TCM_FIRST + 53)
-#define TCM_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
-#define TCM_GETUNICODEFORMAT	CCM_GETUNICODEFORMAT
-#endif /* _WIN32_IE >=0x0400 */
-#define TCN_KEYDOWN	TCN_FIRST
-#define TCN_SELCHANGE	(TCN_FIRST-1)
-#define TCN_SELCHANGING	(TCN_FIRST-2)
-#define NM_OUTOFMEMORY (NM_FIRST-1)
-#define NM_CLICK (NM_FIRST-2)
-#define NM_DBLCLK (NM_FIRST-3)
-#define NM_RETURN (NM_FIRST-4)
-#define NM_RCLICK (NM_FIRST-5)
-#define NM_RDBLCLK (NM_FIRST-6)
-#define NM_SETFOCUS (NM_FIRST-7)
-#define NM_KILLFOCUS (NM_FIRST-8)
-#define NM_CUSTOMDRAW (NM_FIRST-12)
-#define NM_HOVER (NM_FIRST-13)
-#define NM_NCHITTEST (NM_FIRST-14)
-#define NM_KEYDOWN (NM_FIRST-15)
-#define NM_RELEASEDCAPTURE (NM_FIRST-16)
-#define NM_SETCURSOR (NM_FIRST-17)
-#define NM_CHAR (NM_FIRST-18)
-#define NM_TOOLTIPSCREATED (NM_FIRST-19)
-#define SBARS_SIZEGRIP 256
-#define CCM_FIRST 0x2000
-#define CCM_LAST (CCM_FIRST+0x200)
-#define CCM_SETBKCOLOR 8193
-#define CCM_SETCOLORSCHEME 8194
-#define CCM_GETCOLORSCHEME 8195
-#define CCM_GETDROPTARGET 8196
-#define CCM_SETUNICODEFORMAT 8197
-#define CCM_GETUNICODEFORMAT 8198
-#define CCM_SETVERSION 0x2007
-#define CCM_GETVERSION 0x2008
-#define CCM_SETNOTIFYWINDOW 0x2009
-#if (_WIN32_WINNT >= 0x0501)
-#define CCM_SETWINDOWTHEME 0x200b
-#define CCM_DPISCALE 0x200c
-#endif 
-#define ICC_LISTVIEW_CLASSES 1
-#define ICC_TREEVIEW_CLASSES 2
-#define ICC_BAR_CLASSES	4
-#define ICC_TAB_CLASSES      8
-#define ICC_UPDOWN_CLASS 16
-#define ICC_PROGRESS_CLASS 32
-#define ICC_HOTKEY_CLASS 64
-#define ICC_ANIMATE_CLASS 128
-#define ICC_WIN95_CLASSES 255
-#define ICC_DATE_CLASSES 256
-#define ICC_USEREX_CLASSES 512
-#define ICC_COOL_CLASSES 1024
-#if (_WIN32_IE >= 0x0400)
-#define ICC_INTERNET_CLASSES 2048
-#define ICC_PAGESCROLLER_CLASS 4096
-#define ICC_NATIVEFNTCTL_CLASS 8192
-#define INFOTIPSIZE 1024
-#endif /* _WIN32_IE */
-#define GDTR_MIN 1
-#define GDTR_MAX 2
-#define GMR_VISIBLE 0
-#define GMR_DAYSTATE 1
-#define GDT_ERROR -1
-#define GDT_VALID 0
-#define GDT_NONE 1
-#define DTS_UPDOWN 1
-#define DTS_SHOWNONE 2
-#define DTS_SHORTDATEFORMAT 0
-#define DTS_LONGDATEFORMAT 4
-#define DTS_TIMEFORMAT 9
-#define DTS_APPCANPARSE 16
-#define DTS_RIGHTALIGN 32
-#if ( _WIN32_IE >= 0x500 )
-#define DTS_SHORTDATECENTURYFORMAT	0x000C
-#endif /* _WIN32_IE >= 0x500 */
-#define MCS_DAYSTATE 1
-#define MCS_MULTISELECT 2
-#define MCS_WEEKNUMBERS 4
-#if (_WIN32_IE >= 0x0400)
-#define MCS_NOTODAYCIRCLE	0x0008
-#define MCS_NOTODAY	0x0010
-#else /* _WIN32_IE >= 0x0400 */
-#define MCS_NOTODAY	0x0008
-#endif /* _WIN32_IE >= 0x0400 */
-#define DTM_GETSYSTEMTIME 0x1001
-#define DTM_SETSYSTEMTIME 0x1002
-#define DTM_GETRANGE 0x1003
-#define DTM_SETRANGE 0x1004
-#define DTM_SETFORMATA 0x1005
-#define DTM_SETFORMATW 0x1050
-#define DTM_SETMCCOLOR 0x1006
-#define DTM_GETMCCOLOR 0x1007
-#define DTM_GETMONTHCAL 0x1008
-#define DTM_SETMCFONT	0x1009
-#define DTM_GETMCFONT	0x100a
-#define DTN_USERSTRINGA  ((UINT)-758)
-#define DTN_USERSTRINGW  ((UINT)-745)
-#define DTN_WMKEYDOWNA  ((UINT)-757)
-#define DTN_WMKEYDOWNW  ((UINT)-744)
-#define DTN_FORMATA  ((UINT)-756) 
-#define DTN_FORMATW  ((UINT)-743)
-#define DTN_FORMATQUERYA  ((UINT)-755) 
-#define DTN_FORMATQUERYW ((UINT)-742)
-#define DTN_DROPDOWN    ((UINT)-754) 
-#define DTN_CLOSEUP	((UINT)-753) 
-#define DTN_DATETIMECHANGE ((UINT)-759) 
-#define MCM_GETCURSEL	0x1001
-#define MCM_SETCURSEL	0x1002
-#define MCM_GETMAXSELCOUNT 0x1003
-#define MCM_SETMAXSELCOUNT 0x1004
-#define MCM_GETSELRANGE	0x1005
-#define MCM_SETSELRANGE	0x1006
-#define MCM_GETMONTHRANGE 0x1007
-#define MCM_SETDAYSTATE	0x1008
-#define MCM_GETMINREQRECT 0x1009
-#define MCM_SETCOLOR 0x100a
-#define MCM_GETCOLOR 0x100b
-#define MCM_SETTODAY 0x100c
-#define MCM_GETTODAY 0x100d
-#define MCM_HITTEST 0x100e
-#define MCM_SETFIRSTDAYOFWEEK 0x100f
-#define MCM_GETFIRSTDAYOFWEEK 0x1010
-#define MCM_GETRANGE 0x1011
-#define MCM_SETRANGE 0x1012
-#define MCM_GETMONTHDELTA 0x1013
-#define MCM_SETMONTHDELTA 0x1014
-#define MCM_GETMAXTODAYWIDTH 0x1015
-#define MCN_SELCHANGE	  ((UINT)-749)
-#define MCN_GETDAYSTATE	((UINT)-747)
-#define MCN_SELECT		((UINT)-746)
-#define ODT_HEADER 100
-#define ODT_TAB 101
-#define ODT_LISTVIEW 102
-#define SB_SETBKCOLOR	0x2001
-#if (_WIN32_IE >= 0x0300)
-#define SB_ISSIMPLE 1038
-#define MCSC_BACKGROUND 0
-#define MCSC_TEXT 1
-#define MCSC_TITLEBK 2
-#define MCSC_TITLETEXT 3
-#define MCSC_MONTHBK 4
-#define MCSC_TRAILINGTEXT 5
-#endif
-#if (_WIN32_IE >= 0x0400)
-#define MCHT_TITLE 0x10000
-#define MCHT_CALENDAR 0x20000
-#define MCHT_TODAYLINK 0x30000
-#define MCHT_NEXT 0x1000000
-#define MCHT_PREV 0x2000000
-#define MCHT_NOWHERE 0x00
-#define MCHT_TITLEBK (MCHT_TITLE)
-#define MCHT_TITLEMONTH (MCHT_TITLE | 0x0001)
-#define MCHT_TITLEYEAR (MCHT_TITLE | 0x0002)
-#define MCHT_TITLEBTNNEXT (MCHT_TITLE | MCHT_NEXT | 0x0003)
-#define MCHT_TITLEBTNPREV (MCHT_TITLE | MCHT_PREV | 0x0003)
-#define MCHT_CALENDARBK (MCHT_CALENDAR)
-#define MCHT_CALENDARDATE (MCHT_CALENDAR | 0x0001)
-#define MCHT_CALENDARDATENEXT (MCHT_CALENDARDATE | MCHT_NEXT)
-#define MCHT_CALENDARDATEPREV (MCHT_CALENDARDATE | MCHT_PREV)
-#define MCHT_CALENDARDAY (MCHT_CALENDAR | 0x0002)
-#define MCHT_CALENDARWEEKNUM (MCHT_CALENDAR | 0x0003)
-#endif /* _WIN32_IE >= 0x0400 */
-#define RBS_TOOLTIPS 256
-#define RBS_VARHEIGHT 512
-#define RBS_BANDBORDERS 1024
-#define RBS_FIXEDORDER 2048
-#define RBIM_IMAGELIST 1
-#define RB_SETCOLORSCHEME CCM_SETCOLORSCHEME
-#define RB_GETCOLORSCHEME CCM_GETCOLORSCHEME
-#define RBBS_BREAK 1
-#define RBBS_FIXEDSIZE 2
-#define RBBS_CHILDEDGE 4
-#define RBBS_HIDDEN 8
-#define RBBS_NOVERT 16
-#define RBBS_FIXEDBMP 32
-#define RBBIM_STYLE 1
-#define RBBIM_COLORS 2
-#define RBBIM_TEXT 4
-#define RBBIM_IMAGE 8
-#define RBBIM_CHILD 16
-#define RBBIM_CHILDSIZE 32
-#define RBBIM_SIZE 64
-#define RBBIM_BACKGROUND 128
-#define RBBIM_ID 256
-#define RB_INSERTBANDA (WM_USER+1)
-#define RB_INSERTBANDW (WM_USER+10)
-#define RB_DELETEBAND (WM_USER+2)
-#define RB_GETBARINFO (WM_USER+3)
-#define RB_SETBARINFO (WM_USER+4)
-#define RB_GETBANDCOUNT (WM_USER+12)
-#define RB_GETROWCOUNT (WM_USER+13)
-#define RB_GETROWHEIGHT (WM_USER+14)
-#define RB_SETBANDINFOA (WM_USER+6)
-#define RB_SETBANDINFOW (WM_USER+11)
-#define RB_SETPARENT (WM_USER+7)
-#define RBN_HEIGHTCHANGE RBN_FIRST
-#if (_WIN32_IE >= 0x0300)
-#define LVN_ODCACHEHINT (LVN_FIRST-13)
-#define LVN_ODFINDITEMA (LVN_FIRST-52)
-#define LVN_ODFINDITEMW (LVN_FIRST-79)
-#define LVN_ITEMACTIVATE (LVN_FIRST-14)
-#define LVN_ODSTATECHANGED (LVN_FIRST-15)
-#ifdef UNICODE
-#define LVN_ODFINDITEM LVN_ODFINDITEMW
-#else
-#define LVN_ODFINDITEM LVN_ODFINDITEMA
-#endif
-#endif /* _WIN32_IE */
-#if (_WIN32_IE >= 0x0400)
-#define SB_SETICON 1039
-#define SB_SETTIPTEXTA	1040
-#define SB_SETTIPTEXTW	1041
-#define SB_GETTIPTEXTA	1042
-#define SB_GETTIPTEXTW	1043
-#define SB_GETICON	1044
-#define SB_SETUNICODEFORMAT	0x2005
-#define SB_GETUNICODEFORMAT	0x2006
-#define PGF_INVISIBLE 0
-#define PGF_NORMAL 1
-#define PGF_GRAYED 2
-#define PGF_DEPRESSED 4
-#define PGF_HOT 8
-#define PGB_TOPORLEFT 0
-#define PGB_BOTTOMORRIGHT 1
-#define PGF_SCROLLUP 1
-#define PGF_SCROLLDOWN 2
-#define PGF_SCROLLLEFT 4
-#define PGF_SCROLLRIGHT 8
-#define PGK_SHIFT 1
-#define PGK_CONTROL 2
-#define PGK_MENU 4
-#define PGF_CALCWIDTH 1
-#define PGF_CALCHEIGHT 2
-#define PGM_FIRST 0x1400
-#define PGM_SETCHILD (PGM_FIRST+1)
-#define PGM_RECALCSIZE (PGM_FIRST+2)
-#define PGM_FORWARDMOUSE (PGM_FIRST+3)
-#define PGM_SETBKCOLOR (PGM_FIRST+4)
-#define PGM_GETBKCOLOR (PGM_FIRST+5)
-#define PGM_SETBORDER (PGM_FIRST+6)
-#define PGM_GETBORDER (PGM_FIRST+7)
-#define PGM_SETPOS (PGM_FIRST+8)
-#define PGM_GETPOS (PGM_FIRST+9)
-#define PGM_SETBUTTONSIZE (PGM_FIRST+10)
-#define PGM_GETBUTTONSIZE (PGM_FIRST+11)
-#define PGM_GETBUTTONSTATE (PGM_FIRST+12)
-#define PGM_GETDROPTARGET CCM_GETDROPTARGET
-
-#define RBS_REGISTERDROP 4096
-#define RBS_AUTOSIZE 8192
-#define RBS_VERTICALGRIPPER 16384
-#define RBS_DBLCLKTOGGLE  32768
-#define RBBS_VARIABLEHEIGHT 64
-#define RBBS_GRIPPERALWAYS 128
-#define RBBS_NOGRIPPER 256
-#define RBBIM_IDEALSIZE 512
-#define RBBIM_LPARAM 1024
-#define RBBIM_HEADERSIZE 2048
-#define RB_HITTEST (WM_USER+8)
-#define RB_GETRECT (WM_USER+9)
-#define RB_IDTOINDEX (WM_USER+16)
-#define RB_GETTOOLTIPS (WM_USER+17)
-#define RB_SETTOOLTIPS (WM_USER+18)
-#define RB_SETBKCOLOR (WM_USER+19)
-#define RB_GETBKCOLOR (WM_USER+20)
-#define RB_SETTEXTCOLOR (WM_USER+21)
-#define RB_GETTEXTCOLOR (WM_USER+22)
-#define RB_SIZETORECT (WM_USER+23)
-#define RB_BEGINDRAG (WM_USER+24)
-#define RB_ENDDRAG (WM_USER+25)
-#define RB_DRAGMOVE (WM_USER+26)
-#define RB_GETBARHEIGHT (WM_USER+27)
-#define RB_GETBANDINFOW (WM_USER+28)
-#define RB_GETBANDINFOA (WM_USER+29)
-#define RB_MINIMIZEBAND (WM_USER+30)
-#define RB_MAXIMIZEBAND (WM_USER+31)
-#define RB_GETDROPTARGET CCM_GETDROPTARGET
-#define RB_GETBANDBORDERS (WM_USER+34)
-#define RB_SHOWBAND (WM_USER+35)
-#define RB_SETPALETTE (WM_USER+37)
-#define RB_GETPALETTE (WM_USER+38)
-#define RB_MOVEBAND (WM_USER+39)
-#define RB_SETUNICODEFORMAT     CCM_SETUNICODEFORMAT
-#define RB_GETUNICODEFORMAT     CCM_GETUNICODEFORMAT
-#define RBN_GETOBJECT (RBN_FIRST-1)
-#define RBN_LAYOUTCHANGED (RBN_FIRST-2)
-#define RBN_AUTOSIZE (RBN_FIRST-3)
-#define RBN_BEGINDRAG (RBN_FIRST-4)
-#define RBN_ENDDRAG (RBN_FIRST-5)
-#define RBN_DELETINGBAND (RBN_FIRST-6)
-#define RBN_DELETEDBAND (RBN_FIRST-7)
-#define RBN_CHILDSIZE (RBN_FIRST-8)
-#define RBNM_ID 1
-#define RBNM_STYLE 2
-#define RBNM_LPARAM 4
-#define RBHT_NOWHERE 1
-#define RBHT_CAPTION 2
-#define RBHT_CLIENT 3
-#define RBHT_GRABBER 4
-#ifdef UNICODE
-#define SB_SETTIPTEXT	SB_SETTIPTEXTW
-#define SB_GETTIPTEXT	SB_GETTIPTEXTW
-#define RB_GETBANDINFO	RB_GETBANDINFOW
-#else
-#define SB_SETTIPTEXT	SB_SETTIPTEXTA
-#define SB_GETTIPTEXT	SB_GETTIPTEXTA
-#define RB_GETBANDINFO	RB_GETBANDINFOA
-#endif
-#else
-#define RB_GETBANDINFO (WM_USER+5)
-#endif /* _WIN32_IE >= 0x0400 */
-#define CBEM_INSERTITEMA	(WM_USER + 1)
-#define CBEM_SETIMAGELIST	(WM_USER + 2)
-#define CBEM_GETIMAGELIST	(WM_USER + 3)
-#define CBEM_GETITEMA	(WM_USER + 4)
-#define CBEM_SETITEMA	(WM_USER + 5)
-#define CBEM_DELETEITEM	CB_DELETESTRING
-#define CBEM_GETCOMBOCONTROL	(WM_USER + 6)
-#define CBEM_GETEDITCONTROL	(WM_USER + 7)
-#define CBEM_SETEXSTYLE	(WM_USER + 8)
-#define CBEM_GETEXSTYLE	(WM_USER + 9)
-#if (_WIN32_IE >= 0x0400)
-#define CBEM_SETEXTENDEDSTYLE	(WM_USER + 14)
-#define CBEM_GETEXTENDEDSTYLE	(WM_USER + 9)
-#define CBEM_SETUNICODEFORMAT	CCM_SETUNICODEFORMAT
-#define CBEM_GETUNICODEFORMAT	CCM_GETUNICODEFORMAT
-#endif /* _WIN32_IE >= 0x0400 */
-#define CBEM_HASEDITCHANGED	(WM_USER + 10)
-#define CBEM_INSERTITEMW	(WM_USER + 11)
-#define CBEM_SETITEMW	(WM_USER + 12)
-#define CBEM_GETITEMW	(WM_USER + 13)
-#define DA_LAST	0x7fffffff
-#define DPA_APPEND	0x7fffffff
-#define DPA_ERR	-1
-#define DSA_APPEND	0x7fffffff
-#define DSA_ERR	-1
-#define DPAS_SORTED	1
-#define DPAS_INSERTBEFORE	2
-#define DPAS_INSERTAFTER	4
-#if (_WIN32_IE >= 0x400)
-#define WSB_PROP_CYVSCROLL	1
-#define WSB_PROP_CXHSCROLL	2
-#define WSB_PROP_CYHSCROLL	4
-#define WSB_PROP_CXVSCROLL	8
-#define WSB_PROP_CXHTHUMB	16
-#define WSB_PROP_CYVTHUMB	32
-#define WSB_PROP_VBKGCOLOR	64
-#define WSB_PROP_HBKGCOLOR	128
-#define WSB_PROP_VSTYLE	256
-#define WSB_PROP_HSTYLE	512
-#define WSB_PROP_WINSTYLE	1024
-#define WSB_PROP_PALETTE	2048
-#define WSB_PROP_MASK	0xfff
-#define FSB_FLAT_MODE	2
-#define FSB_ENCARTA_MODE	1
-#define FSB_REGULAR_MODE	0
-#endif /* _WIN32_IE >= 0x400 */
-
-#ifndef RC_INVOKED
-typedef struct tagCOMBOBOXEXITEMA{
-	UINT mask;
-	int iItem;
-	LPSTR pszText;
-	int cchTextMax;
-	int iImage;
-	int iSelectedImage;
-	int iOverlay;
-	int iIndent;
-	LPARAM lParam;
-} COMBOBOXEXITEMA, *PCOMBOBOXEXITEMA;
-typedef COMBOBOXEXITEMA CONST *PCCOMBOEXITEMA;
-typedef struct tagCOMBOBOXEXITEMW{
-	UINT mask;
-	int iItem;
-	LPWSTR pszText;
-	int cchTextMax;
-	int iImage;
-	int iSelectedImage;
-	int iOverlay;
-	int iIndent;
-	LPARAM lParam;
-} COMBOBOXEXITEMW, *PCOMBOBOXEXITEMW;
-typedef COMBOBOXEXITEMW CONST *PCCOMBOEXITEMW;
-#if (_WIN32_IE >= 0x0400)
-typedef struct {
-	NMHDR hdr;
-	COMBOBOXEXITEMA ceItem;
-} NMCOMBOBOXEXA, *PNMCOMBOBOXEXA;
-typedef struct {
-	NMHDR hdr;
-	COMBOBOXEXITEMW ceItem;
-} NMCOMBOBOXEXW, *PNMCOMBOBOXEXW;
-typedef struct {
-	NMHDR   hdr;
-	int iItemid;
-	WCHAR   szText[CBEMAXSTRLEN];
-}NMCBEDRAGBEGINW, *LPNMCBEDRAGBEGINW, *PNMCBEDRAGBEGINW;
-typedef struct {
-	NMHDR   hdr;
-	int iItemid;
-	char    szText[CBEMAXSTRLEN];
-}NMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA;
-typedef struct tagNMIPADDRESS{
-	NMHDR hdr;
-	int iField;
-	int iValue;
-} NMIPADDRESS, *LPNMIPADDRESS;
-typedef struct tagLVKEYDOWN {
-	NMHDR hdr;
-	WORD wVKey;
-	UINT flags;
-} NMLVKEYDOWN, *LPNMLVKEYDOWN;
-typedef struct {
-	NMHDR hdr;
-	DWORD dwFlag;
-	int iWidth;
-	int iHeight;
-} NMPGCALCSIZE, *LPNMPGCALCSIZE;
-typedef struct {
-	NMHDR hdr;
-	BOOL fwKeys;
-	RECT rcParent;
-	int iDir;
-	int iXpos;
-	int iYpos;
-	int iScroll;
-} NMPGSCROLL, *LPNMPGSCROLL;
-typedef struct tagNMSELCHANGE {
-	NMHDR nmhdr;
-	SYSTEMTIME stSelStart;
-	SYSTEMTIME stSelEnd;
-} NMSELCHANGE, *LPNMSELCHANGE;
-typedef struct tagNMTBHOTITEM {
-	NMHDR hdr;
-	int idOld;
-	int idNew;
-	DWORD dwFlags;
-} NMTBHOTITEM, *LPNMTBHOTITEM;
-typedef struct {
-	NMHDR hdr;
-	DWORD dwMask;
-	int idCommand;
-	DWORD_PTR lParam;
-	int iImage;
-	LPSTR pszText;
-	int cchText;
-} NMTBDISPINFOA, *LPNMTBDISPINFOA;
-typedef struct {
-	NMHDR hdr;
-	DWORD dwMask;
-	int idCommand;
-	DWORD_PTR lParam;
-	int iImage;
-	LPWSTR pszText;
-	int cchText;
-} NMTBDISPINFOW, *LPNMTBDISPINFOW;
-typedef struct tagNMMOUSE {
-	NMHDR hdr;
-	DWORD_PTR dwItemSpec;
-	DWORD_PTR dwItemData;
-	POINT pt;
-	LPARAM dwHitInfo;
-} NMMOUSE, *LPNMMOUSE;
-#endif /*_WIN32_IE >= 0x0400 */
-#if (_WIN32_IE >= 0x0401)
-typedef struct tagNMTOOLTIPSCREATED
-{
-	NMHDR hdr;
-	HWND hwndToolTips;
-} NMTOOLTIPSCREATED, *LPNMTOOLTIPSCREATED;
-#endif
-typedef struct tagNMDATETIMECHANGE
-{
-	NMHDR nmhdr;
-	DWORD dwFlags;
-	SYSTEMTIME st;
-} NMDATETIMECHANGE, *LPNMDATETIMECHANGE;
-typedef struct {
-	NMHDR hdr;
-	BOOL fChanged;
-	int iNewSelection;
-	WCHAR szText[CBEMAXSTRLEN];
-	int iWhy;
-} NMCBEENDEDITW, *LPNMCBEENDEDITW, *PNMCBEENDEDITW;
-typedef struct {
-	NMHDR hdr;
-	BOOL fChanged;
-	int iNewSelection;
-	char szText[CBEMAXSTRLEN];
-	int iWhy;
-} NMCBEENDEDITA, *LPNMCBEENDEDITA,*PNMCBEENDEDITA;
-typedef struct _COLORMAP {
-	COLORREF from;
-	COLORREF to;
-} COLORMAP,*LPCOLORMAP;
-typedef struct {
-	UINT uNotification;
-	HWND hWnd;
-	POINT ptCursor;
-} DRAGLISTINFO,*LPDRAGLISTINFO;
-typedef struct _TBBUTTON {
-	int iBitmap;
-	int idCommand;
-	BYTE fsState;
-	BYTE fsStyle;
-	BYTE bReserved[2];
-	DWORD dwData;
-	int iString;
-} TBBUTTON,*PTBBUTTON,*LPTBBUTTON;
-typedef const TBBUTTON *LPCTBBUTTON;
-#if _WIN32_IE >= 0x400
-typedef struct {
-	UINT cbSize;
-	DWORD dwMask;
-	int idCommand;
-	int iImage;
-	BYTE fsState;
-	BYTE fsStyle;
-	WORD cx;
-	DWORD lParam;
-	LPSTR pszText;
-	int cchText;
-} TBBUTTONINFOA, *LPTBBUTTONINFOA;
-typedef struct {
-	UINT cbSize;
-	DWORD dwMask;
-	int idCommand;
-	int iImage;
-	BYTE fsState;
-	BYTE fsStyle;
-	WORD cx;
-	DWORD lParam;
-	LPWSTR pszText;
-	int cchText;
-} TBBUTTONINFOW, *LPTBBUTTONINFOW;
-typedef struct {
-	int iButton;
-	DWORD dwFlags;
-} TBINSERTMARK, *LPTBINSERTMARK;
-typedef struct tagLVBKIMAGEA {
-	ULONG ulFlags;              
-	HBITMAP hbm;
-	LPSTR pszImage;
-	UINT cchImageMax;
-	int xOffsetPercent;
-	int yOffsetPercent;
-} LVBKIMAGEA, *LPLVBKIMAGEA;
-typedef struct tagLVBKIMAGEW {
-	ULONG ulFlags;             
-	HBITMAP hbm;
-	LPWSTR pszImage;
-	UINT cchImageMax;
-	int xOffsetPercent;
-	int yOffsetPercent;
-} LVBKIMAGEW, *LPLVBKIMAGEW;
-#endif /* _WIN32_IE >= 0x400 */
-typedef struct {
-	NMHDR hdr;
-	int iItem;
-	TBBUTTON tbButton;
-	int cchText;
-	LPTSTR pszText;
-} TBNOTIFY,*LPTBNOTIFY;
-typedef struct {
-	HKEY hkr;
-	LPCTSTR pszSubKey;
-	LPCTSTR pszValueName;
-} TBSAVEPARAMS;
-typedef struct _IMAGEINFO {
-	HBITMAP hbmImage;
-	HBITMAP hbmMask;
-	int Unused1;
-	int Unused2;
-	RECT rcImage;
-} IMAGEINFO, *LPIMAGEINFO;
-typedef struct _IMAGELIST *HIMAGELIST;
-typedef struct _HDITEMA {
-	UINT mask;
-	int cxy;
-	LPSTR pszText;
-	HBITMAP hbm;
-	int cchTextMax;
-	int fmt;
-	LPARAM lParam;
-#if (_WIN32_IE >= 0x0300)
-	int iImage;
-	int iOrder;
-#endif
-#if (_WIN32_IE >= 0x0500)
-	UINT type;
-	LPVOID pvFilter;
-#endif
-} HDITEMA, * LPHDITEMA;
-typedef struct _HDITEMW {
-	UINT mask;
-	int cxy;
-	LPWSTR pszText;
-	HBITMAP hbm;
-	int cchTextMax;
-	int fmt;
-	LPARAM lParam;
-#if (_WIN32_IE >= 0x0300)
-	int iImage;
-	int iOrder;
-#endif
-#if (_WIN32_IE >= 0x0500)
-	UINT type;
-	LPVOID pvFilter;
-#endif
-} HDITEMW, * LPHDITEMW;
-/* for backward compatability */
-#define HD_ITEMA HDITEMA
-#define HD_ITEMW HDITEMW
-#define HD_ITEM HDITEM
-typedef struct _HD_LAYOUT {
-	RECT *prc;
-	WINDOWPOS *pwpos;
-} HDLAYOUT, *LPHDLAYOUT;
-#define HD_LAYOUT HDLAYOUT /*  backward compatability */
-typedef struct _HD_HITTESTINFO {
-	POINT pt;
-	UINT flags;
-	int iItem;
-} HD_HITTESTINFO, *LPHDHITTESTINFO;
-typedef struct _HD_NOTIFYA {
-	NMHDR hdr;
-	int iItem;
-	int iButton;
-	HD_ITEMA *pitem;
-} HD_NOTIFYA;
-typedef struct _HD_NOTIFYW {
-	NMHDR hdr;
-	int iItem;
-	int iButton;
-	HD_ITEMW *pitem;
-} HD_NOTIFYW;
-/* FIXME: NMHEADER structure (base for all events of the comctl controls)
-   is the same as HD_NOTIFY depending on the value of _WIN32_IE macro.
-   I'm defining both for now. */
-typedef struct _NMHEADERA {
-    NMHDR   hdr;
-    int     iItem;
-    int     iButton;
-    HD_ITEMA* pitem;
-}  NMHEADERA, *LPNMHEADERA;
-
-typedef struct _NMHEADERW {
-    NMHDR   hdr;
-    int     iItem;
-    int     iButton;
-    HD_ITEMW* pitem;
-}  NMHEADERW, *LPNMHEADERW;
-#ifdef UNICODE
-#define NMHEADER NMHEADERW
-#define LPNMHEADER LPNMHEADERW
-#else
-#define NMHEADER NMHEADERA
-#define LPNMHEADER LPNMHEADERA
-#endif
-/* End FIXME. */
-typedef struct tagNMHDDISPINFOA {
-    NMHDR   hdr;
-    int     iItem;
-    UINT    mask;
-    LPSTR   pszText;
-    int     cchTextMax;
-    int     iImage;
-    LPARAM  lParam;
-} NMHDDISPINFOA, *LPNMHDDISPINFOA;
-typedef struct tagNMHDDISPINFOW {
-    NMHDR   hdr;
-    int     iItem;
-    UINT    mask;
-    LPWSTR  pszText;
-    int     cchTextMax;
-    int     iImage;
-    LPARAM  lParam;
-} NMHDDISPINFOW, *LPNMHDDISPINFOW;
-typedef struct tagNMCUSTOMDRAWINFO {
-    NMHDR    hdr;
-    DWORD    dwDrawStage;
-    HDC      hdc;
-    RECT     rc;
-    DWORD    dwItemSpec;
-    UINT     uItemState;
-    LPARAM   lItemlParam;
-} NMCUSTOMDRAW, *LPNMCUSTOMDRAW;
-typedef struct tagNMLVCUSTOMDRAW {
-    NMCUSTOMDRAW nmcd;
-    COLORREF     clrText;
-    COLORREF     clrTextBk;
-#if _WIN32_IE >= 0x0400
-    int          iSubItem;
-#endif
-} NMLVCUSTOMDRAW, *LPNMLVCUSTOMDRAW;
-#if (_WIN32_IE >= 0x0400)
-typedef struct tagNMLVGETINFOTIPA
-{
-	NMHDR hdr;
-	DWORD dwFlags;
-	LPSTR pszText;
-	int cchTextMax;
-	int iItem;
-	int iSubItem;
-	LPARAM lParam;
-} NMLVGETINFOTIPA, *LPNMLVGETINFOTIPA;
-typedef struct tagNMLVGETINFOTIPW
-{
-	NMHDR hdr;
-	DWORD dwFlags;
-	LPWSTR pszText;
-	int cchTextMax;
-	int iItem;
-	int iSubItem;
-	LPARAM lParam;
-} NMLVGETINFOTIPW, *LPNMLVGETINFOTIPW;
-#endif /* _WIN32_IE >= 0x0400 */
-typedef struct tagNMTVCUSTOMDRAW {
-    NMCUSTOMDRAW nmcd;
-    COLORREF     clrText;
-    COLORREF     clrTextBk;
-#if _WIN32_IE >= 0x0400
-    int          iLevel;
-#endif
-} NMTVCUSTOMDRAW, *LPNMTVCUSTOMDRAW;
-#if (_WIN32_IE >= 0x400)
-typedef struct _NMTBCUSTOMDRAW {
-	NMCUSTOMDRAW nmcd;
-	HBRUSH hbrMonoDither;
-	HBRUSH hbrLines;
-	HPEN hpenLines;
-	COLORREF clrText;
-	COLORREF clrMark;
-	COLORREF clrTextHighlight;
-	COLORREF clrBtnFace;
-	COLORREF clrBtnHighlight;
-	COLORREF clrHighlightHotTrack;
-	RECT rcText;
-	int nStringBkMode;
-	int nHLStringBkMode;
-#if (_WIN32_WINNT >= 0x0501)
-	int iListGap;
-#endif
-} NMTBCUSTOMDRAW, * LPNMTBCUSTOMDRAW;
-typedef struct tagNMITEMACTIVATE {
-	NMHDR hdr;
-	int iItem;
-	int iSubItem;
-	UINT uNewState;
-	UINT uOldState;
-	UINT uChanged;
-	POINT ptAction;
-	LPARAM lParam;
-	UINT uKeyFlags;
-} NMITEMACTIVATE, *LPNMITEMACTIVATE;
-#endif /* _WIN32_IE >= 0x0400 */
-typedef struct tagTBADDBITMAP {
-	HINSTANCE hInst;
-	UINT nID;
-} TBADDBITMAP,*LPTBADDBITMAP;
-typedef struct tagTBSAVEPARAMSA {
-	HKEY hkr;
-	LPCSTR pszSubKey;
-	LPCSTR pszValueName;
-} TBSAVEPARAMSA;
-typedef struct tagTBSAVEPARAMSW {
-	HKEY hkr;
-	LPCWSTR pszSubKey;
-	LPCWSTR pszValueName;
-} TBSAVEPARAMSW;
-typedef struct {
-	HINSTANCE hInstOld;
-	UINT nIDOld;
-	HINSTANCE hInstNew;
-	UINT nIDNew;
-	int nButtons;
-} TBREPLACEBITMAP,*LPTBREPLACEBITMAP;
-typedef struct tagNMTOOLBARA {
-	NMHDR hdr;
-	int iItem;
-	TBBUTTON tbButton;
-	int cchText;
-	LPSTR pszText;
-#if (_WIN32_IE >= 0x500)
-	RECT    rcButton;
-#endif
-} NMTOOLBARA, *LPNMTOOLBARA;
-#define TBNOTIFYA NMTOOLBARA
-#define LPTBNOTIFYA LPNMTOOLBARA
-typedef struct tagNMTOOLBARW {
-	NMHDR hdr;
-	int iItem;
-	TBBUTTON tbButton;
-	int cchText;
-	LPWSTR pszText;
-#if (_WIN32_IE >= 0x500)
-	RECT    rcButton;
-#endif
-} NMTOOLBARW, *LPNMTOOLBARW;
-#define TBNOTIFYW NMTOOLBARW
-#define LPTBNOTIFYW LPNMTOOLBARW
-typedef struct tagTOOLINFOA {
-	UINT cbSize;
-	UINT uFlags;
-	HWND hwnd;
-	UINT uId;
-	RECT rect;
-	HINSTANCE hinst;
-	LPSTR lpszText;
-#if (_WIN32_IE >= 0x0300)
-	LPARAM lParam;
-#endif
-} TTTOOLINFOA,*LPTTTOOLINFOA,*PTOOLINFOA;
-#define TOOLINFOA TTTOOLINFOA
-#define LPTOOLINFOA LPTTTOOLINFOA
-#define TTTOOLINFOA_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpszText)
-#define TTTOOLINFOA_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lParam)
-#define TTTOOLINFOA_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOA, lpReserved)
-typedef struct tagTOOLINFOW {
-	UINT cbSize;
-	UINT uFlags;
-	HWND hwnd;
-	UINT uId;
-	RECT rect;
-	HINSTANCE hinst;
-	LPWSTR lpszText;
-#if (_WIN32_IE >= 0x0300)
-	LPARAM lParam;
-#endif
-} TTTOOLINFOW,*LPTTTOOLINFOW,*PTOOLINFOW;
-#define TOOLINFOW TTTOOLINFOW
-#define LPTOOLINFOW LPTTTOOLINFOW
-#define TTTOOLINFOW_V1_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpszText)
-#define TTTOOLINFOW_V2_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lParam)
-#define TTTOOLINFOW_V3_SIZE CCSIZEOF_STRUCT(TTTOOLINFOW, lpReserved)
-typedef struct _TT_HITTESTINFOA {
-	HWND hwnd;
-	POINT pt;
-	TOOLINFOA ti;
-} TTHITTESTINFOA,*LPTTHITTESTINFOA;
-#define LPHITTESTINFOA    LPTTHITTESTINFOA
-typedef struct _TT_HITTESTINFOW {
-	HWND hwnd;
-	POINT pt;
-	TOOLINFOW ti;
-} TTHITTESTINFOW,*LPTTHITTESTINFOW;
-#define LPHITTESTINFOW    LPTTHITTESTINFOW
-typedef struct tagNMTTDISPINFOA {
-	NMHDR hdr;
-	LPSTR lpszText;
-	char szText[80];
-	HINSTANCE hinst;
-	UINT uFlags;
-#if (_WIN32_IE >= 0x0300)
-	LPARAM lParam;
-#endif
-} NMTTDISPINFOA, *LPNMTTDISPINFOA;
-#define TOOLTIPTEXTA	NMTTDISPINFOA
-#define LPTOOLTIPTEXTA	LPNMTTDISPINFOA
-typedef struct tagNMTTDISPINFOW {
- 	NMHDR hdr;
- 	LPWSTR lpszText;
- 	WCHAR szText[80];
- 	HINSTANCE hinst;
- 	UINT uFlags;
-#if (_WIN32_IE >= 0x0300)
-	LPARAM lParam;
-#endif
-} NMTTDISPINFOW, *LPNMTTDISPINFOW;
-#define TOOLTIPTEXTW	NMTTDISPINFOW
-#define LPTOOLTIPTEXTW	LPNMTTDISPINFOW
-typedef struct _UDACCEL {
-	UINT nSec;
-	UINT nInc;
-} UDACCEL,*LPUDACCEL;
-typedef struct _NM_UPDOWN {
-	NMHDR hdr;
-	int iPos;
-	int iDelta;
-} NMUPDOWN,*LPNMUPDOWN;
-/* for backward compatability */
-#define NM_UPDOWN NMUPDOWN 
-#define LPNM_UPDOWN LPNMUPDOWN 
-typedef struct _LVITEMA {
-	UINT mask;
-	int iItem;
-	int iSubItem;
-	UINT state;
-	UINT stateMask;
-	LPSTR pszText;
-	int cchTextMax;
-	int iImage;
-	LPARAM lParam;
-#if (_WIN32_IE >= 0x0300)
-	int iIndent;
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-	int iGroupId;
-	UINT cColumns;
-	PUINT puColumns;
-#endif
-} LVITEMA, FAR *LPLVITEMA;
-#define _LV_ITEMA _LVITEMA
-#define LV_ITEMA LVITEMA
-typedef struct _LVITEMW {
-	UINT mask;
-	int iItem;
-	int iSubItem;
-	UINT state;
-	UINT stateMask;
-	LPWSTR pszText;
-	int cchTextMax;
-	int iImage;
-	LPARAM lParam;
-#if (_WIN32_IE >= 0x0300)
-	int iIndent;
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-	int iGroupId;
-	UINT cColumns;
-	PUINT puColumns;
-#endif
-} LVITEMW, FAR *LPLVITEMW;
-#define _LV_ITEMW _LVITEMW
-#define LV_ITEMW LVITEMW
-typedef struct tagLVFINDINFOA {
-	UINT flags;
-	LPCSTR psz;
-	LPARAM lParam;
-	POINT pt;
-	UINT vkDirection;
-} LVFINDINFOA, FAR* LPFINDINFOA;
-#define _LV_FINDINFOA tagLVFINDINFOA
-#define LV_FINDINFOA LVFINDINFOA
-typedef struct tagLVFINDINFOW {
-	UINT flags;
-	LPCWSTR psz;
-	LPARAM lParam;
-	POINT pt;
-	UINT vkDirection;
-} LVFINDINFOW, FAR* LPFINDINFOW;
-#define _LV_FINDINFOW tagLVFINDINFOW
-#define LV_FINDINFOW LVFINDINFOW
-typedef struct _LVHITTESTINFO {
-	POINT pt;
-	UINT flags;
-	int iItem;
-#if (_WIN32_IE >= 0x0300)
-	int iSubItem;
-#endif
-} LVHITTESTINFO, FAR *LPLVHITTESTINFO;
-#define _LV_HITTESTINFO _LVHITTESTINFO
-#define LV_HITTESTINFO LVHITTESTINFO
-typedef struct _LVCOLUMNA {
-	UINT mask;
-	int fmt;
-	int cx;
-	LPSTR pszText;
-	int cchTextMax;
-	int iSubItem;
-#if (_WIN32_IE >= 0x0300)
-	int iImage;
-	int iOrder;
-#endif
-} LVCOLUMNA, FAR *LPLVCOLUMNA;
-#define _LV_COLUMNA _LVCOLUMNA
-#define LV_COLUMNA LVCOLUMNA
-typedef struct _LVCOLUMNW {
-	UINT mask;
-	int fmt;
-	int cx;
-	LPWSTR pszText;
-	int cchTextMax;
-	int iSubItem;
-#if (_WIN32_IE >= 0x0300)
-	int iImage;
-	int iOrder;
-#endif
-} LVCOLUMNW, FAR *LPLVCOLUMNW;
-#define _LV_COLUMNW _LVCOLUMNW
-#define LV_COLUMNW LVCOLUMNW
-typedef int(CALLBACK *PFNLVCOMPARE)(LPARAM,LPARAM,LPARAM);
-typedef struct tagNMLISTVIEW {
-	NMHDR hdr;
-	int iItem;
-	int iSubItem;
-	UINT uNewState;
-	UINT uOldState;
-	UINT uChanged;
-	POINT ptAction;
-	LPARAM lParam;
-} NMLISTVIEW, *LPNMLISTVIEW;
-/* for backward compatability */
-#define _NM_LISTVIEW  tagNMLISTVIEW
-#define NM_LISTVIEW NMLISTVIEW
-#define LPNM_LISTVIEW LPNMLISTVIEW
-typedef struct tagNMLVDISPINFOA {
-	NMHDR hdr;
-	LV_ITEMA item;
-} NMLVDISPINFOA, FAR *LPNMLVDISPINFOA;
-#define _LV_DISPINFOA tagNMLVDISPINFOA
-#define LV_DISPINFOA NMLVDISPINFOA
-typedef struct tagNMLVDISPINFOW {
-	NMHDR hdr;
-	LV_ITEMW item;
-} NMLVDISPINFOW, FAR *LPNMLVDISPINFOW;
-#define _LV_DISPINFOW tagNMLVDISPINFOW
-#define LV_DISPINFOW NMLVDISPINFOW
-typedef struct _LV_KEYDOWN {
-	NMHDR hdr;
-	WORD wVKey;
-	UINT flags;
-} LV_KEYDOWN;
-typedef struct tagNMLVCACHEHINT {
-	NMHDR hdr;
-	int iFrom;
-	int iTo;
-} NMLVCACHEHINT, *PNMLVCACHEHINT;
-#define NM_CACHEHINT NMLVCACHEHINT
-typedef struct _TREEITEM *HTREEITEM;
-typedef struct tagTVITEMA {
-	UINT mask;
-	HTREEITEM hItem;
-	UINT state;
-	UINT stateMask;
-	LPSTR pszText;
-	int cchTextMax;
-	int iImage;
-	int iSelectedImage;
-	int cChildren;
-	LPARAM lParam;
-} TVITEMA,*LPTVITEMA;
-#define _TV_ITEMA tagTVITEMA
-#define TV_ITEMA TVITEMA
-#define LPTV_ITEMA LPTVITEMA
-typedef struct tagTVITEMW {
-	UINT mask;
-	HTREEITEM hItem;
-	UINT state;
-	UINT stateMask;
-	LPWSTR pszText;
-	int cchTextMax;
-	int iImage;
-	int iSelectedImage;
-	int cChildren;
-	LPARAM lParam;
-} TVITEMW,*LPTVITEMW;
-#define _TV_ITEMW tagTVITEMW
-#define TV_ITEMW TVITEMW
-#define LPTV_ITEMW LPTVITEMW
-#if (_WIN32_IE >= 0x0400)
-typedef struct tagTVITEMEXA {
-	UINT mask;
-	HTREEITEM hItem;
-	UINT state;
-	UINT stateMask;
-	LPSTR pszText;
-	int cchTextMax;
-	int iImage;
-	int iSelectedImage;
-	int cChildren;
-	LPARAM lParam;
-	int iIntegral;
-} TVITEMEXA, *LPTVITEMEXA;
-typedef struct tagTVITEMEXW {
-	UINT mask;
-	HTREEITEM hItem;
-	UINT state;
-	UINT stateMask;
-	LPWSTR pszText;
-	int cchTextMax;
-	int iImage;
-	int iSelectedImage;
-	int cChildren;
-	LPARAM lParam;
-	int iIntegral;
-} TVITEMEXW, *LPTVITEMEXW;
-#endif /* _WIN32_IE >= 0x0400 */
-typedef struct tagTVINSERTSTRUCTA {
-	HTREEITEM hParent;
-	HTREEITEM hInsertAfter;
-#if (_WIN32_IE >= 0x0400)
-	_ANONYMOUS_UNION union {
-	TVITEMEXA itemex;
-	TV_ITEMA item;
-	} DUMMYUNIONNAME;
-#else
-	TV_ITEMA item;
-#endif
-} TVINSERTSTRUCTA,*LPTVINSERTSTRUCTA;
-#define _TV_INSERTSTRUCTA tagTVINSERTSTRUCTA
-#define TV_INSERTSTRUCTA TVINSERTSTRUCTA
-#define LPTV_INSERTSTRUCTA LPTVINSERTSTRUCTA
-typedef struct tagTVINSERTSTRUCTW {
-	HTREEITEM hParent;
-	HTREEITEM hInsertAfter;
-#if (_WIN32_IE >= 0x0400)
-	_ANONYMOUS_UNION union {
-	  TVITEMEXW itemex;
-	  TV_ITEMW  item;
-	} DUMMYUNIONNAME;
-#else
-	TV_ITEMW item;
-#endif
-} TVINSERTSTRUCTW,*LPTVINSERTSTRUCTW;
-#define _TV_INSERTSTRUCTW tagTVINSERTSTRUCTW
-#define TV_INSERTSTRUCTW TVINSERTSTRUCTW
-#define LPTV_INSERTSTRUCTW LPTVINSERTSTRUCTW
-typedef struct tagTVHITTESTINFO {
-	POINT pt;
- 	UINT flags;
-	HTREEITEM hItem;
-} TVHITTESTINFO, *LPTVHITTESTINFO;
-#define _TV_HITTESTINFO tagTVHITTESTINFO
-#define TV_HITTESTINFO TVHITTESTINFO
-#define LPTV_HITTESTINFO LPTVHITTESTINFO
-typedef int(CALLBACK *PFNTVCOMPARE)(LPARAM,LPARAM,LPARAM);
-typedef struct tagTVSORTCB {
-	HTREEITEM hParent;
-	PFNTVCOMPARE lpfnCompare;
-	LPARAM lParam;
-} TVSORTCB,*LPTVSORTCB;
-#define _TV_SORTCB tagTVSORTCB
-#define TV_SORTCB TVSORTCB
-#define LPTV_SORTCB LPTVSORTCB
-typedef struct tagNMTREEVIEWA {
-	NMHDR hdr;
-	UINT action;
-	TV_ITEMA itemOld;
-	TV_ITEMA itemNew;
-	POINT ptDrag;
-} NMTREEVIEWA,*LPNMTREEVIEWA;
-#define _NM_TREEVIEWA tagNMTREEVIEWA
-#define NM_TREEVIEWA NMTREEVIEWA
-#define LPNM_TREEVIEWA LPNMTREEVIEWA
-typedef struct tagNMTREEVIEWW {
-	NMHDR hdr;
-	UINT action;
-	TV_ITEMW itemOld;
-	TV_ITEMW itemNew;
-	POINT ptDrag;
-} NMTREEVIEWW,*LPNMTREEVIEWW;
-#define _NM_TREEVIEWW tagNMTREEVIEWW
-#define NM_TREEVIEWW NMTREEVIEWW
-#define LPNM_TREEVIEWW LPNMTREEVIEWW
-typedef struct tagNMTVDISPINFOA {
-	NMHDR hdr;
-	TVITEMA item;
-} NMTVDISPINFOA, *LPNMTVDISPINFOA;
-#define _TV_DISPINFOA tagNMTVDISPINFOA
-#define TV_DISPINFOA NMTVDISPINFOA
-typedef struct tagNMTVDISPINFOW {
-	NMHDR hdr;
-	TVITEMW item;
-} NMTVDISPINFOW, *LPNMTVDISPINFOW;
-#define _TV_DISPINFOW tagNMTVDISPINFOW
-#define TV_DISPINFOW NMTVDISPINFOW
-typedef struct _TV_KEYDOWN {
-	NMHDR hdr;
-	WORD wVKey;
-	UINT flags;
-} TV_KEYDOWN;
-typedef struct _TC_ITEMHEADERA {
-	UINT mask;
-	UINT lpReserved1;
-	UINT lpReserved2;
-	LPSTR pszText;
-	int cchTextMax;
-	int iImage;
-} TC_ITEMHEADERA;
-typedef struct _TC_ITEMHEADERW {
-	UINT mask;
-	UINT lpReserved1;
-	UINT lpReserved2;
-	LPWSTR pszText;
-	int cchTextMax;
-	int iImage;
-} TC_ITEMHEADERW;
-typedef struct tagTCITEMA {
-	UINT mask;
-#if (_WIN32_IE >= 0x0300)
-	DWORD dwState;
-	DWORD dwStateMask;
-#else
- 	UINT lpReserved1;
- 	UINT lpReserved2;
-#endif
-	LPSTR pszText;
-	int cchTextMax;
-	int iImage;
-	LPARAM lParam;
-} TCITEMA, *LPTCITEMA;
-#define TC_ITEMA TCITEMA
-typedef struct tagTCITEMW {
-	UINT mask;
-#if (_WIN32_IE >= 0x0300)
-	DWORD dwState;
-	DWORD dwStateMask;
-#else
- 	UINT lpReserved1;
- 	UINT lpReserved2;
-#endif
-	LPWSTR pszText;
-	int cchTextMax;
-	int iImage;
-	LPARAM lParam;
-} TCITEMW, *LPTCITEMW;
-#define TC_ITEMW TCITEMW
-typedef struct tagTCHITTESTINFO {
-	POINT pt;
-	UINT flags;
-} TCHITTESTINFO, *LPTCHITTESTINFO;
-#define TC_HITTESTINFO TCHITTESTINFO
-#define LPTC_HITTESTINFO LPTCHITTESTINFO
-typedef struct _TC_KEYDOWN {
-	NMHDR hdr;
-	WORD wVKey;
-	UINT flags;
-} TC_KEYDOWN;
-#if (_WIN32_IE >= 0x0300)
-typedef struct tagINITCOMMONCONTROLSEX {
-	DWORD dwSize;
-	DWORD dwICC;
-} INITCOMMONCONTROLSEX,*LPINITCOMMONCONTROLSEX;
-#endif
-typedef struct tagPBRANGE {
-	int iLow;
-	int iHigh;
-} PBRANGE,*PPBRANGE;
-typedef struct tagCOLORSCHEME {
-	DWORD dwSize;
-	COLORREF clrBtnHighlight;
-	COLORREF clrBtnShadow;
-} COLORSCHEME,*LPCOLORSCHEME;
-typedef struct tagMCHITTESTINFO {
-	UINT cbSize;
-	POINT pt;
-	UINT uHit;
-	SYSTEMTIME st;
-}MCHITTESTINFO, *PMCHITTESTINFO;
-typedef DWORD MONTHDAYSTATE;
-typedef MONTHDAYSTATE *LPMONTHDAYSTATE;
-typedef struct tagNMDAYSTATE {
-	NMHDR nmhdr;
-	SYSTEMTIME stStart;
-	int cDayState;
-	LPMONTHDAYSTATE prgDayState;
-}NMDAYSTATE,*LPNMDAYSTATE;
-typedef struct tagREBARINFO {
-	UINT cbSize;
-	UINT fMask;
-	HIMAGELIST himl;
-} REBARINFO,*LPREBARINFO;
-typedef struct tagREBARBANDINFOA {
-	UINT cbSize;
-	UINT fMask;
-	UINT fStyle;
-	COLORREF clrFore;
-	COLORREF clrBack;
-	LPSTR lpText;
-	UINT cch;
-	int iImage;
-	HWND hwndChild;
-	UINT cxMinChild;
-	UINT cyMinChild;
-	UINT cx;
-	HBITMAP hbmBack;
-	UINT wID;
-#if (_WIN32_IE >= 0x0400)
-	UINT cyChild;
-	UINT cyMaxChild;
-	UINT cyIntegral;
-	UINT cxIdeal;
-	LPARAM lParam;
-	UINT cxHeader;
-#endif
-} REBARBANDINFOA,*LPREBARBANDINFOA;
-typedef struct tagREBARBANDINFOW {
-	UINT cbSize;
-	UINT fMask;
-	UINT fStyle;
-	COLORREF clrFore;
-	COLORREF clrBack;
-	LPWSTR lpText;
-	UINT cch;
-	int iImage;
-	HWND hwndChild;
-	UINT cxMinChild;
-	UINT cyMinChild;
-	UINT cx;
-	HBITMAP hbmBack;
-	UINT wID;
-#if (_WIN32_IE >= 0x0400)
-	UINT cyChild;
-	UINT cyMaxChild;
-	UINT cyIntegral;
-	UINT cxIdeal;
-	LPARAM lParam;
-	UINT cxHeader;
-#endif
-} REBARBANDINFOW,*LPREBARBANDINFOW;
-typedef REBARBANDINFOA const *LPCREBARBANDINFOA;
-typedef REBARBANDINFOW const *LPCREBARBANDINFOW;
-#define REBARBANDINFOA_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOA,wID)
-#define REBARBANDINFOW_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOW, wID)
-#if (_WIN32_IE >= 0x0300)
-typedef struct tagIMAGELISTDRAWPARAMS {
-	DWORD cbSize;
-	HIMAGELIST himl;
-	int i;
-	HDC hdcDst;
-	int x;
-	int y;
-	int cx;
-	int cy;
-	int xBitmap;        
-	int yBitmap;        
-	COLORREF rgbBk;
-	COLORREF rgbFg;
-	UINT fStyle;
-	DWORD dwRop;
-#if (_WIN32_WINNT >= 0x0501)
-	DWORD fState;
-	DWORD Frame;
-	COLORREF crEffect;
-#endif
-} IMAGELISTDRAWPARAMS,*LPIMAGELISTDRAWPARAMS;
-#endif /* (_WIN32_IE >= 0x0300) */
-#if (_WIN32_IE >= 0x0400)
-typedef struct tagNMREBARCHILDSIZE {
-	NMHDR hdr;
-	UINT uBand;
-	UINT wID;
-	RECT rcChild;
-	RECT rcBand;
-} NMREBARCHILDSIZE,*LPNMREBARCHILDSIZE;
-typedef struct tagNMREBAR {
-	NMHDR hdr;
-	DWORD dwMask;
-	UINT uBand;
-	UINT fStyle;
-	UINT wID;
-	LPARAM lParam;
-} NMREBAR,*LPNMREBAR;
-typedef struct tagNMRBAUTOSIZE {
-	NMHDR hdr;
-	BOOL fChanged;
-	RECT rcTarget;
-	RECT rcActual;
-} NMRBAUTOSIZE,*LPNMRBAUTOSIZE;
-#if (_WIN32_IE >= 0x0500)
-typedef struct tagNMREBARCHEVRON {
-	NMHDR hdr;
-	UINT uBand;
-	UINT wID;
-	LPARAM lParam;
-	RECT rc;
-	LPARAM lParamNM;
-} NMREBARCHEVRON, *LPNMREBARCHEVRON;
-#endif
-typedef struct _RB_HITTESTINFO {
-	POINT pt;
-	UINT flags;
-	int iBand;
-} RBHITTESTINFO,*LPRBHITTESTINFO;
-#endif
-typedef struct _DSA *HDSA;
-typedef struct _DPA *HDPA;
-typedef INT (CALLBACK *PFNDPAENUMCALLBACK)(PVOID,PVOID);
-typedef INT (CALLBACK *PFNDSAENUMCALLBACK)(PVOID,PVOID);
-typedef INT (CALLBACK *PFNDPACOMPARE)(PVOID,PVOID,LPARAM);
-#if (_WIN32_WINNT >= 0x0501)
-typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND,UINT,WPARAM,LPARAM,UINT_PTR,DWORD_PTR);
-#endif /* _WIN32_WINNT >= 0x0501 */
-
-#define INDEXTOOVERLAYMASK(i) ((i)<<8)
-#define INDEXTOSTATEIMAGEMASK(i) ((i)<<12)
-#define HANDLE_WM_NOTIFY(h,w,l,f) (f)((h),(int)(w),(NMHDR*)(l))
-#define FORWARD_WM_NOTIFY(h,i,p,f) (LRESULT)(f)((h),WM_NOTIFY,(WPARAM)(int)(i),(LPARAM)(NMHDR*)(p))
-#define CCSIZEOF_STRUCT(s,m) (((int)((PBYTE)(&((s*)0)->m)-((PBYTE)((s*)0))))+sizeof(((s*)0)->m))
-#define MAKEIPADDRESS(b1,b2,b3,b4) ((LPARAM)(((DWORD)(b1)<<24)+((DWORD)(b2)<<16)+((DWORD)(b3)<<8)+((DWORD)(b4))))
-#define MAKEIPRANGE(low,high) ((LPARAM)(WORD)(((BYTE)(high)<<8)+(BYTE)(low)))
-#define FIRST_IPADDRESS(a) ((a>>24) & 0xff)
-#define SECOND_IPADDRESS(a) ((a>>16) & 0xff)
-#define THIRD_IPADDRESS(a)  ((a>>8) & 0xff)
-#define FOURTH_IPADDRESS(a) (a & 0xff)
-#define Animate_Create(w,i,s,hI) CreateWindow(ANIMATE_CLASS,NULL,s,0,0,0,0,w,(HMENU)(i),hI,NULL)
-#define Animate_Open(w,f) (BOOL)SNDMSG(w,ACM_OPEN,0,(LPARAM)f)
-#define Animate_Play(w,f,t,r) (BOOL)SNDMSG(w,ACM_PLAY,(r),(LPARAM)MAKELONG(f,t))
-#define Animate_Stop(w)	(BOOL)SNDMSG(w,ACM_STOP,0,0)
-#define Animate_Close(w)	Animate_Open(w,NULL)
-#define Animate_Seek(w,f)	Animate_Play(w,f,f,1)
-HBITMAP WINAPI CreateMappedBitmap(HINSTANCE,int,UINT,LPCOLORMAP,int);
-HWND WINAPI CreateStatusWindowA(LONG,LPCSTR,HWND,UINT);
-HWND WINAPI CreateStatusWindowW(LONG,LPCWSTR,HWND,UINT);
-HWND WINAPI CreateToolbarEx(HWND,DWORD,UINT,int,HINSTANCE,UINT,LPCTBBUTTON,int,int,int,int,int,UINT);
-HWND WINAPI CreateUpDownControl(DWORD,int,int,int,int,HWND,int,HINSTANCE,HWND,int,int,int);
-#define DateTime_GetMonthCal(hwnd) SNDMSG(hwnd, DTM_GETMONTHCAL, 0, 0)
-#define DateTime_GetMonthCalColor(hwnd, icolor) SNDMSG(hwnd, DTM_GETMONTHCAL, (WPARAM)icolor,0)
-#define DateTime_GetMonthCalFont(hwnd) SNDMSG(hwnd,DTM_GETMCFONT,0,0)
-#define DateTime_GetRange(hwnd,lpsystimearray) SNDMSG(hwnd,DTM_GETRANGE,0,(LPARAM)lpsystimearray)
-#define DateTime_GetSystemTime(hwnd,lpsystime) SNDMSG(hwnd,DTM_GETSYSTEMTIME,0,(LPARAM)lpsystime)
-#define DateTime_SetFormat(hwnd,lpszformat) SNDMSG(hwnd,DTM_SETFORMAT,0,(LPARAM)lpszformat)
-#define DateTime_SetMonthCalColor(hwnd,icolor,clr) SNDMSG(hwnd,DTM_SETMCCOLOR,(WPARAM)icolor,(LPARAM)clr)
-#define DateTime_SetMonthCalFont(hwnd,hfont,lparam) SNDMSG(hwnd,DTM_SETMCFONT,(WPARAM)hfont,(LPARAM)lparam)
-#define DateTime_SetRange(hwnd,flags,lpsystimearray) SNDMSG(hwnd,DTM_SETRANGE,(WPARAM)flags,(LPARAM)lpsystimearray)
-#define DateTime_SetSystemTime(hwnd,flag,lpsystime) SNDMSG(hwnd,DTM_SETSYSTEMTIME,(WPARAM)flag,(LPARAM)lpsystime)
-void WINAPI DrawInsert(HWND,HWND,int);
-void WINAPI DrawStatusTextA(HDC,LPRECT,LPCSTR,UINT);
-void WINAPI DrawStatusTextW(HDC,LPRECT,LPCWSTR,UINT);
-void WINAPI GetEffectiveClientRect(HWND,LPRECT,LPINT);
-#define Header_GetItemCount(w) (int)SNDMSG((w),HDM_GETITEMCOUNT,0,0)
-#define Header_InsertItem(w,i,phdi) (int)SNDMSG((w),HDM_INSERTITEM,(WPARAM)(int)(i),(LPARAM)(const HD_ITEM*)(phdi))
-#define Header_DeleteItem(w,i) (BOOL)SNDMSG((w),HDM_DELETEITEM,(WPARAM)(int)(i),0)
-#define Header_GetItem(w,i,phdi) (BOOL)SNDMSG((w),HDM_GETITEM,(WPARAM)(int)(i),(LPARAM)(HD_ITEM*)(phdi))
-#define Header_SetItem(w,i,phdi) (BOOL)SNDMSG((w),HDM_SETITEM,(WPARAM)(int)(i),(LPARAM)(const HD_ITEM*)(phdi))
-#define Header_Layout(w,l) (BOOL)SNDMSG((w),HDM_LAYOUT,0,(LPARAM)(HD_LAYOUT*)(l))
-#if (_WIN32_IE >= 0x0300)
-#define Header_OrderToIndex(w,o) (int)SNDMSG((w),HDM_ORDERTOINDEX,(WPARAM)(o),0)
-#define Header_GetItemRect(w,i,r) (BOOL)SNDMSG((w),HDM_GETITEMRECT,(WPARAM)(i),(LPARAM)(r))
-#define Header_GetOrderArray(w,l,a) (BOOL)SNDMSG((w),HDM_GETORDERARRAY,(WPARAM)(l),(LPARAM)(a))
-#define Header_SetOrderArray(w,l,a) (BOOL)SNDMSG((w),HDM_SETORDERARRAY,(WPARAM)(l),(LPARAM)(a))
-#endif
-HDSA WINAPI DSA_Create(INT,INT);
-BOOL WINAPI DSA_Destroy(HDSA);
-VOID WINAPI DSA_DestroyCallback(HDSA,PFNDSAENUMCALLBACK,PVOID);
-PVOID WINAPI DSA_GetItemPtr(HDSA,INT);
-INT WINAPI DSA_InsertItem(HDSA,INT,PVOID);
-HDPA WINAPI DPA_Create(INT);
-BOOL WINAPI DPA_Destroy(HDPA);
-PVOID WINAPI DPA_DeletePtr(HDPA,INT);
-BOOL WINAPI DPA_DeleteAllPtrs(HDPA);
-VOID WINAPI DPA_EnumCallback(HDPA,PFNDPAENUMCALLBACK,PVOID);
-VOID WINAPI DPA_DestroyCallback(HDPA,PFNDPAENUMCALLBACK,PVOID);
-BOOL WINAPI DPA_SetPtr(HDPA,INT,PVOID);
-INT WINAPI DPA_InsertPtr(HDPA,INT,PVOID);
-PVOID WINAPI DPA_GetPtr(HDPA,INT_PTR);
-BOOL WINAPI DPA_Sort(HDPA,PFNDPACOMPARE,LPARAM);
-INT WINAPI DPA_Search(HDPA,PVOID,INT,PFNDPACOMPARE,LPARAM,UINT);
-BOOL WINAPI Str_SetPtrW(LPWSTR*,LPCWSTR);
-#if (_WIN32_IE >= 0x0400)
-BOOL WINAPI FlatSB_EnableScrollBar(HWND,INT,UINT);
-BOOL WINAPI FlatSB_ShowScrollBar(HWND,INT,BOOL);
-BOOL WINAPI FlatSB_GetScrollRange(HWND,INT,LPINT,LPINT);
-BOOL WINAPI FlatSB_GetScrollInfo(HWND,INT,LPSCROLLINFO);
-INT WINAPI FlatSB_GetScrollPos(HWND,INT);
-BOOL WINAPI FlatSB_GetScrollProp(HWND,INT,LPINT);
-#ifdef _WIN64
-BOOL WINAPI FlatSB_GetScrollPropPtr(HWND,INT,PINT_PTR);
-#else
-#define FlatSB_GetScrollPropPtr FlatSB_GetScrollProp
-#endif
-INT WINAPI FlatSB_SetScrollPos(HWND,INT,INT,BOOL);
-INT WINAPI FlatSB_SetScrollInfo(HWND,INT,LPSCROLLINFO,BOOL);
-INT WINAPI FlatSB_SetScrollRange(HWND,INT,INT,INT,BOOL);
-BOOL WINAPI FlatSB_SetScrollProp(HWND,UINT,INT_PTR,BOOL);
-#define FlatSB_SetScrollPropPtr FlatSB_SetScrollProp
-BOOL WINAPI InitializeFlatSB(HWND);
-HRESULT WINAPI UninitializeFlatSB(HWND);
-#endif /* _WIN32_IE >= 0x0400 */
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI SetWindowSubclass(HWND,SUBCLASSPROC,UINT_PTR,DWORD_PTR);
-BOOL WINAPI GetWindowSubclass(HWND,SUBCLASSPROC,UINT_PTR,DWORD_PTR*);
-BOOL WINAPI RemoveWindowSubclass(HWND,SUBCLASSPROC,UINT_PTR);
-LRESULT WINAPI DefSubclassProc(HWND,UINT,WPARAM,LPARAM);
-INT WINAPI DrawShadowText(HDC,LPCWSTR,UINT,RECT*,DWORD,COLORREF,COLORREF,INT,INT);
-#endif /* _WIN32_WINNT >= 0x0501 */
-int WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP);
-#define ImageList_AddIcon(l,i) ImageList_ReplaceIcon(l,-1,i)
-int WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF);
-BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,int,int,int);
-HIMAGELIST WINAPI ImageList_Create(int,int,UINT,int,int);
-BOOL WINAPI ImageList_Destroy(HIMAGELIST);
-BOOL WINAPI ImageList_DragEnter(HWND,int,int);
-BOOL WINAPI ImageList_DragLeave(HWND);
-BOOL WINAPI ImageList_DragMove(int,int);
-BOOL WINAPI ImageList_DragShowNolock(BOOL);
-BOOL WINAPI ImageList_Draw(HIMAGELIST,int,HDC,int,int,UINT);
-BOOL WINAPI ImageList_DrawEx(HIMAGELIST,int,HDC,int,int,int,int,COLORREF,COLORREF,UINT);
-void WINAPI ImageList_EndDrag(VOID);
-#define ImageList_ExtractIcon(h,l,i) ImageList_GetIcon(l,i,0)
-COLORREF WINAPI ImageList_GetBkColor(HIMAGELIST);
-HIMAGELIST WINAPI ImageList_GetDragImage(LPPOINT,LPPOINT);
-HICON WINAPI ImageList_GetIcon(HIMAGELIST,int,UINT);
-BOOL WINAPI ImageList_GetIconSize(HIMAGELIST,int*,int*);
-int WINAPI ImageList_GetImageCount(HIMAGELIST);
-BOOL WINAPI ImageList_GetImageInfo(HIMAGELIST,int,IMAGEINFO*);
-#define ImageList_LoadBitmap(h,l,x,G,M) ImageList_LoadImage(h,l,x,G,M,IMAGE_BITMAP,0)
-HIMAGELIST WINAPI ImageList_LoadImageA(HINSTANCE,LPCSTR,int,int,COLORREF,UINT,UINT);
-HIMAGELIST WINAPI ImageList_LoadImageW(HINSTANCE,LPCWSTR,int,int,COLORREF,UINT,UINT);
-HIMAGELIST WINAPI ImageList_Merge(HIMAGELIST,int,HIMAGELIST,int,int,int);
-BOOL WINAPI ImageList_Remove(HIMAGELIST,int);
-#define ImageList_RemoveAll(l) ImageList_Remove(l,-1)
-BOOL WINAPI ImageList_Replace(HIMAGELIST,int,HBITMAP,HBITMAP);
-int WINAPI ImageList_ReplaceIcon(HIMAGELIST,int,HICON);
-COLORREF WINAPI ImageList_SetBkColor(HIMAGELIST,COLORREF);
-BOOL WINAPI ImageList_SetDragCursorImage(HIMAGELIST,int,int,int);
-BOOL WINAPI ImageList_SetIconSize(HIMAGELIST,int,int);
-BOOL WINAPI ImageList_SetOverlayImage(HIMAGELIST,int,int);
-#ifdef _OBJIDL_H
-HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
-BOOL WINAPI ImageList_Write(HIMAGELIST,LPSTREAM);
-#endif
-void WINAPI InitCommonControls(void);
-#if (_WIN32_IE >= 0x0300)
-BOOL WINAPI InitCommonControlsEx(LPINITCOMMONCONTROLSEX);
-#endif
-int WINAPI LBItemFromPt(HWND,POINT,BOOL);
-#define ListView_GetBkColor(w) (COLORREF)SNDMSG((w),LVM_GETBKCOLOR,0,0)
-#define ListView_GetImageList(w,i) (HIMAGELIST)SNDMSG((w),LVM_GETIMAGELIST,(i),0)
-#define ListView_GetItemCount(w) (int)SNDMSG((w),LVM_GETITEMCOUNT,0,0)
-#define ListView_GetItem(w,i) (BOOL)SNDMSG((w),LVM_GETITEM,0,(LPARAM)(i))
-#define ListView_SetBkColor(w,c) (BOOL)SNDMSG((w),LVM_SETBKCOLOR,0,(LPARAM)c)
-#define ListView_SetImageList(w,h,i) (HIMAGELIST)(UINT)SNDMSG((w),LVM_SETIMAGELIST,(i),(LPARAM)(h))
-#define ListView_SetItem(w,i) (BOOL)SNDMSG((w),LVM_SETITEM,0,(LPARAM)(const LV_ITEM*)(i))
-#define ListView_InsertItem(w,i) (int)SNDMSG((w),LVM_INSERTITEM,0,(LPARAM)(const LV_ITEM*)(i))
-#define ListView_DeleteItem(w,i) (BOOL)SNDMSG((w),LVM_DELETEITEM,i,0)
-#define ListView_DeleteAllItems(w) (BOOL)SNDMSG((w),LVM_DELETEALLITEMS,0,0)
-#define ListView_GetCallbackMask(w) (BOOL)SNDMSG((w),LVM_GETCALLBACKMASK,0,0)
-#define ListView_SetCallbackMask(w,m) (BOOL)SNDMSG((w),LVM_SETCALLBACKMASK,m,0)
-#define ListView_GetNextItem(w,i,f) (int)SNDMSG((w),LVM_GETNEXTITEM,i,MAKELPARAM((f),0))
-#define ListView_FindItem(w,i,p) (int)SNDMSG((w), LVM_FINDITEM,(WPARAM)i,(LPARAM)(const LV_FINDINFO*)(p))
-#define ListView_GetItemRect(w,i,p,c) (BOOL)SNDMSG((w),LVM_GETITEMRECT,i,((p)?(((LPRECT)(p))->left=(c),(LPARAM)(LPRECT)(p)):0))
-#define ListView_SetItemPosition(w,i,x,y) (BOOL)SNDMSG((w),LVM_SETITEMPOSITION,i,MAKELPARAM(x,y))
-#define ListView_GetItemPosition(w,i,p) (BOOL)SNDMSG((w),LVM_GETITEMPOSITION,i,(LPARAM)p)
-#define ListView_GetItemSpacing(w,f) (DWORD)SNDMSG((w),LVM_GETITEMSPACING,f,0)
-#define ListView_GetStringWidth(w,s) (int)SNDMSG((w),LVM_GETSTRINGWIDTH,0,(LPARAM)s)
-#define ListView_HitTest(w,p) (int)SNDMSG((w),LVM_HITTEST,0,(LPARAM)(LV_HITTESTINFO*)(p))
-#define ListView_EnsureVisible(w,i,f) (BOOL)SNDMSG((w),LVM_ENSUREVISIBLE,i,MAKELPARAM((f),0))
-#define ListView_Scroll(w,dx,dy) (BOOL)SNDMSG((w),LVM_SCROLL,dx,dy)
-#define ListView_RedrawItems(w,f,l) (BOOL)SNDMSG((w),LVM_REDRAWITEMS,f,l)
-#define ListView_Arrange(w,c) (BOOL)SNDMSG((w),LVM_ARRANGE,c,0)
-#define ListView_EditLabel(w,i) (HWND)SNDMSG((w),LVM_EDITLABEL,i,0)
-#define ListView_GetEditControl(w) (HWND)SNDMSG((w),LVM_GETEDITCONTROL,0,0)
-#define ListView_GetColumn(w,i,p) (BOOL)SNDMSG((w),LVM_GETCOLUMN,i,(LPARAM)(LV_COLUMN*)(p))
-#define ListView_SetColumn(w,i,p) (BOOL)SNDMSG((w),LVM_SETCOLUMN,i,(LPARAM)(const LV_COLUMN*)(p))
-#define ListView_InsertColumn(w,i,p) (int)SNDMSG((w),LVM_INSERTCOLUMN,i,(LPARAM)(const LV_COLUMN*)(p))
-#define ListView_DeleteColumn(w,i) (BOOL)SNDMSG((w),LVM_DELETECOLUMN,i,0)
-#define ListView_GetColumnWidth(w,i) (int)SNDMSG((w),LVM_GETCOLUMNWIDTH,i,0)
-#define ListView_SetColumnWidth(w,i,x) (BOOL)SNDMSG((w),LVM_SETCOLUMNWIDTH,i,MAKELPARAM((x),0))
-#define ListView_CreateDragImage(w,i,p) (HIMAGELIST)SNDMSG((w),LVM_CREATEDRAGIMAGE,i,(LPARAM)(LPPOINT)(p))
-#define ListView_GetViewRect(w,p) (BOOL)SNDMSG((w),LVM_GETVIEWRECT,0,(LPARAM)(LPRECT)(p))
-#define ListView_GetTextColor(w) (COLORREF)SNDMSG((w),LVM_GETTEXTCOLOR,0,0)
-#define ListView_SetTextColor(w,c) (BOOL)SNDMSG((w),LVM_SETTEXTCOLOR,0,(LPARAM)(COLORREF)(c))
-#define ListView_GetTextBkColor(w) (COLORREF)SNDMSG((w),LVM_GETTEXTBKCOLOR,0,0)
-#define ListView_SetTextBkColor(w,c) (BOOL)SNDMSG((w),LVM_SETTEXTBKCOLOR,0,(LPARAM)(COLORREF)(c))
-#define ListView_GetTopIndex(w) (int)SNDMSG((w),LVM_GETTOPINDEX,0,0)
-#define ListView_GetCountPerPage(w) (int)SNDMSG((w),LVM_GETCOUNTPERPAGE,0,0)
-#define ListView_GetOrigin(w,p) (BOOL)SNDMSG((w),LVM_GETORIGIN,0,(LPARAM)(POINT*)(p))
-#define ListView_GetOrigin(w,p) (BOOL)SNDMSG((w),LVM_GETORIGIN,0,(LPARAM)(POINT*)(p))
-#define ListView_Update(w,i) (BOOL)SNDMSG((w),LVM_UPDATE,i,0)
-#define ListView_SetItemState(w,i,d,m) \
-{ \
-	LV_ITEM _lvi;\
-	_lvi.stateMask=m;\
-	_lvi.state=d;\
-	SNDMSG((w),LVM_SETITEMSTATE,i,(LPARAM)(LV_ITEM*)&_lvi);\
-}
-#define ListView_GetItemState(w,i,m) (UINT)SNDMSG((w),LVM_GETITEMSTATE,i,m)
-#define ListView_GetItemText(w,i,iS,s,n) \
-{ \
-	LV_ITEM _lvi;\
-	_lvi.iSubItem=iS;\
-	_lvi.cchTextMax=n;\
-	_lvi.pszText=s;\
-	SNDMSG((w),LVM_GETITEMTEXT,i,(LPARAM)(LV_ITEM*)&_lvi);\
-}
-#define ListView_SetItemText(w,i,iS,s) \
-{ \
-	LV_ITEM _lvi;\
-	_lvi.iSubItem=iS;\
-	_lvi.pszText=s;\
-	SNDMSG((w),LVM_SETITEMTEXT,i,(LPARAM)(LV_ITEM*)&_lvi);\
-}
-#define ListView_SetItemCount(w,n) SNDMSG((w),LVM_SETITEMCOUNT,n,0)
-#define ListView_SortItems(w,f,l) (BOOL)SNDMSG((w),LVM_SORTITEMS,l,(LPARAM)f)
-#define ListView_SetItemPosition32(w,i,x,y) \
-{ \
-	POINT p={x,y}; \
-	SNDMSG((w),LVM_SETITEMPOSITION32,i,(LPARAM)&p);\
-}
-#define ListView_GetSelectedCount(w) (UINT)SNDMSG((w),LVM_GETSELECTEDCOUNT,0,0)
-#define ListView_GetCheckState(w,i) ((((UINT)(SNDMSG((w),LVM_GETITEMSTATE,(WPARAM)(i),LVIS_STATEIMAGEMASK)))>>12)-1)
-#define ListView_SetCheckState(w,i,f) ListView_SetItemState(w,i,INDEXTOSTATEIMAGEMASK((f)+1),LVIS_STATEIMAGEMASK)
-
-BOOL WINAPI MakeDragList(HWND);
-void WINAPI MenuHelp(UINT,WPARAM,LPARAM,HMENU,HINSTANCE,HWND,PUINT);
-#define MonthCal_GetColor(hwnd,icolor) SNDMSG(hwnd,MCM_GETCOLOR,(WPARAM)icolor,(LPARAM)0)
-#define MonthCal_GetCurSel(hwnd,lpsystime) SNDMSG(hwnd,MCM_GETCURSEL,0,(LPARAM)lpsystime)
-#define MonthCal_GetFirstDayOfWeek(hwnd) SNDMSG(hwnd,MCM_GETFIRSTDAYOFWEEK,0,0)
-#define MonthCal_GetMaxSelCount(hwnd) SNDMSG(hwnd,MCM_GETMAXSELCOUNT,0,0)
-#define MonthCal_GetMaxTodayWidth(hwnd) SNDMSG(hwnd,MCM_GETMAXTODAYWIDTH,0,0)
-#define MonthCal_GetMinReqRect(hwnd,lpRectInfo) SNDMSG(hwnd,MCM_GETMINREQRECT,0,(LPARAM)lpRectInfo)
-#define MonthCal_GetMonthDelta(hwnd) SNDMSG(hwnd,MCM_GETMONTHDELTA,0,0)
-#define MonthCal_GetMonthRange(hwnd,flag,systimearray) SNDMSG(hwnd,MCM_GETMONTHRANGE,(WPARAM)flag,(LPARAM)systimearray)
-#define MonthCal_GetRange(hwnd,systimearray) SNDMSG(hwnd,MCM_GETRANGE,0,(LPARAM)systimearray)
-#define MonthCal_GetSelRange(hwnd,systimearray) SNDMSG(hwnd,MCM_GETSELRANGE,0,(LPARAM)systimearray)
-#define MonthCal_GetToday(hwnd,systime) SNDMSG(hwnd,MCM_GETTODAY,0,(LPARAM)systime)
-#define MonthCal_GetUnicodeFormat(hwnd) SNDMSG(hwnd,MCM_GETUNICODEFORMAT,0,0)
-#define MonthCal_HitTest(hwnd,pmchittest) SNDMSG(hwnd,MCM_HITTEST,0,(LPARAM)pmchittest)
-#define MonthCal_SetColor(hwnd,icolor,clr) SNDMSG(hwnd,MCM_SETCOLOR,(WPARAM)icolor,(LPARAM)clr)
-#define MonthCal_SetCurSel(hwnd,lpsystime) SNDMSG(hwnd,MCM_SETCURSEL,0,(LPARAM)lpsystime)
-#define MonthCal_SetDayState(hwnd,imonths,lpdatestatearray) SNDMSG(hwnd,MCM_SETDAYSTATE,(WPARAM)imonths,(LPARAM)lpdatestatearray)
-#define MonthCal_SetFirstDayOfWeek(hwnd,iday) SNDMSG(hwnd,MCM_SETFIRSTDAYOFWEEK,0,(LPARAM)iday)
-#define MonthCal_SetMaxSelCount(hwnd,imax) SNDMSG(hwnd,MCM_SETMAXSELCOUNT,(WPARAM)imax,0)
-#define MonthCal_SetMonthDelta(hwnd,idelta) SNDMSG(hwnd,MCM_SETMONTHDELTA,(WPARAM)idelta,0)
-#define MonthCal_SetRange(hwnd,whichlimit,systimearray) SNDMSG(hwnd,MCM_SETRANGE,whichlimit,systimearray)
-#define MonthCal_SetSelRange(hwnd,systimearray) SNDMSG(hwnd,MCM_SETSELRANGE,0,(LPARAM)systimearray)
-#define MonthCal_SetToday(hwnd,systime) SNDMSG(hwnd,MCM_SETTODAY,0,(LPARAM)systime)
-#define MonthCal_SetUnicodeFormat(hwnd,unicode) SNDMSG(hwnd,MCM_SETUNICODEFORMAT,(WPARAM)unicode,0)
-BOOL WINAPI ShowHideMenuCtl(HWND,UINT,PINT);
-#define TabCtrl_GetItem(w,i,p) (BOOL)SNDMSG((w),TCM_GETITEM,i,(LPARAM)(TC_ITEM*)(p))
-#define TabCtrl_SetItem(w,i,p) (BOOL)SNDMSG((w),TCM_SETITEM,i,(LPARAM)(TC_ITEM*)(p))
-#define TabCtrl_InsertItem(w,i,p) (int)SNDMSG((w),TCM_INSERTITEM,i,(LPARAM)(const TC_ITEM*)(p))
-#define TabCtrl_DeleteItem(w,i) (BOOL)SNDMSG((w),TCM_DELETEITEM,i,0)
-#define TabCtrl_DeleteAllItems(w) (BOOL)SNDMSG((w),TCM_DELETEALLITEMS,0,0)
-#define TabCtrl_GetItemRect(w,i,p) (BOOL)SNDMSG((w),TCM_GETITEMRECT,i,(LPARAM)(LPRECT)(p))
-#define TabCtrl_GetCurSel(w) (int)SNDMSG((w),TCM_GETCURSEL,0,0)
-#define TabCtrl_SetCurSel(w,i) (int)SNDMSG((w),TCM_SETCURSEL,i,0)
-#define TabCtrl_HitTest(w,p) (int)SNDMSG((w),TCM_HITTEST,0,(LPARAM)(TC_HITTESTINFO*)(p))
-#define TabCtrl_SetItemExtra(w,c) (BOOL)SNDMSG((w),TCM_SETITEMEXTRA,c,0)
-#define TabCtrl_AdjustRect(w,b,p) (int)SNDMSG((w),TCM_ADJUSTRECT,b,(LPARAM)(LPRECT)p)
-#define TabCtrl_SetItemSize(w,x,y) (DWORD)SNDMSG((w),TCM_SETITEMSIZE,0,MAKELPARAM(x,y))
-#define TabCtrl_RemoveImage(w,i) (void)SNDMSG((w),TCM_REMOVEIMAGE,i,0)
-#define TabCtrl_SetPadding(w,x,y) (void)SNDMSG((w),TCM_SETPADDING,0,MAKELPARAM(x,y))
-#define TabCtrl_GetRowCount(w) (int)SNDMSG((w),TCM_GETROWCOUNT,0,0)
-#define TabCtrl_GetToolTips(w) (HWND)SNDMSG((w),TCM_GETTOOLTIPS,0,0)
-#define TabCtrl_SetToolTips(w,t) (void)SNDMSG((w),TCM_SETTOOLTIPS,(WPARAM)t,0)
-#define TabCtrl_GetCurFocus(w) (int)SNDMSG((w),TCM_GETCURFOCUS,0,0)
-#define TabCtrl_SetCurFocus(w,i) (void)SNDMSG((w),TCM_SETCURFOCUS,i,0)
-#define TabCtrl_GetImageList(w) (HIMAGELIST)SNDMSG((w),TCM_GETIMAGELIST,0,0)
-#define TabCtrl_SetImageList(w,h) (HIMAGELIST)SNDMSG((w),TCM_SETIMAGELIST,0,(LPARAM)(UINT)(h))
-#define TabCtrl_GetItemCount(w) (int)SNDMSG((w),TCM_GETITEMCOUNT,0,0)
-BOOL WINAPI _TrackMouseEvent(LPTRACKMOUSEEVENT);
-#define TreeView_InsertItem(w,i) (HTREEITEM)SNDMSG((w),TVM_INSERTITEM,0,(LPARAM)(LPTV_INSERTSTRUCT)(i))
-#define TreeView_DeleteItem(w,i) (BOOL)SNDMSG((w),TVM_DELETEITEM,0,(LPARAM)(HTREEITEM)(i))
-#define TreeView_DeleteAllItems(w) (BOOL)SNDMSG((w),TVM_DELETEITEM,0,(LPARAM)TVI_ROOT)
-#define TreeView_Expand(w,i,c) (BOOL)SNDMSG((w),TVM_EXPAND,c,(LPARAM)(HTREEITEM)(i))
-#define TreeView_GetItemRect(w,i,p,c) (*(HTREEITEM*)p=(i),(BOOL)SNDMSG((w),TVM_GETITEMRECT,c,(LPARAM)(LPRECT)(p)))
-#define TreeView_GetCount(w) (UINT)SNDMSG((w),TVM_GETCOUNT,0,0)
-#define TreeView_GetIndent(w) (UINT)SNDMSG((w),TVM_GETINDENT,0,0)
-#define TreeView_SetIndent(w,i) (BOOL)SNDMSG((w),TVM_SETINDENT,i,0)
-#define TreeView_GetImageList(w,i) (HIMAGELIST)SNDMSG((w),TVM_GETIMAGELIST,i,0)
-#define TreeView_SetImageList(w,h,i) (HIMAGELIST)SNDMSG((w),TVM_SETIMAGELIST,i,(LPARAM)(HIMAGELIST)(h))
-#define TreeView_GetNextItem(w,i,c) (HTREEITEM)SNDMSG((w),TVM_GETNEXTITEM,c,(LPARAM)(HTREEITEM)(i))
-#define TreeView_GetChild(w,i)	TreeView_GetNextItem(w,i,TVGN_CHILD)
-#define TreeView_GetNextSibling(w,i)	TreeView_GetNextItem(w,i,TVGN_NEXT)
-#define TreeView_GetPrevSibling(w,i)	TreeView_GetNextItem(w,i,TVGN_PREVIOUS)
-#define TreeView_GetParent(w,i)	TreeView_GetNextItem(w,i,TVGN_PARENT)
-#define TreeView_GetFirstVisible(w)	TreeView_GetNextItem(w,NULL,TVGN_FIRSTVISIBLE)
-#define TreeView_GetNextVisible(w,i)	TreeView_GetNextItem(w,i,TVGN_NEXTVISIBLE)
-#define TreeView_GetPrevVisible(w,i)	TreeView_GetNextItem(w,i,TVGN_PREVIOUSVISIBLE)
-#define TreeView_GetSelection(w)	TreeView_GetNextItem(w,NULL,TVGN_CARET)
-#define TreeView_GetDropHilight(w)	TreeView_GetNextItem(w,NULL,TVGN_DROPHILITE)
-#define TreeView_GetRoot(w)	TreeView_GetNextItem(w,NULL,TVGN_ROOT)
-#define TreeView_Select(w,i,c) (BOOL)SNDMSG((w),TVM_SELECTITEM,c,(LPARAM)(HTREEITEM)(i))
-#define TreeView_SelectItem(w,i)	TreeView_Select(w,i,TVGN_CARET)
-#define TreeView_SelectDropTarget(w,i)	TreeView_Select(w,i,TVGN_DROPHILITE)
-#define TreeView_SelectSetFirstVisible(w,i)	TreeView_Select(w,i,TVGN_FIRSTVISIBLE)
-#define TreeView_GetItem(w,i) (BOOL)SNDMSG((w),TVM_GETITEM,0,(LPARAM)(TV_ITEM*)(i))
-#define TreeView_SetItem(w,i) (BOOL)SNDMSG((w),TVM_SETITEM,0,(LPARAM)(const TV_ITEM*)(i))
-#define TreeView_EditLabel(w,i) (HWND)SNDMSG((w),TVM_EDITLABEL,0,(LPARAM)(HTREEITEM)(i))
-#define TreeView_GetEditControl(w) (HWND)SNDMSG((w),TVM_GETEDITCONTROL,0,0)
-#define TreeView_GetVisibleCount(w) (UINT)SNDMSG((w),TVM_GETVISIBLECOUNT,0,0)
-#define TreeView_HitTest(w,p) (HTREEITEM)SNDMSG((w),TVM_HITTEST,0,(LPARAM)(LPTV_HITTESTINFO)(p))
-#define TreeView_CreateDragImage(w,i) (HIMAGELIST)SNDMSG((w),TVM_CREATEDRAGIMAGE,0,(LPARAM)(HTREEITEM)(i))
-#define TreeView_SortChildren(w,i,r) (BOOL)SNDMSG((w),TVM_SORTCHILDREN,r,(LPARAM)(HTREEITEM)(i))
-#define TreeView_EnsureVisible(w,i) (BOOL)SNDMSG((w),TVM_ENSUREVISIBLE,0,(LPARAM)(HTREEITEM)(i))
-#define TreeView_SortChildrenCB(w,s,r) (BOOL)SNDMSG((w),TVM_SORTCHILDRENCB,r,(LPARAM)(LPTVSORTCB)(s))
-#define TreeView_EndEditLabelNow(w,f) (BOOL)SNDMSG((w),TVM_ENDEDITLABELNOW,f,0)
-#define TreeView_GetISearchString(w,s) (BOOL)SNDMSG((w),TVM_GETISEARCHSTRING,0,(LPARAM)s)
-#if (_WIN32_IE >= 0x0300)
-#define ListView_ApproximateViewRect(w,iw,ih,i) (DWORD)SNDMSG((w),LVM_APPROXIMATEVIEWRECT,(i),MAKELPARAM((iw),(ih)))
-#define ListView_SetExtendedListViewStyle(w,s) (DWORD)SNDMSG((w),LVM_SETEXTENDEDLISTVIEWSTYLE,0,(s))
-#define ListView_GetExtendedListViewStyle(w) (DWORD)SNDMSG((w),LVM_GETEXTENDEDLISTVIEWSTYLE,0,0)
-#define ListView_SetColumnOrderArray(w,i,a) (BOOL)SNDMSG((w),LVM_SETCOLUMNORDERARRAY,(WPARAM)(i),(LPARAM)(LPINT)(a))
-#define ListView_GetColumnOrderArray(w,i,a) (BOOL)SNDMSG((w),LVM_GETCOLUMNORDERARRAY,(WPARAM)(i),(LPARAM)(LPINT)(a))
-#define ListView_GetHeader(w) (HWND)SNDMSG((w),LVM_GETHEADER,0,0)
-#define ListView_GetHotCursor(w) (HCURSOR)SNDMSG((w),LVM_GETHOTCURSOR,0,0)
-#define ListView_GetHotItem(w) (INT)SNDMSG((w),LVM_GETHOTITEM,0,0)
-#define ListView_GetSubItemRect(w,i,is,c,p) (BOOL)SNDMSG((w),LVM_GETSUBITEMRECT,(WPARAM)(int)(i),((p)?(((LPRECT)(p))->left=(c),(((LPRECT)(p))->top=(is)),(LPARAM)(LPRECT)(p)):0))
-#define ListView_SetHotCursor(w,c) (HCURSOR)SNDMSG((w),LVM_SETHOTCURSOR,0,(LPARAM)(c))
-#define ListView_SetHotItem(w,i) (int)SNDMSG((w),LVM_SETHOTITEM,(WPARAM)(i),0)
-#define ListView_SetIconSpacing(w,x,y) (DWORD)SNDMSG((w),LVM_SETICONSPACING,0,MAKELONG(x,y))
-#define ListView_SubItemHitTest(w,p) (int)SNDMSG((w),LVM_SUBITEMHITTEST,0,(LPARAM)(LPLVHITTESTINFO)(p))
-WINBOOL WINAPI ImageList_SetImageCount(HIMAGELIST,UINT);
-WINBOOL WINAPI ImageList_Copy(HIMAGELIST,int,HIMAGELIST,int,UINT);
-WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
-#define TabCtrl_SetMinTabWidth(hwnd, x) SNDMSG((hwnd), TCM_SETMINTABWIDTH, 0, x)
-#define TabCtrl_DeselectAll(hwnd, fExcludeFocus) SNDMSG((hwnd), TCM_DESELECTALL, fExcludeFocus, 0)
-#define TreeView_GetToolTips(w) (HWND)SNDMSG((w),TVM_GETTOOLTIPS,0,0)
-#define TreeView_SetToolTips(w,wt) (HWND)SNDMSG((w),TVM_SETTOOLTIPS,(WPARAM)(wt),0)
-#endif
-#if (_WIN32_IE >= 0x0400)
-#define ListView_GetBkImage(h,plvbki) (BOOL)SNDMSG((h), LVM_GETBKIMAGE, 0, (LPARAM)(plvbki))
-#define ListView_SetBkImage(h, plvbki) (BOOL)SNDMSG((h), LVM_SETBKIMAGE, 0, (LPARAM)(plvbki))
-#define ListView_SetExtendedListViewStyleEx(w,m,s) (DWORD)SNDMSG((w),LVM_SETEXTENDEDLISTVIEWSTYLE,(m),(s))
-#define ListView_SetWorkAreas(w,n,r) (BOOL)SNDMSG((w),LVM_SETWORKAREAS,(WPARAM)(n),(LPARAM)(RECT *)(r))
-#define ListView_GetWorkAreas(w,n,r) (BOOL)SNDMSG((w),LVM_GETWORKAREAS,(WPARAM)(n),(LPARAM)(RECT *)(r))
-#define ListView_GetNumberOfWorkAreas(w,n) (BOOL)SNDMSG((w),LVM_GETNUMBEROFWORKAREAS,0,(LPARAM)(UINT *)(pnWorkAreas))
-#define ListView_SetHoverTime(w,t) (DWORD)SNDMSG((w),LVM_SETHOVERTIME,0,(LPARAM)(t))
-#define ListView_GetHoverTime(w) (DWORD)SNDMSG((w),LVM_GETHOVERTIME,0,0)
-#define ListView_GetSelectionMark(w) (INT)SNDMSG((w),LVM_GETSELECTIONMARK,0,0)
-#define ListView_SetSelectionMark(w,i) (INT)SNDMSG((w),LVM_SETSELECTIONMARK,0,(LPARAM)(i))
-#define ListView_SetToolTips(w,n) (HWND)SNDMSG((w),LVM_SETTOOLTIPS,(WPARAM)(n),0)
-#define ListView_GetToolTips(w) (HWND)SNDMSG((w),LVM_GETTOOLTIPS,0,0)
-#define TabCtrl_HighlightItem(hwnd, i, fHighlight) SNDMSG((hwnd), TCM_HIGHLIGHTITEM, (WPARAM)i, (LPARAM)MAKELONG (fHighlight, 0))
-#define TabCtrl_SetExtendedStyle(hwnd, dw) SNDMSG((hwnd), TCM_SETEXTENDEDSTYLE, 0, dw)
-#define TabCtrl_GetExtendedStyle(hwnd) SNDMSG((hwnd), TCM_GETEXTENDEDSTYLE, 0, 0)
-#define TabCtrl_SetUnicodeFormat(hwnd, fUnicode) SNDMSG((hwnd), TCM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0)
-#define TabCtrl_GetUnicodeFormat(hwnd) SNDMSG((hwnd), TCM_GETUNICODEFORMAT, 0, 0)
-#define TreeView_GetBkColor(w) (COLORREF)SNDMSG((w),TVM_GETBKCOLOR,0,0)
-#define TreeView_GetInsertMarkColor(w) (COLORREF)SNDMSG((w),TVM_GETINSERTMARKCOLOR,0,0)
-#define TreeView_GetItemHeight(w) (int)SNDMSG((w),TVM_GETITEMHEIGHT,0,0)
-#define TreeView_GetScrollTime(w) (UINT)SNDMSG((w),TVM_GETSCROLLTIME,0,0)
-#define TreeView_GetTextColor(w) (COLORREF)SNDMSG((w),TVM_GETTEXTCOLOR,0,0)
-#define TreeView_SetBkColor(w,c) (COLORREF)SNDMSG((w),TVM_SETBKCOLOR,0,(LPARAM)(c))
-#define TreeView_SetInsertMarkColor(w,c) (COLORREF)SNDMSG((w),TVM_SETINSERTMARKCOLOR,0,(LPARAM)(c))
-#define TreeView_SetItemHeight(w,h) (int)SNDMSG((w),TVM_SETITEMHEIGHT,(WPARAM)(h),0)
-#define TreeView_SetScrollTime(w,t) (UINT)SNDMSG((w),TVM_SETSCROLLTIME,(WPARAM)(UINT)(t),0)
-#define TreeView_SetTextColor(w,c) (COLORREF)SNDMSG((w),TVM_SETTEXTCOLOR,0,(LPARAM)(c))
-#define TreeView_SetInsertMark(w,i,a) (BOOL)SNDMSG((w),TVM_SETINSERTMARK,(WPARAM)(a),(LPARAM)(i))
-#define TreeView_SetUnicodeFormat(w,u) (BOOL)SNDMSG((w),TVM_SETUNICODEFORMAT,(WPARAM)(u),0)
-#define TreeView_GetUnicodeFormat(w) (BOOL)SNDMSG((w),TVM_GETUNICODEFORMAT,0,0)
-#endif
-#if (_WIN32_IE >= 0x0500)
-#define TreeView_GetItemState(w,i,m) (UINT)SNDMSG((w),TVM_GETITEMSTATE,(WPARAM)(i),(LPARAM)(m))
-#endif
-
-#ifdef UNICODE
-typedef HDITEMW HDITEM;
-typedef TOOLINFOW TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
-typedef TTHITTESTINFOW TTHITTESTINFO,*LPHITTESTINFO,*LPTTHITTESTINFO;
-typedef TOOLTIPTEXTW TOOLTIPTEXT,*LPTOOLTIPTEXT;
-typedef NMTTDISPINFOW NMTTDISPINFO, *LPNMTTDISPINFO;
-typedef TV_ITEMW TV_ITEM,*LPTV_ITEM;
-typedef TVITEMW TVITEM,*LPTVITEM;
-#if (_WIN32_IE >= 0x0400)
-typedef TVITEMEXW TVITEMEX,*LPTVITEMEX;
-#endif
-typedef TV_INSERTSTRUCTW TV_INSERTSTRUCT,*LPTV_INSERTSTRUCT;
-typedef TVINSERTSTRUCTW TVINSERTSTRUCT,*LPTVINSERTSTRUCT;
-typedef NM_TREEVIEWW NM_TREEVIEW,*LPNM_TREEVIEW;
-typedef NMTREEVIEWW NMTREEVIEW,*LPNMTREEVIEW;
-typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
-#define ACM_OPEN ACM_OPENW
-#define COMBOBOXEXITEM	COMBOBOXEXITEMW
-#define PCOMBOBOXEXITEM	PCOMBOBOXEXITEMW
-#define PCCOMBOBOXEXITEM	PCCOMBOBOXEXITEMW
-#define CBEM_INSERTITEM	CBEM_INSERTITEMW
-#define CBEM_SETITEM	CBEM_SETITEMW
-#define CBEM_GETITEM	CBEM_GETITEMW
-#define CBEN_ENDEDIT	CBEN_ENDEDITW
-#define NMCBEENDEDIT	NMCBEENDEDITW
-#define LPNMCBEENDEDIT	LPNMCBEENDEDITW
-#define PNMCBEENDEDIT	PNMCBEENDEDITW
-#if _WIN32_IE >= 0x0400
-#define NMCOMBOBOXEX	NMCOMBOBOXEXW
-#define PNMCOMBOBOXEX	PNMCOMBOBOXEXW
-#define CBEN_GETDISPINFO	CBEN_GETDISPINFOW
-#define CBEN_DRAGBEGIN	CBEN_DRAGBEGINW
-#define NMCBEDRAGBEGIN	NMCBEDRAGBEGINW
-#define LPNMCBEDRAGBEGIN	LPNMCBEDRAGBEGINW
-#define PNMCBEDRAGBEGIN PNMCBEDRAGBEGINW
-#endif /* _WIN32_IE >= 0x0400 */
-#define SB_GETTEXT	SB_GETTEXTW
-#define SB_SETTEXT	SB_SETTEXTW
-#define SB_GETTEXTLENGTH	SB_GETTEXTLENGTHW
-#define HDM_INSERTITEM HDM_INSERTITEMW
-#define HDM_GETITEM HDM_GETITEMW
-#define HDM_SETITEM HDM_SETITEMW
-#define HDN_ITEMCHANGING	HDN_ITEMCHANGINGW
-#define HDN_ITEMCHANGED	HDN_ITEMCHANGEDW
-#define HDN_ITEMCLICK	HDN_ITEMCLICKW
-#define HDN_ITEMDBLCLICK	HDN_ITEMDBLCLICKW
-#define HDN_DIVIDERDBLCLICK	HDN_DIVIDERDBLCLICKW
-#define HDN_BEGINTRACK	HDN_BEGINTRACKW
-#define HDN_ENDTRACK	HDN_ENDTRACKW
-#define HDN_TRACK	HDN_TRACKW
-#if (_WIN32_IE >= 0x0300)
-#define HDN_GETDISPINFO HDN_GETDISPINFOW
-#endif
-#define HD_NOTIFY HD_NOTIFYW
-#define TBSAVEPARAMS TBSAVEPARAMSW
-#define TB_GETBUTTONTEXT TB_GETBUTTONTEXTW
-#define TB_SAVERESTORE TB_SAVERESTOREW
-#define TB_ADDSTRING TB_ADDSTRINGW
-#define TBN_GETBUTTONINFO TBN_GETBUTTONINFOW
-#if _WIN32_IE >= 0x400
-#define TB_GETBUTTONINFO TB_GETBUTTONINFOW
-#define TB_SETBUTTONINFO TB_SETBUTTONINFOW
-#define TB_INSERTBUTTON TB_INSERTBUTTONW
-#define TB_ADDBUTTONS TB_ADDBUTTONSW
-#define TB_MAPACCELERATOR TB_MAPACCELERATORW
-#define TBBUTTONINFO TBBUTTONINFOW
-#define LPTBBUTTONINFO LPTBBUTTONINFOW
-#define TBN_GETDISPINFO TBN_GETDISPINFOW
-#define NMTBDISPINFO NMTBDISPINFOW
-#define LPNMTBDISPINFO LPNMTBDISPINFOW
-#endif
-#define TBNOTIFY TBNOTIFYW
-#define LPTBNOTIFY LPTBNOTIFYW
-#define NMTOOLBAR NMTOOLBARW
-#define LPNMTOOLBAR LPNMTOOLBARW
-#define TTM_ADDTOOL	TTM_ADDTOOLW
-#define TTM_DELTOOL	TTM_DELTOOLW
-#define TTM_NEWTOOLRECT	TTM_NEWTOOLRECTW
-#define TTM_GETTOOLINFO	TTM_GETTOOLINFOW
-#define TTM_SETTOOLINFO	TTM_SETTOOLINFOW
-#define TTM_HITTEST	TTM_HITTESTW
-#define TTM_GETTEXT	TTM_GETTEXTW
-#define TTM_UPDATETIPTEXT	TTM_UPDATETIPTEXTW
-#define TTM_ENUMTOOLS	TTM_ENUMTOOLSW
-#define TTM_GETCURRENTTOOL	TTM_GETCURRENTTOOLW
-#define TTN_NEEDTEXT TTN_NEEDTEXTW
-#define TTN_GETDISPINFO TTN_GETDISPINFOW
-#define SB_GETTEXT	SB_GETTEXTW
-#define SB_SETTEXT	SB_SETTEXTW
-#define SB_GETTEXTLENGTH	SB_GETTEXTLENGTHW
-#define LV_ITEM LV_ITEMW
-#define LVITEM LVITEMW
-#define LPSTR_TEXTCALLBACK LPSTR_TEXTCALLBACKW
-#if _WIN32_IE >= 0x0400
-#define LVBKIMAGE	LVBKIMAGEW
-#define LPLVBKIMAGE	LPLVBKIMAGEW
-#define LVM_SETBKIMAGE	LVM_SETBKIMAGEW
-#define LVM_GETBKIMAGE	LVM_GETBKIMAGEW
-#endif /* _WIN32_IE >= 0x400 */
-#define LVM_GETITEM	LVM_GETITEMW
-#define LVM_SETITEM LVM_SETITEMW
-#define LVM_INSERTITEM LVM_INSERTITEMW
-#define LV_FINDINFO LV_FINDINFOW
-#define LVFINDINFO LVFINDINFOW
-#define LPFINDINFO LPFINDINFOW
-#define LVM_FINDITEM LVM_FINDITEMW
-#define LVM_GETSTRINGWIDTH LVM_GETSTRINGWIDTHW
-#define LVM_EDITLABEL LVM_EDITLABELW
-#define LV_COLUMN LV_COLUMNW
-#define LVCOLUMN LVCOLUMNW
-#define LVM_GETCOLUMN LVM_GETCOLUMNW
-#define LVM_SETCOLUMN LVM_SETCOLUMNW
-#define LVM_INSERTCOLUMN LVM_INSERTCOLUMNW
-#define LVM_GETITEMTEXT LVM_GETITEMTEXTW
-#define LVM_SETITEMTEXT LVM_SETITEMTEXTW
-#define LVM_GETISEARCHSTRING LVM_GETISEARCHSTRINGW
-#define LVN_BEGINLABELEDIT LVN_BEGINLABELEDITW
-#define LVN_ENDLABELEDIT LVN_ENDLABELEDITW
-#define LVN_GETDISPINFO LVN_GETDISPINFOW
-#define LVN_SETDISPINFO LVN_SETDISPINFOW
-#define LVN_GETINFOTIP LVN_GETINFOTIPW
-#define NMLVGETINFOTIP NMLVGETINFOTIPW
-#define LPNMLVGETINFOTIP LPNMLVGETINFOTIPW
-#define LV_DISPINFO LV_DISPINFOW
-#define NMLVDISPINFO NMLVDISPINFOW
-#define TVM_INSERTITEM TVM_INSERTITEMW
-#define TVM_GETITEM TVM_GETITEMW
-#define TVM_SETITEM TVM_SETITEMW
-#define TVM_EDITLABEL TVM_EDITLABELW
-#define TVM_GETISEARCHSTRING TVM_GETISEARCHSTRINGW
-#define TV_DISPINFO NMTVDISPINFOW
-#define NMTVDISPINFO NMTVDISPINFOW
-#define LPNMTVDISPINFO LPNMTVDISPINFOW
-#define TVN_SELCHANGING TVN_SELCHANGINGW
-#define TVN_SELCHANGED TVN_SELCHANGEDW
-#define TVN_GETDISPINFO TVN_GETDISPINFOW
-#define TVN_SETDISPINFO TVN_SETDISPINFOW
-#define TVN_ITEMEXPANDING TVN_ITEMEXPANDINGW
-#define TVN_ITEMEXPANDED TVN_ITEMEXPANDEDW
-#define TVN_BEGINDRAG TVN_BEGINDRAGW
-#define TVN_BEGINRDRAG TVN_BEGINRDRAGW
-#define TVN_DELETEITEM TVN_DELETEITEMW
-#define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITW
-#define TVN_ENDLABELEDIT TVN_ENDLABELEDITW
-#define TC_ITEMHEADER TC_ITEMHEADERW
-#define TC_ITEM TC_ITEMW
-#define TCITEM TCITEMW
-#define LPTCITEM LPTCITEMW
-#define TCM_GETITEM TCM_GETITEMW
-#define TCM_SETITEM TCM_SETITEMW
-#define TCM_INSERTITEM TCM_INSERTITEMW
-#define CreateStatusWindow CreateStatusWindowW
-#define DrawStatusText DrawStatusTextW
-#define ImageList_LoadImage ImageList_LoadImageW
-#define DTM_SETFORMAT DTM_SETFORMATW
-#define DTN_USERSTRING DTN_USERSTRINGW
-#define DTN_WMKEYDOWN DTN_WMKEYDOWNW
-#define DTN_FORMAT DTN_FORMATW
-#define DTN_FORMATQUERY DTN_FORMATQUERYW
-typedef REBARBANDINFOW REBARBANDINFO,*LPREBARBANDINFO;
-#define LPCREBARBANDINFO LPCREBARBANDINFOW
-#define REBARBANDINFO_V3_SIZE REBARBANDINFOW_V3_SIZE
-#define RB_INSERTBAND RB_INSERTBANDW
-#define RB_SETBANDINFO RB_SETBANDINFOW
-#else /* UNICODE */
-typedef HDITEMA HDITEM;
-typedef TOOLINFOA TOOLINFO,*PTOOLINFO,*LPTOOLINFO;
-typedef TTHITTESTINFOA TTHITTESTINFO,*LPHITTESTINFO,*LPTTHITTESTINFO;
-typedef TOOLTIPTEXTA TOOLTIPTEXT,*LPTOOLTIPTEXT;
-typedef NMTTDISPINFOA NMTTDISPINFO, *LPNMTTDISPINFO;
-typedef TV_ITEMA TV_ITEM,*LPTV_ITEM;
-typedef TVITEMA TVITEM,*LPTVITEM;
-#if (_WIN32_IE >= 0x0400)
-typedef TVITEMEXA TVITEMEX,*LPTVITEMEX;
-#endif
-typedef TV_INSERTSTRUCTA TV_INSERTSTRUCT,*LPTV_INSERTSTRUCT;
-typedef TVINSERTSTRUCTA TVINSERTSTRUCT,*LPTVINSERTSTRUCT;
-typedef NM_TREEVIEWA NM_TREEVIEW,*LPNM_TREEVIEW;
-typedef NMTREEVIEWA NMTREEVIEW,*LPNMTREEVIEW;
-typedef NMHDDISPINFOW NMHDDISPINFO, *LPNMHDDISPINFO;
-#define ACM_OPEN ACM_OPENA
-#define COMBOBOXEXITEM	COMBOBOXEXITEMA
-#define PCOMBOBOXEXITEM	PCOMBOBOXEXITEMA
-#define PCCOMBOBOXEXITEM	PCCOMBOBOXEXITEMA
-#define CBEM_INSERTITEM	CBEM_INSERTITEMA
-#define CBEM_SETITEM	CBEM_SETITEMA
-#define CBEM_GETITEM	CBEM_GETITEMA
-#define CBEN_ENDEDIT	CBEN_ENDEDITA
-#define NMCBEENDEDIT	NMCBEENDEDITA
-#define LPNMCBEENDEDIT	LPNMCBEENDEDITA
-#define PNMCBEENDEDIT	PNMCBEENDEDITA
-#if _WIN32_IE >= 0x0400
-#define TB_GETBUTTONINFO TB_GETBUTTONINFOA
-#define TB_SETBUTTONINFO TB_SETBUTTONINFOA
-#define TB_INSERTBUTTON TB_INSERTBUTTONA
-#define TB_ADDBUTTONS TB_ADDBUTTONSA
-#define TB_MAPACCELERATOR TB_MAPACCELERATORA
-#define NMCOMBOBOXEX	NMCOMBOBOXEXA
-#define PNMCOMBOBOXEX	PNMCOMBOBOXEXA
-#define CBEN_DRAGBEGIN	CBEN_DRAGBEGINA
-#define CBEN_GETDISPINFO	CBEN_GETDISPINFOA
-#define NMCBEDRAGBEGIN	NMCBEDRAGBEGINA
-#define LPNMCBEDRAGBEGIN	LPNMCBEDRAGBEGINA
-#define PNMCBEDRAGBEGIN	PNMCBEDRAGBEGINA
-#define TBN_GETDISPINFO TBN_GETDISPINFOA
-#define NMTBDISPINFO NMTBDISPINFOA
-#define LPNMTBDISPINFO LPNMTBDISPINFOA
-#endif /* _WIN32_IE >= 0x0400 */
-#define SB_GETTEXT	SB_GETTEXTA
-#define SB_SETTEXT	SB_SETTEXTA
-#define SB_GETTEXTLENGTH	SB_GETTEXTLENGTHA
-#define HDM_INSERTITEM HDM_INSERTITEMA
-#define HDM_GETITEM HDM_GETITEMA
-#define HDM_SETITEM HDM_SETITEMA
-#define HDN_ITEMCHANGING	HDN_ITEMCHANGINGA
-#define HDN_ITEMCHANGED	HDN_ITEMCHANGEDA
-#define HDN_ITEMCLICK	HDN_ITEMCLICKA
-#define HDN_ITEMDBLCLICK	HDN_ITEMDBLCLICKA
-#define HDN_DIVIDERDBLCLICK	HDN_DIVIDERDBLCLICKA
-#define HDN_BEGINTRACK	HDN_BEGINTRACKA
-#define HDN_ENDTRACK	HDN_ENDTRACKA
-#define HDN_TRACK	HDN_TRACKA
-#if (_WIN32_IE >= 0x0300)
-#define HDN_GETDISPINFO HDN_GETDISPINFOA
-#endif
-#define HD_NOTIFY HD_NOTIFYA
-#define TBSAVEPARAMS TBSAVEPARAMSA
-#define TB_GETBUTTONTEXT TB_GETBUTTONTEXTA
-#define TB_SAVERESTORE TB_SAVERESTOREA
-#define TB_ADDSTRING TB_ADDSTRINGA
-#define TBN_GETBUTTONINFO TBN_GETBUTTONINFOA
-#if _WIN32_IE >= 0x400
-#define TBBUTTONINFO TBBUTTONINFOA
-#define LPTBBUTTONINFO LPTBBUTTONINFOA
-#endif
-#define TBNOTIFY TBNOTIFYA
-#define LPTBNOTIFY LPTBNOTIFYA
-#define NMTOOLBAR NMTOOLBARA
-#define LPNMTOOLBAR LPNMTOOLBARA
-#define TTM_ADDTOOL	TTM_ADDTOOLA
-#define TTM_DELTOOL	TTM_DELTOOLA
-#define TTM_NEWTOOLRECT	TTM_NEWTOOLRECTA
-#define TTM_GETTOOLINFO	TTM_GETTOOLINFOA
-#define TTM_SETTOOLINFO	TTM_SETTOOLINFOA
-#define TTM_HITTEST	TTM_HITTESTA
-#define TTM_GETTEXT	TTM_GETTEXTA
-#define TTM_UPDATETIPTEXT	TTM_UPDATETIPTEXTA
-#define TTM_ENUMTOOLS	TTM_ENUMTOOLSA
-#define TTM_GETCURRENTTOOL TTM_GETCURRENTTOOLA
-#define TTN_NEEDTEXT TTN_NEEDTEXTA
-#define TTN_GETDISPINFO TTN_GETDISPINFOA
-#define SB_GETTEXT	SB_GETTEXTA
-#define SB_SETTEXT	SB_SETTEXTA
-#define SB_GETTEXTLENGTH	SB_GETTEXTLENGTHA
-#define LV_ITEM LV_ITEMA
-#define LVITEM LVITEMA
-#define LPSTR_TEXTCALLBACK LPSTR_TEXTCALLBACKA
-#if _WIN32_IE >= 0x0400
-#define LVBKIMAGE	LVBKIMAGEA
-#define LPLVBKIMAGE	LPLVBKIMAGEA
-#define LVM_SETBKIMAGE	LVM_SETBKIMAGEA
-#define LVM_GETBKIMAGE	LVM_GETBKIMAGEA
-#endif /* _WIN32_IE >= 0x0400 */
-#define LVM_GETITEM	LVM_GETITEMA
-#define LVM_SETITEM LVM_SETITEMA
-#define LVM_INSERTITEM LVM_INSERTITEMA
-#define LV_FINDINFO LV_FINDINFOA
-#define LVFINDINFO LVFINDINFOA
-#define LPFINDINFO LPFINDINFOA
-#define LVM_FINDITEM LVM_FINDITEMA
-#define LVM_GETSTRINGWIDTH LVM_GETSTRINGWIDTHA
-#define LVM_EDITLABEL LVM_EDITLABELA
-#define LV_COLUMN LV_COLUMNA
-#define LVCOLUMN LVCOLUMNA
-#define LVM_GETCOLUMN LVM_GETCOLUMNA
-#define LVM_SETCOLUMN LVM_SETCOLUMNA
-#define LVM_INSERTCOLUMN LVM_INSERTCOLUMNA
-#define LVM_GETITEMTEXT LVM_GETITEMTEXTA
-#define LVM_SETITEMTEXT LVM_SETITEMTEXTA
-#define LVM_GETISEARCHSTRING LVM_GETISEARCHSTRINGA
-#define LVN_BEGINLABELEDIT LVN_BEGINLABELEDITA
-#define LVN_ENDLABELEDIT LVN_ENDLABELEDITA
-#define LVN_GETDISPINFO LVN_GETDISPINFOA
-#define LVN_SETDISPINFO LVN_SETDISPINFOA
-#define LVN_GETINFOTIP LVN_GETINFOTIPA
-#define NMLVGETINFOTIP NMLVGETINFOTIPA
-#define LPNMLVGETINFOTIP LPNMLVGETINFOTIPA
-#define LV_DISPINFO LV_DISPINFOA
-#define NMLVDISPINFO NMLVDISPINFOA
-#define TVM_INSERTITEM TVM_INSERTITEMA
-#define TVM_GETITEM TVM_GETITEMA
-#define TVM_SETITEM TVM_SETITEMA
-#define TVM_EDITLABEL TVM_EDITLABELA
-#define TVM_GETISEARCHSTRING TVM_GETISEARCHSTRINGA
-#define TV_DISPINFO NMTVDISPINFOA
-#define NMTVDISPINFO NMTVDISPINFOA
-#define LPNMTVDISPINFO LPNMTVDISPINFOA
-#define TVN_SELCHANGING TVN_SELCHANGINGA
-#define TVN_SELCHANGED TVN_SELCHANGEDA
-#define TVN_GETDISPINFO TVN_GETDISPINFOA
-#define TVN_SETDISPINFO TVN_SETDISPINFOA
-#define TVN_ITEMEXPANDING TVN_ITEMEXPANDINGA
-#define TVN_ITEMEXPANDED TVN_ITEMEXPANDEDA
-#define TVN_BEGINDRAG TVN_BEGINDRAGA
-#define TVN_BEGINRDRAG TVN_BEGINRDRAGA
-#define TVN_DELETEITEM TVN_DELETEITEMA
-#define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITA
-#define TVN_ENDLABELEDIT TVN_ENDLABELEDITA
-#define TC_ITEMHEADER TC_ITEMHEADERA
-#define TC_ITEM TC_ITEMA
-#define TCITEM TCITEMA
-#define LPTCITEM LPTCITEMA
-#define TCM_GETITEM TCM_GETITEMA
-#define TCM_SETITEM TCM_SETITEMA
-#define TCM_INSERTITEM TCM_INSERTITEMA
-#define CreateStatusWindow CreateStatusWindowA
-#define DrawStatusText DrawStatusTextA
-#define ImageList_LoadImage ImageList_LoadImageA
-#define DTM_SETFORMAT	  DTM_SETFORMATA
-#define DTN_USERSTRING DTN_USERSTRINGA
-#define DTN_WMKEYDOWN DTN_WMKEYDOWNA
-#define DTN_FORMAT DTN_FORMATA
-#define DTN_FORMATQUERY DTN_FORMATQUERYA
-typedef REBARBANDINFOA REBARBANDINFO,*LPREBARBANDINFO;
-#define LPCREBARBANDINFO LPCREBARBANDINFOA
-#define REBARBANDINFO_V3_SIZE REBARBANDINFOA_V3_SIZE
-#define RB_INSERTBAND RB_INSERTBANDA
-#define RB_SETBANDINFO RB_SETBANDINFOA
-#endif
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/commdlg.h b/winsup/w32api/include/commdlg.h
deleted file mode 100644
index afe2a0cb7..000000000
--- a/winsup/w32api/include/commdlg.h
+++ /dev/null
@@ -1,583 +0,0 @@
-#ifndef _COMMDLG_H
-#define _COMMDLG_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#pragma pack(push,1)
-
-#define LBSELCHSTRINGA  "commdlg_LBSelChangedNotify"
-#define SHAREVISTRINGA  "commdlg_ShareViolation"
-#define FILEOKSTRINGA   "commdlg_FileNameOK"
-#define COLOROKSTRINGA  "commdlg_ColorOK"
-#define SETRGBSTRINGA   "commdlg_SetRGBColor"
-#define HELPMSGSTRINGA  "commdlg_help"
-#define FINDMSGSTRINGA  "commdlg_FindReplace"
-#define LBSELCHSTRINGW  L"commdlg_LBSelChangedNotify"
-#define SHAREVISTRINGW  L"commdlg_ShareViolation"
-#define FILEOKSTRINGW   L"commdlg_FileNameOK"
-#define COLOROKSTRINGW  L"commdlg_ColorOK"
-#define SETRGBSTRINGW   L"commdlg_SetRGBColor"
-#define HELPMSGSTRINGW  L"commdlg_help"
-#define FINDMSGSTRINGW  L"commdlg_FindReplace"
-#ifndef CDN_FIRST
-#define CDN_FIRST	((UINT)-601) /* also in commctrl.h */
-#define CDN_LAST	((UINT)-699)
-#endif
-#define CDN_INITDONE	CDN_FIRST
-#define CDN_SELCHANGE	(CDN_FIRST-1U)
-#define CDN_FOLDERCHANGE	(CDN_FIRST-2U)
-#define CDN_SHAREVIOLATION	(CDN_FIRST-3U)
-#define CDN_HELP	(CDN_FIRST-4U)
-#define CDN_FILEOK	(CDN_FIRST-5U)
-#define CDN_TYPECHANGE	(CDN_FIRST-6U)
-#define CDM_FIRST	(WM_USER+100)
-#define CDM_LAST	(WM_USER+200)
-#define CDM_GETSPEC	CDM_FIRST
-#define CDM_GETFILEPATH	(CDM_FIRST+1)
-#define CDM_GETFOLDERPATH (CDM_FIRST+2)
-#define CDM_GETFOLDERIDLIST	(CDM_FIRST+3)
-#define CDM_SETCONTROLTEXT	(CDM_FIRST+4)
-#define CDM_HIDECONTROL	(CDM_FIRST+5)
-#define CDM_SETDEFEXT	(CDM_FIRST+6)
-#define CC_RGBINIT	1
-#define CC_FULLOPEN	2
-#define CC_PREVENTFULLOPEN	4
-#define CC_SHOWHELP	8
-#define CC_ENABLEHOOK	16
-#define CC_ENABLETEMPLATE	32
-#define CC_ENABLETEMPLATEHANDLE	64
-#define CC_SOLIDCOLOR	128
-#define CC_ANYCOLOR	256
-#define CF_SCREENFONTS	1
-#define CF_PRINTERFONTS	2
-#define CF_BOTH	3
-#define CF_SHOWHELP	4
-#define CF_ENABLEHOOK	8
-#define CF_ENABLETEMPLATE	16
-#define CF_ENABLETEMPLATEHANDLE	32
-#define CF_INITTOLOGFONTSTRUCT	64
-#define CF_USESTYLE	128
-#define CF_EFFECTS	256
-#define CF_APPLY	512
-#define CF_ANSIONLY	1024
-#define CF_SCRIPTSONLY	CF_ANSIONLY
-#define CF_NOVECTORFONTS	2048
-#define CF_NOOEMFONTS	2048
-#define CF_NOSIMULATIONS	4096
-#define CF_LIMITSIZE	8192
-#define CF_FIXEDPITCHONLY	16384
-#define CF_WYSIWYG	32768
-#define CF_FORCEFONTEXIST	65536
-#define CF_SCALABLEONLY	131072
-#define CF_TTONLY	262144
-#define CF_NOFACESEL	 524288
-#define CF_NOSTYLESEL	 1048576
-#define CF_NOSIZESEL	 2097152
-#define CF_SELECTSCRIPT	 4194304
-#define CF_NOSCRIPTSEL	 8388608
-#define CF_NOVERTFONTS	0x1000000
-#define SIMULATED_FONTTYPE	0x8000
-#define PRINTER_FONTTYPE	0x4000
-#define SCREEN_FONTTYPE	0x2000
-#define BOLD_FONTTYPE	0x100
-#define ITALIC_FONTTYPE	0x0200
-#define REGULAR_FONTTYPE	0x0400
-#define WM_CHOOSEFONT_GETLOGFONT	(WM_USER+1)
-#define WM_CHOOSEFONT_SETLOGFONT	(WM_USER+101)
-#define WM_CHOOSEFONT_SETFLAGS	(WM_USER+102)
-#define OFN_ALLOWMULTISELECT 512
-#define OFN_CREATEPROMPT 0x2000
-#define OFN_ENABLEHOOK 32
-#define OFN_ENABLESIZING 0x800000
-#define OFN_ENABLETEMPLATE 64
-#define OFN_ENABLETEMPLATEHANDLE 128
-#define OFN_EXPLORER 0x80000
-#define OFN_EXTENSIONDIFFERENT 0x400
-#define OFN_FILEMUSTEXIST 0x1000
-#define OFN_HIDEREADONLY 4
-#define OFN_LONGNAMES 0x200000
-#define OFN_NOCHANGEDIR 8
-#define OFN_NODEREFERENCELINKS 0x100000
-#define OFN_NOLONGNAMES 0x40000
-#define OFN_NONETWORKBUTTON 0x20000
-#define OFN_NOREADONLYRETURN 0x8000
-#define OFN_NOTESTFILECREATE 0x10000
-#define OFN_NOVALIDATE 256
-#define OFN_OVERWRITEPROMPT 2
-#define OFN_PATHMUSTEXIST 0x800
-#define OFN_READONLY 1
-#define OFN_SHAREAWARE 0x4000
-#define OFN_SHOWHELP 16
-#define OFN_SHAREFALLTHROUGH 2
-#define OFN_SHARENOWARN 1
-#define OFN_SHAREWARN 0
-#define OFN_NODEREFERENCELINKS	0x100000
-#define FR_DIALOGTERM 64
-#define FR_DOWN 1
-#define FR_ENABLEHOOK 256
-#define FR_ENABLETEMPLATE 512
-#define FR_ENABLETEMPLATEHANDLE 0x2000
-#define FR_FINDNEXT 8
-#define FR_HIDEUPDOWN 0x4000
-#define FR_HIDEMATCHCASE 0x8000
-#define FR_HIDEWHOLEWORD 0x10000
-#define FR_MATCHALEFHAMZA	0x80000000
-#define FR_MATCHCASE 4
-#define FR_MATCHDIAC	0x20000000
-#define FR_MATCHKASHIDA	0x40000000
-#define FR_NOMATCHCASE 0x800
-#define FR_NOUPDOWN 0x400
-#define FR_NOWHOLEWORD 4096
-#define FR_REPLACE 16
-#define FR_REPLACEALL 32
-#define FR_SHOWHELP 128
-#define FR_WHOLEWORD 2
-#define PD_ALLPAGES	0
-#define PD_SELECTION	1
-#define PD_PAGENUMS	2
-#define PD_NOSELECTION	4
-#define PD_NOPAGENUMS	8
-#define PD_COLLATE	16
-#define PD_PRINTTOFILE	32
-#define PD_PRINTSETUP	64
-#define PD_NOWARNING	128
-#define PD_RETURNDC	256
-#define PD_RETURNIC	512
-#define PD_RETURNDEFAULT	1024
-#define PD_SHOWHELP	2048
-#define PD_ENABLEPRINTHOOK	4096
-#define PD_ENABLESETUPHOOK	8192
-#define PD_ENABLEPRINTTEMPLATE	16384
-#define PD_ENABLESETUPTEMPLATE 32768
-#define PD_ENABLEPRINTTEMPLATEHANDLE 65536
-#define PD_ENABLESETUPTEMPLATEHANDLE 0x20000
-#define PD_USEDEVMODECOPIES	0x40000
-#define PD_USEDEVMODECOPIESANDCOLLATE	0x40000
-#define PD_DISABLEPRINTTOFILE	0x80000
-#define PD_HIDEPRINTTOFILE	0x100000
-#define PD_NONETWORKBUTTON	0x200000
-#define PSD_DEFAULTMINMARGINS	0
-#define PSD_INWININIINTLMEASURE	0
-#define PSD_MINMARGINS	1
-#define PSD_MARGINS	2
-#define PSD_INTHOUSANDTHSOFINCHES	4
-#define PSD_INHUNDREDTHSOFMILLIMETERS	8
-#define PSD_DISABLEMARGINS	16
-#define PSD_DISABLEPRINTER	32
-#define PSD_NOWARNING	128
-#define PSD_DISABLEORIENTATION	256
-#define PSD_DISABLEPAPER	512
-#define PSD_RETURNDEFAULT	1024
-#define PSD_SHOWHELP	2048
-#define PSD_ENABLEPAGESETUPHOOK 8192
-#define PSD_ENABLEPAGESETUPTEMPLATE	0x8000
-#define PSD_ENABLEPAGESETUPTEMPLATEHANDLE	0x20000
-#define PSD_ENABLEPAGEPAINTHOOK	0x40000
-#define PSD_DISABLEPAGEPAINTING	0x80000
-#define WM_PSD_PAGESETUPDLG	WM_USER
-#define WM_PSD_FULLPAGERECT	(WM_USER+1)
-#define WM_PSD_MINMARGINRECT	(WM_USER+2)
-#define WM_PSD_MARGINRECT	(WM_USER+3)
-#define WM_PSD_GREEKTEXTRECT	(WM_USER+4)
-#define WM_PSD_ENVSTAMPRECT	(WM_USER+5)
-#define WM_PSD_YAFULLPAGERECT	(WM_USER+6)
-#define CD_LBSELNOITEMS (-1)
-#define CD_LBSELCHANGE   0
-#define CD_LBSELSUB      1
-#define CD_LBSELADD      2
-#define DN_DEFAULTPRN	1
-
-#ifndef SNDMSG
-#ifdef __cplusplus
-#define SNDMSG ::SendMessage
-#else
-#define SNDMSG SendMessage
-#endif
-#endif /* ifndef SNDMSG */
-
-#define CommDlg_OpenSave_GetSpec(d,s,m) ((int)SNDMSG((d),CDM_GETSPEC,(m),(LPARAM)(s)))
-#define CommDlg_OpenSave_GetSpecA CommDlg_OpenSave_GetSpec
-#define CommDlg_OpenSave_GetSpecW CommDlg_OpenSave_GetSpec
-#define CommDlg_OpenSave_GetFilePath(d,s,m) ((int)SNDMSG((d),CDM_GETFILEPATH,(m),(LPARAM)(s)))
-#define CommDlg_OpenSave_GetFilePathA CommDlg_OpenSave_GetFilePath
-#define CommDlg_OpenSave_GetFilePathW CommDlg_OpenSave_GetFilePath
-#define CommDlg_OpenSave_GetFolderPath(d,s,m) ((int)SNDMSG((d),CDM_GETFOLDERPATH,(m),(LPARAM)(LPSTR)(s)))
-#define CommDlg_OpenSave_GetFolderPathA CommDlg_OpenSave_GetFolderPath
-#define CommDlg_OpenSave_GetFolderPathW CommDlg_OpenSave_GetFolderPath
-#define CommDlg_OpenSave_GetFolderIDList(d,i,m) ((int)SNDMSG((d),CDM_GETFOLDERIDLIST,(m),(LPARAM)(i)))
-#define CommDlg_OpenSave_SetControlText(d,i,t) ((void)SNDMSG((d),CDM_SETCONTROLTEXT,(i),(LPARAM)(t)))
-#define CommDlg_OpenSave_HideControl(d,i) ((void)SNDMSG((d),CDM_HIDECONTROL,(i),0))
-#define CommDlg_OpenSave_SetDefExt(d,e) ((void)SNDMSG((d),CDM_SETDEFEXT,0,(LPARAM)(e)))
-
-typedef UINT (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM);
-typedef __CDHOOKPROC LPCCHOOKPROC;
-typedef __CDHOOKPROC LPCFHOOKPROC;
-typedef __CDHOOKPROC LPFRHOOKPROC;
-typedef __CDHOOKPROC LPOFNHOOKPROC;
-typedef __CDHOOKPROC LPPAGEPAINTHOOK;
-typedef __CDHOOKPROC LPPAGESETUPHOOK;
-typedef __CDHOOKPROC LPSETUPHOOKPROC;
-typedef __CDHOOKPROC LPPRINTHOOKPROC;
-typedef struct tagCHOOSECOLORA {
-	DWORD	lStructSize;
-	HWND	hwndOwner;
-	HWND	hInstance;
-	COLORREF	rgbResult;
-	COLORREF*	lpCustColors;
-	DWORD	Flags;
-	LPARAM	lCustData;
-	LPCCHOOKPROC	lpfnHook;
-	LPCSTR	lpTemplateName;
-} CHOOSECOLORA,*LPCHOOSECOLORA;
-typedef struct tagCHOOSECOLORW {
-	DWORD	lStructSize;
-	HWND	hwndOwner;
-	HWND	hInstance;
-	COLORREF	rgbResult;
-	COLORREF*	lpCustColors;
-	DWORD	Flags;
-	LPARAM	lCustData;
-	LPCCHOOKPROC	lpfnHook;
-	LPCWSTR	lpTemplateName;
-} CHOOSECOLORW,*LPCHOOSECOLORW;
-typedef struct tagCHOOSEFONTA {
-	DWORD	lStructSize;
-	HWND	hwndOwner;
-	HDC	hDC;
-	LPLOGFONTA	lpLogFont;
-	INT	iPointSize;
-	DWORD	Flags;
-	DWORD	rgbColors;
-	LPARAM	lCustData;
-	LPCFHOOKPROC	lpfnHook;
-	LPCSTR	lpTemplateName;
-	HINSTANCE	hInstance;
-	LPSTR	lpszStyle;
-	WORD	nFontType;
-	WORD	___MISSING_ALIGNMENT__;
-	INT	nSizeMin;
-	INT	nSizeMax;
-} CHOOSEFONTA,*LPCHOOSEFONTA;
-typedef struct tagCHOOSEFONTW {
-	DWORD	lStructSize;
-	HWND	hwndOwner;
-	HDC	hDC;
-	LPLOGFONTW	lpLogFont;
-	INT	iPointSize;
-	DWORD	Flags;
-	DWORD	rgbColors;
-	LPARAM	lCustData;
-	LPCFHOOKPROC	lpfnHook;
-	LPCWSTR	lpTemplateName;
-	HINSTANCE	hInstance;
-	LPWSTR	lpszStyle;
-	WORD	nFontType;
-	WORD	___MISSING_ALIGNMENT__;
-	INT	nSizeMin;
-	INT	nSizeMax;
-} CHOOSEFONTW,*LPCHOOSEFONTW;
-typedef struct tagDEVNAMES {
-	WORD wDriverOffset;
-	WORD wDeviceOffset;
-	WORD wOutputOffset;
-	WORD wDefault;
-} DEVNAMES,*LPDEVNAMES;
-typedef struct {
-	DWORD lStructSize;
-	HWND hwndOwner;
-	HINSTANCE hInstance;
-	DWORD Flags;
-	LPSTR lpstrFindWhat;
-	LPSTR lpstrReplaceWith;
-	WORD wFindWhatLen;
-	WORD wReplaceWithLen;
-	LPARAM lCustData;
-	LPFRHOOKPROC lpfnHook;
-	LPCSTR lpTemplateName;
-} FINDREPLACEA,*LPFINDREPLACEA;
-typedef struct {
-	DWORD lStructSize;
-	HWND hwndOwner;
-	HINSTANCE hInstance;
-	DWORD Flags;
-	LPWSTR lpstrFindWhat;
-	LPWSTR lpstrReplaceWith;
-	WORD wFindWhatLen;
-	WORD wReplaceWithLen;
-	LPARAM lCustData;
-	LPFRHOOKPROC lpfnHook;
-	LPCWSTR lpTemplateName;
-} FINDREPLACEW,*LPFINDREPLACEW;
-typedef struct tagOFNA {
-	DWORD lStructSize;
-	HWND hwndOwner;
-	HINSTANCE hInstance;
-	LPCSTR lpstrFilter;
-	LPSTR lpstrCustomFilter;
-	DWORD nMaxCustFilter;
-	DWORD nFilterIndex;
-	LPSTR lpstrFile;
-	DWORD nMaxFile;
-	LPSTR lpstrFileTitle;
-	DWORD nMaxFileTitle;
-	LPCSTR lpstrInitialDir;
-	LPCSTR lpstrTitle;
-	DWORD Flags;
-	WORD nFileOffset;
-	WORD nFileExtension;
-	LPCSTR lpstrDefExt;
-	DWORD lCustData;
-	LPOFNHOOKPROC lpfnHook;
-	LPCSTR lpTemplateName;
-} OPENFILENAMEA,*LPOPENFILENAMEA;
-typedef struct tagOFNW {
-	DWORD lStructSize;
-	HWND hwndOwner;
-	HINSTANCE hInstance;
-	LPCWSTR lpstrFilter;
-	LPWSTR lpstrCustomFilter;
-	DWORD nMaxCustFilter;
-	DWORD nFilterIndex;
-	LPWSTR lpstrFile;
-	DWORD nMaxFile;
-	LPWSTR lpstrFileTitle;
-	DWORD nMaxFileTitle;
-	LPCWSTR lpstrInitialDir;
-	LPCWSTR lpstrTitle;
-	DWORD Flags;
-	WORD nFileOffset;
-	WORD nFileExtension;
-	LPCWSTR lpstrDefExt;
-	DWORD lCustData;
-	LPOFNHOOKPROC lpfnHook;
-	LPCWSTR lpTemplateName;
-} OPENFILENAMEW,*LPOPENFILENAMEW;
-typedef struct _OFNOTIFYA {
-	NMHDR hdr;
-	LPOPENFILENAMEA lpOFN;
-	LPSTR pszFile;
-} OFNOTIFYA,*LPOFNOTIFYA;
-typedef struct _OFNOTIFYW {
-	NMHDR hdr;
-	LPOPENFILENAMEW lpOFN;
-	LPWSTR pszFile;
-} OFNOTIFYW,*LPOFNOTIFYW;
-typedef struct tagPSDA {
-	DWORD lStructSize;
-	HWND hwndOwner;
-	HGLOBAL hDevMode;
-	HGLOBAL hDevNames;
-	DWORD Flags;
-	POINT ptPaperSize;
-	RECT rtMinMargin;
-	RECT rtMargin;
-	HINSTANCE hInstance;
-	LPARAM lCustData;
-	LPPAGESETUPHOOK lpfnPageSetupHook;
-	LPPAGEPAINTHOOK lpfnPagePaintHook;
-	LPCSTR lpPageSetupTemplateName;
-	HGLOBAL hPageSetupTemplate;
-} PAGESETUPDLGA,*LPPAGESETUPDLGA;
-typedef struct tagPSDW {
-	DWORD lStructSize;
-	HWND hwndOwner;
-	HGLOBAL hDevMode;
-	HGLOBAL hDevNames;
-	DWORD Flags;
-	POINT ptPaperSize;
-	RECT rtMinMargin;
-	RECT rtMargin;
-	HINSTANCE hInstance;
-	LPARAM lCustData;
-	LPPAGESETUPHOOK lpfnPageSetupHook;
-	LPPAGEPAINTHOOK lpfnPagePaintHook;
-	LPCWSTR lpPageSetupTemplateName;
-	HGLOBAL hPageSetupTemplate;
-} PAGESETUPDLGW,*LPPAGESETUPDLGW;
-typedef struct tagPDA {
-	DWORD lStructSize;
-	HWND hwndOwner;
-	HANDLE hDevMode;
-	HANDLE hDevNames;
-	HDC hDC;
-	DWORD Flags;
-	WORD nFromPage;
-	WORD nToPage;
-	WORD nMinPage;
-	WORD nMaxPage;
-	WORD nCopies;
-	HINSTANCE hInstance;
-	DWORD lCustData;
-	LPPRINTHOOKPROC lpfnPrintHook;
-	LPSETUPHOOKPROC lpfnSetupHook;
-	LPCSTR lpPrintTemplateName;
-	LPCSTR lpSetupTemplateName;
-	HANDLE hPrintTemplate;
-	HANDLE hSetupTemplate;
-} PRINTDLGA,*LPPRINTDLGA;
-typedef struct tagPDW {
-	DWORD lStructSize;
-	HWND hwndOwner;
-	HANDLE hDevMode;
-	HANDLE hDevNames;
-	HDC hDC;
-	DWORD Flags;
-	WORD nFromPage;
-	WORD nToPage;
-	WORD nMinPage;
-	WORD nMaxPage;
-	WORD nCopies;
-	HINSTANCE hInstance;
-	DWORD lCustData;
-	LPPRINTHOOKPROC lpfnPrintHook;
-	LPSETUPHOOKPROC lpfnSetupHook;
-	LPCWSTR lpPrintTemplateName;
-	LPCWSTR lpSetupTemplateName;
-	HANDLE hPrintTemplate;
-	HANDLE hSetupTemplate;
-} PRINTDLGW,*LPPRINTDLGW;
-#if (WINVER >= 0x0500) && !defined (__OBJC__)
-#include <unknwn.h>  /* for LPUNKNOWN  */ 
-#include <prsht.h>   /* for HPROPSHEETPAGE  */
-typedef struct tagPRINTPAGERANGE {
-   DWORD  nFromPage;
-   DWORD  nToPage;
-} PRINTPAGERANGE, *LPPRINTPAGERANGE;
-typedef struct tagPDEXA {
-   DWORD lStructSize;
-   HWND hwndOwner;
-   HGLOBAL hDevMode;
-   HGLOBAL hDevNames;
-   HDC hDC;
-   DWORD Flags;
-   DWORD Flags2;
-   DWORD ExclusionFlags;
-   DWORD nPageRanges;
-   DWORD nMaxPageRanges;
-   LPPRINTPAGERANGE lpPageRanges;
-   DWORD nMinPage;
-   DWORD nMaxPage;
-   DWORD nCopies;
-   HINSTANCE hInstance;
-   LPCSTR lpPrintTemplateName;
-   LPUNKNOWN lpCallback;
-   DWORD nPropertyPages;
-   HPROPSHEETPAGE *lphPropertyPages;
-   DWORD nStartPage;
-   DWORD dwResultAction;
-} PRINTDLGEXA, *LPPRINTDLGEXA;
-typedef struct tagPDEXW {
-   DWORD lStructSize;
-   HWND hwndOwner;
-   HGLOBAL hDevMode;
-   HGLOBAL hDevNames;
-   HDC hDC;
-   DWORD Flags;
-   DWORD Flags2;
-   DWORD ExclusionFlags;
-   DWORD nPageRanges;
-   DWORD nMaxPageRanges;
-   LPPRINTPAGERANGE lpPageRanges;
-   DWORD nMinPage;
-   DWORD nMaxPage;
-   DWORD nCopies;
-   HINSTANCE hInstance;
-   LPCWSTR lpPrintTemplateName;
-   LPUNKNOWN lpCallback;
-   DWORD nPropertyPages;
-   HPROPSHEETPAGE *lphPropertyPages;
-   DWORD nStartPage;
-   DWORD dwResultAction;
-} PRINTDLGEXW, *LPPRINTDLGEXW;
-#endif /* WINVER >= 0x0500 */
-
-BOOL WINAPI ChooseColorA(LPCHOOSECOLORA);
-BOOL WINAPI ChooseColorW(LPCHOOSECOLORW);
-BOOL WINAPI ChooseFontA(LPCHOOSEFONTA);
-BOOL WINAPI ChooseFontW(LPCHOOSEFONTW);
-DWORD WINAPI CommDlgExtendedError(void);
-HWND WINAPI FindTextA(LPFINDREPLACEA);
-HWND WINAPI FindTextW(LPFINDREPLACEW);
-short WINAPI GetFileTitleA(LPCSTR,LPSTR,WORD);
-short WINAPI GetFileTitleW(LPCWSTR,LPWSTR,WORD);
-BOOL WINAPI GetOpenFileNameA(LPOPENFILENAMEA);
-BOOL WINAPI GetOpenFileNameW(LPOPENFILENAMEW);
-BOOL WINAPI GetSaveFileNameA(LPOPENFILENAMEA);
-BOOL WINAPI GetSaveFileNameW(LPOPENFILENAMEW);
-BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA);
-BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW);
-BOOL WINAPI PrintDlgA(LPPRINTDLGA);
-BOOL WINAPI PrintDlgW(LPPRINTDLGW);
-HWND WINAPI ReplaceTextA(LPFINDREPLACEA);
-HWND WINAPI ReplaceTextW(LPFINDREPLACEW);
-#if (WINVER >= 0x0500) && !defined (__OBJC__)
-HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA);
-HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW);
-#endif /* WINVER >= 0x0500 */
-
-#ifdef UNICODE
-#define LBSELCHSTRING  LBSELCHSTRINGW
-#define SHAREVISTRING  SHAREVISTRINGW
-#define FILEOKSTRING   FILEOKSTRINGW
-#define COLOROKSTRING  COLOROKSTRINGW
-#define SETRGBSTRING   SETRGBSTRINGW
-#define HELPMSGSTRING  HELPMSGSTRINGW
-#define FINDMSGSTRING  FINDMSGSTRINGW
-typedef CHOOSECOLORW CHOOSECOLOR,*LPCHOOSECOLOR;
-typedef CHOOSEFONTW CHOOSEFONT,*LPCHOOSEFONT;
-typedef FINDREPLACEW FINDREPLACE,*LPFINDREPLACE;
-typedef OPENFILENAMEW OPENFILENAME,*LPOPENFILENAME;
-typedef OFNOTIFYW OFNOTIFY,*LPOFNOTIFY;
-typedef PAGESETUPDLGW PAGESETUPDLG,*LPPAGESETUPDLG;
-typedef PRINTDLGW PRINTDLG,*LPPRINTDLG;
-#define ChooseColor ChooseColorW
-#define ChooseFont ChooseFontW
-#define FindText FindTextW
-#define GetFileTitle GetFileTitleW
-#define GetOpenFileName GetOpenFileNameW
-#define GetSaveFileName GetSaveFileNameW
-#define PageSetupDlg PageSetupDlgW
-#define PrintDlg PrintDlgW
-#define ReplaceText ReplaceTextW
-#if (WINVER >= 0x0500) && !defined (__OBJC__)
-typedef PRINTDLGEXW PRINTDLGEX, *LPPRINTDLGEX;
-#define PrintDlgEx PrintDlgExW
-#endif /* WINVER >= 0x0500 */
-#else /* UNICODE */
-#define LBSELCHSTRING  LBSELCHSTRINGA
-#define SHAREVISTRING  SHAREVISTRINGA
-#define FILEOKSTRING   FILEOKSTRINGA
-#define COLOROKSTRING  COLOROKSTRINGA
-#define SETRGBSTRING   SETRGBSTRINGA
-#define HELPMSGSTRING  HELPMSGSTRINGA
-#define FINDMSGSTRING  FINDMSGSTRINGA
-typedef CHOOSECOLORA CHOOSECOLOR,*LPCHOOSECOLOR;
-typedef CHOOSEFONTA CHOOSEFONT,*LPCHOOSEFONT;
-typedef FINDREPLACEA FINDREPLACE,*LPFINDREPLACE;
-typedef OPENFILENAMEA OPENFILENAME,*LPOPENFILENAME;
-typedef OFNOTIFYA OFNOTIFY,*LPOFNOTIFY;
-typedef PAGESETUPDLGA PAGESETUPDLG,*LPPAGESETUPDLG;
-typedef PRINTDLGA PRINTDLG,*LPPRINTDLG;
-#define ChooseColor ChooseColorA
-#define ChooseFont ChooseFontA
-#define FindText FindTextA
-#define GetFileTitle GetFileTitleA
-#define GetOpenFileName GetOpenFileNameA
-#define GetSaveFileName GetSaveFileNameA
-#define PageSetupDlg PageSetupDlgA
-#define PrintDlg PrintDlgA
-#define ReplaceText ReplaceTextA
-#if (WINVER >= 0x0500) && !defined (__OBJC__)
-typedef PRINTDLGEXA PRINTDLGEX, *LPPRINTDLGEX;
-#define PrintDlgEx PrintDlgExA
-#endif /* WINVER >= 0x0500 */
-#endif /* UNICODE */
-#pragma pack(pop)
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/cpl.h b/winsup/w32api/include/cpl.h
deleted file mode 100644
index 67c5645bb..000000000
--- a/winsup/w32api/include/cpl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _CPL_H
-#define _CPL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define WM_CPL_LAUNCH (WM_USER+1000)
-#define WM_CPL_LAUNCHED (WM_USER+1001)
-#define CPL_DYNAMIC_RES 0
-#define CPL_INIT 1
-#define CPL_GETCOUNT 2
-#define CPL_INQUIRE 3
-#define CPL_SELECT 4
-#define CPL_DBLCLK 5
-#define CPL_STOP 6
-#define CPL_EXIT 7
-#define CPL_NEWINQUIRE 8
-#define CPL_STARTWPARMS 9
-#define CPL_SETUP 200
-typedef LONG(APIENTRY *APPLET_PROC)(HWND,UINT,LONG,LONG);
-typedef struct tagCPLINFO {
-	int idIcon;
-	int idName;
-	int idInfo;
-	LONG lData;
-} CPLINFO,*LPCPLINFO;
-typedef struct tagNEWCPLINFOA {
-	DWORD dwSize;
-	DWORD dwFlags;
-	DWORD dwHelpContext;
-	LONG lData;
-	HICON hIcon;
-	CHAR szName[32];
-	CHAR szInfo[64];
-	CHAR szHelpFile[128];
-} NEWCPLINFOA,*LPNEWCPLINFOA;
-typedef struct tagNEWCPLINFOW {
-	DWORD dwSize;
-	DWORD dwFlags;
-	DWORD dwHelpContext;
-	LONG lData;
-	HICON hIcon;
-	WCHAR szName[32];
-	WCHAR szInfo[64];
-	WCHAR szHelpFile[128];
-} NEWCPLINFOW,*LPNEWCPLINFOW;
-#ifdef UNICODE
-typedef NEWCPLINFOW NEWCPLINFO,*LPNEWCPLINFO;
-#else
-typedef NEWCPLINFOA NEWCPLINFO,*LPNEWCPLINFO;
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/cplext.h b/winsup/w32api/include/cplext.h
deleted file mode 100644
index 34333b566..000000000
--- a/winsup/w32api/include/cplext.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _CPLEXT_H
-#define _CPLEXT_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#define CPLPAGE_MOUSE_BUTTONS 1
-#define CPLPAGE_MOUSE_PTRMOTION 2
-#define CPLPAGE_MOUSE_WHEEL 3
-#define CPLPAGE_KEYBOARD_SPEED 1
-#define CPLPAGE_DISPLAY_BACKGROUND 1
-#endif
diff --git a/winsup/w32api/include/custcntl.h b/winsup/w32api/include/custcntl.h
deleted file mode 100644
index 8a9d5ff32..000000000
--- a/winsup/w32api/include/custcntl.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#ifndef _CUSTCNTL_H
-#define _CUSTCNTL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define CCF_NOTEXT 1
-#define CCHCCCLASS 32
-#define CCHCCDESC 32
-#define CCHCCTEXT 256
-
-typedef struct tagCCSTYLEA {
-	DWORD flStyle;
-	DWORD flExtStyle;
-	CHAR szText[CCHCCTEXT];
-	LANGID lgid;
-	WORD wReserved1;
-} CCSTYLEA,*LPCCSTYLEA;
-typedef struct tagCCSTYLEW {
-	DWORD flStyle;
-	DWORD flExtStyle;
-	WCHAR szText[CCHCCTEXT];
-	LANGID lgid;
-	WORD wReserved1;
-} CCSTYLEW,*LPCCSTYLEW;
-typedef struct tagCCSTYLEFLAGA {
-	DWORD flStyle;
-	DWORD flStyleMask;
-	LPSTR pszStyle;
-} CCSTYLEFLAGA,*LPCCSTYLEFLAGA;
-typedef struct tagCCSTYLEFLAGW {
-	DWORD flStyle;
-	DWORD flStyleMask;
-	LPWSTR pszStyle;
-} CCSTYLEFLAGW,*LPCCSTYLEFLAGW;
-typedef BOOL(CALLBACK* LPFNCCSTYLEA)(HWND,LPCCSTYLEA);
-typedef INT(CALLBACK* LPFNCCSIZETOTEXTA)(DWORD,DWORD,HFONT,LPSTR);
-typedef struct tagCCINFOA {
-	CHAR szClass[CCHCCCLASS];
-	DWORD flOptions;
-	CHAR szDesc[CCHCCDESC];
-	UINT cxDefault;
-	UINT cyDefault;
-	DWORD flStyleDefault;
-	DWORD flExtStyleDefault;
-	DWORD flCtrlTypeMask;
-	CHAR szTextDefault[CCHCCTEXT];
-	INT cStyleFlags;
-	LPCCSTYLEFLAGA aStyleFlags;
-	LPFNCCSTYLEA lpfnStyle;
-	LPFNCCSIZETOTEXTA lpfnSizeToText;
-	DWORD dwReserved1;
-	DWORD dwReserved2;
-} CCINFOA,*LPCCINFOA;
-typedef UINT(CALLBACK* LPFNCCINFOA)(LPCCINFOA);
-typedef BOOL(CALLBACK* LPFNCCSTYLEW)(HWND,LPCCSTYLEW);
-typedef INT (CALLBACK* LPFNCCSIZETOTEXTW)(DWORD,DWORD,HFONT,LPWSTR);
-typedef struct tagCCINFOW {
-	WCHAR szClass[CCHCCCLASS];
-	DWORD flOptions;
-	WCHAR szDesc[CCHCCDESC];
-	UINT cxDefault;
-	UINT cyDefault;
-	DWORD flStyleDefault;
-	DWORD flExtStyleDefault;
-	DWORD flCtrlTypeMask;
-	WCHAR szTextDefault[CCHCCTEXT];
-	INT cStyleFlags;
-	LPCCSTYLEFLAGW aStyleFlags;
-	LPFNCCSTYLEW lpfnStyle;
-	LPFNCCSIZETOTEXTW lpfnSizeToText;
-	DWORD dwReserved1;
-	DWORD dwReserved2;
-} CCINFOW,*LPCCINFOW;
-typedef UINT(CALLBACK* LPFNCCINFOW)(LPCCINFOW);
-
-UINT CALLBACK CustomControlInfoA(LPCCINFOA acci);
-UINT CALLBACK CustomControlInfoW(LPCCINFOW acci);
-
-#ifdef UNICODE
-typedef CCSTYLEW CCSTYLE,*LPCCSTYLE;
-typedef CCSTYLEFLAGW CCSTYLEFLAG,*LPCCSTYLEFLAG;
-typedef CCINFOW CCINFO,*LPCCINFO;
-#define LPFNCCSTYLE LPFNCCSTYLEW
-#define LPFNCCSIZETOTEXT LPFNCCSIZETOTEXTW
-#define LPFNCCINFO LPFNCCINFOW
-#else
-typedef CCSTYLEA CCSTYLE,*LPCCSTYLE;
-typedef CCSTYLEFLAGA CCSTYLEFLAG,*LPCCSTYLEFLAG;
-typedef CCINFOA CCINFO,*LPCCINFO;
-#define LPFNCCSTYLE LPFNCCSTYLEA
-#define LPFNCCSIZETOTEXT LPFNCCSIZETOTEXTA
-#define LPFNCCINFO LPFNCCINFOA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/dbt.h b/winsup/w32api/include/dbt.h
deleted file mode 100644
index e804756a2..000000000
--- a/winsup/w32api/include/dbt.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifndef _DBT_H
-#define _DBT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define DBT_NO_DISK_SPACE	0x47
-#define DBT_CONFIGMGPRIVATE	0x7FFF
-#define DBT_DEVICEARRIVAL	0x8000
-#define DBT_DEVICEQUERYREMOVE	0x8001
-#define DBT_DEVICEQUERYREMOVEFAILED	0x8002
-#define DBT_DEVICEREMOVEPENDING	0x8003
-#define DBT_DEVICEREMOVECOMPLETE	0x8004
-#define DBT_DEVICETYPESPECIFIC	0x8005
-#define DBT_DEVTYP_OEM	0
-#define DBT_DEVTYP_DEVNODE	1
-#define DBT_DEVTYP_VOLUME	2
-#define DBT_DEVTYP_PORT	3
-#define DBT_DEVTYP_NET	4
-#define DBT_APPYBEGIN 0
-#define DBT_APPYEND 1
-#define DBT_DEVNODES_CHANGED 7
-#define DBT_QUERYCHANGECONFIG 0x17
-#define DBT_CONFIGCHANGED 0x18
-#define DBT_CONFIGCHANGECANCELED 0x19
-#define DBT_MONITORCHANGE 0x1B
-#define DBT_SHELLLOGGEDON 32
-#define DBT_CONFIGMGAPI32 34
-#define DBT_VXDINITCOMPLETE 35
-#define DBT_VOLLOCKQUERYLOCK 0x8041
-#define DBT_VOLLOCKLOCKTAKEN 0x8042
-#define DBT_VOLLOCKLOCKFAILED 0x8043
-#define DBT_VOLLOCKQUERYUNLOCK 0x8044
-#define DBT_VOLLOCKLOCKRELEASED 0x8045
-#define DBT_VOLLOCKUNLOCKFAILED 0x8046
-#define DBT_USERDEFINED 0xFFFF
-#define DBTF_MEDIA	1
-#define DBTF_NET	2
-
-/* Also defined in winuser.h */
-#define BSM_ALLCOMPONENTS	0
-#define BSM_APPLICATIONS	8
-#define BSM_ALLDESKTOPS		16
-#define BSM_INSTALLABLEDRIVERS	4
-#define BSM_NETDRIVER	2
-#define BSM_VXDS	1
-#define BSF_FLUSHDISK 0x00000004
-#define BSF_FORCEIFHUNG 0x00000020
-#define BSF_IGNORECURRENTTASK 0x00000002
-#define BSF_NOHANG 0x00000008
-#define BSF_NOTIMEOUTIFNOTHUNG 0x00000040
-#define BSF_POSTMESSAGE 0x00000010
-#define BSF_QUERY 0x00000001
-#if (_WIN32_WINNT >= 0x0500)
-#define BSF_ALLOWSFW 0x00000080
-#define BSF_SENDNOTIFYMESSAGE 0x00000100
-#endif /* (_WIN32_WINNT >= 0x0500) */
-#if (_WIN32_WINNT >= 0x0501)
-#define BSF_LUID 0x00000400
-#define BSF_RETURNHDESK 0x00000200
-#endif /* (_WIN32_WINNT >= 0x0501) */
-
-#define BSF_MSGSRV32ISOK_BIT 31
-#define BSF_MSGSRV32ISOK 0x80000000
-
-typedef struct _DEV_BROADCAST_HDR {
-	DWORD dbch_size;
-	DWORD dbch_devicetype;
-	DWORD dbch_reserved;
-} DEV_BROADCAST_HDR,*PDEV_BROADCAST_HDR;
-typedef struct _DEV_BROADCAST_OEM {
-	DWORD dbco_size;
-	DWORD dbco_devicetype;
-	DWORD dbco_reserved;
-	DWORD dbco_identifier;
-	DWORD dbco_suppfunc;
-} DEV_BROADCAST_OEM,*PDEV_BROADCAST_OEM;
-typedef struct _DEV_BROADCAST_PORT_A {
-	DWORD dbcp_size;
-	DWORD dbcp_devicetype;
-	DWORD dbcp_reserved;
-	char dbcp_name[1];
-} DEV_BROADCAST_PORT_A, *PDEV_BROADCAST_PORT_A;
-typedef struct _DEV_BROADCAST_PORT_W {
-	DWORD dbcp_size;
-	DWORD dbcp_devicetype;
-	DWORD dbcp_reserved;
-	wchar_t dbcp_name[1];
-} DEV_BROADCAST_PORT_W, *PDEV_BROADCAST_PORT_W;
-typedef struct _DEV_BROADCAST_USERDEFINED {
-	struct _DEV_BROADCAST_HDR dbud_dbh;
-	char dbud_szName[1];
-} DEV_BROADCAST_USERDEFINED;
-typedef struct _DEV_BROADCAST_VOLUME {
-	DWORD dbcv_size;
-	DWORD dbcv_devicetype;
-	DWORD dbcv_reserved;
-	DWORD dbcv_unitmask;
-	WORD dbcv_flags;
-} DEV_BROADCAST_VOLUME,*PDEV_BROADCAST_VOLUME;
-
-#ifdef UNICODE
-typedef DEV_BROADCAST_PORT_W DEV_BROADCAST_PORT, *PDEV_BROADCAST_PORT;
-#else
-typedef DEV_BROADCAST_PORT_A DEV_BROADCAST_PORT, *PDEV_BROADCAST_PORT;
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/dde.h b/winsup/w32api/include/dde.h
deleted file mode 100644
index b13e9ce39..000000000
--- a/winsup/w32api/include/dde.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef _DDE_H
-#define _DDE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define WM_DDE_FIRST	0x03E0
-#define WM_DDE_INITIATE	(WM_DDE_FIRST)
-#define WM_DDE_TERMINATE	(WM_DDE_FIRST+1)
-#define WM_DDE_ADVISE	(WM_DDE_FIRST+2)
-#define WM_DDE_UNADVISE	(WM_DDE_FIRST+3)
-#define WM_DDE_ACK	(WM_DDE_FIRST+4)
-#define WM_DDE_DATA	(WM_DDE_FIRST+5)
-#define WM_DDE_REQUEST	(WM_DDE_FIRST+6)
-#define WM_DDE_POKE	(WM_DDE_FIRST+7)
-#define WM_DDE_EXECUTE	(WM_DDE_FIRST+8)
-#define WM_DDE_LAST	(WM_DDE_FIRST+8)
-
-#ifndef RC_INVOKED
-typedef struct {
-	unsigned short bAppReturnCode:8,reserved:6,fBusy:1,fAck:1;
-} DDEACK;
-typedef struct {
-	unsigned short reserved:14,fDeferUpd:1,fAckReq:1;
-	short cfFormat;
-} DDEADVISE;
-typedef struct {
-	unsigned short unused:12,fResponse:1,fRelease:1,reserved:1,fAckReq:1;
-	short cfFormat;
-	BYTE Value[1];
-} DDEDATA;
-typedef struct {
-	unsigned short unused:13,fRelease:1,fReserved:2;
-	short cfFormat;
-	BYTE  Value[1];
-} DDEPOKE;
-typedef struct {
-        unsigned short unused:13,
-                 fRelease:1,
-                 fDeferUpd:1,
-         fAckReq:1;
-    short    cfFormat;
-} DDELN;
-
-typedef struct {
-	unsigned short unused:12,fAck:1,fRelease:1,fReserved:1,fAckReq:1;
-    short cfFormat;
-    BYTE rgb[1];
-} DDEUP;
-BOOL WINAPI DdeSetQualityOfService(HWND,const SECURITY_QUALITY_OF_SERVICE*,PSECURITY_QUALITY_OF_SERVICE);
-BOOL WINAPI ImpersonateDdeClientWindow(HWND,HWND);
-LPARAM WINAPI PackDDElParam(UINT,UINT_PTR,UINT_PTR); 
-BOOL WINAPI UnpackDDElParam(UINT,LPARAM,PUINT_PTR,PUINT_PTR); 
-BOOL WINAPI FreeDDElParam(UINT,LPARAM); 
-LPARAM WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT_PTR,UINT_PTR); 
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/ddeml.h b/winsup/w32api/include/ddeml.h
deleted file mode 100644
index 6ae3bc12e..000000000
--- a/winsup/w32api/include/ddeml.h
+++ /dev/null
@@ -1,314 +0,0 @@
-#ifndef _DDEML_H
-#define _DDEML_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define EXPENTRY	CALLBACK
-#define CP_WINANSI	1004
-#define CP_WINUNICODE	1200
-#define XTYPF_NOBLOCK	2
-#define XTYPF_NODATA	4
-#define XTYPF_ACKREQ	8
-#define XCLASS_MASK	0xFC00
-#define XCLASS_BOOL	0x1000
-#define XCLASS_DATA	0x2000
-#define XCLASS_FLAGS	0x4000
-#define XCLASS_NOTIFICATION	0x8000
-#define XST_NULL	0
-#define XST_INCOMPLETE	1
-#define XST_CONNECTED	2
-#define XST_INIT1	3
-#define XST_INIT2	4
-#define XST_REQSENT	5
-#define XST_DATARCVD	6
-#define XST_POKESENT	7
-#define XST_POKEACKRCVD	8
-#define XST_EXECSENT	9
-#define XST_EXECACKRCVD	10
-#define XST_ADVSENT 11
-#define XST_UNADVSENT 12
-#define XST_ADVACKRCVD 13
-#define XST_UNADVACKRCVD 14
-#define XST_ADVDATASENT 15
-#define XST_ADVDATAACKRCVD 16
-#define XTYP_ERROR	(XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_ADVDATA	(16|XCLASS_FLAGS)
-#define XTYP_ADVREQ	(32|XCLASS_DATA|XTYPF_NOBLOCK)
-#define XTYP_ADVSTART	(0x30|XCLASS_BOOL)
-#define XTYP_ADVSTOP	(0x0040|XCLASS_NOTIFICATION)
-#define XTYP_EXECUTE	(0x0050|XCLASS_FLAGS)
-#define XTYP_CONNECT	(0x0060|XCLASS_BOOL|XTYPF_NOBLOCK)
-#define XTYP_CONNECT_CONFIRM	(0x0070|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_XACT_COMPLETE	(0x0080|XCLASS_NOTIFICATION)
-#define XTYP_POKE	(0x0090|XCLASS_FLAGS)
-#define XTYP_REGISTER	(0x00A0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_REQUEST	(0x00B0|XCLASS_DATA)
-#define XTYP_DISCONNECT	(0x00C0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_UNREGISTER	(0x00D0|XCLASS_NOTIFICATION|XTYPF_NOBLOCK)
-#define XTYP_WILDCONNECT	(0x00E0|XCLASS_DATA|XTYPF_NOBLOCK)
-#define XTYP_MASK	0xF0
-#define XTYP_SHIFT	4
-#define TIMEOUT_ASYNC	0xFFFFFFFF
-#define QID_SYNC	0xFFFFFFFF
-#define ST_CONNECTED	1
-#define ST_ADVISE	2
-#define ST_ISLOCAL	4
-#define ST_BLOCKED	8
-#define ST_CLIENT	16
-#define ST_TERMINATED	32
-#define ST_INLIST	64
-#define ST_BLOCKNEXT	128
-#define ST_ISSELF	256
-#define CADV_LATEACK 0xFFFF
-#define DMLERR_NO_ERROR	0
-#define DMLERR_FIRST	0x4000
-#define DMLERR_ADVACKTIMEOUT	0x4000
-#define DMLERR_BUSY	0x4001
-#define DMLERR_DATAACKTIMEOUT	0x4002
-#define DMLERR_DLL_NOT_INITIALIZED	0x4003
-#define	DMLERR_DLL_USAGE	0x4004
-#define DMLERR_EXECACKTIMEOUT	0x4005
-#define DMLERR_INVALIDPARAMETER	0x4006
-#define DMLERR_LOW_MEMORY	0x4007
-#define DMLERR_MEMORY_ERROR	0x4008
-#define DMLERR_NOTPROCESSED	0x4009
-#define DMLERR_NO_CONV_ESTABLISHED	0x400a
-#define DMLERR_POKEACKTIMEOUT	0x400b
-#define DMLERR_POSTMSG_FAILED	0x400c
-#define DMLERR_REENTRANCY	0x400d
-#define DMLERR_SERVER_DIED	0x400e
-#define DMLERR_SYS_ERROR	0x400f
-#define DMLERR_UNADVACKTIMEOUT	0x4010
-#define DMLERR_UNFOUND_QUEUE_ID	0x4011
-#define DMLERR_LAST	0x4011
-#define DDE_FACK	0x8000
-#define DDE_FBUSY	0x4000
-#define DDE_FDEFERUPD	0x4000
-#define DDE_FACKREQ	0x8000
-#define DDE_FRELEASE	0x2000
-#define DDE_FREQUESTED	0x1000
-#define DDE_FAPPSTATUS	0x00ff
-#define DDE_FNOTPROCESSED	0
-#define DDE_FACKRESERVED	(~(DDE_FACK|DDE_FBUSY|DDE_FAPPSTATUS))
-#define DDE_FADVRESERVED	(~(DDE_FACKREQ|DDE_FDEFERUPD))
-#define DDE_FDATRESERVED	(~(DDE_FACKREQ|DDE_FRELEASE|DDE_FREQUESTED))
-#define DDE_FPOKRESERVED	(~DDE_FRELEASE)
-#define MSGF_DDEMGR	0x8001
-#define CBR_BLOCK	((HDDEDATA)0xffffffff)
-#define CBF_FAIL_SELFCONNECTIONS	0x1000
-#define CBF_FAIL_CONNECTIONS	0x2000
-#define CBF_FAIL_ADVISES	0x4000
-#define CBF_FAIL_EXECUTES	0x8000
-#define CBF_FAIL_POKES	0x10000
-#define CBF_FAIL_REQUESTS	0x20000
-#define CBF_FAIL_ALLSVRXACTIONS	0x3f000
-#define CBF_SKIP_CONNECT_CONFIRMS	0x40000
-#define CBF_SKIP_REGISTRATIONS	0x80000
-#define CBF_SKIP_UNREGISTRATIONS	0x100000
-#define CBF_SKIP_DISCONNECTS	0x200000
-#define CBF_SKIP_ALLNOTIFICATIONS	0x3c0000
-#define APPCMD_CLIENTONLY	0x10L
-#define APPCMD_FILTERINITS	0x20L
-#define APPCMD_MASK	0xFF0L
-#define APPCLASS_STANDARD	0
-#define APPCLASS_MASK	0xFL
-#define EC_ENABLEALL	0
-#define EC_ENABLEONE	ST_BLOCKNEXT
-#define EC_DISABLE	ST_BLOCKED
-#define EC_QUERYWAITING	2
-#define DNS_REGISTER	1
-#define DNS_UNREGISTER	2
-#define DNS_FILTERON	4
-#define DNS_FILTEROFF	8
-#define HDATA_APPOWNED	1
-#define MAX_MONITORS	4
-#define APPCLASS_MONITOR	1L
-#define XTYP_MONITOR	(XCLASS_NOTIFICATION|XTYPF_NOBLOCK|0xF0)
-#define MF_HSZ_INFO	0x1000000
-#define MF_SENDMSGS	0x2000000
-#define MF_POSTMSGS	0x4000000
-#define MF_CALLBACKS	0x8000000
-#define MF_ERRORS	0x10000000
-#define MF_LINKS	0x20000000
-#define MF_CONV	0x40000000
-#define MF_MASK 0xFF000000
-#define MH_CREATE	1
-#define MH_KEEP	2
-#define MH_DELETE	3
-#define MH_CLEANUP	4
-
-DECLARE_HANDLE(HCONVLIST);
-DECLARE_HANDLE(HCONV);
-DECLARE_HANDLE(HSZ);
-DECLARE_HANDLE(HDDEDATA);
-typedef HDDEDATA CALLBACK FNCALLBACK(UINT,UINT,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD);
-typedef HDDEDATA(CALLBACK *PFNCALLBACK)(UINT,UINT,HCONV,HSZ,HSZ,HDDEDATA,DWORD,DWORD);
-typedef struct tagHSZPAIR {
-	HSZ	hszSvc;
-	HSZ	hszTopic;
-} HSZPAIR, *PHSZPAIR;
-typedef struct tagCONVCONTEXT {
-	UINT	cb;
-	UINT	wFlags;
-	UINT	wCountryID;
-	int	iCodePage;
-	DWORD	dwLangID;
-	DWORD	dwSecurity;
-	SECURITY_QUALITY_OF_SERVICE qos;
-} CONVCONTEXT,*PCONVCONTEXT;
-typedef struct tagCONVINFO {
-	DWORD	cb;
-	DWORD	hUser;
-	HCONV	hConvPartner;
-	HSZ	hszSvcPartner;
-	HSZ	hszServiceReq;
-	HSZ	hszTopic;
-	HSZ	hszItem;
-	UINT	wFmt;
-	UINT	wType;
-	UINT	wStatus;
-	UINT	wConvst;
-	UINT	wLastError;
-	HCONVLIST	hConvList;
-	CONVCONTEXT ConvCtxt;
-	HWND	hwnd;
-	HWND	hwndPartner;
-} CONVINFO,*PCONVINFO;
-typedef struct tagDDEML_MSG_HOOK_DATA {
-	UINT	uiLo;
-	UINT	uiHi;
-	DWORD	cbData;
-	DWORD	Data[8];
-} DDEML_MSG_HOOK_DATA;
-typedef struct tagMONHSZSTRUCT {
-	UINT	cb;
-	BOOL	fsAction;
-	DWORD	dwTime;
-	HSZ	hsz;
-	HANDLE	hTask;
-	TCHAR	str[1];
-} MONHSZSTRUCT, *PMONHSZSTRUCT;
-typedef struct tagMONLINKSTRUCT {
-	UINT	cb;
-	DWORD	dwTime;
-	HANDLE	hTask;
-	BOOL	fEstablished;
-	BOOL	fNoData;
-	HSZ	hszSvc;
-	HSZ	hszTopic;
-	HSZ	hszItem;
-	UINT	wFmt;
-	BOOL	fServer;
-	HCONV	hConvServer;
-	HCONV	hConvClient;
-} MONLINKSTRUCT, *PMONLINKSTRUCT;
-typedef struct tagMONCONVSTRUCT {
-	UINT	cb;
-	BOOL	fConnect;
-	DWORD	dwTime;
-	HANDLE	hTask;
-	HSZ	hszSvc;
-	HSZ	hszTopic;
-	HCONV	hConvClient;
-	HCONV	hConvServer;
-} MONCONVSTRUCT, *PMONCONVSTRUCT;
-typedef struct tagMONCBSTRUCT {
-	UINT	cb;
-	DWORD	dwTime;
-	HANDLE	hTask;
-	DWORD	dwRet;
-	UINT	wType;
-	UINT	wFmt;
-	HCONV	hConv;
-	HSZ	hsz1;
-	HSZ	hsz2;
-	HDDEDATA	hData;
-	ULONG_PTR	dwData1;
-	ULONG_PTR	dwData2;
-	CONVCONTEXT	cc;
-	DWORD	cbData;
-	DWORD	Data[8];
-} MONCBSTRUCT, *PMONCBSTRUCT;
-typedef struct tagMONERRSTRUCT {
-	UINT	cb;
-	UINT	wLastError;
-	DWORD	dwTime;
-	HANDLE	hTask;
-} MONERRSTRUCT, *PMONERRSTRUCT;
-typedef struct tagMONMSGSTRUCT {
-	UINT	cb;
-	HWND	hwndTo;
-	DWORD	dwTime;
-	HANDLE	hTask;
-	UINT	wMsg;
-	WPARAM	wParam;
-	LPARAM	lParam;
-	DDEML_MSG_HOOK_DATA dmhd;
-} MONMSGSTRUCT, *PMONMSGSTRUCT;
-
-BOOL WINAPI DdeAbandonTransaction(DWORD,HCONV,DWORD);
-PBYTE WINAPI DdeAccessData(HDDEDATA,PDWORD);
-HDDEDATA WINAPI DdeAddData(HDDEDATA,PBYTE,DWORD,DWORD);
-HDDEDATA WINAPI DdeClientTransaction(PBYTE,DWORD,HCONV,HSZ,UINT,UINT,DWORD,PDWORD);
-int WINAPI DdeCmpStringHandles(HSZ,HSZ);
-HCONV WINAPI DdeConnect(DWORD,HSZ,HSZ,PCONVCONTEXT);
-HCONVLIST WINAPI DdeConnectList(DWORD,HSZ,HSZ,HCONVLIST,PCONVCONTEXT);
-HDDEDATA WINAPI DdeCreateDataHandle(DWORD,PBYTE,DWORD,DWORD,HSZ,UINT,UINT);
-HSZ WINAPI DdeCreateStringHandleA(DWORD,LPSTR,int);
-HSZ WINAPI DdeCreateStringHandleW(DWORD,LPWSTR,int);
-BOOL WINAPI DdeDisconnect(HCONV);
-BOOL WINAPI DdeDisconnectList(HCONVLIST);
-BOOL WINAPI DdeEnableCallback(DWORD,HCONV,UINT);
-BOOL WINAPI DdeFreeDataHandle(HDDEDATA);
-BOOL WINAPI DdeFreeStringHandle(DWORD,HSZ);
-DWORD WINAPI DdeGetData(HDDEDATA,PBYTE,DWORD,DWORD);
-UINT WINAPI DdeGetLastError(DWORD);
-BOOL WINAPI DdeImpersonateClient(HCONV);
-UINT WINAPI DdeInitializeA(PDWORD,PFNCALLBACK,DWORD,DWORD);
-UINT WINAPI DdeInitializeW(PDWORD,PFNCALLBACK,DWORD,DWORD);
-BOOL WINAPI DdeKeepStringHandle(DWORD,HSZ);
-HDDEDATA WINAPI DdeNameService(DWORD,HSZ,HSZ,UINT);
-BOOL WINAPI DdePostAdvise(DWORD,HSZ,HSZ);
-UINT WINAPI DdeQueryConvInfo(HCONV,DWORD,PCONVINFO);
-HCONV WINAPI DdeQueryNextServer(HCONVLIST,HCONV);
-DWORD WINAPI DdeQueryStringA(DWORD,HSZ,LPSTR,DWORD,int);
-DWORD WINAPI DdeQueryStringW(DWORD,HSZ,LPWSTR,DWORD,int);
-HCONV WINAPI DdeReconnect(HCONV);
-BOOL WINAPI DdeSetUserHandle(HCONV,DWORD,DWORD);
-BOOL WINAPI DdeUnaccessData(HDDEDATA);
-BOOL WINAPI DdeUninitialize(DWORD);
-
-#ifdef UNICODE
-#define SZDDESYS_TOPIC	L"System"
-#define SZDDESYS_ITEM_TOPICS	L"Topics"
-#define SZDDESYS_ITEM_SYSITEMS	L"SysItems"
-#define SZDDESYS_ITEM_RTNMSG	L"ReturnMessage"
-#define SZDDESYS_ITEM_STATUS	L"Status"
-#define SZDDESYS_ITEM_FORMATS	L"Formats"
-#define SZDDESYS_ITEM_HELP	L"Help"
-#define SZDDE_ITEM_ITEMLIST	L"TopicItemList"
-#define DdeCreateStringHandle DdeCreateStringHandleW
-#define DdeInitialize DdeInitializeW
-#define DdeQueryString DdeQueryStringW
-#else
-#define SZDDESYS_TOPIC	"System"
-#define SZDDESYS_ITEM_TOPICS	"Topics"
-#define SZDDESYS_ITEM_SYSITEMS	"SysItems"
-#define SZDDESYS_ITEM_RTNMSG	"ReturnMessage"
-#define SZDDESYS_ITEM_STATUS	"Status"
-#define SZDDESYS_ITEM_FORMATS	"Formats"
-#define SZDDESYS_ITEM_HELP	"Help"
-#define SZDDE_ITEM_ITEMLIST	"TopicItemList"
-#define DdeCreateStringHandle DdeCreateStringHandleA
-#define DdeInitialize DdeInitializeA
-#define DdeQueryString DdeQueryStringA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif /* _DDEML_H */
diff --git a/winsup/w32api/include/ddk/atm.h b/winsup/w32api/include/ddk/atm.h
deleted file mode 100644
index bf95bd98a..000000000
--- a/winsup/w32api/include/ddk/atm.h
+++ /dev/null
@@ -1,510 +0,0 @@
-/*
- * atm.h
- *
- * ATM support
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __ATM_H
-#define __ATM_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-typedef ULONG	ATM_ADDRESSTYPE;
-
-#define SAP_TYPE_NSAP			                1
-#define SAP_TYPE_E164			                2
-
-#define ATM_MEDIA_SPECIFIC                1
-
-#define CALLMGR_SPECIFIC_Q2931            1
-
-#define	ATM_NSAP				                  0
-#define	ATM_E164				                  1
-
-#define	ATM_MAC_ADDRESS_LENGTH	          6
-#define	ATM_ADDRESS_LENGTH		            20
-
-typedef ULONG	ATM_AAL_TYPE, *PATM_AAL_TYPE;
-
-#define	AAL_TYPE_AAL0			                1
-#define	AAL_TYPE_AAL1			                2
-#define	AAL_TYPE_AAL34			              4
-#define	AAL_TYPE_AAL5			                8
-
-#define ATM_ADDR_BLANK_CHAR				        L' '
-#define ATM_ADDR_E164_START_CHAR		      L'+'
-#define ATM_ADDR_PUNCTUATION_CHAR		      L'.'
-
-typedef enum {
-	IE_AALParameters,
-	IE_TrafficDescriptor,
-	IE_BroadbandBearerCapability,
-	IE_BHLI,
-	IE_BLLI,
-	IE_CalledPartyNumber,
-	IE_CalledPartySubaddress,
-	IE_CallingPartyNumber,
-	IE_CallingPartySubaddress,
-	IE_Cause,
-	IE_QOSClass,
-	IE_TransitNetworkSelection,
-	IE_BroadbandSendingComplete,
-	IE_LIJCallId,
-	IE_Raw
-} Q2931_IE_TYPE;
-
-typedef struct _Q2931_IE {
-  Q2931_IE_TYPE  IEType;
-  ULONG  IELength;
-  UCHAR  IE[1];
-} Q2931_IE, *PQ2931_IE;
-
-typedef struct _AAL1_PARAMETERS {
-  UCHAR  Subtype;
-  UCHAR  CBRRate;
-  USHORT  Multiplier;
-  UCHAR  SourceClockRecoveryMethod;
-  UCHAR  ErrorCorrectionMethod;
-  USHORT  StructuredDataTransferBlocksize;
-  UCHAR  PartiallyFilledCellsMethod;
-} AAL1_PARAMETERS, *PAAL1_PARAMETERS;
-
-typedef struct _AAL34_PARAMETERS {
-  USHORT  ForwardMaxCPCSSDUSize;
-  USHORT  BackwardMaxCPCSSDUSize;
-  USHORT  LowestMID;
-  USHORT  HighestMID;
-  UCHAR  SSCSType;
-} AAL34_PARAMETERS, *PAAL34_PARAMETERS;
-
-/* AAL5_PARAMETERS.Mode constants */
-#define AAL5_MODE_MESSAGE			            0x01
-#define AAL5_MODE_STREAMING			          0x02
-
-/* AAL5_PARAMETERS.SSCSType constants */
-#define AAL5_SSCS_NULL				            0x00
-#define AAL5_SSCS_SSCOP_ASSURED		        0x01
-#define AAL5_SSCS_SSCOP_NON_ASSURED	      0x02
-#define AAL5_SSCS_FRAME_RELAY		          0x04
-
-typedef struct _AAL5_PARAMETERS {
-  ULONG  ForwardMaxCPCSSDUSize;
-  ULONG  BackwardMaxCPCSSDUSize;
-  UCHAR  Mode;
-  UCHAR  SSCSType;
-} AAL5_PARAMETERS, *PAAL5_PARAMETERS;
-
-typedef struct _AALUSER_PARAMETERS {
-  ULONG  UserDefined;
-} AALUSER_PARAMETERS, *PAALUSER_PARAMETERS;
-
-typedef struct _AAL_PARAMETERS_IE {
-  ATM_AAL_TYPE  AALType;
-  union {
-    AAL1_PARAMETERS  AAL1Parameters;
-    AAL34_PARAMETERS  AAL34Parameters;
-    AAL5_PARAMETERS  AAL5Parameters;
-    AALUSER_PARAMETERS  AALUserParameters;
-  } AALSpecificParameters;
-} AAL_PARAMETERS_IE, *PAAL_PARAMETERS_IE;
-
-
-/* FIXME: Should the union be anonymous in C++ too?  If so,
-   can't define named types _ATM_AAL5_INFO and _ATM_AAL0_INFO
-   within anonymous union for C++. */
-typedef struct _ATM_AAL_OOB_INFO
-{
-	ATM_AAL_TYPE  AalType;
-#ifndef __cplusplus
-	_ANONYMOUS_UNION
-#endif
-	union {
-		struct _ATM_AAL5_INFO {
-			BOOLEAN  CellLossPriority;
-			UCHAR  UserToUserIndication;
-			UCHAR  CommonPartIndicator;
-		} ATM_AAL5_INFO;
-		
-		struct _ATM_AAL0_INFO {
-			BOOLEAN  CellLossPriority;
-			UCHAR  PayLoadTypeIdentifier;
-		} ATM_AAL0_INFO;
-#ifndef __cplusplus
-	} DUMMYUNIONNAME;
-#else
-	} u;
-#endif
-} ATM_AAL_OOB_INFO, *PATM_AAL_OOB_INFO;
-
-typedef struct _ATM_ADDRESS  { 
-  ATM_ADDRESSTYPE  AddressType; 
-  ULONG  NumberOfDigits; 
-  UCHAR  Address[ATM_ADDRESS_LENGTH]; 
-} ATM_ADDRESS, *PATM_ADDRESS;
-
-/* ATM_BHLI_IE.HighLayerInfoType constants */
-#define BHLI_ISO				                  0x00
-#define BHLI_UserSpecific		              0x01
-#define BHLI_HighLayerProfile	            0x02
-#define BHLI_VendorSpecificAppId          0x03
-
-typedef struct _ATM_BHLI_IE {
-  ULONG  HighLayerInfoType;
-  ULONG  HighLayerInfoLength;
-  UCHAR  HighLayerInfo[8];
-} ATM_BHLI_IE, *PATM_BHLI_IE;
-
-/* ATM_BLLI_IE.Layer2Protocol constants */
-#define BLLI_L2_ISO_1745		              0x01
-#define BLLI_L2_Q921			                0x02
-#define BLLI_L2_X25L			                0x06
-#define BLLI_L2_X25M			                0x07
-#define BLLI_L2_ELAPB			                0x08
-#define BLLI_L2_HDLC_ARM		              0x09
-#define BLLI_L2_HDLC_NRM		              0x0A
-#define BLLI_L2_HDLC_ABM		              0x0B
-#define BLLI_L2_LLC				                0x0C
-#define BLLI_L2_X75				                0x0D
-#define BLLI_L2_Q922			                0x0E
-#define BLLI_L2_USER_SPECIFIED            0x10
-#define BLLI_L2_ISO_7776		              0x11
-
-/* ATM_BLLI_IE.Layer3Protocol constants */
-#define BLLI_L3_X25				                0x06
-#define BLLI_L3_ISO_8208		              0x07
-#define BLLI_L3_X223			                0x08
-#define BLLI_L3_SIO_8473		              0x09
-#define BLLI_L3_T70				                0x0A
-#define BLLI_L3_ISO_TR9577		            0x0B
-#define BLLI_L3_USER_SPECIFIED	          0x10
-
-/* ATM_BLLI_IE.Layer3IPI constants */
-#define BLLI_L3_IPI_SNAP		              0x80
-#define BLLI_L3_IPI_IP			              0xCC
-
-typedef struct _ATM_BLLI_IE {
-  ULONG  Layer2Protocol;
-  UCHAR  Layer2Mode;
-  UCHAR  Layer2WindowSize;
-  ULONG  Layer2UserSpecifiedProtocol;
-  ULONG  Layer3Protocol;
-  UCHAR  Layer3Mode;
-  UCHAR  Layer3DefaultPacketSize;
-  UCHAR  Layer3PacketWindowSize;
-  ULONG  Layer3UserSpecifiedProtocol;
-  ULONG  Layer3IPI;
-  UCHAR  SnapId[5];
-} ATM_BLLI_IE, *PATM_BLLI_IE;
-
-/* ATM_BROADBAND_BEARER_CAPABILITY_IE.BearerClass constants */
-#define BCOB_A					                  0x00
-#define BCOB_C					                  0x01
-#define BCOB_X					                  0x02
-
-/* ATM_BROADBAND_BEARER_CAPABILITY_IE.TrafficType constants */
-#define TT_NOIND				                  0x00
-#define TT_CBR					                  0x04
-#define TT_VBR					                  0x08
-
-/* ATM_BROADBAND_BEARER_CAPABILITY_IE.TimingRequirements constants */
-#define TR_NOIND				                  0x00
-#define TR_END_TO_END			                0x01
-#define TR_NO_END_TO_END		              0x02
-
-/* ATM_BROADBAND_BEARER_CAPABILITY_IE.ClippingSusceptability constants */
-#define CLIP_NOT				                  0x00
-#define CLIP_SUS				                  0x20
-
-/* ATM_BROADBAND_BEARER_CAPABILITY_IE.UserPlaneConnectionConfig constants */
-#define UP_P2P					                  0x00
-#define UP_P2MP					                  0x01
-
-typedef struct _ATM_BROADBAND_BEARER_CAPABILITY_IE {
-  UCHAR  BearerClass;
-  UCHAR  TrafficType;
-  UCHAR  TimingRequirements;
-  UCHAR  ClippingSusceptability;
-  UCHAR  UserPlaneConnectionConfig;
-} ATM_BROADBAND_BEARER_CAPABILITY_IE, *PATM_BROADBAND_BEARER_CAPABILITY_IE;
-
-typedef struct _ATM_BROADBAND_SENDING_COMPLETE_IE {
-  UCHAR  SendingComplete;
-} ATM_BROADBAND_SENDING_COMPLETE_IE, *PATM_BROADBAND_SENDING_COMPLETE_IE;
-
-typedef struct _ATM_CALLING_PARTY_NUMBER_IE {
-  ATM_ADDRESS  Number;
-  UCHAR  PresentationIndication;
-  UCHAR  ScreeningIndicator;
-} ATM_CALLING_PARTY_NUMBER_IE, *PATM_CALLING_PARTY_NUMBER_IE;
-
-/* ATM_CAUSE_IE.Location constants */
-#define ATM_CAUSE_LOC_USER                    0x00
-#define ATM_CAUSE_LOC_PRIVATE_LOCAL           0x01
-#define ATM_CAUSE_LOC_PUBLIC_LOCAL            0x02
-#define ATM_CAUSE_LOC_TRANSIT_NETWORK         0x03
-#define ATM_CAUSE_LOC_PUBLIC_REMOTE           0x04
-#define ATM_CAUSE_LOC_PRIVATE_REMOTE          0x05
-#define ATM_CAUSE_LOC_INTERNATIONAL_NETWORK   0x07
-#define ATM_CAUSE_LOC_BEYOND_INTERWORKING     0x0A
-
-/* ATM_CAUSE_IE.Cause constants */
-#define ATM_CAUSE_UNALLOCATED_NUMBER                0x01
-#define ATM_CAUSE_NO_ROUTE_TO_TRANSIT_NETWORK       0x02
-#define ATM_CAUSE_NO_ROUTE_TO_DESTINATION           0x03
-#define ATM_CAUSE_VPI_VCI_UNACCEPTABLE              0x0A
-#define ATM_CAUSE_NORMAL_CALL_CLEARING              0x10
-#define ATM_CAUSE_USER_BUSY                         0x11
-#define ATM_CAUSE_NO_USER_RESPONDING                0x12
-#define ATM_CAUSE_CALL_REJECTED                     0x15
-#define ATM_CAUSE_NUMBER_CHANGED                    0x16
-#define ATM_CAUSE_USER_REJECTS_CLIR                 0x17
-#define ATM_CAUSE_DESTINATION_OUT_OF_ORDER          0x1B
-#define ATM_CAUSE_INVALID_NUMBER_FORMAT             0x1C
-#define ATM_CAUSE_STATUS_ENQUIRY_RESPONSE           0x1E
-#define ATM_CAUSE_NORMAL_UNSPECIFIED                0x1F
-#define ATM_CAUSE_VPI_VCI_UNAVAILABLE               0x23
-#define ATM_CAUSE_NETWORK_OUT_OF_ORDER              0x26
-#define ATM_CAUSE_TEMPORARY_FAILURE                 0x29
-#define ATM_CAUSE_ACCESS_INFORMAION_DISCARDED       0x2B
-#define ATM_CAUSE_NO_VPI_VCI_AVAILABLE              0x2D
-#define ATM_CAUSE_RESOURCE_UNAVAILABLE              0x2F
-#define ATM_CAUSE_QOS_UNAVAILABLE                   0x31
-#define ATM_CAUSE_USER_CELL_RATE_UNAVAILABLE        0x33
-#define ATM_CAUSE_BEARER_CAPABILITY_UNAUTHORIZED    0x39
-#define ATM_CAUSE_BEARER_CAPABILITY_UNAVAILABLE     0x3A
-#define ATM_CAUSE_OPTION_UNAVAILABLE                0x3F
-#define ATM_CAUSE_BEARER_CAPABILITY_UNIMPLEMENTED   0x41
-#define ATM_CAUSE_UNSUPPORTED_TRAFFIC_PARAMETERS    0x49
-#define ATM_CAUSE_INVALID_CALL_REFERENCE            0x51
-#define ATM_CAUSE_CHANNEL_NONEXISTENT               0x52
-#define ATM_CAUSE_INCOMPATIBLE_DESTINATION          0x58
-#define ATM_CAUSE_INVALID_ENDPOINT_REFERENCE        0x59
-#define ATM_CAUSE_INVALID_TRANSIT_NETWORK_SELECTION 0x5B
-#define ATM_CAUSE_TOO_MANY_PENDING_ADD_PARTY        0x5C
-#define ATM_CAUSE_AAL_PARAMETERS_UNSUPPORTED        0x5D
-#define ATM_CAUSE_MANDATORY_IE_MISSING              0x60
-#define ATM_CAUSE_UNIMPLEMENTED_MESSAGE_TYPE        0x61
-#define ATM_CAUSE_UNIMPLEMENTED_IE                  0x63
-#define ATM_CAUSE_INVALID_IE_CONTENTS               0x64
-#define ATM_CAUSE_INVALID_STATE_FOR_MESSAGE         0x65
-#define ATM_CAUSE_RECOVERY_ON_TIMEOUT               0x66
-#define ATM_CAUSE_INCORRECT_MESSAGE_LENGTH          0x68
-#define ATM_CAUSE_PROTOCOL_ERROR                    0x6F
-
-/* ATM_CAUSE_IE.Diagnostics constants */
-#define ATM_CAUSE_COND_UNKNOWN            0x00
-#define ATM_CAUSE_COND_PERMANENT          0x01
-#define ATM_CAUSE_COND_TRANSIENT          0x02
-#define ATM_CAUSE_REASON_USER             0x00
-#define ATM_CAUSE_REASON_IE_MISSING       0x04
-#define ATM_CAUSE_REASON_IE_INSUFFICIENT  0x08
-#define ATM_CAUSE_PU_PROVIDER             0x00
-#define ATM_CAUSE_PU_USER                 0x08
-#define ATM_CAUSE_NA_NORMAL               0x00
-#define ATM_CAUSE_NA_ABNORMAL             0x04
-
-typedef struct _ATM_CAUSE_IE {
-  UCHAR  Location;
-  UCHAR  Cause;
-  UCHAR  DiagnosticsLength;
-  UCHAR  Diagnostics[4];
-} ATM_CAUSE_IE, *PATM_CAUSE_IE;
-
-
-typedef ULONG	ATM_SERVICE_CATEGORY, *PATM_SERVICE_CATEGORY;
-
-/* ATM_FLOW_PARAMETERS.ServiceCategory constants */
-#define	ATM_SERVICE_CATEGORY_CBR	        1
-#define	ATM_SERVICE_CATEGORY_VBR	        2
-#define	ATM_SERVICE_CATEGORY_UBR	        4
-#define	ATM_SERVICE_CATEGORY_ABR	        8
-
-/* ATM_FLOW_PARAMETERS.Reserved1 constants */
-#define ATM_FLOW_PARAMS_RSVD1_MPP	        0x01
-
-typedef struct _ATM_FLOW_PARAMETERS {
-  ATM_SERVICE_CATEGORY  ServiceCategory;
-  ULONG  AverageCellRate;
-  ULONG  PeakCellRate;
-  ULONG  MinimumCellRate;
-  ULONG  InitialCellRate;
-  ULONG  BurstLengthCells;
-  ULONG  MaxSduSize;
-  ULONG  TransientBufferExposure;
-  ULONG  CumulativeRMFixedRTT;
-  UCHAR  RateIncreaseFactor;
-  UCHAR  RateDecreaseFactor;
-  USHORT  ACRDecreaseTimeFactor;
-  UCHAR  MaximumCellsPerForwardRMCell;
-  UCHAR  MaximumForwardRMCellInterval;
-  UCHAR  CutoffDecreaseFactor;
-  UCHAR  Reserved1;
-  ULONG  MissingRMCellCount;
-  ULONG  Reserved2;
-  ULONG  Reserved3;
-} ATM_FLOW_PARAMETERS, *PATM_FLOW_PARAMETERS;
-
-typedef struct _ATM_VPIVCI {
-  ULONG  Vpi;
-  ULONG  Vci;
-} ATM_VPIVCI, *PATM_VPIVCI;
-
-typedef struct _ATM_MEDIA_PARAMETERS {
-  ATM_VPIVCI  ConnectionId;
-  ATM_AAL_TYPE  AALType;
-  ULONG  CellDelayVariationCLP0;
-  ULONG  CellDelayVariationCLP1;
-  ULONG  CellLossRatioCLP0;
-  ULONG  CellLossRatioCLP1;
-  ULONG  CellTransferDelayCLP0;
-  ULONG  CellTransferDelayCLP1;
-  ULONG  DefaultCLP;
-  ATM_FLOW_PARAMETERS  Transmit;
-  ATM_FLOW_PARAMETERS  Receive;
-} ATM_MEDIA_PARAMETERS, *PATM_MEDIA_PARAMETERS;
-
-typedef struct _ATM_PVC_SAP {
-  ATM_BLLI_IE  Blli;
-  ATM_BHLI_IE  Bhli;
-} ATM_PVC_SAP, *PATM_PVC_SAP;
-
-/* ATM_QOS_CLASS_IE constants */
-#define QOS_CLASS0				                0x00
-#define QOS_CLASS1				                0x01
-#define QOS_CLASS2				                0x02
-#define QOS_CLASS3				                0x03
-#define QOS_CLASS4				                0x04
-
-typedef struct _ATM_QOS_CLASS_IE {
-  UCHAR  QOSClassForward;
-  UCHAR  QOSClassBackward;
-} ATM_QOS_CLASS_IE, *PATM_QOS_CLASS_IE;
-
-typedef struct _ATM_RAW_IE {
-  ULONG  RawIELength;
-  ULONG  RawIEType;
-  UCHAR  RawIEValue[1];
-} ATM_RAW_IE, *PATM_RAW_IE;
-
-typedef struct _ATM_SAP {
-  ATM_BLLI_IE  Blli;
-  ATM_BHLI_IE  Bhli;
-  ULONG  NumberOfAddresses;
-  UCHAR  Addresses[1];
-} ATM_SAP, *PATM_SAP;
-
-typedef struct _ATM_TRAFFIC_DESCRIPTOR {
-  ULONG  PeakCellRateCLP0;
-  ULONG  PeakCellRateCLP01;
-  ULONG  SustainableCellRateCLP0;
-  ULONG  SustainableCellRateCLP01;
-  ULONG  MaximumBurstSizeCLP0;
-  ULONG  MaximumBurstSizeCLP01;
-  BOOLEAN  BestEffort;
-  BOOLEAN  Tagging;
-} ATM_TRAFFIC_DESCRIPTOR, *PATM_TRAFFIC_DESCRIPTOR;
-
-typedef struct _ATM_TRAFFIC_DESCRIPTOR_IE {
-  ATM_TRAFFIC_DESCRIPTOR  ForwardTD;
-  ATM_TRAFFIC_DESCRIPTOR  BackwardTD;
-} ATM_TRAFFIC_DESCRIPTOR_IE, *PATM_TRAFFIC_DESCRIPTOR_IE;
-
-/* ATM_TRANSIT_NETWORK_SELECTION_IE.TypeOfNetworkId constants */
-#define TNS_TYPE_NATIONAL			            0x40
-
-/* ATM_TRANSIT_NETWORK_SELECTION_IE.NetworkIdPlan constants */
-#define TNS_PLAN_CARRIER_ID_CODE	        0x01
-
-typedef struct _ATM_TRANSIT_NETWORK_SELECTION_IE {
-  UCHAR  TypeOfNetworkId;
-  UCHAR  NetworkIdPlan;
-  UCHAR  NetworkIdLength;
-  UCHAR  NetworkId[1];
-} ATM_TRANSIT_NETWORK_SELECTION_IE, *PATM_TRANSIT_NETWORK_SELECTION_IE;
-
-typedef struct _ATM_LIJ_CALLID_IE {
-	ULONG  Identifier;
-} ATM_LIJ_CALLID_IE, *PATM_LIJ_CALLID_IE;
-
-/* Q2931_ADD_PVC.Flags constants */
-#define CO_FLAG_SIGNALING_VC              0x00000001
-#define CO_FLAG_NO_DEST_SAP               0x00000002
-
-typedef struct _Q2931_ADD_PVC {
-  ATM_ADDRESS  CalledParty;
-  ATM_ADDRESS  CallingParty;
-  ATM_VPIVCI  ConnectionId;
-  ATM_AAL_TYPE  AALType;
-  ATM_FLOW_PARAMETERS  ForwardFP;
-  ATM_FLOW_PARAMETERS  BackwardFP;
-  ULONG  Flags;
-  ATM_PVC_SAP  LocalSap;
-  ATM_PVC_SAP  DestinationSap;
-  BOOLEAN  LIJIdPresent;
-  ATM_LIJ_CALLID_IE  LIJId;
-} Q2931_ADD_PVC, *PQ2931_ADD_PVC;
-
-typedef struct _Q2931_DELETE_PVC {
-  ATM_VPIVCI  ConnectionId;
-} Q2931_DELETE_PVC, *PQ2931_DELETE_PVC;
-
-typedef ATM_ADDRESS	ATM_CALLED_PARTY_NUMBER_IE;
-typedef ATM_ADDRESS	ATM_CALLED_PARTY_SUBADDRESS_IE;
-typedef ATM_ADDRESS	ATM_CALLING_PARTY_SUBADDRESS_IE;
-
-typedef struct _Q2931_CALLMGR_PARAMETERS {
-  ATM_ADDRESS  CalledParty;
-  ATM_ADDRESS  CallingParty;
-  ULONG  InfoElementCount;
-  UCHAR  InfoElements[1];
-} Q2931_CALLMGR_PARAMETERS, *PQ2931_CALLMGR_PARAMETERS;
-
-typedef struct _ATM_VC_RATES_SUPPORTED {
-  ULONG  MinCellRate;
-  ULONG  MaxCellRate;
-} ATM_VC_RATES_SUPPORTED, *PATM_VC_RATES_SUPPORTED;
-
-typedef ULONG ATM_SERVICE_REGISTRY_TYPE;
-
-/* ATM_SERVICE_ADDRESS_LIST.ServiceRegistryType constants */
-#define ATM_SERVICE_REGISTRY_LECS		      1
-#define ATM_SERVICE_REGISTRY_ANS		      2
-
-typedef struct _ATM_SERVICE_ADDRESS_LIST {
-  ATM_SERVICE_REGISTRY_TYPE  ServiceRegistryType;
-  ULONG  NumberOfAddressesAvailable;
-  ULONG  NumberOfAddressesReturned;
-  ATM_ADDRESS  Address[1];
-} ATM_SERVICE_ADDRESS_LIST, *PATM_SERVICE_ADDRESS_LIST;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __ATM_H */
diff --git a/winsup/w32api/include/ddk/batclass.h b/winsup/w32api/include/ddk/batclass.h
deleted file mode 100644
index 1beef4911..000000000
--- a/winsup/w32api/include/ddk/batclass.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * batclass.h
- *
- * Battery class driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __BATCLASS_H
-#define __BATCLASS_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-#if defined(_BATTERYCLASS_)
-  #define BCLASSAPI DECLSPEC_EXPORT
-#else
-  #define BCLASSAPI DECLSPEC_IMPORT
-#endif
-
-
-/* Battery device GUIDs */
-
-DEFINE_GUID(GUID_DEVICE_BATTERY,
-  0x72631e54L, 0x78A4, 0x11d0, 0xbc, 0xf7, 0x00, 0xaa, 0x00, 0xb7, 0xb3, 0x2a);
-
-DEFINE_GUID(BATTERY_STATUS_WMI_GUID,
-  0xfc4670d1, 0xebbf, 0x416e, 0x87, 0xce, 0x37, 0x4a, 0x4e, 0xbc, 0x11, 0x1a);
-
-DEFINE_GUID(BATTERY_RUNTIME_WMI_GUID,
-  0x535a3767, 0x1ac2, 0x49bc, 0xa0, 0x77, 0x3f, 0x7a, 0x02, 0xe4, 0x0a, 0xec);
-
-DEFINE_GUID(BATTERY_TEMPERATURE_WMI_GUID,
-  0x1a52a14d, 0xadce, 0x4a44, 0x9a, 0x3e, 0xc8, 0xd8, 0xf1, 0x5f, 0xf2, 0xc2);
-
-DEFINE_GUID(BATTERY_FULL_CHARGED_CAPACITY_WMI_GUID,
-  0x40b40565, 0x96f7, 0x4435, 0x86, 0x94, 0x97, 0xe0, 0xe4, 0x39, 0x59, 0x05);
-
-DEFINE_GUID(BATTERY_CYCLE_COUNT_WMI_GUID,
-  0xef98db24, 0x0014, 0x4c25, 0xa5, 0x0b, 0xc7, 0x24, 0xae, 0x5c, 0xd3, 0x71);
-
-DEFINE_GUID(BATTERY_STATIC_DATA_WMI_GUID,
-  0x05e1e463, 0xe4e2, 0x4ea9, 0x80, 0xcb, 0x9b, 0xd4, 0xb3, 0xca, 0x06, 0x55);
-
-DEFINE_GUID(BATTERY_STATUS_CHANGE_WMI_GUID,
-  0xcddfa0c3, 0x7c5b, 0x4e43, 0xa0, 0x34, 0x05, 0x9f, 0xa5, 0xb8, 0x43, 0x64);
-
-DEFINE_GUID(BATTERY_TAG_CHANGE_WMI_GUID,
-  0x5e1f6e19, 0x8786, 0x4d23, 0x94, 0xfc, 0x9e, 0x74, 0x6b, 0xd5, 0xd8, 0x88);
-
-
-/* BATTERY_INFORMATION.Capabilities constants */
-#define BATTERY_SET_CHARGE_SUPPORTED      0x00000001
-#define BATTERY_SET_DISCHARGE_SUPPORTED   0x00000002
-#define BATTERY_SET_RESUME_SUPPORTED      0x00000004
-#define BATTERY_IS_SHORT_TERM             0x20000000
-#define BATTERY_CAPACITY_RELATIVE         0x40000000
-#define BATTERY_SYSTEM_BATTERY            0x80000000
-
-typedef struct _BATTERY_INFORMATION {
-  ULONG  Capabilities;
-  UCHAR  Technology;
-  UCHAR  Reserved[3];
-  UCHAR  Chemistry[4];
-  ULONG  DesignedCapacity;
-  ULONG  FullChargedCapacity;
-  ULONG  DefaultAlert1;
-  ULONG  DefaultAlert2;
-  ULONG  CriticalBias;
-  ULONG  CycleCount;
-} BATTERY_INFORMATION, *PBATTERY_INFORMATION;
-
-typedef struct _BATTERY_MANUFACTURE_DATE {
-  UCHAR  Day;
-  UCHAR  Month;
-  USHORT  Year;
-} BATTERY_MANUFACTURE_DATE, *PBATTERY_MANUFACTURE_DATE;
-
-typedef struct _BATTERY_NOTIFY {
-	ULONG  PowerState;
-	ULONG  LowCapacity;
-	ULONG  HighCapacity;
-} BATTERY_NOTIFY, *PBATTERY_NOTIFY;
-
-/* BATTERY_STATUS.PowerState flags */
-#define BATTERY_POWER_ON_LINE             0x00000001
-#define BATTERY_DISCHARGING               0x00000002
-#define BATTERY_CHARGING                  0x00000004
-#define BATTERY_CRITICAL                  0x00000008
-
-/* BATTERY_STATUS.Voltage constant */
-#define BATTERY_UNKNOWN_VOLTAGE           0xFFFFFFFF
-
-/* BATTERY_STATUS.Rate constant */
-#define BATTERY_UNKNOWN_RATE              0x80000000
-
-typedef struct _BATTERY_STATUS {
-  ULONG  PowerState;
-  ULONG  Capacity;
-  ULONG  Voltage;
-  LONG  Rate;
-} BATTERY_STATUS, *PBATTERY_STATUS;
-
-/* BATTERY_INFORMATION.Capacity constants */
-#define BATTERY_UNKNOWN_CAPACITY          0xFFFFFFFF
-
-typedef enum _BATTERY_QUERY_INFORMATION_LEVEL {
-  BatteryInformation = 0,
-  BatteryGranularityInformation,
-  BatteryTemperature,
-  BatteryEstimatedTime,
-  BatteryDeviceName,
-  BatteryManufactureDate,
-  BatteryManufactureName,
-  BatteryUniqueID,
-  BatterySerialNumber
-} BATTERY_QUERY_INFORMATION_LEVEL;
-
-/* BatteryEstimatedTime constant */
-#define BATTERY_UNKNOWN_TIME              0x80000000
-
-/* NTSTATUS possibly returned by BCLASS_QUERY_STATUS */
-#define BATTERY_TAG_INVALID 0
-
-typedef struct _BATTERY_QUERY_INFORMATION {
-  ULONG  BatteryTag;
-  BATTERY_QUERY_INFORMATION_LEVEL  InformationLevel;
-  LONG  AtRate;
-} BATTERY_QUERY_INFORMATION, *PBATTERY_QUERY_INFORMATION;
-
-typedef enum _BATTERY_SET_INFORMATION_LEVEL {
-  BatteryCriticalBias = 0,
-  BatteryCharge,
-  BatteryDischarge
-} BATTERY_SET_INFORMATION_LEVEL;
-
-#define MAX_BATTERY_STRING_SIZE           128
-
-typedef struct _BATTERY_SET_INFORMATION {
-	ULONG  BatteryTag;
-	BATTERY_SET_INFORMATION_LEVEL  InformationLevel;
-	UCHAR  Buffer[1];
-} BATTERY_SET_INFORMATION, *PBATTERY_SET_INFORMATION;
-
-typedef struct _BATTERY_WAIT_STATUS {
-	ULONG  BatteryTag;
-	ULONG  Timeout;
-	ULONG  PowerState;
-	ULONG  LowCapacity;
-	ULONG  HighCapacity;
-} BATTERY_WAIT_STATUS, *PBATTERY_WAIT_STATUS;
-
-
-#define IOCTL_BATTERY_QUERY_TAG \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x10, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_BATTERY_QUERY_INFORMATION \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x11, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_BATTERY_SET_INFORMATION \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x12, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-
-#define IOCTL_BATTERY_QUERY_STATUS \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x13, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-
-typedef NTSTATUS DDKAPI
-(*BCLASS_DISABLE_STATUS_NOTIFY)(
-  IN PVOID  Context);
-
-typedef NTSTATUS DDKAPI
-(*BCLASS_QUERY_INFORMATION)(
-  IN PVOID  Context,
-  IN ULONG  BatteryTag,
-  IN BATTERY_QUERY_INFORMATION_LEVEL  Level,
-  IN LONG  AtRate  OPTIONAL,
-  OUT PVOID  Buffer,
-  IN ULONG  BufferLength,
-  OUT PULONG  ReturnedLength);
-
-typedef NTSTATUS DDKAPI
-(*BCLASS_QUERY_STATUS)(
-  IN PVOID  Context,
-  IN ULONG  BatteryTag,
-  OUT PBATTERY_STATUS  BatteryStatus);
-
-typedef NTSTATUS DDKAPI
-(*BCLASS_QUERY_TAG)(
-  IN PVOID  Context,
-  OUT PULONG  BatteryTag);
-
-typedef NTSTATUS DDKAPI
-(*BCLASS_SET_INFORMATION)(
-  IN PVOID  Context,
-  IN ULONG  BatteryTag,
-  IN BATTERY_SET_INFORMATION_LEVEL  Level,
-  IN PVOID  Buffer  OPTIONAL);
-
-typedef NTSTATUS DDKAPI
-(*BCLASS_SET_STATUS_NOTIFY)(
-  IN PVOID  Context,
-  IN ULONG  BatteryTag,
-  IN PBATTERY_NOTIFY  BatteryNotify);
-
-
-typedef struct _BATTERY_MINIPORT_INFO {
-  USHORT  MajorVersion;
-  USHORT  MinorVersion;
-  PVOID  Context;
-  BCLASS_QUERY_TAG  QueryTag;
-  BCLASS_QUERY_INFORMATION  QueryInformation;
-  BCLASS_SET_INFORMATION  SetInformation;
-  BCLASS_QUERY_STATUS  QueryStatus;
-  BCLASS_SET_STATUS_NOTIFY  SetStatusNotify;
-  BCLASS_DISABLE_STATUS_NOTIFY  DisableStatusNotify;
-  PDEVICE_OBJECT  Pdo;
-  PUNICODE_STRING  DeviceName;
-} BATTERY_MINIPORT_INFO, *PBATTERY_MINIPORT_INFO;
-
-/* BATTERY_MINIPORT_INFO.XxxVersion */
-#define BATTERY_CLASS_MAJOR_VERSION       0x0001
-#define BATTERY_CLASS_MINOR_VERSION       0x0000
-
-
-BCLASSAPI
-NTSTATUS
-DDKAPI
-BatteryClassInitializeDevice(
-  IN PBATTERY_MINIPORT_INFO  MiniportInfo,
-  IN PVOID  *ClassData);
-
-BCLASSAPI
-NTSTATUS
-DDKAPI
-BatteryClassIoctl(
-  IN PVOID  ClassData,
-  IN PIRP  Irp);
-
-BCLASSAPI
-NTSTATUS
-DDKAPI
-BatteryClassQueryWmiDataBlock(
-  IN PVOID  ClassData,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  IN ULONG  GuidIndex,
-  IN OUT PULONG  InstanceLengthArray,
-  IN ULONG  OutBufferSize,
-  OUT PUCHAR  Buffer);
-
-BCLASSAPI
-NTSTATUS
-DDKAPI
-BatteryClassStatusNotify(
-  IN PVOID  ClassData);
-
-BCLASSAPI
-NTSTATUS
-DDKAPI
-BatteryClassSystemControl(
-  IN  PVOID  ClassData,
-  IN  PWMILIB_CONTEXT  WmiLibContext,
-  IN  PDEVICE_OBJECT  DeviceObject,
-  IN  PIRP  Irp,
-  OUT PSYSCTL_IRP_DISPOSITION  Disposition);
-
-BCLASSAPI
-NTSTATUS
-DDKAPI
-BatteryClassUnload(
-  IN PVOID  ClassData);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __BATCLASS_H */
diff --git a/winsup/w32api/include/ddk/cfg.h b/winsup/w32api/include/ddk/cfg.h
deleted file mode 100644
index f58a08958..000000000
--- a/winsup/w32api/include/ddk/cfg.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * cfg.h
- *
- * PnP Configuration Manager shared definitions between user mode and kernel mode code
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __CFG_H
-#define __CFG_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#define CM_PROB_NOT_CONFIGURED		  				0x00000001
-#define CM_PROB_DEVLOADER_FAILED            0x00000002
-#define CM_PROB_OUT_OF_MEMORY               0x00000003
-#define CM_PROB_ENTRY_IS_WRONG_TYPE         0x00000004
-#define CM_PROB_LACKED_ARBITRATOR           0x00000005
-#define CM_PROB_BOOT_CONFIG_CONFLICT        0x00000006
-#define CM_PROB_FAILED_FILTER               0x00000007
-#define CM_PROB_DEVLOADER_NOT_FOUND         0x00000008
-#define CM_PROB_INVALID_DATA                0x00000009
-#define CM_PROB_FAILED_START                0x0000000A
-#define CM_PROB_LIAR                        0x0000000B
-#define CM_PROB_NORMAL_CONFLICT             0x0000000C
-#define CM_PROB_NOT_VERIFIED                0x0000000D
-#define CM_PROB_NEED_RESTART                0x0000000E
-#define CM_PROB_REENUMERATION               0x0000000F
-#define CM_PROB_PARTIAL_LOG_CONF            0x00000010
-#define CM_PROB_UNKNOWN_RESOURCE            0x00000011
-#define CM_PROB_REINSTALL                   0x00000012
-#define CM_PROB_REGISTRY                    0x00000013
-#define CM_PROB_VXDLDR                      0x00000014
-#define CM_PROB_WILL_BE_REMOVED             0x00000015
-#define CM_PROB_DISABLED                    0x00000016
-#define CM_PROB_DEVLOADER_NOT_READY         0x00000017
-#define CM_PROB_DEVICE_NOT_THERE            0x00000018
-#define CM_PROB_MOVED                       0x00000019
-#define CM_PROB_TOO_EARLY                   0x0000001A
-#define CM_PROB_NO_VALID_LOG_CONF           0x0000001B
-#define CM_PROB_FAILED_INSTALL              0x0000001C
-#define CM_PROB_HARDWARE_DISABLED           0x0000001D
-#define CM_PROB_CANT_SHARE_IRQ              0x0000001E
-#define CM_PROB_FAILED_ADD                  0x0000001F
-#define CM_PROB_DISABLED_SERVICE          	0x00000020
-#define CM_PROB_TRANSLATION_FAILED        	0x00000021
-#define CM_PROB_NO_SOFTCONFIG             	0x00000022
-#define CM_PROB_BIOS_TABLE                	0x00000023
-#define CM_PROB_IRQ_TRANSLATION_FAILED    	0x00000024
-#define CM_PROB_FAILED_DRIVER_ENTRY       	0x00000025
-#define CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD	0x00000026
-#define CM_PROB_DRIVER_FAILED_LOAD          0x00000027
-#define CM_PROB_DRIVER_SERVICE_KEY_INVALID  0x00000028
-#define CM_PROB_LEGACY_SERVICE_NO_DEVICES   0x00000029
-#define CM_PROB_DUPLICATE_DEVICE            0x0000002A
-#define CM_PROB_FAILED_POST_START           0x0000002B
-#define CM_PROB_HALTED                      0x0000002C
-#define CM_PROB_PHANTOM                     0x0000002D
-#define CM_PROB_SYSTEM_SHUTDOWN             0x0000002E
-#define CM_PROB_HELD_FOR_EJECT              0x0000002F
-#define CM_PROB_DRIVER_BLOCKED              0x00000030
-#define CM_PROB_REGISTRY_TOO_LARGE        	0x00000031
-
-#define LCPRI_FORCECONFIG                 0x00000000
-#define LCPRI_BOOTCONFIG                  0x00000001
-#define LCPRI_DESIRED                     0x00002000
-#define LCPRI_NORMAL                      0x00003000
-#define LCPRI_LASTBESTCONFIG              0x00003FFF
-#define LCPRI_SUBOPTIMAL                  0x00005000
-#define LCPRI_LASTSOFTCONFIG              0x00007FFF
-#define LCPRI_RESTART                     0x00008000
-#define LCPRI_REBOOT                      0x00009000
-#define LCPRI_POWEROFF                    0x0000A000
-#define LCPRI_HARDRECONFIG                0x0000C000
-#define LCPRI_HARDWIRED                   0x0000E000
-#define LCPRI_IMPOSSIBLE                  0x0000F000
-#define LCPRI_DISABLED                    0x0000FFFF
-#define MAX_LCPRI                         0x0000FFFF
-
-typedef enum _PNP_VETO_TYPE {
-  PNP_VetoTypeUnknown,
-  PNP_VetoLegacyDevice,
-  PNP_VetoPendingClose,
-  PNP_VetoWindowsApp,
-  PNP_VetoWindowsService,
-  PNP_VetoOutstandingOpen,
-  PNP_VetoDevice,
-  PNP_VetoDriver,
-  PNP_VetoIllegalDeviceRequest,
-  PNP_VetoInsufficientPower,
-  PNP_VetoNonDisableable,
-  PNP_VetoLegacyDriver
-} PNP_VETO_TYPE, *PPNP_VETO_TYPE;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __CFG_H */
diff --git a/winsup/w32api/include/ddk/cfgmgr32.h b/winsup/w32api/include/ddk/cfgmgr32.h
deleted file mode 100644
index a048bb492..000000000
--- a/winsup/w32api/include/ddk/cfgmgr32.h
+++ /dev/null
@@ -1,1533 +0,0 @@
-/*
- * cfgmgr32.h
- *
- * PnP configuration manager
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __CFGMGR32_H
-#define __CFGMGR32_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-#if defined(_CFGMGR32_)
-#define CMAPI DECLSPEC_EXPORT
-#else
-#define CMAPI DECLSPEC_IMPORT
-#endif
-
-#include "cfg.h"
-
-#define CR_SUCCESS                  			0x00000000
-#define CR_DEFAULT                        0x00000001
-#define CR_OUT_OF_MEMORY                  0x00000002
-#define CR_INVALID_POINTER                0x00000003
-#define CR_INVALID_FLAG                   0x00000004
-#define CR_INVALID_DEVNODE                0x00000005
-#define CR_INVALID_DEVINST          			CR_INVALID_DEVNODE
-#define CR_INVALID_RES_DES                0x00000006
-#define CR_INVALID_LOG_CONF               0x00000007
-#define CR_INVALID_ARBITRATOR             0x00000008
-#define CR_INVALID_NODELIST               0x00000009
-#define CR_DEVNODE_HAS_REQS               0x0000000A
-#define CR_DEVINST_HAS_REQS         			CR_DEVNODE_HAS_REQS
-#define CR_INVALID_RESOURCEID             0x0000000B
-#define CR_DLVXD_NOT_FOUND                0x0000000C
-#define CR_NO_SUCH_DEVNODE                0x0000000D
-#define CR_NO_SUCH_DEVINST          			CR_NO_SUCH_DEVNODE
-#define CR_NO_MORE_LOG_CONF               0x0000000E
-#define CR_NO_MORE_RES_DES                0x0000000F
-#define CR_ALREADY_SUCH_DEVNODE           0x00000010
-#define CR_ALREADY_SUCH_DEVINST     			CR_ALREADY_SUCH_DEVNODE
-#define CR_INVALID_RANGE_LIST             0x00000011
-#define CR_INVALID_RANGE                  0x00000012
-#define CR_FAILURE                        0x00000013
-#define CR_NO_SUCH_LOGICAL_DEV            0x00000014
-#define CR_CREATE_BLOCKED                 0x00000015
-#define CR_NOT_SYSTEM_VM                  0x00000016
-#define CR_REMOVE_VETOED                  0x00000017
-#define CR_APM_VETOED                     0x00000018
-#define CR_INVALID_LOAD_TYPE              0x00000019
-#define CR_BUFFER_SMALL                   0x0000001A
-#define CR_NO_ARBITRATOR                  0x0000001B
-#define CR_NO_REGISTRY_HANDLE             0x0000001C
-#define CR_REGISTRY_ERROR                 0x0000001D
-#define CR_INVALID_DEVICE_ID              0x0000001E
-#define CR_INVALID_DATA                   0x0000001F
-#define CR_INVALID_API                    0x00000020
-#define CR_DEVLOADER_NOT_READY            0x00000021
-#define CR_NEED_RESTART                   0x00000022
-#define CR_NO_MORE_HW_PROFILES            0x00000023
-#define CR_DEVICE_NOT_THERE               0x00000024
-#define CR_NO_SUCH_VALUE                  0x00000025
-#define CR_WRONG_TYPE                     0x00000026
-#define CR_INVALID_PRIORITY               0x00000027
-#define CR_NOT_DISABLEABLE                0x00000028
-#define CR_FREE_RESOURCES                 0x00000029
-#define CR_QUERY_VETOED                   0x0000002A
-#define CR_CANT_SHARE_IRQ                 0x0000002B
-#define CR_NO_DEPENDENT                   0x0000002C
-#define CR_SAME_RESOURCES                 0x0000002D
-#define CR_NO_SUCH_REGISTRY_KEY           0x0000002E
-#define CR_INVALID_MACHINENAME            0x0000002F
-#define CR_REMOTE_COMM_FAILURE            0x00000030
-#define CR_MACHINE_UNAVAILABLE            0x00000031
-#define CR_NO_CM_SERVICES                 0x00000032
-#define CR_ACCESS_DENIED                  0x00000033
-#define CR_CALL_NOT_IMPLEMENTED           0x00000034
-#define CR_INVALID_PROPERTY               0x00000035
-#define CR_DEVICE_INTERFACE_ACTIVE        0x00000036
-#define CR_NO_SUCH_DEVICE_INTERFACE       0x00000037
-#define CR_INVALID_REFERENCE_STRING       0x00000038
-#define CR_INVALID_CONFLICT_LIST          0x00000039
-#define CR_INVALID_INDEX                  0x0000003A
-#define CR_INVALID_STRUCTURE_SIZE         0x0000003B
-
-
-typedef DWORD RETURN_TYPE;
-typedef RETURN_TYPE	CONFIGRET;
-
-typedef HANDLE HMACHINE;
-typedef HMACHINE *PHMACHINE;
-
-typedef DWORD_PTR RES_DES;
-typedef RES_DES *PRES_DES;
-
-typedef DWORD_PTR RANGE_ELEMENT;
-typedef RANGE_ELEMENT *PRANGE_ELEMENT;
-
-typedef ULONG_PTR CONFLICT_LIST;
-typedef CONFLICT_LIST *PCONFLICT_LIST;
-
-typedef DWORD_PTR LOG_CONF;
-typedef LOG_CONF *PLOG_CONF;
-
-typedef ULONG PRIORITY;
-typedef PRIORITY *PPRIORITY;
-
-typedef DWORD_PTR RANGE_LIST;
-typedef RANGE_LIST *PRANGE_LIST;
-
-typedef DWORD DEVNODE, DEVINST;
-typedef DEVNODE *PDEVNODE, *PDEVINST;
-
-typedef CHAR *DEVNODEID_A, *DEVINSTID_A;
-typedef WCHAR *DEVNODEID_W, *DEVINSTID_W;
-
-#ifdef UNICODE
-typedef DEVNODEID_W DEVNODEID;
-typedef DEVINSTID_W DEVINSTID;
-#else
-typedef DEVNODEID_A DEVNODEID;
-typedef DEVINSTID_A DEVINSTID;
-#endif
-
-typedef ULONG REGDISPOSITION;
-
-typedef ULONG RESOURCEID;
-typedef RESOURCEID *PRESOURCEID;
-
-#define CM_RESDES_WIDTH_DEFAULT 					0x00000000
-#define CM_RESDES_WIDTH_32      					0x00000001
-#define CM_RESDES_WIDTH_64      					0x00000002
-#define CM_RESDES_WIDTH_BITS    					0x00000003
-
-
-#define MAX_CONFIG_VALUE      						9999
-#define MAX_INSTANCE_VALUE    						9999
-
-#define MAX_DEVICE_ID_LEN     						200
-#define MAX_DEVNODE_ID_LEN    						MAX_DEVICE_ID_LEN
-
-#define MAX_CLASS_NAME_LEN    						32
-#define MAX_GUID_STRING_LEN   						39
-#define MAX_PROFILE_LEN       						80
-
-
-#define ResType_All                       0x00000000
-#define ResType_None                      0x00000000
-#define ResType_Mem                       0x00000001
-#define ResType_IO                        0x00000002
-#define ResType_DMA                       0x00000003
-#define ResType_IRQ                       0x00000004
-#define ResType_DoNotUse                  0x00000005
-#define ResType_BusNumber                 0x00000006
-#define ResType_MAX                       0x00000006
-#define ResType_Ignored_Bit               0x00008000
-#define ResType_ClassSpecific             0x0000FFFF
-#define ResType_Reserved                  0x00008000
-#define ResType_DevicePrivate             0x00008001
-#define ResType_PcCardConfig              0x00008002
-#define ResType_MfCardConfig              0x00008003
-
-#define CM_GETIDLIST_FILTER_NONE          		0x00000000
-#define CM_GETIDLIST_FILTER_ENUMERATOR        0x00000001
-#define CM_GETIDLIST_FILTER_SERVICE           0x00000002
-#define CM_GETIDLIST_FILTER_EJECTRELATIONS    0x00000004
-#define CM_GETIDLIST_FILTER_REMOVALRELATIONS  0x00000008
-#define CM_GETIDLIST_FILTER_POWERRELATIONS    0x00000010
-#define CM_GETIDLIST_FILTER_BUSRELATIONS      0x00000020
-#define CM_GETIDLIST_DONOTGENERATE            0x10000040
-#define CM_GETIDLIST_FILTER_BITS              0x1000007F
-
-#define CM_GET_DEVICE_INTERFACE_LIST_PRESENT     	0x00000000
-#define CM_GET_DEVICE_INTERFACE_LIST_ALL_DEVICES 	0x00000001
-#define CM_GET_DEVICE_INTERFACE_LIST_BITS        	0x00000001
-
-
-typedef struct BusNumber_Des_s {
-  DWORD  BUSD_Count;
-  DWORD  BUSD_Type;
-  DWORD  BUSD_Flags;
-  ULONG  BUSD_Alloc_Base;
-  ULONG  BUSD_Alloc_End;
-} BUSNUMBER_DES, *PBUSNUMBER_DES;
-
-typedef struct BusNumber_Range_s {
-  ULONG  BUSR_Min;
-  ULONG  BUSR_Max;
-  ULONG  BUSR_nBusNumbers;
-  ULONG  BUSR_Flags;
-} BUSNUMBER_RANGE, *PBUSNUMBER_RANGE;
-
-#define BusNumberType_Range sizeof(BUSNUMBER_RANGE)
-
-typedef struct BusNumber_Resource_s {
-  BUSNUMBER_DES  BusNumber_Header;
-  BUSNUMBER_RANGE  BusNumber_Data[ANYSIZE_ARRAY];
-} BUSNUMBER_RESOURCE, *PBUSNUMBER_RESOURCE;
-
-typedef struct CS_Des_s {
-  DWORD  CSD_SignatureLength;
-  DWORD  CSD_LegacyDataOffset;
-  DWORD  CSD_LegacyDataSize;
-  DWORD  CSD_Flags;
-  GUID  CSD_ClassGuid;
-  BYTE  CSD_Signature[ANYSIZE_ARRAY];
-} CS_DES, *PCS_DES;
-
-typedef struct CS_Resource_s {
-  CS_DES  CS_Header;
-} CS_RESOURCE, *PCS_RESOURCE;
-
-typedef struct DevPrivate_Des_s {
-  DWORD  PD_Count;
-  DWORD  PD_Type;
-  DWORD  PD_Data1;
-  DWORD  PD_Data2;
-  DWORD  PD_Data3;
-  DWORD  PD_Flags;
-} DEVPRIVATE_DES, *PDEVPRIVATE_DES;
-
-typedef struct DevPrivate_Range_s {
-	DWORD  PR_Data1;
-	DWORD  PR_Data2;
-	DWORD  PR_Data3;
-} DEVPRIVATE_RANGE, *PDEVPRIVATE_RANGE;
-
-#define PType_Range sizeof(DEVPRIVATE_RANGE)
-
-typedef struct DevPrivate_Resource_s {
-  DEVPRIVATE_DES  PRV_Header;
-  DEVPRIVATE_RANGE  PRV_Data[ANYSIZE_ARRAY];
-} DEVPRIVATE_RESOURCE, *PDEVPRIVATE_RESOURCE;
-
-/* DMA_DES.DD_Flags constants and masks */
-#define mDD_Width         								0x3
-#define fDD_BYTE          								0x0
-#define fDD_WORD          								0x1
-#define fDD_DWORD         								0x2
-#define fDD_BYTE_AND_WORD 								0x3
-
-#define mDD_BusMaster     								0x4
-#define fDD_NoBusMaster   								0x0
-#define fDD_BusMaster     								0x4
-
-#define mDD_Type         									0x18
-#define fDD_TypeStandard 									0x00
-#define fDD_TypeA        									0x08
-#define fDD_TypeB        									0x10
-#define fDD_TypeF        									0x18
-
-typedef struct DMA_Des_s {
-  DWORD  DD_Count;
-  DWORD  DD_Type;
-  DWORD  DD_Flags;
-  ULONG  DD_Alloc_Chan;
-} DMA_DES, *PDMA_DES;
-
-typedef struct DMA_Range_s {
-  ULONG  DR_Min;
-  ULONG  DR_Max;
-  ULONG  DR_Flags;
-} DMA_RANGE, *PDMA_RANGE;
-
-#define DType_Range sizeof(DMA_RANGE)
-
-typedef struct DMA_Resource_s {
-  DMA_DES  DMA_Header;
-  DMA_RANGE  DMA_Data[ANYSIZE_ARRAY];
-} DMA_RESOURCE, *PDMA_RESOURCE;
-
-/* IO_DES.Type constants and masks */
-#define fIOD_PortType   									0x1
-#define fIOD_Memory     									0x0
-#define fIOD_IO         									0x1
-#define fIOD_DECODE     									0x00fc
-#define fIOD_10_BIT_DECODE    						0x0004
-#define fIOD_12_BIT_DECODE    						0x0008
-#define fIOD_16_BIT_DECODE    						0x0010
-#define fIOD_POSITIVE_DECODE  						0x0020
-#define fIOD_PASSIVE_DECODE   						0x0040
-#define fIOD_WINDOW_DECODE    						0x0080
-
-typedef struct IO_Des_s {
-  DWORD  IOD_Count;
-  DWORD  IOD_Type;
-  DWORDLONG  IOD_Alloc_Base;
-  DWORDLONG  IOD_Alloc_End;
-  DWORD  IOD_DesFlags;
-} IO_DES, *PIO_DES;
-
-/* IO_RANGE.IOR_Alias constants */
-#define IO_ALIAS_10_BIT_DECODE      			0x00000004
-#define IO_ALIAS_12_BIT_DECODE      			0x00000010
-#define IO_ALIAS_16_BIT_DECODE      			0x00000000
-#define IO_ALIAS_POSITIVE_DECODE    			0x000000FF
-
-typedef struct IO_Range_s {
-  DWORDLONG  IOR_Align;
-  DWORD  IOR_nPorts;
-  DWORDLONG  IOR_Min;
-  DWORDLONG  IOR_Max;
-  DWORD  IOR_RangeFlags;
-  DWORDLONG  IOR_Alias;
-} IO_RANGE, *PIO_RANGE;
-
-#define IOType_Range sizeof(IO_RANGE)
-
-typedef struct IO_Resource_s {
-  IO_DES  IO_Header;
-  IO_RANGE  IO_Data[ANYSIZE_ARRAY];
-} IO_RESOURCE, *PIO_RESOURCE;
-
-/* IRQ_DES.IRQD_flags constants */
-#define mIRQD_Share        								0x1
-#define fIRQD_Exclusive    								0x0
-#define fIRQD_Share        								0x1
-
-#define fIRQD_Share_Bit    								0
-#define fIRQD_Level_Bit    							  1
-
-#define mIRQD_Edge_Level   								0x2
-#define fIRQD_Level        								0x0
-#define fIRQD_Edge         								0x2
-
-typedef struct IRQ_Des_32_s {
-  DWORD  IRQD_Count;
-  DWORD  IRQD_Type;
-  DWORD  IRQD_Flags;
-  ULONG  IRQD_Alloc_Num;
-  ULONG32  IRQD_Affinity;
-} IRQ_DES_32, *PIRQ_DES_32;
-
-typedef struct IRQ_Des_64_s {
-  DWORD  IRQD_Count;
-  DWORD  IRQD_Type;
-  DWORD  IRQD_Flags;
-  ULONG  IRQD_Alloc_Num;
-  ULONG64  IRQD_Affinity;
-} IRQ_DES_64, *PIRQ_DES_64;
-
-#ifdef _WIN64
-typedef IRQ_DES_64 IRQ_DES;
-typedef PIRQ_DES_64 PIRQ_DES;
-#else
-typedef IRQ_DES_32 IRQ_DES;
-typedef PIRQ_DES_32 PIRQ_DES;
-#endif
-
-typedef struct IRQ_Range_s {
-  ULONG  IRQR_Min;
-  ULONG  IRQR_Max;
-  ULONG  IRQR_Flags;
-} IRQ_RANGE, *PIRQ_RANGE;
-
-#define IRQType_Range sizeof(IRQ_RANGE)
-
-typedef struct IRQ_Resource_s {
-  IRQ_DES  IRQ_Header;
-  IRQ_RANGE  IRQ_Data[ANYSIZE_ARRAY];
-} IRQ_RESOURCE, *PIRQ_RESOURCE;
-
-/* MEM_DES.MD_Flags constants */
-#define mMD_MemoryType              0x1
-#define fMD_MemoryType              mMD_MemoryType
-#define fMD_ROM                     0x0
-#define fMD_RAM                     0x1
-
-#define mMD_32_24                   0x2
-#define fMD_32_24                   mMD_32_24
-#define fMD_24                      0x0
-#define fMD_32                      0x2
-
-#define mMD_Prefetchable            0x4
-#define fMD_Prefetchable            mMD_Prefetchable
-#define fMD_Pref                    mMD_Prefetchable
-#define fMD_PrefetchDisallowed      0x0
-#define fMD_PrefetchAllowed         0x4
-
-#define mMD_Readable                0x8
-#define fMD_Readable                mMD_Readable
-#define fMD_ReadAllowed             0x0
-#define fMD_ReadDisallowed          0x8
-
-#define mMD_CombinedWrite           0x10
-#define fMD_CombinedWrite           mMD_CombinedWrite
-#define fMD_CombinedWriteDisallowed 0x0
-#define fMD_CombinedWriteAllowed    0x10
-
-#define mMD_Cacheable               0x20
-#define fMD_NonCacheable            0x0
-#define fMD_Cacheable               0x20
-
-typedef struct Mem_Des_s {
-  DWORD  MD_Count;
-  DWORD  MD_Type;
-  DWORDLONG  MD_Alloc_Base;
-  DWORDLONG  MD_Alloc_End;
-  DWORD  MD_Flags;
-  DWORD  MD_Reserved;
-} MEM_DES, *PMEM_DES;
-
-typedef struct Mem_Range_s {
-  DWORDLONG  MR_Align;
-  ULONG  MR_nBytes;
-  DWORDLONG  MR_Min;
-  DWORDLONG  MR_Max;
-  DWORD  MR_Flags;
-  DWORD  MR_Reserved;
-} MEM_RANGE, *PMEM_RANGE;
-
-#define MType_Range sizeof(MEM_RANGE)
-
-typedef struct Mem_Resource_s {
-  MEM_DES  MEM_Header;
-  MEM_RANGE  MEM_Data[ANYSIZE_ARRAY];
-} MEM_RESOURCE, *PMEM_RESOURCE;
-
-/* MFCARD_DES.PMF_Flags constants */
-#define fPMF_AUDIO_ENABLE   							0x8
-#define mPMF_AUDIO_ENABLE   							fPMF_AUDIO_ENABLE
-
-typedef struct MfCard_Des_s {
-  DWORD  PMF_Count;
-  DWORD  PMF_Type;
-  DWORD  PMF_Flags;
-  BYTE  PMF_ConfigOptions;
-  BYTE  PMF_IoResourceIndex;
-  BYTE  PMF_Reserved[2];
-  DWORD  PMF_ConfigRegisterBase;
-} MFCARD_DES, *PMFCARD_DES;
-
-typedef struct MfCard_Resource_s {
-  MFCARD_DES  MfCard_Header;
-} MFCARD_RESOURCE, *PMFCARD_RESOURCE;
-
-/* PCCARD_DES.PCD_Flags constants */
-
-typedef struct PcCard_Des_s {
-  DWORD  PCD_Count;
-  DWORD  PCD_Type;
-  DWORD  PCD_Flags;
-  BYTE  PCD_ConfigIndex;
-  BYTE  PCD_Reserved[3];
-  DWORD  PCD_MemoryCardBase1;
-  DWORD  PCD_MemoryCardBase2;
-} PCCARD_DES, *PPCCARD_DES;
-
-#define mPCD_IO_8_16        							0x1
-#define fPCD_IO_8           							0x0
-#define fPCD_IO_16          							0x1
-#define mPCD_MEM_8_16       							0x2
-#define fPCD_MEM_8          							0x0
-#define fPCD_MEM_16         							0x2
-#define mPCD_MEM_A_C        							0xC
-#define fPCD_MEM1_A         							0x4
-#define fPCD_MEM2_A         							0x8
-#define fPCD_IO_ZW_8        							0x10
-#define fPCD_IO_SRC_16      							0x20
-#define fPCD_IO_WS_16       							0x40
-#define mPCD_MEM_WS         							0x300
-#define fPCD_MEM_WS_ONE     							0x100
-#define fPCD_MEM_WS_TWO     							0x200
-#define fPCD_MEM_WS_THREE   							0x300
-
-#define fPCD_MEM_A          							0x4
-
-#define fPCD_ATTRIBUTES_PER_WINDOW 				0x8000
-
-#define fPCD_IO1_16         							0x00010000
-#define fPCD_IO1_ZW_8       							0x00020000
-#define fPCD_IO1_SRC_16     							0x00040000
-#define fPCD_IO1_WS_16      							0x00080000
-
-#define fPCD_IO2_16         							0x00100000
-#define fPCD_IO2_ZW_8       							0x00200000
-#define fPCD_IO2_SRC_16     							0x00400000
-#define fPCD_IO2_WS_16      							0x00800000
-
-#define mPCD_MEM1_WS        							0x03000000
-#define fPCD_MEM1_WS_ONE    							0x01000000
-#define fPCD_MEM1_WS_TWO    							0x02000000
-#define fPCD_MEM1_WS_THREE  							0x03000000
-#define fPCD_MEM1_16        							0x04000000
-
-#define mPCD_MEM2_WS        							0x30000000
-#define fPCD_MEM2_WS_ONE    							0x10000000
-#define fPCD_MEM2_WS_TWO    							0x20000000
-#define fPCD_MEM2_WS_THREE  							0x30000000
-#define fPCD_MEM2_16        							0x40000000
-
-#define PCD_MAX_MEMORY   									2
-#define PCD_MAX_IO       									2
-
-typedef struct PcCard_Resource_s {
-  PCCARD_DES  PcCard_Header;
-} PCCARD_RESOURCE, *PPCCARD_RESOURCE;
-
-
-/* CONFLICT_DETAILS.CD.ulMask constants */
-#define CM_CDMASK_DEVINST      						0x00000001
-#define CM_CDMASK_RESDES       						0x00000002
-#define CM_CDMASK_FLAGS        						0x00000004
-#define CM_CDMASK_DESCRIPTION  						0x00000008
-#define CM_CDMASK_VALID        					  0x0000000F
-
-/* CONFLICT_DETAILS.CD.ulFlags constants */
-#define CM_CDFLAGS_DRIVER      						0x00000001
-#define CM_CDFLAGS_ROOT_OWNED  						0x00000002
-#define CM_CDFLAGS_RESERVED    						0x00000004
-
-typedef struct _CONFLICT_DETAILS_A {
-  ULONG  CD_ulSize;
-  ULONG  CD_ulMask;
-  DEVINST  CD_dnDevInst;
-  RES_DES  CD_rdResDes;
-  ULONG  CD_ulFlags;
-  CHAR  CD_szDescription[MAX_PATH];
-} CONFLICT_DETAILS_A , *PCONFLICT_DETAILS_A;
-
-typedef struct _CONFLICT_DETAILS_W {
-  ULONG  CD_ulSize;
-  ULONG  CD_ulMask;
-  DEVINST  CD_dnDevInst;
-  RES_DES  CD_rdResDes;
-  ULONG  CD_ulFlags;
-  WCHAR  CD_szDescription[MAX_PATH];
-} CONFLICT_DETAILS_W , *PCONFLICT_DETAILS_W;
-
-#ifdef UNICODE
-typedef CONFLICT_DETAILS_W CONFLICT_DETAILS;
-typedef PCONFLICT_DETAILS_W PCONFLICT_DETAILS;
-#else
-typedef CONFLICT_DETAILS_A CONFLICT_DETAILS;
-typedef PCONFLICT_DETAILS_A PCONFLICT_DETAILS;
-#endif
-
-
-
-/* CM_Add_Empty_Log_Conf.ulFlags constants */
-#define PRIORITY_EQUAL_FIRST  						0x00000008
-#define PRIORITY_EQUAL_LAST   						0x00000000
-#define PRIORITY_BIT          						0x00000008
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Add_Empty_Log_Conf(
-  OUT PLOG_CONF  plcLogConf,
-  IN DEVINST  dnDevInst,
-  IN PRIORITY  Priority,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Add_Empty_Log_Conf_Ex(
-  OUT PLOG_CONF  plcLogConf,
-  IN DEVINST  dnDevInst,
-  IN PRIORITY  Priority,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-/* CM_Add_ID.ulFlags constants */
-#define CM_ADD_ID_HARDWARE              	0x00000000
-#define CM_ADD_ID_COMPATIBLE              0x00000001
-#define CM_ADD_ID_BITS                    0x00000001
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Add_IDA(
-  IN DEVINST  dnDevInst,
-  IN PSTR  pszID,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Add_ID_ExA(
-  IN DEVINST  dnDevInst,
-  IN PSTR  pszID,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Add_ID_ExW(
-  IN DEVINST  dnDevInst,
-  IN PWSTR  pszID,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Add_IDW(
-  IN DEVINST  dnDevInst,
-  IN PWSTR  pszID,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-#ifdef UNICODE
-#define CM_Add_ID CM_Add_IDW
-#define CM_Add_ID_Ex CM_Add_ID_ExW
-#else
-#define CM_Add_ID CM_Add_IDA
-#define CM_Add_ID_Ex CM_Add_ID_ExA
-#endif /* UNICODE */
-
-/* FIXME: Obsolete CM_Add_Range */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Add_Res_Des(
-  OUT PRES_DES  prdResDes,
-  IN LOG_CONF  lcLogConf,
-  IN RESOURCEID  ResourceID,
-  IN PCVOID  ResourceData,
-  IN ULONG  ResourceLen,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Add_Res_Des_Ex(
-  OUT PRES_DES  prdResDes,
-  IN LOG_CONF  lcLogConf,
-  IN RESOURCEID  ResourceID,
-  IN PCVOID  ResourceData,
-  IN ULONG  ResourceLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Connect_MachineA(
-  IN PCSTR  UNCServerName,
-  OUT PHMACHINE  phMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Connect_MachineW(
-  IN PCWSTR  UNCServerName,
-  OUT PHMACHINE  phMachine);
-
-#ifdef UNICODE
-#define CM_Connect_Machine CM_Connect_MachineW
-#else
-#define CM_Connect_Machine CM_Connect_MachineA
-#endif /* UNICODE */
-
-/* FIXME: Obsolete CM_Create_DevNode */
-/* FIXME: Obsolete CM_Create_DevNodeEx */
-/* FIXME: Obsolete CM_Create_Range_List */
-/* FIXME: Obsolete CM_Delete_Class_Key */
-/* FIXME: Obsolete CM_Delete_Class_Key_Ex */
-/* FIXME: Obsolete CM_Delete_DevNode_Key */
-/* FIXME: Obsolete CM_Delete_DevNode_Key_Ex */
-/* FIXME: Obsolete CM_Delete_Range */
-/* FIXME: Obsolete CM_Detected_Resource_Conflict */
-/* FIXME: Obsolete CM_Detected_Resource_Conflict_Ex */
-/* FIXME: Obsolete CM_Disable_DevNode */
-/* FIXME: Obsolete CM_Disable_DevNodeEx */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Disconnect_Machine(
-  IN HMACHINE  hMachine); 
-
-/* FIXME: Obsolete CM_Enable_DevNode */
-/* FIXME: Obsolete CM_Enable_DevNodeEx */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Enumerate_Classes(
-  IN ULONG  ulClassIndex,
-  OUT LPGUID  ClassGuid,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Enumerate_Classes_Ex(
-  IN ULONG  ulClassIndex,
-  OUT LPGUID  ClassGuid,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Enumerate_EnumeratorsA(
-  IN ULONG  ulEnumIndex,
-  OUT PCHAR  Buffer,
-  IN OUT PULONG  pulLength,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Enumerate_Enumerators_ExA(
-  IN ULONG  ulEnumIndex,
-  OUT PCHAR  Buffer,
-  IN OUT PULONG  pulLength,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Enumerate_Enumerators_ExW(
-  IN ULONG  ulEnumIndex,
-  OUT PWCHAR  Buffer,
-  IN OUT PULONG  pulLength,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Enumerate_EnumeratorsW(
-  IN ULONG  ulEnumIndex,
-  OUT PWCHAR  Buffer,
-  IN OUT PULONG  pulLength,
-  IN ULONG  ulFlags);
-
-#ifdef UNICODE
-#define CM_Enumerate_Enumerators CM_Enumerate_EnumeratorsW
-#define CM_Enumerate_Enumerators_Ex CM_Enumerate_Enumerators_ExW
-#else
-#define CM_Enumerate_Enumerators CM_Enumerate_EnumeratorsA
-#define CM_Enumerate_Enumerators_Ex CM_Enumerate_Enumerators_ExW
-#endif /* UNICODE */
-
-/* FIXME: Obsolete CM_Find_Range */
-/* FIXME: Obsolete CM_First_Range */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Free_Log_Conf(
-  IN LOG_CONF  lcLogConfToBeFreed,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Free_Log_Conf_Ex(
-  IN LOG_CONF  lcLogConfToBeFreed,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Free_Log_Conf_Handle(
-  IN LOG_CONF  lcLogConf);
-
-/* FIXME: Obsolete CM_Free_Range_List */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Free_Res_Des(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Free_Res_Des_Ex(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Free_Res_Des_Handle(
-  IN RES_DES  rdResDes);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Free_Resource_Conflict_Handle(
-  IN CONFLICT_LIST  clConflictList);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Child(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Child_Ex(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-/* FIXME: Obsolete CM_Get_Class_Name */
-/* FIXME: Obsolete CM_Get_Class_Name_Ex */
-/* FIXME: Obsolete CM_Get_Class_Key_Name */
-/* FIXME: Obsolete CM_Get_Class_Key_Name_Ex */
-/* FIXME: Obsolete CM_Get_Class_Registry_Property */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Depth(
-  OUT PULONG  pulDepth,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Depth_Ex(
-  OUT PULONG  pulDepth,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_IDA(
-  IN DEVINST  dnDevInst,
-  OUT PCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_ExA(
-  IN DEVINST  dnDevInst,
-  OUT PCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_ExW(
-  IN DEVINST  dnDevInst,
-  OUT PWCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_IDW(
-  IN DEVINST  dnDevInst,
-  OUT PWCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags);
-
-#ifdef UNICODE
-#define CM_Get_Device_ID CM_Get_Device_IDW
-#define CM_Get_Device_ID_Ex CM_Get_Device_ID_ExW
-#else
-#define CM_Get_Device_ID CM_Get_Device_IDA
-#define CM_Get_Device_ID_Ex CM_Get_Device_ID_ExW
-#endif /* UNICODE */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_ListA(
-  IN PCSTR  pszFilter,  OPTIONAL
-  OUT PCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_List_ExA(
-  IN PCSTR  pszFilter,  OPTIONAL
-  OUT PCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_List_ExW(
-  IN PCWSTR  pszFilter,  OPTIONAL
-  OUT PWCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_ListW(
-  IN PCWSTR  pszFilter,  OPTIONAL
-  OUT PWCHAR  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags);
-
-#ifdef UNICODE
-#define CM_Get_Device_ID_List CM_Get_Device_ID_ListW
-#define CM_Get_Device_ID_List_Ex CM_Get_Device_ID_List_ExW
-#else
-#define CM_Get_Device_ID_List CM_Get_Device_ID_ListA
-#define CM_Get_Device_ID_List_Ex CM_Get_Device_ID_List_ExA
-#endif /* UNICODE */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_List_SizeA(
-  OUT PULONG  pulLen,
-  IN PCSTR  pszFilter,  OPTIONAL
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_List_Size_ExA(
-  OUT PULONG  pulLen,
-  IN PCSTR  pszFilter,  OPTIONAL
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_List_Size_ExW(
-  OUT PULONG  pulLen,
-  IN PCWSTR  pszFilter,  OPTIONAL
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_List_SizeW(
-  OUT PULONG  pulLen,
-  IN PCWSTR  pszFilter,  OPTIONAL
-  IN ULONG  ulFlags);
-
-#ifdef UNICODE
-#define CM_Get_Device_ID_List_Size CM_Get_Device_ID_List_SizeW
-#define CM_Get_Device_ID_List_Size_Ex CM_Get_Device_ID_List_Size_ExW
-#else
-#define CM_Get_Device_ID_List_Size CM_Get_Device_ID_List_SizeA
-#define CM_Get_Device_ID_List_Size_Ex CM_Get_Device_ID_List_Size_ExA
-#endif /* UNICODE */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_Size(
-  OUT PULONG  pulLen,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Device_ID_Size_Ex(
-  OUT PULONG  pulLen,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-/* FIXME: Obsolete CM_Get_Device_Interface_Alias */
-/* FIXME: Obsolete CM_Get_Device_Interface_Alias_Ex */
-/* FIXME: Obsolete CM_Get_Device_Interface_List */
-/* FIXME: Obsolete CM_Get_Device_Interface_List_Ex */
-/* FIXME: Obsolete CM_Get_Device_Interface_List_Size */
-/* FIXME: Obsolete CM_Get_Device_Interface_List_Size_Ex */
-/* FIXME: Obsolete CM_Get_DevNode_Custom_Property */
-/* FIXME: Obsolete CM_Get_DevNode_Custom_Property_Ex */
-/* FIXME: Obsolete CM_Get_DevNode_Registry_Property */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_DevNode_Status(
-  OUT PULONG  pulStatus,
-  OUT PULONG  pulProblemNumber,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_DevNode_Status_Ex(
-  OUT PULONG  pulStatus,
-  OUT PULONG  pulProblemNumber,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-#define CM_Get_DevInst_Status CM_Get_DevNode_Status
-#define CM_Get_DevInst_Status_Ex CM_Get_DevNode_Status_Ex
-
-/* CM_Get_First_Log_Conf.ulFlags constants */
-#define BASIC_LOG_CONF    0x00000000  /* Specifies the req list. */
-#define FILTERED_LOG_CONF 0x00000001  /* Specifies the filtered req list. */
-#define ALLOC_LOG_CONF    0x00000002  /* Specifies the Alloc Element. */
-#define BOOT_LOG_CONF     0x00000003  /* Specifies the RM Alloc Element. */
-#define FORCED_LOG_CONF   0x00000004  /* Specifies the Forced Log Conf */
-#define OVERRIDE_LOG_CONF 0x00000005  /* Specifies the Override req list. */
-#define NUM_LOG_CONF      0x00000006  /* Number of Log Conf type */
-#define LOG_CONF_BITS     0x00000007  /* The bits of the log conf type. */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_First_Log_Conf(
-  OUT PLOG_CONF  plcLogConf,  OPTIONAL
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_First_Log_Conf_Ex(
-  OUT PLOG_CONF  plcLogConf,  OPTIONAL
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-/* FIXME: Obsolete CM_Get_Global_State */
-/* FIXME: Obsolete CM_Get_Global_State_Ex */
-/* FIXME: Obsolete CM_Get_Hardware_Profile_Info */
-/* FIXME: Obsolete CM_Get_Hardware_Profile_Info_Ex */
-/* FIXME: Obsolete CM_Get_HW_Prof_Flags */
-/* FIXME: Obsolete CM_Get_HW_Prof_Flags_Ex */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Log_Conf_Priority(
-  IN LOG_CONF  lcLogConf,
-  OUT PPRIORITY  pPriority,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Log_Conf_Priority_Ex(
-  IN LOG_CONF  lcLogConf,
-  OUT PPRIORITY  pPriority,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Next_Log_Conf(
-  OUT PLOG_CONF  plcLogConf,  OPTIONAL
-  IN LOG_CONF  lcLogConf,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Next_Log_Conf_Ex(
-  OUT PLOG_CONF  plcLogConf,  OPTIONAL
-  IN LOG_CONF  lcLogConf,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Next_Res_Des(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN RESOURCEID  ForResource,
-  OUT PRESOURCEID  pResourceID,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Next_Res_Des_Ex(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN RESOURCEID  ForResource,
-  OUT PRESOURCEID  pResourceID,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Parent(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Parent_Ex(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Res_Des_Data(
-  IN RES_DES  rdResDes,
-  OUT PVOID  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Res_Des_Data_Ex(
-  IN RES_DES  rdResDes,
-  OUT PVOID  Buffer,
-  IN ULONG  BufferLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Res_Des_Data_Size(
-  OUT PULONG  pulSize,
-  IN RES_DES  rdResDes,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Res_Des_Data_Size_Ex(
-  OUT PULONG  pulSize,
-  IN RES_DES  rdResDes,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Resource_Conflict_Count(
-  IN CONFLICT_LIST  clConflictList,
-  OUT PULONG  pulCount);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Resource_Conflict_DetailsA(
-  IN CONFLICT_LIST  clConflictList,
-  IN ULONG  ulIndex,
-  IN OUT PCONFLICT_DETAILS_A  pConflictDetails);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Resource_Conflict_DetailsW(
-  IN CONFLICT_LIST  clConflictList,
-  IN ULONG  ulIndex,
-  IN OUT PCONFLICT_DETAILS_W  pConflictDetails);
-
-#ifdef UNICODE
-#define CM_Get_Resource_Conflict_Details CM_Get_Resource_Conflict_DetailsW
-#else
-#define CM_Get_Resource_Conflict_Details CM_Get_Resource_Conflict_DetailsA
-#endif /* UNICODE */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Sibling(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  DevInst,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Get_Sibling_Ex(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINST  DevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-WORD
-WINAPI
-CM_Get_Version(
-  VOID);
-
-CMAPI
-WORD
-WINAPI
-CM_Get_Version_Ex(
-  IN HMACHINE  hMachine);
-
-/* FIXME: Obsolete CM_Intersect_Range_List */
-/* FIXME: Obsolete CM_Invert_Range_List */
-/* FIXME: Obsolete CM_Is_Dock_Station_Present */
-/* FIXME: Obsolete CM_Is_Dock_Station_Present_Ex */
-
-/* CM_Locate_DevNode.ulFlags constants */
-#define CM_LOCATE_DEVNODE_NORMAL       		0x00000000
-#define CM_LOCATE_DEVNODE_PHANTOM      		0x00000001
-#define CM_LOCATE_DEVNODE_CANCELREMOVE 		0x00000002
-#define CM_LOCATE_DEVNODE_NOVALIDATION 		0x00000004
-#define CM_LOCATE_DEVNODE_BITS         		0x00000007
-
-#define CM_LOCATE_DEVINST_NORMAL       		CM_LOCATE_DEVNODE_NORMAL
-#define CM_LOCATE_DEVINST_PHANTOM      		CM_LOCATE_DEVNODE_PHANTOM
-#define CM_LOCATE_DEVINST_CANCELREMOVE 		CM_LOCATE_DEVNODE_CANCELREMOVE
-#define CM_LOCATE_DEVINST_NOVALIDATION 		CM_LOCATE_DEVNODE_NOVALIDATION
-#define CM_LOCATE_DEVINST_BITS         		CM_LOCATE_DEVNODE_BITS
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Locate_DevNodeA(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINSTID_A  pDeviceID,  OPTIONAL
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Locate_DevNode_ExA(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINSTID_A  pDeviceID,  OPTIONAL
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Locate_DevNode_ExW(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINSTID_W  pDeviceID,  OPTIONAL
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Locate_DevNodeW(
-  OUT PDEVINST  pdnDevInst,
-  IN DEVINSTID_W  pDeviceID,  OPTIONAL
-  IN ULONG  ulFlags);
-
-#define CM_Locate_DevInstA CM_Locate_DevNodeA
-#define CM_Locate_DevInstW CM_Locate_DevNodeW
-#define CM_Locate_DevInst_ExA CM_Locate_DevNode_ExA
-#define CM_Locate_DevInst_ExW CM_Locate_DevNode_ExW
-
-#ifdef UNICODE
-#define CM_Locate_DevNode CM_Locate_DevNodeW
-#define CM_Locate_DevInst CM_Locate_DevNodeW
-#define CM_Locate_DevNode_Ex CM_Locate_DevNode_ExW
-#define CM_Locate_DevInst_Ex CM_Locate_DevNode_ExW
-#else
-#define CM_Locate_DevNode CM_Locate_DevNodeA
-#define CM_Locate_DevInst CM_Locate_DevNodeA
-#define CM_Locate_DevNode_Ex CM_Locate_DevNode_ExA
-#define CM_Locate_DevInst_Ex CM_Locate_DevNode_ExA
-#endif /* UNICODE */
-
-/* FIXME: Obsolete CM_Merge_Range_List */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Modify_Res_Des(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN RESOURCEID  ResourceID,
-  IN PCVOID  ResourceData,
-  IN ULONG  ResourceLen,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Modify_Res_Des_Ex(
-  OUT PRES_DES  prdResDes,
-  IN RES_DES  rdResDes,
-  IN RESOURCEID  ResourceID,
-  IN PCVOID  ResourceData,
-  IN ULONG  ResourceLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-/* FIXME: Obsolete CM_Move_DevNode */
-/* FIXME: Obsolete CM_Move_DevNode_Ex */
-/* FIXME: Obsolete CM_Next_Range */
-/* FIXME: Obsolete CM_Open_Class_Key */
-/* FIXME: Obsolete CM_Open_Class_Key_Ex */
-/* FIXME: Obsolete CM_Open_DevNode_Key */
-/* FIXME: Obsolete CM_Open_DevNode_Key_Ex */
-
-/* CM_Query_And_Remove_SubTree.ulFlags constants */
-#define CM_REMOVE_UI_OK             			0x00000000
-#define CM_REMOVE_UI_NOT_OK         			0x00000001
-#define CM_REMOVE_NO_RESTART        			0x00000002
-#define CM_REMOVE_BITS              			0x00000003
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Query_And_Remove_SubTreeA(
-  IN  DEVINST dnAncestor,
-  OUT PPNP_VETO_TYPE pVetoType,
-  OUT LPSTR pszVetoName,
-  IN  ULONG ulNameLength,
-  IN  ULONG ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Query_And_Remove_SubTreeW(
-  IN  DEVINST dnAncestor,
-  OUT PPNP_VETO_TYPE pVetoType,
-  OUT LPWSTR pszVetoName,
-  IN  ULONG ulNameLength,
-  IN  ULONG ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Query_And_Remove_SubTree_ExA(
-  IN  DEVINST dnAncestor,
-  OUT PPNP_VETO_TYPE pVetoType,
-  OUT LPSTR pszVetoName,
-  IN  ULONG ulNameLength,
-  IN  ULONG ulFlags,
-  IN  HMACHINE hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Query_And_Remove_SubTree_ExW(
-  IN  DEVINST dnAncestor,
-  OUT PPNP_VETO_TYPE pVetoType,
-  OUT LPWSTR pszVetoName,
-  IN  ULONG ulNameLength,
-  IN  ULONG ulFlags,
-  IN  HMACHINE hMachine);
-
-/* FIXME: Obsolete CM_Query_Arbitrator_Free_Data */
-/* FIXME: Obsolete CM_Query_Arbitrator_Free_Data_Ex */
-/* FIXME: Obsolete CM_Query_Arbitrator_Free_Size */
-/* FIXME: Obsolete CM_Query_Arbitrator_Free_Size_Ex */
-/* FIXME: Obsolete CM_Query_Arbitrator_Free_Size_Ex */
-/* FIXME: Obsolete CM_Query_Remove_SubTree */
-/* FIXME: Obsolete CM_Query_Remove_SubTree_Ex */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Query_Resource_Conflict_List(
-  OUT PCONFLICT_LIST  pclConflictList,
-  IN DEVINST  dnDevInst,
-  IN RESOURCEID  ResourceID,
-  IN PCVOID  ResourceData,
-  IN ULONG  ResourceLen,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-/* CM_Reenumerate_DevNode.ulFlags constants */
-#define CM_REENUMERATE_NORMAL             0x00000000
-#define CM_REENUMERATE_SYNCHRONOUS        0x00000001
-#define CM_REENUMERATE_RETRY_INSTALLATION 0x00000002
-#define CM_REENUMERATE_ASYNCHRONOUS       0x00000004
-#define CM_REENUMERATE_BITS               0x00000007
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Reenumerate_DevNode(
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Reenumerate_DevNode_Ex(
-  IN DEVINST  dnDevInst,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-#define CM_Reenumerate_DevInst CM_Reenumerate_DevNode
-#define CM_Reenumerate_DevInst_Ex CM_Reenumerate_DevNode_Ex
-
-/* FIXME: Obsolete CM_Register_Device_Driver */
-/* FIXME: Obsolete CM_Register_Device_Driver_Ex */
-/* FIXME: Obsolete CM_Register_Device_Interface */
-/* FIXME: Obsolete CM_Register_Device_Interface_Ex */
-/* FIXME: Obsolete CM_Remove_SubTree */
-/* FIXME: Obsolete CM_Remove_SubTree_Ex */
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Request_Device_EjectA(
-  IN DEVINST  dnDevInst,
-  OUT PPNP_VETO_TYPE  pVetoType,
-  OUT LPSTR  pszVetoName,
-  IN ULONG  ulNameLength,
-  IN ULONG  ulFlags);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Request_Device_Eject_ExW(
-  IN DEVINST  dnDevInst,
-  OUT PPNP_VETO_TYPE  pVetoType,
-  OUT LPWSTR  pszVetoName,
-  IN ULONG  ulNameLength,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Request_Device_Eject_ExA(
-  IN DEVINST  dnDevInst,
-  OUT PPNP_VETO_TYPE  pVetoType,
-  OUT LPSTR  pszVetoName,
-  IN ULONG  ulNameLength,
-  IN ULONG  ulFlags,
-  IN HMACHINE  hMachine);
-
-CMAPI
-CONFIGRET
-WINAPI
-CM_Request_Device_EjectW(
-  IN DEVINST  dnDevInst,
-  OUT PPNP_VETO_TYPE  pVetoType,
-  OUT LPWSTR  pszVetoName,
-  IN ULONG  ulNameLength,
-  IN ULONG  ulFlags);
-
-#ifdef UNICODE
-#define CM_Request_Device_Eject CM_Request_Device_EjectW
-#define CM_Request_Device_Eject_Ex CM_Request_Device_Eject_ExW
-#else
-#define CM_Request_Device_Eject CM_Request_Device_EjectA
-#define CM_Request_Device_Eject_Ex CM_Request_Device_Eject_ExA
-#endif /* UNICODE */
-
-/* FIXME: Obsolete CM_Request_Eject_PC */
-/* FIXME: Obsolete CM_Request_Eject_PC_Ex */
-/* FIXME: Obsolete CM_Run_Detection */
-/* FIXME: Obsolete CM_Run_Detection_Ex */
-/* FIXME: Obsolete CM_Set_Class_Registry_Property */
-/* FIXME: Obsolete CM_Set_DevNode_Problem */
-/* FIXME: Obsolete CM_Set_DevNode_Problem_Ex */
-/* FIXME: Obsolete CM_Set_DevNode_Registry_Property */
-/* FIXME: Obsolete CM_Set_DevNode_Registry_Property_Ex */
-/* FIXME: Obsolete CM_Set_HW_Prof */
-/* FIXME: Obsolete CM_Set_HW_Prof_Ex */
-/* FIXME: Obsolete CM_Set_HW_Prof_Flags */
-/* FIXME: Obsolete CM_Set_HW_Prof_Flags_Ex */
-/* FIXME: Obsolete CM_Setup_DevNode */
-/* FIXME: Obsolete CM_Setup_DevNode_Ex */
-/* FIXME: Obsolete CM_Test_Range_Available */
-/* FIXME: Obsolete CM_Uninstall_DevNode */
-/* FIXME: Obsolete CM_Uninstall_DevNode_Ex */
-/* FIXME: Obsolete CM_Unregister_Device_Interface */
-/* FIXME: Obsolete CM_Unregister_Device_Interface_Ex */
-
-#define CM_WaitNoPendingInstallEvents CMP_WaitNoPendingInstallEvents
-
-CMAPI
-DWORD
-WINAPI
-CMP_WaitNoPendingInstallEvents(
-  IN DWORD dwTimeout);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __CFGMGR32_H */
diff --git a/winsup/w32api/include/ddk/d4drvif.h b/winsup/w32api/include/ddk/d4drvif.h
deleted file mode 100644
index fff128694..000000000
--- a/winsup/w32api/include/ddk/d4drvif.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * d4drvif.h
- *
- * DOT4 driver IOCTL interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __D4DRVIF_H
-#define __D4DRVIF_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "d4iface.h"
-
-#define FILE_DEVICE_DOT4                  0x3a
-#define IOCTL_DOT4_USER_BASE              2049
-
-#define IOCTL_DOT4_ADD_ACTIVITY_BROADCAST \
-  CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DOT4_CLOSE_CHANNEL \
-  CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 1, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DOT4_CREATE_SOCKET \
-  CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 7, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-#define IOCTL_DOT4_DESTROY_SOCKET \
-  CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 9, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-#define IOCTL_DOT4_OPEN_CHANNEL \
-  CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 0, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-#define IOCTL_DOT4_READ \
-  CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 2, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-#define IOCTL_DOT4_REMOVE_ACTIVITY_BROADCAST \
-  CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 5, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DOT4_WAIT_ACTIVITY_BROADCAST \
-  CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 6, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-#define IOCTL_DOT4_WAIT_FOR_CHANNEL \
-  CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 8, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-#define IOCTL_DOT4_WRITE \
-  CTL_CODE(FILE_DEVICE_DOT4, IOCTL_DOT4_USER_BASE + 3, METHOD_IN_DIRECT, FILE_ANY_ACCESS)
-
-
-#define MAX_SERVICE_LENGTH                40
-
-typedef struct _DOT4_DC_CREATE_DATA {
-  unsigned char  bPsid;
-  CHAR  pServiceName[MAX_SERVICE_LENGTH + 1];
-  unsigned char  bType;
-  ULONG  ulBufferSize;
-  USHORT  usMaxHtoPPacketSize;
-  USHORT  usMaxPtoHPacketSize;
-  unsigned char bHsid;
-} DOT4_DC_CREATE_DATA, *PDOT4_DC_CREATE_DATA;
-
-typedef struct _DOT4_DC_DESTROY_DATA {
-    unsigned char  bHsid;
-} DOT4_DC_DESTROY_DATA, *PDOT4_DC_DESTROY_DATA;
-
-typedef struct _DOT4_DC_OPEN_DATA {
-  unsigned char  bHsid;
-  unsigned char  fAddActivity;
-  CHANNEL_HANDLE  hChannelHandle;
-} DOT4_DC_OPEN_DATA, *PDOT4_DC_OPEN_DATA;
-
-typedef struct _DOT4_DRIVER_CMD {
-  CHANNEL_HANDLE  hChannelHandle;
-  ULONG  ulSize;
-  ULONG  ulOffset;
-  ULONG  ulTimeout;
-} DOT4_DRIVER_CMD, *PDOT4_DRIVER_CMD;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __D4DRVIF_H */
diff --git a/winsup/w32api/include/ddk/d4iface.h b/winsup/w32api/include/ddk/d4iface.h
deleted file mode 100644
index 3cd511656..000000000
--- a/winsup/w32api/include/ddk/d4iface.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * d4iface.h
- *
- * DOT4 interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __D4IFACE_H
-#define __D4IFACE_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-#define DOT4_MAX_CHANNELS                 128
-#define NO_TIMEOUT                        0
-
-#define DOT4_CHANNEL                      0
-#define HP_MESSAGE_PROCESSOR              1
-#define PRINTER_CHANNEL                   2
-#define SCANNER_CHANNEL                   4
-#define MIO_COMMAND_PROCESSOR             5
-#define ECHO_CHANNEL                      6
-#define FAX_SEND_CHANNEL                  7
-#define FAX_RECV_CHANNEL                  8
-#define DIAGNOSTIC_CHANNEL                9
-#define HP_RESERVED                       10
-#define IMAGE_DOWNLOAD                    11
-#define HOST_DATASTORE_UPLOAD             12
-#define HOST_DATASTORE_DOWNLOAD           13
-#define CONFIG_UPLOAD                     14
-#define CONFIG_DOWNLOAD                   15
-
-#define STREAM_TYPE_CHANNEL               1
-#define PACKET_TYPE_CHANNEL               2
-
-/* DOT4_ACTIVITY.ulMessage flags */
-#define DOT4_STREAM_RECEIVED              0x100
-#define DOT4_STREAM_CREDITS               0x101
-#define DOT4_MESSAGE_RECEIVED             0x102
-#define DOT4_DISCONNECT                   0x103
-#define DOT4_CHANNEL_CLOSED               0x105
-
-typedef unsigned long CHANNEL_HANDLE, *PCHANNEL_HANDLE;
-
-typedef struct _DOT4_ACTIVITY {
-  ULONG  ulMessage;
-  ULONG  ulByteCount;
-  CHANNEL_HANDLE  hChannel;
-} DOT4_ACTIVITY, *PDOT4_ACTIVITY;
-
-typedef struct _DOT4_WMI_XFER_INFO {
-  ULONG  ulStreamBytesWritten;
-  ULONG  ulStreamBytesRead;
-  ULONG  ulPacketBytesWritten;
-  ULONG  ulPacketBytesRead;
-} DOT4_WMI_XFER_INFO, *PDOT4_WMI_XFER_INFO;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __D4IFACE_H */
diff --git a/winsup/w32api/include/ddk/ddkmapi.h b/winsup/w32api/include/ddk/ddkmapi.h
deleted file mode 100644
index feeff8763..000000000
--- a/winsup/w32api/include/ddk/ddkmapi.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * ddkmapi.h
- *
- * DirectDraw support for DxApi function
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __DDKMAPI_H
-#define __DDKMAPI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-#if defined(_DXAPI_)
-  #define DXAPI DECLSPEC_EXPORT
-#else
-  #define DXAPI DECLSPEC_IMPORT
-#endif
-
-DXAPI
-DWORD
-FAR PASCAL
-DxApi(
-  IN DWORD  dwFunctionNum,
-  IN LPVOID  lpvInBuffer,
-  IN DWORD  cbInBuffer,
-  OUT LPVOID  lpvOutBuffer,
-  OUT DWORD  cbOutBuffer);
-
-typedef DWORD (FAR PASCAL *LPDXAPI)(
-  DWORD  dwFunctionNum,
-  LPVOID  lpvInBuffer,
-  DWORD  cbInBuffer,
-  LPVOID  lpvOutBuffer,
-  DWORD  cbOutBuffer);
-
-
-#define DXAPI_MAJORVERSION                1
-#define DXAPI_MINORVERSION                0
-
-#define DD_FIRST_DXAPI                    0x500
-
-#define DD_DXAPI_GETVERSIONNUMBER                 (DD_FIRST_DXAPI)
-#define DD_DXAPI_CLOSEHANDLE                      (DD_FIRST_DXAPI+1)
-#define DD_DXAPI_OPENDIRECTDRAW                   (DD_FIRST_DXAPI+2)
-#define DD_DXAPI_OPENSURFACE                      (DD_FIRST_DXAPI+3)
-#define DD_DXAPI_OPENVIDEOPORT                    (DD_FIRST_DXAPI+4)
-#define DD_DXAPI_GETKERNELCAPS                    (DD_FIRST_DXAPI+5)
-#define DD_DXAPI_GET_VP_FIELD_NUMBER              (DD_FIRST_DXAPI+6)
-#define DD_DXAPI_SET_VP_FIELD_NUMBER              (DD_FIRST_DXAPI+7)
-#define DD_DXAPI_SET_VP_SKIP_FIELD                (DD_FIRST_DXAPI+8)
-#define DD_DXAPI_GET_SURFACE_STATE                (DD_FIRST_DXAPI+9)
-#define DD_DXAPI_SET_SURFACE_STATE                (DD_FIRST_DXAPI+10)
-#define DD_DXAPI_LOCK                             (DD_FIRST_DXAPI+11)
-#define DD_DXAPI_FLIP_OVERLAY                     (DD_FIRST_DXAPI+12)
-#define DD_DXAPI_FLIP_VP                          (DD_FIRST_DXAPI+13)
-#define DD_DXAPI_GET_CURRENT_VP_AUTOFLIP_SURFACE  (DD_FIRST_DXAPI+14)
-#define DD_DXAPI_GET_LAST_VP_AUTOFLIP_SURFACE     (DD_FIRST_DXAPI+15)
-#define DD_DXAPI_REGISTER_CALLBACK                (DD_FIRST_DXAPI+16)
-#define DD_DXAPI_UNREGISTER_CALLBACK              (DD_FIRST_DXAPI+17)
-#define DD_DXAPI_GET_POLARITY                     (DD_FIRST_DXAPI+18)
-#define DD_DXAPI_OPENVPCAPTUREDEVICE              (DD_FIRST_DXAPI+19)
-#define DD_DXAPI_ADDVPCAPTUREBUFFER               (DD_FIRST_DXAPI+20)
-#define DD_DXAPI_FLUSHVPCAPTUREBUFFERS            (DD_FIRST_DXAPI+21)
-
-
-typedef struct _DDCAPBUFFINFO {
-  DWORD  dwFieldNumber;
-  DWORD  bPolarity;
-  LARGE_INTEGER  liTimeStamp;
-  DWORD  ddRVal;
-} DDCAPBUFFINFO, FAR * LPDDCAPBUFFINFO;
-
-/* DDADDVPCAPTUREBUFF.dwFlags constants */
-#define DDADDBUFF_SYSTEMMEMORY            0x0001
-#define DDADDBUFF_NONLOCALVIDMEM          0x0002
-#define DDADDBUFF_INVERT                  0x0004
-
-typedef struct _DDADDVPCAPTUREBUFF {
-  HANDLE  hCapture;
-  DWORD  dwFlags;
-  PMDL  pMDL;
-  PKEVENT  pKEvent;
-  LPDDCAPBUFFINFO  lpBuffInfo;
-} DDADDVPCAPTUREBUFF, FAR * LPDDADDVPCAPTUREBUFF;
-
-typedef struct _DDCLOSEHANDLE {
-  HANDLE  hHandle;
-} DDCLOSEHANDLE, FAR *LPDDCLOSEHANDLE;
-
-typedef struct _DDFLIPOVERLAY {
-  HANDLE  hDirectDraw;
-  HANDLE  hCurrentSurface;
-  HANDLE  hTargetSurface;
-  DWORD  dwFlags;
-} DDFLIPOVERLAY, FAR *LPDDFLIPOVERLAY;
-
-typedef struct _DDFLIPVIDEOPORT {
-  HANDLE  hDirectDraw;
-  HANDLE  hVideoPort;
-  HANDLE  hCurrentSurface;
-  HANDLE  hTargetSurface;
-  DWORD  dwFlags;
-} DDFLIPVIDEOPORT, FAR *LPDDFLIPVIDEOPORT;
-
-typedef struct _DDGETAUTOFLIPIN {
-  HANDLE  hDirectDraw;
-  HANDLE  hVideoPort;
-} DDGETAUTOFLIPIN, FAR *LPDDGETAUTOFLIPIN;
-
-typedef struct _DDGETAUTOFLIPOUT {
-  DWORD  ddRVal;
-  HANDLE  hVideoSurface;
-  HANDLE  hVBISurface;
-  BOOL  bPolarity;
-} DDGETAUTOFLIPOUT, FAR *LPDDGETAUTOFLIPOUT;
-
-typedef struct _DDGETPOLARITYIN {
-  HANDLE  hDirectDraw;
-  HANDLE  hVideoPort;
-} DDGETPOLARITYIN, FAR *LPDDGETPOLARITYIN;
-
-typedef struct _DDGETPOLARITYOUT {
-  DWORD  ddRVal;
-  BOOL  bPolarity;
-} DDGETPOLARITYOUT, FAR *LPDDGETPOLARITYOUT;
-
-typedef struct _DDGETSURFACESTATEIN {
-  HANDLE  hDirectDraw;
-  HANDLE  hSurface;
-} DDGETSURFACESTATEIN, FAR *LPDDGETSURFACESTATEIN;
-
-/* DDGETSURFACESTATEOUT.dwStateCaps/dwStateStatus constants */
-#define DDSTATE_BOB                       0x0001
-#define DDSTATE_WEAVE                     0x0002
-#define DDSTATE_EXPLICITLY_SET            0x0004
-#define DDSTATE_SOFTWARE_AUTOFLIP         0x0008
-#define DDSTATE_SKIPEVENFIELDS            0x0010
-
-typedef struct _DDGETSURFACESTATEOUT {
-  DWORD  ddRVal;
-  DWORD  dwStateCaps;
-  DWORD  dwStateStatus;
-} DDGETSURFACESTATEOUT, FAR *LPDDGETSURFACESTATEOUT;
-
-typedef struct _DDGETFIELDNUMIN {
-  HANDLE  hDirectDraw;
-  HANDLE  hVideoPort;
-} DDGETFIELDNUMIN, FAR *LPDDGETFIELDNUMIN;
-
-typedef struct _DDGETFIELDNUMOUT {
-  DWORD  ddRVal;
-  DWORD  dwFieldNum;
-} DDGETFIELDNUMOUT, FAR *LPDDGETFIELDNUMOUT;
-
-typedef struct _DDGETKERNELCAPSOUT {
-  DWORD  ddRVal;
-  DWORD  dwCaps;
-  DWORD  dwIRQCaps;
-} DDGETKERNELCAPSOUT, FAR *LPDDGETKERNELCAPSOUT;
-
-typedef struct _DDGETVERSIONNUMBER {
-  DWORD  ddRVal;
-  DWORD  dwMajorVersion;
-  DWORD  dwMinorVersion;
-} DDGETVERSIONNUMBER, FAR *LPDDGETVERSIONNUMBER;
-
-typedef struct _DDLOCKIN {
-  HANDLE  hDirectDraw;
-  HANDLE  hSurface;
-} DDLOCKIN, FAR *LPDDLOCKIN;
-
-typedef struct _DDLOCKOUT {
-  DWORD  ddRVal;
-  DWORD  dwSurfHeight;
-  DWORD  dwSurfWidth;
-  LONG  lSurfPitch;
-  PVOID  lpSurface;
-  DWORD  SurfaceCaps;
-  DWORD  dwFormatFlags;
-  DWORD  dwFormatFourCC;
-  DWORD  dwFormatBitCount;
-  _ANONYMOUS_UNION union {
-    DWORD  dwRBitMask;
-    DWORD  dwYBitMask;
-  } DUMMYUNIONNAME;
-  _ANONYMOUS_UNION union {
-    DWORD  dwGBitMask;
-    DWORD  dwUBitMask;
-  } DUMMYUNIONNAME2;
-  _ANONYMOUS_UNION union {
-    DWORD  dwBBitMask;
-    DWORD  dwVBitMask;
-  } DUMMYUNIONNAME3;
-} DDLOCKOUT, FAR *LPDDLOCKOUT;
-
-/* LPDD_NOTIFYCALLBACK.dwFlags constants */
-#define DDNOTIFY_DISPLAY_VSYNC            0x0001
-#define DDNOTIFY_VP_VSYNC                 0x0002
-#define DDNOTIFY_VP_LINE                  0x0004
-#define DDNOTIFY_PRERESCHANGE             0x0008
-#define DDNOTIFY_POSTRESCHANGE            0x0010
-#define DDNOTIFY_PREDOSBOX                0x0020
-#define DDNOTIFY_POSTDOSBOX               0x0040
-#define DDNOTIFY_CLOSEDIRECTDRAW          0x0080
-#define DDNOTIFY_CLOSESURFACE             0x0100
-#define DDNOTIFY_CLOSEVIDEOPORT           0x0200
-#define DDNOTIFY_CLOSECAPTURE             0x0400
-
-typedef ULONG (FAR PASCAL *LPDD_NOTIFYCALLBACK)(
-  DWORD dwFlags,
-  PVOID pContext,
-  DWORD dwParam1,
-  DWORD dwParam2);
-
-typedef struct _DDOPENDIRECTDRAWIN {
-  ULONG_PTR  dwDirectDrawHandle;
-  LPDD_NOTIFYCALLBACK  pfnDirectDrawClose;
-  PVOID  pContext;
-} DDOPENDIRECTDRAWIN, FAR *LPDDOPENDIRECTDRAWIN;
-
-typedef struct _DDOPENDIRECTDRAWOUT {
-  DWORD  ddRVal;
-  HANDLE  hDirectDraw;
-} DDOPENDIRECTDRAWOUT, FAR *LPDDOPENDIRECTDRAWOUT;
-
-typedef struct _DDOPENSURFACEIN {
-  HANDLE  hDirectDraw;
-  ULONG_PTR  dwSurfaceHandle;
-  LPDD_NOTIFYCALLBACK  pfnSurfaceClose;
-  PVOID  pContext;
-} DDOPENSURFACEIN, FAR *LPDDOPENSURFACEIN;
-
-typedef struct _DDOPENSURFACEOUT {
-  DWORD  ddRVal;
-  HANDLE  hSurface;
-} DDOPENSURFACEOUT, FAR *LPDDOPENSURFACEOUT;
-
-typedef struct _DDOPENVIDEOPORTIN {
-  HANDLE  hDirectDraw;
-  ULONG  dwVideoPortHandle;
-  LPDD_NOTIFYCALLBACK  pfnVideoPortClose;
-  PVOID  pContext;
-} DDOPENVIDEOPORTIN, FAR *LPDDOPENVIDEOPORTIN;
-
-typedef struct _DDOPENVIDEOPORTOUT {
-  DWORD  ddRVal;
-  HANDLE  hVideoPort;
-} DDOPENVIDEOPORTOUT, FAR *LPDDOPENVIDEOPORTOUT;
-
-/* DDOPENVPCAPTUREDEVICEIN.dwFlags constants */
-#define DDOPENCAPTURE_VIDEO               0x0001
-#define DDOPENCAPTURE_VBI                 0x0002
-
-typedef struct _DDOPENVPCAPTUREDEVICEIN {
-  HANDLE  hDirectDraw;
-  HANDLE  hVideoPort;
-  DWORD  dwStartLine;
-  DWORD  dwEndLine;
-  DWORD  dwCaptureEveryNFields;
-  LPDD_NOTIFYCALLBACK  pfnCaptureClose;
-  PVOID  pContext;
-  DWORD  dwFlags;
-} DDOPENVPCAPTUREDEVICEIN, FAR * LPDDOPENVPCAPTUREDEVICEIN;
-
-typedef struct _DDOPENVPCAPTUREDEVICEOUT {
-  DWORD  ddRVal;
-  HANDLE  hCapture;
-} DDOPENVPCAPTUREDEVICEOUT, FAR * LPDDOPENVPCAPTUREDEVICEOUT;
-
-/* DDREGISTERCALLBACK.dwEvents constants */
-#define DDEVENT_DISPLAY_VSYNC             0x0001
-#define DDEVENT_VP_VSYNC                  0x0002
-#define DDEVENT_VP_LINE                   0x0004
-#define DDEVENT_PRERESCHANGE              0x0008
-#define DDEVENT_POSTRESCHANGE             0x0010
-#define DDEVENT_PREDOSBOX                 0x0020
-#define DDEVENT_POSTDOSBOX                0x0040
-
-typedef struct _DDREGISTERCALLBACK {
-  HANDLE  hDirectDraw;
-  ULONG  dwEvents;
-  LPDD_NOTIFYCALLBACK  pfnCallback;
-  ULONG_PTR  dwParam1;
-  ULONG_PTR  dwParam2;
-  PVOID  pContext;
-} DDREGISTERCALLBACK, FAR *LPDDREGISTERCALLBACK;
-
-typedef struct _DDSETSURFACETATE {
-  HANDLE  hDirectDraw;
-  HANDLE  hSurface;
-  DWORD  dwState;
-  DWORD  dwStartField;
-} DDSETSURFACESTATE, FAR *LPDDSETSURFACESTATE;
-
-typedef struct _DDSETFIELDNUM {
-  HANDLE  hDirectDraw;
-  HANDLE  hVideoPort;
-  DWORD  dwFieldNum;
-} DDSETFIELDNUM, FAR *LPDDSETFIELDNUM;
-
-typedef struct _DDSETSKIPFIELD {
-  HANDLE  hDirectDraw;
-  HANDLE  hVideoPort;
-  DWORD  dwStartField;
-} DDSETSKIPFIELD, FAR *LPDDSETSKIPFIELD;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __DDKMAPI_H */
diff --git a/winsup/w32api/include/ddk/hidclass.h b/winsup/w32api/include/ddk/hidclass.h
deleted file mode 100644
index 8717fc5ef..000000000
--- a/winsup/w32api/include/ddk/hidclass.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * hidclass.h
- *
- * HID class driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __HIDCLASS_H
-#define __HIDCLASS_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "hidpi.h"
-
-#define HID_REVISION                      0x00000001
-
-DEFINE_GUID (GUID_DEVINTERFACE_HID, \
-  0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30);
-DEFINE_GUID (GUID_HID_INTERFACE_NOTIFY, \
-  0x2c4e2e88L, 0x25e6, 0x4c33, 0x88, 0x2f, 0x3d, 0x82, 0xe6, 0x07, 0x36, 0x81);
-DEFINE_GUID (GUID_HID_INTERFACE_HIDPARSE, \
-  0xf5c315a5, 0x69ac, 0x4bc2, 0x92, 0x79, 0xd0, 0xb6, 0x45, 0x76, 0xf4, 0x4b);
-
-#define GUID_CLASS_INPUT GUID_DEVINTERFACE_HID
-
-#define GUID_CLASS_INPUT_STR "4D1E55B2-F16F-11CF-88CB-001111000030"
-
-
-#define HID_CTL_CODE(id) \
-  CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_NEITHER, FILE_ANY_ACCESS)
-#define HID_BUFFER_CTL_CODE(id) \
-  CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define HID_IN_CTL_CODE(id) \
-  CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_IN_DIRECT, FILE_ANY_ACCESS)
-#define HID_OUT_CTL_CODE(id) \
-  CTL_CODE (FILE_DEVICE_KEYBOARD, (id), METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-
-#define IOCTL_GET_PHYSICAL_DESCRIPTOR         HID_OUT_CTL_CODE(102)
-#define IOCTL_HID_FLUSH_QUEUE                 HID_CTL_CODE(101)
-#define IOCTL_HID_GET_COLLECTION_DESCRIPTOR   HID_CTL_CODE(100)
-#define IOCTL_HID_GET_COLLECTION_INFORMATION  HID_BUFFER_CTL_CODE(106)
-#define IOCTL_HID_GET_FEATURE                 HID_OUT_CTL_CODE(100)
-#define IOCTL_HID_GET_HARDWARE_ID             HID_OUT_CTL_CODE(103)
-#define IOCTL_HID_GET_INDEXED_STRING          HID_OUT_CTL_CODE(120)
-#define IOCTL_HID_GET_INPUT_REPORT            HID_OUT_CTL_CODE(104)
-#define IOCTL_HID_GET_MANUFACTURER_STRING     HID_OUT_CTL_CODE(110)
-#define IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS    HID_BUFFER_CTL_CODE(104)
-#define IOCTL_HID_GET_POLL_FREQUENCY_MSEC     HID_BUFFER_CTL_CODE(102)
-#define IOCTL_HID_GET_PRODUCT_STRING          HID_OUT_CTL_CODE(111)
-#define IOCTL_HID_GET_SERIALNUMBER_STRING     HID_OUT_CTL_CODE(112)
-#define IOCTL_HID_SET_FEATURE                 HID_IN_CTL_CODE(100)
-#define IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS    HID_BUFFER_CTL_CODE(105)
-#define IOCTL_HID_SET_OUTPUT_REPORT           HID_IN_CTL_CODE(101)
-#define IOCTL_HID_SET_POLL_FREQUENCY_MSEC     HID_BUFFER_CTL_CODE(103)
-
-#define IOCTL_HID_GET_DRIVER_CONFIG           HID_BUFFER_CTL_CODE(100)
-#define IOCTL_HID_SET_DRIVER_CONFIG           HID_BUFFER_CTL_CODE(101)
-#define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR     HID_OUT_CTL_CODE(121)
-
-
-enum DeviceObjectState {
-  DeviceObjectStarted = 0,
-  DeviceObjectStopped,
-  DeviceObjectRemoved
-};
-
-typedef VOID DDKAPI (*PHID_STATUS_CHANGE)(
-  PVOID  Context,
-  enum DeviceObjectState  State);
-
-typedef NTSTATUS DDKAPI (*PHIDP_GETCAPS)(
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  OUT PHIDP_CAPS  Capabilities);
-
-typedef struct _HID_COLLECTION_INFORMATION {
-  ULONG  DescriptorSize;
-  BOOLEAN  Polled;
-  UCHAR  Reserved1[1];
-  USHORT  VendorID;
-  USHORT  ProductID;
-  USHORT  VersionNumber;
-} HID_COLLECTION_INFORMATION, *PHID_COLLECTION_INFORMATION;
-
-typedef struct _HID_DRIVER_CONFIG {
-  ULONG  Size;
-  ULONG  RingBufferSize;
-} HID_DRIVER_CONFIG, *PHID_DRIVER_CONFIG;
-
-typedef struct _HID_INTERFACE_HIDPARSE {
-#if 0
-/* FIXME: COM stuff */
-#ifdef __cplusplus
-  INTERFACE  i;
-#else
-  INTERFACE;
-#endif
-#endif
-  PHIDP_GETCAPS  HidpGetCaps;
-} HID_INTERFACE_HIDPARSE, *PHID_INTERFACE_HIDPARSE;
-
-typedef struct _HID_INTERFACE_NOTIFY_PNP {
-#if 0
-/* FIXME: COM stuff */
-#ifdef __cplusplus
-  INTERFACE  i;
-#else
-  INTERFACE;
-#endif
-#endif
-  PHID_STATUS_CHANGE  StatusChangeFn;
-  PVOID  CallbackContext;
-} HID_INTERFACE_NOTIFY_PNP, *PHID_INTERFACE_NOTIFY_PNP;
-
-typedef struct _HID_XFER_PACKET {
-  PUCHAR  reportBuffer;
-  ULONG  reportBufferLen;
-  UCHAR  reportId;
-} HID_XFER_PACKET, *PHID_XFER_PACKET;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __HIDCLASS_H */
diff --git a/winsup/w32api/include/ddk/hidpi.h b/winsup/w32api/include/ddk/hidpi.h
deleted file mode 100644
index 2f8ea5732..000000000
--- a/winsup/w32api/include/ddk/hidpi.h
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * hidpi.h
- *
- * Public Interface for HID parsing library.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __HIDPI_H
-#define __HIDPI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "hidusage.h"
-
-#if defined(_HIDPI_)
-  #define HIDAPI DECLSPEC_EXPORT
-#else
-  #define HIDAPI DECLSPEC_IMPORT
-#endif
-
-typedef PUCHAR PHIDP_REPORT_DESCRIPTOR;
-typedef struct _HIDP_PREPARSED_DATA * PHIDP_PREPARSED_DATA;
-
-typedef struct _HIDP_UNKNOWN_TOKEN {
-  UCHAR  Token;
-  UCHAR  Reserved[3];
-  ULONG  BitField;
-} HIDP_UNKNOWN_TOKEN, *PHIDP_UNKNOWN_TOKEN;
-
-typedef enum _HIDP_KEYBOARD_DIRECTION {
-  HidP_Keyboard_Break,
-  HidP_Keyboard_Make
-} HIDP_KEYBOARD_DIRECTION;
-
-typedef struct _HIDP_KEYBOARD_MODIFIER_STATE {
-  _ANONYMOUS_UNION union {
-    _ANONYMOUS_STRUCT struct {
-      ULONG  LeftControl : 1;
-      ULONG  LeftShift : 1;
-      ULONG  LeftAlt : 1;
-      ULONG  LeftGUI : 1;
-      ULONG  RightControl : 1;
-      ULONG  RightShift : 1;
-      ULONG  RightAlt : 1;
-      ULONG  RigthGUI : 1;
-      ULONG  CapsLock : 1;
-      ULONG  ScollLock : 1;
-      ULONG  NumLock : 1;
-      ULONG  Reserved : 21;
-    } DUMMYSTRUCTNAME;
-    ULONG ul;
-  } DUMMYUNIONNAME;
-} HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE;
-
-typedef BOOLEAN (DDKAPI *PHIDP_INSERT_SCANCODES)(
-  IN PVOID  Context,
-  IN PCHAR  NewScanCodes,
-  IN ULONG  Length);
-
-typedef struct _USAGE_AND_PAGE {
-  USAGE  Usage;
-  USAGE  UsagePage;
-} USAGE_AND_PAGE, *PUSAGE_AND_PAGE;
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_TranslateUsageAndPagesToI8042ScanCodes(
-  IN PUSAGE_AND_PAGE  ChangedUsageList,
-  IN ULONG  UsageListLength,
-  IN HIDP_KEYBOARD_DIRECTION  KeyAction,
-  IN OUT PHIDP_KEYBOARD_MODIFIER_STATE  ModifierState,
-  IN PHIDP_INSERT_SCANCODES  InsertCodesProcedure,
-  IN PVOID  InsertCodesContext);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_TranslateUsagesToI8042ScanCodes(
-  IN PUSAGE  ChangedUsageList,
-  IN ULONG  UsageListLength,
-  IN HIDP_KEYBOARD_DIRECTION  KeyAction,
-  IN OUT PHIDP_KEYBOARD_MODIFIER_STATE  ModifierState,
-  IN PHIDP_INSERT_SCANCODES  InsertCodesProcedure,
-  IN PVOID  InsertCodesContext);
-
-typedef struct _HIDP_BUTTON_CAPS {
-  USAGE  UsagePage;
-  UCHAR  ReportID;
-  BOOLEAN  IsAlias;
-  USHORT  BitField;
-  USHORT  LinkCollection;
-  USAGE  LinkUsage;
-  USAGE  LinkUsagePage;
-  BOOLEAN  IsRange;
-  BOOLEAN  IsStringRange;
-  BOOLEAN  IsDesignatorRange;
-  BOOLEAN  IsAbsolute;
-  ULONG  Reserved[10];
-  _ANONYMOUS_UNION union {
-    struct {
-      USAGE  UsageMin, UsageMax;
-      USHORT  StringMin, StringMax;
-      USHORT  DesignatorMin, DesignatorMax;
-      USHORT  DataIndexMin, DataIndexMax;
-    } Range;
-    struct  {
-       USAGE  Usage, Reserved1;
-       USHORT  StringIndex, Reserved2;
-       USHORT  DesignatorIndex, Reserved3;
-       USHORT  DataIndex, Reserved4;
-    } NotRange;
-  } DUMMYUNIONNAME;
-} HIDP_BUTTON_CAPS, *PHIDP_BUTTON_CAPS;
-
-typedef struct _HIDP_CAPS {
-  USAGE  Usage;
-  USAGE  UsagePage;
-  USHORT  InputReportByteLength;
-  USHORT  OutputReportByteLength;
-  USHORT  FeatureReportByteLength;
-  USHORT  Reserved[17];
-  USHORT  NumberLinkCollectionNodes;
-  USHORT  NumberInputButtonCaps;
-  USHORT  NumberInputValueCaps;
-  USHORT  NumberInputDataIndices;
-  USHORT  NumberOutputButtonCaps;
-  USHORT  NumberOutputValueCaps;
-  USHORT  NumberOutputDataIndices;
-  USHORT  NumberFeatureButtonCaps;
-  USHORT  NumberFeatureValueCaps;
-  USHORT  NumberFeatureDataIndices;
-} HIDP_CAPS, *PHIDP_CAPS;
-
-typedef struct _HIDP_DATA {
-  USHORT  DataIndex;
-  USHORT  Reserved;
-  _ANONYMOUS_UNION union {
-    ULONG  RawValue;
-    BOOLEAN  On;
-  }  DUMMYUNIONNAME;
-} HIDP_DATA, *PHIDP_DATA;
-
-typedef struct _HIDP_EXTENDED_ATTRIBUTES {
-  UCHAR  NumGlobalUnknowns;
-  UCHAR  Reserved[3];
-  PHIDP_UNKNOWN_TOKEN  GlobalUnknowns;
-  ULONG  Data[1];
-} HIDP_EXTENDED_ATTRIBUTES, *PHIDP_EXTENDED_ATTRIBUTES;
-
-#define HIDP_LINK_COLLECTION_ROOT         ((USHORT) -1)
-#define HIDP_LINK_COLLECTION_UNSPECIFIED  ((USHORT) 0)
-
-typedef struct _HIDP_LINK_COLLECTION_NODE {
-  USAGE  LinkUsage;
-  USAGE  LinkUsagePage;
-  USHORT  Parent;
-  USHORT  NumberOfChildren;
-  USHORT  NextSibling;
-  USHORT  FirstChild;
-  ULONG  CollectionType: 8;
-  ULONG  IsAlias: 1;
-  ULONG  Reserved: 23;
-  PVOID  UserContext;
-} HIDP_LINK_COLLECTION_NODE, *PHIDP_LINK_COLLECTION_NODE;
-
-typedef struct _HIDP_VALUE_CAPS {
-  USAGE  UsagePage;
-  UCHAR  ReportID;
-  BOOLEAN  IsAlias;
-  USHORT  BitField;
-  USHORT  LinkCollection;
-  USAGE  LinkUsage;
-  USAGE  LinkUsagePage;
-  BOOLEAN  IsRange;
-  BOOLEAN  IsStringRange;
-  BOOLEAN  IsDesignatorRange;
-  BOOLEAN  IsAbsolute;
-  BOOLEAN  HasNull;
-  UCHAR  Reserved;
-  USHORT  BitSize;
-  USHORT  ReportCount;
-  USHORT  Reserved2[5];
-  ULONG  UnitsExp;
-  ULONG  Units;
-  LONG  LogicalMin, LogicalMax;
-  LONG  PhysicalMin, PhysicalMax;
-    _ANONYMOUS_UNION union {
-      struct {
-        USAGE  UsageMin, UsageMax;
-        USHORT  StringMin, StringMax;
-        USHORT  DesignatorMin, DesignatorMax;
-        USHORT  DataIndexMin, DataIndexMax;
-      } Range;
-      struct {
-        USAGE  Usage, Reserved1;
-        USHORT  StringIndex, Reserved2;
-        USHORT  DesignatorIndex, Reserved3;
-        USHORT  DataIndex, Reserved4;
-      } NotRange;
-    } DUMMYUNIONNAME;
-} HIDP_VALUE_CAPS, *PHIDP_VALUE_CAPS;
-
-typedef enum _HIDP_REPORT_TYPE {
-  HidP_Input,
-  HidP_Output,
-  HidP_Feature
-} HIDP_REPORT_TYPE;
-
-#define FACILITY_HID_ERROR_CODE           0x11
-
-#define HIDP_ERROR_CODES(SEV, CODE) \
-  ((NTSTATUS) (((SEV) << 28) | (FACILITY_HID_ERROR_CODE << 16) | (CODE)))
-
-#define HIDP_STATUS_SUCCESS                 (HIDP_ERROR_CODES(0x0, 0))
-#define HIDP_STATUS_NULL                    (HIDP_ERROR_CODES(0x8, 1))
-#define HIDP_STATUS_INVALID_PREPARSED_DATA  (HIDP_ERROR_CODES(0xC, 1))
-#define HIDP_STATUS_INVALID_REPORT_TYPE     (HIDP_ERROR_CODES(0xC, 2))
-#define HIDP_STATUS_INVALID_REPORT_LENGTH   (HIDP_ERROR_CODES(0xC, 3))
-#define HIDP_STATUS_USAGE_NOT_FOUND         (HIDP_ERROR_CODES(0xC, 4))
-#define HIDP_STATUS_VALUE_OUT_OF_RANGE      (HIDP_ERROR_CODES(0xC, 5))
-#define HIDP_STATUS_BAD_LOG_PHY_VALUES      (HIDP_ERROR_CODES(0xC, 6))
-#define HIDP_STATUS_BUFFER_TOO_SMALL        (HIDP_ERROR_CODES(0xC, 7))
-#define HIDP_STATUS_INTERNAL_ERROR          (HIDP_ERROR_CODES(0xC, 8))
-#define HIDP_STATUS_I8042_TRANS_UNKNOWN     (HIDP_ERROR_CODES(0xC, 9))
-#define HIDP_STATUS_INCOMPATIBLE_REPORT_ID  (HIDP_ERROR_CODES(0xC, 0xA))
-#define HIDP_STATUS_NOT_VALUE_ARRAY         (HIDP_ERROR_CODES(0xC, 0xB))
-#define HIDP_STATUS_IS_VALUE_ARRAY          (HIDP_ERROR_CODES(0xC, 0xC))
-#define HIDP_STATUS_DATA_INDEX_NOT_FOUND    (HIDP_ERROR_CODES(0xC, 0xD))
-#define HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE (HIDP_ERROR_CODES(0xC, 0xE))
-#define HIDP_STATUS_BUTTON_NOT_PRESSED      (HIDP_ERROR_CODES(0xC, 0xF))
-#define HIDP_STATUS_REPORT_DOES_NOT_EXIST   (HIDP_ERROR_CODES(0xC, 0x10))
-#define HIDP_STATUS_NOT_IMPLEMENTED         (HIDP_ERROR_CODES(0xC, 0x20))
-#define HIDP_STATUS_I8242_TRANS_UNKNOWN     HIDP_STATUS_I8042_TRANS_UNKNOWN
-
-
-
-/*
- * NTSTATUS
- * HidP_GetButtonCaps(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   OUT PHIDP_BUTTON_CAPS  ButtonCaps,
- *   IN OUT PULONG  ButtonCapsLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData);
- */
-#define HidP_GetButtonCaps(_Type_, _Caps_, _Len_, _Data_) \
-  HidP_GetSpecificButtonCaps(_Type_, 0, 0, 0, _Caps_, _Len_, _Data_)
-
-/*
- * NTSTATUS
- * HidP_GetButtons(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   IN USAGE  UsagePage,
- *   IN USHORT  LinkCollection,
- *   OUT USAGE  *UsageList,
- *   IN OUT ULONG  *UsageLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData,
- *   IN PCHAR  Report,
- *   IN ULONG  ReportLength);
- */
-#define HidP_GetButtons(Rty, UPa, LCo, ULi, ULe, Ppd, Rep, RLe) \
-  HidP_GetUsages(Rty, UPa, LCo, ULi, ULe, Ppd, Rep, RLe)
-
-#define HidP_GetButtonListLength(RTy, UPa, Ppd) \
-  HidP_GetUsageListLength(Rty, UPa, Ppd)
-
-
-/*
- * NTSTATUS
- * HidP_GetButtonsEx(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   IN USHORT  LinkCollection,
- *   OUT PUSAGE_AND_PAGE  ButtonList,
- *   IN OUT ULONG  *UsageLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData,
- *   IN PCHAR  Report,
- *   IN ULONG  ReportLength);
- */
-#define HidP_GetButtonsEx(RT, LC, BL, UL, PD, R, RL)  \
-  HidP_GetUsagesEx(RT, LC, BL, UL, PD, R, RL)
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetCaps(
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  OUT PHIDP_CAPS  Capabilities);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetData(
-  IN HIDP_REPORT_TYPE  ReportType,
-  OUT PHIDP_DATA  DataList,
-  IN OUT PULONG  DataLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetExtendedAttributes(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USHORT  DataIndex,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  OUT PHIDP_EXTENDED_ATTRIBUTES  Attributes,
-  IN OUT PULONG  LengthAttributes);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetLinkCollectionNodes(
-  OUT PHIDP_LINK_COLLECTION_NODE  LinkCollectionNodes,
-  IN OUT PULONG  LinkCollectionNodesLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetScaledUsageValue(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection  OPTIONAL,
-  IN USAGE  Usage,
-  OUT PLONG  UsageValue,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetSpecificButtonCaps(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection,
-  IN USAGE  Usage,
-  OUT PHIDP_BUTTON_CAPS  ButtonCaps,
-  IN OUT PULONG  ButtonCapsLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetSpecificValueCaps(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection,
-  IN USAGE  Usage,
-  OUT PHIDP_VALUE_CAPS  ValueCaps,
-  IN OUT PULONG  ValueCapsLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetUsages(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection  OPTIONAL,
-  OUT USAGE  *UsageList,
-  IN OUT ULONG  *UsageLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetUsagesEx(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USHORT  LinkCollection,
-  OUT PUSAGE_AND_PAGE  ButtonList,
-  IN OUT ULONG  *UsageLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetUsageValue(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection,
-  IN USAGE  Usage,
-  OUT PULONG  UsageValue,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_GetUsageValueArray(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection  OPTIONAL,
-  IN USAGE  Usage,
-  OUT PCHAR  UsageValue,
-  IN USHORT  UsageValueByteLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN PCHAR  Report,
-  IN ULONG  ReportLength);
-
-/*
- * NTSTATUS
- * HidP_GetValueCaps(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   OUT PHIDP_VALUE_CAPS  ValueCaps,
- *   IN OUT PULONG  ValueCapsLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData);
- */
-#define HidP_GetValueCaps(_Type_, _Caps_, _Len_, _Data_) \
-  HidP_GetSpecificValueCaps (_Type_, 0, 0, 0, _Caps_, _Len_, _Data_)
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_InitializeReportForID(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN UCHAR  ReportID,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
-
-/*
- * BOOLEAN
- * HidP_IsSameUsageAndPage(
- *   USAGE_AND_PAGE  u1,
- *   USAGE_AND_PAGE  u2);
- */
-#define HidP_IsSameUsageAndPage(u1, u2) ((* (PULONG) &u1) == (* (PULONG) &u2))
-
-HIDAPI
-ULONG
-DDKAPI
-HidP_MaxDataListLength(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN PHIDP_PREPARSED_DATA  PreparsedData);
-
-HIDAPI
-ULONG
-DDKAPI
-HidP_MaxUsageListLength(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage  OPTIONAL,
-  IN PHIDP_PREPARSED_DATA  PreparsedData);
-
-/*
- * NTSTATUS
- * HidP_SetButtons(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   IN USAGE  UsagePage,
- *   IN USHORT  LinkCollection,
- *   IN PUSAGE  UsageList,
- *   IN OUT PULONG  UsageLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData,
- *   IN OUT PCHAR  Report,
- *   IN ULONG  ReportLength);
- */
-#define HidP_SetButtons(RT, UP, LC, UL1, UL2, PD, R, RL) \
-  HidP_SetUsages(RT, UP, LC, UL1, UL2, PD, R, RL)
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_SetData(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN PHIDP_DATA  DataList,
-  IN OUT PULONG  DataLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_SetScaledUsageValue(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage, 
-  IN USHORT  LinkCollection  OPTIONAL,
-  IN USAGE  Usage,
-  IN LONG  UsageValue,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_SetUsages(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection, /* Optional */
-  IN PUSAGE  UsageList,
-  IN OUT PULONG  UsageLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_SetUsageValue(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection,
-  IN USAGE  Usage,
-  IN ULONG  UsageValue,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_SetUsageValueArray(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection  OPTIONAL,
-  IN USAGE  Usage,
-  IN PCHAR  UsageValue,
-  IN USHORT  UsageValueByteLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  OUT PCHAR  Report,
-  IN ULONG  ReportLength);
-
-/*
- * NTSTATUS
- * HidP_UnsetButtons(
- *   IN HIDP_REPORT_TYPE  ReportType,
- *   IN USAGE  UsagePage,
- *   IN USHORT  LinkCollection,
- *   IN PUSAGE  UsageList,
- *   IN OUT PULONG  UsageLength,
- *   IN PHIDP_PREPARSED_DATA  PreparsedData,
- *   IN OUT PCHAR  Report,
- *   IN ULONG  ReportLength);
- */
-#define HidP_UnsetButtons(RT, UP, LC, UL1, UL2, PD, R, RL) \
-  HidP_UnsetUsages(RT, UP, LC, UL1, UL2, PD, R, RL)
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_UnsetUsages(
-  IN HIDP_REPORT_TYPE  ReportType,
-  IN USAGE  UsagePage,
-  IN USHORT  LinkCollection,
-  IN PUSAGE  UsageList,
-  IN OUT PULONG  UsageLength,
-  IN PHIDP_PREPARSED_DATA  PreparsedData,
-  IN OUT PCHAR  Report,
-  IN ULONG  ReportLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_UsageAndPageListDifference(
-  IN PUSAGE_AND_PAGE  PreviousUsageList,
-  IN PUSAGE_AND_PAGE  CurrentUsageList,
-  OUT PUSAGE_AND_PAGE  BreakUsageList,
-  OUT PUSAGE_AND_PAGE  MakeUsageList,
-  IN ULONG  UsageListLength);
-
-HIDAPI
-NTSTATUS
-DDKAPI
-HidP_UsageListDifference(
-  IN PUSAGE  PreviousUsageList,
-  IN PUSAGE  CurrentUsageList,
-  OUT PUSAGE  BreakUsageList,
-  OUT PUSAGE  MakeUsageList,
-  IN ULONG  UsageListLength);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __HIDPI_H */
diff --git a/winsup/w32api/include/ddk/hidusage.h b/winsup/w32api/include/ddk/hidusage.h
deleted file mode 100644
index 1f82af98d..000000000
--- a/winsup/w32api/include/ddk/hidusage.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * hidusage.h
- *
- * HID usages
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __HIDUSAGE_H
-#define __HIDUSAGE_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef USHORT USAGE, *PUSAGE;
-
-#define HID_USAGE_GENERIC_POINTER             ((USAGE) 0x01)
-#define HID_USAGE_GENERIC_MOUSE               ((USAGE) 0x02)
-#define HID_USAGE_GENERIC_JOYSTICK            ((USAGE) 0x04)
-#define HID_USAGE_GENERIC_GAMEPAD             ((USAGE) 0x05)
-#define HID_USAGE_GENERIC_KEYBOARD            ((USAGE) 0x06)
-#define HID_USAGE_GENERIC_KEYPAD              ((USAGE) 0x07)
-#define HID_USAGE_GENERIC_SYSTEM_CTL          ((USAGE) 0x80)
-#define HID_USAGE_GENERIC_X                   ((USAGE) 0x30)
-#define HID_USAGE_GENERIC_Y                   ((USAGE) 0x31)
-#define HID_USAGE_GENERIC_Z                   ((USAGE) 0x32)
-#define HID_USAGE_GENERIC_RX                  ((USAGE) 0x33)
-#define HID_USAGE_GENERIC_RY                  ((USAGE) 0x34)
-#define HID_USAGE_GENERIC_RZ                  ((USAGE) 0x35)
-#define HID_USAGE_GENERIC_SLIDER              ((USAGE) 0x36)
-#define HID_USAGE_GENERIC_DIAL                ((USAGE) 0x37)
-#define HID_USAGE_GENERIC_WHEEL               ((USAGE) 0x38)
-#define HID_USAGE_GENERIC_HATSWITCH           ((USAGE) 0x39)
-#define HID_USAGE_GENERIC_COUNTED_BUFFER      ((USAGE) 0x3A)
-#define HID_USAGE_GENERIC_BYTE_COUNT          ((USAGE) 0x3B)
-#define HID_USAGE_GENERIC_MOTION_WAKEUP       ((USAGE) 0x3C)
-#define HID_USAGE_GENERIC_VX                  ((USAGE) 0x40)
-#define HID_USAGE_GENERIC_VY                  ((USAGE) 0x41)
-#define HID_USAGE_GENERIC_VZ                  ((USAGE) 0x42)
-#define HID_USAGE_GENERIC_VBRX                ((USAGE) 0x43)
-#define HID_USAGE_GENERIC_VBRY                ((USAGE) 0x44)
-#define HID_USAGE_GENERIC_VBRZ                ((USAGE) 0x45)
-#define HID_USAGE_GENERIC_VNO                 ((USAGE) 0x46)
-#define HID_USAGE_GENERIC_SYSCTL_POWER        ((USAGE) 0x81)
-#define HID_USAGE_GENERIC_SYSCTL_SLEEP        ((USAGE) 0x82)
-#define HID_USAGE_GENERIC_SYSCTL_WAKE         ((USAGE) 0x83)
-#define HID_USAGE_GENERIC_SYSCTL_CONTEXT_MENU ((USAGE) 0x84)
-#define HID_USAGE_GENERIC_SYSCTL_MAIN_MENU    ((USAGE) 0x85)
-#define HID_USAGE_GENERIC_SYSCTL_APP_MENU     ((USAGE) 0x86)
-#define HID_USAGE_GENERIC_SYSCTL_HELP_MENU    ((USAGE) 0x87)
-#define HID_USAGE_GENERIC_SYSCTL_MENU_EXIT    ((USAGE) 0x88)
-#define HID_USAGE_GENERIC_SYSCTL_MENU_SELECT  ((USAGE) 0x89)
-#define HID_USAGE_GENERIC_SYSCTL_MENU_RIGHT   ((USAGE) 0x8A)
-#define HID_USAGE_GENERIC_SYSCTL_MENU_LEFT    ((USAGE) 0x8B)
-#define HID_USAGE_GENERIC_SYSCTL_MENU_UP      ((USAGE) 0x8C)
-#define HID_USAGE_GENERIC_SYSCTL_MENU_DOWN    ((USAGE) 0x8D)
-
-#define HID_USAGE_KEYBOARD_NOEVENT        ((USAGE) 0x00)
-#define HID_USAGE_KEYBOARD_ROLLOVER       ((USAGE) 0x01)
-#define HID_USAGE_KEYBOARD_POSTFAIL       ((USAGE) 0x02)
-#define HID_USAGE_KEYBOARD_UNDEFINED      ((USAGE) 0x03)
-#define HID_USAGE_KEYBOARD_aA             ((USAGE) 0x04)
-#define HID_USAGE_KEYBOARD_zZ             ((USAGE) 0x1D)
-#define HID_USAGE_KEYBOARD_ONE            ((USAGE) 0x1E)
-#define HID_USAGE_KEYBOARD_ZERO           ((USAGE) 0x27)
-#define HID_USAGE_KEYBOARD_LCTRL          ((USAGE) 0xE0)
-#define HID_USAGE_KEYBOARD_LSHFT          ((USAGE) 0xE1)
-#define HID_USAGE_KEYBOARD_LALT           ((USAGE) 0xE2)
-#define HID_USAGE_KEYBOARD_LGUI           ((USAGE) 0xE3)
-#define HID_USAGE_KEYBOARD_RCTRL          ((USAGE) 0xE4)
-#define HID_USAGE_KEYBOARD_RSHFT          ((USAGE) 0xE5)
-#define HID_USAGE_KEYBOARD_RALT           ((USAGE) 0xE6)
-#define HID_USAGE_KEYBOARD_RGUI           ((USAGE) 0xE7)
-#define HID_USAGE_KEYBOARD_SCROLL_LOCK    ((USAGE) 0x47)
-#define HID_USAGE_KEYBOARD_NUM_LOCK       ((USAGE) 0x53)
-#define HID_USAGE_KEYBOARD_CAPS_LOCK      ((USAGE) 0x39)
-#define HID_USAGE_KEYBOARD_F1             ((USAGE) 0x3A)
-#define HID_USAGE_KEYBOARD_F12            ((USAGE) 0x45)
-#define HID_USAGE_KEYBOARD_RETURN         ((USAGE) 0x28)
-#define HID_USAGE_KEYBOARD_ESCAPE         ((USAGE) 0x29)
-#define HID_USAGE_KEYBOARD_DELETE         ((USAGE) 0x2A)
-#define HID_USAGE_KEYBOARD_PRINT_SCREEN   ((USAGE) 0x46)
-
-#define HID_USAGE_LED_NUM_LOCK                  ((USAGE) 0x01)
-#define HID_USAGE_LED_CAPS_LOCK                 ((USAGE) 0x02)
-#define HID_USAGE_LED_SCROLL_LOCK               ((USAGE) 0x03)
-#define HID_USAGE_LED_COMPOSE                   ((USAGE) 0x04)
-#define HID_USAGE_LED_KANA                      ((USAGE) 0x05)
-#define HID_USAGE_LED_POWER                     ((USAGE) 0x06)
-#define HID_USAGE_LED_SHIFT                     ((USAGE) 0x07)
-#define HID_USAGE_LED_DO_NOT_DISTURB            ((USAGE) 0x08)
-#define HID_USAGE_LED_MUTE                      ((USAGE) 0x09)
-#define HID_USAGE_LED_TONE_ENABLE               ((USAGE) 0x0A)
-#define HID_USAGE_LED_HIGH_CUT_FILTER           ((USAGE) 0x0B)
-#define HID_USAGE_LED_LOW_CUT_FILTER            ((USAGE) 0x0C)
-#define HID_USAGE_LED_EQUALIZER_ENABLE          ((USAGE) 0x0D)
-#define HID_USAGE_LED_SOUND_FIELD_ON            ((USAGE) 0x0E)
-#define HID_USAGE_LED_SURROUND_FIELD_ON         ((USAGE) 0x0F)
-#define HID_USAGE_LED_REPEAT                    ((USAGE) 0x10)
-#define HID_USAGE_LED_STEREO                    ((USAGE) 0x11)
-#define HID_USAGE_LED_SAMPLING_RATE_DETECT      ((USAGE) 0x12)
-#define HID_USAGE_LED_SPINNING                  ((USAGE) 0x13)
-#define HID_USAGE_LED_CAV                       ((USAGE) 0x14)
-#define HID_USAGE_LED_CLV                       ((USAGE) 0x15)
-#define HID_USAGE_LED_RECORDING_FORMAT_DET      ((USAGE) 0x16)
-#define HID_USAGE_LED_OFF_HOOK                  ((USAGE) 0x17)
-#define HID_USAGE_LED_RING                      ((USAGE) 0x18)
-#define HID_USAGE_LED_MESSAGE_WAITING           ((USAGE) 0x19)
-#define HID_USAGE_LED_DATA_MODE                 ((USAGE) 0x1A)
-#define HID_USAGE_LED_BATTERY_OPERATION         ((USAGE) 0x1B)
-#define HID_USAGE_LED_BATTERY_OK                ((USAGE) 0x1C)
-#define HID_USAGE_LED_BATTERY_LOW               ((USAGE) 0x1D)
-#define HID_USAGE_LED_SPEAKER                   ((USAGE) 0x1E)
-#define HID_USAGE_LED_HEAD_SET                  ((USAGE) 0x1F)
-#define HID_USAGE_LED_HOLD                      ((USAGE) 0x20)
-#define HID_USAGE_LED_MICROPHONE                ((USAGE) 0x21)
-#define HID_USAGE_LED_COVERAGE                  ((USAGE) 0x22)
-#define HID_USAGE_LED_NIGHT_MODE                ((USAGE) 0x23)
-#define HID_USAGE_LED_SEND_CALLS                ((USAGE) 0x24)
-#define HID_USAGE_LED_CALL_PICKUP               ((USAGE) 0x25)
-#define HID_USAGE_LED_CONFERENCE                ((USAGE) 0x26)
-#define HID_USAGE_LED_STAND_BY                  ((USAGE) 0x27)
-#define HID_USAGE_LED_CAMERA_ON                 ((USAGE) 0x28)
-#define HID_USAGE_LED_CAMERA_OFF                ((USAGE) 0x29)
-#define HID_USAGE_LED_ON_LINE                   ((USAGE) 0x2A)
-#define HID_USAGE_LED_OFF_LINE                  ((USAGE) 0x2B)
-#define HID_USAGE_LED_BUSY                      ((USAGE) 0x2C)
-#define HID_USAGE_LED_READY                     ((USAGE) 0x2D)
-#define HID_USAGE_LED_PAPER_OUT                 ((USAGE) 0x2E)
-#define HID_USAGE_LED_PAPER_JAM                 ((USAGE) 0x2F)
-#define HID_USAGE_LED_REMOTE                    ((USAGE) 0x30)
-#define HID_USAGE_LED_FORWARD                   ((USAGE) 0x31)
-#define HID_USAGE_LED_REVERSE                   ((USAGE) 0x32)
-#define HID_USAGE_LED_STOP                      ((USAGE) 0x33)
-#define HID_USAGE_LED_REWIND                    ((USAGE) 0x34)
-#define HID_USAGE_LED_FAST_FORWARD              ((USAGE) 0x35)
-#define HID_USAGE_LED_PLAY                      ((USAGE) 0x36)
-#define HID_USAGE_LED_PAUSE                     ((USAGE) 0x37)
-#define HID_USAGE_LED_RECORD                    ((USAGE) 0x38)
-#define HID_USAGE_LED_ERROR                     ((USAGE) 0x39)
-#define HID_USAGE_LED_SELECTED_INDICATOR        ((USAGE) 0x3A)
-#define HID_USAGE_LED_IN_USE_INDICATOR          ((USAGE) 0x3B)
-#define HID_USAGE_LED_MULTI_MODE_INDICATOR      ((USAGE) 0x3C)
-#define HID_USAGE_LED_INDICATOR_ON              ((USAGE) 0x3D)
-#define HID_USAGE_LED_INDICATOR_FLASH           ((USAGE) 0x3E)
-#define HID_USAGE_LED_INDICATOR_SLOW_BLINK      ((USAGE) 0x3F)
-#define HID_USAGE_LED_INDICATOR_FAST_BLINK      ((USAGE) 0x40)
-#define HID_USAGE_LED_INDICATOR_OFF             ((USAGE) 0x41)
-#define HID_USAGE_LED_FLASH_ON_TIME             ((USAGE) 0x42)
-#define HID_USAGE_LED_SLOW_BLINK_ON_TIME        ((USAGE) 0x43)
-#define HID_USAGE_LED_SLOW_BLINK_OFF_TIME       ((USAGE) 0x44)
-#define HID_USAGE_LED_FAST_BLINK_ON_TIME        ((USAGE) 0x45)
-#define HID_USAGE_LED_FAST_BLINK_OFF_TIME       ((USAGE) 0x46)
-#define HID_USAGE_LED_INDICATOR_COLOR           ((USAGE) 0x47)
-#define HID_USAGE_LED_RED                       ((USAGE) 0x48)
-#define HID_USAGE_LED_GREEN                     ((USAGE) 0x49)
-#define HID_USAGE_LED_AMBER                     ((USAGE) 0x4A)
-#define HID_USAGE_LED_GENERIC_INDICATOR         ((USAGE) 0x3B)
-
-#define HID_USAGE_PAGE_UNDEFINED          ((USAGE) 0x00)
-#define HID_USAGE_PAGE_GENERIC            ((USAGE) 0x01)
-#define HID_USAGE_PAGE_SIMULATION         ((USAGE) 0x02)
-#define HID_USAGE_PAGE_VR                 ((USAGE) 0x03)
-#define HID_USAGE_PAGE_SPORT              ((USAGE) 0x04)
-#define HID_USAGE_PAGE_GAME               ((USAGE) 0x05)
-#define HID_USAGE_PAGE_KEYBOARD           ((USAGE) 0x07)
-#define HID_USAGE_PAGE_LED                ((USAGE) 0x08)
-#define HID_USAGE_PAGE_BUTTON             ((USAGE) 0x09)
-#define HID_USAGE_PAGE_ORDINAL            ((USAGE) 0x0A)
-#define HID_USAGE_PAGE_TELEPHONY          ((USAGE) 0x0B)
-#define HID_USAGE_PAGE_CONSUMER           ((USAGE) 0x0C)
-#define HID_USAGE_PAGE_DIGITIZER          ((USAGE) 0x0D)
-#define HID_USAGE_PAGE_UNICODE            ((USAGE) 0x10)
-#define HID_USAGE_PAGE_ALPHANUMERIC       ((USAGE) 0x14)
-
-#define HID_USAGE_TELEPHONY_PHONE               ((USAGE) 0x01)
-#define HID_USAGE_TELEPHONY_ANSWERING_MACHINE   ((USAGE) 0x02)
-#define HID_USAGE_TELEPHONY_MESSAGE_CONTROLS    ((USAGE) 0x03)
-#define HID_USAGE_TELEPHONY_HANDSET             ((USAGE) 0x04)
-#define HID_USAGE_TELEPHONY_HEADSET             ((USAGE) 0x05)
-#define HID_USAGE_TELEPHONY_KEYPAD              ((USAGE) 0x06)
-#define HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON ((USAGE) 0x07)
-
-#define HID_USAGE_SIMULATION_RUDDER       ((USAGE) 0xBA)
-#define HID_USAGE_SIMULATION_THROTTLE     ((USAGE) 0xBB)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __HIDUSAGE_H */
diff --git a/winsup/w32api/include/ddk/mcd.h b/winsup/w32api/include/ddk/mcd.h
deleted file mode 100644
index 44dd26d52..000000000
--- a/winsup/w32api/include/ddk/mcd.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * mcd.h
- *
- * Media changer driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __MCD_H
-#define __MCD_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "srb.h"
-#include "scsi.h"
-#include "ntddchgr.h"
-
-#if defined(_MCD_)
-  #define CHANGERAPI DECLSPEC_EXPORT
-#else
-  #define CHANGERAPI DECLSPEC_IMPORT
-#endif
-
-#ifdef DebugPrint
-#undef DebugPrint
-#endif
-
-#if DBG
-#define DebugPrint(x) ChangerClassDebugPrint x
-#else
-#define DebugPrint(x)
-#endif
-
-#define MAXIMUM_CHANGER_INQUIRY_DATA			252
-
-CHANGERAPI
-PVOID
-DDKAPI
-ChangerClassAllocatePool(
-  IN POOL_TYPE  PoolType,
-  IN ULONG  NumberOfBytes);
-
-VOID
-ChangerClassDebugPrint(
-  ULONG  DebugPrintLevel,
-  PCCHAR  DebugMessage,
-  ...);
-
-CHANGERAPI
-PVOID
-DDKAPI
-ChangerClassFreePool(
-  IN PVOID  PoolToFree);
-
-CHANGERAPI
-NTSTATUS
-DDKAPI
-ChangerClassSendSrbSynchronous(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PSCSI_REQUEST_BLOCK  Srb,
-  IN PVOID  Buffer,
-  IN ULONG  BufferSize,
-  IN BOOLEAN  WriteToDevice);
-
-
-typedef NTSTATUS DDKAPI
-(*CHANGER_INITIALIZE)(
-  IN PDEVICE_OBJECT  DeviceObject);
-
-typedef ULONG DDKAPI
-(*CHANGER_EXTENSION_SIZE)(
-  VOID);
-
-typedef VOID DDKAPI
-(*CHANGER_ERROR_ROUTINE)(
-  PDEVICE_OBJECT  DeviceObject,
-  PSCSI_REQUEST_BLOCK  Srb,
-  NTSTATUS  *Status,
-  BOOLEAN  *Retry);
-
-typedef NTSTATUS DDKAPI
-(*CHANGER_COMMAND_ROUTINE)(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp);
-
-typedef NTSTATUS DDKAPI
-(*CHANGER_PERFORM_DIAGNOSTICS)(
-  IN PDEVICE_OBJECT  DeviceObject,
-  OUT PWMI_CHANGER_PROBLEM_DEVICE_ERROR  ChangerDeviceError);
-
-typedef struct _MCD_INIT_DATA {
-  ULONG  InitDataSize;
-  CHANGER_EXTENSION_SIZE  ChangerAdditionalExtensionSize;
-  CHANGER_INITIALIZE  ChangerInitialize;
-  CHANGER_ERROR_ROUTINE  ChangerError;
-  CHANGER_PERFORM_DIAGNOSTICS  ChangerPerformDiagnostics;
-  CHANGER_COMMAND_ROUTINE  ChangerGetParameters;
-  CHANGER_COMMAND_ROUTINE  ChangerGetStatus;
-  CHANGER_COMMAND_ROUTINE  ChangerGetProductData;
-  CHANGER_COMMAND_ROUTINE  ChangerSetAccess;
-  CHANGER_COMMAND_ROUTINE  ChangerGetElementStatus;
-  CHANGER_COMMAND_ROUTINE  ChangerInitializeElementStatus;
-  CHANGER_COMMAND_ROUTINE  ChangerSetPosition;
-  CHANGER_COMMAND_ROUTINE  ChangerExchangeMedium;
-  CHANGER_COMMAND_ROUTINE  ChangerMoveMedium;
-  CHANGER_COMMAND_ROUTINE  ChangerReinitializeUnit;
-  CHANGER_COMMAND_ROUTINE  ChangerQueryVolumeTags;
-} MCD_INIT_DATA, *PMCD_INIT_DATA;
-
-CHANGERAPI
-NTSTATUS
-DDKAPI
-ChangerClassInitialize(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PUNICODE_STRING  RegistryPath,
-  IN PMCD_INIT_DATA  MCDInitData);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MCD_H */
diff --git a/winsup/w32api/include/ddk/miniport.h b/winsup/w32api/include/ddk/miniport.h
deleted file mode 100644
index 01bbd23a6..000000000
--- a/winsup/w32api/include/ddk/miniport.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * miniport.h
- *
- * Type definitions for miniport drivers
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __MINIPORT_H
-#define __MINIPORT_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define EMULATOR_READ_ACCESS              0x01
-#define EMULATOR_WRITE_ACCESS             0x02
-
-typedef enum _EMULATOR_PORT_ACCESS_TYPE {
-	Uchar,
-	Ushort,
-	Ulong
-} EMULATOR_PORT_ACCESS_TYPE, *PEMULATOR_PORT_ACCESS_TYPE;
-
-
-typedef struct _EMULATOR_ACCESS_ENTRY {
-  ULONG  BasePort;
-  ULONG  NumConsecutivePorts;
-  EMULATOR_PORT_ACCESS_TYPE  AccessType;
-  UCHAR  AccessMode;
-  UCHAR  StringSupport;
-  PVOID  Routine;
-} EMULATOR_ACCESS_ENTRY, *PEMULATOR_ACCESS_ENTRY;
-
-#ifndef VIDEO_ACCESS_RANGE_DEFINED /* also in video.h */
-#define VIDEO_ACCESS_RANGE_DEFINED
-typedef struct _VIDEO_ACCESS_RANGE {
-  PHYSICAL_ADDRESS  RangeStart;
-  ULONG  RangeLength;
-  UCHAR  RangeInIoSpace;
-  UCHAR  RangeVisible;
-  UCHAR  RangeShareable;
-  UCHAR  RangePassive;
-} VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE;
-#endif
-
-typedef VOID DDKAPI
-(*PBANKED_SECTION_ROUTINE)(
-  IN ULONG  ReadBank,
-  IN ULONG  WriteBank,
-  IN PVOID  Context);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MINIPORT_H */
diff --git a/winsup/w32api/include/ddk/minitape.h b/winsup/w32api/include/ddk/minitape.h
deleted file mode 100644
index 7540dea62..000000000
--- a/winsup/w32api/include/ddk/minitape.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * minitape.h
- *
- * Minitape driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-#ifndef __MINITAPE_H
-#define __MINITAPE_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-#define MEDIA_ERASEABLE                   0x00000001
-#define MEDIA_WRITE_ONCE                  0x00000002
-#define MEDIA_READ_ONLY                   0x00000004
-#define MEDIA_READ_WRITE                  0x00000008
-#define MEDIA_WRITE_PROTECTED             0x00000100
-#define MEDIA_CURRENTLY_MOUNTED           0x80000000
-
-typedef enum _TAPE_STATUS {
-	TAPE_STATUS_SEND_SRB_AND_CALLBACK,
-	TAPE_STATUS_CALLBACK,
-	TAPE_STATUS_CHECK_TEST_UNIT_READY,
-	TAPE_STATUS_SUCCESS,
-	TAPE_STATUS_INSUFFICIENT_RESOURCES,
-	TAPE_STATUS_NOT_IMPLEMENTED,
-	TAPE_STATUS_INVALID_DEVICE_REQUEST,
-	TAPE_STATUS_INVALID_PARAMETER,	
-	TAPE_STATUS_MEDIA_CHANGED,
-	TAPE_STATUS_BUS_RESET,
-	TAPE_STATUS_SETMARK_DETECTED,
-	TAPE_STATUS_FILEMARK_DETECTED,
-	TAPE_STATUS_BEGINNING_OF_MEDIA,
-	TAPE_STATUS_END_OF_MEDIA,
-	TAPE_STATUS_BUFFER_OVERFLOW,
-	TAPE_STATUS_NO_DATA_DETECTED,
-	TAPE_STATUS_EOM_OVERFLOW,
-	TAPE_STATUS_NO_MEDIA,
-	TAPE_STATUS_IO_DEVICE_ERROR,
-	TAPE_STATUS_UNRECOGNIZED_MEDIA,
-	TAPE_STATUS_DEVICE_NOT_READY,
-	TAPE_STATUS_MEDIA_WRITE_PROTECTED,
-	TAPE_STATUS_DEVICE_DATA_ERROR,
-	TAPE_STATUS_NO_SUCH_DEVICE,
-	TAPE_STATUS_INVALID_BLOCK_LENGTH,
-	TAPE_STATUS_IO_TIMEOUT,
-	TAPE_STATUS_DEVICE_NOT_CONNECTED,
-	TAPE_STATUS_DATA_OVERRUN,
-	TAPE_STATUS_DEVICE_BUSY,
-	TAPE_STATUS_REQUIRES_CLEANING,
-	TAPE_STATUS_CLEANER_CARTRIDGE_INSTALLED
-} TAPE_STATUS, *PTAPE_STATUS;
-
-#define INQUIRYDATABUFFERSIZE 36
-#ifndef _INQUIRYDATA_DEFINED /* also in scsi.h */
-#define _INQUIRYDATA_DEFINED
-typedef struct _INQUIRYDATA {
-	UCHAR  DeviceType : 5;
-	UCHAR  DeviceTypeQualifier : 3;
-	UCHAR  DeviceTypeModifier : 7;
-	UCHAR  RemovableMedia : 1;
-	union {
-		UCHAR  Versions;
-		struct {
-			UCHAR  ANSIVersion : 3;
-			UCHAR  ECMAVersion : 3;
-			UCHAR  ISOVersion : 2;
-		};
-	};
-	UCHAR  ResponseDataFormat : 4;
-	UCHAR  HiSupport : 1;
-	UCHAR  NormACA : 1;
-	UCHAR  TerminateTask : 1;
-	UCHAR  AERC : 1;
-	UCHAR  AdditionalLength;
-	UCHAR  Reserved;
-	UCHAR  Addr16 : 1;
-	UCHAR  Addr32 : 1;
-	UCHAR  AckReqQ: 1;
-	UCHAR  MediumChanger : 1;
-	UCHAR  MultiPort : 1;
-	UCHAR  ReservedBit2 : 1;
-	UCHAR  EnclosureServices : 1;
-	UCHAR  ReservedBit3 : 1;
-	UCHAR  SoftReset : 1;
-	UCHAR  CommandQueue : 1;
-	UCHAR  TransferDisable : 1;
-	UCHAR  LinkedCommands : 1;
-	UCHAR  Synchronous : 1;
-	UCHAR  Wide16Bit : 1;
-	UCHAR  Wide32Bit : 1;
-	UCHAR  RelativeAddressing : 1;
-	UCHAR  VendorId[8];
-	UCHAR  ProductId[16];
-	UCHAR  ProductRevisionLevel[4];
-	UCHAR  VendorSpecific[20];
-	UCHAR  Reserved3[40];
-} INQUIRYDATA, *PINQUIRYDATA;
-#endif
-
-typedef struct _MODE_CAPABILITIES_PAGE {
-	UCHAR PageCode : 6;
-	UCHAR Reserved1 : 2;
-	UCHAR PageLength;
-	UCHAR Reserved2[2];
-	UCHAR RO : 1;
-	UCHAR Reserved3 : 4;
-	UCHAR SPREV : 1;
-	UCHAR Reserved4 : 2;
-	UCHAR Reserved5 : 3;
-	UCHAR EFMT : 1;
-	UCHAR Reserved6 : 1;
-	UCHAR QFA : 1;
-	UCHAR Reserved7 : 2;
-	UCHAR LOCK : 1;
-	UCHAR LOCKED : 1;
-	UCHAR PREVENT : 1;
-	UCHAR UNLOAD : 1;
-	UCHAR Reserved8 : 2;
-	UCHAR ECC : 1;
-	UCHAR CMPRS : 1;
-	UCHAR Reserved9 : 1;
-	UCHAR BLK512 : 1;
-	UCHAR BLK1024 : 1;
-	UCHAR Reserved10 : 4;
-	UCHAR SLOWB : 1;
-	UCHAR MaximumSpeedSupported[2];
-	UCHAR MaximumStoredDefectedListEntries[2];
-	UCHAR ContinuousTransferLimit[2];
-	UCHAR CurrentSpeedSelected[2];
-	UCHAR BufferSize[2];
-	UCHAR Reserved11[2];
-} MODE_CAPABILITIES_PAGE, *PMODE_CAPABILITIES_PAGE;
-
-typedef BOOLEAN DDKAPI
-(*TAPE_VERIFY_INQUIRY_ROUTINE)(
-	IN PINQUIRYDATA  InquiryData,
-	IN PMODE_CAPABILITIES_PAGE ModeCapabilitiesPage);
-
-typedef VOID DDKAPI
-(*TAPE_EXTENSION_INIT_ROUTINE)(
-  IN PVOID  MinitapeExtension,
-  IN PINQUIRYDATA  InquiryData,
-  IN PMODE_CAPABILITIES_PAGE  ModeCapabilitiesPage);
-
-typedef VOID DDKAPI
-(*TAPE_ERROR_ROUTINE)(
-    IN PVOID  MinitapeExtension,
-    IN PSCSI_REQUEST_BLOCK  Srb,
-    IN OUT PTAPE_STATUS  TapeStatus);
-
-typedef TAPE_STATUS DDKAPI
-(*TAPE_PROCESS_COMMAND_ROUTINE)(
-  IN OUT PVOID  MinitapeExtension,
-  IN OUT PVOID  CommandExtension,
-  IN OUT PVOID  CommandParameters,
-  IN OUT PSCSI_REQUEST_BLOCK  Srb,
-  IN ULONG  CallNumber,
-  IN TAPE_STATUS  StatusOfLastCommand,
-  IN OUT PULONG  RetryFlags);
-
-#define TAPE_RETRY_MASK                   0x0000FFFF
-#define IGNORE_ERRORS                     0x00010000
-#define RETURN_ERRORS                     0x00020000
-
-typedef struct _TAPE_INIT_DATA { 
-  TAPE_VERIFY_INQUIRY_ROUTINE  VerifyInquiry;
-  BOOLEAN  QueryModeCapabilitiesPage; 
-  ULONG  MinitapeExtensionSize; 
-  TAPE_EXTENSION_INIT_ROUTINE  ExtensionInit;
-  ULONG  DefaultTimeOutValue;
-  TAPE_ERROR_ROUTINE  TapeError;
-  ULONG  CommandExtensionSize;
-  TAPE_PROCESS_COMMAND_ROUTINE  CreatePartition; 
-  TAPE_PROCESS_COMMAND_ROUTINE  Erase; 
-  TAPE_PROCESS_COMMAND_ROUTINE  GetDriveParameters; 
-  TAPE_PROCESS_COMMAND_ROUTINE  GetMediaParameters; 
-  TAPE_PROCESS_COMMAND_ROUTINE  GetPosition; 
-  TAPE_PROCESS_COMMAND_ROUTINE  GetStatus; 
-  TAPE_PROCESS_COMMAND_ROUTINE  Prepare; 
-  TAPE_PROCESS_COMMAND_ROUTINE  SetDriveParameters; 
-  TAPE_PROCESS_COMMAND_ROUTINE  SetMediaParameters; 
-  TAPE_PROCESS_COMMAND_ROUTINE  SetPosition; 
-  TAPE_PROCESS_COMMAND_ROUTINE  WriteMarks; 
-  TAPE_PROCESS_COMMAND_ROUTINE  PreProcessReadWrite; /* optional */
-} TAPE_INIT_DATA, *PTAPE_INIT_DATA; 
-
-typedef struct _TAPE_PHYS_POSITION {
-	ULONG  SeekBlockAddress;
-	ULONG  SpaceBlockCount;
-} TAPE_PHYS_POSITION, PTAPE_PHYS_POSITION;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MINITAPE_H */
diff --git a/winsup/w32api/include/ddk/mountdev.h b/winsup/w32api/include/ddk/mountdev.h
deleted file mode 100644
index d22d9be7e..000000000
--- a/winsup/w32api/include/ddk/mountdev.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * mountdev.h
- *
- * Mount point manager/mounted devices interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __MOUNTDEV_H
-#define __MOUNTDEV_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "mountmgr.h"
-
-
-#define IOCTL_MOUNTDEV_QUERY_DEVICE_NAME \
-  CTL_CODE(MOUNTDEVCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_MOUNTDEV_QUERY_UNIQUE_ID \
-  CTL_CODE(MOUNTDEVCONTROLTYPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY \
-  CTL_CODE(MOUNTDEVCONTROLTYPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME \
-  CTL_CODE(MOUNTDEVCONTROLTYPE, 3, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_MOUNTDEV_LINK_CREATED \
-  CTL_CODE(MOUNTDEVCONTROLTYPE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_MOUNTDEV_LINK_DELETED \
-  CTL_CODE(MOUNTDEVCONTROLTYPE, 5, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-
-typedef struct _MOUNTDEV_SUGGESTED_LINK_NAME {
-  BOOLEAN  UseOnlyIfThereAreNoOtherLinks;
-  USHORT  NameLength;
-  WCHAR  Name[1];
-} MOUNTDEV_SUGGESTED_LINK_NAME, *PMOUNTDEV_SUGGESTED_LINK_NAME;
-
-typedef struct _MOUNTDEV_UNIQUE_ID {
-  USHORT  UniqueIdLength;
-  UCHAR  UniqueId[1];
-} MOUNTDEV_UNIQUE_ID, *PMOUNTDEV_UNIQUE_ID;
-
-typedef struct _MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT {
-  ULONG  Size;
-  USHORT  OldUniqueIdOffset;
-  USHORT  OldUniqueIdLength;
-  USHORT  NewUniqueIdOffset;
-  USHORT  NewUniqueIdLength;
-} MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MOUNTDEV_H */
diff --git a/winsup/w32api/include/ddk/mountmgr.h b/winsup/w32api/include/ddk/mountmgr.h
deleted file mode 100644
index ec5241c14..000000000
--- a/winsup/w32api/include/ddk/mountmgr.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * mountmgr.h
- *
- * Mount point manager interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __MOUNTMGR_H
-#define __MOUNTMGR_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-DEFINE_GUID(MOUNTDEV_MOUNTED_DEVICE_GUID,
-	0x53f5630d, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-#define MOUNTMGRCONTROLTYPE  							((ULONG)'m')
-#define MOUNTDEVCONTROLTYPE  							((ULONG)'M')
-
-#define MOUNTMGR_DEVICE_NAME              L"\\Device\\MountPointManager"
-#define MOUNTMGR_DOS_DEVICE_NAME          L"\\\\.\\MountPointManager"
-
-#define IOCTL_MOUNTMGR_CREATE_POINT \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 0, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_MOUNTMGR_QUERY_POINTS \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_MOUNTMGR_DELETE_POINTS \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 1, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 4, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_MOUNTMGR_AUTO_DL_ASSIGNMENTS \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 5, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 6, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 7, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_MOUNTMGR_CHANGE_NOTIFY \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 8, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_MOUNTMGR_KEEP_LINKS_WHEN_OFFLINE \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 9, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_MOUNTMGR_CHECK_UNPROCESSED_VOLUMES \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 10, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION \
-  CTL_CODE(MOUNTMGRCONTROLTYPE, 11, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-
-typedef struct _MOUNTDEV_NAME {
-  USHORT  NameLength;
-  WCHAR  Name[1];
-} MOUNTDEV_NAME, *PMOUNTDEV_NAME;
-
-typedef struct _MOUNTMGR_CHANGE_NOTIFY_INFO {
-  ULONG  EpicNumber;
-} MOUNTMGR_CHANGE_NOTIFY_INFO, *PMOUNTMGR_CHANGE_NOTIFY_INFO;
-
-typedef struct _MOUNTMGR_CREATE_POINT_INPUT {
-  USHORT  SymbolicLinkNameOffset;
-  USHORT  SymbolicLinkNameLength;
-  USHORT  DeviceNameOffset;
-  USHORT  DeviceNameLength;
-} MOUNTMGR_CREATE_POINT_INPUT, *PMOUNTMGR_CREATE_POINT_INPUT;
-
-typedef struct _MOUNTMGR_DRIVE_LETTER_INFORMATION {
-  BOOLEAN  DriveLetterWasAssigned;
-  UCHAR  CurrentDriveLetter;
-} MOUNTMGR_DRIVE_LETTER_INFORMATION, *PMOUNTMGR_DRIVE_LETTER_INFORMATION;
-
-typedef struct _MOUNTMGR_DRIVE_LETTER_TARGET {
-  USHORT  DeviceNameLength;
-  WCHAR  DeviceName[1];
-} MOUNTMGR_DRIVE_LETTER_TARGET, *PMOUNTMGR_DRIVE_LETTER_TARGET;
-
-typedef struct _MOUNTMGR_MOUNT_POINT {
-  ULONG  SymbolicLinkNameOffset;
-  USHORT  SymbolicLinkNameLength;
-  ULONG  UniqueIdOffset;
-  USHORT  UniqueIdLength;
-  ULONG  DeviceNameOffset;
-  USHORT  DeviceNameLength;
-} MOUNTMGR_MOUNT_POINT, *PMOUNTMGR_MOUNT_POINT;
-
-typedef struct _MOUNTMGR_MOUNT_POINTS {
-  ULONG  Size;
-  ULONG  NumberOfMountPoints;
-  MOUNTMGR_MOUNT_POINT  MountPoints[1];
-} MOUNTMGR_MOUNT_POINTS, *PMOUNTMGR_MOUNT_POINTS;
-
-typedef struct _MOUNTMGR_TARGET_NAME {
-  USHORT  DeviceNameLength;
-  WCHAR  DeviceName[1];
-} MOUNTMGR_TARGET_NAME, *PMOUNTMGR_TARGET_NAME;
-
-typedef struct _MOUNTMGR_VOLUME_MOUNT_POINT {
-  USHORT  SourceVolumeNameOffset;
-  USHORT  SourceVolumeNameLength;
-  USHORT  TargetVolumeNameOffset;
-  USHORT  TargetVolumeNameLength;
-} MOUNTMGR_VOLUME_MOUNT_POINT, *PMOUNTMGR_VOLUME_MOUNT_POINT;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MOUNTMGR_H */
diff --git a/winsup/w32api/include/ddk/ndis.h b/winsup/w32api/include/ddk/ndis.h
deleted file mode 100644
index 216249df4..000000000
--- a/winsup/w32api/include/ddk/ndis.h
+++ /dev/null
@@ -1,5189 +0,0 @@
-/*
- * ndis.h
- *
- * Network Device Interface Specification definitions
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * DEFINES: i386                 - Target platform is i386
- *          _NDIS_               - Define only for NDIS library
- *          NDIS_MINIPORT_DRIVER - Define only for NDIS miniport drivers
- *          NDIS40               - Use NDIS 4.0 structures by default
- *          NDIS50               - Use NDIS 5.0 structures by default
- *          NDIS50_MINIPORT      - Building NDIS 5.0 miniport driver
- *          NDIS51_MINIPORT      - Building NDIS 5.1 miniport driver
- */
-#ifndef __NDIS_H
-#define __NDIS_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "ntddndis.h"
-#include "netpnp.h"
-#include "netevent.h"
-#include <winsock2.h>
-
-#if defined(_NDIS_)
-  #define NDISAPI DECLSPEC_EXPORT
-#else
-  #define NDISAPI DECLSPEC_IMPORT
-#endif
-
-#if defined(NDIS50_MINIPORT)
-#ifndef NDIS50
-#define NDIS50
-#endif
-#endif /* NDIS50_MINIPORT */
-
-#if defined(NDIS51_MINIPORT)
-#ifndef NDIS51
-#define NDIS51
-#endif
-#endif /* NDIS51_MINIPORT */
-
-/* NDIS 3.0 is default */
-#if !defined(NDIS30) || !defined(NDIS40) || !defined(NDIS50) || !defined(NDIS51)
-#define NDIS30
-#endif /* !NDIS30 || !NDIS40 || !NDIS50 || !NDIS51 */
-
-#if 1
-/* FIXME: */
-typedef PVOID QUEUED_CLOSE;
-#endif
-
-typedef ULONG NDIS_OID, *PNDIS_OID;
-
-typedef struct _X_FILTER FDDI_FILTER, *PFDDI_FILTER;
-typedef struct _X_FILTER TR_FILTER, *PTR_FILTER;
-typedef struct _X_FILTER NULL_FILTER, *PNULL_FILTER;
-
-typedef struct _REFERENCE {
-	KSPIN_LOCK  SpinLock;
-	USHORT  ReferenceCount;
-	BOOLEAN  Closing;
-} REFERENCE, * PREFERENCE;
-
-
-/* NDIS base types */
-
-typedef struct _NDIS_SPIN_LOCK {
-  KSPIN_LOCK  SpinLock;
-  KIRQL  OldIrql;
-} NDIS_SPIN_LOCK, * PNDIS_SPIN_LOCK;
-
-typedef struct _NDIS_EVENT {
-  KEVENT  Event;
-} NDIS_EVENT, *PNDIS_EVENT;
-
-typedef PVOID NDIS_HANDLE, *PNDIS_HANDLE;
-typedef int NDIS_STATUS, *PNDIS_STATUS;
-
-typedef ANSI_STRING NDIS_ANSI_STRING, *PNDIS_ANSI_STRING;
-typedef UNICODE_STRING NDIS_STRING, *PNDIS_STRING;
-
-typedef MDL NDIS_BUFFER, *PNDIS_BUFFER;
-typedef ULONG NDIS_ERROR_CODE, *PNDIS_ERROR_CODE;
-
-
-/* NDIS_STATUS constants */
-#define NDIS_STATUS_SUCCESS                     ((NDIS_STATUS)STATUS_SUCCESS)
-#define NDIS_STATUS_PENDING                     ((NDIS_STATUS)STATUS_PENDING)
-#define NDIS_STATUS_NOT_RECOGNIZED              ((NDIS_STATUS)0x00010001L)
-#define NDIS_STATUS_NOT_COPIED                  ((NDIS_STATUS)0x00010002L)
-#define NDIS_STATUS_NOT_ACCEPTED                ((NDIS_STATUS)0x00010003L)
-#define NDIS_STATUS_CALL_ACTIVE                 ((NDIS_STATUS)0x00010007L)
-#define NDIS_STATUS_ONLINE                      ((NDIS_STATUS)0x40010003L)
-#define NDIS_STATUS_RESET_START                 ((NDIS_STATUS)0x40010004L)
-#define NDIS_STATUS_RESET_END                   ((NDIS_STATUS)0x40010005L)
-#define NDIS_STATUS_RING_STATUS                 ((NDIS_STATUS)0x40010006L)
-#define NDIS_STATUS_CLOSED                      ((NDIS_STATUS)0x40010007L)
-#define NDIS_STATUS_WAN_LINE_UP                 ((NDIS_STATUS)0x40010008L)
-#define NDIS_STATUS_WAN_LINE_DOWN               ((NDIS_STATUS)0x40010009L)
-#define NDIS_STATUS_WAN_FRAGMENT                ((NDIS_STATUS)0x4001000AL)
-#define	NDIS_STATUS_MEDIA_CONNECT               ((NDIS_STATUS)0x4001000BL)
-#define	NDIS_STATUS_MEDIA_DISCONNECT            ((NDIS_STATUS)0x4001000CL)
-#define NDIS_STATUS_HARDWARE_LINE_UP            ((NDIS_STATUS)0x4001000DL)
-#define NDIS_STATUS_HARDWARE_LINE_DOWN          ((NDIS_STATUS)0x4001000EL)
-#define NDIS_STATUS_INTERFACE_UP                ((NDIS_STATUS)0x4001000FL)
-#define NDIS_STATUS_INTERFACE_DOWN              ((NDIS_STATUS)0x40010010L)
-#define NDIS_STATUS_MEDIA_BUSY                  ((NDIS_STATUS)0x40010011L)
-#define NDIS_STATUS_MEDIA_SPECIFIC_INDICATION   ((NDIS_STATUS)0x40010012L)
-#define NDIS_STATUS_WW_INDICATION               NDIS_STATUS_MEDIA_SPECIFIC_INDICATION
-#define NDIS_STATUS_LINK_SPEED_CHANGE           ((NDIS_STATUS)0x40010013L)
-#define NDIS_STATUS_WAN_GET_STATS               ((NDIS_STATUS)0x40010014L)
-#define NDIS_STATUS_WAN_CO_FRAGMENT             ((NDIS_STATUS)0x40010015L)
-#define NDIS_STATUS_WAN_CO_LINKPARAMS           ((NDIS_STATUS)0x40010016L)
-
-#define NDIS_STATUS_NOT_RESETTABLE              ((NDIS_STATUS)0x80010001L)
-#define NDIS_STATUS_SOFT_ERRORS	                ((NDIS_STATUS)0x80010003L)
-#define NDIS_STATUS_HARD_ERRORS                 ((NDIS_STATUS)0x80010004L)
-#define NDIS_STATUS_BUFFER_OVERFLOW	            ((NDIS_STATUS)STATUS_BUFFER_OVERFLOW)
-
-#define NDIS_STATUS_FAILURE	                    ((NDIS_STATUS)STATUS_UNSUCCESSFUL)
-#define NDIS_STATUS_RESOURCES                   ((NDIS_STATUS)STATUS_INSUFFICIENT_RESOURCES)
-#define NDIS_STATUS_CLOSING	                    ((NDIS_STATUS)0xC0010002L)
-#define NDIS_STATUS_BAD_VERSION	                ((NDIS_STATUS)0xC0010004L)
-#define NDIS_STATUS_BAD_CHARACTERISTICS         ((NDIS_STATUS)0xC0010005L)
-#define NDIS_STATUS_ADAPTER_NOT_FOUND           ((NDIS_STATUS)0xC0010006L)
-#define NDIS_STATUS_OPEN_FAILED	                ((NDIS_STATUS)0xC0010007L)
-#define NDIS_STATUS_DEVICE_FAILED               ((NDIS_STATUS)0xC0010008L)
-#define NDIS_STATUS_MULTICAST_FULL              ((NDIS_STATUS)0xC0010009L)
-#define NDIS_STATUS_MULTICAST_EXISTS            ((NDIS_STATUS)0xC001000AL)
-#define NDIS_STATUS_MULTICAST_NOT_FOUND	        ((NDIS_STATUS)0xC001000BL)
-#define NDIS_STATUS_REQUEST_ABORTED	            ((NDIS_STATUS)0xC001000CL)
-#define NDIS_STATUS_RESET_IN_PROGRESS           ((NDIS_STATUS)0xC001000DL)
-#define NDIS_STATUS_CLOSING_INDICATING          ((NDIS_STATUS)0xC001000EL)
-#define NDIS_STATUS_NOT_SUPPORTED               ((NDIS_STATUS)STATUS_NOT_SUPPORTED)
-#define NDIS_STATUS_INVALID_PACKET              ((NDIS_STATUS)0xC001000FL)
-#define NDIS_STATUS_OPEN_LIST_FULL              ((NDIS_STATUS)0xC0010010L)
-#define NDIS_STATUS_ADAPTER_NOT_READY           ((NDIS_STATUS)0xC0010011L)
-#define NDIS_STATUS_ADAPTER_NOT_OPEN            ((NDIS_STATUS)0xC0010012L)
-#define NDIS_STATUS_NOT_INDICATING              ((NDIS_STATUS)0xC0010013L)
-#define NDIS_STATUS_INVALID_LENGTH              ((NDIS_STATUS)0xC0010014L)
-#define NDIS_STATUS_INVALID_DATA                ((NDIS_STATUS)0xC0010015L)
-#define NDIS_STATUS_BUFFER_TOO_SHORT            ((NDIS_STATUS)0xC0010016L)
-#define NDIS_STATUS_INVALID_OID	                ((NDIS_STATUS)0xC0010017L)
-#define NDIS_STATUS_ADAPTER_REMOVED	            ((NDIS_STATUS)0xC0010018L)
-#define NDIS_STATUS_UNSUPPORTED_MEDIA           ((NDIS_STATUS)0xC0010019L)
-#define NDIS_STATUS_GROUP_ADDRESS_IN_USE        ((NDIS_STATUS)0xC001001AL)
-#define NDIS_STATUS_FILE_NOT_FOUND              ((NDIS_STATUS)0xC001001BL)
-#define NDIS_STATUS_ERROR_READING_FILE          ((NDIS_STATUS)0xC001001CL)
-#define NDIS_STATUS_ALREADY_MAPPED              ((NDIS_STATUS)0xC001001DL)
-#define NDIS_STATUS_RESOURCE_CONFLICT           ((NDIS_STATUS)0xC001001EL)
-#define NDIS_STATUS_NO_CABLE                    ((NDIS_STATUS)0xC001001FL)
-
-#define NDIS_STATUS_INVALID_SAP	                ((NDIS_STATUS)0xC0010020L)
-#define NDIS_STATUS_SAP_IN_USE                  ((NDIS_STATUS)0xC0010021L)
-#define NDIS_STATUS_INVALID_ADDRESS             ((NDIS_STATUS)0xC0010022L)
-#define NDIS_STATUS_VC_NOT_ACTIVATED            ((NDIS_STATUS)0xC0010023L)
-#define NDIS_STATUS_DEST_OUT_OF_ORDER           ((NDIS_STATUS)0xC0010024L)
-#define NDIS_STATUS_VC_NOT_AVAILABLE            ((NDIS_STATUS)0xC0010025L)
-#define NDIS_STATUS_CELLRATE_NOT_AVAILABLE      ((NDIS_STATUS)0xC0010026L)
-#define NDIS_STATUS_INCOMPATABLE_QOS            ((NDIS_STATUS)0xC0010027L)
-#define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED      ((NDIS_STATUS)0xC0010028L)
-#define NDIS_STATUS_NO_ROUTE_TO_DESTINATION     ((NDIS_STATUS)0xC0010029L)
-
-#define NDIS_STATUS_TOKEN_RING_OPEN_ERROR       ((NDIS_STATUS)0xC0011000L)
-#define NDIS_STATUS_INVALID_DEVICE_REQUEST      ((NDIS_STATUS)STATUS_INVALID_DEVICE_REQUEST)
-#define NDIS_STATUS_NETWORK_UNREACHABLE         ((NDIS_STATUS)STATUS_NETWORK_UNREACHABLE)
-
-
-/* NDIS error codes for error logging */
-
-#define NDIS_ERROR_CODE_RESOURCE_CONFLICT			            EVENT_NDIS_RESOURCE_CONFLICT
-#define NDIS_ERROR_CODE_OUT_OF_RESOURCES			            EVENT_NDIS_OUT_OF_RESOURCE
-#define NDIS_ERROR_CODE_HARDWARE_FAILURE			            EVENT_NDIS_HARDWARE_FAILURE
-#define NDIS_ERROR_CODE_ADAPTER_NOT_FOUND			            EVENT_NDIS_ADAPTER_NOT_FOUND
-#define NDIS_ERROR_CODE_INTERRUPT_CONNECT			            EVENT_NDIS_INTERRUPT_CONNECT
-#define NDIS_ERROR_CODE_DRIVER_FAILURE				            EVENT_NDIS_DRIVER_FAILURE
-#define NDIS_ERROR_CODE_BAD_VERSION					              EVENT_NDIS_BAD_VERSION
-#define NDIS_ERROR_CODE_TIMEOUT						                EVENT_NDIS_TIMEOUT
-#define NDIS_ERROR_CODE_NETWORK_ADDRESS				            EVENT_NDIS_NETWORK_ADDRESS
-#define NDIS_ERROR_CODE_UNSUPPORTED_CONFIGURATION	        EVENT_NDIS_UNSUPPORTED_CONFIGURATION
-#define NDIS_ERROR_CODE_INVALID_VALUE_FROM_ADAPTER	      EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER
-#define NDIS_ERROR_CODE_MISSING_CONFIGURATION_PARAMETER	  EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER
-#define NDIS_ERROR_CODE_BAD_IO_BASE_ADDRESS			          EVENT_NDIS_BAD_IO_BASE_ADDRESS
-#define NDIS_ERROR_CODE_RECEIVE_SPACE_SMALL			          EVENT_NDIS_RECEIVE_SPACE_SMALL
-#define NDIS_ERROR_CODE_ADAPTER_DISABLED			            EVENT_NDIS_ADAPTER_DISABLED
-
-
-/* Memory allocation flags. Used by Ndis[Allocate|Free]Memory */
-#define NDIS_MEMORY_CONTIGUOUS            0x00000001
-#define NDIS_MEMORY_NONCACHED             0x00000002
-
-/* NIC attribute flags. Used by NdisMSetAttributes(Ex) */
-#define	NDIS_ATTRIBUTE_IGNORE_PACKET_TIMEOUT    0x00000001
-#define NDIS_ATTRIBUTE_IGNORE_REQUEST_TIMEOUT   0x00000002
-#define NDIS_ATTRIBUTE_IGNORE_TOKEN_RING_ERRORS 0x00000004
-#define NDIS_ATTRIBUTE_BUS_MASTER               0x00000008
-#define NDIS_ATTRIBUTE_INTERMEDIATE_DRIVER      0x00000010
-#define NDIS_ATTRIBUTE_DESERIALIZE              0x00000020
-#define NDIS_ATTRIBUTE_NO_HALT_ON_SUSPEND       0x00000040
-#define NDIS_ATTRIBUTE_SURPRISE_REMOVE_OK       0x00000080
-#define NDIS_ATTRIBUTE_NOT_CO_NDIS              0x00000100
-#define NDIS_ATTRIBUTE_USES_SAFE_BUFFER_APIS    0x00000200
-
-
-/* Lock */
-
-typedef union _NDIS_RW_LOCK_REFCOUNT {
-  UINT  RefCount;
-  UCHAR  cacheLine[16];
-} NDIS_RW_LOCK_REFCOUNT;
-
-typedef struct _NDIS_RW_LOCK {
-  union {
-    struct {
-      KSPIN_LOCK  SpinLock;
-      PVOID  Context;
-    } s;
-    UCHAR  Reserved[16];
-  } u;
-
-  NDIS_RW_LOCK_REFCOUNT  RefCount[MAXIMUM_PROCESSORS];
-} NDIS_RW_LOCK, *PNDIS_RW_LOCK;
-
-typedef struct _LOCK_STATE {
-  USHORT  LockState;
-  KIRQL  OldIrql;
-} LOCK_STATE, *PLOCK_STATE;
-
-
-
-/* Timer */
-
-typedef VOID DDKAPI
-(*PNDIS_TIMER_FUNCTION)(
-	IN PVOID  SystemSpecific1,
-	IN PVOID  FunctionContext,
-	IN PVOID  SystemSpecific2,
-	IN PVOID  SystemSpecific3);
-
-typedef struct _NDIS_TIMER {
-  KTIMER  Timer;
-  KDPC  Dpc;
-} NDIS_TIMER, *PNDIS_TIMER;
-
-
-
-/* Hardware */
-
-typedef CM_MCA_POS_DATA NDIS_MCA_POS_DATA, *PNDIS_MCA_POS_DATA;
-typedef CM_EISA_SLOT_INFORMATION NDIS_EISA_SLOT_INFORMATION, *PNDIS_EISA_SLOT_INFORMATION;
-typedef CM_EISA_FUNCTION_INFORMATION NDIS_EISA_FUNCTION_INFORMATION, *PNDIS_EISA_FUNCTION_INFORMATION;
-typedef CM_PARTIAL_RESOURCE_LIST NDIS_RESOURCE_LIST, *PNDIS_RESOURCE_LIST;
-
-/* Hardware status codes (OID_GEN_HARDWARE_STATUS) */
-typedef enum _NDIS_HARDWARE_STATUS {
-  NdisHardwareStatusReady,
-  NdisHardwareStatusInitializing,
-  NdisHardwareStatusReset,
-  NdisHardwareStatusClosing,
-  NdisHardwareStatusNotReady
-} NDIS_HARDWARE_STATUS, *PNDIS_HARDWARE_STATUS;
-
-/* OID_GEN_GET_TIME_CAPS */
-typedef struct _GEN_GET_TIME_CAPS {
-  ULONG  Flags;
-  ULONG  ClockPrecision;
-} GEN_GET_TIME_CAPS, *PGEN_GET_TIME_CAPS;
-
-/* Flag bits */
-#define	READABLE_LOCAL_CLOCK                    0x00000001
-#define	CLOCK_NETWORK_DERIVED                   0x00000002
-#define	CLOCK_PRECISION                         0x00000004
-#define	RECEIVE_TIME_INDICATION_CAPABLE         0x00000008
-#define	TIMED_SEND_CAPABLE                      0x00000010
-#define	TIME_STAMP_CAPABLE                      0x00000020
-
-/* OID_GEN_GET_NETCARD_TIME */
-typedef struct _GEN_GET_NETCARD_TIME {
-  ULONGLONG  ReadTime;
-} GEN_GET_NETCARD_TIME, *PGEN_GET_NETCARD_TIME;
-
-/* NDIS driver medium (OID_GEN_MEDIA_SUPPORTED / OID_GEN_MEDIA_IN_USE) */
-typedef enum _NDIS_MEDIUM {
-  NdisMedium802_3,
-  NdisMedium802_5,
-  NdisMediumFddi,
-  NdisMediumWan,
-  NdisMediumLocalTalk,
-  NdisMediumDix,
-  NdisMediumArcnetRaw,
-  NdisMediumArcnet878_2,
-  NdisMediumAtm,
-  NdisMediumWirelessWan,
-  NdisMediumIrda,
-  NdisMediumBpc,
-  NdisMediumCoWan,
-  NdisMedium1394,
-  NdisMediumMax
-} NDIS_MEDIUM, *PNDIS_MEDIUM;
-
-/* NDIS packet filter bits (OID_GEN_CURRENT_PACKET_FILTER) */
-#define NDIS_PACKET_TYPE_DIRECTED               0x00000001
-#define NDIS_PACKET_TYPE_MULTICAST              0x00000002
-#define NDIS_PACKET_TYPE_ALL_MULTICAST          0x00000004
-#define NDIS_PACKET_TYPE_BROADCAST              0x00000008
-#define NDIS_PACKET_TYPE_SOURCE_ROUTING         0x00000010
-#define NDIS_PACKET_TYPE_PROMISCUOUS            0x00000020
-#define NDIS_PACKET_TYPE_SMT                    0x00000040
-#define NDIS_PACKET_TYPE_ALL_LOCAL              0x00000080
-#define NDIS_PACKET_TYPE_GROUP                  0x00001000
-#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL         0x00002000
-#define NDIS_PACKET_TYPE_FUNCTIONAL             0x00004000
-#define NDIS_PACKET_TYPE_MAC_FRAME              0x00008000
-
-/* NDIS protocol option bits (OID_GEN_PROTOCOL_OPTIONS) */
-#define NDIS_PROT_OPTION_ESTIMATED_LENGTH       0x00000001
-#define NDIS_PROT_OPTION_NO_LOOPBACK            0x00000002
-#define NDIS_PROT_OPTION_NO_RSVD_ON_RCVPKT      0x00000004
-
-/* NDIS MAC option bits (OID_GEN_MAC_OPTIONS) */
-#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA     0x00000001
-#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED      0x00000002
-#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND      0x00000004
-#define NDIS_MAC_OPTION_NO_LOOPBACK             0x00000008
-#define NDIS_MAC_OPTION_FULL_DUPLEX             0x00000010
-#define	NDIS_MAC_OPTION_EOTX_INDICATION         0x00000020
-#define	NDIS_MAC_OPTION_8021P_PRIORITY          0x00000040
-#define NDIS_MAC_OPTION_RESERVED                0x80000000
-
-/* State of the LAN media (OID_GEN_MEDIA_CONNECT_STATUS) */
-typedef enum _NDIS_MEDIA_STATE {
-	NdisMediaStateConnected,
-	NdisMediaStateDisconnected
-} NDIS_MEDIA_STATE, *PNDIS_MEDIA_STATE;
-
-/* OID_GEN_SUPPORTED_GUIDS */
-typedef struct _NDIS_GUID {
-	GUID  Guid;
-	union {
-		NDIS_OID  Oid;
-		NDIS_STATUS  Status;
-	} u;
-	ULONG  Size;
-	ULONG  Flags;
-} NDIS_GUID, *PNDIS_GUID;
-
-#define	NDIS_GUID_TO_OID                  0x00000001
-#define	NDIS_GUID_TO_STATUS               0x00000002
-#define	NDIS_GUID_ANSI_STRING             0x00000004
-#define	NDIS_GUID_UNICODE_STRING          0x00000008
-#define	NDIS_GUID_ARRAY	                  0x00000010
-
-
-typedef struct _NDIS_PACKET_POOL {
-  NDIS_SPIN_LOCK  SpinLock;
-  struct _NDIS_PACKET *FreeList;
-  UINT  PacketLength;
-  UCHAR  Buffer[1];
-} NDIS_PACKET_POOL, * PNDIS_PACKET_POOL;
-
-/* NDIS_PACKET_PRIVATE.Flags constants */
-#define fPACKET_CONTAINS_MEDIA_SPECIFIC_INFO    0x40
-#define fPACKET_ALLOCATED_BY_NDIS               0x80
-
-typedef struct _NDIS_PACKET_PRIVATE {
-  UINT  PhysicalCount;
-  UINT  TotalLength;
-  PNDIS_BUFFER  Head;
-  PNDIS_BUFFER  Tail;
-  PNDIS_PACKET_POOL  Pool;
-  UINT  Count;
-  ULONG  Flags;
-  BOOLEAN	 ValidCounts;
-  UCHAR  NdisPacketFlags;
-  USHORT  NdisPacketOobOffset;
-} NDIS_PACKET_PRIVATE, * PNDIS_PACKET_PRIVATE;
-
-typedef struct _NDIS_PACKET {
-  NDIS_PACKET_PRIVATE  Private;
-  union {
-    struct {
-      UCHAR  MiniportReserved[2 * sizeof(PVOID)];
-      UCHAR  WrapperReserved[2 * sizeof(PVOID)];
-    } s1;
-    struct {
-      UCHAR  MiniportReservedEx[3 * sizeof(PVOID)];
-      UCHAR  WrapperReservedEx[sizeof(PVOID)];
-    } s2;
-    struct {
-      UCHAR  MacReserved[4 * sizeof(PVOID)];
-    } s3;
-  } u;
-  ULONG_PTR  Reserved[2];
-  UCHAR  ProtocolReserved[1];
-} NDIS_PACKET, *PNDIS_PACKET, **PPNDIS_PACKET;
-
-typedef enum _NDIS_CLASS_ID {
-	NdisClass802_3Priority,
-	NdisClassWirelessWanMbxMailbox,
-	NdisClassIrdaPacketInfo,
-	NdisClassAtmAALInfo
-} NDIS_CLASS_ID;
-
-typedef struct MediaSpecificInformation {
-  UINT  NextEntryOffset;
-  NDIS_CLASS_ID  ClassId;
-  UINT  Size;
-  UCHAR  ClassInformation[1];
-} MEDIA_SPECIFIC_INFORMATION;
-
-typedef struct _NDIS_PACKET_OOB_DATA {
-  _ANONYMOUS_UNION union {
-    ULONGLONG  TimeToSend;
-    ULONGLONG  TimeSent;
-  } DUMMYUNIONNAME;
-  ULONGLONG  TimeReceived;
-  UINT  HeaderSize;
-  UINT  SizeMediaSpecificInfo;
-  PVOID  MediaSpecificInformation;
-  NDIS_STATUS  Status;
-} NDIS_PACKET_OOB_DATA, *PNDIS_PACKET_OOB_DATA;
-
-typedef struct _NDIS_PM_PACKET_PATTERN {
-  ULONG  Priority;
-  ULONG  Reserved;
-  ULONG  MaskSize;
-  ULONG  PatternOffset;
-  ULONG  PatternSize;
-  ULONG  PatternFlags;
-} NDIS_PM_PACKET_PATTERN,  *PNDIS_PM_PACKET_PATTERN;
-
-
-/* Request types used by NdisRequest */
-typedef enum _NDIS_REQUEST_TYPE {
-  NdisRequestQueryInformation,
-  NdisRequestSetInformation,
-  NdisRequestQueryStatistics,
-  NdisRequestOpen,
-  NdisRequestClose,
-  NdisRequestSend,
-  NdisRequestTransferData,
-  NdisRequestReset,
-  NdisRequestGeneric1,
-  NdisRequestGeneric2,
-  NdisRequestGeneric3,
-  NdisRequestGeneric4
-} NDIS_REQUEST_TYPE, *PNDIS_REQUEST_TYPE;
-
-typedef struct _NDIS_REQUEST {
-  UCHAR  MacReserved[4 * sizeof(PVOID)];
-  NDIS_REQUEST_TYPE  RequestType;
-  union _DATA {
-    struct QUERY_INFORMATION {
-      NDIS_OID  Oid;
-      PVOID  InformationBuffer;
-      UINT  InformationBufferLength;
-      UINT  BytesWritten;
-      UINT  BytesNeeded;
-    } QUERY_INFORMATION;
-    struct SET_INFORMATION {
-      NDIS_OID  Oid;
-      PVOID  InformationBuffer;
-      UINT  InformationBufferLength;
-      UINT  BytesRead;
-      UINT  BytesNeeded;
-    } SET_INFORMATION;
- } DATA;
-#if (defined(NDIS50) || defined(NDIS51))
-  UCHAR  NdisReserved[9 * sizeof(PVOID)];
-  union {
-    UCHAR  CallMgrReserved[2 * sizeof(PVOID)];
-    UCHAR  ProtocolReserved[2 * sizeof(PVOID)];
-  };
-  UCHAR  MiniportReserved[2 * sizeof(PVOID)];
-#endif
-} NDIS_REQUEST, *PNDIS_REQUEST;
-
-
-
-/* Wide Area Networks definitions */
-
-typedef struct _NDIS_WAN_PACKET {
-  LIST_ENTRY  WanPacketQueue;
-  PUCHAR  CurrentBuffer;
-  ULONG  CurrentLength;
-  PUCHAR  StartBuffer;
-  PUCHAR  EndBuffer;
-  PVOID  ProtocolReserved1;
-  PVOID  ProtocolReserved2;
-  PVOID  ProtocolReserved3;
-  PVOID  ProtocolReserved4;
-  PVOID  MacReserved1;
-  PVOID  MacReserved2;
-  PVOID  MacReserved3;
-  PVOID  MacReserved4;
-} NDIS_WAN_PACKET, *PNDIS_WAN_PACKET;
-
-
-
-/* DMA channel information */
-
-typedef struct _NDIS_DMA_DESCRIPTION {
-  BOOLEAN  DemandMode;
-  BOOLEAN  AutoInitialize;
-  BOOLEAN  DmaChannelSpecified;
-  DMA_WIDTH  DmaWidth;
-  DMA_SPEED  DmaSpeed;
-  ULONG  DmaPort;
-  ULONG  DmaChannel;
-} NDIS_DMA_DESCRIPTION, *PNDIS_DMA_DESCRIPTION;
-
-typedef struct _NDIS_DMA_BLOCK {
-  PVOID  MapRegisterBase;
-  KEVENT  AllocationEvent;
-  PADAPTER_OBJECT  SystemAdapterObject;
-  BOOLEAN  InProgress;
-} NDIS_DMA_BLOCK, *PNDIS_DMA_BLOCK;
-
-
-/* Possible hardware architecture */
-typedef enum _NDIS_INTERFACE_TYPE {
-	NdisInterfaceInternal = Internal,
-	NdisInterfaceIsa = Isa,
-	NdisInterfaceEisa = Eisa,
-	NdisInterfaceMca = MicroChannel,
-	NdisInterfaceTurboChannel = TurboChannel,
-	NdisInterfacePci = PCIBus,
-	NdisInterfacePcMcia = PCMCIABus,
-	NdisInterfaceCBus = CBus,
-	NdisInterfaceMPIBus = MPIBus,
-	NdisInterfaceMPSABus = MPSABus,
-	NdisInterfaceProcessorInternal = ProcessorInternal,
-	NdisInterfaceInternalPowerBus = InternalPowerBus,
-	NdisInterfacePNPISABus = PNPISABus,
-	NdisInterfacePNPBus = PNPBus,
-	NdisMaximumInterfaceType
-} NDIS_INTERFACE_TYPE, *PNDIS_INTERFACE_TYPE;
-
-#define NdisInterruptLevelSensitive       LevelSensitive
-#define NdisInterruptLatched              Latched
-typedef KINTERRUPT_MODE NDIS_INTERRUPT_MODE, *PNDIS_INTERRUPT_MODE;
-
-
-typedef enum _NDIS_PARAMETER_TYPE {
-  NdisParameterInteger,
-  NdisParameterHexInteger,
-  NdisParameterString,
-  NdisParameterMultiString,
-  NdisParameterBinary
-} NDIS_PARAMETER_TYPE, *PNDIS_PARAMETER_TYPE;
-
-typedef struct {
-	USHORT  Length;
-	PVOID  Buffer;
-} BINARY_DATA;
-
-typedef struct _NDIS_CONFIGURATION_PARAMETER {
-  NDIS_PARAMETER_TYPE  ParameterType;
-  union {
-    ULONG  IntegerData;
-    NDIS_STRING  StringData;
-    BINARY_DATA  BinaryData;
-  } ParameterData;
-} NDIS_CONFIGURATION_PARAMETER, *PNDIS_CONFIGURATION_PARAMETER;
-
-
-typedef PHYSICAL_ADDRESS NDIS_PHYSICAL_ADDRESS, *PNDIS_PHYSICAL_ADDRESS;
-
-typedef struct _NDIS_PHYSICAL_ADDRESS_UNIT {
-  NDIS_PHYSICAL_ADDRESS  PhysicalAddress;
-  UINT  Length;
-} NDIS_PHYSICAL_ADDRESS_UNIT, *PNDIS_PHYSICAL_ADDRESS_UNIT;
-
-typedef struct _NDIS_WAN_LINE_DOWN {
-  UCHAR  RemoteAddress[6];
-  UCHAR  LocalAddress[6];
-} NDIS_WAN_LINE_DOWN, *PNDIS_WAN_LINE_DOWN;
-
-typedef struct _NDIS_WAN_LINE_UP {
-  ULONG  LinkSpeed;
-  ULONG  MaximumTotalSize;
-  NDIS_WAN_QUALITY  Quality;
-  USHORT  SendWindow;
-  UCHAR  RemoteAddress[6];
-  OUT UCHAR  LocalAddress[6];
-  ULONG  ProtocolBufferLength;
-  PUCHAR  ProtocolBuffer;
-  USHORT  ProtocolType;
-  NDIS_STRING  DeviceName;
-} NDIS_WAN_LINE_UP, *PNDIS_WAN_LINE_UP;
-
-
-typedef VOID DDKAPI
-(*ADAPTER_SHUTDOWN_HANDLER)(
-  IN PVOID  ShutdownContext);
-
-
-typedef struct _OID_LIST    OID_LIST, *POID_LIST;
-
-/* PnP state */
-
-typedef enum _NDIS_PNP_DEVICE_STATE {
-  NdisPnPDeviceAdded,
-  NdisPnPDeviceStarted,
-  NdisPnPDeviceQueryStopped,
-  NdisPnPDeviceStopped,
-  NdisPnPDeviceQueryRemoved,
-  NdisPnPDeviceRemoved,
-  NdisPnPDeviceSurpriseRemoved
-} NDIS_PNP_DEVICE_STATE;
-
-#define	NDIS_DEVICE_NOT_STOPPABLE                 0x00000001
-#define	NDIS_DEVICE_NOT_REMOVEABLE                0x00000002
-#define	NDIS_DEVICE_NOT_SUSPENDABLE	              0x00000004
-#define NDIS_DEVICE_DISABLE_PM                    0x00000008
-#define NDIS_DEVICE_DISABLE_WAKE_UP               0x00000010
-#define NDIS_DEVICE_DISABLE_WAKE_ON_RECONNECT     0x00000020
-#define NDIS_DEVICE_RESERVED                      0x00000040
-#define NDIS_DEVICE_DISABLE_WAKE_ON_MAGIC_PACKET  0x00000080
-#define NDIS_DEVICE_DISABLE_WAKE_ON_PATTERN_MATCH 0x00000100
-
-
-/* OID_GEN_NETWORK_LAYER_ADDRESSES */
-typedef struct _NETWORK_ADDRESS {
-  USHORT  AddressLength; 
-  USHORT  AddressType; 
-  UCHAR  Address[1]; 
-} NETWORK_ADDRESS, *PNETWORK_ADDRESS;
-
-typedef struct _NETWORK_ADDRESS_LIST {
-	LONG  AddressCount; 
-	USHORT  AddressType; 
-	NETWORK_ADDRESS  Address[1]; 
-} NETWORK_ADDRESS_LIST, *PNETWORK_ADDRESS_LIST;
-
-/* Protocol types supported by NDIS */
-#define	NDIS_PROTOCOL_ID_DEFAULT        0x00
-#define	NDIS_PROTOCOL_ID_TCP_IP         0x02
-#define	NDIS_PROTOCOL_ID_IPX            0x06
-#define	NDIS_PROTOCOL_ID_NBF            0x07
-#define	NDIS_PROTOCOL_ID_MAX            0x0F
-#define	NDIS_PROTOCOL_ID_MASK           0x0F
-
-
-/* OID_GEN_TRANSPORT_HEADER_OFFSET */
-typedef struct _TRANSPORT_HEADER_OFFSET {
-	USHORT  ProtocolType; 
-	USHORT  HeaderOffset; 
-} TRANSPORT_HEADER_OFFSET, *PTRANSPORT_HEADER_OFFSET;
-
-
-/* OID_GEN_CO_LINK_SPEED / OID_GEN_CO_MINIMUM_LINK_SPEED */
-typedef struct _NDIS_CO_LINK_SPEED {
-  ULONG  Outbound;
-  ULONG  Inbound;
-} NDIS_CO_LINK_SPEED, *PNDIS_CO_LINK_SPEED;
-
-typedef ULONG NDIS_AF, *PNDIS_AF;
-#define CO_ADDRESS_FAMILY_Q2931           ((NDIS_AF)0x1)
-#define CO_ADDRESS_FAMILY_PSCHED          ((NDIS_AF)0x2)
-#define CO_ADDRESS_FAMILY_L2TP            ((NDIS_AF)0x3)
-#define CO_ADDRESS_FAMILY_IRDA            ((NDIS_AF)0x4)
-#define CO_ADDRESS_FAMILY_1394            ((NDIS_AF)0x5)
-#define CO_ADDRESS_FAMILY_PPP             ((NDIS_AF)0x6)
-#define CO_ADDRESS_FAMILY_TAPI            ((NDIS_AF)0x800)
-#define CO_ADDRESS_FAMILY_TAPI_PROXY      ((NDIS_AF)0x801)
-
-#define CO_ADDRESS_FAMILY_PROXY           0x80000000
-
-typedef struct {
-  NDIS_AF  AddressFamily;
-  ULONG  MajorVersion;
-  ULONG  MinorVersion;
-} CO_ADDRESS_FAMILY, *PCO_ADDRESS_FAMILY;
-
-typedef struct _CO_FLOW_PARAMETERS {
-  ULONG  TokenRate;
-  ULONG  TokenBucketSize;
-  ULONG  PeakBandwidth;
-  ULONG  Latency;
-  ULONG  DelayVariation;
-  GUARANTEE  LevelOfGuarantee;
-  ULONG  CostOfCall;
-  ULONG  NetworkAvailability;
-  ULONG  MaxSduSize;
-} CO_FLOW_PARAMETERS, *PCO_FLOW_PARAMETERS;
-
-typedef struct _CO_SPECIFIC_PARAMETERS {
-  ULONG  ParamType;
-  ULONG  Length;
-  UCHAR  Parameters[1];
-} CO_SPECIFIC_PARAMETERS, *PCO_SPECIFIC_PARAMETERS;
-
-typedef struct _CO_CALL_MANAGER_PARAMETERS {
-  CO_FLOW_PARAMETERS  Transmit;
-  CO_FLOW_PARAMETERS  Receive;
-  CO_SPECIFIC_PARAMETERS  CallMgrSpecific;
-} CO_CALL_MANAGER_PARAMETERS, *PCO_CALL_MANAGER_PARAMETERS;
-
-/* CO_MEDIA_PARAMETERS.Flags constants */
-#define RECEIVE_TIME_INDICATION           0x00000001
-#define USE_TIME_STAMPS                   0x00000002
-#define TRANSMIT_VC	                      0x00000004
-#define RECEIVE_VC                        0x00000008
-#define INDICATE_ERRED_PACKETS            0x00000010
-#define INDICATE_END_OF_TX                0x00000020
-#define RESERVE_RESOURCES_VC              0x00000040
-#define	ROUND_DOWN_FLOW	                  0x00000080
-#define	ROUND_UP_FLOW                     0x00000100
-
-typedef struct _CO_MEDIA_PARAMETERS {
-  ULONG  Flags;
-  ULONG  ReceivePriority;
-  ULONG  ReceiveSizeHint;
-  CO_SPECIFIC_PARAMETERS  MediaSpecific;
-} CO_MEDIA_PARAMETERS, *PCO_MEDIA_PARAMETERS;
-
-/* CO_CALL_PARAMETERS.Flags constants */
-#define PERMANENT_VC                      0x00000001
-#define CALL_PARAMETERS_CHANGED           0x00000002
-#define QUERY_CALL_PARAMETERS             0x00000004
-#define BROADCAST_VC                      0x00000008
-#define MULTIPOINT_VC                     0x00000010
-
-typedef struct _CO_CALL_PARAMETERS {
-  ULONG  Flags;
-  PCO_CALL_MANAGER_PARAMETERS  CallMgrParameters;
-  PCO_MEDIA_PARAMETERS  MediaParameters;
-} CO_CALL_PARAMETERS, *PCO_CALL_PARAMETERS;
-
-typedef struct _CO_SAP {
-  ULONG  SapType;
-  ULONG  SapLength;
-  UCHAR  Sap[1];
-} CO_SAP, *PCO_SAP;
-
-typedef struct _NDIS_IPSEC_PACKET_INFO {
-  _ANONYMOUS_UNION union {
-    struct {
-      NDIS_HANDLE  OffloadHandle;
-      NDIS_HANDLE  NextOffloadHandle;
-    } Transmit;
-    struct {
-      ULONG  SA_DELETE_REQ : 1;
-      ULONG  CRYPTO_DONE : 1;
-      ULONG  NEXT_CRYPTO_DONE : 1;
-      ULONG  CryptoStatus;
-    } Receive;
-  } DUMMYUNIONNAME;
-} NDIS_IPSEC_PACKET_INFO, *PNDIS_IPSEC_PACKET_INFO;
-
-/* NDIS_MAC_FRAGMENT.Errors constants */
-#define WAN_ERROR_CRC               			0x00000001
-#define WAN_ERROR_FRAMING           			0x00000002
-#define WAN_ERROR_HARDWAREOVERRUN   			0x00000004
-#define WAN_ERROR_BUFFEROVERRUN     			0x00000008
-#define WAN_ERROR_TIMEOUT           			0x00000010
-#define WAN_ERROR_ALIGNMENT         			0x00000020
-
-typedef struct _NDIS_MAC_FRAGMENT {
-  NDIS_HANDLE  NdisLinkContext;
-  ULONG  Errors;
-} NDIS_MAC_FRAGMENT, *PNDIS_MAC_FRAGMENT;
-
-typedef struct _NDIS_MAC_LINE_DOWN {
-  NDIS_HANDLE  NdisLinkContext;
-} NDIS_MAC_LINE_DOWN, *PNDIS_MAC_LINE_DOWN;
-
-typedef struct _NDIS_MAC_LINE_UP {
-  ULONG  LinkSpeed;
-  NDIS_WAN_QUALITY  Quality;
-  USHORT  SendWindow;
-  NDIS_HANDLE  ConnectionWrapperID;
-  NDIS_HANDLE  NdisLinkHandle;
-  NDIS_HANDLE  NdisLinkContext;
-} NDIS_MAC_LINE_UP, *PNDIS_MAC_LINE_UP;
-
-typedef struct _NDIS_PACKET_8021Q_INFO {
-	_ANONYMOUS_UNION union {
-		struct {
-			UINT32  UserPriority : 3;
-			UINT32  CanonicalFormatId : 1;
-			UINT32  VlanId : 12;
-			UINT32  Reserved : 16;
-		} TagHeader;
-		PVOID  Value;
-	} DUMMYUNIONNAME;
-} NDIS_PACKET_8021Q_INFO, *PNDIS_PACKET_8021Q_INFO;
-
-typedef enum _NDIS_PER_PACKET_INFO {
-	TcpIpChecksumPacketInfo,
-	IpSecPacketInfo,
-	TcpLargeSendPacketInfo,
-	ClassificationHandlePacketInfo,
-	NdisReserved,
-	ScatterGatherListPacketInfo,
-	Ieee8021QInfo,
-	OriginalPacketInfo,
-	PacketCancelId,
-	MaxPerPacketInfo
-} NDIS_PER_PACKET_INFO, *PNDIS_PER_PACKET_INFO;
-
-typedef struct _NDIS_PACKET_EXTENSION {
-  PVOID  NdisPacketInfo[MaxPerPacketInfo];
-} NDIS_PACKET_EXTENSION, *PNDIS_PACKET_EXTENSION;
-
-/*
- * PNDIS_PACKET
- * NDIS_GET_ORIGINAL_PACKET(
- *   IN PNDIS_PACKET  Packet);
- */
-#define NDIS_GET_ORIGINAL_PACKET(Packet) \
-  NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, OriginalPacketInfo)
-
-/*
- * PVOID
- * NDIS_GET_PACKET_CANCEL_ID(
- *   IN PNDIS_PACKET  Packet);
- */
-#define NDIS_GET_PACKET_CANCEL_ID(Packet) \
-  NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, PacketCancelId)
-
-/*
- * PNDIS_PACKET_EXTENSION
- * NDIS_PACKET_EXTENSION_FROM_PACKET(
- *   IN PNDIS_PACKET  Packet);
- */
-#define NDIS_PACKET_EXTENSION_FROM_PACKET(Packet) \
-  ((PNDIS_PACKET_EXTENSION)((PUCHAR)(Packet) \
-    + (Packet)->Private.NdisPacketOobOffset + sizeof(NDIS_PACKET_OOB_DATA)))
-
-/*
- * PVOID
- * NDIS_PER_PACKET_INFO_FROM_PACKET(
- *   IN OUT  PNDIS_PACKET  Packet,
- *   IN NDIS_PER_PACKET_INFO  InfoType);
- */
-#define NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, InfoType) \
-  ((PNDIS_PACKET_EXTENSION)((PUCHAR)(Packet) + (Packet)->Private.NdisPacketOobOffset \
-    + sizeof(NDIS_PACKET_OOB_DATA)))->NdisPacketInfo[(InfoType)]
-
-/*
- * VOID
- * NDIS_SET_ORIGINAL_PACKET(
- *   IN OUT  PNDIS_PACKET  Packet,
- *   IN PNDIS_PACKET  OriginalPacket);
- */
-#define NDIS_SET_ORIGINAL_PACKET(Packet, OriginalPacket) \
-  NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, OriginalPacketInfo) = (OriginalPacket)
-
-/*
- * VOID
- * NDIS_SET_PACKET_CANCEL_ID(
- *  IN PNDIS_PACKET  Packet
- *  IN ULONG_PTR  CancelId);
- */
-#define NDIS_SET_PACKET_CANCEL_ID(Packet, CancelId) \
-  NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, PacketCancelId) = (CancelId)
-
-typedef enum _NDIS_TASK {
-  TcpIpChecksumNdisTask,
-  IpSecNdisTask,
-  TcpLargeSendNdisTask,
-  MaxNdisTask
-} NDIS_TASK, *PNDIS_TASK;
-
-typedef struct _NDIS_TASK_IPSEC {
-  struct {
-    ULONG  AH_ESP_COMBINED;
-    ULONG  TRANSPORT_TUNNEL_COMBINED;
-    ULONG  V4_OPTIONS;
-    ULONG  RESERVED;
-  } Supported;
- 
-  struct {
-    ULONG  MD5 : 1;
-    ULONG  SHA_1 : 1;
-    ULONG  Transport : 1;
-    ULONG  Tunnel : 1;
-    ULONG  Send : 1;
-    ULONG  Receive : 1;
-  } V4AH;
- 
-  struct {
-    ULONG  DES : 1;
-    ULONG  RESERVED : 1;
-    ULONG  TRIPLE_DES : 1;
-    ULONG  NULL_ESP : 1;
-    ULONG  Transport : 1;
-    ULONG  Tunnel : 1;
-    ULONG  Send : 1;
-    ULONG  Receive : 1;
-  } V4ESP;
-} NDIS_TASK_IPSEC, *PNDIS_TASK_IPSEC;
-
-typedef struct _NDIS_TASK_OFFLOAD {
-  ULONG  Version;
-  ULONG  Size;
-  NDIS_TASK  Task;
-  ULONG  OffsetNextTask;
-  ULONG  TaskBufferLength;
-  UCHAR  TaskBuffer[1];
-} NDIS_TASK_OFFLOAD, *PNDIS_TASK_OFFLOAD;
-
-/* NDIS_TASK_OFFLOAD_HEADER.Version constants */
-#define NDIS_TASK_OFFLOAD_VERSION 1
-
-typedef enum _NDIS_ENCAPSULATION {
-  UNSPECIFIED_Encapsulation,
-  NULL_Encapsulation,
-  IEEE_802_3_Encapsulation,
-  IEEE_802_5_Encapsulation,
-  LLC_SNAP_ROUTED_Encapsulation,
-  LLC_SNAP_BRIDGED_Encapsulation
-} NDIS_ENCAPSULATION;
-
-typedef struct _NDIS_ENCAPSULATION_FORMAT {
-  NDIS_ENCAPSULATION  Encapsulation;
-  struct {
-    ULONG  FixedHeaderSize : 1;
-    ULONG  Reserved : 31;
-  } Flags;
-  ULONG  EncapsulationHeaderSize;
-} NDIS_ENCAPSULATION_FORMAT, *PNDIS_ENCAPSULATION_FORMAT;
-
-typedef struct _NDIS_TASK_TCP_IP_CHECKSUM {
-  struct {
-    ULONG  IpOptionsSupported:1;
-    ULONG  TcpOptionsSupported:1;
-    ULONG  TcpChecksum:1;
-    ULONG  UdpChecksum:1;
-    ULONG  IpChecksum:1;
-  } V4Transmit;
- 
-  struct {
-    ULONG  IpOptionsSupported : 1;
-    ULONG  TcpOptionsSupported : 1;
-    ULONG  TcpChecksum : 1;
-    ULONG  UdpChecksum : 1;
-    ULONG  IpChecksum : 1;
-  } V4Receive;
- 
-  struct {
-    ULONG  IpOptionsSupported : 1;
-    ULONG  TcpOptionsSupported : 1;
-    ULONG  TcpChecksum : 1;
-    ULONG  UdpChecksum : 1;
-  } V6Transmit;
- 
-  struct {
-    ULONG  IpOptionsSupported : 1;
-    ULONG  TcpOptionsSupported : 1;
-    ULONG  TcpChecksum : 1;
-    ULONG  UdpChecksum : 1;
-  } V6Receive;
-} NDIS_TASK_TCP_IP_CHECKSUM, *PNDIS_TASK_TCP_IP_CHECKSUM;
-
-typedef struct _NDIS_TASK_TCP_LARGE_SEND {
-  ULONG  Version;
-  ULONG  MaxOffLoadSize;
-  ULONG  MinSegmentCount;
-  BOOLEAN  TcpOptions;
-  BOOLEAN  IpOptions;
-} NDIS_TASK_TCP_LARGE_SEND, *PNDIS_TASK_TCP_LARGE_SEND;
-
-typedef struct _NDIS_TCP_IP_CHECKSUM_PACKET_INFO {
-  _ANONYMOUS_UNION union {
-    struct {
-      ULONG  NdisPacketChecksumV4 : 1;
-      ULONG  NdisPacketChecksumV6 : 1;
-      ULONG  NdisPacketTcpChecksum : 1;
-      ULONG  NdisPacketUdpChecksum : 1;
-      ULONG  NdisPacketIpChecksum : 1;
-      } Transmit;
- 
-    struct {
-      ULONG  NdisPacketTcpChecksumFailed : 1;
-      ULONG  NdisPacketUdpChecksumFailed : 1;
-      ULONG  NdisPacketIpChecksumFailed : 1;
-      ULONG  NdisPacketTcpChecksumSucceeded : 1;
-      ULONG  NdisPacketUdpChecksumSucceeded : 1;
-      ULONG  NdisPacketIpChecksumSucceeded : 1;
-      ULONG  NdisPacketLoopback : 1;
-    } Receive;
-    ULONG  Value;
-  } DUMMYUNIONNAME;
-} NDIS_TCP_IP_CHECKSUM_PACKET_INFO, *PNDIS_TCP_IP_CHECKSUM_PACKET_INFO;
-
-typedef struct _NDIS_WAN_CO_FRAGMENT {
-  ULONG  Errors;
-} NDIS_WAN_CO_FRAGMENT, *PNDIS_WAN_CO_FRAGMENT;
-
-typedef struct _NDIS_WAN_FRAGMENT {
-  UCHAR  RemoteAddress[6];
-  UCHAR  LocalAddress[6];
-} NDIS_WAN_FRAGMENT, *PNDIS_WAN_FRAGMENT;
-
-typedef struct _WAN_CO_LINKPARAMS {
-  ULONG  TransmitSpeed; 
-  ULONG  ReceiveSpeed; 
-  ULONG  SendWindow; 
-} WAN_CO_LINKPARAMS, *PWAN_CO_LINKPARAMS;
-
-
-/* Call Manager */
-
-typedef VOID DDKAPI
-(*CM_ACTIVATE_VC_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-typedef NDIS_STATUS DDKAPI
-(*CM_ADD_PARTY_HANDLER)(
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters,
-  IN NDIS_HANDLE  NdisPartyHandle,
-  OUT PNDIS_HANDLE  CallMgrPartyContext);
-
-typedef NDIS_STATUS DDKAPI
-(*CM_CLOSE_AF_HANDLER)(
-  IN NDIS_HANDLE  CallMgrAfContext);
-
-typedef NDIS_STATUS DDKAPI
-(*CM_CLOSE_CALL_HANDLER)(
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN NDIS_HANDLE  CallMgrPartyContext  OPTIONAL,
-  IN PVOID  CloseData  OPTIONAL,
-  IN UINT  Size  OPTIONAL);
-
-typedef NDIS_STATUS DDKAPI
-(*CM_DEREG_SAP_HANDLER)(
-  IN NDIS_HANDLE  CallMgrSapContext);
-
-typedef VOID DDKAPI
-(*CM_DEACTIVATE_VC_COMPLETE_HANDLER)(
-	IN NDIS_STATUS  Status,
-	IN NDIS_HANDLE  CallMgrVcContext);
-
-typedef NDIS_STATUS DDKAPI
-(*CM_DROP_PARTY_HANDLER)(
-  IN NDIS_HANDLE  CallMgrPartyContext,
-  IN PVOID  CloseData  OPTIONAL,
-  IN UINT  Size  OPTIONAL);
-
-typedef VOID DDKAPI
-(*CM_INCOMING_CALL_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-typedef NDIS_STATUS DDKAPI
-(*CM_MAKE_CALL_HANDLER)(
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters,
-  IN NDIS_HANDLE  NdisPartyHandle	OPTIONAL,
-  OUT PNDIS_HANDLE  CallMgrPartyContext  OPTIONAL);
-
-typedef NDIS_STATUS DDKAPI
-(*CM_MODIFY_CALL_QOS_HANDLER)(
-  IN NDIS_HANDLE  CallMgrVcContext,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-typedef NDIS_STATUS DDKAPI
-(*CM_OPEN_AF_HANDLER)(
-	IN NDIS_HANDLE  CallMgrBindingContext,
-	IN PCO_ADDRESS_FAMILY  AddressFamily,
-	IN NDIS_HANDLE  NdisAfHandle,
-	OUT PNDIS_HANDLE  CallMgrAfContext);
-
-typedef NDIS_STATUS DDKAPI
-(*CM_REG_SAP_HANDLER)(
-  IN NDIS_HANDLE  CallMgrAfContext,
-  IN PCO_SAP  Sap,
-  IN NDIS_HANDLE  NdisSapHandle,
-  OUT	PNDIS_HANDLE  CallMgrSapContext);
-
-typedef NDIS_STATUS DDKAPI
-(*CO_CREATE_VC_HANDLER)(
-  IN NDIS_HANDLE  ProtocolAfContext,
-  IN NDIS_HANDLE  NdisVcHandle,
-  OUT PNDIS_HANDLE  ProtocolVcContext);
-
-typedef NDIS_STATUS DDKAPI
-(*CO_DELETE_VC_HANDLER)(
-  IN NDIS_HANDLE  ProtocolVcContext);
-
-typedef VOID DDKAPI
-(*CO_REQUEST_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolAfContext  OPTIONAL,
-  IN NDIS_HANDLE  ProtocolVcContext  OPTIONAL,
-  IN NDIS_HANDLE  ProtocolPartyContext  OPTIONAL,
-  IN PNDIS_REQUEST  NdisRequest);
-
-typedef NDIS_STATUS DDKAPI
-(*CO_REQUEST_HANDLER)(
-  IN NDIS_HANDLE  ProtocolAfContext,
-  IN NDIS_HANDLE  ProtocolVcContext  OPTIONAL,
-  IN NDIS_HANDLE	ProtocolPartyContext  OPTIONAL,
-  IN OUT PNDIS_REQUEST  NdisRequest);
-
-typedef struct _NDIS_CALL_MANAGER_CHARACTERISTICS {
-	UCHAR  MajorVersion;
-	UCHAR  MinorVersion;
-	USHORT  Filler;
-	UINT  Reserved;
-	CO_CREATE_VC_HANDLER  CmCreateVcHandler;
-	CO_DELETE_VC_HANDLER  CmDeleteVcHandler;
-	CM_OPEN_AF_HANDLER  CmOpenAfHandler;
-	CM_CLOSE_AF_HANDLER	 CmCloseAfHandler;
-	CM_REG_SAP_HANDLER  CmRegisterSapHandler;
-	CM_DEREG_SAP_HANDLER  CmDeregisterSapHandler;
-	CM_MAKE_CALL_HANDLER  CmMakeCallHandler;
-	CM_CLOSE_CALL_HANDLER  CmCloseCallHandler;
-	CM_INCOMING_CALL_COMPLETE_HANDLER  CmIncomingCallCompleteHandler;
-	CM_ADD_PARTY_HANDLER  CmAddPartyHandler;
-	CM_DROP_PARTY_HANDLER  CmDropPartyHandler;
-	CM_ACTIVATE_VC_COMPLETE_HANDLER  CmActivateVcCompleteHandler;
-	CM_DEACTIVATE_VC_COMPLETE_HANDLER  CmDeactivateVcCompleteHandler;
-	CM_MODIFY_CALL_QOS_HANDLER  CmModifyCallQoSHandler;
-	CO_REQUEST_HANDLER  CmRequestHandler;
-	CO_REQUEST_COMPLETE_HANDLER  CmRequestCompleteHandler;
-} NDIS_CALL_MANAGER_CHARACTERISTICS, *PNDIS_CALL_MANAGER_CHARACTERISTICS;
-
-
-
-/* Call Manager clients */
-
-typedef VOID (*CL_OPEN_AF_COMPLETE_HANDLER)(
-  IN NDIS_STATUS Status,
-  IN NDIS_HANDLE ProtocolAfContext,
-  IN NDIS_HANDLE NdisAfHandle);
-
-typedef VOID DDKAPI
-(*CL_CLOSE_AF_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolAfContext);
-
-typedef VOID DDKAPI
-(*CL_REG_SAP_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolSapContext,
-  IN PCO_SAP  Sap,
-  IN NDIS_HANDLE  NdisSapHandle);
-
-typedef VOID DDKAPI
-(*CL_DEREG_SAP_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolSapContext);
-
-typedef VOID DDKAPI
-(*CL_MAKE_CALL_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-typedef VOID DDKAPI
-(*CL_MODIFY_CALL_QOS_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-typedef VOID DDKAPI
-(*CL_CLOSE_CALL_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN NDIS_HANDLE  ProtocolPartyContext  OPTIONAL);
-
-typedef VOID DDKAPI
-(*CL_ADD_PARTY_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolPartyContext,
-  IN NDIS_HANDLE  NdisPartyHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-typedef VOID DDKAPI
-(*CL_DROP_PARTY_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolPartyContext);
-
-typedef NDIS_STATUS DDKAPI
-(*CL_INCOMING_CALL_HANDLER)(
-  IN NDIS_HANDLE  ProtocolSapContext,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters);
-
-typedef VOID DDKAPI
-(*CL_INCOMING_CALL_QOS_CHANGE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-typedef VOID DDKAPI
-(*CL_INCOMING_CLOSE_CALL_HANDLER)(
-  IN NDIS_STATUS  CloseStatus,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN PVOID  CloseData  OPTIONAL,
-  IN UINT  Size  OPTIONAL);
-
-typedef VOID DDKAPI
-(*CL_INCOMING_DROP_PARTY_HANDLER)(
-  IN NDIS_STATUS  DropStatus,
-  IN NDIS_HANDLE  ProtocolPartyContext,
-  IN PVOID  CloseData  OPTIONAL,
-  IN UINT  Size  OPTIONAL);
-
-typedef VOID DDKAPI
-(*CL_CALL_CONNECTED_HANDLER)(
-  IN NDIS_HANDLE  ProtocolVcContext);
-
-
-typedef struct _NDIS_CLIENT_CHARACTERISTICS {
-  UCHAR  MajorVersion;
-  UCHAR  MinorVersion;
-  USHORT  Filler;
-  UINT  Reserved;
-  CO_CREATE_VC_HANDLER  ClCreateVcHandler;
-  CO_DELETE_VC_HANDLER  ClDeleteVcHandler;
-  CO_REQUEST_HANDLER  ClRequestHandler;
-  CO_REQUEST_COMPLETE_HANDLER  ClRequestCompleteHandler;
-  CL_OPEN_AF_COMPLETE_HANDLER  ClOpenAfCompleteHandler;
-  CL_CLOSE_AF_COMPLETE_HANDLER  ClCloseAfCompleteHandler;
-  CL_REG_SAP_COMPLETE_HANDLER  ClRegisterSapCompleteHandler;
-  CL_DEREG_SAP_COMPLETE_HANDLER  ClDeregisterSapCompleteHandler;
-  CL_MAKE_CALL_COMPLETE_HANDLER  ClMakeCallCompleteHandler;
-  CL_MODIFY_CALL_QOS_COMPLETE_HANDLER	 ClModifyCallQoSCompleteHandler;
-  CL_CLOSE_CALL_COMPLETE_HANDLER  ClCloseCallCompleteHandler;
-  CL_ADD_PARTY_COMPLETE_HANDLER  ClAddPartyCompleteHandler;
-  CL_DROP_PARTY_COMPLETE_HANDLER  ClDropPartyCompleteHandler;
-  CL_INCOMING_CALL_HANDLER  ClIncomingCallHandler;
-  CL_INCOMING_CALL_QOS_CHANGE_HANDLER  ClIncomingCallQoSChangeHandler;
-  CL_INCOMING_CLOSE_CALL_HANDLER  ClIncomingCloseCallHandler;
-  CL_INCOMING_DROP_PARTY_HANDLER  ClIncomingDropPartyHandler;
-  CL_CALL_CONNECTED_HANDLER  ClCallConnectedHandler;
-} NDIS_CLIENT_CHARACTERISTICS, *PNDIS_CLIENT_CHARACTERISTICS;
-
-
-/* NDIS protocol structures */
-
-/* Prototypes for NDIS 3.0 protocol characteristics */
-
-typedef VOID DDKAPI
-(*OPEN_ADAPTER_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_STATUS  Status,
-  IN NDIS_STATUS  OpenErrorStatus);
-
-typedef VOID DDKAPI
-(*CLOSE_ADAPTER_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_STATUS  Status);
-
-typedef VOID DDKAPI
-(*RESET_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_STATUS  Status);
-
-typedef VOID DDKAPI
-(*REQUEST_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_REQUEST  NdisRequest,
-  IN NDIS_STATUS  Status);
-
-typedef VOID DDKAPI
-(*STATUS_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_STATUS  GeneralStatus,
-  IN PVOID  StatusBuffer,
-  IN UINT  StatusBufferSize);
-
-typedef VOID DDKAPI
-(*STATUS_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext);
-
-typedef VOID DDKAPI
-(*SEND_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_PACKET  Packet,
-  IN NDIS_STATUS  Status);
-
-typedef VOID DDKAPI
-(*WAN_SEND_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_WAN_PACKET  Packet,
-  IN NDIS_STATUS  Status);
-
-typedef VOID DDKAPI
-(*TRANSFER_DATA_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_PACKET  Packet,
-  IN NDIS_STATUS  Status,
-  IN UINT  BytesTransferred);
-
-typedef VOID DDKAPI
-(*WAN_TRANSFER_DATA_COMPLETE_HANDLER)(
-    VOID);
-
-
-typedef NDIS_STATUS DDKAPI
-(*RECEIVE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN PVOID  HeaderBuffer,
-  IN UINT  HeaderBufferSize,
-  IN PVOID  LookAheadBuffer,
-  IN UINT  LookaheadBufferSize,
-  IN UINT  PacketSize);
-
-typedef NDIS_STATUS DDKAPI
-(*WAN_RECEIVE_HANDLER)(
-  IN NDIS_HANDLE  NdisLinkHandle,
-  IN PUCHAR  Packet,
-  IN ULONG  PacketSize);
-
-typedef VOID DDKAPI
-(*RECEIVE_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext);
-
-
-/* Protocol characteristics for NDIS 3.0 protocols */
-
-#define NDIS30_PROTOCOL_CHARACTERISTICS_S \
-  UCHAR  MajorNdisVersion; \
-  UCHAR  MinorNdisVersion; \
-  _ANONYMOUS_UNION union { \
-    UINT  Reserved; \
-    UINT  Flags; \
-  } DUMMYUNIONNAME; \
-  OPEN_ADAPTER_COMPLETE_HANDLER  OpenAdapterCompleteHandler; \
-  CLOSE_ADAPTER_COMPLETE_HANDLER  CloseAdapterCompleteHandler; \
-  _ANONYMOUS_UNION union { \
-    SEND_COMPLETE_HANDLER  SendCompleteHandler; \
-    WAN_SEND_COMPLETE_HANDLER  WanSendCompleteHandler; \
-  } DUMMYUNIONNAME2; \
-  _ANONYMOUS_UNION union { \
-    TRANSFER_DATA_COMPLETE_HANDLER  TransferDataCompleteHandler; \
-    WAN_TRANSFER_DATA_COMPLETE_HANDLER  WanTransferDataCompleteHandler; \
-  } DUMMYUNIONNAME3; \
-  RESET_COMPLETE_HANDLER  ResetCompleteHandler; \
-  REQUEST_COMPLETE_HANDLER  RequestCompleteHandler; \
-  _ANONYMOUS_UNION union { \
-    RECEIVE_HANDLER	 ReceiveHandler; \
-    WAN_RECEIVE_HANDLER  WanReceiveHandler; \
-  } DUMMYUNIONNAME4; \
-  RECEIVE_COMPLETE_HANDLER  ReceiveCompleteHandler; \
-  STATUS_HANDLER  StatusHandler; \
-  STATUS_COMPLETE_HANDLER  StatusCompleteHandler; \
-  NDIS_STRING  Name;
-
-typedef struct _NDIS30_PROTOCOL_CHARACTERISTICS {
-  NDIS30_PROTOCOL_CHARACTERISTICS_S
-} NDIS30_PROTOCOL_CHARACTERISTICS, *PNDIS30_PROTOCOL_CHARACTERISTICS;
-
-
-/* Prototypes for NDIS 4.0 protocol characteristics */
-
-typedef INT DDKAPI
-(*RECEIVE_PACKET_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_PACKET  Packet);
-
-typedef VOID DDKAPI
-(*BIND_HANDLER)(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  BindContext,
-  IN PNDIS_STRING  DeviceName,
-  IN PVOID  SystemSpecific1,
-  IN PVOID  SystemSpecific2);
-
-typedef VOID DDKAPI
-(*UNBIND_HANDLER)(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_HANDLE  UnbindContext);
-
-typedef NDIS_STATUS DDKAPI
-(*PNP_EVENT_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNET_PNP_EVENT  NetPnPEvent);
-
-typedef VOID DDKAPI
-(*UNLOAD_PROTOCOL_HANDLER)(
-  VOID);
-
-
-/* Protocol characteristics for NDIS 4.0 protocols */
-
-#ifdef __cplusplus
-
-#define NDIS40_PROTOCOL_CHARACTERISTICS_S \
-  NDIS30_PROTOCOL_CHARACTERISTICS  Ndis30Chars; \
-  RECEIVE_PACKET_HANDLER  ReceivePacketHandler; \
-  BIND_HANDLER  BindAdapterHandler; \
-  UNBIND_HANDLER  UnbindAdapterHandler; \
-  PNP_EVENT_HANDLER  PnPEventHandler; \
-  UNLOAD_PROTOCOL_HANDLER  UnloadHandler; 
-
-#else /* !__cplusplus */
-
-#define NDIS40_PROTOCOL_CHARACTERISTICS_S \
-  NDIS30_PROTOCOL_CHARACTERISTICS_S \
-  RECEIVE_PACKET_HANDLER  ReceivePacketHandler; \
-  BIND_HANDLER  BindAdapterHandler; \
-  UNBIND_HANDLER  UnbindAdapterHandler; \
-  PNP_EVENT_HANDLER  PnPEventHandler; \
-  UNLOAD_PROTOCOL_HANDLER  UnloadHandler; 
-
-#endif /* __cplusplus */
-
-typedef struct _NDIS40_PROTOCOL_CHARACTERISTICS {
-  NDIS40_PROTOCOL_CHARACTERISTICS_S
-} NDIS40_PROTOCOL_CHARACTERISTICS, *PNDIS40_PROTOCOL_CHARACTERISTICS;
-
-/* Prototypes for NDIS 5.0 protocol characteristics */
-
-typedef VOID DDKAPI
-(*CO_SEND_COMPLETE_HANDLER)(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN PNDIS_PACKET  Packet);
-
-typedef VOID DDKAPI
-(*CO_STATUS_HANDLER)(
-	IN NDIS_HANDLE  ProtocolBindingContext,
-	IN NDIS_HANDLE  ProtocolVcContext  OPTIONAL,
-	IN NDIS_STATUS  GeneralStatus,
-	IN PVOID  StatusBuffer,
-	IN UINT  StatusBufferSize);
-
-typedef UINT DDKAPI
-(*CO_RECEIVE_PACKET_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN PNDIS_PACKET  Packet);
-
-typedef VOID DDKAPI
-(*CO_AF_REGISTER_NOTIFY_HANDLER)(
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PCO_ADDRESS_FAMILY  AddressFamily);
-
-#ifdef __cplusplus \
-
-#define NDIS50_PROTOCOL_CHARACTERISTICS_S \
-  NDIS40_PROTOCOL_CHARACTERISTICS  Ndis40Chars; \
-  PVOID  ReservedHandlers[4]; \
-  CO_SEND_COMPLETE_HANDLER  CoSendCompleteHandler; \
-  CO_STATUS_HANDLER  CoStatusHandler; \
-  CO_RECEIVE_PACKET_HANDLER  CoReceivePacketHandler; \
-  CO_AF_REGISTER_NOTIFY_HANDLER  CoAfRegisterNotifyHandler;
-
-#else /* !__cplusplus */
-
-#define NDIS50_PROTOCOL_CHARACTERISTICS_S \
-  NDIS40_PROTOCOL_CHARACTERISTICS_S \
-  PVOID  ReservedHandlers[4]; \
-  CO_SEND_COMPLETE_HANDLER  CoSendCompleteHandler; \
-  CO_STATUS_HANDLER  CoStatusHandler; \
-  CO_RECEIVE_PACKET_HANDLER  CoReceivePacketHandler; \
-  CO_AF_REGISTER_NOTIFY_HANDLER  CoAfRegisterNotifyHandler;
-
-#endif /* !__cplusplus */
-
-typedef struct _NDIS50_PROTOCOL_CHARACTERISTICS {
-  NDIS50_PROTOCOL_CHARACTERISTICS_S
-} NDIS50_PROTOCOL_CHARACTERISTICS, *PNDIS50_PROTOCOL_CHARACTERISTICS;
-
-#if defined(NDIS50) || defined(NDIS51)
-typedef struct _NDIS_PROTOCOL_CHARACTERISTICS {
-  NDIS50_PROTOCOL_CHARACTERISTICS_S;
-} NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS;
-#elif defined(NDIS40)
-typedef struct _NDIS_PROTOCOL_CHARACTERISTICS {
-  NDIS40_PROTOCOL_CHARACTERISTICS_S;
-} NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS;
-#elif defined(NDIS30)
-typedef struct _NDIS_PROTOCOL_CHARACTERISTICS {
-  NDIS30_PROTOCOL_CHARACTERISTICS_S
-} NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS;
-#else
-#error Define an NDIS version
-#endif /* NDIS30 */
-
-
-
-/* Buffer management routines */
-
-NDISAPI
-VOID
-DDKAPI
-NdisAllocateBuffer(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_BUFFER  *Buffer,
-  IN NDIS_HANDLE  PoolHandle,
-  IN PVOID  VirtualAddress,
-  IN UINT  Length);
-
-
-NDISAPI
-VOID
-DDKAPI
-NdisAllocateBufferPool(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_HANDLE  PoolHandle,
-  IN UINT  NumberOfDescriptors);
-
-NDISAPI
-VOID
-DDKAPI
-NdisAllocatePacket(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_PACKET  *Packet,
-  IN NDIS_HANDLE  PoolHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisAllocatePacketPool(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_HANDLE  PoolHandle,
-  IN UINT  NumberOfDescriptors,
-  IN UINT  ProtocolReservedLength);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCopyBuffer(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_BUFFER  *Buffer,
-  IN NDIS_HANDLE  PoolHandle,
-  IN PVOID  MemoryDescriptor,
-  IN UINT  Offset,
-  IN UINT  Length);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCopyFromPacketToPacket(
-  IN PNDIS_PACKET  Destination,
-  IN UINT  DestinationOffset,
-  IN UINT  BytesToCopy,
-  IN PNDIS_PACKET  Source,
-  IN UINT  SourceOffset,
-  OUT PUINT  BytesCopied);
-
-NDISAPI
-VOID
-DDKAPI
-NdisDprAllocatePacket(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_PACKET  *Packet,
-  IN NDIS_HANDLE  PoolHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisDprAllocatePacketNonInterlocked(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_PACKET  *Packet,
-  IN NDIS_HANDLE  PoolHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisDprFreePacket(
-  IN PNDIS_PACKET  Packet);
-
-NDISAPI
-VOID
-DDKAPI
-NdisDprFreePacketNonInterlocked(
-  IN PNDIS_PACKET  Packet);
-
-NDISAPI
-VOID
-DDKAPI
-NdisFreeBufferPool(
-  IN NDIS_HANDLE  PoolHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisFreePacket(
-  IN PNDIS_PACKET  Packet);
-
-NDISAPI
-VOID
-DDKAPI
-NdisFreePacketPool(
-  IN NDIS_HANDLE  PoolHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisReturnPackets(
-  IN PNDIS_PACKET  *PacketsToReturn,
-  IN UINT  NumberOfPackets);
-
-NDISAPI
-VOID
-DDKAPI
-NdisUnchainBufferAtBack(
-  IN OUT PNDIS_PACKET  Packet,
-  OUT PNDIS_BUFFER  *Buffer);
-
-NDISAPI
-VOID
-DDKAPI
-NdisUnchainBufferAtFront(
-  IN OUT PNDIS_PACKET  Packet,
-  OUT PNDIS_BUFFER  *Buffer);
-
-NDISAPI
-VOID
-DDKAPI
-NdisAdjustBufferLength(
-  IN PNDIS_BUFFER  Buffer,
-  IN UINT  Length);
-
-NDISAPI
-ULONG
-DDKAPI
-NdisBufferLength(
-  IN PNDIS_BUFFER  Buffer);
-
-NDISAPI
-PVOID
-DDKAPI
-NdisBufferVirtualAddress(
-  IN PNDIS_BUFFER  Buffer);
-
-NDISAPI
-ULONG
-DDKAPI
-NDIS_BUFFER_TO_SPAN_PAGES(
-  IN PNDIS_BUFFER  Buffer);
-
-NDISAPI
-VOID
-DDKAPI
-NdisFreeBuffer(
-  IN PNDIS_BUFFER  Buffer);
-
-NDISAPI
-VOID
-DDKAPI
-NdisGetBufferPhysicalArraySize(
-  IN PNDIS_BUFFER  Buffer,
-  OUT PUINT  ArraySize);
-
-NDISAPI
-VOID
-DDKAPI
-NdisGetFirstBufferFromPacket(
-  IN PNDIS_PACKET  _Packet,
-  OUT PNDIS_BUFFER  *_FirstBuffer,
-  OUT PVOID  *_FirstBufferVA,
-  OUT PUINT  _FirstBufferLength,
-  OUT PUINT  _TotalBufferLength);
-
-NDISAPI
-VOID
-DDKAPI
-NdisQueryBuffer(
-  IN PNDIS_BUFFER  Buffer,
-  OUT PVOID  *VirtualAddress OPTIONAL,
-  OUT PUINT  Length);
-
-NDISAPI
-VOID
-DDKAPI
-NdisQueryBufferOffset(
-  IN PNDIS_BUFFER  Buffer,
-  OUT PUINT  Offset,
-  OUT PUINT  Length);
-
-NDISAPI
-VOID
-DDKAPI
-NdisFreeBuffer(
-  IN PNDIS_BUFFER  Buffer);
-
-
-/*
- * VOID
- * NdisGetBufferPhysicalArraySize(
- *   IN PNDIS_BUFFER  Buffer,
- *   OUT PUINT  ArraySize);
- */
-#define NdisGetBufferPhysicalArraySize(Buffer,        \
-                                       ArraySize)     \
-{                                                     \
-  (*(ArraySize) = NDIS_BUFFER_TO_SPAN_PAGES(Buffer))  \
-}
-
-
-/*
- * VOID
- * NdisGetFirstBufferFromPacket(
- *   IN PNDIS_PACKET  _Packet,
- *   OUT PNDIS_BUFFER  * _FirstBuffer,
- *   OUT PVOID  * _FirstBufferVA,
- *   OUT PUINT  _FirstBufferLength,
- *   OUT PUINT  _TotalBufferLength)
- */
-#define	NdisGetFirstBufferFromPacket(_Packet,             \
-                                     _FirstBuffer,        \
-                                     _FirstBufferVA,      \
-                                     _FirstBufferLength,  \
-                                     _TotalBufferLength)  \
-{                                                         \
-  PNDIS_BUFFER _Buffer;                                   \
-                                                          \
-  _Buffer         = (_Packet)->Private.Head;              \
-  *(_FirstBuffer) = _Buffer;                              \
-  if (_Buffer != NULL)                                    \
-    {                                                     \
-	    *(_FirstBufferVA)     = MmGetSystemAddressForMdl(_Buffer);  \
-	    *(_FirstBufferLength) = MmGetMdlByteCount(_Buffer);	        \
-	    _Buffer = _Buffer->Next;                                    \
-		  *(_TotalBufferLength) = *(_FirstBufferLength);              \
-		  while (_Buffer != NULL) {                                   \
-		    *(_TotalBufferLength) += MmGetMdlByteCount(_Buffer);      \
-		    _Buffer = _Buffer->Next;                                  \
-		  }                                                           \
-    }                             \
-  else                            \
-    {                             \
-      *(_FirstBufferVA) = 0;      \
-      *(_FirstBufferLength) = 0;  \
-      *(_TotalBufferLength) = 0;  \
-    } \
-}
-
-/*
- * VOID
- * NdisQueryBuffer(
- *   IN PNDIS_BUFFER  Buffer,
- *   OUT PVOID  *VirtualAddress OPTIONAL,
- *   OUT PUINT  Length)
- */
-#define NdisQueryBuffer(Buffer,         \
-                        VirtualAddress, \
-                        Length)         \
-{                                       \
-	if (VirtualAddress)                   \
-		*((PVOID*)VirtualAddress) = MmGetSystemAddressForMdl(Buffer); \
-                                        \
-	*((PUINT)Length) = MmGetMdlByteCount(Buffer); \
-}
-
-
-/*
- * VOID
- * NdisQueryBufferOffset(
- *   IN PNDIS_BUFFER  Buffer,
- *   OUT PUINT  Offset,
- *   OUT PUINT  Length);
- */
-#define NdisQueryBufferOffset(Buffer,             \
-                              Offset,             \
-                              Length)             \
-{                                                 \
-  *((PUINT)Offset) = MmGetMdlByteOffset(Buffer);  \
-  *((PUINT)Length) = MmGetMdlByteCount(Buffer);   \
-}
-
-
-/*
- * PVOID
- * NDIS_BUFFER_LINKAGE(
- *   IN PNDIS_BUFFER  Buffer);
- */
-#define NDIS_BUFFER_LINKAGE(Buffer)(Buffer)->Next;
-
-
-/*
- * VOID
- * NdisChainBufferAtBack(
- *   IN OUT PNDIS_PACKET  Packet,
- *   IN OUT PNDIS_BUFFER  Buffer)
- */
-#define NdisChainBufferAtBack(Packet,           \
-                              Buffer)           \
-{                                               \
-	PNDIS_BUFFER NdisBuffer = (Buffer);           \
-                                                \
-	while (NdisBuffer->Next != NULL)              \
-   NdisBuffer = NdisBuffer->Next;               \
-	                                              \
-	NdisBuffer->Next = NULL;                      \
-	                                              \
-	if ((Packet)->Private.Head != NULL)           \
-    (Packet)->Private.Tail->Next = (Buffer);    \
-	else                                          \
-    (Packet)->Private.Head = (Buffer);          \
-	                                              \
-	(Packet)->Private.Tail = NdisBuffer;          \
-	(Packet)->Private.ValidCounts = FALSE;        \
-}
-
-
-/*
- * VOID
- * NdisChainBufferAtFront(
- *   IN OUT PNDIS_PACKET  Packet,
- *   IN OUT PNDIS_BUFFER  Buffer)
- */
-#define NdisChainBufferAtFront(Packet,        \
-                               Buffer)        \
-{                                             \
-	PNDIS_BUFFER _NdisBuffer = (Buffer);        \
-                                              \
-  while (_NdisBuffer->Next != NULL)           \
-    _NdisBuffer = _NdisBuffer->Next;          \
-                                              \
-  if ((Packet)->Private.Head == NULL)         \
-    (Packet)->Private.Tail = _NdisBuffer;     \
-                                              \
-	_NdisBuffer->Next = (Packet)->Private.Head; \
-	(Packet)->Private.Head = (Buffer);          \
-	(Packet)->Private.ValidCounts = FALSE;      \
-}
-
-
-/*
- * VOID
- * NdisGetNextBuffer(
- *   IN PNDIS_BUFFER  CurrentBuffer,
- *   OUT PNDIS_BUFFER  * NextBuffer)
- */
-#define NdisGetNextBuffer(CurrentBuffer,  \
-                          NextBuffer)     \
-{                                         \
-  *(NextBuffer) = (CurrentBuffer)->Next;  \
-}
-
-
-/*
- * UINT
- * NdisGetPacketFlags(
- *   IN PNDIS_PACKET  Packet); 
- */
-#define NdisGetPacketFlags(Packet)(Packet)->Private.Flags;
-
-
-/*
- * VOID
- * NdisClearPacketFlags(
- *   IN PNDIS_PACKET  Packet,
- *   IN UINT  Flags);
- */
-#define NdisClearPacketFlags(Packet, Flags) \
-  (Packet)->Private.Flags &= ~(Flags)
-
-
-/*
- * VOID
- * NDIS_GET_PACKET_MEDIA_SPECIFIC_INFO(
- *   IN PNDIS_PACKET    Packet,
- *   IN PPVOID          pMediaSpecificInfo,
- *   IN PUINT           pSizeMediaSpecificInfo);
- */
-#define NDIS_GET_PACKET_MEDIA_SPECIFIC_INFO(_Packet,                                  \
-                                            _pMediaSpecificInfo,                      \
-                                            _pSizeMediaSpecificInfo)                  \
-{                                                                                     \
-  if (!((_Packet)->Private.NdisPacketFlags & fPACKET_ALLOCATED_BY_NDIS) ||            \
-      !((_Packet)->Private.NdisPacketFlags & fPACKET_CONTAINS_MEDIA_SPECIFIC_INFO))   \
-	  {                                                                                 \
-	    *(_pMediaSpecificInfo) = NULL;                                                  \
-	    *(_pSizeMediaSpecificInfo) = 0;                                                 \
-	  }                                                                                 \
-  else                                                                                \
-	  {                                                                                 \
-	    *(_pMediaSpecificInfo) = ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +           \
-        (_Packet)->Private.NdisPacketOobOffset))->MediaSpecificInformation;           \
-	    *(_pSizeMediaSpecificInfo) = ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +       \
-	      (_Packet)->Private.NdisPacketOobOffset))->SizeMediaSpecificInfo;              \
-	  }                                                                                 \
-}
-
-
-/*
- * ULONG
- * NDIS_GET_PACKET_PROTOCOL_TYPE(
- *   IN PNDIS_PACKET  Packet);
- */
-#define NDIS_GET_PACKET_PROTOCOL_TYPE(_Packet) \
-  ((_Packet)->Private.Flags & NDIS_PROTOCOL_ID_MASK)
-
-/*
- * ULONG
- * NDIS_GET_PACKET_HEADER_SIZE(
- *   IN PNDIS_PACKET  Packet);
- */
-#define NDIS_GET_PACKET_HEADER_SIZE(_Packet) \
-	((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) + \
-	(_Packet)->Private.NdisPacketOobOffset))->HeaderSize
-
-
-/*
- * NDIS_STATUS
- * NDIS_GET_PACKET_STATUS(
- *   IN PNDIS_PACKET  Packet);
- */
-#define NDIS_GET_PACKET_STATUS(_Packet) \
-	((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) + \
-	(_Packet)->Private.NdisPacketOobOffset))->Status
-
-
-/*
- * ULONGLONG
- * NDIS_GET_PACKET_TIME_RECEIVED(
- *   IN PNDIS_PACKET  Packet);
- */
-#define NDIS_GET_PACKET_TIME_RECEIVED(_Packet)  \
-	((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +  \
-	(_Packet)->Private.NdisPacketOobOffset))->TimeReceived
-
-
-/*
- * ULONGLONG
- * NDIS_GET_PACKET_TIME_SENT(
- *   IN PNDIS_PACKET  Packet);
- */
-#define NDIS_GET_PACKET_TIME_SENT(_Packet)      \
-	((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +  \
-	(_Packet)->Private.NdisPacketOobOffset))->TimeSent
-
-
-/*
- * ULONGLONG
- * NDIS_GET_PACKET_TIME_TO_SEND(
- *   IN PNDIS_PACKET  Packet);
- */
-#define NDIS_GET_PACKET_TIME_TO_SEND(_Packet)   \
-	((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +  \
-	(_Packet)->Private.NdisPacketOobOffset))->TimeToSend
-
-
-/*
- * PNDIS_PACKET_OOB_DATA
- * NDIS_OOB_DATA_FROM_PACKET(
- *   IN PNDIS_PACKET  Packet);
- */
-#define NDIS_OOB_DATA_FROM_PACKET(_Packet)    \
-  (PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) + \
-  (_Packet)->Private.NdisPacketOobOffset)
-
- 
-/*
- * VOID
- * NdisQueryPacket(
- *   IN PNDIS_PACKET  Packet,
- *   OUT PUINT  PhysicalBufferCount  OPTIONAL,
- *   OUT PUINT  BufferCount  OPTIONAL,
- *   OUT PNDIS_BUFFER  *FirstBuffer  OPTIONAL,
- *   OUT PUINT  TotalPacketLength  OPTIONAL);
- */
-#define NdisQueryPacket(Packet,                                           \
-                        PhysicalBufferCount,                              \
-                        BufferCount,                                      \
-                        FirstBuffer,                                      \
-                        TotalPacketLength)                                \
-{                                                                         \
-  if (FirstBuffer)                                                        \
-    *((PNDIS_BUFFER*)FirstBuffer) = (Packet)->Private.Head;               \
-  if ((TotalPacketLength) || (BufferCount) || (PhysicalBufferCount))      \
-  {                                                                       \
-    if (!(Packet)->Private.ValidCounts) {                                 \
-      UINT _Offset;                                                       \
-      UINT _PacketLength;                                                 \
-      PNDIS_BUFFER _NdisBuffer;                                           \
-      UINT _PhysicalBufferCount = 0;                                      \
-      UINT _TotalPacketLength   = 0;                                      \
-      UINT _Count               = 0;                                      \
-                                                                          \
-      for (_NdisBuffer = (Packet)->Private.Head;                          \
-        _NdisBuffer != (PNDIS_BUFFER)NULL;                                \
-        _NdisBuffer = _NdisBuffer->Next)                                  \
-      {                                                                   \
-        _PhysicalBufferCount += NDIS_BUFFER_TO_SPAN_PAGES(_NdisBuffer);   \
-        NdisQueryBufferOffset(_NdisBuffer, &_Offset, &_PacketLength);     \
-        _TotalPacketLength += _PacketLength;                              \
-        _Count++;                                                         \
-      }                                                                   \
-      (Packet)->Private.PhysicalCount = _PhysicalBufferCount;             \
-      (Packet)->Private.TotalLength   = _TotalPacketLength;               \
-      (Packet)->Private.Count         = _Count;                           \
-      (Packet)->Private.ValidCounts   = TRUE;                             \
-	}                                                                       \
-                                                                          \
-  if (PhysicalBufferCount)                                                \
-      *((PUINT)PhysicalBufferCount) = (Packet)->Private.PhysicalCount;    \
-                                                                          \
-  if (BufferCount)                                                        \
-      *((PUINT)BufferCount) = (Packet)->Private.Count;                    \
-                                                                          \
-  if (TotalPacketLength)                                                  \
-      *((PUINT)TotalPacketLength) = (Packet)->Private.TotalLength;        \
-  } \
-}
-
-
-/*
- * VOID
- * NdisRecalculatePacketCounts(
- *   IN OUT  PNDIS_PACKET  Packet);
- */
-#define NdisRecalculatePacketCounts(Packet)       \
-{                                                 \
-  PNDIS_BUFFER _Buffer = (Packet)->Private.Head;  \
-  if (_Buffer != NULL)                            \
-  {                                               \
-      while (_Buffer->Next != NULL)               \
-      {                                           \
-          �_Buffer = _Buffer->Next;               \
-      }                                           \
-      (Packet)->Private.Tail = _Buffer;           \
-  }                                               \
-  (Packet)->Private.ValidCounts = FALSE;          \
-}
-
-
-/*
- * VOID
- * NdisReinitializePacket(
- *   IN OUT  PNDIS_PACKET  Packet);
- */
-#define NdisReinitializePacketCounts(Packet)    \
-{                                               \
-	(Packet)->Private.Head = (PNDIS_BUFFER)NULL;  \
-	(Packet)->Private.ValidCounts = FALSE;        \
-}
-
-
-/*
- * VOID
- * NdisSetPacketFlags(
- *   IN PNDIS_PACKET  Packet,
- *   IN UINT  Flags); 
- */
-#define NdisSetPacketFlags(Packet, Flags) \
-  (Packet)->Private.Flags |= (Flags);
-
-
-/*
- * VOID
- * NDIS_SET_PACKET_HEADER_SIZE(
- *   IN PNDIS_PACKET  Packet,
- *   IN UINT  HdrSize);
- */
-#define NDIS_SET_PACKET_HEADER_SIZE(_Packet, _HdrSize)              \
-  ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +                      \
-  (_Packet)->Private.NdisPacketOobOffset))->HeaderSize = (_HdrSize)
-
-
-/*
- * VOID
- * NDIS_SET_PACKET_MEDIA_SPECIFIC_INFO(
- *   IN PNDIS_PACKET  Packet,
- *   IN PVOID  MediaSpecificInfo,
- *   IN UINT  SizeMediaSpecificInfo);
- */
-#define NDIS_SET_PACKET_MEDIA_SPECIFIC_INFO(_Packet,                      \
-                                            _MediaSpecificInfo,           \
-                                            _SizeMediaSpecificInfo)       \
-{                                                                         \
-  if ((_Packet)->Private.NdisPacketFlags & fPACKET_ALLOCATED_BY_NDIS)     \
-	  {                                                                     \
-      (_Packet)->Private.NdisPacketFlags |= fPACKET_CONTAINS_MEDIA_SPECIFIC_INFO; \
-      ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +                        \
-        (_Packet)->Private.NdisPacketOobOffset))->MediaSpecificInformation = \
-          (_MediaSpecificInfo);                                           \
-      ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +                        \
-        (_Packet)->Private.NdisPacketOobOffset))->SizeMediaSpecificInfo = \
-          (_SizeMediaSpecificInfo);                                       \
-	  }                                                                     \
-}
-
-
-/*
- * VOID
- * NDIS_SET_PACKET_STATUS(
- *   IN PNDIS_PACKET    Packet,
- *   IN NDIS_STATUS     Status);
- */
-#define NDIS_SET_PACKET_STATUS(_Packet, _Status)  \
-  ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +    \
-  (_Packet)->Private.NdisPacketOobOffset))->Status = (_Status)
-
-
-/*
- * VOID
- * NDIS_SET_PACKET_TIME_RECEIVED(
- *   IN PNDIS_PACKET  Packet,
- *   IN ULONGLONG  TimeReceived);
- */
-#define NDIS_SET_PACKET_TIME_RECEIVED(_Packet, _TimeReceived) \
-  ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +                \
-  (_Packet)->Private.NdisPacketOobOffset))->TimeReceived = (_TimeReceived)
-
-
-/*
- * VOID
- * NDIS_SET_PACKET_TIME_SENT(
- *   IN PNDIS_PACKET  Packet,
- *   IN ULONGLONG  TimeSent);
- */
-#define NDIS_SET_PACKET_TIME_SENT(_Packet, _TimeSent) \
-  ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +        \
-  (_Packet)->Private.NdisPacketOobOffset))->TimeSent = (_TimeSent)
-
-
-/*
- * VOID
- * NDIS_SET_PACKET_TIME_TO_SEND(
- *   IN PNDIS_PACKET  Packet,
- *   IN ULONGLONG  TimeToSend);
- */
-#define NDIS_SET_PACKET_TIME_TO_SEND(_Packet, _TimeToSend)  \
-  ((PNDIS_PACKET_OOB_DATA)((PUCHAR)(_Packet) +              \
-  (_Packet)->Private.NdisPacketOobOffset))->TimeToSend = (_TimeToSend)
-
-
-/*
- * VOID
- * NdisSetSendFlags(
- *   IN PNDIS_PACKET  Packet,
- *   IN UINT  Flags);
- */
-#define NdisSetSendFlags(_Packet,_Flags)(_Packet)->Private.Flags = (_Flags)
-
-
-
-/* Memory management routines */
-
-/*
- * VOID
- * NdisCreateLookaheadBufferFromSharedMemory(
- *   IN PVOID  pSharedMemory,
- *   IN UINT  LookaheadLength,
- *   OUT PVOID  *pLookaheadBuffer)
- */
-#define NdisCreateLookaheadBufferFromSharedMemory(_pSharedMemory,     \
-                                                  _LookaheadLength,   \
-                                                  _pLookaheadBuffer)  \
-  ((*(_pLookaheadBuffer)) = (_pSharedMemory))
-
-/*
- * VOID
- * NdisDestroyLookaheadBufferFromSharedMemory(
- *   IN PVOID  pLookaheadBuffer)
- */
-#define NdisDestroyLookaheadBufferFromSharedMemory(_pLookaheadBuffer)
-
-#if defined(i386)
-
-/*
- * VOID
- * NdisMoveFromMappedMemory(
- *   OUT PVOID  Destination,
- *   IN PVOID  Source,
- *   IN ULONG  Length);
- */
-#define NdisMoveFromMappedMemory(Destination, Source, Length) \
-  NdisMoveMappedMemory(Destination, Source, Length)
-
-/*
- * VOID
- * NdisMoveMappedMemory(
- *   OUT PVOID  Destination,
- *   IN PVOID  Source,
- *   IN ULONG  Length);
- */
-#define NdisMoveMappedMemory(Destination, Source, Length) \
-  RtlCopyMemory(Destination, Source, Length)
-
-/*
- * VOID
- * NdisMoveToMappedMemory(
- *   OUT PVOID  Destination,
- *   IN PVOID  Source,
- *   IN ULONG  Length);
- */
-#define NdisMoveToMappedMemory(Destination, Source, Length) \
-  NdisMoveMappedMemory(Destination, Source, Length)
-
-#endif /* i386 */
-
-/*
- * VOID
- * NdisMUpdateSharedMemory(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN ULONG  Length,
- *   IN PVOID  VirtualAddress,
- *   IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
- */
-#define NdisMUpdateSharedMemory(_H, _L, _V, _P) \
-  NdisUpdateSharedMemory(_H, _L, _V, _P)
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisAllocateMemory(
-  OUT  PVOID  *VirtualAddress,
-  IN UINT  Length,
-  IN UINT  MemoryFlags,
-  IN NDIS_PHYSICAL_ADDRESS  HighestAcceptableAddress);
-
-NDISAPI
-VOID
-DDKAPI
-NdisFreeMemory(
-  IN PVOID  VirtualAddress,
-  IN UINT  Length,
-  IN UINT  MemoryFlags);
-
-NDISAPI
-VOID
-DDKAPI
-NdisImmediateReadSharedMemory(
-  IN NDIS_HANDLE WrapperConfigurationContext,
-  IN ULONG       SharedMemoryAddress,
-  OUT PUCHAR      Buffer,
-  IN ULONG       Length);
-
-NDISAPI
-VOID
-DDKAPI
-NdisImmediateWriteSharedMemory(
-  IN NDIS_HANDLE WrapperConfigurationContext,
-  IN ULONG       SharedMemoryAddress,
-  IN PUCHAR      Buffer,
-  IN ULONG       Length);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMAllocateSharedMemory(
-  IN	NDIS_HANDLE  MiniportAdapterHandle,
-  IN	ULONG  Length,
-  IN	BOOLEAN  Cached,
-  OUT	 PVOID  *VirtualAddress,
-  OUT	 PNDIS_PHYSICAL_ADDRESS  PhysicalAddress);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMAllocateSharedMemoryAsync(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN ULONG  Length,
-  IN BOOLEAN  Cached,
-  IN PVOID  Context);
-
-#if defined(NDIS50)
-
-#define NdisUpdateSharedMemory(NdisAdapterHandle, \
-                               Length,            \
-                               VirtualAddress,    \
-                               PhysicalAddress)
-
-#else
-
-NDISAPI
-VOID
-DDKAPI
-NdisUpdateSharedMemory(
-  IN NDIS_HANDLE             NdisAdapterHandle,
-  IN ULONG                   Length,
-  IN PVOID                   VirtualAddress,
-  IN NDIS_PHYSICAL_ADDRESS   PhysicalAddress);
-
-#endif /* defined(NDIS50) */
-
-/*
- * ULONG
- * NdisGetPhysicalAddressHigh(
- *   IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
- */
-#define NdisGetPhysicalAddressHigh(PhysicalAddress) \
-  ((PhysicalAddress).HighPart)
-
-/*
- * VOID
- * NdisSetPhysicalAddressHigh(
- *   IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress,
- *   IN ULONG  Value);
- */
-#define NdisSetPhysicalAddressHigh(PhysicalAddress, Value) \
-  ((PhysicalAddress).HighPart) = (Value)
-
-/*
- * ULONG
- * NdisGetPhysicalAddressLow(
- *   IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
- */
-#define NdisGetPhysicalAddressLow(PhysicalAddress) \
-  ((PhysicalAddress).LowPart)
-
-
-/*
- * VOID
- * NdisSetPhysicalAddressLow(
- *   IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress,
- *   IN ULONG  Value);
- */
-#define NdisSetPhysicalAddressLow(PhysicalAddress, Value) \
-  ((PhysicalAddress).LowPart) = (Value)
-
-/*
- * VOID
- * NDIS_PHYSICAL_ADDRESS_CONST(
- *   IN ULONG  Low,
- *   IN LONG  High); 
- */
-#define NDIS_PHYSICAL_ADDRESS_CONST(Low, High)  \
-    { {(ULONG)(Low), (LONG)(High)} }
-
-/*
- * ULONG
- * NdisEqualMemory(
- *  IN CONST VOID  *Source1,
- *  IN CONST VOID  *Source2,
- *  IN ULONG  Length);
- */
-#define NdisEqualMemory(Source1, Source2, Length) \
-  RtlEqualMemory(Source1, Source2, Length)
-
-/*
- * VOID
- * NdisFillMemory(
- *   IN PVOID  Destination,
- *   IN ULONG  Length,
- *   IN UCHAR  Fill);
- */
-#define NdisFillMemory(Destination, Length, Fill) \
-  RtlFillMemory(Destination, Length, Fill)
-
-/*
- * VOID
- * NdisZeroMappedMemory(
- *   IN PVOID  Destination,
- *   IN ULONG  Length);
- */
-#define NdisZeroMappedMemory(Destination, Length) \
-  RtlZeroMemory(Destination, Length)
-
-/*
- * VOID
- * NdisMoveMemory(
- *   OUT  PVOID  Destination,
- *   IN PVOID  Source,
- *   IN ULONG  Length);
- */
-#define NdisMoveMemory(Destination, Source, Length) \
-  RtlCopyMemory(Destination, Source, Length)
-
-
-/*
- * VOID
- * NdisRetrieveUlong(
- *   IN PULONG  DestinationAddress,
- *   IN PULONG  SourceAddress);
- */
-#define NdisRetrieveUlong(DestinationAddress, SourceAddress) \
-  RtlRetrieveUlong(DestinationAddress, SourceAddress)
-
-
-/*
- * VOID
- * NdisStoreUlong(
- *   IN PULONG  DestinationAddress,
- *   IN ULONG  Value); 
- */
-#define NdisStoreUlong(DestinationAddress, Value) \
-  RtlStoreUlong(DestinationAddress, Value)
-
-
-/*
- * VOID
- * NdisZeroMemory(
- *   IN PVOID  Destination,
- *   IN ULONG  Length)
- */
-#define NdisZeroMemory(Destination, Length) \
-  RtlZeroMemory(Destination, Length)
-
-
-
-/* Configuration routines */
-
-NDISAPI
-VOID
-DDKAPI
-NdisOpenConfiguration(
-  OUT  PNDIS_STATUS  Status,
-  OUT  PNDIS_HANDLE  ConfigurationHandle,
-  IN NDIS_HANDLE  WrapperConfigurationContext);
-
-NDISAPI
-VOID
-DDKAPI
-NdisReadNetworkAddress(
-  OUT PNDIS_STATUS  Status,
-  OUT PVOID  *NetworkAddress,
-  OUT PUINT  NetworkAddressLength,
-  IN NDIS_HANDLE  ConfigurationHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisReadEisaSlotInformation(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  WrapperConfigurationContext,
-  OUT PUINT  SlotNumber,
-  OUT PNDIS_EISA_FUNCTION_INFORMATION  EisaData);
-
-NDISAPI
-VOID
-DDKAPI
-NdisReadEisaSlotInformationEx(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  WrapperConfigurationContext,
-  OUT PUINT  SlotNumber,
-  OUT PNDIS_EISA_FUNCTION_INFORMATION  *EisaData,
-  OUT PUINT  NumberOfFunctions);
-
-NDISAPI
-ULONG
-DDKAPI
-NdisReadPciSlotInformation(
-  IN NDIS_HANDLE  NdisAdapterHandle,
-  IN ULONG  SlotNumber,
-  IN ULONG  Offset,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
-
-NDISAPI
-ULONG 
-DDKAPI
-NdisWritePciSlotInformation(
-  IN NDIS_HANDLE  NdisAdapterHandle,
-  IN ULONG  SlotNumber,
-  IN ULONG  Offset,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
-
-
-
-/* String management routines */
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisAnsiStringToUnicodeString(
-  IN OUT PNDIS_STRING  DestinationString,
-  IN PNDIS_ANSI_STRING  SourceString);
-
-/*
- * BOOLEAN
- * NdisEqualString(
- *   IN PNDIS_STRING  String1,
- *   IN PNDIS_STRING  String2,
- *   IN BOOLEAN  CaseInsensitive);
- */
-#define NdisEqualString(_String1, _String2, _CaseInsensitive) \
-  RtlEqualUnicodeString(_String1, _String2, _CaseInsensitive)
-
-NDISAPI
-VOID
-DDKAPI
-NdisInitAnsiString(
-  IN OUT PNDIS_ANSI_STRING  DestinationString,
-  IN PCSTR  SourceString);
-
-NDISAPI
-VOID
-DDKAPI
-NdisInitUnicodeString(
-  IN OUT PNDIS_STRING  DestinationString,
-  IN PCWSTR  SourceString);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisUnicodeStringToAnsiString(
-  IN OUT PNDIS_ANSI_STRING  DestinationString,
-  IN PNDIS_STRING  SourceString);
-
-#define NdisFreeString(_s)  NdisFreeMemory((_s).Buffer, (_s).MaximumLength, 0)
-#define NdisPrintString(_s) DbgPrint("%ls", (_s).Buffer)
-
-
-/* Spin lock reoutines */
-
-/*
- * VOID
- * NdisAllocateSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
- */
-#define NdisAllocateSpinLock(_SpinLock) \
-  KeInitializeSpinLock(&(_SpinLock)->SpinLock)
-
-/*
- * VOID
- * NdisFreeSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
- */
-#define NdisFreeSpinLock(_SpinLock)
-
-/*
- * VOID
- * NdisAcquireSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
- */
-#define NdisAcquireSpinLock(_SpinLock) \
-  KeAcquireSpinLock(&(_SpinLock)->SpinLock, &(_SpinLock)->OldIrql)
-
-/*
- * VOID
- * NdisReleaseSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
- */
-#define NdisReleaseSpinLock(_SpinLock) \
-  KeReleaseSpinLock(&(_SpinLock)->SpinLock, (_SpinLock)->OldIrql)
-
-/*
- * VOID
- * NdisDprAcquireSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
- */
-#define NdisDprAcquireSpinLock(_SpinLock)                \
-{                                                       \
-    KeAcquireSpinLockAtDpcLevel(&(_SpinLock)->SpinLock); \
-    (_SpinLock)->OldIrql = DISPATCH_LEVEL;               \
-}
-
-/*
- * VOID
- * NdisDprReleaseSpinLock(
- *   IN PNDIS_SPIN_LOCK  SpinLock);
- */
-#define NdisDprReleaseSpinLock(_SpinLock) \
-  KeReleaseSpinLockFromDpcLevel(&(_SpinLock)->SpinLock)
-
-
-
-/* I/O routines */
-
-/*
- * VOID
- * NdisRawReadPortBufferUchar(
- *   IN ULONG  Port,
- *   OUT PUCHAR  Buffer,
- *   IN ULONG  Length);
- */
-#define NdisRawReadPortBufferUchar(Port, Buffer, Length)    \
-  READ_PORT_BUFFER_UCHAR((PUCHAR)(Port), (PUCHAR)(Buffer), (Length))
-
-/*
- * VOID
- * NdisRawReadPortBufferUlong(
- *   IN ULONG  Port,
- *   OUT PULONG  Buffer,
- *   IN ULONG  Length);
- */
-#define NdisRawReadPortBufferUlong(Port, Buffer, Length)  \
-  READ_PORT_BUFFER_ULONG((PULONG)(Port), (PULONG)(Buffer), (Length))
-
-/*
- * VOID
- * NdisRawReadPortBufferUshort(
- *   IN ULONG  Port,
- *   OUT PUSHORT  Buffer,
- *   IN ULONG  Length);
- */
-#define NdisRawReadPortBufferUshort(Port, Buffer, Length) \
-  READ_PORT_BUFFER_USHORT((PUSHORT)(Port), (PUSHORT)(Buffer), (Length))
-
-
-/*
- * VOID
- * NdisRawReadPortUchar(
- *   IN ULONG  Port,
- *   OUT PUCHAR  Data);
- */
-#define NdisRawReadPortUchar(Port, Data) \
-  *(Data) = READ_PORT_UCHAR((PUCHAR)(Port))
-
-/*
- * VOID
- * NdisRawReadPortUlong(
- *   IN ULONG  Port,
- *   OUT PULONG  Data);
- */
-#define NdisRawReadPortUlong(Port, Data) \
-  *(Data) = READ_PORT_ULONG((PULONG)(Port))
-
-/*
- * VOID
- * NdisRawReadPortUshort(
- *   IN ULONG   Port,
- *   OUT PUSHORT Data);
- */
-#define NdisRawReadPortUshort(Port, Data) \
-  *(Data) = READ_PORT_USHORT((PUSHORT)(Port))
-
-
-/*
- * VOID
- * NdisRawWritePortBufferUchar(
- *   IN ULONG  Port,
- *   IN PUCHAR  Buffer,
- *   IN ULONG  Length);
- */
-#define NdisRawWritePortBufferUchar(Port, Buffer, Length) \
-  WRITE_PORT_BUFFER_UCHAR((PUCHAR)(Port), (PUCHAR)(Buffer), (Length))
-
-/*
- * VOID
- * NdisRawWritePortBufferUlong(
- *   IN ULONG  Port,
- *   IN PULONG  Buffer,
- *   IN ULONG  Length);
- */
-#define NdisRawWritePortBufferUlong(Port, Buffer, Length) \
-  WRITE_PORT_BUFFER_ULONG((PULONG)(Port), (PULONG)(Buffer), (Length))
-
-/*
- * VOID
- * NdisRawWritePortBufferUshort(
- *   IN ULONG   Port,
- *   IN PUSHORT Buffer,
- *   IN ULONG   Length);
- */
-#define NdisRawWritePortBufferUshort(Port, Buffer, Length) \
-  WRITE_PORT_BUFFER_USHORT((PUSHORT)(Port), (PUSHORT)(Buffer), (Length))
-
-
-/*
- * VOID
- * NdisRawWritePortUchar(
- *   IN ULONG  Port,
- *   IN UCHAR  Data);
- */
-#define NdisRawWritePortUchar(Port, Data) \
-  WRITE_PORT_UCHAR((PUCHAR)(Port), (UCHAR)(Data))
-
-/*
- * VOID
- * NdisRawWritePortUlong(
- *   IN ULONG  Port,
- *   IN ULONG  Data);
- */
-#define NdisRawWritePortUlong(Port, Data)   \
-  WRITE_PORT_ULONG((PULONG)(Port), (ULONG)(Data))
-
-/*
- * VOID
- * NdisRawWritePortUshort(
- *   IN ULONG  Port,
- *   IN USHORT  Data);
- */
-#define NdisRawWritePortUshort(Port, Data) \
-  WRITE_PORT_USHORT((PUSHORT)(Port), (USHORT)(Data))
-
-
-/*
- * VOID
- * NdisReadRegisterUchar(
- *   IN PUCHAR  Register,
- *   OUT PUCHAR  Data);
- */
-#define NdisReadRegisterUchar(Register, Data) \
-  *(Data) = *(Register)
-
-/*
- * VOID
- * NdisReadRegisterUlong(
- *   IN PULONG  Register,
- *   OUT PULONG  Data);
- */
-#define NdisReadRegisterUlong(Register, Data)   \
-  *(Data) = *(Register)
-
-/*
- * VOID
- * NdisReadRegisterUshort(
- *   IN PUSHORT  Register,
- *   OUT PUSHORT  Data);
- */
-#define NdisReadRegisterUshort(Register, Data)  \
-    *(Data) = *(Register)
-
-/*
- * VOID
- * NdisReadRegisterUchar(
- *   IN PUCHAR  Register,
- *   IN UCHAR  Data);
- */
-#define NdisWriteRegisterUchar(Register, Data) \
-  WRITE_REGISTER_UCHAR((Register), (Data))
-
-/*
- * VOID
- * NdisReadRegisterUlong(
- *   IN PULONG  Register,
- *   IN ULONG  Data);
- */
-#define NdisWriteRegisterUlong(Register, Data) \
-  WRITE_REGISTER_ULONG((Register), (Data))
-
-/*
- * VOID
- * NdisReadRegisterUshort(
- *   IN PUSHORT  Register,
- *   IN USHORT  Data);
- */
-#define NdisWriteRegisterUshort(Register, Data) \
-  WRITE_REGISTER_USHORT((Register), (Data))
-
-
-/* Linked lists */
-
-/*
- * VOID
- * NdisInitializeListHead(
- *   IN PLIST_ENTRY  ListHead);
- */
-#define NdisInitializeListHead(_ListHead) \
-  InitializeListHead(_ListHead)
-
-/*
- * PLIST_ENTRY
- * NdisInterlockedInsertHeadList(
- *   IN PLIST_ENTRY  ListHead,
- *   IN PLIST_ENTRY  ListEntry,
- *   IN PNDIS_SPIN_LOCK  SpinLock);
- */
-#define NdisInterlockedInsertHeadList(_ListHead, _ListEntry, _SpinLock) \
-  ExInterlockedInsertHeadList(_ListHead, _ListEntry, &(_SpinLock)->SpinLock)
-
-/*
- * PLIST_ENTRY
- * NdisInterlockedInsertTailList(
- *   IN PLIST_ENTRY  ListHead,
- *   IN PLIST_ENTRY  ListEntry,
- *   IN PNDIS_SPIN_LOCK  SpinLock);
- */
-#define NdisInterlockedInsertTailList(_ListHead, _ListEntry, _SpinLock) \
-  ExInterlockedInsertTailList(_ListHead, _ListEntry, &(_SpinLock)->SpinLock)
-
-/*
- * PLIST_ENTRY
- * NdisInterlockedRemoveHeadList(
- *   IN PLIST_ENTRY  ListHead,
- *   IN PNDIS_SPIN_LOCK  SpinLock);
-*/
-#define NdisInterlockedRemoveHeadList(_ListHead, _SpinLock) \
-  ExInterlockedRemoveHeadList(_ListHead, &(_SpinLock)->SpinLock)
-
-/*
- * VOID
- * NdisInitializeSListHead(
- *   IN PSLIST_HEADER  SListHead);
- */
-#define NdisInitializeSListHead(SListHead) ExInitializeSListHead(SListHead)
-
-/*
- * USHORT NdisQueryDepthSList(
- *   IN PSLIST_HEADER  SListHead);
- */
-#define NdisQueryDepthSList(SListHead) ExQueryDepthSList(SListHead)
-
-
-
-/* Interlocked routines */
-
-/*
- * LONG
- * NdisInterlockedDecrement(
- *   IN PLONG  Addend);
- */
-#define NdisInterlockedDecrement(Addend) InterlockedDecrement(Addend)
-
-/*
- * LONG
- * NdisInterlockedIncrement(
- *   IN PLONG  Addend);
- */
-#define NdisInterlockedIncrement(Addend) InterlockedIncrement(Addend)
-
-/*
- * VOID
- * NdisInterlockedAddUlong(
- *   IN PULONG  Addend,
- *   IN ULONG  Increment,
- *   IN PNDIS_SPIN_LOCK  SpinLock);
- */
-#define NdisInterlockedAddUlong(_Addend, _Increment, _SpinLock) \
-  ExInterlockedAddUlong(_Addend, _Increment, &(_SpinLock)->SpinLock)
-
-
-
-/* Miscellaneous routines */
-
-NDISAPI
-VOID
-DDKAPI
-NdisCloseConfiguration(
-  IN NDIS_HANDLE  ConfigurationHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisReadConfiguration(
-  OUT  PNDIS_STATUS  Status,
-  OUT  PNDIS_CONFIGURATION_PARAMETER  *ParameterValue,
-  IN NDIS_HANDLE  ConfigurationHandle,
-  IN PNDIS_STRING  Keyword,
-  IN NDIS_PARAMETER_TYPE  ParameterType);
-
-NDISAPI
-VOID
-DDKAPI
-NdisWriteConfiguration(
-  OUT  PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  WrapperConfigurationContext,
-  IN PNDIS_STRING  Keyword,
-  IN PNDIS_CONFIGURATION_PARAMETER  *ParameterValue);
-
-NDISAPI
-VOID
-DDKCDECLAPI
-NdisWriteErrorLogEntry(
-	IN NDIS_HANDLE  NdisAdapterHandle,
-	IN NDIS_ERROR_CODE  ErrorCode,
-	IN ULONG  NumberOfErrorValues,
-	IN ...);
-
-/*
- * VOID
- * NdisStallExecution(
- *   IN UINT  MicrosecondsToStall)
- */
-#define NdisStallExecution KeStallExecutionProcessor
-
-/*
- * VOID
- * NdisGetCurrentSystemTime(
- *   IN PLARGE_INTEGER  pSystemTime);
- */
-#define NdisGetCurrentSystemTime KeQuerySystemTime
-
-NDISAPI
-VOID
-DDKAPI
-NdisGetCurrentProcessorCpuUsage(
-  OUT PULONG  pCpuUsage);
-
-
-
-/* NDIS helper macros */
-
-/*
- * VOID
- * NDIS_INIT_FUNCTION(FunctionName)
- */
-#define NDIS_INIT_FUNCTION(FunctionName)    \
-  alloc_text(init, FunctionName)
-
-/*
- * VOID
- * NDIS_PAGABLE_FUNCTION(FunctionName) 
- */
-#define NDIS_PAGEABLE_FUNCTION(FunctionName) \
-  alloc_text(page, FunctionName)
-
-#define NDIS_PAGABLE_FUNCTION NDIS_PAGEABLE_FUNCTION
-
-
-/* NDIS 4.0 extensions */
-
-NDISAPI
-VOID
-DDKAPI
-NdisMFreeSharedMemory(
-	IN NDIS_HANDLE  MiniportAdapterHandle,
-	IN ULONG  Length,
-	IN BOOLEAN  Cached,
-	IN PVOID  VirtualAddress,
-	IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMWanIndicateReceive(
-	OUT PNDIS_STATUS  Status,
-	IN NDIS_HANDLE  MiniportAdapterHandle,
-	IN NDIS_HANDLE  NdisLinkContext,
-	IN PUCHAR  PacketBuffer,
-	IN UINT  PacketSize);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMWanIndicateReceiveComplete(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMWanSendComplete(
-	IN NDIS_HANDLE  MiniportAdapterHandle,
-	IN PNDIS_WAN_PACKET  Packet,
-	IN NDIS_STATUS  Status);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisPciAssignResources(
-	IN NDIS_HANDLE  NdisMacHandle,
-	IN NDIS_HANDLE  NdisWrapperHandle,
-	IN NDIS_HANDLE  WrapperConfigurationContext,
-	IN ULONG  SlotNumber,
-	OUT PNDIS_RESOURCE_LIST  *AssignedResources);
-
-
-/* NDIS 5.0 extensions */
-
-NDISAPI
-VOID
-DDKAPI
-NdisAcquireReadWriteLock(
-  IN PNDIS_RW_LOCK  Lock,
-  IN BOOLEAN  fWrite,
-  IN PLOCK_STATE  LockState);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisAllocateMemoryWithTag(
-  OUT PVOID  *VirtualAddress,
-  IN UINT  Length,
-  IN ULONG  Tag);
-
-NDISAPI
-VOID
-DDKAPI
-NdisAllocatePacketPoolEx(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_HANDLE  PoolHandle,
-  IN UINT  NumberOfDescriptors,
-  IN UINT  NumberOfOverflowDescriptors,
-  IN UINT  ProtocolReservedLength);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCompletePnPEvent(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PNET_PNP_EVENT  NetPnPEvent);
-
-NDISAPI
-VOID
-DDKAPI
-NdisGetCurrentProcessorCounts(
-  OUT PULONG  pIdleCount,
-  OUT PULONG  pKernelAndUser,
-  OUT PULONG  pIndex);
-
-NDISAPI
-VOID
-DDKAPI
-NdisGetDriverHandle(
-  IN PNDIS_HANDLE  NdisBindingHandle,
-  OUT PNDIS_HANDLE  NdisDriverHandle);
-
-NDISAPI
-PNDIS_PACKET
-DDKAPI
-NdisGetReceivedPacket(
-  IN PNDIS_HANDLE  NdisBindingHandle,
-  IN PNDIS_HANDLE  MacContext);
-
-NDISAPI
-VOID
-DDKAPI
-NdisGetSystemUptime(
-  OUT PULONG  pSystemUpTime);
-
-NDISAPI
-VOID
-DDKAPI
-NdisInitializeReadWriteLock(
-  IN PNDIS_RW_LOCK  Lock);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMDeregisterDevice(
-  IN NDIS_HANDLE  NdisDeviceHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMGetDeviceProperty(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN OUT PDEVICE_OBJECT  *PhysicalDeviceObject  OPTIONAL,
-  IN OUT PDEVICE_OBJECT  *FunctionalDeviceObject  OPTIONAL,
-  IN OUT PDEVICE_OBJECT  *NextDeviceObject  OPTIONAL,
-  IN OUT PCM_RESOURCE_LIST  *AllocatedResources  OPTIONAL,
-  IN OUT PCM_RESOURCE_LIST  *AllocatedResourcesTranslated  OPTIONAL);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMInitializeScatterGatherDma(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN BOOLEAN  Dma64BitAddresses,
-  IN ULONG  MaximumPhysicalMapping);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMPromoteMiniport(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMQueryAdapterInstanceName(
-  OUT PNDIS_STRING  AdapterInstanceName,
-  IN NDIS_HANDLE  MiniportAdapterHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMRegisterDevice(
-  IN NDIS_HANDLE  NdisWrapperHandle,
-  IN PNDIS_STRING  DeviceName,
-  IN PNDIS_STRING  SymbolicName,
-  IN PDRIVER_DISPATCH  MajorFunctions[],
-  OUT PDEVICE_OBJECT  *pDeviceObject,
-  OUT NDIS_HANDLE  *NdisDeviceHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMRegisterUnloadHandler(
-  IN NDIS_HANDLE  NdisWrapperHandle,
-  IN PDRIVER_UNLOAD  UnloadHandler);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMRemoveMiniport(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMSetMiniportSecondary(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  PrimaryMiniportAdapterHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisOpenConfigurationKeyByIndex(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  ConfigurationHandle,
-  IN ULONG  Index,
-  OUT PNDIS_STRING  KeyName,
-  OUT PNDIS_HANDLE  KeyHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisOpenConfigurationKeyByName(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  ConfigurationHandle,
-  IN PNDIS_STRING  SubKeyName,
-  OUT PNDIS_HANDLE  SubKeyHandle);
-
-NDISAPI
-UINT
-DDKAPI
-NdisPacketPoolUsage(
-  IN NDIS_HANDLE  PoolHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisQueryAdapterInstanceName(
-  OUT PNDIS_STRING  AdapterInstanceName,
-  IN NDIS_HANDLE  NdisBindingHandle);
-
-NDISAPI
-ULONG
-DDKAPI
-NdisReadPcmciaAttributeMemory(
-  IN NDIS_HANDLE  NdisAdapterHandle,
-  IN ULONG  Offset,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
-
-NDISAPI
-VOID
-DDKAPI
-NdisReleaseReadWriteLock(
-  IN PNDIS_RW_LOCK  Lock,
-  IN PLOCK_STATE  LockState);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisWriteEventLogEntry(
-  IN PVOID  LogHandle,
-  IN NDIS_STATUS  EventCode,
-  IN ULONG  UniqueEventValue,
-  IN USHORT  NumStrings,
-  IN PVOID  StringsList  OPTIONAL,
-  IN ULONG  DataSize,
-  IN PVOID  Data  OPTIONAL);
-
-NDISAPI
-ULONG
-DDKAPI
-NdisWritePcmciaAttributeMemory(
-  IN NDIS_HANDLE  NdisAdapterHandle,
-  IN ULONG  Offset,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
-
-
-/* Connectionless services */
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisClAddParty(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN NDIS_HANDLE  ProtocolPartyContext,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters,
-  OUT PNDIS_HANDLE  NdisPartyHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisClCloseAddressFamily(
-  IN NDIS_HANDLE  NdisAfHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisClCloseCall(
-  IN NDIS_HANDLE NdisVcHandle,
-  IN NDIS_HANDLE NdisPartyHandle  OPTIONAL,
-  IN PVOID  Buffer  OPTIONAL,
-  IN UINT  Size);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisClDeregisterSap(
-  IN NDIS_HANDLE  NdisSapHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisClDropParty(
-  IN NDIS_HANDLE  NdisPartyHandle,
-  IN PVOID  Buffer  OPTIONAL,
-  IN UINT  Size);
-
-NDISAPI
-VOID
-DDKAPI
-NdisClIncomingCallComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisClMakeCall(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters,
-  IN NDIS_HANDLE  ProtocolPartyContext  OPTIONAL,
-  OUT PNDIS_HANDLE  NdisPartyHandle  OPTIONAL);
-
-NDISAPI
-NDIS_STATUS 
-DDKAPI
-NdisClModifyCallQoS(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisClOpenAddressFamily(
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PCO_ADDRESS_FAMILY  AddressFamily,
-  IN NDIS_HANDLE  ProtocolAfContext,
-  IN PNDIS_CLIENT_CHARACTERISTICS  ClCharacteristics,
-  IN UINT  SizeOfClCharacteristics,
-  OUT PNDIS_HANDLE  NdisAfHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisClRegisterSap(
-  IN NDIS_HANDLE  NdisAfHandle,
-  IN NDIS_HANDLE  ProtocolSapContext,
-  IN PCO_SAP  Sap,
-  OUT PNDIS_HANDLE  NdisSapHandle);
-
-
-/* Call Manager services */
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisCmActivateVc(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmAddPartyComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisPartyHandle,
-  IN NDIS_HANDLE  CallMgrPartyContext  OPTIONAL,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmCloseAddressFamilyComplete(
-  IN NDIS_STATUS Status,
-  IN NDIS_HANDLE NdisAfHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmCloseCallComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisCmDeactivateVc(
-  IN NDIS_HANDLE  NdisVcHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmDeregisterSapComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisSapHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmDispatchCallConnected(
-  IN NDIS_HANDLE  NdisVcHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisCmDispatchIncomingCall(
-  IN NDIS_HANDLE  NdisSapHandle,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmDispatchIncomingCallQoSChange(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmDispatchIncomingCloseCall(
-  IN NDIS_STATUS  CloseStatus,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PVOID  Buffer  OPTIONAL,
-  IN UINT  Size);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmDispatchIncomingDropParty(
-  IN NDIS_STATUS  DropStatus,
-  IN NDIS_HANDLE  NdisPartyHandle,
-  IN PVOID  Buffer  OPTIONAL,
-  IN UINT  Size);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmDropPartyComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisPartyHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmMakeCallComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL,
-  IN NDIS_HANDLE  CallMgrPartyContext  OPTIONAL,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmModifyCallQoSComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmOpenAddressFamilyComplete(
-  IN NDIS_STATUS Status,
-  IN NDIS_HANDLE NdisAfHandle,
-  IN NDIS_HANDLE CallMgrAfContext);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisCmRegisterAddressFamily(
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PCO_ADDRESS_FAMILY  AddressFamily,
-  IN PNDIS_CALL_MANAGER_CHARACTERISTICS  CmCharacteristics,
-  IN UINT  SizeOfCmCharacteristics);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCmRegisterSapComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisSapHandle,
-  IN NDIS_HANDLE  CallMgrSapContext);
-
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMCmActivateVc(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMCmCreateVc(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  NdisAfHandle,
-  IN NDIS_HANDLE  MiniportVcContext,
-  OUT  PNDIS_HANDLE  NdisVcHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMCmDeactivateVc(
-  IN NDIS_HANDLE  NdisVcHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMCmDeleteVc(
-  IN NDIS_HANDLE  NdisVcHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMCmRegisterAddressFamily(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PCO_ADDRESS_FAMILY  AddressFamily,
-  IN PNDIS_CALL_MANAGER_CHARACTERISTICS  CmCharacteristics,
-  IN UINT  SizeOfCmCharacteristics);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMCmRequest(
-  IN NDIS_HANDLE  NdisAfHandle,
-  IN NDIS_HANDLE  NdisVcHandle  OPTIONAL,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL,
-  IN OUT  PNDIS_REQUEST  NdisRequest);
-
-
-/* Connection-oriented services */
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisCoCreateVc(
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN NDIS_HANDLE  NdisAfHandle  OPTIONAL,
-  IN NDIS_HANDLE  ProtocolVcContext,
-  IN OUT PNDIS_HANDLE  NdisVcHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisCoDeleteVc(
-  IN NDIS_HANDLE  NdisVcHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisCoRequest(
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN NDIS_HANDLE  NdisAfHandle  OPTIONAL,
-  IN NDIS_HANDLE  NdisVcHandle  OPTIONAL,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL,
-  IN OUT  PNDIS_REQUEST  NdisRequest);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCoRequestComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisAfHandle,
-  IN NDIS_HANDLE  NdisVcHandle  OPTIONAL,
-  IN NDIS_HANDLE  NdisPartyHandle  OPTIONAL,
-  IN PNDIS_REQUEST  NdisRequest);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCoSendPackets(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMCoActivateVcComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PCO_CALL_PARAMETERS  CallParameters);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMCoDeactivateVcComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMCoIndicateReceivePacket(
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMCoIndicateStatus(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  NdisVcHandle  OPTIONAL,
-  IN NDIS_STATUS  GeneralStatus,
-  IN PVOID  StatusBuffer  OPTIONAL,
-  IN ULONG  StatusBufferSize);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMCoReceiveComplete(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMCoRequestComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PNDIS_REQUEST  Request);
-
-NDISAPI
-VOID 
-DDKAPI
-NdisMCoSendComplete(
-  IN NDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisVcHandle,
-  IN PNDIS_PACKET  Packet);
-
-
-/* NDIS 5.0 extensions for intermediate drivers */
-
-NDISAPI
-VOID
-DDKAPI
-NdisIMAssociateMiniport(
-  IN NDIS_HANDLE  DriverHandle,
-  IN NDIS_HANDLE  ProtocolHandle);
-
-NDISAPI
-NDIS_STATUS 
-DDKAPI
-NdisIMCancelInitializeDeviceInstance(
-  IN NDIS_HANDLE  DriverHandle,
-  IN PNDIS_STRING  DeviceInstance);
-
-NDISAPI
-VOID
-DDKAPI
-NdisIMCopySendCompletePerPacketInfo(
-  IN PNDIS_PACKET  DstPacket,
-  IN PNDIS_PACKET  SrcPacket);
-
-NDISAPI
-VOID
-DDKAPI
-NdisIMCopySendPerPacketInfo(
-  IN PNDIS_PACKET  DstPacket,
-  IN PNDIS_PACKET  SrcPacket);
-
-NDISAPI
-VOID
-DDKAPI
-NdisIMDeregisterLayeredMiniport(
-  IN NDIS_HANDLE  DriverHandle);
-
-NDISAPI
-NDIS_HANDLE
-DDKAPI
-NdisIMGetBindingContext(
-  IN NDIS_HANDLE  NdisBindingHandle);
-
-NDISAPI
-NDIS_HANDLE
-DDKAPI
-NdisIMGetDeviceContext(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisIMInitializeDeviceInstanceEx(
-  IN NDIS_HANDLE  DriverHandle,
-  IN PNDIS_STRING  DriverInstance,
-  IN NDIS_HANDLE  DeviceContext  OPTIONAL);
-
-NDISAPI
-PSINGLE_LIST_ENTRY
-DDKAPI
-NdisInterlockedPopEntrySList(
-  IN PSLIST_HEADER  ListHead,
-  IN PKSPIN_LOCK  Lock);
-
-NDISAPI
-PSINGLE_LIST_ENTRY
-DDKAPI
-NdisInterlockedPushEntrySList(
-  IN PSLIST_HEADER  ListHead,
-  IN PSINGLE_LIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
-
-NDISAPI
-VOID
-DDKAPI
-NdisQueryBufferSafe(
-  IN PNDIS_BUFFER  Buffer,
-  OUT PVOID  *VirtualAddress  OPTIONAL,
-  OUT PUINT  Length,
-  IN UINT  Priority);
-
-
-/* Prototypes for NDIS_MINIPORT_CHARACTERISTICS */
-
-typedef BOOLEAN DDKAPI
-(*W_CHECK_FOR_HANG_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext);
-
-typedef VOID DDKAPI
-(*W_DISABLE_INTERRUPT_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext);
-
-typedef VOID DDKAPI
-(*W_ENABLE_INTERRUPT_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext);
-
-typedef VOID DDKAPI
-(*W_HALT_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext);
-
-typedef VOID DDKAPI
-(*W_HANDLE_INTERRUPT_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext);
-
-typedef NDIS_STATUS DDKAPI
-(*W_INITIALIZE_HANDLER)(
-  OUT PNDIS_STATUS  OpenErrorStatus,
-  OUT PUINT  SelectedMediumIndex,
-  IN PNDIS_MEDIUM  MediumArray,
-  IN UINT  MediumArraySize,
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE  WrapperConfigurationContext);
-
-typedef VOID DDKAPI
-(*W_ISR_HANDLER)(
-  OUT PBOOLEAN  InterruptRecognized,
-  OUT PBOOLEAN  QueueMiniportHandleInterrupt,
-  IN	NDIS_HANDLE  MiniportAdapterContext);
-
-typedef NDIS_STATUS DDKAPI
-(*W_QUERY_INFORMATION_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_OID  Oid,
-  IN PVOID  InformationBuffer,
-  IN ULONG  InformationBufferLength,
-  OUT PULONG  BytesWritten,
-  OUT PULONG  BytesNeeded);
-
-typedef NDIS_STATUS DDKAPI
-(*W_RECONFIGURE_HANDLER)(
-  OUT PNDIS_STATUS  OpenErrorStatus,
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE	WrapperConfigurationContext);
-
-typedef NDIS_STATUS DDKAPI
-(*W_RESET_HANDLER)(
-  OUT PBOOLEAN  AddressingReset,
-  IN NDIS_HANDLE  MiniportAdapterContext);
-
-typedef NDIS_STATUS DDKAPI
-(*W_SEND_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PNDIS_PACKET  Packet,
-  IN UINT  Flags);
-
-typedef NDIS_STATUS DDKAPI
-(*WM_SEND_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE  NdisLinkHandle,
-  IN PNDIS_WAN_PACKET  Packet);
-
-typedef NDIS_STATUS DDKAPI
-(*W_SET_INFORMATION_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_OID  Oid,
-  IN PVOID  InformationBuffer,
-  IN ULONG  InformationBufferLength,
-  OUT PULONG  BytesRead,
-  OUT PULONG  BytesNeeded);
-
-typedef NDIS_STATUS DDKAPI
-(*W_TRANSFER_DATA_HANDLER)(
-  OUT PNDIS_PACKET  Packet,
-  OUT PUINT  BytesTransferred,
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE  MiniportReceiveContext,
-  IN UINT  ByteOffset,
-  IN UINT  BytesToTransfer);
-
-typedef NDIS_STATUS DDKAPI
-(*WM_TRANSFER_DATA_HANDLER)(
-  VOID);
-
-
-/* NDIS structures available only to miniport drivers */
-
-#define NDIS30_MINIPORT_CHARACTERISTICS_S \
-  UCHAR  MajorNdisVersion; \
-  UCHAR  MinorNdisVersion; \
-  UINT  Reserved; \
-  W_CHECK_FOR_HANG_HANDLER  CheckForHangHandler; \
-  W_DISABLE_INTERRUPT_HANDLER  DisableInterruptHandler; \
-  W_ENABLE_INTERRUPT_HANDLER  EnableInterruptHandler; \
-  W_HALT_HANDLER  HaltHandler; \
-  W_HANDLE_INTERRUPT_HANDLER  HandleInterruptHandler; \
-  W_INITIALIZE_HANDLER  InitializeHandler; \
-  W_ISR_HANDLER  ISRHandler; \
-  W_QUERY_INFORMATION_HANDLER  QueryInformationHandler; \
-  W_RECONFIGURE_HANDLER  ReconfigureHandler; \
-  W_RESET_HANDLER  ResetHandler; \
-  _ANONYMOUS_UNION union { \
-    W_SEND_HANDLER  SendHandler; \
-    WM_SEND_HANDLER  WanSendHandler; \
-  } _UNION_NAME(u1); \
-  W_SET_INFORMATION_HANDLER  SetInformationHandler; \
-  _ANONYMOUS_UNION union { \
-    W_TRANSFER_DATA_HANDLER  TransferDataHandler; \
-    WM_TRANSFER_DATA_HANDLER  WanTransferDataHandler; \
-  } _UNION_NAME(u2);
-
-typedef struct _NDIS30_MINIPORT_CHARACTERISTICS {
-  NDIS30_MINIPORT_CHARACTERISTICS_S
-} NDIS30_MINIPORT_CHARACTERISTICS, *PSNDIS30_MINIPORT_CHARACTERISTICS;
-
-
-/* Extensions for NDIS 4.0 miniports */
-
-typedef VOID DDKAPI
-(*W_SEND_PACKETS_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
-
-typedef VOID DDKAPI
-(*W_RETURN_PACKET_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PNDIS_PACKET  Packet);
-
-typedef VOID DDKAPI
-(*W_ALLOCATE_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PVOID  VirtualAddress,
-  IN PNDIS_PHYSICAL_ADDRESS  PhysicalAddress,
-  IN ULONG  Length,
-  IN PVOID  Context);
-
-#ifdef __cplusplus
-
-#define NDIS40_MINIPORT_CHARACTERISTICS_S \
-  NDIS30_MINIPORT_CHARACTERISTICS  Ndis30Chars; \
-  W_RETURN_PACKET_HANDLER  ReturnPacketHandler; \
-  W_SEND_PACKETS_HANDLER  SendPacketsHandler; \
-  W_ALLOCATE_COMPLETE_HANDLER  AllocateCompleteHandler;
-
-#else /* !__cplusplus */
-
-#define NDIS40_MINIPORT_CHARACTERISTICS_S \
-  NDIS30_MINIPORT_CHARACTERISTICS_S \
-  W_RETURN_PACKET_HANDLER  ReturnPacketHandler; \
-  W_SEND_PACKETS_HANDLER  SendPacketsHandler; \
-  W_ALLOCATE_COMPLETE_HANDLER  AllocateCompleteHandler;
-
-#endif /* !__cplusplus */
-
-typedef struct _NDIS40_MINIPORT_CHARACTERISTICS {
-  NDIS40_MINIPORT_CHARACTERISTICS_S
-} NDIS40_MINIPORT_CHARACTERISTICS, *PNDIS40_MINIPORT_CHARACTERISTICS;
-
-
-/* Extensions for NDIS 5.0 miniports */
-
-typedef NDIS_STATUS DDKAPI
-(*W_CO_CREATE_VC_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE  NdisVcHandle,
-  OUT PNDIS_HANDLE  MiniportVcContext);
-
-typedef NDIS_STATUS DDKAPI
-(*W_CO_DELETE_VC_HANDLER)(
-  IN NDIS_HANDLE  MiniportVcContext);
-
-typedef NDIS_STATUS DDKAPI
-(*W_CO_ACTIVATE_VC_HANDLER)(
-  IN NDIS_HANDLE  MiniportVcContext,
-  IN OUT PCO_CALL_PARAMETERS  CallParameters);
-
-typedef NDIS_STATUS DDKAPI
-(*W_CO_DEACTIVATE_VC_HANDLER)(
-  IN NDIS_HANDLE  MiniportVcContext);
-
-typedef VOID DDKAPI
-(*W_CO_SEND_PACKETS_HANDLER)(
-  IN NDIS_HANDLE  MiniportVcContext,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
-
-typedef NDIS_STATUS DDKAPI
-(*W_CO_REQUEST_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN NDIS_HANDLE  MiniportVcContext  OPTIONAL,
-  IN OUT PNDIS_REQUEST  NdisRequest);
-
-#ifdef __cplusplus
-
-#define NDIS50_MINIPORT_CHARACTERISTICS_S \
-  NDIS40_MINIPORT_CHARACTERISTICS  Ndis40Chars; \
-  W_CO_CREATE_VC_HANDLER  CoCreateVcHandler; \
-  W_CO_DELETE_VC_HANDLER  CoDeleteVcHandler; \
-  W_CO_ACTIVATE_VC_HANDLER  CoActivateVcHandler; \
-  W_CO_DEACTIVATE_VC_HANDLER  CoDeactivateVcHandler; \
-  W_CO_SEND_PACKETS_HANDLER  CoSendPacketsHandler; \
-  W_CO_REQUEST_HANDLER  CoRequestHandler;
-
-#else /* !__cplusplus */
-
-#define NDIS50_MINIPORT_CHARACTERISTICS_S \
-  NDIS40_MINIPORT_CHARACTERISTICS_S \
-  W_CO_CREATE_VC_HANDLER  CoCreateVcHandler; \
-  W_CO_DELETE_VC_HANDLER  CoDeleteVcHandler; \
-  W_CO_ACTIVATE_VC_HANDLER  CoActivateVcHandler; \
-  W_CO_DEACTIVATE_VC_HANDLER  CoDeactivateVcHandler; \
-  W_CO_SEND_PACKETS_HANDLER  CoSendPacketsHandler; \
-  W_CO_REQUEST_HANDLER  CoRequestHandler;
-
-#endif /* !__cplusplus */
-
-typedef struct _NDIS50_MINIPORT_CHARACTERISTICS {
-   NDIS50_MINIPORT_CHARACTERISTICS_S
-} NDIS50_MINIPORT_CHARACTERISTICS, *PSNDIS50_MINIPORT_CHARACTERISTICS;
-
-
-/* Extensions for NDIS 5.1 miniports */
-
-typedef VOID DDKAPI
-(*W_CANCEL_SEND_PACKETS_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PVOID  CancelId);
-
-
-#if defined(NDIS51)
-typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
-  NDIS50_MINIPORT_CHARACTERISTICS_S
-} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
-#elif defined(NDIS50)
-typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
-  NDIS50_MINIPORT_CHARACTERISTICS_S
-} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
-#elif defined(NDIS40)
-typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
-  NDIS40_MINIPORT_CHARACTERISTICS_S
-} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
-#elif defined(NDIS30)
-typedef struct _NDIS_MINIPORT_CHARACTERISTICS {
-  NDIS30_MINIPORT_CHARACTERISTICS_S
-} NDIS_MINIPORT_CHARACTERISTICS, *PNDIS_MINIPORT_CHARACTERISTICS;
-#endif /* NDIS30 */
-
-
-typedef NDIS_STATUS DDKAPI
-(*SEND_HANDLER)(
-  IN NDIS_HANDLE  MacBindingHandle,
-  IN PNDIS_PACKET  Packet);
-
-typedef NDIS_STATUS DDKAPI
-(*TRANSFER_DATA_HANDLER)(
-  IN NDIS_HANDLE  MacBindingHandle,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN UINT  ByteOffset,
-  IN UINT  BytesToTransfer,
-  OUT PNDIS_PACKET  Packet,
-  OUT PUINT  BytesTransferred);
-
-typedef NDIS_STATUS DDKAPI
-(*RESET_HANDLER)(
-  IN NDIS_HANDLE  MacBindingHandle);
-
-typedef NDIS_STATUS DDKAPI
-(*REQUEST_HANDLER)(
-  IN NDIS_HANDLE   MacBindingHandle,
-  IN PNDIS_REQUEST   NdisRequest);
-
-
-
-/* Structures available only to full MAC drivers */
-
-typedef BOOLEAN DDKAPI
-(*PNDIS_INTERRUPT_SERVICE)(
-  IN PVOID  InterruptContext);
-
-typedef VOID DDKAPI
-(*PNDIS_DEFERRED_PROCESSING)(
-  IN PVOID  SystemSpecific1,
-  IN PVOID  InterruptContext,
-  IN PVOID  SystemSpecific2,
-  IN PVOID  SystemSpecific3);
-
-
-
-typedef struct _NDIS_MINIPORT_BLOCK NDIS_MINIPORT_BLOCK, *PNDIS_MINIPORT_BLOCK;
-typedef struct _NDIS_PROTOCOL_BLOCK NDIS_PROTOCOL_BLOCK, *PNDIS_PROTOCOL_BLOCK;
-typedef struct _NDIS_OPEN_BLOCK		NDIS_OPEN_BLOCK,     *PNDIS_OPEN_BLOCK;
-typedef struct _NDIS_M_DRIVER_BLOCK NDIS_M_DRIVER_BLOCK, *PNDIS_M_DRIVER_BLOCK;
-typedef	struct _NDIS_AF_LIST        NDIS_AF_LIST,        *PNDIS_AF_LIST;
-
-
-typedef struct _NDIS_MINIPORT_INTERRUPT {
-  PKINTERRUPT  InterruptObject;
-  KSPIN_LOCK  DpcCountLock;
-  PVOID  MiniportIdField;
-  W_ISR_HANDLER  MiniportIsr;
-  W_HANDLE_INTERRUPT_HANDLER  MiniportDpc;
-  KDPC  InterruptDpc;
-  PNDIS_MINIPORT_BLOCK  Miniport;
-  UCHAR  DpcCount;
-  BOOLEAN  Filler1;
-  KEVENT  DpcsCompletedEvent;
-  BOOLEAN  SharedInterrupt;
-  BOOLEAN	 IsrRequested;
-} NDIS_MINIPORT_INTERRUPT, *PNDIS_MINIPORT_INTERRUPT;
-
-typedef struct _NDIS_MINIPORT_TIMER {
-  KTIMER  Timer;
-  KDPC  Dpc;
-  PNDIS_TIMER_FUNCTION  MiniportTimerFunction;
-  PVOID  MiniportTimerContext;
-  PNDIS_MINIPORT_BLOCK  Miniport;
-  struct _NDIS_MINIPORT_TIMER  *NextDeferredTimer;
-} NDIS_MINIPORT_TIMER, *PNDIS_MINIPORT_TIMER;
-
-typedef struct _NDIS_INTERRUPT {
-  PKINTERRUPT  InterruptObject;
-  KSPIN_LOCK  DpcCountLock;
-  PNDIS_INTERRUPT_SERVICE  MacIsr;
-  PNDIS_DEFERRED_PROCESSING  MacDpc;
-  KDPC  InterruptDpc;
-  PVOID  InterruptContext;
-  UCHAR  DpcCount;
-  BOOLEAN	 Removing;
-  KEVENT  DpcsCompletedEvent;
-} NDIS_INTERRUPT, *PNDIS_INTERRUPT;
-
-
-typedef struct _MAP_REGISTER_ENTRY {
-	PVOID  MapRegister;
-	BOOLEAN  WriteToDevice;
-} MAP_REGISTER_ENTRY, *PMAP_REGISTER_ENTRY;
-
-
-typedef enum _NDIS_WORK_ITEM_TYPE {
-  NdisWorkItemRequest,
-  NdisWorkItemSend,
-  NdisWorkItemReturnPackets,
-  NdisWorkItemResetRequested,
-  NdisWorkItemResetInProgress,
-  NdisWorkItemHalt,
-  NdisWorkItemSendLoopback,
-  NdisWorkItemMiniportCallback,
-  NdisMaxWorkItems
-} NDIS_WORK_ITEM_TYPE, *PNDIS_WORK_ITEM_TYPE;
-
-#define	NUMBER_OF_WORK_ITEM_TYPES         NdisMaxWorkItems
-#define	NUMBER_OF_SINGLE_WORK_ITEMS       6
-
-typedef struct _NDIS_MINIPORT_WORK_ITEM {
-	SINGLE_LIST_ENTRY  Link;
-	NDIS_WORK_ITEM_TYPE  WorkItemType;
-	PVOID  WorkItemContext;
-} NDIS_MINIPORT_WORK_ITEM, *PNDIS_MINIPORT_WORK_ITEM;
-
-
-typedef struct _NDIS_BIND_PATHS {
-	UINT  Number;
-	NDIS_STRING  Paths[1];
-} NDIS_BIND_PATHS, *PNDIS_BIND_PATHS;
-
-#define DECLARE_UNKNOWN_STRUCT(BaseName) \
-  typedef struct _##BaseName BaseName, *P##BaseName;
-
-#define DECLARE_UNKNOWN_PROTOTYPE(Name) \
-  typedef VOID (*(Name))(VOID);
-
-#define ETH_LENGTH_OF_ADDRESS 6
-
-DECLARE_UNKNOWN_STRUCT(ETH_BINDING_INFO)
-
-DECLARE_UNKNOWN_PROTOTYPE(ETH_ADDRESS_CHANGE)
-DECLARE_UNKNOWN_PROTOTYPE(ETH_FILTER_CHANGE)
-DECLARE_UNKNOWN_PROTOTYPE(ETH_DEFERRED_CLOSE)
-
-typedef struct _ETH_FILTER {
-  PNDIS_SPIN_LOCK  Lock;
-  CHAR  (*MCastAddressBuf)[ETH_LENGTH_OF_ADDRESS];
-  struct _NDIS_MINIPORT_BLOCK  *Miniport;
-  UINT  CombinedPacketFilter;
-  PETH_BINDING_INFO  OpenList;
-  ETH_ADDRESS_CHANGE  AddressChangeAction;
-  ETH_FILTER_CHANGE  FilterChangeAction;
-  ETH_DEFERRED_CLOSE  CloseAction;
-  UINT  MaxMulticastAddresses;
-  UINT  NumAddresses;
-  UCHAR AdapterAddress[ETH_LENGTH_OF_ADDRESS];
-  UINT  OldCombinedPacketFilter;
-  CHAR  (*OldMCastAddressBuf)[ETH_LENGTH_OF_ADDRESS];
-  UINT  OldNumAddresses;
-  PETH_BINDING_INFO  DirectedList;
-  PETH_BINDING_INFO  BMList;
-  PETH_BINDING_INFO  MCastSet;
-#if defined(_NDIS_)
-  UINT  NumOpens;
-  PVOID  BindListLock;
-#endif
-} ETH_FILTER, *PETH_FILTER;
-
-typedef VOID DDKAPI
-(*ETH_RCV_COMPLETE_HANDLER)(
-  IN PETH_FILTER  Filter);
-
-typedef VOID DDKAPI
-(*ETH_RCV_INDICATE_HANDLER)(
-  IN PETH_FILTER  Filter,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN PCHAR  Address,
-  IN PVOID  HeaderBuffer,
-  IN UINT  HeaderBufferSize,
-  IN PVOID  LookaheadBuffer,
-  IN UINT  LookaheadBufferSize,
-  IN UINT  PacketSize);
-
-typedef VOID DDKAPI
-(*FDDI_RCV_COMPLETE_HANDLER)(
-  IN PFDDI_FILTER  Filter);
-
-typedef VOID DDKAPI
-(*FDDI_RCV_INDICATE_HANDLER)(
-  IN PFDDI_FILTER  Filter,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN PCHAR  Address,
-  IN UINT  AddressLength,
-  IN PVOID  HeaderBuffer,
-  IN UINT  HeaderBufferSize,
-  IN PVOID  LookaheadBuffer,
-  IN UINT  LookaheadBufferSize,
-  IN UINT  PacketSize);
-
-typedef VOID DDKAPI
-(*FILTER_PACKET_INDICATION_HANDLER)(
-  IN NDIS_HANDLE  Miniport,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
-
-typedef VOID DDKAPI
-(*TR_RCV_COMPLETE_HANDLER)(
-  IN PTR_FILTER  Filter);
-
-typedef VOID DDKAPI
-(*TR_RCV_INDICATE_HANDLER)(
-  IN PTR_FILTER  Filter,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN PVOID  HeaderBuffer,
-  IN UINT  HeaderBufferSize,
-  IN PVOID  LookaheadBuffer,
-  IN UINT  LookaheadBufferSize,
-  IN UINT  PacketSize);
-
-typedef VOID DDKAPI
-(*WAN_RCV_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  NdisLinkContext);
-
-typedef VOID DDKAPI
-(*WAN_RCV_HANDLER)(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  NdisLinkContext,
-  IN PUCHAR  Packet,
-  IN ULONG  PacketSize);
-
-typedef VOID DDKFASTAPI
-(*NDIS_M_DEQUEUE_WORK_ITEM)(
-  IN PNDIS_MINIPORT_BLOCK  Miniport,
-  IN NDIS_WORK_ITEM_TYPE  WorkItemType,
-  OUT PVOID  *WorkItemContext);
-
-typedef NDIS_STATUS DDKFASTAPI
-(*NDIS_M_QUEUE_NEW_WORK_ITEM)(
-  IN PNDIS_MINIPORT_BLOCK  Miniport,
-  IN NDIS_WORK_ITEM_TYPE  WorkItemType,
-  IN PVOID  WorkItemContext);
-
-typedef NDIS_STATUS DDKFASTAPI
-(*NDIS_M_QUEUE_WORK_ITEM)(
-  IN PNDIS_MINIPORT_BLOCK  Miniport,
-  IN NDIS_WORK_ITEM_TYPE  WorkItemType,
-  IN PVOID  WorkItemContext);
-
-typedef VOID DDKAPI
-(*NDIS_M_REQ_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_STATUS  Status);
-
-typedef VOID DDKAPI
-(*NDIS_M_RESET_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_STATUS  Status,
-  IN BOOLEAN  AddressingReset);
-
-typedef VOID DDKAPI
-(*NDIS_M_SEND_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PNDIS_PACKET  Packet,
-  IN NDIS_STATUS  Status);
-
-typedef VOID DDKAPI
-(*NDIS_M_SEND_RESOURCES_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
-
-typedef BOOLEAN DDKFASTAPI
-(*NDIS_M_START_SENDS)(
-  IN PNDIS_MINIPORT_BLOCK  Miniport);
-
-typedef VOID DDKAPI
-(*NDIS_M_STATUS_HANDLER)(
-  IN NDIS_HANDLE  MiniportHandle,
-  IN NDIS_STATUS  GeneralStatus,
-  IN PVOID  StatusBuffer,
-  IN UINT  StatusBufferSize);
-
-typedef VOID DDKAPI
-(*NDIS_M_STS_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
-
-typedef VOID DDKAPI
-(*NDIS_M_TD_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PNDIS_PACKET  Packet,
-  IN NDIS_STATUS  Status,
-  IN UINT  BytesTransferred);
-
-typedef VOID (DDKAPI *NDIS_WM_SEND_COMPLETE_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PVOID  Packet,
-  IN NDIS_STATUS  Status);
-
-
-#if ARCNET
-
-#define ARC_SEND_BUFFERS                  8
-#define ARC_HEADER_SIZE                   4
-
-typedef struct _NDIS_ARC_BUF {
-  NDIS_HANDLE  ArcnetBufferPool;
-  PUCHAR  ArcnetLookaheadBuffer;
-  UINT  NumFree;
-  ARC_BUFFER_LIST ArcnetBuffers[ARC_SEND_BUFFERS];
-} NDIS_ARC_BUF, *PNDIS_ARC_BUF;
-
-#endif /* ARCNET */
-
-#define NDIS_MINIPORT_WORK_QUEUE_SIZE 10
-
-typedef struct _NDIS_LOG {
-  PNDIS_MINIPORT_BLOCK  Miniport;
-  KSPIN_LOCK  LogLock;
-  PIRP  Irp;
-  UINT  TotalSize;
-  UINT  CurrentSize;
-  UINT  InPtr;
-  UINT  OutPtr;
-  UCHAR  LogBuf[1];
-} NDIS_LOG, *PNDIS_LOG;
-
-typedef struct _FILTERDBS {
-  _ANONYMOUS_UNION union {
-    PETH_FILTER  EthDB;
-    PNULL_FILTER  NullDB;
-  } DUMMYUNIONNAME;
-  PTR_FILTER  TrDB;
-  PFDDI_FILTER  FddiDB;
-#if ARCNET
-  PARC_FILTER  ArcDB;
-#else /* !ARCNET */
-  PVOID  XXXDB;
-#endif /* !ARCNET */
-} FILTERDBS, *PFILTERDBS;
-
-
-struct _NDIS_MINIPORT_BLOCK {
-  PVOID  Signature;
-  PNDIS_MINIPORT_BLOCK  NextMiniport;
-  PNDIS_M_DRIVER_BLOCK  DriverHandle;
-  NDIS_HANDLE  MiniportAdapterContext;
-  UNICODE_STRING  MiniportName;
-  PNDIS_BIND_PATHS  BindPaths;
-  NDIS_HANDLE  OpenQueue;
-  REFERENCE  Ref;
-  NDIS_HANDLE  DeviceContext;
-  UCHAR  Padding1;
-  UCHAR  LockAcquired;
-  UCHAR  PmodeOpens;
-  UCHAR  AssignedProcessor;
-  KSPIN_LOCK  Lock;
-  PNDIS_REQUEST  MediaRequest;
-  PNDIS_MINIPORT_INTERRUPT  Interrupt;
-  ULONG  Flags;
-  ULONG  PnPFlags;
-  LIST_ENTRY  PacketList;
-  PNDIS_PACKET  FirstPendingPacket;
-  PNDIS_PACKET  ReturnPacketsQueue;
-  ULONG  RequestBuffer;
-  PVOID  SetMCastBuffer;
-  PNDIS_MINIPORT_BLOCK  PrimaryMiniport;
-  PVOID  WrapperContext;
-  PVOID  BusDataContext;
-  ULONG  PnPCapabilities;
-  PCM_RESOURCE_LIST  Resources;
-  NDIS_TIMER  WakeUpDpcTimer;
-  UNICODE_STRING  BaseName;
-  UNICODE_STRING  SymbolicLinkName;
-  ULONG  CheckForHangSeconds;
-  USHORT  CFHangTicks;
-  USHORT  CFHangCurrentTick;
-  NDIS_STATUS  ResetStatus;
-  NDIS_HANDLE  ResetOpen;
-  FILTERDBS  FilterDbs;
-  FILTER_PACKET_INDICATION_HANDLER  PacketIndicateHandler;
-  NDIS_M_SEND_COMPLETE_HANDLER  SendCompleteHandler;
-  NDIS_M_SEND_RESOURCES_HANDLER  SendResourcesHandler;
-  NDIS_M_RESET_COMPLETE_HANDLER  ResetCompleteHandler;
-  NDIS_MEDIUM  MediaType;
-  ULONG  BusNumber;
-  NDIS_INTERFACE_TYPE  BusType;
-  NDIS_INTERFACE_TYPE  AdapterType;
-  PDEVICE_OBJECT  DeviceObject;
-  PDEVICE_OBJECT  PhysicalDeviceObject;
-  PDEVICE_OBJECT  NextDeviceObject;
-  PMAP_REGISTER_ENTRY  MapRegisters;
-  PNDIS_AF_LIST  CallMgrAfList;
-  PVOID  MiniportThread;
-  PVOID  SetInfoBuf;
-  USHORT  SetInfoBufLen;
-  USHORT  MaxSendPackets;
-  NDIS_STATUS  FakeStatus;
-  PVOID  LockHandler;
-  PUNICODE_STRING  pAdapterInstanceName;
-  PNDIS_MINIPORT_TIMER  TimerQueue;
-  UINT  MacOptions;
-  PNDIS_REQUEST  PendingRequest;
-  UINT  MaximumLongAddresses;
-  UINT  MaximumShortAddresses;
-  UINT  CurrentLookahead;
-  UINT  MaximumLookahead;
-  W_HANDLE_INTERRUPT_HANDLER  HandleInterruptHandler;
-  W_DISABLE_INTERRUPT_HANDLER  DisableInterruptHandler;
-  W_ENABLE_INTERRUPT_HANDLER  EnableInterruptHandler;
-  W_SEND_PACKETS_HANDLER  SendPacketsHandler;
-  NDIS_M_START_SENDS  DeferredSendHandler;
-  ETH_RCV_INDICATE_HANDLER  EthRxIndicateHandler;
-  TR_RCV_INDICATE_HANDLER  TrRxIndicateHandler;
-  FDDI_RCV_INDICATE_HANDLER  FddiRxIndicateHandler;
-  ETH_RCV_COMPLETE_HANDLER  EthRxCompleteHandler;
-  TR_RCV_COMPLETE_HANDLER  TrRxCompleteHandler;
-  FDDI_RCV_COMPLETE_HANDLER  FddiRxCompleteHandler;
-  NDIS_M_STATUS_HANDLER  StatusHandler;
-  NDIS_M_STS_COMPLETE_HANDLER  StatusCompleteHandler;
-  NDIS_M_TD_COMPLETE_HANDLER  TDCompleteHandler;
-  NDIS_M_REQ_COMPLETE_HANDLER  QueryCompleteHandler;
-  NDIS_M_REQ_COMPLETE_HANDLER  SetCompleteHandler;
-  NDIS_WM_SEND_COMPLETE_HANDLER  WanSendCompleteHandler;
-  WAN_RCV_HANDLER  WanRcvHandler;
-  WAN_RCV_COMPLETE_HANDLER  WanRcvCompleteHandler;
-#if defined(_NDIS_)
-  PNDIS_MINIPORT_BLOCK  NextGlobalMiniport;
-  SINGLE_LIST_ENTRY  WorkQueue[NUMBER_OF_WORK_ITEM_TYPES];
-  SINGLE_LIST_ENTRY  SingleWorkItems[NUMBER_OF_SINGLE_WORK_ITEMS];
-  UCHAR  SendFlags;
-  UCHAR  TrResetRing;
-  UCHAR  ArcnetAddress;
-  UCHAR  XState;
-  _ANONYMOUS_UNION union {
-#if ARCNET
-    PNDIS_ARC_BUF  ArcBuf;
-#endif
-    PVOID  BusInterface;
-  } DUMMYUNIONNAME;
-  PNDIS_LOG  Log;
-  ULONG  SlotNumber;
-  PCM_RESOURCE_LIST  AllocatedResources;
-  PCM_RESOURCE_LIST  AllocatedResourcesTranslated;
-  SINGLE_LIST_ENTRY  PatternList;
-  NDIS_PNP_CAPABILITIES  PMCapabilities;
-  DEVICE_CAPABILITIES  DeviceCaps;
-  ULONG  WakeUpEnable;
-  DEVICE_POWER_STATE  CurrentDevicePowerState;
-  PIRP  pIrpWaitWake;
-  SYSTEM_POWER_STATE  WaitWakeSystemState;
-  LARGE_INTEGER  VcIndex;
-  KSPIN_LOCK  VcCountLock;
-  LIST_ENTRY  WmiEnabledVcs;
-  PNDIS_GUID  pNdisGuidMap;
-  PNDIS_GUID  pCustomGuidMap;
-  USHORT  VcCount;
-  USHORT  cNdisGuidMap;
-  USHORT  cCustomGuidMap;
-  USHORT  CurrentMapRegister;
-  PKEVENT  AllocationEvent;
-  USHORT  BaseMapRegistersNeeded;
-  USHORT  SGMapRegistersNeeded;
-  ULONG  MaximumPhysicalMapping;
-  NDIS_TIMER  MediaDisconnectTimer;
-  USHORT  MediaDisconnectTimeOut;
-  USHORT  InstanceNumber;
-  NDIS_EVENT  OpenReadyEvent;
-  NDIS_PNP_DEVICE_STATE  PnPDeviceState;
-  NDIS_PNP_DEVICE_STATE  OldPnPDeviceState;
-  PGET_SET_DEVICE_DATA  SetBusData;
-  PGET_SET_DEVICE_DATA  GetBusData;
-  KDPC  DeferredDpc;
-#if 0
-  /* FIXME: */
-  NDIS_STATS  NdisStats;
-#else
-  ULONG  NdisStats;
-#endif
-  PNDIS_PACKET  IndicatedPacket[MAXIMUM_PROCESSORS];
-  PKEVENT  RemoveReadyEvent;
-  PKEVENT  AllOpensClosedEvent;
-  PKEVENT  AllRequestsCompletedEvent;
-  ULONG  InitTimeMs;
-  NDIS_MINIPORT_WORK_ITEM  WorkItemBuffer[NUMBER_OF_SINGLE_WORK_ITEMS];
-  PDMA_ADAPTER  SystemAdapterObject;
-  ULONG  DriverVerifyFlags;
-  POID_LIST  OidList;
-  USHORT  InternalResetCount;
-  USHORT  MiniportResetCount;
-  USHORT  MediaSenseConnectCount;
-  USHORT  MediaSenseDisconnectCount;
-  PNDIS_PACKET  *xPackets;
-  ULONG  UserModeOpenReferences;
-  _ANONYMOUS_UNION union {
-    PVOID  SavedSendHandler;
-    PVOID  SavedWanSendHandler;
-  } DUMMYUNIONNAME2;
-  PVOID  SavedSendPacketsHandler;
-  PVOID  SavedCancelSendPacketsHandler;
-  W_SEND_PACKETS_HANDLER  WSendPacketsHandler;                
-  ULONG  MiniportAttributes;
-  PDMA_ADAPTER  SavedSystemAdapterObject;
-  USHORT  NumOpens;
-  USHORT  CFHangXTicks; 
-  ULONG  RequestCount;
-  ULONG  IndicatedPacketsCount;
-  ULONG  PhysicalMediumType;
-  PNDIS_REQUEST  LastRequest;
-  LONG  DmaAdapterRefCount;
-  PVOID  FakeMac;
-  ULONG  LockDbg;
-  ULONG  LockDbgX;
-  PVOID  LockThread;
-  ULONG  InfoFlags;
-  KSPIN_LOCK  TimerQueueLock;
-  PKEVENT  ResetCompletedEvent;
-  PKEVENT  QueuedBindingCompletedEvent;
-  PKEVENT  DmaResourcesReleasedEvent;
-  FILTER_PACKET_INDICATION_HANDLER  SavedPacketIndicateHandler;
-  ULONG  RegisteredInterrupts;
-  PNPAGED_LOOKASIDE_LIST  SGListLookasideList;
-  ULONG  ScatterGatherListSize;
-#endif /* _NDIS_ */
-};
-
-
-/* Handler prototypes for NDIS_OPEN_BLOCK */
-
-typedef NDIS_STATUS (DDKAPI *WAN_SEND_HANDLER)(
-  IN NDIS_HANDLE  MacBindingHandle,
-  IN NDIS_HANDLE  LinkHandle,
-  IN PVOID  Packet);
-
-/* NDIS 4.0 extension */
-
-typedef VOID (DDKAPI *SEND_PACKETS_HANDLER)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
-
-
-typedef struct _NDIS_COMMON_OPEN_BLOCK {
-  PVOID  MacHandle;
-  NDIS_HANDLE  BindingHandle;
-  PNDIS_MINIPORT_BLOCK  MiniportHandle;
-  PNDIS_PROTOCOL_BLOCK  ProtocolHandle;
-  NDIS_HANDLE  ProtocolBindingContext;
-  PNDIS_OPEN_BLOCK  MiniportNextOpen;
-  PNDIS_OPEN_BLOCK  ProtocolNextOpen;
-  NDIS_HANDLE  MiniportAdapterContext;
-  BOOLEAN  Reserved1;
-  BOOLEAN  Reserved2;
-  BOOLEAN  Reserved3;
-  BOOLEAN  Reserved4;
-  PNDIS_STRING  BindDeviceName;
-  KSPIN_LOCK  Reserved5;
-  PNDIS_STRING  RootDeviceName;
-  _ANONYMOUS_UNION union {
-    SEND_HANDLER  SendHandler;
-    WAN_SEND_HANDLER  WanSendHandler;
-  } DUMMYUNIONNAME;
-  TRANSFER_DATA_HANDLER  TransferDataHandler;
-  SEND_COMPLETE_HANDLER  SendCompleteHandler;
-  TRANSFER_DATA_COMPLETE_HANDLER  TransferDataCompleteHandler;
-  RECEIVE_HANDLER  ReceiveHandler;
-  RECEIVE_COMPLETE_HANDLER  ReceiveCompleteHandler;
-  WAN_RECEIVE_HANDLER  WanReceiveHandler;
-  REQUEST_COMPLETE_HANDLER  RequestCompleteHandler;
-  RECEIVE_PACKET_HANDLER  ReceivePacketHandler;
-  SEND_PACKETS_HANDLER  SendPacketsHandler;
-  RESET_HANDLER  ResetHandler;
-  REQUEST_HANDLER  RequestHandler;
-  RESET_COMPLETE_HANDLER  ResetCompleteHandler;
-  STATUS_HANDLER  StatusHandler;
-  STATUS_COMPLETE_HANDLER  StatusCompleteHandler;
-#if defined(_NDIS_)
-  ULONG  Flags;
-  ULONG  References;
-  KSPIN_LOCK  SpinLock;
-  NDIS_HANDLE  FilterHandle;
-  ULONG  ProtocolOptions;
-  USHORT  CurrentLookahead;
-  USHORT  ConnectDampTicks;
-  USHORT  DisconnectDampTicks;
-  W_SEND_HANDLER  WSendHandler;
-  W_TRANSFER_DATA_HANDLER  WTransferDataHandler;
-  W_SEND_PACKETS_HANDLER  WSendPacketsHandler;
-  W_CANCEL_SEND_PACKETS_HANDLER  CancelSendPacketsHandler;
-  ULONG  WakeUpEnable;
-  PKEVENT  CloseCompleteEvent;
-  QUEUED_CLOSE  QC;
-  ULONG  AfReferences;
-  PNDIS_OPEN_BLOCK  NextGlobalOpen;
-#endif /* _NDIS_ */
-} NDIS_COMMON_OPEN_BLOCK;
-
-struct _NDIS_OPEN_BLOCK
-{
-    NDIS_COMMON_OPEN_BLOCK NdisCommonOpenBlock;
-#if defined(_NDIS_)
-    struct _NDIS_OPEN_CO
-    {
-        struct _NDIS_CO_AF_BLOCK *  NextAf;
-        W_CO_CREATE_VC_HANDLER      MiniportCoCreateVcHandler;
-        W_CO_REQUEST_HANDLER        MiniportCoRequestHandler;
-        CO_CREATE_VC_HANDLER        CoCreateVcHandler;
-        CO_DELETE_VC_HANDLER        CoDeleteVcHandler;
-        PVOID                       CmActivateVcCompleteHandler;
-        PVOID                       CmDeactivateVcCompleteHandler;
-        PVOID                       CoRequestCompleteHandler;
-        LIST_ENTRY                  ActiveVcHead;
-        LIST_ENTRY                  InactiveVcHead;
-        LONG                        PendingAfNotifications;
-        PKEVENT                     AfNotifyCompleteEvent;
-    };
-#endif /* _NDIS_ */
-};
-
-
-
-/* Routines for NDIS miniport drivers */
-
-NDISAPI
-VOID
-DDKAPI
-NdisInitializeWrapper(
-  OUT PNDIS_HANDLE  NdisWrapperHandle,
-  IN PVOID  SystemSpecific1,
-  IN PVOID  SystemSpecific2,
-  IN PVOID  SystemSpecific3);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMAllocateMapRegisters(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN UINT  DmaChannel,
-  IN BOOLEAN  Dma32BitAddresses,
-  IN ULONG  PhysicalMapRegistersNeeded,
-  IN ULONG  MaximumPhysicalMapping);
-
-/*
- * VOID
- * NdisMArcIndicateReceive(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN PUCHAR  HeaderBuffer,
- *   IN PUCHAR  DataBuffer,
- *   IN UINT  Length);
- */
-#define NdisMArcIndicateReceive(MiniportAdapterHandle, \
-                                HeaderBuffer,          \
-                                DataBuffer,            \
-                                Length)                \
-{                                                      \
-    ArcFilterDprIndicateReceive(                       \
-        (((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FilterDbs.ArcDB), \
-        (HeaderBuffer), \
-        (DataBuffer),   \
-        (Length));      \
-}
-
-/*
- * VOID
- * NdisMArcIndicateReceiveComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle);
- */
-#define NdisMArcIndicateReceiveComplete(MiniportAdapterHandle) \
-{                                                              \
-    if (((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->EthDB)  \
-	    {                                                        \
-	        NdisMEthIndicateReceiveComplete(_H);                 \
-	    }                                                        \
-                                                               \
-    ArcFilterDprIndicateReceiveComplete(                       \
-      ((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->ArcDB);   \
-}
-
-NDISAPI
-VOID
-DDKAPI
-NdisMCloseLog(
-  IN NDIS_HANDLE  LogHandle);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMCreateLog(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN UINT  Size,
-  OUT PNDIS_HANDLE  LogHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMDeregisterAdapterShutdownHandler(
-  IN NDIS_HANDLE  MiniportHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMDeregisterInterrupt(
-  IN PNDIS_MINIPORT_INTERRUPT  Interrupt);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMDeregisterIoPortRange(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN UINT  InitialPort,
-  IN UINT  NumberOfPorts,
-  IN PVOID  PortOffset);
-
-/*
- * VOID
- * NdisMEthIndicateReceive(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN NDIS_HANDLE  MiniportReceiveContext,
- *   IN PVOID  HeaderBuffer,
- *   IN UINT  HeaderBufferSize,
- *   IN PVOID  LookaheadBuffer,
- *   IN UINT  LookaheadBufferSize,
- *   IN UINT  PacketSize);
- */
-#define NdisMEthIndicateReceive(MiniportAdapterHandle,  \
-                                MiniportReceiveContext, \
-                                HeaderBuffer,           \
-                                HeaderBufferSize,       \
-                                LookaheadBuffer,        \
-                                LookaheadBufferSize,    \
-                                PacketSize)             \
-{                                                       \
-    (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->EthRxIndicateHandler)( \
-        (((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FilterDbs.EthDB), \
-		(MiniportReceiveContext), \
-		(HeaderBuffer),           \
-		(HeaderBuffer),           \
-		(HeaderBufferSize),       \
-		(LookaheadBuffer),        \
-		(LookaheadBufferSize),    \
-		(PacketSize));            \
-}
-
-/*
- * VOID
- * NdisMEthIndicateReceiveComplete(
- *   IN NDIS_HANDLE MiniportAdapterHandle);
- */
-#define NdisMEthIndicateReceiveComplete(MiniportAdapterHandle) \
-{                                                              \
-    (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->EthRxCompleteHandler)( \
-        ((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->FilterDbs.EthDB);    \
-}
-
-/*
- * VOID
- * NdisMFddiIndicateReceive(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN NDIS_HANDLE  MiniportReceiveContext,
- *   IN PVOID  HeaderBuffer,
- *   IN UINT  HeaderBufferSize,
- *   IN PVOID  LookaheadBuffer,
- *   IN UINT  LookaheadBufferSize,
- *   IN UINT  PacketSize);
- */
-#define NdisMFddiIndicateReceive(MiniportAdapterHandle,  \
-                                 MiniportReceiveContext, \
-                                 HeaderBuffer,           \
-                                 HeaderBufferSize,       \
-                                 LookaheadBuffer,        \
-                                 LookaheadBufferSize,    \
-                                 PacketSize)             \
-{                                                        \
-    (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FddiRxIndicateHandler)( \
-        (((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FilterDbs.FddiDB),   \
-        (MiniportReceiveContext),              \
-        (PUCHAR)(HeaderBuffer) + 1,            \
-        (((*(PUCHAR*)(HeaderBuffer)) & 0x40) ? \
-            FDDI_LENGTH_OF_LONG_ADDRESS :      \
-		    FDDI_LENGTH_OF_SHORT_ADDRESS),     \
-        (HeaderBuffer),                        \
-        (HeaderBufferSize),                    \
-        (LookaheadBuffer),                     \
-        (LookaheadBufferSize),                 \
-        (PacketSize));                         \
-}
-
-
-
-/*
- * VOID
- * NdisMFddiIndicateReceiveComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle);
- */
-#define NdisMFddiIndicateReceiveComplete(MiniportAdapterHandle) \
-{                                                               \
-    (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FddiRxCompleteHandler)( \
-        ((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->FilterDbs.FddiDB);      \
-}
-
-NDISAPI
-VOID
-DDKAPI
-NdisMFlushLog(
-  IN NDIS_HANDLE  LogHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMFreeMapRegisters(
-  IN NDIS_HANDLE  MiniportAdapterHandle);
-
-/*
- * VOID
- * NdisMIndicateStatus(
- *  IN NDIS_HANDLE  MiniportAdapterHandle,
- *  IN NDIS_STATUS  GeneralStatus,
- *  IN PVOID  StatusBuffer,
- *  IN UINT  StatusBufferSize);
- */
-
-#define NdisMIndicateStatus(MiniportAdapterHandle,  \
-   GeneralStatus, StatusBuffer, StatusBufferSize)   \
-  (*((PNDIS_MINIPORT_BLOCK)(_M))->StatusHandler)(   \
-  MiniportAdapterHandle, GeneralStatus, StatusBuffer, StatusBufferSize)
-
-/*
- * VOID
- * NdisMIndicateStatusComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle);
- */
-#define NdisMIndicateStatusComplete(MiniportAdapterHandle) \
-  (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->StatusCompleteHandler)( \
-    MiniportAdapterHandle)
-
-/*
- * VOID
- * NdisMInitializeWrapper(
- *   OUT PNDIS_HANDLE  NdisWrapperHandle,
- *   IN PVOID  SystemSpecific1,
- *   IN PVOID  SystemSpecific2,
- *   IN PVOID  SystemSpecific3);
- */
-#define NdisMInitializeWrapper(NdisWrapperHandle, \
-                               SystemSpecific1,   \
-                               SystemSpecific2,   \
-                               SystemSpecific3)   \
-    NdisInitializeWrapper((NdisWrapperHandle),    \
-                          (SystemSpecific1),      \
-                          (SystemSpecific2),      \
-                          (SystemSpecific3))
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMMapIoSpace(
-  OUT PVOID  *VirtualAddress,
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_PHYSICAL_ADDRESS  PhysicalAddress,
-  IN UINT  Length);
-
-/*
- * VOID
- * NdisMQueryInformationComplete(
- *  IN NDIS_HANDLE  MiniportAdapterHandle,
- *  IN NDIS_STATUS  Status);
- */
-#define NdisMQueryInformationComplete(MiniportAdapterHandle, Status) \
-  (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->QueryCompleteHandler)(MiniportAdapterHandle, Status)
-
-NDISAPI
-VOID
-DDKAPI
-NdisMRegisterAdapterShutdownHandler(
-  IN NDIS_HANDLE  MiniportHandle,
-  IN PVOID  ShutdownContext,
-  IN ADAPTER_SHUTDOWN_HANDLER  ShutdownHandler);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMRegisterInterrupt(
-  OUT PNDIS_MINIPORT_INTERRUPT  Interrupt,
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN UINT  InterruptVector,
-  IN UINT  InterruptLevel,
-  IN BOOLEAN  RequestIsr,
-  IN BOOLEAN  SharedInterrupt,
-  IN NDIS_INTERRUPT_MODE  InterruptMode);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMRegisterIoPortRange(
-  OUT PVOID  *PortOffset,
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN UINT  InitialPort,
-  IN UINT  NumberOfPorts);
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMRegisterMiniport(
-  IN NDIS_HANDLE  NdisWrapperHandle,
-  IN PNDIS_MINIPORT_CHARACTERISTICS  MiniportCharacteristics,
-  IN UINT  CharacteristicsLength);
-
-
-#if !defined(_NDIS_)
-
-/*
- * VOID
- * NdisMResetComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN NDIS_STATUS  Status,
- *   IN BOOLEAN  AddressingReset);
- */
-#define	NdisMResetComplete(MiniportAdapterHandle, \
-                           Status,                \
-                           AddressingReset)       \
-{                                                 \
-    (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->ResetCompleteHandler)( \
-        MiniportAdapterHandle, Status, AddressingReset); \
-}
-
-/*
- * VOID
- * NdisMSendComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN PNDIS_PACKET  Packet,
- *   IN NDIS_STATUS  Status);
- */
-#define	NdisMSendComplete(MiniportAdapterHandle, \
-                          Packet,                \
-                          Status)                \
-{                                                \
-    (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->SendCompleteHandler)( \
-        MiniportAdapterHandle, Packet, Status);  \
-}
-
-/*
- * VOID
- * NdisMSendResourcesAvailable(
- *   IN NDIS_HANDLE  MiniportAdapterHandle);
- */
-#define	NdisMSendResourcesAvailable(MiniportAdapterHandle) \
-{                                                \
-    (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->SendResourcesHandler)( \
-        MiniportAdapterHandle); \
-}
-
-/*
- * VOID
- * NdisMTransferDataComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN PNDIS_PACKET  Packet,
- *   IN NDIS_STATUS  Status,
- *   IN UINT  BytesTransferred);
- */
-#define	NdisMTransferDataComplete(MiniportAdapterHandle, \
-                                  Packet,                \
-                                  Status,                \
-                                  BytesTransferred)      \
-{                                                        \
-    (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TDCompleteHandler)( \
-        MiniportAdapterHandle, Packet, Status, BytesTransferred)           \
-}
-
-#endif /* !_NDIS_ */
-
-
-/*
- * VOID
- * NdisMSetAttributes(
- *  IN NDIS_HANDLE  MiniportAdapterHandle,
- *  IN NDIS_HANDLE  MiniportAdapterContext,
- *  IN BOOLEAN  BusMaster,
- *  IN NDIS_INTERFACE_TYPE  AdapterType);
- */
-#define NdisMSetAttributes(MiniportAdapterHandle,   \
-                           MiniportAdapterContext,  \
-                           BusMaster,               \
-                           AdapterType)             \
-  NdisMSetAttributesEx(MiniportAdapterHandle,       \
-    MiniportAdapterContext,                         \
-    0,                                              \
-    (BusMaster) ? NDIS_ATTRIBUTE_BUS_MASTER : 0,    \
-    AdapterType)
-
-NDISAPI
-VOID 
-DDKAPI
-NdisMSetAttributesEx(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN UINT  CheckForHangTimeInSeconds   OPTIONAL,
-  IN ULONG  AttributeFlags,
-  IN NDIS_INTERFACE_TYPE AdapterType); 
-
-/*
- * VOID
- * NdisMSetInformationComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN NDIS_STATUS  Status);
- */
-#define NdisMSetInformationComplete(MiniportAdapterHandle, \
-                                    Status) \
-  (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->SetCompleteHandler)( \
-    MiniportAdapterHandle, Status)
-
-NDISAPI
-VOID
-DDKAPI
-NdisMSleep(
-  IN ULONG  MicrosecondsToSleep);
-
-NDISAPI
-BOOLEAN
-DDKAPI
-NdisMSynchronizeWithInterrupt(
-  IN PNDIS_MINIPORT_INTERRUPT  Interrupt,
-  IN PVOID  SynchronizeFunction,
-  IN PVOID  SynchronizeContext);
-
-/*
- * VOID
- * NdisMTrIndicateReceive(
- *   IN NDIS_HANDLE  MiniportAdapterHandle,
- *   IN NDIS_HANDLE  MiniportReceiveContext,
- *   IN PVOID  HeaderBuffer,
- *   IN UINT  HeaderBufferSize,
- *   IN PVOID  LookaheadBuffer,
- *   IN UINT  LookaheadBufferSize,
- *   IN UINT  PacketSize);
- */
-#define NdisMTrIndicateReceive(MiniportAdapterHandle,  \
-                               MiniportReceiveContext, \
-                               HeaderBuffer,           \
-                               HeaderBufferSize,       \
-                               LookaheadBuffer,        \
-                               LookaheadBufferSize,    \
-                               PacketSize)             \
-{                                                      \
-    (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TrRxIndicateHandler)( \
-      (((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->FilterDbs.TrDB),     \
-		(MiniportReceiveContext), \
-		(HeaderBuffer),           \
-		(HeaderBuffer),           \
-		(HeaderBufferSize),       \
-		(LookaheadBuffer),        \
-		(LookaheadBufferSize),    \
-		(PacketSize));            \
-}
-
-/*
- * VOID
- * NdisMTrIndicateReceiveComplete(
- *   IN NDIS_HANDLE  MiniportAdapterHandle);
- */
-#define NdisMTrIndicateReceiveComplete(MiniportAdapterHandle) \
-{                                                             \
-	(*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->TrRxCompleteHandler)( \
-    ((PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle)->FilterDbs.TrDB);    \
-}
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisMWriteLogData(
-  IN NDIS_HANDLE  LogHandle,
-  IN PVOID  LogBuffer,
-  IN UINT  LogBufferSize);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMQueryAdapterResources(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  WrapperConfigurationContext,
-  OUT PNDIS_RESOURCE_LIST  ResourceList,
-  IN OUT PUINT  BufferSize);
-
-NDISAPI
-VOID
-DDKAPI
-NdisTerminateWrapper(
-  IN NDIS_HANDLE  NdisWrapperHandle,
-  IN PVOID  SystemSpecific);
-
-NDISAPI
-VOID
-DDKAPI
-NdisMUnmapIoSpace(
-  IN NDIS_HANDLE  MiniportAdapterHandle,
-  IN PVOID  VirtualAddress,
-  IN UINT  Length);
-
-
-
-/* NDIS intermediate miniport structures */
-
-typedef VOID (DDKAPI *W_MINIPORT_CALLBACK)(
-  IN NDIS_HANDLE  MiniportAdapterContext,
-  IN PVOID  CallbackContext);
-
-
-
-/* Routines for intermediate miniport drivers */
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisIMDeInitializeDeviceInstance(
-  IN NDIS_HANDLE NdisMiniportHandle);
-
-/*
- * NDIS_STATUS
- * NdisIMInitializeDeviceInstance(
- *   IN NDIS_HANDLE  DriverHandle,
- *   IN PNDIS_STRING  DeviceInstance);
- */
-#define NdisIMInitializeDeviceInstance(DriverHandle, DeviceInstance) \
-  NdisIMInitializeDeviceInstanceEx(DriverHandle, DeviceInstance, NULL)
-
-NDISAPI
-NDIS_STATUS
-DDKAPI
-NdisIMRegisterLayeredMiniport(
-  IN NDIS_HANDLE  NdisWrapperHandle,
-  IN PNDIS_MINIPORT_CHARACTERISTICS  MiniportCharacteristics,
-  IN UINT  CharacteristicsLength,
-  OUT PNDIS_HANDLE  DriverHandle);
-
-
-/* Functions obsoleted by NDIS 5.0 */
-
-NDISAPI
-VOID
-DDKAPI
-NdisFreeDmaChannel(
-  IN PNDIS_HANDLE  NdisDmaHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisSetupDmaTransfer(
-  OUT PNDIS_STATUS  Status,
-  IN PNDIS_HANDLE  NdisDmaHandle,
-  IN PNDIS_BUFFER  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length,
-  IN BOOLEAN  WriteToDevice);
-
-NDISAPI
-NTSTATUS
-DDKAPI
-NdisUpcaseUnicodeString(
-  OUT PUNICODE_STRING  DestinationString,  
-  IN PUNICODE_STRING  SourceString);
-
-
-/* Routines for NDIS protocol drivers */
-
-NDISAPI
-VOID
-DDKAPI
-NdisRequest(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PNDIS_REQUEST  NdisRequest);
-
-NDISAPI
-VOID
-DDKAPI
-NdisReset(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisBindingHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisSend(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PNDIS_PACKET  Packet);
-
-NDISAPI
-VOID
-DDKAPI
-NdisSendPackets(
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN PPNDIS_PACKET  PacketArray,
-  IN UINT  NumberOfPackets);
-
-NDISAPI
-VOID
-DDKAPI
-NdisTransferData(
-  OUT PNDIS_STATUS        Status,
-  IN NDIS_HANDLE  NdisBindingHandle,
-  IN NDIS_HANDLE  MacReceiveContext,
-  IN UINT  ByteOffset,
-  IN UINT  BytesToTransfer,
-  IN OUT PNDIS_PACKET  Packet,
-  OUT PUINT  BytesTransferred);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCloseAdapter(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisBindingHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCompleteBindAdapter(
-  IN NDIS_HANDLE  BindAdapterContext,
-  IN NDIS_STATUS  Status,
-  IN NDIS_STATUS  OpenStatus);
-
-NDISAPI
-VOID
-DDKAPI
-NdisCompleteUnbindAdapter(
-  IN NDIS_HANDLE  UnbindAdapterContext,
-  IN NDIS_STATUS  Status);
-
-NDISAPI
-VOID
-DDKAPI
-NdisDeregisterProtocol(
-  OUT PNDIS_STATUS  Status,
-  IN NDIS_HANDLE  NdisProtocolHandle);
-
-NDISAPI
-VOID
-DDKAPI
-NdisOpenAdapter(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_STATUS  OpenErrorStatus,
-  OUT PNDIS_HANDLE  NdisBindingHandle,
-  OUT PUINT  SelectedMediumIndex,
-  IN PNDIS_MEDIUM  MediumArray,
-  IN UINT  MediumArraySize,
-  IN NDIS_HANDLE  NdisProtocolHandle,
-  IN NDIS_HANDLE  ProtocolBindingContext,
-  IN PNDIS_STRING  AdapterName,
-  IN UINT  OpenOptions,
-  IN PSTRING  AddressingInformation);
-
-NDISAPI
-VOID
-DDKAPI
-NdisOpenProtocolConfiguration(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_HANDLE  ConfigurationHandle,
-  IN PNDIS_STRING  ProtocolSection);
-
-NDISAPI
-VOID
-DDKAPI
-NdisRegisterProtocol(
-  OUT PNDIS_STATUS  Status,
-  OUT PNDIS_HANDLE  NdisProtocolHandle,
-  IN PNDIS_PROTOCOL_CHARACTERISTICS  ProtocolCharacteristics,
-  IN UINT  CharacteristicsLength);
-
-/* Obsoleted in Windows XP */
-
-/* Prototypes for NDIS_MAC_CHARACTERISTICS */
-
-typedef NDIS_STATUS (*OPEN_ADAPTER_HANDLER)(
-  OUT PNDIS_STATUS  OpenErrorStatus,
-  OUT NDIS_HANDLE  *MacBindingHandle,
-  OUT PUINT  SelectedMediumIndex,
-  IN PNDIS_MEDIUM  MediumArray,
-  IN UINT  MediumArraySize,
-  IN NDIS_HANDLE  NdisBindingContext,
-  IN NDIS_HANDLE  MacAdapterContext,
-  IN UINT  OpenOptions,
-  IN PSTRING  AddressingInformation  OPTIONAL);
-
-typedef NDIS_STATUS (DDKAPI *CLOSE_ADAPTER_HANDLER)(
-  IN NDIS_HANDLE  MacBindingHandle);
-
-typedef NDIS_STATUS (DDKAPI *WAN_TRANSFER_DATA_HANDLER)(
-  VOID);
-
-typedef NDIS_STATUS (DDKAPI *QUERY_GLOBAL_STATISTICS_HANDLER)(
-  IN NDIS_HANDLE  MacAdapterContext,
-  IN PNDIS_REQUEST  NdisRequest);
-
-typedef VOID (DDKAPI *UNLOAD_MAC_HANDLER)(
-  IN NDIS_HANDLE  MacMacContext);
-
-typedef NDIS_STATUS (DDKAPI *ADD_ADAPTER_HANDLER)(
-  IN NDIS_HANDLE  MacMacContext,
-  IN NDIS_HANDLE  WrapperConfigurationContext,
-  IN PNDIS_STRING  AdapterName);
-
-typedef VOID (*REMOVE_ADAPTER_HANDLER)(
-  IN NDIS_HANDLE  MacAdapterContext);
-
-typedef struct _NDIS_MAC_CHARACTERISTICS {
-  UCHAR  MajorNdisVersion;
-  UCHAR  MinorNdisVersion;
-  UINT  Reserved;
-  OPEN_ADAPTER_HANDLER  OpenAdapterHandler;
-  CLOSE_ADAPTER_HANDLER  CloseAdapterHandler;
-  SEND_HANDLER  SendHandler;
-  TRANSFER_DATA_HANDLER  TransferDataHandler;
-  RESET_HANDLER  ResetHandler;
-  REQUEST_HANDLER  RequestHandler;
-  QUERY_GLOBAL_STATISTICS_HANDLER  QueryGlobalStatisticsHandler;
-  UNLOAD_MAC_HANDLER  UnloadMacHandler;
-  ADD_ADAPTER_HANDLER  AddAdapterHandler;
-  REMOVE_ADAPTER_HANDLER  RemoveAdapterHandler;
-  NDIS_STRING  Name;
-} NDIS_MAC_CHARACTERISTICS, *PNDIS_MAC_CHARACTERISTICS;
-
-typedef	NDIS_MAC_CHARACTERISTICS        NDIS_WAN_MAC_CHARACTERISTICS;
-typedef	NDIS_WAN_MAC_CHARACTERISTICS    *PNDIS_WAN_MAC_CHARACTERISTICS;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NDIS_H */
-
-/* EOF */
diff --git a/winsup/w32api/include/ddk/ndisguid.h b/winsup/w32api/include/ddk/ndisguid.h
deleted file mode 100644
index 27b8777bf..000000000
--- a/winsup/w32api/include/ddk/ndisguid.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * ndisguid.h
- *
- * GUIDs for NDIS drivers
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NDISGUID_H
-#define __NDISGUID_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-DEFINE_GUID(GUID_NDIS_LAN_CLASS,
-  0xad498944, 0x762f, 0x11d0, 0x8d, 0xcb, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ENUMERATE_ADAPTER,
-  0x981f2d7f, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ENUMERATE_VC,
-  0x981f2d82, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_NOTIFY_ADAPTER_ARRIVAL,
-  0x981f2d81, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_NOTIFY_ADAPTER_REMOVAL,
-  0x981f2d80, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_NOTIFY_VC_ARRIVAL,
-  0x182f9e0c, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_NOTIFY_VC_REMOVAL,
-  0x981f2d79, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_NOTIFY_BIND,
-  0x5413531c, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_NOTIFY_UNBIND,
-  0x6e3ce1ec, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_WAKE_ON_MAGIC_PACKET_ONLY,
-  0xa14f1c97, 0x8839, 0x4f8a, 0x99, 0x96, 0xa2, 0x89, 0x96, 0xeb, 0xbf, 0x1d);
-
-
-DEFINE_GUID(GUID_NDIS_802_3_CURRENT_ADDRESS,
-  0x44795700, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_3_MAC_OPTIONS,
-  0x44795703, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_3_MAXIMUM_LIST_SIZE,
-  0x44795702, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_3_MULTICAST_LIST,
-  0x44795701, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_3_PERMANENT_ADDRESS,
-  0x447956ff, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_3_RCV_ERROR_ALIGNMENT,
-  0x44795704, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_3_XMIT_MORE_COLLISIONS,
-  0x44795706, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_3_XMIT_ONE_COLLISION,
-  0x44795705, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_5_CURRENT_ADDRESS,
-  0x44795708, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_5_CURRENT_FUNCTIONAL,
-  0x44795709, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_5_CURRENT_GROUP,
-  0x4479570a, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_5_CURRENT_RING_STATE,
-  0xacf14032, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_5_CURRENT_RING_STATUS,
-  0x890a36ec, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_5_LAST_OPEN_STATUS,
-  0x4479570b, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_5_PERMANENT_ADDRESS,
-  0x44795707, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_5_LINE_ERRORS,
-  0xacf14033, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_802_5_LOST_FRAMES,
-  0xacf14034, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-
-DEFINE_GUID(GUID_NDIS_802_11_ADD_WEP,
-  0x4307bff0, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_AUTHENTICATION_MODE,
-  0x43920a24, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_BSSID,
-  0x2504b6c2, 0x1fa5, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_BSSID_LIST,
-  0x69526f9a, 0x2062, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_BASIC_RATES,
-  0x4a198516, 0x2068, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_CONFIGURATION,
-  0x4a4df982, 0x2068, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_DESIRED_RATES,
-  0x452ee08e, 0x2536, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_DISASSOCIATE,
-  0x43671f40, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_FRAGMENTATION_THRESHOLD,
-  0x69aaa7c4, 0x2062, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_INFRASTRUCTURE_MODE,
-  0x697d5a7e, 0x2062, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_NETWORK_TYPES_SUPPORTED,
-  0x8531d6e6, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_NETWORK_TYPE_IN_USE,
-  0x857e2326, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_NUMBER_OF_ANTENNAS,
-  0x01779336, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_POWER_MODE,
-  0x85be837c, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_RATES_SUPPORTED,
-  0x49db8722, 0x2068, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_REMOVE_WEP,
-  0x433c345c, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_PRIVACY_FILTER,
-  0x6733c4e9, 0x4792, 0x11d4, 0x97, 0xf1, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_RSSI,
-  0x1507db16, 0x2053, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_RSSI_TRIGGER,
-  0x155689b8, 0x2053, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_RTS_THRESHOLD,
-  0x0134d07e, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_RX_ANTENNA_SELECTED,
-  0x01ac07a2, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_SSID,
-  0x7d2a90ea, 0x2041, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_STATISTICS,
-  0x42bb73b0, 0x2129, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_TX_POWER_LEVEL,
-  0x11e6ba76, 0x2053, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-DEFINE_GUID(GUID_NDIS_802_11_TX_ANTENNA_SELECTED,
-  0x01dbb74a, 0x2064, 0x11d4, 0x97, 0xeb, 0x00, 0xc0, 0x4f, 0x79, 0xc4, 0x03);
-
-
-DEFINE_GUID(GUID_NDIS_ATM_HW_CURRENT_ADDRESS,
-  0x791ad1a1, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_MAX_AAL0_PACKET_SIZE,
-  0x791ad1a5, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_MAX_AAL1_PACKET_SIZE,
-  0x791ad1a6, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_MAX_AAL34_PACKET_SIZE,
-  0x791ad1a7, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_MAX_AAL5_PACKET_SIZE,
-  0x791ad191, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_MAX_ACTIVE_VCI_BITS,
-  0x791ad1a3, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_MAX_ACTIVE_VCS,
-  0x791ad1a2, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_MAX_ACTIVE_VPI_BITS,
-  0x791ad1a4, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_SUPPORTED_AAL_TYPES,
-  0x791ad1a0, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_SUPPORTED_SERVICE_CATEGORY,
-  0x791ad19f, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_SUPPORTED_VC_RATES,
-  0x791ad19e, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-
-DEFINE_GUID(GUID_NDIS_ATM_RCV_CELLS_DROPPED,
-  0x0a21480c, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_RCV_CELLS_OK,
-  0x0a21480a, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_ATM_XMIT_CELLS_OK,
-  0x0a21480b, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-
-DEFINE_GUID(GUID_NDIS_FDDI_LONG_CURRENT_ADDR,
-  0xacf14036, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_LONG_MAX_LIST_SIZE,
-  0xacf14038, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_LONG_MULTICAST_LIST,
-  0xacf14037, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_LONG_PERMANENT_ADDR,
-  0xacf14035, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_SHORT_CURRENT_ADDR,
-  0xacf1403a, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_SHORT_MAX_LIST_SIZE,
-  0xacf1403c, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_SHORT_MULTICAST_LIST,
-  0xacf1403b, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_SHORT_PERMANENT_ADDR,
-  0xacf14039, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-
-DEFINE_GUID(GUID_NDIS_FDDI_ATTACHMENT_TYPE,
-  0xacf1403d, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_DOWNSTREAM_NODE_LONG,
-  0xacf1403f, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_FRAME_ERRORS,
-  0xacf14040, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_FRAMES_LOST,
-  0xacf14041, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_LCT_FAILURES,
-  0xacf14043, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_LCONNECTION_STATE,
-  0xacf14045, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_LEM_REJECTS,
-  0xacf14044, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_RING_MGT_STATE,
-  0xacf14042, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_FDDI_UPSTREAM_NODE_LONG,
-  0xacf1403e, 0xa61c, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-
-DEFINE_GUID(GUID_NDIS_GEN_CURRENT_LOOKAHEAD,
-  0x5ec10361, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CURRENT_PACKET_FILTER,
-  0x5ec10360, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_DRIVER_VERSION,
-  0x5ec10362, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_HARDWARE_STATUS,
-  0x5ec10354, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_MEDIA_IN_USE,
-  0x5ec10356, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_MEDIA_SUPPORTED,
-  0x5ec10355, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_LINK_SPEED,
-  0x5ec10359, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_MAC_OPTIONS,
-  0x5ec10365, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_LOOKAHEAD,
-  0x5ec10357, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_FRAME_SIZE,
-  0x5ec10358, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_SEND_PACKETS,
-  0x5ec10367, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_MAXIMUM_TOTAL_SIZE,
-  0x5ec10363, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_MEDIA_CONNECT_STATUS,
-  0x5ec10366, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_RECEIVE_BLOCK_SIZE,
-  0x5ec1035d, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_RECEIVE_BUFFER_SPACE,
-  0x5ec1035b, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_TRANSMIT_BUFFER_SPACE,
-  0x5ec1035a, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_TRANSMIT_BLOCK_SIZE,
-  0x5ec1035c, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_VENDOR_DESCRIPTION,
-  0x5ec1035f, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_VENDOR_DRIVER_VERSION,
-  0x447956f9, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_VENDOR_ID,
-  0x5ec1035e, 0xa61a, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-
-DEFINE_GUID(GUID_NDIS_GEN_RCV_ERROR,
-  0x447956fd, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_RCV_NO_BUFFER,
-  0x447956fe, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_RCV_OK,
-  0x447956fb, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_XMIT_ERROR,
-  0x447956fc, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_XMIT_OK,
-  0x447956fa, 0xa61b, 0x11d0, 0x8d, 0xd4, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_DRIVER_VERSION,
-  0x791ad198, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_HARDWARE_STATUS,
-  0x791ad192, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_LINK_SPEED,
-  0x791ad195, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_MAC_OPTIONS,
-  0x791ad19a, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_MEDIA_SUPPORTED,
-  0x791ad193, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_MEDIA_IN_USE,
-  0x791ad194, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_MEDIA_CONNECT_STATUS,
-  0x791ad19b, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_MINIMUM_LINK_SPEED,
-  0x791ad19d, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_VENDOR_DESCRIPTION,
-  0x791ad197, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_VENDOR_DRIVER_VERSION,
-  0x791ad19c, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_VENDOR_ID,
-  0x791ad196, 0xe35c, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_RCV_PDUS_ERROR,
-  0x0a214808, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_RCV_PDUS_OK,
-  0x0a214806, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_RCV_PDUS_NO_BUFFER,
-  0x0a214809, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_XMIT_PDUS_ERROR,
-  0x0a214807, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_GEN_CO_XMIT_PDUS_OK,
-  0x0a214805, 0xe35f, 0x11d0, 0x96, 0x92, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-
-DEFINE_GUID(GUID_NDIS_STATUS_LINK_SPEED_CHANGE,
-  0x981f2d85, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_STATUS_MEDIA_CONNECT,
-  0x981f2d7d, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_STATUS_MEDIA_DISCONNECT,
-  0x981f2d7e, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_STATUS_MEDIA_SPECIFIC_INDICATION,
-  0x981f2d84, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_STATUS_RESET_END,
-  0x981f2d77, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-DEFINE_GUID(GUID_NDIS_STATUS_RESET_START,
-  0x981f2d76, 0xb1f3, 0x11d0, 0x8d, 0xd7, 0x00, 0xc0, 0x4f, 0xc3, 0x35, 0x8c);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NDISGUID_H */
diff --git a/winsup/w32api/include/ddk/ndistapi.h b/winsup/w32api/include/ddk/ndistapi.h
deleted file mode 100644
index 774f42af9..000000000
--- a/winsup/w32api/include/ddk/ndistapi.h
+++ /dev/null
@@ -1,1312 +0,0 @@
-/*
- * ndistapi.h
- *
- * NDIS Telephony API
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NDISTAPI_H
-#define __NDISTAPI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ndis.h"
-
-#ifndef NDIS_TAPI_CURRENT_VERSION
-#define NDIS_TAPI_CURRENT_VERSION         0x00010003
-#endif
-
-typedef ULONG_PTR HTAPI_LINE;
-typedef ULONG_PTR HDRV_LINE;
-typedef ULONG_PTR HTAPI_CALL;
-typedef ULONG_PTR HDRV_CALL;
-
-#define NDIS_STATUS_TAPI_ADDRESSBLOCKED               ((NDIS_STATUS)0xC0012000L)
-#define NDIS_STATUS_TAPI_BEARERMODEUNAVAIL            ((NDIS_STATUS)0xC0012001L)
-#define NDIS_STATUS_TAPI_CALLUNAVAIL                  ((NDIS_STATUS)0xC0012002L)
-#define NDIS_STATUS_TAPI_DIALBILLING                  ((NDIS_STATUS)0xC0012003L)
-#define NDIS_STATUS_TAPI_DIALDIALTONE                 ((NDIS_STATUS)0xC0012004L)
-#define NDIS_STATUS_TAPI_DIALPROMPT                   ((NDIS_STATUS)0xC0012005L)
-#define NDIS_STATUS_TAPI_DIALQUIET                    ((NDIS_STATUS)0xC0012006L)
-#define NDIS_STATUS_TAPI_INCOMPATIBLEEXTVERSION       ((NDIS_STATUS)0xC0012007L)
-#define NDIS_STATUS_TAPI_INUSE                        ((NDIS_STATUS)0xC0012008L)
-#define NDIS_STATUS_TAPI_INVALADDRESS                 ((NDIS_STATUS)0xC0012009L)
-#define NDIS_STATUS_TAPI_INVALADDRESSID               ((NDIS_STATUS)0xC001200AL)
-#define NDIS_STATUS_TAPI_INVALADDRESSMODE             ((NDIS_STATUS)0xC001200BL)
-#define NDIS_STATUS_TAPI_INVALBEARERMODE              ((NDIS_STATUS)0xC001200CL)
-#define NDIS_STATUS_TAPI_INVALCALLHANDLE              ((NDIS_STATUS)0xC001200DL)
-#define NDIS_STATUS_TAPI_INVALCALLPARAMS              ((NDIS_STATUS)0xC001200EL)
-#define NDIS_STATUS_TAPI_INVALCALLSTATE               ((NDIS_STATUS)0xC001200FL)
-#define NDIS_STATUS_TAPI_INVALDEVICECLASS             ((NDIS_STATUS)0xC0012010L)
-#define NDIS_STATUS_TAPI_INVALLINEHANDLE              ((NDIS_STATUS)0xC0012011L)
-#define NDIS_STATUS_TAPI_INVALLINESTATE               ((NDIS_STATUS)0xC0012012L)
-#define NDIS_STATUS_TAPI_INVALMEDIAMODE               ((NDIS_STATUS)0xC0012013L)
-#define NDIS_STATUS_TAPI_INVALRATE                    ((NDIS_STATUS)0xC0012014L)
-#define NDIS_STATUS_TAPI_NODRIVER                     ((NDIS_STATUS)0xC0012015L)
-#define NDIS_STATUS_TAPI_OPERATIONUNAVAIL             ((NDIS_STATUS)0xC0012016L)
-#define NDIS_STATUS_TAPI_RATEUNAVAIL                  ((NDIS_STATUS)0xC0012017L)
-#define NDIS_STATUS_TAPI_RESOURCEUNAVAIL              ((NDIS_STATUS)0xC0012018L)
-#define NDIS_STATUS_TAPI_STRUCTURETOOSMALL            ((NDIS_STATUS)0xC0012019L)
-#define NDIS_STATUS_TAPI_USERUSERINFOTOOBIG           ((NDIS_STATUS)0xC001201AL)
-#define NDIS_STATUS_TAPI_ALLOCATED                    ((NDIS_STATUS)0xC001201BL)
-#define NDIS_STATUS_TAPI_INVALADDRESSSTATE            ((NDIS_STATUS)0xC001201CL)
-#define NDIS_STATUS_TAPI_INVALPARAM                   ((NDIS_STATUS)0xC001201DL)
-#define NDIS_STATUS_TAPI_NODEVICE                     ((NDIS_STATUS)0xC001201EL)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_NORMAL        ((NDIS_STATUS)0xC0012020L)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_UNKNOWN       ((NDIS_STATUS)0xC0012021L)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_REJECT        ((NDIS_STATUS)0xC0012022L)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_PICKUP        ((NDIS_STATUS)0xC0012023L)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_FORWARDED     ((NDIS_STATUS)0xC0012024L)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_BUSY          ((NDIS_STATUS)0xC0012025L)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_NOANSWER      ((NDIS_STATUS)0xC0012026L)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_BADADDRESS    ((NDIS_STATUS)0xC0012027L)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_UNREACHABLE   ((NDIS_STATUS)0xC0012028L)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_CONGESTION    ((NDIS_STATUS)0xC0012029L)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_INCOMPATIBLE  ((NDIS_STATUS)0xC001202AL)
-#define NDIS_STATUS_TAPI_DISCONNECTMODE_UNAVAIL       ((NDIS_STATUS)0xC001202BL)
-#define NDIS_STATUS_TAPI_RECV_DIGIT					          ((NDIS_STATUS)0x40010020L)
-
-#define LINE_ADDRESSSTATE                 0L
-#define LINE_CALLINFO                     1L
-#define LINE_CALLSTATE                    2L
-#define LINE_CLOSE                        3L
-#define LINE_DEVSPECIFIC                  4L
-#define LINE_DEVSPECIFICFEATURE           5L
-#define LINE_GATHERDIGITS                 6L
-#define LINE_GENERATE                     7L
-#define LINE_LINEDEVSTATE                 8L
-#define LINE_MONITORDIGITS                9L
-#define LINE_MONITORMEDIA                 10L
-#define LINE_MONITORTONE                  11L
-#define LINE_REPLY                        12L
-#define LINE_REQUEST                      13L
-#define LINE_CREATE                       19L
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINE_AGENTSPECIFIC                21L
-#define LINE_AGENTSTATUS                  22L
-#define LINE_APPNEWCALL                   23L
-#define LINE_PROXYREQUEST                 24L
-#define LINE_REMOVE                       25L
-#endif
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020002)
-#define LINE_AGENTSESSIONSTATUS           27L
-#define LINE_QUEUESTATUS                  28L
-#define LINE_AGENTSTATUSEX                29L
-#define LINE_GROUPSTATUS                  30L
-#define LINE_PROXYSTATUS                  31L
-#endif
-#if (TAPI_CURRENT_VERSION >= 0x00030000)
-#define LINE_APPNEWCALLHUB                32L
-#define LINE_CALLHUBCLOSE                 33L
-#define LINE_DEVSPECIFICEX                34L
-#endif
-
-#define TSPI_MESSAGE_BASE                 500L
-#define LINE_NEWCALL                      TSPI_MESSAGE_BASE
-#define LINE_CALLDEVSPECIFIC              (TSPI_MESSAGE_BASE + 1L)
-#define STRINGFORMAT_ASCII                0x00000001
-#define STRINGFORMAT_DBCS                 0x00000002
-#define STRINGFORMAT_UNICODE              0x00000003
-#define STRINGFORMAT_BINARY               0x00000004
-
-#define LINEADDRCAPFLAGS_FWDNUMRINGS      0x00000001
-#define LINEADDRCAPFLAGS_PICKUPGROUPID    0x00000002
-#define LINEADDRCAPFLAGS_SECURE           0x00000004
-#define LINEADDRCAPFLAGS_BLOCKIDDEFAULT   0x00000008
-#define LINEADDRCAPFLAGS_BLOCKIDOVERRIDE  0x00000010
-#define LINEADDRCAPFLAGS_DIALED           0x00000020
-#define LINEADDRCAPFLAGS_ORIGOFFHOOK      0x00000040
-#define LINEADDRCAPFLAGS_DESTOFFHOOK      0x00000080
-#define LINEADDRCAPFLAGS_FWDCONSULT       0x00000100
-#define LINEADDRCAPFLAGS_SETUPCONFNULL    0x00000200
-#define LINEADDRCAPFLAGS_AUTORECONNECT    0x00000400
-#define LINEADDRCAPFLAGS_COMPLETIONID     0x00000800
-#define LINEADDRCAPFLAGS_TRANSFERHELD     0x00001000
-#define LINEADDRCAPFLAGS_TRANSFERMAKE     0x00002000
-#define LINEADDRCAPFLAGS_CONFERENCEHELD   0x00004000
-#define LINEADDRCAPFLAGS_CONFERENCEMAKE   0x00008000
-#define LINEADDRCAPFLAGS_PARTIALDIAL      0x00010000
-#define LINEADDRCAPFLAGS_FWDSTATUSVALID   0x00020000
-#define LINEADDRCAPFLAGS_FWDINTEXTADDR    0x00040000
-#define LINEADDRCAPFLAGS_FWDBUSYNAADDR    0x00080000
-#define LINEADDRCAPFLAGS_ACCEPTTOALERT    0x00100000
-#define LINEADDRCAPFLAGS_CONFDROP         0x00200000
-#define LINEADDRCAPFLAGS_PICKUPCALLWAIT   0x00400000
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINEADDRCAPFLAGS_PREDICTIVEDIALER 0x00800000
-#define LINEADDRCAPFLAGS_QUEUE            0x01000000
-#define LINEADDRCAPFLAGS_ROUTEPOINT       0x02000000
-#define LINEADDRCAPFLAGS_HOLDMAKESNEW     0x04000000
-#define LINEADDRCAPFLAGS_NOINTERNALCALLS  0x08000000
-#define LINEADDRCAPFLAGS_NOEXTERNALCALLS  0x10000000
-#define LINEADDRCAPFLAGS_SETCALLINGID     0x20000000
-#endif
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
-#define LINEADDRCAPFLAGS_ACDGROUP         0x40000000
-#define LINEADDRCAPFLAGS_NOPSTNADDRESSTRANSLATION \
-                                          0x80000000
-#endif
-
-#define LINEADDRESSMODE_ADDRESSID         0x00000001
-#define LINEADDRESSMODE_DIALABLEADDR      0x00000002
-#define LINEADDRESSSHARING_PRIVATE        0x00000001
-#define LINEADDRESSSHARING_BRIDGEDEXCL    0x00000002
-#define LINEADDRESSSHARING_BRIDGEDNEW     0x00000004
-#define LINEADDRESSSHARING_BRIDGEDSHARED  0x00000008
-#define LINEADDRESSSHARING_MONITORED      0x00000010
-#define LINEADDRESSSTATE_OTHER            0x00000001
-#define LINEADDRESSSTATE_DEVSPECIFIC      0x00000002
-#define LINEADDRESSSTATE_INUSEZERO        0x00000004
-#define LINEADDRESSSTATE_INUSEONE         0x00000008
-#define LINEADDRESSSTATE_INUSEMANY        0x00000010
-#define LINEADDRESSSTATE_NUMCALLS         0x00000020
-#define LINEADDRESSSTATE_FORWARD          0x00000040
-#define LINEADDRESSSTATE_TERMINALS        0x00000080
-
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
-#define LINEADDRESSTYPE_PHONENUMBER       0x00000001
-#define LINEADDRESSTYPE_SDP               0x00000002
-#define LINEADDRESSTYPE_EMAILNAME         0x00000004
-#define LINEADDRESSTYPE_DOMAINNAME        0x00000008
-#define LINEADDRESSTYPE_IPADDRESS         0x00000010
-#endif
-
-#define LINEADDRFEATURE_FORWARD           0x00000001
-#define LINEADDRFEATURE_MAKECALL          0x00000002
-#define LINEADDRFEATURE_PICKUP            0x00000004
-#define LINEADDRFEATURE_SETMEDIACONTROL   0x00000008
-#define LINEADDRFEATURE_SETTERMINAL       0x00000010
-#define LINEADDRFEATURE_SETUPCONF         0x00000020
-#define LINEADDRFEATURE_UNCOMPLETECALL    0x00000040
-#define LINEADDRFEATURE_UNPARK            0x00000080
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINEADDRFEATURE_PICKUPHELD        0x00000100
-#define LINEADDRFEATURE_PICKUPGROUP       0x00000200
-#define LINEADDRFEATURE_PICKUPDIRECT      0x00000400
-#define LINEADDRFEATURE_PICKUPWAITING     0x00000800
-#define LINEADDRFEATURE_FORWARDFWD        0x00001000
-#define LINEADDRFEATURE_FORWARDDND        0x00002000
-#endif
-
-#define LINEANSWERMODE_NONE               0x00000001
-#define LINEANSWERMODE_DROP               0x00000002
-#define LINEANSWERMODE_HOLD               0x00000004
-
-#define LINEBEARERMODE_VOICE              0x00000001
-#define LINEBEARERMODE_SPEECH             0x00000002
-#define LINEBEARERMODE_MULTIUSE           0x00000004
-#define LINEBEARERMODE_DATA               0x00000008
-#define LINEBEARERMODE_ALTSPEECHDATA      0x00000010
-#define LINEBEARERMODE_NONCALLSIGNALING   0x00000020
-#define LINEBEARERMODE_PASSTHROUGH        0x00000040
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINEBEARERMODE_RESTRICTEDDATA     0x00000080
-#endif
-
-#define LINEBUSYMODE_STATION              0x00000001
-#define LINEBUSYMODE_TRUNK                0x00000002
-#define LINEBUSYMODE_UNKNOWN              0x00000004
-#define LINEBUSYMODE_UNAVAIL              0x00000008
-
-#define LINECALLCOMPLCOND_BUSY            0x00000001
-#define LINECALLCOMPLCOND_NOANSWER        0x00000002
-
-#define LINECALLCOMPLMODE_CAMPON          0x00000001
-#define LINECALLCOMPLMODE_CALLBACK        0x00000002
-#define LINECALLCOMPLMODE_INTRUDE         0x00000004
-#define LINECALLCOMPLMODE_MESSAGE         0x00000008
-
-#define LINECALLFEATURE_ACCEPT            0x00000001
-#define LINECALLFEATURE_ADDTOCONF         0x00000002
-#define LINECALLFEATURE_ANSWER            0x00000004
-#define LINECALLFEATURE_BLINDTRANSFER     0x00000008
-#define LINECALLFEATURE_COMPLETECALL      0x00000010
-#define LINECALLFEATURE_COMPLETETRANSF    0x00000020
-#define LINECALLFEATURE_DIAL              0x00000040
-#define LINECALLFEATURE_DROP              0x00000080
-#define LINECALLFEATURE_GATHERDIGITS      0x00000100
-#define LINECALLFEATURE_GENERATEDIGITS    0x00000200
-#define LINECALLFEATURE_GENERATETONE      0x00000400
-#define LINECALLFEATURE_HOLD              0x00000800
-#define LINECALLFEATURE_MONITORDIGITS     0x00001000
-#define LINECALLFEATURE_MONITORMEDIA      0x00002000
-#define LINECALLFEATURE_MONITORTONES      0x00004000
-#define LINECALLFEATURE_PARK              0x00008000
-#define LINECALLFEATURE_PREPAREADDCONF    0x00010000
-#define LINECALLFEATURE_REDIRECT          0x00020000
-#define LINECALLFEATURE_REMOVEFROMCONF    0x00040000
-#define LINECALLFEATURE_SECURECALL        0x00080000
-#define LINECALLFEATURE_SENDUSERUSER      0x00100000
-#define LINECALLFEATURE_SETCALLPARAMS     0x00200000
-#define LINECALLFEATURE_SETMEDIACONTROL   0x00400000
-#define LINECALLFEATURE_SETTERMINAL       0x00800000
-#define LINECALLFEATURE_SETUPCONF         0x01000000
-#define LINECALLFEATURE_SETUPTRANSFER     0x02000000
-#define LINECALLFEATURE_SWAPHOLD          0x04000000
-#define LINECALLFEATURE_UNHOLD            0x08000000
-#define LINECALLFEATURE_RELEASEUSERUSERINFO \
-                                          0x10000000
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINECALLFEATURE_SETTREATMENT      0x20000000
-#define LINECALLFEATURE_SETQOS            0x40000000
-#define LINECALLFEATURE_SETCALLDATA       0x80000000
-#endif
-
-#define LINECALLINFOSTATE_OTHER           0x00000001
-#define LINECALLINFOSTATE_DEVSPECIFIC     0x00000002
-#define LINECALLINFOSTATE_BEARERMODE      0x00000004
-#define LINECALLINFOSTATE_RATE            0x00000008
-#define LINECALLINFOSTATE_MEDIAMODE       0x00000010
-#define LINECALLINFOSTATE_APPSPECIFIC     0x00000020
-#define LINECALLINFOSTATE_CALLID          0x00000040
-#define LINECALLINFOSTATE_RELATEDCALLID   0x00000080
-#define LINECALLINFOSTATE_ORIGIN          0x00000100
-#define LINECALLINFOSTATE_REASON          0x00000200
-#define LINECALLINFOSTATE_COMPLETIONID    0x00000400
-#define LINECALLINFOSTATE_NUMOWNERINCR    0x00000800
-#define LINECALLINFOSTATE_NUMOWNERDECR    0x00001000
-#define LINECALLINFOSTATE_NUMMONITORS     0x00002000
-#define LINECALLINFOSTATE_TRUNK           0x00004000
-#define LINECALLINFOSTATE_CALLERID        0x00008000
-#define LINECALLINFOSTATE_CALLEDID        0x00010000
-#define LINECALLINFOSTATE_CONNECTEDID     0x00020000
-#define LINECALLINFOSTATE_REDIRECTIONID   0x00040000
-#define LINECALLINFOSTATE_REDIRECTINGID   0x00080000
-#define LINECALLINFOSTATE_DISPLAY         0x00100000
-#define LINECALLINFOSTATE_USERUSERINFO    0x00200000
-#define LINECALLINFOSTATE_HIGHLEVELCOMP   0x00400000
-#define LINECALLINFOSTATE_LOWLEVELCOMP    0x00800000
-#define LINECALLINFOSTATE_CHARGINGINFO    0x01000000
-#define LINECALLINFOSTATE_TERMINAL        0x02000000
-#define LINECALLINFOSTATE_DIALPARAMS      0x04000000
-#define LINECALLINFOSTATE_MONITORMODES    0x08000000
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINECALLINFOSTATE_TREATMENT       0x10000000
-#define LINECALLINFOSTATE_QOS             0x20000000
-#define LINECALLINFOSTATE_CALLDATA        0x40000000
-#endif
-
-#define LINECALLORIGIN_OUTBOUND           0x00000001
-#define LINECALLORIGIN_INTERNAL           0x00000002
-#define LINECALLORIGIN_EXTERNAL           0x00000004
-#define LINECALLORIGIN_UNKNOWN            0x00000010
-#define LINECALLORIGIN_UNAVAIL            0x00000020
-#define LINECALLORIGIN_CONFERENCE         0x00000040
-#define LINECALLORIGIN_INBOUND            0x00000080
-
-#define LINECALLPARAMFLAGS_SECURE         0x00000001
-#define LINECALLPARAMFLAGS_IDLE           0x00000002
-#define LINECALLPARAMFLAGS_BLOCKID        0x00000004
-#define LINECALLPARAMFLAGS_ORIGOFFHOOK    0x00000008
-#define LINECALLPARAMFLAGS_DESTOFFHOOK    0x00000010
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINECALLPARAMFLAGS_NOHOLDCONFERENCE \
-                                          0x00000020
-#define LINECALLPARAMFLAGS_PREDICTIVEDIAL 0x00000040
-#define LINECALLPARAMFLAGS_ONESTEPTRANSFER \
-                                          0x00000080
-#endif
-
-#define LINECALLPARTYID_BLOCKED           0x00000001
-#define LINECALLPARTYID_OUTOFAREA         0x00000002
-#define LINECALLPARTYID_NAME              0x00000004
-#define LINECALLPARTYID_ADDRESS           0x00000008
-#define LINECALLPARTYID_PARTIAL           0x00000010
-#define LINECALLPARTYID_UNKNOWN           0x00000020
-#define LINECALLPARTYID_UNAVAIL           0x00000040
-
-#define LINECALLPRIVILEGE_NONE            0x00000001
-#define LINECALLPRIVILEGE_MONITOR         0x00000002
-#define LINECALLPRIVILEGE_OWNER           0x00000004
-
-#define LINECALLREASON_DIRECT             0x00000001
-#define LINECALLREASON_FWDBUSY            0x00000002
-#define LINECALLREASON_FWDNOANSWER        0x00000004
-#define LINECALLREASON_FWDUNCOND          0x00000008
-#define LINECALLREASON_PICKUP             0x00000010
-#define LINECALLREASON_UNPARK             0x00000020
-#define LINECALLREASON_REDIRECT           0x00000040
-#define LINECALLREASON_CALLCOMPLETION     0x00000080
-#define LINECALLREASON_TRANSFER           0x00000100
-#define LINECALLREASON_REMINDER           0x00000200
-#define LINECALLREASON_UNKNOWN            0x00000400
-#define LINECALLREASON_UNAVAIL            0x00000800
-#define LINECALLREASON_INTRUDE            0x00001000
-#define LINECALLREASON_PARKED             0x00002000
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINECALLREASON_CAMPEDON           0x00004000
-#define LINECALLREASON_ROUTEREQUEST       0x00008000
-#endif
-
-#define LINECALLSELECT_LINE               0x00000001
-#define LINECALLSELECT_ADDRESS            0x00000002
-#define LINECALLSELECT_CALL               0x00000004
-#if (NDIS_TAPI_CURRENT_VERSION > 0x00020000)
-#define LINECALLSELECT_DEVICEID           0x00000008
-#endif
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
-#define LINECALLSELECT_CALLID             0x00000010
-#endif
-
-#define LINECALLSTATE_IDLE                0x00000001
-#define LINECALLSTATE_OFFERING            0x00000002
-#define LINECALLSTATE_ACCEPTED            0x00000004
-#define LINECALLSTATE_DIALTONE            0x00000008
-#define LINECALLSTATE_DIALING             0x00000010
-#define LINECALLSTATE_RINGBACK            0x00000020
-#define LINECALLSTATE_BUSY                0x00000040
-#define LINECALLSTATE_SPECIALINFO         0x00000080
-#define LINECALLSTATE_CONNECTED           0x00000100
-#define LINECALLSTATE_PROCEEDING          0x00000200
-#define LINECALLSTATE_ONHOLD              0x00000400
-#define LINECALLSTATE_CONFERENCED         0x00000800
-#define LINECALLSTATE_ONHOLDPENDCONF      0x00001000
-#define LINECALLSTATE_ONHOLDPENDTRANSFER  0x00002000
-#define LINECALLSTATE_DISCONNECTED        0x00004000
-#define LINECALLSTATE_UNKNOWN             0x00008000
-
-#define LINEDEVCAPFLAGS_CROSSADDRCONF     0x00000001
-#define LINEDEVCAPFLAGS_HIGHLEVCOMP       0x00000002
-#define LINEDEVCAPFLAGS_LOWLEVCOMP        0x00000004
-#define LINEDEVCAPFLAGS_MEDIACONTROL      0x00000008
-#define LINEDEVCAPFLAGS_MULTIPLEADDR      0x00000010
-#define LINEDEVCAPFLAGS_CLOSEDROP         0x00000020
-#define LINEDEVCAPFLAGS_DIALBILLING       0x00000040
-#define LINEDEVCAPFLAGS_DIALQUIET         0x00000080
-#define LINEDEVCAPFLAGS_DIALDIALTONE      0x00000100
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
-#define LINEDEVCAPFLAGS_MSP               0x00000200
-#define LINEDEVCAPFLAGS_CALLHUB           0x00000400
-#define LINEDEVCAPFLAGS_CALLHUBTRACKING   0x00000800
-#define LINEDEVCAPFLAGS_PRIVATEOBJECTS    0x00001000
-#endif
-
-#define LINEDEVSTATE_OTHER      0x00000001
-#define LINEDEVSTATE_RINGING              0x00000002
-#define LINEDEVSTATE_CONNECTED            0x00000004
-#define LINEDEVSTATE_DISCONNECTED         0x00000008
-#define LINEDEVSTATE_MSGWAITON            0x00000010
-#define LINEDEVSTATE_MSGWAITOFF           0x00000020
-#define LINEDEVSTATE_INSERVICE            0x00000040
-#define LINEDEVSTATE_OUTOFSERVICE         0x00000080
-#define LINEDEVSTATE_MAINTENANCE          0x00000100
-#define LINEDEVSTATE_OPEN                 0x00000200
-#define LINEDEVSTATE_CLOSE                0x00000400
-#define LINEDEVSTATE_NUMCALLS             0x00000800
-#define LINEDEVSTATE_NUMCOMPLETIONS       0x00001000
-#define LINEDEVSTATE_TERMINALS            0x00002000
-#define LINEDEVSTATE_ROAMMODE             0x00004000
-#define LINEDEVSTATE_BATTERY              0x00008000
-#define LINEDEVSTATE_SIGNAL               0x00010000
-#define LINEDEVSTATE_DEVSPECIFIC          0x00020000
-#define LINEDEVSTATE_REINIT               0x00040000
-#define LINEDEVSTATE_LOCK                 0x00080000
-
-#define LINEDEVSTATUSFLAGS_CONNECTED      0x00000001
-#define LINEDEVSTATUSFLAGS_MSGWAIT        0x00000002
-#define LINEDEVSTATUSFLAGS_INSERVICE      0x00000004
-#define LINEDEVSTATUSFLAGS_LOCKED         0x00000008
-
-#define LINEDIALTONEMODE_NORMAL           0x00000001
-#define LINEDIALTONEMODE_SPECIAL          0x00000002
-#define LINEDIALTONEMODE_INTERNAL         0x00000004
-#define LINEDIALTONEMODE_EXTERNAL         0x00000008
-#define LINEDIALTONEMODE_UNKNOWN          0x00000010
-#define LINEDIALTONEMODE_UNAVAIL          0x00000020
-
-#define LINEDIGITMODE_PULSE               0x00000001
-#define LINEDIGITMODE_DTMF                0x00000002
-#define LINEDIGITMODE_DTMFEND             0x00000004
-
-#define LINEDISCONNECTMODE_NORMAL         0x00000001
-#define LINEDISCONNECTMODE_UNKNOWN        0x00000002
-#define LINEDISCONNECTMODE_REJECT         0x00000004
-#define LINEDISCONNECTMODE_PICKUP         0x00000008
-#define LINEDISCONNECTMODE_FORWARDED      0x00000010
-#define LINEDISCONNECTMODE_BUSY           0x00000020
-#define LINEDISCONNECTMODE_NOANSWER       0x00000040
-#define LINEDISCONNECTMODE_BADADDRESS     0x00000080
-#define LINEDISCONNECTMODE_UNREACHABLE    0x00000100
-#define LINEDISCONNECTMODE_CONGESTION     0x00000200
-#define LINEDISCONNECTMODE_INCOMPATIBLE   0x00000400
-#define LINEDISCONNECTMODE_UNAVAIL        0x00000800
-#define LINEDISCONNECTMODE_NODIALTONE     0x00001000
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINEDISCONNECTMODE_NUMBERCHANGED  0x00002000
-#define LINEDISCONNECTMODE_OUTOFORDER     0x00004000
-#define LINEDISCONNECTMODE_TEMPFAILURE    0x00008000
-#define LINEDISCONNECTMODE_QOSUNAVAIL     0x00010000
-#define LINEDISCONNECTMODE_BLOCKED        0x00020000
-#define LINEDISCONNECTMODE_DONOTDISTURB   0x00040000
-#define LINEDISCONNECTMODE_CANCELLED      0x00080000
-#endif
-
-#define LINEFEATURE_DEVSPECIFIC           0x00000001
-#define LINEFEATURE_DEVSPECIFICFEAT       0x00000002
-#define LINEFEATURE_FORWARD               0x00000004
-#define LINEFEATURE_MAKECALL              0x00000008
-#define LINEFEATURE_SETMEDIACONTROL       0x00000010
-#define LINEFEATURE_SETTERMINAL           0x00000020
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINEFEATURE_SETDEVSTATUS          0x00000040
-#define LINEFEATURE_FORWARDFWD            0x00000080
-#define LINEFEATURE_FORWARDDND            0x00000100
-#endif
-
-#define LINEFORWARDMODE_UNCOND            0x00000001
-#define LINEFORWARDMODE_UNCONDINTERNAL    0x00000002
-#define LINEFORWARDMODE_UNCONDEXTERNAL    0x00000004
-#define LINEFORWARDMODE_UNCONDSPECIFIC    0x00000008
-#define LINEFORWARDMODE_BUSY              0x00000010
-#define LINEFORWARDMODE_BUSYINTERNAL      0x00000020
-#define LINEFORWARDMODE_BUSYEXTERNAL      0x00000040
-#define LINEFORWARDMODE_BUSYSPECIFIC      0x00000080
-#define LINEFORWARDMODE_NOANSW            0x00000100
-#define LINEFORWARDMODE_NOANSWINTERNAL    0x00000200
-#define LINEFORWARDMODE_NOANSWEXTERNAL    0x00000400
-#define LINEFORWARDMODE_NOANSWSPECIFIC    0x00000800
-#define LINEFORWARDMODE_BUSYNA            0x00001000
-#define LINEFORWARDMODE_BUSYNAINTERNAL    0x00002000
-#define LINEFORWARDMODE_BUSYNAEXTERNAL    0x00004000
-#define LINEFORWARDMODE_BUSYNASPECIFIC    0x00008000
-
-#define LINEGATHERTERM_BUFFERFULL         0x00000001
-#define LINEGATHERTERM_TERMDIGIT          0x00000002
-#define LINEGATHERTERM_FIRSTTIMEOUT       0x00000004
-#define LINEGATHERTERM_INTERTIMEOUT       0x00000008
-#define LINEGATHERTERM_CANCEL             0x00000010
-
-#define LINEGENERATETERM_DONE             0x00000001
-#define LINEGENERATETERM_CANCEL           0x00000002
-
-#define LINEMEDIACONTROL_NONE             0x00000001
-#define LINEMEDIACONTROL_START            0x00000002
-#define LINEMEDIACONTROL_RESET            0x00000004
-#define LINEMEDIACONTROL_PAUSE            0x00000008
-#define LINEMEDIACONTROL_RESUME           0x00000010
-#define LINEMEDIACONTROL_RATEUP           0x00000020
-#define LINEMEDIACONTROL_RATEDOWN         0x00000040
-#define LINEMEDIACONTROL_RATENORMAL       0x00000080
-#define LINEMEDIACONTROL_VOLUMEUP         0x00000100
-#define LINEMEDIACONTROL_VOLUMEDOWN       0x00000200
-#define LINEMEDIACONTROL_VOLUMENORMAL     0x00000400
-
-#define LINEMEDIAMODE_UNKNOWN             0x00000002
-#define LINEMEDIAMODE_INTERACTIVEVOICE    0x00000004
-#define LINEMEDIAMODE_AUTOMATEDVOICE      0x00000008
-#define LINEMEDIAMODE_DATAMODEM           0x00000010
-#define LINEMEDIAMODE_G3FAX               0x00000020
-#define LINEMEDIAMODE_TDD                 0x00000040
-#define LINEMEDIAMODE_G4FAX               0x00000080
-#define LINEMEDIAMODE_DIGITALDATA         0x00000100
-#define LINEMEDIAMODE_TELETEX             0x00000200
-#define LINEMEDIAMODE_VIDEOTEX            0x00000400
-#define LINEMEDIAMODE_TELEX               0x00000800
-#define LINEMEDIAMODE_MIXED               0x00001000
-#define LINEMEDIAMODE_ADSI                0x00002000
-
-#define LINEMEDIAMODE_VOICEVIEW           0x00004000
-#define LAST_LINEMEDIAMODE                0x00004000
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020001)
-#define LINEMEDIAMODE_VIDEO               0x00008000
-#define LAST_LINEMEDIAMODE                0x00008000
-#endif
-
-#define LINEPARKMODE_DIRECTED             0x00000001
-#define LINEPARKMODE_NONDIRECTED          0x00000002
-
-#define LINEREMOVEFROMCONF_NONE           0x00000001
-#define LINEREMOVEFROMCONF_LAST           0x00000002
-#define LINEREMOVEFROMCONF_ANY            0x00000003
-
-#define LINEREQUESTMODE_MAKECALL          0x00000001
-#define LINEREQUESTMODE_MEDIACALL         0x00000002
-#define LINEREQUESTMODE_DROP              0x00000004
-
-#define LAST_LINEREQUESTMODE              LINEREQUESTMODE_MEDIACALL
-
-#define LINEROAMMODE_UNKNOWN              0x00000001
-#define LINEROAMMODE_UNAVAIL              0x00000002
-#define LINEROAMMODE_HOME                 0x00000004
-#define LINEROAMMODE_ROAMA                0x00000008
-#define LINEROAMMODE_ROAMB                0x00000010
-
-#define LINESPECIALINFO_NOCIRCUIT         0x00000001
-#define LINESPECIALINFO_CUSTIRREG         0x00000002
-#define LINESPECIALINFO_REORDER           0x00000004
-#define LINESPECIALINFO_UNKNOWN           0x00000008
-#define LINESPECIALINFO_UNAVAIL           0x00000010
-
-#define LINETERMDEV_PHONE                 0x00000001
-#define LINETERMDEV_HEADSET               0x00000002
-#define LINETERMDEV_SPEAKER               0x00000004
-
-#define LINETERMMODE_BUTTONS              0x00000001
-#define LINETERMMODE_LAMPS                0x00000002
-#define LINETERMMODE_DISPLAY              0x00000004
-#define LINETERMMODE_RINGER               0x00000008
-#define LINETERMMODE_HOOKSWITCH           0x00000010
-#define LINETERMMODE_MEDIATOLINE          0x00000020
-#define LINETERMMODE_MEDIAFROMLINE        0x00000040
-#define LINETERMMODE_MEDIABIDIRECT        0x00000080
-
-#define LINETERMSHARING_PRIVATE           0x00000001
-#define LINETERMSHARING_SHAREDEXCL        0x00000002
-#define LINETERMSHARING_SHAREDCONF        0x00000004
-
-#define LINETONEMODE_CUSTOM               0x00000001
-#define LINETONEMODE_RINGBACK             0x00000002
-#define LINETONEMODE_BUSY                 0x00000004
-#define LINETONEMODE_BEEP                 0x00000008
-#define LINETONEMODE_BILLING              0x00000010
-
-#define LINETRANSFERMODE_TRANSFER         0x00000001
-#define LINETRANSFERMODE_CONFERENCE       0x00000002
-
-#define LINETOLLLISTOPTION_ADD            0x00000001
-#define LINETOLLLISTOPTION_REMOVE         0x00000002
-
-#define LINETRANSLATEOPTION_CARDOVERRIDE  0x00000001
-
-#define LINETRANSLATERESULT_CANONICAL     0x00000001
-#define LINETRANSLATERESULT_INTERNATIONAL 0x00000002
-#define LINETRANSLATERESULT_LONGDISTANCE  0x00000004
-#define LINETRANSLATERESULT_LOCAL         0x00000008
-#define LINETRANSLATERESULT_INTOLLLIST    0x00000010
-#define LINETRANSLATERESULT_NOTINTOLLLIST 0x00000020
-#define LINETRANSLATERESULT_DIALBILLING   0x00000040
-#define LINETRANSLATERESULT_DIALQUIET     0x00000080
-#define LINETRANSLATERESULT_DIALDIALTONE  0x00000100
-#define LINETRANSLATERESULT_DIALPROMPT    0x00000200
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-#define LINETRANSLATERESULT_VOICEDETECT   0x00000400
-#endif
-
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)                                           
-#define LINETRANSLATERESULT_NOTRANSLATION 0x00000800
-#endif              
-
-
-typedef struct  _NDIS_VAR_DATA_DESC {
-	USHORT  Length;
-	USHORT  MaximumLength;
-	LONG  Offset;
-} NDIS_VAR_DATA_DESC, *PNDIS_VAR_DATA_DESC;
-
-typedef struct _LINE_DIAL_PARAMS {
-	ULONG  ulDialPause;
-	ULONG  ulDialSpeed;
-	ULONG  ulDigitDuration;
-	ULONG  ulWaitForDialtone;
-} LINE_DIAL_PARAMS, *PLINE_DIAL_PARAMS;
-
-typedef struct _LINE_ADDRESS_CAPS {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  ulLineDeviceID;
-	ULONG  ulAddressSize;
-	ULONG  ulAddressOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
-	ULONG  ulAddressSharing;
-	ULONG  ulAddressStates;
-	ULONG  ulCallInfoStates;
-	ULONG  ulCallerIDFlags;
-	ULONG  ulCalledIDFlags;
-	ULONG  ulConnectedIDFlags;
-	ULONG  ulRedirectionIDFlags;
-	ULONG  ulRedirectingIDFlags;
-	ULONG  ulCallStates;
-	ULONG  ulDialToneModes;
-	ULONG  ulBusyModes;
-	ULONG  ulSpecialInfo;
-	ULONG  ulDisconnectModes;
-	ULONG  ulMaxNumActiveCalls;
-	ULONG  ulMaxNumOnHoldCalls;
-	ULONG  ulMaxNumOnHoldPendingCalls;
-	ULONG  ulMaxNumConference;
-	ULONG  ulMaxNumTransConf;
-	ULONG  ulAddrCapFlags;
-	ULONG  ulCallFeatures;
-	ULONG  ulRemoveFromConfCaps;
-	ULONG  ulRemoveFromConfState;
-	ULONG  ulTransferModes;
-	ULONG  ulParkModes;
-	ULONG  ulForwardModes;
-	ULONG  ulMaxForwardEntries;
-	ULONG  ulMaxSpecificEntries;
-	ULONG  ulMinFwdNumRings;
-	ULONG  ulMaxFwdNumRings;
-	ULONG  ulMaxCallCompletions;
-	ULONG  ulCallCompletionConds;
-	ULONG  ulCallCompletionModes;
-	ULONG  ulNumCompletionMessages;
-	ULONG  ulCompletionMsgTextEntrySize;
-	ULONG  ulCompletionMsgTextSize;
-	ULONG  ulCompletionMsgTextOffset;
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00010004)
-	ULONG  ulAddressFeatures;
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-	ULONG  ulPredictiveAutoTransferStates;
-	ULONG  ulNumCallTreatments;
-	ULONG  ulCallTreatmentListSize;
-	ULONG  ulCallTreatmentListOffset;
-	ULONG  ulDeviceClassesSize;
-	ULONG  ulDeviceClassesOffset;
-	ULONG  ulMaxCallDataSize;
-	ULONG  ulCallFeatures2;
-	ULONG  ulMaxNoAnswerTimeout;
-	ULONG  ulConnectedModes;
-	ULONG  ulOfferingModes;
-	ULONG  ulAvailableMediaModes;
-#endif
-#endif
-} LINE_ADDRESS_CAPS, *PLINE_ADDRESS_CAPS;
-
-typedef struct _LINE_ADDRESS_STATUS {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  ulNumInUse;
-	ULONG  ulNumActiveCalls;
-	ULONG  ulNumOnHoldCalls;
-	ULONG  ulNumOnHoldPendCalls;
-	ULONG  ulAddressFeatures;
-	ULONG  ulNumRingsNoAnswer;
-	ULONG  ulForwardNumEntries;
-	ULONG  ulForwardSize;
-	ULONG  ulForwardOffset;
-	ULONG  ulTerminalModesSize;
-	ULONG  ulTerminalModesOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
-} LINE_ADDRESS_STATUS, *PLINE_ADDRESS_STATUS;
-
-typedef struct _LINE_CALL_INFO {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  hLine;
-	ULONG  ulLineDeviceID;
-	ULONG  ulAddressID;
-	ULONG  ulBearerMode;
-	ULONG  ulRate;
-	ULONG  ulMediaMode;
-	ULONG  ulAppSpecific;
-	ULONG  ulCallID;
-	ULONG  ulRelatedCallID;
-	ULONG  ulCallParamFlags;
-	ULONG  ulCallStates;
-	ULONG  ulMonitorDigitModes;
-	ULONG  ulMonitorMediaModes;
-	LINE_DIAL_PARAMS  DialParams;
-	ULONG  ulOrigin;
-	ULONG  ulReason;
-	ULONG  ulCompletionID;
-	ULONG  ulNumOwners;
-	ULONG  ulNumMonitors;
-	ULONG  ulCountryCode;
-	ULONG  ulTrunk;
-	ULONG  ulCallerIDFlags;
-	ULONG  ulCallerIDSize;
-	ULONG  ulCallerIDOffset;
-	ULONG  ulCallerIDNameSize;
-	ULONG  ulCallerIDNameOffset;
-	ULONG  ulCalledIDFlags;
-	ULONG  ulCalledIDSize;
-	ULONG  ulCalledIDOffset;
-	ULONG  ulCalledIDNameSize;
-	ULONG  ulCalledIDNameOffset;
-	ULONG  ulConnectedIDFlags;
-	ULONG  ulConnectedIDSize;
-	ULONG  ulConnectedIDOffset;
-	ULONG  ulConnectedIDNameSize;
-	ULONG  ulConnectedIDNameOffset;
-	ULONG  ulRedirectionIDFlags;
-	ULONG  ulRedirectionIDSize;
-	ULONG  ulRedirectionIDOffset;
-	ULONG  ulRedirectionIDNameSize;
-	ULONG  ulRedirectionIDNameOffset;
-	ULONG  ulRedirectingIDFlags;
-	ULONG  ulRedirectingIDSize;
-	ULONG  ulRedirectingIDOffset;
-	ULONG  ulRedirectingIDNameSize;
-	ULONG  ulRedirectingIDNameOffset;
-	ULONG  ulAppNameSize;
-	ULONG  ulAppNameOffset;
-	ULONG  ulDisplayableAddressSize;
-	ULONG  ulDisplayableAddressOffset;
-	ULONG  ulCalledPartySize;
-	ULONG  ulCalledPartyOffset;
-	ULONG  ulCommentSize;
-	ULONG  ulCommentOffset;
-	ULONG  ulDisplaySize;
-	ULONG  ulDisplayOffset;
-	ULONG  ulUserUserInfoSize;
-	ULONG  ulUserUserInfoOffset;
-	ULONG  ulHighLevelCompSize;
-	ULONG  ulHighLevelCompOffset;
-	ULONG  ulLowLevelCompSize;
-	ULONG  ulLowLevelCompOffset;
-	ULONG  ulChargingInfoSize;
-	ULONG  ulChargingInfoOffset;
-	ULONG  ulTerminalModesSize;
-	ULONG  ulTerminalModesOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-	ULONG  ulCallTreatment;
-	ULONG  ulCallDataSize;
-	ULONG  ulCallDataOffset;
-	ULONG  ulSendingFlowspecSize;
-	ULONG  ulSendingFlowspecOffset;
-	ULONG  ulReceivingFlowspecSize;
-	ULONG  ulReceivingFlowspecOffset;
-#endif
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
-	ULONG  ulCallerIDAddressType;
-	ULONG  ulCalledIDAddressType;
-	ULONG  ulConnectedIDAddressType;
-	ULONG  ulRedirectionIDAddressType;
-	ULONG  ulRedirectingIDAddressType;
-#endif
-} LINE_CALL_INFO, *PLINE_CALL_INFO;
-
-typedef struct _LINE_CALL_PARAMS {
-  ULONG  ulTotalSize;
-	ULONG  ulBearerMode;
-	ULONG  ulMinRate;
-	ULONG  ulMaxRate;
-	ULONG  ulMediaMode;
-	ULONG  ulCallParamFlags;
-	ULONG  ulAddressMode;
-	ULONG  ulAddressID;
-	LINE_DIAL_PARAMS  DialParams;
-	ULONG  ulOrigAddressSize;
-	ULONG  ulOrigAddressOffset;
-	ULONG  ulDisplayableAddressSize;
-	ULONG  ulDisplayableAddressOffset;
-	ULONG  ulCalledPartySize;
-	ULONG  ulCalledPartyOffset;
-	ULONG  ulCommentSize;
-	ULONG  ulCommentOffset;
-	ULONG  ulUserUserInfoSize;
-	ULONG  ulUserUserInfoOffset;
-	ULONG  ulHighLevelCompSize;
-	ULONG  ulHighLevelCompOffset;
-	ULONG  ulLowLevelCompSize;
-	ULONG  ulLowLevelCompOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-	ULONG  ulPredictiveAutoTransferStates;
-	ULONG  ulTargetAddressSize;
-	ULONG  ulTargetAddressOffset;
-	ULONG  ulSendingFlowspecSize;
-	ULONG  ulSendingFlowspecOffset;
-	ULONG  ulReceivingFlowspecSize;
-	ULONG  ulReceivingFlowspecOffset;
-	ULONG  ulDeviceClassSize;
-	ULONG  ulDeviceClassOffset;
-	ULONG  ulDeviceConfigSize;
-	ULONG  ulDeviceConfigOffset;
-	ULONG  ulCallDataSize;
-	ULONG  ulCallDataOffset;
-	ULONG  ulNoAnswerTimeout;
-	ULONG  ulCallingPartyIDSize;
-	ULONG  ulCallingPartyIDOffset;
-#endif
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
-  ULONG  ulAddressType;
-#endif
-} LINE_CALL_PARAMS, *PLINE_CALL_PARAMS;
-
-typedef struct _LINE_CALL_STATUS {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  ulCallState;
-	ULONG  ulCallStateMode;
-	ULONG  ulCallPrivilege;
-	ULONG  ulCallFeatures;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
-} LINE_CALL_STATUS, *PLINE_CALL_STATUS;
-
-typedef struct _LINE_DEV_CAPS {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  ulProviderInfoSize;
-	ULONG  ulProviderInfoOffset;
-	ULONG  ulSwitchInfoSize;
-	ULONG  ulSwitchInfoOffset;
-	ULONG  ulPermanentLineID;
-	ULONG  ulLineNameSize;
-	ULONG  ulLineNameOffset;
-	ULONG  ulStringFormat;
-	ULONG  ulAddressModes;
-	ULONG  ulNumAddresses;
-	ULONG  ulBearerModes;
-	ULONG  ulMaxRate;
-	ULONG  ulMediaModes;
-	ULONG  ulGenerateToneModes;
-	ULONG  ulGenerateToneMaxNumFreq;
-	ULONG  ulGenerateDigitModes;
-	ULONG  ulMonitorToneMaxNumFreq;
-	ULONG  ulMonitorToneMaxNumEntries;
-	ULONG  ulMonitorDigitModes;
-	ULONG  ulGatherDigitsMinTimeout;
-	ULONG  ulGatherDigitsMaxTimeout;
-	ULONG  ulMedCtlDigitMaxListSize;
-	ULONG  ulMedCtlMediaMaxListSize;
-	ULONG  ulMedCtlToneMaxListSize;
-	ULONG  ulMedCtlCallStateMaxListSize;
-	ULONG  ulDevCapFlags;
-	ULONG  ulMaxNumActiveCalls;
-	ULONG  ulAnswerMode;
-	ULONG  ulRingModes;
-	ULONG  ulLineStates;
-	ULONG  ulUUIAcceptSize;
-	ULONG  ulUUIAnswerSize;
-	ULONG  ulUUIMakeCallSize;
-	ULONG  ulUUIDropSize;
-	ULONG  ulUUISendUserUserInfoSize;
-	ULONG  ulUUICallInfoSize;
-	LINE_DIAL_PARAMS  MinDialParams;
-	LINE_DIAL_PARAMS  MaxDialParams;
-	LINE_DIAL_PARAMS  DefaultDialParams;
-	ULONG  ulNumTerminals;
-	ULONG  ulTerminalCapsSize;
-	ULONG  ulTerminalCapsOffset;
-	ULONG  ulTerminalTextEntrySize;
-	ULONG  ulTerminalTextSize;
-	ULONG  ulTerminalTextOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00010004)
-	ULONG  ulLineFeatures;
-#endif
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020000)
-	ULONG  ulSettableDevStatus;
-	ULONG  ulDeviceClassesSize;
-	ULONG  ulDeviceClassesOffset;
-#endif
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00020002)
-  GUID  PermanentLineGuid;
-#endif
-#if (NDIS_TAPI_CURRENT_VERSION >= 0x00030000)
-	ULONG  ulAddressTypes;
-	GUID  ProtocolGuid;
-	ULONG  ulAvailableTracking;
-#endif
-} LINE_DEV_CAPS, *PLINE_DEV_CAPS;
-
-typedef struct _LINE_DEV_STATUS {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;
-	ULONG  ulNumOpens;
-	ULONG  ulOpenMediaModes;
-	ULONG  ulNumActiveCalls;
-	ULONG  ulNumOnHoldCalls;
-	ULONG  ulNumOnHoldPendCalls;
-	ULONG  ulLineFeatures;
-	ULONG  ulNumCallCompletions;
-	ULONG  ulRingMode;
-	ULONG  ulSignalLevel;
-	ULONG  ulBatteryLevel;
-	ULONG  ulRoamMode;
-	ULONG  ulDevStatusFlags;
-	ULONG  ulTerminalModesSize;
-	ULONG  ulTerminalModesOffset;
-	ULONG  ulDevSpecificSize;
-	ULONG  ulDevSpecificOffset;
-} LINE_DEV_STATUS, *PLINE_DEV_STATUS;
-
-typedef struct _LINE_EXTENSION_ID {
-	ULONG  ulExtensionID0;
-	ULONG  ulExtensionID1;
-	ULONG  ulExtensionID2;
-	ULONG  ulExtensionID3;
-} LINE_EXTENSION_ID, *PLINE_EXTENSION_ID;
-
-typedef struct _VAR_STRING {
-	ULONG  ulTotalSize;
-	ULONG  ulNeededSize;
-	ULONG  ulUsedSize;	
-	ULONG  ulStringFormat;
-	ULONG  ulStringSize;
-	ULONG  ulStringOffset;
-} VAR_STRING, *PVAR_STRING;
-
-typedef struct _NDIS_TAPI_ANSWER { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulUserUserInfoSize; 
-  IN UCHAR  UserUserInfo[1]; 
-} NDIS_TAPI_ANSWER, *PNDIS_TAPI_ANSWER; 
-
-typedef struct _NDIS_TAPI_CLOSE { 
-  IN ULONG  ulRequestID;
-  IN HDRV_LINE  hdLine;
-} NDIS_TAPI_CLOSE, *PNDIS_TAPI_CLOSE;
-
-typedef struct _NDIS_TAPI_CLOSE_CALL { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-} NDIS_TAPI_CLOSE_CALL, *PNDIS_TAPI_CLOSE_CALL; 
-
-typedef struct _NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulMediaModes; 
-  IN LINE_CALL_PARAMS  LineCallParams; 
-} NDIS_TAPI_CONDITIONAL_MEDIA_DETECTION, *PNDIS_TAPI_CONDITIONAL_MEDIA_DETECTION; 
-
-typedef struct _NDIS_TAPI_DROP { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulUserUserInfoSize; 
-  IN UCHAR  UserUserInfo[1]; 
-} NDIS_TAPI_DROP, *PNDIS_TAPI_DROP; 
-
-typedef struct _NDIS_TAPI_PROVIDER_SHUTDOWN { 
-  IN ULONG  ulRequestID; 
-} NDIS_TAPI_PROVIDER_SHUTDOWN, *PNDIS_TAPI_PROVIDER_SHUTDOWN; 
-
-typedef struct _NDIS_TAPI_SET_APP_SPECIFIC { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulAppSpecific; 
-} NDIS_TAPI_SET_APP_SPECIFIC, *PNDIS_TAPI_SET_APP_SPECIFIC; 
-
-typedef struct _NDIS_TAPI_SET_CALL_PARAMS {
-  IN ULONG  ulRequestID;
-  IN HDRV_CALL  hdCall;
-  IN ULONG  ulBearerMode;
-  IN ULONG  ulMinRate;
-  IN ULONG  ulMaxRate;
-  IN BOOLEAN  bSetLineDialParams;
-  IN LINE_DIAL_PARAMS  LineDialParams;
-} NDIS_TAPI_SET_CALL_PARAMS, *PNDIS_TAPI_SET_CALL_PARAMS; 
-
-typedef struct _NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulMediaModes; 
-} NDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION, *PNDIS_TAPI_SET_DEFAULT_MEDIA_DETECTION;
-
-typedef struct _NDIS_TAPI_SET_DEV_CONFIG { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulDeviceClassSize; 
-  IN ULONG  ulDeviceClassOffset; 
-  IN ULONG  ulDeviceConfigSize; 
-  IN UCHAR  DeviceConfig[1]; 
-} NDIS_TAPI_SET_DEV_CONFIG, *PNDIS_TAPI_SET_DEV_CONFIG; 
-
-typedef struct _NDIS_TAPI_SET_MEDIA_MODE { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulMediaMode; 
-} NDIS_TAPI_SET_MEDIA_MODE, *PNDIS_TAPI_SET_MEDIA_MODE; 
-
-typedef struct _NDIS_TAPI_SET_STATUS_MESSAGES { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulLineStates; 
-  IN ULONG  ulAddressStates; 
-} NDIS_TAPI_SET_STATUS_MESSAGES, *PNDIS_TAPI_SET_STATUS_MESSAGES; 
-
-typedef struct _NDIS_TAPI_ACCEPT { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulUserUserInfoSize; 
-  IN UCHAR  UserUserInfo[1]; 
-} NDIS_TAPI_ACCEPT, *PNDIS_TAPI_ACCEPT; 
-
-typedef struct _NDIS_TAPI_DIAL { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulDestAddressSize; 
-  IN CHAR  szDestAddress[1]; 
-} NDIS_TAPI_DIAL, *PNDIS_TAPI_DIAL; 
-
-typedef struct _NDIS_TAPI_EVENT {
-  IN HTAPI_LINE  htLine;
-  IN HTAPI_CALL  htCall;
-  IN ULONG  ulMsg;
-  IN ULONG  ulParam1;
-  IN ULONG  ulParam2;
-  IN ULONG  ulParam3;
-} NDIS_TAPI_EVENT, *PNDIS_TAPI_EVENT;
-
-typedef struct _NDIS_TAPI_OPEN { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN HTAPI_LINE  htLine; 
-  OUT HDRV_LINE  hdLine; 
-} NDIS_TAPI_OPEN, *PNDIS_TAPI_OPEN; 
-
-typedef struct _NDIS_TAPI_SECURE_CALL { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-} NDIS_TAPI_SECURE_CALL, *PNDIS_TAPI_SECURE_CALL; 
-
-typedef struct _NDIS_TAPI_SELECT_EXT_VERSION { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulExtVersion; 
-} NDIS_TAPI_SELECT_EXT_VERSION, *PNDIS_TAPI_SELECT_EXT_VERSION; 
-
-typedef struct _NDIS_TAPI_SEND_USER_USER_INFO { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulUserUserInfoSize; 
-  IN UCHAR  UserUserInfo[1]; 
-} NDIS_TAPI_SEND_USER_USER_INFO, *PNDIS_TAPI_SEND_USER_USER_INFO; 
-
-
-typedef struct _NDIS_TAPI_CONFIG_DIALOG { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulDeviceClassSize; 
-  IN ULONG  ulDeviceClassOffset; 
-  IN ULONG  ulLibraryNameTotalSize; 
-  OUT ULONG ulLibraryNameNeededSize; 
-  OUT CHAR  szLibraryName[1]; 
-} NDIS_TAPI_CONFIG_DIALOG, *PNDIS_TAPI_CONFIG_DIALOG; 
-
-typedef struct _NDIS_TAPI_DEV_SPECIFIC { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulAddressID; 
-  IN HDRV_CALL  hdCall; 
-  IN OUT ULONG  ulParamsSize; 
-  IN OUT UCHAR  Params[1]; 
-} NDIS_TAPI_DEV_SPECIFIC, *PNDIS_TAPI_DEV_SPECIFIC; 
-
-typedef struct _NDIS_TAPI_GET_ADDRESS_CAPS { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulAddressID; 
-  IN ULONG  ulExtVersion; 
-  OUT LINE_ADDRESS_CAPS  LineAddressCaps; 
-} NDIS_TAPI_GET_ADDRESS_CAPS, *PNDIS_TAPI_GET_ADDRESS_CAPS; 
-
-typedef struct _NDIS_TAPI_GET_ADDRESS_ID { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  OUT ULONG  ulAddressID; 
-  IN ULONG  ulAddressMode; 
-  IN ULONG  ulAddressSize; 
-  IN CHAR  szAddress[1]; 
-} NDIS_TAPI_GET_ADDRESS_ID, *PNDIS_TAPI_GET_ADDRESS_ID; 
-
-typedef struct _NDIS_TAPI_GET_ADDRESS_STATUS { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulAddressID; 
-  OUT LINE_ADDRESS_STATUS  LineAddressStatus; 
-} NDIS_TAPI_GET_ADDRESS_STATUS, *PNDIS_TAPI_GET_ADDRESS_STATUS; 
-
-typedef struct _NDIS_TAPI_GET_CALL_ADDRESS_ID { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  OUT ULONG  ulAddressID; 
-} NDIS_TAPI_GET_CALL_ADDRESS_ID, *PNDIS_TAPI_GET_CALL_ADDRESS_ID; 
-
-typedef struct _NDIS_TAPI_GET_CALL_INFO { 
-  ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  OUT LINE_CALL_INFO  LineCallInfo; 
-} NDIS_TAPI_GET_CALL_INFO, *PNDIS_TAPI_GET_CALL_INFO; 
-
-typedef struct _NDIS_TAPI_GET_CALL_STATUS { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_CALL  hdCall; 
-  OUT LINE_CALL_STATUS  LineCallStatus; 
-} NDIS_TAPI_GET_CALL_STATUS, *PNDIS_TAPI_GET_CALL_STATUS; 
-
-typedef struct _NDIS_TAPI_GET_DEV_CAPS { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulExtVersion; 
-  OUT LINE_DEV_CAPS  LineDevCaps; 
-} NDIS_TAPI_GET_DEV_CAPS, *PNDIS_TAPI_GET_DEV_CAPS;
-
-typedef struct _NDIS_TAPI_GET_DEV_CONFIG { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulDeviceClassSize; 
-  IN ULONG  ulDeviceClassOffset; 
-  OUT VAR_STRING  DeviceConfig; 
-} NDIS_TAPI_GET_DEV_CONFIG, *PNDIS_TAPI_GET_DEV_CONFIG; 
-
-typedef struct _NDIS_TAPI_GET_EXTENSION_ID { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  OUT LINE_EXTENSION_ID  LineExtensionID; 
-} NDIS_TAPI_GET_EXTENSION_ID, *PNDIS_TAPI_GET_EXTENSION_ID;
-
-typedef struct _NDIS_TAPI_GET_ID { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN ULONG  ulAddressID; 
-  IN HDRV_CALL  hdCall; 
-  IN ULONG  ulSelect; 
-  IN ULONG  ulDeviceClassSize; 
-  IN ULONG  ulDeviceClassOffset; 
-  OUT VAR_STRING  DeviceID; 
-} NDIS_TAPI_GET_ID, *PNDIS_TAPI_GET_ID; 
-
-typedef struct _NDIS_TAPI_GET_LINE_DEV_STATUS { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  OUT LINE_DEV_STATUS  LineDevStatus; 
-} NDIS_TAPI_GET_LINE_DEV_STATUS, *PNDIS_TAPI_GET_LINE_DEV_STATUS; 
-
-typedef struct _NDIS_TAPI_MAKE_CALL { 
-  IN ULONG  ulRequestID; 
-  IN HDRV_LINE  hdLine; 
-  IN HTAPI_CALL  htCall; 
-  OUT HDRV_CALL  hdCall; 
-  IN ULONG  ulDestAddressSize; 
-  IN ULONG  ulDestAddressOffset; 
-  IN BOOLEAN  bUseDefaultLineCallParams; 
-  IN LINE_CALL_PARAMS  LineCallParams; 
-} NDIS_TAPI_MAKE_CALL, *PNDIS_TAPI_MAKE_CALL;
-
-typedef struct _NDIS_TAPI_NEGOTIATE_EXT_VERSION { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceID; 
-  IN ULONG  ulLowVersion; 
-  IN ULONG  ulHighVersion; 
-  OUT ULONG  ulExtVersion; 
-} NDIS_TAPI_NEGOTIATE_EXT_VERSION, *PNDIS_TAPI_NEGOTIATE_EXT_VERSION; 
-
-typedef struct _NDIS_TAPI_PROVIDER_INITIALIZE { 
-  IN ULONG  ulRequestID; 
-  IN ULONG  ulDeviceIDBase; 
-  OUT ULONG  ulNumLineDevs; 
-  OUT ULONG  ulProviderID; 
-} NDIS_TAPI_PROVIDER_INITIALIZE, *PNDIS_TAPI_PROVIDER_INITIALIZE; 
-
-
-#define CO_TAPI_VERSION                   NDIS_TAPI_CURRENT_VERSION
-
-#define CO_TAPI_FLAG_OUTGOING_CALL          0x00000001
-#define CO_TAPI_FLAG_INCOMING_CALL          0x00000002
-#define CO_TAPI_FLAG_USE_DEFAULT_CALLPARAMS	0x00000004
-
-#define AF_TAPI_SAP_TYPE                  0x00008000
-
-typedef struct _CO_TAPI_ADDRESS_CAPS {
-  IN ULONG  ulLineID;
-  IN ULONG  ulAddressID;
-  OUT ULONG  ulFlags;
-  OUT LINE_ADDRESS_CAPS  LineAddressCaps;
-} CO_TAPI_ADDRESS_CAPS, *PCO_TAPI_ADDRESS_CAPS;
-
-/* CO_TAPI_CM_CAPS.ulFlags constants */
-#define CO_TAPI_FLAG_PER_LINE_CAPS        0x00000001
-
-typedef struct _CO_TAPI_CM_CAPS {
-  OUT ULONG  ulCoTapiVersion;
-  OUT ULONG  ulNumLines;
-  OUT ULONG  ulFlags;
-} CO_TAPI_CM_CAPS, *PCO_TAPI_CM_CAPS;
-
-typedef struct _CO_TAPI_CALL_DIAGNOSTICS {
-  OUT ULONG  ulOrigin;
-  OUT ULONG  ulReason;
-  OUT NDIS_VAR_DATA_DESC  DiagInfo;
-} CO_TAPI_CALL_DIAGNOSTICS, *PCO_TAPI_CALL_DIAGNOSTICS;
-
-
-/* CO_TAPI_LINE_CAPS.ulFlags constants */
-#define CO_TAPI_FLAG_PER_ADDRESS_CAPS     0x00000001
-
-typedef struct _CO_TAPI_LINE_CAPS {
-  IN ULONG  ulLineID;
-  OUT ULONG  ulFlags;
-  OUT LINE_DEV_CAPS  LineDevCaps;
-} CO_TAPI_LINE_CAPS, *PCO_TAPI_LINE_CAPS;
-
-typedef struct _CO_TAPI_TRANSLATE_NDIS_CALLPARAMS {
-  IN ULONG  ulFlags;
-  IN NDIS_VAR_DATA_DESC  NdisCallParams;
-  OUT NDIS_VAR_DATA_DESC  LineCallInfo;
-} CO_TAPI_TRANSLATE_NDIS_CALLPARAMS, *PCO_TAPI_TRANSLATE_NDIS_CALLPARAMS;
-
-typedef struct _CO_TAPI_TRANSLATE_TAPI_CALLPARAMS {
-  IN ULONG  ulLineID;
-  IN ULONG  ulAddressID;
-  IN ULONG  ulFlags;
-  IN NDIS_VAR_DATA_DESC  DestAddress;
-  IN NDIS_VAR_DATA_DESC  LineCallParams;
-  OUT NDIS_VAR_DATA_DESC  NdisCallParams;
-} CO_TAPI_TRANSLATE_TAPI_CALLPARAMS, *PCO_TAPI_TRANSLATE_TAPI_CALLPARAMS;
-
-/* CO_TAPI_TRANSLATE_SAP.ulLineID constants */
-#define CO_TAPI_LINE_ID_UNSPECIFIED       0xFFFFFFFF
-
-/* CO_TAPI_TRANSLATE_SAP.ulAddressID constants */
-#define CO_TAPI_ADDRESS_ID_UNSPECIFIED    0xFFFFFFFF
-
-typedef struct _CO_TAPI_TRANSLATE_SAP {
-  IN ULONG  ulLineID;
-  IN ULONG  ulAddressID;
-  IN ULONG  ulMediaModes;
-  IN ULONG  Reserved;
-  OUT ULONG  NumberOfSaps;
-  OUT NDIS_VAR_DATA_DESC  NdisSapParams[1];
-} CO_AF_TAPI_SAP, *PCO_AF_TAPI_SAP;
-
-typedef struct _CO_AF_TAPI_INCOMING_CALL_PARAMETERS {
-  IN  ULONG  ulLineID;
-  IN  ULONG  ulAddressID;
-  IN  ULONG  ulFlags;
-  IN  NDIS_VAR_DATA_DESC  LineCallInfo;
-} CO_AF_TAPI_INCOMING_CALL_PARAMETERS, *PCO_AF_TAPI_INCOMING_CALL_PARAMETERS;
-
-typedef struct _CO_AF_TAPI_MAKE_CALL_PARAMETERS {
-  IN  ULONG  ulLineID;
-  IN  ULONG  ulAddressID;
-  IN  ULONG  ulFlags;
-  IN  NDIS_VAR_DATA_DESC  DestAddress;
-  IN  NDIS_VAR_DATA_DESC  LineCallParams;
-} CO_AF_TAPI_MAKE_CALL_PARAMETERS, *PCO_AF_TAPI_MAKE_CALL_PARAMETERS;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NDISTAPI_H */
diff --git a/winsup/w32api/include/ddk/ndiswan.h b/winsup/w32api/include/ddk/ndiswan.h
deleted file mode 100644
index a3156d5a9..000000000
--- a/winsup/w32api/include/ddk/ndiswan.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * ndiswan.h
- *
- * Definitions for NDIS WAN miniport drivers
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NDISWAN_H
-#define __NDISWAN_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ndis.h"
-
-#define NDIS_USE_WAN_WRAPPER         			0x00000001
-
-#define NDIS_STATUS_TAPI_INDICATION 			((NDIS_STATUS)0x40010080L)
-
-/* NDIS_WAN_INFO.FramingBits constants */
-#define RAS_FRAMING                     0x00000001
-#define RAS_COMPRESSION                 0x00000002
-
-#define ARAP_V1_FRAMING                 0x00000004
-#define ARAP_V2_FRAMING                 0x00000008
-#define ARAP_FRAMING                    (ARAP_V1_FRAMING | ARAP_V2_FRAMING)
-
-#define PPP_MULTILINK_FRAMING           0x00000010
-#define PPP_SHORT_SEQUENCE_HDR_FORMAT   0x00000020
-#define PPP_MC_MULTILINK_FRAMING        0x00000040
-
-#define PPP_FRAMING                     0x00000100
-#define PPP_COMPRESS_ADDRESS_CONTROL    0x00000200
-#define PPP_COMPRESS_PROTOCOL_FIELD     0x00000400
-#define PPP_ACCM_SUPPORTED              0x00000800
-
-#define SLIP_FRAMING                    0x00001000
-#define SLIP_VJ_COMPRESSION             0x00002000
-#define SLIP_VJ_AUTODETECT              0x00004000
-
-#define MEDIA_NRZ_ENCODING              0x00010000
-#define MEDIA_NRZI_ENCODING             0x00020000
-#define MEDIA_NLPID                     0x00040000
-
-#define RFC_1356_FRAMING                0x00100000
-#define RFC_1483_FRAMING                0x00200000
-#define RFC_1490_FRAMING                0x00400000
-#define LLC_ENCAPSULATION               0x00800000
-
-#define SHIVA_FRAMING                   0x01000000
-#define NBF_PRESERVE_MAC_ADDRESS        0x01000000
-
-#define PASS_THROUGH_MODE               0x10000000
-#define RAW_PASS_THROUGH_MODE           0x20000000
-
-#define TAPI_PROVIDER                   0x80000000
-
-typedef struct _NDIS_WAN_INFO {
-  OUT ULONG  MaxFrameSize; 
-  OUT ULONG  MaxTransmit; 
-  OUT ULONG  HeaderPadding; 
-  OUT ULONG  TailPadding; 
-  OUT ULONG  Endpoints; 
-  OUT UINT  MemoryFlags; 
-  OUT NDIS_PHYSICAL_ADDRESS  HighestAcceptableAddress; 
-  OUT ULONG  FramingBits; 
-  OUT ULONG  DesiredACCM; 
-} NDIS_WAN_INFO, *PNDIS_WAN_INFO;
-
-typedef struct _NDIS_WAN_GET_LINK_INFO { 
-  IN NDIS_HANDLE  NdisLinkHandle; 
-  OUT ULONG  MaxSendFrameSize; 
-  OUT ULONG  MaxRecvFrameSize; 
-  OUT ULONG  HeaderPadding; 
-  OUT ULONG  TailPadding; 
-  OUT ULONG  SendFramingBits; 
-  OUT ULONG  RecvFramingBits; 
-  OUT ULONG  SendCompressionBits; 
-  OUT ULONG  RecvCompressionBits; 
-  OUT ULONG  SendACCM; 
-  OUT ULONG  RecvACCM; 
-} NDIS_WAN_GET_LINK_INFO, *PNDIS_WAN_GET_LINK_INFO;
-
-typedef struct _NDIS_WAN_SET_LINK_INFO { 
-  IN NDIS_HANDLE  NdisLinkHandle; 
-  IN ULONG  MaxSendFrameSize; 
-  IN ULONG  MaxRecvFrameSize; 
-  IN ULONG  HeaderPadding; 
-  IN ULONG  TailPadding; 
-  IN ULONG  SendFramingBits; 
-  IN ULONG  RecvFramingBits; 
-  IN ULONG  SendCompressionBits; 
-  IN ULONG  RecvCompressionBits; 
-  IN ULONG  SendACCM; 
-  IN ULONG  RecvACCM; 
-} NDIS_WAN_SET_LINK_INFO, *PNDIS_WAN_SET_LINK_INFO; 
-
-/* NDIS_WAN_COMPRESS_INFO.MSCompType constants */
-#define NDISWAN_COMPRESSION            		0x00000001
-#define NDISWAN_ENCRYPTION              	0x00000010
-#define NDISWAN_40_ENCRYPTION           	0x00000020
-#define NDISWAN_128_ENCRYPTION          	0x00000040
-#define NDISWAN_56_ENCRYPTION           	0x00000080
-#define NDISWAN_HISTORY_LESS            	0x01000000
-
-/* NDIS_WAN_COMPRESS_INFO.CompType constants */
-#define COMPTYPE_OUI											0
-#define COMPTYPE_NT31RAS									254
-#define COMPTYPE_NONE											255
-
-typedef struct _NDIS_WAN_COMPRESS_INFO {
-	UCHAR  SessionKey[8];
-	ULONG  MSCompType;
-	UCHAR  CompType;
-	USHORT  CompLength;
-	_ANONYMOUS_UNION union {
-		struct {
-			UCHAR  CompOUI[3];
-			UCHAR  CompSubType;
-			UCHAR  CompValues[32];
-		} Proprietary;
-		struct {
-			UCHAR  CompValues[32];
-		} Public;
-	} DUMMYUNIONNAME;
-} NDIS_WAN_COMPRESS_INFO;
-
-typedef NDIS_WAN_COMPRESS_INFO *PNDIS_WAN_COMPRESS_INFO;
-
-typedef struct _NDIS_WAN_GET_COMP_INFO { 
-  IN NDIS_HANDLE  NdisLinkHandle; 
-  OUT NDIS_WAN_COMPRESS_INFO  SendCapabilities; 
-  OUT NDIS_WAN_COMPRESS_INFO  RecvCapabilities; 
-} NDIS_WAN_GET_COMP_INFO, *PNDIS_WAN_GET_COMP_INFO;
-
-typedef struct _NDIS_WAN_SET_COMP_INFO {
-  IN NDIS_HANDLE  NdisLinkHandle;
-  IN NDIS_WAN_COMPRESS_INFO  SendCapabilities;
-  IN NDIS_WAN_COMPRESS_INFO  RecvCapabilities;
-} NDIS_WAN_SET_COMP_INFO, *PNDIS_WAN_SET_COMP_INFO;
-
-typedef struct _NDIS_WAN_GET_STATS_INFO {
-  IN NDIS_HANDLE  NdisLinkHandle;
-  OUT ULONG  BytesSent;
-  OUT ULONG  BytesRcvd;
-  OUT ULONG  FramesSent;
-  OUT ULONG  FramesRcvd;
-  OUT ULONG  CRCErrors;
-  OUT ULONG  TimeoutErrors;
-  OUT ULONG  AlignmentErrors;
-  OUT ULONG  SerialOverrunErrors;
-  OUT ULONG  FramingErrors;
-  OUT ULONG  BufferOverrunErrors;
-  OUT ULONG  BytesTransmittedUncompressed;
-  OUT ULONG  BytesReceivedUncompressed;
-  OUT ULONG  BytesTransmittedCompressed;
-  OUT ULONG  BytesReceivedCompressed;
-} NDIS_WAN_GET_STATS_INFO, *PNDIS_WAN_GET_STATS_INFO;
-
-#define NdisMWanInitializeWrapper(NdisWrapperHandle,	\
-                                  SystemSpecific1,		\
-                                  SystemSpecific2,		\
-                                  SystemSpecific3)		\
-{                                                     \
-	NdisMInitializeWrapper(NdisWrapperHandle,          	\
-                         SystemSpecific1,          		\
-                         SystemSpecific2,          		\
-                         SystemSpecific3);         		\
-}
-
-typedef struct _NDIS_WAN_CO_INFO {
-  OUT ULONG  MaxFrameSize;
-  OUT ULONG  MaxSendWindow;
-  OUT ULONG  FramingBits;
-  OUT ULONG  DesiredACCM;
-} NDIS_WAN_CO_INFO, *PNDIS_WAN_CO_INFO;
-
-typedef struct _NDIS_WAN_CO_GET_LINK_INFO {
-  OUT ULONG  MaxSendFrameSize;
-  OUT ULONG  MaxRecvFrameSize;
-  OUT ULONG  SendFramingBits;
-  OUT ULONG  RecvFramingBits;
-  OUT ULONG  SendCompressionBits;
-  OUT ULONG  RecvCompressionBits;
-  OUT ULONG  SendACCM;
-  OUT ULONG  RecvACCM;
-} NDIS_WAN_CO_GET_LINK_INFO, *PNDIS_WAN_CO_GET_LINK_INFO;
-
-typedef struct _NDIS_WAN_CO_SET_LINK_INFO {
-  IN ULONG  MaxSendFrameSize;
-  IN ULONG  MaxRecvFrameSize;
-  IN ULONG  SendFramingBits;
-  IN ULONG  RecvFramingBits;
-  IN ULONG  SendCompressionBits;
-  IN ULONG  RecvCompressionBits;
-  IN ULONG  SendACCM;
-  IN ULONG  RecvACCM;
-} NDIS_WAN_CO_SET_LINK_INFO, *PNDIS_WAN_CO_SET_LINK_INFO;
-
-typedef struct _NDIS_WAN_CO_GET_COMP_INFO { 
-  OUT NDIS_WAN_COMPRESS_INFO  SendCapabilities; 
-  OUT NDIS_WAN_COMPRESS_INFO  RecvCapabilities; 
-} NDIS_WAN_CO_GET_COMP_INFO, *PNDIS_WAN_CO_GET_COMP_INFO; 
-
-typedef struct _NDIS_WAN_CO_SET_COMP_INFO {
-  IN NDIS_WAN_COMPRESS_INFO  SendCapabilities;
-  IN NDIS_WAN_COMPRESS_INFO  RecvCapabilities;
-} NDIS_WAN_CO_SET_COMP_INFO, *PNDIS_WAN_CO_SET_COMP_INFO;
-
-typedef struct _NDIS_WAN_CO_GET_STATS_INFO {
-  OUT ULONG  BytesSent;
-  OUT ULONG  BytesRcvd;
-  OUT ULONG  FramesSent;
-  OUT ULONG  FramesRcvd;
-  OUT ULONG  CRCErrors;
-  OUT ULONG  TimeoutErrors;
-  OUT ULONG  AlignmentErrors;
-  OUT ULONG  SerialOverrunErrors;
-  OUT ULONG  FramingErrors;
-  OUT ULONG  BufferOverrunErrors;
-  OUT ULONG  BytesTransmittedUncompressed;
-  OUT ULONG  BytesReceivedUncompressed;
-  OUT ULONG  BytesTransmittedCompressed;
-  OUT ULONG  BytesReceivedCompressed;
-} NDIS_WAN_CO_GET_STATS_INFO, *PNDIS_WAN_CO_GET_STATS_INFO;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NDISWAN_H */
diff --git a/winsup/w32api/include/ddk/netevent.h b/winsup/w32api/include/ddk/netevent.h
deleted file mode 100644
index 0cf66e032..000000000
--- a/winsup/w32api/include/ddk/netevent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * netevent.h
- *
- * Network events
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NETEVENT_H
-#define __NETEVENT_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define EVENT_TRANSPORT_REGISTER_FAILED  0xC000232CL
-
-#define EVENT_TRANSPORT_ADAPTER_NOT_FOUND 0xC000232EL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NETEVENT_H */
diff --git a/winsup/w32api/include/ddk/netpnp.h b/winsup/w32api/include/ddk/netpnp.h
deleted file mode 100644
index 32f305d03..000000000
--- a/winsup/w32api/include/ddk/netpnp.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * netpnp.h
- *
- * Network Plug and Play event support
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NETPNP_H
-#define __NETPNP_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-typedef enum _NET_PNP_EVENT_CODE {
-  NetEventSetPower,
-  NetEventQueryPower,
-  NetEventQueryRemoveDevice,
-  NetEventCancelRemoveDevice,
-  NetEventReconfigure,
-  NetEventBindList,
-  NetEventBindsComplete,
-  NetEventPnPCapabilities,
-  NetEventMaximum
-} NET_PNP_EVENT_CODE, *PNET_PNP_EVENT_CODE;
-
-typedef struct _NET_PNP_EVENT {
-  NET_PNP_EVENT_CODE  NetEvent;
-  PVOID  Buffer;
-  ULONG  BufferLength;
-  ULONG_PTR  NdisReserved[4];
-  ULONG_PTR  TransportReserved[4];
-  ULONG_PTR  TdiReserved[4];
-  ULONG_PTR  TdiClientReserved[4];
-} NET_PNP_EVENT, *PNET_PNP_EVENT;
-
-typedef enum _NET_DEVICE_POWER_STATE {
-  NetDeviceStateUnspecified,
-  NetDeviceStateD0,
-  NetDeviceStateD1,
-  NetDeviceStateD2,
-  NetDeviceStateD3,
-  NetDeviceStateMaximum
-} NET_DEVICE_POWER_STATE, *PNET_DEVICE_POWER_STATE;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NETPNP_H */
diff --git a/winsup/w32api/include/ddk/newdev.h b/winsup/w32api/include/ddk/newdev.h
deleted file mode 100644
index 7f618ded0..000000000
--- a/winsup/w32api/include/ddk/newdev.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * newdev.h
- *
- * Driver installation DLL interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NEWDEV_H
-#define __NEWDEV_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-/* UpdateDriverForPlugAndPlayDevices.InstallFlags constants */
-#define INSTALLFLAG_FORCE                 0x00000001
-#define INSTALLFLAG_READONLY              0x00000002
-#define INSTALLFLAG_NONINTERACTIVE        0x00000004
-#define INSTALLFLAG_BITS                  0x00000007
-
-BOOL WINAPI
-UpdateDriverForPlugAndPlayDevicesA(
-  HWND  hwndParent,
-  LPCSTR  HardwareId,
-  LPCSTR  FullInfPath,
-  DWORD  InstallFlags,
-  PBOOL  bRebootRequired  OPTIONAL);
-
-BOOL WINAPI
-UpdateDriverForPlugAndPlayDevicesW(
-  HWND  hwndParent,
-  LPCWSTR  HardwareId,
-  LPCWSTR  FullInfPath,
-  DWORD  InstallFlags,
-  PBOOL  bRebootRequired  OPTIONAL);
-
-#ifdef UNICODE
-#define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesW
-#else
-#define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesA
-#endif /* UNICODE */
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NEWDEV_H */
diff --git a/winsup/w32api/include/ddk/ntapi.h b/winsup/w32api/include/ddk/ntapi.h
deleted file mode 100644
index a9a6b6e5c..000000000
--- a/winsup/w32api/include/ddk/ntapi.h
+++ /dev/null
@@ -1,2887 +0,0 @@
-/*
- * ntapi.h
- *
- * Windows NT Native API
- *
- * Most structures in this file is obtained from Windows NT/2000 Native API
- * Reference by Gary Nebbett, ISBN 1578701996.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTAPI_H
-#define __NTAPI_H
-
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include <stdarg.h>
-#include <winbase.h>
-#include "ntddk.h"
-#include "ntpoapi.h"
-
-typedef struct _PEB *PPEB;
-
-/* FIXME: Unknown definitions */
-typedef PVOID POBJECT_TYPE_LIST;
-typedef PVOID PEXECUTION_STATE;
-typedef PVOID PLANGID;
-
-
-/* System information and control */
-
-typedef enum _SYSTEM_INFORMATION_CLASS {
-	SystemInformationClassMin = 0,
-	SystemBasicInformation = 0,
-	SystemProcessorInformation = 1,
-	SystemPerformanceInformation = 2,
-	SystemTimeOfDayInformation = 3,
-	SystemPathInformation = 4,
-	SystemNotImplemented1 = 4,
-	SystemProcessInformation = 5,
-	SystemProcessesAndThreadsInformation = 5,
-	SystemCallCountInfoInformation = 6,
-	SystemCallCounts = 6,
-	SystemDeviceInformation = 7,
-	SystemConfigurationInformation = 7,
-	SystemProcessorPerformanceInformation = 8,
-	SystemProcessorTimes = 8,
-	SystemFlagsInformation = 9,
-	SystemGlobalFlag = 9,
-	SystemCallTimeInformation = 10,
-	SystemNotImplemented2 = 10,
-	SystemModuleInformation = 11,
-	SystemLocksInformation = 12,
-	SystemLockInformation = 12,
-	SystemStackTraceInformation = 13,
-	SystemNotImplemented3 = 13,
-	SystemPagedPoolInformation = 14,
-	SystemNotImplemented4 = 14,
-	SystemNonPagedPoolInformation = 15,
-	SystemNotImplemented5 = 15,
-	SystemHandleInformation = 16,
-	SystemObjectInformation = 17,
-	SystemPageFileInformation = 18,
-	SystemPagefileInformation = 18,
-	SystemVdmInstemulInformation = 19,
-	SystemInstructionEmulationCounts = 19,
-	SystemVdmBopInformation = 20,
-	SystemInvalidInfoClass1 = 20,	
-	SystemFileCacheInformation = 21,
-	SystemCacheInformation = 21,
-	SystemPoolTagInformation = 22,
-	SystemInterruptInformation = 23,
-	SystemProcessorStatistics = 23,
-	SystemDpcBehaviourInformation = 24,
-	SystemDpcInformation = 24,
-	SystemFullMemoryInformation = 25,
-	SystemNotImplemented6 = 25,
-	SystemLoadImage = 26,
-	SystemUnloadImage = 27,
-	SystemTimeAdjustmentInformation = 28,
-	SystemTimeAdjustment = 28,
-	SystemSummaryMemoryInformation = 29,
-	SystemNotImplemented7 = 29,
-	SystemNextEventIdInformation = 30,
-	SystemNotImplemented8 = 30,
-	SystemEventIdsInformation = 31,
-	SystemNotImplemented9 = 31,
-	SystemCrashDumpInformation = 32,
-	SystemExceptionInformation = 33,
-	SystemCrashDumpStateInformation = 34,
-	SystemKernelDebuggerInformation = 35,
-	SystemContextSwitchInformation = 36,
-	SystemRegistryQuotaInformation = 37,
-	SystemLoadAndCallImage = 38,
-	SystemPrioritySeparation = 39,
-	SystemPlugPlayBusInformation = 40,
-	SystemNotImplemented10 = 40,
-	SystemDockInformation = 41,
-	SystemNotImplemented11 = 41,
-	/* SystemPowerInformation = 42, Conflicts with POWER_INFORMATION_LEVEL 1 */
-	SystemInvalidInfoClass2 = 42,
-	SystemProcessorSpeedInformation = 43,
-	SystemInvalidInfoClass3 = 43,
-	SystemCurrentTimeZoneInformation = 44,
-	SystemTimeZoneInformation = 44,
-	SystemLookasideInformation = 45,
-	SystemSetTimeSlipEvent = 46,
-	SystemCreateSession = 47,
-	SystemDeleteSession = 48,
-	SystemInvalidInfoClass4 = 49,
-	SystemRangeStartInformation = 50,
-	SystemVerifierInformation = 51,
-	SystemAddVerifier = 52,
-	SystemSessionProcessesInformation	= 53,
-	SystemInformationClassMax
-} SYSTEM_INFORMATION_CLASS;
-
-typedef struct _SYSTEM_BASIC_INFORMATION {
-	ULONG  Unknown;
-	ULONG  MaximumIncrement;
-	ULONG  PhysicalPageSize;
-	ULONG  NumberOfPhysicalPages;
-	ULONG  LowestPhysicalPage;
-	ULONG  HighestPhysicalPage;
-	ULONG  AllocationGranularity;
-	ULONG  LowestUserAddress;
-	ULONG  HighestUserAddress;
-	ULONG  ActiveProcessors;
-	UCHAR  NumberProcessors;
-} SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION;
-
-typedef struct _SYSTEM_PROCESSOR_INFORMATION {
-	USHORT  ProcessorArchitecture;
-	USHORT  ProcessorLevel;
-	USHORT  ProcessorRevision;
-	USHORT  Unknown;
-	ULONG  FeatureBits;
-} SYSTEM_PROCESSOR_INFORMATION, *PSYSTEM_PROCESSOR_INFORMATION;
-
-typedef struct _SYSTEM_PERFORMANCE_INFORMATION {
-	LARGE_INTEGER  IdleTime;
-	LARGE_INTEGER  ReadTransferCount;
-	LARGE_INTEGER  WriteTransferCount;
-	LARGE_INTEGER  OtherTransferCount;
-	ULONG  ReadOperationCount;
-	ULONG  WriteOperationCount;
-	ULONG  OtherOperationCount;
-	ULONG  AvailablePages;
-	ULONG  TotalCommittedPages;
-	ULONG  TotalCommitLimit;
-	ULONG  PeakCommitment;
-	ULONG  PageFaults;
-	ULONG  WriteCopyFaults;
-	ULONG  TransitionFaults;
-	ULONG  CacheTransitionFaults;
-	ULONG  DemandZeroFaults;
-	ULONG  PagesRead;
-	ULONG  PageReadIos;
-	ULONG	 CacheReads;
-	ULONG	 CacheIos;
-	ULONG  PagefilePagesWritten;
-	ULONG  PagefilePageWriteIos;
-	ULONG  MappedFilePagesWritten;
-	ULONG  MappedFilePageWriteIos;
-	ULONG  PagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
-	ULONG  PagedPoolAllocs;
-	ULONG  PagedPoolFrees;
-	ULONG  NonPagedPoolAllocs;
-	ULONG  NonPagedPoolFrees;
-	ULONG  TotalFreeSystemPtes;
-	ULONG  SystemCodePage;
-	ULONG  TotalSystemDriverPages;
-	ULONG  TotalSystemCodePages;
-	ULONG  SmallNonPagedLookasideListAllocateHits;
-	ULONG  SmallPagedLookasideListAllocateHits;
-	ULONG  Reserved3;
-	ULONG  MmSystemCachePage;
-	ULONG  PagedPoolPage;
-	ULONG  SystemDriverPage;
-	ULONG  FastReadNoWait;
-	ULONG  FastReadWait;
-	ULONG  FastReadResourceMiss;
-	ULONG  FastReadNotPossible;
-	ULONG  FastMdlReadNoWait;
-	ULONG  FastMdlReadWait;
-	ULONG  FastMdlReadResourceMiss;
-	ULONG  FastMdlReadNotPossible;
-	ULONG  MapDataNoWait;
-	ULONG  MapDataWait;
-	ULONG  MapDataNoWaitMiss;
-	ULONG  MapDataWaitMiss;
-	ULONG  PinMappedDataCount;
-	ULONG  PinReadNoWait;
-	ULONG  PinReadWait;
-	ULONG  PinReadNoWaitMiss;
-	ULONG  PinReadWaitMiss;
-	ULONG  CopyReadNoWait;
-	ULONG  CopyReadWait;
-	ULONG  CopyReadNoWaitMiss;
-	ULONG  CopyReadWaitMiss;
-	ULONG  MdlReadNoWait;
-	ULONG  MdlReadWait;
-	ULONG  MdlReadNoWaitMiss;
-	ULONG  MdlReadWaitMiss;
-	ULONG  ReadAheadIos;
-	ULONG  LazyWriteIos;
-	ULONG  LazyWritePages;
-	ULONG  DataFlushes;
-	ULONG  DataPages;
-	ULONG  ContextSwitches;
-	ULONG  FirstLevelTbFills;
-	ULONG  SecondLevelTbFills;
-	ULONG  SystemCalls;
-} SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION;
-
-typedef struct _SYSTEM_TIME_OF_DAY_INFORMATION {
-	LARGE_INTEGER  BootTime;
-	LARGE_INTEGER  CurrentTime;
-	LARGE_INTEGER  TimeZoneBias;
-	ULONG  CurrentTimeZoneId;
-} SYSTEM_TIME_OF_DAY_INFORMATION, *PSYSTEM_TIME_OF_DAY_INFORMATION;
-
-typedef struct _VM_COUNTERS {
-	ULONG  PeakVirtualSize;
-	ULONG  VirtualSize;
-	ULONG  PageFaultCount;
-	ULONG  PeakWorkingSetSize;
-	ULONG  WorkingSetSize;
-	ULONG  QuotaPeakPagedPoolUsage;
-	ULONG  QuotaPagedPoolUsage;
-	ULONG  QuotaPeakNonPagedPoolUsage;
-	ULONG  QuotaNonPagedPoolUsage;
-	ULONG  PagefileUsage;
-	ULONG  PeakPagefileUsage;
-} VM_COUNTERS;
-
-typedef enum _THREAD_STATE {
-	StateInitialized,
-	StateReady,
-	StateRunning,
-	StateStandby,
-	StateTerminated,
-	StateWait,
-	StateTransition,
-	StateUnknown
-} THREAD_STATE;
-
-typedef struct _SYSTEM_THREADS {
-	LARGE_INTEGER  KernelTime;
-	LARGE_INTEGER  UserTime;
-	LARGE_INTEGER  CreateTime;
-	ULONG  WaitTime;
-	PVOID  StartAddress;
-	CLIENT_ID  ClientId;
-	KPRIORITY  Priority;
-	KPRIORITY  BasePriority;
-	ULONG  ContextSwitchCount;
-	THREAD_STATE  State;
-	KWAIT_REASON  WaitReason;
-} SYSTEM_THREADS, *PSYSTEM_THREADS;
-
-typedef struct _SYSTEM_PROCESSES {
-	ULONG  NextEntryDelta;
-	ULONG  ThreadCount;
-	ULONG  Reserved1[6];
-	LARGE_INTEGER  CreateTime;
-	LARGE_INTEGER  UserTime;
-	LARGE_INTEGER  KernelTime;
-	UNICODE_STRING  ProcessName;
-	KPRIORITY  BasePriority;
-	ULONG  ProcessId;
-	ULONG  InheritedFromProcessId;
-	ULONG  HandleCount;
-	ULONG  Reserved2[2];
-	VM_COUNTERS  VmCounters;
-	IO_COUNTERS  IoCounters;
-	SYSTEM_THREADS  Threads[1];
-} SYSTEM_PROCESSES, *PSYSTEM_PROCESSES;
-
-typedef struct _SYSTEM_CALLS_INFORMATION {
-	ULONG  Size;
-	ULONG  NumberOfDescriptorTables;
-	ULONG  NumberOfRoutinesInTable[1];
-	ULONG  CallCounts[ANYSIZE_ARRAY];
-} SYSTEM_CALLS_INFORMATION, *PSYSTEM_CALLS_INFORMATION;
-
-typedef struct _SYSTEM_CONFIGURATION_INFORMATION {
-	ULONG  DiskCount;
-	ULONG  FloppyCount;
-	ULONG  CdRomCount;
-	ULONG  TapeCount;
-	ULONG  SerialCount;
-	ULONG  ParallelCount;
-} SYSTEM_CONFIGURATION_INFORMATION, *PSYSTEM_CONFIGURATION_INFORMATION;
-
-typedef struct _SYSTEM_PROCESSOR_TIMES {
-	LARGE_INTEGER  IdleTime;
-	LARGE_INTEGER  KernelTime;
-	LARGE_INTEGER  UserTime;
-	LARGE_INTEGER  DpcTime;
-	LARGE_INTEGER  InterruptTime;
-	ULONG  InterruptCount;
-} SYSTEM_PROCESSOR_TIMES, *PSYSTEM_PROCESSOR_TIMES;
-
-/* SYSTEM_GLOBAL_FLAG.GlobalFlag constants */
-#define FLG_STOP_ON_EXCEPTION             0x00000001
-#define FLG_SHOW_LDR_SNAPS                0x00000002
-#define FLG_DEBUG_INITIAL_COMMAND         0x00000004
-#define FLG_STOP_ON_HUNG_GUI              0x00000008
-#define FLG_HEAP_ENABLE_TAIL_CHECK        0x00000010
-#define FLG_HEAP_ENABLE_FREE_CHECK        0x00000020
-#define FLG_HEAP_VALIDATE_PARAMETERS      0x00000040
-#define FLG_HEAP_VALIDATE_ALL             0x00000080
-#define FLG_POOL_ENABLE_TAIL_CHECK        0x00000100
-#define FLG_POOL_ENABLE_FREE_CHECK        0x00000200
-#define FLG_POOL_ENABLE_TAGGING           0x00000400
-#define FLG_HEAP_ENABLE_TAGGING           0x00000800
-#define FLG_USER_STACK_TRACE_DB           0x00001000
-#define FLG_KERNEL_STACK_TRACE_DB         0x00002000
-#define FLG_MAINTAIN_OBJECT_TYPELIST      0x00004000
-#define FLG_HEAP_ENABLE_TAG_BY_DLL        0x00008000
-#define FLG_IGNORE_DEBUG_PRIV             0x00010000
-#define FLG_ENABLE_CSRDEBUG               0x00020000
-#define FLG_ENABLE_KDEBUG_SYMBOL_LOAD     0x00040000
-#define FLG_DISABLE_PAGE_KERNEL_STACKS    0x00080000
-#define FLG_HEAP_ENABLE_CALL_TRACING      0x00100000
-#define FLG_HEAP_DISABLE_COALESCING       0x00200000
-#define FLG_ENABLE_CLOSE_EXCEPTIONS       0x00400000
-#define FLG_ENABLE_EXCEPTION_LOGGING      0x00800000
-#define FLG_ENABLE_DBGPRINT_BUFFERING     0x08000000
-
-typedef struct _SYSTEM_GLOBAL_FLAG {
-  ULONG  GlobalFlag;
-} SYSTEM_GLOBAL_FLAG, *PSYSTEM_GLOBAL_FLAG;
-
-typedef struct _SYSTEM_MODULE_INFORMATION_ENTRY {
-	ULONG	 Unknown1;
-	ULONG	 Unknown2;
-	PVOID  Base;
-	ULONG  Size;
-	ULONG  Flags;
-	USHORT  Index;
-  /* Length of module name not including the path, this
-     field contains valid value only for NTOSKRNL module */
-	USHORT	NameLength;
-	USHORT  LoadCount;
-	USHORT  PathLength;
-	CHAR  ImageName[256];
-} SYSTEM_MODULE_INFORMATION_ENTRY, *PSYSTEM_MODULE_INFORMATION_ENTRY;
-
-typedef struct _SYSTEM_MODULE_INFORMATION {
-	ULONG  Count;
-  SYSTEM_MODULE_INFORMATION_ENTRY Module[1];
-} SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION;
-
-typedef struct _SYSTEM_LOCK_INFORMATION {
-	PVOID  Address;
-	USHORT  Type;
-	USHORT  Reserved1;
-	ULONG  ExclusiveOwnerThreadId;
-	ULONG  ActiveCount;
-	ULONG  ContentionCount;
-	ULONG  Reserved2[2];
-	ULONG  NumberOfSharedWaiters;
-	ULONG  NumberOfExclusiveWaiters;
-} SYSTEM_LOCK_INFORMATION, *PSYSTEM_LOCK_INFORMATION;
-
-/*SYSTEM_HANDLE_INFORMATION.Flags cosntants */
-#define PROTECT_FROM_CLOSE                0x01
-#define INHERIT                           0x02
-
-typedef struct _SYSTEM_HANDLE_INFORMATION {
-	ULONG  ProcessId;
-	UCHAR  ObjectTypeNumber;
-	UCHAR  Flags;
-	USHORT  Handle;
-	PVOID  Object;
-	ACCESS_MASK  GrantedAccess;
-} SYSTEM_HANDLE_INFORMATION, *PSYSTEM_HANDLE_INFORMATION;
-
-typedef struct _SYSTEM_OBJECT_TYPE_INFORMATION {
-	ULONG  NextEntryOffset;
-	ULONG  ObjectCount;
-	ULONG  HandleCount;
-	ULONG  TypeNumber;
-	ULONG  InvalidAttributes;
-	GENERIC_MAPPING  GenericMapping;
-	ACCESS_MASK  ValidAccessMask;
-	POOL_TYPE  PoolType;
-	UCHAR  Unknown;
-	UNICODE_STRING  Name;
-} SYSTEM_OBJECT_TYPE_INFORMATION, *PSYSTEM_OBJECT_TYPE_INFORMATION;
-
-/* SYSTEM_OBJECT_INFORMATION.Flags constants */
-#define FLG_SYSOBJINFO_SINGLE_HANDLE_ENTRY    0x40
-#define FLG_SYSOBJINFO_DEFAULT_SECURITY_QUOTA 0x20
-#define FLG_SYSOBJINFO_PERMANENT              0x10
-#define FLG_SYSOBJINFO_EXCLUSIVE              0x08
-#define FLG_SYSOBJINFO_CREATOR_INFO           0x04
-#define FLG_SYSOBJINFO_KERNEL_MODE            0x02
-
-typedef struct _SYSTEM_OBJECT_INFORMATION {
-	ULONG  NextEntryOffset;
-	PVOID  Object;
-	ULONG  CreatorProcessId;
-	USHORT  Unknown;
-	USHORT  Flags;
-	ULONG  PointerCount;
-	ULONG  HandleCount;
-	ULONG  PagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
-	ULONG  ExclusiveProcessId;
-	PSECURITY_DESCRIPTOR  SecurityDescriptor;
-	UNICODE_STRING  Name;
-} SYSTEM_OBJECT_INFORMATION, *PSYSTEM_OBJECT_INFORMATION;
-
-typedef struct _SYSTEM_PAGEFILE_INFORMATION {
-	ULONG  NextEntryOffset;
-	ULONG  CurrentSize;
-	ULONG  TotalUsed;
-	ULONG  PeakUsed;
-	UNICODE_STRING  FileName;
-} SYSTEM_PAGEFILE_INFORMATION, *PSYSTEM_PAGEFILE_INFORMATION;
-
-typedef struct _SYSTEM_INSTRUCTION_EMULATION_INFORMATION {
-	ULONG  SegmentNotPresent;
-	ULONG  TwoByteOpcode;
-	ULONG  ESprefix;
-	ULONG  CSprefix;
-	ULONG  SSprefix;
-	ULONG  DSprefix;
-	ULONG  FSPrefix;
-	ULONG  GSprefix;
-	ULONG  OPER32prefix;
-	ULONG  ADDR32prefix;
-	ULONG  INSB;
-	ULONG  INSW;
-	ULONG  OUTSB;
-	ULONG  OUTSW;
-	ULONG  PUSHFD;
-	ULONG  POPFD;
-	ULONG  INTnn;
-	ULONG  INTO;
-	ULONG  IRETD;
-	ULONG  INBimm;
-	ULONG  INWimm;
-	ULONG  OUTBimm;
-	ULONG  OUTWimm;
-	ULONG  INB;
-	ULONG  INW;
-	ULONG  OUTB;
-	ULONG  OUTW;
-	ULONG  LOCKprefix;
-	ULONG  REPNEprefix;
-	ULONG  REPprefix;
-	ULONG  HLT;
-	ULONG  CLI;
-	ULONG  STI;
-	ULONG  GenericInvalidOpcode;
-} SYSTEM_INSTRUCTION_EMULATION_INFORMATION, *PSYSTEM_INSTRUCTION_EMULATION_INFORMATION;
-
-typedef struct _SYSTEM_POOL_TAG_INFORMATION {
-	CHAR  Tag[4];
-	ULONG  PagedPoolAllocs;
-	ULONG  PagedPoolFrees;
-	ULONG  PagedPoolUsage;
-	ULONG  NonPagedPoolAllocs;
-	ULONG  NonPagedPoolFrees;
-	ULONG  NonPagedPoolUsage;
-} SYSTEM_POOL_TAG_INFORMATION, *PSYSTEM_POOL_TAG_INFORMATION;
-
-typedef struct _SYSTEM_PROCESSOR_STATISTICS {
-	ULONG  ContextSwitches;
-	ULONG  DpcCount;
-	ULONG  DpcRequestRate;
-	ULONG  TimeIncrement;
-	ULONG  DpcBypassCount;
-	ULONG  ApcBypassCount;
-} SYSTEM_PROCESSOR_STATISTICS, *PSYSTEM_PROCESSOR_STATISTICS;
-
-typedef struct _SYSTEM_DPC_INFORMATION {
-	ULONG  Reserved;
-	ULONG  MaximumDpcQueueDepth;
-	ULONG  MinimumDpcRate;
-	ULONG  AdjustDpcThreshold;
-	ULONG  IdealDpcRate;
-} SYSTEM_DPC_INFORMATION, *PSYSTEM_DPC_INFORMATION;
-
-typedef struct _SYSTEM_LOAD_IMAGE {
-	UNICODE_STRING  ModuleName;
-	PVOID  ModuleBase;
-	PVOID  SectionPointer;
-	PVOID  EntryPoint;
-	PVOID  ExportDirectory;
-} SYSTEM_LOAD_IMAGE, *PSYSTEM_LOAD_IMAGE;
-
-typedef struct _SYSTEM_UNLOAD_IMAGE {
-  PVOID  ModuleBase;
-} SYSTEM_UNLOAD_IMAGE, *PSYSTEM_UNLOAD_IMAGE;
-
-typedef struct _SYSTEM_QUERY_TIME_ADJUSTMENT {
-	ULONG  TimeAdjustment;
-	ULONG  MaximumIncrement;
-	BOOLEAN  TimeSynchronization;
-} SYSTEM_QUERY_TIME_ADJUSTMENT, *PSYSTEM_QUERY_TIME_ADJUSTMENT;
-
-typedef struct _SYSTEM_SET_TIME_ADJUSTMENT {
-	ULONG  TimeAdjustment;
-	BOOLEAN  TimeSynchronization;
-} SYSTEM_SET_TIME_ADJUSTMENT, *PSYSTEM_SET_TIME_ADJUSTMENT;
-
-typedef struct _SYSTEM_CRASH_DUMP_INFORMATION {
-	HANDLE  CrashDumpSectionHandle;
-	HANDLE  Unknown;
-} SYSTEM_CRASH_DUMP_INFORMATION, *PSYSTEM_CRASH_DUMP_INFORMATION;
-
-typedef struct _SYSTEM_EXCEPTION_INFORMATION {
-	ULONG  AlignmentFixupCount;
-	ULONG  ExceptionDispatchCount;
-	ULONG  FloatingEmulationCount;
-	ULONG  Reserved;
-} SYSTEM_EXCEPTION_INFORMATION, *PSYSTEM_EXCEPTION_INFORMATION;
-
-typedef struct _SYSTEM_CRASH_DUMP_STATE_INFORMATION {
-	ULONG  CrashDumpSectionExists;
-	ULONG  Unknown;
-} SYSTEM_CRASH_DUMP_STATE_INFORMATION, *PSYSTEM_CRASH_DUMP_STATE_INFORMATION;
-
-typedef struct _SYSTEM_KERNEL_DEBUGGER_INFORMATION {
-	BOOLEAN  DebuggerEnabled;
-	BOOLEAN  DebuggerNotPresent;
-} SYSTEM_KERNEL_DEBUGGER_INFORMATION, *PSYSTEM_KERNEL_DEBUGGER_INFORMATION;
-
-typedef struct _SYSTEM_CONTEXT_SWITCH_INFORMATION {
-	ULONG  ContextSwitches;
-	ULONG  ContextSwitchCounters[11];
-} SYSTEM_CONTEXT_SWITCH_INFORMATION, *PSYSTEM_CONTEXT_SWITCH_INFORMATION;
-
-typedef struct _SYSTEM_REGISTRY_QUOTA_INFORMATION {
-	ULONG  RegistryQuota;
-	ULONG  RegistryQuotaInUse;
-	ULONG  PagedPoolSize;
-} SYSTEM_REGISTRY_QUOTA_INFORMATION, *PSYSTEM_REGISTRY_QUOTA_INFORMATION;
-
-typedef struct _SYSTEM_LOAD_AND_CALL_IMAGE {
-  UNICODE_STRING  ModuleName;
-} SYSTEM_LOAD_AND_CALL_IMAGE, *PSYSTEM_LOAD_AND_CALL_IMAGE;
-
-typedef struct _SYSTEM_PRIORITY_SEPARATION {
-  ULONG  PrioritySeparation;
-} SYSTEM_PRIORITY_SEPARATION, *PSYSTEM_PRIORITY_SEPARATION;
-
-typedef struct _SYSTEM_TIME_ZONE_INFORMATION {
-	LONG  Bias;
-	WCHAR  StandardName[32];
-	LARGE_INTEGER  StandardDate;
-	LONG  StandardBias;
-	WCHAR  DaylightName[32];
-	LARGE_INTEGER  DaylightDate;
-	LONG  DaylightBias;
-} SYSTEM_TIME_ZONE_INFORMATION, *PSYSTEM_TIME_ZONE_INFORMATION;
-
-typedef struct _SYSTEM_LOOKASIDE_INFORMATION {
-	USHORT  Depth;
-	USHORT  MaximumDepth;
-	ULONG  TotalAllocates;
-	ULONG  AllocateMisses;
-	ULONG  TotalFrees;
-	ULONG  FreeMisses;
-	POOL_TYPE  Type;
-	ULONG  Tag;
-	ULONG  Size;
-} SYSTEM_LOOKASIDE_INFORMATION, *PSYSTEM_LOOKASIDE_INFORMATION;
-
-typedef struct _SYSTEM_SET_TIME_SLIP_EVENT {
-  HANDLE  TimeSlipEvent;
-} SYSTEM_SET_TIME_SLIP_EVENT, *PSYSTEM_SET_TIME_SLIP_EVENT;
-
-typedef struct _SYSTEM_CREATE_SESSION {
-  ULONG  SessionId;
-} SYSTEM_CREATE_SESSION, *PSYSTEM_CREATE_SESSION;
-
-typedef struct _SYSTEM_DELETE_SESSION {
-  ULONG  SessionId;
-} SYSTEM_DELETE_SESSION, *PSYSTEM_DELETE_SESSION;
-
-typedef struct _SYSTEM_RANGE_START_INFORMATION {
-  PVOID  SystemRangeStart;
-} SYSTEM_RANGE_START_INFORMATION, *PSYSTEM_RANGE_START_INFORMATION;
-
-typedef struct _SYSTEM_SESSION_PROCESSES_INFORMATION {
-	ULONG  SessionId;
-	ULONG  BufferSize;
-	PVOID  Buffer;
-} SYSTEM_SESSION_PROCESSES_INFORMATION, *PSYSTEM_SESSION_PROCESSES_INFORMATION;
-
-typedef struct _SYSTEM_POOL_BLOCK {
-	BOOLEAN  Allocated;
-	USHORT  Unknown;
-	ULONG  Size;
-	CHAR  Tag[4];
-} SYSTEM_POOL_BLOCK, *PSYSTEM_POOL_BLOCK;
-
-typedef struct _SYSTEM_POOL_BLOCKS_INFORMATION {
-	ULONG  PoolSize;
-	PVOID  PoolBase;
-	USHORT  Unknown;
-	ULONG  NumberOfBlocks;
-	SYSTEM_POOL_BLOCK  PoolBlocks[1];
-} SYSTEM_POOL_BLOCKS_INFORMATION, *PSYSTEM_POOL_BLOCKS_INFORMATION;
-
-typedef struct _SYSTEM_MEMORY_USAGE {
-	PVOID  Name;
-	USHORT  Valid;
-	USHORT  Standby;
-	USHORT  Modified;
-	USHORT  PageTables;
-} SYSTEM_MEMORY_USAGE, *PSYSTEM_MEMORY_USAGE;
-
-typedef struct _SYSTEM_MEMORY_USAGE_INFORMATION {
-  ULONG  Reserved;
-	PVOID  EndOfData;
-	SYSTEM_MEMORY_USAGE  MemoryUsage[1];
-} SYSTEM_MEMORY_USAGE_INFORMATION, *PSYSTEM_MEMORY_USAGE_INFORMATION;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtQuerySystemInformation(
-  IN SYSTEM_INFORMATION_CLASS  SystemInformationClass,
-  IN OUT PVOID  SystemInformation,
-  IN ULONG  SystemInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQuerySystemInformation(
-  IN SYSTEM_INFORMATION_CLASS  SystemInformationClass,
-  IN OUT PVOID  SystemInformation,
-  IN ULONG  SystemInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetSystemInformation(
-	IN SYSTEM_INFORMATION_CLASS  SystemInformationClass,
-	IN OUT PVOID  SystemInformation,
-	IN ULONG  SystemInformationLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQuerySystemEnvironmentValue(
-	IN PUNICODE_STRING  Name,
-	OUT PVOID  Value,
-	IN ULONG  ValueLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetSystemEnvironmentValue(
-	IN PUNICODE_STRING  Name,
-	IN PUNICODE_STRING  Value);
-
-typedef enum _SHUTDOWN_ACTION {
-	ShutdownNoReboot,
-	ShutdownReboot,
-	ShutdownPowerOff
-} SHUTDOWN_ACTION;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtShutdownSystem(
-  IN SHUTDOWN_ACTION  Action);
-
-typedef enum _DEBUG_CONTROL_CODE {
-  DebugGetTraceInformation = 1,
-	DebugSetInternalBreakpoint,
-	DebugSetSpecialCall,
-	DebugClearSpecialCalls,
-	DebugQuerySpecialCalls,
-	DebugDbgBreakPoint,
-	DebugMaximum
-} DEBUG_CONTROL_CODE;
-
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSystemDebugControl(
-	IN DEBUG_CONTROL_CODE  ControlCode,
-	IN PVOID  InputBuffer  OPTIONAL,
-	IN ULONG  InputBufferLength,
-	OUT PVOID  OutputBuffer  OPTIONAL,
-	IN ULONG  OutputBufferLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
-
-
-
-/* Objects, Object directories, and symbolic links */
-
-typedef enum _OBJECT_INFORMATION_CLASS {
-	ObjectBasicInformation,
-	ObjectNameInformation,
-	ObjectTypeInformation,
-	ObjectAllTypesInformation,
-	ObjectHandleInformation
-} OBJECT_INFORMATION_CLASS;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryObject(
-	IN HANDLE  ObjectHandle,
-	IN OBJECT_INFORMATION_CLASS  ObjectInformationClass,
-	OUT PVOID  ObjectInformation,
-	IN ULONG  ObjectInformationLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetInformationObject(
-	IN HANDLE  ObjectHandle,
-	IN OBJECT_INFORMATION_CLASS  ObjectInformationClass,
-	IN PVOID  ObjectInformation,
-	IN ULONG  ObjectInformationLength);
-
-/* OBJECT_BASIC_INFORMATION.Attributes constants */
-/* also in winbase.h */
-#define HANDLE_FLAG_INHERIT               0x01
-#define HANDLE_FLAG_PROTECT_FROM_CLOSE    0x02
-/* end winbase.h */
-#define PERMANENT                         0x10
-#define EXCLUSIVE                         0x20
-
-typedef struct _OBJECT_BASIC_INFORMATION {
-	ULONG  Attributes;
-	ACCESS_MASK  GrantedAccess;
-	ULONG  HandleCount;
-	ULONG  PointerCount;
-	ULONG  PagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
-	ULONG  Reserved[3];
-	ULONG  NameInformationLength;
-	ULONG  TypeInformationLength;
-	ULONG  SecurityDescriptorLength;
-	LARGE_INTEGER  CreateTime;
-} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION;
-#if 0
-/* FIXME: Enable later */
-typedef struct _OBJECT_TYPE_INFORMATION {
-	UNICODE_STRING  Name;
-	ULONG  ObjectCount;
-	ULONG  HandleCount;
-	ULONG  Reserved1[4];
-	ULONG  PeakObjectCount;
-	ULONG  PeakHandleCount;
-	ULONG  Reserved2[4];
-	ULONG  InvalidAttributes;
-	GENERIC_MAPPING  GenericMapping;
-	ULONG  ValidAccess;
-	UCHAR  Unknown;
-	BOOLEAN  MaintainHandleDatabase;
-	POOL_TYPE  PoolType;
-	ULONG  PagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
-} OBJECT_TYPE_INFORMATION, *POBJECT_TYPE_INFORMATION;
-
-typedef struct _OBJECT_ALL_TYPES_INFORMATION {
-  ULONG  NumberOfTypes;
-  OBJECT_TYPE_INFORMATION  TypeInformation;
-} OBJECT_ALL_TYPES_INFORMATION, *POBJECT_ALL_TYPES_INFORMATION;
-#endif
-typedef struct _OBJECT_HANDLE_ATTRIBUTE_INFORMATION {
-  BOOLEAN  Inherit;
-  BOOLEAN  ProtectFromClose;
-} OBJECT_HANDLE_ATTRIBUTE_INFORMATION, *POBJECT_HANDLE_ATTRIBUTE_INFORMATION;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtDuplicateObject(
-  IN HANDLE  SourceProcessHandle,
-  IN HANDLE  SourceHandle,
-  IN HANDLE  TargetProcessHandle,
-  OUT PHANDLE  TargetHandle  OPTIONAL,
-  IN ACCESS_MASK  DesiredAccess,
-  IN ULONG  Attributes,
-  IN ULONG  Options);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwDuplicateObject(
-  IN HANDLE  SourceProcessHandle,
-  IN HANDLE  SourceHandle,
-  IN HANDLE  TargetProcessHandle,
-  OUT PHANDLE  TargetHandle  OPTIONAL,
-  IN ACCESS_MASK  DesiredAccess,
-  IN ULONG  Attributes,
-  IN ULONG  Options);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtQuerySecurityObject(
-  IN HANDLE Handle,
-  IN SECURITY_INFORMATION  SecurityInformation,
-  OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN ULONG  SecurityDescriptorLength,
-  OUT PULONG  ReturnLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQuerySecurityObject(
-  IN HANDLE Handle,
-  IN SECURITY_INFORMATION  SecurityInformation,
-  OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN ULONG  SecurityDescriptorLength,
-  OUT PULONG  ReturnLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtSetSecurityObject(
-  IN HANDLE  Handle,
-  IN SECURITY_INFORMATION  SecurityInformation,
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetSecurityObject(
-  IN HANDLE  Handle,
-  IN SECURITY_INFORMATION  SecurityInformation,
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwOpenDirectoryObject(
-  OUT PHANDLE  DirectoryHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryDirectoryObject(
-  IN HANDLE  DirectoryHandle,
-  OUT PVOID  Buffer,
-  IN ULONG  BufferLength,
-  IN BOOLEAN  ReturnSingleEntry,
-  IN BOOLEAN  RestartScan,
-  IN OUT PULONG  Context,
-  OUT PULONG  ReturnLength  OPTIONAL);
-
-typedef struct _DIRECTORY_BASIC_INFORMATION {
-  UNICODE_STRING  ObjectName;
-  UNICODE_STRING  ObjectTypeName;
-} DIRECTORY_BASIC_INFORMATION, *PDIRECTORY_BASIC_INFORMATION;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreateSymbolicLinkObject(
-  OUT PHANDLE  SymbolicLinkHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PUNICODE_STRING  TargetName);
-
-
-
-
-/* Virtual memory */
-
-typedef enum _MEMORY_INFORMATION_CLASS {
-MemoryBasicInformation,
-MemoryWorkingSetList,
-MemorySectionName,
-MemoryBasicVlmInformation
-} MEMORY_INFORMATION_CLASS;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtAllocateVirtualMemory(
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN ULONG  ZeroBits,
-  IN OUT PULONG  AllocationSize,
-  IN ULONG  AllocationType,
-  IN ULONG  Protect);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAllocateVirtualMemory(
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN ULONG  ZeroBits,
-  IN OUT PULONG  AllocationSize,
-  IN ULONG  AllocationType,
-  IN ULONG  Protect);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtFreeVirtualMemory(
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN OUT PULONG  FreeSize,
-  IN ULONG  FreeType);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwFreeVirtualMemory(
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN OUT PULONG  FreeSize,
-  IN ULONG  FreeType);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN PVOID  BaseAddress,
-	IN MEMORY_INFORMATION_CLASS  MemoryInformationClass,
-	OUT PVOID  MemoryInformation,
-	IN ULONG  MemoryInformationLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
-
-/* MEMORY_WORKING_SET_LIST.WorkingSetList constants */
-#define WSLE_PAGE_READONLY                0x001
-#define WSLE_PAGE_EXECUTE                 0x002
-#define WSLE_PAGE_READWRITE               0x004
-#define WSLE_PAGE_EXECUTE_READ            0x003
-#define WSLE_PAGE_WRITECOPY               0x005
-#define WSLE_PAGE_EXECUTE_READWRITE       0x006
-#define WSLE_PAGE_EXECUTE_WRITECOPY       0x007
-#define WSLE_PAGE_SHARE_COUNT_MASK        0x0E0
-#define WSLE_PAGE_SHAREABLE               0x100
-
-typedef struct _MEMORY_WORKING_SET_LIST {
-  ULONG  NumberOfPages;
-  ULONG  WorkingSetList[1];
-} MEMORY_WORKING_SET_LIST, *PMEMORY_WORKING_SET_LIST;
-
-typedef struct _MEMORY_SECTION_NAME {
-  UNICODE_STRING  SectionFileName;
-} MEMORY_SECTION_NAME, *PMEMORY_SECTION_NAME;
-
-/* Zw[Lock|Unlock]VirtualMemory.LockType constants */
-#define LOCK_VM_IN_WSL                    0x01
-#define LOCK_VM_IN_RAM                    0x02
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwLockVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN OUT PVOID  *BaseAddress,
-	IN OUT PULONG  LockSize,
-	IN ULONG  LockType);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwUnlockVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN OUT PVOID  *BaseAddress,
-	IN OUT PULONG  LockSize,
-	IN ULONG  LockType);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwReadVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN PVOID  BaseAddress,
-	OUT PVOID  Buffer,
-	IN ULONG  BufferLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwWriteVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN PVOID  BaseAddress,
-	IN PVOID  Buffer,
-	IN ULONG  BufferLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwProtectVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN OUT PVOID  *BaseAddress,
-	IN OUT PULONG  ProtectSize,
-	IN ULONG  NewProtect,
-	OUT PULONG  OldProtect);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwFlushVirtualMemory(
-	IN HANDLE  ProcessHandle,
-	IN OUT PVOID  *BaseAddress,
-	IN OUT PULONG  FlushSize,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAllocateUserPhysicalPages(
-	IN HANDLE  ProcessHandle,
-	IN PULONG  NumberOfPages,
-	OUT PULONG  PageFrameNumbers);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwFreeUserPhysicalPages(
-	IN HANDLE  ProcessHandle,
-	IN OUT PULONG  NumberOfPages,
-	IN PULONG  PageFrameNumbers);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwMapUserPhysicalPages(
-	IN PVOID  BaseAddress,
-	IN PULONG  NumberOfPages,
-	IN PULONG  PageFrameNumbers);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwMapUserPhysicalPagesScatter(
-	IN PVOID  *BaseAddresses,
-	IN PULONG  NumberOfPages,
-	IN PULONG  PageFrameNumbers);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwGetWriteWatch(
-	IN HANDLE  ProcessHandle,
-	IN ULONG  Flags,
-	IN PVOID  BaseAddress,
-	IN ULONG  RegionSize,
-	OUT PULONG  Buffer,
-	IN OUT PULONG  BufferEntries,
-	OUT PULONG  Granularity);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwResetWriteWatch(
-	IN HANDLE  ProcessHandle,
-	IN PVOID  BaseAddress,
-	IN ULONG  RegionSize);
-
-
-
-
-/* Sections */
-
-typedef enum _SECTION_INFORMATION_CLASS {
-  SectionBasicInformation,
-  SectionImageInformation
-} SECTION_INFORMATION_CLASS;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtCreateSection(
-  OUT PHANDLE  SectionHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PLARGE_INTEGER  SectionSize  OPTIONAL,
-  IN ULONG  Protect,
-  IN ULONG  Attributes,
-  IN HANDLE  FileHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreateSection(
-  OUT PHANDLE  SectionHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PLARGE_INTEGER  SectionSize  OPTIONAL,
-  IN ULONG  Protect,
-  IN ULONG  Attributes,
-  IN HANDLE  FileHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQuerySection(
-	IN HANDLE  SectionHandle,
-	IN SECTION_INFORMATION_CLASS  SectionInformationClass,
-	OUT PVOID  SectionInformation,
-	IN ULONG  SectionInformationLength,
-  OUT PULONG  ResultLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwExtendSection(
-	IN HANDLE  SectionHandle,
-	IN PLARGE_INTEGER  SectionSize);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAreMappedFilesTheSame(
-	IN PVOID  Address1,
-	IN PVOID  Address2);
-
-
-
-
-/* Threads */
-
-typedef struct _USER_STACK {
-	PVOID  FixedStackBase;
-	PVOID  FixedStackLimit;
-	PVOID  ExpandableStackBase;
-	PVOID  ExpandableStackLimit;
-	PVOID  ExpandableStackBottom;
-} USER_STACK, *PUSER_STACK;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreateThread(
-	OUT PHANDLE  ThreadHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes,
-	IN HANDLE  ProcessHandle,
-	OUT PCLIENT_ID  ClientId,
-	IN PCONTEXT  ThreadContext,
-	IN PUSER_STACK  UserStack,
-	IN BOOLEAN  CreateSuspended);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtOpenThread(
-  OUT PHANDLE  ThreadHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PCLIENT_ID  ClientId);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwOpenThread(
-  OUT PHANDLE  ThreadHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PCLIENT_ID  ClientId);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwTerminateThread(
-	IN HANDLE  ThreadHandle  OPTIONAL,
-	IN NTSTATUS  ExitStatus);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtQueryInformationThread(
-  IN HANDLE  ThreadHandle,
-  IN THREADINFOCLASS  ThreadInformationClass,
-  OUT PVOID  ThreadInformation,
-  IN ULONG  ThreadInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryInformationThread(
-  IN HANDLE  ThreadHandle,
-  IN THREADINFOCLASS  ThreadInformationClass,
-  OUT PVOID  ThreadInformation,
-  IN ULONG  ThreadInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtSetInformationThread(
-  IN HANDLE  ThreadHandle,
-  IN THREADINFOCLASS  ThreadInformationClass,
-  IN PVOID  ThreadInformation,
-  IN ULONG  ThreadInformationLength);
-
-typedef struct _THREAD_BASIC_INFORMATION {
-	NTSTATUS  ExitStatus;
-	PNT_TIB  TebBaseAddress;
-	CLIENT_ID  ClientId;
-	KAFFINITY  AffinityMask;
-	KPRIORITY  Priority;
-	KPRIORITY  BasePriority;
-} THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION;
-
-typedef struct _KERNEL_USER_TIMES {
-	LARGE_INTEGER  CreateTime;
-	LARGE_INTEGER  ExitTime;
-	LARGE_INTEGER  KernelTime;
-	LARGE_INTEGER  UserTime;
-} KERNEL_USER_TIMES, *PKERNEL_USER_TIMES;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSuspendThread(
-  IN HANDLE  ThreadHandle,
-  OUT PULONG  PreviousSuspendCount  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwResumeThread(
-  IN HANDLE  ThreadHandle,
-  OUT PULONG  PreviousSuspendCount  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwGetContextThread(
-  IN HANDLE  ThreadHandle,
-  OUT PCONTEXT  Context);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetContextThread(
-	IN HANDLE  ThreadHandle,
-	IN PCONTEXT  Context);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueueApcThread(
-	IN HANDLE  ThreadHandle,
-	IN PKNORMAL_ROUTINE  ApcRoutine,
-	IN PVOID  ApcContext  OPTIONAL,
-	IN PVOID  Argument1  OPTIONAL,
-	IN PVOID  Argument2  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwTestAlert(
-  VOID);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAlertThread(
-  IN HANDLE  ThreadHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAlertResumeThread(
-  IN HANDLE  ThreadHandle,
-  OUT PULONG  PreviousSuspendCount  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwRegisterThreadTerminatePort(
-  IN HANDLE  PortHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwImpersonateThread(
-	IN HANDLE  ThreadHandle,
-	IN HANDLE  TargetThreadHandle,
-	IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwImpersonateAnonymousToken(
-  IN HANDLE  ThreadHandle);
-
-
-
-
-/* Processes */
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreateProcess(
-	OUT PHANDLE  ProcessHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes,
-	IN HANDLE  InheritFromProcessHandle,
-	IN BOOLEAN  InheritHandles,
-	IN HANDLE  SectionHandle  OPTIONAL,
-	IN HANDLE  DebugPort  OPTIONAL,
-	IN HANDLE  ExceptionPort  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreateProcess(
-	OUT PHANDLE  ProcessHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes,
-	IN HANDLE  InheritFromProcessHandle,
-	IN BOOLEAN  InheritHandles,
-	IN HANDLE  SectionHandle  OPTIONAL,
-	IN HANDLE  DebugPort  OPTIONAL,
-	IN HANDLE  ExceptionPort  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwTerminateProcess(
-	IN HANDLE  ProcessHandle  OPTIONAL,
-	IN NTSTATUS  ExitStatus);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryInformationProcess(
-  IN HANDLE  ProcessHandle,
-  IN PROCESSINFOCLASS  ProcessInformationClass,
-  OUT PVOID  ProcessInformation,
-  IN ULONG  ProcessInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtSetInformationProcess(
-  IN HANDLE  ProcessHandle,
-  IN PROCESSINFOCLASS  ProcessInformationClass,
-  IN PVOID  ProcessInformation,
-  IN ULONG  ProcessInformationLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetInformationProcess(
-  IN HANDLE  ProcessHandle,
-  IN PROCESSINFOCLASS  ProcessInformationClass,
-  IN PVOID  ProcessInformation,
-  IN ULONG  ProcessInformationLength);
-
-typedef struct _PROCESS_BASIC_INFORMATION {
-	NTSTATUS  ExitStatus;
-	PPEB  PebBaseAddress;
-	KAFFINITY  AffinityMask;
-	KPRIORITY  BasePriority;
-	ULONG  UniqueProcessId;
-	ULONG  InheritedFromUniqueProcessId;
-} PROCESS_BASIC_INFORMATION, *PPROCESS_BASIC_INFORMATION;
-
-typedef struct _PROCESS_ACCESS_TOKEN {
-  HANDLE  Token;
-  HANDLE  Thread;
-} PROCESS_ACCESS_TOKEN, *PPROCESS_ACCESS_TOKEN;
-
-/* DefaultHardErrorMode constants */
-/* also in winbase.h */
-#define SEM_FAILCRITICALERRORS            0x0001
-#define SEM_NOGPFAULTERRORBOX             0x0002
-#define SEM_NOALIGNMENTFAULTEXCEPT        0x0004
-#define SEM_NOOPENFILEERRORBOX            0x8000
-/* end winbase.h */
-typedef struct _POOLED_USAGE_AND_LIMITS {
-	ULONG  PeakPagedPoolUsage;
-	ULONG  PagedPoolUsage;
-	ULONG  PagedPoolLimit;
-	ULONG  PeakNonPagedPoolUsage;
-	ULONG  NonPagedPoolUsage;
-	ULONG  NonPagedPoolLimit;
-	ULONG  PeakPagefileUsage;
-	ULONG  PagefileUsage;
-	ULONG  PagefileLimit;
-} POOLED_USAGE_AND_LIMITS, *PPOOLED_USAGE_AND_LIMITS;
-
-typedef struct _PROCESS_WS_WATCH_INFORMATION {
-  PVOID  FaultingPc;
-  PVOID  FaultingVa;
-} PROCESS_WS_WATCH_INFORMATION, *PPROCESS_WS_WATCH_INFORMATION;
-
-/* PROCESS_PRIORITY_CLASS.PriorityClass constants */
-#define PC_IDLE                           1
-#define PC_NORMAL                         2
-#define PC_HIGH                           3
-#define PC_REALTIME                       4
-#define PC_BELOW_NORMAL                   5
-#define PC_ABOVE_NORMAL                   6
-
-typedef struct _PROCESS_PRIORITY_CLASS {
-  BOOLEAN  Foreground;
-  UCHAR  PriorityClass;
-} PROCESS_PRIORITY_CLASS, *PPROCESS_PRIORITY_CLASS;
-
-/* PROCESS_DEVICEMAP_INFORMATION.DriveType constants */
-#define DRIVE_UNKNOWN                     0
-#define DRIVE_NO_ROOT_DIR                 1
-#define DRIVE_REMOVABLE                   2
-#define DRIVE_FIXED                       3
-#define DRIVE_REMOTE                      4
-#define DRIVE_CDROM                       5
-#define DRIVE_RAMDISK                     6
-
-typedef struct _PROCESS_DEVICEMAP_INFORMATION {
-	_ANONYMOUS_UNION union {
-		struct {
-		  HANDLE  DirectoryHandle;
-		} Set;
-		struct {
-		  ULONG  DriveMap;
-		  UCHAR  DriveType[32];
-		} Query;
-	} DUMMYUNIONNAME;
-} PROCESS_DEVICEMAP_INFORMATION, *PPROCESS_DEVICEMAP_INFORMATION;
-
-typedef struct _PROCESS_SESSION_INFORMATION {
-  ULONG  SessionId;
-} PROCESS_SESSION_INFORMATION, *PPROCESS_SESSION_INFORMATION;
-
-typedef struct _RTL_USER_PROCESS_PARAMETERS {
-	ULONG  AllocationSize;
-	ULONG  Size;
-	ULONG  Flags;
-	ULONG  DebugFlags;
-	HANDLE  hConsole;
-	ULONG  ProcessGroup;
-	HANDLE  hStdInput;
-	HANDLE  hStdOutput;
-	HANDLE  hStdError;
-	UNICODE_STRING  CurrentDirectoryName;
-	HANDLE  CurrentDirectoryHandle;
-	UNICODE_STRING  DllPath;
-	UNICODE_STRING  ImagePathName;
-	UNICODE_STRING  CommandLine;
-	PWSTR  Environment;
-	ULONG  dwX;
-	ULONG  dwY;
-	ULONG  dwXSize;
-	ULONG  dwYSize;
-	ULONG  dwXCountChars;
-	ULONG  dwYCountChars;
-	ULONG  dwFillAttribute;
-	ULONG  dwFlags;
-	ULONG  wShowWindow;
-	UNICODE_STRING  WindowTitle;
-	UNICODE_STRING  DesktopInfo;
-	UNICODE_STRING  ShellInfo;
-	UNICODE_STRING  RuntimeInfo;
-} RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS;
-
-NTSTATUS
-NTAPI
-RtlCreateProcessParameters(
-	OUT PRTL_USER_PROCESS_PARAMETERS  *ProcessParameters,
-	IN PUNICODE_STRING  ImageFile,
-	IN PUNICODE_STRING  DllPath  OPTIONAL,
-	IN PUNICODE_STRING  CurrentDirectory  OPTIONAL,
-	IN PUNICODE_STRING  CommandLine  OPTIONAL,
-	IN PWSTR  Environment OPTIONAL,
-	IN PUNICODE_STRING  WindowTitle  OPTIONAL,
-	IN PUNICODE_STRING  DesktopInfo  OPTIONAL,
-	IN PUNICODE_STRING  ShellInfo  OPTIONAL,
-	IN PUNICODE_STRING  RuntimeInfo  OPTIONAL);
-
-NTSTATUS
-NTAPI
-RtlDestroyProcessParameters(
-  IN PRTL_USER_PROCESS_PARAMETERS  ProcessParameters);
-
-typedef struct _DEBUG_BUFFER {
-	HANDLE  SectionHandle;
-	PVOID  SectionBase;
-	PVOID  RemoteSectionBase;
-	ULONG  SectionBaseDelta;
-	HANDLE  EventPairHandle;
-	ULONG  Unknown[2];
-	HANDLE  RemoteThreadHandle;
-	ULONG  InfoClassMask;
-	ULONG  SizeOfInfo;
-	ULONG  AllocatedSize;
-	ULONG  SectionSize;
-	PVOID  ModuleInformation;
-	PVOID  BackTraceInformation;
-	PVOID  HeapInformation;
-	PVOID  LockInformation;
-	PVOID  Reserved[8];
-} DEBUG_BUFFER, *PDEBUG_BUFFER;
-
-PDEBUG_BUFFER
-NTAPI
-RtlCreateQueryDebugBuffer(
-	IN ULONG  Size,
-	IN BOOLEAN  EventPair);
-
-/* RtlQueryProcessDebugInformation.DebugInfoClassMask constants */
-#define PDI_MODULES                       0x01
-#define PDI_BACKTRACE                     0x02
-#define PDI_HEAPS                         0x04
-#define PDI_HEAP_TAGS                     0x08
-#define PDI_HEAP_BLOCKS                   0x10
-#define PDI_LOCKS                         0x20
-
-NTSTATUS
-NTAPI
-RtlQueryProcessDebugInformation(
-	IN ULONG  ProcessId,
-	IN ULONG  DebugInfoClassMask,
-	IN OUT PDEBUG_BUFFER  DebugBuffer);
-
-NTSTATUS
-NTAPI
-RtlDestroyQueryDebugBuffer(
-  IN PDEBUG_BUFFER  DebugBuffer);
-
-/* DEBUG_MODULE_INFORMATION.Flags constants */
-#define LDRP_STATIC_LINK                  0x00000002
-#define LDRP_IMAGE_DLL                    0x00000004
-#define LDRP_LOAD_IN_PROGRESS             0x00001000
-#define LDRP_UNLOAD_IN_PROGRESS           0x00002000
-#define LDRP_ENTRY_PROCESSED              0x00004000
-#define LDRP_ENTRY_INSERTED               0x00008000
-#define LDRP_CURRENT_LOAD                 0x00010000
-#define LDRP_FAILED_BUILTIN_LOAD          0x00020000
-#define LDRP_DONT_CALL_FOR_THREADS        0x00040000
-#define LDRP_PROCESS_ATTACH_CALLED        0x00080000
-#define LDRP_DEBUG_SYMBOLS_LOADED         0x00100000
-#define LDRP_IMAGE_NOT_AT_BASE            0x00200000
-#define LDRP_WX86_IGNORE_MACHINETYPE      0x00400000
-
-typedef struct _DEBUG_MODULE_INFORMATION {
-	ULONG  Reserved[2];
-	ULONG  Base;
-	ULONG  Size;
-	ULONG  Flags;
-	USHORT  Index;
-	USHORT  Unknown;
-	USHORT  LoadCount;
-	USHORT  ModuleNameOffset;
-	CHAR  ImageName[256];
-} DEBUG_MODULE_INFORMATION, *PDEBUG_MODULE_INFORMATION;
-
-typedef struct _DEBUG_HEAP_INFORMATION {
-	ULONG  Base;
-	ULONG  Flags;
-	USHORT  Granularity;
-	USHORT  Unknown;
-	ULONG  Allocated;
-	ULONG  Committed;
-	ULONG  TagCount;
-	ULONG  BlockCount;
-	ULONG  Reserved[7];
-	PVOID  Tags;
-	PVOID  Blocks;
-} DEBUG_HEAP_INFORMATION, *PDEBUG_HEAP_INFORMATION;
-
-typedef struct _DEBUG_LOCK_INFORMATION {
-	PVOID  Address;
-	USHORT  Type;
-	USHORT  CreatorBackTraceIndex;
-	ULONG  OwnerThreadId;
-	ULONG  ActiveCount;
-	ULONG  ContentionCount;
-	ULONG  EntryCount;
-	ULONG  RecursionCount;
-	ULONG  NumberOfSharedWaiters;
-	ULONG  NumberOfExclusiveWaiters;
-} DEBUG_LOCK_INFORMATION, *PDEBUG_LOCK_INFORMATION;
-
-
-
-/* Jobs */
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreateJobObject(
-	OUT PHANDLE  JobHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwOpenJobObject(
-	OUT PHANDLE  JobHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwTerminateJobObject(
-	IN HANDLE  JobHandle,
-	IN NTSTATUS  ExitStatus);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAssignProcessToJobObject(
-	IN HANDLE  JobHandle,
-	IN HANDLE  ProcessHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryInformationJobObject(
-	IN HANDLE  JobHandle,
-	IN JOBOBJECTINFOCLASS  JobInformationClass,
-	OUT PVOID  JobInformation,
-	IN ULONG  JobInformationLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetInformationJobObject(
-	IN HANDLE  JobHandle,
-	IN JOBOBJECTINFOCLASS  JobInformationClass,
-	IN PVOID  JobInformation,
-	IN ULONG  JobInformationLength);
-
-
-/* Tokens */
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreateToken(
-OUT PHANDLE TokenHandle,
-IN ACCESS_MASK DesiredAccess,
-IN POBJECT_ATTRIBUTES ObjectAttributes,
-IN TOKEN_TYPE Type,
-IN PLUID AuthenticationId,
-IN PLARGE_INTEGER ExpirationTime,
-IN PTOKEN_USER User,
-IN PTOKEN_GROUPS Groups,
-IN PTOKEN_PRIVILEGES Privileges,
-IN PTOKEN_OWNER Owner,
-IN PTOKEN_PRIMARY_GROUP PrimaryGroup,
-IN PTOKEN_DEFAULT_DACL DefaultDacl,
-IN PTOKEN_SOURCE Source
-);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtOpenProcessToken(
-  IN HANDLE  ProcessHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  OUT PHANDLE  TokenHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwOpenProcessToken(
-  IN HANDLE  ProcessHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  OUT PHANDLE  TokenHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtOpenThreadToken(
-  IN HANDLE  ThreadHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN BOOLEAN  OpenAsSelf,
-  OUT PHANDLE  TokenHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwOpenThreadToken(
-  IN HANDLE  ThreadHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN BOOLEAN  OpenAsSelf,
-  OUT PHANDLE  TokenHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtDuplicateToken(
-  IN HANDLE  ExistingTokenHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN BOOLEAN  EffectiveOnly,
-  IN TOKEN_TYPE  TokenType,
-  OUT PHANDLE  NewTokenHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwDuplicateToken(
-  IN HANDLE  ExistingTokenHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN BOOLEAN  EffectiveOnly,
-  IN TOKEN_TYPE  TokenType,
-  OUT PHANDLE  NewTokenHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwFilterToken(
-	IN HANDLE  ExistingTokenHandle,
-	IN ULONG  Flags,
-	IN PTOKEN_GROUPS  SidsToDisable,
-	IN PTOKEN_PRIVILEGES  PrivilegesToDelete,
-	IN PTOKEN_GROUPS  SidsToRestricted,
-	OUT PHANDLE  NewTokenHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtAdjustPrivilegesToken(
-  IN HANDLE  TokenHandle,
-  IN BOOLEAN  DisableAllPrivileges,
-  IN PTOKEN_PRIVILEGES  NewState,
-  IN ULONG  BufferLength,
-  OUT PTOKEN_PRIVILEGES  PreviousState  OPTIONAL,
-  OUT PULONG  ReturnLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAdjustPrivilegesToken(
-  IN HANDLE  TokenHandle,
-  IN BOOLEAN  DisableAllPrivileges,
-  IN PTOKEN_PRIVILEGES  NewState,
-  IN ULONG  BufferLength,
-  OUT PTOKEN_PRIVILEGES  PreviousState  OPTIONAL,
-  OUT PULONG  ReturnLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAdjustGroupsToken(
-	IN HANDLE  TokenHandle,
-	IN BOOLEAN  ResetToDefault,
-	IN PTOKEN_GROUPS  NewState,
-	IN ULONG  BufferLength,
-	OUT PTOKEN_GROUPS  PreviousState  OPTIONAL,
-	OUT PULONG  ReturnLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtQueryInformationToken(
-  IN HANDLE  TokenHandle,
-  IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
-  OUT PVOID  TokenInformation,
-  IN ULONG  TokenInformationLength,
-  OUT PULONG  ReturnLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryInformationToken(
-  IN HANDLE  TokenHandle,
-  IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
-  OUT PVOID  TokenInformation,
-  IN ULONG  TokenInformationLength,
-  OUT PULONG  ReturnLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetInformationToken(
-	IN HANDLE  TokenHandle,
-	IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
-	IN PVOID  TokenInformation,
-  IN ULONG  TokenInformationLength);
-
-
-
-
-/* Time */
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQuerySystemTime(
-  OUT PLARGE_INTEGER  CurrentTime);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetSystemTime(
-  IN PLARGE_INTEGER  NewTime,
-  OUT PLARGE_INTEGER  OldTime  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryPerformanceCounter(
-  OUT PLARGE_INTEGER  PerformanceCount,
-  OUT PLARGE_INTEGER  PerformanceFrequency  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryPerformanceCounter(
-  OUT PLARGE_INTEGER  PerformanceCount,
-  OUT PLARGE_INTEGER  PerformanceFrequency  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryTimerResolution(
-	OUT PULONG  CoarsestResolution,
-	OUT PULONG  FinestResolution,
-	OUT PULONG  ActualResolution);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwDelayExecution(
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Interval);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwYieldExecution(
-  VOID);
-
-NTOSAPI
-ULONG
-NTAPI
-ZwGetTickCount(
-  VOID);
-
-
-
-
-/* Execution profiling */
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreateProfile(
-	OUT PHANDLE  ProfileHandle,
-	IN HANDLE  ProcessHandle,
-	IN PVOID  Base,
-	IN ULONG  Size,
-	IN ULONG  BucketShift,
-	IN PULONG  Buffer,
-	IN ULONG  BufferLength,
-	IN KPROFILE_SOURCE  Source,
-	IN ULONG  ProcessorMask);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetIntervalProfile(
-  IN ULONG  Interval,
-  IN KPROFILE_SOURCE  Source);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryIntervalProfile(
-	IN KPROFILE_SOURCE  Source,
-	OUT PULONG  Interval);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwStartProfile(
-  IN HANDLE  ProfileHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwStopProfile(
-  IN HANDLE  ProfileHandle);
-
-
-
-
-/* Local Procedure Call (LPC) */
-
-typedef struct _LPC_MESSAGE {
-	USHORT  DataSize;
-	USHORT  MessageSize;
-	USHORT  MessageType;
-	USHORT  VirtualRangesOffset;
-	CLIENT_ID  ClientId;
-	ULONG  MessageId;
-	ULONG  SectionSize;
-	UCHAR  Data[ANYSIZE_ARRAY];
-} LPC_MESSAGE, *PLPC_MESSAGE;
-
-typedef enum _LPC_TYPE {
-	LPC_NEW_MESSAGE,
-	LPC_REQUEST,
-	LPC_REPLY,
-	LPC_DATAGRAM,
-	LPC_LOST_REPLY,
-	LPC_PORT_CLOSED,
-	LPC_CLIENT_DIED,
-	LPC_EXCEPTION,
-	LPC_DEBUG_EVENT,
-	LPC_ERROR_EVENT,
-	LPC_CONNECTION_REQUEST,
-	LPC_CONNECTION_REFUSED,
-  LPC_MAXIMUM
-} LPC_TYPE;
-
-typedef struct _LPC_SECTION_WRITE {
-	ULONG  Length;
-	HANDLE  SectionHandle;
-	ULONG  SectionOffset;
-	ULONG  ViewSize;
-	PVOID  ViewBase;
-	PVOID  TargetViewBase;
-} LPC_SECTION_WRITE, *PLPC_SECTION_WRITE;
-
-typedef struct _LPC_SECTION_READ {
-	ULONG  Length;
-	ULONG  ViewSize;
-	PVOID  ViewBase;
-} LPC_SECTION_READ, *PLPC_SECTION_READ;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreatePort(
-	OUT PHANDLE  PortHandle,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes,
-	IN ULONG  MaxDataSize,
-	IN ULONG  MaxMessageSize,
-	IN ULONG  Reserved);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreateWaitablePort(
-	OUT PHANDLE  PortHandle,
-	IN POBJECT_ATTRIBUTES  ObjectAttributes,
-	IN ULONG  MaxDataSize,
-	IN ULONG  MaxMessageSize,
-	IN ULONG  Reserved);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtConnectPort(
-  OUT PHANDLE  PortHandle,
-  IN PUNICODE_STRING  PortName,
-  IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos,
-  IN OUT PLPC_SECTION_WRITE  WriteSection  OPTIONAL,
-  IN OUT PLPC_SECTION_READ  ReadSection  OPTIONAL,
-  OUT PULONG  MaxMessageSize  OPTIONAL,
-  IN OUT PVOID  ConnectData  OPTIONAL,
-  IN OUT PULONG  ConnectDataLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwConnectPort(
-  OUT PHANDLE  PortHandle,
-  IN PUNICODE_STRING  PortName,
-  IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos,
-  IN OUT PLPC_SECTION_WRITE  WriteSection  OPTIONAL,
-  IN OUT PLPC_SECTION_READ  ReadSection  OPTIONAL,
-  OUT PULONG  MaxMessageSize  OPTIONAL,
-  IN OUT PVOID  ConnectData  OPTIONAL,
-  IN OUT PULONG  ConnectDataLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwConnectPort(
-	OUT PHANDLE  PortHandle,
-	IN PUNICODE_STRING  PortName,
-	IN PSECURITY_QUALITY_OF_SERVICE  SecurityQos,
-	IN OUT PLPC_SECTION_WRITE  WriteSection  OPTIONAL,
-	IN OUT PLPC_SECTION_READ  ReadSection  OPTIONAL,
-	OUT PULONG  MaxMessageSize  OPTIONAL,
-	IN OUT PVOID  ConnectData  OPTIONAL,
-	IN OUT PULONG  ConnectDataLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwListenPort(
-  IN HANDLE  PortHandle,
-  OUT PLPC_MESSAGE  Message);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAcceptConnectPort(
-	OUT PHANDLE  PortHandle,
-	IN ULONG  PortIdentifier,
-	IN PLPC_MESSAGE  Message,
-	IN BOOLEAN  Accept,
-	IN OUT PLPC_SECTION_WRITE  WriteSection  OPTIONAL,
-	IN OUT PLPC_SECTION_READ  ReadSection  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCompleteConnectPort(
-  IN HANDLE  PortHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtRequestPort(
-  IN HANDLE  PortHandle,
-  IN PLPC_MESSAGE  RequestMessage);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtRequestWaitReplyPort(
-  IN HANDLE  PortHandle,
-  IN PLPC_MESSAGE  RequestMessage,
-  OUT PLPC_MESSAGE  ReplyMessage);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwRequestWaitReplyPort(
-  IN HANDLE  PortHandle,
-  IN PLPC_MESSAGE  RequestMessage,
-  OUT PLPC_MESSAGE  ReplyMessage);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwReplyPort(
-	IN HANDLE  PortHandle,
-	IN PLPC_MESSAGE  ReplyMessage);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwReplyWaitReplyPort(
-	IN HANDLE  PortHandle,
-	IN OUT PLPC_MESSAGE  ReplyMessage);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwReplyWaitReceivePort(
-	IN HANDLE  PortHandle,
-	OUT PULONG  PortIdentifier  OPTIONAL,
-	IN PLPC_MESSAGE  ReplyMessage  OPTIONAL,
-	OUT PLPC_MESSAGE  Message);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwReplyWaitReceivePortEx(
-	IN HANDLE  PortHandle,
-	OUT PULONG  PortIdentifier  OPTIONAL,
-	IN PLPC_MESSAGE  ReplyMessage  OPTIONAL,
-	OUT PLPC_MESSAGE  Message,
-	IN PLARGE_INTEGER  Timeout);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwReadRequestData(
-	IN HANDLE  PortHandle,
-	IN PLPC_MESSAGE  Message,
-	IN ULONG  Index,
-	OUT PVOID  Buffer,
-	IN ULONG  BufferLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwWriteRequestData(
-	IN HANDLE  PortHandle,
-	IN PLPC_MESSAGE  Message,
-	IN ULONG  Index,
-	IN PVOID  Buffer,
-	IN ULONG  BufferLength,
-	OUT PULONG  ReturnLength  OPTIONAL);
-
-typedef enum _PORT_INFORMATION_CLASS {
-  PortBasicInformation
-} PORT_INFORMATION_CLASS;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryInformationPort(
-	IN HANDLE  PortHandle,
-	IN PORT_INFORMATION_CLASS  PortInformationClass,
-	OUT PVOID  PortInformation,
-	IN ULONG  PortInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwImpersonateClientOfPort(
-  IN HANDLE  PortHandle,
-  IN PLPC_MESSAGE  Message);
-
-
-
-
-/* Files */
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtDeleteFile(
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwDeleteFile(
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwFlushBuffersFile(
-	IN HANDLE  FileHandle,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCancelIoFile(
-	IN HANDLE  FileHandle,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwReadFileScatter(
-	IN HANDLE  FileHandle,
-	IN HANDLE  Event OPTIONAL,
-	IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-	IN PVOID  ApcContext  OPTIONAL,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock,
-	IN PFILE_SEGMENT_ELEMENT  Buffer,
-	IN ULONG  Length,
-	IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-	IN PULONG  Key  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwWriteFileGather(
-	IN HANDLE  FileHandle,
-	IN HANDLE  Event  OPTIONAL,
-	IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-	IN PVOID  ApcContext  OPTIONAL,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock,
-	IN PFILE_SEGMENT_ELEMENT  Buffer,
-	IN ULONG  Length,
-	IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-	IN PULONG  Key  OPTIONAL);
-
-
-
-
-/* Registry keys */
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSaveKey(
-	IN HANDLE  KeyHandle,
-	IN HANDLE  FileHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSaveMergedKeys(
-	IN HANDLE  KeyHandle1,
-	IN HANDLE  KeyHandle2,
-	IN HANDLE  FileHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwRestoreKey(
-  IN HANDLE  KeyHandle,
-  IN HANDLE  FileHandle,
-  IN ULONG  Flags);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwLoadKey(
-  IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
-  IN POBJECT_ATTRIBUTES  FileObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwLoadKey2(
-	IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
-	IN POBJECT_ATTRIBUTES  FileObjectAttributes,
-	IN ULONG  Flags);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwUnloadKey(
-  IN POBJECT_ATTRIBUTES  KeyObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryOpenSubKeys(
-	IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
-	OUT PULONG  NumberOfKeys);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwReplaceKey(
-	IN POBJECT_ATTRIBUTES  NewFileObjectAttributes,
-	IN HANDLE  KeyHandle,
-	IN POBJECT_ATTRIBUTES  OldFileObjectAttributes);
-
-typedef enum _KEY_SET_INFORMATION_CLASS {
-  KeyLastWriteTimeInformation
-} KEY_SET_INFORMATION_CLASS;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetInformationKey(
-	IN HANDLE  KeyHandle,
-	IN KEY_SET_INFORMATION_CLASS  KeyInformationClass,
-	IN PVOID  KeyInformation,
-	IN ULONG  KeyInformationLength);
-
-typedef struct _KEY_LAST_WRITE_TIME_INFORMATION {
-  LARGE_INTEGER LastWriteTime;
-} KEY_LAST_WRITE_TIME_INFORMATION, *PKEY_LAST_WRITE_TIME_INFORMATION;
-
-typedef struct _KEY_NAME_INFORMATION {
-	ULONG NameLength;
-	WCHAR Name[1];
-} KEY_NAME_INFORMATION, *PKEY_NAME_INFORMATION;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwNotifyChangeKey(
-	IN HANDLE  KeyHandle,
-	IN HANDLE  EventHandle  OPTIONAL,
-	IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-	IN PVOID  ApcContext  OPTIONAL,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock,
-	IN ULONG  NotifyFilter,
-	IN BOOLEAN  WatchSubtree,
-	IN PVOID  Buffer,
-	IN ULONG  BufferLength,
-	IN BOOLEAN  Asynchronous);
-
-/* ZwNotifyChangeMultipleKeys.Flags constants */
-#define REG_MONITOR_SINGLE_KEY            0x00
-#define REG_MONITOR_SECOND_KEY            0x01
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwNotifyChangeMultipleKeys(
-	IN HANDLE  KeyHandle,
-	IN ULONG  Flags,
-	IN POBJECT_ATTRIBUTES  KeyObjectAttributes,
-	IN HANDLE  EventHandle  OPTIONAL,
-	IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-	IN PVOID  ApcContext  OPTIONAL,
-	OUT PIO_STATUS_BLOCK  IoStatusBlock,
-	IN ULONG  NotifyFilter,
-	IN BOOLEAN  WatchSubtree,
-	IN PVOID  Buffer,
-	IN ULONG  BufferLength,
-	IN BOOLEAN  Asynchronous);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryMultipleValueKey(
-	IN HANDLE  KeyHandle,
-	IN OUT  PKEY_VALUE_ENTRY  ValueList,
-	IN ULONG  NumberOfValues,
-	OUT PVOID  Buffer,
-	IN OUT PULONG  Length,
-	OUT PULONG  ReturnLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwInitializeRegistry(
-  IN BOOLEAN  Setup);
-
-
-
-
-/* Security and auditing */
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwPrivilegeCheck(
-	IN HANDLE  TokenHandle,
-	IN PPRIVILEGE_SET  RequiredPrivileges,
-	OUT PBOOLEAN  Result);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwPrivilegeObjectAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN HANDLE  TokenHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN PPRIVILEGE_SET  Privileges,
-	IN BOOLEAN  AccessGranted);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwPrivilegeObjectAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN HANDLE  TokenHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN PPRIVILEGE_SET  Privileges,
-	IN BOOLEAN  AccessGranted);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAccessCheck(
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN HANDLE  TokenHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN PPRIVILEGE_SET  PrivilegeSet,
-	IN PULONG  PrivilegeSetLength,
-	OUT PACCESS_MASK  GrantedAccess,
-	OUT PBOOLEAN  AccessStatus);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAccessCheckAndAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN PUNICODE_STRING  ObjectTypeName,
-	IN PUNICODE_STRING  ObjectName,
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN ACCESS_MASK  DesiredAccess,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN BOOLEAN  ObjectCreation,
-	OUT PACCESS_MASK  GrantedAccess,
-	OUT PBOOLEAN  AccessStatus,
-	OUT PBOOLEAN  GenerateOnClose);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAccessCheckByType(
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN PSID  PrincipalSelfSid,
-	IN HANDLE  TokenHandle,
-	IN ULONG  DesiredAccess,
-	IN POBJECT_TYPE_LIST  ObjectTypeList,
-	IN ULONG  ObjectTypeListLength,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN PPRIVILEGE_SET  PrivilegeSet,
-	IN PULONG  PrivilegeSetLength,
-	OUT PACCESS_MASK  GrantedAccess,
-	OUT PULONG  AccessStatus);
-
-typedef enum _AUDIT_EVENT_TYPE {
-	AuditEventObjectAccess,
-	AuditEventDirectoryServiceAccess
-} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAccessCheckByTypeAndAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN PUNICODE_STRING  ObjectTypeName,
-	IN PUNICODE_STRING  ObjectName,
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN PSID  PrincipalSelfSid,
-	IN ACCESS_MASK  DesiredAccess,
-	IN AUDIT_EVENT_TYPE  AuditType,
-	IN ULONG  Flags,
-	IN POBJECT_TYPE_LIST  ObjectTypeList,
-	IN ULONG  ObjectTypeListLength,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN BOOLEAN  ObjectCreation,
-	OUT PACCESS_MASK  GrantedAccess,
-	OUT PULONG  AccessStatus,
-	OUT PBOOLEAN  GenerateOnClose);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAccessCheckByTypeResultList(
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN PSID  PrincipalSelfSid,
-	IN HANDLE  TokenHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN POBJECT_TYPE_LIST  ObjectTypeList,
-	IN ULONG  ObjectTypeListLength,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN PPRIVILEGE_SET  PrivilegeSet,
-	IN PULONG  PrivilegeSetLength,
-	OUT PACCESS_MASK  GrantedAccessList,
-	OUT PULONG  AccessStatusList);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAccessCheckByTypeResultListAndAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN PUNICODE_STRING  ObjectTypeName,
-	IN PUNICODE_STRING  ObjectName,
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN PSID  PrincipalSelfSid,
-	IN ACCESS_MASK  DesiredAccess,
-	IN AUDIT_EVENT_TYPE  AuditType,
-	IN ULONG  Flags,
-	IN POBJECT_TYPE_LIST  ObjectTypeList,
-	IN ULONG  ObjectTypeListLength,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN BOOLEAN  ObjectCreation,
-	OUT PACCESS_MASK  GrantedAccessList,
-	OUT PULONG  AccessStatusList,
-	OUT PULONG  GenerateOnClose);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwAccessCheckByTypeResultListAndAuditAlarmByHandle(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  HandleId,
-	IN HANDLE  TokenHandle,
-	IN PUNICODE_STRING  ObjectTypeName,
-	IN PUNICODE_STRING  ObjectName,
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN PSID  PrincipalSelfSid,
-	IN ACCESS_MASK  DesiredAccess,
-	IN AUDIT_EVENT_TYPE  AuditType,
-	IN ULONG  Flags,
-	IN POBJECT_TYPE_LIST  ObjectTypeList,
-	IN ULONG  ObjectTypeListLength,
-	IN PGENERIC_MAPPING  GenericMapping,
-	IN BOOLEAN  ObjectCreation,
-	OUT PACCESS_MASK  GrantedAccessList,
-	OUT PULONG  AccessStatusList,
-	OUT PULONG  GenerateOnClose);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwOpenObjectAuditAlarm(
-	IN PUNICODE_STRING  SubsystemName,
-	IN PVOID  *HandleId,
-	IN PUNICODE_STRING  ObjectTypeName,
-	IN PUNICODE_STRING  ObjectName,
-	IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-	IN HANDLE  TokenHandle,
-	IN ACCESS_MASK  DesiredAccess,
-	IN ACCESS_MASK  GrantedAccess,
-	IN PPRIVILEGE_SET  Privileges  OPTIONAL,
-	IN BOOLEAN  ObjectCreation,
-	IN BOOLEAN  AccessGranted,
-	OUT PBOOLEAN  GenerateOnClose);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCloseObjectAuditAlarm(
-  IN PUNICODE_STRING  SubsystemName,
-  IN PVOID  HandleId,
-  IN BOOLEAN  GenerateOnClose);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwDeleteObjectAuditAlarm(
-  IN PUNICODE_STRING  SubsystemName,
-  IN PVOID  HandleId,
-  IN BOOLEAN  GenerateOnClose);
-
-
-
-
-/* Plug and play and power management */
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwRequestWakeupLatency(
-  IN LATENCY_TIME  Latency);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwRequestDeviceWakeup(
-  IN HANDLE  DeviceHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCancelDeviceWakeupRequest(
-  IN HANDLE  DeviceHandle);
-
-NTOSAPI
-BOOLEAN
-NTAPI
-ZwIsSystemResumeAutomatic(
-  VOID);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetThreadExecutionState(
-	IN EXECUTION_STATE  ExecutionState,
-	OUT PEXECUTION_STATE  PreviousExecutionState);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwGetDevicePowerState(
-  IN HANDLE  DeviceHandle,
-  OUT PDEVICE_POWER_STATE  DevicePowerState);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetSystemPowerState(
-	IN POWER_ACTION  SystemAction,
-	IN SYSTEM_POWER_STATE  MinSystemState,
-	IN ULONG  Flags);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwInitiatePowerAction(
-	IN POWER_ACTION  SystemAction,
-	IN SYSTEM_POWER_STATE  MinSystemState,
-	IN ULONG  Flags,
-	IN BOOLEAN  Asynchronous);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwPowerInformation(
-	IN POWER_INFORMATION_LEVEL  PowerInformationLevel,
-	IN PVOID  InputBuffer  OPTIONAL,
-	IN ULONG  InputBufferLength,
-	OUT PVOID  OutputBuffer  OPTIONAL,
-	IN ULONG  OutputBufferLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwPlugPlayControl(
-  IN ULONG  ControlCode,
-  IN OUT PVOID  Buffer,
-  IN ULONG  BufferLength);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwGetPlugPlayEvent(
-	IN ULONG  Reserved1,
-	IN ULONG  Reserved2,
-	OUT PVOID  Buffer,
-	IN ULONG  BufferLength);
-
-
-
-
-/* Miscellany */
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwRaiseException(
-  IN PEXCEPTION_RECORD  ExceptionRecord,
-  IN PCONTEXT  Context,
-  IN BOOLEAN  SearchFrames);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwContinue(
-  IN PCONTEXT  Context,
-  IN BOOLEAN  TestAlert);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwW32Call(
-	IN ULONG  RoutineIndex,
-	IN PVOID  Argument,
-	IN ULONG  ArgumentLength,
-	OUT PVOID  *Result  OPTIONAL,
-	OUT PULONG  ResultLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetLowWaitHighThread(
-  VOID);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetHighWaitLowThread(
-  VOID);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwLoadDriver(
-  IN PUNICODE_STRING  DriverServiceName);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwUnloadDriver(
-  IN PUNICODE_STRING  DriverServiceName);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwFlushInstructionCache(
-	IN HANDLE  ProcessHandle,
-	IN PVOID  BaseAddress  OPTIONAL,
-	IN ULONG  FlushSize);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwFlushWriteBuffer(
-  VOID);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryDefaultLocale(
-	IN BOOLEAN  ThreadOrSystem,
-	OUT PLCID  Locale);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetDefaultLocale(
-  IN BOOLEAN  ThreadOrSystem,
-  IN LCID  Locale);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryDefaultUILanguage(
-  OUT PLANGID  LanguageId);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetDefaultUILanguage(
-  IN LANGID  LanguageId);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwQueryInstallUILanguage(
-  OUT PLANGID  LanguageId);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtAllocateLocallyUniqueId(
-  OUT PLUID  Luid);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtAllocateUuids(
-  OUT PLARGE_INTEGER  UuidLastTimeAllocated,
-  OUT PULONG  UuidDeltaTime,
-  OUT PULONG  UuidSequenceNumber,
-  OUT PUCHAR  UuidSeed);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetUuidSeed(
-  IN PUCHAR  UuidSeed);
-
-typedef enum _HARDERROR_RESPONSE_OPTION {
-	OptionAbortRetryIgnore,
-	OptionOk,
-	OptionOkCancel,
-	OptionRetryCancel,
-	OptionYesNo,
-	OptionYesNoCancel,
-	OptionShutdownSystem
-} HARDERROR_RESPONSE_OPTION, *PHARDERROR_RESPONSE_OPTION;
-
-typedef enum _HARDERROR_RESPONSE {
-	ResponseReturnToCaller,
-	ResponseNotHandled,
-	ResponseAbort,
-	ResponseCancel,
-	ResponseIgnore,
-	ResponseNo,
-	ResponseOk,
-	ResponseRetry,
-	ResponseYes
-} HARDERROR_RESPONSE, *PHARDERROR_RESPONSE;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwRaiseHardError(
-	IN NTSTATUS  Status,
-	IN ULONG  NumberOfArguments,
-	IN ULONG  StringArgumentsMask,
-	IN PULONG  Arguments,
-	IN HARDERROR_RESPONSE_OPTION  ResponseOption,
-	OUT PHARDERROR_RESPONSE  Response);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetDefaultHardErrorPort(
-  IN HANDLE  PortHandle);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwDisplayString(
-  IN PUNICODE_STRING  String);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwCreatePagingFile(
-  IN PUNICODE_STRING  FileName,
-  IN PULARGE_INTEGER  InitialSize,
-  IN PULARGE_INTEGER  MaximumSize,
-  IN ULONG  Reserved);
-
-typedef USHORT RTL_ATOM, *PRTL_ATOM;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtAddAtom(
-  IN PWSTR  AtomName,
-  IN ULONG  AtomNameLength,
-  OUT PRTL_ATOM  Atom);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtFindAtom(
-  IN PWSTR  AtomName,
-  IN ULONG  AtomNameLength,
-  OUT PRTL_ATOM  Atom);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtDeleteAtom(
-  IN RTL_ATOM  Atom);
-
-typedef enum _ATOM_INFORMATION_CLASS {
-	AtomBasicInformation,
-	AtomListInformation
-} ATOM_INFORMATION_CLASS;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtQueryInformationAtom(
-  IN RTL_ATOM  Atom,
-  IN ATOM_INFORMATION_CLASS  AtomInformationClass,
-  OUT PVOID  AtomInformation,
-  IN ULONG  AtomInformationLength,
-  OUT PULONG  ReturnLength  OPTIONAL);
-
-typedef struct _ATOM_BASIC_INFORMATION {
-	USHORT  ReferenceCount;
-	USHORT  Pinned;
-	USHORT  NameLength;
-	WCHAR  Name[1];
-} ATOM_BASIC_INFORMATION, *PATOM_BASIC_INFORMATION;
-
-typedef struct _ATOM_LIST_INFORMATION {
-  ULONG  NumberOfAtoms;
-  ATOM  Atoms[1];
-} ATOM_LIST_INFORMATION, *PATOM_LIST_INFORMATION;
-
-NTOSAPI
-NTSTATUS
-NTAPI
-ZwSetLdtEntries(
-	IN ULONG  Selector1,
-	IN LDT_ENTRY  LdtEntry1,
-	IN ULONG  Selector2,
-	IN LDT_ENTRY  LdtEntry2);
-
-NTOSAPI
-NTSTATUS
-NTAPI
-NtVdmControl(
-  IN ULONG  ControlCode,
-  IN PVOID  ControlData);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTAPI_H */
diff --git a/winsup/w32api/include/ddk/ntdd8042.h b/winsup/w32api/include/ddk/ntdd8042.h
deleted file mode 100644
index 7696c8e27..000000000
--- a/winsup/w32api/include/ddk/ntdd8042.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * ntdd8042.h
- *
- * i8042 IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDD8042_H
-#define __NTDD8042_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "ntddkbd.h"
-#include "ntddmou.h"
-
-
-#define IOCTL_INTERNAL_I8042_CONTROLLER_WRITE_BUFFER \
-  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0FF2, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_I8042_HOOK_KEYBOARD \
-  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0FF0, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_I8042_KEYBOARD_START_INFORMATION \
-  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0FF3, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_I8042_KEYBOARD_WRITE_BUFFER \
-  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0FF1, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_I8042_HOOK_MOUSE \
-  CTL_CODE(FILE_DEVICE_MOUSE, 0x0FF0, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_I8042_MOUSE_START_INFORMATION \
-  CTL_CODE(FILE_DEVICE_MOUSE, 0x0FF3, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_I8042_MOUSE_WRITE_BUFFER \
-  CTL_CODE(FILE_DEVICE_MOUSE, 0x0FF1, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define I8042_POWER_SYS_BUTTON            0x0001
-#define I8042_SLEEP_SYS_BUTTON            0x0002
-#define I8042_WAKE_SYS_BUTTON             0x0004
-#define I8042_SYS_BUTTONS                 (I8042_POWER_SYS_BUTTON | \
-                                           I8042_SLEEP_SYS_BUTTON | \
-                                           I8042_WAKE_SYS_BUTTON)
-
-typedef enum _TRANSMIT_STATE {
-  Idle = 0,
-  SendingBytes
-} TRANSMIT_STATE;
-
-typedef struct _OUTPUT_PACKET {
-  PUCHAR  Bytes;
-  ULONG  CurrentByte;
-  ULONG  ByteCount;
-  TRANSMIT_STATE  State;
-} OUTPUT_PACKET, *POUTPUT_PACKET;
-
-typedef enum _KEYBOARD_SCAN_STATE {
-  Normal,
-  GotE0,
-  GotE1
-} KEYBOARD_SCAN_STATE, *PKEYBOARD_SCAN_STATE;
-
-typedef enum _MOUSE_STATE {
-  MouseIdle,
-  XMovement,
-  YMovement,
-  ZMovement,
-  MouseExpectingACK,
-  MouseResetting
-} MOUSE_STATE, *PMOUSE_STATE;
-
-typedef enum _MOUSE_RESET_SUBSTATE {
-	ExpectingReset,
-	ExpectingResetId,
-	ExpectingGetDeviceIdACK,
-	ExpectingGetDeviceIdValue,
-	ExpectingSetResolutionDefaultACK,
-	ExpectingSetResolutionDefaultValueACK,
-	ExpectingSetResolutionACK,
-	ExpectingSetResolutionValueACK,
-	ExpectingSetScaling1to1ACK,
-	ExpectingSetScaling1to1ACK2,
-	ExpectingSetScaling1to1ACK3,
-	ExpectingReadMouseStatusACK,
-	ExpectingReadMouseStatusByte1,
-	ExpectingReadMouseStatusByte2,
-	ExpectingReadMouseStatusByte3,
-	StartPnPIdDetection,
-	ExpectingLoopSetSamplingRateACK,
-	ExpectingLoopSetSamplingRateValueACK,
-	ExpectingPnpIdByte1,
-	ExpectingPnpIdByte2,
-	ExpectingPnpIdByte3,
-	ExpectingPnpIdByte4,
-	ExpectingPnpIdByte5,
-	ExpectingPnpIdByte6,
-	ExpectingPnpIdByte7,
-	EnableWheel,
-	Enable5Buttons,
-	ExpectingGetDeviceId2ACK,
-	ExpectingGetDeviceId2Value,
-	ExpectingSetSamplingRateACK,
-	ExpectingSetSamplingRateValueACK,
-	ExpectingEnableACK,
-	ExpectingFinalResolutionACK,
-	ExpectingFinalResolutionValueACK,
-	ExpectingGetDeviceIdDetectACK,
-	ExpectingGetDeviceIdDetectValue,
-	CustomHookStateMinimum = 100,
-	CustomHookStateMaximum = 999,
-	I8042ReservedMinimum = 1000
-} MOUSE_RESET_SUBSTATE, *PMOUSE_RESET_SUBSTATE;
-
-typedef struct _INTERNAL_I8042_START_INFORMATION {
-  ULONG  Size;
-  PKINTERRUPT  InterruptObject;
-  ULONG  Reserved[8];
-} INTERNAL_I8042_START_INFORMATION, *PINTERNAL_I8042_START_INFORMATION;
-
-typedef VOID DDKAPI
-(*PI8042_ISR_WRITE_PORT)(
-  IN PVOID  Context,
-  IN UCHAR  Value);
-
-typedef VOID DDKAPI
-(*PI8042_QUEUE_PACKET)(
-  IN PVOID  Context);
-
-typedef NTSTATUS DDKAPI
-(*PI8042_SYNCH_READ_PORT) (
-  IN PVOID  Context,
-  OUT PUCHAR  Value,
-  IN BOOLEAN  WaitForACK);
-
-typedef NTSTATUS DDKAPI
-(*PI8042_SYNCH_WRITE_PORT)(
-  IN PVOID  Context,
-  IN UCHAR  Value,
-  IN BOOLEAN  WaitForACK);
-
-
-typedef NTSTATUS DDKAPI
-(*PI8042_KEYBOARD_INITIALIZATION_ROUTINE)(
-  IN PVOID  InitializationContext,
-  IN PVOID  SynchFuncContext,
-  IN PI8042_SYNCH_READ_PORT  ReadPort,
-  IN PI8042_SYNCH_WRITE_PORT  WritePort,
-  OUT PBOOLEAN  TurnTranslationOn);
-
-typedef BOOLEAN DDKAPI
-(*PI8042_KEYBOARD_ISR)(
-  PVOID  IsrContext,
-  PKEYBOARD_INPUT_DATA  CurrentInput,
-  POUTPUT_PACKET  CurrentOutput,
-  UCHAR  StatusByte,
-  PUCHAR  Byte,
-  PBOOLEAN  ContinueProcessing,
-  PKEYBOARD_SCAN_STATE  ScanState);
-
-typedef struct _INTERNAL_I8042_HOOK_KEYBOARD {
-	OUT PVOID  Context;
-	OUT PI8042_KEYBOARD_INITIALIZATION_ROUTINE  InitializationRoutine;
-	OUT PI8042_KEYBOARD_ISR  IsrRoutine;
-	IN PI8042_ISR_WRITE_PORT  IsrWritePort;
-	IN PI8042_QUEUE_PACKET  QueueKeyboardPacket;
-	IN PVOID  CallContext;
-} INTERNAL_I8042_HOOK_KEYBOARD, *PINTERNAL_I8042_HOOK_KEYBOARD;
-
-typedef BOOLEAN DDKAPI
-(*PI8042_MOUSE_ISR)(
-  PVOID  IsrContext,
-  PMOUSE_INPUT_DATA  CurrentInput,
-  POUTPUT_PACKET  CurrentOutput,
-  UCHAR  StatusByte,
-  PUCHAR  Byte,
-  PBOOLEAN  ContinueProcessing,
-  PMOUSE_STATE  MouseState,
-  PMOUSE_RESET_SUBSTATE  ResetSubState);
-
-typedef struct _INTERNAL_I8042_HOOK_MOUSE {
-  OUT PVOID  Context;
-  OUT PI8042_MOUSE_ISR  IsrRoutine;
-  IN PI8042_ISR_WRITE_PORT  IsrWritePort;
-  IN PI8042_QUEUE_PACKET  QueueMousePacket;
-  IN PVOID  CallContext;
-} INTERNAL_I8042_HOOK_MOUSE, *PINTERNAL_I8042_HOOK_MOUSE;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDD8042_H */
diff --git a/winsup/w32api/include/ddk/ntddbeep.h b/winsup/w32api/include/ddk/ntddbeep.h
deleted file mode 100644
index b82b6274e..000000000
--- a/winsup/w32api/include/ddk/ntddbeep.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * ntddbeep.h
- *
- * Beep device IOCTL interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDBEEP_H
-#define __NTDDBEEP_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define DD_BEEP_DEVICE_NAME               "\\Device\\Beep"
-#define DD_BEEP_DEVICE_NAME_U             L"\\Device\\Beep"
-
-#define IOCTL_BEEP_SET \
-  CTL_CODE(FILE_DEVICE_BEEP, 0, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-typedef struct _BEEP_SET_PARAMETERS {
-	ULONG  Frequency;
-	ULONG  Duration;
-} BEEP_SET_PARAMETERS, *PBEEP_SET_PARAMETERS;
-
-#define BEEP_FREQUENCY_MINIMUM            0x25
-#define BEEP_FREQUENCY_MAXIMUM            0x7FFF
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDBEEP_H */
diff --git a/winsup/w32api/include/ddk/ntddcdrm.h b/winsup/w32api/include/ddk/ntddcdrm.h
deleted file mode 100644
index 82bf815c2..000000000
--- a/winsup/w32api/include/ddk/ntddcdrm.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * ntddcdrm.h
- *
- * CDROM IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDCDRM_H
-#define __NTDDCDRM_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "ntddstor.h"
-
-
-#define IOCTL_CDROM_BASE                  FILE_DEVICE_CD_ROM
-
-#define IOCTL_CDROM_CHECK_VERIFY \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_FIND_NEW_DEVICES \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_GET_CONTROL \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x000D, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_GET_DRIVE_GEOMETRY \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0013, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_GET_LAST_SESSION \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x000E, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_GET_VOLUME \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_PAUSE_AUDIO \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_PLAY_AUDIO_MSF \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_RAW_READ \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x000F, METHOD_OUT_DIRECT,  FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_READ_Q_CHANNEL \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_READ_TOC \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_READ_TOC_EX \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0015, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_RESUME_AUDIO \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_SEEK_AUDIO_MSF \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_SET_VOLUME \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x000A, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_SIMBAD \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x1003, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CDROM_STOP_AUDIO \
-  CTL_CODE(IOCTL_CDROM_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-
-#define MAXIMUM_NUMBER_TRACKS             100
-#define MAXIMUM_CDROM_SIZE                804
-#define MINIMUM_CDROM_READ_TOC_EX_SIZE    2
-
-typedef struct _TRACK_DATA {
-  UCHAR  Reserved;
-  UCHAR  Control : 4;
-  UCHAR  Adr : 4;
-  UCHAR  TrackNumber;
-  UCHAR  Reserved1;
-  UCHAR  Address[4];
-} TRACK_DATA, *PTRACK_DATA;
-
-/* CDROM_DISK_DATA.DiskData flags */
-#define CDROM_DISK_AUDIO_TRACK            0x00000001
-#define CDROM_DISK_DATA_TRACK             0x00000002
-
-typedef struct _CDROM_DISK_DATA {
-  ULONG  DiskData;
-} CDROM_DISK_DATA, *PCDROM_DISK_DATA;
-
-typedef struct _CDROM_PLAY_AUDIO_MSF {
-  UCHAR  StartingM;
-  UCHAR  StartingS;
-  UCHAR  StartingF;
-  UCHAR  EndingM;
-  UCHAR  EndingS;
-  UCHAR  EndingF;
-} CDROM_PLAY_AUDIO_MSF, *PCDROM_PLAY_AUDIO_MSF;
-
-/* CDROM_READ_TOC_EX.Format constants */
-#define CDROM_READ_TOC_EX_FORMAT_TOC      0x00
-#define CDROM_READ_TOC_EX_FORMAT_SESSION  0x01
-#define CDROM_READ_TOC_EX_FORMAT_FULL_TOC 0x02
-#define CDROM_READ_TOC_EX_FORMAT_PMA      0x03
-#define CDROM_READ_TOC_EX_FORMAT_ATIP     0x04
-#define CDROM_READ_TOC_EX_FORMAT_CDTEXT   0x05
-
-typedef struct _CDROM_READ_TOC_EX {
-  UCHAR  Format : 4;
-  UCHAR  Reserved1 : 3; 
-  UCHAR  Msf : 1;
-  UCHAR  SessionTrack;
-  UCHAR  Reserved2;
-  UCHAR  Reserved3;
-} CDROM_READ_TOC_EX, *PCDROM_READ_TOC_EX;
-
-typedef struct _CDROM_SEEK_AUDIO_MSF {
-  UCHAR  M;
-  UCHAR  S;
-  UCHAR  F;
-} CDROM_SEEK_AUDIO_MSF, *PCDROM_SEEK_AUDIO_MSF;
-
-/* CDROM_SUB_Q_DATA_FORMAT.Format constants */
-#define IOCTL_CDROM_SUB_Q_CHANNEL         0x00
-#define IOCTL_CDROM_CURRENT_POSITION      0x01
-#define IOCTL_CDROM_MEDIA_CATALOG         0x02
-#define IOCTL_CDROM_TRACK_ISRC            0x03
-
-typedef struct _CDROM_SUB_Q_DATA_FORMAT {
-  UCHAR Format;
-  UCHAR Track;
-} CDROM_SUB_Q_DATA_FORMAT, *PCDROM_SUB_Q_DATA_FORMAT;
-
-typedef struct _CDROM_TOC {
-  UCHAR  Length[2];
-  UCHAR  FirstTrack;
-  UCHAR  LastTrack;
-  TRACK_DATA  TrackData[MAXIMUM_NUMBER_TRACKS];
-} CDROM_TOC, *PCDROM_TOC;
-
-#define CDROM_TOC_SIZE sizeof(CDROM_TOC)
-
-typedef struct _CDROM_TOC_ATIP_DATA_BLOCK {
-  UCHAR  CdrwReferenceSpeed : 3;
-  UCHAR  Reserved3 : 1;
-  UCHAR  WritePower : 3;
-  UCHAR  True1 : 1;
-  UCHAR  Reserved4 : 6;
-  UCHAR  UnrestrictedUse : 1;
-  UCHAR  Reserved5 : 1;
-  UCHAR  A3Valid : 1;
-  UCHAR  A2Valid : 1;
-  UCHAR  A1Valid : 1;
-  UCHAR  Reserved6 : 3;
-  UCHAR  IsCdrw : 1;
-  UCHAR  True2 : 1;
-  UCHAR  Reserved7;
-  UCHAR  LeadInMsf[3];
-  UCHAR  Reserved8;
-  UCHAR  LeadOutMsf[3];
-  UCHAR  Reserved9;
-  UCHAR  A1Values[3];
-  UCHAR  Reserved10;
-  UCHAR  A2Values[3];
-  UCHAR  Reserved11;
-  UCHAR  A3Values[3];
-  UCHAR  Reserved12;
-} CDROM_TOC_ATIP_DATA_BLOCK, *PCDROM_TOC_ATIP_DATA_BLOCK;
-
-typedef struct _CDROM_TOC_ATIP_DATA {
-  UCHAR  Length[2];
-  UCHAR  Reserved1;
-  UCHAR  Reserved2;
-  CDROM_TOC_ATIP_DATA_BLOCK  Descriptors[0];
-} CDROM_TOC_ATIP_DATA, *PCDROM_TOC_ATIP_DATA;
-
-/* CDROM_TOC_CD_TEXT_DATA_BLOCK.PackType constants */
-#define CDROM_CD_TEXT_PACK_ALBUM_NAME 0x80
-#define CDROM_CD_TEXT_PACK_PERFORMER  0x81
-#define CDROM_CD_TEXT_PACK_SONGWRITER 0x82
-#define CDROM_CD_TEXT_PACK_COMPOSER   0x83
-#define CDROM_CD_TEXT_PACK_ARRANGER   0x84
-#define CDROM_CD_TEXT_PACK_MESSAGES   0x85
-#define CDROM_CD_TEXT_PACK_DISC_ID    0x86
-#define CDROM_CD_TEXT_PACK_GENRE      0x87
-#define CDROM_CD_TEXT_PACK_TOC_INFO   0x88
-#define CDROM_CD_TEXT_PACK_TOC_INFO2  0x89
-#define CDROM_CD_TEXT_PACK_UPC_EAN    0x8e
-#define CDROM_CD_TEXT_PACK_SIZE_INFO  0x8f
-
-typedef struct _CDROM_TOC_CD_TEXT_DATA_BLOCK {
-  UCHAR  PackType;
-  UCHAR  TrackNumber : 7;
-  UCHAR  ExtensionFlag : 1;
-  UCHAR  SequenceNumber;
-  UCHAR  CharacterPosition : 4;
-  UCHAR  BlockNumber : 3;
-  UCHAR  Unicode : 1;
-  _ANONYMOUS_UNION union {
-    UCHAR  Text[12];
-    WCHAR  WText[6];
-  } DUMMYUNIONNAME;
-  UCHAR  CRC[2];
-} CDROM_TOC_CD_TEXT_DATA_BLOCK, *PCDROM_TOC_CD_TEXT_DATA_BLOCK;
-
-typedef struct _CDROM_TOC_CD_TEXT_DATA {
-  UCHAR  Length[2];
-  UCHAR  Reserved1;
-  UCHAR  Reserved2;
-  CDROM_TOC_CD_TEXT_DATA_BLOCK  Descriptors[0];
-} CDROM_TOC_CD_TEXT_DATA, *PCDROM_TOC_CD_TEXT_DATA;
-
-/* CDROM_TOC_FULL_TOC_DATA_BLOCK.Adr constants */
-#define ADR_NO_MODE_INFORMATION           0x0
-#define ADR_ENCODES_CURRENT_POSITION      0x1
-#define ADR_ENCODES_MEDIA_CATALOG         0x2
-#define ADR_ENCODES_ISRC                  0x3
-
-typedef struct _CDROM_TOC_FULL_TOC_DATA_BLOCK {
-  UCHAR  SessionNumber;
-  UCHAR  Control : 4;
-  UCHAR  Adr : 4;
-  UCHAR  Reserved1;
-  UCHAR  Point;
-  UCHAR  MsfExtra[3];
-  UCHAR  Zero;
-  UCHAR  Msf[3];
-} CDROM_TOC_FULL_TOC_DATA_BLOCK, *PCDROM_TOC_FULL_TOC_DATA_BLOCK;
-
-typedef struct _CDROM_TOC_FULL_TOC_DATA {
-  UCHAR  Length[2];
-  UCHAR  FirstCompleteSession;
-  UCHAR  LastCompleteSession;
-  CDROM_TOC_FULL_TOC_DATA_BLOCK  Descriptors[0];
-} CDROM_TOC_FULL_TOC_DATA, *PCDROM_TOC_FULL_TOC_DATA;
-
-typedef struct _CDROM_TOC_PMA_DATA {
-  UCHAR  Length[2];
-  UCHAR  Reserved1;
-  UCHAR  Reserved2;
-  CDROM_TOC_FULL_TOC_DATA_BLOCK  Descriptors[0];
-} CDROM_TOC_PMA_DATA, *PCDROM_TOC_PMA_DATA;
-
-/* SUB_Q_HEADER.AudioStatus constants */
-#define AUDIO_STATUS_NOT_SUPPORTED  0x00
-#define AUDIO_STATUS_IN_PROGRESS    0x11
-#define AUDIO_STATUS_PAUSED         0x12
-#define AUDIO_STATUS_PLAY_COMPLETE  0x13
-#define AUDIO_STATUS_PLAY_ERROR     0x14
-#define AUDIO_STATUS_NO_STATUS      0x15
-
-typedef struct _SUB_Q_HEADER {
-  UCHAR  Reserved;
-  UCHAR  AudioStatus;
-  UCHAR  DataLength[2];
-} SUB_Q_HEADER, *PSUB_Q_HEADER;
-
-typedef struct _SUB_Q_MEDIA_CATALOG_NUMBER {
-  SUB_Q_HEADER  Header;
-  UCHAR  FormatCode;
-  UCHAR  Reserved[3];
-  UCHAR  Reserved1 : 7;
-  UCHAR  Mcval :1;
-  UCHAR  MediaCatalog[15];
-} SUB_Q_MEDIA_CATALOG_NUMBER, *PSUB_Q_MEDIA_CATALOG_NUMBER;
-
-typedef struct _SUB_Q_TRACK_ISRC {
-  SUB_Q_HEADER  Header;
-  UCHAR  FormatCode;
-  UCHAR  Reserved0;
-  UCHAR  Track;
-  UCHAR  Reserved1;
-  UCHAR  Reserved2 : 7;
-  UCHAR  Tcval : 1;
-  UCHAR  TrackIsrc[15];
-} SUB_Q_TRACK_ISRC, *PSUB_Q_TRACK_ISRC;
-
-typedef struct _SUB_Q_CURRENT_POSITION {
-  SUB_Q_HEADER  Header;
-  UCHAR  FormatCode;
-  UCHAR  Control : 4;
-  UCHAR  ADR : 4;
-  UCHAR  TrackNumber;
-  UCHAR  IndexNumber;
-  UCHAR  AbsoluteAddress[4];
-  UCHAR  TrackRelativeAddress[4];
-} SUB_Q_CURRENT_POSITION, *PSUB_Q_CURRENT_POSITION;
-
-typedef union _SUB_Q_CHANNEL_DATA {
-  SUB_Q_CURRENT_POSITION  CurrentPosition;
-  SUB_Q_MEDIA_CATALOG_NUMBER  MediaCatalog;
-  SUB_Q_TRACK_ISRC  TrackIsrc;
-} SUB_Q_CHANNEL_DATA, *PSUB_Q_CHANNEL_DATA;
-
-/* CDROM_AUDIO_CONTROL.LbaFormat constants */
-#define AUDIO_WITH_PREEMPHASIS            0x1
-#define DIGITAL_COPY_PERMITTED            0x2
-#define AUDIO_DATA_TRACK                  0x4
-#define TWO_FOUR_CHANNEL_AUDIO            0x8
-
-typedef struct _CDROM_AUDIO_CONTROL {
-	UCHAR  LbaFormat;
-	USHORT  LogicalBlocksPerSecond;
-} CDROM_AUDIO_CONTROL, *PCDROM_AUDIO_CONTROL;
-
-typedef struct _VOLUME_CONTROL {
-  UCHAR  PortVolume[4];
-} VOLUME_CONTROL, *PVOLUME_CONTROL;
-
-typedef enum _TRACK_MODE_TYPE {
-	YellowMode2,
-	XAForm2,
-	CDDA
-} TRACK_MODE_TYPE, *PTRACK_MODE_TYPE;
-
-typedef struct __RAW_READ_INFO {
-	LARGE_INTEGER  DiskOffset;
-	ULONG  SectorCount;
-	TRACK_MODE_TYPE  TrackMode;
-} RAW_READ_INFO, *PRAW_READ_INFO;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDCDRM_H */
diff --git a/winsup/w32api/include/ddk/ntddcdvd.h b/winsup/w32api/include/ddk/ntddcdvd.h
deleted file mode 100644
index 48a106bad..000000000
--- a/winsup/w32api/include/ddk/ntddcdvd.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * ntddcdvd.h
- *
- * DVD IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDCDVD_H
-#define __NTDDCDVD_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "ntddstor.h"
-
-
-#define IOCTL_DVD_BASE                    FILE_DEVICE_DVD
-
-#define IOCTL_DVD_END_SESSION \
-  CTL_CODE(IOCTL_DVD_BASE, 0x0403, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DVD_GET_REGION \
-  CTL_CODE(IOCTL_DVD_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DVD_READ_KEY \
-  CTL_CODE(IOCTL_DVD_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DVD_READ_STRUCTURE \
-  CTL_CODE(IOCTL_DVD_BASE, 0x0450, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DVD_SEND_KEY \
-  CTL_CODE(IOCTL_DVD_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DVD_START_SESSION \
-  CTL_CODE(IOCTL_DVD_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DVD_SET_READ_AHEAD \
-  CTL_CODE(IOCTL_DVD_BASE, 0x0404, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-
-typedef ULONG DVD_SESSION_ID, *PDVD_SESSION_ID;
-
-typedef struct _STORAGE_SET_READ_AHEAD {
-	LARGE_INTEGER  TriggerAddress;
-	LARGE_INTEGER  TargetAddress;
-} STORAGE_SET_READ_AHEAD, *PSTORAGE_SET_READ_AHEAD;
-
-typedef enum DVD_STRUCTURE_FORMAT {
-  DvdPhysicalDescriptor,
-  DvdCopyrightDescriptor,
-  DvdDiskKeyDescriptor,
-  DvdBCADescriptor,
-  DvdManufacturerDescriptor,
-  DvdMaxDescriptor
-} DVD_STRUCTURE_FORMAT, *PDVD_STRUCTURE_FORMAT;
-
-typedef struct DVD_READ_STRUCTURE {
-  LARGE_INTEGER  BlockByteOffset;
-  DVD_STRUCTURE_FORMAT  Format;
-  DVD_SESSION_ID  SessionId;
-  UCHAR  LayerNumber;
-} DVD_READ_STRUCTURE, *PDVD_READ_STRUCTURE;
-
-typedef struct _DVD_DESCRIPTOR_HEADER {
-    USHORT Length;
-    UCHAR Reserved[2];
-    UCHAR Data[0];
-} DVD_DESCRIPTOR_HEADER, *PDVD_DESCRIPTOR_HEADER;
-
-typedef struct _DVD_LAYER_DESCRIPTOR {
-  UCHAR  BookVersion : 4;
-  UCHAR  BookType : 4;
-  UCHAR  MinimumRate : 4;
-  UCHAR  DiskSize : 4;
-  UCHAR  LayerType : 4;
-  UCHAR  TrackPath : 1;
-  UCHAR  NumberOfLayers : 2;
-  UCHAR  Reserved1 : 1;
-  UCHAR  TrackDensity : 4;
-  UCHAR  LinearDensity : 4;
-  ULONG  StartingDataSector;
-  ULONG  EndDataSector;
-  ULONG  EndLayerZeroSector;
-  UCHAR  Reserved5 : 7;
-  UCHAR  BCAFlag : 1;
-  UCHAR  Reserved6;
-} DVD_LAYER_DESCRIPTOR, *PDVD_LAYER_DESCRIPTOR;
-
-typedef struct _DVD_COPYRIGHT_DESCRIPTOR {
-  UCHAR  CopyrightProtectionType;
-  UCHAR  RegionManagementInformation;
-  USHORT  Reserved;
-} DVD_COPYRIGHT_DESCRIPTOR, *PDVD_COPYRIGHT_DESCRIPTOR;
-
-typedef struct _DVD_DISK_KEY_DESCRIPTOR {
-  UCHAR  DiskKeyData[2048];
-} DVD_DISK_KEY_DESCRIPTOR, *PDVD_DISK_KEY_DESCRIPTOR;
-
-typedef enum _DVD_KEY_TYPE {
-	DvdChallengeKey = 0x01,
-	DvdBusKey1,
-	DvdBusKey2,
-	DvdTitleKey,
-	DvdAsf,
-	DvdSetRpcKey = 0x6,
-	DvdGetRpcKey = 0x8,
-	DvdDiskKey = 0x80,
-	DvdInvalidateAGID = 0x3f
-} DVD_KEY_TYPE;
-
-typedef struct _DVD_COPY_PROTECT_KEY {
-	ULONG  KeyLength;
-	DVD_SESSION_ID  SessionId;
-	DVD_KEY_TYPE  KeyType;
-	ULONG  KeyFlags;
-	union {
-		HANDLE  FileHandle;
-		LARGE_INTEGER  TitleOffset;
-	} Parameters;
-	UCHAR  KeyData[0];
-} DVD_COPY_PROTECT_KEY, *PDVD_COPY_PROTECT_KEY;
-
-#define DVD_CHALLENGE_KEY_LENGTH          (12 + sizeof(DVD_COPY_PROTECT_KEY))
-#define DVD_BUS_KEY_LENGTH                (8 + sizeof(DVD_COPY_PROTECT_KEY))
-#define DVD_TITLE_KEY_LENGTH              (8 + sizeof(DVD_COPY_PROTECT_KEY))
-#define DVD_DISK_KEY_LENGTH               (2048 + sizeof(DVD_COPY_PROTECT_KEY))
-#define DVD_RPC_KEY_LENGTH                (sizeof(DVD_RPC_KEY) + sizeof(DVD_COPY_PROTECT_KEY))
-#define DVD_SET_RPC_KEY_LENGTH            (sizeof(DVD_SET_RPC_KEY) + sizeof(DVD_COPY_PROTECT_KEY))
-#define DVD_ASF_LENGTH                    (sizeof(DVD_ASF) + sizeof(DVD_COPY_PROTECT_KEY))
-
-#define DVD_END_ALL_SESSIONS              ((DVD_SESSION_ID) 0xffffffff)
-
-
-#define DVD_CGMS_RESERVED_MASK            0x00000078
-
-#define DVD_CGMS_COPY_PROTECT_MASK        0x00000018
-#define DVD_CGMS_COPY_PERMITTED           0x00000000
-#define DVD_CGMS_COPY_ONCE                0x00000010
-#define DVD_CGMS_NO_COPY                  0x00000018
-
-#define DVD_COPYRIGHT_MASK                0x00000040
-#define DVD_NOT_COPYRIGHTED               0x00000000
-#define DVD_COPYRIGHTED                   0x00000040
-
-#define DVD_SECTOR_PROTECT_MASK           0x00000020
-#define DVD_SECTOR_NOT_PROTECTED          0x00000000
-#define DVD_SECTOR_PROTECTED              0x00000020
-
-
-typedef struct _DVD_BCA_DESCRIPTOR {
-  UCHAR  BCAInformation[0];
-} DVD_BCA_DESCRIPTOR, *PDVD_BCA_DESCRIPTOR;
-
-typedef struct _DVD_MANUFACTURER_DESCRIPTOR {
-  UCHAR  ManufacturingInformation[2048];
-} DVD_MANUFACTURER_DESCRIPTOR, *PDVD_MANUFACTURER_DESCRIPTOR;
-
-typedef struct _DVD_RPC_KEY {
-  UCHAR  UserResetsAvailable : 3;
-  UCHAR  ManufacturerResetsAvailable : 3;
-  UCHAR  TypeCode : 2;
-  UCHAR  RegionMask;
-  UCHAR  RpcScheme;
-  UCHAR  Reserved2[1];
-} DVD_RPC_KEY, *PDVD_RPC_KEY;
-
-typedef struct _DVD_SET_RPC_KEY {
-  UCHAR  PreferredDriveRegionCode;
-  UCHAR  Reserved[3];
-} DVD_SET_RPC_KEY, *PDVD_SET_RPC_KEY;
-
-typedef struct _DVD_ASF {
-  UCHAR  Reserved0[3];
-  UCHAR  SuccessFlag : 1;
-  UCHAR  Reserved1 : 7;
-} DVD_ASF, *PDVD_ASF;
-
-typedef struct _DVD_REGION {
-	UCHAR  CopySystem;
-	UCHAR  RegionData;
-	UCHAR  SystemRegion;
-	UCHAR  ResetCount;
-} DVD_REGION, *PDVD_REGION;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDCDVD_H */
diff --git a/winsup/w32api/include/ddk/ntddchgr.h b/winsup/w32api/include/ddk/ntddchgr.h
deleted file mode 100644
index 7cd6cfafd..000000000
--- a/winsup/w32api/include/ddk/ntddchgr.h
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * ntddchgr.h
- *
- * Media changer IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDCHGR_H
-#define __NTDDCHGR_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "ntddstor.h"
-
-
-#define DD_CHANGER_DEVICE_NAME            "\\Device\\Changer"
-#define DD_CHANGER_DEVICE_NAME_U          L"\\Device\\Changer"
-
-#define IOCTL_CHANGER_BASE                FILE_DEVICE_CHANGER
-
-#define IOCTL_CHANGER_EXCHANGE_MEDIUM  \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x0008, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CHANGER_GET_ELEMENT_STATUS \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_CHANGER_GET_PARAMETERS \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CHANGER_GET_PRODUCT_DATA \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CHANGER_GET_STATUS \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CHANGER_INITIALIZE_ELEMENT_STATUS \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CHANGER_MOVE_MEDIUM \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x0009, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CHANGER_QUERY_VOLUME_TAGS \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x000B, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_CHANGER_REINITIALIZE_TRANSPORT \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x000A, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_CHANGER_SET_ACCESS \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_CHANGER_SET_POSITION \
-  CTL_CODE(IOCTL_CHANGER_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-
-#define MAX_VOLUME_ID_SIZE                36
-#define MAX_VOLUME_TEMPLATE_SIZE          40
-
-typedef  enum _ELEMENT_TYPE {
-  AllElements,
-  ChangerTransport,
-  ChangerSlot,
-  ChangerIEPort,
-  ChangerDrive,
-  ChangerDoor,
-  ChangerKeypad,
-  ChangerMaxElement
-} ELEMENT_TYPE, *PELEMENT_TYPE;
-
-typedef struct _CHANGER_ELEMENT {
-  ELEMENT_TYPE  ElementType;
-  ULONG  ElementAddress;
-} CHANGER_ELEMENT, *PCHANGER_ELEMENT;
-
-typedef struct _CHANGER_ELEMENT_LIST {
-  CHANGER_ELEMENT  Element;
-  ULONG  NumberOfElements;
-} CHANGER_ELEMENT_LIST, *PCHANGER_ELEMENT_LIST;
-
-typedef struct _CHANGER_INITIALIZE_ELEMENT_STATUS {
-  CHANGER_ELEMENT_LIST  ElementList;
-  BOOLEAN  BarCodeScan;
-} CHANGER_INITIALIZE_ELEMENT_STATUS, *PCHANGER_INITIALIZE_ELEMENT_STATUS;
-
-typedef struct _CHANGER_READ_ELEMENT_STATUS {
-  CHANGER_ELEMENT_LIST  ElementList;
-  BOOLEAN  VolumeTagInfo;
-} CHANGER_READ_ELEMENT_STATUS, *PCHANGER_READ_ELEMENT_STATUS;
-
-
-typedef struct _CHANGER_SET_POSITION {
-	CHANGER_ELEMENT  Transport;
-	CHANGER_ELEMENT  Destination;
-	BOOLEAN  Flip;
-} CHANGER_SET_POSITION, *PCHANGER_SET_POSITION;
-
-typedef struct _CHANGER_EXCHANGE_MEDIUM {
-	CHANGER_ELEMENT  Transport;
-	CHANGER_ELEMENT  Source;
-	CHANGER_ELEMENT  Destination1;
-	CHANGER_ELEMENT  Destination2;
-	BOOLEAN  Flip1;
-	BOOLEAN  Flip2;
-} CHANGER_EXCHANGE_MEDIUM, *PCHANGER_EXCHANGE_MEDIUM;
-
-typedef struct _CHANGER_MOVE_MEDIUM {
-  CHANGER_ELEMENT  Transport;
-  CHANGER_ELEMENT  Source;
-  CHANGER_ELEMENT  Destination;
-  BOOLEAN  Flip;
-} CHANGER_MOVE_MEDIUM, *PCHANGER_MOVE_MEDIUM;
-
-#define VENDOR_ID_LENGTH                  8
-#define PRODUCT_ID_LENGTH                 16
-#define REVISION_LENGTH                   4
-#define SERIAL_NUMBER_LENGTH              32
-
-typedef  struct _CHANGER_PRODUCT_DATA {
-	UCHAR  VendorId[VENDOR_ID_LENGTH];
-	UCHAR  ProductId[PRODUCT_ID_LENGTH];
-	UCHAR  Revision[REVISION_LENGTH];
-	UCHAR  SerialNumber[SERIAL_NUMBER_LENGTH];
-	UCHAR  DeviceType;
-} CHANGER_PRODUCT_DATA, *PCHANGER_PRODUCT_DATA;
-
-/* CHANGER_SET_ACCESS.Control constants */
-#define LOCK_ELEMENT                      0
-#define UNLOCK_ELEMENT                    1
-#define EXTEND_IEPORT                     2
-#define RETRACT_IEPORT                    3
-
-typedef struct _CHANGER_SET_ACCESS {
-  CHANGER_ELEMENT  Element;
-  ULONG  Control;
-} CHANGER_SET_ACCESS, *PCHANGER_SET_ACCESS;
-
-
-typedef enum _CHANGER_DEVICE_PROBLEM_TYPE {
-  DeviceProblemNone,
-  DeviceProblemHardware,
-  DeviceProblemCHMError,
-  DeviceProblemDoorOpen,
-  DeviceProblemCalibrationError,
-  DeviceProblemTargetFailure,
-  DeviceProblemCHMMoveError,
-  DeviceProblemCHMZeroError,
-  DeviceProblemCartridgeInsertError,
-  DeviceProblemPositionError,
-  DeviceProblemSensorError,
-  DeviceProblemCartridgeEjectError,
-  DeviceProblemGripperError,
-  DeviceProblemDriveError
-} CHANGER_DEVICE_PROBLEM_TYPE, *PCHANGER_DEVICE_PROBLEM_TYPE;
-
-/* CHANGER_ELEMENT_STATUS(_EX).Flags constants */
-#define ELEMENT_STATUS_FULL               0x00000001
-#define ELEMENT_STATUS_IMPEXP             0x00000002
-#define ELEMENT_STATUS_EXCEPT             0x00000004
-#define ELEMENT_STATUS_ACCESS             0x00000008
-#define ELEMENT_STATUS_EXENAB             0x00000010
-#define ELEMENT_STATUS_INENAB             0x00000020
-#define ELEMENT_STATUS_PRODUCT_DATA       0x00000040
-#define ELEMENT_STATUS_LUN_VALID          0x00001000
-#define ELEMENT_STATUS_ID_VALID           0x00002000
-#define ELEMENT_STATUS_NOT_BUS            0x00008000
-#define ELEMENT_STATUS_INVERT             0x00400000
-#define ELEMENT_STATUS_SVALID             0x00800000
-#define ELEMENT_STATUS_PVOLTAG            0x10000000
-#define ELEMENT_STATUS_AVOLTAG            0x20000000
-
-/* CHANGER_ELEMENT_STATUS(_EX).ExceptionCode constants */
-#define ERROR_LABEL_UNREADABLE            0x00000001
-#define ERROR_LABEL_QUESTIONABLE          0x00000002
-#define ERROR_SLOT_NOT_PRESENT            0x00000004
-#define ERROR_DRIVE_NOT_INSTALLED         0x00000008
-#define ERROR_TRAY_MALFUNCTION            0x00000010
-#define ERROR_INIT_STATUS_NEEDED          0x00000011
-#define ERROR_UNHANDLED_ERROR             0xFFFFFFFF
-
-typedef struct _CHANGER_ELEMENT_STATUS {
-  CHANGER_ELEMENT  Element;
-  CHANGER_ELEMENT  SrcElementAddress;
-  ULONG  Flags;
-  ULONG  ExceptionCode;
-  UCHAR  TargetId;
-  UCHAR  Lun;
-  USHORT  Reserved;
-  UCHAR  PrimaryVolumeID[MAX_VOLUME_ID_SIZE];
-  UCHAR  AlternateVolumeID[MAX_VOLUME_ID_SIZE];
-} CHANGER_ELEMENT_STATUS, *PCHANGER_ELEMENT_STATUS;
-
-typedef  struct _CHANGER_ELEMENT_STATUS_EX {
-  CHANGER_ELEMENT  Element;
-  CHANGER_ELEMENT  SrcElementAddress;
-  ULONG  Flags;
-  ULONG  ExceptionCode;
-  UCHAR  TargetId;
-  UCHAR  Lun;
-  USHORT  Reserved;
-  UCHAR  PrimaryVolumeID[MAX_VOLUME_ID_SIZE];
-  UCHAR  AlternateVolumeID[MAX_VOLUME_ID_SIZE];
-  UCHAR  VendorIdentification[VENDOR_ID_LENGTH];
-  UCHAR  ProductIdentification[PRODUCT_ID_LENGTH];
-  UCHAR  SerialNumber[SERIAL_NUMBER_LENGTH];
-} CHANGER_ELEMENT_STATUS_EX, *PCHANGER_ELEMENT_STATUS_EX;
-
-/* CHANGER_SEND_VOLUME_TAG_INFORMATION.ActionCode constants */
-#define SEARCH_ALL                        0x0
-#define SEARCH_PRIMARY                    0x1
-#define SEARCH_ALTERNATE                  0x2
-#define SEARCH_ALL_NO_SEQ                 0x4
-#define SEARCH_PRI_NO_SEQ                 0x5
-#define SEARCH_ALT_NO_SEQ                 0x6
-#define ASSERT_PRIMARY                    0x8
-#define ASSERT_ALTERNATE                  0x9
-#define REPLACE_PRIMARY                   0xA
-#define REPLACE_ALTERNATE                 0xB
-#define UNDEFINE_PRIMARY                  0xC
-#define UNDEFINE_ALTERNATE                0xD
-
-typedef struct _CHANGER_SEND_VOLUME_TAG_INFORMATION {
-  CHANGER_ELEMENT StartingElement;
-  ULONG  ActionCode;
-  UCHAR  VolumeIDTemplate[MAX_VOLUME_TEMPLATE_SIZE];
-} CHANGER_SEND_VOLUME_TAG_INFORMATION, *PCHANGER_SEND_VOLUME_TAG_INFORMATION;
-
-/* GET_CHANGER_PARAMETERS.Features0 constants */
-#define CHANGER_BAR_CODE_SCANNER_INSTALLED  0x00000001
-#define CHANGER_INIT_ELEM_STAT_WITH_RANGE   0x00000002
-#define CHANGER_CLOSE_IEPORT                0x00000004
-#define CHANGER_OPEN_IEPORT                 0x00000008
-#define CHANGER_STATUS_NON_VOLATILE         0x00000010
-#define CHANGER_EXCHANGE_MEDIA              0x00000020
-#define CHANGER_CLEANER_SLOT                0x00000040
-#define CHANGER_LOCK_UNLOCK                 0x00000080
-#define CHANGER_CARTRIDGE_MAGAZINE          0x00000100
-#define CHANGER_MEDIUM_FLIP                 0x00000200
-#define CHANGER_POSITION_TO_ELEMENT         0x00000400
-#define CHANGER_REPORT_IEPORT_STATE         0x00000800
-#define CHANGER_STORAGE_DRIVE               0x00001000
-#define CHANGER_STORAGE_IEPORT              0x00002000
-#define CHANGER_STORAGE_SLOT                0x00004000
-#define CHANGER_STORAGE_TRANSPORT           0x00008000
-#define CHANGER_DRIVE_CLEANING_REQUIRED     0x00010000
-#define CHANGER_PREDISMOUNT_EJECT_REQUIRED  0x00020000
-#define CHANGER_CLEANER_ACCESS_NOT_VALID    0x00040000
-#define CHANGER_PREMOUNT_EJECT_REQUIRED     0x00080000
-#define CHANGER_VOLUME_IDENTIFICATION       0x00100000
-#define CHANGER_VOLUME_SEARCH               0x00200000
-#define CHANGER_VOLUME_ASSERT               0x00400000
-#define CHANGER_VOLUME_REPLACE              0x00800000
-#define CHANGER_VOLUME_UNDEFINE             0x01000000
-#define CHANGER_SERIAL_NUMBER_VALID         0x04000000
-#define CHANGER_DEVICE_REINITIALIZE_CAPABLE 0x08000000
-#define CHANGER_KEYPAD_ENABLE_DISABLE       0x10000000
-#define CHANGER_DRIVE_EMPTY_ON_DOOR_ACCESS  0x20000000
-#define CHANGER_RESERVED_BIT                0x80000000
-
-/* GET_CHANGER_PARAMETERS.Features1 constants */
-#define CHANGER_PREDISMOUNT_ALIGN_TO_SLOT   0x80000001
-#define CHANGER_PREDISMOUNT_ALIGN_TO_DRIVE  0x80000002
-#define CHANGER_CLEANER_AUTODISMOUNT        0x80000004
-#define CHANGER_TRUE_EXCHANGE_CAPABLE       0x80000008
-#define CHANGER_SLOTS_USE_TRAYS             0x80000010
-#define CHANGER_RTN_MEDIA_TO_ORIGINAL_ADDR  0x80000020
-#define CHANGER_CLEANER_OPS_NOT_SUPPORTED   0x80000040
-#define CHANGER_IEPORT_USER_CONTROL_OPEN    0x80000080
-#define CHANGER_IEPORT_USER_CONTROL_CLOSE   0x80000100
-#define CHANGER_MOVE_EXTENDS_IEPORT         0x80000200
-#define CHANGER_MOVE_RETRACTS_IEPORT        0x80000400
-
-/* GET_CHANGER_PARAMETERS.MoveFrom,ExchangeFrom,PositionCapabilities constants */
-#define CHANGER_TO_TRANSPORT              0x01
-#define CHANGER_TO_SLOT                   0x02
-#define CHANGER_TO_IEPORT                 0x04
-#define CHANGER_TO_DRIVE                  0x08
-
-/* GET_CHANGER_PARAMETERS.LockUnlockCapabilities constants */
-#define LOCK_UNLOCK_IEPORT                0x01
-#define LOCK_UNLOCK_DOOR                  0x02
-#define LOCK_UNLOCK_KEYPAD                0x04
-
-typedef struct _GET_CHANGER_PARAMETERS {
-  ULONG  Size;
-  USHORT  NumberTransportElements;
-  USHORT  NumberStorageElements;
-  USHORT  NumberCleanerSlots;
-  USHORT  NumberIEElements;
-  USHORT  NumberDataTransferElements;
-  USHORT  NumberOfDoors;
-  USHORT  FirstSlotNumber;
-  USHORT  FirstDriveNumber;
-  USHORT  FirstTransportNumber;
-  USHORT  FirstIEPortNumber;
-  USHORT  FirstCleanerSlotAddress;
-  USHORT  MagazineSize;
-  ULONG  DriveCleanTimeout;
-  ULONG  Features0;
-  ULONG  Features1;
-  UCHAR  MoveFromTransport;
-  UCHAR  MoveFromSlot;
-  UCHAR  MoveFromIePort;
-  UCHAR  MoveFromDrive;
-  UCHAR  ExchangeFromTransport;
-  UCHAR  ExchangeFromSlot;
-  UCHAR  ExchangeFromIePort;
-  UCHAR  ExchangeFromDrive;
-  UCHAR  LockUnlockCapabilities;
-  UCHAR  PositionCapabilities;
-  UCHAR  Reserved1[2];
-  ULONG  Reserved2[2];
-} GET_CHANGER_PARAMETERS, * PGET_CHANGER_PARAMETERS;
-
-typedef struct READ_ELEMENT_ADDRESS_INFO {
-  ULONG  NumberOfElements;
-  CHANGER_ELEMENT_STATUS  ElementStatus[1];
-} READ_ELEMENT_ADDRESS_INFO, *PREAD_ELEMENT_ADDRESS_INFO;
-
-typedef struct _TAPE_WMI_OPERATIONS {
-  ULONG  Method;
-  ULONG  DataBufferSize;
-  PVOID  DataBuffer;
-} TAPE_WMI_OPERATIONS, *PTAPE_WMI_OPERATIONS;
-
-typedef struct _WMI_CHANGER_PROBLEM_DEVICE_ERROR {
-  ULONG  ChangerProblemType;
-} WMI_CHANGER_PROBLEM_DEVICE_ERROR, *PWMI_CHANGER_PROBLEM_DEVICE_ERROR;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDCHGR_H */
diff --git a/winsup/w32api/include/ddk/ntdddisk.h b/winsup/w32api/include/ddk/ntdddisk.h
deleted file mode 100644
index 205046928..000000000
--- a/winsup/w32api/include/ddk/ntdddisk.h
+++ /dev/null
@@ -1,522 +0,0 @@
-/*
- * ntdddisk.h
- *
- * Disk IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDDISK_H
-#define __NTDDDISK_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "ntddstor.h"
-
-
-#define DD_DISK_DEVICE_NAME               "\\Device\\UNKNOWN"
-#define DD_DISK_DEVICE_NAME_U             L"\\Device\\UNKNOWN"
-
-#define IOCTL_DISK_BASE                   FILE_DEVICE_DISK
-
-#define IOCTL_DISK_CHECK_VERIFY \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DISK_CONTROLLER_NUMBER \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0011, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_CREATE_DISK \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0016, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_DELETE_DRIVE_LAYOUT \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0040, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_FIND_NEW_DEVICES \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DISK_FORMAT_TRACKS \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_FORMAT_TRACKS_EX \
-  CTL_CODE(IOCTL_DISK_BASE, 0x000b, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_GET_CACHE_INFORMATION \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0035, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DISK_GET_DRIVE_GEOMETRY \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_GET_DRIVE_GEOMETRY_EX \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0028, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_GET_DRIVE_LAYOUT \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DISK_GET_DRIVE_LAYOUT_EX \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0014, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_GET_MEDIA_TYPES \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_GET_LENGTH_INFO \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0017, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DISK_GET_PARTITION_INFO \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DISK_GET_PARTITION_INFO_EX \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0012, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_GROW_PARTITION \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0034, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_INTERNAL_CLEAR_VERIFY \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0101, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_INTERNAL_SET_VERIFY \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0100, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_IS_WRITABLE \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0009, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_PERFORMANCE \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0008, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_PERFORMANCE_OFF \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0018, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_DISK_REASSIGN_BLOCKS \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_RESERVE \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_DISK_SET_CACHE_INFORMATION \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_SET_DRIVE_LAYOUT \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_SET_DRIVE_LAYOUT_EX \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0015, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_SET_PARTITION_INFO \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_SET_PARTITION_INFO_EX \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0013, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_UPDATE_DRIVE_SIZE \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0032, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_DISK_VERIFY \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0005, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define SMART_GET_VERSION \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0020, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define SMART_RCV_DRIVE_DATA \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0022, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define SMART_SEND_DRIVE_COMMAND \
-  CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-
-#define PARTITION_ENTRY_UNUSED            0x00
-#define PARTITION_FAT_12                  0x01
-#define PARTITION_XENIX_1                 0x02
-#define PARTITION_XENIX_2                 0x03
-#define PARTITION_FAT_16                  0x04
-#define PARTITION_EXTENDED                0x05
-#define PARTITION_HUGE                    0x06
-#define PARTITION_IFS                     0x07
-#define PARTITION_OS2BOOTMGR              0x0A
-#define PARTITION_FAT32                   0x0B
-#define PARTITION_FAT32_XINT13            0x0C
-#define PARTITION_XINT13                  0x0E
-#define PARTITION_XINT13_EXTENDED         0x0F
-#define PARTITION_PREP                    0x41
-#define PARTITION_LDM                     0x42
-#define PARTITION_UNIX                    0x63
-#define VALID_NTFT                        0xC0
-#define PARTITION_NTFT                    0x80
-
-#define IsFTPartition( PartitionType ) \
-  (((PartitionType) & PARTITION_NTFT) && \
-  IsRecognizedPartition(PartitionType))
-
-#define IsContainerPartition(PartitionType) \
-  (((PartitionType) == PARTITION_EXTENDED) || \
-  ((PartitionType) == PARTITION_XINT13_EXTENDED))
-
-#define IsRecognizedPartition(PartitionType) ( \
-	(((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT_12)) || \
-	(((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_HUGE)) || \
-	(((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_IFS)) || \
-	(((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32)) || \
-	(((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_FAT32_XINT13)) || \
-	(((PartitionType) & PARTITION_NTFT) && (((PartitionType) & ~0xC0) == PARTITION_XINT13)) || \
-	((PartitionType) == PARTITION_FAT_12) || \
-	((PartitionType) == PARTITION_FAT_16) || \
-	((PartitionType) == PARTITION_HUGE) || \
-	((PartitionType) == PARTITION_IFS) || \
-	((PartitionType) == PARTITION_FAT32) || \
-	((PartitionType) == PARTITION_FAT32_XINT13) || \
-	((PartitionType) == PARTITION_XINT13))
-
-#define WMI_DISK_GEOMETRY_GUID \
-  {0x25007f51, 0x57c2, 0x11d1, {0xa5, 0x28, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0x10}}
-
-typedef USHORT BAD_TRACK_NUMBER;
-typedef USHORT *PBAD_TRACK_NUMBER;
-
-typedef enum _MEDIA_TYPE {
-  Unknown,
-  F5_1Pt2_512,
-  F3_1Pt44_512,
-  F3_2Pt88_512,
-  F3_20Pt8_512,
-  F3_720_512,
-  F5_360_512,
-  F5_320_512,
-  F5_320_1024,
-  F5_180_512,
-  F5_160_512,
-  RemovableMedia,
-  FixedMedia,
-  F3_120M_512,
-  F3_640_512,
-  F5_640_512,
-  F5_720_512,
-  F3_1Pt2_512,
-  F3_1Pt23_1024,
-  F5_1Pt23_1024,
-  F3_128Mb_512,
-  F3_230Mb_512,
-  F8_256_128
-} MEDIA_TYPE, *PMEDIA_TYPE;
-
-typedef enum _DETECTION_TYPE {
-  DetectNone,
-  DetectInt13,
-  DetectExInt13
-} DETECTION_TYPE;
-
-typedef struct _DISK_CONTROLLER_NUMBER {
-  ULONG  ControllerNumber;
-  ULONG  DiskNumber;
-} DISK_CONTROLLER_NUMBER, *PDISK_CONTROLLER_NUMBER;
-
-typedef struct _DISK_INT13_INFO {
-  USHORT  DriveSelect;
-  ULONG  MaxCylinders;
-  USHORT  SectorsPerTrack;
-  USHORT  MaxHeads;
-  USHORT  NumberDrives;
-} DISK_INT13_INFO, *PDISK_INT13_INFO;
-
-typedef struct _DISK_EX_INT13_INFO {
-  USHORT  ExBufferSize;
-  USHORT  ExFlags;
-  ULONG  ExCylinders;
-  ULONG  ExHeads;
-  ULONG  ExSectorsPerTrack;
-  ULONG64  ExSectorsPerDrive;
-  USHORT  ExSectorSize;
-  USHORT  ExReserved;
-} DISK_EX_INT13_INFO, *PDISK_EX_INT13_INFO;
-
-typedef struct _DISK_DETECTION_INFO {
-  ULONG  SizeOfDetectInfo;
-  DETECTION_TYPE  DetectionType;
-  _ANONYMOUS_UNION union {
-    _ANONYMOUS_STRUCT struct {
-      DISK_INT13_INFO  Int13;
-      DISK_EX_INT13_INFO  ExInt13;
-    } DUMMYSTRUCTNAME;
-  } DUMMYUNIONNAME;
-} DISK_DETECTION_INFO, *PDISK_DETECTION_INFO;
-
-typedef struct _DISK_GEOMETRY {
-  LARGE_INTEGER  Cylinders;
-  MEDIA_TYPE  MediaType;
-  ULONG  TracksPerCylinder;
-  ULONG  SectorsPerTrack;
-  ULONG  BytesPerSector;
-} DISK_GEOMETRY, *PDISK_GEOMETRY;
-
-typedef struct _DISK_GEOMETRY_EX {
-  DISK_GEOMETRY  Geometry;
-  LARGE_INTEGER  DiskSize;
-  UCHAR  Data[1];
-} DISK_GEOMETRY_EX, *PDISK_GEOMETRY_EX;
-
-#define DiskGeometryGetPartition(Geometry) \
-   ((PDISK_PARTITION_INFO)((Geometry) + 1))
-
-#define DiskGeometryGetDetect(Geometry)\
- ((PDISK_DETECTION_INFO)(((PBYTE)DiskGeometryGetPartition(Geometry) + \
-  DiskGeometryGetPartition(Geometry)->SizeOfPartitionInfo)))
-
-typedef struct _PARTITION_INFORMATION {
-  LARGE_INTEGER  StartingOffset;
-  LARGE_INTEGER  PartitionLength;
-  DWORD  HiddenSectors;
-  DWORD  PartitionNumber;
-  BYTE  PartitionType;
-  BOOLEAN  BootIndicator;
-  BOOLEAN  RecognizedPartition;
-  BOOLEAN  RewritePartition;
-} PARTITION_INFORMATION, *PPARTITION_INFORMATION;
-
-typedef struct _PARTITION_INFORMATION_GPT {
-  GUID  PartitionType;
-  GUID  PartitionId;
-  ULONG64  Attributes;
-  WCHAR Name  [36];
-} PARTITION_INFORMATION_GPT, *PPARTITION_INFORMATION_GPT;
-
-typedef struct _DISK_PARTITION_INFO {
-  ULONG  SizeOfPartitionInfo;
-  PARTITION_STYLE  PartitionStyle;
-  _ANONYMOUS_UNION union {
-    struct {
-      ULONG  Signature;
-      ULONG  CheckSum;
-    } Mbr;
-    struct {
-      GUID  DiskId;
-    } Gpt;
-  } DUMMYUNIONNAME;
-} DISK_PARTITION_INFO, *PDISK_PARTITION_INFO;
-
-typedef struct _DISK_PERFORMANCE {
-  LARGE_INTEGER  BytesRead;
-  LARGE_INTEGER  BytesWritten;
-  LARGE_INTEGER  ReadTime;
-  LARGE_INTEGER  WriteTime;
-  LARGE_INTEGER  IdleTime;
-  ULONG  ReadCount;
-  ULONG  WriteCount;
-  ULONG  QueueDepth;
-  ULONG  SplitCount;
-  LARGE_INTEGER  QueryTime;
-  ULONG  StorageDeviceNumber;
-  WCHAR  StorageManagerName[8];
-} DISK_PERFORMANCE, *PDISK_PERFORMANCE;
-
-typedef struct _PARTITION_INFORMATION_EX {
-  PARTITION_STYLE  PartitionStyle;
-  LARGE_INTEGER  StartingOffset;
-  LARGE_INTEGER  PartitionLength;
-  ULONG  PartitionNumber;
-  BOOLEAN  RewritePartition;
-  _ANONYMOUS_UNION union {
-    PARTITION_INFORMATION_MBR  Mbr;
-    PARTITION_INFORMATION_GPT  Gpt;
-  } DUMMYUNIONNAME;
-} PARTITION_INFORMATION_EX, *PPARTITION_INFORMATION_EX;
-
-typedef struct _FORMAT_EX_PARAMETERS {
-  MEDIA_TYPE  MediaType;
-  ULONG  StartCylinderNumber;
-  ULONG  EndCylinderNumber;
-  ULONG  StartHeadNumber;
-  ULONG  EndHeadNumber;
-  USHORT  FormatGapLength;
-  USHORT  SectorsPerTrack;
-  USHORT  SectorNumber[1];
-} FORMAT_EX_PARAMETERS, *PFORMAT_EX_PARAMETERS;
-
-typedef struct _FORMAT_PARAMETERS {
-  MEDIA_TYPE  MediaType;
-  ULONG  StartCylinderNumber;
-  ULONG  EndCylinderNumber;
-  ULONG  StartHeadNumber;
-  ULONG  EndHeadNumber;
-} FORMAT_PARAMETERS, *PFORMAT_PARAMETERS;
-
-typedef struct _GET_LENGTH_INFORMATION {
-  LARGE_INTEGER  Length;
-} GET_LENGTH_INFORMATION, *PGET_LENGTH_INFORMATION;
-
-typedef struct _REASSIGN_BLOCKS {
-  WORD  Reserved;
-  WORD  Count;
-  DWORD  BlockNumber[1];
-} REASSIGN_BLOCKS, *PREASSIGN_BLOCKS;
-
-typedef struct _SET_PARTITION_INFORMATION {
-  UCHAR  PartitionType;
-} SET_PARTITION_INFORMATION, *PSET_PARTITION_INFORMATION;
-
-typedef SET_PARTITION_INFORMATION SET_PARTITION_INFORMATION_MBR;
-typedef PARTITION_INFORMATION_GPT SET_PARTITION_INFORMATION_GPT;
-
-typedef struct _SET_PARTITION_INFORMATION_EX {
-  PARTITION_STYLE  PartitionStyle;
-  _ANONYMOUS_UNION union {
-    SET_PARTITION_INFORMATION_MBR  Mbr;
-    SET_PARTITION_INFORMATION_GPT  Gpt;
-  } DUMMYUNIONNAME;
-} SET_PARTITION_INFORMATION_EX, *PSET_PARTITION_INFORMATION_EX;
-
-typedef struct _VERIFY_INFORMATION {
-  LARGE_INTEGER  StartingOffset;
-  DWORD  Length;
-} VERIFY_INFORMATION, *PVERIFY_INFORMATION;
-
-typedef enum {
-	EqualPriority,
-	KeepPrefetchedData,
-	KeepReadData
-} DISK_CACHE_RETENTION_PRIORITY;
-
-typedef struct _DISK_CACHE_INFORMATION {
-	BOOLEAN  ParametersSavable;
-	BOOLEAN  ReadCacheEnabled;
-	BOOLEAN  WriteCacheEnabled;
-	DISK_CACHE_RETENTION_PRIORITY  ReadRetentionPriority;
-	DISK_CACHE_RETENTION_PRIORITY  WriteRetentionPriority;
-	USHORT  DisablePrefetchTransferLength;
-	BOOLEAN  PrefetchScalar;
-	_ANONYMOUS_UNION union {
-		struct {
-			USHORT  Minimum;
-			USHORT  Maximum;
-			USHORT  MaximumBlocks;
-		} ScalarPrefetch;
-		struct {
-			USHORT  Minimum;
-			USHORT  Maximum;
-		} BlockPrefetch;
-	} DUMMYUNIONNAME;
-} DISK_CACHE_INFORMATION, *PDISK_CACHE_INFORMATION;
-
-typedef struct _DISK_GROW_PARTITION {
-  ULONG  PartitionNumber;
-  LARGE_INTEGER  BytesToGrow;
-} DISK_GROW_PARTITION, *PDISK_GROW_PARTITION;
-
-/* GETVERSIONINPARAMS.fCapabilities constants */
-#define CAP_ATA_ID_CMD                    1
-#define CAP_ATAPI_ID_CMD                  2
-#define CAP_SMART_CMD                     4
-
-typedef struct _GETVERSIONINPARAMS {
-	UCHAR  bVersion;
-	UCHAR  bRevision;
-	UCHAR  bReserved;
-	UCHAR  bIDEDeviceMap;
-	ULONG  fCapabilities;
-	ULONG  dwReserved[4];
-} GETVERSIONINPARAMS, *PGETVERSIONINPARAMS, *LPGETVERSIONINPARAMS;
-
-/* IDEREGS.bCommandReg constants */
-#define ATAPI_ID_CMD                      0xA1
-#define ID_CMD                            0xEC
-#define SMART_CMD                         0xB0
-
-#define SMART_CYL_LOW                     0x4F
-#define SMART_CYL_HI                      0xC2
-
-typedef struct _IDEREGS {
-	UCHAR  bFeaturesReg;
-	UCHAR  bSectorCountReg;
-	UCHAR  bSectorNumberReg;
-	UCHAR  bCylLowReg;
-	UCHAR  bCylHighReg;
-	UCHAR  bDriveHeadReg;
-	UCHAR  bCommandReg;
-	UCHAR  bReserved;
-} IDEREGS, *PIDEREGS, *LPIDEREGS;
-
-typedef struct _SENDCMDINPARAMS {
-	ULONG  cBufferSize;
-	IDEREGS  irDriveRegs;
-	UCHAR  bDriveNumber;
-	UCHAR  bReserved[3];
-	ULONG  dwReserved[4];
-	UCHAR  bBuffer[1];
-} SENDCMDINPARAMS, *PSENDCMDINPARAMS, *LPSENDCMDINPARAMS;
-
-/* DRIVERSTATUS.bDriverError constants */
-#define SMART_NO_ERROR                    0
-#define SMART_IDE_ERROR                   1
-#define SMART_INVALID_FLAG                2
-#define SMART_INVALID_COMMAND             3
-#define SMART_INVALID_BUFFER              4
-#define SMART_INVALID_DRIVE               5
-#define SMART_INVALID_IOCTL               6
-#define SMART_ERROR_NO_MEM                7
-#define SMART_INVALID_REGISTER            8
-#define SMART_NOT_SUPPORTED               9
-#define SMART_NO_IDE_DEVICE               10
-
-#define SMART_OFFLINE_ROUTINE_OFFLINE     0
-#define SMART_SHORT_SELFTEST_OFFLINE      1
-#define SMART_EXTENDED_SELFTEST_OFFLINE   2
-#define SMART_ABORT_OFFLINE_SELFTEST      127
-#define SMART_SHORT_SELFTEST_CAPTIVE      129
-#define SMART_EXTENDED_SELFTEST_CAPTIVE   130
-
-typedef struct _DRIVERSTATUS {
-	UCHAR  bDriverError;
-	UCHAR  bIDEError;
-	UCHAR  bReserved[2];
-	ULONG  dwReserved[2];
-} DRIVERSTATUS, *PDRIVERSTATUS, *LPDRIVERSTATUS;
-
-#define READ_ATTRIBUTE_BUFFER_SIZE        512
-#define IDENTIFY_BUFFER_SIZE              512
-#define READ_THRESHOLD_BUFFER_SIZE        512
-#define SMART_LOG_SECTOR_SIZE             512
-
-typedef struct _SENDCMDOUTPARAMS {
-	ULONG  cBufferSize;
-	DRIVERSTATUS  DriverStatus;
-	UCHAR  bBuffer[1];
-} SENDCMDOUTPARAMS, *PSENDCMDOUTPARAMS, *LPSENDCMDOUTPARAMS;
-
-#define READ_ATTRIBUTES                   0xD0
-#define READ_THRESHOLDS                   0xD1
-#define ENABLE_DISABLE_AUTOSAVE           0xD2
-#define SAVE_ATTRIBUTE_VALUES             0xD3
-#define EXECUTE_OFFLINE_DIAGS             0xD4
-#define SMART_READ_LOG                    0xD5
-#define SMART_WRITE_LOG                   0xd6
-#define ENABLE_SMART                      0xD8
-#define DISABLE_SMART                     0xD9
-#define RETURN_SMART_STATUS               0xDA
-#define ENABLE_DISABLE_AUTO_OFFLINE       0xDB
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDDISK_H */
diff --git a/winsup/w32api/include/ddk/ntddk.h b/winsup/w32api/include/ddk/ntddk.h
deleted file mode 100644
index 480ff0ccf..000000000
--- a/winsup/w32api/include/ddk/ntddk.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * ntddk.h
- *
- * Windows Device Driver Kit
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * DEFINES:
- *    DBG          - Debugging enabled/disabled (0/1)
- *    POOL_TAGGING - Enable pool tagging
- *    _X86_        - X86 environment
- */
-
-#ifndef __NTDDK_H
-#define __NTDDK_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include <stdarg.h>
-#include <windef.h>
-#include <ntdef.h>
-#include <basetyps.h>
-
-/* Base types, structures and definitions */
-typedef short CSHORT;
-typedef CONST int CINT;
-typedef CONST char *PCSZ;
-
-#ifndef STATIC
-#define STATIC static
-#endif
-
-#ifndef CALLBACK
-#define CALLBACK
-#endif
-
-#ifndef DECL_IMPORT
-#define DECL_IMPORT __attribute__((dllimport))
-#endif
-
-#ifndef DECL_EXPORT
-#define DECL_EXPORT __attribute__((dllexport))
-#endif
-
-/* Windows NT status codes */
-#include "ntstatus.h"
-
-/* Windows NT definitions exported to user mode */
-#include <winnt.h>
-
-/* Windows Device Driver Kit */
-#include "winddk.h"
-
-/* Definitions only in Windows XP */
-#include "winxp.h"
-
-/* Definitions only in Windows 2000 */
-#include "win2k.h"
-
-/* Definitions only in Windows NT 4 */
-#include "winnt4.h"
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDK_H */
diff --git a/winsup/w32api/include/ddk/ntddkbd.h b/winsup/w32api/include/ddk/ntddkbd.h
deleted file mode 100644
index 9a1a358a3..000000000
--- a/winsup/w32api/include/ddk/ntddkbd.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * ntddkbd.h
- *
- * Keyboard IOCTL interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDKBD_H
-#define __NTDDKBD_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define DD_KEYBOARD_DEVICE_NAME           "\\Device\\KeyboardClass"
-#define DD_KEYBOARD_DEVICE_NAME_U         L"\\Device\\KeyboardClass"
-
-#define IOCTL_KEYBOARD_QUERY_ATTRIBUTES \
-  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_KEYBOARD_QUERY_INDICATORS \
-  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0010, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION \
-  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0020, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_KEYBOARD_QUERY_TYPEMATIC \
-  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0008, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_KEYBOARD_SET_TYPEMATIC \
-  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0001, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_KEYBOARD_SET_INDICATORS \
-  CTL_CODE(FILE_DEVICE_KEYBOARD, 0x0002, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-
-DEFINE_GUID(GUID_DEVINTERFACE_KEYBOARD, \
-  0x884b96c3, 0x56ef, 0x11d1, 0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd);
-
-#define KEYBOARD_ERROR_VALUE_BASE         10000
-
-/* KEYBOARD_INPUT_DATA.MakeCode constants */
-#define KEYBOARD_OVERRUN_MAKE_CODE        0xFF
-
-/* KEYBOARD_INPUT_DATA.Flags constants */
-#define KEY_MAKE                          0
-#define KEY_BREAK                         1
-#define KEY_E0                            2
-#define KEY_E1                            4
-
-typedef struct _KEYBOARD_INPUT_DATA {
-  USHORT  UnitId;
-  USHORT  MakeCode;
-  USHORT  Flags;
-  USHORT  Reserved;
-  ULONG  ExtraInformation;
-} KEYBOARD_INPUT_DATA, *PKEYBOARD_INPUT_DATA;
-
-
-typedef struct _KEYBOARD_TYPEMATIC_PARAMETERS {
-	USHORT  UnitId;
-	USHORT  Rate;
-	USHORT  Delay;
-} KEYBOARD_TYPEMATIC_PARAMETERS, *PKEYBOARD_TYPEMATIC_PARAMETERS;
-
-typedef struct _KEYBOARD_ID {
-	UCHAR  Type;
-	UCHAR  Subtype;
-} KEYBOARD_ID, *PKEYBOARD_ID;
-
-#define ENHANCED_KEYBOARD(Id) ((Id).Type == 2 || (Id).Type == 4 || FAREAST_KEYBOARD(Id))
-#define FAREAST_KEYBOARD(Id)  ((Id).Type == 7 || (Id).Type == 8)
-
-typedef struct _KEYBOARD_INDICATOR_PARAMETERS {
-  USHORT  UnitId;
-  USHORT  LedFlags;
-} KEYBOARD_INDICATOR_PARAMETERS, *PKEYBOARD_INDICATOR_PARAMETERS;
-
-typedef struct _INDICATOR_LIST {
-  USHORT  MakeCode;
-  USHORT  IndicatorFlags;
-} INDICATOR_LIST, *PINDICATOR_LIST;
-
-typedef struct _KEYBOARD_INDICATOR_TRANSLATION {
-  USHORT  NumberOfIndicatorKeys;
-  INDICATOR_LIST  IndicatorList[1];
-} KEYBOARD_INDICATOR_TRANSLATION, *PKEYBOARD_INDICATOR_TRANSLATION;
-
-typedef struct _KEYBOARD_ATTRIBUTES {
-	KEYBOARD_ID  KeyboardIdentifier;
-	USHORT  KeyboardMode;
-	USHORT  NumberOfFunctionKeys;
-	USHORT  NumberOfIndicators;
-	USHORT  NumberOfKeysTotal;
-	ULONG  InputDataQueueLength;
-	KEYBOARD_TYPEMATIC_PARAMETERS  KeyRepeatMinimum;
-	KEYBOARD_TYPEMATIC_PARAMETERS  KeyRepeatMaximum;
-} KEYBOARD_ATTRIBUTES, *PKEYBOARD_ATTRIBUTES;
-
-typedef struct _KEYBOARD_UNIT_ID_PARAMETER {
-  USHORT  UnitId;
-} KEYBOARD_UNIT_ID_PARAMETER, *PKEYBOARD_UNIT_ID_PARAMETER;
-
-typedef struct _KEYBOARD_IME_STATUS {
-	USHORT  UnitId;
-	ULONG  ImeOpen;
-	ULONG  ImeConvMode;
-} KEYBOARD_IME_STATUS, *PKEYBOARD_IME_STATUS;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDKBD_H */
diff --git a/winsup/w32api/include/ddk/ntddmou.h b/winsup/w32api/include/ddk/ntddmou.h
deleted file mode 100644
index 457b9d96e..000000000
--- a/winsup/w32api/include/ddk/ntddmou.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * ntddmou.h
- *
- * Mouse device IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDMOU_H
-#define __NTDDMOU_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define DD_MOUSE_DEVICE_NAME              "\\Device\\PointerClass"
-#define DD_MOUSE_DEVICE_NAME_U            L"\\Device\\PointerClass"
-
-#define IOCTL_MOUSE_QUERY_ATTRIBUTES \
-  CTL_CODE(FILE_DEVICE_MOUSE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-DEFINE_GUID(GUID_DEVINTERFACE_MOUSE, \
-  0x378de44c, 0x56ef, 0x11d1, 0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd);
-
-#define MOUSE_ERROR_VALUE_BASE            20000
-
-/* MOUSE_INPUT_DATA.ButtonFlags constants */
-#define MOUSE_LEFT_BUTTON_DOWN            0x0001
-#define MOUSE_LEFT_BUTTON_UP              0x0002
-#define MOUSE_RIGHT_BUTTON_DOWN           0x0004
-#define MOUSE_RIGHT_BUTTON_UP             0x0008
-#define MOUSE_MIDDLE_BUTTON_DOWN          0x0010
-#define MOUSE_MIDDLE_BUTTON_UP            0x0020
-#define MOUSE_BUTTON_4_DOWN               0x0040
-#define MOUSE_BUTTON_4_UP                 0x0080
-#define MOUSE_BUTTON_5_DOWN               0x0100
-#define MOUSE_BUTTON_5_UP                 0x0200
-#define MOUSE_WHEEL                       0x0400
-
-#define MOUSE_BUTTON_1_DOWN               MOUSE_LEFT_BUTTON_DOWN
-#define MOUSE_BUTTON_1_UP                 MOUSE_LEFT_BUTTON_UP
-#define MOUSE_BUTTON_2_DOWN               MOUSE_RIGHT_BUTTON_DOWN
-#define MOUSE_BUTTON_2_UP                 MOUSE_RIGHT_BUTTON_UP
-#define MOUSE_BUTTON_3_DOWN               MOUSE_MIDDLE_BUTTON_DOWN
-#define MOUSE_BUTTON_3_UP                 MOUSE_MIDDLE_BUTTON_UP
-
-/* MOUSE_INPUT_DATA.Flags constants */
-#define MOUSE_MOVE_RELATIVE               0
-#define MOUSE_MOVE_ABSOLUTE               1
-#define MOUSE_VIRTUAL_DESKTOP             0x02
-#define MOUSE_ATTRIBUTES_CHANGED          0x04
-
-typedef struct _MOUSE_INPUT_DATA {
-	USHORT  UnitId;
-	USHORT  Flags;
-	_ANONYMOUS_UNION union {
-		ULONG Buttons;
-		_ANONYMOUS_STRUCT struct  {
-			USHORT  ButtonFlags;
-			USHORT  ButtonData;
-		} DUMMYSTRUCTNAME;
-	} DUMMYUNIONNAME;
-	ULONG  RawButtons;
-	LONG  LastX;
-	LONG  LastY;
-	ULONG  ExtraInformation;
-} MOUSE_INPUT_DATA, *PMOUSE_INPUT_DATA;
-
-typedef struct _MOUSE_UNIT_ID_PARAMETER {
-  USHORT  UnitId;
-} MOUSE_UNIT_ID_PARAMETER, *PMOUSE_UNIT_ID_PARAMETER;
-
-/* MOUSE_ATTRIBUTES.MouseIdentifier constants */
-#define MOUSE_INPORT_HARDWARE             0x0001
-#define MOUSE_I8042_HARDWARE              0x0002
-#define MOUSE_SERIAL_HARDWARE             0x0004
-#define BALLPOINT_I8042_HARDWARE          0x0008
-#define BALLPOINT_SERIAL_HARDWARE         0x0010
-#define WHEELMOUSE_I8042_HARDWARE         0x0020
-#define WHEELMOUSE_SERIAL_HARDWARE        0x0040
-#define MOUSE_HID_HARDWARE                0x0080
-#define WHEELMOUSE_HID_HARDWARE           0x0100
-
-typedef struct _MOUSE_ATTRIBUTES {
-  USHORT  MouseIdentifier;
-  USHORT  NumberOfButtons;
-  USHORT  SampleRate;
-  ULONG  InputDataQueueLength;
-} MOUSE_ATTRIBUTES, *PMOUSE_ATTRIBUTES;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDMOU_H */
diff --git a/winsup/w32api/include/ddk/ntddndis.h b/winsup/w32api/include/ddk/ntddndis.h
deleted file mode 100644
index 06b2cd045..000000000
--- a/winsup/w32api/include/ddk/ntddndis.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * ntddndis.h
- *
- * NDIS device driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDNDIS_H
-#define __NTDDNDIS_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef enum _NDIS_WAN_QUALITY {
-	NdisWanRaw,
-	NdisWanErrorControl,
-	NdisWanReliable
-} NDIS_WAN_QUALITY, *PNDIS_WAN_QUALITY;
-
-typedef enum _NDIS_DEVICE_POWER_STATE {
-  NdisDeviceStateUnspecified = 0,
-  NdisDeviceStateD0,
-  NdisDeviceStateD1,
-  NdisDeviceStateD2,
-  NdisDeviceStateD3,
-  NdisDeviceStateMaximum
-} NDIS_DEVICE_POWER_STATE, *PNDIS_DEVICE_POWER_STATE;
-
-typedef struct _NDIS_PM_WAKE_UP_CAPABILITIES {
-  NDIS_DEVICE_POWER_STATE  MinMagicPacketWakeUp;
-  NDIS_DEVICE_POWER_STATE  MinPatternWakeUp;
-  NDIS_DEVICE_POWER_STATE  MinLinkChangeWakeUp;
-} NDIS_PM_WAKE_UP_CAPABILITIES, *PNDIS_PM_WAKE_UP_CAPABILITIES;
-
-/* NDIS_PNP_CAPABILITIES.Flags constants */
-#define NDIS_DEVICE_WAKE_UP_ENABLE                0x00000001
-#define NDIS_DEVICE_WAKE_ON_PATTERN_MATCH_ENABLE  0x00000002
-#define NDIS_DEVICE_WAKE_ON_MAGIC_PACKET_ENABLE   0x00000004
-
-typedef struct _NDIS_PNP_CAPABILITIES {
-  ULONG  Flags;
-  NDIS_PM_WAKE_UP_CAPABILITIES  WakeUpCapabilities;
-} NDIS_PNP_CAPABILITIES, *PNDIS_PNP_CAPABILITIES;
-
-/* Required Object IDs (OIDs) */
-#define OID_GEN_SUPPORTED_LIST            0x00010101
-#define OID_GEN_HARDWARE_STATUS           0x00010102
-#define OID_GEN_MEDIA_SUPPORTED           0x00010103
-#define OID_GEN_MEDIA_IN_USE              0x00010104
-#define OID_GEN_MAXIMUM_LOOKAHEAD         0x00010105
-#define OID_GEN_MAXIMUM_FRAME_SIZE        0x00010106
-#define OID_GEN_LINK_SPEED                0x00010107
-#define OID_GEN_TRANSMIT_BUFFER_SPACE     0x00010108
-#define OID_GEN_RECEIVE_BUFFER_SPACE      0x00010109
-#define OID_GEN_TRANSMIT_BLOCK_SIZE       0x0001010A
-#define OID_GEN_RECEIVE_BLOCK_SIZE        0x0001010B
-#define OID_GEN_VENDOR_ID                 0x0001010C
-#define OID_GEN_VENDOR_DESCRIPTION        0x0001010D
-#define OID_GEN_CURRENT_PACKET_FILTER     0x0001010E
-#define OID_GEN_CURRENT_LOOKAHEAD         0x0001010F
-#define OID_GEN_DRIVER_VERSION            0x00010110
-#define OID_GEN_MAXIMUM_TOTAL_SIZE        0x00010111
-#define OID_GEN_PROTOCOL_OPTIONS          0x00010112
-#define OID_GEN_MAC_OPTIONS               0x00010113
-#define OID_GEN_MEDIA_CONNECT_STATUS      0x00010114
-#define OID_GEN_MAXIMUM_SEND_PACKETS      0x00010115
-#define OID_GEN_VENDOR_DRIVER_VERSION     0x00010116
-#define OID_GEN_SUPPORTED_GUIDS           0x00010117
-#define OID_GEN_NETWORK_LAYER_ADDRESSES   0x00010118
-#define OID_GEN_TRANSPORT_HEADER_OFFSET   0x00010119
-#define OID_GEN_MACHINE_NAME              0x0001021A
-#define OID_GEN_RNDIS_CONFIG_PARAMETER    0x0001021B
-#define OID_GEN_VLAN_ID                   0x0001021C
-
-/* Optional OIDs */
-#define OID_GEN_MEDIA_CAPABILITIES        0x00010201
-#define OID_GEN_PHYSICAL_MEDIUM           0x00010202
-
-/* Required statistics OIDs */
-#define OID_GEN_XMIT_OK                   0x00020101
-#define OID_GEN_RCV_OK                    0x00020102
-#define OID_GEN_XMIT_ERROR                0x00020103
-#define OID_GEN_RCV_ERROR                 0x00020104
-#define OID_GEN_RCV_NO_BUFFER             0x00020105
-
-/* Optional statistics OIDs */
-#define OID_GEN_DIRECTED_BYTES_XMIT       0x00020201
-#define OID_GEN_DIRECTED_FRAMES_XMIT      0x00020202
-#define OID_GEN_MULTICAST_BYTES_XMIT      0x00020203
-#define OID_GEN_MULTICAST_FRAMES_XMIT     0x00020204
-#define OID_GEN_BROADCAST_BYTES_XMIT      0x00020205
-#define OID_GEN_BROADCAST_FRAMES_XMIT     0x00020206
-#define OID_GEN_DIRECTED_BYTES_RCV        0x00020207
-#define OID_GEN_DIRECTED_FRAMES_RCV       0x00020208
-#define OID_GEN_MULTICAST_BYTES_RCV       0x00020209
-#define OID_GEN_MULTICAST_FRAMES_RCV      0x0002020A
-#define OID_GEN_BROADCAST_BYTES_RCV       0x0002020B
-#define OID_GEN_BROADCAST_FRAMES_RCV      0x0002020C
-#define OID_GEN_RCV_CRC_ERROR             0x0002020D
-#define OID_GEN_TRANSMIT_QUEUE_LENGTH     0x0002020E
-#define OID_GEN_GET_TIME_CAPS             0x0002020F
-#define OID_GEN_GET_NETCARD_TIME          0x00020210
-#define OID_GEN_NETCARD_LOAD              0x00020211
-#define OID_GEN_DEVICE_PROFILE            0x00020212
-#define OID_GEN_INIT_TIME_MS              0x00020213
-#define OID_GEN_RESET_COUNTS              0x00020214
-#define OID_GEN_MEDIA_SENSE_COUNTS        0x00020215
-#define OID_GEN_FRIENDLY_NAME             0x00020216
-#define OID_GEN_MINIPORT_INFO             0x00020217
-#define OID_GEN_RESET_VERIFY_PARAMETERS   0x00020218
-
-/* IEEE 802.3 (Ethernet) OIDs */
-#define NDIS_802_3_MAC_OPTION_PRIORITY    0x00000001
-
-#define OID_802_3_PERMANENT_ADDRESS       0x01010101
-#define OID_802_3_CURRENT_ADDRESS         0x01010102
-#define OID_802_3_MULTICAST_LIST          0x01010103
-#define OID_802_3_MAXIMUM_LIST_SIZE       0x01010104
-#define OID_802_3_MAC_OPTIONS             0x01010105
-#define OID_802_3_RCV_ERROR_ALIGNMENT     0x01020101
-#define OID_802_3_XMIT_ONE_COLLISION      0x01020102
-#define OID_802_3_XMIT_MORE_COLLISIONS    0x01020103
-#define OID_802_3_XMIT_DEFERRED           0x01020201
-#define OID_802_3_XMIT_MAX_COLLISIONS     0x01020202
-#define OID_802_3_RCV_OVERRUN             0x01020203
-#define OID_802_3_XMIT_UNDERRUN           0x01020204
-#define OID_802_3_XMIT_HEARTBEAT_FAILURE  0x01020205
-#define OID_802_3_XMIT_TIMES_CRS_LOST     0x01020206
-#define OID_802_3_XMIT_LATE_COLLISIONS    0x01020207
-
-/* OID_GEN_MINIPORT_INFO constants */
-#define NDIS_MINIPORT_BUS_MASTER                      0x00000001
-#define NDIS_MINIPORT_WDM_DRIVER                      0x00000002
-#define NDIS_MINIPORT_SG_LIST                         0x00000004
-#define NDIS_MINIPORT_SUPPORTS_MEDIA_QUERY            0x00000008
-#define NDIS_MINIPORT_INDICATES_PACKETS               0x00000010
-#define NDIS_MINIPORT_IGNORE_PACKET_QUEUE             0x00000020
-#define NDIS_MINIPORT_IGNORE_REQUEST_QUEUE            0x00000040
-#define NDIS_MINIPORT_IGNORE_TOKEN_RING_ERRORS        0x00000080
-#define NDIS_MINIPORT_INTERMEDIATE_DRIVER             0x00000100
-#define NDIS_MINIPORT_IS_NDIS_5                       0x00000200
-#define NDIS_MINIPORT_IS_CO                           0x00000400
-#define NDIS_MINIPORT_DESERIALIZE                     0x00000800
-#define NDIS_MINIPORT_REQUIRES_MEDIA_POLLING          0x00001000
-#define NDIS_MINIPORT_SUPPORTS_MEDIA_SENSE            0x00002000
-#define NDIS_MINIPORT_NETBOOT_CARD                    0x00004000
-#define NDIS_MINIPORT_PM_SUPPORTED                    0x00008000
-#define NDIS_MINIPORT_SUPPORTS_MAC_ADDRESS_OVERWRITE  0x00010000
-#define NDIS_MINIPORT_USES_SAFE_BUFFER_APIS           0x00020000
-#define NDIS_MINIPORT_HIDDEN                          0x00040000
-#define NDIS_MINIPORT_SWENUM                          0x00080000
-#define NDIS_MINIPORT_SURPRISE_REMOVE_OK              0x00100000
-#define NDIS_MINIPORT_NO_HALT_ON_SUSPEND              0x00200000
-#define NDIS_MINIPORT_HARDWARE_DEVICE                 0x00400000
-#define NDIS_MINIPORT_SUPPORTS_CANCEL_SEND_PACKETS    0x00800000
-#define NDIS_MINIPORT_64BITS_DMA                      0x01000000
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDNDIS_H */
diff --git a/winsup/w32api/include/ddk/ntddpar.h b/winsup/w32api/include/ddk/ntddpar.h
deleted file mode 100644
index 2f88c39c4..000000000
--- a/winsup/w32api/include/ddk/ntddpar.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * ntddpar.h
- *
- * Parallel port driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDPAR_H
-#define __NTDDPAR_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-/* Parallel port device GUIDs */
-
-DEFINE_GUID (GUID_DEVINTERFACE_PARALLEL,
-  0x97F76EF0, 0xF883, 0x11D0, 0xAF, 0x1F, 0x00, 0x00, 0xF8, 0x00, 0x84, 0x5C);
-DEFINE_GUID (GUID_DEVINTERFACE_PARCLASS,
-  0x811FC6A5, 0xF728, 0x11D0, 0xA5, 0x37, 0x00, 0x00, 0xF8, 0x75, 0x3E, 0xD1);
-
-#define GUID_PARALLEL_DEVICE GUID_DEVINTERFACE_PARALLEL
-#define GUID_PARCLASS_DEVICE GUID_DEVINTERFACE_PARCLASS
-
-
-#define IOCTL_IEEE1284_GET_MODE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 5, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_IEEE1284_NEGOTIATE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 6, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_GET_DEFAULT_MODES \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 10, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_GET_DEVICE_CAPS \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 9, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_IS_PORT_FREE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 21, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_QUERY_DEVICE_ID \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 3, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_QUERY_DEVICE_ID_SIZE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_QUERY_INFORMATION \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 1, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_QUERY_LOCATION \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 22, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_QUERY_RAW_DEVICE_ID \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 12, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_SET_INFORMATION \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_SET_READ_ADDRESS \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 8, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_PAR_SET_WRITE_ADDRESS \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 7, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-typedef struct _PAR_DEVICE_ID_SIZE_INFORMATION {
-  ULONG  DeviceIdSize;
-} PAR_DEVICE_ID_SIZE_INFORMATION, *PPAR_DEVICE_ID_SIZE_INFORMATION;
-
-#define PARALLEL_INIT                     0x01
-#define PARALLEL_AUTOFEED                 0x02
-#define PARALLEL_PAPER_EMPTY              0x04
-#define PARALLEL_OFF_LINE                 0x08
-#define PARALLEL_POWER_OFF                0x10
-#define PARALLEL_NOT_CONNECTED            0x20
-#define PARALLEL_BUSY                     0x40
-#define PARALLEL_SELECTED                 0x80
-
-typedef struct _PAR_QUERY_INFORMATION {
-  UCHAR  Status;
-} PAR_QUERY_INFORMATION, *PPAR_QUERY_INFORMATION;
-
-typedef struct _PAR_SET_INFORMATION {
-  UCHAR  Init;
-} PAR_SET_INFORMATION, *PPAR_SET_INFORMATION;
-
-typedef struct _PARCLASS_NEGOTIATION_MASK {
-  USHORT  usReadMask;
-  USHORT  usWriteMask;
-} PARCLASS_NEGOTIATION_MASK, *PPARCLASS_NEGOTIATION_MASK;
-
-#define NONE                              0x0000
-#define CENTRONICS                        0x0001
-#define IEEE_COMPATIBILITY                0x0002
-#define NIBBLE                            0x0004
-#define CHANNEL_NIBBLE                    0x0008
-#define BYTE_BIDIR                        0x0010
-#define EPP_HW                            0x0020
-#define EPP_SW                            0x0040
-#define EPP_ANY                           0x0060
-#define BOUNDED_ECP                       0x0080
-#define ECP_HW_NOIRQ                      0x0100
-#define ECP_HW_IRQ                        0x0200
-#define ECP_SW                            0x0400
-#define ECP_ANY                           0x0780
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDPAR_H */
diff --git a/winsup/w32api/include/ddk/ntddpcm.h b/winsup/w32api/include/ddk/ntddpcm.h
deleted file mode 100644
index f16e33d35..000000000
--- a/winsup/w32api/include/ddk/ntddpcm.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * ntddpcm.h
- *
- * PCMCIA IOCTL interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDPCM_H
-#define __NTDDPCM_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define IOCTL_PCMCIA_BASE                 FILE_DEVICE_CONTROLLER
-
-#define DD_PCMCIA_DEVICE_NAME             "\\\\.\\Pcmcia"
-#define DD_PCMCIA_DEVICE_NAME_U           L"\\\\.\\Pcmcia"
-
-#define IOCTL_GET_TUPLE_DATA \
-  CTL_CODE(IOCTL_PCMCIA_BASE, 3000, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_SOCKET_INFORMATION \
-  CTL_CODE(IOCTL_PCMCIA_BASE, 3004, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define DEVICE_IDENTIFIER_LENGTH          64
-#define DRIVER_NAME_LENGTH                32
-#define MANUFACTURER_NAME_LENGTH          64
-
-#define PcmciaInvalidControllerType       0xffffffff
-
-typedef struct _TUPLE_REQUEST {
- USHORT  Socket;
-} TUPLE_REQUEST, *PTUPLE_REQUEST;
-
-typedef enum _PCMCIA_CONTROLLER_CLASS {
-	PcmciaInvalidControllerClass = -1,
-	PcmciaIntelCompatible,
-	PcmciaCardBusCompatible,
-	PcmciaElcController,
-	PcmciaDatabook,     
-	PcmciaPciPcmciaBridge,
-	PcmciaCirrusLogic,  
-	PcmciaTI,           
-	PcmciaTopic,        
-	PcmciaRicoh,        
-	PcmciaDatabookCB,   
-	PcmciaOpti,         
-	PcmciaTrid,         
-	PcmciaO2Micro,      
-	PcmciaNEC,          
-	PcmciaNEC_98                
-} PCMCIA_CONTROLLER_CLASS, *PPCMCIA_CONTROLLER_CLASS;
-
-typedef struct _PCMCIA_SOCKET_INFORMATION {
-	USHORT  Socket;
-	USHORT  TupleCrc;
-	UCHAR  Manufacturer[MANUFACTURER_NAME_LENGTH];
-	UCHAR  Identifier[DEVICE_IDENTIFIER_LENGTH];
-	UCHAR  DriverName[DRIVER_NAME_LENGTH];
-	UCHAR  DeviceFunctionId;
-	UCHAR  Reserved;
-	UCHAR  CardInSocket;
-	UCHAR  CardEnabled;
-	ULONG  ControllerType;
-} PCMCIA_SOCKET_INFORMATION, *PPCMCIA_SOCKET_INFORMATION;
-
-#define PcmciaClassFromControllerType(type)     ((PCMCIA_CONTROLLER_CLASS)((type) & 0xff))
-#define PcmciaModelFromControllerType(type)     (((type) >> 8) & 0x3ffff)
-#define PcmciaRevisionFromControllerType(type)  ((type) >> 26)
-
-
-DEFINE_GUID(GUID_PCMCIA_INTERFACE_STANDARD, \
-  0xbed5dadfL, 0x38fb, 0x11d1, 0x94, 0x62, 0x00, 0xc0, 0x4f, 0xb9, 0x60, 0xee);
-
-typedef ULONG MEMORY_SPACE;
-
-typedef ULONG STDCALL
-(*PPCMCIA_READ_WRITE_CONFIG)(
-  IN PVOID  Context,
-  IN ULONG  WhichSpace,
-  IN PUCHAR  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
-
-#define PCCARD_PCI_CONFIGURATION_SPACE    0
-#define PCCARD_ATTRIBUTE_MEMORY           1
-#define PCCARD_COMMON_MEMORY              2
-#define PCCARD_ATTRIBUTE_MEMORY_INDIRECT  3
-#define PCCARD_COMMON_MEMORY_INDIRECT     4
-
-typedef struct _PCMCIA_BUS_INTERFACE_STANDARD {
-	USHORT  Size;
-	USHORT  Version;
-	PVOID  Context;
-	PINTERFACE_REFERENCE  InterfaceReference;
-	PINTERFACE_DEREFERENCE  InterfaceDereference;
-	PPCMCIA_READ_WRITE_CONFIG ReadConfig; 
-	PPCMCIA_READ_WRITE_CONFIG  WriteConfig;
-} PCMCIA_BUS_INTERFACE_STANDARD, *PPCMCIA_BUS_INTERFACE_STANDARD;
-
-#define PCMCIA_MEMORY_8BIT_ACCESS         0
-#define PCMCIA_MEMORY_16BIT_ACCESS        1
-
-typedef BOOLEAN STDCALL
-(*PPCMCIA_MODIFY_MEMORY_WINDOW)(
-  IN PVOID  Context,
-  IN ULONGLONG  HostBase,
-  IN ULONGLONG  CardBase,
-  IN BOOLEAN  Enable,
-  IN ULONG  WindowSize  OPTIONAL,
-  IN UCHAR  AccessSpeed  OPTIONAL,
-  IN UCHAR  BusWidth  OPTIONAL,
-  IN BOOLEAN  IsAttributeMemory  OPTIONAL);
-
-#define PCMCIA_VPP_0V                     0
-#define PCMCIA_VPP_12V                    1
-#define PCMCIA_VPP_IS_VCC                 2
-
-typedef BOOLEAN STDCALL
-(*PPCMCIA_SET_VPP)(
-  IN PVOID  Context,
-  IN UCHAR  VppLevel);
-
-typedef BOOLEAN STDCALL
-(*PPCMCIA_IS_WRITE_PROTECTED)(
-  IN PVOID  Context);
-
-typedef struct _PCMCIA_INTERFACE_STANDARD {
-	USHORT  Size;
-	USHORT  Version;
-	PINTERFACE_REFERENCE  InterfaceReference;
-	PINTERFACE_DEREFERENCE  InterfaceDereference;
-	PVOID  Context;
-	PPCMCIA_MODIFY_MEMORY_WINDOW  ModifyMemoryWindow;
-	PPCMCIA_SET_VPP  SetVpp;
-	PPCMCIA_IS_WRITE_PROTECTED  IsWriteProtected;
-} PCMCIA_INTERFACE_STANDARD, *PPCMCIA_INTERFACE_STANDARD;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDPCM_H */
diff --git a/winsup/w32api/include/ddk/ntddscsi.h b/winsup/w32api/include/ddk/ntddscsi.h
deleted file mode 100644
index c580ae3c6..000000000
--- a/winsup/w32api/include/ddk/ntddscsi.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * ntddscsi.h
- *
- * SCSI port IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDSCSI_H
-#define __NTDDSCSI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define DD_SCSI_DEVICE_NAME               "\\Device\\ScsiPort"
-#define DD_SCSI_DEVICE_NAME_U             L"\\Device\\ScsiPort"
-
-#define IOCTL_SCSI_BASE                   FILE_DEVICE_CONTROLLER
-
-#define IOCTL_SCSI_GET_INQUIRY_DATA \
-  CTL_CODE(IOCTL_SCSI_BASE, 0x0403, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_SCSI_GET_CAPABILITIES \
-  CTL_CODE(IOCTL_SCSI_BASE, 0x0404, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_SCSI_GET_ADDRESS \
-  CTL_CODE(IOCTL_SCSI_BASE, 0x0406, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_SCSI_MINIPORT \
-  CTL_CODE(IOCTL_SCSI_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_SCSI_PASS_THROUGH \
-  CTL_CODE(IOCTL_SCSI_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_SCSI_PASS_THROUGH_DIRECT \
-  CTL_CODE(IOCTL_SCSI_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_SCSI_RESCAN_BUS \
-  CTL_CODE(IOCTL_SCSI_BASE, 0x0407, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-
-DEFINE_GUID(ScsiRawInterfaceGuid, \
-  0x53f56309L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-DEFINE_GUID(WmiScsiAddressGuid, \
-  0x53f5630fL, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-typedef struct _SCSI_PASS_THROUGH {
-  USHORT  Length;
-  UCHAR  ScsiStatus;
-  UCHAR  PathId;
-  UCHAR  TargetId;
-  UCHAR  Lun;
-  UCHAR  CdbLength;
-  UCHAR  SenseInfoLength;
-  UCHAR  DataIn;
-  ULONG  DataTransferLength;
-  ULONG  TimeOutValue;
-  ULONG_PTR DataBufferOffset;
-  ULONG  SenseInfoOffset;
-  UCHAR  Cdb[16];
-} SCSI_PASS_THROUGH, *PSCSI_PASS_THROUGH;
-
-typedef struct _SCSI_PASS_THROUGH_DIRECT {
-  USHORT  Length;
-  UCHAR  ScsiStatus;
-  UCHAR  PathId;
-  UCHAR  TargetId;
-  UCHAR  Lun;
-  UCHAR  CdbLength;
-  UCHAR  SenseInfoLength;
-  UCHAR  DataIn;
-  ULONG  DataTransferLength;
-  ULONG  TimeOutValue;
-  PVOID  DataBuffer;
-  ULONG  SenseInfoOffset;
-  UCHAR  Cdb[16];
-} SCSI_PASS_THROUGH_DIRECT, *PSCSI_PASS_THROUGH_DIRECT;
-
-typedef struct _SRB_IO_CONTROL { 
-  ULONG  HeaderLength; 
-  UCHAR  Signature[8]; 
-  ULONG  Timeout; 
-  ULONG  ControlCode; 
-  ULONG  ReturnCode; 
-  ULONG  Length; 
-} SRB_IO_CONTROL, *PSRB_IO_CONTROL; 
-
-typedef struct _SCSI_ADDRESS {
-	ULONG  Length;
-	UCHAR  PortNumber;
-	UCHAR  PathId;
-	UCHAR  TargetId;
-	UCHAR  Lun;
-} SCSI_ADDRESS, *PSCSI_ADDRESS;
-
-typedef struct _SCSI_BUS_DATA {
-	UCHAR  NumberOfLogicalUnits;
-	UCHAR  InitiatorBusId;
-	ULONG  InquiryDataOffset;
-}SCSI_BUS_DATA, *PSCSI_BUS_DATA;
-
-typedef struct _SCSI_ADAPTER_BUS_INFO {
-	UCHAR  NumberOfBuses;
-	SCSI_BUS_DATA  BusData[1];
-} SCSI_ADAPTER_BUS_INFO, *PSCSI_ADAPTER_BUS_INFO;
-
-typedef struct _IO_SCSI_CAPABILITIES {
-	ULONG  Length;
-	ULONG  MaximumTransferLength;
-	ULONG  MaximumPhysicalPages;
-	ULONG  SupportedAsynchronousEvents;
-	ULONG  AlignmentMask;
-	BOOLEAN  TaggedQueuing;
-	BOOLEAN  AdapterScansDown;
-	BOOLEAN  AdapterUsesPio;
-} IO_SCSI_CAPABILITIES, *PIO_SCSI_CAPABILITIES;
-
-typedef struct _SCSI_INQUIRY_DATA {
-	UCHAR  PathId;
-	UCHAR  TargetId;
-	UCHAR  Lun;
-	BOOLEAN  DeviceClaimed;
-	ULONG  InquiryDataLength;
-	ULONG  NextInquiryDataOffset;
-	UCHAR  InquiryData[1];
-} SCSI_INQUIRY_DATA, *PSCSI_INQUIRY_DATA;
-
-#define SCSI_IOCTL_DATA_OUT               0
-#define SCSI_IOCTL_DATA_IN                1
-#define SCSI_IOCTL_DATA_UNSPECIFIED       2
-
-typedef struct _DUMP_POINTERS {
-	PADAPTER_OBJECT  AdapterObject;
-	PVOID  MappedRegisterBase;
-	PVOID  DumpData;
-	PVOID  CommonBufferVa;
-	LARGE_INTEGER  CommonBufferPa;
-	ULONG  CommonBufferSize;
-	BOOLEAN  AllocateCommonBuffers;
-	BOOLEAN  UseDiskDump;
-	UCHAR  Spare1[2];
-	PVOID  DeviceObject;
-} DUMP_POINTERS, *PDUMP_POINTERS;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDSCSI_H */
diff --git a/winsup/w32api/include/ddk/ntddser.h b/winsup/w32api/include/ddk/ntddser.h
deleted file mode 100644
index 1a3fb1c09..000000000
--- a/winsup/w32api/include/ddk/ntddser.h
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * ntddser.h
- *
- * Serial port driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDSER_H
-#define __NTDDSER_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-/* GUIDs */
-
-DEFINE_GUID(GUID_DEVINTERFACE_COMPORT,
-  0x86e0d1e0L, 0x8089, 0x11d0, 0x9c, 0xe4, 0x08, 0x00, 0x3e, 0x30, 0x1f, 0x73);
-
-DEFINE_GUID(GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR,
-  0x4D36E978L, 0xE325, 0x11CE, 0xBF, 0xC1, 0x08, 0x00, 0x2B, 0xE1, 0x03, 0x18);
-
-#define IOCTL_SERIAL_CLEAR_STATS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 36, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_CLR_DTR \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 10, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_CLR_RTS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 13, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_CONFIG_SIZE \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 32, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_BAUD_RATE \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 20, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_CHARS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 22, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_COMMSTATUS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 27, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_DTRRTS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 30, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_HANDFLOW \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 24, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_LINE_CONTROL \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 21, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_MODEM_CONTROL \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 37, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_MODEMSTATUS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 26, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_PROPERTIES \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 29, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_STATS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 35, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_TIMEOUTS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 8, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_GET_WAIT_MASK \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 16, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_IMMEDIATE_CHAR \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 6, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_LSRMST_INSERT \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 31, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_PURGE \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 19, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_RESET_DEVICE \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 11, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_BAUD_RATE \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 1, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_BREAK_ON \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_BREAK_OFF \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 5, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_CHARS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 23, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_DTR \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 9, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_FIFO_CONTROL \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 39, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_HANDFLOW \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 25, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_LINE_CONTROL \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 3, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_MODEM_CONTROL \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 38, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_QUEUE_SIZE \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_RTS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 12, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_TIMEOUTS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 7, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_WAIT_MASK \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 17, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_XOFF \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 14, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_SET_XON \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 15, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_WAIT_ON_MASK \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 18, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_XOFF_COUNTER \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 28, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_SERIAL_INTERNAL_BASIC_SETTINGS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 3, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_INTERNAL_CANCEL_WAIT_WAKE \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_INTERNAL_DO_WAIT_WAKE \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 1, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERIAL_INTERNAL_RESTORE_SETTINGS \
-  CTL_CODE (FILE_DEVICE_SERIAL_PORT, 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_SERENUM_PORT_DESC \
-  CTL_CODE (FILE_DEVICE_SERENUM, 130, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_SERENUM_GET_PORT_NAME \
-  CTL_CODE (FILE_DEVICE_SERENUM, 131, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_SERENUM_REMOVE_SELF \
-  CTL_CODE (FILE_DEVICE_SERENUM, 129, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-
-typedef struct _SERIAL_BAUD_RATE {
-  ULONG  BaudRate;
-} SERIAL_BAUD_RATE, *PSERIAL_BAUD_RATE;
-
-/* SERIAL_BAUD_RATE.BaudRate constants */
-#define SERIAL_BAUD_075                   0x00000001
-#define SERIAL_BAUD_110                   0x00000002
-#define SERIAL_BAUD_134_5                 0x00000004
-#define SERIAL_BAUD_150                   0x00000008
-#define SERIAL_BAUD_300                   0x00000010
-#define SERIAL_BAUD_600                   0x00000020
-#define SERIAL_BAUD_1200                  0x00000040
-#define SERIAL_BAUD_1800                  0x00000080
-#define SERIAL_BAUD_2400                  0x00000100
-#define SERIAL_BAUD_4800                  0x00000200
-#define SERIAL_BAUD_7200                  0x00000400
-#define SERIAL_BAUD_9600                  0x00000800
-#define SERIAL_BAUD_14400                 0x00001000
-#define SERIAL_BAUD_19200                 0x00002000
-#define SERIAL_BAUD_38400                 0x00004000
-#define SERIAL_BAUD_56K                   0x00008000
-#define SERIAL_BAUD_128K                  0x00010000
-#define SERIAL_BAUD_115200                0x00020000
-#define SERIAL_BAUD_57600                 0x00040000
-#define SERIAL_BAUD_USER                  0x10000000
-
-typedef struct _SERIAL_CHARS {
-  UCHAR  EofChar;
-  UCHAR  ErrorChar;
-  UCHAR  BreakChar;
-  UCHAR  EventChar;
-  UCHAR  XonChar;
-  UCHAR  XoffChar;
-} SERIAL_CHARS, *PSERIAL_CHARS;
-
-typedef struct _SERIAL_STATUS {
-  ULONG  Errors;
-  ULONG  HoldReasons;
-  ULONG  AmountInInQueue;
-  ULONG  AmountInOutQueue;
-  BOOLEAN  EofReceived;
-  BOOLEAN  WaitForImmediate;
-} SERIAL_STATUS, *PSERIAL_STATUS;
-
-typedef struct _SERIAL_HANDFLOW {
-	ULONG  ControlHandShake;
-	ULONG  FlowReplace;
-	LONG  XonLimit;
-	LONG  XoffLimit;
-} SERIAL_HANDFLOW, *PSERIAL_HANDFLOW;
-
-#define SERIAL_DTR_MASK                   0x00000003
-#define SERIAL_DTR_CONTROL                0x00000001
-#define SERIAL_DTR_HANDSHAKE              0x00000002
-#define SERIAL_CTS_HANDSHAKE              0x00000008
-#define SERIAL_DSR_HANDSHAKE              0x00000010
-#define SERIAL_DCD_HANDSHAKE              0x00000020
-#define SERIAL_OUT_HANDSHAKEMASK          0x00000038
-#define SERIAL_DSR_SENSITIVITY            0x00000040
-#define SERIAL_ERROR_ABORT                0x80000000
-#define SERIAL_CONTROL_INVALID            0x7fffff84
-#define SERIAL_AUTO_TRANSMIT              0x00000001
-#define SERIAL_AUTO_RECEIVE               0x00000002
-#define SERIAL_ERROR_CHAR                 0x00000004
-#define SERIAL_NULL_STRIPPING             0x00000008
-#define SERIAL_BREAK_CHAR                 0x00000010
-#define SERIAL_RTS_MASK                   0x000000c0
-#define SERIAL_RTS_CONTROL                0x00000040
-#define SERIAL_RTS_HANDSHAKE              0x00000080
-#define SERIAL_TRANSMIT_TOGGLE            0x000000c0
-#define SERIAL_XOFF_CONTINUE              0x80000000
-#define SERIAL_FLOW_INVALID               0x7fffff20
-
-typedef struct _SERIAL_LINE_CONTROL {
-  UCHAR  StopBits;
-  UCHAR  Parity;
-  UCHAR  WordLength;
-} SERIAL_LINE_CONTROL, *PSERIAL_LINE_CONTROL;
-
-/* SERIAL_LINE_CONTROL.StopBits constants */
-#define STOP_BIT_1                        0x00
-#define STOP_BITS_1_5                     0x01
-#define STOP_BITS_2                       0x02
-
-/* SERIAL_LINE_CONTROL.Parity constants */
-#define NO_PARITY                         0x00
-#define ODD_PARITY                        0x01
-#define EVEN_PARITY                       0x02
-#define MARK_PARITY                       0x03
-#define SPACE_PARITY                      0x04
-
-/* IOCTL_SERIAL_(GET_MODEM_CONTROL, SET_MODEM_CONTROL) flags */
-#define SERIAL_IOC_MCR_DTR                0x00000001
-#define SERIAL_IOC_MCR_RTS                0x00000002
-#define SERIAL_IOC_MCR_OUT1               0x00000004
-#define SERIAL_IOC_MCR_OUT2               0x00000008
-#define SERIAL_IOC_MCR_LOOP               0x00000010
-
-typedef struct _SERIAL_COMMPROP {
-  USHORT  PacketLength;
-  USHORT  PacketVersion;
-  ULONG  ServiceMask;
-  ULONG  Reserved1;
-  ULONG  MaxTxQueue;
-  ULONG  MaxRxQueue;
-  ULONG  MaxBaud;
-  ULONG  ProvSubType;
-  ULONG  ProvCapabilities;
-  ULONG  SettableParams;
-  ULONG  SettableBaud;
-  USHORT  SettableData;
-  USHORT  SettableStopParity;
-  ULONG  CurrentTxQueue;
-  ULONG  CurrentRxQueue;
-  ULONG  ProvSpec1;
-  ULONG  ProvSpec2;
-  WCHAR  ProvChar[1];
-} SERIAL_COMMPROP, *PSERIAL_COMMPROP;
-
-/* SERIAL_COMMPROP.SettableParams flags */
-#define SERIAL_SP_PARITY                  0x0001
-#define SERIAL_SP_BAUD                    0x0002
-#define SERIAL_SP_DATABITS                0x0004
-#define SERIAL_SP_STOPBITS                0x0008
-#define SERIAL_SP_HANDSHAKING             0x0010
-#define SERIAL_SP_PARITY_CHECK            0x0020
-#define SERIAL_SP_CARRIER_DETECT          0x0040
-
-/* SERIAL_COMMPROP.ProvCapabilities flags */
-#define SERIAL_PCF_DTRDSR                 0x00000001
-#define SERIAL_PCF_RTSCTS                 0x00000002
-#define SERIAL_PCF_CD                     0x00000004
-#define SERIAL_PCF_PARITY_CHECK           0x00000008
-#define SERIAL_PCF_XONXOFF                0x00000010
-#define SERIAL_PCF_SETXCHAR               0x00000020
-#define SERIAL_PCF_TOTALTIMEOUTS          0x00000040
-#define SERIAL_PCF_INTTIMEOUTS            0x00000080
-#define SERIAL_PCF_SPECIALCHARS           0x00000100
-#define SERIAL_PCF_16BITMODE              0x00000200
-
-/* SERIAL_COMMPROP.SettableData flags */
-#define SERIAL_DATABITS_5                 0x0001
-#define SERIAL_DATABITS_6                 0x0002
-#define SERIAL_DATABITS_7                 0x0004
-#define SERIAL_DATABITS_8                 0x0008
-#define SERIAL_DATABITS_16                0x0010
-#define SERIAL_DATABITS_16X               0x0020
-
-/* SERIAL_COMMPROP.SettableStopParity flags */
-#define SERIAL_STOPBITS_10                0x0001
-#define SERIAL_STOPBITS_15                0x0002
-#define SERIAL_STOPBITS_20                0x0004
-#define SERIAL_PARITY_NONE                0x0100
-#define SERIAL_PARITY_ODD                 0x0200
-#define SERIAL_PARITY_EVEN                0x0400
-#define SERIAL_PARITY_MARK                0x0800
-#define SERIAL_PARITY_SPACE               0x1000
-
-typedef struct _SERIALPERF_STATS {
-  ULONG  ReceivedCount;
-  ULONG  TransmittedCount;
-  ULONG  FrameErrorCount;
-  ULONG  SerialOverrunErrorCount;
-  ULONG  BufferOverrunErrorCount;
-  ULONG  ParityErrorCount;
-} SERIALPERF_STATS, *PSERIALPERF_STATS;
-
-typedef struct _SERIAL_TIMEOUTS {
-  ULONG  ReadIntervalTimeout;
-  ULONG  ReadTotalTimeoutMultiplier;
-  ULONG  ReadTotalTimeoutConstant;
-  ULONG  WriteTotalTimeoutMultiplier;
-  ULONG  WriteTotalTimeoutConstant;
-} SERIAL_TIMEOUTS, *PSERIAL_TIMEOUTS;
-
-/* IOCTL_SERIAL_(GET_WAIT_MASK, SET_WAIT_MASK, WAIT_ON_MASK) flags */
-#define SERIAL_EV_RXCHAR                  0x0001
-#define SERIAL_EV_RXFLAG                  0x0002
-#define SERIAL_EV_TXEMPTY                 0x0004
-#define SERIAL_EV_CTS                     0x0008
-#define SERIAL_EV_DSR                     0x0010
-#define SERIAL_EV_RLSD                    0x0020
-#define SERIAL_EV_BREAK                   0x0040
-#define SERIAL_EV_ERR                     0x0080
-#define SERIAL_EV_RING                    0x0100
-#define SERIAL_EV_PERR                    0x0200
-#define SERIAL_EV_RX80FULL                0x0400
-#define SERIAL_EV_EVENT1                  0x0800
-#define SERIAL_EV_EVENT2                  0x1000
-
-/* IOCTL_SERIAL_LSRMST_INSERT constants */
-#define SERIAL_LSRMST_LSR_DATA            0x01
-#define SERIAL_LSRMST_LSR_NODATA          0x02
-#define SERIAL_LSRMST_MST                 0x03
-#define SERIAL_LSRMST_ESCAPE              0x00
-
-/* IOCTL_SERIAL_PURGE constants */
-#define SERIAL_PURGE_TXABORT              0x00000001
-#define SERIAL_PURGE_RXABORT              0x00000002
-#define SERIAL_PURGE_TXCLEAR              0x00000004
-#define SERIAL_PURGE_RXCLEAR              0x00000008
-
-/* IOCTL_SERIAL_SET_FIFO_CONTROL constants */
-#define SERIAL_IOC_FCR_FIFO_ENABLE        0x00000001
-#define SERIAL_IOC_FCR_RCVR_RESET         0x00000002
-#define SERIAL_IOC_FCR_XMIT_RESET         0x00000004
-#define SERIAL_IOC_FCR_DMA_MODE           0x00000008
-#define SERIAL_IOC_FCR_RES1               0x00000010
-#define SERIAL_IOC_FCR_RES2               0x00000020
-#define SERIAL_IOC_FCR_RCVR_TRIGGER_LSB   0x00000040
-#define SERIAL_IOC_FCR_RCVR_TRIGGER_MSB   0x00000080
-
-typedef struct _SERIAL_QUEUE_SIZE {
-  ULONG  InSize;
-  ULONG  OutSize;
-} SERIAL_QUEUE_SIZE, *PSERIAL_QUEUE_SIZE;
-
-typedef struct _SERIAL_XOFF_COUNTER {
-	ULONG  Timeout;
-	LONG  Counter;
-	UCHAR  XoffChar;
-} SERIAL_XOFF_COUNTER, *PSERIAL_XOFF_COUNTER;
-
-typedef struct _SERIAL_BASIC_SETTINGS {
-	SERIAL_TIMEOUTS  Timeouts;
-	SERIAL_HANDFLOW  HandFlow;
-	ULONG  RxFifo;
-	ULONG  TxFifo;
-} SERIAL_BASIC_SETTINGS, *PSERIAL_BASIC_SETTINGS;
-
-typedef struct _SERENUM_PORT_DESC {
-	ULONG  Size;
-	PVOID  PortHandle;
-	PHYSICAL_ADDRESS  PortAddress;
-	USHORT  Reserved[1];
-} SERENUM_PORT_DESC, *PSERENUM_PORT_DESC;
-
-typedef UCHAR STDCALL
-(*PSERENUM_READPORT)(
-  PVOID  SerPortAddress);
-
-typedef VOID STDCALL
-(*PSERENUM_WRITEPORT)(
-  PVOID  SerPortAddress,
-  UCHAR  Value);
-
-typedef enum _SERENUM_PORTION {
-  SerenumFirstHalf,
-  SerenumSecondHalf,
-  SerenumWhole
-} SERENUM_PORTION;
-
-typedef struct _SERENUM_PORT_PARAMETERS {
-  ULONG  Size;
-  PSERENUM_READPORT  ReadAccessor;
-  PSERENUM_WRITEPORT  WriteAccessor;
-  PVOID  SerPortAddress;
-  PVOID  HardwareHandle;
-  SERENUM_PORTION  Portion;
-  USHORT  NumberAxis;
-  USHORT  Reserved[3];
-} SERENUM_PORT_PARAMETERS, *PSERENUM_PORT_PARAMETERS;
-
-#define SERIAL_ERROR_BREAK                0x00000001
-#define SERIAL_ERROR_FRAMING              0x00000002
-#define SERIAL_ERROR_OVERRUN              0x00000004
-#define SERIAL_ERROR_QUEUEOVERRUN         0x00000008
-#define SERIAL_ERROR_PARITY               0x00000010
-
-#define SERIAL_SP_UNSPECIFIED             0x00000000
-#define SERIAL_SP_RS232                   0x00000001
-#define SERIAL_SP_PARALLEL                0x00000002
-#define SERIAL_SP_RS422                   0x00000003
-#define SERIAL_SP_RS423                   0x00000004
-#define SERIAL_SP_RS449                   0x00000005
-#define SERIAL_SP_MODEM                   0X00000006
-#define SERIAL_SP_FAX                     0x00000021
-#define SERIAL_SP_SCANNER                 0x00000022
-#define SERIAL_SP_BRIDGE                  0x00000100
-#define SERIAL_SP_LAT                     0x00000101
-#define SERIAL_SP_TELNET                  0x00000102
-#define SERIAL_SP_X25                     0x00000103
-#define SERIAL_SP_SERIALCOMM              0x00000001
-
-#define SERIAL_TX_WAITING_FOR_CTS         0x00000001
-#define SERIAL_TX_WAITING_FOR_DSR         0x00000002
-#define SERIAL_TX_WAITING_FOR_DCD         0x00000004
-#define SERIAL_TX_WAITING_FOR_XON         0x00000008
-#define SERIAL_TX_WAITING_XOFF_SENT       0x00000010
-#define SERIAL_TX_WAITING_ON_BREAK        0x00000020
-#define SERIAL_RX_WAITING_FOR_DSR         0x00000040
-
-#define SERIAL_DTR_STATE                  0x00000001
-#define SERIAL_RTS_STATE                  0x00000002
-#define SERIAL_CTS_STATE                  0x00000010
-#define SERIAL_DSR_STATE                  0x00000020
-#define SERIAL_RI_STATE                   0x00000040
-#define SERIAL_DCD_STATE                  0x00000080
-
-typedef struct _SERIALCONFIG {
-  ULONG  Size;
-  USHORT  Version;
-  ULONG  SubType;
-  ULONG  ProvOffset;
-  ULONG  ProviderSize;
-  WCHAR  ProviderData[1];
-} SERIALCONFIG,*PSERIALCONFIG;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDSER_H */
diff --git a/winsup/w32api/include/ddk/ntddstor.h b/winsup/w32api/include/ddk/ntddstor.h
deleted file mode 100644
index 6875cd190..000000000
--- a/winsup/w32api/include/ddk/ntddstor.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * ntddstor.h
- *
- * Storage class IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDSTOR_H
-#define __NTDDSTOR_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define IOCTL_STORAGE_BASE                FILE_DEVICE_MASS_STORAGE
-
-#define IOCTL_STORAGE_CHECK_VERIFY \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_STORAGE_CHECK_VERIFY2 \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_STORAGE_EJECT_MEDIA \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_STORAGE_EJECTION_CONTROL \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_STORAGE_FIND_NEW_DEVICES \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_STORAGE_GET_DEVICE_NUMBER \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_STORAGE_GET_MEDIA_TYPES \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_STORAGE_GET_MEDIA_TYPES_EX \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_STORAGE_LOAD_MEDIA \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_STORAGE_LOAD_MEDIA2 \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_STORAGE_MCN_CONTROL \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_STORAGE_MEDIA_REMOVAL \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_STORAGE_PREDICT_FAILURE \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_STORAGE_QUERY_PROPERTY \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0500, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_STORAGE_RELEASE \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_STORAGE_RESERVE \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_STORAGE_RESET_BUS \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_STORAGE_RESET_DEVICE \
-  CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-
-DEFINE_GUID(GUID_DEVINTERFACE_DISK,
-  0x53f56307L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-DEFINE_GUID(GUID_DEVINTERFACE_CDROM,
-  0x53f56308L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-DEFINE_GUID(GUID_DEVINTERFACE_PARTITION,
-  0x53f5630aL, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-DEFINE_GUID(GUID_DEVINTERFACE_TAPE,
-  0x53f5630bL, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-DEFINE_GUID(GUID_DEVINTERFACE_WRITEONCEDISK,
-  0x53f5630cL, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-DEFINE_GUID(GUID_DEVINTERFACE_VOLUME,
-  0x53f5630dL, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-DEFINE_GUID(GUID_DEVINTERFACE_MEDIUMCHANGER,
-  0x53f56310L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-DEFINE_GUID(GUID_DEVINTERFACE_FLOPPY,
-  0x53f56311L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-DEFINE_GUID(GUID_DEVINTERFACE_CDCHANGER,
-  0x53f56312L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-DEFINE_GUID(GUID_DEVINTERFACE_STORAGEPORT,
-  0x2accfe60L, 0xc130, 0x11d2, 0xb0, 0x82, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b);
-
-
-typedef enum _STORAGE_MEDIA_TYPE {
-  DDS_4mm = 0x20,
-  MiniQic,
-  Travan,
-  QIC,
-  MP_8mm,
-  AME_8mm,
-  AIT1_8mm,
-  DLT,
-  NCTP,
-  IBM_3480,
-  IBM_3490E,
-  IBM_Magstar_3590,
-  IBM_Magstar_MP,
-  STK_DATA_D3,
-  SONY_DTF,
-  DV_6mm,
-  DMI,
-  SONY_D2,
-  CLEANER_CARTRIDGE,
-  CD_ROM,
-  CD_R,
-  CD_RW,
-  DVD_ROM,
-  DVD_R,
-  DVD_RW,
-  MO_3_RW,
-  MO_5_WO,
-  MO_5_RW,
-  MO_5_LIMDOW,
-  PC_5_WO,
-  PC_5_RW,
-  PD_5_RW,
-  ABL_5_WO,
-  PINNACLE_APEX_5_RW,
-  SONY_12_WO,
-  PHILIPS_12_WO,
-  HITACHI_12_WO,
-  CYGNET_12_WO,
-  KODAK_14_WO,
-  MO_NFR_525,
-  NIKON_12_RW,
-  IOMEGA_ZIP,
-  IOMEGA_JAZ,
-  SYQUEST_EZ135,
-  SYQUEST_EZFLYER,
-  SYQUEST_SYJET,
-  AVATAR_F2,
-  MP2_8mm,
-  DST_S,
-  DST_M,
-  DST_L,
-  VXATape_1,
-  VXATape_2,
-  STK_9840,
-  LTO_Ultrium,
-  LTO_Accelis,
-  DVD_RAM,
-  AIT_8mm,
-  ADR_1,
-  ADR_2
-} STORAGE_MEDIA_TYPE, *PSTORAGE_MEDIA_TYPE;
-
-typedef enum _STORAGE_BUS_TYPE {
-	BusTypeUnknown = 0x00,
-	BusTypeScsi,
-	BusTypeAtapi,
-	BusTypeAta,
-	BusType1394,
-	BusTypeSsa,
-	BusTypeFibre,
-	BusTypeUsb,
-	BusTypeRAID,
-	BusTypeMaxReserved = 0x7F
-} STORAGE_BUS_TYPE, *PSTORAGE_BUS_TYPE;
-
-/* DEVICE_MEDIA_INFO.DeviceSpecific.DiskInfo.MediaCharacteristics constants */
-#define MEDIA_ERASEABLE                   0x00000001
-#define MEDIA_WRITE_ONCE                  0x00000002
-#define MEDIA_READ_ONLY                   0x00000004
-#define MEDIA_READ_WRITE                  0x00000008
-#define MEDIA_WRITE_PROTECTED             0x00000100
-#define MEDIA_CURRENTLY_MOUNTED           0x80000000
-
-typedef struct _DEVICE_MEDIA_INFO {
-  union {
-    struct {
-      LARGE_INTEGER  Cylinders;
-      STORAGE_MEDIA_TYPE  MediaType;
-      ULONG  TracksPerCylinder;
-      ULONG  SectorsPerTrack;
-      ULONG  BytesPerSector;
-      ULONG  NumberMediaSides;
-      ULONG  MediaCharacteristics; 
-    } DiskInfo;
-    struct {
-      LARGE_INTEGER  Cylinders;
-      STORAGE_MEDIA_TYPE  MediaType;
-      ULONG  TracksPerCylinder;
-      ULONG  SectorsPerTrack;
-      ULONG  BytesPerSector;
-      ULONG  NumberMediaSides;
-      ULONG  MediaCharacteristics; 
-    } RemovableDiskInfo;
-    struct {
-      STORAGE_MEDIA_TYPE  MediaType;
-      ULONG  MediaCharacteristics; 
-      ULONG  CurrentBlockSize;
-      STORAGE_BUS_TYPE  BusType;
-      union {
-        struct {
-          UCHAR  MediumType;
-          UCHAR  DensityCode;
-        } ScsiInformation;
-      } BusSpecificData;
-    } TapeInfo;
-  } DeviceSpecific;
-} DEVICE_MEDIA_INFO, *PDEVICE_MEDIA_INFO;
-
-typedef struct _GET_MEDIA_TYPES {
-  ULONG  DeviceType;
-  ULONG  MediaInfoCount;
-  DEVICE_MEDIA_INFO  MediaInfo[1];
-} GET_MEDIA_TYPES, *PGET_MEDIA_TYPES;
-
-typedef struct _STORAGE_ADAPTER_DESCRIPTOR {
-  ULONG  Version;
-  ULONG  Size;
-  ULONG  MaximumTransferLength;
-  ULONG  MaximumPhysicalPages;
-  ULONG  AlignmentMask;
-  BOOLEAN  AdapterUsesPio;
-  BOOLEAN  AdapterScansDown;
-  BOOLEAN  CommandQueueing;
-  BOOLEAN  AcceleratedTransfer;
-  STORAGE_BUS_TYPE  BusType;
-  USHORT  BusMajorVersion;
-  USHORT  BusMinorVersion;
-} STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR;
-
-typedef struct _STORAGE_BUS_RESET_REQUEST {
-  UCHAR  PathId;
-} STORAGE_BUS_RESET_REQUEST, *PSTORAGE_BUS_RESET_REQUEST;
-
-typedef struct _STORAGE_DESCRIPTOR_HEADER {
-  ULONG  Version;
-  ULONG  Size;
-} STORAGE_DESCRIPTOR_HEADER, *PSTORAGE_DESCRIPTOR_HEADER;
-
-typedef struct _STORAGE_DEVICE_DESCRIPTOR {
-  ULONG  Version;
-  ULONG  Size;
-  UCHAR  DeviceType;
-  UCHAR  DeviceTypeModifier;
-  BOOLEAN  RemovableMedia;
-  BOOLEAN  CommandQueueing;
-  ULONG  VendorIdOffset;
-  ULONG  ProductIdOffset;
-  ULONG  ProductRevisionOffset;
-  ULONG  SerialNumberOffset;
-  STORAGE_BUS_TYPE  BusType;
-  ULONG  RawPropertiesLength;
-  UCHAR  RawDeviceProperties[1];
-} STORAGE_DEVICE_DESCRIPTOR, *PSTORAGE_DEVICE_DESCRIPTOR;
-
-typedef struct _STORAGE_DEVICE_ID_DESCRIPTOR {
-  ULONG  Version;
-  ULONG  Size;
-  ULONG  NumberOfIdentifiers;
-  UCHAR  Identifiers[1];
-} STORAGE_DEVICE_ID_DESCRIPTOR, *PSTORAGE_DEVICE_ID_DESCRIPTOR;
-
-typedef struct _STORAGE_DEVICE_NUMBER {
-  DEVICE_TYPE  DeviceType;
-  ULONG  DeviceNumber;
-  ULONG  PartitionNumber;
-} STORAGE_DEVICE_NUMBER, *PSTORAGE_DEVICE_NUMBER;
-
-typedef struct _STORAGE_PREDICT_FAILURE {
-  ULONG  PredictFailure;
-  UCHAR  VendorSpecific[512];
-} STORAGE_PREDICT_FAILURE, *PSTORAGE_PREDICT_FAILURE;
-
-typedef enum _STORAGE_PROPERTY_ID {
-  StorageDeviceProperty = 0,
-  StorageAdapterProperty,
-  StorageDeviceIdProperty
-} STORAGE_PROPERTY_ID, *PSTORAGE_PROPERTY_ID;
-
-typedef enum _STORAGE_QUERY_TYPE {
-  PropertyStandardQuery = 0, 
-  PropertyExistsQuery, 
-  PropertyMaskQuery, 
-  PropertyQueryMaxDefined 
-} STORAGE_QUERY_TYPE, *PSTORAGE_QUERY_TYPE;
-
-typedef struct _STORAGE_PROPERTY_QUERY {
-  STORAGE_PROPERTY_ID  PropertyId;
-  STORAGE_QUERY_TYPE  QueryType;
-  UCHAR  AdditionalParameters[1];
-} STORAGE_PROPERTY_QUERY, *PSTORAGE_PROPERTY_QUERY;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDSTOR_H */
diff --git a/winsup/w32api/include/ddk/ntddtape.h b/winsup/w32api/include/ddk/ntddtape.h
deleted file mode 100644
index 4cc88691f..000000000
--- a/winsup/w32api/include/ddk/ntddtape.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * ntddtape.h
- *
- * Tape device IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDTAPE_H
-#define __NTDDTAPE_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "ntddstor.h"
-
-
-#define DD_TAPE_DEVICE_NAME               "\\Device\\Tape"
-#define DD_TAPE_DEVICE_NAME_U             L"\\Device\\Tape"
-
-#define IOCTL_TAPE_BASE                   FILE_DEVICE_TAPE
-
-#define IOCTL_TAPE_CHECK_VERIFY         CTL_CODE(IOCTL_TAPE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_TAPE_CREATE_PARTITION     CTL_CODE(IOCTL_TAPE_BASE, 0x000a, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_TAPE_ERASE                CTL_CODE(IOCTL_TAPE_BASE, 0x0000, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_TAPE_FIND_NEW_DEVICES     CTL_CODE(IOCTL_DISK_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_TAPE_GET_DRIVE_PARAMS     CTL_CODE(IOCTL_TAPE_BASE, 0x0005, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_TAPE_GET_MEDIA_PARAMS     CTL_CODE(IOCTL_TAPE_BASE, 0x0007, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_TAPE_GET_POSITION         CTL_CODE(IOCTL_TAPE_BASE, 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_TAPE_GET_STATUS           CTL_CODE(IOCTL_TAPE_BASE, 0x0009, METHOD_BUFFERED, FILE_READ_ACCESS )
-
-#define IOCTL_TAPE_PREPARE              CTL_CODE(IOCTL_TAPE_BASE, 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_TAPE_SET_DRIVE_PARAMS     CTL_CODE(IOCTL_TAPE_BASE, 0x0006, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_TAPE_SET_MEDIA_PARAMS     CTL_CODE(IOCTL_TAPE_BASE, 0x0008, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_TAPE_SET_POSITION         CTL_CODE(IOCTL_TAPE_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_TAPE_WRITE_MARKS          CTL_CODE(IOCTL_TAPE_BASE, 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-
-typedef enum _TAPE_DRIVE_PROBLEM_TYPE {
-  TapeDriveProblemNone, 
-  TapeDriveReadWriteWarning,
-  TapeDriveReadWriteError, 
-  TapeDriveReadWarning,
-  TapeDriveWriteWarning,
-  TapeDriveReadError,
-  TapeDriveWriteError, 
-  TapeDriveHardwareError,
-  TapeDriveUnsupportedMedia, 
-  TapeDriveScsiConnectionError,
-  TapeDriveTimetoClean, 
-  TapeDriveCleanDriveNow,
-  TapeDriveMediaLifeExpired, 
-  TapeDriveSnappedTape
-} TAPE_DRIVE_PROBLEM_TYPE;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDTAPE_H */
diff --git a/winsup/w32api/include/ddk/ntddtdi.h b/winsup/w32api/include/ddk/ntddtdi.h
deleted file mode 100644
index 5ff5ad064..000000000
--- a/winsup/w32api/include/ddk/ntddtdi.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * ntddtdi.h
- *
- * TDI IOCTL interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDTDI_H
-#define __NTDDTDI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define DD_TDI_DEVICE_NAME                "\\Device\\UNKNOWN"
-#define DD_TDI_DEVICE_NAME_U              L"\\Device\\UNKNOWN"
-
-#define _TDI_CONTROL_CODE(Request, Method) \
-  CTL_CODE(FILE_DEVICE_TRANSPORT, Request, Method, FILE_ANY_ACCESS)
-
-#define IOCTL_TDI_ACCEPT                  _TDI_CONTROL_CODE(0,  METHOD_BUFFERED)
-#define IOCTL_TDI_CONNECT                 _TDI_CONTROL_CODE(1,  METHOD_BUFFERED)
-#define IOCTL_TDI_DISCONNECT              _TDI_CONTROL_CODE(2,  METHOD_BUFFERED)
-#define IOCTL_TDI_LISTEN                  _TDI_CONTROL_CODE(3,  METHOD_BUFFERED)
-#define IOCTL_TDI_QUERY_INFORMATION       _TDI_CONTROL_CODE(4,  METHOD_OUT_DIRECT)
-#define IOCTL_TDI_RECEIVE                 _TDI_CONTROL_CODE(5,  METHOD_OUT_DIRECT)
-#define IOCTL_TDI_RECEIVE_DATAGRAM        _TDI_CONTROL_CODE(6,  METHOD_OUT_DIRECT)
-#define IOCTL_TDI_SEND                    _TDI_CONTROL_CODE(7,  METHOD_IN_DIRECT)
-#define IOCTL_TDI_SEND_DATAGRAM           _TDI_CONTROL_CODE(8,  METHOD_IN_DIRECT)
-#define IOCTL_TDI_SET_EVENT_HANDLER       _TDI_CONTROL_CODE(9,  METHOD_BUFFERED)
-#define IOCTL_TDI_SET_INFORMATION         _TDI_CONTROL_CODE(10, METHOD_IN_DIRECT)
-#define IOCTL_TDI_ASSOCIATE_ADDRESS       _TDI_CONTROL_CODE(11, METHOD_BUFFERED)
-#define IOCTL_TDI_DISASSOCIATE_ADDRESS    _TDI_CONTROL_CODE(12, METHOD_BUFFERED)
-#define IOCTL_TDI_ACTION                  _TDI_CONTROL_CODE(13, METHOD_OUT_DIRECT)
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDTDI_H */
diff --git a/winsup/w32api/include/ddk/ntddvdeo.h b/winsup/w32api/include/ddk/ntddvdeo.h
deleted file mode 100644
index e8afdbc2c..000000000
--- a/winsup/w32api/include/ddk/ntddvdeo.h
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
- * ntddvdeo.h
- *
- * Definitions for video devices
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDVDEO_H
-#define __NTDDVDEO_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define VIDEO_DEVICE_NAME                 "DISPLAY%d"
-#define WVIDEO_DEVICE_NAME                L"DISPLAY%d"
-
-#define DD_FULLSCREEN_VIDEO_DEVICE_NAME   L"\\Device\\FSVideo"
-
-DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, \
-  0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99);
-
-
-#define IOCTL_VIDEO_DISABLE_CURSOR \
-  CTL_CODE (FILE_DEVICE_VIDEO, 0x109, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_DISABLE_POINTER \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x10f, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_ENABLE_CURSOR \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x108, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_ENABLE_POINTER \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x10e, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_FREE_PUBLIC_ACCESS_RANGES \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x119, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_GET_BANK_SELECT_CODE \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x115, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_GET_CHILD_STATE \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x120, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_GET_POWER_MANAGEMENT \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x11c, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_HANDLE_VIDEOPARAMETERS \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x08, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_LOAD_AND_SET_FONT \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x105, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_MAP_VIDEO_MEMORY \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x116, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_QUERY_AVAIL_MODES \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x100, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_QUERY_COLOR_CAPABILITIES \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x11a, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_QUERY_CURRENT_MODE \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x102, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_QUERY_CURSOR_ATTR \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x10b, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_QUERY_CURSOR_POSITION \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x10d, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_QUERY_NUM_AVAIL_MODES \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x101, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_QUERY_POINTER_ATTR \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x111, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_QUERY_POINTER_CAPABILITIES \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x114, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_QUERY_POINTER_POSITION \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x113, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_QUERY_PUBLIC_ACCESS_RANGES \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x118, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_RESET_DEVICE \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x104, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_RESTORE_HARDWARE_STATE \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x81, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SAVE_HARDWARE_STATE \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x80, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SET_CHILD_STATE_CONFIGURATION \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x122, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SET_COLOR_REGISTERS \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x107, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SET_CURRENT_MODE \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x103, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SET_CURSOR_ATTR \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x10a, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SET_CURSOR_POSITION \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x10c, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SET_PALETTE_REGISTERS \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x106, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SET_POINTER_ATTR \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x110, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SET_POINTER_POSITION \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x112, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SET_POWER_MANAGEMENT \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x11b, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SHARE_VIDEO_MEMORY \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x11d, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_SWITCH_DUALVIEW \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x123, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_UNMAP_VIDEO_MEMORY \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x117, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_UNSHARE_VIDEO_MEMORY \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x11e, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VIDEO_VALIDATE_CHILD_STATE_CONFIGURATION \
-  CTL_CODE(FILE_DEVICE_VIDEO, 0x121, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-
-
-typedef struct _VIDEO_MEMORY {
-  PVOID  RequestedVirtualAddress;
-} VIDEO_MEMORY, *PVIDEO_MEMORY;
-
-typedef struct _VIDEO_MEMORY_INFORMATION {
-  PVOID  VideoRamBase;
-  ULONG  VideoRamLength;
-  PVOID  FrameBufferBase;
-  ULONG  FrameBufferLength;
-} VIDEO_MEMORY_INFORMATION, *PVIDEO_MEMORY_INFORMATION;
-
-/* VIDEO_MODE.RequestedMode */
-#define VIDEO_MODE_MAP_MEM_LINEAR         0x40000000
-#define VIDEO_MODE_NO_ZERO_MEMORY         0x80000000
-
-typedef struct _VIDEO_MODE {
-  ULONG  RequestedMode;
-} VIDEO_MODE, *PVIDEO_MODE;
-
-/* VIDEO_MODE_INFORMATION.AttributeFlags */
-#define VIDEO_MODE_COLOR                  0x0001
-#define VIDEO_MODE_GRAPHICS               0x0002
-#define VIDEO_MODE_PALETTE_DRIVEN         0x0004
-#define VIDEO_MODE_MANAGED_PALETTE        0x0008
-#define VIDEO_MODE_INTERLACED             0x0010
-#define VIDEO_MODE_NO_OFF_SCREEN          0x0020
-#define VIDEO_MODE_NO_64_BIT_ACCESS       0x0040
-#define VIDEO_MODE_BANKED                 0x0080
-#define VIDEO_MODE_LINEAR                 0x0100
-
-typedef struct _VIDEO_MODE_INFORMATION {
-  ULONG  Length;
-  ULONG  ModeIndex;
-  ULONG  VisScreenWidth;
-  ULONG  VisScreenHeight;
-  ULONG  ScreenStride;
-  ULONG  NumberOfPlanes;
-  ULONG  BitsPerPlane;
-  ULONG  Frequency;
-  ULONG  XMillimeter;
-  ULONG  YMillimeter;
-  ULONG  NumberRedBits;
-  ULONG  NumberGreenBits;
-  ULONG  NumberBlueBits;
-  ULONG  RedMask;
-  ULONG  GreenMask;
-  ULONG  BlueMask;
-  ULONG  AttributeFlags;
-  ULONG  VideoMemoryBitmapWidth;
-  ULONG  VideoMemoryBitmapHeight;
-  ULONG  DriverSpecificAttributeFlags;
-} VIDEO_MODE_INFORMATION, *PVIDEO_MODE_INFORMATION;
-
-typedef struct _VIDEO_NUM_MODES {
-  ULONG  NumModes;
-  ULONG  ModeInformationLength;
-} VIDEO_NUM_MODES, *PVIDEO_NUM_MODES;
-
-typedef enum _VIDEO_POWER_STATE {
-  VideoPowerUnspecified = 0,
-  VideoPowerOn = 1,
-  VideoPowerStandBy,
-  VideoPowerSuspend,
-  VideoPowerOff,
-  VideoPowerHibernate,
-  VideoPowerShutdown,
-  VideoPowerMaximum
-} VIDEO_POWER_STATE, *PVIDEO_POWER_STATE;
-
-typedef struct _VIDEO_POWER_MANAGEMENT {
-  ULONG  Length;
-  ULONG  DPMSVersion;
-  ULONG  PowerState;
-} VIDEO_POWER_MANAGEMENT, *PVIDEO_POWER_MANAGEMENT;
-
-typedef struct _VIDEO_PUBLIC_ACCESS_RANGES {
-  ULONG  InIoSpace;
-  ULONG  MappedInIoSpace;
-  PVOID  VirtualAddress;
-} VIDEO_PUBLIC_ACCESS_RANGES, *PVIDEO_PUBLIC_ACCESS_RANGES;
-
-typedef struct _VIDEO_SHARE_MEMORY {
-  HANDLE  ProcessHandle;
-  ULONG  ViewOffset;
-  ULONG  ViewSize;
-  PVOID  RequestedVirtualAddress;
-} VIDEO_SHARE_MEMORY, *PVIDEO_SHARE_MEMORY;
-
-typedef struct _VIDEO_SHARE_MEMORY_INFORMATION {
-  ULONG  SharedViewOffset;
-  ULONG  SharedViewSize;
-  PVOID  VirtualAddress;
-} VIDEO_SHARE_MEMORY_INFORMATION, *PVIDEO_SHARE_MEMORY_INFORMATION;
-
-/* VIDEO_BANK_SELECT.BankingFlags constants */
-#define PLANAR_HC                         0x00000001
-
-/* VIDEO_BANK_SELECT.BankingType and PlanarHCBankingType constants */
-typedef enum _VIDEO_BANK_TYPE {
-  VideoNotBanked = 0,
-  VideoBanked1RW,
-  VideoBanked1R1W,
-  VideoBanked2RW,
-  NumVideoBankTypes
-} VIDEO_BANK_TYPE, *PVIDEO_BANK_TYPE;
-
-typedef struct _VIDEO_BANK_SELECT {
-  ULONG  Length;
-  ULONG  Size;
-  ULONG  BankingFlags;
-  ULONG  BankingType;
-  ULONG  PlanarHCBankingType;
-  ULONG  BitmapWidthInBytes;
-  ULONG  BitmapSize;
-  ULONG  Granularity;
-  ULONG  PlanarHCGranularity;
-  ULONG  CodeOffset;
-  ULONG  PlanarHCBankCodeOffset;
-  ULONG  PlanarHCEnableCodeOffset;
-  ULONG  PlanarHCDisableCodeOffset;
-} VIDEO_BANK_SELECT, *PVIDEO_BANK_SELECT;
-
-typedef struct _VIDEO_LOAD_FONT_INFORMATION {
-  USHORT  WidthInPixels;
-  USHORT  HeightInPixels;
-  ULONG  FontSize;
-  UCHAR  Font[1];
-} VIDEO_LOAD_FONT_INFORMATION, *PVIDEO_LOAD_FONT_INFORMATION;
-
-/* VIDEO_COLOR_CAPABILITIES.AttributeFlags constants */
-#define VIDEO_DEVICE_COLOR                0x00000001
-#define VIDEO_OPTIONAL_GAMMET_TABLE       0x00000002
-
-typedef struct _VIDEO_COLOR_CAPABILITIES {
-  ULONG  Length;
-  ULONG  AttributeFlags;
-  LONG  RedPhosphoreDecay;
-  LONG  GreenPhosphoreDecay;
-  LONG  BluePhosphoreDecay;
-  LONG  WhiteChromaticity_x;
-  LONG  WhiteChromaticity_y;
-  LONG  WhiteChromaticity_Y;
-  LONG  RedChromaticity_x;
-  LONG  RedChromaticity_y;
-  LONG  GreenChromaticity_x;
-  LONG  GreenChromaticity_y;
-  LONG  BlueChromaticity_x;
-  LONG  BlueChromaticity_y;
-  LONG  WhiteGamma;
-  LONG  RedGamma;
-  LONG  GreenGamma;
-  LONG  BlueGamma;
-} VIDEO_COLOR_CAPABILITIES, *PVIDEO_COLOR_CAPABILITIES;
-
-typedef struct _VIDEO_CURSOR_ATTRIBUTES {
-  USHORT  Width;
-  USHORT  Height;
-  SHORT  Column;
-  SHORT  Row;
-  UCHAR  Rate;
-  UCHAR  Enable;
-} VIDEO_CURSOR_ATTRIBUTES, *PVIDEO_CURSOR_ATTRIBUTES;
-
-typedef struct _VIDEO_CURSOR_POSITION {
-  SHORT  Column;
-  SHORT  Row;
-} VIDEO_CURSOR_POSITION, *PVIDEO_CURSOR_POSITION;
-
-typedef struct _VIDEO_POINTER_ATTRIBUTES {
-  ULONG  Flags;
-  ULONG  Width;
-  ULONG  Height;
-  ULONG  WidthInBytes;
-  ULONG  Enable;
-  SHORT  Column;
-  SHORT  Row;
-  UCHAR  Pixels[1];
-} VIDEO_POINTER_ATTRIBUTES, *PVIDEO_POINTER_ATTRIBUTES;
-
-/* VIDEO_POINTER_CAPABILITIES.Flags */
-#define VIDEO_MODE_ASYNC_POINTER          0x01
-#define VIDEO_MODE_MONO_POINTER           0x02
-#define VIDEO_MODE_COLOR_POINTER          0x04
-#define VIDEO_MODE_ANIMATE_START          0x08
-#define VIDEO_MODE_ANIMATE_UPDATE         0x10
-
-typedef struct _VIDEO_POINTER_CAPABILITIES {
-  ULONG  Flags;
-  ULONG  MaxWidth;
-  ULONG  MaxHeight;
-  ULONG  HWPtrBitmapStart;
-  ULONG  HWPtrBitmapEnd;
-} VIDEO_POINTER_CAPABILITIES, *PVIDEO_POINTER_CAPABILITIES;
-
-typedef struct _VIDEO_POINTER_POSITION {
-  SHORT  Column;
-  SHORT  Row;
-} VIDEO_POINTER_POSITION, *PVIDEO_POINTER_POSITION;
-
-
-/* VIDEO_HARDWARE_STATE_HEADER.VGAStateFlags constants */
-#define VIDEO_STATE_NON_STANDARD_VGA      0x00000001
-#define VIDEO_STATE_UNEMULATED_VGA_STATE  0x00000002
-#define VIDEO_STATE_PACKED_CHAIN4_MODE    0x00000004
-
-typedef struct _VIDEO_HARDWARE_STATE_HEADER {
-  ULONG  Length;
-  UCHAR  PortValue[0x30];
-  ULONG  AttribIndexDataState;
-  ULONG  BasicSequencerOffset;
-  ULONG  BasicCrtContOffset;
-  ULONG  BasicGraphContOffset;
-  ULONG  BasicAttribContOffset;
-  ULONG  BasicDacOffset;
-  ULONG  BasicLatchesOffset;
-  ULONG  ExtendedSequencerOffset;
-  ULONG  ExtendedCrtContOffset;
-  ULONG  ExtendedGraphContOffset;
-  ULONG  ExtendedAttribContOffset;
-  ULONG  ExtendedDacOffset;
-  ULONG  ExtendedValidatorStateOffset;
-  ULONG  ExtendedMiscDataOffset;
-  ULONG  PlaneLength;
-  ULONG  Plane1Offset;
-  ULONG  Plane2Offset;
-  ULONG  Plane3Offset;
-  ULONG  Plane4Offset;
-  ULONG  VGAStateFlags;
-  ULONG  DIBOffset;
-  ULONG  DIBBitsPerPixel;
-  ULONG  DIBXResolution;
-  ULONG  DIBYResolution;
-  ULONG  DIBXlatOffset;
-  ULONG  DIBXlatLength;
-  ULONG  VesaInfoOffset;
-  PVOID  FrameBufferData;
-} VIDEO_HARDWARE_STATE_HEADER, *PVIDEO_HARDWARE_STATE_HEADER;
-
-typedef struct _VIDEO_CLUTDATA {
-  UCHAR  Red;
-  UCHAR  Green;
-  UCHAR  Blue;
-  UCHAR  Unused;
-} VIDEO_CLUTDATA, *PVIDEO_CLUTDATA;
-
-typedef struct {
-	USHORT  NumEntries;
-	USHORT  FirstEntry;
-	union {
-    VIDEO_CLUTDATA  RgbArray;
-    ULONG  RgbLong;
-	} LookupTable[1];
-} VIDEO_CLUT, *PVIDEO_CLUT;
-
-typedef struct _VIDEO_PALETTE_DATA {
-  USHORT  NumEntries;
-  USHORT  FirstEntry;
-  USHORT  Colors[1];
-} VIDEO_PALETTE_DATA, *PVIDEO_PALETTE_DATA;
-
-typedef struct _VIDEO_HARDWARE_STATE {
-	PVIDEO_HARDWARE_STATE_HEADER  StateHeader;
-	ULONG  StateLength;
-} VIDEO_HARDWARE_STATE, *PVIDEO_HARDWARE_STATE;
-
-#define VIDEO_CHILD_ACTIVE                0x00000001
-#define VIDEO_CHILD_DETACHED              0x00000002
-#define VIDEO_CHILD_NOPRUNE_FREQ          0x80000000
-#define VIDEO_CHILD_NOPRUNE_RESOLUTION    0x40000000
-
-#define VIDEO_DUALVIEW_REMOVABLE          0x00000001
-#define VIDEO_DUALVIEW_PRIMARY            0x80000000
-#define VIDEO_DUALVIEW_SECONDARY          0x40000000
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDVDEO_H */
diff --git a/winsup/w32api/include/ddk/ntddvol.h b/winsup/w32api/include/ddk/ntddvol.h
deleted file mode 100644
index a5d9064be..000000000
--- a/winsup/w32api/include/ddk/ntddvol.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * ntddvol.h
- *
- * Volume IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTDDVOL_H
-#define __NTDDVOL_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define IOCTL_VOLUME_BASE                 ((ULONG) 'V')
-
-#define IOCTL_VOLUME_LOGICAL_TO_PHYSICAL \
-  CTL_CODE(IOCTL_VOLUME_BASE, 8, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_PHYSICAL_TO_LOGICAL \
-  CTL_CODE(IOCTL_VOLUME_BASE, 9, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_READ_PLEX \
-  CTL_CODE(IOCTL_VOLUME_BASE, 11, METHOD_OUT_DIRECT, FILE_READ_ACCESS)
-
-#define IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS \
-  CTL_CODE(IOCTL_VOLUME_BASE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_IS_CLUSTERED \
-  CTL_CODE(IOCTL_VOLUME_BASE, 12, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_QUERY_VOLUME_NUMBER \
-  CTL_CODE(IOCTL_VOLUME_BASE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_IS_PARTITION \
-  CTL_CODE(IOCTL_VOLUME_BASE, 10, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_SET_GPT_ATTRIBUTES \
-  CTL_CODE(IOCTL_VOLUME_BASE, 13, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_GET_GPT_ATTRIBUTES \
-  CTL_CODE(IOCTL_VOLUME_BASE, 14, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_SUPPORTS_ONLINE_OFFLINE \
-  CTL_CODE(IOCTL_VOLUME_BASE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_ONLINE \
-  CTL_CODE(IOCTL_VOLUME_BASE, 2, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_VOLUME_OFFLINE \
-  CTL_CODE(IOCTL_VOLUME_BASE, 3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-
-#define IOCTL_VOLUME_IS_OFFLINE \
-  CTL_CODE(IOCTL_VOLUME_BASE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_IS_IO_CAPABLE \
-  CTL_CODE(IOCTL_VOLUME_BASE, 5, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_VOLUME_QUERY_FAILOVER_SET \
-  CTL_CODE(IOCTL_VOLUME_BASE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-
-typedef struct _VOLUME_LOGICAL_OFFSET {
-  LONGLONG  LogicalOffset;
-} VOLUME_LOGICAL_OFFSET, *PVOLUME_LOGICAL_OFFSET;
-
-typedef struct _VOLUME_PHYSICAL_OFFSET {
-  ULONG  DiskNumber;
-  LONGLONG  Offset;
-} VOLUME_PHYSICAL_OFFSET, *PVOLUME_PHYSICAL_OFFSET;
-
-typedef struct _VOLUME_PHYSICAL_OFFSETS {
-  ULONG  NumberOfPhysicalOffsets;
-  VOLUME_PHYSICAL_OFFSET  PhysicalOffset[1];
-} VOLUME_PHYSICAL_OFFSETS, *PVOLUME_PHYSICAL_OFFSETS;
-
-typedef struct _VOLUME_READ_PLEX_INPUT {
-  LARGE_INTEGER  ByteOffset;
-  ULONG  Length;
-  ULONG  PlexNumber;
-} VOLUME_READ_PLEX_INPUT, *PVOLUME_READ_PLEX_INPUT;
-
-typedef struct _VOLUME_GET_GPT_ATTRIBUTES_INFORMATION {
-  ULONGLONG  GptAttributes;
-} VOLUME_GET_GPT_ATTRIBUTES_INFORMATION, *PVOLUME_GET_GPT_ATTRIBUTES_INFORMATION;
-
-typedef struct _VOLUME_SET_GPT_ATTRIBUTES_INFORMATION {
-	ULONGLONG  GptAttributes;
-	BOOLEAN  RevertOnClose;
-	BOOLEAN  ApplyToAllConnectedVolumes;
-	USHORT  Reserved1;
-	ULONG  Reserved2;
-} VOLUME_SET_GPT_ATTRIBUTES_INFORMATION, *PVOLUME_SET_GPT_ATTRIBUTES_INFORMATION;
-
-typedef struct _DISK_EXTENT {
-	ULONG  DiskNumber;
-	LARGE_INTEGER  StartingOffset;
-	LARGE_INTEGER  ExtentLength;
-} DISK_EXTENT, *PDISK_EXTENT;
-
-typedef struct _VOLUME_DISK_EXTENTS {
-	ULONG  NumberOfDiskExtents;
-	DISK_EXTENT  Extents[1];
-} VOLUME_DISK_EXTENTS, *PVOLUME_DISK_EXTENTS;
-
-typedef struct _VOLUME_NUMBER {
-	ULONG  VolumeNumber;
-	WCHAR  VolumeManagerName[8];
-} VOLUME_NUMBER, *PVOLUME_NUMBER;
-
-typedef struct _VOLUME_FAILOVER_SET {
-	ULONG  NumberOfDisks;
-	ULONG  DiskNumbers[1];
-} VOLUME_FAILOVER_SET, *PVOLUME_FAILOVER_SET;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTDDVOL_H */
diff --git a/winsup/w32api/include/ddk/ntifs.h b/winsup/w32api/include/ddk/ntifs.h
deleted file mode 100644
index b09c16306..000000000
--- a/winsup/w32api/include/ddk/ntifs.h
+++ /dev/null
@@ -1,4691 +0,0 @@
-/*
- * ntifs.h
- *
- * Windows NT Filesystem Driver Developer Kit
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Bo Brant�n <bosse@acc.umu.se>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef _NTIFS_
-#define _NTIFS_
-#define _GNU_NTIFS_
-
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "ntapi.h"
-
-#define VER_PRODUCTBUILD 10000
-
-#ifndef NTSYSAPI
-#define NTSYSAPI
-#endif
-
-#ifndef NTKERNELAPI
-#define NTKERNELAPI STDCALL
-#endif
-
-typedef struct _SE_EXPORTS                  *PSE_EXPORTS;
-
-extern PUCHAR                       *FsRtlLegalAnsiCharacterArray;
-extern PSE_EXPORTS                  SeExports;
-extern PACL                         SePublicDefaultDacl;
-extern PACL                         SeSystemDefaultDacl;
-
-#define ANSI_DOS_STAR                   ('<')
-#define ANSI_DOS_QM                     ('>')
-#define ANSI_DOS_DOT                    ('"')
-
-#define DOS_STAR                        (L'<')
-#define DOS_QM                          (L'>')
-#define DOS_DOT                         (L'"')
-
-/* also in winnt.h */
-#define ACCESS_ALLOWED_ACE_TYPE         (0x0)
-#define ACCESS_DENIED_ACE_TYPE          (0x1)
-#define SYSTEM_AUDIT_ACE_TYPE           (0x2)
-#define SYSTEM_ALARM_ACE_TYPE           (0x3)
- 
-#define COMPRESSION_FORMAT_NONE         (0x0000)
-#define COMPRESSION_FORMAT_DEFAULT      (0x0001)
-#define COMPRESSION_FORMAT_LZNT1        (0x0002)
-#define COMPRESSION_ENGINE_STANDARD     (0x0000)
-#define COMPRESSION_ENGINE_MAXIMUM      (0x0100)
-#define COMPRESSION_ENGINE_HIBER        (0x0200)
-
-#define FILE_ACTION_ADDED                   0x00000001
-#define FILE_ACTION_REMOVED                 0x00000002
-#define FILE_ACTION_MODIFIED                0x00000003
-#define FILE_ACTION_RENAMED_OLD_NAME        0x00000004
-#define FILE_ACTION_RENAMED_NEW_NAME        0x00000005
-#define FILE_ACTION_ADDED_STREAM            0x00000006
-#define FILE_ACTION_REMOVED_STREAM          0x00000007
-#define FILE_ACTION_MODIFIED_STREAM         0x00000008
-#define FILE_ACTION_REMOVED_BY_DELETE       0x00000009
-#define FILE_ACTION_ID_NOT_TUNNELLED        0x0000000A
-#define FILE_ACTION_TUNNELLED_ID_COLLISION  0x0000000B
-/* end  winnt.h */
-
-#define FILE_EA_TYPE_BINARY             0xfffe
-#define FILE_EA_TYPE_ASCII              0xfffd
-#define FILE_EA_TYPE_BITMAP             0xfffb
-#define FILE_EA_TYPE_METAFILE           0xfffa
-#define FILE_EA_TYPE_ICON               0xfff9
-#define FILE_EA_TYPE_EA                 0xffee
-#define FILE_EA_TYPE_MVMT               0xffdf
-#define FILE_EA_TYPE_MVST               0xffde
-#define FILE_EA_TYPE_ASN1               0xffdd
-#define FILE_EA_TYPE_FAMILY_IDS         0xff01
-
-#define FILE_NEED_EA                    0x00000080
-
-/* also in winnt.h */
-#define FILE_NOTIFY_CHANGE_FILE_NAME    0x00000001
-#define FILE_NOTIFY_CHANGE_DIR_NAME     0x00000002
-#define FILE_NOTIFY_CHANGE_NAME         0x00000003
-#define FILE_NOTIFY_CHANGE_ATTRIBUTES   0x00000004
-#define FILE_NOTIFY_CHANGE_SIZE         0x00000008
-#define FILE_NOTIFY_CHANGE_LAST_WRITE   0x00000010
-#define FILE_NOTIFY_CHANGE_LAST_ACCESS  0x00000020
-#define FILE_NOTIFY_CHANGE_CREATION     0x00000040
-#define FILE_NOTIFY_CHANGE_EA           0x00000080
-#define FILE_NOTIFY_CHANGE_SECURITY     0x00000100
-#define FILE_NOTIFY_CHANGE_STREAM_NAME  0x00000200
-#define FILE_NOTIFY_CHANGE_STREAM_SIZE  0x00000400
-#define FILE_NOTIFY_CHANGE_STREAM_WRITE 0x00000800
-#define FILE_NOTIFY_VALID_MASK          0x00000fff
-/* end winnt.h */
-
-#define FILE_OPLOCK_BROKEN_TO_LEVEL_2   0x00000007
-#define FILE_OPLOCK_BROKEN_TO_NONE      0x00000008
-
-#define FILE_OPBATCH_BREAK_UNDERWAY     0x00000009
-
-#define FILE_CASE_SENSITIVE_SEARCH      0x00000001
-#define FILE_CASE_PRESERVED_NAMES       0x00000002
-#define FILE_UNICODE_ON_DISK            0x00000004
-#define FILE_PERSISTENT_ACLS            0x00000008
-#define FILE_FILE_COMPRESSION           0x00000010
-#define FILE_VOLUME_QUOTAS              0x00000020
-#define FILE_SUPPORTS_SPARSE_FILES      0x00000040
-#define FILE_SUPPORTS_REPARSE_POINTS    0x00000080
-#define FILE_SUPPORTS_REMOTE_STORAGE    0x00000100
-#define FS_LFN_APIS                     0x00004000
-#define FILE_VOLUME_IS_COMPRESSED       0x00008000
-#define FILE_SUPPORTS_OBJECT_IDS        0x00010000
-#define FILE_SUPPORTS_ENCRYPTION        0x00020000
-#define FILE_NAMED_STREAMS              0x00040000
-
-#define FILE_PIPE_BYTE_STREAM_TYPE      0x00000000
-#define FILE_PIPE_MESSAGE_TYPE          0x00000001
-
-#define FILE_PIPE_BYTE_STREAM_MODE      0x00000000
-#define FILE_PIPE_MESSAGE_MODE          0x00000001
-
-#define FILE_PIPE_QUEUE_OPERATION       0x00000000
-#define FILE_PIPE_COMPLETE_OPERATION    0x00000001
-
-#define FILE_PIPE_INBOUND               0x00000000
-#define FILE_PIPE_OUTBOUND              0x00000001
-#define FILE_PIPE_FULL_DUPLEX           0x00000002
-
-#define FILE_PIPE_DISCONNECTED_STATE    0x00000001
-#define FILE_PIPE_LISTENING_STATE       0x00000002
-#define FILE_PIPE_CONNECTED_STATE       0x00000003
-#define FILE_PIPE_CLOSING_STATE         0x00000004
-
-#define FILE_PIPE_CLIENT_END            0x00000000
-#define FILE_PIPE_SERVER_END            0x00000001
-
-#define FILE_PIPE_READ_DATA             0x00000000
-#define FILE_PIPE_WRITE_SPACE           0x00000001
-
-#define FILE_STORAGE_TYPE_SPECIFIED             0x00000041  /* FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE */
-#define FILE_STORAGE_TYPE_DEFAULT               (StorageTypeDefault << FILE_STORAGE_TYPE_SHIFT)
-#define FILE_STORAGE_TYPE_DIRECTORY             (StorageTypeDirectory << FILE_STORAGE_TYPE_SHIFT)
-#define FILE_STORAGE_TYPE_FILE                  (StorageTypeFile << FILE_STORAGE_TYPE_SHIFT)
-#define FILE_STORAGE_TYPE_DOCFILE               (StorageTypeDocfile << FILE_STORAGE_TYPE_SHIFT)
-#define FILE_STORAGE_TYPE_JUNCTION_POINT        (StorageTypeJunctionPoint << FILE_STORAGE_TYPE_SHIFT)
-#define FILE_STORAGE_TYPE_CATALOG               (StorageTypeCatalog << FILE_STORAGE_TYPE_SHIFT)
-#define FILE_STORAGE_TYPE_STRUCTURED_STORAGE    (StorageTypeStructuredStorage << FILE_STORAGE_TYPE_SHIFT)
-#define FILE_STORAGE_TYPE_EMBEDDING             (StorageTypeEmbedding << FILE_STORAGE_TYPE_SHIFT)
-#define FILE_STORAGE_TYPE_STREAM                (StorageTypeStream << FILE_STORAGE_TYPE_SHIFT)
-#define FILE_MINIMUM_STORAGE_TYPE               FILE_STORAGE_TYPE_DEFAULT
-#define FILE_MAXIMUM_STORAGE_TYPE               FILE_STORAGE_TYPE_STREAM
-#define FILE_STORAGE_TYPE_MASK                  0x000f0000
-#define FILE_STORAGE_TYPE_SHIFT                 16
-
-#define FILE_VC_QUOTA_NONE              0x00000000
-#define FILE_VC_QUOTA_TRACK             0x00000001
-#define FILE_VC_QUOTA_ENFORCE           0x00000002
-#define FILE_VC_QUOTA_MASK              0x00000003
-
-#define FILE_VC_QUOTAS_LOG_VIOLATIONS   0x00000004
-#define FILE_VC_CONTENT_INDEX_DISABLED  0x00000008
-
-#define FILE_VC_LOG_QUOTA_THRESHOLD     0x00000010
-#define FILE_VC_LOG_QUOTA_LIMIT         0x00000020
-#define FILE_VC_LOG_VOLUME_THRESHOLD    0x00000040
-#define FILE_VC_LOG_VOLUME_LIMIT        0x00000080
-
-#define FILE_VC_QUOTAS_INCOMPLETE       0x00000100
-#define FILE_VC_QUOTAS_REBUILDING       0x00000200
-
-#define FILE_VC_VALID_MASK              0x000003ff
-
-#define FSRTL_FLAG_FILE_MODIFIED        (0x01)
-#define FSRTL_FLAG_FILE_LENGTH_CHANGED  (0x02)
-#define FSRTL_FLAG_LIMIT_MODIFIED_PAGES (0x04)
-#define FSRTL_FLAG_ACQUIRE_MAIN_RSRC_EX (0x08)
-#define FSRTL_FLAG_ACQUIRE_MAIN_RSRC_SH (0x10)
-#define FSRTL_FLAG_USER_MAPPED_FILE     (0x20)
-#define FSRTL_FLAG_EOF_ADVANCE_ACTIVE   (0x80)
-
-#define FSRTL_FLAG2_DO_MODIFIED_WRITE   (0x01)
-
-#define FSRTL_FSP_TOP_LEVEL_IRP         (0x01)
-#define FSRTL_CACHE_TOP_LEVEL_IRP       (0x02)
-#define FSRTL_MOD_WRITE_TOP_LEVEL_IRP   (0x03)
-#define FSRTL_FAST_IO_TOP_LEVEL_IRP     (0x04)
-#define FSRTL_MAX_TOP_LEVEL_IRP_FLAG    (0x04)
-
-#define FSRTL_VOLUME_DISMOUNT           1
-#define FSRTL_VOLUME_DISMOUNT_FAILED    2
-#define FSRTL_VOLUME_LOCK               3
-#define FSRTL_VOLUME_LOCK_FAILED        4
-#define FSRTL_VOLUME_UNLOCK             5
-#define FSRTL_VOLUME_MOUNT              6
-
-#define FSRTL_WILD_CHARACTER            0x08
-
-#ifdef _X86_
-#define HARDWARE_PTE    HARDWARE_PTE_X86
-#define PHARDWARE_PTE   PHARDWARE_PTE_X86
-#else
-#define HARDWARE_PTE    ULONG
-#define PHARDWARE_PTE   PULONG
-#endif
-
-#define IO_CHECK_CREATE_PARAMETERS      0x0200
-#define IO_ATTACH_DEVICE                0x0400
-
-#define IO_ATTACH_DEVICE_API            0x80000000
-/* also in winnt.h */
-#define IO_COMPLETION_QUERY_STATE       0x0001
-#define IO_COMPLETION_MODIFY_STATE      0x0002
-#define IO_COMPLETION_ALL_ACCESS        (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3)
-/* end winnt.h */
-#define IO_FILE_OBJECT_NON_PAGED_POOL_CHARGE    64
-#define IO_FILE_OBJECT_PAGED_POOL_CHARGE        1024
-
-#define IO_TYPE_APC                     18
-#define IO_TYPE_DPC                     19
-#define IO_TYPE_DEVICE_QUEUE            20
-#define IO_TYPE_EVENT_PAIR              21
-#define IO_TYPE_INTERRUPT               22
-#define IO_TYPE_PROFILE                 23
-
-#define IRP_BEING_VERIFIED              0x10
-
-#define MAILSLOT_CLASS_FIRSTCLASS       1
-#define MAILSLOT_CLASS_SECONDCLASS      2
-
-#define MAILSLOT_SIZE_AUTO              0
-
-#define MAP_PROCESS                     1L
-#define MAP_SYSTEM                      2L
-#define MEM_DOS_LIM                     0x40000000
-/* also in winnt.h */
-#define MEM_IMAGE                       SEC_IMAGE
-/* end winnt.h */ 
-#define OB_TYPE_TYPE                    1
-#define OB_TYPE_DIRECTORY               2
-#define OB_TYPE_SYMBOLIC_LINK           3
-#define OB_TYPE_TOKEN                   4
-#define OB_TYPE_PROCESS                 5
-#define OB_TYPE_THREAD                  6
-#define OB_TYPE_EVENT                   7
-#define OB_TYPE_EVENT_PAIR              8
-#define OB_TYPE_MUTANT                  9
-#define OB_TYPE_SEMAPHORE               10
-#define OB_TYPE_TIMER                   11
-#define OB_TYPE_PROFILE                 12
-#define OB_TYPE_WINDOW_STATION          13
-#define OB_TYPE_DESKTOP                 14
-#define OB_TYPE_SECTION                 15
-#define OB_TYPE_KEY                     16
-#define OB_TYPE_PORT                    17
-#define OB_TYPE_ADAPTER                 18
-#define OB_TYPE_CONTROLLER              19
-#define OB_TYPE_DEVICE                  20
-#define OB_TYPE_DRIVER                  21
-#define OB_TYPE_IO_COMPLETION           22
-#define OB_TYPE_FILE                    23
-
-#define PIN_WAIT                        (1)
-#define PIN_EXCLUSIVE                   (2)
-#define PIN_NO_READ                     (4)
-#define PIN_IF_BCB                      (8)
-
-#define PORT_CONNECT                    0x0001
-#define PORT_ALL_ACCESS                 (STANDARD_RIGHTS_ALL |\
-                                         PORT_CONNECT)
-/* also in winnt.h */
-#define SEC_BASED	0x00200000
-#define SEC_NO_CHANGE	0x00400000
-#define SEC_FILE	0x00800000
-#define SEC_IMAGE	0x01000000
-#define SEC_VLM		0x02000000
-#define SEC_RESERVE	0x04000000
-#define SEC_COMMIT	0x08000000
-#define SEC_NOCACHE	0x10000000
-
-#define SECURITY_WORLD_SID_AUTHORITY    {0,0,0,0,0,1}
-#define SECURITY_WORLD_RID              (0x00000000L)
-
-#define SID_REVISION                    1
-
-#define TOKEN_ASSIGN_PRIMARY            (0x0001)
-#define TOKEN_DUPLICATE                 (0x0002)
-#define TOKEN_IMPERSONATE               (0x0004)
-#define TOKEN_QUERY                     (0x0008)
-#define TOKEN_QUERY_SOURCE              (0x0010)
-#define TOKEN_ADJUST_PRIVILEGES         (0x0020)
-#define TOKEN_ADJUST_GROUPS             (0x0040)
-#define TOKEN_ADJUST_DEFAULT            (0x0080)
-
-#define TOKEN_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED |\
-                          TOKEN_ASSIGN_PRIMARY     |\
-                          TOKEN_DUPLICATE          |\
-                          TOKEN_IMPERSONATE        |\
-                          TOKEN_QUERY              |\
-                          TOKEN_QUERY_SOURCE       |\
-                          TOKEN_ADJUST_PRIVILEGES  |\
-                          TOKEN_ADJUST_GROUPS      |\
-                          TOKEN_ADJUST_DEFAULT)
-
-#define TOKEN_READ       (STANDARD_RIGHTS_READ     |\
-                          TOKEN_QUERY)
-
-#define TOKEN_WRITE      (STANDARD_RIGHTS_WRITE    |\
-                          TOKEN_ADJUST_PRIVILEGES  |\
-                          TOKEN_ADJUST_GROUPS      |\
-                          TOKEN_ADJUST_DEFAULT)
-
-#define TOKEN_EXECUTE    (STANDARD_RIGHTS_EXECUTE)
-
-#define TOKEN_SOURCE_LENGTH 8
-/* end winnt.h */
-
-#define TOKEN_HAS_TRAVERSE_PRIVILEGE    0x01
-#define TOKEN_HAS_BACKUP_PRIVILEGE      0x02
-#define TOKEN_HAS_RESTORE_PRIVILEGE     0x04
-#define TOKEN_HAS_ADMIN_GROUP           0x08
-#define TOKEN_IS_RESTRICTED             0x10
-
-#define VACB_MAPPING_GRANULARITY        (0x40000)
-#define VACB_OFFSET_SHIFT               (18)
-
-#define FSCTL_REQUEST_OPLOCK_LEVEL_1    CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  0, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_REQUEST_OPLOCK_LEVEL_2    CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  1, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_REQUEST_BATCH_OPLOCK      CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  2, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_OPLOCK_BREAK_ACKNOWLEDGE  CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  3, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_OPBATCH_ACK_CLOSE_PENDING CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  4, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_OPLOCK_BREAK_NOTIFY       CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  5, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_LOCK_VOLUME               CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  6, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_UNLOCK_VOLUME             CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  7, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_DISMOUNT_VOLUME           CTL_CODE(FILE_DEVICE_FILE_SYSTEM,  8, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define FSCTL_IS_VOLUME_MOUNTED         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 10, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_IS_PATHNAME_VALID         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 11, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_MARK_VOLUME_DIRTY         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 12, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define FSCTL_QUERY_RETRIEVAL_POINTERS  CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 14,  METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_GET_COMPRESSION           CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 15, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_SET_COMPRESSION           CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA)
-
-
-#define FSCTL_MARK_AS_SYSTEM_HIVE       CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 19,  METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_OPLOCK_BREAK_ACK_NO_2     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 20, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_INVALIDATE_VOLUMES        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 21, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_QUERY_FAT_BPB             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 22, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_REQUEST_FILTER_OPLOCK     CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 23, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_FILESYSTEM_GET_STATISTICS CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 24, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#if (VER_PRODUCTBUILD >= 1381)
-
-#define FSCTL_GET_NTFS_VOLUME_DATA      CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 25, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_GET_NTFS_FILE_RECORD      CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 26, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_GET_VOLUME_BITMAP         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 27,  METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_GET_RETRIEVAL_POINTERS    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 28,  METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_MOVE_FILE                 CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 29, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_IS_VOLUME_DIRTY           CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_GET_HFS_INFORMATION       CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 31, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_ALLOW_EXTENDED_DASD_IO    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 32, METHOD_NEITHER,  FILE_ANY_ACCESS)
-
-#endif /* (VER_PRODUCTBUILD >= 1381) */
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-#define FSCTL_READ_PROPERTY_DATA        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 33, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_WRITE_PROPERTY_DATA       CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 34, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_FIND_FILES_BY_SID         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 35, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define FSCTL_DUMP_PROPERTY_DATA        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 37,  METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_SET_OBJECT_ID             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_GET_OBJECT_ID             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 39, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_DELETE_OBJECT_ID          CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 40, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_SET_REPARSE_POINT         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_GET_REPARSE_POINT         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_DELETE_REPARSE_POINT      CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_ENUM_USN_DATA             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 44,  METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_SECURITY_ID_CHECK         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 45,  METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_READ_USN_JOURNAL          CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 46,  METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_SET_OBJECT_ID_EXTENDED    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 47, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_CREATE_OR_GET_OBJECT_ID   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 48, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_SET_SPARSE                CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_SET_ZERO_DATA             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_QUERY_ALLOCATED_RANGES    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 51,  METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_ENABLE_UPGRADE            CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 52, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_SET_ENCRYPTION            CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 53, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_ENCRYPTION_FSCTL_IO       CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 54,  METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_WRITE_RAW_ENCRYPTED       CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 55,  METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_READ_RAW_ENCRYPTED        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 56,  METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_CREATE_USN_JOURNAL        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 57,  METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_READ_FILE_USN_DATA        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 58,  METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_WRITE_USN_CLOSE_RECORD    CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 59,  METHOD_NEITHER, FILE_READ_DATA)
-#define FSCTL_EXTEND_VOLUME             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 60, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_QUERY_USN_JOURNAL         CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 61, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_DELETE_USN_JOURNAL        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 62, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_MARK_HANDLE               CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_SIS_COPYFILE              CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 64, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_SIS_LINK_FILES            CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 65, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA)
-#define FSCTL_HSM_MSG                   CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 66, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA)
-#define FSCTL_NSS_CONTROL               CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 67, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_HSM_DATA                  CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 68, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA)
-#define FSCTL_RECALL_FILE               CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 69, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_NSS_RCONTROL              CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 70, METHOD_BUFFERED, FILE_READ_DATA)
-#define FSCTL_READ_FROM_PLEX            CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 71, METHOD_OUT_DIRECT, FILE_READ_DATA)
-#define FSCTL_FILE_PREFETCH             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 72, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-#define FSCTL_MAILSLOT_PEEK             CTL_CODE(FILE_DEVICE_MAILSLOT, 0, METHOD_NEITHER, FILE_READ_DATA)
-
-#define FSCTL_NETWORK_SET_CONFIGURATION_INFO    CTL_CODE(FILE_DEVICE_NETWORK_FILE_SYSTEM, 102, METHOD_IN_DIRECT, FILE_ANY_ACCESS)
-#define FSCTL_NETWORK_GET_CONFIGURATION_INFO    CTL_CODE(FILE_DEVICE_NETWORK_FILE_SYSTEM, 103, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-#define FSCTL_NETWORK_GET_CONNECTION_INFO       CTL_CODE(FILE_DEVICE_NETWORK_FILE_SYSTEM, 104, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_NETWORK_ENUMERATE_CONNECTIONS     CTL_CODE(FILE_DEVICE_NETWORK_FILE_SYSTEM, 105, METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSCTL_NETWORK_DELETE_CONNECTION         CTL_CODE(FILE_DEVICE_NETWORK_FILE_SYSTEM, 107, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_NETWORK_GET_STATISTICS            CTL_CODE(FILE_DEVICE_NETWORK_FILE_SYSTEM, 116, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_NETWORK_SET_DOMAIN_NAME           CTL_CODE(FILE_DEVICE_NETWORK_FILE_SYSTEM, 120, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_NETWORK_REMOTE_BOOT_INIT_SCRT     CTL_CODE(FILE_DEVICE_NETWORK_FILE_SYSTEM, 250, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define FSCTL_PIPE_ASSIGN_EVENT         CTL_CODE(FILE_DEVICE_NAMED_PIPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_PIPE_DISCONNECT           CTL_CODE(FILE_DEVICE_NAMED_PIPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_PIPE_LISTEN               CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_PIPE_PEEK                 CTL_CODE(FILE_DEVICE_NAMED_PIPE, 3, METHOD_BUFFERED, FILE_READ_DATA)
-#define FSCTL_PIPE_QUERY_EVENT          CTL_CODE(FILE_DEVICE_NAMED_PIPE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_PIPE_TRANSCEIVE           CTL_CODE(FILE_DEVICE_NAMED_PIPE, 5, METHOD_NEITHER,  FILE_READ_DATA | FILE_WRITE_DATA)
-#define FSCTL_PIPE_WAIT                 CTL_CODE(FILE_DEVICE_NAMED_PIPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_PIPE_IMPERSONATE          CTL_CODE(FILE_DEVICE_NAMED_PIPE, 7, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_PIPE_SET_CLIENT_PROCESS   CTL_CODE(FILE_DEVICE_NAMED_PIPE, 8, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_PIPE_QUERY_CLIENT_PROCESS CTL_CODE(FILE_DEVICE_NAMED_PIPE, 9, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_PIPE_INTERNAL_READ        CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2045, METHOD_BUFFERED, FILE_READ_DATA)
-#define FSCTL_PIPE_INTERNAL_WRITE       CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2046, METHOD_BUFFERED, FILE_WRITE_DATA)
-#define FSCTL_PIPE_INTERNAL_TRANSCEIVE  CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2047, METHOD_NEITHER, FILE_READ_DATA | FILE_WRITE_DATA)
-#define FSCTL_PIPE_INTERNAL_READ_OVFLOW CTL_CODE(FILE_DEVICE_NAMED_PIPE, 2048, METHOD_BUFFERED, FILE_READ_DATA)
-
-#define IOCTL_REDIR_QUERY_PATH          CTL_CODE(FILE_DEVICE_NETWORK_FILE_SYSTEM, 99, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-typedef PVOID PEJOB;
-typedef PVOID OPLOCK, *POPLOCK;
-typedef PVOID PWOW64_PROCESS;
-
-typedef struct _CACHE_MANAGER_CALLBACKS         *PCACHE_MANAGER_CALLBACKS;
-typedef struct _EPROCESS_QUOTA_BLOCK            *PEPROCESS_QUOTA_BLOCK;
-typedef struct _FILE_GET_QUOTA_INFORMATION      *PFILE_GET_QUOTA_INFORMATION;
-typedef struct _HANDLE_TABLE                    *PHANDLE_TABLE;
-typedef struct _KEVENT_PAIR                     *PKEVENT_PAIR;
-typedef struct _KPROCESS                        *PKPROCESS;
-typedef struct _KQUEUE                          *PKQUEUE;
-typedef struct _KTRAP_FRAME                     *PKTRAP_FRAME;
-typedef struct _MAILSLOT_CREATE_PARAMETERS      *PMAILSLOT_CREATE_PARAMETERS;
-typedef struct _MMWSL                           *PMMWSL;
-typedef struct _NAMED_PIPE_CREATE_PARAMETERS    *PNAMED_PIPE_CREATE_PARAMETERS;
-typedef struct _OBJECT_DIRECTORY                *POBJECT_DIRECTORY;
-typedef struct _PAGEFAULT_HISTORY               *PPAGEFAULT_HISTORY;
-typedef struct _PS_IMPERSONATION_INFORMATION    *PPS_IMPERSONATION_INFORMATION;
-typedef struct _SECTION_OBJECT                  *PSECTION_OBJECT;
-typedef struct _SHARED_CACHE_MAP                *PSHARED_CACHE_MAP;
-typedef struct _TERMINATION_PORT                *PTERMINATION_PORT;
-typedef struct _VACB                            *PVACB;
-typedef struct _VAD_HEADER                      *PVAD_HEADER;
-
-typedef struct _NOTIFY_SYNC
-{
-    ULONG Unknown0;
-    ULONG Unknown1;
-    ULONG Unknown2;
-    USHORT Unknown3;
-    USHORT Unknown4;
-    ULONG Unknown5;
-    ULONG Unknown6;
-    ULONG Unknown7;
-    ULONG Unknown8;
-    ULONG Unknown9;
-    ULONG Unknown10;
-} NOTIFY_SYNC, * PNOTIFY_SYNC;
-
-typedef enum _FAST_IO_POSSIBLE {
-    FastIoIsNotPossible,
-    FastIoIsPossible,
-    FastIoIsQuestionable
-} FAST_IO_POSSIBLE;
-
-typedef enum _FILE_STORAGE_TYPE {
-    StorageTypeDefault = 1,
-    StorageTypeDirectory,
-    StorageTypeFile,
-    StorageTypeJunctionPoint,
-    StorageTypeCatalog,
-    StorageTypeStructuredStorage,
-    StorageTypeEmbedding,
-    StorageTypeStream
-} FILE_STORAGE_TYPE;
-
-typedef enum _IO_COMPLETION_INFORMATION_CLASS {
-    IoCompletionBasicInformation
-} IO_COMPLETION_INFORMATION_CLASS;
-
-typedef enum _OBJECT_INFO_CLASS {
-    ObjectBasicInfo,
-    ObjectNameInfo,
-    ObjectTypeInfo,
-    ObjectAllTypesInfo,
-    ObjectProtectionInfo
-} OBJECT_INFO_CLASS;
-
-typedef struct _HARDWARE_PTE_X86 {
-    ULONG Valid             : 1;
-    ULONG Write             : 1;
-    ULONG Owner             : 1;
-    ULONG WriteThrough      : 1;
-    ULONG CacheDisable      : 1;
-    ULONG Accessed          : 1;
-    ULONG Dirty             : 1;
-    ULONG LargePage         : 1;
-    ULONG Global            : 1;
-    ULONG CopyOnWrite       : 1;
-    ULONG Prototype         : 1;
-    ULONG reserved          : 1;
-    ULONG PageFrameNumber   : 20;
-} HARDWARE_PTE_X86, *PHARDWARE_PTE_X86;
-
-typedef struct _KAPC_STATE {
-    LIST_ENTRY  ApcListHead[2];
-    PKPROCESS   Process;
-    BOOLEAN     KernelApcInProgress;
-    BOOLEAN     KernelApcPending;
-    BOOLEAN     UserApcPending;
-} KAPC_STATE, *PKAPC_STATE;
-
-typedef struct _KGDTENTRY {
-    USHORT LimitLow;
-    USHORT BaseLow;
-    union {
-        struct {
-            UCHAR BaseMid;
-            UCHAR Flags1;
-            UCHAR Flags2;
-            UCHAR BaseHi;
-        } Bytes;
-        struct {
-            ULONG BaseMid       : 8;
-            ULONG Type          : 5;
-            ULONG Dpl           : 2;
-            ULONG Pres          : 1;
-            ULONG LimitHi       : 4;
-            ULONG Sys           : 1;
-            ULONG Reserved_0    : 1;
-            ULONG Default_Big   : 1;
-            ULONG Granularity   : 1;
-            ULONG BaseHi        : 8;
-        } Bits;
-    } HighWord;
-} KGDTENTRY, *PKGDTENTRY;
-
-typedef struct _KIDTENTRY {
-    USHORT Offset;
-    USHORT Selector;
-    USHORT Access;
-    USHORT ExtendedOffset;
-} KIDTENTRY, *PKIDTENTRY;
-
-#if (VER_PRODUCTBUILD >= 2600)
-
-typedef struct _MMSUPPORT_FLAGS {
-    ULONG SessionSpace              : 1;
-    ULONG BeingTrimmed              : 1;
-    ULONG SessionLeader             : 1;
-    ULONG TrimHard                  : 1;
-    ULONG WorkingSetHard            : 1;
-    ULONG AddressSpaceBeingDeleted  : 1;
-    ULONG Available                 : 10;
-    ULONG AllowWorkingSetAdjustment : 8;
-    ULONG MemoryPriority            : 8;
-} MMSUPPORT_FLAGS, *PMMSUPPORT_FLAGS;
-
-#else
-
-typedef struct _MMSUPPORT_FLAGS {
-    ULONG SessionSpace      : 1;
-    ULONG BeingTrimmed      : 1;
-    ULONG ProcessInSession  : 1;
-    ULONG SessionLeader     : 1;
-    ULONG TrimHard          : 1;
-    ULONG WorkingSetHard    : 1;
-    ULONG WriteWatch        : 1;
-    ULONG Filler            : 25;
-} MMSUPPORT_FLAGS, *PMMSUPPORT_FLAGS;
-
-#endif
-
-#if (VER_PRODUCTBUILD >= 2600)
-
-typedef struct _MMSUPPORT {
-    LARGE_INTEGER   LastTrimTime;
-    MMSUPPORT_FLAGS Flags;
-    ULONG           PageFaultCount;
-    ULONG           PeakWorkingSetSize;
-    ULONG           WorkingSetSize;
-    ULONG           MinimumWorkingSetSize;
-    ULONG           MaximumWorkingSetSize;
-    PMMWSL          VmWorkingSetList;
-    LIST_ENTRY      WorkingSetExpansionLinks;
-    ULONG           Claim;
-    ULONG           NextEstimationSlot;
-    ULONG           NextAgingSlot;
-    ULONG           EstimatedAvailable;
-    ULONG           GrowthSinceLastEstimate;
-} MMSUPPORT, *PMMSUPPORT;
-
-#else
-
-typedef struct _MMSUPPORT {
-    LARGE_INTEGER   LastTrimTime;
-    ULONG           LastTrimFaultCount;
-    ULONG           PageFaultCount;
-    ULONG           PeakWorkingSetSize;
-    ULONG           WorkingSetSize;
-    ULONG           MinimumWorkingSetSize;
-    ULONG           MaximumWorkingSetSize;
-    PMMWSL          VmWorkingSetList;
-    LIST_ENTRY      WorkingSetExpansionLinks;
-    BOOLEAN         AllowWorkingSetAdjustment;
-    BOOLEAN         AddressSpaceBeingDeleted;
-    UCHAR           ForegroundSwitchCount;
-    UCHAR           MemoryPriority;
-#if (VER_PRODUCTBUILD >= 2195)
-    union {
-        ULONG           LongFlags;
-        MMSUPPORT_FLAGS Flags;
-    } u;
-    ULONG           Claim;
-    ULONG           NextEstimationSlot;
-    ULONG           NextAgingSlot;
-    ULONG           EstimatedAvailable;
-    ULONG           GrowthSinceLastEstimate;
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-} MMSUPPORT, *PMMSUPPORT;
-
-#endif
-
-typedef struct _SE_AUDIT_PROCESS_CREATION_INFO {
-    POBJECT_NAME_INFORMATION ImageFileName;
-} SE_AUDIT_PROCESS_CREATION_INFO, *PSE_AUDIT_PROCESS_CREATION_INFO;
-
-typedef struct _BITMAP_RANGE {
-    LIST_ENTRY      Links;
-    LARGE_INTEGER   BasePage;
-    ULONG           FirstDirtyPage;
-    ULONG           LastDirtyPage;
-    ULONG           DirtyPages;
-    PULONG          Bitmap;
-} BITMAP_RANGE, *PBITMAP_RANGE;
-
-typedef struct _CACHE_UNINITIALIZE_EVENT {
-    struct _CACHE_UNINITIALIZE_EVENT    *Next;
-    KEVENT                              Event;
-} CACHE_UNINITIALIZE_EVENT, *PCACHE_UNINITIALIZE_EVENT;
-
-typedef struct _CC_FILE_SIZES {
-    LARGE_INTEGER AllocationSize;
-    LARGE_INTEGER FileSize;
-    LARGE_INTEGER ValidDataLength;
-} CC_FILE_SIZES, *PCC_FILE_SIZES;
-
-typedef struct _COMPRESSED_DATA_INFO {
-    USHORT  CompressionFormatAndEngine;
-    UCHAR   CompressionUnitShift;
-    UCHAR   ChunkShift;
-    UCHAR   ClusterShift;
-    UCHAR   Reserved;
-    USHORT  NumberOfChunks;
-    ULONG   CompressedChunkSizes[ANYSIZE_ARRAY];
-} COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO;
-
-typedef struct _DEVICE_MAP {
-    POBJECT_DIRECTORY   DosDevicesDirectory;
-    POBJECT_DIRECTORY   GlobalDosDevicesDirectory;
-    ULONG               ReferenceCount;
-    ULONG               DriveMap;
-    UCHAR               DriveType[32];
-} DEVICE_MAP, *PDEVICE_MAP; 
-
-#if (VER_PRODUCTBUILD >= 2600)
-
-typedef struct _EX_FAST_REF {
-    _ANONYMOUS_UNION union {
-        PVOID Object;
-        ULONG RefCnt : 3;
-        ULONG Value;
-    } DUMMYUNIONNAME;
-} EX_FAST_REF, *PEX_FAST_REF;
-
-typedef struct _EX_PUSH_LOCK {
-    _ANONYMOUS_UNION union {
-        _ANONYMOUS_STRUCT struct {
-            ULONG   Waiting     : 1;
-            ULONG   Exclusive   : 1;
-            ULONG   Shared      : 30;
-        } DUMMYSTRUCTNAME;
-        ULONG   Value;
-        PVOID   Ptr;
-    } DUMMYUNIONNAME;
-} EX_PUSH_LOCK, *PEX_PUSH_LOCK;
-
-typedef struct _EX_RUNDOWN_REF {
-    _ANONYMOUS_UNION union {
-        ULONG Count;
-        PVOID Ptr;
-    } DUMMYUNIONNAME;
-} EX_RUNDOWN_REF, *PEX_RUNDOWN_REF;
-
-#endif
-
-typedef struct _EPROCESS_QUOTA_ENTRY {
-    ULONG Usage;
-    ULONG Limit;
-    ULONG Peak;
-    ULONG Return;
-} EPROCESS_QUOTA_ENTRY, *PEPROCESS_QUOTA_ENTRY;
-
-typedef struct _EPROCESS_QUOTA_BLOCK {
-    EPROCESS_QUOTA_ENTRY    QuotaEntry[3];
-    LIST_ENTRY              QuotaList;
-    ULONG                   ReferenceCount;
-    ULONG                   ProcessCount;
-} EPROCESS_QUOTA_BLOCK, *PEPROCESS_QUOTA_BLOCK;
-
-/*
- * When needing these parameters cast your PIO_STACK_LOCATION to
- * PEXTENDED_IO_STACK_LOCATION
- */
-#if !defined(_ALPHA_)
-#include <pshpack4.h>
-#endif
-typedef struct _EXTENDED_IO_STACK_LOCATION {
-
-    /* Included for padding */
-    UCHAR MajorFunction;
-    UCHAR MinorFunction;
-    UCHAR Flags;
-    UCHAR Control;
-
-    union {
-
-       struct {
-          PIO_SECURITY_CONTEXT              SecurityContext;
-          ULONG                             Options;
-          USHORT                            Reserved;
-          USHORT                            ShareAccess;
-          PMAILSLOT_CREATE_PARAMETERS       Parameters;
-       } CreateMailslot;
-
-        struct {
-            PIO_SECURITY_CONTEXT            SecurityContext;
-            ULONG                           Options;
-            USHORT                          Reserved;
-            USHORT                          ShareAccess;
-            PNAMED_PIPE_CREATE_PARAMETERS   Parameters;
-        } CreatePipe;
-
-        struct {
-            ULONG                           OutputBufferLength;
-            ULONG                           InputBufferLength;
-            ULONG                           FsControlCode;
-            PVOID                           Type3InputBuffer;
-        } FileSystemControl;
-
-        struct {
-            PLARGE_INTEGER                  Length;
-            ULONG                           Key;
-            LARGE_INTEGER                   ByteOffset;
-        } LockControl;
-
-        struct {
-            ULONG                           Length;
-            ULONG                           CompletionFilter;
-        } NotifyDirectory;
-
-        struct {
-            ULONG                           Length;
-            PUNICODE_STRING                 FileName;
-            FILE_INFORMATION_CLASS          FileInformationClass;
-            ULONG                           FileIndex;
-        } QueryDirectory;
-
-        struct {
-            ULONG                           Length;
-            PVOID                           EaList;
-            ULONG                           EaListLength;
-            ULONG                           EaIndex;
-        } QueryEa;
-
-        struct {
-            ULONG                           Length;
-            PSID                            StartSid;
-            PFILE_GET_QUOTA_INFORMATION     SidList;
-            ULONG                           SidListLength;
-        } QueryQuota;
-
-        struct {
-            ULONG                           Length;
-        } SetEa;
-
-        struct {
-            ULONG                           Length;
-        } SetQuota;
-
-        struct {
-            ULONG                           Length;
-            FS_INFORMATION_CLASS            FsInformationClass;
-        } SetVolume;
-
-    } Parameters;
-    PDEVICE_OBJECT  DeviceObject;
-    PFILE_OBJECT  FileObject;
-    PIO_COMPLETION_ROUTINE  CompletionRoutine;
-    PVOID  Context;
-
-} EXTENDED_IO_STACK_LOCATION, *PEXTENDED_IO_STACK_LOCATION;
-#if !defined(_ALPHA_)
-#include <poppack.h>
-#endif
-
-typedef struct _FILE_ACCESS_INFORMATION {
-    ACCESS_MASK AccessFlags;
-} FILE_ACCESS_INFORMATION, *PFILE_ACCESS_INFORMATION;
-
-typedef struct _FILE_ALLOCATION_INFORMATION {
-    LARGE_INTEGER AllocationSize;
-} FILE_ALLOCATION_INFORMATION, *PFILE_ALLOCATION_INFORMATION;
-
-typedef struct _FILE_BOTH_DIR_INFORMATION {
-    ULONG           NextEntryOffset;
-    ULONG           FileIndex;
-    LARGE_INTEGER   CreationTime;
-    LARGE_INTEGER   LastAccessTime;
-    LARGE_INTEGER   LastWriteTime;
-    LARGE_INTEGER   ChangeTime;
-    LARGE_INTEGER   EndOfFile;
-    LARGE_INTEGER   AllocationSize;
-    ULONG           FileAttributes;
-    ULONG           FileNameLength;
-    ULONG           EaSize;
-    CCHAR           ShortNameLength;
-    WCHAR           ShortName[12];
-    WCHAR           FileName[1];
-} FILE_BOTH_DIR_INFORMATION, *PFILE_BOTH_DIR_INFORMATION;
-
-typedef struct _FILE_COMPLETION_INFORMATION {
-    HANDLE  Port;
-    ULONG   Key;
-} FILE_COMPLETION_INFORMATION, *PFILE_COMPLETION_INFORMATION;
-
-typedef struct _FILE_COMPRESSION_INFORMATION {
-    LARGE_INTEGER   CompressedFileSize;
-    USHORT          CompressionFormat;
-    UCHAR           CompressionUnitShift;
-    UCHAR           ChunkShift;
-    UCHAR           ClusterShift;
-    UCHAR           Reserved[3];
-} FILE_COMPRESSION_INFORMATION, *PFILE_COMPRESSION_INFORMATION;
-
-typedef struct _FILE_COPY_ON_WRITE_INFORMATION {
-    BOOLEAN ReplaceIfExists;
-    HANDLE  RootDirectory;
-    ULONG   FileNameLength;
-    WCHAR   FileName[1];
-} FILE_COPY_ON_WRITE_INFORMATION, *PFILE_COPY_ON_WRITE_INFORMATION;
-
-typedef struct _FILE_DIRECTORY_INFORMATION {
-    ULONG           NextEntryOffset;
-    ULONG           FileIndex;
-    LARGE_INTEGER   CreationTime;
-    LARGE_INTEGER   LastAccessTime;
-    LARGE_INTEGER   LastWriteTime;
-    LARGE_INTEGER   ChangeTime;
-    LARGE_INTEGER   EndOfFile;
-    LARGE_INTEGER   AllocationSize;
-    ULONG           FileAttributes;
-    ULONG           FileNameLength;
-    WCHAR           FileName[1];
-} FILE_DIRECTORY_INFORMATION, *PFILE_DIRECTORY_INFORMATION;
-
-typedef struct _FILE_FULL_DIRECTORY_INFORMATION {
-		ULONG	          NextEntryOffset;
-		ULONG	          FileIndex;
-		LARGE_INTEGER   CreationTime;
-		LARGE_INTEGER   LastAccessTime;
-		LARGE_INTEGER   LastWriteTime;
-		LARGE_INTEGER   ChangeTime;
-		LARGE_INTEGER   EndOfFile;
-		LARGE_INTEGER   AllocationSize;
-		ULONG           FileAttributes;
-		ULONG           FileNameLength;
-		ULONG           EaSize;
-		WCHAR           FileName[0];
-} FILE_FULL_DIRECTORY_INFORMATION, *PFILE_FULL_DIRECTORY_INFORMATION;
-
-typedef struct _FILE_BOTH_DIRECTORY_INFORMATION {
-		ULONG         NextEntryOffset;
-		ULONG	        FileIndex;
-		LARGE_INTEGER CreationTime;
-		LARGE_INTEGER LastAccessTime;
-		LARGE_INTEGER LastWriteTime;
-		LARGE_INTEGER ChangeTime;
-		LARGE_INTEGER EndOfFile;
-		LARGE_INTEGER AllocationSize;
-		ULONG         FileAttributes;
-		ULONG         FileNameLength;
-		ULONG         EaSize;
-		CHAR          ShortNameLength;
-		WCHAR         ShortName[12];
-		WCHAR         FileName[0];
-} FILE_BOTH_DIRECTORY_INFORMATION, *PFILE_BOTH_DIRECTORY_INFORMATION;
-
-typedef struct _FILE_EA_INFORMATION {
-    ULONG EaSize;
-} FILE_EA_INFORMATION, *PFILE_EA_INFORMATION;
-
-typedef struct _FILE_FS_ATTRIBUTE_INFORMATION {
-    ULONG   FileSystemAttributes;
-    ULONG   MaximumComponentNameLength;
-    ULONG   FileSystemNameLength;
-    WCHAR   FileSystemName[1];
-} FILE_FS_ATTRIBUTE_INFORMATION, *PFILE_FS_ATTRIBUTE_INFORMATION;
-
-typedef struct _FILE_FS_CONTROL_INFORMATION {
-    LARGE_INTEGER   FreeSpaceStartFiltering;
-    LARGE_INTEGER   FreeSpaceThreshold;
-    LARGE_INTEGER   FreeSpaceStopFiltering;
-    LARGE_INTEGER   DefaultQuotaThreshold;
-    LARGE_INTEGER   DefaultQuotaLimit;
-    ULONG           FileSystemControlFlags;
-} FILE_FS_CONTROL_INFORMATION, *PFILE_FS_CONTROL_INFORMATION;
-
-typedef struct _FILE_FS_FULL_SIZE_INFORMATION {
-    LARGE_INTEGER   TotalAllocationUnits;
-    LARGE_INTEGER   CallerAvailableAllocationUnits;
-    LARGE_INTEGER   ActualAvailableAllocationUnits;
-    ULONG           SectorsPerAllocationUnit;
-    ULONG           BytesPerSector;
-} FILE_FS_FULL_SIZE_INFORMATION, *PFILE_FS_FULL_SIZE_INFORMATION;
-
-typedef struct _FILE_FS_LABEL_INFORMATION {
-    ULONG VolumeLabelLength;
-    WCHAR VolumeLabel[1];
-} FILE_FS_LABEL_INFORMATION, *PFILE_FS_LABEL_INFORMATION;
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-typedef struct _FILE_FS_OBJECT_ID_INFORMATION {
-    UCHAR ObjectId[16];
-    UCHAR ExtendedInfo[48];
-} FILE_FS_OBJECT_ID_INFORMATION, *PFILE_FS_OBJECT_ID_INFORMATION;
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-typedef struct _FILE_FS_SIZE_INFORMATION {
-    LARGE_INTEGER   TotalAllocationUnits;
-    LARGE_INTEGER   AvailableAllocationUnits;
-    ULONG           SectorsPerAllocationUnit;
-    ULONG           BytesPerSector;
-} FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION;
-
-typedef struct _FILE_FS_VOLUME_INFORMATION {
-    LARGE_INTEGER   VolumeCreationTime;
-    ULONG           VolumeSerialNumber;
-    ULONG           VolumeLabelLength;
-    BOOLEAN         SupportsObjects;
-    WCHAR           VolumeLabel[1];
-} FILE_FS_VOLUME_INFORMATION, *PFILE_FS_VOLUME_INFORMATION;
-
-typedef struct _FILE_FULL_DIR_INFORMATION {
-    ULONG           NextEntryOffset;
-    ULONG           FileIndex;
-    LARGE_INTEGER   CreationTime;
-    LARGE_INTEGER   LastAccessTime;
-    LARGE_INTEGER   LastWriteTime;
-    LARGE_INTEGER   ChangeTime;
-    LARGE_INTEGER   EndOfFile;
-    LARGE_INTEGER   AllocationSize;
-    ULONG           FileAttributes;
-    ULONG           FileNameLength;
-    ULONG           EaSize;
-    WCHAR           FileName[1];
-} FILE_FULL_DIR_INFORMATION, *PFILE_FULL_DIR_INFORMATION;
-
-typedef struct _FILE_GET_EA_INFORMATION {
-    ULONG   NextEntryOffset;
-    UCHAR   EaNameLength;
-    CHAR    EaName[1];
-} FILE_GET_EA_INFORMATION, *PFILE_GET_EA_INFORMATION;
-
-typedef struct _FILE_GET_QUOTA_INFORMATION {
-    ULONG   NextEntryOffset;
-    ULONG   SidLength;
-    SID     Sid;
-} FILE_GET_QUOTA_INFORMATION, *PFILE_GET_QUOTA_INFORMATION;
-
-typedef struct _FILE_INTERNAL_INFORMATION {
-    LARGE_INTEGER IndexNumber;
-} FILE_INTERNAL_INFORMATION, *PFILE_INTERNAL_INFORMATION;
-
-typedef struct _FILE_LINK_INFORMATION {
-    BOOLEAN ReplaceIfExists;
-    HANDLE  RootDirectory;
-    ULONG   FileNameLength;
-    WCHAR   FileName[1];
-} FILE_LINK_INFORMATION, *PFILE_LINK_INFORMATION;
-
-typedef struct _FILE_LOCK_INFO {
-    LARGE_INTEGER   StartingByte;
-    LARGE_INTEGER   Length;
-    BOOLEAN         ExclusiveLock;
-    ULONG           Key;
-    PFILE_OBJECT    FileObject;
-    PEPROCESS       Process;
-    LARGE_INTEGER   EndingByte;
-} FILE_LOCK_INFO, *PFILE_LOCK_INFO;
-
-/* raw internal file lock struct returned from FsRtlGetNextFileLock */
-typedef struct _FILE_SHARED_LOCK_ENTRY {
-    PVOID           Unknown1;
-    PVOID           Unknown2;
-    FILE_LOCK_INFO  FileLock;
-} FILE_SHARED_LOCK_ENTRY, *PFILE_SHARED_LOCK_ENTRY;
-
-/* raw internal file lock struct returned from FsRtlGetNextFileLock */
-typedef struct _FILE_EXCLUSIVE_LOCK_ENTRY {
-    LIST_ENTRY      ListEntry;
-    PVOID           Unknown1;
-    PVOID           Unknown2;
-    FILE_LOCK_INFO  FileLock;
-} FILE_EXCLUSIVE_LOCK_ENTRY, *PFILE_EXCLUSIVE_LOCK_ENTRY;
-
-typedef NTSTATUS (*PCOMPLETE_LOCK_IRP_ROUTINE) (
-    IN PVOID    Context,
-    IN PIRP     Irp
-);
-
-typedef VOID (NTAPI *PUNLOCK_ROUTINE) (
-    IN PVOID            Context,
-    IN PFILE_LOCK_INFO  FileLockInfo
-);
-
-typedef struct _FILE_LOCK {
-    PCOMPLETE_LOCK_IRP_ROUTINE  CompleteLockIrpRoutine;
-    PUNLOCK_ROUTINE             UnlockRoutine;
-    BOOLEAN                     FastIoIsQuestionable;
-    BOOLEAN                     Pad[3];
-    PVOID                       LockInformation;
-    FILE_LOCK_INFO              LastReturnedLockInfo;
-    PVOID                       LastReturnedLock;
-} FILE_LOCK, *PFILE_LOCK;
-
-typedef struct _FILE_MAILSLOT_PEEK_BUFFER {
-    ULONG ReadDataAvailable;
-    ULONG NumberOfMessages;
-    ULONG MessageLength;
-} FILE_MAILSLOT_PEEK_BUFFER, *PFILE_MAILSLOT_PEEK_BUFFER;
-
-typedef struct _FILE_MAILSLOT_QUERY_INFORMATION {
-    ULONG           MaximumMessageSize;
-    ULONG           MailslotQuota;
-    ULONG           NextMessageSize;
-    ULONG           MessagesAvailable;
-    LARGE_INTEGER   ReadTimeout;
-} FILE_MAILSLOT_QUERY_INFORMATION, *PFILE_MAILSLOT_QUERY_INFORMATION;
-
-typedef struct _FILE_MAILSLOT_SET_INFORMATION {
-    LARGE_INTEGER ReadTimeout;
-} FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION;
-
-typedef struct _FILE_MODE_INFORMATION {
-    ULONG Mode;
-} FILE_MODE_INFORMATION, *PFILE_MODE_INFORMATION;
-
-typedef struct _FILE_ALL_INFORMATION {
-    FILE_BASIC_INFORMATION      BasicInformation;
-    FILE_STANDARD_INFORMATION   StandardInformation;
-    FILE_INTERNAL_INFORMATION   InternalInformation;
-    FILE_EA_INFORMATION         EaInformation;
-    FILE_ACCESS_INFORMATION     AccessInformation;
-    FILE_POSITION_INFORMATION   PositionInformation;
-    FILE_MODE_INFORMATION       ModeInformation;
-    FILE_ALIGNMENT_INFORMATION  AlignmentInformation;
-    FILE_NAME_INFORMATION       NameInformation;
-} FILE_ALL_INFORMATION, *PFILE_ALL_INFORMATION;
-
-typedef struct _FILE_NAMES_INFORMATION {
-    ULONG NextEntryOffset;
-    ULONG FileIndex;
-    ULONG FileNameLength;
-    WCHAR FileName[1];
-} FILE_NAMES_INFORMATION, *PFILE_NAMES_INFORMATION;
-
-typedef struct _FILE_OBJECTID_INFORMATION {
-    LONGLONG        FileReference;
-    UCHAR           ObjectId[16];
-    _ANONYMOUS_UNION union {
-        struct {
-            UCHAR   BirthVolumeId[16];
-            UCHAR   BirthObjectId[16];
-            UCHAR   DomainId[16];
-        } ;
-        UCHAR       ExtendedInfo[48];
-    } DUMMYUNIONNAME;
-} FILE_OBJECTID_INFORMATION, *PFILE_OBJECTID_INFORMATION;
-
-typedef struct _FILE_OLE_CLASSID_INFORMATION {
-    GUID ClassId;
-} FILE_OLE_CLASSID_INFORMATION, *PFILE_OLE_CLASSID_INFORMATION;
-
-typedef struct _FILE_OLE_ALL_INFORMATION {
-    FILE_BASIC_INFORMATION          BasicInformation;
-    FILE_STANDARD_INFORMATION       StandardInformation;
-    FILE_INTERNAL_INFORMATION       InternalInformation;
-    FILE_EA_INFORMATION             EaInformation;
-    FILE_ACCESS_INFORMATION         AccessInformation;
-    FILE_POSITION_INFORMATION       PositionInformation;
-    FILE_MODE_INFORMATION           ModeInformation;
-    FILE_ALIGNMENT_INFORMATION      AlignmentInformation;
-    USN                             LastChangeUsn;
-    USN                             ReplicationUsn;
-    LARGE_INTEGER                   SecurityChangeTime;
-    FILE_OLE_CLASSID_INFORMATION    OleClassIdInformation;
-    FILE_OBJECTID_INFORMATION       ObjectIdInformation;
-    FILE_STORAGE_TYPE               StorageType;
-    ULONG                           OleStateBits;
-    ULONG                           OleId;
-    ULONG                           NumberOfStreamReferences;
-    ULONG                           StreamIndex;
-    ULONG                           SecurityId;
-    BOOLEAN                         ContentIndexDisable;
-    BOOLEAN                         InheritContentIndexDisable;
-    FILE_NAME_INFORMATION           NameInformation;
-} FILE_OLE_ALL_INFORMATION, *PFILE_OLE_ALL_INFORMATION;
-
-typedef struct _FILE_OLE_DIR_INFORMATION {
-    ULONG               NextEntryOffset;
-    ULONG               FileIndex;
-    LARGE_INTEGER       CreationTime;
-    LARGE_INTEGER       LastAccessTime;
-    LARGE_INTEGER       LastWriteTime;
-    LARGE_INTEGER       ChangeTime;
-    LARGE_INTEGER       EndOfFile;
-    LARGE_INTEGER       AllocationSize;
-    ULONG               FileAttributes;
-    ULONG               FileNameLength;
-    FILE_STORAGE_TYPE   StorageType;
-    GUID                OleClassId;
-    ULONG               OleStateBits;
-    BOOLEAN             ContentIndexDisable;
-    BOOLEAN             InheritContentIndexDisable;
-    WCHAR               FileName[1];
-} FILE_OLE_DIR_INFORMATION, *PFILE_OLE_DIR_INFORMATION;
-
-typedef struct _FILE_OLE_INFORMATION {
-    LARGE_INTEGER                   SecurityChangeTime;
-    FILE_OLE_CLASSID_INFORMATION    OleClassIdInformation;
-    FILE_OBJECTID_INFORMATION       ObjectIdInformation;
-    FILE_STORAGE_TYPE               StorageType;
-    ULONG                           OleStateBits;
-    BOOLEAN                         ContentIndexDisable;
-    BOOLEAN                         InheritContentIndexDisable;
-} FILE_OLE_INFORMATION, *PFILE_OLE_INFORMATION;
-
-typedef struct _FILE_OLE_STATE_BITS_INFORMATION {
-    ULONG StateBits;
-    ULONG StateBitsMask;
-} FILE_OLE_STATE_BITS_INFORMATION, *PFILE_OLE_STATE_BITS_INFORMATION;
-
-typedef struct _FILE_PIPE_ASSIGN_EVENT_BUFFER {
-    HANDLE  EventHandle;
-    ULONG   KeyValue;
-} FILE_PIPE_ASSIGN_EVENT_BUFFER, *PFILE_PIPE_ASSIGN_EVENT_BUFFER;
-
-typedef struct _FILE_PIPE_CLIENT_PROCESS_BUFFER {
-    PVOID ClientSession;
-    PVOID ClientProcess;
-} FILE_PIPE_CLIENT_PROCESS_BUFFER, *PFILE_PIPE_CLIENT_PROCESS_BUFFER;
-
-typedef struct _FILE_PIPE_EVENT_BUFFER {
-    ULONG NamedPipeState;
-    ULONG EntryType;
-    ULONG ByteCount;
-    ULONG KeyValue;
-    ULONG NumberRequests;
-} FILE_PIPE_EVENT_BUFFER, *PFILE_PIPE_EVENT_BUFFER;
-
-typedef struct _FILE_PIPE_INFORMATION {
-    ULONG ReadMode;
-    ULONG CompletionMode;
-} FILE_PIPE_INFORMATION, *PFILE_PIPE_INFORMATION;
-
-typedef struct _FILE_PIPE_LOCAL_INFORMATION {
-    ULONG NamedPipeType;
-    ULONG NamedPipeConfiguration;
-    ULONG MaximumInstances;
-    ULONG CurrentInstances;
-    ULONG InboundQuota;
-    ULONG ReadDataAvailable;
-    ULONG OutboundQuota;
-    ULONG WriteQuotaAvailable;
-    ULONG NamedPipeState;
-    ULONG NamedPipeEnd;
-} FILE_PIPE_LOCAL_INFORMATION, *PFILE_PIPE_LOCAL_INFORMATION;
-
-typedef struct _FILE_PIPE_REMOTE_INFORMATION {
-    LARGE_INTEGER   CollectDataTime;
-    ULONG           MaximumCollectionCount;
-} FILE_PIPE_REMOTE_INFORMATION, *PFILE_PIPE_REMOTE_INFORMATION;
-
-typedef struct _FILE_PIPE_WAIT_FOR_BUFFER {
-    LARGE_INTEGER   Timeout;
-    ULONG           NameLength;
-    BOOLEAN         TimeoutSpecified;
-    WCHAR           Name[1];
-} FILE_PIPE_WAIT_FOR_BUFFER, *PFILE_PIPE_WAIT_FOR_BUFFER;
-
-typedef struct _FILE_QUOTA_INFORMATION {
-    ULONG           NextEntryOffset;
-    ULONG           SidLength;
-    LARGE_INTEGER   ChangeTime;
-    LARGE_INTEGER   QuotaUsed;
-    LARGE_INTEGER   QuotaThreshold;
-    LARGE_INTEGER   QuotaLimit;
-    SID             Sid;
-} FILE_QUOTA_INFORMATION, *PFILE_QUOTA_INFORMATION;
-
-typedef struct _FILE_RENAME_INFORMATION {
-    BOOLEAN ReplaceIfExists;
-    HANDLE  RootDirectory;
-    ULONG   FileNameLength;
-    WCHAR   FileName[1];
-} FILE_RENAME_INFORMATION, *PFILE_RENAME_INFORMATION;
-
-typedef struct _FILE_STREAM_INFORMATION {
-    ULONG           NextEntryOffset;
-    ULONG           StreamNameLength;
-    LARGE_INTEGER   StreamSize;
-    LARGE_INTEGER   StreamAllocationSize;
-    WCHAR           StreamName[1];
-} FILE_STREAM_INFORMATION, *PFILE_STREAM_INFORMATION;
-
-typedef struct _FILE_TRACKING_INFORMATION {
-    HANDLE  DestinationFile;
-    ULONG   ObjectInformationLength;
-    CHAR    ObjectInformation[1];
-} FILE_TRACKING_INFORMATION, *PFILE_TRACKING_INFORMATION;
-
-typedef struct _FSRTL_COMMON_FCB_HEADER {
-    CSHORT          NodeTypeCode;
-    CSHORT          NodeByteSize;
-    UCHAR           Flags;
-    UCHAR           IsFastIoPossible;
-#if (VER_PRODUCTBUILD >= 1381)
-    UCHAR           Flags2;
-    UCHAR           Reserved;
-#endif /* (VER_PRODUCTBUILD >= 1381) */
-    PERESOURCE      Resource;
-    PERESOURCE      PagingIoResource;
-    LARGE_INTEGER   AllocationSize;
-    LARGE_INTEGER   FileSize;
-    LARGE_INTEGER   ValidDataLength;
-} FSRTL_COMMON_FCB_HEADER, *PFSRTL_COMMON_FCB_HEADER;
-
-typedef struct _GENERATE_NAME_CONTEXT {
-    USHORT  Checksum;
-    BOOLEAN CheckSumInserted;
-    UCHAR   NameLength;
-    WCHAR   NameBuffer[8];
-    ULONG   ExtensionLength;
-    WCHAR   ExtensionBuffer[4];
-    ULONG   LastIndexValue;
-} GENERATE_NAME_CONTEXT, *PGENERATE_NAME_CONTEXT;
-
-typedef struct _HANDLE_TABLE_ENTRY {
-    PVOID   Object;
-    ULONG   ObjectAttributes;
-    ULONG   GrantedAccess;
-    USHORT  GrantedAccessIndex;
-    USHORT  CreatorBackTraceIndex;
-    ULONG   NextFreeTableEntry;
-} HANDLE_TABLE_ENTRY, *PHANDLE_TABLE_ENTRY;
-
-typedef struct _MAPPING_PAIR {
-    ULONGLONG Vcn;
-    ULONGLONG Lcn;
-} MAPPING_PAIR, *PMAPPING_PAIR;
-
-typedef struct _GET_RETRIEVAL_DESCRIPTOR {
-    ULONG           NumberOfPairs;
-    ULONGLONG       StartVcn;
-    MAPPING_PAIR    Pair[1];
-} GET_RETRIEVAL_DESCRIPTOR, *PGET_RETRIEVAL_DESCRIPTOR;
-
-typedef struct _IO_CLIENT_EXTENSION {
-    struct _IO_CLIENT_EXTENSION *NextExtension;
-    PVOID                       ClientIdentificationAddress;
-} IO_CLIENT_EXTENSION, *PIO_CLIENT_EXTENSION;
-
-typedef struct _IO_COMPLETION_BASIC_INFORMATION {
-    LONG Depth;
-} IO_COMPLETION_BASIC_INFORMATION, *PIO_COMPLETION_BASIC_INFORMATION;
-
-typedef struct _KEVENT_PAIR {
-    USHORT Type;
-    USHORT Size;
-    KEVENT Event1;
-    KEVENT Event2;
-} KEVENT_PAIR, *PKEVENT_PAIR;
-
-typedef struct _KQUEUE {
-    DISPATCHER_HEADER   Header;
-    LIST_ENTRY          EntryListHead;
-    ULONG               CurrentCount;
-    ULONG               MaximumCount;
-    LIST_ENTRY          ThreadListHead;
-} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE;
-
-typedef struct _MAILSLOT_CREATE_PARAMETERS {
-    ULONG           MailslotQuota;
-    ULONG           MaximumMessageSize;
-    LARGE_INTEGER   ReadTimeout;
-    BOOLEAN         TimeoutSpecified;
-} MAILSLOT_CREATE_PARAMETERS, *PMAILSLOT_CREATE_PARAMETERS;
-
-typedef struct _MBCB {
-    CSHORT          NodeTypeCode;
-    CSHORT          NodeIsInZone;
-    ULONG           PagesToWrite;
-    ULONG           DirtyPages;
-    ULONG           Reserved;
-    LIST_ENTRY      BitmapRanges;
-    LONGLONG        ResumeWritePage;
-    BITMAP_RANGE    BitmapRange1;
-    BITMAP_RANGE    BitmapRange2;
-    BITMAP_RANGE    BitmapRange3;
-} MBCB, *PMBCB;
-
-typedef struct _MOVEFILE_DESCRIPTOR {
-     HANDLE         FileHandle; 
-     ULONG          Reserved;   
-     LARGE_INTEGER  StartVcn; 
-     LARGE_INTEGER  TargetLcn;
-     ULONG          NumVcns; 
-     ULONG          Reserved1;  
-} MOVEFILE_DESCRIPTOR, *PMOVEFILE_DESCRIPTOR;
-
-typedef struct _NAMED_PIPE_CREATE_PARAMETERS {
-    ULONG           NamedPipeType;
-    ULONG           ReadMode;
-    ULONG           CompletionMode;
-    ULONG           MaximumInstances;
-    ULONG           InboundQuota;
-    ULONG           OutboundQuota;
-    LARGE_INTEGER   DefaultTimeout;
-    BOOLEAN         TimeoutSpecified;
-} NAMED_PIPE_CREATE_PARAMETERS, *PNAMED_PIPE_CREATE_PARAMETERS;
-
-typedef struct _OBJECT_BASIC_INFO {
-    ULONG           Attributes;
-    ACCESS_MASK     GrantedAccess;
-    ULONG           HandleCount;
-    ULONG           ReferenceCount;
-    ULONG           PagedPoolUsage;
-    ULONG           NonPagedPoolUsage;
-    ULONG           Reserved[3];
-    ULONG           NameInformationLength;
-    ULONG           TypeInformationLength;
-    ULONG           SecurityDescriptorLength;
-    LARGE_INTEGER   CreateTime;
-} OBJECT_BASIC_INFO, *POBJECT_BASIC_INFO;
-
-typedef struct _OBJECT_HANDLE_ATTRIBUTE_INFO {
-    BOOLEAN Inherit;
-    BOOLEAN ProtectFromClose;
-} OBJECT_HANDLE_ATTRIBUTE_INFO, *POBJECT_HANDLE_ATTRIBUTE_INFO;
-
-typedef struct _OBJECT_NAME_INFO {
-    UNICODE_STRING  ObjectName;
-    WCHAR           ObjectNameBuffer[1];
-} OBJECT_NAME_INFO, *POBJECT_NAME_INFO;
-
-typedef struct _OBJECT_PROTECTION_INFO {
-    BOOLEAN Inherit;
-    BOOLEAN ProtectHandle;
-} OBJECT_PROTECTION_INFO, *POBJECT_PROTECTION_INFO;
-
-typedef struct _OBJECT_TYPE_INFO {
-    UNICODE_STRING  ObjectTypeName;
-    UCHAR           Unknown[0x58];
-    WCHAR           ObjectTypeNameBuffer[1];
-} OBJECT_TYPE_INFO, *POBJECT_TYPE_INFO;
-
-typedef struct _OBJECT_ALL_TYPES_INFO {
-    ULONG               NumberOfObjectTypes;
-    OBJECT_TYPE_INFO    ObjectsTypeInfo[1];
-} OBJECT_ALL_TYPES_INFO, *POBJECT_ALL_TYPES_INFO;
-
-typedef struct _PAGEFAULT_HISTORY {
-    ULONG                           CurrentIndex;
-    ULONG                           MaxIndex;
-    KSPIN_LOCK                      SpinLock;
-    PVOID                           Reserved;
-    PROCESS_WS_WATCH_INFORMATION    WatchInfo[1];
-} PAGEFAULT_HISTORY, *PPAGEFAULT_HISTORY;
-
-typedef struct _PATHNAME_BUFFER {
-    ULONG PathNameLength;
-    WCHAR Name[1];
-} PATHNAME_BUFFER, *PPATHNAME_BUFFER;
-
-#if (VER_PRODUCTBUILD >= 2600)
-
-typedef struct _PRIVATE_CACHE_MAP_FLAGS {
-    ULONG DontUse           : 16;
-    ULONG ReadAheadActive   : 1;
-    ULONG ReadAheadEnabled  : 1;
-    ULONG Available         : 14;
-} PRIVATE_CACHE_MAP_FLAGS, *PPRIVATE_CACHE_MAP_FLAGS;
-
-typedef struct _PRIVATE_CACHE_MAP {
-    _ANONYMOUS_UNION union {
-        CSHORT                  NodeTypeCode;
-        PRIVATE_CACHE_MAP_FLAGS Flags;
-        ULONG                   UlongFlags;
-    } DUMMYUNIONNAME;
-    ULONG                       ReadAheadMask;
-    PFILE_OBJECT                FileObject;
-    LARGE_INTEGER               FileOffset1;
-    LARGE_INTEGER               BeyondLastByte1;
-    LARGE_INTEGER               FileOffset2;
-    LARGE_INTEGER               BeyondLastByte2;
-    LARGE_INTEGER               ReadAheadOffset[2];
-    ULONG                       ReadAheadLength[2];
-    KSPIN_LOCK                  ReadAheadSpinLock;
-    LIST_ENTRY                  PrivateLinks;
-} PRIVATE_CACHE_MAP, *PPRIVATE_CACHE_MAP;
-
-#endif
-
-typedef struct _PS_IMPERSONATION_INFORMATION {
-    PACCESS_TOKEN                   Token;
-    BOOLEAN                         CopyOnOpen;
-    BOOLEAN                         EffectiveOnly;
-    SECURITY_IMPERSONATION_LEVEL    ImpersonationLevel;
-} PS_IMPERSONATION_INFORMATION, *PPS_IMPERSONATION_INFORMATION;
-
-typedef struct _PUBLIC_BCB {
-    CSHORT          NodeTypeCode;
-    CSHORT          NodeByteSize;
-    ULONG           MappedLength;
-    LARGE_INTEGER   MappedFileOffset;
-} PUBLIC_BCB, *PPUBLIC_BCB;
-
-typedef struct _QUERY_PATH_REQUEST {
-    ULONG                   PathNameLength;
-    PIO_SECURITY_CONTEXT    SecurityContext;
-    WCHAR                   FilePathName[1];
-} QUERY_PATH_REQUEST, *PQUERY_PATH_REQUEST;
-
-typedef struct _QUERY_PATH_RESPONSE {
-    ULONG LengthAccepted;
-} QUERY_PATH_RESPONSE, *PQUERY_PATH_RESPONSE;
-
-typedef struct _RETRIEVAL_POINTERS_BUFFER {
-    ULONG               ExtentCount;
-    LARGE_INTEGER       StartingVcn;
-    struct {
-        LARGE_INTEGER   NextVcn;
-        LARGE_INTEGER   Lcn;
-    } Extents[1];
-} RETRIEVAL_POINTERS_BUFFER, *PRETRIEVAL_POINTERS_BUFFER;
-
-typedef struct _RTL_SPLAY_LINKS {
-    struct _RTL_SPLAY_LINKS *Parent;
-    struct _RTL_SPLAY_LINKS *LeftChild;
-    struct _RTL_SPLAY_LINKS *RightChild;
-} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS;
-
-typedef struct _SE_EXPORTS {
-
-    LUID    SeCreateTokenPrivilege;
-    LUID    SeAssignPrimaryTokenPrivilege;
-    LUID    SeLockMemoryPrivilege;
-    LUID    SeIncreaseQuotaPrivilege;
-    LUID    SeUnsolicitedInputPrivilege;
-    LUID    SeTcbPrivilege;
-    LUID    SeSecurityPrivilege;
-    LUID    SeTakeOwnershipPrivilege;
-    LUID    SeLoadDriverPrivilege;
-    LUID    SeCreatePagefilePrivilege;
-    LUID    SeIncreaseBasePriorityPrivilege;
-    LUID    SeSystemProfilePrivilege;
-    LUID    SeSystemtimePrivilege;
-    LUID    SeProfileSingleProcessPrivilege;
-    LUID    SeCreatePermanentPrivilege;
-    LUID    SeBackupPrivilege;
-    LUID    SeRestorePrivilege;
-    LUID    SeShutdownPrivilege;
-    LUID    SeDebugPrivilege;
-    LUID    SeAuditPrivilege;
-    LUID    SeSystemEnvironmentPrivilege;
-    LUID    SeChangeNotifyPrivilege;
-    LUID    SeRemoteShutdownPrivilege;
-
-    PSID    SeNullSid;
-    PSID    SeWorldSid;
-    PSID    SeLocalSid;
-    PSID    SeCreatorOwnerSid;
-    PSID    SeCreatorGroupSid;
-
-    PSID    SeNtAuthoritySid;
-    PSID    SeDialupSid;
-    PSID    SeNetworkSid;
-    PSID    SeBatchSid;
-    PSID    SeInteractiveSid;
-    PSID    SeLocalSystemSid;
-    PSID    SeAliasAdminsSid;
-    PSID    SeAliasUsersSid;
-    PSID    SeAliasGuestsSid;
-    PSID    SeAliasPowerUsersSid;
-    PSID    SeAliasAccountOpsSid;
-    PSID    SeAliasSystemOpsSid;
-    PSID    SeAliasPrintOpsSid;
-    PSID    SeAliasBackupOpsSid;
-
-    PSID    SeAuthenticatedUsersSid;
-
-    PSID    SeRestrictedSid;
-    PSID    SeAnonymousLogonSid;
-
-    LUID    SeUndockPrivilege;
-    LUID    SeSyncAgentPrivilege;
-    LUID    SeEnableDelegationPrivilege;
-
-} SE_EXPORTS, *PSE_EXPORTS;
-
-typedef struct _SECTION_BASIC_INFORMATION {
-    PVOID           BaseAddress;
-    ULONG           Attributes;
-    LARGE_INTEGER   Size;
-} SECTION_BASIC_INFORMATION, *PSECTION_BASIC_INFORMATION;
-
-typedef struct _SECTION_IMAGE_INFORMATION {
-    PVOID   EntryPoint;
-    ULONG   Unknown1;
-    ULONG   StackReserve;
-    ULONG   StackCommit;
-    ULONG   Subsystem;
-    USHORT  MinorSubsystemVersion;
-    USHORT  MajorSubsystemVersion;
-    ULONG   Unknown2;
-    ULONG   Characteristics;
-    USHORT  ImageNumber;
-    BOOLEAN Executable;
-    UCHAR   Unknown3;
-    ULONG   Unknown4[3];
-} SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION;
-
-#if (VER_PRODUCTBUILD >= 2600)
-
-typedef struct _SHARED_CACHE_MAP {
-    CSHORT                      NodeTypeCode;
-    CSHORT                      NodeByteSize;
-    ULONG                       OpenCount;
-    LARGE_INTEGER               FileSize;
-    LIST_ENTRY                  BcbList;
-    LARGE_INTEGER               SectionSize;
-    LARGE_INTEGER               ValidDataLength;
-    LARGE_INTEGER               ValidDataGoal;
-    PVACB                       InitialVacbs[4];
-    PVACB                       *Vacbs;
-    PFILE_OBJECT                FileObject;
-    PVACB                       ActiveVacb;
-    PVOID                       NeedToZero;
-    ULONG                       ActivePage;
-    ULONG                       NeedToZeroPage;
-    KSPIN_LOCK                  ActiveVacbSpinLock;
-    ULONG                       VacbActiveCount;
-    ULONG                       DirtyPages;
-    LIST_ENTRY                  SharedCacheMapLinks;
-    ULONG                       Flags;
-    NTSTATUS                    Status;
-    PMBCB                       Mbcb;
-    PVOID                       Section;
-    PKEVENT                     CreateEvent;
-    PKEVENT                     WaitOnActiveCount;
-    ULONG                       PagesToWrite;
-    LONGLONG                    BeyondLastFlush;
-    PCACHE_MANAGER_CALLBACKS    Callbacks;
-    PVOID                       LazyWriteContext;
-    LIST_ENTRY                  PrivateList;
-    PVOID                       LogHandle;
-    PVOID                       FlushToLsnRoutine;
-    ULONG                       DirtyPageThreshold;
-    ULONG                       LazyWritePassCount;
-    PCACHE_UNINITIALIZE_EVENT   UninitializeEvent;
-    PVACB                       NeedToZeroVacb;
-    KSPIN_LOCK                  BcbSpinLock;
-    PVOID                       Reserved;
-    KEVENT                      Event;
-    EX_PUSH_LOCK                VacbPushLock;
-    PRIVATE_CACHE_MAP           PrivateCacheMap;
-} SHARED_CACHE_MAP, *PSHARED_CACHE_MAP;
-
-#endif
-
-typedef struct _STARTING_VCN_INPUT_BUFFER {
-    LARGE_INTEGER StartingVcn;
-} STARTING_VCN_INPUT_BUFFER, *PSTARTING_VCN_INPUT_BUFFER;
-
-typedef struct _SYSTEM_CACHE_INFORMATION {
-    ULONG CurrentSize;
-    ULONG PeakSize;
-    ULONG PageFaultCount;
-    ULONG MinimumWorkingSet;
-    ULONG MaximumWorkingSet;
-    ULONG Unused[4];
-} SYSTEM_CACHE_INFORMATION, *PSYSTEM_CACHE_INFORMATION;
-
-typedef struct _TERMINATION_PORT {
-    struct _TERMINATION_PORT*   Next;
-    PVOID                       Port;
-} TERMINATION_PORT, *PTERMINATION_PORT;
-
-typedef struct _SECURITY_CLIENT_CONTEXT {
-    SECURITY_QUALITY_OF_SERVICE SecurityQos;
-    PACCESS_TOKEN               ClientToken;
-    BOOLEAN                     DirectlyAccessClientToken;
-    BOOLEAN                     DirectAccessEffectiveOnly;
-    BOOLEAN                     ServerIsRemote;
-    TOKEN_CONTROL               ClientTokenControl;
-} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT;
-
-typedef struct _TUNNEL {
-    FAST_MUTEX          Mutex;
-    PRTL_SPLAY_LINKS    Cache;
-    LIST_ENTRY          TimerQueue;
-    USHORT              NumEntries;
-} TUNNEL, *PTUNNEL;
-
-typedef struct _VACB {
-    PVOID               BaseAddress;
-    PSHARED_CACHE_MAP   SharedCacheMap;
-    union {
-        LARGE_INTEGER   FileOffset;
-        USHORT          ActiveCount;
-    } Overlay;
-    LIST_ENTRY          LruList;
-} VACB, *PVACB;
-
-typedef struct _VAD_HEADER {
-    PVOID       StartVPN;
-    PVOID       EndVPN;
-    PVAD_HEADER ParentLink;
-    PVAD_HEADER LeftLink;
-    PVAD_HEADER RightLink;
-    ULONG       Flags;          /* LSB = CommitCharge */
-    PVOID       ControlArea;
-    PVOID       FirstProtoPte;
-    PVOID       LastPTE;
-    ULONG       Unknown;
-    LIST_ENTRY  Secured;
-} VAD_HEADER, *PVAD_HEADER;
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcCanIWrite (
-    IN PFILE_OBJECT FileObject,
-    IN ULONG        BytesToWrite,
-    IN BOOLEAN      Wait,
-    IN BOOLEAN      Retrying
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcCopyRead (
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN ULONG                Length,
-    IN BOOLEAN              Wait,
-    OUT PVOID               Buffer,
-    OUT PIO_STATUS_BLOCK    IoStatus
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcCopyWrite (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
-    IN BOOLEAN          Wait,
-    IN PVOID            Buffer
-);
-
-#define CcCopyWriteWontFlush(FO, FOFF, LEN) ((LEN) <= 0x10000)
-
-typedef VOID (NTAPI *PCC_POST_DEFERRED_WRITE) (
-    IN PVOID Context1,
-    IN PVOID Context2
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcDeferWrite (
-    IN PFILE_OBJECT             FileObject,
-    IN PCC_POST_DEFERRED_WRITE  PostRoutine,
-    IN PVOID                    Context1,
-    IN PVOID                    Context2,
-    IN ULONG                    BytesToWrite,
-    IN BOOLEAN                  Retrying
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcFastCopyRead (
-    IN PFILE_OBJECT         FileObject,
-    IN ULONG                FileOffset,
-    IN ULONG                Length,
-    IN ULONG                PageCount,
-    OUT PVOID               Buffer,
-    OUT PIO_STATUS_BLOCK    IoStatus
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcFastCopyWrite (
-    IN PFILE_OBJECT FileObject,
-    IN ULONG        FileOffset,
-    IN ULONG        Length,
-    IN PVOID        Buffer
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcFlushCache (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
-    IN PLARGE_INTEGER           FileOffset OPTIONAL,
-    IN ULONG                    Length,
-    OUT PIO_STATUS_BLOCK        IoStatus OPTIONAL
-);
-
-typedef VOID (*PDIRTY_PAGE_ROUTINE) (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
-    IN PLARGE_INTEGER   OldestLsn,
-    IN PLARGE_INTEGER   NewestLsn,
-    IN PVOID            Context1,
-    IN PVOID            Context2
-);
-
-NTKERNELAPI
-LARGE_INTEGER
-NTAPI
-CcGetDirtyPages (
-    IN PVOID                LogHandle,
-    IN PDIRTY_PAGE_ROUTINE  DirtyPageRoutine,
-    IN PVOID                Context1,
-    IN PVOID                Context2
-);
-
-NTKERNELAPI
-PFILE_OBJECT
-NTAPI
-CcGetFileObjectFromBcb (
-    IN PVOID Bcb
-);
-
-NTKERNELAPI
-PFILE_OBJECT
-NTAPI
-CcGetFileObjectFromSectionPtrs (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer
-);
-
-#define CcGetFileSizePointer(FO) (                                     \
-    ((PLARGE_INTEGER)((FO)->SectionObjectPointer->SharedCacheMap) + 1) \
-)
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-LARGE_INTEGER
-NTAPI
-CcGetFlushedValidData (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
-    IN BOOLEAN                  BcbListHeld
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-LARGE_INTEGER
-CcGetLsnForFileObject (
-    IN PFILE_OBJECT     FileObject,
-    OUT PLARGE_INTEGER  OldestLsn OPTIONAL
-);
-
-typedef BOOLEAN (NTAPI *PACQUIRE_FOR_LAZY_WRITE) (
-    IN PVOID    Context,
-    IN BOOLEAN  Wait
-);
-
-typedef VOID (NTAPI *PRELEASE_FROM_LAZY_WRITE) (
-    IN PVOID Context
-);
-
-typedef BOOLEAN (NTAPI *PACQUIRE_FOR_READ_AHEAD) (
-    IN PVOID    Context,
-    IN BOOLEAN  Wait
-);
-
-typedef VOID (NTAPI *PRELEASE_FROM_READ_AHEAD) (
-    IN PVOID Context
-);
-
-typedef struct _CACHE_MANAGER_CALLBACKS {
-    PACQUIRE_FOR_LAZY_WRITE     AcquireForLazyWrite;
-    PRELEASE_FROM_LAZY_WRITE    ReleaseFromLazyWrite;
-    PACQUIRE_FOR_READ_AHEAD     AcquireForReadAhead;
-    PRELEASE_FROM_READ_AHEAD    ReleaseFromReadAhead;
-} CACHE_MANAGER_CALLBACKS, *PCACHE_MANAGER_CALLBACKS;
-
-NTKERNELAPI
-VOID
-NTAPI
-CcInitializeCacheMap (
-    IN PFILE_OBJECT             FileObject,
-    IN PCC_FILE_SIZES           FileSizes,
-    IN BOOLEAN                  PinAccess,
-    IN PCACHE_MANAGER_CALLBACKS Callbacks,
-    IN PVOID                    LazyWriteContext
-);
-
-#define CcIsFileCached(FO) (                                                         \
-    ((FO)->SectionObjectPointer != NULL) &&                                          \
-    (((PSECTION_OBJECT_POINTERS)(FO)->SectionObjectPointer)->SharedCacheMap != NULL) \
-)
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcIsThereDirtyData (
-    IN PVPB Vpb
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcMapData (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
-    IN BOOLEAN          Wait,
-    OUT PVOID           *Bcb,
-    OUT PVOID           *Buffer
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcMdlRead (
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN ULONG                Length,
-    OUT PMDL                *MdlChain,
-    OUT PIO_STATUS_BLOCK    IoStatus
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcMdlReadComplete (
-    IN PFILE_OBJECT FileObject,
-    IN PMDL         MdlChain
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcMdlWriteComplete (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN PMDL             MdlChain
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcPinMappedData (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
-#if (VER_PRODUCTBUILD >= 2195)
-    IN ULONG            Flags,
-#else
-    IN BOOLEAN          Wait,
-#endif
-    IN OUT PVOID        *Bcb
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcPinRead (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
-#if (VER_PRODUCTBUILD >= 2195)
-    IN ULONG            Flags,
-#else
-    IN BOOLEAN          Wait,
-#endif
-    OUT PVOID           *Bcb,
-    OUT PVOID           *Buffer
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcPrepareMdlWrite (
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN ULONG                Length,
-    OUT PMDL                *MdlChain,
-    OUT PIO_STATUS_BLOCK    IoStatus
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcPreparePinWrite (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length,
-    IN BOOLEAN          Zero,
-#if (VER_PRODUCTBUILD >= 2195)
-    IN ULONG            Flags,
-#else
-    IN BOOLEAN          Wait,
-#endif
-    OUT PVOID           *Bcb,
-    OUT PVOID           *Buffer
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcPurgeCacheSection (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
-    IN PLARGE_INTEGER           FileOffset OPTIONAL,
-    IN ULONG                    Length,
-    IN BOOLEAN                  UninitializeCacheMaps
-);
-
-#define CcReadAhead(FO, FOFF, LEN) (                \
-    if ((LEN) >= 256) {                             \
-        CcScheduleReadAhead((FO), (FOFF), (LEN));   \
-    }                                               \
-)
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-PVOID
-NTAPI
-CcRemapBcb (
-    IN PVOID Bcb
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-VOID
-NTAPI
-CcRepinBcb (
-    IN PVOID Bcb
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcScheduleReadAhead (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN ULONG            Length
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcSetAdditionalCacheAttributes (
-    IN PFILE_OBJECT FileObject,
-    IN BOOLEAN      DisableReadAhead,
-    IN BOOLEAN      DisableWriteBehind
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcSetBcbOwnerPointer (
-    IN PVOID Bcb,
-    IN PVOID OwnerPointer
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcSetDirtyPageThreshold (
-    IN PFILE_OBJECT FileObject,
-    IN ULONG        DirtyPageThreshold
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcSetDirtyPinnedData (
-    IN PVOID            BcbVoid,
-    IN PLARGE_INTEGER   Lsn OPTIONAL
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcSetFileSizes (
-    IN PFILE_OBJECT     FileObject,
-    IN PCC_FILE_SIZES   FileSizes
-);
-
-typedef VOID (NTAPI *PFLUSH_TO_LSN) (
-    IN PVOID            LogHandle,
-    IN PLARGE_INTEGER   Lsn
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcSetLogHandleForFile (
-    IN PFILE_OBJECT     FileObject,
-    IN PVOID            LogHandle,
-    IN PFLUSH_TO_LSN    FlushToLsnRoutine
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcSetReadAheadGranularity (
-    IN PFILE_OBJECT FileObject,
-    IN ULONG        Granularity     /* default: PAGE_SIZE */
-                                    /* allowed: 2^n * PAGE_SIZE */
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcUninitializeCacheMap (
-    IN PFILE_OBJECT                 FileObject,
-    IN PLARGE_INTEGER               TruncateSize OPTIONAL,
-    IN PCACHE_UNINITIALIZE_EVENT    UninitializeCompleteEvent OPTIONAL
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcUnpinData (
-    IN PVOID Bcb
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcUnpinDataForThread (
-    IN PVOID            Bcb,
-    IN ERESOURCE_THREAD ResourceThreadId
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-CcUnpinRepinnedBcb (
-    IN PVOID                Bcb,
-    IN BOOLEAN              WriteThrough,
-    OUT PIO_STATUS_BLOCK    IoStatus
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-CcWaitForCurrentLazyWriterActivity (
-    VOID
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-CcZeroData (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   StartOffset,
-    IN PLARGE_INTEGER   EndOffset,
-    IN BOOLEAN          Wait
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-ExDisableResourceBoostLite (
-    IN PERESOURCE Resource
-);
-
-NTKERNELAPI
-ULONG
-NTAPI
-ExQueryPoolBlockSize (
-    IN PVOID        PoolBlock,
-    OUT PBOOLEAN    QuotaCharged
-);
-
-#define FlagOn(x, f) ((x) & (f))
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlAddToTunnelCache (
-    IN PTUNNEL          Cache,
-    IN ULONGLONG        DirectoryKey,
-    IN PUNICODE_STRING  ShortName,
-    IN PUNICODE_STRING  LongName,
-    IN BOOLEAN          KeyByShortName,
-    IN ULONG            DataLength,
-    IN PVOID            Data
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-PFILE_LOCK
-NTAPI
-FsRtlAllocateFileLock (
-    IN PCOMPLETE_LOCK_IRP_ROUTINE   CompleteLockIrpRoutine OPTIONAL,
-    IN PUNLOCK_ROUTINE              UnlockRoutine OPTIONAL
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-PVOID
-NTAPI
-FsRtlAllocatePool (
-    IN POOL_TYPE    PoolType,
-    IN ULONG        NumberOfBytes
-);
-
-NTKERNELAPI
-PVOID
-NTAPI
-FsRtlAllocatePoolWithQuota (
-    IN POOL_TYPE    PoolType,
-    IN ULONG        NumberOfBytes
-);
-
-NTKERNELAPI
-PVOID
-NTAPI
-FsRtlAllocatePoolWithQuotaTag (
-    IN POOL_TYPE    PoolType,
-    IN ULONG        NumberOfBytes,
-    IN ULONG        Tag
-);
-
-NTKERNELAPI
-PVOID
-NTAPI
-FsRtlAllocatePoolWithTag (
-    IN POOL_TYPE    PoolType,
-    IN ULONG        NumberOfBytes,
-    IN ULONG        Tag
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlAreNamesEqual (
-    IN PUNICODE_STRING  Name1,
-    IN PUNICODE_STRING  Name2,
-    IN BOOLEAN          IgnoreCase,
-    IN PWCHAR           UpcaseTable OPTIONAL
-);
-
-#define FsRtlAreThereCurrentFileLocks(FL) ( \
-    ((FL)->FastIoIsQuestionable)            \
-)
-
-/*
-  FsRtlCheckLockForReadAccess:
-
-  All this really does is pick out the lock parameters from the irp (io stack
-  location?), get IoGetRequestorProcess, and pass values on to
-  FsRtlFastCheckLockForRead.
-*/
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlCheckLockForReadAccess (
-    IN PFILE_LOCK   FileLock,
-    IN PIRP         Irp
-);
-
-/*
-  FsRtlCheckLockForWriteAccess:
-
-  All this really does is pick out the lock parameters from the irp (io stack
-  location?), get IoGetRequestorProcess, and pass values on to
-  FsRtlFastCheckLockForWrite.
-*/
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlCheckLockForWriteAccess (
-    IN PFILE_LOCK   FileLock,
-    IN PIRP         Irp
-);
-
-typedef
-VOID NTAPI
-(*POPLOCK_WAIT_COMPLETE_ROUTINE) (
-    IN PVOID    Context,
-    IN PIRP     Irp
-);
-
-typedef
-VOID NTAPI
-(*POPLOCK_FS_PREPOST_IRP) (
-    IN PVOID    Context,
-    IN PIRP     Irp
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-FsRtlCheckOplock (
-    IN POPLOCK                          Oplock,
-    IN PIRP                             Irp,
-    IN PVOID                            Context,
-    IN POPLOCK_WAIT_COMPLETE_ROUTINE    CompletionRoutine OPTIONAL,
-    IN POPLOCK_FS_PREPOST_IRP           PostIrpRoutine OPTIONAL
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlCopyRead (
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN ULONG                Length,
-    IN BOOLEAN              Wait,
-    IN ULONG                LockKey,
-    OUT PVOID               Buffer,
-    OUT PIO_STATUS_BLOCK    IoStatus,
-    IN PDEVICE_OBJECT       DeviceObject
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlCopyWrite (
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN ULONG                Length,
-    IN BOOLEAN              Wait,
-    IN ULONG                LockKey,
-    IN PVOID                Buffer,
-    OUT PIO_STATUS_BLOCK    IoStatus,
-    IN PDEVICE_OBJECT       DeviceObject
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlCurrentBatchOplock (
-    IN POPLOCK Oplock
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlDeleteKeyFromTunnelCache (
-    IN PTUNNEL      Cache,
-    IN ULONGLONG    DirectoryKey
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlDeleteTunnelCache (
-    IN PTUNNEL Cache
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlDeregisterUncProvider (
-    IN HANDLE Handle
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlDoesNameContainWildCards (
-    IN PUNICODE_STRING Name
-);
-
-#define FsRtlEnterFileSystem    KeEnterCriticalRegion
-
-#define FsRtlExitFileSystem     KeLeaveCriticalRegion
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlFastCheckLockForRead (
-    IN PFILE_LOCK           FileLock,
-    IN PLARGE_INTEGER       FileOffset,
-    IN PLARGE_INTEGER       Length,
-    IN ULONG                Key,
-    IN PFILE_OBJECT         FileObject,
-    IN PEPROCESS            Process
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlFastCheckLockForWrite (
-    IN PFILE_LOCK           FileLock,
-    IN PLARGE_INTEGER       FileOffset,
-    IN PLARGE_INTEGER       Length,
-    IN ULONG                Key,
-    IN PFILE_OBJECT         FileObject,
-    IN PEPROCESS            Process
-);
-
-#define FsRtlFastLock(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11) (       \
-     FsRtlPrivateLock(A1, A2, A3, A4, A5, A6, A7, A8, A9, NULL, A10, A11)   \
-)
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-FsRtlFastUnlockAll (
-    IN PFILE_LOCK           FileLock,
-    IN PFILE_OBJECT         FileObject,
-    IN PEPROCESS            Process,
-    IN PVOID                Context OPTIONAL
-);
-/* ret: STATUS_RANGE_NOT_LOCKED */
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-FsRtlFastUnlockAllByKey (
-    IN PFILE_LOCK           FileLock,
-    IN PFILE_OBJECT         FileObject,
-    IN PEPROCESS            Process,
-    IN ULONG                Key,
-    IN PVOID                Context OPTIONAL
-);  
-/* ret: STATUS_RANGE_NOT_LOCKED */
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-FsRtlFastUnlockSingle (
-    IN PFILE_LOCK           FileLock,
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN PLARGE_INTEGER       Length,
-    IN PEPROCESS            Process,
-    IN ULONG                Key,
-    IN PVOID                Context OPTIONAL,
-    IN BOOLEAN              AlreadySynchronized
-);                      
-/* ret:  STATUS_RANGE_NOT_LOCKED */
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlFindInTunnelCache (
-    IN PTUNNEL          Cache,
-    IN ULONGLONG        DirectoryKey,
-    IN PUNICODE_STRING  Name,
-    OUT PUNICODE_STRING ShortName,
-    OUT PUNICODE_STRING LongName,
-    IN OUT PULONG       DataLength,
-    OUT PVOID           Data
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlFreeFileLock (
-    IN PFILE_LOCK FileLock
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-FsRtlGetFileSize (
-    IN PFILE_OBJECT         FileObject,
-    IN OUT PLARGE_INTEGER   FileSize
-);
-
-/*
-  FsRtlGetNextFileLock:
-
-  ret: NULL if no more locks
-
-  Internals:
-    FsRtlGetNextFileLock uses FileLock->LastReturnedLockInfo and
-    FileLock->LastReturnedLock as storage.
-    LastReturnedLock is a pointer to the 'raw' lock inkl. double linked
-    list, and FsRtlGetNextFileLock needs this to get next lock on subsequent
-    calls with Restart = FALSE.
-*/
-NTKERNELAPI
-PFILE_LOCK_INFO
-NTAPI
-FsRtlGetNextFileLock (
-    IN PFILE_LOCK   FileLock,
-    IN BOOLEAN      Restart
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlInitializeFileLock (
-    IN PFILE_LOCK                   FileLock,
-    IN PCOMPLETE_LOCK_IRP_ROUTINE   CompleteLockIrpRoutine OPTIONAL,
-    IN PUNLOCK_ROUTINE              UnlockRoutine OPTIONAL
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlInitializeOplock (
-    IN OUT POPLOCK Oplock
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlInitializeTunnelCache (
-    IN PTUNNEL Cache
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlIsNameInExpression (
-    IN PUNICODE_STRING  Expression,
-    IN PUNICODE_STRING  Name,
-    IN BOOLEAN          IgnoreCase,
-    IN PWCHAR           UpcaseTable OPTIONAL
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlIsNtstatusExpected (
-    IN NTSTATUS Ntstatus
-);
-
-#define FsRtlIsUnicodeCharacterWild(C) (                                    \
-    (((C) >= 0x40) ?                                                        \
-    FALSE :                                                                 \
-    FlagOn((*FsRtlLegalAnsiCharacterArray)[(C)], FSRTL_WILD_CHARACTER ))    \
-)
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlMdlReadComplete (
-    IN PFILE_OBJECT     FileObject,
-    IN PMDL             MdlChain
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlMdlReadCompleteDev (
-    IN PFILE_OBJECT     FileObject,
-    IN PMDL             MdlChain,
-    IN PDEVICE_OBJECT   DeviceObject
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlMdlWriteComplete (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN PMDL             MdlChain
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlMdlWriteCompleteDev (
-    IN PFILE_OBJECT     FileObject,
-    IN PLARGE_INTEGER   FileOffset,
-    IN PMDL             MdlChain,
-    IN PDEVICE_OBJECT   DeviceObject
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-FsRtlNormalizeNtstatus (
-    IN NTSTATUS Exception,
-    IN NTSTATUS GenericException
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlNotifyChangeDirectory (
-    IN PNOTIFY_SYNC NotifySync,
-    IN PVOID        FsContext,
-    IN PSTRING      FullDirectoryName,
-    IN PLIST_ENTRY  NotifyList,
-    IN BOOLEAN      WatchTree,
-    IN ULONG        CompletionFilter,
-    IN PIRP         NotifyIrp
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlNotifyCleanup (
-    IN PNOTIFY_SYNC NotifySync,
-    IN PLIST_ENTRY  NotifyList,
-    IN PVOID        FsContext
-);
-
-typedef BOOLEAN (*PCHECK_FOR_TRAVERSE_ACCESS) (
-    IN PVOID                        NotifyContext,
-    IN PVOID                        TargetContext,
-    IN PSECURITY_SUBJECT_CONTEXT    SubjectContext
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlNotifyFullChangeDirectory (
-    IN PNOTIFY_SYNC                 NotifySync,
-    IN PLIST_ENTRY                  NotifyList,
-    IN PVOID                        FsContext,
-    IN PSTRING                      FullDirectoryName,
-    IN BOOLEAN                      WatchTree,
-    IN BOOLEAN                      IgnoreBuffer,
-    IN ULONG                        CompletionFilter,
-    IN PIRP                         NotifyIrp,
-    IN PCHECK_FOR_TRAVERSE_ACCESS   TraverseCallback OPTIONAL,
-    IN PSECURITY_SUBJECT_CONTEXT    SubjectContext OPTIONAL
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlNotifyFullReportChange (
-    IN PNOTIFY_SYNC NotifySync,
-    IN PLIST_ENTRY  NotifyList,
-    IN PSTRING      FullTargetName,
-    IN USHORT       TargetNameOffset,
-    IN PSTRING      StreamName OPTIONAL,
-    IN PSTRING      NormalizedParentName OPTIONAL,
-    IN ULONG        FilterMatch,
-    IN ULONG        Action,
-    IN PVOID        TargetContext
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlNotifyInitializeSync (
-    IN PNOTIFY_SYNC NotifySync
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlNotifyReportChange (
-    IN PNOTIFY_SYNC NotifySync,
-    IN PLIST_ENTRY  NotifyList,
-    IN PSTRING      FullTargetName,
-    IN PUSHORT      FileNamePartLength,
-    IN ULONG        FilterMatch
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlNotifyUninitializeSync (
-    IN PNOTIFY_SYNC NotifySync
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-FsRtlNotifyVolumeEvent (
-    IN PFILE_OBJECT FileObject,
-    IN ULONG        EventCode
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-FsRtlOplockFsctrl (
-    IN POPLOCK  Oplock,
-    IN PIRP     Irp,
-    IN ULONG    OpenCount
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlOplockIsFastIoPossible (
-    IN POPLOCK Oplock
-);
-
-/*
-  FsRtlPrivateLock:
-
-  ret: IoStatus->Status: STATUS_PENDING, STATUS_LOCK_NOT_GRANTED
-
-  Internals: 
-    -Calls IoCompleteRequest if Irp
-    -Uses exception handling / ExRaiseStatus with STATUS_INSUFFICIENT_RESOURCES
-*/
-NTKERNELAPI
-BOOLEAN
-NTAPI
-FsRtlPrivateLock (
-    IN PFILE_LOCK           FileLock,
-    IN PFILE_OBJECT         FileObject,
-    IN PLARGE_INTEGER       FileOffset,
-    IN PLARGE_INTEGER       Length,
-    IN PEPROCESS            Process,
-    IN ULONG                Key,
-    IN BOOLEAN              FailImmediately, 
-    IN BOOLEAN              ExclusiveLock,
-    OUT PIO_STATUS_BLOCK    IoStatus, 
-    IN PIRP                 Irp OPTIONAL,
-    IN PVOID                Context,
-    IN BOOLEAN              AlreadySynchronized
-);
-
-/*
-  FsRtlProcessFileLock:
-
-  ret:
-    -STATUS_INVALID_DEVICE_REQUEST
-    -STATUS_RANGE_NOT_LOCKED from unlock routines.
-    -STATUS_PENDING, STATUS_LOCK_NOT_GRANTED from FsRtlPrivateLock
-    (redirected IoStatus->Status).
-
-  Internals: 
-    -switch ( Irp->CurrentStackLocation->MinorFunction )
-        lock: return FsRtlPrivateLock;
-        unlocksingle: return FsRtlFastUnlockSingle;
-        unlockall: return FsRtlFastUnlockAll;
-        unlockallbykey: return FsRtlFastUnlockAllByKey;
-        default: IofCompleteRequest with STATUS_INVALID_DEVICE_REQUEST;
-                 return STATUS_INVALID_DEVICE_REQUEST;
-
-    -'AllwaysZero' is passed thru as 'AllwaysZero' to lock / unlock routines.
-    -'Irp' is passet thru as 'Irp' to FsRtlPrivateLock.
-*/
-NTKERNELAPI
-NTSTATUS
-NTAPI
-FsRtlProcessFileLock (
-    IN PFILE_LOCK   FileLock,
-    IN PIRP         Irp,
-    IN PVOID        Context OPTIONAL
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-FsRtlRegisterUncProvider (
-    IN OUT PHANDLE      MupHandle,
-    IN PUNICODE_STRING  RedirectorDeviceName,
-    IN BOOLEAN          MailslotsSupported
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlUninitializeFileLock (
-    IN PFILE_LOCK FileLock
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-FsRtlUninitializeOplock (
-    IN OUT POPLOCK Oplock
-);
-
-NTSYSAPI
-VOID
-NTAPI
-HalDisplayString (
-    IN PCHAR String
-);
-
-NTSYSAPI
-VOID
-NTAPI
-HalQueryRealTimeClock (
-    IN OUT PTIME_FIELDS TimeFields
-);
-
-NTSYSAPI
-VOID
-NTAPI
-HalSetRealTimeClock (
-    IN PTIME_FIELDS TimeFields
-);
-
-#define InitializeMessageHeader(m, l, t) {                  \
-    (m)->Length = (USHORT)(l);                              \
-    (m)->DataLength = (USHORT)(l - sizeof( LPC_MESSAGE ));  \
-    (m)->MessageType = (USHORT)(t);                         \
-    (m)->DataInfoOffset = 0;                                \
-}
-
-NTKERNELAPI
-VOID
-NTAPI
-IoAcquireVpbSpinLock (
-    OUT PKIRQL Irql
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoCheckDesiredAccess (
-    IN OUT PACCESS_MASK DesiredAccess,
-    IN ACCESS_MASK      GrantedAccess
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoCheckEaBufferValidity (
-    IN PFILE_FULL_EA_INFORMATION    EaBuffer,
-    IN ULONG                        EaLength,
-    OUT PULONG                      ErrorOffset
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoCheckFunctionAccess (
-    IN ACCESS_MASK              GrantedAccess,
-    IN UCHAR                    MajorFunction,
-    IN UCHAR                    MinorFunction,
-    IN ULONG                    IoControlCode,
-    IN PFILE_INFORMATION_CLASS  FileInformationClass OPTIONAL,
-    IN PFS_INFORMATION_CLASS    FsInformationClass OPTIONAL
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoCheckQuotaBufferValidity (
-    IN PFILE_QUOTA_INFORMATION  QuotaBuffer,
-    IN ULONG                    QuotaLength,
-    OUT PULONG                  ErrorOffset
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-PFILE_OBJECT
-NTAPI
-IoCreateStreamFileObject (
-    IN PFILE_OBJECT     FileObject OPTIONAL,
-    IN PDEVICE_OBJECT   DeviceObject OPTIONAL
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-PFILE_OBJECT
-NTAPI
-IoCreateStreamFileObjectLite (
-    IN PFILE_OBJECT     FileObject OPTIONAL,
-    IN PDEVICE_OBJECT   DeviceObject OPTIONAL
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-IoFastQueryNetworkAttributes (
-    IN POBJECT_ATTRIBUTES               ObjectAttributes,
-    IN ACCESS_MASK                      DesiredAccess,
-    IN ULONG                            OpenOptions,
-    OUT PIO_STATUS_BLOCK                IoStatus,
-    OUT PFILE_NETWORK_OPEN_INFORMATION  Buffer
-);
-
-NTKERNELAPI
-PDEVICE_OBJECT
-NTAPI
-IoGetAttachedDevice (
-    IN PDEVICE_OBJECT DeviceObject
-);
-
-NTKERNELAPI
-PDEVICE_OBJECT
-NTAPI
-IoGetBaseFileSystemDeviceObject (
-    IN PFILE_OBJECT FileObject
-);
-
-NTKERNELAPI
-PEPROCESS
-NTAPI
-IoGetRequestorProcess (
-    IN PIRP Irp
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-ULONG
-NTAPI
-IoGetRequestorProcessId (
-    IN PIRP Irp
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-PIRP
-NTAPI
-IoGetTopLevelIrp (
-    VOID
-);
-
-#define IoIsFileOpenedExclusively(FileObject) ( \
-    (BOOLEAN) !(                                \
-    (FileObject)->SharedRead ||                 \
-    (FileObject)->SharedWrite ||                \
-    (FileObject)->SharedDelete                  \
-    )                                           \
-)
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-IoIsOperationSynchronous (
-    IN PIRP Irp
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-IoIsSystemThread (
-    IN PETHREAD Thread
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-IoIsValidNameGraftingBuffer (
-    IN PIRP                 Irp,
-    IN PREPARSE_DATA_BUFFER ReparseBuffer
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoPageRead (
-    IN PFILE_OBJECT         FileObject,
-    IN PMDL                 Mdl,
-    IN PLARGE_INTEGER       Offset,
-    IN PKEVENT              Event,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoQueryFileInformation (
-    IN PFILE_OBJECT             FileObject,
-    IN FILE_INFORMATION_CLASS   FileInformationClass,
-    IN ULONG                    Length,
-    OUT PVOID                   FileInformation,
-    OUT PULONG                  ReturnedLength
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoQueryVolumeInformation (
-    IN PFILE_OBJECT         FileObject,
-    IN FS_INFORMATION_CLASS FsInformationClass,
-    IN ULONG                Length,
-    OUT PVOID               FsInformation,
-    OUT PULONG              ReturnedLength
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-IoRegisterFileSystem (
-    IN OUT PDEVICE_OBJECT DeviceObject
-);
-
-#if (VER_PRODUCTBUILD >= 1381)
-
-typedef VOID (NTAPI *PDRIVER_FS_NOTIFICATION) (
-    IN PDEVICE_OBJECT DeviceObject,
-    IN BOOLEAN        DriverActive
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoRegisterFsRegistrationChange (
-    IN PDRIVER_OBJECT           DriverObject,
-    IN PDRIVER_FS_NOTIFICATION  DriverNotificationRoutine
-);
-
-#endif /* (VER_PRODUCTBUILD >= 1381) */
-
-NTKERNELAPI
-VOID
-NTAPI
-IoReleaseVpbSpinLock (
-    IN KIRQL Irql
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-IoSetDeviceToVerify (
-    IN PETHREAD         Thread,
-    IN PDEVICE_OBJECT   DeviceObject
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoSetInformation (
-    IN PFILE_OBJECT             FileObject,
-    IN FILE_INFORMATION_CLASS   FileInformationClass,
-    IN ULONG                    Length,
-    IN PVOID                    FileInformation
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-IoSetTopLevelIrp (
-    IN PIRP Irp
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoSynchronousPageWrite (
-    IN PFILE_OBJECT         FileObject,
-    IN PMDL                 Mdl,
-    IN PLARGE_INTEGER       FileOffset,
-    IN PKEVENT              Event,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock
-);
-
-NTKERNELAPI
-PEPROCESS
-NTAPI
-IoThreadToProcess (
-    IN PETHREAD Thread
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-IoUnregisterFileSystem (
-    IN OUT PDEVICE_OBJECT DeviceObject
-);
-
-#if (VER_PRODUCTBUILD >= 1381)
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoUnregisterFsRegistrationChange (
-    IN PDRIVER_OBJECT           DriverObject,
-    IN PDRIVER_FS_NOTIFICATION  DriverNotificationRoutine
-);
-
-#endif /* (VER_PRODUCTBUILD >= 1381) */
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-IoVerifyVolume (
-    IN PDEVICE_OBJECT   DeviceObject,
-    IN BOOLEAN          AllowRawMount
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-KeAttachProcess (
-    IN PEPROCESS Process
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-KeDetachProcess (
-    VOID
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-KeInitializeQueue (
-    IN PRKQUEUE Queue,
-    IN ULONG    Count OPTIONAL
-);
-
-NTKERNELAPI
-LONG
-NTAPI
-KeInsertHeadQueue (
-    IN PRKQUEUE     Queue,
-    IN PLIST_ENTRY  Entry
-);
-
-NTKERNELAPI
-LONG
-NTAPI
-KeInsertQueue (
-    IN PRKQUEUE     Queue,
-    IN PLIST_ENTRY  Entry
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-KeInsertQueueApc (
-    IN PKAPC      Apc,
-    IN PVOID      SystemArgument1,
-    IN PVOID      SystemArgument2,
-    IN KPRIORITY  PriorityBoost
-);
-
-NTKERNELAPI
-LONG
-NTAPI
-KeReadStateQueue (
-    IN PRKQUEUE Queue
-);
-
-NTKERNELAPI
-PLIST_ENTRY
-NTAPI
-KeRemoveQueue (
-    IN PRKQUEUE         Queue,
-    IN KPROCESSOR_MODE  WaitMode,
-    IN PLARGE_INTEGER   Timeout OPTIONAL
-);
-
-NTKERNELAPI
-PLIST_ENTRY
-NTAPI
-KeRundownQueue (
-    IN PRKQUEUE Queue
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-VOID
-NTAPI
-KeStackAttachProcess (
-    IN PKPROCESS    Process,
-    OUT PKAPC_STATE ApcState
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-KeUnstackDetachProcess (
-    IN PKAPC_STATE ApcState
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-MmCanFileBeTruncated (
-    IN PSECTION_OBJECT_POINTERS     SectionObjectPointer,
-    IN PLARGE_INTEGER               NewFileSize
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-MmFlushImageSection (
-    IN PSECTION_OBJECT_POINTERS     SectionObjectPointer,
-    IN MMFLUSH_TYPE                 FlushType
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-MmForceSectionClosed (
-    IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
-    IN BOOLEAN                  DelayClose
-);
-
-#if (VER_PRODUCTBUILD >= 1381)
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-MmIsRecursiveIoFault (
-    VOID
-);
-
-#else
-
-#define MmIsRecursiveIoFault() (                            \
-    (PsGetCurrentThread()->DisablePageFaultClustering) |    \
-    (PsGetCurrentThread()->ForwardClusterOnly)              \
-)
-
-#endif
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-MmMapViewOfSection (
-    IN PVOID                SectionObject,
-    IN PEPROCESS            Process,
-    IN OUT PVOID            *BaseAddress,
-    IN ULONG                ZeroBits,
-    IN ULONG                CommitSize,
-    IN OUT PLARGE_INTEGER   SectionOffset OPTIONAL,
-    IN OUT PULONG           ViewSize,
-    IN SECTION_INHERIT      InheritDisposition,
-    IN ULONG                AllocationType,
-    IN ULONG                Protect
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-MmSetAddressRangeModified (
-    IN PVOID    Address,
-    IN ULONG    Length
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-ObCreateObject (
-    IN KPROCESSOR_MODE      ObjectAttributesAccessMode OPTIONAL,
-    IN POBJECT_TYPE         ObjectType,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes OPTIONAL,
-    IN KPROCESSOR_MODE      AccessMode,
-    IN OUT PVOID            ParseContext OPTIONAL,
-    IN ULONG                ObjectSize,
-    IN ULONG                PagedPoolCharge OPTIONAL,
-    IN ULONG                NonPagedPoolCharge OPTIONAL,
-    OUT PVOID               *Object
-);
-
-NTKERNELAPI
-ULONG
-NTAPI
-ObGetObjectPointerCount (
-    IN PVOID Object
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-ObInsertObject (
-    IN PVOID            Object,
-    IN PACCESS_STATE    PassedAccessState OPTIONAL,
-    IN ACCESS_MASK      DesiredAccess,
-    IN ULONG            AdditionalReferences,
-    OUT PVOID           *ReferencedObject OPTIONAL,
-    OUT PHANDLE         Handle
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-ObMakeTemporaryObject (
-    IN PVOID Object
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-ObOpenObjectByPointer (
-    IN PVOID            Object,
-    IN ULONG            HandleAttributes,
-    IN PACCESS_STATE    PassedAccessState OPTIONAL,
-    IN ACCESS_MASK      DesiredAccess OPTIONAL,
-    IN POBJECT_TYPE     ObjectType OPTIONAL,
-    IN KPROCESSOR_MODE  AccessMode,
-    OUT PHANDLE         Handle
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-ObQueryNameString (
-    IN PVOID                        Object,
-    OUT POBJECT_NAME_INFORMATION    ObjectNameInfo,
-    IN ULONG                        Length,
-    OUT PULONG                      ReturnLength
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-ObQueryObjectAuditingByHandle (
-    IN HANDLE       Handle,
-    OUT PBOOLEAN    GenerateOnClose
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-ObReferenceObjectByName (
-    IN PUNICODE_STRING  ObjectName,
-    IN ULONG            Attributes,
-    IN PACCESS_STATE    PassedAccessState OPTIONAL,
-    IN ACCESS_MASK      DesiredAccess OPTIONAL,
-    IN POBJECT_TYPE     ObjectType,
-    IN KPROCESSOR_MODE  AccessMode,
-    IN OUT PVOID        ParseContext OPTIONAL,
-    OUT PVOID           *Object
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-PsChargePoolQuota (
-    IN PEPROCESS    Process,
-    IN POOL_TYPE    PoolType,
-    IN ULONG        Amount
-);
-
-#define PsDereferenceImpersonationToken(T)  \
-            {if (ARGUMENT_PRESENT(T)) {     \
-                (ObDereferenceObject((T))); \
-            } else {                        \
-                ;                           \
-            }                               \
-}
-
-#define PsDereferencePrimaryToken(T) (ObDereferenceObject((T)))
-
-NTKERNELAPI
-ULONGLONG
-NTAPI
-PsGetProcessExitTime (
-    VOID
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-PsIsThreadTerminating (
-    IN PETHREAD Thread
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-PsLookupProcessByProcessId (
-    IN PVOID        ProcessId,
-    OUT PEPROCESS   *Process
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-PsLookupProcessThreadByCid (
-    IN PCLIENT_ID   Cid,
-    OUT PEPROCESS   *Process OPTIONAL,
-    OUT PETHREAD    *Thread
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-PsLookupThreadByThreadId (
-    IN PVOID        UniqueThreadId,
-    OUT PETHREAD    *Thread
-);
-
-NTKERNELAPI
-PACCESS_TOKEN
-NTAPI
-PsReferenceImpersonationToken (
-    IN PETHREAD                         Thread,
-    OUT PBOOLEAN                        CopyOnUse,
-    OUT PBOOLEAN                        EffectiveOnly,
-    OUT PSECURITY_IMPERSONATION_LEVEL   Level
-);
-
-NTKERNELAPI
-HANDLE
-NTAPI
-PsReferencePrimaryToken (
-    IN PEPROCESS Process
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-PsReturnPoolQuota (
-    IN PEPROCESS    Process,
-    IN POOL_TYPE    PoolType,
-    IN ULONG        Amount
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-PsRevertToSelf (
-    VOID
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlAbsoluteToSelfRelativeSD (
-    IN PSECURITY_DESCRIPTOR     AbsoluteSecurityDescriptor,
-    IN OUT PSECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor,
-    IN PULONG                   BufferLength
-);
-
-NTSYSAPI
-PVOID
-NTAPI
-RtlAllocateHeap (
-    IN HANDLE  HeapHandle,
-    IN ULONG   Flags,
-    IN ULONG   Size
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlCompressBuffer (
-    IN USHORT   CompressionFormatAndEngine,
-    IN PUCHAR   UncompressedBuffer,
-    IN ULONG    UncompressedBufferSize,
-    OUT PUCHAR  CompressedBuffer,
-    IN ULONG    CompressedBufferSize,
-    IN ULONG    UncompressedChunkSize,
-    OUT PULONG  FinalCompressedSize,
-    IN PVOID    WorkSpace
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlCompressChunks (
-    IN PUCHAR                       UncompressedBuffer,
-    IN ULONG                        UncompressedBufferSize,
-    OUT PUCHAR                      CompressedBuffer,
-    IN ULONG                        CompressedBufferSize,
-    IN OUT PCOMPRESSED_DATA_INFO    CompressedDataInfo,
-    IN ULONG                        CompressedDataInfoLength,
-    IN PVOID                        WorkSpace
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlConvertSidToUnicodeString (
-    OUT PUNICODE_STRING DestinationString,
-    IN PSID             Sid,
-    IN BOOLEAN          AllocateDestinationString
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlCopySid (
-    IN ULONG   Length,
-    IN PSID    Destination,
-    IN PSID    Source
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlDecompressBuffer (
-    IN USHORT   CompressionFormat,
-    OUT PUCHAR  UncompressedBuffer,
-    IN ULONG    UncompressedBufferSize,
-    IN PUCHAR   CompressedBuffer,
-    IN ULONG    CompressedBufferSize,
-    OUT PULONG  FinalUncompressedSize
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlDecompressChunks (
-    OUT PUCHAR                  UncompressedBuffer,
-    IN ULONG                    UncompressedBufferSize,
-    IN PUCHAR                   CompressedBuffer,
-    IN ULONG                    CompressedBufferSize,
-    IN PUCHAR                   CompressedTail,
-    IN ULONG                    CompressedTailSize,
-    IN PCOMPRESSED_DATA_INFO    CompressedDataInfo
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlDecompressFragment (
-    IN USHORT   CompressionFormat,
-    OUT PUCHAR  UncompressedFragment,
-    IN ULONG    UncompressedFragmentSize,
-    IN PUCHAR   CompressedBuffer,
-    IN ULONG    CompressedBufferSize,
-    IN ULONG    FragmentOffset,
-    OUT PULONG  FinalUncompressedSize,
-    IN PVOID    WorkSpace
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlDescribeChunk (
-    IN USHORT       CompressionFormat,
-    IN OUT PUCHAR   *CompressedBuffer,
-    IN PUCHAR       EndOfCompressedBufferPlus1,
-    OUT PUCHAR      *ChunkBuffer,
-    OUT PULONG      ChunkSize
-);
-
-NTSYSAPI
-BOOLEAN
-NTAPI
-RtlEqualSid (
-    IN PSID Sid1,
-    IN PSID Sid2
-);
-
-NTSYSAPI
-VOID
-NTAPI
-RtlFillMemoryUlong (
-    IN PVOID    Destination,
-    IN ULONG    Length,
-    IN ULONG    Fill
-);
-
-NTSYSAPI
-BOOLEAN
-NTAPI
-RtlFreeHeap (
-    IN HANDLE  HeapHandle,
-    IN ULONG   Flags,
-    IN PVOID   P
-);
-
-NTSYSAPI
-VOID
-NTAPI
-RtlGenerate8dot3Name (
-    IN PUNICODE_STRING              Name,
-    IN BOOLEAN                      AllowExtendedCharacters,
-    IN OUT PGENERATE_NAME_CONTEXT   Context,
-    OUT PUNICODE_STRING             Name8dot3
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlGetCompressionWorkSpaceSize (
-    IN USHORT   CompressionFormatAndEngine,
-    OUT PULONG  CompressBufferWorkSpaceSize,
-    OUT PULONG  CompressFragmentWorkSpaceSize
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlGetDaclSecurityDescriptor (
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    OUT PBOOLEAN            DaclPresent,
-    OUT PACL                *Dacl,
-    OUT PBOOLEAN            DaclDefaulted
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlGetGroupSecurityDescriptor (
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    OUT PSID                *Group,
-    OUT PBOOLEAN            GroupDefaulted
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlGetOwnerSecurityDescriptor (
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    OUT PSID                *Owner,
-    OUT PBOOLEAN            OwnerDefaulted
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlInitializeSid (
-    IN OUT PSID                     Sid,
-    IN PSID_IDENTIFIER_AUTHORITY    IdentifierAuthority,
-    IN UCHAR                        SubAuthorityCount
-);
-
-NTSYSAPI
-BOOLEAN
-NTAPI
-RtlIsNameLegalDOS8Dot3 (
-    IN PUNICODE_STRING UnicodeName,
-    IN PANSI_STRING    AnsiName,
-    PBOOLEAN           Unknown
-);
-
-NTSYSAPI
-ULONG
-NTAPI
-RtlLengthRequiredSid (
-    IN UCHAR SubAuthorityCount
-);
-
-NTSYSAPI
-ULONG
-NTAPI
-RtlLengthSid (
-    IN PSID Sid
-);
-
-NTSYSAPI
-ULONG
-NTAPI
-RtlNtStatusToDosError (
-    IN NTSTATUS Status
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlReserveChunk (
-    IN USHORT       CompressionFormat,
-    IN OUT PUCHAR   *CompressedBuffer,
-    IN PUCHAR       EndOfCompressedBufferPlus1,
-    OUT PUCHAR      *ChunkBuffer,
-    IN ULONG        ChunkSize
-);
-
-NTSYSAPI
-VOID
-NTAPI
-RtlSecondsSince1970ToTime (
-    IN ULONG            SecondsSince1970,
-    OUT PLARGE_INTEGER  Time
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlSelfRelativeToAbsoluteSD (
-    IN PSECURITY_DESCRIPTOR     SelfRelativeSD,
-    OUT PSECURITY_DESCRIPTOR    AbsoluteSD,
-    IN PULONG                   AbsoluteSDSize,
-    IN PACL                     Dacl,
-    IN PULONG                   DaclSize,
-    IN PACL                     Sacl,
-    IN PULONG                   SaclSize,
-    IN PSID                     Owner,
-    IN PULONG                   OwnerSize,
-    IN PSID                     PrimaryGroup,
-    IN PULONG                   PrimaryGroupSize
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlSetGroupSecurityDescriptor (
-    IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN PSID                     Group,
-    IN BOOLEAN                  GroupDefaulted
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlSetOwnerSecurityDescriptor (
-    IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN PSID                     Owner,
-    IN BOOLEAN                  OwnerDefaulted
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-RtlSetSaclSecurityDescriptor (
-    IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN BOOLEAN                  SaclPresent,
-    IN PACL                     Sacl,
-    IN BOOLEAN                  SaclDefaulted
-);
-
-NTSYSAPI
-PUCHAR
-NTAPI
-RtlSubAuthorityCountSid (
-    IN PSID Sid
-);
-
-NTSYSAPI
-PULONG
-NTAPI
-RtlSubAuthoritySid (
-    IN PSID    Sid,
-    IN ULONG   SubAuthority
-);
-
-NTSYSAPI
-BOOLEAN
-NTAPI
-RtlValidSid (
-    IN PSID Sid
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeAppendPrivileges (
-    PACCESS_STATE   AccessState,
-    PPRIVILEGE_SET  Privileges
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-SeAuditingFileEvents (
-    IN BOOLEAN              AccessGranted,
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-SeAuditingFileOrGlobalEvents (
-    IN BOOLEAN                      AccessGranted,
-    IN PSECURITY_DESCRIPTOR         SecurityDescriptor,
-    IN PSECURITY_SUBJECT_CONTEXT    SubjectContext
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-SeCaptureSubjectContext (
-    OUT PSECURITY_SUBJECT_CONTEXT SubjectContext
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeCreateAccessState (
-    OUT PACCESS_STATE   AccessState,
-    IN PVOID            AuxData,
-    IN ACCESS_MASK      AccessMask,
-    IN PGENERIC_MAPPING Mapping
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeCreateClientSecurity (
-    IN PETHREAD                     Thread,
-    IN PSECURITY_QUALITY_OF_SERVICE QualityOfService,
-    IN BOOLEAN                      RemoteClient,
-    OUT PSECURITY_CLIENT_CONTEXT    ClientContext
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeCreateClientSecurityFromSubjectContext (
-    IN PSECURITY_SUBJECT_CONTEXT    SubjectContext,
-    IN PSECURITY_QUALITY_OF_SERVICE QualityOfService,
-    IN BOOLEAN                      ServerIsRemote,
-    OUT PSECURITY_CLIENT_CONTEXT    ClientContext
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-#define SeDeleteClientSecurity(C)  {                                           \
-            if (SeTokenType((C)->ClientToken) == TokenPrimary) {               \
-                PsDereferencePrimaryToken( (C)->ClientToken );                 \
-            } else {                                                           \
-                PsDereferenceImpersonationToken( (C)->ClientToken );           \
-            }                                                                  \
-}
-
-NTKERNELAPI
-VOID
-NTAPI
-SeDeleteObjectAuditAlarm (
-    IN PVOID    Object,
-    IN HANDLE   Handle
-);
-
-#define SeEnableAccessToExports() SeExports = *(PSE_EXPORTS *)SeExports;
-
-NTKERNELAPI
-VOID
-NTAPI
-SeFreePrivileges (
-    IN PPRIVILEGE_SET Privileges
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-SeImpersonateClient (
-    IN PSECURITY_CLIENT_CONTEXT ClientContext,
-    IN PETHREAD                 ServerThread OPTIONAL
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeImpersonateClientEx (
-    IN PSECURITY_CLIENT_CONTEXT ClientContext,
-    IN PETHREAD                 ServerThread OPTIONAL
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-VOID
-NTAPI
-SeLockSubjectContext (
-    IN PSECURITY_SUBJECT_CONTEXT SubjectContext
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeMarkLogonSessionForTerminationNotification (
-    IN PLUID LogonId
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-SeOpenObjectAuditAlarm (
-    IN PUNICODE_STRING      ObjectTypeName,
-    IN PVOID                Object OPTIONAL,
-    IN PUNICODE_STRING      AbsoluteObjectName OPTIONAL,
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN PACCESS_STATE        AccessState,
-    IN BOOLEAN              ObjectCreated,
-    IN BOOLEAN              AccessGranted,
-    IN KPROCESSOR_MODE      AccessMode,
-    OUT PBOOLEAN            GenerateOnClose
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-SeOpenObjectForDeleteAuditAlarm (
-    IN PUNICODE_STRING      ObjectTypeName,
-    IN PVOID                Object OPTIONAL,
-    IN PUNICODE_STRING      AbsoluteObjectName OPTIONAL,
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN PACCESS_STATE        AccessState,
-    IN BOOLEAN              ObjectCreated,
-    IN BOOLEAN              AccessGranted,
-    IN KPROCESSOR_MODE      AccessMode,
-    OUT PBOOLEAN            GenerateOnClose
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-SePrivilegeCheck (
-    IN OUT PPRIVILEGE_SET           RequiredPrivileges,
-    IN PSECURITY_SUBJECT_CONTEXT    SubjectContext,
-    IN KPROCESSOR_MODE              AccessMode
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeQueryAuthenticationIdToken (
-    IN PACCESS_TOKEN    Token,
-    OUT PLUID           LogonId
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeQueryInformationToken (
-    IN PACCESS_TOKEN           Token,
-    IN TOKEN_INFORMATION_CLASS TokenInformationClass,
-    OUT PVOID                  *TokenInformation
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeQuerySecurityDescriptorInfo (
-    IN PSECURITY_INFORMATION    SecurityInformation,
-    OUT PSECURITY_DESCRIPTOR    SecurityDescriptor,
-    IN OUT PULONG               Length,
-    IN PSECURITY_DESCRIPTOR     *ObjectsSecurityDescriptor
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeQuerySessionIdToken (
-    IN PACCESS_TOKEN    Token,
-    IN PULONG           SessionId
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-#define SeQuerySubjectContextToken( SubjectContext )                \
-    ( ARGUMENT_PRESENT(                                             \
-        ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->ClientToken   \
-        ) ?                                                         \
-    ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->ClientToken :     \
-    ((PSECURITY_SUBJECT_CONTEXT) SubjectContext)->PrimaryToken )
-
-typedef NTSTATUS (*PSE_LOGON_SESSION_TERMINATED_ROUTINE) (
-    IN PLUID LogonId
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeRegisterLogonSessionTerminatedRoutine (
-    IN PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-SeReleaseSubjectContext (
-    IN PSECURITY_SUBJECT_CONTEXT SubjectContext
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-SeSetAccessStateGenericMapping (
-    PACCESS_STATE       AccessState,
-    PGENERIC_MAPPING    GenericMapping
-);
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeSetSecurityDescriptorInfo (
-    IN PVOID                    Object OPTIONAL,
-    IN PSECURITY_INFORMATION    SecurityInformation,
-    IN PSECURITY_DESCRIPTOR     SecurityDescriptor,
-    IN OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor,
-    IN POOL_TYPE                PoolType,
-    IN PGENERIC_MAPPING         GenericMapping
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTKERNELAPI
-NTSTATUS
-NTAPI
-SeSetSecurityDescriptorInfoEx (
-    IN PVOID                    Object OPTIONAL,
-    IN PSECURITY_INFORMATION    SecurityInformation,
-    IN PSECURITY_DESCRIPTOR     ModificationDescriptor,
-    IN OUT PSECURITY_DESCRIPTOR *ObjectsSecurityDescriptor,
-    IN ULONG                    AutoInheritFlags,
-    IN POOL_TYPE                PoolType,
-    IN PGENERIC_MAPPING         GenericMapping
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-SeTokenIsAdmin (
-    IN PACCESS_TOKEN Token
-);
-
-NTKERNELAPI
-BOOLEAN
-NTAPI
-SeTokenIsRestricted (
-    IN PACCESS_TOKEN Token
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTKERNELAPI
-TOKEN_TYPE
-NTAPI
-SeTokenType (
-    IN PACCESS_TOKEN Token
-);
-
-NTKERNELAPI
-VOID
-NTAPI
-SeUnlockSubjectContext (
-    IN PSECURITY_SUBJECT_CONTEXT SubjectContext
-);
-
-NTKERNELAPI
-NTSTATUS
-SeUnregisterLogonSessionTerminatedRoutine (
-    IN PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwAdjustPrivilegesToken (
-    IN HANDLE               TokenHandle,
-    IN BOOLEAN              DisableAllPrivileges,
-    IN PTOKEN_PRIVILEGES    NewState,
-    IN ULONG                BufferLength,
-    OUT PTOKEN_PRIVILEGES   PreviousState OPTIONAL,
-    OUT PULONG              ReturnLength
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwAlertThread (
-    IN HANDLE ThreadHandle
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwAllocateVirtualMemory (
-    IN HANDLE       ProcessHandle,
-    IN OUT PVOID    *BaseAddress,
-    IN ULONG        ZeroBits,
-    IN OUT PULONG   RegionSize,
-    IN ULONG        AllocationType,
-    IN ULONG        Protect
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwAccessCheckAndAuditAlarm (
-    IN PUNICODE_STRING      SubsystemName,
-    IN PVOID                HandleId,
-    IN PUNICODE_STRING      ObjectTypeName,
-    IN PUNICODE_STRING      ObjectName,
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor,
-    IN ACCESS_MASK          DesiredAccess,
-    IN PGENERIC_MAPPING     GenericMapping,
-    IN BOOLEAN              ObjectCreation,
-    OUT PACCESS_MASK        GrantedAccess,
-    OUT PBOOLEAN            AccessStatus,
-    OUT PBOOLEAN            GenerateOnClose
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwCancelIoFile (
-    IN HANDLE               FileHandle,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwClearEvent (
-    IN HANDLE EventHandle
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwCloseObjectAuditAlarm (
-    IN PUNICODE_STRING  SubsystemName,
-    IN PVOID            HandleId,
-    IN BOOLEAN          GenerateOnClose
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwCreateSection (
-    OUT PHANDLE             SectionHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes OPTIONAL,
-    IN PLARGE_INTEGER       MaximumSize OPTIONAL,
-    IN ULONG                SectionPageProtection,
-    IN ULONG                AllocationAttributes,
-    IN HANDLE               FileHandle OPTIONAL
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwCreateSymbolicLinkObject (
-    OUT PHANDLE             SymbolicLinkHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes,
-    IN PUNICODE_STRING      TargetName
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwDeleteFile (
-    IN POBJECT_ATTRIBUTES ObjectAttributes
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwDeleteValueKey (
-    IN HANDLE           Handle,
-    IN PUNICODE_STRING  Name
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwDeviceIoControlFile (
-    IN HANDLE               FileHandle,
-    IN HANDLE               Event OPTIONAL,
-    IN PIO_APC_ROUTINE      ApcRoutine OPTIONAL,
-    IN PVOID                ApcContext OPTIONAL,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    IN ULONG                IoControlCode,
-    IN PVOID                InputBuffer OPTIONAL,
-    IN ULONG                InputBufferLength,
-    OUT PVOID               OutputBuffer OPTIONAL,
-    IN ULONG                OutputBufferLength
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwDisplayString (
-    IN PUNICODE_STRING String
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwDuplicateObject (
-    IN HANDLE       SourceProcessHandle,
-    IN HANDLE       SourceHandle,
-    IN HANDLE       TargetProcessHandle OPTIONAL,
-    OUT PHANDLE     TargetHandle OPTIONAL,
-    IN ACCESS_MASK  DesiredAccess,
-    IN ULONG        HandleAttributes,
-    IN ULONG        Options
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwDuplicateToken (
-    IN HANDLE               ExistingTokenHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes,
-    IN BOOLEAN              EffectiveOnly,
-    IN TOKEN_TYPE           TokenType,
-    OUT PHANDLE             NewTokenHandle
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwFlushInstructionCache (
-    IN HANDLE   ProcessHandle,
-    IN PVOID    BaseAddress OPTIONAL,
-    IN ULONG    FlushSize
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwFlushVirtualMemory (
-    IN HANDLE               ProcessHandle,
-    IN OUT PVOID            *BaseAddress,
-    IN OUT PULONG           FlushSize,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwFreeVirtualMemory (
-    IN HANDLE       ProcessHandle,
-    IN OUT PVOID    *BaseAddress,
-    IN OUT PULONG   RegionSize,
-    IN ULONG        FreeType
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwFsControlFile (
-    IN HANDLE               FileHandle,
-    IN HANDLE               Event OPTIONAL,
-    IN PIO_APC_ROUTINE      ApcRoutine OPTIONAL,
-    IN PVOID                ApcContext OPTIONAL,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    IN ULONG                FsControlCode,
-    IN PVOID                InputBuffer OPTIONAL,
-    IN ULONG                InputBufferLength,
-    OUT PVOID               OutputBuffer OPTIONAL,
-    IN ULONG                OutputBufferLength
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwInitiatePowerAction (
-    IN POWER_ACTION         SystemAction,
-    IN SYSTEM_POWER_STATE   MinSystemState,
-    IN ULONG                Flags,
-    IN BOOLEAN              Asynchronous
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwLoadDriver (
-    /* "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\<DriverName>" */
-    IN PUNICODE_STRING RegistryPath
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwLoadKey (
-    IN POBJECT_ATTRIBUTES KeyObjectAttributes,
-    IN POBJECT_ATTRIBUTES FileObjectAttributes
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwNotifyChangeKey (
-    IN HANDLE               KeyHandle,
-    IN HANDLE               EventHandle OPTIONAL,
-    IN PIO_APC_ROUTINE      ApcRoutine OPTIONAL,
-    IN PVOID                ApcContext OPTIONAL,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    IN ULONG                NotifyFilter,
-    IN BOOLEAN              WatchSubtree,
-    IN PVOID                Buffer,
-    IN ULONG                BufferLength,
-    IN BOOLEAN              Asynchronous
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwOpenDirectoryObject (
-    OUT PHANDLE             DirectoryHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwOpenEvent (
-    OUT PHANDLE             EventHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwOpenProcess (
-    OUT PHANDLE             ProcessHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes,
-    IN PCLIENT_ID           ClientId OPTIONAL
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwOpenProcessToken (
-    IN HANDLE       ProcessHandle,
-    IN ACCESS_MASK  DesiredAccess,
-    OUT PHANDLE     TokenHandle
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwOpenThread (
-    OUT PHANDLE             ThreadHandle,
-    IN ACCESS_MASK          DesiredAccess,
-    IN POBJECT_ATTRIBUTES   ObjectAttributes,
-    IN PCLIENT_ID           ClientId
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwOpenThreadToken (
-    IN HANDLE       ThreadHandle,
-    IN ACCESS_MASK  DesiredAccess,
-    IN BOOLEAN      OpenAsSelf,
-    OUT PHANDLE     TokenHandle
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwPowerInformation (
-    IN POWER_INFORMATION_LEVEL  PowerInformationLevel,
-    IN PVOID                    InputBuffer OPTIONAL,
-    IN ULONG                    InputBufferLength,
-    OUT PVOID                   OutputBuffer OPTIONAL,
-    IN ULONG                    OutputBufferLength
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwPulseEvent (
-    IN HANDLE   EventHandle,
-    OUT PULONG  PreviousState OPTIONAL
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQueryDefaultLocale (
-    IN BOOLEAN  ThreadOrSystem,
-    OUT PLCID   Locale
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQueryDirectoryFile (
-    IN HANDLE                   FileHandle,
-    IN HANDLE                   Event OPTIONAL,
-    IN PIO_APC_ROUTINE          ApcRoutine OPTIONAL,
-    IN PVOID                    ApcContext OPTIONAL,
-    OUT PIO_STATUS_BLOCK        IoStatusBlock,
-    OUT PVOID                   FileInformation,
-    IN ULONG                    Length,
-    IN FILE_INFORMATION_CLASS   FileInformationClass,
-    IN BOOLEAN                  ReturnSingleEntry,
-    IN PUNICODE_STRING          FileName OPTIONAL,
-    IN BOOLEAN                  RestartScan
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQueryDirectoryObject (
-    IN HANDLE       DirectoryHandle,
-    OUT PVOID       Buffer,
-    IN ULONG        Length,
-    IN BOOLEAN      ReturnSingleEntry,
-    IN BOOLEAN      RestartScan,
-    IN OUT PULONG   Context,
-    OUT PULONG      ReturnLength OPTIONAL
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQueryEaFile (
-    IN HANDLE               FileHandle,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    OUT PVOID               Buffer,
-    IN ULONG                Length,
-    IN BOOLEAN              ReturnSingleEntry,
-    IN PVOID                EaList OPTIONAL,
-    IN ULONG                EaListLength,
-    IN PULONG               EaIndex OPTIONAL,
-    IN BOOLEAN              RestartScan
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQueryInformationProcess (
-    IN HANDLE           ProcessHandle,
-    IN PROCESSINFOCLASS ProcessInformationClass,
-    OUT PVOID           ProcessInformation,
-    IN ULONG            ProcessInformationLength,
-    OUT PULONG          ReturnLength OPTIONAL
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQueryInformationToken (
-    IN HANDLE                   TokenHandle,
-    IN TOKEN_INFORMATION_CLASS  TokenInformationClass,
-    OUT PVOID                   TokenInformation,
-    IN ULONG                    Length,
-    OUT PULONG                  ResultLength
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQueryObject (
-    IN HANDLE                      ObjectHandle,
-    IN OBJECT_INFORMATION_CLASS    ObjectInformationClass,
-    OUT PVOID                      ObjectInformation,
-    IN ULONG                       Length,
-    OUT PULONG                     ResultLength
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQuerySection (
-    IN HANDLE                       SectionHandle,
-    IN SECTION_INFORMATION_CLASS    SectionInformationClass,
-    OUT PVOID                       SectionInformation,
-    IN ULONG                        SectionInformationLength,
-    OUT PULONG                      ResultLength OPTIONAL
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQuerySecurityObject (
-    IN HANDLE                   FileHandle,
-    IN SECURITY_INFORMATION     SecurityInformation,
-    OUT PSECURITY_DESCRIPTOR    SecurityDescriptor,
-    IN ULONG                    Length,
-    OUT PULONG                  ResultLength
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQuerySystemInformation (
-    IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
-    OUT PVOID                   SystemInformation,
-    IN ULONG                    Length,
-    OUT PULONG                  ReturnLength
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwQueryVolumeInformationFile (
-    IN HANDLE               FileHandle,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    OUT PVOID               FsInformation,
-    IN ULONG                Length,
-    IN FS_INFORMATION_CLASS FsInformationClass
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwReplaceKey (
-    IN POBJECT_ATTRIBUTES   NewFileObjectAttributes,
-    IN HANDLE               KeyHandle,
-    IN POBJECT_ATTRIBUTES   OldFileObjectAttributes
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwResetEvent (
-    IN HANDLE   EventHandle,
-    OUT PULONG  PreviousState OPTIONAL
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwRestoreKey (
-    IN HANDLE   KeyHandle,
-    IN HANDLE   FileHandle,
-    IN ULONG    Flags
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSaveKey (
-    IN HANDLE KeyHandle,
-    IN HANDLE FileHandle
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSetDefaultLocale (
-    IN BOOLEAN  ThreadOrSystem,
-    IN LCID     Locale
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSetDefaultUILanguage (
-    IN LANGID LanguageId
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSetEaFile (
-    IN HANDLE               FileHandle,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    OUT PVOID               Buffer,
-    IN ULONG                Length
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSetEvent (
-    IN HANDLE   EventHandle,
-    OUT PULONG  PreviousState OPTIONAL
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSetInformationObject (
-    IN HANDLE                       ObjectHandle,
-    IN OBJECT_INFORMATION_CLASS    ObjectInformationClass,
-    IN PVOID                        ObjectInformation,
-    IN ULONG                        ObjectInformationLength
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSetInformationProcess (
-    IN HANDLE           ProcessHandle,
-    IN PROCESSINFOCLASS ProcessInformationClass,
-    IN PVOID            ProcessInformation,
-    IN ULONG            ProcessInformationLength
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSetSecurityObject (
-    IN HANDLE               Handle,
-    IN SECURITY_INFORMATION SecurityInformation,
-    IN PSECURITY_DESCRIPTOR SecurityDescriptor
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSetSystemInformation (
-    IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
-    IN PVOID                    SystemInformation,
-    IN ULONG                    Length
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSetSystemTime (
-    IN PLARGE_INTEGER   NewTime,
-    OUT PLARGE_INTEGER  OldTime OPTIONAL
-);
-
-#if (VER_PRODUCTBUILD >= 2195)
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwSetVolumeInformationFile (
-    IN HANDLE               FileHandle,
-    OUT PIO_STATUS_BLOCK    IoStatusBlock,
-    IN PVOID                FsInformation,
-    IN ULONG                Length,
-    IN FS_INFORMATION_CLASS FsInformationClass
-);
-
-#endif /* (VER_PRODUCTBUILD >= 2195) */
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwTerminateProcess (
-    IN HANDLE   ProcessHandle OPTIONAL,
-    IN NTSTATUS ExitStatus
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwUnloadDriver (
-    /* "\\Registry\\Machine\\System\\CurrentControlSet\\Services\\<DriverName>" */
-    IN PUNICODE_STRING RegistryPath
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwUnloadKey (
-    IN POBJECT_ATTRIBUTES KeyObjectAttributes
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwWaitForSingleObject (
-    IN HANDLE           Handle,
-    IN BOOLEAN          Alertable,
-    IN PLARGE_INTEGER   Timeout OPTIONAL
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwWaitForMultipleObjects (
-    IN ULONG            HandleCount,
-    IN PHANDLE          Handles,
-    IN WAIT_TYPE        WaitType,
-    IN BOOLEAN          Alertable,
-    IN PLARGE_INTEGER   Timeout OPTIONAL
-);
-
-NTSYSAPI
-NTSTATUS
-NTAPI
-ZwYieldExecution (
-    VOID
-);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _NTIFS_ */
diff --git a/winsup/w32api/include/ddk/ntpoapi.h b/winsup/w32api/include/ddk/ntpoapi.h
deleted file mode 100644
index d33de7140..000000000
--- a/winsup/w32api/include/ddk/ntpoapi.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * ntpoapi.h
- *
- * APIs for power management.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __NTPOAPI_H
-#define __NTPOAPI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "batclass.h"
-
-#define POWER_PERF_SCALE                  100
-#define PERF_LEVEL_TO_PERCENT(x)          (((x) * 1000) / (POWER_PERF_SCALE * 10))
-#define PERCENT_TO_PERF_LEVEL(x)          (((x) * POWER_PERF_SCALE * 10) / 1000)
-
-typedef struct _PROCESSOR_IDLE_TIMES {
-	ULONGLONG  StartTime;
-	ULONGLONG  EndTime;
-	ULONG  IdleHandlerReserved[4];
-} PROCESSOR_IDLE_TIMES, *PPROCESSOR_IDLE_TIMES;
-
-typedef BOOLEAN DDKFASTAPI
-(*PPROCESSOR_IDLE_HANDLER)(
-  IN OUT PPROCESSOR_IDLE_TIMES IdleTimes);
-
-typedef struct _PROCESSOR_IDLE_HANDLER_INFO {
-  ULONG  HardwareLatency;
-  PPROCESSOR_IDLE_HANDLER  Handler;
-} PROCESSOR_IDLE_HANDLER_INFO, *PPROCESSOR_IDLE_HANDLER_INFO;
-
-typedef VOID DDKFASTAPI
-(*PSET_PROCESSOR_THROTTLE)(
-  IN UCHAR  Throttle);
-
-typedef NTSTATUS DDKFASTAPI
-(*PSET_PROCESSOR_THROTTLE2)(
-  IN UCHAR  Throttle);
-
-#define MAX_IDLE_HANDLERS                 3
-
-typedef struct _PROCESSOR_STATE_HANDLER {
-	UCHAR  ThrottleScale;
-	BOOLEAN  ThrottleOnIdle;
-	PSET_PROCESSOR_THROTTLE  SetThrottle;
-	ULONG  NumIdleHandlers;
-	PROCESSOR_IDLE_HANDLER_INFO  IdleHandler[MAX_IDLE_HANDLERS];
-} PROCESSOR_STATE_HANDLER, *PPROCESSOR_STATE_HANDLER;
-
-typedef enum _POWER_STATE_HANDLER_TYPE {
-	PowerStateSleeping1,
-	PowerStateSleeping2,
-	PowerStateSleeping3,
-	PowerStateSleeping4,
-	PowerStateSleeping4Firmware,
-	PowerStateShutdownReset,
-	PowerStateShutdownOff,
-	PowerStateMaximum
-} POWER_STATE_HANDLER_TYPE, *PPOWER_STATE_HANDLER_TYPE;
-
-typedef NTSTATUS DDKAPI
-(*PENTER_STATE_SYSTEM_HANDLER)(
-  IN PVOID  SystemContext);
-
-typedef NTSTATUS DDKAPI
-(*PENTER_STATE_HANDLER)(
-  IN PVOID  Context,
-  IN PENTER_STATE_SYSTEM_HANDLER  SystemHandler  OPTIONAL,
-  IN PVOID  SystemContext,
-  IN LONG  NumberProcessors,
-  IN VOLATILE PLONG  Number);
-
-typedef struct _POWER_STATE_HANDLER {
-	POWER_STATE_HANDLER_TYPE  Type;
-	BOOLEAN  RtcWake;
-	UCHAR  Spare[3];
-	PENTER_STATE_HANDLER  Handler;
-	PVOID  Context;
-} POWER_STATE_HANDLER, *PPOWER_STATE_HANDLER;
-
-typedef NTSTATUS STDCALL
-(*PENTER_STATE_NOTIFY_HANDLER)(
-  IN POWER_STATE_HANDLER_TYPE  State,
-  IN PVOID  Context,
-  IN BOOLEAN  Entering);
-
-typedef struct _POWER_STATE_NOTIFY_HANDLER {
-	PENTER_STATE_NOTIFY_HANDLER  Handler;
-	PVOID  Context;
-} POWER_STATE_NOTIFY_HANDLER, *PPOWER_STATE_NOTIFY_HANDLER;
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtPowerInformation(
-  IN POWER_INFORMATION_LEVEL  InformationLevel,
-  IN PVOID  InputBuffer OPTIONAL,
-  IN ULONG  InputBufferLength,
-  OUT PVOID  OutputBuffer OPTIONAL,
-  IN ULONG  OutputBufferLength);
-
-#define PROCESSOR_STATE_TYPE_PERFORMANCE  1
-#define PROCESSOR_STATE_TYPE_THROTTLE     2
-
-typedef struct _PROCESSOR_PERF_LEVEL {
-  UCHAR  PercentFrequency;
-  UCHAR  Reserved;
-  USHORT  Flags;
-} PROCESSOR_PERF_LEVEL, *PPROCESSOR_PERF_LEVEL;
-
-typedef struct _PROCESSOR_PERF_STATE {
-  UCHAR  PercentFrequency;
-  UCHAR  MinCapacity;
-  USHORT  Power;
-  UCHAR  IncreaseLevel;
-  UCHAR  DecreaseLevel;
-  USHORT  Flags;
-  ULONG  IncreaseTime;
-  ULONG  DecreaseTime;
-  ULONG  IncreaseCount;
-  ULONG  DecreaseCount;
-  ULONGLONG  PerformanceTime;
-} PROCESSOR_PERF_STATE, *PPROCESSOR_PERF_STATE;
-
-typedef struct _PROCESSOR_STATE_HANDLER2 {
-	ULONG  NumIdleHandlers;
-	PROCESSOR_IDLE_HANDLER_INFO  IdleHandler[MAX_IDLE_HANDLERS];
-	PSET_PROCESSOR_THROTTLE2  SetPerfLevel;
-	ULONG  HardwareLatency;
-	UCHAR  NumPerfStates;
-	PROCESSOR_PERF_LEVEL  PerfLevel[1];
-} PROCESSOR_STATE_HANDLER2, *PPROCESSOR_STATE_HANDLER2;
-
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtSetThreadExecutionState(
-  IN EXECUTION_STATE  esFlags,
-  OUT EXECUTION_STATE  *PreviousFlags);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtRequestWakeupLatency(
-  IN LATENCY_TIME  latency);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtInitiatePowerAction(
-  IN POWER_ACTION  SystemAction,
-  IN SYSTEM_POWER_STATE  MinSystemState,
-  IN ULONG  Flags,
-  IN BOOLEAN  Asynchronous);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtSetSystemPowerState(
-  IN POWER_ACTION SystemAction,
-  IN SYSTEM_POWER_STATE MinSystemState,
-  IN ULONG Flags);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtGetDevicePowerState(
-  IN HANDLE  Device,
-  OUT DEVICE_POWER_STATE  *State);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtCancelDeviceWakeupRequest(
-  IN HANDLE  Device);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-NtIsSystemResumeAutomatic(
-  VOID);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtRequestDeviceWakeup(
-  IN HANDLE  Device);
-
-#define WINLOGON_LOCK_ON_SLEEP            0x00000001
-
-typedef struct _PROCESSOR_POWER_INFORMATION {
-  ULONG  Number;
-  ULONG  MaxMhz;
-  ULONG  CurrentMhz;
-  ULONG  MhzLimit;
-  ULONG  MaxIdleState;
-  ULONG  CurrentIdleState;
-} PROCESSOR_POWER_INFORMATION, *PPROCESSOR_POWER_INFORMATION;
-
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __NTPOAPI_H */
diff --git a/winsup/w32api/include/ddk/ntstatus.h b/winsup/w32api/include/ddk/ntstatus.h
deleted file mode 100644
index d325d9f11..000000000
--- a/winsup/w32api/include/ddk/ntstatus.h
+++ /dev/null
@@ -1,1105 +0,0 @@
-/*
- * ntstatus.h
- *
- * Windows NT status codes 
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef _NTSTATUS_H
-#define _NTSTATUS_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(STATUS_SUCCESS)
-#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) 
-#endif /* !STATUS_SUCCESS */
-#define FACILITY_DEBUGGER 0x1
-#define FACILITY_RPC_RUNTIME 0x2
-#define FACILITY_RPC_STUBS 0x3
-#define FACILITY_IO_ERROR_CODE 0x4
-#define FACILITY_TERMINAL_SERVER 0xA
-#define FACILITY_USB_ERROR_CODE 0x10
-#define FACILITY_HID_ERROR_CODE 0x11
-#define FACILITY_FIREWIRE_ERROR_CODE 0x12
-#define FACILITY_CLUSTER_ERROR_CODE 0x13
-#define FACILITY_ACPI_ERROR_CODE 0x14
-#define FACILITY_SXS_ERROR_CODE 0x15
-#define STATUS_SEVERITY_SUCCESS 0x0
-#define STATUS_SEVERITY_INFORMATIONAL 0x1
-#define STATUS_SEVERITY_WARNING 0x2
-#define STATUS_SEVERITY_ERROR 0x3
-#define STATUS_WAIT_0 ((NTSTATUS)0x00000000L)
-#define STATUS_WAIT_1 ((NTSTATUS)0x00000001L)
-#define STATUS_WAIT_2 ((NTSTATUS)0x00000002L)
-#define STATUS_WAIT_3 ((NTSTATUS)0x00000003L)
-#define STATUS_WAIT_63 ((NTSTATUS)0x0000003FL)
-#define STATUS_ABANDONED ((NTSTATUS)0x00000080L)
-#define STATUS_ABANDONED_WAIT_0 ((NTSTATUS)0x00000080L)  
-#define STATUS_ABANDONED_WAIT_63 ((NTSTATUS)0x000000BFL)
-#define STATUS_USER_APC ((NTSTATUS)0x000000C0L)  
-#define STATUS_KERNEL_APC ((NTSTATUS)0x00000100L)
-#define STATUS_ALERTED ((NTSTATUS)0x00000101L)
-#define STATUS_TIMEOUT ((NTSTATUS)0x00000102L)  
-#define STATUS_PENDING ((NTSTATUS)0x00000103L)  
-#define STATUS_REPARSE ((NTSTATUS)0x00000104L)
-#define STATUS_MORE_ENTRIES ((NTSTATUS)0x00000105L)
-#define STATUS_NOT_ALL_ASSIGNED ((NTSTATUS)0x00000106L)
-#define STATUS_SOME_NOT_MAPPED ((NTSTATUS)0x00000107L)
-#define STATUS_OPLOCK_BREAK_IN_PROGRESS ((NTSTATUS)0x00000108L)
-#define STATUS_VOLUME_MOUNTED ((NTSTATUS)0x00000109L)
-#define STATUS_RXACT_COMMITTED ((NTSTATUS)0x0000010AL)
-#define STATUS_NOTIFY_CLEANUP ((NTSTATUS)0x0000010BL)
-#define STATUS_NOTIFY_ENUM_DIR ((NTSTATUS)0x0000010CL)
-#define STATUS_NO_QUOTAS_FOR_ACCOUNT ((NTSTATUS)0x0000010DL)
-#define STATUS_PRIMARY_TRANSPORT_CONNECT_FAILED ((NTSTATUS)0x0000010EL)
-#define STATUS_PAGE_FAULT_TRANSITION ((NTSTATUS)0x00000110L)
-#define STATUS_PAGE_FAULT_DEMAND_ZERO ((NTSTATUS)0x00000111L)
-#define STATUS_PAGE_FAULT_COPY_ON_WRITE ((NTSTATUS)0x00000112L)
-#define STATUS_PAGE_FAULT_GUARD_PAGE ((NTSTATUS)0x00000113L)
-#define STATUS_PAGE_FAULT_PAGING_FILE ((NTSTATUS)0x00000114L)
-#define STATUS_CACHE_PAGE_LOCKED ((NTSTATUS)0x00000115L)
-#define STATUS_CRASH_DUMP ((NTSTATUS)0x00000116L)
-#define STATUS_BUFFER_ALL_ZEROS ((NTSTATUS)0x00000117L)
-#define STATUS_REPARSE_OBJECT ((NTSTATUS)0x00000118L)
-#define STATUS_RESOURCE_REQUIREMENTS_CHANGED ((NTSTATUS)0x00000119L)
-#define STATUS_TRANSLATION_COMPLETE ((NTSTATUS)0x00000120L)
-#define STATUS_DS_MEMBERSHIP_EVALUATED_LOCALLY ((NTSTATUS)0x00000121L)
-#define STATUS_NOTHING_TO_TERMINATE ((NTSTATUS)0x00000122L)
-#define STATUS_PROCESS_NOT_IN_JOB ((NTSTATUS)0x00000123L)
-#define STATUS_PROCESS_IN_JOB ((NTSTATUS)0x00000124L)
-#define STATUS_OBJECT_NAME_EXISTS ((NTSTATUS)0x40000000L)
-#define STATUS_THREAD_WAS_SUSPENDED ((NTSTATUS)0x40000001L)
-#define STATUS_WORKING_SET_LIMIT_RANGE ((NTSTATUS)0x40000002L)
-#define STATUS_IMAGE_NOT_AT_BASE ((NTSTATUS)0x40000003L)
-#define STATUS_RXACT_STATE_CREATED ((NTSTATUS)0x40000004L)
-#define STATUS_SEGMENT_NOTIFICATION ((NTSTATUS)0x40000005L)  
-#define STATUS_LOCAL_USER_SESSION_KEY ((NTSTATUS)0x40000006L)
-#define STATUS_BAD_CURRENT_DIRECTORY ((NTSTATUS)0x40000007L)
-#define STATUS_SERIAL_MORE_WRITES ((NTSTATUS)0x40000008L)
-#define STATUS_REGISTRY_RECOVERED ((NTSTATUS)0x40000009L)
-#define STATUS_FT_READ_RECOVERY_FROM_BACKUP ((NTSTATUS)0x4000000AL)
-#define STATUS_FT_WRITE_RECOVERY ((NTSTATUS)0x4000000BL)
-#define STATUS_SERIAL_COUNTER_TIMEOUT ((NTSTATUS)0x4000000CL)
-#define STATUS_NULL_LM_PASSWORD ((NTSTATUS)0x4000000DL)
-#define STATUS_IMAGE_MACHINE_TYPE_MISMATCH ((NTSTATUS)0x4000000EL)
-#define STATUS_RECEIVE_PARTIAL ((NTSTATUS)0x4000000FL)
-#define STATUS_RECEIVE_EXPEDITED ((NTSTATUS)0x40000010L)
-#define STATUS_RECEIVE_PARTIAL_EXPEDITED ((NTSTATUS)0x40000011L)
-#define STATUS_EVENT_DONE ((NTSTATUS)0x40000012L)
-#define STATUS_EVENT_PENDING ((NTSTATUS)0x40000013L)
-#define STATUS_CHECKING_FILE_SYSTEM ((NTSTATUS)0x40000014L)
-#define STATUS_FATAL_APP_EXIT ((NTSTATUS)0x40000015L)
-#define STATUS_PREDEFINED_HANDLE ((NTSTATUS)0x40000016L)
-#define STATUS_WAS_UNLOCKED ((NTSTATUS)0x40000017L)
-#define STATUS_SERVICE_NOTIFICATION ((NTSTATUS)0x40000018L)
-#define STATUS_WAS_LOCKED ((NTSTATUS)0x40000019L)
-#define STATUS_LOG_HARD_ERROR ((NTSTATUS)0x4000001AL)
-#define STATUS_ALREADY_WIN32 ((NTSTATUS)0x4000001BL)
-#define STATUS_WX86_UNSIMULATE ((NTSTATUS)0x4000001CL)
-#define STATUS_WX86_CONTINUE ((NTSTATUS)0x4000001DL)
-#define STATUS_WX86_SINGLE_STEP ((NTSTATUS)0x4000001EL)
-#define STATUS_WX86_BREAKPOINT ((NTSTATUS)0x4000001FL)
-#define STATUS_WX86_EXCEPTION_CONTINUE ((NTSTATUS)0x40000020L)
-#define STATUS_WX86_EXCEPTION_LASTCHANCE ((NTSTATUS)0x40000021L)
-#define STATUS_WX86_EXCEPTION_CHAIN ((NTSTATUS)0x40000022L)
-#define STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE ((NTSTATUS)0x40000023L)
-#define STATUS_NO_YIELD_PERFORMED ((NTSTATUS)0x40000024L)
-#define STATUS_TIMER_RESUME_IGNORED ((NTSTATUS)0x40000025L)
-#define STATUS_ARBITRATION_UNHANDLED ((NTSTATUS)0x40000026L)
-#define STATUS_CARDBUS_NOT_SUPPORTED ((NTSTATUS)0x40000027L)
-#define STATUS_WX86_CREATEWX86TIB ((NTSTATUS)0x40000028L)
-#define STATUS_MP_PROCESSOR_MISMATCH ((NTSTATUS)0x40000029L)
-#define STATUS_HIBERNATED ((NTSTATUS)0x4000002AL)  
-#define STATUS_RESUME_HIBERNATION ((NTSTATUS)0x4000002BL)  
-#define STATUS_GUARD_PAGE_VIOLATION ((NTSTATUS)0x80000001L)  
-#define STATUS_DATATYPE_MISALIGNMENT ((NTSTATUS)0x80000002L)  
-#define STATUS_BREAKPOINT ((NTSTATUS)0x80000003L)  
-#define STATUS_SINGLE_STEP ((NTSTATUS)0x80000004L)  
-#define STATUS_BUFFER_OVERFLOW ((NTSTATUS)0x80000005L)
-#define STATUS_NO_MORE_FILES ((NTSTATUS)0x80000006L)
-#define STATUS_WAKE_SYSTEM_DEBUGGER ((NTSTATUS)0x80000007L)
-#define STATUS_HANDLES_CLOSED ((NTSTATUS)0x8000000AL)
-#define STATUS_NO_INHERITANCE ((NTSTATUS)0x8000000BL)
-#define STATUS_GUID_SUBSTITUTION_MADE ((NTSTATUS)0x8000000CL)
-#define STATUS_PARTIAL_COPY ((NTSTATUS)0x8000000DL)
-#define STATUS_DEVICE_PAPER_EMPTY ((NTSTATUS)0x8000000EL)
-#define STATUS_DEVICE_POWERED_OFF ((NTSTATUS)0x8000000FL)
-#define STATUS_DEVICE_OFF_LINE ((NTSTATUS)0x80000010L)
-#define STATUS_DEVICE_BUSY ((NTSTATUS)0x80000011L)
-#define STATUS_NO_MORE_EAS ((NTSTATUS)0x80000012L)
-#define STATUS_INVALID_EA_NAME ((NTSTATUS)0x80000013L)
-#define STATUS_EA_LIST_INCONSISTENT ((NTSTATUS)0x80000014L)
-#define STATUS_INVALID_EA_FLAG ((NTSTATUS)0x80000015L)
-#define STATUS_VERIFY_REQUIRED ((NTSTATUS)0x80000016L)
-#define STATUS_EXTRANEOUS_INFORMATION ((NTSTATUS)0x80000017L)
-#define STATUS_RXACT_COMMIT_NECESSARY ((NTSTATUS)0x80000018L)
-#define STATUS_NO_MORE_ENTRIES ((NTSTATUS)0x8000001AL)
-#define STATUS_FILEMARK_DETECTED ((NTSTATUS)0x8000001BL)
-#define STATUS_MEDIA_CHANGED ((NTSTATUS)0x8000001CL)
-#define STATUS_BUS_RESET ((NTSTATUS)0x8000001DL)
-#define STATUS_END_OF_MEDIA ((NTSTATUS)0x8000001EL)
-#define STATUS_BEGINNING_OF_MEDIA ((NTSTATUS)0x8000001FL)
-#define STATUS_MEDIA_CHECK ((NTSTATUS)0x80000020L)
-#define STATUS_SETMARK_DETECTED ((NTSTATUS)0x80000021L)
-#define STATUS_NO_DATA_DETECTED ((NTSTATUS)0x80000022L)
-#define STATUS_REDIRECTOR_HAS_OPEN_HANDLES ((NTSTATUS)0x80000023L)
-#define STATUS_SERVER_HAS_OPEN_HANDLES ((NTSTATUS)0x80000024L)
-#define STATUS_ALREADY_DISCONNECTED ((NTSTATUS)0x80000025L)
-#define STATUS_LONGJUMP ((NTSTATUS)0x80000026L)
-#define STATUS_CLEANER_CARTRIDGE_INSTALLED ((NTSTATUS)0x80000027L)
-#define STATUS_PLUGPLAY_QUERY_VETOED ((NTSTATUS)0x80000028L)
-#define STATUS_UNWIND_CONSOLIDATE ((NTSTATUS)0x80000029L)
-#define STATUS_CLUSTER_NODE_ALREADY_UP ((NTSTATUS)0x80130001L)
-#define STATUS_CLUSTER_NODE_ALREADY_DOWN ((NTSTATUS)0x80130002L)
-#define STATUS_CLUSTER_NETWORK_ALREADY_ONLINE ((NTSTATUS)0x80130003L)
-#define STATUS_CLUSTER_NETWORK_ALREADY_OFFLINE ((NTSTATUS)0x80130004L)
-#define STATUS_CLUSTER_NODE_ALREADY_MEMBER ((NTSTATUS)0x80130005L)
-#define STATUS_UNSUCCESSFUL ((NTSTATUS)0xC0000001L)
-#define STATUS_NOT_IMPLEMENTED ((NTSTATUS)0xC0000002L)
-#define STATUS_INVALID_INFO_CLASS ((NTSTATUS)0xC0000003L)  
-#define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L)
-#define STATUS_ACCESS_VIOLATION ((NTSTATUS)0xC0000005L)  
-#define STATUS_IN_PAGE_ERROR ((NTSTATUS)0xC0000006L)  
-#define STATUS_PAGEFILE_QUOTA ((NTSTATUS)0xC0000007L)
-#define STATUS_INVALID_HANDLE ((NTSTATUS)0xC0000008L)  
-#define STATUS_BAD_INITIAL_STACK ((NTSTATUS)0xC0000009L)
-#define STATUS_BAD_INITIAL_PC ((NTSTATUS)0xC000000AL)
-#define STATUS_INVALID_CID ((NTSTATUS)0xC000000BL)
-#define STATUS_TIMER_NOT_CANCELED ((NTSTATUS)0xC000000CL)
-#define STATUS_INVALID_PARAMETER ((NTSTATUS)0xC000000DL)
-#define STATUS_NO_SUCH_DEVICE ((NTSTATUS)0xC000000EL)
-#define STATUS_NO_SUCH_FILE ((NTSTATUS)0xC000000FL)
-#define STATUS_INVALID_DEVICE_REQUEST ((NTSTATUS)0xC0000010L)
-#define STATUS_END_OF_FILE ((NTSTATUS)0xC0000011L)
-#define STATUS_WRONG_VOLUME ((NTSTATUS)0xC0000012L)
-#define STATUS_NO_MEDIA_IN_DEVICE ((NTSTATUS)0xC0000013L)
-#define STATUS_UNRECOGNIZED_MEDIA ((NTSTATUS)0xC0000014L)
-#define STATUS_NONEXISTENT_SECTOR ((NTSTATUS)0xC0000015L)
-#define STATUS_MORE_PROCESSING_REQUIRED ((NTSTATUS)0xC0000016L)
-#define STATUS_NO_MEMORY ((NTSTATUS)0xC0000017L)  
-#define STATUS_CONFLICTING_ADDRESSES ((NTSTATUS)0xC0000018L)
-#define STATUS_NOT_MAPPED_VIEW ((NTSTATUS)0xC0000019L)
-#define STATUS_UNABLE_TO_FREE_VM ((NTSTATUS)0xC000001AL)
-#define STATUS_UNABLE_TO_DELETE_SECTION ((NTSTATUS)0xC000001BL)
-#define STATUS_INVALID_SYSTEM_SERVICE ((NTSTATUS)0xC000001CL)
-#define STATUS_ILLEGAL_INSTRUCTION ((NTSTATUS)0xC000001DL)  
-#define STATUS_INVALID_LOCK_SEQUENCE ((NTSTATUS)0xC000001EL)
-#define STATUS_INVALID_VIEW_SIZE ((NTSTATUS)0xC000001FL)
-#define STATUS_INVALID_FILE_FOR_SECTION ((NTSTATUS)0xC0000020L)
-#define STATUS_ALREADY_COMMITTED ((NTSTATUS)0xC0000021L)
-#define STATUS_ACCESS_DENIED ((NTSTATUS)0xC0000022L)
-#define STATUS_BUFFER_TOO_SMALL ((NTSTATUS)0xC0000023L)
-#define STATUS_OBJECT_TYPE_MISMATCH ((NTSTATUS)0xC0000024L)
-#define STATUS_NONCONTINUABLE_EXCEPTION ((NTSTATUS)0xC0000025L)  
-#define STATUS_INVALID_DISPOSITION ((NTSTATUS)0xC0000026L)  
-#define STATUS_UNWIND ((NTSTATUS)0xC0000027L)
-#define STATUS_BAD_STACK ((NTSTATUS)0xC0000028L)
-#define STATUS_INVALID_UNWIND_TARGET ((NTSTATUS)0xC0000029L)
-#define STATUS_NOT_LOCKED ((NTSTATUS)0xC000002AL)
-#define STATUS_PARITY_ERROR ((NTSTATUS)0xC000002BL)
-#define STATUS_UNABLE_TO_DECOMMIT_VM ((NTSTATUS)0xC000002CL)
-#define STATUS_NOT_COMMITTED ((NTSTATUS)0xC000002DL)
-#define STATUS_INVALID_PORT_ATTRIBUTES ((NTSTATUS)0xC000002EL)
-#define STATUS_PORT_MESSAGE_TOO_LONG ((NTSTATUS)0xC000002FL)
-#define STATUS_INVALID_PARAMETER_MIX ((NTSTATUS)0xC0000030L)
-#define STATUS_INVALID_QUOTA_LOWER ((NTSTATUS)0xC0000031L)
-#define STATUS_DISK_CORRUPT_ERROR ((NTSTATUS)0xC0000032L)
-#define STATUS_OBJECT_NAME_INVALID ((NTSTATUS)0xC0000033L)
-#define STATUS_OBJECT_NAME_NOT_FOUND ((NTSTATUS)0xC0000034L)
-#define STATUS_OBJECT_NAME_COLLISION ((NTSTATUS)0xC0000035L)
-#define STATUS_PORT_DISCONNECTED ((NTSTATUS)0xC0000037L)
-#define STATUS_DEVICE_ALREADY_ATTACHED ((NTSTATUS)0xC0000038L)
-#define STATUS_OBJECT_PATH_INVALID ((NTSTATUS)0xC0000039L)
-#define STATUS_OBJECT_PATH_NOT_FOUND ((NTSTATUS)0xC000003AL)
-#define STATUS_OBJECT_PATH_SYNTAX_BAD ((NTSTATUS)0xC000003BL)
-#define STATUS_DATA_OVERRUN ((NTSTATUS)0xC000003CL)
-#define STATUS_DATA_LATE_ERROR ((NTSTATUS)0xC000003DL)
-#define STATUS_DATA_ERROR ((NTSTATUS)0xC000003EL)
-#define STATUS_CRC_ERROR ((NTSTATUS)0xC000003FL)
-#define STATUS_SECTION_TOO_BIG ((NTSTATUS)0xC0000040L)
-#define STATUS_PORT_CONNECTION_REFUSED ((NTSTATUS)0xC0000041L)
-#define STATUS_INVALID_PORT_HANDLE ((NTSTATUS)0xC0000042L)
-#define STATUS_SHARING_VIOLATION ((NTSTATUS)0xC0000043L)
-#define STATUS_QUOTA_EXCEEDED ((NTSTATUS)0xC0000044L)
-#define STATUS_INVALID_PAGE_PROTECTION ((NTSTATUS)0xC0000045L)
-#define STATUS_MUTANT_NOT_OWNED ((NTSTATUS)0xC0000046L)
-#define STATUS_SEMAPHORE_LIMIT_EXCEEDED ((NTSTATUS)0xC0000047L)
-#define STATUS_PORT_ALREADY_SET ((NTSTATUS)0xC0000048L)
-#define STATUS_SECTION_NOT_IMAGE ((NTSTATUS)0xC0000049L)
-#define STATUS_SUSPEND_COUNT_EXCEEDED ((NTSTATUS)0xC000004AL)
-#define STATUS_THREAD_IS_TERMINATING ((NTSTATUS)0xC000004BL)
-#define STATUS_BAD_WORKING_SET_LIMIT ((NTSTATUS)0xC000004CL)
-#define STATUS_INCOMPATIBLE_FILE_MAP ((NTSTATUS)0xC000004DL)
-#define STATUS_SECTION_PROTECTION ((NTSTATUS)0xC000004EL)
-#define STATUS_EAS_NOT_SUPPORTED ((NTSTATUS)0xC000004FL)
-#define STATUS_EA_TOO_LARGE ((NTSTATUS)0xC0000050L)
-#define STATUS_NONEXISTENT_EA_ENTRY ((NTSTATUS)0xC0000051L)
-#define STATUS_NO_EAS_ON_FILE ((NTSTATUS)0xC0000052L)
-#define STATUS_EA_CORRUPT_ERROR ((NTSTATUS)0xC0000053L)
-#define STATUS_FILE_LOCK_CONFLICT ((NTSTATUS)0xC0000054L)
-#define STATUS_LOCK_NOT_GRANTED ((NTSTATUS)0xC0000055L)
-#define STATUS_DELETE_PENDING ((NTSTATUS)0xC0000056L)
-#define STATUS_CTL_FILE_NOT_SUPPORTED ((NTSTATUS)0xC0000057L)
-#define STATUS_UNKNOWN_REVISION ((NTSTATUS)0xC0000058L)
-#define STATUS_REVISION_MISMATCH ((NTSTATUS)0xC0000059L)
-#define STATUS_INVALID_OWNER ((NTSTATUS)0xC000005AL)
-#define STATUS_INVALID_PRIMARY_GROUP ((NTSTATUS)0xC000005BL)
-#define STATUS_NO_IMPERSONATION_TOKEN ((NTSTATUS)0xC000005CL)
-#define STATUS_CANT_DISABLE_MANDATORY ((NTSTATUS)0xC000005DL)
-#define STATUS_NO_LOGON_SERVERS ((NTSTATUS)0xC000005EL)
-#define STATUS_NO_SUCH_LOGON_SESSION ((NTSTATUS)0xC000005FL)
-#define STATUS_NO_SUCH_PRIVILEGE ((NTSTATUS)0xC0000060L)
-#define STATUS_PRIVILEGE_NOT_HELD ((NTSTATUS)0xC0000061L)
-#define STATUS_INVALID_ACCOUNT_NAME ((NTSTATUS)0xC0000062L)
-#define STATUS_USER_EXISTS ((NTSTATUS)0xC0000063L)
-#define STATUS_NO_SUCH_USER ((NTSTATUS)0xC0000064L)  
-#define STATUS_GROUP_EXISTS ((NTSTATUS)0xC0000065L)
-#define STATUS_NO_SUCH_GROUP ((NTSTATUS)0xC0000066L)
-#define STATUS_MEMBER_IN_GROUP ((NTSTATUS)0xC0000067L)
-#define STATUS_MEMBER_NOT_IN_GROUP ((NTSTATUS)0xC0000068L)
-#define STATUS_LAST_ADMIN ((NTSTATUS)0xC0000069L)
-#define STATUS_WRONG_PASSWORD ((NTSTATUS)0xC000006AL)  
-#define STATUS_ILL_FORMED_PASSWORD ((NTSTATUS)0xC000006BL)
-#define STATUS_PASSWORD_RESTRICTION ((NTSTATUS)0xC000006CL)  
-#define STATUS_LOGON_FAILURE ((NTSTATUS)0xC000006DL)  
-#define STATUS_ACCOUNT_RESTRICTION ((NTSTATUS)0xC000006EL)  
-#define STATUS_INVALID_LOGON_HOURS ((NTSTATUS)0xC000006FL)  
-#define STATUS_INVALID_WORKSTATION ((NTSTATUS)0xC0000070L)  
-#define STATUS_PASSWORD_EXPIRED ((NTSTATUS)0xC0000071L)  
-#define STATUS_ACCOUNT_DISABLED ((NTSTATUS)0xC0000072L)  
-#define STATUS_NONE_MAPPED ((NTSTATUS)0xC0000073L)
-#define STATUS_TOO_MANY_LUIDS_REQUESTED ((NTSTATUS)0xC0000074L)
-#define STATUS_LUIDS_EXHAUSTED ((NTSTATUS)0xC0000075L)
-#define STATUS_INVALID_SUB_AUTHORITY ((NTSTATUS)0xC0000076L)
-#define STATUS_INVALID_ACL ((NTSTATUS)0xC0000077L)
-#define STATUS_INVALID_SID ((NTSTATUS)0xC0000078L)
-#define STATUS_INVALID_SECURITY_DESCR ((NTSTATUS)0xC0000079L)
-#define STATUS_PROCEDURE_NOT_FOUND ((NTSTATUS)0xC000007AL)
-#define STATUS_INVALID_IMAGE_FORMAT ((NTSTATUS)0xC000007BL)
-#define STATUS_NO_TOKEN ((NTSTATUS)0xC000007CL)
-#define STATUS_BAD_INHERITANCE_ACL ((NTSTATUS)0xC000007DL)
-#define STATUS_RANGE_NOT_LOCKED ((NTSTATUS)0xC000007EL)
-#define STATUS_DISK_FULL ((NTSTATUS)0xC000007FL)
-#define STATUS_SERVER_DISABLED ((NTSTATUS)0xC0000080L)
-#define STATUS_SERVER_NOT_DISABLED ((NTSTATUS)0xC0000081L)
-#define STATUS_TOO_MANY_GUIDS_REQUESTED ((NTSTATUS)0xC0000082L)
-#define STATUS_GUIDS_EXHAUSTED ((NTSTATUS)0xC0000083L)
-#define STATUS_INVALID_ID_AUTHORITY ((NTSTATUS)0xC0000084L)
-#define STATUS_AGENTS_EXHAUSTED ((NTSTATUS)0xC0000085L)
-#define STATUS_INVALID_VOLUME_LABEL ((NTSTATUS)0xC0000086L)
-#define STATUS_SECTION_NOT_EXTENDED ((NTSTATUS)0xC0000087L)
-#define STATUS_NOT_MAPPED_DATA ((NTSTATUS)0xC0000088L)
-#define STATUS_RESOURCE_DATA_NOT_FOUND ((NTSTATUS)0xC0000089L)
-#define STATUS_RESOURCE_TYPE_NOT_FOUND ((NTSTATUS)0xC000008AL)
-#define STATUS_RESOURCE_NAME_NOT_FOUND ((NTSTATUS)0xC000008BL)
-#define STATUS_ARRAY_BOUNDS_EXCEEDED ((NTSTATUS)0xC000008CL)  
-#define STATUS_FLOAT_DENORMAL_OPERAND ((NTSTATUS)0xC000008DL)  
-#define STATUS_FLOAT_DIVIDE_BY_ZERO ((NTSTATUS)0xC000008EL)  
-#define STATUS_FLOAT_INEXACT_RESULT ((NTSTATUS)0xC000008FL)  
-#define STATUS_FLOAT_INVALID_OPERATION ((NTSTATUS)0xC0000090L)  
-#define STATUS_FLOAT_OVERFLOW ((NTSTATUS)0xC0000091L)  
-#define STATUS_FLOAT_STACK_CHECK ((NTSTATUS)0xC0000092L)  
-#define STATUS_FLOAT_UNDERFLOW ((NTSTATUS)0xC0000093L)  
-#define STATUS_INTEGER_DIVIDE_BY_ZERO ((NTSTATUS)0xC0000094L)  
-#define STATUS_INTEGER_OVERFLOW ((NTSTATUS)0xC0000095L)  
-#define STATUS_PRIVILEGED_INSTRUCTION ((NTSTATUS)0xC0000096L)  
-#define STATUS_TOO_MANY_PAGING_FILES ((NTSTATUS)0xC0000097L)
-#define STATUS_FILE_INVALID ((NTSTATUS)0xC0000098L)
-#define STATUS_ALLOTTED_SPACE_EXCEEDED ((NTSTATUS)0xC0000099L)
-#define STATUS_INSUFFICIENT_RESOURCES ((NTSTATUS)0xC000009AL)  
-#define STATUS_DFS_EXIT_PATH_FOUND ((NTSTATUS)0xC000009BL)
-#define STATUS_DEVICE_DATA_ERROR ((NTSTATUS)0xC000009CL)
-#define STATUS_DEVICE_NOT_CONNECTED ((NTSTATUS)0xC000009DL)
-#define STATUS_DEVICE_POWER_FAILURE ((NTSTATUS)0xC000009EL)
-#define STATUS_FREE_VM_NOT_AT_BASE ((NTSTATUS)0xC000009FL)
-#define STATUS_MEMORY_NOT_ALLOCATED ((NTSTATUS)0xC00000A0L)
-#define STATUS_WORKING_SET_QUOTA ((NTSTATUS)0xC00000A1L)
-#define STATUS_MEDIA_WRITE_PROTECTED ((NTSTATUS)0xC00000A2L)
-#define STATUS_DEVICE_NOT_READY ((NTSTATUS)0xC00000A3L)
-#define STATUS_INVALID_GROUP_ATTRIBUTES ((NTSTATUS)0xC00000A4L)
-#define STATUS_BAD_IMPERSONATION_LEVEL ((NTSTATUS)0xC00000A5L)
-#define STATUS_CANT_OPEN_ANONYMOUS ((NTSTATUS)0xC00000A6L)
-#define STATUS_BAD_VALIDATION_CLASS ((NTSTATUS)0xC00000A7L)
-#define STATUS_BAD_TOKEN_TYPE ((NTSTATUS)0xC00000A8L)
-#define STATUS_BAD_MASTER_BOOT_RECORD ((NTSTATUS)0xC00000A9L)
-#define STATUS_INSTRUCTION_MISALIGNMENT ((NTSTATUS)0xC00000AAL)
-#define STATUS_INSTANCE_NOT_AVAILABLE ((NTSTATUS)0xC00000ABL)
-#define STATUS_PIPE_NOT_AVAILABLE ((NTSTATUS)0xC00000ACL)
-#define STATUS_INVALID_PIPE_STATE ((NTSTATUS)0xC00000ADL)
-#define STATUS_PIPE_BUSY ((NTSTATUS)0xC00000AEL)
-#define STATUS_ILLEGAL_FUNCTION ((NTSTATUS)0xC00000AFL)
-#define STATUS_PIPE_DISCONNECTED ((NTSTATUS)0xC00000B0L)
-#define STATUS_PIPE_CLOSING ((NTSTATUS)0xC00000B1L)
-#define STATUS_PIPE_CONNECTED ((NTSTATUS)0xC00000B2L)
-#define STATUS_PIPE_LISTENING ((NTSTATUS)0xC00000B3L)
-#define STATUS_INVALID_READ_MODE ((NTSTATUS)0xC00000B4L)
-#define STATUS_IO_TIMEOUT ((NTSTATUS)0xC00000B5L)
-#define STATUS_FILE_FORCED_CLOSED ((NTSTATUS)0xC00000B6L)
-#define STATUS_PROFILING_NOT_STARTED ((NTSTATUS)0xC00000B7L)
-#define STATUS_PROFILING_NOT_STOPPED ((NTSTATUS)0xC00000B8L)
-#define STATUS_COULD_NOT_INTERPRET ((NTSTATUS)0xC00000B9L)
-#define STATUS_FILE_IS_A_DIRECTORY ((NTSTATUS)0xC00000BAL)
-#define STATUS_NOT_SUPPORTED ((NTSTATUS)0xC00000BBL)
-#define STATUS_REMOTE_NOT_LISTENING ((NTSTATUS)0xC00000BCL)
-#define STATUS_DUPLICATE_NAME ((NTSTATUS)0xC00000BDL)
-#define STATUS_BAD_NETWORK_PATH ((NTSTATUS)0xC00000BEL)
-#define STATUS_NETWORK_BUSY ((NTSTATUS)0xC00000BFL)
-#define STATUS_DEVICE_DOES_NOT_EXIST ((NTSTATUS)0xC00000C0L)
-#define STATUS_TOO_MANY_COMMANDS ((NTSTATUS)0xC00000C1L)
-#define STATUS_ADAPTER_HARDWARE_ERROR ((NTSTATUS)0xC00000C2L)
-#define STATUS_INVALID_NETWORK_RESPONSE ((NTSTATUS)0xC00000C3L)
-#define STATUS_UNEXPECTED_NETWORK_ERROR ((NTSTATUS)0xC00000C4L)
-#define STATUS_BAD_REMOTE_ADAPTER ((NTSTATUS)0xC00000C5L)
-#define STATUS_PRINT_QUEUE_FULL ((NTSTATUS)0xC00000C6L)
-#define STATUS_NO_SPOOL_SPACE ((NTSTATUS)0xC00000C7L)
-#define STATUS_PRINT_CANCELLED ((NTSTATUS)0xC00000C8L)
-#define STATUS_NETWORK_NAME_DELETED ((NTSTATUS)0xC00000C9L)
-#define STATUS_NETWORK_ACCESS_DENIED ((NTSTATUS)0xC00000CAL)
-#define STATUS_BAD_DEVICE_TYPE ((NTSTATUS)0xC00000CBL)
-#define STATUS_BAD_NETWORK_NAME ((NTSTATUS)0xC00000CCL)
-#define STATUS_TOO_MANY_NAMES ((NTSTATUS)0xC00000CDL)
-#define STATUS_TOO_MANY_SESSIONS ((NTSTATUS)0xC00000CEL)
-#define STATUS_SHARING_PAUSED ((NTSTATUS)0xC00000CFL)
-#define STATUS_REQUEST_NOT_ACCEPTED ((NTSTATUS)0xC00000D0L)
-#define STATUS_REDIRECTOR_PAUSED ((NTSTATUS)0xC00000D1L)
-#define STATUS_NET_WRITE_FAULT ((NTSTATUS)0xC00000D2L)
-#define STATUS_PROFILING_AT_LIMIT ((NTSTATUS)0xC00000D3L)
-#define STATUS_NOT_SAME_DEVICE ((NTSTATUS)0xC00000D4L)
-#define STATUS_FILE_RENAMED ((NTSTATUS)0xC00000D5L)
-#define STATUS_VIRTUAL_CIRCUIT_CLOSED ((NTSTATUS)0xC00000D6L)
-#define STATUS_NO_SECURITY_ON_OBJECT ((NTSTATUS)0xC00000D7L)
-#define STATUS_CANT_WAIT ((NTSTATUS)0xC00000D8L)
-#define STATUS_PIPE_EMPTY ((NTSTATUS)0xC00000D9L)
-#define STATUS_CANT_ACCESS_DOMAIN_INFO ((NTSTATUS)0xC00000DAL)
-#define STATUS_CANT_TERMINATE_SELF ((NTSTATUS)0xC00000DBL)
-#define STATUS_INVALID_SERVER_STATE ((NTSTATUS)0xC00000DCL)
-#define STATUS_INVALID_DOMAIN_STATE ((NTSTATUS)0xC00000DDL)
-#define STATUS_INVALID_DOMAIN_ROLE ((NTSTATUS)0xC00000DEL)
-#define STATUS_NO_SUCH_DOMAIN ((NTSTATUS)0xC00000DFL)
-#define STATUS_DOMAIN_EXISTS ((NTSTATUS)0xC00000E0L)
-#define STATUS_DOMAIN_LIMIT_EXCEEDED ((NTSTATUS)0xC00000E1L)
-#define STATUS_OPLOCK_NOT_GRANTED ((NTSTATUS)0xC00000E2L)
-#define STATUS_INVALID_OPLOCK_PROTOCOL ((NTSTATUS)0xC00000E3L)
-#define STATUS_INTERNAL_DB_CORRUPTION ((NTSTATUS)0xC00000E4L)
-#define STATUS_INTERNAL_ERROR ((NTSTATUS)0xC00000E5L)
-#define STATUS_GENERIC_NOT_MAPPED ((NTSTATUS)0xC00000E6L)
-#define STATUS_BAD_DESCRIPTOR_FORMAT ((NTSTATUS)0xC00000E7L)
-#define STATUS_INVALID_USER_BUFFER ((NTSTATUS)0xC00000E8L)
-#define STATUS_UNEXPECTED_IO_ERROR ((NTSTATUS)0xC00000E9L)
-#define STATUS_UNEXPECTED_MM_CREATE_ERR ((NTSTATUS)0xC00000EAL)
-#define STATUS_UNEXPECTED_MM_MAP_ERROR ((NTSTATUS)0xC00000EBL)
-#define STATUS_UNEXPECTED_MM_EXTEND_ERR ((NTSTATUS)0xC00000ECL)
-#define STATUS_NOT_LOGON_PROCESS ((NTSTATUS)0xC00000EDL)
-#define STATUS_LOGON_SESSION_EXISTS ((NTSTATUS)0xC00000EEL)
-#define STATUS_INVALID_PARAMETER_1 ((NTSTATUS)0xC00000EFL)
-#define STATUS_INVALID_PARAMETER_2 ((NTSTATUS)0xC00000F0L)
-#define STATUS_INVALID_PARAMETER_3 ((NTSTATUS)0xC00000F1L)
-#define STATUS_INVALID_PARAMETER_4 ((NTSTATUS)0xC00000F2L)
-#define STATUS_INVALID_PARAMETER_5 ((NTSTATUS)0xC00000F3L)
-#define STATUS_INVALID_PARAMETER_6 ((NTSTATUS)0xC00000F4L)
-#define STATUS_INVALID_PARAMETER_7 ((NTSTATUS)0xC00000F5L)
-#define STATUS_INVALID_PARAMETER_8 ((NTSTATUS)0xC00000F6L)
-#define STATUS_INVALID_PARAMETER_9 ((NTSTATUS)0xC00000F7L)
-#define STATUS_INVALID_PARAMETER_10 ((NTSTATUS)0xC00000F8L)
-#define STATUS_INVALID_PARAMETER_11 ((NTSTATUS)0xC00000F9L)
-#define STATUS_INVALID_PARAMETER_12 ((NTSTATUS)0xC00000FAL)
-#define STATUS_REDIRECTOR_NOT_STARTED ((NTSTATUS)0xC00000FBL)
-#define STATUS_REDIRECTOR_STARTED ((NTSTATUS)0xC00000FCL)
-#define STATUS_STACK_OVERFLOW ((NTSTATUS)0xC00000FDL)  
-#define STATUS_NO_SUCH_PACKAGE ((NTSTATUS)0xC00000FEL)
-#define STATUS_BAD_FUNCTION_TABLE ((NTSTATUS)0xC00000FFL)
-#define STATUS_VARIABLE_NOT_FOUND ((NTSTATUS)0xC0000100L)
-#define STATUS_DIRECTORY_NOT_EMPTY ((NTSTATUS)0xC0000101L)
-#define STATUS_FILE_CORRUPT_ERROR ((NTSTATUS)0xC0000102L)
-#define STATUS_NOT_A_DIRECTORY ((NTSTATUS)0xC0000103L)
-#define STATUS_BAD_LOGON_SESSION_STATE ((NTSTATUS)0xC0000104L)
-#define STATUS_LOGON_SESSION_COLLISION ((NTSTATUS)0xC0000105L)
-#define STATUS_NAME_TOO_LONG ((NTSTATUS)0xC0000106L)
-#define STATUS_FILES_OPEN ((NTSTATUS)0xC0000107L)
-#define STATUS_CONNECTION_IN_USE ((NTSTATUS)0xC0000108L)
-#define STATUS_MESSAGE_NOT_FOUND ((NTSTATUS)0xC0000109L)
-#define STATUS_PROCESS_IS_TERMINATING ((NTSTATUS)0xC000010AL)
-#define STATUS_INVALID_LOGON_TYPE ((NTSTATUS)0xC000010BL)
-#define STATUS_NO_GUID_TRANSLATION ((NTSTATUS)0xC000010CL)
-#define STATUS_CANNOT_IMPERSONATE ((NTSTATUS)0xC000010DL)
-#define STATUS_IMAGE_ALREADY_LOADED ((NTSTATUS)0xC000010EL)
-#define STATUS_ABIOS_NOT_PRESENT ((NTSTATUS)0xC000010FL)
-#define STATUS_ABIOS_LID_NOT_EXIST ((NTSTATUS)0xC0000110L)
-#define STATUS_ABIOS_LID_ALREADY_OWNED ((NTSTATUS)0xC0000111L)
-#define STATUS_ABIOS_NOT_LID_OWNER ((NTSTATUS)0xC0000112L)
-#define STATUS_ABIOS_INVALID_COMMAND ((NTSTATUS)0xC0000113L)
-#define STATUS_ABIOS_INVALID_LID ((NTSTATUS)0xC0000114L)
-#define STATUS_ABIOS_SELECTOR_NOT_AVAILABLE ((NTSTATUS)0xC0000115L)
-#define STATUS_ABIOS_INVALID_SELECTOR ((NTSTATUS)0xC0000116L)
-#define STATUS_NO_LDT ((NTSTATUS)0xC0000117L)
-#define STATUS_INVALID_LDT_SIZE ((NTSTATUS)0xC0000118L)
-#define STATUS_INVALID_LDT_OFFSET ((NTSTATUS)0xC0000119L)
-#define STATUS_INVALID_LDT_DESCRIPTOR ((NTSTATUS)0xC000011AL)
-#define STATUS_INVALID_IMAGE_NE_FORMAT ((NTSTATUS)0xC000011BL)
-#define STATUS_RXACT_INVALID_STATE ((NTSTATUS)0xC000011CL)
-#define STATUS_RXACT_COMMIT_FAILURE ((NTSTATUS)0xC000011DL)
-#define STATUS_MAPPED_FILE_SIZE_ZERO ((NTSTATUS)0xC000011EL)
-#define STATUS_TOO_MANY_OPENED_FILES ((NTSTATUS)0xC000011FL)
-#define STATUS_CANCELLED ((NTSTATUS)0xC0000120L)
-#define STATUS_CANNOT_DELETE ((NTSTATUS)0xC0000121L)
-#define STATUS_INVALID_COMPUTER_NAME ((NTSTATUS)0xC0000122L)
-#define STATUS_FILE_DELETED ((NTSTATUS)0xC0000123L)
-#define STATUS_SPECIAL_ACCOUNT ((NTSTATUS)0xC0000124L)
-#define STATUS_SPECIAL_GROUP ((NTSTATUS)0xC0000125L)
-#define STATUS_SPECIAL_USER ((NTSTATUS)0xC0000126L)
-#define STATUS_MEMBERS_PRIMARY_GROUP ((NTSTATUS)0xC0000127L)
-#define STATUS_FILE_CLOSED ((NTSTATUS)0xC0000128L)
-#define STATUS_TOO_MANY_THREADS ((NTSTATUS)0xC0000129L)
-#define STATUS_THREAD_NOT_IN_PROCESS ((NTSTATUS)0xC000012AL)
-#define STATUS_TOKEN_ALREADY_IN_USE ((NTSTATUS)0xC000012BL)
-#define STATUS_PAGEFILE_QUOTA_EXCEEDED ((NTSTATUS)0xC000012CL)
-#define STATUS_COMMITMENT_LIMIT ((NTSTATUS)0xC000012DL)
-#define STATUS_INVALID_IMAGE_LE_FORMAT ((NTSTATUS)0xC000012EL)
-#define STATUS_INVALID_IMAGE_NOT_MZ ((NTSTATUS)0xC000012FL)
-#define STATUS_INVALID_IMAGE_PROTECT ((NTSTATUS)0xC0000130L)
-#define STATUS_INVALID_IMAGE_WIN_16 ((NTSTATUS)0xC0000131L)
-#define STATUS_LOGON_SERVER_CONFLICT ((NTSTATUS)0xC0000132L)
-#define STATUS_TIME_DIFFERENCE_AT_DC ((NTSTATUS)0xC0000133L)
-#define STATUS_SYNCHRONIZATION_REQUIRED ((NTSTATUS)0xC0000134L)
-#define STATUS_DLL_NOT_FOUND ((NTSTATUS)0xC0000135L)
-#define STATUS_OPEN_FAILED ((NTSTATUS)0xC0000136L)
-#define STATUS_IO_PRIVILEGE_FAILED ((NTSTATUS)0xC0000137L)
-#define STATUS_ORDINAL_NOT_FOUND ((NTSTATUS)0xC0000138L)
-#define STATUS_ENTRYPOINT_NOT_FOUND ((NTSTATUS)0xC0000139L)
-#define STATUS_CONTROL_C_EXIT ((NTSTATUS)0xC000013AL)  
-#define STATUS_LOCAL_DISCONNECT ((NTSTATUS)0xC000013BL)
-#define STATUS_REMOTE_DISCONNECT ((NTSTATUS)0xC000013CL)
-#define STATUS_REMOTE_RESOURCES ((NTSTATUS)0xC000013DL)
-#define STATUS_LINK_FAILED ((NTSTATUS)0xC000013EL)
-#define STATUS_LINK_TIMEOUT ((NTSTATUS)0xC000013FL)
-#define STATUS_INVALID_CONNECTION ((NTSTATUS)0xC0000140L)
-#define STATUS_INVALID_ADDRESS ((NTSTATUS)0xC0000141L)
-#define STATUS_DLL_INIT_FAILED ((NTSTATUS)0xC0000142L)
-#define STATUS_MISSING_SYSTEMFILE ((NTSTATUS)0xC0000143L)
-#define STATUS_UNHANDLED_EXCEPTION ((NTSTATUS)0xC0000144L)
-#define STATUS_APP_INIT_FAILURE ((NTSTATUS)0xC0000145L)
-#define STATUS_PAGEFILE_CREATE_FAILED ((NTSTATUS)0xC0000146L)
-#define STATUS_NO_PAGEFILE ((NTSTATUS)0xC0000147L)
-#define STATUS_INVALID_LEVEL ((NTSTATUS)0xC0000148L)
-#define STATUS_WRONG_PASSWORD_CORE ((NTSTATUS)0xC0000149L)
-#define STATUS_ILLEGAL_FLOAT_CONTEXT ((NTSTATUS)0xC000014AL)
-#define STATUS_PIPE_BROKEN ((NTSTATUS)0xC000014BL)
-#define STATUS_REGISTRY_CORRUPT ((NTSTATUS)0xC000014CL)
-#define STATUS_REGISTRY_IO_FAILED ((NTSTATUS)0xC000014DL)
-#define STATUS_NO_EVENT_PAIR ((NTSTATUS)0xC000014EL)
-#define STATUS_UNRECOGNIZED_VOLUME ((NTSTATUS)0xC000014FL)
-#define STATUS_SERIAL_NO_DEVICE_INITED ((NTSTATUS)0xC0000150L)
-#define STATUS_NO_SUCH_ALIAS ((NTSTATUS)0xC0000151L)
-#define STATUS_MEMBER_NOT_IN_ALIAS ((NTSTATUS)0xC0000152L)
-#define STATUS_MEMBER_IN_ALIAS ((NTSTATUS)0xC0000153L)
-#define STATUS_ALIAS_EXISTS ((NTSTATUS)0xC0000154L)
-#define STATUS_LOGON_NOT_GRANTED ((NTSTATUS)0xC0000155L)
-#define STATUS_TOO_MANY_SECRETS ((NTSTATUS)0xC0000156L)
-#define STATUS_SECRET_TOO_LONG ((NTSTATUS)0xC0000157L)
-#define STATUS_INTERNAL_DB_ERROR ((NTSTATUS)0xC0000158L)
-#define STATUS_FULLSCREEN_MODE ((NTSTATUS)0xC0000159L)
-#define STATUS_TOO_MANY_CONTEXT_IDS ((NTSTATUS)0xC000015AL)
-#define STATUS_LOGON_TYPE_NOT_GRANTED ((NTSTATUS)0xC000015BL)
-#define STATUS_NOT_REGISTRY_FILE ((NTSTATUS)0xC000015CL)
-#define STATUS_NT_CROSS_ENCRYPTION_REQUIRED ((NTSTATUS)0xC000015DL)
-#define STATUS_DOMAIN_CTRLR_CONFIG_ERROR ((NTSTATUS)0xC000015EL)
-#define STATUS_FT_MISSING_MEMBER ((NTSTATUS)0xC000015FL)
-#define STATUS_ILL_FORMED_SERVICE_ENTRY ((NTSTATUS)0xC0000160L)
-#define STATUS_ILLEGAL_CHARACTER ((NTSTATUS)0xC0000161L)
-#define STATUS_UNMAPPABLE_CHARACTER ((NTSTATUS)0xC0000162L)
-#define STATUS_UNDEFINED_CHARACTER ((NTSTATUS)0xC0000163L)
-#define STATUS_FLOPPY_VOLUME ((NTSTATUS)0xC0000164L)
-#define STATUS_FLOPPY_ID_MARK_NOT_FOUND ((NTSTATUS)0xC0000165L)
-#define STATUS_FLOPPY_WRONG_CYLINDER ((NTSTATUS)0xC0000166L)
-#define STATUS_FLOPPY_UNKNOWN_ERROR ((NTSTATUS)0xC0000167L)
-#define STATUS_FLOPPY_BAD_REGISTERS ((NTSTATUS)0xC0000168L)
-#define STATUS_DISK_RECALIBRATE_FAILED ((NTSTATUS)0xC0000169L)
-#define STATUS_DISK_OPERATION_FAILED ((NTSTATUS)0xC000016AL)
-#define STATUS_DISK_RESET_FAILED ((NTSTATUS)0xC000016BL)
-#define STATUS_SHARED_IRQ_BUSY ((NTSTATUS)0xC000016CL)
-#define STATUS_FT_ORPHANING ((NTSTATUS)0xC000016DL)
-#define STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT ((NTSTATUS)0xC000016EL)
-#define STATUS_PARTITION_FAILURE ((NTSTATUS)0xC0000172L)
-#define STATUS_INVALID_BLOCK_LENGTH ((NTSTATUS)0xC0000173L)
-#define STATUS_DEVICE_NOT_PARTITIONED ((NTSTATUS)0xC0000174L)
-#define STATUS_UNABLE_TO_LOCK_MEDIA ((NTSTATUS)0xC0000175L)
-#define STATUS_UNABLE_TO_UNLOAD_MEDIA ((NTSTATUS)0xC0000176L)
-#define STATUS_EOM_OVERFLOW ((NTSTATUS)0xC0000177L)
-#define STATUS_NO_MEDIA ((NTSTATUS)0xC0000178L)
-#define STATUS_NO_SUCH_MEMBER ((NTSTATUS)0xC000017AL)
-#define STATUS_INVALID_MEMBER ((NTSTATUS)0xC000017BL)
-#define STATUS_KEY_DELETED ((NTSTATUS)0xC000017CL)
-#define STATUS_NO_LOG_SPACE ((NTSTATUS)0xC000017DL)
-#define STATUS_TOO_MANY_SIDS ((NTSTATUS)0xC000017EL)
-#define STATUS_LM_CROSS_ENCRYPTION_REQUIRED ((NTSTATUS)0xC000017FL)
-#define STATUS_KEY_HAS_CHILDREN ((NTSTATUS)0xC0000180L)
-#define STATUS_CHILD_MUST_BE_VOLATILE ((NTSTATUS)0xC0000181L)
-#define STATUS_DEVICE_CONFIGURATION_ERROR ((NTSTATUS)0xC0000182L)
-#define STATUS_DRIVER_INTERNAL_ERROR ((NTSTATUS)0xC0000183L)
-#define STATUS_INVALID_DEVICE_STATE ((NTSTATUS)0xC0000184L)
-#define STATUS_IO_DEVICE_ERROR ((NTSTATUS)0xC0000185L)
-#define STATUS_DEVICE_PROTOCOL_ERROR ((NTSTATUS)0xC0000186L)
-#define STATUS_BACKUP_CONTROLLER ((NTSTATUS)0xC0000187L)
-#define STATUS_LOG_FILE_FULL ((NTSTATUS)0xC0000188L)
-#define STATUS_TOO_LATE ((NTSTATUS)0xC0000189L)
-#define STATUS_NO_TRUST_LSA_SECRET ((NTSTATUS)0xC000018AL)
-#define STATUS_NO_TRUST_SAM_ACCOUNT ((NTSTATUS)0xC000018BL)
-#define STATUS_TRUSTED_DOMAIN_FAILURE ((NTSTATUS)0xC000018CL)
-#define STATUS_TRUSTED_RELATIONSHIP_FAILURE ((NTSTATUS)0xC000018DL)
-#define STATUS_EVENTLOG_FILE_CORRUPT ((NTSTATUS)0xC000018EL)
-#define STATUS_EVENTLOG_CANT_START ((NTSTATUS)0xC000018FL)
-#define STATUS_TRUST_FAILURE ((NTSTATUS)0xC0000190L)
-#define STATUS_MUTANT_LIMIT_EXCEEDED ((NTSTATUS)0xC0000191L)
-#define STATUS_NETLOGON_NOT_STARTED ((NTSTATUS)0xC0000192L)
-#define STATUS_ACCOUNT_EXPIRED ((NTSTATUS)0xC0000193L)  
-#define STATUS_POSSIBLE_DEADLOCK ((NTSTATUS)0xC0000194L)
-#define STATUS_NETWORK_CREDENTIAL_CONFLICT ((NTSTATUS)0xC0000195L)
-#define STATUS_REMOTE_SESSION_LIMIT ((NTSTATUS)0xC0000196L)
-#define STATUS_EVENTLOG_FILE_CHANGED ((NTSTATUS)0xC0000197L)
-#define STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT ((NTSTATUS)0xC0000198L)
-#define STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT ((NTSTATUS)0xC0000199L)
-#define STATUS_NOLOGON_SERVER_TRUST_ACCOUNT ((NTSTATUS)0xC000019AL)
-#define STATUS_DOMAIN_TRUST_INCONSISTENT ((NTSTATUS)0xC000019BL)
-#define STATUS_FS_DRIVER_REQUIRED ((NTSTATUS)0xC000019CL)
-#define STATUS_NO_USER_SESSION_KEY ((NTSTATUS)0xC0000202L)
-#define STATUS_USER_SESSION_DELETED ((NTSTATUS)0xC0000203L)
-#define STATUS_RESOURCE_LANG_NOT_FOUND ((NTSTATUS)0xC0000204L)
-#define STATUS_INSUFF_SERVER_RESOURCES ((NTSTATUS)0xC0000205L)
-#define STATUS_INVALID_BUFFER_SIZE ((NTSTATUS)0xC0000206L)
-#define STATUS_INVALID_ADDRESS_COMPONENT ((NTSTATUS)0xC0000207L)
-#define STATUS_INVALID_ADDRESS_WILDCARD ((NTSTATUS)0xC0000208L)
-#define STATUS_TOO_MANY_ADDRESSES ((NTSTATUS)0xC0000209L)
-#define STATUS_ADDRESS_ALREADY_EXISTS ((NTSTATUS)0xC000020AL)
-#define STATUS_ADDRESS_CLOSED ((NTSTATUS)0xC000020BL)
-#define STATUS_CONNECTION_DISCONNECTED ((NTSTATUS)0xC000020CL)
-#define STATUS_CONNECTION_RESET ((NTSTATUS)0xC000020DL)
-#define STATUS_TOO_MANY_NODES ((NTSTATUS)0xC000020EL)
-#define STATUS_TRANSACTION_ABORTED ((NTSTATUS)0xC000020FL)
-#define STATUS_TRANSACTION_TIMED_OUT ((NTSTATUS)0xC0000210L)
-#define STATUS_TRANSACTION_NO_RELEASE ((NTSTATUS)0xC0000211L)
-#define STATUS_TRANSACTION_NO_MATCH ((NTSTATUS)0xC0000212L)
-#define STATUS_TRANSACTION_RESPONDED ((NTSTATUS)0xC0000213L)
-#define STATUS_TRANSACTION_INVALID_ID ((NTSTATUS)0xC0000214L)
-#define STATUS_TRANSACTION_INVALID_TYPE ((NTSTATUS)0xC0000215L)
-#define STATUS_NOT_SERVER_SESSION ((NTSTATUS)0xC0000216L)
-#define STATUS_NOT_CLIENT_SESSION ((NTSTATUS)0xC0000217L)
-#define STATUS_CANNOT_LOAD_REGISTRY_FILE ((NTSTATUS)0xC0000218L)
-#define STATUS_DEBUG_ATTACH_FAILED ((NTSTATUS)0xC0000219L)
-#define STATUS_SYSTEM_PROCESS_TERMINATED ((NTSTATUS)0xC000021AL)
-#define STATUS_DATA_NOT_ACCEPTED ((NTSTATUS)0xC000021BL)
-#define STATUS_NO_BROWSER_SERVERS_FOUND ((NTSTATUS)0xC000021CL)
-#define STATUS_VDM_HARD_ERROR ((NTSTATUS)0xC000021DL)
-#define STATUS_DRIVER_CANCEL_TIMEOUT ((NTSTATUS)0xC000021EL)
-#define STATUS_REPLY_MESSAGE_MISMATCH ((NTSTATUS)0xC000021FL)
-#define STATUS_MAPPED_ALIGNMENT ((NTSTATUS)0xC0000220L)
-#define STATUS_IMAGE_CHECKSUM_MISMATCH ((NTSTATUS)0xC0000221L)
-#define STATUS_LOST_WRITEBEHIND_DATA ((NTSTATUS)0xC0000222L)
-#define STATUS_CLIENT_SERVER_PARAMETERS_INVALID ((NTSTATUS)0xC0000223L)
-#define STATUS_PASSWORD_MUST_CHANGE ((NTSTATUS)0xC0000224L)  
-#define STATUS_NOT_FOUND ((NTSTATUS)0xC0000225L)
-#define STATUS_NOT_TINY_STREAM ((NTSTATUS)0xC0000226L)
-#define STATUS_RECOVERY_FAILURE ((NTSTATUS)0xC0000227L)
-#define STATUS_STACK_OVERFLOW_READ ((NTSTATUS)0xC0000228L)
-#define STATUS_FAIL_CHECK ((NTSTATUS)0xC0000229L)
-#define STATUS_DUPLICATE_OBJECTID ((NTSTATUS)0xC000022AL)
-#define STATUS_OBJECTID_EXISTS ((NTSTATUS)0xC000022BL)
-#define STATUS_CONVERT_TO_LARGE ((NTSTATUS)0xC000022CL)
-#define STATUS_RETRY ((NTSTATUS)0xC000022DL)
-#define STATUS_FOUND_OUT_OF_SCOPE ((NTSTATUS)0xC000022EL)
-#define STATUS_ALLOCATE_BUCKET ((NTSTATUS)0xC000022FL)
-#define STATUS_PROPSET_NOT_FOUND ((NTSTATUS)0xC0000230L)
-#define STATUS_MARSHALL_OVERFLOW ((NTSTATUS)0xC0000231L)
-#define STATUS_INVALID_VARIANT ((NTSTATUS)0xC0000232L)
-#define STATUS_DOMAIN_CONTROLLER_NOT_FOUND ((NTSTATUS)0xC0000233L)
-#define STATUS_ACCOUNT_LOCKED_OUT ((NTSTATUS)0xC0000234L)  
-#define STATUS_HANDLE_NOT_CLOSABLE ((NTSTATUS)0xC0000235L)
-#define STATUS_CONNECTION_REFUSED ((NTSTATUS)0xC0000236L)
-#define STATUS_GRACEFUL_DISCONNECT ((NTSTATUS)0xC0000237L)
-#define STATUS_ADDRESS_ALREADY_ASSOCIATED ((NTSTATUS)0xC0000238L)
-#define STATUS_ADDRESS_NOT_ASSOCIATED ((NTSTATUS)0xC0000239L)
-#define STATUS_CONNECTION_INVALID ((NTSTATUS)0xC000023AL)
-#define STATUS_CONNECTION_ACTIVE ((NTSTATUS)0xC000023BL)
-#define STATUS_NETWORK_UNREACHABLE ((NTSTATUS)0xC000023CL)
-#define STATUS_HOST_UNREACHABLE ((NTSTATUS)0xC000023DL)
-#define STATUS_PROTOCOL_UNREACHABLE ((NTSTATUS)0xC000023EL)
-#define STATUS_PORT_UNREACHABLE ((NTSTATUS)0xC000023FL)
-#define STATUS_REQUEST_ABORTED ((NTSTATUS)0xC0000240L)
-#define STATUS_CONNECTION_ABORTED ((NTSTATUS)0xC0000241L)
-#define STATUS_BAD_COMPRESSION_BUFFER ((NTSTATUS)0xC0000242L)
-#define STATUS_USER_MAPPED_FILE ((NTSTATUS)0xC0000243L)
-#define STATUS_AUDIT_FAILED ((NTSTATUS)0xC0000244L)
-#define STATUS_TIMER_RESOLUTION_NOT_SET ((NTSTATUS)0xC0000245L)
-#define STATUS_CONNECTION_COUNT_LIMIT ((NTSTATUS)0xC0000246L)
-#define STATUS_LOGIN_TIME_RESTRICTION ((NTSTATUS)0xC0000247L)
-#define STATUS_LOGIN_WKSTA_RESTRICTION ((NTSTATUS)0xC0000248L)
-#define STATUS_IMAGE_MP_UP_MISMATCH ((NTSTATUS)0xC0000249L)
-#define STATUS_INSUFFICIENT_LOGON_INFO ((NTSTATUS)0xC0000250L)
-#define STATUS_BAD_DLL_ENTRYPOINT ((NTSTATUS)0xC0000251L)
-#define STATUS_BAD_SERVICE_ENTRYPOINT ((NTSTATUS)0xC0000252L)
-#define STATUS_LPC_REPLY_LOST ((NTSTATUS)0xC0000253L)
-#define STATUS_IP_ADDRESS_CONFLICT1 ((NTSTATUS)0xC0000254L)
-#define STATUS_IP_ADDRESS_CONFLICT2 ((NTSTATUS)0xC0000255L)
-#define STATUS_REGISTRY_QUOTA_LIMIT ((NTSTATUS)0xC0000256L)
-#define STATUS_PATH_NOT_COVERED ((NTSTATUS)0xC0000257L)
-#define STATUS_NO_CALLBACK_ACTIVE ((NTSTATUS)0xC0000258L)
-#define STATUS_LICENSE_QUOTA_EXCEEDED ((NTSTATUS)0xC0000259L)
-#define STATUS_PWD_TOO_SHORT ((NTSTATUS)0xC000025AL)
-#define STATUS_PWD_TOO_RECENT ((NTSTATUS)0xC000025BL)
-#define STATUS_PWD_HISTORY_CONFLICT ((NTSTATUS)0xC000025CL)
-#define STATUS_PLUGPLAY_NO_DEVICE ((NTSTATUS)0xC000025EL)
-#define STATUS_UNSUPPORTED_COMPRESSION ((NTSTATUS)0xC000025FL)
-#define STATUS_INVALID_HW_PROFILE ((NTSTATUS)0xC0000260L)
-#define STATUS_INVALID_PLUGPLAY_DEVICE_PATH ((NTSTATUS)0xC0000261L)
-#define STATUS_DRIVER_ORDINAL_NOT_FOUND ((NTSTATUS)0xC0000262L)
-#define STATUS_DRIVER_ENTRYPOINT_NOT_FOUND ((NTSTATUS)0xC0000263L)
-#define STATUS_RESOURCE_NOT_OWNED ((NTSTATUS)0xC0000264L)
-#define STATUS_TOO_MANY_LINKS ((NTSTATUS)0xC0000265L)
-#define STATUS_QUOTA_LIST_INCONSISTENT ((NTSTATUS)0xC0000266L)
-#define STATUS_FILE_IS_OFFLINE ((NTSTATUS)0xC0000267L)
-#define STATUS_EVALUATION_EXPIRATION ((NTSTATUS)0xC0000268L)
-#define STATUS_ILLEGAL_DLL_RELOCATION ((NTSTATUS)0xC0000269L)
-#define STATUS_LICENSE_VIOLATION ((NTSTATUS)0xC000026AL)
-#define STATUS_DLL_INIT_FAILED_LOGOFF ((NTSTATUS)0xC000026BL)
-#define STATUS_DRIVER_UNABLE_TO_LOAD ((NTSTATUS)0xC000026CL)
-#define STATUS_DFS_UNAVAILABLE ((NTSTATUS)0xC000026DL)
-#define STATUS_VOLUME_DISMOUNTED ((NTSTATUS)0xC000026EL)
-#define STATUS_WX86_INTERNAL_ERROR ((NTSTATUS)0xC000026FL)
-#define STATUS_WX86_FLOAT_STACK_CHECK ((NTSTATUS)0xC0000270L)
-#define STATUS_VALIDATE_CONTINUE ((NTSTATUS)0xC0000271L)
-#define STATUS_NO_MATCH ((NTSTATUS)0xC0000272L)
-#define STATUS_NO_MORE_MATCHES ((NTSTATUS)0xC0000273L)
-#define STATUS_NOT_A_REPARSE_POINT ((NTSTATUS)0xC0000275L)
-#define STATUS_IO_REPARSE_TAG_INVALID ((NTSTATUS)0xC0000276L)
-#define STATUS_IO_REPARSE_TAG_MISMATCH ((NTSTATUS)0xC0000277L)
-#define STATUS_IO_REPARSE_DATA_INVALID ((NTSTATUS)0xC0000278L)
-#define STATUS_IO_REPARSE_TAG_NOT_HANDLED ((NTSTATUS)0xC0000279L)
-#define STATUS_REPARSE_POINT_NOT_RESOLVED ((NTSTATUS)0xC0000280L)
-#define STATUS_DIRECTORY_IS_A_REPARSE_POINT ((NTSTATUS)0xC0000281L)
-#define STATUS_RANGE_LIST_CONFLICT ((NTSTATUS)0xC0000282L)
-#define STATUS_SOURCE_ELEMENT_EMPTY ((NTSTATUS)0xC0000283L)
-#define STATUS_DESTINATION_ELEMENT_FULL ((NTSTATUS)0xC0000284L)
-#define STATUS_ILLEGAL_ELEMENT_ADDRESS ((NTSTATUS)0xC0000285L)
-#define STATUS_MAGAZINE_NOT_PRESENT ((NTSTATUS)0xC0000286L)
-#define STATUS_REINITIALIZATION_NEEDED ((NTSTATUS)0xC0000287L)
-#define STATUS_DEVICE_REQUIRES_CLEANING ((NTSTATUS)0x80000288L)
-#define STATUS_DEVICE_DOOR_OPEN ((NTSTATUS)0x80000289L)
-#define STATUS_ENCRYPTION_FAILED ((NTSTATUS)0xC000028AL)
-#define STATUS_DECRYPTION_FAILED ((NTSTATUS)0xC000028BL)
-#define STATUS_RANGE_NOT_FOUND ((NTSTATUS)0xC000028CL)
-#define STATUS_NO_RECOVERY_POLICY ((NTSTATUS)0xC000028DL)
-#define STATUS_NO_EFS ((NTSTATUS)0xC000028EL)
-#define STATUS_WRONG_EFS ((NTSTATUS)0xC000028FL)
-#define STATUS_NO_USER_KEYS ((NTSTATUS)0xC0000290L)
-#define STATUS_FILE_NOT_ENCRYPTED ((NTSTATUS)0xC0000291L)
-#define STATUS_NOT_EXPORT_FORMAT ((NTSTATUS)0xC0000292L)
-#define STATUS_FILE_ENCRYPTED ((NTSTATUS)0xC0000293L)
-#define STATUS_WAKE_SYSTEM ((NTSTATUS)0x40000294L)
-#define STATUS_WMI_GUID_NOT_FOUND ((NTSTATUS)0xC0000295L)
-#define STATUS_WMI_INSTANCE_NOT_FOUND ((NTSTATUS)0xC0000296L)
-#define STATUS_WMI_ITEMID_NOT_FOUND ((NTSTATUS)0xC0000297L)
-#define STATUS_WMI_TRY_AGAIN ((NTSTATUS)0xC0000298L)
-#define STATUS_SHARED_POLICY ((NTSTATUS)0xC0000299L)
-#define STATUS_POLICY_OBJECT_NOT_FOUND ((NTSTATUS)0xC000029AL)
-#define STATUS_POLICY_ONLY_IN_DS ((NTSTATUS)0xC000029BL)
-#define STATUS_VOLUME_NOT_UPGRADED ((NTSTATUS)0xC000029CL)
-#define STATUS_REMOTE_STORAGE_NOT_ACTIVE ((NTSTATUS)0xC000029DL)
-#define STATUS_REMOTE_STORAGE_MEDIA_ERROR ((NTSTATUS)0xC000029EL)
-#define STATUS_NO_TRACKING_SERVICE ((NTSTATUS)0xC000029FL)
-#define STATUS_SERVER_SID_MISMATCH ((NTSTATUS)0xC00002A0L)
-#define STATUS_DS_NO_ATTRIBUTE_OR_VALUE ((NTSTATUS)0xC00002A1L)
-#define STATUS_DS_INVALID_ATTRIBUTE_SYNTAX ((NTSTATUS)0xC00002A2L)
-#define STATUS_DS_ATTRIBUTE_TYPE_UNDEFINED ((NTSTATUS)0xC00002A3L)
-#define STATUS_DS_ATTRIBUTE_OR_VALUE_EXISTS ((NTSTATUS)0xC00002A4L)
-#define STATUS_DS_BUSY ((NTSTATUS)0xC00002A5L)
-#define STATUS_DS_UNAVAILABLE ((NTSTATUS)0xC00002A6L)
-#define STATUS_DS_NO_RIDS_ALLOCATED ((NTSTATUS)0xC00002A7L)
-#define STATUS_DS_NO_MORE_RIDS ((NTSTATUS)0xC00002A8L)
-#define STATUS_DS_INCORRECT_ROLE_OWNER ((NTSTATUS)0xC00002A9L)
-#define STATUS_DS_RIDMGR_INIT_ERROR ((NTSTATUS)0xC00002AAL)
-#define STATUS_DS_OBJ_CLASS_VIOLATION ((NTSTATUS)0xC00002ABL)
-#define STATUS_DS_CANT_ON_NON_LEAF ((NTSTATUS)0xC00002ACL)
-#define STATUS_DS_CANT_ON_RDN ((NTSTATUS)0xC00002ADL)
-#define STATUS_DS_CANT_MOD_OBJ_CLASS ((NTSTATUS)0xC00002AEL)
-#define STATUS_DS_CROSS_DOM_MOVE_FAILED ((NTSTATUS)0xC00002AFL)
-#define STATUS_DS_GC_NOT_AVAILABLE ((NTSTATUS)0xC00002B0L)
-#define STATUS_DIRECTORY_SERVICE_REQUIRED ((NTSTATUS)0xC00002B1L)
-#define STATUS_REPARSE_ATTRIBUTE_CONFLICT ((NTSTATUS)0xC00002B2L)
-#define STATUS_CANT_ENABLE_DENY_ONLY ((NTSTATUS)0xC00002B3L)
-#define STATUS_FLOAT_MULTIPLE_FAULTS ((NTSTATUS)0xC00002B4L)  
-#define STATUS_FLOAT_MULTIPLE_TRAPS ((NTSTATUS)0xC00002B5L)  
-#define STATUS_DEVICE_REMOVED ((NTSTATUS)0xC00002B6L)
-#define STATUS_JOURNAL_DELETE_IN_PROGRESS ((NTSTATUS)0xC00002B7L)
-#define STATUS_JOURNAL_NOT_ACTIVE ((NTSTATUS)0xC00002B8L)
-#define STATUS_NOINTERFACE ((NTSTATUS)0xC00002B9L)
-#define STATUS_DS_ADMIN_LIMIT_EXCEEDED ((NTSTATUS)0xC00002C1L)
-#define STATUS_DRIVER_FAILED_SLEEP ((NTSTATUS)0xC00002C2L)
-#define STATUS_MUTUAL_AUTHENTICATION_FAILED ((NTSTATUS)0xC00002C3L)
-#define STATUS_CORRUPT_SYSTEM_FILE ((NTSTATUS)0xC00002C4L)
-#define STATUS_DATATYPE_MISALIGNMENT_ERROR ((NTSTATUS)0xC00002C5L)  
-#define STATUS_WMI_READ_ONLY ((NTSTATUS)0xC00002C6L)
-#define STATUS_WMI_SET_FAILURE ((NTSTATUS)0xC00002C7L)
-#define STATUS_COMMITMENT_MINIMUM ((NTSTATUS)0xC00002C8L)
-#define STATUS_REG_NAT_CONSUMPTION ((NTSTATUS)0xC00002C9L)  
-#define STATUS_TRANSPORT_FULL ((NTSTATUS)0xC00002CAL)
-#define STATUS_DS_SAM_INIT_FAILURE ((NTSTATUS)0xC00002CBL)
-#define STATUS_ONLY_IF_CONNECTED ((NTSTATUS)0xC00002CCL)
-#define STATUS_DS_SENSITIVE_GROUP_VIOLATION ((NTSTATUS)0xC00002CDL)
-#define STATUS_PNP_RESTART_ENUMERATION ((NTSTATUS)0xC00002CEL)
-#define STATUS_JOURNAL_ENTRY_DELETED ((NTSTATUS)0xC00002CFL)
-#define STATUS_DS_CANT_MOD_PRIMARYGROUPID ((NTSTATUS)0xC00002D0L)
-#define STATUS_SYSTEM_IMAGE_BAD_SIGNATURE ((NTSTATUS)0xC00002D1L)
-#define STATUS_PNP_REBOOT_REQUIRED ((NTSTATUS)0xC00002D2L)
-#define STATUS_POWER_STATE_INVALID ((NTSTATUS)0xC00002D3L)
-#define STATUS_DS_INVALID_GROUP_TYPE ((NTSTATUS)0xC00002D4L)
-#define STATUS_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN ((NTSTATUS)0xC00002D5L)
-#define STATUS_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN ((NTSTATUS)0xC00002D6L)
-#define STATUS_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER ((NTSTATUS)0xC00002D7L)
-#define STATUS_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER ((NTSTATUS)0xC00002D8L)
-#define STATUS_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER ((NTSTATUS)0xC00002D9L)
-#define STATUS_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER ((NTSTATUS)0xC00002DAL)
-#define STATUS_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER ((NTSTATUS)0xC00002DBL)
-#define STATUS_DS_HAVE_PRIMARY_MEMBERS ((NTSTATUS)0xC00002DCL)
-#define STATUS_WMI_NOT_SUPPORTED ((NTSTATUS)0xC00002DDL)
-#define STATUS_INSUFFICIENT_POWER ((NTSTATUS)0xC00002DEL)
-#define STATUS_SAM_NEED_BOOTKEY_PASSWORD ((NTSTATUS)0xC00002DFL)
-#define STATUS_SAM_NEED_BOOTKEY_FLOPPY ((NTSTATUS)0xC00002E0L)
-#define STATUS_DS_CANT_START ((NTSTATUS)0xC00002E1L)
-#define STATUS_DS_INIT_FAILURE ((NTSTATUS)0xC00002E2L)
-#define STATUS_SAM_INIT_FAILURE ((NTSTATUS)0xC00002E3L)
-#define STATUS_DS_GC_REQUIRED ((NTSTATUS)0xC00002E4L)
-#define STATUS_DS_LOCAL_MEMBER_OF_LOCAL_ONLY ((NTSTATUS)0xC00002E5L)
-#define STATUS_DS_NO_FPO_IN_UNIVERSAL_GROUPS ((NTSTATUS)0xC00002E6L)
-#define STATUS_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED ((NTSTATUS)0xC00002E7L)
-#define STATUS_MULTIPLE_FAULT_VIOLATION ((NTSTATUS)0xC00002E8L)
-#define STATUS_CURRENT_DOMAIN_NOT_ALLOWED ((NTSTATUS)0xC00002E9L)
-#define STATUS_CANNOT_MAKE ((NTSTATUS)0xC00002EAL)
-#define STATUS_SYSTEM_SHUTDOWN ((NTSTATUS)0xC00002EBL)
-#define STATUS_DS_INIT_FAILURE_CONSOLE ((NTSTATUS)0xC00002ECL)
-#define STATUS_DS_SAM_INIT_FAILURE_CONSOLE ((NTSTATUS)0xC00002EDL)
-#define STATUS_UNFINISHED_CONTEXT_DELETED ((NTSTATUS)0xC00002EEL)
-#define STATUS_NO_TGT_REPLY ((NTSTATUS)0xC00002EFL)
-#define STATUS_OBJECTID_NOT_FOUND ((NTSTATUS)0xC00002F0L)
-#define STATUS_NO_IP_ADDRESSES ((NTSTATUS)0xC00002F1L)
-#define STATUS_WRONG_CREDENTIAL_HANDLE ((NTSTATUS)0xC00002F2L)
-#define STATUS_CRYPTO_SYSTEM_INVALID ((NTSTATUS)0xC00002F3L)
-#define STATUS_MAX_REFERRALS_EXCEEDED ((NTSTATUS)0xC00002F4L)
-#define STATUS_MUST_BE_KDC ((NTSTATUS)0xC00002F5L)
-#define STATUS_STRONG_CRYPTO_NOT_SUPPORTED ((NTSTATUS)0xC00002F6L)
-#define STATUS_TOO_MANY_PRINCIPALS ((NTSTATUS)0xC00002F7L)
-#define STATUS_NO_PA_DATA ((NTSTATUS)0xC00002F8L)
-#define STATUS_PKINIT_NAME_MISMATCH ((NTSTATUS)0xC00002F9L)
-#define STATUS_SMARTCARD_LOGON_REQUIRED ((NTSTATUS)0xC00002FAL)
-#define STATUS_KDC_INVALID_REQUEST ((NTSTATUS)0xC00002FBL)
-#define STATUS_KDC_UNABLE_TO_REFER ((NTSTATUS)0xC00002FCL)
-#define STATUS_KDC_UNKNOWN_ETYPE ((NTSTATUS)0xC00002FDL)
-#define STATUS_SHUTDOWN_IN_PROGRESS ((NTSTATUS)0xC00002FEL)
-#define STATUS_SERVER_SHUTDOWN_IN_PROGRESS ((NTSTATUS)0xC00002FFL)
-#define STATUS_NOT_SUPPORTED_ON_SBS ((NTSTATUS)0xC0000300L)
-#define STATUS_WMI_GUID_DISCONNECTED ((NTSTATUS)0xC0000301L)
-#define STATUS_WMI_ALREADY_DISABLED ((NTSTATUS)0xC0000302L)
-#define STATUS_WMI_ALREADY_ENABLED ((NTSTATUS)0xC0000303L)
-#define STATUS_MFT_TOO_FRAGMENTED ((NTSTATUS)0xC0000304L)
-#define STATUS_COPY_PROTECTION_FAILURE ((NTSTATUS)0xC0000305L)
-#define STATUS_CSS_AUTHENTICATION_FAILURE ((NTSTATUS)0xC0000306L)
-#define STATUS_CSS_KEY_NOT_PRESENT ((NTSTATUS)0xC0000307L)
-#define STATUS_CSS_KEY_NOT_ESTABLISHED ((NTSTATUS)0xC0000308L)
-#define STATUS_CSS_SCRAMBLED_SECTOR ((NTSTATUS)0xC0000309L)
-#define STATUS_CSS_REGION_MISMATCH ((NTSTATUS)0xC000030AL)
-#define STATUS_CSS_RESETS_EXHAUSTED ((NTSTATUS)0xC000030BL)
-#define STATUS_PKINIT_FAILURE ((NTSTATUS)0xC0000320L)
-#define STATUS_SMARTCARD_SUBSYSTEM_FAILURE ((NTSTATUS)0xC0000321L)
-#define STATUS_NO_KERB_KEY ((NTSTATUS)0xC0000322L)
-#define STATUS_HOST_DOWN ((NTSTATUS)0xC0000350L)
-#define STATUS_UNSUPPORTED_PREAUTH ((NTSTATUS)0xC0000351L)
-#define STATUS_EFS_ALG_BLOB_TOO_BIG ((NTSTATUS)0xC0000352L)
-#define STATUS_PORT_NOT_SET ((NTSTATUS)0xC0000353L)
-#define STATUS_DEBUGGER_INACTIVE ((NTSTATUS)0xC0000354L)
-#define STATUS_DS_VERSION_CHECK_FAILURE ((NTSTATUS)0xC0000355L)
-#define STATUS_AUDITING_DISABLED ((NTSTATUS)0xC0000356L)
-#define STATUS_PRENT4_MACHINE_ACCOUNT ((NTSTATUS)0xC0000357L)
-#define STATUS_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER ((NTSTATUS)0xC0000358L)
-#define STATUS_INVALID_IMAGE_WIN_32 ((NTSTATUS)0xC0000359L)
-#define STATUS_INVALID_IMAGE_WIN_64 ((NTSTATUS)0xC000035AL)
-#define STATUS_BAD_BINDINGS ((NTSTATUS)0xC000035BL)
-#define STATUS_NETWORK_SESSION_EXPIRED ((NTSTATUS)0xC000035CL)
-#define STATUS_APPHELP_BLOCK ((NTSTATUS)0xC000035DL)
-#define STATUS_ALL_SIDS_FILTERED ((NTSTATUS)0xC000035EL)
-#define STATUS_NOT_SAFE_MODE_DRIVER ((NTSTATUS)0xC000035FL)
-#define STATUS_ACCESS_DISABLED_BY_POLICY_DEFAULT ((NTSTATUS)0xC0000361L)
-#define STATUS_ACCESS_DISABLED_BY_POLICY_PATH ((NTSTATUS)0xC0000362L)
-#define STATUS_ACCESS_DISABLED_BY_POLICY_PUBLISHER ((NTSTATUS)0xC0000363L)
-#define STATUS_ACCESS_DISABLED_BY_POLICY_OTHER ((NTSTATUS)0xC0000364L)
-#define STATUS_FAILED_DRIVER_ENTRY ((NTSTATUS)0xC0000365L)
-#define STATUS_DEVICE_ENUMERATION_ERROR ((NTSTATUS)0xC0000366L)
-#define STATUS_WAIT_FOR_OPLOCK ((NTSTATUS)0x00000367L)
-#define STATUS_MOUNT_POINT_NOT_RESOLVED ((NTSTATUS)0xC0000368L)
-#define STATUS_INVALID_DEVICE_OBJECT_PARAMETER ((NTSTATUS)0xC0000369L)
-#define STATUS_MCA_OCCURED ((NTSTATUS)0xC000036AL)
-#define STATUS_DRIVER_BLOCKED_CRITICAL ((NTSTATUS)0xC000036BL)
-#define STATUS_DRIVER_BLOCKED ((NTSTATUS)0xC000036CL)
-#define STATUS_DRIVER_DATABASE_ERROR ((NTSTATUS)0xC000036DL)
-#define STATUS_SYSTEM_HIVE_TOO_LARGE ((NTSTATUS)0xC000036EL)
-#define STATUS_INVALID_IMPORT_OF_NON_DLL ((NTSTATUS)0xC000036FL)
-#define STATUS_DS_SHUTTING_DOWN ((NTSTATUS)0x40000370L)
-#define STATUS_SMARTCARD_WRONG_PIN ((NTSTATUS)0xC0000380L)
-#define STATUS_SMARTCARD_CARD_BLOCKED ((NTSTATUS)0xC0000381L)
-#define STATUS_SMARTCARD_CARD_NOT_AUTHENTICATED ((NTSTATUS)0xC0000382L)
-#define STATUS_SMARTCARD_NO_CARD ((NTSTATUS)0xC0000383L)
-#define STATUS_SMARTCARD_NO_KEY_CONTAINER ((NTSTATUS)0xC0000384L)
-#define STATUS_SMARTCARD_NO_CERTIFICATE ((NTSTATUS)0xC0000385L)
-#define STATUS_SMARTCARD_NO_KEYSET ((NTSTATUS)0xC0000386L)
-#define STATUS_SMARTCARD_IO_ERROR ((NTSTATUS)0xC0000387L)
-#define STATUS_DOWNGRADE_DETECTED ((NTSTATUS)0xC0000388L)
-#define STATUS_SMARTCARD_CERT_REVOKED ((NTSTATUS)0xC0000389L)
-#define STATUS_ISSUING_CA_UNTRUSTED ((NTSTATUS)0xC000038AL)
-#define STATUS_REVOCATION_OFFLINE_C ((NTSTATUS)0xC000038BL)
-#define STATUS_PKINIT_CLIENT_FAILURE ((NTSTATUS)0xC000038CL)
-#define STATUS_SMARTCARD_CERT_EXPIRED ((NTSTATUS)0xC000038DL)
-#define STATUS_DRIVER_FAILED_PRIOR_UNLOAD ((NTSTATUS)0xC000038EL)
-#define STATUS_WOW_ASSERTION ((NTSTATUS)0xC0009898L)
-#define RPC_NT_INVALID_STRING_BINDING ((NTSTATUS)0xC0020001L)
-#define RPC_NT_WRONG_KIND_OF_BINDING ((NTSTATUS)0xC0020002L)
-#define RPC_NT_INVALID_BINDING ((NTSTATUS)0xC0020003L)
-#define RPC_NT_PROTSEQ_NOT_SUPPORTED ((NTSTATUS)0xC0020004L)
-#define RPC_NT_INVALID_RPC_PROTSEQ ((NTSTATUS)0xC0020005L)
-#define RPC_NT_INVALID_STRING_UUID ((NTSTATUS)0xC0020006L)
-#define RPC_NT_INVALID_ENDPOINT_FORMAT ((NTSTATUS)0xC0020007L)
-#define RPC_NT_INVALID_NET_ADDR ((NTSTATUS)0xC0020008L)
-#define RPC_NT_NO_ENDPOINT_FOUND ((NTSTATUS)0xC0020009L)
-#define RPC_NT_INVALID_TIMEOUT ((NTSTATUS)0xC002000AL)
-#define RPC_NT_OBJECT_NOT_FOUND ((NTSTATUS)0xC002000BL)
-#define RPC_NT_ALREADY_REGISTERED ((NTSTATUS)0xC002000CL)
-#define RPC_NT_TYPE_ALREADY_REGISTERED ((NTSTATUS)0xC002000DL)
-#define RPC_NT_ALREADY_LISTENING ((NTSTATUS)0xC002000EL)
-#define RPC_NT_NO_PROTSEQS_REGISTERED ((NTSTATUS)0xC002000FL)
-#define RPC_NT_NOT_LISTENING ((NTSTATUS)0xC0020010L)
-#define RPC_NT_UNKNOWN_MGR_TYPE ((NTSTATUS)0xC0020011L)
-#define RPC_NT_UNKNOWN_IF ((NTSTATUS)0xC0020012L)
-#define RPC_NT_NO_BINDINGS ((NTSTATUS)0xC0020013L)
-#define RPC_NT_NO_PROTSEQS ((NTSTATUS)0xC0020014L)
-#define RPC_NT_CANT_CREATE_ENDPOINT ((NTSTATUS)0xC0020015L)
-#define RPC_NT_OUT_OF_RESOURCES ((NTSTATUS)0xC0020016L)
-#define RPC_NT_SERVER_UNAVAILABLE ((NTSTATUS)0xC0020017L)
-#define RPC_NT_SERVER_TOO_BUSY ((NTSTATUS)0xC0020018L)
-#define RPC_NT_INVALID_NETWORK_OPTIONS ((NTSTATUS)0xC0020019L)
-#define RPC_NT_NO_CALL_ACTIVE ((NTSTATUS)0xC002001AL)
-#define RPC_NT_CALL_FAILED ((NTSTATUS)0xC002001BL)
-#define RPC_NT_CALL_FAILED_DNE ((NTSTATUS)0xC002001CL)
-#define RPC_NT_PROTOCOL_ERROR ((NTSTATUS)0xC002001DL)
-#define RPC_NT_UNSUPPORTED_TRANS_SYN ((NTSTATUS)0xC002001FL)
-#define RPC_NT_UNSUPPORTED_TYPE ((NTSTATUS)0xC0020021L)
-#define RPC_NT_INVALID_TAG ((NTSTATUS)0xC0020022L)
-#define RPC_NT_INVALID_BOUND ((NTSTATUS)0xC0020023L)
-#define RPC_NT_NO_ENTRY_NAME ((NTSTATUS)0xC0020024L)
-#define RPC_NT_INVALID_NAME_SYNTAX ((NTSTATUS)0xC0020025L)
-#define RPC_NT_UNSUPPORTED_NAME_SYNTAX ((NTSTATUS)0xC0020026L)
-#define RPC_NT_UUID_NO_ADDRESS ((NTSTATUS)0xC0020028L)
-#define RPC_NT_DUPLICATE_ENDPOINT ((NTSTATUS)0xC0020029L)
-#define RPC_NT_UNKNOWN_AUTHN_TYPE ((NTSTATUS)0xC002002AL)
-#define RPC_NT_MAX_CALLS_TOO_SMALL ((NTSTATUS)0xC002002BL)
-#define RPC_NT_STRING_TOO_LONG ((NTSTATUS)0xC002002CL)
-#define RPC_NT_PROTSEQ_NOT_FOUND ((NTSTATUS)0xC002002DL)
-#define RPC_NT_PROCNUM_OUT_OF_RANGE ((NTSTATUS)0xC002002EL)
-#define RPC_NT_BINDING_HAS_NO_AUTH ((NTSTATUS)0xC002002FL)
-#define RPC_NT_UNKNOWN_AUTHN_SERVICE ((NTSTATUS)0xC0020030L)
-#define RPC_NT_UNKNOWN_AUTHN_LEVEL ((NTSTATUS)0xC0020031L)
-#define RPC_NT_INVALID_AUTH_IDENTITY ((NTSTATUS)0xC0020032L)
-#define RPC_NT_UNKNOWN_AUTHZ_SERVICE ((NTSTATUS)0xC0020033L)
-#define EPT_NT_INVALID_ENTRY ((NTSTATUS)0xC0020034L)
-#define EPT_NT_CANT_PERFORM_OP ((NTSTATUS)0xC0020035L)
-#define EPT_NT_NOT_REGISTERED ((NTSTATUS)0xC0020036L)
-#define RPC_NT_NOTHING_TO_EXPORT ((NTSTATUS)0xC0020037L)
-#define RPC_NT_INCOMPLETE_NAME ((NTSTATUS)0xC0020038L)
-#define RPC_NT_INVALID_VERS_OPTION ((NTSTATUS)0xC0020039L)
-#define RPC_NT_NO_MORE_MEMBERS ((NTSTATUS)0xC002003AL)
-#define RPC_NT_NOT_ALL_OBJS_UNEXPORTED ((NTSTATUS)0xC002003BL)
-#define RPC_NT_INTERFACE_NOT_FOUND ((NTSTATUS)0xC002003CL)
-#define RPC_NT_ENTRY_ALREADY_EXISTS ((NTSTATUS)0xC002003DL)
-#define RPC_NT_ENTRY_NOT_FOUND ((NTSTATUS)0xC002003EL)
-#define RPC_NT_NAME_SERVICE_UNAVAILABLE ((NTSTATUS)0xC002003FL)
-#define RPC_NT_INVALID_NAF_ID ((NTSTATUS)0xC0020040L)
-#define RPC_NT_CANNOT_SUPPORT ((NTSTATUS)0xC0020041L)
-#define RPC_NT_NO_CONTEXT_AVAILABLE ((NTSTATUS)0xC0020042L)
-#define RPC_NT_INTERNAL_ERROR ((NTSTATUS)0xC0020043L)
-#define RPC_NT_ZERO_DIVIDE ((NTSTATUS)0xC0020044L)
-#define RPC_NT_ADDRESS_ERROR ((NTSTATUS)0xC0020045L)
-#define RPC_NT_FP_DIV_ZERO ((NTSTATUS)0xC0020046L)
-#define RPC_NT_FP_UNDERFLOW ((NTSTATUS)0xC0020047L)
-#define RPC_NT_FP_OVERFLOW ((NTSTATUS)0xC0020048L)
-#define RPC_NT_NO_MORE_ENTRIES ((NTSTATUS)0xC0030001L)
-#define RPC_NT_SS_CHAR_TRANS_OPEN_FAIL ((NTSTATUS)0xC0030002L)
-#define RPC_NT_SS_CHAR_TRANS_SHORT_FILE ((NTSTATUS)0xC0030003L)
-#define RPC_NT_SS_IN_NULL_CONTEXT ((NTSTATUS)0xC0030004L)
-#define RPC_NT_SS_CONTEXT_MISMATCH ((NTSTATUS)0xC0030005L)
-#define RPC_NT_SS_CONTEXT_DAMAGED ((NTSTATUS)0xC0030006L)
-#define RPC_NT_SS_HANDLES_MISMATCH ((NTSTATUS)0xC0030007L)
-#define RPC_NT_SS_CANNOT_GET_CALL_HANDLE ((NTSTATUS)0xC0030008L)
-#define RPC_NT_NULL_REF_POINTER ((NTSTATUS)0xC0030009L)
-#define RPC_NT_ENUM_VALUE_OUT_OF_RANGE ((NTSTATUS)0xC003000AL)
-#define RPC_NT_BYTE_COUNT_TOO_SMALL ((NTSTATUS)0xC003000BL)
-#define RPC_NT_BAD_STUB_DATA ((NTSTATUS)0xC003000CL)
-#define RPC_NT_CALL_IN_PROGRESS ((NTSTATUS)0xC0020049L)
-#define RPC_NT_NO_MORE_BINDINGS ((NTSTATUS)0xC002004AL)
-#define RPC_NT_GROUP_MEMBER_NOT_FOUND ((NTSTATUS)0xC002004BL)
-#define EPT_NT_CANT_CREATE ((NTSTATUS)0xC002004CL)
-#define RPC_NT_INVALID_OBJECT ((NTSTATUS)0xC002004DL)
-#define RPC_NT_NO_INTERFACES ((NTSTATUS)0xC002004FL)
-#define RPC_NT_CALL_CANCELLED ((NTSTATUS)0xC0020050L)
-#define RPC_NT_BINDING_INCOMPLETE ((NTSTATUS)0xC0020051L)
-#define RPC_NT_COMM_FAILURE ((NTSTATUS)0xC0020052L)
-#define RPC_NT_UNSUPPORTED_AUTHN_LEVEL ((NTSTATUS)0xC0020053L)
-#define RPC_NT_NO_PRINC_NAME ((NTSTATUS)0xC0020054L)
-#define RPC_NT_NOT_RPC_ERROR ((NTSTATUS)0xC0020055L)
-#define RPC_NT_UUID_LOCAL_ONLY ((NTSTATUS)0x40020056L)
-#define RPC_NT_SEC_PKG_ERROR ((NTSTATUS)0xC0020057L)
-#define RPC_NT_NOT_CANCELLED ((NTSTATUS)0xC0020058L)
-#define RPC_NT_INVALID_ES_ACTION ((NTSTATUS)0xC0030059L)
-#define RPC_NT_WRONG_ES_VERSION ((NTSTATUS)0xC003005AL)
-#define RPC_NT_WRONG_STUB_VERSION ((NTSTATUS)0xC003005BL)
-#define RPC_NT_INVALID_PIPE_OBJECT ((NTSTATUS)0xC003005CL)
-#define RPC_NT_INVALID_PIPE_OPERATION ((NTSTATUS)0xC003005DL)
-#define RPC_NT_WRONG_PIPE_VERSION ((NTSTATUS)0xC003005EL)
-#define RPC_NT_PIPE_CLOSED ((NTSTATUS)0xC003005FL)
-#define RPC_NT_PIPE_DISCIPLINE_ERROR ((NTSTATUS)0xC0030060L)
-#define RPC_NT_PIPE_EMPTY ((NTSTATUS)0xC0030061L)
-#define RPC_NT_INVALID_ASYNC_HANDLE ((NTSTATUS)0xC0020062L)
-#define RPC_NT_INVALID_ASYNC_CALL ((NTSTATUS)0xC0020063L)
-#define RPC_NT_SEND_INCOMPLETE ((NTSTATUS)0x400200AFL)
-#define STATUS_ACPI_INVALID_OPCODE ((NTSTATUS)0xC0140001L)
-#define STATUS_ACPI_STACK_OVERFLOW ((NTSTATUS)0xC0140002L)
-#define STATUS_ACPI_ASSERT_FAILED ((NTSTATUS)0xC0140003L)
-#define STATUS_ACPI_INVALID_INDEX ((NTSTATUS)0xC0140004L)
-#define STATUS_ACPI_INVALID_ARGUMENT ((NTSTATUS)0xC0140005L)
-#define STATUS_ACPI_FATAL ((NTSTATUS)0xC0140006L)
-#define STATUS_ACPI_INVALID_SUPERNAME ((NTSTATUS)0xC0140007L)
-#define STATUS_ACPI_INVALID_ARGTYPE ((NTSTATUS)0xC0140008L)
-#define STATUS_ACPI_INVALID_OBJTYPE ((NTSTATUS)0xC0140009L)
-#define STATUS_ACPI_INVALID_TARGETTYPE ((NTSTATUS)0xC014000AL)
-#define STATUS_ACPI_INCORRECT_ARGUMENT_COUNT ((NTSTATUS)0xC014000BL)
-#define STATUS_ACPI_ADDRESS_NOT_MAPPED ((NTSTATUS)0xC014000CL)
-#define STATUS_ACPI_INVALID_EVENTTYPE ((NTSTATUS)0xC014000DL)
-#define STATUS_ACPI_HANDLER_COLLISION ((NTSTATUS)0xC014000EL)
-#define STATUS_ACPI_INVALID_DATA ((NTSTATUS)0xC014000FL)
-#define STATUS_ACPI_INVALID_REGION ((NTSTATUS)0xC0140010L)
-#define STATUS_ACPI_INVALID_ACCESS_SIZE ((NTSTATUS)0xC0140011L)
-#define STATUS_ACPI_ACQUIRE_GLOBAL_LOCK ((NTSTATUS)0xC0140012L)
-#define STATUS_ACPI_ALREADY_INITIALIZED ((NTSTATUS)0xC0140013L)
-#define STATUS_ACPI_NOT_INITIALIZED ((NTSTATUS)0xC0140014L)
-#define STATUS_ACPI_INVALID_MUTEX_LEVEL ((NTSTATUS)0xC0140015L)
-#define STATUS_ACPI_MUTEX_NOT_OWNED ((NTSTATUS)0xC0140016L)
-#define STATUS_ACPI_MUTEX_NOT_OWNER ((NTSTATUS)0xC0140017L)
-#define STATUS_ACPI_RS_ACCESS ((NTSTATUS)0xC0140018L)
-#define STATUS_ACPI_INVALID_TABLE ((NTSTATUS)0xC0140019L)
-#define STATUS_ACPI_REG_HANDLER_FAILED ((NTSTATUS)0xC0140020L)
-#define STATUS_ACPI_POWER_REQUEST_FAILED ((NTSTATUS)0xC0140021L)
-#define STATUS_CTX_WINSTATION_NAME_INVALID ((NTSTATUS)0xC00A0001L)
-#define STATUS_CTX_INVALID_PD ((NTSTATUS)0xC00A0002L)
-#define STATUS_CTX_PD_NOT_FOUND ((NTSTATUS)0xC00A0003L)
-#define STATUS_CTX_CDM_CONNECT ((NTSTATUS)0x400A0004L)
-#define STATUS_CTX_CDM_DISCONNECT ((NTSTATUS)0x400A0005L)
-#define STATUS_CTX_CLOSE_PENDING ((NTSTATUS)0xC00A0006L)
-#define STATUS_CTX_NO_OUTBUF ((NTSTATUS)0xC00A0007L)
-#define STATUS_CTX_MODEM_INF_NOT_FOUND ((NTSTATUS)0xC00A0008L)
-#define STATUS_CTX_INVALID_MODEMNAME ((NTSTATUS)0xC00A0009L)
-#define STATUS_CTX_RESPONSE_ERROR ((NTSTATUS)0xC00A000AL)
-#define STATUS_CTX_MODEM_RESPONSE_TIMEOUT ((NTSTATUS)0xC00A000BL)
-#define STATUS_CTX_MODEM_RESPONSE_NO_CARRIER ((NTSTATUS)0xC00A000CL)
-#define STATUS_CTX_MODEM_RESPONSE_NO_DIALTONE ((NTSTATUS)0xC00A000DL)
-#define STATUS_CTX_MODEM_RESPONSE_BUSY ((NTSTATUS)0xC00A000EL)
-#define STATUS_CTX_MODEM_RESPONSE_VOICE ((NTSTATUS)0xC00A000FL)
-#define STATUS_CTX_TD_ERROR ((NTSTATUS)0xC00A0010L)
-#define STATUS_CTX_LICENSE_CLIENT_INVALID ((NTSTATUS)0xC00A0012L)
-#define STATUS_CTX_LICENSE_NOT_AVAILABLE ((NTSTATUS)0xC00A0013L)
-#define STATUS_CTX_LICENSE_EXPIRED ((NTSTATUS)0xC00A0014L)
-#define STATUS_CTX_WINSTATION_NOT_FOUND ((NTSTATUS)0xC00A0015L)
-#define STATUS_CTX_WINSTATION_NAME_COLLISION ((NTSTATUS)0xC00A0016L)
-#define STATUS_CTX_WINSTATION_BUSY ((NTSTATUS)0xC00A0017L)
-#define STATUS_CTX_BAD_VIDEO_MODE ((NTSTATUS)0xC00A0018L)
-#define STATUS_CTX_GRAPHICS_INVALID ((NTSTATUS)0xC00A0022L)
-#define STATUS_CTX_NOT_CONSOLE ((NTSTATUS)0xC00A0024L)
-#define STATUS_CTX_CLIENT_QUERY_TIMEOUT ((NTSTATUS)0xC00A0026L)
-#define STATUS_CTX_CONSOLE_DISCONNECT ((NTSTATUS)0xC00A0027L)
-#define STATUS_CTX_CONSOLE_CONNECT ((NTSTATUS)0xC00A0028L)
-#define STATUS_CTX_SHADOW_DENIED ((NTSTATUS)0xC00A002AL)
-#define STATUS_CTX_WINSTATION_ACCESS_DENIED ((NTSTATUS)0xC00A002BL)
-#define STATUS_CTX_INVALID_WD ((NTSTATUS)0xC00A002EL)
-#define STATUS_CTX_WD_NOT_FOUND ((NTSTATUS)0xC00A002FL)
-#define STATUS_CTX_SHADOW_INVALID ((NTSTATUS)0xC00A0030L)
-#define STATUS_CTX_SHADOW_DISABLED ((NTSTATUS)0xC00A0031L)
-#define STATUS_RDP_PROTOCOL_ERROR ((NTSTATUS)0xC00A0032L)
-#define STATUS_CTX_CLIENT_LICENSE_NOT_SET ((NTSTATUS)0xC00A0033L)
-#define STATUS_CTX_CLIENT_LICENSE_IN_USE ((NTSTATUS)0xC00A0034L)
-#define STATUS_CTX_SHADOW_ENDED_BY_MODE_CHANGE ((NTSTATUS)0xC00A0035L)
-#define STATUS_CTX_SHADOW_NOT_RUNNING ((NTSTATUS)0xC00A0036L)
-#define STATUS_PNP_BAD_MPS_TABLE ((NTSTATUS)0xC0040035L)
-#define STATUS_PNP_TRANSLATION_FAILED ((NTSTATUS)0xC0040036L)
-#define STATUS_PNP_IRQ_TRANSLATION_FAILED ((NTSTATUS)0xC0040037L)
-#define STATUS_SXS_SECTION_NOT_FOUND ((NTSTATUS)0xC0150001L)
-#define STATUS_SXS_CANT_GEN_ACTCTX ((NTSTATUS)0xC0150002L)
-#define STATUS_SXS_INVALID_ACTCTXDATA_FORMAT ((NTSTATUS)0xC0150003L)
-#define STATUS_SXS_ASSEMBLY_NOT_FOUND ((NTSTATUS)0xC0150004L)
-#define STATUS_SXS_MANIFEST_FORMAT_ERROR ((NTSTATUS)0xC0150005L)
-#define STATUS_SXS_MANIFEST_PARSE_ERROR ((NTSTATUS)0xC0150006L)
-#define STATUS_SXS_ACTIVATION_CONTEXT_DISABLED ((NTSTATUS)0xC0150007L)
-#define STATUS_SXS_KEY_NOT_FOUND ((NTSTATUS)0xC0150008L)
-#define STATUS_SXS_VERSION_CONFLICT ((NTSTATUS)0xC0150009L)
-#define STATUS_SXS_WRONG_SECTION_TYPE ((NTSTATUS)0xC015000AL)
-#define STATUS_SXS_THREAD_QUERIES_DISABLED ((NTSTATUS)0xC015000BL)
-#define STATUS_SXS_ASSEMBLY_MISSING ((NTSTATUS)0xC015000CL)
-#define STATUS_SXS_RELEASE_ACTIVATION_CONTEXT ((NTSTATUS)0x4015000DL)
-#define STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET ((NTSTATUS)0xC015000EL)
-#define STATUS_SXS_EARLY_DEACTIVATION ((NTSTATUS)0xC015000FL)  
-#define STATUS_SXS_INVALID_DEACTIVATION ((NTSTATUS)0xC0150010L)  
-#define STATUS_SXS_MULTIPLE_DEACTIVATION ((NTSTATUS)0xC0150011L)
-#define STATUS_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY ((NTSTATUS)0xC0150012L)
-#define STATUS_SXS_PROCESS_TERMINATION_REQUESTED ((NTSTATUS)0xC0150013L)
-#define STATUS_CLUSTER_INVALID_NODE ((NTSTATUS)0xC0130001L)
-#define STATUS_CLUSTER_NODE_EXISTS ((NTSTATUS)0xC0130002L)
-#define STATUS_CLUSTER_JOIN_IN_PROGRESS ((NTSTATUS)0xC0130003L)
-#define STATUS_CLUSTER_NODE_NOT_FOUND ((NTSTATUS)0xC0130004L)
-#define STATUS_CLUSTER_LOCAL_NODE_NOT_FOUND ((NTSTATUS)0xC0130005L)
-#define STATUS_CLUSTER_NETWORK_EXISTS ((NTSTATUS)0xC0130006L)
-#define STATUS_CLUSTER_NETWORK_NOT_FOUND ((NTSTATUS)0xC0130007L)
-#define STATUS_CLUSTER_NETINTERFACE_EXISTS ((NTSTATUS)0xC0130008L)
-#define STATUS_CLUSTER_NETINTERFACE_NOT_FOUND ((NTSTATUS)0xC0130009L)
-#define STATUS_CLUSTER_INVALID_REQUEST ((NTSTATUS)0xC013000AL)
-#define STATUS_CLUSTER_INVALID_NETWORK_PROVIDER ((NTSTATUS)0xC013000BL)
-#define STATUS_CLUSTER_NODE_DOWN ((NTSTATUS)0xC013000CL)
-#define STATUS_CLUSTER_NODE_UNREACHABLE ((NTSTATUS)0xC013000DL)
-#define STATUS_CLUSTER_NODE_NOT_MEMBER ((NTSTATUS)0xC013000EL)
-#define STATUS_CLUSTER_JOIN_NOT_IN_PROGRESS ((NTSTATUS)0xC013000FL)
-#define STATUS_CLUSTER_INVALID_NETWORK ((NTSTATUS)0xC0130010L)
-#define STATUS_CLUSTER_NO_NET_ADAPTERS ((NTSTATUS)0xC0130011L)
-#define STATUS_CLUSTER_NODE_UP ((NTSTATUS)0xC0130012L)
-#define STATUS_CLUSTER_NODE_PAUSED ((NTSTATUS)0xC0130013L)
-#define STATUS_CLUSTER_NODE_NOT_PAUSED ((NTSTATUS)0xC0130014L)
-#define STATUS_CLUSTER_NO_SECURITY_CONTEXT ((NTSTATUS)0xC0130015L)
-#define STATUS_CLUSTER_NETWORK_NOT_INTERNAL ((NTSTATUS)0xC0130016L)
-#define STATUS_CLUSTER_POISONED ((NTSTATUS)0xC0130017L)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/winsup/w32api/include/ddk/parallel.h b/winsup/w32api/include/ddk/parallel.h
deleted file mode 100644
index 1c7d72f10..000000000
--- a/winsup/w32api/include/ddk/parallel.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * parallel.h
- *
- * ParPort driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __PARALLEL_H
-#define __PARALLEL_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "ntddpar.h"
-
-
-#define DD_PARALLEL_PORT_BASE_NAME        "ParallelPort"
-#define DD_PARALLEL_PORT_BASE_NAME_U      L"ParallelPort"
-
-#define IOCTL_INTERNAL_DESELECT_DEVICE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 24, METHOD_BUFFERED, FILE_ANY_ACCESS) 
-#define IOCTL_INTERNAL_GET_MORE_PARALLEL_PORT_INFO \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 17, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_GET_PARALLEL_PNP_INFO \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 21, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_GET_PARALLEL_PORT_INFO \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 12, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_INIT_1284_3_BUS \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 22, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_PARALLEL_CLEAR_CHIP_MODE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 20, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_PARALLEL_CONNECT_INTERRUPT \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 13, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_PARALLEL_DISCONNECT_INTERRUPT \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 14, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_PARALLEL_PORT_ALLOCATE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 11, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_PARALLEL_PORT_FREE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 40, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_PARALLEL_SET_CHIP_MODE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 19, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_RELEASE_PARALLEL_PORT_INFO \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 15, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_SELECT_DEVICE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 23, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-
-typedef struct _PARALLEL_1284_COMMAND {
-  UCHAR  ID;
-  UCHAR  Port;
-  ULONG  CommandFlags;
-} PARALLEL_1284_COMMAND, *PPARALLEL_1284_COMMAND;
-
-/* PARALLEL_1284_COMMAND.CommandFlags */
-#define PAR_END_OF_CHAIN_DEVICE           0x00000001
-#define PAR_HAVE_PORT_KEEP_PORT           0x00000002
-
-typedef struct _MORE_PARALLEL_PORT_INFORMATION {
-	INTERFACE_TYPE  InterfaceType;
-	ULONG  BusNumber;
-	ULONG  InterruptLevel;
-	ULONG  InterruptVector;
-	KAFFINITY  InterruptAffinity;
-	KINTERRUPT_MODE  InterruptMode;
-} MORE_PARALLEL_PORT_INFORMATION, *PMORE_PARALLEL_PORT_INFORMATION;
-
-typedef NTSTATUS DDKAPI
-(*PPARALLEL_SET_CHIP_MODE)(
-	IN  PVOID  SetChipContext,
-	IN  UCHAR  ChipMode);
-
-typedef NTSTATUS DDKAPI
-(*PPARALLEL_CLEAR_CHIP_MODE)(
-	IN  PVOID  ClearChipContext,
-	IN  UCHAR  ChipMode);
-
-typedef NTSTATUS DDKAPI
-(*PPARCHIP_CLEAR_CHIP_MODE)(
-	IN  PVOID  ClearChipContext,
-	IN  UCHAR  ChipMode);
-
-typedef NTSTATUS DDKAPI
-(*PPARALLEL_TRY_SELECT_ROUTINE)(
-	IN  PVOID  TrySelectContext,
-	IN  PVOID  TrySelectCommand);
-
-typedef NTSTATUS DDKAPI
-(*PPARALLEL_DESELECT_ROUTINE)(
-	IN PVOID  DeselectContext,
-	IN PVOID  DeselectCommand);
-
-/* PARALLEL_PNP_INFORMATION.HardwareCapabilities */
-#define PPT_NO_HARDWARE_PRESENT           0x00000000
-#define PPT_ECP_PRESENT                   0x00000001
-#define PPT_EPP_PRESENT                   0x00000002
-#define PPT_EPP_32_PRESENT                0x00000004
-#define PPT_BYTE_PRESENT                  0x00000008
-#define PPT_BIDI_PRESENT                  0x00000008
-#define PPT_1284_3_PRESENT                0x00000010
-
-typedef struct _PARALLEL_PNP_INFORMATION {
-  PHYSICAL_ADDRESS  OriginalEcpController;
-  PUCHAR  EcpController;
-  ULONG  SpanOfEcpController;
-  ULONG  PortNumber;
-  ULONG  HardwareCapabilities;
-  PPARALLEL_SET_CHIP_MODE  TrySetChipMode;
-  PPARALLEL_CLEAR_CHIP_MODE  ClearChipMode;
-  ULONG  FifoDepth;
-  ULONG  FifoWidth;
-  PHYSICAL_ADDRESS  EppControllerPhysicalAddress;
-  ULONG  SpanOfEppController;
-  ULONG  Ieee1284_3DeviceCount;
-  PPARALLEL_TRY_SELECT_ROUTINE  TrySelectDevice;
-  PPARALLEL_DESELECT_ROUTINE  DeselectDevice;
-  PVOID  Context;
-  ULONG  CurrentMode;
-  PWSTR  PortName;
-} PARALLEL_PNP_INFORMATION, *PPARALLEL_PNP_INFORMATION;
-
-typedef BOOLEAN DDKAPI
-(*PPARALLEL_TRY_ALLOCATE_ROUTINE)(
-  IN  PVOID  TryAllocateContext);
-
-typedef VOID DDKAPI
-(*PPARALLEL_FREE_ROUTINE)(
-  IN  PVOID  FreeContext);
-
-typedef ULONG DDKAPI
-(*PPARALLEL_QUERY_WAITERS_ROUTINE)(
-	IN  PVOID  QueryAllocsContext);
-
-typedef struct _PARALLEL_PORT_INFORMATION {
-  PHYSICAL_ADDRESS  OriginalController;
-  PUCHAR  Controller;
-  ULONG  SpanOfController;
-  PPARALLEL_TRY_ALLOCATE_ROUTINE  TryAllocatePort;
-  PPARALLEL_FREE_ROUTINE  FreePort;
-  PPARALLEL_QUERY_WAITERS_ROUTINE  QueryNumWaiters;
-  PVOID  Context;
-} PARALLEL_PORT_INFORMATION, *PPARALLEL_PORT_INFORMATION;
-
-/* PARALLEL_CHIP_MODE.ModeFlags */
-#define INITIAL_MODE                      0x00
-#define PARCHIP_ECR_ARBITRATOR            0x01
-
-typedef struct _PARALLEL_CHIP_MODE {
-  UCHAR  ModeFlags;
-  BOOLEAN  success;
-} PARALLEL_CHIP_MODE, *PPARALLEL_CHIP_MODE;
-
-typedef VOID DDKAPI
-(*PPARALLEL_DEFERRED_ROUTINE)(
-	IN  PVOID  DeferredContext);
-
-typedef struct _PARALLEL_INTERRUPT_SERVICE_ROUTINE {
-  PKSERVICE_ROUTINE  InterruptServiceRoutine;
-  PVOID  InterruptServiceContext;
-  PPARALLEL_DEFERRED_ROUTINE  DeferredPortCheckRoutine;
-  PVOID  DeferredPortCheckContext;
-} PARALLEL_INTERRUPT_SERVICE_ROUTINE, *PPARALLEL_INTERRUPT_SERVICE_ROUTINE;
-
-
-#define IOCTL_INTERNAL_DISCONNECT_IDLE \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 32, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_LOCK_PORT \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 37, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_LOCK_PORT_NO_SELECT \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 52, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_PARCLASS_CONNECT \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 30, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_PARCLASS_DISCONNECT \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 31, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_UNLOCK_PORT \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 38, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_INTERNAL_UNLOCK_PORT_NO_DESELECT \
-  CTL_CODE (FILE_DEVICE_PARALLEL_PORT, 53, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-typedef USHORT DDKAPI
-(*PDETERMINE_IEEE_MODES)(
-  IN PVOID  Context);
-
-typedef enum _PARALLEL_SAFETY {
-	SAFE_MODE,
-	UNSAFE_MODE
-} PARALLEL_SAFETY;
-
-typedef NTSTATUS DDKAPI
-(*PNEGOTIATE_IEEE_MODE)(
-  IN PVOID  Context,
-  IN USHORT  ModeMaskFwd,
-  IN USHORT  ModeMaskRev,
-  IN PARALLEL_SAFETY  ModeSafety,
-  IN BOOLEAN  IsForward);
-
-typedef NTSTATUS DDKAPI
-(*PTERMINATE_IEEE_MODE)(
-	IN  PVOID  Context);
-	
-typedef NTSTATUS DDKAPI
-(*PPARALLEL_IEEE_FWD_TO_REV)(
-  IN  PVOID  Context);
-
-typedef NTSTATUS DDKAPI
-(*PPARALLEL_IEEE_REV_TO_FWD)(
-  IN  PVOID  Context);
-
-typedef NTSTATUS DDKAPI
-(*PPARALLEL_READ)(
-	IN  PVOID  Context,
-	OUT PVOID  Buffer,
-	IN  ULONG  NumBytesToRead,
-	OUT PULONG  NumBytesRead,
-	IN  UCHAR  Channel);
-	
-typedef NTSTATUS DDKAPI
-(*PPARALLEL_WRITE)(
-	IN  PVOID  Context,
-	OUT PVOID  Buffer,
-	IN  ULONG  NumBytesToWrite,
-	OUT PULONG  NumBytesWritten,
-	IN  UCHAR   Channel);
-
-typedef NTSTATUS DDKAPI
-(*PPARALLEL_TRYSELECT_DEVICE)(
-  IN  PVOID  Context,
-  IN  PARALLEL_1284_COMMAND  Command);
-
-typedef NTSTATUS DDKAPI
-(*PPARALLEL_DESELECT_DEVICE)(
-  IN  PVOID  Context,
-  IN  PARALLEL_1284_COMMAND  Command);
-
-typedef struct _PARCLASS_INFORMATION {
-  PUCHAR  Controller;
-  PUCHAR  EcrController;
-  ULONG  SpanOfController;
-  PDETERMINE_IEEE_MODES  DetermineIeeeModes;
-  PNEGOTIATE_IEEE_MODE  NegotiateIeeeMode;
-  PTERMINATE_IEEE_MODE  TerminateIeeeMode;
-  PPARALLEL_IEEE_FWD_TO_REV  IeeeFwdToRevMode;
-  PPARALLEL_IEEE_REV_TO_FWD  IeeeRevToFwdMode;
-  PPARALLEL_READ  ParallelRead;
-  PPARALLEL_WRITE  ParallelWrite;
-  PVOID  ParclassContext;
-  ULONG  HardwareCapabilities;
-  ULONG  FifoDepth;
-  ULONG  FifoWidth;
-  PPARALLEL_TRYSELECT_DEVICE  ParallelTryselect;
-  PPARALLEL_DESELECT_DEVICE  ParallelDeSelect;
-} PARCLASS_INFORMATION, *PPARCLASS_INFORMATION;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __PARALLEL_H */
diff --git a/winsup/w32api/include/ddk/pfhook.h b/winsup/w32api/include/ddk/pfhook.h
deleted file mode 100644
index 571b63ef6..000000000
--- a/winsup/w32api/include/ddk/pfhook.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * pfhook.h
- *
- * Packet filter API
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __PFHOOK_H
-#define __PFHOOK_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define DD_IPFLTRDRVR_DEVICE_NAME         L"\\Device\\IPFILTERDRIVER"
-
-#define INVALID_PF_IF_INDEX               0xffffffff
-#define ZERO_PF_IP_ADDR                   0
-
-typedef ULONG IPAddr;
-
-typedef enum _PF_FORWARD_ACTION {
-	PF_FORWARD = 0,
-	PF_DROP = 1,
-	PF_PASS = 2,
-	PF_ICMP_ON_DROP = 3
-} PF_FORWARD_ACTION;
-
-typedef PF_FORWARD_ACTION STDCALL
-(*PacketFilterExtensionPtr)(
-  IN unsigned char  *PacketHeader,
-  IN unsigned char  *Packet, 
-  IN unsigned int  PacketLength, 
-  IN unsigned int  RecvInterfaceIndex, 
-  IN unsigned int  SendInterfaceIndex, 
-  IN IPAddr  RecvLinkNextHop, 
-  IN IPAddr  SendLinkNextHop); 
-
-typedef struct _PF_SET_EXTENSION_HOOK_INFO {
-  PacketFilterExtensionPtr  ExtensionPointer; 
-} PF_SET_EXTENSION_HOOK_INFO, *PPF_SET_EXTENSION_HOOK_INFO;
-
-#define FSCTL_IPFLTRDRVR_BASE             FILE_DEVICE_NETWORK
-
-#define _IPFLTRDRVR_CTL_CODE(function, method, access) \
-  CTL_CODE(FSCTL_IPFLTRDRVR_BASE, function, method, access)
-
-#define IOCTL_PF_SET_EXTENSION_POINTER \
-  _IPFLTRDRVR_CTL_CODE(22, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __PFHOOK_H */
diff --git a/winsup/w32api/include/ddk/poclass.h b/winsup/w32api/include/ddk/poclass.h
deleted file mode 100644
index 8de537884..000000000
--- a/winsup/w32api/include/ddk/poclass.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * poclass.h
- *
- * Power policy driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __POCLASS_H
-#define __POCLASS_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "batclass.h"
-
-
-DEFINE_GUID(GUID_CLASS_INPUT,
-  0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30);
-
-DEFINE_GUID(GUID_DEVICE_LID,
-  0x4AFA3D52L, 0x74A7, 0x11d0, 0xbe, 0x5e, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57);
-
-DEFINE_GUID(GUID_DEVICE_MEMORY,
-  0x3fd0f03dL, 0x92e0, 0x45fb, 0xb7, 0x5c, 0x5e, 0xd8, 0xff, 0xb0, 0x10, 0x21);
-
-DEFINE_GUID(GUID_DEVICE_MESSAGE_INDICATOR,
-  0XCD48A365L, 0xfa94, 0x4ce2, 0xa2, 0x32, 0xa1, 0xb7, 0x64, 0xe5, 0xd8, 0xb4);
-
-DEFINE_GUID(GUID_DEVICE_PROCESSOR,
-  0x97fadb10L, 0x4e33, 0x40ae, 0x35, 0x9c, 0x8b, 0xef, 0x02, 0x9d, 0xbd, 0xd0);
-
-DEFINE_GUID(GUID_DEVICE_SYS_BUTTON,
-  0x4AFA3D53L, 0x74A7, 0x11d0, 0xbe, 0x5e, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57);
-
-DEFINE_GUID(GUID_DEVICE_THERMAL_ZONE,
-  0x4AFA3D51L, 0x74A7, 0x11d0, 0xbe, 0x5e, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57);
-
-
-#define IOCTL_GET_PROCESSOR_OBJ_INFO \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x60, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_GET_SYS_BUTTON_CAPS \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x50, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_GET_SYS_BUTTON_EVENT \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x51, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_SET_SYS_MESSAGE_INDICATOR \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x70, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-
-#define IOCTL_NOTIFY_SWITCH_EVENT \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x40, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_THERMAL_QUERY_INFORMATION \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x20, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_THERMAL_SET_COOLING_POLICY \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x21, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-
-#define IOCTL_QUERY_LID \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x30, METHOD_BUFFERED, FILE_READ_ACCESS)
-
-#define IOCTL_RUN_ACTIVE_COOLING_METHOD \
-  CTL_CODE(FILE_DEVICE_BATTERY, 0x22, METHOD_BUFFERED, FILE_WRITE_ACCESS)
-
-#define SYS_BUTTON_POWER                  0x00000001
-#define SYS_BUTTON_SLEEP                  0x00000002
-#define SYS_BUTTON_LID                    0x00000004
-#define SYS_BUTTON_WAKE                   0x80000000
-
-#define MAX_ACTIVE_COOLING_LEVELS         10
-#define ACTIVE_COOLING                    0
-#define PASSIVE_COOLING                   1
-
-typedef struct _THERMAL_INFORMATION {
-  ULONG  ThermalStamp;
-  ULONG  ThermalConstant1;
-  ULONG  ThermalConstant2;
-  KAFFINITY  Processors;
-  ULONG  SamplingPeriod;
-  ULONG  CurrentTemperature;
-  ULONG  PassiveTripPoint;
-  ULONG  CriticalTripPoint;
-  UCHAR  ActiveTripPointCount;
-  ULONG  ActiveTripPoint[MAX_ACTIVE_COOLING_LEVELS];
-} THERMAL_INFORMATION, *PTHERMAL_INFORMATION;
-
-typedef struct _PROCESSOR_OBJECT_INFO {
-	ULONG  PhysicalID;
-	ULONG  PBlkAddress;
-	UCHAR  PBlkLength;
-} PROCESSOR_OBJECT_INFO, *PPROCESSOR_OBJECT_INFO;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __POCLASS_H */
diff --git a/winsup/w32api/include/ddk/scsi.h b/winsup/w32api/include/ddk/scsi.h
deleted file mode 100644
index 727ba6c3e..000000000
--- a/winsup/w32api/include/ddk/scsi.h
+++ /dev/null
@@ -1,1698 +0,0 @@
-/*
- * scsi.h
- *
- * SCSI port and class interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __SCSI_H
-#define __SCSI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-typedef union _CDB {
-  struct _CDB6GENERIC {
-    UCHAR  OperationCode;
-    UCHAR  Immediate : 1;
-    UCHAR  CommandUniqueBits : 4;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  CommandUniqueBytes[3];
-    UCHAR  Link : 1;
-    UCHAR  Flag : 1;
-    UCHAR  Reserved : 4;
-    UCHAR  VendorUnique : 2;
-  } CDB6GENERIC, *PCDB6GENERIC;
-  
-  struct _CDB6READWRITE {
-    UCHAR  OperationCode;
-    UCHAR  LogicalBlockMsb1 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  LogicalBlockMsb0;
-    UCHAR  LogicalBlockLsb;
-    UCHAR  TransferBlocks;
-    UCHAR  Control;
-  } CDB6READWRITE, *PCDB6READWRITE;
-  
-  struct _CDB6INQUIRY {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  PageCode;
-    UCHAR  IReserved;
-    UCHAR  AllocationLength;
-    UCHAR  Control;
-  } CDB6INQUIRY, *PCDB6INQUIRY;
-  
-  struct _CDB6INQUIRY3 {
-    UCHAR  OperationCode;
-    UCHAR  EnableVitalProductData : 1;
-    UCHAR  CommandSupportData : 1;
-    UCHAR  Reserved1 : 6;
-    UCHAR  PageCode;
-    UCHAR  Reserved2;
-    UCHAR  AllocationLength;
-    UCHAR  Control;
-  } CDB6INQUIRY3, *PCDB6INQUIRY3;
-  
-  struct _CDB6VERIFY {
-    UCHAR  OperationCode;
-    UCHAR  Fixed : 1;
-    UCHAR  ByteCompare : 1;
-    UCHAR  Immediate : 1;
-    UCHAR  Reserved : 2;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  VerificationLength[3];
-    UCHAR  Control;
-  } CDB6VERIFY, *PCDB6VERIFY;
-  
-  struct _CDB6FORMAT {
-    UCHAR  OperationCode;
-    UCHAR  FormatControl : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  FReserved1;
-    UCHAR  InterleaveMsb;
-    UCHAR  InterleaveLsb;
-    UCHAR  FReserved2;
-  } CDB6FORMAT, *PCDB6FORMAT;
-  
-  struct _CDB10 {
-    UCHAR  OperationCode;
-    UCHAR  RelativeAddress : 1;
-    UCHAR  Reserved1 : 2;
-    UCHAR  ForceUnitAccess : 1;
-    UCHAR  DisablePageOut : 1;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  LogicalBlockByte0;
-    UCHAR  LogicalBlockByte1;
-    UCHAR  LogicalBlockByte2;
-    UCHAR  LogicalBlockByte3;
-    UCHAR  Reserved2;
-    UCHAR  TransferBlocksMsb;
-    UCHAR  TransferBlocksLsb;
-    UCHAR  Control;
-  } CDB10, *PCDB10;
-  
-  struct _CDB12 {
-    UCHAR  OperationCode;
-    UCHAR  RelativeAddress : 1;
-    UCHAR  Reserved1 : 2;
-    UCHAR  ForceUnitAccess : 1;
-    UCHAR  DisablePageOut : 1;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  LogicalBlock[4];
-    UCHAR  TransferLength[4];
-    UCHAR  Reserved2;
-    UCHAR  Control;
-  } CDB12, *PCDB12;
-  
-  struct _PAUSE_RESUME {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Reserved2[6];
-    UCHAR  Action;
-    UCHAR  Control;
-  } PAUSE_RESUME, *PPAUSE_RESUME;
-  
-  struct _READ_TOC {
-    UCHAR  OperationCode;
-    UCHAR  Reserved0 : 1;
-    UCHAR  Msf : 1;
-    UCHAR  Reserved1 : 3;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Format2 : 4;
-    UCHAR  Reserved2 : 4;
-    UCHAR  Reserved3[3];
-    UCHAR  StartingTrack;
-    UCHAR  AllocationLength[2];
-    UCHAR  Control : 6;
-    UCHAR  Format : 2;
-  } READ_TOC, *PREAD_TOC;
-  
-  struct _READ_DISK_INFORMATION {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  Lun : 3;
-    UCHAR  Reserved2[5];
-    UCHAR  AllocationLength[2];
-    UCHAR  Control;
-  } READ_DISK_INFORMATION, *PREAD_DISK_INFORMATION;
-  
-  struct _READ_TRACK_INFORMATION {
-    UCHAR  OperationCode;
-    UCHAR  Track : 1;
-    UCHAR  Reserved1 : 3;
-    UCHAR  Reserved2 : 1;
-    UCHAR  Lun : 3;
-    UCHAR  BlockAddress[4];
-    UCHAR  Reserved3;
-    UCHAR  AllocationLength[2];
-    UCHAR  Control;
-  } READ_TRACK_INFORMATION, *PREAD_TRACK_INFORMATION;
-  
-  struct _RESERVE_TRACK_RZONE {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1[4];
-    UCHAR  ReservationSize[4];
-    UCHAR  Control;
-  } RESERVE_TRACK_RZONE, *PRESERVE_TRACK_RZONE;
-  
-  struct _SEND_OPC_INFORMATION {
-    UCHAR  OperationCode;
-    UCHAR  DoOpc    : 1;
-    UCHAR  Reserved : 7;
-    UCHAR  Reserved1[5];
-    UCHAR  ParameterListLength[2];
-    UCHAR  Reserved2;
-  } SEND_OPC_INFORMATION, *PSEND_OPC_INFORMATION;
-  
-  struct _CLOSE_TRACK {
-    UCHAR  OperationCode;
-    UCHAR  Immediate : 1;
-    UCHAR  Reserved1 : 7;
-    UCHAR  Track     : 1;
-    UCHAR  Session   : 1;
-    UCHAR  Reserved2 : 6;
-    UCHAR  Reserved3;
-    UCHAR  TrackNumber[2];
-    UCHAR  Reserved4[3];
-    UCHAR  Control;
-  } CLOSE_TRACK, *PCLOSE_TRACK;
-  
-  struct _SEND_CUE_SHEET {
-    UCHAR  OperationCode;
-    UCHAR  Reserved[5];
-    UCHAR  CueSheetSize[3];
-    UCHAR  Control;
-  } SEND_CUE_SHEET, *PSEND_CUE_SHEET;
-  
-  struct _READ_HEADER {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 1;
-    UCHAR  Msf : 1;
-    UCHAR  Reserved2 : 3;
-    UCHAR  Lun : 3;
-    UCHAR  LogicalBlockAddress[4];
-    UCHAR  Reserved3;
-    UCHAR  AllocationLength[2];
-    UCHAR  Control;
-  } READ_HEADER, *PREAD_HEADER;
-  
-  struct _PLAY_AUDIO {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  StartingBlockAddress[4];
-    UCHAR  Reserved2;
-    UCHAR  PlayLength[2];
-    UCHAR  Control;
-  } PLAY_AUDIO, *PPLAY_AUDIO;
-  
-  struct _PLAY_AUDIO_MSF { 
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Reserved2;
-    UCHAR  StartingM;
-    UCHAR  StartingS;
-    UCHAR  StartingF;
-    UCHAR  EndingM;
-    UCHAR  EndingS;
-    UCHAR  EndingF;
-    UCHAR  Control;
-  } PLAY_AUDIO_MSF, *PPLAY_AUDIO_MSF;
-  
-/* FIXME: Should the union be anonymous in C++ too?  If so,
-   can't define named types _LBA and _MSF within anonymous union
-   for C++. */ 	
-  struct _PLAY_CD {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 1;
-    UCHAR  CMSF : 1;
-    UCHAR  ExpectedSectorType : 3;
-    UCHAR  Lun : 3;
-#ifndef __cplusplus
-  _ANONYMOUS_UNION
-#endif
-  union {
-      struct _LBA {
-            UCHAR  StartingBlockAddress[4];
-            UCHAR  PlayLength[4];
-      } LBA;
-  
-      struct _MSF {
-            UCHAR  Reserved1;
-            UCHAR  StartingM;
-            UCHAR  StartingS;
-            UCHAR  StartingF;
-            UCHAR  EndingM;
-            UCHAR  EndingS;
-            UCHAR  EndingF;
-            UCHAR  Reserved2;
-      } MSF;
-  #ifndef __cplusplus
-  }DUMMYUNIONNAME;
-  #else
-  }u;
-  #endif
-  
-    UCHAR  Audio : 1;
-    UCHAR  Composite : 1;
-    UCHAR  Port1 : 1;
-    UCHAR  Port2 : 1;
-    UCHAR  Reserved2 : 3;
-    UCHAR  Speed : 1;
-    UCHAR  Control;
-  } PLAY_CD, *PPLAY_CD;
-  
-  struct _SCAN_CD {
-    UCHAR  OperationCode;
-    UCHAR  RelativeAddress : 1;
-    UCHAR  Reserved1 : 3;
-    UCHAR  Direct : 1;
-    UCHAR  Lun : 3;
-    UCHAR  StartingAddress[4];
-    UCHAR  Reserved2[3];
-    UCHAR  Reserved3 : 6;
-    UCHAR  Type : 2;
-    UCHAR  Reserved4;
-    UCHAR  Control;
-  } SCAN_CD, *PSCAN_CD;
-  
-  struct _STOP_PLAY_SCAN {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  Lun : 3;
-    UCHAR  Reserved2[7];
-    UCHAR  Control;
-  } STOP_PLAY_SCAN, *PSTOP_PLAY_SCAN;
-  
-  struct _SUBCHANNEL {
-    UCHAR  OperationCode;
-    UCHAR  Reserved0 : 1;
-    UCHAR  Msf : 1;
-    UCHAR  Reserved1 : 3;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Reserved2 : 6;
-    UCHAR  SubQ : 1;
-    UCHAR  Reserved3 : 1;
-    UCHAR  Format;
-    UCHAR  Reserved4[2];
-    UCHAR  TrackNumber;
-    UCHAR  AllocationLength[2];
-    UCHAR  Control;
-  } SUBCHANNEL, *PSUBCHANNEL;
-  
-  struct _READ_CD { 
-    UCHAR  OperationCode;
-    UCHAR  RelativeAddress : 1;
-    UCHAR  Reserved0 : 1;
-    UCHAR  ExpectedSectorType : 3;
-    UCHAR  Lun : 3;
-    UCHAR  StartingLBA[4];
-    UCHAR  TransferBlocks[3];
-    UCHAR  Reserved2 : 1;
-    UCHAR  ErrorFlags : 2;
-    UCHAR  IncludeEDC : 1;
-    UCHAR  IncludeUserData : 1;
-    UCHAR  HeaderCode : 2;
-    UCHAR  IncludeSyncData : 1;
-    UCHAR  SubChannelSelection : 3;
-    UCHAR  Reserved3 : 5;
-    UCHAR  Control;
-  } READ_CD, *PREAD_CD;
-  
-  struct _READ_CD_MSF {
-    UCHAR  OperationCode;
-    UCHAR  RelativeAddress : 1;
-    UCHAR  Reserved1 : 1;
-    UCHAR  ExpectedSectorType : 3;
-    UCHAR  Lun : 3;
-    UCHAR  Reserved2;
-    UCHAR  StartingM;
-    UCHAR  StartingS;
-    UCHAR  StartingF;
-    UCHAR  EndingM;
-    UCHAR  EndingS;
-    UCHAR  EndingF;
-    UCHAR  Reserved3;
-    UCHAR  Reserved4 : 1;
-    UCHAR  ErrorFlags : 2;
-    UCHAR  IncludeEDC : 1;
-    UCHAR  IncludeUserData : 1;
-    UCHAR  HeaderCode : 2;
-    UCHAR  IncludeSyncData : 1;
-    UCHAR  SubChannelSelection : 3;
-    UCHAR  Reserved5 : 5;
-    UCHAR  Control;
-  } READ_CD_MSF, *PREAD_CD_MSF;
-  
-  struct _PLXTR_READ_CDDA {
-    UCHAR  OperationCode;
-    UCHAR  Reserved0 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  LogicalBlockByte0;
-    UCHAR  LogicalBlockByte1;
-    UCHAR  LogicalBlockByte2;
-    UCHAR  LogicalBlockByte3;
-    UCHAR  TransferBlockByte0;
-    UCHAR  TransferBlockByte1;
-    UCHAR  TransferBlockByte2;
-    UCHAR  TransferBlockByte3;
-    UCHAR  SubCode;
-    UCHAR  Control;
-  } PLXTR_READ_CDDA, *PPLXTR_READ_CDDA;
-  
-  struct _NEC_READ_CDDA {
-    UCHAR  OperationCode;
-    UCHAR  Reserved0;
-    UCHAR  LogicalBlockByte0;
-    UCHAR  LogicalBlockByte1;
-    UCHAR  LogicalBlockByte2;
-    UCHAR  LogicalBlockByte3;
-    UCHAR  Reserved1;
-    UCHAR  TransferBlockByte0;
-    UCHAR  TransferBlockByte1;
-    UCHAR  Control;
-  } NEC_READ_CDDA, *PNEC_READ_CDDA;
-  
-  struct _MODE_SENSE {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 3;
-    UCHAR  Dbd : 1;
-    UCHAR  Reserved2 : 1;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  PageCode : 6;
-    UCHAR  Pc : 2;
-    UCHAR  Reserved3;
-    UCHAR  AllocationLength;
-    UCHAR  Control;
-  } MODE_SENSE, *PMODE_SENSE;
-  
-  struct _MODE_SENSE10 {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 3;
-    UCHAR  Dbd : 1;
-    UCHAR  Reserved2 : 1;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  PageCode : 6;
-    UCHAR  Pc : 2;
-    UCHAR  Reserved3[4];
-    UCHAR  AllocationLength[2];
-    UCHAR  Control;
-  } MODE_SENSE10, *PMODE_SENSE10;
-  
-  struct _MODE_SELECT {
-    UCHAR  OperationCode;
-    UCHAR  SPBit : 1;
-    UCHAR  Reserved1 : 3;
-    UCHAR  PFBit : 1;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Reserved2[2];
-    UCHAR  ParameterListLength;
-    UCHAR  Control;
-  } MODE_SELECT, *PMODE_SELECT;
-  
-  struct _MODE_SELECT10 {
-    UCHAR  OperationCode;
-    UCHAR  SPBit : 1;
-    UCHAR  Reserved1 : 3;
-    UCHAR  PFBit : 1;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Reserved2[5];
-    UCHAR  ParameterListLength[2];
-    UCHAR  Control;
-  } MODE_SELECT10, *PMODE_SELECT10;
-  
-  struct _LOCATE {
-    UCHAR  OperationCode;
-    UCHAR  Immediate : 1;
-    UCHAR  CPBit : 1;
-    UCHAR  BTBit : 1;
-    UCHAR  Reserved1 : 2;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Reserved3;
-    UCHAR  LogicalBlockAddress[4];
-    UCHAR  Reserved4;
-    UCHAR  Partition;
-    UCHAR  Control;
-  } LOCATE, *PLOCATE;
-  
-  struct _LOGSENSE {
-    UCHAR  OperationCode;
-    UCHAR  SPBit : 1;
-    UCHAR  PPCBit : 1;
-    UCHAR  Reserved1 : 3;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  PageCode : 6;
-    UCHAR  PCBit : 2;
-    UCHAR  Reserved2;
-    UCHAR  Reserved3;
-    UCHAR  ParameterPointer[2];
-    UCHAR  AllocationLength[2];
-    UCHAR  Control;
-  } LOGSENSE, *PLOGSENSE;
-  
-  struct _LOGSELECT {
-    UCHAR  OperationCode;
-    UCHAR  SPBit : 1;
-    UCHAR  PCRBit : 1;
-    UCHAR  Reserved1 : 3;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Reserved : 6;
-    UCHAR  PCBit : 2;
-    UCHAR  Reserved2[4];
-    UCHAR  ParameterListLength[2];
-    UCHAR  Control;
-  } LOGSELECT, *PLOGSELECT;
-  
-  struct _PRINT {
-    UCHAR  OperationCode;
-    UCHAR  Reserved : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  TransferLength[3];
-    UCHAR  Control;
-  } PRINT, *PPRINT;
-  
-  struct _SEEK {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  LogicalBlockAddress[4];
-    UCHAR  Reserved2[3];
-    UCHAR  Control;
-  } SEEK, *PSEEK;
-  
-  struct _ERASE {
-    UCHAR  OperationCode;
-    UCHAR  Long : 1;
-    UCHAR  Immediate : 1;
-    UCHAR  Reserved1 : 3;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Reserved2[3];
-    UCHAR  Control;
-  } ERASE, *PERASE;
-  
-  struct _START_STOP {
-    UCHAR  OperationCode;
-    UCHAR  Immediate: 1;
-    UCHAR  Reserved1 : 4;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Reserved2[2];
-    UCHAR  Start : 1;
-    UCHAR  LoadEject : 1;
-    UCHAR  Reserved3 : 6;
-    UCHAR  Control;
-  } START_STOP, *PSTART_STOP;
-  
-  struct _MEDIA_REMOVAL {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  Reserved2[2];
-  
-    UCHAR  Prevent : 1;
-    UCHAR  Persistant : 1;
-    UCHAR  Reserved3 : 6;
-  
-    UCHAR  Control;
-  } MEDIA_REMOVAL, *PMEDIA_REMOVAL;
-  
-  struct _SEEK_BLOCK {
-    UCHAR  OperationCode;
-    UCHAR  Immediate : 1;
-    UCHAR  Reserved1 : 7;
-    UCHAR  BlockAddress[3];
-    UCHAR  Link : 1;
-    UCHAR  Flag : 1;
-    UCHAR  Reserved2 : 4;
-    UCHAR  VendorUnique : 2;
-  } SEEK_BLOCK, *PSEEK_BLOCK;
-  
-  struct _REQUEST_BLOCK_ADDRESS {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1[3];
-    UCHAR  AllocationLength;
-    UCHAR  Link : 1;
-    UCHAR  Flag : 1;
-    UCHAR  Reserved2 : 4;
-    UCHAR  VendorUnique : 2;
-  } REQUEST_BLOCK_ADDRESS, *PREQUEST_BLOCK_ADDRESS;
-  
-  struct _PARTITION {
-    UCHAR  OperationCode;
-    UCHAR  Immediate : 1;
-    UCHAR  Sel: 1;
-    UCHAR  PartitionSelect : 6;
-    UCHAR  Reserved1[3];
-    UCHAR  Control;
-  } PARTITION, *PPARTITION;
-  
-  struct _WRITE_TAPE_MARKS {
-    UCHAR  OperationCode;
-    UCHAR  Immediate : 1;
-    UCHAR  WriteSetMarks: 1;
-    UCHAR  Reserved : 3;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  TransferLength[3];
-    UCHAR  Control;
-  } WRITE_TAPE_MARKS, *PWRITE_TAPE_MARKS;
-  
-  struct _SPACE_TAPE_MARKS {
-    UCHAR  OperationCode;
-    UCHAR  Code : 3;
-    UCHAR  Reserved : 2;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  NumMarksMSB ;
-    UCHAR  NumMarks;
-    UCHAR  NumMarksLSB;
-  union {
-        UCHAR  value;
-      struct {
-            UCHAR  Link : 1;
-            UCHAR  Flag : 1;
-            UCHAR  Reserved : 4;
-            UCHAR  VendorUnique : 2;
-      } Fields;
-  } Byte6;
-  } SPACE_TAPE_MARKS, *PSPACE_TAPE_MARKS;
-  
-  struct _READ_POSITION {
-    UCHAR  Operation;
-    UCHAR  BlockType : 1;
-    UCHAR  Reserved1 : 4;
-    UCHAR  Lun : 3;
-    UCHAR  Reserved2[7];
-    UCHAR  Control;
-  } READ_POSITION, *PREAD_POSITION;
-  
-  struct _CDB6READWRITETAPE {
-    UCHAR  OperationCode;
-    UCHAR  VendorSpecific : 5;
-    UCHAR  Reserved : 3;
-    UCHAR  TransferLenMSB;
-    UCHAR  TransferLen;
-    UCHAR  TransferLenLSB;
-    UCHAR  Link : 1;
-    UCHAR  Flag : 1;
-    UCHAR  Reserved1 : 4;
-    UCHAR  VendorUnique : 2;
-  } CDB6READWRITETAPE, *PCDB6READWRITETAPE;
-  
-  struct _INIT_ELEMENT_STATUS {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  LogicalUnitNubmer : 3;
-    UCHAR  Reserved2[3];
-    UCHAR  Reserved3 : 7;
-    UCHAR  NoBarCode : 1;
-  } INIT_ELEMENT_STATUS, *PINIT_ELEMENT_STATUS;
-  
-  struct _INITIALIZE_ELEMENT_RANGE {
-    UCHAR  OperationCode;
-    UCHAR  Range : 1;
-    UCHAR  Reserved1 : 4;
-    UCHAR  LogicalUnitNubmer : 3;
-    UCHAR  FirstElementAddress[2];
-    UCHAR  Reserved2[2];
-    UCHAR  NumberOfElements[2];
-    UCHAR  Reserved3;
-    UCHAR  Reserved4 : 7;
-    UCHAR  NoBarCode : 1;
-  } INITIALIZE_ELEMENT_RANGE, *PINITIALIZE_ELEMENT_RANGE;
-  
-  struct _POSITION_TO_ELEMENT {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  TransportElementAddress[2];
-    UCHAR  DestinationElementAddress[2];
-    UCHAR  Reserved2[2];
-    UCHAR  Flip : 1;
-    UCHAR  Reserved3 : 7;
-    UCHAR  Control;
-  } POSITION_TO_ELEMENT, *PPOSITION_TO_ELEMENT;
-  
-  struct _MOVE_MEDIUM {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  TransportElementAddress[2];
-    UCHAR  SourceElementAddress[2];
-    UCHAR  DestinationElementAddress[2];
-    UCHAR  Reserved2[2];
-    UCHAR  Flip : 1;
-    UCHAR  Reserved3 : 7;
-    UCHAR  Control;
-  } MOVE_MEDIUM, *PMOVE_MEDIUM;
-  
-  struct _EXCHANGE_MEDIUM {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  TransportElementAddress[2];
-    UCHAR  SourceElementAddress[2];
-    UCHAR  Destination1ElementAddress[2];
-    UCHAR  Destination2ElementAddress[2];
-    UCHAR  Flip1 : 1;
-    UCHAR  Flip2 : 1;
-    UCHAR  Reserved3 : 6;
-    UCHAR  Control;
-  } EXCHANGE_MEDIUM, *PEXCHANGE_MEDIUM;
-  
-  struct _READ_ELEMENT_STATUS {
-    UCHAR  OperationCode;
-    UCHAR  ElementType : 4;
-    UCHAR  VolTag : 1;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  StartingElementAddress[2];
-    UCHAR  NumberOfElements[2];
-    UCHAR  Reserved1;
-    UCHAR  AllocationLength[3];
-    UCHAR  Reserved2;
-    UCHAR  Control;
-  } READ_ELEMENT_STATUS, *PREAD_ELEMENT_STATUS;
-  
-  struct _SEND_VOLUME_TAG {
-    UCHAR  OperationCode;
-    UCHAR  ElementType : 4;
-    UCHAR  Reserved1 : 1;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  StartingElementAddress[2];
-    UCHAR  Reserved2;
-    UCHAR  ActionCode : 5;
-    UCHAR  Reserved3 : 3;
-    UCHAR  Reserved4[2];
-    UCHAR  ParameterListLength[2];
-    UCHAR  Reserved5;
-    UCHAR  Control;
-  } SEND_VOLUME_TAG, *PSEND_VOLUME_TAG;
-  
-  struct _REQUEST_VOLUME_ELEMENT_ADDRESS {
-    UCHAR  OperationCode;
-    UCHAR  ElementType : 4;
-    UCHAR  VolTag : 1;
-    UCHAR  LogicalUnitNumber : 3;
-    UCHAR  StartingElementAddress[2];
-    UCHAR  NumberElements[2];
-    UCHAR  Reserved1;
-    UCHAR  AllocationLength[3];
-    UCHAR  Reserved2;
-    UCHAR  Control;
-  } REQUEST_VOLUME_ELEMENT_ADDRESS, *PREQUEST_VOLUME_ELEMENT_ADDRESS;
-  
-  struct _LOAD_UNLOAD {
-    UCHAR  OperationCode;
-    UCHAR  Immediate : 1;
-    UCHAR  Reserved1 : 4;
-    UCHAR  Lun : 3;
-    UCHAR  Reserved2[2];
-    UCHAR  Start : 1;
-    UCHAR  LoadEject : 1;
-    UCHAR  Reserved3: 6;
-    UCHAR  Reserved4[3];
-    UCHAR  Slot;
-    UCHAR  Reserved5[3];
-  } LOAD_UNLOAD, *PLOAD_UNLOAD;
-  
-  struct _MECH_STATUS {
-    UCHAR  OperationCode;
-    UCHAR  Reserved : 5;
-    UCHAR  Lun : 3;
-    UCHAR  Reserved1[6];
-    UCHAR  AllocationLength[2];
-    UCHAR  Reserved2[1];
-    UCHAR  Control;
-  } MECH_STATUS, *PMECH_STATUS;
-  
-  struct _SYNCHRONIZE_CACHE10 {
-  
-    UCHAR  OperationCode;
-  
-    UCHAR  RelAddr : 1;
-    UCHAR  Immediate : 1;
-    UCHAR  Reserved : 3;
-    UCHAR  Lun : 3;
-  
-    UCHAR  LogicalBlockAddress[4];
-    UCHAR  Reserved2;
-    UCHAR  BlockCount[2];
-    UCHAR  Control;
-  } SYNCHRONIZE_CACHE10, *PSYNCHRONIZE_CACHE10;
-  
-  struct _GET_EVENT_STATUS_NOTIFICATION {
-    UCHAR  OperationCode;
-  
-    UCHAR  Immediate : 1;
-    UCHAR  Reserved : 4;
-    UCHAR  Lun : 3;
-  
-    UCHAR  Reserved2[2];
-    UCHAR  NotificationClassRequest;
-    UCHAR  Reserved3[2];
-    UCHAR  EventListLength[2];
-  
-    UCHAR  Control;
-  } GET_EVENT_STATUS_NOTIFICATION, *PGET_EVENT_STATUS_NOTIFICATION;
-  
-  struct _READ_DVD_STRUCTURE {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  Lun : 3;
-    UCHAR  RMDBlockNumber[4];
-    UCHAR  LayerNumber;
-    UCHAR  Format;
-    UCHAR  AllocationLength[2];
-    UCHAR  Reserved3 : 6;
-    UCHAR  AGID : 2;
-    UCHAR  Control;
-  } READ_DVD_STRUCTURE, *PREAD_DVD_STRUCTURE;
-  
-  struct _SEND_DVD_STRUCTURE {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  Lun : 3;
-    UCHAR  Reserved2[5];
-    UCHAR  Format;
-    UCHAR  ParameterListLength[2];
-    UCHAR  Reserved3;
-    UCHAR  Control;
-  } SEND_DVD_STRUCTURE, *PSEND_DVD_STRUCTURE;
-  
-  struct _SEND_KEY {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  Lun : 3;
-    UCHAR  Reserved2[6];
-    UCHAR  ParameterListLength[2];
-    UCHAR  KeyFormat : 6;
-    UCHAR  AGID : 2;
-    UCHAR  Control;
-  } SEND_KEY, *PSEND_KEY;
-  
-  struct _REPORT_KEY {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  Lun : 3;
-    UCHAR  LogicalBlockAddress[4];
-    UCHAR  Reserved2[2];
-    UCHAR  AllocationLength[2];
-    UCHAR  KeyFormat : 6;
-    UCHAR  AGID : 2;
-    UCHAR  Control;
-  } REPORT_KEY, *PREPORT_KEY;
-  
-  struct _SET_READ_AHEAD {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  Lun : 3;
-    UCHAR  TriggerLBA[4];
-    UCHAR  ReadAheadLBA[4];
-    UCHAR  Reserved2;
-    UCHAR  Control;
-  } SET_READ_AHEAD, *PSET_READ_AHEAD;
-  
-  struct _READ_FORMATTED_CAPACITIES {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1 : 5;
-    UCHAR  Lun : 3;
-    UCHAR  Reserved2[5];
-    UCHAR  AllocationLength[2];
-    UCHAR  Control;
-  } READ_FORMATTED_CAPACITIES, *PREAD_FORMATTED_CAPACITIES;
-  
-  struct _REPORT_LUNS {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1[5];
-    UCHAR  AllocationLength[4];
-    UCHAR  Reserved2[1];
-    UCHAR  Control;
-  } REPORT_LUNS, *PREPORT_LUNS;
-  
-  struct _PERSISTENT_RESERVE_IN {
-    UCHAR  OperationCode;
-    UCHAR  ServiceAction : 5;
-    UCHAR  Reserved1 : 3;
-    UCHAR  Reserved2[5];
-    UCHAR  AllocationLength[2];
-    UCHAR  Control;
-  } PERSISTENT_RESERVE_IN, *PPERSISTENT_RESERVE_IN;
-  
-  struct _PERSISTENT_RESERVE_OUT {
-    UCHAR  OperationCode;
-    UCHAR  ServiceAction : 5;
-    UCHAR  Reserved1 : 3;
-    UCHAR  Type : 4;
-    UCHAR  Scope : 4;
-    UCHAR  Reserved2[4];
-    UCHAR  ParameterListLength[2];
-    UCHAR  Control;
-  } PERSISTENT_RESERVE_OUT, *PPERSISTENT_RESERVE_OUT;
-  
-  struct _GET_CONFIGURATION {
-    UCHAR  OperationCode;
-    UCHAR  RequestType : 1;
-    UCHAR  Reserved1   : 7;
-    UCHAR  StartingFeature[2];
-    UCHAR  Reserved2[3];
-    UCHAR  AllocationLength[2];
-    UCHAR  Control;
-  } GET_CONFIGURATION, *PGET_CONFIGURATION;
-  
-  struct _SET_CD_SPEED {
-    UCHAR  OperationCode;
-    UCHAR  Reserved1;
-    UCHAR  ReadSpeed[2];
-    UCHAR  WriteSpeed[2];
-    UCHAR  Reserved2[5];
-    UCHAR  Control;
-  } SET_CD_SPEED, *PSET_CD_SPEED;
-  
-  ULONG AsUlong[4];
-    UCHAR  AsByte[16];
-} CDB, *PCDB;
-
-#ifndef _INQUIRYDATA_DEFINED /* also in minitape.h */
-#define _INQUIRYDATA_DEFINED
-
-#define INQUIRYDATABUFFERSIZE             36
-
-typedef struct _INQUIRYDATA {
-  UCHAR  DeviceType : 5;
-  UCHAR  DeviceTypeQualifier : 3;
-  UCHAR  DeviceTypeModifier : 7;
-  UCHAR  RemovableMedia : 1;
-  _ANONYMOUS_UNION union {
-    UCHAR  Versions;
-    _ANONYMOUS_STRUCT struct {
-      UCHAR  ANSIVersion : 3;
-      UCHAR  ECMAVersion : 3;
-      UCHAR  ISOVersion : 2;
-    } DUMMYSTRUCTNAME;
-  } DUMMYUNIONNAME;
-  UCHAR  ResponseDataFormat : 4;
-  UCHAR  HiSupport : 1;
-  UCHAR  NormACA : 1;
-  UCHAR  TerminateTask : 1;
-  UCHAR  AERC : 1;
-  UCHAR  AdditionalLength;
-  UCHAR  Reserved;
-  UCHAR  Addr16 : 1;
-  UCHAR  Addr32 : 1;
-  UCHAR  AckReqQ: 1;
-  UCHAR  MediumChanger : 1;
-  UCHAR  MultiPort : 1;
-  UCHAR  ReservedBit2 : 1;
-  UCHAR  EnclosureServices : 1;
-  UCHAR  ReservedBit3 : 1;
-  UCHAR  SoftReset : 1;
-  UCHAR  CommandQueue : 1;
-  UCHAR  TransferDisable : 1;
-  UCHAR  LinkedCommands : 1;
-  UCHAR  Synchronous : 1;
-  UCHAR  Wide16Bit : 1;
-  UCHAR  Wide32Bit : 1;
-  UCHAR  RelativeAddressing : 1;
-  UCHAR  VendorId[8];
-  UCHAR  ProductId[16];
-  UCHAR  ProductRevisionLevel[4];
-  UCHAR  VendorSpecific[20];
-  UCHAR  Reserved3[40];
-} INQUIRYDATA, *PINQUIRYDATA;
-#endif
-
-/* INQUIRYDATA.DeviceType constants */
-#define DIRECT_ACCESS_DEVICE              0x00
-#define SEQUENTIAL_ACCESS_DEVICE          0x01
-#define PRINTER_DEVICE                    0x02
-#define PROCESSOR_DEVICE                  0x03
-#define WRITE_ONCE_READ_MULTIPLE_DEVICE   0x04
-#define READ_ONLY_DIRECT_ACCESS_DEVICE    0x05
-#define SCANNER_DEVICE                    0x06
-#define OPTICAL_DEVICE                    0x07
-#define MEDIUM_CHANGER                    0x08
-#define COMMUNICATION_DEVICE              0x09
-#define LOGICAL_UNIT_NOT_PRESENT_DEVICE   0x7F
-#define DEVICE_QUALIFIER_NOT_SUPPORTED    0x03
-
-/* INQUIRYDATA.DeviceTypeQualifier constants */
-#define DEVICE_CONNECTED 0x00
-
-#define SCSISTAT_GOOD                     0x00
-#define SCSISTAT_CHECK_CONDITION          0x02
-#define SCSISTAT_CONDITION_MET            0x04
-#define SCSISTAT_BUSY                     0x08
-#define SCSISTAT_INTERMEDIATE             0x10
-#define SCSISTAT_INTERMEDIATE_COND_MET    0x14
-#define SCSISTAT_RESERVATION_CONFLICT     0x18
-#define SCSISTAT_COMMAND_TERMINATED       0x22
-#define SCSISTAT_QUEUE_FULL               0x28
-
-/* Mode Sense/Select page constants */
-#define MODE_PAGE_ERROR_RECOVERY          0x01
-#define MODE_PAGE_DISCONNECT              0x02
-#define MODE_PAGE_FORMAT_DEVICE           0x03
-#define MODE_PAGE_RIGID_GEOMETRY          0x04
-#define MODE_PAGE_FLEXIBILE               0x05
-#define MODE_PAGE_WRITE_PARAMETERS        0x05
-#define MODE_PAGE_VERIFY_ERROR            0x07
-#define MODE_PAGE_CACHING                 0x08
-#define MODE_PAGE_PERIPHERAL              0x09
-#define MODE_PAGE_CONTROL                 0x0A
-#define MODE_PAGE_MEDIUM_TYPES            0x0B
-#define MODE_PAGE_NOTCH_PARTITION         0x0C
-#define MODE_PAGE_CD_AUDIO_CONTROL        0x0E
-#define MODE_PAGE_DATA_COMPRESS           0x0F
-#define MODE_PAGE_DEVICE_CONFIG           0x10
-#define MODE_PAGE_MEDIUM_PARTITION        0x11
-#define MODE_PAGE_CDVD_FEATURE_SET        0x18
-#define MODE_PAGE_POWER_CONDITION         0x1A
-#define MODE_PAGE_FAULT_REPORTING         0x1C
-#define MODE_PAGE_CDVD_INACTIVITY         0x1D
-#define MODE_PAGE_ELEMENT_ADDRESS         0x1D
-#define MODE_PAGE_TRANSPORT_GEOMETRY      0x1E
-#define MODE_PAGE_DEVICE_CAPABILITIES     0x1F
-#define MODE_PAGE_CAPABILITIES            0x2A
-#define MODE_SENSE_RETURN_ALL             0x3f
-#define MODE_SENSE_CURRENT_VALUES         0x00
-#define MODE_SENSE_CHANGEABLE_VALUES      0x40
-#define MODE_SENSE_DEFAULT_VAULES         0x80
-#define MODE_SENSE_SAVED_VALUES           0xc0
-
-/* SCSI CDB operation codes */
-#define SCSIOP_TEST_UNIT_READY            0x00
-#define SCSIOP_REZERO_UNIT                0x01
-#define SCSIOP_REWIND                     0x01
-#define SCSIOP_REQUEST_BLOCK_ADDR         0x02
-#define SCSIOP_REQUEST_SENSE              0x03
-#define SCSIOP_FORMAT_UNIT                0x04
-#define SCSIOP_READ_BLOCK_LIMITS          0x05
-#define SCSIOP_REASSIGN_BLOCKS            0x07
-#define SCSIOP_INIT_ELEMENT_STATUS        0x07
-#define SCSIOP_READ6                      0x08
-#define SCSIOP_RECEIVE                    0x08
-#define SCSIOP_WRITE6                     0x0A
-#define SCSIOP_PRINT                      0x0A
-#define SCSIOP_SEND                       0x0A
-#define SCSIOP_SEEK6                      0x0B
-#define SCSIOP_TRACK_SELECT               0x0B
-#define SCSIOP_SLEW_PRINT                 0x0B
-#define SCSIOP_SEEK_BLOCK                 0x0C
-#define SCSIOP_PARTITION                  0x0D
-#define SCSIOP_READ_REVERSE               0x0F
-#define SCSIOP_WRITE_FILEMARKS            0x10
-#define SCSIOP_FLUSH_BUFFER               0x10
-#define SCSIOP_SPACE                      0x11
-#define SCSIOP_INQUIRY                    0x12
-#define SCSIOP_VERIFY6                    0x13
-#define SCSIOP_RECOVER_BUF_DATA           0x14
-#define SCSIOP_MODE_SELECT                0x15
-#define SCSIOP_RESERVE_UNIT               0x16
-#define SCSIOP_RELEASE_UNIT               0x17
-#define SCSIOP_COPY                       0x18
-#define SCSIOP_ERASE                      0x19
-#define SCSIOP_MODE_SENSE                 0x1A
-#define SCSIOP_START_STOP_UNIT            0x1B
-#define SCSIOP_STOP_PRINT                 0x1B
-#define SCSIOP_LOAD_UNLOAD                0x1B
-#define SCSIOP_RECEIVE_DIAGNOSTIC         0x1C
-#define SCSIOP_SEND_DIAGNOSTIC            0x1D
-#define SCSIOP_MEDIUM_REMOVAL             0x1E
-
-#define SCSIOP_READ_FORMATTED_CAPACITY    0x23
-#define SCSIOP_READ_CAPACITY              0x25
-#define SCSIOP_READ                       0x28
-#define SCSIOP_WRITE                      0x2A
-#define SCSIOP_SEEK                       0x2B
-#define SCSIOP_LOCATE                     0x2B
-#define SCSIOP_POSITION_TO_ELEMENT        0x2B
-#define SCSIOP_WRITE_VERIFY               0x2E
-#define SCSIOP_VERIFY                     0x2F
-#define SCSIOP_SEARCH_DATA_HIGH           0x30
-#define SCSIOP_SEARCH_DATA_EQUAL          0x31
-#define SCSIOP_SEARCH_DATA_LOW            0x32
-#define SCSIOP_SET_LIMITS                 0x33
-#define SCSIOP_READ_POSITION              0x34
-#define SCSIOP_SYNCHRONIZE_CACHE          0x35
-#define SCSIOP_COMPARE                    0x39
-#define SCSIOP_COPY_COMPARE               0x3A
-#define SCSIOP_WRITE_DATA_BUFF            0x3B
-#define SCSIOP_READ_DATA_BUFF             0x3C
-#define SCSIOP_CHANGE_DEFINITION          0x40
-#define SCSIOP_READ_SUB_CHANNEL           0x42
-#define SCSIOP_READ_TOC                   0x43
-#define SCSIOP_READ_HEADER                0x44
-#define SCSIOP_PLAY_AUDIO                 0x45
-#define SCSIOP_GET_CONFIGURATION          0x46
-#define SCSIOP_PLAY_AUDIO_MSF             0x47
-#define SCSIOP_PLAY_TRACK_INDEX           0x48
-#define SCSIOP_PLAY_TRACK_RELATIVE        0x49
-#define SCSIOP_GET_EVENT_STATUS           0x4A
-#define SCSIOP_PAUSE_RESUME               0x4B
-#define SCSIOP_LOG_SELECT                 0x4C
-#define SCSIOP_LOG_SENSE                  0x4D
-#define SCSIOP_STOP_PLAY_SCAN             0x4E
-#define SCSIOP_READ_DISK_INFORMATION      0x51
-#define SCSIOP_READ_TRACK_INFORMATION     0x52
-#define SCSIOP_RESERVE_TRACK_RZONE        0x53
-#define SCSIOP_SEND_OPC_INFORMATION       0x54
-#define SCSIOP_MODE_SELECT10              0x55
-#define SCSIOP_MODE_SENSE10               0x5A
-#define SCSIOP_CLOSE_TRACK_SESSION        0x5B
-#define SCSIOP_READ_BUFFER_CAPACITY       0x5C
-#define SCSIOP_SEND_CUE_SHEET             0x5D
-#define SCSIOP_PERSISTENT_RESERVE_IN      0x5E
-#define SCSIOP_PERSISTENT_RESERVE_OUT     0x5F
-
-#define SCSIOP_REPORT_LUNS                0xA0
-#define SCSIOP_BLANK                      0xA1
-#define SCSIOP_SEND_KEY                   0xA3
-#define SCSIOP_REPORT_KEY                 0xA4
-#define SCSIOP_MOVE_MEDIUM                0xA5
-#define SCSIOP_LOAD_UNLOAD_SLOT           0xA6
-#define SCSIOP_EXCHANGE_MEDIUM            0xA6
-#define SCSIOP_SET_READ_AHEAD             0xA7
-#define SCSIOP_READ_DVD_STRUCTURE         0xAD
-#define SCSIOP_REQUEST_VOL_ELEMENT        0xB5
-#define SCSIOP_SEND_VOLUME_TAG            0xB6
-#define SCSIOP_READ_ELEMENT_STATUS        0xB8
-#define SCSIOP_READ_CD_MSF                0xB9
-#define SCSIOP_SCAN_CD                    0xBA
-#define SCSIOP_SET_CD_SPEED               0xBB
-#define SCSIOP_PLAY_CD                    0xBC
-#define SCSIOP_MECHANISM_STATUS           0xBD
-#define SCSIOP_READ_CD                    0xBE
-#define SCSIOP_SEND_DVD_STRUCTURE         0xBF
-#define SCSIOP_INIT_ELEMENT_RANGE         0xE7
-
-#define SCSIOP_DENON_EJECT_DISC           0xE6
-#define SCSIOP_DENON_STOP_AUDIO           0xE7
-#define SCSIOP_DENON_PLAY_AUDIO           0xE8
-#define SCSIOP_DENON_READ_TOC             0xE9
-#define SCSIOP_DENON_READ_SUBCODE         0xEB
-
-#define SCSIMESS_MODIFY_DATA_POINTER      0x00
-#define SCSIMESS_SYNCHRONOUS_DATA_REQ     0x01
-#define SCSIMESS_WIDE_DATA_REQUEST        0x03
-
-#define SCSIMESS_MODIFY_DATA_LENGTH       5
-#define SCSIMESS_SYNCH_DATA_LENGTH        3
-#define SCSIMESS_WIDE_DATA_LENGTH         2
-
-#define SCSIMESS_ABORT                    0x06
-#define SCSIMESS_ABORT_WITH_TAG           0x0D
-#define SCSIMESS_BUS_DEVICE_RESET         0x0C
-#define SCSIMESS_CLEAR_QUEUE              0x0E
-#define SCSIMESS_COMMAND_COMPLETE         0x00
-#define SCSIMESS_DISCONNECT               0x04
-#define SCSIMESS_EXTENDED_MESSAGE         0x01
-#define SCSIMESS_IDENTIFY                 0x80
-#define SCSIMESS_IDENTIFY_WITH_DISCON     0xC0
-#define SCSIMESS_IGNORE_WIDE_RESIDUE      0x23
-#define SCSIMESS_INITIATE_RECOVERY        0x0F
-#define SCSIMESS_INIT_DETECTED_ERROR      0x05
-#define SCSIMESS_LINK_CMD_COMP            0x0A
-#define SCSIMESS_LINK_CMD_COMP_W_FLAG     0x0B
-#define SCSIMESS_MESS_PARITY_ERROR        0x09
-#define SCSIMESS_MESSAGE_REJECT           0x07
-#define SCSIMESS_NO_OPERATION             0x08
-#define SCSIMESS_HEAD_OF_QUEUE_TAG        0x21
-#define SCSIMESS_ORDERED_QUEUE_TAG        0x22
-#define SCSIMESS_SIMPLE_QUEUE_TAG         0x20
-#define SCSIMESS_RELEASE_RECOVERY         0x10
-#define SCSIMESS_RESTORE_POINTERS         0x03
-#define SCSIMESS_SAVE_DATA_POINTER        0x02
-#define SCSIMESS_TERMINATE_IO_PROCESS     0x11
-
-#define CDB_FORCE_MEDIA_ACCESS            0x08
-
-#define CDB_RETURN_ON_COMPLETION          0
-#define CDB_RETURN_IMMEDIATE              1
-
-#define CDB_INQUIRY_EVPD                  0x01
-
-#define LUN0_FORMAT_SAVING_DEFECT_LIST    0
-#define USE_DEFAULTMSB                    0
-#define USE_DEFAULTLSB                    0
-
-#define START_UNIT_CODE                   0x01
-#define STOP_UNIT_CODE                    0x00
-
-typedef struct _SENSE_DATA {
-  UCHAR  ErrorCode : 7;
-  UCHAR  Valid : 1;
-  UCHAR  SegmentNumber;
-  UCHAR  SenseKey : 4;
-  UCHAR  Reserved : 1;
-  UCHAR  IncorrectLength : 1;
-  UCHAR  EndOfMedia : 1;
-  UCHAR  FileMark : 1;
-  UCHAR  Information[4];
-  UCHAR  AdditionalSenseLength;
-  UCHAR  CommandSpecificInformation[4];
-  UCHAR  AdditionalSenseCode;
-  UCHAR  AdditionalSenseCodeQualifier;
-  UCHAR  FieldReplaceableUnitCode;
-  UCHAR  SenseKeySpecific[3];
-} SENSE_DATA, *PSENSE_DATA;
-
-#define SENSE_BUFFER_SIZE                 18
-
-/* Sense codes */
-#define SCSI_SENSE_NO_SENSE               0x00
-#define SCSI_SENSE_RECOVERED_ERROR        0x01
-#define SCSI_SENSE_NOT_READY              0x02
-#define SCSI_SENSE_MEDIUM_ERROR           0x03
-#define SCSI_SENSE_HARDWARE_ERROR         0x04
-#define SCSI_SENSE_ILLEGAL_REQUEST        0x05
-#define SCSI_SENSE_UNIT_ATTENTION         0x06
-#define SCSI_SENSE_DATA_PROTECT           0x07
-#define SCSI_SENSE_BLANK_CHECK            0x08
-#define SCSI_SENSE_UNIQUE                 0x09
-#define SCSI_SENSE_COPY_ABORTED           0x0A
-#define SCSI_SENSE_ABORTED_COMMAND        0x0B
-#define SCSI_SENSE_EQUAL                  0x0C
-#define SCSI_SENSE_VOL_OVERFLOW           0x0D
-#define SCSI_SENSE_MISCOMPARE             0x0E
-#define SCSI_SENSE_RESERVED               0x0F
-
-/* Additional tape bit */
-#define SCSI_ILLEGAL_LENGTH               0x20
-#define SCSI_EOM                          0x40
-#define SCSI_FILE_MARK                    0x80
-
-/* Additional Sense codes */
-#define SCSI_ADSENSE_NO_SENSE                              0x00
-#define SCSI_ADSENSE_NO_SEEK_COMPLETE                      0x02
-#define SCSI_ADSENSE_LUN_NOT_READY                         0x04
-#define SCSI_ADSENSE_WRITE_ERROR                           0x0C
-#define SCSI_ADSENSE_TRACK_ERROR                           0x14
-#define SCSI_ADSENSE_SEEK_ERROR                            0x15
-#define SCSI_ADSENSE_REC_DATA_NOECC                        0x17
-#define SCSI_ADSENSE_REC_DATA_ECC                          0x18
-#define SCSI_ADSENSE_ILLEGAL_COMMAND                       0x20
-#define SCSI_ADSENSE_ILLEGAL_BLOCK                         0x21
-#define SCSI_ADSENSE_INVALID_CDB                           0x24
-#define SCSI_ADSENSE_INVALID_LUN                           0x25
-#define SCSI_ADSENSE_WRITE_PROTECT                         0x27
-#define SCSI_ADSENSE_MEDIUM_CHANGED                        0x28
-#define SCSI_ADSENSE_BUS_RESET                             0x29
-#define SCSI_ADSENSE_INSUFFICIENT_TIME_FOR_OPERATION       0x2E
-#define SCSI_ADSENSE_INVALID_MEDIA                         0x30
-#define SCSI_ADSENSE_NO_MEDIA_IN_DEVICE                    0x3a
-#define SCSI_ADSENSE_POSITION_ERROR                        0x3b
-#define SCSI_ADSENSE_OPERATOR_REQUEST                      0x5a
-#define SCSI_ADSENSE_FAILURE_PREDICTION_THRESHOLD_EXCEEDED 0x5d
-#define SCSI_ADSENSE_ILLEGAL_MODE_FOR_THIS_TRACK           0x64
-#define SCSI_ADSENSE_COPY_PROTECTION_FAILURE               0x6f
-#define SCSI_ADSENSE_POWER_CALIBRATION_ERROR               0x73
-#define SCSI_ADSENSE_VENDOR_UNIQUE                         0x80
-#define SCSI_ADSENSE_MUSIC_AREA                            0xA0
-#define SCSI_ADSENSE_DATA_AREA                             0xA1
-#define SCSI_ADSENSE_VOLUME_OVERFLOW                       0xA7
-
-#define SCSI_SENSEQ_CAUSE_NOT_REPORTABLE                   0x00
-#define SCSI_SENSEQ_BECOMING_READY                         0x01
-#define SCSI_SENSEQ_INIT_COMMAND_REQUIRED                  0x02
-#define SCSI_SENSEQ_MANUAL_INTERVENTION_REQUIRED           0x03
-#define SCSI_SENSEQ_FORMAT_IN_PROGRESS                     0x04
-#define SCSI_SENSEQ_REBUILD_IN_PROGRESS                    0x05
-#define SCSI_SENSEQ_RECALCULATION_IN_PROGRESS              0x06
-#define SCSI_SENSEQ_OPERATION_IN_PROGRESS                  0x07
-#define SCSI_SENSEQ_LONG_WRITE_IN_PROGRESS                 0x08
-#define SCSI_SENSEQ_LOSS_OF_STREAMING                      0x09
-#define SCSI_SENSEQ_PADDING_BLOCKS_ADDED                   0x0A
-
-
-#define FILE_DEVICE_SCSI 0x0000001b
-
-#define IOCTL_SCSI_EXECUTE_IN ((FILE_DEVICE_SCSI << 16) + 0x0011)
-#define IOCTL_SCSI_EXECUTE_OUT ((FILE_DEVICE_SCSI << 16) + 0x0012)
-#define IOCTL_SCSI_EXECUTE_NONE ((FILE_DEVICE_SCSI << 16) + 0x0013)
-
-/* SMART support in ATAPI */
-#define IOCTL_SCSI_MINIPORT_SMART_VERSION               ((FILE_DEVICE_SCSI << 16) + 0x0500)
-#define IOCTL_SCSI_MINIPORT_IDENTIFY                    ((FILE_DEVICE_SCSI << 16) + 0x0501)
-#define IOCTL_SCSI_MINIPORT_READ_SMART_ATTRIBS          ((FILE_DEVICE_SCSI << 16) + 0x0502)
-#define IOCTL_SCSI_MINIPORT_READ_SMART_THRESHOLDS       ((FILE_DEVICE_SCSI << 16) + 0x0503)
-#define IOCTL_SCSI_MINIPORT_ENABLE_SMART                ((FILE_DEVICE_SCSI << 16) + 0x0504)
-#define IOCTL_SCSI_MINIPORT_DISABLE_SMART               ((FILE_DEVICE_SCSI << 16) + 0x0505)
-#define IOCTL_SCSI_MINIPORT_RETURN_STATUS               ((FILE_DEVICE_SCSI << 16) + 0x0506)
-#define IOCTL_SCSI_MINIPORT_ENABLE_DISABLE_AUTOSAVE     ((FILE_DEVICE_SCSI << 16) + 0x0507)
-#define IOCTL_SCSI_MINIPORT_SAVE_ATTRIBUTE_VALUES       ((FILE_DEVICE_SCSI << 16) + 0x0508)
-#define IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS       ((FILE_DEVICE_SCSI << 16) + 0x0509)
-#define IOCTL_SCSI_MINIPORT_ENABLE_DISABLE_AUTO_OFFLINE ((FILE_DEVICE_SCSI << 16) + 0x050a)
-#define IOCTL_SCSI_MINIPORT_READ_SMART_LOG              ((FILE_DEVICE_SCSI << 16) + 0x050b)
-#define IOCTL_SCSI_MINIPORT_WRITE_SMART_LOG             ((FILE_DEVICE_SCSI << 16) + 0x050c)
-
-/* CLUSTER support */
-#define IOCTL_SCSI_MINIPORT_NOT_QUORUM_CAPABLE  ((FILE_DEVICE_SCSI << 16) + 0x0520)
-#define IOCTL_SCSI_MINIPORT_NOT_CLUSTER_CAPABLE ((FILE_DEVICE_SCSI << 16) + 0x0521)
-
-/* Read Capacity Data. Returned in Big Endian format */
-typedef struct _READ_CAPACITY_DATA {
-  ULONG  LogicalBlockAddress;
-  ULONG  BytesPerBlock;
-} READ_CAPACITY_DATA, *PREAD_CAPACITY_DATA;
-
-/* Read Block Limits Data. Returned in Big Endian format */
-typedef struct _READ_BLOCK_LIMITS {
-  UCHAR  Reserved;
-  UCHAR  BlockMaximumSize[3];
-  UCHAR  BlockMinimumSize[2];
-} READ_BLOCK_LIMITS_DATA, *PREAD_BLOCK_LIMITS_DATA;
-
-
-typedef struct _MODE_PARAMETER_HEADER {
-  UCHAR  ModeDataLength;
-  UCHAR  MediumType;
-  UCHAR  DeviceSpecificParameter;
-  UCHAR  BlockDescriptorLength;
-}MODE_PARAMETER_HEADER, *PMODE_PARAMETER_HEADER;
-
-typedef struct _MODE_PARAMETER_HEADER10 {
-  UCHAR  ModeDataLength[2];
-  UCHAR  MediumType;
-  UCHAR  DeviceSpecificParameter;
-  UCHAR  Reserved[2];
-  UCHAR  BlockDescriptorLength[2];
-} MODE_PARAMETER_HEADER10, *PMODE_PARAMETER_HEADER10;
-
-#define MODE_FD_SINGLE_SIDE               0x01
-#define MODE_FD_DOUBLE_SIDE               0x02
-#define MODE_FD_MAXIMUM_TYPE              0x1E
-#define MODE_DSP_FUA_SUPPORTED            0x10
-#define MODE_DSP_WRITE_PROTECT            0x80
-
-typedef struct _MODE_PARAMETER_BLOCK {
-  UCHAR  DensityCode;
-  UCHAR  NumberOfBlocks[3];
-  UCHAR  Reserved;
-  UCHAR  BlockLength[3];
-} MODE_PARAMETER_BLOCK, *PMODE_PARAMETER_BLOCK;
-
-typedef struct _MODE_DISCONNECT_PAGE {
-  UCHAR  PageCode : 6;
-  UCHAR  Reserved : 1;
-  UCHAR  PageSavable : 1;
-  UCHAR  PageLength;
-  UCHAR  BufferFullRatio;
-  UCHAR  BufferEmptyRatio;
-  UCHAR  BusInactivityLimit[2];
-  UCHAR  BusDisconnectTime[2];
-  UCHAR  BusConnectTime[2];
-  UCHAR  MaximumBurstSize[2];
-  UCHAR  DataTransferDisconnect : 2;
-  UCHAR  Reserved2[3];
-}MODE_DISCONNECT_PAGE, *PMODE_DISCONNECT_PAGE;
-
-typedef struct _MODE_CACHING_PAGE {
-  UCHAR  PageCode : 6;
-  UCHAR  Reserved : 1;
-  UCHAR  PageSavable : 1;
-  UCHAR  PageLength;
-  UCHAR  ReadDisableCache : 1;
-  UCHAR  MultiplicationFactor : 1;
-  UCHAR  WriteCacheEnable : 1;
-  UCHAR  Reserved2 : 5;
-  UCHAR  WriteRetensionPriority : 4;
-  UCHAR  ReadRetensionPriority : 4;
-  UCHAR  DisablePrefetchTransfer[2];
-  UCHAR  MinimumPrefetch[2];
-  UCHAR  MaximumPrefetch[2];
-  UCHAR  MaximumPrefetchCeiling[2];
-}MODE_CACHING_PAGE, *PMODE_CACHING_PAGE;
-
-typedef struct _MODE_CDROM_WRITE_PARAMETERS_PAGE {
-  UCHAR  PageLength;
-  UCHAR  WriteType : 4;
-  UCHAR  TestWrite : 1;
-  UCHAR  LinkSizeValid : 1;
-  UCHAR  BufferUnderrunFreeEnabled : 1;
-  UCHAR  Reserved2 : 1;
-  UCHAR  TrackMode : 4;
-  UCHAR  Copy : 1;
-  UCHAR  FixedPacket : 1;
-  UCHAR  MultiSession : 2;
-  UCHAR  DataBlockType : 4;
-  UCHAR  Reserved3 : 4;    
-  UCHAR  LinkSize;
-  UCHAR  Reserved4;
-  UCHAR  HostApplicationCode : 6;
-  UCHAR  Reserved5 : 2;    
-  UCHAR  SessionFormat;
-  UCHAR  Reserved6;
-  UCHAR  PacketSize[4];
-  UCHAR  AudioPauseLength[2];
-  UCHAR  Reserved7 : 7;
-  UCHAR  MediaCatalogNumberValid : 1;
-  UCHAR  MediaCatalogNumber[13];
-  UCHAR  MediaCatalogNumberZero;
-  UCHAR  MediaCatalogNumberAFrame;
-  UCHAR  Reserved8 : 7;
-  UCHAR  ISRCValid : 1;
-  UCHAR  ISRCCountry[2];
-  UCHAR  ISRCOwner[3];
-  UCHAR  ISRCRecordingYear[2];
-  UCHAR  ISRCSerialNumber[5];
-  UCHAR  ISRCZero;
-  UCHAR  ISRCAFrame;
-  UCHAR  ISRCReserved;
-  UCHAR  SubHeaderData[4];
-} MODE_CDROM_WRITE_PARAMETERS_PAGE, *PMODE_CDROM_WRITE_PARAMETERS_PAGE;
-
-typedef struct _MODE_FLEXIBLE_DISK_PAGE {
-  UCHAR  PageCode : 6;
-  UCHAR  Reserved : 1;
-  UCHAR  PageSavable : 1;
-  UCHAR  PageLength;
-  UCHAR  TransferRate[2];
-  UCHAR  NumberOfHeads;
-  UCHAR  SectorsPerTrack;
-  UCHAR  BytesPerSector[2];
-  UCHAR  NumberOfCylinders[2];
-  UCHAR  StartWritePrecom[2];
-  UCHAR  StartReducedCurrent[2];
-  UCHAR  StepRate[2];
-  UCHAR  StepPluseWidth;
-  UCHAR  HeadSettleDelay[2];
-  UCHAR  MotorOnDelay;
-  UCHAR  MotorOffDelay;
-  UCHAR  Reserved2 : 5;
-  UCHAR  MotorOnAsserted : 1;
-  UCHAR  StartSectorNumber : 1;
-  UCHAR  TrueReadySignal : 1;
-  UCHAR  StepPlusePerCyclynder : 4;
-  UCHAR  Reserved3 : 4;
-  UCHAR  WriteCompenstation;
-  UCHAR  HeadLoadDelay;
-  UCHAR  HeadUnloadDelay;
-  UCHAR  Pin2Usage : 4;
-  UCHAR  Pin34Usage : 4;
-  UCHAR  Pin1Usage : 4;
-  UCHAR  Pin4Usage : 4;
-  UCHAR  MediumRotationRate[2];
-  UCHAR  Reserved4[2];
-} MODE_FLEXIBLE_DISK_PAGE, *PMODE_FLEXIBLE_DISK_PAGE;
-
-typedef struct _MODE_FORMAT_PAGE {
-  UCHAR  PageCode : 6;
-  UCHAR  Reserved : 1;
-  UCHAR  PageSavable : 1;
-  UCHAR  PageLength;
-  UCHAR  TracksPerZone[2];
-  UCHAR  AlternateSectorsPerZone[2];
-  UCHAR  AlternateTracksPerZone[2];
-  UCHAR  AlternateTracksPerLogicalUnit[2];
-  UCHAR  SectorsPerTrack[2];
-  UCHAR  BytesPerPhysicalSector[2];
-  UCHAR  Interleave[2];
-  UCHAR  TrackSkewFactor[2];
-  UCHAR  CylinderSkewFactor[2];
-  UCHAR  Reserved2 : 4;
-  UCHAR  SurfaceFirst : 1;
-  UCHAR  RemovableMedia : 1;
-  UCHAR  HardSectorFormating : 1;
-  UCHAR  SoftSectorFormating : 1;
-  UCHAR  Reserved3[3];
-} MODE_FORMAT_PAGE, *PMODE_FORMAT_PAGE;
-
-typedef struct _MODE_RIGID_GEOMETRY_PAGE {
-  UCHAR  PageCode : 6;
-  UCHAR  Reserved : 1;
-  UCHAR  PageSavable : 1;
-  UCHAR  PageLength;
-  UCHAR  NumberOfCylinders[3];
-  UCHAR  NumberOfHeads;
-  UCHAR  StartWritePrecom[3];
-  UCHAR  StartReducedCurrent[3];
-  UCHAR  DriveStepRate[2];
-  UCHAR  LandZoneCyclinder[3];
-  UCHAR  RotationalPositionLock : 2;
-  UCHAR  Reserved2 : 6;
-  UCHAR  RotationOffset;
-  UCHAR  Reserved3;
-  UCHAR  RoataionRate[2];
-  UCHAR  Reserved4[2];
-} MODE_RIGID_GEOMETRY_PAGE, *PMODE_RIGID_GEOMETRY_PAGE;
-
-typedef struct _MODE_READ_WRITE_RECOVERY_PAGE {
-  UCHAR  PageCode : 6;
-  UCHAR  Reserved1 : 1;
-  UCHAR  PSBit : 1;
-  UCHAR  PageLength;
-  UCHAR  DCRBit : 1;
-  UCHAR  DTEBit : 1;
-  UCHAR  PERBit : 1;
-  UCHAR  EERBit : 1;
-  UCHAR  RCBit : 1;
-  UCHAR  TBBit : 1;
-  UCHAR  ARRE : 1;
-  UCHAR  AWRE : 1;
-  UCHAR  ReadRetryCount;
-  UCHAR  Reserved4[4];
-  UCHAR  WriteRetryCount;
-  UCHAR  Reserved5[3];
-} MODE_READ_WRITE_RECOVERY_PAGE, *PMODE_READ_WRITE_RECOVERY_PAGE;
-
-typedef struct _MODE_READ_RECOVERY_PAGE {
-  UCHAR  PageCode : 6;
-  UCHAR  Reserved1 : 1;
-  UCHAR  PSBit : 1;
-  UCHAR  PageLength;
-  UCHAR  DCRBit : 1;
-  UCHAR  DTEBit : 1;
-  UCHAR  PERBit : 1;
-  UCHAR  Reserved2 : 1;
-  UCHAR  RCBit : 1;
-  UCHAR  TBBit : 1;
-  UCHAR  Reserved3 : 2;
-  UCHAR  ReadRetryCount;
-  UCHAR  Reserved4[4];
-} MODE_READ_RECOVERY_PAGE, *PMODE_READ_RECOVERY_PAGE;
-
-typedef struct _MODE_INFO_EXCEPTIONS {
-  UCHAR  PageCode : 6;
-  UCHAR  Reserved1 : 1;
-  UCHAR  PSBit : 1;
-  UCHAR  PageLength;
-  _ANONYMOUS_UNION union {
-    UCHAR  Flags;
-    _ANONYMOUS_STRUCT struct {
-      UCHAR  LogErr : 1;
-      UCHAR  Reserved2 : 1;
-      UCHAR  Test : 1;
-      UCHAR  Dexcpt : 1;
-      UCHAR  Reserved3 : 3;
-      UCHAR  Perf : 1;
-    } DUMMYSTRUCTNAME;
-  } DUMMYUNIONNAME;
-  UCHAR  ReportMethod : 4;
-  UCHAR  Reserved4 : 4;
-  UCHAR  IntervalTimer[4];
-  UCHAR  ReportCount[4];
-} MODE_INFO_EXCEPTIONS, *PMODE_INFO_EXCEPTIONS;
-
-/* CDROM audio control */
-#define CDB_AUDIO_PAUSE                   0x00
-#define CDB_AUDIO_RESUME                  0x01
-#define CDB_DEVICE_START                  0x11
-#define CDB_DEVICE_STOP                   0x10
-#define CDB_EJECT_MEDIA                   0x10
-#define CDB_LOAD_MEDIA                    0x01
-#define CDB_SUBCHANNEL_HEADER             0x00
-#define CDB_SUBCHANNEL_BLOCK              0x01
-
-#define CDROM_AUDIO_CONTROL_PAGE          0x0E
-#define MODE_SELECT_IMMEDIATE             0x04
-#define MODE_SELECT_PFBIT                 0x10
-
-#define CDB_USE_MSF                       0x01
-
-typedef struct _PORT_OUTPUT {
-  UCHAR  ChannelSelection;
-  UCHAR  Volume;
-} PORT_OUTPUT, *PPORT_OUTPUT;
-
-typedef struct _AUDIO_OUTPUT {
-  UCHAR  CodePage;
-  UCHAR  ParameterLength;
-  UCHAR  Immediate;
-  UCHAR  Reserved[2];
-  UCHAR  LbaFormat;
-  UCHAR  LogicalBlocksPerSecond[2];
-  PORT_OUTPUT  PortOutput[4];
-} AUDIO_OUTPUT, *PAUDIO_OUTPUT;
-
-/* Multisession CDROMs */
-#define GET_LAST_SESSION 0x01
-#define GET_SESSION_DATA 0x02;
-
-/* Atapi 2.5 changers */
-typedef struct _MECHANICAL_STATUS_INFORMATION_HEADER {
-  UCHAR  CurrentSlot : 5;
-  UCHAR  ChangerState : 2;
-  UCHAR  Fault : 1;
-  UCHAR  Reserved : 5;
-  UCHAR  MechanismState : 3;
-  UCHAR  CurrentLogicalBlockAddress[3];
-  UCHAR  NumberAvailableSlots;
-  UCHAR  SlotTableLength[2];
-} MECHANICAL_STATUS_INFORMATION_HEADER, *PMECHANICAL_STATUS_INFORMATION_HEADER;
-
-typedef struct _SLOT_TABLE_INFORMATION {
-  UCHAR  DiscChanged : 1;
-  UCHAR  Reserved : 6;
-  UCHAR  DiscPresent : 1;
-  UCHAR  Reserved2[3];
-} SLOT_TABLE_INFORMATION, *PSLOT_TABLE_INFORMATION;
-
-typedef struct _MECHANICAL_STATUS {
-  MECHANICAL_STATUS_INFORMATION_HEADER  MechanicalStatusHeader;
-  SLOT_TABLE_INFORMATION  SlotTableInfo[1];
-} MECHANICAL_STATUS, *PMECHANICAL_STATUS;
-
-
-/* Tape definitions */
-typedef struct _TAPE_POSITION_DATA {
-	UCHAR  Reserved1 : 2;
-	UCHAR  BlockPositionUnsupported : 1;
-	UCHAR  Reserved2 : 3;
-	UCHAR  EndOfPartition : 1;
-	UCHAR  BeginningOfPartition : 1;
-	UCHAR  PartitionNumber;
-	USHORT  Reserved3;
-	UCHAR  FirstBlock[4];
-	UCHAR  LastBlock[4];
-	UCHAR  Reserved4;
-	UCHAR  NumberOfBlocks[3];
-	UCHAR  NumberOfBytes[4];
-} TAPE_POSITION_DATA, *PTAPE_POSITION_DATA;
-
-/* This structure is used to convert little endian ULONGs
-   to SCSI CDB big endians values. */
-typedef union _EIGHT_BYTE {
-  _ANONYMOUS_STRUCT struct {
-    UCHAR  Byte0;
-    UCHAR  Byte1;
-    UCHAR  Byte2;
-    UCHAR  Byte3;
-    UCHAR  Byte4;
-    UCHAR  Byte5;
-    UCHAR  Byte6;
-    UCHAR  Byte7;
-  } DUMMYSTRUCTNAME;
-  ULONGLONG  AsULongLong;
-} EIGHT_BYTE, *PEIGHT_BYTE;
-
-typedef union _FOUR_BYTE {
-  _ANONYMOUS_STRUCT struct {
-    UCHAR  Byte0;
-    UCHAR  Byte1;
-    UCHAR  Byte2;
-    UCHAR  Byte3;
-  } DUMMYSTRUCTNAME;
-  ULONG  AsULong;
-} FOUR_BYTE, *PFOUR_BYTE;
-
-typedef union _TWO_BYTE {
-  _ANONYMOUS_STRUCT struct {
-    UCHAR  Byte0;
-    UCHAR  Byte1;
-  } DUMMYSTRUCTNAME;
-  USHORT  AsUShort;
-} TWO_BYTE, *PTWO_BYTE;
-
-/* Byte reversing macro for converting between
-   big- and little-endian formats */
-#define REVERSE_BYTES_QUAD(Destination, Source) { \
-    PEIGHT_BYTE _val1 = (PEIGHT_BYTE)(Destination); \
-    PEIGHT_BYTE _val2 = (PEIGHT_BYTE)(Source); \
-    _val1->Byte7 = _val2->Byte0; \
-    _val1->Byte6 = _val2->Byte1; \
-    _val1->Byte5 = _val2->Byte2; \
-    _val1->Byte4 = _val2->Byte3; \
-    _val1->Byte3 = _val2->Byte4; \
-    _val1->Byte2 = _val2->Byte5; \
-    _val1->Byte1 = _val2->Byte6; \
-    _val1->Byte0 = _val2->Byte7; \
-}
-
-#define REVERSE_BYTES(Destination, Source) { \
-    PFOUR_BYTE _val1 = (PFOUR_BYTE)(Destination); \
-    PFOUR_BYTE _val2 = (PFOUR_BYTE)(Source); \
-    _val1->Byte3 = _val2->Byte0; \
-    _val1->Byte2 = _val2->Byte1; \
-    _val1->Byte1 = _val2->Byte2; \
-    _val1->Byte0 = _val2->Byte3; \
-}
-
-#define REVERSE_BYTES_SHORT(Destination, Source) { \
-  PTWO_BYTE _val1 = (PTWO_BYTE)(Destination); \
-  PTWO_BYTE _val2 = (PTWO_BYTE)(Source); \
-  _val1->Byte1 = _val2->Byte0; \
-  _val1->Byte0 = _val2->Byte1; \
-}
-
-#define REVERSE_SHORT(Short) { \
-  UCHAR _val; \
-  PTWO_BYTE _val2 = (PTWO_BYTE)(Short); \
-  _val = _val2->Byte0; \
-  _val2->Byte0 = _val2->Byte1; \
-  _val2->Byte1 = _val; \
-}
-
-#define REVERSE_LONG(Long) { \
-  UCHAR _val; \
-  PFOUR_BYTE _val2 = (PFOUR_BYTE)(Long); \
-  _val = _val2->Byte3; \
-  _val2->Byte3 = _val2->Byte0; \
-  _val2->Byte0 = _val; \
-  _val = _val2->Byte2; \
-  _val2->Byte2 = _val2->Byte1; \
-  _val2->Byte1 = _val; \
-}
-
-#define WHICH_BIT(Data, Bit) { \
-  UCHAR _val; \
-  for (_val = 0; _val < 32; _val++) { \
-    if (((Data) >> _val) == 1) { \
-      break; \
-    } \
-  } \
-  assert(_val != 32); \
-  (Bit) = _val; \
-}
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SCSI_H */
diff --git a/winsup/w32api/include/ddk/scsiscan.h b/winsup/w32api/include/ddk/scsiscan.h
deleted file mode 100644
index 8d32ad342..000000000
--- a/winsup/w32api/include/ddk/scsiscan.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * scsiscan.h
- *
- * SCSI scanner driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __SCSISCAN_H
-#define __SCSISCAN_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define IOCTL_SCSISCAN_CMD \
-  CTL_CODE(FILE_DEVICE_SCANNER, SCSISCAN_CMD_CODE, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-#define IOCTL_SCSISCAN_LOCKDEVICE \
-  CTL_CODE(FILE_DEVICE_SCANNER, SCSISCAN_LOCKDEVICE, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-#define IOCTL_SCSISCAN_SET_TIMEOUT \
-  CTL_CODE(FILE_DEVICE_SCANNER, SCSISCAN_SET_TIMEOUT,	METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_SCSISCAN_GET_INFO \
-  CTL_CODE(FILE_DEVICE_SCANNER, SCSISCAN_GET_INFO, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-#define IOCTL_SCSISCAN_UNLOCKDEVICE \
-  CTL_CODE(FILE_DEVICE_SCANNER, SCSISCAN_UNLOCKDEVICE, METHOD_OUT_DIRECT, FILE_ANY_ACCESS)
-
-
-/* SCSISCAN_CMD.SrbFlags constants */
-#define SRB_FLAGS_DISABLE_SYNCH_TRANSFER  0x00000008
-#define SRB_FLAGS_DISABLE_AUTOSENSE       0x00000020
-#define SRB_FLAGS_DATA_IN                 0x00000040
-#define SRB_FLAGS_DATA_OUT                0x00000080
-#define SRB_FLAGS_NO_DATA_TRANSFER        0x00000000
-
-/* SCSISCAN_CMD.pSrbStatus constants */
-#define SRB_STATUS_PENDING                  0x00
-#define SRB_STATUS_SUCCESS                  0x01
-#define SRB_STATUS_ABORTED                  0x02
-#define SRB_STATUS_ABORT_FAILED             0x03
-#define SRB_STATUS_ERROR                    0x04
-#define SRB_STATUS_BUSY                     0x05
-#define SRB_STATUS_INVALID_REQUEST          0x06
-#define SRB_STATUS_INVALID_PATH_ID          0x07
-#define SRB_STATUS_NO_DEVICE                0x08
-#define SRB_STATUS_TIMEOUT                  0x09
-#define SRB_STATUS_SELECTION_TIMEOUT        0x0A
-#define SRB_STATUS_COMMAND_TIMEOUT          0x0B
-#define SRB_STATUS_MESSAGE_REJECTED         0x0D
-#define SRB_STATUS_BUS_RESET                0x0E
-#define SRB_STATUS_PARITY_ERROR             0x0F
-#define SRB_STATUS_REQUEST_SENSE_FAILED     0x10
-#define SRB_STATUS_NO_HBA                   0x11
-#define SRB_STATUS_DATA_OVERRUN             0x12
-#define SRB_STATUS_UNEXPECTED_BUS_FREE      0x13
-#define SRB_STATUS_PHASE_SEQUENCE_FAILURE   0x14
-#define SRB_STATUS_BAD_SRB_BLOCK_LENGTH     0x15
-#define SRB_STATUS_REQUEST_FLUSHED          0x16
-#define SRB_STATUS_INVALID_LUN              0x20
-#define SRB_STATUS_INVALID_TARGET_ID        0x21
-#define SRB_STATUS_BAD_FUNCTION             0x22
-#define SRB_STATUS_ERROR_RECOVERY           0x23
-#define SRB_STATUS_QUEUE_FROZEN             0x40
-#define SRB_STATUS_AUTOSENSE_VALID          0x80
-
-#define SRB_STATUS(Status) (Status & ~(SRB_STATUS_AUTOSENSE_VALID | SRB_STATUS_QUEUE_FROZEN))
-
-typedef struct _SCSISCAN_CMD {
-  ULONG  Reserved1;
-  ULONG  Size;
-  ULONG  SrbFlags;
-  UCHAR  CdbLength;
-  UCHAR  SenseLength;
-  UCHAR  Reserved2;
-  UCHAR  Reserved3;
-  ULONG  TransferLength;
-  UCHAR  Cdb[16];
-  PUCHAR  pSrbStatus;
-  PUCHAR  pSenseBuffer;
-} SCSISCAN_CMD, *PSCSISCAN_CMD;
-
-#define MAX_STRING 128
-
-/* SCSISCAN_INFO.Flags constants */
-#define SCSISCAN_RESERVED         0x000
-#define SCSISCAN_CMD_CODE         0x004
-#define SCSISCAN_LOCKDEVICE       0x005
-#define SCSISCAN_UNLOCKDEVICE     0x006
-#define SCSISCAN_SET_TIMEOUT      0x007
-#define SCSISCAN_GET_INFO         0x008
-
-typedef struct _SCSISCAN_INFO {
-  ULONG  Size;
-  ULONG  Flags;
-  UCHAR  PortNumber;
-  UCHAR  PathId;
-  UCHAR  TargetId;
-  UCHAR  Lun;
-  UCHAR  AdapterName[MAX_STRING];
-  ULONG  Reserved;
-} SCSISCAN_INFO, *PSCSISCAN_INFO;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SCSISCAN_H */
diff --git a/winsup/w32api/include/ddk/scsiwmi.h b/winsup/w32api/include/ddk/scsiwmi.h
deleted file mode 100644
index 684271593..000000000
--- a/winsup/w32api/include/ddk/scsiwmi.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * scsiwmi.h
- *
- * SCSI WMILIB interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __SCSIWMI_H
-#define __SCSIWMI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "srb.h"
-
-
-typedef struct _SCSIWMI_REQUEST_CONTEXT {
-  PVOID  UserContext;
-  ULONG  BufferSize;
-  PUCHAR  Buffer;
-  UCHAR  MinorFunction;
-  UCHAR  ReturnStatus;
-  ULONG  ReturnSize;
-} SCSIWMI_REQUEST_CONTEXT, *PSCSIWMI_REQUEST_CONTEXT;
-
-#ifdef _GUID_DEFINED
-# warning _GUID_DEFINED is deprecated, use GUID_DEFINED instead
-#endif
-
-#if ! (defined _GUID_DEFINED || defined GUID_DEFINED)
-#define GUID_DEFINED
-typedef struct _GUID {
-    unsigned long  Data1;
-    unsigned short Data2;
-    unsigned short Data3;
-    unsigned char  Data4[ 8 ];
-} GUID;
-#endif
-
-#ifndef _LPCGUID_DEFINED
-#define _LPCGUID_DEFINED
-typedef const GUID *LPCGUID;
-#endif
-
-typedef struct _SCSIWMIGUIDREGINFO {
-  LPCGUID  Guid;
-  ULONG  InstanceCount;
-  ULONG  Flags;
-} SCSIWMIGUIDREGINFO, *PSCSIWMIGUIDREGINFO;
-
-typedef UCHAR DDKAPI
-(*PSCSIWMI_QUERY_REGINFO)(
-	IN PVOID  DeviceContext,
-	IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-	OUT PWCHAR  *MofResourceName);
-
-typedef BOOLEAN DDKAPI
-(*PSCSIWMI_QUERY_DATABLOCK)(
-  IN PVOID  Context,
-  IN PSCSIWMI_REQUEST_CONTEXT  DispatchContext,
-  IN ULONG  GuidIndex,
-  IN ULONG  InstanceIndex,
-  IN ULONG  InstanceCount,
-  IN OUT PULONG  InstanceLengthArray,
-  IN ULONG  BufferAvail,
-  OUT PUCHAR  Buffer);
-
-typedef BOOLEAN DDKAPI
-(*PSCSIWMI_SET_DATABLOCK)(
-  IN PVOID  DeviceContext,
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN ULONG  GuidIndex,
-  IN ULONG  InstanceIndex,
-  IN ULONG  BufferSize,
-  IN PUCHAR  Buffer);
-
-typedef BOOLEAN DDKAPI
-(*PSCSIWMI_SET_DATAITEM)(
-  IN PVOID  DeviceContext,
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN ULONG  GuidIndex,
-  IN ULONG  InstanceIndex,
-  IN ULONG  DataItemId,
-  IN ULONG  BufferSize,
-  IN PUCHAR  Buffer);
-
-typedef BOOLEAN DDKAPI
-(*PSCSIWMI_EXECUTE_METHOD)(
-  IN PVOID  DeviceContext,
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN ULONG  GuidIndex,
-  IN ULONG  InstanceIndex,
-  IN ULONG  MethodId,
-  IN ULONG  InBufferSize,
-  IN ULONG  OutBufferSize,
-  IN OUT PUCHAR  Buffer);
-
-typedef enum _SCSIWMI_ENABLE_DISABLE_CONTROL {
-	ScsiWmiEventControl,
-	ScsiWmiDataBlockControl
-} SCSIWMI_ENABLE_DISABLE_CONTROL;
-
-typedef BOOLEAN DDKAPI
-(*PSCSIWMI_FUNCTION_CONTROL)(
-  IN PVOID  DeviceContext,
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN ULONG  GuidIndex,
-  IN SCSIWMI_ENABLE_DISABLE_CONTROL  Function,
-  IN BOOLEAN  Enable);
-
-typedef struct _SCSIWMILIB_CONTEXT {
-  ULONG  GuidCount;
-  PSCSIWMIGUIDREGINFO  GuidList;
-  PSCSIWMI_QUERY_REGINFO  QueryWmiRegInfo;
-  PSCSIWMI_QUERY_DATABLOCK  QueryWmiDataBlock;
-  PSCSIWMI_SET_DATABLOCK  SetWmiDataBlock;
-  PSCSIWMI_SET_DATAITEM  SetWmiDataItem;
-  PSCSIWMI_EXECUTE_METHOD  ExecuteWmiMethod;
-  PSCSIWMI_FUNCTION_CONTROL  WmiFunctionControl;
-} SCSI_WMILIB_CONTEXT, *PSCSI_WMILIB_CONTEXT;
-
-SCSIPORTAPI
-BOOLEAN
-DDKAPI
-ScsiPortWmiDispatchFunction(
-  IN PSCSI_WMILIB_CONTEXT  WmiLibInfo,
-  IN UCHAR  MinorFunction,
-  IN PVOID  DeviceContext,
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN PVOID  DataPath,
-  IN ULONG  BufferSize,
-  IN PVOID  Buffer);
-
-#define ScsiPortWmiFireAdapterEvent(  \
-  HwDeviceExtension,                  \
-  Guid,                               \
-  InstanceIndex,                      \
-  EventDataSize,                      \
-  EventData)                          \
-    ScsiPortWmiFireLogicalUnitEvent(  \
-	  HwDeviceExtension,                \
-	  0xff,                             \
-	  0,                                \
-	  0,                                \
-	  Guid,                             \
-	  InstanceIndex,                    \
-	  EventDataSize,                    \
-	  EventData)
-
-/*
- * ULONG
- * ScsiPortWmiGetReturnSize(
- *   PSCSIWMI_REQUEST_CONTEXT  RequestContext);
- */
-#define ScsiPortWmiGetReturnSize(RequestContext) \
-  ((RequestContext)->ReturnSize)
-
-/* UCHAR 
- * ScsiPortWmiGetReturnStatus(
- *   PSCSIWMI_REQUEST_CONTEXT  RequestContext);
- */ 
-#define ScsiPortWmiGetReturnStatus(RequestContext) \
-  ((RequestContext)->ReturnStatus)
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWmiPostProcess(
-  IN PSCSIWMI_REQUEST_CONTEXT  RequestContext,
-  IN UCHAR  SrbStatus,
-  IN ULONG  BufferUsed);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWmiFireLogicalUnitEvent(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN LPGUID  Guid,
-  IN ULONG  InstanceIndex,
-  IN ULONG  EventDataSize,
-  IN PVOID  EventData);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SCSIWMI_H */
diff --git a/winsup/w32api/include/ddk/smbus.h b/winsup/w32api/include/ddk/smbus.h
deleted file mode 100644
index 5444d374d..000000000
--- a/winsup/w32api/include/ddk/smbus.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * smbus.h
- *
- * System Management Bus driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __SMBUS_H
-#define __SMBUS_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#if !defined(SMBCLASS)
-  #define SMBCLASSAPI DECLSPEC_IMPORT
-#else
-  #define SMBCLASSAPI DECLSPEC_EXPORT
-#endif
-
-#define SMB_BUS_REQUEST \
-  CTL_CODE(FILE_DEVICE_UNKNOWN, 0, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define SMB_DEREGISTER_ALARM_NOTIFY \
-  CTL_CODE(FILE_DEVICE_UNKNOWN, 2, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define SMB_REGISTER_ALARM_NOTIFY \
-  CTL_CODE(FILE_DEVICE_UNKNOWN, 1, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-
-struct _SMB_CLASS;
-
-#define SMB_MAX_DATA_SIZE                 32
-
-/* SMB_REQUEST.Status constants */
-#define SMB_STATUS_OK                     0x00
-#define SMB_UNKNOWN_FAILURE               0x07
-#define SMB_ADDRESS_NOT_ACKNOWLEDGED      0x10
-#define SMB_DEVICE_ERROR                  0x11
-#define SMB_COMMAND_ACCESS_DENIED         0x12
-#define SMB_UNKNOWN_ERROR                 0x13
-#define SMB_DEVICE_ACCESS_DENIED          0x17
-#define SMB_TIMEOUT                       0x18
-#define SMB_UNSUPPORTED_PROTOCOL          0x19
-#define SMB_BUS_BUSY                      0x1A
-
-/* SMB_REQUEST.Protocol constants */
-#define SMB_WRITE_QUICK                   0x00
-#define SMB_READ_QUICK                    0x01
-#define SMB_SEND_BYTE                     0x02
-#define SMB_RECEIVE_BYTE                  0x03
-#define SMB_WRITE_BYTE                    0x04
-#define SMB_READ_BYTE                     0x05
-#define SMB_WRITE_WORD                    0x06
-#define SMB_READ_WORD                     0x07
-#define SMB_WRITE_BLOCK                   0x08
-#define SMB_READ_BLOCK                    0x09
-#define SMB_PROCESS_CALL                  0x0A
-#define SMB_MAXIMUM_PROTOCOL              0x0A
-
-typedef struct _SMB_REQUEST {
-  UCHAR  Status;
-  UCHAR  Protocol;
-  UCHAR  Address;
-  UCHAR  Command;
-  UCHAR  BlockLength;
-  UCHAR  Data[SMB_MAX_DATA_SIZE];
-} SMB_REQUEST, *PSMB_REQUEST;
-
-typedef VOID STDCALL
-(*SMB_ALARM_NOTIFY)(
-  PVOID  Context,
-  UCHAR  Address,
-  USHORT  Data);
-
-typedef struct _SMB_REGISTER_ALARM {
-  UCHAR  MinAddress;
-  UCHAR  MaxAddress;
-  SMB_ALARM_NOTIFY  NotifyFunction;
-  PVOID  NotifyContext;
-} SMB_REGISTER_ALARM, *PSMB_REGISTER_ALARM;
-
-/* SMB_CLASS.XxxVersion constants */
-#define SMB_CLASS_MAJOR_VERSION           0x0001
-#define SMB_CLASS_MINOR_VERSION           0x0000
-
-typedef NTSTATUS DDKAPI
-(*SMB_RESET_DEVICE)(
-  IN struct _SMB_CLASS  *SmbClass,
-  IN PVOID  SmbMiniport);
-
-typedef VOID DDKAPI
-(*SMB_START_IO)(
-  IN struct _SMB_CLASS  *SmbClass,
-  IN PVOID  SmbMiniport);
-
-typedef NTSTATUS DDKAPI
-(*SMB_STOP_DEVICE)(
-  IN struct _SMB_CLASS  *SmbClass,
-  IN PVOID  SmbMiniport);
-
-typedef struct _SMB_CLASS {
-  USHORT  MajorVersion;
-  USHORT  MinorVersion;
-  PVOID  Miniport;
-  PDEVICE_OBJECT  DeviceObject;
-  PDEVICE_OBJECT  PDO;
-  PDEVICE_OBJECT  LowerDeviceObject;
-  PIRP  CurrentIrp;
-  PSMB_REQUEST  CurrentSmb;
-  SMB_RESET_DEVICE  ResetDevice;
-  SMB_START_IO  StartIo;
-  SMB_STOP_DEVICE  StopDevice;
-} SMB_CLASS, *PSMB_CLASS;
-
-SMBCLASSAPI
-VOID
-DDKAPI
-SmbClassAlarm(
-  IN PSMB_CLASS  SmbClass,
-  IN UCHAR  Address,
-  IN USHORT  Data);
-
-SMBCLASSAPI
-VOID
-DDKAPI
-SmbClassCompleteRequest(
-  IN PSMB_CLASS  SmbClass);
-
-typedef NTSTATUS DDKAPI
-(*PSMB_INITIALIZE_MINIPORT)(
-  IN PSMB_CLASS  SmbClass,
-  IN PVOID  MiniportExtension,
-  IN PVOID  MiniportContext);
-
-SMBCLASSAPI
-NTSTATUS
-DDKAPI
-SmbClassCreateFdo(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDEVICE_OBJECT  PDO,
-  IN ULONG  MiniportExtensionSize,
-  IN PSMB_INITIALIZE_MINIPORT  MiniportInitialize,
-  IN PVOID  MiniportContext,
-  OUT PDEVICE_OBJECT  *FDO);
-
-SMBCLASSAPI
-NTSTATUS
-DDKAPI
-SmbClassInitializeDevice(
-  IN ULONG  MajorVersion,
-  IN ULONG  MinorVersion,
-  IN PDRIVER_OBJECT  DriverObject);
-
-SMBCLASSAPI
-VOID
-DDKAPI
-SmbClassLockDevice(
-  IN PSMB_CLASS  SmbClass);
-
-SMBCLASSAPI
-VOID
-DDKAPI
-SmbClassUnlockDevice(
-  IN PSMB_CLASS  SmbClass);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SMBUS_H */
diff --git a/winsup/w32api/include/ddk/srb.h b/winsup/w32api/include/ddk/srb.h
deleted file mode 100644
index 74ba51a04..000000000
--- a/winsup/w32api/include/ddk/srb.h
+++ /dev/null
@@ -1,757 +0,0 @@
-/*
- * scsi.h
- *
- * Interface between SCSI miniport drivers and the SCSI port driver.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __SRB_H
-#define __SRB_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-#if defined(_SCSIPORT_)
-  #define SCSIPORTAPI DECLSPEC_EXPORT
-#else
-  #define SCSIPORTAPI DECLSPEC_IMPORT
-#endif
-
-#if DBG
-#define DebugPrint(x) ScsiDebugPrint x
-#else
-#define DebugPrint(x)
-#endif
-
-typedef PHYSICAL_ADDRESS SCSI_PHYSICAL_ADDRESS, *PSCSI_PHYSICAL_ADDRESS;
-
-#define SP_UNINITIALIZED_VALUE            ((ULONG) ~0)
-#define SP_UNTAGGED                       ((UCHAR) ~0)
-
-#define SRB_SIMPLE_TAG_REQUEST            0x20
-#define SRB_HEAD_OF_QUEUE_TAG_REQUEST     0x21
-#define SRB_ORDERED_QUEUE_TAG_REQUEST     0x22
-
-#define SRB_STATUS_QUEUE_FROZEN           0x40
-#define SRB_STATUS_AUTOSENSE_VALID        0x80
-
-#define SRB_STATUS(Status) \
-  (Status & ~(SRB_STATUS_AUTOSENSE_VALID | SRB_STATUS_QUEUE_FROZEN))
-
-#define MAXIMUM_CDB_SIZE                  12
-
-#if DBG
-#define SCSI_PORT_SIGNATURE               0x54524f50
-#endif
-
-
-#define SCSI_MAXIMUM_LOGICAL_UNITS        8
-#define SCSI_MAXIMUM_TARGETS_PER_BUS      128
-#define SCSI_MAXIMUM_LUNS_PER_TARGET      255
-#define SCSI_MAXIMUM_BUSES                8
-#define SCSI_MINIMUM_PHYSICAL_BREAKS      16
-#define SCSI_MAXIMUM_PHYSICAL_BREAKS      255
-#define SCSI_MAXIMUM_TARGETS              8
-
-#define SRB_FUNCTION_WMI                  0x17
-
-#define SRB_WMI_FLAGS_ADAPTER_REQUEST     0x0001
-
-#define SP_BUS_PARITY_ERROR               0x0001
-#define SP_UNEXPECTED_DISCONNECT          0x0002
-#define SP_INVALID_RESELECTION            0x0003
-#define SP_BUS_TIME_OUT                   0x0004
-#define SP_PROTOCOL_ERROR                 0x0005
-#define SP_INTERNAL_ADAPTER_ERROR         0x0006
-#define SP_REQUEST_TIMEOUT                0x0007
-#define SP_IRQ_NOT_RESPONDING             0x0008
-#define SP_BAD_FW_WARNING                 0x0009
-#define SP_BAD_FW_ERROR                   0x000a
-#define SP_LOST_WMI_MINIPORT_REQUEST      0x000b
-
-/* SCSI_REQUEST_BLOCK.Function constants */
-#define SRB_FUNCTION_EXECUTE_SCSI         0x00
-#define SRB_FUNCTION_CLAIM_DEVICE         0x01
-#define SRB_FUNCTION_IO_CONTROL           0x02
-#define SRB_FUNCTION_RECEIVE_EVENT        0x03
-#define SRB_FUNCTION_RELEASE_QUEUE        0x04
-#define SRB_FUNCTION_ATTACH_DEVICE        0x05
-#define SRB_FUNCTION_RELEASE_DEVICE       0x06
-#define SRB_FUNCTION_SHUTDOWN             0x07
-#define SRB_FUNCTION_FLUSH                0x08
-#define SRB_FUNCTION_ABORT_COMMAND        0x10
-#define SRB_FUNCTION_RELEASE_RECOVERY     0x11
-#define SRB_FUNCTION_RESET_BUS            0x12
-#define SRB_FUNCTION_RESET_DEVICE         0x13
-#define SRB_FUNCTION_TERMINATE_IO         0x14
-#define SRB_FUNCTION_FLUSH_QUEUE          0x15
-#define SRB_FUNCTION_REMOVE_DEVICE        0x16
-#define SRB_FUNCTION_WMI                  0x17
-#define SRB_FUNCTION_LOCK_QUEUE           0x18
-#define SRB_FUNCTION_UNLOCK_QUEUE         0x19
-#define SRB_FUNCTION_RESET_LOGICAL_UNIT   0x20
-
-/* SCSI_REQUEST_BLOCK.SrbStatus constants */
-#define SRB_STATUS_PENDING                0x00
-#define SRB_STATUS_SUCCESS                0x01
-#define SRB_STATUS_ABORTED                0x02
-#define SRB_STATUS_ABORT_FAILED           0x03
-#define SRB_STATUS_ERROR                  0x04
-#define SRB_STATUS_BUSY                   0x05
-#define SRB_STATUS_INVALID_REQUEST        0x06
-#define SRB_STATUS_INVALID_PATH_ID        0x07
-#define SRB_STATUS_NO_DEVICE              0x08
-#define SRB_STATUS_TIMEOUT                0x09
-#define SRB_STATUS_SELECTION_TIMEOUT      0x0A
-#define SRB_STATUS_COMMAND_TIMEOUT        0x0B
-#define SRB_STATUS_MESSAGE_REJECTED       0x0D
-#define SRB_STATUS_BUS_RESET              0x0E
-#define SRB_STATUS_PARITY_ERROR           0x0F
-#define SRB_STATUS_REQUEST_SENSE_FAILED   0x10
-#define SRB_STATUS_NO_HBA                 0x11
-#define SRB_STATUS_DATA_OVERRUN           0x12
-#define SRB_STATUS_UNEXPECTED_BUS_FREE    0x13
-#define SRB_STATUS_PHASE_SEQUENCE_FAILURE 0x14
-#define SRB_STATUS_BAD_SRB_BLOCK_LENGTH   0x15
-#define SRB_STATUS_REQUEST_FLUSHED        0x16
-#define SRB_STATUS_INVALID_LUN            0x20
-#define SRB_STATUS_INVALID_TARGET_ID      0x21
-#define SRB_STATUS_BAD_FUNCTION           0x22
-#define SRB_STATUS_ERROR_RECOVERY         0x23
-#define SRB_STATUS_NOT_POWERED            0x24
-#define SRB_STATUS_INTERNAL_ERROR         0x30
-
-/* SCSI_REQUEST_BLOCK.SrbFlags constants */
-#define SRB_FLAGS_QUEUE_ACTION_ENABLE       0x00000002
-#define SRB_FLAGS_DISABLE_DISCONNECT        0x00000004
-#define SRB_FLAGS_DISABLE_SYNCH_TRANSFER    0x00000008
-#define SRB_FLAGS_BYPASS_FROZEN_QUEUE       0x00000010
-#define SRB_FLAGS_DISABLE_AUTOSENSE         0x00000020
-#define SRB_FLAGS_DATA_IN                   0x00000040
-#define SRB_FLAGS_DATA_OUT                  0x00000080
-#define SRB_FLAGS_NO_DATA_TRANSFER          0x00000000
-#define SRB_FLAGS_UNSPECIFIED_DIRECTION     (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT)
-#define SRB_FLAGS_NO_QUEUE_FREEZE           0x00000100
-#define SRB_FLAGS_ADAPTER_CACHE_ENABLE      0x00000200
-#define SRB_FLAGS_FREE_SENSE_BUFFER         0x00000400
-#define SRB_FLAGS_IS_ACTIVE                 0x00010000
-#define SRB_FLAGS_ALLOCATED_FROM_ZONE       0x00020000
-#define SRB_FLAGS_SGLIST_FROM_POOL          0x00040000
-#define SRB_FLAGS_BYPASS_LOCKED_QUEUE       0x00080000
-#define SRB_FLAGS_NO_KEEP_AWAKE             0x00100000
-#define SRB_FLAGS_PORT_DRIVER_ALLOCSENSE    0x00200000
-#define SRB_FLAGS_PORT_DRIVER_SENSEHASPORT  0x00400000
-#define SRB_FLAGS_DONT_START_NEXT_PACKET    0x00800000
-#define SRB_FLAGS_PORT_DRIVER_RESERVED      0x0F000000
-#define SRB_FLAGS_CLASS_DRIVER_RESERVED     0xF0000000
-
-typedef struct _SCSI_REQUEST_BLOCK { 
-  USHORT  Length; 
-  UCHAR  Function; 
-  UCHAR  SrbStatus; 
-  UCHAR  ScsiStatus; 
-  UCHAR  PathId; 
-  UCHAR  TargetId; 
-  UCHAR  Lun; 
-  UCHAR  QueueTag; 
-  UCHAR  QueueAction; 
-  UCHAR  CdbLength; 
-  UCHAR  SenseInfoBufferLength; 
-  ULONG  SrbFlags; 
-  ULONG  DataTransferLength; 
-  ULONG  TimeOutValue; 
-  PVOID  DataBuffer; 
-  PVOID  SenseInfoBuffer; 
-  struct _SCSI_REQUEST_BLOCK  *NextSrb; 
-  PVOID  OriginalRequest; 
-  PVOID  SrbExtension; 
-  _ANONYMOUS_UNION union {
-    ULONG  InternalStatus;
-    ULONG  QueueSortKey;
-  } DUMMYUNIONNAME; 
-#if defined(_WIN64)
-  ULONG Reserved;
-#endif
-  UCHAR  Cdb[16]; 
-} SCSI_REQUEST_BLOCK, *PSCSI_REQUEST_BLOCK; 
-
-#define SCSI_REQUEST_BLOCK_SIZE           sizeof(SCSI_REQUEST_BLOCK)
-
-typedef struct _ACCESS_RANGE { 
-  SCSI_PHYSICAL_ADDRESS  RangeStart; 
-  ULONG  RangeLength; 
-  BOOLEAN  RangeInMemory; 
-} ACCESS_RANGE, *PACCESS_RANGE;
-
-/* PORT_CONFIGURATION_INFORMATION.Dma64BitAddresses constants */
-#define SCSI_DMA64_MINIPORT_SUPPORTED     0x01
-#define SCSI_DMA64_SYSTEM_SUPPORTED       0x80
-
-typedef struct _PORT_CONFIGURATION_INFORMATION {
-  ULONG  Length;
-  ULONG  SystemIoBusNumber;
-  INTERFACE_TYPE  AdapterInterfaceType;
-  ULONG  BusInterruptLevel;
-  ULONG  BusInterruptVector;
-  KINTERRUPT_MODE  InterruptMode;
-  ULONG  MaximumTransferLength;
-  ULONG  NumberOfPhysicalBreaks;
-  ULONG  DmaChannel;
-  ULONG  DmaPort;
-  DMA_WIDTH  DmaWidth;
-  DMA_SPEED  DmaSpeed;
-  ULONG  AlignmentMask;
-  ULONG  NumberOfAccessRanges;
-  ACCESS_RANGE  (*AccessRanges)[];
-  PVOID  Reserved;
-  UCHAR  NumberOfBuses;
-  UCHAR  InitiatorBusId[8];
-  BOOLEAN  ScatterGather;
-  BOOLEAN  Master;
-  BOOLEAN  CachesData;
-  BOOLEAN  AdapterScansDown;
-  BOOLEAN  AtdiskPrimaryClaimed;
-  BOOLEAN  AtdiskSecondaryClaimed;
-  BOOLEAN  Dma32BitAddresses;
-  BOOLEAN  DemandMode;
-  BOOLEAN  MapBuffers;
-  BOOLEAN  NeedPhysicalAddresses;
-  BOOLEAN  TaggedQueueing;
-  BOOLEAN  AutoRequestSense;
-  BOOLEAN  MultipleRequestPerLu;
-  BOOLEAN  ReceiveEvent;
-  BOOLEAN  RealModeInitialized;
-  BOOLEAN  BufferAccessScsiPortControlled;
-  UCHAR  MaximumNumberOfTargets;
-  UCHAR  ReservedUchars[2];
-  ULONG  SlotNumber;
-  ULONG  BusInterruptLevel2;
-  ULONG  BusInterruptVector2;
-  KINTERRUPT_MODE  InterruptMode2;
-  ULONG  DmaChannel2;
-  ULONG  DmaPort2;
-  DMA_WIDTH  DmaWidth2;
-  DMA_SPEED  DmaSpeed2;
-  ULONG  DeviceExtensionSize;
-  ULONG  SpecificLuExtensionSize;
-  ULONG  SrbExtensionSize;
-  UCHAR  Dma64BitAddresses;
-  BOOLEAN  ResetTargetSupported;
-  UCHAR  MaximumNumberOfLogicalUnits;
-  BOOLEAN  WmiDataProvider;
-} PORT_CONFIGURATION_INFORMATION, *PPORT_CONFIGURATION_INFORMATION;
-
-#define CONFIG_INFO_VERSION_2             sizeof(PORT_CONFIGURATION_INFORMATION)
-
-typedef enum _SCSI_NOTIFICATION_TYPE {
-	RequestComplete,
-	NextRequest,
-	NextLuRequest,
-	ResetDetected,
-	CallDisableInterrupts,
-	CallEnableInterrupts,
-	RequestTimerCall,
-	BusChangeDetected,
-	WMIEvent,
-	WMIReregister
-} SCSI_NOTIFICATION_TYPE, *PSCSI_NOTIFICATION_TYPE;
-
-#ifdef __GNUC__
-__extension__ /* enums limited to range of integer */
-#endif
-typedef enum _SCSI_ADAPTER_CONTROL_TYPE {
-	ScsiQuerySupportedControlTypes = 0,
-	ScsiStopAdapter,
-	ScsiRestartAdapter,
-	ScsiSetBootConfig,
-	ScsiSetRunningConfig,
-	ScsiAdapterControlMax,
-	MakeAdapterControlTypeSizeOfUlong = 0xffffffff
-} SCSI_ADAPTER_CONTROL_TYPE, *PSCSI_ADAPTER_CONTROL_TYPE;
-
-typedef enum _SCSI_ADAPTER_CONTROL_STATUS {
-	ScsiAdapterControlSuccess = 0,
-	ScsiAdapterControlUnsuccessful
-} SCSI_ADAPTER_CONTROL_STATUS, *PSCSI_ADAPTER_CONTROL_STATUS;
-
-typedef struct _SCSI_SUPPORTED_CONTROL_TYPE_LIST {
-	ULONG MaxControlType;
-	BOOLEAN SupportedTypeList[0];
-} SCSI_SUPPORTED_CONTROL_TYPE_LIST, *PSCSI_SUPPORTED_CONTROL_TYPE_LIST;
-
-typedef SCSI_ADAPTER_CONTROL_STATUS DDKAPI
-(*PHW_ADAPTER_CONTROL)(
-	IN PVOID DeviceExtension,
-	IN SCSI_ADAPTER_CONTROL_TYPE ControlType,
-	IN PVOID Parameters);
-
-typedef BOOLEAN DDKAPI
-(*PHW_ADAPTER_STATE)(
-	IN PVOID DeviceExtension,
-	IN PVOID Context,
-	IN BOOLEAN SaveState);
-
-#define SP_RETURN_NOT_FOUND               0
-#define SP_RETURN_FOUND                   1
-#define SP_RETURN_ERROR                   2
-#define SP_RETURN_BAD_CONFIG              3
-
-typedef ULONG DDKAPI
-(*PHW_FIND_ADAPTER)(
-	IN PVOID DeviceExtension,
-	IN PVOID HwContext,
-	IN PVOID BusInformation,
-	IN PCHAR ArgumentString,
-	IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo,
-	OUT PBOOLEAN Again);
-
-typedef BOOLEAN DDKAPI
-(*PHW_INITIALIZE)(
-  IN PVOID DeviceExtension);
-
-typedef BOOLEAN DDKAPI
-(*PHW_INTERRUPT)(
-  IN PVOID DeviceExtension);
-
-typedef BOOLEAN DDKAPI
-(*PHW_RESET_BUS)(
-  IN PVOID DeviceExtension,
-  IN ULONG PathId);
-
-typedef VOID DDKAPI
-(*PHW_DMA_STARTED)(
-  IN PVOID DeviceExtension);
-
-typedef BOOLEAN DDKAPI
-(*PHW_STARTIO)(
-  IN PVOID DeviceExtension,
-  IN PSCSI_REQUEST_BLOCK Srb);
-
-typedef VOID DDKAPI
-(*PHW_TIMER)(
-  IN PVOID DeviceExtension);
-
-typedef struct _HW_INITIALIZATION_DATA { 
-  ULONG  HwInitializationDataSize; 
-  INTERFACE_TYPE  AdapterInterfaceType; 
-  PHW_INITIALIZE  HwInitialize; 
-  PHW_STARTIO  HwStartIo; 
-  PHW_INTERRUPT  HwInterrupt; 
-  PHW_FIND_ADAPTER  HwFindAdapter; 
-  PHW_RESET_BUS  HwResetBus; 
-  PHW_DMA_STARTED  HwDmaStarted; 
-  PHW_ADAPTER_STATE  HwAdapterState; 
-  ULONG  DeviceExtensionSize; 
-  ULONG  SpecificLuExtensionSize; 
-  ULONG  SrbExtensionSize; 
-  ULONG  NumberOfAccessRanges; 
-  PVOID  Reserved; 
-  BOOLEAN  MapBuffers; 
-  BOOLEAN  NeedPhysicalAddresses; 
-  BOOLEAN  TaggedQueueing; 
-  BOOLEAN  AutoRequestSense; 
-  BOOLEAN  MultipleRequestPerLu; 
-  BOOLEAN  ReceiveEvent; 
-  USHORT  VendorIdLength; 
-  PVOID  VendorId; 
-  USHORT  ReservedUshort; 
-  USHORT  DeviceIdLength; 
-  PVOID  DeviceId; 
-  PHW_ADAPTER_CONTROL  HwAdapterControl;
-} HW_INITIALIZATION_DATA, *PHW_INITIALIZATION_DATA; 
-
-SCSIPORTAPI
-VOID 
-DDKAPI
-ScsiPortCompleteRequest(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN UCHAR  SrbStatus);
-
-/*
- * ULONG
- * ScsiPortConvertPhysicalAddressToUlong(
- *   IN SCSI_PHYSICAL_ADDRESS  Address);
- */
-#define ScsiPortConvertPhysicalAddressToUlong(Address) ((Address).LowPart)
-
-SCSIPORTAPI
-SCSI_PHYSICAL_ADDRESS 
-DDKAPI
-ScsiPortConvertUlongToPhysicalAddress(
-  IN ULONG  UlongAddress);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortFlushDma(
-  IN PVOID  DeviceExtension);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortFreeDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  MappedAddress);
-
-SCSIPORTAPI
-ULONG
-DDKAPI
-ScsiPortGetBusData(
-  IN PVOID  DeviceExtension,
-  IN ULONG  BusDataType,
-  IN ULONG  SystemIoBusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
-
-SCSIPORTAPI
-PVOID
-DDKAPI
-ScsiPortGetDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  SystemIoBusNumber,
-  IN SCSI_PHYSICAL_ADDRESS  IoAddress,
-  IN ULONG  NumberOfBytes,
-  IN BOOLEAN  InIoSpace);
-
-SCSIPORTAPI
-PVOID
-DDKAPI
-ScsiPortGetLogicalUnit(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun);
-
-SCSIPORTAPI
-SCSI_PHYSICAL_ADDRESS
-DDKAPI
-ScsiPortGetPhysicalAddress(
-  IN PVOID  HwDeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb  OPTIONAL,
-  IN PVOID  VirtualAddress,
-  OUT ULONG  *Length);
-
-SCSIPORTAPI
-PSCSI_REQUEST_BLOCK
-DDKAPI
-ScsiPortGetSrb(
-  IN PVOID  DeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN LONG  QueueTag);
-
-SCSIPORTAPI
-PVOID
-DDKAPI
-ScsiPortGetUncachedExtension(
-  IN PVOID  HwDeviceExtension,
-  IN PPORT_CONFIGURATION_INFORMATION  ConfigInfo,
-  IN ULONG  NumberOfBytes);
-
-SCSIPORTAPI
-PVOID
-DDKAPI
-ScsiPortGetVirtualAddress(
-  IN PVOID  HwDeviceExtension,
-  IN SCSI_PHYSICAL_ADDRESS  PhysicalAddress);
-
-SCSIPORTAPI
-ULONG
-DDKAPI
-ScsiPortInitialize(
-  IN PVOID  Argument1,
-  IN PVOID  Argument2,
-  IN struct _HW_INITIALIZATION_DATA  *HwInitializationData,
-  IN PVOID  HwContext  OPTIONAL);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortIoMapTransfer(
-  IN PVOID  HwDeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb,
-  IN ULONG  LogicalAddress,
-  IN ULONG  Length);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortLogError(
-  IN PVOID  HwDeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb  OPTIONAL,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN ULONG  ErrorCode,
-  IN ULONG  UniqueId);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortMoveMemory(
-  IN PVOID  WriteBuffer,
-  IN PVOID  ReadBuffer,
-  IN ULONG  Length);
-
-SCSIPORTAPI
-VOID
-DDKCDECLAPI
-ScsiPortNotification(
-  IN SCSI_NOTIFICATION_TYPE  NotificationType,
-  IN PVOID  HwDeviceExtension,
-  IN ...);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortQuerySystemTime(
-  OUT PLARGE_INTEGER  CurrentTime);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortReadPortBufferUchar(
-  IN PUCHAR  Port,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortReadPortBufferUlong(
-  IN PULONG  Port,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortReadPortBufferUshort(
-  IN PUSHORT  Port,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-UCHAR
-DDKAPI
-ScsiPortReadPortUchar(
-  IN PUCHAR  Port);
-
-SCSIPORTAPI
-ULONG
-DDKAPI
-ScsiPortReadPortUlong(
-  IN PULONG  Port);
-
-SCSIPORTAPI
-USHORT
-DDKAPI
-ScsiPortReadPortUshort(
-  IN PUSHORT  Port);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortReadRegisterBufferUchar(
-  IN PUCHAR  Register,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortReadRegisterBufferUlong(
-  IN PULONG  Register,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortReadRegisterBufferUshort(
-  IN PUSHORT  Register,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-UCHAR
-DDKAPI
-ScsiPortReadRegisterUchar(
-  IN PUCHAR  Register);
-
-SCSIPORTAPI
-ULONG
-DDKAPI
-ScsiPortReadRegisterUlong(
-  IN PULONG  Register);
-
-SCSIPORTAPI
-USHORT
-DDKAPI
-ScsiPortReadRegisterUshort(
-  IN PUSHORT  Register);
-
-SCSIPORTAPI
-ULONG
-DDKAPI
-ScsiPortSetBusDataByOffset(
-  IN PVOID  DeviceExtension,
-  IN ULONG  BusDataType,
-  IN ULONG  SystemIoBusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortStallExecution(
-  IN ULONG  Delay);
-
-SCSIPORTAPI
-BOOLEAN
-DDKAPI
-ScsiPortValidateRange(
-  IN PVOID  HwDeviceExtension,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  SystemIoBusNumber,
-  IN SCSI_PHYSICAL_ADDRESS  IoAddress,
-  IN ULONG  NumberOfBytes,
-  IN BOOLEAN  InIoSpace);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWritePortBufferUchar(
-  IN PUCHAR  Port,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWritePortBufferUlong(
-  IN PULONG  Port,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWritePortBufferUshort(
-  IN PUSHORT  Port,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWritePortUchar(
-  IN PUCHAR  Port,
-  IN UCHAR  Value);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWritePortUlong(
-  IN PULONG  Port,
-  IN ULONG  Value);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWritePortUshort(
-  IN PUSHORT  Port,
-  IN USHORT  Value);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWriteRegisterBufferUchar(
-  IN PUCHAR  Register,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWriteRegisterBufferUlong(
-  IN PULONG  Register,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWriteRegisterBufferUshort(
-  IN PUSHORT  Register,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWriteRegisterUchar(
-  IN PUCHAR  Register,
-  IN ULONG  Value);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWriteRegisterUlong(
-  IN PULONG  Register,
-  IN ULONG  Value);
-
-SCSIPORTAPI
-VOID
-DDKAPI
-ScsiPortWriteRegisterUshort(
-  IN PUSHORT  Register,
-  IN USHORT  Value);
-
-SCSIPORTAPI
-VOID
-DDKCDECLAPI
-ScsiDebugPrint(
-  IN ULONG DebugPrintLevel,
-  IN PCCHAR DebugMessage,
-  IN ...);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __SRB_H */
diff --git a/winsup/w32api/include/ddk/storport.h b/winsup/w32api/include/ddk/storport.h
deleted file mode 100644
index 184a099c7..000000000
--- a/winsup/w32api/include/ddk/storport.h
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * storport.h
- *
- * StorPort interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __STORPORT_H
-#define __STORPORT_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "srb.h"
-
-#if defined(_STORPORT_)
-  #define STORPORTAPI DECLSPEC_EXPORT
-#else
-  #define STORPORTAPI DECLSPEC_IMPORT
-#endif
-
-
-typedef PHYSICAL_ADDRESS STOR_PHYSICAL_ADDRESS;
-
-typedef struct _STOR_SCATTER_GATHER_ELEMENT {
-	STOR_PHYSICAL_ADDRESS  PhysicalAddress;
-	ULONG  Length;
-	ULONG_PTR  Reserved;
-} STOR_SCATTER_GATHER_ELEMENT, *PSTOR_SCATTER_GATHER_ELEMENT;
-
-typedef struct _STOR_SCATTER_GATHER_LIST {
-    ULONG  NumberOfElements;
-    ULONG_PTR  Reserved;
-    STOR_SCATTER_GATHER_ELEMENT  List[0];
-} STOR_SCATTER_GATHER_LIST, *PSTOR_SCATTER_GATHER_LIST;
-
-typedef struct _SCSI_WMI_REQUEST_BLOCK {
-  USHORT  Length;
-  UCHAR  Function;
-  UCHAR  SrbStatus;
-  UCHAR  WMISubFunction;
-  UCHAR  PathId;
-  UCHAR  TargetId;
-  UCHAR  Lun;
-  UCHAR  Reserved1;
-  UCHAR  WMIFlags;
-  UCHAR  Reserved2[2];
-  ULONG  SrbFlags;
-  ULONG  DataTransferLength;
-  ULONG  TimeOutValue;
-  PVOID  DataBuffer;
-  PVOID  DataPath;
-  PVOID  Reserved3;
-  PVOID  OriginalRequest;
-  PVOID  SrbExtension;
-  ULONG  Reserved4;
-  UCHAR  Reserved5[16];
-} SCSI_WMI_REQUEST_BLOCK, *PSCSI_WMI_REQUEST_BLOCK;
-
-
-STORPORTAPI
-ULONG
-DDKAPI
-StorPortInitialize(
-  IN PVOID  Argument1,
-  IN PVOID  Argument2,
-  IN PHW_INITIALIZATION_DATA  HwInitializationData,
-  IN PVOID  Unused);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortFreeDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  MappedAddress);
-
-STORPORTAPI
-ULONG
-DDKAPI
-StorPortGetBusData(
-  IN PVOID  DeviceExtension,
-  IN ULONG  BusDataType,
-  IN ULONG  SystemIoBusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
-
-STORPORTAPI
-ULONG
-DDKAPI
-StorPortSetBusDataByOffset(
-  IN PVOID  DeviceExtension,
-  IN ULONG   BusDataType,
-  IN ULONG  SystemIoBusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
-
-STORPORTAPI
-PVOID
-DDKAPI
-StorPortGetDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  SystemIoBusNumber,
-  IN SCSI_PHYSICAL_ADDRESS  IoAddress,
-  IN ULONG  NumberOfBytes,
-  IN BOOLEAN  InIoSpace);
-
-STORPORTAPI
-PVOID
-DDKAPI
-StorPortGetLogicalUnit(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun);
-
-STORPORTAPI
-PSCSI_REQUEST_BLOCK
-DDKAPI
-StorPortGetSrb(
-  IN PVOID  DeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN LONG  QueueTag);
-
-STORPORTAPI
-STOR_PHYSICAL_ADDRESS
-DDKAPI
-StorPortGetPhysicalAddress(
-  IN PVOID  HwDeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb,
-  IN PVOID  VirtualAddress,
-  OUT ULONG  *Length);
-
-STORPORTAPI
-PVOID
-DDKAPI
-StorPortGetVirtualAddress(
-  IN PVOID  HwDeviceExtension,
-  IN STOR_PHYSICAL_ADDRESS  PhysicalAddress);
-
-STORPORTAPI
-PVOID
-DDKAPI
-StorPortGetUncachedExtension(
-  IN PVOID HwDeviceExtension,
-  IN PPORT_CONFIGURATION_INFORMATION ConfigInfo,
-  IN ULONG NumberOfBytes);
-
-STORPORTAPI
-VOID
-DDKCDECLAPI
-StorPortNotification(
-  IN SCSI_NOTIFICATION_TYPE  NotificationType,
-  IN PVOID  HwDeviceExtension,
-  IN ...);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortLogError(
-  IN PVOID  HwDeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb OPTIONAL,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN ULONG  ErrorCode,
-  IN ULONG  UniqueId);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortCompleteRequest(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN UCHAR  SrbStatus);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortMoveMemory(
-  IN PVOID  WriteBuffer,
-  IN PVOID  ReadBuffer,
-  IN ULONG  Length);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortStallExecution(
-  IN ULONG  Delay);
-
-STORPORTAPI
-STOR_PHYSICAL_ADDRESS
-DDKAPI
-StorPortConvertUlong64ToPhysicalAddress(
-  IN ULONG64  UlongAddress);
-
-STORPORTAPI
-ULONG64
-DDKAPI
-StorPortConvertPhysicalAddressToUlong64(
-  IN STOR_PHYSICAL_ADDRESS  Address);
-
-STORPORTAPI
-BOOLEAN
-DDKAPI
-StorPortValidateRange(
-  IN PVOID  HwDeviceExtension,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  SystemIoBusNumber,
-  IN STOR_PHYSICAL_ADDRESS  IoAddress,
-  IN ULONG  NumberOfBytes,
-  IN BOOLEAN  InIoSpace);
-
-STORPORTAPI
-VOID
-DDKCDECLAPI
-StorPortDebugPrint(
-  IN ULONG  DebugPrintLevel,
-  IN PCCHAR  DebugMessage,
-  IN ...);
-
-STORPORTAPI
-UCHAR
-DDKAPI
-StorPortReadPortUchar(
-  IN PUCHAR  Port);
-
-STORPORTAPI
-ULONG
-DDKAPI
-StorPortReadPortUlong(
-  IN PULONG  Port);
-
-STORPORTAPI
-USHORT
-DDKAPI
-StorPortReadPortUshort(
-  IN PUSHORT  Port);
-
-STORPORTAPI
-UCHAR
-DDKAPI
-StorPortReadRegisterUchar(
-  IN PUCHAR  Register);
-
-STORPORTAPI
-ULONG
-DDKAPI
-StorPortReadRegisterUlong(
-  IN PULONG  Register);
-
-STORPORTAPI
-USHORT
-DDKAPI
-StorPortReadRegisterUshort(
-  IN PUSHORT  Register);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortWritePortUchar(
-  IN PUCHAR  Port,
-  IN UCHAR  Value);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortWritePortUlong(
-  IN PULONG  Port,
-  IN ULONG  Value);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortWritePortUshort(
-  IN PUSHORT  Port,
-  IN USHORT  Value);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortWriteRegisterUchar(
-  IN PUCHAR  Port,
-  IN UCHAR  Value);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortWriteRegisterUlong(
-  IN PULONG  Port,
-  IN ULONG  Value);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortWriteRegisterUshort(
-  IN PUSHORT  Port,
-  IN USHORT  Value);
-
-STORPORTAPI
-BOOLEAN
-DDKAPI
-StorPortPauseDevice(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN ULONG  TimeOut);
-
-STORPORTAPI
-BOOLEAN
-DDKAPI
-StorPortResumeDevice(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun);
-
-STORPORTAPI
-BOOLEAN
-DDKAPI
-StorPortPause(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  TimeOut);
-
-STORPORTAPI
-BOOLEAN
-DDKAPI
-StorPortResume(
-  IN PVOID  HwDeviceExtension);
-
-STORPORTAPI
-BOOLEAN
-DDKAPI
-StorPortDeviceBusy(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun,
-  IN ULONG  RequestsToComplete);
-
-STORPORTAPI
-BOOLEAN
-DDKAPI
-StorPortDeviceReady(
-  IN PVOID  HwDeviceExtension,
-  IN UCHAR  PathId,
-  IN UCHAR  TargetId,
-  IN UCHAR  Lun);
-
-STORPORTAPI
-BOOLEAN
-DDKAPI
-StorPortBusy(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  RequestsToComplete);
-
-STORPORTAPI
-BOOLEAN
-DDKAPI
-StorPortReady(
-  IN PVOID  HwDeviceExtension);
-
-STORPORTAPI
-PSTOR_SCATTER_GATHER_LIST
-DDKAPI
-StorPortGetScatterGatherList(
-  IN PVOID  DeviceExtension,
-  IN PSCSI_REQUEST_BLOCK  Srb);
-
-typedef BOOLEAN DDKAPI
-(*PSTOR_SYNCHRONIZED_ACCESS)(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Context);
-
-STORPORTAPI
-VOID
-DDKAPI
-StorPortSynchronizeAccess(
-  IN PVOID  HwDeviceExtension,
-  IN PSTOR_SYNCHRONIZED_ACCESS  SynchronizedAccessRoutine,
-  IN PVOID  Context);
-
-#if DBG
-#define DebugPrint(x) StorPortDebugPrint x
-#else
-#define DebugPrint(x)
-#endif
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __STORPORT_H */
diff --git a/winsup/w32api/include/ddk/tdi.h b/winsup/w32api/include/ddk/tdi.h
deleted file mode 100644
index 46d01a299..000000000
--- a/winsup/w32api/include/ddk/tdi.h
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
- * tdi.h
- *
- * TDI user mode definitions
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __TDI_H
-#define __TDI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "ntddtdi.h"
-#include "tdistat.h"
-#include "netpnp.h"
-
-
-/* Basic types */
-
-typedef LONG TDI_STATUS;
-typedef PVOID CONNECTION_CONTEXT;
-
-typedef struct _TDI_CONNECTION_INFORMATION {
-  LONG  UserDataLength;
-  PVOID  UserData;
-  LONG  OptionsLength;
-  PVOID  Options;
-  LONG  RemoteAddressLength;
-  PVOID  RemoteAddress;
-} TDI_CONNECTION_INFORMATION, *PTDI_CONNECTION_INFORMATION;
-
-typedef struct _TDI_REQUEST {
-  union {
-    HANDLE  AddressHandle;
-    CONNECTION_CONTEXT  ConnectionContext;
-    HANDLE  ControlChannel;
-  } Handle;
-  PVOID  RequestNotifyObject;
-  PVOID  RequestContext;
-  TDI_STATUS  TdiStatus;
-} TDI_REQUEST, *PTDI_REQUEST;
-
-typedef struct _TDI_REQUEST_STATUS {
-  TDI_STATUS  Status;
-  PVOID  RequestContext;
-  ULONG  BytesTransferred;
-} TDI_REQUEST_STATUS, *PTDI_REQUEST_STATUS;
-
-typedef struct _TA_ADDRESS {
-  USHORT  AddressLength;
-  USHORT  AddressType;
-  UCHAR  Address[1];
-} TA_ADDRESS, *PTA_ADDRESS;
-
-#define TDI_ADDRESS_TYPE_UNSPEC             0
-#define TDI_ADDRESS_TYPE_UNIX               1
-#define TDI_ADDRESS_TYPE_IP                 2
-#define TDI_ADDRESS_TYPE_IMPLINK            3
-#define TDI_ADDRESS_TYPE_PUP                4
-#define TDI_ADDRESS_TYPE_CHAOS              5
-#define TDI_ADDRESS_TYPE_NS                 6
-#define TDI_ADDRESS_TYPE_IPX                6
-#define TDI_ADDRESS_TYPE_NBS                7
-#define TDI_ADDRESS_TYPE_ECMA               8
-#define TDI_ADDRESS_TYPE_DATAKIT            9
-#define TDI_ADDRESS_TYPE_CCITT              10
-#define TDI_ADDRESS_TYPE_SNA                11
-#define TDI_ADDRESS_TYPE_DECnet             12
-#define TDI_ADDRESS_TYPE_DLI                13
-#define TDI_ADDRESS_TYPE_LAT                14
-#define TDI_ADDRESS_TYPE_HYLINK             15
-#define TDI_ADDRESS_TYPE_APPLETALK          16
-#define TDI_ADDRESS_TYPE_NETBIOS            17
-#define TDI_ADDRESS_TYPE_8022               18
-#define TDI_ADDRESS_TYPE_OSI_TSAP           19
-#define TDI_ADDRESS_TYPE_NETONE             20
-#define TDI_ADDRESS_TYPE_VNS                21
-#define TDI_ADDRESS_TYPE_NETBIOS_EX         22
-#define TDI_ADDRESS_TYPE_IP6                23
-#define TDI_ADDRESS_TYPE_NETBIOS_UNICODE_EX 24
-
-#define TdiTransportAddress               "TransportAddress"
-#define TdiConnectionContext              "ConnectionContext"
-#define TDI_TRANSPORT_ADDRESS_LENGTH      (sizeof(TdiTransportAddress) - 1)
-#define TDI_CONNECTION_CONTEXT_LENGTH     (sizeof(TdiConnectionContext) - 1)
-
-typedef struct _TRANSPORT_ADDRESS {
-  LONG  TAAddressCount;
-  TA_ADDRESS  Address[1];
-} TRANSPORT_ADDRESS, *PTRANSPORT_ADDRESS;
-
-typedef struct _TDI_ADDRESS_INFO {
-  ULONG  ActivityCount;
-  TRANSPORT_ADDRESS  Address;
-} TDI_ADDRESS_INFO, *PTDI_ADDRESS_INFO;
-
-typedef struct _TDI_ACTION_HEADER {
-  ULONG  TransportId;
-  USHORT  ActionCode;
-  USHORT  Reserved;
-} TDI_ACTION_HEADER, *PTDI_ACTION_HEADER;
-
-typedef struct _TDI_ADDRESS_8022 {
-  UCHAR  MACAddress[6];
-} TDI_ADDRESS_8022, *PTDI_ADDRESS_8022;
-
-#define TDI_ADDRESS_LENGTH_8022           sizeof(TDI_ADDRESS_8022);
-
-typedef struct _TDI_ADDRESS_APPLETALK {
-  USHORT  Network;
-  UCHAR  Node;
-  UCHAR  Socket;
-} TDI_ADDRESS_APPLETALK, *PTDI_ADDRESS_APPLETALK;
-
-#define TDI_ADDRESS_LENGTH_APPLETALK      sizeof(TDI_ADDRESS_APPLETALK)
-
-typedef struct _TDI_ADDRESS_IP {
-  USHORT  sin_port;
-  ULONG  in_addr;
-  UCHAR  sin_zero[8];
-} TDI_ADDRESS_IP, *PTDI_ADDRESS_IP;
-
-#define TDI_ADDRESS_LENGTH_IP             sizeof(TDI_ADDRESS_IP)
-
-typedef struct _TDI_ADDRESS_IPX {
-  ULONG  NetworkAddress;
-  UCHAR  NodeAddress[6];
-  USHORT  Socket;
-} TDI_ADDRESS_IPX, *PTDI_ADDRESS_IPX;
-
-#define TDI_ADDRESS_LENGTH_IPX            sizeof(TDI_ADDRESS_IPX)
-
-/* TDI_ADDRESS_NETBIOS.NetbiosNameType constants */
-#define TDI_ADDRESS_NETBIOS_TYPE_UNIQUE       0x0000
-#define TDI_ADDRESS_NETBIOS_TYPE_GROUP        0x0001
-#define TDI_ADDRESS_NETBIOS_TYPE_QUICK_UNIQUE 0x0002
-#define TDI_ADDRESS_NETBIOS_TYPE_QUICK_GROUP  0x0003
-
-typedef struct _TDI_ADDRESS_NETBIOS {
-  USHORT  NetbiosNameType;
-  UCHAR  NetbiosName[16];
-} TDI_ADDRESS_NETBIOS, *PTDI_ADDRESS_NETBIOS;
-
-#define TDI_ADDRESS_LENGTH_NETBIOS        sizeof(TDI_ADDRESS_NETBIOS)
-
-typedef struct _TDI_ADDRESS_NETBIOS_EX {
-  UCHAR  EndpointName[16];
-  TDI_ADDRESS_NETBIOS  NetbiosAddress;
-} TDI_ADDRESS_NETBIOS_EX, *PTDI_ADDRESS_NETBIOS_EX;
-
-#define TDI_ADDRESS_LENGTH_NETBIOS_EX     sizeof(TDI_ADDRESS_NETBIOS_EX)
-
-/* TDI_ADDRESS_NETONE.NetoneNameType constants */
-#define TDI_ADDRESS_NETONE_TYPE_UNIQUE    0x0000
-#define TDI_ADDRESS_NETONE_TYPE_ROTORED   0x0001
-
-typedef struct _TDI_ADDRESS_NETONE {
-  USHORT  NetoneNameType;
-  UCHAR  NetoneName[20];
-} TDI_ADDRESS_NETONE, *PTDI_ADDRESS_NETONE;
-
-#define TDI_ADDRESS_LENGTH_NETONE         sizeof(TDI_ADDRESS_NETONE)
-
-typedef struct _TDI_ADDRESS_NS
-{
-    ULONG   NetworkAddress;
-    UCHAR   NodeAddress[6];
-    USHORT  Socket;
-} TDI_ADDRESS_NS, *PTDI_ADDRESS_NS;
-
-#define TDI_ADDRESS_LENGTH_NS             sizeof(TDI_ADDRESS_NS)
-
-#define ISO_MAX_ADDR_LENGTH               64
-
-/* TDI_ADDRESS_OSI_TSAP.tp_addr_type constants */
-#define ISO_HIERARCHICAL                  0
-#define ISO_NON_HIERARCHICAL              1
-
-typedef struct _TDI_ADDRESS_OSI_TSAP {
-  USHORT  tp_addr_type;
-  USHORT  tp_taddr_len;
-  USHORT  tp_tsel_len;
-  UCHAR  tp_addr[ISO_MAX_ADDR_LENGTH];
-} TDI_ADDRESS_OSI_TSAP, *PTDI_ADDRESS_OSI_TSAP;
-
-#define TDI_ADDRESS_LENGTH_OSI_TSAP       sizeof(TDI_ADDRESS_OSI_TSAP)
-
-typedef struct _TDI_ADDRESS_VNS {
-  UCHAR  net_address[4];
-  UCHAR  subnet_addr[2];
-  UCHAR  port[2];
-  UCHAR  hops;
-  UCHAR  filler[5];
-} TDI_ADDRESS_VNS, *PTDI_ADDRESS_VNS;
-
-#define TDI_ADDRESS_LENGTH_VNS            sizeof(TDI_ADDRESS_VNS)
-
-typedef struct _TDI_ADDRESS_IP6 {
-  USHORT  sin6_port;
-  ULONG  sin6_flowinfo;
-  USHORT  sin6_addr[8];
-  ULONG  sin6_scope_id;
-} TDI_ADDRESS_IP6, *PTDI_ADDRESS_IP6;
-
-#define TDI_ADDRESS_LENGTH_IP6            sizeof(TDI_ADDRESS_IP6)
-
-enum eNameBufferType {
-	NBT_READONLY = 0,
-	NBT_WRITEONLY,
-	NBT_READWRITE,
-	NBT_WRITTEN
-};
-
-typedef struct _TDI_ADDRESS_NETBIOS_UNICODE_EX {
-  USHORT  NetbiosNameType;
-  enum eNameBufferType  NameBufferType;
-  UNICODE_STRING  EndpointName;
-  UNICODE_STRING  RemoteName;
-  WCHAR  EndpointBuffer[17];
-  WCHAR  RemoteNameBuffer[1];
-} TDI_ADDRESS_NETBIOS_UNICODE_EX, *PTDI_ADDRESS_NETBIOS_UNICODE_EX;
-
-
-typedef struct _TDI_CONNECT_REQUEST {
-	TDI_REQUEST  Request;
-	PTDI_CONNECTION_INFORMATION  RequestConnectionInformation;
-	PTDI_CONNECTION_INFORMATION  ReturnConnectionInformation;
-	LARGE_INTEGER  Timeout;
-} TDI_REQUEST_CONNECT, *PTDI_REQUEST_CONNECT;
-
-typedef struct _TDI_REQUEST_ACCEPT {
-  TDI_REQUEST  Request;
-  PTDI_CONNECTION_INFORMATION  RequestConnectionInformation;
-  PTDI_CONNECTION_INFORMATION  ReturnConnectionInformation;
-} TDI_REQUEST_ACCEPT, *PTDI_REQUEST_ACCEPT;
-
-typedef struct _TDI_REQUEST_LISTEN {
-  TDI_REQUEST  Request;
-  PTDI_CONNECTION_INFORMATION  RequestConnectionInformation;
-  PTDI_CONNECTION_INFORMATION  ReturnConnectionInformation;
-  USHORT  ListenFlags;
-} TDI_REQUEST_LISTEN, *PTDI_REQUEST_LISTEN;
-
-typedef struct _TDI_DISCONNECT_REQUEST {
-  TDI_REQUEST  Request;
-  LARGE_INTEGER  Timeout;
-} TDI_REQUEST_DISCONNECT, *PTDI_REQUEST_DISCONNECT;
-
-typedef struct _TDI_REQUEST_SEND {
-  TDI_REQUEST  Request;
-  USHORT  SendFlags;
-} TDI_REQUEST_SEND, *PTDI_REQUEST_SEND;
-
-typedef struct _TDI_REQUEST_RECEIVE {
-  TDI_REQUEST  Request;
-  USHORT  ReceiveFlags;
-} TDI_REQUEST_RECEIVE, *PTDI_REQUEST_RECEIVE;
-
-typedef struct _TDI_REQUEST_SEND_DATAGRAM {
-  TDI_REQUEST  Request;
-  PTDI_CONNECTION_INFORMATION  SendDatagramInformation;
-} TDI_REQUEST_SEND_DATAGRAM, *PTDI_REQUEST_SEND_DATAGRAM;
-
-typedef struct _TDI_REQUEST_RECEIVE_DATAGRAM {
-  TDI_REQUEST  Request;
-  PTDI_CONNECTION_INFORMATION  ReceiveDatagramInformation;
-  PTDI_CONNECTION_INFORMATION  ReturnInformation;
-  USHORT  ReceiveFlags;
-} TDI_REQUEST_RECEIVE_DATAGRAM, *PTDI_REQUEST_RECEIVE_DATAGRAM;
-
-typedef struct _TDI_REQUEST_SET_EVENT {
-  TDI_REQUEST  Request;
-  LONG  EventType;
-  PVOID  EventHandler;
-  PVOID  EventContext;
-} TDI_REQUEST_SET_EVENT_HANDLER, *PTDI_REQUEST_SET_EVENT_HANDLER;
-
-#define TDI_RECEIVE_BROADCAST             0x00000004
-#define TDI_RECEIVE_MULTICAST             0x00000008
-#define TDI_RECEIVE_PARTIAL               0x00000010
-#define TDI_RECEIVE_NORMAL                0x00000020
-#define TDI_RECEIVE_EXPEDITED             0x00000040
-#define TDI_RECEIVE_PEEK                  0x00000080
-#define TDI_RECEIVE_NO_RESPONSE_EXP       0x00000100
-#define TDI_RECEIVE_COPY_LOOKAHEAD        0x00000200
-#define TDI_RECEIVE_ENTIRE_MESSAGE        0x00000400
-#define TDI_RECEIVE_AT_DISPATCH_LEVEL     0x00000800
-#define TDI_RECEIVE_CONTROL_INFO          0x00001000
-
-/* Listen flags */
-#define TDI_QUERY_ACCEPT                  0x00000001
-
-/* Options used for both SendOptions and ReceiveIndicators */
-#define TDI_SEND_EXPEDITED                0x0020
-#define TDI_SEND_PARTIAL                  0x0040
-#define TDI_SEND_NO_RESPONSE_EXPECTED     0x0080
-#define TDI_SEND_NON_BLOCKING             0x0100
-#define TDI_SEND_AND_DISCONNECT           0x0200
-
-/* Disconnect Flags */
-#define TDI_DISCONNECT_WAIT               0x0001
-#define TDI_DISCONNECT_ABORT              0x0002
-#define TDI_DISCONNECT_RELEASE            0x0004
-
-/* TdiRequest structure for TdiQueryInformation request */
-typedef struct _TDI_REQUEST_QUERY_INFORMATION {
-  TDI_REQUEST  Request;
-  ULONG  QueryType;
-  PTDI_CONNECTION_INFORMATION  RequestConnectionInformation;
-} TDI_REQUEST_QUERY_INFORMATION, *PTDI_REQUEST_QUERY_INFORMATION;
-
-/* TdiRequest structure for TdiSetInformation request */
-typedef struct _TDI_REQUEST_SET_INFORMATION {
-  TDI_REQUEST  Request;
-  ULONG  SetType;
-  PTDI_CONNECTION_INFORMATION  RequestConnectionInformation;
-} TDI_REQUEST_SET_INFORMATION, *PTDI_REQUEST_SET_INFORMATION;
-
-typedef TDI_REQUEST_SET_INFORMATION  TDI_REQ_SET_INFORMATION, *PTDI_REQ_SET_INFORMATION;
-
-typedef union _TDI_REQUEST_TYPE {
-  TDI_REQUEST_ACCEPT  TdiAccept;
-  TDI_REQUEST_CONNECT  TdiConnect;
-  TDI_REQUEST_DISCONNECT  TdiDisconnect;
-  TDI_REQUEST_LISTEN  TdiListen;
-  TDI_REQUEST_QUERY_INFORMATION  TdiQueryInformation;
-  TDI_REQUEST_RECEIVE  TdiReceive;
-  TDI_REQUEST_RECEIVE_DATAGRAM  TdiReceiveDatagram;
-  TDI_REQUEST_SEND  TdiSend;
-  TDI_REQUEST_SEND_DATAGRAM  TdiSendDatagram;
-  TDI_REQUEST_SET_EVENT_HANDLER  TdiSetEventHandler;
-  TDI_REQUEST_SET_INFORMATION   TdiSetInformation;
-} TDI_REQUEST_TYPE, *PTDI_REQUEST_TYPE;
-
-
-/* Query information types */
-
-/* Generic query info types that must be supported by all transports */
-#define TDI_QUERY_BROADCAST_ADDRESS     0x00000001
-#define TDI_QUERY_PROVIDER_INFO         0x00000002
-#define TDI_QUERY_ADDRESS_INFO          0x00000003
-#define TDI_QUERY_CONNECTION_INFO       0x00000004
-#define TDI_QUERY_PROVIDER_STATISTICS   0x00000005
-#define TDI_QUERY_DATAGRAM_INFO         0x00000006
-#define TDI_QUERY_DATA_LINK_ADDRESS     0x00000007
-#define TDI_QUERY_NETWORK_ADDRESS       0x00000008
-#define TDI_QUERY_MAX_DATAGRAM_INFO     0x00000009
-
-/* Netbios specific query information types */
-#define TDI_QUERY_ADAPTER_STATUS        0x00000100
-#define TDI_QUERY_SESSION_STATUS        0x00000200
-#define TDI_QUERY_FIND_NAME             0x00000300
-
-typedef struct _TA_APPLETALK_ADDR {
-  LONG  TAAddressCount;
-  struct _AddrAtalk {
-    USHORT  AddressLength;
-    USHORT  AddressType;
-    TDI_ADDRESS_APPLETALK  Address[1];
-  } Address[1];
-} TA_APPLETALK_ADDRESS, *PTA_APPLETALK_ADDRESS;
-
-typedef struct _TA_ADDRESS_IP {
-  LONG  TAAddressCount;
-  struct _AddrIp {
-    USHORT  AddressLength;
-    USHORT  AddressType;
-    TDI_ADDRESS_IP  Address[1];
-  } Address[1];
-} TA_ADDRESS_IP, *PTA_ADDRESS_IP;
-
-typedef struct _TA_ADDRESS_IPX {
-  LONG  TAAddressCount;
-  struct _AddrIpx {
-    USHORT  AddressLength;
-    USHORT  AddressType;
-    TDI_ADDRESS_IPX  Address[1];
-  } Address[1];
-} TA_IPX_ADDRESS, *PTA_IPX_ADDRESS;
-
-typedef struct _TA_NETBIOS_ADDRESS {
-  LONG  TAAddressCount;
-  struct _Addr{
-    USHORT  AddressLength;
-    USHORT  AddressType;
-    TDI_ADDRESS_NETBIOS  Address[1];
-  } Address[1];
-} TA_NETBIOS_ADDRESS, *PTA_NETBIOS_ADDRESS;
-
-typedef struct _TA_ADDRESS_NS {
-  LONG  TAAddressCount;
-  struct  _AddrNs {
-    USHORT  AddressLength;
-    USHORT  AddressType;
-    TDI_ADDRESS_NS  Address[1];
-  } Address[1];
-} TA_NS_ADDRESS, *PTA_NS_ADDRESS;
-
-typedef struct _TA_ADDRESS_VNS {
-  LONG  TAAddressCount;
-  struct  _AddrVns {
-    USHORT  AddressLength;
-    USHORT  AddressType;
-    TDI_ADDRESS_VNS  Address[1];
-  } Address[1];
-} TA_VNS_ADDRESS, *PTA_VNS_ADDRESS;
-
-typedef struct _TA_ADDRESS_IP6 {
-  LONG  TAAddressCount;
-  struct _AddrIp6 {
-    USHORT  AddressLength;
-    USHORT  AddressType;
-    TDI_ADDRESS_IP6  Address[1];
-  } Address [1];
-} TA_IP6_ADDRESS, *PTA_IP6_ADDRESS;
-
-typedef struct _TA_ADDRESS_NETBIOS_UNICODE_EX {
-  LONG  TAAddressCount;
-  struct _AddrNetbiosWCharEx {
-    USHORT  AddressLength;
-    USHORT  AddressType;
-    TDI_ADDRESS_NETBIOS_UNICODE_EX  Address[1];
-  } Address [1];
-} TA_NETBIOS_UNICODE_EX_ADDRESS, *PTA_NETBIOS_UNICODE_EX_ADDRESS;
-
-
-/* Structures used for TdiQueryInformation and TdiSetInformation */
-
-typedef struct _TDI_ENDPOINT_INFO {
-  ULONG  State;
-  ULONG  Event;
-  ULONG  TransmittedTsdus;
-  ULONG  ReceivedTsdus;
-  ULONG  TransmissionErrors;
-  ULONG  ReceiveErrors;
-  ULONG  MinimumLookaheadData;
-  ULONG  MaximumLookaheadData;
-  ULONG  PriorityLevel;
-  ULONG  SecurityLevel;
-  ULONG  SecurityCompartment;
-} TDI_ENDPOINT_INFO, *PTDI_ENDPOINT_INFO;
-
-typedef struct _TDI_CONNECTION_INFO {
-  ULONG  State;
-  ULONG  Event; 
-  ULONG  TransmittedTsdus;
-  ULONG  ReceivedTsdus;
-  ULONG  TransmissionErrors;
-  ULONG  ReceiveErrors;
-  LARGE_INTEGER  Throughput;
-  LARGE_INTEGER  Delay;
-  ULONG  SendBufferSize;
-  ULONG  ReceiveBufferSize;
-  BOOLEAN  Unreliable;
-} TDI_CONNECTION_INFO, *PTDI_CONNECTION_INFO;
-
-typedef struct _TDI_DATAGRAM_INFO {
-  ULONG  MaximumDatagramBytes;
-  ULONG  MaximumDatagramCount;
-} TDI_DATAGRAM_INFO, *PTDI_DATAGRAM_INFO;
-
-typedef struct _TDI_MAX_DATAGRAM_INFO {
-  ULONG  MaxDatagramSize;
-} TDI_MAX_DATAGRAM_INFO, *PTDI_MAX_DATAGRAM_INFO;
-
-typedef struct _TDI_PROVIDER_INFO {
-  ULONG  Version;
-  ULONG  MaxSendSize;
-  ULONG  MaxConnectionUserData;
-  ULONG  MaxDatagramSize;
-  ULONG  ServiceFlags;
-  ULONG  MinimumLookaheadData;
-  ULONG  MaximumLookaheadData;
-  ULONG  NumberOfResources;
-  LARGE_INTEGER  StartTime;
-} TDI_PROVIDER_INFO, *PTDI_PROVIDER_INFO;
-
-#define TDI_SERVICE_CONNECTION_MODE     0x00000001
-#define TDI_SERVICE_ORDERLY_RELEASE     0x00000002
-#define TDI_SERVICE_CONNECTIONLESS_MODE 0x00000004
-#define TDI_SERVICE_ERROR_FREE_DELIVERY 0x00000008
-#define TDI_SERVICE_SECURITY_LEVEL      0x00000010
-#define TDI_SERVICE_BROADCAST_SUPPORTED 0x00000020
-#define TDI_SERVICE_MULTICAST_SUPPORTED 0x00000040
-#define TDI_SERVICE_DELAYED_ACCEPTANCE  0x00000080
-#define TDI_SERVICE_EXPEDITED_DATA      0x00000100
-#define TDI_SERVICE_INTERNAL_BUFFERING  0x00000200
-#define TDI_SERVICE_ROUTE_DIRECTED      0x00000400
-#define TDI_SERVICE_NO_ZERO_LENGTH      0x00000800
-#define TDI_SERVICE_POINT_TO_POINT      0x00001000
-#define TDI_SERVICE_MESSAGE_MODE        0x00002000
-#define TDI_SERVICE_HALF_DUPLEX         0x00004000
-#define TDI_SERVICE_DGRAM_CONNECTION    0x00008000
-#define TDI_SERVICE_FORCE_ACCESS_CHECK  0x00010000
-#define TDI_SERVICE_SEND_AND_DISCONNECT 0x00020000
-#define TDI_SERVICE_DIRECT_ACCEPT       0x00040000
-#define TDI_SERVICE_ACCEPT_LOCAL_ADDR   0x00080000
-
-typedef struct _TDI_PROVIDER_RESOURCE_STATS {
-  ULONG  ResourceId;
-  ULONG  MaximumResourceUsed;
-  ULONG  AverageResourceUsed;
-  ULONG  ResourceExhausted;
-} TDI_PROVIDER_RESOURCE_STATS, *PTDI_PROVIDER_RESOURCE_STATS;
-
-typedef struct _TDI_PROVIDER_STATISTICS {
-  ULONG  Version;
-  ULONG  OpenConnections;
-  ULONG  ConnectionsAfterNoRetry;
-  ULONG  ConnectionsAfterRetry;
-  ULONG  LocalDisconnects;
-  ULONG  RemoteDisconnects;
-  ULONG  LinkFailures;
-  ULONG  AdapterFailures;
-  ULONG  SessionTimeouts;
-  ULONG  CancelledConnections;
-  ULONG  RemoteResourceFailures;
-  ULONG  LocalResourceFailures;
-  ULONG  NotFoundFailures;
-  ULONG  NoListenFailures;
-  ULONG  DatagramsSent;
-  LARGE_INTEGER  DatagramBytesSent;
-  ULONG  DatagramsReceived;
-  LARGE_INTEGER  DatagramBytesReceived;
-  ULONG  PacketsSent;
-  ULONG  PacketsReceived;
-  ULONG  DataFramesSent;
-  LARGE_INTEGER  DataFrameBytesSent;
-  ULONG  DataFramesReceived;
-  LARGE_INTEGER  DataFrameBytesReceived;
-  ULONG  DataFramesResent;
-  LARGE_INTEGER  DataFrameBytesResent;
-  ULONG  DataFramesRejected;
-  LARGE_INTEGER  DataFrameBytesRejected;
-  ULONG  ResponseTimerExpirations;
-  ULONG  AckTimerExpirations;
-  ULONG  MaximumSendWindow;
-  ULONG  AverageSendWindow;
-  ULONG  PiggybackAckQueued;
-  ULONG  PiggybackAckTimeouts;
-  LARGE_INTEGER  WastedPacketSpace;
-  ULONG  WastedSpacePackets;
-  ULONG  NumberOfResources;
-  TDI_PROVIDER_RESOURCE_STATS  ResourceStats[1];
-} TDI_PROVIDER_STATISTICS, *PTDI_PROVIDER_STATISTICS;
-
-#define TDI_EVENT_CONNECT                 0
-#define TDI_EVENT_DISCONNECT              1
-#define TDI_EVENT_ERROR                   2
-#define TDI_EVENT_RECEIVE                 3
-#define TDI_EVENT_RECEIVE_DATAGRAM        4
-#define TDI_EVENT_RECEIVE_EXPEDITED       5
-#define TDI_EVENT_SEND_POSSIBLE           6
-
-typedef struct _TDI_REQUEST_ASSOCIATE {
-  TDI_REQUEST  Request;
-  HANDLE  AddressHandle;
-} TDI_REQUEST_ASSOCIATE_ADDRESS, *PTDI_REQUEST_ASSOCIATE_ADDRESS;
-
-#define NDIS_PACKET_POOL_TAG_FOR_NWLNKIPX   'iPDN'
-#define NDIS_PACKET_POOL_TAG_FOR_NWLNKSPX   'sPDN'
-#define NDIS_PACKET_POOL_TAG_FOR_NWLNKNB    'nPDN'
-#define NDIS_PACKET_POOL_TAG_FOR_TCPIP      'tPDN'
-#define NDIS_PACKET_POOL_TAG_FOR_NBF        'bPDN'
-#define NDIS_PACKET_POOL_TAG_FOR_APPLETALK  'aPDN'
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TDI_H */
diff --git a/winsup/w32api/include/ddk/tdiinfo.h b/winsup/w32api/include/ddk/tdiinfo.h
deleted file mode 100644
index a6248c880..000000000
--- a/winsup/w32api/include/ddk/tdiinfo.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * tdiinfo.h
- *
- * TDI set and query information interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __TDIINFO_H
-#define __TDIINFO_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-typedef struct TDIEntityID {
-  ULONG  tei_entity;
-  ULONG  tei_instance;
-} TDIEntityID;
-
-#define	MAX_TDI_ENTITIES                  4096
-#define INVALID_ENTITY_INSTANCE           -1
-#define	GENERIC_ENTITY				            0
-#define	ENTITY_LIST_ID				            0
-#define	ENTITY_TYPE_ID				            1
-
-#define	AT_ENTITY					                0x280
-#define	CL_NL_ENTITY				              0x301
-#define	CL_TL_ENTITY				              0x401
-#define	CO_NL_ENTITY				              0x300
-#define	CO_TL_ENTITY				              0x400
-#define	ER_ENTITY					                0x380
-#define	IF_ENTITY					                0x200
-
-#define	AT_ARP						                0x280
-#define	AT_NULL						                0x282
-#define	CL_TL_NBF					                0x401
-#define	CL_TL_UDP					                0x403
-#define	CL_NL_IPX					                0x301
-#define	CL_NL_IP					                0x303
-#define	CO_TL_NBF					                0x400
-#define	CO_TL_SPX					                0x402
-#define	CO_TL_TCP					                0x404
-#define	CO_TL_SPP					                0x406
-#define	ER_ICMP						                0x380
-#define	IF_GENERIC					              0x200
-#define	IF_MIB						                0x202
-
-/* TDIObjectID.toi_class constants */
-#define	INFO_CLASS_GENERIC			          0x100
-#define	INFO_CLASS_PROTOCOL			          0x200
-#define	INFO_CLASS_IMPLEMENTATION	        0x300
-
-/* TDIObjectID.toi_type constants */
-#define	INFO_TYPE_PROVIDER			          0x100
-#define	INFO_TYPE_ADDRESS_OBJECT	        0x200
-#define	INFO_TYPE_CONNECTION		          0x300
-
-typedef struct _TDIObjectID {
-	TDIEntityID  toi_entity;
-	ULONG  toi_class;
-	ULONG  toi_type;
-	ULONG  toi_id;
-} TDIObjectID;
-
-#define	CONTEXT_SIZE				              16
-
-typedef struct _TCP_REQUEST_QUERY_INFORMATION_EX {
-  TDIObjectID  ID;
-  ULONG_PTR  Context[CONTEXT_SIZE / sizeof(ULONG_PTR)];
-} TCP_REQUEST_QUERY_INFORMATION_EX, *PTCP_REQUEST_QUERY_INFORMATION_EX;
-
-#if defined(_WIN64)
-typedef struct _TCP_REQUEST_QUERY_INFORMATION_EX32 {
-  TDIObjectID  ID;
-  ULONG32  Context[CONTEXT_SIZE / sizeof(ULONG32)];
-} TCP_REQUEST_QUERY_INFORMATION_EX32, *PTCP_REQUEST_QUERY_INFORMATION_EX32;
-#endif /* _WIN64 */
-
-typedef struct _TCP_REQUEST_SET_INFORMATION_EX {
-  TDIObjectID  ID;
-  UINT  BufferSize;
-  UCHAR  Buffer[1];
-} TCP_REQUEST_SET_INFORMATION_EX, *PTCP_REQUEST_SET_INFORMATION_EX;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TDIINFO_H */
diff --git a/winsup/w32api/include/ddk/tdikrnl.h b/winsup/w32api/include/ddk/tdikrnl.h
deleted file mode 100644
index 7e684702a..000000000
--- a/winsup/w32api/include/ddk/tdikrnl.h
+++ /dev/null
@@ -1,1166 +0,0 @@
-/*
- * tdikrnl.h
- *
- * TDI kernel mode definitions
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __TDIKRNL_H
-#define __TDIKRNL_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "tdi.h"
-
-#if defined(_TDI_)
-  #define TDIKRNLAPI DECLSPEC_EXPORT
-#else
-  #define TDIKRNLAPI DECLSPEC_IMPORT
-#endif
-
-
-typedef struct _TDI_REQUEST_KERNEL {
-  ULONG  RequestFlags;
-  PTDI_CONNECTION_INFORMATION  RequestConnectionInformation;
-  PTDI_CONNECTION_INFORMATION  ReturnConnectionInformation;
-  PVOID  RequestSpecific;
-} TDI_REQUEST_KERNEL, *PTDI_REQUEST_KERNEL;
-
-/* Request codes */
-#define TDI_ASSOCIATE_ADDRESS             0x01
-#define TDI_DISASSOCIATE_ADDRESS          0x02
-#define TDI_CONNECT                       0x03
-#define TDI_LISTEN                        0x04
-#define TDI_ACCEPT                        0x05
-#define TDI_DISCONNECT                    0x06
-#define TDI_SEND                          0x07
-#define TDI_RECEIVE                       0x08
-#define TDI_SEND_DATAGRAM                 0x09
-#define TDI_RECEIVE_DATAGRAM              0x0A
-#define TDI_SET_EVENT_HANDLER             0x0B
-#define TDI_QUERY_INFORMATION             0x0C
-#define TDI_SET_INFORMATION               0x0D
-#define TDI_ACTION                        0x0E
-
-#define TDI_DIRECT_SEND                   0x27
-#define TDI_DIRECT_SEND_DATAGRAM          0x29
-
-#define TDI_TRANSPORT_ADDRESS_FILE        1
-#define TDI_CONNECTION_FILE               2
-#define TDI_CONTROL_CHANNEL_FILE          3
-
-/* Internal TDI IOCTLS */
-#define IOCTL_TDI_QUERY_DIRECT_SEND_HANDLER   _TDI_CONTROL_CODE(0x80, METHOD_NEITHER)
-#define IOCTL_TDI_QUERY_DIRECT_SENDDG_HANDLER _TDI_CONTROL_CODE(0x81, METHOD_NEITHER)
-
-/* TdiAssociateAddress */
-typedef struct _TDI_REQUEST_KERNEL_ASSOCIATE {
-  HANDLE  AddressHandle;
-} TDI_REQUEST_KERNEL_ASSOCIATE, *PTDI_REQUEST_KERNEL_ASSOCIATE;
-
-/* TdiDisassociateAddress */
-typedef TDI_REQUEST_KERNEL TDI_REQUEST_KERNEL_DISASSOCIATE,
-  *PTDI_REQUEST_KERNEL_DISASSOCIATE;
-
-/* TdiAccept */
-typedef struct _TDI_REQUEST_KERNEL_ACCEPT {
-  PTDI_CONNECTION_INFORMATION  RequestConnectionInformation;
-  PTDI_CONNECTION_INFORMATION  ReturnConnectionInformation;
-} TDI_REQUEST_KERNEL_ACCEPT, *PTDI_REQUEST_KERNEL_ACCEPT;
-
-/* TdiConnect */
-typedef TDI_REQUEST_KERNEL TDI_REQUEST_KERNEL_CONNECT,
-  *PTDI_REQUEST_KERNEL_CONNECT;
-
-/* TdiDisconnect */
-typedef TDI_REQUEST_KERNEL TDI_REQUEST_KERNEL_DISCONNECT,
-  *PTDI_REQUEST_KERNEL_DISCONNECT;
-
-/* TdiListen */
-typedef TDI_REQUEST_KERNEL TDI_REQUEST_KERNEL_LISTEN,
-  *PTDI_REQUEST_KERNEL_LISTEN;
-
-/* TdiReceive */
-typedef struct _TDI_REQUEST_KERNEL_RECEIVE {
-  ULONG  ReceiveLength;
-  ULONG  ReceiveFlags;
-} TDI_REQUEST_KERNEL_RECEIVE, *PTDI_REQUEST_KERNEL_RECEIVE;
-
-/* TdiReceiveDatagram */
-typedef struct _TDI_REQUEST_KERNEL_RECEIVEDG {
-  ULONG  ReceiveLength;
-  PTDI_CONNECTION_INFORMATION  ReceiveDatagramInformation;
-  PTDI_CONNECTION_INFORMATION  ReturnDatagramInformation;
-  ULONG  ReceiveFlags;
-} TDI_REQUEST_KERNEL_RECEIVEDG, *PTDI_REQUEST_KERNEL_RECEIVEDG;
-
-/* TdiSend */
-typedef struct _TDI_REQUEST_KERNEL_SEND {
-  ULONG  SendLength;
-  ULONG  SendFlags;
-} TDI_REQUEST_KERNEL_SEND, *PTDI_REQUEST_KERNEL_SEND;
-
-/* TdiSendDatagram */
-typedef struct _TDI_REQUEST_KERNEL_SENDDG {
-  ULONG  SendLength;
-  PTDI_CONNECTION_INFORMATION  SendDatagramInformation;
-} TDI_REQUEST_KERNEL_SENDDG, *PTDI_REQUEST_KERNEL_SENDDG;
-
-/* TdiSetEventHandler */
-typedef struct _TDI_REQUEST_KERNEL_SET_EVENT {
-  LONG  EventType;
-  PVOID  EventHandler;
-  PVOID  EventContext;
-} TDI_REQUEST_KERNEL_SET_EVENT, *PTDI_REQUEST_KERNEL_SET_EVENT;
-
-/* TdiQueryInformation */
-typedef struct _TDI_REQUEST_KERNEL_QUERY_INFO {
-  LONG  QueryType;
-  PTDI_CONNECTION_INFORMATION  RequestConnectionInformation;
-} TDI_REQUEST_KERNEL_QUERY_INFORMATION, *PTDI_REQUEST_KERNEL_QUERY_INFORMATION;
-
-/* TdiSetInformation */
-typedef struct _TDI_REQUEST_KERNEL_SET_INFO {
-  LONG  SetType;
-  PTDI_CONNECTION_INFORMATION  RequestConnectionInformation;
-} TDI_REQUEST_KERNEL_SET_INFORMATION, *PTDI_REQUEST_KERNEL_SET_INFORMATION;
-
-
-/* Event types */
-#define TDI_EVENT_CONNECT                   0
-#define TDI_EVENT_DISCONNECT                1
-#define TDI_EVENT_ERROR                     2
-#define TDI_EVENT_RECEIVE                   3
-#define TDI_EVENT_RECEIVE_DATAGRAM          4
-#define TDI_EVENT_RECEIVE_EXPEDITED         5
-#define TDI_EVENT_SEND_POSSIBLE             6
-#define TDI_EVENT_CHAINED_RECEIVE           7
-#define TDI_EVENT_CHAINED_RECEIVE_DATAGRAM  8
-#define TDI_EVENT_CHAINED_RECEIVE_EXPEDITED 9
-#define TDI_EVENT_ERROR_EX                  10
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CONNECT)(
-  IN PVOID  TdiEventContext,
-  IN LONG  RemoteAddressLength,
-  IN PVOID  RemoteAddress,
-  IN LONG  UserDataLength,
-  IN PVOID  UserData,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  OUT CONNECTION_CONTEXT  *ConnectionContext,
-  OUT PIRP  *AcceptIrp);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDefaultConnectHandler(
-  IN PVOID  TdiEventContext,
-  IN LONG  RemoteAddressLength,
-  IN PVOID  RemoteAddress,
-  IN LONG  UserDataLength,
-  IN PVOID  UserData,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  OUT CONNECTION_CONTEXT *ConnectionContext,
-  OUT PIRP  *AcceptIrp);
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_DISCONNECT)(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN LONG  DisconnectDataLength,
-  IN PVOID  DisconnectData,
-  IN LONG  DisconnectInformationLength,
-  IN PVOID  DisconnectInformation,
-  IN ULONG  DisconnectFlags);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDefaultDisconnectHandler(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN LONG  DisconnectDataLength,
-  IN PVOID  DisconnectData,
-  IN LONG  DisconnectInformationLength,
-  IN PVOID  DisconnectInformation,
-  IN ULONG  DisconnectFlags);
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_ERROR)(
-  IN PVOID  TdiEventContext,
-  IN NTSTATUS  Status);
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_ERROR_EX)(
-  IN PVOID  TdiEventContext,
-  IN NTSTATUS  Status,
-  IN PVOID  Buffer);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDefaultErrorHandler(
-  IN PVOID  TdiEventContext,
-  IN NTSTATUS  Status);
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_RECEIVE)(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDefaultReceiveHandler(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_RECEIVE_DATAGRAM)(
-  IN PVOID  TdiEventContext,
-  IN LONG  SourceAddressLength,
-  IN PVOID  SourceAddress,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  IN ULONG  ReceiveDatagramFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
-
-TDIKRNLAPI
-NTSTATUS DDKAPI
-TdiDefaultRcvDatagramHandler(
-  IN PVOID  TdiEventContext,
-  IN LONG  SourceAddressLength,
-  IN PVOID  SourceAddress,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  IN ULONG  ReceiveDatagramFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_RECEIVE_EXPEDITED)(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDefaultRcvExpeditedHandler(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  BytesIndicated,
-  IN ULONG  BytesAvailable,
-  OUT ULONG  *BytesTaken,
-  IN PVOID  Tsdu,
-  OUT PIRP  *IoRequestPacket);
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CHAINED_RECEIVE)(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  ReceiveLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDefaultChainedReceiveHandler(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  ReceiveLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CHAINED_RECEIVE_DATAGRAM)(
-  IN PVOID  TdiEventContext,
-  IN LONG  SourceAddressLength,
-  IN PVOID  SourceAddress,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  IN ULONG  ReceiveDatagramFlags,
-  IN ULONG  ReceiveDatagramLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDefaultChainedRcvDatagramHandler(
-  IN PVOID  TdiEventContext,
-  IN LONG  SourceAddressLength,
-  IN PVOID  SourceAddress,
-  IN LONG  OptionsLength,
-  IN PVOID  Options,
-  IN ULONG  ReceiveDatagramFlags,
-  IN ULONG  ReceiveDatagramLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_CHAINED_RECEIVE_EXPEDITED)(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  ReceiveLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDefaultChainedRcvExpeditedHandler(
-  IN PVOID  TdiEventContext,
-  IN CONNECTION_CONTEXT  ConnectionContext,
-  IN ULONG  ReceiveFlags,
-  IN ULONG  ReceiveLength,
-  IN ULONG  StartingOffset,
-  IN PMDL  Tsdu,
-  IN PVOID  TsduDescriptor);
-
-typedef NTSTATUS DDKAPI
-(*PTDI_IND_SEND_POSSIBLE)(
-  IN PVOID  TdiEventContext,
-  IN PVOID  ConnectionContext,
-  IN ULONG  BytesAvailable);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDefaultSendPossibleHandler(
-  IN PVOID  TdiEventContext,
-  IN PVOID  ConnectionContext,
-  IN ULONG  BytesAvailable);
-
-
-
-/* Macros and functions to build IRPs */
-
-#define TdiBuildBaseIrp(                                                  \
-  bIrp, bDevObj, bFileObj, bCompRoutine, bContxt, bIrpSp, bMinor)         \
-{                                                                         \
-  bIrpSp->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL;                 \
-  bIrpSp->MinorFunction = (bMinor);                                       \
-  bIrpSp->DeviceObject  = (bDevObj);                                      \
-  bIrpSp->FileObject    = (bFileObj);                                     \
-  if (bCompRoutine)                                                       \
-    IoSetCompletionRoutine(bIrp, bCompRoutine, bContxt, TRUE, TRUE, TRUE) \
-  else                                                                    \
-    IoSetCompletionRoutine(bIrp, NULL, NULL, FALSE, FALSE, FALSE);        \
-}
-
-/*
- * VOID
- * TdiBuildAccept(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
- *   OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo);
- */
-#define TdiBuildAccept(                                             \
-  Irp, DevObj, FileObj, CompRoutine, Contxt,                        \
-  RequestConnectionInfo, ReturnConnectionInfo)                      \
-{                                                                   \
-  PTDI_REQUEST_KERNEL_ACCEPT _Request;                              \
-  PIO_STACK_LOCATION _IrpSp;                                        \
-                                                                    \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                          \
-                                                                    \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,                \
-                  Contxt, _IrpSp, TDI_ACCEPT);                      \
-                                                                    \
-  _Request = (PTDI_REQUEST_KERNEL_ACCEPT)&_IrpSp->Parameters;       \
-  _Request->RequestConnectionInformation = (RequestConnectionInfo); \
-  _Request->ReturnConnectionInformation  = (ReturnConnectionInfo);  \
-}
-
-/*
- * VOID
- * TdiBuildAction(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PMDL  MdlAddr);
- */
-#define TdiBuildAction(                               \
-  Irp, DevObj, FileObj, CompRoutine, Contxt, MdlAddr) \
-{                                                     \
-  PIO_STACK_LOCATION _IrpSp;                          \
-                                                      \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);            \
-                                                      \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,  \
-                  Contxt, _IrpSp, TDI_ACTION);        \
-                                                      \
-  (Irp)->MdlAddress = (MdlAddr);                      \
-}
-
-/*
- * VOID
- * TdiBuildAssociateAddress(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN HANDLE  AddrHandle);
- */
-#define TdiBuildAssociateAddress(                                \
-  Irp, DevObj, FileObj, CompRoutine, Contxt, AddrHandle)         \
-{                                                                \
-  PTDI_REQUEST_KERNEL_ASSOCIATE _Request;                        \
-  PIO_STACK_LOCATION _IrpSp;                                     \
-                                                                 \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                       \
-                                                                 \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,             \
-                  Contxt, _IrpSp, TDI_ASSOCIATE_ADDRESS);        \
-                                                                 \
-  _Request = (PTDI_REQUEST_KERNEL_ASSOCIATE)&_IrpSp->Parameters; \
-  _Request->AddressHandle = (HANDLE)(AddrHandle);                \
-}
-
-/*
- * VOID
- * TdiBuildConnect(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PLARGE_INTEGER  Time,
- *   IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
- *   OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo); 
- */
-#define TdiBuildConnect(                                            \
-  Irp, DevObj, FileObj, CompRoutine, Contxt,                        \
-  Time, RequestConnectionInfo, ReturnConnectionInfo)                \
-{                                                                   \
-  PTDI_REQUEST_KERNEL _Request;                                     \
-  PIO_STACK_LOCATION _IrpSp;                                        \
-                                                                    \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                          \
-                                                                    \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,                \
-                  Contxt, _IrpSp, TDI_CONNECT);                     \
-                                                                    \
-  _Request = (PTDI_REQUEST_KERNEL)&_IrpSp->Parameters;              \
-  _Request->RequestConnectionInformation = (RequestConnectionInfo); \
-  _Request->ReturnConnectionInformation  = (ReturnConnectionInfo);  \
-  _Request->RequestSpecific              = (PVOID)(Time);           \
-}
-
-/*
- * VOID
- * TdiBuildDisassociateAddress(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt);
- */
-#define TdiBuildDisassociateAddress(                                \
-  Irp, DevObj, FileObj, CompRoutine, Contxt)                        \
-{                                                                   \
-  PIO_STACK_LOCATION _IrpSp;                                        \
-                                                                    \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                          \
-                                                                    \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,                \
-                  Contxt, _IrpSp, TDI_DISASSOCIATE_ADDRESS);        \
-}
-
-/*
- * VOID
- * TdiBuildDisconnect(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PLARGE_INTEGER  Time,
- *   IN PULONG  Flags,
- *   IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
- *   OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo); 
- */
-#define TdiBuildDisconnect(                                         \
-  Irp, DevObj, FileObj, CompRoutine, Contxt, Time,                  \
-  Flags, RequestConnectionInfo, ReturnConnectionInfo)               \
-{                                                                   \
-  PTDI_REQUEST_KERNEL _Request;                                     \
-  PIO_STACK_LOCATION _IrpSp;                                        \
-                                                                    \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                          \
-                                                                    \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,                \
-                  Contxt, _IrpSp, TDI_DISCONNECT);                  \
-                                                                    \
-  _Request = (PTDI_REQUEST_KERNEL)&_IrpSp->Parameters;              \
-  _Request->RequestConnectionInformation = (RequestConnectionInfo); \
-  _Request->ReturnConnectionInformation  = (ReturnConnectionInfo);  \
-  _Request->RequestSpecific = (PVOID)(Time);                        \
-  _Request->RequestFlags    = (Flags);                              \
-}
-
-/*
- * PIRP
- * TdiBuildInternalDeviceControlIrp(
- *   IN CCHAR IrpSubFunction,
- *   IN PDEVICE_OBJECT DeviceObject,
- *   IN PFILE_OBJECT FileObject,
- *   IN PKEVENT Event,
- *   IN PIO_STATUS_BLOCK IoStatusBlock);
- */
-#define TdiBuildInternalDeviceControlIrp( \
-  IrpSubFunction, DeviceObject,           \
-  FileObject, Event, IoStatusBlock)       \
-  IoBuildDeviceIoControlRequest(          \
-		0x00000003, DeviceObject,             \
-		NULL, 0, NULL, 0,                     \
-		TRUE, Event, IoStatusBlock)
-
-/*
- * VOID
- * TdiBuildListen(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN ULONG  Flags,
- *   IN PTDI_CONNECTION_INFORMATION  RequestConnectionInfo,
- *   OUT PTDI_CONNECTION_INFORMATION  ReturnConnectionInfo); 
- */
-#define TdiBuildListen(                                             \
-  Irp, DevObj, FileObj, CompRoutine, Contxt,                        \
-  Flags, RequestConnectionInfo, ReturnConnectionInfo)               \
-{                                                                   \
-  PTDI_REQUEST_KERNEL _Request;                                     \
-  PIO_STACK_LOCATION _IrpSp;                                        \
-                                                                    \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                          \
-                                                                    \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,                \
-                  Contxt, _IrpSp, TDI_LISTEN);                      \
-                                                                    \
-  _Request = (PTDI_REQUEST_KERNEL)&_IrpSp->Parameters;              \
-  _Request->RequestConnectionInformation = (RequestConnectionInfo); \
-  _Request->ReturnConnectionInformation  = (ReturnConnectionInfo);  \
-  _Request->RequestFlags = (Flags);                                 \
-}
-
-TDIKRNLAPI
-VOID
-DDKAPI
-TdiBuildNetbiosAddress(
-	IN PUCHAR  NetbiosName,
-	IN BOOLEAN  IsGroupName,
-	IN OUT PTA_NETBIOS_ADDRESS  NetworkName);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiBuildNetbiosAddressEa(
-  IN PUCHAR  Buffer,
-  IN BOOLEAN  IsGroupName,
-  IN PUCHAR  NetbiosName);
-
-/*
- * VOID
- * TdiBuildQueryInformation(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN UINT  QType,
- *   IN PMDL  MdlAddr);
- */
-#define TdiBuildQueryInformation(                                        \
-  Irp, DevObj, FileObj, CompRoutine, Contxt, QType, MdlAddr)             \
-{                                                                        \
-  PTDI_REQUEST_KERNEL_QUERY_INFORMATION _Request;                        \
-  PIO_STACK_LOCATION _IrpSp;                                             \
-                                                                         \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                               \
-                                                                         \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,                     \
-                  Contxt, _IrpSp, TDI_QUERY_INFORMATION);                \
-                                                                         \
-  _Request = (PTDI_REQUEST_KERNEL_QUERY_INFORMATION)&_IrpSp->Parameters; \
-  _Request->RequestConnectionInformation = NULL;                         \
-  _Request->QueryType = (ULONG)(QType);                                  \
-  (Irp)->MdlAddress   = (MdlAddr);                                       \
-}
-
-/*
- * VOID
- * TdiBuildReceive(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PMDL  MdlAddr,
- *   IN ULONG  InFlags, 
- *   IN ULONG  ReceiveLen); 
- */
-#define TdiBuildReceive(                                       \
-  Irp, DevObj, FileObj, CompRoutine, Contxt,                   \
-  MdlAddr, InFlags, ReceiveLen)                                \
-{                                                              \
-  PTDI_REQUEST_KERNEL_RECEIVE _Request;                        \
-  PIO_STACK_LOCATION _IrpSp;                                   \
-                                                               \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                     \
-                                                               \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,           \
-                  Contxt, _IrpSp, TDI_RECEIVE);                \
-                                                               \
-  _Request = (PTDI_REQUEST_KERNEL_RECEIVE)&_IrpSp->Parameters; \
-  _Request->ReceiveFlags  = (InFlags);                         \
-  _Request->ReceiveLength = (ReceiveLen);                      \
-  (Irp)->MdlAddress       = (MdlAddr);                         \
-}
-
-/*
- * VOID
- * TdiBuildReceiveDatagram(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PMDL  MdlAddr,
- *   IN ULONG  ReceiveLen,
- *   IN PTDI_CONNECTION_INFORMATION  ReceiveDatagramInfo,
- *   OUT PTDI_CONNECTION_INFORMATION  ReturnInfo,
- *   ULONG InFlags); 
- */
-#define TdiBuildReceiveDatagram(                                 \
-  Irp, DevObj, FileObj, CompRoutine, Contxt, MdlAddr,            \
-  ReceiveLen, ReceiveDatagramInfo, ReturnInfo, InFlags)          \
-{                                                                \
-  PTDI_REQUEST_KERNEL_RECEIVEDG _Request;                        \
-  PIO_STACK_LOCATION _IrpSp;                                     \
-                                                                 \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                       \
-                                                                 \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,             \
-                  Contxt, _IrpSp, TDI_RECEIVE_DATAGRAM);         \
-                                                                 \
-  _Request = (PTDI_REQUEST_KERNEL_RECEIVEDG)&_IrpSp->Parameters; \
-  _Request->ReceiveDatagramInformation = (ReceiveDatagramInfo);  \
-  _Request->ReturnDatagramInformation  = (ReturnInfo);           \
-  _Request->ReceiveLength = (ReceiveLen);                        \
-  _Request->ReceiveFlags  = (InFlags);                           \
-  (Irp)->MdlAddress       = (MdlAddr);                           \
-}
-
-/*
- * VOID
- * TdiBuildSend(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PMDL  MdlAddr,
- *   IN ULONG  InFlags,
- *   IN ULONG  SendLen);
- */
-#define TdiBuildSend(                                       \
-  Irp, DevObj, FileObj, CompRoutine, Contxt,                \
-  MdlAddr, InFlags, SendLen)                                \
-{                                                           \
-  PTDI_REQUEST_KERNEL_SEND _Request;                        \
-  PIO_STACK_LOCATION _IrpSp;                                \
-                                                            \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                  \
-                                                            \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,        \
-                  Contxt, _IrpSp, TDI_SEND);                \
-                                                            \
-  _Request = (PTDI_REQUEST_KERNEL_SEND)&_IrpSp->Parameters; \
-  _Request->SendFlags  = (InFlags);                         \
-  _Request->SendLength = (SendLen);                         \
-  (Irp)->MdlAddress    = (MdlAddr);                         \
-}
-
-/*
- * VOID
- * TdiBuildSendDatagram(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN PMDL  MdlAddr,
- *   IN ULONG  SendLen,
- *   IN PTDI_CONNECTION_INFORMATION  SendDatagramInfo); 
- */
-#define TdiBuildSendDatagram(                                 \
-  Irp, DevObj, FileObj, CompRoutine, Contxt,                  \
-  MdlAddr, SendLen, SendDatagramInfo)                         \
-{                                                             \
-  PTDI_REQUEST_KERNEL_SENDDG _Request;                        \
-  PIO_STACK_LOCATION _IrpSp;                                  \
-                                                              \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                    \
-                                                              \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,          \
-                  Contxt, _IrpSp, TDI_SEND_DATAGRAM);         \
-                                                              \
-  _Request = (PTDI_REQUEST_KERNEL_SENDDG)&_IrpSp->Parameters; \
-  _Request->SendDatagramInformation = (SendDatagramInfo);     \
-  _Request->SendLength = (SendLen);                           \
-  (Irp)->MdlAddress    = (MdlAddr);                           \
-}
-
-/*
- * VOID
- * TdiBuildSetEventHandler(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN INT  InEventType,
- *   IN PVOID  InEventHandler,
- *   IN PVOID  InEventContext);
- */
-#define TdiBuildSetEventHandler(                                 \
-  Irp, DevObj, FileObj, CompRoutine, Contxt,                     \
-  InEventType, InEventHandler, InEventContext)                   \
-{                                                                \
-  PTDI_REQUEST_KERNEL_SET_EVENT _Request;                        \
-  PIO_STACK_LOCATION _IrpSp;                                     \
-                                                                 \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                       \
-                                                                 \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,             \
-                  Contxt, _IrpSp, TDI_SET_EVENT_HANDLER);        \
-                                                                 \
-  _Request = (PTDI_REQUEST_KERNEL_SET_EVENT)&_IrpSp->Parameters; \
-  _Request->EventType    = (InEventType);                        \
-  _Request->EventHandler = (PVOID)(InEventHandler);              \
-  _Request->EventContext = (PVOID)(InEventContext);              \
-}
-
-/*
- * VOID
- * TdiBuildSetInformation(
- *   IN PIRP  Irp,
- *   IN PDEVICE_OBJECT  DevObj,
- *   IN PFILE_OBJECT  FileObj,
- *   IN PVOID  CompRoutine,
- *   IN PVOID  Contxt,
- *   IN UINT  SType,
- *   IN PMDL  MdlAddr);
- */
-#define TdiBuildSetInformation(                                        \
-  Irp, DevObj, FileObj, CompRoutine, Contxt, SType, MdlAddr)           \
-{                                                                      \
-  PTDI_REQUEST_KERNEL_SET_INFORMATION _Request;                        \
-  PIO_STACK_LOCATION _IrpSp;                                           \
-                                                                       \
-  _IrpSp = IoGetNextIrpStackLocation(Irp);                             \
-                                                                       \
-  TdiBuildBaseIrp(Irp, DevObj, FileObj, CompRoutine,                   \
-                  Contxt, _IrpSp, TDI_SET_INFORMATION);                \
-                                                                       \
-  _Request = (PTDI_REQUEST_KERNEL_SET_INFORMATION)&_IrpSp->Parameters; \
-  _Request->RequestConnectionInformation = NULL;                       \
-  _Request->SetType = (ULONG)(SType);                                  \
-  (Irp)->MdlAddress = (MdlAddr);                                       \
-}
-
-/* TDI20_CLIENT_INTERFACE_INFO.TdiVersion constants */
-#define TDI_CURRENT_MAJOR_VERSION         2
-#define TDI_CURRENT_MINOR_VERSION         0
-
-#define TDI_CURRENT_VERSION ((TDI_CURRENT_MINOR_VERSION) << 8 \
-  | (TDI_CURRENT_MAJOR_VERSION))
-
-#define TDI_VERSION_ONE                   0x0001
-
-typedef enum _TDI_PNP_OPCODE {
-  TDI_PNP_OP_MIN,
-  TDI_PNP_OP_ADD,
-  TDI_PNP_OP_DEL,
-  TDI_PNP_OP_UPDATE,
-  TDI_PNP_OP_PROVIDERREADY,
-  TDI_PNP_OP_NETREADY,
-  TDI_PNP_OP_ADD_IGNORE_BINDING,
-  TDI_PNP_OP_DELETE_IGNORE_BINDING,
-  TDI_PNP_OP_MAX
-} TDI_PNP_OPCODE;
-
-/* TDI_PNP_CONTEXT.ContextType */
-#define TDI_PNP_CONTEXT_TYPE_IF_NAME            0x1
-#define TDI_PNP_CONTEXT_TYPE_IF_ADDR            0x2
-#define TDI_PNP_CONTEXT_TYPE_PDO                0x3
-#define TDI_PNP_CONTEXT_TYPE_FIRST_OR_LAST_IF   0x4
-
-typedef struct _TDI_PNP_CONTEXT {
-  USHORT  ContextSize;
-  USHORT  ContextType;
-  UCHAR  ContextData[1];
-} TDI_PNP_CONTEXT, *PTDI_PNP_CONTEXT;
-
-typedef VOID DDKAPI
-(*TDI_ADD_ADDRESS_HANDLER)(
-  IN PTA_ADDRESS  Address);
-
-typedef VOID DDKAPI
-(*TDI_ADD_ADDRESS_HANDLER_V2)(
-  IN PTA_ADDRESS  Address,
-  IN PUNICODE_STRING  DeviceName,
-  IN PTDI_PNP_CONTEXT  Context);
-
-typedef VOID DDKAPI
-(*TDI_BINDING_HANDLER)(
-  IN TDI_PNP_OPCODE  PnPOpcode,
-  IN PUNICODE_STRING  DeviceName,
-  IN PWSTR  MultiSZBindList);
-
-typedef VOID DDKAPI
-(*TDI_BIND_HANDLER)(
-  IN PUNICODE_STRING  DeviceName);
-
-typedef VOID DDKAPI
-(*TDI_DEL_ADDRESS_HANDLER)(
-  IN PTA_ADDRESS  Address);
-
-typedef VOID DDKAPI
-(*TDI_DEL_ADDRESS_HANDLER_V2)(
-  IN PTA_ADDRESS  Address,
-  IN PUNICODE_STRING  DeviceName,
-  IN PTDI_PNP_CONTEXT  Context);
-
-typedef NTSTATUS DDKAPI
-(*TDI_PNP_POWER_HANDLER)(
-  IN PUNICODE_STRING  DeviceName,
-  IN PNET_PNP_EVENT  PowerEvent,
-  IN PTDI_PNP_CONTEXT  Context1,
-  IN PTDI_PNP_CONTEXT  Context2);
-
-typedef VOID DDKAPI
-(*TDI_UNBIND_HANDLER)(
-  IN PUNICODE_STRING  DeviceName);
-
-typedef VOID DDKAPI
-(*ProviderPnPPowerComplete)(
-  IN PNET_PNP_EVENT  NetEvent,
-  IN NTSTATUS  ProviderStatus);
-
-typedef struct _TDI20_CLIENT_INTERFACE_INFO {
-  _ANONYMOUS_UNION union {
-    _ANONYMOUS_STRUCT struct {
-      UCHAR  MajorTdiVersion;
-      UCHAR  MinorTdiVersion;
-    } DUMMYSTRUCTNAME;
-    USHORT TdiVersion;
-  } DUMMYUNIONNAME;
-  USHORT  Unused;
-  PUNICODE_STRING  ClientName;
-  TDI_PNP_POWER_HANDLER  PnPPowerHandler;
-  _ANONYMOUS_UNION union {
-    TDI_BINDING_HANDLER  BindingHandler;
-    _ANONYMOUS_STRUCT struct {
-      TDI_BIND_HANDLER  BindHandler;
-      TDI_UNBIND_HANDLER  UnBindHandler;
-    } DUMMYSTRUCTNAME;
-  }DUMMYUNIONNAME2;
-  _ANONYMOUS_UNION union {
-    _ANONYMOUS_STRUCT struct {
-      TDI_ADD_ADDRESS_HANDLER_V2  AddAddressHandlerV2;
-      TDI_DEL_ADDRESS_HANDLER_V2  DelAddressHandlerV2;
-    } DUMMYSTRUCTNAME;
-    _ANONYMOUS_STRUCT struct {
-      TDI_ADD_ADDRESS_HANDLER  AddAddressHandler;
-      TDI_DEL_ADDRESS_HANDLER  DelAddressHandler;
-    } DUMMYSTRUCTNAME2;
-  } DUMMYUNIONNAME3;
-} TDI20_CLIENT_INTERFACE_INFO, *PTDI20_CLIENT_INTERFACE_INFO;
-
-typedef TDI20_CLIENT_INTERFACE_INFO TDI_CLIENT_INTERFACE_INFO;
-typedef TDI_CLIENT_INTERFACE_INFO *PTDI_CLIENT_INTERFACE_INFO;
-
-
-/* TDI functions */
-
-/*
- * VOID
- * TdiCompleteRequest(
- *   IN PIRP Irp,
- *   IN NTSTATUS Status);
- */
-#define TdiCompleteRequest(Irp, Status)           \
-{                                                 \
-  (Irp)->IoStatus.Status = (Status);              \
-  IoCompleteRequest((Irp), IO_NETWORK_INCREMENT); \
-}
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiCopyBufferToMdl(
-  IN PVOID  SourceBuffer,
-  IN ULONG  SourceOffset,
-  IN ULONG  SourceBytesToCopy,
-  IN PMDL  DestinationMdlChain,
-  IN ULONG  DestinationOffset,
-  IN PULONG  BytesCopied);
-
-/*
- * VOID
- * TdiCopyLookaheadData(
- *   IN PVOID  Destination,
- *   IN PVOID  Source,
- *   IN ULONG  Length,
- *   IN ULONG  ReceiveFlags);
- */
-#define TdiCopyLookaheadData(Destination, Source, Length, ReceiveFlags) \
-  RtlCopyMemory(Destination, Source, Length)
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiCopyMdlChainToMdlChain (
-  IN PMDL  SourceMdlChain,
-  IN ULONG  SourceOffset,
-  IN PMDL  DestinationMdlChain,
-  IN ULONG  DestinationOffset,
-  OUT PULONG  BytesCopied);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiCopyMdlToBuffer(
-  IN PMDL  SourceMdlChain,
-  IN ULONG  SourceOffset,
-  IN PVOID  DestinationBuffer,
-  IN ULONG  DestinationOffset,
-  IN ULONG  DestinationBufferSize,
-  OUT PULONG  BytesCopied);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDeregisterAddressChangeHandler(
-  IN HANDLE  BindingHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDeregisterDeviceObject(
-  IN HANDLE  DevRegistrationHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDeregisterNetAddress(
-  IN HANDLE  AddrRegistrationHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDeregisterPnPHandlers(
-  IN HANDLE  BindingHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiDeregisterProvider(
-  IN HANDLE  ProviderHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiEnumerateAddresses(
-  IN HANDLE  BindingHandle);
-
-TDIKRNLAPI
-VOID
-DDKAPI
-TdiInitialize(
-  VOID);
-
-TDIKRNLAPI
-VOID
-DDKAPI
-TdiMapBuffer(
-  IN PMDL  MdlChain);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiMapUserRequest(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  IN PIO_STACK_LOCATION  IrpSp);
-
-TDIKRNLAPI
-BOOLEAN
-DDKAPI
-TdiMatchPdoWithChainedReceiveContext(
-  IN PVOID TsduDescriptor,
-  IN PVOID PDO);
-
-TDIKRNLAPI
-VOID
-DDKAPI
-TdiPnPPowerComplete(
-  IN HANDLE  BindingHandle,
-  IN PNET_PNP_EVENT  PowerEvent,
-  IN NTSTATUS  Status);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiPnPPowerRequest(
-  IN PUNICODE_STRING  DeviceName,
-  IN PNET_PNP_EVENT  PowerEvent,
-  IN PTDI_PNP_CONTEXT  Context1,
-  IN PTDI_PNP_CONTEXT  Context2,
-  IN ProviderPnPPowerComplete  ProtocolCompletionHandler);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiProviderReady(
-  IN HANDLE  ProviderHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiRegisterAddressChangeHandler(
-  IN TDI_ADD_ADDRESS_HANDLER  AddHandler,
-  IN TDI_DEL_ADDRESS_HANDLER  DeleteHandler,
-  OUT HANDLE  *BindingHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiRegisterDeviceObject(
-  IN PUNICODE_STRING  DeviceName,
-  OUT HANDLE  *DevRegistrationHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiRegisterNetAddress(
-  IN PTA_ADDRESS  Address,
-  IN PUNICODE_STRING  DeviceName,
-  IN PTDI_PNP_CONTEXT  Context,
-  OUT HANDLE  *AddrRegistrationHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiRegisterNotificationHandler(
-  IN TDI_BIND_HANDLER  BindHandler,
-  IN TDI_UNBIND_HANDLER  UnbindHandler,
-  OUT HANDLE  *BindingHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiRegisterPnPHandlers(
-  IN PTDI_CLIENT_INTERFACE_INFO  ClientInterfaceInfo,
-  IN ULONG  InterfaceInfoSize,
-  OUT HANDLE  *BindingHandle);
-
-TDIKRNLAPI
-NTSTATUS
-DDKAPI
-TdiRegisterProvider(
-  IN PUNICODE_STRING  ProviderName,
-  OUT HANDLE  *ProviderHandle);
-
-TDIKRNLAPI
-VOID
-DDKAPI
-TdiReturnChainedReceives(
-  IN PVOID  *TsduDescriptors,
-  IN ULONG   NumberOfTsdus);
-
-TDIKRNLAPI
-VOID
-DDKAPI
-TdiUnmapBuffer(
-  IN PMDL  MdlChain);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TDIKRNL_H */
diff --git a/winsup/w32api/include/ddk/tdistat.h b/winsup/w32api/include/ddk/tdistat.h
deleted file mode 100644
index f0588d257..000000000
--- a/winsup/w32api/include/ddk/tdistat.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * tdistat.h
- *
- * TDI status codes
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __TDISTAT_H
-#define __TDISTAT_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define TDI_SUCCESS                       STATUS_SUCCESS
-#define TDI_NO_RESOURCES                  STATUS_INSUFFICIENT_RESOURCES
-#define TDI_ADDR_IN_USE                   STATUS_ADDRESS_ALREADY_EXISTS
-#define TDI_BAD_ADDR                      STATUS_INVALID_ADDRESS_COMPONENT
-#define TDI_NO_FREE_ADDR                  STATUS_TOO_MANY_ADDRESSES
-#define TDI_ADDR_INVALID                  STATUS_INVALID_ADDRESS
-#define TDI_ADDR_DELETED                  STATUS_ADDRESS_CLOSED
-#define TDI_BUFFER_OVERFLOW               STATUS_BUFFER_OVERFLOW
-#define TDI_BAD_EVENT_TYPE                STATUS_INVALID_PARAMETER
-#define TDI_BAD_OPTION                    STATUS_INVALID_PARAMETER
-#define TDI_CONN_REFUSED                  STATUS_CONNECTION_REFUSED
-#define TDI_INVALID_CONNECTION            STATUS_CONNECTION_INVALID
-#define TDI_ALREADY_ASSOCIATED            STATUS_ADDRESS_ALREADY_ASSOCIATED
-#define TDI_NOT_ASSOCIATED                STATUS_ADDRESS_NOT_ASSOCIATED
-#define TDI_CONNECTION_ACTIVE             STATUS_CONNECTION_ACTIVE
-#define TDI_CONNECTION_ABORTED            STATUS_CONNECTION_ABORTED
-#define TDI_CONNECTION_RESET              STATUS_CONNECTION_RESET
-#define TDI_TIMED_OUT                     STATUS_IO_TIMEOUT
-#define TDI_GRACEFUL_DISC                 STATUS_GRACEFUL_DISCONNECT
-#define TDI_NOT_ACCEPTED                  STATUS_DATA_NOT_ACCEPTED
-#define TDI_MORE_PROCESSING               STATUS_MORE_PROCESSING_REQUIRED
-#define TDI_INVALID_STATE                 STATUS_INVALID_DEVICE_STATE
-#define TDI_INVALID_PARAMETER             STATUS_INVALID_PARAMETER
-#define TDI_DEST_NET_UNREACH              STATUS_NETWORK_UNREACHABLE
-#define TDI_DEST_HOST_UNREACH             STATUS_HOST_UNREACHABLE
-#define TDI_DEST_UNREACHABLE              TDI_DEST_HOST_UNREACH
-#define TDI_DEST_PROT_UNREACH             STATUS_PROTOCOL_UNREACHABLE
-#define TDI_DEST_PORT_UNREACH             STATUS_PORT_UNREACHABLE
-#define TDI_INVALID_QUERY                 STATUS_INVALID_DEVICE_REQUEST
-#define TDI_REQ_ABORTED                   STATUS_REQUEST_ABORTED
-#define TDI_BUFFER_TOO_SMALL              STATUS_BUFFER_TOO_SMALL
-#define TDI_CANCELLED                     STATUS_CANCELLED
-#define	TDI_BUFFER_TOO_BIG		            STATUS_INVALID_BUFFER_SIZE
-#define TDI_INVALID_REQUEST               STATUS_INVALID_DEVICE_REQUEST
-#define TDI_PENDING                       STATUS_PENDING
-#define TDI_ITEM_NOT_FOUND                STATUS_OBJECT_NAME_NOT_FOUND
-
-#define TDI_STATUS_BAD_VERSION            0xC0010004L
-#define TDI_STATUS_BAD_CHARACTERISTICS    0xC0010005L
-
-#define	TDI_OPTION_EOL                    0
-
-#define	TDI_ADDRESS_OPTION_REUSE          1
-#define	TDI_ADDRESS_OPTION_DHCP           2
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TDISTAT_H */
diff --git a/winsup/w32api/include/ddk/tvout.h b/winsup/w32api/include/ddk/tvout.h
deleted file mode 100644
index 740022a27..000000000
--- a/winsup/w32api/include/ddk/tvout.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * tvout.h
- *
- * Definitions for TV-out support
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __TVOUT_H
-#define __TVOUT_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-/* VIDEOPARAMETERS.dwCommand constants */
-#define VP_COMMAND_GET                    0x00000001
-#define VP_COMMAND_SET                    0x00000002
-
-/* VIDEOPARAMETERS.dwFlags constants */
-#define VP_FLAGS_TV_MODE                  0x00000001
-#define VP_FLAGS_TV_STANDARD              0x00000002
-#define VP_FLAGS_FLICKER                  0x00000004
-#define VP_FLAGS_OVERSCAN                 0x00000008
-#define VP_FLAGS_MAX_UNSCALED             0x00000010
-#define VP_FLAGS_POSITION                 0x00000020
-#define VP_FLAGS_BRIGHTNESS               0x00000040
-#define VP_FLAGS_CONTRAST                 0x00000080
-#define VP_FLAGS_COPYPROTECT              0x00000100
-
-/* VIDEOPARAMETERS.dwMode constants */
-#define VP_MODE_WIN_GRAPHICS              0x00000001
-#define VP_MODE_TV_PLAYBACK               0x00000002
-
-/* VIDEOPARAMETERS.dwTVStandard/dwAvailableTVStandard constants */
-#define VP_TV_STANDARD_NTSC_M             0x00000001
-#define VP_TV_STANDARD_NTSC_M_J           0x00000002
-#define VP_TV_STANDARD_PAL_B              0x00000004
-#define VP_TV_STANDARD_PAL_D              0x00000008
-#define VP_TV_STANDARD_PAL_H              0x00000010
-#define VP_TV_STANDARD_PAL_I              0x00000020
-#define VP_TV_STANDARD_PAL_M              0x00000040
-#define VP_TV_STANDARD_PAL_N              0x00000080
-#define VP_TV_STANDARD_SECAM_B            0x00000100
-#define VP_TV_STANDARD_SECAM_D            0x00000200
-#define VP_TV_STANDARD_SECAM_G            0x00000400
-#define VP_TV_STANDARD_SECAM_H            0x00000800
-#define VP_TV_STANDARD_SECAM_K            0x00001000
-#define VP_TV_STANDARD_SECAM_K1           0x00002000
-#define VP_TV_STANDARD_SECAM_L            0x00004000
-#define VP_TV_STANDARD_WIN_VGA            0x00008000
-#define VP_TV_STANDARD_NTSC_433           0x00010000
-#define VP_TV_STANDARD_PAL_G              0x00020000
-#define VP_TV_STANDARD_PAL_60             0x00040000
-#define VP_TV_STANDARD_SECAM_L1           0x00080000
-
-/* VIDEOPARAMETERS.dwMode constants */
-#define VP_CP_TYPE_APS_TRIGGER            0x00000001
-#define VP_CP_TYPE_MACROVISION            0x00000002
-
-/* VIDEOPARAMETERS.dwCPCommand constants */
-#define VP_CP_CMD_ACTIVATE                0x00000001
-#define VP_CP_CMD_DEACTIVATE              0x00000002
-#define VP_CP_CMD_CHANGE                  0x00000004
-
-typedef struct _VIDEOPARAMETERS {
-  GUID  Guid;
-  DWORD  dwOffset;
-  DWORD  dwCommand;
-  DWORD  dwFlags;
-  DWORD  dwMode;
-  DWORD  dwTVStandard;
-  DWORD  dwAvailableModes;
-  DWORD  dwAvailableTVStandard;
-  DWORD  dwFlickerFilter;
-  DWORD  dwOverScanX;
-  DWORD  dwOverScanY;
-  DWORD  dwMaxUnscaledX;
-  DWORD  dwMaxUnscaledY;
-  DWORD  dwPositionX;
-  DWORD  dwPositionY;
-  DWORD  dwBrightness;
-  DWORD  dwContrast;
-  DWORD  dwCPType;
-  DWORD  dwCPCommand;
-  DWORD  dwCPStandard;
-  DWORD  dwCPKey;
-  BYTE  bCP_APSTriggerBits;
-  BYTE  bOEMCopyProtection[256];
-} VIDEOPARAMETERS, *PVIDEOPARAMETERS, FAR *LPVIDEOPARAMETERS;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TVOUT_H */
diff --git a/winsup/w32api/include/ddk/upssvc.h b/winsup/w32api/include/ddk/upssvc.h
deleted file mode 100644
index 4e6f62e2d..000000000
--- a/winsup/w32api/include/ddk/upssvc.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * upssvc.h
- *
- * UPS service interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __UPSSVC_H
-#define __UPSSVC_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-#if defined(_APCUPS_)
-  #define UPSAPI DECLSPEC_EXPORT
-#else
-  #define UPSAPI DECLSPEC_IMPORT
-#endif
-
-
-#define UPS_ONLINE                        1
-#define UPS_ONBATTERY                     2
-#define UPS_LOWBATTERY                    4
-#define UPS_NOCOMM                        8
-#define UPS_CRITICAL                      16
-
-UPSAPI
-VOID
-DDKAPI
-UPSCancelWait(VOID);
-
-UPSAPI
-DWORD
-DDKAPI
-UPSGetState(VOID);
-
-#define UPS_INITUNKNOWNERROR              0
-#define UPS_INITOK                        1
-#define UPS_INITNOSUCHDRIVER              2
-#define UPS_INITBADINTERFACE              3
-#define UPS_INITREGISTRYERROR             4
-#define UPS_INITCOMMOPENERROR             5
-#define UPS_INITCOMMSETUPERROR            6
-
-UPSAPI
-DWORD
-DDKAPI
-UPSInit(VOID);
-
-UPSAPI
-VOID
-DDKAPI
-UPSStop(VOID);
-
-UPSAPI
-VOID
-DDKAPI
-UPSTurnOff(
-  IN DWORD  aTurnOffDelay);
-
-UPSAPI
-VOID
-DDKAPI
-UPSWaitForStateChange(
-  IN DWORD  aCurrentState,
-  IN DWORD  anInterval);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __UPSSVC_H */
diff --git a/winsup/w32api/include/ddk/usb.h b/winsup/w32api/include/ddk/usb.h
deleted file mode 100644
index f3439352b..000000000
--- a/winsup/w32api/include/ddk/usb.h
+++ /dev/null
@@ -1,475 +0,0 @@
-/*
- * usb.h
- *
- * USB support.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __USB_H
-#define __USB_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __USBDI_H
-#error usbdi.h cannot be included with usb.h
-#else
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "usb100.h"
-
-typedef LONG USBD_STATUS;
-typedef PVOID USBD_PIPE_HANDLE;
-typedef PVOID USBD_CONFIGURATION_HANDLE;
-typedef PVOID USBD_INTERFACE_HANDLE;
-
-#define USBD_STATUS_SUCCESS               ((USBD_STATUS)0x00000000L)
-#define USBD_STATUS_PENDING               ((USBD_STATUS)0x40000000L)
-#define USBD_STATUS_CRC                   ((USBD_STATUS)0xC0000001L)
-#define USBD_STATUS_BTSTUFF               ((USBD_STATUS)0xC0000002L)
-#define USBD_STATUS_DATA_TOGGLE_MISMATCH  ((USBD_STATUS)0xC0000003L)
-#define USBD_STATUS_STALL_PID             ((USBD_STATUS)0xC0000004L)
-#define USBD_STATUS_DEV_NOT_RESPONDING    ((USBD_STATUS)0xC0000005L)
-#define USBD_STATUS_PID_CHECK_FAILURE     ((USBD_STATUS)0xC0000006L)
-#define USBD_STATUS_UNEXPECTED_PID        ((USBD_STATUS)0xC0000007L)
-#define USBD_STATUS_DATA_OVERRUN          ((USBD_STATUS)0xC0000008L)
-#define USBD_STATUS_DATA_UNDERRUN         ((USBD_STATUS)0xC0000009L)
-#define USBD_STATUS_RESERVED1             ((USBD_STATUS)0xC000000AL)
-#define USBD_STATUS_RESERVED2             ((USBD_STATUS)0xC000000BL)
-#define USBD_STATUS_BUFFER_OVERRUN        ((USBD_STATUS)0xC000000CL)
-#define USBD_STATUS_BUFFER_UNDERRUN       ((USBD_STATUS)0xC000000DL)
-#define USBD_STATUS_NOT_ACCESSED          ((USBD_STATUS)0xC000000FL)
-#define USBD_STATUS_FIFO                  ((USBD_STATUS)0xC0000010L)
-#define USBD_STATUS_XACT_ERROR            ((USBD_STATUS)0xC0000011L)
-#define USBD_STATUS_BABBLE_DETECTED       ((USBD_STATUS)0xC0000012L)
-#define USBD_STATUS_DATA_BUFFER_ERROR     ((USBD_STATUS)0xC0000013L)
-#define USBD_STATUS_ENDPOINT_HALTED       ((USBD_STATUS)0xC0000030L)
-#define USBD_STATUS_INVALID_URB_FUNCTION  ((USBD_STATUS)0x80000200L)
-#define USBD_STATUS_INVALID_PARAMETER     ((USBD_STATUS)0x80000300L)
-#define USBD_STATUS_ERROR_BUSY            ((USBD_STATUS)0x80000400L)
-#define USBD_STATUS_INVALID_PIPE_HANDLE   ((USBD_STATUS)0x80000600L)
-#define USBD_STATUS_NO_BANDWIDTH          ((USBD_STATUS)0x80000700L)
-#define USBD_STATUS_INTERNAL_HC_ERROR     ((USBD_STATUS)0x80000800L)
-#define USBD_STATUS_ERROR_SHORT_TRANSFER  ((USBD_STATUS)0x80000900L)
-#define USBD_STATUS_BAD_START_FRAME       ((USBD_STATUS)0xC0000A00L)
-#define USBD_STATUS_ISOCH_REQUEST_FAILED  ((USBD_STATUS)0xC0000B00L)
-#define USBD_STATUS_FRAME_CONTROL_OWNED   ((USBD_STATUS)0xC0000C00L)
-#define USBD_STATUS_FRAME_CONTROL_NOT_OWNED \
-                                          ((USBD_STATUS)0xC0000D00L)
-#define USBD_STATUS_NOT_SUPPORTED         ((USBD_STATUS)0xC0000E00L)
-#define USBD_STATUS_INAVLID_CONFIGURATION_DESCRIPTOR \
-                                          ((USBD_STATUS)0xC0000F00L)
-#define USBD_STATUS_INSUFFICIENT_RESOURCES \
-                                          ((USBD_STATUS)0xC0001000L)                                          
-#define USBD_STATUS_SET_CONFIG_FAILED     ((USBD_STATUS)0xC0002000L)
-#define USBD_STATUS_BUFFER_TOO_SMALL      ((USBD_STATUS)0xC0003000L)
-#define USBD_STATUS_INTERFACE_NOT_FOUND   ((USBD_STATUS)0xC0004000L)
-#define USBD_STATUS_INAVLID_PIPE_FLAGS    ((USBD_STATUS)0xC0005000L)
-#define USBD_STATUS_TIMEOUT               ((USBD_STATUS)0xC0006000L)
-#define USBD_STATUS_DEVICE_GONE           ((USBD_STATUS)0xC0007000L)
-#define USBD_STATUS_STATUS_NOT_MAPPED     ((USBD_STATUS)0xC0008000L)
-#define USBD_STATUS_CANCELED              ((USBD_STATUS)0xC0010000L)
-#define USBD_STATUS_ISO_NOT_ACCESSED_BY_HW \
-                                          ((USBD_STATUS)0xC0020000L)   
-#define USBD_STATUS_ISO_TD_ERROR          ((USBD_STATUS)0xC0030000L)   
-#define USBD_STATUS_ISO_NA_LATE_USBPORT   ((USBD_STATUS)0xC0040000L) 
-#define USBD_STATUS_ISO_NOT_ACCESSED_LATE ((USBD_STATUS)0xC0050000L)
-
-#define USBD_SUCCESS(Status) ((USBD_STATUS)(Status) >= 0)
-#define USBD_PENDING(Status) ((ULONG)(Status) >> 30 == 1)
-#define USBD_ERROR(Status) ((USBD_STATUS)(Status) < 0)
-
-/* URB TransferFlags constants */
-#define USBD_TRANSFER_DIRECTION(x)        ((x) & USBD_TRANSFER_DIRECTION_IN)
-#define USBD_TRANSFER_DIRECTION_OUT       0   
-#define USBD_TRANSFER_DIRECTION_BIT       0
-#define USBD_TRANSFER_DIRECTION_IN        (1 << USBD_TRANSFER_DIRECTION_BIT)
-#define USBD_SHORT_TRANSFER_OK_BIT        1
-#define USBD_SHORT_TRANSFER_OK            (1 << USBD_SHORT_TRANSFER_OK_BIT)
-#define USBD_START_ISO_TRANSFER_ASAP_BIT  2
-#define USBD_START_ISO_TRANSFER_ASAP      (1 << USBD_START_ISO_TRANSFER_ASAP_BIT)
-#define USBD_DEFAULT_PIPE_TRANSFER_BIT    3
-#define USBD_DEFAULT_PIPE_TRANSFER        (1 << USBD_DEFAULT_PIPE_TRANSFER_BIT)
-
-#define USBD_TRANSFER_DIRECTION_FLAG(flags) ((flags) & USBD_TRANSFER_DIRECTION)
-
-#define VALID_TRANSFER_FLAGS_MASK \
-  (USBD_SHORT_TRANSFER_OK | \
-  USBD_TRANSFER_DIRECTION | \
-  USBD_START_ISO_TRANSFER_ASAP | \
-  USBD_DEFAULT_PIPE_TRANSFER)
-
-#define USB_DEFAULT_DEVICE_ADDRESS        0
-#define USB_DEFAULT_ENDPOINT_ADDRESS      0
-#define USB_DEFAULT_MAX_PACKET            64
-#define USBD_ISO_START_FRAME_RANGE        1024
-#define USBD_DEFAULT_MAXIMUM_TRANSFER_SIZE  0xFFFFFFFF
-
-typedef enum _USB_CONTROLLER_FLAVOR {
-	USB_HcGeneric = 0,
-	OHCI_Generic = 100,
-	OHCI_Hydra,
-	OHCI_NEC,
-	UHCI_Generic = 200,
-	UHCI_Piix4,
-	UHCI_Piix3,
-	UHCI_Ich2_1,
-	UHCI_Ich2_2,
-	UHCI_Ich1,
-	UHCI_VIA = 250,
-	EHCI_Generic = 1000,
-	EHCI_NEC = 2000,
-	EHCI_Lucent = 3000
-} USB_CONTROLLER_FLAVOR;
-
-struct _URB_HEADER { 
-	USHORT  Length;
-	USHORT  Function;
-	USBD_STATUS  Status;
-	PVOID  UsbdDeviceHandle;
-	ULONG  UsbdFlags;
-};
-
-typedef struct _USBD_VERSION_INFORMATION {
-	ULONG  USBDI_Version;
-	ULONG  Supported_USB_Version;
-} USBD_VERSION_INFORMATION, *PUSBD_VERSION_INFORMATION;
-
-struct _URB_HCD_AREA {
-  PVOID  Reserved8[8];
-};
-
-struct _URB_BULK_OR_INTERRUPT_TRANSFER {
-  struct _URB_HEADER  Hdr;
-  USBD_PIPE_HANDLE  PipeHandle;
-  ULONG  TransferFlags;
-  ULONG  TransferBufferLength;
-  PVOID  TransferBuffer;
-  PMDL  TransferBufferMDL;
-  struct _URB  *UrbLink;
-  struct _URB_HCD_AREA  hca;
-};
-
-struct _URB_CONTROL_DESCRIPTOR_REQUEST { 
-  struct _URB_HEADER  Hdr;
-  PVOID  Reserved;
-  ULONG  Reserved0;
-  ULONG  TransferBufferLength;
-  PVOID  TransferBuffer;
-  PMDL  TransferBufferMDL;
-  struct _URB *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	USHORT  Reserved1;
-  UCHAR  Index;
-  UCHAR  DescriptorType;
-  USHORT  LanguageId;
-  USHORT  Reserved2;
-};
-
-struct _URB_CONTROL_FEATURE_REQUEST { 
-  struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  Reserved2;
-	ULONG  Reserved3;
-	PVOID  Reserved4;
-	PMDL  Reserved5;
-  struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	USHORT  Reserved0;
-  USHORT  FeatureSelector;
-  USHORT  Index;
-  USHORT Reserved1;
-};
-
-struct _URB_CONTROL_GET_CONFIGURATION_REQUEST {
-  struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  Reserved0;
-  ULONG  TransferBufferLength;
-  PVOID  TransferBuffer;
-  PMDL  TransferBufferMDL;
-  struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	UCHAR  Reserved1[8];    
-};
-
-struct _URB_CONTROL_GET_INTERFACE_REQUEST { 
-	struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  Reserved0;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	UCHAR  Reserved1[4];
-	USHORT  Interface;
-	USHORT  Reserved2;
-};
-
-struct _URB_CONTROL_GET_STATUS_REQUEST { 
-	struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  Reserved0;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	UCHAR  Reserved1[4];
-	USHORT  Index;
-	USHORT  Reserved2;
-};
-
-struct _URB_CONTROL_TRANSFER { 
-  struct _URB_HEADER  Hdr;
-  USBD_PIPE_HANDLE  PipeHandle;
-  ULONG  TransferFlags;
-  ULONG  TransferBufferLength;
-  PVOID  TransferBuffer;
-  PMDL TransferBufferMDL;
-  struct _URB  *UrbLink;
-  struct _URB_HCD_AREA  hca;
-  UCHAR  SetupPacket[8];
-};
-
-struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST {
-	struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  TransferFlags;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	UCHAR  RequestTypeReservedBits;
-	UCHAR  Request;
-	USHORT  Value;
-	USHORT  Index;
-	USHORT  Reserved1;
-};
-
-struct _URB_FRAME_LENGTH_CONTROL {
-  struct _URB_HEADER  Hdr;
-};
-
-struct _URB_GET_CURRENT_FRAME_NUMBER {
-  struct _URB_HEADER  Hdr;
-  ULONG  FrameNumber;
-};
-
-struct _URB_GET_FRAME_LENGTH {
-  struct _URB_HEADER  Hdr;
-  ULONG  FrameLength;
-  ULONG  FrameNumber;
-};
-
-typedef struct _USBD_ISO_PACKET_DESCRIPTOR {
-  ULONG  Offset;
-  ULONG  Length;
-  USBD_STATUS  Status;
-} USBD_ISO_PACKET_DESCRIPTOR, *PUSBD_ISO_PACKET_DESCRIPTOR;
-
-struct _URB_ISOCH_TRANSFER { 
-  struct _URB_HEADER  Hdr; 
-  USBD_PIPE_HANDLE  PipeHandle;
-  ULONG  TransferFlags;
-  ULONG  TransferBufferLength;
-  PVOID  TransferBuffer;
-  PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-  ULONG  StartFrame;
-  ULONG  NumberOfPackets;
-  ULONG  ErrorCount;
-  USBD_ISO_PACKET_DESCRIPTOR  IsoPacket[1];
-};
-
-typedef enum _USBD_PIPE_TYPE {
-	UsbdPipeTypeControl,
-	UsbdPipeTypeIsochronous,
-	UsbdPipeTypeBulk,
-	UsbdPipeTypeInterrupt
-} USBD_PIPE_TYPE;
-
-typedef struct _USBD_PIPE_INFORMATION {
-  USHORT  MaximumPacketSize;
-  UCHAR  EndpointAddress;
-  UCHAR  Interval;
-  USBD_PIPE_TYPE  PipeType;
-  USBD_PIPE_HANDLE  PipeHandle;
-  ULONG  MaximumTransferSize;
-  ULONG  PipeFlags;
-} USBD_PIPE_INFORMATION, *PUSBD_PIPE_INFORMATION ;
-
-#define USBD_PIPE_DIRECTION_IN(pipeInformation) \
-  ((pipeInformation)->EndpointAddress & USB_ENDPOINT_DIRECTION_MASK) 
-
-typedef struct _USBD_INTERFACE_INFORMATION {
-  USHORT  Length;
-  UCHAR  InterfaceNumber;
-  UCHAR  AlternateSetting;
-  UCHAR  Class;
-  UCHAR  SubClass;
-  UCHAR  Protocol;
-  UCHAR  Reserved;
-  USBD_INTERFACE_HANDLE  InterfaceHandle;
-  ULONG  NumberOfPipes;
-  USBD_PIPE_INFORMATION Pipes[1];
-} USBD_INTERFACE_INFORMATION, *PUSBD_INTERFACE_INFORMATION;
-
-struct _URB_SELECT_INTERFACE { 
-  struct _URB_HEADER  Hdr;
-  USBD_CONFIGURATION_HANDLE  ConfigurationHandle;
-  USBD_INTERFACE_INFORMATION  Interface;
-};
-
-struct _URB_SELECT_CONFIGURATION { 
-  struct _URB_HEADER  Hdr;
-  PUSB_CONFIGURATION_DESCRIPTOR  ConfigurationDescriptor;
-  USBD_CONFIGURATION_HANDLE  ConfigurationHandle;
-  USBD_INTERFACE_INFORMATION  Interface;
-};
-
-struct _URB_PIPE_REQUEST {
-	struct _URB_HEADER  Hdr;
-	USBD_PIPE_HANDLE  PipeHandle;
-	ULONG  Reserved;
-};
-
-struct _URB_SET_FRAME_LENGTH {
-  struct _URB_HEADER  Hdr;
-  LONG  FrameLengthDelta;
-};
-
-typedef struct _URB { 
-  _ANONYMOUS_UNION union {
-		struct _URB_HEADER  UrbHeader;
-		struct _URB_SELECT_INTERFACE  UrbSelectInterface;
-		struct _URB_SELECT_CONFIGURATION  UrbSelectConfiguration;
-		struct _URB_PIPE_REQUEST  UrbPipeRequest;
-		struct _URB_FRAME_LENGTH_CONTROL  UrbFrameLengthControl;
-		struct _URB_GET_FRAME_LENGTH  UrbGetFrameLength;
-		struct _URB_SET_FRAME_LENGTH  UrbSetFrameLength;
-		struct _URB_GET_CURRENT_FRAME_NUMBER  UrbGetCurrentFrameNumber;
-		struct _URB_CONTROL_TRANSFER  UrbControlTransfer;
-		struct _URB_BULK_OR_INTERRUPT_TRANSFER  UrbBulkOrInterruptTransfer;
-		struct _URB_ISOCH_TRANSFER  UrbIsochronousTransfer;
-		struct _URB_CONTROL_DESCRIPTOR_REQUEST  UrbControlDescriptorRequest;
-		struct _URB_CONTROL_GET_STATUS_REQUEST  UrbControlGetStatusRequest;
-		struct _URB_CONTROL_FEATURE_REQUEST  UrbControlFeatureRequest;
-		struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST  UrbControlVendorClassRequest;
-		struct _URB_CONTROL_GET_INTERFACE_REQUEST  UrbControlGetInterfaceRequest;
-		struct _URB_CONTROL_GET_CONFIGURATION_REQUEST  UrbControlGetConfigurationRequest;
-  } DUMMYUNIONNAME;
-} URB, *PURB;
-
-#define URB_FROM_IRP(Irp) ((IoGetCurrentIrpStackLocation(Irp))->Parameters.Others.Argument1)
-
-#define URB_FUNCTION_SELECT_CONFIGURATION            0x0000
-#define URB_FUNCTION_SELECT_INTERFACE                0x0001
-#define URB_FUNCTION_ABORT_PIPE                      0x0002
-#define URB_FUNCTION_TAKE_FRAME_LENGTH_CONTROL       0x0003
-#define URB_FUNCTION_RELEASE_FRAME_LENGTH_CONTROL    0x0004
-#define URB_FUNCTION_GET_FRAME_LENGTH                0x0005
-#define URB_FUNCTION_SET_FRAME_LENGTH                0x0006
-#define URB_FUNCTION_GET_CURRENT_FRAME_NUMBER        0x0007
-#define URB_FUNCTION_CONTROL_TRANSFER                0x0008
-#define URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER      0x0009
-#define URB_FUNCTION_ISOCH_TRANSFER                  0x000A
-#define URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE      0x000B
-#define URB_FUNCTION_SET_DESCRIPTOR_TO_DEVICE        0x000C
-#define URB_FUNCTION_SET_FEATURE_TO_DEVICE           0x000D
-#define URB_FUNCTION_SET_FEATURE_TO_INTERFACE        0x000E
-#define URB_FUNCTION_SET_FEATURE_TO_ENDPOINT         0x000F
-#define URB_FUNCTION_CLEAR_FEATURE_TO_DEVICE         0x0010
-#define URB_FUNCTION_CLEAR_FEATURE_TO_INTERFACE      0x0011
-#define URB_FUNCTION_CLEAR_FEATURE_TO_ENDPOINT       0x0012
-#define URB_FUNCTION_GET_STATUS_FROM_DEVICE          0x0013
-#define URB_FUNCTION_GET_STATUS_FROM_INTERFACE       0x0014
-#define URB_FUNCTION_GET_STATUS_FROM_ENDPOINT        0x0015
-#define URB_FUNCTION_RESERVED_0X0016                 0x0016
-#define URB_FUNCTION_VENDOR_DEVICE                   0x0017
-#define URB_FUNCTION_VENDOR_INTERFACE                0x0018
-#define URB_FUNCTION_VENDOR_ENDPOINT                 0x0019
-#define URB_FUNCTION_CLASS_DEVICE                    0x001A
-#define URB_FUNCTION_CLASS_INTERFACE                 0x001B
-#define URB_FUNCTION_CLASS_ENDPOINT                  0x001C
-#define URB_FUNCTION_RESERVE_0X001D                  0x001D
-#define URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL 0x001E
-#define URB_FUNCTION_CLASS_OTHER                     0x001F
-#define URB_FUNCTION_VENDOR_OTHER                    0x0020
-#define URB_FUNCTION_GET_STATUS_FROM_OTHER           0x0021
-#define URB_FUNCTION_CLEAR_FEATURE_TO_OTHER          0x0022
-#define URB_FUNCTION_SET_FEATURE_TO_OTHER            0x0023
-#define URB_FUNCTION_GET_DESCRIPTOR_FROM_ENDPOINT    0x0024
-#define URB_FUNCTION_SET_DESCRIPTOR_TO_ENDPOINT      0x0025
-#define URB_FUNCTION_GET_CONFIGURATION               0x0026
-#define URB_FUNCTION_GET_INTERFACE                   0x0027
-#define URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE   0x0028
-#define URB_FUNCTION_SET_DESCRIPTOR_TO_INTERFACE     0x0029
-#define URB_FUNCTION_GET_MS_FEATURE_DESCRIPTOR       0x002A
-#define URB_FUNCTION_RESERVE_0X002B                  0x002B
-#define URB_FUNCTION_RESERVE_0X002C                  0x002C
-#define URB_FUNCTION_RESERVE_0X002D                  0x002D
-#define URB_FUNCTION_RESERVE_0X002E                  0x002E
-#define URB_FUNCTION_RESERVE_0X002F                  0x002F
-#define URB_FUNCTION_SYNC_RESET_PIPE                 0x0030
-#define URB_FUNCTION_SYNC_CLEAR_STALL                0x0031
-
-#define USBD_PF_CHANGE_MAX_PACKET         0x00000001
-#define USBD_PF_SHORT_PACKET_OPT          0x00000002 
-#define USBD_PF_ENABLE_RT_THREAD_ACCESS   0x00000004 
-#define USBD_PF_MAP_ADD_TRANSFERS         0x00000008 
-
-#define USBD_PF_VALID_MASK (USBD_PF_CHANGE_MAX_PACKET | \
-                            USBD_PF_SHORT_PACKET_OPT | \
-                            USBD_PF_ENABLE_RT_THREAD_ACCESS | \
-                            USBD_PF_MAP_ADD_TRANSFERS)
-
-#define OS_STRING_DESCRIPTOR_INDEX        0xEE
-
-#define MS_GENRE_DESCRIPTOR_INDEX         0x0001
-#define MS_POWER_DESCRIPTOR_INDEX         0x0002
-
-#define MS_OS_STRING_SIGNATURE            L"MSFT100"
-
-typedef struct _OS_STRING {
-	UCHAR  bLength;
-	UCHAR  bDescriptorType;
-	WCHAR  MicrosoftString[7];
-	UCHAR  bVendorCode;
-	UCHAR  bPad;
-} OS_STRING, *POS_STRING;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* defined __USBDI_H */
- 
-#endif /* __USB_H */
diff --git a/winsup/w32api/include/ddk/usb100.h b/winsup/w32api/include/ddk/usb100.h
deleted file mode 100644
index df28f1712..000000000
--- a/winsup/w32api/include/ddk/usb100.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * usb100.h
- *
- * USB 1.0 support
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __USB100_H
-#define __USB100_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define MAXIMUM_USB_STRING_LENGTH         255
-
-#define USB_DEVICE_CLASS_RESERVED           0x00
-#define USB_DEVICE_CLASS_AUDIO              0x01
-#define USB_DEVICE_CLASS_COMMUNICATIONS     0x02
-#define USB_DEVICE_CLASS_HUMAN_INTERFACE    0x03
-#define USB_DEVICE_CLASS_MONITOR            0x04
-#define USB_DEVICE_CLASS_PHYSICAL_INTERFACE 0x05
-#define USB_DEVICE_CLASS_POWER              0x06
-#define USB_DEVICE_CLASS_PRINTER            0x07
-#define USB_DEVICE_CLASS_STORAGE            0x08
-#define USB_DEVICE_CLASS_HUB                0x09
-#define USB_DEVICE_CLASS_VENDOR_SPECIFIC    0xFF
-
-#define USB_RESERVED_DESCRIPTOR_TYPE        0x06
-#define USB_CONFIG_POWER_DESCRIPTOR_TYPE    0x07
-#define USB_INTERFACE_POWER_DESCRIPTOR_TYPE 0x08
-
-#define USB_REQUEST_GET_STATUS            0x00
-#define USB_REQUEST_CLEAR_FEATURE         0x01
-#define USB_REQUEST_SET_FEATURE           0x03
-#define USB_REQUEST_SET_ADDRESS           0x05
-#define USB_REQUEST_GET_DESCRIPTOR        0x06
-#define USB_REQUEST_SET_DESCRIPTOR        0x07
-#define USB_REQUEST_GET_CONFIGURATION     0x08
-#define USB_REQUEST_SET_CONFIGURATION     0x09
-#define USB_REQUEST_GET_INTERFACE         0x0A
-#define USB_REQUEST_SET_INTERFACE         0x0B
-#define USB_REQUEST_SYNC_FRAME            0x0C
-
-#define USB_GETSTATUS_SELF_POWERED            0x01
-#define USB_GETSTATUS_REMOTE_WAKEUP_ENABLED   0x02
-
-#define BMREQUEST_HOST_TO_DEVICE          0
-#define BMREQUEST_DEVICE_TO_HOST          1
-
-#define BMREQUEST_STANDARD                0
-#define BMREQUEST_CLASS                   1
-#define BMREQUEST_VENDOR                  2
-
-#define BMREQUEST_TO_DEVICE               0
-#define BMREQUEST_TO_INTERFACE            1
-#define BMREQUEST_TO_ENDPOINT             2
-#define BMREQUEST_TO_OTHER                3
-
-/* USB_COMMON_DESCRIPTOR.bDescriptorType constants */
-#define USB_DEVICE_DESCRIPTOR_TYPE        0x01
-#define USB_CONFIGURATION_DESCRIPTOR_TYPE 0x02
-#define USB_STRING_DESCRIPTOR_TYPE        0x03
-#define USB_INTERFACE_DESCRIPTOR_TYPE     0x04
-#define USB_ENDPOINT_DESCRIPTOR_TYPE      0x05
-
-typedef struct _USB_COMMON_DESCRIPTOR {
-	UCHAR  bLength;
-	UCHAR  bDescriptorType;
-} USB_COMMON_DESCRIPTOR, *PUSB_COMMON_DESCRIPTOR;
-
-#define USB_DESCRIPTOR_MAKE_TYPE_AND_INDEX(d, i) ((USHORT)((USHORT)d << 8 | i))
-
-/* USB_CONFIGURATION_DESCRIPTOR.bmAttributes constants */
-#define USB_CONFIG_POWERED_MASK           0xc0
-#define USB_CONFIG_BUS_POWERED            0x80
-#define USB_CONFIG_SELF_POWERED           0x40
-#define USB_CONFIG_REMOTE_WAKEUP          0x20
-
-typedef struct _USB_CONFIGURATION_DESCRIPTOR { 
-  UCHAR  bLength;
-  UCHAR  bDescriptorType;
-  USHORT  wTotalLength;
-  UCHAR  bNumInterfaces;
-  UCHAR  iConfiguration;
-  UCHAR  bmAttributes;
-  UCHAR  MaxPower;
-} USB_CONFIGURATION_DESCRIPTOR, *PUSB_CONFIGURATION_DESCRIPTOR;
-
-typedef struct _USB_DEVICE_DESCRIPTOR { 
-  UCHAR  bLength;
-  UCHAR  bDescriptorType;
-  USHORT  bcdUSB;
-  UCHAR  bDeviceClass;
-  UCHAR  bDeviceSubClass;
-  UCHAR  bDeviceProtocol;
-  UCHAR  bMaxPacketSize0;
-  USHORT  idVendor;
-  USHORT  idProduct;
-  USHORT  bcdDevice;
-  UCHAR  iManufacturer;
-  UCHAR  iProduct;
-  UCHAR  iSerialNumber;
-  UCHAR  bNumConfigurations;
-} USB_DEVICE_DESCRIPTOR, *PUSB_DEVICE_DESCRIPTOR;
-
-#define USB_ENDPOINT_DIRECTION_MASK       0x80
-
-#define USB_ENDPOINT_DIRECTION_OUT(x) (!((x) & USB_ENDPOINT_DIRECTION_MASK))
-#define USB_ENDPOINT_DIRECTION_IN(x) ((x) & USB_ENDPOINT_DIRECTION_MASK)
-
-/* USB_ENDPOINT_DESCRIPTOR.bmAttributes constants */
-#define USB_ENDPOINT_TYPE_MASK            0x03
-#define USB_ENDPOINT_TYPE_CONTROL         0x00
-#define USB_ENDPOINT_TYPE_ISOCHRONOUS     0x01
-#define USB_ENDPOINT_TYPE_BULK            0x02
-#define USB_ENDPOINT_TYPE_INTERRUPT       0x03
-
-typedef struct _USB_ENDPOINT_DESCRIPTOR { 
-  UCHAR  bLength;
-  UCHAR  bDescriptorType;
-  UCHAR  bEndpointAddress;
-  UCHAR  bmAttributes;
-  USHORT  wMaxPacketSize;
-  UCHAR  bInterval;
-} USB_ENDPOINT_DESCRIPTOR, *PUSB_ENDPOINT_DESCRIPTOR;
-
-#define USB_FEATURE_ENDPOINT_STALL        0x0000
-#define USB_FEATURE_REMOTE_WAKEUP         0x0001
-
-typedef struct _USB_INTERFACE_DESCRIPTOR { 
-  UCHAR  bLength;
-  UCHAR  bDescriptorType;
-  UCHAR  bInterfaceNumber;
-  UCHAR  bAlternateSetting;
-  UCHAR  bNumEndpoints;
-  UCHAR  bInterfaceClass;
-  UCHAR  bInterfaceSubClass;
-  UCHAR  bInterfaceProtocol;
-  UCHAR  iInterface;
-} USB_INTERFACE_DESCRIPTOR, *PUSB_INTERFACE_DESCRIPTOR;
-
-typedef struct _USB_STRING_DESCRIPTOR {
-  UCHAR  bLength;
-  UCHAR  bDescriptorType;
-  WCHAR  bString[1];
-} USB_STRING_DESCRIPTOR, *PUSB_STRING_DESCRIPTOR;
-
-typedef struct _USB_HUB_DESCRIPTOR {
-	UCHAR  bDescriptorLength;
-	UCHAR  bDescriptorType;
-	UCHAR  bNumberOfPorts;
-	USHORT  wHubCharacteristics;
-	UCHAR  bPowerOnToPowerGood;
-	UCHAR  bHubControlCurrent;
-	UCHAR  bRemoveAndPowerMask[64];
-} USB_HUB_DESCRIPTOR, *PUSB_HUB_DESCRIPTOR;
-
-#define USB_SUPPORT_D0_COMMAND            0x01
-#define USB_SUPPORT_D1_COMMAND            0x02
-#define USB_SUPPORT_D2_COMMAND            0x04
-#define USB_SUPPORT_D3_COMMAND            0x08
-
-#define USB_SUPPORT_D1_WAKEUP             0x10
-#define USB_SUPPORT_D2_WAKEUP             0x20
-
-typedef struct _USB_CONFIGURATION_POWER_DESCRIPTOR {
-	UCHAR  bLength;
-	UCHAR  bDescriptorType;
-	UCHAR  SelfPowerConsumedD0[3];
-	UCHAR  bPowerSummaryId;
-	UCHAR  bBusPowerSavingD1;
-	UCHAR  bSelfPowerSavingD1;
-	UCHAR  bBusPowerSavingD2;
-	UCHAR  bSelfPowerSavingD2; 
-	UCHAR  bBusPowerSavingD3;
-	UCHAR  bSelfPowerSavingD3; 
-	USHORT  TransitionTimeFromD1;
-	USHORT  TransitionTimeFromD2;
-	USHORT  TransitionTimeFromD3;
-} USB_CONFIGURATION_POWER_DESCRIPTOR, *PUSB_CONFIGURATION_POWER_DESCRIPTOR;
-
-#define USB_FEATURE_INTERFACE_POWER_D0    0x0002
-#define USB_FEATURE_INTERFACE_POWER_D1    0x0003
-#define USB_FEATURE_INTERFACE_POWER_D2    0x0004
-#define USB_FEATURE_INTERFACE_POWER_D3    0x0005
-
-typedef struct _USB_INTERFACE_POWER_DESCRIPTOR {
-	UCHAR  bLength;
-	UCHAR  bDescriptorType;
-	UCHAR  bmCapabilitiesFlags;
-	UCHAR  bBusPowerSavingD1;
-	UCHAR  bSelfPowerSavingD1;
-	UCHAR  bBusPowerSavingD2;
-	UCHAR  bSelfPowerSavingD2; 
-	UCHAR  bBusPowerSavingD3;
-	UCHAR  bSelfPowerSavingD3; 
-	USHORT  TransitionTimeFromD1;
-	USHORT  TransitionTimeFromD2;
-	USHORT  TransitionTimeFromD3;
-} USB_INTERFACE_POWER_DESCRIPTOR, *PUSB_INTERFACE_POWER_DESCRIPTOR;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USB100_H */
diff --git a/winsup/w32api/include/ddk/usbcamdi.h b/winsup/w32api/include/ddk/usbcamdi.h
deleted file mode 100644
index 5d96435d8..000000000
--- a/winsup/w32api/include/ddk/usbcamdi.h
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * usbcamdi.h
- *
- * USB Camera driver interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __USBCAMDI_H
-#define __USBCAMDI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#if !defined(__USB_H) && !defined(__USBDI_H)
-#error include usb.h or usbdi.h before usbcamdi.h
-#else
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-#if defined(_BATTERYCLASS_)
-  #define USBCAMAPI DECLSPEC_EXPORT
-#else
-  #define USBCAMAPI DECLSPEC_IMPORT
-#endif
-
-
-/* FIXME: Unknown definition */
-typedef PVOID PHW_STREAM_REQUEST_BLOCK;
-
-DEFINE_GUID(GUID_USBCAMD_INTERFACE,
-  0x2bcb75c0, 0xb27f, 0x11d1, 0xba, 0x41, 0x0, 0xa0, 0xc9, 0xd, 0x2b, 0x5);
-
-#define USBCAMD_PROCESSPACKETEX_DropFrame             0x0002 
-#define USBCAMD_PROCESSPACKETEX_NextFrameIsStill      0x0004 
-#define USBCAMD_PROCESSPACKETEX_CurrentFrameIsStill   0x0008 
-
-#define USBCAMD_DATA_PIPE                 0x0001
-#define USBCAMD_MULTIPLEX_PIPE            0x0002
-#define USBCAMD_SYNC_PIPE                 0x0004
-#define USBCAMD_DONT_CARE_PIPE            0x0008
-
-#define USBCAMD_VIDEO_STREAM              0x1
-#define USBCAMD_STILL_STREAM              0x2
-#define USBCAMD_VIDEO_STILL_STREAM        (USBCAMD_VIDEO_STREAM | USBCAMD_STILL_STREAM)
-
-#define USBCAMD_STOP_STREAM               0x00000001
-#define USBCAMD_START_STREAM              0x00000000
-
-typedef struct _pipe_config_descriptor {
-  CHAR  StreamAssociation;
-  UCHAR  PipeConfigFlags;
-} USBCAMD_Pipe_Config_Descriptor, *PUSBCAMD_Pipe_Config_Descriptor;
-
-typedef enum {
-	USBCAMD_CamControlFlag_NoVideoRawProcessing = 1,
-	USBCAMD_CamControlFlag_NoStillRawProcessing = 2,
-	USBCAMD_CamControlFlag_AssociatedFormat = 4,
-	USBCAMD_CamControlFlag_EnableDeviceEvents = 8
-} USBCAMD_CamControlFlags;
-
-typedef NTSTATUS DDKAPI
-(*PCAM_ALLOCATE_BW_ROUTINE)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  PULONG  RawFrameLength,
-  PVOID  Format);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_ALLOCATE_BW_ROUTINE_EX)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  PULONG  RawFrameLength,
-  PVOID  Format,
-  ULONG  StreamNumber);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_CONFIGURE_ROUTINE)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  PUSBD_INTERFACE_INFORMATION  Interface,
-  PUSB_CONFIGURATION_DESCRIPTOR  ConfigurationDescriptor,
-  PLONG  DataPipeIndex,
-  PLONG  SyncPipeIndex);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_CONFIGURE_ROUTINE_EX)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  PUSBD_INTERFACE_INFORMATION  Interface,
-  PUSB_CONFIGURATION_DESCRIPTOR  ConfigurationDescriptor,
-  ULONG  PipeConfigListSize,
-  PUSBCAMD_Pipe_Config_Descriptor  PipeConfig,
-  PUSB_DEVICE_DESCRIPTOR  DeviceDescriptor);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_FREE_BW_ROUTINE)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_FREE_BW_ROUTINE_EX)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  ULONG  StreamNumber);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_INITIALIZE_ROUTINE)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext);
-
-typedef VOID DDKAPI
-(*PCAM_NEW_FRAME_ROUTINE)(
-  PVOID  DeviceContext,
-  PVOID  FrameContext); 
-
-typedef VOID DDKAPI
-(*PCAM_NEW_FRAME_ROUTINE_EX)(
-  PVOID  DeviceContext,
-  PVOID  FrameContext,
-  ULONG  StreamNumber,
-  PULONG  FrameLength);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_PROCESS_RAW_FRAME_ROUTINE)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  PVOID  FrameContext,
-  PVOID  FrameBuffer,
-  ULONG  FrameLength,
-  PVOID  RawFrameBuffer,
-  ULONG  RawFrameLength,
-  ULONG  NumberOfPackets,
-  PULONG  BytesReturned);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_PROCESS_RAW_FRAME_ROUTINE_EX)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  PVOID  FrameContext,
-  PVOID  FrameBuffer,
-  ULONG  FrameLength,
-  PVOID  RawFrameBuffer,
-  ULONG  RawFrameLength,
-  ULONG  NumberOfPackets,
-  PULONG  BytesReturned,
-  ULONG  ActualRawFrameLength,
-  ULONG  StreamNumber);
-
-typedef ULONG DDKAPI
-(*PCAM_PROCESS_PACKET_ROUTINE)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  PVOID  CurrentFrameContext,
-  PUSBD_ISO_PACKET_DESCRIPTOR  SyncPacket,
-  PVOID  SyncBuffer,
-  PUSBD_ISO_PACKET_DESCRIPTOR  DataPacket,
-  PVOID  DataBuffer,
-  PBOOLEAN  FrameComplete,
-  PBOOLEAN  NextFrameIsStill); 
-
-typedef ULONG DDKAPI
-(*PCAM_PROCESS_PACKET_ROUTINE_EX)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  PVOID  CurrentFrameContext,
-  PUSBD_ISO_PACKET_DESCRIPTOR  SyncPacket,
-  PVOID  SyncBuffer,
-  PUSBD_ISO_PACKET_DESCRIPTOR  DataPacket,
-  PVOID  DataBuffer,
-  PBOOLEAN  FrameComplete,
-  PULONG  PacketFlag,
-  PULONG  ValidDataOffset);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_STATE_ROUTINE)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_START_CAPTURE_ROUTINE)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_START_CAPTURE_ROUTINE_EX)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  ULONG  StreamNumber);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_STOP_CAPTURE_ROUTINE)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext);
-
-typedef NTSTATUS DDKAPI
-(*PCAM_STOP_CAPTURE_ROUTINE_EX)(
-  PDEVICE_OBJECT  BusDeviceObject,
-  PVOID  DeviceContext,
-  ULONG  StreamNumber);
-
-typedef struct _USBCAMD_DEVICE_DATA {
-	ULONG  Sig;
-	PCAM_INITIALIZE_ROUTINE  CamInitialize;
-	PCAM_INITIALIZE_ROUTINE  CamUnInitialize;
-	PCAM_PROCESS_PACKET_ROUTINE  CamProcessUSBPacket;
-	PCAM_NEW_FRAME_ROUTINE  CamNewVideoFrame;
-	PCAM_PROCESS_RAW_FRAME_ROUTINE  CamProcessRawVideoFrame;
-	PCAM_START_CAPTURE_ROUTINE  CamStartCapture;
-	PCAM_STOP_CAPTURE_ROUTINE  CamStopCapture;
-	PCAM_CONFIGURE_ROUTINE  CamConfigure;
-	PCAM_STATE_ROUTINE  CamSaveState;
-	PCAM_STATE_ROUTINE  CamRestoreState;
-	PCAM_ALLOCATE_BW_ROUTINE  CamAllocateBandwidth;
-	PCAM_FREE_BW_ROUTINE  CamFreeBandwidth;
-} USBCAMD_DEVICE_DATA, *PUSBCAMD_DEVICE_DATA;
-
-typedef struct _USBCAMD_DEVICE_DATA2 {
-	ULONG  Sig;
-	PCAM_INITIALIZE_ROUTINE  CamInitialize;
-	PCAM_INITIALIZE_ROUTINE  CamUnInitialize;
-	PCAM_PROCESS_PACKET_ROUTINE_EX  CamProcessUSBPacketEx;
-	PCAM_NEW_FRAME_ROUTINE_EX  CamNewVideoFrameEx;
-	PCAM_PROCESS_RAW_FRAME_ROUTINE_EX  CamProcessRawVideoFrameEx;
-	PCAM_START_CAPTURE_ROUTINE_EX  CamStartCaptureEx;
-	PCAM_STOP_CAPTURE_ROUTINE_EX  CamStopCaptureEx;
-	PCAM_CONFIGURE_ROUTINE_EX  CamConfigureEx;
-	PCAM_STATE_ROUTINE  CamSaveState;
-	PCAM_STATE_ROUTINE  CamRestoreState;
-	PCAM_ALLOCATE_BW_ROUTINE_EX  CamAllocateBandwidthEx;
-	PCAM_FREE_BW_ROUTINE_EX  CamFreeBandwidthEx;
-} USBCAMD_DEVICE_DATA2, *PUSBCAMD_DEVICE_DATA2;
-
-USBCAMAPI
-ULONG
-DDKAPI
-USBCAMD_InitializeNewInterface(
-  IN PVOID  DeviceContext,
-  IN PVOID  DeviceData,
-  IN ULONG  Version,
-  IN ULONG  CamControlFlag);
-
-typedef VOID DDKAPI
-(*PCOMMAND_COMPLETE_FUNCTION)(
-  PVOID  DeviceContext,
-  PVOID  CommandContext,
-  NTSTATUS  NtStatus);
-
-typedef NTSTATUS DDKAPI
-(*PFNUSBCAMD_BulkReadWrite)(
-  IN PVOID  DeviceContext,
-  IN USHORT  PipeIndex,
-  IN PVOID  Buffer,
-  IN ULONG  BufferLength,
-  IN PCOMMAND_COMPLETE_FUNCTION  CommandComplete,
-  IN PVOID  CommandContext);
-
-typedef NTSTATUS DDKAPI
-(*PFNUSBCAMD_SetIsoPipeState)(
-  IN PVOID  DeviceContext,
-  IN ULONG  PipeStateFlags);
-
-typedef NTSTATUS DDKAPI
-(*PFNUSBCAMD_CancelBulkReadWrite)(
-  IN PVOID  DeviceContext,
-  IN ULONG  PipeIndex);
-
-typedef NTSTATUS DDKAPI
-(*PFNUSBCAMD_SetVideoFormat)( 
-  IN PVOID  DeviceContext,
-  IN PHW_STREAM_REQUEST_BLOCK  pSrb);
-
-typedef NTSTATUS DDKAPI
-(*PFNUSBCAMD_WaitOnDeviceEvent)(
-  IN PVOID  DeviceContext,
-  IN ULONG  PipeIndex,
-  IN PVOID  Buffer,
-  IN ULONG  BufferLength,
-  IN PCOMMAND_COMPLETE_FUNCTION  EventComplete,
-  IN PVOID  EventContext,
-  IN BOOLEAN  LoopBack);
-
-USBCAMAPI
-PVOID
-DDKAPI
-USBCAMD_AdapterReceivePacket(
-  IN PHW_STREAM_REQUEST_BLOCK  Srb,
-  IN PUSBCAMD_DEVICE_DATA  DeviceData,
-  IN PDEVICE_OBJECT  *DeviceObject,
-  IN BOOLEAN  NeedsCompletion);
-
-USBCAMAPI
-NTSTATUS
-DDKAPI
-USBCAMD_ControlVendorCommand(
-  IN PVOID  DeviceContext,
-  IN UCHAR  Request,
-  IN USHORT  Value,
-  IN USHORT  Index,
-  IN PVOID  Buffer,
-  IN OUT PULONG  BufferLength,
-  IN BOOLEAN  GetData,
-  IN PCOMMAND_COMPLETE_FUNCTION  CommandComplete,
-  IN PVOID  CommandContext);
-
-typedef VOID DDKAPI
-(*PADAPTER_RECEIVE_PACKET_ROUTINE)(
-  IN PHW_STREAM_REQUEST_BLOCK  Srb);
-
-USBCAMAPI
-ULONG
-DDKAPI
-USBCAMD_DriverEntry(
-  PVOID  Context1,
-  PVOID  Context2,
-  ULONG  DeviceContextSize,
-  ULONG  FrameContextSize,
-  PADAPTER_RECEIVE_PACKET_ROUTINE  ReceivePacket);
-
-USBCAMAPI
-NTSTATUS
-DDKAPI
-USBCAMD_GetRegistryKeyValue(
-  IN HANDLE  Handle,
-  IN PWCHAR  KeyNameString,
-  IN ULONG  KeyNameStringLength,
-  IN PVOID  Data,
-  IN ULONG  DataLength);
-
-USBCAMAPI
-NTSTATUS
-DDKAPI
-USBCAMD_SelectAlternateInterface(
-  IN PVOID  DeviceContext,
-  IN OUT PUSBD_INTERFACE_INFORMATION  RequestInterface);
-
-#define USBCAMD_VERSION_200               0x200
-
-typedef struct _USBCAMD_INTERFACE {
-  INTERFACE  Interface;
-  PFNUSBCAMD_WaitOnDeviceEvent  USBCAMD_WaitOnDeviceEvent;
-  PFNUSBCAMD_BulkReadWrite  USBCAMD_BulkReadWrite;
-  PFNUSBCAMD_SetVideoFormat  USBCAMD_SetVideoFormat;
-  PFNUSBCAMD_SetIsoPipeState  USBCAMD_SetIsoPipeState;
-  PFNUSBCAMD_CancelBulkReadWrite  USBCAMD_CancelBulkReadWrite;
-} USBCAMD_INTERFACE, *PUSBCAMD_INTERFACE;
-
-typedef VOID DDKAPI
-(*PSTREAM_RECEIVE_PACKET)(
-  IN PVOID  Srb,
-  IN PVOID  DeviceContext,
-  IN PBOOLEAN  Completed);
-
-#if defined(DEBUG_LOG)
-
-USBCAMAPI
-VOID
-DDKAPI
-USBCAMD_Debug_LogEntry(
-	IN CHAR  *Name,
-	IN ULONG  Info1,
-	IN ULONG  Info2,
-	IN ULONG  Info3);
-
-#define ILOGENTRY(sig, info1, info2, info3) \
-  USBCAMD_Debug_LogEntry(sig, (ULONG)info1, (ULONG)info2, (ULONG)info3)
-
-#else
-
-#define ILOGENTRY(sig, info1, info2, info3)
-
-#endif /* DEBUG_LOG */
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !defined(__USB_H) && !defined(__USBDI_H) */
-
-
-#endif /* __USBCAMDI_H */
diff --git a/winsup/w32api/include/ddk/usbdi.h b/winsup/w32api/include/ddk/usbdi.h
deleted file mode 100644
index 7caca07a7..000000000
--- a/winsup/w32api/include/ddk/usbdi.h
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * usbdi.h
- *
- * USBD and USB device driver definitions
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __USBDI_H
-#define __USBDI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __USB_H
-#error usb.h cannot be included with usbdi.h
-#else
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "usbioctl.h"
-
-
-#define USBDI_VERSION                     0x300
-
-#define USB_DEFAULT_DEVICE_ADDRESS        0
-#define USB_DEFAULT_ENDPOINT_ADDRESS      0
-#define USB_DEFAULT_MAX_PACKET            64
-
-#define URB_FROM_IRP(Irp) ((IoGetCurrentIrpStackLocation(Irp))->Parameters.Others.Argument1)
-
-#define URB_FUNCTION_SELECT_CONFIGURATION           0x0000
-#define URB_FUNCTION_SELECT_INTERFACE               0x0001
-#define URB_FUNCTION_ABORT_PIPE                     0x0002
-#define URB_FUNCTION_TAKE_FRAME_LENGTH_CONTROL      0x0003
-#define URB_FUNCTION_RELEASE_FRAME_LENGTH_CONTROL   0x0004
-#define URB_FUNCTION_GET_FRAME_LENGTH               0x0005
-#define URB_FUNCTION_SET_FRAME_LENGTH               0x0006
-#define URB_FUNCTION_GET_CURRENT_FRAME_NUMBER       0x0007
-#define URB_FUNCTION_CONTROL_TRANSFER               0x0008
-#define URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER     0x0009
-#define URB_FUNCTION_ISOCH_TRANSFER                 0x000A
-#define URB_FUNCTION_RESET_PIPE                     0x001E
-#define URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE     0x000B
-#define URB_FUNCTION_GET_DESCRIPTOR_FROM_ENDPOINT   0x0024
-#define URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE  0x0028
-#define URB_FUNCTION_SET_DESCRIPTOR_TO_DEVICE       0x000C
-#define URB_FUNCTION_SET_DESCRIPTOR_TO_ENDPOINT     0x0025
-#define URB_FUNCTION_SET_DESCRIPTOR_TO_INTERFACE    0x0029
-#define URB_FUNCTION_SET_FEATURE_TO_DEVICE          0x000D
-#define URB_FUNCTION_SET_FEATURE_TO_INTERFACE       0x000E
-#define URB_FUNCTION_SET_FEATURE_TO_ENDPOINT        0x000F
-#define URB_FUNCTION_SET_FEATURE_TO_OTHER           0x0023
-#define URB_FUNCTION_CLEAR_FEATURE_TO_DEVICE        0x0010
-#define URB_FUNCTION_CLEAR_FEATURE_TO_INTERFACE     0x0011
-#define URB_FUNCTION_CLEAR_FEATURE_TO_ENDPOINT      0x0012
-#define URB_FUNCTION_CLEAR_FEATURE_TO_OTHER         0x0022
-#define URB_FUNCTION_GET_STATUS_FROM_DEVICE         0x0013
-#define URB_FUNCTION_GET_STATUS_FROM_INTERFACE      0x0014
-#define URB_FUNCTION_GET_STATUS_FROM_ENDPOINT       0x0015
-#define URB_FUNCTION_GET_STATUS_FROM_OTHER          0x0021
-#define URB_FUNCTION_RESERVED0                      0x0016
-#define URB_FUNCTION_VENDOR_DEVICE                  0x0017
-#define URB_FUNCTION_VENDOR_INTERFACE               0x0018
-#define URB_FUNCTION_VENDOR_ENDPOINT                0x0019
-#define URB_FUNCTION_VENDOR_OTHER                   0x0020
-#define URB_FUNCTION_CLASS_DEVICE                   0x001A
-#define URB_FUNCTION_CLASS_INTERFACE                0x001B
-#define URB_FUNCTION_CLASS_ENDPOINT                 0x001C
-#define URB_FUNCTION_CLASS_OTHER                    0x001F
-#define URB_FUNCTION_RESERVED                       0x001D
-#define URB_FUNCTION_GET_CONFIGURATION              0x0026
-#define URB_FUNCTION_GET_INTERFACE                  0x0027
-#define URB_FUNCTION_LAST                           0x0029
-
-typedef LONG USBD_STATUS;
-typedef PVOID USBD_PIPE_HANDLE;
-typedef PVOID USBD_CONFIGURATION_HANDLE;
-typedef PVOID USBD_INTERFACE_HANDLE;
-
-#define USBD_ERROR(Status) ((USBD_STATUS)(Status) < 0)
-#define USBD_HALTED(Status) ((ULONG)(Status) >> 30 == 3)
-#define USBD_PENDING(Status) ((ULONG)(Status) >> 30 == 1)
-#define USBD_STATUS(Status) ((ULONG)(Status) & 0x0FFFFFFFL)
-#define USBD_SUCCESS(Status) ((USBD_STATUS)(Status) >= 0)
-
-#define USBD_STATUS_SUCCESS               ((USBD_STATUS)0x00000000L)
-#define USBD_STATUS_PENDING               ((USBD_STATUS)0x40000000L)
-#define USBD_STATUS_HALTED                ((USBD_STATUS)0xC0000000L)
-#define USBD_STATUS_ERROR                 ((USBD_STATUS)0x80000000L)
-#define USBD_STATUS_NO_MEMORY             ((USBD_STATUS)0x80000100L)
-#define USBD_STATUS_INVALID_URB_FUNCTION  ((USBD_STATUS)0x80000200L)
-#define USBD_STATUS_INVALID_PARAMETER     ((USBD_STATUS)0x80000300L)
-#define USBD_STATUS_ERROR_BUSY            ((USBD_STATUS)0x80000400L)
-#define USBD_STATUS_REQUEST_FAILED        ((USBD_STATUS)0x80000500L)
-#define USBD_STATUS_INVALID_PIPE_HANDLE   ((USBD_STATUS)0x80000600L)
-#define USBD_STATUS_NO_BANDWIDTH          ((USBD_STATUS)0x80000700L)
-#define USBD_STATUS_INTERNAL_HC_ERROR     ((USBD_STATUS)0x80000800L)
-#define USBD_STATUS_ERROR_SHORT_TRANSFER  ((USBD_STATUS)0x80000900L)
-#define USBD_STATUS_CRC                   ((USBD_STATUS)0xC0000001L)
-#define USBD_STATUS_BTSTUFF               ((USBD_STATUS)0xC0000002L)
-#define USBD_STATUS_DATA_TOGGLE_MISMATCH  ((USBD_STATUS)0xC0000003L)
-#define USBD_STATUS_STALL_PID             ((USBD_STATUS)0xC0000004L)
-#define USBD_STATUS_DEV_NOT_RESPONDING    ((USBD_STATUS)0xC0000005L)
-#define USBD_STATUS_PID_CHECK_FAILURE     ((USBD_STATUS)0xC0000006L)
-#define USBD_STATUS_UNEXPECTED_PID        ((USBD_STATUS)0xC0000007L)
-#define USBD_STATUS_DATA_OVERRUN          ((USBD_STATUS)0xC0000008L)
-#define USBD_STATUS_DATA_UNDERRUN         ((USBD_STATUS)0xC0000009L)
-#define USBD_STATUS_RESERVED1             ((USBD_STATUS)0xC000000AL)
-#define USBD_STATUS_RESERVED2             ((USBD_STATUS)0xC000000BL)
-#define USBD_STATUS_BUFFER_OVERRUN        ((USBD_STATUS)0xC000000CL)
-#define USBD_STATUS_BUFFER_UNDERRUN       ((USBD_STATUS)0xC000000DL)
-#define USBD_STATUS_NOT_ACCESSED          ((USBD_STATUS)0xC000000FL)
-#define USBD_STATUS_FIFO                  ((USBD_STATUS)0xC0000010L)
-#define USBD_STATUS_ENDPOINT_HALTED       ((USBD_STATUS)0xC0000030L)
-#define USBD_STATUS_BAD_START_FRAME       ((USBD_STATUS)0xC0000A00L)
-#define USBD_STATUS_ISOCH_REQUEST_FAILED  ((USBD_STATUS)0xC0000B00L)
-#define USBD_STATUS_FRAME_CONTROL_OWNED   ((USBD_STATUS)0xC0000C00L)
-#define USBD_STATUS_FRAME_CONTROL_NOT_OWNED \
-                                          ((USBD_STATUS)0xC0000D00L)
-#define USBD_STATUS_INAVLID_CONFIGURATION_DESCRIPTOR \
-                                          ((USBD_STATUS)0xC0000F00L)
-#define USBD_STATUS_CANCELING             ((USBD_STATUS)0x00020000L)
-
-#define USBD_PIPE_DIRECTION_IN(pipeInformation) \
-  ((pipeInformation)->EndpointAddress & USB_ENDPOINT_DIRECTION_MASK) 
-
-struct _URB_HEADER { 
-	USHORT  Length;
-	USHORT  Function;
-	USBD_STATUS  Status;
-	PVOID  UsbdDeviceHandle;
-	ULONG  UsbdFlags;
-};
-
-struct _URB_HCD_AREA {
-	PVOID  HcdEndpoint;
-	PIRP  HcdIrp;
-	LIST_ENTRY  HcdListEntry;
-	LIST_ENTRY  HcdListEntry2;
-	PVOID  HcdCurrentIoFlushPointer;
-	PVOID  HcdExtension;
-};
-
-struct _URB_BULK_OR_INTERRUPT_TRANSFER {
-	struct _URB_HEADER  Hdr;
-	USBD_PIPE_HANDLE  PipeHandle;
-	ULONG  TransferFlags;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-};
-
-struct _URB_CONTROL_DESCRIPTOR_REQUEST {
-	struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  Reserved0;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	USHORT  Reserved1;
-	UCHAR  Index;
-	UCHAR  DescriptorType;
-	USHORT  LanguageId;
-	USHORT  Reserved2;
-};
-
-struct _URB_CONTROL_FEATURE_REQUEST {
-	struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  Reserved2;
-	ULONG  Reserved3;
-	PVOID  Reserved4;
-	PMDL  Reserved5;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	USHORT  Reserved0;
-	USHORT  FeatureSelector;
-	USHORT  Index;
-	USHORT  Reserved1;
-};
-
-struct _URB_CONTROL_GET_CONFIGURATION_REQUEST {
-	struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  Reserved0;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	UCHAR  Reserved1[8];    
-};
-
-struct _URB_CONTROL_GET_INTERFACE_REQUEST {
-	struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  Reserved0;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	UCHAR  Reserved1[4];
-	USHORT  Interface;
-	USHORT  Reserved2;
-};
-
-struct _URB_CONTROL_GET_STATUS_REQUEST {
-	struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  Reserved0;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	UCHAR  Reserved1[4];
-	USHORT  Index;
-	USHORT  Reserved2;
-};
-
-struct _URB_CONTROL_TRANSFER {
-	struct _URB_HEADER  Hdr;
-	USBD_PIPE_HANDLE  PipeHandle;
-	ULONG  TransferFlags;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	UCHAR  SetupPacket[8];
-};
-
-struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST {
-	struct _URB_HEADER  Hdr;
-	PVOID  Reserved;
-	ULONG  TransferFlags;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	UCHAR  RequestTypeReservedBits;
-	UCHAR  Request;
-	USHORT  Value;
-	USHORT  Index;
-	USHORT  Reserved1;
-};
-
-struct _URB_FRAME_LENGTH_CONTROL {
-	struct _URB_HEADER  Hdr;
-};
-
-struct _URB_GET_CURRENT_FRAME_NUMBER {
-	struct _URB_HEADER  Hdr;
-	ULONG  FrameNumber;
-};
-
-struct _URB_GET_FRAME_LENGTH {
-	struct _URB_HEADER  Hdr;
-	ULONG  FrameLength;
-	ULONG  FrameNumber;
-};
-
-typedef struct _USBD_ISO_PACKET_DESCRIPTOR {
-  ULONG  Offset;
-  ULONG  Length;
-  USBD_STATUS  Status;
-} USBD_ISO_PACKET_DESCRIPTOR, *PUSBD_ISO_PACKET_DESCRIPTOR;
-
-struct _URB_ISOCH_TRANSFER {
-	struct _URB_HEADER  Hdr;
-	USBD_PIPE_HANDLE  PipeHandle;
-	ULONG  TransferFlags;
-	ULONG  TransferBufferLength;
-	PVOID  TransferBuffer;
-	PMDL  TransferBufferMDL;
-	struct _URB  *UrbLink;
-	struct _URB_HCD_AREA  hca;
-	ULONG  StartFrame;
-	ULONG  NumberOfPackets;
-	ULONG  ErrorCount;
-	USBD_ISO_PACKET_DESCRIPTOR  IsoPacket[1]; 
-};
-
-struct _URB_PIPE_REQUEST {
-	struct _URB_HEADER  Hdr;
-	USBD_PIPE_HANDLE  PipeHandle;
-	ULONG  Reserved;
-};
-
-struct _URB_SET_FRAME_LENGTH {
-	struct _URB_HEADER  Hdr;
-	LONG  FrameLengthDelta;
-};
-
-typedef struct _USBD_DEVICE_INFORMATION {
-	ULONG  OffsetNext;
-	PVOID  UsbdDeviceHandle;
-	USB_DEVICE_DESCRIPTOR  DeviceDescriptor;
-} USBD_DEVICE_INFORMATION, *PUSBD_DEVICE_INFORMATION;
-
-typedef enum _USBD_PIPE_TYPE {
-	UsbdPipeTypeControl,
-	UsbdPipeTypeIsochronous,
-	UsbdPipeTypeBulk,
-	UsbdPipeTypeInterrupt
-} USBD_PIPE_TYPE;
-
-/* USBD_PIPE_INFORMATION.PipeFlags constants */
-#define USBD_PF_CHANGE_MAX_PACKET         0x00000001
-#define USBD_PF_DOUBLE_BUFFER             0x00000002 
-#define USBD_PF_ENABLE_RT_THREAD_ACCESS   0x00000004 
-#define USBD_PF_MAP_ADD_TRANSFERS         0x00000008
-
-typedef struct _USBD_PIPE_INFORMATION {
-  USHORT  MaximumPacketSize;
-  UCHAR  EndpointAddress;
-  UCHAR  Interval;
-  USBD_PIPE_TYPE  PipeType;
-  USBD_PIPE_HANDLE  PipeHandle;
-  ULONG  MaximumTransferSize;
-  ULONG  PipeFlags;
-} USBD_PIPE_INFORMATION, *PUSBD_PIPE_INFORMATION;
-
-typedef struct _USBD_INTERFACE_INFORMATION {
-  USHORT  Length;
-  UCHAR  InterfaceNumber;
-  UCHAR  AlternateSetting;
-  UCHAR  Class;
-  UCHAR  SubClass;
-  UCHAR  Protocol;
-  UCHAR  Reserved;
-  USBD_INTERFACE_HANDLE  InterfaceHandle;
-  ULONG  NumberOfPipes; 
-  USBD_PIPE_INFORMATION  Pipes[1];
-} USBD_INTERFACE_INFORMATION, *PUSBD_INTERFACE_INFORMATION;
-
-struct _URB_SELECT_CONFIGURATION {
-	struct _URB_HEADER  Hdr;
-	PUSB_CONFIGURATION_DESCRIPTOR  ConfigurationDescriptor;
-	USBD_CONFIGURATION_HANDLE  ConfigurationHandle;
-	USBD_INTERFACE_INFORMATION  Interface;
-};
-
-struct _URB_SELECT_INTERFACE {
-	struct _URB_HEADER  Hdr;
-	USBD_CONFIGURATION_HANDLE  ConfigurationHandle;
-	USBD_INTERFACE_INFORMATION  Interface;
-};
-
-typedef struct _USBD_VERSION_INFORMATION {
-	ULONG  USBDI_Version;
-	ULONG  Supported_USB_Version;
-} USBD_VERSION_INFORMATION, *PUSBD_VERSION_INFORMATION;
-
-typedef struct _URB {
-	union {
-		struct _URB_HEADER  UrbHeader;
-		struct _URB_SELECT_INTERFACE  UrbSelectInterface;
-		struct _URB_SELECT_CONFIGURATION  UrbSelectConfiguration;
-		struct _URB_PIPE_REQUEST  UrbPipeRequest;
-		struct _URB_FRAME_LENGTH_CONTROL  UrbFrameLengthControl;
-		struct _URB_GET_FRAME_LENGTH  UrbGetFrameLength;
-		struct _URB_SET_FRAME_LENGTH  UrbSetFrameLength;
-		struct _URB_GET_CURRENT_FRAME_NUMBER  UrbGetCurrentFrameNumber;
-		struct _URB_CONTROL_TRANSFER  UrbControlTransfer;
-		struct _URB_BULK_OR_INTERRUPT_TRANSFER  UrbBulkOrInterruptTransfer;
-		struct _URB_ISOCH_TRANSFER  UrbIsochronousTransfer;
-		struct _URB_CONTROL_DESCRIPTOR_REQUEST  UrbControlDescriptorRequest;
-		struct _URB_CONTROL_GET_STATUS_REQUEST  UrbControlGetStatusRequest;
-		struct _URB_CONTROL_FEATURE_REQUEST  UrbControlFeatureRequest;
-		struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST  UrbControlVendorClassRequest;
-		struct _URB_CONTROL_GET_INTERFACE_REQUEST  UrbControlGetInterfaceRequest;
-		struct _URB_CONTROL_GET_CONFIGURATION_REQUEST  UrbControlGetConfigurationRequest;
-	};
-} URB, *PURB;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* defined __USB_H */
-
-#endif /* __USBDI_H */
diff --git a/winsup/w32api/include/ddk/usbioctl.h b/winsup/w32api/include/ddk/usbioctl.h
deleted file mode 100644
index f0ab90aa0..000000000
--- a/winsup/w32api/include/ddk/usbioctl.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- * usbioctl.h
- *
- * USB IOCTL interface.
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __USBIOCTL_H
-#define __USBIOCTL_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "usb100.h"
-#include "usbiodef.h"
-
-#define USBD_PORT_ENABLED                 1
-#define USBD_PORT_CONNECTED               2
-
-#define IOCTL_INTERNAL_USB_CYCLE_PORT \
-  CTL_CODE(FILE_DEVICE_USB, USB_CYCLE_PORT, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_ENABLE_PORT \
-  CTL_CODE(FILE_DEVICE_USB, USB_ENABLE_PORT, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_GET_BUS_INFO \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_BUS_INFO, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_GET_BUSGUID_INFO \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_BUSGUID_INFO, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_GET_CONTROLLER_NAME \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_CONTROLLER_NAME, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_DEVICE_HANDLE, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_GET_HUB_COUNT \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_HUB_COUNT, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_GET_HUB_NAME \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_HUB_NAME, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_PARENT_HUB_INFO, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_GET_PORT_STATUS \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_PORT_STATUS, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_RESET_PORT \
-  CTL_CODE(FILE_DEVICE_USB, USB_RESET_PORT, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_ROOTHUB_PDO, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION \
-  CTL_CODE(FILE_DEVICE_USB, USB_IDLE_NOTIFICATION, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-#define IOCTL_INTERNAL_USB_SUBMIT_URB  \
-  CTL_CODE(FILE_DEVICE_USB, USB_SUBMIT_URB, METHOD_NEITHER, FILE_ANY_ACCESS)
-
-
-#define IOCTL_USB_DIAG_IGNORE_HUBS_ON \
-  CTL_CODE(FILE_DEVICE_USB, USB_DIAG_IGNORE_HUBS_ON, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_DIAG_IGNORE_HUBS_OFF \
-  CTL_CODE(FILE_DEVICE_USB, USB_DIAG_IGNORE_HUBS_OFF, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_DIAGNOSTIC_MODE_OFF \
-  CTL_CODE(FILE_DEVICE_USB, HCD_DIAGNOSTIC_MODE_OFF, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_DIAGNOSTIC_MODE_ON \
-  CTL_CODE(FILE_DEVICE_USB, HCD_DIAGNOSTIC_MODE_ON, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_GET_HUB_CAPABILITIES \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_HUB_CAPABILITIES, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_GET_ROOT_HUB_NAME \
-  CTL_CODE(FILE_DEVICE_USB, HCD_GET_ROOT_HUB_NAME, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_GET_HCD_DRIVERKEY_NAME \
-  CTL_CODE(FILE_DEVICE_USB, HCD_GET_DRIVERKEY_NAME, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_GET_NODE_INFORMATION \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_INFORMATION, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_GET_NODE_CONNECTION_INFORMATION \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_INFORMATION, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_GET_NODE_CONNECTION_ATTRIBUTES \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_ATTRIBUTES, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_GET_NODE_CONNECTION_NAME \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_NAME, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME \
-  CTL_CODE(FILE_DEVICE_USB, USB_GET_NODE_CONNECTION_DRIVERKEY_NAME, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_HCD_DISABLE_PORT \
-  CTL_CODE(FILE_DEVICE_USB, HCD_DISABLE_PORT, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_HCD_ENABLE_PORT \
-  CTL_CODE(FILE_DEVICE_USB, HCD_ENABLE_PORT, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_HCD_GET_STATS_1 \
-  CTL_CODE(FILE_DEVICE_USB, HCD_GET_STATS_1, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-#define IOCTL_USB_HCD_GET_STATS_2 \
-  CTL_CODE(FILE_DEVICE_USB, HCD_GET_STATS_2, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-
-typedef struct _USB_HUB_CAPABILITIES {
-  ULONG  HubIs2xCapable : 1;
-} USB_HUB_CAPABILITIES, *PUSB_HUB_CAPABILITIES;
-
-typedef enum _USB_CONNECTION_STATUS {
-	NoDeviceConnected,
-	DeviceConnected,
-	DeviceFailedEnumeration,
-	DeviceGeneralFailure,
-	DeviceCausedOvercurrent,
-	DeviceNotEnoughPower,
-	DeviceNotEnoughBandwidth,
-	DeviceHubNestedTooDeeply,
-	DeviceInLegacyHub
-} USB_CONNECTION_STATUS, *PUSB_CONNECTION_STATUS;
-
-typedef struct _USB_DESCRIPTOR_REQUEST {
-	ULONG  ConnectionIndex;
-	struct {
-		UCHAR  bmRequest;
-		UCHAR  bRequest;
-		USHORT  wValue;
-		USHORT  wIndex;
-		USHORT  wLength;
-	} SetupPacket;
-	UCHAR  Data[0];
-} USB_DESCRIPTOR_REQUEST, *PUSB_DESCRIPTOR_REQUEST;
-
-typedef struct _USB_HCD_DRIVERKEY_NAME {
-	ULONG  ActualLength;
-	WCHAR  DriverKeyName[1];
-} USB_HCD_DRIVERKEY_NAME, *PUSB_HCD_DRIVERKEY_NAME;
-
-typedef struct _HCD_ISO_STAT_COUNTERS {
-	USHORT  LateUrbs;
-	USHORT  DoubleBufferedPackets;
-	USHORT  TransfersCF_5ms;
-	USHORT  TransfersCF_2ms;
-	USHORT  TransfersCF_1ms;
-	USHORT  MaxInterruptLatency;
-	USHORT  BadStartFrame;
-	USHORT  StaleUrbs;
-	USHORT  IsoPacketNotAccesed;
-	USHORT  IsoPacketHWError;
-	USHORT  SmallestUrbPacketCount;
-	USHORT  LargestUrbPacketCount;
-	USHORT  IsoCRC_Error;
-	USHORT  IsoOVERRUN_Error;
-	USHORT  IsoINTERNAL_Error;
-	USHORT  IsoUNKNOWN_Error;
-	ULONG  IsoBytesTransferred;
-	USHORT  LateMissedCount;
-	USHORT  HWIsoMissedCount;
-	ULONG  Reserved7[8];
-} HCD_ISO_STAT_COUNTERS, *PHCD_ISO_STAT_COUNTERS;
-
-typedef struct _HCD_STAT_COUNTERS {
-	ULONG  BytesTransferred;
-	USHORT  IsoMissedCount;
-	USHORT  DataOverrunErrorCount;
-	USHORT  CrcErrorCount;
-	USHORT  ScheduleOverrunCount;
-	USHORT  TimeoutErrorCount;
-	USHORT  InternalHcErrorCount;
-	USHORT  BufferOverrunErrorCount;
-	USHORT  SWErrorCount;
-	USHORT  StallPidCount;
-	USHORT  PortDisableCount;
-} HCD_STAT_COUNTERS, *PHCD_STAT_COUNTERS;
-
-typedef struct _HCD_STAT_INFORMATION_1 {
-	ULONG  Reserved1;
-	ULONG  Reserved2;
-	ULONG  ResetCounters;
-	LARGE_INTEGER  TimeRead;
-	HCD_STAT_COUNTERS  Counters;
-} HCD_STAT_INFORMATION_1, *PHCD_STAT_INFORMATION_1;
-
-typedef struct _HCD_STAT_INFORMATION_2 {
-	ULONG  Reserved1;
-	ULONG  Reserved2;
-	ULONG  ResetCounters;
-	LARGE_INTEGER  TimeRead;
-	LONG  LockedMemoryUsed;
-	HCD_STAT_COUNTERS  Counters;
-	HCD_ISO_STAT_COUNTERS  IsoCounters;
-} HCD_STAT_INFORMATION_2, *PHCD_STAT_INFORMATION_2;
-
-typedef struct _USB_HUB_INFORMATION {
-	USB_HUB_DESCRIPTOR  HubDescriptor;
-	BOOLEAN  HubIsBusPowered;
-} USB_HUB_INFORMATION, *PUSB_HUB_INFORMATION;
-
-typedef struct _USB_HUB_NAME {
-	ULONG  ActualLength;
-	WCHAR  HubName[1];
-} USB_HUB_NAME, *PUSB_HUB_NAME;
-
-typedef enum _USB_HUB_NODE {
-	UsbHub,
-	UsbMIParent
-} USB_HUB_NODE;
-
-typedef VOID STDCALL
-(*USB_IDLE_CALLBACK)(
-  PVOID  Context);
-
-typedef struct _USB_IDLE_CALLBACK_INFO {
-	USB_IDLE_CALLBACK  IdleCallback;
-	PVOID  IdleContext;
-} USB_IDLE_CALLBACK_INFO, *PUSB_IDLE_CALLBACK_INFO;
-
-typedef struct _USB_NODE_CONNECTION_ATTRIBUTES {
-	ULONG  ConnectionIndex;
-	USB_CONNECTION_STATUS  ConnectionStatus;
-	ULONG  PortAttributes;
-} USB_NODE_CONNECTION_ATTRIBUTES, *PUSB_NODE_CONNECTION_ATTRIBUTES;
-
-typedef struct _USB_NODE_CONNECTION_DRIVERKEY_NAME {
-	ULONG  ConnectionIndex;
-	ULONG  ActualLength;
-	WCHAR  DriverKeyName[1];
-} USB_NODE_CONNECTION_DRIVERKEY_NAME, *PUSB_NODE_CONNECTION_DRIVERKEY_NAME;
-
-typedef struct _USB_PIPE_INFO {
-	USB_ENDPOINT_DESCRIPTOR  EndpointDescriptor;
-	ULONG  ScheduleOffset;
-} USB_PIPE_INFO, *PUSB_PIPE_INFO;
-
-typedef struct _USB_NODE_CONNECTION_INFORMATION {
-	ULONG  ConnectionIndex;
-	USB_DEVICE_DESCRIPTOR  DeviceDescriptor;
-	UCHAR  CurrentConfigurationValue;
-	BOOLEAN  LowSpeed;
-	BOOLEAN  DeviceIsHub;
-	USHORT  DeviceAddress;
-	ULONG  NumberOfOpenPipes;
-	USB_CONNECTION_STATUS  ConnectionStatus;
-	USB_PIPE_INFO  PipeList[0];
-} USB_NODE_CONNECTION_INFORMATION, *PUSB_NODE_CONNECTION_INFORMATION;
-
-typedef struct _USB_NODE_CONNECTION_NAME {
-	ULONG  ConnectionIndex;
-	ULONG  ActualLength;
-	WCHAR  NodeName[1];
-} USB_NODE_CONNECTION_NAME, *PUSB_NODE_CONNECTION_NAME;
-
-typedef struct _USB_MI_PARENT_INFORMATION {
-  ULONG  NumberOfInterfaces;
-} USB_MI_PARENT_INFORMATION, *PUSB_MI_PARENT_INFORMATION;
-
-typedef struct _USB_NODE_INFORMATION {
-	USB_HUB_NODE  NodeType;
-	union {
-		USB_HUB_INFORMATION  HubInformation;
-		USB_MI_PARENT_INFORMATION  MiParentInformation;
-	} u;
-} USB_NODE_INFORMATION, *PUSB_NODE_INFORMATION;
-
-#define WMI_USB_DRIVER_INFORMATION        0
-#define WMI_USB_DRIVER_NOTIFICATION       1
-#define WMI_USB_POWER_DEVICE_ENABLE       2
-
-typedef enum _USB_NOTIFICATION_TYPE {
-	EnumerationFailure = 0,
-	InsufficentBandwidth,
-	InsufficentPower,
-	OverCurrent,
-	ResetOvercurrent,
-	AcquireBusInfo,
-	AcquireHubName,
-	AcquireControllerName,
-	HubOvercurrent,
-	HubPowerChange,
-	HubNestedTooDeeply,
-	ModernDeviceInLegacyHub
-} USB_NOTIFICATION_TYPE;
-
-typedef struct _USB_ACQUIRE_INFO {
-	USB_NOTIFICATION_TYPE  NotificationType;
-	ULONG  TotalSize;
-	WCHAR  Buffer[1];
-} USB_ACQUIRE_INFO, *PUSB_ACQUIRE_INFO;
-
-typedef struct _USB_NOTIFICATION {
-  USB_NOTIFICATION_TYPE  NotificationType;
-} USB_NOTIFICATION, *PUSB_NOTIFICATION;
-
-typedef struct _USB_BUS_NOTIFICATION {
-	USB_NOTIFICATION_TYPE  NotificationType;
-	ULONG  TotalBandwidth;
-	ULONG  ConsumedBandwidth;
-	ULONG  ControllerNameLength;
-} USB_BUS_NOTIFICATION, *PUSB_BUS_NOTIFICATION;
-
-typedef struct _USB_CONNECTION_NOTIFICATION {
-	USB_NOTIFICATION_TYPE  NotificationType;
-	ULONG  ConnectionNumber;
-	ULONG  RequestedBandwidth;     
-	ULONG  EnumerationFailReason;
-	ULONG  PowerRequested;
-	ULONG  HubNameLength;
-} USB_CONNECTION_NOTIFICATION, *PUSB_CONNECTION_NOTIFICATION;
-
-typedef struct _USB_ROOT_HUB_NAME {
-	ULONG  ActualLength;
-	WCHAR  RootHubName[1];
-} USB_ROOT_HUB_NAME, *PUSB_ROOT_HUB_NAME;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBIOCTL_H */
diff --git a/winsup/w32api/include/ddk/usbiodef.h b/winsup/w32api/include/ddk/usbiodef.h
deleted file mode 100644
index 4a801e393..000000000
--- a/winsup/w32api/include/ddk/usbiodef.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * usbiodef.h
- *
- * USB IOCTL definitions
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __USBIODEF_H
-#define __USBIODEF_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-DEFINE_GUID(GUID_DEVINTERFACE_USB_HUB, \
-  0xf18a0e88, 0xc30c, 0x11d0, 0x88, 0x15, 0x00, 0xa0, 0xc9, 0x06, 0xbe, 0xd8);
-
-DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE,
-  0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED);
-
-DEFINE_GUID(GUID_DEVINTERFACE_USB_HOST_CONTROLLER,
-  0x3abf6f2d, 0x71c4, 0x462a, 0x8a, 0x92, 0x1e, 0x68, 0x61, 0xe6, 0xaf, 0x27);
-             
-DEFINE_GUID(GUID_USB_WMI_STD_DATA,
-  0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2);
-
-DEFINE_GUID(GUID_USB_WMI_STD_NOTIFICATION,
-  0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2);        
-
-#define GUID_CLASS_USBHUB                 GUID_DEVINTERFACE_USB_HUB
-#define GUID_CLASS_USB_DEVICE             GUID_DEVINTERFACE_USB_DEVICE
-#define GUID_CLASS_USB_HOST_CONTROLLER    GUID_DEVINTERFACE_USB_HOST_CONTROLLER
-
-#define USB_SUBMIT_URB                    0
-#define USB_RESET_PORT                    1
-#define USB_GET_ROOTHUB_PDO               3
-#define USB_GET_PORT_STATUS               4
-#define USB_ENABLE_PORT                   5
-#define USB_GET_HUB_COUNT                 6
-#define USB_CYCLE_PORT                    7
-#define USB_GET_HUB_NAME                  8
-#define USB_IDLE_NOTIFICATION             9
-#define USB_GET_BUS_INFO                  264
-#define USB_GET_CONTROLLER_NAME           265
-#define USB_GET_BUSGUID_INFO              266
-#define USB_GET_PARENT_HUB_INFO           267
-#define USB_GET_DEVICE_HANDLE             268
-
-#define HCD_GET_STATS_1                   255
-#define HCD_DIAGNOSTIC_MODE_ON            256
-#define HCD_DIAGNOSTIC_MODE_OFF           257
-#define HCD_GET_ROOT_HUB_NAME             258
-#define HCD_GET_DRIVERKEY_NAME            265
-#define HCD_GET_STATS_2                   266
-#define HCD_DISABLE_PORT                  268
-#define HCD_ENABLE_PORT                   269
-#define HCD_USER_REQUEST                  270
-
-#define USB_GET_NODE_INFORMATION                258
-#define USB_GET_NODE_CONNECTION_INFORMATION     259
-#define USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION 260
-#define USB_GET_NODE_CONNECTION_NAME            261
-#define USB_DIAG_IGNORE_HUBS_ON                 262
-#define USB_DIAG_IGNORE_HUBS_OFF                263
-#define USB_GET_NODE_CONNECTION_DRIVERKEY_NAME  264
-#define USB_GET_HUB_CAPABILITIES                271
-#define USB_GET_NODE_CONNECTION_ATTRIBUTES      272
-
-#define FILE_DEVICE_USB                   FILE_DEVICE_UNKNOWN
-
-#define USB_CTL(id) CTL_CODE(FILE_DEVICE_USB, \
-														 (id), \
-														 METHOD_BUFFERED, \
-														 FILE_ANY_ACCESS)
-
-#define USB_KERNEL_CTL(id) CTL_CODE(FILE_DEVICE_USB, \
-                                    (id), \
-                                    METHOD_NEITHER, \
-                                    FILE_ANY_ACCESS)
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBIODEF_H */
diff --git a/winsup/w32api/include/ddk/usbscan.h b/winsup/w32api/include/ddk/usbscan.h
deleted file mode 100644
index 938c7066a..000000000
--- a/winsup/w32api/include/ddk/usbscan.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * usbscan.h
- *
- * USB scanner definitions
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __USBSCAN_H
-#define __USBSCAN_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-
-#define FILE_DEVICE_USB_SCAN              0x8000
-#define IOCTL_INDEX                       0x0800
-
-#define IOCTL_CANCEL_IO \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 1, METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_GET_VERSION \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 0, METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_GET_CHANNEL_ALIGN_RQST \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 5, METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_GET_DEVICE_DESCRIPTOR \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 6, METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_GET_PIPE_CONFIGURATION \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 10,METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_GET_USB_DESCRIPTOR \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 8, METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_READ_REGISTERS \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 3, METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_RESET_PIPE \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 7, METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_SEND_USB_REQUEST \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 9, METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_SET_TIMEOUT \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 11,METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_WAIT_ON_DEVICE_EVENT \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 2, METHOD_BUFFERED,FILE_ANY_ACCESS)
-
-#define IOCTL_WRITE_REGISTERS \
-  CTL_CODE(FILE_DEVICE_USB_SCAN, IOCTL_INDEX + 4, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-
-#define MAX_NUM_PIPES                     8
-
-#define BULKIN_FLAG                       0x80
-
-typedef struct _CHANNEL_INFO {
-  OUT ULONG  EventChannelSize;
-  OUT ULONG  uReadDataAlignment;
-  OUT ULONG  uWriteDataAlignment;
-}CHANNEL_INFO, *PCHANNEL_INFO;
-
-typedef struct _DEVICE_DESCRIPTOR {
-  OUT USHORT  usVendorId; 
-  OUT USHORT  usProductId; 
-  OUT USHORT  usBcdDevice; 
-  OUT USHORT  usLanguageId; 
-} DEVICE_DESCRIPTOR, *PDEVICE_DESCRIPTOR;
-
-typedef struct _DRV_VERSION {
-  OUT ULONG  major;
-  OUT ULONG  minor;
-  OUT ULONG  internal; 
-} DRV_VERSION, *PDRV_VERSION;
-
-typedef struct _IO_BLOCK {
-  IN ULONG  uOffset;
-  IN ULONG  uLength;
-  IN OUT PUCHAR  pbyData;
-  IN ULONG  uIndex;
-} IO_BLOCK, *PIO_BLOCK;
-
-typedef struct _IO_BLOCK_EX {
-  IN  ULONG  uOffset;
-  IN  ULONG  uLength;
-  IN OUT PUCHAR  pbyData;
-  IN  ULONG  uIndex;
-  IN  UCHAR  bRequest;
-  IN  UCHAR  bmRequestType;
-  IN  UCHAR  fTransferDirectionIn;
-} IO_BLOCK_EX, *PIO_BLOCK_EX;
-
-typedef struct _USBSCAN_GET_DESCRIPTOR {
-  IN UCHAR  DescriptorType;
-  IN UCHAR  Index;
-  IN USHORT  LanguageId;
-} USBSCAN_GET_DESCRIPTOR, *PUSBSCAN_GET_DESCRIPTOR;
-
-typedef enum _RAW_PIPE_TYPE {
-	USBSCAN_PIPE_CONTROL,
-	USBSCAN_PIPE_ISOCHRONOUS,
-	USBSCAN_PIPE_BULK,
-	USBSCAN_PIPE_INTERRUPT
-} RAW_PIPE_TYPE;
-
-typedef struct _USBSCAN_PIPE_INFORMATION {
-  USHORT  MaximumPacketSize;
-  UCHAR  EndpointAddress;
-  UCHAR  Interval;
-  RAW_PIPE_TYPE  PipeType;
-} USBSCAN_PIPE_INFORMATION, *PUSBSCAN_PIPE_INFORMATION;
-
-typedef struct _USBSCAN_PIPE_CONFIGURATION {
-  OUT ULONG  NumberOfPipes;
-  OUT USBSCAN_PIPE_INFORMATION  PipeInfo[MAX_NUM_PIPES];
-} USBSCAN_PIPE_CONFIGURATION, *PUSBSCAN_PIPE_CONFIGURATION;
-
-typedef struct _USBSCAN_TIMEOUT {
-  IN ULONG  TimeoutRead;
-  IN ULONG  TimeoutWrite;
-  IN ULONG  TimeoutEvent;
-} USBSCAN_TIMEOUT, *PUSBSCAN_TIMEOUT;
-
-typedef enum _PIPE_TYPE {
-	EVENT_PIPE,
-	READ_DATA_PIPE,
-	WRITE_DATA_PIPE,
-	ALL_PIPE
-} PIPE_TYPE;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBSCAN_H */
diff --git a/winsup/w32api/include/ddk/usbuser.h b/winsup/w32api/include/ddk/usbuser.h
deleted file mode 100644
index feacddac3..000000000
--- a/winsup/w32api/include/ddk/usbuser.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * usbuser.h
- *
- * USB user mode IOCTL interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __USBUSER_H
-#define __USBUSER_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "usb.h"
-#include "usbiodef.h"
-
-
-#define USBUSER_VERSION                   0x0004
-
-#define IOCTL_USB_USER_REQUEST            USB_CTL(HCD_USER_REQUEST)
-
-#ifndef IOCTL_USB_DIAGNOSTIC_MODE_ON
-#define IOCTL_USB_DIAGNOSTIC_MODE_ON      USB_CTL(HCD_DIAGNOSTIC_MODE_ON) 
-#endif
-#ifndef IOCTL_USB_DIAGNOSTIC_MODE_OFF
-#define IOCTL_USB_DIAGNOSTIC_MODE_OFF     USB_CTL(HCD_DIAGNOSTIC_MODE_OFF) 
-#endif
-
-#ifndef IOCTL_USB_GET_ROOT_HUB_NAME
-#define IOCTL_USB_GET_ROOT_HUB_NAME       USB_CTL(HCD_GET_ROOT_HUB_NAME) 
-#endif
-#ifndef IOCTL_GET_HCD_DRIVERKEY_NAME
-#define IOCTL_GET_HCD_DRIVERKEY_NAME      USB_CTL(HCD_GET_DRIVERKEY_NAME) 
-#endif
-
-typedef enum _USB_USER_ERROR_CODE {
-	UsbUserSuccess = 0,
-	UsbUserNotSupported,
-	UsbUserInvalidRequestCode,
-	UsbUserFeatureDisabled,
-	UsbUserInvalidHeaderParameter,
-	UsbUserInvalidParameter,
-	UsbUserMiniportError,
-	UsbUserBufferTooSmall,
-	UsbUserErrorNotMapped,
-	UsbUserDeviceNotStarted,
-	UsbUserNoDeviceConnected
-} USB_USER_ERROR_CODE;
-
-#define USBUSER_GET_CONTROLLER_INFO_0     0x00000001
-#define USBUSER_GET_CONTROLLER_DRIVER_KEY 0x00000002
-#define USBUSER_PASS_THRU                 0x00000003
-#define USBUSER_GET_POWER_STATE_MAP       0x00000004
-#define USBUSER_GET_BANDWIDTH_INFORMATION 0x00000005
-#define USBUSER_GET_BUS_STATISTICS_0      0x00000006
-#define USBUSER_GET_ROOTHUB_SYMBOLIC_NAME 0x00000007
-#define USBUSER_GET_USB_DRIVER_VERSION    0x00000008
-#define USBUSER_GET_USB2_HW_VERSION       0x00000009
-#define USBUSER_OP_SEND_ONE_PACKET        0x10000001
-#define USBUSER_OP_RAW_RESET_PORT         0x20000001
-#define USBUSER_OP_OPEN_RAW_DEVICE        0x20000002
-#define USBUSER_OP_CLOSE_RAW_DEVICE       0x20000003
-#define USBUSER_OP_SEND_RAW_COMMAND       0x20000004
-#define USBUSER_INVALID_REQUEST           0xFFFFFFF0
-#define USBUSER_OP_MASK_DEVONLY_API       0x10000000
-#define USBUSER_OP_MASK_HCTEST_API        0x20000000
-
-#define USB_PACKETFLAG_LOW_SPEED          0x00000001
-#define USB_PACKETFLAG_FULL_SPEED         0x00000002
-#define USB_PACKETFLAG_HIGH_SPEED         0x00000004
-#define USB_PACKETFLAG_ASYNC_IN           0x00000008
-#define USB_PACKETFLAG_ASYNC_OUT          0x00000010
-#define USB_PACKETFLAG_ISO_IN             0x00000020
-#define USB_PACKETFLAG_ISO_OUT            0x00000040
-#define USB_PACKETFLAG_SETUP              0x00000080
-#define USB_PACKETFLAG_TOGGLE0            0x00000100
-#define USB_PACKETFLAG_TOGGLE1            0x00000200
-
-typedef struct _PACKET_PARAMETERS {
-	UCHAR  DeviceAddress;
-	UCHAR  EndpointAddress;
-	USHORT  MaximumPacketSize;
-	ULONG  Timeout;
-	ULONG  Flags;
-	ULONG  DataLength;
-	USHORT  HubDeviceAddress;
-	USHORT  PortTTNumber;
-	UCHAR  ErrorCount;
-	UCHAR  Pad[3];
-	USBD_STATUS  UsbdStatusCode;
-	UCHAR  Data[4];
-} PACKET_PARAMETERS, *PPACKET_PARAMETERS;
-
-typedef struct _RAW_RESET_PORT_PARAMETERS {
-	USHORT  PortNumber;
-	USHORT  PortStatus;
-} RAW_RESET_PORT_PARAMETERS, *PRAW_RESET_PORT_PARAMETERS;
-
-typedef struct _USB_BANDWIDTH_INFO {
-	ULONG  DeviceCount;
-	ULONG  TotalBusBandwidth;
-	ULONG  Total32secBandwidth;
-	ULONG  AllocedBulkAndControl;
-	ULONG  AllocedIso;
-	ULONG  AllocedInterrupt_1ms;
-	ULONG  AllocedInterrupt_2ms;
-	ULONG  AllocedInterrupt_4ms;
-	ULONG  AllocedInterrupt_8ms;
-	ULONG  AllocedInterrupt_16ms;
-	ULONG  AllocedInterrupt_32ms;
-} USB_BANDWIDTH_INFO, *PUSB_BANDWIDTH_INFO;
-
-typedef struct _USBUSER_REQUEST_HEADER {
-	ULONG  UsbUserRequest;
-	USB_USER_ERROR_CODE  UsbUserStatusCode;
-	ULONG  RequestBufferLength;
-	ULONG  ActualBufferLength;
-} USBUSER_REQUEST_HEADER, *PUSBUSER_REQUEST_HEADER;
-
-typedef struct _USBUSER_BANDWIDTH_INFO_REQUEST {
-	USBUSER_REQUEST_HEADER  Header;
-	USB_BANDWIDTH_INFO  BandwidthInformation;
-} USBUSER_BANDWIDTH_INFO_REQUEST, *PUSBUSER_BANDWIDTH_INFO_REQUEST;
-
-typedef struct _USB_BUS_STATISTICS_0 {
-	ULONG  DeviceCount;
-	LARGE_INTEGER  CurrentSystemTime;
-	ULONG  CurrentUsbFrame;
-	ULONG  BulkBytes;
-	ULONG  IsoBytes;
-	ULONG  InterruptBytes;
-	ULONG  ControlDataBytes;
-	ULONG  PciInterruptCount;
-	ULONG  HardResetCount;
-	ULONG  WorkerSignalCount;
-	ULONG  CommonBufferBytes;
-	ULONG  WorkerIdleTimeMs;
-	BOOLEAN  RootHubEnabled;
-	UCHAR  RootHubDevicePowerState;
-	UCHAR  Unused;
-	UCHAR  NameIndex;
-} USB_BUS_STATISTICS_0, *PUSB_BUS_STATISTICS_0;
-
-typedef struct _USBUSER_BUS_STATISTICS_0_REQUEST {
-	USBUSER_REQUEST_HEADER  Header;
-	USB_BUS_STATISTICS_0  BusStatistics0;
-} USBUSER_BUS_STATISTICS_0_REQUEST, *PUSBUSER_BUS_STATISTICS_0_REQUEST;
-
-/* USB_CONTROLLER_INFO_0.HcFeatureFlags constants */
-#define USB_HC_FEATURE_FLAG_PORT_POWER_SWITCHING  0x00000001
-#define USB_HC_FEATURE_FLAG_SEL_SUSPEND           0x00000002
-#define USB_HC_FEATURE_LEGACY_BIOS                0x00000004
-
-typedef struct _USB_CLOSE_RAW_DEVICE_PARAMETERS {
-  ULONG  xxx;
-} USB_CLOSE_RAW_DEVICE_PARAMETERS , *PUSB_CLOSE_RAW_DEVICE_PARAMETERS;
-
-typedef struct _USBUSER_CLOSE_RAW_DEVICE {
-	USBUSER_REQUEST_HEADER  Header;
-	USB_CLOSE_RAW_DEVICE_PARAMETERS  Parameters;
-} USBUSER_CLOSE_RAW_DEVICE, *PUSBUSER_CLOSE_RAW_DEVICE;
-
-typedef struct _USB_CONTROLLER_INFO_0 {
-  ULONG  PciVendorId;
-  ULONG  PciDeviceId;
-  ULONG  PciRevision;
-  ULONG  NumberOfRootPorts;
-  USB_CONTROLLER_FLAVOR  ControllerFlavor;
-  ULONG  HcFeatureFlags;
-} USB_CONTROLLER_INFO_0 , *PUSB_CONTROLLER_INFO_0;
-
-typedef struct _USBUSER_CONTROLLER_INFO_0 {
-  USBUSER_REQUEST_HEADER  Header;
-  USB_CONTROLLER_INFO_0  Info0;    
-} USBUSER_CONTROLLER_INFO_0, *PUSBUSER_CONTROLLER_INFO_0;
-
-typedef struct _USB_DRIVER_VERSION_PARAMETERS {
-	ULONG  DriverTrackingCode;
-	ULONG  USBDI_Version;
-	ULONG  USBUSER_Version;
-	BOOLEAN  CheckedPortDriver;
-	BOOLEAN  CheckedMiniportDriver;
-	USHORT  USB_Version;
-} USB_DRIVER_VERSION_PARAMETERS , *PUSB_DRIVER_VERSION_PARAMETERS;
-
-typedef struct _USBUSER_GET_DRIVER_VERSION {
-	USBUSER_REQUEST_HEADER  Header;
-	USB_DRIVER_VERSION_PARAMETERS  Parameters;    
-} USBUSER_GET_DRIVER_VERSION, *PUSBUSER_GET_DRIVER_VERSION;
-
-typedef struct _USB_OPEN_RAW_DEVICE_PARAMETERS {
-	USHORT  PortStatus;
-	USHORT  MaxPacketEp0;
-} USB_OPEN_RAW_DEVICE_PARAMETERS , *PUSB_OPEN_RAW_DEVICE_PARAMETERS;
-
-typedef struct _USBUSER_OPEN_RAW_DEVICE {
-	USBUSER_REQUEST_HEADER  Header;
-	USB_OPEN_RAW_DEVICE_PARAMETERS  Parameters;    
-} USBUSER_OPEN_RAW_DEVICE, *PUSBUSER_OPEN_RAW_DEVICE;
-
-typedef enum _WDMUSB_POWER_STATE {
-	WdmUsbPowerNotMapped = 0,
-	WdmUsbPowerSystemUnspecified = 100,
-	WdmUsbPowerSystemWorking,
-	WdmUsbPowerSystemSleeping1,
-	WdmUsbPowerSystemSleeping2,
-	WdmUsbPowerSystemSleeping3,
-	WdmUsbPowerSystemHibernate,
-	WdmUsbPowerSystemShutdown,
-	WdmUsbPowerDeviceUnspecified = 200,
-	WdmUsbPowerDeviceD0,
-	WdmUsbPowerDeviceD1,
-	WdmUsbPowerDeviceD2,
-	WdmUsbPowerDeviceD3
-} WDMUSB_POWER_STATE;
-
-typedef struct _USB_POWER_INFO {
-	WDMUSB_POWER_STATE  SystemState;
-	WDMUSB_POWER_STATE  HcDevicePowerState;
-	WDMUSB_POWER_STATE  HcDeviceWake;
-	WDMUSB_POWER_STATE  HcSystemWake; 
-	WDMUSB_POWER_STATE  RhDevicePowerState;
-	WDMUSB_POWER_STATE  RhDeviceWake;
-	WDMUSB_POWER_STATE  RhSystemWake; 
-	WDMUSB_POWER_STATE  LastSystemSleepState; 
-	BOOLEAN  CanWakeup;
-	BOOLEAN  IsPowered;
-} USB_POWER_INFO, *PUSB_POWER_INFO;
-
-typedef struct _USBUSER_POWER_INFO_REQUEST {
-	USBUSER_REQUEST_HEADER  Header;
-	USB_POWER_INFO  PowerInformation;
-} USBUSER_POWER_INFO_REQUEST, *PUSBUSER_POWER_INFO_REQUEST;
-
-typedef struct _USB_UNICODE_NAME {
-	ULONG  Length;
-	WCHAR  String[1];
-} USB_UNICODE_NAME, *PUSB_UNICODE_NAME;
-
-typedef struct _USBUSER_CONTROLLER_UNICODE_NAME {
-	USBUSER_REQUEST_HEADER  Header;
-  USB_UNICODE_NAME  UnicodeName;
-} USBUSER_CONTROLLER_UNICODE_NAME, *PUSBUSER_CONTROLLER_UNICODE_NAME;
-
-typedef struct _USB_PASS_THRU_PARAMETERS {
-	GUID  FunctionGUID;
-	ULONG  ParameterLength;
-	UCHAR  Parameters[4];
-} USB_PASS_THRU_PARAMETERS, *PUSB_PASS_THRU_PARAMETERS;
-
-typedef struct _USBUSER_PASS_THRU_REQUEST {
-	USBUSER_REQUEST_HEADER  Header;
-	USB_PASS_THRU_PARAMETERS  PassThru;
-} USBUSER_PASS_THRU_REQUEST, *PUSBUSER_PASS_THRU_REQUEST;
-
-typedef struct _USBUSER_RAW_RESET_ROOT_PORT {
-	USBUSER_REQUEST_HEADER  Header;
-	RAW_RESET_PORT_PARAMETERS  Parameters;
-} USBUSER_RAW_RESET_ROOT_PORT, *PUSBUSER_RAW_RESET_ROOT_PORT;
-
-typedef struct _USBUSER_SEND_ONE_PACKET {
-	USBUSER_REQUEST_HEADER  Header;
-	PACKET_PARAMETERS  PacketParameters;
-} USBUSER_SEND_ONE_PACKET, *PUSBUSER_SEND_ONE_PACKET;
-
-typedef struct _USB_SEND_RAW_COMMAND_PARAMETERS {
-	UCHAR  Usb_bmRequest;
-	UCHAR  Usb_bRequest;
-	USHORT  Usb_wVlaue;
-	USHORT  Usb_wIndex;
-	USHORT  Usb_wLength;
-	USHORT  DeviceAddress;
-	USHORT  MaximumPacketSize;
-	ULONG  Timeout;
-	ULONG  DataLength;
-	USBD_STATUS  UsbdStatusCode;
-	UCHAR  Data[4];
-} USB_SEND_RAW_COMMAND_PARAMETERS, *PUSB_SEND_RAW_COMMAND_PARAMETERS;
-
-typedef struct _USBUSER_SEND_RAW_COMMAND {
-	USBUSER_REQUEST_HEADER  Header;
-	USB_SEND_RAW_COMMAND_PARAMETERS  Parameters;
-} USBUSER_SEND_RAW_COMMAND, *PUSBUSER_SEND_RAW_COMMAND;
-
-/* USB_USB2HW_VERSION_PARAMETERS.Usb2HwRevision constants */
-#define USB2HW_UNKNOWN                    0x00
-#define USB2HW_A0                         0xA0
-#define USB2HW_A1                         0xA1
-#define USB2HW_B0                         0xB0
-
-typedef struct _USB_USB2HW_VERSION_PARAMETERS {
-  UCHAR  Usb2HwRevision;
-} USB_USB2HW_VERSION_PARAMETERS, *PUSB_USB2HW_VERSION_PARAMETERS;
-
-typedef struct _USBUSER_GET_USB2HW_VERSION {
-	USBUSER_REQUEST_HEADER  Header;
-	USB_USB2HW_VERSION_PARAMETERS  Parameters;
-} USBUSER_GET_USB2HW_VERSION, *PUSBUSER_GET_USB2HW_VERSION;
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __USBUSER_H */
diff --git a/winsup/w32api/include/ddk/video.h b/winsup/w32api/include/ddk/video.h
deleted file mode 100644
index 41e17127d..000000000
--- a/winsup/w32api/include/ddk/video.h
+++ /dev/null
@@ -1,1570 +0,0 @@
-/*
- * video.h
- *
- * Video port and miniport driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __VIDEO_H
-#define __VIDEO_H
-
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __WINDDI_H
-#error winddi.h cannot be included with video.h
-#else
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-
-#if defined(_VIDEOPORT_)
-  #define VPAPI DECLSPEC_EXPORT
-#else
-  #define VPAPI DECLSPEC_IMPORT
-#endif
-
-#include "videoagp.h"
-#include "ntddvdeo.h"
-
-
-typedef LONG VP_STATUS;
-typedef VP_STATUS *PVP_STATUS;
-typedef struct __DMA_PARAMETERS * PDMA;
-typedef struct _VIDEO_PORT_EVENT *PEVENT;
-typedef struct _VIDEO_PORT_SPIN_LOCK *PSPIN_LOCK;
-typedef struct __VP_DMA_ADAPTER *PVP_DMA_ADAPTER;
-
-#define DISPLAY_ADAPTER_HW_ID             0xFFFFFFFF
-
-#define EVENT_TYPE_MASK                   1
-#define SYNCHRONIZATION_EVENT             0
-#define NOTIFICATION_EVENT                1
-
-#define INITIAL_EVENT_STATE_MASK          2
-#define INITIAL_EVENT_NOT_SIGNALED        0
-#define INITIAL_EVENT_SIGNALED            2
-
-typedef enum VIDEO_DEBUG_LEVEL {
-  Error = 0,
-  Warn,
-  Trace,
-  Info
-} VIDEO_DEBUG_LEVEL, *PVIDEO_DEBUG_LEVEL;
-
-typedef enum {
-  VideoPortUnlockAfterDma = 1,
-  VideoPortKeepPagesLocked,
-  VideoPortDmaInitOnly
-} DMA_FLAGS;
-
-typedef enum _HW_DMA_RETURN {
-  DmaAsyncReturn,
-  DmaSyncReturn
-} HW_DMA_RETURN, *PHW_DMA_RETURN;
-
-typedef HW_DMA_RETURN
-(*PVIDEO_HW_START_DMA)(
-    PVOID  HwDeviceExtension,
-    PDMA  pDma);
-
-
-#if DBG
-
-#define PAGED_CODE() \
-  if (VideoPortGetCurrentIrql() > 1 /* APC_LEVEL */) \
-  { \
-    VideoPortDebugPrint(Error, "Video: Pageable code called at IRQL %d\n", VideoPortGetCurrentIrql() ); \
-    assert(FALSE); \
-  }
-
-#else
-
-#define PAGED_CODE()
-
-#endif
-
-typedef struct _VIDEO_HARDWARE_CONFIGURATION_DATA {
-  INTERFACE_TYPE InterfaceType;
-  ULONG BusNumber;
-  USHORT Version;
-  USHORT Revision;
-  USHORT Irql;
-  USHORT Vector;
-  ULONG ControlBase;
-  ULONG ControlSize;
-  ULONG CursorBase;
-  ULONG CursorSize;
-  ULONG FrameBase;
-  ULONG FrameSize;
-} VIDEO_HARDWARE_CONFIGURATION_DATA, *PVIDEO_HARDWARE_CONFIGURATION_DATA;
-
-#define SIZE_OF_NT4_VIDEO_PORT_CONFIG_INFO       0x42
-#define SIZE_OF_NT4_VIDEO_HW_INITIALIZATION_DATA 0x28
-#define SIZE_OF_W2K_VIDEO_HW_INITIALIZATION_DATA 0x50
-
-typedef enum _VIDEO_DEVICE_DATA_TYPE {
-  VpMachineData = 0,
-  VpCmosData,
-  VpBusData,
-  VpControllerData,
-  VpMonitorData
-} VIDEO_DEVICE_DATA_TYPE, *PVIDEO_DEVICE_DATA_TYPE;
-
-
-
-/* Video miniport driver functions */
-
-typedef struct _VP_SCATTER_GATHER_ELEMENT {
-  PHYSICAL_ADDRESS  Address;
-  ULONG  Length;
-  ULONG_PTR  Reserved;
-} VP_SCATTER_GATHER_ELEMENT, *PVP_SCATTER_GATHER_ELEMENT;
-
-typedef struct _VP_SCATTER_GATHER_LIST {
-  ULONG  NumberOfElements;
-  ULONG_PTR  Reserved;
-  VP_SCATTER_GATHER_ELEMENT  Elements[0];
-} VP_SCATTER_GATHER_LIST, *PVP_SCATTER_GATHER_LIST;
-
-typedef VOID DDKAPI
-(*PEXECUTE_DMA)(
-	IN PVOID  HwDeviceExtension,
-	IN PVP_DMA_ADAPTER  VpDmaAdapter,
-	IN PVP_SCATTER_GATHER_LIST  SGList,
-	IN PVOID  Context);
-
-typedef PVOID DDKAPI
-(*PVIDEO_PORT_GET_PROC_ADDRESS)(
-  IN PVOID  HwDeviceExtension,
-  IN PUCHAR  FunctionName);
-
-typedef struct _VIDEO_PORT_CONFIG_INFO {
-  ULONG  Length;
-  ULONG  SystemIoBusNumber;
-  INTERFACE_TYPE  AdapterInterfaceType;
-  ULONG  BusInterruptLevel;
-  ULONG  BusInterruptVector;
-  KINTERRUPT_MODE  InterruptMode;
-  ULONG  NumEmulatorAccessEntries;
-  PEMULATOR_ACCESS_ENTRY  EmulatorAccessEntries;
-  ULONG_PTR  EmulatorAccessEntriesContext;
-  PHYSICAL_ADDRESS  VdmPhysicalVideoMemoryAddress;
-  ULONG  VdmPhysicalVideoMemoryLength;
-  ULONG  HardwareStateSize;
-  ULONG  DmaChannel;
-  ULONG  DmaPort;
-  UCHAR  DmaShareable;
-  UCHAR  InterruptShareable;
-  BOOLEAN  Master;
-  DMA_WIDTH  DmaWidth;
-  DMA_SPEED  DmaSpeed;
-  BOOLEAN  bMapBuffers;
-  BOOLEAN  NeedPhysicalAddresses;
-  BOOLEAN  DemandMode;
-  ULONG  MaximumTransferLength;
-  ULONG  NumberOfPhysicalBreaks;
-  BOOLEAN  ScatterGather;
-  ULONG  MaximumScatterGatherChunkSize;
-  PVIDEO_PORT_GET_PROC_ADDRESS VideoPortGetProcAddress;
-  PWSTR  DriverRegistryPath;
-  ULONGLONG  SystemMemorySize;
-} VIDEO_PORT_CONFIG_INFO, *PVIDEO_PORT_CONFIG_INFO;
-
-typedef VP_STATUS DDKAPI
-(*PVIDEO_HW_FIND_ADAPTER)(
-	IN PVOID  HwDeviceExtension,
-	IN PVOID  HwContext,
-	IN PWSTR  ArgumentString,
-	IN OUT  PVIDEO_PORT_CONFIG_INFO  ConfigInfo,
-	OUT PUCHAR  Again);
-
-typedef VP_STATUS DDKAPI
-(*PVIDEO_HW_POWER_GET)(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  HwId,
-  IN OUT  PVIDEO_POWER_MANAGEMENT  VideoPowerControl);
-
-/* PVIDEO_HW_GET_CHILD_DESCRIPTOR return values */
-#define VIDEO_ENUM_MORE_DEVICES           ERROR_CONTINUE
-#define VIDEO_ENUM_NO_MORE_DEVICES        ERROR_NO_MORE_DEVICES
-#define VIDEO_ENUM_INVALID_DEVICE         ERROR_INVALID_NAME
-
-/* PVIDEO_HW_GET_CHILD_DESCRIPTOR.ChildEnumInfo constants */
-typedef struct _VIDEO_CHILD_ENUM_INFO {
-  ULONG  Size;
-  ULONG  ChildDescriptorSize;
-  ULONG  ChildIndex;
-  ULONG  ACPIHwId;
-  PVOID  ChildHwDeviceExtension;
-} VIDEO_CHILD_ENUM_INFO, *PVIDEO_CHILD_ENUM_INFO;
-
-/* PVIDEO_HW_GET_CHILD_DESCRIPTOR.VideoChildType constants */
-typedef enum _VIDEO_CHILD_TYPE {
-  Monitor = 1,
-  NonPrimaryChip,
-  VideoChip,
-  Other
-} VIDEO_CHILD_TYPE, *PVIDEO_CHILD_TYPE;
-
-typedef VP_STATUS DDKAPI
-(*PVIDEO_HW_GET_CHILD_DESCRIPTOR)(
-  IN PVOID  HwDeviceExtension,
-  IN PVIDEO_CHILD_ENUM_INFO  ChildEnumInfo,
-  OUT  PVIDEO_CHILD_TYPE  VideoChildType,
-  OUT  PUCHAR  pChildDescriptor,
-  OUT  PULONG  UId,
-  OUT  PULONG  pUnused);
-
-typedef BOOLEAN DDKAPI
-(*PVIDEO_HW_INITIALIZE)(
-  IN PVOID  HwDeviceExtension);
-
-typedef BOOLEAN DDKAPI
-(*PVIDEO_HW_INTERRUPT)(
-  IN PVOID  HwDeviceExtension);
-
-/* VIDEO_ACCESS_RANGE.RangePassive */
-#define VIDEO_RANGE_PASSIVE_DECODE        1
-#define VIDEO_RANGE_10_BIT_DECODE         2
-
-#ifndef VIDEO_ACCESS_RANGE_DEFINED /* also in miniport.h */
-#define VIDEO_ACCESS_RANGE_DEFINED
-typedef struct _VIDEO_ACCESS_RANGE {
-  PHYSICAL_ADDRESS  RangeStart;
-  ULONG  RangeLength;
-  UCHAR  RangeInIoSpace;
-  UCHAR  RangeVisible;
-  UCHAR  RangeShareable;
-  UCHAR  RangePassive;
-} VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE;
-#endif
-
-typedef VOID DDKAPI
-(*PVIDEO_HW_LEGACYRESOURCES)(
-  IN ULONG  VendorId,
-  IN ULONG  DeviceId,
-  IN OUT  PVIDEO_ACCESS_RANGE  *LegacyResourceList,
-  IN OUT  PULONG  LegacyResourceCount);
-
-typedef VP_STATUS DDKAPI
-(*PMINIPORT_QUERY_DEVICE_ROUTINE)(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Context,
-  IN VIDEO_DEVICE_DATA_TYPE  DeviceDataType,
-  IN PVOID  Identifier,
-  IN ULONG  IdentifierLength,
-  IN PVOID  ConfigurationData,
-  IN ULONG  ConfigurationDataLength,
-  IN OUT  PVOID  ComponentInformation,
-  IN ULONG  ComponentInformationLength);
-
-typedef struct _QUERY_INTERFACE {
-  CONST GUID  *InterfaceType;
-  USHORT  Size;
-  USHORT  Version;
-  PINTERFACE  Interface;
-  PVOID  InterfaceSpecificData;
-} QUERY_INTERFACE, *PQUERY_INTERFACE;
-
-typedef VP_STATUS DDKAPI
-(*PVIDEO_HW_QUERY_INTERFACE)(
-  IN PVOID  HwDeviceExtension,
-  IN OUT  PQUERY_INTERFACE  QueryInterface);
-
-typedef VP_STATUS DDKAPI
-(*PMINIPORT_GET_REGISTRY_ROUTINE)(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Context,
-  IN OUT  PWSTR  ValueName,
-  IN OUT  PVOID  ValueData,
-  IN ULONG  ValueLength);
-
-typedef BOOLEAN DDKAPI
-(*PVIDEO_HW_RESET_HW)(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  Columns,
-  IN ULONG  Rows);
-
-typedef VP_STATUS DDKAPI
-(*PVIDEO_HW_POWER_SET)(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  HwId,
-  IN PVIDEO_POWER_MANAGEMENT  VideoPowerControl);
-
-typedef struct _STATUS_BLOCK {
-   _ANONYMOUS_UNION union {
-    VP_STATUS  Status;
-    PVOID  Pointer;
-  } DUMMYUNIONNAME;
-  ULONG_PTR Information;
-} STATUS_BLOCK, *PSTATUS_BLOCK;
-
-typedef struct _VIDEO_REQUEST_PACKET {
-  ULONG  IoControlCode;
-  PSTATUS_BLOCK  StatusBlock;
-  PVOID  InputBuffer;
-  ULONG  InputBufferLength;
-  PVOID  OutputBuffer;
-  ULONG  OutputBufferLength;
-} VIDEO_REQUEST_PACKET, *PVIDEO_REQUEST_PACKET;
-
-typedef BOOLEAN DDKAPI
-(*PVIDEO_HW_START_IO)(
-  IN PVOID  HwDeviceExtension,
-  IN PVIDEO_REQUEST_PACKET  RequestPacket);
-
-typedef BOOLEAN DDKAPI
-(*PMINIPORT_SYNCHRONIZE_ROUTINE)(
-  IN PVOID  Context);
-
-typedef VOID DDKAPI
-(*PVIDEO_HW_TIMER)(
-  IN PVOID  HwDeviceExtension);
-
-typedef VOID DDKAPI
-(*PMINIPORT_DPC_ROUTINE)(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Context);
-
-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_UCHAR)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PUCHAR  Data);
-
-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_UCHAR_STRING)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PUCHAR  Data,
-  IN ULONG  DataLength);
-
-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_ULONG)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PULONG  Data);
-
-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_ULONG_STRING)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PULONG  Data,
-  IN ULONG  DataLength);
-
-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_USHORT)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PUSHORT  Data);
-
-typedef VP_STATUS DDKAPI
-(*PDRIVER_IO_PORT_USHORT_STRING)(
-  IN ULONG_PTR  Context,
-  IN ULONG  Port,
-  IN UCHAR  AccessMode,
-  IN PUSHORT  Data,
-  IN ULONG  DataLength);
-
-
-
-typedef struct _INT10_BIOS_ARGUMENTS {
-  ULONG  Eax;
-  ULONG  Ebx;
-  ULONG  Ecx;
-  ULONG  Edx;
-  ULONG  Esi;
-  ULONG  Edi;
-  ULONG  Ebp;
-  USHORT  SegDs;
-  USHORT  SegEs;
-} INT10_BIOS_ARGUMENTS, *PINT10_BIOS_ARGUMENTS;
-
-typedef struct _VIDEO_CHILD_STATE {
-  ULONG  Id;
-  ULONG  State;
-} VIDEO_CHILD_STATE, *PVIDEO_CHILD_STATE;
-
-typedef struct _VIDEO_CHILD_STATE_CONFIGURATION {
-  ULONG  Count;
-  VIDEO_CHILD_STATE  ChildStateArray[ANYSIZE_ARRAY];
-} VIDEO_CHILD_STATE_CONFIGURATION, *PVIDEO_CHILD_STATE_CONFIGURATION;
-
-typedef struct _VIDEO_HW_INITIALIZATION_DATA {
-  ULONG  HwInitDataSize;
-  INTERFACE_TYPE  AdapterInterfaceType;
-  PVIDEO_HW_FIND_ADAPTER  HwFindAdapter;
-  PVIDEO_HW_INITIALIZE  HwInitialize;
-  PVIDEO_HW_INTERRUPT  HwInterrupt;
-  PVIDEO_HW_START_IO  HwStartIO;
-  ULONG  HwDeviceExtensionSize;
-  ULONG  StartingDeviceNumber;
-  PVIDEO_HW_RESET_HW  HwResetHw;
-  PVIDEO_HW_TIMER  HwTimer;
-  PVIDEO_HW_START_DMA  HwStartDma;
-  PVIDEO_HW_POWER_SET  HwSetPowerState;
-  PVIDEO_HW_POWER_GET  HwGetPowerState;
-  PVIDEO_HW_GET_CHILD_DESCRIPTOR  HwGetVideoChildDescriptor;
-  PVIDEO_HW_QUERY_INTERFACE  HwQueryInterface;
-  ULONG  HwChildDeviceExtensionSize;
-  PVIDEO_ACCESS_RANGE  HwLegacyResourceList;
-  ULONG  HwLegacyResourceCount;
-  PVIDEO_HW_LEGACYRESOURCES  HwGetLegacyResources;
-  BOOLEAN  AllowEarlyEnumeration;
-  ULONG  Reserved;
-} VIDEO_HW_INITIALIZATION_DATA, *PVIDEO_HW_INITIALIZATION_DATA;
-
-/* VIDEO_PORT_AGP_INTERFACE.Version contants */
-#define VIDEO_PORT_AGP_INTERFACE_VERSION_1 1
-
-typedef struct _VIDEO_PORT_AGP_INTERFACE {
-  SHORT  Size;
-  SHORT  Version;
-  PVOID  Context;
-  PINTERFACE_REFERENCE  InterfaceReference;
-  PINTERFACE_DEREFERENCE  InterfaceDereference;
-  PAGP_RESERVE_PHYSICAL  AgpReservePhysical;
-  PAGP_RELEASE_PHYSICAL  AgpReleasePhysical;
-  PAGP_COMMIT_PHYSICAL  AgpCommitPhysical;
-  PAGP_FREE_PHYSICAL  AgpFreePhysical;
-  PAGP_RESERVE_VIRTUAL  AgpReserveVirtual;
-  PAGP_RELEASE_VIRTUAL  AgpReleaseVirtual;
-  PAGP_COMMIT_VIRTUAL  AgpCommitVirtual;
-  PAGP_FREE_VIRTUAL  AgpFreeVirtual;
-  ULONGLONG  AgpAllocationLimit;
-} VIDEO_PORT_AGP_INTERFACE, *PVIDEO_PORT_AGP_INTERFACE;
-
-/* VIDEO_PORT_AGP_INTERFACE_2.Version constants */
-#define VIDEO_PORT_AGP_INTERFACE_VERSION_2 2
-
-typedef struct _VIDEO_PORT_AGP_INTERFACE_2 {
-  IN USHORT  Size;
-  IN USHORT  Version;
-  OUT PVOID  Context;
-  OUT PINTERFACE_REFERENCE  InterfaceReference;
-  OUT PINTERFACE_DEREFERENCE  InterfaceDereference;
-  OUT PAGP_RESERVE_PHYSICAL  AgpReservePhysical;
-  OUT PAGP_RELEASE_PHYSICAL  AgpReleasePhysical;
-  OUT PAGP_COMMIT_PHYSICAL  AgpCommitPhysical;
-  OUT PAGP_FREE_PHYSICAL  AgpFreePhysical;
-  OUT PAGP_RESERVE_VIRTUAL  AgpReserveVirtual;
-  OUT PAGP_RELEASE_VIRTUAL  AgpReleaseVirtual;
-  OUT PAGP_COMMIT_VIRTUAL  AgpCommitVirtual;
-  OUT PAGP_FREE_VIRTUAL  AgpFreeVirtual;
-  OUT ULONGLONG  AgpAllocationLimit;
-  OUT PAGP_SET_RATE  AgpSetRate;
-} VIDEO_PORT_AGP_INTERFACE_2, *PVIDEO_PORT_AGP_INTERFACE_2;
-
-#define VIDEO_PORT_I2C_INTERFACE_VERSION_1  1
-
-typedef VOID DDKAPI
-(*PVIDEO_WRITE_CLOCK_LINE)(
-  PVOID HwDeviceExtension,
-  UCHAR Data);
-
-typedef VOID DDKAPI
-(*PVIDEO_WRITE_DATA_LINE)(
-  PVOID HwDeviceExtension,
-  UCHAR Data);
-
-typedef BOOLEAN DDKAPI
-(*PVIDEO_READ_CLOCK_LINE)(
-  PVOID HwDeviceExtension);
-
-typedef BOOLEAN DDKAPI
-(*PVIDEO_READ_DATA_LINE)(
-  PVOID HwDeviceExtension);
-
-typedef struct _I2C_CALLBACKS
-{
-  IN PVIDEO_WRITE_CLOCK_LINE  WriteClockLine;
-  IN PVIDEO_WRITE_DATA_LINE  WriteDataLine;
-  IN PVIDEO_READ_CLOCK_LINE  ReadClockLine;
-  IN PVIDEO_READ_DATA_LINE  ReadDataLine;
-} I2C_CALLBACKS, *PI2C_CALLBACKS;
-
-typedef BOOLEAN DDKAPI
-(*PI2C_START)(
-  IN PVOID  HwDeviceExtension,
-  IN PI2C_CALLBACKS  I2CCallbacks);
-
-typedef BOOLEAN DDKAPI
-(*PI2C_STOP)(
-  IN PVOID  HwDeviceExtension,
-  IN PI2C_CALLBACKS  I2CCallbacks);
-
-typedef BOOLEAN DDKAPI
-(*PI2C_WRITE)(
-  IN PVOID  HwDeviceExtension,
-  IN PI2C_CALLBACKS  I2CCallbacks,
-  IN PUCHAR  Buffer,
-  IN ULONG  Length);
-
-typedef BOOLEAN DDKAPI
-(*PI2C_READ)(
-  IN PVOID  HwDeviceExtension,
-  IN PI2C_CALLBACKS  I2CCallbacks,
-  OUT PUCHAR  Buffer,
-  IN ULONG  Length);
-
-typedef struct _VIDEO_PORT_I2C_INTERFACE {
-  USHORT  Size;
-  USHORT  Version;
-  PVOID  Context;
-  PINTERFACE_REFERENCE  InterfaceReference;
-  PINTERFACE_DEREFERENCE  InterfaceDereference;
-  PI2C_START  I2CStart;
-  PI2C_STOP  I2CStop;
-  PI2C_WRITE  I2CWrite;
-  PI2C_READ  I2CRead;
-} VIDEO_PORT_I2C_INTERFACE, *PVIDEO_PORT_I2C_INTERFACE;
-
-/* VIDEO_PORT_INT10_INTERFACE.Version constants */
-#define VIDEO_PORT_INT10_INTERFACE_VERSION_1 1
-
-typedef VP_STATUS DDKAPI
-(*PINT10_ALLOCATE_BUFFER)(
-  IN PVOID  Context,
-  OUT PUSHORT  Seg,
-  OUT PUSHORT  Off,
-  IN OUT PULONG  Length);
-
-typedef VP_STATUS DDKAPI
-(*PINT10_CALL_BIOS)(
-  IN PVOID  Context,
-  IN OUT PINT10_BIOS_ARGUMENTS  BiosArguments);
-
-typedef VP_STATUS DDKAPI
-(*PINT10_FREE_BUFFER)(
-  IN PVOID  Context,
-  IN USHORT  Seg,
-  IN USHORT  Off);
-
-typedef VP_STATUS DDKAPI
-(*PINT10_READ_MEMORY)(
-  IN PVOID  Context,
-  IN USHORT  Seg,
-  IN USHORT  Off,
-  OUT PVOID  Buffer,
-  IN ULONG  Length);
-
-typedef VP_STATUS DDKAPI
-(*PINT10_WRITE_MEMORY)(
-  IN PVOID  Context,
-  IN USHORT  Seg,
-  IN USHORT  Off,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
-
-typedef struct _VIDEO_PORT_INT10_INTERFACE {
-  IN USHORT  Size;
-  IN USHORT  Version;
-  OUT PVOID  Context;
-  OUT PINTERFACE_REFERENCE  InterfaceReference;
-  OUT PINTERFACE_DEREFERENCE  InterfaceDereference;
-  OUT PINT10_ALLOCATE_BUFFER  Int10AllocateBuffer;
-  OUT PINT10_FREE_BUFFER  Int10FreeBuffer;
-  OUT PINT10_READ_MEMORY  Int10ReadMemory;
-  OUT PINT10_WRITE_MEMORY  Int10WriteMemory;
-  OUT PINT10_CALL_BIOS  Int10CallBios;
-} VIDEO_PORT_INT10_INTERFACE, *PVIDEO_PORT_INT10_INTERFACE;
-
-/* Flags for VideoPortGetDeviceBase and VideoPortMapMemory */
-#define VIDEO_MEMORY_SPACE_MEMORY         0x00
-#define VIDEO_MEMORY_SPACE_IO             0x01
-#define VIDEO_MEMORY_SPACE_USER_MODE      0x02
-#define VIDEO_MEMORY_SPACE_DENSE          0x04
-#define VIDEO_MEMORY_SPACE_P6CACHE        0x08
-
-typedef struct _VIDEO_X86_BIOS_ARGUMENTS {
-  ULONG  Eax;
-  ULONG  Ebx;
-  ULONG  Ecx;
-  ULONG  Edx;
-  ULONG  Esi;
-  ULONG  Edi;
-  ULONG  Ebp;
-} VIDEO_X86_BIOS_ARGUMENTS, *PVIDEO_X86_BIOS_ARGUMENTS;
-
-typedef struct _VP_DEVICE_DESCRIPTION {
-  BOOLEAN  ScatterGather;
-  BOOLEAN  Dma32BitAddresses;
-  BOOLEAN  Dma64BitAddresses;
-  ULONG  MaximumLength;
-} VP_DEVICE_DESCRIPTION, *PVP_DEVICE_DESCRIPTION;
-
-typedef struct _VPOSVERSIONINFO {
-  IN ULONG  Size;
-  OUT ULONG  MajorVersion;
-  OUT ULONG  MinorVersion;
-  OUT ULONG  BuildNumber;
-  OUT USHORT  ServicePackMajor;
-  OUT USHORT  ServicePackMinor;
-} VPOSVERSIONINFO, *PVPOSVERSIONINFO;
-
-
-
-/* Video port functions for miniports */
-
-VPAPI
-VOID
-DDKAPI
-VideoDebugPrint(
-  IN ULONG  DebugPrintLevel,
-  IN PCHAR  DebugMessage,
-  IN ...);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortAcquireDeviceLock(
-  IN PVOID  HwDeviceExtension);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortAcquireSpinLock(
-  IN PVOID  HwDeviceExtension,
-  IN PSPIN_LOCK  SpinLock,
-  OUT PUCHAR  OldIrql);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortAcquireSpinLockAtDpcLevel(
-  IN PVOID  HwDeviceExtension,
-  IN PSPIN_LOCK  SpinLock);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortAllocateBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  Size,
-  OUT PVOID  *Buffer);
-
-VPAPI
-PVOID
-DDKAPI
-VideoPortAllocateCommonBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DMA_ADAPTER  VpDmaAdapter,
-  IN ULONG  DesiredLength,
-  OUT PPHYSICAL_ADDRESS  LogicalAddress,
-  IN BOOLEAN  CacheEnabled,
-  PVOID  Reserved);
-
-VPAPI
-PVOID
-DDKAPI
-VideoPortAllocateContiguousMemory(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  NumberOfBytes,
-  IN PHYSICAL_ADDRESS  HighestAcceptableAddress);
-
-/* VideoPortAllocatePool.PoolType constants */
-typedef enum _VP_POOL_TYPE {
-  VpNonPagedPool = 0,
-  VpPagedPool,
-  VpNonPagedPoolCacheAligned = 4,
-  VpPagedPoolCacheAligned
-} VP_POOL_TYPE, *PVP_POOL_TYPE;
-
-VPAPI
-PVOID
-DDKAPI
-VideoPortAllocatePool(
-  IN PVOID  HwDeviceExtension,
-  IN VP_POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  Tag);
-
-VPAPI
-PDMA
-DDKAPI
-VideoPortAssociateEventsWithDmaHandle(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PVIDEO_REQUEST_PACKET  pVrp,
-  IN PVOID  MappedUserEvent,
-  IN PVOID  DisplayDriverEvent);
-
-/* VideoPortCheckForDeviceExistence.Flags constants */
-#define CDE_USE_SUBSYSTEM_IDS             0x00000001
-#define CDE_USE_REVISION                  0x00000002
-
-VPAPI
-BOOLEAN
-DDKAPI
-VideoPortCheckForDeviceExistence(
-  IN PVOID  HwDeviceExtension,
-  IN USHORT  VendorId,
-  IN USHORT  DeviceId,
-  IN UCHAR  RevisionId,
-  IN USHORT  SubVendorId,
-  IN USHORT  SubSystemId,
-  IN ULONG  Flags);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortClearEvent(
-  IN PVOID  HwDeviceExtension,
-  IN PEVENT  pEvent);
-
-VPAPI
-ULONG
-DDKAPI
-VideoPortCompareMemory(
-  IN PVOID  Source1,
-  IN PVOID  Source2,
-  IN ULONG  Length);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortCompleteDma(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DMA_ADAPTER  VpDmaAdapter,
-  IN PVP_SCATTER_GATHER_LIST  VpScatterGather,
-  IN BOOLEAN  WriteToDevice);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortCreateEvent(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  EventFlag,
-  IN PVOID  Unused,
-  OUT PEVENT  *ppEvent);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortCreateSecondaryDisplay(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PVOID  *SecondaryDeviceExtension,
-  IN ULONG  ulFlag);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortCreateSpinLock(
-  IN PVOID  HwDeviceExtension,
-  OUT PSPIN_LOCK  *SpinLock);
-
-typedef struct _DDC_CONTROL {
-  IN ULONG  Size;
-  IN I2C_CALLBACKS  I2CCallbacks;
-  IN UCHAR  EdidSegment;
-} DDC_CONTROL, *PDDC_CONTROL;
-
-VPAPI
-BOOLEAN
-DDKAPI
-VideoPortDDCMonitorHelper(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  DDCControl,
-  IN OUT PUCHAR  EdidBuffer,
-  IN ULONG  EdidBufferSize);
-
-VPAPI
-VOID
-DDKCDECLAPI
-VideoPortDebugPrint(
-  IN VIDEO_DEBUG_LEVEL  DebugPrintLevel,
-  IN PCHAR  DebugMessage,
-  IN ...);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortDeleteEvent(
-  IN PVOID  HwDeviceExtension,
-  IN PEVENT  pEvent);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortDeleteSpinLock(
-  IN PVOID  HwDeviceExtension,
-  IN PSPIN_LOCK  SpinLock);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortDisableInterrupt(
-  IN PVOID  HwDeviceExtension);
-
-VPAPI
-PDMA
-DDKAPI
-VideoPortDoDma(
-  IN PVOID  HwDeviceExtension,
-  IN PDMA  pDma,
-  IN DMA_FLAGS  DmaFlags);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortEnableInterrupt(
-  IN PVOID  HwDeviceExtension);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortEnumerateChildren(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Reserved);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortFreeCommonBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  Length,
-  IN PVOID  VirtualAddress,
-  IN PHYSICAL_ADDRESS  LogicalAddress,
-  IN BOOLEAN  CacheEnabled);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortFreeDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  MappedAddress);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortFreePool(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Ptr);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortGetAccessRanges(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  NumRequestedResources,
-  IN PIO_RESOURCE_DESCRIPTOR  RequestedResources  OPTIONAL,
-  IN ULONG  NumAccessRanges,
-  OUT PVIDEO_ACCESS_RANGE  AccessRanges,
-  IN PVOID  VendorId,
-  IN PVOID  DeviceId,
-  OUT PULONG  Slot);
-
-VPAPI
-PVOID
-DDKAPI
-VideoPortGetAssociatedDeviceExtension(
-  IN PVOID  DeviceObject);
-
-VPAPI
-ULONG
-DDKAPI
-VideoPortGetAssociatedDeviceID(
-  IN PVOID DeviceObject);
-
-VPAPI
-ULONG
-DDKAPI
-VideoPortGetBusData(
-  IN PVOID  HwDeviceExtension,
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  SlotNumber,
-  IN OUT PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
-
-VPAPI
-ULONG
-DDKAPI
-VideoPortGetBytesUsed(
-  IN PVOID  HwDeviceExtension,
-  IN PDMA  pDma);
-
-VPAPI
-PVOID
-DDKAPI
-VideoPortGetCommonBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  DesiredLength,
-  IN ULONG  Alignment,
-  OUT PPHYSICAL_ADDRESS  LogicalAddress,
-  OUT PULONG  pActualLength,
-  IN BOOLEAN  CacheEnabled);
-
-VPAPI
-UCHAR
-DDKAPI
-VideoPortGetCurrentIrql(
-  VOID);
-
-VPAPI
-PVOID
-DDKAPI
-VideoPortGetDeviceBase(
-  IN PVOID  HwDeviceExtension,
-  IN PHYSICAL_ADDRESS  IoAddress,
-  IN ULONG  NumberOfUchars,
-  IN UCHAR  InIoSpace);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortGetDeviceData(
-  IN PVOID  HwDeviceExtension,
-  IN VIDEO_DEVICE_DATA_TYPE  DeviceDataType,
-  IN PMINIPORT_QUERY_DEVICE_ROUTINE  CallbackRoutine,
-  IN PVOID  Context);
-
-VPAPI
-PVP_DMA_ADAPTER
-DDKAPI
-VideoPortGetDmaAdapter(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DEVICE_DESCRIPTION  VpDeviceDescription);
-
-VPAPI
-PVOID
-DDKAPI
-VideoPortGetDmaContext(
-  IN PVOID  HwDeviceExtension,
-  IN PDMA  pDma);
-
-VPAPI
-PVOID
-DDKAPI
-VideoPortGetMdl(
-  IN PVOID  HwDeviceExtension,
-  IN PDMA  pDma);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortGetRegistryParameters(
-  IN PVOID  HwDeviceExtension,
-  IN PWSTR  ParameterName,
-  IN UCHAR  IsParameterFileName,
-  IN PMINIPORT_GET_REGISTRY_ROUTINE  CallbackRoutine,
-  IN PVOID  Context);
-
-VPAPI
-PVOID
-DDKAPI
-VideoPortGetRomImage(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Unused1,
-  IN ULONG  Unused2,
-  IN ULONG  Length);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortGetVersion(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PVPOSVERSIONINFO  pVpOsVersionInfo);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortGetVgaStatus(
-  IN PVOID  HwDeviceExtension,
-  OUT PULONG  VgaStatus);
-
-VPAPI
-ULONG
-DDKAPI
-VideoPortInitialize(
-  IN PVOID  Argument1,
-  IN PVOID  Argument2,
-  IN PVIDEO_HW_INITIALIZATION_DATA  HwInitializationData,
-  IN PVOID  HwContext);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortInt10(
-  IN PVOID  HwDeviceExtension,
-  IN PVIDEO_X86_BIOS_ARGUMENTS  BiosArguments);
-
-VPAPI
-LONG
-DDKFASTAPI
-VideoPortInterlockedDecrement(
-  IN PLONG  Addend);
-
-VPAPI
-LONG
-DDKFASTAPI
-VideoPortInterlockedExchange(
-  IN OUT PLONG  Target,
-  IN LONG  Value);
-
-VPAPI
-LONG
-DDKFASTAPI
-VideoPortInterlockedIncrement(
-  IN PLONG  Addend);
-
-typedef enum _VP_LOCK_OPERATION {
-  VpReadAccess = 0,
-  VpWriteAccess,
-  VpModifyAccess
-} VP_LOCK_OPERATION;
-
-VPAPI
-PVOID
-DDKAPI
-VideoPortLockBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  BaseAddress,
-  IN ULONG  Length,
-  IN VP_LOCK_OPERATION  Operation);
-
-VPAPI
-BOOLEAN
-DDKAPI
-VideoPortLockPages(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PVIDEO_REQUEST_PACKET  pVrp,
-  IN OUT PEVENT  pUEvent,
-  IN PEVENT  pDisplayEvent,
-  IN DMA_FLAGS  DmaFlags);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortLogError(
-  IN PVOID  HwDeviceExtension,
-  IN PVIDEO_REQUEST_PACKET  Vrp  OPTIONAL,
-  IN VP_STATUS  ErrorCode,
-  IN ULONG  UniqueId);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortMapBankedMemory(
-  IN PVOID  HwDeviceExtension,
-  IN PHYSICAL_ADDRESS  PhysicalAddress,
-  IN OUT PULONG  Length,
-  PULONG  InIoSpace,
-  PVOID  *VirtualAddress,
-  ULONG  BankLength,
-  UCHAR  ReadWriteBank,
-  PBANKED_SECTION_ROUTINE  BankRoutine,
-  PVOID  Context);
-
-VPAPI
-PDMA
-DDKAPI
-VideoPortMapDmaMemory(
-  IN PVOID  HwDeviceExtension,
-  IN PVIDEO_REQUEST_PACKET  pVrp,
-  IN PHYSICAL_ADDRESS  BoardAddress,
-  IN PULONG  Length,
-  IN PULONG  InIoSpace,
-  IN PVOID  MappedUserEvent,
-  IN PVOID  DisplayDriverEvent,
-  IN OUT PVOID  *VirtualAddress);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortMapMemory(
-  IN PVOID  HwDeviceExtension,
-  IN PHYSICAL_ADDRESS  PhysicalAddress,
-  IN OUT PULONG  Length,
-  IN PULONG  InIoSpace,
-  IN OUT PVOID  *VirtualAddress);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortMoveMemory(
-  IN PVOID  Destination,
-  IN PVOID  Source,
-  IN ULONG  Length);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortPutDmaAdapter(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DMA_ADAPTER  VpDmaAdapter);
-
-VPAPI
-LONGLONG
-DDKAPI
-VideoPortQueryPerformanceCounter(
-  IN PVOID  HwDeviceExtension,
-  OUT PLONGLONG  PerformanceFrequency  OPTIONAL);
-
-/* VideoPortQueryServices.ServicesType constants */
-typedef enum _VIDEO_PORT_SERVICES {
-  VideoPortServicesAGP = 1,
-  VideoPortServicesI2C,
-  VideoPortServicesHeadless,
-  VideoPortServicesInt10
-} VIDEO_PORT_SERVICES;
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortQueryServices(
-  IN PVOID HwDeviceExtension,
-  IN VIDEO_PORT_SERVICES ServicesType,
-  IN OUT PINTERFACE Interface);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortQuerySystemTime(
-  OUT PLARGE_INTEGER  CurrentTime);
-
-VPAPI
-BOOLEAN
-DDKAPI
-VideoPortQueueDpc(
-  IN PVOID  HwDeviceExtension,
-  IN PMINIPORT_DPC_ROUTINE  CallbackRoutine,
-  IN PVOID  Context);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReadPortBufferUchar(
-  IN PUCHAR  Port,
-  OUT PUCHAR  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReadPortBufferUlong(
-  IN PULONG  Port,
-  OUT PULONG  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReadPortBufferUshort(
-  IN PUSHORT  Port,
-  OUT PUSHORT  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-UCHAR
-DDKAPI
-VideoPortReadPortUchar(
-  IN PUCHAR  Port);
-
-VPAPI
-ULONG
-DDKAPI
-VideoPortReadPortUlong(
-  IN PULONG  Port);
-
-VPAPI
-USHORT
-DDKAPI
-VideoPortReadPortUshort(
-  IN PUSHORT  Port);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReadRegisterBufferUchar(
-  IN PUCHAR  Register,
-  OUT PUCHAR  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReadRegisterBufferUlong(
-  IN PULONG  Register,
-  OUT PULONG  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReadRegisterBufferUshort(
-  IN PUSHORT  Register,
-  OUT PUSHORT  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-UCHAR
-DDKAPI
-VideoPortReadRegisterUchar(
-  IN PUCHAR  Register);
-
-VPAPI
-ULONG
-DDKAPI
-VideoPortReadRegisterUlong(
-  IN PULONG  Register);
-
-VPAPI
-USHORT
-DDKAPI
-VideoPortReadRegisterUshort(
-  IN PUSHORT  Register);
-
-VPAPI
-LONG
-DDKAPI
-VideoPortReadStateEvent(
-  IN PVOID  HwDeviceExtension,
-  IN PEVENT  pEvent);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReleaseBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Buffer);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReleaseCommonBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DMA_ADAPTER  VpDmaAdapter,
-  IN ULONG  Length,
-  IN PHYSICAL_ADDRESS  LogicalAddress,
-  IN PVOID  VirtualAddress,
-  IN BOOLEAN  CacheEnabled);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReleaseDeviceLock(
-  IN PVOID  HwDeviceExtension);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReleaseSpinLock(
-  IN PVOID  HwDeviceExtension,
-  IN PSPIN_LOCK  SpinLock,
-  IN UCHAR  NewIrql);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortReleaseSpinLockFromDpcLevel(
-  IN PVOID  HwDeviceExtension,
-  IN PSPIN_LOCK  SpinLock);
-
-VPAPI
-BOOLEAN
-DDKAPI
-VideoPortScanRom(
-  PVOID  HwDeviceExtension,
-  PUCHAR  RomBase,
-  ULONG  RomLength,
-  PUCHAR  String);
-
-VPAPI
-ULONG
-DDKAPI
-VideoPortSetBusData(
-  IN PVOID  HwDeviceExtension,
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortSetBytesUsed(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PDMA  pDma,
-  IN ULONG  BytesUsed);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortSetDmaContext(
-  IN PVOID  HwDeviceExtension,
-  OUT PDMA  pDma,
-  IN PVOID  InstanceContext);
-
-VPAPI
-LONG
-DDKAPI
-VideoPortSetEvent(
-  IN PVOID  HwDeviceExtension,
-  IN PEVENT  pEvent);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortSetRegistryParameters(
-  IN PVOID  HwDeviceExtension,
-  IN PWSTR  ValueName,
-  IN PVOID  ValueData,
-  IN ULONG  ValueLength);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortSetTrappedEmulatorPorts(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  NumAccessRanges,
-  IN PVIDEO_ACCESS_RANGE  AccessRange);
-
-VPAPI
-BOOLEAN
-DDKAPI
-VideoPortSignalDmaComplete(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  pDmaHandle);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortStallExecution(
-  IN ULONG  Microseconds);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortStartDma(
-  IN PVOID  HwDeviceExtension,
-  IN PVP_DMA_ADAPTER  VpDmaAdapter,
-  IN PVOID  Mdl,
-  IN ULONG  Offset,
-  IN OUT PULONG  pLength,
-  IN PEXECUTE_DMA  ExecuteDmaRoutine,
-  IN PVOID  Context,
-  IN BOOLEAN  WriteToDevice);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortStartTimer(
-  IN PVOID  HwDeviceExtension);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortStopTimer(
-  IN PVOID  HwDeviceExtension);
-
-/* VideoPortSynchronizeExecution.Priority constants */
-typedef enum VIDEO_SYNCHRONIZE_PRIORITY {
-  VpLowPriority = 0,
-  VpMediumPriority,
-  VpHighPriority
-} VIDEO_SYNCHRONIZE_PRIORITY, *PVIDEO_SYNCHRONIZE_PRIORITY;
-
-VPAPI
-BOOLEAN
-DDKAPI
-VideoPortSynchronizeExecution(
-  IN PVOID  HwDeviceExtension,
-  IN VIDEO_SYNCHRONIZE_PRIORITY  Priority,
-  IN PMINIPORT_SYNCHRONIZE_ROUTINE  SynchronizeRoutine,
-  IN PVOID  Context);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortUnLockBuffer(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Mdl);
-
-VPAPI
-BOOLEAN
-DDKAPI
-VideoPortUnlockPages(
-  IN PVOID  hwDeviceExtension,
-  IN OUT PDMA  pDma);
-
-VPAPI
-BOOLEAN
-DDKAPI
-VideoPortUnmapDmaMemory(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  VirtualAddress,
-  IN HANDLE  ProcessHandle,
-  IN PDMA  BoardMemoryHandle);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortUnmapMemory(
-  IN PVOID  HwDeviceExtension,
-  IN OUT PVOID  VirtualAddress,
-  IN HANDLE  ProcessHandle);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortVerifyAccessRanges(
-  IN PVOID  HwDeviceExtension,
-  IN ULONG  NumAccessRanges,
-  IN PVIDEO_ACCESS_RANGE  AccessRanges);
-
-VPAPI
-VP_STATUS
-DDKAPI
-VideoPortWaitForSingleObject(
-  IN PVOID  HwDeviceExtension,
-  IN PVOID  Object,
-  IN PLARGE_INTEGER  Timeout  OPTIONAL);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWritePortBufferUchar(
-  IN PUCHAR  Port,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWritePortBufferUlong(
-  IN PULONG  Port,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWritePortBufferUshort(
-  IN PUSHORT  Port,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWritePortUchar(
-  IN PUCHAR  Port,
-  IN UCHAR  Value);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWritePortUlong(
-  IN PULONG  Port,
-  IN ULONG  Value);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWritePortUshort(
-  IN PUSHORT  Port,
-  IN USHORT  Value);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWriteRegisterBufferUchar(
-  IN PUCHAR  Register,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWriteRegisterBufferUlong(
-  IN PULONG  Register,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWriteRegisterBufferUshort(
-  IN PUSHORT  Register,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWriteRegisterUchar(
-  IN PUCHAR  Register,
-  IN UCHAR  Value);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWriteRegisterUlong(
-  IN PULONG  Register,
-  IN ULONG  Value);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortWriteRegisterUshort(
-  IN PUSHORT  Register,
-  IN USHORT  Value);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortZeroDeviceMemory(
-  IN PVOID  Destination,
-  IN ULONG  Length);
-
-VPAPI
-VOID
-DDKAPI
-VideoPortZeroMemory(
-  IN PVOID  Destination,
-  IN ULONG  Length);
-
-#if DBG
-#define VideoDebugPrint(x) VideoPortDebugPrint x
-#else
-#define VideoDebugPrint(x)
-#endif
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* defined __WINDDI_H */
-
-#endif /* __VIDEO_H */
diff --git a/winsup/w32api/include/ddk/videoagp.h b/winsup/w32api/include/ddk/videoagp.h
deleted file mode 100644
index 89886f809..000000000
--- a/winsup/w32api/include/ddk/videoagp.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * videoagp.h
- *
- * Video miniport AGP interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __VIDEOAGP_H
-#define __VIDEOAGP_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include "ntddk.h"
-#include "video.h"
-
-
-#define VIDEO_AGP_RATE_1X                 0x00000001
-#define VIDEO_AGP_RATE_2X                 0x00000002
-#define VIDEO_AGP_RATE_4X                 0x00000004
-#define VIDEO_AGP_RATE_8X                 0x00000008
-
-typedef enum _VIDEO_PORT_CACHE_TYPE {
-	VpNonCached = 0,
-	VpWriteCombined,
-	VpCached
-} VIDEO_PORT_CACHE_TYPE;
-
-typedef BOOLEAN DDKAPI
-(*PAGP_COMMIT_PHYSICAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  PVOID  PhysicalReserveContext,
-  IN  ULONG  Pages,
-  IN  ULONG  Offset);
-
-typedef PVOID DDKAPI
-(*PAGP_COMMIT_VIRTUAL)(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVOID  VirtualReserveContext,
-	IN  ULONG  Pages,
-	IN  ULONG  Offset);
-
-typedef VOID DDKAPI
-(*PAGP_FREE_PHYSICAL)(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVOID  PhysicalReserveContext,
-	IN  ULONG  Pages,
-	IN  ULONG  Offset);
-
-typedef VOID DDKAPI
-(*PAGP_FREE_VIRTUAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  PVOID  VirtualReserveContext,
-  IN  ULONG  Pages,
-  IN  ULONG  Offset);
-
-typedef VOID DDKAPI
-(*PAGP_RELEASE_PHYSICAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  PVOID  PhysicalReserveContext);
-
-typedef VOID DDKAPI
-(*PAGP_RELEASE_VIRTUAL)(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVOID  VirtualReserveContext);
-
-typedef PHYSICAL_ADDRESS DDKAPI
-(*PAGP_RESERVE_PHYSICAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  ULONG  Pages,
-  IN  VIDEO_PORT_CACHE_TYPE  Caching,
-  OUT PVOID  *PhysicalReserveContext);
-
-typedef PVOID DDKAPI
-(*PAGP_RESERVE_VIRTUAL)(
-  IN  PVOID  HwDeviceExtension,
-  IN  HANDLE  ProcessHandle,
-  IN  PVOID  PhysicalReserveContext,
-  OUT PVOID  *VirtualReserveContext);
-
-typedef BOOLEAN DDKAPI
-(*PAGP_SET_RATE)(
-	IN  PVOID  HwDeviceExtension,
-	IN  ULONG  AgpRate);
-
-typedef struct _VIDEO_PORT_AGP_SERVICES {
-  PAGP_RESERVE_PHYSICAL  AgpReservePhysical;
-  PAGP_RELEASE_PHYSICAL  AgpReleasePhysical;
-  PAGP_COMMIT_PHYSICAL  AgpCommitPhysical;
-  PAGP_FREE_PHYSICAL  AgpFreePhysical;
-  PAGP_RESERVE_VIRTUAL  AgpReserveVirtual;
-  PAGP_RELEASE_VIRTUAL  AgpReleaseVirtual;
-  PAGP_COMMIT_VIRTUAL  AgpCommitVirtual;
-  PAGP_FREE_VIRTUAL  AgpFreeVirtual;
-  ULONGLONG  AllocationLimit;
-} VIDEO_PORT_AGP_SERVICES, *PVIDEO_PORT_AGP_SERVICES;
-
-VPAPI
-BOOLEAN
-DDKAPI
-VideoPortGetAgpServices(
-	IN  PVOID  HwDeviceExtension,
-	IN  PVIDEO_PORT_AGP_SERVICES  AgpServices);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __VIDEOAGP_H */
diff --git a/winsup/w32api/include/ddk/win2k.h b/winsup/w32api/include/ddk/win2k.h
deleted file mode 100644
index deba29b9e..000000000
--- a/winsup/w32api/include/ddk/win2k.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * win2k.h
- *
- * Definitions only used in Windows 2000 and earlier versions
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __WIN2K_H
-#define __WIN2K_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ntddk.h"
-
-#pragma pack(push,4)
-
-typedef enum _BUS_DATA_TYPE {
-  ConfigurationSpaceUndefined = -1,
-  Cmos,
-  EisaConfiguration,
-  Pos,
-  CbusConfiguration,
-  PCIConfiguration,
-  VMEConfiguration,
-  NuBusConfiguration,
-  PCMCIAConfiguration,
-  MPIConfiguration,
-  MPSAConfiguration,
-  PNPISAConfiguration,
-  SgiInternalConfiguration,
-  MaximumBusDataType
-} BUS_DATA_TYPE, *PBUS_DATA_TYPE;
-
-NTOSAPI
-VOID
-DDKAPI
-ExReleaseResourceForThreadLite(
-  IN PERESOURCE  Resource,
-  IN ERESOURCE_THREAD  ResourceThreadId);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoReadPartitionTable(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  SectorSize,
-  IN BOOLEAN  ReturnRecognizedPartitions,
-  OUT struct _DRIVE_LAYOUT_INFORMATION  **PartitionBuffer);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoSetPartitionInformation(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  SectorSize,
-  IN ULONG  PartitionNumber,
-  IN ULONG  PartitionType);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWritePartitionTable(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  SectorSize,
-  IN ULONG  SectorsPerTrack,
-  IN ULONG  NumberOfHeads,
-  IN struct _DRIVE_LAYOUT_INFORMATION  *PartitionBuffer);
-
-/*
- * PVOID MmGetSystemAddressForMdl(
- *   IN PMDL  Mdl); 
- */
-#define MmGetSystemAddressForMdl(Mdl) \
-  (((Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA | \
-    MDL_SOURCE_IS_NONPAGED_POOL)) ? \
-      ((Mdl)->MappedSystemVa) : \
-      (MmMapLockedPages((Mdl), KernelMode)))
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __WIN2K_H */
diff --git a/winsup/w32api/include/ddk/winddi.h b/winsup/w32api/include/ddk/winddi.h
deleted file mode 100644
index 5659e6f89..000000000
--- a/winsup/w32api/include/ddk/winddi.h
+++ /dev/null
@@ -1,4146 +0,0 @@
-/*
- * winddi.h
- *
- * GDI device driver interface
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __WINDDI_H
-#define __WINDDI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __VIDEO_H
-#error video.h cannot be included with winddi.h
-#else
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ntddk.h"
-#include <wingdi.h>
-
-#if 1
-/* FIXME: Some DirectDraw structures not added yet */
-typedef ULONG_PTR FLATPTR;
-typedef PVOID LPVIDMEM;
-typedef PVOID LPVMEMHEAP;
-typedef PVOID PGLYPHOS;
-typedef struct _DD_SURFACECALLBACKS {
-} DD_SURFACECALLBACKS, *PDD_SURFACECALLBACKS;
-typedef struct _DD_PALETTECALLBACKS {
-} DD_PALETTECALLBACKS, *PDD_PALETTECALLBACKS;
-typedef struct _DD_CALLBACKS {
-} DD_CALLBACKS, *PDD_CALLBACKS;
-typedef struct _DD_HALINFO {
-} DD_HALINFO, *PDD_HALINFO;
-typedef struct _DDSCAPS {
-} DDSCAPS, *PDDSCAPS;
-typedef struct _DDSCAPSEX {
-} DDSCAPSEX, *PDDSCAPSEX;
-typedef struct _VIDEOMEMORY {
-} VIDEOMEMORY, *LPVIDEOMEMORY;
-typedef struct _DD_DIRECTDRAW_GLOBAL {
-} DD_DIRECTDRAW_GLOBAL, *LPDD_DIRECTDRAW_GLOBAL;
-typedef struct _DD_SURFACE_LOCAL {
-} DD_SURFACE_LOCAL, *PDD_SURFACE_LOCAL, *LPDD_SURFACE_LOCAL;
-#endif
-
-#if defined(_WIN32K_)
-#define WIN32KAPI DECL_EXPORT
-#else
-#define WIN32KAPI DECL_IMPORT
-#endif
-
-#define DDI_DRIVER_VERSION_NT4            0x00020000
-#define DDI_DRIVER_VERSION_SP3            0x00020003
-#define DDI_DRIVER_VERSION_NT5            0x00030000
-#define DDI_DRIVER_VERSION_NT5_01         0x00030100
-
-#define GDI_DRIVER_VERSION                0x4000
-
-#ifdef _X86_
-
-typedef DWORD FLOATL;
-
-#else /* !_X86_ */
-
-typedef FLOAT FLOATL;
-
-#endif
-
-typedef SHORT FWORD;
-typedef LONG LDECI4;
-typedef ULONG IDENT;
-
-typedef ULONG_PTR HFF;
-typedef ULONG_PTR HFC;
-
-typedef LONG PTRDIFF;
-typedef PTRDIFF *PPTRDIFF;
-typedef LONG FIX;
-typedef FIX *PFIX;
-typedef ULONG ROP4;
-typedef ULONG MIX;
-typedef ULONG HGLYPH;
-typedef HGLYPH *PHGLYPH;
-
-typedef LONG_PTR (DDKAPI *PFN)();
-
-DECLARE_HANDLE(HBM);
-DECLARE_HANDLE(HDEV);
-DECLARE_HANDLE(HSURF);
-DECLARE_HANDLE(DHSURF);
-DECLARE_HANDLE(DHPDEV);
-DECLARE_HANDLE(HDRVOBJ);
-
-
-#define GDI_DRIVER_VERSION                0x4000
-
-typedef struct _ENG_EVENT *PEVENT;
-
-#define OPENGL_CMD                        4352
-#define OPENGL_GETINFO                    4353
-#define WNDOBJ_SETUP                      4354
-
-#define FD_ERROR                          0xFFFFFFFF
-#define DDI_ERROR                         0xFFFFFFFF
-
-#define HFF_INVALID                       ((HFF) 0)
-#define HFC_INVALID                       ((HFC) 0)
-#define HGLYPH_INVALID                    ((HGLYPH) -1)
-
-#define FP_ALTERNATEMODE                  1
-#define FP_WINDINGMODE                    2
-
-#define DN_ACCELERATION_LEVEL             1
-#define DN_DEVICE_ORIGIN                  2
-#define DN_SLEEP_MODE                     3
-#define DN_DRAWING_BEGIN                  4
-
-#define DCR_SOLID                         0
-#define DCR_DRIVER                        1
-#define DCR_HALFTONE                      2
-
-#define GX_IDENTITY                       0
-#define GX_OFFSET                         1
-#define GX_SCALE                          2
-#define GX_GENERAL                        3
-
-typedef struct _POINTE {
-	FLOATL  x;
-	FLOATL  y;
-} POINTE, *PPOINTE;
-
-typedef union _FLOAT_LONG {
-  FLOATL  e;
-  LONG  l;
-} FLOAT_LONG, *PFLOAT_LONG;
-
-typedef struct _POINTFIX {
-  FIX  x;
-  FIX  y;
-} POINTFIX, *PPOINTFIX;
-
-typedef struct _RECTFX {
-  FIX  xLeft;
-  FIX  yTop;
-  FIX  xRight;
-  FIX  yBottom;
-} RECTFX, *PRECTFX;
-
-typedef struct _POINTQF {
-  LARGE_INTEGER  x;
-  LARGE_INTEGER  y;
-} POINTQF, *PPOINTQF;
-
-
-typedef struct _BLENDOBJ {
-  BLENDFUNCTION  BlendFunction;
-} BLENDOBJ,*PBLENDOBJ;
-
-/* BRUSHOBJ.flColorType */
-#define BR_DEVICE_ICM    0x01
-#define BR_HOST_ICM      0x02
-#define BR_CMYKCOLOR     0x04
-#define BR_ORIGCOLOR     0x08
-
-typedef struct _BRUSHOBJ {
-  ULONG  iSolidColor;
-  PVOID  pvRbrush;
-  FLONG  flColorType;
-} BRUSHOBJ;
-
-typedef struct _CIECHROMA {
-  LDECI4  x;
-  LDECI4  y;
-  LDECI4  Y;
-} CIECHROMA;
-
-typedef struct _RUN {
-  LONG  iStart;
-  LONG  iStop;
-} RUN, *PRUN;
-
-typedef struct _CLIPLINE {
-  POINTFIX  ptfxA;
-  POINTFIX  ptfxB;
-  LONG  lStyleState;
-  ULONG  c;
-  RUN  arun[1];
-} CLIPLINE, *PCLIPLINE;
-
-/* CLIPOBJ.iDComplexity constants */
-#define DC_TRIVIAL                        0
-#define DC_RECT                           1
-#define DC_COMPLEX                        3
-
-/* CLIPOBJ.iFComplexity constants */
-#define FC_RECT                           1
-#define FC_RECT4                          2
-#define FC_COMPLEX                        3
-
-/* CLIPOBJ.iMode constants */
-#define TC_RECTANGLES                     0
-#define TC_PATHOBJ                        2
-
-/* CLIPOBJ.fjOptions constants */
-#define OC_BANK_CLIP                      1
-
-typedef struct _CLIPOBJ {
-  ULONG  iUniq;
-  RECTL  rclBounds;
-  BYTE  iDComplexity;
-  BYTE  iFComplexity;
-  BYTE  iMode;
-  BYTE  fjOptions;
-} CLIPOBJ;
-
-typedef struct _COLORINFO {
-  CIECHROMA  Red;
-  CIECHROMA  Green;
-  CIECHROMA  Blue;
-  CIECHROMA  Cyan;
-  CIECHROMA  Magenta;
-  CIECHROMA  Yellow;
-  CIECHROMA  AlignmentWhite;
-  LDECI4  RedGamma;
-  LDECI4  GreenGamma;
-  LDECI4  BlueGamma;
-  LDECI4  MagentaInCyanDye;
-  LDECI4  YellowInCyanDye;
-  LDECI4  CyanInMagentaDye;
-  LDECI4  YellowInMagentaDye;
-  LDECI4  CyanInYellowDye;
-  LDECI4  MagentaInYellowDye;
-} COLORINFO, *PCOLORINFO;
-
-/* DEVHTADJDATA.DeviceFlags constants */
-#define DEVHTADJF_COLOR_DEVICE            0x00000001
-#define DEVHTADJF_ADDITIVE_DEVICE         0x00000002
-
-typedef struct _DEVHTINFO {
-  DWORD  HTFlags;
-  DWORD  HTPatternSize;
-  DWORD  DevPelsDPI;
-  COLORINFO  ColorInfo;
-} DEVHTINFO, *PDEVHTINFO;
-
-typedef struct _DEVHTADJDATA {
-  DWORD   DeviceFlags;
-  DWORD   DeviceXDPI;
-  DWORD   DeviceYDPI;
-  PDEVHTINFO  pDefHTInfo;
-  PDEVHTINFO  pAdjHTInfo;
-} DEVHTADJDATA, *PDEVHTADJDATA;
-
-/* DEVINFO.flGraphicsCaps flags */
-#define GCAPS_BEZIERS           0x00000001
-#define GCAPS_GEOMETRICWIDE     0x00000002
-#define GCAPS_ALTERNATEFILL     0x00000004
-#define GCAPS_WINDINGFILL       0x00000008
-#define GCAPS_HALFTONE          0x00000010
-#define GCAPS_COLOR_DITHER      0x00000020
-#define GCAPS_HORIZSTRIKE       0x00000040
-#define GCAPS_VERTSTRIKE        0x00000080
-#define GCAPS_OPAQUERECT        0x00000100
-#define GCAPS_VECTORFONT        0x00000200
-#define GCAPS_MONO_DITHER       0x00000400
-#define GCAPS_ASYNCCHANGE       0x00000800
-#define GCAPS_ASYNCMOVE         0x00001000
-#define GCAPS_DONTJOURNAL       0x00002000
-#define GCAPS_DIRECTDRAW        0x00004000
-#define GCAPS_ARBRUSHOPAQUE     0x00008000
-#define GCAPS_PANNING           0x00010000
-#define GCAPS_HIGHRESTEXT       0x00040000
-#define GCAPS_PALMANAGED        0x00080000
-#define GCAPS_DITHERONREALIZE   0x00200000
-#define GCAPS_NO64BITMEMACCESS  0x00400000
-#define GCAPS_FORCEDITHER       0x00800000
-#define GCAPS_GRAY16            0x01000000
-#define GCAPS_ICM               0x02000000
-#define GCAPS_CMYKCOLOR         0x04000000
-#define GCAPS_LAYERED           0x08000000
-#define GCAPS_ARBRUSHTEXT       0x10000000
-#define GCAPS_SCREENPRECISION   0x20000000
-#define GCAPS_FONT_RASTERIZER   0x40000000
-#define GCAPS_NUP               0x80000000
-
-/* DEVINFO.iDitherFormat constants */
-#define BMF_1BPP       1L
-#define BMF_4BPP       2L
-#define BMF_8BPP       3L
-#define BMF_16BPP      4L
-#define BMF_24BPP      5L
-#define BMF_32BPP      6L
-#define BMF_4RLE       7L
-#define BMF_8RLE       8L
-#define BMF_JPEG       9L
-#define BMF_PNG       10L
-
-/* DEVINFO.flGraphicsCaps2 flags */
-#define GCAPS2_JPEGSRC          0x00000001
-#define GCAPS2_xxxx             0x00000002
-#define GCAPS2_PNGSRC           0x00000008
-#define GCAPS2_CHANGEGAMMARAMP  0x00000010
-#define GCAPS2_ALPHACURSOR      0x00000020
-#define GCAPS2_SYNCFLUSH        0x00000040
-#define GCAPS2_SYNCTIMER        0x00000080
-#define GCAPS2_ICD_MULTIMON     0x00000100
-#define GCAPS2_MOUSETRAILS      0x00000200
-#define GCAPS2_RESERVED1        0x00000400
-
-typedef struct _DEVINFO {
-  FLONG  flGraphicsCaps;
-  LOGFONTW  lfDefaultFont;
-  LOGFONTW  lfAnsiVarFont;
-  LOGFONTW  lfAnsiFixFont;
-  ULONG  cFonts;
-  ULONG  iDitherFormat;
-  USHORT  cxDither;
-  USHORT  cyDither;
-  HPALETTE  hpalDefault;
-  FLONG  flGraphicsCaps2;
-} DEVINFO, *PDEVINFO;
-
-typedef struct _DRIVEROBJ *PDRIVEROBJ;
-
-typedef BOOL DDKAPI CALLBACK
-(*FREEOBJPROC)(
-  IN PDRIVEROBJ  pDriverObj);
-
-typedef struct _DRIVEROBJ {
-  PVOID  pvObj;
-  FREEOBJPROC  pFreeProc;
-  HDEV  hdev;
-  DHPDEV  dhpdev;
-} DRIVEROBJ;
-
-/* DRVFN.iFunc constants */
-#define INDEX_DrvEnablePDEV               0L
-#define INDEX_DrvCompletePDEV             1L
-#define INDEX_DrvDisablePDEV              2L
-#define INDEX_DrvEnableSurface            3L
-#define INDEX_DrvDisableSurface           4L
-#define INDEX_DrvAssertMode               5L
-#define INDEX_DrvOffset                   6L
-#define INDEX_DrvResetPDEV                7L
-#define INDEX_DrvDisableDriver            8L
-#define INDEX_DrvCreateDeviceBitmap       10L
-#define INDEX_DrvDeleteDeviceBitmap       11L
-#define INDEX_DrvRealizeBrush             12L
-#define INDEX_DrvDitherColor              13L
-#define INDEX_DrvStrokePath               14L
-#define INDEX_DrvFillPath                 15L
-#define INDEX_DrvStrokeAndFillPath        16L
-#define INDEX_DrvPaint                    17L
-#define INDEX_DrvBitBlt                   18L
-#define INDEX_DrvCopyBits                 19L
-#define INDEX_DrvStretchBlt               20L
-#define INDEX_DrvSetPalette               22L
-#define INDEX_DrvTextOut                  23L
-#define INDEX_DrvEscape                   24L
-#define INDEX_DrvDrawEscape               25L
-#define INDEX_DrvQueryFont                26L
-#define INDEX_DrvQueryFontTree            27L
-#define INDEX_DrvQueryFontData            28L
-#define INDEX_DrvSetPointerShape          29L
-#define INDEX_DrvMovePointer              30L
-#define INDEX_DrvLineTo                   31L
-#define INDEX_DrvSendPage                 32L
-#define INDEX_DrvStartPage                33L
-#define INDEX_DrvEndDoc                   34L
-#define INDEX_DrvStartDoc                 35L
-#define INDEX_DrvGetGlyphMode             37L
-#define INDEX_DrvSynchronize              38L
-#define INDEX_DrvSaveScreenBits           40L
-#define INDEX_DrvGetModes                 41L
-#define INDEX_DrvFree                     42L
-#define INDEX_DrvDestroyFont              43L
-#define INDEX_DrvQueryFontCaps            44L
-#define INDEX_DrvLoadFontFile             45L
-#define INDEX_DrvUnloadFontFile           46L
-#define INDEX_DrvFontManagement           47L
-#define INDEX_DrvQueryTrueTypeTable       48L
-#define INDEX_DrvQueryTrueTypeOutline     49L
-#define INDEX_DrvGetTrueTypeFile          50L
-#define INDEX_DrvQueryFontFile            51L
-#define INDEX_DrvMovePanning              52L
-#define INDEX_DrvQueryAdvanceWidths       53L
-#define INDEX_DrvSetPixelFormat           54L
-#define INDEX_DrvDescribePixelFormat      55L
-#define INDEX_DrvSwapBuffers              56L
-#define INDEX_DrvStartBanding             57L
-#define INDEX_DrvNextBand                 58L
-#define INDEX_DrvGetDirectDrawInfo        59L
-#define INDEX_DrvEnableDirectDraw         60L
-#define INDEX_DrvDisableDirectDraw        61L
-#define INDEX_DrvQuerySpoolType           62L
-#define INDEX_DrvIcmCreateColorTransform  64L
-#define INDEX_DrvIcmDeleteColorTransform  65L
-#define INDEX_DrvIcmCheckBitmapBits       66L
-#define INDEX_DrvIcmSetDeviceGammaRamp    67L
-#define INDEX_DrvGradientFill             68L
-#define INDEX_DrvStretchBltROP            69L
-#define INDEX_DrvPlgBlt                   70L
-#define INDEX_DrvAlphaBlend               71L
-#define INDEX_DrvSynthesizeFont           72L
-#define INDEX_DrvGetSynthesizedFontFiles  73L
-#define INDEX_DrvTransparentBlt           74L
-#define INDEX_DrvQueryPerBandInfo         75L
-#define INDEX_DrvQueryDeviceSupport       76L
-#define INDEX_DrvReserved1                77L
-#define INDEX_DrvReserved2                78L
-#define INDEX_DrvReserved3                79L
-#define INDEX_DrvReserved4                80L
-#define INDEX_DrvReserved5                81L
-#define INDEX_DrvReserved6                82L
-#define INDEX_DrvReserved7                83L
-#define INDEX_DrvReserved8                84L
-#define INDEX_DrvDeriveSurface            85L
-#define INDEX_DrvQueryGlyphAttrs          86L
-#define INDEX_DrvNotify                   87L
-#define INDEX_DrvSynchronizeSurface       88L
-#define INDEX_DrvResetDevice              89L
-#define INDEX_DrvReserved9                90L
-#define INDEX_DrvReserved10               91L
-#define INDEX_DrvReserved11               92L
-#define INDEX_LAST                        93L
-
-typedef struct _DRVFN {
-  ULONG  iFunc;
-  PFN  pfn;
-} DRVFN, *PDRVFN;
-
-/* DRVENABLEDATA.iDriverVersion constants */
-#define DDI_DRIVER_VERSION_NT4            0x00020000
-#define DDI_DRIVER_VERSION_SP3            0x00020003
-#define DDI_DRIVER_VERSION_NT5            0x00030000
-#define DDI_DRIVER_VERSION_NT5_01         0x00030100
-
-typedef struct _DRVENABLEDATA {
-  ULONG  iDriverVersion;
-  ULONG  c;
-  DRVFN  *pdrvfn;
-} DRVENABLEDATA, *PDRVENABLEDATA;
-
-DECLARE_HANDLE(HSEMAPHORE);
-
-typedef struct _ENGSAFESEMAPHORE {
-  HSEMAPHORE  hsem;
-  LONG  lCount;
-} ENGSAFESEMAPHORE;
-
-typedef struct _ENG_TIME_FIELDS {
-  USHORT  usYear;
-  USHORT  usMonth;
-  USHORT  usDay;
-  USHORT  usHour;
-  USHORT  usMinute;
-  USHORT  usSecond;
-  USHORT  usMilliseconds;
-  USHORT  usWeekday;
-} ENG_TIME_FIELDS, *PENG_TIME_FIELDS;
-
-typedef struct _ENUMRECTS {
-  ULONG  c;
-  RECTL  arcl[1];
-} ENUMRECTS;
-
-typedef struct _FD_XFORM {
-  FLOATL  eXX;
-  FLOATL  eXY;
-  FLOATL  eYX;
-  FLOATL  eYY;
-} FD_XFORM, *PFD_XFORM;
-
-/* FD_DEVICEMETRICS.flRealizedType constants */
-#define FDM_TYPE_BM_SIDE_CONST            0x00000001
-#define FDM_TYPE_MAXEXT_EQUAL_BM_SIDE     0x00000002
-#define FDM_TYPE_CHAR_INC_EQUAL_BM_BASE   0x00000004
-#define FDM_TYPE_ZERO_BEARINGS            0x00000008
-#define FDM_TYPE_CONST_BEARINGS           0x00000010
-
-typedef struct _FD_DEVICEMETRICS {
-  FLONG  flRealizedType;
-  POINTE  pteBase;
-  POINTE  pteSide;
-  LONG  lD;
-  FIX  fxMaxAscender;
-  FIX  fxMaxDescender;
-  POINTL  ptlUnderline1;
-  POINTL  ptlStrikeout;
-  POINTL  ptlULThickness;
-  POINTL  ptlSOThickness;
-  ULONG  cxMax;
-  ULONG  cyMax;
-  ULONG  cjGlyphMax;
-  FD_XFORM  fdxQuantized;
-  LONG  lNonLinearExtLeading;
-  LONG  lNonLinearIntLeading;
-  LONG  lNonLinearMaxCharWidth;
-  LONG  lNonLinearAvgCharWidth;
-  LONG  lMinA;
-  LONG  lMinC;
-  LONG  lMinD;
-  LONG  alReserved[1];
-} FD_DEVICEMETRICS, *PFD_DEVICEMETRICS;
-
-/* FD_GLYPHATTR.iMode constants */
-#define FO_ATTR_MODE_ROTATE               1
-
-typedef struct _FD_GLYPHATTR {
-  ULONG  cjThis;
-  ULONG  cGlyphs;
-  ULONG  iMode;
-  BYTE  aGlyphAttr[1];
-} FD_GLYPHATTR, *PFD_GLYPHATTR;
-
-/* FD_GLYPHSET.flAccel */
-#define GS_UNICODE_HANDLES                0x00000001
-#define GS_8BIT_HANDLES                   0x00000002
-#define GS_16BIT_HANDLES                  0x00000004
-
-typedef struct _WCRUN {
-  WCHAR  wcLow;
-  USHORT  cGlyphs;
-  HGLYPH  *phg;
-} WCRUN, *PWCRUN;
-
-typedef struct _FD_GLYPHSET {
-  ULONG  cjThis;
-  FLONG  flAccel;
-  ULONG  cGlyphsSupported;
-  ULONG  cRuns;
-  WCRUN  awcrun[1];
-} FD_GLYPHSET, *PFD_GLYPHSET;
-
-typedef struct _FD_KERNINGPAIR {
-  WCHAR  wcFirst;
-  WCHAR  wcSecond;
-  FWORD  fwdKern;
-} FD_KERNINGPAIR;
-
-typedef struct _FLOATOBJ
-{
-  ULONG  ul1;
-  ULONG  ul2;
-} FLOATOBJ, *PFLOATOBJ;
-
-typedef struct _FLOATOBJ_XFORM {
-  FLOATOBJ  eM11;
-  FLOATOBJ  eM12;
-  FLOATOBJ  eM21;
-  FLOATOBJ  eM22;
-  FLOATOBJ  eDx;
-  FLOATOBJ  eDy;
-} FLOATOBJ_XFORM, *PFLOATOBJ_XFORM, FAR *LPFLOATOBJ_XFORM;
-
-/* FONTDIFF.fsSelection */
-#define FM_SEL_ITALIC                     0x0001
-#define FM_SEL_UNDERSCORE                 0x0002
-#define FM_SEL_NEGATIVE                   0x0004
-#define FM_SEL_OUTLINED                   0x0008
-#define FM_SEL_STRIKEOUT                  0x0010
-#define FM_SEL_BOLD                       0x0020
-#define FM_SEL_REGULAR                    0x0040
-
-typedef struct _FONTDIFF {
-  BYTE  jReserved1;
-  BYTE  jReserved2;
-  BYTE  jReserved3;
-  BYTE  bWeight;
-  USHORT  usWinWeight;
-  FSHORT  fsSelection;
-  FWORD  fwdAveCharWidth;
-  FWORD  fwdMaxCharInc;
-  POINTL  ptlCaret;
-} FONTDIFF;
-
-typedef struct _FONTSIM {
-  PTRDIFF  dpBold;
-  PTRDIFF  dpItalic;
-  PTRDIFF  dpBoldItalic;
-} FONTSIM;
-
-/* FONTINFO.flCaps constants */
-#define FO_DEVICE_FONT                    1L
-#define FO_OUTLINE_CAPABLE                2L
-
-typedef struct _FONTINFO {
-  ULONG  cjThis;
-  FLONG  flCaps;
-  ULONG  cGlyphsSupported;
-  ULONG  cjMaxGlyph1;
-  ULONG  cjMaxGlyph4;
-  ULONG  cjMaxGlyph8;
-  ULONG  cjMaxGlyph32;
-} FONTINFO, *PFONTINFO;
-
-/* FONTOBJ.flFontType constants */
-#define FO_TYPE_RASTER   RASTER_FONTTYPE
-#define FO_TYPE_DEVICE   DEVICE_FONTTYPE
-#define FO_TYPE_TRUETYPE TRUETYPE_FONTTYPE
-#define FO_TYPE_OPENTYPE OPENTYPE_FONTTYPE
-
-#define FO_SIM_BOLD      0x00002000
-#define FO_SIM_ITALIC    0x00004000
-#define FO_EM_HEIGHT     0x00008000
-#define FO_GRAY16        0x00010000
-#define FO_NOGRAY16      0x00020000
-#define FO_NOHINTS       0x00040000
-#define FO_NO_CHOICE     0x00080000
-#define FO_CFF            0x00100000
-#define FO_POSTSCRIPT     0x00200000
-#define FO_MULTIPLEMASTER 0x00400000
-#define FO_VERT_FACE      0x00800000
-#define FO_DBCS_FONT      0X01000000
-#define FO_NOCLEARTYPE    0x02000000
-#define FO_CLEARTYPE_X    0x10000000
-#define FO_CLEARTYPE_Y    0x20000000
-
-typedef struct _FONTOBJ {
-  ULONG  iUniq;
-  ULONG  iFace;
-  ULONG  cxMax;
-  FLONG  flFontType;
-  ULONG_PTR  iTTUniq;
-  ULONG_PTR  iFile;
-  SIZE  sizLogResPpi;
-  ULONG  ulStyleSize;
-  PVOID  pvConsumer;
-  PVOID  pvProducer;
-} FONTOBJ;
-
-typedef struct _GAMMARAMP {
-  WORD  Red[256];
-  WORD  Green[256];
-  WORD  Blue[256];
-} GAMMARAMP, *PGAMMARAMP;
-
-/* GDIINFO.ulPrimaryOrder constants */
-#define PRIMARY_ORDER_ABC                 0
-#define PRIMARY_ORDER_ACB                 1
-#define PRIMARY_ORDER_BAC                 2
-#define PRIMARY_ORDER_BCA                 3
-#define PRIMARY_ORDER_CBA                 4
-#define PRIMARY_ORDER_CAB                 5
-
-/* GDIINFO.ulHTPatternSize constants */
-#define HT_PATSIZE_2x2                    0
-#define HT_PATSIZE_2x2_M                  1
-#define HT_PATSIZE_4x4                    2
-#define HT_PATSIZE_4x4_M                  3
-#define HT_PATSIZE_6x6                    4
-#define HT_PATSIZE_6x6_M                  5
-#define HT_PATSIZE_8x8                    6
-#define HT_PATSIZE_8x8_M                  7
-#define HT_PATSIZE_10x10                  8
-#define HT_PATSIZE_10x10_M                9
-#define HT_PATSIZE_12x12                  10
-#define HT_PATSIZE_12x12_M                11
-#define HT_PATSIZE_14x14                  12
-#define HT_PATSIZE_14x14_M                13
-#define HT_PATSIZE_16x16                  14
-#define HT_PATSIZE_16x16_M                15
-#define HT_PATSIZE_SUPERCELL              16
-#define HT_PATSIZE_SUPERCELL_M            17
-#define HT_PATSIZE_USER                   18
-#define HT_PATSIZE_MAX_INDEX              HT_PATSIZE_USER
-#define HT_PATSIZE_DEFAULT                HT_PATSIZE_SUPERCELL_M
-#define HT_USERPAT_CX_MIN                 4
-#define HT_USERPAT_CX_MAX                 256
-#define HT_USERPAT_CY_MIN                 4
-#define HT_USERPAT_CY_MAX                 256
-
-/* GDIINFO.ulHTOutputFormat constants */
-#define HT_FORMAT_1BPP                    0
-#define HT_FORMAT_4BPP                    2
-#define HT_FORMAT_4BPP_IRGB               3
-#define HT_FORMAT_8BPP                    4
-#define HT_FORMAT_16BPP                   5
-#define HT_FORMAT_24BPP                   6
-#define HT_FORMAT_32BPP                   7
-
-/* GDIINFO.flHTFlags */
-#define HT_FLAG_SQUARE_DEVICE_PEL         0x00000001
-#define HT_FLAG_HAS_BLACK_DYE             0x00000002
-#define HT_FLAG_ADDITIVE_PRIMS            0x00000004
-#define HT_FLAG_USE_8BPP_BITMASK          0x00000008
-#define HT_FLAG_INK_HIGH_ABSORPTION       0x00000010
-#define HT_FLAG_INK_ABSORPTION_INDICES    0x00000060
-#define HT_FLAG_DO_DEVCLR_XFORM           0x00000080
-#define HT_FLAG_OUTPUT_CMY                0x00000100
-#define HT_FLAG_PRINT_DRAFT_MODE          0x00000200
-#define HT_FLAG_INVERT_8BPP_BITMASK_IDX   0x00000400
-#define HT_FLAG_8BPP_CMY332_MASK          0xFF000000
-
-#define MAKE_CMYMASK_BYTE(c,m,y)          ((BYTE)(((BYTE)(c) & 0x07) << 5) \
-                                          |(BYTE)(((BYTE)(m) & 0x07) << 2) \
-                                          |(BYTE)((BYTE)(y) & 0x03))
-
-#define MAKE_CMY332_MASK(c,m,y)           ((DWORD)(((DWORD)(c) & 0x07) << 29)\
-                                          |(DWORD)(((DWORD)(m) & 0x07) << 26)\
-                                          |(DWORD)(((DWORD)(y) & 0x03) << 24))
-
-/* GDIINFO.flHTFlags constants */
-#define HT_FLAG_INK_ABSORPTION_IDX0       0x00000000
-#define HT_FLAG_INK_ABSORPTION_IDX1       0x00000020
-#define HT_FLAG_INK_ABSORPTION_IDX2       0x00000040
-#define HT_FLAG_INK_ABSORPTION_IDX3       0x00000060
-
-#define HT_FLAG_HIGHEST_INK_ABSORPTION    (HT_FLAG_INK_HIGH_ABSORPTION \
-                                          |HT_FLAG_INK_ABSORPTION_IDX3)
-#define HT_FLAG_HIGHER_INK_ABSORPTION     (HT_FLAG_INK_HIGH_ABSORPTION \
-                                          |HT_FLAG_INK_ABSORPTION_IDX2)
-#define HT_FLAG_HIGH_INK_ABSORPTION       (HT_FLAG_INK_HIGH_ABSORPTION \
-                                          |HT_FLAG_INK_ABSORPTION_IDX1)
-#define HT_FLAG_NORMAL_INK_ABSORPTION     HT_FLAG_INK_ABSORPTION_IDX0
-#define HT_FLAG_LOW_INK_ABSORPTION        HT_FLAG_INK_ABSORPTION_IDX1
-#define HT_FLAG_LOWER_INK_ABSORPTION      HT_FLAG_INK_ABSORPTION_IDX2
-#define HT_FLAG_LOWEST_INK_ABSORPTION     HT_FLAG_INK_ABSORPTION_IDX3
-
-#define HT_BITMASKPALRGB                  (DWORD)'0BGR'
-#define HT_SET_BITMASKPAL2RGB(pPal)       (*((LPDWORD)(pPal)) = HT_BITMASKPALRGB)
-#define HT_IS_BITMASKPALRGB(pPal)         (*((LPDWORD)(pPal)) == (DWORD)0)
-
-/* GDIINFO.ulPhysicalPixelCharacteristics constants */
-#define PPC_DEFAULT                       0x0
-#define PPC_UNDEFINED                     0x1
-#define PPC_RGB_ORDER_VERTICAL_STRIPES    0x2
-#define PPC_BGR_ORDER_VERTICAL_STRIPES    0x3
-#define PPC_RGB_ORDER_HORIZONTAL_STRIPES  0x4
-#define PPC_BGR_ORDER_HORIZONTAL_STRIPES  0x5
-
-#define PPG_DEFAULT                       0
-#define PPG_SRGB                          1
-
-typedef struct _GDIINFO {
-  ULONG  ulVersion;
-  ULONG  ulTechnology;
-  ULONG  ulHorzSize;
-  ULONG  ulVertSize;
-  ULONG  ulHorzRes;
-  ULONG  ulVertRes;
-  ULONG  cBitsPixel;
-  ULONG  cPlanes;
-  ULONG  ulNumColors;
-  ULONG  flRaster;
-  ULONG  ulLogPixelsX;
-  ULONG  ulLogPixelsY;
-  ULONG  flTextCaps;
-  ULONG  ulDACRed;
-  ULONG  ulDACGreen;
-  ULONG  ulDACBlue;
-  ULONG  ulAspectX;
-  ULONG  ulAspectY;
-  ULONG  ulAspectXY;
-  LONG  xStyleStep;
-  LONG  yStyleStep;
-  LONG  denStyleStep;
-  POINTL  ptlPhysOffset;
-  SIZEL  szlPhysSize;
-  ULONG  ulNumPalReg;
-  COLORINFO  ciDevice;
-  ULONG  ulDevicePelsDPI;
-  ULONG  ulPrimaryOrder;
-  ULONG  ulHTPatternSize;
-  ULONG  ulHTOutputFormat;
-  ULONG  flHTFlags;
-  ULONG  ulVRefresh;
-  ULONG  ulBltAlignment;
-  ULONG  ulPanningHorzRes;
-  ULONG  ulPanningVertRes;
-  ULONG  xPanningAlignment;
-  ULONG  yPanningAlignment;
-  ULONG  cxHTPat;
-  ULONG  cyHTPat;
-  LPBYTE  pHTPatA;
-  LPBYTE  pHTPatB;
-  LPBYTE  pHTPatC;
-  ULONG  flShadeBlend;
-  ULONG  ulPhysicalPixelCharacteristics;
-  ULONG  ulPhysicalPixelGamma;
-} GDIINFO, *PGDIINFO;
-
-/* PATHDATA.flags constants */
-#define PD_BEGINSUBPATH                   0x00000001
-#define PD_ENDSUBPATH                     0x00000002
-#define PD_RESETSTYLE                     0x00000004
-#define PD_CLOSEFIGURE                    0x00000008
-#define PD_BEZIERS                        0x00000010
-#define PD_ALL                            (PD_BEGINSUBPATH \
-                                          |PD_ENDSUBPATH \
-                                          |PD_RESETSTYLE \
-                                          |PD_CLOSEFIGURE \
-                                          PD_BEZIERS)
-
-typedef struct _PATHDATA {
-  FLONG  flags;
-  ULONG  count;
-  POINTFIX  pptfx;
-} PATHDATA, *PPATHDATA;
-
-/* PATHOBJ.fl constants */
-#define PO_BEZIERS                        0x00000001
-#define PO_ELLIPSE                        0x00000002
-#define PO_ALL_INTEGERS                   0x00000004
-#define PO_ENUM_AS_INTEGERS               0x00000008
-
-typedef struct _PATHOBJ {
-  FLONG  fl;
-  ULONG  cCurves;
-} PATHOBJ;
-
-typedef struct _GLYPHBITS {
-  POINTL  ptlOrigin;
-  SIZEL  sizlBitmap;
-  BYTE  aj[1];
-} GLYPHBITS;
-
-typedef union _GLYPHDEF {
-  GLYPHBITS  *pgb;
-  PATHOBJ  *ppo;
-} GLYPHDEF;
-
-typedef struct _GLYPHPOS {
-  HGLYPH  hg;
-  GLYPHDEF  *pgdf;
-  POINTL  *ptl;
-} GLYPHPOS, *PGLYPHPOS;
-
-typedef struct _GLYPHDATA {
-  GLYPHDEF  gdf;
-  HGLYPH  hg;
-  FIX  fxD;
-  FIX  fxA;
-  FIX  fxAB;
-  FIX  fxInkTop;
-  FIX  fxInkBottom;
-  RECTL  rclInk;
-  POINTQF  ptqD;
-} GLYPHDATA;
-
-typedef struct _IFIEXTRA {
-  ULONG  ulIdentifier;
-  PTRDIFF  dpFontSig;
-  ULONG  cig;
-  PTRDIFF  dpDesignVector;
-  PTRDIFF  dpAxesInfoW;
-  ULONG  aulReserved[1];
-} IFIEXTRA, *PIFIEXTRA;
-
-/* IFIMETRICS constants */
-
-#define FM_VERSION_NUMBER                 0x0
-
-/* IFIMETRICS.fsType constants */
-#define FM_TYPE_LICENSED                  0x2
-#define FM_READONLY_EMBED                 0x4
-#define FM_EDITABLE_EMBED                 0x8
-#define FM_NO_EMBEDDING                   FM_TYPE_LICENSED
-
-/* IFIMETRICS.flInfo constants */
-#define FM_INFO_TECH_TRUETYPE             0x00000001
-#define FM_INFO_TECH_BITMAP               0x00000002
-#define FM_INFO_TECH_STROKE               0x00000004
-#define FM_INFO_TECH_OUTLINE_NOT_TRUETYPE 0x00000008
-#define FM_INFO_ARB_XFORMS                0x00000010
-#define FM_INFO_1BPP                      0x00000020
-#define FM_INFO_4BPP                      0x00000040
-#define FM_INFO_8BPP                      0x00000080
-#define FM_INFO_16BPP                     0x00000100
-#define FM_INFO_24BPP                     0x00000200
-#define FM_INFO_32BPP                     0x00000400
-#define FM_INFO_INTEGER_WIDTH             0x00000800
-#define FM_INFO_CONSTANT_WIDTH            0x00001000
-#define FM_INFO_NOT_CONTIGUOUS            0x00002000
-#define FM_INFO_TECH_MM                   0x00004000
-#define FM_INFO_RETURNS_OUTLINES          0x00008000
-#define FM_INFO_RETURNS_STROKES           0x00010000
-#define FM_INFO_RETURNS_BITMAPS           0x00020000
-#define FM_INFO_DSIG                      0x00040000
-#define FM_INFO_RIGHT_HANDED              0x00080000
-#define FM_INFO_INTEGRAL_SCALING          0x00100000
-#define FM_INFO_90DEGREE_ROTATIONS        0x00200000
-#define FM_INFO_OPTICALLY_FIXED_PITCH     0x00400000
-#define FM_INFO_DO_NOT_ENUMERATE          0x00800000
-#define FM_INFO_ISOTROPIC_SCALING_ONLY    0x01000000
-#define FM_INFO_ANISOTROPIC_SCALING_ONLY  0x02000000
-#define FM_INFO_TECH_CFF                  0x04000000
-#define FM_INFO_FAMILY_EQUIV              0x08000000
-#define FM_INFO_DBCS_FIXED_PITCH          0x10000000
-#define FM_INFO_NONNEGATIVE_AC            0x20000000
-#define FM_INFO_IGNORE_TC_RA_ABLE         0x40000000
-#define FM_INFO_TECH_TYPE1                0x80000000
-
-#define MAXCHARSETS                       16
-
-/* IFIMETRICS.ulPanoseCulture constants */
-#define  FM_PANOSE_CULTURE_LATIN          0x0
-
-typedef struct _IFIMETRICS {
-  ULONG  cjThis;
-  ULONG  cjIfiExtra;
-  PTRDIFF  dpwszFamilyName;
-  PTRDIFF  dpwszStyleName;
-  PTRDIFF  dpwszFaceName;
-  PTRDIFF  dpwszUniqueName;
-  PTRDIFF  dpFontSim;
-  LONG  lEmbedId;
-  LONG  lItalicAngle;
-  LONG  lCharBias;
-  PTRDIFF  dpCharSets;
-  BYTE  jWinCharSet;
-  BYTE  jWinPitchAndFamily;
-  USHORT  usWinWeight;
-  ULONG  flInfo;
-  USHORT  fsSelection;
-  USHORT  fsType;
-  FWORD  fwdUnitsPerEm;
-  FWORD  fwdLowestPPEm;
-  FWORD  fwdWinAscender;
-  FWORD  fwdWinDescender;
-  FWORD  fwdMacAscender;
-  FWORD  fwdMacDescender;
-  FWORD  fwdMacLineGap;
-  FWORD  fwdTypoAscender;
-  FWORD  fwdTypoDescender;
-  FWORD  fwdTypoLineGap;
-  FWORD  fwdAveCharWidth;
-  FWORD  fwdMaxCharInc;
-  FWORD  fwdCapHeight;
-  FWORD  fwdXHeight;
-  FWORD  fwdSubscriptXSize;
-  FWORD  fwdSubscriptYSize;
-  FWORD  fwdSubscriptXOffset;
-  FWORD  fwdSubscriptYOffset;
-  FWORD  fwdSuperscriptXSize;
-  FWORD  fwdSuperscriptYSize;
-  FWORD  fwdSuperscriptXOffset;
-  FWORD  fwdSuperscriptYOffset;
-  FWORD  fwdUnderscoreSize;
-  FWORD  fwdUnderscorePosition;
-  FWORD  fwdStrikeoutSize;
-  FWORD  fwdStrikeoutPosition;
-  BYTE  chFirstChar;
-  BYTE  chLastChar;
-  BYTE  chDefaultChar;
-  BYTE  chBreakChar;
-  WCHAR  wcFirstChar;
-  WCHAR  wcLastChar;
-  WCHAR  wcDefaultChar;
-  WCHAR  wcBreakChar;
-  POINTL  ptlBaseline;
-  POINTL  ptlAspect;
-  POINTL  ptlCaret;
-  RECTL  rclFontBox;
-  BYTE  achVendId[4];
-  ULONG  cKerningPairs;
-  ULONG  ulPanoseCulture;
-  PANOSE  panose;
-#if defined(_WIN64)
-  PVOID  Align;
-#endif
-} IFIMETRICS, *PIFIMETRICS;
-
-/* LINEATTRS.fl */
-#define LA_GEOMETRIC                      0x00000001
-#define LA_ALTERNATE                      0x00000002
-#define LA_STARTGAP                       0x00000004
-#define LA_STYLED                         0x00000008
-
-/* LINEATTRS.iJoin */
-#define JOIN_ROUND                        0L
-#define JOIN_BEVEL                        1L
-#define JOIN_MITER                        2L
-
-/* LINEATTRS.iEndCap */
-#define ENDCAP_ROUND                      0L
-#define ENDCAP_SQUARE                     1L
-#define ENDCAP_BUTT                       2L
-
-typedef struct _LINEATTRS {
-  FLONG  fl;
-  ULONG  iJoin;
-  ULONG  iEndCap;
-  FLOAT_LONG  elWidth;
-  FLOATL  eMiterLimit;
-  ULONG  cstyle;
-  PFLOAT_LONG  pstyle;
-  FLOAT_LONG  elStyleState;
-} LINEATTRS, *PLINEATTRS;
-
-typedef struct _PALOBJ {
-  ULONG  ulReserved;
-} PALOBJ;
-
-typedef struct _PERBANDINFO {
-  BOOL  bRepeatThisBand;
-  SIZEL  szlBand;
-  ULONG  ulHorzRes;
-  ULONG  ulVertRes;
-} PERBANDINFO, *PPERBANDINFO;
-
-/* STROBJ.flAccel constants */
-#define SO_FLAG_DEFAULT_PLACEMENT        0x00000001
-#define SO_HORIZONTAL                    0x00000002
-#define SO_VERTICAL                      0x00000004
-#define SO_REVERSED                      0x00000008
-#define SO_ZERO_BEARINGS                 0x00000010
-#define SO_CHAR_INC_EQUAL_BM_BASE        0x00000020
-#define SO_MAXEXT_EQUAL_BM_SIDE          0x00000040
-#define SO_DO_NOT_SUBSTITUTE_DEVICE_FONT 0x00000080
-#define SO_GLYPHINDEX_TEXTOUT            0x00000100
-#define SO_ESC_NOT_ORIENT                0x00000200
-#define SO_DXDY                          0x00000400
-#define SO_CHARACTER_EXTRA               0x00000800
-#define SO_BREAK_EXTRA                   0x00001000
-
-typedef struct _STROBJ {
-  ULONG  cGlyphs;
-  FLONG  flAccel;
-  ULONG  ulCharInc;
-  RECTL  rclBkGround;
-  GLYPHPOS  *pgp;
-  LPWSTR  pwszOrg;
-} STROBJ;
-
-typedef struct _SURFACEALIGNMENT {
-  union {
-		struct {
-			DWORD  dwStartAlignment;
-			DWORD  dwPitchAlignment;
-			DWORD  dwReserved1;
-			DWORD  dwReserved2;
-		} Linear;
-		struct {
-			DWORD  dwXAlignment;
-			DWORD  dwYAlignment;
-			DWORD  dwReserved1;
-			DWORD  dwReserved2;
-		} Rectangular;
-  };
-} SURFACEALIGNMENT, *LPSURFACEALIGNMENT;
-
-/* SURFOBJ.iType constants */
-#define STYPE_BITMAP                      0L
-#define STYPE_DEVICE                      1L
-#define STYPE_DEVBITMAP                   3L
-
-/* SURFOBJ.fjBitmap constants */
-#define BMF_TOPDOWN                       0x0001
-#define BMF_NOZEROINIT                    0x0002
-#define BMF_DONTCACHE                     0x0004
-#define BMF_USERMEM                       0x0008
-#define BMF_KMSECTION                     0x0010
-#define BMF_NOTSYSMEM                     0x0020
-#define BMF_WINDOW_BLT                    0x0040
-#define BMF_UMPDMEM                       0x0080
-#define BMF_RESERVED                      0xFF00
-
-typedef struct _SURFOBJ {
-  DHSURF  dhsurf;
-  HSURF  hsurf;
-  DHPDEV  dhpdev;
-  HDEV  hdev;
-  SIZEL  sizlBitmap;
-  ULONG  cjBits;
-  PVOID  pvBits;
-  PVOID  pvScan0;
-  LONG  lDelta;
-  ULONG  iUniq;
-  ULONG  iBitmapFormat;
-  USHORT  iType;
-  USHORT  fjBitmap;
-} SURFOBJ;
-
-typedef struct _TYPE1_FONT {
-  HANDLE  hPFM;
-  HANDLE  hPFB;
-  ULONG  ulIdentifier;
-} TYPE1_FONT;
-
-typedef struct _WNDOBJ {
-  CLIPOBJ  coClient;
-  PVOID  pvConsumer;
-  RECTL  rclClient;
-  SURFOBJ  *psoOwner;
-} WNDOBJ, *PWNDOBJ;
-
-typedef struct _XFORML {
-  FLOATL  eM11;
-  FLOATL  eM12;
-  FLOATL  eM21;
-  FLOATL  eM22;
-  FLOATL  eDx;
-  FLOATL  eDy;
-} XFORML, *PXFORML;
-
-typedef struct _XFORMOBJ {
-  ULONG  ulReserved;
-} XFORMOBJ;
-
-/* XLATEOBJ.flXlate constants */
-#define XO_TRIVIAL                        0x00000001
-#define XO_TABLE                          0x00000002
-#define XO_TO_MONO                        0x00000004
-#define XO_FROM_CMYK                      0x00000008
-#define XO_DEVICE_ICM                     0x00000010
-#define XO_HOST_ICM                       0x00000020
-
-typedef struct _XLATEOBJ {
-  ULONG  iUniq;
-  FLONG  flXlate;
-  USHORT  iSrcType;
-  USHORT  iDstType;
-  ULONG  cEntries;
-  ULONG  *pulXlate;
-} XLATEOBJ;
-
-typedef VOID DDKAPI (CALLBACK *WNDOBJCHANGEPROC)(
-  IN WNDOBJ  *pwo,
-  IN FLONG  fl);
-
-
-WIN32KAPI
-HANDLE
-DDKAPI
-BRUSHOBJ_hGetColorTransform(
-  IN BRUSHOBJ  *pbo);
-
-WIN32KAPI
-PVOID
-DDKAPI
-BRUSHOBJ_pvAllocRbrush(
-  IN BRUSHOBJ  *pbo,
-  IN ULONG  cj);
-
-WIN32KAPI
-PVOID
-DDKAPI
-BRUSHOBJ_pvGetRbrush(
-  IN BRUSHOBJ  *pbo);
-
-WIN32KAPI
-ULONG
-DDKAPI
-BRUSHOBJ_ulGetBrushColor(
-  IN BRUSHOBJ  *pbo);
-
-WIN32KAPI
-BOOL
-DDKAPI
-CLIPOBJ_bEnum(
-  IN CLIPOBJ  *pco,
-  IN ULONG  cj,
-  OUT ULONG  *pv);
-
-/* CLIPOBJ_cEnumStart.iType constants */
-#define CT_RECTANGLES                     0L
-
-/* CLIPOBJ_cEnumStart.iDirection constants */
-#define CD_RIGHTDOWN                      0x00000000
-#define CD_LEFTDOWN                       0x00000001
-#define CD_LEFTWARDS                      0x00000001
-#define CD_RIGHTUP                        0x00000002
-#define CD_UPWARDS                        0x00000002
-#define CD_LEFTUP                         0x00000003
-#define CD_ANY                            0x00000004
-
-WIN32KAPI
-ULONG
-DDKAPI
-CLIPOBJ_cEnumStart(
-  IN CLIPOBJ  *pco,
-  IN BOOL  bAll,
-  IN ULONG  iType,
-  IN ULONG  iDirection,
-  IN ULONG  cLimit);
-
-WIN32KAPI
-PATHOBJ*
-DDKAPI
-CLIPOBJ_ppoGetPath(
-  IN CLIPOBJ  *pco);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngAcquireSemaphore(
-  IN HSEMAPHORE  hsem);
-
-#define FL_ZERO_MEMORY                    0x00000001
-#define FL_NONPAGED_MEMORY                0x00000002
-
-WIN32KAPI
-PVOID
-DDKAPI
-EngAllocMem(
-  IN ULONG  Flags,
-  IN ULONG  MemSize,
-  IN ULONG  Tag);
-
-WIN32KAPI
-PVOID
-DDKAPI
-EngAllocPrivateUserMem(
-  IN PDD_SURFACE_LOCAL  psl,
-  IN SIZE_T  cj,
-  IN ULONG  tag);
-
-WIN32KAPI
-PVOID
-DDKAPI
-EngAllocUserMem(
-  IN SIZE_T  cj,
-  IN ULONG  tag);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngAlphaBlend(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN BLENDOBJ  *pBlendObj);
-
-/* EngAssociateSurface.flHooks constants */
-#define HOOK_BITBLT                       0x00000001
-#define HOOK_STRETCHBLT                   0x00000002
-#define HOOK_PLGBLT                       0x00000004
-#define HOOK_TEXTOUT                      0x00000008
-#define HOOK_PAINT                        0x00000010
-#define HOOK_STROKEPATH                   0x00000020
-#define HOOK_FILLPATH                     0x00000040
-#define HOOK_STROKEANDFILLPATH            0x00000080
-#define HOOK_LINETO                       0x00000100
-#define HOOK_COPYBITS                     0x00000400
-#define HOOK_MOVEPANNING                  0x00000800
-#define HOOK_SYNCHRONIZE                  0x00001000
-#define HOOK_STRETCHBLTROP                0x00002000
-#define HOOK_SYNCHRONIZEACCESS            0x00004000
-#define HOOK_TRANSPARENTBLT               0x00008000
-#define HOOK_ALPHABLEND                   0x00010000
-#define HOOK_GRADIENTFILL                 0x00020000
-#define HOOK_FLAGS                        0x0003b5ff
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngAssociateSurface(
-  IN HSURF  hsurf,
-  IN HDEV  hdev,
-  IN FLONG  flHooks);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngBitBlt(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclTrg,
-  IN POINTL  *pptlSrc,
-  IN POINTL  *pptlMask,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrush,
-  IN ROP4  rop4);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngCheckAbort(
-  IN SURFOBJ  *pso);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngClearEvent(
-  IN PEVENT  pEvent);
-
-WIN32KAPI
-FD_GLYPHSET*
-DDKAPI
-EngComputeGlyphSet(
-  IN INT  nCodePage,
-  IN INT  nFirstChar,
-  IN INT  cChars);
-
-/* EngControlSprites.fl constants */
-#define ECS_TEARDOWN                      0x00000001
-#define ECS_REDRAW                        0x00000002
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngControlSprites(
-  IN WNDOBJ  *pwo,
-  IN FLONG  fl);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngCopyBits(
-  OUT SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN POINTL  *pptlSrc);
-
-WIN32KAPI
-HBITMAP
-DDKAPI
-EngCreateBitmap(
-  IN SIZEL  sizl,
-  IN LONG  lWidth,
-  IN ULONG  iFormat,
-  IN FLONG  fl,
-  IN PVOID  pvBits);
-
-WIN32KAPI
-CLIPOBJ*
-DDKAPI
-EngCreateClip(
-  VOID);
-
-WIN32KAPI
-HBITMAP
-DDKAPI
-EngCreateDeviceBitmap(
-  IN DHSURF  dhsurf,
-  IN SIZEL  sizl,
-  IN ULONG  iFormatCompat);
-
-WIN32KAPI
-HSURF
-DDKAPI
-EngCreateDeviceSurface(
-  DHSURF  dhsurf,
-  SIZEL  sizl,
-  ULONG  iFormatCompat);
-
-#if 0
-WIN32KAPI
-HDRVOBJ
-DDKAPI
-EngCreateDriverObj(
-  PVOID  pvObj,
-  FREEOBJPROC  pFreeObjProc,
-  HDEV  hdev);
-#endif
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngCreateEvent(
-  OUT PEVENT  *ppEvent);
-
-/* EngCreatePalette.iMode constants */
-#define PAL_INDEXED                       0x00000001
-#define PAL_BITFIELDS                     0x00000002
-#define PAL_RGB                           0x00000004
-#define PAL_BGR                           0x00000008
-#define PAL_CMYK                          0x00000010
-
-WIN32KAPI
-HPALETTE
-DDKAPI
-EngCreatePalette(
-  IN ULONG  iMode,
-  IN ULONG  cColors,
-  IN ULONG  *pulColors,
-  IN FLONG  flRed,
-  IN FLONG  flGreen,
-  IN FLONG  flBlue);
-
-WIN32KAPI
-PATHOBJ*
-DDKAPI
-EngCreatePath(
-  VOID);
-
-WIN32KAPI
-HSEMAPHORE
-DDKAPI
-EngCreateSemaphore(
-  VOID);
-
-/* EngCreateWnd.fl constants */
-#define WO_RGN_CLIENT_DELTA               0x00000001
-#define WO_RGN_CLIENT                     0x00000002
-#define WO_RGN_SURFACE_DELTA              0x00000004
-#define WO_RGN_SURFACE                    0x00000008
-#define WO_RGN_UPDATE_ALL                 0x00000010
-#define WO_RGN_WINDOW                     0x00000020
-#define WO_DRAW_NOTIFY                    0x00000040
-#define WO_SPRITE_NOTIFY                  0x00000080
-#define WO_RGN_DESKTOP_COORD              0x00000100
-
-WIN32KAPI
-WNDOBJ*
-DDKAPI
-EngCreateWnd(
-  SURFOBJ  *pso,
-  HWND  hwnd,
-  WNDOBJCHANGEPROC  pfn,
-  FLONG  fl,
-  int  iPixelFormat);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngDebugBreak(
-  VOID);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngDebugPrint(
-  IN PCHAR StandardPrefix,
-  IN PCHAR DebugMessage,
-  IN va_list ap);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngDeleteClip(
-  IN CLIPOBJ  *pco);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngDeleteDriverObj(
-  IN HDRVOBJ  hdo,
-  IN BOOL  bCallBack,
-  IN BOOL  bLocked);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngDeleteEvent(
-  IN PEVENT  pEvent);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngDeleteFile(
-  IN LPWSTR  pwszFileName);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngDeletePalette(
-  IN HPALETTE  hpal);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngDeletePath(
-  IN PATHOBJ  *ppo);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngDeleteSafeSemaphore(
-  IN OUT ENGSAFESEMAPHORE  *pssem);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngDeleteSemaphore(
-  IN OUT HSEMAPHORE  hsem);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngDeleteSurface(
-  IN HSURF  hsurf);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngDeleteWnd(
-  IN WNDOBJ  *pwo);
-
-WIN32KAPI
-DWORD
-DDKAPI
-EngDeviceIoControl(
-  IN HANDLE  hDevice,
-  IN DWORD  dwIoControlCode,
-  IN LPVOID  lpInBuffer,
-  IN DWORD  nInBufferSize,
-  IN OUT LPVOID  lpOutBuffer,
-  IN DWORD  nOutBufferSize,
-  OUT LPDWORD  lpBytesReturned);
-
-WIN32KAPI
-ULONG
-DDKAPI
-EngDitherColor(
-  IN HDEV  hdev,
-  IN ULONG  iMode,
-  IN ULONG  rgb,
-  OUT ULONG  *pul);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngEnumForms(
-  IN HANDLE  hPrinter,
-  IN DWORD  Level,
-  OUT LPBYTE  pForm,
-  IN DWORD  cbBuf,
-  OUT LPDWORD  pcbNeeded,
-  OUT LPDWORD  pcReturned);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngEraseSurface(
-  IN SURFOBJ  *pso,
-  IN RECTL  *prcl,
-  IN ULONG  iColor);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngFillPath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix,
-  IN FLONG  flOptions);
-
-WIN32KAPI
-PVOID
-DDKAPI
-EngFindImageProcAddress(
-  IN HANDLE  hModule,
-  IN LPSTR  lpProcName);
-
-WIN32KAPI
-PVOID
-DDKAPI
-EngFindResource(
-  IN HANDLE  h,
-  IN int  iName,
-  IN int  iType,
-  OUT PULONG  pulSize);
-
-WIN32KAPI
-PVOID
-DDKAPI
-EngFntCacheAlloc(
-  IN ULONG  FastCheckSum,
-  IN ULONG  ulSize);
-
-/* EngFntCacheFault.iFaultMode constants */
-#define ENG_FNT_CACHE_READ_FAULT          0x00000001
-#define ENG_FNT_CACHE_WRITE_FAULT         0x00000002
-
-WIN32KAPI
-VOID
-DDKAPI
-EngFntCacheFault(
-  IN ULONG  ulFastCheckSum,
-  IN ULONG  iFaultMode);
-
-WIN32KAPI
-PVOID
-DDKAPI
-EngFntCacheLookUp(
-  IN ULONG  FastCheckSum,
-  OUT ULONG  *pulSize);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngFreeMem(
-  IN PVOID  Mem);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngFreeModule(
-  IN HANDLE  h);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngFreePrivateUserMem(
-  IN PDD_SURFACE_LOCAL  psl,
-  IN PVOID  pv);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngFreeUserMem(
-  IN PVOID  pv);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngGetCurrentCodePage(
-  OUT PUSHORT  OemCodePage,
-  OUT PUSHORT  AnsiCodePage);
-
-WIN32KAPI
-HANDLE
-DDKAPI
-EngGetCurrentProcessId(
-  VOID);
-
-WIN32KAPI
-HANDLE
-DDKAPI
-EngGetCurrentThreadId(
-  VOID);
-
-WIN32KAPI
-LPWSTR
-DDKAPI
-EngGetDriverName(
-  IN HDEV  hdev);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngGetFileChangeTime(
-  IN HANDLE  h,
-  OUT LARGE_INTEGER  *pChangeTime);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngGetFilePath(
-  IN HANDLE  h,
-  OUT WCHAR  (*pDest)[MAX_PATH+1]);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngGetForm(
-  IN HANDLE  hPrinter,
-  IN LPWSTR  pFormName,
-  IN DWORD  Level,
-  OUT LPBYTE  pForm,
-  IN DWORD  cbBuf,
-  OUT LPDWORD  pcbNeeded);
-
-WIN32KAPI
-ULONG
-DDKAPI
-EngGetLastError(
-  VOID);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngGetPrinter(
-  IN HANDLE  hPrinter,
-  IN DWORD  dwLevel,
-  OUT LPBYTE  pPrinter,
-  IN DWORD  cbBuf,
-  OUT LPDWORD  pcbNeeded);
-
-WIN32KAPI
-DWORD
-DDKAPI
-EngGetPrinterData(
-  IN HANDLE  hPrinter,
-  IN LPWSTR  pValueName,
-  OUT LPDWORD  pType,
-  OUT LPBYTE  pData,
-  IN DWORD  nSize,
-  OUT LPDWORD  pcbNeeded);
-
-WIN32KAPI
-LPWSTR
-DDKAPI
-EngGetPrinterDataFileName(
-  IN HDEV  hdev);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngGetPrinterDriver(
-  IN HANDLE  hPrinter,
-  IN LPWSTR  pEnvironment,
-  IN DWORD  dwLevel,
-  OUT BYTE  *lpbDrvInfo,
-  IN DWORD  cbBuf,
-  OUT DWORD  *pcbNeeded);
-
-WIN32KAPI
-HANDLE
-DDKAPI
-EngGetProcessHandle(
-  VOID);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngGetType1FontList(
-  IN HDEV  hdev,
-  OUT TYPE1_FONT  *pType1Buffer,
-  IN ULONG  cjType1Buffer,
-  OUT PULONG  pulLocalFonts,
-  OUT PULONG  pulRemoteFonts,
-  OUT LARGE_INTEGER  *pLastModified);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngGradientFill(
-  IN SURFOBJ  *psoDest,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN TRIVERTEX  *pVertex,
-  IN ULONG  nVertex,
-  IN PVOID  pMesh,
-  IN ULONG  nMesh,
-  IN RECTL  *prclExtents,
-  IN POINTL  *pptlDitherOrg,
-  IN ULONG  ulMode);
-
-/* EngHangNotification return values */
-#define EHN_RESTORED                      0x00000000
-#define EHN_ERROR                         0x00000001
-
-WIN32KAPI
-ULONG
-DDKAPI
-EngHangNotification(
-  IN HDEV  hDev,
-  IN PVOID  Reserved);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngInitializeSafeSemaphore(
-  OUT ENGSAFESEMAPHORE  *pssem);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngIsSemaphoreOwned(
-  IN HSEMAPHORE  hsem);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngIsSemaphoreOwnedByCurrentThread(
-  IN HSEMAPHORE  hsem);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngLineTo(
-  SURFOBJ  *pso,
-  CLIPOBJ  *pco,
-  BRUSHOBJ  *pbo,
-  LONG  x1,
-  LONG  y1,
-  LONG  x2,
-  LONG  y2,
-  RECTL  *prclBounds,
-  MIX  mix);
-
-WIN32KAPI
-HANDLE
-DDKAPI
-EngLoadImage(
-  IN LPWSTR  pwszDriver);
-
-WIN32KAPI
-HANDLE
-DDKAPI
-EngLoadModule(
-  IN LPWSTR  pwsz);
-
-WIN32KAPI
-HANDLE
-DDKAPI
-EngLoadModuleForWrite(
-  IN LPWSTR  pwsz,
-  IN ULONG  cjSizeOfModule);
-
-WIN32KAPI
-PDD_SURFACE_LOCAL
-DDKAPI
-EngLockDirectDrawSurface(
-  IN HANDLE  hSurface);
-
-WIN32KAPI
-DRIVEROBJ*
-DDKAPI
-EngLockDriverObj(
-  IN HDRVOBJ  hdo);
-
-WIN32KAPI
-SURFOBJ*
-DDKAPI
-EngLockSurface(
-  IN HSURF  hsurf);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngLpkInstalled(
-  VOID);
-
-WIN32KAPI
-PEVENT
-DDKAPI
-EngMapEvent(
-  IN HDEV  hDev,
-  IN HANDLE  hUserObject,
-  IN PVOID  Reserved1,
-  IN PVOID  Reserved2,
-  IN PVOID  Reserved3);
-
-WIN32KAPI
-PVOID
-DDKAPI
-EngMapFile(
-  IN LPWSTR  pwsz,
-  IN ULONG  cjSize,
-  OUT ULONG_PTR  *piFile);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngMapFontFile(
-  ULONG_PTR  iFile,
-  PULONG  *ppjBuf,
-  ULONG  *pcjBuf);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngMapFontFileFD(
-  IN ULONG_PTR  iFile,
-  OUT PULONG  *ppjBuf,
-  OUT ULONG  *pcjBuf);
-
-WIN32KAPI
-PVOID
-DDKAPI
-EngMapModule(
-  IN HANDLE  h,
-  OUT PULONG  pSize);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngMarkBandingSurface(
-  IN HSURF  hsurf);
-
-/* EngModifySurface.flSurface constants */
-#define MS_NOTSYSTEMMEMORY                0x00000001
-#define MS_SHAREDACCESS                   0x00000002
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngModifySurface(
-  IN HSURF  hsurf,
-  IN HDEV  hdev,
-  IN FLONG  flHooks,
-  IN FLONG  flSurface,
-  IN DHSURF  dhsurf,
-  IN VOID  *pvScan0,
-  IN LONG  lDelta,
-  IN VOID  *pvReserved);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngMovePointer(
-  IN SURFOBJ  *pso,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl);
-
-WIN32KAPI
-int
-DDKAPI
-EngMulDiv(
-  IN int  a,
-  IN int  b,
-  IN int  c);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngMultiByteToUnicodeN(
-  OUT LPWSTR  UnicodeString,
-  IN ULONG  MaxBytesInUnicodeString,
-  OUT PULONG  BytesInUnicodeString,
-  IN PCHAR  MultiByteString,
-  IN ULONG  BytesInMultiByteString);
-
-WIN32KAPI
-INT
-DDKAPI
-EngMultiByteToWideChar(
-  IN UINT  CodePage,
-  OUT LPWSTR  WideCharString,
-  IN INT  BytesInWideCharString,
-  IN LPSTR  MultiByteString,
-  IN INT  BytesInMultiByteString);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngPaint(
-  IN SURFOBJ  *pso,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngPlgBlt(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMsk,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlBrushOrg,
-  IN POINTFIX  *pptfx,
-  IN RECTL  *prcl,
-  IN POINTL  *pptl,
-  IN ULONG  iMode);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngProbeForRead(
-  IN PVOID  Address,
-  IN ULONG  Length,
-  IN ULONG  Alignment);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngProbeForReadAndWrite(
-  IN PVOID  Address,
-  IN ULONG  Length,
-  IN ULONG  Alignment);
-
-typedef enum _ENG_DEVICE_ATTRIBUTE {
-  QDA_RESERVED = 0,
-  QDA_ACCELERATION_LEVEL
-} ENG_DEVICE_ATTRIBUTE;
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngQueryDeviceAttribute(
-  IN HDEV  hdev,
-  IN ENG_DEVICE_ATTRIBUTE  devAttr,
-  IN VOID  *pvIn,
-  IN ULONG  ulInSize,
-  OUT VOID  *pvOut,
-  OUT ULONG  ulOutSize);
-
-WIN32KAPI
-LARGE_INTEGER
-DDKAPI
-EngQueryFileTimeStamp(
-  IN LPWSTR  pwsz);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngQueryLocalTime(
-  OUT PENG_TIME_FIELDS  ptf);
-
-WIN32KAPI
-ULONG
-DDKAPI
-EngQueryPalette(
-  IN HPALETTE  hPal,
-  OUT ULONG  *piMode,
-  IN ULONG  cColors,
-  OUT ULONG  *pulColors);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngQueryPerformanceCounter(
-  OUT LONGLONG  *pPerformanceCount);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngQueryPerformanceFrequency(
-  OUT LONGLONG  *pFrequency);
-
-typedef enum _ENG_SYSTEM_ATTRIBUTE {
-  EngProcessorFeature = 1,
-  EngNumberOfProcessors,
-  EngOptimumAvailableUserMemory,
-  EngOptimumAvailableSystemMemory,
-} ENG_SYSTEM_ATTRIBUTE;
-
-#define QSA_MMX                           0x00000100
-#define QSA_SSE                           0x00002000
-#define QSA_3DNOW                         0x00004000
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngQuerySystemAttribute(
-  IN ENG_SYSTEM_ATTRIBUTE  CapNum,
-  OUT PDWORD  pCapability);
-
-WIN32KAPI
-LONG
-DDKAPI
-EngReadStateEvent(
-  IN PEVENT  pEvent);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngReleaseSemaphore(
-  IN HSEMAPHORE  hsem);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngRestoreFloatingPointState(
-  IN VOID  *pBuffer);
-
-WIN32KAPI
-ULONG
-DDKAPI
-EngSaveFloatingPointState(
-  OUT VOID  *pBuffer,
-  IN ULONG  cjBufferSize);
-
-WIN32KAPI
-HANDLE
-DDKAPI
-EngSecureMem(
-  IN PVOID  Address,
-  IN ULONG  Length);
-
-WIN32KAPI
-LONG
-DDKAPI
-EngSetEvent(
-  IN PEVENT  pEvent);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngSetLastError(
-  IN ULONG  iError);
-
-WIN32KAPI
-ULONG
-DDKAPI
-EngSetPointerShape(
-  IN SURFOBJ  *pso,
-  IN SURFOBJ  *psoMask,
-  IN SURFOBJ  *psoColor,
-  IN XLATEOBJ  *pxlo,
-  IN LONG  xHot,
-  IN LONG  yHot,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl,
-  IN FLONG  fl);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngSetPointerTag(
-  IN HDEV  hdev,
-  IN SURFOBJ  *psoMask,
-  IN SURFOBJ  *psoColor,
-  IN XLATEOBJ  *pxlo,
-  IN FLONG  fl);
-
-WIN32KAPI
-DWORD
-DDKAPI
-EngSetPrinterData(
-  IN HANDLE  hPrinter,
-  IN LPWSTR  pType,
-  IN DWORD  dwType,
-  IN LPBYTE  lpbPrinterData,
-  IN DWORD  cjPrinterData);
-
-typedef int DDKCDECLAPI (*SORTCOMP)(const void *pv1, const void *pv2);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngSort(
-  IN OUT PBYTE  pjBuf,
-  IN ULONG  c,
-  IN ULONG  cjElem,
-  IN SORTCOMP  pfnComp);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngStretchBlt(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngStretchBltROP(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode,
-  IN BRUSHOBJ  *pbo,
-  IN DWORD  rop4);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngStrokeAndFillPath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pboStroke,
-  IN LINEATTRS  *plineattrs,
-  IN BRUSHOBJ  *pboFill,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mixFill,
-  IN FLONG  flOptions);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngStrokePath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN LINEATTRS  *plineattrs,
-  IN MIX  mix);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngTextOut(
-  IN SURFOBJ  *pso,
-  IN STROBJ  *pstro,
-  IN FONTOBJ  *pfo,
-  IN CLIPOBJ  *pco,
-  IN RECTL  *prclExtra,
-  IN RECTL  *prclOpaque,
-  IN BRUSHOBJ  *pboFore,
-  IN BRUSHOBJ  *pboOpaque,
-  IN POINTL  pptlOrg,
-  IN MIX  mix);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngTransparentBlt(
-  IN SURFOBJ  *psoDst,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDst,
-  IN RECTL  *prclSrc,
-  IN ULONG  iTransColor,
-  IN ULONG  ulReserved);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngUnicodeToMultiByteN(
-  OUT PCHAR  MultiByteString,
-  IN ULONG  MaxBytesInMultiByteString,
-  OUT PULONG  BytesInMultiByteString,
-  IN PWSTR  UnicodeString,
-  IN ULONG  BytesInUnicodeString);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngUnloadImage(
-  IN HANDLE  hModule);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngUnlockDirectDrawSurface(
-  IN PDD_SURFACE_LOCAL  pSurface);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngUnlockDriverObj(
-  IN HDRVOBJ  hdo);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngUnlockSurface(
-  IN SURFOBJ  *pso);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngUnmapEvent(
-  IN PEVENT  pEvent);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngUnmapFile(
-  IN ULONG_PTR  iFile);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngUnmapFontFile(
-  ULONG_PTR  iFile);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngUnmapFontFileFD(
-  IN ULONG_PTR  iFile);
-
-WIN32KAPI
-VOID
-DDKAPI
-EngUnsecureMem(
-  IN HANDLE  hSecure);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngWaitForSingleObject(
-  IN PEVENT  pEvent,
-  IN PLARGE_INTEGER  pTimeOut);
-
-WIN32KAPI
-INT
-DDKAPI
-EngWideCharToMultiByte(
-  IN UINT  CodePage,
-  IN LPWSTR  WideCharString,
-  IN INT  BytesInWideCharString,
-  OUT LPSTR  MultiByteString,
-  IN INT  BytesInMultiByteString);
-
-WIN32KAPI
-BOOL
-DDKAPI
-EngWritePrinter(
-  IN HANDLE  hPrinter,
-  IN LPVOID  pBuf,
-  IN DWORD  cbBuf,
-  OUT LPDWORD  pcWritten);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_Add(
-  IN OUT PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_AddFloat(
-  IN OUT PFLOATOBJ  pf,
-  IN FLOATL  f);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_AddLong(
-  IN OUT PFLOATOBJ  pf,
-  IN LONG  l);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_Div(
-  IN OUT PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_DivFloat(
-  IN OUT PFLOATOBJ  pf,
-  IN FLOATL  f);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_DivLong(
-  IN OUT PFLOATOBJ  pf,
-  IN LONG  l);
-
-WIN32KAPI
-BOOL
-DDKAPI
-FLOATOBJ_Equal(
-  IN PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
-
-WIN32KAPI
-BOOL
-DDKAPI
-FLOATOBJ_EqualLong(
-  IN PFLOATOBJ  pf,
-  IN LONG  l);
-
-WIN32KAPI
-LONG
-DDKAPI
-FLOATOBJ_GetFloat(
-  IN PFLOATOBJ  pf);
-
-WIN32KAPI
-LONG
-DDKAPI
-FLOATOBJ_GetLong(
-  IN PFLOATOBJ  pf);
-
-WIN32KAPI
-BOOL
-DDKAPI
-FLOATOBJ_GreaterThan(
-  IN PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
-
-WIN32KAPI
-BOOL
-DDKAPI
-FLOATOBJ_GreaterThanLong(
-  IN PFLOATOBJ  pf,
-  IN LONG  l);
-
-WIN32KAPI
-BOOL
-DDKAPI
-FLOATOBJ_LessThan(
-  IN PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
-
-WIN32KAPI
-BOOL
-DDKAPI
-FLOATOBJ_LessThanLong(
-  IN PFLOATOBJ  pf,
-  IN LONG  l);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_Mul(
-  IN OUT PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_MulFloat(
-  IN OUT PFLOATOBJ  pf,
-  IN FLOATL  f);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_MulLong(
-  IN OUT PFLOATOBJ  pf,
-  IN LONG  l);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_Neg(
-  IN OUT PFLOATOBJ  pf);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_SetFloat(
-  OUT PFLOATOBJ  pf,
-  IN FLOATL  f);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_SetLong(
-  OUT PFLOATOBJ  pf,
-  IN LONG  l);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_Sub(
-  IN OUT PFLOATOBJ  pf,
-  IN PFLOATOBJ  pf1);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_SubFloat(
-  IN OUT PFLOATOBJ  pf,
-  IN FLOATL  f);
-
-WIN32KAPI
-VOID
-DDKAPI
-FLOATOBJ_SubLong(
-  IN OUT PFLOATOBJ  pf,
-  IN LONG  l);
-
-WIN32KAPI
-ULONG
-DDKAPI
-FONTOBJ_cGetAllGlyphHandles(
-  IN FONTOBJ  *pfo,
-  OUT HGLYPH  *phg);
-
-WIN32KAPI
-ULONG
-DDKAPI
-FONTOBJ_cGetGlyphs(
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN ULONG  cGlyph,
-  IN HGLYPH  *phg,
-  OUT PVOID  **ppvGlyph);
-
-WIN32KAPI
-FD_GLYPHSET*
-DDKAPI
-FONTOBJ_pfdg(
-  IN FONTOBJ  *pfo);
-
-WIN32KAPI
-IFIMETRICS*
-DDKAPI
-FONTOBJ_pifi(
-  IN FONTOBJ  *pfo);
-
-WIN32KAPI
-PBYTE
-DDKAPI
-FONTOBJ_pjOpenTypeTablePointer(
-  IN FONTOBJ  *pfo,
-  IN ULONG  ulTag,
-  OUT ULONG  *pcjTable);
-
-WIN32KAPI
-PFD_GLYPHATTR
-DDKAPI 
-FONTOBJ_pQueryGlyphAttrs(
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode);
-
-WIN32KAPI
-PVOID
-DDKAPI
-FONTOBJ_pvTrueTypeFontFile(
-  IN FONTOBJ  *pfo,
-  OUT ULONG  *pcjFile);
-
-WIN32KAPI
-LPWSTR
-DDKAPI
-FONTOBJ_pwszFontFilePaths(
-  IN FONTOBJ  *pfo,
-  OUT ULONG  *pcwc);
-
-WIN32KAPI
-XFORMOBJ*
-DDKAPI
-FONTOBJ_pxoGetXform(
-  IN FONTOBJ  *pfo);
-
-WIN32KAPI
-VOID
-DDKAPI
-FONTOBJ_vGetInfo(
-  IN FONTOBJ  *pfo,
-  IN ULONG  cjSize,
-  OUT FONTINFO  *pfi);
-
-WIN32KAPI
-FLATPTR
-DDKAPI
-HeapVidMemAllocAligned(
-  IN LPVIDMEM  lpVidMem,
-  IN DWORD  dwWidth,
-  IN DWORD  dwHeight,
-  IN LPSURFACEALIGNMENT  lpAlignment,
-  OUT LPLONG  lpNewPitch);
-
-WIN32KAPI
-LONG
-DDKAPI
-HT_ComputeRGBGammaTable(
-  IN USHORT  GammaTableEntries,
-  IN USHORT  GammaTableType,
-  IN USHORT  RedGamma,
-  IN USHORT  GreenGamma,
-  IN USHORT  BlueGamma,
-  OUT LPBYTE  pGammaTable);
-
-WIN32KAPI
-LONG
-DDKAPI
-HT_Get8BPPFormatPalette(
-  OUT LPPALETTEENTRY  pPaletteEntry,
-  IN USHORT  RedGamma,
-  IN USHORT  GreenGamma,
-  IN USHORT  BlueGamma);
-
-WIN32KAPI
-LONG
-DDKAPI
-HT_Get8BPPMaskPalette(
-  IN OUT LPPALETTEENTRY  pPaletteEntry,
-  IN BOOL  Use8BPPMaskPal,
-  IN BYTE  CMYMask,
-  IN USHORT  RedGamma,
-  IN USHORT  GreenGamma,
-  IN USHORT  BlueGamma);
-
-WIN32KAPI
-LONG
-DDKAPI
-HTUI_DeviceColorAdjustment(
-  IN LPSTR  pDeviceName,
-  OUT PDEVHTADJDATA  pDevHTAdjData);
-
-WIN32KAPI
-ULONG
-DDKAPI
-PALOBJ_cGetColors(
-  IN PALOBJ  *ppalo,
-  IN ULONG  iStart,
-  IN ULONG  cColors,
-  OUT ULONG  *pulColors);
-
-WIN32KAPI
-BOOL
-DDKAPI
-PATHOBJ_bCloseFigure(
-  IN PATHOBJ  *ppo);
-
-WIN32KAPI
-BOOL
-DDKAPI
-PATHOBJ_bEnum(
-  IN PATHOBJ  *ppo,
-  OUT PATHDATA  *ppd);
-
-WIN32KAPI
-BOOL
-DDKAPI
-PATHOBJ_bEnumClipLines(
-  IN PATHOBJ  *ppo,
-  IN ULONG  cb,
-  OUT CLIPLINE  *pcl);
-
-WIN32KAPI
-BOOL
-DDKAPI
-PATHOBJ_bMoveTo(
-  IN PATHOBJ  *ppo,
-  IN POINTFIX  ptfx);
-
-WIN32KAPI
-BOOL
-DDKAPI
-PATHOBJ_bPolyBezierTo(
-  IN PATHOBJ  *ppo,
-  IN POINTFIX  *pptfx,
-  IN ULONG  cptfx);
-
-WIN32KAPI
-BOOL
-DDKAPI
-PATHOBJ_bPolyLineTo(
-  IN PATHOBJ  *ppo,
-  IN POINTFIX  *pptfx,
-  IN ULONG  cptfx);
-
-WIN32KAPI
-VOID
-DDKAPI
-PATHOBJ_vEnumStart(
-  IN PATHOBJ  *ppo);
-
-WIN32KAPI
-VOID
-DDKAPI
-PATHOBJ_vEnumStartClipLines(
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN SURFOBJ  *pso,
-  IN LINEATTRS  *pla);
-
-WIN32KAPI
-VOID
-DDKAPI
-PATHOBJ_vGetBounds(
-  IN PATHOBJ  *ppo,
-  OUT PRECTFX  prectfx);
-
-WIN32KAPI
-BOOL
-DDKAPI
-STROBJ_bEnum(
-  IN STROBJ  *pstro,
-  OUT ULONG  *pc,
-  OUT PGLYPHPOS  *ppgpos);
-
-WIN32KAPI
-BOOL
-DDKAPI
-STROBJ_bEnumPositionsOnly(
-  IN STROBJ  *pstro,
-  OUT ULONG  *pc,
-  OUT PGLYPHOS  **ppgpos);
-
-WIN32KAPI
-BOOL
-DDKAPI
-STROBJ_bGetAdvanceWidths(
-  IN STROBJ  *pso,
-  IN ULONG  iFirst,
-  IN ULONG  c,
-  OUT POINTQF  *pptqD);
-
-WIN32KAPI
-DWORD
-DDKAPI
-STROBJ_dwGetCodePage(
-  IN STROBJ  *pstro);
-
-WIN32KAPI
-FIX
-DDKAPI
-STROBJ_fxBreakExtra(
-  IN STROBJ  *pstro);
-
-WIN32KAPI
-FIX
-DDKAPI
-STROBJ_fxCharacterExtra(
-  IN STROBJ  *pstro);
-
-WIN32KAPI
-VOID
-DDKAPI
-STROBJ_vEnumStart(
-  IN STROBJ  *pstro);
-
-WIN32KAPI
-VOID
-DDKAPI
-VidMemFree(
-  IN LPVMEMHEAP  pvmh,
-  IN FLATPTR  ptr);
-
-WIN32KAPI
-BOOL
-DDKAPI
-WNDOBJ_bEnum(
-  IN WNDOBJ  *pwo,
-  IN ULONG  cj,
-  OUT ULONG  *pul);
-
-WIN32KAPI
-ULONG
-DDKAPI
-WNDOBJ_cEnumStart(
-  IN WNDOBJ  *pwo,
-  IN ULONG  iType,
-  IN ULONG  iDirection,
-  IN ULONG  cLimit);
-
-WIN32KAPI
-VOID
-DDKAPI
-WNDOBJ_vSetConsumer(
-  IN WNDOBJ  *pwo,
-  IN PVOID  pvConsumer);
-
-/* XFORMOBJ_bApplyXform.iMode constants */
-#define XF_LTOL                           0L
-#define XF_INV_LTOL                       1L
-#define XF_LTOFX                          2L
-#define XF_INV_FXTOL                      3L
-
-WIN32KAPI
-BOOL
-DDKAPI
-XFORMOBJ_bApplyXform(
-  IN XFORMOBJ  *pxo,
-  IN ULONG  iMode,
-  IN ULONG  cPoints,
-  IN PVOID  pvIn,
-  OUT PVOID  pvOut);
-
-WIN32KAPI
-ULONG
-DDKAPI
-XFORMOBJ_iGetFloatObjXform(
-  IN XFORMOBJ  *pxo,
-  OUT FLOATOBJ_XFORM  *pxfo);
-
-WIN32KAPI
-ULONG
-DDKAPI
-XFORMOBJ_iGetXform(
-  IN XFORMOBJ  *pxo,
-  OUT XFORML  *pxform);
-
-/* XLATEOBJ_cGetPalette.iPal constants */
-#define XO_SRCPALETTE                     1
-#define XO_DESTPALETTE                    2
-#define XO_DESTDCPALETTE                  3
-#define XO_SRCBITFIELDS                   4
-#define XO_DESTBITFIELDS                  5
-
-WIN32KAPI
-ULONG
-DDKAPI
-XLATEOBJ_cGetPalette(
-  IN XLATEOBJ  *pxlo,
-  IN ULONG  iPal,
-  IN ULONG  cPal,
-  OUT ULONG  *pPal);
-
-WIN32KAPI
-HANDLE
-DDKAPI
-XLATEOBJ_hGetColorTransform(
-  IN XLATEOBJ  *pxlo);
-
-WIN32KAPI
-ULONG
-DDKAPI
-XLATEOBJ_iXlate(
-  IN XLATEOBJ  *pxlo,
-  IN ULONG  iColor);
-
-WIN32KAPI
-ULONG*
-DDKAPI
-XLATEOBJ_piVector(
-  IN XLATEOBJ  *pxlo);
-
-
-
-/* Graphics Driver Functions */
-
-BOOL
-DDKAPI
-DrvAlphaBlend(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN BLENDOBJ  *pBlendObj);
-
-BOOL
-DDKAPI
-DrvAssertMode(
-  IN DHPDEV  dhpdev,
-  IN BOOL  bEnable);
-
-BOOL
-DDKAPI
-DrvBitBlt(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclTrg,
-  IN POINTL  *pptlSrc,
-  IN POINTL  *pptlMask,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrush,
-  IN ROP4  rop4);
-
-VOID
-DDKAPI
-DrvCompletePDEV(
-  IN DHPDEV  dhpdev,
-  IN HDEV  hdev);
-
-BOOL
-DDKAPI
-DrvCopyBits(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN POINTL  *pptlSrc);
-
-HBITMAP
-DDKAPI
-DrvCreateDeviceBitmap(
-  IN DHPDEV  dhpdev,
-  IN SIZEL  sizl,
-  IN ULONG  iFormat);
-
-VOID
-DDKAPI
-DrvDeleteDeviceBitmap(
-  IN DHSURF  dhsurf);
-
-HBITMAP
-DDKAPI
-DrvDeriveSurface(
-  DD_DIRECTDRAW_GLOBAL  *pDirectDraw,
-  DD_SURFACE_LOCAL  *pSurface);
-
-LONG
-DDKAPI
-DrvDescribePixelFormat(
-  IN DHPDEV  dhpdev,
-  IN LONG  iPixelFormat,
-  IN ULONG  cjpfd,
-  OUT PIXELFORMATDESCRIPTOR  *ppfd);
-
-VOID
-DDKAPI
-DrvDestroyFont(
-  IN FONTOBJ  *pfo);
-
-VOID
-DDKAPI
-DrvDisableDriver(
-  VOID);
-
-VOID
-DDKAPI
-DrvDisablePDEV(
-  IN DHPDEV  dhpdev);
-
-VOID
-DDKAPI
-DrvDisableSurface(
-  IN DHPDEV  dhpdev);
-
-#define DM_DEFAULT                        0x00000001
-#define DM_MONOCHROME                     0x00000002
-
-ULONG
-DDKAPI
-DrvDitherColor(
-  IN DHPDEV  dhpdev,
-  IN ULONG  iMode,
-  IN ULONG  rgb,
-  OUT ULONG  *pul);
-
-ULONG
-DDKAPI
-DrvDrawEscape(
-  IN SURFOBJ  *pso,
-  IN ULONG  iEsc,
-  IN CLIPOBJ  *pco,
-  IN RECTL  *prcl,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn);
-
-BOOL
-DDKAPI
-DrvEnableDriver(
-  IN ULONG  iEngineVersion,
-  IN ULONG  cj,
-  OUT DRVENABLEDATA  *pded);
-
-DHPDEV
-DDKAPI
-DrvEnablePDEV(
-  IN DEVMODEW  *pdm,
-  IN LPWSTR  pwszLogAddress,
-  IN ULONG  cPat,
-  OUT HSURF  *phsurfPatterns,
-  IN ULONG  cjCaps,
-  OUT ULONG  *pdevcaps,
-  IN ULONG  cjDevInfo,
-  OUT DEVINFO  *pdi,
-  IN HDEV  hdev,
-  IN LPWSTR  pwszDeviceName,
-  IN HANDLE  hDriver);
-
-HSURF
-DDKAPI
-DrvEnableSurface(
-  IN DHPDEV  dhpdev);
-
-/* DrvEndDoc.fl constants */
-#define ED_ABORTDOC                       0x00000001
-
-BOOL
-DDKAPI
-DrvEndDoc(
-  IN SURFOBJ  *pso,
-  IN FLONG  fl);
-
-ULONG
-DDKAPI
-DrvEscape(
-  IN SURFOBJ  *pso,
-  IN ULONG  iEsc,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn,
-  IN ULONG  cjOut,
-  OUT PVOID  pvOut);
-
-BOOL
-DDKAPI
-DrvFillPath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix,
-  IN FLONG  flOptions);
-
-ULONG
-DDKAPI
-DrvFontManagement(
-  IN SURFOBJ  *pso,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn,
-  IN ULONG  cjOut,
-  OUT PVOID  pvOut);
-
-VOID
-DDKAPI
-DrvFree(
-  IN PVOID  pv,
-  IN ULONG_PTR  id);
-
-/* DrvGetGlyphMode return values */
-#define FO_HGLYPHS                        0L
-#define FO_GLYPHBITS                      1L
-#define FO_PATHOBJ                        2L
-
-ULONG
-DDKAPI
-DrvGetGlyphMode(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo);
-
-ULONG
-DDKAPI
-DrvGetModes(
-  IN HANDLE  hDriver,
-  IN ULONG  cjSize,
-  OUT DEVMODEW  *pdm);
-
-PVOID
-DDKAPI
-DrvGetTrueTypeFile(
-  IN ULONG_PTR  iFile,
-  IN ULONG  *pcj);
-
-BOOL
-DDKAPI
-DrvGradientFill(
-  IN SURFOBJ  *psoDest,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN TRIVERTEX  *pVertex,
-  IN ULONG  nVertex,
-  IN PVOID  pMesh,
-  IN ULONG  nMesh,
-  IN RECTL  *prclExtents,
-  IN POINTL  *pptlDitherOrg,
-  IN ULONG  ulMode);
-
-BOOL
-DDKAPI
-DrvIcmCheckBitmapBits(
-  IN DHPDEV  dhpdev,
-  IN HANDLE  hColorTransform,
-  IN SURFOBJ  *pso,
-  OUT PBYTE  paResults);
-
-HANDLE
-DDKAPI
-DrvIcmCreateColorTransform(
-  IN DHPDEV  dhpdev,
-  IN LPLOGCOLORSPACEW  pLogColorSpace,
-  IN PVOID  pvSourceProfile,
-  IN ULONG  cjSourceProfile,
-  IN PVOID  pvDestProfile,
-  IN ULONG  cjDestProfile,
-  IN PVOID  pvTargetProfile,
-  IN ULONG  cjTargetProfile,
-  IN DWORD  dwReserved);
-
-BOOL
-DDKAPI
-DrvIcmDeleteColorTransform(
-  IN DHPDEV  dhpdev,
-  IN HANDLE  hcmXform);
-
-/* DrvIcmSetDeviceGammaRamp.iFormat constants */
-#define IGRF_RGB_256BYTES                 0x00000000
-#define IGRF_RGB_256WORDS                 0x00000001
-
-BOOL
-DDKAPI
-DrvIcmSetDeviceGammaRamp(
-  IN DHPDEV  dhpdev,
-  IN ULONG  iFormat,
-  IN LPVOID  lpRamp);
-
-BOOL
-DDKAPI
-DrvLineTo(
-  SURFOBJ  *pso,
-  CLIPOBJ  *pco,
-  BRUSHOBJ  *pbo,
-  LONG  x1,
-  LONG  y1,
-  LONG  x2,
-  LONG  y2,
-  RECTL  *prclBounds,
-  MIX  mix);
-
-ULONG_PTR
-DDKAPI
-DrvLoadFontFile(
-  ULONG  cFiles,
-  ULONG_PTR  *piFile,
-  PVOID  *ppvView,
-  ULONG  *pcjView,
-  DESIGNVECTOR  *pdv,
-  ULONG  ulLangID,
-  ULONG  ulFastCheckSum);
-
-VOID
-DDKAPI
-DrvMovePointer(
-  IN SURFOBJ  *pso,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl);
-
-BOOL
-DDKAPI
-DrvNextBand(
-  IN SURFOBJ  *pso,
-  IN POINTL  *pptl);
-
-VOID
-DDKAPI
-DrvNotify(
-  IN SURFOBJ  *pso,
-  IN ULONG  iType,
-  IN PVOID  pvData);
-
-BOOL
-DDKAPI
-DrvOffset(
-  IN SURFOBJ  *pso,
-  IN LONG  x,
-  IN LONG  y,
-  IN FLONG  flReserved);
-
-BOOL
-DDKAPI
-DrvPaint(
-  IN SURFOBJ  *pso,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix);
-
-BOOL
-DDKAPI
-DrvPlgBlt(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMsk,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlBrushOrg,
-  IN POINTFIX  *pptfx,
-  IN RECTL  *prcl,
-  IN POINTL  *pptl,
-  IN ULONG  iMode);
-
-/* DrvQueryAdvanceWidths.iMode constants */
-#define QAW_GETWIDTHS                     0
-#define QAW_GETEASYWIDTHS                 1
-
-BOOL
-DDKAPI
-DrvQueryAdvanceWidths(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN HGLYPH  *phg,
-  OUT PVOID  pvWidths,
-  IN ULONG  cGlyphs);
-
-/* DrvQueryDeviceSupport.iType constants */
-#define QDS_CHECKJPEGFORMAT               0x00000000
-#define QDS_CHECKPNGFORMAT                0x00000001
-
-BOOL
-DDKAPI
-DrvQueryDeviceSupport(
-  SURFOBJ  *pso,
-  XLATEOBJ  *pxlo,
-  XFORMOBJ  *pxo,
-  ULONG  iType,
-  ULONG  cjIn,
-  PVOID  pvIn,
-  ULONG  cjOut,
-  PVOID  pvOut);
-
-/* DrvQueryDriverInfo.dwMode constants */
-#define DRVQUERY_USERMODE                 0x00000001
-
-BOOL
-DDKAPI
-DrvQueryDriverInfo(
-  DWORD  dwMode,
-  PVOID  pBuffer,
-  DWORD  cbBuf,
-  PDWORD  pcbNeeded);
-
-PIFIMETRICS
-DDKAPI
-DrvQueryFont(
-  IN DHPDEV  dhpdev,
-  IN ULONG_PTR  iFile,
-  IN ULONG  iFace,
-  IN ULONG_PTR  *pid);
-
-/* DrvQueryFontCaps.pulCaps constants */
-#define QC_OUTLINES                       0x00000001
-#define QC_1BIT                           0x00000002
-#define QC_4BIT                           0x00000004
-
-#define QC_FONTDRIVERCAPS (QC_OUTLINES | QC_1BIT | QC_4BIT)
-
-LONG
-DDKAPI
-DrvQueryFontCaps(
-  IN ULONG  culCaps,
-  OUT ULONG  *pulCaps);
-
-/* DrvQueryFontData.iMode constants */
-#define QFD_GLYPHANDBITMAP                1L
-#define QFD_GLYPHANDOUTLINE               2L
-#define QFD_MAXEXTENTS                    3L
-#define QFD_TT_GLYPHANDBITMAP             4L
-#define QFD_TT_GRAY1_BITMAP               5L
-#define QFD_TT_GRAY2_BITMAP               6L
-#define QFD_TT_GRAY4_BITMAP               8L
-#define QFD_TT_GRAY8_BITMAP               9L
-
-#define QFD_TT_MONO_BITMAP QFD_TT_GRAY1_BITMAP
-
-LONG
-DDKAPI
-DrvQueryFontData(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN HGLYPH  hg,
-  IN OUT GLYPHDATA  *pgd,
-  IN OUT PVOID  pv,
-  IN ULONG  cjSize);
-
-/* DrvQueryFontFile.ulMode constants */
-#define QFF_DESCRIPTION                   0x00000001
-#define QFF_NUMFACES                      0x00000002
-
-LONG
-DDKAPI
-DrvQueryFontFile(
-  IN ULONG_PTR  iFile,
-  IN ULONG  ulMode,
-  IN ULONG  cjBuf,
-  IN ULONG  *pulBuf);
-
-/* DrvQueryFontTree.iMode constants */
-#define QFT_UNICODE                       0L
-#define QFT_LIGATURES                     1L
-#define QFT_KERNPAIRS                     2L
-#define QFT_GLYPHSET                      3L
-
-PVOID
-DDKAPI
-DrvQueryFontTree(
-  IN DHPDEV  dhpdev,
-  IN ULONG_PTR  iFile,
-  IN ULONG  iFace,
-  IN ULONG  iMode,
-  IN ULONG_PTR  *pid);
-
-PFD_GLYPHATTR
-DDKAPI
-DrvQueryGlyphAttrs(
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode);
-
-ULONG
-DDKAPI
-DrvQueryPerBandInfo(
-  IN SURFOBJ  *pso,
-  IN OUT PERBANDINFO  *pbi);
-
-/* DrvQueryTrueTypeOutline.bMetricsOnly constants */
-#define TTO_METRICS_ONLY                  0x00000001
-#define TTO_QUBICS                        0x00000002
-#define TTO_UNHINTED                      0x00000004
-
-LONG
-DDKAPI
-DrvQueryTrueTypeOutline(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN HGLYPH  hglyph,
-  IN BOOL  bMetricsOnly,
-  IN GLYPHDATA  *pgldt,
-  IN ULONG  cjBuf,
-  OUT TTPOLYGONHEADER  *ppoly);
-
-LONG
-DDKAPI
-DrvQueryTrueTypeTable(
-  IN ULONG_PTR  iFile,
-  IN ULONG  ulFont,
-  IN ULONG  ulTag,
-  IN PTRDIFF  dpStart,
-  IN ULONG  cjBuf,
-  OUT BYTE  *pjBuf,
-  OUT PBYTE  *ppjTable,
-  OUT ULONG *pcjTable);
-
-/* DrvRealizeBrush.iHatch constants */
-#define RB_DITHERCOLOR                    0x80000000L
-
-#define HS_DDI_MAX                        6
-
-BOOL
-DDKAPI
-DrvRealizeBrush(
-  IN BRUSHOBJ  *pbo,
-  IN SURFOBJ  *psoTarget,
-  IN SURFOBJ  *psoPattern,
-  IN SURFOBJ  *psoMask,
-  IN XLATEOBJ  *pxlo,
-  IN ULONG  iHatch);
-
-/* DrvResetDevice return values */
-#define DRD_SUCCESS                       0
-#define DRD_ERROR                         1
-
-ULONG
-DDKAPI
-DrvResetDevice(
-  IN DHPDEV dhpdev,
-  IN PVOID Reserved);
-
-BOOL
-DDKAPI
-DrvResetPDEV(
-  DHPDEV  dhpdevOld,
-  DHPDEV  dhpdevNew);
-
-/* DrvSaveScreenBits.iMode constants */
-#define SS_SAVE                           0x00000000
-#define SS_RESTORE                        0x00000001
-#define SS_FREE                           0x00000002
-
-ULONG_PTR
-DDKAPI
-DrvSaveScreenBits(
-  IN SURFOBJ  *pso,
-  IN ULONG  iMode,
-  IN ULONG_PTR  ident,
-  IN RECTL  *prcl);
-
-BOOL
-DDKAPI
-DrvSendPage(
-  IN SURFOBJ  *pso);
-
-BOOL
-DDKAPI
-DrvSetPalette(
-  IN DHPDEV  dhpdev,
-  IN PALOBJ  *ppalo,
-  IN FLONG  fl,
-  IN ULONG  iStart,
-  IN ULONG  cColors);
-
-BOOL
-DDKAPI
-DrvSetPixelFormat(
-  IN SURFOBJ  *pso,
-  IN LONG  iPixelFormat,
-  IN HWND  hwnd);
-
-/* DrvSetPointerShape return values */
-#define SPS_ERROR                         0x00000000
-#define SPS_DECLINE                       0x00000001
-#define SPS_ACCEPT_NOEXCLUDE              0x00000002
-#define SPS_ACCEPT_EXCLUDE                0x00000003
-#define SPS_ACCEPT_SYNCHRONOUS            0x00000004
-
-/* DrvSetPointerShape.fl constants */
-#define SPS_CHANGE                        0x00000001L
-#define SPS_ASYNCCHANGE                   0x00000002L
-#define SPS_ANIMATESTART                  0x00000004L
-#define SPS_ANIMATEUPDATE                 0x00000008L
-#define SPS_ALPHA                         0x00000010L
-#define SPS_LENGTHMASK                    0x00000F00L
-#define SPS_FREQMASK                      0x000FF000L
-
-ULONG
-DDKAPI
-DrvSetPointerShape(
-  IN SURFOBJ  *pso,
-  IN SURFOBJ  *psoMask,
-  IN SURFOBJ  *psoColor,
-  IN XLATEOBJ  *pxlo,
-  IN LONG  xHot,
-  IN LONG  yHot,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl,
-  IN FLONG  fl);
-
-BOOL
-DDKAPI
-DrvStartBanding(
-  IN SURFOBJ  *pso,
-  IN POINTL  *pptl);
-
-BOOL
-DDKAPI
-DrvStartDoc(
-  IN SURFOBJ  *pso,
-  IN LPWSTR  pwszDocName,
-  IN DWORD  dwJobId);
-
-BOOL
-DDKAPI
-DrvStartPage(
-  IN SURFOBJ  *pso);
-
-BOOL
-DDKAPI
-DrvStretchBlt(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode);
-
-BOOL
-DDKAPI
-DrvStretchBltROP(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode,
-  IN BRUSHOBJ  *pbo,
-  IN DWORD  rop4);
-
-BOOL
-DDKAPI
-DrvStrokeAndFillPath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pboStroke,
-  IN LINEATTRS  *plineattrs,
-  IN BRUSHOBJ  *pboFill,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mixFill,
-  IN FLONG  flOptions);
-
-BOOL
-DDKAPI
-DrvStrokePath(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN LINEATTRS  *plineattrs,
-  IN MIX  mix);
-
-BOOL
-DDKAPI
-DrvSwapBuffers(
-  IN SURFOBJ  *pso,
-  IN WNDOBJ  *pwo);
-
-VOID
-DDKAPI
-DrvSynchronize(
-  IN DHPDEV  dhpdev,
-  IN RECTL  *prcl);
-
-/* DrvSynchronizeSurface.fl constants */
-#define DSS_TIMER_EVENT                   0x00000001
-#define DSS_FLUSH_EVENT                   0x00000002
-
-VOID
-DDKAPI
-DrvSynchronizeSurface(
-  IN SURFOBJ  *pso,
-  IN RECTL  *prcl,
-  IN FLONG  fl);
-
-BOOL
-DDKAPI
-DrvTextOut(
-  IN SURFOBJ  *pso,
-  IN STROBJ  *pstro,
-  IN FONTOBJ  *pfo,
-  IN CLIPOBJ  *pco,
-  IN RECTL  *prclExtra,
-  IN RECTL  *prclOpaque,
-  IN BRUSHOBJ  *pboFore,
-  IN BRUSHOBJ  *pboOpaque,
-  IN POINTL  *pptlOrg,
-  IN MIX  mix);
-
-BOOL
-DDKAPI
-DrvTransparentBlt(
-  IN SURFOBJ  *psoDst,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDst,
-  IN RECTL  *prclSrc,
-  IN ULONG  iTransColor,
-  IN ULONG  ulReserved);
-
-BOOL
-DDKAPI
-DrvUnloadFontFile(
-  IN ULONG_PTR  iFile);
-
-/* WNDOBJCHANGEPROC.fl constants */
-#define WOC_RGN_CLIENT_DELTA              0x00000001
-#define WOC_RGN_CLIENT                    0x00000002
-#define WOC_RGN_SURFACE_DELTA             0x00000004
-#define WOC_RGN_SURFACE                   0x00000008
-#define WOC_CHANGED                       0x00000010
-#define WOC_DELETE                        0x00000020
-#define WOC_DRAWN                         0x00000040
-#define WOC_SPRITE_OVERLAP                0x00000080
-#define WOC_SPRITE_NO_OVERLAP             0x00000100
-
-typedef VOID DDKAPI
-(CALLBACK * WNDOBJCHANGEPROC)(
-  WNDOBJ  *pwo,
-  FLONG  fl);
-
-
-typedef BOOL DDKAPI
-(*PFN_DrvAlphaBlend)(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN BLENDOBJ  *pBlendObj);
-
-typedef BOOL DDKAPI
-(*PFN_DrvAssertMode)(
-  IN DHPDEV  dhpdev,
-  IN BOOL  bEnable);
-
-typedef BOOL DDKAPI
-(*PFN_DrvBitBlt)(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclTrg,
-  IN POINTL  *pptlSrc,
-  IN POINTL  *pptlMask,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrush,
-  IN ROP4  rop4);
-
-typedef VOID DDKAPI
-(*PFN_DrvCompletePDEV)(
-  IN DHPDEV  dhpdev,
-  IN HDEV  hdev);
-
-typedef BOOL DDKAPI
-(*PFN_DrvCopyBits)(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDest,
-  IN POINTL  *pptlSrc);
-
-typedef HBITMAP DDKAPI
-(*PFN_DrvCreateDeviceBitmap)(
-  IN DHPDEV  dhpdev,
-  IN SIZEL  sizl,
-  IN ULONG  iFormat);
-
-typedef VOID DDKAPI
-(*PFN_DrvDeleteDeviceBitmap)(
-  IN DHSURF  dhsurf);
-
-typedef HBITMAP DDKAPI
-(*PFN_DrvDeriveSurface)(
-  DD_DIRECTDRAW_GLOBAL  *pDirectDraw,
-  DD_SURFACE_LOCAL  *pSurface);
-
-typedef LONG DDKAPI
-(*PFN_DrvDescribePixelFormat)(
-  IN DHPDEV  dhpdev,
-  IN LONG  iPixelFormat,
-  IN ULONG  cjpfd,
-  OUT PIXELFORMATDESCRIPTOR  *ppfd);
-
-typedef VOID DDKAPI
-(*PFN_DrvDestroyFont)(
-  IN FONTOBJ  *pfo);
-
-typedef VOID DDKAPI
-(*PFN_DrvDisableDriver)(
-  VOID);
-
-typedef VOID DDKAPI
-(*PFN_DrvDisablePDEV)(
-  IN DHPDEV  dhpdev);
-
-typedef VOID DDKAPI
-(*PFN_DrvDisableSurface)(
-  IN DHPDEV  dhpdev);
-
-typedef ULONG DDKAPI
-(*PFN_DrvDitherColor)(
-  IN DHPDEV  dhpdev,
-  IN ULONG  iMode,
-  IN ULONG  rgb,
-  OUT ULONG  *pul);
-
-typedef ULONG DDKAPI
-(*PFN_DrvDrawEscape)(
-  IN SURFOBJ  *pso,
-  IN ULONG  iEsc,
-  IN CLIPOBJ  *pco,
-  IN RECTL  *prcl,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn);
-
-typedef BOOL DDKAPI
-(*PFN_DrvEnableDriver)(
-  IN ULONG  iEngineVersion,
-  IN ULONG  cj,
-  OUT DRVENABLEDATA  *pded);
-#if 0
-typedef DHPDEV DDKAPI
-(*PFN_DrvEnablePDEV)(
-  IN DEVMODEW  *pdm,
-  IN LPWSTR  pwszLogAddress,
-  IN ULONG  cPat,
-  OUT HSURF  *phsurfPatterns,
-  IN ULONG  cjCaps,
-  OUT ULONG  *pdevcaps,
-  IN ULONG  cjDevInfo,
-  OUT DEVINFO  *pdi,
-  IN HDEV  hdev,
-  IN LPWSTR  pwszDeviceName,
-  IN HANDLE  hDriver);
-#endif
-typedef HSURF DDKAPI
-(*PFN_DrvEnableSurface)(
-  IN DHPDEV  dhpdev);
-
-typedef BOOL DDKAPI
-(*PFN_DrvEndDoc)(
-  IN SURFOBJ  *pso,
-  IN FLONG  fl);
-
-typedef ULONG DDKAPI
-(*PFN_DrvEscape)(
-  IN SURFOBJ  *pso,
-  IN ULONG  iEsc,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn,
-  IN ULONG  cjOut,
-  OUT PVOID  pvOut);
-
-typedef BOOL DDKAPI
-(*PFN_DrvFillPath)(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix,
-  IN FLONG  flOptions);
-
-typedef ULONG DDKAPI
-(*PFN_DrvFontManagement)(
-  IN SURFOBJ  *pso,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN ULONG  cjIn,
-  IN PVOID  pvIn,
-  IN ULONG  cjOut,
-  OUT PVOID  pvOut);
-
-typedef VOID DDKAPI
-(*PFN_DrvFree)(
-  IN PVOID  pv,
-  IN ULONG_PTR  id);
-
-typedef ULONG DDKAPI
-(*PFN_DrvGetGlyphMode)(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo);
-
-typedef ULONG DDKAPI
-(*PFN_DrvGetModes)(
-  IN HANDLE  hDriver,
-  IN ULONG  cjSize,
-  OUT DEVMODEW  *pdm);
-
-typedef PVOID DDKAPI
-(*PFN_DrvGetTrueTypeFile)(
-  IN ULONG_PTR  iFile,
-  IN ULONG  *pcj);
-
-typedef BOOL DDKAPI
-(*PFN_DrvGradientFill)(
-  IN SURFOBJ  *psoDest,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN TRIVERTEX  *pVertex,
-  IN ULONG  nVertex,
-  IN PVOID  pMesh,
-  IN ULONG  nMesh,
-  IN RECTL  *prclExtents,
-  IN POINTL  *pptlDitherOrg,
-  IN ULONG  ulMode);
-
-typedef BOOL DDKAPI
-(*PFN_DrvIcmCheckBitmapBits)(
-  IN DHPDEV  dhpdev,
-  IN HANDLE  hColorTransform,
-  IN SURFOBJ  *pso,
-  OUT PBYTE  paResults);
-
-typedef HANDLE DDKAPI
-(*PFN_DrvIcmCreateColorTransform)(
-  IN DHPDEV  dhpdev,
-  IN LPLOGCOLORSPACEW  pLogColorSpace,
-  IN PVOID  pvSourceProfile,
-  IN ULONG  cjSourceProfile,
-  IN PVOID  pvDestProfile,
-  IN ULONG  cjDestProfile,
-  IN PVOID  pvTargetProfile,
-  IN ULONG  cjTargetProfile,
-  IN DWORD  dwReserved);
-
-typedef BOOL DDKAPI
-(*PFN_DrvIcmDeleteColorTransform)(
-  IN DHPDEV  dhpdev,
-  IN HANDLE  hcmXform);
-
-typedef BOOL DDKAPI
-(*PFN_DrvIcmSetDeviceGammaRamp)(
-  IN DHPDEV  dhpdev,
-  IN ULONG  iFormat,
-  IN LPVOID  lpRamp);
-
-typedef BOOL DDKAPI
-(*PFN_DrvLineTo)(
-  SURFOBJ  *pso,
-  CLIPOBJ  *pco,
-  BRUSHOBJ  *pbo,
-  LONG  x1,
-  LONG  y1,
-  LONG  x2,
-  LONG  y2,
-  RECTL  *prclBounds,
-  MIX  mix);
-
-typedef ULONG_PTR DDKAPI
-(*PFN_DrvLoadFontFile)(
-  ULONG  cFiles,
-  ULONG_PTR  *piFile,
-  PVOID  *ppvView,
-  ULONG  *pcjView,
-  DESIGNVECTOR  *pdv,
-  ULONG  ulLangID,
-  ULONG  ulFastCheckSum);
-
-typedef VOID DDKAPI
-(*PFN_DrvMovePointer)(
-  IN SURFOBJ  *pso,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl);
-
-typedef BOOL DDKAPI
-(*PFN_DrvNextBand)(
-  IN SURFOBJ  *pso,
-  IN POINTL  *pptl);
-
-typedef VOID DDKAPI
-(*PFN_DrvNotify)(
-  IN SURFOBJ  *pso,
-  IN ULONG  iType,
-  IN PVOID  pvData);
-
-typedef BOOL DDKAPI
-(*PFN_DrvOffset)(
-  IN SURFOBJ  *pso,
-  IN LONG  x,
-  IN LONG  y,
-  IN FLONG  flReserved);
-
-typedef BOOL DDKAPI
-(*PFN_DrvPaint)(
-  IN SURFOBJ  *pso,
-  IN CLIPOBJ  *pco,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mix);
-
-typedef BOOL DDKAPI
-(*PFN_DrvPlgBlt)(
-  IN SURFOBJ  *psoTrg,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMsk,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlBrushOrg,
-  IN POINTFIX  *pptfx,
-  IN RECTL  *prcl,
-  IN POINTL  *pptl,
-  IN ULONG  iMode);
-
-typedef BOOL DDKAPI
-(*PFN_DrvQueryAdvanceWidths)(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN HGLYPH  *phg,
-  OUT PVOID  pvWidths,
-  IN ULONG  cGlyphs);
-
-typedef BOOL DDKAPI
-(*PFN_DrvQueryDeviceSupport)(
-  SURFOBJ  *pso,
-  XLATEOBJ  *pxlo,
-  XFORMOBJ  *pxo,
-  ULONG  iType,
-  ULONG  cjIn,
-  PVOID  pvIn,
-  ULONG  cjOut,
-  PVOID  pvOut);
-
-typedef BOOL DDKAPI
-(*PFN_DrvQueryDriverInfo)(
-  DWORD  dwMode,
-  PVOID  pBuffer,
-  DWORD  cbBuf,
-  PDWORD  pcbNeeded);
-
-typedef PIFIMETRICS DDKAPI
-(*PFN_DrvQueryFont)(
-  IN DHPDEV  dhpdev,
-  IN ULONG_PTR  iFile,
-  IN ULONG  iFace,
-  IN ULONG_PTR  *pid);
-
-typedef LONG DDKAPI
-(*PFN_DrvQueryFontCaps)(
-  IN ULONG  culCaps,
-  OUT ULONG  *pulCaps);
-
-typedef LONG DDKAPI
-(*PFN_DrvQueryFontData)(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode,
-  IN HGLYPH  hg,
-  IN OUT GLYPHDATA  *pgd,
-  IN OUT PVOID  pv,
-  IN ULONG  cjSize);
-
-typedef LONG DDKAPI
-(*PFN_DrvQueryFontFile)(
-  IN ULONG_PTR  iFile,
-  IN ULONG  ulMode,
-  IN ULONG  cjBuf,
-  IN ULONG  *pulBuf);
-
-typedef PVOID DDKAPI
-(*PFN_DrvQueryFontTree)(
-  IN DHPDEV  dhpdev,
-  IN ULONG_PTR  iFile,
-  IN ULONG  iFace,
-  IN ULONG  iMode,
-  IN ULONG_PTR  *pid);
-
-typedef PFD_GLYPHATTR DDKAPI
-(*PFN_DrvQueryGlyphAttrs)(
-  IN FONTOBJ  *pfo,
-  IN ULONG  iMode);
-
-typedef ULONG DDKAPI
-(*PFN_DrvQueryPerBandInfo)(
-  IN SURFOBJ  *pso,
-  IN OUT PERBANDINFO  *pbi);
-
-typedef LONG DDKAPI
-(*PFN_DrvQueryTrueTypeOutline)(
-  IN DHPDEV  dhpdev,
-  IN FONTOBJ  *pfo,
-  IN HGLYPH  hglyph,
-  IN BOOL  bMetricsOnly,
-  IN GLYPHDATA  *pgldt,
-  IN ULONG  cjBuf,
-  OUT TTPOLYGONHEADER  *ppoly);
-
-typedef LONG DDKAPI
-(*PFN_DrvQueryTrueTypeTable)(
-  IN ULONG_PTR  iFile,
-  IN ULONG  ulFont,
-  IN ULONG  ulTag,
-  IN PTRDIFF  dpStart,
-  IN ULONG  cjBuf,
-  OUT BYTE  *pjBuf,
-  OUT PBYTE  *ppjTable,
-  OUT ULONG *pcjTable);
-
-typedef BOOL DDKAPI
-(*PFN_DrvRealizeBrush)(
-  IN BRUSHOBJ  *pbo,
-  IN SURFOBJ  *psoTarget,
-  IN SURFOBJ  *psoPattern,
-  IN SURFOBJ  *psoMask,
-  IN XLATEOBJ  *pxlo,
-  IN ULONG  iHatch);
-
-typedef ULONG DDKAPI
-(*PFN_DrvResetDevice)(
-  IN DHPDEV dhpdev,
-  IN PVOID Reserved);
-
-typedef BOOL DDKAPI
-(*PFN_DrvResetPDEV)(
-  DHPDEV  dhpdevOld,
-  DHPDEV  dhpdevNew);
-
-typedef ULONG_PTR DDKAPI
-(*PFN_DrvSaveScreenBits)(
-  IN SURFOBJ  *pso,
-  IN ULONG  iMode,
-  IN ULONG_PTR  ident,
-  IN RECTL  *prcl);
-
-typedef BOOL DDKAPI
-(*PFN_DrvSendPage)(
-  IN SURFOBJ  *pso);
-
-typedef BOOL DDKAPI
-(*PFN_DrvSetPalette)(
-  IN DHPDEV  dhpdev,
-  IN PALOBJ  *ppalo,
-  IN FLONG  fl,
-  IN ULONG  iStart,
-  IN ULONG  cColors);
-
-typedef BOOL DDKAPI
-(*PFN_DrvSetPixelFormat)(
-  IN SURFOBJ  *pso,
-  IN LONG  iPixelFormat,
-  IN HWND  hwnd);
-
-typedef ULONG DDKAPI
-(*PFN_DrvSetPointerShape)(
-  IN SURFOBJ  *pso,
-  IN SURFOBJ  *psoMask,
-  IN SURFOBJ  *psoColor,
-  IN XLATEOBJ  *pxlo,
-  IN LONG  xHot,
-  IN LONG  yHot,
-  IN LONG  x,
-  IN LONG  y,
-  IN RECTL  *prcl,
-  IN FLONG  fl);
-
-typedef BOOL DDKAPI
-(*PFN_DrvStartBanding)(
-  IN SURFOBJ  *pso,
-  IN POINTL  *pptl);
-
-typedef BOOL DDKAPI
-(*PFN_DrvStartDoc)(
-  IN SURFOBJ  *pso,
-  IN LPWSTR  pwszDocName,
-  IN DWORD  dwJobId);
-
-typedef BOOL DDKAPI
-(*PFN_DrvStartPage)(
-  IN SURFOBJ  *pso);
-
-typedef BOOL DDKAPI
-(*PFN_DrvStretchBlt)(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode);
-
-typedef BOOL DDKAPI
-(*PFN_DrvStretchBltROP)(
-  IN SURFOBJ  *psoDest,
-  IN SURFOBJ  *psoSrc,
-  IN SURFOBJ  *psoMask,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN COLORADJUSTMENT  *pca,
-  IN POINTL  *pptlHTOrg,
-  IN RECTL  *prclDest,
-  IN RECTL  *prclSrc,
-  IN POINTL  *pptlMask,
-  IN ULONG  iMode,
-  IN BRUSHOBJ  *pbo,
-  IN DWORD  rop4);
-
-typedef BOOL DDKAPI
-(*PFN_DrvStrokeAndFillPath)(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pboStroke,
-  IN LINEATTRS  *plineattrs,
-  IN BRUSHOBJ  *pboFill,
-  IN POINTL  *pptlBrushOrg,
-  IN MIX  mixFill,
-  IN FLONG  flOptions);
-
-typedef BOOL DDKAPI
-(*PFN_DrvStrokePath)(
-  IN SURFOBJ  *pso,
-  IN PATHOBJ  *ppo,
-  IN CLIPOBJ  *pco,
-  IN XFORMOBJ  *pxo,
-  IN BRUSHOBJ  *pbo,
-  IN POINTL  *pptlBrushOrg,
-  IN LINEATTRS  *plineattrs,
-  IN MIX  mix);
-
-typedef BOOL DDKAPI
-(*PFN_DrvSwapBuffers)(
-  IN SURFOBJ  *pso,
-  IN WNDOBJ  *pwo);
-
-typedef VOID DDKAPI
-(*PFN_DrvSynchronize)(
-  IN DHPDEV  dhpdev,
-  IN RECTL  *prcl);
-
-typedef VOID DDKAPI
-(*PFN_DrvSynchronizeSurface)(
-  IN SURFOBJ  *pso,
-  IN RECTL  *prcl,
-  IN FLONG  fl);
-
-typedef BOOL DDKAPI
-(*PFN_DrvTextOut)(
-  IN SURFOBJ  *pso,
-  IN STROBJ  *pstro,
-  IN FONTOBJ  *pfo,
-  IN CLIPOBJ  *pco,
-  IN RECTL  *prclExtra,
-  IN RECTL  *prclOpaque,
-  IN BRUSHOBJ  *pboFore,
-  IN BRUSHOBJ  *pboOpaque,
-  IN POINTL  *pptlOrg,
-  IN MIX  mix);
-
-typedef BOOL DDKAPI
-(*PFN_DrvTransparentBlt)(
-  IN SURFOBJ  *psoDst,
-  IN SURFOBJ  *psoSrc,
-  IN CLIPOBJ  *pco,
-  IN XLATEOBJ  *pxlo,
-  IN RECTL  *prclDst,
-  IN RECTL  *prclSrc,
-  IN ULONG  iTransColor,
-  IN ULONG  ulReserved);
-
-typedef BOOL DDKAPI
-(*PFN_DrvUnloadFontFile)(
-  IN ULONG_PTR  iFile);
-
-
-WIN32KAPI
-VOID
-DDKAPI
-DrvDisableDirectDraw(
-  IN DHPDEV  dhpdev);
-
-WIN32KAPI
-BOOL
-DDKAPI
-DrvEnableDirectDraw(
-  IN DHPDEV  dhpdev,
-  OUT DD_CALLBACKS  *pCallBacks,
-  OUT DD_SURFACECALLBACKS  *pSurfaceCallBacks,
-  OUT DD_PALETTECALLBACKS  *pPaletteCallBacks);
-
-WIN32KAPI
-BOOL
-DDKAPI
-DrvGetDirectDrawInfo(
-  IN DHPDEV  dhpdev,
-  OUT DD_HALINFO  *pHalInfo,
-  OUT DWORD  *pdwNumHeaps,
-  OUT VIDEOMEMORY  *pvmList,
-  OUT DWORD  *pdwNumFourCCCodes,
-  OUT DWORD  *pdwFourCC);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* defined __VIDEO_H */
-
-#endif /* __WINDDI_H */
diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h
deleted file mode 100644
index fb1896670..000000000
--- a/winsup/w32api/include/ddk/winddk.h
+++ /dev/null
@@ -1,9089 +0,0 @@
-/*
- * winddk.h
- *
- * Windows Device Driver Kit
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __WINDDK_H
-#define __WINDDK_H
-
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-/*
-** Definitions specific to this Device Driver Kit
-*/
-#define DDKAPI __attribute__((stdcall))
-#define DDKFASTAPI __attribute__((fastcall))
-#define DDKCDECLAPI __attribute__((cdecl))
-
-#if defined(_NTOSKRNL_)
-#ifndef NTOSAPI
-#define NTOSAPI DECL_EXPORT
-#endif
-#define DECLARE_INTERNAL_OBJECT(x) typedef struct _##x; typedef struct _##x *P##x;
-#define DECLARE_INTERNAL_OBJECT2(x,y) typedef struct _##x; typedef struct _##x *P##y;
-#else
-#ifndef NTOSAPI
-#define NTOSAPI DECL_IMPORT
-#endif
-#define DECLARE_INTERNAL_OBJECT(x) struct _##x; typedef struct _##x *P##x;
-#define DECLARE_INTERNAL_OBJECT2(x,y) struct _##x; typedef struct _##x *P##y;
-#endif
-
-/* Pseudo modifiers for parameters */
-#define IN
-#define OUT
-#define OPTIONAL
-#define UNALLIGNED
-
-#define CONST const
-#define VOLATILE volatile
-
-#define RESTRICTED_POINTER
-#define POINTER_ALIGNMENT
-
-
-
-/*
-** Forward declarations
-*/
-
-struct _IRP;
-struct _MDL;
-struct _KAPC;
-struct _KDPC;
-struct _KPCR;
-struct _KPRCB;
-struct _KTSS;
-struct _FILE_OBJECT;
-struct _DMA_ADAPTER;
-struct _DEVICE_OBJECT;
-struct _DRIVER_OBJECT;
-struct _SECTION_OBJECT;
-struct _IO_STATUS_BLOCK;
-struct _DEVICE_DESCRIPTION;
-struct _SCATTER_GATHER_LIST;
-
-DECLARE_INTERNAL_OBJECT(ADAPTER_OBJECT)
-DECLARE_INTERNAL_OBJECT(DMA_ADAPTER)
-DECLARE_INTERNAL_OBJECT(IO_STATUS_BLOCK)
-DECLARE_INTERNAL_OBJECT(SECTION_OBJECT)
-
-#if 1
-/* FIXME: Unknown definitions */
-struct _SET_PARTITION_INFORMATION_EX;
-typedef ULONG WAIT_TYPE;
-typedef HANDLE TRACEHANDLE;
-typedef PVOID PWMILIB_CONTEXT;
-typedef PVOID PSYSCTL_IRP_DISPOSITION;
-typedef ULONG LOGICAL;
-#endif
-
-/*
-** Routines specific to this DDK
-*/
-
-#define TAG(_a, _b, _c, _d) (ULONG) \
-	(((_a) << 0) + ((_b) << 8) + ((_c) << 16) + ((_d) << 24))
-
-static __inline struct _KPCR * KeGetCurrentKPCR(
-  VOID)
-{
-  ULONG Value;
-
-  __asm__ __volatile__ ("movl %%fs:0x18, %0\n\t"
-	  : "=r" (Value)
-    : /* no inputs */
-  );
-  return (struct _KPCR *) Value;
-}
-
-/*
-** Simple structures
-*/
-
-typedef LONG KPRIORITY;
-typedef UCHAR KIRQL, *PKIRQL;
-typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK;
-typedef ULONG KAFFINITY, *PKAFFINITY;
-typedef CCHAR KPROCESSOR_MODE;
-
-typedef enum _MODE {
-  KernelMode,
-  UserMode,
-  MaximumMode
-} MODE;
-
-
-/* Structures not exposed to drivers */
-typedef struct _IO_TIMER *PIO_TIMER;
-typedef struct _EPROCESS *PEPROCESS;
-typedef struct _ETHREAD *PETHREAD;
-typedef struct _KINTERRUPT *PKINTERRUPT;
-typedef struct _OBJECT_TYPE *POBJECT_TYPE;
-typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD;
-typedef struct _COMPRESSED_DATA_INFO *PCOMPRESSED_DATA_INFO;
-typedef struct _HAL_DISPATCH_TABLE *PHAL_DISPATCH_TABLE;
-typedef struct _HAL_PRIVATE_DISPATCH_TABLE *PHAL_PRIVATE_DISPATCH_TABLE;
-typedef struct _DRIVE_LAYOUT_INFORMATION *PDRIVE_LAYOUT_INFORMATION;
-typedef struct _DRIVE_LAYOUT_INFORMATION_EX *PDRIVE_LAYOUT_INFORMATION_EX;
-
-/* Constants */
-#define	MAXIMUM_PROCESSORS                32
-
-#define MAXIMUM_WAIT_OBJECTS              64
-
-#define METHOD_BUFFERED                   0
-#define METHOD_IN_DIRECT                  1
-#define METHOD_OUT_DIRECT                 2
-#define METHOD_NEITHER                    3
-
-#define LOW_PRIORITY                      0
-#define LOW_REALTIME_PRIORITY             16
-#define HIGH_PRIORITY                     31
-#define MAXIMUM_PRIORITY                  32
-
-#define FILE_LIST_DIRECTORY               0x00000001
-#define FILE_READ_DATA                    0x00000001
-#define FILE_ADD_FILE                     0x00000002
-#define FILE_WRITE_DATA                   0x00000002
-#define FILE_ADD_SUBDIRECTORY             0x00000004
-#define FILE_APPEND_DATA                  0x00000004
-#define FILE_CREATE_PIPE_INSTANCE         0x00000004
-#define FILE_READ_EA                      0x00000008
-#define FILE_WRITE_EA                     0x00000010
-#define FILE_EXECUTE                      0x00000020
-#define FILE_TRAVERSE                     0x00000020
-#define FILE_DELETE_CHILD                 0x00000040
-#define FILE_READ_ATTRIBUTES              0x00000080
-#define FILE_WRITE_ATTRIBUTES             0x00000100
-
-#define FILE_SUPERSEDED                   0x00000000
-#define FILE_OPENED                       0x00000001
-#define FILE_CREATED                      0x00000002
-#define FILE_OVERWRITTEN                  0x00000003
-#define FILE_EXISTS                       0x00000004
-#define FILE_DOES_NOT_EXIST               0x00000005
-
-#define FILE_SHARE_READ                   0x00000001
-#define FILE_SHARE_WRITE                  0x00000002
-#define FILE_SHARE_DELETE                 0x00000004
-#define FILE_SHARE_VALID_FLAGS            0x00000007
-
-#define FILE_ATTRIBUTE_READONLY           0x00000001
-#define FILE_ATTRIBUTE_HIDDEN             0x00000002
-#define FILE_ATTRIBUTE_SYSTEM             0x00000004
-#define FILE_ATTRIBUTE_DIRECTORY          0x00000010
-#define FILE_ATTRIBUTE_ARCHIVE            0x00000020
-#define FILE_ATTRIBUTE_DEVICE             0x00000040
-#define FILE_ATTRIBUTE_NORMAL             0x00000080
-#define FILE_ATTRIBUTE_TEMPORARY          0x00000100
-#define FILE_ATTRIBUTE_SPARSE_FILE        0x00000200
-#define FILE_ATTRIBUTE_REPARSE_POINT      0x00000400
-#define FILE_ATTRIBUTE_COMPRESSED         0x00000800
-#define FILE_ATTRIBUTE_OFFLINE            0x00001000
-#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000
-#define FILE_ATTRIBUTE_ENCRYPTED          0x00004000
-
-#define FILE_ATTRIBUTE_VALID_FLAGS        0x00007fb7
-#define FILE_ATTRIBUTE_VALID_SET_FLAGS    0x000031a7
-
-#define FILE_COPY_STRUCTURED_STORAGE      0x00000041
-#define FILE_STRUCTURED_STORAGE           0x00000441
-
-#define FILE_VALID_OPTION_FLAGS           0x00ffffff
-#define FILE_VALID_PIPE_OPTION_FLAGS      0x00000032
-#define FILE_VALID_MAILSLOT_OPTION_FLAGS  0x00000032
-#define FILE_VALID_SET_FLAGS              0x00000036
-
-#define FILE_SUPERSEDE                    0x00000000
-#define FILE_OPEN                         0x00000001
-#define FILE_CREATE                       0x00000002
-#define FILE_OPEN_IF                      0x00000003
-#define FILE_OVERWRITE                    0x00000004
-#define FILE_OVERWRITE_IF                 0x00000005
-#define FILE_MAXIMUM_DISPOSITION          0x00000005
-
-#define FILE_DIRECTORY_FILE               0x00000001
-#define FILE_WRITE_THROUGH                0x00000002
-#define FILE_SEQUENTIAL_ONLY              0x00000004
-#define FILE_NO_INTERMEDIATE_BUFFERING    0x00000008
-#define FILE_SYNCHRONOUS_IO_ALERT         0x00000010
-#define FILE_SYNCHRONOUS_IO_NONALERT      0x00000020
-#define FILE_NON_DIRECTORY_FILE           0x00000040
-#define FILE_CREATE_TREE_CONNECTION       0x00000080
-#define FILE_COMPLETE_IF_OPLOCKED         0x00000100
-#define FILE_NO_EA_KNOWLEDGE              0x00000200
-#define FILE_OPEN_FOR_RECOVERY            0x00000400
-#define FILE_RANDOM_ACCESS                0x00000800
-#define FILE_DELETE_ON_CLOSE              0x00001000
-#define FILE_OPEN_BY_FILE_ID              0x00002000
-#define FILE_OPEN_FOR_BACKUP_INTENT       0x00004000
-#define FILE_NO_COMPRESSION               0x00008000
-#define FILE_RESERVE_OPFILTER             0x00100000
-#define FILE_OPEN_REPARSE_POINT           0x00200000
-#define FILE_OPEN_NO_RECALL               0x00400000
-#define FILE_OPEN_FOR_FREE_SPACE_QUERY    0x00800000
-
-#define FILE_ANY_ACCESS                   0x00000000
-#define FILE_SPECIAL_ACCESS               FILE_ANY_ACCESS
-#define FILE_READ_ACCESS                  0x00000001
-#define FILE_WRITE_ACCESS                 0x00000002
-
-#define FILE_ALL_ACCESS \
-  (STANDARD_RIGHTS_REQUIRED | \
-   SYNCHRONIZE | \
-   0x1FF)
-
-#define FILE_GENERIC_EXECUTE \
-  (STANDARD_RIGHTS_EXECUTE | \
-   FILE_READ_ATTRIBUTES | \
-   FILE_EXECUTE | \
-   SYNCHRONIZE)
-
-#define FILE_GENERIC_READ \
-  (STANDARD_RIGHTS_READ | \
-   FILE_READ_DATA | \
-   FILE_READ_ATTRIBUTES | \
-   FILE_READ_EA | \
-   SYNCHRONIZE)
-
-#define FILE_GENERIC_WRITE \
-  (STANDARD_RIGHTS_WRITE | \
-   FILE_WRITE_DATA | \
-   FILE_WRITE_ATTRIBUTES | \
-   FILE_WRITE_EA | \
-   FILE_APPEND_DATA | \
-   SYNCHRONIZE)
-
-/* Exported object types */
-extern NTOSAPI POBJECT_TYPE ExDesktopObjectType;
-extern NTOSAPI POBJECT_TYPE ExEventObjectType;
-extern NTOSAPI POBJECT_TYPE ExSemaphoreObjectType;
-extern NTOSAPI POBJECT_TYPE ExWindowStationObjectType;
-extern NTOSAPI POBJECT_TYPE IoAdapterObjectType;
-extern NTOSAPI ULONG IoDeviceHandlerObjectSize;
-extern NTOSAPI POBJECT_TYPE IoDeviceHandlerObjectType;
-extern NTOSAPI POBJECT_TYPE IoDeviceObjectType;
-extern NTOSAPI POBJECT_TYPE IoDriverObjectType;
-extern NTOSAPI POBJECT_TYPE IoFileObjectType;
-extern NTOSAPI POBJECT_TYPE LpcPortObjectType;
-extern NTOSAPI POBJECT_TYPE MmSectionObjectType;
-extern NTOSAPI POBJECT_TYPE SeTokenObjectType;
-
-extern NTOSAPI CCHAR KeNumberProcessors;
-extern NTOSAPI PHAL_DISPATCH_TABLE HalDispatchTable;
-extern NTOSAPI PHAL_PRIVATE_DISPATCH_TABLE HalPrivateDispatchTable;
-
-
-/*
-** IRP function codes
-*/
-
-#define IRP_MJ_CREATE                     0x00
-#define IRP_MJ_CREATE_NAMED_PIPE          0x01
-#define IRP_MJ_CLOSE                      0x02
-#define IRP_MJ_READ                       0x03
-#define IRP_MJ_WRITE                      0x04
-#define IRP_MJ_QUERY_INFORMATION          0x05
-#define IRP_MJ_SET_INFORMATION            0x06
-#define IRP_MJ_QUERY_EA                   0x07
-#define IRP_MJ_SET_EA                     0x08
-#define IRP_MJ_FLUSH_BUFFERS              0x09
-#define IRP_MJ_QUERY_VOLUME_INFORMATION   0x0a
-#define IRP_MJ_SET_VOLUME_INFORMATION     0x0b
-#define IRP_MJ_DIRECTORY_CONTROL          0x0c
-#define IRP_MJ_FILE_SYSTEM_CONTROL        0x0d
-#define IRP_MJ_DEVICE_CONTROL             0x0e
-#define IRP_MJ_INTERNAL_DEVICE_CONTROL    0x0f
-#define IRP_MJ_SCSI                       0x0f
-#define IRP_MJ_SHUTDOWN                   0x10
-#define IRP_MJ_LOCK_CONTROL               0x11
-#define IRP_MJ_CLEANUP                    0x12
-#define IRP_MJ_CREATE_MAILSLOT            0x13
-#define IRP_MJ_QUERY_SECURITY             0x14
-#define IRP_MJ_SET_SECURITY               0x15
-#define IRP_MJ_POWER                      0x16
-#define IRP_MJ_SYSTEM_CONTROL             0x17
-#define IRP_MJ_DEVICE_CHANGE              0x18
-#define IRP_MJ_QUERY_QUOTA                0x19
-#define IRP_MJ_SET_QUOTA                  0x1a
-#define IRP_MJ_PNP                        0x1b
-#define IRP_MJ_PNP_POWER                  0x1b
-#define IRP_MJ_MAXIMUM_FUNCTION           0x1b
-
-#define IRP_MN_QUERY_DIRECTORY            0x01
-#define IRP_MN_NOTIFY_CHANGE_DIRECTORY    0x02
-
-#define IRP_MN_USER_FS_REQUEST            0x00
-#define IRP_MN_MOUNT_VOLUME               0x01
-#define IRP_MN_VERIFY_VOLUME              0x02
-#define IRP_MN_LOAD_FILE_SYSTEM           0x03
-#define IRP_MN_TRACK_LINK                 0x04
-#define IRP_MN_KERNEL_CALL                0x04
-
-#define IRP_MN_LOCK                       0x01
-#define IRP_MN_UNLOCK_SINGLE              0x02
-#define IRP_MN_UNLOCK_ALL                 0x03
-#define IRP_MN_UNLOCK_ALL_BY_KEY          0x04
-
-#define IRP_MN_NORMAL                     0x00
-#define IRP_MN_DPC                        0x01
-#define IRP_MN_MDL                        0x02
-#define IRP_MN_COMPLETE                   0x04
-#define IRP_MN_COMPRESSED                 0x08
-
-#define IRP_MN_MDL_DPC                    (IRP_MN_MDL | IRP_MN_DPC)
-#define IRP_MN_COMPLETE_MDL               (IRP_MN_COMPLETE | IRP_MN_MDL)
-#define IRP_MN_COMPLETE_MDL_DPC           (IRP_MN_COMPLETE_MDL | IRP_MN_DPC)
-
-#define IRP_MN_SCSI_CLASS                 0x01
-
-#define IRP_MN_START_DEVICE               0x00
-#define IRP_MN_QUERY_REMOVE_DEVICE        0x01
-#define IRP_MN_REMOVE_DEVICE              0x02
-#define IRP_MN_CANCEL_REMOVE_DEVICE       0x03
-#define IRP_MN_STOP_DEVICE                0x04
-#define IRP_MN_QUERY_STOP_DEVICE          0x05
-#define IRP_MN_CANCEL_STOP_DEVICE         0x06
-
-#define IRP_MN_QUERY_DEVICE_RELATIONS       0x07
-#define IRP_MN_QUERY_INTERFACE              0x08
-#define IRP_MN_QUERY_CAPABILITIES           0x09
-#define IRP_MN_QUERY_RESOURCES              0x0A
-#define IRP_MN_QUERY_RESOURCE_REQUIREMENTS  0x0B
-#define IRP_MN_QUERY_DEVICE_TEXT            0x0C
-#define IRP_MN_FILTER_RESOURCE_REQUIREMENTS 0x0D
-
-#define IRP_MN_READ_CONFIG                  0x0F
-#define IRP_MN_WRITE_CONFIG                 0x10
-#define IRP_MN_EJECT                        0x11
-#define IRP_MN_SET_LOCK                     0x12
-#define IRP_MN_QUERY_ID                     0x13
-#define IRP_MN_QUERY_PNP_DEVICE_STATE       0x14
-#define IRP_MN_QUERY_BUS_INFORMATION        0x15
-#define IRP_MN_DEVICE_USAGE_NOTIFICATION    0x16
-#define IRP_MN_SURPRISE_REMOVAL             0x17
-#define IRP_MN_QUERY_LEGACY_BUS_INFORMATION 0x18
-
-#define IRP_MN_WAIT_WAKE                  0x00
-#define IRP_MN_POWER_SEQUENCE             0x01
-#define IRP_MN_SET_POWER                  0x02
-#define IRP_MN_QUERY_POWER                0x03
-
-#define IRP_MN_QUERY_ALL_DATA             0x00
-#define IRP_MN_QUERY_SINGLE_INSTANCE      0x01
-#define IRP_MN_CHANGE_SINGLE_INSTANCE     0x02
-#define IRP_MN_CHANGE_SINGLE_ITEM         0x03
-#define IRP_MN_ENABLE_EVENTS              0x04
-#define IRP_MN_DISABLE_EVENTS             0x05
-#define IRP_MN_ENABLE_COLLECTION          0x06
-#define IRP_MN_DISABLE_COLLECTION         0x07
-#define IRP_MN_REGINFO                    0x08
-#define IRP_MN_EXECUTE_METHOD             0x09
-
-#define IRP_MN_REGINFO_EX                 0x0b
-
-typedef enum _IO_ALLOCATION_ACTION {
-  KeepObject = 1,
-  DeallocateObject,
-  DeallocateObjectKeepRegisters
-} IO_ALLOCATION_ACTION, *PIO_ALLOCATION_ACTION;
-
-typedef IO_ALLOCATION_ACTION DDKAPI
-(*PDRIVER_CONTROL)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp,
-  IN PVOID  MapRegisterBase,
-  IN PVOID  Context);
-
-typedef VOID DDKAPI
-(*PDRIVER_LIST_CONTROL)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp,
-  IN struct _SCATTER_GATHER_LIST  *ScatterGather,
-  IN PVOID  Context);
-
-typedef NTSTATUS DDKAPI
-(*PDRIVER_ADD_DEVICE)(
-  IN struct _DRIVER_OBJECT  *DriverObject,
-  IN struct _DEVICE_OBJECT  *PhysicalDeviceObject);
-
-typedef NTSTATUS DDKAPI
-(*PIO_COMPLETION_ROUTINE)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp,
-  IN PVOID  Context);
-
-typedef VOID DDKAPI
-(*PDRIVER_CANCEL)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp);
-
-typedef VOID DDKAPI
-(*PKDEFERRED_ROUTINE)(
-  IN struct _KDPC  *Dpc,
-  IN PVOID  DeferredContext,
-  IN PVOID  SystemArgument1,
-  IN PVOID  SystemArgument2);
-
-typedef NTSTATUS DDKAPI
-(*PDRIVER_DISPATCH)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp);
-
-typedef VOID DDKAPI
-(*PIO_DPC_ROUTINE)(
-  IN struct _KDPC  *Dpc,
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp,
-  IN PVOID  Context);
-
-typedef NTSTATUS DDKAPI
-(*PMM_DLL_INITIALIZE)(
-  IN PUNICODE_STRING  RegistryPath);
-
-typedef NTSTATUS DDKAPI
-(*PMM_DLL_UNLOAD)(
-  VOID);
-
-typedef NTSTATUS DDKAPI
-(*PDRIVER_ENTRY)( 
-  IN struct _DRIVER_OBJECT  *DriverObject, 
-  IN PUNICODE_STRING  RegistryPath); 
-
-typedef NTSTATUS DDKAPI
-(*PDRIVER_INITIALIZE)(
-  IN struct _DRIVER_OBJECT  *DriverObject, 
-  IN PUNICODE_STRING  RegistryPath);
-
-typedef BOOLEAN DDKAPI
-(*PKSERVICE_ROUTINE)(
-  IN struct _KINTERRUPT  *Interrupt,
-  IN PVOID  ServiceContext);
-
-typedef VOID DDKAPI
-(*PIO_TIMER_ROUTINE)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN PVOID  Context);
-
-typedef VOID DDKAPI
-(*PDRIVER_REINITIALIZE)( 
-  IN struct _DRIVER_OBJECT  *DriverObject, 
-  IN PVOID  Context, 
-  IN ULONG  Count); 
-
-typedef NTSTATUS DDKAPI
-(*PDRIVER_STARTIO)(
-  IN struct _DEVICE_OBJECT  *DeviceObject,
-  IN struct _IRP  *Irp);
-
-typedef BOOLEAN DDKAPI
-(*PKSYNCHRONIZE_ROUTINE)(
-  IN PVOID  SynchronizeContext);
-
-typedef VOID DDKAPI
-(*PDRIVER_UNLOAD)( 
-  IN struct _DRIVER_OBJECT  *DriverObject); 
-
-
-
-/*
-** Plug and Play structures
-*/
-
-typedef VOID DDKAPI
-(*PINTERFACE_REFERENCE)(
-  PVOID  Context);
-
-typedef VOID DDKAPI
-(*PINTERFACE_DEREFERENCE)(
-  PVOID Context);
-
-typedef BOOLEAN DDKAPI
-(*PTRANSLATE_BUS_ADDRESS)(
-  IN PVOID  Context,
-  IN PHYSICAL_ADDRESS  BusAddress,
-  IN ULONG  Length,
-  IN OUT PULONG  AddressSpace,
-  OUT PPHYSICAL_ADDRESS  TranslatedAddress);
-
-typedef struct _DMA_ADAPTER* DDKAPI
-(*PGET_DMA_ADAPTER)(
-  IN PVOID  Context,
-  IN struct _DEVICE_DESCRIPTION  *DeviceDescriptor,
-  OUT PULONG  NumberOfMapRegisters);
-
-typedef ULONG DDKAPI
-(*PGET_SET_DEVICE_DATA)(
-  IN PVOID  Context,
-  IN ULONG  DataType,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
-
-typedef union _POWER_STATE {
-  SYSTEM_POWER_STATE  SystemState;
-  DEVICE_POWER_STATE  DeviceState;
-} POWER_STATE, *PPOWER_STATE;
-
-typedef enum _POWER_STATE_TYPE {
-  SystemPowerState,
-  DevicePowerState
-} POWER_STATE_TYPE, *PPOWER_STATE_TYPE;
-
-typedef struct _BUS_INTERFACE_STANDARD {
-  USHORT  Size;
-  USHORT  Version;
-  PVOID  Context;
-  PINTERFACE_REFERENCE  InterfaceReference;
-  PINTERFACE_DEREFERENCE  InterfaceDereference;
-  PTRANSLATE_BUS_ADDRESS  TranslateBusAddress;
-  PGET_DMA_ADAPTER  GetDmaAdapter;
-  PGET_SET_DEVICE_DATA  SetBusData;
-  PGET_SET_DEVICE_DATA  GetBusData;
-} BUS_INTERFACE_STANDARD, *PBUS_INTERFACE_STANDARD;
-
-typedef struct _DEVICE_CAPABILITIES {
-  USHORT  Size;
-  USHORT  Version;
-  ULONG  DeviceD1 : 1;
-  ULONG  DeviceD2 : 1;
-  ULONG  LockSupported : 1;
-  ULONG  EjectSupported : 1;
-  ULONG  Removable : 1;
-  ULONG  DockDevice : 1;
-  ULONG  UniqueID : 1;
-  ULONG  SilentInstall : 1;
-  ULONG  RawDeviceOK : 1;
-  ULONG  SurpriseRemovalOK : 1;
-  ULONG  WakeFromD0 : 1;
-  ULONG  WakeFromD1 : 1;
-  ULONG  WakeFromD2 : 1;
-  ULONG  WakeFromD3 : 1;
-  ULONG  HardwareDisabled : 1;
-  ULONG  NonDynamic : 1;
-  ULONG  WarmEjectSupported : 1;
-  ULONG  NoDisplayInUI : 1;
-  ULONG  Reserved : 14;
-  ULONG  Address;
-  ULONG  UINumber;
-  DEVICE_POWER_STATE  DeviceState[PowerSystemMaximum];
-  SYSTEM_POWER_STATE  SystemWake;
-  DEVICE_POWER_STATE  DeviceWake;
-  ULONG  D1Latency;
-  ULONG  D2Latency;
-  ULONG  D3Latency;
-} DEVICE_CAPABILITIES, *PDEVICE_CAPABILITIES;
-
-typedef struct _DEVICE_INTERFACE_CHANGE_NOTIFICATION {
-  USHORT  Version;
-  USHORT  Size;
-  GUID  Event;
-  GUID  InterfaceClassGuid;
-  PUNICODE_STRING  SymbolicLinkName;
-} DEVICE_INTERFACE_CHANGE_NOTIFICATION, *PDEVICE_INTERFACE_CHANGE_NOTIFICATION;
-
-typedef struct _HWPROFILE_CHANGE_NOTIFICATION {
-  USHORT  Version;
-  USHORT  Size;
-  GUID  Event;
-} HWPROFILE_CHANGE_NOTIFICATION, *PHWPROFILE_CHANGE_NOTIFICATION;
-
-#undef INTERFACE
-
-typedef struct _INTERFACE {
-  USHORT  Size;
-  USHORT  Version;
-  PVOID  Context;
-  PINTERFACE_REFERENCE  InterfaceReference;
-  PINTERFACE_DEREFERENCE  InterfaceDereference;
-} INTERFACE, *PINTERFACE; 
-
-typedef struct _PLUGPLAY_NOTIFICATION_HEADER {
-  USHORT  Version; 
-  USHORT  Size; 
-  GUID  Event;
-} PLUGPLAY_NOTIFICATION_HEADER, *PPLUGPLAY_NOTIFICATION_HEADER;
-
-typedef ULONG PNP_DEVICE_STATE, *PPNP_DEVICE_STATE;
-
-/* PNP_DEVICE_STATE */
-
-#define PNP_DEVICE_DISABLED                      0x00000001
-#define PNP_DEVICE_DONT_DISPLAY_IN_UI            0x00000002
-#define PNP_DEVICE_FAILED                        0x00000004
-#define PNP_DEVICE_REMOVED                       0x00000008
-#define PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED 0x00000010
-#define PNP_DEVICE_NOT_DISABLEABLE               0x00000020
-
-typedef struct _TARGET_DEVICE_CUSTOM_NOTIFICATION {
-  USHORT  Version;
-  USHORT  Size;
-  GUID  Event;
-  struct _FILE_OBJECT  *FileObject;
-  LONG  NameBufferOffset;
-  UCHAR  CustomDataBuffer[1];
-} TARGET_DEVICE_CUSTOM_NOTIFICATION, *PTARGET_DEVICE_CUSTOM_NOTIFICATION;
-
-typedef struct _TARGET_DEVICE_REMOVAL_NOTIFICATION {
-  USHORT  Version;
-  USHORT  Size;
-  GUID  Event;
-  struct _FILE_OBJECT  *FileObject;
-} TARGET_DEVICE_REMOVAL_NOTIFICATION, *PTARGET_DEVICE_REMOVAL_NOTIFICATION;
-
-typedef enum _BUS_QUERY_ID_TYPE {
-  BusQueryDeviceID,
-  BusQueryHardwareIDs,
-  BusQueryCompatibleIDs,
-  BusQueryInstanceID,
-  BusQueryDeviceSerialNumber
-} BUS_QUERY_ID_TYPE, *PBUS_QUERY_ID_TYPE;
-
-typedef enum _DEVICE_TEXT_TYPE {
-  DeviceTextDescription,
-  DeviceTextLocationInformation
-} DEVICE_TEXT_TYPE, *PDEVICE_TEXT_TYPE;
-
-typedef enum _DEVICE_USAGE_NOTIFICATION_TYPE {
-  DeviceUsageTypeUndefined,
-  DeviceUsageTypePaging,
-  DeviceUsageTypeHibernation,
-  DeviceUsageTypeDumpFile
-} DEVICE_USAGE_NOTIFICATION_TYPE;
-
-typedef struct _POWER_SEQUENCE {
-  ULONG  SequenceD1;
-  ULONG  SequenceD2;
-  ULONG  SequenceD3;
-} POWER_SEQUENCE, *PPOWER_SEQUENCE;
-
-typedef enum {
-  DevicePropertyDeviceDescription,
-  DevicePropertyHardwareID,
-  DevicePropertyCompatibleIDs,
-  DevicePropertyBootConfiguration,
-  DevicePropertyBootConfigurationTranslated,
-  DevicePropertyClassName,
-  DevicePropertyClassGuid,
-  DevicePropertyDriverKeyName,
-  DevicePropertyManufacturer,
-  DevicePropertyFriendlyName,
-  DevicePropertyLocationInformation,
-  DevicePropertyPhysicalDeviceObjectName,
-  DevicePropertyBusTypeGuid,
-  DevicePropertyLegacyBusType,
-  DevicePropertyBusNumber,
-  DevicePropertyEnumeratorName,
-  DevicePropertyAddress,
-  DevicePropertyUINumber,
-  DevicePropertyInstallState,
-  DevicePropertyRemovalPolicy
-} DEVICE_REGISTRY_PROPERTY;
-
-typedef enum _IO_NOTIFICATION_EVENT_CATEGORY {
-  EventCategoryReserved,
-  EventCategoryHardwareProfileChange,
-  EventCategoryDeviceInterfaceChange,
-  EventCategoryTargetDeviceChange
-} IO_NOTIFICATION_EVENT_CATEGORY;
-
-#define PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES    0x00000001
-
-typedef NTSTATUS DDKAPI
-(*PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(
-  IN PVOID NotificationStructure,
-  IN PVOID Context);
-
-typedef VOID DDKAPI
-(*PDEVICE_CHANGE_COMPLETE_CALLBACK)(
-  IN PVOID Context);
-
-
-
-/*
-** System structures
-*/
-
-#define SYMBOLIC_LINK_QUERY               0x0001
-#define SYMBOLIC_LINK_ALL_ACCESS          (STANDARD_RIGHTS_REQUIRED | 0x1)
-
-/* also in winnt,h */
-#define DUPLICATE_CLOSE_SOURCE            0x00000001
-#define DUPLICATE_SAME_ACCESS             0x00000002
-#define DUPLICATE_SAME_ATTRIBUTES         0x00000004
-/* end winnt.h */
-
-typedef struct _OBJECT_NAME_INFORMATION {               
-  UNICODE_STRING  Name;                                
-} OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION;   
-
-typedef VOID DDKAPI
-(*PIO_APC_ROUTINE)(
-  IN PVOID ApcContext,
-  IN PIO_STATUS_BLOCK IoStatusBlock,
-  IN ULONG Reserved);
-
-typedef struct _IO_STATUS_BLOCK {
-  _ANONYMOUS_UNION union {
-    NTSTATUS  Status;
-    PVOID  Pointer;
-  } DUMMYUNIONNAME;
-  ULONG_PTR  Information;
-} IO_STATUS_BLOCK;
-
-typedef VOID DDKAPI
-(*PKNORMAL_ROUTINE)(
-  IN PVOID  NormalContext,
-  IN PVOID  SystemArgument1,
-  IN PVOID  SystemArgument2);
-
-typedef VOID DDKAPI
-(*PKKERNEL_ROUTINE)(
-  IN struct _KAPC  *Apc,
-  IN OUT PKNORMAL_ROUTINE  *NormalRoutine,
-  IN OUT PVOID  *NormalContext,
-  IN OUT PVOID  *SystemArgument1,
-  IN OUT PVOID  *SystemArgument2);
-
-typedef VOID DDKAPI
-(*PKRUNDOWN_ROUTINE)(
-  IN struct _KAPC  *Apc);
-
-typedef BOOLEAN DDKAPI
-(*PKTRANSFER_ROUTINE)(
-  VOID);
-
-typedef struct _KAPC {
-  CSHORT  Type;
-  CSHORT  Size;
-  ULONG  Spare0;
-  struct _KTHREAD  *Thread;
-  LIST_ENTRY  ApcListEntry;
-  PKKERNEL_ROUTINE  KernelRoutine;
-  PKRUNDOWN_ROUTINE  RundownRoutine;
-  PKNORMAL_ROUTINE  NormalRoutine;
-  PVOID  NormalContext;
-  PVOID  SystemArgument1;
-  PVOID  SystemArgument2;
-  CCHAR  ApcStateIndex;
-  KPROCESSOR_MODE  ApcMode;
-  BOOLEAN  Inserted;
-} KAPC, *PKAPC, *RESTRICTED_POINTER PRKAPC;
-
-typedef struct _KDEVICE_QUEUE {
-  CSHORT  Type;
-  CSHORT  Size;
-  LIST_ENTRY  DeviceListHead;
-  KSPIN_LOCK  Lock;
-  BOOLEAN  Busy;
-} KDEVICE_QUEUE, *PKDEVICE_QUEUE, *RESTRICTED_POINTER PRKDEVICE_QUEUE;
-
-typedef struct _KDEVICE_QUEUE_ENTRY {
-  LIST_ENTRY  DeviceListEntry;
-  ULONG  SortKey;
-  BOOLEAN  Inserted;
-} KDEVICE_QUEUE_ENTRY, *PKDEVICE_QUEUE_ENTRY,
-*RESTRICTED_POINTER PRKDEVICE_QUEUE_ENTRY;
-
-#define LOCK_QUEUE_WAIT                   1
-#define LOCK_QUEUE_OWNER                  2
-
-typedef enum _KSPIN_LOCK_QUEUE_NUMBER {
-  LockQueueDispatcherLock,
-  LockQueueContextSwapLock,
-  LockQueuePfnLock,
-  LockQueueSystemSpaceLock,
-  LockQueueVacbLock,
-  LockQueueMasterLock,
-  LockQueueNonPagedPoolLock,
-  LockQueueIoCancelLock,
-  LockQueueWorkQueueLock,
-  LockQueueIoVpbLock,
-  LockQueueIoDatabaseLock,
-  LockQueueIoCompletionLock,
-  LockQueueNtfsStructLock,
-  LockQueueAfdWorkQueueLock,
-  LockQueueBcbLock,
-  LockQueueMaximumLock
-} KSPIN_LOCK_QUEUE_NUMBER, *PKSPIN_LOCK_QUEUE_NUMBER;
-
-typedef struct _KSPIN_LOCK_QUEUE {
-  struct _KSPIN_LOCK_QUEUE  *VOLATILE Next;
-  PKSPIN_LOCK VOLATILE  Lock;
-} KSPIN_LOCK_QUEUE, *PKSPIN_LOCK_QUEUE;
-
-typedef struct _KLOCK_QUEUE_HANDLE {
-  KSPIN_LOCK_QUEUE  LockQueue;
-  KIRQL  OldIrql;
-} KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE;
-
-typedef struct _KDPC {
-  CSHORT  Type;
-  UCHAR  Number;
-  UCHAR  Importance;
-  LIST_ENTRY  DpcListEntry;
-  PKDEFERRED_ROUTINE  DeferredRoutine;
-  PVOID  DeferredContext;
-  PVOID  SystemArgument1;
-  PVOID  SystemArgument2;
-  PULONG_PTR  Lock;
-} KDPC, *PKDPC, *RESTRICTED_POINTER PRKDPC;
-
-typedef struct _WAIT_CONTEXT_BLOCK {
-  KDEVICE_QUEUE_ENTRY  WaitQueueEntry;
-  struct _DRIVER_CONTROL  *DeviceRoutine;
-  PVOID  DeviceContext;
-  ULONG  NumberOfMapRegisters;
-  PVOID  DeviceObject;
-  PVOID  CurrentIrp;
-  PKDPC  BufferChainingDpc;
-} WAIT_CONTEXT_BLOCK, *PWAIT_CONTEXT_BLOCK;
-
-typedef struct _DISPATCHER_HEADER {
-  UCHAR  Type;
-  UCHAR  Absolute;
-  UCHAR  Size;
-  UCHAR  Inserted;
-  LONG  SignalState;
-  LIST_ENTRY  WaitListHead;
-} DISPATCHER_HEADER, *PDISPATCHER_HEADER;
-
-typedef struct _KEVENT {
-  DISPATCHER_HEADER  Header;
-} KEVENT, *PKEVENT, *RESTRICTED_POINTER PRKEVENT;
-
-typedef struct _KSEMAPHORE {
-    DISPATCHER_HEADER Header;
-    LONG Limit;
-} KSEMAPHORE, *PKSEMAPHORE, *RESTRICTED_POINTER PRKSEMAPHORE;
-
-typedef struct _FAST_MUTEX {
-  LONG  Count;
-  struct _KTHREAD  *Owner;
-  ULONG  Contention;
-  KEVENT  Event;
-  ULONG  OldIrql;
-} FAST_MUTEX, *PFAST_MUTEX;
-
-typedef struct _KTIMER {
-  DISPATCHER_HEADER  Header;
-  ULARGE_INTEGER  DueTime;
-  LIST_ENTRY  TimerListEntry;
-  struct _KDPC  *Dpc;
-  LONG  Period;
-} KTIMER, *PKTIMER, *RESTRICTED_POINTER PRKTIMER;
-
-typedef struct _KMUTANT {
-  DISPATCHER_HEADER  Header;
-  LIST_ENTRY  MutantListEntry;
-  struct _KTHREAD  *RESTRICTED_POINTER OwnerThread;
-  BOOLEAN  Abandoned;
-  UCHAR  ApcDisable;
-} KMUTANT, *PKMUTANT, *RESTRICTED_POINTER PRKMUTANT, KMUTEX, *PKMUTEX, *RESTRICTED_POINTER PRKMUTEX;
-
-typedef enum _TIMER_TYPE {
-  NotificationTimer,
-  SynchronizationTimer
-} TIMER_TYPE;
-
-#define EVENT_INCREMENT                   1
-#define IO_NO_INCREMENT                   0
-#define IO_CD_ROM_INCREMENT               1
-#define IO_DISK_INCREMENT                 1
-#define IO_KEYBOARD_INCREMENT             6
-#define IO_MAILSLOT_INCREMENT             2
-#define IO_MOUSE_INCREMENT                6
-#define IO_NAMED_PIPE_INCREMENT           2
-#define IO_NETWORK_INCREMENT              2
-#define IO_PARALLEL_INCREMENT             1
-#define IO_SERIAL_INCREMENT               2
-#define IO_SOUND_INCREMENT                8
-#define IO_VIDEO_INCREMENT                1
-#define SEMAPHORE_INCREMENT               1
-
-typedef struct _IRP {
-  CSHORT  Type;
-  USHORT  Size;
-  struct _MDL  *MdlAddress;
-  ULONG  Flags;
-  union {
-    struct _IRP  *MasterIrp;
-    LONG  IrpCount;
-    PVOID  SystemBuffer;
-  } AssociatedIrp;
-  LIST_ENTRY  ThreadListEntry;
-  IO_STATUS_BLOCK  IoStatus;
-  KPROCESSOR_MODE  RequestorMode;
-  BOOLEAN  PendingReturned;
-  CHAR  StackCount;
-  CHAR  CurrentLocation;
-  BOOLEAN  Cancel;
-  KIRQL  CancelIrql;
-  CCHAR  ApcEnvironment;
-  UCHAR  AllocationFlags;
-  PIO_STATUS_BLOCK  UserIosb;
-  PKEVENT  UserEvent;
-  union {
-    struct {
-      PIO_APC_ROUTINE  UserApcRoutine;
-      PVOID  UserApcContext;
-    } AsynchronousParameters;
-    LARGE_INTEGER  AllocationSize;
-  } Overlay;
-  PDRIVER_CANCEL  CancelRoutine;
-  PVOID  UserBuffer;
-  union {
-    struct {
-      _ANONYMOUS_UNION union {
-        KDEVICE_QUEUE_ENTRY  DeviceQueueEntry;
-        _ANONYMOUS_STRUCT struct {
-          PVOID  DriverContext[4];
-        } DUMMYSTRUCTNAME;
-      } DUMMYUNIONNAME;
-      PETHREAD  Thread;
-      PCHAR  AuxiliaryBuffer;
-      _ANONYMOUS_STRUCT struct {
-        LIST_ENTRY  ListEntry;
-        _ANONYMOUS_UNION union {
-          struct _IO_STACK_LOCATION  *CurrentStackLocation;
-          ULONG  PacketType;
-        } DUMMYUNIONNAME;
-      } DUMMYSTRUCTNAME;
-      struct _FILE_OBJECT  *OriginalFileObject;
-    } Overlay;
-    KAPC  Apc;
-    PVOID  CompletionKey;
-  } Tail;
-} IRP;
-typedef struct _IRP *PIRP;
-
-/* IRP.Flags */
-
-#define SL_FORCE_ACCESS_CHECK             0x01
-#define SL_OPEN_PAGING_FILE               0x02
-#define SL_OPEN_TARGET_DIRECTORY          0x04
-#define SL_CASE_SENSITIVE                 0x80
-
-#define SL_KEY_SPECIFIED                  0x01
-#define SL_OVERRIDE_VERIFY_VOLUME         0x02
-#define SL_WRITE_THROUGH                  0x04
-#define SL_FT_SEQUENTIAL_WRITE            0x08
-
-#define SL_FAIL_IMMEDIATELY               0x01
-#define SL_EXCLUSIVE_LOCK                 0x02
-
-#define SL_RESTART_SCAN                   0x01
-#define SL_RETURN_SINGLE_ENTRY            0x02
-#define SL_INDEX_SPECIFIED                0x04
-
-#define SL_WATCH_TREE                     0x01
-
-#define SL_ALLOW_RAW_MOUNT                0x01
-
-#define CTL_CODE(DeviceType, Function, Method, Access)( \
-  ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
-
-#define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16)
-
-enum
-{
-   IRP_NOCACHE = 0x1,
-   IRP_PAGING_IO = 0x2,
-   IRP_MOUNT_COMPLETION = 0x2,
-   IRP_SYNCHRONOUS_API = 0x4,
-   IRP_ASSOCIATED_IRP = 0x8,
-   IRP_BUFFERED_IO = 0x10,
-   IRP_DEALLOCATE_BUFFER = 0x20,
-   IRP_INPUT_OPERATION = 0x40,
-   IRP_SYNCHRONOUS_PAGING_IO = 0x40,
-   IRP_CREATE_OPERATION = 0x80,
-   IRP_READ_OPERATION = 0x100,
-   IRP_WRITE_OPERATION = 0x200,
-   IRP_CLOSE_OPERATION = 0x400,
-   IRP_DEFER_IO_COMPLETION = 0x800,
-   IRP_OB_QUERY_NAME = 0x1000,
-   IRP_HOLD_DEVICE_QUEUE = 0x2000,
-   IRP_RETRY_IO_COMPLETION = 0x4000
-};
-
-
-typedef struct _DRIVE_LAYOUT_INFORMATION_MBR {
-  ULONG  Signature;
-} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR;
-
-typedef struct _DRIVE_LAYOUT_INFORMATION_GPT {
-  GUID  DiskId;
-  LARGE_INTEGER  StartingUsableOffset;
-  LARGE_INTEGER  UsableLength;
-  ULONG  MaxPartitionCount;
-} DRIVE_LAYOUT_INFORMATION_GPT, *PDRIVE_LAYOUT_INFORMATION_GPT;
-
-typedef struct _PARTITION_INFORMATION_MBR {
-  UCHAR  PartitionType;
-  BOOLEAN  BootIndicator;
-  BOOLEAN  RecognizedPartition;
-  ULONG  HiddenSectors;
-} PARTITION_INFORMATION_MBR, *PPARTITION_INFORMATION_MBR;
-
-
-typedef struct _BOOTDISK_INFORMATION {
-  LONGLONG  BootPartitionOffset;
-  LONGLONG  SystemPartitionOffset;
-  ULONG  BootDeviceSignature;
-  ULONG  SystemDeviceSignature;
-} BOOTDISK_INFORMATION, *PBOOTDISK_INFORMATION;
-
-typedef struct _BOOTDISK_INFORMATION_EX {
-  LONGLONG  BootPartitionOffset;
-  LONGLONG  SystemPartitionOffset;
-  ULONG  BootDeviceSignature;
-  ULONG  SystemDeviceSignature;
-  GUID  BootDeviceGuid;
-  GUID  SystemDeviceGuid;
-  BOOLEAN  BootDeviceIsGpt;
-  BOOLEAN  SystemDeviceIsGpt;
-} BOOTDISK_INFORMATION_EX, *PBOOTDISK_INFORMATION_EX;
-
-typedef struct _EISA_MEMORY_TYPE {
-  UCHAR  ReadWrite : 1;
-  UCHAR  Cached : 1;
-  UCHAR  Reserved0 : 1;
-  UCHAR  Type : 2;
-  UCHAR  Shared : 1;
-  UCHAR  Reserved1 : 1;
-  UCHAR  MoreEntries : 1;
-} EISA_MEMORY_TYPE, *PEISA_MEMORY_TYPE;
-
-typedef struct _EISA_MEMORY_CONFIGURATION {
-  EISA_MEMORY_TYPE  ConfigurationByte;
-  UCHAR  DataSize;
-  USHORT  AddressLowWord;
-  UCHAR  AddressHighByte;
-  USHORT  MemorySize;
-} EISA_MEMORY_CONFIGURATION, *PEISA_MEMORY_CONFIGURATION;
-
-typedef struct _EISA_IRQ_DESCRIPTOR {
-  UCHAR  Interrupt : 4;
-  UCHAR  Reserved : 1;
-  UCHAR  LevelTriggered : 1;
-  UCHAR  Shared : 1;
-  UCHAR  MoreEntries : 1;
-} EISA_IRQ_DESCRIPTOR, *PEISA_IRQ_DESCRIPTOR;
-
-typedef struct _EISA_IRQ_CONFIGURATION {
-  EISA_IRQ_DESCRIPTOR  ConfigurationByte;
-  UCHAR  Reserved;
-} EISA_IRQ_CONFIGURATION, *PEISA_IRQ_CONFIGURATION;
-
-typedef struct _DMA_CONFIGURATION_BYTE0 {
-  UCHAR Channel : 3;
-  UCHAR Reserved : 3;
-  UCHAR Shared : 1;
-  UCHAR MoreEntries : 1;
-} DMA_CONFIGURATION_BYTE0;
-
-typedef struct _DMA_CONFIGURATION_BYTE1 {
-  UCHAR  Reserved0 : 2;
-  UCHAR  TransferSize : 2;
-  UCHAR  Timing : 2;
-  UCHAR  Reserved1 : 2;
-} DMA_CONFIGURATION_BYTE1;
-
-typedef struct _EISA_DMA_CONFIGURATION {
-  DMA_CONFIGURATION_BYTE0  ConfigurationByte0;
-  DMA_CONFIGURATION_BYTE1  ConfigurationByte1;
-} EISA_DMA_CONFIGURATION, *PEISA_DMA_CONFIGURATION;
-
-typedef struct _EISA_PORT_DESCRIPTOR {
-  UCHAR  NumberPorts : 5;
-  UCHAR  Reserved : 1;
-  UCHAR  Shared : 1;
-  UCHAR  MoreEntries : 1;
-} EISA_PORT_DESCRIPTOR, *PEISA_PORT_DESCRIPTOR;
-
-typedef struct _EISA_PORT_CONFIGURATION {
-  EISA_PORT_DESCRIPTOR  Configuration;
-  USHORT  PortAddress;
-} EISA_PORT_CONFIGURATION, *PEISA_PORT_CONFIGURATION;
-
-typedef struct _CM_EISA_FUNCTION_INFORMATION {
-  ULONG  CompressedId;
-  UCHAR  IdSlotFlags1;
-  UCHAR  IdSlotFlags2;
-  UCHAR  MinorRevision;
-  UCHAR  MajorRevision;
-  UCHAR  Selections[26];
-  UCHAR  FunctionFlags;
-  UCHAR  TypeString[80];
-  EISA_MEMORY_CONFIGURATION  EisaMemory[9];
-  EISA_IRQ_CONFIGURATION  EisaIrq[7];
-  EISA_DMA_CONFIGURATION  EisaDma[4];
-  EISA_PORT_CONFIGURATION  EisaPort[20];
-  UCHAR  InitializationData[60];
-} CM_EISA_FUNCTION_INFORMATION, *PCM_EISA_FUNCTION_INFORMATION;
-
-/* CM_EISA_FUNCTION_INFORMATION.FunctionFlags */
-
-#define EISA_FUNCTION_ENABLED           0x80
-#define EISA_FREE_FORM_DATA             0x40
-#define EISA_HAS_PORT_INIT_ENTRY        0x20
-#define EISA_HAS_PORT_RANGE             0x10
-#define EISA_HAS_DMA_ENTRY              0x08
-#define EISA_HAS_IRQ_ENTRY              0x04
-#define EISA_HAS_MEMORY_ENTRY           0x02
-#define EISA_HAS_TYPE_ENTRY             0x01
-#define EISA_HAS_INFORMATION \
-  (EISA_HAS_PORT_RANGE + EISA_HAS_DMA_ENTRY + EISA_HAS_IRQ_ENTRY \
-  + EISA_HAS_MEMORY_ENTRY + EISA_HAS_TYPE_ENTRY)
-
-typedef struct _CM_EISA_SLOT_INFORMATION {
-  UCHAR  ReturnCode;
-  UCHAR  ReturnFlags;
-  UCHAR  MajorRevision;
-  UCHAR  MinorRevision;
-  USHORT  Checksum;
-  UCHAR  NumberFunctions;
-  UCHAR  FunctionInformation;
-  ULONG  CompressedId;
-} CM_EISA_SLOT_INFORMATION, *PCM_EISA_SLOT_INFORMATION;
-
-/* CM_EISA_SLOT_INFORMATION.ReturnCode */
-
-#define EISA_INVALID_SLOT               0x80
-#define EISA_INVALID_FUNCTION           0x81
-#define EISA_INVALID_CONFIGURATION      0x82
-#define EISA_EMPTY_SLOT                 0x83
-#define EISA_INVALID_BIOS_CALL          0x86
-
-typedef struct _CM_FLOPPY_DEVICE_DATA {
-  USHORT  Version;
-  USHORT  Revision;
-  CHAR  Size[8];
-  ULONG  MaxDensity;
-  ULONG  MountDensity;
-  UCHAR  StepRateHeadUnloadTime;
-  UCHAR  HeadLoadTime;
-  UCHAR  MotorOffTime;
-  UCHAR  SectorLengthCode;
-  UCHAR  SectorPerTrack;
-  UCHAR  ReadWriteGapLength;
-  UCHAR  DataTransferLength;
-  UCHAR  FormatGapLength;
-  UCHAR  FormatFillCharacter;
-  UCHAR  HeadSettleTime;
-  UCHAR  MotorSettleTime;
-  UCHAR  MaximumTrackValue;
-  UCHAR  DataTransferRate;
-} CM_FLOPPY_DEVICE_DATA, *PCM_FLOPPY_DEVICE_DATA;
-
-typedef enum _INTERFACE_TYPE {
-  InterfaceTypeUndefined = -1,
-  Internal,
-  Isa,
-  Eisa,
-  MicroChannel,
-  TurboChannel,
-  PCIBus,
-  VMEBus,
-  NuBus,
-  PCMCIABus,
-  CBus,
-  MPIBus,
-  MPSABus,
-  ProcessorInternal,
-  InternalPowerBus,
-  PNPISABus,
-  PNPBus,
-  MaximumInterfaceType
-} INTERFACE_TYPE, *PINTERFACE_TYPE;
-
-typedef struct _PNP_BUS_INFORMATION {
-  GUID  BusTypeGuid;
-  INTERFACE_TYPE  LegacyBusType;
-  ULONG  BusNumber;
-} PNP_BUS_INFORMATION, *PPNP_BUS_INFORMATION;
-
-typedef struct _CM_PARTIAL_RESOURCE_DESCRIPTOR {
-  UCHAR Type;
-  UCHAR ShareDisposition;
-  USHORT Flags;
-  union {
-    struct {
-      PHYSICAL_ADDRESS Start;
-      ULONG Length;
-    } Generic;
-    struct {
-      PHYSICAL_ADDRESS Start;
-      ULONG Length;
-    } Port;
-    struct {
-      ULONG Level;
-      ULONG Vector;
-      ULONG Affinity;
-    } Interrupt;
-    struct {
-      PHYSICAL_ADDRESS Start;
-      ULONG Length;
-    } Memory;
-    struct {
-      ULONG Channel;
-      ULONG Port;
-      ULONG Reserved1;
-    } Dma;
-    struct {
-      ULONG Data[3];
-    } DevicePrivate;
-    struct {
-      ULONG Start;
-      ULONG Length;
-      ULONG Reserved;
-    } BusNumber;
-    struct {
-      ULONG DataSize;
-      ULONG Reserved1;
-      ULONG Reserved2;
-    } DeviceSpecificData;
-  } u;
-} CM_PARTIAL_RESOURCE_DESCRIPTOR, *PCM_PARTIAL_RESOURCE_DESCRIPTOR;
-
-/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Type */
-
-#define CmResourceTypeNull                0
-#define CmResourceTypePort                1
-#define CmResourceTypeInterrupt           2
-#define CmResourceTypeMemory              3
-#define CmResourceTypeDma                 4
-#define CmResourceTypeDeviceSpecific      5
-#define CmResourceTypeBusNumber           6
-#define CmResourceTypeMaximum             7
-#define CmResourceTypeNonArbitrated     128
-#define CmResourceTypeConfigData        128
-#define CmResourceTypeDevicePrivate     129
-#define CmResourceTypePcCardConfig      130
-#define CmResourceTypeMfCardConfig      131
-
-/* CM_PARTIAL_RESOURCE_DESCRIPTOR.ShareDisposition */
-
-typedef enum _CM_SHARE_DISPOSITION {
-  CmResourceShareUndetermined,
-  CmResourceShareDeviceExclusive,
-  CmResourceShareDriverExclusive,
-  CmResourceShareShared
-} CM_SHARE_DISPOSITION;
-
-/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypePort */
-
-#define CM_RESOURCE_PORT_MEMORY           0x0000
-#define CM_RESOURCE_PORT_IO               0x0001
-#define CM_RESOURCE_PORT_10_BIT_DECODE    0x0004
-#define CM_RESOURCE_PORT_12_BIT_DECODE    0x0008
-#define CM_RESOURCE_PORT_16_BIT_DECODE    0x0010
-#define CM_RESOURCE_PORT_POSITIVE_DECODE  0x0020
-#define CM_RESOURCE_PORT_PASSIVE_DECODE   0x0040
-#define CM_RESOURCE_PORT_WINDOW_DECODE    0x0080
-
-/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypeInterrupt */
-
-#define CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE 0x0000
-#define CM_RESOURCE_INTERRUPT_LATCHED         0x0001
-
-/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypeMemory */
-
-#define CM_RESOURCE_MEMORY_READ_WRITE     0x0000
-#define CM_RESOURCE_MEMORY_READ_ONLY      0x0001
-#define CM_RESOURCE_MEMORY_WRITE_ONLY     0x0002
-#define CM_RESOURCE_MEMORY_PREFETCHABLE   0x0004
-#define CM_RESOURCE_MEMORY_COMBINEDWRITE  0x0008
-#define CM_RESOURCE_MEMORY_24             0x0010
-#define CM_RESOURCE_MEMORY_CACHEABLE      0x0020
-
-/* CM_PARTIAL_RESOURCE_DESCRIPTOR.Flags if Type = CmResourceTypeDma */
-
-#define CM_RESOURCE_DMA_8                 0x0000
-#define CM_RESOURCE_DMA_16                0x0001
-#define CM_RESOURCE_DMA_32                0x0002
-#define CM_RESOURCE_DMA_8_AND_16          0x0004
-#define CM_RESOURCE_DMA_BUS_MASTER        0x0008
-#define CM_RESOURCE_DMA_TYPE_A            0x0010
-#define CM_RESOURCE_DMA_TYPE_B            0x0020
-#define CM_RESOURCE_DMA_TYPE_F            0x0040
-
-typedef struct _CM_PARTIAL_RESOURCE_LIST {
-  USHORT  Version;
-  USHORT  Revision;
-  ULONG  Count;
-  CM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptors[1];
-} CM_PARTIAL_RESOURCE_LIST, *PCM_PARTIAL_RESOURCE_LIST;
-
-typedef struct _CM_FULL_RESOURCE_DESCRIPTOR {
-  INTERFACE_TYPE  InterfaceType;
-  ULONG  BusNumber;
-  CM_PARTIAL_RESOURCE_LIST  PartialResourceList;
-} CM_FULL_RESOURCE_DESCRIPTOR, *PCM_FULL_RESOURCE_DESCRIPTOR;
-
-typedef struct _CM_RESOURCE_LIST {
-  ULONG  Count;
-  CM_FULL_RESOURCE_DESCRIPTOR  List[1];
-} CM_RESOURCE_LIST, *PCM_RESOURCE_LIST;
-
-typedef struct _CM_INT13_DRIVE_PARAMETER {
-  USHORT  DriveSelect;
-  ULONG  MaxCylinders;
-  USHORT  SectorsPerTrack;
-  USHORT  MaxHeads;
-  USHORT  NumberDrives;
-} CM_INT13_DRIVE_PARAMETER, *PCM_INT13_DRIVE_PARAMETER;
-
-typedef struct _CM_KEYBOARD_DEVICE_DATA {
-  USHORT  Version;
-  USHORT  Revision;
-  UCHAR  Type;
-  UCHAR  Subtype;
-  USHORT  KeyboardFlags;
-} CM_KEYBOARD_DEVICE_DATA, *PCM_KEYBOARD_DEVICE_DATA;
-
-#define KEYBOARD_INSERT_ON                0x80
-#define KEYBOARD_CAPS_LOCK_ON             0x40
-#define KEYBOARD_NUM_LOCK_ON              0x20
-#define KEYBOARD_SCROLL_LOCK_ON           0x10
-#define KEYBOARD_ALT_KEY_DOWN             0x08
-#define KEYBOARD_CTRL_KEY_DOWN            0x04
-#define KEYBOARD_LEFT_SHIFT_DOWN          0x02
-#define KEYBOARD_RIGHT_SHIFT_DOWN         0x01
-
-typedef struct _CM_MCA_POS_DATA {
-  USHORT  AdapterId;
-  UCHAR  PosData1;
-  UCHAR  PosData2;
-  UCHAR  PosData3;
-  UCHAR  PosData4;
-} CM_MCA_POS_DATA, *PCM_MCA_POS_DATA;
-
-typedef struct CM_Power_Data_s {
-  ULONG  PD_Size;
-  DEVICE_POWER_STATE  PD_MostRecentPowerState;
-  ULONG  PD_Capabilities;
-  ULONG  PD_D1Latency;
-  ULONG  PD_D2Latency;
-  ULONG  PD_D3Latency;
-  DEVICE_POWER_STATE  PD_PowerStateMapping[PowerSystemMaximum];
-} CM_POWER_DATA, *PCM_POWER_DATA;
-
-#define PDCAP_D0_SUPPORTED                0x00000001
-#define PDCAP_D1_SUPPORTED                0x00000002
-#define PDCAP_D2_SUPPORTED                0x00000004
-#define PDCAP_D3_SUPPORTED                0x00000008
-#define PDCAP_WAKE_FROM_D0_SUPPORTED      0x00000010
-#define PDCAP_WAKE_FROM_D1_SUPPORTED      0x00000020
-#define PDCAP_WAKE_FROM_D2_SUPPORTED      0x00000040
-#define PDCAP_WAKE_FROM_D3_SUPPORTED      0x00000080
-#define PDCAP_WARM_EJECT_SUPPORTED        0x00000100
-
-typedef struct _CM_SCSI_DEVICE_DATA {
-  USHORT  Version;
-  USHORT  Revision;
-  UCHAR  HostIdentifier;
-} CM_SCSI_DEVICE_DATA, *PCM_SCSI_DEVICE_DATA;
-
-typedef struct _CM_SERIAL_DEVICE_DATA {
-  USHORT  Version;
-  USHORT  Revision;
-  ULONG  BaudClock;
-} CM_SERIAL_DEVICE_DATA, *PCM_SERIAL_DEVICE_DATA;
-
-/* IO_RESOURCE_DESCRIPTOR.Option */
-
-#define IO_RESOURCE_PREFERRED             0x01
-#define IO_RESOURCE_DEFAULT               0x02
-#define IO_RESOURCE_ALTERNATIVE           0x08
-
-typedef struct _IO_RESOURCE_DESCRIPTOR {
-  UCHAR  Option;
-  UCHAR  Type;
-  UCHAR  ShareDisposition;
-  UCHAR  Spare1;
-  USHORT  Flags;
-  USHORT  Spare2;
-  union {
-    struct {
-      ULONG  Length;
-      ULONG  Alignment;
-      PHYSICAL_ADDRESS  MinimumAddress;
-      PHYSICAL_ADDRESS  MaximumAddress;
-    } Port;
-    struct {
-      ULONG  Length;
-      ULONG  Alignment;
-      PHYSICAL_ADDRESS  MinimumAddress;
-      PHYSICAL_ADDRESS  MaximumAddress;
-    } Memory;
-    struct {
-      ULONG  MinimumVector;
-      ULONG  MaximumVector;
-    } Interrupt;
-    struct {
-      ULONG  MinimumChannel;
-      ULONG  MaximumChannel;
-    } Dma;
-    struct {
-      ULONG  Length;
-      ULONG  Alignment;
-      PHYSICAL_ADDRESS  MinimumAddress;
-      PHYSICAL_ADDRESS  MaximumAddress;
-    } Generic;
-    struct {
-      ULONG  Data[3];
-    } DevicePrivate;
-    struct {
-      ULONG  Length;
-      ULONG  MinBusNumber;
-      ULONG  MaxBusNumber;
-      ULONG  Reserved;
-    } BusNumber;
-    struct {
-      ULONG  Priority;
-      ULONG  Reserved1;
-      ULONG  Reserved2;
-    } ConfigData;
-  } u;
-} IO_RESOURCE_DESCRIPTOR, *PIO_RESOURCE_DESCRIPTOR;
-
-typedef struct _IO_RESOURCE_LIST {
-  USHORT  Version;
-  USHORT  Revision;
-  ULONG  Count;
-  IO_RESOURCE_DESCRIPTOR  Descriptors[1];
-} IO_RESOURCE_LIST, *PIO_RESOURCE_LIST;
-
-typedef struct _IO_RESOURCE_REQUIREMENTS_LIST {
-  ULONG  ListSize;
-  INTERFACE_TYPE  InterfaceType;
-  ULONG  BusNumber;
-  ULONG  SlotNumber;
-  ULONG  Reserved[3];
-  ULONG  AlternativeLists;
-  IO_RESOURCE_LIST  List[1];
-} IO_RESOURCE_REQUIREMENTS_LIST, *PIO_RESOURCE_REQUIREMENTS_LIST;
-
-typedef struct _CONTROLLER_OBJECT {
-  CSHORT  Type;
-  CSHORT  Size;
-  PVOID  ControllerExtension;
-  KDEVICE_QUEUE  DeviceWaitQueue;
-  ULONG  Spare1;
-  LARGE_INTEGER  Spare2;
-} CONTROLLER_OBJECT, *PCONTROLLER_OBJECT;
-
-typedef enum _DMA_WIDTH {
-  Width8Bits,
-  Width16Bits,
-  Width32Bits,
-  MaximumDmaWidth
-} DMA_WIDTH, *PDMA_WIDTH;
-
-typedef enum _DMA_SPEED {
-  Compatible,
-  TypeA,
-  TypeB,
-  TypeC,
-  TypeF,
-  MaximumDmaSpeed
-} DMA_SPEED, *PDMA_SPEED;
-
-/* DEVICE_DESCRIPTION.Version */
-
-#define DEVICE_DESCRIPTION_VERSION        0x0000
-#define DEVICE_DESCRIPTION_VERSION1       0x0001
-#define DEVICE_DESCRIPTION_VERSION2       0x0002
-
-typedef struct _DEVICE_DESCRIPTION {
-  ULONG  Version;
-  BOOLEAN  Master;
-  BOOLEAN  ScatterGather;
-  BOOLEAN  DemandMode;
-  BOOLEAN  AutoInitialize;
-  BOOLEAN  Dma32BitAddresses;
-  BOOLEAN  IgnoreCount;
-  BOOLEAN  Reserved1;
-  BOOLEAN  Dma64BitAddresses;
-  ULONG  BusNumber; 
-  ULONG  DmaChannel;
-  INTERFACE_TYPE  InterfaceType;
-  DMA_WIDTH  DmaWidth;
-  DMA_SPEED  DmaSpeed;
-  ULONG  MaximumLength;
-  ULONG  DmaPort;
-} DEVICE_DESCRIPTION, *PDEVICE_DESCRIPTION;
-
-/* VPB.Flags */
-#define VPB_MOUNTED                       0x0001
-#define VPB_LOCKED                        0x0002
-#define VPB_PERSISTENT                    0x0004
-#define VPB_REMOVE_PENDING                0x0008
-#define VPB_RAW_MOUNT                     0x0010
-
-#define MAXIMUM_VOLUME_LABEL_LENGTH       (32 * sizeof(WCHAR))
-
-typedef struct _VPB {
-  CSHORT  Type;
-  CSHORT  Size;
-  USHORT  Flags;
-  USHORT  VolumeLabelLength;
-  struct _DEVICE_OBJECT  *DeviceObject;
-  struct _DEVICE_OBJECT  *RealDevice;
-  ULONG  SerialNumber;
-  ULONG  ReferenceCount;
-  WCHAR  VolumeLabel[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)];
-} VPB, *PVPB;
-
-/* DEVICE_OBJECT.Flags */
-
-#define DO_VERIFY_VOLUME                  0x00000002      
-#define DO_BUFFERED_IO                    0x00000004      
-#define DO_EXCLUSIVE                      0x00000008      
-#define DO_DIRECT_IO                      0x00000010      
-#define DO_MAP_IO_BUFFER                  0x00000020      
-#define DO_DEVICE_HAS_NAME                0x00000040      
-#define DO_DEVICE_INITIALIZING            0x00000080      
-#define DO_SYSTEM_BOOT_PARTITION          0x00000100      
-#define DO_LONG_TERM_REQUESTS             0x00000200      
-#define DO_NEVER_LAST_DEVICE              0x00000400      
-#define DO_SHUTDOWN_REGISTERED            0x00000800      
-#define DO_BUS_ENUMERATED_DEVICE          0x00001000      
-#define DO_POWER_PAGABLE                  0x00002000      
-#define DO_POWER_INRUSH                   0x00004000      
-#define DO_LOW_PRIORITY_FILESYSTEM        0x00010000      
-
-/* DEVICE_OBJECT.Characteristics */
-
-#define FILE_REMOVABLE_MEDIA            0x00000001
-#define FILE_READ_ONLY_DEVICE           0x00000002
-#define FILE_FLOPPY_DISKETTE            0x00000004
-#define FILE_WRITE_ONCE_MEDIA           0x00000008
-#define FILE_REMOTE_DEVICE              0x00000010
-#define FILE_DEVICE_IS_MOUNTED          0x00000020
-#define FILE_VIRTUAL_VOLUME             0x00000040
-#define FILE_AUTOGENERATED_DEVICE_NAME  0x00000080
-#define FILE_DEVICE_SECURE_OPEN         0x00000100
-
-/* DEVICE_OBJECT.AlignmentRequirement */
-
-#define FILE_BYTE_ALIGNMENT             0x00000000
-#define FILE_WORD_ALIGNMENT             0x00000001
-#define FILE_LONG_ALIGNMENT             0x00000003
-#define FILE_QUAD_ALIGNMENT             0x00000007
-#define FILE_OCTA_ALIGNMENT             0x0000000f
-#define FILE_32_BYTE_ALIGNMENT          0x0000001f
-#define FILE_64_BYTE_ALIGNMENT          0x0000003f
-#define FILE_128_BYTE_ALIGNMENT         0x0000007f
-#define FILE_256_BYTE_ALIGNMENT         0x000000ff
-#define FILE_512_BYTE_ALIGNMENT         0x000001ff
-
-/* DEVICE_OBJECT.DeviceType */
-
-#define DEVICE_TYPE ULONG
-
-#define FILE_DEVICE_BEEP                  0x00000001
-#define FILE_DEVICE_CD_ROM                0x00000002
-#define FILE_DEVICE_CD_ROM_FILE_SYSTEM    0x00000003
-#define FILE_DEVICE_CONTROLLER            0x00000004
-#define FILE_DEVICE_DATALINK              0x00000005
-#define FILE_DEVICE_DFS                   0x00000006
-#define FILE_DEVICE_DISK                  0x00000007
-#define FILE_DEVICE_DISK_FILE_SYSTEM      0x00000008
-#define FILE_DEVICE_FILE_SYSTEM           0x00000009
-#define FILE_DEVICE_INPORT_PORT           0x0000000a
-#define FILE_DEVICE_KEYBOARD              0x0000000b
-#define FILE_DEVICE_MAILSLOT              0x0000000c
-#define FILE_DEVICE_MIDI_IN               0x0000000d
-#define FILE_DEVICE_MIDI_OUT              0x0000000e
-#define FILE_DEVICE_MOUSE                 0x0000000f
-#define FILE_DEVICE_MULTI_UNC_PROVIDER    0x00000010
-#define FILE_DEVICE_NAMED_PIPE            0x00000011
-#define FILE_DEVICE_NETWORK               0x00000012
-#define FILE_DEVICE_NETWORK_BROWSER       0x00000013
-#define FILE_DEVICE_NETWORK_FILE_SYSTEM   0x00000014
-#define FILE_DEVICE_NULL                  0x00000015
-#define FILE_DEVICE_PARALLEL_PORT         0x00000016
-#define FILE_DEVICE_PHYSICAL_NETCARD      0x00000017
-#define FILE_DEVICE_PRINTER               0x00000018
-#define FILE_DEVICE_SCANNER               0x00000019
-#define FILE_DEVICE_SERIAL_MOUSE_PORT     0x0000001a
-#define FILE_DEVICE_SERIAL_PORT           0x0000001b
-#define FILE_DEVICE_SCREEN                0x0000001c
-#define FILE_DEVICE_SOUND                 0x0000001d
-#define FILE_DEVICE_STREAMS               0x0000001e
-#define FILE_DEVICE_TAPE                  0x0000001f
-#define FILE_DEVICE_TAPE_FILE_SYSTEM      0x00000020
-#define FILE_DEVICE_TRANSPORT             0x00000021
-#define FILE_DEVICE_UNKNOWN               0x00000022
-#define FILE_DEVICE_VIDEO                 0x00000023
-#define FILE_DEVICE_VIRTUAL_DISK          0x00000024
-#define FILE_DEVICE_WAVE_IN               0x00000025
-#define FILE_DEVICE_WAVE_OUT              0x00000026
-#define FILE_DEVICE_8042_PORT             0x00000027
-#define FILE_DEVICE_NETWORK_REDIRECTOR    0x00000028
-#define FILE_DEVICE_BATTERY               0x00000029
-#define FILE_DEVICE_BUS_EXTENDER          0x0000002a
-#define FILE_DEVICE_MODEM                 0x0000002b
-#define FILE_DEVICE_VDM                   0x0000002c
-#define FILE_DEVICE_MASS_STORAGE          0x0000002d
-#define FILE_DEVICE_SMB                   0x0000002e
-#define FILE_DEVICE_KS                    0x0000002f
-#define FILE_DEVICE_CHANGER               0x00000030
-#define FILE_DEVICE_SMARTCARD             0x00000031
-#define FILE_DEVICE_ACPI                  0x00000032
-#define FILE_DEVICE_DVD                   0x00000033
-#define FILE_DEVICE_FULLSCREEN_VIDEO      0x00000034
-#define FILE_DEVICE_DFS_FILE_SYSTEM       0x00000035
-#define FILE_DEVICE_DFS_VOLUME            0x00000036
-#define FILE_DEVICE_SERENUM               0x00000037
-#define FILE_DEVICE_TERMSRV               0x00000038
-#define FILE_DEVICE_KSEC                  0x00000039
-#define FILE_DEVICE_FIPS		              0x0000003a
-
-typedef struct _DEVICE_OBJECT {
-  CSHORT  Type;
-  USHORT  Size;
-  LONG  ReferenceCount;
-  struct _DRIVER_OBJECT  *DriverObject;
-  struct _DEVICE_OBJECT  *NextDevice;
-  struct _DEVICE_OBJECT  *AttachedDevice;
-  struct _IRP  *CurrentIrp;
-  PIO_TIMER  Timer;
-  ULONG  Flags;
-  ULONG  Characteristics;
-  PVPB  Vpb;
-  PVOID  DeviceExtension;
-  DEVICE_TYPE  DeviceType;
-  CCHAR  StackSize;
-  union {
-    LIST_ENTRY  ListEntry;
-    WAIT_CONTEXT_BLOCK  Wcb;
-  } Queue;
-  ULONG  AlignmentRequirement;
-  KDEVICE_QUEUE  DeviceQueue;
-  KDPC  Dpc;
-  ULONG  ActiveThreadCount;
-  PSECURITY_DESCRIPTOR  SecurityDescriptor;
-  KEVENT  DeviceLock;
-  USHORT  SectorSize;
-  USHORT  Spare1;
-  struct _DEVOBJ_EXTENSION  *DeviceObjectExtension;
-  PVOID  Reserved;
-} DEVICE_OBJECT;
-typedef struct _DEVICE_OBJECT *PDEVICE_OBJECT;
-
-typedef enum _DEVICE_RELATION_TYPE {
-  BusRelations,
-  EjectionRelations,
-  PowerRelations,
-  RemovalRelations,
-  TargetDeviceRelation,
-  SingleBusRelations
-} DEVICE_RELATION_TYPE, *PDEVICE_RELATION_TYPE;
-
-typedef struct _DEVICE_RELATIONS {
-  ULONG  Count;
-  PDEVICE_OBJECT Objects[1];
-} DEVICE_RELATIONS, *PDEVICE_RELATIONS;
-
-typedef struct _SCATTER_GATHER_ELEMENT {
-  PHYSICAL_ADDRESS  Address;   
-  ULONG  Length;          
-  ULONG_PTR  Reserved;
-} SCATTER_GATHER_ELEMENT, *PSCATTER_GATHER_ELEMENT;
-
-typedef struct _SCATTER_GATHER_LIST {
-  ULONG  NumberOfElements;
-  ULONG_PTR  Reserved;
-  SCATTER_GATHER_ELEMENT  Elements[0];
-} SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST;
-
-typedef struct _MDL {
-  struct _MDL  *Next;
-  CSHORT  Size;
-  CSHORT  MdlFlags;
-  struct _EPROCESS  *Process;
-  PVOID  MappedSystemVa;
-  PVOID  StartVa;
-  ULONG  ByteCount;
-  ULONG  ByteOffset;
-} MDL, *PMDL;
-
-#define MDL_MAPPED_TO_SYSTEM_VA           0x0001
-#define MDL_PAGES_LOCKED                  0x0002
-#define MDL_SOURCE_IS_NONPAGED_POOL       0x0004
-#define MDL_ALLOCATED_FIXED_SIZE          0x0008
-#define MDL_PARTIAL                       0x0010
-#define MDL_PARTIAL_HAS_BEEN_MAPPED       0x0020
-#define MDL_IO_PAGE_READ                  0x0040
-#define MDL_WRITE_OPERATION               0x0080
-#define MDL_PARENT_MAPPED_SYSTEM_VA       0x0100
-#define MDL_FREE_EXTRA_PTES               0x0200
-#define MDL_IO_SPACE                      0x0800
-#define MDL_NETWORK_HEADER                0x1000
-#define MDL_MAPPING_CAN_FAIL              0x2000
-#define MDL_ALLOCATED_MUST_SUCCEED        0x4000
-
-#define MDL_MAPPING_FLAGS ( \
-  MDL_MAPPED_TO_SYSTEM_VA     | \
-  MDL_PAGES_LOCKED            | \
-  MDL_SOURCE_IS_NONPAGED_POOL | \
-  MDL_PARTIAL_HAS_BEEN_MAPPED | \
-  MDL_PARENT_MAPPED_SYSTEM_VA | \
-  MDL_SYSTEM_VA               | \
-  MDL_IO_SPACE)
-
-typedef VOID DDKAPI
-(*PPUT_DMA_ADAPTER)(
-  IN PDMA_ADAPTER  DmaAdapter);
-
-typedef PVOID DDKAPI
-(*PALLOCATE_COMMON_BUFFER)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN ULONG  Length,
-  OUT PPHYSICAL_ADDRESS  LogicalAddress,
-  IN BOOLEAN  CacheEnabled);
-
-typedef VOID DDKAPI
-(*PFREE_COMMON_BUFFER)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN ULONG  Length,
-  IN PHYSICAL_ADDRESS  LogicalAddress,
-  IN PVOID  VirtualAddress,
-  IN BOOLEAN  CacheEnabled);
-
-typedef NTSTATUS DDKAPI
-(*PALLOCATE_ADAPTER_CHANNEL)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  NumberOfMapRegisters,
-  IN PDRIVER_CONTROL  ExecutionRoutine,
-  IN PVOID  Context);
-
-typedef BOOLEAN DDKAPI
-(*PFLUSH_ADAPTER_BUFFERS)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PMDL  Mdl,
-  IN PVOID  MapRegisterBase,
-  IN PVOID  CurrentVa,
-  IN ULONG  Length,
-  IN BOOLEAN  WriteToDevice);
-
-typedef VOID DDKAPI
-(*PFREE_ADAPTER_CHANNEL)(
-  IN PDMA_ADAPTER  DmaAdapter);
-
-typedef VOID DDKAPI
-(*PFREE_MAP_REGISTERS)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  PVOID  MapRegisterBase,
-  ULONG  NumberOfMapRegisters);
-
-typedef PHYSICAL_ADDRESS DDKAPI
-(*PMAP_TRANSFER)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PMDL  Mdl,
-  IN PVOID  MapRegisterBase,
-  IN PVOID  CurrentVa,
-  IN OUT PULONG  Length,
-  IN BOOLEAN  WriteToDevice);
-
-typedef ULONG DDKAPI
-(*PGET_DMA_ALIGNMENT)(
-  IN PDMA_ADAPTER  DmaAdapter);
-
-typedef ULONG DDKAPI
-(*PREAD_DMA_COUNTER)(
-  IN PDMA_ADAPTER  DmaAdapter);
-
-typedef NTSTATUS DDKAPI
-(*PGET_SCATTER_GATHER_LIST)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PMDL  Mdl,
-  IN PVOID  CurrentVa,
-  IN ULONG  Length,
-  IN PDRIVER_LIST_CONTROL  ExecutionRoutine,
-  IN PVOID  Context,
-  IN BOOLEAN  WriteToDevice);
-
-typedef VOID DDKAPI
-(*PPUT_SCATTER_GATHER_LIST)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PSCATTER_GATHER_LIST  ScatterGather,
-  IN BOOLEAN  WriteToDevice);
-
-typedef NTSTATUS DDKAPI
-(*PCALCULATE_SCATTER_GATHER_LIST_SIZE)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PMDL  Mdl  OPTIONAL,
-  IN PVOID  CurrentVa,
-  IN ULONG  Length,
-  OUT PULONG  ScatterGatherListSize,
-  OUT PULONG  pNumberOfMapRegisters  OPTIONAL);
-
-typedef NTSTATUS DDKAPI
-(*PBUILD_SCATTER_GATHER_LIST)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PMDL  Mdl,
-  IN PVOID  CurrentVa,
-  IN ULONG  Length,
-  IN PDRIVER_LIST_CONTROL  ExecutionRoutine,
-  IN PVOID  Context,
-  IN BOOLEAN  WriteToDevice,
-  IN PVOID  ScatterGatherBuffer,
-  IN ULONG  ScatterGatherLength);
-
-typedef NTSTATUS DDKAPI
-(*PBUILD_MDL_FROM_SCATTER_GATHER_LIST)(
-  IN PDMA_ADAPTER  DmaAdapter,
-  IN PSCATTER_GATHER_LIST  ScatterGather,
-  IN PMDL  OriginalMdl,
-  OUT PMDL  *TargetMdl);
-
-typedef struct _DMA_OPERATIONS {
-  ULONG  Size;
-  PPUT_DMA_ADAPTER  PutDmaAdapter;
-  PALLOCATE_COMMON_BUFFER  AllocateCommonBuffer;
-  PFREE_COMMON_BUFFER  FreeCommonBuffer;
-  PALLOCATE_ADAPTER_CHANNEL  AllocateAdapterChannel;
-  PFLUSH_ADAPTER_BUFFERS  FlushAdapterBuffers;
-  PFREE_ADAPTER_CHANNEL  FreeAdapterChannel;
-  PFREE_MAP_REGISTERS  FreeMapRegisters;
-  PMAP_TRANSFER  MapTransfer;
-  PGET_DMA_ALIGNMENT  GetDmaAlignment;
-  PREAD_DMA_COUNTER  ReadDmaCounter;
-  PGET_SCATTER_GATHER_LIST  GetScatterGatherList;
-  PPUT_SCATTER_GATHER_LIST  PutScatterGatherList;
-  PCALCULATE_SCATTER_GATHER_LIST_SIZE  CalculateScatterGatherList;
-  PBUILD_SCATTER_GATHER_LIST  BuildScatterGatherList;
-  PBUILD_MDL_FROM_SCATTER_GATHER_LIST  BuildMdlFromScatterGatherList;
-} DMA_OPERATIONS, *PDMA_OPERATIONS;
-
-typedef struct _DMA_ADAPTER {
-  USHORT  Version;
-  USHORT  Size;
-  PDMA_OPERATIONS  DmaOperations;
-} DMA_ADAPTER;
-
-typedef enum _FILE_INFORMATION_CLASS {
-  FileDirectoryInformation = 1,
-  FileFullDirectoryInformation,
-  FileBothDirectoryInformation,
-  FileBasicInformation,
-  FileStandardInformation,
-  FileInternalInformation,
-  FileEaInformation,
-  FileAccessInformation,
-  FileNameInformation,
-  FileRenameInformation,
-  FileLinkInformation,
-  FileNamesInformation,
-  FileDispositionInformation,
-  FilePositionInformation,
-  FileFullEaInformation,
-  FileModeInformation,
-  FileAlignmentInformation,
-  FileAllInformation,
-  FileAllocationInformation,
-  FileEndOfFileInformation,
-  FileAlternateNameInformation,
-  FileStreamInformation,
-  FilePipeInformation,
-  FilePipeLocalInformation,
-  FilePipeRemoteInformation,
-  FileMailslotQueryInformation,
-  FileMailslotSetInformation,
-  FileCompressionInformation,
-  FileObjectIdInformation,
-  FileCompletionInformation,
-  FileMoveClusterInformation,
-  FileQuotaInformation,
-  FileReparsePointInformation,
-  FileNetworkOpenInformation,
-  FileAttributeTagInformation,
-  FileTrackingInformation,
-  FileIdBothDirectoryInformation,
-  FileIdFullDirectoryInformation,
-  FileValidDataLengthInformation,
-  FileShortNameInformation,
-  FileMaximumInformation
-} FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS;
-
-typedef struct _FILE_POSITION_INFORMATION {                 
-  LARGE_INTEGER  CurrentByteOffset;                        
-} FILE_POSITION_INFORMATION, *PFILE_POSITION_INFORMATION;   
-
-typedef struct _FILE_ALIGNMENT_INFORMATION {
-  ULONG  AlignmentRequirement;
-} FILE_ALIGNMENT_INFORMATION;
-
-typedef struct _FILE_NAME_INFORMATION {                     
-  ULONG  FileNameLength;                                   
-  WCHAR  FileName[1];                                      
-} FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION;           
-
-typedef struct FILE_BASIC_INFORMATION {
-  LARGE_INTEGER  CreationTime;
-  LARGE_INTEGER  LastAccessTime;
-  LARGE_INTEGER  LastWriteTime;
-  LARGE_INTEGER  ChangeTime;
-  ULONG  FileAttributes;
-} FILE_BASIC_INFORMATION, *PFILE_BASIC_INFORMATION;
-
-typedef struct _FILE_STANDARD_INFORMATION {
-  LARGE_INTEGER  AllocationSize;
-  LARGE_INTEGER  EndOfFile;
-  ULONG  NumberOfLinks;
-  BOOLEAN  DeletePending;
-  BOOLEAN  Directory;
-} FILE_STANDARD_INFORMATION, *PFILE_STANDARD_INFORMATION;
-
-typedef struct _FILE_NETWORK_OPEN_INFORMATION {                 
-  LARGE_INTEGER  CreationTime;                                 
-  LARGE_INTEGER  LastAccessTime;                               
-  LARGE_INTEGER  LastWriteTime;                                
-  LARGE_INTEGER  ChangeTime;                                   
-  LARGE_INTEGER  AllocationSize;                               
-  LARGE_INTEGER  EndOfFile;                                    
-  ULONG  FileAttributes;                                       
-} FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION;   
-
-typedef struct _FILE_ATTRIBUTE_TAG_INFORMATION {               
-  ULONG  FileAttributes;                                       
-  ULONG  ReparseTag;                                           
-} FILE_ATTRIBUTE_TAG_INFORMATION, *PFILE_ATTRIBUTE_TAG_INFORMATION;
-
-typedef struct _FILE_DISPOSITION_INFORMATION {                  
-  BOOLEAN  DoDeleteFile;                                         
-} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION; 
-                                                                
-typedef struct _FILE_END_OF_FILE_INFORMATION {                  
-  LARGE_INTEGER  EndOfFile;                                    
-} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION; 
-                                                                
-typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION {                                    
-  LARGE_INTEGER  ValidDataLength;                                                      
-} FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION;             
-
-typedef enum _FSINFOCLASS {
-  FileFsVolumeInformation = 1,
-  FileFsLabelInformation,
-  FileFsSizeInformation,
-  FileFsDeviceInformation,
-  FileFsAttributeInformation,
-  FileFsControlInformation,
-  FileFsFullSizeInformation,
-  FileFsObjectIdInformation,
-  FileFsDriverPathInformation,
-  FileFsMaximumInformation
-} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS;
-
-typedef struct _FILE_FS_DEVICE_INFORMATION {
-  DEVICE_TYPE  DeviceType;
-  ULONG  Characteristics;
-} FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION;
-
-typedef struct _FILE_FULL_EA_INFORMATION {
-  ULONG  NextEntryOffset;
-  UCHAR  Flags;
-  UCHAR  EaNameLength;
-  USHORT  EaValueLength;
-  CHAR  EaName[1];
-} FILE_FULL_EA_INFORMATION, *PFILE_FULL_EA_INFORMATION;
-
-typedef ULONG_PTR ERESOURCE_THREAD;
-typedef ERESOURCE_THREAD *PERESOURCE_THREAD;
-
-typedef struct _OWNER_ENTRY {
-  ERESOURCE_THREAD  OwnerThread;
-  _ANONYMOUS_UNION union {
-      LONG  OwnerCount;
-      ULONG  TableSize;
-  } DUMMYUNIONNAME;
-} OWNER_ENTRY, *POWNER_ENTRY;
-
-/* ERESOURCE.Flag */
-
-#define ResourceNeverExclusive            0x0010
-#define ResourceReleaseByOtherThread      0x0020
-#define ResourceOwnedExclusive            0x0080
-
-#define RESOURCE_HASH_TABLE_SIZE          64
-
-typedef struct _ERESOURCE {
-  LIST_ENTRY  SystemResourcesList;
-  POWNER_ENTRY  OwnerTable;
-  SHORT  ActiveCount;
-  USHORT  Flag;
-  PKSEMAPHORE  SharedWaiters;
-  PKEVENT  ExclusiveWaiters;
-  OWNER_ENTRY  OwnerThreads[2];
-  ULONG  ContentionCount;
-  USHORT  NumberOfSharedWaiters;
-  USHORT  NumberOfExclusiveWaiters;
-  _ANONYMOUS_UNION union {
-    PVOID  Address;
-    ULONG_PTR  CreatorBackTraceIndex;
-  } DUMMYUNIONNAME;
-  KSPIN_LOCK  SpinLock;
-} ERESOURCE, *PERESOURCE;
-
-/* NOTE: PVOID for methods to avoid 'assignment from incompatible pointer type' warning */
-typedef struct _DRIVER_EXTENSION {
-  struct _DRIVER_OBJECT  *DriverObject;
-  PVOID  AddDevice;
-  ULONG  Count;
-  UNICODE_STRING  ServiceKeyName;
-} DRIVER_EXTENSION, *PDRIVER_EXTENSION;
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_CHECK_IF_POSSIBLE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN BOOLEAN  Wait,
-  IN ULONG  LockKey,
-  IN BOOLEAN  CheckForReadOperation,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_READ)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN BOOLEAN  Wait,
-  IN ULONG  LockKey,
-  OUT PVOID  Buffer,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_WRITE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN BOOLEAN  Wait,
-  IN ULONG  LockKey,
-  IN PVOID  Buffer,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_QUERY_BASIC_INFO)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN BOOLEAN  Wait,
-  OUT PFILE_BASIC_INFORMATION  Buffer,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_QUERY_STANDARD_INFO)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN BOOLEAN  Wait,
-  OUT PFILE_STANDARD_INFORMATION  Buffer,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_LOCK)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN PLARGE_INTEGER  Length,
-  PEPROCESS  ProcessId,
-  ULONG  Key,
-  BOOLEAN  FailImmediately,
-  BOOLEAN  ExclusiveLock,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_UNLOCK_SINGLE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN PLARGE_INTEGER  Length,
-  PEPROCESS  ProcessId,
-  ULONG  Key,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_UNLOCK_ALL)(
-  IN struct _FILE_OBJECT  *FileObject,
-  PEPROCESS  ProcessId,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_UNLOCK_ALL_BY_KEY)(
-  IN struct _FILE_OBJECT  *FileObject,
-  PVOID  ProcessId,
-  ULONG  Key,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_DEVICE_CONTROL)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN BOOLEAN  Wait,
-  IN PVOID  InputBuffer  OPTIONAL,
-  IN ULONG  InputBufferLength,
-  OUT PVOID  OutputBuffer  OPTIONAL,
-  IN ULONG  OutputBufferLength,
-  IN ULONG  IoControlCode,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef VOID DDKAPI
-(*PFAST_IO_ACQUIRE_FILE)(
-  IN struct _FILE_OBJECT  *FileObject);
-
-typedef VOID DDKAPI
-(*PFAST_IO_RELEASE_FILE)(
-  IN struct _FILE_OBJECT  *FileObject);
-
-typedef VOID DDKAPI
-(*PFAST_IO_DETACH_DEVICE)(
-  IN struct _DEVICE_OBJECT  *SourceDevice,
-  IN struct _DEVICE_OBJECT  *TargetDevice);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_QUERY_NETWORK_OPEN_INFO)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN BOOLEAN  Wait,
-  OUT struct _FILE_NETWORK_OPEN_INFORMATION  *Buffer,
-  OUT struct _IO_STATUS_BLOCK  *IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef NTSTATUS DDKAPI
-(*PFAST_IO_ACQUIRE_FOR_MOD_WRITE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  EndingOffset,
-  OUT struct _ERESOURCE  **ResourceToRelease,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_MDL_READ)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN ULONG  LockKey,
-  OUT PMDL  *MdlChain,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_MDL_READ_COMPLETE)(
-  IN struct _FILE_OBJECT *FileObject,
-  IN PMDL MdlChain,
-  IN struct _DEVICE_OBJECT *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_PREPARE_MDL_WRITE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN ULONG  LockKey,
-  OUT PMDL  *MdlChain,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_MDL_WRITE_COMPLETE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN PMDL  MdlChain,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_READ_COMPRESSED)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN ULONG  LockKey,
-  OUT PVOID  Buffer,
-  OUT PMDL  *MdlChain,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  OUT struct _COMPRESSED_DATA_INFO  *CompressedDataInfo,
-  IN ULONG  CompressedDataInfoLength,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_WRITE_COMPRESSED)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN ULONG  Length,
-  IN ULONG  LockKey,
-  IN PVOID  Buffer,
-  OUT PMDL  *MdlChain,
-  OUT PIO_STATUS_BLOCK  IoStatus,
-  IN struct _COMPRESSED_DATA_INFO  *CompressedDataInfo,
-  IN ULONG  CompressedDataInfoLength,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PMDL  MdlChain,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN PLARGE_INTEGER  FileOffset,
-  IN PMDL  MdlChain,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef BOOLEAN DDKAPI
-(*PFAST_IO_QUERY_OPEN)(
-  IN struct _IRP  *Irp,
-  OUT PFILE_NETWORK_OPEN_INFORMATION  NetworkInformation,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef NTSTATUS DDKAPI
-(*PFAST_IO_RELEASE_FOR_MOD_WRITE)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN struct _ERESOURCE  *ResourceToRelease,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef NTSTATUS DDKAPI
-(*PFAST_IO_ACQUIRE_FOR_CCFLUSH)(
-  IN struct _FILE_OBJECT  *FileObject,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef NTSTATUS DDKAPI
-(*PFAST_IO_RELEASE_FOR_CCFLUSH) (
-  IN struct _FILE_OBJECT  *FileObject,
-  IN struct _DEVICE_OBJECT  *DeviceObject);
-
-typedef struct _FAST_IO_DISPATCH {
-  ULONG  SizeOfFastIoDispatch;
-  PFAST_IO_CHECK_IF_POSSIBLE  FastIoCheckIfPossible;
-  PFAST_IO_READ  FastIoRead;
-  PFAST_IO_WRITE  FastIoWrite;
-  PFAST_IO_QUERY_BASIC_INFO  FastIoQueryBasicInfo;
-  PFAST_IO_QUERY_STANDARD_INFO  FastIoQueryStandardInfo;
-  PFAST_IO_LOCK  FastIoLock;
-  PFAST_IO_UNLOCK_SINGLE  FastIoUnlockSingle;
-  PFAST_IO_UNLOCK_ALL  FastIoUnlockAll;
-  PFAST_IO_UNLOCK_ALL_BY_KEY  FastIoUnlockAllByKey;
-  PFAST_IO_DEVICE_CONTROL  FastIoDeviceControl;
-  PFAST_IO_ACQUIRE_FILE  AcquireFileForNtCreateSection;
-  PFAST_IO_RELEASE_FILE  ReleaseFileForNtCreateSection;
-  PFAST_IO_DETACH_DEVICE  FastIoDetachDevice;
-  PFAST_IO_QUERY_NETWORK_OPEN_INFO  FastIoQueryNetworkOpenInfo;
-  PFAST_IO_ACQUIRE_FOR_MOD_WRITE  AcquireForModWrite;
-  PFAST_IO_MDL_READ  MdlRead;
-  PFAST_IO_MDL_READ_COMPLETE  MdlReadComplete;
-  PFAST_IO_PREPARE_MDL_WRITE  PrepareMdlWrite;
-  PFAST_IO_MDL_WRITE_COMPLETE  MdlWriteComplete;
-  PFAST_IO_READ_COMPRESSED  FastIoReadCompressed;
-  PFAST_IO_WRITE_COMPRESSED  FastIoWriteCompressed;
-  PFAST_IO_MDL_READ_COMPLETE_COMPRESSED  MdlReadCompleteCompressed;
-  PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED  MdlWriteCompleteCompressed;
-  PFAST_IO_QUERY_OPEN  FastIoQueryOpen;
-  PFAST_IO_RELEASE_FOR_MOD_WRITE  ReleaseForModWrite;
-  PFAST_IO_ACQUIRE_FOR_CCFLUSH  AcquireForCcFlush;
-  PFAST_IO_RELEASE_FOR_CCFLUSH  ReleaseForCcFlush;
-} FAST_IO_DISPATCH, *PFAST_IO_DISPATCH;
-
-/* NOTE: PVOID for methods to avoid 'assignment from incompatible pointer type' warning */
-typedef struct _DRIVER_OBJECT {
-  CSHORT  Type;
-  CSHORT  Size;
-  PDEVICE_OBJECT  DeviceObject;
-  ULONG  Flags;
-  PVOID  DriverStart;
-  ULONG  DriverSize;
-  PVOID  DriverSection;
-  PDRIVER_EXTENSION  DriverExtension;
-  UNICODE_STRING  DriverName;
-  PUNICODE_STRING  HardwareDatabase;
-  PVOID  FastIoDispatch;
-  PVOID  DriverInit;
-  PVOID  DriverStartIo;
-  PVOID  DriverUnload;
-  PVOID  MajorFunction[IRP_MJ_MAXIMUM_FUNCTION + 1];
-} DRIVER_OBJECT;
-typedef struct _DRIVER_OBJECT *PDRIVER_OBJECT;
-
-typedef struct _SECTION_OBJECT_POINTERS {
-  PVOID  DataSectionObject;
-  PVOID  SharedCacheMap;
-  PVOID  ImageSectionObject;
-} SECTION_OBJECT_POINTERS, *PSECTION_OBJECT_POINTERS;
-
-typedef struct _IO_COMPLETION_CONTEXT {
-  PVOID  Port;
-  PVOID  Key;
-} IO_COMPLETION_CONTEXT, *PIO_COMPLETION_CONTEXT;
-
-/* FILE_OBJECT.Flags */
-
-#define FO_FILE_OPEN                      0x00000001
-#define FO_SYNCHRONOUS_IO                 0x00000002
-#define FO_ALERTABLE_IO                   0x00000004
-#define FO_NO_INTERMEDIATE_BUFFERING      0x00000008
-#define FO_WRITE_THROUGH                  0x00000010
-#define FO_SEQUENTIAL_ONLY                0x00000020
-#define FO_CACHE_SUPPORTED                0x00000040
-#define FO_NAMED_PIPE                     0x00000080
-#define FO_STREAM_FILE                    0x00000100
-#define FO_MAILSLOT                       0x00000200
-#define FO_GENERATE_AUDIT_ON_CLOSE        0x00000400
-#define FO_DIRECT_DEVICE_OPEN             0x00000800
-#define FO_FILE_MODIFIED                  0x00001000
-#define FO_FILE_SIZE_CHANGED              0x00002000
-#define FO_CLEANUP_COMPLETE               0x00004000
-#define FO_TEMPORARY_FILE                 0x00008000
-#define FO_DELETE_ON_CLOSE                0x00010000
-#define FO_OPENED_CASE_SENSITIVE          0x00020000
-#define FO_HANDLE_CREATED                 0x00040000
-#define FO_FILE_FAST_IO_READ              0x00080000
-#define FO_RANDOM_ACCESS                  0x00100000
-#define FO_FILE_OPEN_CANCELLED            0x00200000
-#define FO_VOLUME_OPEN                    0x00400000
-#define FO_FILE_OBJECT_HAS_EXTENSION      0x00800000
-#define FO_REMOTE_ORIGIN                  0x01000000
-
-typedef struct _FILE_OBJECT {
-  CSHORT  Type;
-  CSHORT  Size;
-  PDEVICE_OBJECT  DeviceObject;
-  PVPB  Vpb;
-  PVOID  FsContext;
-  PVOID  FsContext2;
-  PSECTION_OBJECT_POINTERS  SectionObjectPointer;
-  PVOID  PrivateCacheMap;
-  NTSTATUS  FinalStatus;
-  struct _FILE_OBJECT  *RelatedFileObject;
-  BOOLEAN  LockOperation;
-  BOOLEAN  DeletePending;
-  BOOLEAN  ReadAccess;
-  BOOLEAN  WriteAccess;
-  BOOLEAN  DeleteAccess;
-  BOOLEAN  SharedRead;
-  BOOLEAN  SharedWrite;
-  BOOLEAN  SharedDelete;
-  ULONG  Flags;
-  UNICODE_STRING  FileName;
-  LARGE_INTEGER  CurrentByteOffset;
-  ULONG  Waiters;
-  ULONG  Busy;
-  PVOID  LastLock;
-  KEVENT  Lock;
-  KEVENT  Event;
-  PIO_COMPLETION_CONTEXT  CompletionContext;
-} FILE_OBJECT;
-typedef struct _FILE_OBJECT *PFILE_OBJECT;
-
-typedef enum _SECURITY_OPERATION_CODE {
-  SetSecurityDescriptor,
-  QuerySecurityDescriptor,
-  DeleteSecurityDescriptor,
-  AssignSecurityDescriptor
-} SECURITY_OPERATION_CODE, *PSECURITY_OPERATION_CODE;
-
-#define INITIAL_PRIVILEGE_COUNT           3
-
-typedef struct _INITIAL_PRIVILEGE_SET {
-  ULONG  PrivilegeCount;
-  ULONG  Control;
-  LUID_AND_ATTRIBUTES  Privilege[INITIAL_PRIVILEGE_COUNT];
-} INITIAL_PRIVILEGE_SET, * PINITIAL_PRIVILEGE_SET;
-
-typedef struct _SECURITY_SUBJECT_CONTEXT {
-  PACCESS_TOKEN  ClientToken;
-  SECURITY_IMPERSONATION_LEVEL  ImpersonationLevel;
-  PACCESS_TOKEN  PrimaryToken;
-  PVOID  ProcessAuditId;
-} SECURITY_SUBJECT_CONTEXT, *PSECURITY_SUBJECT_CONTEXT;
-
-typedef struct _ACCESS_STATE {
-  LUID  OperationID;
-  BOOLEAN  SecurityEvaluated;
-  BOOLEAN  GenerateAudit;
-  BOOLEAN  GenerateOnClose;
-  BOOLEAN  PrivilegesAllocated;
-  ULONG  Flags;
-  ACCESS_MASK  RemainingDesiredAccess;
-  ACCESS_MASK  PreviouslyGrantedAccess;
-  ACCESS_MASK  OriginalDesiredAccess;
-  SECURITY_SUBJECT_CONTEXT  SubjectSecurityContext;
-  PSECURITY_DESCRIPTOR  SecurityDescriptor;
-  PVOID  AuxData;
-  union {
-    INITIAL_PRIVILEGE_SET  InitialPrivilegeSet;
-    PRIVILEGE_SET  PrivilegeSet;
-  } Privileges;
-
-  BOOLEAN  AuditPrivileges;
-  UNICODE_STRING  ObjectName;
-  UNICODE_STRING  ObjectTypeName;
-} ACCESS_STATE, *PACCESS_STATE;
-
-typedef struct _IO_SECURITY_CONTEXT {
-  PSECURITY_QUALITY_OF_SERVICE  SecurityQos;
-  PACCESS_STATE  AccessState;
-  ACCESS_MASK  DesiredAccess;
-  ULONG  FullCreateOptions;
-} IO_SECURITY_CONTEXT, *PIO_SECURITY_CONTEXT;
-
-struct _IO_CSQ;
-
-typedef struct _IO_CSQ_IRP_CONTEXT {
-  ULONG  Type;
-  struct _IRP  *Irp;
-  struct _IO_CSQ  *Csq;
-} IO_CSQ_IRP_CONTEXT, *PIO_CSQ_IRP_CONTEXT;
-
-typedef VOID DDKAPI
-(*PIO_CSQ_INSERT_IRP)(
-  IN struct _IO_CSQ  *Csq,
-  IN PIRP  Irp);
-
-typedef VOID DDKAPI
-(*PIO_CSQ_REMOVE_IRP)(
-  IN struct _IO_CSQ  *Csq,
-  IN PIRP  Irp);
-
-typedef PIRP DDKAPI
-(*PIO_CSQ_PEEK_NEXT_IRP)(
-  IN struct _IO_CSQ  *Csq,
-  IN PIRP  Irp,
-  IN PVOID  PeekContext);
-
-typedef VOID DDKAPI
-(*PIO_CSQ_ACQUIRE_LOCK)(
-  IN  struct _IO_CSQ  *Csq,
-  OUT PKIRQL  Irql);
-
-typedef VOID DDKAPI
-(*PIO_CSQ_RELEASE_LOCK)(
-  IN struct _IO_CSQ  *Csq,
-  IN KIRQL  Irql);
-
-typedef VOID DDKAPI
-(*PIO_CSQ_COMPLETE_CANCELED_IRP)(
-  IN  struct _IO_CSQ  *Csq,
-  IN  PIRP  Irp);
-
-typedef struct _IO_CSQ {
-  ULONG  Type;
-  PIO_CSQ_INSERT_IRP  CsqInsertIrp;
-  PIO_CSQ_REMOVE_IRP  CsqRemoveIrp;
-  PIO_CSQ_PEEK_NEXT_IRP  CsqPeekNextIrp;
-  PIO_CSQ_ACQUIRE_LOCK  CsqAcquireLock;
-  PIO_CSQ_RELEASE_LOCK  CsqReleaseLock;
-  PIO_CSQ_COMPLETE_CANCELED_IRP  CsqCompleteCanceledIrp;
-  PVOID  ReservePointer;
-} IO_CSQ, *PIO_CSQ;
-
-typedef struct _IO_STACK_LOCATION {
-  UCHAR  MajorFunction;
-  UCHAR  MinorFunction;
-  UCHAR  Flags;
-  UCHAR  Control;
-  union {
-    struct {
-      PIO_SECURITY_CONTEXT  SecurityContext;
-      ULONG  Options;
-      USHORT POINTER_ALIGNMENT  FileAttributes;
-      USHORT  ShareAccess;
-      ULONG POINTER_ALIGNMENT  EaLength;
-    } Create;
-    struct {
-      ULONG  Length;
-      ULONG POINTER_ALIGNMENT  Key;
-      LARGE_INTEGER  ByteOffset;
-    } Read;
-    struct {
-      ULONG  Length;
-      ULONG POINTER_ALIGNMENT  Key;
-      LARGE_INTEGER  ByteOffset;
-    } Write;
-    struct {
-      ULONG  Length;
-      FILE_INFORMATION_CLASS POINTER_ALIGNMENT  FileInformationClass;
-    } QueryFile;
-    struct {
-      ULONG  Length;
-      FILE_INFORMATION_CLASS POINTER_ALIGNMENT  FileInformationClass;
-      PFILE_OBJECT  FileObject;
-      _ANONYMOUS_UNION union {
-        _ANONYMOUS_STRUCT struct {
-          BOOLEAN  ReplaceIfExists;
-          BOOLEAN  AdvanceOnly;
-        } DUMMYSTRUCTNAME;
-        ULONG  ClusterCount;
-        HANDLE  DeleteHandle;
-      } DUMMYUNIONNAME;
-    } SetFile;
-    struct {
-      ULONG  Length;
-      FS_INFORMATION_CLASS POINTER_ALIGNMENT  FsInformationClass;
-    } QueryVolume;
-    struct {
-      ULONG  OutputBufferLength;
-      ULONG POINTER_ALIGNMENT  InputBufferLength;
-      ULONG POINTER_ALIGNMENT  IoControlCode;
-      PVOID  Type3InputBuffer;
-    } DeviceIoControl;
-    struct {
-      SECURITY_INFORMATION  SecurityInformation;
-      ULONG POINTER_ALIGNMENT  Length;
-    } QuerySecurity;
-    struct {
-      SECURITY_INFORMATION  SecurityInformation;
-      PSECURITY_DESCRIPTOR  SecurityDescriptor;
-    } SetSecurity;
-    struct {
-      PVPB  Vpb;
-      PDEVICE_OBJECT  DeviceObject;
-    } MountVolume;
-    struct {
-      PVPB  Vpb;
-      PDEVICE_OBJECT  DeviceObject;
-    } VerifyVolume;
-    struct {
-      struct _SCSI_REQUEST_BLOCK  *Srb;
-    } Scsi;
-    struct {
-      DEVICE_RELATION_TYPE  Type;
-    } QueryDeviceRelations;
-    struct {
-      CONST GUID  *InterfaceType;
-      USHORT  Size;
-      USHORT  Version;
-      PINTERFACE  Interface;
-      PVOID  InterfaceSpecificData;
-    } QueryInterface;
-    struct {
-      PDEVICE_CAPABILITIES  Capabilities;
-    } DeviceCapabilities;
-    struct {
-      PIO_RESOURCE_REQUIREMENTS_LIST  IoResourceRequirementList;
-    } FilterResourceRequirements;
-    struct {
-      ULONG  WhichSpace;
-      PVOID  Buffer;
-      ULONG  Offset;
-      ULONG POINTER_ALIGNMENT  Length;
-    } ReadWriteConfig;
-    struct {
-      BOOLEAN  Lock;
-    } SetLock;
-    struct {
-      BUS_QUERY_ID_TYPE  IdType;
-    } QueryId;
-    struct {
-      DEVICE_TEXT_TYPE  DeviceTextType;
-      LCID POINTER_ALIGNMENT  LocaleId;
-    } QueryDeviceText;
-    struct {
-      BOOLEAN  InPath;
-      BOOLEAN  Reserved[3];
-      DEVICE_USAGE_NOTIFICATION_TYPE POINTER_ALIGNMENT  Type;
-    } UsageNotification;
-    struct {
-      SYSTEM_POWER_STATE  PowerState;
-    } WaitWake;
-    struct {
-      PPOWER_SEQUENCE  PowerSequence;
-    } PowerSequence;
-    struct {
-      ULONG  SystemContext;
-      POWER_STATE_TYPE POINTER_ALIGNMENT  Type;
-      POWER_STATE POINTER_ALIGNMENT  State;
-      POWER_ACTION POINTER_ALIGNMENT  ShutdownType;
-    } Power;
-    struct {
-      PCM_RESOURCE_LIST  AllocatedResources;
-      PCM_RESOURCE_LIST  AllocatedResourcesTranslated;
-    } StartDevice;
-    struct {
-      ULONG_PTR  ProviderId;
-      PVOID  DataPath;
-      ULONG  BufferSize;
-      PVOID  Buffer;
-    } WMI;
-    struct {
-      PVOID  Argument1;
-      PVOID  Argument2;
-      PVOID  Argument3;
-      PVOID  Argument4;
-    } Others;
-  } Parameters;
-  PDEVICE_OBJECT  DeviceObject;
-  PFILE_OBJECT  FileObject;
-  PIO_COMPLETION_ROUTINE  CompletionRoutine;
-  PVOID  Context;
-} IO_STACK_LOCATION, *PIO_STACK_LOCATION;
-
-/* IO_STACK_LOCATION.Control */
-
-#define SL_PENDING_RETURNED               0x01
-#define SL_INVOKE_ON_CANCEL               0x20
-#define SL_INVOKE_ON_SUCCESS              0x40
-#define SL_INVOKE_ON_ERROR                0x80
-
-typedef enum _KEY_INFORMATION_CLASS {
-  KeyBasicInformation,
-  KeyNodeInformation,
-  KeyFullInformation,
-  KeyNameInformation,
-  KeyCachedInformation,
-  KeyFlagsInformation
-} KEY_INFORMATION_CLASS;
-
-typedef struct _KEY_BASIC_INFORMATION {
-  LARGE_INTEGER  LastWriteTime;
-  ULONG  TitleIndex;
-  ULONG  NameLength;
-  WCHAR  Name[1];
-} KEY_BASIC_INFORMATION, *PKEY_BASIC_INFORMATION;
-
-typedef struct _KEY_FULL_INFORMATION {
-  LARGE_INTEGER  LastWriteTime;
-  ULONG  TitleIndex;
-  ULONG  ClassOffset;
-  ULONG  ClassLength;
-  ULONG  SubKeys;
-  ULONG  MaxNameLen;
-  ULONG  MaxClassLen;
-  ULONG  Values;
-  ULONG  MaxValueNameLen;
-  ULONG  MaxValueDataLen;
-  WCHAR  Class[1];
-} KEY_FULL_INFORMATION, *PKEY_FULL_INFORMATION;
-
-typedef struct _KEY_NODE_INFORMATION {
-  LARGE_INTEGER  LastWriteTime;
-  ULONG  TitleIndex;
-  ULONG  ClassOffset;
-  ULONG  ClassLength;
-  ULONG  NameLength;
-  WCHAR  Name[1];
-} KEY_NODE_INFORMATION, *PKEY_NODE_INFORMATION;
-
-typedef struct _KEY_VALUE_BASIC_INFORMATION {
-  ULONG  TitleIndex;
-  ULONG  Type;
-  ULONG  NameLength;
-  WCHAR  Name[1];
-} KEY_VALUE_BASIC_INFORMATION, *PKEY_VALUE_BASIC_INFORMATION;
-
-typedef struct _KEY_VALUE_FULL_INFORMATION {
-  ULONG  TitleIndex;
-  ULONG  Type;
-  ULONG  DataOffset;
-  ULONG  DataLength;
-  ULONG  NameLength;
-  WCHAR  Name[1];
-} KEY_VALUE_FULL_INFORMATION, *PKEY_VALUE_FULL_INFORMATION;
-
-typedef struct _KEY_VALUE_PARTIAL_INFORMATION {
-  ULONG  TitleIndex;
-  ULONG  Type;
-  ULONG  DataLength;
-  UCHAR  Data[1];
-} KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION;
-
-typedef struct _KEY_VALUE_PARTIAL_INFORMATION_ALIGN64 {
-  ULONG  Type;
-  ULONG  DataLength;
-  UCHAR  Data[1];
-} KEY_VALUE_PARTIAL_INFORMATION_ALIGN64, *PKEY_VALUE_PARTIAL_INFORMATION_ALIGN64;
-
-typedef struct _KEY_VALUE_ENTRY {
-  PUNICODE_STRING  ValueName;
-  ULONG  DataLength;
-  ULONG  DataOffset;
-  ULONG  Type;
-} KEY_VALUE_ENTRY, *PKEY_VALUE_ENTRY;
-
-typedef enum _KEY_VALUE_INFORMATION_CLASS {
-  KeyValueBasicInformation,
-  KeyValueFullInformation,
-  KeyValuePartialInformation,
-  KeyValueFullInformationAlign64,
-  KeyValuePartialInformationAlign64
-} KEY_VALUE_INFORMATION_CLASS;
-
-/* KEY_VALUE_Xxx.Type */
-
-#define REG_NONE                           0
-#define REG_SZ                             1
-#define REG_EXPAND_SZ                      2
-#define REG_BINARY                         3
-#define REG_DWORD                          4
-#define REG_DWORD_LITTLE_ENDIAN            4
-#define REG_DWORD_BIG_ENDIAN               5
-#define REG_LINK                           6
-#define REG_MULTI_SZ                       7
-#define REG_RESOURCE_LIST                  8
-#define REG_FULL_RESOURCE_DESCRIPTOR       9
-#define REG_RESOURCE_REQUIREMENTS_LIST    10
-#define REG_QWORD                         11
-#define REG_QWORD_LITTLE_ENDIAN           11
-
-#define PCI_TYPE0_ADDRESSES               6
-#define PCI_TYPE1_ADDRESSES               2
-#define PCI_TYPE2_ADDRESSES               5
-
-typedef struct _PCI_COMMON_CONFIG {
-  USHORT  VendorID;
-  USHORT  DeviceID;
-  USHORT  Command;
-  USHORT  Status;
-  UCHAR  RevisionID;
-  UCHAR  ProgIf;
-  UCHAR  SubClass;
-  UCHAR  BaseClass;
-  UCHAR  CacheLineSize;
-  UCHAR  LatencyTimer;
-  UCHAR  HeaderType;
-  UCHAR  BIST;
-  union {
-    struct _PCI_HEADER_TYPE_0 {
-      ULONG  BaseAddresses[PCI_TYPE0_ADDRESSES];
-      ULONG  CIS;
-      USHORT  SubVendorID;
-      USHORT  SubSystemID;
-      ULONG  ROMBaseAddress;
-      UCHAR  CapabilitiesPtr;
-      UCHAR  Reserved1[3];
-      ULONG  Reserved2;
-      UCHAR  InterruptLine;
-      UCHAR  InterruptPin;
-      UCHAR  MinimumGrant;
-      UCHAR  MaximumLatency;
-    } type0;
-      struct _PCI_HEADER_TYPE_1 {
-        ULONG  BaseAddresses[PCI_TYPE1_ADDRESSES];
-        UCHAR  PrimaryBus;
-        UCHAR  SecondaryBus;
-        UCHAR  SubordinateBus;
-        UCHAR  SecondaryLatency;
-        UCHAR  IOBase;
-        UCHAR  IOLimit;
-        USHORT  SecondaryStatus;
-        USHORT  MemoryBase;
-        USHORT  MemoryLimit;
-        USHORT  PrefetchBase;
-        USHORT  PrefetchLimit;
-        ULONG  PrefetchBaseUpper32;
-        ULONG  PrefetchLimitUpper32;
-        USHORT  IOBaseUpper16;
-        USHORT  IOLimitUpper16;
-        UCHAR  CapabilitiesPtr;
-        UCHAR  Reserved1[3];
-        ULONG  ROMBaseAddress;
-        UCHAR  InterruptLine;
-        UCHAR  InterruptPin;
-        USHORT  BridgeControl;
-      } type1;
-      struct _PCI_HEADER_TYPE_2 {
-        ULONG  SocketRegistersBaseAddress;
-        UCHAR  CapabilitiesPtr;
-        UCHAR  Reserved;
-        USHORT  SecondaryStatus;
-        UCHAR  PrimaryBus;
-        UCHAR  SecondaryBus;
-        UCHAR  SubordinateBus;
-        UCHAR  SecondaryLatency;
-        struct {
-          ULONG  Base;
-          ULONG  Limit;
-        } Range[PCI_TYPE2_ADDRESSES - 1];
-        UCHAR  InterruptLine;
-        UCHAR  InterruptPin;
-        USHORT  BridgeControl;
-      } type2;
-  } u;
-  UCHAR  DeviceSpecific[192];
-} PCI_COMMON_CONFIG, *PPCI_COMMON_CONFIG;
-
-/* PCI_COMMON_CONFIG.Command */
-
-#define PCI_ENABLE_IO_SPACE               0x0001
-#define PCI_ENABLE_MEMORY_SPACE           0x0002
-#define PCI_ENABLE_BUS_MASTER             0x0004
-#define PCI_ENABLE_SPECIAL_CYCLES         0x0008
-#define PCI_ENABLE_WRITE_AND_INVALIDATE   0x0010
-#define PCI_ENABLE_VGA_COMPATIBLE_PALETTE 0x0020
-#define PCI_ENABLE_PARITY                 0x0040
-#define PCI_ENABLE_WAIT_CYCLE             0x0080
-#define PCI_ENABLE_SERR                   0x0100
-#define PCI_ENABLE_FAST_BACK_TO_BACK      0x0200
-
-/* PCI_COMMON_CONFIG.Status */
-
-#define PCI_STATUS_CAPABILITIES_LIST      0x0010
-#define PCI_STATUS_66MHZ_CAPABLE          0x0020
-#define PCI_STATUS_UDF_SUPPORTED          0x0040
-#define PCI_STATUS_FAST_BACK_TO_BACK      0x0080
-#define PCI_STATUS_DATA_PARITY_DETECTED   0x0100
-#define PCI_STATUS_DEVSEL                 0x0600
-#define PCI_STATUS_SIGNALED_TARGET_ABORT  0x0800
-#define PCI_STATUS_RECEIVED_TARGET_ABORT  0x1000
-#define PCI_STATUS_RECEIVED_MASTER_ABORT  0x2000
-#define PCI_STATUS_SIGNALED_SYSTEM_ERROR  0x4000
-#define PCI_STATUS_DETECTED_PARITY_ERROR  0x8000
-
-/* PCI_COMMON_CONFIG.HeaderType */
-
-#define PCI_MULTIFUNCTION                 0x80
-#define PCI_DEVICE_TYPE                   0x00
-#define PCI_BRIDGE_TYPE                   0x01
-#define PCI_CARDBUS_BRIDGE_TYPE           0x02
-
-#define PCI_CONFIGURATION_TYPE(PciData) \
-  (((PPCI_COMMON_CONFIG) (PciData))->HeaderType & ~PCI_MULTIFUNCTION)
-
-#define PCI_MULTIFUNCTION_DEVICE(PciData) \
-  ((((PPCI_COMMON_CONFIG) (PciData))->HeaderType & PCI_MULTIFUNCTION) != 0)
-
-typedef struct _PCI_SLOT_NUMBER {
-  union {
-    struct {
-      ULONG  DeviceNumber : 5;
-      ULONG  FunctionNumber : 3;
-      ULONG  Reserved : 24;
-    } bits;
-    ULONG  AsULONG;
-  } u;
-} PCI_SLOT_NUMBER, *PPCI_SLOT_NUMBER;
-
-typedef enum _POOL_TYPE {
-  NonPagedPool,
-  PagedPool,
-  NonPagedPoolMustSucceed,
-  DontUseThisType,
-  NonPagedPoolCacheAligned,
-  PagedPoolCacheAligned,
-  NonPagedPoolCacheAlignedMustS,
-	MaxPoolType,
-	NonPagedPoolSession = 32,
-	PagedPoolSession,
-	NonPagedPoolMustSucceedSession,
-	DontUseThisTypeSession,
-	NonPagedPoolCacheAlignedSession,
-	PagedPoolCacheAlignedSession,
-	NonPagedPoolCacheAlignedMustSSession
-} POOL_TYPE;
-
-typedef enum _EX_POOL_PRIORITY {
-  LowPoolPriority,
-  LowPoolPrioritySpecialPoolOverrun = 8,
-  LowPoolPrioritySpecialPoolUnderrun = 9,
-  NormalPoolPriority = 16,
-  NormalPoolPrioritySpecialPoolOverrun = 24,
-  NormalPoolPrioritySpecialPoolUnderrun = 25,
-  HighPoolPriority = 32,
-  HighPoolPrioritySpecialPoolOverrun = 40,
-  HighPoolPrioritySpecialPoolUnderrun = 41
-} EX_POOL_PRIORITY;
-
-/* PRIVILEGE_SET.Control */
-
-#define PRIVILEGE_SET_ALL_NECESSARY       1
-
-typedef struct _RTL_OSVERSIONINFOW {
-  ULONG  dwOSVersionInfoSize;
-  ULONG  dwMajorVersion;
-  ULONG  dwMinorVersion;
-  ULONG  dwBuildNumber;
-  ULONG  dwPlatformId;
-  WCHAR  szCSDVersion[128];
-} RTL_OSVERSIONINFOW, *PRTL_OSVERSIONINFOW;
-
-typedef struct _RTL_OSVERSIONINFOEXW {
-  ULONG  dwOSVersionInfoSize;
-  ULONG  dwMajorVersion;
-  ULONG  dwMinorVersion;
-  ULONG  dwBuildNumber;
-  ULONG  dwPlatformId;
-  WCHAR  szCSDVersion[128];
-  USHORT  wServicePackMajor;
-  USHORT  wServicePackMinor;
-  USHORT  wSuiteMask;
-  UCHAR  wProductType;
-  UCHAR  wReserved;
-} RTL_OSVERSIONINFOEXW, *PRTL_OSVERSIONINFOEXW;
-
-NTOSAPI
-ULONGLONG
-DDKAPI
-VerSetConditionMask(
-  IN ULONGLONG  ConditionMask,
-  IN ULONG  TypeMask,
-  IN UCHAR  Condition);
-
-#define VER_SET_CONDITION(ConditionMask, TypeBitMask, ComparisonType)  \
-        ((ConditionMask) = VerSetConditionMask((ConditionMask), \
-        (TypeBitMask), (ComparisonType)))
-
-/* RtlVerifyVersionInfo() TypeMask */
-
-#define VER_MINORVERSION                  0x0000001
-#define VER_MAJORVERSION                  0x0000002
-#define VER_BUILDNUMBER                   0x0000004
-#define VER_PLATFORMID                    0x0000008
-#define VER_SERVICEPACKMINOR              0x0000010
-#define VER_SERVICEPACKMAJOR              0x0000020
-#define VER_SUITENAME                     0x0000040
-#define VER_PRODUCT_TYPE                  0x0000080
-
-/* RtlVerifyVersionInfo() ComparisonType */
-
-#define VER_EQUAL                       1
-#define VER_GREATER                     2
-#define VER_GREATER_EQUAL               3
-#define VER_LESS                        4
-#define VER_LESS_EQUAL                  5
-#define VER_AND                         6
-#define VER_OR                          7
-
-#define VER_CONDITION_MASK              7
-#define VER_NUM_BITS_PER_CONDITION_MASK 3
-
-typedef struct _RTL_BITMAP {
-  ULONG  SizeOfBitMap;
-  PULONG  Buffer;
-} RTL_BITMAP, *PRTL_BITMAP;
-
-typedef struct _RTL_BITMAP_RUN {
-    ULONG  StartingIndex;
-    ULONG  NumberOfBits;
-} RTL_BITMAP_RUN, *PRTL_BITMAP_RUN;
-
-typedef NTSTATUS DDKAPI
-(*PRTL_QUERY_REGISTRY_ROUTINE)(
-  IN PWSTR  ValueName,
-  IN ULONG  ValueType,
-  IN PVOID  ValueData,
-  IN ULONG  ValueLength,
-  IN PVOID  Context,
-  IN PVOID  EntryContext);
-
-#define RTL_REGISTRY_ABSOLUTE             0
-#define RTL_REGISTRY_SERVICES             1
-#define RTL_REGISTRY_CONTROL              2
-#define RTL_REGISTRY_WINDOWS_NT           3
-#define RTL_REGISTRY_DEVICEMAP            4
-#define RTL_REGISTRY_USER                 5
-
-/* RTL_QUERY_REGISTRY_TABLE.Flags */
-#define RTL_QUERY_REGISTRY_SUBKEY         0x00000001
-#define RTL_QUERY_REGISTRY_TOPKEY         0x00000002
-#define RTL_QUERY_REGISTRY_REQUIRED       0x00000004
-#define RTL_QUERY_REGISTRY_NOVALUE        0x00000008
-#define RTL_QUERY_REGISTRY_NOEXPAND       0x00000010
-#define RTL_QUERY_REGISTRY_DIRECT         0x00000020
-#define RTL_QUERY_REGISTRY_DELETE         0x00000040
-
-typedef struct _RTL_QUERY_REGISTRY_TABLE {
-  PRTL_QUERY_REGISTRY_ROUTINE  QueryRoutine;
-  ULONG  Flags;
-  PWSTR  Name;
-  PVOID  EntryContext;
-  ULONG  DefaultType;
-  PVOID  DefaultData;
-  ULONG  DefaultLength;
-} RTL_QUERY_REGISTRY_TABLE, *PRTL_QUERY_REGISTRY_TABLE;
-
-typedef struct _TIME_FIELDS {
-  CSHORT  Year;
-  CSHORT  Month;
-  CSHORT  Day;
-  CSHORT  Hour;
-  CSHORT  Minute;
-  CSHORT  Second;
-  CSHORT  Milliseconds;
-  CSHORT  Weekday;
-} TIME_FIELDS, *PTIME_FIELDS;
-
-typedef PVOID DDKAPI
-(*PALLOCATE_FUNCTION)(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  Tag);
-
-typedef VOID DDKAPI
-(*PFREE_FUNCTION)(
-  IN PVOID  Buffer);
-
-#define GENERAL_LOOKASIDE_S \
-  SLIST_HEADER  ListHead; \
-  USHORT  Depth; \
-  USHORT  MaximumDepth; \
-  ULONG  TotalAllocates; \
-  _ANONYMOUS_UNION union { \
-    ULONG  AllocateMisses; \
-    ULONG  AllocateHits; \
-  } DUMMYUNIONNAME; \
-  ULONG  TotalFrees; \
-  _ANONYMOUS_UNION union { \
-    ULONG  FreeMisses; \
-    ULONG  FreeHits; \
-  } DUMMYUNIONNAME2; \
-  POOL_TYPE  Type; \
-  ULONG  Tag; \
-  ULONG  Size; \
-  PALLOCATE_FUNCTION  Allocate; \
-  PFREE_FUNCTION  Free; \
-  LIST_ENTRY  ListEntry; \
-  ULONG  LastTotalAllocates; \
-  _ANONYMOUS_UNION union { \
-    ULONG  LastAllocateMisses; \
-    ULONG  LastAllocateHits; \
-  } DUMMYUNIONNAME3; \
-  ULONG Future[2];
-
-typedef struct _GENERAL_LOOKASIDE {
-  GENERAL_LOOKASIDE_S
-} GENERAL_LOOKASIDE, *PGENERAL_LOOKASIDE;
-
-typedef struct _NPAGED_LOOKASIDE_LIST {
-  GENERAL_LOOKASIDE_S
-  KSPIN_LOCK  Obsoleted;
-} NPAGED_LOOKASIDE_LIST, *PNPAGED_LOOKASIDE_LIST;
-
-typedef struct _PAGED_LOOKASIDE_LIST {
-  GENERAL_LOOKASIDE_S
-  FAST_MUTEX  Obsoleted;
-} PAGED_LOOKASIDE_LIST, *PPAGED_LOOKASIDE_LIST;
-
-typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT;
-
-typedef VOID DDKAPI (*PCALLBACK_FUNCTION)(
-  IN PVOID  CallbackContext,
-  IN PVOID  Argument1,
-  IN PVOID  Argument2);
-
-typedef enum _EVENT_TYPE {
-  NotificationEvent,
-  SynchronizationEvent
-} EVENT_TYPE;
-
-typedef enum _KWAIT_REASON {
-  Executive,
-  FreePage,
-  PageIn,
-  PoolAllocation,
-  DelayExecution,
-  Suspended,
-  UserRequest,
-  WrExecutive,
-  WrFreePage,
-  WrPageIn,
-  WrPoolAllocation,
-  WrDelayExecution,
-  WrSuspended,
-  WrUserRequest,
-  WrEventPair,
-  WrQueue,
-  WrLpcReceive,
-  WrLpcReply,
-  WrVirtualMemory,
-  WrPageOut,
-  WrRendezvous,
-  Spare2,
-  Spare3,
-  Spare4,
-  Spare5,
-  Spare6,
-  WrKernel,
-  MaximumWaitReason
-} KWAIT_REASON;
-
-typedef struct _KWAIT_BLOCK {
-  LIST_ENTRY  WaitListEntry;
-  struct _KTHREAD * RESTRICTED_POINTER  Thread;
-  PVOID  Object;
-  struct _KWAIT_BLOCK * RESTRICTED_POINTER  NextWaitBlock;
-  USHORT  WaitKey;
-  USHORT  WaitType;
-} KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK;
-
-typedef struct _IO_REMOVE_LOCK_TRACKING_BLOCK * PIO_REMOVE_LOCK_TRACKING_BLOCK;
-
-typedef struct _IO_REMOVE_LOCK_COMMON_BLOCK {
-  BOOLEAN  Removed;
-  BOOLEAN  Reserved[3];
-  LONG  IoCount;
-  KEVENT  RemoveEvent;
-} IO_REMOVE_LOCK_COMMON_BLOCK;
-
-typedef struct _IO_REMOVE_LOCK_DBG_BLOCK {
-  LONG  Signature;
-  LONG  HighWatermark;
-  LONGLONG  MaxLockedTicks;
-  LONG  AllocateTag;
-  LIST_ENTRY  LockList;
-  KSPIN_LOCK  Spin;
-  LONG  LowMemoryCount;
-  ULONG  Reserved1[4];
-  PVOID  Reserved2;
-  PIO_REMOVE_LOCK_TRACKING_BLOCK  Blocks;
-} IO_REMOVE_LOCK_DBG_BLOCK;
-
-typedef struct _IO_REMOVE_LOCK {
-  IO_REMOVE_LOCK_COMMON_BLOCK  Common;
-#if DBG
-  IO_REMOVE_LOCK_DBG_BLOCK  Dbg;
-#endif
-} IO_REMOVE_LOCK, *PIO_REMOVE_LOCK;
-
-typedef struct _IO_WORKITEM *PIO_WORKITEM;
-
-typedef VOID DDKAPI
-(*PIO_WORKITEM_ROUTINE)(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PVOID  Context);
-
-typedef struct _SHARE_ACCESS {
-  ULONG  OpenCount;
-  ULONG  Readers;
-  ULONG  Writers;
-  ULONG  Deleters;
-  ULONG  SharedRead;
-  ULONG  SharedWrite;
-  ULONG  SharedDelete;
-} SHARE_ACCESS, *PSHARE_ACCESS;
-
-typedef enum _KINTERRUPT_MODE {
-  LevelSensitive,
-  Latched
-} KINTERRUPT_MODE;
-
-typedef VOID DDKAPI
-(*PKINTERRUPT_ROUTINE)(
-  VOID);
-
-typedef enum _KPROFILE_SOURCE {
-  ProfileTime,
-  ProfileAlignmentFixup,
-  ProfileTotalIssues,
-  ProfilePipelineDry,
-  ProfileLoadInstructions,
-  ProfilePipelineFrozen,
-  ProfileBranchInstructions,
-  ProfileTotalNonissues,
-  ProfileDcacheMisses,
-  ProfileIcacheMisses,
-  ProfileCacheMisses,
-  ProfileBranchMispredictions,
-  ProfileStoreInstructions,
-  ProfileFpInstructions,
-  ProfileIntegerInstructions,
-  Profile2Issue,
-  Profile3Issue,
-  Profile4Issue,
-  ProfileSpecialInstructions,
-  ProfileTotalCycles,
-  ProfileIcacheIssues,
-  ProfileDcacheAccesses,
-  ProfileMemoryBarrierCycles,
-  ProfileLoadLinkedIssues,
-  ProfileMaximum
-} KPROFILE_SOURCE;
-
-typedef enum _CREATE_FILE_TYPE {
-  CreateFileTypeNone,
-  CreateFileTypeNamedPipe,
-  CreateFileTypeMailslot
-} CREATE_FILE_TYPE;
-
-typedef struct _CONFIGURATION_INFORMATION {
-  ULONG  DiskCount;
-  ULONG  FloppyCount;
-  ULONG  CdRomCount;
-  ULONG  TapeCount;
-  ULONG  ScsiPortCount;
-  ULONG  SerialCount;
-  ULONG  ParallelCount;
-  BOOLEAN  AtDiskPrimaryAddressClaimed;
-  BOOLEAN  AtDiskSecondaryAddressClaimed;
-  ULONG  Version;
-  ULONG  MediumChangerCount;
-} CONFIGURATION_INFORMATION, *PCONFIGURATION_INFORMATION;
-
-typedef enum _CONFIGURATION_TYPE {
-  ArcSystem,
-  CentralProcessor,
-  FloatingPointProcessor,
-  PrimaryIcache,
-  PrimaryDcache,
-  SecondaryIcache,
-  SecondaryDcache,
-  SecondaryCache,
-  EisaAdapter,
-  TcAdapter,
-  ScsiAdapter,
-  DtiAdapter,
-  MultiFunctionAdapter,
-  DiskController,
-  TapeController,
-  CdromController,
-  WormController,
-  SerialController,
-  NetworkController,
-  DisplayController,
-  ParallelController,
-  PointerController,
-  KeyboardController,
-  AudioController,
-  OtherController,
-  DiskPeripheral,
-  FloppyDiskPeripheral,
-  TapePeripheral,
-  ModemPeripheral,
-  MonitorPeripheral,
-  PrinterPeripheral,
-  PointerPeripheral,
-  KeyboardPeripheral,
-  TerminalPeripheral,
-  OtherPeripheral,
-  LinePeripheral,
-  NetworkPeripheral,
-  SystemMemory,
-  DockingInformation,
-  RealModeIrqRoutingTable,
-  MaximumType
-} CONFIGURATION_TYPE, *PCONFIGURATION_TYPE;
-
-typedef NTSTATUS (*PIO_QUERY_DEVICE_ROUTINE)(
-  IN PVOID  Context,
-  IN PUNICODE_STRING  PathName,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  BusNumber,
-  IN PKEY_VALUE_FULL_INFORMATION  *BusInformation,
-  IN CONFIGURATION_TYPE  ControllerType,
-  IN ULONG  ControllerNumber,
-  IN PKEY_VALUE_FULL_INFORMATION  *ControllerInformation,
-  IN CONFIGURATION_TYPE  PeripheralType,
-  IN ULONG  PeripheralNumber,
-  IN PKEY_VALUE_FULL_INFORMATION  *PeripheralInformation);
-
-typedef enum _WORK_QUEUE_TYPE {
-  CriticalWorkQueue,
-  DelayedWorkQueue,
-  HyperCriticalWorkQueue,
-  MaximumWorkQueue
-} WORK_QUEUE_TYPE;
-
-typedef VOID DDKAPI
-(*PWORKER_THREAD_ROUTINE)(
-  IN PVOID Parameter);
-
-typedef struct _WORK_QUEUE_ITEM {
-  LIST_ENTRY  List;
-  PWORKER_THREAD_ROUTINE  WorkerRoutine;
-  PVOID  Parameter;
-} WORK_QUEUE_ITEM, *PWORK_QUEUE_ITEM;
-
-typedef enum _KBUGCHECK_BUFFER_DUMP_STATE {
-    BufferEmpty,
-    BufferInserted,
-    BufferStarted,
-    BufferFinished,
-    BufferIncomplete
-} KBUGCHECK_BUFFER_DUMP_STATE;
-
-typedef VOID DDKAPI
-(*PKBUGCHECK_CALLBACK_ROUTINE)(
-  IN PVOID  Buffer,
-  IN ULONG  Length);
-
-typedef struct _KBUGCHECK_CALLBACK_RECORD {
-  LIST_ENTRY  Entry;
-  PKBUGCHECK_CALLBACK_ROUTINE  CallbackRoutine;
-  PVOID  Buffer;
-  ULONG  Length;
-  PUCHAR  Component;
-  ULONG_PTR  Checksum;
-  UCHAR  State;
-} KBUGCHECK_CALLBACK_RECORD, *PKBUGCHECK_CALLBACK_RECORD;
-
-/*
- * VOID
- * KeInitializeCallbackRecord(
- *   IN PKBUGCHECK_CALLBACK_RECORD  CallbackRecord)
- */
-#define KeInitializeCallbackRecord(CallbackRecord) \
-  CallbackRecord->State = BufferEmpty;
-
-typedef enum _KDPC_IMPORTANCE {
-  LowImportance,
-  MediumImportance,
-  HighImportance
-} KDPC_IMPORTANCE;
-
-typedef enum _MEMORY_CACHING_TYPE_ORIG {
-  MmFrameBufferCached = 2
-} MEMORY_CACHING_TYPE_ORIG;
-
-typedef enum _MEMORY_CACHING_TYPE {
-  MmNonCached = FALSE,
-  MmCached = TRUE,
-  MmWriteCombined = MmFrameBufferCached,
-  MmHardwareCoherentCached,
-  MmNonCachedUnordered,
-  MmUSWCCached,
-  MmMaximumCacheType
-} MEMORY_CACHING_TYPE;
-
-typedef enum _MM_PAGE_PRIORITY {
-  LowPagePriority,
-  NormalPagePriority = 16,
-  HighPagePriority = 32
-} MM_PAGE_PRIORITY;
-
-typedef enum _LOCK_OPERATION {
-  IoReadAccess,
-  IoWriteAccess,
-  IoModifyAccess
-} LOCK_OPERATION;
-
-typedef enum _MM_SYSTEM_SIZE {
-  MmSmallSystem,
-  MmMediumSystem,
-  MmLargeSystem
-} MM_SYSTEM_SIZE;
-
-typedef struct _OBJECT_HANDLE_INFORMATION {
-  ULONG HandleAttributes;
-  ACCESS_MASK GrantedAccess;
-} OBJECT_HANDLE_INFORMATION, *POBJECT_HANDLE_INFORMATION;
-
-typedef struct _CLIENT_ID {
-  HANDLE  UniqueProcess;
-  HANDLE  UniqueThread;
-} CLIENT_ID, *PCLIENT_ID;
-
-typedef VOID DDKAPI
-(*PKSTART_ROUTINE)(
-  IN PVOID  StartContext);
-
-typedef VOID DDKAPI
-(*PCREATE_PROCESS_NOTIFY_ROUTINE)(
-  IN HANDLE  ParentId,
-  IN HANDLE  ProcessId,
-  IN BOOLEAN  Create);
-
-typedef VOID DDKAPI
-(*PCREATE_THREAD_NOTIFY_ROUTINE)(
-  IN HANDLE  ProcessId,
-  IN HANDLE  ThreadId,
-  IN BOOLEAN  Create);
-
-typedef struct _IMAGE_INFO {
-  _ANONYMOUS_UNION union {
-    ULONG  Properties;
-    _ANONYMOUS_STRUCT struct {
-      ULONG  ImageAddressingMode  : 8;
-      ULONG  SystemModeImage      : 1;
-      ULONG  ImageMappedToAllPids : 1;
-      ULONG  Reserved             : 22;
-    } DUMMYSTRUCTNAME;
-  } DUMMYUNIONNAME;
-  PVOID  ImageBase;
-  ULONG  ImageSelector;
-  SIZE_T  ImageSize;
-  ULONG  ImageSectionNumber;
-} IMAGE_INFO, *PIMAGE_INFO;
-
-#define IMAGE_ADDRESSING_MODE_32BIT       3
-
-typedef VOID DDKAPI
-(*PLOAD_IMAGE_NOTIFY_ROUTINE)(
-  IN PUNICODE_STRING  FullImageName,
-  IN HANDLE  ProcessId,
-  IN PIMAGE_INFO  ImageInfo);
-
-typedef enum _PROCESSINFOCLASS {
-  ProcessBasicInformation,
-  ProcessQuotaLimits,
-  ProcessIoCounters,
-  ProcessVmCounters,
-  ProcessTimes,
-  ProcessBasePriority,
-  ProcessRaisePriority,
-  ProcessDebugPort,
-  ProcessExceptionPort,
-  ProcessAccessToken,
-  ProcessLdtInformation,
-  ProcessLdtSize,
-  ProcessDefaultHardErrorMode,
-  ProcessIoPortHandlers,
-  ProcessPooledUsageAndLimits,
-  ProcessWorkingSetWatch,
-  ProcessUserModeIOPL,
-  ProcessEnableAlignmentFaultFixup,
-  ProcessPriorityClass,
-  ProcessWx86Information,
-  ProcessHandleCount,
-  ProcessAffinityMask,
-  ProcessPriorityBoost,
-  ProcessDeviceMap,
-  ProcessSessionInformation,
-  ProcessForegroundInformation,
-  ProcessWow64Information,
-  ProcessImageFileName,
-  ProcessLUIDDeviceMapsEnabled,
-  ProcessBreakOnTermination,
-  ProcessDebugObjectHandle,
-  ProcessDebugFlags,
-  ProcessHandleTracing,
-  MaxProcessInfoClass
-} PROCESSINFOCLASS;
-
-typedef enum _THREADINFOCLASS {
-  ThreadBasicInformation,
-  ThreadTimes,
-  ThreadPriority,
-  ThreadBasePriority,
-  ThreadAffinityMask,
-  ThreadImpersonationToken,
-  ThreadDescriptorTableEntry,
-  ThreadEnableAlignmentFaultFixup,
-  ThreadEventPair_Reusable,
-  ThreadQuerySetWin32StartAddress,
-  ThreadZeroTlsCell,
-  ThreadPerformanceCount,
-  ThreadAmILastThread,
-  ThreadIdealProcessor,
-  ThreadPriorityBoost,
-  ThreadSetTlsArrayAddress,
-  ThreadIsIoPending,
-  ThreadHideFromDebugger,
-  ThreadBreakOnTermination,
-  MaxThreadInfoClass
-} THREADINFOCLASS;
-
-#define ES_SYSTEM_REQUIRED                0x00000001
-#define ES_DISPLAY_REQUIRED               0x00000002
-#define ES_USER_PRESENT                   0x00000004
-#define ES_CONTINUOUS                     0x80000000
-
-typedef ULONG EXECUTION_STATE;
-
-typedef VOID DDKAPI
-(*PREQUEST_POWER_COMPLETE)(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN UCHAR  MinorFunction,
-  IN POWER_STATE  PowerState,
-  IN PVOID  Context,
-  IN PIO_STATUS_BLOCK  IoStatus);
-
-typedef enum _TRACE_INFORMATION_CLASS {
-  TraceIdClass,
-  TraceHandleClass,
-  TraceEnableFlagsClass,
-  TraceEnableLevelClass,
-  GlobalLoggerHandleClass,
-  EventLoggerHandleClass,
-  AllLoggerHandlesClass,
-  TraceHandleByNameClass
-} TRACE_INFORMATION_CLASS;
-
-typedef NTSTATUS DDKAPI
-(*PEX_CALLBACK_FUNCTION)(
-  IN PVOID  CallbackContext,
-  IN PVOID  Argument1,
-  IN PVOID  Argument2);
-
-
-
-/*
-** Storage structures
-*/
-typedef enum _PARTITION_STYLE {
-  PARTITION_STYLE_MBR,
-  PARTITION_STYLE_GPT
-} PARTITION_STYLE;
-
-typedef struct _CREATE_DISK_MBR {
-  ULONG  Signature;
-} CREATE_DISK_MBR, *PCREATE_DISK_MBR;
-
-typedef struct _CREATE_DISK_GPT {
-  GUID  DiskId;
-  ULONG  MaxPartitionCount;
-} CREATE_DISK_GPT, *PCREATE_DISK_GPT;
-
-typedef struct _CREATE_DISK {
-  PARTITION_STYLE  PartitionStyle;
-  _ANONYMOUS_UNION union {
-    CREATE_DISK_MBR  Mbr;
-    CREATE_DISK_GPT  Gpt;
-  } DUMMYUNIONNAME;
-} CREATE_DISK, *PCREATE_DISK;
-
-typedef struct _DISK_SIGNATURE {
-  ULONG  PartitionStyle;
-  _ANONYMOUS_UNION union {
-    struct {
-      ULONG  Signature;
-      ULONG  CheckSum;
-    } Mbr;
-    struct {
-      GUID  DiskId;
-    } Gpt;
-  } DUMMYUNIONNAME;
-} DISK_SIGNATURE, *PDISK_SIGNATURE;
-
-typedef VOID DDKFASTAPI
-(*PTIME_UPDATE_NOTIFY_ROUTINE)(
-  IN HANDLE  ThreadId,
-  IN KPROCESSOR_MODE  Mode);
-
-#define DBG_STATUS_CONTROL_C              1
-#define DBG_STATUS_SYSRQ                  2
-#define DBG_STATUS_BUGCHECK_FIRST         3
-#define DBG_STATUS_BUGCHECK_SECOND        4
-#define DBG_STATUS_FATAL                  5
-#define DBG_STATUS_DEBUG_CONTROL          6
-#define DBG_STATUS_WORKER                 7
-
-typedef struct _PHYSICAL_MEMORY_RANGE {
-  PHYSICAL_ADDRESS  BaseAddress;
-  LARGE_INTEGER  NumberOfBytes;
-} PHYSICAL_MEMORY_RANGE, *PPHYSICAL_MEMORY_RANGE;
-
-typedef ULONG_PTR
-(*PDRIVER_VERIFIER_THUNK_ROUTINE)(
-  IN PVOID  Context);
-
-typedef struct _DRIVER_VERIFIER_THUNK_PAIRS {
-  PDRIVER_VERIFIER_THUNK_ROUTINE  PristineRoutine;
-  PDRIVER_VERIFIER_THUNK_ROUTINE  NewRoutine;
-} DRIVER_VERIFIER_THUNK_PAIRS, *PDRIVER_VERIFIER_THUNK_PAIRS;
-
-#define DRIVER_VERIFIER_SPECIAL_POOLING             0x0001
-#define DRIVER_VERIFIER_FORCE_IRQL_CHECKING         0x0002
-#define DRIVER_VERIFIER_INJECT_ALLOCATION_FAILURES  0x0004
-#define DRIVER_VERIFIER_TRACK_POOL_ALLOCATIONS      0x0008
-#define DRIVER_VERIFIER_IO_CHECKING                 0x0010
-
-#define RTL_RANGE_LIST_ADD_IF_CONFLICT    0x00000001
-#define RTL_RANGE_LIST_ADD_SHARED         0x00000002
-
-#define RTL_RANGE_LIST_SHARED_OK          0x00000001
-#define RTL_RANGE_LIST_NULL_CONFLICT_OK   0x00000002
-
-#define RTL_RANGE_LIST_SHARED_OK          0x00000001
-#define RTL_RANGE_LIST_NULL_CONFLICT_OK   0x00000002
-
-#define RTL_RANGE_LIST_MERGE_IF_CONFLICT  RTL_RANGE_LIST_ADD_IF_CONFLICT
-
-typedef struct _RTL_RANGE {
-  ULONGLONG  Start;
-  ULONGLONG  End;
-  PVOID  UserData;
-  PVOID  Owner;
-  UCHAR  Attributes;
-  UCHAR  Flags;
-} RTL_RANGE, *PRTL_RANGE;
-
-#define RTL_RANGE_SHARED                  0x01
-#define RTL_RANGE_CONFLICT                0x02
-
-typedef struct _RTL_RANGE_LIST {
-  LIST_ENTRY  ListHead;
-  ULONG  Flags;
-  ULONG  Count;
-  ULONG  Stamp;
-} RTL_RANGE_LIST, *PRTL_RANGE_LIST;
-
-typedef struct _RANGE_LIST_ITERATOR {
-  PLIST_ENTRY  RangeListHead;
-  PLIST_ENTRY  MergedHead;
-  PVOID  Current;
-  ULONG  Stamp;
-} RTL_RANGE_LIST_ITERATOR, *PRTL_RANGE_LIST_ITERATOR;
-
-typedef BOOLEAN
-(*PRTL_CONFLICT_RANGE_CALLBACK)(
-  IN PVOID  Context,
-  IN PRTL_RANGE  Range);
-
-#define HASH_STRING_ALGORITHM_DEFAULT     0
-#define HASH_STRING_ALGORITHM_X65599      1
-#define HASH_STRING_ALGORITHM_INVALID     0xffffffff
-
-typedef enum _SUITE_TYPE {
-  SmallBusiness,
-  Enterprise,
-  BackOffice,
-  CommunicationServer,
-  TerminalServer,
-  SmallBusinessRestricted,
-  EmbeddedNT,
-  DataCenter,
-  SingleUserTS,
-  Personal,
-  Blade,
-  MaxSuiteType
-} SUITE_TYPE;
-
-typedef VOID DDKAPI
-(*PTIMER_APC_ROUTINE)(
-  IN PVOID  TimerContext,
-  IN ULONG  TimerLowValue,
-  IN LONG  TimerHighValue);
-
-
-
-/*
-** WMI structures
-*/
-
-typedef VOID DDKAPI
-(*WMI_NOTIFICATION_CALLBACK)(
-  PVOID  Wnode,
-  PVOID  Context);
-
-
-/*
-** Architecture specific structures
-*/
-
-#ifdef _X86_
-
-typedef ULONG PFN_NUMBER, *PPFN_NUMBER;
-
-#define PASSIVE_LEVEL                      0
-#define LOW_LEVEL                          0
-#define APC_LEVEL                          1
-#define DISPATCH_LEVEL                     2
-#define PROFILE_LEVEL                     27
-#define CLOCK1_LEVEL                      28
-#define CLOCK2_LEVEL                      28
-#define IPI_LEVEL                         29
-#define POWER_LEVEL                       30
-#define HIGH_LEVEL                        31
-
-typedef struct _KPCR_TIB {
-  PVOID  ExceptionList;         /* 00 */
-  PVOID  StackBase;             /* 04 */
-  PVOID  StackLimit;            /* 08 */
-  PVOID  SubSystemTib;          /* 0C */
-  _ANONYMOUS_UNION union {
-    PVOID  FiberData;           /* 10 */
-    DWORD  Version;             /* 10 */
-  } DUMMYUNIONNAME;
-  PVOID  ArbitraryUserPointer;  /* 14 */
-} KPCR_TIB, *PKPCR_TIB;         /* 18 */
-
-#define PCR_MINOR_VERSION 1
-#define PCR_MAJOR_VERSION 1
-
-typedef struct _KPCR {
-  KPCR_TIB  Tib;                /* 00 */
-  struct _KPCR  *Self;          /* 18 */
-  struct _KPRCB  *PCRCB;        /* 1C */
-  KIRQL  Irql;                  /* 20 */
-  ULONG  IRR;                   /* 24 */
-  ULONG  IrrActive;             /* 28 */
-  ULONG  IDR;                   /* 2C */
-  PVOID  KdVersionBlock;        /* 30 */
-  PUSHORT  IDT;                 /* 34 */
-  PUSHORT  GDT;                 /* 38 */
-  struct _KTSS  *TSS;           /* 3C */
-  USHORT  MajorVersion;         /* 40 */
-  USHORT  MinorVersion;         /* 42 */
-  KAFFINITY  SetMember;         /* 44 */
-  ULONG  StallScaleFactor;      /* 48 */
-  UCHAR  DebugActive;           /* 4C */
-  UCHAR  ProcessorNumber;       /* 4D */
-  UCHAR  Reserved[2];           /* 4E */
-} KPCR, *PKPCR;                 /* 50 */
-
-typedef struct _KFLOATING_SAVE {
-  ULONG  ControlWord;
-  ULONG  StatusWord;
-  ULONG  ErrorOffset;
-  ULONG  ErrorSelector;
-  ULONG  DataOffset;
-  ULONG  DataSelector;
-  ULONG  Cr0NpxState;
-  ULONG  Spare1;
-} KFLOATING_SAVE, *PKFLOATING_SAVE;
-
-#define PAGE_SIZE                         0x1000
-#define PAGE_SHIFT                        12L
-
-extern NTOSAPI PVOID *MmHighestUserAddress;
-extern NTOSAPI PVOID *MmSystemRangeStart;
-extern NTOSAPI ULONG *MmUserProbeAddress;
-
-#define MM_HIGHEST_USER_ADDRESS           *MmHighestUserAddress
-#define MM_SYSTEM_RANGE_START             *MmSystemRangeStart
-#define MM_USER_PROBE_ADDRESS             *MmUserProbeAddress
-#define MM_LOWEST_USER_ADDRESS            (PVOID)0x10000
-#define MM_LOWEST_SYSTEM_ADDRESS          (PVOID)0xC0C00000
-
-#define KI_USER_SHARED_DATA               0xffdf0000
-#define SharedUserData                    ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA)
-
-#define EFLAG_SIGN                        0x8000
-#define EFLAG_ZERO                        0x4000
-#define EFLAG_SELECT                      (EFLAG_SIGN | EFLAG_ZERO)
-
-#define RESULT_NEGATIVE                   ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
-#define RESULT_ZERO                       ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT)
-#define RESULT_POSITIVE                   ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT)
-
-typedef enum _INTERLOCKED_RESULT {
-  ResultNegative = RESULT_NEGATIVE,
-  ResultZero = RESULT_ZERO,
-  ResultPositive = RESULT_POSITIVE
-} INTERLOCKED_RESULT;
-
-NTOSAPI
-KIRQL
-DDKAPI
-KeGetCurrentIrql(
-  VOID);
-
-/*
- * ULONG
- * KeGetCurrentProcessorNumber(
- *   VOID)
- */
-#define KeGetCurrentProcessorNumber() \
-  ((ULONG)KeGetCurrentKPCR()->ProcessorNumber)
-
-#if !defined(__INTERLOCKED_DECLARED)
-#define __INTERLOCKED_DECLARED
-
-NTOSAPI
-LONG
-DDKFASTAPI
-InterlockedIncrement(
-  IN PLONG  VOLATILE  Addend);
-
-NTOSAPI
-LONG
-DDKFASTAPI
-InterlockedDecrement(
-  IN PLONG  VOLATILE  Addend);
-
-NTOSAPI
-LONG
-DDKFASTAPI
-InterlockedCompareExchange(
-  IN OUT PLONG  VOLATILE  Destination,
-  IN LONG  Exchange,
-  IN LONG  Comparand);
-
-NTOSAPI
-LONG
-DDKFASTAPI
-InterlockedExchange(
-  IN OUT PLONG  VOLATILE  Target,
-  IN LONG Value);
-
-NTOSAPI
-LONG
-DDKFASTAPI
-InterlockedExchangeAdd(
-  IN OUT PLONG VOLATILE  Addend,
-  IN LONG  Value);
-
-/*
- * PVOID
- * InterlockedExchangePointer(
- *   IN OUT PVOID VOLATILE  *Target,
- *   IN PVOID  Value)
- */
-#define InterlockedExchangePointer(Target, Value) \
-  ((PVOID) InterlockedExchange((PLONG) Target, (LONG) Value))
-
-/*
- * PVOID
- * InterlockedCompareExchangePointer(
- *   IN OUT PVOID  *Destination,
- *   IN PVOID  Exchange,
- *   IN PVOID  Comparand)
- */
-#define InterlockedCompareExchangePointer(Destination, Exchange, Comparand) \
-  ((PVOID) InterlockedCompareExchange((PLONG) Destination, (LONG) Exchange, (LONG) Comparand))
-
-#endif /* !__INTERLOCKED_DECLARED */
-
-NTOSAPI
-VOID
-DDKFASTAPI
-KefAcquireSpinLockAtDpcLevel(
-  IN PKSPIN_LOCK  SpinLock);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-KefReleaseSpinLockFromDpcLevel(
-  IN PKSPIN_LOCK  SpinLock);
-
-#define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock)
-#define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock)
-
-#define RtlCopyMemoryNonTemporal RtlCopyMemory
-
-#define KeGetDcacheFillSize() 1L
-
-#endif /* _X86_ */
-
-
-
-/*
-** Utillity functions
-*/
-
-#define ARGUMENT_PRESENT(ArgumentPointer) \
-  ((BOOLEAN) ((PVOID)ArgumentPointer != (PVOID)NULL))
-
-/*
- * ULONG
- * BYTE_OFFSET(
- *   IN PVOID  Va)
- */
-#define BYTE_OFFSET(Va) \
-  ((ULONG) ((ULONG_PTR) (Va) & (PAGE_SIZE - 1)))
-
-/*
- * ULONG
- * BYTES_TO_PAGES(
- *   IN ULONG  Size)
- */
-#define BYTES_TO_PAGES(Size) \
-  ((ULONG) ((ULONG_PTR) (Size) >> PAGE_SHIFT) + (((ULONG) (Size) & (PAGE_SIZE - 1)) != 0))
-
-/*
- * PCHAR
- * CONTAINING_RECORD(
- *   IN PCHAR  Address,
- *   IN TYPE  Type,
- *   IN PCHAR  Field);
- */
-#ifndef CONTAINING_RECORD
-#define CONTAINING_RECORD(Address, Type, Field) \
-  ((Type *) (((ULONG_PTR) Address) - FIELD_OFFSET(Type, Field)))
-#endif
-
-/* LONG
- * FIELD_OFFSET(
- *   IN TYPE  Type,
- *   IN PCHAR  Field);
- */
-#ifndef FIELD_OFFSET
-#define FIELD_OFFSET(Type, Field) \
-  ((LONG) (&(((Type *) 0)->Field)))
-#endif
-
-/*
- * PVOID
- * PAGE_ALIGN(
- *   IN PVOID  Va)
- */
-#define PAGE_ALIGN(Va) \
-  ((PVOID) ((ULONG_PTR)(Va) & ~(PAGE_SIZE - 1)))
-
-/*
- * ULONG_PTR
- * ROUND_TO_PAGES(
- *   IN ULONG_PTR  Size)
- */
-#define ROUND_TO_PAGES(Size) \
-  ((ULONG_PTR) (((ULONG_PTR) Size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)))
-
-NTOSAPI
-VOID
-DDKAPI
-RtlAssert(
-  IN PVOID  FailedAssertion,
-  IN PVOID  FileName,
-  IN ULONG  LineNumber,
-  IN PCHAR  Message);
-
-#if DBG
-
-#define ASSERT(exp) \
-  ((!(exp)) ? \
-    (RtlAssert( #exp, __FILE__, __LINE__, NULL ), FALSE) : TRUE)
-
-#define ASSERTMSG(msg, exp) \
-  ((!(exp)) ? \
-    (RtlAssert( #exp, __FILE__, __LINE__, msg ), FALSE) : TRUE)
-
-#define RTL_SOFT_ASSERT(exp) \
-  ((!(_exp)) ? \
-    (DbgPrint("%s(%d): Soft assertion failed\n   Expression: %s\n", __FILE__, __LINE__, #exp), FALSE) : TRUE)
-
-#define RTL_SOFT_ASSERTMSG(msg, exp) \
-  ((!(exp)) ? \
-    (DbgPrint("%s(%d): Soft assertion failed\n   Expression: %s\n   Message: %s\n", __FILE__, __LINE__, #exp, (msg)), FALSE) : TRUE)
-
-#define RTL_VERIFY(exp) ASSERT(exp)
-#define RTL_VERIFYMSG(msg, exp) ASSERT(msg, exp)
-
-#define RTL_SOFT_VERIFY(exp) RTL_SOFT_ASSERT(exp)
-#define RTL_SOFT_VERIFYMSG(msg, exp) RTL_SOFT_ASSERTMSG(msg, exp)
-
-#else /* !DBG */
-
-#define ASSERT(exp) ((VOID) 0)
-#define ASSERTMSG(msg, exp) ((VOID) 0)
-
-#define RTL_SOFT_ASSERT(exp) ((VOID) 0)
-#define RTL_SOFT_ASSERTMSG(msg, exp) ((VOID) 0)
-
-#define RTL_VERIFY(exp) ((exp) ? TRUE : FALSE)
-#define RTL_VERIFYMSG(msg, exp) ((exp) ? TRUE : FALSE)
-
-#define RTL_SOFT_VERIFY(exp) ((exp) ? TRUE : FALSE)
-#define RTL_SOFT_VERIFYMSG(msg, exp) ((exp) ? TRUE : FALSE)
-
-#endif /* DBG */
-
-#define assert ASSERT
-
-
-/*
-** Driver support routines
-*/
-
-/** Runtime library routines **/
-
-/*
- * VOID
- * InitializeListHead(
- *   IN PLIST_ENTRY  ListHead)
- */
-#define InitializeListHead(_ListHead) \
-{ \
-  (_ListHead)->Flink = (_ListHead); \
-  (_ListHead)->Blink = (_ListHead); \
-}
-
-/*
- * VOID
- * InsertHeadList(
- *   IN PLIST_ENTRY  ListHead,
- *   IN PLIST_ENTRY  Entry)
- */
-#define InsertHeadList(_ListHead, \
-                       _Entry) \
-{ \
-  PLIST_ENTRY _OldFlink; \
-  _OldFlink = (_ListHead)->Flink; \
-  (_Entry)->Flink = _OldFlink; \
-  (_Entry)->Blink = (_ListHead); \
-  _OldFlink->Blink = (_Entry); \
-  (_ListHead)->Flink = (_Entry); \
-}
-
-/*
- * VOID
- * InsertTailList(
- *   IN PLIST_ENTRY  ListHead,
- *   IN PLIST_ENTRY  Entry)
- */
-#define InsertTailList(_ListHead, \
-                       _Entry) \
-{ \
-	PLIST_ENTRY _OldBlink; \
-	_OldBlink = (_ListHead)->Blink; \
-	(_Entry)->Flink = (_ListHead); \
-	(_Entry)->Blink = _OldBlink; \
-	_OldBlink->Flink = (_Entry); \
-	(_ListHead)->Blink = (_Entry); \
-}
-
-/*
- * BOOLEAN
- * IsListEmpty(
- *   IN PLIST_ENTRY  ListHead)
- */
-#define IsListEmpty(_ListHead) \
-  ((_ListHead)->Flink == (_ListHead))
-
-static __inline PSINGLE_LIST_ENTRY 
-PopEntryList(
-  IN PSINGLE_LIST_ENTRY  ListHead)
-{
-	PSINGLE_LIST_ENTRY Entry;
-
-	Entry = ListHead->Next;
-	if (Entry != NULL)
-	{
-		ListHead->Next = Entry->Next;
-	}
-  return Entry;
-}
-
-/*
- * VOID
- * PushEntryList(
- *   IN PSINGLE_LIST_ENTRY  ListHead,
- *   IN PSINGLE_LIST_ENTRY  Entry)
- */
-#define PushEntryList(_ListHead, \
-                      _Entry) \
-{ \
-	(_Entry)->Next = (_ListHead)->Next; \
-	(_ListHead)->Next = (_Entry); \
-}
-
-/*
- * VOID
- * RemoveEntryList(
- *   IN PLIST_ENTRY  Entry)
- */
-#define RemoveEntryList(_Entry) \
-{ \
-	PLIST_ENTRY _OldFlink; \
-	PLIST_ENTRY _OldBlink; \
-	_OldFlink = (_Entry)->Flink; \
-	_OldBlink = (_Entry)->Blink; \
-	_OldFlink->Blink = _OldBlink; \
-	_OldBlink->Flink = _OldFlink; \
-  (_Entry)->Flink = NULL; \
-  (_Entry)->Blink = NULL; \
-}
-
-static __inline PLIST_ENTRY 
-RemoveHeadList(
-  IN PLIST_ENTRY  ListHead)
-{
-	PLIST_ENTRY OldFlink;
-	PLIST_ENTRY OldBlink;
-	PLIST_ENTRY Entry;
-
-	Entry = ListHead->Flink;
-	OldFlink = ListHead->Flink->Flink;
-	OldBlink = ListHead->Flink->Blink;
-	OldFlink->Blink = OldBlink;
-	OldBlink->Flink = OldFlink;
-
-  if (Entry != ListHead)
-  {
-    Entry->Flink = NULL;
-    Entry->Blink = NULL;
-  }
-
-	return Entry;
-}
-
-static __inline PLIST_ENTRY
-RemoveTailList(
-  IN PLIST_ENTRY  ListHead)
-{
-	PLIST_ENTRY OldFlink;
-	PLIST_ENTRY OldBlink;
-	PLIST_ENTRY Entry;
-
-	Entry = ListHead->Blink;
-	OldFlink = ListHead->Blink->Flink;
-	OldBlink = ListHead->Blink->Blink;
-	OldFlink->Blink = OldBlink;
-	OldBlink->Flink = OldFlink;
-
-  if (Entry != ListHead)
-  {
-    Entry->Flink = NULL;
-    Entry->Blink = NULL;
-  }
-   
-  return Entry;
-}
-
-NTOSAPI
-PSLIST_ENTRY
-DDKFASTAPI
-InterlockedPopEntrySList(
-  IN PSLIST_HEADER  ListHead);
-
-NTOSAPI
-PSLIST_ENTRY
-DDKFASTAPI
-InterlockedPushEntrySList(
-  IN PSLIST_HEADER  ListHead,
-  IN PSLIST_ENTRY  ListEntry);
-
-/*
- * USHORT
- * QueryDepthSList(
- *   IN PSLIST_HEADER  SListHead)
- */
-#define QueryDepthSList(_SListHead) \
-  ((USHORT) ((_SListHead)->Alignment & 0xffff))
-
-#define InterlockedFlushSList(ListHead) ExInterlockedFlushSList(ListHead)
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlAnsiStringToUnicodeSize(
-  IN PANSI_STRING  AnsiString);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlAddRange(
-  IN OUT PRTL_RANGE_LIST  RangeList,
-  IN ULONGLONG  Start,
-  IN ULONGLONG  End,
-  IN UCHAR  Attributes,
-  IN ULONG  Flags,
-  IN PVOID  UserData  OPTIONAL,
-  IN PVOID  Owner  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlAnsiStringToUnicodeString(
-  IN OUT PUNICODE_STRING  DestinationString,
-  IN PANSI_STRING  SourceString,
-  IN BOOLEAN  AllocateDestinationString);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlAppendUnicodeStringToString(
-  IN OUT PUNICODE_STRING  Destination,
-  IN PUNICODE_STRING  Source);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlAppendUnicodeToString(
-  IN OUT PUNICODE_STRING  Destination,
-  IN PCWSTR  Source);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlAreBitsClear(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  StartingIndex,
-  IN ULONG  Length); 
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlAreBitsSet(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  StartingIndex,
-  IN ULONG  Length); 
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlCharToInteger(
-  IN PCSZ  String,
-  IN ULONG  Base  OPTIONAL,
-  IN OUT PULONG  Value);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlCheckBit(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  BitPosition); 
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlCheckRegistryKey(
-  IN ULONG  RelativeTo,
-  IN PWSTR  Path);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlClearAllBits(
-  IN PRTL_BITMAP  BitMapHeader); 
-
-NTOSAPI
-VOID
-DDKAPI
-RtlClearBit(
-  PRTL_BITMAP  BitMapHeader,
-  ULONG  BitNumber);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlClearBits(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  StartingIndex,
-  IN ULONG  NumberToClear); 
-
-NTOSAPI
-SIZE_T
-DDKAPI
-RtlCompareMemory(
-  IN CONST VOID  *Source1,
-  IN CONST VOID  *Source2,
-  IN SIZE_T  Length);
-
-NTOSAPI
-LONG
-DDKAPI
-RtlCompareString(
-  IN PSTRING  String1,
-  IN PSTRING  String2,
-  BOOLEAN  CaseInSensitive);
-
-NTOSAPI
-LONG
-DDKAPI
-RtlCompareUnicodeString(
-  IN PUNICODE_STRING  String1,
-  IN PUNICODE_STRING  String2,
-  IN BOOLEAN  CaseInSensitive);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlConvertLongToLargeInteger(
-  IN LONG  SignedInteger);
-
-NTOSAPI
-LUID
-DDKAPI
-RtlConvertLongToLuid(
-  IN LONG  Long);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlConvertUlongToLargeInteger(
-  IN ULONG  UnsignedInteger);
-
-NTOSAPI
-LUID
-DDKAPI
-RtlConvertUlongToLuid(
-  ULONG  Ulong);
-
-/*
- * VOID
- * RtlCopyMemory(
- *   IN VOID UNALIGNED  *Destination,
- *   IN CONST VOID UNALIGNED  *Source,
- *   IN SIZE_T  Length)
- */
-#ifndef RtlCopyMemory
-#define RtlCopyMemory(Destination, Source, Length) \
-  memcpy(Destination, Source, Length);
-#endif
-
-#ifndef RtlCopyBytes
-#define RtlCopyBytes RtlCopyMemory
-#endif
-
-NTOSAPI
-VOID
-DDKAPI
-RtlCopyMemory32(
-  IN VOID UNALIGNED  *Destination,
-  IN CONST VOID UNALIGNED  *Source,
-  IN ULONG  Length);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlCopyRangeList(
-  OUT PRTL_RANGE_LIST  CopyRangeList,
-  IN PRTL_RANGE_LIST  RangeList);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlCopyString(
-  IN OUT PSTRING  DestinationString,
-  IN PSTRING  SourceString  OPTIONAL);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlCopyUnicodeString(
-  IN OUT PUNICODE_STRING  DestinationString,
-  IN PUNICODE_STRING  SourceString);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlCreateRegistryKey(
-  IN ULONG  RelativeTo,
-  IN PWSTR  Path);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlCreateSecurityDescriptor(
-  IN OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN ULONG  Revision);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlDeleteOwnersRanges(
-  IN OUT PRTL_RANGE_LIST  RangeList,
-  IN PVOID  Owner);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlDeleteRange(
-  IN OUT PRTL_RANGE_LIST  RangeList,
-  IN ULONGLONG  Start,
-  IN ULONGLONG  End,
-  IN PVOID  Owner);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlDeleteRegistryValue(
-  IN ULONG  RelativeTo,
-  IN PCWSTR  Path,
-  IN PCWSTR  ValueName);
-
-/*
- * BOOLEAN
- * RtlEqualLuid( 
- *   IN LUID  Luid1,
- *   IN LUID  Luid2)
- */
-#define RtlEqualLuid(_Luid1, \
-                     _Luid2) \
-  ((Luid1.LowPart == Luid2.LowPart) && (Luid1.HighPart == Luid2.HighPart))
-
-/*
- * ULONG
- * RtlEqualMemory(
- *   IN VOID UNALIGNED  *Destination,
- *   IN CONST VOID UNALIGNED  *Source,
- *   IN SIZE_T  Length)
- */
-#define RtlEqualMemory(Destination, Source, Length) (!memcmp(Destination, Source, Length))
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlEqualString(
-  IN PSTRING  String1,
-  IN PSTRING  String2,
-  IN BOOLEAN  CaseInSensitive);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlEqualUnicodeString(
-  IN CONST UNICODE_STRING  *String1,
-  IN CONST UNICODE_STRING  *String2,
-  IN BOOLEAN  CaseInSensitive);
-
-/*
- * VOID
- * RtlFillMemory(
- *   IN VOID UNALIGNED  *Destination,
- *   IN SIZE_T  Length,
- *   IN UCHAR  Fill)
- */
-#ifndef RtlFillMemory
-#define RtlFillMemory(Destination, Length, Fill) \
-  memset(Destination, Fill, Length)
-#endif
-
-#ifndef RtlFillBytes
-#define RtlFillBytes RtlFillMemory
-#endif
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlFindClearBits(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  NumberToFind,
-  IN ULONG  HintIndex); 
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlFindClearBitsAndSet(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  NumberToFind,
-  IN ULONG  HintIndex); 
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlFindClearRuns( 
-  IN PRTL_BITMAP  BitMapHeader, 
-  OUT PRTL_BITMAP_RUN  RunArray, 
-  IN ULONG  SizeOfRunArray, 
-  IN BOOLEAN  LocateLongestRuns);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlFindFirstRunClear(
-  IN PRTL_BITMAP  BitMapHeader,
-  OUT PULONG  StartingIndex);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlFindLastBackwardRunClear(
-  IN PRTL_BITMAP  BitMapHeader, 
-  IN ULONG  FromIndex, 
-  OUT PULONG  StartingRunIndex); 
-
-NTOSAPI
-CCHAR
-DDKAPI
-RtlFindLeastSignificantBit(
-  IN ULONGLONG  Set);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlFindLongestRunClear(
-  IN PRTL_BITMAP  BitMapHeader,
-  OUT PULONG  StartingIndex); 
-
-NTOSAPI
-CCHAR
-DDKAPI
-RtlFindMostSignificantBit(
-  IN ULONGLONG  Set);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlFindNextForwardRunClear(
-  IN PRTL_BITMAP  BitMapHeader, 
-  IN ULONG  FromIndex, 
-  OUT PULONG  StartingRunIndex);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlFindRange(
-  IN PRTL_RANGE_LIST  RangeList,
-  IN ULONGLONG  Minimum,
-  IN ULONGLONG  Maximum,
-  IN ULONG  Length,
-  IN ULONG  Alignment,
-  IN ULONG  Flags,
-  IN UCHAR  AttributeAvailableMask,
-  IN PVOID  Context  OPTIONAL,
-  IN PRTL_CONFLICT_RANGE_CALLBACK  Callback  OPTIONAL,
-  OUT PULONGLONG  Start);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlFindSetBits(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  NumberToFind,
-  IN ULONG  HintIndex); 
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlFindSetBitsAndClear(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  NumberToFind,
-  IN ULONG  HintIndex); 
-
-NTOSAPI
-VOID
-DDKAPI
-RtlFreeAnsiString(
-  IN PANSI_STRING  AnsiString);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlFreeRangeList(
-  IN PRTL_RANGE_LIST  RangeList);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlFreeUnicodeString(
-  IN PUNICODE_STRING  UnicodeString);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlGetCallersAddress(
-  OUT PVOID  *CallersAddress,
-  OUT PVOID  *CallersCaller);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlGetVersion(
-  IN OUT PRTL_OSVERSIONINFOW  lpVersionInformation);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlGetFirstRange(
-  IN PRTL_RANGE_LIST  RangeList,
-  OUT PRTL_RANGE_LIST_ITERATOR  Iterator,
-  OUT PRTL_RANGE  *Range);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlGetNextRange(
-  IN OUT  PRTL_RANGE_LIST_ITERATOR  Iterator,
-  OUT PRTL_RANGE  *Range,
-  IN BOOLEAN  MoveForwards);
-
-#define FOR_ALL_RANGES(RangeList, Iterator, Current)          \
-  for (RtlGetFirstRange((RangeList), (Iterator), &(Current)); \
-    (Current) != NULL;                                        \
-    RtlGetNextRange((Iterator), &(Current), TRUE))
-
-#define FOR_ALL_RANGES_BACKWARDS(RangeList, Iterator, Current) \
-  for (RtlGetLastRange((RangeList), (Iterator), &(Current));   \
-    (Current) != NULL;                                         \
-    RtlGetNextRange((Iterator), &(Current), FALSE))
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlGUIDFromString( 
-  IN PUNICODE_STRING  GuidString, 
-  OUT GUID  *Guid);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlHashUnicodeString(
-  IN CONST UNICODE_STRING  *String,
-  IN BOOLEAN  CaseInSensitive,
-  IN ULONG  HashAlgorithm,
-  OUT PULONG  HashValue);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlInitAnsiString(
-  IN OUT PANSI_STRING  DestinationString,
-  IN PCSZ  SourceString);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlInitializeBitMap(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN PULONG  BitMapBuffer,
-  IN ULONG  SizeOfBitMap); 
-
-NTOSAPI
-VOID
-DDKAPI
-RtlInitializeRangeList(
-  IN OUT PRTL_RANGE_LIST  RangeList);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlInitString(
-  IN OUT PSTRING  DestinationString,
-  IN PCSZ  SourceString);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlInitUnicodeString(
-  IN OUT PUNICODE_STRING  DestinationString,
-  IN PCWSTR  SourceString);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlInt64ToUnicodeString(
-  IN ULONGLONG  Value,
-  IN ULONG  Base OPTIONAL,
-  IN OUT PUNICODE_STRING  String);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlIntegerToUnicodeString(
-  IN ULONG  Value,
-  IN ULONG  Base  OPTIONAL,
-  IN OUT PUNICODE_STRING  String);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlIntPtrToUnicodeString(
-  PLONG  Value,
-  ULONG  Base  OPTIONAL,
-  PUNICODE_STRING  String);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlInvertRangeList(
-  OUT PRTL_RANGE_LIST  InvertedRangeList,
-  IN PRTL_RANGE_LIST  RangeList);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlIsRangeAvailable(
-  IN PRTL_RANGE_LIST  RangeList,
-  IN ULONGLONG  Start,
-  IN ULONGLONG  End,
-  IN ULONG  Flags,
-  IN UCHAR  AttributeAvailableMask,
-  IN PVOID  Context  OPTIONAL,
-  IN PRTL_CONFLICT_RANGE_CALLBACK  Callback  OPTIONAL,
-  OUT PBOOLEAN  Available);
-
-/*
- * BOOLEAN
- * RtlIsZeroLuid(
- *   IN PLUID  L1)
- */
-#define RtlIsZeroLuid(_L1) \
-  ((BOOLEAN) ((!(_L1)->LowPart) && (!(_L1)->HighPart)))
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlLengthSecurityDescriptor(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlMapGenericMask(
-  IN OUT PACCESS_MASK  AccessMask,
-  IN PGENERIC_MAPPING  GenericMapping);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlMergeRangeLists(
-  OUT PRTL_RANGE_LIST  MergedRangeList,
-  IN PRTL_RANGE_LIST  RangeList1,
-  IN PRTL_RANGE_LIST  RangeList2,
-  IN ULONG  Flags);
-
-/*
- * VOID
- * RtlMoveMemory(
- *  IN VOID UNALIGNED  *Destination,
- *  IN CONST VOID UNALIGNED  *Source,
- *  IN SIZE_T  Length)
- */
-#define RtlMoveMemory memmove
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlNumberOfClearBits(
-  IN PRTL_BITMAP  BitMapHeader);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlNumberOfSetBits(
-  IN PRTL_BITMAP  BitMapHeader); 
-
-NTOSAPI
-VOID
-DDKFASTAPI
-RtlPrefetchMemoryNonTemporal(
-  IN PVOID  Source,
-  IN SIZE_T  Length);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlPrefixUnicodeString( 
-  IN PUNICODE_STRING  String1, 
-  IN PUNICODE_STRING  String2, 
-  IN BOOLEAN  CaseInSensitive);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlQueryRegistryValues(
-  IN ULONG  RelativeTo,
-  IN PCWSTR  Path,
-  IN PRTL_QUERY_REGISTRY_TABLE  QueryTable,
-  IN PVOID  Context,
-  IN PVOID  Environment  OPTIONAL);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlRetrieveUlong(
-  IN OUT PULONG  DestinationAddress,
-  IN PULONG  SourceAddress);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlRetrieveUshort(
-  IN OUT PUSHORT  DestinationAddress,
-  IN PUSHORT  SourceAddress);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlSetAllBits(
-  IN PRTL_BITMAP  BitMapHeader); 
-
-NTOSAPI
-VOID
-DDKAPI
-RtlSetBit(
-  PRTL_BITMAP  BitMapHeader,
-  ULONG  BitNumber);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlSetBits(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  StartingIndex,
-  IN ULONG  NumberToSet); 
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlSetDaclSecurityDescriptor(
-  IN OUT PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN BOOLEAN  DaclPresent,
-  IN PACL  Dacl  OPTIONAL,
-  IN BOOLEAN  DaclDefaulted  OPTIONAL);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlStoreUlong(
-  IN PULONG  Address,
-  IN ULONG  Value);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlStoreUlonglong(
-  IN OUT PULONGLONG  Address,
-  ULONGLONG  Value);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlStoreUlongPtr(
-  IN OUT PULONG_PTR  Address,
-  IN ULONG_PTR  Value);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlStoreUshort(
-  IN PUSHORT  Address,
-  IN USHORT  Value);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlStringFromGUID( 
-  IN REFGUID  Guid, 
-  OUT PUNICODE_STRING  GuidString);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlTestBit(
-  IN PRTL_BITMAP  BitMapHeader,
-  IN ULONG  BitNumber);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlTimeFieldsToTime(
-  IN PTIME_FIELDS  TimeFields,
-  IN PLARGE_INTEGER  Time);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlTimeToTimeFields(
-  IN PLARGE_INTEGER  Time,
-  IN PTIME_FIELDS  TimeFields);
-
-NTOSAPI
-ULONG
-DDKFASTAPI
-RtlUlongByteSwap(
-  IN ULONG  Source);
-
-NTOSAPI
-ULONGLONG
-DDKFASTAPI
-RtlUlonglongByteSwap(
-  IN ULONGLONG  Source);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlUnicodeStringToAnsiSize(
-  IN PUNICODE_STRING  UnicodeString);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlUnicodeStringToAnsiString(
-  IN OUT PANSI_STRING  DestinationString,
-  IN PUNICODE_STRING  SourceString,
-  IN BOOLEAN  AllocateDestinationString);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlUnicodeStringToInteger(
-  IN PUNICODE_STRING  String,
-  IN ULONG  Base  OPTIONAL,
-  OUT PULONG  Value);
-
-NTOSAPI
-WCHAR
-DDKAPI
-RtlUpcaseUnicodeChar( 
-  IN WCHAR  SourceCharacter);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlUpcaseUnicodeString(
-  IN OUT PUNICODE_STRING  DestinationString  OPTIONAL,
-  IN PCUNICODE_STRING  SourceString,
-  IN BOOLEAN  AllocateDestinationString);
-
-NTOSAPI
-CHAR
-DDKAPI
-RtlUpperChar( 
-  IN CHAR Character);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlUpperString(
-  IN OUT PSTRING  DestinationString,
-  IN PSTRING  SourceString);
-
-NTOSAPI
-USHORT
-DDKFASTAPI
-RtlUshortByteSwap(
-  IN USHORT  Source);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlValidRelativeSecurityDescriptor(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptorInput,
-  IN ULONG  SecurityDescriptorLength,
-  IN SECURITY_INFORMATION  RequiredInformation);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlValidSecurityDescriptor(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlVerifyVersionInfo(
-  IN PRTL_OSVERSIONINFOEXW  VersionInfo,
-  IN ULONG  TypeMask,
-  IN ULONGLONG  ConditionMask);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlVolumeDeviceToDosName(
-  IN PVOID  VolumeDeviceObject,
-  OUT PUNICODE_STRING  DosName);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlWalkFrameChain(
-  OUT PVOID  *Callers,
-  IN ULONG  Count,
-  IN ULONG  Flags);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-RtlWriteRegistryValue(
-  IN ULONG  RelativeTo,
-  IN PCWSTR  Path,
-  IN PCWSTR  ValueName,
-  IN ULONG  ValueType,
-  IN PVOID  ValueData,
-  IN ULONG  ValueLength);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlxUnicodeStringToAnsiSize(
-  IN PUNICODE_STRING  UnicodeString);
-
-/*
- * VOID
- * RtlZeroMemory(
- *   IN VOID UNALIGNED  *Destination,
- *   IN SIZE_T  Length)
- */
-#ifndef RtlZeroMemory
-#define RtlZeroMemory(Destination, Length) \
-  memset(Destination, 0, Length)
-#endif
-
-#ifndef RtlZeroBytes
-#define RtlZeroBytes RtlZeroMemory
-#endif
-
-
-/** Executive support routines **/
-
-NTOSAPI
-VOID
-DDKFASTAPI
-ExAcquireFastMutex(
-  IN PFAST_MUTEX  FastMutex);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-ExAcquireFastMutexUnsafe(
-  IN PFAST_MUTEX  FastMutex);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-ExAcquireResourceExclusiveLite(
-  IN PERESOURCE  Resource,
-  IN BOOLEAN  Wait);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-ExAcquireResourceSharedLite(
-  IN PERESOURCE  Resource,
-  IN BOOLEAN  Wait);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-ExAcquireSharedStarveExclusive(
-  IN PERESOURCE  Resource,
-  IN BOOLEAN  Wait);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-ExAcquireSharedWaitForExclusive(
-  IN PERESOURCE  Resource,
-  IN BOOLEAN  Wait);
-
-static __inline PVOID
-ExAllocateFromNPagedLookasideList(
-  IN PNPAGED_LOOKASIDE_LIST  Lookaside)
-{
-	PVOID Entry;
-
-	Lookaside->TotalAllocates++;
-  Entry = InterlockedPopEntrySList(&Lookaside->ListHead);
-	if (Entry == NULL) {
-		Lookaside->AllocateMisses++;
-		Entry = (Lookaside->Allocate)(Lookaside->Type, Lookaside->Size, Lookaside->Tag);
-	}
-  return Entry;
-}
-
-static __inline PVOID
-ExAllocateFromPagedLookasideList(
-  IN PPAGED_LOOKASIDE_LIST  Lookaside)
-{
-  PVOID Entry;
-
-  Lookaside->TotalAllocates++;
-  Entry = InterlockedPopEntrySList(&Lookaside->ListHead);
-  if (Entry == NULL) {
-    Lookaside->AllocateMisses++;
-    Entry = (Lookaside->Allocate)(Lookaside->Type,
-      Lookaside->Size, Lookaside->Tag);
-  }
-  return Entry;
-}
-
-NTOSAPI
-PVOID
-DDKAPI
-ExAllocatePoolWithQuotaTag(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  Tag);
-
-NTOSAPI
-PVOID
-DDKAPI
-ExAllocatePoolWithTag(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  Tag);
-
-#ifdef POOL_TAGGING
-
-#define ExAllocatePoolWithQuota(p,n) ExAllocatePoolWithQuotaTag(p,n,' kdD')
-#define ExAllocatePool(p,n) ExAllocatePoolWithTag(p,n,' kdD')
-
-#else /* !POOL_TAGGING */
-
-NTOSAPI
-PVOID
-DDKAPI
-ExAllocatePool(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes);
-
-NTOSAPI
-PVOID
-DDKAPI
-ExAllocatePoolWithQuota(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes);
-
-#endif /* POOL_TAGGING */
-
-NTOSAPI
-PVOID
-DDKAPI
-ExAllocatePoolWithTagPriority(
-  IN POOL_TYPE  PoolType,
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  Tag,
-  IN EX_POOL_PRIORITY  Priority);
-
-NTOSAPI
-VOID
-DDKAPI
-ExConvertExclusiveToSharedLite(
-  IN PERESOURCE  Resource);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ExCreateCallback(
-  OUT PCALLBACK_OBJECT  *CallbackObject,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN BOOLEAN  Create,
-  IN BOOLEAN  AllowMultipleCallbacks);
-
-NTOSAPI
-VOID
-DDKAPI
-ExDeleteNPagedLookasideList(
-  IN PNPAGED_LOOKASIDE_LIST  Lookaside);
-
-NTOSAPI
-VOID
-DDKAPI
-ExDeletePagedLookasideList(
-  IN PPAGED_LOOKASIDE_LIST  Lookaside);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ExDeleteResourceLite(
-  IN PERESOURCE  Resource);
-
-NTOSAPI
-VOID
-DDKAPI
-ExFreePool(
-  IN PVOID  P);
-
-#define PROTECTED_POOL                    0x80000000
-
-#ifdef POOL_TAGGING
-#define ExFreePool(P) ExFreePoolWithTag(P, 0)
-#endif
-
-NTOSAPI
-VOID
-DDKAPI
-ExFreePoolWithTag(
-  IN PVOID  P,
-  IN ULONG  Tag);
-
-#define ExQueryDepthSList(ListHead) QueryDepthSList(ListHead)
-
-static __inline VOID
-ExFreeToNPagedLookasideList(
-  IN PNPAGED_LOOKASIDE_LIST  Lookaside,
-  IN PVOID  Entry)
-{
-  Lookaside->TotalFrees++;
-	if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) {
-		Lookaside->FreeMisses++;
-		(Lookaside->Free)(Entry);
-  } else {
-		InterlockedPushEntrySList(&Lookaside->ListHead,
-      (PSLIST_ENTRY)Entry);
-	}
-}
-
-static __inline VOID
-ExFreeToPagedLookasideList(
-  IN PPAGED_LOOKASIDE_LIST  Lookaside,
-  IN PVOID  Entry)
-{
-  Lookaside->TotalFrees++;
-  if (ExQueryDepthSList(&Lookaside->ListHead) >= Lookaside->Depth) {
-    Lookaside->FreeMisses++;
-    (Lookaside->Free)(Entry);
-  } else {
-    InterlockedPushEntrySList(&Lookaside->ListHead, (PSLIST_ENTRY)Entry);
-  }
-}
-
-/*
- * ERESOURCE_THREAD
- * ExGetCurrentResourceThread(
- *   VOID);
- */
-#define ExGetCurrentResourceThread() ((ERESOURCE_THREAD) PsGetCurrentThread())
-
-NTOSAPI
-ULONG
-DDKAPI
-ExGetExclusiveWaiterCount(
-  IN PERESOURCE  Resource);
-
-NTOSAPI
-KPROCESSOR_MODE
-DDKAPI
-ExGetPreviousMode( 
-  VOID);
-
-NTOSAPI
-ULONG
-DDKAPI
-ExGetSharedWaiterCount(
-  IN PERESOURCE  Resource);
-
-NTOSAPI
-VOID
-DDKAPI
-KeInitializeEvent(
-  IN PRKEVENT  Event,
-  IN EVENT_TYPE  Type,
-  IN BOOLEAN  State);
-
-/*
- * VOID DDKAPI
- * ExInitializeFastMutex(
- *   IN PFAST_MUTEX  FastMutex)
- */
-#define ExInitializeFastMutex(_FastMutex) \
-{ \
-  (_FastMutex)->Count = 1; \
-  (_FastMutex)->Owner = NULL; \
-  (_FastMutex)->Contention = 0; \
-  KeInitializeEvent(&(_FastMutex)->Event, SynchronizationEvent, FALSE); \
-}
-
-NTOSAPI
-VOID
-DDKAPI
-ExInitializeNPagedLookasideList(
-  IN PNPAGED_LOOKASIDE_LIST  Lookaside,
-  IN PALLOCATE_FUNCTION  Allocate  OPTIONAL,
-  IN PFREE_FUNCTION  Free  OPTIONAL,
-  IN ULONG  Flags,
-  IN SIZE_T  Size,
-  IN ULONG  Tag,
-  IN USHORT  Depth);
-
-NTOSAPI
-VOID
-DDKAPI
-ExInitializePagedLookasideList(
-  IN PPAGED_LOOKASIDE_LIST  Lookaside,
-  IN PALLOCATE_FUNCTION  Allocate  OPTIONAL,
-  IN PFREE_FUNCTION  Free  OPTIONAL,
-  IN ULONG  Flags,
-  IN SIZE_T  Size,
-  IN ULONG  Tag,
-  IN USHORT  Depth);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ExInitializeResourceLite(
-  IN PERESOURCE  Resource);
-
-/*
- * VOID
- * InitializeSListHead(
- *   IN PSLIST_HEADER  SListHead)
- */
-#define InitializeSListHead(_SListHead) \
-	(_SListHead)->Alignment = 0
-
-#define ExInitializeSListHead InitializeSListHead
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-ExInterlockedAddLargeInteger(
-  IN PLARGE_INTEGER  Addend,
-  IN LARGE_INTEGER  Increment,
-  IN PKSPIN_LOCK  Lock);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-ExInterlockedAddLargeStatistic(
-  IN PLARGE_INTEGER  Addend,
-  IN ULONG  Increment);
-
-NTOSAPI
-ULONG
-DDKFASTAPI
-ExInterlockedAddUlong(
-  IN PULONG  Addend,
-  IN ULONG  Increment,
-  PKSPIN_LOCK  Lock);
-
-NTOSAPI
-LONGLONG
-DDKFASTAPI
-ExInterlockedCompareExchange64(
-  IN OUT PLONGLONG  Destination,
-  IN PLONGLONG  Exchange,
-  IN PLONGLONG  Comparand,
-  IN PKSPIN_LOCK  Lock); 
-
-NTOSAPI
-PSINGLE_LIST_ENTRY
-DDKFASTAPI
-ExInterlockedFlushSList(
-  IN PSLIST_HEADER  ListHead);
-
-NTOSAPI
-PLIST_ENTRY
-DDKFASTAPI
-ExInterlockedInsertHeadList(
-  IN PLIST_ENTRY  ListHead,
-  IN PLIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
-
-NTOSAPI
-PLIST_ENTRY
-DDKFASTAPI
-ExInterlockedInsertTailList(
-  IN PLIST_ENTRY  ListHead,
-  IN PLIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
-
-NTOSAPI
-PSINGLE_LIST_ENTRY
-DDKFASTAPI
-ExInterlockedPopEntryList(
-  IN PSINGLE_LIST_ENTRY  ListHead,
-  IN PKSPIN_LOCK  Lock);
-
-/*
- * PSINGLE_LIST_ENTRY
- * ExInterlockedPopEntrySList(
- *   IN PSLIST_HEADER  ListHead,
- *   IN PKSPIN_LOCK  Lock)
- */
-#define ExInterlockedPopEntrySList(_ListHead, \
-                                   _Lock) \
-  InterlockedPopEntrySList(_ListHead)
-
-NTOSAPI
-PSINGLE_LIST_ENTRY
-DDKFASTAPI
-ExInterlockedPushEntryList(
-  IN PSINGLE_LIST_ENTRY  ListHead,
-  IN PSINGLE_LIST_ENTRY  ListEntry,
-  IN PKSPIN_LOCK  Lock);
-
-/*
- * PSINGLE_LIST_ENTRY FASTCALL
- * ExInterlockedPushEntrySList(
- *   IN PSLIST_HEADER  ListHead,
- *   IN PSINGLE_LIST_ENTRY  ListEntry,
- *   IN PKSPIN_LOCK  Lock)
- */
-#define ExInterlockedPushEntrySList(_ListHead, \
-                                    _ListEntry, \
-                                    _Lock) \
-  InterlockedPushEntrySList(_ListHead, _ListEntry)
-
-NTOSAPI
-PLIST_ENTRY
-DDKFASTAPI
-ExInterlockedRemoveHeadList(
-  IN PLIST_ENTRY  ListHead,
-  IN PKSPIN_LOCK  Lock);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-ExIsProcessorFeaturePresent(
-  IN ULONG  ProcessorFeature);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-ExIsResourceAcquiredExclusiveLite(
-  IN PERESOURCE  Resource);
-
-NTOSAPI
-USHORT
-DDKAPI
-ExIsResourceAcquiredLite(
-  IN PERESOURCE  Resource);
-
-NTOSAPI
-USHORT
-DDKAPI
-ExIsResourceAcquiredSharedLite(
-  IN PERESOURCE  Resource);
-
-NTOSAPI
-VOID
-DDKAPI
-ExLocalTimeToSystemTime(
-  IN PLARGE_INTEGER  LocalTime,
-  OUT PLARGE_INTEGER  SystemTime);
-
-NTOSAPI
-VOID
-DDKAPI
-ExNotifyCallback(
-  IN PCALLBACK_OBJECT  CallbackObject,
-  IN PVOID  Argument1,
-  IN PVOID  Argument2);
-
-NTOSAPI
-VOID
-DDKAPI
-ExRaiseAccessViolation(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-ExRaiseDatatypeMisalignment(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-ExRaiseStatus(
-  IN NTSTATUS  Status);
-
-NTOSAPI
-PVOID
-DDKAPI
-ExRegisterCallback(
-  IN PCALLBACK_OBJECT  CallbackObject,
-  IN PCALLBACK_FUNCTION  CallbackFunction,
-  IN PVOID  CallbackContext);
-
-NTOSAPI
-VOID
-DDKAPI
-ExReinitializeResourceLite(
-  IN PERESOURCE  Resource);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-ExReleaseFastMutex(
-  IN PFAST_MUTEX  FastMutex);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-ExReleaseFastMutexUnsafe(
-  IN PFAST_MUTEX  FastMutex);
-
-NTOSAPI
-VOID
-DDKAPI
-ExReleaseResourceForThreadLite(
-  IN PERESOURCE  Resource,
-  IN ERESOURCE_THREAD  ResourceThreadId);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-ExReleaseResourceLite(
-  IN PERESOURCE  Resource);
-
-NTOSAPI
-VOID
-DDKAPI
-ExSetResourceOwnerPointer( 
-  IN PERESOURCE  Resource,
-  IN PVOID  OwnerPointer);
-
-NTOSAPI
-ULONG
-DDKAPI
-ExSetTimerResolution(
-  IN ULONG  DesiredTime,
-  IN BOOLEAN  SetResolution);
-
-NTOSAPI
-VOID
-DDKAPI
-ExSystemTimeToLocalTime(
-  IN PLARGE_INTEGER  SystemTime,
-  OUT PLARGE_INTEGER  LocalTime);
-
-NTOSAPI
-BOOLEAN
-DDKFASTAPI
-ExTryToAcquireFastMutex(
-  IN PFAST_MUTEX  FastMutex);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-ExTryToAcquireResourceExclusiveLite(
-  IN PERESOURCE  Resource);
-
-NTOSAPI
-VOID
-DDKAPI
-ExUnregisterCallback(
-  IN PVOID  CbRegistration);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ExUuidCreate(
-  OUT UUID  *Uuid);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-ExVerifySuite(
-  IN SUITE_TYPE  SuiteType);
-
-#if DBG
-
-#define PAGED_CODE() { \
-  if (KeGetCurrentIrql() > APC_LEVEL) { \
-    KdPrint( ("NTDDK: Pageable code called at IRQL > APC_LEVEL (%d)\n", KeGetCurrentIrql() )); \
-    assert(FALSE); \
-  } \
-}
-
-#else
-
-#define PAGED_CODE()
-
-#endif
-
-NTOSAPI
-VOID
-DDKAPI
-ProbeForRead(
-  IN CONST VOID  *Address,
-  IN ULONG  Length,
-  IN ULONG  Alignment);
-
-NTOSAPI
-VOID
-DDKAPI
-ProbeForWrite(
-  IN CONST VOID  *Address,
-  IN ULONG  Length,
-  IN ULONG  Alignment);
-
-
-
-/** Configuration manager routines **/
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-CmRegisterCallback(
-  IN PEX_CALLBACK_FUNCTION  Function,
-  IN PVOID  Context,
-  IN OUT PLARGE_INTEGER  Cookie);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-CmUnRegisterCallback(
-  IN LARGE_INTEGER  Cookie);
-
-
-
-/** Filesystem runtime library routines **/
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-FsRtlIsTotalDeviceFailure(
-  IN NTSTATUS  Status);
-
-
-
-/** Hardware abstraction layer routines **/
-
-NTOSAPI
-VOID
-DDKFASTAPI
-HalExamineMBR(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  SectorSize,
-  IN ULONG  MBRTypeIdentifier,
-  OUT PVOID  Buffer);
-
-NTOSAPI
-VOID
-DDKAPI
-READ_PORT_BUFFER_UCHAR(
-  IN PUCHAR  Port,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-READ_PORT_BUFFER_ULONG(
-  IN PULONG  Port,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-READ_PORT_BUFFER_USHORT(
-  IN PUSHORT  Port,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-UCHAR
-DDKAPI
-READ_PORT_UCHAR(
-  IN PUCHAR  Port);
-
-NTOSAPI
-ULONG
-DDKAPI
-READ_PORT_ULONG(
-  IN PULONG  Port);
-
-NTOSAPI
-USHORT
-DDKAPI
-READ_PORT_USHORT(
-  IN PUSHORT  Port);
-
-NTOSAPI
-VOID
-DDKAPI
-READ_REGISTER_BUFFER_UCHAR(
-  IN PUCHAR  Register,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-READ_REGISTER_BUFFER_ULONG(
-  IN PULONG  Register,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-READ_REGISTER_BUFFER_USHORT(
-  IN PUSHORT  Register,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-UCHAR
-DDKAPI
-READ_REGISTER_UCHAR(
-  IN PUCHAR  Register);
-
-NTOSAPI
-ULONG
-DDKAPI
-READ_REGISTER_ULONG(
-  IN PULONG  Register);
-
-NTOSAPI
-USHORT
-DDKAPI
-READ_REGISTER_USHORT(
-  IN PUSHORT  Register);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_PORT_BUFFER_UCHAR(
-  IN PUCHAR  Port,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_PORT_BUFFER_ULONG(
-  IN PULONG  Port,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_PORT_BUFFER_USHORT(
-  IN PUSHORT  Port,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_PORT_UCHAR(
-  IN PUCHAR  Port,
-  IN UCHAR  Value);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_PORT_ULONG(
-  IN PULONG  Port,
-  IN ULONG  Value);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_PORT_USHORT(
-  IN PUSHORT  Port,
-  IN USHORT  Value);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_REGISTER_BUFFER_UCHAR(
-  IN PUCHAR  Register,
-  IN PUCHAR  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_REGISTER_BUFFER_ULONG(
-  IN PULONG  Register,
-  IN PULONG  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_REGISTER_BUFFER_USHORT(
-  IN PUSHORT  Register,
-  IN PUSHORT  Buffer,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_REGISTER_UCHAR(
-  IN PUCHAR  Register,
-  IN UCHAR  Value);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_REGISTER_ULONG(
-  IN PULONG  Register,
-  IN ULONG  Value);
-
-NTOSAPI
-VOID
-DDKAPI
-WRITE_REGISTER_USHORT(
-  IN PUSHORT  Register,
-  IN USHORT  Value);
-
-
-
-/** I/O manager routines **/
-
-NTOSAPI
-VOID
-DDKAPI
-IoAcquireCancelSpinLock(
-  OUT PKIRQL  Irql);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoAcquireRemoveLockEx(
-  IN PIO_REMOVE_LOCK  RemoveLock,
-  IN OPTIONAL PVOID  Tag  OPTIONAL,
-  IN PCSTR  File,
-  IN ULONG  Line,
-  IN ULONG  RemlockSize);
-
-/*
- * NTSTATUS
- * IoAcquireRemoveLock(
- *   IN PIO_REMOVE_LOCK  RemoveLock,
- *   IN OPTIONAL PVOID  Tag)
- */
-#define IoAcquireRemoveLock(_RemoveLock, \
-                            _Tag) \
-  IoAcquireRemoveLockEx(_RemoveLock, _Tag, __FILE__, __LINE__, sizeof(IO_REMOVE_LOCK))
-
-/*
- * VOID
- * IoAdjustPagingPathCount(
- *   IN PLONG  Count,
- *   IN BOOLEAN  Increment)
- */
-#define IoAdjustPagingPathCount(_Count, \
-                                _Increment) \
-{ \
-  if (_Increment) \
-    { \
-      InterlockedIncrement(_Count); \
-    } \
-  else \
-    { \
-      InterlockedDecrement(_Count); \
-    } \
-}
-
-NTOSAPI
-VOID
-DDKAPI
-IoAllocateController(
-  IN PCONTROLLER_OBJECT  ControllerObject,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PDRIVER_CONTROL  ExecutionRoutine,
-  IN PVOID  Context);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoAllocateDriverObjectExtension(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PVOID  ClientIdentificationAddress,
-  IN ULONG  DriverObjectExtensionSize,
-  OUT PVOID  *DriverObjectExtension);
-
-typedef struct _IO_ERROR_LOG_PACKET { 
-	UCHAR  MajorFunctionCode; 
-	UCHAR  RetryCount; 
-	USHORT  DumpDataSize; 
-	USHORT  NumberOfStrings; 
-	USHORT  StringOffset; 
-	USHORT  EventCategory; 
-	NTSTATUS  ErrorCode; 
-	ULONG  UniqueErrorValue; 
-	NTSTATUS  FinalStatus; 
-	ULONG  SequenceNumber; 
-	ULONG  IoControlCode; 
-	LARGE_INTEGER  DeviceOffset; 
-	ULONG  DumpData[1]; 
-} IO_ERROR_LOG_PACKET, *PIO_ERROR_LOG_PACKET; 
-
-NTOSAPI
-PVOID
-DDKAPI
-IoAllocateErrorLogEntry(
-  IN PVOID  IoObject,
-  IN UCHAR  EntrySize);
-
-NTOSAPI
-PIRP
-DDKAPI
-IoAllocateIrp(
-  IN CCHAR  StackSize,
-  IN BOOLEAN  ChargeQuota);
-
-NTOSAPI
-PMDL
-DDKAPI
-IoAllocateMdl(
-  IN PVOID  VirtualAddress,
-  IN ULONG  Length,
-  IN BOOLEAN  SecondaryBuffer,
-  IN BOOLEAN  ChargeQuota,
-  IN OUT PIRP  Irp  OPTIONAL);
-
-NTOSAPI
-PIO_WORKITEM
-DDKAPI
-IoAllocateWorkItem(
-  IN PDEVICE_OBJECT  DeviceObject);
-
-/*
- * VOID IoAssignArcName(
- *   IN PUNICODE_STRING  ArcName,
- *   IN PUNICODE_STRING  DeviceName);
- */
-#define IoAssignArcName(_ArcName, _DeviceName) ( \
-  IoCreateSymbolicLink((_ArcName), (_DeviceName)))
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoAttachDevice(
-  IN PDEVICE_OBJECT  SourceDevice,
-  IN PUNICODE_STRING  TargetDevice,
-  OUT PDEVICE_OBJECT  *AttachedDevice);
-
-NTOSAPI
-PDEVICE_OBJECT
-DDKAPI
-IoAttachDeviceToDeviceStack(
-  IN PDEVICE_OBJECT  SourceDevice,
-  IN PDEVICE_OBJECT  TargetDevice);
-
-NTOSAPI
-PIRP
-DDKAPI
-IoBuildAsynchronousFsdRequest(
-  IN ULONG  MajorFunction,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN OUT PVOID  Buffer  OPTIONAL,
-  IN ULONG  Length  OPTIONAL,
-  IN PLARGE_INTEGER  StartingOffset  OPTIONAL,
-  IN PIO_STATUS_BLOCK  IoStatusBlock  OPTIONAL);
-
-NTOSAPI
-PIRP
-DDKAPI
-IoBuildDeviceIoControlRequest(
-  IN ULONG  IoControlCode,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PVOID  InputBuffer  OPTIONAL,
-  IN ULONG  InputBufferLength,
-  OUT PVOID  OutputBuffer  OPTIONAL,
-  IN ULONG  OutputBufferLength,
-  IN BOOLEAN  InternalDeviceIoControl,
-  IN PKEVENT  Event,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock);
-
-NTOSAPI
-VOID
-DDKAPI
-IoBuildPartialMdl(
-  IN PMDL  SourceMdl,
-  IN OUT PMDL  TargetMdl,
-  IN PVOID  VirtualAddress,
-  IN ULONG  Length);
-
-NTOSAPI
-PIRP
-DDKAPI
-IoBuildSynchronousFsdRequest(
-  IN ULONG  MajorFunction,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN OUT PVOID  Buffer  OPTIONAL,
-  IN ULONG  Length  OPTIONAL,
-  IN PLARGE_INTEGER  StartingOffset  OPTIONAL,
-  IN PKEVENT  Event,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock);
-
-NTOSAPI
-NTSTATUS
-DDKFASTAPI
-IofCallDriver(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN OUT PIRP  Irp);
-
-/*
- * NTSTATUS
- * IoCallDriver(
- *   IN PDEVICE_OBJECT  DeviceObject,
- *   IN OUT PIRP  Irp)
- */
-#define IoCallDriver IofCallDriver
-
-NTOSAPI
-VOID
-DDKAPI
-IoCancelFileOpen(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PFILE_OBJECT  FileObject);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-IoCancelIrp(
-  IN PIRP  Irp);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoCheckShareAccess(
-  IN ACCESS_MASK  DesiredAccess,
-  IN ULONG  DesiredShareAccess,
-  IN OUT PFILE_OBJECT  FileObject,
-  IN OUT PSHARE_ACCESS  ShareAccess,
-  IN BOOLEAN  Update);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-IofCompleteRequest(
-  IN PIRP  Irp,
-  IN CCHAR  PriorityBoost);
-
-/*
- * VOID
- * IoCompleteRequest(
- *  IN PIRP  Irp,
- *  IN CCHAR  PriorityBoost)
- */
-#define IoCompleteRequest IofCompleteRequest
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoConnectInterrupt(
-  OUT PKINTERRUPT  *InterruptObject,
-  IN PKSERVICE_ROUTINE  ServiceRoutine,
-  IN PVOID  ServiceContext,
-  IN PKSPIN_LOCK  SpinLock  OPTIONAL,
-  IN ULONG  Vector,
-  IN KIRQL  Irql,
-  IN KIRQL  SynchronizeIrql,
-  IN KINTERRUPT_MODE    InterruptMode,
-  IN BOOLEAN  ShareVector,
-  IN KAFFINITY  ProcessorEnableMask,
-  IN BOOLEAN  FloatingSave);
-
-/*
- * PIO_STACK_LOCATION
- * IoGetCurrentIrpStackLocation(
- *   IN PIRP  Irp)
- */
-#define IoGetCurrentIrpStackLocation(_Irp) \
-  ((_Irp)->Tail.Overlay.CurrentStackLocation)
-
-/*
- * PIO_STACK_LOCATION
- * IoGetNextIrpStackLocation(
- *   IN PIRP  Irp)
- */
-#define IoGetNextIrpStackLocation(_Irp) \
-  ((_Irp)->Tail.Overlay.CurrentStackLocation - 1)
-
-/*
- * VOID
- * IoCopyCurrentIrpStackLocationToNext(
- *   IN PIRP  Irp)
- */
-#define IoCopyCurrentIrpStackLocationToNext(_Irp) \
-{ \
-  PIO_STACK_LOCATION _IrpSp; \
-  PIO_STACK_LOCATION _NextIrpSp; \
-  _IrpSp = IoGetCurrentIrpStackLocation(_Irp); \
-  _NextIrpSp = IoGetNextIrpStackLocation(_Irp); \
-  RtlCopyMemory(_NextIrpSp, _IrpSp, \
-    FIELD_OFFSET(IO_STACK_LOCATION, CompletionRoutine)); \
-  _NextIrpSp->Control = 0; \
-}
-
-NTOSAPI
-PCONTROLLER_OBJECT
-DDKAPI
-IoCreateController(
-  IN ULONG  Size);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoCreateDevice(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN ULONG  DeviceExtensionSize,
-  IN PUNICODE_STRING  DeviceName  OPTIONAL,
-  IN DEVICE_TYPE  DeviceType,
-  IN ULONG  DeviceCharacteristics,
-  IN BOOLEAN  Exclusive,
-  OUT PDEVICE_OBJECT  *DeviceObject);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoCreateDisk(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PCREATE_DISK  Disk);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoCreateFile(
-  OUT PHANDLE FileHandle,
-  IN ACCESS_MASK DesiredAccess,
-  IN POBJECT_ATTRIBUTES ObjectAttributes,
-  OUT PIO_STATUS_BLOCK IoStatusBlock,
-  IN PLARGE_INTEGER AllocationSize OPTIONAL,
-  IN ULONG FileAttributes,
-  IN ULONG ShareAccess,
-  IN ULONG Disposition,
-  IN ULONG CreateOptions,
-  IN PVOID EaBuffer OPTIONAL,
-  IN ULONG EaLength,
-  IN CREATE_FILE_TYPE CreateFileType,
-  IN PVOID ExtraCreateParameters OPTIONAL,
-  IN ULONG Options);
-
-NTOSAPI
-PKEVENT
-DDKAPI
-IoCreateNotificationEvent(
-  IN PUNICODE_STRING  EventName,
-  OUT PHANDLE  EventHandle);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoCreateSymbolicLink(
-  IN PUNICODE_STRING  SymbolicLinkName,
-  IN PUNICODE_STRING  DeviceName);
-
-NTOSAPI
-PKEVENT
-DDKAPI
-IoCreateSynchronizationEvent(
-  IN PUNICODE_STRING  EventName,
-  OUT PHANDLE  EventHandle);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoCreateUnprotectedSymbolicLink(
-  IN PUNICODE_STRING  SymbolicLinkName,
-  IN PUNICODE_STRING  DeviceName);
-
-NTOSAPI
-VOID
-DDKAPI
-IoCsqInitialize(
-  PIO_CSQ  Csq,
-  IN PIO_CSQ_INSERT_IRP  CsqInsertIrp,
-  IN PIO_CSQ_REMOVE_IRP  CsqRemoveIrp,
-  IN PIO_CSQ_PEEK_NEXT_IRP  CsqPeekNextIrp,
-  IN PIO_CSQ_ACQUIRE_LOCK  CsqAcquireLock,
-  IN PIO_CSQ_RELEASE_LOCK  CsqReleaseLock,
-  IN PIO_CSQ_COMPLETE_CANCELED_IRP  CsqCompleteCanceledIrp);
-
-NTOSAPI
-VOID
-DDKAPI
-IoCsqInsertIrp(
-  IN  PIO_CSQ  Csq,
-  IN  PIRP  Irp,
-  IN  PIO_CSQ_IRP_CONTEXT  Context);
-
-NTOSAPI
-PIRP
-DDKAPI
-IoCsqRemoveIrp(
-  IN  PIO_CSQ  Csq,
-  IN  PIO_CSQ_IRP_CONTEXT  Context);
-
-NTOSAPI
-PIRP
-DDKAPI
-IoCsqRemoveNextIrp(
-  IN PIO_CSQ  Csq,
-  IN PVOID  PeekContext);
-
-NTOSAPI
-VOID
-DDKAPI
-IoDeleteController(
-  IN PCONTROLLER_OBJECT  ControllerObject);
-
-NTOSAPI
-VOID
-DDKAPI
-IoDeleteDevice(
-  IN PDEVICE_OBJECT  DeviceObject);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoDeleteSymbolicLink(
-  IN PUNICODE_STRING  SymbolicLinkName);
-
-/*
- * VOID
- * IoDeassignArcName(
- *   IN PUNICODE_STRING  ArcName)
- */
-#define IoDeassignArcName IoDeleteSymbolicLink
-
-NTOSAPI
-VOID
-DDKAPI
-IoDetachDevice(
-  IN OUT PDEVICE_OBJECT  TargetDevice);
-
-NTOSAPI
-VOID
-DDKAPI
-IoDisconnectInterrupt(
-  IN PKINTERRUPT  InterruptObject);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-IoForwardIrpSynchronously(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp);
-
-#define IoForwardAndCatchIrp IoForwardIrpSynchronously
-
-NTOSAPI
-VOID
-DDKAPI
-IoFreeController(
-  IN PCONTROLLER_OBJECT  ControllerObject);
-
-NTOSAPI
-VOID
-DDKAPI
-IoFreeErrorLogEntry(
-  PVOID  ElEntry);
-
-NTOSAPI
-VOID
-DDKAPI
-IoFreeIrp(
-  IN PIRP  Irp);
-
-NTOSAPI
-VOID
-DDKAPI
-IoFreeMdl(
-  IN PMDL  Mdl);
-
-NTOSAPI
-VOID
-DDKAPI
-IoFreeWorkItem(
-  IN PIO_WORKITEM  pIOWorkItem);
-
-NTOSAPI
-PDEVICE_OBJECT
-DDKAPI
-IoGetAttachedDevice(
-  IN PDEVICE_OBJECT  DeviceObject);
-
-NTOSAPI
-PDEVICE_OBJECT
-DDKAPI
-IoGetAttachedDeviceReference(
-  IN PDEVICE_OBJECT  DeviceObject);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoGetBootDiskInformation(
-  IN OUT PBOOTDISK_INFORMATION  BootDiskInformation,
-  IN ULONG  Size);
-
-NTOSAPI
-PCONFIGURATION_INFORMATION
-DDKAPI
-IoGetConfigurationInformation( 
-  VOID);
-
-NTOSAPI
-PEPROCESS
-DDKAPI
-IoGetCurrentProcess(
-  VOID);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoGetDeviceInterfaceAlias(
-  IN PUNICODE_STRING  SymbolicLinkName,
-  IN CONST GUID  *AliasInterfaceClassGuid,
-  OUT PUNICODE_STRING  AliasSymbolicLinkName);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoGetDeviceInterfaces(
-  IN CONST GUID  *InterfaceClassGuid,
-  IN PDEVICE_OBJECT  PhysicalDeviceObject  OPTIONAL,
-  IN ULONG  Flags,
-  OUT PWSTR  *SymbolicLinkList);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoGetDeviceObjectPointer(
-  IN PUNICODE_STRING  ObjectName,
-  IN ACCESS_MASK  DesiredAccess,
-  OUT PFILE_OBJECT  *FileObject,
-  OUT PDEVICE_OBJECT  *DeviceObject);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoGetDeviceProperty(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN DEVICE_REGISTRY_PROPERTY  DeviceProperty,
-  IN ULONG  BufferLength,
-  OUT PVOID  PropertyBuffer,
-  OUT PULONG  ResultLength);
-
-NTOSAPI
-PDEVICE_OBJECT
-DDKAPI
-IoGetDeviceToVerify(
-  IN PETHREAD  Thread);
-
-NTOSAPI
-PDMA_ADAPTER
-DDKAPI
-IoGetDmaAdapter(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject,
-  IN PDEVICE_DESCRIPTION  DeviceDescription,
-  IN OUT PULONG  NumberOfMapRegisters);
-
-NTOSAPI
-PVOID
-DDKAPI
-IoGetDriverObjectExtension(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PVOID  ClientIdentificationAddress);
-
-NTOSAPI
-PGENERIC_MAPPING
-DDKAPI
-IoGetFileObjectGenericMapping(
-  VOID);
-
-/*
- * ULONG
- * IoGetFunctionCodeFromCtlCode(
- *   IN ULONG  ControlCode)
- */
-#define IoGetFunctionCodeFromCtlCode(_ControlCode) \
-  (((_ControlCode) >> 2) & 0x00000FFF)
-
-NTOSAPI
-PVOID
-DDKAPI
-IoGetInitialStack(
-  VOID);
-
-NTOSAPI
-PDEVICE_OBJECT
-DDKAPI
-IoGetRelatedDeviceObject(
-  IN PFILE_OBJECT  FileObject);
-
-NTOSAPI
-ULONG
-DDKAPI
-IoGetRemainingStackSize(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-IoGetStackLimits(
-  OUT PULONG_PTR  LowLimit,
-  OUT PULONG_PTR  HighLimit);
-
-NTOSAPI
-VOID
-DDKAPI
-KeInitializeDpc(
-  IN PRKDPC  Dpc,
-  IN PKDEFERRED_ROUTINE  DeferredRoutine,
-  IN PVOID  DeferredContext);
-
-/*
- * VOID
- * IoInitializeDpcRequest(
- *   IN PDEVICE_OBJECT DeviceObject,
- *   IN PIO_DPC_ROUTINE DpcRoutine)
- */
-#define IoInitializeDpcRequest(_DeviceObject, \
-                               _DpcRoutine) \
-  KeInitializeDpc(&(_DeviceObject)->Dpc, \
-    (PKDEFERRED_ROUTINE) (_DpcRoutine), \
-    _DeviceObject)
-
-NTOSAPI
-VOID
-DDKAPI
-IoInitializeIrp(
-  IN OUT PIRP  Irp,
-  IN USHORT  PacketSize,
-  IN CCHAR  StackSize);
-
-NTOSAPI
-VOID
-DDKAPI
-IoInitializeRemoveLockEx(
-  IN  PIO_REMOVE_LOCK Lock,
-  IN  ULONG   AllocateTag,
-  IN  ULONG   MaxLockedMinutes,
-  IN  ULONG   HighWatermark,
-  IN  ULONG   RemlockSize);
-
-/* VOID
- * IoInitializeRemoveLock(
- *   IN PIO_REMOVE_LOCK  Lock,
- *   IN ULONG  AllocateTag,
- *   IN ULONG  MaxLockedMinutes,
- *   IN ULONG  HighWatermark)
- */
-#define IoInitializeRemoveLock( \
-  Lock, AllocateTag, MaxLockedMinutes, HighWatermark) \
-  IoInitializeRemoveLockEx(Lock, AllocateTag, MaxLockedMinutes, \
-    HighWatermark, sizeof(IO_REMOVE_LOCK))
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoInitializeTimer(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIO_TIMER_ROUTINE  TimerRoutine,
-  IN PVOID  Context);
-
-NTOSAPI
-VOID
-DDKAPI
-IoInvalidateDeviceRelations(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN DEVICE_RELATION_TYPE  Type);
-
-NTOSAPI
-VOID
-DDKAPI
-IoInvalidateDeviceState(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-IoIs32bitProcess(
-  IN PIRP  Irp  OPTIONAL);
-
-/*
- * BOOLEAN
- * IoIsErrorUserInduced(
- *   IN NTSTATUS  Status);
- */
-#define IoIsErrorUserInduced(Status) \
-	((BOOLEAN)(((Status) == STATUS_DEVICE_NOT_READY) || \
-   ((Status) == STATUS_IO_TIMEOUT) || \
-   ((Status) == STATUS_MEDIA_WRITE_PROTECTED) || \
-   ((Status) == STATUS_NO_MEDIA_IN_DEVICE) || \
-   ((Status) == STATUS_VERIFY_REQUIRED) || \
-   ((Status) == STATUS_UNRECOGNIZED_MEDIA) || \
-   ((Status) == STATUS_WRONG_VOLUME)))
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-IoIsWdmVersionAvailable(
-  IN UCHAR  MajorVersion,
-  IN UCHAR  MinorVersion);
-
-NTOSAPI
-PIRP
-DDKAPI
-IoMakeAssociatedIrp(
-  IN PIRP  Irp,
-  IN CCHAR  StackSize);
-
-/*
- * VOID
- * IoMarkIrpPending(
- *   IN OUT PIRP  Irp)
- */
-#define IoMarkIrpPending(_Irp) \
-  (IoGetCurrentIrpStackLocation(_Irp)->Control |= SL_PENDING_RETURNED)
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoOpenDeviceInterfaceRegistryKey(
-  IN PUNICODE_STRING  SymbolicLinkName,
-  IN ACCESS_MASK  DesiredAccess,
-  OUT PHANDLE  DeviceInterfaceKey);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoOpenDeviceRegistryKey(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  DevInstKeyType,
-  IN ACCESS_MASK  DesiredAccess,
-  OUT PHANDLE  DevInstRegKey);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoQueryDeviceDescription(
-  IN PINTERFACE_TYPE  BusType  OPTIONAL,
-  IN PULONG  BusNumber  OPTIONAL,
-  IN PCONFIGURATION_TYPE  ControllerType  OPTIONAL,
-  IN PULONG  ControllerNumber  OPTIONAL,
-  IN PCONFIGURATION_TYPE  PeripheralType  OPTIONAL,
-  IN PULONG  PeripheralNumber  OPTIONAL,
-  IN PIO_QUERY_DEVICE_ROUTINE  CalloutRoutine,
-  IN PVOID  Context);
-
-NTOSAPI
-VOID
-DDKAPI
-IoQueueWorkItem(
-  IN PIO_WORKITEM  pIOWorkItem,
-  IN PIO_WORKITEM_ROUTINE  Routine,
-  IN WORK_QUEUE_TYPE  QueueType,
-  IN PVOID  Context);
-
-NTOSAPI
-VOID
-DDKAPI
-IoRaiseHardError(
-  IN PIRP  Irp,
-  IN PVPB  Vpb  OPTIONAL,
-  IN PDEVICE_OBJECT  RealDeviceObject);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-IoRaiseInformationalHardError(
-  IN NTSTATUS  ErrorStatus,
-  IN PUNICODE_STRING  String  OPTIONAL,
-  IN PKTHREAD  Thread  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoReadDiskSignature(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  BytesPerSector,
-  OUT PDISK_SIGNATURE  Signature);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoReadPartitionTableEx(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN struct _DRIVE_LAYOUT_INFORMATION_EX  **PartitionBuffer);
-
-NTOSAPI
-VOID
-DDKAPI
-IoRegisterBootDriverReinitialization(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDRIVER_REINITIALIZE  DriverReinitializationRoutine,
-  IN PVOID  Context);
-
-NTOSAPI
-VOID
-DDKAPI
-IoRegisterBootDriverReinitialization(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDRIVER_REINITIALIZE  DriverReinitializationRoutine,
-  IN PVOID  Context);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoRegisterDeviceInterface(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject,
-  IN CONST GUID  *InterfaceClassGuid,
-  IN PUNICODE_STRING  ReferenceString  OPTIONAL,
-  OUT PUNICODE_STRING  SymbolicLinkName);
-
-NTOSAPI
-VOID
-DDKAPI
-IoRegisterDriverReinitialization(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDRIVER_REINITIALIZE  DriverReinitializationRoutine,
-  IN PVOID  Context);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoRegisterPlugPlayNotification(
-  IN IO_NOTIFICATION_EVENT_CATEGORY  EventCategory,
-  IN ULONG  EventCategoryFlags,
-  IN PVOID  EventCategoryData  OPTIONAL,
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDRIVER_NOTIFICATION_CALLBACK_ROUTINE  CallbackRoutine,
-  IN PVOID  Context,
-  OUT PVOID  *NotificationEntry);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoRegisterShutdownNotification(
-  IN PDEVICE_OBJECT  DeviceObject);
-
-NTOSAPI
-VOID
-DDKAPI
-IoReleaseCancelSpinLock(
-  IN KIRQL  Irql);
-
-NTOSAPI
-VOID
-DDKAPI
-IoReleaseRemoveLockAndWaitEx(
-  IN PIO_REMOVE_LOCK  RemoveLock,
-  IN PVOID  Tag,
-  IN ULONG  RemlockSize);
-
-NTOSAPI
-VOID
-DDKAPI
-IoReleaseRemoveLockEx(
-  IN PIO_REMOVE_LOCK  RemoveLock,
-  IN PVOID  Tag,
-  IN ULONG  RemlockSize);
-
-/*
- * VOID
- * IoReleaseRemoveLockAndWait(
- *   IN PIO_REMOVE_LOCK  RemoveLock,
- *   IN PVOID  Tag)
- */
-#define IoReleaseRemoveLockAndWait(_RemoveLock, \
-                                   _Tag) \
-  IoReleaseRemoveLockEx(_RemoveLock, _Tag, sizeof(IO_REMOVE_LOCK))
-
-NTOSAPI
-VOID
-DDKAPI
-IoRemoveShareAccess(
-  IN PFILE_OBJECT  FileObject,
-  IN OUT PSHARE_ACCESS  ShareAccess);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoReportDetectedDevice(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN INTERFACE_TYPE  LegacyBusType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN PCM_RESOURCE_LIST  ResourceList,
-  IN PIO_RESOURCE_REQUIREMENTS_LIST  ResourceRequirements  OPTIONAL,
-  IN BOOLEAN  ResourceAssigned,
-  IN OUT PDEVICE_OBJECT  *DeviceObject);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoReportResourceForDetection(
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PCM_RESOURCE_LIST  DriverList  OPTIONAL,
-  IN ULONG  DriverListSize  OPTIONAL,
-  IN PDEVICE_OBJECT  DeviceObject  OPTIONAL,
-  IN PCM_RESOURCE_LIST  DeviceList  OPTIONAL,
-  IN ULONG  DeviceListSize  OPTIONAL,
-  OUT PBOOLEAN  ConflictDetected);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoReportResourceUsage(
-  IN PUNICODE_STRING  DriverClassName  OPTIONAL,
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PCM_RESOURCE_LIST  DriverList  OPTIONAL,
-  IN ULONG  DriverListSize  OPTIONAL,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PCM_RESOURCE_LIST  DeviceList  OPTIONAL,
-  IN ULONG  DeviceListSize  OPTIONAL,
-  IN BOOLEAN  OverrideConflict,
-  OUT PBOOLEAN  ConflictDetected);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoReportTargetDeviceChange(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject,
-  IN PVOID  NotificationStructure);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoReportTargetDeviceChangeAsynchronous(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject,
-  IN PVOID  NotificationStructure,
-  IN PDEVICE_CHANGE_COMPLETE_CALLBACK  Callback  OPTIONAL,
-  IN PVOID  Context  OPTIONAL);
-
-NTOSAPI
-VOID
-DDKAPI
-IoRequestDeviceEject(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject);
-
-/*
- * VOID
- * IoRequestDpc(
- *   IN PDEVICE_OBJECT  DeviceObject,
- *   IN PIRP  Irp,
- *   IN PVOID  Context);
- */
-#define IoRequestDpc(DeviceObject, Irp, Context)( \
-  KeInsertQueueDpc(&(DeviceObject)->Dpc, (Irp), (Context)))
-
-NTOSAPI
-VOID
-DDKAPI
-IoReuseIrp(
-  IN OUT PIRP  Irp,
-  IN NTSTATUS  Status);
-
-/*
- * PDRIVER_CANCEL
- * IoSetCancelRoutine(
- *   IN PIRP  Irp,
- *   IN PDRIVER_CANCEL  CancelRoutine)
- */
-#define IoSetCancelRoutine(_Irp, \
-                           _CancelRoutine) \
-  ((PDRIVER_CANCEL) InterlockedExchangePointer( \
-    (PVOID *) &(_Irp)->CancelRoutine, (PVOID) (_CancelRoutine)))
-
-/*
- * VOID
- * IoSetCompletionRoutine(
- *   IN PIRP  Irp,
- *   IN PIO_COMPLETION_ROUTINE  CompletionRoutine,
- *   IN PVOID  Context,
- *   IN BOOLEAN  InvokeOnSuccess,
- *   IN BOOLEAN  InvokeOnError,
- *   IN BOOLEAN  InvokeOnCancel)
- */
-#define IoSetCompletionRoutine(_Irp, \
-                               _CompletionRoutine, \
-                               _Context, \
-                               _InvokeOnSuccess, \
-                               _InvokeOnError, \
-                               _InvokeOnCancel) \
-{ \
-  PIO_STACK_LOCATION _IrpSp; \
-  assert(_InvokeOnSuccess || _InvokeOnError || _InvokeOnCancel ? \
-    _CompletionRoutine != NULL : TRUE); \
-  _IrpSp = IoGetNextIrpStackLocation(_Irp); \
-  _IrpSp->CompletionRoutine = (PIO_COMPLETION_ROUTINE)(_CompletionRoutine); \
-	_IrpSp->Context = (_Context); \
-  _IrpSp->Control = 0; \
-  if (_InvokeOnSuccess) _IrpSp->Control = SL_INVOKE_ON_SUCCESS; \
-  if (_InvokeOnError) _IrpSp->Control |= SL_INVOKE_ON_ERROR; \
-  if (_InvokeOnCancel) _IrpSp->Control |= SL_INVOKE_ON_CANCEL; \
-}
-
-NTOSAPI
-VOID
-DDKAPI
-IoSetCompletionRoutineEx(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  IN PIO_COMPLETION_ROUTINE  CompletionRoutine,
-  IN PVOID  Context,
-  IN BOOLEAN    InvokeOnSuccess,
-  IN BOOLEAN  InvokeOnError,
-  IN BOOLEAN  InvokeOnCancel);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoSetDeviceInterfaceState(
-  IN PUNICODE_STRING  SymbolicLinkName,
-  IN BOOLEAN  Enable);
-
-NTOSAPI
-VOID
-DDKAPI
-IoSetHardErrorOrVerifyDevice(
-  IN PIRP  Irp,
-  IN PDEVICE_OBJECT  DeviceObject);
-
-/*
- * VOID
- * IoSetNextIrpStackLocation(
- *   IN OUT PIRP  Irp)
- */
-#define IoSetNextIrpStackLocation(_Irp) \
-{ \
-  (_Irp)->CurrentLocation--; \
-  (_Irp)->Tail.Overlay.CurrentStackLocation--; \
-}
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoSetPartitionInformationEx(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  PartitionNumber,
-  IN struct _SET_PARTITION_INFORMATION_EX  *PartitionInfo);
-
-NTOSAPI
-VOID
-DDKAPI
-IoSetShareAccess(
-  IN ACCESS_MASK  DesiredAccess,
-  IN ULONG  DesiredShareAccess,
-  IN OUT PFILE_OBJECT  FileObject,
-  OUT PSHARE_ACCESS  ShareAccess);
-
-NTOSAPI
-VOID
-DDKAPI
-IoSetStartIoAttributes(
-  IN PDEVICE_OBJECT  DeviceObject, 
-  IN BOOLEAN  DeferredStartIo, 
-  IN BOOLEAN  NonCancelable); 
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoSetSystemPartition(
-  IN PUNICODE_STRING  VolumeNameString);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-IoSetThreadHardErrorMode(
-  IN BOOLEAN  EnableHardErrors);
-
-/*
- * USHORT
- * IoSizeOfIrp(
- *   IN CCHAR  StackSize)
- */
-#define IoSizeOfIrp(_StackSize) \
-  ((USHORT) (sizeof(IRP) + ((_StackSize) * (sizeof(IO_STACK_LOCATION)))))
-
-/*
- * VOID
- * IoSkipCurrentIrpStackLocation(
- *   IN PIRP  Irp)
- */
-#define IoSkipCurrentIrpStackLocation(_Irp) \
-{ \
-  (_Irp)->CurrentLocation++; \
-  (_Irp)->Tail.Overlay.CurrentStackLocation++; \
-}
-
-NTOSAPI
-VOID
-DDKAPI
-IoStartNextPacket(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN BOOLEAN  Cancelable);
-
-NTOSAPI
-VOID
-DDKAPI
-IoStartNextPacketByKey(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN BOOLEAN  Cancelable,
-  IN ULONG  Key);
-
-NTOSAPI
-VOID
-DDKAPI
-IoStartPacket(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  IN PULONG  Key  OPTIONAL,
-  IN PDRIVER_CANCEL  CancelFunction  OPTIONAL);
-
-NTOSAPI
-VOID
-DDKAPI
-IoStartTimer(
-  IN PDEVICE_OBJECT  DeviceObject);
-
-NTOSAPI
-VOID
-DDKAPI
-IoStopTimer(
-  IN PDEVICE_OBJECT  DeviceObject);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoUnregisterPlugPlayNotification(
-  IN PVOID  NotificationEntry);
-
-NTOSAPI
-VOID
-DDKAPI
-IoUnregisterShutdownNotification(
-  IN PDEVICE_OBJECT  DeviceObject);
-
-NTOSAPI
-VOID
-DDKAPI
-IoUpdateShareAccess(
-  IN PFILE_OBJECT  FileObject,
-  IN OUT PSHARE_ACCESS  ShareAccess);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoVerifyPartitionTable(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN BOOLEAN  FixErrors);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoVolumeDeviceToDosName(
-  IN  PVOID  VolumeDeviceObject,
-  OUT PUNICODE_STRING  DosName);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIAllocateInstanceIds(
-  IN GUID  *Guid,
-  IN ULONG  InstanceCount,
-  OUT ULONG  *FirstInstanceId);
-
-NTOSAPI
-ULONG
-DDKAPI
-IoWMIDeviceObjectToProviderId(
-  IN PDEVICE_OBJECT  DeviceObject);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIDeviceObjectToInstanceName(
-  IN PVOID  DataBlockObject,
-  IN PDEVICE_OBJECT  DeviceObject,
-  OUT PUNICODE_STRING  InstanceName);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIExecuteMethod(
-  IN PVOID  DataBlockObject,
-  IN PUNICODE_STRING  InstanceName,
-  IN ULONG  MethodId,
-  IN ULONG  InBufferSize,
-  IN OUT PULONG  OutBufferSize,
-  IN OUT  PUCHAR  InOutBuffer);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIHandleToInstanceName(
-  IN PVOID  DataBlockObject,
-  IN HANDLE  FileHandle,
-  OUT PUNICODE_STRING  InstanceName);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIOpenBlock(
-  IN GUID  *DataBlockGuid,
-  IN ULONG  DesiredAccess,
-  OUT PVOID  *DataBlockObject);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIQueryAllData(
-  IN PVOID  DataBlockObject,
-  IN OUT ULONG  *InOutBufferSize,
-  OUT PVOID  OutBuffer);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIQueryAllDataMultiple(
-  IN PVOID  *DataBlockObjectList,
-  IN ULONG  ObjectCount,
-  IN OUT ULONG  *InOutBufferSize,
-  OUT PVOID  OutBuffer);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIQuerySingleInstance(
-  IN PVOID  DataBlockObject,
-  IN PUNICODE_STRING  InstanceName,
-  IN OUT ULONG  *InOutBufferSize,
-  OUT PVOID OutBuffer);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIQuerySingleInstanceMultiple(
-  IN PVOID  *DataBlockObjectList,
-  IN PUNICODE_STRING  InstanceNames,
-  IN ULONG  ObjectCount,
-  IN OUT ULONG  *InOutBufferSize,
-  OUT PVOID  OutBuffer);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIRegistrationControl(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  Action);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMISetNotificationCallback(
-  IN PVOID  Object,
-  IN WMI_NOTIFICATION_CALLBACK  Callback,
-  IN PVOID  Context);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMISetSingleInstance(
-  IN PVOID  DataBlockObject,
-  IN PUNICODE_STRING  InstanceName,
-  IN ULONG  Version,
-  IN ULONG  ValueBufferSize,
-  IN PVOID  ValueBuffer);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMISetSingleItem(
-  IN PVOID  DataBlockObject,
-  IN PUNICODE_STRING  InstanceName,
-  IN ULONG  DataItemId,
-  IN ULONG  Version,
-  IN ULONG  ValueBufferSize,
-  IN PVOID  ValueBuffer);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMISuggestInstanceName(
-  IN PDEVICE_OBJECT  PhysicalDeviceObject OPTIONAL,
-  IN PUNICODE_STRING  SymbolicLinkName OPTIONAL,
-  IN BOOLEAN  CombineNames,
-  OUT PUNICODE_STRING  SuggestedInstanceName);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWMIWriteEvent(
-  IN PVOID  WnodeEventItem);
-
-NTOSAPI
-VOID
-DDKAPI
-IoWriteErrorLogEntry(
-  IN PVOID  ElEntry);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoWritePartitionTableEx(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN struct _DRIVE_LAYOUT_INFORMATION_EX  *PartitionBuffer);
-
-
-
-/** Kernel routines **/
-
-NTOSAPI
-VOID
-DDKFASTAPI
-KeAcquireInStackQueuedSpinLock(
-  IN PKSPIN_LOCK  SpinLock,
-  IN PKLOCK_QUEUE_HANDLE  LockHandle);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-KeAcquireInStackQueuedSpinLockAtDpcLevel(
-  IN PKSPIN_LOCK  SpinLock,
-  IN PKLOCK_QUEUE_HANDLE  LockHandle);
-
-NTOSAPI
-KIRQL
-DDKAPI
-KeAcquireInterruptSpinLock(
-  IN PKINTERRUPT  Interrupt);
-
-NTOSAPI
-VOID
-DDKAPI
-KeAcquireSpinLock(
-  IN PKSPIN_LOCK  SpinLock,
-  OUT PKIRQL  OldIrql);
-
-/* System Service Dispatch Table */
-typedef struct _SSDT {
-  ULONG  SysCallPtr;
-} SSDT, *PSSDT;
-
-/* System Service Parameters Table */
-typedef struct _SSPT {
-  ULONG  ParamBytes;
-} SSPT, *PSSPT;
-
-typedef struct _SSDT_ENTRY {
-	PSSDT  SSDT;
-	PULONG  ServiceCounterTable;
-	ULONG  NumberOfServices;
-	PSSPT  SSPT;
-} SSDT_ENTRY, *PSSDT_ENTRY;
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeAddSystemServiceTable(
-  IN PSSDT  SSDT,
-  IN PULONG  ServiceCounterTable,
-  IN ULONG  NumberOfServices,
-  IN PSSPT  SSPT,
-  IN ULONG  TableIndex);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeAreApcsDisabled(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-KeAttachProcess(
-  IN PEPROCESS  Process);
-
-NTOSAPI
-VOID
-DDKAPI
-KeBugCheck(
-  IN ULONG  BugCheckCode);
-
-NTOSAPI
-VOID
-DDKAPI
-KeBugCheckEx(
-  IN ULONG  BugCheckCode,
-  IN ULONG_PTR  BugCheckParameter1,
-  IN ULONG_PTR  BugCheckParameter2,
-  IN ULONG_PTR  BugCheckParameter3,
-  IN ULONG_PTR  BugCheckParameter4);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeCancelTimer(
-  IN PKTIMER  Timer);
-
-NTOSAPI
-VOID
-DDKAPI
-KeClearEvent(
-  IN PRKEVENT  Event);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-KeDelayExecutionThread(
-  IN KPROCESSOR_MODE  WaitMode,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Interval);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeDeregisterBugCheckCallback(
-  IN PKBUGCHECK_CALLBACK_RECORD  CallbackRecord);
-
-NTOSAPI
-VOID
-DDKAPI
-KeDetachProcess(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-KeEnterCriticalRegion(
-  VOID);
-
-/*
- * VOID
- * KeFlushIoBuffers(
- *   IN PMDL  Mdl,
- *   IN BOOLEAN  ReadOperation,
- *   IN BOOLEAN  DmaOperation)
- */
-#define KeFlushIoBuffers(_Mdl, _ReadOperation, _DmaOperation)
-
-NTOSAPI
-PRKTHREAD
-DDKAPI
-KeGetCurrentThread(
-  VOID);
-
-NTOSAPI
-KPROCESSOR_MODE
-DDKAPI
-KeGetPreviousMode(
-  VOID);
-
-NTOSAPI
-ULONG
-DDKAPI
-KeGetRecommendedSharedDataAlignment(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-KeInitializeApc(
-  IN PKAPC  Apc,
-	IN PKTHREAD  Thread,
-	IN UCHAR  StateIndex,
-	IN PKKERNEL_ROUTINE  KernelRoutine,
-	IN PKRUNDOWN_ROUTINE  RundownRoutine,
-	IN PKNORMAL_ROUTINE  NormalRoutine,
-	IN UCHAR  Mode,
-	IN PVOID  Context);
-
-NTOSAPI
-VOID
-DDKAPI
-KeInitializeDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue);
-
-NTOSAPI
-VOID
-DDKAPI
-KeInitializeMutex(
-  IN PRKMUTEX  Mutex,
-  IN ULONG  Level);
-
-NTOSAPI
-VOID
-DDKAPI
-KeInitializeSemaphore(
-  IN PRKSEMAPHORE  Semaphore,
-  IN LONG  Count,
-  IN LONG  Limit);
-
-NTOSAPI
-VOID
-DDKAPI
-KeInitializeSpinLock(
-  IN PKSPIN_LOCK  SpinLock);
-
-NTOSAPI
-VOID
-DDKAPI
-KeInitializeTimer(
-  IN PKTIMER  Timer);
-
-NTOSAPI
-VOID
-DDKAPI
-KeInitializeTimerEx(
-  IN PKTIMER  Timer,
-  IN TIMER_TYPE  Type);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeInsertByKeyDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue,
-  IN PKDEVICE_QUEUE_ENTRY  DeviceQueueEntry,
-  IN ULONG  SortKey);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeInsertDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue,
-  IN PKDEVICE_QUEUE_ENTRY  DeviceQueueEntry);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeInsertQueueDpc(
-  IN PRKDPC  Dpc,
-  IN PVOID  SystemArgument1,
-  IN PVOID  SystemArgument2);
-
-NTOSAPI
-VOID
-DDKAPI
-KeLeaveCriticalRegion(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-KeLowerIrql(
-  IN KIRQL  NewIrql);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-KePulseEvent(
-  IN PRKEVENT  Event,
-  IN KPRIORITY  Increment,
-  IN BOOLEAN  Wait);
-
-NTOSAPI
-ULONGLONG
-DDKAPI
-KeQueryInterruptTime(
-  VOID);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-KeQueryPerformanceCounter(
-  OUT PLARGE_INTEGER  PerformanceFrequency  OPTIONAL);
-
-NTOSAPI
-KPRIORITY
-DDKAPI
-KeQueryPriorityThread(
-  IN PRKTHREAD  Thread);
-
-NTOSAPI
-VOID
-DDKAPI
-KeQuerySystemTime(
-  OUT PLARGE_INTEGER  CurrentTime);
-
-NTOSAPI
-VOID
-DDKAPI
-KeQueryTickCount(
-  OUT PLARGE_INTEGER  TickCount);
-
-NTOSAPI
-ULONG
-DDKAPI
-KeQueryTimeIncrement(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-KeRaiseIrql(
-  IN KIRQL  NewIrql,
-  OUT PKIRQL  OldIrql);
-
-NTOSAPI
-KIRQL
-DDKAPI
-KeRaiseIrqlToDpcLevel(
-  VOID);
-
-NTOSAPI
-LONG
-DDKAPI
-KeReadStateEvent(
-  IN PRKEVENT  Event);
-
-NTOSAPI
-LONG
-DDKAPI
-KeReadStateMutex(
-  IN PRKMUTEX  Mutex);
-
-NTOSAPI
-LONG
-DDKAPI
-KeReadStateSemaphore(
-  IN PRKSEMAPHORE  Semaphore);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeReadStateTimer(
-  IN PKTIMER  Timer);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeRegisterBugCheckCallback(
-  IN PKBUGCHECK_CALLBACK_RECORD  CallbackRecord,
-  IN PKBUGCHECK_CALLBACK_ROUTINE  CallbackRoutine,
-  IN PVOID  Buffer,
-  IN ULONG  Length,
-  IN PUCHAR  Component);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-KeReleaseInStackQueuedSpinLock(
-  IN PKLOCK_QUEUE_HANDLE  LockHandle);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-KeReleaseInStackQueuedSpinLockFromDpcLevel(
-  IN PKLOCK_QUEUE_HANDLE  LockHandle);
-
-NTOSAPI
-VOID
-DDKAPI
-KeReleaseInterruptSpinLock(
-  IN PKINTERRUPT  Interrupt,
-  IN KIRQL  OldIrql);
-
-NTOSAPI
-LONG
-DDKAPI
-KeReleaseMutex(
-  IN PRKMUTEX  Mutex,
-  IN BOOLEAN  Wait);
-
-NTOSAPI
-LONG
-DDKAPI
-KeReleaseSemaphore(
-  IN PRKSEMAPHORE  Semaphore,
-  IN KPRIORITY  Increment,
-  IN LONG  Adjustment,
-  IN BOOLEAN  Wait);
-
-NTOSAPI
-VOID
-DDKAPI
-KeReleaseSpinLock(
-  IN PKSPIN_LOCK  SpinLock,
-  IN KIRQL  NewIrql);
-
-NTOSAPI
-PKDEVICE_QUEUE_ENTRY
-DDKAPI 
-KeRemoveByKeyDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue,
-  IN ULONG  SortKey);
-
-NTOSAPI
-PKDEVICE_QUEUE_ENTRY
-DDKAPI
-KeRemoveDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeRemoveEntryDeviceQueue(
-  IN PKDEVICE_QUEUE  DeviceQueue,
-  IN PKDEVICE_QUEUE_ENTRY  DeviceQueueEntry);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeRemoveQueueDpc(
-  IN PRKDPC  Dpc);
-
-NTOSAPI
-LONG
-DDKAPI
-KeResetEvent(
-  IN PRKEVENT  Event);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-KeRestoreFloatingPointState(
-  IN PKFLOATING_SAVE  FloatSave);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-KeSaveFloatingPointState(
-  OUT PKFLOATING_SAVE  FloatSave);
-
-NTOSAPI
-LONG
-DDKAPI
-KeSetBasePriorityThread(
-  IN PRKTHREAD  Thread,
-  IN LONG  Increment);
-
-NTOSAPI
-LONG
-DDKAPI
-KeSetEvent(
-  IN PRKEVENT  Event,
-  IN KPRIORITY  Increment,
-  IN BOOLEAN  Wait);
-
-NTOSAPI
-VOID
-DDKAPI
-KeSetImportanceDpc(
-  IN PRKDPC  Dpc,
-  IN KDPC_IMPORTANCE  Importance);
-
-NTOSAPI
-KPRIORITY
-DDKAPI
-KeSetPriorityThread(
-  IN PKTHREAD  Thread,
-  IN KPRIORITY  Priority);
-
-NTOSAPI
-VOID
-DDKAPI
-KeSetTargetProcessorDpc(
-  IN PRKDPC  Dpc,
-  IN CCHAR  Number);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeSetTimer(
-  IN PKTIMER  Timer,
-  IN LARGE_INTEGER  DueTime,
-  IN PKDPC  Dpc  OPTIONAL);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeSetTimerEx(
-  IN PKTIMER  Timer,
-  IN LARGE_INTEGER  DueTime,
-  IN LONG  Period  OPTIONAL,
-  IN PKDPC  Dpc  OPTIONAL);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-KeSetTimeUpdateNotifyRoutine(
-  IN PTIME_UPDATE_NOTIFY_ROUTINE  NotifyRoutine);
-
-NTOSAPI
-VOID
-DDKAPI
-KeStallExecutionProcessor(
-  IN ULONG  MicroSeconds);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-KeSynchronizeExecution(
-  IN PKINTERRUPT    Interrupt,
-  IN PKSYNCHRONIZE_ROUTINE  SynchronizeRoutine,
-  IN PVOID  SynchronizeContext);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-KeWaitForMultipleObjects(
-  IN ULONG  Count,
-  IN PVOID  Object[],
-  IN WAIT_TYPE  WaitType,
-  IN KWAIT_REASON  WaitReason,
-  IN KPROCESSOR_MODE  WaitMode,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Timeout  OPTIONAL,
-  IN PKWAIT_BLOCK  WaitBlockArray  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-KeWaitForMutexObject(
-  IN PRKMUTEX  Mutex,
-  IN KWAIT_REASON  WaitReason,
-  IN KPROCESSOR_MODE  WaitMode,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Timeout  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-KeWaitForSingleObject(
-  IN PVOID  Object,
-  IN KWAIT_REASON  WaitReason,
-  IN KPROCESSOR_MODE  WaitMode,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Timeout  OPTIONAL);
-
-
-
-/** Memory manager routines **/
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmAdvanceMdl(
-  IN PMDL  Mdl,
-  IN ULONG  NumberOfBytes);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmAllocateContiguousMemory(
-  IN ULONG  NumberOfBytes,
-  IN PHYSICAL_ADDRESS  HighestAcceptableAddress);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmAllocateContiguousMemorySpecifyCache(
-  IN SIZE_T  NumberOfBytes,
-  IN PHYSICAL_ADDRESS  LowestAcceptableAddress,
-  IN PHYSICAL_ADDRESS  HighestAcceptableAddress,
-  IN PHYSICAL_ADDRESS  BoundaryAddressMultiple  OPTIONAL,
-  IN MEMORY_CACHING_TYPE  CacheType);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmAllocateMappingAddress(
-  IN SIZE_T  NumberOfBytes,
-  IN ULONG  PoolTag);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmAllocateNonCachedMemory(
-  IN ULONG  NumberOfBytes);
-
-NTOSAPI
-PMDL
-DDKAPI
-MmAllocatePagesForMdl(
-  IN PHYSICAL_ADDRESS  LowAddress,
-  IN PHYSICAL_ADDRESS  HighAddress,
-  IN PHYSICAL_ADDRESS  SkipBytes,
-  IN SIZE_T  TotalBytes);
-
-NTOSAPI
-VOID
-DDKAPI
-MmBuildMdlForNonPagedPool(
-  IN OUT PMDL  MemoryDescriptorList);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmCreateSection(
-  OUT PSECTION_OBJECT  *SectionObject,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes  OPTIONAL,
-  IN PLARGE_INTEGER  MaximumSize,
-  IN ULONG  SectionPageProtection,
-  IN ULONG  AllocationAttributes,
-  IN HANDLE  FileHandle  OPTIONAL,
-  IN PFILE_OBJECT  File  OPTIONAL);
-
-typedef enum _MMFLUSH_TYPE {
-  MmFlushForDelete,
-  MmFlushForWrite
-} MMFLUSH_TYPE;
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-MmFlushImageSection(
-  IN PSECTION_OBJECT_POINTERS  SectionObjectPointer,
-  IN MMFLUSH_TYPE  FlushType);
-
-NTOSAPI
-VOID
-DDKAPI
-MmFreeContiguousMemory(
-  IN PVOID  BaseAddress);
-
-NTOSAPI
-VOID
-DDKAPI
-MmFreeContiguousMemorySpecifyCache(
-  IN PVOID  BaseAddress,
-  IN SIZE_T  NumberOfBytes,
-  IN MEMORY_CACHING_TYPE  CacheType);
-
-NTOSAPI
-VOID
-DDKAPI
-MmFreeMappingAddress(
-  IN PVOID  BaseAddress,
-  IN ULONG  PoolTag);
-
-NTOSAPI
-VOID
-DDKAPI
-MmFreeNonCachedMemory(
-  IN PVOID  BaseAddress,
-  IN SIZE_T  NumberOfBytes);
-
-NTOSAPI
-VOID
-DDKAPI
-MmFreePagesFromMdl(
-  IN PMDL  MemoryDescriptorList);
-
-/*
- * ULONG
- * MmGetMdlByteCount(
- *   IN PMDL  Mdl)
- */
-#define MmGetMdlByteCount(_Mdl) \
-  ((_Mdl)->ByteCount)
-
-/*
- * ULONG
- * MmGetMdlByteOffset(
- *   IN PMDL  Mdl)
- */
-#define MmGetMdlByteOffset(_Mdl) \
-  ((_Mdl)->ByteOffset)
-
-/*
- * PPFN_NUMBER
- * MmGetMdlPfnArray(
- *   IN PMDL  Mdl)
- */
-#define MmGetMdlPfnArray(_Mdl) \
-  ((PPFN_NUMBER) ((_Mdl) + 1))
-
-/*
- * PVOID
- * MmGetMdlVirtualAddress(
- *   IN PMDL  Mdl)
- */
-#define MmGetMdlVirtualAddress(_Mdl) \
-  ((PVOID) ((PCHAR) ((_Mdl)->StartVa) + (_Mdl)->ByteOffset))
-
-NTOSAPI
-PHYSICAL_ADDRESS
-DDKAPI
-MmGetPhysicalAddress(
-  IN PVOID  BaseAddress);
-
-NTOSAPI
-PPHYSICAL_MEMORY_RANGE
-DDKAPI
-MmGetPhysicalMemoryRanges(
-  VOID);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmGetVirtualForPhysical(
-  IN PHYSICAL_ADDRESS  PhysicalAddress);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmMapLockedPagesSpecifyCache(
-  IN PMDL  MemoryDescriptorList,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN MEMORY_CACHING_TYPE  CacheType,
-  IN PVOID  BaseAddress,
-  IN ULONG  BugCheckOnFailure,
-  IN MM_PAGE_PRIORITY  Priority);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmMapLockedPagesWithReservedMapping(
-  IN PVOID  MappingAddress,
-  IN ULONG  PoolTag,
-  IN PMDL  MemoryDescriptorList,
-  IN MEMORY_CACHING_TYPE  CacheType);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmMapUserAddressesToPage(
-  IN PVOID  BaseAddress,
-  IN SIZE_T  NumberOfBytes,
-  IN PVOID  PageAddress);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmMapVideoDisplay(
-  IN PHYSICAL_ADDRESS  PhysicalAddress,
-  IN SIZE_T  NumberOfBytes,
-  IN MEMORY_CACHING_TYPE  CacheType);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmMapViewInSessionSpace(
-  IN PVOID  Section,
-  OUT PVOID  *MappedBase,
-  IN OUT PSIZE_T  ViewSize);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmMapViewInSystemSpace(
-  IN PVOID  Section,
-  OUT PVOID  *MappedBase,
-  IN PSIZE_T  ViewSize);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmMarkPhysicalMemoryAsBad(
-  IN PPHYSICAL_ADDRESS  StartAddress,
-  IN OUT PLARGE_INTEGER  NumberOfBytes);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmMarkPhysicalMemoryAsGood(
-  IN PPHYSICAL_ADDRESS  StartAddress,
-  IN OUT PLARGE_INTEGER  NumberOfBytes);
-
-/*
- * PVOID
- * MmGetSystemAddressForMdlSafe(
- *   IN PMDL  Mdl,
- *   IN MM_PAGE_PRIORITY  Priority)
- */
-#define MmGetSystemAddressForMdlSafe(_Mdl, _Priority) \
-  ((_Mdl)->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA \
-    | MDL_SOURCE_IS_NONPAGED_POOL)) ? \
-    (_Mdl)->MappedSystemVa : \
-    (PVOID) MmMapLockedPagesSpecifyCache((_Mdl), \
-      KernelMode, MmCached, NULL, FALSE, _Priority)
-
-NTOSAPI
-PVOID
-DDKAPI
-MmGetSystemRoutineAddress(
-  IN PUNICODE_STRING  SystemRoutineName);
-
-/*
- * ULONG
- * ADDRESS_AND_SIZE_TO_SPAN_PAGES(
- *   IN PVOID  Va,
- *   IN ULONG  Size)
- */
-#define ADDRESS_AND_SIZE_TO_SPAN_PAGES(_Va, \
-                                       _Size) \
-  ((ULONG) ((((ULONG_PTR) (_Va) & (PAGE_SIZE - 1)) \
-    + (_Size) + (PAGE_SIZE - 1)) >> PAGE_SHIFT))
-
-/*
- * VOID
- * MmInitializeMdl(
- *   IN PMDL  MemoryDescriptorList,
- *   IN PVOID  BaseVa,
- *   IN SIZE_T  Length)
- */
-#define MmInitializeMdl(_MemoryDescriptorList, \
-                        _BaseVa, \
-                        _Length) \
-{ \
-  (_MemoryDescriptorList)->Next = (PMDL) NULL; \
-  (_MemoryDescriptorList)->Size = (CSHORT) (sizeof(MDL) + \
-    (sizeof(PFN_NUMBER) * ADDRESS_AND_SIZE_TO_SPAN_PAGES(_BaseVa, _Length))); \
-  (_MemoryDescriptorList)->MdlFlags = 0; \
-  (_MemoryDescriptorList)->StartVa = (PVOID) PAGE_ALIGN(_BaseVa); \
-  (_MemoryDescriptorList)->ByteOffset = BYTE_OFFSET(_BaseVa); \
-  (_MemoryDescriptorList)->ByteCount = (ULONG) _Length; \
-}
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-MmIsAddressValid(
-  IN PVOID  VirtualAddress);
-
-NTOSAPI
-LOGICAL
-DDKAPI
-MmIsDriverVerifying(
-  IN PDRIVER_OBJECT  DriverObject);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-MmIsThisAnNtAsSystem(
-  VOID);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmIsVerifierEnabled(
-  OUT PULONG  VerifierFlags);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmLockPagableDataSection(
-  IN PVOID  AddressWithinSection);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmLockPagableImageSection(
-  IN PVOID  AddressWithinSection);
-
-/*
- * PVOID
- * MmLockPagableCodeSection(
- *   IN PVOID  AddressWithinSection)
- */
-#define MmLockPagableCodeSection MmLockPagableDataSection
-
-NTOSAPI
-VOID
-DDKAPI
-MmLockPagableSectionByHandle(
-  IN PVOID  ImageSectionHandle);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmMapIoSpace(
-  IN PHYSICAL_ADDRESS  PhysicalAddress,
-  IN ULONG  NumberOfBytes,
-  IN MEMORY_CACHING_TYPE  CacheEnable);
-
-NTOSAPI
-PVOID
-DDKAPI
-MmMapLockedPages(
-  IN PMDL  MemoryDescriptorList,
-  IN KPROCESSOR_MODE  AccessMode);
-
-NTOSAPI
-VOID
-DDKAPI
-MmPageEntireDriver(
-  IN PVOID  AddressWithinSection);
-
-NTOSAPI
-VOID
-DDKAPI
-MmProbeAndLockProcessPages(
-  IN OUT PMDL  MemoryDescriptorList,
-  IN PEPROCESS  Process,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN LOCK_OPERATION  Operation);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmProtectMdlSystemAddress(
-  IN PMDL  MemoryDescriptorList,
-  IN ULONG  NewProtect);
-
-NTOSAPI
-VOID
-DDKAPI
-MmUnmapLockedPages(
-  IN PVOID  BaseAddress,
-  IN PMDL  MemoryDescriptorList);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmUnmapViewInSessionSpace(
-  IN PVOID  MappedBase);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmUnmapViewInSystemSpace(
-  IN PVOID MappedBase);
-
-NTOSAPI
-VOID
-DDKAPI
-MmUnsecureVirtualMemory(
-  IN HANDLE  SecureHandle);
-
-/*
- * VOID
- * MmPrepareMdlForReuse(
- *   IN PMDL  Mdl)
- */
-#define MmPrepareMdlForReuse(_Mdl) \
-{ \
-  if (((_Mdl)->MdlFlags & MDL_PARTIAL_HAS_BEEN_MAPPED) != 0) { \
-    assert(((_Mdl)->MdlFlags & MDL_PARTIAL) != 0); \
-    MmUnmapLockedPages((_Mdl)->MappedSystemVa, (_Mdl)); \
-  } else if (((_Mdl)->MdlFlags & MDL_PARTIAL) == 0) { \
-    assert(((_Mdl)->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) == 0); \
-  } \
-}
-
-NTOSAPI
-VOID
-DDKAPI
-MmProbeAndLockPages(
-  IN OUT PMDL  MemoryDescriptorList,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN LOCK_OPERATION  Operation);
-
-NTOSAPI
-MM_SYSTEM_SIZE
-DDKAPI
-MmQuerySystemSize(
-  VOID);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-MmRemovePhysicalMemory(
-  IN PPHYSICAL_ADDRESS  StartAddress,
-  IN OUT PLARGE_INTEGER  NumberOfBytes);
-
-NTOSAPI
-VOID
-DDKAPI
-MmResetDriverPaging(
-  IN PVOID  AddressWithinSection);
-
-NTOSAPI
-HANDLE
-DDKAPI
-MmSecureVirtualMemory(
-  IN PVOID  Address,
-  IN SIZE_T  Size,
-  IN ULONG  ProbeMode);
-
-NTOSAPI
-ULONG
-DDKAPI
-MmSizeOfMdl(
-  IN PVOID  Base,
-  IN SIZE_T  Length);
-
-NTOSAPI
-VOID
-DDKAPI
-MmUnlockPagableImageSection(
-  IN PVOID  ImageSectionHandle);
-
-NTOSAPI
-VOID
-DDKAPI
-MmUnlockPages(
-  IN PMDL  MemoryDescriptorList);
-
-NTOSAPI
-VOID
-DDKAPI
-MmUnmapIoSpace(
-  IN PVOID  BaseAddress,
-  IN SIZE_T  NumberOfBytes);
-
-NTOSAPI
-VOID
-DDKAPI
-MmUnmapReservedMapping(
-  IN PVOID  BaseAddress,
-  IN ULONG  PoolTag,
-  IN PMDL  MemoryDescriptorList);
-
-NTOSAPI
-VOID
-DDKAPI
-MmUnmapVideoDisplay(
-  IN PVOID  BaseAddress,
-  IN SIZE_T  NumberOfBytes);
-
-
-
-/** Object manager routines **/
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ObAssignSecurity(
-  IN PACCESS_STATE  AccessState,
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN PVOID  Object,
-  IN POBJECT_TYPE  Type);
-
-NTOSAPI
-VOID
-DDKAPI
-ObDereferenceSecurityDescriptor(
-  PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  ULONG  Count);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-ObfDereferenceObject(
-  IN PVOID  Object);
-
-/*
- * VOID
- * ObDereferenceObject(
- *   IN PVOID  Object)
- */
-#define ObDereferenceObject ObfDereferenceObject
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ObGetObjectSecurity(
-  IN PVOID  Object,
-  OUT PSECURITY_DESCRIPTOR  *SecurityDescriptor,
-  OUT PBOOLEAN  MemoryAllocated); 
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ObInsertObject(
-  IN PVOID  Object,
-  IN PACCESS_STATE  PassedAccessState  OPTIONAL,
-  IN ACCESS_MASK  DesiredAccess,
-  IN ULONG  AdditionalReferences,
-  OUT PVOID*  ReferencedObject  OPTIONAL,
-  OUT PHANDLE  Handle);
-
-NTOSAPI
-VOID
-DDKFASTAPI
-ObfReferenceObject(
-  IN PVOID  Object);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ObLogSecurityDescriptor(
-  IN PSECURITY_DESCRIPTOR  InputSecurityDescriptor,
-  OUT PSECURITY_DESCRIPTOR  *OutputSecurityDescriptor,
-  IN ULONG RefBias);
-/*
- * VOID
- * ObReferenceObject(
- *   IN PVOID  Object)
- */
-#define ObReferenceObject ObfReferenceObject
-
-NTOSAPI
-VOID
-DDKAPI
-ObMakeTemporaryObject(
-  IN PVOID  Object);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ObOpenObjectByName(
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN POBJECT_TYPE  ObjectType,
-  IN OUT PVOID  ParseContext  OPTIONAL,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN ACCESS_MASK  DesiredAccess,
-  IN PACCESS_STATE  PassedAccessState,
-  OUT PHANDLE  Handle);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ObOpenObjectByPointer(
-  IN PVOID  Object,
-  IN ULONG  HandleAttributes,
-  IN PACCESS_STATE  PassedAccessState  OPTIONAL,
-  IN ACCESS_MASK  DesiredAccess  OPTIONAL,
-  IN POBJECT_TYPE  ObjectType  OPTIONAL,
-  IN KPROCESSOR_MODE  AccessMode,
-  OUT PHANDLE  Handle);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ObQueryObjectAuditingByHandle(
-  IN HANDLE  Handle,
-  OUT PBOOLEAN  GenerateOnClose);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ObReferenceObjectByHandle(
-  IN HANDLE  Handle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_TYPE  ObjectType  OPTIONAL,
-  IN KPROCESSOR_MODE  AccessMode,
-  OUT PVOID  *Object,
-  OUT POBJECT_HANDLE_INFORMATION  HandleInformation  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ObReferenceObjectByName(
-  IN PUNICODE_STRING  ObjectPath,
-  IN ULONG  Attributes,
-  IN PACCESS_STATE  PassedAccessState  OPTIONAL,
-  IN ACCESS_MASK  DesiredAccess  OPTIONAL,
-  IN POBJECT_TYPE  ObjectType,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN OUT PVOID  ParseContext  OPTIONAL,
-  OUT PVOID  *Object);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ObReferenceObjectByPointer(
-  IN PVOID  Object,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_TYPE  ObjectType,
-  IN KPROCESSOR_MODE  AccessMode);
-
-NTOSAPI
-VOID
-DDKAPI
-ObReferenceSecurityDescriptor(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN ULONG  Count);
-
-NTOSAPI
-VOID
-DDKAPI
-ObReleaseObjectSecurity(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN BOOLEAN  MemoryAllocated);
-
-
-
-/** Process manager routines **/
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PsCreateSystemProcess(
-  IN PHANDLE  ProcessHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PsCreateSystemThread(
-  OUT PHANDLE  ThreadHandle,
-  IN ULONG  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes  OPTIONAL,
-  IN HANDLE  ProcessHandle  OPTIONAL,
-  OUT PCLIENT_ID  ClientId  OPTIONAL,
-  IN PKSTART_ROUTINE  StartRoutine,
-  IN PVOID  StartContext);
-
-/*
- * PEPROCESS
- * PsGetCurrentProcess(VOID)
- */
-#define PsGetCurrentProcess IoGetCurrentProcess
-
-NTOSAPI
-HANDLE
-DDKAPI
-PsGetCurrentProcessId(
-  VOID);
-
-/*
- * PETHREAD
- * PsGetCurrentThread(VOID)
- */
-#define PsGetCurrentThread() \
-  ((PETHREAD) KeGetCurrentThread())
-
-NTOSAPI
-HANDLE
-DDKAPI
-PsGetCurrentThreadId(
-  VOID);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-PsGetVersion(
-  PULONG  MajorVersion  OPTIONAL,
-  PULONG  MinorVersion  OPTIONAL,
-  PULONG  BuildNumber  OPTIONAL,
-  PUNICODE_STRING  CSDVersion  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PsRemoveCreateThreadNotifyRoutine(
-  IN PCREATE_THREAD_NOTIFY_ROUTINE  NotifyRoutine);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PsRemoveLoadImageNotifyRoutine(
-  IN PLOAD_IMAGE_NOTIFY_ROUTINE  NotifyRoutine);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PsSetCreateProcessNotifyRoutine(
-  IN PCREATE_PROCESS_NOTIFY_ROUTINE  NotifyRoutine,
-  IN BOOLEAN  Remove);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PsSetCreateThreadNotifyRoutine(
-  IN PCREATE_THREAD_NOTIFY_ROUTINE  NotifyRoutine);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PsSetLoadImageNotifyRoutine(
-  IN PLOAD_IMAGE_NOTIFY_ROUTINE  NotifyRoutine);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PsTerminateSystemThread(
-  IN NTSTATUS  ExitStatus);
-
-
-
-/** Security reference monitor routines **/
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-SeAccessCheck(
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor,
-  IN PSECURITY_SUBJECT_CONTEXT  SubjectSecurityContext,
-  IN BOOLEAN  SubjectContextLocked,
-  IN ACCESS_MASK  DesiredAccess,
-  IN ACCESS_MASK  PreviouslyGrantedAccess,
-  OUT PPRIVILEGE_SET  *Privileges  OPTIONAL,
-  IN PGENERIC_MAPPING  GenericMapping,
-  IN KPROCESSOR_MODE  AccessMode,
-  OUT PACCESS_MASK  GrantedAccess,
-  OUT PNTSTATUS  AccessStatus);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-SeAssignSecurity(
-  IN PSECURITY_DESCRIPTOR  ParentDescriptor  OPTIONAL,
-  IN PSECURITY_DESCRIPTOR  ExplicitDescriptor  OPTIONAL,
-  OUT PSECURITY_DESCRIPTOR  *NewDescriptor,
-  IN BOOLEAN  IsDirectoryObject,
-  IN PSECURITY_SUBJECT_CONTEXT  SubjectContext,
-  IN PGENERIC_MAPPING  GenericMapping,
-  IN POOL_TYPE  PoolType);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-SeAssignSecurityEx(
-  IN PSECURITY_DESCRIPTOR  ParentDescriptor  OPTIONAL,
-  IN PSECURITY_DESCRIPTOR  ExplicitDescriptor  OPTIONAL,
-  OUT PSECURITY_DESCRIPTOR  *NewDescriptor,
-  IN GUID  *ObjectType  OPTIONAL,
-  IN BOOLEAN  IsDirectoryObject,
-  IN ULONG  AutoInheritFlags,
-  IN PSECURITY_SUBJECT_CONTEXT  SubjectContext,
-  IN PGENERIC_MAPPING  GenericMapping,
-  IN POOL_TYPE  PoolType);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-SeDeassignSecurity(
-  IN OUT PSECURITY_DESCRIPTOR  *SecurityDescriptor);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-SeSinglePrivilegeCheck(
-  LUID  PrivilegeValue,
-  KPROCESSOR_MODE  PreviousMode);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-SeValidSecurityDescriptor(
-  IN ULONG  Length,
-  IN PSECURITY_DESCRIPTOR  SecurityDescriptor);
-
-
-
-/** NtXxx routines **/
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtOpenProcess(
-  OUT PHANDLE  ProcessHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN PCLIENT_ID  ClientId  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtQueryInformationProcess(
-  IN HANDLE  ProcessHandle,
-  IN PROCESSINFOCLASS  ProcessInformationClass,
-  OUT PVOID  ProcessInformation,
-  IN ULONG  ProcessInformationLength,
-  OUT PULONG  ReturnLength OPTIONAL);
-
-
-
-/** NtXxx and ZwXxx routines **/
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwCancelTimer(
-  IN HANDLE  TimerHandle,
-  OUT PBOOLEAN  CurrentState  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtClose(
-  IN HANDLE  Handle);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwClose(
-  IN HANDLE  Handle);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwCreateDirectoryObject(
-  OUT PHANDLE  DirectoryHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtCreateEvent(
-  OUT PHANDLE  EventHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN BOOLEAN  ManualReset,
-  IN BOOLEAN  InitialState);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwCreateEvent(
-  OUT PHANDLE  EventHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN BOOLEAN  ManualReset,
-  IN BOOLEAN  InitialState);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwCreateFile(
-  OUT PHANDLE  FileHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN PLARGE_INTEGER  AllocationSize  OPTIONAL,
-  IN ULONG  FileAttributes,
-  IN ULONG  ShareAccess,
-  IN ULONG  CreateDisposition,
-  IN ULONG  CreateOptions,
-  IN PVOID  EaBuffer  OPTIONAL,
-  IN ULONG  EaLength);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwCreateKey(
-  OUT PHANDLE  KeyHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  IN ULONG  TitleIndex,
-  IN PUNICODE_STRING  Class  OPTIONAL,
-  IN ULONG  CreateOptions,
-  OUT PULONG  Disposition  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwCreateTimer(
-  OUT PHANDLE  TimerHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes  OPTIONAL,
-  IN TIMER_TYPE  TimerType);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwDeleteKey(
-  IN HANDLE  KeyHandle);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwDeleteValueKey(
-  IN HANDLE  KeyHandle,
-  IN PUNICODE_STRING  ValueName);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtDeviceIoControlFile(
-  IN HANDLE  DeviceHandle,
-  IN HANDLE  Event  OPTIONAL, 
-  IN PIO_APC_ROUTINE  UserApcRoutine  OPTIONAL, 
-  IN PVOID  UserApcContext  OPTIONAL, 
-  OUT PIO_STATUS_BLOCK  IoStatusBlock, 
-  IN ULONG  IoControlCode,
-  IN PVOID  InputBuffer, 
-  IN ULONG  InputBufferSize,
-  OUT PVOID  OutputBuffer,
-  IN ULONG  OutputBufferSize);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwDeviceIoControlFile(
-  IN HANDLE  DeviceHandle,
-  IN HANDLE  Event  OPTIONAL, 
-  IN PIO_APC_ROUTINE  UserApcRoutine  OPTIONAL, 
-  IN PVOID  UserApcContext  OPTIONAL, 
-  OUT PIO_STATUS_BLOCK  IoStatusBlock, 
-  IN ULONG  IoControlCode,
-  IN PVOID  InputBuffer, 
-  IN ULONG  InputBufferSize,
-  OUT PVOID  OutputBuffer,
-  IN ULONG  OutputBufferSize);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwEnumerateKey(
-  IN HANDLE  KeyHandle,
-  IN ULONG  Index,
-  IN KEY_INFORMATION_CLASS  KeyInformationClass,
-  OUT PVOID  KeyInformation,
-  IN ULONG  Length,
-  OUT PULONG  ResultLength);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwEnumerateValueKey(
-  IN HANDLE  KeyHandle,
-  IN ULONG  Index,
-  IN KEY_VALUE_INFORMATION_CLASS  KeyValueInformationClass,
-  OUT PVOID  KeyValueInformation,
-  IN ULONG  Length,
-  OUT PULONG  ResultLength);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwFlushKey(
-  IN HANDLE  KeyHandle);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwMakeTemporaryObject(
-  IN HANDLE  Handle);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtMapViewOfSection(
-  IN HANDLE  SectionHandle,
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN ULONG  ZeroBits,
-  IN ULONG  CommitSize,
-  IN OUT PLARGE_INTEGER  SectionOffset  OPTIONAL,
-  IN OUT PSIZE_T  ViewSize,
-  IN SECTION_INHERIT  InheritDisposition,
-  IN ULONG  AllocationType,
-  IN ULONG  Protect);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwMapViewOfSection(
-  IN HANDLE  SectionHandle,
-  IN HANDLE  ProcessHandle,
-  IN OUT PVOID  *BaseAddress,
-  IN ULONG  ZeroBits,
-  IN ULONG  CommitSize,
-  IN OUT PLARGE_INTEGER  SectionOffset  OPTIONAL,
-  IN OUT PSIZE_T  ViewSize,
-  IN SECTION_INHERIT  InheritDisposition,
-  IN ULONG  AllocationType,
-  IN ULONG  Protect);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtOpenFile(
-  OUT PHANDLE  FileHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN ULONG  ShareAccess,
-  IN ULONG  OpenOptions);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwOpenFile(
-  OUT PHANDLE  FileHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN ULONG  ShareAccess,
-  IN ULONG  OpenOptions);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwOpenKey(
-  OUT PHANDLE  KeyHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwOpenSection(
-  OUT PHANDLE  SectionHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwOpenSymbolicLinkObject(
-  OUT PHANDLE  LinkHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwOpenTimer(
-  OUT PHANDLE  TimerHandle,
-  IN ACCESS_MASK  DesiredAccess,
-  IN POBJECT_ATTRIBUTES  ObjectAttributes);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwQueryInformationFile(
-  IN HANDLE  FileHandle,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  OUT PVOID  FileInformation,
-  IN ULONG  Length,
-  IN FILE_INFORMATION_CLASS  FileInformationClass);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwQueryKey(
-  IN HANDLE  KeyHandle,
-  IN KEY_INFORMATION_CLASS  KeyInformationClass,
-  OUT PVOID  KeyInformation,
-  IN ULONG  Length,
-  OUT PULONG  ResultLength);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwQuerySymbolicLinkObject(
-  IN HANDLE  LinkHandle,
-  IN OUT PUNICODE_STRING  LinkTarget,
-  OUT PULONG  ReturnedLength  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwQueryValueKey(
-  IN HANDLE  KeyHandle,
-  IN PUNICODE_STRING  ValueName,
-  IN KEY_VALUE_INFORMATION_CLASS  KeyValueInformationClass,
-  OUT PVOID  KeyValueInformation,
-  IN ULONG  Length,
-  OUT PULONG  ResultLength);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtReadFile(
-  IN HANDLE  FileHandle,
-  IN HANDLE  Event  OPTIONAL,
-  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-  IN PVOID  ApcContext  OPTIONAL,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  OUT PVOID  Buffer,
-  IN ULONG  Length,
-  IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-  IN PULONG  Key  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwReadFile(
-  IN HANDLE  FileHandle,
-  IN HANDLE  Event  OPTIONAL,
-  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-  IN PVOID  ApcContext  OPTIONAL,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  OUT PVOID  Buffer,
-  IN ULONG  Length,
-  IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-  IN PULONG  Key  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtSetEvent(
-  IN HANDLE  EventHandle,
-  IN PULONG  NumberOfThreadsReleased);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwSetEvent(
-  IN HANDLE  EventHandle,
-  IN PULONG  NumberOfThreadsReleased);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwSetInformationFile(
-  IN HANDLE  FileHandle,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN PVOID  FileInformation,
-  IN ULONG  Length,
-  IN FILE_INFORMATION_CLASS  FileInformationClass);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwSetInformationThread(
-  IN HANDLE  ThreadHandle,
-  IN THREADINFOCLASS  ThreadInformationClass,
-  IN PVOID  ThreadInformation,
-  IN ULONG  ThreadInformationLength);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwSetTimer(
-  IN HANDLE  TimerHandle,
-  IN PLARGE_INTEGER  DueTime,
-  IN PTIMER_APC_ROUTINE  TimerApcRoutine  OPTIONAL,
-  IN PVOID  TimerContext  OPTIONAL,
-  IN BOOLEAN  WakeTimer,
-  IN LONG  Period  OPTIONAL,
-  OUT PBOOLEAN  PreviousState  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwSetValueKey(
-  IN HANDLE  KeyHandle,
-  IN PUNICODE_STRING  ValueName,
-  IN ULONG  TitleIndex  OPTIONAL,
-  IN ULONG  Type,
-  IN PVOID  Data,
-  IN ULONG  DataSize);
-
-/* [Nt|Zw]MapViewOfSection.InheritDisposition constants */
-#define AT_EXTENDABLE_FILE                0x00002000
-#define SEC_NO_CHANGE                     0x00400000
-#define AT_RESERVED                       0x20000000
-#define AT_ROUND_TO_PAGE                  0x40000000
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtUnmapViewOfSection(
-  IN HANDLE  ProcessHandle,
-  IN PVOID  BaseAddress);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwUnmapViewOfSection(
-  IN HANDLE  ProcessHandle,
-  IN PVOID  BaseAddress);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtWaitForSingleObject(
-  IN HANDLE  Object,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Time);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwWaitForSingleObject(
-  IN HANDLE  Object,
-  IN BOOLEAN  Alertable,
-  IN PLARGE_INTEGER  Time);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-NtWriteFile(
-  IN HANDLE  FileHandle,
-  IN HANDLE  Event  OPTIONAL,
-  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-  IN PVOID  ApcContext  OPTIONAL,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN PVOID  Buffer,
-  IN ULONG  Length,
-  IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-  IN PULONG  Key  OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ZwWriteFile(
-  IN HANDLE  FileHandle,
-  IN HANDLE  Event  OPTIONAL,
-  IN PIO_APC_ROUTINE  ApcRoutine  OPTIONAL,
-  IN PVOID  ApcContext  OPTIONAL,
-  OUT PIO_STATUS_BLOCK  IoStatusBlock,
-  IN PVOID  Buffer,
-  IN ULONG  Length,
-  IN PLARGE_INTEGER  ByteOffset  OPTIONAL,
-  IN PULONG  Key  OPTIONAL);
-
-
-
-/** Power management support routines **/
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PoCallDriver(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN OUT PIRP  Irp);
-
-NTOSAPI
-PULONG
-DDKAPI
-PoRegisterDeviceForIdleDetection(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  ConservationIdleTime,
-  IN ULONG  PerformanceIdleTime,
-  IN DEVICE_POWER_STATE  State);
-
-NTOSAPI
-PVOID
-DDKAPI
-PoRegisterSystemState(
-  IN PVOID  StateHandle,
-  IN EXECUTION_STATE  Flags);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PoRequestPowerIrp(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN UCHAR  MinorFunction,  
-  IN POWER_STATE  PowerState,
-  IN PREQUEST_POWER_COMPLETE  CompletionFunction,
-  IN PVOID  Context,
-  OUT PIRP  *Irp OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-PoRequestShutdownEvent(
-  OUT PVOID  *Event);
-
-NTOSAPI
-VOID
-DDKAPI
-PoSetDeviceBusy(
-  PULONG  IdlePointer); 
-
-NTOSAPI
-POWER_STATE
-DDKAPI
-PoSetPowerState(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN POWER_STATE_TYPE  Type,
-  IN POWER_STATE  State);
-
-NTOSAPI
-VOID
-DDKAPI
-PoSetSystemState(
-  IN EXECUTION_STATE  Flags);
-
-NTOSAPI
-VOID
-DDKAPI
-PoStartNextPowerIrp(
-  IN PIRP  Irp);
-
-NTOSAPI
-VOID
-DDKAPI
-PoUnregisterSystemState(
-  IN PVOID  StateHandle);
-
-
-
-/** WMI library support routines **/
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-WmiCompleteRequest(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  IN NTSTATUS  Status,
-  IN ULONG  BufferUsed,
-  IN CCHAR  PriorityBoost);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-WmiFireEvent(
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN LPGUID  Guid, 
-  IN ULONG  InstanceIndex,
-  IN ULONG  EventDataSize,
-  IN PVOID  EventData); 
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-WmiQueryTraceInformation(
-  IN TRACE_INFORMATION_CLASS  TraceInformationClass,
-  OUT PVOID  TraceInformation,
-  IN ULONG  TraceInformationLength,
-  OUT PULONG  RequiredLength OPTIONAL,
-  IN PVOID  Buffer OPTIONAL);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-WmiSystemControl(
-  IN PWMILIB_CONTEXT  WmiLibInfo,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN PIRP  Irp,
-  OUT PSYSCTL_IRP_DISPOSITION  IrpDisposition);
-
-NTOSAPI
-NTSTATUS
-DDKCDECLAPI
-WmiTraceMessage(
-  IN TRACEHANDLE  LoggerHandle,
-  IN ULONG  MessageFlags,
-  IN LPGUID  MessageGuid,
-  IN USHORT  MessageNumber,
-  IN ...);
-
-#if 0
-/* FIXME: Get va_list from where? */
-NTOSAPI
-NTSTATUS
-DDKCDECLAPI
-WmiTraceMessageVa(
-  IN TRACEHANDLE  LoggerHandle,
-  IN ULONG  MessageFlags,
-  IN LPGUID  MessageGuid,
-  IN USHORT  MessageNumber,
-  IN va_list  MessageArgList);
-#endif
-
-
-/** Kernel debugger routines **/
-
-NTOSAPI
-VOID
-DDKAPI
-KdDisableDebugger(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-KdEnableDebugger(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-DbgBreakPoint(
-  VOID);
-
-NTOSAPI
-VOID
-DDKAPI
-DbgBreakPointWithStatus(
-  IN ULONG  Status);
-
-NTOSAPI
-ULONG
-DDKCDECLAPI
-DbgPrint(
-  IN PCH  Format,
-  IN ...);
-
-NTOSAPI
-ULONG
-DDKCDECLAPI
-DbgPrintEx(
-  IN ULONG  ComponentId,
-  IN ULONG  Level,
-  IN PCH  Format,
-  IN ...);
-
-NTOSAPI
-ULONG
-DDKCDECLAPI
-DbgPrintReturnControlC(
-  IN PCH  Format,
-  IN ...);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-DbgQueryDebugFilterState(
-  IN ULONG  ComponentId,
-  IN ULONG  Level);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-DbgSetDebugFilterState(
-  IN ULONG  ComponentId,
-  IN ULONG  Level,
-  IN BOOLEAN  State);
-
-#if DBG
-
-#define KdPrint(_x_) DbgPrint _x_
-#define KdPrintEx(_x_) DbgPrintEx _x_
-#define KdBreakPoint() DbgBreakPoint()
-#define KdBreakPointWithStatus(s) DbgBreakPointWithStatus(s)
-
-#else /* !DBG */
-
-#define KdPrint(_x_)
-#define KdPrintEx(_x_)
-#define KdBreakPoint()
-#define KdBreakPointWithStatus(s)
-
-#endif /* !DBG */
-
-extern NTOSAPI PBOOLEAN KdDebuggerNotPresent;
-extern NTOSAPI PBOOLEAN KdDebuggerEnabled;
-#define KD_DEBUGGER_ENABLED     *KdDebuggerEnabled
-#define KD_DEBUGGER_NOT_PRESENT *KdDebuggerNotPresent
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __WINDDK_H */
diff --git a/winsup/w32api/include/ddk/winnt4.h b/winsup/w32api/include/ddk/winnt4.h
deleted file mode 100644
index 0c73231cb..000000000
--- a/winsup/w32api/include/ddk/winnt4.h
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * winnt4.h
- *
- * Definitions only used in Windows NT 4.0 and earlier versions
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __WINNT4_H
-#define __WINNT4_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-typedef struct _ZONE_SEGMENT_HEADER {
-  SINGLE_LIST_ENTRY  SegmentList;
-  PVOID  Reserved;
-} ZONE_SEGMENT_HEADER, *PZONE_SEGMENT_HEADER;
-
-typedef struct _ZONE_HEADER {
-  SINGLE_LIST_ENTRY  FreeList;
-  SINGLE_LIST_ENTRY  SegmentList;
-  ULONG  BlockSize;
-  ULONG  TotalSegmentSize;
-} ZONE_HEADER, *PZONE_HEADER;
-
-static __inline PVOID
-ExAllocateFromZone(
-  IN PZONE_HEADER  Zone)
-{
-  if (Zone->FreeList.Next)
-    Zone->FreeList.Next = Zone->FreeList.Next->Next;
-  return (PVOID) Zone->FreeList.Next;
-}
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ExExtendZone(
-  IN PZONE_HEADER  Zone,
-  IN PVOID  Segment,
-  IN ULONG  SegmentSize);
-
-static __inline PVOID
-ExFreeToZone(
-  IN PZONE_HEADER  Zone,
-  IN PVOID  Block)
-{
-  ((PSINGLE_LIST_ENTRY) Block)->Next = Zone->FreeList.Next;
-  Zone->FreeList.Next = ((PSINGLE_LIST_ENTRY) Block);
-  return ((PSINGLE_LIST_ENTRY) Block)->Next;
-}
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ExInitializeZone(
-  IN PZONE_HEADER  Zone,
-  IN ULONG  BlockSize,
-  IN PVOID  InitialSegment,
-  IN ULONG  InitialSegmentSize);
-
-/*
- * PVOID
- * ExInterlockedAllocateFromZone(
- *   IN PZONE_HEADER  Zone,
- *   IN PKSPIN_LOCK  Lock)
- */
-#define ExInterlockedAllocateFromZone(Zone, \
-                              Lock) \
-  ((PVOID) ExInterlockedPopEntryList(&Zone->FreeList, Lock))
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-ExInterlockedExtendZone(
-  IN PZONE_HEADER  Zone,
-  IN PVOID  Segment,
-  IN ULONG  SegmentSize,
-  IN PKSPIN_LOCK  Lock);
-
-NTOSAPI
-PVOID
-DDKAPI
-ExInterlockedFreeToZone(
-  IN PZONE_HEADER  Zone,
-  IN PVOID  Block,
-  IN PKSPIN_LOCK  Lock);
-
-/*
- * VOID
- * ExInitializeWorkItem(
- *   IN PWORK_QUEUE_ITEM  Item,
- *   IN PWORKER_THREAD_ROUTINE  Routine,
- *   IN PVOID  Context)
- */
-#define ExInitializeWorkItem(Item, \
-                             Routine, \
-                             Context) \
-{ \
-  (Item)->WorkerRoutine = Routine; \
-  (Item)->Parameter = Context; \
-  (Item)->List.Flink = NULL; \
-}
-
-/*
- * BOOLEAN
- * ExIsFullZone(
- *  IN PZONE_HEADER  Zone)
- */
-#define ExIsFullZone(Zone) \
-  ((Zone)->FreeList.Next == (PSINGLE_LIST_ENTRY) NULL)
-
-NTOSAPI
-VOID
-DDKAPI
-ExQueueWorkItem(
-  IN PWORK_QUEUE_ITEM  WorkItem,
-  IN WORK_QUEUE_TYPE  QueueType);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-ExIsObjectInFirstZoneSegment(
-  IN PZONE_HEADER  Zone,
-  IN PVOID  Object);
-
-NTOSAPI
-VOID
-DDKAPI
-ExReleaseResource(
-  IN PERESOURCE  Resource);
-
-#define ExAcquireResourceExclusive ExAcquireResourceExclusiveLite
-#define ExAcquireResourceShared ExAcquireResourceSharedLite
-#define ExConvertExclusiveToShared ExConvertExclusiveToSharedLite
-#define ExDeleteResource ExDeleteResourceLite
-#define ExInitializeResource ExInitializeResourceLite
-#define ExIsResourceAcquiredExclusive ExIsResourceAcquiredExclusiveLite
-#define ExIsResourceAcquiredShared ExIsResourceAcquiredSharedLite
-#define ExIsResourceAcquired ExIsResourceAcquiredSharedLite
-#define ExReleaseResourceForThread ExReleaseResourceForThreadLite
-
-NTOSAPI
-INTERLOCKED_RESULT
-DDKAPI
-ExInterlockedDecrementLong(
-  IN PLONG  Addend,
-  IN PKSPIN_LOCK  Lock);
-
-NTOSAPI
-ULONG
-DDKAPI
-ExInterlockedExchangeUlong(
-  IN PULONG  Target,
-  IN ULONG  Value,
-  IN PKSPIN_LOCK  Lock);
-
-NTOSAPI
-INTERLOCKED_RESULT
-DDKAPI
-ExInterlockedIncrementLong(
-  IN PLONG  Addend,
-  IN PKSPIN_LOCK  Lock);
-
-NTOSAPI
-PVOID
-DDKAPI
-HalAllocateCommonBuffer(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN ULONG  Length,
-  OUT PPHYSICAL_ADDRESS  LogicalAddress,
-  IN BOOLEAN  CacheEnabled);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-HalAssignSlotResources(
-  IN PUNICODE_STRING  RegistryPath,
-  IN PUNICODE_STRING  DriverClassName,
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN INTERFACE_TYPE  BusType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN OUT PCM_RESOURCE_LIST  *AllocatedResources);
-
-NTOSAPI
-VOID
-DDKAPI
-HalFreeCommonBuffer(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN ULONG  Length,
-  IN PHYSICAL_ADDRESS  LogicalAddress,
-  IN PVOID  VirtualAddress,
-  IN BOOLEAN  CacheEnabled);
-
-NTOSAPI
-PADAPTER_OBJECT
-DDKAPI
-HalGetAdapter(
-  IN PDEVICE_DESCRIPTION  DeviceDescription,
-  IN OUT PULONG  NumberOfMapRegisters);
-
-NTOSAPI
-ULONG
-DDKAPI
-HalGetBusData(
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
-
-NTOSAPI
-ULONG
-DDKAPI
-HalGetBusDataByOffset(
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
-
-NTOSAPI
-ULONG
-DDKAPI
-HalGetDmaAlignmentRequirement( 
-  VOID);
-
-NTOSAPI
-ULONG
-DDKAPI
-HalGetInterruptVector(
-  IN INTERFACE_TYPE  InterfaceType,
-  IN ULONG  BusNumber,
-  IN ULONG  BusInterruptLevel,
-  IN ULONG  BusInterruptVector,
-  OUT PKIRQL  Irql,
-  OUT PKAFFINITY  Affinity);
-
-NTOSAPI
-ULONG
-DDKAPI
-HalReadDmaCounter(
-  IN PADAPTER_OBJECT  AdapterObject);
-
-NTOSAPI
-ULONG
-DDKAPI
-HalSetBusData(
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Length);
-
-NTOSAPI
-ULONG
-DDKAPI
-HalSetBusDataByOffset(
-  IN BUS_DATA_TYPE  BusDataType,
-  IN ULONG  BusNumber,
-  IN ULONG  SlotNumber,
-  IN PVOID  Buffer,
-  IN ULONG  Offset,
-  IN ULONG  Length);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-HalTranslateBusAddress(
-  IN INTERFACE_TYPE  InterfaceType,
-  IN ULONG  BusNumber,
-  IN PHYSICAL_ADDRESS  BusAddress,
-  IN OUT PULONG  AddressSpace,
-  OUT PPHYSICAL_ADDRESS  TranslatedAddress);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoAllocateAdapterChannel(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN PDEVICE_OBJECT  DeviceObject,
-  IN ULONG  NumberOfMapRegisters,
-  IN PDRIVER_CONTROL  ExecutionRoutine,
-  IN PVOID  Context);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoAssignResources(
-  IN PUNICODE_STRING  RegistryPath,
-  IN PUNICODE_STRING  DriverClassName  OPTIONAL,
-  IN PDRIVER_OBJECT  DriverObject,
-  IN PDEVICE_OBJECT  DeviceObject  OPTIONAL,
-  IN PIO_RESOURCE_REQUIREMENTS_LIST  RequestedResources,
-  IN OUT PCM_RESOURCE_LIST  *AllocatedResources);
-
-NTOSAPI
-NTSTATUS
-DDKAPI
-IoAttachDeviceByPointer(
-  IN PDEVICE_OBJECT  SourceDevice,
-  IN PDEVICE_OBJECT  TargetDevice);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-IoFlushAdapterBuffers(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN PMDL  Mdl,
-  IN PVOID  MapRegisterBase,
-  IN PVOID  CurrentVa,
-  IN ULONG  Length,
-  IN BOOLEAN  WriteToDevice);
-
-NTOSAPI
-VOID
-DDKAPI
-IoFreeAdapterChannel(
-  IN PADAPTER_OBJECT  AdapterObject);
-
-NTOSAPI
-VOID
-DDKAPI
-IoFreeMapRegisters(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN PVOID  MapRegisterBase,
-  IN ULONG  NumberOfMapRegisters);
-
-NTOSAPI
-PHYSICAL_ADDRESS
-DDKAPI
-IoMapTransfer(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN PMDL  Mdl,
-  IN PVOID  MapRegisterBase,
-  IN PVOID  CurrentVa,
-  IN OUT PULONG  Length,
-  IN BOOLEAN  WriteToDevice);
-
-NTOSAPI
-PMDL
-DDKAPI
-MmCreateMdl(
-  IN PMDL  MemoryDescriptorList  OPTIONAL,
-  IN PVOID  Base,
-  IN SIZE_T  Length);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-MmIsNonPagedSystemAddressValid(
-  IN PVOID  VirtualAddress);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlEnlargedIntegerMultiply(
-  IN LONG  Multiplicand,
-  IN LONG  Multiplier);
-
-NTOSAPI
-ULONG
-DDKAPI
-RtlEnlargedUnsignedDivide(
-  IN ULARGE_INTEGER  Dividend,
-  IN ULONG  Divisor,
-  IN OUT PULONG  Remainder);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlEnlargedUnsignedMultiply(
-  IN ULONG  Multiplicand,
-  IN ULONG  Multiplier);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlExtendedIntegerMultiply(
-  IN LARGE_INTEGER  Multiplicand,
-  IN LONG  Multiplier);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlExtendedLargeIntegerDivide(
-  IN LARGE_INTEGER  Dividend,
-  IN ULONG  Divisor,
-  IN OUT PULONG  Remainder);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlExtendedMagicDivide(
-  IN LARGE_INTEGER  Dividend,
-  IN LARGE_INTEGER  MagicDivisor,
-  IN CCHAR  ShiftCount);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlLargeIntegerAdd(
-  IN LARGE_INTEGER  Addend1,
-  IN LARGE_INTEGER  Addend2);
-
-NTOSAPI
-VOID
-DDKAPI
-RtlLargeIntegerAnd(
-  IN OUT LARGE_INTEGER  Result,
-  IN LARGE_INTEGER  Source,
-  IN LARGE_INTEGER  Mask);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlLargeIntegerArithmeticShift(
-  IN LARGE_INTEGER  LargeInteger,
-  IN CCHAR  ShiftCount);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlLargeIntegerDivide(
-  IN LARGE_INTEGER  Dividend,
-  IN LARGE_INTEGER  Divisor,
-  IN OUT PLARGE_INTEGER  Remainder);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerEqualTo(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerEqualToZero(
-  IN LARGE_INTEGER  Operand);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerGreaterOrEqualToZero(
-  IN LARGE_INTEGER  Operand);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerGreaterThan(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerGreaterThanOrEqualTo(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerGreaterThanZero(
-  IN LARGE_INTEGER  Operand);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerLessOrEqualToZero(
-  IN LARGE_INTEGER  Operand);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerLessThan(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerLessThanOrEqualTo(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerLessThanZero(
-  IN LARGE_INTEGER  Operand);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlLargeIntegerNegate(
-  IN LARGE_INTEGER  Subtrahend);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerNotEqualTo(
-  IN LARGE_INTEGER  Operand1,
-  IN LARGE_INTEGER  Operand2);
-
-NTOSAPI
-BOOLEAN
-DDKAPI
-RtlLargeIntegerNotEqualToZero(
-  IN LARGE_INTEGER  Operand);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlLargeIntegerShiftLeft(
-  IN LARGE_INTEGER  LargeInteger,
-  IN CCHAR  ShiftCount);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlLargeIntegerShiftRight(
-  IN LARGE_INTEGER  LargeInteger,
-  IN CCHAR  ShiftCount);
-
-NTOSAPI
-LARGE_INTEGER
-DDKAPI
-RtlLargeIntegerSubtract(
-  IN LARGE_INTEGER  Minuend,
-  IN LARGE_INTEGER  Subtrahend);
-
-
-/*
- * ULONG
- * COMPUTE_PAGES_SPANNED(
- *   IN PVOID  Va,
- *   IN ULONG  Size)
- */
-#define COMPUTE_PAGES_SPANNED(Va, \
-                              Size) \
-  (ADDRESS_AND_SIZE_TO_SPAN_PAGES(Va, Size))
-
-
-/*
-** Architecture specific structures
-*/
-
-#ifdef _X86_
-
-NTOSAPI
-INTERLOCKED_RESULT
-DDKFASTAPI
-Exfi386InterlockedIncrementLong(
-  IN PLONG  Addend);
-
-NTOSAPI
-INTERLOCKED_RESULT
-DDKFASTAPI
-Exfi386InterlockedDecrementLong(
-  IN PLONG  Addend);
-
-NTOSAPI
-ULONG
-DDKFASTAPI
-Exfi386InterlockedExchangeUlong(
-  IN PULONG  Target,
-  IN ULONG  Value);
-
-#define ExInterlockedIncrementLong(Addend,Lock) Exfi386InterlockedIncrementLong(Addend)
-#define ExInterlockedDecrementLong(Addend,Lock) Exfi386InterlockedDecrementLong(Addend)
-#define ExInterlockedExchangeUlong(Target, Value, Lock) Exfi386InterlockedExchangeUlong(Target, Value)
-
-#endif /* _X86_ */
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __WINNT4_H */
diff --git a/winsup/w32api/include/ddk/winxp.h b/winsup/w32api/include/ddk/winxp.h
deleted file mode 100644
index 28e34a89c..000000000
--- a/winsup/w32api/include/ddk/winxp.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * winxp.h
- *
- * Definitions only used in Windows XP and earlier versions
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __WINXP_H
-#define __WINXP_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __WINXP_H */
diff --git a/winsup/w32api/include/ddk/ws2san.h b/winsup/w32api/include/ddk/ws2san.h
deleted file mode 100644
index 29a21181d..000000000
--- a/winsup/w32api/include/ddk/ws2san.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * ws2san.h
- *
- * WinSock Direct (SAN) support
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __WS2SAN_H
-#define __WS2SAN_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#pragma pack(push,4)
-
-#include <winsock2.h>
-#include "ntddk.h"
-
-
-#define WSPAPI STDCALL
-
-/* FIXME: Unknown definitions */
-typedef PVOID LPWSPDATA;
-typedef PDWORD LPWSATHREADID;
-typedef PVOID LPWSPPROC_TABLE;
-typedef struct _WSPUPCALLTABLEEX WSPUPCALLTABLEEX;
-typedef WSPUPCALLTABLEEX *LPWSPUPCALLTABLEEX;
-
-#define SO_MAX_RDMA_SIZE                  0x700D
-#define SO_RDMA_THRESHOLD_SIZE            0x700E
-
-#define WSAID_REGISTERMEMORY \
-  {0xC0B422F5, 0xF58C, 0x11d1, {0xAD, 0x6C, 0x00, 0xC0, 0x4F, 0xA3, 0x4A, 0x2D}}
-
-#define WSAID_DEREGISTERMEMORY \
-  {0xC0B422F6, 0xF58C, 0x11d1, {0xAD, 0x6C, 0x00, 0xC0, 0x4F, 0xA3, 0x4A, 0x2D}}
-
-#define WSAID_REGISTERRDMAMEMORY \
-  {0xC0B422F7, 0xF58C, 0x11d1, {0xAD, 0x6C, 0x00, 0xC0, 0x4F, 0xA3, 0x4A, 0x2D}}
-
-#define WSAID_DEREGISTERRDMAMEMORY \
-  {0xC0B422F8, 0xF58C, 0x11d1, {0xAD, 0x6C, 0x00, 0xC0, 0x4F, 0xA3, 0x4A, 0x2D}}
-
-#define WSAID_RDMAWRITE \
-  {0xC0B422F9, 0xF58C, 0x11d1, {0xAD, 0x6C, 0x00, 0xC0, 0x4F, 0xA3, 0x4A, 0x2D}}
-
-#define WSAID_RDMAREAD \
-  {0xC0B422FA, 0xF58C, 0x11d1, {0xAD, 0x6C, 0x00, 0xC0, 0x4F, 0xA3, 0x4A, 0x2D}}
-
-#define WSAID_MEMORYREGISTRATIONCACHECALLBACK \
-  {0xE5DA4AF8, 0xD824, 0x48CD, {0xA7, 0x99, 0x63, 0x37, 0xA9, 0x8E, 0xD2, 0xAF}}
-
-typedef struct _WSABUFEX {
-	u_long  len; 
-	char FAR  *buf; 
-	HANDLE  handle; 
-} WSABUFEX, FAR * LPWSABUFEX;
-
-#if 0
-typedef struct _WSPUPCALLTABLEEX {
-	LPWPUCLOSEEVENT  lpWPUCloseEvent;
-	LPWPUCLOSESOCKETHANDLE  lpWPUCloseSocketHandle;
-	LPWPUCREATEEVENT  lpWPUCreateEvent;
-	LPWPUCREATESOCKETHANDLE  lpWPUCreateSocketHandle;
-	LPWPUFDISSET  lpWPUFDIsSet;
-	LPWPUGETPROVIDERPATH  lpWPUGetProviderPath;
-	LPWPUMODIFYIFSHANDLE  lpWPUModifyIFSHandle;
-	LPWPUPOSTMESSAGE  lpWPUPostMessage;
-	LPWPUQUERYBLOCKINGCALLBACK  lpWPUQueryBlockingCallback;
-	LPWPUQUERYSOCKETHANDLECONTEXT  lpWPUQuerySocketHandleContext;
-	LPWPUQUEUEAPC  lpWPUQueueApc;
-	LPWPURESETEVENT  lpWPUResetEvent;
-	LPWPUSETEVENT  lpWPUSetEvent;
-	LPWPUOPENCURRENTTHREAD  lpWPUOpenCurrentThread;
-	LPWPUCLOSETHREAD  lpWPUCloseThread;
-	LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest;
-} WSPUPCALLTABLEEX, FAR * LPWSPUPCALLTABLEEX;
-#endif
-
-int WSPAPI
-WSPStartupEx(
-  IN WORD  wVersionRequested,
-  OUT LPWSPDATA  lpWSPData,
-  IN LPWSAPROTOCOL_INFOW  lpProtocolInfo,
-  IN LPWSPUPCALLTABLEEX  lpUpcallTable,
-  OUT LPWSPPROC_TABLE  lpProcTable);
-
-typedef int WSPAPI
-(*LPWSPSTARTUPEX)(
-  IN WORD  wVersionRequested,
-  OUT LPWSPDATA  lpWSPData,
-  IN LPWSAPROTOCOL_INFOW  lpProtocolInfo,
-  IN LPWSPUPCALLTABLEEX  lpUpcallTable,
-  OUT LPWSPPROC_TABLE  lpProcTable);
-
-#define MEM_READ                          1
-#define MEM_WRITE                         2
-#define MEM_READWRITE                     3
-
-int WSPAPI
-WSPDeregisterMemory(
-  IN SOCKET  s,
-  IN HANDLE  Handle,
-  OUT LPINT  lpErrno);
-
-typedef int WSPAPI
-(*LPFN_WSPDEREGISTERMEMORY)(
-  IN SOCKET  s,
-  IN HANDLE  Handle,
-  OUT LPINT  lpErrno);
-
-int WSPAPI
-WSPDeregisterRdmaMemory(
-  IN SOCKET  s,
-  IN LPVOID  lpRdmaBufferDescriptor,
-  IN DWORD  dwDescriptorLength,
-  OUT LPINT  lpErrno);
-
-typedef int WSPAPI
-(*LPFN_WSPDEREGISTERRDMAMEMORY)(
-  IN SOCKET  s,
-  IN LPVOID  lpRdmaBufferDescriptor,
-  IN DWORD  dwDescriptorLength,
-  OUT LPINT  lpErrno);
-
-int WSPAPI
-WSPMemoryRegistrationCacheCallback(
-  IN PVOID  lpvAddress,
-  IN SIZE_T  Size,
-  OUT LPINT  lpErrno);
-
-typedef int WSPAPI
-(*LPFN_WSPMEMORYREGISTRATIONCACHECALLBACK)(
-  IN PVOID  lpvAddress,
-  IN SIZE_T  Size,
-  OUT LPINT  lpErrno);
-
-int WSPAPI
-WSPRdmaRead(
-  IN SOCKET  s,
-  IN LPWSABUFEX  lpBuffers,
-  IN DWORD  dwBufferCount,
-  IN LPVOID  lpTargetBufferDescriptor,
-  IN DWORD  dwTargetDescriptorLength,
-  IN DWORD  dwTargetBufferOffset,
-  OUT LPDWORD  lpdwNumberOfBytesRead,
-  IN DWORD  dwFlags,
-  IN LPWSAOVERLAPPED  lpOverlapped,
-  IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
-  IN LPWSATHREADID  lpThreadId,
-  OUT LPINT  lpErrno);
-
-typedef int WSPAPI
-(*LPFN_WSPRDMAREAD)(
-  IN SOCKET  s,
-  IN LPWSABUFEX  lpBuffers,
-  IN DWORD  dwBufferCount,
-  IN LPVOID  lpTargetBufferDescriptor,
-  IN DWORD  dwTargetDescriptorLength,
-  IN DWORD  dwTargetBufferOffset,
-  OUT LPDWORD  lpdwNumberOfBytesRead,
-  IN DWORD  dwFlags,
-  IN LPWSAOVERLAPPED  lpOverlapped,
-  IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
-  IN LPWSATHREADID  lpThreadId,
-  OUT LPINT  lpErrno);
-
-int WSPAPI
-WSPRdmaWrite(
-  IN SOCKET  s,
-  IN LPWSABUFEX  lpBuffers,
-  IN DWORD  dwBufferCount,
-  IN LPVOID  lpTargetBufferDescriptor,
-  IN DWORD  dwTargetDescriptorLength,
-  IN DWORD  dwTargetBufferOffset,
-  OUT LPDWORD  lpdwNumberOfBytesWritten,
-  IN DWORD  dwFlags,
-  IN LPWSAOVERLAPPED  lpOverlapped,
-  IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
-  IN LPWSATHREADID  lpThreadId,
-  OUT LPINT  lpErrno);
-
-typedef int WSPAPI
-(*LPFN_WSPRDMAWRITE)(
-  IN SOCKET  s,
-  IN LPWSABUFEX  lpBuffers,
-  IN DWORD  dwBufferCount,
-  IN LPVOID  lpTargetBufferDescriptor,
-  IN DWORD  dwTargetDescriptorLength,
-  IN DWORD  dwTargetBufferOffset,
-  OUT LPDWORD  lpdwNumberOfBytesWritten,
-  IN DWORD  dwFlags,
-  IN LPWSAOVERLAPPED  lpOverlapped,
-  IN LPWSAOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine,
-  IN LPWSATHREADID  lpThreadId,
-  OUT LPINT  lpErrno);
-
-HANDLE WSPAPI
-WSPRegisterMemory(
-  IN SOCKET  s,
-  IN PVOID  lpBuffer,
-  IN DWORD  dwBufferLength,
-  IN DWORD  dwFlags,
-  OUT LPINT  lpErrno);
-
-int WSPAPI
-WSPRegisterRdmaMemory(
-  IN SOCKET  s,
-  IN PVOID  lpBuffer,
-  IN DWORD  dwBufferLength,
-  IN DWORD  dwFlags,
-  OUT LPVOID  lpRdmaBufferDescriptor,
-  IN OUT LPDWORD  lpdwDescriptorLength,
-  OUT LPINT  lpErrno);
-
-typedef int WSPAPI
-(*LPFN_WSPREGISTERRDMAMEMORY)(
-  IN SOCKET  s,
-  IN PVOID  lpBuffer,
-  IN DWORD  dwBufferLength,
-  IN DWORD  dwFlags,
-  OUT LPVOID  lpRdmaBufferDescriptor,
-  IN OUT LPDWORD  lpdwDescriptorLength,
-  OUT LPINT  lpErrno);
-
-#pragma pack(pop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __WS2SAN_H */
diff --git a/winsup/w32api/include/ddk/xfilter.h b/winsup/w32api/include/ddk/xfilter.h
deleted file mode 100644
index 3940b44f2..000000000
--- a/winsup/w32api/include/ddk/xfilter.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * xfilter.h
- *
- * Address filtering for NDIS MACs
- *
- * This file is part of the w32api package.
- *
- * Contributors:
- *   Created by Casper S. Hornstrup <chorns@users.sourceforge.net>
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-#ifndef __XFILTER_H
-#define __XFILTER_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ntddk.h"
-
-
-#define ETH_LENGTH_OF_ADDRESS             6
-
-#define ETH_IS_BROADCAST(Address) \
-  ((((PUCHAR)(Address))[0] == ((UCHAR)0xff)) && (((PUCHAR)(Address))[1] == ((UCHAR)0xff)))
-
-#define ETH_IS_MULTICAST(Address) \
-  (BOOLEAN)(((PUCHAR)(Address))[0] & ((UCHAR)0x01))
-
-#define ETH_COMPARE_NETWORK_ADDRESSES(_A, _B, _Result) \
-{ \
-	if (*(ULONG UNALIGNED *)&(_A)[2] > *(ULONG UNALIGNED *)&(_B)[2]) \
-	{ \
-    *(_Result) = 1; \
-	} \
-	else if (*(ULONG UNALIGNED *)&(_A)[2] < *(ULONG UNALIGNED *)&(_B)[2]) \
-	{ \
-    *(_Result) = (UINT)-1; \
-	} \
-	else if (*(USHORT UNALIGNED *)(_A) > *(USHORT UNALIGNED *)(_B)) \
-	{ \
-    *(_Result) = 1; \
-	} \
-	else if (*(USHORT UNALIGNED *)(_A) < *(USHORT UNALIGNED *)(_B)) \
-	{ \
-	  *(_Result) = (UINT)-1; \
-	} \
-	else \
-	{ \
-	  *(_Result) = 0; \
-	} \
-}
-
-#define ETH_COMPARE_NETWORK_ADDRESSES_EQ(_A,_B, _Result) \
-{ \
-	if ((*(ULONG UNALIGNED *)&(_A)[2] == *(ULONG UNALIGNED *)&(_B)[2]) && \
-    (*(USHORT UNALIGNED *)(_A) == *(USHORT UNALIGNED *)(_B))) \
-	{ \
-    *(_Result) = 0; \
-	} \
-	else \
-	{ \
-    *(_Result) = 1; \
-	} \
-}
-
-#define ETH_COPY_NETWORK_ADDRESS(_D, _S) \
-{ \
-	*((ULONG UNALIGNED *)(_D)) = *((ULONG UNALIGNED *)(_S)); \
-	*((USHORT UNALIGNED *)((UCHAR *)(_D) + 4)) = *((USHORT UNALIGNED *)((UCHAR *)(_S) + 4)); \
-}
-
-#define FDDI_LENGTH_OF_LONG_ADDRESS       6
-#define FDDI_LENGTH_OF_SHORT_ADDRESS      2
-
-#define FDDI_IS_BROADCAST(Address, AddressLength, Result)   \
-  *Result = ((*(PUCHAR)(Address) == (UCHAR)0xFF) && \
-  (*((PUCHAR)(Address) + 1) == (UCHAR)0xFF))
-
-#define FDDI_IS_MULTICAST(Address, AddressLength, Result) \
-  *Result = (BOOLEAN)(*(UCHAR *)(Address) & (UCHAR)0x01)
-
-#define FDDI_IS_SMT(FcByte, Result) \
-{ \
-  *Result = ((FcByte & ((UCHAR)0xf0)) == 0x40); \
-}
-
-
-#define FDDI_COMPARE_NETWORK_ADDRESSES(_A, _B, _Length, _Result) \
-{ \
-	if (*(USHORT UNALIGNED *)(_A) > *(USHORT UNALIGNED *)(_B)) \
-	{ \
-	  *(_Result) = 1; \
-	} \
-	else if (*(USHORT UNALIGNED *)(_A) < *(USHORT UNALIGNED *)(_B)) \
-	{ \
-	  *(_Result) = (UINT)-1; \
-	} \
-	else if (_Length == 2) \
-	{ \
-	  *(_Result) = 0; \
-	} \
-	else if (*(ULONG UNALIGNED *)((PUCHAR)(_A) + 2) > *(ULONG UNALIGNED *)((PUCHAR)(_B) + 2)) \
-	{ \
-	  *(_Result) = 1; \
-	} \
-	else if (*(ULONG UNALIGNED *)((PUCHAR)(_A) + 2) < *(ULONG UNALIGNED *)((PUCHAR)(_B) + 2)) \
-	{ \
-	  *(_Result) = (UINT)-1; \
-	} \
-	else \
-	{ \
-	  *(_Result) = 0; \
-	} \
-}
-
-#define FDDI_COMPARE_NETWORK_ADDRESSES_EQ(_A, _B, _Length, _Result) \
-{                                                                   \
-	if ((*(USHORT UNALIGNED *)(_A) == *(USHORT UNALIGNED *)(_B)) && \
-	  (((_Length) == 2) || \
-	    (*(ULONG UNALIGNED *)((PUCHAR)(_A) + 2) == *(ULONG UNALIGNED *)((PUCHAR)(_B) + 2)))) \
-	{ \
-	  *(_Result) = 0; \
-	} \
-	else \
-	{ \
-	  *(_Result) = 1; \
-	} \
-}
-
-#define FDDI_COPY_NETWORK_ADDRESS(D, S, AddressLength) \
-{ \
-	PCHAR _D = (D); \
-	PCHAR _S = (S); \
-	UINT _C = (AddressLength); \
-	for ( ; _C > 0 ; _D++, _S++, _C--) \
-	{ \
-	  *_D = *_S; \
-	} \
-}
-
-#define TR_LENGTH_OF_FUNCTIONAL           4
-#define TR_LENGTH_OF_ADDRESS              6
-
-typedef ULONG TR_FUNCTIONAL_ADDRESS;
-typedef ULONG TR_GROUP_ADDRESS;
-
-#define TR_IS_NOT_DIRECTED(_Address, _Result) \
-{ \
-  *(_Result) = (BOOLEAN)((_Address)[0] & 0x80); \
-}
-
-#define TR_IS_FUNCTIONAL(_Address, _Result) \
-{ \
-	*(_Result) = (BOOLEAN)(((_Address)[0] & 0x80) && !((_Address)[2] & 0x80)); \
-}
-
-#define TR_IS_GROUP(_Address, _Result) \
-{ \
-  *(_Result) = (BOOLEAN)((_Address)[0] & (_Address)[2] & 0x80); \
-}
-
-#define TR_IS_SOURCE_ROUTING(_Address, _Result) \
-{ \
-  *(_Result) = (BOOLEAN)((_Address)[0] & 0x80); \
-}
-
-#define TR_IS_MAC_FRAME(_PacketHeader) ((((PUCHAR)_PacketHeader)[1] & 0xFC) == 0)
-
-#define TR_IS_BROADCAST(_Address, _Result) \
-{ \
-	*(_Result) = (BOOLEAN)(((*(UNALIGNED USHORT *)&(_Address)[0] == 0xFFFF) || \
-		(*(UNALIGNED USHORT *)&(_Address)[0] == 0x00C0)) && \
-		(*(UNALIGNED ULONG  *)&(_Address)[2] == 0xFFFFFFFF)); \
-}
-
-#define TR_COMPARE_NETWORK_ADDRESSES(_A, _B, _Result) \
-{ \
-	if (*(ULONG UNALIGNED *)&(_A)[2] > *(ULONG UNALIGNED *)&(_B)[2]) \
-	{ \
-	  *(_Result) = 1; \
-	} \
-	else if (*(ULONG UNALIGNED *)&(_A)[2] < *(ULONG UNALIGNED *)&(_B)[2]) \
-	{ \
-	  *(_Result) = (UINT)-1; \
-	} \
-	else if (*(USHORT UNALIGNED *)(_A) > *(USHORT UNALIGNED *)(_B)) \
-	{ \
-	  *(_Result) = 1; \
-	} \
-	else if (*(USHORT UNALIGNED *)(_A) < *(USHORT UNALIGNED *)(_B)) \
-	{ \
-	  *(_Result) = (UINT)-1; \
-	} \
-	else \
-	{ \
-	  *(_Result) = 0; \
-	} \
-}
-
-#define TR_COPY_NETWORK_ADDRESS(_D, _S) \
-{ \
-	*((ULONG UNALIGNED *)(_D)) = *((ULONG UNALIGNED *)(_S)); \
-	*((USHORT UNALIGNED *)((UCHAR *)(_D)+4)) = *((USHORT UNALIGNED *)((UCHAR *)(_S) + 4)); \
-}
-
-#define TR_COMPARE_NETWORK_ADDRESSES_EQ(_A, _B, _Result) \
-{ \
-	if ((*(ULONG UNALIGNED  *)&(_A)[2] == *(ULONG UNALIGNED  *)&(_B)[2]) && \
-	    (*(USHORT UNALIGNED *)&(_A)[0] == *(USHORT UNALIGNED *)&(_B)[0])) \
-	{ \
-    *(_Result) = 0; \
-	} \
-	else \
-	{ \
-    *(_Result) = 1; \
-	} \
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __XFILTER_H */
diff --git a/winsup/w32api/include/dhcpcsdk.h b/winsup/w32api/include/dhcpcsdk.h
deleted file mode 100644
index 1d27df766..000000000
--- a/winsup/w32api/include/dhcpcsdk.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _DHCPCDSK_H
-#define _DHCPCDSK_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if (_WIN32_WINNT >= 0x0500)
-#define DHCPCAPI_REGISTER_HANDLE_EVENT 0x00000001
-#define DHCPCAPI_REQUEST_PERSISTENT  0x00000001
-#define DHCPCAPI_REQUEST_SYNCHRONOUS 0x00000002
-typedef struct _DHCPAPI_CLASSID {
-	ULONG Flags;
-	LPBYTE Data;
-	ULONG nBytesData;
-} DHCPCAPI_CLASSID,*PDHCPCAPI_CLASSID,*LPDHCPCAPI_CLASSID;
-typedef struct _DHCPAPI_PARAMS {
-	ULONG Flags;
-	ULONG OptionId;
-	BOOL IsVendor;
-	LPBYTE Data;
-	DWORD nBytesData;
-} DHCPAPI_PARAMS,*PDHCPAPI_PARAMS,*LPDHCPAPI_PARAMS;
-typedef struct _DHCPAPI_PARAMS_ARRAY {
-	ULONG nParams;
-	LPDHCPAPI_PARAMS Params;
-} DHCPCAPI_PARAMS_ARRAY,*PDHCPCAPI_PARAMS_ARRAY,*LPDHCPCAPI_PARAMS_ARRAY;
-VOID WINAPI DhcpCApiCleanup(void);
-DWORD WINAPI DhcpCApiInitialize(LPDWORD);
-DWORD WINAPI DhcpDeRegisterParamChange(DWORD,LPVOID,LPVOID);
-DWORD WINAPI DhcpRegisterParamChange(DWORD,LPVOID,PWSTR,LPDHCPCAPI_CLASSID,DHCPCAPI_PARAMS_ARRAY,LPVOID);
-DWORD WINAPI DhcpRemoveDNSRegistrations(void);
-DWORD WINAPI DhcpUndoRequestParams(DWORD,LPVOID,LPWSTR,LPWSTR);
-#endif /* (_WIN32_WINNT >= 0x0500) */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/dlgs.h b/winsup/w32api/include/dlgs.h
deleted file mode 100644
index 82525ab5c..000000000
--- a/winsup/w32api/include/dlgs.h
+++ /dev/null
@@ -1,186 +0,0 @@
-#ifndef _DLGS_H
-#define _DLGS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define FILEOPENORD 1536
-#define MULTIFILEOPENORD 1537
-#define PRINTDLGORD 1538
-#define PRNSETUPDLGORD 1539
-#define FINDDLGORD 1540
-#define REPLACEDLGORD 1541
-#define FONTDLGORD 1542
-#define FORMATDLGORD31 1543
-#define FORMATDLGORD30 1544
-#define PAGESETUPDLGORD 1546
-#define ctlFirst 0x400
-#define ctlLast 0x4ff
-#define chx1 0x410
-#define chx2 0x411
-#define chx3 0x412
-#define chx4 0x413
-#define chx5 0x414
-#define chx6 0x415
-#define chx7 0x416
-#define chx8 0x417
-#define chx9 0x418
-#define chx10 0x419
-#define chx11 0x41a
-#define chx12 0x41b
-#define chx13 0x41c
-#define chx14 0x41d
-#define chx15 0x41e
-#define chx16 0x41f
-#define cmb1 0x470
-#define cmb2 0x471
-#define cmb3 0x472
-#define cmb4 0x473
-#define cmb5 0x474
-#define cmb6 0x475
-#define cmb7 0x476
-#define cmb8 0x477
-#define cmb9 0x478
-#define cmb10 0x479
-#define cmb11 0x47a
-#define cmb12 0x47b
-#define cmb13 0x47c
-#define cmb14 0x47d
-#define cmb15 0x47e
-#define cmb16 0x47f
-#define edt1 0x480
-#define edt2 0x481
-#define edt3 0x482
-#define edt4 0x483
-#define edt5 0x484
-#define edt6 0x485
-#define edt7 0x486
-#define edt8 0x487
-#define edt9 0x488
-#define edt10 0x489
-#define edt11 0x48a
-#define edt12 0x48b
-#define edt13 0x48c
-#define edt14 0x48d
-#define edt15 0x48e
-#define edt16 0x48f
-#define frm1 0x434
-#define frm2 0x435
-#define frm3 0x436
-#define frm4 0x437
-#define grp1 0x430
-#define grp2 0x431
-#define grp3 0x432
-#define grp4 0x433
-#define ico1 0x43c
-#define ico2 0x43d
-#define ico3 0x43e
-#define ico4 0x43f
-#define lst1 0x460
-#define lst2 0x461
-#define lst3 0x462
-#define lst4 0x463
-#define lst5 0x464
-#define lst6 0x465
-#define lst7 0x466
-#define lst8 0x467
-#define lst9 0x468
-#define lst10 0x469
-#define lst11 0x46a
-#define lst12 0x46b
-#define lst13 0x46c
-#define lst14 0x46d
-#define lst15 0x46e
-#define lst16 0x46f
-#define psh1 0x400
-#define psh2 0x401
-#define psh3 0x402
-#define psh4 0x403
-#define psh5 0x404
-#define psh6 0x405
-#define psh7 0x406
-#define psh8 0x407
-#define psh9 0x408
-#define psh10 0x409
-#define psh11 0x40a
-#define psh12 0x40b
-#define psh13 0x40c
-#define psh14 0x40d
-#define psh15 0x40e
-#define pshHelp 0x40e
-#define psh16 0x40f
-#define rad1 0x420
-#define rad2 0x421
-#define rad3 0x422
-#define rad4 0x423
-#define rad5 0x424
-#define rad6 0x425
-#define rad7 0x426
-#define rad8 0x427
-#define rad9 0x428
-#define rad10 0x429
-#define rad11 0x42a
-#define rad12 0x42b
-#define rad13 0x42c
-#define rad14 0x42d
-#define rad15 0x42e
-#define rad16 0x42f
-#define rct1 0x438
-#define rct2 0x439
-#define rct3 0x43a
-#define rct4 0x43b
-#define scr1 0x490
-#define scr2 0x491
-#define scr3 0x492
-#define scr4 0x493
-#define scr5 0x494
-#define scr6 0x495
-#define scr7 0x496
-#define scr8 0x497
-#define stc1 0x440
-#define stc2 0x441
-#define stc3 0x442
-#define stc4 0x443
-#define stc5 0x444
-#define stc6 0x445
-#define stc7 0x446
-#define stc8 0x447
-#define stc9 0x448
-#define stc10 0x449
-#define stc11 0x44a
-#define stc12 0x44b
-#define stc13 0x44c
-#define stc14 0x44d
-#define stc15 0x44e
-#define stc16 0x44f
-#define stc17 0x450
-#define stc18 0x451
-#define stc19 0x452
-#define stc20 0x453
-#define stc21 0x454
-#define stc22 0x455
-#define stc23 0x456
-#define stc24 0x457
-#define stc25 0x458
-#define stc26 0x459
-#define stc27 0x45a
-#define stc28 0x45b
-#define stc29 0x45c
-#define stc30 0x45d
-#define stc31 0x45e
-#define stc32 0x45f
-#ifndef RC_INVOKED
-typedef struct tagCRGB {
- BYTE bRed;
- BYTE bGreen;
- BYTE bBlue;
- BYTE bExtra;
-} CRGB;
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/docobj.h b/winsup/w32api/include/docobj.h
deleted file mode 100644
index 27055dd84..000000000
--- a/winsup/w32api/include/docobj.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef _DOCOBJ_H
-#define _DOCOBJ_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define OLECMDERR_E_UNKNOWNGROUP (-2147221244)
-#define OLECMDERR_E_DISABLED (-2147221247)
-#define OLECMDERR_E_NOHELP (-2147221246)
-#define OLECMDERR_E_CANCELED (-2147221245)
-#define OLECMDERR_E_NOTSUPPORTED (-2147221248)
-
-typedef enum {
-	OLECMDID_OPEN = 1,
-	OLECMDID_NEW = 2,
-	OLECMDID_SAVE = 3,
-	OLECMDID_SAVEAS = 4,
-	OLECMDID_SAVECOPYAS = 5,
-	OLECMDID_PRINT = 6,
-	OLECMDID_PRINTPREVIEW = 7,
-	OLECMDID_PAGESETUP = 8,
-	OLECMDID_SPELL = 9,
-	OLECMDID_PROPERTIES = 10,
-	OLECMDID_CUT = 11,
-	OLECMDID_COPY = 12,
-	OLECMDID_PASTE = 13,
-	OLECMDID_PASTESPECIAL = 14,
-	OLECMDID_UNDO = 15,
-	OLECMDID_REDO = 16,
-	OLECMDID_SELECTALL = 17,
-	OLECMDID_CLEARSELECTION = 18,
-	OLECMDID_ZOOM = 19,
-	OLECMDID_GETZOOMRANGE = 20,
-	OLECMDID_UPDATECOMMANDS = 21,
-	OLECMDID_REFRESH = 22,
-	OLECMDID_STOP = 23,
-	OLECMDID_HIDETOOLBARS = 24,
-	OLECMDID_SETPROGRESSMAX = 25,
-	OLECMDID_SETPROGRESSPOS = 26,
-	OLECMDID_SETPROGRESSTEXT = 27,
-	OLECMDID_SETTITLE = 28,
-	OLECMDID_SETDOWNLOADSTATE = 29,
-	OLECMDID_STOPDOWNLOAD = 30
-} OLECMDID;
-typedef enum {
-	OLECMDF_SUPPORTED = 1,
-	OLECMDF_ENABLED = 2,
-	OLECMDF_LATCHED = 4,
-	OLECMDF_NINCHED = 8
-} OLECMDF;
-typedef enum {
-	OLECMDEXECOPT_DODEFAULT = 0,
-	OLECMDEXECOPT_PROMPTUSER = 1,
-	OLECMDEXECOPT_DONTPROMPTUSER = 2,
-	OLECMDEXECOPT_SHOWHELP = 3
-} OLECMDEXECOPT;
-
-typedef struct _tagOLECMDTEXT {
-	DWORD cmdtextf;
-	ULONG cwActual;
-	ULONG cwBuf;
-	wchar_t rgwz[1];
-} OLECMDTEXT;
-typedef struct _tagOLECMD {
-	ULONG cmdID;
-	DWORD cmdf;
-} OLECMD;
-
-typedef interface IOleInPlaceSite *LPOLEINPLACESITE;
-typedef interface IEnumOleDocumentViews *LPENUMOLEDOCUMENTVIEWS;
-
-EXTERN_C const IID IID_IContinueCallback;
-EXTERN_C const IID IID_IEnumOleDocumentViews;
-EXTERN_C const IID IID_IPrint;
-
-EXTERN_C const IID IID_IOleDocumentView;
-#undef INTERFACE
-#define INTERFACE IOleDocumentView
-DECLARE_INTERFACE_(IOleDocumentView,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-	STDMETHOD(SetInPlaceSite)(THIS_ LPOLEINPLACESITE) PURE;
-	STDMETHOD(GetInPlaceSite)(THIS_ LPOLEINPLACESITE*) PURE;
-	STDMETHOD(GetDocument)(THIS_ IUnknown*) PURE;
-	STDMETHOD(SetRect)(THIS_ LPRECT) PURE;
-	STDMETHOD(GetRect)(THIS_ LPRECT) PURE;
-	STDMETHOD(SetRectComplex)(THIS_ LPRECT,LPRECT,LPRECT,LPRECT) PURE;
-	STDMETHOD(Show)(THIS_ BOOL) PURE;
-	STDMETHOD(UIActivate)(THIS_ BOOL) PURE;
-	STDMETHOD(Open)(THIS) PURE;
-	STDMETHOD(Close)(THIS_ DWORD) PURE;
-	STDMETHOD(SaveViewState)(THIS_ IStream*) PURE;
-	STDMETHOD(ApplyViewState)(THIS_ IStream*) PURE;
-	STDMETHOD(Clone)(THIS_ LPOLEINPLACESITE,IOleDocumentView**) PURE;
-};
-
-DECLARE_ENUMERATOR_(IEnumOleDocumentViews,IOleDocumentView);
-
-EXTERN_C const IID IID_IOleDocument;
-#undef INTERFACE
-#define INTERFACE IOleDocument
-DECLARE_INTERFACE_(IOleDocument,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-	STDMETHOD(CreateView)(THIS_ LPOLEINPLACESITE,IStream*,DWORD,IOleDocumentView**) PURE;
-	STDMETHOD(GetDocMiscStatus)(THIS_ DWORD*) PURE;
-	STDMETHOD(EnumViews)(THIS_ LPENUMOLEDOCUMENTVIEWS*,IOleDocumentView**) PURE;
-};
-
-EXTERN_C const IID IID_IOleCommandTarget;
-#undef INTERFACE
-#define INTERFACE IOleCommandTarget
-DECLARE_INTERFACE_(IOleCommandTarget,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-	STDMETHOD(QueryStatus)(THIS_ const GUID*,ULONG,OLECMD*,OLECMDTEXT*) PURE;
-	STDMETHOD(Exec)(THIS_ const GUID*,DWORD,DWORD,VARIANTARG*,VARIANTARG*) PURE;
-};
-
-EXTERN_C const IID IID_IOleDocumentSite;
-#undef INTERFACE
-#define INTERFACE IOleDocumentSite
-DECLARE_INTERFACE_(IOleDocumentSite,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-	STDMETHOD(ActivateMe)(THIS_ IOleDocumentView*) PURE;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/errorrep.h b/winsup/w32api/include/errorrep.h
deleted file mode 100644
index 75d8f80ee..000000000
--- a/winsup/w32api/include/errorrep.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _ERRORREP_H

-#define _ERRORREP_H

-#if __GNUC__ >= 3

-#pragma GCC system_header

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#if (_WIN32_WINNT >= 0x0501)

-typedef enum {

-	frrvErr = 3,

-	frrvErrNoDW = 4,

-	frrvErrTimeout = 5,

-	frrvLaunchDebugger = 6,

-	frrvOk = 0,

-	frrvOkHeadless = 7,

-	frrvOkManifest = 1,

-	frrvOkQueued = 2

-} EFaultRepRetVal;

-BOOL WINAPI AddERExcludedApplicationA(LPCSTR);

-BOOL WINAPI AddERExcludedApplicationW(LPCWSTR);

-EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS,DWORD);

-#endif

-

-#ifdef UNICODE

-#if (_WIN32_WINNT >= 0x0501)

-#define AddERExcludedApplication AddERExcludedApplicationW

-#endif

-#else

-#if (_WIN32_WINNT >= 0x0501)

-#define AddERExcludedApplication AddERExcludedApplicationA

-#endif

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-#endif

diff --git a/winsup/w32api/include/exdisp.h b/winsup/w32api/include/exdisp.h
deleted file mode 100644
index 9e747df11..000000000
--- a/winsup/w32api/include/exdisp.h
+++ /dev/null
@@ -1,257 +0,0 @@
-#ifndef _EXDISP_H
-#define _EXDISP_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <oaidl.h>
-#include <ocidl.h>
-#include <docobj.h>
-
-EXTERN_C const CLSID CLSID_WebBrowser;
-EXTERN_C const IID DIID_DWebBrowserEvents;
-
-typedef enum {
-	navOpenInNewWindow = 0x1,
-	navNoHistory = 0x2,
-	navNoReadFromCache = 0x4,
-	navNoWriteTocache = 0x8,
-	navAllowAutosearch = 0x10,
-	navBrowserBar = 0x20,
-	navHyperLink = 0x40
-} BrowserNavConstants;
-
-EXTERN_C const IID IID_IWebBrowser;
-#undef INTERFACE
-#define INTERFACE IWebBrowser
-DECLARE_INTERFACE_(IWebBrowser,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(GoBack)(THIS) PURE;
-	STDMETHOD(GoForward)(THIS) PURE;
-	STDMETHOD(GoHome)(THIS) PURE;
-	STDMETHOD(GoSearch)(THIS) PURE;
-	STDMETHOD(Navigate)(THIS_ BSTR,VARIANT*,VARIANT*,VARIANT*,VARIANT*) PURE;
-	STDMETHOD(Refresh)(THIS) PURE;
-	STDMETHOD(Refresh2)(THIS_ VARIANT*) PURE;
-	STDMETHOD(Stop)(THIS) PURE;
-	STDMETHOD(get_Application)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_Parent)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_Container)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_Document)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_TopLevelContainer)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(get_Type)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_Left)(THIS_ long*) PURE;
-	STDMETHOD(put_Left)(THIS_ long) PURE;
-	STDMETHOD(get_Top)(THIS_ long*) PURE;
-	STDMETHOD(put_Top)(THIS_ long) PURE;
-	STDMETHOD(get_Width)(THIS_ long*) PURE;
-	STDMETHOD(put_Width)(THIS_ long) PURE;
-	STDMETHOD(get_Height)(THIS_ long*) PURE;
-	STDMETHOD(put_Height)(THIS_ long) PURE;
-	STDMETHOD(get_LocationName)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_LocationURL)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_Busy)(THIS_ VARIANT_BOOL*) PURE;
-};
-
-EXTERN_C const IID IID_IWebBrowserApp;
-#undef INTERFACE
-#define INTERFACE IWebBrowserApp
-DECLARE_INTERFACE_(IWebBrowserApp,IWebBrowser)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(GoBack)(THIS) PURE;
-	STDMETHOD(GoForward)(THIS) PURE;
-	STDMETHOD(GoHome)(THIS) PURE;
-	STDMETHOD(GoSearch)(THIS) PURE;
-	STDMETHOD(Navigate)(THIS_ BSTR,VARIANT*,VARIANT*,VARIANT*,VARIANT*) PURE;
-	STDMETHOD(Refresh)(THIS) PURE;
-	STDMETHOD(Refresh2)(THIS_ VARIANT*) PURE;
-	STDMETHOD(Stop)(THIS) PURE;
-	STDMETHOD(get_Application)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_Parent)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_Container)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_Document)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_TopLevelContainer)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(get_Type)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_Left)(THIS_ long*) PURE;
-	STDMETHOD(put_Left)(THIS_ long) PURE;
-	STDMETHOD(get_Top)(THIS_ long*) PURE;
-	STDMETHOD(put_Top)(THIS_ long) PURE;
-	STDMETHOD(get_Width)(THIS_ long*) PURE;
-	STDMETHOD(put_Width)(THIS_ long) PURE;
-	STDMETHOD(get_Height)(THIS_ long*) PURE;
-	STDMETHOD(put_Height)(THIS_ long) PURE;
-	STDMETHOD(get_LocationName)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_LocationURL)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_Busy)(THIS_ VARIANT_BOOL*) PURE;
-
-	STDMETHOD(Quit)(THIS) PURE;
-	STDMETHOD(ClientToWindow)(THIS_ int*,int*) PURE;
-	STDMETHOD(PutProperty)(THIS_ BSTR,VARIANT) PURE;
-	STDMETHOD(GetProperty)(THIS_ BSTR,VARIANT*) PURE;
-	STDMETHOD(get_Name)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_HWND)(THIS_ long*) PURE;
-	STDMETHOD(get_FullName)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_Path)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_Visible)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_Visible)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_StatusBar)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_StatusBar)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_StatusText)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_StatusText)(THIS_ BSTR) PURE;
-	STDMETHOD(get_ToolBar)(THIS_ int*) PURE;
-	STDMETHOD(put_ToolBar)(THIS_ int) PURE;
-	STDMETHOD(get_MenuBar)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_MenuBar)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_FullScreen)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_FullScreen)(THIS_ VARIANT_BOOL) PURE;
-};
-
-EXTERN_C const IID IID_IWebBrowser2;
-#undef INTERFACE
-#define INTERFACE IWebBrowser2
-DECLARE_INTERFACE_(IWebBrowser2,IWebBrowserApp)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(GoBack)(THIS) PURE;
-	STDMETHOD(GoForward)(THIS) PURE;
-	STDMETHOD(GoHome)(THIS) PURE;
-	STDMETHOD(GoSearch)(THIS) PURE;
-	STDMETHOD(Navigate)(THIS_ BSTR,VARIANT*,VARIANT*,VARIANT*,VARIANT*) PURE;
-	STDMETHOD(Refresh)(THIS) PURE;
-	STDMETHOD(Refresh2)(THIS_ VARIANT*) PURE;
-	STDMETHOD(Stop)(THIS) PURE;
-	STDMETHOD(get_Application)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_Parent)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_Container)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_Document)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_TopLevelContainer)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(get_Type)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_Left)(THIS_ long*) PURE;
-	STDMETHOD(put_Left)(THIS_ long) PURE;
-	STDMETHOD(get_Top)(THIS_ long*) PURE;
-	STDMETHOD(put_Top)(THIS_ long) PURE;
-	STDMETHOD(get_Width)(THIS_ long*) PURE;
-	STDMETHOD(put_Width)(THIS_ long) PURE;
-	STDMETHOD(get_Height)(THIS_ long*) PURE;
-	STDMETHOD(put_Height)(THIS_ long) PURE;
-	STDMETHOD(get_LocationName)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_LocationURL)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_Busy)(THIS_ VARIANT_BOOL*) PURE;
-
-	STDMETHOD(Quit)(THIS) PURE;
-	STDMETHOD(ClientToWindow)(THIS_ int*,int*) PURE;
-	STDMETHOD(PutProperty)(THIS_ BSTR,VARIANT) PURE;
-	STDMETHOD(GetProperty)(THIS_ BSTR,VARIANT*) PURE;
-	STDMETHOD(get_Name)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_HWND)(THIS_ long*) PURE;
-	STDMETHOD(get_FullName)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_Path)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_Visible)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_Visible)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_StatusBar)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_StatusBar)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_StatusText)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_StatusText)(THIS_ BSTR) PURE;
-	STDMETHOD(get_ToolBar)(THIS_ int*) PURE;
-	STDMETHOD(put_ToolBar)(THIS_ int) PURE;
-	STDMETHOD(get_MenuBar)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_MenuBar)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_FullScreen)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_FullScreen)(THIS_ VARIANT_BOOL) PURE;
-
-	STDMETHOD(Navigate2)(THIS_ VARIANT*,VARIANT*,VARIANT*,VARIANT*,VARIANT*) PURE;
-	STDMETHOD(QueryStatusWB)(THIS_ OLECMDID,OLECMDF*) PURE;
-	STDMETHOD(ExecWB)(THIS_ OLECMDID,OLECMDEXECOPT,VARIANT*,VARIANT*) PURE;
-	STDMETHOD(ShowBrowserBar)(THIS_ VARIANT*,VARIANT*,VARIANT*) PURE;
-	STDMETHOD(get_ReadyState)(THIS_ READYSTATE*) PURE;
-	STDMETHOD(get_Offline)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_Offline)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_Silent)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_Silent)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_RegistaerAsBrowser)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_RegisterAsBrowser)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_RegistaerAsDropTarget)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_RegisterAsDropTarget)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_TheaterMode)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_TheaterMode)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_AddressBar)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_AddressBar)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_Resizable)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_Resizable)(THIS_ VARIANT_BOOL) PURE;
-};
-
-#define STDDISP(m) STDMETHOD_(void,m)
-
-EXTERN_C const IID DIID_DWebBrowserEvents2;
-#undef INTERFACE
-#define INTERFACE DWebBrowserEvents2
-DECLARE_INTERFACE_(DWebBrowserEvents2,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDDISP(StatusTextChange)(THIS_ BSTR) PURE;
-	STDDISP(ProgressChange)(THIS_ long,long) PURE;
-	STDDISP(CommandStateChange)(THIS_ long,VARIANT_BOOL) PURE;
-	STDDISP(DownloadBegin)(THIS) PURE;
-	STDDISP(DownloadComplete)(THIS) PURE;
-	STDDISP(TitleChange)(THIS_ BSTR) PURE;
-	STDDISP(PropertyChange)(THIS_ BSTR) PURE;
-	STDDISP(BeforeNavigate2)(THIS_ IDispatch*,VARIANT*,VARIANT*,VARIANT*,VARIANT*,VARIANT*,VARIANT_BOOL*) PURE;
-	STDDISP(NewWindow2)(THIS_ IDispatch**,VARIANT_BOOL*) PURE;
-	STDDISP(NavigateComplete)(THIS_ IDispatch*,VARIANT*) PURE;
-	STDDISP(DocumentComplete)(THIS_ IDispatch*,VARIANT*) PURE;
-	STDDISP(OnQuit)(THIS) PURE;
-	STDDISP(OnVisible)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(OnToolBar)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(OnMenuBar)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(OnStatusBar)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(OnFullScreen)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(OnTheaterMode)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(WindowSetResizable)(THIS_ VARIANT_BOOL) PURE;
-	STDDISP(WindowSetLeft)(THIS_ long) PURE;
-	STDDISP(WindowSetTop)(THIS_ long) PURE;
-	STDDISP(WindowSetWidth)(THIS_ long) PURE;
-	STDDISP(WindowSetHeight)(THIS_ long) PURE;
-	STDDISP(WindowClosing)(THIS_ VARIANT_BOOL,VARIANT_BOOL*) PURE;
-	STDDISP(ClientToHostWindow)(THIS_ long*,long*) PURE;
-	STDDISP(SetSecureLockIcon)(THIS_ long) PURE;
-	STDDISP(FileDownload)(THIS_ VARIANT_BOOL*) PURE;
-};
-
-#undef STDDISP
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/exdispid.h b/winsup/w32api/include/exdispid.h
deleted file mode 100644
index da2b0a4f0..000000000
--- a/winsup/w32api/include/exdispid.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _EXDISPID_H
-#define _EXDISPID_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define DISPID_BEFORENAVIGATE2 250
-#define DISPID_NEWWINDOW2 251
-#define DISPID_PROGRESSCHANGE 108
-#define DISPID_DOCUMENTCOMPLETE 259
-#define DISPID_STATUSTEXTCHANGE 102
-#define DISPID_TITLECHANGE 113
-
-#endif
diff --git a/winsup/w32api/include/httpext.h b/winsup/w32api/include/httpext.h
deleted file mode 100644
index ddff9471f..000000000
--- a/winsup/w32api/include/httpext.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-       httpext.h - Header for ISAPI extensions.
-
-       This file is part of a free library for the Win32 API.
-
-       This library is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#ifndef _HTTPEXT_H
-#define _HTTPEXT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	HSE_VERSION_MAJOR	2
-#define	HSE_VERSION_MINOR	0
-#define	HSE_LOG_BUFFER_LEN	80
-#define	HSE_MAX_EXT_DLL_NAME_LEN	256
-#define	HSE_STATUS_SUCCESS	1
-#define	HSE_STATUS_SUCCESS_AND_KEEP_CONN	2
-#define	HSE_STATUS_PENDING	3
-#define	HSE_STATUS_ERROR	4
-#define	HSE_REQ_BASE	0
-#define	HSE_REQ_SEND_URL_REDIRECT_RESP	1
-#define	HSE_REQ_SEND_URL	2
-#define	HSE_REQ_SEND_RESPONSE_HEADER	3
-#define	HSE_REQ_DONE_WITH_SESSION	4
-#define	HSE_REQ_END_RESERVED	1000
-#define	HSE_TERM_ADVISORY_UNLOAD	0x00000001
-#define	HSE_TERM_MUST_UNLOAD	0x00000002
-#define	HSE_IO_SYNC	0x00000001
-#define	HSE_IO_ASYNC	0x00000002
-#define	HSE_IO_DISCONNECT_AFTER_SEND	0x00000004
-#define	HSE_IO_SEND_HEADERS	0x00000008
-typedef	LPVOID HCONN;
-typedef	struct _HSE_VERSION_INFO {
-	DWORD	dwExtensionVersion;
-	CHAR	lpszExtensionDesc[HSE_MAX_EXT_DLL_NAME_LEN];
-} HSE_VERSION_INFO, *LPHSE_VERSION_INFO;
-typedef	struct _EXTENSION_CONTROL_BLOCK	{
-	DWORD	cbSize;
-	DWORD	dwVersion;
-	HCONN	ConnID;
-	DWORD	dwHttpStatusCode;
-	CHAR	lpszLogData[HSE_LOG_BUFFER_LEN];
-	LPSTR	lpszMethod;
-	LPSTR	lpszQueryString;
-	LPSTR	lpszPathInfo;
-	LPSTR	lpszPathTranslated;
-	DWORD	cbTotalBytes;
-	DWORD	cbAvailable;
-	LPBYTE	lpbData;
-	LPSTR	lpszContentType;
-	BOOL	(PASCAL	*GetServerVariable)(HCONN,LPSTR,LPVOID,LPDWORD);
-	BOOL	(PASCAL	*WriteClient)(HCONN,LPVOID,LPDWORD,DWORD);
-	BOOL	(PASCAL	*ReadClient)(HCONN,LPVOID,LPDWORD);
-	BOOL	(PASCAL	*ServerSupportFunction)(HCONN,DWORD,LPVOID,LPDWORD,LPDWORD);
-} EXTENSION_CONTROL_BLOCK, *LPEXTENSION_CONTROL_BLOCK;
-typedef	BOOL	(PASCAL	*PFN_GETEXTENSIONVERSION)(HSE_VERSION_INFO*);
-typedef	DWORD	(PASCAL	*PFN_HTTPEXTENSIONPROC)(EXTENSION_CONTROL_BLOCK*);
-typedef	BOOL	(PASCAL	*PFN_TERMINATEEXTENSION)(DWORD);
-typedef	VOID	(PASCAL	*PFN_HSE_IO_COMPLETION)(EXTENSION_CONTROL_BLOCK*,PVOID,DWORD,DWORD);
-typedef struct _HSE_TF_INFO {
-	PFN_HSE_IO_COMPLETION pfnHseIO;
-	PVOID pContext;
-	HANDLE hFile;
-	LPCSTR pszStatusCode;
-	DWORD BytesToWrite;
-	DWORD Offset;
-	PVOID pHead;
-	DWORD HeadLength;
-	PVOID pTail;
-	DWORD TailLength;
-	DWORD dwFlags;
-} HSE_TF_INFO, *LPHSE_TF_INFO;
-BOOL	PASCAL	GetExtensionVersion(HSE_VERSION_INFO*);
-DWORD	PASCAL	HttpExtensionProc(EXTENSION_CONTROL_BLOCK*);
-BOOL	PASCAL	TerminateExtension(DWORD);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _HTTPEXT_H */
diff --git a/winsup/w32api/include/idispids.h b/winsup/w32api/include/idispids.h
deleted file mode 100644
index 66585b4d0..000000000
--- a/winsup/w32api/include/idispids.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _IDISPIDS_H
-#define _IDISPIDS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define DISPID_AMBIENT_OFFLINEIFNOTCONNECTED (-5501)
-#define DISPID_AMBIENT_SILENT (-5502)
-
-#endif
diff --git a/winsup/w32api/include/imagehlp.h b/winsup/w32api/include/imagehlp.h
deleted file mode 100644
index 1f94533c1..000000000
--- a/winsup/w32api/include/imagehlp.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
-	imagehlp.h - Include file for IMAGEHLP.DLL APIs
-
-	Written by Mumit Khan <khan@nanotech.wisc.edu>
-
-	This file is part of a free library for the Win32 API. 
-
-	NOTE: This strictly does not belong in the Win32 API since it's
-	really part of Platform SDK. However,GDB needs it and we might
-	as well provide it here.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-*/
-
-#ifndef _IMAGEHLP_H
-#define _IMAGEHLP_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define API_VERSION_NUMBER 7
-#define BIND_NO_BOUND_IMPORTS 0x00000001
-#define BIND_NO_UPDATE 0x00000002
-#define BIND_ALL_IMAGES 0x00000004
-#define BIND_CACHE_IMPORT_DLLS 0x00000008 
-#define CBA_DEFERRED_SYMBOL_LOAD_START 1
-#define CBA_DEFERRED_SYMBOL_LOAD_COMPLETE 2
-#define CBA_DEFERRED_SYMBOL_LOAD_FAILURE 3
-#define CBA_SYMBOLS_UNLOADED 4
-#define CBA_DUPLICATE_SYMBOL 5
-#define CERT_PE_IMAGE_DIGEST_DEBUG_INFO 1
-#define CERT_PE_IMAGE_DIGEST_RESOURCES 2
-#define CERT_PE_IMAGE_DIGEST_ALL_IMPORT_INFO 4
-#define CERT_PE_IMAGE_DIGEST_NON_PE_INFO 8
-#define CERT_SECTION_TYPE_ANY 255
-#define CHECKSUM_SUCCESS	0
-#define CHECKSUM_OPEN_FAILURE	1
-#define CHECKSUM_MAP_FAILURE	2
-#define CHECKSUM_MAPVIEW_FAILURE	3
-#define CHECKSUM_UNICODE_FAILURE	4
-#define IMAGE_SEPARATION	65536
-#define SPLITSYM_REMOVE_PRIVATE	1
-#define SPLITSYM_EXTRACT_ALL	2
-#define SPLITSYM_SYMBOLPATH_IS_SRC	4
-#define SYMF_OMAP_GENERATED	1
-#define SYMF_OMAP_MODIFIED	2
-#define SYMOPT_CASE_INSENSITIVE	1
-#define SYMOPT_UNDNAME	2
-#define SYMOPT_DEFERRED_LOADS	4
-#define SYMOPT_NO_CPP	8
-#define SYMOPT_LOAD_LINES	16
-#define SYMOPT_OMAP_FIND_NEAREST	32
-#define UNDNAME_COMPLETE	0
-#define UNDNAME_NO_LEADING_UNDERSCORES	1 
-#define UNDNAME_NO_MS_KEYWORDS	2 
-#define UNDNAME_NO_FUNCTION_RETURNS	4 
-#define UNDNAME_NO_ALLOCATION_MODEL	8 
-#define UNDNAME_NO_ALLOCATION_LANGUAGE	16
-#define UNDNAME_NO_MS_THISTYPE	32
-#define UNDNAME_NO_CV_THISTYPE	64
-#define UNDNAME_NO_THISTYPE	96
-#define UNDNAME_NO_ACCESS_SPECIFIERS	128
-#define UNDNAME_NO_THROW_SIGNATURES	256
-#define UNDNAME_NO_MEMBER_TYPE	512 
-#define UNDNAME_NO_RETURN_UDT_MODEL	1024
-#define UNDNAME_32_BIT_DECODE	2048
-#define UNDNAME_NAME_ONLY	4096
-#define UNDNAME_NO_ARGUMENTS	8192
-#define UNDNAME_NO_SPECIAL_SYMS	16384
-
-#define _IMAGEHLPAPI DECLSPEC_IMPORT WINAPI
-
-#ifndef RC_INVOKED
-
-typedef enum _IMAGEHLP_STATUS_REASON {
-	BindOutOfMemory,
-	BindRvaToVaFailed,
-	BindNoRoomInImage,
-	BindImportModuleFailed,
-	BindImportProcedureFailed,
-	BindImportModule,
-	BindImportProcedure,
-	BindForwarder,
-	BindForwarderNOT,
-	BindImageModified,
-	BindExpandFileHeaders,
-	BindImageComplete,
-	BindMismatchedSymbols,
-	BindSymbolsNotUpdated
-} IMAGEHLP_STATUS_REASON;
-typedef BOOL(STDCALL*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG);
-typedef struct _LOADED_IMAGE {
-	LPSTR ModuleName;
-	HANDLE hFile;
-	PUCHAR MappedAddress;
-	PIMAGE_NT_HEADERS FileHeader;
-	PIMAGE_SECTION_HEADER LastRvaSection;
-	ULONG NumberOfSections;
-	PIMAGE_SECTION_HEADER Sections;
-	ULONG Characteristics;
-	BOOLEAN fSystemImage;
-	BOOLEAN fDOSImage;
-	LIST_ENTRY Links;
-	ULONG SizeOfImage;
-} LOADED_IMAGE,*PLOADED_IMAGE;
-typedef struct _IMAGE_DEBUG_INFORMATION {
-	LIST_ENTRY List;
-	DWORD Size;
-	PVOID MappedBase;
-	USHORT Machine;
-	USHORT Characteristics;
-	DWORD CheckSum;
-	DWORD ImageBase;
-	DWORD SizeOfImage;
-	DWORD NumberOfSections;
-	PIMAGE_SECTION_HEADER Sections;
-	DWORD ExportedNamesSize;
-	LPSTR ExportedNames;
-	DWORD NumberOfFunctionTableEntries;
-	PIMAGE_FUNCTION_ENTRY FunctionTableEntries;
-	DWORD LowestFunctionStartingAddress;
-	DWORD HighestFunctionEndingAddress;
-	DWORD NumberOfFpoTableEntries;
-	PFPO_DATA FpoTableEntries;
-	DWORD SizeOfCoffSymbols;
-	PIMAGE_COFF_SYMBOLS_HEADER CoffSymbols;
-	DWORD SizeOfCodeViewSymbols;
-	PVOID CodeViewSymbols;
-	LPSTR ImageFilePath;
-	LPSTR ImageFileName;
-	LPSTR DebugFilePath;
-	DWORD TimeDateStamp;
-	BOOL RomImage;
-	PIMAGE_DEBUG_DIRECTORY DebugDirectory;
-	DWORD NumberOfDebugDirectories;
-	DWORD Reserved[3];
-} IMAGE_DEBUG_INFORMATION,*PIMAGE_DEBUG_INFORMATION;
-typedef enum {
-	AddrMode1616,
-	AddrMode1632,
-	AddrModeReal,
-	AddrModeFlat
-} ADDRESS_MODE;
-typedef struct _tagADDRESS {
-	DWORD Offset;
-	WORD Segment;
-	ADDRESS_MODE Mode;
-} ADDRESS,*LPADDRESS;
-typedef struct _KDHELP {
-	DWORD Thread;
-	DWORD ThCallbackStack;
-	DWORD NextCallback;
-	DWORD FramePointer;
-	DWORD KiCallUserMode;
-	DWORD KeUserCallbackDispatcher;
-	DWORD SystemRangeStart;
-} KDHELP,*PKDHELP;
-typedef struct _tagSTACKFRAME {
-	ADDRESS AddrPC; 
-	ADDRESS AddrReturn; 
-	ADDRESS AddrFrame; 
-	ADDRESS AddrStack; 
-	LPVOID FuncTableEntry; 
-	DWORD Params[4]; 
-	BOOL Far; 
-	BOOL Virtual; 
-	DWORD Reserved[3];
-	KDHELP KdHelp;
-} STACKFRAME,*LPSTACKFRAME;
-typedef BOOL(STDCALL*PREAD_PROCESS_MEMORY_ROUTINE)(HANDLE ,LPCVOID,LPVOID,DWORD,LPDWORD); 
-typedef LPVOID(STDCALL*PFUNCTION_TABLE_ACCESS_ROUTINE)(HANDLE,DWORD); 
-typedef DWORD(STDCALL*PGET_MODULE_BASE_ROUTINE)(HANDLE,DWORD); 
-typedef DWORD(STDCALL*PTRANSLATE_ADDRESS_ROUTINE)(HANDLE,HANDLE,LPADDRESS);
-typedef struct API_VERSION {
-	USHORT MajorVersion;
-	USHORT MinorVersion;
-	USHORT Revision;
-	USHORT Reserved;
-} API_VERSION,*LPAPI_VERSION;
-typedef BOOL(CALLBACK*PSYM_ENUMMODULES_CALLBACK)(LPSTR,ULONG,PVOID); 
-typedef BOOL(CALLBACK*PSYM_ENUMSYMBOLS_CALLBACK)(LPSTR,ULONG,ULONG,PVOID);
-typedef BOOL(CALLBACK*PENUMLOADED_MODULES_CALLBACK)(LPSTR,ULONG,ULONG,PVOID);
-typedef BOOL(CALLBACK*PSYMBOL_REGISTERED_CALLBACK)(HANDLE,ULONG,PVOID,PVOID);
-typedef enum {
-	SymNone,
-	SymCoff,
-	SymCv,
-	SymPdb,
-	SymExport,
-	SymDeferred,
-	SymSym 
-} SYM_TYPE;
-typedef struct _IMAGEHLP_SYMBOL {
-	DWORD SizeOfStruct; 
-	DWORD Address; 
-	DWORD Size; 
-	DWORD Flags; 
-	DWORD MaxNameLength; 
-	CHAR Name[1]; 
-} IMAGEHLP_SYMBOL,*PIMAGEHLP_SYMBOL;
-typedef struct _IMAGEHLP_MODULE {
-	DWORD SizeOfStruct; 
-	DWORD BaseOfImage; 
-	DWORD ImageSize; 
-	DWORD TimeDateStamp; 
-	DWORD CheckSum; 
-	DWORD NumSyms; 
-	SYM_TYPE SymType; 
-	CHAR ModuleName[32]; 
-	CHAR ImageName[256]; 
-	CHAR LoadedImageName[256]; 
-} IMAGEHLP_MODULE,*PIMAGEHLP_MODULE;
-typedef struct _IMAGEHLP_LINE {
-	DWORD SizeOfStruct; 
-	DWORD Key; 
-	DWORD LineNumber; 
-	PCHAR FileName; 
-	DWORD Address; 
-} IMAGEHLP_LINE,*PIMAGEHLP_LINE;
-typedef struct _IMAGEHLP_DEFERRED_SYMBOL_LOAD {
-	DWORD SizeOfStruct; 
-	DWORD BaseOfImage; 
-	DWORD CheckSum; 
-	DWORD TimeDateStamp; 
-	CHAR FileName[MAX_PATH]; 
-	BOOLEAN Reparse; 
-} IMAGEHLP_DEFERRED_SYMBOL_LOAD,*PIMAGEHLP_DEFERRED_SYMBOL_LOAD;
-typedef struct _IMAGEHLP_DUPLICATE_SYMBOL {
-	DWORD SizeOfStruct; 
-	DWORD NumberOfDups; 
-	PIMAGEHLP_SYMBOL Symbol; 
-	ULONG SelectedSymbol; 
-} IMAGEHLP_DUPLICATE_SYMBOL,*PIMAGEHLP_DUPLICATE_SYMBOL;
-typedef PVOID DIGEST_HANDLE;
-typedef BOOL(WINAPI*DIGEST_FUNCTION)(DIGEST_HANDLE refdata,PBYTE pData,DWORD dwLength);
-
-PIMAGE_NT_HEADERS _IMAGEHLPAPI CheckSumMappedFile(LPVOID,DWORD,LPDWORD,LPDWORD);
-DWORD _IMAGEHLPAPI MapFileAndCheckSumA(LPSTR,LPDWORD,LPDWORD);
-DWORD _IMAGEHLPAPI MapFileAndCheckSumW(PWSTR,LPDWORD,LPDWORD);
-BOOL _IMAGEHLPAPI TouchFileTimes(HANDLE,LPSYSTEMTIME); 
-BOOL _IMAGEHLPAPI SplitSymbols(LPSTR,LPSTR,LPSTR,DWORD); 
-HANDLE _IMAGEHLPAPI FindDebugInfoFile(LPSTR,LPSTR,LPSTR); 
-HANDLE _IMAGEHLPAPI FindExecutableImage(LPSTR,LPSTR,LPSTR);
-BOOL _IMAGEHLPAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS); 
-BOOL _IMAGEHLPAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS,DWORD); 
-BOOL _IMAGEHLPAPI BindImage(IN LPSTR,IN LPSTR,IN LPSTR); 
-BOOL _IMAGEHLPAPI BindImageEx(IN DWORD,IN LPSTR,IN LPSTR,IN LPSTR,IN PIMAGEHLP_STATUS_ROUTINE); 
-BOOL _IMAGEHLPAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG*, OUT ULONG*, IN OUT ULONG*, IN ULONG);
-
-PLOADED_IMAGE _IMAGEHLPAPI ImageLoad(LPSTR,LPSTR); 
-BOOL _IMAGEHLPAPI ImageUnload(PLOADED_IMAGE); 
-PIMAGE_NT_HEADERS _IMAGEHLPAPI ImageNtHeader(IN PVOID); 
-PVOID _IMAGEHLPAPI ImageDirectoryEntryToData(IN PVOID,IN BOOLEAN,IN USHORT,OUT PULONG); 
-PIMAGE_SECTION_HEADER _IMAGEHLPAPI ImageRvaToSection(IN PIMAGE_NT_HEADERS,IN PVOID,IN ULONG); 
-PVOID _IMAGEHLPAPI ImageRvaToVa(IN PIMAGE_NT_HEADERS,IN PVOID,IN ULONG,IN OUT PIMAGE_SECTION_HEADER*); 
-BOOL _IMAGEHLPAPI MapAndLoad(LPSTR,LPSTR,PLOADED_IMAGE,BOOL,BOOL); 
-BOOL _IMAGEHLPAPI GetImageConfigInformation(PLOADED_IMAGE,PIMAGE_LOAD_CONFIG_DIRECTORY); 
-DWORD _IMAGEHLPAPI GetImageUnusedHeaderBytes(PLOADED_IMAGE,LPDWORD);
-BOOL _IMAGEHLPAPI SetImageConfigInformation(PLOADED_IMAGE,PIMAGE_LOAD_CONFIG_DIRECTORY);
-BOOL _IMAGEHLPAPI UnMapAndLoad(PLOADED_IMAGE); 
-PIMAGE_DEBUG_INFORMATION _IMAGEHLPAPI MapDebugInformation(HANDLE,LPSTR,LPSTR,DWORD); 
-BOOL _IMAGEHLPAPI UnmapDebugInformation(PIMAGE_DEBUG_INFORMATION); 
-HANDLE _IMAGEHLPAPI FindExecutableImage(LPSTR,LPSTR,LPSTR); 
-BOOL _IMAGEHLPAPI SearchTreeForFile(LPSTR,LPSTR,LPSTR);
-BOOL _IMAGEHLPAPI MakeSureDirectoryPathExists(LPCSTR);
-DWORD _IMAGEHLPAPI WINAPI UnDecorateSymbolName(LPCSTR,LPSTR,DWORD, DWORD); 
-BOOL
-_IMAGEHLPAPI
-StackWalk(DWORD,HANDLE,HANDLE,LPSTACKFRAME,LPVOID,PREAD_PROCESS_MEMORY_ROUTINE,PFUNCTION_TABLE_ACCESS_ROUTINE,PGET_MODULE_BASE_ROUTINE,PTRANSLATE_ADDRESS_ROUTINE);
-LPAPI_VERSION _IMAGEHLPAPI ImagehlpApiVersion(VOID); 
-LPAPI_VERSION _IMAGEHLPAPI ImagehlpApiVersionEx(LPAPI_VERSION);
-DWORD _IMAGEHLPAPI GetTimestampForLoadedLibrary(HMODULE); 
-BOOL _IMAGEHLPAPI RemovePrivateCvSymbolic(PCHAR,PCHAR*,ULONG*); 
-VOID _IMAGEHLPAPI RemoveRelocations(PCHAR);
-DWORD _IMAGEHLPAPI SymSetOptions(IN DWORD); 
-DWORD _IMAGEHLPAPI SymGetOptions(VOID); 
-BOOL _IMAGEHLPAPI SymCleanup(IN HANDLE); 
-BOOL _IMAGEHLPAPI SymEnumerateModules(IN HANDLE,IN PSYM_ENUMMODULES_CALLBACK,IN PVOID);
-BOOL _IMAGEHLPAPI SymEnumerateSymbols(IN HANDLE,IN DWORD,IN PSYM_ENUMSYMBOLS_CALLBACK,IN PVOID);
-BOOL _IMAGEHLPAPI EnumerateLoadedModules(IN HANDLE,IN PENUMLOADED_MODULES_CALLBACK,IN PVOID);
-LPVOID _IMAGEHLPAPI SymFunctionTableAccess(HANDLE,DWORD);
-BOOL _IMAGEHLPAPI SymGetModuleInfo(IN HANDLE,IN DWORD,OUT PIMAGEHLP_MODULE); 
-DWORD _IMAGEHLPAPI SymGetModuleBase(IN HANDLE,IN DWORD); 
-BOOL _IMAGEHLPAPI SymGetSymFromAddr(IN HANDLE,IN DWORD,OUT PDWORD,OUT PIMAGEHLP_SYMBOL); 
-BOOL _IMAGEHLPAPI SymGetSymFromName(IN HANDLE,IN LPSTR,OUT PIMAGEHLP_SYMBOL);
-BOOL _IMAGEHLPAPI SymGetSymNext(IN HANDLE,IN OUT PIMAGEHLP_SYMBOL); 
-BOOL _IMAGEHLPAPI SymGetSymPrev(IN HANDLE,IN OUT PIMAGEHLP_SYMBOL); 
-BOOL _IMAGEHLPAPI SymGetLineFromAddr(IN HANDLE,IN DWORD,OUT PDWORD,OUT PIMAGEHLP_LINE);
-BOOL _IMAGEHLPAPI SymGetLineFromName(IN HANDLE,IN LPSTR,IN LPSTR,IN DWORD,OUT PLONG,IN OUT PIMAGEHLP_LINE);
-BOOL _IMAGEHLPAPI SymGetLineNext(IN HANDLE,IN OUT PIMAGEHLP_LINE); 
-BOOL _IMAGEHLPAPI SymGetLinePrev(IN HANDLE,IN OUT PIMAGEHLP_LINE); 
-BOOL _IMAGEHLPAPI SymMatchFileName(IN LPSTR,IN LPSTR,OUT LPSTR*,OUT LPSTR*);
-BOOL _IMAGEHLPAPI SymInitialize(IN HANDLE,IN LPSTR,IN BOOL); 
-BOOL _IMAGEHLPAPI SymGetSearchPath(IN HANDLE,OUT LPSTR,IN DWORD); 
-BOOL _IMAGEHLPAPI SymSetSearchPath(IN HANDLE,IN LPSTR); 
-BOOL _IMAGEHLPAPI SymLoadModule(IN HANDLE,IN HANDLE,IN PSTR,IN PSTR,IN DWORD,IN DWORD); 
-BOOL _IMAGEHLPAPI SymUnloadModule(IN HANDLE,IN DWORD); 
-BOOL _IMAGEHLPAPI SymUnDName(IN PIMAGEHLP_SYMBOL,OUT LPSTR,IN DWORD); 
-BOOL _IMAGEHLPAPI SymRegisterCallback(IN HANDLE,IN PSYMBOL_REGISTERED_CALLBACK,IN PVOID);
-BOOL _IMAGEHLPAPI ImageGetDigestStream(IN HANDLE,IN DWORD,IN DIGEST_FUNCTION,IN DIGEST_HANDLE); 
-BOOL _IMAGEHLPAPI ImageAddCertificate(IN HANDLE,IN LPWIN_CERTIFICATE,OUT PDWORD); 
-BOOL _IMAGEHLPAPI ImageRemoveCertificate(IN HANDLE,IN DWORD); 
-BOOL _IMAGEHLPAPI ImageEnumerateCertificates(IN HANDLE,IN WORD,OUT PDWORD,IN OUT PDWORD OPTIONAL,IN OUT DWORD OPTIONAL); 
-BOOL _IMAGEHLPAPI ImageGetCertificateData(IN HANDLE,IN DWORD,OUT LPWIN_CERTIFICATE,IN OUT PDWORD); 
-BOOL _IMAGEHLPAPI ImageGetCertificateHeader(IN HANDLE,IN DWORD,IN OUT LPWIN_CERTIFICATE); 
-BOOL _IMAGEHLPAPI CopyPdb(CHAR const*,CHAR const*,BOOL); 
-BOOL _IMAGEHLPAPI RemovePrivateCvSymbolicEx(PCHAR,ULONG,PCHAR*,ULONG*);
-
-#endif /* RC_INVOKED */
-
-#ifdef UNICODE
-#define MapFileAndCheckSum MapFileAndCheckSumW
-#else
-#define MapFileAndCheckSum MapFileAndCheckSumA
-#endif 
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _IMAGEHLP_H */
-
diff --git a/winsup/w32api/include/imm.h b/winsup/w32api/include/imm.h
deleted file mode 100644
index 6ae9cab43..000000000
--- a/winsup/w32api/include/imm.h
+++ /dev/null
@@ -1,430 +0,0 @@
-#ifndef _IMM_H
-#define _IMM_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define WM_CONVERTREQUESTEX 0x108
-#define WM_IME_STARTCOMPOSITION 0x10D
-#define WM_IME_ENDCOMPOSITION 0x10E
-#define WM_IME_COMPOSITION 0x10F
-#define WM_IME_KEYLAST 0x10F
-#define WM_IME_SETCONTEXT 0x281
-#define WM_IME_NOTIFY 0x282
-#define WM_IME_CONTROL 0x283
-#define WM_IME_COMPOSITIONFULL 0x284
-#define WM_IME_SELECT 0x285
-#define WM_IME_CHAR 0x286
-#define WM_IME_KEYDOWN 0x290
-#define WM_IME_KEYUP 0x291
-#define IMC_GETCANDIDATEPOS 7
-#define IMC_SETCANDIDATEPOS 8
-#define IMC_GETCOMPOSITIONFONT 9
-#define IMC_SETCOMPOSITIONFONT 10
-#define IMC_GETCOMPOSITIONWINDOW 11
-#define IMC_SETCOMPOSITIONWINDOW 12
-#define IMC_GETSTATUSWINDOWPOS 15
-#define IMC_SETSTATUSWINDOWPOS 16
-#define IMC_CLOSESTATUSWINDOW 0x21
-#define IMC_OPENSTATUSWINDOW 0x22
-#define IMN_CLOSESTATUSWINDOW 1
-#define IMN_OPENSTATUSWINDOW 2
-#define IMN_CHANGECANDIDATE 3
-#define IMN_CLOSECANDIDATE 4
-#define IMN_OPENCANDIDATE 5
-#define IMN_SETCONVERSIONMODE 6
-#define IMN_SETSENTENCEMODE 7
-#define IMN_SETOPENSTATUS 8
-#define IMN_SETCANDIDATEPOS 9
-#define IMN_SETCOMPOSITIONFONT 10
-#define IMN_SETCOMPOSITIONWINDOW 11
-#define IMN_SETSTATUSWINDOWPOS 12
-#define IMN_GUIDELINE 13
-#define IMN_PRIVATE 14
-#define NI_OPENCANDIDATE 16
-#define NI_CLOSECANDIDATE 17
-#define NI_SELECTCANDIDATESTR 18
-#define NI_CHANGECANDIDATELIST 19
-#define NI_FINALIZECONVERSIONRESULT 20
-#define NI_COMPOSITIONSTR 21
-#define NI_SETCANDIDATE_PAGESTART 22
-#define NI_SETCANDIDATE_PAGESIZE 23
-#define NI_IMEMENUSELECTED 24
-#define ISC_SHOWUICANDIDATEWINDOW 1
-#define ISC_SHOWUICOMPOSITIONWINDOW 0x80000000
-#define ISC_SHOWUIGUIDELINE 0x40000000
-#define ISC_SHOWUIALLCANDIDATEWINDOW 15
-#define ISC_SHOWUIALL 0xC000000F
-#define CPS_COMPLETE 1
-#define CPS_CONVERT 2
-#define CPS_REVERT 3
-#define CPS_CANCEL 4
-#define IME_CHOTKEY_IME_NONIME_TOGGLE 16
-#define IME_CHOTKEY_SHAPE_TOGGLE 17
-#define IME_CHOTKEY_SYMBOL_TOGGLE 18
-#define IME_JHOTKEY_CLOSE_OPEN 0x30
-#define IME_KHOTKEY_SHAPE_TOGGLE 0x50
-#define IME_KHOTKEY_HANJACONVERT 0x51
-#define IME_KHOTKEY_ENGLISH 0x52
-#define IME_THOTKEY_IME_NONIME_TOGGLE 0x70
-#define IME_THOTKEY_SHAPE_TOGGLE 0x71
-#define IME_THOTKEY_SYMBOL_TOGGLE 0x72
-#define IME_HOTKEY_DSWITCH_FIRST 256
-#define IME_HOTKEY_DSWITCH_LAST 0x11F
-#define IME_ITHOTKEY_RESEND_RESULTSTR 512
-#define IME_ITHOTKEY_PREVIOUS_COMPOSITION 513
-#define IME_ITHOTKEY_UISTYLE_TOGGLE 514
-#define GCS_COMPREADSTR 1
-#define GCS_COMPREADATTR 2
-#define GCS_COMPREADCLAUSE 4
-#define GCS_COMPSTR 8
-#define GCS_COMPATTR 16
-#define GCS_COMPCLAUSE 32
-#define GCS_CURSORPOS 128
-#define GCS_DELTASTART 256
-#define GCS_RESULTREADSTR 512
-#define GCS_RESULTREADCLAUSE 1024
-#define GCS_RESULTSTR 2048
-#define GCS_RESULTCLAUSE 4096
-#define CS_INSERTCHAR 0x2000
-#define CS_NOMOVECARET 0x4000
-#define IMEVER_0310 0x3000A
-#define IMEVER_0400 0x40000
-#define IME_PROP_AT_CARET 0x10000
-#define IME_PROP_SPECIAL_UI 0x20000
-#define IME_PROP_CANDLIST_START_FROM_1 0x40000
-#define IME_PROP_UNICODE 0x80000
-#define UI_CAP_2700 1
-#define UI_CAP_ROT90 2
-#define UI_CAP_ROTANY 4
-#define SCS_CAP_COMPSTR 1
-#define SCS_CAP_MAKEREAD 2
-#define SELECT_CAP_CONVERSION 1
-#define SELECT_CAP_SENTENCE 2
-#define GGL_LEVEL 1
-#define GGL_INDEX 2
-#define GGL_STRING 3
-#define GGL_PRIVATE 4
-#define GL_LEVEL_NOGUIDELINE 0
-#define GL_LEVEL_FATAL 1
-#define GL_LEVEL_ERROR 2
-#define GL_LEVEL_WARNING 3
-#define GL_LEVEL_INFORMATION 4
-#define GL_ID_UNKNOWN 0
-#define GL_ID_NOMODULE 1
-#define GL_ID_NODICTIONARY 16
-#define GL_ID_CANNOTSAVE 17
-#define GL_ID_NOCONVERT 32
-#define GL_ID_TYPINGERROR 33
-#define GL_ID_TOOMANYSTROKE 34
-#define GL_ID_READINGCONFLICT 35
-#define GL_ID_INPUTREADING 36
-#define GL_ID_INPUTRADICAL 37
-#define GL_ID_INPUTCODE 38
-#define GL_ID_INPUTSYMBOL 39
-#define GL_ID_CHOOSECANDIDATE 40
-#define GL_ID_REVERSECONVERSION 41
-#define GL_ID_PRIVATE_FIRST 0x8000
-#define GL_ID_PRIVATE_LAST 0xFFFF
-#define IGP_GETIMEVERSION (DWORD)(-4)
-#define IGP_PROPERTY 4
-#define IGP_CONVERSION 8
-#define IGP_SENTENCE 12
-#define IGP_UI 16
-#define IGP_SETCOMPSTR 0x14
-#define IGP_SELECT 0x18
-#define SCS_SETSTR (GCS_COMPREADSTR|GCS_COMPSTR)
-#define SCS_CHANGEATTR (GCS_COMPREADATTR|GCS_COMPATTR)
-#define SCS_CHANGECLAUSE (GCS_COMPREADCLAUSE|GCS_COMPCLAUSE)
-#define ATTR_INPUT 0
-#define ATTR_TARGET_CONVERTED 1
-#define ATTR_CONVERTED 2
-#define ATTR_TARGET_NOTCONVERTED 3
-#define ATTR_INPUT_ERROR 4
-#define ATTR_FIXEDCONVERTED 5
-#define CFS_DEFAULT 0
-#define CFS_RECT 1
-#define CFS_POINT 2
-#define CFS_SCREEN 4
-#define CFS_FORCE_POSITION 32
-#define CFS_CANDIDATEPOS 64
-#define CFS_EXCLUDE 128
-#define GCL_CONVERSION 1
-#define GCL_REVERSECONVERSION 2
-#define GCL_REVERSE_LENGTH 3
-#define IME_CMODE_ALPHANUMERIC 0
-#define IME_CMODE_NATIVE 1
-#define IME_CMODE_CHINESE IME_CMODE_NATIVE
-#define IME_CMODE_HANGEUL IME_CMODE_NATIVE
-#define IME_CMODE_HANGUL IME_CMODE_NATIVE
-#define IME_CMODE_JAPANESE IME_CMODE_NATIVE
-#define IME_CMODE_KATAKANA 2
-#define IME_CMODE_LANGUAGE 3
-#define IME_CMODE_FULLSHAPE 8
-#define IME_CMODE_ROMAN 16
-#define IME_CMODE_CHARCODE 32
-#define IME_CMODE_HANJACONVERT 64
-#define IME_CMODE_SOFTKBD 128
-#define IME_CMODE_NOCONVERSION 256
-#define IME_CMODE_EUDC 512
-#define IME_CMODE_SYMBOL 1024
-#define IME_CMODE_FIXED 2048
-#define IME_SMODE_NONE 0
-#define IME_SMODE_PLAURALCLAUSE 1
-#define IME_SMODE_SINGLECONVERT 2
-#define IME_SMODE_AUTOMATIC 4
-#define IME_SMODE_PHRASEPREDICT 8
-#define IME_CAND_UNKNOWN 0
-#define IME_CAND_READ 1
-#define IME_CAND_CODE 2
-#define IME_CAND_MEANING 3
-#define IME_CAND_RADICAL 4
-#define IME_CAND_STROKE 5
-#define IMM_ERROR_NODATA (-1)
-#define IMM_ERROR_GENERAL (-2)
-#define IME_CONFIG_GENERAL 1
-#define IME_CONFIG_REGISTERWORD 2
-#define IME_CONFIG_SELECTDICTIONARY 3
-#define IME_ESC_QUERY_SUPPORT 3
-#define IME_ESC_RESERVED_FIRST 4
-#define IME_ESC_RESERVED_LAST 0x7FF
-#define IME_ESC_PRIVATE_FIRST 0x800
-#define IME_ESC_PRIVATE_LAST 0xFFF
-#define IME_ESC_SEQUENCE_TO_INTERNAL 0x1001
-#define IME_ESC_GET_EUDC_DICTIONARY 0x1003
-#define IME_ESC_SET_EUDC_DICTIONARY 0x1004
-#define IME_ESC_MAX_KEY 0x1005
-#define IME_ESC_IME_NAME 0x1006
-#define IME_ESC_SYNC_HOTKEY 0x1007
-#define IME_ESC_HANJA_MODE 0x1008
-#define IME_ESC_AUTOMATA 0x1009
-#define IME_REGWORD_STYLE_EUDC 1
-#define IME_REGWORD_STYLE_USER_FIRST 0x80000000
-#define IME_REGWORD_STYLE_USER_LAST 0xFFFFFFFF
-#define SOFTKEYBOARD_TYPE_T1 1
-#define SOFTKEYBOARD_TYPE_C1 2
-#define IMEMENUITEM_STRING_SIZE 80
-#define MOD_ALT 1
-#define MOD_CONTROL 2
-#define MOD_SHIFT 4
-#define MOD_WIN 8
-#define MOD_IGNORE_ALL_MODIFIER 1024
-#define MOD_ON_KEYUP  2048
-#define MOD_RIGHT 16384
-#define MOD_LEFT 32768
-#define IACE_CHILDREN 1
-#define IACE_DEFAULT 16
-#define IACE_IGNORENOCONTEXT 32
-#define IGIMIF_RIGHTMENU 1
-#define IGIMII_CMODE 1
-#define IGIMII_SMODE 2
-#define IGIMII_CONFIGURE 4
-#define IGIMII_TOOLS 8
-#define IGIMII_HELP 16
-#define IGIMII_OTHER 32
-#define IGIMII_INPUTTOOLS 64
-#define IMFT_RADIOCHECK 1
-#define IMFT_SEPARATOR 2
-#define IMFT_SUBMENU 4
-#define IMFS_GRAYED MFS_GRAYED
-#define IMFS_DISABLED MFS_DISABLED
-#define IMFS_CHECKED MFS_CHECKED
-#define IMFS_HILITE MFS_HILITE
-#define IMFS_ENABLED MFS_ENABLED
-#define IMFS_UNCHECKED MFS_UNCHECKED
-#define IMFS_UNHILITE MFS_UNHILITE
-#define IMFS_DEFAULT MFS_DEFAULT
-#ifndef VK_PROCESSKEY
-#define VK_PROCESSKEY 0x0E5
-#endif
-#define STYLE_DESCRIPTION_SIZE 32
-typedef DWORD HIMC;
-typedef DWORD HIMCC;
-typedef HKL *LPHKL;
-typedef struct tagCOMPOSITIONFORM {
-	DWORD dwStyle;
-	POINT ptCurrentPos;
-	RECT rcArea;
-} COMPOSITIONFORM,*PCOMPOSITIONFORM,*LPCOMPOSITIONFORM;
-typedef struct tagCANDIDATEFORM {
-	DWORD dwIndex;
-	DWORD dwStyle;
-	POINT ptCurrentPos;
-	RECT rcArea;
-} CANDIDATEFORM,*PCANDIDATEFORM,*LPCANDIDATEFORM;
-typedef struct tagCANDIDATELIST {
-	DWORD dwSize;
-	DWORD dwStyle;
-	DWORD dwCount;
-	DWORD dwSelection;
-	DWORD dwPageStart;
-	DWORD dwPageSize;
-	DWORD dwOffset[1];
-} CANDIDATELIST,*PCANDIDATELIST,*LPCANDIDATELIST;
-typedef struct tagREGISTERWORDA {
-	LPSTR lpReading;
-	LPSTR lpWord;
-} REGISTERWORDA,*PREGISTERWORDA,*LPREGISTERWORDA;
-typedef struct tagREGISTERWORDW {
-	LPWSTR lpReading;
-	LPWSTR lpWord;
-} REGISTERWORDW,*PREGISTERWORDW,*LPREGISTERWORDW;
-typedef struct tagSTYLEBUFA {
-	DWORD dwStyle;
-	CHAR szDescription[STYLE_DESCRIPTION_SIZE];
-} STYLEBUFA,*PSTYLEBUFA,*LPSTYLEBUFA;
-typedef struct tagSTYLEBUFW {
-	DWORD dwStyle;
-	WCHAR szDescription[STYLE_DESCRIPTION_SIZE];
-} STYLEBUFW,*PSTYLEBUFW,*LPSTYLEBUFW;
-typedef struct tagIMEMENUITEMINFOA {
-	UINT cbSize;
-	UINT fType;
-	UINT fState;
-	UINT wID;
-	HBITMAP hbmpChecked;
-	HBITMAP hbmpUnchecked;
-	DWORD dwItemData;
-	CHAR szString[IMEMENUITEM_STRING_SIZE];
-	HBITMAP hbmpItem;
-} IMEMENUITEMINFOA,*PIMEMENUITEMINFOA,*LPIMEMENUITEMINFOA;
-typedef struct tagIMEMENUITEMINFOW {
-	UINT cbSize;
-	UINT fType;
-	UINT fState;
-	UINT wID;
-	HBITMAP hbmpChecked;
-	HBITMAP hbmpUnchecked;
-	DWORD dwItemData;
-	WCHAR szString[IMEMENUITEM_STRING_SIZE];
-	HBITMAP hbmpItem;
-} IMEMENUITEMINFOW,*PIMEMENUITEMINFOW,*LPIMEMENUITEMINFOW;
-typedef int (CALLBACK *REGISTERWORDENUMPROCA)(LPCSTR, DWORD, LPCSTR, LPVOID);
-typedef int (CALLBACK *REGISTERWORDENUMPROCW)(LPCWSTR, DWORD, LPCWSTR, LPVOID);
-#ifdef UNICODE
-#define REGISTERWORDENUMPROC REGISTERWORDENUMPROCW
-typedef REGISTERWORDW REGISTERWORD,*PREGISTERWORD,*LPREGISTERWORD;
-typedef STYLEBUFW STYLEBUF,*PSTYLEBUF,*LPSTYLEBUF;
-typedef IMEMENUITEMINFOW IMEMENUITEMINFO,*PIMEMENUITEMINFO,*LPIMEMENUITEMINFO;
-#else
-#define REGISTERWORDENUMPROC REGISTERWORDENUMPROCA
-typedef REGISTERWORDA REGISTERWORD,*PREGISTERWORD,*LPREGISTERWORD;
-typedef STYLEBUFA STYLEBUF,*PSTYLEBUF,*LPSTYLEBUF;
-typedef IMEMENUITEMINFOA IMEMENUITEMINFO,*PIMEMENUITEMINFO,*LPIMEMENUITEMINFO;
-#endif
-HKL WINAPI ImmInstallIMEA(LPCSTR,LPCSTR);
-HKL WINAPI ImmInstallIMEW(LPCWSTR,LPCWSTR);
-HWND WINAPI ImmGetDefaultIMEWnd(HWND);
-UINT WINAPI ImmGetDescriptionA(HKL,LPSTR,UINT);
-UINT WINAPI ImmGetDescriptionW(HKL,LPWSTR,UINT);
-UINT WINAPI ImmGetIMEFileNameA(HKL,LPSTR,UINT);
-UINT WINAPI ImmGetIMEFileNameW(HKL,LPWSTR,UINT);
-DWORD WINAPI ImmGetProperty(HKL,DWORD);
-BOOL WINAPI ImmIsIME(HKL);
-BOOL WINAPI ImmSimulateHotKey(HWND,DWORD);
-HIMC WINAPI ImmCreateContext(void);
-BOOL WINAPI ImmDestroyContext(HIMC);
-HIMC WINAPI ImmGetContext(HWND);
-BOOL WINAPI ImmReleaseContext(HWND,HIMC);
-HIMC WINAPI ImmAssociateContext(HWND,HIMC);
-LONG WINAPI ImmGetCompositionStringA(HIMC,DWORD,PVOID,DWORD);
-LONG WINAPI ImmGetCompositionStringW(HIMC,DWORD,PVOID,DWORD);
-BOOL WINAPI ImmSetCompositionStringA(HIMC,DWORD,PCVOID,DWORD,PCVOID,DWORD);
-BOOL WINAPI ImmSetCompositionStringW(HIMC,DWORD,PCVOID,DWORD,PCVOID,DWORD);
-DWORD WINAPI ImmGetCandidateListCountA(HIMC,PDWORD);
-DWORD WINAPI ImmGetCandidateListCountW(HIMC,PDWORD);
-DWORD WINAPI ImmGetCandidateListA(HIMC,DWORD,PCANDIDATELIST,DWORD);
-DWORD WINAPI ImmGetCandidateListW(HIMC,DWORD,PCANDIDATELIST,DWORD);
-DWORD WINAPI ImmGetGuideLineA(HIMC,DWORD,LPSTR,DWORD);
-DWORD WINAPI ImmGetGuideLineW(HIMC,DWORD,LPWSTR,DWORD);
-BOOL WINAPI ImmGetConversionStatus(HIMC,LPDWORD,PDWORD);
-BOOL WINAPI ImmSetConversionStatus(HIMC,DWORD,DWORD);
-BOOL WINAPI ImmGetOpenStatus(HIMC);
-BOOL WINAPI ImmSetOpenStatus(HIMC,BOOL);
-#ifndef NOGDI
-BOOL WINAPI ImmGetCompositionFontA(HIMC,LPLOGFONTA);
-BOOL WINAPI ImmGetCompositionFontW(HIMC,LPLOGFONTW);
-BOOL WINAPI ImmSetCompositionFontA(HIMC,LPLOGFONTA);
-BOOL WINAPI ImmSetCompositionFontW(HIMC,LPLOGFONTW);
-#endif
-BOOL WINAPI ImmConfigureIMEA(HKL,HWND,DWORD,PVOID);
-BOOL WINAPI ImmConfigureIMEW(HKL,HWND,DWORD,PVOID);
-LRESULT WINAPI ImmEscapeA(HKL,HIMC,UINT,PVOID);
-LRESULT WINAPI ImmEscapeW(HKL,HIMC,UINT,PVOID);
-DWORD WINAPI ImmGetConversionListA(HKL,HIMC,LPCSTR,PCANDIDATELIST,DWORD,UINT);
-DWORD WINAPI ImmGetConversionListW(HKL,HIMC,LPCWSTR,PCANDIDATELIST,DWORD,UINT);
-BOOL WINAPI ImmNotifyIME(HIMC,DWORD,DWORD,DWORD);
-BOOL WINAPI ImmGetStatusWindowPos(HIMC,LPPOINT);
-BOOL WINAPI ImmSetStatusWindowPos(HIMC,LPPOINT);
-BOOL WINAPI ImmGetCompositionWindow(HIMC,PCOMPOSITIONFORM);
-BOOL WINAPI ImmSetCompositionWindow(HIMC,PCOMPOSITIONFORM);
-BOOL WINAPI ImmGetCandidateWindow(HIMC,DWORD,PCANDIDATEFORM);
-BOOL WINAPI ImmSetCandidateWindow(HIMC,PCANDIDATEFORM);
-BOOL WINAPI ImmIsUIMessageA(HWND,UINT,WPARAM,LPARAM);
-BOOL WINAPI ImmIsUIMessageW(HWND,UINT,WPARAM,LPARAM);
-UINT WINAPI ImmGetVirtualKey(HWND);
-BOOL WINAPI ImmRegisterWordA(HKL,LPCSTR,DWORD,LPCSTR);
-BOOL WINAPI ImmRegisterWordW(HKL,LPCWSTR,DWORD,LPCWSTR);
-BOOL WINAPI ImmUnregisterWordA(HKL,LPCSTR,DWORD,LPCSTR);
-BOOL WINAPI ImmUnregisterWordW(HKL,LPCWSTR,DWORD,LPCWSTR);
-UINT WINAPI ImmGetRegisterWordStyleA(HKL,UINT,PSTYLEBUFA);
-UINT WINAPI ImmGetRegisterWordStyleW(HKL,UINT,PSTYLEBUFW);
-UINT WINAPI ImmEnumRegisterWordA(HKL,REGISTERWORDENUMPROCA,LPCSTR,DWORD,LPCSTR,PVOID);
-UINT WINAPI ImmEnumRegisterWordW(HKL,REGISTERWORDENUMPROCW,LPCWSTR,DWORD,LPCWSTR,PVOID);
-BOOL WINAPI EnableEUDC(BOOL);
-BOOL WINAPI ImmDisableIME(DWORD);
-DWORD WINAPI ImmGetImeMenuItemsA(HIMC,DWORD,DWORD,LPIMEMENUITEMINFOA,LPIMEMENUITEMINFOA,DWORD);
-DWORD WINAPI ImmGetImeMenuItemsW(HIMC,DWORD,DWORD,LPIMEMENUITEMINFOW,LPIMEMENUITEMINFOW,DWORD);
-
-#ifdef UNICODE
-#define ImmEnumRegisterWord ImmEnumRegisterWordW
-#define ImmGetRegisterWordStyle ImmGetRegisterWordStyleW
-#define ImmUnregisterWord ImmUnregisterWordW
-#define ImmRegisterWord ImmRegisterWordW
-#define ImmInstallIME ImmInstallIMEW
-#define ImmIsUIMessage ImmIsUIMessageW
-#define ImmGetConversionList ImmGetConversionListW
-#define ImmEscape ImmEscapeW
-#define ImmConfigureIME ImmConfigureIMEW
-#ifndef NOGDI
-#define ImmSetCompositionFont ImmSetCompositionFontW
-#define ImmGetCompositionFont ImmGetCompositionFontW
-#endif
-#define ImmGetGuideLine ImmGetGuideLineW
-#define ImmGetCandidateList ImmGetCandidateListW
-#define ImmGetCandidateListCount ImmGetCandidateListCountW
-#define ImmSetCompositionString ImmSetCompositionStringW
-#define ImmGetCompositionString ImmGetCompositionStringW
-#define ImmGetDescription ImmGetDescriptionW
-#define ImmGetIMEFileName ImmGetIMEFileNameW
-#define ImmGetImeMenuItems ImmGetImeMenuItemsW
-#else
-#define ImmEnumRegisterWord ImmEnumRegisterWordA
-#define ImmGetRegisterWordStyle ImmGetRegisterWordStyleA
-#define ImmUnregisterWord ImmUnregisterWordA
-#define ImmRegisterWord ImmRegisterWordA
-#define ImmInstallIME ImmInstallIMEA
-#define ImmIsUIMessage ImmIsUIMessageA
-#define ImmGetConversionList ImmGetConversionListA
-#define ImmEscape ImmEscapeA
-#define ImmConfigureIME ImmConfigureIMEA
-#ifndef NOGDI
-#define ImmSetCompositionFont ImmSetCompositionFontA
-#define ImmGetCompositionFont ImmGetCompositionFontA
-#endif
-#define ImmGetGuideLine ImmGetGuideLineA
-#define ImmGetCandidateList ImmGetCandidateListA
-#define ImmGetCandidateListCount ImmGetCandidateListCountA
-#define ImmSetCompositionString ImmSetCompositionStringA
-#define ImmGetCompositionString ImmGetCompositionStringA
-#define ImmGetDescription ImmGetDescriptionA
-#define ImmGetIMEFileName ImmGetIMEFileNameA
-#define ImmGetImeMenuItems ImmGetImeMenuItemsW
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/initguid.h b/winsup/w32api/include/initguid.h
deleted file mode 100644
index b024c7075..000000000
--- a/winsup/w32api/include/initguid.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _INITGUID_H
-#define _INITGUID_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifndef DEFINE_GUID
-#include <basetyps.h>
-#endif
-#undef DEFINE_GUID
-#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) GUID_EXT const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-#endif
diff --git a/winsup/w32api/include/intshcut.h b/winsup/w32api/include/intshcut.h
deleted file mode 100644
index e4c87cd10..000000000
--- a/winsup/w32api/include/intshcut.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef _INTSHCUT_H
-#define _INTSHCUT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <isguids.h>
-#ifdef __cplusplus
-extern "C" { 
-#endif 
-#define INTSHCUTAPI DECLSPEC_IMPORT
-#define E_FLAGS MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x1000)
-#define IS_E_EXEC_FAILED MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x2002)
-#define URL_E_INVALID_SYNTAX MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x1001)
-#define URL_E_UNREGISTERED_PROTOCOL MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x1002)
-typedef enum iurl_seturl_flags {
- IURL_SETURL_FL_GUESS_PROTOCOL=1,
- IURL_SETURL_FL_USE_DEFAULT_PROTOCOL,
- ALL_IURL_SETURL_FLAGS=(IURL_SETURL_FL_GUESS_PROTOCOL|IURL_SETURL_FL_USE_DEFAULT_PROTOCOL)
-} IURL_SETURL_FLAGS;
-typedef enum iurl_invokecommand_flags {
- IURL_INVOKECOMMAND_FL_ALLOW_UI=1,
- IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB,
- ALL_IURL_INVOKECOMMAND_FLAGS=(IURL_INVOKECOMMAND_FL_ALLOW_UI|IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB)
-} IURL_INVOKECOMMAND_FLAGS;
-typedef enum translateurl_in_flags {
- TRANSLATEURL_FL_GUESS_PROTOCOL=1,
- TRANSLATEURL_FL_USE_DEFAULT_PROTOCOL,
- ALL_TRANSLATEURL_FLAGS=(TRANSLATEURL_FL_GUESS_PROTOCOL|TRANSLATEURL_FL_USE_DEFAULT_PROTOCOL)
-} TRANSLATEURL_IN_FLAGS;
-typedef enum urlassociationdialog_in_flags {
- URLASSOCDLG_FL_USE_DEFAULT_NAME=1,
- URLASSOCDLG_FL_REGISTER_ASSOC,
- ALL_URLASSOCDLG_FLAGS=(URLASSOCDLG_FL_USE_DEFAULT_NAME|URLASSOCDLG_FL_REGISTER_ASSOC)
-} URLASSOCIATIONDIALOG_IN_FLAGS;
-typedef enum mimeassociationdialog_in_flags {
- MIMEASSOCDLG_FL_REGISTER_ASSOC=1,
- ALL_MIMEASSOCDLG_FLAGS=MIMEASSOCDLG_FL_REGISTER_ASSOC
-} MIMEASSOCIATIONDIALOG_IN_FLAGS;
-typedef struct urlinvokecommandinfo {
- DWORD dwcbSize;
- DWORD dwFlags;
- HWND hwndParent;
- PCSTR pcszVerb;
-} URLINVOKECOMMANDINFO,*PURLINVOKECOMMANDINFO;
-typedef const URLINVOKECOMMANDINFO CURLINVOKECOMMANDINFO;
-typedef const URLINVOKECOMMANDINFO *PCURLINVOKECOMMANDINFO;
-#undef INTERFACE
-#define INTERFACE IUniformResourceLocator
-DECLARE_INTERFACE_(IUniformResourceLocator,IUnknown)
-{
- STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
- STDMETHOD_(ULONG,AddRef)(THIS) PURE;
- STDMETHOD_(ULONG,Release)(THIS) PURE;
- STDMETHOD(SetURL)(THIS_ PCSTR,DWORD) PURE;
- STDMETHOD(GetURL)(THIS_ PSTR*) PURE;
- STDMETHOD(InvokeCommand)(THIS_ PURLINVOKECOMMANDINFO) PURE;
-};
-typedef IUniformResourceLocator *PIUniformResourceLocator;
-typedef const IUniformResourceLocator CIUniformResourceLocator;
-typedef const IUniformResourceLocator *PCIUniformResourceLocator;
-
-BOOL WINAPI InetIsOffline(DWORD);
-HRESULT WINAPI MIMEAssociationDialogA(HWND,DWORD,PCSTR,PCSTR,PSTR,UINT);
-HRESULT WINAPI MIMEAssociationDialogW(HWND,DWORD,PCWSTR,PCWSTR,PWSTR,UINT);
-HRESULT WINAPI TranslateURLA(PCSTR,DWORD,PSTR*);
-HRESULT WINAPI TranslateURLW(PCWSTR,DWORD,PWSTR*);
-HRESULT WINAPI URLAssociationDialogA(HWND,DWORD,PCSTR,PCSTR,PSTR,UINT);
-HRESULT WINAPI URLAssociationDialogW(HWND,DWORD,PCWSTR,PCWSTR,PWSTR,UINT);
-#ifdef UNICODE
-#define TranslateURL TranslateURLW
-#define MIMEAssociationDialog MIMEAssociationDialogW
-#define URLAssociationDialog URLAssociationDialogW
-#else
-#define TranslateURL TranslateURLA
-#define MIMEAssociationDialog MIMEAssociationDialogA
-#define URLAssociationDialog URLAssociationDialogA
-#endif 
-#ifdef __cplusplus
-} 
-#endif 
-#endif 
diff --git a/winsup/w32api/include/ipexport.h b/winsup/w32api/include/ipexport.h
deleted file mode 100644
index 3fbf4eec9..000000000
--- a/winsup/w32api/include/ipexport.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef _IPEXPORT_H
-#define _IPEXPORT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifndef ANY_SIZE
-#define ANY_SIZE 1
-#endif
-#define MAX_ADAPTER_NAME 128
-/* IP STATUS flags */
-#define IP_STATUS_BASE 11000
-#define IP_SUCCESS  0
-#define IP_BUF_TOO_SMALL    (IP_STATUS_BASE + 1)
-#define IP_DEST_NET_UNREACHABLE (IP_STATUS_BASE + 2)
-#define IP_DEST_HOST_UNREACHABLE    (IP_STATUS_BASE + 3)
-#define IP_DEST_PROT_UNREACHABLE    (IP_STATUS_BASE + 4)
-#define IP_DEST_PORT_UNREACHABLE    (IP_STATUS_BASE + 5)
-#define IP_NO_RESOURCES (IP_STATUS_BASE + 6)
-#define IP_BAD_OPTION   (IP_STATUS_BASE + 7)
-#define IP_HW_ERROR (IP_STATUS_BASE + 8)
-#define IP_PACKET_TOO_BIG   (IP_STATUS_BASE + 9)
-#define IP_REQ_TIMED_OUT    (IP_STATUS_BASE + 10)
-#define IP_BAD_REQ  (IP_STATUS_BASE + 11)
-#define IP_BAD_ROUTE    (IP_STATUS_BASE + 12)
-#define IP_TTL_EXPIRED_TRANSIT  (IP_STATUS_BASE + 13)
-#define IP_TTL_EXPIRED_REASSEM  (IP_STATUS_BASE + 14)
-#define IP_PARAM_PROBLEM    (IP_STATUS_BASE + 15)
-#define IP_SOURCE_QUENCH    (IP_STATUS_BASE + 16)
-#define IP_OPTION_TOO_BIG   (IP_STATUS_BASE + 17)
-#define IP_BAD_DESTINATION  (IP_STATUS_BASE + 18)
-#define IP_ADDR_DELETED (IP_STATUS_BASE + 19)
-#define IP_SPEC_MTU_CHANGE  (IP_STATUS_BASE + 20)
-#define IP_MTU_CHANGE   (IP_STATUS_BASE + 21)
-#define IP_UNLOAD   (IP_STATUS_BASE + 22)
-#define IP_GENERAL_FAILURE  (IP_STATUS_BASE + 50)
-#define MAX_IP_STATUS   IP_GENERAL_FAILURE
-#define IP_PENDING  (IP_STATUS_BASE + 255)
-/* IP header Flags values */
-#define IP_FLAG_DF  0x2
-/*  IP Option types */
-#define IP_OPT_EOL  0
-#define IP_OPT_NOP  1
-#define IP_OPT_SECURITY 0x82
-#define IP_OPT_LSRR 0x83
-#define IP_OPT_SSRR 0x89
-#define IP_OPT_RR   0x7
-#define IP_OPT_TS   0x44
-#define IP_OPT_SID  0x88
-#define IP_OPT_ROUTER_ALERT 0x94
-#define MAX_OPT_SIZE    40
-
-typedef unsigned long IPAddr, IPMask, IP_STATUS;
-typedef struct ip_option_information {
-  unsigned char Ttl;
-  unsigned char Tos;
-  unsigned char Flags;
-  unsigned char OptionsSize;
-  unsigned char* OptionsData;
-}IP_OPTION_INFORMATION, *PIP_OPTION_INFORMATION;
-typedef struct icmp_echo_reply {
-  IPAddr        Address;
-  unsigned long Status;
-  unsigned long RoundTripTime;
-  unsigned short    DataSize;
-  unsigned short    Reserved;
-  void* Data;
-  struct ip_option_information   Options;
-} ICMP_ECHO_REPLY, *PICMP_ECHO_REPLY;
-typedef struct {
-  ULONG Index;
-  WCHAR  Name[MAX_ADAPTER_NAME];
-} IP_ADAPTER_INDEX_MAP, *PIP_ADAPTER_INDEX_MAP;
-typedef struct {
-  LONG NumAdapters;
-  IP_ADAPTER_INDEX_MAP Adapter[ANY_SIZE];
-} IP_INTERFACE_INFO, *PIP_INTERFACE_INFO;
-typedef struct _IP_UNIDIRECTIONAL_ADAPTER_ADDRESS {
-  ULONG NumAdapters;
-  IPAddr Address[1];
-} IP_UNIDIRECTIONAL_ADAPTER_ADDRESS, *PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS;
-#ifdef __cplusplus
-}
-#endif
-#endif /* _IPEXPORT_H */
diff --git a/winsup/w32api/include/iphlpapi.h b/winsup/w32api/include/iphlpapi.h
deleted file mode 100644
index 214c53ef7..000000000
--- a/winsup/w32api/include/iphlpapi.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _IPHLPAPI_H
-#define _IPHLPAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <iprtrmib.h>
-#include <ipexport.h>
-#include <iptypes.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-DWORD WINAPI AddIPAddress(IPAddr,IPMask,DWORD,PULONG,PULONG);
-DWORD WINAPI CreateIpForwardEntry(PMIB_IPFORWARDROW);
-DWORD WINAPI CreateIpNetEntry(PMIB_IPNETROW);
-DWORD WINAPI CreateProxyArpEntry(DWORD,DWORD,DWORD);
-DWORD WINAPI DeleteIPAddress(ULONG);
-DWORD WINAPI DeleteIpForwardEntry(PMIB_IPFORWARDROW);
-DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW);
-DWORD WINAPI DeleteProxyArpEntry(DWORD,DWORD,DWORD);
-DWORD WINAPI EnableRouter(HANDLE*,OVERLAPPED*);
-DWORD WINAPI FlushIpNetTable(DWORD);
-DWORD WINAPI GetAdapterIndex(LPWSTR,PULONG);
-DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO,PULONG);
-DWORD WINAPI GetBestInterface(IPAddr,PDWORD);
-DWORD WINAPI GetBestRoute(DWORD,DWORD,PMIB_IPFORWARDROW);
-DWORD WINAPI GetFriendlyIfIndex(DWORD);
-DWORD WINAPI GetIcmpStatistics(PMIB_ICMP);
-DWORD WINAPI GetIfEntry(PMIB_IFROW);
-DWORD WINAPI GetIfTable(PMIB_IFTABLE,PULONG,BOOL);
-DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO,PULONG);
-DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE,PULONG,BOOL);
-DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE,PULONG,BOOL);
-DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE,PULONG,BOOL);
-DWORD WINAPI GetIpStatistics(PMIB_IPSTATS);
-DWORD WINAPI GetNetworkParams(PFIXED_INFO,PULONG);
-DWORD WINAPI GetNumberOfInterfaces(PDWORD);
-DWORD WINAPI GetPerAdapterInfo(ULONG,PIP_PER_ADAPTER_INFO, PULONG);
-BOOL WINAPI GetRTTAndHopCount(IPAddr,PULONG,ULONG,PULONG);
-DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS);
-DWORD WINAPI GetTcpTable(PMIB_TCPTABLE,PDWORD,BOOL);
-DWORD WINAPI GetUniDirectionalAdapterInfo(PIP_UNIDIRECTIONAL_ADAPTER_ADDRESS,PULONG);
-DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS);
-DWORD WINAPI GetUdpTable(PMIB_UDPTABLE,PDWORD,BOOL);
-DWORD WINAPI IpReleaseAddress(PIP_ADAPTER_INDEX_MAP);
-DWORD WINAPI IpRenewAddress(PIP_ADAPTER_INDEX_MAP);
-DWORD WINAPI NotifyAddrChange(PHANDLE,LPOVERLAPPED);
-DWORD WINAPI NotifyRouteChange(PHANDLE,LPOVERLAPPED);
-DWORD WINAPI SendARP(IPAddr,IPAddr,PULONG,PULONG);
-DWORD WINAPI SetIfEntry(PMIB_IFROW);
-DWORD WINAPI SetIpForwardEntry(PMIB_IPFORWARDROW);
-DWORD WINAPI SetIpNetEntry(PMIB_IPNETROW);
-DWORD WINAPI SetIpStatistics(PMIB_IPSTATS);
-DWORD WINAPI SetIpTTL(UINT);
-DWORD WINAPI SetTcpEntry(PMIB_TCPROW);
-DWORD WINAPI UnenableRouter(OVERLAPPED*, LPDWORD);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _IPHLPAPI_H */
diff --git a/winsup/w32api/include/ipifcons.h b/winsup/w32api/include/ipifcons.h
deleted file mode 100644
index eecf53264..000000000
--- a/winsup/w32api/include/ipifcons.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _IPIFCONS_H
-#define _IPIFCONS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define MIB_IF_ADMIN_STATUS_UP 1
-#define MIB_IF_ADMIN_STATUS_DOWN 2
-#define MIB_IF_ADMIN_STATUS_TESTING 3
-#define MIB_IF_OPER_STATUS_NON_OPERATIONAL 0
-#define MIB_IF_OPER_STATUS_UNREACHABLE 1
-#define MIB_IF_OPER_STATUS_DISCONNECTED 2
-#define MIB_IF_OPER_STATUS_CONNECTING 3
-#define MIB_IF_OPER_STATUS_CONNECTED 4
-#define MIB_IF_OPER_STATUS_OPERATIONAL 5
-#define MIB_IF_TYPE_OTHER 1
-#define MIB_IF_TYPE_ETHERNET 6
-#define MIB_IF_TYPE_TOKENRING 9
-#define MIB_IF_TYPE_FDDI 15
-#define MIB_IF_TYPE_PPP 23
-#define MIB_IF_TYPE_LOOPBACK 24
-#define MIB_IF_TYPE_SLIP 28
-#endif /* _IPIFCONS_H */
diff --git a/winsup/w32api/include/iprtrmib.h b/winsup/w32api/include/iprtrmib.h
deleted file mode 100644
index f897ecbfa..000000000
--- a/winsup/w32api/include/iprtrmib.h
+++ /dev/null
@@ -1,209 +0,0 @@
-#ifndef _IPRTRMIB_H
-#define _IPRTRMIB_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <ipifcons.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifndef ANY_SIZE
-#define ANY_SIZE 1
-#endif
-#define MAXLEN_PHYSADDR 8
-#define MAXLEN_IFDESCR 256
-#ifndef MAX_INTERFACE_NAME_LEN
-#define MAX_INTERFACE_NAME_LEN 256
-#endif
-#define MIB_IPNET_TYPE_OTHER 1
-#define MIB_IPNET_TYPE_INVALID 2
-#define MIB_IPNET_TYPE_DYNAMIC 3
-#define MIB_IPNET_TYPE_STATIC 4
-#define MIB_TCP_RTO_OTHER 1
-#define MIB_TCP_RTO_CONSTANT 2
-#define MIB_TCP_RTO_RSRE 3
-#define MIB_TCP_RTO_VANJ 4
-#define MIB_TCP_STATE_CLOSED 1                 
-#define MIB_TCP_STATE_LISTEN 2                 
-#define MIB_TCP_STATE_SYN_SENT 3                 
-#define MIB_TCP_STATE_SYN_RCVD 4                 
-#define MIB_TCP_STATE_ESTAB 5                 
-#define MIB_TCP_STATE_FIN_WAIT1 6                 
-#define MIB_TCP_STATE_FIN_WAIT2 7                 
-#define MIB_TCP_STATE_CLOSE_WAIT 8                 
-#define MIB_TCP_STATE_CLOSING 9                
-#define MIB_TCP_STATE_LAST_ACK 10                
-#define MIB_TCP_STATE_TIME_WAIT 11                
-#define MIB_TCP_STATE_DELETE_TCB 12                
-#define MIB_USE_CURRENT_TTL ((DWORD)-1)
-#define MIB_USE_CURRENT_FORWARDING ((DWORD)-1)
-#define MIB_TCP_MAXCONN_DYNAMIC ((DWORD)-1)
-typedef struct {
-  DWORD dwAddr;
-  DWORD dwIndex;
-  DWORD dwMask;
-  DWORD dwBCastAddr;
-  DWORD dwReasmSize;
-  unsigned short unused1;
-  unsigned short unused2;
-} MIB_IPADDRROW, *PMIB_IPADDRROW;
-typedef struct {
-  DWORD dwNumEntries;
-  MIB_IPADDRROW table[ANY_SIZE];
-} MIB_IPADDRTABLE, *PMIB_IPADDRTABLE;
-typedef struct {
-  DWORD dwForwardDest;
-  DWORD dwForwardMask;
-  DWORD dwForwardPolicy;
-  DWORD dwForwardNextHop;
-  DWORD dwForwardIfIndex;
-  DWORD dwForwardType;
-  DWORD dwForwardProto;
-  DWORD dwForwardAge;
-  DWORD dwForwardNextHopAS;
-  DWORD dwForwardMetric1;
-  DWORD dwForwardMetric2;
-  DWORD dwForwardMetric3;
-  DWORD dwForwardMetric4;
-  DWORD dwForwardMetric5;
-} MIB_IPFORWARDROW, *PMIB_IPFORWARDROW;
-typedef struct {
-  DWORD dwNumEntries;
-  MIB_IPFORWARDROW table[ANY_SIZE];
-} MIB_IPFORWARDTABLE, *PMIB_IPFORWARDTABLE;
-typedef struct {
-  DWORD dwIndex;
-  DWORD dwPhysAddrLen;
-  BYTE bPhysAddr[MAXLEN_PHYSADDR];
-  DWORD dwAddr;
-  DWORD dwType;
-} MIB_IPNETROW, *PMIB_IPNETROW;
-typedef struct {
-  DWORD dwNumEntries;
-  MIB_IPNETROW table[ANY_SIZE];
-} MIB_IPNETTABLE, *PMIB_IPNETTABLE;
-typedef struct {
-  DWORD dwMsgs;
-  DWORD dwErrors;
-  DWORD dwDestUnreachs;
-  DWORD dwTimeExcds;
-  DWORD dwParmProbs;
-  DWORD dwSrcQuenchs;
-  DWORD dwRedirects;
-  DWORD dwEchos;
-  DWORD dwEchoReps;
-  DWORD dwTimestamps;
-  DWORD dwTimestampReps;
-  DWORD dwAddrMasks;
-  DWORD dwAddrMaskReps;
-} MIBICMPSTATS, *PMIBICMPSTATS;
-typedef struct {
-  MIBICMPSTATS icmpInStats;
-  MIBICMPSTATS icmpOutStats;
-} MIBICMPINFO, *PMIBICMPINFO;
-typedef struct {
-  MIBICMPINFO stats;
-} MIB_ICMP, *PMIB_ICMP;
-typedef struct {
-  WCHAR wszName[MAX_INTERFACE_NAME_LEN];
-  DWORD dwIndex;
-  DWORD dwType;
-  DWORD dwMtu;
-  DWORD dwSpeed;
-  DWORD dwPhysAddrLen;
-  BYTE bPhysAddr[MAXLEN_PHYSADDR];
-  DWORD dwAdminStatus;
-  DWORD dwOperStatus;
-  DWORD dwLastChange;
-  DWORD dwInOctets;
-  DWORD dwInUcastPkts;
-  DWORD dwInNUcastPkts;
-  DWORD dwInDiscards;
-  DWORD dwInErrors;
-  DWORD dwInUnknownProtos;
-  DWORD dwOutOctets;
-  DWORD dwOutUcastPkts;
-  DWORD dwOutNUcastPkts;
-  DWORD dwOutDiscards;
-  DWORD dwOutErrors;
-  DWORD dwOutQLen;
-  DWORD dwDescrLen;
-  BYTE  bDescr[MAXLEN_IFDESCR];
-} MIB_IFROW, *PMIB_IFROW;
-typedef struct {
-  DWORD dwNumEntries;
-  MIB_IFROW table[ANY_SIZE];
-} MIB_IFTABLE, *PMIB_IFTABLE;
-typedef struct {
-  DWORD dwForwarding;
-  DWORD dwDefaultTTL;
-  DWORD dwInReceives;
-  DWORD dwInHdrErrors;
-  DWORD dwInAddrErrors;
-  DWORD dwForwDatagrams;
-  DWORD dwInUnknownProtos;
-  DWORD dwInDiscards;
-  DWORD dwInDelivers;
-  DWORD dwOutRequests;
-  DWORD dwRoutingDiscards;
-  DWORD dwOutDiscards;
-  DWORD dwOutNoRoutes;
-  DWORD dwReasmTimeout;
-  DWORD dwReasmReqds;
-  DWORD dwReasmOks;
-  DWORD dwReasmFails;
-  DWORD dwFragOks;
-  DWORD dwFragFails;
-  DWORD dwFragCreates;
-  DWORD dwNumIf;
-  DWORD dwNumAddr;
-  DWORD dwNumRoutes;
-} MIB_IPSTATS, *PMIB_IPSTATS;
-typedef struct {
-  DWORD dwRtoAlgorithm;
-  DWORD dwRtoMin;
-  DWORD dwRtoMax;
-  DWORD dwMaxConn;
-  DWORD dwActiveOpens;
-  DWORD dwPassiveOpens;
-  DWORD dwAttemptFails;
-  DWORD dwEstabResets;
-  DWORD dwCurrEstab;
-  DWORD dwInSegs;
-  DWORD dwOutSegs;
-  DWORD dwRetransSegs;
-  DWORD dwInErrs;
-  DWORD dwOutRsts;
-  DWORD dwNumConns;
-} MIB_TCPSTATS, *PMIB_TCPSTATS;
-typedef struct {
-  DWORD dwState;
-  DWORD dwLocalAddr;
-  DWORD dwLocalPort;
-  DWORD dwRemoteAddr;
-  DWORD dwRemotePort;
-} MIB_TCPROW, *PMIB_TCPROW;
-typedef struct {
-  DWORD dwNumEntries;
-  MIB_TCPROW table[ANY_SIZE];
-} MIB_TCPTABLE, *PMIB_TCPTABLE;
-typedef struct {
-  DWORD dwInDatagrams;
-  DWORD dwNoPorts;
-  DWORD dwInErrors;
-  DWORD dwOutDatagrams;
-  DWORD dwNumAddrs;
-} MIB_UDPSTATS, *PMIB_UDPSTATS;
-typedef struct {
-  DWORD dwLocalAddr;
-  DWORD dwLocalPort;
-} MIB_UDPROW, *PMIB_UDPROW;
-typedef struct {
-  DWORD dwNumEntries;
-  MIB_UDPROW table[ANY_SIZE];
-} MIB_UDPTABLE, *PMIB_UDPTABLE;
-#ifdef __cplusplus
-}
-#endif
-#endif /* _IPRTRMIB_H */
diff --git a/winsup/w32api/include/iptypes.h b/winsup/w32api/include/iptypes.h
deleted file mode 100644
index 6ddded00a..000000000
--- a/winsup/w32api/include/iptypes.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _IPTYPES_H
-#define _IPTYPES_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <sys/types.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define DEFAULT_MINIMUM_ENTITIES 32
-#define MAX_ADAPTER_ADDRESS_LENGTH 8
-#define MAX_ADAPTER_DESCRIPTION_LENGTH 128
-#define MAX_ADAPTER_NAME_LENGTH 256
-#define MAX_DOMAIN_NAME_LEN 128
-#define MAX_HOSTNAME_LEN 128
-#define MAX_SCOPE_ID_LEN 256
-#define BROADCAST_NODETYPE 1
-#define PEER_TO_PEER_NODETYPE 2
-#define MIXED_NODETYPE 4
-#define HYBRID_NODETYPE 8
-#define IF_OTHER_ADAPTERTYPE 0
-#define IF_ETHERNET_ADAPTERTYPE 1
-#define IF_TOKEN_RING_ADAPTERTYPE 2
-#define IF_FDDI_ADAPTERTYPE 3
-#define IF_PPP_ADAPTERTYPE 4
-#define IF_LOOPBACK_ADAPTERTYPE 5
-typedef struct {
-  char String[16];
-} IP_ADDRESS_STRING, *PIP_ADDRESS_STRING, IP_MASK_STRING, *PIP_MASK_STRING;
-typedef struct _IP_ADDR_STRING {
-  struct _IP_ADDR_STRING* Next;
-  IP_ADDRESS_STRING IpAddress;
-  IP_MASK_STRING IpMask;
-  DWORD Context;
-} IP_ADDR_STRING, *PIP_ADDR_STRING;
-typedef struct _IP_ADAPTER_INFO {
-  struct _IP_ADAPTER_INFO* Next;
-  DWORD ComboIndex;
-  char AdapterName[MAX_ADAPTER_NAME_LENGTH+4];
-  char Description[MAX_ADAPTER_DESCRIPTION_LENGTH+4];
-  UINT AddressLength;
-  BYTE Address[MAX_ADAPTER_ADDRESS_LENGTH];
-  DWORD Index;
-  UINT Type;
-  UINT DhcpEnabled;
-  PIP_ADDR_STRING CurrentIpAddress;
-  IP_ADDR_STRING IpAddressList;
-  IP_ADDR_STRING GatewayList;
-  IP_ADDR_STRING DhcpServer;
-  BOOL HaveWins;
-  IP_ADDR_STRING PrimaryWinsServer;
-  IP_ADDR_STRING SecondaryWinsServer;
-  time_t LeaseObtained;
-  time_t LeaseExpires;
-} IP_ADAPTER_INFO, *PIP_ADAPTER_INFO;
-typedef struct _IP_PER_ADAPTER_INFO {
-  UINT AutoconfigEnabled;
-  UINT AutoconfigActive;
-  PIP_ADDR_STRING CurrentDnsServer;
-  IP_ADDR_STRING DnsServerList;
-} IP_PER_ADAPTER_INFO, *PIP_PER_ADAPTER_INFO;
-typedef struct _FIXED_INFO {
-  char HostName[MAX_HOSTNAME_LEN+4] ;
-  char DomainName[MAX_DOMAIN_NAME_LEN+4];
-  PIP_ADDR_STRING CurrentDnsServer;
-  IP_ADDR_STRING DnsServerList;
-  UINT NodeType;
-  char ScopeId[MAX_SCOPE_ID_LEN+4];
-  UINT EnableRouting;
-  UINT EnableProxy;
-  UINT EnableDns;
-} FIXED_INFO, *PFIXED_INFO;
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _IPTYPES_H */
diff --git a/winsup/w32api/include/isguids.h b/winsup/w32api/include/isguids.h
deleted file mode 100644
index d5655d262..000000000
--- a/winsup/w32api/include/isguids.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ISGUID_H
-#define _ISGUID_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern const GUID CLSID_InternetShortcut;
-extern const GUID IID_IUniformResourceLocator;
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/largeint.h b/winsup/w32api/include/largeint.h
deleted file mode 100644
index b2222a97f..000000000
--- a/winsup/w32api/include/largeint.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-  largeint.h
-
-  Header for 64 bit integer arithmetics library
-
- */
-#ifndef _LARGEINT_H
-#define _LARGEINT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef _HAVE_INT64
-#define _toi (__int64)
-#define _toui (unsigned __int64)
-#else
-#error "64 bit integers not supported"
-#endif
-
-/*
-  We don't let the compiler see the prototypes if we are compiling the
-  library because if it does it will choke on conflicting types in the
-  prototypes.
-*/
-
-#if defined(LARGEINT_PROTOS) || defined(__COMPILING_LARGEINT)
-
-#ifndef __COMPILING_LARGEINT
-/* addition/subtraction */
-LARGE_INTEGER WINAPI LargeIntegerAdd (LARGE_INTEGER, LARGE_INTEGER);
-LARGE_INTEGER WINAPI LargeIntegerSubtract (LARGE_INTEGER, LARGE_INTEGER);
-
-/* bit operations */
-LARGE_INTEGER WINAPI LargeIntegerArithmeticShift (LARGE_INTEGER, int);
-LARGE_INTEGER WINAPI LargeIntegerShiftLeft (LARGE_INTEGER, int);
-LARGE_INTEGER WINAPI LargeIntegerShiftRight (LARGE_INTEGER, int);
-LARGE_INTEGER WINAPI LargeIntegerNegate (LARGE_INTEGER);
-
-/* conversion */
-LARGE_INTEGER WINAPI ConvertLongToLargeInteger (LONG);
-LARGE_INTEGER WINAPI ConvertUlongToLargeInteger (ULONG);
-
-/* multiplication */
-LARGE_INTEGER WINAPI EnlargedIntegerMultiply (LONG, LONG);
-LARGE_INTEGER WINAPI EnlargedUnsignedMultiply (ULONG, ULONG);
-LARGE_INTEGER WINAPI ExtendedIntegerMultiply (LARGE_INTEGER, LONG);
-/* FIXME: is this not part of largeint? */
-LARGE_INTEGER WINAPI LargeIntegerMultiply (LARGE_INTEGER, LARGE_INTEGER);
-#endif /* __COMPILING_LARGEINT */
-
-#else
-
-#define LargeIntegerAdd(a,b) (LARGE_INTEGER)(_toi(a) + _toi(b))
-#define LargeIntegerSubtract(a,b) (LARGE_INTEGER)(_toi(a) - _toi(b))
-#define LargeIntegerRightShift(i,n) (LARGE_INTEGER)(_toi(i) >> (n))
-#define LargeIntegerArithmeticShift LargeIntegerRightShift
-#define LargeIntegerLeftShift(i,n) (LARGE_INTEGER)(_toi(i) << (n))
-#define LargeIntegerNegate(i) (LARGE_INTEGER)(- _toi(i))
-#define EnlargedIntegerMultiply(a,b) (LARGE_INTEGER)(_toi(a) * _toi(b))
-#define EnlargedUnsignedMultiply(a,b) (LARGE_INTEGER)(_toui(a) * _toui(b))
-#define ExtendedIntegerMultiply(a,b) (LARGE_INTEGER)(_toi(a) * _toi(b))
-/* FIXME: should this exist */
-#define LargeIntegerMultiply(a,b) (LARGE_INTEGER)(_toi(a) * _toi(b))
-#define ConvertLongToLargeInteger(l) (LARGE_INTEGER)(_toi(l))
-#define ConvertUlongToLargeInteger(ul) (LARGE_INTEGER)(_toui(ul))
-
-#endif /* LARGEINT_PROTOS || __COMPILING_LARGEINT */
-
-#ifndef __COMPILING_LARGEINT
-/* division; no macros of these because of multiple expansion */
-LARGE_INTEGER WINAPI LargeIntegerDivide (LARGE_INTEGER, LARGE_INTEGER, PLARGE_INTEGER);
-ULONG WINAPI EnlargedUnsignedDivide (ULARGE_INTEGER, ULONG, PULONG);
-LARGE_INTEGER WINAPI ExtendedLargeIntegerDivide (LARGE_INTEGER, ULONG, PULONG);
-LARGE_INTEGER WINAPI ExtendedMagicDivide (LARGE_INTEGER, LARGE_INTEGER, int);
-#endif /* __COMPILING_LARGEINT */
-
-#define LargeIntegerAnd(dest, src, m) \
-{ \
-  dest._STRUCT_NAME(u.)LowPart = s._STRUCT_NAME(u.)LowPart & m._STRUCT_NAME(u.)LowPart; \
-  dest._STRUCT_NAME(u.)HighPart = s._STRUCT_NAME(u.)HighPart & m._STRUCT_NAME(u.)HighPart; \
-}
-
-/* comparision */
-#define LargeIntegerGreaterThan(a,b) (_toi(a) > _toi(b))
-#define LargeIntegerGreaterThanOrEqual(a,b) (_toi(a) >= _toi(b))
-#define LargeIntegerEqualTo(a,b) (_toi(a) == _toi(b))
-#define LargeIntegerNotEqualTo(a,b) (_toi(a) != _toi(b))
-#define LargeIntegerLessThan(a,b) (_toi(a) < _toi(b))
-#define LargeIntegerLessThanOrEqualTo(a,b) (_toi(a) <= _toi(b))
-#define LargeIntegerGreaterThanZero(a) (_toi(a) > 0)
-#define LargeIntegerGreaterOrEqualToZero(a) ((a)._STRUCT_NAME(u.)HighPart > 0)
-#define LargeIntegerEqualToZero(a) !((a)._STRUCT_NAME(u.)LowPart | (a)._STRUCT_NAME(u.)HighPart)
-#define LargeIntegerNotEqualToZero(a) ((a)._STRUCT_NAME(u.)LowPart | (a)._STRUCT_NAME(u.)HighPart)
-#define LargeIntegerLessThanZero(a) ((a)._STRUCT_NAME(u.)HighPart < 0)
-#define LargeIntegerLessOrEqualToZero(a) (_toi(a) <= 0)
-
-#ifndef __COMPILING_LARGEINT
-#undef _toi
-#undef _toui
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _LARGEINT_H */
diff --git a/winsup/w32api/include/lm.h b/winsup/w32api/include/lm.h
deleted file mode 100644
index db1779db6..000000000
--- a/winsup/w32api/include/lm.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _LM_H
-#define _LM_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <lmcons.h>
-#include <lmaccess.h>
-#include <lmalert.h>
-#include <lmat.h>
-#include <lmaudit.h>
-#include <lmchdev.h>
-#include <lmconfig.h>
-#include <lmerr.h>
-#include <lmmsg.h>
-#include <lmshare.h>
-#include <lmapibuf.h>
-#include <lmremutl.h>
-#include <lmrepl.h>
-#include <lmuse.h>
-#include <lmerrlog.h>
-#include <lmsvc.h>
-#include <lmwksta.h>
-#include <lmserver.h>
-#include <lmstats.h>
-
-#endif
diff --git a/winsup/w32api/include/lmaccess.h b/winsup/w32api/include/lmaccess.h
deleted file mode 100644
index 044a7a607..000000000
--- a/winsup/w32api/include/lmaccess.h
+++ /dev/null
@@ -1,610 +0,0 @@
-#ifndef _LMACCESS_H
-#define _LMACCESS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <lmcons.h> 
-#define GROUP_SPECIALGRP_USERS L"USERS"
-#define GROUP_SPECIALGRP_ADMINS L"ADMINS"
-#define GROUP_SPECIALGRP_GUESTS L"GUESTS"
-#define GROUP_SPECIALGRP_LOCAL L"LOCAL"
-#define ACCESS_LETTERS "RWCXDAP "
-#define NETLOGON_CONTROL_QUERY 1 
-#define NETLOGON_CONTROL_REPLICATE 2 
-#define NETLOGON_CONTROL_SYNCHRONIZE 3 
-#define NETLOGON_CONTROL_PDC_REPLICATE 4 
-#define NETLOGON_CONTROL_REDISCOVER 5 
-#define NETLOGON_CONTROL_TC_QUERY 6 
-#define NETLOGON_CONTROL_BACKUP_CHANGE_LOG 65532
-#define NETLOGON_CONTROL_TRUNCATE_LOG 65533
-#define NETLOGON_CONTROL_SET_DBFLAG 65534
-#define NETLOGON_CONTROL_BREAKPOINT 65535
-#define UF_SCRIPT 1
-#define UF_ACCOUNTDISABLE 2
-#define UF_HOMEDIR_REQUIRED 8
-#define UF_LOCKOUT 16
-#define UF_PASSWD_NOTREQD 32
-#define UF_PASSWD_CANT_CHANGE 64
-#define UF_TEMP_DUPLICATE_ACCOUNT 256
-#define UF_NORMAL_ACCOUNT 512
-#define UF_INTERDOMAIN_TRUST_ACCOUNT 2048
-#define UF_WORKSTATION_TRUST_ACCOUNT 4096
-#define UF_SERVER_TRUST_ACCOUNT 8192
-#define UF_MNS_LOGON_ACCOUNT 131072
-#define UF_MACHINE_ACCOUNT_MASK (UF_INTERDOMAIN_TRUST_ACCOUNT|UF_WORKSTATION_TRUST_ACCOUNT|UF_SERVER_TRUST_ACCOUNT)
-#define UF_ACCOUNT_TYPE_MASK (UF_TEMP_DUPLICATE_ACCOUNT|UF_NORMAL_ACCOUNT|UF_INTERDOMAIN_TRUST_ACCOUNT|UF_WORKSTATION_TRUST_ACCOUNT|UF_SERVER_TRUST_ACCOUNT)
-#define UF_DONT_EXPIRE_PASSWD 65536
-#define UF_SETTABLE_BITS (UF_SCRIPT|UF_ACCOUNTDISABLE|UF_LOCKOUT|UF_HOMEDIR_REQUIRED|UF_PASSWD_NOTREQD|UF_PASSWD_CANT_CHANGE|UF_ACCOUNT_TYPE_MASK|UF_DONT_EXPIRE_PASSWD)
-#define FILTER_TEMP_DUPLICATE_ACCOUNT 1
-#define FILTER_NORMAL_ACCOUNT 2
-#define FILTER_INTERDOMAIN_TRUST_ACCOUNT 8
-#define FILTER_WORKSTATION_TRUST_ACCOUNT 16
-#define FILTER_SERVER_TRUST_ACCOUNT 32
-#define LG_INCLUDE_INDIRECT 1
-#define AF_OP_PRINT 1
-#define AF_OP_COMM 2
-#define AF_OP_SERVER 4
-#define AF_OP_ACCOUNTS 8
-#define AF_SETTABLE_BITS (AF_OP_PRINT|AF_OP_COMM|AF_OP_SERVER|AF_OP_ACCOUNTS)
-#define UAS_ROLE_STANDALONE 0
-#define UAS_ROLE_MEMBER 1
-#define UAS_ROLE_BACKUP 2
-#define UAS_ROLE_PRIMARY 3
-#define USER_NAME_PARMNUM 1
-#define USER_PASSWORD_PARMNUM 3
-#define USER_PASSWORD_AGE_PARMNUM 4
-#define USER_PRIV_PARMNUM 5
-#define USER_HOME_DIR_PARMNUM 6
-#define USER_COMMENT_PARMNUM 7
-#define USER_FLAGS_PARMNUM 8
-#define USER_SCRIPT_PATH_PARMNUM 9
-#define USER_AUTH_FLAGS_PARMNUM 10
-#define USER_FULL_NAME_PARMNUM 11
-#define USER_USR_COMMENT_PARMNUM 12
-#define USER_PARMS_PARMNUM 13
-#define USER_WORKSTATIONS_PARMNUM 14
-#define USER_LAST_LOGON_PARMNUM 15
-#define USER_LAST_LOGOFF_PARMNUM 16
-#define USER_ACCT_EXPIRES_PARMNUM 17
-#define USER_MAX_STORAGE_PARMNUM 18
-#define USER_UNITS_PER_WEEK_PARMNUM 19
-#define USER_LOGON_HOURS_PARMNUM 20
-#define USER_PAD_PW_COUNT_PARMNUM 21
-#define USER_NUM_LOGONS_PARMNUM 22
-#define USER_LOGON_SERVER_PARMNUM 23
-#define USER_COUNTRY_CODE_PARMNUM 24
-#define USER_CODE_PAGE_PARMNUM 25
-#define USER_PRIMARY_GROUP_PARMNUM 51
-#define USER_PROFILE 52 
-#define USER_PROFILE_PARMNUM 52
-#define USER_HOME_DIR_DRIVE_PARMNUM 53
-#define USER_NAME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_NAME_PARMNUM)
-#define USER_PASSWORD_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_PASSWORD_PARMNUM)
-#define USER_PASSWORD_AGE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_PASSWORD_AGE_PARMNUM)
-#define USER_PRIV_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_PRIV_PARMNUM)
-#define USER_HOME_DIR_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_HOME_DIR_PARMNUM)
-#define USER_COMMENT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_COMMENT_PARMNUM)
-#define USER_FLAGS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_FLAGS_PARMNUM)
-#define USER_SCRIPT_PATH_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_SCRIPT_PATH_PARMNUM)
-#define USER_AUTH_FLAGS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_AUTH_FLAGS_PARMNUM)
-#define USER_FULL_NAME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_FULL_NAME_PARMNUM)
-#define USER_USR_COMMENT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_USR_COMMENT_PARMNUM)
-#define USER_PARMS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_PARMS_PARMNUM)
-#define USER_WORKSTATIONS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_WORKSTATIONS_PARMNUM)
-#define USER_LAST_LOGON_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_LAST_LOGON_PARMNUM)
-#define USER_LAST_LOGOFF_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_LAST_LOGOFF_PARMNUM)
-#define USER_ACCT_EXPIRES_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_ACCT_EXPIRES_PARMNUM)
-#define USER_MAX_STORAGE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_MAX_STORAGE_PARMNUM)
-#define USER_UNITS_PER_WEEK_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_UNITS_PER_WEEK_PARMNUM)
-#define USER_LOGON_HOURS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_LOGON_HOURS_PARMNUM)
-#define USER_PAD_PW_COUNT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_PAD_PW_COUNT_PARMNUM)
-#define USER_NUM_LOGONS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_NUM_LOGONS_PARMNUM)
-#define USER_LOGON_SERVER_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_LOGON_SERVER_PARMNUM)
-#define USER_COUNTRY_CODE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_COUNTRY_CODE_PARMNUM)
-#define USER_CODE_PAGE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_CODE_PAGE_PARMNUM)
-#define USER_PRIMARY_GROUP_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_PRIMARY_GROUP_PARMNUM)
-#define USER_POSIX_ID_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_POSIX_ID_PARMNUM)
-#define USER_HOME_DIR_DRIVE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+USER_HOME_DIR_DRIVE_PARMNUM)
-#define NULL_USERSETINFO_PASSWD " "
-#define TIMEQ_FOREVER ((ULONG)-1)
-#define USER_MAXSTORAGE_UNLIMITED ((ULONG)-1)
-#define USER_NO_LOGOFF ((ULONG)-1L)
-#define UNITS_PER_DAY 24
-#define UNITS_PER_WEEK  168
-#define USER_PRIV_MASK 3
-#define USER_PRIV_GUEST 0
-#define USER_PRIV_USER 1
-#define USER_PRIV_ADMIN 2
-#define MAX_PASSWD_LEN PWLEN
-#define DEF_MIN_PWLEN 6
-#define DEF_PWUNIQUENESS 5
-#define DEF_MAX_PWHIST 8
-#define DEF_MAX_PWAGE TIMEQ_FOREVER
-#define DEF_MIN_PWAGE 0
-#define DEF_FORCE_LOGOFF (ULONG)0xffffffff
-#define DEF_MAX_BADPW 0
-#define ONE_DAY 86400
-#define VALIDATED_LOGON 0
-#define PASSWORD_EXPIRED 2
-#define NON_VALIDATED_LOGON 3
-#define VALID_LOGOFF 1
-#define MODALS_MIN_PASSWD_LEN_PARMNUM 1
-#define MODALS_MAX_PASSWD_AGE_PARMNUM 2
-#define MODALS_MIN_PASSWD_AGE_PARMNUM 3
-#define MODALS_FORCE_LOGOFF_PARMNUM 4
-#define MODALS_PASSWD_HIST_LEN_PARMNUM 5
-#define MODALS_ROLE_PARMNUM 6
-#define MODALS_PRIMARY_PARMNUM 7
-#define MODALS_DOMAIN_NAME_PARMNUM 8
-#define MODALS_DOMAIN_ID_PARMNUM 9
-#define MODALS_LOCKOUT_DURATION_PARMNUM 10
-#define MODALS_LOCKOUT_OBSERVATION_WINDOW_PARMNUM 11
-#define MODALS_LOCKOUT_THRESHOLD_PARMNUM 12
-#define MODALS_MIN_PASSWD_LEN_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_MIN_PASSWD_LEN_PARMNUM)
-#define MODALS_MAX_PASSWD_AGE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_MAX_PASSWD_AGE_PARMNUM)
-#define MODALS_MIN_PASSWD_AGE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_MIN_PASSWD_AGE_PARMNUM)
-#define MODALS_FORCE_LOGOFF_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_FORCE_LOGOFF_PARMNUM)
-#define MODALS_PASSWD_HIST_LEN_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_PASSWD_HIST_LEN_PARMNUM)
-#define MODALS_ROLE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_ROLE_PARMNUM)
-#define MODALS_PRIMARY_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_PRIMARY_PARMNUM)
-#define MODALS_DOMAIN_NAME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_DOMAIN_NAME_PARMNUM)
-#define MODALS_DOMAIN_ID_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+MODALS_DOMAIN_ID_PARMNUM)
-#define GROUPIDMASK 0x8000 
-#define GROUP_ALL_PARMNUM 0
-#define GROUP_NAME_PARMNUM 1
-#define GROUP_COMMENT_PARMNUM 2
-#define GROUP_ATTRIBUTES_PARMNUM 3
-#define GROUP_ALL_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+GROUP_ALL_PARMNUM)
-#define GROUP_NAME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+GROUP_NAME_PARMNUM)
-#define GROUP_COMMENT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+GROUP_COMMENT_PARMNUM)
-#define GROUP_ATTRIBUTES_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+GROUP_ATTRIBUTES_PARMNUM)
-#define GROUP_POSIX_ID_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+GROUP_POSIX_ID_PARMNUM)
-#define LOCALGROUP_NAME_PARMNUM 1
-#define LOCALGROUP_COMMENT_PARMNUM 2
-#define MAXPERMENTRIES 64
-#define ACCESS_NONE 0
-#define ACCESS_ALL (ACCESS_READ|ACCESS_WRITE|ACCESS_CREATE|ACCESS_EXEC|ACCESS_DELETE|ACCESS_ATRIB|ACCESS_PERM)
-#define ACCESS_READ 1
-#define ACCESS_WRITE 2
-#define ACCESS_CREATE 4
-#define ACCESS_EXEC 8
-#define ACCESS_DELETE 16
-#define ACCESS_ATRIB 32
-#define ACCESS_PERM 64
-#define ACCESS_GROUP 0x8000
-#define ACCESS_AUDIT 1
-#define ACCESS_SUCCESS_OPEN 16
-#define ACCESS_SUCCESS_WRITE 32
-#define ACCESS_SUCCESS_DELETE 64
-#define ACCESS_SUCCESS_ACL 128
-#define ACCESS_SUCCESS_MASK 240
-#define ACCESS_FAIL_OPEN 256
-#define ACCESS_FAIL_WRITE 512
-#define ACCESS_FAIL_DELETE 1024
-#define ACCESS_FAIL_ACL 2048
-#define ACCESS_FAIL_MASK 3840
-#define ACCESS_FAIL_SHIFT 4
-#define ACCESS_RESOURCE_NAME_PARMNUM 1
-#define ACCESS_ATTR_PARMNUM 2
-#define ACCESS_COUNT_PARMNUM 3
-#define ACCESS_ACCESS_LIST_PARMNUM 4
-#define ACCESS_RESOURCE_NAME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+ACCESS_RESOURCE_NAME_PARMNUM)
-#define ACCESS_ATTR_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+ACCESS_ATTR_PARMNUM)
-#define ACCESS_COUNT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+ACCESS_COUNT_PARMNUM)
-#define ACCESS_ACCESS_LIST_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+ACCESS_ACCESS_LIST_PARMNUM)
-#define NETLOGON_REPLICATION_NEEDED 1
-#define NETLOGON_REPLICATION_IN_PROGRESS 2
-#define NETLOGON_FULL_SYNC_REPLICATION 4
-#define NETLOGON_REDO_NEEDED 8
-
-typedef struct _USER_INFO_0 { LPWSTR usri0_name; }USER_INFO_0,*PUSER_INFO_0,*LPUSER_INFO_0;
-typedef struct _USER_INFO_1 {
-	LPWSTR usri1_name;
-	LPWSTR usri1_password;
-	DWORD usri1_password_age;
-	DWORD usri1_priv;
-	LPWSTR usri1_home_dir;
-	LPWSTR usri1_comment;
-	DWORD usri1_flags;
-	LPWSTR usri1_script_path;
-}USER_INFO_1,*PUSER_INFO_1,*LPUSER_INFO_1;
-typedef struct _USER_INFO_2 {
-	LPWSTR usri2_name;
-	LPWSTR usri2_password;
-	DWORD usri2_password_age;
-	DWORD usri2_priv;
-	LPWSTR usri2_home_dir;
-	LPWSTR usri2_comment;
-	DWORD usri2_flags;
-	LPWSTR usri2_script_path;
-	DWORD usri2_auth_flags;
-	LPWSTR usri2_full_name;
-	LPWSTR usri2_usr_comment;
-	LPWSTR usri2_parms;
-	LPWSTR usri2_workstations;
-	DWORD usri2_last_logon;
-	DWORD usri2_last_logoff;
-	DWORD usri2_acct_expires;
-	DWORD usri2_max_storage;
-	DWORD usri2_units_per_week;
-	PBYTE usri2_logon_hours;
-	DWORD usri2_bad_pw_count;
-	DWORD usri2_num_logons;
-	LPWSTR usri2_logon_server;
-	DWORD usri2_country_code;
-	DWORD usri2_code_page;
-}USER_INFO_2,*PUSER_INFO_2,*LPUSER_INFO_2;
-typedef struct _USER_INFO_3 {
-	LPWSTR usri3_name;
-	LPWSTR usri3_password;
-	DWORD usri3_password_age;
-	DWORD usri3_priv;
-	LPWSTR usri3_home_dir;
-	LPWSTR usri3_comment;
-	DWORD usri3_flags;
-	LPWSTR usri3_script_path;
-	DWORD usri3_auth_flags;
-	LPWSTR usri3_full_name;
-	LPWSTR usri3_usr_comment;
-	LPWSTR usri3_parms;
-	LPWSTR usri3_workstations;
-	DWORD usri3_last_logon;
-	DWORD usri3_last_logoff;
-	DWORD usri3_acct_expires;
-	DWORD usri3_max_storage;
-	DWORD usri3_units_per_week;
-	PBYTE usri3_logon_hours;
-	DWORD usri3_bad_pw_count;
-	DWORD usri3_num_logons;
-	LPWSTR usri3_logon_server;
-	DWORD usri3_country_code;
-	DWORD usri3_code_page;
-	DWORD usri3_user_id;
-	DWORD usri3_primary_group_id;
-	LPWSTR usri3_profile;
-	LPWSTR usri3_home_dir_drive;
-	DWORD usri3_password_expired;
-}USER_INFO_3,*PUSER_INFO_3,*LPUSER_INFO_3;
-typedef struct _USER_INFO_10 {
-	LPWSTR usri10_name;
-	LPWSTR usri10_comment;
-	LPWSTR usri10_usr_comment;
-	LPWSTR usri10_full_name;
-}USER_INFO_10,*PUSER_INFO_10,*LPUSER_INFO_10;
-typedef struct _USER_INFO_11 {
-	LPWSTR usri11_name;
-	LPWSTR usri11_comment;
-	LPWSTR usri11_usr_comment;
-	LPWSTR usri11_full_name;
-	DWORD usri11_priv;
-	DWORD usri11_auth_flags;
-	DWORD usri11_password_age;
-	LPWSTR usri11_home_dir;
-	LPWSTR usri11_parms;
-	DWORD usri11_last_logon;
-	DWORD usri11_last_logoff;
-	DWORD usri11_bad_pw_count;
-	DWORD usri11_num_logons;
-	LPWSTR usri11_logon_server;
-	DWORD usri11_country_code;
-	LPWSTR usri11_workstations;
-	DWORD usri11_max_storage;
-	DWORD usri11_units_per_week;
-	PBYTE usri11_logon_hours;
-	DWORD usri11_code_page;
-}USER_INFO_11,*PUSER_INFO_11,*LPUSER_INFO_11;
-typedef struct _USER_INFO_20 {
-	LPWSTR usri20_name;
-	LPWSTR usri20_full_name;
-	LPWSTR usri20_comment;
-	DWORD usri20_flags;
-	DWORD usri20_user_id;
-}USER_INFO_20,*PUSER_INFO_20,*LPUSER_INFO_20;
-typedef struct _USER_INFO_21 {
-	BYTE usri21_password[ENCRYPTED_PWLEN];
-}USER_INFO_21,*PUSER_INFO_21,*LPUSER_INFO_21;
-typedef struct _USER_INFO_22 {
-	LPWSTR usri22_name;
-	BYTE usri22_password[ENCRYPTED_PWLEN];
-	DWORD usri22_password_age;
-	DWORD usri22_priv;
-	LPWSTR usri22_home_dir;
-	LPWSTR usri22_comment;
-	DWORD usri22_flags;
-	LPWSTR usri22_script_path;
-	DWORD usri22_auth_flags;
-	LPWSTR usri22_full_name;
-	LPWSTR usri22_usr_comment;
-	LPWSTR usri22_parms;
-	LPWSTR usri22_workstations;
-	DWORD usri22_last_logon;
-	DWORD usri22_last_logoff;
-	DWORD usri22_acct_expires;
-	DWORD usri22_max_storage;
-	DWORD usri22_units_per_week;
-	PBYTE usri22_logon_hours;
-	DWORD usri22_bad_pw_count;
-	DWORD usri22_num_logons;
-	LPWSTR usri22_logon_server;
-	DWORD usri22_country_code;
-	DWORD usri22_code_page;
-	}USER_INFO_22,*PUSER_INFO_22,*LPUSER_INFO_22;
-typedef struct _USER_INFO_1003 {
-	LPWSTR usri1003_password;
-} USER_INFO_1003,*PUSER_INFO_1003,*LPUSER_INFO_1003;
-typedef struct _USER_INFO_1005 {
-	DWORD usri1005_priv;
-} USER_INFO_1005,*PUSER_INFO_1005,*LPUSER_INFO_1005;
-typedef struct _USER_INFO_1006 {
-	LPWSTR usri1006_home_dir;
-} USER_INFO_1006,*PUSER_INFO_1006,*LPUSER_INFO_1006;
-typedef struct _USER_INFO_1007 {
-	LPWSTR usri1007_comment;
-} USER_INFO_1007,*PUSER_INFO_1007,*LPUSER_INFO_1007;
-typedef struct _USER_INFO_1008 {
-	DWORD usri1008_flags;
-} USER_INFO_1008,*PUSER_INFO_1008,*LPUSER_INFO_1008;
-typedef struct _USER_INFO_1009 {
-	LPWSTR usri1009_script_path;
-} USER_INFO_1009,*PUSER_INFO_1009,*LPUSER_INFO_1009;
-typedef struct _USER_INFO_1010 {
-	DWORD usri1010_auth_flags;
-} USER_INFO_1010,*PUSER_INFO_1010,*LPUSER_INFO_1010;
-typedef struct _USER_INFO_1011 {
-	LPWSTR usri1011_full_name;
-} USER_INFO_1011,*PUSER_INFO_1011,*LPUSER_INFO_1011;
-typedef struct _USER_INFO_1012 {
-	LPWSTR usri1012_usr_comment;
-} USER_INFO_1012,*PUSER_INFO_1012,*LPUSER_INFO_1012;
-typedef struct _USER_INFO_1013 {
-	LPWSTR usri1013_parms;
-} USER_INFO_1013,*PUSER_INFO_1013,*LPUSER_INFO_1013;
-typedef struct _USER_INFO_1014 {
-	LPWSTR usri1014_workstations;
-} USER_INFO_1014,*PUSER_INFO_1014,*LPUSER_INFO_1014;
-typedef struct _USER_INFO_1017 {
-	DWORD usri1017_acct_expires;
-} USER_INFO_1017,*PUSER_INFO_1017,*LPUSER_INFO_1017;
-typedef struct _USER_INFO_1018 {
-	DWORD usri1018_max_storage;
-} USER_INFO_1018,*PUSER_INFO_1018,*LPUSER_INFO_1018;
-typedef struct _USER_INFO_1020 {
-	DWORD usri1020_units_per_week;
-	PBYTE usri1020_logon_hours;
-} USER_INFO_1020,*PUSER_INFO_1020,*LPUSER_INFO_1020;
-typedef struct _USER_INFO_1023 {
-	LPWSTR usri1023_logon_server;
-} USER_INFO_1023,*PUSER_INFO_1023,*LPUSER_INFO_1023;
-typedef struct _USER_INFO_1024 {
-	DWORD usri1024_country_code;
-} USER_INFO_1024,*PUSER_INFO_1024,*LPUSER_INFO_1024;
-typedef struct _USER_INFO_1025 {
-	DWORD usri1025_code_page;
-} USER_INFO_1025,*PUSER_INFO_1025,*LPUSER_INFO_1025;
-typedef struct _USER_INFO_1051 {
-	DWORD usri1051_primary_group_id;
-} USER_INFO_1051,*PUSER_INFO_1051,*LPUSER_INFO_1051;
-typedef struct _USER_INFO_1052 {
-	LPWSTR usri1052_profile;
-} USER_INFO_1052,*PUSER_INFO_1052,*LPUSER_INFO_1052;
-typedef struct _USER_INFO_1053 {
-	LPWSTR usri1053_home_dir_drive;
-} USER_INFO_1053,*PUSER_INFO_1053,*LPUSER_INFO_1053;
-typedef struct _USER_MODALS_INFO_0 {
-	DWORD usrmod0_min_passwd_len;
-	DWORD usrmod0_max_passwd_age;
-	DWORD usrmod0_min_passwd_age;
-	DWORD usrmod0_force_logoff;
-	DWORD usrmod0_password_hist_len;
-}USER_MODALS_INFO_0,*PUSER_MODALS_INFO_0,*LPUSER_MODALS_INFO_0;
-typedef struct _USER_MODALS_INFO_1 {
-	DWORD usrmod1_role;
-	LPWSTR usrmod1_primary;
-}USER_MODALS_INFO_1,*PUSER_MODALS_INFO_1,*LPUSER_MODALS_INFO_1;
-typedef struct _USER_MODALS_INFO_2 {
-	LPWSTR usrmod2_domain_name;
-	PSID usrmod2_domain_id;
-}USER_MODALS_INFO_2,*PUSER_MODALS_INFO_2,*LPUSER_MODALS_INFO_2;
-typedef struct _USER_MODALS_INFO_3 {
-	DWORD usrmod3_lockout_duration;
-	DWORD usrmod3_lockout_observation_window;
-	DWORD usrmod3_lockout_threshold;
-}USER_MODALS_INFO_3,*PUSER_MODALS_INFO_3,*LPUSER_MODALS_INFO_3;
-typedef struct _USER_MODALS_INFO_1001 {
-	DWORD usrmod1001_min_passwd_len;
-} USER_MODALS_INFO_1001,*PUSER_MODALS_INFO_1001,*LPUSER_MODALS_INFO_1001;
-typedef struct _USER_MODALS_INFO_1002 {
-	DWORD usrmod1002_max_passwd_age;
-} USER_MODALS_INFO_1002,*PUSER_MODALS_INFO_1002,*LPUSER_MODALS_INFO_1002;
-typedef struct _USER_MODALS_INFO_1003 {
-	DWORD usrmod1003_min_passwd_age;
-} USER_MODALS_INFO_1003,*PUSER_MODALS_INFO_1003,*LPUSER_MODALS_INFO_1003;
-typedef struct _USER_MODALS_INFO_1004 {
-	DWORD usrmod1004_force_logoff;
-} USER_MODALS_INFO_1004,*PUSER_MODALS_INFO_1004,*LPUSER_MODALS_INFO_1004;
-typedef struct _USER_MODALS_INFO_1005 {
-	DWORD usrmod1005_password_hist_len;
-} USER_MODALS_INFO_1005,*PUSER_MODALS_INFO_1005,*LPUSER_MODALS_INFO_1005;
-typedef struct _USER_MODALS_INFO_1006 {
-	DWORD usrmod1006_role;
-} USER_MODALS_INFO_1006,*PUSER_MODALS_INFO_1006,*LPUSER_MODALS_INFO_1006;
-typedef struct _USER_MODALS_INFO_1007 {
-	LPWSTR usrmod1007_primary;
-} USER_MODALS_INFO_1007,*PUSER_MODALS_INFO_1007,*LPUSER_MODALS_INFO_1007;
-typedef struct _GROUP_INFO_0 {
-	LPWSTR grpi0_name;
-}GROUP_INFO_0,*PGROUP_INFO_0,*LPGROUP_INFO_0;
-typedef struct _GROUP_INFO_1 {
-	LPWSTR grpi1_name;
-	LPWSTR grpi1_comment;
-}GROUP_INFO_1,*PGROUP_INFO_1,*LPGROUP_INFO_1;
-typedef struct _GROUP_INFO_2 {
-	LPWSTR grpi2_name;
-	LPWSTR grpi2_comment;
-	DWORD grpi2_group_id;
-	DWORD grpi2_attributes;
-}GROUP_INFO_2,*PGROUP_INFO_2;
-typedef struct _GROUP_INFO_1002 {
-	LPWSTR grpi1002_comment;
-} GROUP_INFO_1002,*PGROUP_INFO_1002,*LPGROUP_INFO_1002;
-typedef struct _GROUP_INFO_1005 {
-	DWORD grpi1005_attributes;
-} GROUP_INFO_1005,*PGROUP_INFO_1005,*LPGROUP_INFO_1005;
-typedef struct _GROUP_USERS_INFO_0 {
-	LPWSTR grui0_name;
-} GROUP_USERS_INFO_0,*PGROUP_USERS_INFO_0,*LPGROUP_USERS_INFO_0;
-typedef struct _GROUP_USERS_INFO_1 {
-	LPWSTR grui1_name;
-	DWORD grui1_attributes;
-} GROUP_USERS_INFO_1,*PGROUP_USERS_INFO_1,*LPGROUP_USERS_INFO_1;
-typedef struct _LOCALGROUP_INFO_0 {
-	LPWSTR lgrpi0_name;
-}LOCALGROUP_INFO_0,*PLOCALGROUP_INFO_0,*LPLOCALGROUP_INFO_0;
-typedef struct _LOCALGROUP_INFO_1 {
-	LPWSTR lgrpi1_name;
-	LPWSTR lgrpi1_comment;
-}LOCALGROUP_INFO_1,*PLOCALGROUP_INFO_1,*LPLOCALGROUP_INFO_1;
-typedef struct _LOCALGROUP_INFO_1002 {
-	LPWSTR lgrpi1002_comment;
-}LOCALGROUP_INFO_1002,*PLOCALGROUP_INFO_1002,*LPLOCALGROUP_INFO_1002;
-typedef struct _LOCALGROUP_MEMBERS_INFO_0 {
-	PSID lgrmi0_sid;
-} LOCALGROUP_MEMBERS_INFO_0,*PLOCALGROUP_MEMBERS_INFO_0,*LPLOCALGROUP_MEMBERS_INFO_0;
-typedef struct _LOCALGROUP_MEMBERS_INFO_1 {
-	PSID lgrmi1_sid;
-	SID_NAME_USE lgrmi1_sidusage;
-	LPWSTR lgrmi1_name;
-} LOCALGROUP_MEMBERS_INFO_1,*PLOCALGROUP_MEMBERS_INFO_1,*LPLOCALGROUP_MEMBERS_INFO_1;
-typedef struct _LOCALGROUP_MEMBERS_INFO_2 {
-	PSID lgrmi2_sid;
-	SID_NAME_USE lgrmi2_sidusage;
-	LPWSTR lgrmi2_domainandname;
-} LOCALGROUP_MEMBERS_INFO_2,*PLOCALGROUP_MEMBERS_INFO_2,*LPLOCALGROUP_MEMBERS_INFO_2;
-typedef struct _LOCALGROUP_MEMBERS_INFO_3 {
-	LPWSTR lgrmi3_domainandname;
-} LOCALGROUP_MEMBERS_INFO_3,*PLOCALGROUP_MEMBERS_INFO_3,
-*LPLOCALGROUP_MEMBERS_INFO_3;
-typedef struct _LOCALGROUP_USERS_INFO_0 {
-	LPWSTR lgrui0_name;
-} LOCALGROUP_USERS_INFO_0,*PLOCALGROUP_USERS_INFO_0,*LPLOCALGROUP_USERS_INFO_0;
-typedef struct _NET_DISPLAY_USER {
-	LPWSTR usri1_name;
-	LPWSTR usri1_comment;
-	DWORD usri1_flags;
-	LPWSTR usri1_full_name;
-	DWORD usri1_user_id;
-	DWORD usri1_next_index;
-} NET_DISPLAY_USER,*PNET_DISPLAY_USER;
-typedef struct _NET_DISPLAY_MACHINE {
-	LPWSTR usri2_name;
-	LPWSTR usri2_comment;
-	DWORD usri2_flags;
-	DWORD usri2_user_id;
-	DWORD usri2_next_index;
-} NET_DISPLAY_MACHINE,*PNET_DISPLAY_MACHINE;
-typedef struct _NET_DISPLAY_GROUP {
-	LPWSTR grpi3_name;
-	LPWSTR grpi3_comment;
-	DWORD grpi3_group_id;
-	DWORD grpi3_attributes;
-	DWORD grpi3_next_index;
-} NET_DISPLAY_GROUP,*PNET_DISPLAY_GROUP;
-typedef struct _ACCESS_INFO_0 {
-	LPTSTR acc0_resource_name;
-}ACCESS_INFO_0,*PACCESS_INFO_0,*LPACCESS_INFO_0;
-typedef struct _ACCESS_INFO_1 {
-	LPTSTR acc1_resource_name;
-	DWORD acc1_attr;
-	DWORD acc1_count;
-}ACCESS_INFO_1,*PACCESS_INFO_1,*LPACCESS_INFO_1;
-typedef struct _ACCESS_INFO_1002 {
-	DWORD acc1002_attr;
-} ACCESS_INFO_1002,*PACCESS_INFO_1002,*LPACCESS_INFO_1002;
-typedef struct _ACCESS_LIST {
-	LPTSTR acl_ugname;
-	DWORD acl_access;
-}ACCESS_LIST,*PACCESS_LIST,*LPACCESS_LIST;
-typedef struct _NETLOGON_INFO_1 {
-	DWORD netlog1_flags;
-	NET_API_STATUS netlog1_pdc_connection_status;
-} NETLOGON_INFO_1,*PNETLOGON_INFO_1;
-typedef struct _NETLOGON_INFO_2 {
-	DWORD netlog2_flags;
-	NET_API_STATUS netlog2_pdc_connection_status;
-	LPWSTR netlog2_trusted_dc_name;
-	NET_API_STATUS netlog2_tc_connection_status;
-} NETLOGON_INFO_2,*PNETLOGON_INFO_2;
-typedef struct _NETLOGON_INFO_3 {
-	DWORD netlog3_flags;
-	DWORD netlog3_logon_attempts;
-	DWORD netlog3_reserved1;
-	DWORD netlog3_reserved2;
-	DWORD netlog3_reserved3;
-	DWORD netlog3_reserved4;
-	DWORD netlog3_reserved5;
-} NETLOGON_INFO_3,*PNETLOGON_INFO_3;
-
-#if 0
-/* MS has these defined, but the RxNetAccessXX functions aren't documented nor do
-   they exist in any headers */
-#define NetAccessAdd RxNetAccessAdd
-#define NetAccessEnum RxNetAccessEnum
-#define NetAccessGetInfo RxNetAccessGetInfo
-#define NetAccessSetInfo RxNetAccessSetInfo
-#define NetAccessDel RxNetAccessDel
-#define NetAccessGetUserPerms RxNetAccessGetUserPerms
-/* These are obsolete */
-NET_API_STATUS WINAPI NetAccessAdd(LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetAccessEnum(LPCWSTR,LPCWSTR,DWORD,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetAccessGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetAccessSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetAccessDel(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetAccessGetUserPerms(LPCWSTR,LPCWSTR,LPCWSTR,PDWORD);
-#endif
-
-NET_API_STATUS WINAPI NetUserAdd(LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetUserEnum(LPCWSTR,DWORD,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetUserGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetUserSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetUserDel(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetUserGetGroups(LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetUserSetGroups(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD);
-NET_API_STATUS WINAPI NetUserGetLocalGroups(LPCWSTR,LPCWSTR,DWORD,DWORD,PBYTE*,DWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetUserModalsGet(LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetUserModalsSet(LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetGroupAdd(LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetGroupAddUser(LPCWSTR,LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetGroupEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetGroupGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetGroupSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetGroupDel(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetGroupDelUser(LPCWSTR,LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetGroupGetUsers(LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetGroupSetUsers(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD);
-NET_API_STATUS WINAPI NetLocalGroupAdd(LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetLocalGroupAddMember(LPCWSTR,LPCWSTR,PSID);
-NET_API_STATUS WINAPI NetLocalGroupEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetLocalGroupGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetLocalGroupSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetLocalGroupDel(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetLocalGroupDelMember(LPCWSTR,LPCWSTR,PSID);
-NET_API_STATUS WINAPI NetLocalGroupGetMembers(LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,
-PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetLocalGroupSetMembers(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD);
-NET_API_STATUS WINAPI NetLocalGroupAddMembers(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD);
-NET_API_STATUS WINAPI NetLocalGroupDelMembers(LPCWSTR,LPCWSTR,DWORD,PBYTE,DWORD);
-NET_API_STATUS WINAPI NetQueryDisplayInformation(LPCWSTR,DWORD,DWORD,DWORD,DWORD,PDWORD,PVOID*);
-NET_API_STATUS WINAPI NetGetDisplayInformationIndex(LPCWSTR,DWORD,LPCWSTR,PDWORD);
-NET_API_STATUS WINAPI NetGetDCName(LPCWSTR,LPCWSTR,PBYTE*);
-NET_API_STATUS WINAPI NetGetAnyDCName(LPCWSTR,LPCWSTR,PBYTE*);
-NET_API_STATUS WINAPI I_NetLogonControl(LPCWSTR,DWORD,DWORD,PBYTE*);
-NET_API_STATUS WINAPI I_NetLogonControl2(LPCWSTR,DWORD,DWORD,PBYTE,PBYTE*);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmalert.h b/winsup/w32api/include/lmalert.h
deleted file mode 100644
index 4f59edc8b..000000000
--- a/winsup/w32api/include/lmalert.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _LMALERT_H
-#define _LMALERT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define ALERTER_MAILSLOT TEXT("\\\\.\\MAILSLOT\\Alerter")
-#define ALERT_PRINT_EVENT TEXT("PRINTING")
-#define ALERT_MESSAGE_EVENT TEXT("MESSAGE")
-#define ALERT_ERRORLOG_EVENT TEXT("ERRORLOG")
-#define ALERT_ADMIN_EVENT TEXT("ADMIN")
-#define ALERT_USER_EVENT TEXT("USER")
-#define ALERT_OTHER_INFO(x) ((PBYTE)(x)+sizeof(STD_ALERT))
-#define ALERT_VAR_DATA(p) ((PBYTE)(p)+sizeof(*p))
-#define PRJOB_QSTATUS 3
-#define PRJOB_DEVSTATUS 508
-#define PRJOB_COMPLETE 4
-#define PRJOB_INTERV 8
-#define PRJOB_ 16
-#define PRJOB_DESTOFFLINE 32
-#define PRJOB_DESTPAUSED 64
-#define PRJOB_NOTIFY 128
-#define PRJOB_DESTNOPAPER 256
-#define PRJOB_DELETED 32768
-#define PRJOB_QS_QUEUED 0
-#define PRJOB_QS_PAUSED 1
-#define PRJOB_QS_SPOOLING 2
-#define PRJOB_QS_PRINTING 3
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef struct _ADMIN_OTHER_INFO {
-	DWORD alrtad_errcode;
-	DWORD alrtad_numstrings;
-}ADMIN_OTHER_INFO,*PADMIN_OTHER_INFO,*LPADMIN_OTHER_INFO;
-typedef struct _STD_ALERT {
-	DWORD alrt_timestamp;
-	TCHAR alrt_eventname[EVLEN+1];
-	TCHAR alrt_servicename[SNLEN+1];
-}STD_ALERT,*PSTD_ALERT,*LPSTD_ALERT;
-typedef struct _ERRLOG_OTHER_INFO {
-	DWORD alrter_errcode;
-	DWORD alrter_offset;
-}ERRLOG_OTHER_INFO,*PERRLOG_OTHER_INFO,*LPERRLOG_OTHER_INFO;
-typedef struct _PRINT_OTHER_INFO {
-	DWORD alrtpr_jobid;
-	DWORD alrtpr_status;
-	DWORD alrtpr_submitted;
-	DWORD alrtpr_size;
-}PRINT_OTHER_INFO,*PPRINT_OTHER_INFO,*LPPRINT_OTHER_INFO;
-typedef struct _USER_OTHER_INFO {
-	DWORD alrtus_errcode;
-	DWORD alrtus_numstrings;
-}USER_OTHER_INFO,*PUSER_OTHER_INFO,*LPUSER_OTHER_INFO;
-NET_API_STATUS WINAPI NetAlertRaise(LPCWSTR,PVOID,DWORD);
-NET_API_STATUS WINAPI NetAlertRaiseEx(LPCWSTR,PVOID,DWORD,LPCWSTR);
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/lmapibuf.h b/winsup/w32api/include/lmapibuf.h
deleted file mode 100644
index 54de81106..000000000
--- a/winsup/w32api/include/lmapibuf.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef _LMAPIBUF_H
-#define _LMAPIBUF_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD,PVOID*);
-NET_API_STATUS WINAPI NetApiBufferFree(PVOID);
-NET_API_STATUS WINAPI NetApiBufferReallocate(PVOID,DWORD,PVOID*);
-NET_API_STATUS WINAPI NetApiBufferSize(PVOID,PDWORD);
-NET_API_STATUS WINAPI NetapipBufferAllocate(DWORD,PVOID*);
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/lmat.h b/winsup/w32api/include/lmat.h
deleted file mode 100644
index 95999a802..000000000
--- a/winsup/w32api/include/lmat.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _LMAT_H
-#define _LMAT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define JOB_RUN_PERIODICALLY	1
-#define JOB_EXEC_ERROR	2
-#define JOB_RUNS_TODAY	4
-#define JOB_ADD_CURRENT_DATE	8
-#define JOB_NONINTERACTIVE	16
-#define JOB_INPUT_FLAGS	(JOB_RUN_PERIODICALLY|JOB_ADD_CURRENT_DATE|JOB_NONINTERACTIVE)
-#define JOB_OUTPUT_FLAGS (JOB_RUN_PERIODICALLY|JOB_EXEC_ERROR|JOB_RUNS_TODAY|JOB_NONINTERACTIVE)
-typedef struct _AT_ENUM {
-	DWORD JobId;
-	DWORD JobTime;
-	DWORD DaysOfMonth;
-	UCHAR DaysOfWeek;
-	UCHAR Flags;
-	LPWSTR Command;
-} AT_ENUM,*PAT_ENUM,*LPAT_ENUM;
-typedef struct _AT_INFO {
-	DWORD JobTime;
-	DWORD DaysOfMonth;
-	UCHAR DaysOfWeek;
-	UCHAR Flags;
-	LPWSTR Command;
-} AT_INFO,*PAT_INFO,*LPAT_INFO;
-NET_API_STATUS WINAPI NetScheduleJobAdd(LPWSTR,PBYTE,LPDWORD);
-NET_API_STATUS WINAPI NetScheduleJobDel(LPWSTR,DWORD,DWORD);
-NET_API_STATUS WINAPI NetScheduleJobEnum(LPWSTR,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetScheduleJobGetInfo(LPWSTR,DWORD,PBYTE*);
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/lmaudit.h b/winsup/w32api/include/lmaudit.h
deleted file mode 100644
index 4a97baaa5..000000000
--- a/winsup/w32api/include/lmaudit.h
+++ /dev/null
@@ -1,250 +0,0 @@
-#ifndef _LMAUDIT_H
-#define _LMAUDIT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define REVISED_AUDIT_ENTRY_STRUCT
-#define LOGFLAGS_FORWARD 0
-#define LOGFLAGS_BACKWARD 1
-#define LOGFLAGS_SEEK 2
-#define ACTION_LOCKOUT 0
-#define ACTION_ADMINUNLOCK 1
-#define AE_GUEST 0
-#define AE_USER 1
-#define AE_ADMIN 2
-#define AE_NORMAL 0
-#define AE_USERLIMIT 0
-#define AE_GENERAL 0
-#define AE_ERROR 1
-#define AE_SESSDIS 1
-#define AE_BADPW 1
-#define AE_AUTODIS 2
-#define AE_UNSHARE 2
-#define AE_ADMINPRIVREQD 2
-#define AE_ADMINDIS 3
-#define AE_NOACCESSPERM 3
-#define AE_ACCRESTRICT 4
-#define AE_NORMAL_CLOSE 0
-#define AE_SES_CLOSE 1
-#define AE_ADMIN_CLOSE 2
-#define AE_LIM_UNKNOWN 0
-#define AE_LIM_LOGONHOURS 1
-#define AE_LIM_EXPIRED 2
-#define AE_LIM_INVAL_WKSTA 3
-#define AE_LIM_DISABLED 4
-#define AE_LIM_DELETED 5
-#define AE_MOD 0
-#define AE_DELETE 1
-#define AE_ADD 2
-#define AE_UAS_USER 0
-#define AE_UAS_GROUP 1
-#define AE_UAS_MODALS 2
-#define SVAUD_SERVICE  1
-#define SVAUD_GOODSESSLOGON 6
-#define SVAUD_BADSESSLOGON 24
-#define SVAUD_SESSLOGON (SVAUD_GOODSESSLOGON|SVAUD_BADSESSLOGON)
-#define SVAUD_GOODNETLOGON 96
-#define SVAUD_BADNETLOGON 384
-#define SVAUD_NETLOGON (SVAUD_GOODNETLOGON|SVAUD_BADNETLOGON)
-#define SVAUD_LOGON (SVAUD_NETLOGON|SVAUD_SESSLOGON)
-#define SVAUD_GOODUSE 0x600
-#define SVAUD_BADUSE 0x1800
-#define SVAUD_USE (SVAUD_GOODUSE|SVAUD_BADUSE)
-#define SVAUD_USERLIST 8192
-#define SVAUD_PERMISSIONS 16384
-#define SVAUD_RESOURCE 32768
-#define SVAUD_LOGONLIM 65536
-#define AA_AUDIT_ALL 1
-#define AA_A_OWNER 4
-#define AA_CLOSE 8
-#define AA_S_OPEN 16
-#define AA_S_WRITE 32
-#define AA_S_CREATE 32
-#define AA_S_DELETE 64
-#define AA_S_ACL 128
-#define AA_S_ALL 253
-#define AA_F_OPEN 256
-#define AA_F_WRITE 512
-#define AA_F_CREATE 512
-#define AA_F_DELETE 1024
-#define AA_F_ACL 2048
-#define AA_F_ALL (AA_F_OPEN|AA_F_WRITE|AA_F_DELETE|AA_F_ACL)
-#define AA_A_OPEN 2048
-#define AA_A_WRITE 4096
-#define AA_A_CREATE 8192
-#define AA_A_DELETE 16384
-#define AA_A_ACL 32768
-#define AA_A_ALL (AA_F_OPEN|AA_F_WRITE|AA_F_DELETE|AA_F_ACL)
-typedef struct _AUDIT_ENTRY {
-	DWORD ae_len;
-	DWORD ae_reserved;
-	DWORD ae_time;
-	DWORD ae_type;
-	DWORD ae_data_offset;
-	DWORD ae_data_size;
-} AUDIT_ENTRY,*PAUDIT_ENTRY,*LPAUDIT_ENTRY;
-typedef struct _HLOG {
-	DWORD time;
-	DWORD last_flags;
-	DWORD offset;
-	DWORD rec_offset;
-} HLOG,*PHLOG,*LPHLOG;
-typedef struct _AE_SRVSTATUS {
-	DWORD ae_sv_status;
-} AE_SRVSTATUS,*PAE_SRVSTATUS,*LPAE_SRVSTATUS;
-typedef struct _AE_SESSLOGON {
-	DWORD ae_so_compname;
-	DWORD ae_so_username;
-	DWORD ae_so_privilege;
-} AE_SESSLOGON,*PAE_SESSLOGON,*LPAE_SESSLOGON;
-typedef struct _AE_SESSLOGOFF {
-	DWORD ae_sf_compname;
-	DWORD ae_sf_username;
-	DWORD ae_sf_reason;
-} AE_SESSLOGOFF,*PAE_SESSLOGOFF,*LPAE_SESSLOGOFF;
-typedef struct _AE_SESSPWERR {
-	DWORD ae_sp_compname;
-	DWORD ae_sp_username;
-} AE_SESSPWERR,*PAE_SESSPWERR,*LPAE_SESSPWERR;
-typedef struct _AE_CONNSTART {
-	DWORD ae_ct_compname;
-	DWORD ae_ct_username;
-	DWORD ae_ct_netname;
-	DWORD ae_ct_connid;
-} AE_CONNSTART,*PAE_CONNSTART,*LPAE_CONNSTART;
-typedef struct _AE_CONNSTOP {
-	DWORD ae_cp_compname;
-	DWORD ae_cp_username;
-	DWORD ae_cp_netname;
-	DWORD ae_cp_connid;
-	DWORD ae_cp_reason;
-} AE_CONNSTOP,*PAE_CONNSTOP,*LPAE_CONNSTOP;
-typedef struct _AE_CONNREJ {
-	DWORD ae_cr_compname;
-	DWORD ae_cr_username;
-	DWORD ae_cr_netname;
-	DWORD ae_cr_reason;
-} AE_CONNREJ,*PAE_CONNREJ,*LPAE_CONNREJ;
-typedef struct _AE_RESACCESS {
-	DWORD ae_ra_compname;
-	DWORD ae_ra_username;
-	DWORD ae_ra_resname;
-	DWORD ae_ra_operation;
-	DWORD ae_ra_returncode;
-	DWORD ae_ra_restype;
-	DWORD ae_ra_fileid;
-} AE_RESACCESS,*PAE_RESACCESS,*LPAE_RESACCESS;
-typedef struct _AE_RESACCESSREJ {
-	DWORD ae_rr_compname;
-	DWORD ae_rr_username;
-	DWORD ae_rr_resname;
-	DWORD ae_rr_operation;
-} AE_RESACCESSREJ,*PAE_RESACCESSREJ,*LPAE_RESACCESSREJ;
-typedef struct _AE_CLOSEFILE {
-	DWORD ae_cf_compname;
-	DWORD ae_cf_username;
-	DWORD ae_cf_resname;
-	DWORD ae_cf_fileid;
-	DWORD ae_cf_duration;
-	DWORD ae_cf_reason;
-} AE_CLOSEFILE,*PAE_CLOSEFILE,*LPAE_CLOSEFILE;
-typedef struct _AE_SERVICESTAT {
-	DWORD ae_ss_compname;
-	DWORD ae_ss_username;
-	DWORD ae_ss_svcname;
-	DWORD ae_ss_status;
-	DWORD ae_ss_code;
-	DWORD ae_ss_text;
-	DWORD ae_ss_returnval;
-} AE_SERVICESTAT,*PAE_SERVICESTAT,*LPAE_SERVICESTAT;
-typedef struct _AE_ACLMOD {
-	DWORD ae_am_compname;
-	DWORD ae_am_username;
-	DWORD ae_am_resname;
-	DWORD ae_am_action;
-	DWORD ae_am_datalen;
-} AE_ACLMOD,*PAE_ACLMOD,*LPAE_ACLMOD;
-typedef struct _AE_UASMOD {
-	DWORD ae_um_compname;
-	DWORD ae_um_username;
-	DWORD ae_um_resname;
-	DWORD ae_um_rectype;
-	DWORD ae_um_action;
-	DWORD ae_um_datalen;
-} AE_UASMOD,*PAE_UASMOD,*LPAE_UASMOD;
-typedef struct _AE_NETLOGON {
-	DWORD ae_no_compname;
-	DWORD ae_no_username;
-	DWORD ae_no_privilege;
-	DWORD ae_no_authflags;
-} AE_NETLOGON,*PAE_NETLOGON,*LPAE_NETLOGON;
-typedef struct _AE_NETLOGOFF {
-	DWORD ae_nf_compname;
-	DWORD ae_nf_username;
-	DWORD ae_nf_reserved1;
-	DWORD ae_nf_reserved2;
-} AE_NETLOGOFF,*PAE_NETLOGOFF,*LPAE_NETLOGOFF;
-typedef struct _AE_ACCLIM {
-	DWORD ae_al_compname;
-	DWORD ae_al_username;
-	DWORD ae_al_resname;
-	DWORD ae_al_limit;
-} AE_ACCLIM,*PAE_ACCLIM,*LPAE_ACCLIM;
-typedef struct _AE_LOCKOUT {
-	DWORD ae_lk_compname;
-	DWORD ae_lk_username;
-	DWORD ae_lk_action;
-	DWORD ae_lk_bad_pw_count;
-} AE_LOCKOUT,*PAE_LOCKOUT,*LPAE_LOCKOUT;
-typedef struct _AE_GENERIC {
-	DWORD ae_ge_msgfile;
-	DWORD ae_ge_msgnum;
-	DWORD ae_ge_params;
-	DWORD ae_ge_param1;
-	DWORD ae_ge_param2;
-	DWORD ae_ge_param3;
-	DWORD ae_ge_param4;
-	DWORD ae_ge_param5;
-	DWORD ae_ge_param6;
-	DWORD ae_ge_param7;
-	DWORD ae_ge_param8;
-	DWORD ae_ge_param9;
-} AE_GENERIC,*PAE_GENERIC,*LPAE_GENERIC;
-NET_API_STATUS WINAPI NetAuditClear(LPCWSTR,LPCWSTR,LPCWSTR); 
-NET_API_STATUS WINAPI NetAuditRead(LPTSTR,LPTSTR,LPHLOG,DWORD,PDWORD,DWORD,DWORD,PBYTE*,DWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetAuditWrite(DWORD,PBYTE,DWORD,LPTSTR,PBYTE);
-
-/* These conflict with struct typedefs, why? */
-#define AE_SRVSTATUS 0
-#define AE_SESSLOGON 1
-#define AE_SESSLOGOFF 2
-#define AE_SESSPWERR 3
-#define AE_CONNSTART 4
-#define AE_CONNSTOP 5
-#define AE_CONNREJ 6
-#define AE_RESACCESS 7
-#define AE_RESACCESSREJ 8
-#define AE_CLOSEFILE 9
-#define AE_SERVICESTAT 11
-#define AE_ACLMOD 12
-#define AE_UASMOD 13
-#define AE_NETLOGON 14
-#define AE_NETLOGOFF 15
-#define AE_NETLOGDENIED 16
-#define AE_ACCLIMITEXCD 17
-#define AE_RESACCESS2 18
-#define AE_ACLMODFAIL 19
-#define AE_LOCKOUT 20
-#define AE_GENERIC_TYPE 21
-#define AE_SRVSTART 0
-#define AE_SRVPAUSED 1
-#define AE_SRVCONT 2
-#define AE_SRVSTOP 3
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/lmbrowsr.h b/winsup/w32api/include/lmbrowsr.h
deleted file mode 100644
index 4aee4646c..000000000
--- a/winsup/w32api/include/lmbrowsr.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef _LMBROWSR_H
-#define _LMBROWSR_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define BROWSER_ROLE_PDC 1
-#define BROWSER_ROLE_BDC 2
-typedef struct _BROWSER_STATISTICS {
-	LARGE_INTEGER StatisticsStartTime;
-	LARGE_INTEGER NumberOfServerAnnouncements;
-	LARGE_INTEGER NumberOfDomainAnnouncements;
-	ULONG NumberOfElectionPackets;
-	ULONG NumberOfMailslotWrites;
-	ULONG NumberOfGetBrowserServerListRequests;
-	ULONG NumberOfServerEnumerations;
-	ULONG NumberOfDomainEnumerations;
-	ULONG NumberOfOtherEnumerations;
-	ULONG NumberOfMissedServerAnnouncements;
-	ULONG NumberOfMissedMailslotDatagrams;
-	ULONG NumberOfMissedGetBrowserServerListRequests;
-	ULONG NumberOfFailedServerAnnounceAllocations;
-	ULONG NumberOfFailedMailslotAllocations;
-	ULONG NumberOfFailedMailslotReceives;
-	ULONG NumberOfFailedMailslotWrites;
-	ULONG NumberOfFailedMailslotOpens;
-	ULONG NumberOfDuplicateMasterAnnouncements;
-LARGE_INTEGER NumberOfIllegalDatagrams;
-} BROWSER_STATISTICS,*PBROWSER_STATISTICS,*LPBROWSER_STATISTICS;
-typedef struct _BROWSER_STATISTICS_100 {
-	LARGE_INTEGER StartTime;
-	LARGE_INTEGER NumberOfServerAnnouncements;
-	LARGE_INTEGER NumberOfDomainAnnouncements;
-	ULONG NumberOfElectionPackets;
-	ULONG NumberOfMailslotWrites;
-	ULONG NumberOfGetBrowserServerListRequests;
-	LARGE_INTEGER NumberOfIllegalDatagrams;
-} BROWSER_STATISTICS_100,*PBROWSER_STATISTICS_100;
-typedef struct _BROWSER_STATISTICS_101 {
-	LARGE_INTEGER StartTime;
-	LARGE_INTEGER NumberOfServerAnnouncements;
-	LARGE_INTEGER NumberOfDomainAnnouncements;
-	ULONG NumberOfElectionPackets;
-	ULONG NumberOfMailslotWrites;
-	ULONG NumberOfGetBrowserServerListRequests;
-	LARGE_INTEGER NumberOfIllegalDatagrams;
-	ULONG NumberOfMissedServerAnnouncements;
-	ULONG NumberOfMissedMailslotDatagrams;
-	ULONG NumberOfMissedGetBrowserServerListRequests;
-	ULONG NumberOfFailedServerAnnounceAllocations;
-	ULONG NumberOfFailedMailslotAllocations;
-	ULONG NumberOfFailedMailslotReceives;
-	ULONG NumberOfFailedMailslotWrites;
-	ULONG NumberOfFailedMailslotOpens;
-	ULONG NumberOfDuplicateMasterAnnouncements;
-} BROWSER_STATISTICS_101,*PBROWSER_STATISTICS_101;
-
-NET_API_STATUS WINAPI I_BrowserServerEnum(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,PDWORD);
-NET_API_STATUS WINAPI I_BrowserServerEnumEx(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,LPCWSTR);
-NET_API_STATUS I_BrowserQueryEmulatedDomains(LPWSTR,PBYTE*,PDWORD);
-NET_API_STATUS I_BrowserQueryOtherDomains(LPCWSTR,PBYTE*,PDWORD,PDWORD);
-NET_API_STATUS I_BrowserResetNetlogonState(LPCWSTR);
-NET_API_STATUS I_BrowserSetNetlogonState(LPWSTR,LPWSTR,LPWSTR,DWORD);
-NET_API_STATUS I_BrowserQueryStatistics(LPCWSTR,LPBROWSER_STATISTICS*);
-NET_API_STATUS I_BrowserResetStatistics(LPCWSTR);
-WORD I_BrowserServerEnumForXactsrv(LPCWSTR,LPCWSTR,ULONG,USHORT,PVOID,WORD,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,LPCWSTR,PWORD);
-NET_API_STATUS I_BrowserDebugTrace(PWCHAR,PCHAR);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmchdev.h b/winsup/w32api/include/lmchdev.h
deleted file mode 100644
index 3a4096881..000000000
--- a/winsup/w32api/include/lmchdev.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef _LMCHDEV_H
-#define _LMCHDEV_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define CHARDEVQ_NO_REQUESTS (-1)
-#define CHARDEV_CLOSE 0
-#define CHARDEVQ_MAX_PRIORITY 1
-#define CHARDEVQ_DEV_PARMNUM 1
-#define HANDLE_INFO_LEVEL_1 1
-#define HANDLE_CHARTIME_PARMNUM 1
-#define HANDLE_CHARCOUNT_PARMNUM 2
-#define CHARDEV_STAT_OPENED 2
-#define CHARDEVQ_PRIORITY_PARMNUM 2
-#define CHARDEVQ_DEVS_PARMNUM 3
-#define CHARDEV_STAT_ERROR 4
-#define CHARDEVQ_NUMUSERS_PARMNUM 4
-#define CHARDEVQ_NUMAHEAD_PARMNUM 5
-#define CHARDEVQ_DEF_PRIORITY 5
-#define CHARDEVQ_PRIORITY_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+CHARDEVQ_PRIORITY_PARMNUM)
-#define CHARDEVQ_DEVS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+CHARDEVQ_DEVS_PARMNUM)
-#define CHARDEVQ_MIN_PRIORITY 9
-typedef struct _CHARDEV_INFO_0 { LPWSTR ch0_dev; } CHARDEV_INFO_0,*PCHARDEV_INFO_0,*LPCHARDEV_INFO_0;
-typedef struct _CHARDEV_INFO_1 {
-	LPWSTR ch1_dev;
-	DWORD ch1_status;
-	LPWSTR ch1_username;
-	DWORD ch1_time;
-} CHARDEV_INFO_1,*PCHARDEV_INFO_1,*LPCHARDEV_INFO_1;
-typedef struct _CHARDEVQ_INFO_0 { LPWSTR cq0_dev; } CHARDEVQ_INFO_0,*PCHARDEVQ_INFO_0,*LPCHARDEVQ_INFO_0;
-typedef struct _CHARDEVQ_INFO_1 {
-	LPWSTR cq1_dev;
-	DWORD cq1_priority;
-	LPWSTR cq1_devs;
-	DWORD cq1_numusers;
-	DWORD cq1_numahead;
-} CHARDEVQ_INFO_1,*PCHARDEVQ_INFO_1,*LPCHARDEVQ_INFO_1;
-typedef struct _CHARDEVQ_INFO_1002 { DWORD cq1002_priority; } CHARDEVQ_INFO_1002,*PCHARDEVQ_INFO_1002,*LPCHARDEVQ_INFO_1002;
-typedef struct _CHARDEVQ_INFO_1003 { LPWSTR cq1003_devs; } CHARDEVQ_INFO_1003,*PCHARDEVQ_INFO_1003,*LPCHARDEVQ_INFO_1003;
-typedef struct _HANDLE_INFO_1 {
-	DWORD hdli1_chartime;
-	DWORD hdli1_charcount;
-}HANDLE_INFO_1,*PHANDLE_INFO_1,*LPHANDLE_INFO_1;
-NET_API_STATUS WINAPI NetCharDevEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetCharDevGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetCharDevControl(LPCWSTR,LPCWSTR,DWORD);
-NET_API_STATUS WINAPI NetCharDevQEnum(LPCWSTR,LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetCharDevQGetInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetCharDevQSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetCharDevQPurge(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetCharDevQPurgeSelf(LPCWSTR,LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetHandleGetInfo(HANDLE,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetHandleSetInfo(HANDLE,DWORD,PBYTE,DWORD,PDWORD);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmconfig.h b/winsup/w32api/include/lmconfig.h
deleted file mode 100644
index b75c6ab9c..000000000
--- a/winsup/w32api/include/lmconfig.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _LMCONFIG_H
-#define _LMCONFIG_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define REVISED_CONFIG_APIS
-typedef struct _CONFIG_INFO_0 {
-	LPWSTR cfgi0_key;
-	LPWSTR cfgi0_data;
-} CONFIG_INFO_0,*PCONFIG_INFO_0,*LPCONFIG_INFO_0;
-NET_API_STATUS WINAPI NetConfigGet(LPCWSTR,LPCWSTR,LPCWSTR,PBYTE*);
-NET_API_STATUS WINAPI NetConfigGetAll(LPCWSTR,LPCWSTR,PBYTE*);
-NET_API_STATUS WINAPI NetConfigSet(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,PBYTE,DWORD);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmcons.h b/winsup/w32api/include/lmcons.h
deleted file mode 100644
index 27566b365..000000000
--- a/winsup/w32api/include/lmcons.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef _LMCONS_H
-#define _LMCONS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define MESSAGE_FILENAME TEXT("NETMSG")
-#define OS2MSG_FILENAME TEXT("BASE")
-#define HELP_MSG_FILENAME TEXT("NETH")
-#define NET_API_FUNCTION __stdcall
-#define NET_API_STATUS DWORD
-#define API_RET_TYPE NET_API_STATUS
-#define MIN_LANMAN_MESSAGE_ID NERR_BASE
-#define MAX_LANMAN_MESSAGE_ID 5799
-#ifndef CNLEN /* also in nddeapi.h */
-#define CNLEN 15
-#define UNCLEN (CNLEN + 2)
-#endif
-#define DNLEN 15
-#define LM20_CNLEN 15
-#define LM20_DNLEN 15
-#define LM20_SNLEN 15
-#define LM20_STXTLEN 63
-#define LM20_UNCLEN (LM20_CNLEN+2)
-#define LM20_NNLEN 12
-#define LM20_RMLEN (LM20_UNCLEN+1+LM20_NNLEN)
-#define NNLEN 80
-#define RMLEN (UNCLEN+1+NNLEN)
-#define SNLEN 80
-#define STXTLEN 256
-#define PATHLEN 256
-#define LM20_PATHLEN 256
-#define DEVLEN 80
-#define LM20_DEVLEN 8
-#define EVLEN 16
-#define UNLEN 256
-#define LM20_UNLEN 20
-#define GNLEN UNLEN
-#define LM20_GNLEN LM20_UNLEN
-#define PWLEN 256
-#define LM20_PWLEN 14
-#define SHPWLEN 8
-#define CLTYPE_LEN 12
-#define MAXCOMMENTSZ 256
-#define LM20_MAXCOMMENTSZ 48
-#define QNLEN NNLEN
-#define LM20_QNLEN LM20_NNLEN
-#define ALERTSZ 128
-#define MAXDEVENTRIES (sizeof(int)*8)
-#define NETBIOS_NAME_LEN 16
-#define MAX_PREFERRED_LENGTH ((DWORD)-1)
-#define CRYPT_KEY_LEN 7
-#define CRYPT_TXT_LEN 8
-#define ENCRYPTED_PWLEN 16
-#define SESSION_PWLEN 24
-#define SESSION_CRYPT_KLEN 21
-#define PARMNUM_ALL             0
-#define PARM_ERROR_UNKNOWN ((DWORD)-1)
-#define PARM_ERROR_NONE 0
-#define PARMNUM_BASE_INFOLEVEL 1000
-#define PLATFORM_ID_DOS 300
-#define PLATFORM_ID_OS2 400
-#define PLATFORM_ID_NT 500
-#define PLATFORM_ID_OSF 600
-#define PLATFORM_ID_VMS 700
-/* new typedef in W2K */
-#if defined( _WIN32_WINNT ) || defined( WINNT ) || defined( FORCE_UNICODE )
-#define LMSTR   LPWSTR
-#define LMCSTR  LPCWSTR
-#else
-#define LMSTR   LPSTR
-#define LMCSTR  LPCSTR
-#endif
-
-#endif
diff --git a/winsup/w32api/include/lmerr.h b/winsup/w32api/include/lmerr.h
deleted file mode 100644
index 58b148492..000000000
--- a/winsup/w32api/include/lmerr.h
+++ /dev/null
@@ -1,306 +0,0 @@
-#ifndef _LMERR_H
-#define _LMERR_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <winerror.h>
-#define NERR_Success 0 
-#define NERR_BASE 2100
-#define NERR_NetNotStarted (NERR_BASE+2)
-#define NERR_UnknownServer (NERR_BASE+3)
-#define NERR_ShareMem (NERR_BASE+4)
-#define NERR_NoNetworkResource (NERR_BASE+5)
-#define NERR_RemoteOnly (NERR_BASE+6)
-#define NERR_DevNotRedirected (NERR_BASE+7)
-#define NERR_ServerNotStarted (NERR_BASE+14)
-#define NERR_ItemNotFound (NERR_BASE+15)
-#define NERR_UnknownDevDir (NERR_BASE+16)
-#define NERR_RedirectedPath (NERR_BASE+17)
-#define NERR_DuplicateShare (NERR_BASE+18)
-#define NERR_NoRoom (NERR_BASE+19)
-#define NERR_TooManyItems (NERR_BASE+21)
-#define NERR_InvalidMaxUsers (NERR_BASE+22)
-#define NERR_BufTooSmall (NERR_BASE+23)
-#define NERR_RemoteErr (NERR_BASE+27)
-#define NERR_LanmanIniError (NERR_BASE+31)
-#define NERR_NetworkError (NERR_BASE+36)
-#define NERR_WkstaInconsistentState (NERR_BASE+37)
-#define NERR_WkstaNotStarted (NERR_BASE+38)
-#define NERR_BrowserNotStarted (NERR_BASE+39)
-#define NERR_InternalError (NERR_BASE+40)
-#define NERR_BadTransactConfig (NERR_BASE+41)
-#define NERR_InvalidAPI (NERR_BASE+42)
-#define NERR_BadEventName (NERR_BASE+43)
-#define NERR_DupNameReboot (NERR_BASE+44)
-#define NERR_CfgCompNotFound (NERR_BASE+46)
-#define NERR_CfgParamNotFound (NERR_BASE+47)
-#define NERR_LineTooLong (NERR_BASE+49)
-#define NERR_QNotFound (NERR_BASE+50)
-#define NERR_JobNotFound (NERR_BASE+51)
-#define NERR_DestNotFound (NERR_BASE+52)
-#define NERR_DestExists (NERR_BASE+53)
-#define NERR_QExists (NERR_BASE+54)
-#define NERR_QNoRoom (NERR_BASE+55)
-#define NERR_JobNoRoom (NERR_BASE+56)
-#define NERR_DestNoRoom (NERR_BASE+57)
-#define NERR_DestIdle (NERR_BASE+58)
-#define NERR_DestInvalidOp (NERR_BASE+59)
-#define NERR_ProcNoRespond (NERR_BASE+60)
-#define NERR_SpoolerNotLoaded (NERR_BASE+61)
-#define NERR_DestInvalidState (NERR_BASE+62)
-#define NERR_QInvalidState (NERR_BASE+63)
-#define NERR_JobInvalidState (NERR_BASE+64)
-#define NERR_SpoolNoMemory (NERR_BASE+65)
-#define NERR_DriverNotFound (NERR_BASE+66)
-#define NERR_DataTypeInvalid (NERR_BASE+67)
-#define NERR_ProcNotFound (NERR_BASE+68)
-#define NERR_ServiceTableLocked (NERR_BASE+80)
-#define NERR_ServiceTableFull (NERR_BASE+81)
-#define NERR_ServiceInstalled (NERR_BASE+82)
-#define NERR_ServiceEntryLocked (NERR_BASE+83)
-#define NERR_ServiceNotInstalled (NERR_BASE+84)
-#define NERR_BadServiceName (NERR_BASE+85)
-#define NERR_ServiceCtlTimeout (NERR_BASE+86)
-#define NERR_ServiceCtlBusy (NERR_BASE+87)
-#define NERR_BadServiceProgName (NERR_BASE+88)
-#define NERR_ServiceNotCtrl (NERR_BASE+89)
-#define NERR_ServiceKillProc (NERR_BASE+90)
-#define NERR_ServiceCtlNotValid (NERR_BASE+91)
-#define NERR_NotInDispatchTbl (NERR_BASE+92)
-#define NERR_BadControlRecv (NERR_BASE+93)
-#define NERR_ServiceNotStarting (NERR_BASE+94)
-#define NERR_AlreadyLoggedOn (NERR_BASE+100)
-#define NERR_NotLoggedOn (NERR_BASE+101)
-#define NERR_BadUsername (NERR_BASE+102)
-#define NERR_BadPassword (NERR_BASE+103)
-#define NERR_UnableToAddName_W (NERR_BASE+104)
-#define NERR_UnableToAddName_F (NERR_BASE+105)
-#define NERR_UnableToDelName_W (NERR_BASE+106)
-#define NERR_UnableToDelName_F (NERR_BASE+107)
-#define NERR_LogonsPaused (NERR_BASE+109)
-#define NERR_LogonServerConflict (NERR_BASE+110)
-#define NERR_LogonNoUserPath (NERR_BASE+111)
-#define NERR_LogonScriptError (NERR_BASE+112)
-#define NERR_StandaloneLogon (NERR_BASE+114)
-#define NERR_LogonServerNotFound (NERR_BASE+115)
-#define NERR_LogonDomainExists (NERR_BASE+116)
-#define NERR_NonValidatedLogon (NERR_BASE+117)
-#define NERR_ACFNotFound (NERR_BASE+119)
-#define NERR_GroupNotFound (NERR_BASE+120)
-#define NERR_UserNotFound (NERR_BASE+121)
-#define NERR_ResourceNotFound (NERR_BASE+122)
-#define NERR_GroupExists (NERR_BASE+123)
-#define NERR_UserExists (NERR_BASE+124)
-#define NERR_ResourceExists (NERR_BASE+125)
-#define NERR_NotPrimary (NERR_BASE+126)
-#define NERR_ACFNotLoaded (NERR_BASE+127)
-#define NERR_ACFNoRoom (NERR_BASE+128)
-#define NERR_ACFFileIOFail (NERR_BASE+129)
-#define NERR_ACFTooManyLists (NERR_BASE+130)
-#define NERR_UserLogon (NERR_BASE+131)
-#define NERR_ACFNoParent (NERR_BASE+132)
-#define NERR_CanNotGrowSegment (NERR_BASE+133)
-#define NERR_SpeGroupOp (NERR_BASE+134)
-#define NERR_NotInCache (NERR_BASE+135)
-#define NERR_UserInGroup (NERR_BASE+136)
-#define NERR_UserNotInGroup (NERR_BASE+137)
-#define NERR_AccountUndefined (NERR_BASE+138)
-#define NERR_AccountExpired (NERR_BASE+139)
-#define NERR_InvalidWorkstation (NERR_BASE+140)
-#define NERR_InvalidLogonHours (NERR_BASE+141)
-#define NERR_PasswordExpired (NERR_BASE+142)
-#define NERR_PasswordCantChange (NERR_BASE+143)
-#define NERR_PasswordHistConflict (NERR_BASE+144)
-#define NERR_PasswordTooShort (NERR_BASE+145)
-#define NERR_PasswordTooRecent (NERR_BASE+146)
-#define NERR_InvalidDatabase (NERR_BASE+147)
-#define NERR_DatabaseUpToDate (NERR_BASE+148)
-#define NERR_SyncRequired (NERR_BASE+149)
-#define NERR_UseNotFound (NERR_BASE+150)
-#define NERR_BadAsgType (NERR_BASE+151)
-#define NERR_DeviceIsShared (NERR_BASE+152)
-#define NERR_NoComputerName (NERR_BASE+170)
-#define NERR_MsgAlreadyStarted (NERR_BASE+171)
-#define NERR_MsgInitFailed (NERR_BASE+172)
-#define NERR_NameNotFound (NERR_BASE+173)
-#define NERR_AlreadyForwarded (NERR_BASE+174)
-#define NERR_AddForwarded (NERR_BASE+175)
-#define NERR_AlreadyExists (NERR_BASE+176)
-#define NERR_TooManyNames (NERR_BASE+177)
-#define NERR_DelComputerName (NERR_BASE+178)
-#define NERR_LocalForward (NERR_BASE+179)
-#define NERR_GrpMsgProcessor (NERR_BASE+180)
-#define NERR_PausedRemote (NERR_BASE+181)
-#define NERR_BadReceive (NERR_BASE+182)
-#define NERR_NameInUse (NERR_BASE+183)
-#define NERR_MsgNotStarted (NERR_BASE+184)
-#define NERR_NotLocalName (NERR_BASE+185)
-#define NERR_NoForwardName (NERR_BASE+186)
-#define NERR_RemoteFull (NERR_BASE+187)
-#define NERR_NameNotForwarded (NERR_BASE+188)
-#define NERR_TruncatedBroadcast (NERR_BASE+189)
-#define NERR_InvalidDevice (NERR_BASE+194)
-#define NERR_WriteFault (NERR_BASE+195)
-#define NERR_DuplicateName (NERR_BASE+197)
-#define NERR_DeleteLater (NERR_BASE+198)
-#define NERR_IncompleteDel (NERR_BASE+199)
-#define NERR_MultipleNets (NERR_BASE+200)
-#define NERR_NetNameNotFound (NERR_BASE+210)
-#define NERR_DeviceNotShared (NERR_BASE+211)
-#define NERR_ClientNameNotFound (NERR_BASE+212)
-#define NERR_FileIdNotFound (NERR_BASE+214)
-#define NERR_ExecFailure (NERR_BASE+215)
-#define NERR_TmpFile (NERR_BASE+216)
-#define NERR_TooMuchData (NERR_BASE+217)
-#define NERR_DeviceShareConflict (NERR_BASE+218)
-#define NERR_BrowserTableIncomplete (NERR_BASE+219)
-#define NERR_NotLocalDomain (NERR_BASE+220)
-#define NERR_DevInvalidOpCode (NERR_BASE+231)
-#define NERR_DevNotFound (NERR_BASE+232)
-#define NERR_DevNotOpen (NERR_BASE+233)
-#define NERR_BadQueueDevString (NERR_BASE+234)
-#define NERR_BadQueuePriority (NERR_BASE+235)
-#define NERR_NoCommDevs (NERR_BASE+237)
-#define NERR_QueueNotFound (NERR_BASE+238)
-#define NERR_BadDevString (NERR_BASE+240)
-#define NERR_BadDev (NERR_BASE+241)
-#define NERR_InUseBySpooler (NERR_BASE+242)
-#define NERR_CommDevInUse (NERR_BASE+243)
-#define NERR_InvalidComputer (NERR_BASE+251)
-#define NERR_MaxLenExceeded (NERR_BASE+254)
-#define NERR_BadComponent (NERR_BASE+256)
-#define NERR_CantType (NERR_BASE+257)
-#define NERR_TooManyEntries (NERR_BASE+262)
-#define NERR_ProfileFileTooBig (NERR_BASE+270)
-#define NERR_ProfileOffset (NERR_BASE+271)
-#define NERR_ProfileCleanup (NERR_BASE+272)
-#define NERR_ProfileUnknownCmd (NERR_BASE+273)
-#define NERR_ProfileLoadErr (NERR_BASE+274)
-#define NERR_ProfileSaveErr (NERR_BASE+275)
-#define NERR_LogOverflow (NERR_BASE+277)
-#define NERR_LogFileChanged (NERR_BASE+278)
-#define NERR_LogFileCorrupt (NERR_BASE+279)
-#define NERR_SourceIsDir (NERR_BASE+280)
-#define NERR_BadSource (NERR_BASE+281)
-#define NERR_BadDest (NERR_BASE+282)
-#define NERR_DifferentServers (NERR_BASE+283)
-#define NERR_RunSrvPaused (NERR_BASE+285)
-#define NERR_ErrCommRunSrv (NERR_BASE+289)
-#define NERR_ErrorExecingGhost (NERR_BASE+291)
-#define NERR_ShareNotFound (NERR_BASE+292)
-#define NERR_InvalidLana (NERR_BASE+300)
-#define NERR_OpenFiles (NERR_BASE+301)
-#define NERR_ActiveConns (NERR_BASE+302)
-#define NERR_BadPasswordCore (NERR_BASE+303)
-#define NERR_DevInUse (NERR_BASE+304)
-#define NERR_LocalDrive (NERR_BASE+305)
-#define NERR_AlertExists (NERR_BASE+330)
-#define NERR_TooManyAlerts (NERR_BASE+331)
-#define NERR_NoSuchAlert (NERR_BASE+332)
-#define NERR_BadRecipient (NERR_BASE+333)
-#define NERR_AcctLimitExceeded (NERR_BASE+334)
-#define NERR_InvalidLogSeek (NERR_BASE+340)
-#define NERR_BadUasConfig (NERR_BASE+350)
-#define NERR_InvalidUASOp (NERR_BASE+351)
-#define NERR_LastAdmin (NERR_BASE+352)
-#define NERR_DCNotFound (NERR_BASE+353)
-#define NERR_LogonTrackingError (NERR_BASE+354)
-#define NERR_NetlogonNotStarted (NERR_BASE+355)
-#define NERR_CanNotGrowUASFile (NERR_BASE+356)
-#define NERR_TimeDiffAtDC (NERR_BASE+357)
-#define NERR_PasswordMismatch (NERR_BASE+358)
-#define NERR_NoSuchServer (NERR_BASE+360)
-#define NERR_NoSuchSession (NERR_BASE+361)
-#define NERR_NoSuchConnection (NERR_BASE+362)
-#define NERR_TooManyServers (NERR_BASE+363)
-#define NERR_TooManySessions (NERR_BASE+364)
-#define NERR_TooManyConnections (NERR_BASE+365)
-#define NERR_TooManyFiles (NERR_BASE+366)
-#define NERR_NoAlternateServers (NERR_BASE+367)
-#define NERR_TryDownLevel (NERR_BASE+370)
-#define NERR_UPSDriverNotStarted (NERR_BASE+380)
-#define NERR_UPSInvalidConfig (NERR_BASE+381)
-#define NERR_UPSInvalidCommPort (NERR_BASE+382)
-#define NERR_UPSSignalAsserted (NERR_BASE+383)
-#define NERR_UPSShutdownFailed (NERR_BASE+384)
-#define NERR_BadDosRetCode (NERR_BASE+400)
-#define NERR_ProgNeedsExtraMem (NERR_BASE+401)
-#define NERR_BadDosFunction (NERR_BASE+402)
-#define NERR_RemoteBootFailed (NERR_BASE+403)
-#define NERR_BadFileCheckSum (NERR_BASE+404)
-#define NERR_NoRplBootSystem (NERR_BASE+405)
-#define NERR_RplLoadrNetBiosErr (NERR_BASE+406)
-#define NERR_RplLoadrDiskErr (NERR_BASE+407)
-#define NERR_ImageParamErr (NERR_BASE+408)
-#define NERR_TooManyImageParams (NERR_BASE+409)
-#define NERR_NonDosFloppyUsed (NERR_BASE+410)
-#define NERR_RplBootRestart (NERR_BASE+411)
-#define NERR_RplSrvrCallFailed (NERR_BASE+412)
-#define NERR_CantConnectRplSrvr (NERR_BASE+413)
-#define NERR_CantOpenImageFile (NERR_BASE+414)
-#define NERR_CallingRplSrvr (NERR_BASE+415)
-#define NERR_StartingRplBoot (NERR_BASE+416)
-#define NERR_RplBootServiceTerm (NERR_BASE+417)
-#define NERR_RplBootStartFailed (NERR_BASE+418)
-#define NERR_RPL_CONNECTED (NERR_BASE+419)
-#define NERR_BrowserConfiguredToNotRun (NERR_BASE+450)
-#define NERR_RplNoAdaptersStarted (NERR_BASE+510)
-#define NERR_RplBadRegistry (NERR_BASE+511)
-#define NERR_RplBadDatabase (NERR_BASE+512)
-#define NERR_RplRplfilesShare (NERR_BASE+513)
-#define NERR_RplNotRplServer (NERR_BASE+514)
-#define NERR_RplCannotEnum (NERR_BASE+515)
-#define NERR_RplWkstaInfoCorrupted (NERR_BASE+516)
-#define NERR_RplWkstaNotFound (NERR_BASE+517)
-#define NERR_RplWkstaNameUnavailable (NERR_BASE+518)
-#define NERR_RplProfileInfoCorrupted (NERR_BASE+519)
-#define NERR_RplProfileNotFound (NERR_BASE+520)
-#define NERR_RplProfileNameUnavailable (NERR_BASE+521)
-#define NERR_RplProfileNotEmpty (NERR_BASE+522)
-#define NERR_RplConfigInfoCorrupted (NERR_BASE+523)
-#define NERR_RplConfigNotFound (NERR_BASE+524)
-#define NERR_RplAdapterInfoCorrupted (NERR_BASE+525)
-#define NERR_RplInternal (NERR_BASE+526)
-#define NERR_RplVendorInfoCorrupted (NERR_BASE+527)
-#define NERR_RplBootInfoCorrupted (NERR_BASE+528)
-#define NERR_RplWkstaNeedsUserAcct (NERR_BASE+529)
-#define NERR_RplNeedsRPLUSERAcct (NERR_BASE+530)
-#define NERR_RplBootNotFound (NERR_BASE+531)
-#define NERR_RplIncompatibleProfile (NERR_BASE+532)
-#define NERR_RplAdapterNameUnavailable (NERR_BASE+533)
-#define NERR_RplConfigNotEmpty (NERR_BASE+534)
-#define NERR_RplBootInUse (NERR_BASE+535)
-#define NERR_RplBackupDatabase (NERR_BASE+536)
-#define NERR_RplAdapterNotFound (NERR_BASE+537)
-#define NERR_RplVendorNotFound (NERR_BASE+538)
-#define NERR_RplVendorNameUnavailable (NERR_BASE+539)
-#define NERR_RplBootNameUnavailable (NERR_BASE+540)
-#define NERR_RplConfigNameUnavailable (NERR_BASE+541)
-#define NERR_DfsInternalCorruption (NERR_BASE+560)
-#define NERR_DfsVolumeDataCorrupt (NERR_BASE+561)
-#define NERR_DfsNoSuchVolume (NERR_BASE+562)
-#define NERR_DfsVolumeAlreadyExists (NERR_BASE+563)
-#define NERR_DfsAlreadyShared (NERR_BASE+564)
-#define NERR_DfsNoSuchShare (NERR_BASE+565)
-#define NERR_DfsNotALeafVolume (NERR_BASE+566)
-#define NERR_DfsLeafVolume (NERR_BASE+567)
-#define NERR_DfsVolumeHasMultipleServers (NERR_BASE+568)
-#define NERR_DfsCantCreateJunctionPoint (NERR_BASE+569)
-#define NERR_DfsServerNotDfsAware (NERR_BASE+570)
-#define NERR_DfsBadRenamePath (NERR_BASE+571)
-#define NERR_DfsVolumeIsOffline (NERR_BASE+572)
-#define NERR_DfsNoSuchServer (NERR_BASE+573)
-#define NERR_DfsCyclicalName (NERR_BASE+574)
-#define NERR_DfsNotSupportedInServerDfs (NERR_BASE+575)
-#define NERR_DfsDuplicateService (NERR_BASE+576)
-#define NERR_DfsCantRemoveLastServerShare (NERR_BASE+577)
-#define NERR_DfsVolumeIsInterDfs  (NERR_BASE+578)
-#define NERR_DfsInconsistent (NERR_BASE+579)
-#define NERR_DfsServerUpgraded (NERR_BASE+580)
-#define NERR_DfsDataIsIdentical (NERR_BASE+581)
-#define NERR_DfsCantRemoveDfsRoot (NERR_BASE+582)
-#define NERR_DfsChildOrParentInDfs (NERR_BASE+583)
-#define NERR_DfsInternalError (NERR_BASE+590)
-#define MAX_NERR (NERR_BASE+899)
-#endif 
diff --git a/winsup/w32api/include/lmerrlog.h b/winsup/w32api/include/lmerrlog.h
deleted file mode 100644
index 2f4160369..000000000
--- a/winsup/w32api/include/lmerrlog.h
+++ /dev/null
@@ -1,211 +0,0 @@
-#ifndef _LMERRLOG_H
-#define _LMERRLOG_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define ERRLOG_BASE 3100
-#define ERRLOG2_BASE 5700 
-#define LOGFLAGS_FORWARD 0
-#define LOGFLAGS_BACKWARD 1
-#define LOGFLAGS_SEEK 2
-#define NELOG_Internal_Error ERRLOG_BASE
-#define NELOG_Resource_Shortage (ERRLOG_BASE+1)
-#define NELOG_Unable_To_Lock_Segment (ERRLOG_BASE+2)
-#define NELOG_Unable_To_Unlock_Segment (ERRLOG_BASE+3)
-#define NELOG_Uninstall_Service (ERRLOG_BASE+4)
-#define NELOG_Init_Exec_Fail (ERRLOG_BASE+5)
-#define NELOG_Ncb_Error (ERRLOG_BASE+6)
-#define NELOG_Net_Not_Started (ERRLOG_BASE+7)
-#define NELOG_Ioctl_Error (ERRLOG_BASE+8)
-#define NELOG_System_Semaphore (ERRLOG_BASE+9)
-#define NELOG_Init_OpenCreate_Err (ERRLOG_BASE+10)
-#define NELOG_NetBios (ERRLOG_BASE+11)
-#define NELOG_SMB_Illegal (ERRLOG_BASE+12)
-#define NELOG_Service_Fail (ERRLOG_BASE+13)
-#define NELOG_Entries_Lost (ERRLOG_BASE+14)
-#define NELOG_Init_Seg_Overflow (ERRLOG_BASE+20)
-#define NELOG_Srv_No_Mem_Grow (ERRLOG_BASE+21)
-#define NELOG_Access_File_Bad (ERRLOG_BASE+22)
-#define NELOG_Srvnet_Not_Started (ERRLOG_BASE+23)
-#define NELOG_Init_Chardev_Err (ERRLOG_BASE+24)
-#define NELOG_Remote_API (ERRLOG_BASE+25)
-#define NELOG_Ncb_TooManyErr (ERRLOG_BASE+26)
-#define NELOG_Mailslot_err (ERRLOG_BASE+27)
-#define NELOG_ReleaseMem_Alert (ERRLOG_BASE+28)
-#define NELOG_AT_cannot_write (ERRLOG_BASE+29)
-#define NELOG_Cant_Make_Msg_File (ERRLOG_BASE+30)
-#define NELOG_Exec_Netservr_NoMem (ERRLOG_BASE+31)
-#define NELOG_Server_Lock_Failure (ERRLOG_BASE+32)
-#define NELOG_Msg_Shutdown (ERRLOG_BASE+40)
-#define NELOG_Msg_Sem_Shutdown (ERRLOG_BASE+41)
-#define NELOG_Msg_Log_Err (ERRLOG_BASE+50)
-#define NELOG_VIO_POPUP_ERR (ERRLOG_BASE+51)
-#define NELOG_Msg_Unexpected_SMB_Type (ERRLOG_BASE+52)
-#define NELOG_Wksta_Infoseg (ERRLOG_BASE+60)
-#define NELOG_Wksta_Compname (ERRLOG_BASE+61)
-#define NELOG_Wksta_BiosThreadFailure (ERRLOG_BASE+62)
-#define NELOG_Wksta_IniSeg (ERRLOG_BASE+63)
-#define NELOG_Wksta_HostTab_Full (ERRLOG_BASE+64)
-#define NELOG_Wksta_Bad_Mailslot_SMB (ERRLOG_BASE+65)
-#define NELOG_Wksta_UASInit (ERRLOG_BASE+66)
-#define NELOG_Wksta_SSIRelogon (ERRLOG_BASE+67)
-#define NELOG_Build_Name (ERRLOG_BASE+70)
-#define NELOG_Name_Expansion (ERRLOG_BASE+71)
-#define NELOG_Message_Send (ERRLOG_BASE+72)
-#define NELOG_Mail_Slt_Err (ERRLOG_BASE+73)
-#define NELOG_AT_cannot_read (ERRLOG_BASE+74)
-#define NELOG_AT_sched_err (ERRLOG_BASE+75)
-#define NELOG_AT_schedule_file_created (ERRLOG_BASE+76)
-#define NELOG_Srvnet_NB_Open (ERRLOG_BASE+77)
-#define NELOG_AT_Exec_Err (ERRLOG_BASE+78)
-#define NELOG_Lazy_Write_Err (ERRLOG_BASE+80)
-#define NELOG_HotFix (ERRLOG_BASE+81)
-#define NELOG_HardErr_From_Server (ERRLOG_BASE+82)
-#define NELOG_LocalSecFail1 (ERRLOG_BASE+83)
-#define NELOG_LocalSecFail2 (ERRLOG_BASE+84)
-#define NELOG_LocalSecFail3 (ERRLOG_BASE+85)
-#define NELOG_LocalSecGeneralFail (ERRLOG_BASE+86)
-#define NELOG_NetWkSta_Internal_Error (ERRLOG_BASE+90)
-#define NELOG_NetWkSta_No_Resource (ERRLOG_BASE+91)
-#define NELOG_NetWkSta_SMB_Err (ERRLOG_BASE+92)
-#define NELOG_NetWkSta_VC_Err (ERRLOG_BASE+93)
-#define NELOG_NetWkSta_Stuck_VC_Err (ERRLOG_BASE+94)
-#define NELOG_NetWkSta_NCB_Err (ERRLOG_BASE+95)
-#define NELOG_NetWkSta_Write_Behind_Err (ERRLOG_BASE+96)
-#define NELOG_NetWkSta_Reset_Err (ERRLOG_BASE+97)
-#define NELOG_NetWkSta_Too_Many (ERRLOG_BASE+98)
-#define NELOG_Srv_Thread_Failure (ERRLOG_BASE+104)
-#define NELOG_Srv_Close_Failure (ERRLOG_BASE+105)
-#define NELOG_ReplUserCurDir (ERRLOG_BASE+106)
-#define NELOG_ReplCannotMasterDir (ERRLOG_BASE+107)
-#define NELOG_ReplUpdateError (ERRLOG_BASE+108)
-#define NELOG_ReplLostMaster (ERRLOG_BASE+109)
-#define NELOG_NetlogonAuthDCFail (ERRLOG_BASE+110)
-#define NELOG_ReplLogonFailed (ERRLOG_BASE+111)
-#define NELOG_ReplNetErr (ERRLOG_BASE+112)
-#define NELOG_ReplMaxFiles (ERRLOG_BASE+113)
-#define NELOG_ReplMaxTreeDepth (ERRLOG_BASE+114)
-#define NELOG_ReplBadMsg (ERRLOG_BASE+115)
-#define NELOG_ReplSysErr (ERRLOG_BASE+116)
-#define NELOG_ReplUserLoged (ERRLOG_BASE+117)
-#define NELOG_ReplBadImport (ERRLOG_BASE+118)
-#define NELOG_ReplBadExport (ERRLOG_BASE+119)
-#define NELOG_ReplSignalFileErr (ERRLOG_BASE+120)
-#define NELOG_DiskFT (ERRLOG_BASE+121)
-#define NELOG_ReplAccessDenied (ERRLOG_BASE+122)
-#define NELOG_NetlogonFailedPrimary (ERRLOG_BASE+123)
-#define NELOG_NetlogonPasswdSetFailed (ERRLOG_BASE+124)
-#define NELOG_NetlogonTrackingError (ERRLOG_BASE+125)
-#define NELOG_NetlogonSyncError (ERRLOG_BASE+126)
-#define NELOG_UPS_PowerOut (ERRLOG_BASE+130)
-#define NELOG_UPS_Shutdown (ERRLOG_BASE+131)
-#define NELOG_UPS_CmdFileError (ERRLOG_BASE+132)
-#define NELOG_UPS_CannotOpenDriver (ERRLOG_BASE+133)
-#define NELOG_UPS_PowerBack (ERRLOG_BASE+134)
-#define NELOG_UPS_CmdFileConfig (ERRLOG_BASE+135)
-#define NELOG_UPS_CmdFileExec (ERRLOG_BASE+136)
-#define NELOG_Missing_Parameter (ERRLOG_BASE+150)
-#define NELOG_Invalid_Config_Line (ERRLOG_BASE+151)
-#define NELOG_Invalid_Config_File (ERRLOG_BASE+152)
-#define NELOG_File_Changed (ERRLOG_BASE+153)
-#define NELOG_Files_Dont_Fit (ERRLOG_BASE+154)
-#define NELOG_Wrong_DLL_Version (ERRLOG_BASE+155)
-#define NELOG_Error_in_DLL (ERRLOG_BASE+156)
-#define NELOG_System_Error (ERRLOG_BASE+157)
-#define NELOG_FT_ErrLog_Too_Large (ERRLOG_BASE+158)
-#define NELOG_FT_Update_In_Progress (ERRLOG_BASE+159)
-#define NELOG_OEM_Code (ERRLOG_BASE+199)
-#define NELOG_NetlogonSSIInitError ERRLOG2_BASE
-#define NELOG_NetlogonFailedToUpdateTrustList (ERRLOG2_BASE+1)
-#define NELOG_NetlogonFailedToAddRpcInterface (ERRLOG2_BASE+2)
-#define NELOG_NetlogonFailedToReadMailslot (ERRLOG2_BASE+3)
-#define NELOG_NetlogonFailedToRegisterSC (ERRLOG2_BASE+4)
-#define NELOG_NetlogonChangeLogCorrupt (ERRLOG2_BASE+5)
-#define NELOG_NetlogonFailedToCreateShare (ERRLOG2_BASE+6)
-#define NELOG_NetlogonDownLevelLogonFailed (ERRLOG2_BASE+7)
-#define NELOG_NetlogonDownLevelLogoffFailed (ERRLOG2_BASE+8)
-#define NELOG_NetlogonNTLogonFailed (ERRLOG2_BASE+9)
-#define NELOG_NetlogonNTLogoffFailed (ERRLOG2_BASE+10)
-#define NELOG_NetlogonPartialSyncCallSuccess (ERRLOG2_BASE+11)
-#define NELOG_NetlogonPartialSyncCallFailed (ERRLOG2_BASE+12)
-#define NELOG_NetlogonFullSyncCallSuccess (ERRLOG2_BASE+13)
-#define NELOG_NetlogonFullSyncCallFailed (ERRLOG2_BASE+14)
-#define NELOG_NetlogonPartialSyncSuccess (ERRLOG2_BASE+15)
-#define NELOG_NetlogonPartialSyncFailed (ERRLOG2_BASE+16)
-#define NELOG_NetlogonFullSyncSuccess (ERRLOG2_BASE+17)
-#define NELOG_NetlogonFullSyncFailed (ERRLOG2_BASE+18)
-#define NELOG_NetlogonAuthNoDomainController (ERRLOG2_BASE+19)
-#define NELOG_NetlogonAuthNoTrustLsaSecret (ERRLOG2_BASE+20)
-#define NELOG_NetlogonAuthNoTrustSamAccount (ERRLOG2_BASE+21)
-#define NELOG_NetlogonServerAuthFailed (ERRLOG2_BASE+22)
-#define NELOG_NetlogonServerAuthNoTrustSamAccount (ERRLOG2_BASE+23)
-#define NELOG_FailedToRegisterSC (ERRLOG2_BASE+24)
-#define NELOG_FailedToSetServiceStatus (ERRLOG2_BASE+25)
-#define NELOG_FailedToGetComputerName (ERRLOG2_BASE+26)
-#define NELOG_DriverNotLoaded (ERRLOG2_BASE+27)
-#define NELOG_NoTranportLoaded (ERRLOG2_BASE+28)
-#define NELOG_NetlogonFailedDomainDelta (ERRLOG2_BASE+29)
-#define NELOG_NetlogonFailedGlobalGroupDelta (ERRLOG2_BASE+30)
-#define NELOG_NetlogonFailedLocalGroupDelta (ERRLOG2_BASE+31)
-#define NELOG_NetlogonFailedUserDelta (ERRLOG2_BASE+32)
-#define NELOG_NetlogonFailedPolicyDelta (ERRLOG2_BASE+33)
-#define NELOG_NetlogonFailedTrustedDomainDelta (ERRLOG2_BASE+34)
-#define NELOG_NetlogonFailedAccountDelta (ERRLOG2_BASE+35)
-#define NELOG_NetlogonFailedSecretDelta (ERRLOG2_BASE+36)
-#define NELOG_NetlogonSystemError (ERRLOG2_BASE+37)
-#define NELOG_NetlogonDuplicateMachineAccounts (ERRLOG2_BASE+38)
-#define NELOG_NetlogonTooManyGlobalGroups (ERRLOG2_BASE+39)
-#define NELOG_NetlogonBrowserDriver (ERRLOG2_BASE+40)
-#define NELOG_NetlogonAddNameFailure (ERRLOG2_BASE+41)
-#define NELOG_RplMessages (ERRLOG2_BASE+42)
-#define NELOG_RplXnsBoot (ERRLOG2_BASE+43)
-#define NELOG_RplSystem (ERRLOG2_BASE+44)
-#define NELOG_RplWkstaTimeout (ERRLOG2_BASE+45)
-#define NELOG_RplWkstaFileOpen (ERRLOG2_BASE+46)
-#define NELOG_RplWkstaFileRead (ERRLOG2_BASE+47)
-#define NELOG_RplWkstaMemory (ERRLOG2_BASE+48)
-#define NELOG_RplWkstaFileChecksum (ERRLOG2_BASE+49)
-#define NELOG_RplWkstaFileLineCount (ERRLOG2_BASE+50)
-#define NELOG_RplWkstaBbcFile (ERRLOG2_BASE+51)
-#define NELOG_RplWkstaFileSize (ERRLOG2_BASE+52)
-#define NELOG_RplWkstaInternal (ERRLOG2_BASE+53)
-#define NELOG_RplWkstaWrongVersion (ERRLOG2_BASE+54)
-#define NELOG_RplWkstaNetwork (ERRLOG2_BASE+55)
-#define NELOG_RplAdapterResource (ERRLOG2_BASE+56)
-#define NELOG_RplFileCopy (ERRLOG2_BASE+57)
-#define NELOG_RplFileDelete (ERRLOG2_BASE+58)
-#define NELOG_RplFilePerms (ERRLOG2_BASE+59)
-#define NELOG_RplCheckConfigs (ERRLOG2_BASE+60)
-#define NELOG_RplCreateProfiles (ERRLOG2_BASE+61)
-#define NELOG_RplRegistry (ERRLOG2_BASE+62)
-#define NELOG_RplReplaceRPLDISK (ERRLOG2_BASE+63)
-#define NELOG_RplCheckSecurity (ERRLOG2_BASE+64)
-#define NELOG_RplBackupDatabase (ERRLOG2_BASE+65)
-#define NELOG_RplInitDatabase (ERRLOG2_BASE+66)
-#define NELOG_RplRestoreDatabaseFailure (ERRLOG2_BASE+67)
-#define NELOG_RplRestoreDatabaseSuccess (ERRLOG2_BASE+68)
-#define NELOG_RplInitRestoredDatabase (ERRLOG2_BASE+69)
-#define NELOG_NetlogonSessionTypeWrong (ERRLOG2_BASE+70)
-#define REVISED_ERROR_LOG_STRUCT
-typedef struct _ERROR_LOG {
-	DWORD el_len;
-	DWORD el_reserved;
-	DWORD el_time;
-	DWORD el_error;
-	LPWSTR el_name; 
-	LPWSTR el_text; 
-	LPBYTE el_data; 
-	DWORD el_data_size; 
-	DWORD el_nstrings; 
-} ERROR_LOG,*PERROR_LOG,*LPERROR_LOG;
-NET_API_STATUS WINAPI NetErrorLogClear(LPCWSTR,LPCWSTR,LPBYTE);
-NET_API_STATUS WINAPI NetErrorLogRead(LPCWSTR,LPWSTR,LPHLOG,DWORD,LPDWORD,DWORD,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD);
-NET_API_STATUS WINAPI NetErrorLogWrite(LPBYTE,DWORD,LPCWSTR,LPBYTE,DWORD,LPBYTE,DWORD,LPBYTE);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmmsg.h b/winsup/w32api/include/lmmsg.h
deleted file mode 100644
index 9a4ea6434..000000000
--- a/winsup/w32api/include/lmmsg.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _LMMSG_H
-#define _LMMSG_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define MSGNAME_NOT_FORWARDED 0
-#define MSGNAME_FORWARDED_TO 4
-#define MSGNAME_FORWARDED_FROM 16
-typedef struct _MSG_INFO_0 { LPWSTR msgi0_name; }MSG_INFO_0,*PMSG_INFO_0,*LPMSG_INFO_0;
-typedef struct _MSG_INFO_1 {
-	LPWSTR msgi1_name;
-	DWORD msgi1_forward_flag;
-	LPWSTR msgi1_forward;
-}MSG_INFO_1,*PMSG_INFO_1,*LPMSG_INFO_1;
-NET_API_STATUS WINAPI NetMessageBufferSend(LPCWSTR,LPCWSTR,LPCWSTR,PBYTE,DWORD);
-NET_API_STATUS WINAPI NetMessageNameAdd(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetMessageNameDel(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetMessageNameEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetMessageNameGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmremutl.h b/winsup/w32api/include/lmremutl.h
deleted file mode 100644
index 0609240af..000000000
--- a/winsup/w32api/include/lmremutl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef _LMREMUTL_H
-#define _LMREMUTL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define SUPPORTS_REMOTE_ADMIN_PROTOCOL 2
-#define SUPPORTS_RPC 4
-#define SUPPORTS_SAM_PROTOCOL 8
-#define SUPPORTS_UNICODE 16
-#define SUPPORTS_LOCAL 32
-#define SUPPORTS_ANY 0xFFFFFFFF
-#define NO_PERMISSION_REQUIRED 1
-#define ALLOCATE_RESPONSE 2
-#define USE_SPECIFIC_TRANSPORT 0x80000000
-#ifndef DESC_CHAR_UNICODE
-typedef CHAR DESC_CHAR;
-#else 
-typedef WCHAR DESC_CHAR;
-#endif 
-typedef DESC_CHAR *LPDESC;
-typedef struct _TIME_OF_DAY_INFO {
-	DWORD tod_elapsedt;
-	DWORD tod_msecs;
-	DWORD tod_hours;
-	DWORD tod_mins;
-	DWORD tod_secs;
-	DWORD tod_hunds;
-	LONG tod_timezone;
-	DWORD tod_tinterval;
-	DWORD tod_day;
-	DWORD tod_month;
-	DWORD tod_year;
-	DWORD tod_weekday;
-} TIME_OF_DAY_INFO,*PTIME_OF_DAY_INFO,*LPTIME_OF_DAY_INFO;
-NET_API_STATUS WINAPI NetRemoteTOD(LPCWSTR,PBYTE*);
-NET_API_STATUS WINAPI NetRemoteComputerSupports(LPCWSTR,DWORD,PDWORD);
-NET_API_STATUS RxRemoteApi(DWORD,LPCWSTR,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,LPDESC,DWORD,... );
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmrepl.h b/winsup/w32api/include/lmrepl.h
deleted file mode 100644
index 0cef98ce9..000000000
--- a/winsup/w32api/include/lmrepl.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef _LMREPL_H
-#define _LMREPL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define REPL_ROLE_EXPORT 1
-#define REPL_ROLE_IMPORT 2
-#define REPL_ROLE_BOTH 3
-#define REPL_INTERVAL_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+0)
-#define REPL_PULSE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+1)
-#define REPL_GUARDTIME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+2)
-#define REPL_RANDOM_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+3)
-#define REPL_UNLOCK_NOFORCE 0
-#define REPL_UNLOCK_FORCE 1
-#define REPL_STATE_OK 0
-#define REPL_STATE_NO_MASTER 1
-#define REPL_STATE_NO_SYNC 2
-#define REPL_STATE_NEVER_REPLICATED 3
-#define REPL_INTEGRITY_FILE 1
-#define REPL_INTEGRITY_TREE 2
-#define REPL_EXTENT_FILE 1
-#define REPL_EXTENT_TREE 2
-#define REPL_EXPORT_INTEGRITY_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+0)
-#define REPL_EXPORT_EXTENT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+1)
-typedef struct _REPL_INFO_0 {
-	DWORD rp0_role;
-	LPWSTR rp0_exportpath;
-	LPWSTR rp0_exportlist;
-	LPWSTR rp0_importpath;
-	LPWSTR rp0_importlist;
-	LPWSTR rp0_logonusername;
-	DWORD rp0_interval;
-	DWORD rp0_pulse;
-	DWORD rp0_guardtime;
-	DWORD rp0_random;
-} REPL_INFO_0,*PREPL_INFO_0,*LPREPL_INFO_0;
-typedef struct _REPL_INFO_1000 { DWORD rp1000_interval; } REPL_INFO_1000,*PREPL_INFO_1000,*LPREPL_INFO_1000;
-typedef struct _REPL_INFO_1001 { DWORD rp1001_pulse; } REPL_INFO_1001,*PREPL_INFO_1001,*LPREPL_INFO_1001;
-typedef struct _REPL_INFO_1002 { DWORD rp1002_guardtime; } REPL_INFO_1002,*PREPL_INFO_1002,*LPREPL_INFO_1002;
-typedef struct _REPL_INFO_1003 { DWORD rp1003_random; } REPL_INFO_1003,*PREPL_INFO_1003,*LPREPL_INFO_1003;
-
-NET_API_STATUS WINAPI NetReplGetInfo(LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetReplSetInfo(LPCWSTR,DWORD,PBYTE,PDWORD);
-typedef struct _REPL_EDIR_INFO_0 {
-	LPWSTR rped0_dirname;
-} REPL_EDIR_INFO_0,*PREPL_EDIR_INFO_0,*LPREPL_EDIR_INFO_0;
-typedef struct _REPL_EDIR_INFO_1 {
-	LPWSTR rped1_dirname;
-	DWORD rped1_integrity;
-	DWORD rped1_extent;
-} REPL_EDIR_INFO_1,*PREPL_EDIR_INFO_1,*LPREPL_EDIR_INFO_1;
-typedef struct _REPL_EDIR_INFO_2 {
-	LPWSTR rped2_dirname;
-	DWORD rped2_integrity;
-	DWORD rped2_extent;
-	DWORD rped2_lockcount;
-	DWORD rped2_locktime;
-} REPL_EDIR_INFO_2,*PREPL_EDIR_INFO_2,*LPREPL_EDIR_INFO_2;
-typedef struct _REPL_EDIR_INFO_1000 {
-	DWORD rped1000_integrity;
-} REPL_EDIR_INFO_1000,*PREPL_EDIR_INFO_1000,*LPREPL_EDIR_INFO_1000;
-typedef struct _REPL_EDIR_INFO_1001 {
-	DWORD rped1001_extent;
-} REPL_EDIR_INFO_1001,*PREPL_EDIR_INFO_1001,*LPREPL_EDIR_INFO_1001;
-typedef struct _REPL_IDIR_INFO_0 { LPWSTR rpid0_dirname; } REPL_IDIR_INFO_0,*PREPL_IDIR_INFO_0,*LPREPL_IDIR_INFO_0;
-typedef struct _REPL_IDIR_INFO_1 {
-	LPWSTR rpid1_dirname;
-	DWORD rpid1_state;
-	LPWSTR rpid1_mastername;
-	DWORD rpid1_last_update_time;
-	DWORD rpid1_lockcount;
-	DWORD rpid1_locktime;
-} REPL_IDIR_INFO_1,*PREPL_IDIR_INFO_1,*LPREPL_IDIR_INFO_1;
-NET_API_STATUS WINAPI NetReplExportDirAdd(LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetReplExportDirDel(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetReplExportDirEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetReplExportDirGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetReplExportDirSetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetReplExportDirLock(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetReplExportDirUnlock(LPCWSTR,LPCWSTR,DWORD);
-NET_API_STATUS WINAPI NetReplImportDirAdd(LPCWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetReplImportDirDel(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetReplImportDirEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetReplImportDirGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetReplImportDirLock(LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetReplImportDirUnlock(LPCWSTR,LPCWSTR,DWORD);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmserver.h b/winsup/w32api/include/lmserver.h
deleted file mode 100644
index 711971430..000000000
--- a/winsup/w32api/include/lmserver.h
+++ /dev/null
@@ -1,606 +0,0 @@
-#ifndef _LMSERVER_H
-#define _LMSERVER_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <winsvc.h>
-#include <lmcons.h>
-typedef struct _SERVER_INFO_100 {
-DWORD	sv100_platform_id;
-LPWSTR	sv100_name;
-} SERVER_INFO_100,*PSERVER_INFO_100,*LPSERVER_INFO_100;
-typedef struct _SERVER_INFO_101 {
-DWORD	sv101_platform_id;
-LPWSTR	sv101_name;
-DWORD	sv101_version_major;
-DWORD	sv101_version_minor;
-DWORD	sv101_type;
-LPWSTR	sv101_comment;
-} SERVER_INFO_101,*PSERVER_INFO_101,*LPSERVER_INFO_101;
-typedef struct _SERVER_INFO_102 {
-DWORD	sv102_platform_id;
-LPWSTR	sv102_name;
-DWORD	sv102_version_major;
-DWORD	sv102_version_minor;
-DWORD	sv102_type;
-LPWSTR	sv102_comment;
-DWORD	sv102_users;
-LONG	sv102_disc;
-BOOL	sv102_hidden;
-DWORD	sv102_announce;
-DWORD	sv102_anndelta;
-DWORD	sv102_licenses;
-LPWSTR	sv102_userpath;
-} SERVER_INFO_102,*PSERVER_INFO_102,*LPSERVER_INFO_102;
-typedef struct _SERVER_INFO_402 {
-DWORD	sv402_ulist_mtime;
-DWORD	sv402_glist_mtime;
-DWORD	sv402_alist_mtime;
-LPWSTR	sv402_alerts;
-DWORD	sv402_security;
-DWORD	sv402_numadmin;
-DWORD	sv402_lanmask;
-LPWSTR	sv402_guestacct;
-DWORD	sv402_chdevs;
-DWORD	sv402_chdevq;
-DWORD	sv402_chdevjobs;
-DWORD	sv402_connections;
-DWORD	sv402_shares;
-DWORD	sv402_openfiles;
-DWORD	sv402_sessopens;
-DWORD	sv402_sessvcs;
-DWORD	sv402_sessreqs;
-DWORD	sv402_opensearch;
-DWORD	sv402_activelocks;
-DWORD	sv402_numreqbuf;
-DWORD	sv402_sizreqbuf;
-DWORD	sv402_numbigbuf;
-DWORD	sv402_numfiletasks;
-DWORD	sv402_alertsched;
-DWORD	sv402_erroralert;
-DWORD	sv402_logonalert;
-DWORD	sv402_accessalert;
-DWORD	sv402_diskalert;
-DWORD	sv402_netioalert;
-DWORD	sv402_maxauditsz;
-LPWSTR	sv402_srvheuristics;
-} SERVER_INFO_402,*PSERVER_INFO_402,*LPSERVER_INFO_402;
-typedef struct _SERVER_INFO_403 {
-DWORD	sv403_ulist_mtime;
-DWORD	sv403_glist_mtime;
-DWORD	sv403_alist_mtime;
-LPWSTR	sv403_alerts;
-DWORD	sv403_security;
-DWORD	sv403_numadmin;
-DWORD	sv403_lanmask;
-LPWSTR	sv403_guestacct;
-DWORD	sv403_chdevs;
-DWORD	sv403_chdevq;
-DWORD	sv403_chdevjobs;
-DWORD	sv403_connections;
-DWORD	sv403_shares;
-DWORD	sv403_openfiles;
-DWORD	sv403_sessopens;
-DWORD	sv403_sessvcs;
-DWORD	sv403_sessreqs;
-DWORD	sv403_opensearch;
-DWORD	sv403_activelocks;
-DWORD	sv403_numreqbuf;
-DWORD	sv403_sizreqbuf;
-DWORD	sv403_numbigbuf;
-DWORD	sv403_numfiletasks;
-DWORD	sv403_alertsched;
-DWORD	sv403_erroralert;
-DWORD	sv403_logonalert;
-DWORD	sv403_accessalert;
-DWORD	sv403_diskalert;
-DWORD	sv403_netioalert;
-DWORD	sv403_maxauditsz;
-LPWSTR	sv403_srvheuristics;
-DWORD	sv403_auditedevents;
-DWORD	sv403_autoprofile;
-LPWSTR	sv403_autopath;
-} SERVER_INFO_403,*PSERVER_INFO_403,*LPSERVER_INFO_403;
-typedef struct _SERVER_INFO_502 {
-DWORD	sv502_sessopens;
-DWORD	sv502_sessvcs;
-DWORD	sv502_opensearch;
-DWORD	sv502_sizreqbuf;
-DWORD	sv502_initworkitems;
-DWORD	sv502_maxworkitems;
-DWORD	sv502_rawworkitems;
-DWORD	sv502_irpstacksize;
-DWORD	sv502_maxrawbuflen;
-DWORD	sv502_sessusers;
-DWORD	sv502_sessconns;
-DWORD	sv502_maxpagedmemoryusage;
-DWORD	sv502_maxnonpagedmemoryusage;
-BOOL	sv502_enablesoftcompat;
-BOOL	sv502_enableforcedlogoff;
-BOOL	sv502_timesource;
-BOOL	sv502_acceptdownlevelapis;
-BOOL	sv502_lmannounce;
-} SERVER_INFO_502,*PSERVER_INFO_502,*LPSERVER_INFO_502;
-typedef struct _SERVER_INFO_503 {
-DWORD	sv503_sessopens;
-DWORD	sv503_sessvcs;
-DWORD	sv503_opensearch;
-DWORD	sv503_sizreqbuf;
-DWORD	sv503_initworkitems;
-DWORD	sv503_maxworkitems;
-DWORD	sv503_rawworkitems;
-DWORD	sv503_irpstacksize;
-DWORD	sv503_maxrawbuflen;
-DWORD	sv503_sessusers;
-DWORD	sv503_sessconns;
-DWORD	sv503_maxpagedmemoryusage;
-DWORD	sv503_maxnonpagedmemoryusage;
-BOOL	sv503_enablesoftcompat;
-BOOL	sv503_enableforcedlogoff;
-BOOL	sv503_timesource;
-BOOL	sv503_acceptdownlevelapis;
-BOOL	sv503_lmannounce;
-LPWSTR	sv503_domain;
-DWORD	sv503_maxcopyreadlen;
-DWORD	sv503_maxcopywritelen;
-DWORD	sv503_minkeepsearch;
-DWORD	sv503_maxkeepsearch;
-DWORD	sv503_minkeepcomplsearch;
-DWORD	sv503_maxkeepcomplsearch;
-DWORD	sv503_threadcountadd;
-DWORD	sv503_numblockthreads;
-DWORD	sv503_scavtimeout;
-DWORD	sv503_minrcvqueue;
-DWORD	sv503_minfreeworkitems;
-DWORD	sv503_xactmemsize;
-DWORD	sv503_threadpriority;
-DWORD	sv503_maxmpxct;
-DWORD	sv503_oplockbreakwait;
-DWORD	sv503_oplockbreakresponsewait;
-BOOL	sv503_enableoplocks;
-BOOL	sv503_enableoplockforceclose;
-BOOL	sv503_enablefcbopens;
-BOOL	sv503_enableraw;
-BOOL	sv503_enablesharednetdrives;
-DWORD	sv503_minfreeconnections;
-DWORD	sv503_maxfreeconnections;
-} SERVER_INFO_503,*PSERVER_INFO_503,*LPSERVER_INFO_503;
-typedef struct _SERVER_INFO_599 {
-DWORD	sv599_sessopens;
-DWORD	sv599_sessvcs;
-DWORD	sv599_opensearch;
-DWORD	sv599_sizreqbuf;
-DWORD	sv599_initworkitems;
-DWORD	sv599_maxworkitems;
-DWORD	sv599_rawworkitems;
-DWORD	sv599_irpstacksize;
-DWORD	sv599_maxrawbuflen;
-DWORD	sv599_sessusers;
-DWORD	sv599_sessconns;
-DWORD	sv599_maxpagedmemoryusage;
-DWORD	sv599_maxnonpagedmemoryusage;
-BOOL	sv599_enablesoftcompat;
-BOOL	sv599_enableforcedlogoff;
-BOOL	sv599_timesource;
-BOOL	sv599_acceptdownlevelapis;
-BOOL	sv599_lmannounce;
-LPWSTR	sv599_domain;
-DWORD	sv599_maxcopyreadlen;
-DWORD	sv599_maxcopywritelen;
-DWORD	sv599_minkeepsearch;
-DWORD	sv599_maxkeepsearch;
-DWORD	sv599_minkeepcomplsearch;
-DWORD	sv599_maxkeepcomplsearch;
-DWORD	sv599_threadcountadd;
-DWORD	sv599_numblockthreads;
-DWORD	sv599_scavtimeout;
-DWORD	sv599_minrcvqueue;
-DWORD	sv599_minfreeworkitems;
-DWORD	sv599_xactmemsize;
-DWORD	sv599_threadpriority;
-DWORD	sv599_maxmpxct;
-DWORD	sv599_oplockbreakwait;
-DWORD	sv599_oplockbreakresponsewait;
-BOOL	sv599_enableoplocks;
-BOOL	sv599_enableoplockforceclose;
-BOOL	sv599_enablefcbopens;
-BOOL	sv599_enableraw;
-BOOL	sv599_enablesharednetdrives;
-DWORD	sv599_minfreeconnections;
-DWORD	sv599_maxfreeconnections;
-DWORD	sv599_initsesstable;
-DWORD	sv599_initconntable;
-DWORD	sv599_initfiletable;
-DWORD	sv599_initsearchtable;
-DWORD	sv599_alertschedule;
-DWORD	sv599_errorthreshold;
-DWORD	sv599_networkerrorthreshold;
-DWORD	sv599_diskspacethreshold;
-DWORD	sv599_reserved;
-DWORD	sv599_maxlinkdelay;
-DWORD	sv599_minlinkthroughput;
-DWORD	sv599_linkinfovalidtime;
-DWORD	sv599_scavqosinfoupdatetime;
-DWORD	sv599_maxworkitemidletime;
-} SERVER_INFO_599,*PSERVER_INFO_599,*LPSERVER_INFO_599;
-typedef struct _SERVER_INFO_598 {
-DWORD	sv598_maxrawworkitems;
-DWORD	sv598_maxthreadsperqueue;
-DWORD	sv598_producttype;
-DWORD	sv598_serversize;
-DWORD	sv598_connectionlessautodisc;
-DWORD	sv598_sharingviolationretries;
-DWORD	sv598_sharingviolationdelay;
-DWORD	sv598_maxglobalopensearch;
-DWORD	sv598_removeduplicatesearches;
-DWORD	sv598_lockviolationoffset;
-DWORD	sv598_lockviolationdelay;
-DWORD	sv598_mdlreadswitchover;
-DWORD	sv598_cachedopenlimit;
-DWORD	sv598_otherqueueaffinity;
-BOOL	sv598_restrictnullsessaccess;
-BOOL	sv598_enablewfw311directipx;
-DWORD	sv598_queuesamplesecs;
-DWORD	sv598_balancecount;
-DWORD	sv598_preferredaffinity;
-DWORD	sv598_maxfreerfcbs;
-DWORD	sv598_maxfreemfcbs;
-DWORD	sv598_maxfreelfcbs;
-DWORD	sv598_maxfreepagedpoolchunks;
-DWORD	sv598_minpagedpoolchunksize;
-DWORD	sv598_maxpagedpoolchunksize;
-BOOL	sv598_sendsfrompreferredprocessor;
-} SERVER_INFO_598,*PSERVER_INFO_598,*LPSERVER_INFO_598;
-typedef struct _SERVER_INFO_1005 {LPWSTR sv1005_comment; } SERVER_INFO_1005,*PSERVER_INFO_1005,*LPSERVER_INFO_1005;
-typedef struct _SERVER_INFO_1107 { DWORD sv1107_users; } SERVER_INFO_1107,*PSERVER_INFO_1107,*LPSERVER_INFO_1107;
-typedef struct _SERVER_INFO_1010 { LONG sv1010_disc; } SERVER_INFO_1010,*PSERVER_INFO_1010,*LPSERVER_INFO_1010;
-typedef struct _SERVER_INFO_1016 { BOOL sv1016_hidden; } SERVER_INFO_1016,*PSERVER_INFO_1016,*LPSERVER_INFO_1016;
-typedef struct _SERVER_INFO_1017 { DWORD sv1017_announce; } SERVER_INFO_1017,*PSERVER_INFO_1017,*LPSERVER_INFO_1017;
-typedef struct _SERVER_INFO_1018 { DWORD sv1018_anndelta; } SERVER_INFO_1018,*PSERVER_INFO_1018,*LPSERVER_INFO_1018;
-typedef struct _SERVER_INFO_1501 { DWORD sv1501_sessopens; } SERVER_INFO_1501,*PSERVER_INFO_1501,*LPSERVER_INFO_1501;
-typedef struct _SERVER_INFO_1502 { DWORD sv1502_sessvcs; } SERVER_INFO_1502,*PSERVER_INFO_1502,*LPSERVER_INFO_1502;
-typedef struct _SERVER_INFO_1503 { DWORD sv1503_opensearch; } SERVER_INFO_1503,*PSERVER_INFO_1503,*LPSERVER_INFO_1503;
-typedef struct _SERVER_INFO_1506 { DWORD sv1506_maxworkitems; } SERVER_INFO_1506,*PSERVER_INFO_1506,*LPSERVER_INFO_1506;
-typedef struct _SERVER_INFO_1509 { DWORD sv1509_maxrawbuflen; } SERVER_INFO_1509,*PSERVER_INFO_1509,*LPSERVER_INFO_1509;
-typedef struct _SERVER_INFO_1510 { DWORD sv1510_sessusers; } SERVER_INFO_1510,*PSERVER_INFO_1510,*LPSERVER_INFO_1510;
-typedef struct _SERVER_INFO_1511 { DWORD sv1511_sessconns; } SERVER_INFO_1511,*PSERVER_INFO_1511,*LPSERVER_INFO_1511;
-typedef struct _SERVER_INFO_1512 { DWORD sv1512_maxnonpagedmemoryusage; } SERVER_INFO_1512,*PSERVER_INFO_1512,*LPSERVER_INFO_1512;
-typedef struct _SERVER_INFO_1513 { DWORD sv1513_maxpagedmemoryusage; } SERVER_INFO_1513,*PSERVER_INFO_1513,*LPSERVER_INFO_1513;
-typedef struct _SERVER_INFO_1514 { BOOL sv1514_enablesoftcompat; } SERVER_INFO_1514,*PSERVER_INFO_1514,*LPSERVER_INFO_1514;
-typedef struct _SERVER_INFO_1515 { BOOL sv1515_enableforcedlogoff; } SERVER_INFO_1515,*PSERVER_INFO_1515,*LPSERVER_INFO_1515;
-typedef struct _SERVER_INFO_1516 { BOOL sv1516_timesource; } SERVER_INFO_1516,*PSERVER_INFO_1516,*LPSERVER_INFO_1516;
-typedef struct _SERVER_INFO_1518 { BOOL sv1518_lmannounce; } SERVER_INFO_1518,*PSERVER_INFO_1518,*LPSERVER_INFO_1518;
-typedef struct _SERVER_INFO_1520 { DWORD sv1520_maxcopyreadlen; } SERVER_INFO_1520,*PSERVER_INFO_1520,*LPSERVER_INFO_1520;
-typedef struct _SERVER_INFO_1521 { DWORD sv1521_maxcopywritelen; } SERVER_INFO_1521,*PSERVER_INFO_1521,*LPSERVER_INFO_1521;
-typedef struct _SERVER_INFO_1522 { DWORD sv1522_minkeepsearch; } SERVER_INFO_1522,*PSERVER_INFO_1522,*LPSERVER_INFO_1522;
-typedef struct _SERVER_INFO_1523 { DWORD sv1523_maxkeepsearch; } SERVER_INFO_1523,*PSERVER_INFO_1523,*LPSERVER_INFO_1523;
-typedef struct _SERVER_INFO_1524 { DWORD sv1524_minkeepcomplsearch; } SERVER_INFO_1524,*PSERVER_INFO_1524,*LPSERVER_INFO_1524;
-typedef struct _SERVER_INFO_1525 { DWORD sv1525_maxkeepcomplsearch; } SERVER_INFO_1525,*PSERVER_INFO_1525,*LPSERVER_INFO_1525;
-typedef struct _SERVER_INFO_1528 { DWORD sv1528_scavtimeout; } SERVER_INFO_1528,*PSERVER_INFO_1528,*LPSERVER_INFO_1528;
-typedef struct _SERVER_INFO_1529 { DWORD sv1529_minrcvqueue; } SERVER_INFO_1529,*PSERVER_INFO_1529,*LPSERVER_INFO_1529;
-typedef struct _SERVER_INFO_1530 { DWORD sv1530_minfreeworkitems; } SERVER_INFO_1530,*PSERVER_INFO_1530,*LPSERVER_INFO_1530;
-typedef struct _SERVER_INFO_1533 { DWORD sv1533_maxmpxct; } SERVER_INFO_1533,*PSERVER_INFO_1533,*LPSERVER_INFO_1533;
-typedef struct _SERVER_INFO_1534 { DWORD sv1534_oplockbreakwait; } SERVER_INFO_1534,*PSERVER_INFO_1534,*LPSERVER_INFO_1534;
-typedef struct _SERVER_INFO_1535 { DWORD sv1535_oplockbreakresponsewait; } SERVER_INFO_1535,*PSERVER_INFO_1535,*LPSERVER_INFO_1535;
-typedef struct _SERVER_INFO_1536 { BOOL sv1536_enableoplocks; } SERVER_INFO_1536,*PSERVER_INFO_1536,*LPSERVER_INFO_1536;
-typedef struct _SERVER_INFO_1537 { BOOL sv1537_enableoplockforceclose; } SERVER_INFO_1537,*PSERVER_INFO_1537,*LPSERVER_INFO_1537;
-typedef struct _SERVER_INFO_1538 { BOOL sv1538_enablefcbopens; } SERVER_INFO_1538,*PSERVER_INFO_1538,*LPSERVER_INFO_1538;
-typedef struct _SERVER_INFO_1539 { BOOL sv1539_enableraw; } SERVER_INFO_1539,*PSERVER_INFO_1539,*LPSERVER_INFO_1539;
-typedef struct _SERVER_INFO_1540 { BOOL sv1540_enablesharednetdrives; } SERVER_INFO_1540,*PSERVER_INFO_1540,*LPSERVER_INFO_1540;
-typedef struct _SERVER_INFO_1541 { BOOL sv1541_minfreeconnections; } SERVER_INFO_1541,*PSERVER_INFO_1541,*LPSERVER_INFO_1541;
-typedef struct _SERVER_INFO_1542 { BOOL sv1542_maxfreeconnections; } SERVER_INFO_1542,*PSERVER_INFO_1542,*LPSERVER_INFO_1542;
-typedef struct _SERVER_INFO_1543 { DWORD sv1543_initsesstable; } SERVER_INFO_1543,*PSERVER_INFO_1543,*LPSERVER_INFO_1543;
-typedef struct _SERVER_INFO_1544 { DWORD sv1544_initconntable; } SERVER_INFO_1544,*PSERVER_INFO_1544,*LPSERVER_INFO_1544;
-typedef struct _SERVER_INFO_1545 { DWORD sv1545_initfiletable; } SERVER_INFO_1545,*PSERVER_INFO_1545,*LPSERVER_INFO_1545;
-typedef struct _SERVER_INFO_1546 { DWORD sv1546_initsearchtable; } SERVER_INFO_1546,*PSERVER_INFO_1546,*LPSERVER_INFO_1546;
-typedef struct _SERVER_INFO_1547 { DWORD sv1547_alertschedule; } SERVER_INFO_1547,*PSERVER_INFO_1547,*LPSERVER_INFO_1547;
-typedef struct _SERVER_INFO_1548 { DWORD sv1548_errorthreshold; } SERVER_INFO_1548,*PSERVER_INFO_1548,*LPSERVER_INFO_1548;
-typedef struct _SERVER_INFO_1549 { DWORD sv1549_networkerrorthreshold; } SERVER_INFO_1549,*PSERVER_INFO_1549,*LPSERVER_INFO_1549;
-typedef struct _SERVER_INFO_1550 { DWORD sv1550_diskspacethreshold; } SERVER_INFO_1550,*PSERVER_INFO_1550,*LPSERVER_INFO_1550;
-typedef struct _SERVER_INFO_1552 { DWORD sv1552_maxlinkdelay; } SERVER_INFO_1552,*PSERVER_INFO_1552,*LPSERVER_INFO_1552;
-typedef struct _SERVER_INFO_1553 { DWORD sv1553_minlinkthroughput; } SERVER_INFO_1553,*PSERVER_INFO_1553,*LPSERVER_INFO_1553;
-typedef struct _SERVER_INFO_1554 { DWORD sv1554_linkinfovalidtime; } SERVER_INFO_1554,*PSERVER_INFO_1554,*LPSERVER_INFO_1554;
-typedef struct _SERVER_INFO_1555 { DWORD sv1555_scavqosinfoupdatetime; } SERVER_INFO_1555,*PSERVER_INFO_1555,*LPSERVER_INFO_1555;
-typedef struct _SERVER_INFO_1556 { DWORD sv1556_maxworkitemidletime; } SERVER_INFO_1556,*PSERVER_INFO_1556,*LPSERVER_INFO_1556;
-typedef struct _SERVER_INFO_1557 { DWORD sv1557_maxrawworkitems; } SERVER_INFO_1557,*PSERVER_INFO_1557,*LPSERVER_INFO_1557;
-typedef struct _SERVER_INFO_1560 { DWORD sv1560_producttype; } SERVER_INFO_1560,*PSERVER_INFO_1560,*LPSERVER_INFO_1560;
-typedef struct _SERVER_INFO_1561 { DWORD sv1561_serversize; } SERVER_INFO_1561,*PSERVER_INFO_1561,*LPSERVER_INFO_1561;
-typedef struct _SERVER_INFO_1562 { DWORD sv1562_connectionlessautodisc; } SERVER_INFO_1562,*PSERVER_INFO_1562,*LPSERVER_INFO_1562;
-typedef struct _SERVER_INFO_1563 { DWORD sv1563_sharingviolationretries; } SERVER_INFO_1563,*PSERVER_INFO_1563,*LPSERVER_INFO_1563;
-typedef struct _SERVER_INFO_1564 { DWORD sv1564_sharingviolationdelay; } SERVER_INFO_1564,*PSERVER_INFO_1564,*LPSERVER_INFO_1564;
-typedef struct _SERVER_INFO_1565 { DWORD sv1565_maxglobalopensearch; } SERVER_INFO_1565,*PSERVER_INFO_1565,*LPSERVER_INFO_1565;
-typedef struct _SERVER_INFO_1566 { BOOL sv1566_removeduplicatesearches; } SERVER_INFO_1566,*PSERVER_INFO_1566,*LPSERVER_INFO_1566;
-typedef struct _SERVER_INFO_1567 { DWORD sv1567_lockviolationretries; } SERVER_INFO_1567,*PSERVER_INFO_1567,*LPSERVER_INFO_1567;
-typedef struct _SERVER_INFO_1568 { DWORD sv1568_lockviolationoffset; } SERVER_INFO_1568,*PSERVER_INFO_1568,*LPSERVER_INFO_1568;
-typedef struct _SERVER_INFO_1569 { DWORD sv1569_lockviolationdelay; } SERVER_INFO_1569,*PSERVER_INFO_1569,*LPSERVER_INFO_1569;
-typedef struct _SERVER_INFO_1570 { DWORD sv1570_mdlreadswitchover; } SERVER_INFO_1570,*PSERVER_INFO_1570,*LPSERVER_INFO_1570;
-typedef struct _SERVER_INFO_1571 { DWORD sv1571_cachedopenlimit; } SERVER_INFO_1571,*PSERVER_INFO_1571,*LPSERVER_INFO_1571;
-typedef struct _SERVER_INFO_1572 { DWORD sv1572_criticalthreads; } SERVER_INFO_1572,*PSERVER_INFO_1572,*LPSERVER_INFO_1572;
-typedef struct _SERVER_INFO_1573 { DWORD sv1573_restrictnullsessaccess; } SERVER_INFO_1573,*PSERVER_INFO_1573,*LPSERVER_INFO_1573;
-typedef struct _SERVER_INFO_1574 { DWORD sv1574_enablewfw311directipx;} SERVER_INFO_1574,*PSERVER_INFO_1574,*LPSERVER_INFO_1574;
-typedef struct _SERVER_INFO_1575 { DWORD sv1575_otherqueueaffinity; } SERVER_INFO_1575,*PSERVER_INFO_1575,*LPSERVER_INFO_1575;
-typedef struct _SERVER_INFO_1576 { DWORD sv1576_queuesamplesecs; } SERVER_INFO_1576,*PSERVER_INFO_1576,*LPSERVER_INFO_1576;
-typedef struct _SERVER_INFO_1577 { DWORD sv1577_balancecount; } SERVER_INFO_1577,*PSERVER_INFO_1577,*LPSERVER_INFO_1577;
-typedef struct _SERVER_INFO_1578 { DWORD sv1578_preferredaffinity; } SERVER_INFO_1578,*PSERVER_INFO_1578,*LPSERVER_INFO_1578;
-typedef struct _SERVER_INFO_1579 { DWORD sv1579_maxfreerfcbs; } SERVER_INFO_1579,*PSERVER_INFO_1579,*LPSERVER_INFO_1579;
-typedef struct _SERVER_INFO_1580 { DWORD sv1580_maxfreemfcbs; } SERVER_INFO_1580,*PSERVER_INFO_1580,*LPSERVER_INFO_1580;
-typedef struct _SERVER_INFO_1581 { DWORD sv1581_maxfreemlcbs; } SERVER_INFO_1581,*PSERVER_INFO_1581,*LPSERVER_INFO_1581;
-typedef struct _SERVER_INFO_1582 { DWORD sv1582_maxfreepagedpoolchunks; } SERVER_INFO_1582,*PSERVER_INFO_1582,*LPSERVER_INFO_1582;
-typedef struct _SERVER_INFO_1583 { DWORD sv1583_minpagedpoolchunksize; } SERVER_INFO_1583,*PSERVER_INFO_1583,*LPSERVER_INFO_1583;
-typedef struct _SERVER_INFO_1584 { DWORD sv1584_maxpagedpoolchunksize; } SERVER_INFO_1584,*PSERVER_INFO_1584,*LPSERVER_INFO_1584;
-typedef struct _SERVER_INFO_1585 { BOOL sv1585_sendsfrompreferredprocessor; } SERVER_INFO_1585,*PSERVER_INFO_1585,*LPSERVER_INFO_1585;
-typedef struct _SERVER_INFO_1586 { BOOL sv1586_maxthreadsperqueue; } SERVER_INFO_1586,*PSERVER_INFO_1586,*LPSERVER_INFO_1586;
-typedef struct _SERVER_TRANSPORT_INFO_0 {
-DWORD svti0_numberofvcs;
-LPWSTR	svti0_transportname;
-PBYTE	svti0_transportaddress;
-DWORD	svti0_transportaddresslength;
-LPWSTR	svti0_networkaddress;
-} SERVER_TRANSPORT_INFO_0,*PSERVER_TRANSPORT_INFO_0,*LPSERVER_TRANSPORT_INFO_0;
-
-NET_API_STATUS WINAPI NetServerEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,PDWORD);
-NET_API_STATUS WINAPI NetServerEnumEx(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,DWORD,LPCWSTR,LPCWSTR);
-NET_API_STATUS WINAPI NetServerGetInfo(LPWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetServerSetInfo(LPWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS NetServerSetInfoCommandLine(WORD,LPWSTR*);
-NET_API_STATUS WINAPI NetServerDiskEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetServerComputerNameAdd(LPWSTR,LPWSTR,LPWSTR);
-NET_API_STATUS WINAPI NetServerComputerNameDel(LPWSTR,LPWSTR);
-NET_API_STATUS WINAPI NetServerTransportAdd(LPWSTR,DWORD,PBYTE);
-NET_API_STATUS WINAPI NetServerTransportAddEx(LPWSTR,DWORD,PBYTE);
-NET_API_STATUS WINAPI NetServerTransportDel(LPWSTR,DWORD,PBYTE);
-NET_API_STATUS WINAPI NetServerTransportEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-BOOL SetServiceBits(SERVICE_STATUS_HANDLE,DWORD,BOOL,BOOL);
-
-#define SVI1_NUM_ELEMENTS	5
-#define SVI2_NUM_ELEMENTS	40
-#define SVI3_NUM_ELEMENTS	44
-#define SV_MAX_CMD_LEN	PATHLEN
-#define SW_AUTOPROF_LOAD_MASK 1
-#define SW_AUTOPROF_SAVE_MASK 2
-#define SV_MAX_SRV_HEUR_LEN	32	
-#define SV_USERS_PER_LICENSE	5
-#define SV_PLATFORM_ID_OS2 400
-#define SV_PLATFORM_ID_NT 500
-#define MAJOR_VERSION_MASK 15
-#define SV_TYPE_WORKSTATION	1
-#define SV_TYPE_SERVER 2
-#define SV_TYPE_SQLSERVER 4
-#define SV_TYPE_DOMAIN_CTRL 8
-#define SV_TYPE_DOMAIN_BAKCTRL 16
-#define SV_TYPE_TIME_SOURCE 32
-#define SV_TYPE_AFP 64
-#define SV_TYPE_NOVELL 128
-#define SV_TYPE_DOMAIN_MEMBER 256
-#define SV_TYPE_PRINTQ_SERVER 512
-#define SV_TYPE_DIALIN_SERVER 1024
-#define SV_TYPE_XENIX_SERVER 2048
-#define SV_TYPE_SERVER_UNIX	SV_TYPE_XENIX_SERVER
-#define SV_TYPE_NT 4096
-#define SV_TYPE_WFW 8192
-#define SV_TYPE_SERVER_MFPN 16384
-#define SV_TYPE_SERVER_NT 32768
-#define SV_TYPE_POTENTIAL_BROWSER 65536
-#define SV_TYPE_BACKUP_BROWSER	0x20000
-#define SV_TYPE_MASTER_BROWSER	0x40000
-#define SV_TYPE_DOMAIN_MASTER	0x80000
-#define SV_TYPE_SERVER_OSF	0x100000
-#define SV_TYPE_SERVER_VMS	0x200000
-#define SV_TYPE_WINDOWS	0x400000 
-#define SV_TYPE_ALTERNATE_XPORT	0x20000000 
-#define SV_TYPE_LOCAL_LIST_ONLY	0x40000000 
-#define SV_TYPE_DOMAIN_ENUM	0x80000000
-#define SV_TYPE_ALL	0xFFFFFFFF 
-#define SV_NODISC	(-1) 
-#define SV_USERSECURITY	1
-#define SV_SHARESECURITY	0
-#define SV_HIDDEN	1
-#define SV_VISIBLE	0
-#define SV_PLATFORM_ID_PARMNUM	101
-#define SV_NAME_PARMNUM	102
-#define SV_VERSION_MAJOR_PARMNUM	103
-#define SV_VERSION_MINOR_PARMNUM	104
-#define SV_TYPE_PARMNUM	105
-#define SV_COMMENT_PARMNUM	5
-#define SV_USERS_PARMNUM	107
-#define SV_DISC_PARMNUM	10
-#define SV_HIDDEN_PARMNUM	16
-#define SV_ANNOUNCE_PARMNUM	17
-#define SV_ANNDELTA_PARMNUM	18
-#define SV_USERPATH_PARMNUM	112
-#define SV_ULIST_MTIME_PARMNUM	401
-#define SV_GLIST_MTIME_PARMNUM	402
-#define SV_ALIST_MTIME_PARMNUM	403
-#define SV_ALERTS_PARMNUM	11
-#define SV_SECURITY_PARMNUM	405
-#define SV_NUMADMIN_PARMNUM	406
-#define SV_LANMASK_PARMNUM	407
-#define SV_GUESTACC_PARMNUM	408
-#define SV_CHDEVQ_PARMNUM	410
-#define SV_CHDEVJOBS_PARMNUM	411
-#define SV_CONNECTIONS_PARMNUM	412
-#define SV_SHARES_PARMNUM	413
-#define SV_OPENFILES_PARMNUM	414
-#define SV_SESSREQS_PARMNUM	417
-#define SV_ACTIVELOCKS_PARMNUM	419
-#define SV_NUMREQBUF_PARMNUM	420
-#define SV_NUMBIGBUF_PARMNUM	422
-#define SV_NUMFILETASKS_PARMNUM	423
-#define SV_ALERTSCHED_PARMNUM	37
-#define SV_ERRORALERT_PARMNUM	38
-#define SV_LOGONALERT_PARMNUM	39
-#define SV_ACCESSALERT_PARMNUM	40
-#define SV_DISKALERT_PARMNUM	41
-#define SV_NETIOALERT_PARMNUM	42
-#define SV_MAXAUDITSZ_PARMNUM	43
-#define SV_SRVHEURISTICS_PARMNUM	431
-#define SV_SESSOPENS_PARMNUM	501
-#define SV_SESSVCS_PARMNUM	502
-#define SV_OPENSEARCH_PARMNUM	503
-#define SV_SIZREQBUF_PARMNUM	504
-#define SV_INITWORKITEMS_PARMNUM	505
-#define SV_MAXWORKITEMS_PARMNUM	506
-#define SV_RAWWORKITEMS_PARMNUM	507
-#define SV_IRPSTACKSIZE_PARMNUM	508
-#define SV_MAXRAWBUFLEN_PARMNUM	509
-#define SV_SESSUSERS_PARMNUM	510
-#define SV_SESSCONNS_PARMNUM	511
-#define SV_MAXNONPAGEDMEMORYUSAGE_PARMNUM 512
-#define SV_MAXPAGEDMEMORYUSAGE_PARMNUM	513
-#define SV_ENABLESOFTCOMPAT_PARMNUM	514
-#define SV_ENABLEFORCEDLOGOFF_PARMNUM	515
-#define SV_TIMESOURCE_PARMNUM	516
-#define SV_ACCEPTDOWNLEVELAPIS_PARMNUM	517
-#define SV_LMANNOUNCE_PARMNUM	518
-#define SV_DOMAIN_PARMNUM	519
-#define SV_MAXCOPYREADLEN_PARMNUM	520
-#define SV_MAXCOPYWRITELEN_PARMNUM	521
-#define SV_MINKEEPSEARCH_PARMNUM	522
-#define SV_MAXKEEPSEARCH_PARMNUM	523
-#define SV_MINKEEPCOMPLSEARCH_PARMNUM	524
-#define SV_MAXKEEPCOMPLSEARCH_PARMNUM	525
-#define SV_THREADCOUNTADD_PARMNUM	526
-#define SV_NUMBLOCKTHREADS_PARMNUM	527
-#define SV_SCAVTIMEOUT_PARMNUM	528
-#define SV_MINRCVQUEUE_PARMNUM	529
-#define SV_MINFREEWORKITEMS_PARMNUM	530
-#define SV_XACTMEMSIZE_PARMNUM	531
-#define SV_THREADPRIORITY_PARMNUM	532
-#define SV_MAXMPXCT_PARMNUM	533
-#define SV_OPLOCKBREAKWAIT_PARMNUM	534
-#define SV_OPLOCKBREAKRESPONSEWAIT_PARMNUM 535
-#define SV_ENABLEOPLOCKS_PARMNUM	536
-#define SV_ENABLEOPLOCKFORCECLOSE_PARMNUM 537
-#define SV_ENABLEFCBOPENS_PARMNUM	538
-#define SV_ENABLERAW_PARMNUM	539
-#define SV_ENABLESHAREDNETDRIVES_PARMNUM	540
-#define SV_MINFREECONNECTIONS_PARMNUM	541
-#define SV_MAXFREECONNECTIONS_PARMNUM	542
-#define SV_INITSESSTABLE_PARMNUM	543
-#define SV_INITCONNTABLE_PARMNUM	544
-#define SV_INITFILETABLE_PARMNUM	545
-#define SV_INITSEARCHTABLE_PARMNUM	546
-#define SV_ALERTSCHEDULE_PARMNUM	547
-#define SV_ERRORTHRESHOLD_PARMNUM	548
-#define SV_NETWORKERRORTHRESHOLD_PARMNUM	549
-#define SV_DISKSPACETHRESHOLD_PARMNUM	550
-#define SV_MAXLINKDELAY_PARMNUM	552
-#define SV_MINLINKTHROUGHPUT_PARMNUM	553
-#define SV_LINKINFOVALIDTIME_PARMNUM	554
-#define SV_SCAVQOSINFOUPDATETIME_PARMNUM	555
-#define SV_MAXWORKITEMIDLETIME_PARMNUM	556
-#define SV_MAXRAWWORKITEMS_PARMNUM	557
-#define SV_PRODUCTTYPE_PARMNUM	560
-#define SV_SERVERSIZE_PARMNUM	561
-#define SV_CONNECTIONLESSAUTODISC_PARMNUM 562
-#define SV_SHARINGVIOLATIONRETRIES_PARMNUM 563
-#define SV_SHARINGVIOLATIONDELAY_PARMNUM	564
-#define SV_MAXGLOBALOPENSEARCH_PARMNUM	565
-#define SV_REMOVEDUPLICATESEARCHES_PARMNUM 566
-#define SV_LOCKVIOLATIONRETRIES_PARMNUM	567
-#define SV_LOCKVIOLATIONOFFSET_PARMNUM	568
-#define SV_LOCKVIOLATIONDELAY_PARMNUM	569
-#define SV_MDLREADSWITCHOVER_PARMNUM	570
-#define SV_CACHEDOPENLIMIT_PARMNUM	571
-#define SV_CRITICALTHREADS_PARMNUM	572
-#define SV_RESTRICTNULLSESSACCESS_PARMNUM 573
-#define SV_ENABLEWFW311DIRECTIPX_PARMNUM	574
-#define SV_OTHERQUEUEAFFINITY_PARMNUM	575
-#define SV_QUEUESAMPLESECS_PARMNUM	576
-#define SV_BALANCECOUNT_PARMNUM	577
-#define SV_PREFERREDAFFINITY_PARMNUM	578
-#define SV_MAXFREERFCBS_PARMNUM	579
-#define SV_MAXFREEMFCBS_PARMNUM	580
-#define SV_MAXFREELFCBS_PARMNUM	581
-#define SV_MAXFREEPAGEDPOOLCHUNKS_PARMNUM 582
-#define SV_MINPAGEDPOOLCHUNKSIZE_PARMNUM	583
-#define SV_MAXPAGEDPOOLCHUNKSIZE_PARMNUM	584
-#define SV_SENDSFROMPREFERREDPROCESSOR_PARMNUM	585
-#define SV_MAXTHREADSPERQUEUE_PARMNUM	586
-#define SV_COMMENT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_COMMENT_PARMNUM)
-#define SV_USERS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_USERS_PARMNUM)
-#define SV_DISC_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_DISC_PARMNUM)
-#define SV_HIDDEN_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_HIDDEN_PARMNUM)
-#define SV_ANNOUNCE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_ANNOUNCE_PARMNUM)
-#define SV_ANNDELTA_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_ANNDELTA_PARMNUM)
-#define SV_SESSOPENS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_SESSOPENS_PARMNUM)
-#define SV_SESSVCS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_SESSVCS_PARMNUM)
-#define SV_OPENSEARCH_INFOLEVEL	(PARMNUM_BASE_INFOLEVEL+SV_OPENSEARCH_PARMNUM)
-#define SV_MAXWORKITEMS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXWORKITEMS_PARMNUM)
-#define SV_MAXRAWBUFLEN_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXRAWBUFLEN_PARMNUM)
-#define SV_SESSUSERS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_SESSUSERS_PARMNUM)
-#define SV_SESSCONNS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_SESSCONNS_PARMNUM)
-#define SV_MAXNONPAGEDMEMORYUSAGE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXNONPAGEDMEMORYUSAGE_PARMNUM)
-#define SV_MAXPAGEDMEMORYUSAGE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXPAGEDMEMORYUSAGE_PARMNUM)
-#define SV_ENABLESOFTCOMPAT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_ENABLESOFTCOMPAT_PARMNUM)
-#define SV_ENABLEFORCEDLOGOFF_INFOLEVEL	(PARMNUM_BASE_INFOLEVEL+SV_ENABLEFORCEDLOGOFF_PARMNUM)
-#define SV_TIMESOURCE_INFOLEVEL	(PARMNUM_BASE_INFOLEVEL+SV_TIMESOURCE_PARMNUM)
-#define SV_LMANNOUNCE_INFOLEVEL	(PARMNUM_BASE_INFOLEVEL+SV_LMANNOUNCE_PARMNUM)
-#define SV_MAXCOPYREADLEN_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXCOPYREADLEN_PARMNUM)
-#define SV_MAXCOPYWRITELEN_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXCOPYWRITELEN_PARMNUM)
-#define SV_MINKEEPSEARCH_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MINKEEPSEARCH_PARMNUM)
-#define SV_MAXKEEPSEARCH_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXKEEPSEARCH_PARMNUM)
-#define SV_MINKEEPCOMPLSEARCH_INFOLEVEL	(PARMNUM_BASE_INFOLEVEL+SV_MINKEEPCOMPLSEARCH_PARMNUM)
-#define SV_MAXKEEPCOMPLSEARCH_INFOLEVEL	(PARMNUM_BASE_INFOLEVEL+SV_MAXKEEPCOMPLSEARCH_PARMNUM)
-#define SV_SCAVTIMEOUT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_SCAVTIMEOUT_PARMNUM)
-#define SV_MINRCVQUEUE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MINRCVQUEUE_PARMNUM)
-#define SV_MINFREEWORKITEMS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MINFREEWORKITEMS_PARMNUM)
-#define SV_MAXMPXCT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXMPXCT_PARMNUM)
-#define SV_OPLOCKBREAKWAIT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_OPLOCKBREAKWAIT_PARMNUM)
-#define SV_OPLOCKBREAKRESPONSEWAIT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_OPLOCKBREAKRESPONSEWAIT_PARMNUM)
-#define SV_ENABLEOPLOCKS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_ENABLEOPLOCKS_PARMNUM)
-#define SV_ENABLEOPLOCKFORCECLOSE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_ENABLEOPLOCKFORCECLOSE_PARMNUM)
-#define SV_ENABLEFCBOPENS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_ENABLEFCBOPENS_PARMNUM)
-#define SV_ENABLERAW_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_ENABLERAW_PARMNUM)
-#define SV_ENABLESHAREDNETDRIVES_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_ENABLESHAREDNETDRIVES_PARMNUM)
-#define SV_MINFREECONNECTIONS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MINFREECONNECTIONS_PARMNUM)
-#define SV_MAXFREECONNECTIONS_INFOLEVEL	(PARMNUM_BASE_INFOLEVEL+SV_MAXFREECONNECTIONS_PARMNUM)
-#define SV_INITSESSTABLE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_INITSESSTABLE_PARMNUM)
-#define SV_INITCONNTABLE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_INITCONNTABLE_PARMNUM)
-#define SV_INITFILETABLE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_INITFILETABLE_PARMNUM)
-#define SV_INITSEARCHTABLE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_INITSEARCHTABLE_PARMNUM)
-#define SV_ALERTSCHEDULE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_ALERTSCHEDULE_PARMNUM)
-#define SV_ERRORTHRESHOLD_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_ERRORTHRESHOLD_PARMNUM)
-#define SV_NETWORKERRORTHRESHOLD_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_NETWORKERRORTHRESHOLD_PARMNUM)
-#define SV_DISKSPACETHRESHOLD_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_DISKSPACETHRESHOLD_PARMNUM)
-#define SV_MAXLINKDELAY_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXLINKDELAY_PARMNUM)
-#define SV_MINLINKTHROUGHPUT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MINLINKTHROUGHPUT_PARMNUM)
-#define SV_LINKINFOVALIDTIME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_LINKINFOVALIDTIME_PARMNUM)
-#define SV_SCAVQOSINFOUPDATETIME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_SCAVQOSINFOUPDATETIME_PARMNUM)
-#define SV_MAXWORKITEMIDLETIME_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXWORKITEMIDLETIME_PARMNUM)
-#define SV_MAXRAWWORKITEMS_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXRAWWORKITEMS_PARMNUM)
-#define SV_PRODUCTTYPE_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_PRODUCTTYPE_PARMNUM)
-#define SV_SERVERSIZE_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_SERVERSIZE_PARMNUM)
-#define SV_CONNECTIONLESSAUTODISC_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_CONNECTIONLESSAUTODISC_PARMNUM)
-#define SV_SHARINGVIOLATIONRETRIES_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_SHARINGVIOLATIONRETRIES_PARMNUM)
-#define SV_SHARINGVIOLATIONDELAY_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_SHARINGVIOLATIONDELAY_PARMNUM)
-#define SV_MAXGLOBALOPENSEARCH_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXGLOBALOPENSEARCH_PARMNUM)
-#define SV_REMOVEDUPLICATESEARCHES_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_REMOVEDUPLICATESEARCHES_PARMNUM)
-#define SV_LOCKVIOLATIONRETRIES_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_LOCKVIOLATIONRETRIES_PARMNUM)
-#define SV_LOCKVIOLATIONOFFSET_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_LOCKVIOLATIONOFFSET_PARMNUM)
-#define SV_LOCKVIOLATIONDELAY_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_LOCKVIOLATIONDELAY_PARMNUM)
-#define SV_MDLREADSWITCHOVER_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_MDLREADSWITCHOVER_PARMNUM)
-#define SV_CACHEDOPENLIMIT_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_CACHEDOPENLIMIT_PARMNUM)
-#define SV_CRITICALTHREADS_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_CRITICALTHREADS_PARMNUM)
-#define SV_RESTRICTNULLSESSACCESS_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_RESTRICTNULLSESSACCESS_PARMNUM)
-#define SV_ENABLEWFW311DIRECTIPX_INFOLOEVEL (PARMNUM_BASE_INFOLEVEL+SV_ENABLEWFW311DIRECTIPX_PARMNUM)
-#define SV_OTHERQUEUEAFFINITY_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_OTHERQUEUEAFFINITY_PARMNUM)
-#define SV_QUEUESAMPLESECS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_QUEUESAMPLESECS_PARMNUM)
-#define SV_BALANCECOUNT_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_BALANCECOUNT_PARMNUM)
-#define SV_PREFERREDAFFINITY_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_PREFERREDAFFINITY_PARMNUM)
-#define SV_MAXFREERFCBS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXFREERFCBS_PARMNUM)
-#define SV_MAXFREEMFCBS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXFREEMFCBS_PARMNUM)
-#define SV_MAXFREELFCBS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXFREELFCBS_PARMNUM)
-#define SV_MAXFREEPAGEDPOOLCHUNKS_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXFREEPAGEDPOOLCHUNKS_PARMNUM)
-#define SV_MINPAGEDPOOLCHUNKSIZE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MINPAGEDPOOLCHUNKSIZE_PARMNUM)
-#define SV_MAXPAGEDPOOLCHUNKSIZE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXPAGEDPOOLCHUNKSIZE_PARMNUM)
-#define SV_SENDSFROMPREFERREDPROCESSOR_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_SENDSFROMPREFERREDPROCESSOR_PARMNUM)
-#define SV_MAXTHREADSPERQUEUE_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SV_MAXTHREADSPERQUEUE_PARMNUM)
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmshare.h b/winsup/w32api/include/lmshare.h
deleted file mode 100644
index 07fe9270b..000000000
--- a/winsup/w32api/include/lmshare.h
+++ /dev/null
@@ -1,147 +0,0 @@
-#ifndef _LMSHARE_H
-#define _LMSHARE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <lmcons.h> 
-#define SHARE_NETNAME_PARMNUM 1
-#define SHARE_TYPE_PARMNUM 3
-#define SHARE_REMARK_PARMNUM 4
-#define SHARE_PERMISSIONS_PARMNUM 5
-#define SHARE_MAX_USES_PARMNUM 6
-#define SHARE_CURRENT_USES_PARMNUM 7
-#define SHARE_PATH_PARMNUM 8
-#define SHARE_PASSWD_PARMNUM 9
-#define SHARE_FILE_SD_PARMNUM 501
-#define SHARE_REMARK_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SHARE_REMARK_PARMNUM)
-#define SHARE_MAX_USES_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SHARE_MAX_USES_PARMNUM)
-#define SHARE_FILE_SD_INFOLEVEL (PARMNUM_BASE_INFOLEVEL+SHARE_FILE_SD_PARMNUM)
-#define SHI1_NUM_ELEMENTS 4
-#define SHI2_NUM_ELEMENTS 10
-#define STYPE_DISKTREE 0
-#define STYPE_PRINTQ 1
-#define STYPE_DEVICE 2
-#define STYPE_IPC 3
-#define STYPE_DFS 100
-#define STYPE_SPECIAL 0x80000000
-#define SHI_USES_UNLIMITED (DWORD)(-1)
-#define SESS_GUEST 1
-#define SESS_NOENCRYPTION 2
-#define SESI1_NUM_ELEMENTS 8
-#define SESI2_NUM_ELEMENTS 9
-#define PERM_FILE_READ 1
-#define PERM_FILE_WRITE 2
-#define PERM_FILE_CREATE 4
-typedef struct _FILE_INFO_2 { DWORD fi2_id;} FILE_INFO_2,*PFILE_INFO_2,*LPFILE_INFO_2;
-typedef struct _FILE_INFO_3 {
-	DWORD fi3_id;
-	DWORD fi3_permissions;
-	DWORD fi3_num_locks;
-	LPTSTR fi3_pathname;
-	LPTSTR fi3_username;
-} FILE_INFO_3,*PFILE_INFO_3,*LPFILE_INFO_3;
-typedef struct _SHARE_INFO_0 { LPTSTR shi0_netname; } SHARE_INFO_0,*PSHARE_INFO_0,*LPSHARE_INFO_0;
-typedef struct _SHARE_INFO_1 {
-	LPTSTR shi1_netname;
-	DWORD shi1_type;
-	LPTSTR shi1_remark;
-} SHARE_INFO_1,*PSHARE_INFO_1,*LPSHARE_INFO_1;
-typedef struct _SHARE_INFO_2 {
-	LPTSTR shi2_netname;
-	DWORD shi2_type;
-	LPTSTR shi2_remark;
-	DWORD shi2_permissions;
-	DWORD shi2_max_uses;
-	DWORD shi2_current_uses;
-	LPTSTR shi2_path;
-	LPTSTR shi2_passwd;
-} SHARE_INFO_2,*PSHARE_INFO_2,*LPSHARE_INFO_2;
-typedef struct _SHARE_INFO_502 {
-	LPTSTR shi502_netname;
-	DWORD shi502_type;
-	LPTSTR shi502_remark;
-	DWORD shi502_permissions;
-	DWORD shi502_max_uses;
-	DWORD shi502_current_uses;
-	LPTSTR shi502_path;
-	LPTSTR shi502_passwd;
-	DWORD shi502_reserved;
-	PSECURITY_DESCRIPTOR shi502_security_descriptor;
-} SHARE_INFO_502,*PSHARE_INFO_502,*LPSHARE_INFO_502;
-typedef struct _SHARE_INFO_1004 {
-	LPTSTR shi1004_remark;
-} SHARE_INFO_1004,*PSHARE_INFO_1004,*LPSHARE_INFO_1004;
-typedef struct _SHARE_INFO_1006 {
-	DWORD shi1006_max_uses;
-} SHARE_INFO_1006,*PSHARE_INFO_1006,*LPSHARE_INFO_1006;
-typedef struct _SHARE_INFO_1501 {
-	DWORD shi1501_reserved;
-	PSECURITY_DESCRIPTOR shi1501_security_descriptor;
-} SHARE_INFO_1501,*PSHARE_INFO_1501,*LPSHARE_INFO_1501;
-typedef struct _SESSION_INFO_0 { LPWSTR sesi0_cname; } SESSION_INFO_0,*PSESSION_INFO_0,*LPSESSION_INFO_0;
-typedef struct _SESSION_INFO_1 {
-	LPTSTR sesi1_cname; 
-	LPTSTR sesi1_username;
-	DWORD sesi1_num_opens;
-	DWORD sesi1_time;
-	DWORD sesi1_idle_time;
-	DWORD sesi1_user_flags;
-} SESSION_INFO_1,*PSESSION_INFO_1,*LPSESSION_INFO_1;
-typedef struct _SESSION_INFO_2 {
-	LPTSTR sesi2_cname; 
-	LPTSTR sesi2_username;
-	DWORD sesi2_num_opens;
-	DWORD sesi2_time;
-	DWORD sesi2_idle_time;
-	DWORD sesi2_user_flags;
-	LPWSTR sesi2_cltype_name;
-} SESSION_INFO_2,*PSESSION_INFO_2,*LPSESSION_INFO_2;
-typedef struct _SESSION_INFO_10 {
-	LPWSTR sesi10_cname; 
-	LPWSTR sesi10_username;
-	DWORD sesi10_time;
-	DWORD sesi10_idle_time;
-} SESSION_INFO_10,*PSESSION_INFO_10,*LPSESSION_INFO_10;
-typedef struct _SESSION_INFO_502 {
-	LPWSTR sesi502_cname; 
-	LPWSTR sesi502_username;
-	DWORD sesi502_num_opens;
-	DWORD sesi502_time;
-	DWORD sesi502_idle_time;
-	DWORD sesi502_user_flags;
-	LPWSTR sesi502_cltype_name;
-	LPWSTR sesi502_transport;
-} SESSION_INFO_502,*PSESSION_INFO_502,*LPSESSION_INFO_502;
-typedef struct _CONNECTION_INFO_0 { DWORD coni0_id; } CONNECTION_INFO_0,*PCONNECTION_INFO_0,*LPCONNECTION_INFO_0;
-typedef struct _CONNECTION_INFO_1 {
-	DWORD coni1_id;
-	DWORD coni1_type;
-	DWORD coni1_num_opens;
-	DWORD coni1_num_users;
-	DWORD coni1_time;
-	LPWSTR coni1_username;
-	LPWSTR coni1_netname;
-} CONNECTION_INFO_1,*PCONNECTION_INFO_1,*LPCONNECTION_INFO_1;
-NET_API_STATUS WINAPI NetShareAdd(LPWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetShareEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetShareEnumSticky(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD resume_handle);
-NET_API_STATUS WINAPI NetShareGetInfo(LPWSTR,LPWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetShareSetInfo(LPWSTR,LPWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetShareDel(LPWSTR,LPWSTR,DWORD);
-NET_API_STATUS WINAPI NetShareDelSticky(LPWSTR,LPWSTR,DWORD);
-NET_API_STATUS WINAPI NetShareCheck(LPWSTR,LPWSTR,PDWORD);
-NET_API_STATUS WINAPI NetSessionEnum(LPWSTR,LPWSTR,LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetSessionDel(LPWSTR,LPWSTR,LPWSTR);
-NET_API_STATUS WINAPI NetSessionGetInfo(LPWSTR,LPWSTR,LPWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetConnectionEnum(LPWSTR,LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetFileClose(LPWSTR,DWORD);
-NET_API_STATUS WINAPI NetFileEnum(LPWSTR,LPWSTR,LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetFileGetInfo(LPWSTR,DWORD,DWORD,PBYTE*);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmsname.h b/winsup/w32api/include/lmsname.h
deleted file mode 100644
index a840cb21f..000000000
--- a/winsup/w32api/include/lmsname.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef _LMSNAME_H
-#define _LMSNAME_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define SERVICE_WORKSTATION TEXT("LanmanWorkstation")
-#define SERVICE_LM20_WORKSTATION TEXT("WORKSTATION")
-#define WORKSTATION_DISPLAY_NAME TEXT("Workstation")
-#define SERVICE_SERVER TEXT("LanmanServer")
-#define SERVICE_LM20_SERVER TEXT("SERVER")
-#define SERVER_DISPLAY_NAME TEXT("Server")
-#define SERVICE_BROWSER TEXT("BROWSER")
-#define SERVICE_LM20_BROWSER SERVICE_BROWSER
-#define SERVICE_MESSENGER TEXT("MESSENGER")
-#define SERVICE_LM20_MESSENGER SERVICE_MESSENGER
-#define SERVICE_NETRUN TEXT("NETRUN")
-#define SERVICE_LM20_NETRUN SERVICE_NETRUN
-#define SERVICE_SPOOLER TEXT("SPOOLER")
-#define SERVICE_LM20_SPOOLER SERVICE_SPOOLER
-#define SERVICE_ALERTER TEXT("ALERTER")
-#define SERVICE_LM20_ALERTER SERVICE_ALERTER
-#define SERVICE_NETLOGON TEXT("NETLOGON")
-#define SERVICE_LM20_NETLOGON SERVICE_NETLOGON
-#define SERVICE_NETPOPUP TEXT("NETPOPUP")
-#define SERVICE_LM20_NETPOPUP SERVICE_NETPOPUP
-#define SERVICE_SQLSERVER TEXT("SQLSERVER")
-#define SERVICE_LM20_SQLSERVER SERVICE_SQLSERVER
-#define SERVICE_REPL TEXT("REPLICATOR")
-#define SERVICE_LM20_REPL SERVICE_REPL
-#define SERVICE_RIPL TEXT("REMOTEBOOT")
-#define SERVICE_LM20_RIPL SERVICE_RIPL
-#define SERVICE_TIMESOURCE TEXT("TIMESOURCE")
-#define SERVICE_LM20_TIMESOURCE SERVICE_TIMESOURCE
-#define SERVICE_AFP TEXT("AFP")
-#define SERVICE_LM20_AFP SERVICE_AFP
-#define SERVICE_UPS TEXT("UPS")
-#define SERVICE_LM20_UPS SERVICE_UPS
-#define SERVICE_XACTSRV TEXT("XACTSRV")
-#define SERVICE_LM20_XACTSRV SERVICE_XACTSRV
-#define SERVICE_TCPIP TEXT("TCPIP")
-#define SERVICE_LM20_TCPIP SERVICE_TCPIP
-#define SERVICE_NBT TEXT("NBT")
-#define SERVICE_LM20_NBT SERVICE_NBT
-#define SERVICE_LMHOSTS TEXT("LMHOSTS")
-#define SERVICE_LM20_LMHOSTS SERVICE_LMHOSTS
-#define SERVICE_TELNET TEXT("Telnet")
-#define SERVICE_LM20_TELNET SERVICE_TELNET
-#define SERVICE_SCHEDULE TEXT("Schedule")
-#define SERVICE_LM20_SCHEDULE SERVICE_SCHEDULE
-#define SERVICE_NTLMSSP TEXT("NtLmSsp")
-#define SERVICE_DHCP TEXT("DHCP")
-#define SERVICE_LM20_DHCP SERVICE_DHCP
-#define SERVICE_NWSAP TEXT("NwSapAgent")
-#define SERVICE_LM20_NWSAP SERVICE_NWSAP
-#define NWSAP_DISPLAY_NAME TEXT("NW Sap Agent")
-#define SERVICE_NWCS TEXT("NWCWorkstation")
-#endif
diff --git a/winsup/w32api/include/lmstats.h b/winsup/w32api/include/lmstats.h
deleted file mode 100644
index 2a4a2c2e3..000000000
--- a/winsup/w32api/include/lmstats.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifndef _LMSTATS_H
-#define _LMSTATS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define STATSOPT_CLR 1
-#define STATS_NO_VALUE ((ULONG)-1)
-#define STATS_OVERFLOW ((ULONG)-2)
-typedef struct _STAT_SERVER_0 {
-	DWORD sts0_start;
-	DWORD sts0_fopens;
-	DWORD sts0_devopens;
-	DWORD sts0_jobsqueued;
-	DWORD sts0_sopens;
-	DWORD sts0_stimedout;
-	DWORD sts0_serrorout;
-	DWORD sts0_pwerrors;
-	DWORD sts0_permerrors;
-	DWORD sts0_syserrors;
-	DWORD sts0_bytessent_low;
-	DWORD sts0_bytessent_high;
-	DWORD sts0_bytesrcvd_low;
-	DWORD sts0_bytesrcvd_high;
-	DWORD sts0_avresponse;
-	DWORD sts0_reqbufneed;
-	DWORD sts0_bigbufneed;
-} STAT_SERVER_0,*PSTAT_SERVER_0,*LPSTAT_SERVER_0;
-#ifdef LM20_WORKSTATION_STATISTICS
-typedef struct _STAT_WORKSTATION_0 {
-	DWORD stw0_start;
-	DWORD stw0_numNCB_r;
-	DWORD stw0_numNCB_s;
-	DWORD stw0_numNCB_a;
-	DWORD stw0_fiNCB_r;
-	DWORD stw0_fiNCB_s;
-	DWORD stw0_fiNCB_a;
-	DWORD stw0_fcNCB_r;
-	DWORD stw0_fcNCB_s;
-	DWORD stw0_fcNCB_a;
-	DWORD stw0_sesstart;
-	DWORD stw0_sessfailcon;
-	DWORD stw0_sessbroke;
-	DWORD stw0_uses;
-	DWORD stw0_usefail;
-	DWORD stw0_autorec;
-	DWORD stw0_bytessent_r_lo;
-	DWORD stw0_bytessent_r_hi;
-	DWORD stw0_bytesrcvd_r_lo;
-	DWORD stw0_bytesrcvd_r_hi;
-	DWORD stw0_bytessent_s_lo;
-	DWORD stw0_bytessent_s_hi;
-	DWORD stw0_bytesrcvd_s_lo;
-	DWORD stw0_bytesrcvd_s_hi;
-	DWORD stw0_bytessent_a_lo;
-	DWORD stw0_bytessent_a_hi;
-	DWORD stw0_bytesrcvd_a_lo;
-	DWORD stw0_bytesrcvd_a_hi;
-	DWORD stw0_reqbufneed;
-	DWORD stw0_bigbufneed;
-} STAT_WORKSTATION_0,*PSTAT_WORKSTATION_0,*LPSTAT_WORKSTATION_0;
-#else
-typedef struct _STAT_WORKSTATION_0 {
-	LARGE_INTEGER StatisticsStartTime;
-	LARGE_INTEGER BytesReceived;
-	LARGE_INTEGER SmbsReceived;
-	LARGE_INTEGER PagingReadBytesRequested;
-	LARGE_INTEGER NonPagingReadBytesRequested;
-	LARGE_INTEGER CacheReadBytesRequested;
-	LARGE_INTEGER NetworkReadBytesRequested;
-	LARGE_INTEGER BytesTransmitted;
-	LARGE_INTEGER SmbsTransmitted;
-	LARGE_INTEGER PagingWriteBytesRequested;
-	LARGE_INTEGER NonPagingWriteBytesRequested;
-	LARGE_INTEGER CacheWriteBytesRequested;
-	LARGE_INTEGER NetworkWriteBytesRequested;
-	DWORD InitiallyFailedOperations;
-	DWORD FailedCompletionOperations;
-	DWORD ReadOperations;
-	DWORD RandomReadOperations;
-	DWORD ReadSmbs;
-	DWORD LargeReadSmbs;
-	DWORD SmallReadSmbs;
-	DWORD WriteOperations;
-	DWORD RandomWriteOperations;
-	DWORD WriteSmbs;
-	DWORD LargeWriteSmbs;
-	DWORD SmallWriteSmbs;
-	DWORD RawReadsDenied;
-	DWORD RawWritesDenied;
-	DWORD NetworkErrors;
-	DWORD Sessions;
-	DWORD FailedSessions;
-	DWORD Reconnects;
-	DWORD CoreConnects;
-	DWORD Lanman20Connects;
-	DWORD Lanman21Connects;
-	DWORD LanmanNtConnects;
-	DWORD ServerDisconnects;
-	DWORD HungSessions;
-	DWORD UseCount;
-	DWORD FailedUseCount;
-	DWORD CurrentCommands;
-} STAT_WORKSTATION_0,*PSTAT_WORKSTATION_0,*LPSTAT_WORKSTATION_0;
-#endif
-
-NET_API_STATUS WINAPI NetStatisticsGet(LPWSTR,LPWSTR,DWORD,DWORD,PBYTE*);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmsvc.h b/winsup/w32api/include/lmsvc.h
deleted file mode 100644
index bb19ee058..000000000
--- a/winsup/w32api/include/lmsvc.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#ifndef _LMSVC_H
-#define _LMSVC_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <lmsname.h>
-#define SERVICE_DOS_ENCRYPTION TEXT("ENCRYPT")
-#define SERVICE_UNINSTALLED 0
-#define SERVICE_INSTALL_PENDING 1
-#define SERVICE_UNINSTALL_PENDING 2
-#define SERVICE_INSTALLED 3
-#define SERVICE_INSTALL_STATE 3
-#define SERVICE_PAUSE_STATE 18
-#define LM20_SERVICE_ACTIVE 0
-#define LM20_SERVICE_CONTINUE_PENDING 4
-#define LM20_SERVICE_PAUSE_PENDING 8
-#define LM20_SERVICE_PAUSED 18
-#define SERVICE_NOT_UNINSTALLABLE 0
-#define SERVICE_UNINSTALLABLE 16
-#define SERVICE_NOT_PAUSABLE 0
-#define SERVICE_PAUSABLE 32
-#define SERVICE_REDIR_PAUSED 0x700
-#define SERVICE_REDIR_DISK_PAUSED 256
-#define SERVICE_REDIR_PRINT_PAUSED 512
-#define SERVICE_REDIR_COMM_PAUSED 1024
-#define SERVICE_CTRL_INTERROGATE 0
-#define SERVICE_CTRL_PAUSE 1
-#define SERVICE_CTRL_CONTINUE 2
-#define SERVICE_CTRL_UNINSTALL 3
-#define SERVICE_CTRL_REDIR_DISK 1
-#define SERVICE_CTRL_REDIR_PRINT 2
-#define SERVICE_CTRL_REDIR_COMM 4
-#define SERVICE_IP_NO_HINT 0
-#define SERVICE_CCP_NO_HINT 0
-#define SERVICE_IP_QUERY_HINT 0x10000
-#define SERVICE_CCP_QUERY_HINT 0x10000
-#define SERVICE_IP_CHKPT_NUM 255
-#define SERVICE_CCP_CHKPT_NUM 255
-#define SERVICE_IP_WAIT_TIME 0xFF00
-#define SERVICE_CCP_WAIT_TIME 0xFF00
-#define SERVICE_IP_WAITTIME_SHIFT 8
-#define SERVICE_NTIP_WAITTIME_SHIFT 12
-#define UPPER_HINT_MASK 0xFF00
-#define LOWER_HINT_MASK 255
-#define UPPER_GET_HINT_MASK 0xFF00000
-#define LOWER_GET_HINT_MASK 0xFF00
-#define SERVICE_NT_MAXTIME 0xFFFF
-#define SERVICE_RESRV_MASK 0x1FFFF
-#define SERVICE_MAXTIME 255
-#define SERVICE_BASE 3050
-#define SERVICE_UIC_NORMAL 0
-#define SERVICE_UIC_BADPARMVAL (SERVICE_BASE+1)
-#define SERVICE_UIC_MISSPARM (SERVICE_BASE+2)
-#define SERVICE_UIC_UNKPARM (SERVICE_BASE+3)
-#define SERVICE_UIC_RESOURCE (SERVICE_BASE+4)
-#define SERVICE_UIC_CONFIG (SERVICE_BASE+5)
-#define SERVICE_UIC_SYSTEM (SERVICE_BASE+6)
-#define SERVICE_UIC_INTERNAL (SERVICE_BASE+7)
-#define SERVICE_UIC_AMBIGPARM (SERVICE_BASE+8)
-#define SERVICE_UIC_DUPPARM (SERVICE_BASE+9)
-#define SERVICE_UIC_KILL (SERVICE_BASE+10)
-#define SERVICE_UIC_EXEC (SERVICE_BASE+11)
-#define SERVICE_UIC_SUBSERV (SERVICE_BASE+12)
-#define SERVICE_UIC_CONFLPARM (SERVICE_BASE+13)
-#define SERVICE_UIC_FILE (SERVICE_BASE+14)
-#define SERVICE_UIC_M_NULL 0
-#define SERVICE_UIC_M_MEMORY (SERVICE_BASE+20) 
-#define SERVICE_UIC_M_DISK (SERVICE_BASE+21) 
-#define SERVICE_UIC_M_THREADS (SERVICE_BASE+22) 
-#define SERVICE_UIC_M_PROCESSES (SERVICE_BASE+23) 
-#define SERVICE_UIC_M_SECURITY (SERVICE_BASE+24)
-#define SERVICE_UIC_M_LANROOT (SERVICE_BASE+25)
-#define SERVICE_UIC_M_REDIR (SERVICE_BASE+26)
-#define SERVICE_UIC_M_SERVER (SERVICE_BASE+27)
-#define SERVICE_UIC_M_SEC_FILE_ERR (SERVICE_BASE+28)
-#define SERVICE_UIC_M_FILES (SERVICE_BASE+29)
-#define SERVICE_UIC_M_LOGS (SERVICE_BASE+30)
-#define SERVICE_UIC_M_LANGROUP (SERVICE_BASE+31)
-#define SERVICE_UIC_M_MSGNAME (SERVICE_BASE+32)
-#define SERVICE_UIC_M_ANNOUNCE (SERVICE_BASE+33)
-#define SERVICE_UIC_M_UAS (SERVICE_BASE+34)
-#define SERVICE_UIC_M_SERVER_SEC_ERR (SERVICE_BASE+35)
-#define SERVICE_UIC_M_WKSTA (SERVICE_BASE+37)
-#define SERVICE_UIC_M_ERRLOG (SERVICE_BASE+38)
-#define SERVICE_UIC_M_FILE_UW (SERVICE_BASE+39)
-#define SERVICE_UIC_M_ADDPAK (SERVICE_BASE+40)
-#define SERVICE_UIC_M_LAZY (SERVICE_BASE+41)
-#define SERVICE_UIC_M_UAS_MACHINE_ACCT (SERVICE_BASE+42)
-#define SERVICE_UIC_M_UAS_SERVERS_NMEMB (SERVICE_BASE+43)
-#define SERVICE_UIC_M_UAS_SERVERS_NOGRP (SERVICE_BASE+44)
-#define SERVICE_UIC_M_UAS_INVALID_ROLE (SERVICE_BASE+45)
-#define SERVICE_UIC_M_NETLOGON_NO_DC (SERVICE_BASE+46)
-#define SERVICE_UIC_M_NETLOGON_DC_CFLCT (SERVICE_BASE+47)
-#define SERVICE_UIC_M_NETLOGON_AUTH (SERVICE_BASE+48)
-#define SERVICE_UIC_M_UAS_PROLOG (SERVICE_BASE+49)
-#define SERVICE2_BASE 5600
-#define SERVICE_UIC_M_NETLOGON_MPATH (SERVICE2_BASE+0)
-#define SERVICE_UIC_M_LSA_MACHINE_ACCT (SERVICE2_BASE+1)
-#define SERVICE_UIC_M_DATABASE_ERROR (SERVICE2_BASE+2)
-
-typedef struct _SERVICE_INFO_0 { LPWSTR svci0_name;} SERVICE_INFO_0,*PSERVICE_INFO_0,* LPSERVICE_INFO_0;
-typedef struct _SERVICE_INFO_1 {
-	LPWSTR svci1_name;
-	DWORD svci1_status;
-	DWORD svci1_code;
-	DWORD svci1_pid;
-} SERVICE_INFO_1,*PSERVICE_INFO_1,* LPSERVICE_INFO_1;
-typedef struct _SERVICE_INFO_2 {
-	LPWSTR svci2_name;
-	DWORD svci2_status;
-	DWORD svci2_code;
-	DWORD svci2_pid;
-	LPWSTR svci2_text;
-	DWORD svci2_specific_error;
-	LPWSTR svci2_display_name;
-} SERVICE_INFO_2,*PSERVICE_INFO_2,* LPSERVICE_INFO_2;
-
-NET_API_STATUS WINAPI NetServiceControl(LPCWSTR,LPCWSTR,DWORD,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetServiceEnum(LPCWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetServiceGetInfo(LPCWSTR,LPCWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetServiceInstall(LPCWSTR,LPCWSTR,DWORD,LPCWSTR*,PBYTE*);
-#define SERVICE_IP_CODE(t,n) ((long)SERVICE_IP_QUERY_HINT|(long)(n|(t<<SERVICE_IP_WAITTIME_SHIFT)))
-#define SERVICE_CCP_CODE(t,n) ((long)SERVICE_CCP_QUERY_HINT|(long)(n|(t<<SERVICE_IP_WAITTIME_SHIFT)))
-#define SERVICE_UIC_CODE(c,m) ((long)(((long)c<<16)|(long)(USHORT)m))
-#define SERVICE_NT_CCP_CODE(t,n) (((long)SERVICE_CCP_QUERY_HINT)|((long)(n))|(((t)&LOWER_HINT_MASK)<<SERVICE_IP_WAITTIME_SHIFT)|(((t)&UPPER_HINT_MASK)<<SERVICE_NTIP_WAITTIME_SHIFT))
-#define SERVICE_NT_WAIT_GET(c) ((((c)&UPPER_GET_HINT_MASK)>>SERVICE_NTIP_WAITTIME_SHIFT)|(((c)&LOWER_GET_HINT_MASK)>>SERVICE_IP_WAITTIME_SHIFT))
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmuse.h b/winsup/w32api/include/lmuse.h
deleted file mode 100644
index a63a71f3c..000000000
--- a/winsup/w32api/include/lmuse.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _LMUSE_H
-#define _LMUSE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <lmuseflg.h>
-#define USE_LOCAL_PARMNUM 1
-#define USE_REMOTE_PARMNUM 2
-#define USE_PASSWORD_PARMNUM 3
-#define USE_ASGTYPE_PARMNUM 4
-#define USE_USERNAME_PARMNUM 5
-#define USE_DOMAINNAME_PARMNUM 6
-#define USE_OK 0
-#define USE_PAUSED 1
-#define USE_SESSLOST 2
-#define USE_DISCONN 2
-#define USE_NETERR 3
-#define USE_CONN 4
-#define USE_RECONN 5
-#define USE_WILDCARD ((DWORD)-1)
-#define USE_DISKDEV 0
-#define USE_SPOOLDEV 1
-#define USE_CHARDEV 2
-#define USE_IPC 3
-typedef struct _USE_INFO_0 {
-	LPWSTR ui0_local;
-	LPWSTR ui0_remote;
-}USE_INFO_0,*PUSE_INFO_0,*LPUSE_INFO_0;
-typedef struct _USE_INFO_1 {
-	LPWSTR ui1_local;
-	LPWSTR ui1_remote;
-	LPWSTR ui1_password;
-	DWORD ui1_status;
-	DWORD ui1_asg_type;
-	DWORD ui1_refcount;
-	DWORD ui1_usecount;
-}USE_INFO_1,*PUSE_INFO_1,*LPUSE_INFO_1;
-typedef struct _USE_INFO_2 {
-	LPWSTR ui2_local;
-	LPWSTR ui2_remote;
-	LPWSTR ui2_password;
-	DWORD ui2_status;
-	DWORD ui2_asg_type;
-	DWORD ui2_refcount;
-	DWORD ui2_usecount;
-	LPWSTR ui2_username;
-	LPWSTR ui2_domainname;
-}USE_INFO_2,*PUSE_INFO_2,*LPUSE_INFO_2;
-NET_API_STATUS WINAPI NetUseAdd(LPWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetUseDel(LPWSTR,LPWSTR,DWORD);
-NET_API_STATUS WINAPI NetUseEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetUseGetInfo(LPWSTR,LPWSTR,DWORD,PBYTE*);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lmuseflg.h b/winsup/w32api/include/lmuseflg.h
deleted file mode 100644
index 34162e4e5..000000000
--- a/winsup/w32api/include/lmuseflg.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _LMUSEFLG_H
-#define _LMUSEFLG_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define USE_NOFORCE 0
-#define USE_FORCE 1
-#define USE_LOTS_OF_FORCE 2
-#endif 
diff --git a/winsup/w32api/include/lmwksta.h b/winsup/w32api/include/lmwksta.h
deleted file mode 100644
index a8c6ccbcd..000000000
--- a/winsup/w32api/include/lmwksta.h
+++ /dev/null
@@ -1,233 +0,0 @@
-#ifndef _LMWKSTA_H
-#define _LMWKSTA_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <lmuseflg.h> 
-#define WKSTA_PLATFORM_ID_PARMNUM 100
-#define WKSTA_COMPUTERNAME_PARMNUM 1
-#define WKSTA_LANGROUP_PARMNUM 2
-#define WKSTA_VER_MAJOR_PARMNUM 4
-#define WKSTA_VER_MINOR_PARMNUM 5
-#define WKSTA_LOGGED_ON_USERS_PARMNUM 6
-#define WKSTA_LANROOT_PARMNUM 7
-#define WKSTA_LOGON_DOMAIN_PARMNUM 8
-#define WKSTA_LOGON_SERVER_PARMNUM 9
-#define WKSTA_CHARWAIT_PARMNUM 10 
-#define WKSTA_CHARTIME_PARMNUM 11 
-#define WKSTA_CHARCOUNT_PARMNUM 12 
-#define WKSTA_KEEPCONN_PARMNUM 13
-#define WKSTA_KEEPSEARCH_PARMNUM 14
-#define WKSTA_MAXCMDS_PARMNUM 15
-#define WKSTA_NUMWORKBUF_PARMNUM 16
-#define WKSTA_MAXWRKCACHE_PARMNUM 17
-#define WKSTA_SESSTIMEOUT_PARMNUM 18
-#define WKSTA_SIZERROR_PARMNUM 19
-#define WKSTA_NUMALERTS_PARMNUM 20
-#define WKSTA_NUMSERVICES_PARMNUM 21
-#define WKSTA_NUMCHARBUF_PARMNUM 22
-#define WKSTA_SIZCHARBUF_PARMNUM 23
-#define WKSTA_ERRLOGSZ_PARMNUM 27 
-#define WKSTA_PRINTBUFTIME_PARMNUM 28 
-#define WKSTA_SIZWORKBUF_PARMNUM 29
-#define WKSTA_MAILSLOTS_PARMNUM 30
-#define WKSTA_NUMDGRAMBUF_PARMNUM 31
-#define WKSTA_WRKHEURISTICS_PARMNUM 32 
-#define WKSTA_MAXTHREADS_PARMNUM 33
-#define WKSTA_LOCKQUOTA_PARMNUM 41
-#define WKSTA_LOCKINCREMENT_PARMNUM 42
-#define WKSTA_LOCKMAXIMUM_PARMNUM 43
-#define WKSTA_PIPEINCREMENT_PARMNUM 44
-#define WKSTA_PIPEMAXIMUM_PARMNUM 45
-#define WKSTA_DORMANTFILELIMIT_PARMNUM 46
-#define WKSTA_CACHEFILETIMEOUT_PARMNUM 47
-#define WKSTA_USEOPPORTUNISTICLOCKING_PARMNUM 48
-#define WKSTA_USEUNLOCKBEHIND_PARMNUM 49
-#define WKSTA_USECLOSEBEHIND_PARMNUM 50
-#define WKSTA_BUFFERNAMEDPIPES_PARMNUM 51
-#define WKSTA_USELOCKANDREADANDUNLOCK_PARMNUM 52
-#define WKSTA_UTILIZENTCACHING_PARMNUM 53
-#define WKSTA_USERAWREAD_PARMNUM 54
-#define WKSTA_USERAWWRITE_PARMNUM 55
-#define WKSTA_USEWRITERAWWITHDATA_PARMNUM 56
-#define WKSTA_USEENCRYPTION_PARMNUM 57
-#define WKSTA_BUFFILESWITHDENYWRITE_PARMNUM 58
-#define WKSTA_BUFFERREADONLYFILES_PARMNUM 59
-#define WKSTA_FORCECORECREATEMODE_PARMNUM 60
-#define WKSTA_USE512BYTESMAXTRANSFER_PARMNUM 61
-#define WKSTA_READAHEADTHRUPUT_PARMNUM 62
-#define WKSTA_OTH_DOMAINS_PARMNUM 101
-#define TRANSPORT_QUALITYOFSERVICE_PARMNUM 201
-#define TRANSPORT_NAME_PARMNUM 202
-
-typedef struct _WKSTA_INFO_100 {
-	DWORD wki100_platform_id;
-	LPWSTR wki100_computername;
-	LPWSTR wki100_langroup;
-	DWORD wki100_ver_major;
-	DWORD wki100_ver_minor;
-}WKSTA_INFO_100,*PWKSTA_INFO_100,*LPWKSTA_INFO_100;
-typedef struct _WKSTA_INFO_101 {
-	DWORD wki101_platform_id;
-	LPWSTR wki101_computername;
-	LPWSTR wki101_langroup;
-	DWORD wki101_ver_major;
-	DWORD wki101_ver_minor;
-	LPWSTR wki101_lanroot;
-}WKSTA_INFO_101,*PWKSTA_INFO_101,*LPWKSTA_INFO_101;
-typedef struct _WKSTA_INFO_102 {
-	DWORD wki102_platform_id;
-	LPWSTR wki102_computername;
-	LPWSTR wki102_langroup;
-	DWORD wki102_ver_major;
-	DWORD wki102_ver_minor;
-	LPWSTR wki102_lanroot;
-	DWORD wki102_logged_on_users;
-}WKSTA_INFO_102,*PWKSTA_INFO_102,*LPWKSTA_INFO_102;
-typedef struct _WKSTA_INFO_302{
-	DWORD wki302_char_wait;
-	DWORD wki302_collection_time;
-	DWORD wki302_maximum_collection_count;
-	DWORD wki302_keep_conn;
-	DWORD wki302_keep_search;
-	DWORD wki302_max_cmds;
-	DWORD wki302_num_work_buf;
-	DWORD wki302_siz_work_buf;
-	DWORD wki302_max_wrk_cache;
-	DWORD wki302_sess_timeout;
-	DWORD wki302_siz_error;
-	DWORD wki302_num_alerts;
-	DWORD wki302_num_services;
-	DWORD wki302_errlog_sz;
-	DWORD wki302_print_buf_time;
-	DWORD wki302_num_char_buf;
-	DWORD wki302_siz_char_buf;
-	LPWSTR wki302_wrk_heuristics;
-	DWORD wki302_mailslots;
-	DWORD wki302_num_dgram_buf;
-}WKSTA_INFO_302,*PWKSTA_INFO_302,*LPWKSTA_INFO_302;
-typedef struct _WKSTA_INFO_402{
-	DWORD wki402_char_wait;
-	DWORD wki402_collection_time;
-	DWORD wki402_maximum_collection_count;
-	DWORD wki402_keep_conn;
-	DWORD wki402_keep_search;
-	DWORD wki402_max_cmds;
-	DWORD wki402_num_work_buf;
-	DWORD wki402_siz_work_buf;
-	DWORD wki402_max_wrk_cache;
-	DWORD wki402_sess_timeout;
-	DWORD wki402_siz_error;
-	DWORD wki402_num_alerts;
-	DWORD wki402_num_services;
-	DWORD wki402_errlog_sz;
-	DWORD wki402_print_buf_time;
-	DWORD wki402_num_char_buf;
-	DWORD wki402_siz_char_buf;
-	LPWSTR wki402_wrk_heuristics;
-	DWORD wki402_mailslots;
-	DWORD wki402_num_dgram_buf;
-	DWORD wki402_max_threads;
-}WKSTA_INFO_402,*PWKSTA_INFO_402,*LPWKSTA_INFO_402;
-typedef struct _WKSTA_INFO_502{
-	DWORD wki502_char_wait;
-	DWORD wki502_collection_time;
-	DWORD wki502_maximum_collection_count;
-	DWORD wki502_keep_conn;
-	DWORD wki502_max_cmds;
-	DWORD wki502_sess_timeout;
-	DWORD wki502_siz_char_buf;
-	DWORD wki502_max_threads;
-	DWORD wki502_lock_quota;
-	DWORD wki502_lock_increment;
-	DWORD wki502_lock_maximum;
-	DWORD wki502_pipe_increment;
-	DWORD wki502_pipe_maximum;
-	DWORD wki502_cache_file_timeout;
-	DWORD wki502_dormant_file_limit;
-	DWORD wki502_read_ahead_throughput;
-	DWORD wki502_num_mailslot_buffers;
-	DWORD wki502_num_srv_announce_buffers;
-	DWORD wki502_max_illegal_datagram_events;
-	DWORD wki502_illegal_datagram_event_reset_frequency;
-	BOOL wki502_log_election_packets;
-	BOOL wki502_use_opportunistic_locking;
-	BOOL wki502_use_unlock_behind;
-	BOOL wki502_use_close_behind;
-	BOOL wki502_buf_named_pipes;
-	BOOL wki502_use_lock_read_unlock;
-	BOOL wki502_utilize_nt_caching;
-	BOOL wki502_use_raw_read;
-	BOOL wki502_use_raw_write;
-	BOOL wki502_use_write_raw_data;
-	BOOL wki502_use_encryption;
-	BOOL wki502_buf_files_deny_write;
-	BOOL wki502_buf_read_only_files;
-	BOOL wki502_force_core_create_mode;
-	BOOL wki502_use_512_byte_max_transfer;
-}WKSTA_INFO_502,*PWKSTA_INFO_502,*LPWKSTA_INFO_502;
-typedef struct _WKSTA_INFO_1010 { DWORD wki1010_char_wait;} WKSTA_INFO_1010,*PWKSTA_INFO_1010,*LPWKSTA_INFO_1010;
-typedef struct _WKSTA_INFO_1011 { DWORD wki1011_collection_time;} WKSTA_INFO_1011,*PWKSTA_INFO_1011,*LPWKSTA_INFO_1011;
-typedef struct _WKSTA_INFO_1012 { DWORD wki1012_maximum_collection_count;} WKSTA_INFO_1012,*PWKSTA_INFO_1012,*LPWKSTA_INFO_1012;
-typedef struct _WKSTA_INFO_1027 { DWORD wki1027_errlog_sz;} WKSTA_INFO_1027,*PWKSTA_INFO_1027,*LPWKSTA_INFO_1027;
-typedef struct _WKSTA_INFO_1028 { DWORD wki1028_print_buf_time;} WKSTA_INFO_1028,*PWKSTA_INFO_1028,*LPWKSTA_INFO_1028;
-typedef struct _WKSTA_INFO_1032 { DWORD wki1032_wrk_heuristics;} WKSTA_INFO_1032,*PWKSTA_INFO_1032,*LPWKSTA_INFO_1032;
-typedef struct _WKSTA_INFO_1013 { DWORD wki1013_keep_conn;} WKSTA_INFO_1013,*PWKSTA_INFO_1013,*LPWKSTA_INFO_1013;
-typedef struct _WKSTA_INFO_1018 { DWORD wki1018_sess_timeout;} WKSTA_INFO_1018,*PWKSTA_INFO_1018,*LPWKSTA_INFO_1018;
-typedef struct _WKSTA_INFO_1023 { DWORD wki1023_siz_char_buf;} WKSTA_INFO_1023,*PWKSTA_INFO_1023,*LPWKSTA_INFO_1023;
-typedef struct _WKSTA_INFO_1033 { DWORD wki1033_max_threads;} WKSTA_INFO_1033,*PWKSTA_INFO_1033,*LPWKSTA_INFO_1033;
-typedef struct _WKSTA_INFO_1041 { DWORD wki1041_lock_quota;} WKSTA_INFO_1041,*PWKSTA_INFO_1041,*LPWKSTA_INFO_1041;
-typedef struct _WKSTA_INFO_1042 { DWORD wki1042_lock_increment;} WKSTA_INFO_1042,*PWKSTA_INFO_1042,*LPWKSTA_INFO_1042;
-typedef struct _WKSTA_INFO_1043 { DWORD wki1043_lock_maximum;} WKSTA_INFO_1043,*PWKSTA_INFO_1043,*LPWKSTA_INFO_1043;
-typedef struct _WKSTA_INFO_1044 { DWORD wki1044_pipe_increment;} WKSTA_INFO_1044,*PWKSTA_INFO_1044,*LPWKSTA_INFO_1044;
-typedef struct _WKSTA_INFO_1045 { DWORD wki1045_pipe_maximum;} WKSTA_INFO_1045,*PWKSTA_INFO_1045,*LPWKSTA_INFO_1045;
-typedef struct _WKSTA_INFO_1046 { DWORD wki1046_dormant_file_limit;} WKSTA_INFO_1046,*PWKSTA_INFO_1046,*LPWKSTA_INFO_1046;
-typedef struct _WKSTA_INFO_1047 { DWORD wki1047_cache_file_timeout;} WKSTA_INFO_1047,*PWKSTA_INFO_1047,*LPWKSTA_INFO_1047;
-typedef struct _WKSTA_INFO_1048 { BOOL wki1048_use_opportunistic_locking;} WKSTA_INFO_1048,*PWKSTA_INFO_1048,*LPWKSTA_INFO_1048;
-typedef struct _WKSTA_INFO_1049 { BOOL wki1049_use_unlock_behind;} WKSTA_INFO_1049,*PWKSTA_INFO_1049,*LPWKSTA_INFO_1049;
-typedef struct _WKSTA_INFO_1050 { BOOL wki1050_use_close_behind;} WKSTA_INFO_1050,*PWKSTA_INFO_1050,*LPWKSTA_INFO_1050;
-typedef struct _WKSTA_INFO_1051 { BOOL wki1051_buf_named_pipes;} WKSTA_INFO_1051,*PWKSTA_INFO_1051,*LPWKSTA_INFO_1051;
-typedef struct _WKSTA_INFO_1052 { BOOL wki1052_use_lock_read_unlock;} WKSTA_INFO_1052,*PWKSTA_INFO_1052,*LPWKSTA_INFO_1052;
-typedef struct _WKSTA_INFO_1053 { BOOL wki1053_utilize_nt_caching;} WKSTA_INFO_1053,*PWKSTA_INFO_1053,*LPWKSTA_INFO_1053;
-typedef struct _WKSTA_INFO_1054 { BOOL wki1054_use_raw_read;} WKSTA_INFO_1054,*PWKSTA_INFO_1054,*LPWKSTA_INFO_1054;
-typedef struct _WKSTA_INFO_1055 { BOOL wki1055_use_raw_write;} WKSTA_INFO_1055,*PWKSTA_INFO_1055,*LPWKSTA_INFO_1055;
-typedef struct _WKSTA_INFO_1056 { BOOL wki1056_use_write_raw_data;} WKSTA_INFO_1056,*PWKSTA_INFO_1056,*LPWKSTA_INFO_1056;
-typedef struct _WKSTA_INFO_1057 { BOOL wki1057_use_encryption;} WKSTA_INFO_1057,*PWKSTA_INFO_1057,*LPWKSTA_INFO_1057;
-typedef struct _WKSTA_INFO_1058 { BOOL wki1058_buf_files_deny_write;} WKSTA_INFO_1058,*PWKSTA_INFO_1058,*LPWKSTA_INFO_1058;
-typedef struct _WKSTA_INFO_1059 { BOOL wki1059_buf_read_only_files;} WKSTA_INFO_1059,*PWKSTA_INFO_1059,*LPWKSTA_INFO_1059;
-typedef struct _WKSTA_INFO_1060 { BOOL wki1060_force_core_create_mode;} WKSTA_INFO_1060,*PWKSTA_INFO_1060,*LPWKSTA_INFO_1060;
-typedef struct _WKSTA_INFO_1061 { BOOL wki1061_use_512_byte_max_transfer;} WKSTA_INFO_1061,*PWKSTA_INFO_1061,*LPWKSTA_INFO_1061;
-typedef struct _WKSTA_INFO_1062 { DWORD wki1062_read_ahead_throughput;} WKSTA_INFO_1062,*PWKSTA_INFO_1062,*LPWKSTA_INFO_1062;
-typedef struct _WKSTA_USER_INFO_0 { LPWSTR wkui0_username;}WKSTA_USER_INFO_0,*PWKSTA_USER_INFO_0,*LPWKSTA_USER_INFO_0;
-typedef struct _WKSTA_USER_INFO_1 {
-	LPWSTR wkui1_username;
-	LPWSTR wkui1_logon_domain;
-	LPWSTR wkui1_oth_domains;
-	LPWSTR wkui1_logon_server;
-}WKSTA_USER_INFO_1,*PWKSTA_USER_INFO_1,*LPWKSTA_USER_INFO_1;
-typedef struct _WKSTA_USER_INFO_1101 { LPWSTR wkui1101_oth_domains;} WKSTA_USER_INFO_1101,*PWKSTA_USER_INFO_1101,*LPWKSTA_USER_INFO_1101;
-typedef struct _WKSTA_TRANSPORT_INFO_0 {
-	DWORD wkti0_quality_of_service;
-	DWORD wkti0_number_of_vcs;
-	LPWSTR wkti0_transport_name;
-	LPWSTR wkti0_transport_address;
-	BOOL wkti0_wan_ish;
-}WKSTA_TRANSPORT_INFO_0,*PWKSTA_TRANSPORT_INFO_0,*LPWKSTA_TRANSPORT_INFO_0;
-
-NET_API_STATUS WINAPI NetWkstaGetInfo(LPWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetWkstaSetInfo(LPWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR,DWORD,PBYTE*);
-NET_API_STATUS WINAPI NetWkstaUserSetInfo(LPWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetWkstaUserEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-NET_API_STATUS WINAPI NetWkstaTransportAdd(LPWSTR,DWORD,PBYTE,PDWORD);
-NET_API_STATUS WINAPI NetWkstaTransportDel(LPWSTR,LPWSTR,DWORD);
-NET_API_STATUS WINAPI NetWkstaTransportEnum(LPWSTR,DWORD,PBYTE*,DWORD,PDWORD,PDWORD,PDWORD);
-
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/lzexpand.h b/winsup/w32api/include/lzexpand.h
deleted file mode 100644
index 68d4807a8..000000000
--- a/winsup/w32api/include/lzexpand.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _LZEXPAND_H
-#define _LZEXPAND_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define LZERROR_BADINHANDLE	(-1)
-#define LZERROR_BADOUTHANDLE	(-2)
-#define LZERROR_READ	(-3)
-#define LZERROR_WRITE	(-4)
-#define LZERROR_GLOBALLOC	(-5)
-#define LZERROR_GLOBLOCK	(-6)
-#define LZERROR_BADVALUE	(-7)
-#define LZERROR_UNKNOWNALG	(-8)
-LONG WINAPI CopyLZFile(INT,INT);
-INT WINAPI GetExpandedNameA(LPSTR,LPSTR);
-INT WINAPI GetExpandedNameW(LPWSTR,LPWSTR);
-VOID APIENTRY LZClose(INT);
-LONG APIENTRY LZCopy(INT,INT);
-VOID WINAPI LZDone(VOID);
-INT WINAPI LZInit(INT);
-INT WINAPI LZOpenFileA(LPSTR,LPOFSTRUCT,WORD);
-INT WINAPI LZOpenFileW(LPWSTR,LPOFSTRUCT,WORD);
-INT WINAPI LZRead(INT,LPSTR,INT);
-LONG WINAPI LZSeek(INT,LONG,INT);
-INT WINAPI LZStart(VOID);
-#ifdef UNICODE
-#define GetExpandedName GetExpandedNameW
-#define LZOpenFile  LZOpenFileW
-#else
-#define GetExpandedName GetExpandedNameA
-#define LZOpenFile  LZOpenFileA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/mapi.h b/winsup/w32api/include/mapi.h
deleted file mode 100644
index 8474f8923..000000000
--- a/winsup/w32api/include/mapi.h
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef _MAPI_H
-#define _MAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SUCCESS_SUCCESS			0
-#define MAPI_USER_ABORT			1
-#define MAPI_E_USER_ABORT		1
-#define MAPI_E_FAILURE			2
-#define MAPI_E_LOGIN_FAILURE		3
-#define MAPI_E_LOGON_FAILURE		3
-#define MAPI_E_DISK_FULL		4
-#define MAPI_E_INSUFFICIENT_MEMORY	5
-#define MAPI_E_ACCESS_DENIED		6
-#define MAPI_E_BLK_TOO_SMALL		6
-#define MAPI_E_TOO_MANY_SESSIONS	8
-#define MAPI_E_TOO_MANY_FILES		9
-#define MAPI_E_TOO_MANY_RECIPIENTS	10
-#define MAPI_E_ATTACHMENT_NOT_FOUND	11
-#define MAPI_E_ATTACHMENT_OPEN_FAILURE	12
-#define MAPI_E_ATTACHMENT_WRITE_FAILURE	13
-#define MAPI_E_UNKNOWN_RECIPIENT	14
-#define MAPI_E_BAD_RECIPTYPE		15
-#define MAPI_E_NO_MESSAGES		16
-#define MAPI_E_INVALID_MESSAGE		17
-#define MAPI_E_TEXT_TOO_LARGE		18
-#define MAPI_E_INVALID_SESSION		19
-#define MAPI_E_TYPE_NOT_SUPPORTED	20
-#define MAPI_E_AMBIGUOUS_RECIPIENT	21
-#define MAPI_E_AMBIGUOUS_RECIP		21
-#define MAPI_E_MESSAGE_IN_USE		22
-#define MAPI_E_NETWORK_FAILURE		23
-#define MAPI_E_INVALID_EDITFIELDS	24
-#define MAPI_E_INVALID_RECIPS		25
-#define MAPI_E_NOT_SUPPORTED		26
-
-#define MAPI_ORIG	0
-#define MAPI_TO		1
-#define MAPI_CC		2
-#define MAPI_BCC	3
-
-#define MAPI_LOGON_UI		0x0001
-#define MAPI_NEW_SESSION	0x0002
-#define MAPI_FORCE_DOWNLOAD	0x1000
-#define MAPI_LOGOFF_SHARED	0x0001
-#define MAPI_LOGOFF_UI		0x0002
-#define MAPI_DIALOG		0x0008
-#define MAPI_UNREAD_ONLY	0x0020
-#define MAPI_LONG_MSGID		0x4000
-#define MAPI_GUARANTEE_FIFO	0x0100
-#define MAPI_ENVELOPE_ONLY	0x0040
-#define MAPI_PEEK		0x0080
-#define MAPI_BODY_AS_FILE	0x0200
-#define MAPI_SUPPRESS_ATTACH	0x0800
-#define MAPI_AB_NOMODIFY	0x0400
-#define MAPI_OLE		0x0001
-#define MAPI_OLE_STATIC		0x0002
-#define MAPI_UNREAD		0x0001
-#define MAPI_RECEIPT_REQUESTED	0x0002
-#define MAPI_SENT		0x0004
-
-#ifndef RC_INVOKED
-typedef unsigned long FLAGS;
-typedef unsigned long LHANDLE;
-typedef unsigned long FAR *LPLHANDLE, FAR *LPULONG;
-
-typedef struct {
-  ULONG ulReserved;
-  ULONG ulRecipClass;
-  LPSTR lpszName;
-  LPSTR lpszAddress;
-  ULONG ulEIDSize;
-  LPVOID lpEntryID;
-} MapiRecipDesc, *lpMapiRecipDesc;
-typedef struct {
-  ULONG ulReserved;
-  ULONG flFlags;
-  ULONG nPosition;
-  LPSTR lpszPathName;
-  LPSTR lpszFileName;
-  LPVOID lpFileType;
-} MapiFileDesc, *lpMapiFileDesc;
-typedef struct {
-  ULONG ulReserved;
-  ULONG cbTag;
-  LPBYTE lpTag;
-  ULONG cbEncoding;
-  LPBYTE lpEncoding;
-} MapiFileTagExt, *lpMapiFileTagExt;
-typedef struct {
-  ULONG ulReserved;
-  LPSTR lpszSubject;
-  LPSTR lpszNoteText;
-  LPSTR lpszMessageType;
-  LPSTR lpszDateReceived;
-  LPSTR lpszConversationID;
-  FLAGS flFlags;
-  lpMapiRecipDesc lpOriginator;
-  ULONG nRecipCount;
-  lpMapiRecipDesc lpRecips;
-  ULONG nFileCount;
-  lpMapiFileDesc lpFiles;
-} MapiMessage, *lpMapiMessage;
-
-ULONG PASCAL MAPILogon (ULONG,LPSTR,LPSTR,FLAGS,ULONG,LPLHANDLE);
-ULONG PASCAL MAPISendMail (LHANDLE,ULONG,lpMapiMessage,FLAGS,ULONG);
-ULONG PASCAL MAPISendDocuments (ULONG,LPSTR,LPSTR,LPSTR,ULONG);
-ULONG PASCAL MAPIReadMail (LHANDLE,ULONG,LPSTR,FLAGS,ULONG,
-			   lpMapiMessage*);
-ULONG PASCAL MAPIFindNext (LHANDLE,ULONG,LPSTR,LPSTR,FLAGS,ULONG,LPSTR);
-ULONG PASCAL MAPIResolveName (LHANDLE,ULONG,LPSTR,FLAGS,ULONG,
-                             lpMapiRecipDesc*);
-ULONG PASCAL MAPIAddress (LHANDLE,ULONG,LPSTR,ULONG,LPSTR,ULONG,
-			  lpMapiRecipDesc,FLAGS,ULONG,LPULONG,
-			  lpMapiRecipDesc*);
-ULONG PASCAL MAPIFreeBuffer (LPVOID);
-ULONG PASCAL MAPIDetails (LHANDLE,ULONG,lpMapiRecipDesc,FLAGS,ULONG);
-ULONG PASCAL MAPISaveMail (LHANDLE,ULONG,lpMapiMessage lpszMessage,
-                           FLAGS,ULONG,LPSTR);
-ULONG PASCAL MAPIDeleteMail (LHANDLE lpSession,ULONG,LPSTR,FLAGS,ULONG);
-ULONG PASCAL MAPILogoff (LHANDLE,ULONG,FLAGS,ULONG);
-/* Netscape extensions.  */
-ULONG PASCAL MAPIGetNetscapeVersion (void);
-ULONG PASCAL MAPI_NSCP_SynchronizeClient (LHANDLE,ULONG);
-
-/* Handles for use with GetProcAddress */
-typedef ULONG (PASCAL * LPMAPILOGON) (ULONG,LPSTR,LPSTR,FLAGS,ULONG,
-				      LPLHANDLE);
-typedef ULONG (PASCAL * LPMAPISENDMAIL) (LHANDLE,ULONG,lpMapiMessage,
-					 FLAGS,ULONG);
-typedef ULONG (PASCAL * LPMAPISENDDOCUMENTS) (ULONG,LPSTR,LPSTR,
-					      LPSTR,ULONG);
-typedef ULONG (PASCAL * LPMAPIREADMAIL) (LHANDLE,ULONG,LPSTR,FLAGS,
-					 ULONG,lpMapiMessage*);
-typedef ULONG (PASCAL * LPMAPIFINDNEXT) (LHANDLE,ULONG,LPSTR,LPSTR,
-					 FLAGS,ULONG,LPSTR);
-typedef ULONG (PASCAL * LPMAPIRESOLVENAME) (LHANDLE,ULONG,LPSTR,FLAGS,
-					    ULONG,lpMapiRecipDesc*);
-typedef ULONG (PASCAL * LPMAPIADDRESS) (LHANDLE,ULONG,LPSTR,ULONG,LPSTR,
-					ULONG,lpMapiRecipDesc,FLAGS,ULONG,
-					LPULONG,lpMapiRecipDesc*);
-typedef ULONG (PASCAL * LPMAPIFREEBUFFER) (LPVOID lpv);
-typedef ULONG (PASCAL * LPMAPIDETAILS) (LHANDLE,ULONG,lpMapiRecipDesc,
-					FLAGS,ULONG);
-typedef ULONG (PASCAL * LPMAPISAVEMAIL) (LHANDLE,ULONG,lpMapiMessage,
-					 FLAGS,ULONG,LPSTR);
-typedef ULONG (PASCAL * LPMAPIDELETEMAIL) (LHANDLE lpSession,ULONG,
-					   LPSTR, FLAGS,ULONG);
-typedef ULONG (PASCAL * LPMAPILOGOFF)(LHANDLE,ULONG,FLAGS,ULONG);
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* Not _MAPI_H */
-
diff --git a/winsup/w32api/include/mciavi.h b/winsup/w32api/include/mciavi.h
deleted file mode 100644
index 8535a7f09..000000000
--- a/winsup/w32api/include/mciavi.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _MCIAVI_H
-#define _MCIAVI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define MCI_MCIAVI_PLAY_WINDOW 0x1000000
-#define	MCI_MCIAVI_PLAY_FULLSCREEN 0x2000000
-#define MCI_MCIAVI_PLAY_FULLBY2	0x4000000
-#define MCI_AVI_STATUS_FRAMES_SKIPPED 0x8001
-#define MCI_AVI_STATUS_LAST_PLAY_SPEED	0x8002
-#define MCI_AVI_STATUS_AUDIO_BREAKS	0x8003
-#define MCI_AVI_SETVIDEO_DRAW_PROCEDURE	0x8000
-#define MCI_AVI_SETVIDEO_PALETTE_COLOR	0x8100
-#define MCI_AVI_SETVIDEO_PALETTE_HALFTONE 0x0000FFFF
-#define MCIERR_AVI_OLDAVIFORMAT	(MCIERR_CUSTOM_DRIVER_BASE+100)
-#define MCIERR_AVI_NOTINTERLEAVED	(MCIERR_CUSTOM_DRIVER_BASE+101)
-#define MCIERR_AVI_NODISPDIB	(MCIERR_CUSTOM_DRIVER_BASE+102)
-#define MCIERR_AVI_CANTPLAYFULLSCREEN	(MCIERR_CUSTOM_DRIVER_BASE+103)
-#define MCIERR_AVI_TOOBIGFORVGA	(MCIERR_CUSTOM_DRIVER_BASE+104)
-#define MCIERR_AVI_NOCOMPRESSOR (MCIERR_CUSTOM_DRIVER_BASE+105)
-#define MCIERR_AVI_DISPLAYERROR (MCIERR_CUSTOM_DRIVER_BASE+106)
-#define MCIERR_AVI_AUDIOERROR	(MCIERR_CUSTOM_DRIVER_BASE+107)
-#define MCIERR_AVI_BADPALETTE	(MCIERR_CUSTOM_DRIVER_BASE+108)
-#endif
diff --git a/winsup/w32api/include/mcx.h b/winsup/w32api/include/mcx.h
deleted file mode 100644
index c7173b77b..000000000
--- a/winsup/w32api/include/mcx.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef _MCX_H
-#define _MCX_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define DIALOPTION_BILLING 64
-#define DIALOPTION_QUIET 128
-#define DIALOPTION_DIALTONE 256
-#define MDMVOLFLAG_LOW	1
-#define MDMVOLFLAG_MEDIUM	2
-#define MDMVOLFLAG_HIGH	4
-#define MDMVOL_LOW	0
-#define MDMVOL_MEDIUM	1
-#define MDMVOL_HIGH	2
-#define MDMSPKRFLAG_OFF	1
-#define MDMSPKRFLAG_DIAL	2
-#define MDMSPKRFLAG_ON	4
-#define MDMSPKRFLAG_CALLSETUP	8
-#define MDMSPKR_OFF	0
-#define MDMSPKR_DIAL 1
-#define MDMSPKR_ON	2
-#define MDMSPKR_CALLSETUP	3
-#define MDM_COMPRESSION	1
-#define MDM_ERROR_CONTROL	2
-#define MDM_FORCED_EC	4
-#define MDM_CELLULAR	8
-#define MDM_FLOWCONTROL_HARD	16
-#define MDM_FLOWCONTROL_SOFT	32
-#define MDM_CCITT_OVERRIDE	64
-#define MDM_SPEED_ADJUST	128
-#define MDM_TONE_DIAL	256
-#define MDM_BLIND_DIAL	512
-#define MDM_V23_OVERRIDE	1024
-typedef struct _MODEMDEVCAPS {
-	DWORD dwActualSize;
-	DWORD dwRequiredSize;
-	DWORD dwDevSpecificOffset;
-	DWORD dwDevSpecificSize;
-	DWORD dwModemProviderVersion;
-	DWORD dwModemManufacturerOffset;
-	DWORD dwModemManufacturerSize;
-	DWORD dwModemModelOffset;
-	DWORD dwModemModelSize;
-	DWORD dwModemVersionOffset;
-	DWORD dwModemVersionSize;
-	DWORD dwDialOptions;
-	DWORD dwCallSetupFailTimer;
-	DWORD dwInactivityTimeout;
-	DWORD dwSpeakerVolume;
-	DWORD dwSpeakerMode;
-	DWORD dwModemOptions;
-	DWORD dwMaxDTERate;
-	DWORD dwMaxDCERate;
-	BYTE abVariablePortion[1];
-} MODEMDEVCAPS,*PMODEMDEVCAPS,*LPMODEMDEVCAPS;
-typedef struct _MODEMSETTINGS {
-	DWORD dwActualSize;
-	DWORD dwRequiredSize;
-	DWORD dwDevSpecificOffset;
-	DWORD dwDevSpecificSize;
-	DWORD dwCallSetupFailTimer;
-	DWORD dwInactivityTimeout;
-	DWORD dwSpeakerVolume;
-	DWORD dwSpeakerMode;
-	DWORD dwPreferredModemOptions;
-	DWORD dwNegotiatedModemOptions;
-	DWORD dwNegotiatedDCERate;
-	BYTE abVariablePortion[1];
-} MODEMSETTINGS,*PMODEMSETTINGS,*LPMODEMSETTINGS;
-#ifdef __cplusplus
-}
-#endif
-#endif /* _MCX_H */
diff --git a/winsup/w32api/include/mgmtapi.h b/winsup/w32api/include/mgmtapi.h
deleted file mode 100644
index 89e68e3e2..000000000
--- a/winsup/w32api/include/mgmtapi.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-  mgmtapi.h - Header file for the SNMP Management API
-
-  Written by Filip Navara <xnavara@volny.cz>
-
-  References (2003-08-25):
-    http://msdn.microsoft.com/library/en-us/snmp/snmp/snmp_reference.asp
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#ifndef _MGMTAPI_H
-#define _MGMTAPI_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifndef _SNMP_H
-#include <snmp.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SNMP_MGMTAPI_TIMEOUT	40
-#define SNMP_MGMTAPI_SELECT_FDERRORS	41
-#define SNMP_MGMTAPI_TRAP_ERRORS	42
-#define SNMP_MGMTAPI_TRAP_DUPINIT	43
-#define SNMP_MGMTAPI_NOTRAPS	44
-#define SNMP_MGMTAPI_AGAIN	45
-#define SNMP_MGMTAPI_INVALID_CTL	46
-#define SNMP_MGMTAPI_INVALID_SESSION	47
-#define SNMP_MGMTAPI_INVALID_BUFFER	48
-#define MGMCTL_SETAGENTPORT	1
-
-#ifndef RC_INVOKED
-
-typedef PVOID LPSNMP_MGR_SESSION;
-
-BOOL WINSNMPAPI SnmpMgrClose(LPSNMP_MGR_SESSION);
-BOOL WINSNMPAPI SnmpMgrCtl(LPSNMP_MGR_SESSION,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD);
-BOOL WINSNMPAPI SnmpMgrGetTrap(AsnObjectIdentifier*,AsnNetworkAddress*,AsnInteger*,AsnInteger*,AsnTimeticks*,SnmpVarBindList*);
-BOOL WINSNMPAPI SnmpMgrGetTrapEx(AsnObjectIdentifier*,AsnNetworkAddress*,AsnNetworkAddress*,AsnInteger*,AsnInteger*,AsnOctetString*,AsnTimeticks*,SnmpVarBindList*);
-BOOL WINSNMPAPI SnmpMgrOidToStr(AsnObjectIdentifier*,LPSTR*);
-LPSNMP_MGR_SESSION WINSNMPAPI SnmpMgrOpen(LPSTR,LPSTR,INT,INT);
-INT WINSNMPAPI SnmpMgrRequest(LPSNMP_MGR_SESSION,BYTE,SnmpVarBindList*,AsnInteger*,AsnInteger*);
-BOOL WINSNMPAPI SnmpMgrStrToOid(LPSTR,AsnObjectIdentifier*);
-BOOL WINSNMPAPI SnmpMgrTrapListen(HANDLE*);
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/mmsystem.h b/winsup/w32api/include/mmsystem.h
deleted file mode 100644
index 95da48c0b..000000000
--- a/winsup/w32api/include/mmsystem.h
+++ /dev/null
@@ -1,1941 +0,0 @@
-
-#ifndef _MMSYSTEM_H
-#define _MMSYSTEM_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-#pragma pack(push,1)
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define	WINMMAPI	DECLSPEC_IMPORT
-#define _loadds
-#define _huge
-#define MAXPNAMELEN 32
-#define MAXERRORLENGTH 256
-#define MAX_JOYSTICKOEMVXDNAME 260
-#define _MMRESULT_
-#define TIME_MS 1
-#define TIME_SAMPLES 2
-#define TIME_BYTES 4
-#define TIME_SMPTE 8
-#define TIME_MIDI 16
-#define TIME_TICKS 32
-#define MAKEFOURCC(c0,c1,c2,c3) ((DWORD)(BYTE)(c0)|((DWORD)(BYTE)(c1)<<8)|((DWORD)(BYTE)(c2)<<16)|((DWORD)(BYTE)(c3)<<24))
-#ifndef mmioFOURCC
-#define mmioFOURCC(c0,c1,c2,c3) MAKEFOURCC(c0,c1,c2,c3)
-#endif
-#define MM_JOY1MOVE 0x3A0
-#define MM_JOY2MOVE 0x3A1
-#define MM_JOY1ZMOVE 0x3A2
-#define MM_JOY2ZMOVE 0x3A3
-#define MM_JOY1BUTTONDOWN 0x3B5
-#define MM_JOY2BUTTONDOWN 0x3B6
-#define MM_JOY1BUTTONUP 0x3B7
-#define MM_JOY2BUTTONUP 0x3B8
-#define MM_MCINOTIFY 0x3B9
-#define MM_WOM_OPEN 0x3BB
-#define MM_WOM_CLOSE 0x3BC
-#define MM_WOM_DONE 0x3BD
-#define MM_WIM_OPEN 0x3BE
-#define MM_WIM_CLOSE 0x3BF
-#define MM_WIM_DATA 0x3C0
-#define MM_MIM_OPEN 0x3C1
-#define MM_MIM_CLOSE 0x3C2
-#define MM_MIM_DATA 0x3C3
-#define MM_MIM_LONGDATA 0x3C4
-#define MM_MIM_ERROR 0x3C5
-#define MM_MIM_LONGERROR 0x3C6
-#define MM_MOM_OPEN 0x3C7
-#define MM_MOM_CLOSE 0x3C8
-#define MM_MOM_DONE 0x3C9
-#define MM_DRVM_OPEN 0x3D0
-#define MM_DRVM_CLOSE 0x3D1
-#define MM_DRVM_DATA 0x3D2
-#define MM_DRVM_ERROR 0x3D3
-#define MM_STREAM_OPEN	0x3D4
-#define MM_STREAM_CLOSE	0x3D5
-#define MM_STREAM_DONE	0x3D6
-#define MM_STREAM_ERROR	0x3D7
-#define MM_MOM_POSITIONCB 0x3CA
-#define MM_MCISIGNAL 0x3CB
-#define MM_MIM_MOREDATA 0x3CC
-#define MM_MIXM_LINE_CHANGE 0x3D0
-#define MM_MIXM_CONTROL_CHANGE 0x3D1
-#define MMSYSERR_BASE 0
-#define WAVERR_BASE 32
-#define MIDIERR_BASE 64
-#define TIMERR_BASE 96
-#define JOYERR_BASE 160
-#define MCIERR_BASE 256
-#define MIXERR_BASE 1024
-#define MCI_STRING_OFFSET 512
-#define MCI_VD_OFFSET 1024
-#define MCI_CD_OFFSET 1088
-#define MCI_WAVE_OFFSET 1152
-#define MCI_SEQ_OFFSET 1216
-#define MMSYSERR_NOERROR 0
-#define MMSYSERR_ERROR (MMSYSERR_BASE+1)
-#define MMSYSERR_BADDEVICEID (MMSYSERR_BASE+2)
-#define MMSYSERR_NOTENABLED (MMSYSERR_BASE+3)
-#define MMSYSERR_ALLOCATED (MMSYSERR_BASE+4)
-#define MMSYSERR_INVALHANDLE (MMSYSERR_BASE+5)
-#define MMSYSERR_NODRIVER (MMSYSERR_BASE+6)
-#define MMSYSERR_NOMEM (MMSYSERR_BASE+7)
-#define MMSYSERR_NOTSUPPORTED (MMSYSERR_BASE+8)
-#define MMSYSERR_BADERRNUM (MMSYSERR_BASE+9)
-#define MMSYSERR_INVALFLAG (MMSYSERR_BASE+10)
-#define MMSYSERR_INVALPARAM (MMSYSERR_BASE+11)
-#define MMSYSERR_HANDLEBUSY (MMSYSERR_BASE+12)
-#define MMSYSERR_INVALIDALIAS (MMSYSERR_BASE+13)
-#define MMSYSERR_BADDB (MMSYSERR_BASE+14)
-#define MMSYSERR_KEYNOTFOUND (MMSYSERR_BASE+15)
-#define MMSYSERR_READERROR (MMSYSERR_BASE+16)
-#define MMSYSERR_WRITEERROR (MMSYSERR_BASE+17)
-#define MMSYSERR_DELETEERROR (MMSYSERR_BASE+18)
-#define MMSYSERR_VALNOTFOUND (MMSYSERR_BASE+19)
-#define MMSYSERR_NODRIVERCB (MMSYSERR_BASE+20)
-#define MMSYSERR_LASTERROR (MMSYSERR_BASE+20)
-#define DRV_LOAD 1
-#define DRV_ENABLE 2
-#define DRV_OPEN 3
-#define DRV_CLOSE 4
-#define DRV_DISABLE 5
-#define DRV_FREE 6
-#define DRV_CONFIGURE 7
-#define DRV_QUERYCONFIGURE 8
-#define DRV_INSTALL 9
-#define DRV_REMOVE 10
-#define DRV_EXITSESSION 11
-#define DRV_POWER 15
-#define DRV_RESERVED 0x800
-#define DRV_USER 0x4000
-#define DRVCNF_CANCEL 0
-#define DRVCNF_OK 1
-#define DRVCNF_RESTART 2
-#define DRV_CANCEL DRVCNF_CANCEL
-#define DRV_OK DRVCNF_OK
-#define DRV_RESTART DRVCNF_RESTART
-#define DRV_MCI_FIRST DRV_RESERVED
-#define DRV_MCI_LAST (DRV_RESERVED+0xFFF)
-#define CALLBACK_TYPEMASK 0x70000
-#define CALLBACK_NULL 0
-#define CALLBACK_WINDOW 0x10000
-#define CALLBACK_TASK 0x20000
-#define CALLBACK_FUNCTION 0x30000
-#define CALLBACK_THREAD CALLBACK_TASK
-#define CALLBACK_EVENT 0x50000
-#define SND_SYNC 0
-#define SND_ASYNC 1
-#define SND_NODEFAULT 2
-#define SND_MEMORY 4
-#define SND_LOOP 8
-#define SND_NOSTOP 16
-#define SND_NOWAIT	0x2000
-#define SND_ALIAS 0x10000
-#define SND_ALIAS_ID	0x110000
-#define SND_FILENAME 0x20000
-#define SND_RESOURCE 0x40004
-#define SND_PURGE 0x40
-#define SND_APPLICATION 0x80
-#define SND_ALIAS_START	0
-#define	sndAlias(c0,c1)	(SND_ALIAS_START+(DWORD)(BYTE)(c0)|((DWORD)(BYTE)(c1)<<8))
-#define SND_ALIAS_SYSTEMASTERISK sndAlias('S','*')
-#define SND_ALIAS_SYSTEMQUESTION sndAlias('S','?')
-#define SND_ALIAS_SYSTEMHAND sndAlias('S','H')
-#define SND_ALIAS_SYSTEMEXIT sndAlias('S','E')
-#define SND_ALIAS_SYSTEMSTART sndAlias('S','S')
-#define SND_ALIAS_SYSTEMWELCOME sndAlias('S','W')
-#define SND_ALIAS_SYSTEMEXCLAMATION sndAlias('S','!')
-#define SND_ALIAS_SYSTEMDEFAULT sndAlias('S','D')
-#define WAVERR_BADFORMAT (WAVERR_BASE + 0)
-#define WAVERR_STILLPLAYING (WAVERR_BASE + 1)
-#define WAVERR_UNPREPARED (WAVERR_BASE + 2)
-#define WAVERR_SYNC (WAVERR_BASE + 3)
-#define WAVERR_LASTERROR (WAVERR_BASE + 3)
-#define WOM_OPEN MM_WOM_OPEN
-#define WOM_CLOSE MM_WOM_CLOSE
-#define WOM_DONE MM_WOM_DONE
-#define WIM_OPEN MM_WIM_OPEN
-#define WIM_CLOSE MM_WIM_CLOSE
-#define WIM_DATA MM_WIM_DATA
-#define WAVE_MAPPER ((UINT)-1)
-#define WAVE_FORMAT_QUERY 1
-#define WAVE_ALLOWSYNC 2
-#define WAVE_MAPPED 4
-#define WAVE_FORMAT_DIRECT 8
-#define WAVE_FORMAT_DIRECT_QUERY (WAVE_FORMAT_QUERY|WAVE_FORMAT_DIRECT)
-#define WHDR_DONE 1
-#define WHDR_PREPARED 2
-#define WHDR_BEGINLOOP 4
-#define WHDR_ENDLOOP 8
-#define WHDR_INQUEUE 16
-#define WAVECAPS_PITCH 1
-#define WAVECAPS_PLAYBACKRATE 2
-#define WAVECAPS_VOLUME 4
-#define WAVECAPS_LRVOLUME 8
-#define WAVECAPS_SYNC 16
-#define WAVECAPS_SAMPLEACCURATE 32
-#define WAVECAPS_DIRECTSOUND 64
-#define WAVE_INVALIDFORMAT 0
-#define WAVE_FORMAT_1M08 1
-#define WAVE_FORMAT_1S08 2
-#define WAVE_FORMAT_1M16 4
-#define WAVE_FORMAT_1S16 8
-#define WAVE_FORMAT_2M08 16
-#define WAVE_FORMAT_2S08 32
-#define WAVE_FORMAT_2M16 64
-#define WAVE_FORMAT_2S16 128
-#define WAVE_FORMAT_4M08 256
-#define WAVE_FORMAT_4S08 512
-#define WAVE_FORMAT_4M16 1024
-#define WAVE_FORMAT_4S16 2048
-#define WAVE_FORMAT_PCM 1
-#define MIDIERR_UNPREPARED MIDIERR_BASE
-#define MIDIERR_STILLPLAYING (MIDIERR_BASE+1)
-#define MIDIERR_NOMAP (MIDIERR_BASE+2)
-#define MIDIERR_NOTREADY (MIDIERR_BASE+3)
-#define MIDIERR_NODEVICE (MIDIERR_BASE+4)
-#define MIDIERR_INVALIDSETUP (MIDIERR_BASE+5)
-#define MIDIERR_BADOPENMODE (MIDIERR_BASE+6)
-#define MIDIERR_DONT_CONTINUE (MIDIERR_BASE+7)
-#define MIDIERR_LASTERROR (MIDIERR_BASE+7)
-#define MIDIPATCHSIZE 128
-#define MIM_OPEN MM_MIM_OPEN
-#define MIM_CLOSE MM_MIM_CLOSE
-#define MIM_DATA MM_MIM_DATA
-#define MIM_LONGDATA MM_MIM_LONGDATA
-#define MIM_ERROR MM_MIM_ERROR
-#define MIM_LONGERROR MM_MIM_LONGERROR
-#define MOM_OPEN MM_MOM_OPEN
-#define MOM_CLOSE MM_MOM_CLOSE
-#define MOM_DONE MM_MOM_DONE
-#define MIM_MOREDATA MM_MIM_MOREDATA
-#define MOM_POSITIONCB MM_MOM_POSITIONCB
-#define MIDIMAPPER ((UINT)-1)
-#define MIDI_MAPPER ((UINT)-1)
-#define MIDI_IO_STATUS 32
-#define MIDI_CACHE_ALL 1
-#define MIDI_CACHE_BESTFIT 2
-#define MIDI_CACHE_QUERY 3
-#define MIDI_UNCACHE 4
-#define MOD_MIDIPORT 1
-#define MOD_SYNTH 2
-#define MOD_SQSYNTH 3
-#define MOD_FMSYNTH 4
-#define MOD_MAPPER 5
-#define MIDICAPS_VOLUME 1
-#define MIDICAPS_LRVOLUME 2
-#define MIDICAPS_CACHE 4
-#define MIDICAPS_STREAM 8
-#define MHDR_DONE 1
-#define MHDR_PREPARED 2
-#define MHDR_INQUEUE 4
-#define MHDR_ISSTRM 8
-#define MEVT_F_SHORT 0
-#define MEVT_F_LONG 0x80000000
-#define MEVT_F_CALLBACK 0x40000000
-#define MEVT_EVENTTYPE(x) ((BYTE)(((x)>>24)&0xFF))
-#define MEVT_EVENTPARM(x) ((DWORD)((x)&0xFFFFFFL))
-#define MEVT_SHORTMSG 0
-#define MEVT_TEMPO 1
-#define MEVT_NOP 2
-#define MEVT_LONGMSG ((BYTE)0x80)
-#define MEVT_COMMENT ((BYTE)0x82)
-#define MEVT_VERSION ((BYTE)0x84)
-#define MIDISTRM_ERROR (-2)
-#define MIDIPROP_SET 0x80000000
-#define MIDIPROP_GET 0x40000000
-#define MIDIPROP_TIMEDIV 1
-#define MIDIPROP_TEMPO 2
-#define AUX_MAPPER ((UINT)-1)
-#define AUXCAPS_CDAUDIO 1
-#define AUXCAPS_AUXIN 2
-#define AUXCAPS_VOLUME 1
-#define AUXCAPS_LRVOLUME 2
-#define MIXER_SHORT_NAME_CHARS 16
-#define MIXER_LONG_NAME_CHARS 64
-#define MIXERR_INVALLINE MIXERR_BASE
-#define MIXERR_INVALCONTROL (MIXERR_BASE+1)
-#define MIXERR_INVALVALUE (MIXERR_BASE+2)
-#define MIXERR_LASTERROR (MIXERR_BASE+2)
-#define MIXER_OBJECTF_HANDLE 0x80000000
-#define MIXER_OBJECTF_MIXER 0
-#define MIXER_OBJECTF_HMIXER (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIXER)
-#define MIXER_OBJECTF_WAVEOUT 0x10000000
-#define MIXER_OBJECTF_HWAVEOUT (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_WAVEOUT)
-#define MIXER_OBJECTF_WAVEIN 0x20000000
-#define MIXER_OBJECTF_HWAVEIN (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_WAVEIN)
-#define MIXER_OBJECTF_MIDIOUT 0x30000000
-#define MIXER_OBJECTF_HMIDIOUT (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIDIOUT)
-#define MIXER_OBJECTF_MIDIIN 0x40000000
-#define MIXER_OBJECTF_HMIDIIN (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIDIIN)
-#define MIXER_OBJECTF_AUX 0x50000000
-#define MIXERLINE_LINEF_ACTIVE 1
-#define MIXERLINE_LINEF_DISCONNECTED 0x8000
-#define MIXERLINE_LINEF_SOURCE 0x80000000
-#define MIXERLINE_COMPONENTTYPE_DST_FIRST 0
-#define MIXERLINE_COMPONENTTYPE_DST_UNDEFINED MIXERLINE_COMPONENTTYPE_DST_FIRST
-#define MIXERLINE_COMPONENTTYPE_DST_DIGITAL (MIXERLINE_COMPONENTTYPE_DST_FIRST+1)
-#define MIXERLINE_COMPONENTTYPE_DST_LINE (MIXERLINE_COMPONENTTYPE_DST_FIRST+2)
-#define MIXERLINE_COMPONENTTYPE_DST_MONITOR (MIXERLINE_COMPONENTTYPE_DST_FIRST+3)
-#define MIXERLINE_COMPONENTTYPE_DST_SPEAKERS (MIXERLINE_COMPONENTTYPE_DST_FIRST+4)
-#define MIXERLINE_COMPONENTTYPE_DST_HEADPHONES (MIXERLINE_COMPONENTTYPE_DST_FIRST+5)
-#define MIXERLINE_COMPONENTTYPE_DST_TELEPHONE (MIXERLINE_COMPONENTTYPE_DST_FIRST+6)
-#define MIXERLINE_COMPONENTTYPE_DST_WAVEIN (MIXERLINE_COMPONENTTYPE_DST_FIRST+7)
-#define MIXERLINE_COMPONENTTYPE_DST_VOICEIN (MIXERLINE_COMPONENTTYPE_DST_FIRST+8)
-#define MIXERLINE_COMPONENTTYPE_DST_LAST (MIXERLINE_COMPONENTTYPE_DST_FIRST+8)
-#define MIXERLINE_COMPONENTTYPE_SRC_FIRST 0x1000
-#define MIXERLINE_COMPONENTTYPE_SRC_UNDEFINED MIXERLINE_COMPONENTTYPE_SRC_FIRST
-#define MIXERLINE_COMPONENTTYPE_SRC_DIGITAL (MIXERLINE_COMPONENTTYPE_SRC_FIRST+1)
-#define MIXERLINE_COMPONENTTYPE_SRC_LINE (MIXERLINE_COMPONENTTYPE_SRC_FIRST+2)
-#define MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE (MIXERLINE_COMPONENTTYPE_SRC_FIRST+3)
-#define MIXERLINE_COMPONENTTYPE_SRC_SYNTHESIZER (MIXERLINE_COMPONENTTYPE_SRC_FIRST+4)
-#define MIXERLINE_COMPONENTTYPE_SRC_COMPACTDISC (MIXERLINE_COMPONENTTYPE_SRC_FIRST+5)
-#define MIXERLINE_COMPONENTTYPE_SRC_TELEPHONE (MIXERLINE_COMPONENTTYPE_SRC_FIRST+6)
-#define MIXERLINE_COMPONENTTYPE_SRC_PCSPEAKER (MIXERLINE_COMPONENTTYPE_SRC_FIRST+7)
-#define MIXERLINE_COMPONENTTYPE_SRC_WAVEOUT (MIXERLINE_COMPONENTTYPE_SRC_FIRST+8)
-#define MIXERLINE_COMPONENTTYPE_SRC_AUXILIARY (MIXERLINE_COMPONENTTYPE_SRC_FIRST+9)
-#define MIXERLINE_COMPONENTTYPE_SRC_ANALOG (MIXERLINE_COMPONENTTYPE_SRC_FIRST+10)
-#define MIXERLINE_COMPONENTTYPE_SRC_LAST (MIXERLINE_COMPONENTTYPE_SRC_FIRST+10)
-#define MIXERLINE_TARGETTYPE_UNDEFINED 0
-#define MIXERLINE_TARGETTYPE_WAVEOUT 1
-#define MIXERLINE_TARGETTYPE_WAVEIN 2
-#define MIXERLINE_TARGETTYPE_MIDIOUT 3
-#define MIXERLINE_TARGETTYPE_MIDIIN 4
-#define MIXERLINE_TARGETTYPE_AUX 5
-#define MIXER_GETLINEINFOF_DESTINATION 0
-#define MIXER_GETLINEINFOF_SOURCE 1
-#define MIXER_GETLINEINFOF_LINEID 2
-#define MIXER_GETLINEINFOF_COMPONENTTYPE 3
-#define MIXER_GETLINEINFOF_TARGETTYPE 4
-#define MIXER_GETLINEINFOF_QUERYMASK 15
-#define MIXERCONTROL_CONTROLF_UNIFORM 1
-#define MIXERCONTROL_CONTROLF_MULTIPLE 2
-#define MIXERCONTROL_CONTROLF_DISABLED 0x80000000
-#define MIXERCONTROL_CT_CLASS_MASK 0xF0000000
-#define MIXERCONTROL_CT_CLASS_CUSTOM 0
-#define MIXERCONTROL_CT_CLASS_METER 0x10000000
-#define MIXERCONTROL_CT_CLASS_SWITCH 0x20000000
-#define MIXERCONTROL_CT_CLASS_NUMBER 0x30000000
-#define MIXERCONTROL_CT_CLASS_SLIDER 0x40000000
-#define MIXERCONTROL_CT_CLASS_FADER 0x50000000
-#define MIXERCONTROL_CT_CLASS_TIME 0x60000000
-#define MIXERCONTROL_CT_CLASS_LIST 0x70000000
-#define MIXERCONTROL_CT_SUBCLASS_MASK 0xF000000
-#define MIXERCONTROL_CT_SC_SWITCH_BOOLEAN 0
-#define MIXERCONTROL_CT_SC_SWITCH_BUTTON 0x1000000
-#define MIXERCONTROL_CT_SC_METER_POLLED 0
-#define MIXERCONTROL_CT_SC_TIME_MICROSECS 0
-#define MIXERCONTROL_CT_SC_TIME_MILLISECS 0x1000000
-#define MIXERCONTROL_CT_SC_LIST_SINGLE 0
-#define MIXERCONTROL_CT_SC_LIST_MULTIPLE 0x1000000
-#define MIXERCONTROL_CT_UNITS_MASK 0xFF0000
-#define MIXERCONTROL_CT_UNITS_CUSTOM 0
-#define MIXERCONTROL_CT_UNITS_BOOLEAN 0x10000
-#define MIXERCONTROL_CT_UNITS_SIGNED 0x20000
-#define MIXERCONTROL_CT_UNITS_UNSIGNED 0x30000
-#define MIXERCONTROL_CT_UNITS_DECIBELS 0x40000
-#define MIXERCONTROL_CT_UNITS_PERCENT 0x50000
-#define MIXERCONTROL_CONTROLTYPE_CUSTOM (MIXERCONTROL_CT_CLASS_CUSTOM|MIXERCONTROL_CT_UNITS_CUSTOM)
-#define MIXERCONTROL_CONTROLTYPE_BOOLEANMETER (MIXERCONTROL_CT_CLASS_METER|MIXERCONTROL_CT_SC_METER_POLLED|MIXERCONTROL_CT_UNITS_BOOLEAN)
-#define MIXERCONTROL_CONTROLTYPE_SIGNEDMETER (MIXERCONTROL_CT_CLASS_METER|MIXERCONTROL_CT_SC_METER_POLLED|MIXERCONTROL_CT_UNITS_SIGNED)
-#define MIXERCONTROL_CONTROLTYPE_PEAKMETER (MIXERCONTROL_CONTROLTYPE_SIGNEDMETER+1)
-#define MIXERCONTROL_CONTROLTYPE_UNSIGNEDMETER (MIXERCONTROL_CT_CLASS_METER|MIXERCONTROL_CT_SC_METER_POLLED|MIXERCONTROL_CT_UNITS_UNSIGNED)
-#define MIXERCONTROL_CONTROLTYPE_BOOLEAN (MIXERCONTROL_CT_CLASS_SWITCH|MIXERCONTROL_CT_SC_SWITCH_BOOLEAN|MIXERCONTROL_CT_UNITS_BOOLEAN)
-#define MIXERCONTROL_CONTROLTYPE_ONOFF (MIXERCONTROL_CONTROLTYPE_BOOLEAN+1)
-#define MIXERCONTROL_CONTROLTYPE_MUTE (MIXERCONTROL_CONTROLTYPE_BOOLEAN+2)
-#define MIXERCONTROL_CONTROLTYPE_MONO (MIXERCONTROL_CONTROLTYPE_BOOLEAN+3)
-#define MIXERCONTROL_CONTROLTYPE_LOUDNESS (MIXERCONTROL_CONTROLTYPE_BOOLEAN+4)
-#define MIXERCONTROL_CONTROLTYPE_STEREOENH (MIXERCONTROL_CONTROLTYPE_BOOLEAN+5)
-#define MIXERCONTROL_CONTROLTYPE_BUTTON (MIXERCONTROL_CT_CLASS_SWITCH|MIXERCONTROL_CT_SC_SWITCH_BUTTON|MIXERCONTROL_CT_UNITS_BOOLEAN)
-#define MIXERCONTROL_CONTROLTYPE_DECIBELS (MIXERCONTROL_CT_CLASS_NUMBER|MIXERCONTROL_CT_UNITS_DECIBELS)
-#define MIXERCONTROL_CONTROLTYPE_SIGNED (MIXERCONTROL_CT_CLASS_NUMBER|MIXERCONTROL_CT_UNITS_SIGNED)
-#define MIXERCONTROL_CONTROLTYPE_UNSIGNED (MIXERCONTROL_CT_CLASS_NUMBER|MIXERCONTROL_CT_UNITS_UNSIGNED)
-#define MIXERCONTROL_CONTROLTYPE_PERCENT (MIXERCONTROL_CT_CLASS_NUMBER|MIXERCONTROL_CT_UNITS_PERCENT)
-#define MIXERCONTROL_CONTROLTYPE_SLIDER (MIXERCONTROL_CT_CLASS_SLIDER|MIXERCONTROL_CT_UNITS_SIGNED)
-#define MIXERCONTROL_CONTROLTYPE_PAN (MIXERCONTROL_CONTROLTYPE_SLIDER+1)
-#define MIXERCONTROL_CONTROLTYPE_QSOUNDPAN (MIXERCONTROL_CONTROLTYPE_SLIDER+2)
-#define MIXERCONTROL_CONTROLTYPE_FADER (MIXERCONTROL_CT_CLASS_FADER|MIXERCONTROL_CT_UNITS_UNSIGNED)
-#define MIXERCONTROL_CONTROLTYPE_VOLUME (MIXERCONTROL_CONTROLTYPE_FADER+1)
-#define MIXERCONTROL_CONTROLTYPE_BASS (MIXERCONTROL_CONTROLTYPE_FADER+2)
-#define MIXERCONTROL_CONTROLTYPE_TREBLE (MIXERCONTROL_CONTROLTYPE_FADER+3)
-#define MIXERCONTROL_CONTROLTYPE_EQUALIZER (MIXERCONTROL_CONTROLTYPE_FADER+4)
-#define MIXERCONTROL_CONTROLTYPE_SINGLESELECT (MIXERCONTROL_CT_CLASS_LIST|MIXERCONTROL_CT_SC_LIST_SINGLE|MIXERCONTROL_CT_UNITS_BOOLEAN)
-#define MIXERCONTROL_CONTROLTYPE_MUX (MIXERCONTROL_CONTROLTYPE_SINGLESELECT+1)
-#define MIXERCONTROL_CONTROLTYPE_MULTIPLESELECT (MIXERCONTROL_CT_CLASS_LIST|MIXERCONTROL_CT_SC_LIST_MULTIPLE|MIXERCONTROL_CT_UNITS_BOOLEAN)
-#define MIXERCONTROL_CONTROLTYPE_MIXER (MIXERCONTROL_CONTROLTYPE_MULTIPLESELECT+1)
-#define MIXERCONTROL_CONTROLTYPE_MICROTIME (MIXERCONTROL_CT_CLASS_TIME|MIXERCONTROL_CT_SC_TIME_MICROSECS|MIXERCONTROL_CT_UNITS_UNSIGNED)
-#define MIXERCONTROL_CONTROLTYPE_MILLITIME (MIXERCONTROL_CT_CLASS_TIME|MIXERCONTROL_CT_SC_TIME_MILLISECS|MIXERCONTROL_CT_UNITS_UNSIGNED)
-#define MIXER_GETLINECONTROLSF_ALL 0
-#define MIXER_GETLINECONTROLSF_ONEBYID 1
-#define MIXER_GETLINECONTROLSF_ONEBYTYPE 2
-#define MIXER_GETLINECONTROLSF_QUERYMASK 15
-#define MIXER_GETCONTROLDETAILSF_VALUE 0
-#define MIXER_GETCONTROLDETAILSF_LISTTEXT 1
-#define MIXER_GETCONTROLDETAILSF_QUERYMASK 15
-#define MIXER_SETCONTROLDETAILSF_VALUE 0
-#define MIXER_SETCONTROLDETAILSF_CUSTOM 1
-#define MIXER_SETCONTROLDETAILSF_QUERYMASK 15
-#define TIMERR_NOERROR 0
-#define TIMERR_NOCANDO (TIMERR_BASE+1)
-#define TIMERR_STRUCT (TIMERR_BASE+33)
-#define TIME_ONESHOT 0
-#define TIME_PERIODIC 1
-#define TIME_CALLBACK_FUNCTION 0
-#define TIME_CALLBACK_EVENT_SET 16
-#define TIME_CALLBACK_EVENT_PULSE 32
-#if (WINVER >= 0x0501)
-#define TIME_KILL_SYNCHRONOUS 0x0100
-#endif
-#define JOYERR_NOERROR (0)
-#define JOYERR_PARMS (JOYERR_BASE+5)
-#define JOYERR_NOCANDO (JOYERR_BASE+6)
-#define JOYERR_UNPLUGGED (JOYERR_BASE+7)
-#define JOY_BUTTON1 1
-#define JOY_BUTTON2 2
-#define JOY_BUTTON3 4
-#define JOY_BUTTON4 8
-#define JOY_BUTTON1CHG 256
-#define JOY_BUTTON2CHG 512
-#define JOY_BUTTON3CHG 1024
-#define JOY_BUTTON4CHG 2048
-#define JOY_BUTTON5 257
-#define JOY_BUTTON6 513
-#define JOY_BUTTON7 1025
-#define JOY_BUTTON8 2049
-#define JOY_BUTTON9 256
-#define JOY_BUTTON10 512
-#define JOY_BUTTON11 1024
-#define JOY_BUTTON12 2048
-#define JOY_BUTTON13 4096
-#define JOY_BUTTON14 8192
-#define JOY_BUTTON15 16384
-#define JOY_BUTTON16 32768
-#define JOY_BUTTON17 65536
-#define JOY_BUTTON18 0x20000
-#define JOY_BUTTON19 0x40000
-#define JOY_BUTTON20 0x80000
-#define JOY_BUTTON21 0x100000
-#define JOY_BUTTON22 0x200000
-#define JOY_BUTTON23 0x400000
-#define JOY_BUTTON24 0x800000
-#define JOY_BUTTON25 0x1000000
-#define JOY_BUTTON26 0x2000000
-#define JOY_BUTTON27 0x4000000
-#define JOY_BUTTON28 0x8000000
-#define JOY_BUTTON29 0x10000000
-#define JOY_BUTTON30 0x20000000
-#define JOY_BUTTON31 0x40000000
-#define JOY_BUTTON32 0x80000000
-#define JOY_POVCENTERED	((WORD)-1)
-#define JOY_POVFORWARD	0
-#define JOY_POVRIGHT	9000
-#define JOY_POVBACKWARD	18000
-#define JOY_POVLEFT	27000
-#define JOY_RETURNX	1
-#define JOY_RETURNY	2
-#define JOY_RETURNZ	4l
-#define JOY_RETURNR	8
-#define JOY_RETURNU	16
-#define JOY_RETURNV	32
-#define JOY_RETURNPOV	64
-#define JOY_RETURNBUTTONS	128
-#define JOY_RETURNRAWDATA	256
-#define JOY_RETURNPOVCTS	512
-#define JOY_RETURNCENTERED	1024
-#define JOY_USEDEADZONE	2048
-#define JOY_RETURNALL	(JOY_RETURNX|JOY_RETURNY|JOY_RETURNZ|JOY_RETURNR|JOY_RETURNU|JOY_RETURNV|JOY_RETURNPOV|JOY_RETURNBUTTONS)
-#define JOY_CAL_READALWAYS	0x10000
-#define JOY_CAL_READXYONLY	0x20000
-#define JOY_CAL_READ3	0x40000
-#define JOY_CAL_READ4	0x80000
-#define JOY_CAL_READXONLY	0x100000
-#define JOY_CAL_READYONLY	0x200000
-#define JOY_CAL_READ5	0x400000
-#define JOY_CAL_READ6	0x800000
-#define JOY_CAL_READZONLY	0x1000000
-#define JOY_CAL_READRONLY	0x2000000
-#define JOY_CAL_READUONLY	0x4000000
-#define JOY_CAL_READVONLY	0x8000000
-#define JOYSTICKID1 0
-#define JOYSTICKID2 1
-#define JOYCAPS_HASZ	1
-#define JOYCAPS_HASR	2
-#define JOYCAPS_HASU	4
-#define JOYCAPS_HASV	8
-#define JOYCAPS_HASPOV	16
-#define JOYCAPS_POV4DIR	32
-#define JOYCAPS_POVCTS	64
-#define MMIOERR_BASE 256
-#define MMIOERR_FILENOTFOUND (MMIOERR_BASE+1)
-#define MMIOERR_OUTOFMEMORY (MMIOERR_BASE+2)
-#define MMIOERR_CANNOTOPEN (MMIOERR_BASE+3)
-#define MMIOERR_CANNOTCLOSE (MMIOERR_BASE+4)
-#define MMIOERR_CANNOTREAD (MMIOERR_BASE+5)
-#define MMIOERR_CANNOTWRITE (MMIOERR_BASE+6)
-#define MMIOERR_CANNOTSEEK (MMIOERR_BASE+7)
-#define MMIOERR_CANNOTEXPAND (MMIOERR_BASE+8)
-#define MMIOERR_CHUNKNOTFOUND (MMIOERR_BASE+9)
-#define MMIOERR_UNBUFFERED (MMIOERR_BASE+10)
-#define MMIOERR_PATHNOTFOUND (MMIOERR_BASE+11)
-#define MMIOERR_ACCESSDENIED (MMIOERR_BASE+12)
-#define MMIOERR_SHARINGVIOLATION (MMIOERR_BASE+13)
-#define MMIOERR_NETWORKERROR (MMIOERR_BASE+14)
-#define MMIOERR_TOOMANYOPENFILES (MMIOERR_BASE+15)
-#define MMIOERR_INVALIDFILE (MMIOERR_BASE+16)
-#define CFSEPCHAR '+'
-#define MMIO_RWMODE 3
-#define MMIO_SHAREMODE 0x70
-#define MMIO_CREATE 0x1000
-#define MMIO_PARSE 256
-#define MMIO_DELETE 512
-#define MMIO_EXIST 0x4000
-#define MMIO_ALLOCBUF 0x10000
-#define MMIO_GETTEMP 0x20000
-#define MMIO_DIRTY 0x10000000
-#define MMIO_READ 0
-#define MMIO_WRITE 1
-#define MMIO_READWRITE 2
-#define MMIO_COMPAT 0
-#define MMIO_EXCLUSIVE 16
-#define MMIO_DENYWRITE 32
-#define MMIO_DENYREAD 0x30
-#define MMIO_DENYNONE 64
-#define MMIO_FHOPEN 16
-#define MMIO_EMPTYBUF 16
-#define MMIO_TOUPPER 16
-#define MMIO_INSTALLPROC 0x10000
-#define MMIO_GLOBALPROC 0x10000000
-#define MMIO_REMOVEPROC 0x20000
-#define MMIO_UNICODEPROC 0x1000000
-#define MMIO_FINDPROC 0x40000
-#define MMIO_FINDCHUNK 16
-#define MMIO_FINDRIFF 32
-#define MMIO_FINDLIST 64
-#define MMIO_CREATERIFF 32
-#define MMIO_CREATELIST 64
-#define MMIOM_READ MMIO_READ
-#define MMIOM_WRITE MMIO_WRITE
-#define MMIOM_SEEK 2
-#define MMIOM_OPEN 3
-#define MMIOM_CLOSE 4
-#define MMIOM_WRITEFLUSH 5
-#define MMIOM_RENAME 6
-#define MMIOM_USER 0x8000
-#define FOURCC_RIFF mmioFOURCC('R', 'I', 'F', 'F')
-#define FOURCC_LIST mmioFOURCC('L', 'I', 'S', 'T')
-#define FOURCC_DOS mmioFOURCC('D', 'O', 'S', ' ')
-#define FOURCC_MEM mmioFOURCC('M', 'E', 'M', ' ')
-#define MMIO_DEFAULTBUFFER 8192
-#define MCIERR_INVALID_DEVICE_ID (MCIERR_BASE+1)
-#define MCIERR_UNRECOGNIZED_KEYWORD (MCIERR_BASE+3)
-#define MCIERR_UNRECOGNIZED_COMMAND (MCIERR_BASE+5)
-#define MCIERR_HARDWARE (MCIERR_BASE+6)
-#define MCIERR_INVALID_DEVICE_NAME (MCIERR_BASE+7)
-#define MCIERR_OUT_OF_MEMORY (MCIERR_BASE+8)
-#define MCIERR_DEVICE_OPEN (MCIERR_BASE+9)
-#define MCIERR_CANNOT_LOAD_DRIVER (MCIERR_BASE+10)
-#define MCIERR_MISSING_COMMAND_STRING (MCIERR_BASE+11)
-#define MCIERR_PARAM_OVERFLOW (MCIERR_BASE+12)
-#define MCIERR_MISSING_STRING_ARGUMENT (MCIERR_BASE+13)
-#define MCIERR_BAD_INTEGER (MCIERR_BASE+14)
-#define MCIERR_PARSER_INTERNAL (MCIERR_BASE+15)
-#define MCIERR_DRIVER_INTERNAL (MCIERR_BASE+16)
-#define MCIERR_MISSING_PARAMETER (MCIERR_BASE+17)
-#define MCIERR_UNSUPPORTED_FUNCTION (MCIERR_BASE+18)
-#define MCIERR_FILE_NOT_FOUND (MCIERR_BASE+19)
-#define MCIERR_DEVICE_NOT_READY (MCIERR_BASE+20)
-#define MCIERR_INTERNAL (MCIERR_BASE+21)
-#define MCIERR_DRIVER (MCIERR_BASE+22)
-#define MCIERR_CANNOT_USE_ALL (MCIERR_BASE+23)
-#define MCIERR_MULTIPLE (MCIERR_BASE+24)
-#define MCIERR_EXTENSION_NOT_FOUND (MCIERR_BASE+25)
-#define MCIERR_OUTOFRANGE (MCIERR_BASE+26)
-#define MCIERR_FLAGS_NOT_COMPATIBLE (MCIERR_BASE+28)
-#define MCIERR_FILE_NOT_SAVED (MCIERR_BASE+30)
-#define MCIERR_DEVICE_TYPE_REQUIRED (MCIERR_BASE+31)
-#define MCIERR_DEVICE_LOCKED (MCIERR_BASE+32)
-#define MCIERR_DUPLICATE_ALIAS (MCIERR_BASE+33)
-#define MCIERR_BAD_CONSTANT (MCIERR_BASE+34)
-#define MCIERR_MUST_USE_SHAREABLE (MCIERR_BASE+35)
-#define MCIERR_MISSING_DEVICE_NAME (MCIERR_BASE+36)
-#define MCIERR_BAD_TIME_FORMAT (MCIERR_BASE+37)
-#define MCIERR_NO_CLOSING_QUOTE (MCIERR_BASE+38)
-#define MCIERR_DUPLICATE_FLAGS (MCIERR_BASE+39)
-#define MCIERR_INVALID_FILE (MCIERR_BASE+40)
-#define MCIERR_NULL_PARAMETER_BLOCK (MCIERR_BASE+41)
-#define MCIERR_UNNAMED_RESOURCE (MCIERR_BASE+42)
-#define MCIERR_NEW_REQUIRES_ALIAS (MCIERR_BASE+43)
-#define MCIERR_NOTIFY_ON_AUTO_OPEN (MCIERR_BASE+44)
-#define MCIERR_NO_ELEMENT_ALLOWED (MCIERR_BASE+45)
-#define MCIERR_NONAPPLICABLE_FUNCTION (MCIERR_BASE+46)
-#define MCIERR_ILLEGAL_FOR_AUTO_OPEN (MCIERR_BASE+47)
-#define MCIERR_FILENAME_REQUIRED (MCIERR_BASE+48)
-#define MCIERR_EXTRA_CHARACTERS (MCIERR_BASE+49)
-#define MCIERR_DEVICE_NOT_INSTALLED (MCIERR_BASE+50)
-#define MCIERR_GET_CD (MCIERR_BASE+51)
-#define MCIERR_SET_CD (MCIERR_BASE+52)
-#define MCIERR_SET_DRIVE (MCIERR_BASE+53)
-#define MCIERR_DEVICE_LENGTH (MCIERR_BASE+54)
-#define MCIERR_DEVICE_ORD_LENGTH (MCIERR_BASE+55)
-#define MCIERR_NO_INTEGER (MCIERR_BASE+56)
-#define MCIERR_WAVE_OUTPUTSINUSE (MCIERR_BASE+64)
-#define MCIERR_WAVE_SETOUTPUTINUSE (MCIERR_BASE+65)
-#define MCIERR_WAVE_INPUTSINUSE (MCIERR_BASE+66)
-#define MCIERR_WAVE_SETINPUTINUSE (MCIERR_BASE+67)
-#define MCIERR_WAVE_OUTPUTUNSPECIFIED (MCIERR_BASE+68)
-#define MCIERR_WAVE_INPUTUNSPECIFIED (MCIERR_BASE+69)
-#define MCIERR_WAVE_OUTPUTSUNSUITABLE (MCIERR_BASE+70)
-#define MCIERR_WAVE_SETOUTPUTUNSUITABLE (MCIERR_BASE+71)
-#define MCIERR_WAVE_INPUTSUNSUITABLE (MCIERR_BASE+72)
-#define MCIERR_WAVE_SETINPUTUNSUITABLE (MCIERR_BASE+73)
-#define MCIERR_SEQ_DIV_INCOMPATIBLE (MCIERR_BASE+80)
-#define MCIERR_SEQ_PORT_INUSE (MCIERR_BASE+81)
-#define MCIERR_SEQ_PORT_NONEXISTENT (MCIERR_BASE+82)
-#define MCIERR_SEQ_PORT_MAPNODEVICE (MCIERR_BASE+83)
-#define MCIERR_SEQ_PORT_MISCERROR (MCIERR_BASE+84)
-#define MCIERR_SEQ_TIMER (MCIERR_BASE+85)
-#define MCIERR_SEQ_PORTUNSPECIFIED (MCIERR_BASE+86)
-#define MCIERR_SEQ_NOMIDIPRESENT (MCIERR_BASE+87)
-#define MCIERR_NO_WINDOW (MCIERR_BASE+90)
-#define MCIERR_CREATEWINDOW (MCIERR_BASE+91)
-#define MCIERR_FILE_READ (MCIERR_BASE+92)
-#define MCIERR_FILE_WRITE (MCIERR_BASE+93)
-#define MCIERR_NO_IDENTITY (MCIERR_BASE+94)
-#define MCIERR_CUSTOM_DRIVER_BASE (MCIERR_BASE+256)
-#define MCI_FIRST DRV_MCI_FIRST
-#define MCI_OPEN 0x803
-#define MCI_CLOSE 0x804
-#define MCI_ESCAPE 0x805
-#define MCI_PLAY 0x806
-#define MCI_SEEK 0x807
-#define MCI_STOP 0x808
-#define MCI_PAUSE 0x809
-#define MCI_INFO 0x80A
-#define MCI_GETDEVCAPS 0x80B
-#define MCI_SPIN 0x80C
-#define MCI_SET 0x80D
-#define MCI_STEP 0x80E
-#define MCI_RECORD 0x80F
-#define MCI_SYSINFO 0x810
-#define MCI_BREAK 0x811
-#define MCI_SAVE 0x813
-#define MCI_STATUS 0x814
-#define MCI_CUE 0x830
-#define MCI_REALIZE 0x840
-#define MCI_WINDOW 0x841
-#define MCI_PUT 0x842
-#define MCI_WHERE 0x843
-#define MCI_FREEZE 0x844
-#define MCI_UNFREEZE 0x845
-#define MCI_LOAD 0x850
-#define MCI_CUT 0x851
-#define MCI_COPY 0x852
-#define MCI_PASTE 0x853
-#define MCI_UPDATE 0x854
-#define MCI_RESUME 0x855
-#define MCI_DELETE 0x856
-#define MCI_USER_MESSAGES (DRV_MCI_FIRST+0x400)
-#define MCI_LAST 0xFFF
-#define MCI_ALL_DEVICE_ID ((MCIDEVICEID)-1)
-#define MCI_DEVTYPE_VCR 513
-#define MCI_DEVTYPE_VIDEODISC 514
-#define MCI_DEVTYPE_OVERLAY 515
-#define MCI_DEVTYPE_CD_AUDIO 516
-#define MCI_DEVTYPE_DAT 517
-#define MCI_DEVTYPE_SCANNER 518
-#define MCI_DEVTYPE_ANIMATION 519
-#define MCI_DEVTYPE_DIGITAL_VIDEO 520
-#define MCI_DEVTYPE_OTHER 521
-#define MCI_DEVTYPE_WAVEFORM_AUDIO 522
-#define MCI_DEVTYPE_SEQUENCER 523
-#define MCI_DEVTYPE_FIRST MCI_DEVTYPE_VCR
-#define MCI_DEVTYPE_LAST MCI_DEVTYPE_SEQUENCER
-#define MCI_DEVTYPE_FIRST_USER 0x1000
-#define MCI_MODE_NOT_READY (MCI_STRING_OFFSET+12)
-#define MCI_MODE_STOP (MCI_STRING_OFFSET+13)
-#define MCI_MODE_PLAY (MCI_STRING_OFFSET+14)
-#define MCI_MODE_RECORD (MCI_STRING_OFFSET+15)
-#define MCI_MODE_SEEK (MCI_STRING_OFFSET+16)
-#define MCI_MODE_PAUSE (MCI_STRING_OFFSET+17)
-#define MCI_MODE_OPEN (MCI_STRING_OFFSET+18)
-#define MCI_FORMAT_MILLISECONDS 0
-#define MCI_FORMAT_HMS 1
-#define MCI_FORMAT_MSF 2
-#define MCI_FORMAT_FRAMES 3
-#define MCI_FORMAT_SMPTE_24 4
-#define MCI_FORMAT_SMPTE_25 5
-#define MCI_FORMAT_SMPTE_30 6
-#define MCI_FORMAT_SMPTE_30DROP 7
-#define MCI_FORMAT_BYTES 8
-#define MCI_FORMAT_SAMPLES 9
-#define MCI_FORMAT_TMSF 10
-#define MCI_MSF_MINUTE(t) ((BYTE)(t))
-#define MCI_MSF_SECOND(t) ((BYTE)(((WORD)(t))>>8))
-#define MCI_MSF_FRAME(t) ((BYTE)((t)>>16))
-#define MCI_MAKE_MSF(m,s,f) ((DWORD)(((BYTE)(m)|((WORD)(s)<<8))|(((DWORD)(BYTE)(f))<<16)))
-#define MCI_TMSF_TRACK(t) ((BYTE)(t))
-#define MCI_TMSF_MINUTE(t) ((BYTE)(((WORD)(t))>>8))
-#define MCI_TMSF_SECOND(t) ((BYTE)((t)>>16))
-#define MCI_TMSF_FRAME(t) ((BYTE)((t)>>24))
-#define MCI_MAKE_TMSF(t,m,s,f) ((DWORD)(((BYTE)(t)|((WORD)(m)<<8))|(((DWORD)(BYTE)(s)|((WORD)(f)<<8))<<16)))
-#define MCI_HMS_HOUR(t) ((BYTE)(t))
-#define MCI_HMS_MINUTE(t) ((BYTE)(((WORD)(t))>>8))
-#define MCI_HMS_SECOND(t) ((BYTE)((t)>>16))
-#define MCI_MAKE_HMS(h,m,s) ((DWORD)(((BYTE)(h)|((WORD)(m)<<8))|(((DWORD)(BYTE)(s))<<16)))
-#define MCI_NOTIFY_SUCCESSFUL 1
-#define MCI_NOTIFY_SUPERSEDED 2
-#define MCI_NOTIFY_ABORTED 4
-#define MCI_NOTIFY_FAILURE 8
-#define MCI_NOTIFY 1
-#define MCI_WAIT 2
-#define MCI_FROM 4
-#define MCI_TO 8
-#define MCI_TRACK 16
-#define MCI_OPEN_SHAREABLE 256
-#define MCI_OPEN_ELEMENT 512
-#define MCI_OPEN_ALIAS 1024
-#define MCI_OPEN_ELEMENT_ID 2048
-#define MCI_OPEN_TYPE_ID 0x1000
-#define MCI_OPEN_TYPE 0x2000
-#define MCI_SEEK_TO_START 256
-#define MCI_SEEK_TO_END 512
-#define MCI_STATUS_ITEM 256
-#define MCI_STATUS_START 512
-#define MCI_STATUS_LENGTH 1
-#define MCI_STATUS_POSITION 2
-#define MCI_STATUS_NUMBER_OF_TRACKS 3
-#define MCI_STATUS_MODE 4
-#define MCI_STATUS_MEDIA_PRESENT 5
-#define MCI_STATUS_TIME_FORMAT 6
-#define MCI_STATUS_READY 7
-#define MCI_STATUS_CURRENT_TRACK 8
-#define MCI_INFO_PRODUCT 256
-#define MCI_INFO_FILE 512
-#define MCI_INFO_MEDIA_UPC 1024
-#define MCI_INFO_MEDIA_IDENTITY 2048
-#define MCI_INFO_NAME 0x1000
-#define MCI_INFO_COPYRIGHT 0x2000
-#define MCI_GETDEVCAPS_ITEM 256
-#define MCI_GETDEVCAPS_CAN_RECORD 1
-#define MCI_GETDEVCAPS_HAS_AUDIO 2
-#define MCI_GETDEVCAPS_HAS_VIDEO 3
-#define MCI_GETDEVCAPS_DEVICE_TYPE 4
-#define MCI_GETDEVCAPS_USES_FILES 5
-#define MCI_GETDEVCAPS_COMPOUND_DEVICE 6
-#define MCI_GETDEVCAPS_CAN_EJECT 7
-#define MCI_GETDEVCAPS_CAN_PLAY 8
-#define MCI_GETDEVCAPS_CAN_SAVE 9
-#define MCI_SYSINFO_QUANTITY 256
-#define MCI_SYSINFO_OPEN 512
-#define MCI_SYSINFO_NAME 1024
-#define MCI_SYSINFO_INSTALLNAME 2048
-#define MCI_SET_DOOR_OPEN 256
-#define MCI_SET_DOOR_CLOSED 512
-#define MCI_SET_TIME_FORMAT 1024
-#define MCI_SET_AUDIO 2048
-#define MCI_SET_VIDEO 0x1000
-#define MCI_SET_ON 0x2000
-#define MCI_SET_OFF 0x4000
-#define MCI_SET_AUDIO_ALL 0
-#define MCI_SET_AUDIO_LEFT 1
-#define MCI_SET_AUDIO_RIGHT 2
-#define MCI_BREAK_KEY 256
-#define MCI_BREAK_HWND 512
-#define MCI_BREAK_OFF 1024
-#define MCI_RECORD_INSERT 256
-#define MCI_RECORD_OVERWRITE 512
-#define MCI_SAVE_FILE 256
-#define MCI_LOAD_FILE 256
-#define MCI_VD_MODE_PARK (MCI_VD_OFFSET+1)
-#define MCI_VD_MEDIA_CLV (MCI_VD_OFFSET+2)
-#define MCI_VD_MEDIA_CAV (MCI_VD_OFFSET+3)
-#define MCI_VD_MEDIA_OTHER (MCI_VD_OFFSET+4)
-#define MCI_VD_FORMAT_TRACK 0x4001
-#define MCI_VD_PLAY_REVERSE 0x10000
-#define MCI_VD_PLAY_FAST 0x20000
-#define MCI_VD_PLAY_SPEED 0x40000
-#define MCI_VD_PLAY_SCAN 0x80000
-#define MCI_VD_PLAY_SLOW 0x100000
-#define MCI_VD_SEEK_REVERSE 0x10000
-#define MCI_VD_STATUS_SPEED 0x4002
-#define MCI_VD_STATUS_FORWARD 0x4003
-#define MCI_VD_STATUS_MEDIA_TYPE 0x4004
-#define MCI_VD_STATUS_SIDE 0x4005
-#define MCI_VD_STATUS_DISC_SIZE 0x4006
-#define MCI_VD_GETDEVCAPS_CLV 0x10000
-#define MCI_VD_GETDEVCAPS_CAV 0x20000
-#define MCI_VD_SPIN_UP 0x10000
-#define MCI_VD_SPIN_DOWN 0x20000
-#define MCI_VD_GETDEVCAPS_CAN_REVERSE 0x4002
-#define MCI_VD_GETDEVCAPS_FAST_RATE 0x4003
-#define MCI_VD_GETDEVCAPS_SLOW_RATE 0x4004
-#define MCI_VD_GETDEVCAPS_NORMAL_RATE 0x4005
-#define MCI_VD_STEP_FRAMES 0x10000
-#define MCI_VD_STEP_REVERSE 0x20000
-#define MCI_VD_ESCAPE_STRING 256
-#define MCI_CDA_STATUS_TYPE_TRACK 0x4001
-#define MCI_CDA_TRACK_AUDIO MCI_CD_OFFSET
-#define MCI_CDA_TRACK_OTHER (MCI_CD_OFFSET+1)
-#define MCI_WAVE_PCM MCI_WAVE_OFFSET
-#define MCI_WAVE_MAPPER (MCI_WAVE_OFFSET+1)
-#define MCI_WAVE_OPEN_BUFFER 0x10000
-#define MCI_WAVE_SET_FORMATTAG 0x10000
-#define MCI_WAVE_SET_CHANNELS 0x20000
-#define MCI_WAVE_SET_SAMPLESPERSEC 0x40000
-#define MCI_WAVE_SET_AVGBYTESPERSEC 0x80000
-#define MCI_WAVE_SET_BLOCKALIGN 0x100000
-#define MCI_WAVE_SET_BITSPERSAMPLE 0x200000
-#define MCI_WAVE_INPUT 0x400000
-#define MCI_WAVE_OUTPUT 0x800000
-#define MCI_WAVE_STATUS_FORMATTAG 0x4001
-#define MCI_WAVE_STATUS_CHANNELS 0x4002
-#define MCI_WAVE_STATUS_SAMPLESPERSEC 0x4003
-#define MCI_WAVE_STATUS_AVGBYTESPERSEC 0x4004
-#define MCI_WAVE_STATUS_BLOCKALIGN 0x4005
-#define MCI_WAVE_STATUS_BITSPERSAMPLE 0x4006
-#define MCI_WAVE_STATUS_LEVEL 0x4007
-#define MCI_WAVE_SET_ANYINPUT 0x4000000
-#define MCI_WAVE_SET_ANYOUTPUT 0x8000000
-#define MCI_WAVE_GETDEVCAPS_INPUTS 0x4001
-#define MCI_WAVE_GETDEVCAPS_OUTPUTS 0x4002
-#define MCI_SEQ_DIV_PPQN MCI_SEQ_OFFSET
-#define MCI_SEQ_DIV_SMPTE_24 (MCI_SEQ_OFFSET+1)
-#define MCI_SEQ_DIV_SMPTE_25 (MCI_SEQ_OFFSET+2)
-#define MCI_SEQ_DIV_SMPTE_30DROP (MCI_SEQ_OFFSET+3)
-#define MCI_SEQ_DIV_SMPTE_30 (MCI_SEQ_OFFSET+4)
-#define MCI_SEQ_FORMAT_SONGPTR 0x4001
-#define MCI_SEQ_FILE 0x4002
-#define MCI_SEQ_MIDI 0x4003
-#define MCI_SEQ_SMPTE 0x4004
-#define MCI_SEQ_NONE 65533
-#define MCI_SEQ_MAPPER 65535
-#define MCI_SEQ_STATUS_TEMPO 0x4002
-#define MCI_SEQ_STATUS_PORT 0x4003
-#define MCI_SEQ_STATUS_SLAVE 0x4007
-#define MCI_SEQ_STATUS_MASTER 0x4008
-#define MCI_SEQ_STATUS_OFFSET 0x4009
-#define MCI_SEQ_STATUS_DIVTYPE 0x400A
-#define MCI_SEQ_STATUS_NAME 0x400B
-#define MCI_SEQ_STATUS_COPYRIGHT 0x400C
-#define MCI_SEQ_SET_TEMPO 0x10000
-#define MCI_SEQ_SET_PORT 0x20000
-#define MCI_SEQ_SET_SLAVE 0x40000
-#define MCI_SEQ_SET_MASTER 0x80000
-#define MCI_SEQ_SET_OFFSET 0x1000000
-#define MCI_ANIM_OPEN_WS 0x10000
-#define MCI_ANIM_OPEN_PARENT 0x20000
-#define MCI_ANIM_OPEN_NOSTATIC 0x40000
-#define MCI_ANIM_PLAY_SPEED 0x10000
-#define MCI_ANIM_PLAY_REVERSE 0x20000
-#define MCI_ANIM_PLAY_FAST 0x40000
-#define MCI_ANIM_PLAY_SLOW 0x80000
-#define MCI_ANIM_PLAY_SCAN 0x100000
-#define MCI_ANIM_STEP_REVERSE 0x10000
-#define MCI_ANIM_STEP_FRAMES 0x20000
-#define MCI_ANIM_STATUS_SPEED 0x4001
-#define MCI_ANIM_STATUS_FORWARD 0x4002
-#define MCI_ANIM_STATUS_HWND 0x4003
-#define MCI_ANIM_STATUS_HPAL 0x4004
-#define MCI_ANIM_STATUS_STRETCH 0x4005
-#define MCI_ANIM_INFO_TEXT 0x10000
-#define MCI_ANIM_GETDEVCAPS_CAN_REVERSE 0x4001
-#define MCI_ANIM_GETDEVCAPS_FAST_RATE 0x4002
-#define MCI_ANIM_GETDEVCAPS_SLOW_RATE 0x4003
-#define MCI_ANIM_GETDEVCAPS_NORMAL_RATE 0x4004
-#define MCI_ANIM_GETDEVCAPS_PALETTES 0x4006
-#define MCI_ANIM_GETDEVCAPS_CAN_STRETCH 0x4007
-#define MCI_ANIM_GETDEVCAPS_MAX_WINDOWS 0x4008
-#define MCI_ANIM_REALIZE_NORM 0x10000
-#define MCI_ANIM_REALIZE_BKGD 0x20000
-#define MCI_ANIM_WINDOW_HWND 0x10000
-#define MCI_ANIM_WINDOW_STATE 0x40000
-#define MCI_ANIM_WINDOW_TEXT 0x80000
-#define MCI_ANIM_WINDOW_ENABLE_STRETCH 0x100000
-#define MCI_ANIM_WINDOW_DISABLE_STRETCH 0x200000
-#define MCI_ANIM_WINDOW_DEFAULT 0xL
-#define MCI_ANIM_RECT 0x10000
-#define MCI_ANIM_PUT_SOURCE 0x20000
-#define MCI_ANIM_PUT_DESTINATION 0x40000
-#define MCI_ANIM_WHERE_SOURCE 0x20000
-#define MCI_ANIM_WHERE_DESTINATION 0x40000
-#define MCI_ANIM_UPDATE_HDC 0x20000
-#define MCI_OVLY_OPEN_WS 0x10000
-#define MCI_OVLY_OPEN_PARENT 0x20000
-#define MCI_OVLY_STATUS_HWND 0x4001
-#define MCI_OVLY_STATUS_STRETCH 0x4002
-#define MCI_OVLY_INFO_TEXT 0x10000
-#define MCI_OVLY_GETDEVCAPS_CAN_STRETCH 0x4001
-#define MCI_OVLY_GETDEVCAPS_CAN_FREEZE 0x4002
-#define MCI_OVLY_GETDEVCAPS_MAX_WINDOWS 0x4003
-#define MCI_OVLY_WINDOW_HWND 0x10000
-#define MCI_OVLY_WINDOW_STATE 0x40000
-#define MCI_OVLY_WINDOW_TEXT 0x80000
-#define MCI_OVLY_WINDOW_ENABLE_STRETCH 0x100000
-#define MCI_OVLY_WINDOW_DISABLE_STRETCH 0x200000
-#define MCI_OVLY_WINDOW_DEFAULT 0xL
-#define MCI_OVLY_RECT 0x10000
-#define MCI_OVLY_PUT_SOURCE 0x20000
-#define MCI_OVLY_PUT_DESTINATION 0x40000
-#define MCI_OVLY_PUT_FRAME 0x80000
-#define MCI_OVLY_PUT_VIDEO 0x100000
-#define MCI_OVLY_WHERE_SOURCE 0x20000
-#define MCI_OVLY_WHERE_DESTINATION 0x40000
-#define MCI_OVLY_WHERE_FRAME 0x80000
-#define MCI_OVLY_WHERE_VIDEO 0x100000
-#define NEWTRANSPARENT 3
-#define QUERYROPSUPPORT 40
-#define SELECTDIB 41
-#define DIBINDEX(n) MAKELONG((n),0x10FF)
-#define SC_SCREENSAVE 0xF140
-#define CAPS1 94
-#define C1_TRANSPARENT 1
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-#ifndef SEEK_END
-#define SEEK_END 2
-#endif
-
-typedef DWORD MCIERROR;
-typedef UINT MCIDEVICEID;
-typedef UINT(CALLBACK *YIELDPROC)(MCIDEVICEID,DWORD);
-typedef UINT MMVERSION;
-typedef UINT MMRESULT;
-typedef struct mmtime_tag {
-	UINT wType;
-	union {
-		DWORD ms;
-		DWORD sample;
-		DWORD cb;
-		DWORD ticks;
-		struct {
-			BYTE hour;
-			BYTE min;
-			BYTE sec;
-			BYTE frame;
-			BYTE fps;
-			BYTE dummy;
-			BYTE pad[2];
-		} smpte;
-		struct {
-			DWORD songptrpos;
-		} midi;
-	} u;
-} MMTIME,*PMMTIME,*LPMMTIME;
-DECLARE_HANDLE(HDRVR);
-typedef struct tagDRVCONFIGINFO {
-	DWORD dwDCISize;
-	LPCWSTR lpszDCISectionName;
-	LPCWSTR lpszDCIAliasName;
-} DRVCONFIGINFO,*PDRVCONFIGINFO,*LPDRVCONFIGINFO;
-typedef struct DRVCONFIGINFOEX {
-	DWORD dwDCISize;
-	LPCWSTR lpszDCISectionName;
-	LPCWSTR lpszDCIAliasName;
-	DWORD dnDevNode;
-} DRVCONFIGINFOEX,*PDRVCONFIGINFOEX,*LPDRVCONFIGINFOEX;
-typedef LRESULT(CALLBACK* DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM);
-typedef void (CALLBACK DRVCALLBACK)(HDRVR,UINT,DWORD,DWORD,DWORD);
-typedef DRVCALLBACK *LPDRVCALLBACK;
-typedef DRVCALLBACK *PDRVCALLBACK;
-DECLARE_HANDLE(HWAVE);
-DECLARE_HANDLE(HWAVEIN);
-DECLARE_HANDLE(HWAVEOUT);
-typedef HWAVEIN *LPHWAVEIN;
-typedef HWAVEOUT *LPHWAVEOUT;
-typedef DRVCALLBACK WAVECALLBACK;
-typedef WAVECALLBACK *LPWAVECALLBACK;
-typedef struct wavehdr_tag {
-	LPSTR lpData;
-	DWORD dwBufferLength;
-	DWORD dwBytesRecorded;
-	DWORD dwUser;
-	DWORD dwFlags;
-	DWORD dwLoops;
-	struct wavehdr_tag *lpNext;
-	DWORD reserved;
-} WAVEHDR,*PWAVEHDR,*LPWAVEHDR;
-typedef struct tagWAVEOUTCAPSA {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	CHAR szPname[MAXPNAMELEN];
-	DWORD dwFormats;
-	WORD wChannels;
-	WORD wReserved1;
-	DWORD dwSupport;
-} WAVEOUTCAPSA,*PWAVEOUTCAPSA,*LPWAVEOUTCAPSA;
-typedef struct tagWAVEOUTCAPSW {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	WCHAR szPname[MAXPNAMELEN];
-	DWORD dwFormats;
-	WORD wChannels;
-	WORD wReserved1;
-	DWORD dwSupport;
-} WAVEOUTCAPSW,*PWAVEOUTCAPSW,*LPWAVEOUTCAPSW;
-typedef struct tagWAVEINCAPSA {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	CHAR szPname[MAXPNAMELEN];
-	DWORD dwFormats;
-	WORD wChannels;
-	WORD wReserved1;
-} WAVEINCAPSA,*PWAVEINCAPSA,*LPWAVEINCAPSA;
-typedef struct tagWAVEINCAPSW {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	WCHAR szPname[MAXPNAMELEN];
-	DWORD dwFormats;
-	WORD wChannels;
-	WORD wReserved1;
-} WAVEINCAPSW,*PWAVEINCAPSW,*LPWAVEINCAPSW;
-typedef struct waveformat_tag {
-	WORD wFormatTag;
-	WORD nChannels;
-	DWORD nSamplesPerSec;
-	DWORD nAvgBytesPerSec;
-	WORD nBlockAlign;
-} WAVEFORMAT,*PWAVEFORMAT,*LPWAVEFORMAT;
-typedef struct pcmwaveformat_tag {
-	WAVEFORMAT wf;
-	WORD wBitsPerSample;
-} PCMWAVEFORMAT, *PPCMWAVEFORMAT,*LPPCMWAVEFORMAT;
-#ifndef _WAVEFORMATEX_
-#define _WAVEFORMATEX_
-typedef struct tWAVEFORMATEX {
-	WORD wFormatTag;
-	WORD nChannels;
-	DWORD nSamplesPerSec;
-	DWORD nAvgBytesPerSec;
-	WORD nBlockAlign;
-	WORD wBitsPerSample;
-	WORD cbSize;
-} WAVEFORMATEX,*PWAVEFORMATEX,*LPWAVEFORMATEX;
-typedef const WAVEFORMATEX *LPCWAVEFORMATEX;
-#endif
-DECLARE_HANDLE(HMIDI);
-DECLARE_HANDLE(HMIDIIN);
-DECLARE_HANDLE(HMIDIOUT);
-DECLARE_HANDLE(HMIDISTRM);
-typedef HMIDI *LPHMIDI;
-typedef HMIDIIN *LPHMIDIIN;
-typedef HMIDIOUT *LPHMIDIOUT;
-typedef HMIDISTRM *LPHMIDISTRM;
-typedef DRVCALLBACK MIDICALLBACK;
-typedef MIDICALLBACK *LPMIDICALLBACK;
-typedef WORD PATCHARRAY[MIDIPATCHSIZE];
-typedef WORD *LPPATCHARRAY;
-typedef WORD KEYARRAY[MIDIPATCHSIZE];
-typedef WORD *LPKEYARRAY;
-typedef struct tagMIDIOUTCAPSA {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	CHAR szPname[MAXPNAMELEN];
-	WORD wTechnology;
-	WORD wVoices;
-	WORD wNotes;
-	WORD wChannelMask;
-	DWORD dwSupport;
-} MIDIOUTCAPSA,*PMIDIOUTCAPSA,*LPMIDIOUTCAPSA;
-typedef struct tagMIDIOUTCAPSW {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	WCHAR szPname[MAXPNAMELEN];
-	WORD wTechnology;
-	WORD wVoices;
-	WORD wNotes;
-	WORD wChannelMask;
-	DWORD dwSupport;
-} MIDIOUTCAPSW,*PMIDIOUTCAPSW,*LPMIDIOUTCAPSW;
-typedef struct tagMIDIINCAPSA {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	CHAR szPname[MAXPNAMELEN];
-	DWORD dwSupport;
-} MIDIINCAPSA,*PMIDIINCAPSA,*LPMIDIINCAPSA;
-typedef struct tagMIDIINCAPSW {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	WCHAR szPname[MAXPNAMELEN];
-	DWORD dwSupport;
-} MIDIINCAPSW,*PMIDIINCAPSW,*NPMIDIINCAPSW,*LPMIDIINCAPSW;
-typedef struct midihdr_tag {
-	LPSTR lpData;
-	DWORD dwBufferLength;
-	DWORD dwBytesRecorded;
-	DWORD dwUser;
-	DWORD dwFlags;
-	struct midihdr_tag *lpNext;
-	DWORD reserved;
-	DWORD dwOffset;
-	DWORD dwReserved[8];
-} MIDIHDR,*PMIDIHDR,*LPMIDIHDR;
-typedef struct midievent_tag {
-	DWORD dwDeltaTime;
-	DWORD dwStreamID;
-	DWORD dwEvent;
-	DWORD dwParms[1];
-} MIDIEVENT;
-typedef struct midistrmbuffver_tag {
-	DWORD dwVersion;
-	DWORD dwMid;
-	DWORD dwOEMVersion;
-} MIDISTRMBUFFVER;
-typedef struct midiproptimediv_tag {
-	DWORD cbStruct;
-	DWORD dwTimeDiv;
-} MIDIPROPTIMEDIV,*LPMIDIPROPTIMEDIV;
-typedef struct midiproptempo_tag {
-	DWORD cbStruct;
-	DWORD dwTempo;
-} MIDIPROPTEMPO,*LPMIDIPROPTEMPO;
-typedef struct tagAUXCAPSA {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	CHAR szPname[MAXPNAMELEN];
-	WORD wTechnology;
-	WORD wReserved1;
-	DWORD dwSupport;
-} AUXCAPSA,*PAUXCAPSA,*LPAUXCAPSA;
-typedef struct tagAUXCAPSW {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	WCHAR szPname[MAXPNAMELEN];
-	WORD wTechnology;
-	WORD wReserved1;
-	DWORD dwSupport;
-} AUXCAPSW,*PAUXCAPSW,*LPAUXCAPSW;
-DECLARE_HANDLE(HMIXEROBJ);
-typedef HMIXEROBJ *LPHMIXEROBJ;
-DECLARE_HANDLE(HMIXER);
-typedef HMIXER *LPHMIXER;
-typedef struct tagMIXERCAPSA {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	CHAR szPname[MAXPNAMELEN];
-	DWORD fdwSupport;
-	DWORD cDestinations;
-} MIXERCAPSA,*PMIXERCAPSA,*LPMIXERCAPSA;
-typedef struct tagMIXERCAPSW {
-	WORD wMid;
-	WORD wPid;
-	MMVERSION vDriverVersion;
-	WCHAR szPname[MAXPNAMELEN];
-	DWORD fdwSupport;
-	DWORD cDestinations;
-} MIXERCAPSW,*PMIXERCAPSW,*LPMIXERCAPSW;
-typedef struct tagMIXERLINEA {
-	DWORD cbStruct;
-	DWORD dwDestination;
-	DWORD dwSource;
-	DWORD dwLineID;
-	DWORD fdwLine;
-	DWORD dwUser;
-	DWORD dwComponentType;
-	DWORD cChannels;
-	DWORD cConnections;
-	DWORD cControls;
-	CHAR szShortName[MIXER_SHORT_NAME_CHARS];
-	CHAR szName[MIXER_LONG_NAME_CHARS];
-	struct {
-		DWORD dwType;
-		DWORD dwDeviceID;
-		WORD wMid;
-		WORD wPid;
-		MMVERSION vDriverVersion;
-		CHAR szPname[MAXPNAMELEN];
-	} Target;
-} MIXERLINEA,*PMIXERLINEA,*LPMIXERLINEA;
-typedef struct tagMIXERLINEW {
-	DWORD cbStruct;
-	DWORD dwDestination;
-	DWORD dwSource;
-	DWORD dwLineID;
-	DWORD fdwLine;
-	DWORD dwUser;
-	DWORD dwComponentType;
-	DWORD cChannels;
-	DWORD cConnections;
-	DWORD cControls;
-	WCHAR szShortName[MIXER_SHORT_NAME_CHARS];
-	WCHAR szName[MIXER_LONG_NAME_CHARS];
-	struct {
-		DWORD dwType;
-		DWORD dwDeviceID;
-		WORD wMid;
-		WORD wPid;
-		MMVERSION vDriverVersion;
-		WCHAR szPname[MAXPNAMELEN];
-	} Target;
-} MIXERLINEW,*PMIXERLINEW,*LPMIXERLINEW;
-typedef struct tagMIXERCONTROLA {
-	DWORD cbStruct;
-	DWORD dwControlID;
-	DWORD dwControlType;
-	DWORD fdwControl;
-	DWORD cMultipleItems;
-	CHAR szShortName[MIXER_SHORT_NAME_CHARS];
-	CHAR szName[MIXER_LONG_NAME_CHARS];
-	union {
-		_ANONYMOUS_STRUCT struct {
-			LONG lMinimum;
-			LONG lMaximum;
-		}_STRUCT_NAME(s);
-		_ANONYMOUS_STRUCT struct {
-			DWORD dwMinimum;
-			DWORD dwMaximum;
-		}_STRUCT_NAME(s1);
-		DWORD dwReserved[6];
-	} Bounds;
-	union {
-		DWORD cSteps;
-		DWORD cbCustomData;
-		DWORD dwReserved[6];
-	} Metrics;
-} MIXERCONTROLA,*PMIXERCONTROLA,*LPMIXERCONTROLA;
-typedef struct tagMIXERCONTROLW {
-	DWORD cbStruct;
-	DWORD dwControlID;
-	DWORD dwControlType;
-	DWORD fdwControl;
-	DWORD cMultipleItems;
-	WCHAR szShortName[MIXER_SHORT_NAME_CHARS];
-	WCHAR szName[MIXER_LONG_NAME_CHARS];
-	union {
-		_ANONYMOUS_STRUCT struct {
-			LONG lMinimum;
-			LONG lMaximum;
-		}_STRUCT_NAME(s);
-		_ANONYMOUS_STRUCT struct {
-			DWORD dwMinimum;
-			DWORD dwMaximum;
-		}_STRUCT_NAME(s1);
-		DWORD dwReserved[6];
-	} Bounds;
-	union {
-		DWORD cSteps;
-		DWORD cbCustomData;
-		DWORD dwReserved[6];
-	} Metrics;
-} MIXERCONTROLW,*PMIXERCONTROLW,*LPMIXERCONTROLW;
-typedef struct tagMIXERLINECONTROLSA {
-	DWORD cbStruct;
-	DWORD dwLineID;
-	_ANONYMOUS_UNION union {
-		DWORD dwControlID;
-		DWORD dwControlType;
-	} DUMMYUNIONNAME;
-	DWORD cControls;
-	DWORD cbmxctrl;
-	LPMIXERCONTROLA pamxctrl;
-} MIXERLINECONTROLSA,*PMIXERLINECONTROLSA,*LPMIXERLINECONTROLSA;
-typedef struct tagMIXERLINECONTROLSW {
-	DWORD cbStruct;
-	DWORD dwLineID;
-	_ANONYMOUS_UNION union {
-		DWORD dwControlID;
-		DWORD dwControlType;
-	} DUMMYUNIONNAME;
-	DWORD cControls;
-	DWORD cbmxctrl;
-	LPMIXERCONTROLW pamxctrl;
-} MIXERLINECONTROLSW,*PMIXERLINECONTROLSW,*LPMIXERLINECONTROLSW;
-typedef struct tMIXERCONTROLDETAILS {
-	DWORD cbStruct;
-	DWORD dwControlID;
-	DWORD cChannels;
-	_ANONYMOUS_UNION union {
-		HWND hwndOwner;
-		DWORD cMultipleItems;
-	} DUMMYUNIONNAME;
-	DWORD cbDetails;
-	PVOID paDetails;
-} MIXERCONTROLDETAILS,*PMIXERCONTROLDETAILS,*LPMIXERCONTROLDETAILS;
-typedef struct tagMIXERCONTROLDETAILS_LISTTEXTA {
-	DWORD dwParam1;
-	DWORD dwParam2;
-	CHAR szName[MIXER_LONG_NAME_CHARS];
-} MIXERCONTROLDETAILS_LISTTEXTA,*PMIXERCONTROLDETAILS_LISTTEXTA,*LPMIXERCONTROLDETAILS_LISTTEXTA;
-typedef struct tagMIXERCONTROLDETAILS_LISTTEXTW {
-	DWORD dwParam1;
-	DWORD dwParam2;
-	WCHAR szName[MIXER_LONG_NAME_CHARS];
-} MIXERCONTROLDETAILS_LISTTEXTW,*PMIXERCONTROLDETAILS_LISTTEXTW,*LPMIXERCONTROLDETAILS_LISTTEXTW;
-typedef struct tMIXERCONTROLDETAILS_BOOLEAN {
-	LONG fValue;
-} MIXERCONTROLDETAILS_BOOLEAN,*PMIXERCONTROLDETAILS_BOOLEAN,*LPMIXERCONTROLDETAILS_BOOLEAN;
-typedef struct tMIXERCONTROLDETAILS_SIGNED {
-	LONG lValue;
-} MIXERCONTROLDETAILS_SIGNED,*PMIXERCONTROLDETAILS_SIGNED,*LPMIXERCONTROLDETAILS_SIGNED;
-typedef struct tMIXERCONTROLDETAILS_UNSIGNED {
-	DWORD dwValue;
-} MIXERCONTROLDETAILS_UNSIGNED,*PMIXERCONTROLDETAILS_UNSIGNED,*LPMIXERCONTROLDETAILS_UNSIGNED;
-typedef void(CALLBACK TIMECALLBACK)(UINT,UINT,DWORD,DWORD,DWORD);
-typedef TIMECALLBACK *LPTIMECALLBACK;
-typedef struct timecaps_tag {
-	UINT wPeriodMin;
-	UINT wPeriodMax;
-} TIMECAPS,*PTIMECAPS,*LPTIMECAPS;
-typedef struct tagJOYCAPSA {
-	WORD wMid;
-	WORD wPid;
-	CHAR szPname[MAXPNAMELEN];
-	UINT wXmin;
-	UINT wXmax;
-	UINT wYmin;
-	UINT wYmax;
-	UINT wZmin;
-	UINT wZmax;
-	UINT wNumButtons;
-	UINT wPeriodMin;
-	UINT wPeriodMax;
-	UINT wRmin;
-	UINT wRmax;
-	UINT wUmin;
-	UINT wUmax;
-	UINT wVmin;
-	UINT wVmax;
-	UINT wCaps;
-	UINT wMaxAxes;
-	UINT wNumAxes;
-	UINT wMaxButtons;
-	CHAR szRegKey[MAXPNAMELEN];
-	CHAR szOEMVxD[MAX_JOYSTICKOEMVXDNAME];
-} JOYCAPSA,*PJOYCAPSA,*LPJOYCAPSA;
-typedef struct tagJOYCAPSW {
-	WORD wMid;
-	WORD wPid;
-	WCHAR szPname[MAXPNAMELEN];
-	UINT wXmin;
-	UINT wXmax;
-	UINT wYmin;
-	UINT wYmax;
-	UINT wZmin;
-	UINT wZmax;
-	UINT wNumButtons;
-	UINT wPeriodMin;
-	UINT wPeriodMax;
-	UINT wRmin;
-	UINT wRmax;
-	UINT wUmin;
-	UINT wUmax;
-	UINT wVmin;
-	UINT wVmax;
-	UINT wCaps;
-	UINT wMaxAxes;
-	UINT wNumAxes;
-	UINT wMaxButtons;
-	WCHAR szRegKey[MAXPNAMELEN];
-	WCHAR szOEMVxD[MAX_JOYSTICKOEMVXDNAME];
-} JOYCAPSW,*PJOYCAPSW,*LPJOYCAPSW;
-typedef struct joyinfo_tag {
-	UINT wXpos;
-	UINT wYpos;
-	UINT wZpos;
-	UINT wButtons;
-} JOYINFO,*PJOYINFO,*LPJOYINFO;
-typedef struct joyinfoex_tag {
-	DWORD dwSize;
-	DWORD dwFlags;
-	DWORD dwXpos;
-	DWORD dwYpos;
-	DWORD dwZpos;
-	DWORD dwRpos;
-	DWORD dwUpos;
-	DWORD dwVpos;
-	DWORD dwButtons;
-	DWORD dwButtonNumber;
-	DWORD dwPOV;
-	DWORD dwReserved1;
-	DWORD dwReserved2;
-} JOYINFOEX,*PJOYINFOEX,*LPJOYINFOEX;
-typedef DWORD FOURCC;
-typedef char *HPSTR;
-DECLARE_HANDLE(HMMIO);
-typedef LRESULT (CALLBACK MMIOPROC)(LPSTR,UINT,LPARAM,LPARAM);
-typedef MMIOPROC *LPMMIOPROC;
-typedef struct _MMIOINFO {
-	DWORD dwFlags;
-	FOURCC fccIOProc;
-	LPMMIOPROC pIOProc;
-	UINT wErrorRet;
-	HTASK htask;
-	LONG cchBuffer;
-	HPSTR pchBuffer;
-	HPSTR pchNext;
-	HPSTR pchEndRead;
-	HPSTR pchEndWrite;
-	LONG lBufOffset;
-	LONG lDiskOffset;
-	DWORD adwInfo[3];
-	DWORD dwReserved1;
-	DWORD dwReserved2;
-	HMMIO hmmio;
-} MMIOINFO,*PMMIOINFO,*LPMMIOINFO;
-typedef const MMIOINFO *LPCMMIOINFO;
-typedef struct _MMCKINFO {
-	FOURCC ckid;
-	DWORD cksize;
-	FOURCC fccType;
-	DWORD dwDataOffset;
-	DWORD dwFlags;
-} MMCKINFO,*PMMCKINFO,*LPMMCKINFO;
-typedef const MMCKINFO *LPCMMCKINFO;
-typedef struct tagMCI_GENERIC_PARMS {
-	DWORD dwCallback;
-} MCI_GENERIC_PARMS,*PMCI_GENERIC_PARMS,*LPMCI_GENERIC_PARMS;
-typedef struct tagMCI_OPEN_PARMSA {
-	DWORD dwCallback;
-	MCIDEVICEID wDeviceID;
-	LPCSTR lpstrDeviceType;
-	LPCSTR lpstrElementName;
-	LPCSTR lpstrAlias;
-} MCI_OPEN_PARMSA,*PMCI_OPEN_PARMSA,*LPMCI_OPEN_PARMSA;
-typedef struct tagMCI_OPEN_PARMSW {
-	DWORD dwCallback;
-	MCIDEVICEID wDeviceID;
-	LPCWSTR lpstrDeviceType;
-	LPCWSTR lpstrElementName;
-	LPCWSTR lpstrAlias;
-} MCI_OPEN_PARMSW,*PMCI_OPEN_PARMSW,*LPMCI_OPEN_PARMSW;
-typedef struct tagMCI_PLAY_PARMS {
-	DWORD dwCallback;
-	DWORD dwFrom;
-	DWORD dwTo;
-} MCI_PLAY_PARMS,*PMCI_PLAY_PARMS,*LPMCI_PLAY_PARMS;
-typedef struct tagMCI_SEEK_PARMS {
-	DWORD dwCallback;
-	DWORD dwTo;
-} MCI_SEEK_PARMS, *PMCI_SEEK_PARMS,*LPMCI_SEEK_PARMS;
-typedef struct tagMCI_STATUS_PARMS {
-	DWORD dwCallback;
-	DWORD dwReturn;
-	DWORD dwItem;
-	DWORD dwTrack;
-} MCI_STATUS_PARMS,*PMCI_STATUS_PARMS,*LPMCI_STATUS_PARMS;
-typedef struct tagMCI_INFO_PARMSA {
-	DWORD dwCallback;
-	LPSTR lpstrReturn;
-	DWORD dwRetSize;
-} MCI_INFO_PARMSA,*LPMCI_INFO_PARMSA;
-typedef struct tagMCI_INFO_PARMSW {
-	DWORD dwCallback;
-	LPWSTR lpstrReturn;
-	DWORD dwRetSize;
-} MCI_INFO_PARMSW,*LPMCI_INFO_PARMSW;
-typedef struct tagMCI_GETDEVCAPS_PARMS {
-	DWORD dwCallback;
-	DWORD dwReturn;
-	DWORD dwItem;
-} MCI_GETDEVCAPS_PARMS,*PMCI_GETDEVCAPS_PARMS,*LPMCI_GETDEVCAPS_PARMS;
-typedef struct tagMCI_SYSINFO_PARMSA {
-	DWORD dwCallback;
-	LPSTR lpstrReturn;
-	DWORD dwRetSize;
-	DWORD dwNumber;
-	UINT wDeviceType;
-} MCI_SYSINFO_PARMSA,*PMCI_SYSINFO_PARMSA,*LPMCI_SYSINFO_PARMSA;
-typedef struct tagMCI_SYSINFO_PARMSW {
-	DWORD dwCallback;
-	LPWSTR lpstrReturn;
-	DWORD dwRetSize;
-	DWORD dwNumber;
-	UINT wDeviceType;
-} MCI_SYSINFO_PARMSW,*PMCI_SYSINFO_PARMSW,*LPMCI_SYSINFO_PARMSW;
-typedef struct tagMCI_SET_PARMS {
-	DWORD dwCallback;
-	DWORD dwTimeFormat;
-	DWORD dwAudio;
-} MCI_SET_PARMS,*PMCI_SET_PARMS,*LPMCI_SET_PARMS;
-typedef struct tagMCI_BREAK_PARMS {
-	DWORD dwCallback;
-	int nVirtKey;
-	HWND hwndBreak;
-} MCI_BREAK_PARMS,*PMCI_BREAK_PARMS,*LPMCI_BREAK_PARMS;
-typedef struct tagMCI_SAVE_PARMSA {
-	DWORD dwCallback;
-	LPCSTR lpfilename;
-} MCI_SAVE_PARMSA,*PMCI_SAVE_PARMSA,*LPMCI_SAVE_PARMSA;
-typedef struct tagMCI_SAVE_PARMSW {
-	DWORD dwCallback;
-	LPCWSTR lpfilename;
-} MCI_SAVE_PARMSW,*PMCI_SAVE_PARMSW,*LPMCI_SAVE_PARMSW;
-typedef struct tagMCI_LOAD_PARMSA {
-	DWORD dwCallback;
-	LPCSTR lpfilename;
-} MCI_LOAD_PARMSA,*PMCI_LOAD_PARMSA,*LPMCI_LOAD_PARMSA;
-typedef struct tagMCI_LOAD_PARMSW {
-	DWORD dwCallback;
-	LPCWSTR lpfilename;
-} MCI_LOAD_PARMSW,*PMCI_LOAD_PARMSW,*LPMCI_LOAD_PARMSW;
-typedef struct tagMCI_RECORD_PARMS {
-	DWORD dwCallback;
-	DWORD dwFrom;
-	DWORD dwTo;
-} MCI_RECORD_PARMS,*LPMCI_RECORD_PARMS;
-typedef struct tagMCI_VD_PLAY_PARMS {
-	DWORD dwCallback;
-	DWORD dwFrom;
-	DWORD dwTo;
-	DWORD dwSpeed;
-} MCI_VD_PLAY_PARMS,*PMCI_VD_PLAY_PARMS,*LPMCI_VD_PLAY_PARMS;
-typedef struct tagMCI_VD_STEP_PARMS {
-	DWORD dwCallback;
-	DWORD dwFrames;
-} MCI_VD_STEP_PARMS,*PMCI_VD_STEP_PARMS,*LPMCI_VD_STEP_PARMS;
-typedef struct tagMCI_VD_ESCAPE_PARMSA {
-	DWORD dwCallback;
-	LPCSTR lpstrCommand;
-} MCI_VD_ESCAPE_PARMSA,*PMCI_VD_ESCAPE_PARMSA,*LPMCI_VD_ESCAPE_PARMSA;
-typedef struct tagMCI_VD_ESCAPE_PARMSW {
-	DWORD dwCallback;
-	LPCWSTR lpstrCommand;
-} MCI_VD_ESCAPE_PARMSW,*PMCI_VD_ESCAPE_PARMSW,*LPMCI_VD_ESCAPE_PARMSW;
-typedef struct tagMCI_WAVE_OPEN_PARMSA {
-	DWORD dwCallback;
-	MCIDEVICEID wDeviceID;
-	LPCSTR lpstrDeviceType;
-	LPCSTR lpstrElementName;
-	LPCSTR lpstrAlias;
-	DWORD dwBufferSeconds;
-} MCI_WAVE_OPEN_PARMSA,*PMCI_WAVE_OPEN_PARMSA,*LPMCI_WAVE_OPEN_PARMSA;
-typedef struct tagMCI_WAVE_OPEN_PARMSW {
-	DWORD dwCallback;
-	MCIDEVICEID wDeviceID;
-	LPCWSTR lpstrDeviceType;
-	LPCWSTR lpstrElementName;
-	LPCWSTR lpstrAlias;
-	DWORD dwBufferSeconds;
-} MCI_WAVE_OPEN_PARMSW,*PMCI_WAVE_OPEN_PARMSW,*LPMCI_WAVE_OPEN_PARMSW;
-typedef struct tagMCI_WAVE_DELETE_PARMS {
-	DWORD dwCallback;
-	DWORD dwFrom;
-	DWORD dwTo;
-} MCI_WAVE_DELETE_PARMS, *PMCI_WAVE_DELETE_PARMS,*LPMCI_WAVE_DELETE_PARMS;
-typedef struct tagMCI_WAVE_SET_PARMS {
-	DWORD dwCallback;
-	DWORD dwTimeFormat;
-	DWORD dwAudio;
-	UINT wInput;
-	UINT wOutput;
-	WORD wFormatTag;
-	WORD wReserved2;
-	WORD nChannels;
-	WORD wReserved3;
-	DWORD nSamplesPerSec;
-	DWORD nAvgBytesPerSec;
-	WORD nBlockAlign;
-	WORD wReserved4;
-	WORD wBitsPerSample;
-	WORD wReserved5;
-} MCI_WAVE_SET_PARMS,*PMCI_WAVE_SET_PARMS,*LPMCI_WAVE_SET_PARMS;
-
-LRESULT WINAPI CloseDriver(HDRVR,LONG,LONG);
-HDRVR WINAPI OpenDriver(LPCWSTR,LPCWSTR,LONG);
-LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LONG,LONG);
-HMODULE WINAPI DrvGetModuleHandle(HDRVR);
-HMODULE WINAPI GetDriverModuleHandle(HDRVR);
-LRESULT WINAPI DefDriverProc(DWORD,HDRVR,UINT,LPARAM,LPARAM);
-UINT WINAPI mmsystemGetVersion(void);
-#define OutputDebugStr OutputDebugString
-BOOL WINAPI sndPlaySoundA(LPCSTR,UINT);
-BOOL WINAPI sndPlaySoundW(LPCWSTR,UINT);
-BOOL WINAPI PlaySoundA(LPCSTR,HMODULE,DWORD);
-BOOL WINAPI PlaySoundW(LPCWSTR,HMODULE,DWORD);
-UINT WINAPI waveOutGetNumDevs(void);
-MMRESULT WINAPI waveOutGetDevCapsA(UINT,LPWAVEOUTCAPSA,UINT);
-MMRESULT WINAPI waveOutGetDevCapsW(UINT,LPWAVEOUTCAPSW,UINT);
-MMRESULT WINAPI waveOutGetVolume(HWAVEOUT,PDWORD);
-MMRESULT WINAPI waveOutSetVolume(HWAVEOUT,DWORD);
-MMRESULT WINAPI waveOutGetErrorTextA(MMRESULT,LPSTR,UINT);
-MMRESULT WINAPI waveOutGetErrorTextW(MMRESULT,LPWSTR,UINT);
-MMRESULT WINAPI waveOutOpen(LPHWAVEOUT,UINT,LPCWAVEFORMATEX,DWORD,DWORD,DWORD);
-MMRESULT WINAPI waveOutClose(HWAVEOUT);
-MMRESULT WINAPI waveOutPrepareHeader(HWAVEOUT,LPWAVEHDR,UINT);
-MMRESULT WINAPI waveOutUnprepareHeader(HWAVEOUT,LPWAVEHDR,UINT);
-MMRESULT WINAPI waveOutWrite(HWAVEOUT,LPWAVEHDR,UINT);
-MMRESULT WINAPI waveOutPause(HWAVEOUT);
-MMRESULT WINAPI waveOutRestart(HWAVEOUT);
-MMRESULT WINAPI waveOutReset(HWAVEOUT);
-MMRESULT WINAPI waveOutBreakLoop(HWAVEOUT);
-MMRESULT WINAPI waveOutGetPosition(HWAVEOUT,LPMMTIME,UINT);
-MMRESULT WINAPI waveOutGetPitch(HWAVEOUT,PDWORD);
-MMRESULT WINAPI waveOutSetPitch(HWAVEOUT,DWORD);
-MMRESULT WINAPI waveOutGetPlaybackRate(HWAVEOUT,PDWORD);
-MMRESULT WINAPI waveOutSetPlaybackRate(HWAVEOUT,DWORD);
-MMRESULT WINAPI waveOutGetID(HWAVEOUT,LPUINT);
-MMRESULT WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD,DWORD);
-UINT WINAPI waveInGetNumDevs(void);
-MMRESULT WINAPI waveInGetDevCapsA(UINT,LPWAVEINCAPSA,UINT);
-MMRESULT WINAPI waveInGetDevCapsW(UINT,LPWAVEINCAPSW,UINT);
-MMRESULT WINAPI waveInGetErrorTextA(MMRESULT,LPSTR,UINT);
-MMRESULT WINAPI waveInGetErrorTextW(MMRESULT,LPWSTR,UINT);
-MMRESULT WINAPI waveInOpen(LPHWAVEIN,UINT,LPCWAVEFORMATEX,DWORD,DWORD,DWORD);
-MMRESULT WINAPI waveInClose(HWAVEIN);
-MMRESULT WINAPI waveInPrepareHeader(HWAVEIN,LPWAVEHDR,UINT);
-MMRESULT WINAPI waveInUnprepareHeader(HWAVEIN,LPWAVEHDR,UINT);
-MMRESULT WINAPI waveInAddBuffer(HWAVEIN,LPWAVEHDR,UINT);
-MMRESULT WINAPI waveInStart(HWAVEIN);
-MMRESULT WINAPI waveInStop(HWAVEIN);
-MMRESULT WINAPI waveInReset(HWAVEIN);
-MMRESULT WINAPI waveInGetPosition(HWAVEIN,LPMMTIME,UINT);
-MMRESULT WINAPI waveInGetID(HWAVEIN,LPUINT);
-MMRESULT WINAPI waveInMessage(HWAVEIN,UINT,DWORD,DWORD);
-UINT WINAPI midiOutGetNumDevs(void);
-MMRESULT WINAPI midiStreamOpen(LPHMIDISTRM,LPUINT,DWORD,DWORD,DWORD,DWORD);
-MMRESULT WINAPI midiStreamClose(HMIDISTRM);
-MMRESULT WINAPI midiStreamProperty(HMIDISTRM,LPBYTE,DWORD);
-MMRESULT WINAPI midiStreamPosition(HMIDISTRM,LPMMTIME,UINT);
-MMRESULT WINAPI midiStreamOut(HMIDISTRM,LPMIDIHDR,UINT);
-MMRESULT WINAPI midiStreamPause(HMIDISTRM);
-MMRESULT WINAPI midiStreamRestart(HMIDISTRM);
-MMRESULT WINAPI midiStreamStop(HMIDISTRM);
-MMRESULT WINAPI midiConnect(HMIDI,HMIDIOUT,PVOID);
-MMRESULT WINAPI midiDisconnect(HMIDI,HMIDIOUT,PVOID);
-MMRESULT WINAPI midiOutGetDevCapsA(UINT,LPMIDIOUTCAPSA,UINT);
-MMRESULT WINAPI midiOutGetDevCapsW(UINT,LPMIDIOUTCAPSW,UINT);
-MMRESULT WINAPI midiOutGetVolume(HMIDIOUT,PDWORD);
-MMRESULT WINAPI midiOutSetVolume(HMIDIOUT,DWORD);
-MMRESULT WINAPI midiOutGetErrorTextA(MMRESULT,LPSTR,UINT);
-MMRESULT WINAPI midiOutGetErrorTextW(MMRESULT,LPWSTR,UINT);
-MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD,DWORD,DWORD);
-MMRESULT WINAPI midiOutClose(HMIDIOUT);
-MMRESULT WINAPI midiOutPrepareHeader(HMIDIOUT,LPMIDIHDR,UINT);
-MMRESULT WINAPI midiOutUnprepareHeader(HMIDIOUT,LPMIDIHDR,UINT);
-MMRESULT WINAPI midiOutShortMsg(HMIDIOUT,DWORD);
-MMRESULT WINAPI midiOutLongMsg(HMIDIOUT,LPMIDIHDR,UINT);
-MMRESULT WINAPI midiOutReset(HMIDIOUT);
-MMRESULT WINAPI midiOutCachePatches(HMIDIOUT,UINT,LPWORD,UINT);
-MMRESULT WINAPI midiOutCacheDrumPatches(HMIDIOUT,UINT,LPWORD,UINT);
-MMRESULT WINAPI midiOutGetID(HMIDIOUT,LPUINT);
-MMRESULT WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD,DWORD);
-UINT WINAPI midiInGetNumDevs(void);
-MMRESULT WINAPI midiInGetDevCapsA(UINT,LPMIDIINCAPSA,UINT);
-MMRESULT WINAPI midiInGetDevCapsW(UINT,LPMIDIINCAPSW,UINT);
-MMRESULT WINAPI midiInGetErrorTextA(MMRESULT,LPSTR,UINT);
-MMRESULT WINAPI midiInGetErrorTextW(MMRESULT,LPWSTR,UINT);
-MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD,DWORD,DWORD);
-MMRESULT WINAPI midiInClose(HMIDIIN);
-MMRESULT WINAPI midiInPrepareHeader(HMIDIIN,LPMIDIHDR,UINT);
-MMRESULT WINAPI midiInUnprepareHeader(HMIDIIN,LPMIDIHDR,UINT);
-MMRESULT WINAPI midiInAddBuffer(HMIDIIN,LPMIDIHDR,UINT);
-MMRESULT WINAPI midiInStart(HMIDIIN);
-MMRESULT WINAPI midiInStop(HMIDIIN);
-MMRESULT WINAPI midiInReset(HMIDIIN);
-MMRESULT WINAPI midiInGetID(HMIDIIN,LPUINT);
-MMRESULT WINAPI midiInMessage(HMIDIIN,UINT,DWORD,DWORD);
-UINT WINAPI auxGetNumDevs(void);
-MMRESULT WINAPI auxGetDevCapsA(UINT,LPAUXCAPSA,UINT);
-MMRESULT WINAPI auxGetDevCapsW(UINT,LPAUXCAPSW,UINT);
-MMRESULT WINAPI auxSetVolume(UINT,DWORD);
-MMRESULT WINAPI auxGetVolume(UINT,PDWORD);
-MMRESULT WINAPI auxOutMessage(UINT,UINT,DWORD,DWORD);
-UINT WINAPI mixerGetNumDevs(void);
-MMRESULT WINAPI mixerGetDevCapsA(UINT,LPMIXERCAPSA,UINT);
-MMRESULT WINAPI mixerGetDevCapsW(UINT,LPMIXERCAPSW,UINT);
-MMRESULT WINAPI mixerOpen(LPHMIXER,UINT,DWORD,DWORD,DWORD);
-MMRESULT WINAPI mixerClose(HMIXER);
-DWORD WINAPI mixerMessage(HMIXER,UINT,DWORD,DWORD);
-MMRESULT WINAPI mixerGetLineInfoA(HMIXEROBJ,LPMIXERLINEA,DWORD);
-MMRESULT WINAPI mixerGetLineInfoW(HMIXEROBJ,LPMIXERLINEW,DWORD);
-MMRESULT WINAPI mixerGetID(HMIXEROBJ,PUINT,DWORD);
-MMRESULT WINAPI mixerGetLineControlsA(HMIXEROBJ,LPMIXERLINECONTROLSA,DWORD);
-MMRESULT WINAPI mixerGetLineControlsW(HMIXEROBJ,LPMIXERLINECONTROLSW,DWORD);
-MMRESULT WINAPI mixerGetControlDetailsA(HMIXEROBJ,LPMIXERCONTROLDETAILS,DWORD);
-MMRESULT WINAPI mixerGetControlDetailsW(HMIXEROBJ,LPMIXERCONTROLDETAILS,DWORD);
-MMRESULT WINAPI mixerSetControlDetails(HMIXEROBJ,LPMIXERCONTROLDETAILS,DWORD);
-MMRESULT WINAPI timeGetSystemTime(LPMMTIME,UINT);
-DWORD WINAPI timeGetTime(void);
-MMRESULT WINAPI timeSetEvent(UINT,UINT,LPTIMECALLBACK,DWORD,UINT);
-MMRESULT WINAPI timeKillEvent(UINT);
-MMRESULT WINAPI timeGetDevCaps(LPTIMECAPS,UINT);
-MMRESULT WINAPI timeBeginPeriod(UINT);
-MMRESULT WINAPI timeEndPeriod(UINT);
-UINT WINAPI joyGetNumDevs(void);
-MMRESULT WINAPI joyGetDevCapsA(UINT,LPJOYCAPSA,UINT);
-MMRESULT WINAPI joyGetDevCapsW(UINT,LPJOYCAPSW,UINT);
-MMRESULT WINAPI joyGetPos(UINT,LPJOYINFO);
-MMRESULT WINAPI joyGetPosEx(UINT,LPJOYINFOEX);
-MMRESULT WINAPI joyGetThreshold(UINT,LPUINT);
-MMRESULT WINAPI joyReleaseCapture(UINT);
-MMRESULT WINAPI joySetCapture(HWND,UINT,UINT,BOOL);
-MMRESULT WINAPI joySetThreshold(UINT,UINT);
-FOURCC WINAPI mmioStringToFOURCCA(LPCSTR,UINT);
-FOURCC WINAPI mmioStringToFOURCCW(LPCWSTR,UINT);
-LPMMIOPROC WINAPI mmioInstallIOProcA(FOURCC,LPMMIOPROC,DWORD);
-LPMMIOPROC WINAPI mmioInstallIOProcW(FOURCC,LPMMIOPROC,DWORD);
-HMMIO WINAPI mmioOpenA(LPSTR,LPMMIOINFO,DWORD);
-HMMIO WINAPI mmioOpenW(LPWSTR,LPMMIOINFO,DWORD);
-MMRESULT WINAPI mmioRenameA(LPCSTR,LPCSTR,LPCMMIOINFO,DWORD);
-MMRESULT WINAPI mmioRenameW(LPCWSTR,LPCWSTR,LPCMMIOINFO,DWORD);
-MMRESULT WINAPI mmioClose(HMMIO,UINT);
-LONG WINAPI mmioRead(HMMIO,HPSTR,LONG);
-LONG WINAPI mmioWrite(HMMIO,LPCSTR,LONG);
-LONG WINAPI mmioSeek(HMMIO,LONG,int);
-MMRESULT WINAPI mmioGetInfo(HMMIO,LPMMIOINFO,UINT);
-MMRESULT WINAPI mmioSetInfo(HMMIO,LPCMMIOINFO,UINT);
-MMRESULT WINAPI mmioSetBuffer(HMMIO,LPSTR,LONG,UINT);
-MMRESULT WINAPI mmioFlush(HMMIO,UINT);
-MMRESULT WINAPI mmioAdvance(HMMIO,LPMMIOINFO,UINT);
-LRESULT WINAPI mmioSendMessage(HMMIO,UINT,LPARAM,LPARAM);
-MMRESULT WINAPI mmioDescend(HMMIO,LPMMCKINFO,const MMCKINFO*,UINT);
-MMRESULT WINAPI mmioAscend(HMMIO,LPMMCKINFO,UINT);
-MMRESULT WINAPI mmioCreateChunk(HMMIO,LPMMCKINFO,UINT);
-MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD);
-MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD);
-MCIERROR WINAPI mciSendStringA(LPCSTR,LPSTR,UINT,HWND);
-MCIERROR WINAPI mciSendStringW(LPCWSTR,LPWSTR,UINT,HWND);
-MCIDEVICEID WINAPI mciGetDeviceIDA(LPCSTR);
-MCIDEVICEID WINAPI mciGetDeviceIDW(LPCWSTR);
-MCIDEVICEID WINAPI mciGetDeviceIDFromElementIDA(DWORD,LPCSTR);
-MCIDEVICEID WINAPI mciGetDeviceIDFromElementIDW(DWORD,LPCWSTR);
-BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT);
-BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT);
-BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD);
-HTASK WINAPI mciGetCreatorTask(MCIDEVICEID);
-YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD);
-
-typedef struct tagMCI_SEQ_SET_PARMS {
-	DWORD dwCallback;
-	DWORD dwTimeFormat;
-	DWORD dwAudio;
-	DWORD dwTempo;
-	DWORD dwPort;
-	DWORD dwSlave;
-	DWORD dwMaster;
-	DWORD dwOffset;
-} MCI_SEQ_SET_PARMS,*PMCI_SEQ_SET_PARMS,*LPMCI_SEQ_SET_PARMS;
-typedef struct tagMCI_ANIM_OPEN_PARMSA {
-	DWORD dwCallback;
-	MCIDEVICEID wDeviceID;
-	LPCSTR lpstrDeviceType;
-	LPCSTR lpstrElementName;
-	LPCSTR lpstrAlias;
-	DWORD dwStyle;
-	HWND hWndParent;
-} MCI_ANIM_OPEN_PARMSA,*PMCI_ANIM_OPEN_PARMSA,*LPMCI_ANIM_OPEN_PARMSA;
-typedef struct tagMCI_ANIM_OPEN_PARMSW {
-	DWORD dwCallback;
-	MCIDEVICEID wDeviceID;
-	LPCWSTR lpstrDeviceType;
-	LPCWSTR lpstrElementName;
-	LPCWSTR lpstrAlias;
-	DWORD dwStyle;
-	HWND hWndParent;
-} MCI_ANIM_OPEN_PARMSW,*PMCI_ANIM_OPEN_PARMSW,*LPMCI_ANIM_OPEN_PARMSW;
-typedef struct tagMCI_ANIM_PLAY_PARMS {
-	DWORD dwCallback;
-	DWORD dwFrom;
-	DWORD dwTo;
-	DWORD dwSpeed;
-} MCI_ANIM_PLAY_PARMS,*PMCI_ANIM_PLAY_PARMS,*LPMCI_ANIM_PLAY_PARMS;
-typedef struct tagMCI_ANIM_STEP_PARMS {
-	DWORD dwCallback;
-	DWORD dwFrames;
-} MCI_ANIM_STEP_PARMS,*PMCI_ANIM_STEP_PARMS,*LPMCI_ANIM_STEP_PARMS;
-typedef struct tagMCI_ANIM_WINDOW_PARMSA {
-	DWORD dwCallback;
-	HWND hWnd;
-	UINT nCmdShow;
-	LPCSTR lpstrText;
-} MCI_ANIM_WINDOW_PARMSA,*PMCI_ANIM_WINDOW_PARMSA,*LPMCI_ANIM_WINDOW_PARMSA;
-typedef struct tagMCI_ANIM_WINDOW_PARMSW {
-	DWORD dwCallback;
-	HWND hWnd;
-	UINT nCmdShow;
-	LPCWSTR lpstrText;
-} MCI_ANIM_WINDOW_PARMSW,*PMCI_ANIM_WINDOW_PARMSW,*LPMCI_ANIM_WINDOW_PARMSW;
-typedef struct tagMCI_ANIM_RECT_PARMS {
-	DWORD dwCallback;
-#ifdef MCI_USE_OFFEXT
-	POINT ptOffset;
-	POINT ptExtent;
-#else
-	RECT rc;
-#endif
-} MCI_ANIM_RECT_PARMS,*PMCI_ANIM_RECT_PARMS,*LPMCI_ANIM_RECT_PARMS;
-typedef struct tagMCI_ANIM_UPDATE_PARMS {
-	DWORD dwCallback;
-	RECT rc;
-	HDC hDC;
-} MCI_ANIM_UPDATE_PARMS,*PMCI_ANIM_UPDATE_PARMS,*LPMCI_ANIM_UPDATE_PARMS;
-typedef struct tagMCI_OVLY_OPEN_PARMSA {
-	DWORD dwCallback;
-	MCIDEVICEID wDeviceID;
-	LPCSTR lpstrDeviceType;
-	LPCSTR lpstrElementName;
-	LPCSTR lpstrAlias;
-	DWORD dwStyle;
-	HWND hWndParent;
-} MCI_OVLY_OPEN_PARMSA,*PMCI_OVLY_OPEN_PARMSA,*LPMCI_OVLY_OPEN_PARMSA;
-typedef struct tagMCI_OVLY_OPEN_PARMSW {
-	DWORD dwCallback;
-	MCIDEVICEID wDeviceID;
-	LPCWSTR lpstrDeviceType;
-	LPCWSTR lpstrElementName;
-	LPCWSTR lpstrAlias;
-	DWORD dwStyle;
-	HWND hWndParent;
-} MCI_OVLY_OPEN_PARMSW,*PMCI_OVLY_OPEN_PARMSW,*LPMCI_OVLY_OPEN_PARMSW;
-typedef struct tagMCI_OVLY_WINDOW_PARMSA {
-	DWORD dwCallback;
-	HWND hWnd;
-	UINT nCmdShow;
-	LPCSTR lpstrText;
-} MCI_OVLY_WINDOW_PARMSA,*PMCI_OVLY_WINDOW_PARMSA,*LPMCI_OVLY_WINDOW_PARMSA;
-typedef struct tagMCI_OVLY_WINDOW_PARMSW {
-	DWORD dwCallback;
-	HWND hWnd;
-	UINT nCmdShow;
-	LPCWSTR lpstrText;
-} MCI_OVLY_WINDOW_PARMSW,*PMCI_OVLY_WINDOW_PARMSW,*LPMCI_OVLY_WINDOW_PARMSW;
-typedef struct tagMCI_OVLY_RECT_PARMS {
-	DWORD dwCallback;
-#ifdef MCI_USE_OFFEXT
-	POINT ptOffset;
-	POINT ptExtent;
-#else
-	RECT rc;
-#endif
-} MCI_OVLY_RECT_PARMS,*PMCI_OVLY_RECT_PARMS,*LPMCI_OVLY_RECT_PARMS;
-typedef struct tagMCI_OVLY_SAVE_PARMSA {
-	DWORD dwCallback;
-	LPCSTR lpfilename;
-	RECT rc;
-} MCI_OVLY_SAVE_PARMSA,*PMCI_OVLY_SAVE_PARMSA,*LPMCI_OVLY_SAVE_PARMSA;
-typedef struct tagMCI_OVLY_SAVE_PARMSW {
-	DWORD dwCallback;
-	LPCWSTR lpfilename;
-	RECT rc;
-} MCI_OVLY_SAVE_PARMSW,*PMCI_OVLY_SAVE_PARMSW,*LPMCI_OVLY_SAVE_PARMSW;
-typedef struct tagMCI_OVLY_LOAD_PARMSA {
-	DWORD dwCallback;
-	LPCSTR lpfilename;
-	RECT rc;
-} MCI_OVLY_LOAD_PARMSA,*PMCI_OVLY_LOAD_PARMSA,*LPMCI_OVLY_LOAD_PARMSA;
-typedef struct tagMCI_OVLY_LOAD_PARMSW {
-	DWORD dwCallback;
-	LPCWSTR lpfilename;
-	RECT rc;
-} MCI_OVLY_LOAD_PARMSW,*PMCI_OVLY_LOAD_PARMSW,*LPMCI_OVLY_LOAD_PARMSW;
-
-#ifdef UNICODE
-typedef WAVEOUTCAPSW WAVEOUTCAPS,*PWAVEOUTCAPS,*LPWAVEOUTCAPS;
-typedef WAVEINCAPSW WAVEINCAPS,*PWAVEINCAPS,*LPWAVEINCAPS;
-typedef MIDIOUTCAPSW MIDIOUTCAPS,*PMIDIOUTCAPS,*LPMIDIOUTCAPS;
-typedef MIDIINCAPSW MIDIINCAPS,*PMIDIINCAPS,*LPMIDIINCAPS;
-typedef AUXCAPSW AUXCAPS,*PAUXCAPS,*LPAUXCAPS;
-typedef MIXERCAPSW MIXERCAPS,*PMIXERCAPS,*LPMIXERCAPS;
-typedef MIXERLINEW MIXERLINE,*PMIXERLINE,*LPMIXERLINE;
-typedef MIXERCONTROLA MIXERCONTROL,*PMIXERCONTROL,*LPMIXERCONTROL;
-typedef MIXERLINECONTROLSW MIXERLINECONTROLS,*PMIXERLINECONTROLS,*LPMIXERLINECONTROLS;
-typedef MIXERCONTROLDETAILS_LISTTEXTW MIXERCONTROLDETAILS_LISTTEXT,*PMIXERCONTROLDETAILS_LISTTEXT,*LPMIXERCONTROLDETAILS_LISTTEXT;
-typedef JOYCAPSW JOYCAPS,*PJOYCAPS,*LPJOYCAPS;
-typedef MCI_OPEN_PARMSW MCI_OPEN_PARMS,*PMCI_OPEN_PARMS,*LPMCI_OPEN_PARMS;
-typedef MCI_INFO_PARMSW MCI_INFO_PARMS,*LPMCI_INFO_PARMS;
-typedef MCI_SYSINFO_PARMSW MCI_SYSINFO_PARMS,*PMCI_SYSINFO_PARMS,*LPMCI_SYSINFO_PARMS;
-typedef MCI_SAVE_PARMSW MCI_SAVE_PARMS,*PMCI_SAVE_PARMS,*LPMCI_SAVE_PARMS;
-typedef MCI_LOAD_PARMSW MCI_LOAD_PARMS,*PMCI_LOAD_PARMS,*LPMCI_LOAD_PARMS;
-typedef MCI_VD_ESCAPE_PARMSW MCI_VD_ESCAPE_PARMS,*PMCI_VD_ESCAPE_PARMS,*LPMCI_VD_ESCAPE_PARMS;
-typedef MCI_WAVE_OPEN_PARMSW MCI_WAVE_OPEN_PARMS,*PMCI_WAVE_OPEN_PARMS,*LPMCI_WAVE_OPEN_PARMS;
-typedef MCI_ANIM_OPEN_PARMSW MCI_ANIM_OPEN_PARMS,*PMCI_ANIM_OPEN_PARMS,*LPMCI_ANIM_OPEN_PARMS;
-typedef MCI_ANIM_WINDOW_PARMSW MCI_ANIM_WINDOW_PARMS,*PMCI_ANIM_WINDOW_PARMS,*LPMCI_ANIM_WINDOW_PARMS;
-typedef MCI_OVLY_OPEN_PARMSW MCI_OVLY_OPEN_PARMS,*PMCI_OVLY_OPEN_PARMS,*LPMCI_OVLY_OPEN_PARMS;
-typedef MCI_OVLY_WINDOW_PARMSW MCI_OVLY_WINDOW_PARMS,*PMCI_OVLY_WINDOW_PARMS,*LPMCI_OVLY_WINDOW_PARMS;
-typedef MCI_OVLY_SAVE_PARMSW MCI_OVLY_SAVE_PARMS,*PMCI_OVLY_SAVE_PARMS,*LPMCI_OVLY_SAVE_PARMS;
-#define sndPlaySound sndPlaySoundW
-#define PlaySound PlaySoundW
-#define waveOutGetDevCaps waveOutGetDevCapsW
-#define waveOutGetErrorText waveOutGetErrorTextW
-#define waveInGetDevCaps waveInGetDevCapsW
-#define waveInGetErrorText waveInGetErrorTextW
-#define midiOutGetDevCaps midiOutGetDevCapsW
-#define midiOutGetErrorText midiOutGetErrorTextW
-#define midiInGetDevCaps midiInGetDevCapsW
-#define midiInGetErrorText midiInGetErrorTextW
-#define auxGetDevCaps auxGetDevCapsW
-#define mixerGetDevCaps mixerGetDevCapsW
-#define mixerGetLineInfo mixerGetLineInfoW
-#define mixerGetLineControls mixerGetLineControlsW
-#define mixerGetControlDetails mixerGetControlDetailsW
-#define joyGetDevCaps joyGetDevCapsW
-#define mmioInstallIOProc mmioInstallIOProcW
-#define mmioStringToFOURCC mmioStringToFOURCCW
-#define mmioOpen mmioOpenW
-#define mmioRename mmioRenameW
-#define mciSendCommand mciSendCommandW
-#define mciSendString mciSendStringW
-#define mciGetDeviceID mciGetDeviceIDW
-#define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDW
-#define mciGetErrorString mciGetErrorStringW
-#else
-typedef WAVEOUTCAPSA WAVEOUTCAPS,*PWAVEOUTCAPS,*LPWAVEOUTCAPS;
-typedef WAVEINCAPSA WAVEINCAPS,*PWAVEINCAPS,*LPWAVEINCAPS;
-typedef MIDIOUTCAPSA MIDIOUTCAPS,*PMIDIOUTCAPS,*LPMIDIOUTCAPS;
-typedef MIDIINCAPSA MIDIINCAPS,*PMIDIINCAPS,*LPMIDIINCAPS;
-typedef AUXCAPSA AUXCAPS,*PAUXCAPS,*LPAUXCAPS;
-typedef MIXERCAPSA MIXERCAPS,*PMIXERCAPS,*LPMIXERCAPS;
-typedef MIXERLINEA MIXERLINE,*PMIXERLINE,*LPMIXERLINE;
-typedef MIXERCONTROLA MIXERCONTROL,*PMIXERCONTROL,*LPMIXERCONTROL;
-typedef MIXERLINECONTROLSA MIXERLINECONTROLS,*PMIXERLINECONTROLS,*LPMIXERLINECONTROLS;
-typedef MIXERCONTROLDETAILS_LISTTEXTA MIXERCONTROLDETAILS_LISTTEXT,*PMIXERCONTROLDETAILS_LISTTEXT,*LPMIXERCONTROLDETAILS_LISTTEXT;
-typedef JOYCAPSA JOYCAPS,*PJOYCAPS,*LPJOYCAPS;
-typedef MCI_OPEN_PARMSA MCI_OPEN_PARMS,*PMCI_OPEN_PARMS,*LPMCI_OPEN_PARMS;
-typedef MCI_INFO_PARMSA MCI_INFO_PARMS,*LPMCI_INFO_PARMS;
-typedef MCI_SYSINFO_PARMSA MCI_SYSINFO_PARMS,*PMCI_SYSINFO_PARMS,*LPMCI_SYSINFO_PARMS;
-typedef MCI_SAVE_PARMSA MCI_SAVE_PARMS,*PMCI_SAVE_PARMS,*LPMCI_SAVE_PARMS;
-typedef MCI_LOAD_PARMSA MCI_LOAD_PARMS,*PMCI_LOAD_PARMS,*LPMCI_LOAD_PARMS;
-typedef MCI_VD_ESCAPE_PARMSA MCI_VD_ESCAPE_PARMS,*PMCI_VD_ESCAPE_PARMS,*LPMCI_VD_ESCAPE_PARMS;
-typedef MCI_WAVE_OPEN_PARMSA MCI_WAVE_OPEN_PARMS,*PMCI_WAVE_OPEN_PARMS,*LPMCI_WAVE_OPEN_PARMS;
-typedef MCI_ANIM_OPEN_PARMSA MCI_ANIM_OPEN_PARMS,*PMCI_ANIM_OPEN_PARMS,*LPMCI_ANIM_OPEN_PARMS;
-typedef MCI_ANIM_WINDOW_PARMSA MCI_ANIM_WINDOW_PARMS,*PMCI_ANIM_WINDOW_PARMS,*LPMCI_ANIM_WINDOW_PARMS;
-typedef MCI_OVLY_OPEN_PARMSA MCI_OVLY_OPEN_PARMS,*PMCI_OVLY_OPEN_PARMS,*LPMCI_OVLY_OPEN_PARMS;
-typedef MCI_OVLY_WINDOW_PARMSA MCI_OVLY_WINDOW_PARMS,*PMCI_OVLY_WINDOW_PARMS,*LPMCI_OVLY_WINDOW_PARMS;
-typedef MCI_OVLY_SAVE_PARMSA MCI_OVLY_SAVE_PARMS,*PMCI_OVLY_SAVE_PARMS,*LPMCI_OVLY_SAVE_PARMS;
-#define sndPlaySound sndPlaySoundA
-#define PlaySound PlaySoundA
-#define waveOutGetDevCaps waveOutGetDevCapsA
-#define waveOutGetErrorText waveOutGetErrorTextA
-#define waveInGetDevCaps waveInGetDevCapsA
-#define waveInGetErrorText waveInGetErrorTextA
-#define midiOutGetDevCaps midiOutGetDevCapsA
-#define midiOutGetErrorText midiOutGetErrorTextA
-#define midiInGetDevCaps midiInGetDevCapsA
-#define midiInGetErrorText midiInGetErrorTextA
-#define auxGetDevCaps auxGetDevCapsA
-#define mixerGetDevCaps mixerGetDevCapsA
-#define mixerGetLineInfo mixerGetLineInfoA
-#define mixerGetLineControls mixerGetLineControlsA
-#define mixerGetControlDetails mixerGetControlDetailsA
-#define joyGetDevCaps joyGetDevCapsA
-#define mmioInstallIOProc mmioInstallIOProcA
-#define mmioStringToFOURCC mmioStringToFOURCCA
-#define mmioOpen mmioOpenA
-#define mmioRename mmioRenameA
-#define mciSendCommand mciSendCommandA
-#define mciSendString mciSendStringA
-#define mciGetDeviceID mciGetDeviceIDA
-#define mciGetDeviceIDFromElementID mciGetDeviceIDFromElementIDA
-#define mciGetErrorString mciGetErrorStringA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#pragma pack(pop)
-#endif
diff --git a/winsup/w32api/include/mshtml.h b/winsup/w32api/include/mshtml.h
deleted file mode 100644
index d84d01cd0..000000000
--- a/winsup/w32api/include/mshtml.h
+++ /dev/null
@@ -1,454 +0,0 @@
-#ifndef _MSHTML_H
-#define _MSHTML_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef interface IHTMLElementCollection *LPHTMLELEMENTCOLLECTION;
-typedef interface IHTMLElement *LPHTMLELEMENT;
-typedef interface IHTMLSelectionObject *LPHTMLSELECTIONOBJECT;
-typedef interface IHTMLFramesCollection *LPHTMLFRAMESCOLLECTION;
-typedef interface IHTMLLocation *LPHTMLLOCATION;
-typedef interface IHTMLWindow2 *LPHTMLWINDOW2;
-typedef interface IHTMLStyleSheetsCollection *LPHTMLSTYLESHEETSCOLLECTION;
-typedef interface IHTMLStyleSheet *LPHTMLSTYLESHEET;
-typedef interface IHTMLStyle *LPHTMLSTYLE;
-typedef interface IHTMLFiltersCollection *LPHTMLFILTERSCOLLECTION;
-typedef interface IHTMLLinkElement *LPHTMLLINKELEMENT;
-typedef interface IHTMLImgElement *LPHTMLIMGELEMENT;
-
-EXTERN_C const IID IID_IHTMLLinkElement;
-#undef INTERFACE
-#define INTERFACE IHTMLLinkElement
-DECLARE_INTERFACE_(IHTMLLinkElement,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(put_href)(THIS_ BSTR) PURE;
-	STDMETHOD(get_href)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_rel)(THIS_ BSTR) PURE;
-	STDMETHOD(get_rel)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_rev)(THIS_ BSTR) PURE;
-	STDMETHOD(get_rev)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_type)(THIS_ BSTR) PURE;
-	STDMETHOD(get_type)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_readyState)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_onreadystatechange)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onreadystatechange)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onload)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onload)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onerror)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onerror)(THIS_ VARIANT*) PURE;
-	STDMETHOD(get_styleSheet)(THIS_ LPHTMLSTYLESHEET*) PURE;
-	STDMETHOD(put_disabled)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_disabled)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_media)(THIS_ BSTR) PURE;
-	STDMETHOD(get_media)(THIS_ BSTR*) PURE;
-};
-
-EXTERN_C const IID IID_IHTMLImgElement;
-#undef INTERFACE
-#define INTERFACE IHTMLImgElement
-DECLARE_INTERFACE_(IHTMLImgElement,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(put_isMap)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_isMap)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_useMap)(THIS_ BSTR) PURE;
-	STDMETHOD(get_useMap)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_mimeType)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_fileSize)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_fileCreatedDate)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_fileModifiedDate)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_fileUpdatedDate)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_protocol)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_href)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_nameProp)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_border)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_border)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_vspace)(THIS_ long) PURE;
-	STDMETHOD(get_vspace)(THIS_ long*) PURE;
-	STDMETHOD(put_hspace)(THIS_ long) PURE;
-	STDMETHOD(get_hspace)(THIS_ long*) PURE;
-	STDMETHOD(put_alt)(THIS_ BSTR) PURE;
-	STDMETHOD(get_alt)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_src)(THIS_ BSTR) PURE;
-	STDMETHOD(get_src)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_lowsrc)(THIS_ BSTR) PURE;
-	STDMETHOD(get_lowsrc)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_vrml)(THIS_ BSTR) PURE;
-	STDMETHOD(get_vrml)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_dynsrc)(THIS_ BSTR) PURE;
-	STDMETHOD(get_dynsrc)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_readyState)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_complete)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_loop)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_loop)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_align)(THIS_ BSTR) PURE;
-	STDMETHOD(get_align)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_onload)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onload)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onerror)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onerror)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onabort)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onabort)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_name)(THIS_ BSTR) PURE;
-	STDMETHOD(get_name)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_width)(THIS_ long) PURE;
-	STDMETHOD(get_width)(THIS_ long*) PURE;
-	STDMETHOD(put_height)(THIS_ long) PURE;
-	STDMETHOD(get_height)(THIS_ long*) PURE;
-	STDMETHOD(put_start)(THIS_ BSTR) PURE;
-	STDMETHOD(get_start)(THIS_ BSTR*) PURE;
-};
-
-EXTERN_C const IID IID_IHTMLElementCollection;
-#undef INTERFACE
-#define INTERFACE IHTMLElementCollection
-DECLARE_INTERFACE_(IHTMLElementCollection,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(toString)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_length)(THIS_ long) PURE;
-	STDMETHOD(get_length)(THIS_ long*) PURE;
-	STDMETHOD(get__newEnum)(THIS_ IUnknown**) PURE;
-	STDMETHOD(item)(THIS_ VARIANT,VARIANT,IDispatch**) PURE;
-	STDMETHOD(tags)(THIS_ VARIANT,IDispatch**) PURE;
-};
-
-
-EXTERN_C const IID IID_IHTMLDocument;
-#undef INTERFACE
-#define INTERFACE IHTMLDocument
-DECLARE_INTERFACE_(IHTMLDocument,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(get_Script)(THIS_ IDispatch**) PURE;
-};
-
-EXTERN_C const IID IID_IHTMLDocument2;
-#undef INTERFACE
-#define INTERFACE IHTMLDocument2
-DECLARE_INTERFACE_(IHTMLDocument2,IHTMLDocument)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(get_Script)(THIS_ IDispatch**) PURE;
-
-	STDMETHOD(get_all)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
-	STDMETHOD(get_body)(THIS_ LPHTMLELEMENT*) PURE;
-	STDMETHOD(get_activeElement)(THIS_ LPHTMLELEMENT*) PURE;
-	STDMETHOD(get_images)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
-	STDMETHOD(get_applets)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
-	STDMETHOD(get_links)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
-	STDMETHOD(get_forms)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
-	STDMETHOD(get_anchors)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
-	STDMETHOD(put_title)(THIS_ BSTR) PURE;
-	STDMETHOD(get_title)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_scripts)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
-	STDMETHOD(put_designMode)(THIS_ BSTR) PURE;
-	STDMETHOD(get_designMode)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_selection)(LPHTMLSELECTIONOBJECT*) PURE;
-	STDMETHOD(get_readyState)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_frames)(THIS_ LPHTMLFRAMESCOLLECTION*) PURE;
-	STDMETHOD(get_embeds)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
-	STDMETHOD(get_plugins)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
-	STDMETHOD(put_alinkColor)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_alinkColor)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_bgColor)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_bgColor)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_fgColor)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_fgColor)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_linkColor)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_linkColor)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_vlinkColor)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_vlinkColor)(THIS_ VARIANT*) PURE;
-	STDMETHOD(get_referrer)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_location)(THIS_ LPHTMLLOCATION*) PURE;
-	STDMETHOD(get_lastModified)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_url)(THIS_ BSTR) PURE;
-	STDMETHOD(get_url)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_domain)(THIS_ BSTR) PURE;
-	STDMETHOD(get_domain)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_cookie)(THIS_ BSTR) PURE;
-	STDMETHOD(get_cookie)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_expands)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(get_expands)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(put_charset)(THIS_ BSTR) PURE;
-	STDMETHOD(get_charset)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_defaultCharset)(THIS_ BSTR) PURE;
-	STDMETHOD(get_defaultCharset)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_mimeType)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_fileSize)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_fileCreatedDate)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_fileModifiedDate)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_fileUpdatedDate)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_security)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_protocol)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_nameProp)(THIS_ BSTR*) PURE;
-	STDMETHOD(write)(THIS_ SAFEARRAY) PURE;
-	STDMETHOD(writeln)(THIS_ SAFEARRAY) PURE;
-	STDMETHOD(open)(THIS_ BSTR,VARIANT,VARIANT,VARIANT,IDispatch**) PURE;
-	STDMETHOD(close)(THIS) PURE;
-	STDMETHOD(clear)(THIS) PURE;
-	STDMETHOD(queryCommandSupported)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(queryCommandEnabled)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(queryCommandState)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(queryCommandIndeterm)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(queryCommandText)(THIS_ BSTR,BSTR*) PURE;
-	STDMETHOD(queryCommandValue)(THIS_ BSTR,VARIANT*) PURE;
-	STDMETHOD(execCommand)(THIS_ BSTR,VARIANT_BOOL,VARIANT,VARIANT_BOOL*) PURE;
-	STDMETHOD(execCommandShowHelp)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(createElement)(THIS_ BSTR,LPHTMLELEMENT*) PURE;
-	STDMETHOD(put_onhelp)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onhelp)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onclick)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onclick)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_ondblclick)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_ondblclick)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onkeyup)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onkeyup)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onkeydown)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onkeydown)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onkeypress)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onkeypress)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onmouseup)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onmouseup)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onmousedown)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onmousedown)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onmousemove)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onmousemove)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onmouseout)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onmouseout)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onmouseover)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onmouseover)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onreadystatechange)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onreadystatechange)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onafterupdate)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onafterupdate)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onrowexit)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onrowexit)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onrowenter)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onrowenter)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_ondragstart)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_ondragstart)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onselectstart)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onselectstart)(THIS_ VARIANT*) PURE;
-	STDMETHOD(elementFromPoint)(THIS_ long,long,LPHTMLELEMENT*) PURE;
-	STDMETHOD(get_parentWindow)(THIS_ LPHTMLWINDOW2*) PURE;
-	STDMETHOD(get_styleSheets)(THIS_ LPHTMLSTYLESHEETSCOLLECTION*) PURE;
-	STDMETHOD(put_onbeforeupdate)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onbeforeupdate)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onerrorupdate)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onerrorupdate)(THIS_ VARIANT*) PURE;
-	STDMETHOD(toString)(THIS_ BSTR*) PURE;
-	STDMETHOD(createStyleSheet)(THIS_ BSTR,long,LPHTMLSTYLESHEET*) PURE;
-};
-
-EXTERN_C const IID IID_IHTMLSelectionObject;
-#undef INTERFACE
-#define INTERFACE IHTMLSelectionObject
-DECLARE_INTERFACE_(IHTMLSelectionObject,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(createRange)(THIS_ IDispatch**) PURE;
-	STDMETHOD(empty)(THIS) PURE;
-	STDMETHOD(clear)(THIS) PURE;
-	STDMETHOD(type)(THIS_ BSTR*) PURE;
-};
-
-EXTERN_C const IID IID_IHTMLTxtRange;
-#undef INTERFACE
-#define INTERFACE IHTMLTxtRange
-DECLARE_INTERFACE_(IHTMLTxtRange,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(get_htmlText)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_text)(THIS_ BSTR) PURE;
-	STDMETHOD(get_text)(THIS_ BSTR*) PURE;
-	STDMETHOD(parentElement)(THIS_ LPHTMLELEMENT*) PURE;
-	STDMETHOD(duplicate)(THIS_ IHTMLTxtRange**) PURE;
-	STDMETHOD(inRange)(THIS_ IHTMLTxtRange*,VARIANT_BOOL*) PURE;
-	STDMETHOD(isEqual)(THIS_ IHTMLTxtRange*,VARIANT_BOOL*) PURE;
-	STDMETHOD(scrollIntoView)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(collapse)(THIS_ VARIANT_BOOL) PURE;
-	STDMETHOD(expand)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(move)(THIS_ BSTR,long,long*) PURE;
-	STDMETHOD(moveStart)(THIS_ BSTR,long,long*) PURE;
-	STDMETHOD(moveEnd)(THIS_ BSTR,long,long*) PURE;
-	STDMETHOD(select)(THIS) PURE;
-	STDMETHOD(pasteHTML)(THIS_ BSTR) PURE;
-	STDMETHOD(moveToElementText)(THIS_ LPHTMLELEMENT) PURE;
-	STDMETHOD(setEndPoint)(THIS_ BSTR,IHTMLTxtRange*) PURE;
-	STDMETHOD(compareEndPoints)(THIS_ BSTR,IHTMLTxtRange*,long*) PURE;
-	STDMETHOD(findText)(THIS_ BSTR,long,long,VARIANT_BOOL*) PURE;
-	STDMETHOD(moveToPoint)(THIS_ long,long) PURE;
-	STDMETHOD(getBookmark)(THIS_ BSTR*) PURE;
-	STDMETHOD(moveToBookbark)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(queryCommandSupported)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(queryCommandEnabled)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(queryCommandState)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(queryCommandIndeterm)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-	STDMETHOD(queryCommandText)(THIS_ BSTR,BSTR*) PURE;
-	STDMETHOD(queryCommandValue)(THIS_ BSTR,VARIANT*) PURE;
-	STDMETHOD(execCommand)(THIS_ BSTR,VARIANT_BOOL,VARIANT,VARIANT_BOOL*) PURE;
-	STDMETHOD(execCommandShowHelp)(THIS_ BSTR,VARIANT_BOOL*) PURE;
-};
-
-EXTERN_C const IID IID_IHTMLElement;
-#undef INTERFACE
-#define INTERFACE IHTMLElement
-DECLARE_INTERFACE_(IHTMLElement,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-	STDMETHOD(setAttribute)(THIS_ BSTR,VARIANT,long) PURE;
-	STDMETHOD(getAttribute)(THIS_ BSTR,long,VARIANT*) PURE;
-	STDMETHOD(removeAttribute)(THIS_ BSTR,long,VARIANT_BOOL*) PURE;
-	STDMETHOD(put_className)(THIS_ BSTR) PURE;
-	STDMETHOD(get_className)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_id)(THIS_ BSTR) PURE;
-	STDMETHOD(get_id)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_tagName)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_parentElement)(THIS_ LPHTMLELEMENT*) PURE;
-	STDMETHOD(get_style)(THIS_ LPHTMLSTYLE*) PURE;
-	STDMETHOD(put_onhelp)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onhelp)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onclick)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onclick)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_ondblclick)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_ondblclick)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onkeydown)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onkeydown)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onkeyup)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onkeyup)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onkeypress)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onkeypress)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onmouseout)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onmouseout)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onmouseover)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onmouseover)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onmousemove)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onmousemove)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onmousedown)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onmousedown)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onmouseup)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onmouseup)(THIS_ VARIANT*) PURE;
-	STDMETHOD(get_document)(THIS_ IDispatch**) PURE;
-	STDMETHOD(put_title)(THIS_ BSTR) PURE;
-	STDMETHOD(get_title)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_language)(THIS_ BSTR) PURE;
-	STDMETHOD(get_language)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_onselectstart)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onselectstart)(THIS_ VARIANT*) PURE;
-	STDMETHOD(scrollIntoView)(THIS_ VARIANT) PURE;
-	STDMETHOD(contains)(THIS_ LPHTMLELEMENT,VARIANT_BOOL*) PURE;
-	STDMETHOD(get_source3Index)(THIS_ long*) PURE;
-	STDMETHOD(get_recordNumber)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_lang)(THIS_ BSTR) PURE;
-	STDMETHOD(get_lang)(THIS_ BSTR*) PURE;
-	STDMETHOD(get_offsetLeft)(THIS_ long*) PURE;
-	STDMETHOD(get_offsetTop)(THIS_ long*) PURE;
-	STDMETHOD(get_offsetWidth)(THIS_ long*) PURE;
-	STDMETHOD(get_offsetHeight)(THIS_ long*) PURE;
-	STDMETHOD(get_offsetParent)(THIS_ LPHTMLELEMENT*) PURE;
-	STDMETHOD(put_innerHTML)(THIS_ BSTR) PURE;
-	STDMETHOD(get_innerHTML)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_innerText)(THIS_ BSTR) PURE;
-	STDMETHOD(get_innerText)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_outerHTML)(THIS_ BSTR) PURE;
-	STDMETHOD(get_outerHTML)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_outerText)(THIS_ BSTR) PURE;
-	STDMETHOD(get_outerText)(THIS_ BSTR*) PURE;
-	STDMETHOD(insertAdjacentHTML)(THIS_ BSTR,BSTR) PURE;
-	STDMETHOD(insertAdjacentText)(THIS_ BSTR,BSTR) PURE;
-	STDMETHOD(get_parentTextEdit)(THIS_ LPHTMLELEMENT*) PURE;
-	STDMETHOD(isTextEdit)(THIS_ VARIANT_BOOL*) PURE;
-	STDMETHOD(click)(THIS) PURE;
-	STDMETHOD(get_filters)(THIS_ LPHTMLFILTERSCOLLECTION*) PURE;
-	STDMETHOD(put_ondragstart)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_ondragstart)(THIS_ VARIANT*) PURE;
-	STDMETHOD(toString)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_onbeforeupdate)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onbeforeupdate)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onafterupdate)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onafterupdate)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onerrorupdate)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onerrorupdate)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onrowexit)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onrowexit)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onrowenter)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onrowenter)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_ondatasetchanged)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_ondatasetchanged)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_ondataavailable)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_ondataavailable)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_ondatasetcomplete)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_ondatasetcomplete)(THIS_ VARIANT*) PURE;
-	STDMETHOD(put_onfilterchange)(THIS_ VARIANT) PURE;
-	STDMETHOD(get_onfilterchange)(THIS_ VARIANT*) PURE;
-	STDMETHOD(get_children)(THIS_ IDispatch**) PURE;
-	STDMETHOD(get_all)(THIS_ IDispatch**) PURE;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/mswsock.h b/winsup/w32api/include/mswsock.h
deleted file mode 100644
index 0cea0b840..000000000
--- a/winsup/w32api/include/mswsock.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * mswsock.h
- * MS-specific extensions to Windows Sockets, exported from mswsock.dll.
- * These functions are N/A on Windows9x.
- *
- * This file is part of a free library for the Win32 API.
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-         
-#ifndef _MSWSOCK_H
-#define _MSWSOCK_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SO_CONNDATA	0x7000
-#define SO_CONNOPT	0x7001
-#define SO_DISCDATA	0x7002
-#define SO_DISCOPT	0x7003
-#define SO_CONNDATALEN	0x7004
-#define SO_CONNOPTLEN	0x7005
-#define SO_DISCDATALEN	0x7006
-#define SO_DISCOPTLEN	0x7007
-#define SO_OPENTYPE	0x7008
-#define SO_SYNCHRONOUS_ALERT	0x10
-#define SO_SYNCHRONOUS_NONALERT	0x20
-#define SO_MAXDG	0x7009
-#define SO_MAXPATHDG	0x700A
-#define SO_UPDATE_ACCEPT_CONTEXT	0x700B
-#define SO_CONNECT_TIME	0x700C
-#define TCP_BSDURGENT	0x7000
-
-#define TF_DISCONNECT   1
-#define TF_REUSE_SOCKET 2
-#define TF_WRITE_BEHIND 4
-#define TF_USE_DEFAULT_WORKER   0
-#define TF_USE_SYSTEM_THREAD    16
-#define TF_USE_KERNEL_APC   32
-
-typedef struct _TRANSMIT_FILE_BUFFERS {
-	PVOID Head;
-	DWORD HeadLength;
-	PVOID Tail;
-	DWORD TailLength;
-} TRANSMIT_FILE_BUFFERS, *PTRANSMIT_FILE_BUFFERS, *LPTRANSMIT_FILE_BUFFERS;
-
-int PASCAL WSARecvEx(SOCKET,char*,int,int*);
-BOOL PASCAL TransmitFile(SOCKET,HANDLE,DWORD,DWORD,LPOVERLAPPED,LPTRANSMIT_FILE_BUFFERS,DWORD);
-BOOL PASCAL AcceptEx(SOCKET,SOCKET,PVOID,DWORD,DWORD,DWORD,LPDWORD,LPOVERLAPPED);
-VOID PASCAL GetAcceptExSockaddrs(PVOID,DWORD,DWORD,DWORD,struct sockaddr**, LPINT, struct sockaddr**, LPINT);
-
-#ifdef _WINSOCK2_H /* These require the winsock2 interface.  */
-
-#define TP_ELEMENT_FILE		1
-#define TP_ELEMENT_MEMORY	2
-#define TP_ELEMENT_EOP		4
-
-typedef struct _TRANSMIT_PACKETS_ELEMENT { 
-	ULONG dwElFlags;
-	ULONG cLength;
-	_ANONYMOUS_UNION
-	union {
-		struct {
-			LARGE_INTEGER	nFileOffset;
-			HANDLE		hFile;
-		};
-		PVOID	pBuffer;
-	};
-} TRANSMIT_PACKETS_ELEMENT; 
-
-typedef struct _WSAMSG {
-	LPSOCKADDR	name;
-	INT		namelen;
-	LPWSABUF	lpBuffers;
-	DWORD		dwBufferCount;
-	WSABUF		Control;
-	DWORD		dwFlags;
-} WSAMSG, *PWSAMSG, *LPWSAMSG;
-
-
-/* According to MSDN docs, the WSAMSG.Control buffer starts with a
-   cmsghdr header of the following form.  See also RFC 2292. */
-
-typedef struct wsacmsghdr {
-	UINT	cmsg_len;
-	INT	cmsg_level;
- 	INT	cmsg_type;
-	/* followed by UCHAR cmsg_data[]; */
-} WSACMSGHDR;
-
-/* TODO: Standard Posix.1g macros as per RFC 2292, with WSA_uglification. */
-#if 0
-#define WSA_CMSG_FIRSTHDR(mhdr)
-#define WSA_CMSG_NXTHDR(mhdr, cmsg)
-#define WSA_CMSG_SPACE(length)
-#define WSA_CMSG_LEN(length)
-#endif
-
-BOOL PASCAL DisconnectEx(SOCKET,LPOVERLAPPED,DWORD,DWORD);
-int PASCAL WSARecvMsg(SOCKET,LPWSAMSG,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-
-#endif /* _WINSOCK2_H */
-
-#ifdef __cplusplus
-}
-#endif
-#endif  /*  _MSWSOCK_H */
-
diff --git a/winsup/w32api/include/nb30.h b/winsup/w32api/include/nb30.h
deleted file mode 100644
index c0ef0e53b..000000000
--- a/winsup/w32api/include/nb30.h
+++ /dev/null
@@ -1,186 +0,0 @@
-#ifndef _NB30_H
-#define _NB30_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define NCBNAMSZ 16
-#define MAX_LANA 254
-#define NAME_FLAGS_MASK 0x87
-#define GROUP_NAME 0x80
-#define UNIQUE_NAME 0x00
-#define REGISTERING 0x00
-#define REGISTERED 0x04
-#define DEREGISTERED 0x05
-#define DUPLICATE 0x06
-#define DUPLICATE_DEREG 0x07
-#define LISTEN_OUTSTANDING 0x01
-#define CALL_PENDING 0x02
-#define SESSION_ESTABLISHED 0x03
-#define HANGUP_PENDING 0x04
-#define HANGUP_COMPLETE 0x05
-#define SESSION_ABORTED 0x06
-#define ALL_TRANSPORTS "M\0\0\0"
-#define MS_NBF "MNBF"
-#define NCBCALL 0x10
-#define NCBLISTEN 0x11
-#define NCBHANGUP 0x12
-#define NCBSEND 0x14
-#define NCBRECV 0x15
-#define NCBRECVANY 0x16
-#define NCBCHAINSEND 0x17
-#define NCBDGSEND 0x20
-#define NCBDGRECV 0x21
-#define NCBDGSENDBC 0x22
-#define NCBDGRECVBC 0x23
-#define NCBADDNAME 0x30
-#define NCBDELNAME 0x31
-#define NCBRESET 0x32
-#define NCBASTAT 0x33
-#define NCBSSTAT 0x34
-#define NCBCANCEL 0x35
-#define NCBADDGRNAME 0x36
-#define NCBENUM 0x37
-#define NCBUNLINK 0x70
-#define NCBSENDNA 0x71
-#define NCBCHAINSENDNA 0x72
-#define NCBLANSTALERT 0x73
-#define NCBACTION 0x77
-#define NCBFINDNAME 0x78
-#define NCBTRACE 0x79
-#define ASYNCH 0x80
-#define NRC_GOODRET 0x00
-#define NRC_BUFLEN 0x01
-#define NRC_ILLCMD 0x03
-#define NRC_CMDTMO 0x05
-#define NRC_INCOMP 0x06
-#define NRC_BADDR 0x07
-#define NRC_SNUMOUT 0x08
-#define NRC_NORES 0x09
-#define NRC_SCLOSED 0x0a
-#define NRC_CMDCAN 0x0b
-#define NRC_DUPNAME 0x0d
-#define NRC_NAMTFUL 0x0e
-#define NRC_ACTSES 0x0f
-#define NRC_LOCTFUL 0x11
-#define NRC_REMTFUL 0x12
-#define NRC_ILLNN 0x13
-#define NRC_NOCALL 0x14
-#define NRC_NOWILD 0x15
-#define NRC_INUSE 0x16
-#define NRC_NAMERR 0x17
-#define NRC_SABORT 0x18
-#define NRC_NAMCONF 0x19
-#define NRC_IFBUSY 0x21
-#define NRC_TOOMANY 0x22
-#define NRC_BRIDGE 0x23
-#define NRC_CANOCCR 0x24
-#define NRC_CANCEL 0x26
-#define NRC_DUPENV 0x30
-#define NRC_ENVNOTDEF 0x34
-#define NRC_OSRESNOTAV 0x35
-#define NRC_MAXAPPS 0x36
-#define NRC_NOSAPS 0x37
-#define NRC_NORESOURCES 0x38
-#define NRC_INVADDRESS 0x39
-#define NRC_INVDDID 0x3B
-#define NRC_LOCKFAIL 0x3C
-#define NRC_OPENERR 0x3f
-#define NRC_SYSTEM 0x40
-#define NRC_PENDING 0xff
-#define NCB_POST void CALLBACK
-typedef struct _ACTION_HEADER {
-	ULONG transport_id;
-	USHORT action_code;
-	USHORT reserved;
-} ACTION_HEADER,*PACTION_HEADER;
-typedef struct _ADAPTER_STATUS {
-	UCHAR adapter_address[6];
-	UCHAR rev_major;
-	UCHAR reserved0;
-	UCHAR adapter_type;
-	UCHAR rev_minor;
-	WORD duration;
-	WORD frmr_recv;
-	WORD frmr_xmit;
-	WORD iframe_recv_err;
-	WORD xmit_aborts;
-	DWORD xmit_success;
-	DWORD recv_success;
-	WORD iframe_xmit_err;
-	WORD recv_buff_unavail;
-	WORD t1_timeouts;
-	WORD ti_timeouts;
-	DWORD reserved1;
-	WORD free_ncbs;
-	WORD max_cfg_ncbs;
-	WORD max_ncbs;
-	WORD xmit_buf_unavail;
-	WORD max_dgram_size;
-	WORD pending_sess;
-	WORD max_cfg_sess;
-	WORD max_sess;
-	WORD max_sess_pkt_size;
-	WORD name_count;
-} ADAPTER_STATUS,*PADAPTER_STATUS;
-typedef struct _FIND_NAME_BUFFER {
-	UCHAR length;
-	UCHAR access_control;
-	UCHAR frame_control;
-	UCHAR destination_addr[6];
-	UCHAR source_addr[6];
-	UCHAR routing_info[18];
-} FIND_NAME_BUFFER,*PFIND_NAME_BUFFER;
-typedef struct _FIND_NAME_HEADER {
-	WORD node_count;
-	UCHAR reserved;
-	UCHAR unique_group;
-} FIND_NAME_HEADER,*PFIND_NAME_HEADER;
-typedef struct _LANA_ENUM {
-	UCHAR length;
-	UCHAR lana[MAX_LANA+1];
-} LANA_ENUM,*PLANA_ENUM;
-typedef struct _NAME_BUFFER {
-	UCHAR name[NCBNAMSZ];
-	UCHAR name_num;
-	UCHAR name_flags;
-} NAME_BUFFER,*PNAME_BUFFER;
-typedef struct _NCB {
-	UCHAR ncb_command;
-	UCHAR ncb_retcode;
-	UCHAR ncb_lsn;
-	UCHAR ncb_num;
-	PUCHAR ncb_buffer;
-	WORD ncb_length;
-	UCHAR ncb_callname[NCBNAMSZ];
-	UCHAR ncb_name[NCBNAMSZ];
-	UCHAR ncb_rto;
-	UCHAR ncb_sto;
-	void (CALLBACK *ncb_post)(struct _NCB*);
-	UCHAR ncb_lana_num;
-	UCHAR ncb_cmd_cplt;
-	UCHAR ncb_reserve[10];
-	HANDLE ncb_event;
-} NCB,*PNCB;
-typedef struct _SESSION_BUFFER {
-	UCHAR lsn;
-	UCHAR state;
-	UCHAR local_name[NCBNAMSZ];
-	UCHAR remote_name[NCBNAMSZ];
-	UCHAR rcvs_outstanding;
-	UCHAR sends_outstanding;
-} SESSION_BUFFER,*PSESSION_BUFFER;
-typedef struct _SESSION_HEADER {
-	UCHAR sess_name;
-	UCHAR num_sess;
-	UCHAR rcv_dg_outstanding;
-	UCHAR rcv_any_outstanding;
-} SESSION_HEADER,*PSESSION_HEADER;
-UCHAR WINAPI Netbios(PNCB);
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/nddeapi.h b/winsup/w32api/include/nddeapi.h
deleted file mode 100644
index a6ea207e0..000000000
--- a/winsup/w32api/include/nddeapi.h
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef _NDDEAPI_H
-#define _NDDEAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifndef CNLEN /* also in lmcons.h */
-#define CNLEN 15
-#define UNCLEN (CNLEN + 2)
-#endif
-#define SEP_CHAR ','
-#define BAR_CHAR "|"
-#define SEP_WCHAR L','
-#define BAR_WCHAR L"|"
-#define NDDE_NO_ERROR 0
-#define NDDE_ACCESS_DENIED 1
-#define NDDE_BUF_TOO_SMALL 2
-#define NDDE_ERROR_MORE_DATA 3
-#define NDDE_INVALID_SERVER 4
-#define NDDE_INVALID_SHARE 5
-#define NDDE_INVALID_PARAMETER 6
-#define NDDE_INVALID_LEVEL 7
-#define NDDE_INVALID_PASSWORD 8
-#define NDDE_INVALID_ITEMNAME 9
-#define NDDE_INVALID_TOPIC 10
-#define NDDE_INTERNAL_ERROR 11
-#define NDDE_OUT_OF_MEMORY 12
-#define NDDE_INVALID_APPNAME 13
-#define NDDE_NOT_IMPLEMENTED 14
-#define NDDE_SHARE_ALREADY_EXIST 15
-#define NDDE_SHARE_NOT_EXIST 16
-#define NDDE_INVALID_FILENAME 17
-#define NDDE_NOT_RUNNING 18
-#define NDDE_INVALID_WINDOW 19
-#define NDDE_INVALID_SESSION 20
-#define NDDE_INVALID_ITEM_LIST 21
-#define NDDE_SHARE_DATA_CORRUPTED 22
-#define NDDE_REGISTRY_ERROR 23
-#define NDDE_CANT_ACCESS_SERVER 24
-#define NDDE_INVALID_SPECIAL_COMMAND 25
-#define NDDE_INVALID_SECURITY_DESC 26
-#define NDDE_TRUST_SHARE_FAIL 27
-#define MAX_NDDESHARENAME 256
-#define MAX_DOMAINNAME 15
-#define MAX_USERNAME 15
-#define MAX_APPNAME 255
-#define MAX_TOPICNAME 255
-#define MAX_ITEMNAME 255
-#define NDDEF_NOPASSWORDPROMPT 0x0001
-#define NDDEF_NOCACHELOOKUP 0x0002
-#define NDDEF_STRIP_NDDE 0x0004
-#define SHARE_TYPE_OLD 0x01
-#define SHARE_TYPE_NEW 0x02
-#define SHARE_TYPE_STATIC 0x04
-#define NDDE_TRUST_SHARE_START 0x80000000L
-#define NDDE_TRUST_SHARE_INIT 0x40000000L
-#define NDDE_TRUST_SHARE_DEL 0x20000000L
-#define NDDE_TRUST_CMD_SHOW 0x10000000L
-#define NDDE_CMD_SHOW_MASK 0x0000FFFFL
-struct NDdeShareInfo_tag {
-	LONG lRevision;
-	LPTSTR lpszShareName;
-	LONG lShareType;
-	LPTSTR lpszAppTopicList;
-	LONG fSharedFlag;
-	LONG fService;
-	LONG fStartAppFlag;
-	LONG nCmdShow;
-	LONG qModifyId[2];
-	LONG cNumItems;
-	LPTSTR lpszItemList;
-} NDDESHAREINFO,*PNDDESHAREINFO;
-
-UINT WINAPI NDdeGetErrorStringA(UINT,LPSTR,DWORD);
-UINT WINAPI NDdeGetErrorStringW(UINT,LPWSTR,DWORD);
-UINT WINAPI NDdeGetShareSecurityA(LPSTR,LPSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD);
-UINT WINAPI NDdeGetShareSecurityW(LPWSTR,LPWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD);
-UINT WINAPI NDdeGetTrustedShareA(LPSTR,LPSTR,PDWORD,PDWORD,PDWORD);
-UINT WINAPI NDdeGetTrustedShareW(LPWSTR,LPWSTR,PDWORD,PDWORD,PDWORD);
-BOOL WINAPI NDdeIsValidShareNameA(LPSTR);
-BOOL WINAPI NDdeIsValidShareNameW(LPWSTR);
-BOOL WINAPI NDdeIsValidAppTopicListA(LPSTR);
-BOOL WINAPI NDdeIsValidAppTopicListW(LPWSTR);
-UINT WINAPI NDdeSetShareSecurityA(LPSTR,LPSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-UINT WINAPI NDdeSetShareSecurityW(LPWSTR,LPWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-UINT WINAPI NDdeSetTrustedShareA(LPSTR,LPSTR,DWORD);
-UINT WINAPI NDdeSetTrustedShareW(LPWSTR,LPWSTR,DWORD);
-UINT WINAPI NDdeShareAddA(LPSTR,UINT,PSECURITY_DESCRIPTOR,PBYTE,DWORD);
-UINT WINAPI NDdeShareAddW(LPWSTR,UINT,PSECURITY_DESCRIPTOR,PBYTE,DWORD);
-UINT WINAPI NDdeShareDelA(LPSTR,LPSTR,UINT);
-UINT WINAPI NDdeShareDelW(LPWSTR,LPWSTR,UINT);
-UINT WINAPI NDdeShareEnumA(LPSTR,UINT,PBYTE,DWORD,PDWORD,PDWORD);
-UINT WINAPI NDdeShareEnumW(LPWSTR,UINT,PBYTE,DWORD,PDWORD,PDWORD);
-UINT WINAPI NDdeShareGetInfoA(LPSTR,LPSTR,UINT,PBYTE,DWORD,PDWORD,PWORD);
-UINT WINAPI NDdeShareGetInfoW(LPWSTR,LPWSTR,UINT,PBYTE,DWORD,PDWORD,PWORD);
-UINT WINAPI NDdeShareSetInfoA(LPSTR,LPSTR,UINT,PBYTE,DWORD,WORD);
-UINT WINAPI NDdeShareSetInfoW(LPWSTR,LPWSTR,UINT,PBYTE,DWORD,WORD);
-UINT WINAPI NDdeTrustedShareEnumA(LPSTR,UINT,PBYTE,DWORD,PDWORD,PDWORD);
-UINT WINAPI NDdeTrustedShareEnumW(LPWSTR,UINT,PBYTE,DWORD,PDWORD,PDWORD);
-#ifdef UNICODE
-#define NDdeShareAdd NDdeShareAddW
-#define NDdeShareDel NDdeShareDelW
-#define NDdeSetShareSecurity NDdeSetShareSecurityW
-#define NDdeGetShareSecurity NDdeGetShareSecurityW
-#define NDdeShareEnum NDdeShareEnumW
-#define NDdeShareGetInfo NDdeShareGetInfoW
-#define NDdeShareSetInfo NDdeShareSetInfoW
-#define NDdeGetErrorString NDdeGetErrorStringW
-#define NDdeSetTrustedShare NDdeSetTrustedShareW
-#define NDdeGetTrustedShare NDdeGetTrustedShareW
-#define NDdeTrustedShareEnum NDdeTrustedShareEnumW
-#else
-#define NDdeShareAdd NDdeShareAddA
-#define NDdeShareDel NDdeShareDelA
-#define NDdeSetShareSecurity NDdeSetShareSecurityA
-#define NDdeGetShareSecurity NDdeGetShareSecurityA
-#define NDdeShareEnum NDdeShareEnumA
-#define NDdeShareGetInfo NDdeShareGetInfoA
-#define NDdeShareSetInfo NDdeShareSetInfoA
-#define NDdeGetErrorString NDdeGetErrorStringA
-#define NDdeIsValidShareName NDdeIsValidShareNameA
-#define NDdeIsValidAppTopicList NDdeIsValidAppTopicListA
-#define NDdeSetTrustedShare NDdeSetTrustedShareA
-#define NDdeGetTrustedShare NDdeGetTrustedShareA
-#define NDdeTrustedShareEnum NDdeTrustedShareEnumA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/nspapi.h b/winsup/w32api/include/nspapi.h
deleted file mode 100644
index 54cb7cfaa..000000000
--- a/winsup/w32api/include/nspapi.h
+++ /dev/null
@@ -1,126 +0,0 @@
-#ifndef _NSPAPI_H
-#define _NSPAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define NS_ALL		0
-
-#define NS_SAP		1
-#define NS_NDS		2
-#define NS_PEER_BROWSE	3
-
-#define NS_TCPIP_LOCAL	10
-#define NS_TCPIP_HOSTS	11
-#define NS_DNS		12
-#define NS_NETBT	13
-#define NS_WINS		14
-
-#define NS_NBP		20
-
-#define NS_MS		30
-#define NS_STDA		31
-#define NS_NTDS		32
-
-#define NS_X500		40
-#define NS_NIS		41
-#define NS_NISPLUS	42
-
-#define NS_WRQ		50
-
-#define SERVICE_REGISTER	1
-#define SERVICE_DEREGISTER	2
-#define SERVICE_FLUSH		3
-#define SERVICE_FLAG_HARD	0x00000002
-
-#ifndef RC_INVOKED
-
-#if defined (_WINSOCK_H) || defined (_WINSOCK2_H) /* needed for LPSOCKADDR */
-#ifndef __CSADDR_T_DEFINED /* also in winsock2.h, but not in winsock.h */
-#define __CSADDR_T_DEFINED
-typedef struct _SOCKET_ADDRESS {
-	LPSOCKADDR lpSockaddr;
-	INT iSockaddrLength;
-} SOCKET_ADDRESS,*PSOCKET_ADDRESS,*LPSOCKET_ADDRESS;
-typedef struct _CSADDR_INFO {
-	SOCKET_ADDRESS LocalAddr;
-	SOCKET_ADDRESS RemoteAddr;
-	INT iSocketType;
-	INT iProtocol;
-} CSADDR_INFO,*PCSADDR_INFO,*LPCSADDR_INFO;
-#endif
-#endif
-
-#ifndef __BLOB_T_DEFINED /* also in wtypes.h and winsock2.h */
-#define __BLOB_T_DEFINED
-typedef struct _BLOB {
-	ULONG	cbSize;
-	BYTE	*pBlobData;
-} BLOB,*PBLOB,*LPBLOB;
-#endif
-
-typedef struct _SERVICE_ADDRESS {
-	DWORD dwAddressType;
-	DWORD dwAddressFlags;
-	DWORD dwAddressLength;
-	DWORD dwPrincipalLength;
-	BYTE *lpAddress;
-	BYTE *lpPrincipal;
-} SERVICE_ADDRESS;
-typedef struct _SERVICE_ADDRESSES {
-	DWORD dwAddressCount;
-	SERVICE_ADDRESS Addresses[1];
-} SERVICE_ADDRESSES, *PSERVICE_ADDRESSES, *LPSERVICE_ADDRESSES;
-typedef struct _SERVICE_INFOA {
-	LPGUID lpServiceType;
-	LPSTR lpServiceName;
-	LPSTR lpComment;
-	LPSTR lpLocale;
-	DWORD dwDisplayHint;
-	DWORD dwVersion;
-	DWORD dwTime;
-	LPSTR lpMachineName;
-	LPSERVICE_ADDRESSES lpServiceAddress;
-	BLOB ServiceSpecificInfo;
-} SERVICE_INFOA, *LPSERVICE_INFOA;
-typedef struct _SERVICE_INFOW {
-	LPGUID lpServiceType;
-	LPWSTR lpServiceName;
-	LPWSTR lpComment;
-	LPWSTR lpLocale;
-	DWORD dwDisplayHint;
-	DWORD dwVersion;
-	DWORD dwTime;
-	LPWSTR lpMachineName;
-	LPSERVICE_ADDRESSES lpServiceAddress;
-	BLOB ServiceSpecificInfo;
-} SERVICE_INFOW, *LPSERVICE_INFOW;
-
-typedef void *LPSERVICE_ASYNC_INFO;
-INT WINAPI SetServiceA(DWORD,DWORD,DWORD,LPSERVICE_INFOA,LPSERVICE_ASYNC_INFO,LPDWORD);
-INT WINAPI SetServiceW(DWORD,DWORD,DWORD,LPSERVICE_INFOA,LPSERVICE_ASYNC_INFO,LPDWORD);
-INT WINAPI GetAddressByNameA(DWORD,LPGUID,LPSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPTSTR,LPDWORD);
-INT WINAPI GetAddressByNameW(DWORD,LPGUID,LPWSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPTSTR,LPDWORD);
-
-#ifdef UNICODE
-typedef SERVICE_INFOW SERVICE_INFO, *LPSERVICE_INFO;
-#define _SERVICE_INFO SERVICE_INFOW
-#define SetService SetServiceW
-#define GetAddressByName GetAddressByNameW
-#else
-typedef SERVICE_INFOA SERVICE_INFO, *LPSERVICE_INFO;
-#define _SERVICE_INFO SERVICE_INFOA
-#define SetService SetServiceA
-#define GetAddressByName GetAddressByNameA
-#endif
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _NSPAPI_H */
diff --git a/winsup/w32api/include/ntdef.h b/winsup/w32api/include/ntdef.h
deleted file mode 100644
index 83f4fa356..000000000
--- a/winsup/w32api/include/ntdef.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef _NTDEF_H
-#define _NTDEF_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define NTAPI __stdcall
-#define OBJ_INHERIT 2L
-#define OBJ_PERMANENT 16L
-#define OBJ_EXCLUSIVE 32L
-#define OBJ_CASE_INSENSITIVE 64L
-#define OBJ_OPENIF 128L
-#define OBJ_OPENLINK 256L
-#define OBJ_VALID_ATTRIBUTES 498L
-#define InitializeObjectAttributes(p,n,a,r,s) { \
-  (p)->Length = sizeof(OBJECT_ATTRIBUTES); \
-  (p)->RootDirectory = (r); \
-  (p)->Attributes = (a); \
-  (p)->ObjectName = (n); \
-  (p)->SecurityDescriptor = (s); \
-  (p)->SecurityQualityOfService = NULL; \
-}
-#ifndef NT_SUCCESS
-#define NT_SUCCESS(x) ((x)>=0)
-#define STATUS_SUCCESS ((NTSTATUS)0)
-#endif
-#if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H)
-typedef LONG NTSTATUS, *PNTSTATUS;
-typedef struct _UNICODE_STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PWSTR  Buffer;
-} UNICODE_STRING, *PUNICODE_STRING;
-typedef const UNICODE_STRING* PCUNICODE_STRING;
-typedef struct _STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PCHAR  Buffer;
-} STRING, *PSTRING;
-#endif
-typedef STRING ANSI_STRING;
-typedef PSTRING PANSI_STRING;
-typedef STRING OEM_STRING;
-typedef PSTRING POEM_STRING;
-typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS;
-typedef enum _SECTION_INHERIT {
-  ViewShare = 1,
-  ViewUnmap = 2
-} SECTION_INHERIT;
-#if !defined(_NTSECAPI_H)
-typedef struct _OBJECT_ATTRIBUTES {
-  ULONG Length;
-  HANDLE RootDirectory;
-  PUNICODE_STRING ObjectName;
-  ULONG Attributes;                      
-  PVOID SecurityDescriptor;              
-  PVOID SecurityQualityOfService;
-} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
-#endif
-#endif /* _NTDEF_H */
diff --git a/winsup/w32api/include/ntdll.h b/winsup/w32api/include/ntdll.h
deleted file mode 100644
index b66661399..000000000
--- a/winsup/w32api/include/ntdll.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _NTDLL_H
-#define _NTDLL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-typedef enum _SHUTDOWN_ACTION {
-     ShutdownNoReboot,
-     ShutdownReboot,
-     ShutdownPowerOff
- } SHUTDOWN_ACTION;
-
-DWORD WINAPI NtShutdownSystem (SHUTDOWN_ACTION Action);
-
-#endif /* _NTDLL_H */
diff --git a/winsup/w32api/include/ntldap.h b/winsup/w32api/include/ntldap.h
deleted file mode 100644
index 29236a047..000000000
--- a/winsup/w32api/include/ntldap.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-  ntldap.h - Header file for the Windows LDAP API Extensions
-
-  Written by Filip Navara <xnavara@volny.cz>
-
-  References:
-    Lightweight Directory Access Protocol Reference
-    http://msdn.microsoft.com/library/en-us/netdir/ldap/ldap_reference.asp
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#ifndef _NTLDAP_H
-#define _NTLDAP_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#define LDAP_SERVER_ASQ_OID	"1.2.840.113556.1.4.1504"
-#define LDAP_SERVER_ASQ_OID_W	L"1.2.840.113556.1.4.1504"
-#define LDAP_SERVER_DIRSYNC_OID	"1.2.840.113556.1.4.841"
-#define LDAP_SERVER_DIRSYNC_OID_W	L"1.2.840.113556.1.4.841"
-#define LDAP_SERVER_SD_FLAGS_OID	"1.2.840.113556.1.4.801"
-#define LDAP_SERVER_SD_FLAGS_OID_W	L"1.2.840.113556.1.4.801"
-#define LDAP_SERVER_FAST_BIND_OID	"1.2.840.113556.1.4.1781"
-#define LDAP_SERVER_FAST_BIND_OID_W	L"1.2.840.113556.1.4.1781"
-#define LDAP_MATCHING_RULE_BIT_OR	"1.2.840.113556.1.4.804"
-#define LDAP_MATCHING_RULE_BIT_OR_W	L"1.2.840.113556.1.4.804"
-#define LDAP_MATCHING_RULE_BIT_AND	"1.2.840.113556.1.4.803"
-#define LDAP_MATCHING_RULE_BIT_AND_W	L"1.2.840.113556.1.4.803"
-#define LDAP_SERVER_EXTENDED_DN_OID	"1.2.840.113556.1.4.529"
-#define LDAP_SERVER_EXTENDED_DN_OID_W	L"1.2.840.113556.1.4.529"
-#define LDAP_SERVER_LAZY_COMMIT_OID	"1.2.840.113556.1.4.619"
-#define LDAP_SERVER_LAZY_COMMIT_OID_W	L"1.2.840.113556.1.4.619"
-#define LDAP_SERVER_TREE_DELETE_OID	"1.2.840.113556.1.4.805"
-#define LDAP_SERVER_TREE_DELETE_OID_W	L"1.2.840.113556.1.4.805"
-#define LDAP_SERVER_VERIFY_NAME_OID	"1.2.840.113556.1.4.1338"
-#define LDAP_SERVER_VERIFY_NAME_OID_W	L"1.2.840.113556.1.4.1338"
-#define LDAP_SERVER_SHOW_DELETED_OID	"1.2.840.113556.1.4.417"
-#define LDAP_SERVER_SHOW_DELETED_OID_W	L"1.2.840.113556.1.4.417"
-#define LDAP_SERVER_NOTIFICATION_OID	"1.2.840.113556.1.4.528"
-#define LDAP_SERVER_NOTIFICATION_OID_W	L"1.2.840.113556.1.4.528"
-#define LDAP_SERVER_DOMAIN_SCOPE_OID	"1.2.840.113556.1.4.1339"
-#define LDAP_SERVER_DOMAIN_SCOPE_OID_W	L"1.2.840.113556.1.4.1339"
-#define LDAP_CAP_ACTIVE_DIRECTORY_OID	"1.2.840.113556.1.4.800"
-#define LDAP_CAP_ACTIVE_DIRECTORY_OID_W	L"1.2.840.113556.1.4.800"
-#define LDAP_SERVER_SEARCH_OPTIONS_OID	"1.2.840.113556.1.4.1340"
-#define LDAP_SERVER_SEARCH_OPTIONS_OID_W	L"1.2.840.113556.1.4.1340"
-#define LDAP_CAP_ACTIVE_DIRECTORY_V51_OID	"1.2.840.113556.1.4.1670"
-#define LDAP_CAP_ACTIVE_DIRECTORY_V51_OID_W	L"1.2.840.113556.1.4.1670"
-#define LDAP_SERVER_PERMISSIVE_MODIFY_OID	"1.2.840.113556.1.4.1413"
-#define LDAP_SERVER_PERMISSIVE_MODIFY_OID_W	L"1.2.840.113556.1.4.1413"
-#define LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID	"1.2.840.113556.1.4.521"
-#define LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID_W	L"1.2.840.113556.1.4.521"
-#define SERVER_SEARCH_FLAG_DOMAIN_SCOPE	1
-#define SERVER_SEARCH_FLAG_PHANTOM_ROOT	2
-
-#endif /*  _NTLDAP_H */
diff --git a/winsup/w32api/include/ntsecapi.h b/winsup/w32api/include/ntsecapi.h
deleted file mode 100644
index 71e4e5e74..000000000
--- a/winsup/w32api/include/ntsecapi.h
+++ /dev/null
@@ -1,611 +0,0 @@
-#ifndef _NTSECAPI_H
-#define _NTSECAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define KERB_WRAP_NO_ENCRYPT 0x80000001
-#define LOGON_GUEST 1
-#define LOGON_NOENCRYPTION 2
-#define LOGON_CACHED_ACCOUNT 4
-#define LOGON_USED_LM_PASSWORD 8
-#define LOGON_EXTRA_SIDS 32
-#define LOGON_SUBAUTH_SESSION_KEY 64
-#define LOGON_SERVER_TRUST_ACCOUNT 128
-#define LOGON_NTLMV2_ENABLED 256
-#define LOGON_RESOURCE_GROUPS 512
-#define LOGON_PROFILE_PATH_RETURNED 1024
-#define LOGON_GRACE_LOGON 16777216
-#define LSA_MODE_PASSWORD_PROTECTED 1
-#define LSA_MODE_INDIVIDUAL_ACCOUNTS 2
-#define LSA_MODE_MANDATORY_ACCESS 3
-#define LSA_MODE_LOG_FULL 4
-#define LSA_SUCCESS(x) ((LONG)(x)>=0)
-#define MICROSOFT_KERBEROS_NAME_A "Kerberos"
-#define MICROSOFT_KERBEROS_NAME_W L"Kerberos"
-#define MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT 32
-#define MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT 2048
-#define MSV1_0_CHALLENGE_LENGTH 8
-#define MSV1_0_CLEARTEXT_PASSWORD_ALLOWED 2
-#define MSV1_0_CRED_LM_PRESENT 1
-#define MSV1_0_CRED_NT_PRESENT 2
-#define MSV1_0_CRED_VERSION 0
-#define MSV1_0_DONT_TRY_GUEST_ACCOUNT 16
-#define MSV1_0_LANMAN_SESSION_KEY_LENGTH 8
-#define MSV1_0_MAX_NTLM3_LIFE 1800
-#define MSV1_0_MAX_AVL_SIZE 64000
-#define MSV1_0_MNS_LOGON 16777216
-#define MSV1_0_NTLM3_RESPONSE_LENGTH 16
-#define MSV1_0_NTLM3_OWF_LENGTH 16
-#define MSV1_0_NTLM3_INPUT_LENGTH (sizeof(MSV1_0_NTLM3_RESPONSE)-MSV1_0_NTLM3_RESPONSE_LENGTH)
-#define MSV1_0_OWF_PASSWORD_LENGTH 16
-#define MSV1_0_PACKAGE_NAME "MICROSOFT_AUTHENTICATION_PACKAGE_V1_0"
-#define MSV1_0_PACKAGE_NAMEW L"MICROSOFT_AUTHENTICATION_PACKAGE_V1_0"
-#define MSV1_0_PACKAGE_NAMEW_LENGTH sizeof(MSV1_0_PACKAGE_NAMEW)-sizeof(WCHAR)
-#define MSV1_0_RETURN_USER_PARAMETERS 8
-#define MSV1_0_RETURN_PASSWORD_EXPIRY 64
-#define MSV1_0_RETURN_PROFILE_PATH 512
-#define MSV1_0_SUBAUTHENTICATION_DLL_EX 1048576
-#define MSV1_0_SUBAUTHENTICATION_DLL 0xff000000
-#define MSV1_0_SUBAUTHENTICATION_DLL_SHIFT 24
-#define MSV1_0_SUBAUTHENTICATION_DLL_RAS 2
-#define MSV1_0_SUBAUTHENTICATION_DLL_IIS 132
-#define MSV1_0_SUBAUTHENTICATION_FLAGS 0xff000000
-#define MSV1_0_SUBAUTHENTICATION_KEY "System\\CurrentControlSet\\Control\\Lsa\\MSV1_0"
-#define MSV1_0_SUBAUTHENTICATION_VALUE "Auth"
-#define MSV1_0_TRY_GUEST_ACCOUNT_ONLY 256
-#define MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY 1024
-#define MSV1_0_UPDATE_LOGON_STATISTICS 4
-#define MSV1_0_USE_CLIENT_CHALLENGE 128
-#define MSV1_0_USER_SESSION_KEY_LENGTH 16
-#define POLICY_VIEW_LOCAL_INFORMATION 1
-#define POLICY_VIEW_AUDIT_INFORMATION 2
-#define POLICY_GET_PRIVATE_INFORMATION 4
-#define POLICY_TRUST_ADMIN 8
-#define POLICY_CREATE_ACCOUNT 16
-#define POLICY_CREATE_SECRET 32
-#define POLICY_CREATE_PRIVILEGE 64
-#define POLICY_SET_DEFAULT_QUOTA_LIMITS 128
-#define POLICY_SET_AUDIT_REQUIREMENTS 256
-#define POLICY_AUDIT_LOG_ADMIN 512
-#define POLICY_SERVER_ADMIN 1024
-#define POLICY_LOOKUP_NAMES 2048
-#define POLICY_READ (STANDARD_RIGHTS_READ|6)
-#define POLICY_WRITE (STANDARD_RIGHTS_WRITE|2040)
-#define POLICY_EXECUTE (STANDARD_RIGHTS_EXECUTE|2049)
-#define POLICY_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|4095)
-#define POLICY_AUDIT_EVENT_UNCHANGED 0
-#define POLICY_AUDIT_EVENT_SUCCESS 1
-#define POLICY_AUDIT_EVENT_FAILURE 2
-#define POLICY_AUDIT_EVENT_NONE 4
-#define POLICY_AUDIT_EVENT_MASK 7
-#define POLICY_LOCATION_LOCAL 1
-#define POLICY_LOCATION_DS 2
-#define POLICY_MACHINE_POLICY_LOCAL 0
-#define POLICY_MACHINE_POLICY_DEFAULTED 1
-#define POLICY_MACHINE_POLICY_EXPLICIT 2
-#define POLICY_MACHINE_POLICY_UNKNOWN 0xFFFFFFFF
-#define POLICY_QOS_SCHANEL_REQUIRED 1
-#define POLICY_QOS_OUTBOUND_INTEGRITY 2
-#define POLICY_QOS_OUTBOUND_CONFIDENTIALITY 4
-#define POLICY_QOS_INBOUND_INTEGREITY 8
-#define POLICY_QOS_INBOUND_CONFIDENTIALITY 16
-#define POLICY_QOS_ALLOW_LOCAL_ROOT_CERT_STORE 32
-#define POLICY_QOS_RAS_SERVER_ALLOWED 64
-#define POLICY_QOS_DHCP_SERVER_ALLOWD 128
-#define POLICY_KERBEROS_FORWARDABLE 1
-#define POLICY_KERBEROS_PROXYABLE 2
-#define POLICY_KERBEROS_RENEWABLE 4
-#define POLICY_KERBEROS_POSTDATEABLE 8
-#define SAM_PASSWORD_CHANGE_NOTIFY_ROUTINE "PasswordChangeNotify"
-#define SAM_INIT_NOTIFICATION_ROUTINE "InitializeChangeNotify"
-#define SAM_PASSWORD_FILTER_ROUTINE "PasswordFilter"
-#define SE_INTERACTIVE_LOGON_NAME TEXT("SeInteractiveLogonRight")
-#define SE_NETWORK_LOGON_NAME TEXT("SeNetworkLogonRight")
-#define SE_BATCH_LOGON_NAME TEXT("SeBatchLogonRight")
-#define SE_SERVICE_LOGON_NAME TEXT("SeServiceLogonRight")
-#define TRUST_ATTRIBUTE_NON_TRANSITIVE 1
-#define TRUST_ATTRIBUTE_UPLEVEL_ONLY 2
-#define TRUST_ATTRIBUTE_TREE_PARENT 4194304
-#define TRUST_ATTRIBUTES_VALID  -16580609
-#define TRUST_AUTH_TYPE_NONE 0
-#define TRUST_AUTH_TYPE_NT4OWF 1
-#define TRUST_AUTH_TYPE_CLEAR 2
-#define TRUST_DIRECTION_DISABLED 0
-#define TRUST_DIRECTION_INBOUND 1
-#define TRUST_DIRECTION_OUTBOUND 2
-#define TRUST_DIRECTION_BIDIRECTIONAL 3
-#define TRUST_TYPE_DOWNLEVEL 1
-#define TRUST_TYPE_UPLEVEL 2
-#define TRUST_TYPE_MIT 3
-#define TRUST_TYPE_DCE 4
-#if !defined(_NTDEF_H) && !defined(_SUBAUTH_H)
-typedef LONG NTSTATUS, *PNTSTATUS;
-typedef struct _UNICODE_STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PWSTR Buffer;
-} UNICODE_STRING, *PUNICODE_STRING;
-typedef struct _STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PCHAR Buffer;
-} STRING, *PSTRING;
-#endif
-typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING;
-typedef STRING LSA_STRING, *PLSA_STRING;
-typedef enum _MSV1_0_LOGON_SUBMIT_TYPE {
-  MsV1_0InteractiveLogon = 2,
-  MsV1_0Lm20Logon,
-  MsV1_0NetworkLogon,
-  MsV1_0SubAuthLogon,
-  MsV1_0WorkstationUnlockLogon = 7
-} MSV1_0_LOGON_SUBMIT_TYPE, *PMSV1_0_LOGON_SUBMIT_TYPE;
-typedef enum _MSV1_0_PROFILE_BUFFER_TYPE {
-  MsV1_0InteractiveProfile = 2,
-  MsV1_0Lm20LogonProfile,
-  MsV1_0SmartCardProfile
-} MSV1_0_PROFILE_BUFFER_TYPE, *PMSV1_0_PROFILE_BUFFER_TYPE;
-typedef enum {
-  MsvAvEOL,
-  MsvAvNbComputerName,
-  MsvAvNbDomainName,
-  MsvAvDnsComputerName,
-  MsvAvDnsDomainName
-} MSV1_0_AVID;
-typedef enum _MSV1_0_PROTOCOL_MESSAGE_TYPE {
-  MsV1_0Lm20ChallengeRequest = 0,
-  MsV1_0Lm20GetChallengeResponse,
-  MsV1_0EnumerateUsers,
-  MsV1_0GetUserInfo,
-  MsV1_0ReLogonUsers,
-  MsV1_0ChangePassword,
-  MsV1_0ChangeCachedPassword,
-  MsV1_0GenericPassthrough,
-  MsV1_0CacheLogon,
-  MsV1_0SubAuth,
-  MsV1_0DeriveCredential,
-  MsV1_0CacheLookup
-} MSV1_0_PROTOCOL_MESSAGE_TYPE, *PMSV1_0_PROTOCOL_MESSAGE_TYPE;
-typedef enum _POLICY_LSA_SERVER_ROLE {
-  PolicyServerRoleBackup = 2,
-  PolicyServerRolePrimary
-} POLICY_LSA_SERVER_ROLE, *PPOLICY_LSA_SERVER_ROLE;
-typedef enum _POLICY_SERVER_ENABLE_STATE {
-  PolicyServerEnabled = 2,
-  PolicyServerDisabled
-} POLICY_SERVER_ENABLE_STATE, *PPOLICY_SERVER_ENABLE_STATE;
-typedef enum _POLICY_INFORMATION_CLASS {
-  PolicyAuditLogInformation = 1,
-  PolicyAuditEventsInformation,
-  PolicyPrimaryDomainInformation,
-  PolicyPdAccountInformation,
-  PolicyAccountDomainInformation,
-  PolicyLsaServerRoleInformation,
-  PolicyReplicaSourceInformation,
-  PolicyDefaultQuotaInformation,
-  PolicyModificationInformation,
-  PolicyAuditFullSetInformation,
-  PolicyAuditFullQueryInformation,
-  PolicyDnsDomainInformation,
-  PolicyEfsInformation
-} POLICY_INFORMATION_CLASS, *PPOLICY_INFORMATION_CLASS;
-typedef enum _POLICY_AUDIT_EVENT_TYPE {
-  AuditCategorySystem,
-  AuditCategoryLogon,
-  AuditCategoryObjectAccess,
-  AuditCategoryPrivilegeUse,
-  AuditCategoryDetailedTracking,
-  AuditCategoryPolicyChange,
-  AuditCategoryAccountManagement,
-  AuditCategoryDirectoryServiceAccess,
-  AuditCategoryAccountLogon
-} POLICY_AUDIT_EVENT_TYPE, *PPOLICY_AUDIT_EVENT_TYPE;
-typedef enum _POLICY_LOCAL_INFORMATION_CLASS {
-  PolicyLocalAuditEventsInformation = 1,
-  PolicyLocalPdAccountInformation,
-  PolicyLocalAccountDomainInformation,
-  PolicyLocalLsaServerRoleInformation,
-  PolicyLocalReplicaSourceInformation,
-  PolicyLocalModificationInformation,
-  PolicyLocalAuditFullSetInformation,
-  PolicyLocalAuditFullQueryInformation,
-  PolicyLocalDnsDomainInformation,
-  PolicyLocalIPSecReferenceInformation,
-  PolicyLocalMachinePasswordInformation,
-  PolicyLocalQualityOfServiceInformation,
-  PolicyLocalPolicyLocationInformation
-} POLICY_LOCAL_INFORMATION_CLASS, *PPOLICY_LOCAL_INFORMATION_CLASS;
-typedef enum _POLICY_DOMAIN_INFORMATION_CLASS {
-  PolicyDomainIPSecReferenceInformation = 1,
-  PolicyDomainQualityOfServiceInformation,
-  PolicyDomainEfsInformation,
-  PolicyDomainPublicKeyInformation,
-  PolicyDomainPasswordPolicyInformation,
-  PolicyDomainLockoutInformation,
-  PolicyDomainKerberosTicketInformation
-} POLICY_DOMAIN_INFORMATION_CLASS, *PPOLICY_DOMAIN_INFORMATION_CLASS;
-typedef enum _SECURITY_LOGON_TYPE {
-  Interactive = 2,
-  Network,
-  Batch,
-  Service,
-  Proxy,
-  Unlock
-} SECURITY_LOGON_TYPE, *PSECURITY_LOGON_TYPE;
-typedef enum _TRUSTED_INFORMATION_CLASS {
-  TrustedDomainNameInformation = 1,
-  TrustedControllersInformation,
-  TrustedPosixOffsetInformation,
-  TrustedPasswordInformation,
-  TrustedDomainInformationBasic,
-  TrustedDomainInformationEx,
-  TrustedDomainAuthInformation,
-  TrustedDomainFullInformation
-} TRUSTED_INFORMATION_CLASS, *PTRUSTED_INFORMATION_CLASS;
-typedef struct _DOMAIN_PASSWORD_INFORMATION {
-  USHORT MinPasswordLength;
-  USHORT PasswordHistoryLength;
-  ULONG PasswordProperties;
-  LARGE_INTEGER MaxPasswordAge;
-  LARGE_INTEGER MinPasswordAge;
-} DOMAIN_PASSWORD_INFORMATION, *PDOMAIN_PASSWORD_INFORMATION;
-typedef ULONG LSA_ENUMERATION_HANDLE, *PLSA_ENUMERATION_HANDLE;
-typedef struct _LSA_ENUMERATION_INFORMATION {
-  PSID Sid;
-} LSA_ENUMERATION_INFORMATION, *PLSA_ENUMERATION_INFORMATION;
-typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE;
-#if !defined(_NTDEF_H)
-typedef struct _LSA_OBJECT_ATTRIBUTES {
-  ULONG Length;
-  HANDLE RootDirectory;
-  PLSA_UNICODE_STRING ObjectName;
-  ULONG Attributes;
-  PVOID SecurityDescriptor;
-  PVOID SecurityQualityOfService;
-} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
-#endif
-typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;
-typedef struct _LSA_TRUST_INFORMATION {
-  LSA_UNICODE_STRING Name;
-  PSID Sid;
-} LSA_TRUST_INFORMATION, *PLSA_TRUST_INFORMATION;
-typedef struct _LSA_REFERENCED_DOMAIN_LIST {
-  ULONG Entries;
-  PLSA_TRUST_INFORMATION Domains;
-} LSA_REFERENCED_DOMAIN_LIST, *PLSA_REFERENCED_DOMAIN_LIST;
-typedef struct _LSA_TRANSLATED_SID {
-  SID_NAME_USE Use;
-  ULONG RelativeId;
-  LONG DomainIndex;
-} LSA_TRANSLATED_SID, *PLSA_TRANSLATED_SID;
-typedef struct _LSA_TRANSLATED_NAME {
-  SID_NAME_USE Use;
-  LSA_UNICODE_STRING Name;
-  LONG DomainIndex;
-} LSA_TRANSLATED_NAME, *PLSA_TRANSLATED_NAME;
-typedef struct _MSV1_0_INTERACTIVE_LOGON {
-  MSV1_0_LOGON_SUBMIT_TYPE MessageType;
-  UNICODE_STRING LogonDomainName;
-  UNICODE_STRING UserName;
-  UNICODE_STRING Password;
-} MSV1_0_INTERACTIVE_LOGON, *PMSV1_0_INTERACTIVE_LOGON;
-typedef struct _MSV1_0_INTERACTIVE_PROFILE {
-  MSV1_0_PROFILE_BUFFER_TYPE MessageType;
-  USHORT LogonCount;
-  USHORT BadPasswordCount;
-  LARGE_INTEGER LogonTime;
-  LARGE_INTEGER LogoffTime;
-  LARGE_INTEGER KickOffTime;
-  LARGE_INTEGER PasswordLastSet;
-  LARGE_INTEGER PasswordCanChange;
-  LARGE_INTEGER PasswordMustChange;
-  UNICODE_STRING LogonScript;
-  UNICODE_STRING HomeDirectory;
-  UNICODE_STRING FullName;
-  UNICODE_STRING ProfilePath;
-  UNICODE_STRING HomeDirectoryDrive;
-  UNICODE_STRING LogonServer;
-  ULONG UserFlags;
-} MSV1_0_INTERACTIVE_PROFILE, *PMSV1_0_INTERACTIVE_PROFILE;
-typedef struct _MSV1_0_LM20_LOGON {
-  MSV1_0_LOGON_SUBMIT_TYPE MessageType;
-  UNICODE_STRING LogonDomainName;
-  UNICODE_STRING UserName;
-  UNICODE_STRING Workstation;
-  UCHAR ChallengeToClient[MSV1_0_CHALLENGE_LENGTH];
-  STRING CaseSensitiveChallengeResponse;
-  STRING CaseInsensitiveChallengeResponse;
-  ULONG ParameterControl;
-} MSV1_0_LM20_LOGON, * PMSV1_0_LM20_LOGON;
-typedef struct _MSV1_0_SUBAUTH_LOGON{ /* W2K only */
-  MSV1_0_LOGON_SUBMIT_TYPE MessageType;
-  UNICODE_STRING LogonDomainName;
-  UNICODE_STRING UserName;
-  UNICODE_STRING Workstation;
-  UCHAR ChallengeToClient[MSV1_0_CHALLENGE_LENGTH];
-  STRING AuthenticationInfo1;
-  STRING AuthenticationInfo2;
-  ULONG ParameterControl;
-  ULONG SubAuthPackageId;
-} MSV1_0_SUBAUTH_LOGON, * PMSV1_0_SUBAUTH_LOGON;
-typedef struct _MSV1_0_LM20_LOGON_PROFILE {
-  MSV1_0_PROFILE_BUFFER_TYPE MessageType;
-  LARGE_INTEGER KickOffTime;
-  LARGE_INTEGER LogoffTime;
-  ULONG UserFlags;
-  UCHAR UserSessionKey[MSV1_0_USER_SESSION_KEY_LENGTH];
-  UNICODE_STRING LogonDomainName;
-  UCHAR LanmanSessionKey[MSV1_0_LANMAN_SESSION_KEY_LENGTH];
-  UNICODE_STRING LogonServer;
-  UNICODE_STRING UserParameters;
-} MSV1_0_LM20_LOGON_PROFILE, * PMSV1_0_LM20_LOGON_PROFILE;
-typedef struct _MSV1_0_SUPPLEMENTAL_CREDENTIAL {
-  ULONG Version;
-  ULONG Flags;
-  UCHAR LmPassword[MSV1_0_OWF_PASSWORD_LENGTH];
-  UCHAR NtPassword[MSV1_0_OWF_PASSWORD_LENGTH];
-} MSV1_0_SUPPLEMENTAL_CREDENTIAL, *PMSV1_0_SUPPLEMENTAL_CREDENTIAL;
-typedef struct _MSV1_0_NTLM3_RESPONSE {
-  UCHAR Response[MSV1_0_NTLM3_RESPONSE_LENGTH];
-  UCHAR RespType;
-  UCHAR HiRespType;
-  USHORT Flags;
-  ULONG MsgWord;
-  ULONGLONG TimeStamp;
-  UCHAR ChallengeFromClient[MSV1_0_CHALLENGE_LENGTH];
-  ULONG AvPairsOff;
-  UCHAR Buffer[1];
-} MSV1_0_NTLM3_RESPONSE, *PMSV1_0_NTLM3_RESPONSE;
-typedef struct  _MSV1_0_AV_PAIR {
-  USHORT AvId;
-  USHORT AvLen;
-} MSV1_0_AV_PAIR, *PMSV1_0_AV_PAIR;
-typedef struct _MSV1_0_CHANGEPASSWORD_REQUEST {
-  MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
-  UNICODE_STRING DomainName;
-  UNICODE_STRING AccountName;
-  UNICODE_STRING OldPassword;
-  UNICODE_STRING NewPassword;
-  BOOLEAN Impersonating;
-} MSV1_0_CHANGEPASSWORD_REQUEST, *PMSV1_0_CHANGEPASSWORD_REQUEST;
-typedef struct _MSV1_0_CHANGEPASSWORD_RESPONSE {
-  MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
-  BOOLEAN PasswordInfoValid;
-  DOMAIN_PASSWORD_INFORMATION DomainPasswordInfo;
-} MSV1_0_CHANGEPASSWORD_RESPONSE, *PMSV1_0_CHANGEPASSWORD_RESPONSE;
-typedef struct _MSV1_0_SUBAUTH_REQUEST{
-  MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
-  ULONG SubAuthPackageId;
-  ULONG SubAuthInfoLength;
-  PUCHAR SubAuthSubmitBuffer;
-} MSV1_0_SUBAUTH_REQUEST, *PMSV1_0_SUBAUTH_REQUEST;
-typedef struct _MSV1_0_SUBAUTH_RESPONSE{
-  MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
-  ULONG SubAuthInfoLength;
-  PUCHAR SubAuthReturnBuffer;
-} MSV1_0_SUBAUTH_RESPONSE, *PMSV1_0_SUBAUTH_RESPONSE;
-#define MSV1_0_DERIVECRED_TYPE_SHA1 0
-typedef struct _MSV1_0_DERIVECRED_REQUEST {
-  MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
-  LUID LogonId;
-  ULONG DeriveCredType;
-  ULONG DeriveCredInfoLength;
-  UCHAR DeriveCredSubmitBuffer[1];
-} MSV1_0_DERIVECRED_REQUEST, *PMSV1_0_DERIVECRED_REQUEST;
-typedef struct _MSV1_0_DERIVECRED_RESPONSE {
-  MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
-  ULONG DeriveCredInfoLength;
-  UCHAR DeriveCredReturnBuffer[1];
-} MSV1_0_DERIVECRED_RESPONSE, *PMSV1_0_DERIVECRED_RESPONSE;
-typedef ULONG POLICY_AUDIT_EVENT_OPTIONS, *PPOLICY_AUDIT_EVENT_OPTIONS;
-typedef struct _POLICY_PRIVILEGE_DEFINITION {
-  LSA_UNICODE_STRING Name;
-  LUID LocalValue;
-} POLICY_PRIVILEGE_DEFINITION, *PPOLICY_PRIVILEGE_DEFINITION;
-typedef struct _POLICY_AUDIT_LOG_INFO {
-  ULONG AuditLogPercentFull;
-  ULONG MaximumLogSize;
-  LARGE_INTEGER AuditRetentionPeriod;
-  BOOLEAN AuditLogFullShutdownInProgress;
-  LARGE_INTEGER TimeToShutdown;
-  ULONG NextAuditRecordId;
-} POLICY_AUDIT_LOG_INFO, *PPOLICY_AUDIT_LOG_INFO;
-typedef struct _POLICY_AUDIT_EVENTS_INFO {
-  BOOLEAN AuditingMode;
-  PPOLICY_AUDIT_EVENT_OPTIONS EventAuditingOptions;
-  ULONG MaximumAuditEventCount;
-} POLICY_AUDIT_EVENTS_INFO, *PPOLICY_AUDIT_EVENTS_INFO;
-typedef struct _POLICY_ACCOUNT_DOMAIN_INFO {
-  LSA_UNICODE_STRING DomainName;
-  PSID DomainSid;
-} POLICY_ACCOUNT_DOMAIN_INFO, *PPOLICY_ACCOUNT_DOMAIN_INFO;
-typedef struct _POLICY_PRIMARY_DOMAIN_INFO {
-  LSA_UNICODE_STRING Name;
-  PSID Sid;
-} POLICY_PRIMARY_DOMAIN_INFO, *PPOLICY_PRIMARY_DOMAIN_INFO;
-typedef struct _POLICY_DNS_DOMAIN_INFO {
-  LSA_UNICODE_STRING Name;
-  LSA_UNICODE_STRING DnsDomainName;
-  LSA_UNICODE_STRING DnsTreeName;
-  GUID DomainGuid;
-  PSID Sid;
-} POLICY_DNS_DOMAIN_INFO, *PPOLICY_DNS_DOMAIN_INFO;
-typedef struct _POLICY_PD_ACCOUNT_INFO {
-  LSA_UNICODE_STRING Name;
-} POLICY_PD_ACCOUNT_INFO, *PPOLICY_PD_ACCOUNT_INFO;
-typedef struct _POLICY_LSA_SERVER_ROLE_INFO {
-  POLICY_LSA_SERVER_ROLE LsaServerRole;
-} POLICY_LSA_SERVER_ROLE_INFO, *PPOLICY_LSA_SERVER_ROLE_INFO;
-typedef struct _POLICY_REPLICA_SOURCE_INFO {
-  LSA_UNICODE_STRING ReplicaSource;
-  LSA_UNICODE_STRING ReplicaAccountName;
-} POLICY_REPLICA_SOURCE_INFO, *PPOLICY_REPLICA_SOURCE_INFO;
-typedef struct _POLICY_DEFAULT_QUOTA_INFO {
-  QUOTA_LIMITS QuotaLimits;
-} POLICY_DEFAULT_QUOTA_INFO, *PPOLICY_DEFAULT_QUOTA_INFO;
-typedef struct _POLICY_MODIFICATION_INFO {
-  LARGE_INTEGER ModifiedId;
-  LARGE_INTEGER DatabaseCreationTime;
-} POLICY_MODIFICATION_INFO, *PPOLICY_MODIFICATION_INFO;
-typedef struct _POLICY_AUDIT_FULL_SET_INFO {
-  BOOLEAN ShutDownOnFull;
-} POLICY_AUDIT_FULL_SET_INFO, *PPOLICY_AUDIT_FULL_SET_INFO;
-typedef struct _POLICY_AUDIT_FULL_QUERY_INFO {
-  BOOLEAN ShutDownOnFull;
-  BOOLEAN LogIsFull;
-} POLICY_AUDIT_FULL_QUERY_INFO, *PPOLICY_AUDIT_FULL_QUERY_INFO;
-typedef struct _POLICY_EFS_INFO {
-  ULONG InfoLength;
-  PUCHAR EfsBlob;
-} POLICY_EFS_INFO, *PPOLICY_EFS_INFO;
-typedef struct _POLICY_LOCAL_IPSEC_REFERENCE_INFO {
-  LSA_UNICODE_STRING ObjectPath;
-} POLICY_LOCAL_IPSEC_REFERENCE_INFO, *PPOLICY_LOCAL_IPSEC_REFERENCE_INFO;
-typedef struct _POLICY_LOCAL_MACHINE_PASSWORD_INFO {
-  LARGE_INTEGER PasswordChangeInterval;
-} POLICY_LOCAL_MACHINE_PASSWORD_INFO, *PPOLICY_LOCAL_MACHINE_PASSWORD_INFO;
-typedef struct _POLICY_LOCAL_POLICY_LOCATION_INFO {
-  ULONG PolicyLocation;
-} POLICY_LOCAL_POLICY_LOCATION_INFO, *PPOLICY_LOCAL_POLICY_LOCATION_INFO;
-typedef struct _POLICY_LOCAL_QUALITY_OF_SERVICE_INFO {
-  ULONG QualityOfService;
-} POLICY_LOCAL_QUALITY_OF_SERVICE_INFO, *PPOLICY_LOCAL_QUALITY_OF_SERVICE_INFO;
-typedef struct _POLICY_LOCAL_QUALITY_OF_SERVICE_INFO POLICY_DOMAIN_QUALITY_OF_SERVICE_INFO;
-typedef struct _POLICY_LOCAL_QUALITY_OF_SERVICE_INFO *PPOLICY_DOMAIN_QUALITY_OF_SERVICE_INFO;
-typedef struct _POLICY_DOMAIN_PUBLIC_KEY_INFO {
-  ULONG InfoLength;
-  PUCHAR PublicKeyInfo;
-} POLICY_DOMAIN_PUBLIC_KEY_INFO, *PPOLICY_DOMAIN_PUBLIC_KEY_INFO;
-typedef struct _POLICY_DOMAIN_LOCKOUT_INFO {
-  LARGE_INTEGER LockoutDuration;
-  LARGE_INTEGER LockoutObservationWindow;
-  USHORT LockoutThreshold;
-} POLICY_DOMAIN_LOCKOUT_INFO, *PPOLICY_DOMAIN_LOCKOUT_INFO;
-typedef struct _POLICY_DOMAIN_PASSWORD_INFO {
-  USHORT MinPasswordLength;
-  USHORT PasswordHistoryLength;
-  ULONG PasswordProperties;
-  LARGE_INTEGER MaxPasswordAge;
-  LARGE_INTEGER MinPasswordAge;
-} POLICY_DOMAIN_PASSWORD_INFO, *PPOLICY_DOMAIN_PASSWORD_INFO;
-typedef struct _POLICY_DOMAIN_KERBEROS_TICKET_INFO {
-  ULONG AuthenticationOptions;
-  LARGE_INTEGER MinTicketAge;
-  LARGE_INTEGER MaxTicketAge;
-  LARGE_INTEGER MaxRenewAge;
-  LARGE_INTEGER ProxyLifetime;
-  LARGE_INTEGER ForceLogoff;
-} POLICY_DOMAIN_KERBEROS_TICKET_INFO, *PPOLICY_DOMAIN_KERBEROS_TICKET_INFO;
-typedef PVOID LSA_HANDLE, *PLSA_HANDLE;
-typedef struct _TRUSTED_DOMAIN_NAME_INFO {
-  LSA_UNICODE_STRING Name;
-} TRUSTED_DOMAIN_NAME_INFO, *PTRUSTED_DOMAIN_NAME_INFO;
-typedef struct _TRUSTED_CONTROLLERS_INFO {
-  ULONG Entries;
-  PLSA_UNICODE_STRING Names;
-} TRUSTED_CONTROLLERS_INFO, *PTRUSTED_CONTROLLERS_INFO;
-typedef struct _TRUSTED_POSIX_OFFSET_INFO {
-  ULONG Offset;
-} TRUSTED_POSIX_OFFSET_INFO, *PTRUSTED_POSIX_OFFSET_INFO;
-typedef struct _TRUSTED_PASSWORD_INFO {
-  LSA_UNICODE_STRING Password;
-  LSA_UNICODE_STRING OldPassword;
-} TRUSTED_PASSWORD_INFO, *PTRUSTED_PASSWORD_INFO;
-typedef  LSA_TRUST_INFORMATION TRUSTED_DOMAIN_INFORMATION_BASIC;
-typedef PLSA_TRUST_INFORMATION *PTRUSTED_DOMAIN_INFORMATION_BASIC;
-typedef struct _TRUSTED_DOMAIN_INFORMATION_EX {
-  LSA_UNICODE_STRING Name;
-  LSA_UNICODE_STRING FlatName;
-  PSID Sid;
-  ULONG TrustDirection;
-  ULONG TrustType;
-  ULONG TrustAttributes;
-} TRUSTED_DOMAIN_INFORMATION_EX, *PTRUSTED_DOMAIN_INFORMATION_EX;
-typedef struct _LSA_AUTH_INFORMATION {
-  LARGE_INTEGER LastUpdateTime;
-  ULONG AuthType;
-  ULONG AuthInfoLength;
-  PUCHAR AuthInfo;
-} LSA_AUTH_INFORMATION, *PLSA_AUTH_INFORMATION;
-typedef struct _TRUSTED_DOMAIN_AUTH_INFORMATION {
-  ULONG IncomingAuthInfos;
-  PLSA_AUTH_INFORMATION IncomingAuthenticationInformation;
-  PLSA_AUTH_INFORMATION IncomingPreviousAuthenticationInformation;
-  ULONG OutgoingAuthInfos;
-  PLSA_AUTH_INFORMATION OutgoingAuthenticationInformation;
-  PLSA_AUTH_INFORMATION OutgoingPreviousAuthenticationInformation;
-} TRUSTED_DOMAIN_AUTH_INFORMATION, *PTRUSTED_DOMAIN_AUTH_INFORMATION;
-typedef struct _TRUSTED_DOMAIN_FULL_INFORMATION {
-  TRUSTED_DOMAIN_INFORMATION_EX Information;
-  TRUSTED_POSIX_OFFSET_INFO PosixOffset;
-  TRUSTED_DOMAIN_AUTH_INFORMATION AuthInformation;
-} TRUSTED_DOMAIN_FULL_INFORMATION, *PTRUSTED_DOMAIN_FULL_INFORMATION;
-NTSTATUS NTAPI LsaAddAccountRights(LSA_HANDLE,PSID,PLSA_UNICODE_STRING,ULONG);
-NTSTATUS NTAPI LsaCallAuthenticationPackage(HANDLE,ULONG,PVOID,ULONG,PVOID*,
-                            PULONG,PNTSTATUS);
-NTSTATUS NTAPI LsaClose(LSA_HANDLE);
-NTSTATUS NTAPI LsaConnectUntrusted(PHANDLE);
-NTSTATUS NTAPI LsaCreateTrustedDomainEx(LSA_HANDLE,
-                            PTRUSTED_DOMAIN_INFORMATION_EX,
-                            PTRUSTED_DOMAIN_AUTH_INFORMATION,ACCESS_MASK,
-                            PLSA_HANDLE);
-NTSTATUS NTAPI LsaDeleteTrustedDomain(LSA_HANDLE,PSID);
-NTSTATUS NTAPI LsaDeregisterLogonProcess(HANDLE);
-NTSTATUS NTAPI LsaEnumerateAccountRights(LSA_HANDLE,PSID,PLSA_UNICODE_STRING*,PULONG);
-NTSTATUS NTAPI LsaEnumerateAccountsWithUserRight(LSA_HANDLE,PLSA_UNICODE_STRING,
-                            PVOID*,PULONG);
-NTSTATUS NTAPI LsaEnumerateTrustedDomains(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,
-                            PVOID*,ULONG,PULONG);
-NTSTATUS NTAPI LsaEnumerateTrustedDomainsEx(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,
-                            TRUSTED_INFORMATION_CLASS,PVOID*,ULONG,PULONG);
-NTSTATUS NTAPI LsaFreeMemory(PVOID);
-NTSTATUS NTAPI LsaFreeReturnBuffer(PVOID);
-NTSTATUS NTAPI LsaLogonUser(HANDLE,PLSA_STRING,SECURITY_LOGON_TYPE,ULONG,PVOID,
-                            ULONG,PTOKEN_GROUPS,PTOKEN_SOURCE,PVOID*,PULONG,
-                            PLUID,PHANDLE,PQUOTA_LIMITS,PNTSTATUS);
-NTSTATUS NTAPI LsaLookupAuthenticationPackage(HANDLE,PLSA_STRING,PULONG);
-NTSTATUS NTAPI LsaLookupNames(LSA_HANDLE,ULONG,PLSA_UNICODE_STRING,
-                            PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID*);
-NTSTATUS NTAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID*,
-                            PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_NAME*);
-ULONG NTAPI LsaNtStatusToWinError(NTSTATUS);
-NTSTATUS NTAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,
-                            ACCESS_MASK,PLSA_HANDLE);
-NTSTATUS NTAPI LsaQueryDomainInformationPolicy(LSA_HANDLE,
-                            POLICY_DOMAIN_INFORMATION_CLASS,PVOID*);
-NTSTATUS NTAPI LsaQueryInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*);
-NTSTATUS NTAPI LsaQueryLocalInformationPolicy(LSA_HANDLE,
-                            POLICY_LOCAL_INFORMATION_CLASS,PVOID*);
-NTSTATUS NTAPI LsaQueryTrustedDomainInfo(LSA_HANDLE,PSID,
-                            TRUSTED_INFORMATION_CLASS,PVOID*);
-NTSTATUS NTAPI LsaQueryTrustedDomainInfoByName(LSA_HANDLE,PLSA_UNICODE_STRING,
-                            TRUSTED_INFORMATION_CLASS,PVOID*);
-NTSTATUS NTAPI LsaRegisterLogonProcess(PLSA_STRING,PHANDLE,PLSA_OPERATIONAL_MODE);
-NTSTATUS NTAPI LsaRemoveAccountRights(LSA_HANDLE,PSID,BOOLEAN,
-                            PLSA_UNICODE_STRING,ULONG);
-NTSTATUS NTAPI LsaRetrievePrivateData(LSA_HANDLE,PLSA_UNICODE_STRING,
-                            PLSA_UNICODE_STRING*);
-NTSTATUS NTAPI LsaSetDomainInformationPolicy(LSA_HANDLE,
-                            POLICY_DOMAIN_INFORMATION_CLASS,PVOID);
-NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS, PVOID);
-NTSTATUS NTAPI LsaSetLocalInformationPolicy(LSA_HANDLE,
-                            POLICY_LOCAL_INFORMATION_CLASS,PVOID);
-NTSTATUS NTAPI LsaSetTrustedDomainInformation(LSA_HANDLE,PSID,
-                            TRUSTED_INFORMATION_CLASS,PVOID);
-NTSTATUS NTAPI LsaSetTrustedDomainInfoByName(LSA_HANDLE,PLSA_UNICODE_STRING,
-                            TRUSTED_INFORMATION_CLASS,PVOID);
-NTSTATUS NTAPI LsaStorePrivateData(LSA_HANDLE,PLSA_UNICODE_STRING,
-                            PLSA_UNICODE_STRING);
-typedef NTSTATUS (*PSAM_PASSWORD_NOTIFICATION_ROUTINE)(PUNICODE_STRING,
-                            ULONG,PUNICODE_STRING);
-typedef BOOLEAN (*PSAM_INIT_NOTIFICATION_ROUTINE)(void);
-typedef BOOLEAN (*PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING,
-                            PUNICODE_STRING,BOOLEAN);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _NTSECAPI_H */
diff --git a/winsup/w32api/include/ntsecpkg.h b/winsup/w32api/include/ntsecpkg.h
deleted file mode 100644
index 1b6076a86..000000000
--- a/winsup/w32api/include/ntsecpkg.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _NTSECPKG_H
-#define _NTSECPKG_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define ISC_REQ_DELEGATE 1
-#define ISC_REQ_MUTUAL_AUTH 2
-#define ISC_REQ_REPLAY_DETECT 4
-#define ISC_REQ_SEQUENCE_DETECT 8
-#define ISC_REQ_CONFIDENTIALITY  16
-#define ISC_REQ_USE_SESSION_KEY 32
-#define ISC_REQ_PROMPT_FOR_CREDS 64
-#define ISC_REQ_USE_SUPPLIED_CREDS  128
-#define ISC_REQ_ALLOCATE_MEMORY 256
-#define ISC_REQ_USE_DCE_STYLE 512
-#define ISC_REQ_DATAGRAM 1024
-#define ISC_REQ_CONNECTION 2048
-#define ISC_REQ_EXTENDED_ERROR 16384
-#define ISC_REQ_STREAM 32768
-#define ISC_REQ_INTEGRITY 65536
-#define ISC_REQ_MANUAL_CRED_VALIDATION 524288
-#define ISC_REQ_HTTP  268435456
-
-#define ISC_RET_EXTENDED_ERROR 16384
-
-#define ASC_REQ_DELEGATE 1
-#define ASC_REQ_MUTUAL_AUTH 2
-#define ASC_REQ_REPLAY_DETECT 4
-#define ASC_REQ_SEQUENCE_DETECT 8
-#define ASC_REQ_CONFIDENTIALITY 16
-#define ASC_REQ_USE_SESSION_KEY 32
-#define ASC_REQ_ALLOCATE_MEMORY 256
-#define ASC_REQ_USE_DCE_STYLE 512
-#define ASC_REQ_DATAGRAM 1024
-#define ASC_REQ_CONNECTION 2048
-#define ASC_REQ_EXTENDED_ERROR 32768
-#define ASC_REQ_STREAM 65536
-#define ASC_REQ_INTEGRITY 131072
-
-#define SECURITY_NATIVE_DREP  16
-#define SECURITY_NETWORK_DREP 0
-
-#endif /* _NTSECPKG_H */
diff --git a/winsup/w32api/include/oaidl.h b/winsup/w32api/include/oaidl.h
deleted file mode 100644
index 06125ed80..000000000
--- a/winsup/w32api/include/oaidl.h
+++ /dev/null
@@ -1,624 +0,0 @@
-#ifndef _OAIDL_H
-#define _OAIDL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef NONAMELESSUNION
-#define __VARIANT_NAME_1 n1
-#define __VARIANT_NAME_2 n2
-#define __VARIANT_NAME_3 n3
-#define __VARIANT_NAME_4 n4
-#else
-#define __tagVARIANT
-#define __VARIANT_NAME_1
-#define __VARIANT_NAME_2
-#define __VARIANT_NAME_3
-#define __VARIANT_NAME_4
-#endif
-#define DISPID_UNKNOWN (-1)
-#define DISPID_VALUE (0)
-#define DISPID_PROPERTYPUT (-3)
-#define DISPID_NEWENUM (-4)
-#define DISPID_EVALUATE (-5)
-#define DISPID_CONSTRUCTOR (-6)
-#define DISPID_DESTRUCTOR (-7)
-#define DISPID_COLLECT (-8)
-#define FADF_AUTO (1)
-#define FADF_STATIC (2)
-#define FADF_EMBEDDED (4)
-#define FADF_FIXEDSIZE (16)
-#define FADF_BSTR (256)
-#define FADF_UNKNOWN (512)
-#define FADF_DISPATCH (1024)
-#define FADF_VARIANT (2048)
-#define FADF_RESERVED (0xf0e8)
-#define PARAMFLAG_NONE (0)
-#define PARAMFLAG_FIN (1)
-#define PARAMFLAG_FOUT (2)
-#define PARAMFLAG_FLCID (4)
-#define PARAMFLAG_FRETVAL (8)
-#define PARAMFLAG_FOPT (16)
-#define PARAMFLAG_FHASDEFAULT (32)
-#define IDLFLAG_NONE PARAMFLAG_NONE
-#define IDLFLAG_FIN PARAMFLAG_FIN
-#define IDLFLAG_FOUT PARAMFLAG_FOUT
-#define IDLFLAG_FLCID PARAMFLAG_FLCID
-#define IDLFLAG_FRETVAL PARAMFLAG_FRETVAL
-#define IMPLTYPEFLAG_FDEFAULT 1
-#define IMPLTYPEFLAG_FSOURCE 2
-#define IMPLTYPEFLAG_FRESTRICTED 4
-#define IMPLTYPEFLAG_FDEFAULTVTABLE 8
-
-typedef interface ITypeLib *LPTYPELIB;
-typedef interface ICreateTypeInfo *LPCREATETYPEINFO;
-typedef interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
-typedef interface ICreateTypeLib *LPCREATETYPELIB;
-typedef interface ICreateTypeLib2 *LPCREATETYPELIB2;
-typedef interface ITypeComp *LPTYPECOMP;
-typedef interface ITypeInfo *LPTYPEINFO;
-typedef interface IErrorInfo *LPERRORINFO;
-typedef interface IDispatch *LPDISPATCH;
-typedef interface IEnumVARIANT *LPENUMVARIANT;
-typedef interface ICreateErrorInfo *LPCREATEERRORINFO;
-typedef interface ISupportErrorInfo *LPSUPPORTERRORINFO;
-typedef interface IRecordInfo *LPRECORDINFO;
-
-extern const IID IID_ITypeLib;
-extern const IID IID_ICreateTypeInfo;
-extern const IID IID_ICreateTypeInfo2;
-extern const IID IID_ICreateTypeLib;
-extern const IID IID_ICreateTypeLib2;
-extern const IID IID_ITypeInfo;
-extern const IID IID_IErrorInfo;
-extern const IID IID_IDispatch;
-extern const IID IID_IEnumVARIANT;
-extern const IID IID_ICreateErrorInfo;
-extern const IID IID_ISupportErrorInfo;
-extern const IID IID_IRecordInfo;
-extern const IID IID_ITypeMarshal;
-
-typedef enum tagSYSKIND {
-	SYS_WIN16,SYS_WIN32,SYS_MAC
-} SYSKIND;
-typedef enum tagLIBFLAGS {
-	LIBFLAG_FRESTRICTED=1,LIBFLAG_FCONTROL=2,LIBFLAG_FHIDDEN=4,
-	LIBFLAG_FHASDISKIMAGE=8
-} LIBFLAGS;
-typedef struct tagTLIBATTR {
-	GUID guid;
-	LCID lcid;
-	SYSKIND syskind;
-	WORD wMajorVerNum;
-	WORD wMinorVerNum;
-	WORD wLibFlags;
-} TLIBATTR,*LPTLIBATTR;
-typedef CY CURRENCY;
-typedef struct tagSAFEARRAYBOUND {
-	ULONG cElements;
-	LONG lLbound;
-}SAFEARRAYBOUND,*LPSAFEARRAYBOUND;
-typedef struct _wireSAFEARR_BSTR
-{
-	ULONG Size;
-	wireBSTR *aBstr;
-}SAFEARR_BSTR;
-typedef struct _wireSAFEARR_UNKNOWN {
-	ULONG Size;
-	IUnknown **apUnknown;
-}SAFEARR_UNKNOWN;
-typedef struct _wireSAFEARR_DISPATCH {
-	ULONG Size;
-	LPDISPATCH *apDispatch;
-}SAFEARR_DISPATCH;
-typedef struct _wireSAFEARR_VARIANT {
-	ULONG Size;
-	struct _wireVARIANT *aVariant;
-}SAFEARR_VARIANT;
-typedef enum tagSF_TYPE {
-	SF_ERROR=VT_ERROR,
-	SF_I1=VT_I1,
-	SF_I2=VT_I2,
-	SF_I4=VT_I4,
-	SF_I8=VT_I8,
-	SF_BSTR=VT_BSTR,
-	SF_UNKNOWN=VT_UNKNOWN,
-	SF_DISPATCH=VT_DISPATCH,
-	SF_VARIANT=VT_VARIANT
-}SF_TYPE;
-typedef struct _wireBRECORD  {
-	ULONG fFlags;
-	ULONG clSize;
-	LPRECORDINFO* pRecInfo;
-	byte* pRecord;
-} *wireBRECORD;
-typedef struct _wireSAFEARR_BRECORD {
-    ULONG Size;
-    wireBRECORD* aRecord;
-    } SAFEARR_BRECORD;
-typedef struct _wireSAFEARR_HAVEIID {
-	ULONG Size;
-	IUnknown** apUnknown;
-	IID iid;
-	} SAFEARR_HAVEIID;
-typedef struct _wireSAFEARRAY_UNION {
-	ULONG sfType;
-	union {
-		SAFEARR_BSTR BstrStr;
-		SAFEARR_UNKNOWN UnknownStr;
-		SAFEARR_DISPATCH DispatchStr;
-		SAFEARR_VARIANT VariantStr;
-		SAFEARR_BRECORD RecordStr;
-		SAFEARR_HAVEIID HaveIidStr;
-		BYTE_SIZEDARR ByteStr;
-		WORD_SIZEDARR WordStr;
-		DWORD_SIZEDARR LongStr;
-		HYPER_SIZEDARR HyperStr;
-	}u;
-}SAFEARRAYUNION;
-typedef struct _wireSAFEARRAY {
-	USHORT cDims;
-	USHORT fFeatures;
-	ULONG cbElements;
-	ULONG cLocks;
-	SAFEARRAYUNION uArrayStructs;
-	SAFEARRAYBOUND rgsabound[1];
-}*wireSAFEARRAY;
-typedef wireSAFEARRAY *wirePSAFEARRAY;
-typedef struct tagSAFEARRAY {
-	USHORT cDims;
-	USHORT fFeatures;
-	ULONG cbElements;
-	ULONG cLocks;
-	PVOID pvData;
-	SAFEARRAYBOUND rgsabound[1];
-}SAFEARRAY,*LPSAFEARRAY;
-#if defined (__GNUC__) && !defined (NONAMELESSUNION)
-__extension__   /* no named members  */
-#endif
-typedef struct tagVARIANT {
-  _ANONYMOUS_UNION union {
-	struct __tagVARIANT {
-	VARTYPE vt;
-	WORD wReserved1;
-	WORD wReserved2;
-	WORD wReserved3;
-	_ANONYMOUS_UNION union {
-		long lVal;
-		unsigned char bVal;
-		short iVal;
-		float fltVal;
-		double dblVal;
-		VARIANT_BOOL  boolVal;
-		SCODE scode;
-		CY cyVal;
-		DATE date;
-		BSTR bstrVal;
-		IUnknown *punkVal;
-		LPDISPATCH pdispVal;
-		SAFEARRAY *parray;
-		unsigned char *pbVal;
-		short *piVal;
-		long *plVal;
-		float *pfltVal;
-		double *pdblVal;
-		VARIANT_BOOL *pboolVal;
-		_VARIANT_BOOL  *pbool;
-		SCODE *pscode;
-		CY *pcyVal;
-		DATE *pdate;
-		BSTR *pbstrVal;
-		IUnknown **ppunkVal;
-		LPDISPATCH *ppdispVal;
-		SAFEARRAY **pparray;
-		struct tagVARIANT *pvarVal;
-		void *byref;
-		CHAR cVal;
-		USHORT uiVal;
-		ULONG ulVal;
-		INT intVal;
-		UINT uintVal;
-		DECIMAL *pdecVal;
-		CHAR  *pcVal;
-		USHORT  *puiVal;
-		ULONG  *pulVal;
-		INT  *pintVal;
-		UINT  *puintVal;
-		_ANONYMOUS_STRUCT struct {
-			PVOID pvRecord;
-			struct IRecordInfo *pRecInfo;
-		} __VARIANT_NAME_4;
-	} __VARIANT_NAME_3;
-    } __VARIANT_NAME_2;
-    DECIMAL decVal;
-  } __VARIANT_NAME_1;
-} VARIANT,*LPVARIANT;
-typedef VARIANT VARIANTARG;
-typedef VARIANT *LPVARIANTARG;
-typedef struct _wireVARIANT {
-	DWORD clSize;
-	DWORD rpcReserved;
-	USHORT vt;
-	USHORT wReserved1;
-	USHORT wReserved2;
-	USHORT wReserved3;
-	_ANONYMOUS_UNION union {
-		LONG lVal;
-		BYTE bVal;
-		SHORT iVal;
-		FLOAT fltVal;
-		DOUBLE dblVal;
-		VARIANT_BOOL boolVal;
-		SCODE scode;
-		CY cyVal;
-		DATE date;
-		wireBSTR bstrVal;
-		IUnknown *punkVal;
-		LPDISPATCH pdispVal;
-		wirePSAFEARRAY parray;
-		wireBRECORD brecVal;
-		BYTE *pbVal;
-		SHORT *piVal;
-		LONG *plVal;
-		FLOAT *pfltVal;
-		DOUBLE *pdblVal;
-		VARIANT_BOOL *pboolVal;
-		SCODE *pscode;
-		CY *pcyVal;
-		DATE *pdate;
-		wireBSTR *pbstrVal;
-		IUnknown **ppunkVal;
-		LPDISPATCH *ppdispVal;
-		wirePSAFEARRAY *pparray;
-		struct _wireVARIANT *pvarVal;
-		CHAR cVal;
-		USHORT uiVal;
-		ULONG ulVal;
-		INT intVal;
-		UINT uintVal;
-		DECIMAL decVal;
-		DECIMAL *pdecVal;
-		CHAR *pcVal;
-		USHORT *puiVal;
-		ULONG *pulVal;
-		INT *pintVal;
-		UINT *puintVal;
-	} DUMMYUNIONNAME;
-} *wireVARIANT;  
-typedef LONG DISPID;
-typedef DISPID MEMBERID;
-typedef DWORD HREFTYPE;
-typedef enum tagTYPEKIND {
-	TKIND_ENUM,TKIND_RECORD,TKIND_MODULE,TKIND_INTERFACE,TKIND_DISPATCH,
-	TKIND_COCLASS,TKIND_ALIAS,TKIND_UNION,TKIND_MAX
-}TYPEKIND;
-typedef struct tagTYPEDESC {
-	_ANONYMOUS_UNION union {
-		struct tagTYPEDESC *lptdesc;
-		struct tagARRAYDESC *lpadesc;
-		HREFTYPE hreftype;
-	} DUMMYUNIONNAME;
-	VARTYPE vt;
-}TYPEDESC;
-typedef struct tagARRAYDESC {
-	TYPEDESC tdescElem;
-	USHORT cDims;
-	SAFEARRAYBOUND rgbounds[1];
-}ARRAYDESC;
-typedef struct tagPARAMDESCEX {
-	ULONG cBytes;
-	VARIANTARG varDefaultValue;
-}PARAMDESCEX,*LPPARAMDESCEX;
-typedef struct tagPARAMDESC {
-	LPPARAMDESCEX pparamdescex;
-	USHORT wParamFlags;
-}PARAMDESC,*LPPARAMDESC;
-typedef struct tagIDLDESC {
-	ULONG dwReserved;
-	USHORT wIDLFlags;
-}IDLDESC,*LPIDLDESC;
-typedef struct tagELEMDESC {
-	TYPEDESC tdesc;
-	_ANONYMOUS_UNION union {
-		IDLDESC idldesc;
-		PARAMDESC paramdesc;
-	} DUMMYUNIONNAME;
-} ELEMDESC,*LPELEMDESC;
-typedef struct tagTYPEATTR {
-	GUID guid;
-	LCID lcid;
-	DWORD dwReserved;
-	MEMBERID memidConstructor;
-	MEMBERID memidDestructor;
-	LPOLESTR lpstrSchema;
-	ULONG cbSizeInstance;
-	TYPEKIND typekind;
-	WORD cFuncs;
-	WORD cVars;
-	WORD cImplTypes;
-	WORD cbSizeVft;
-	WORD cbAlignment;
-	WORD wTypeFlags;
-	WORD wMajorVerNum;
-	WORD wMinorVerNum;
-	TYPEDESC tdescAlias;
-	IDLDESC idldescType;
-}TYPEATTR,*LPTYPEATTR;
-typedef struct tagDISPPARAMS {
-	VARIANTARG *rgvarg;
-	DISPID *rgdispidNamedArgs;
-	UINT cArgs;
-	UINT cNamedArgs;
-}DISPPARAMS;
-typedef struct tagEXCEPINFO {
-	WORD wCode;
-	WORD wReserved;
-	BSTR bstrSource;
-	BSTR bstrDescription;
-	BSTR bstrHelpFile;
-	DWORD dwHelpContext;
-	PVOID pvReserved;
-	HRESULT(__stdcall * pfnDeferredFillIn)(struct tagEXCEPINFO*);
-	SCODE scode;
-} EXCEPINFO,*LPEXCEPINFO;
-typedef enum tagCALLCONV {
-	CC_FASTCALL,CC_CDECL,CC_MSCPASCAL,CC_PASCAL=CC_MSCPASCAL,
-	CC_MACPASCAL,CC_STDCALL,CC_FPFASTCALL,CC_SYSCALL,CC_MPWCDECL,
-	CC_MPWPASCAL,CC_MAX=CC_MPWPASCAL
-}CALLCONV;
-typedef enum tagFUNCKIND {
-	FUNC_VIRTUAL,FUNC_PUREVIRTUAL,FUNC_NONVIRTUAL,
-	FUNC_STATIC,FUNC_DISPATCH
-}FUNCKIND;
-typedef enum tagINVOKEKIND {
-	INVOKE_FUNC=1,INVOKE_PROPERTYGET,INVOKE_PROPERTYPUT=4,
-	INVOKE_PROPERTYPUTREF=8
-}INVOKEKIND;
-typedef struct tagFUNCDESC {
-	MEMBERID memid;
-	SCODE *lprgscode;
-	ELEMDESC *lprgelemdescParam;
-	FUNCKIND funckind;
-	INVOKEKIND invkind;
-	CALLCONV callconv;
-	SHORT cParams;
-	SHORT cParamsOpt;
-	SHORT oVft;
-	SHORT cScodes;
-	ELEMDESC elemdescFunc;
-	WORD wFuncFlags;
-}FUNCDESC,*LPFUNCDESC;
-typedef enum tagVARKIND {
-	VAR_PERINSTANCE,VAR_STATIC,VAR_CONST,VAR_DISPATCH
-} VARKIND;
-typedef struct tagVARDESC {
-	MEMBERID memid;
-	LPOLESTR lpstrSchema;
-	_ANONYMOUS_UNION union {
-		ULONG oInst;
-		VARIANT *lpvarValue;
-	} DUMMYUNIONNAME;
-	ELEMDESC elemdescVar;
-	WORD wVarFlags;
-	VARKIND varkind;
-} VARDESC,*LPVARDESC;
-typedef enum tagTYPEFLAGS {
-	TYPEFLAG_FAPPOBJECT=1,TYPEFLAG_FCANCREATE=2,TYPEFLAG_FLICENSED=4,
-	TYPEFLAG_FPREDECLID=8,TYPEFLAG_FHIDDEN=16,TYPEFLAG_FCONTROL=32,
-	TYPEFLAG_FDUAL=64,TYPEFLAG_FNONEXTENSIBLE=128,
-	TYPEFLAG_FOLEAUTOMATION=256,TYPEFLAG_FRESTRICTED=512,
-	TYPEFLAG_FAGGREGATABLE=1024,TYPEFLAG_FREPLACEABLE=2048,
-	TYPEFLAG_FDISPATCHABLE=4096,TYPEFLAG_FREVERSEBIND=8192
-} TYPEFLAGS;
-typedef enum tagFUNCFLAGS {
-	FUNCFLAG_FRESTRICTED=1,FUNCFLAG_FSOURCE=2,FUNCFLAG_FBINDABLE=4,
-	FUNCFLAG_FREQUESTEDIT=8,FUNCFLAG_FDISPLAYBIND=16,FUNCFLAG_FDEFAULTBIND=32,
-	FUNCFLAG_FHIDDEN=64,FUNCFLAG_FUSESGETLASTERROR=128,FUNCFLAG_FDEFAULTCOLLELEM=256,
-	FUNCFLAG_FUIDEFAULT=512,FUNCFLAG_FNONBROWSABLE=1024,FUNCFLAG_FREPLACEABLE=2048,
-	FUNCFLAG_FIMMEDIATEBIND=4096
-} FUNCFLAGS;
-typedef enum tagVARFLAGS {
-	VARFLAG_FREADONLY=1,VARFLAG_FSOURCE=2,VARFLAG_FBINDABLE=4,VARFLAG_FREQUESTEDIT=8,
-	VARFLAG_FDISPLAYBIND=16,VARFLAG_FDEFAULTBIND=32,VARFLAG_FHIDDEN=64,VARFLAG_FRESTRICTED=128,
-	VARFLAG_FDEFAULTCOLLELEM=256,VARFLAG_FUIDEFAULT=512,VARFLAG_FNONBROWSABLE=1024,
-	VARFLAG_FREPLACEABLE=2048,VARFLAG_FIMMEDIATEBIND=4096
-} VARFLAGS;
-typedef struct tagCLEANLOCALSTORAGE {
-	IUnknown *pInterface;
-	PVOID pStorage;
-	DWORD flags;
-} CLEANLOCALSTORAGE;
-typedef struct tagCUSTDATAITEM {
-	GUID guid;
-	VARIANTARG varValue;
-} CUSTDATAITEM,*LPCUSTDATAITEM;
-typedef struct tagCUSTDATA {
-	DWORD cCustData;
-	LPCUSTDATAITEM prgCustData;
-} CUSTDATA,*LPCUSTDATA;
-
-typedef enum tagDESCKIND {
-        DESCKIND_NONE=0,DESCKIND_FUNCDESC=DESCKIND_NONE+1,
-        DESCKIND_VARDESC=DESCKIND_FUNCDESC+1,DESCKIND_TYPECOMP=DESCKIND_VARDESC+1,
-        DESCKIND_IMPLICITAPPOBJ=DESCKIND_TYPECOMP+1,
-        DESCKIND_MAX=DESCKIND_IMPLICITAPPOBJ+1
-} DESCKIND;
-
-typedef union tagBINDPTR {
-        LPFUNCDESC lpfuncdesc;
-        LPVARDESC lpvardesc;
-        LPTYPECOMP lptcomp;
-} BINDPTR,*LPBINDPTR;
-
-#undef INTERFACE
-#define INTERFACE IDispatch
-DECLARE_INTERFACE_(IDispatch,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IEnumVARIANT
-DECLARE_INTERFACE_(IEnumVARIANT,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Next)(THIS_ ULONG,VARIANT*,ULONG*) PURE;
-	STDMETHOD(Skip)(THIS_ ULONG) PURE;
-	STDMETHOD(Reset)(THIS) PURE;
-	STDMETHOD(Clone)(THIS_ IEnumVARIANT**) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE ITypeComp
-DECLARE_INTERFACE_(ITypeComp,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Bind)(THIS_ LPOLESTR,ULONG,WORD,LPTYPEINFO*,DESCKIND*,LPBINDPTR) PURE;
-	STDMETHOD(BindType)(THIS_ LPOLESTR,ULONG,LPTYPEINFO*,LPTYPECOMP*) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE ITypeInfo
-DECLARE_INTERFACE_(ITypeInfo,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeAttr)(THIS_ LPTYPEATTR*) PURE;
-	STDMETHOD(GetTypeComp)(THIS_ LPTYPECOMP*) PURE;
-	STDMETHOD(GetFuncDesc)(THIS_ UINT,LPFUNCDESC*) PURE;
-	STDMETHOD(GetVarDesc)(THIS_ UINT,LPVARDESC*) PURE;
-	STDMETHOD(GetNames)(THIS_ MEMBERID,BSTR*,UINT,UINT*) PURE;
-	STDMETHOD(GetRefTypeOfImplType)(THIS_ UINT,HREFTYPE*) PURE;
-	STDMETHOD(GetImplTypeFlags)(THIS_ UINT,INT*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ LPOLESTR*,UINT,MEMBERID*) PURE;
-	STDMETHOD(Invoke)(THIS_ PVOID,MEMBERID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-	STDMETHOD(GetDocumentation)(THIS_ MEMBERID,BSTR*,BSTR*,DWORD*,BSTR*) PURE;
-	STDMETHOD(GetDllEntry)(THIS_ MEMBERID,INVOKEKIND,BSTR*,BSTR*,WORD*) PURE;
-	STDMETHOD(GetRefTypeInfo)(THIS_ HREFTYPE,LPTYPEINFO*) PURE;
-	STDMETHOD(AddressOfMember)(THIS_ MEMBERID,INVOKEKIND,PVOID*) PURE;
-	STDMETHOD(CreateInstance)(THIS_ LPUNKNOWN,REFIID,PVOID*) PURE;
-	STDMETHOD(GetMops)(THIS_ MEMBERID,BSTR*) PURE;
-	STDMETHOD(GetContainingTypeLib)(THIS_ LPTYPELIB*,UINT*) PURE;
-	STDMETHOD_(void,ReleaseTypeAttr)(THIS_ LPTYPEATTR) PURE;
-	STDMETHOD_(void,ReleaseFuncDesc)(THIS_ LPFUNCDESC) PURE;
-	STDMETHOD_(void,ReleaseVarDesc)(THIS_ LPVARDESC) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE ITypeLib
-DECLARE_INTERFACE_(ITypeLib,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(UINT,GetTypeInfoCount)(THIS) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,ITypeInfo**) PURE;
-	STDMETHOD(GetTypeInfoType)(THIS_ UINT,TYPEKIND*) PURE;
-	STDMETHOD(GetTypeInfoOfGuid)(THIS_ REFGUID,ITypeInfo**) PURE;
-	STDMETHOD(GetLibAttr)(THIS_ TLIBATTR**) PURE;
-	STDMETHOD(GetTypeComp)(THIS_ ITypeComp*) PURE;
-	STDMETHOD(GetDocumentation)(THIS_ INT,BSTR*,BSTR*,DWORD*,BSTR*) PURE;
-	STDMETHOD(IsName)(THIS_ LPOLESTR,ULONG,BOOL*) PURE;
-	STDMETHOD(FindName)(THIS_ LPOLESTR,ULONG,ITypeInfo**,MEMBERID*,USHORT*) PURE;
-	STDMETHOD_(void,ReleaseTLibAttr)(THIS_ TLIBATTR*) PURE;
-};
-
-EXTERN_C const IID IID_IErrorInfo;
-#undef INTERFACE
-#define INTERFACE IErrorInfo
-DECLARE_INTERFACE_(IErrorInfo, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetGUID)(THIS_ GUID*) PURE;
-	STDMETHOD(GetSource)(THIS_ BSTR*) PURE;
-	STDMETHOD(GetDescription)(THIS_ BSTR*) PURE;
-	STDMETHOD(GetHelpFile)(THIS_ BSTR*) PURE;
-	STDMETHOD(GetHelpContext)(THIS_ DWORD*) PURE;
-};
-
-EXTERN_C const IID IID_ICreateErrorInfo;
-#undef INTERFACE
-#define INTERFACE ICreateErrorInfo
-DECLARE_INTERFACE_(ICreateErrorInfo, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*)PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(SetGUID)(THIS_ REFGUID) PURE;
-	STDMETHOD(SetSource)(THIS_ LPOLESTR) PURE;
-	STDMETHOD(SetDescription)(THIS_ LPOLESTR) PURE;
-	STDMETHOD(SetHelpFile)(THIS_ LPOLESTR) PURE;
-	STDMETHOD(SetHelpContext)(THIS_ DWORD) PURE;
-};
-
-EXTERN_C const IID IID_ISupportErrorInfo;
-#undef INTERFACE
-#define INTERFACE ISupportErrorInfo
-DECLARE_INTERFACE_(ISupportErrorInfo, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(InterfaceSupportsErrorInfo)(THIS_ REFIID) PURE;
-};
-
-EXTERN_C const IID IID_IRecordInfo;
-#undef INTERFACE
-#define INTERFACE IRecordInfo
-DECLARE_INTERFACE_(IRecordInfo, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(RecordInit)(THIS_ PVOID) PURE;
-	STDMETHOD(RecordClear)(THIS_ PVOID) PURE;
-	STDMETHOD(RecordCopy)(THIS_ PVOID, PVOID) PURE;
-	STDMETHOD(GetGuid)(THIS_ GUID*) PURE;
-	STDMETHOD(GetName)(THIS_ BSTR*) PURE;
-	STDMETHOD(GetSize)(THIS_ ULONG*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ ITypeInfo**) PURE;
-	STDMETHOD(GetField)(THIS_ PVOID,LPCOLESTR,VARIANT*) PURE;
-	STDMETHOD(GetFieldNoCopy)(THIS_ PVOID,LPCOLESTR,VARIANT*,PVOID*) PURE;
-	STDMETHOD(PutField )(THIS_ ULONG,PVOID,LPCOLESTR, VARIANT*) PURE;
-	STDMETHOD(PutFieldNoCopy)(THIS_ ULONG,PVOID,LPCOLESTR,VARIANT*) PURE;
-	STDMETHOD(GetFieldNames)(THIS_ ULONG*,BSTR*) PURE;
-	STDMETHOD_(BOOL,IsMatchingType)(THIS_ THIS) PURE;
-	STDMETHOD_(PVOID,RecordCreate)(THIS) PURE;
-	STDMETHOD(RecordCreateCopy)(THIS_ PVOID,PVOID*) PURE;
-	STDMETHOD(RecordDestroy )(THIS_ PVOID) PURE;
-};
-
-EXTERN_C const IID IID_ITypeMarshal;
-#undef INTERFACE
-#define INTERFACE ITypeMarshal
-DECLARE_INTERFACE_(ITypeMarshal, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Size)(THIS_ PVOID,DWORD,PVOID,ULONG*) PURE;
-	STDMETHOD(Marshal)(THIS_ PVOID,DWORD,PVOID,ULONG,BYTE*,ULONG*) PURE;
-	STDMETHOD(Unmarshal)(THIS_ PVOID,DWORD,ULONG,BYTE*,ULONG*) PURE;
-	STDMETHOD(Free)(THIS_ PVOID) PURE;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/objbase.h b/winsup/w32api/include/objbase.h
deleted file mode 100644
index 3480b7b76..000000000
--- a/winsup/w32api/include/objbase.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Include here to prevent circular dependencies if windows.h
-   not already included */
-#include <rpc.h>
-#include <rpcndr.h>
-
-#ifndef _OBJBASE_H
-#define _OBJBASE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <stdlib.h>
-#pragma pack(push,8)
-#include <basetyps.h>
-
-#define WINOLEAPI STDAPI
-#define WINOLEAPI_(type) STDAPI_(type)
-#define FARSTRUCT
-#define HUGEP
-#define LISet32(li,v) ((li).HighPart=(v)<0?-1:0,(li).LowPart=(v))
-#define ULISet32(li,v) ((li).HighPart=0,(li).LowPart=(v))
-#define CLSCTX_ALL (CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER|CLSCTX_LOCAL_SERVER)
-#define CLSCTX_INPROC (CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER)
-#define CLSCTX_SERVER (CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER)
-#define MARSHALINTERFACE_MIN 500
-#define CWCSTORAGENAME 32
-#define STGM_DIRECT 0
-#define STGM_TRANSACTED 0x10000L
-#define STGM_SIMPLE 0x8000000L
-#define STGM_READ 0
-#define STGM_WRITE 1
-#define STGM_READWRITE 2
-#define STGM_SHARE_DENY_NONE 0x40
-#define STGM_SHARE_DENY_READ 0x30
-#define STGM_SHARE_DENY_WRITE 0x20
-#define STGM_SHARE_EXCLUSIVE 0x10
-#define STGM_PRIORITY 0x40000L
-#define STGM_DELETEONRELEASE 0x4000000
-#define STGM_NOSCRATCH 0x100000
-#define STGM_CREATE 0x1000
-#define STGM_CONVERT 0x20000
-#define STGM_FAILIFTHERE 0
-#define CWCSTORAGENAME 32
-#define ASYNC_MODE_COMPATIBILITY	1
-#define ASYNC_MODE_DEFAULT	0
-#define STGTY_REPEAT	256
-#define STG_TOEND	0xFFFFFFFF
-#define STG_LAYOUT_SEQUENTIAL	0
-#define STG_LAYOUT_INTERLEAVED	1
-#define COM_RIGHTS_EXECUTE 1
-#define COM_RIGHTS_SAFE_FOR_SCRIPTING 2
-typedef enum tagREGCLS {
-	REGCLS_SINGLEUSE = 0,
-	REGCLS_MULTIPLEUSE = 1,
-	REGCLS_MULTI_SEPARATE = 2
-} REGCLS;
-#include <wtypes.h>
-#include <unknwn.h>
-#include <objidl.h>
-
-#ifdef __cplusplus
-inline BOOL IsEqualGUID(REFGUID rguid1, REFGUID rguid2)
-	{ return !memcmp(&rguid1, &rguid2, sizeof(GUID)); }
-inline BOOL operator==(const GUID& guidOne, const GUID& guidOther)
-	{ return !memcmp(&guidOne,&guidOther,sizeof(GUID)); }
-inline BOOL operator!=(const GUID& g1, const GUID& g2)
-	{ return !(g1 == g2); }
-#else
-#define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID)))
-#endif
-#define IsEqualIID(id1,id2) IsEqualGUID(id1,id2)
-#define IsEqualCLSID(id1,id2) IsEqualGUID(id1,id2)
-#include <cguid.h>
-
-typedef enum tagCOINIT {
-	COINIT_APARTMENTTHREADED	= 0x2,
-	COINIT_MULTITHREADED		= 0x0,
-	COINIT_DISABLE_OLE1DDE		= 0x4,
-	COINIT_SPEED_OVER_MEMORY	= 0x8
-} COINIT;
-typedef enum tagSTDMSHLFLAGS {
-    SMEXF_SERVER  = 0x01,
-    SMEXF_HANDLER = 0x02
-} STDMSHLFLAGS;
-
-WINOLEAPI_(DWORD) CoBuildVersion(void);
-WINOLEAPI CoInitialize(PVOID);
-WINOLEAPI CoInitializeEx(LPVOID,DWORD);
-WINOLEAPI_(void) CoUninitialize(void);
-WINOLEAPI CoGetMalloc(DWORD,LPMALLOC*);
-WINOLEAPI_(DWORD) CoGetCurrentProcess(void);
-WINOLEAPI CoRegisterMallocSpy(LPMALLOCSPY);
-WINOLEAPI CoRevokeMallocSpy(void);
-WINOLEAPI CoCreateStandardMalloc(DWORD,IMalloc**);
-#if DBG == 1
-WINOLEAPI_(ULONG) DebugCoGetRpcFault(void);
-WINOLEAPI_(void) DebugCoSetRpcFault(ULONG);
-#endif
-WINOLEAPI CoGetClassObject(REFCLSID,DWORD,COSERVERINFO*,REFIID,PVOID*);
-WINOLEAPI CoRegisterClassObject(REFCLSID,LPUNKNOWN,DWORD,DWORD,PDWORD);
-WINOLEAPI CoRevokeClassObject(DWORD);
-WINOLEAPI CoGetMarshalSizeMax(ULONG*,REFIID,LPUNKNOWN,DWORD,PVOID,DWORD);
-WINOLEAPI CoMarshalInterface(LPSTREAM,REFIID,LPUNKNOWN,DWORD,PVOID,DWORD);
-WINOLEAPI CoUnmarshalInterface(LPSTREAM,REFIID,PVOID*);
-WINOLEAPI CoMarshalHresult(LPSTREAM,HRESULT);
-WINOLEAPI CoUnmarshalHresult(LPSTREAM,HRESULT*);
-WINOLEAPI CoReleaseMarshalData(LPSTREAM);
-WINOLEAPI CoDisconnectObject(LPUNKNOWN,DWORD);
-WINOLEAPI CoLockObjectExternal(LPUNKNOWN,BOOL,BOOL);
-WINOLEAPI CoGetStandardMarshal(REFIID,LPUNKNOWN,DWORD,PVOID,DWORD,LPMARSHAL*);
-WINOLEAPI CoGetStdMarshalEx(LPUNKNOWN,DWORD,LPUNKNOWN*);
-WINOLEAPI_(BOOL) CoIsHandlerConnected(LPUNKNOWN);
-WINOLEAPI_(BOOL) CoHasStrongExternalConnections(LPUNKNOWN);
-WINOLEAPI CoMarshalInterThreadInterfaceInStream(REFIID,LPUNKNOWN,LPSTREAM*);
-WINOLEAPI CoGetInterfaceAndReleaseStream(LPSTREAM,REFIID,PVOID*);
-WINOLEAPI CoCreateFreeThreadedMarshaler(LPUNKNOWN,LPUNKNOWN*);
-WINOLEAPI_(HINSTANCE) CoLoadLibrary(LPOLESTR,BOOL);
-WINOLEAPI_(void) CoFreeLibrary(HINSTANCE);
-WINOLEAPI_(void) CoFreeAllLibraries(void);
-WINOLEAPI_(void) CoFreeUnusedLibraries(void);
-WINOLEAPI CoCreateInstance(REFCLSID,LPUNKNOWN,DWORD,REFIID,PVOID*);
-WINOLEAPI CoCreateInstanceEx(REFCLSID,IUnknown*,DWORD,COSERVERINFO*,DWORD,MULTI_QI*);
-WINOLEAPI StringFromCLSID(REFCLSID,LPOLESTR*);
-WINOLEAPI CLSIDFromString(LPOLESTR,LPCLSID);
-WINOLEAPI StringFromIID(REFIID,LPOLESTR*);
-WINOLEAPI IIDFromString(LPOLESTR,LPIID);
-WINOLEAPI_(BOOL) CoIsOle1Class(REFCLSID);
-WINOLEAPI ProgIDFromCLSID(REFCLSID,LPOLESTR*);
-WINOLEAPI CLSIDFromProgID(LPCOLESTR,LPCLSID);
-WINOLEAPI_(int) StringFromGUID2(REFGUID,LPOLESTR,int);
-WINOLEAPI CoCreateGuid(GUID*);
-WINOLEAPI_(BOOL) CoFileTimeToDosDateTime(FILETIME*,LPWORD,LPWORD);
-WINOLEAPI_(BOOL) CoDosDateTimeToFileTime(WORD,WORD,FILETIME*);
-WINOLEAPI CoFileTimeNow(FILETIME*);
-WINOLEAPI CoRegisterMessageFilter(LPMESSAGEFILTER,LPMESSAGEFILTER*);
-WINOLEAPI CoGetTreatAsClass(REFCLSID,LPCLSID);
-WINOLEAPI CoTreatAsClass(REFCLSID,REFCLSID);
-typedef HRESULT (STDAPICALLTYPE *LPFNGETCLASSOBJECT)(REFCLSID,REFIID,PVOID*);
-typedef HRESULT (STDAPICALLTYPE *LPFNCANUNLOADNOW)(void);
-STDAPI DllGetClassObject(REFCLSID,REFIID,PVOID*);
-STDAPI DllCanUnloadNow(void);
-WINOLEAPI_(PVOID) CoTaskMemAlloc(ULONG);
-WINOLEAPI_(PVOID) CoTaskMemRealloc(PVOID,ULONG);
-WINOLEAPI_(void) CoTaskMemFree(PVOID);
-WINOLEAPI CreateDataAdviseHolder(LPDATAADVISEHOLDER*);
-WINOLEAPI CreateDataCache(LPUNKNOWN,REFCLSID,REFIID,PVOID*);
-WINOLEAPI StgCreateDocfile(const OLECHAR*,DWORD,DWORD,IStorage**);
-WINOLEAPI StgCreateDocfileOnILockBytes(ILockBytes*,DWORD,DWORD,IStorage**);
-WINOLEAPI StgOpenStorage(const OLECHAR*,IStorage*,DWORD,SNB,DWORD,IStorage**);
-WINOLEAPI StgOpenStorageOnILockBytes(ILockBytes*,IStorage*,DWORD,SNB,DWORD,IStorage**);
-WINOLEAPI StgIsStorageFile(const OLECHAR*);
-WINOLEAPI StgIsStorageILockBytes(ILockBytes*);
-WINOLEAPI StgSetTimes(OLECHAR const*,FILETIME const*,FILETIME const*,FILETIME const*);
-WINOLEAPI BindMoniker(LPMONIKER,DWORD,REFIID,PVOID*);
-WINOLEAPI CoGetObject(LPCWSTR,BIND_OPTS*,REFIID,void**);
-WINOLEAPI MkParseDisplayName(LPBC,LPCOLESTR,ULONG*,LPMONIKER*);
-WINOLEAPI MonikerRelativePathTo(LPMONIKER,LPMONIKER,LPMONIKER*,BOOL);
-WINOLEAPI MonikerCommonPrefixWith(LPMONIKER,LPMONIKER,LPMONIKER*);
-WINOLEAPI CreateBindCtx(DWORD,LPBC*);
-WINOLEAPI CreateGenericComposite(LPMONIKER,LPMONIKER,LPMONIKER*);
-WINOLEAPI GetClassFile (LPCOLESTR,CLSID*);
-WINOLEAPI CreateFileMoniker(LPCOLESTR,LPMONIKER*);
-WINOLEAPI CreateItemMoniker(LPCOLESTR,LPCOLESTR,LPMONIKER*);
-WINOLEAPI CreateAntiMoniker(LPMONIKER*);
-WINOLEAPI CreatePointerMoniker(LPUNKNOWN,LPMONIKER*);
-WINOLEAPI GetRunningObjectTable(DWORD,LPRUNNINGOBJECTTABLE*);
-WINOLEAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR,LONG,SOLE_AUTHENTICATION_SERVICE*, void*,DWORD,DWORD,void*,DWORD,void*);
-WINOLEAPI CoGetCallContext(REFIID,void**);
-WINOLEAPI CoQueryProxyBlanket(IUnknown*, DWORD*,DWORD*,OLECHAR**,DWORD*,DWORD*,RPC_AUTH_IDENTITY_HANDLE*,DWORD*);
-WINOLEAPI CoSetProxyBlanket(IUnknown*,DWORD,DWORD,OLECHAR*,DWORD,DWORD,RPC_AUTH_IDENTITY_HANDLE, DWORD);
-WINOLEAPI CoCopyProxy(IUnknown*,IUnknown**);
-WINOLEAPI CoQueryClientBlanket(DWORD*,DWORD*,OLECHAR**, DWORD*,DWORD*,RPC_AUTHZ_HANDLE*,DWORD*);
-WINOLEAPI CoImpersonateClient(void);
-WINOLEAPI CoRevertToSelf(void);
-WINOLEAPI CoQueryAuthenticationServices(DWORD*, SOLE_AUTHENTICATION_SERVICE**);
-WINOLEAPI CoSwitchCallContext(IUnknown*,IUnknown**);
-WINOLEAPI CoGetInstanceFromFile(COSERVERINFO*, CLSID*,IUnknown*,DWORD,DWORD,OLECHAR*,DWORD,MULTI_QI*);
-WINOLEAPI CoGetInstanceFromIStorage(COSERVERINFO*,CLSID*, IUnknown*,DWORD,struct IStorage*, DWORD,MULTI_QI*);
-WINOLEAPI_(ULONG) CoAddRefServerProcess(void);
-WINOLEAPI_(ULONG) CoReleaseServerProcess(void);
-WINOLEAPI CoResumeClassObjects(void);
-WINOLEAPI CoSuspendClassObjects(void);
-
-#pragma pack(pop)
-#endif
diff --git a/winsup/w32api/include/objfwd.h b/winsup/w32api/include/objfwd.h
deleted file mode 100644
index 8fede73aa..000000000
--- a/winsup/w32api/include/objfwd.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef _OBJFWD_H
-#define _OBJFWD_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <basetyps.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef interface IMoniker *LPMONIKER;
-typedef interface IStream *LPSTREAM;
-typedef interface IMarshal *LPMARSHAL;
-typedef interface IMalloc *LPMALLOC;
-typedef interface IMallocSpy *LPMALLOCSPY;
-typedef interface IMessageFilter *LPMESSAGEFILTER;
-typedef interface IPersist *LPPERSIST;
-typedef interface IPersistStream *LPPERSISTSTREAM;
-typedef interface IRunningObjectTable *LPRUNNINGOBJECTTABLE;
-typedef interface IBindCtx *LPBINDCTX,*LPBC;
-typedef interface IAdviseSink *LPADVISESINK;
-typedef interface IAdviseSink2 *LPADVISESINK2;
-typedef interface IDataObject *LPDATAOBJECT;
-typedef interface IDataAdviseHolder *LPDATAADVISEHOLDER;
-typedef interface IEnumMoniker *LPENUMMONIKER;
-typedef interface IEnumFORMATETC *LPENUMFORMATETC;
-typedef interface IEnumSTATDATA *LPENUMSTATDATA;
-typedef interface IEnumSTATSTG *LPENUMSTATSTG;
-typedef interface IEnumSTATPROPSTG LPENUMSTATPROPSTG;
-typedef interface IEnumString *LPENUMSTRING;
-typedef interface IEnumUnknown *LPENUMUNKNOWN;
-typedef interface IStorage *LPSTORAGE;
-typedef interface IPersistStorage *LPPERSISTSTORAGE;
-typedef interface ILockBytes *LPLOCKBYTES;
-typedef interface IStdMarshalInfo *LPSTDMARSHALINFO;
-typedef interface IExternalConnection *LPEXTERNALCONNECTION;
-typedef interface IRunnableObject *LPRUNNABLEOBJECT;
-typedef interface IROTData *LPROTDATA;
-typedef interface IPersistFile *LPPERSISTFILE;
-typedef interface IRootStorage *LPROOTSTORAGE;
-typedef interface IRpcChannelBuffer *LPRPCCHANNELBUFFER;
-typedef interface IRpcProxyBuffer *LPRPCPROXYBUFFER;
-typedef interface IRpcStubBuffer *LPRPCSTUBBUFFER;
-typedef interface IPropertyStorage *LPPROPERTYSTORAGE;
-typedef interface IEnumSTATPROPSETSTG *LPENUMSTATPROPSETSTG;
-typedef interface IPropertySetStorage *LPPROPERTYSETSTORAGE;
-typedef interface IClientSecurity *LPCLIENTSECURITY;
-typedef interface IServerSecurity *LPSERVERSECURITY;
-typedef interface IClassActivator *LPCLASSACTIVATOR;
-typedef interface IFillLockBytes *LPFILLLOCKBYTES;
-typedef interface IProgressNotify *LPPROGRESSNOTIFY;
-typedef interface ILayoutStorage *LPLAYOUTSTORAGE;
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/objidl.h b/winsup/w32api/include/objidl.h
deleted file mode 100644
index f33f8a319..000000000
--- a/winsup/w32api/include/objidl.h
+++ /dev/null
@@ -1,1707 +0,0 @@
-#ifndef _OBJIDL_H
-#define _OBJIDL_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#include <objfwd.h>
-
-typedef struct  tagSTATSTG {
-	LPOLESTR pwcsName;
-	DWORD type;
-	ULARGE_INTEGER cbSize;
-	FILETIME mtime;
-	FILETIME ctime;
-	FILETIME atime;
-	DWORD grfMode;
-	DWORD grfLocksSupported;
-	CLSID clsid;
-	DWORD grfStateBits;
-	DWORD reserved;
-} STATSTG;
-typedef enum tagSTGTY {
-	STGTY_STORAGE=1,
-	STGTY_STREAM,
-	STGTY_LOCKBYTES,
-	STGTY_PROPERTY
-} STGTY;
-typedef enum tagSTREAM_SEEK {
-	STREAM_SEEK_SET,
-	STREAM_SEEK_CUR,
-	STREAM_SEEK_END
-} STREAM_SEEK;
-typedef struct tagINTERFACEINFO {
-	LPUNKNOWN pUnk;
-	IID iid;
-	WORD wMethod;
-} INTERFACEINFO,*LPINTERFACEINFO;
-typedef enum tagCALLTYPE {
-	CALLTYPE_TOPLEVEL=1,
-	CALLTYPE_NESTED,
-	CALLTYPE_ASYNC,
-	CALLTYPE_TOPLEVEL_CALLPENDING,
-	CALLTYPE_ASYNC_CALLPENDING
-} CALLTYPE;
-typedef enum tagPENDINGTYPE {
-	PENDINGTYPE_TOPLEVEL=1,
-	PENDINGTYPE_NESTED
-} PENDINGTYPE;
-typedef enum tagPENDINGMSG {
-	PENDINGMSG_CANCELCALL=0,
-	PENDINGMSG_WAITNOPROCESS,
-	PENDINGMSG_WAITDEFPROCESS
-} PENDINGMSG;
-typedef OLECHAR **SNB;
-typedef enum tagDATADIR	{
-	DATADIR_GET=1,
-	DATADIR_SET
-} DATADIR;
-typedef WORD CLIPFORMAT,*LPCLIPFORMAT;
-typedef struct tagDVTARGETDEVICE {
-	DWORD tdSize;
-	WORD tdDriverNameOffset;
-	WORD tdDeviceNameOffset;
-	WORD tdPortNameOffset;
-	WORD tdExtDevmodeOffset;
-	BYTE tdData[1];
-} DVTARGETDEVICE;
-typedef struct tagFORMATETC {
-	CLIPFORMAT cfFormat;
-	DVTARGETDEVICE*ptd;
-	DWORD dwAspect;
-	LONG lindex;
-	DWORD tymed;
-} FORMATETC,*LPFORMATETC;
-typedef struct tagRemSTGMEDIUM {
-	DWORD tymed;
-	DWORD dwHandleType;
-	ULONG pData;
-	unsigned long pUnkForRelease;
-	unsigned long cbData;
-	BYTE data[1];
-} RemSTGMEDIUM;
-typedef struct tagHLITEM {
-	ULONG uHLID;
-	LPWSTR pwzFriendlyName;
-} HLITEM;
-typedef struct tagSTATDATA {
-	FORMATETC formatetc;
-	DWORD grfAdvf;
-	struct IAdviseSink *pAdvSink;
-	DWORD dwConnection;
-} STATDATA;
-typedef struct tagSTATPROPSETSTG {
-	FMTID fmtid;
-	CLSID clsid;
-	DWORD grfFlags;
-	FILETIME mtime;
-	FILETIME ctime;
-	FILETIME atime;
-} STATPROPSETSTG;
-typedef enum tagEXTCONN {
-	EXTCONN_STRONG=1,
-	EXTCONN_WEAK=2,
-	EXTCONN_CALLABLE=4
-} EXTCONN;
-typedef struct tagMULTI_QI {
-	const IID *pIID;
-	IUnknown *pItf;
-	HRESULT	hr;
-} MULTI_QI;
-typedef struct _AUTH_IDENTITY {
-	USHORT *User;
-	ULONG UserLength;
-	USHORT *Domain;
-	ULONG DomainLength;
-	USHORT *Password;
-	ULONG PasswordLength;
-	ULONG Flags;
-} AUTH_IDENTITY;
-typedef struct _COAUTHINFO{
-	DWORD dwAuthnSvc;
-	DWORD dwAuthzSvc;
-	LPWSTR pwszServerPrincName;
-	DWORD dwAuthnLevel;
-	DWORD dwImpersonationLevel;
-	AUTH_IDENTITY *pAuthIdentityData;
-	DWORD dwCapabilities;
-} COAUTHINFO;
-typedef struct  _COSERVERINFO {
-	DWORD dwReserved1;
-	LPWSTR pwszName;
-	COAUTHINFO *pAuthInfo;
-	DWORD dwReserved2;
-} COSERVERINFO;
-typedef struct tagBIND_OPTS {
-	DWORD cbStruct;
-	DWORD grfFlags;
-	DWORD grfMode;
-	DWORD dwTickCountDeadline;
-} BIND_OPTS,*LPBIND_OPTS;
-typedef struct tagBIND_OPTS2 {
-	DWORD cbStruct;
-	DWORD grfFlags;
-	DWORD grfMode;
-	DWORD dwTickCountDeadline;
-	DWORD dwTrackFlags;
-	DWORD dwClassContext;
-	LCID locale;
-	COSERVERINFO *pServerInfo;
-} BIND_OPTS2,*LPBIND_OPTS2;
-typedef enum tagBIND_FLAGS {
-	BIND_MAYBOTHERUSER=1,
-	BIND_JUSTTESTEXISTENCE
-} BIND_FLAGS;
-typedef struct tagSTGMEDIUM {
-	DWORD tymed;
-	_ANONYMOUS_UNION union {
-		HBITMAP hBitmap;
-		PVOID hMetaFilePict;
-		HENHMETAFILE hEnhMetaFile;
-		HGLOBAL hGlobal;
-		LPWSTR lpszFileName;
-		LPSTREAM pstm;
-		LPSTORAGE pstg;
-	} DUMMYUNIONNAME;
-	LPUNKNOWN pUnkForRelease;
-} STGMEDIUM,*LPSTGMEDIUM;
-typedef enum tagLOCKTYPE {
-	LOCK_WRITE=1,
-	LOCK_EXCLUSIVE=2,
-	LOCK_ONLYONCE=4
-} LOCKTYPE;
-typedef unsigned long RPCOLEDATAREP;
-typedef struct  tagRPCOLEMESSAGE {
-	PVOID reserved1;
-	RPCOLEDATAREP dataRepresentation;
-	PVOID Buffer;
-	ULONG cbBuffer;
-	ULONG iMethod;
-	PVOID reserved2[5];
-	ULONG rpcFlags;
-} RPCOLEMESSAGE;
-typedef enum tagMKSYS {
-	MKSYS_NONE,
-	MKSYS_GENERICCOMPOSITE,
-	MKSYS_FILEMONIKER,
-	MKSYS_ANTIMONIKER,
-	MKSYS_ITEMMONIKER,
-	MKSYS_POINTERMONIKER
-} MKSYS;
-typedef enum tagMKREDUCE {
-	MKRREDUCE_ALL,
-	MKRREDUCE_ONE=196608,
-	MKRREDUCE_TOUSER=131072,
-	MKRREDUCE_THROUGHUSER=65536
-} MKRREDUCE;
-typedef struct tagRemSNB {
-	unsigned long ulCntStr;
-	unsigned long ulCntChar;
-	OLECHAR rgString[1];
-} RemSNB;
-typedef enum tagADVF {
-	ADVF_NODATA=1,ADVF_PRIMEFIRST=2,ADVF_ONLYONCE=4,ADVF_DATAONSTOP=64,
-	ADVFCACHE_NOHANDLER=8,ADVFCACHE_FORCEBUILTIN=16,ADVFCACHE_ONSAVE=32
-} ADVF;
-typedef enum tagTYMED {
-	TYMED_HGLOBAL=1,TYMED_FILE=2,TYMED_ISTREAM=4,TYMED_ISTORAGE=8,
-	TYMED_GDI=16,TYMED_MFPICT=32,TYMED_ENHMF=64,TYMED_NULL=0
-} TYMED;
-typedef enum tagSERVERCALL {
-	SERVERCALL_ISHANDLED,SERVERCALL_REJECTED,SERVERCALL_RETRYLATER
-} SERVERCALL;
-typedef struct tagCAUB {
-	ULONG cElems;
-	unsigned char *pElems;
-}CAUB;
-typedef struct tagCAI {
-	ULONG cElems;
-	short *pElems;
-}CAI;
-typedef struct tagCAUI {
-	ULONG cElems;
-	USHORT *pElems;
-}CAUI;
-typedef struct tagCAL {
-	ULONG cElems;
-	long *pElems;
-}CAL;
-typedef struct tagCAUL {
-	ULONG cElems;
-	ULONG *pElems;
-}CAUL;
-typedef struct tagCAFLT {
-	ULONG cElems;
-	float *pElems;
-}CAFLT;
-typedef struct tagCADBL {
-	ULONG cElems;
-	double *pElems;
-}CADBL;
-typedef struct tagCACY {
-	ULONG cElems;
-	CY *pElems;
-}CACY;
-typedef struct tagCADATE {
-	ULONG cElems;
-	DATE *pElems;
-}CADATE;
-typedef struct tagCABSTR {
-	ULONG cElems;
-	BSTR  *pElems;
-}CABSTR;
-typedef struct tagCABSTRBLOB {
-	ULONG cElems;
-	BSTRBLOB *pElems;
-}CABSTRBLOB;
-typedef struct tagCABOOL {
-	ULONG cElems;
-	VARIANT_BOOL *pElems;
-}CABOOL;
-typedef struct tagCASCODE {
-	ULONG cElems;
-	SCODE *pElems;
-}CASCODE;
-typedef struct tagCAH {
-	ULONG cElems;
-	LARGE_INTEGER *pElems;
-}CAH;
-typedef struct tagCAUH {
-	ULONG cElems;
-	ULARGE_INTEGER *pElems;
-}CAUH;
-typedef struct tagCALPSTR {
-	ULONG cElems;
-	LPSTR *pElems;
-}CALPSTR;
-typedef struct tagCALPWSTR {
-	ULONG cElems;
-	LPWSTR *pElems;
-}CALPWSTR;
-typedef struct tagCAFILETIME {
-	ULONG cElems;
-	FILETIME *pElems;
-}CAFILETIME;
-typedef struct tagCACLIPDATA {
-	ULONG cElems;
-	CLIPDATA *pElems;
-}CACLIPDATA;
-typedef struct tagCACLSID {
-	ULONG cElems;
-	CLSID *pElems;
-}CACLSID;
-typedef struct tagPROPVARIANT *LPPROPVARIANT;
-typedef struct tagCAPROPVARIANT {
-	ULONG cElems;
-	LPPROPVARIANT pElems;
-}CAPROPVARIANT;
-typedef struct tagPROPVARIANT {
-	VARTYPE vt;
-	WORD wReserved1;
-	WORD wReserved2;
-	WORD wReserved3;
-	_ANONYMOUS_UNION union {
-		CHAR cVal;
-		UCHAR bVal;
-		short iVal;
-		USHORT uiVal;
-		VARIANT_BOOL boolVal;
-#if 0
-/* bool is a standard type in C++, and a standard macro expanding
-   to the _Bool type in C99 (see stdbool.h) */   
-		_VARIANT_BOOL bool;
-#endif
-		long lVal;
-		ULONG ulVal;
-		float fltVal;
-		SCODE scode;
-		LARGE_INTEGER hVal;
-		ULARGE_INTEGER uhVal;
-		double dblVal;
-		CY cyVal;
-		DATE date;
-		FILETIME filetime;
-		CLSID *puuid;
-		BLOB blob;
-		CLIPDATA *pclipdata;
-		LPSTREAM pStream;
-		LPSTORAGE pStorage;
-		BSTR bstrVal;
-		BSTRBLOB bstrblobVal;
-		LPSTR pszVal;
-		LPWSTR pwszVal;
-		CAUB caub;
-		CAI cai;
-		CAUI caui;
-		CABOOL cabool;
-		CAL cal;
-		CAUL caul;
-		CAFLT caflt;
-		CASCODE cascode;
-		CAH cah;
-		CAUH cauh;
-		CADBL cadbl;
-		CACY cacy;
-		CADATE cadate;
-		CAFILETIME cafiletime;
-		CACLSID cauuid;
-		CACLIPDATA caclipdata;
-		CABSTR cabstr;
-		CABSTRBLOB cabstrblob;
-		CALPSTR calpstr;
-		CALPWSTR calpwstr;
-		CAPROPVARIANT capropvar;
-	} DUMMYUNIONNAME;
-} PROPVARIANT;
-typedef struct tagPROPSPEC {
-	ULONG ulKind;
-	_ANONYMOUS_UNION union {
-		PROPID propid;
-		LPOLESTR lpwstr;
-	} DUMMYUNIONNAME;
-}PROPSPEC;
-typedef struct  tagSTATPROPSTG {
-	LPOLESTR lpwstrName;
-	PROPID propid;
-	VARTYPE vt;
-} STATPROPSTG;
-typedef enum PROPSETFLAG {
-	PROPSETFLAG_DEFAULT,PROPSETFLAG_NONSIMPLE,PROPSETFLAG_ANSI,
-	PROPSETFLAG_UNBUFFERED=4
-} PROPSETFLAG;
-typedef struct tagSTORAGELAYOUT {
-	DWORD LayoutType;
-	OLECHAR* pwcsElementName;
-	LARGE_INTEGER cOffset;
-	LARGE_INTEGER cBytes;
-} STORAGELAYOUT;
-typedef struct tagSOLE_AUTHENTICATION_SERVICE {
-    DWORD dwAuthnSvc;
-    DWORD dwAuthzSvc;
-    OLECHAR *pPrincipalName;
-    HRESULT hr;
-} SOLE_AUTHENTICATION_SERVICE;
-#define COLE_DEFAULT_PRINCIPAL ( ( OLECHAR* )-1 )
-typedef enum tagEOLE_AUTHENTICATION_CAPABILITIES {
-	EOAC_NONE = 0,
-	EOAC_MUTUAL_AUTH = 0x1,
-	EOAC_STATIC_CLOAKING = 0x20,
-	EOAC_DYNAMIC_CLOAKING = 0x40,
-	EOAC_ANY_AUTHORITY = 0x80,
-	EOAC_MAKE_FULLSIC = 0x100,
-	EOAC_DEFAULT = 0x800,
-	EOAC_SECURE_REFS = 0x2,
-	EOAC_ACCESS_CONTROL = 0x4,
-	EOAC_APPID = 0x8,
-	EOAC_DYNAMIC = 0x10,
-	EOAC_REQUIRE_FULLSIC = 0x200,
-	EOAC_AUTO_IMPERSONATE = 0x400,
-	EOAC_NO_CUSTOM_MARSHAL = 0x2000,
-	EOAC_DISABLE_AAA = 0x1000
-} EOLE_AUTHENTICATION_CAPABILITIES;
-typedef struct tagSOLE_AUTHENTICATION_INFO {
-    DWORD dwAuthnSvc;
-    DWORD dwAuthzSvc;
-    void* pAuthInfo;
-} SOLE_AUTHENTICATION_INFO;
-#define COLE_DEFAULT_AUTHINFO ( ( void* )-1 )
-typedef struct tagSOLE_AUTHENTICATION_LIST {
-    DWORD cAuthInfo;
-    SOLE_AUTHENTICATION_INFO* aAuthInfo;
-} SOLE_AUTHENTICATION_LIST;
-
-EXTERN_C const FMTID FMTID_SummaryInformation;
-EXTERN_C const FMTID FMTID_DocSummaryInformation;
-EXTERN_C const FMTID FMTID_UserDefinedProperties;
-
-DECLARE_ENUMERATOR(FORMATETC);
-DECLARE_ENUMERATOR(HLITEM);
-DECLARE_ENUMERATOR(STATDATA);
-DECLARE_ENUMERATOR(STATPROPSETSTG);
-DECLARE_ENUMERATOR(STATPROPSTG);
-DECLARE_ENUMERATOR(STATSTG);
-DECLARE_ENUMERATOR_(IEnumString,LPOLESTR);
-DECLARE_ENUMERATOR_(IEnumMoniker,interface IMoniker*);
-DECLARE_ENUMERATOR_(IEnumUnknown,IUnknown*);
-
-EXTERN_C const IID IID_ISequentialStream;
-#undef INTERFACE
-#define INTERFACE ISequentialStream
-DECLARE_INTERFACE_(ISequentialStream,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Read)(THIS_ void*,ULONG,ULONG*) PURE;
-	STDMETHOD(Write)(THIS_ void const*,ULONG,ULONG*) PURE;
-};
-
-EXTERN_C const IID IID_IStream;
-#undef INTERFACE
-#define INTERFACE IStream
-DECLARE_INTERFACE_(IStream,ISequentialStream)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Read)(THIS_ void*,ULONG,ULONG*) PURE;
-	STDMETHOD(Write)(THIS_ void const*,ULONG,ULONG*) PURE;
-	STDMETHOD(Seek)(THIS_ LARGE_INTEGER,DWORD,ULARGE_INTEGER*) PURE;
-	STDMETHOD(SetSize)(THIS_ ULARGE_INTEGER) PURE;
-	STDMETHOD(CopyTo)(THIS_ IStream*,ULARGE_INTEGER,ULARGE_INTEGER*,ULARGE_INTEGER*) PURE;
-	STDMETHOD(Commit)(THIS_ DWORD) PURE;
-	STDMETHOD(Revert)(THIS) PURE;
-	STDMETHOD(LockRegion)(THIS_ ULARGE_INTEGER,ULARGE_INTEGER,DWORD) PURE;
-	STDMETHOD(UnlockRegion)(THIS_ ULARGE_INTEGER,ULARGE_INTEGER,DWORD) PURE;
-	STDMETHOD(Stat)(THIS_ STATSTG*,DWORD) PURE;
-	STDMETHOD(Clone)(THIS_ LPSTREAM*) PURE;
-};
-
-EXTERN_C const IID IID_IMarshal;
-#undef INTERFACE
-#define INTERFACE IMarshal
-DECLARE_INTERFACE_(IMarshal,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetUnmarshalClass) (THIS_ REFIID,DWORD,PVOID,DWORD,CLSID*) PURE;
-	STDMETHOD(GetMarshalSizeMax) (THIS_ REFIID,DWORD,PVOID,DWORD,PDWORD) PURE;
-	STDMETHOD(MarshalInterface) (THIS_ REFIID,DWORD,DWORD) PURE;
-	STDMETHOD(UnmarshalInterface) (THIS_ IStream*,void**) PURE;
-	STDMETHOD(ReleaseMarshalData) (THIS_ IStream*) PURE;
-	STDMETHOD(DisconnectObject) (THIS_ DWORD) PURE;
-};
-
-EXTERN_C const IID IID_IStdMarshalInfo;
-#undef INTERFACE
-#define INTERFACE IStdMarshalInfo
-DECLARE_INTERFACE_(IStdMarshalInfo,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassForHandler)(THIS_ DWORD,PVOID,CLSID*) PURE;
-};
-
-EXTERN_C const IID IID_IMalloc;
-#undef INTERFACE
-#define INTERFACE IMalloc
-DECLARE_INTERFACE_(IMalloc,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(void*,Alloc)(THIS_ ULONG) PURE;
-	STDMETHOD_(void*,Realloc)(THIS_ void*,ULONG) PURE;
-	STDMETHOD_(void,Free)(THIS_ void*) PURE;
-	STDMETHOD_(ULONG,GetSize)(THIS_ void*) PURE;
-	STDMETHOD_(int,DidAlloc)(THIS_ void*) PURE;
-	STDMETHOD_(void,HeapMinimize)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IMallocSpy;
-#undef INTERFACE
-#define INTERFACE IMallocSpy
-DECLARE_INTERFACE_(IMallocSpy,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(ULONG,PreAlloc)(THIS_ ULONG) PURE;
-	STDMETHOD_(void*,PostAlloc)(THIS_ void*) PURE;
-	STDMETHOD_(void*,PreFree)(THIS_ void*,BOOL) PURE;
-	STDMETHOD_(void,PostFree)(THIS_ BOOL) PURE;
-	STDMETHOD_(ULONG,PreRealloc)(THIS_ void*,ULONG,void*) PURE;
-	STDMETHOD_(void*,PostRealloc)(THIS_ void*,BOOL) PURE;
-	STDMETHOD_(void*,PreGetSize)(THIS_ void*,BOOL) PURE;
-	STDMETHOD_(ULONG,PostGetSize)(THIS_ ULONG,BOOL) PURE;
-	STDMETHOD_(void*,PreDidAlloc)(THIS_ void*,BOOL) PURE;
-	STDMETHOD_(int,PostDidAlloc)(THIS_ void*,BOOL,int) PURE;
-	STDMETHOD_(void,PreHeapMinimize)(THIS) PURE;
-	STDMETHOD_(void,PostHeapMinimize)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IMessageFilter;
-#undef INTERFACE
-#define INTERFACE IMessageFilter
-DECLARE_INTERFACE_(IMessageFilter,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(DWORD,HandleInComingCall)(THIS_ DWORD,HTASK,DWORD,LPINTERFACEINFO) PURE;
-	STDMETHOD_(DWORD,RetryRejectedCall)(THIS_ HTASK,DWORD,DWORD) PURE;
-	STDMETHOD_(DWORD,MessagePending)(THIS_ HTASK,DWORD,DWORD) PURE;
-};
-
-EXTERN_C const IID IID_IPersist;
-#undef INTERFACE
-#define INTERFACE IPersist
-DECLARE_INTERFACE_(IPersist,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassID)(THIS_ CLSID*) PURE;
-};
-
-EXTERN_C const IID IID_IPersistStream;
-#undef INTERFACE
-#define INTERFACE IPersistStream
-DECLARE_INTERFACE_(IPersistStream,IPersist)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
-	STDMETHOD(IsDirty)(THIS) PURE;
-	STDMETHOD(Load)(THIS_ IStream*) PURE;
-	STDMETHOD(Save)(THIS_ IStream*,BOOL) PURE;
-	STDMETHOD(GetSizeMax)(THIS_ PULARGE_INTEGER) PURE;
-};
-
-EXTERN_C const IID IID_IRunningObjectTable;
-#undef INTERFACE
-#define INTERFACE IRunningObjectTable
-DECLARE_INTERFACE_(IRunningObjectTable,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Register)(THIS_ DWORD,LPUNKNOWN,LPMONIKER,PDWORD) PURE;
-	STDMETHOD(Revoke)(THIS_ DWORD) PURE;
-	STDMETHOD(IsRunning)(THIS_ LPMONIKER) PURE;
-	STDMETHOD(GetObject)(THIS_ LPMONIKER,LPUNKNOWN*) PURE;
-	STDMETHOD(NoteChangeTime)(THIS_ DWORD,LPFILETIME) PURE;
-	STDMETHOD(GetTimeOfLastChange)(THIS_ LPMONIKER,LPFILETIME) PURE;
-	STDMETHOD(EnumRunning)(THIS_ IEnumMoniker**) PURE;
-};
-
-EXTERN_C const IID IID_IBindCtx;
-#undef INTERFACE
-#define INTERFACE IBindCtx
-DECLARE_INTERFACE_(IBindCtx,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(RegisterObjectBound)(THIS_ LPUNKNOWN) PURE;
-	STDMETHOD(RevokeObjectBound)(THIS_ LPUNKNOWN) PURE;
-	STDMETHOD(ReleaseBoundObjects)(THIS) PURE;
-	STDMETHOD(SetBindOptions)(THIS_ LPBIND_OPTS) PURE;
-	STDMETHOD(GetBindOptions)(THIS_ LPBIND_OPTS) PURE;
-	STDMETHOD(GetRunningObjectTable)(THIS_ IRunningObjectTable**) PURE;
-	STDMETHOD(RegisterObjectParam)(THIS_ LPOLESTR,IUnknown*) PURE;
-	STDMETHOD(GetObjectParam)(THIS_ LPOLESTR,IUnknown**) PURE;
-	STDMETHOD(EnumObjectParam)(THIS_ IEnumString**) PURE;
-	STDMETHOD(RevokeObjectParam)(THIS_ LPOLESTR) PURE;
-};
-
-EXTERN_C const IID IID_IMoniker;
-#undef INTERFACE
-#define INTERFACE IMoniker
-DECLARE_INTERFACE_(IMoniker,IPersistStream)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
-	STDMETHOD(IsDirty)(THIS) PURE;
-	STDMETHOD(Load)(THIS_ IStream*) PURE;
-	STDMETHOD(Save)(THIS_ IStream*,BOOL) PURE;
-	STDMETHOD(GetSizeMax)(THIS_ PULARGE_INTEGER) PURE;
-	STDMETHOD(BindToObject)(THIS_ IBindCtx*,IMoniker*,REFIID,PVOID*) PURE;
-	STDMETHOD(BindToStorage)(THIS_ IBindCtx*,IMoniker*,REFIID,PVOID*) PURE;
-	STDMETHOD(Reduce)(THIS_ IBindCtx*,DWORD,IMoniker**,IMoniker**) PURE;
-	STDMETHOD(ComposeWith)(THIS_ IMoniker*,BOOL,IMoniker**) PURE;
-	STDMETHOD(Enum)(THIS_ BOOL,IEnumMoniker**) PURE;
-	STDMETHOD(IsEqual)(THIS_ IMoniker*) PURE;
-	STDMETHOD(Hash)(THIS_ PDWORD) PURE;
-	STDMETHOD(IsRunning)(THIS_ IBindCtx*,IMoniker*,IMoniker*) PURE;
-	STDMETHOD(GetTimeOfLastChange)(THIS_ IBindCtx*,IMoniker*,LPFILETIME) PURE;
-	STDMETHOD(Inverse)(THIS_ IMoniker**) PURE;
-	STDMETHOD(CommonPrefixWith)(THIS_ IMoniker*,IMoniker**) PURE;
-	STDMETHOD(RelativePathTo)(THIS_ IMoniker*,IMoniker**) PURE;
-	STDMETHOD(GetDisplayName)(THIS_ IBindCtx*,IMoniker*,LPOLESTR*) PURE;
-	STDMETHOD(ParseDisplayName)(THIS_ IBindCtx*,IMoniker*,LPOLESTR,ULONG*,IMoniker**) PURE;
-	STDMETHOD(IsSystemMoniker)(THIS_ PDWORD) PURE;
-};
-
-EXTERN_C const IID IID_IPersistStorage;
-#undef INTERFACE
-#define INTERFACE IPersistStorage
-DECLARE_INTERFACE_(IPersistStorage,IPersist)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassID)(THIS_ CLSID*) PURE;
-	STDMETHOD(IsDirty)(THIS) PURE;
-	STDMETHOD(InitNew)(THIS_ LPSTORAGE) PURE;
-	STDMETHOD(Load)(THIS_ LPSTORAGE) PURE;
-	STDMETHOD(Save)(THIS_ LPSTORAGE,BOOL) PURE;
-	STDMETHOD(SaveCompleted)(THIS_ LPSTORAGE) PURE;
-	STDMETHOD(HandsOffStorage)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IPersistFile;
-#undef INTERFACE
-#define INTERFACE IPersistFile
-DECLARE_INTERFACE_(IPersistFile,IPersist)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassID)(THIS_ CLSID*) PURE;
-	STDMETHOD(IsDirty)(THIS) PURE;
-	STDMETHOD(Load)(THIS_ LPCOLESTR,DWORD) PURE;
-	STDMETHOD(Save)(THIS_ LPCOLESTR,BOOL) PURE;
-	STDMETHOD(SaveCompleted)(THIS_ LPCOLESTR) PURE;
-	STDMETHOD(GetCurFile)(THIS_ LPOLESTR*) PURE;
-};
-
-EXTERN_C const IID IID_IAdviseSink;
-#undef INTERFACE
-#define INTERFACE IAdviseSink
-DECLARE_INTERFACE_(IAdviseSink,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(void,OnDataChange)(THIS_ FORMATETC*,STGMEDIUM*) PURE;
-	STDMETHOD_(void,OnViewChange)(THIS_ DWORD,LONG) PURE;
-	STDMETHOD_(void,OnRename)(THIS_ IMoniker*) PURE;
-	STDMETHOD_(void,OnSave)(THIS) PURE;
-	STDMETHOD_(void,OnClose)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IAdviseSink2;
-#undef INTERFACE
-#define INTERFACE IAdviseSink2
-DECLARE_INTERFACE_(IAdviseSink2,IAdviseSink)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(void,OnDataChange)(THIS_ FORMATETC*,STGMEDIUM*) PURE;
-	STDMETHOD_(void,OnViewChange)(THIS_ DWORD,LONG) PURE;
-	STDMETHOD_(void,OnRename)(THIS_ IMoniker*) PURE;
-	STDMETHOD_(void,OnSave)(THIS) PURE;
-	STDMETHOD_(void,OnClose)(THIS) PURE;
-	STDMETHOD_(void,OnLinkSrcChange)(THIS_ IMoniker*);
-};
-
-EXTERN_C const IID IID_IDataObject;
-#undef INTERFACE
-#define INTERFACE IDataObject
-DECLARE_INTERFACE_(IDataObject,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetData)(THIS_ FORMATETC*,STGMEDIUM*) PURE;
-	STDMETHOD(GetDataHere)(THIS_ FORMATETC*,STGMEDIUM*) PURE;
-	STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE;
-	STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE;
-	STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE;
-	STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC**) PURE;
-	STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
-	STDMETHOD(DUnadvise)(THIS_ DWORD) PURE;
-	STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**) PURE;
-};
-
-EXTERN_C const IID IID_IDataAdviseHolder;
-#undef INTERFACE
-#define INTERFACE IDataAdviseHolder
-DECLARE_INTERFACE_(IDataAdviseHolder,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Advise)(THIS_ IDataObject*,FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE;
-	STDMETHOD(Unadvise)(THIS_ DWORD) PURE;
-	STDMETHOD(EnumAdvise)(THIS_ IEnumSTATDATA**) PURE;
-	STDMETHOD(SendOnDataChange)(THIS_ IDataObject*,DWORD,DWORD) PURE;
-};
-
-EXTERN_C const IID IID_IStorage;
-#undef INTERFACE
-#define INTERFACE IStorage
-DECLARE_INTERFACE_(IStorage,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(CreateStream)(THIS_ LPCWSTR,DWORD,DWORD,DWORD,IStream**) PURE;
-	STDMETHOD(OpenStream)(THIS_ LPCWSTR,PVOID,DWORD,DWORD,IStream**) PURE;
-	STDMETHOD(CreateStorage)(THIS_ LPCWSTR,DWORD,DWORD,DWORD,IStorage**) PURE;
-	STDMETHOD(OpenStorage)(THIS_ LPCWSTR,IStorage*,DWORD,SNB,DWORD,IStorage**) PURE;
-	STDMETHOD(CopyTo)(THIS_ DWORD,IID const*,SNB,IStorage*) PURE;
-	STDMETHOD(MoveElementTo)(THIS_ LPCWSTR,IStorage*,LPCWSTR,DWORD) PURE;
-	STDMETHOD(Commit)(THIS_ DWORD) PURE;
-	STDMETHOD(Revert)(THIS) PURE;
-	STDMETHOD(EnumElements)(THIS_ DWORD,PVOID,DWORD,IEnumSTATSTG**) PURE;
-	STDMETHOD(DestroyElement)(THIS_ LPCWSTR) PURE;
-	STDMETHOD(RenameElement)(THIS_ LPCWSTR,LPCWSTR) PURE;
-	STDMETHOD(SetElementTimes)(THIS_ LPCWSTR,FILETIME const*,FILETIME const*,FILETIME const*) PURE;
-	STDMETHOD(SetClass)(THIS_ REFCLSID) PURE;
-	STDMETHOD(SetStateBits)(THIS_ DWORD,DWORD) PURE;
-	STDMETHOD(Stat)(THIS_ STATSTG*,DWORD) PURE;
-};
-
-EXTERN_C const IID IID_IRootStorage;
-#undef INTERFACE
-#define INTERFACE IRootStorage
-DECLARE_INTERFACE_(IRootStorage,IPersist)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(SwitchToFile)(THIS_ LPOLESTR) PURE;
-};
-
-EXTERN_C const IID IID_IRpcChannelBuffer;
-#undef INTERFACE
-#define INTERFACE IRpcChannelBuffer
-DECLARE_INTERFACE_(IRpcChannelBuffer,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetBuffer)(THIS_ RPCOLEMESSAGE*,REFIID) PURE;
-	STDMETHOD(SendReceive)(THIS_ RPCOLEMESSAGE*,PULONG) PURE;
-	STDMETHOD(FreeBuffer)(THIS_ RPCOLEMESSAGE*) PURE;
-	STDMETHOD(GetDestCtx)(THIS_ PDWORD,PVOID*) PURE;
-	STDMETHOD(IsConnected)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IRpcProxyBuffer;
-#undef INTERFACE
-#define INTERFACE IRpcProxyBuffer
-DECLARE_INTERFACE_(IRpcProxyBuffer,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Connect)(THIS_ IRpcChannelBuffer*) PURE;
-	STDMETHOD_(void,Disconnect)(THIS) PURE;
-
-};
-
-EXTERN_C const IID IID_IRpcStubBuffer;
-#undef INTERFACE
-#define INTERFACE IRpcStubBuffer
-DECLARE_INTERFACE_(IRpcStubBuffer,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Connect)(THIS_ LPUNKNOWN) PURE;
-	STDMETHOD_(void,Disconnect)(THIS) PURE;
-	STDMETHOD(Invoke)(THIS_ RPCOLEMESSAGE*,LPRPCSTUBBUFFER) PURE;
-	STDMETHOD_(LPRPCSTUBBUFFER,IsIIDSupported)(THIS_ REFIID) PURE;
-	STDMETHOD_(ULONG,CountRefs)(THIS) PURE;
-	STDMETHOD(DebugServerQueryInterface)(THIS_ PVOID*) PURE;
-	STDMETHOD(DebugServerRelease)(THIS_ PVOID) PURE;
-};
-
-EXTERN_C const IID IID_IPSFactoryBuffer;
-#undef INTERFACE
-#define INTERFACE IPSFactoryBuffer
-DECLARE_INTERFACE_(IPSFactoryBuffer,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(CreateProxy)(THIS_ LPUNKNOWN,REFIID,LPRPCPROXYBUFFER*,PVOID*) PURE;
-	STDMETHOD(CreateStub)(THIS_ REFIID,LPUNKNOWN,LPRPCSTUBBUFFER*) PURE;
-};
-
-EXTERN_C const IID IID_ILockBytes;
-#undef INTERFACE
-#define INTERFACE ILockBytes
-DECLARE_INTERFACE_(ILockBytes,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(ReadAt)(THIS_ ULARGE_INTEGER,PVOID,ULONG,ULONG*) PURE;
-	STDMETHOD(WriteAt)(THIS_ ULARGE_INTEGER,PCVOID,ULONG,ULONG*) PURE;
-	STDMETHOD(Flush)(THIS) PURE;
-	STDMETHOD(SetSize)(THIS_ ULARGE_INTEGER) PURE;
-	STDMETHOD(LockRegion)(THIS_ ULARGE_INTEGER,ULARGE_INTEGER,DWORD) PURE;
-	STDMETHOD(UnlockRegion)(THIS_ ULARGE_INTEGER,ULARGE_INTEGER,DWORD) PURE;
-	STDMETHOD(Stat)(THIS_ STATSTG*,DWORD) PURE;
-};
-
-EXTERN_C const IID IID_IExternalConnection;
-#undef INTERFACE
-#define INTERFACE IExternalConnection
-DECLARE_INTERFACE_(IExternalConnection,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(AddConnection)(THIS_ DWORD,DWORD) PURE;
-	STDMETHOD(ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE;
-};
-
-EXTERN_C const IID IID_IRunnableObject;
-#undef INTERFACE
-#define INTERFACE IRunnableObject
-DECLARE_INTERFACE_(IRunnableObject,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetRunningClass)(THIS_ LPCLSID) PURE;
-	STDMETHOD(Run)(THIS_ LPBC) PURE;
-	STDMETHOD_(BOOL,IsRunning)(THIS) PURE;
-	STDMETHOD(LockRunning)(THIS_ BOOL,BOOL) PURE;
-	STDMETHOD(SetContainedObject)(THIS_ BOOL) PURE;
-};
-
-EXTERN_C const IID IID_IROTData;
-#undef INTERFACE
-#define INTERFACE IROTData
-DECLARE_INTERFACE_(IROTData,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetComparisonData)(THIS_ PVOID,ULONG,PULONG) PURE;
-};
-
-EXTERN_C const IID IID_IChannelHook;
-#undef INTERFACE
-#define INTERFACE IChannelHook
-DECLARE_INTERFACE_(IChannelHook,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(void,ClientGetSize)(THIS_ REFGUID,REFIID,PULONG) PURE;
-	STDMETHOD_(void,ClientFillBuffer)(THIS_ REFGUID,REFIID,PULONG,PVOID) PURE;
-	STDMETHOD_(void,ClientNotify)(THIS_ REFGUID,REFIID,ULONG,PVOID,DWORD,HRESULT) PURE;
-	STDMETHOD_(void,ServerNotify)(THIS_ REFGUID,REFIID,ULONG,PVOID,DWORD) PURE;
-	STDMETHOD_(void,ServerGetSize)(THIS_ REFGUID,REFIID,HRESULT,PULONG) PURE;
-	STDMETHOD_(void,ServerFillBuffer)(THIS_ REFGUID,REFIID,PULONG,PVOID,HRESULT) PURE;
-};
-
-EXTERN_C const IID IID_IPropertyStorage;
-#undef INTERFACE
-#define INTERFACE IPropertyStorage
-DECLARE_INTERFACE_(IPropertyStorage,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(ReadMultiple)(THIS_ ULONG,PROPSPEC const*,PROPVARIANT*) PURE;
-	STDMETHOD(WriteMultiple)(THIS_ ULONG,PROPSPEC const*,PROPVARIANT*,PROPID) PURE;
-	STDMETHOD(DeleteMultiple)(THIS_ ULONG,PROPSPEC const*) PURE;
-	STDMETHOD(ReadPropertyNames)(THIS_ ULONG,PROPID const*,LPWSTR*) PURE;
-	STDMETHOD(WritePropertyNames)(THIS_ ULONG,PROPID const*,LPWSTR const*) PURE;
-	STDMETHOD(DeletePropertyNames)(THIS_ ULONG,PROPID const*) PURE;
-	STDMETHOD(SetClass)(THIS_ REFCLSID) PURE;
-	STDMETHOD(Commit)(THIS_ DWORD) PURE;
-	STDMETHOD(Revert)(THIS) PURE;
-	STDMETHOD(Enum)(THIS_ IEnumSTATPROPSTG**) PURE;
-	STDMETHOD(Stat)(THIS_ STATPROPSTG*) PURE;
-	STDMETHOD(SetTimes)(THIS_ FILETIME const*,FILETIME const*,FILETIME const*) PURE;
-};
-
-EXTERN_C const IID IID_IPropertySetStorage;
-#undef INTERFACE
-#define INTERFACE IPropertySetStorage
-DECLARE_INTERFACE_(IPropertySetStorage,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Create)(THIS_ REFFMTID,CLSID*,DWORD,DWORD,LPPROPERTYSTORAGE*) PURE;
-	STDMETHOD(Open)(THIS_ REFFMTID,DWORD,LPPROPERTYSTORAGE*) PURE;
-	STDMETHOD(Delete)(THIS_ REFFMTID) PURE;
-	STDMETHOD(Enum)(THIS_ IEnumSTATPROPSETSTG**) PURE;
-};
-
-EXTERN_C const IID IID_IClientSecurity;
-#undef INTERFACE
-#define INTERFACE IClientSecurity
-DECLARE_INTERFACE_(IClientSecurity,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(QueryBlanket)(THIS_ PVOID,PDWORD,PDWORD,OLECHAR**,PDWORD,PDWORD,RPC_AUTH_IDENTITY_HANDLE**,PDWORD*) PURE;
-	STDMETHOD(SetBlanket)(THIS_ PVOID,DWORD,DWORD,LPWSTR,DWORD,DWORD,RPC_AUTH_IDENTITY_HANDLE*,DWORD) PURE;
-	STDMETHOD(CopyProxy)(THIS_ LPUNKNOWN,LPUNKNOWN*) PURE;
-};
-
-EXTERN_C const IID IID_IServerSecurity;
-#undef INTERFACE
-#define INTERFACE IServerSecurity
-DECLARE_INTERFACE_(IServerSecurity,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(QueryBlanket)(THIS_ PDWORD,PDWORD,OLECHAR**,PDWORD,PDWORD,RPC_AUTHZ_HANDLE*,PDWORD*) PURE;
-	STDMETHOD(ImpersonateClient)(THIS) PURE;
-	STDMETHOD(RevertToSelf)(THIS) PURE;
-	STDMETHOD(IsImpersonating)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IClassActivator;
-#undef INTERFACE
-#define INTERFACE IClassActivator
-DECLARE_INTERFACE_(IClassActivator,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassObject)(THIS_ REFCLSID,DWORD,LCID,REFIID,PVOID*) PURE;
-};
-
-EXTERN_C const IID IID_IFillLockBytes;
-#undef INTERFACE
-#define INTERFACE IFillLockBytes
-DECLARE_INTERFACE_(IFillLockBytes,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(FillAppend)(THIS_ void const*,ULONG,PULONG) PURE;
-	STDMETHOD(FillAt)(THIS_ ULARGE_INTEGER,void const*,ULONG,PULONG) PURE;
-	STDMETHOD(SetFillSize)(THIS_ ULARGE_INTEGER) PURE;
-	STDMETHOD(Terminate)(THIS_ BOOL) PURE;
-};
-
-EXTERN_C const IID IID_IProgressNotify;
-#undef INTERFACE
-#define INTERFACE IProgressNotify
-DECLARE_INTERFACE_(IProgressNotify,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(OnProgress)(THIS_ DWORD,DWORD,BOOL,BOOL) PURE;
-};
-
-EXTERN_C const IID IID_ILayoutStorage;
-#undef INTERFACE
-#define INTERFACE ILayoutStorage
-DECLARE_INTERFACE_(ILayoutStorage,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(LayoutScript)(THIS_ STORAGELAYOUT*,DWORD,DWORD) PURE;
-	STDMETHOD(BeginMonitor)(THIS) PURE;
-	STDMETHOD(EndMonitor)(THIS) PURE;
-	STDMETHOD(ReLayoutDocfile)(THIS_ OLECHAR*) PURE;
-};
-
-HRESULT STDMETHODCALLTYPE IMarshal_GetUnmarshalClass_Proxy(IMarshal*,REFIID,void*,DWORD,void*,DWORD,CLSID*);
-void STDMETHODCALLTYPE IMarshal_GetUnmarshalClass_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMarshal_GetMarshalSizeMax_Proxy(IMarshal*,REFIID,void*,DWORD,void*,DWORD,DWORD*);
-void STDMETHODCALLTYPE IMarshal_GetMarshalSizeMax_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMarshal_MarshalInterface_Proxy(IMarshal*,IStream*,REFIID,void*,DWORD,void*,DWORD);
-void STDMETHODCALLTYPE IMarshal_MarshalInterface_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMarshal_UnmarshalInterface_Proxy(IMarshal*,IStream*,REFIID,void**);
-void STDMETHODCALLTYPE IMarshal_UnmarshalInterface_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMarshal_ReleaseMarshalData_Proxy(IMarshal*,IStream*);
-void STDMETHODCALLTYPE IMarshal_ReleaseMarshalData_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMarshal_DisconnectObject_Proxy(IMarshal*,DWORD);
-void STDMETHODCALLTYPE IMarshal_DisconnectObject_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void* STDMETHODCALLTYPE IMalloc_Alloc_Proxy(IMalloc*,ULONG);
-void STDMETHODCALLTYPE IMalloc_Alloc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void* STDMETHODCALLTYPE IMalloc_Realloc_Proxy(IMalloc*,void*,ULONG);
-void STDMETHODCALLTYPE IMalloc_Realloc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IMalloc_Free_Proxy(IMalloc*,void*);
-void STDMETHODCALLTYPE IMalloc_Free_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-ULONG STDMETHODCALLTYPE IMalloc_GetSize_Proxy(IMalloc*,void*);
-void STDMETHODCALLTYPE IMalloc_GetSize_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-int STDMETHODCALLTYPE IMalloc_DidAlloc_Proxy(IMalloc*,void*);
-void STDMETHODCALLTYPE IMalloc_DidAlloc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IMalloc_HeapMinimize_Proxy(IMalloc*);
-void STDMETHODCALLTYPE IMalloc_HeapMinimize_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-ULONG STDMETHODCALLTYPE IMallocSpy_PreAlloc_Proxy(IMallocSpy*,ULONG cbRequest);
-void STDMETHODCALLTYPE IMallocSpy_PreAlloc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void* STDMETHODCALLTYPE IMallocSpy_PostAlloc_Proxy(IMallocSpy*,void*);
-void STDMETHODCALLTYPE IMallocSpy_PostAlloc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void* STDMETHODCALLTYPE IMallocSpy_PreFree_Proxy(IMallocSpy*,void*,BOOL);
-void STDMETHODCALLTYPE IMallocSpy_PreFree_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IMallocSpy_PostFree_Proxy(IMallocSpy*,BOOL);
-void STDMETHODCALLTYPE IMallocSpy_PostFree_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-ULONG STDMETHODCALLTYPE IMallocSpy_PreRealloc_Proxy(IMallocSpy*,void*,ULONG,void**,BOOL);
-void STDMETHODCALLTYPE IMallocSpy_PreRealloc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void* STDMETHODCALLTYPE IMallocSpy_PostRealloc_Proxy(IMallocSpy*,void*,BOOL);
-void STDMETHODCALLTYPE IMallocSpy_PostRealloc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void* STDMETHODCALLTYPE IMallocSpy_PreGetSize_Proxy(IMallocSpy*,void*,BOOL);
-void STDMETHODCALLTYPE IMallocSpy_PreGetSize_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-ULONG STDMETHODCALLTYPE IMallocSpy_PostGetSize_Proxy(IMallocSpy*,ULONG,BOOL);
-void STDMETHODCALLTYPE IMallocSpy_PostGetSize_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void* STDMETHODCALLTYPE IMallocSpy_PreDidAlloc_Proxy(IMallocSpy*,void*,BOOL);
-void STDMETHODCALLTYPE IMallocSpy_PreDidAlloc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-int STDMETHODCALLTYPE IMallocSpy_PostDidAlloc_Proxy(IMallocSpy*,void*,BOOL,int);
-void STDMETHODCALLTYPE IMallocSpy_PostDidAlloc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IMallocSpy_PreHeapMinimize_Proxy(IMallocSpy* );
-void STDMETHODCALLTYPE IMallocSpy_PreHeapMinimize_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IMallocSpy_PostHeapMinimize_Proxy(IMallocSpy*);
-void STDMETHODCALLTYPE IMallocSpy_PostHeapMinimize_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStdMarshalInfo_GetClassForHandler_Proxy(IStdMarshalInfo*,DWORD,void*,CLSID*);
-void STDMETHODCALLTYPE IStdMarshalInfo_GetClassForHandler_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-DWORD STDMETHODCALLTYPE IExternalConnection_AddConnection_Proxy(IExternalConnection*,DWORD,DWORD);
-void STDMETHODCALLTYPE IExternalConnection_AddConnection_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-DWORD STDMETHODCALLTYPE IExternalConnection_ReleaseConnection_Proxy(IExternalConnection*,DWORD,DWORD,BOOL);
-void STDMETHODCALLTYPE IExternalConnection_ReleaseConnection_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumUnknown_RemoteNext_Proxy(IEnumUnknown*,ULONG,IUnknown**,ULONG*);
-void STDMETHODCALLTYPE IEnumUnknown_RemoteNext_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumUnknown_Skip_Proxy(IEnumUnknown*,ULONG);
-void STDMETHODCALLTYPE IEnumUnknown_Skip_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumUnknown_Reset_Proxy(IEnumUnknown* );
-void STDMETHODCALLTYPE IEnumUnknown_Reset_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumUnknown_Clone_Proxy(IEnumUnknown*,IEnumUnknown**);
-void STDMETHODCALLTYPE IEnumUnknown_Clone_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IBindCtx_RegisterObjectBound_Proxy(IBindCtx*,IUnknown*punk);
-void STDMETHODCALLTYPE IBindCtx_RegisterObjectBound_Stub(IRpcStubBuffer*,IRpcChannelBuffer*_pRpcChannelBuffer,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IBindCtx_RevokeObjectBound_Proxy(IBindCtx*,IUnknown*punk);
-void STDMETHODCALLTYPE IBindCtx_RevokeObjectBound_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IBindCtx_ReleaseBoundObjects_Proxy(IBindCtx*);
-void STDMETHODCALLTYPE IBindCtx_ReleaseBoundObjects_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IBindCtx_SetBindOptions_Proxy(IBindCtx*,BIND_OPTS*);
-void STDMETHODCALLTYPE IBindCtx_SetBindOptions_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IBindCtx_GetBindOptions_Proxy(IBindCtx*,BIND_OPTS*pbindopts);
-void STDMETHODCALLTYPE IBindCtx_GetBindOptions_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IBindCtx_GetRunningObjectTable_Proxy(IBindCtx*,IRunningObjectTable**);
-void STDMETHODCALLTYPE IBindCtx_GetRunningObjectTable_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IBindCtx_RegisterObjectParam_Proxy(IBindCtx*,LPCSTR,IUnknown*);
-void STDMETHODCALLTYPE IBindCtx_RegisterObjectParam_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IBindCtx_GetObjectParam_Proxy(IBindCtx*,LPCSTR,IUnknown**);
-void STDMETHODCALLTYPE IBindCtx_GetObjectParam_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IBindCtx_EnumObjectParam_Proxy(IBindCtx*,IEnumString**);
-void STDMETHODCALLTYPE IBindCtx_EnumObjectParam_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IBindCtx_RevokeObjectParam_Proxy(IBindCtx*,LPCSTR);
-void STDMETHODCALLTYPE IBindCtx_RevokeObjectParam_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumMoniker_RemoteNext_Proxy(IEnumMoniker*,ULONG,IMoniker**,ULONG*);
-void STDMETHODCALLTYPE IEnumMoniker_RemoteNext_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumMoniker_Skip_Proxy(IEnumMoniker*,ULONG);
-void STDMETHODCALLTYPE IEnumMoniker_Skip_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumMoniker_Reset_Proxy(IEnumMoniker*);
-void STDMETHODCALLTYPE IEnumMoniker_Reset_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumMoniker_Clone_Proxy(IEnumMoniker*,IEnumMoniker**);
-void STDMETHODCALLTYPE IEnumMoniker_Clone_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunnableObject_GetRunningClass_Proxy(IRunnableObject*,LPCLSID);
-void STDMETHODCALLTYPE IRunnableObject_GetRunningClass_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunnableObject_Run_Proxy(IRunnableObject*,LPBINDCTX);
-void STDMETHODCALLTYPE IRunnableObject_Run_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-BOOL STDMETHODCALLTYPE IRunnableObject_IsRunning_Proxy(IRunnableObject*);
-void STDMETHODCALLTYPE IRunnableObject_IsRunning_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunnableObject_LockRunning_Proxy(IRunnableObject*,BOOL,BOOL);
-void STDMETHODCALLTYPE IRunnableObject_LockRunning_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunnableObject_SetContainedObject_Proxy(IRunnableObject*,BOOL);
-void STDMETHODCALLTYPE IRunnableObject_SetContainedObject_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunningObjectTable_Register_Proxy(IRunningObjectTable*,DWORD,IUnknown*,IMoniker*,DWORD*);
-void STDMETHODCALLTYPE IRunningObjectTable_Register_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunningObjectTable_Revoke_Proxy(IRunningObjectTable*,DWORD);
-void STDMETHODCALLTYPE IRunningObjectTable_Revoke_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunningObjectTable_IsRunning_Proxy(IRunningObjectTable*,IMoniker*);
-void STDMETHODCALLTYPE IRunningObjectTable_IsRunning_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunningObjectTable_GetObject_Proxy(IRunningObjectTable*,IMoniker*,IUnknown**);
-void STDMETHODCALLTYPE IRunningObjectTable_GetObject_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunningObjectTable_NoteChangeTime_Proxy(IRunningObjectTable*,DWORD,FILETIME*);
-void STDMETHODCALLTYPE IRunningObjectTable_NoteChangeTime_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunningObjectTable_GetTimeOfLastChange_Proxy(IRunningObjectTable*,IMoniker*,FILETIME*);
-void STDMETHODCALLTYPE IRunningObjectTable_GetTimeOfLastChange_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRunningObjectTable_EnumRunning_Proxy(IRunningObjectTable*,IEnumMoniker**);
-void STDMETHODCALLTYPE IRunningObjectTable_EnumRunning_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersist_GetClassID_Proxy(IPersist*,CLSID*);
-void STDMETHODCALLTYPE IPersist_GetClassID_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistStream_IsDirty_Proxy(IPersistStream*);
-void STDMETHODCALLTYPE IPersistStream_IsDirty_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistStream_Load_Proxy(IPersistStream*,IStream*);
-void STDMETHODCALLTYPE IPersistStream_Load_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistStream_Save_Proxy(IPersistStream*,IStream*,BOOL);
-void STDMETHODCALLTYPE IPersistStream_Save_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistStream_GetSizeMax_Proxy(IPersistStream*,ULARGE_INTEGER*);
-void STDMETHODCALLTYPE IPersistStream_GetSizeMax_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_RemoteBindToObject_Proxy(IMoniker*,IBindCtx*,IMoniker*,REFIID,IUnknown**);
-void STDMETHODCALLTYPE IMoniker_RemoteBindToObject_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_RemoteBindToStorage_Proxy(IMoniker*,IBindCtx*,IMoniker*,REFIID,IUnknown**);
-void STDMETHODCALLTYPE IMoniker_RemoteBindToStorage_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_Reduce_Proxy(IMoniker*,IBindCtx*,DWORD,IMoniker**,IMoniker**);
-void STDMETHODCALLTYPE IMoniker_Reduce_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_ComposeWith_Proxy(IMoniker*,IMoniker*,BOOL,IMoniker**);
-void STDMETHODCALLTYPE IMoniker_ComposeWith_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_Enum_Proxy(IMoniker*,BOOL,IEnumMoniker**);
-void STDMETHODCALLTYPE IMoniker_Enum_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_IsEqual_Proxy(IMoniker*,IMoniker*);
-void STDMETHODCALLTYPE IMoniker_IsEqual_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_Hash_Proxy(IMoniker*,DWORD*);
-void STDMETHODCALLTYPE IMoniker_Hash_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_IsRunning_Proxy(IMoniker*,IBindCtx*,IMoniker*,IMoniker*);
-void STDMETHODCALLTYPE IMoniker_IsRunning_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_GetTimeOfLastChange_Proxy(IMoniker*,IBindCtx*,IMoniker*,FILETIME*);
-void STDMETHODCALLTYPE IMoniker_GetTimeOfLastChange_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_Inverse_Proxy(IMoniker*,IMoniker**);
-void STDMETHODCALLTYPE IMoniker_Inverse_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_CommonPrefixWith_Proxy(IMoniker*,IMoniker*,IMoniker**);
-void STDMETHODCALLTYPE IMoniker_CommonPrefixWith_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_RelativePathTo_Proxy(IMoniker*,IMoniker*,IMoniker**);
-void STDMETHODCALLTYPE IMoniker_RelativePathTo_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_GetDisplayName_Proxy(IMoniker*,IBindCtx*,IMoniker*,LPCSTR*);
-void STDMETHODCALLTYPE IMoniker_GetDisplayName_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_ParseDisplayName_Proxy(IMoniker*,IBindCtx*,IMoniker*,LPCSTR,ULONG*,IMoniker**);
-void STDMETHODCALLTYPE IMoniker_ParseDisplayName_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IMoniker_IsSystemMoniker_Proxy(IMoniker*,DWORD*);
-void STDMETHODCALLTYPE IMoniker_IsSystemMoniker_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IROTData_GetComparisonData_Proxy(IROTData*,BYTE*,ULONG cbMax,ULONG*);
-void STDMETHODCALLTYPE IROTData_GetComparisonData_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumString_RemoteNext_Proxy(IEnumString*,ULONG,LPCSTR*rgelt,ULONG*);
-void STDMETHODCALLTYPE IEnumString_RemoteNext_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumString_Skip_Proxy(IEnumString*,ULONG);
-void STDMETHODCALLTYPE IEnumString_Skip_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumString_Reset_Proxy(IEnumString*);
-void STDMETHODCALLTYPE IEnumString_Reset_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumString_Clone_Proxy(IEnumString*,IEnumString**);
-void STDMETHODCALLTYPE IEnumString_Clone_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_RemoteRead_Proxy(IStream*,BYTE*,ULONG,ULONG*);
-void STDMETHODCALLTYPE IStream_RemoteRead_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_RemoteWrite_Proxy(IStream*,BYTE*pv,ULONG,ULONG*);
-void STDMETHODCALLTYPE IStream_RemoteWrite_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_RemoteSeek_Proxy(IStream*,LARGE_INTEGER,DWORD,ULARGE_INTEGER*);
-void STDMETHODCALLTYPE IStream_RemoteSeek_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_SetSize_Proxy(IStream*,ULARGE_INTEGER);
-void STDMETHODCALLTYPE IStream_SetSize_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_RemoteCopyTo_Proxy(IStream*,IStream*,ULARGE_INTEGER,ULARGE_INTEGER*,ULARGE_INTEGER*);
-void STDMETHODCALLTYPE IStream_RemoteCopyTo_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_Commit_Proxy(IStream*,DWORD);
-void STDMETHODCALLTYPE IStream_Commit_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_Revert_Proxy(IStream*);
-void STDMETHODCALLTYPE IStream_Revert_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_LockRegion_Proxy(IStream*,ULARGE_INTEGER,ULARGE_INTEGER,DWORD);
-void STDMETHODCALLTYPE IStream_LockRegion_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_UnlockRegion_Proxy(IStream*,ULARGE_INTEGER,ULARGE_INTEGER,DWORD);
-void STDMETHODCALLTYPE IStream_UnlockRegion_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_Stat_Proxy(IStream*,STATSTG*,DWORD);
-void STDMETHODCALLTYPE IStream_Stat_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStream_Clone_Proxy(IStream*,IStream**);
-void STDMETHODCALLTYPE IStream_Clone_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumSTATSTG_RemoteNext_Proxy(IEnumSTATSTG*,ULONG,STATSTG*,ULONG*);
-void STDMETHODCALLTYPE IEnumSTATSTG_RemoteNext_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumSTATSTG_Skip_Proxy(IEnumSTATSTG*,ULONG celt);
-void STDMETHODCALLTYPE IEnumSTATSTG_Skip_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumSTATSTG_Reset_Proxy(IEnumSTATSTG*);
-void STDMETHODCALLTYPE IEnumSTATSTG_Reset_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumSTATSTG_Clone_Proxy(IEnumSTATSTG*,IEnumSTATSTG**);
-void STDMETHODCALLTYPE IEnumSTATSTG_Clone_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_CreateStream_Proxy(IStorage*,OLECHAR*,DWORD,DWORD,DWORD,IStream**);
-void STDMETHODCALLTYPE IStorage_CreateStream_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_RemoteOpenStream_Proxy(IStorage*,const OLECHAR*,unsigned long,BYTE*,DWORD,DWORD,IStream**);
-void STDMETHODCALLTYPE IStorage_RemoteOpenStream_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_CreateStorage_Proxy(IStorage*,OLECHAR*,DWORD,DWORD,DWORD,IStorage**);
-void STDMETHODCALLTYPE IStorage_CreateStorage_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_OpenStorage_Proxy(IStorage*,OLECHAR*,IStorage*,DWORD,SNB,DWORD,IStorage**);
-void STDMETHODCALLTYPE IStorage_OpenStorage_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_CopyTo_Proxy(IStorage*,DWORD,const IID*,SNB,IStorage*);
-void STDMETHODCALLTYPE IStorage_CopyTo_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_MoveElementTo_Proxy(IStorage*,const OLECHAR*,IStorage*,const OLECHAR*,DWORD);
-void STDMETHODCALLTYPE IStorage_MoveElementTo_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_Commit_Proxy(IStorage*,DWORD);
-void STDMETHODCALLTYPE IStorage_Commit_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_Revert_Proxy(IStorage*);
-void STDMETHODCALLTYPE IStorage_Revert_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_RemoteEnumElements_Proxy(IStorage*,DWORD,unsigned long,BYTE*,DWORD,IEnumSTATSTG**);
-void STDMETHODCALLTYPE IStorage_RemoteEnumElements_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_DestroyElement_Proxy(IStorage*,OLECHAR*);
-void STDMETHODCALLTYPE IStorage_DestroyElement_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_RenameElement_Proxy(IStorage*,const OLECHAR*,const OLECHAR*);
-void STDMETHODCALLTYPE IStorage_RenameElement_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_SetElementTimes_Proxy(IStorage*,const OLECHAR*,const FILETIME*,const FILETIME*,const FILETIME*);
-void STDMETHODCALLTYPE IStorage_SetElementTimes_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_SetClass_Proxy(IStorage*,REFCLSID);
-void STDMETHODCALLTYPE IStorage_SetClass_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_SetStateBits_Proxy(IStorage*,DWORD,DWORD);
-void STDMETHODCALLTYPE IStorage_SetStateBits_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IStorage_Stat_Proxy(IStorage*,STATSTG*,DWORD);
-void STDMETHODCALLTYPE IStorage_Stat_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistFile_IsDirty_Proxy(IPersistFile*);
-void STDMETHODCALLTYPE IPersistFile_IsDirty_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistFile_Load_Proxy(IPersistFile*,LPCOLESTR,DWORD);
-void STDMETHODCALLTYPE IPersistFile_Load_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistFile_Save_Proxy(IPersistFile*,LPCOLESTR pszFileName,BOOL);
-void STDMETHODCALLTYPE IPersistFile_Save_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistFile_SaveCompleted_Proxy(IPersistFile*,LPCOLESTR);
-void STDMETHODCALLTYPE IPersistFile_SaveCompleted_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistFile_GetCurFile_Proxy(IPersistFile*,LPCSTR*);
-void STDMETHODCALLTYPE IPersistFile_GetCurFile_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistStorage_IsDirty_Proxy(IPersistStorage*);
-void STDMETHODCALLTYPE IPersistStorage_IsDirty_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistStorage_InitNew_Proxy(IPersistStorage*,IStorage*);
-void STDMETHODCALLTYPE IPersistStorage_InitNew_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistStorage_Load_Proxy(IPersistStorage*,IStorage*);
-void STDMETHODCALLTYPE IPersistStorage_Load_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistStorage_Save_Proxy(IPersistStorage*,IStorage*,BOOL);
-void STDMETHODCALLTYPE IPersistStorage_Save_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistStorage_SaveCompleted_Proxy(IPersistStorage*,IStorage*);
-void STDMETHODCALLTYPE IPersistStorage_SaveCompleted_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPersistStorage_HandsOffStorage_Proxy(IPersistStorage*);
-void STDMETHODCALLTYPE IPersistStorage_HandsOffStorage_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE ILockBytes_RemoteReadAt_Proxy(ILockBytes*,ULARGE_INTEGER,BYTE*,ULONG,ULONG*);
-void STDMETHODCALLTYPE ILockBytes_RemoteReadAt_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE ILockBytes_RemoteWriteAt_Proxy(ILockBytes*,ULARGE_INTEGER,BYTE*pv,ULONG,ULONG*);
-void STDMETHODCALLTYPE ILockBytes_RemoteWriteAt_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE ILockBytes_Flush_Proxy(ILockBytes*);
-void STDMETHODCALLTYPE ILockBytes_Flush_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE ILockBytes_SetSize_Proxy(ILockBytes*,ULARGE_INTEGER);
-void STDMETHODCALLTYPE ILockBytes_SetSize_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE ILockBytes_LockRegion_Proxy(ILockBytes*,ULARGE_INTEGER,ULARGE_INTEGER,DWORD);
-void STDMETHODCALLTYPE ILockBytes_LockRegion_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE ILockBytes_UnlockRegion_Proxy(ILockBytes*,ULARGE_INTEGER,ULARGE_INTEGER,DWORD);
-void STDMETHODCALLTYPE ILockBytes_UnlockRegion_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE ILockBytes_Stat_Proxy(ILockBytes*,STATSTG*,DWORD);
-void STDMETHODCALLTYPE ILockBytes_Stat_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumFORMATETC_RemoteNext_Proxy(IEnumFORMATETC*,ULONG,FORMATETC*,ULONG*);
-void STDMETHODCALLTYPE IEnumFORMATETC_RemoteNext_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumFORMATETC_Skip_Proxy(IEnumFORMATETC*,ULONG);
-void STDMETHODCALLTYPE IEnumFORMATETC_Skip_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumFORMATETC_Reset_Proxy(IEnumFORMATETC*);
-void STDMETHODCALLTYPE IEnumFORMATETC_Reset_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumFORMATETC_Clone_Proxy(IEnumFORMATETC*,IEnumFORMATETC**);
-void STDMETHODCALLTYPE IEnumFORMATETC_Clone_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumFORMATETC_Next_Proxy(IEnumFORMATETC*,ULONG,FORMATETC*,ULONG*);
-HRESULT STDMETHODCALLTYPE IEnumFORMATETC_Next_Stub(IEnumFORMATETC*,ULONG,FORMATETC*,ULONG*);
-HRESULT STDMETHODCALLTYPE IEnumSTATDATA_RemoteNext_Proxy(IEnumSTATDATA*,ULONG,STATDATA*,ULONG*);
-void STDMETHODCALLTYPE IEnumSTATDATA_RemoteNext_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumSTATDATA_Skip_Proxy(IEnumSTATDATA*,ULONG);
-void STDMETHODCALLTYPE IEnumSTATDATA_Skip_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumSTATDATA_Reset_Proxy(IEnumSTATDATA*);
-void STDMETHODCALLTYPE IEnumSTATDATA_Reset_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumSTATDATA_Clone_Proxy(IEnumSTATDATA*,IEnumSTATDATA**);
-void STDMETHODCALLTYPE IEnumSTATDATA_Clone_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IEnumSTATDATA_Next_Proxy(IEnumSTATDATA*,ULONG,STATDATA*,ULONG*);
-HRESULT STDMETHODCALLTYPE IEnumSTATDATA_Next_Stub(IEnumSTATDATA*,ULONG,STATDATA*,ULONG*);
-HRESULT STDMETHODCALLTYPE IRootStorage_SwitchToFile_Proxy(IRootStorage*,LPCSTR);
-void STDMETHODCALLTYPE IRootStorage_SwitchToFile_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IAdviseSink_RemoteOnDataChange_Proxy(IAdviseSink*,FORMATETC*,RemSTGMEDIUM*);
-void STDMETHODCALLTYPE IAdviseSink_RemoteOnDataChange_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IAdviseSink_RemoteOnViewChange_Proxy(IAdviseSink*,DWORD,LONG);
-void STDMETHODCALLTYPE IAdviseSink_RemoteOnViewChange_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IAdviseSink_RemoteOnRename_Proxy(IAdviseSink*,IMoniker*);
-void STDMETHODCALLTYPE IAdviseSink_RemoteOnRename_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IAdviseSink_RemoteOnSave_Proxy(IAdviseSink*);
-void STDMETHODCALLTYPE IAdviseSink_RemoteOnSave_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IAdviseSink_RemoteOnClose_Proxy(IAdviseSink*);
-void STDMETHODCALLTYPE IAdviseSink_RemoteOnClose_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IAdviseSink_OnDataChange_Proxy(IAdviseSink*,FORMATETC*,STGMEDIUM*);
-void STDMETHODCALLTYPE IAdviseSink_OnDataChange_Stub(IAdviseSink*,FORMATETC*,RemSTGMEDIUM*);
-void STDMETHODCALLTYPE IAdviseSink_OnViewChange_Proxy(IAdviseSink*,DWORD,LONG);
-void STDMETHODCALLTYPE IAdviseSink_OnViewChange_Stub(IAdviseSink*,DWORD,LONG);
-void STDMETHODCALLTYPE IAdviseSink_OnRename_Proxy(IAdviseSink*,IMoniker*);
-void STDMETHODCALLTYPE IAdviseSink_OnRename_Stub(IAdviseSink*,IMoniker*);
-void STDMETHODCALLTYPE IAdviseSink_OnSave_Proxy(IAdviseSink*);
-void STDMETHODCALLTYPE IAdviseSink_OnSave_Stub(IAdviseSink*);
-void STDMETHODCALLTYPE IAdviseSink_OnClose_Proxy(IAdviseSink*);
-HRESULT STDMETHODCALLTYPE IAdviseSink_OnClose_Stub(IAdviseSink*);
-void STDMETHODCALLTYPE IAdviseSink2_RemoteOnLinkSrcChange_Proxy(IAdviseSink2*,IMoniker*);
-void STDMETHODCALLTYPE IAdviseSink2_RemoteOnLinkSrcChange_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IAdviseSink2_OnLinkSrcChange_Proxy(IAdviseSink2*,IMoniker*);
-void STDMETHODCALLTYPE IAdviseSink2_OnLinkSrcChange_Stub(IAdviseSink2*,IMoniker*);
-HRESULT STDMETHODCALLTYPE IDataObject_RemoteGetData_Proxy(IDataObject*,FORMATETC*,RemSTGMEDIUM**);
-void STDMETHODCALLTYPE IDataObject_RemoteGetData_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataObject_RemoteGetDataHere_Proxy(IDataObject*,FORMATETC*,RemSTGMEDIUM**);
-void STDMETHODCALLTYPE IDataObject_RemoteGetDataHere_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataObject_QueryGetData_Proxy(IDataObject*,FORMATETC*);
-void STDMETHODCALLTYPE IDataObject_QueryGetData_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataObject_GetCanonicalFormatEtc_Proxy(IDataObject*,FORMATETC*,FORMATETC*);
-void STDMETHODCALLTYPE IDataObject_GetCanonicalFormatEtc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataObject_RemoteSetData_Proxy(IDataObject*,FORMATETC*,RemSTGMEDIUM*,BOOL);
-void STDMETHODCALLTYPE IDataObject_RemoteSetData_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataObject_EnumFormatEtc_Proxy(IDataObject*,DWORD,IEnumFORMATETC**);
-void STDMETHODCALLTYPE IDataObject_EnumFormatEtc_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataObject_DAdvise_Proxy(IDataObject*,FORMATETC*,DWORD,IAdviseSink*,DWORD*);
-void STDMETHODCALLTYPE IDataObject_DAdvise_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataObject_DUnadvise_Proxy(IDataObject*,DWORD);
-void STDMETHODCALLTYPE IDataObject_DUnadvise_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataObject_EnumDAdvise_Proxy(IDataObject*,IEnumSTATDATA**);
-void STDMETHODCALLTYPE IDataObject_EnumDAdvise_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataObject_GetData_Proxy(IDataObject*,FORMATETC*,STGMEDIUM*);
-HRESULT STDMETHODCALLTYPE IDataObject_GetData_Stub(IDataObject*,FORMATETC*,RemSTGMEDIUM**);
-HRESULT STDMETHODCALLTYPE IDataObject_GetDataHere_Proxy(IDataObject*,FORMATETC*,STGMEDIUM*);
-HRESULT STDMETHODCALLTYPE IDataObject_GetDataHere_Stub(IDataObject*,FORMATETC*,RemSTGMEDIUM**);
-HRESULT STDMETHODCALLTYPE IDataObject_SetData_Proxy(IDataObject*,FORMATETC*,STGMEDIUM*,BOOL);
-HRESULT STDMETHODCALLTYPE IDataObject_SetData_Stub(IDataObject*,FORMATETC*,RemSTGMEDIUM*,BOOL);
-HRESULT STDMETHODCALLTYPE IDataAdviseHolder_Advise_Proxy(IDataAdviseHolder*,IDataObject*,FORMATETC*,DWORD,IAdviseSink*,DWORD*);
-void STDMETHODCALLTYPE IDataAdviseHolder_Advise_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataAdviseHolder_Unadvise_Proxy(IDataAdviseHolder*,DWORD);
-void STDMETHODCALLTYPE IDataAdviseHolder_Unadvise_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataAdviseHolder_EnumAdvise_Proxy(IDataAdviseHolder*,IEnumSTATDATA**);
-void STDMETHODCALLTYPE IDataAdviseHolder_EnumAdvise_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IDataAdviseHolder_SendOnDataChange_Proxy(IDataAdviseHolder*,IDataObject*,DWORD,DWORD);
-void STDMETHODCALLTYPE IDataAdviseHolder_SendOnDataChange_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-DWORD STDMETHODCALLTYPE IMessageFilter_HandleInComingCall_Proxy(IMessageFilter*,DWORD,HTASK,DWORD,LPINTERFACEINFO);
-void STDMETHODCALLTYPE IMessageFilter_HandleInComingCall_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-DWORD STDMETHODCALLTYPE IMessageFilter_RetryRejectedCall_Proxy(IMessageFilter*,HTASK,DWORD,DWORD);
-void STDMETHODCALLTYPE IMessageFilter_RetryRejectedCall_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-DWORD STDMETHODCALLTYPE IMessageFilter_MessagePending_Proxy(IMessageFilter*,HTASK,DWORD,DWORD);
-void STDMETHODCALLTYPE IMessageFilter_MessagePending_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRpcChannelBuffer_GetBuffer_Proxy(IRpcChannelBuffer*,RPCOLEMESSAGE*,REFIID);
-void STDMETHODCALLTYPE IRpcChannelBuffer_GetBuffer_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRpcChannelBuffer_SendReceive_Proxy(IRpcChannelBuffer*,RPCOLEMESSAGE*,ULONG*);
-void STDMETHODCALLTYPE IRpcChannelBuffer_SendReceive_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRpcChannelBuffer_FreeBuffer_Proxy(IRpcChannelBuffer*,RPCOLEMESSAGE*);
-void STDMETHODCALLTYPE IRpcChannelBuffer_FreeBuffer_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRpcChannelBuffer_GetDestCtx_Proxy(IRpcChannelBuffer*,DWORD*,void**);
-void STDMETHODCALLTYPE IRpcChannelBuffer_GetDestCtx_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRpcChannelBuffer_IsConnected_Proxy(IRpcChannelBuffer*);
-void STDMETHODCALLTYPE IRpcChannelBuffer_IsConnected_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRpcProxyBuffer_Connect_Proxy(IRpcProxyBuffer*,IRpcChannelBuffer*pRpcChannelBuffer);
-void STDMETHODCALLTYPE IRpcProxyBuffer_Connect_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IRpcProxyBuffer_Disconnect_Proxy(IRpcProxyBuffer*);
-void STDMETHODCALLTYPE IRpcProxyBuffer_Disconnect_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRpcStubBuffer_Connect_Proxy(IRpcStubBuffer*,IUnknown*);
-void STDMETHODCALLTYPE IRpcStubBuffer_Connect_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IRpcStubBuffer_Disconnect_Proxy(IRpcStubBuffer*);
-void STDMETHODCALLTYPE IRpcStubBuffer_Disconnect_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRpcStubBuffer_Invoke_Proxy(IRpcStubBuffer*,RPCOLEMESSAGE*,IRpcChannelBuffer*);
-void STDMETHODCALLTYPE IRpcStubBuffer_Invoke_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-IRpcStubBuffer*STDMETHODCALLTYPE IRpcStubBuffer_IsIIDSupported_Proxy(IRpcStubBuffer*,REFIID);
-void STDMETHODCALLTYPE IRpcStubBuffer_IsIIDSupported_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-ULONG STDMETHODCALLTYPE IRpcStubBuffer_CountRefs_Proxy(IRpcStubBuffer*);
-void STDMETHODCALLTYPE IRpcStubBuffer_CountRefs_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IRpcStubBuffer_DebugServerQueryInterface_Proxy(IRpcStubBuffer*,void**);
-void STDMETHODCALLTYPE IRpcStubBuffer_DebugServerQueryInterface_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE IRpcStubBuffer_DebugServerRelease_Proxy(IRpcStubBuffer*,void*);
-void STDMETHODCALLTYPE IRpcStubBuffer_DebugServerRelease_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPSFactoryBuffer_CreateProxy_Proxy(IPSFactoryBuffer*,IUnknown*,REFIID,IRpcProxyBuffer**,void**);
-void STDMETHODCALLTYPE IPSFactoryBuffer_CreateProxy_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IPSFactoryBuffer_CreateStub_Proxy(IPSFactoryBuffer*,REFIID,IUnknown*,IRpcStubBuffer**);
-void STDMETHODCALLTYPE IPSFactoryBuffer_CreateStub_Stub(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,PDWORD);
-void STDMETHODCALLTYPE SNB_to_xmit(SNB*,RemSNB**);
-void STDMETHODCALLTYPE SNB_from_xmit(RemSNB*,SNB*);
-void STDMETHODCALLTYPE SNB_free_inst(SNB*);
-void STDMETHODCALLTYPE SNB_free_xmit(RemSNB*);
-HRESULT STDMETHODCALLTYPE IEnumUnknown_Next_Proxy(IEnumUnknown*,ULONG,IUnknown**,ULONG*);
-HRESULT STDMETHODCALLTYPE IEnumUnknown_Next_Stub(IEnumUnknown*,ULONG,IUnknown**,ULONG*);
-HRESULT STDMETHODCALLTYPE IEnumMoniker_Next_Proxy(IEnumMoniker*,ULONG,IMoniker**,ULONG*);
-HRESULT STDMETHODCALLTYPE IEnumMoniker_Next_Stub(IEnumMoniker*,ULONG,IMoniker**,ULONG*);
-HRESULT STDMETHODCALLTYPE IMoniker_BindToObject_Proxy(IMoniker*,IBindCtx*,IMoniker*,REFIID,void**);
-HRESULT STDMETHODCALLTYPE IMoniker_BindToObject_Stub(IMoniker*,IBindCtx*,IMoniker*,REFIID,IUnknown**);
-HRESULT STDMETHODCALLTYPE IMoniker_BindToStorage_Proxy(IMoniker*,IBindCtx*,IMoniker*,REFIID,void**);
-HRESULT STDMETHODCALLTYPE IMoniker_BindToStorage_Stub(IMoniker*,IBindCtx*,IMoniker*,REFIID,IUnknown**);
-HRESULT STDMETHODCALLTYPE IEnumString_Next_Proxy(IEnumString*,ULONG,LPCSTR*,ULONG*);
-HRESULT STDMETHODCALLTYPE IEnumString_Next_Stub(IEnumString*,ULONG,LPCSTR*,ULONG*);
-HRESULT STDMETHODCALLTYPE IStream_Read_Proxy(IStream*,void*,ULONG,ULONG*);
-HRESULT STDMETHODCALLTYPE IStream_Read_Stub(IStream*,BYTE*,ULONG,ULONG*);
-HRESULT STDMETHODCALLTYPE IStream_Write_Proxy(IStream*,void*,ULONG,ULONG*);
-HRESULT STDMETHODCALLTYPE IStream_Write_Stub(IStream*,BYTE*,ULONG,ULONG*);
-HRESULT STDMETHODCALLTYPE IStream_Seek_Proxy(IStream*,LARGE_INTEGER,DWORD,ULARGE_INTEGER*);
-HRESULT STDMETHODCALLTYPE IStream_Seek_Stub(IStream*,LARGE_INTEGER,DWORD,ULARGE_INTEGER*);
-HRESULT STDMETHODCALLTYPE IStream_CopyTo_Proxy(IStream*,IStream*,ULARGE_INTEGER,ULARGE_INTEGER*,ULARGE_INTEGER*);
-HRESULT STDMETHODCALLTYPE IStream_CopyTo_Stub(IStream*,IStream*,ULARGE_INTEGER,ULARGE_INTEGER*,ULARGE_INTEGER*);
-HRESULT STDMETHODCALLTYPE IEnumSTATSTG_Next_Proxy(IEnumSTATSTG*,ULONG,STATSTG*,ULONG*);
-HRESULT STDMETHODCALLTYPE IEnumSTATSTG_Next_Stub(IEnumSTATSTG*,ULONG,STATSTG*,ULONG*);
-HRESULT STDMETHODCALLTYPE IStorage_OpenStream_Proxy(IStorage*,OLECHAR*,void*,DWORD,DWORD,IStream**);
-HRESULT STDMETHODCALLTYPE IStorage_OpenStream_Stub(IStorage*,OLECHAR*,unsigned long,BYTE*,DWORD,DWORD,IStream** );
-HRESULT STDMETHODCALLTYPE IStorage_EnumElements_Proxy(IStorage*,DWORD,void*,DWORD,IEnumSTATSTG**);
-HRESULT STDMETHODCALLTYPE IStorage_EnumElements_Stub(IStorage*,DWORD,unsigned long,BYTE*,DWORD,IEnumSTATSTG**);
-HRESULT STDMETHODCALLTYPE ILockBytes_ReadAt_Proxy(ILockBytes*,ULARGE_INTEGER,void*,ULONG,ULONG*);
-HRESULT STDMETHODCALLTYPE ILockBytes_ReadAt_Stub(ILockBytes*,ULARGE_INTEGER,BYTE*,ULONG,ULONG*);
-HRESULT STDMETHODCALLTYPE ILockBytes_WriteAt_Proxy(ILockBytes*,ULARGE_INTEGER,const void*,ULONG,ULONG*);
-HRESULT STDMETHODCALLTYPE ILockBytes_WriteAt_Stub(ILockBytes*,ULARGE_INTEGER,BYTE*,ULONG,ULONG*);
-
-#if (!defined (__cplusplus) || defined (CINTERFACE)) \
-    && defined (COBJMACROS)
-#define IMarshal_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
-#define IMarshal_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IMarshal_Release(This) (This)->lpVtbl->Release(This)
-#define IMarshal_GetUnmarshalClass(T,r,pv,dw,pvD,m,pC) (T)->lpVtbl->GetUnmarshalClass(T,r,pv,dw,pvD,m,pC)
-#define IMarshal_GetMarshalSizeMax(T,r,pv,dw,pD,m,p) (T)->lpVtbl->GetMarshalSizeMax(T,r,pv,dw,pD,m,p)
-#define IMarshal_MarshalInterface(T,p,r,pv,dw,pvD,m) (T)->lpVtbl->MarshalInterface(T,p,r,pv,dw,pv,m)
-#define IMarshal_UnmarshalInterface(T,p,r,pp) (T)->lpVtbl->UnmarshalInterface(T,p,r,pp)
-#define IMarshal_ReleaseMarshalData(T,p) (T)->lpVtbl->ReleaseMarshalData(T,p)
-#define IMarshal_DisconnectObject(T,d) (T)->lpVtbl->DisconnectObject(T,d)
-#define IMalloc_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IMalloc_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IMalloc_Release(This) (This)->lpVtbl->Release(This)
-#define IMalloc_Alloc(This,cb) (This)->lpVtbl->Alloc(This,cb)
-#define IMalloc_Realloc(This,pv,cb)	(This)->lpVtbl->Realloc(This,pv,cb)
-#define IMalloc_Free(This,pv) (This)->lpVtbl->Free(This,pv)
-#define IMalloc_GetSize(This,pv) (This)->lpVtbl->GetSize(This,pv)
-#define IMalloc_DidAlloc(This,pv) (This)->lpVtbl->DidAlloc(This,pv)
-#define IMalloc_HeapMinimize(This) (This)->lpVtbl->HeapMinimize(This)
-#define IMallocSpy_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
-#define IMallocSpy_AddRef(This)	(This)->lpVtbl->AddRef(This)
-#define IMallocSpy_Release(This) (This)->lpVtbl->Release(This)
-#define IMallocSpy_PreAlloc(T,c) (T)->lpVtbl->PreAlloc(T,c)
-#define IMallocSpy_PostAlloc(This,p) (This)->lpVtbl->PostAlloc(This,p)
-#define IMallocSpy_PreFree(This,p,f) (This)->lpVtbl->PreFree(This,p,f)
-#define IMallocSpy_PostFree(This,fSpyed) (This)->lpVtbl->PostFree(This,fSpyed)
-#define IMallocSpy_PreRealloc(T,p,c,pp,f) (T)->lpVtbl->PreRealloc(T,p,c,pp,f)
-#define IMallocSpy_PostRealloc(T,p,f) (T)->lpVtbl->PostRealloc(T,p,f)
-#define IMallocSpy_PreGetSize(This,p,f)	(This)->lpVtbl->PreGetSize(This,p,f)
-#define IMallocSpy_PostGetSize(This,cbActual,fSpyed) (This)->lpVtbl->PostGetSize(This,cbActual,fSpyed)
-#define IMallocSpy_PreDidAlloc(This,pRequest,fSpyed) (This)->lpVtbl->PreDidAlloc(This,pRequest,fSpyed)
-#define IMallocSpy_PostDidAlloc(This,pRequest,fSpyed,fActual) (This)->lpVtbl->PostDidAlloc(This,pRequest,fSpyed,fActual)
-#define IMallocSpy_PreHeapMinimize(T) (T)->lpVtbl->PreHeapMinimize(T)
-#define IMallocSpy_PostHeapMinimize(T) (T)->lpVtbl->PostHeapMinimize(T)
-#define IStdMarshalInfo_QueryInterface(T,r,p) (This)->lpVtbl->QueryInterface(T,r,p)
-#define IStdMarshalInfo_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IStdMarshalInfo_Release(This) (This)->lpVtbl->Release(This)
-#define IStdMarshalInfo_GetClassForHandler(This,D,p,C) (This)->lpVtbl->GetClassForHandler(This,D,p,C)
-#define IExternalConnection_QueryInterface(This,riid,ppvObject)	(This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IExternalConnection_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IExternalConnection_Release(This) (This)->lpVtbl->Release(This)
-#define IExternalConnection_AddConnection(T,e,r) (T)->lpVtbl->AddConnection(T,e,r)
-#define IExternalConnection_ReleaseConnection(This,e,r,f) (This)->lpVtbl->ReleaseConnection(This,e,r,f)
-#define IEnumUnknown_QueryInterface(T,r,p) (This)->lpVtbl->QueryInterface(T,r,p)
-#define IEnumUnknown_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IEnumUnknown_Release(This) (This)->lpVtbl->Release(This)
-#define IEnumUnknown_Next(This,celt,rgelt,p) (This)->lpVtbl->Next(This,celt,rgelt,p)
-#define IEnumUnknown_Skip(This,celt) (This)->lpVtbl->Skip(This,celt)
-#define IEnumUnknown_Reset(This) (This)->lpVtbl->Reset(This)
-#define IEnumUnknown_Clone(This,ppenum)	 (This)->lpVtbl->Clone(This,ppenum)
-#define IBindCtx_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
-#define IBindCtx_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IBindCtx_Release(This)	(This)->lpVtbl->Release(This)
-#define IBindCtx_RegisterObjectBound(T,p) (T)->lpVtbl->RegisterObjectBound(T,p)
-#define IBindCtx_RevokeObjectBound(T,p)	(T)->lpVtbl->RevokeObjectBound(T,p)
-#define IBindCtx_ReleaseBoundObjects(T) (T)->lpVtbl->ReleaseBoundObjects(T)
-#define IBindCtx_SetBindOptions(T,p) (T)->lpVtbl->SetBindOptions(T,p)
-#define IBindCtx_GetBindOptions(This,pbindopts)	(This)->lpVtbl->GetBindOptions(This,pbindopts)
-#define IBindCtx_GetRunningObjectTable(This,pprot) (This)->lpVtbl->GetRunningObjectTable(This,pprot)
-#define IBindCtx_RegisterObjectParam(This,pszKey,punk) (This)->lpVtbl->RegisterObjectParam(This,pszKey,punk)
-#define IBindCtx_GetObjectParam(This,pszKey,ppunk) (This)->lpVtbl->GetObjectParam(This,pszKey,ppunk)
-#define IBindCtx_EnumObjectParam(This,ppenum) (This)->lpVtbl->EnumObjectParam(This,ppenum)
-#define IBindCtx_RevokeObjectParam(This,pszKey)	(This)->lpVtbl->RevokeObjectParam(This,pszKey)
-#define IEnumMoniker_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
-#define IEnumMoniker_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IEnumMoniker_Release(This) (This)->lpVtbl->Release(This)
-#define IEnumMoniker_Next(This,celt,rgelt,pceltFetched)	(This)->lpVtbl->Next(This,celt,rgelt,pceltFetched)
-#define IEnumMoniker_Skip(This,celt) (This)->lpVtbl->Skip(This,celt)
-#define IEnumMoniker_Reset(This) (This)->lpVtbl->Reset(This)
-#define IEnumMoniker_Clone(This,ppenum) (This)->lpVtbl->Clone(This,ppenum)
-#define IRunnableObject_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IRunnableObject_AddRef(This)	(This)->lpVtbl->AddRef(This)
-#define IRunnableObject_Release(This)	(This)->lpVtbl->Release(This)
-#define IRunnableObject_GetRunningClass(This,lpClsid)	(This)->lpVtbl->GetRunningClass(This,lpClsid)
-#define IRunnableObject_Run(This,pbc)	(This)->lpVtbl->Run(This,pbc)
-#define IRunnableObject_IsRunning(This)	(This)->lpVtbl->IsRunning(This)
-#define IRunnableObject_LockRunning(This,fLock,fLastUnlockCloses) (This)->lpVtbl->LockRunning(This,fLock,fLastUnlockCloses)
-#define IRunnableObject_SetContainedObject(This,fContained) (This)->lpVtbl->SetContainedObject(This,fContained)
-#define IRunningObjectTable_QueryInterface(This,riid,ppvObject)	(This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IRunningObjectTable_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IRunningObjectTable_Release(This) (This)->lpVtbl->Release(This)
-#define IRunningObjectTable_Register(This,grfFlags,punkObject,pmkObjectName,pdwRegister) (This)->lpVtbl->Register(This,grfFlags,punkObject,pmkObjectName,pdwRegister)
-#define IRunningObjectTable_Revoke(This,dwRegister) (This)->lpVtbl->Revoke(This,dwRegister)
-#define IRunningObjectTable_IsRunning(This,pmkObjectName) (This)->lpVtbl->IsRunning(This,pmkObjectName)
-#define IRunningObjectTable_GetObject(This,pmkObjectName,ppunkObject) (This)->lpVtbl->GetObject(This,pmkObjectName,ppunkObject)
-#define IRunningObjectTable_NoteChangeTime(This,dwRegister,pfiletime) (This)->lpVtbl->NoteChangeTime(This,dwRegister,pfiletime)
-#define IRunningObjectTable_GetTimeOfLastChange(This,pmkObjectName,pfiletime) (This)->lpVtbl->GetTimeOfLastChange(This,pmkObjectName,pfiletime)
-#define IRunningObjectTable_EnumRunning(This,ppenumMoniker) (This)->lpVtbl->EnumRunning(This,ppenumMoniker)
-#define IPersist_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
-#define IPersist_AddRef(This)	(This)->lpVtbl->AddRef(This)
-#define IPersist_Release(This)	(This)->lpVtbl->Release(This)
-#define IPersist_GetClassID(This,pClassID) (This)->lpVtbl->GetClassID(This,pClassID)
-#define IPersistStream_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
-#define IPersistStream_AddRef(This)	(This)->lpVtbl->AddRef(This)
-#define IPersistStream_Release(This)	(This)->lpVtbl->Release(This)
-#define IPersistStream_GetClassID(T,p) (T)->lpVtbl->GetClassID(T,p)
-#define IPersistStream_IsDirty(This)	(This)->lpVtbl->IsDirty(This)
-#define IPersistStream_Load(This,pStm)	(This)->lpVtbl->Load(This,pStm)
-#define IPersistStream_Save(T,p,f) (T)->lpVtbl->Save(T,p,f)
-#define IPersistStream_GetSizeMax(T,p) (T)->lpVtbl->GetSizeMax(T,p)
-#define IMoniker_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IMoniker_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IMoniker_Release(This)	(This)->lpVtbl->Release(This)
-#define IMoniker_GetClassID(This,pClassID) (This)->lpVtbl->GetClassID(This,pClassID)
-#define IMoniker_IsDirty(This)	(This)->lpVtbl->IsDirty(This)
-#define IMoniker_Load(This,pStm) (This)->lpVtbl->Load(This,pStm)
-#define IMoniker_Save(This,pStm,fClearDirty) (This)->lpVtbl->Save(This,pStm,fClearDirty)
-#define IMoniker_GetSizeMax(This,pcbSize) (This)->lpVtbl->GetSizeMax(This,pcbSize)
-#define IMoniker_BindToObject(T,p,pm,r,pp) (T)->lpVtbl->BindToObject(T,p,pm,r,pp)
-#define IMoniker_BindToStorage(This,pbc,pmkToLeft,riid,ppvObj) (This)->lpVtbl->BindToStorage(This,pbc,pmkToLeft,riid,ppvObj)
-#define IMoniker_Reduce(This,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced)	(This)->lpVtbl->Reduce(This,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced)
-#define IMoniker_ComposeWith(This,pmkRight,fOnlyIfNotGeneric,ppmkComposite) (This)->lpVtbl->ComposeWith(This,pmkRight,fOnlyIfNotGeneric,ppmkComposite)
-#define IMoniker_Enum(T,f,pp) (T)->lpVtbl->Enum(T,f,pp)
-#define IMoniker_IsEqual(This,p) (This)->lpVtbl->IsEqual(This,p)
-#define IMoniker_Hash(This,pdwHash) (This)->lpVtbl->Hash(This,pdwHash)
-#define IMoniker_IsRunning(T,pbc,Left,N) (T)->lpVtbl->IsRunning(T,pbc,Left,N)
-#define IMoniker_GetTimeOfLastChange(This,pbc,pmkToLeft,pFileTime) (This)->lpVtbl->GetTimeOfLastChange(This,pbc,pmkToLeft,pFileTime)
-#define IMoniker_Inverse(This,ppmk) (This)->lpVtbl->Inverse(This,ppmk)
-#define IMoniker_CommonPrefixWith(This,pmkOther,ppmkPrefix) (This)->lpVtbl->CommonPrefixWith(This,pmkOther,ppmkPrefix)
-#define IMoniker_RelativePathTo(This,pmkOther,ppmkRelPath) (This)->lpVtbl->RelativePathTo(This,pmkOther,ppmkRelPath)
-#define IMoniker_GetDisplayName(This,pbc,pmkToLeft,ppszDisplayName) (This)->lpVtbl->GetDisplayName(This,pbc,pmkToLeft,ppszDisplayName)
-#define IMoniker_ParseDisplayName(This,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut) (This)->lpVtbl->ParseDisplayName(This,pbc,pmkToLeft,pszDisplayName,pchEaten,ppmkOut)
-#define IMoniker_IsSystemMoniker(This,pdwMksys)	(This)->lpVtbl->IsSystemMoniker(This,pdwMksys)
-#define IROTData_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IROTData_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IROTData_Release(This) (This)->lpVtbl->Release(This)
-#define IROTData_GetComparisonData(This,pbData,cbMax,pcbData) (This)->lpVtbl->GetComparisonData(This,pbData,cbMax,pcbData)
-#define IEnumString_QueryInterface(This,riid,ppvObject)	(This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IEnumString_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IEnumString_Release(This) (This)->lpVtbl->Release(This)
-#define IEnumString_Next(This,celt,rgelt,pceltFetched) (This)->lpVtbl->Next(This,celt,rgelt,pceltFetched)
-#define IEnumString_Skip(This,celt) (This)->lpVtbl->Skip(This,celt)
-#define IEnumString_Reset(This)	(This)->lpVtbl->Reset(This)
-#define IEnumString_Clone(This,ppenum) (This)->lpVtbl->Clone(This,ppenum)
-#define IStream_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IStream_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IStream_Release(This) (This)->lpVtbl->Release(This)
-#define IStream_Read(This,pv,cb,pcbRead) (This)->lpVtbl->Read(This,pv,cb,pcbRead)
-#define IStream_Write(This,pv,cb,pcbWritten) (This)->lpVtbl->Write(This,pv,cb,pcbWritten)
-#define IStream_Seek(This,dlibMove,dwOrigin,plibNewPosition) (This)->lpVtbl->Seek(This,dlibMove,dwOrigin,plibNewPosition)
-#define IStream_SetSize(This,libNewSize) (This)->lpVtbl->SetSize(This,libNewSize)
-#define IStream_CopyTo(This,pstm,cb,pcbRead,pcbWritten)	(This)->lpVtbl->CopyTo(This,pstm,cb,pcbRead,pcbWritten)
-#define IStream_Commit(This,grfCommitFlags) (This)->lpVtbl->Commit(This,grfCommitFlags)
-#define IStream_Revert(This) (This)->lpVtbl->Revert(This)
-#define IStream_LockRegion(This,libOffset,cb,dwLockType) (This)->lpVtbl->LockRegion(This,libOffset,cb,dwLockType)
-#define IStream_UnlockRegion(This,libOffset,cb,dwLockType) (This)->lpVtbl->UnlockRegion(This,libOffset,cb,dwLockType)
-#define IStream_Stat(This,pstatstg,grfStatFlag)	(This)->lpVtbl->Stat(This,pstatstg,grfStatFlag)
-#define IStream_Clone(This,ppstm) (This)->lpVtbl->Clone(This,ppstm)
-#define IEnumSTATSTG_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
-#define IEnumSTATSTG_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IEnumSTATSTG_Release(This) (This)->lpVtbl->Release(This)
-#define IEnumSTATSTG_Next(T,c,r,p) (T)->lpVtbl->Next(T,c,r,p)
-#define IEnumSTATSTG_Skip(This,celt)	(This)->lpVtbl->Skip(This,celt)
-#define IEnumSTATSTG_Reset(This) (This)->lpVtbl->Reset(This)
-#define IEnumSTATSTG_Clone(This,ppenum)	 (This)->lpVtbl->Clone(This,ppenum)
-#define IStorage_QueryInterface(T,r,p) (T)->lpVtbl->QueryInterface(T,r,p)
-#define IStorage_AddRef(This)	 (This)->lpVtbl->AddRef(This)
-#define IStorage_Release(This)	 (This)->lpVtbl->Release(This)
-#define IStorage_CreateStream(T,p,g,r1,r2,pp) (T)->lpVtbl->CreateStream(T,p,g,r1,r2,pp)
-#define IStorage_OpenStream(T,p,r1,g,r2,pp) (T)->lpVtbl->OpenStream(T,p,r1,g,r2,pp)
-#define IStorage_CreateStorage(T,p,g,d,r2,pp) (This)->lpVtbl->CreateStorage(T,p,g,d,r2,pp)
-#define IStorage_OpenStorage(This,pwcsName,pstgPriority,grfMode,snbExclude,reserved,ppstg) (This)->lpVtbl->OpenStorage(This,pwcsName,pstgPriority,grfMode,snbExclude,reserved,ppstg)
-#define IStorage_CopyTo(This,ciidExclude,rgiidExclude,snbExclude,pstgDest) (This)->lpVtbl->CopyTo(This,ciidExclude,rgiidExclude,snbExclude,pstgDest)
-#define IStorage_MoveElementTo(This,pwcsName,pstgDest,pwcsNewName,grfFlags) (This)->lpVtbl->MoveElementTo(This,pwcsName,pstgDest,pwcsNewName,grfFlags)
-#define IStorage_Commit(This,g) (This)->lpVtbl->Commit(This,g)
-#define IStorage_Revert(This) (This)->lpVtbl->Revert(This)
-#define IStorage_EnumElements(This,reserved1,reserved2,reserved3,ppenum) (This)->lpVtbl->EnumElements(This,reserved1,reserved2,reserved3,ppenum)
-#define IStorage_DestroyElement(This,pwcsName)	(This)->lpVtbl->DestroyElement(This,pwcsName)
-#define IStorage_RenameElement(This,pwcsOldName,pwcsNewName) (This)->lpVtbl->RenameElement(This,pwcsOldName,pwcsNewName)
-#define IStorage_SetElementTimes(This,pwcsName,pctime,patime,pmtime) (This)->lpVtbl->SetElementTimes(This,pwcsName,pctime,patime,pmtime)
-#define IStorage_SetClass(This,clsid) (This)->lpVtbl->SetClass(This,clsid)
-#define IStorage_SetStateBits(This,grfStateBits,grfMask) (This)->lpVtbl->SetStateBits(This,grfStateBits,grfMask)
-#define IStorage_Stat(This,p,g) (This)->lpVtbl->Stat(This,p,g)
-#define IPersistFile_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IPersistFile_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IPersistFile_Release(This) (This)->lpVtbl->Release(This)
-#define IPersistFile_GetClassID(This,pClassID)	(This)->lpVtbl->GetClassID(This,pClassID)
-#define IPersistFile_IsDirty(This) (This)->lpVtbl->IsDirty(This)
-#define IPersistFile_Load(This,pszFileName,dwMode) (This)->lpVtbl->Load(This,pszFileName,dwMode)
-#define IPersistFile_Save(This,pszFileName,fRemember) (This)->lpVtbl->Save(This,pszFileName,fRemember)
-#define IPersistFile_SaveCompleted(This,pszFileName) (This)->lpVtbl->SaveCompleted(This,pszFileName)
-#define IPersistFile_GetCurFile(This,ppszFileName) (This)->lpVtbl->GetCurFile(This,ppszFileName)
-#define IPersistStorage_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IPersistStorage_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IPersistStorage_Release(This) (This)->lpVtbl->Release(This)
-#define IPersistStorage_GetClassID(This,pClassID) (This)->lpVtbl->GetClassID(This,pClassID)
-#define IPersistStorage_IsDirty(This) (This)->lpVtbl->IsDirty(This)
-#define IPersistStorage_InitNew(This,pStg) (This)->lpVtbl->InitNew(This,pStg)
-#define IPersistStorage_Load(This,pStg)	(This)->lpVtbl->Load(This,pStg)
-#define IPersistStorage_Save(This,pStgSave,fSameAsLoad)	(This)->lpVtbl->Save(This,pStgSave,fSameAsLoad)
-#define IPersistStorage_SaveCompleted(This,pStgNew) (This)->lpVtbl->SaveCompleted(This,pStgNew)
-#define IPersistStorage_HandsOffStorage(This) (This)->lpVtbl->HandsOffStorage(This)
-#define ILockBytes_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define ILockBytes_AddRef(This)	(This)->lpVtbl->AddRef(This)
-#define ILockBytes_Release(This) (This)->lpVtbl->Release(This)
-#define ILockBytes_ReadAt(This,ulOffset,pv,cb,pcbRead) (This)->lpVtbl->ReadAt(This,ulOffset,pv,cb,pcbRead)
-#define ILockBytes_WriteAt(This,ulOffset,pv,cb,pcbWritten) (This)->lpVtbl->WriteAt(This,ulOffset,pv,cb,pcbWritten)
-#define ILockBytes_Flush(This) (This)->lpVtbl->Flush(This)
-#define ILockBytes_SetSize(This,cb) (This)->lpVtbl->SetSize(This,cb)
-#define ILockBytes_LockRegion(This,libOffset,cb,dwLockType) (This)->lpVtbl->LockRegion(This,libOffset,cb,dwLockType)
-#define ILockBytes_UnlockRegion(This,libOffset,cb,dwLockType) (This)->lpVtbl->UnlockRegion(This,libOffset,cb,dwLockType)
-#define ILockBytes_Stat(This,pstatstg,grfStatFlag) (This)->lpVtbl->Stat(This,pstatstg,grfStatFlag)
-#define IEnumFORMATETC_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IEnumFORMATETC_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IEnumFORMATETC_Release(This) (This)->lpVtbl->Release(This)
-#define IEnumFORMATETC_Next(This,celt,rgelt,pceltFetched) (This)->lpVtbl->Next(This,celt,rgelt,pceltFetched)
-#define IEnumFORMATETC_Skip(This,celt) (This)->lpVtbl->Skip(This,celt)
-#define IEnumFORMATETC_Reset(This) (This)->lpVtbl->Reset(This)
-#define IEnumFORMATETC_Clone(This,ppenum) (This)->lpVtbl->Clone(This,ppenum)
-#define IEnumSTATDATA_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IEnumSTATDATA_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IEnumSTATDATA_Release(This) (This)->lpVtbl->Release(This)
-#define IEnumSTATDATA_Next(This,celt,rgelt,pceltFetched) (This)->lpVtbl->Next(This,celt,rgelt,pceltFetched)
-#define IEnumSTATDATA_Skip(This,celt) (This)->lpVtbl->Skip(This,celt)
-#define IEnumSTATDATA_Reset(This) (This)->lpVtbl->Reset(This)
-#define IEnumSTATDATA_Clone(This,ppenum) (This)->lpVtbl->Clone(This,ppenum)
-#define IRootStorage_QueryInterface(T,r,O) (T)->lpVtbl->QueryInterface(T,r,O)
-#define IRootStorage_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IRootStorage_Release(This)	 (This)->lpVtbl->Release(This)
-#define IRootStorage_SwitchToFile(This,pszFile)	 (This)->lpVtbl->SwitchToFile(This,pszFile)
-#define IAdviseSink_QueryInterface(This,riid,ppvObject)	(This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IAdviseSink_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IAdviseSink_Release(This) (This)->lpVtbl->Release(This)
-#define IAdviseSink_OnDataChange(This,pFormatetc,pStgmed) (This)->lpVtbl->OnDataChange(This,pFormatetc,pStgmed)
-#define IAdviseSink_OnViewChange(This,dwAspect,lindex) (This)->lpVtbl->OnViewChange(This,dwAspect,lindex)
-#define IAdviseSink_OnRename(This,pmk) (This)->lpVtbl->OnRename(This,pmk)
-#define IAdviseSink_OnSave(This) (This)->lpVtbl->OnSave(This)
-#define IAdviseSink_OnClose(This) (This)->lpVtbl->OnClose(This)
-#define IAdviseSink2_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IAdviseSink2_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IAdviseSink2_Release(This) (This)->lpVtbl->Release(This)
-#define IAdviseSink2_OnDataChange(This,pFormatetc,pStgmed) (This)->lpVtbl->OnDataChange(This,pFormatetc,pStgmed)
-#define IAdviseSink2_OnViewChange(This,dwAspect,lindex)	(This)->lpVtbl->OnViewChange(This,dwAspect,lindex)
-#define IAdviseSink2_OnRename(This,pmk)	(This)->lpVtbl->OnRename(This,pmk)
-#define IAdviseSink2_OnSave(This) (This)->lpVtbl->OnSave(This)
-#define IAdviseSink2_OnClose(This) (This)->lpVtbl->OnClose(This)
-#define IAdviseSink2_OnLinkSrcChange(This,pmk) (This)->lpVtbl->OnLinkSrcChange(This,pmk)
-#define IDataObject_QueryInterface(This,riid,ppvObject)	(This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IDataObject_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IDataObject_Release(This) (This)->lpVtbl->Release(This)
-#define IDataObject_GetData(This,pformatetcIn,pmedium) (This)->lpVtbl->GetData(This,pformatetcIn,pmedium)
-#define IDataObject_GetDataHere(This,pformatetc,pmedium) (This)->lpVtbl->GetDataHere(This,pformatetc,pmedium)
-#define IDataObject_QueryGetData(This,pformatetc) (This)->lpVtbl->QueryGetData(This,pformatetc)
-#define IDataObject_GetCanonicalFormatEtc(This,pformatectIn,pformatetcOut) (This)->lpVtbl->GetCanonicalFormatEtc(This,pformatectIn,pformatetcOut)
-#define IDataObject_SetData(This,pformatetc,pmedium,fRelease) (This)->lpVtbl->SetData(This,pformatetc,pmedium,fRelease)
-#define IDataObject_EnumFormatEtc(This,dwDirection,ppenumFormatEtc) (This)->lpVtbl->EnumFormatEtc(This,dwDirection,ppenumFormatEtc)
-#define IDataObject_DAdvise(This,pformatetc,advf,pAdvSink,pdwConnection) (This)->lpVtbl->DAdvise(This,pformatetc,advf,pAdvSink,pdwConnection)
-#define IDataObject_DUnadvise(This,dwConnection) (This)->lpVtbl->DUnadvise(This,dwConnection)
-#define IDataObject_EnumDAdvise(This,ppenumAdvise) (This)->lpVtbl->EnumDAdvise(This,ppenumAdvise)
-#define IDataAdviseHolder_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IDataAdviseHolder_AddRef(This)	(This)->lpVtbl->AddRef(This)
-#define IDataAdviseHolder_Release(This)	(This)->lpVtbl->Release(This)
-#define IDataAdviseHolder_Advise(This,pDataObject,pFetc,advf,pAdvise,pdwConnection) (This)->lpVtbl->Advise(This,pDataObject,pFetc,advf,pAdvise,pdwConnection)
-#define IDataAdviseHolder_Unadvise(This,dwConnection) (This)->lpVtbl->Unadvise(This,dwConnection)
-#define IDataAdviseHolder_EnumAdvise(This,ppenumAdvise)	(This)->lpVtbl->EnumAdvise(This,ppenumAdvise)
-#define IDataAdviseHolder_SendOnDataChange(This,pDataObject,dwReserved,advf) (This)->lpVtbl->SendOnDataChange(This,pDataObject,dwReserved,advf)
-#define IMessageFilter_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IMessageFilter_AddRef(This)	 (This)->lpVtbl->AddRef(This)
-#define IMessageFilter_Release(This)	 (This)->lpVtbl->Release(This)
-#define IMessageFilter_HandleInComingCall(T,d,h,dw,lp) (T)->lpVtbl->HandleInComingCall(T,d,h,dw,lp)
-#define IMessageFilter_RetryRejectedCall(s,C,T,R) (s)->lpVtbl->RetryRejectedCall(s,C,T,R)
-#define IMessageFilter_MessagePending(s,C,T,P) (s)->lpVtbl->MessagePending(This,C,T,P)
-#define IRpcChannelBuffer_QueryInterface(T,r,p)	(T)->lpVtbl->QueryInterface(T,r,p)
-#define IRpcChannelBuffer_AddRef(This)	(This)->lpVtbl->AddRef(This)
-#define IRpcChannelBuffer_Release(This)	(This)->lpVtbl->Release(This)
-#define IRpcChannelBuffer_GetBuffer(This,pMessage,riid)	(This)->lpVtbl->GetBuffer(This,pMessage,riid)
-#define IRpcChannelBuffer_SendReceive(T,p,pS) (T)->lpVtbl->SendReceive(T,p,pS)
-#define IRpcChannelBuffer_FreeBuffer(T,p) (T)->lpVtbl->FreeBuffer(T,p)
-#define IRpcChannelBuffer_GetDestCtx(This,pdwDestContext,ppvDestContext) (This)->lpVtbl->GetDestCtx(This,pdwDestContext,ppvDestContext)
-#define IRpcChannelBuffer_IsConnected(This) (This)->lpVtbl->IsConnected(This)
-#define IRpcProxyBuffer_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IRpcProxyBuffer_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IRpcProxyBuffer_Release(This) (This)->lpVtbl->Release(This)
-#define IRpcProxyBuffer_Connect(This,pRpcChannelBuffer)	(This)->lpVtbl->Connect(This,pRpcChannelBuffer)
-#define IRpcProxyBuffer_Disconnect(This) (This)->lpVtbl->Disconnect(This)
-#define IRpcStubBuffer_QueryInterface(T,r,pp) (T)->lpVtbl->QueryInterface(T,r,pp)
-#define IRpcStubBuffer_AddRef(This) (This)->lpVtbl->AddRef(This)
-#define IRpcStubBuffer_Release(This)	(This)->lpVtbl->Release(This)
-#define IRpcStubBuffer_Connect(This,p)	 (This)->lpVtbl->Connect(This,p)
-#define IRpcStubBuffer_Disconnect(This)	 (This)->lpVtbl->Disconnect(This)
-#define IRpcStubBuffer_Invoke(T,_prpcmsg,_p)	 (T)->lpVtbl->Invoke(This,_prpcmsg,_p)
-#define IRpcStubBuffer_IsIIDSupported(T,d) (T)->lpVtbl->IsIIDSupported(T,d)
-#define IRpcStubBuffer_CountRefs(This)	 (This)->lpVtbl->CountRefs(This)
-#define IRpcStubBuffer_DebugServerQueryInterface(T,p) (T)->lpVtbl->DebugServerQueryInterface(T,p)
-#define IRpcStubBuffer_DebugServerRelease(T,p) (T)->lpVtbl->DebugServerRelease(T,p)
-#define IPSFactoryBuffer_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)
-#define IPSFactoryBuffer_AddRef(This)	(This)->lpVtbl->AddRef(This)
-#define IPSFactoryBuffer_Release(This)	(This)->lpVtbl->Release(This)
-#define IPSFactoryBuffer_CreateProxy(T,U,r,P,p) (T)->lpVtbl->CreateProxy(T,U,r,P,p)
-#define IPSFactoryBuffer_CreateStub(T,r,U,p) (T)->lpVtbl->CreateStub(T,r,U,p)
-#endif /* COBJMACROS */
-
-#endif
diff --git a/winsup/w32api/include/ocidl.h b/winsup/w32api/include/ocidl.h
deleted file mode 100644
index d856b48fe..000000000
--- a/winsup/w32api/include/ocidl.h
+++ /dev/null
@@ -1,547 +0,0 @@
-#ifndef _OCIDL_H
-#define _OCIDL_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ole2.h>
-
-typedef interface IErrorLog *LPERRORLOG;
-typedef interface IPropertyBag *LPPROPERTYBAG;
-typedef interface IEnumConnections *LPENUMCONNECTIONS;
-typedef interface IConnectionPoint *LPCONNECTIONPOINT;
-typedef interface IEnumConnectionPoints *LPENUMCONNECTIONPOINTS;
-typedef interface IPropertyPageSite *LPPROPERTYPAGESITE;
-typedef interface IFont *LPFONT;
-typedef interface IFontDisp *LPFONTDISP;
-
-#ifndef OLE2ANSI
-typedef TEXTMETRICW TEXTMETRICOLE;
-#else
-typedef TEXTMETRIC TEXTMETRICOLE;
-#endif
-typedef TEXTMETRICOLE *LPTEXTMETRICOLE;
-typedef DWORD OLE_COLOR;
-typedef UINT OLE_HANDLE;
-typedef long OLE_XPOS_HIMETRIC;
-typedef long OLE_YPOS_HIMETRIC;
-typedef long OLE_XSIZE_HIMETRIC;
-typedef long OLE_YSIZE_HIMETRIC;
-
-typedef enum tagREADYSTATE {
-	READYSTATE_UNINITIALIZED = 0,
-	READYSTATE_LOADING = 1,
-	READYSTATE_LOADED = 2,
-	READYSTATE_INTERACTIVE = 3,
-	READYSTATE_COMPLETE = 4
-} READYSTATE;
-typedef struct tagPOINTF {
-	float x;
-	float y;
-} POINTF,*LPPOINTF;
-typedef struct tagCONTROLINFO {
-	ULONG cb;
-	HACCEL hAccel;
-	USHORT cAccel;
-	DWORD dwFlags;
-} CONTROLINFO,*LPCONTROLINFO;
-typedef struct tagCONNECTDATA {
-	LPUNKNOWN pUnk;
-	DWORD dwCookie;
-} CONNECTDATA,*LPCONNECTDATA;
-typedef struct tagLICINFO {
-	long cbLicInfo;
-	BOOL fRuntimeKeyAvail;
-	BOOL fLicVerified;
-} LICINFO,*LPLICINFO;
-typedef struct tagCAUUID {
-	ULONG cElems;
-	GUID *pElems;
-} CAUUID,*LPCAUUID;
-typedef struct tagCALPOLESTR {
-	ULONG cElems;
-	LPOLESTR *pElems;
-} CALPOLESTR,*LPCALPOLESTR;
-typedef struct tagCADWORD {
-	ULONG cElems;
-	DWORD *pElems;
-} CADWORD,*LPCADWORD;
-typedef struct tagPROPPAGEINFO {
-	ULONG cb;
-	LPOLESTR pszTitle;
-	SIZE size;
-	LPOLESTR pszDocString;
-	LPOLESTR pszHelpFile;
-	DWORD dwHelpContext;
-} PROPPAGEINFO,*LPPROPPAGEINFO;
-
-EXTERN_C const IID IID_IOleControl;
-#undef INTERFACE
-#define INTERFACE IOleControl
-DECLARE_INTERFACE_(IOleControl,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetControlInfo)(THIS_ LPCONTROLINFO) PURE;
-	STDMETHOD(OnMnemonic)(THIS_ LPMSG) PURE;
-	STDMETHOD(OnAmbientPropertyChange)(THIS_ DISPID) PURE;
-	STDMETHOD(FreezeEvents)(THIS_ BOOL) PURE;
-};
-
-EXTERN_C const IID IID_IOleControlSite;
-#undef INTERFACE
-#define INTERFACE IOleControlSite
-DECLARE_INTERFACE_(IOleControlSite,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(OnControlInfoChanged)(THIS) PURE;
-	STDMETHOD(LockInPlaceActive)(THIS_ BOOL) PURE;
-	STDMETHOD(GetExtendedControl)(THIS_ LPDISPATCH*) PURE;
-	STDMETHOD(TransformCoords)(THIS_ POINTL*,POINTF*,DWORD) PURE;
-	STDMETHOD(TranslateAccelerator)(THIS_ LPMSG,DWORD) PURE;
-	STDMETHOD(OnFocus)(THIS_ BOOL) PURE;
-	STDMETHOD(ShowPropertyFrame)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_ISimpleFrameSite;
-#undef INTERFACE
-#define INTERFACE ISimpleFrameSite
-DECLARE_INTERFACE_(ISimpleFrameSite,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(PreMessageFilter)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT*,PDWORD) PURE;
-	STDMETHOD(PostMessageFilter)(THIS_ HWND,UINT,WPARAM,LPARAM,LRESULT*,DWORD) PURE;
-};
-
-EXTERN_C const IID IID_IErrorLog;
-#undef INTERFACE
-#define INTERFACE IErrorLog
-DECLARE_INTERFACE_(IErrorLog,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(AddError)(THIS_ LPCOLESTR,LPEXCEPINFO) PURE;
-};
-
-EXTERN_C const IID IID_IPropertyBag;
-#undef INTERFACE
-#define INTERFACE IPropertyBag
-DECLARE_INTERFACE_(IPropertyBag,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Read)(THIS_ LPCOLESTR,LPVARIANT,LPERRORLOG) PURE;
-	STDMETHOD(Write)(THIS_ LPCOLESTR,LPVARIANT) PURE;
-};
-
-EXTERN_C const IID IID_IPersistPropertyBag;
-#undef INTERFACE
-#define INTERFACE IPersistPropertyBag
-DECLARE_INTERFACE_(IPersistPropertyBag,IPersist)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
-	STDMETHOD(InitNew)(THIS) PURE;
-	STDMETHOD(Load)(THIS_ LPPROPERTYBAG,LPERRORLOG) PURE;
-	STDMETHOD(Save)(THIS_ LPPROPERTYBAG,BOOL,BOOL) PURE;
-};
-
-EXTERN_C const IID IID_IPersistStreamInit;
-#undef INTERFACE
-#define INTERFACE IPersistStreamInit
-DECLARE_INTERFACE_(IPersistStreamInit,IPersist)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
-	STDMETHOD(IsDirty)(THIS) PURE;
-	STDMETHOD(Load)(THIS_ LPSTREAM) PURE;
-	STDMETHOD(Save)(THIS_ LPSTREAM,BOOL) PURE;
-	STDMETHOD(GetSizeMax)(THIS_ PULARGE_INTEGER) PURE;
-	STDMETHOD(InitNew)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IPersistMemory;
-#undef INTERFACE
-#define INTERFACE IPersistMemory
-DECLARE_INTERFACE_(IPersistMemory,IPersist)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassID)(THIS_ LPCLSID) PURE;
-	STDMETHOD(IsDirty)(THIS) PURE;
-	STDMETHOD(Load)(THIS_ PVOID,ULONG) PURE;
-	STDMETHOD(Save)(THIS_ PVOID,BOOL,ULONG) PURE;
-	STDMETHOD(GetSizeMax)(THIS_ PULONG) PURE;
-	STDMETHOD(InitNew)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IPropertyNotifySink;
-#undef INTERFACE
-#define INTERFACE IPropertyNotifySink
-DECLARE_INTERFACE_(IPropertyNotifySink,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(OnChanged)(THIS_ DISPID) PURE;
-	STDMETHOD(OnRequestEdit)(THIS_ DISPID) PURE;
-};
-
-EXTERN_C const IID IID_IProvideClassInfo;
-#undef INTERFACE
-#define INTERFACE IProvideClassInfo
-DECLARE_INTERFACE_(IProvideClassInfo,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassInfo)(THIS_ LPTYPEINFO*) PURE;
-};
-
-EXTERN_C const IID IID_IProvideClassInfo2;
-#undef INTERFACE
-#define INTERFACE IProvideClassInfo2
-DECLARE_INTERFACE_(IProvideClassInfo2,IProvideClassInfo)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassInfo)(THIS_ LPTYPEINFO*) PURE;
-	STDMETHOD(GetGUID)(THIS_ DWORD,GUID*) PURE;
-};
-
-EXTERN_C const IID IID_IConnectionPointContainer;
-#undef INTERFACE
-#define INTERFACE IConnectionPointContainer
-DECLARE_INTERFACE_(IConnectionPointContainer,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(EnumConnectionPoints)(THIS_ LPENUMCONNECTIONPOINTS*) PURE;
-	STDMETHOD(FindConnectionPoint)(THIS_ REFIID,LPCONNECTIONPOINT*) PURE;
-};
-
-EXTERN_C const IID IID_IEnumConnectionPoints;
-#undef INTERFACE
-#define INTERFACE IEnumConnectionPoints
-DECLARE_INTERFACE_(IEnumConnectionPoints,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Next)(THIS_ ULONG,LPCONNECTIONPOINT*,ULONG*) PURE;
-	STDMETHOD(Skip)(THIS_ ULONG) PURE;
-	STDMETHOD(Reset)(THIS) PURE;
-	STDMETHOD(Clone)(THIS_ LPENUMCONNECTIONPOINTS*) PURE;
-};
-
-EXTERN_C const IID IID_IConnectionPoint;
-#undef INTERFACE
-#define INTERFACE IConnectionPoint
-DECLARE_INTERFACE_(IConnectionPoint,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetConnectionInterface)(THIS_ IID*) PURE;
-	STDMETHOD(GetConnectionPointContainer)(THIS_ IConnectionPointContainer**) PURE;
-	STDMETHOD(Advise)(THIS_ LPUNKNOWN,PDWORD) PURE;
-	STDMETHOD(Unadvise)(THIS_ DWORD) PURE;
-	STDMETHOD(EnumConnections)(THIS_ LPENUMCONNECTIONS*) PURE;
-};
-
-EXTERN_C const IID IID_IEnumConnections;
-#undef INTERFACE
-#define INTERFACE IEnumConnections
-DECLARE_INTERFACE_(IEnumConnections,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Next)(THIS_ ULONG,LPCONNECTDATA,PULONG) PURE;
-	STDMETHOD(Skip)(THIS_ ULONG) PURE;
-	STDMETHOD(Reset)(THIS) PURE;
-	STDMETHOD(Clone)(THIS_ LPENUMCONNECTIONS*) PURE;
-};
-
-EXTERN_C const IID IID_IClassFactory2;
-#undef INTERFACE
-#define INTERFACE IClassFactory2
-DECLARE_INTERFACE_(IClassFactory2,IClassFactory)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(CreateInstance)(THIS_ LPUNKNOWN,REFIID,PVOID*) PURE;
-	STDMETHOD(LockServer)(THIS_ BOOL) PURE;
-	STDMETHOD(GetLicInfo)(THIS_ LPLICINFO) PURE;
-	STDMETHOD(RequestLicKey)(THIS_ DWORD,BSTR*) PURE;
-	STDMETHOD(CreateInstanceLic)(THIS_ LPUNKNOWN,LPUNKNOWN,REFIID,BSTR,PVOID*) PURE;
-};
-
-EXTERN_C const IID IID_ISpecifyPropertyPages;
-#undef INTERFACE
-#define INTERFACE ISpecifyPropertyPages
-DECLARE_INTERFACE_(ISpecifyPropertyPages,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetPages)(THIS_ CAUUID*) PURE;
-};
-
-EXTERN_C const IID IID_IPerPropertyBrowsing;
-#undef INTERFACE
-#define INTERFACE IPerPropertyBrowsing
-DECLARE_INTERFACE_(IPerPropertyBrowsing,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetDisplayString)(THIS_ DISPID,BSTR*) PURE;
-	STDMETHOD(MapPropertyToPage)(THIS_ DISPID,LPCLSID) PURE;
-	STDMETHOD(GetPredefinedStrings)(THIS_ DISPID,CALPOLESTR*,CADWORD*) PURE;
-	STDMETHOD(GetPredefinedValue)(THIS_ DISPID,DWORD,VARIANT*) PURE;
-};
-
-EXTERN_C const IID IID_IPropertyPageSite;
-#undef INTERFACE
-#define INTERFACE IPropertyPageSite
-DECLARE_INTERFACE_(IPropertyPageSite,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(OnStatusChange)(THIS_ DWORD) PURE;
-	STDMETHOD(GetLocaleID)(THIS_ LCID*) PURE;
-	STDMETHOD(GetPageContainer)(THIS_ LPUNKNOWN*) PURE;
-	STDMETHOD(TranslateAccelerator)(THIS_ LPMSG) PURE;
-};
-
-EXTERN_C const IID IID_IPropertyPage;
-#undef INTERFACE
-#define INTERFACE IPropertyPage
-DECLARE_INTERFACE_(IPropertyPage,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(SetPageSite)(THIS_ LPPROPERTYPAGESITE) PURE;
-	STDMETHOD(Activate)(THIS_ HWND,LPCRECT,BOOL) PURE;
-	STDMETHOD(Deactivate)(THIS) PURE;
-	STDMETHOD(GetPageInfo)(THIS_ LPPROPPAGEINFO) PURE;
-	STDMETHOD(SetObjects)(THIS_ ULONG,LPUNKNOWN*) PURE;
-	STDMETHOD(Show)(THIS_ UINT) PURE;
-	STDMETHOD(Move)(THIS_ LPCRECT) PURE;
-	STDMETHOD(IsPageDirty)(THIS) PURE;
-	STDMETHOD(Apply)(THIS) PURE;
-	STDMETHOD(Help)(THIS_ LPCOLESTR) PURE;
-	STDMETHOD(TranslateAccelerator)(THIS_ LPMSG) PURE;
-};
-
-EXTERN_C const IID IID_IPropertyPage2;
-#undef INTERFACE
-#define INTERFACE IPropertyPage2
-DECLARE_INTERFACE_(IPropertyPage2,IPropertyPage)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(SetPageSite)(THIS_ LPPROPERTYPAGESITE) PURE;
-	STDMETHOD(Activate)(THIS_ HWND,LPCRECT,BOOL) PURE;
-	STDMETHOD(Deactivate)(THIS) PURE;
-	STDMETHOD(GetPageInfo)(THIS_ LPPROPPAGEINFO) PURE;
-	STDMETHOD(SetObjects)(THIS_ ULONG,LPUNKNOWN*) PURE;
-	STDMETHOD(Show)(THIS_ UINT) PURE;
-	STDMETHOD(Move)(THIS_ LPCRECT) PURE;
-	STDMETHOD(IsPageDirty)(THIS) PURE;
-	STDMETHOD(Apply)(THIS) PURE;
-	STDMETHOD(Help)(THIS_ LPCOLESTR) PURE;
-	STDMETHOD(TranslateAccelerator)(THIS_ LPMSG) PURE;
-	STDMETHOD(EditProperty)(THIS_ DISPID) PURE;
-};
-
-EXTERN_C const IID IID_IFont;
-#undef INTERFACE
-#define INTERFACE IFont
-DECLARE_INTERFACE_(IFont,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(get_Name)(THIS_ BSTR*) PURE;
-	STDMETHOD(put_Name)(THIS_ BSTR) PURE;
-	STDMETHOD(get_Size)(THIS_ CY*) PURE;
-	STDMETHOD(put_Size)(THIS_ CY) PURE;
-	STDMETHOD(get_Bold)(THIS_ BOOL*) PURE;
-	STDMETHOD(put_Bold)(THIS_ BOOL) PURE;
-	STDMETHOD(get_Italic)(THIS_ BOOL*) PURE;
-	STDMETHOD(put_Italic)(THIS_ BOOL) PURE;
-	STDMETHOD(get_Underline)(THIS_ BOOL*) PURE;
-	STDMETHOD(put_Underline)(THIS_ BOOL) PURE;
-	STDMETHOD(get_Strikethrough)(THIS_ BOOL*) PURE;
-	STDMETHOD(put_Strikethrough)(THIS_ BOOL) PURE;
-	STDMETHOD(get_Weight)(THIS_ short*) PURE;
-	STDMETHOD(put_Weight)(THIS_ short) PURE;
-	STDMETHOD(get_Charset)(THIS_ short*) PURE;
-	STDMETHOD(put_Charset)(THIS_ short) PURE;
-	STDMETHOD(get_hFont)(THIS_ HFONT*) PURE;
-	STDMETHOD(Clone)(THIS_ IFont**) PURE;
-	STDMETHOD(IsEqual)(THIS_ IFont*) PURE;
-	STDMETHOD(SetRatio)(THIS_ long,long) PURE;
-	STDMETHOD(QueryTextMetrics)(THIS_ LPTEXTMETRICOLE) PURE;
-	STDMETHOD(AddRefHfont)(THIS_ HFONT) PURE;
-	STDMETHOD(ReleaseHfont)(THIS_ HFONT) PURE;
-	STDMETHOD(SetHdc)(THIS_ HDC) PURE;
-};
-
-EXTERN_C const IID IID_IFontDisp;
-#undef INTERFACE
-#define INTERFACE IFontDisp
-DECLARE_INTERFACE_(IFontDisp,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-};
-
-EXTERN_C const IID IID_IPicture;
-#undef INTERFACE
-#define INTERFACE IPicture
-DECLARE_INTERFACE_(IPicture,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(get_Handle)(THIS_ OLE_HANDLE*) PURE;
-	STDMETHOD(get_hPal)(THIS_ OLE_HANDLE*) PURE;
-	STDMETHOD(get_Type)(THIS_ short*) PURE;
-	STDMETHOD(get_Width)(THIS_ OLE_XSIZE_HIMETRIC*) PURE;
-	STDMETHOD(get_Height)(THIS_ OLE_YSIZE_HIMETRIC*) PURE;
-	STDMETHOD(Render)(THIS_ HDC,long,long,long,long,OLE_XPOS_HIMETRIC,OLE_YPOS_HIMETRIC,OLE_XSIZE_HIMETRIC,OLE_YSIZE_HIMETRIC,LPCRECT) PURE;
-	STDMETHOD(set_hPal)(THIS_ OLE_HANDLE) PURE;
-	STDMETHOD(get_CurDC)(THIS_ HDC*) PURE;
-	STDMETHOD(SelectPicture)(THIS_ HDC,HDC*,OLE_HANDLE*) PURE;
-	STDMETHOD(get_KeepOriginalFormat)(THIS_ BOOL*) PURE;
-	STDMETHOD(put_KeepOriginalFormat)(THIS_ BOOL) PURE;
-	STDMETHOD(PictureChanged)(THIS) PURE;
-	STDMETHOD(SaveAsFile)(THIS_ LPSTREAM,BOOL,LONG*) PURE;
-	STDMETHOD(get_Attributes)(THIS_ PDWORD) PURE;
-};
-
-EXTERN_C const IID IID_IPictureDisp;
-#undef INTERFACE
-#define INTERFACE IPictureDisp
-DECLARE_INTERFACE_(IPictureDisp,IDispatch)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-};
-
-EXTERN_C const IID IID_IOleInPlaceSiteEx;
-#undef INTERFACE
-#define INTERFACE IOleInPlaceSiteEx
-DECLARE_INTERFACE_(IOleInPlaceSiteEx,IOleInPlaceSite)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(CanInPlaceActivate)(THIS) PURE;
-	STDMETHOD(OnInPlaceActivate)(THIS) PURE;
-	STDMETHOD(OnUIActivate)(THIS) PURE;
-	STDMETHOD(GetWindowContext)(THIS_ IOleInPlaceFrame**,IOleInPlaceUIWindow**,LPRECT,LPRECT,LPOLEINPLACEFRAMEINFO) PURE;
-	STDMETHOD(Scroll)(THIS_ SIZE) PURE;
-	STDMETHOD(OnUIDeactivate)(THIS_ BOOL) PURE;
-	STDMETHOD(OnInPlaceDeactivate)(THIS) PURE;
-	STDMETHOD(DiscardUndoState)(THIS) PURE;
-	STDMETHOD(DeactivateAndUndo)(THIS) PURE;
-	STDMETHOD(OnPosRectChange)(THIS_ LPCRECT) PURE;
-
-	STDMETHOD(OnInPlaceActivateEx)(THIS_ BOOL*,DWORD) PURE;
-	STDMETHOD(OnInPlaceDeactivateEx)(THIS_ BOOL) PURE;
-	STDMETHOD(RequestUIActivate)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IObjectWithSite;
-#undef INTERFACE
-#define INTERFACE IObjectWithSite
-DECLARE_INTERFACE_(IObjectWithSite,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(SetSite)(THIS_ IUnknown*) PURE;
-	STDMETHOD(GetSite)(THIS_ REFIID, void**) PURE;
-};
-
-EXTERN_C const IID IID_IOleInPlaceSiteWindowless;
-#undef INTERFACE
-#define INTERFACE IOleInPlaceSiteWindowless
-DECLARE_INTERFACE_(IOleInPlaceSiteWindowless,IOleInPlaceSiteEx)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(CanInPlaceActivate)(THIS) PURE;
-	STDMETHOD(OnInPlaceActivate)(THIS) PURE;
-	STDMETHOD(OnUIActivate)(THIS) PURE;
-	STDMETHOD(GetWindowContext)(THIS_ IOleInPlaceFrame**,IOleInPlaceUIWindow**,LPRECT,LPRECT,LPOLEINPLACEFRAMEINFO) PURE;
-	STDMETHOD(Scroll)(THIS_ SIZE) PURE;
-	STDMETHOD(OnUIDeactivate)(THIS_ BOOL) PURE;
-	STDMETHOD(OnInPlaceDeactivate)(THIS) PURE;
-	STDMETHOD(DiscardUndoState)(THIS) PURE;
-	STDMETHOD(DeactivateAndUndo)(THIS) PURE;
-	STDMETHOD(OnPosRectChange)(THIS_ LPCRECT) PURE;
-
-	STDMETHOD(OnInPlaceActivateEx)(THIS_ BOOL*,DWORD) PURE;
-	STDMETHOD(OnInPlaceDeactivateEx)(THIS_ BOOL) PURE;
-	STDMETHOD(RequestUIActivate)(THIS) PURE;
-
-	STDMETHOD(CanWindowlessActivate)(THIS) PURE;
-	STDMETHOD(GetCapture)(THIS) PURE;
-	STDMETHOD(SetCapture)(THIS_ BOOL) PURE;
-	STDMETHOD(GetFocus)(THIS) PURE;
-	STDMETHOD(SetFocus)(THIS_ BOOL) PURE;
-	STDMETHOD(GetDC)(THIS_ LPCRECT,DWORD,HDC*) PURE;
-	STDMETHOD(ReleaseDC)(THIS_ HDC) PURE;
-	STDMETHOD(InvalidateRect)(THIS_ LPCRECT,BOOL) PURE;
-	STDMETHOD(InvalidateRgn)(THIS_ HRGN,BOOL) PURE;
-	STDMETHOD(ScrollRect)(THIS_ INT,INT,LPCRECT,LPCRECT) PURE;
-	STDMETHOD(AdjustRect)(THIS_ LPCRECT) PURE;
-	STDMETHOD(OnDefWindowMessage)(THIS_ UINT,WPARAM,LPARAM,LRESULT*) PURE;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/odbcinst.h b/winsup/w32api/include/odbcinst.h
deleted file mode 100644
index b90464f27..000000000
--- a/winsup/w32api/include/odbcinst.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef _ODBCINST_H
-#define _ODBCINST_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-#include <sql.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifndef ODBCVER
-#define ODBCVER 0x0351
-#endif
-#define INSTAPI __stdcall
-#define  ODBC_ADD_DSN     1
-#define  ODBC_CONFIG_DSN  2
-#define  ODBC_REMOVE_DSN  3
-#if (ODBCVER >= 0x0250)
-#define ODBC_ADD_SYS_DSN 4
-#define ODBC_CONFIG_SYS_DSN 5
-#define ODBC_REMOVE_SYS_DSN 6
-#define ODBC_INSTALL_INQUIRY 1 
-#define ODBC_INSTALL_COMPLETE 2
-#define ODBC_INSTALL_DRIVER 1
-#define ODBC_REMOVE_DRIVER 2
-#define ODBC_CONFIG_DRIVER 3
-#define ODBC_CONFIG_DRIVER_MAX 100
-#endif /* (ODBCVER >= 0x0250) */
-#if (ODBCVER >= 0x0300)
-#define ODBC_REMOVE_DEFAULT_DSN 7
-#define ODBC_BOTH_DSN 0
-#define ODBC_USER_DSN 1
-#define ODBC_SYSTEM_DSN 2
-#define ODBC_ERROR_GENERAL_ERR 1
-#define ODBC_ERROR_INVALID_BUFF_LEN 2
-#define ODBC_ERROR_INVALID_HWND 3
-#define ODBC_ERROR_INVALID_STR 4
-#define ODBC_ERROR_INVALID_REQUEST_TYPE 5
-#define ODBC_ERROR_COMPONENT_NOT_FOUND 6
-#define ODBC_ERROR_INVALID_NAME 7
-#define ODBC_ERROR_INVALID_KEYWORD_VALUE 8
-#define ODBC_ERROR_INVALID_DSN 9
-#define ODBC_ERROR_INVALID_INF 10
-#define ODBC_ERROR_REQUEST_FAILED 11
-#define ODBC_ERROR_INVALID_PATH 12
-#define ODBC_ERROR_LOAD_LIB_FAILED 13
-#define ODBC_ERROR_INVALID_PARAM_SEQUENCE 14
-#define ODBC_ERROR_INVALID_LOG_FILE 15
-#define ODBC_ERROR_USER_CANCELED 16
-#define ODBC_ERROR_USAGE_UPDATE_FAILED 17
-#define ODBC_ERROR_CREATE_DSN_FAILED 18
-#define ODBC_ERROR_WRITING_SYSINFO_FAILED 19
-#define ODBC_ERROR_REMOVE_DSN_FAILED 20
-#define ODBC_ERROR_OUT_OF_MEM 21
-#define ODBC_ERROR_OUTPUT_STRING_TRUNCATED 22
-#endif /* ODBCVER >= 0x0300 */
-
-#ifndef RC_INVOKED
-BOOL INSTAPI ConfigDSN(HWND,WORD,LPCSTR,LPCSTR);
-BOOL INSTAPI ConfigDSNW(HWND,WORD,LPCWSTR,LPCWSTR);
-BOOL INSTAPI ConfigTranslator(HWND,DWORD*);
-BOOL INSTAPI SQLConfigDataSource(HWND,WORD,LPCSTR,LPCSTR);
-BOOL INSTAPI SQLConfigDataSourceW(HWND,WORD,LPCWSTR,LPCWSTR);
-BOOL INSTAPI SQLCreateDataSource(HWND,LPCSTR);
-BOOL INSTAPI SQLCreateDataSourceW(HWND,LPCWSTR);
-BOOL INSTAPI SQLGetAvailableDrivers(LPCSTR,LPSTR,WORD,WORD*);
-BOOL INSTAPI SQLGetAvailableDriversW(LPCWSTR,LPWSTR,WORD,WORD*);
-BOOL INSTAPI SQLGetInstalledDrivers(LPSTR,WORD,WORD*);
-BOOL INSTAPI SQLGetInstalledDriversW(LPWSTR,WORD,WORD*);
-int INSTAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPSTR,int,LPCSTR);
-int INSTAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,int,LPCWSTR);
-BOOL INSTAPI SQLGetTranslator(HWND,LPSTR,WORD,WORD*,LPSTR,WORD,WORD*,DWORD*);
-BOOL INSTAPI SQLGetTranslatorW(HWND,LPWSTR,WORD,WORD*,LPWSTR,WORD,WORD*,DWORD*);
-BOOL INSTAPI SQLInstallDriver(LPCSTR,LPCSTR,LPSTR,WORD,WORD*);
-BOOL INSTAPI SQLInstallDriverManager(LPSTR,WORD,WORD*);
-BOOL INSTAPI SQLInstallDriverManagerW(LPWSTR,WORD,WORD*);
-BOOL INSTAPI SQLInstallDriverW(LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*);
-BOOL INSTAPI SQLInstallODBC(HWND,LPCSTR,LPCSTR,LPCSTR);
-BOOL INSTAPI SQLInstallODBCW(HWND,LPCWSTR,LPCWSTR,LPCWSTR);
-BOOL INSTAPI SQLManageDataSources(HWND);
-BOOL INSTAPI SQLRemoveDefaultDataSource(void);
-BOOL INSTAPI SQLRemoveDSNFromIni(LPCSTR);
-BOOL INSTAPI SQLRemoveDSNFromIniW(LPCWSTR);
-BOOL INSTAPI SQLValidDSN(LPCSTR);
-BOOL INSTAPI SQLValidDSNW(LPCWSTR);
-BOOL INSTAPI SQLWriteDSNToIni(LPCSTR,LPCSTR);
-BOOL INSTAPI SQLWriteDSNToIniW(LPCWSTR,LPCWSTR);
-BOOL INSTAPI SQLWritePrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
-BOOL INSTAPI SQLWritePrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
-#if(ODBCVER >= 0x0250) 
-BOOL INSTAPI ConfigDriver(HWND,WORD,LPCSTR,LPCSTR,LPSTR,WORD,WORD*);
-BOOL INSTAPI ConfigDriverW(HWND,WORD,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*);
-BOOL INSTAPI SQLConfigDriver(HWND,WORD,LPCSTR,LPCSTR,LPSTR,WORD,WORD*);
-BOOL INSTAPI SQLConfigDriverW(HWND,WORD,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*);
-BOOL INSTAPI SQLInstallTranslator(LPCSTR,LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD);
-BOOL INSTAPI SQLInstallTranslatorW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*,WORD,LPDWORD);
-BOOL INSTAPI SQLRemoveDriver(LPCSTR,BOOL,LPDWORD);
-BOOL INSTAPI SQLRemoveDriverManager(LPDWORD);
-BOOL INSTAPI SQLRemoveDriverW(LPCWSTR,BOOL,LPDWORD);
-BOOL INSTAPI SQLRemoveTranslator(LPCSTR,LPDWORD);
-BOOL INSTAPI SQLRemoveTranslatorW(LPCWSTR,LPDWORD);
-#endif /* ODBCVER >= 0x0250 */  
-#if (ODBCVER >= 0x0300) 
-BOOL INSTAPI SQLGetConfigMode(UWORD*);
-BOOL INSTAPI SQLInstallDriverEx(LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD);
-BOOL INSTAPI SQLInstallDriverExW(LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*,WORD,LPDWORD);
-SQLRETURN INSTAPI SQLInstallerError(WORD,DWORD*,LPSTR,WORD,WORD*);
-SQLRETURN INSTAPI SQLInstallerErrorW(WORD,DWORD*,LPWSTR,WORD,WORD*);
-BOOL INSTAPI SQLInstallTranslatorEx(LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD);
-BOOL INSTAPI SQLInstallTranslatorExW(LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*,WORD,LPDWORD);
-SQLRETURN INSTAPI SQLPostInstallerError(DWORD,LPCSTR);
-SQLRETURN INSTAPI SQLPostInstallerErrorW(DWORD,LPCWSTR);
-BOOL INSTAPI SQLReadFileDSN(LPCSTR,LPCSTR,LPCSTR,LPSTR,WORD,WORD*);
-BOOL INSTAPI SQLReadFileDSNW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*);
-BOOL INSTAPI SQLSetConfigMode(UWORD);
-BOOL INSTAPI SQLWriteFileDSN(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
-BOOL INSTAPI SQLWriteFileDSNW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
-#endif /* ODBCVER >= 0x0300 */  
-
-#if defined (UNICODE) && !defined (SQL_NOUNICODEMAP)
-#define SQLConfigDataSource SQLConfigDataSourceW
-#define SQLConfigDriver SQLConfigDriverW
-#define SQLCreateDataSource SQLCreateDataSourceW 
-#define SQLGetAvailableDrivers SQLGetAvailableDriversW 
-#define SQLGetInstalledDrivers SQLGetInstalledDriversW
-#define SQLGetPrivateProfileString SQLGetPrivateProfileStringW
-#define SQLGetTranslator SQLGetTranslatorW 
-#define SQLInstallDriver SQLInstallDriverW 
-#define SQLInstallDriverEx SQLInstallDriverExW
-#define SQLInstallDriverManager SQLInstallDriverManagerW
-#define SQLInstallerError SQLInstallerErrorW
-#define SQLInstallODBC SQLInstallODBCW 
-#define SQLInstallTranslator SQLInstallTranslatorW
-#define SQLInstallTranslatorEx SQLInstallTranslatorExW
-#define SQLPostInstallerError SQLPostInstallerErrorW
-#define SQLReadFileDSN SQLReadFileDSNW
-#define SQLRemoveDriver SQLRemoveDriverW
-#define SQLRemoveDSNFromIni SQLRemoveDSNFromIniW 
-#define SQLRemoveTranslator SQLRemoveTranslatorW
-#define SQLValidDSN SQLValidDSNW 
-#define SQLWriteDSNToIni SQLWriteDSNToIniW 
-#define SQLWriteFileDSN SQLWriteFileDSNW
-#define SQLWritePrivateProfileString SQLWritePrivateProfileStringW
-#endif /* UNICODE && !SQL_NOUNICODEMAP */
-#endif /* RC_INVOKED */
-#ifdef __cplusplus
-}
-#endif
-#endif /* _ODBCINST_H */
diff --git a/winsup/w32api/include/ole.h b/winsup/w32api/include/ole.h
deleted file mode 100644
index d2dd2020a..000000000
--- a/winsup/w32api/include/ole.h
+++ /dev/null
@@ -1,308 +0,0 @@
-#ifndef _OLE_H
-#define _OLE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef STRICT
-#define OLE_LPCSTR LPCSTR
-#define OLE_CONST const
-#else
-#define OLE_LPCSTR LPSTR
-#define OLE_CONST
-#endif
-#define LRESULT LONG
-#define HGLOBAL HANDLE
-#define OT_LINK 1L
-#define OT_EMBEDDED 2L
-#define OT_STATIC 3L
-#define OLEVERB_PRIMARY 0
-#define OF_SET 1
-#define OF_GET 2
-#define OF_HANDLER 4
-
-typedef struct _OLETARGETDEVICE {
-	USHORT otdDeviceNameOffset;
-	USHORT otdDriverNameOffset;
-	USHORT otdPortNameOffset;
-	USHORT otdExtDevmodeOffset;
-	USHORT otdExtDevmodeSize;
-	USHORT otdEnvironmentOffset;
-	USHORT otdEnvironmentSize;
-	BYTE otdData[1];
-} OLETARGETDEVICE;
-typedef OLETARGETDEVICE *LPOLETARGETDEVICE;
-typedef enum {
-OLE_OK,
-OLE_WAIT_FOR_RELEASE,
-OLE_BUSY,
-OLE_ERROR_PROTECT_ONLY,
-OLE_ERROR_MEMORY,
-OLE_ERROR_STREAM,
-OLE_ERROR_STATIC,
-OLE_ERROR_BLANK,
-OLE_ERROR_DRAW,
-OLE_ERROR_METAFILE,
-OLE_ERROR_ABORT,
-OLE_ERROR_CLIPBOARD,
-OLE_ERROR_FORMAT,
-OLE_ERROR_OBJECT,
-OLE_ERROR_OPTION,
-OLE_ERROR_PROTOCOL,
-OLE_ERROR_ADDRESS,
-OLE_ERROR_NOT_EQUAL,
-OLE_ERROR_HANDLE,
-OLE_ERROR_GENERIC,
-OLE_ERROR_CLASS,
-OLE_ERROR_SYNTAX,
-OLE_ERROR_DATATYPE,
-OLE_ERROR_PALETTE,
-OLE_ERROR_NOT_LINK,
-OLE_ERROR_NOT_EMPTY,
-OLE_ERROR_SIZE,
-OLE_ERROR_DRIVE,
-OLE_ERROR_NETWORK,
-OLE_ERROR_NAME,
-OLE_ERROR_TEMPLATE,
-OLE_ERROR_NEW,
-OLE_ERROR_EDIT,
-OLE_ERROR_OPEN,
-OLE_ERROR_NOT_OPEN,
-OLE_ERROR_LAUNCH,
-OLE_ERROR_COMM,
-OLE_ERROR_TERMINATE,
-OLE_ERROR_COMMAND,
-OLE_ERROR_SHOW,
-OLE_ERROR_DOVERB,
-OLE_ERROR_ADVISE_NATIVE,
-OLE_ERROR_ADVISE_PICT,
-OLE_ERROR_ADVISE_RENAME,
-OLE_ERROR_POKE_NATIVE,
-OLE_ERROR_REQUEST_NATIVE,
-OLE_ERROR_REQUEST_PICT,
-OLE_ERROR_SERVER_BLOCKED,
-OLE_ERROR_REGISTRATION,
-OLE_ERROR_ALREADY_REGISTERED,
-OLE_ERROR_TASK,
-OLE_ERROR_OUTOFDATE,
-OLE_ERROR_CANT_UPDATE_CLIENT,
-OLE_ERROR_UPDATE,
-OLE_ERROR_SETDATA_FORMAT,
-OLE_ERROR_STATIC_FROM_OTHER_OS,
-OLE_ERROR_FILE_VER,
-OLE_WARN_DELETE_DATA = 1000
-} OLESTATUS;
-typedef enum {
-	OLE_CHANGED,
-	OLE_SAVED,
-	OLE_CLOSED,
-	OLE_RENAMED,
-	OLE_QUERY_PAINT,
-	OLE_RELEASE,
-	OLE_QUERY_RETRY
-} OLE_NOTIFICATION;
-typedef enum {
-	OLE_NONE,
-	OLE_DELETE,
-	OLE_LNKPASTE,
-	OLE_EMBPASTE,
-	OLE_SHOW,
-	OLE_RUN,
-	OLE_ACTIVATE,
-	OLE_UPDATE,
-	OLE_CLOSE,
-	OLE_RECONNECT,
-	OLE_SETUPDATEOPTIONS,
-	OLE_SERVERUNLAUNCH,
-	OLE_LOADFROMSTREAM,
-	OLE_SETDATA,
-	OLE_REQUESTDATA,
-	OLE_OTHER,
-	OLE_CREATE,
-	OLE_CREATEFROMTEMPLATE,
-	OLE_CREATELINKFROMFILE,
-	OLE_COPYFROMLNK,
-	OLE_CREATEFROMFILE,
-	OLE_CREATEINVISIBLE
-} OLE_RELEASE_METHOD;
-typedef enum {
-	olerender_none,
-	olerender_draw,
-	olerender_format
-	} OLEOPT_RENDER;
-typedef WORD OLECLIPFORMAT;
-typedef enum {
-	oleupdate_always,
-	oleupdate_onsave,
-#ifdef OLE_INTERNAL
-	oleupdate_oncall,
-	oleupdate_onclose
-#else
-	oleupdate_oncall
-#endif
-} OLEOPT_UPDATE;
-typedef HANDLE HOBJECT;
-typedef LONG LHSERVER;
-typedef LONG LHCLIENTDOC;
-typedef LONG LHSERVERDOC;
-typedef struct _OLEOBJECT *LPOLEOBJECT;
-typedef struct _OLESTREAM *LPOLESTREAM;
-typedef struct _OLECLIENT *LPOLECLIENT;
-typedef struct _OLEOBJECTVTBL {
-	void *(CALLBACK* QueryProtocol)(LPOLEOBJECT,OLE_LPCSTR);
-	OLESTATUS (CALLBACK* Release)(LPOLEOBJECT);
-	OLESTATUS (CALLBACK* Show)(LPOLEOBJECT,BOOL);
-	OLESTATUS (CALLBACK* DoVerb)(LPOLEOBJECT,UINT,BOOL,BOOL);
-	OLESTATUS (CALLBACK* GetData)(LPOLEOBJECT,OLECLIPFORMAT,HANDLE*);
-	OLESTATUS (CALLBACK* SetData)(LPOLEOBJECT,OLECLIPFORMAT,HANDLE);
-	OLESTATUS (CALLBACK* SetTargetDevice)(LPOLEOBJECT,HGLOBAL);
-	OLESTATUS (CALLBACK* SetBounds)(LPOLEOBJECT,OLE_CONST RECT*);
-	OLECLIPFORMAT (CALLBACK* EnumFormats)(LPOLEOBJECT,OLECLIPFORMAT);
-	OLESTATUS (CALLBACK* SetColorScheme)(LPOLEOBJECT,OLE_CONST LOGPALETTE*);
-#ifndef SERVERONLY
-	OLESTATUS (CALLBACK* Delete)(LPOLEOBJECT);
-	OLESTATUS (CALLBACK* SetHostNames)(LPOLEOBJECT,OLE_LPCSTR,OLE_LPCSTR);
-	OLESTATUS (CALLBACK* SaveToStream)(LPOLEOBJECT,LPOLESTREAM);
-	OLESTATUS (CALLBACK* Clone)(LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,OLE_LPCSTR,LPOLEOBJECT*);
-	OLESTATUS (CALLBACK* CopyFromLink)(LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,OLE_LPCSTR,LPOLEOBJECT*);
-	OLESTATUS (CALLBACK* Equal)(LPOLEOBJECT,LPOLEOBJECT);
-	OLESTATUS (CALLBACK* CopyToClipboard)(LPOLEOBJECT);
-	OLESTATUS (CALLBACK* Draw)(LPOLEOBJECT,HDC,OLE_CONST RECT*,OLE_CONST RECT*,HDC);
-	OLESTATUS (CALLBACK* Activate)(LPOLEOBJECT,UINT,BOOL,BOOL,HWND,OLE_CONST RECT*);
-	OLESTATUS (CALLBACK* Execute)(LPOLEOBJECT,HGLOBAL,UINT);
-	OLESTATUS (CALLBACK* Close)(LPOLEOBJECT);
-	OLESTATUS (CALLBACK* Update)(LPOLEOBJECT);
-	OLESTATUS (CALLBACK* Reconnect)(LPOLEOBJECT);
-	OLESTATUS (CALLBACK* ObjectConvert)(LPOLEOBJECT,OLE_LPCSTR,LPOLECLIENT,LHCLIENTDOC,OLE_LPCSTR,LPOLEOBJECT*);
-	OLESTATUS (CALLBACK* GetLinkUpdateOptions)(LPOLEOBJECT,OLEOPT_UPDATE*);
-	OLESTATUS (CALLBACK* SetLinkUpdateOptions)(LPOLEOBJECT,OLEOPT_UPDATE);
-	OLESTATUS (CALLBACK* Rename)(LPOLEOBJECT,OLE_LPCSTR);
-	OLESTATUS (CALLBACK* QueryName)(LPOLEOBJECT,LPSTR,UINT*);
-	OLESTATUS (CALLBACK* QueryType)(LPOLEOBJECT,LONG*);
-	OLESTATUS (CALLBACK* QueryBounds)(LPOLEOBJECT,RECT*);
-	OLESTATUS (CALLBACK* QuerySize)(LPOLEOBJECT,DWORD*);
-	OLESTATUS (CALLBACK* QueryOpen)(LPOLEOBJECT);
-	OLESTATUS (CALLBACK* QueryOutOfDate)(LPOLEOBJECT);
-	OLESTATUS (CALLBACK* QueryReleaseStatus)(LPOLEOBJECT);
-	OLESTATUS (CALLBACK* QueryReleaseError)(LPOLEOBJECT);
-	OLE_RELEASE_METHOD (CALLBACK* QueryReleaseMethod)(LPOLEOBJECT);
-	OLESTATUS (CALLBACK* RequestData)(LPOLEOBJECT,OLECLIPFORMAT);
-	OLESTATUS (CALLBACK* ObjectLong)(LPOLEOBJECT,UINT,LONG*);
-	OLESTATUS (CALLBACK* ChangeData)(LPOLEOBJECT,HANDLE,LPOLECLIENT,BOOL);
-#endif
-} OLEOBJECTVTBL;
-typedef OLEOBJECTVTBL*LPOLEOBJECTVTBL;
-#ifndef OLE_INTERNAL
-typedef struct _OLEOBJECT { LPOLEOBJECTVTBL lpvtbl; } OLEOBJECT;
-#endif
-typedef struct _OLECLIENTVTBL { int (CALLBACK* CallBack)(LPOLECLIENT,OLE_NOTIFICATION,LPOLEOBJECT); } OLECLIENTVTBL;
-typedef OLECLIENTVTBL *LPOLECLIENTVTBL;
-typedef struct _OLECLIENT { LPOLECLIENTVTBL lpvtbl; } OLECLIENT;
-typedef struct _OLESTREAMVTBL {
-	DWORD (CALLBACK* Get)(LPOLESTREAM,void*,DWORD);
-	DWORD (CALLBACK* Put)(LPOLESTREAM,OLE_CONST void*,DWORD);
-} OLESTREAMVTBL;
-typedef OLESTREAMVTBL *LPOLESTREAMVTBL;
-typedef struct _OLESTREAM { LPOLESTREAMVTBL lpstbl; } OLESTREAM;
-typedef enum {
-	OLE_SERVER_MULTI,
-	OLE_SERVER_SINGLE
-} OLE_SERVER_USE;
-typedef struct _OLESERVER *LPOLESERVER;
-typedef struct _OLESERVERDOC *LPOLESERVERDOC;
-typedef struct _OLESERVERVTBL {
-	OLESTATUS (CALLBACK* Open)(LPOLESERVER,LHSERVERDOC,OLE_LPCSTR,LPOLESERVERDOC*);
-	OLESTATUS (CALLBACK* Create)(LPOLESERVER,LHSERVERDOC,OLE_LPCSTR,OLE_LPCSTR,LPOLESERVERDOC*);
-	OLESTATUS (CALLBACK* CreateFromTemplate)(LPOLESERVER,LHSERVERDOC,OLE_LPCSTR,OLE_LPCSTR,OLE_LPCSTR,LPOLESERVERDOC*);
-	OLESTATUS (CALLBACK* Edit)(LPOLESERVER,LHSERVERDOC,OLE_LPCSTR,OLE_LPCSTR,LPOLESERVERDOC*);
-	OLESTATUS (CALLBACK* Exit)(LPOLESERVER);
-	OLESTATUS (CALLBACK* Release)(LPOLESERVER);
-	OLESTATUS (CALLBACK* Execute)(LPOLESERVER,HGLOBAL);
-} OLESERVERVTBL;
-typedef OLESERVERVTBL *LPOLESERVERVTBL;
-typedef struct _OLESERVER { LPOLESERVERVTBL lpvtbl; } OLESERVER;
-typedef struct _OLESERVERDOCVTBL {
-	OLESTATUS (CALLBACK* Save)(LPOLESERVERDOC);
-	OLESTATUS (CALLBACK* Close)(LPOLESERVERDOC);
-	OLESTATUS (CALLBACK* SetHostNames)(LPOLESERVERDOC,OLE_LPCSTR,OLE_LPCSTR);
-	OLESTATUS (CALLBACK* SetDocDimensions)(LPOLESERVERDOC,OLE_CONST RECT*);
-	OLESTATUS (CALLBACK* GetObject)(LPOLESERVERDOC,OLE_LPCSTR,LPOLEOBJECT*,LPOLECLIENT);
-	OLESTATUS (CALLBACK* Release)(LPOLESERVERDOC);
-	OLESTATUS (CALLBACK* SetColorScheme)(LPOLESERVERDOC,OLE_CONST LOGPALETTE*);
-	OLESTATUS (CALLBACK* Execute)(LPOLESERVERDOC,HGLOBAL);
-} OLESERVERDOCVTBL;
-typedef OLESERVERDOCVTBL *LPOLESERVERDOCVTBL;
-typedef struct _OLESERVERDOC { LPOLESERVERDOCVTBL lpvtbl; } OLESERVERDOC;
-OLESTATUS WINAPI OleDelete(LPOLEOBJECT);
-OLESTATUS WINAPI OleRelease(LPOLEOBJECT);
-OLESTATUS WINAPI OleSaveToStream(LPOLEOBJECT,LPOLESTREAM);
-OLESTATUS WINAPI OleEqual(LPOLEOBJECT,LPOLEOBJECT );
-OLESTATUS WINAPI OleCopyToClipboard(LPOLEOBJECT);
-OLESTATUS WINAPI OleSetHostNames(LPOLEOBJECT,LPCSTR,LPCSTR);
-OLESTATUS WINAPI OleSetTargetDevice(LPOLEOBJECT,HGLOBAL);
-OLESTATUS WINAPI OleSetBounds(LPOLEOBJECT,LPCRECT);
-OLESTATUS WINAPI OleSetColorScheme(LPOLEOBJECT,const LOGPALETTE*);
-OLESTATUS WINAPI OleQueryBounds(LPOLEOBJECT,RECT*);
-OLESTATUS WINAPI OleQuerySize(LPOLEOBJECT,DWORD*);
-OLESTATUS WINAPI OleDraw(LPOLEOBJECT,HDC,LPCRECT,LPCRECT,HDC);
-OLESTATUS WINAPI OleQueryOpen(LPOLEOBJECT);
-OLESTATUS WINAPI OleActivate(LPOLEOBJECT,UINT,BOOL,BOOL,HWND,LPCRECT);
-OLESTATUS WINAPI OleExecute(LPOLEOBJECT,HGLOBAL,UINT);
-OLESTATUS WINAPI OleClose(LPOLEOBJECT);
-OLESTATUS WINAPI OleUpdate(LPOLEOBJECT);
-OLESTATUS WINAPI OleReconnect(LPOLEOBJECT);
-OLESTATUS WINAPI OleGetLinkUpdateOptions(LPOLEOBJECT,OLEOPT_UPDATE*);
-OLESTATUS WINAPI OleSetLinkUpdateOptions(LPOLEOBJECT,OLEOPT_UPDATE);
-WINAPI void *OleQueryProtocol(LPOLEOBJECT,LPCSTR);
-OLESTATUS WINAPI OleQueryReleaseStatus(LPOLEOBJECT);
-OLESTATUS WINAPI OleQueryReleaseError(LPOLEOBJECT);
-OLE_RELEASE_METHOD WINAPI OleQueryReleaseMethod(LPOLEOBJECT);
-OLESTATUS WINAPI OleQueryType(LPOLEOBJECT,LONG*);
-DWORD WINAPI OleQueryClientVersion(void);
-DWORD WINAPI OleQueryServerVersion(void);
-OLECLIPFORMAT WINAPI OleEnumFormats(LPOLEOBJECT,OLECLIPFORMAT);
-OLESTATUS WINAPI OleGetData(LPOLEOBJECT,OLECLIPFORMAT,HANDLE*);
-OLESTATUS WINAPI OleSetData(LPOLEOBJECT,OLECLIPFORMAT,HANDLE);
-OLESTATUS WINAPI OleQueryOutOfDate(LPOLEOBJECT);
-OLESTATUS WINAPI OleRequestData(LPOLEOBJECT,OLECLIPFORMAT);
-OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR,OLEOPT_RENDER,OLECLIPFORMAT);
-OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR,OLEOPT_RENDER,OLECLIPFORMAT);
-OLESTATUS WINAPI OleCreateFromClip(LPCSTR,LPOLECLIENT,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*,OLEOPT_RENDER,OLECLIPFORMAT);
-OLESTATUS WINAPI OleCreateLinkFromClip(LPCSTR,LPOLECLIENT,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*,OLEOPT_RENDER,OLECLIPFORMAT);
-OLESTATUS WINAPI OleCreateFromFile(LPCSTR,LPOLECLIENT,LPCSTR,LPCSTR,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*,OLEOPT_RENDER,OLECLIPFORMAT);
-OLESTATUS WINAPI OleCreateLinkFromFile(LPCSTR,LPOLECLIENT,LPCSTR,LPCSTR,LPCSTR,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*,OLEOPT_RENDER,OLECLIPFORMAT);
-OLESTATUS WINAPI OleLoadFromStream(LPOLESTREAM,LPCSTR,LPOLECLIENT,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*);
-OLESTATUS WINAPI OleCreate(LPCSTR,LPOLECLIENT,LPCSTR,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*,OLEOPT_RENDER,OLECLIPFORMAT);
-OLESTATUS WINAPI OleCreateInvisible(LPCSTR,LPOLECLIENT,LPCSTR,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*,OLEOPT_RENDER,OLECLIPFORMAT,BOOL);
-OLESTATUS WINAPI OleCreateFromTemplate(LPCSTR,LPOLECLIENT,LPCSTR,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*,OLEOPT_RENDER,OLECLIPFORMAT);
-OLESTATUS WINAPI OleClone(LPOLEOBJECT,LPOLECLIENT,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*);
-OLESTATUS WINAPI OleCopyFromLink(LPOLEOBJECT,LPCSTR,LPOLECLIENT,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*);
-OLESTATUS WINAPI OleObjectConvert(LPOLEOBJECT,LPCSTR,LPOLECLIENT,LHCLIENTDOC,LPCSTR,LPOLEOBJECT*);
-OLESTATUS WINAPI OleRename(LPOLEOBJECT,LPCSTR);
-OLESTATUS WINAPI OleQueryName(LPOLEOBJECT,LPSTR,UINT*);
-OLESTATUS WINAPI OleRevokeObject(LPOLECLIENT);
-BOOL WINAPI OleIsDcMeta(HDC);
-OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR,LPCSTR,LONG,LHCLIENTDOC*);
-OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC);
-OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC,LPCSTR);
-OLESTATUS WINAPI OleRevertClientDoc(LHCLIENTDOC);
-OLESTATUS WINAPI OleSavedClientDoc(LHCLIENTDOC);
-OLESTATUS WINAPI OleEnumObjects(LHCLIENTDOC,LPOLEOBJECT*);
-OLESTATUS WINAPI OleRegisterServer(LPCSTR,LPOLESERVER,LHSERVER*,HINSTANCE,OLE_SERVER_USE);
-OLESTATUS WINAPI OleRevokeServer(LHSERVER);
-OLESTATUS WINAPI OleBlockServer(LHSERVER);
-OLESTATUS WINAPI OleUnblockServer(LHSERVER,BOOL*);
-OLESTATUS WINAPI OleLockServer(LPOLEOBJECT,LHSERVER*);
-OLESTATUS WINAPI OleUnlockServer(LHSERVER);
-OLESTATUS WINAPI OleRegisterServerDoc(LHSERVER,LPCSTR,LPOLESERVERDOC,LHSERVERDOC*);
-OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC);
-OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC,LPCSTR);
-OLESTATUS WINAPI OleRevertServerDoc(LHSERVERDOC);
-OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC);
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/ole2.h b/winsup/w32api/include/ole2.h
deleted file mode 100644
index c80a9a958..000000000
--- a/winsup/w32api/include/ole2.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef _OLE2_H
-#define _OLE2_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#pragma pack(push,8)
-#include <winerror.h>
-#include <objbase.h>
-#include <olectlid.h>
-#include <oleauto.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define E_DRAW VIEW_E_DRAW
-#define DATA_E_FORMATETC DV_E_FORMATETC
-#define OLEIVERB_PRIMARY (0L)
-#define OLEIVERB_SHOW (-1L)
-#define OLEIVERB_OPEN (-2L)
-#define OLEIVERB_HIDE (-3L)
-#define OLEIVERB_UIACTIVATE (-4L)
-#define OLEIVERB_INPLACEACTIVATE (-5L)
-#define OLEIVERB_DISCARDUNDOSTATE (-6L)
-#define EMBDHLP_INPROC_HANDLER 0x0000L
-#define EMBDHLP_INPROC_SERVER 0x0001L
-#define EMBDHLP_CREATENOW 0x00000000L
-#define EMBDHLP_DELAYCREATE 0x00010000L
-#include <oleidl.h>
-
-typedef struct _OLESTREAMVTBL *LPOLESTREAMVTBL;
-typedef struct _OLESTREAM {
-	LPOLESTREAMVTBL lpstbl;
-} OLESTREAM,*LPOLESTREAM;
-typedef struct _OLESTREAMVTBL {
-	DWORD (CALLBACK* Get)(LPOLESTREAM,void*,DWORD);
-	DWORD (CALLBACK* Put)(LPOLESTREAM,const void*,DWORD);
-} OLESTREAMVTBL;
-
-WINOLEAPI CreateDataAdviseHolder(LPDATAADVISEHOLDER*);
-WINOLEAPI_(DWORD) OleBuildVersion(void);
-WINOLEAPI ReadClassStg(LPSTORAGE,CLSID*);
-WINOLEAPI WriteClassStg(LPSTORAGE,REFCLSID);
-WINOLEAPI ReadClassStm(LPSTREAM,CLSID*);
-WINOLEAPI WriteClassStm(LPSTREAM,REFCLSID);
-WINOLEAPI WriteFmtUserTypeStg(LPSTORAGE,CLIPFORMAT,LPOLESTR);
-WINOLEAPI ReadFmtUserTypeStg(LPSTORAGE,CLIPFORMAT*,LPOLESTR*);
-WINOLEAPI OleInitialize(PVOID);
-WINOLEAPI_(void) OleUninitialize(void);
-WINOLEAPI OleQueryLinkFromData(LPDATAOBJECT);
-WINOLEAPI OleQueryCreateFromData(LPDATAOBJECT);
-WINOLEAPI OleCreate(REFCLSID,REFIID,DWORD,LPFORMATETC,LPOLECLIENTSITE,LPSTORAGE,PVOID*);
-WINOLEAPI OleCreateFromData(LPDATAOBJECT,REFIID,DWORD,LPFORMATETC,LPOLECLIENTSITE,LPSTORAGE,PVOID*);
-WINOLEAPI OleCreateLinkFromData(LPDATAOBJECT,REFIID,DWORD,LPFORMATETC,LPOLECLIENTSITE,LPSTORAGE,PVOID*);
-WINOLEAPI OleCreateStaticFromData(LPDATAOBJECT,REFIID,DWORD,LPFORMATETC,LPOLECLIENTSITE,LPSTORAGE,PVOID*);
-WINOLEAPI OleCreateLink(LPMONIKER,REFIID,DWORD,LPFORMATETC,LPOLECLIENTSITE,LPSTORAGE,PVOID*);
-WINOLEAPI OleCreateLinkToFile(LPCOLESTR,REFIID,DWORD,LPFORMATETC,LPOLECLIENTSITE,LPSTORAGE,PVOID*);
-WINOLEAPI OleCreateFromFile(REFCLSID,LPCOLESTR,REFIID,DWORD,LPFORMATETC,LPOLECLIENTSITE,LPSTORAGE,PVOID*);
-WINOLEAPI OleLoad(LPSTORAGE,REFIID,LPOLECLIENTSITE,PVOID*);
-WINOLEAPI OleSave(LPPERSISTSTORAGE,LPSTORAGE,BOOL);
-WINOLEAPI OleLoadFromStream(LPSTREAM,REFIID,PVOID*);
-WINOLEAPI OleSaveToStream(LPPERSISTSTREAM,LPSTREAM);
-WINOLEAPI OleSetContainedObject(LPUNKNOWN,BOOL);
-WINOLEAPI OleNoteObjectVisible(LPUNKNOWN,BOOL);
-WINOLEAPI RegisterDragDrop(HWND,LPDROPTARGET);
-WINOLEAPI RevokeDragDrop(HWND);
-WINOLEAPI DoDragDrop(LPDATAOBJECT,LPDROPSOURCE,DWORD,PDWORD);
-WINOLEAPI OleSetClipboard(LPDATAOBJECT);
-WINOLEAPI OleGetClipboard(LPDATAOBJECT*);
-WINOLEAPI OleFlushClipboard(void);
-WINOLEAPI OleIsCurrentClipboard(LPDATAOBJECT);
-WINOLEAPI_(HOLEMENU) OleCreateMenuDescriptor(HMENU,LPOLEMENUGROUPWIDTHS);
-WINOLEAPI OleSetMenuDescriptor(HOLEMENU,HWND,HWND,LPOLEINPLACEFRAME,LPOLEINPLACEACTIVEOBJECT);
-WINOLEAPI OleDestroyMenuDescriptor(HOLEMENU);
-WINOLEAPI OleTranslateAccelerator(LPOLEINPLACEFRAME,LPOLEINPLACEFRAMEINFO,LPMSG);
-WINOLEAPI_(HANDLE) OleDuplicateData(HANDLE,CLIPFORMAT,UINT);
-WINOLEAPI OleDraw(LPUNKNOWN,DWORD,HDC,LPCRECT);
-WINOLEAPI OleRun(LPUNKNOWN);
-WINOLEAPI_(BOOL) OleIsRunning(LPOLEOBJECT);
-WINOLEAPI OleLockRunning(LPUNKNOWN,BOOL,BOOL);
-WINOLEAPI_(void) ReleaseStgMedium(LPSTGMEDIUM);
-WINOLEAPI CreateOleAdviseHolder(LPOLEADVISEHOLDER*);
-WINOLEAPI OleCreateDefaultHandler(REFCLSID,LPUNKNOWN,REFIID,PVOID*);
-WINOLEAPI OleCreateEmbeddingHelper(REFCLSID,LPUNKNOWN,DWORD,LPCLASSFACTORY,REFIID,PVOID*);
-WINOLEAPI_(BOOL) IsAccelerator(HACCEL,int,LPMSG,WORD*);
-WINOLEAPI_(HGLOBAL) OleGetIconOfFile(LPOLESTR,BOOL);
-WINOLEAPI_(HGLOBAL) OleGetIconOfClass(REFCLSID,LPOLESTR,BOOL);
-WINOLEAPI_(HGLOBAL) OleMetafilePictFromIconAndLabel(HICON,LPOLESTR,LPOLESTR,UINT);
-WINOLEAPI OleRegGetUserType(REFCLSID,DWORD,LPOLESTR*);
-WINOLEAPI OleRegGetMiscStatus(REFCLSID,DWORD,DWORD*);
-WINOLEAPI OleRegEnumFormatEtc (REFCLSID,DWORD,LPENUMFORMATETC*);
-WINOLEAPI OleRegEnumVerbs (REFCLSID,LPENUMOLEVERB*);
-WINOLEAPI OleConvertOLESTREAMToIStorage(LPOLESTREAM,LPSTORAGE,const DVTARGETDEVICE*);
-WINOLEAPI OleConvertIStorageToOLESTREAM(LPSTORAGE,LPOLESTREAM);
-WINOLEAPI GetHGlobalFromILockBytes(LPLOCKBYTES,HGLOBAL*);
-WINOLEAPI CreateILockBytesOnHGlobal(HGLOBAL,BOOL,LPLOCKBYTES*);
-WINOLEAPI GetHGlobalFromStream(LPSTREAM,HGLOBAL*);
-WINOLEAPI CreateStreamOnHGlobal(HGLOBAL,BOOL,LPSTREAM*);
-WINOLEAPI OleDoAutoConvert(LPSTORAGE,LPCLSID);
-WINOLEAPI OleGetAutoConvert(REFCLSID,LPCLSID);
-WINOLEAPI OleSetAutoConvert(REFCLSID,REFCLSID);
-WINOLEAPI GetConvertStg(LPSTORAGE);
-WINOLEAPI SetConvertStg(LPSTORAGE,BOOL);
-WINOLEAPI OleConvertIStorageToOLESTREAMEx(LPSTORAGE,CLIPFORMAT,LONG,LONG,DWORD,LPSTGMEDIUM,LPOLESTREAM);
-WINOLEAPI OleConvertOLESTREAMToIStorageEx(LPOLESTREAM,LPSTORAGE,CLIPFORMAT*,LONG*,LONG*,DWORD*,LPSTGMEDIUM);
-#ifdef __cplusplus
-}
-#endif
-#pragma pack(pop)
-#endif
diff --git a/winsup/w32api/include/ole2ver.h b/winsup/w32api/include/ole2ver.h
deleted file mode 100644
index 667003a82..000000000
--- a/winsup/w32api/include/ole2ver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _OLE2VER_H
-#define _OLE2VER_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-#define rmm 23
-#define rup 639
-#endif
diff --git a/winsup/w32api/include/oleacc.h b/winsup/w32api/include/oleacc.h
deleted file mode 100644
index 726370091..000000000
--- a/winsup/w32api/include/oleacc.h
+++ /dev/null
@@ -1,217 +0,0 @@
-#ifndef _OLEACC_H
-#define _OLEACC_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DISPID_ACC_PARENT                   (-5000)
-#define DISPID_ACC_CHILDCOUNT               (-5001)
-#define DISPID_ACC_CHILD                    (-5002)
-
-#define DISPID_ACC_NAME                     (-5003)
-#define DISPID_ACC_VALUE                    (-5004)
-#define DISPID_ACC_DESCRIPTION              (-5005)
-#define DISPID_ACC_ROLE                     (-5006)
-#define DISPID_ACC_STATE                    (-5007)
-#define DISPID_ACC_HELP                     (-5008)
-#define DISPID_ACC_HELPTOPIC                (-5009)
-#define DISPID_ACC_KEYBOARDSHORTCUT         (-5010)
-#define DISPID_ACC_FOCUS                    (-5011)
-#define DISPID_ACC_SELECTION                (-5012)
-#define DISPID_ACC_DEFAULTACTION            (-5013)
-
-#define DISPID_ACC_SELECT                   (-5014)
-#define DISPID_ACC_LOCATION                 (-5015)
-#define DISPID_ACC_NAVIGATE                 (-5016)
-#define DISPID_ACC_HITTEST                  (-5017)
-#define DISPID_ACC_DODEFAULTACTION          (-5018)
-
-#define NAVDIR_DOWN 2
-#define NAVDIR_FIRSTCHILD 7
-#define NAVDIR_LASTCHILD 8
-#define NAVDIR_LEFT 3
-#define NAVDIR_NEXT 5
-#define NAVDIR_PREVIOUS 6
-#define NAVDIR_RIGHT 4
-#define NAVDIR_UP 1
-
-#define ROLE_SYSTEM_ALERT 8
-#define ROLE_SYSTEM_ANIMATION 54
-#define ROLE_SYSTEM_APPLICATION 14
-#define ROLE_SYSTEM_BORDER 19
-#define ROLE_SYSTEM_BUTTONDROPDOWN  56
-#define ROLE_SYSTEM_BUTTONDROPDOWNGRID 58
-#define ROLE_SYSTEM_BUTTONMENU 57
-#define ROLE_SYSTEM_CARET 7
-#define ROLE_SYSTEM_CELL 29
-#define ROLE_SYSTEM_CHARACTER 32
-#define ROLE_SYSTEM_CHART 17
-#define ROLE_SYSTEM_CHECKBUTTON 44
-#define ROLE_SYSTEM_CLIENT 10
-#define ROLE_SYSTEM_CLOCK 61
-#define ROLE_SYSTEM_COLUMN 27
-#define ROLE_SYSTEM_COLUMNHEADER 25
-#define ROLE_SYSTEM_COMBOBOX 46
-#define ROLE_SYSTEM_CURSOR 6
-#define ROLE_SYSTEM_DIAGRAM 53
-#define ROLE_SYSTEM_DIAL 49
-#define ROLE_SYSTEM_DIALOG 18
-#define ROLE_SYSTEM_DOCUMENT 15
-#define ROLE_SYSTEM_DROPLIST 47
-#define ROLE_SYSTEM_EQUATION 55
-#define ROLE_SYSTEM_GRAPHIC 40
-#define ROLE_SYSTEM_GRIP 4
-#define ROLE_SYSTEM_GROUPING 20
-#define ROLE_SYSTEM_HELPBALLOON 31
-#define ROLE_SYSTEM_HOTKEYFIELD 50
-#define ROLE_SYSTEM_INDICATOR 39
-#define ROLE_SYSTEM_LINK 30
-#define ROLE_SYSTEM_LIST 33
-#define ROLE_SYSTEM_LISTITEM 34
-#define ROLE_SYSTEM_MENUBAR 2
-#define ROLE_SYSTEM_MENUITEM 12
-#define ROLE_SYSTEM_MENUPOPUP 11
-#define ROLE_SYSTEM_OUTLINE 35
-#define ROLE_SYSTEM_OUTLINEITEM 36
-#define ROLE_SYSTEM_PAGETAB 37
-#define ROLE_SYSTEM_PAGETABLIST 60
-#define ROLE_SYSTEM_PANE 16
-#define ROLE_SYSTEM_PROGRESSBAR 48
-#define ROLE_SYSTEM_PROPERTYPAGE 38
-#define ROLE_SYSTEM_PUSHBUTTON 43
-#define ROLE_SYSTEM_RADIOBUTTON 45
-#define ROLE_SYSTEM_ROW 28
-#define ROLE_SYSTEM_ROWHEADER 26
-#define ROLE_SYSTEM_SCROLLBAR 3
-#define ROLE_SYSTEM_SEPARATOR 21
-#define ROLE_SYSTEM_SLIDER 51
-#define ROLE_SYSTEM_SOUND 5
-#define ROLE_SYSTEM_SPINBUTTON 52
-#define ROLE_SYSTEM_STATICTEXT 41
-#define ROLE_SYSTEM_STATUSBAR 23
-#define ROLE_SYSTEM_TABLE 24
-#define ROLE_SYSTEM_TEXT 42
-#define ROLE_SYSTEM_TITLEBAR 1
-#define ROLE_SYSTEM_TOOLBAR 22
-#define ROLE_SYSTEM_TOOLTIP 13
-#define ROLE_SYSTEM_WHITESPACE 59
-#define ROLE_SYSTEM_WINDOW 9
-
-#define STATE_SYSTEM_UNAVAILABLE 0x00000001
-#define STATE_SYSTEM_SELECTED 0x00000002
-#define STATE_SYSTEM_FOCUSED 0x00000004
-#define STATE_SYSTEM_PRESSED 0x00000008
-#define STATE_SYSTEM_CHECKED 0x00000010
-#define STATE_SYSTEM_MIXED 0x00000020
-#define STATE_SYSTEM_READONLY 0x00000040
-#define STATE_SYSTEM_HOTTRACKED 0x00000080
-#define STATE_SYSTEM_DEFAULT 0x00000100
-#define STATE_SYSTEM_EXPANDED 0x00000200
-#define STATE_SYSTEM_COLLAPSED 0x00000400
-#define STATE_SYSTEM_BUSY 0x00000800
-#define STATE_SYSTEM_FLOATING 0x00001000
-#define STATE_SYSTEM_MARQUEED 0x00002000
-#define STATE_SYSTEM_ANIMATED 0x00004000
-#define STATE_SYSTEM_INVISIBLE 0x00008000
-#define STATE_SYSTEM_OFFSCREEN 0x00010000
-#define STATE_SYSTEM_SIZEABLE 0x00020000
-#define STATE_SYSTEM_MOVEABLE 0x00040000
-#define STATE_SYSTEM_SELFVOICING 0x00080000
-#define STATE_SYSTEM_FOCUSABLE 0x00100000
-#define STATE_SYSTEM_SELECTABLE 0x00200000
-#define STATE_SYSTEM_LINKED 0x00400000
-#define STATE_SYSTEM_TRAVERSED 0x00800000
-#define STATE_SYSTEM_MULTISELECTABLE 0x01000000
-#define STATE_SYSTEM_EXTSELECTABLE 0x02000000
-#define STATE_SYSTEM_ALERT_LOW 0x04000000
-#define STATE_SYSTEM_ALERT_MEDIUM 0x08000000
-#define STATE_SYSTEM_ALERT_HIGH 0x10000000
-#define STATE_SYSTEM_VALID 0x1fffffff
-
-typedef enum tagSELFLAG 
-{
-  SELFLAG_NONE = 0,
-  SELFLAG_TAKEFOCUS = 1,
-  SELFLAG_TAKESELECTION = 2,
-  SELFLAG_EXTENDSELECTION = 4,
-  SELFLAG_ADDSELECTION = 8,
-  SELFLAG_REMOVESELECTION = 16
-} SELFLAG; 
-
-#define SELFLAG_VALID	0x0000001F
-
-/* DEFINE_GUID(LIBID_Accessibility, 0x1ea4dbf0, 0x3c3b,0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); */
-/* DEFINE_GUID(IID_IAccessible,     0x618736e0, 0x3c3d,0x11cf, 0x81, 0x0c, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); */
-EXTERN_C const IID IID_IAccessible;
-#undef INTERFACE
-#define INTERFACE IAccessible
-DECLARE_INTERFACE_(IAccessible, IDispatch)
-{
-    STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-    STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
-    STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
-    STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
-    STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
-
-    STDMETHOD(get_accParent)(THIS_ IDispatch**) PURE;
-    STDMETHOD(get_accChildCount)(THIS_ long*) PURE;
-    STDMETHOD(get_accChild)(THIS_ VARIANT, IDispatch **) PURE;
-    STDMETHOD(get_accName)(THIS_ VARIANT, BSTR*) PURE;
-    STDMETHOD(get_accValue)(THIS_ VARIANT, BSTR*) PURE;
-    STDMETHOD(get_accDescription)(THIS_ VARIANT, BSTR*) PURE;
-    STDMETHOD(get_accRole)(THIS_ VARIANT, VARIANT*) PURE;
-    STDMETHOD(get_accState)(THIS_ VARIANT, VARIANT*) PURE;
-    STDMETHOD(get_accHelp)(THIS_ VARIANT, BSTR*) PURE;
-    STDMETHOD(get_accHelpTopic)(THIS_ BSTR*, VARIANT, long*) PURE;
-    STDMETHOD(get_accKeyboardShortcut)(THIS_ VARIANT, BSTR*) PURE;
-    STDMETHOD(get_accFocus)(THIS_ VARIANT*) PURE;
-    STDMETHOD(get_accSelection)(THIS_ VARIANT*) PURE;
-    STDMETHOD(get_accDefaultAction)(THIS_ VARIANT, BSTR*) PURE;
-
-    STDMETHOD(accSelect)(THIS_ long, VARIANT) PURE;
-    STDMETHOD(accLocation)(THIS_ long*, long*, long*, long*, VARIANT) PURE;
-    STDMETHOD(accNavigate)(THIS_ long, VARIANT, VARIANT*) PURE;
-    STDMETHOD(accHitTest)(THIS_ long, long, VARIANT*) PURE;
-    STDMETHOD(accDoDefaultAction)(THIS_ VARIANT) PURE;
-
-    STDMETHOD(put_accName)(THIS_ VARIANT, BSTR) PURE;
-    STDMETHOD(put_accValue)(THIS_ VARIANT, BSTR) PURE;
-};
-typedef IAccessible* LPACCESSIBLE;
-
-STDAPI AccessibleChildren(IAccessible*,LONG,LONG,VARIANT*,LONG*);
-STDAPI AccessibleObjectFromEvent(HWND,DWORD,DWORD,IAccessible*,VARIANT*);
-STDAPI AccessibleObjectFromPoint(POINT,IAccessible**,VARIANT*);
-STDAPI AccessibleObjectFromWindow(HWND,DWORD,REFIID,void**);
-STDAPI CreateStdAccessibleObject(HWND,LONG,REFIID,void**);
-STDAPI CreateStdAccessibleProxyA(HWND,LPCSTR,LONG,REFIID,void**);
-STDAPI CreateStdAccessibleProxyW(HWND,LPCWSTR,LONG,REFIID,void**);
-void WINAPI GetOleaccVersionInfo(DWORD*,DWORD*);
-UINT WINAPI GetRoleTextA(DWORD,LPSTR,UINT);
-UINT WINAPI GetRoleTextW(DWORD,LPWSTR,UINT);
-UINT WINAPI GetStateTextA(DWORD,LPSTR,UINT);
-UINT WINAPI GetStateTextW(DWORD,LPWSTR,UINT);
-LRESULT WINAPI LresultFromObject(REFIID,WPARAM,LPUNKNOWN);
-STDAPI ObjectFromLresult(LRESULT,REFIID,WPARAM,void**);
-STDAPI WindowFromAccessibleObject(IAccessible*,HWND*);
-
-#ifdef UNICODE
-#define CreateStdAccessibleProxy CreateStdAccessibleProxyW
-#define GetRoleText GetRoleTextW
-#define GetStateText GetStateTextW
-#else
-#define CreateStdAccessibleProxy CreateStdAccessibleProxyA
-#define GetRoleText GetRoleTextA
-#define GetStateText GetStateTextA
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _OLEACC_H */
diff --git a/winsup/w32api/include/oleauto.h b/winsup/w32api/include/oleauto.h
deleted file mode 100644
index d28067c7a..000000000
--- a/winsup/w32api/include/oleauto.h
+++ /dev/null
@@ -1,261 +0,0 @@
-#ifndef _OLEAUTO_H
-#define _OLEAUTO_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#pragma pack(push,8)
-#define WINOLEAUTAPI STDAPI
-#define WINOLEAUTAPI_(type) STDAPI_(type)
-#define STDOLE_MAJORVERNUM 1
-#define STDOLE_MINORVERNUM 0
-#define STDOLE_LCID 0
-#define VARIANT_NOVALUEPROP 0x01
-#define VARIANT_ALPHABOOL 0x02
-#define VARIANT_NOUSEOVERRIDE 0x04
-#define VARIANT_LOCALBOOL 0x08
-#define VAR_TIMEVALUEONLY 0x0001
-#define VAR_DATEVALUEONLY 0x0002
-#define MEMBERID_NIL DISPID_UNKNOWN
-#define ID_DEFAULTINST (-2)
-#define DISPATCH_METHOD 1
-#define DISPATCH_PROPERTYGET 2
-#define DISPATCH_PROPERTYPUT 4
-#define DISPATCH_PROPERTYPUTREF 8
-#define LHashValOfName(l,n) LHashValOfNameSys(SYS_WIN32,l,n)
-#define WHashValOfLHashVal(h) ((unsigned short)(0x0000ffff&(h)))
-#define IsHashValCompatible(h1,h2) ((BOOL)((0x00ff0000&(h1))==(0x00ff0000&(h2))))
-#define ACTIVEOBJECT_STRONG 0
-#define ACTIVEOBJECT_WEAK 1
-#ifdef NONAMELESSUNION
-#define V_UNION(X,Y) ((X)->n1.n2.n3.Y)
-#define V_VT(X) ((X)->n1.n2.vt)
-#else
-#define V_UNION(X,Y) ((X)->Y)
-#define V_VT(X) ((X)->vt)
-#endif
-#define V_BOOL(X) V_UNION(X,boolVal)
-#define V_ISBYREF(X) (V_VT(X)&VT_BYREF)
-#define V_ISARRAY(X) (V_VT(X)&VT_ARRAY)
-#define V_ISVECTOR(X) (V_VT(X)&VT_VECTOR)
-#define V_NONE(X) V_I2(X)
-#define V_UI1(X) V_UNION(X,bVal)
-#define V_UI1REF(X) V_UNION(X,pbVal)
-#define V_I2(X) V_UNION(X,iVal)
-#define V_I2REF(X) V_UNION(X,piVal)
-#define V_I4(X) V_UNION(X,lVal)
-#define V_I4REF(X) V_UNION(X,plVal)
-#define V_I8(X) V_UNION(X,hVal)
-#define V_I8REF(X) V_UNION(X,phVal)
-#define V_R4(X) V_UNION(X,fltVal)
-#define V_R4REF(X) V_UNION(X,pfltVal)
-#define V_R8(X) V_UNION(X,dblVal)
-#define V_R8REF(X) V_UNION(X,pdblVal)
-#define V_CY(X) V_UNION(X,cyVal)
-#define V_CYREF(X) V_UNION(X,pcyVal)
-#define V_DATE(X) V_UNION(X,date)
-#define V_DATEREF(X) V_UNION(X,pdate)
-#define V_BSTR(X) V_UNION(X,bstrVal)
-#define V_BSTRREF(X) V_UNION(X,pbstrVal)
-#define V_DISPATCH(X) V_UNION(X,pdispVal)
-#define V_DISPATCHREF(X) V_UNION(X,ppdispVal)
-#define V_ERROR(X) V_UNION(X,scode)
-#define V_ERRORREF(X) V_UNION(X,pscode)
-#define V_BOOLREF(X) V_UNION(X,pboolVal)
-#define V_UNKNOWN(X) V_UNION(X,punkVal)
-#define V_UNKNOWNREF(X) V_UNION(X,ppunkVal)
-#define V_VARIANTREF(X) V_UNION(X,pvarVal)
-#define V_LPSTR(X) V_UNION(X,pszVal)
-#define V_LPSTRREF(X) V_UNION(X,ppszVal)
-#define V_LPWSTR(X) V_UNION(X,pwszVal)
-#define V_LPWSTRREF(X) V_UNION(X,ppwszVal)
-#define V_FILETIME(X) V_UNION(X,filetime)
-#define V_FILETIMEREF(X) V_UNION(X,pfiletime)
-#define V_BLOB(X) V_UNION(X,blob)
-#define V_UUID(X) V_UNION(X,puuid)
-#define V_CLSID(X) V_UNION(X,puuid)
-#define V_ARRAY(X) V_UNION(X,parray)
-#define V_ARRAYREF(X) V_UNION(X,pparray)
-#define V_BYREF(X) V_UNION(X,byref)
-#define V_DECIMAL(X) V_UNION(X,decVal)
-#define V_DECIMALREF(X) V_UNION(X,pdecVal)
-#define V_I1(X) V_UNION(X,cVal)
-
-#include <oaidl.h>
-
-typedef enum tagREGKIND {
-	REGKIND_DEFAULT,
-	REGKIND_REGISTER,
-	REGKIND_NONE
-} REGKIND;
-typedef struct tagPARAMDATA {
-	OLECHAR *szName;
-	VARTYPE vt;
-} PARAMDATA,*LPPARAMDATA;
-typedef struct tagMETHODDATA {
-	OLECHAR *szName;
-	PARAMDATA *ppdata;
-	DISPID dispid;
-	UINT iMeth;
-	CALLCONV cc;
-	UINT cArgs;
-	WORD wFlags;
-	VARTYPE vtReturn;
-} METHODDATA,*LPMETHODDATA;
-typedef struct tagINTERFACEDATA {
-	METHODDATA *pmethdata;
-	UINT cMembers;
-} INTERFACEDATA,*LPINTERFACEDATA;
-
-WINOLEAUTAPI_(BSTR) SysAllocString(const OLECHAR*);
-WINOLEAUTAPI_(int) SysReAllocString(BSTR*,const OLECHAR*);
-WINOLEAUTAPI_(BSTR) SysAllocStringLen(const OLECHAR*,unsigned int);
-WINOLEAUTAPI_(int) SysReAllocStringLen(BSTR*,const OLECHAR*,unsigned int);
-WINOLEAUTAPI_(void) SysFreeString(BSTR);
-WINOLEAUTAPI_(unsigned int) SysStringLen(BSTR);
-WINOLEAUTAPI_(unsigned int) SysStringByteLen(BSTR);
-WINOLEAUTAPI_(BSTR) SysAllocStringByteLen(const char*,unsigned int);
-WINOLEAUTAPI_(int) DosDateTimeToVariantTime(unsigned short,unsigned short,double*);
-WINOLEAUTAPI_(int) VariantTimeToDosDateTime(double,unsigned short*,unsigned short*);
-WINOLEAUTAPI_(int) VariantTimeToSystemTime(double,LPSYSTEMTIME);
-WINOLEAUTAPI_(int) SystemTimeToVariantTime(LPSYSTEMTIME, double*);
-WINOLEAUTAPI SafeArrayAllocDescriptor(unsigned int,SAFEARRAY**);
-WINOLEAUTAPI SafeArrayAllocData(SAFEARRAY*);
-WINOLEAUTAPI_(SAFEARRAY*) SafeArrayCreate(VARTYPE,unsigned int,SAFEARRAYBOUND*);
-WINOLEAUTAPI SafeArrayDestroyDescriptor(SAFEARRAY*);
-WINOLEAUTAPI SafeArrayDestroyData(SAFEARRAY*);
-WINOLEAUTAPI SafeArrayDestroy(SAFEARRAY*);
-WINOLEAUTAPI SafeArrayRedim(SAFEARRAY*,SAFEARRAYBOUND*);
-WINOLEAUTAPI_(unsigned int) SafeArrayGetDim(SAFEARRAY*);
-WINOLEAUTAPI_(unsigned int) SafeArrayGetElemsize(SAFEARRAY*);
-WINOLEAUTAPI SafeArrayGetUBound(SAFEARRAY*,unsigned int,long*);
-WINOLEAUTAPI SafeArrayGetLBound(SAFEARRAY*,unsigned int,long*);
-WINOLEAUTAPI SafeArrayLock(SAFEARRAY*);
-WINOLEAUTAPI SafeArrayUnlock(SAFEARRAY*);
-WINOLEAUTAPI SafeArrayAccessData(SAFEARRAY*,void**);
-WINOLEAUTAPI SafeArrayUnaccessData(SAFEARRAY*);
-WINOLEAUTAPI SafeArrayGetElement(SAFEARRAY*,long*,void*);
-WINOLEAUTAPI SafeArrayPutElement(SAFEARRAY*,long*,void*);
-WINOLEAUTAPI SafeArrayCopy(SAFEARRAY*,SAFEARRAY**);
-WINOLEAUTAPI SafeArrayPtrOfIndex(SAFEARRAY*,long*,void**);
-WINOLEAUTAPI_(SAFEARRAY*) SafeArrayCreateVector(VARTYPE,LONG,UINT);
-WINOLEAUTAPI_(void) VariantInit(VARIANTARG*);
-WINOLEAUTAPI VariantClear(VARIANTARG*);
-WINOLEAUTAPI VariantCopy(VARIANTARG*,VARIANTARG*);
-WINOLEAUTAPI VariantCopyInd(VARIANT*,VARIANTARG*);
-WINOLEAUTAPI VariantChangeType(VARIANTARG*,VARIANTARG*,unsigned short,VARTYPE);
-WINOLEAUTAPI VariantChangeTypeEx(VARIANTARG*,VARIANTARG*,LCID,unsigned short,VARTYPE);
-WINOLEAUTAPI VarUI1FromI2(short,unsigned char*);
-WINOLEAUTAPI VarUI1FromI4(long,unsigned char*);
-WINOLEAUTAPI VarUI1FromR4(float,unsigned char*);
-WINOLEAUTAPI VarUI1FromR8(double,unsigned char*);
-WINOLEAUTAPI VarUI1FromCy(CY,unsigned char*);
-WINOLEAUTAPI VarUI1FromDate(DATE,unsigned char*);
-WINOLEAUTAPI VarUI1FromStr(OLECHAR*,LCID,unsigned long,unsigned char*);
-WINOLEAUTAPI VarUI1FromDisp(LPDISPATCH*,LCID,unsigned char*);
-WINOLEAUTAPI VarUI1FromBool(VARIANT_BOOL,unsigned char*);
-WINOLEAUTAPI VarI2FromUI1(unsigned char,short*);
-WINOLEAUTAPI VarI2FromI4(long,short*);
-WINOLEAUTAPI VarI2FromR4(float,short*);
-WINOLEAUTAPI VarI2FromR8(double,short*);
-WINOLEAUTAPI VarI2FromCy(CY cyIn,short*);
-WINOLEAUTAPI VarI2FromDate(DATE,short*);
-WINOLEAUTAPI VarI2FromStr(OLECHAR*,LCID,unsigned long,short*);
-WINOLEAUTAPI VarI2FromDisp(LPDISPATCH*,LCID,short*);
-WINOLEAUTAPI VarI2FromBool(VARIANT_BOOL,short*);
-WINOLEAUTAPI VarI4FromUI1(unsigned char,long*);
-WINOLEAUTAPI VarI4FromI2(short,long*);
-WINOLEAUTAPI VarI4FromR4(float,long*);
-WINOLEAUTAPI VarI4FromR8(double,long*);
-WINOLEAUTAPI VarI4FromCy(CY,long*);
-WINOLEAUTAPI VarI4FromDate(DATE,long*);
-WINOLEAUTAPI VarI4FromStr(OLECHAR*,LCID,unsigned long,long*);
-WINOLEAUTAPI VarI4FromDisp(LPDISPATCH*,LCID,long*);
-WINOLEAUTAPI VarI4FromBool(VARIANT_BOOL,long*);
-WINOLEAUTAPI VarR4FromUI1(unsigned char,float*);
-WINOLEAUTAPI VarR4FromI2(short,float*);
-WINOLEAUTAPI VarR4FromI4(long,float*);
-WINOLEAUTAPI VarR4FromR8(double,float*);
-WINOLEAUTAPI VarR4FromCy(CY,float*);
-WINOLEAUTAPI VarR4FromDate(DATE,float*);
-WINOLEAUTAPI VarR4FromStr(OLECHAR*,LCID,unsigned long,float*);
-WINOLEAUTAPI VarR4FromDisp(LPDISPATCH*,LCID,float*);
-WINOLEAUTAPI VarR4FromBool(VARIANT_BOOL,float*);
-WINOLEAUTAPI VarR8FromUI1(unsigned char,double*);
-WINOLEAUTAPI VarR8FromI2(short,double*);
-WINOLEAUTAPI VarR8FromI4(long,double*);
-WINOLEAUTAPI VarR8FromR4(float,double*);
-WINOLEAUTAPI VarR8FromCy(CY,double*);
-WINOLEAUTAPI VarR8FromDate(DATE,double*);
-WINOLEAUTAPI VarR8FromStr(OLECHAR*,LCID,unsigned long,double*);
-WINOLEAUTAPI VarR8FromDisp(LPDISPATCH*,LCID,double*);
-WINOLEAUTAPI VarR8FromBool(VARIANT_BOOL,double*);
-WINOLEAUTAPI VarR8FromDec(DECIMAL*,double*);
-WINOLEAUTAPI VarDateFromUI1(unsigned char,DATE*);
-WINOLEAUTAPI VarDateFromI2(short,DATE*);
-WINOLEAUTAPI VarDateFromI4(long,DATE*);
-WINOLEAUTAPI VarDateFromR4(float,DATE*);
-WINOLEAUTAPI VarDateFromR8(double,DATE*);
-WINOLEAUTAPI VarDateFromCy(CY,DATE*);
-WINOLEAUTAPI VarDateFromStr(OLECHAR*,LCID,unsigned long,DATE*);
-WINOLEAUTAPI VarDateFromDisp(LPDISPATCH*,LCID,DATE*);
-WINOLEAUTAPI VarDateFromBool(VARIANT_BOOL,DATE*);
-WINOLEAUTAPI VarCyFromUI1(unsigned char,CY*);
-WINOLEAUTAPI VarCyFromI2(short,CY*);
-WINOLEAUTAPI VarCyFromI4(long,CY*);
-WINOLEAUTAPI VarCyFromR4(float,CY*);
-WINOLEAUTAPI VarCyFromR8(double,CY*);
-WINOLEAUTAPI VarCyFromDate(DATE,CY*);
-WINOLEAUTAPI VarCyFromStr(OLECHAR*,LCID,unsigned long,CY*);
-WINOLEAUTAPI VarCyFromDisp(LPDISPATCH*,LCID,CY*);
-WINOLEAUTAPI VarCyFromBool(VARIANT_BOOL,CY*);
-WINOLEAUTAPI VarBstrFromUI1(unsigned char,LCID,unsigned long,BSTR*);
-WINOLEAUTAPI VarBstrFromI2(short,LCID,unsigned long,BSTR*);
-WINOLEAUTAPI VarBstrFromI4(long,LCID,unsigned long,BSTR*);
-WINOLEAUTAPI VarBstrFromR4(float,LCID,unsigned long,BSTR*);
-WINOLEAUTAPI VarBstrFromR8(double,LCID,unsigned long,BSTR*);
-WINOLEAUTAPI VarBstrFromCy(CY,LCID,unsigned long,BSTR*);
-WINOLEAUTAPI VarBstrFromDate(DATE,LCID,unsigned long,BSTR*);
-WINOLEAUTAPI VarBstrFromDisp(LPDISPATCH*,LCID,unsigned long,BSTR*);
-WINOLEAUTAPI VarBstrFromBool(VARIANT_BOOL,LCID,unsigned long,BSTR*);
-WINOLEAUTAPI VarBoolFromUI1(unsigned char,VARIANT_BOOL*);
-WINOLEAUTAPI VarBoolFromI2(short,VARIANT_BOOL*);
-WINOLEAUTAPI VarBoolFromI4(long,VARIANT_BOOL*);
-WINOLEAUTAPI VarBoolFromR4(float,VARIANT_BOOL*);
-WINOLEAUTAPI VarBoolFromR8(double,VARIANT_BOOL*);
-WINOLEAUTAPI VarBoolFromDate(DATE,VARIANT_BOOL*);
-WINOLEAUTAPI VarBoolFromCy(CY,VARIANT_BOOL*);
-WINOLEAUTAPI VarBoolFromStr(OLECHAR*,LCID,unsigned long,VARIANT_BOOL*);
-WINOLEAUTAPI VarBoolFromDisp(LPDISPATCH*,LCID,VARIANT_BOOL*);
-WINOLEAUTAPI VarDecFromR8(double,DECIMAL*);
-WINOLEAUTAPI_(ULONG) LHashValOfNameSysA(SYSKIND,LCID,const char*);
-WINOLEAUTAPI_(ULONG) LHashValOfNameSys(SYSKIND,LCID,const OLECHAR*);
-WINOLEAUTAPI LoadTypeLib(const OLECHAR*,LPTYPELIB*);
-WINOLEAUTAPI LoadTypeLibEx(LPCOLESTR,REGKIND,LPTYPELIB*);
-WINOLEAUTAPI LoadRegTypeLib(REFGUID,WORD,WORD,LCID,LPTYPELIB*);
-WINOLEAUTAPI QueryPathOfRegTypeLib(REFGUID,unsigned short,unsigned short,LCID,LPBSTR);
-WINOLEAUTAPI RegisterTypeLib(LPTYPELIB,OLECHAR*,OLECHAR*);
-WINOLEAUTAPI UnRegisterTypeLib(REFGUID,WORD,WORD,LCID,SYSKIND);
-WINOLEAUTAPI CreateTypeLib(SYSKIND,const OLECHAR*,LPCREATETYPELIB*);
-WINOLEAUTAPI DispGetParam(DISPPARAMS*,UINT,VARTYPE,VARIANT*,UINT*);
-WINOLEAUTAPI DispGetIDsOfNames(LPTYPEINFO,OLECHAR**,UINT,DISPID*);
-WINOLEAUTAPI DispInvoke(void*,LPTYPEINFO,DISPID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*);
-WINOLEAUTAPI CreateDispTypeInfo(INTERFACEDATA*,LCID,LPTYPEINFO*);
-WINOLEAUTAPI CreateStdDispatch(IUnknown*,void*,LPTYPEINFO,IUnknown**);
-WINOLEAUTAPI RegisterActiveObject(IUnknown*,REFCLSID,DWORD,DWORD*);
-WINOLEAUTAPI RevokeActiveObject(DWORD,void*);
-WINOLEAUTAPI GetActiveObject(REFCLSID,void*,IUnknown**);
-WINOLEAUTAPI SetErrorInfo(unsigned long,LPERRORINFO);
-WINOLEAUTAPI GetErrorInfo(unsigned long,LPERRORINFO*);
-WINOLEAUTAPI CreateErrorInfo(LPCREATEERRORINFO*);
-WINOLEAUTAPI_(unsigned long) OaBuildVersion(void);
-WINOLEAUTAPI VectorFromBstr (BSTR, SAFEARRAY **);
-WINOLEAUTAPI BstrFromVector (SAFEARRAY *, BSTR *);
-
-WINOLEAUTAPI VarAdd(LPVARIANT, LPVARIANT, LPVARIANT);
-WINOLEAUTAPI VarSub(LPVARIANT, LPVARIANT, LPVARIANT);
-WINOLEAUTAPI VarMul(LPVARIANT, LPVARIANT, LPVARIANT);
-WINOLEAUTAPI VarDiv(LPVARIANT, LPVARIANT, LPVARIANT);
-#pragma pack(pop)
-
-#endif
diff --git a/winsup/w32api/include/olectl.h b/winsup/w32api/include/olectl.h
deleted file mode 100644
index f0b86bc32..000000000
--- a/winsup/w32api/include/olectl.h
+++ /dev/null
@@ -1,323 +0,0 @@
-#ifndef _OLECTL_H
-#define _OLECTL_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ocidl.h>
-#include <olectlid.h>
-
-#define STD_CTL_SCODE(n) MAKE_SCODE(SEVERITY_ERROR,FACILITY_CONTROL,n)
-#define CTL_E_ILLEGALFUNCTIONCALL STD_CTL_SCODE(5)
-#define CTL_E_OVERFLOW STD_CTL_SCODE(6)
-#define CTL_E_OUTOFMEMORY STD_CTL_SCODE(7)
-#define CTL_E_DIVISIONBYZERO STD_CTL_SCODE(11)
-#define CTL_E_OUTOFSTRINGSPACE STD_CTL_SCODE(14)
-#define CTL_E_OUTOFSTACKSPACE STD_CTL_SCODE(28)
-#define CTL_E_BADFILENAMEORNUMBER STD_CTL_SCODE(52)
-#define CTL_E_FILENOTFOUND STD_CTL_SCODE(53)
-#define CTL_E_BADFILEMODE STD_CTL_SCODE(54)
-#define CTL_E_FILEALREADYOPEN STD_CTL_SCODE(55)
-#define CTL_E_DEVICEIOERROR STD_CTL_SCODE(57)
-#define CTL_E_FILEALREADYEXISTS STD_CTL_SCODE(58)
-#define CTL_E_BADRECORDLENGTH STD_CTL_SCODE(59)
-#define CTL_E_DISKFULL STD_CTL_SCODE(61)
-#define CTL_E_BADRECORDNUMBER STD_CTL_SCODE(63)
-#define CTL_E_BADFILENAME STD_CTL_SCODE(64)
-#define CTL_E_TOOMANYFILES STD_CTL_SCODE(67)
-#define CTL_E_DEVICEUNAVAILABLE STD_CTL_SCODE(68)
-#define CTL_E_PERMISSIONDENIED STD_CTL_SCODE(70)
-#define CTL_E_DISKNOTREADY STD_CTL_SCODE(71)
-#define CTL_E_PATHFILEACCESSERROR STD_CTL_SCODE(75)
-#define CTL_E_PATHNOTFOUND STD_CTL_SCODE(76)
-#define CTL_E_INVALIDPATTERNSTRING STD_CTL_SCODE(93)
-#define CTL_E_INVALIDUSEOFNULL STD_CTL_SCODE(94)
-#define CTL_E_INVALIDFILEFORMAT STD_CTL_SCODE(321)
-#define CTL_E_INVALIDPROPERTYVALUE STD_CTL_SCODE(380)
-#define CTL_E_INVALIDPROPERTYARRAYINDEX STD_CTL_SCODE(381)
-#define CTL_E_SETNOTSUPPORTEDATRUNTIME STD_CTL_SCODE(382)
-#define CTL_E_SETNOTSUPPORTED STD_CTL_SCODE(383)
-#define CTL_E_NEEDPROPERTYARRAYINDEX STD_CTL_SCODE(385)
-#define CTL_E_SETNOTPERMITTED STD_CTL_SCODE(387)
-#define CTL_E_GETNOTSUPPORTEDATRUNTIME STD_CTL_SCODE(393)
-#define CTL_E_GETNOTSUPPORTED STD_CTL_SCODE(394)
-#define CTL_E_PROPERTYNOTFOUND STD_CTL_SCODE(422)
-#define CTL_E_INVALIDCLIPBOARDFORMAT STD_CTL_SCODE(460)
-#define CTL_E_INVALIDPICTURE STD_CTL_SCODE(481)
-#define CTL_E_PRINTERERROR STD_CTL_SCODE(482)
-#define CTL_E_CANTSAVEFILETOTEMP STD_CTL_SCODE(735)
-#define CTL_E_SEARCHTEXTNOTFOUND STD_CTL_SCODE(744)
-#define CTL_E_REPLACEMENTSTOOLONG STD_CTL_SCODE(746)
-#define CUSTOM_CTL_SCODE(n) MAKE_SCODE(SEVERITY_ERROR,FACILITY_CONTROL,n)
-#define CTL_E_CUSTOM_FIRST CUSTOM_CTL_SCODE(600)
-#define CLASS_E_NOTLICENSED (CLASSFACTORY_E_FIRST+2)
-#define CONNECT_E_FIRST MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x200)
-#define CONNECT_E_LAST MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x20F)
-#define CONNECT_S_FIRST MAKE_SCODE(SEVERITY_SUCCESS,FACILITY_ITF,0x200)
-#define CONNECT_S_LAST MAKE_SCODE(SEVERITY_SUCCESS,FACILITY_ITF,0x20F)
-#define CONNECT_E_NOCONNECTION (CONNECT_E_FIRST+0)
-#define CONNECT_E_ADVISELIMIT (CONNECT_E_FIRST+1)
-#define CONNECT_E_CANNOTCONNECT (CONNECT_E_FIRST+2)
-#define CONNECT_E_OVERRIDDEN (CONNECT_E_FIRST+3)
-#define SELFREG_E_FIRST MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x200)
-#define SELFREG_E_LAST MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x20F)
-#define SELFREG_S_FIRST MAKE_SCODE(SEVERITY_SUCCESS,FACILITY_ITF,0x200)
-#define SELFREG_S_LAST MAKE_SCODE(SEVERITY_SUCCESS,FACILITY_ITF,0x20F)
-#define SELFREG_E_TYPELIB (SELFREG_E_FIRST+0)
-#define SELFREG_E_CLASS (SELFREG_E_FIRST+1)
-#define PERPROP_E_FIRST MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x200)
-#define PERPROP_E_LAST MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x20F)
-#define PERPROP_S_FIRST MAKE_SCODE(SEVERITY_SUCCESS,FACILITY_ITF,0x200)
-#define PERPROP_S_LAST MAKE_SCODE(SEVERITY_SUCCESS,FACILITY_ITF,0x20F)
-#define PERPROP_E_NOPAGEAVAILABLE PERPROP_E_FIRST
-#define OLEMISC_RECOMPOSEONRESIZE 0x1
-#define OLEMISC_ONLYICONIC 0x2
-#define OLEMISC_INSERTNOTREPLACE 0x4
-#define OLEMISC_STATIC 0x8
-#define OLEMISC_CANTLINKINSIDE 0x10
-#define OLEMISC_CANLINKBYOLE1 0x20
-#define OLEMISC_ISLINKOBJECT 0x40
-#define OLEMISC_INSIDEOUT 0x80
-#define OLEMISC_ACTIVATEWHENVISIBLE 0x100
-#define OLEMISC_RENDERINGISDEVICEINDEPENDENT 0x200
-#define OLEMISC_INVISIBLEATRUNTIME 0x400
-#define OLEMISC_ALWAYSRUN 0x800
-#define OLEMISC_ACTSLIKEBUTTON 0x1000
-#define OLEMISC_ACTSLIKELABEL 0x2000
-#define OLEMISC_NOUIACTIVATE 0x4000
-#define OLEMISC_ALIGNABLE 0x8000
-#define OLEMISC_SIMPLEFRAME 0x10000
-#define OLEMISC_SETCLIENTSITEFIRST 0x20000
-#define OLEMISC_IMEMODE 0x40000
-#define OLEMISC_IGNOREACTIVATEWHENVISIBLE 0x80000
-#define OLEMISC_WANTSTOMENUMERGE 0x100000
-#define OLEMISC_SUPPORTSMULTILEVELUNDO 0x200000
-#define OLEIVERB_PROPERTIES (-7)
-#define VT_STREAMED_PROPSET 73
-#define VT_STORED_PROPSET 74
-#define VT_BLOB_PROPSET 75
-#define VT_VERBOSE_ENUM	76
-#define VT_COLOR VT_I4
-#define VT_XPOS_PIXELS VT_I4
-#define VT_YPOS_PIXELS VT_I4
-#define VT_XSIZE_PIXELS VT_I4
-#define VT_YSIZE_PIXELS VT_I4
-#define VT_XPOS_HIMETRIC VT_I4
-#define VT_YPOS_HIMETRIC VT_I4
-#define VT_XSIZE_HIMETRIC VT_I4
-#define VT_YSIZE_HIMETRIC VT_I4
-#define VT_TRISTATE VT_I2
-#define VT_OPTEXCLUSIVE VT_BOOL
-#define VT_FONT VT_DISPATCH
-#define VT_PICTURE VT_DISPATCH
-#define VT_HANDLE VT_I4
-#define OCM__BASE (WM_USER+0x1c00)
-#define OCM_COMMAND (OCM__BASE+WM_COMMAND)
-#define OCM_CTLCOLORBTN (OCM__BASE+WM_CTLCOLORBTN)
-#define OCM_CTLCOLOREDIT (OCM__BASE+WM_CTLCOLOREDIT)
-#define OCM_CTLCOLORDLG (OCM__BASE+WM_CTLCOLORDLG)
-#define OCM_CTLCOLORLISTBOX (OCM__BASE+WM_CTLCOLORLISTBOX)
-#define OCM_CTLCOLORMSGBOX (OCM__BASE+WM_CTLCOLORMSGBOX)
-#define OCM_CTLCOLORSCROLLBAR (OCM__BASE+WM_CTLCOLORSCROLLBAR)
-#define OCM_CTLCOLORSTATIC (OCM__BASE+WM_CTLCOLORSTATIC)
-#define OCM_DRAWITEM (OCM__BASE+WM_DRAWITEM)
-#define OCM_MEASUREITEM (OCM__BASE+WM_MEASUREITEM)
-#define OCM_DELETEITEM (OCM__BASE+WM_DELETEITEM)
-#define OCM_VKEYTOITEM (OCM__BASE+WM_VKEYTOITEM)
-#define OCM_CHARTOITEM (OCM__BASE+WM_CHARTOITEM)
-#define OCM_COMPAREITEM (OCM__BASE+WM_COMPAREITEM)
-#define OCM_HSCROLL (OCM__BASE+WM_HSCROLL)
-#define OCM_VSCROLL (OCM__BASE+WM_VSCROLL)
-#define OCM_PARENTNOTIFY (OCM__BASE+WM_PARENTNOTIFY)
-#define OCM_NOTIFY (OCM__BASE+WM_NOTIFY)
-#define CTRLINFO_EATS_RETURN 1 
-#define CTRLINFO_EATS_ESCAPE 2 
-#define XFORMCOORDS_POSITION 1
-#define XFORMCOORDS_SIZE 2
-#define XFORMCOORDS_HIMETRICTOCONTAINER 4
-#define XFORMCOORDS_CONTAINERTOHIMETRIC 8
-#define GUIDKIND_DEFAULT_SOURCE_DISP_IID 1
-#define PROPPAGESTATUS_DIRTY 1
-#define PROPPAGESTATUS_VALIDATE 2
-#define FONTSIZE(n) {n##0000,0}
-#define PICTURE_SCALABLE 1
-#define PICTURE_TRANSPARENT 2
-#define PICTYPE_UNINITIALIZED (-1)
-#define PICTYPE_NONE	0
-#define PICTYPE_BITMAP	1
-#define PICTYPE_METAFILE	2
-#define PICTYPE_ICON	3
-#define PICTYPE_ENHMETAFILE	4
-#define DISPID_AUTOSIZE (-500)
-#define DISPID_BACKCOLOR (-501)
-#define DISPID_BACKSTYLE (-502)
-#define DISPID_BORDERCOLOR (-503)
-#define DISPID_BORDERSTYLE (-504)
-#define DISPID_BORDERWIDTH (-505)
-#define DISPID_DRAWMODE (-507)
-#define DISPID_DRAWSTYLE (-508)
-#define DISPID_DRAWWIDTH (-509)
-#define DISPID_FILLCOLOR (-510)
-#define DISPID_FILLSTYLE (-511)
-#define DISPID_FONT (-512)
-#define DISPID_FORECOLOR (-513)
-#define DISPID_ENABLED (-514)
-#define DISPID_HWND (-515)
-#define DISPID_TABSTOP (-516)
-#define DISPID_TEXT (-517)
-#define DISPID_CAPTION (-518)
-#define DISPID_BORDERVISIBLE (-519)
-#define DISPID_APPEARANCE	(-520)
-#define DISPID_MOUSEPOINTER	(-521)
-#define DISPID_MOUSEICON	(-522)
-#define DISPID_PICTURE	(-523)
-#define DISPID_VALID	(-524)
-#define DISPID_REFRESH (-550)
-#define DISPID_DOCLICK (-551)
-#define DISPID_ABOUTBOX (-552)
-#define DISPID_CLICK (-600)
-#define DISPID_DBLCLICK (-601)
-#define DISPID_KEYDOWN (-602)
-#define DISPID_KEYPRESS (-603)
-#define DISPID_KEYUP (-604)
-#define DISPID_MOUSEDOWN (-605)
-#define DISPID_MOUSEMOVE (-606)
-#define DISPID_MOUSEUP (-607)
-#define DISPID_ERROREVENT (-608)
-#define DISPID_AMBIENT_BACKCOLOR (-701)
-#define DISPID_AMBIENT_DISPLAYNAME (-702)
-#define DISPID_AMBIENT_FONT (-703)
-#define DISPID_AMBIENT_FORECOLOR (-704)
-#define DISPID_AMBIENT_LOCALEID (-705)
-#define DISPID_AMBIENT_MESSAGEREFLECT (-706)
-#define DISPID_AMBIENT_SCALEUNITS (-707)
-#define DISPID_AMBIENT_TEXTALIGN (-708)
-#define DISPID_AMBIENT_USERMODE (-709)
-#define DISPID_AMBIENT_UIDEAD (-710)
-#define DISPID_AMBIENT_SHOWGRABHANDLES (-711)
-#define DISPID_AMBIENT_SHOWHATCHING (-712)
-#define DISPID_AMBIENT_DISPLAYASDEFAULT (-713)
-#define DISPID_AMBIENT_SUPPORTSMNEMONICS (-714)
-#define DISPID_AMBIENT_AUTOCLIP (-715)
-#define DISPID_AMBIENT_APPEARANCE	(-716)
-#define DISPID_AMBIENT_CODEPAGE	(-725)
-#define DISPID_AMBIENT_PALETTE	(-726)
-#define DISPID_AMBIENT_CHARSET	(-727)
-#define DISPID_AMBIENT_RIGHTTOLEFT	(-732)
-#define DISPID_AMBIENT_TOPTOBOTTOM	(-733)
-
-#define DISPID_FONT_NAME 0
-#define DISPID_FONT_SIZE 2
-#define DISPID_FONT_BOLD 3
-#define DISPID_FONT_ITALIC 4
-#define DISPID_FONT_UNDER 5
-#define DISPID_FONT_STRIKE 6
-#define DISPID_FONT_WEIGHT 7
-#define DISPID_FONT_CHARSET 8
-#define DISPID_PICT_HANDLE 0
-#define DISPID_PICT_HPAL 2
-#define DISPID_PICT_TYPE 3
-#define DISPID_PICT_WIDTH 4
-#define DISPID_PICT_HEIGHT 5
-#define DISPID_PICT_RENDER 6
-
-typedef interface IOleControl *LPOLECONTROL;
-typedef interface IOleControlSite *LPOLECONTROLSITE;
-typedef interface ISimpleFrameSite *LPSIMPLEFRAMESITE;
-typedef interface IPersistPropertyBag *LPPERSISTPROPERTYBAG;
-typedef interface IPersistStreamInit *LPPERSISTSTREAMINIT;
-typedef interface IPersistMemory *LPPERSISTMEMORY;
-typedef interface IPropertyNotifySink* LPPROPERTYNOTIFYSINK;
-typedef interface IProvideClassInfo *LPPROVIDECLASSINFO;
-typedef interface IProvideClassInfo2 *LPPROVIDECLASSINFO2;
-typedef interface IConnectionPointContainer *LPCONNECTIONPOINTCONTAINER;
-typedef interface IClassFactory2 *LPCLASSFACTORY2;
-typedef interface ISpecifyPropertyPages *LPSPECIFYPROPERTYPAGES;
-typedef interface IPerPropertyBrowsing *LPPERPROPERTYBROWSING;
-typedef interface IPropertyPage *LPPROPERTYPAGE;
-typedef interface IPropertyPage2 *LPPROPERTYPAGE2;
-
-typedef interface IPicture *LPPICTURE;
-typedef interface IPictureDisp *LPPICTUREDISP;
-typedef long OLE_XPOS_PIXELS;
-typedef long OLE_YPOS_PIXELS;
-typedef long OLE_XSIZE_PIXELS;
-typedef long OLE_YSIZE_PIXELS;
-typedef float OLE_XPOS_CONTAINER;
-typedef float OLE_YPOS_CONTAINER;
-typedef float OLE_XSIZE_CONTAINER;
-
-typedef VARIANT_BOOL OLE_OPTEXCLUSIVE;
-typedef VARIANT_BOOL OLE_CANCELBOOL;
-typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL;
-
-#pragma pack(push,8)
-typedef enum { triUnchecked,triChecked1,triGray } OLE_TRISTATE;
-typedef struct tagOCPFIPARAMS {
-	ULONG cbStructSize;
-	HWND hWndOwner;
-	int x;
-	int y;
-	LPCOLESTR lpszCaption;
-	ULONG cObjects;
-	LPUNKNOWN *lplpUnk;
-	ULONG cPages;
-	CLSID *lpPages;
-	LCID lcid;
-	DISPID dispidInitialProperty;
-} OCPFIPARAMS,*LPOCPFIPARAMS;
-typedef struct tagFONTDESC {
-	UINT cbSizeofstruct;
-	LPOLESTR lpstrName;
-	CY cySize;
-	SHORT sWeight;
-	SHORT sCharset;
-	BOOL fItalic;
-	BOOL fUnderline;
-	BOOL fStrikethrough;
-} FONTDESC,*LPFONTDESC;
-typedef struct tagPICTDESC {
-	UINT cbSizeofstruct;
-	UINT picType;
-	_ANONYMOUS_UNION union {
-		struct {
-			HBITMAP hbitmap;
-			HPALETTE hpal;
-		} bmp;
-		struct {
-			HMETAFILE hmeta;
-			int xExt;
-			int yExt;
-		} wmf;
-		struct {
-			HICON hicon;
-		} icon;
-		struct {
-			HENHMETAFILE hemf;
-		} emf;
-	} DUMMYUNIONNAME;
-} PICTDESC,*LPPICTDESC;
-#pragma pack(pop)
-
-STDAPI DllRegisterServer(void);
-STDAPI DllUnregisterServer(void);
-STDAPI OleCreateFontIndirect(LPFONTDESC,REFIID,PVOID*);
-STDAPI OleCreatePictureIndirect(LPPICTDESC,REFIID,BOOL,PVOID*);
-STDAPI OleCreatePropertyFrame(HWND,UINT,UINT,LPCOLESTR,ULONG,LPUNKNOWN*,ULONG,LPCLSID,LCID,DWORD,PVOID);
-STDAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS);
-STDAPI_(HCURSOR) OleIconToCursor(HINSTANCE,HICON);
-STDAPI OleLoadPicture(LPSTREAM,LONG,BOOL,REFIID,PVOID*);
-STDAPI OleLoadPictureEx(LPSTREAM,LONG,BOOL,REFIID,DWORD,DWORD,DWORD,LPVOID*);
-STDAPI OleLoadPicturePath(LPOLESTR,LPUNKNOWN,DWORD,OLE_COLOR,REFIID,LPVOID*);
-STDAPI OleLoadPictureFile(VARIANT,LPDISPATCH*);
-STDAPI OleLoadPictureFileEx(VARIANT,DWORD,DWORD,DWORD,LPDISPATCH*);
-STDAPI OleSavePictureFile(LPDISPATCH,BSTR);
-STDAPI OleTranslateColor(OLE_COLOR,HPALETTE,COLORREF*);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/olectlid.h b/winsup/w32api/include/olectlid.h
deleted file mode 100644
index 73e935cca..000000000
--- a/winsup/w32api/include/olectlid.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifndef _OLECTLID_H
-#define _OLECTLID_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern const GUID IID_IDispatch;
-extern const GUID IID_IPropertyNotifySink;
-extern const GUID IID_IClassFactory2;
-extern const GUID IID_IProvideClassInfo;
-extern const GUID IID_IProvideClassInfo2;
-extern const GUID IID_IConnectionPointContainer;
-extern const GUID IID_IEnumConnectionPoints;
-extern const GUID IID_IConnectionPoint;
-extern const GUID IID_IEnumConnections;
-extern const GUID IID_IOleControl;
-extern const GUID IID_IOleControlSite;
-extern const GUID IID_ISimpleFrameSite;
-extern const GUID IID_IPersistStreamInit;
-extern const GUID IID_IPersistMemory;
-extern const GUID IID_IPersistPropertyBag;
-extern const GUID IID_IPropertyBag;
-extern const GUID IID_IErrorLog;
-extern const GUID IID_IPropertyFrame;
-extern const GUID IID_ISpecifyPropertyPages;
-extern const GUID IID_IPerPropertyBrowsing;
-extern const GUID IID_IPropertyPageSite;
-extern const GUID IID_IPropertyPage;
-extern const GUID IID_IPropertyPage2;
-extern const GUID CLSID_CFontPropPage;
-extern const GUID CLSID_CColorPropPage;
-extern const GUID CLSID_CPicturePropPage;
-extern const GUID CLSID_PersistPropset;
-extern const GUID CLSID_ConvertVBX;
-extern const GUID CLSID_StdFont;
-extern const GUID CLSID_StdPicture;
-extern const GUID IID_IFont;
-extern const GUID IID_IFontDisp;
-extern const GUID IID_IPicture;
-extern const GUID IID_IPictureDisp;
-extern const GUID GUID_HIMETRIC;
-extern const GUID GUID_COLOR;
-extern const GUID GUID_XPOSPIXEL;
-extern const GUID GUID_YPOSPIXEL;
-extern const GUID GUID_XSIZEPIXEL;
-extern const GUID GUID_YSIZEPIXEL;
-extern const GUID GUID_XPOS;
-extern const GUID GUID_YPOS;
-extern const GUID GUID_XSIZE;
-extern const GUID GUID_YSIZE;
-extern const GUID GUID_TRISTATE;
-extern const GUID GUID_OPTIONVALUEEXCLUSIVE;
-extern const GUID GUID_CHECKVALUEEXCLUSIVE;
-extern const GUID GUID_FONTNAME;
-extern const GUID GUID_FONTSIZE;
-extern const GUID GUID_FONTBOLD;
-extern const GUID GUID_FONTITALIC;
-extern const GUID GUID_FONTUNDERSCORE;
-extern const GUID GUID_FONTSTRIKETHROUGH;
-extern const GUID GUID_HANDLE;
-extern const GUID IID_IEnumUnknown;
-extern const GUID IID_IEnumString;
-extern const GUID IID_IEnumMoniker;
-extern const GUID IID_IEnumFORMATETC;
-extern const GUID IID_IEnumOLEVERB;
-extern const GUID IID_IEnumSTATDATA;
-extern const GUID IID_IEnumSTATSTG;
-extern const GUID IID_IEnumGeneric;
-extern const GUID IID_IEnumHolder;
-extern const GUID IID_IEnumCallback;
-extern const GUID IID_IPersistStream;
-extern const GUID IID_IPersistStorage;
-extern const GUID IID_IPersistFile;
-extern const GUID IID_IPersist;
-extern const GUID IID_IViewObject;
-extern const GUID IID_IDataObject;
-extern const GUID IID_IAdviseSink;
-extern const GUID IID_IDataAdviseHolder;
-extern const GUID IID_IOleAdviseHolder;
-extern const GUID IID_IOleObject;
-extern const GUID IID_IOleInPlaceObject;
-extern const GUID IID_IOleWindow;
-extern const GUID IID_IOleInPlaceUIWindow;
-extern const GUID IID_IOleInPlaceFrame;
-extern const GUID IID_IOleInPlaceActiveObject;
-extern const GUID IID_IOleClientSite;
-extern const GUID IID_IOleInPlaceSite;
-extern const GUID IID_IParseDisplayName;
-extern const GUID IID_IOleContainer;
-extern const GUID IID_IOleItemContainer;
-extern const GUID IID_IOleLink;
-extern const GUID IID_IOleCache;
-extern const GUID IID_IOleManager;
-extern const GUID IID_IOlePresObj;
-extern const GUID IID_IDropSource;
-extern const GUID IID_IDropTarget;
-extern const GUID IID_IDebug;
-extern const GUID IID_IDebugStream;
-extern const GUID IID_IAdviseSink2;
-extern const GUID IID_IRunnableObject;
-extern const GUID IID_IViewObject2;
-extern const GUID IID_IOleCache2;
-extern const GUID IID_IOleCacheControl;
-extern const GUID CLSID_Picture_Metafile;
-extern const GUID CLSID_Picture_Dib;
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/oledlg.h b/winsup/w32api/include/oledlg.h
deleted file mode 100644
index 11dd88b9f..000000000
--- a/winsup/w32api/include/oledlg.h
+++ /dev/null
@@ -1,935 +0,0 @@
-#ifndef _OLEDLG_H
-#define _OLEDLG_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <windows.h>
-#include <shellapi.h>
-#include <commdlg.h>
-#include <ole2.h>
-#include <string.h>
-/* #include <tchar.h> */
-#include <dlgs.h>
-#include <prsht.h>
-#define PS_MAXLINKTYPES 8
-#define OLESTDDELIM TEXT("\\")
-#define SZOLEUI_MSG_HELP TEXT("OLEUI_MSG_HELP")
-#define SZOLEUI_MSG_ENDDIALOG TEXT("OLEUI_MSG_ENDDIALOG")
-#define SZOLEUI_MSG_BROWSE TEXT("OLEUI_MSG_BROWSE")
-#define SZOLEUI_MSG_CHANGEICON TEXT("OLEUI_MSG_CHANGEICON")
-#define SZOLEUI_MSG_CLOSEBUSYDIALOG TEXT("OLEUI_MSG_CLOSEBUSYDIALOG")
-#define SZOLEUI_MSG_CONVERT TEXT("OLEUI_MSG_CONVERT")
-#define SZOLEUI_MSG_CHANGESOURCE TEXT("OLEUI_MSG_CHANGESOURCE")
-#define SZOLEUI_MSG_ADDCONTROL TEXT("OLEUI_MSG_ADDCONTROL")
-#define SZOLEUI_MSG_BROWSE_OFN TEXT("OLEUI_MSG_BROWSE_OFN")
-#define PROP_HWND_CHGICONDLG TEXT("HWND_CIDLG")
-#define IDC_OLEUIHELP 99
-#define IDC_IO_CREATENEW 2100
-#define IDC_IO_CREATEFROMFILE 2101
-#define IDC_IO_LINKFILE 2102
-#define IDC_IO_OBJECTTYPELIST 2103
-#define IDC_IO_DISPLAYASICON 2104
-#define IDC_IO_CHANGEICON 2105
-#define IDC_IO_FILE 2106
-#define IDC_IO_FILEDISPLAY 2107
-#define IDC_IO_RESULTIMAGE 2108
-#define IDC_IO_RESULTTEXT 2109
-#define IDC_IO_ICONDISPLAY 2110
-#define IDC_IO_OBJECTTYPETEXT 2111 
-#define IDC_IO_FILETEXT 2112 
-#define IDC_IO_FILETYPE 2113
-#define IDC_IO_INSERTCONTROL 2114
-#define IDC_IO_ADDCONTROL 2115
-#define IDC_IO_CONTROLTYPELIST 2116
-#define IDC_PS_PASTE 500
-#define IDC_PS_PASTELINK 501
-#define IDC_PS_SOURCETEXT 502
-#define IDC_PS_PASTELIST 503 
-#define IDC_PS_PASTELINKLIST 504 
-#define IDC_PS_DISPLAYLIST 505
-#define IDC_PS_DISPLAYASICON 506
-#define IDC_PS_ICONDISPLAY 507
-#define IDC_PS_CHANGEICON 508
-#define IDC_PS_RESULTIMAGE 509
-#define IDC_PS_RESULTTEXT 510
-#define IDC_CI_GROUP 120 
-#define IDC_CI_CURRENT 121
-#define IDC_CI_CURRENTICON 122
-#define IDC_CI_DEFAULT 123
-#define IDC_CI_DEFAULTICON 124
-#define IDC_CI_FROMFILE 125
-#define IDC_CI_FROMFILEEDIT 126
-#define IDC_CI_ICONLIST 127
-#define IDC_CI_LABEL 128 
-#define IDC_CI_LABELEDIT 129
-#define IDC_CI_BROWSE 130
-#define IDC_CI_ICONDISPLAY 131
-#define IDC_CV_OBJECTTYPE 150
-#define IDC_CV_DISPLAYASICON 152
-#define IDC_CV_CHANGEICON 153
-#define IDC_CV_ACTIVATELIST 154
-#define IDC_CV_CONVERTTO 155
-#define IDC_CV_ACTIVATEAS 156
-#define IDC_CV_RESULTTEXT 157
-#define IDC_CV_CONVERTLIST 158
-#define IDC_CV_ICONDISPLAY 165
-#define IDC_EL_CHANGESOURCE 201
-#define IDC_EL_AUTOMATIC 202
-#define IDC_EL_CANCELLINK 209
-#define IDC_EL_UPDATENOW 210
-#define IDC_EL_OPENSOURCE 211
-#define IDC_EL_MANUAL 212
-#define IDC_EL_LINKSOURCE 216
-#define IDC_EL_LINKTYPE 217
-#define IDC_EL_LINKSLISTBOX 206
-#define IDC_EL_COL1 220 
-#define IDC_EL_COL2 221 
-#define IDC_EL_COL3 222 
-#define IDC_BZ_RETRY 600
-#define IDC_BZ_ICON 601
-#define IDC_BZ_MESSAGE1 602 
-#define IDC_BZ_SWITCHTO 604
-#define IDC_UL_METER 1029 
-#define IDC_UL_STOP 1030 
-#define IDC_UL_PERCENT 1031 
-#define IDC_UL_PROGRESS 1032 
-#define IDC_PU_LINKS 900 
-#define IDC_PU_TEXT 901 
-#define IDC_PU_CONVERT 902 
-#define IDC_PU_ICON 908 
-#define IDC_GP_OBJECTNAME 1009
-#define IDC_GP_OBJECTTYPE 1010
-#define IDC_GP_OBJECTSIZE 1011
-#define IDC_GP_CONVERT 1013
-#define IDC_GP_OBJECTICON 1014 
-#define IDC_GP_OBJECTLOCATION 1022
-#define IDC_VP_PERCENT 1000
-#define IDC_VP_CHANGEICON 1001
-#define IDC_VP_EDITABLE 1002
-#define IDC_VP_ASICON 1003
-#define IDC_VP_RELATIVE 1005
-#define IDC_VP_SPIN 1006
-#define IDC_VP_SCALETXT 1034
-#define IDC_VP_ICONDISPLAY 1021
-#define IDC_VP_RESULTIMAGE 1033
-#define IDC_LP_OPENSOURCE 1006
-#define IDC_LP_UPDATENOW 1007
-#define IDC_LP_BREAKLINK 1008
-#define IDC_LP_LINKSOURCE 1012
-#define IDC_LP_CHANGESOURCE 1015
-#define IDC_LP_AUTOMATIC 1016
-#define IDC_LP_MANUAL 1017
-#define IDC_LP_DATE 1018
-#define IDC_LP_TIME 1019
-#define IDD_INSERTOBJECT 1000
-#define IDD_CHANGEICON 1001
-#define IDD_CONVERT 1002
-#define IDD_PASTESPECIAL 1003
-#define IDD_EDITLINKS 1004
-#define IDD_BUSY 1006
-#define IDD_UPDATELINKS 1007
-#define IDD_CHANGESOURCE 1009
-#define IDD_INSERTFILEBROWSE 1010
-#define IDD_CHANGEICONBROWSE 1011
-#define IDD_CONVERTONLY 1012
-#define IDD_CHANGESOURCE4 1013
-#define IDD_GNRLPROPS 1100
-#define IDD_VIEWPROPS 1101
-#define IDD_LINKPROPS 1102
-#define IDD_CANNOTUPDATELINK 1008
-#define IDD_LINKSOURCEUNAVAILABLE 1020
-#define IDD_SERVERNOTFOUND 1023
-#define IDD_OUTOFMEMORY 1024
-#define IDD_SERVERNOTREGW 1021
-#define IDD_LINKTYPECHANGEDW 1022
-#define IDD_SERVERNOTREGA 1025
-#define IDD_LINKTYPECHANGEDA 1026
-#define ID_BROWSE_CHANGEICON 1
-#define ID_BROWSE_INSERTFILE 2
-#define ID_BROWSE_ADDCONTROL 3
-#define ID_BROWSE_CHANGESOURCE 4
-#define OLEUI_FALSE 0
-#define OLEUI_SUCCESS 1 
-#define OLEUI_OK 1 
-#define OLEUI_CANCEL 2 
-#define OLEUI_ERR_STANDARDMIN 100
-#define OLEUI_ERR_STRUCTURENULL 101 
-#define OLEUI_ERR_STRUCTUREINVALID 102
-#define OLEUI_ERR_CBSTRUCTINCORRECT 103
-#define OLEUI_ERR_HWNDOWNERINVALID 104
-#define OLEUI_ERR_LPSZCAPTIONINVALID 105
-#define OLEUI_ERR_LPFNHOOKINVALID 106
-#define OLEUI_ERR_HINSTANCEINVALID 107
-#define OLEUI_ERR_LPSZTEMPLATEINVALID 108
-#define OLEUI_ERR_HRESOURCEINVALID 109
-#define OLEUI_ERR_FINDTEMPLATEFAILURE 110 
-#define OLEUI_ERR_LOADTEMPLATEFAILURE 111
-#define OLEUI_ERR_DIALOGFAILURE 112
-#define OLEUI_ERR_LOCALMEMALLOC 113
-#define OLEUI_ERR_GLOBALMEMALLOC 114
-#define OLEUI_ERR_LOADSTRING 115
-#define OLEUI_ERR_OLEMEMALLOC 116
-#define OLEUI_ERR_STANDARDMAX 116 
-#define OPF_OBJECTISLINK 1
-#define OPF_NOFILLDEFAULT 2
-#define OPF_SHOWHELP 4
-#define OPF_DISABLECONVERT 8
-#define OLEUI_OPERR_SUBPROPNULL OLEUI_ERR_STANDARDMAX
-#define OLEUI_OPERR_SUBPROPINVALID (OLEUI_ERR_STANDARDMAX+1)
-#define OLEUI_OPERR_PROPSHEETNULL (OLEUI_ERR_STANDARDMAX+2)
-#define OLEUI_OPERR_PROPSHEETINVALID (OLEUI_ERR_STANDARDMAX+3)
-#define OLEUI_OPERR_SUPPROP (OLEUI_ERR_STANDARDMAX+4)
-#define OLEUI_OPERR_PROPSINVALID (OLEUI_ERR_STANDARDMAX+5)
-#define OLEUI_OPERR_PAGESINCORRECT (OLEUI_ERR_STANDARDMAX+6)
-#define OLEUI_OPERR_INVALIDPAGES (OLEUI_ERR_STANDARDMAX+7)
-#define OLEUI_OPERR_NOTSUPPORTED (OLEUI_ERR_STANDARDMAX+8)
-#define OLEUI_OPERR_DLGPROCNOTNULL (OLEUI_ERR_STANDARDMAX+9)
-#define OLEUI_OPERR_LPARAMNOTZERO (OLEUI_ERR_STANDARDMAX+10)
-#define OLEUI_GPERR_STRINGINVALID (OLEUI_ERR_STANDARDMAX+11)
-#define OLEUI_GPERR_CLASSIDINVALID (OLEUI_ERR_STANDARDMAX+12)
-#define OLEUI_GPERR_LPCLSIDEXCLUDEINVALID (OLEUI_ERR_STANDARDMAX+13)
-#define OLEUI_GPERR_CBFORMATINVALID (OLEUI_ERR_STANDARDMAX+14)
-#define OLEUI_VPERR_METAPICTINVALID (OLEUI_ERR_STANDARDMAX+15)
-#define OLEUI_VPERR_DVASPECTINVALID (OLEUI_ERR_STANDARDMAX+16)
-#define OLEUI_LPERR_LINKCNTRNULL (OLEUI_ERR_STANDARDMAX+17)
-#define OLEUI_LPERR_LINKCNTRINVALID (OLEUI_ERR_STANDARDMAX+18)
-#define OLEUI_OPERR_PROPERTYSHEET (OLEUI_ERR_STANDARDMAX+19)
-#define OLEUI_OPERR_OBJINFOINVALID (OLEUI_ERR_STANDARDMAX+20)
-#define OLEUI_OPERR_LINKINFOINVALID (OLEUI_ERR_STANDARDMAX+21)
-#define OLEUI_QUERY_GETCLASSID 65280
-#define OLEUI_QUERY_LINKBROKEN 65281 
-#define IOF_SHOWHELP 1
-#define IOF_SELECTCREATENEW 2
-#define IOF_SELECTCREATEFROMFILE 4
-#define IOF_CHECKLINK 8
-#define IOF_CHECKDISPLAYASICON 16
-#define IOF_CREATENEWOBJECT 32
-#define IOF_CREATEFILEOBJECT 64
-#define IOF_CREATELINKOBJECT 128
-#define IOF_DISABLELINK 256
-#define IOF_VERIFYSERVERSEXIST 512
-#define IOF_DISABLEDISPLAYASICON 1024
-#define IOF_HIDECHANGEICON 2048
-#define IOF_SHOWINSERTCONTROL 4096
-#define IOF_SELECTCREATECONTROL 8192
-#define OLEUI_IOERR_LPSZFILEINVALID OLEUI_ERR_STANDARDMAX
-#define OLEUI_IOERR_LPSZLABELINVALID (OLEUI_ERR_STANDARDMAX+1)
-#define OLEUI_IOERR_HICONINVALID (OLEUI_ERR_STANDARDMAX+2)
-#define OLEUI_IOERR_LPFORMATETCINVALID (OLEUI_ERR_STANDARDMAX+3)
-#define OLEUI_IOERR_PPVOBJINVALID (OLEUI_ERR_STANDARDMAX+4)
-#define OLEUI_IOERR_LPIOLECLIENTSITEINVALID (OLEUI_ERR_STANDARDMAX+5)
-#define OLEUI_IOERR_LPISTORAGEINVALID (OLEUI_ERR_STANDARDMAX+6)
-#define OLEUI_IOERR_SCODEHASERROR (OLEUI_ERR_STANDARDMAX+7)
-#define OLEUI_IOERR_LPCLSIDEXCLUDEINVALID (OLEUI_ERR_STANDARDMAX+8)
-#define OLEUI_IOERR_CCHFILEINVALID (OLEUI_ERR_STANDARDMAX+9)
-#define PSF_SHOWHELP 1
-#define PSF_SELECTPASTE 2
-#define PSF_SELECTPASTELINK 4
-#define PSF_CHECKDISPLAYASICON 8
-#define PSF_DISABLEDISPLAYASICON 16
-#define PSF_HIDECHANGEICON 32
-#define PSF_STAYONCLIPBOARDCHANGE 64
-#define PSF_NOREFRESHDATAOBJECT 128
-#define OLEUI_IOERR_SRCDATAOBJECTINVALID OLEUI_ERR_STANDARDMAX
-#define OLEUI_IOERR_ARRPASTEENTRIESINVALID (OLEUI_ERR_STANDARDMAX+1)
-#define OLEUI_IOERR_ARRLINKTYPESINVALID (OLEUI_ERR_STANDARDMAX+2)
-#define OLEUI_PSERR_CLIPBOARDCHANGED (OLEUI_ERR_STANDARDMAX+3)
-#define OLEUI_PSERR_GETCLIPBOARDFAILED (OLEUI_ERR_STANDARDMAX+4)
-#define OLEUI_ELERR_LINKCNTRNULL OLEUI_ERR_STANDARDMAX
-#define OLEUI_ELERR_LINKCNTRINVALID (OLEUI_ERR_STANDARDMAX+1)
-#define ELF_SHOWHELP 1
-#define ELF_DISABLEUPDATENOW 2
-#define ELF_DISABLEOPENSOURCE 4
-#define ELF_DISABLECHANGESOURCE 8
-#define ELF_DISABLECANCELLINK 16
-#define CIF_SHOWHELP 1
-#define CIF_SELECTCURRENT 2
-#define CIF_SELECTDEFAULT 4
-#define CIF_SELECTFROMFILE 8
-#define CIF_USEICONEXE 16
-#define OLEUI_CIERR_MUSTHAVECLSID OLEUI_ERR_STANDARDMAX
-#define OLEUI_CIERR_MUSTHAVECURRENTMETAFILE (OLEUI_ERR_STANDARDMAX+1)
-#define OLEUI_CIERR_SZICONEXEINVALID (OLEUI_ERR_STANDARDMAX+2)
-#define CF_SHOWHELPBUTTON 1
-#define CF_SETCONVERTDEFAULT 2
-#define CF_SETACTIVATEDEFAULT 4
-#define CF_SELECTCONVERTTO 8
-#define CF_SELECTACTIVATEAS 16
-#define CF_DISABLEDISPLAYASICON 32
-#define CF_DISABLEACTIVATEAS 64
-#define CF_HIDECHANGEICON 128
-#define CF_CONVERTONLY 256
-#define OLEUI_CTERR_CLASSIDINVALID (OLEUI_ERR_STANDARDMAX+1)
-#define OLEUI_CTERR_DVASPECTINVALID (OLEUI_ERR_STANDARDMAX+2)
-#define OLEUI_CTERR_CBFORMATINVALID (OLEUI_ERR_STANDARDMAX+3)
-#define OLEUI_CTERR_HMETAPICTINVALID (OLEUI_ERR_STANDARDMAX+4)
-#define OLEUI_CTERR_STRINGINVALID (OLEUI_ERR_STANDARDMAX+5)
-#define BZ_DISABLECANCELBUTTON 1
-#define BZ_DISABLESWITCHTOBUTTON 2
-#define BZ_DISABLERETRYBUTTON 4
-#define BZ_NOTRESPONDINGDIALOG 8
-#define OLEUI_BZERR_HTASKINVALID OLEUI_ERR_STANDARDMAX
-#define OLEUI_BZ_SWITCHTOSELECTED (OLEUI_ERR_STANDARDMAX+1)
-#define OLEUI_BZ_RETRYSELECTED (OLEUI_ERR_STANDARDMAX+2)
-#define OLEUI_BZ_CALLUNBLOCKED (OLEUI_ERR_STANDARDMAX+3)
-#define CSF_SHOWHELP 1
-#define CSF_VALIDSOURCE 2
-#define CSF_ONLYGETSOURCE 4
-#define CSF_EXPLORER 8
-#define OLEUI_CSERR_LINKCNTRNULL OLEUI_ERR_STANDARDMAX
-#define OLEUI_CSERR_LINKCNTRINVALID (OLEUI_ERR_STANDARDMAX+1)
-#define OLEUI_CSERR_FROMNOTNULL (OLEUI_ERR_STANDARDMAX+2)
-#define OLEUI_CSERR_TONOTNULL (OLEUI_ERR_STANDARDMAX+3)
-#define OLEUI_CSERR_SOURCENULL (OLEUI_ERR_STANDARDMAX+4)
-#define OLEUI_CSERR_SOURCEINVALID (OLEUI_ERR_STANDARDMAX+5)
-#define OLEUI_CSERR_SOURCEPARSERROR (OLEUI_ERR_STANDARDMAX+6)
-#define OLEUI_CSERR_SOURCEPARSEERROR (OLEUI_ERR_STANDARDMAX+7)
-#define VPF_SELECTRELATIVE 1
-#define VPF_DISABLERELATIVE 2
-#define VPF_DISABLESCALE 4
-
-#ifndef RC_INVOKED
-#pragma pack(push, 8)
-typedef UINT (CALLBACK *LPFNOLEUIHOOK)(HWND, UINT, WPARAM, LPARAM);
-typedef struct tagOLEUIINSERTOBJECTW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCWSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCWSTR lpszTemplate;
-	HRSRC hResource;
-	CLSID clsid;
-	LPWSTR lpszFile;
-	UINT cchFile;
-	UINT cClsidExclude;
-	LPCLSID lpClsidExclude;
-	IID iid;
-	DWORD oleRender;
-	LPFORMATETC lpFormatEtc;
-	LPOLECLIENTSITE lpIOleClientSite;
-	LPSTORAGE lpIStorage;
-	PVOID *ppvObj;
-	SCODE sc;
-	HGLOBAL hMetaPict;
-} OLEUIINSERTOBJECTW,*POLEUIINSERTOBJECTW,*LPOLEUIINSERTOBJECTW;
-typedef struct tagOLEUIINSERTOBJECTA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCSTR lpszTemplate;
-	HRSRC hResource;
-	CLSID clsid;
-	LPSTR lpszFile;
-	UINT cchFile;
-	UINT cClsidExclude;
-	LPCLSID lpClsidExclude;
-	IID iid;
-	DWORD oleRender;
-	LPFORMATETC lpFormatEtc;
-	LPOLECLIENTSITE lpIOleClientSite;
-	LPSTORAGE lpIStorage;
-	PVOID *ppvObj;
-	SCODE sc;
-	HGLOBAL hMetaPict;
-} OLEUIINSERTOBJECTA,*POLEUIINSERTOBJECTA,*LPOLEUIINSERTOBJECTA;
-STDAPI_(UINT) OleUIInsertObjectW(LPOLEUIINSERTOBJECTW);
-STDAPI_(UINT) OleUIInsertObjectA(LPOLEUIINSERTOBJECTA);
-typedef enum tagOLEUIPASTEFLAG {
-	OLEUIPASTE_PASTEONLY,
-	OLEUIPASTE_LINKTYPE1,
-	OLEUIPASTE_LINKTYPE2,
-	OLEUIPASTE_LINKTYPE3=4,
-	OLEUIPASTE_LINKTYPE4=8,
-	OLEUIPASTE_LINKTYPE5=16,
-	OLEUIPASTE_LINKTYPE6=32,
-	OLEUIPASTE_LINKTYPE7=64,
-	OLEUIPASTE_LINKTYPE8=128,
-	OLEUIPASTE_PASTE=512,
-	OLEUIPASTE_LINKANYTYPE=1024,
-	OLEUIPASTE_ENABLEICON=2048 
-} OLEUIPASTEFLAG;
-typedef struct tagOLEUIPASTEENTRYW {
-	FORMATETC fmtetc;
-	LPCWSTR lpstrFormatName;
-	LPCWSTR lpstrResultText;
-	DWORD dwFlags;
-	DWORD dwScratchSpace;
-} OLEUIPASTEENTRYW,*POLEUIPASTEENTRYW,*LPOLEUIPASTEENTRYW;
-typedef struct tagOLEUIPASTEENTRYA {
-	FORMATETC fmtetc;
-	LPCSTR lpstrFormatName;
-	LPCSTR lpstrResultText;
-	DWORD dwFlags;
-	DWORD dwScratchSpace;
-} OLEUIPASTEENTRYA,*POLEUIPASTEENTRYA,*LPOLEUIPASTEENTRYA;
-typedef struct tagOLEUIPASTESPECIALW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCWSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCWSTR lpszTemplate;
-	HRSRC hResource;
-	LPDATAOBJECT lpSrcDataObj;
-	LPOLEUIPASTEENTRYW arrPasteEntries;
-	int cPasteEntries;
-	UINT *arrLinkTypes;
-	int cLinkTypes;
-	UINT cClsidExclude;
-	LPCLSID lpClsidExclude;
-	int nSelectedIndex;
-	BOOL fLink;
-	HGLOBAL hMetaPict;
-	SIZEL sizel;
-} OLEUIPASTESPECIALW,*POLEUIPASTESPECIALW,*LPOLEUIPASTESPECIALW;
-typedef struct tagOLEUIPASTESPECIALA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCSTR lpszTemplate;
-	HRSRC hResource;
-	LPDATAOBJECT lpSrcDataObj;
-	LPOLEUIPASTEENTRYA arrPasteEntries;
-	int cPasteEntries;
-	UINT *arrLinkTypes;
-	int cLinkTypes;
-	UINT cClsidExclude;
-	LPCLSID lpClsidExclude;
-	int nSelectedIndex;
-	BOOL fLink;
-	HGLOBAL hMetaPict;
-	SIZEL sizel;
-} OLEUIPASTESPECIALA,*POLEUIPASTESPECIALA,*LPOLEUIPASTESPECIALA;
-#undef INTERFACE
-#define INTERFACE IOleUILinkContainerW
-DECLARE_INTERFACE_(IOleUILinkContainerW, IUnknown)
-{
-	STDMETHOD(QueryInterface) (THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-	STDMETHOD_(ULONG,Release) (THIS) PURE;
-	STDMETHOD_(DWORD,GetNextLink) (THIS_ DWORD dwLink) PURE;
-	STDMETHOD(SetLinkUpdateOptions) (THIS_ DWORD,DWORD) PURE;
-	STDMETHOD(GetLinkUpdateOptions) (THIS_ DWORD,PDWORD) PURE;
-	STDMETHOD(SetLinkSource) (THIS_ DWORD, LPWSTR,ULONG,PULONG,BOOL) PURE;
-	STDMETHOD(GetLinkSource) (THIS_ DWORD,LPWSTR*,PULONG,LPWSTR*,LPWSTR*,BOOL*,BOOL*) PURE;
-	STDMETHOD(OpenLinkSource) (THIS_ DWORD) PURE;
-	STDMETHOD(UpdateLink) (THIS_ DWORD,BOOL,BOOL) PURE;
-	STDMETHOD(CancelLink) (THIS_ DWORD) PURE;
-};
-typedef IOleUILinkContainerW *LPOLEUILINKCONTAINERW;
-#undef INTERFACE
-#define INTERFACE IOleUILinkContainerA
-DECLARE_INTERFACE_(IOleUILinkContainerA, IUnknown)
-{
-	STDMETHOD(QueryInterface) (THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef) (THIS) PURE;
-	STDMETHOD_(ULONG,Release) (THIS) PURE;
-	STDMETHOD_(DWORD,GetNextLink) (THIS_ DWORD) PURE;
-	STDMETHOD(SetLinkUpdateOptions) (THIS_ DWORD,DWORD) PURE;
-	STDMETHOD(GetLinkUpdateOptions) (THIS_ DWORD,PDWORD) PURE;
-	STDMETHOD(SetLinkSource) (THIS_ DWORD, LPSTR,ULONG,PULONG,BOOL) PURE;
-	STDMETHOD(GetLinkSource) (THIS_ DWORD,LPSTR*,PULONG,LPSTR*,LPSTR*,BOOL*,BOOL*) PURE;
-	STDMETHOD(OpenLinkSource) (THIS_ DWORD) PURE;
-	STDMETHOD(UpdateLink) (THIS_ DWORD,BOOL,BOOL) PURE;
-	STDMETHOD(CancelLink) (THIS_ DWORD) PURE;
-};
-typedef IOleUILinkContainerA *LPOLEUILINKCONTAINERA;
-typedef struct tagOLEUIEDITLINKSW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCWSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCWSTR lpszTemplate;
-	HRSRC hResource;
-	LPOLEUILINKCONTAINERW lpOleUILinkContainer;
-} OLEUIEDITLINKSW,*POLEUIEDITLINKSW,*LPOLEUIEDITLINKSW;
-typedef struct tagOLEUIEDITLINKSA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCSTR lpszTemplate;
-	HRSRC hResource;
-	LPOLEUILINKCONTAINERA lpOleUILinkContainer;
-} OLEUIEDITLINKSA,*POLEUIEDITLINKSA,*LPOLEUIEDITLINKSA;
-typedef struct tagOLEUICHANGEICONW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCWSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCWSTR lpszTemplate;
-	HRSRC hResource;
-	HGLOBAL hMetaPict;
-	CLSID clsid;
-	WCHAR szIconExe[MAX_PATH];
-	int cchIconExe;
-} OLEUICHANGEICONW,*POLEUICHANGEICONW,*LPOLEUICHANGEICONW;
-typedef struct tagOLEUICHANGEICONA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCSTR lpszTemplate;
-	HRSRC hResource;
-	HGLOBAL hMetaPict;
-	CLSID clsid;
-	CHAR szIconExe[MAX_PATH];
-	int cchIconExe;
-} OLEUICHANGEICONA,*POLEUICHANGEICONA,*LPOLEUICHANGEICONA;
-typedef struct tagOLEUICONVERTW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCWSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCWSTR lpszTemplate;
-	HRSRC hResource;
-	CLSID clsid;
-	CLSID clsidConvertDefault;
-	CLSID clsidActivateDefault;
-	CLSID clsidNew;
-	DWORD dvAspect;
-	WORD wFormat;
-	BOOL fIsLinkedObject;
-	HGLOBAL hMetaPict;
-	LPWSTR lpszUserType;
-	BOOL fObjectsIconChanged;
-	LPWSTR lpszDefLabel;
-	UINT cClsidExclude;
-	LPCLSID lpClsidExclude;
-} OLEUICONVERTW,*POLEUICONVERTW,*LPOLEUICONVERTW;
-typedef struct tagOLEUICONVERTA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCSTR lpszTemplate;
-	HRSRC hResource;
-	CLSID clsid;
-	CLSID clsidConvertDefault;
-	CLSID clsidActivateDefault;
-	CLSID clsidNew;
-	DWORD dvAspect;
-	WORD wFormat;
-	BOOL fIsLinkedObject;
-	HGLOBAL hMetaPict;
-	LPSTR lpszUserType;
-	BOOL fObjectsIconChanged;
-	LPSTR lpszDefLabel;
-	UINT cClsidExclude;
-	LPCLSID lpClsidExclude;
-} OLEUICONVERTA,*POLEUICONVERTA,*LPOLEUICONVERTA;
-typedef struct tagOLEUIBUSYW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCWSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCWSTR lpszTemplate;
-	HRSRC hResource;
-	HTASK hTask;
-	HWND *lphWndDialog;
-} OLEUIBUSYW,*POLEUIBUSYW,*LPOLEUIBUSYW;
-typedef struct tagOLEUIBUSYA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCSTR lpszTemplate;
-	HRSRC hResource;
-	HTASK hTask;
-	HWND *lphWndDialog;
-} OLEUIBUSYA,*POLEUIBUSYA,*LPOLEUIBUSYA;
-typedef struct tagOLEUICHANGESOURCEW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCWSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCWSTR lpszTemplate;
-	HRSRC hResource;
-	OPENFILENAMEW* lpOFN;
-	DWORD dwReserved1[4];
-	LPOLEUILINKCONTAINERW lpOleUILinkContainer;
-	DWORD dwLink;
-	LPWSTR lpszDisplayName;
-	ULONG nFileLength;
-	LPWSTR lpszFrom;
-	LPWSTR lpszTo;
-} OLEUICHANGESOURCEW,*POLEUICHANGESOURCEW,*LPOLEUICHANGESOURCEW;
-typedef struct tagOLEUICHANGESOURCEA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	HWND hWndOwner;
-	LPCSTR lpszCaption;
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	HINSTANCE hInstance;
-	LPCSTR lpszTemplate;
-	HRSRC hResource;
-	OPENFILENAMEA *lpOFN;
-	DWORD dwReserved1[4];
-	LPOLEUILINKCONTAINERA lpOleUILinkContainer;
-	DWORD dwLink;
-	LPSTR lpszDisplayName;
-	ULONG nFileLength;
-	LPSTR lpszFrom;
-	LPSTR lpszTo;
-} OLEUICHANGESOURCEA,*POLEUICHANGESOURCEA,*LPOLEUICHANGESOURCEA;
-#undef INTERFACE
-#define INTERFACE IOleUIObjInfoW
-DECLARE_INTERFACE_(IOleUIObjInfoW, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetObjectInfo)(THIS_ DWORD,PDWORD,LPWSTR*,LPWSTR*,LPWSTR*,LPWSTR*) PURE;
-	STDMETHOD(GetConvertInfo)(THIS_ DWORD,CLSID*,PWORD,CLSID*,LPCLSID*,UINT*) PURE;
-	STDMETHOD(ConvertObject)(THIS_ DWORD,REFCLSID) PURE;
-	STDMETHOD(GetViewInfo)(THIS_ DWORD,HGLOBAL*,PDWORD,int*) PURE;
-	STDMETHOD(SetViewInfo)(THIS_ DWORD,HGLOBAL,DWORD,int,BOOL) PURE;
-};
-typedef IOleUIObjInfoW *LPOLEUIOBJINFOW;
-#undef INTERFACE
-#define INTERFACE IOleUIObjInfoA
-DECLARE_INTERFACE_(IOleUIObjInfoA, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetObjectInfo)(THIS_ DWORD,PDWORD,LPSTR*,LPSTR*,LPSTR*,LPSTR*) PURE;
-	STDMETHOD(GetConvertInfo)(THIS_ DWORD,CLSID*,PWORD,CLSID*,LPCLSID*,UINT*) PURE;
-	STDMETHOD(ConvertObject)(THIS_ DWORD,REFCLSID) PURE;
-	STDMETHOD(GetViewInfo)(THIS_ DWORD,HGLOBAL*,PDWORD,int*) PURE;
-	STDMETHOD(SetViewInfo)(THIS_ DWORD,HGLOBAL,DWORD,int,BOOL) PURE;
-};
-typedef IOleUIObjInfoA *LPOLEUIOBJINFOA;
-#undef INTERFACE
-#define INTERFACE IOleUILinkInfoW
-DECLARE_INTERFACE_(IOleUILinkInfoW, IOleUILinkContainerW)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(DWORD,GetNextLink)(THIS_ DWORD) PURE;
-	STDMETHOD(SetLinkUpdateOptions)(THIS_ DWORD,DWORD) PURE;
-	STDMETHOD(GetLinkUpdateOptions)(THIS_ DWORD,DWORD*) PURE;
-	STDMETHOD(SetLinkSource)(THIS_ DWORD,LPWSTR,ULONG,PULONG,BOOL) PURE;
-	STDMETHOD(GetLinkSource)(THIS_ DWORD,LPWSTR*,PULONG,LPWSTR*,LPWSTR*,BOOL*,BOOL*) PURE;
-	STDMETHOD(OpenLinkSource)(THIS_ DWORD) PURE;
-	STDMETHOD(UpdateLink)(THIS_ DWORD,BOOL,BOOL) PURE;
-	STDMETHOD(CancelLink)(THIS_ DWORD) PURE;
-	STDMETHOD(GetLastUpdate)(THIS_ DWORD,FILETIME*) PURE;
-};
-typedef IOleUILinkInfoW *LPOLEUILINKINFOW;
-#undef INTERFACE
-#define INTERFACE IOleUILinkInfoA
-DECLARE_INTERFACE_(IOleUILinkInfoA, IOleUILinkContainerA)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(DWORD,GetNextLink)(THIS_ DWORD) PURE;
-	STDMETHOD(SetLinkUpdateOptions)(THIS_ DWORD,DWORD) PURE;
-	STDMETHOD(GetLinkUpdateOptions)(THIS_ DWORD,DWORD*) PURE;
-	STDMETHOD(SetLinkSource)(THIS_ DWORD,LPSTR,ULONG,PULONG,BOOL) PURE;
-	STDMETHOD(GetLinkSource)(THIS_ DWORD,LPSTR*,PULONG,LPSTR*,LPSTR*,BOOL*,BOOL*) PURE;
-	STDMETHOD(OpenLinkSource)(THIS_ DWORD) PURE;
-	STDMETHOD(UpdateLink)(THIS_ DWORD,BOOL,BOOL) PURE;
-	STDMETHOD(CancelLink)(THIS_ DWORD) PURE;
-	STDMETHOD(GetLastUpdate)(THIS_ DWORD,FILETIME*) PURE;
-};
-typedef IOleUILinkInfoA* LPOLEUILINKINFOA;
-struct tagOLEUIOBJECTPROPSW;
-struct tagOLEUIOBJECTPROPSA;
-typedef struct tagOLEUIGNRLPROPSW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	DWORD dwReserved1[2];
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	DWORD dwReserved2[3];
-	struct tagOLEUIOBJECTPROPSW* lpOP;
-} OLEUIGNRLPROPSW,*POLEUIGNRLPROPSW,*LPOLEUIGNRLPROPSW;
-typedef struct tagOLEUIGNRLPROPSA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	DWORD dwReserved1[2];
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	DWORD dwReserved2[3];
-	struct tagOLEUIOBJECTPROPSA* lpOP;
-} OLEUIGNRLPROPSA,*POLEUIGNRLPROPSA,*LPOLEUIGNRLPROPSA;
-typedef struct tagOLEUIVIEWPROPSW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	DWORD dwReserved1[2];
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	DWORD dwReserved2[3];
-	struct tagOLEUIOBJECTPROPSW* lpOP;
-	int nScaleMin;
-	int nScaleMax;
-} OLEUIVIEWPROPSW,*POLEUIVIEWPROPSW,*LPOLEUIVIEWPROPSW;
-typedef struct tagOLEUIVIEWPROPSA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	DWORD dwReserved1[2];
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	DWORD dwReserved2[3];
-	struct tagOLEUIOBJECTPROPSA *lpOP;
-	int nScaleMin;
-	int nScaleMax;
-} OLEUIVIEWPROPSA,*POLEUIVIEWPROPSA,*LPOLEUIVIEWPROPSA;
-typedef struct tagOLEUILINKPROPSW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	DWORD dwReserved1[2];
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	DWORD dwReserved2[3];
-	struct tagOLEUIOBJECTPROPSW *lpOP;
-} OLEUILINKPROPSW, *POLEUILINKPROPSW,* LPOLEUILINKPROPSW;
-typedef struct tagOLEUILINKPROPSA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	DWORD dwReserved1[2];
-	LPFNOLEUIHOOK lpfnHook;
-	LPARAM lCustData;
-	DWORD dwReserved2[3];
-	struct tagOLEUIOBJECTPROPSA* lpOP;
-} OLEUILINKPROPSA,*POLEUILINKPROPSA,*LPOLEUILINKPROPSA;
-typedef struct tagOLEUIOBJECTPROPSW {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	LPPROPSHEETHEADERW lpPS;
-	DWORD dwObject;
-	LPOLEUIOBJINFOW lpObjInfo;
-	DWORD dwLink;
-	LPOLEUILINKINFOW lpLinkInfo;
-	LPOLEUIGNRLPROPSW lpGP;
-	LPOLEUIVIEWPROPSW lpVP;
-	LPOLEUILINKPROPSW lpLP;
-} OLEUIOBJECTPROPSW,*POLEUIOBJECTPROPSW,*LPOLEUIOBJECTPROPSW;
-typedef struct tagOLEUIOBJECTPROPSA {
-	DWORD cbStruct;
-	DWORD dwFlags;
-	LPPROPSHEETHEADERA lpPS;
-	DWORD dwObject;
-	LPOLEUIOBJINFOA lpObjInfo;
-	DWORD dwLink;
-	LPOLEUILINKINFOA lpLinkInfo;
-	LPOLEUIGNRLPROPSA lpGP;
-	LPOLEUIVIEWPROPSA lpVP;
-	LPOLEUILINKPROPSA lpLP;
-} OLEUIOBJECTPROPSA,*POLEUIOBJECTPROPSA,*LPOLEUIOBJECTPROPSA;
-
-STDAPI_(BOOL) OleUIAddVerbMenuW(LPOLEOBJECT,LPCWSTR,HMENU,UINT,UINT,UINT,BOOL,UINT,HMENU*);
-STDAPI_(BOOL) OleUIAddVerbMenuA(LPOLEOBJECT,LPCSTR,HMENU,UINT,UINT,UINT,BOOL,UINT,HMENU*);
-STDAPI_(UINT) OleUIBusyW(LPOLEUIBUSYW);
-STDAPI_(UINT) OleUIBusyA(LPOLEUIBUSYA);
-STDAPI_(BOOL) OleUICanConvertOrActivateAs(REFCLSID,BOOL,WORD);
-STDAPI_(UINT) OleUIChangeIconW(LPOLEUICHANGEICONW);
-STDAPI_(UINT) OleUIChangeIconA(LPOLEUICHANGEICONA);
-STDAPI_(UINT) OleUIChangeSourceW(LPOLEUICHANGESOURCEW);
-STDAPI_(UINT) OleUIChangeSourceA(LPOLEUICHANGESOURCEA);
-STDAPI_(UINT) OleUIConvertW(LPOLEUICONVERTW);
-STDAPI_(UINT) OleUIConvertA(LPOLEUICONVERTA);
-STDAPI_(UINT) OleUIEditLinksW(LPOLEUIEDITLINKSW);
-STDAPI_(UINT) OleUIEditLinksA(LPOLEUIEDITLINKSA);
-STDAPI_(UINT) OleUIObjectPropertiesW(LPOLEUIOBJECTPROPSW);
-STDAPI_(UINT) OleUIObjectPropertiesA(LPOLEUIOBJECTPROPSA);
-STDAPI_(UINT) OleUIPasteSpecialW(LPOLEUIPASTESPECIALW);
-STDAPI_(UINT) OleUIPasteSpecialA(LPOLEUIPASTESPECIALA);
-int OleUIPromptUserW(int,HWND,...);
-int OleUIPromptUserA(int,HWND,...);
-STDAPI_(BOOL) OleUIUpdateLinksW(LPOLEUILINKCONTAINERW,HWND,LPWSTR,int);
-STDAPI_(BOOL) OleUIUpdateLinksA(LPOLEUILINKCONTAINERA,HWND,LPSTR,int);
-
-#ifdef UNICODE
-#define IDD_SERVERNOTREG IDD_SERVERNOTREGW
-#define IDD_LINKTYPECHANGED IDD_LINKTYPECHANGEDW
-#define OleUIUpdateLinks OleUIUpdateLinksW
-#define OleUIAddVerbMenu OleUIAddVerbMenuW
-#define tagOLEUIOBJECTPROPS tagOLEUIOBJECTPROPSW
-#define OLEUIOBJECTPROPS OLEUIOBJECTPROPSW
-#define POLEUIOBJECTPROPS POLEUIOBJECTPROPSW
-#define LPOLEUIOBJECTPROPS LPOLEUIOBJECTPROPSW
-#define OleUIObjectProperties OleUIObjectPropertiesW
-#define tagOLEUIINSERTOBJECT tagOLEUIINSERTOBJECTW
-#define OLEUIINSERTOBJECT OLEUIINSERTOBJECTW
-#define POLEUIINSERTOBJECT POLEUIINSERTOBJECTW
-#define LPOLEUIINSERTOBJECT LPOLEUIINSERTOBJECTW
-#define OleUIInsertObject OleUIInsertObjectW
-#define OleUIPromptUser OleUIPromptUserW
-#define tagOLEUIPASTEENTRY tagOLEUIPASTEENTRYW
-#define OLEUIPASTEENTRY OLEUIPASTEENTRYW
-#define POLEUIPASTEENTRY POLEUIPASTEENTRYW
-#define LPOLEUIPASTEENTRY LPOLEUIPASTEENTRYW
-#define tagOLEUIPASTESPECIAL tagOLEUIPASTESPECIALW
-#define OLEUIPASTESPECIAL OLEUIPASTESPECIALW
-#define POLEUIPASTESPECIAL POLEUIPASTESPECIALW
-#define LPOLEUIPASTESPECIAL LPOLEUIPASTESPECIALW
-#define OleUIPasteSpecial OleUIPasteSpecialW
-#define IOleUILinkContainer IOleUILinkContainerW
-#define LPOLEUILINKCONTAINER LPOLEUILINKCONTAINERW
-#define tagOLEUIEDITLINKS tagOLEUIEDITLINKSW
-#define OLEUIEDITLINKS OLEUIEDITLINKSW
-#define POLEUIEDITLINKS POLEUIEDITLINKSW
-#define LPOLEUIEDITLINKS LPOLEUIEDITLINKSW
-#define OleUIEditLinks OleUIEditLinksW
-#define tagOLEUICHANGEICON tagOLEUICHANGEICONW
-#define OLEUICHANGEICON OLEUICHANGEICONW
-#define POLEUICHANGEICON POLEUICHANGEICONW
-#define LPOLEUICHANGEICON LPOLEUICHANGEICONW
-#define OleUIChangeIcon OleUIChangeIconW
-#define tagOLEUICONVERT tagOLEUICONVERTW
-#define OLEUICONVERT OLEUICONVERTW
-#define POLEUICONVERT POLEUICONVERTW
-#define LPOLEUICONVERT LPOLEUICONVERTW
-#define OleUIConvert OleUIConvertW
-#define tagOLEUIBUSY tagOLEUIBUSYW
-#define OLEUIBUSY OLEUIBUSYW
-#define POLEUIBUSY POLEUIBUSYW
-#define LPOLEUIBUSY LPOLEUIBUSYW
-#define OleUIBusy OleUIBusyW
-#define tagOLEUICHANGESOURCE tagOLEUICHANGESOURCEW
-#define OLEUICHANGESOURCE OLEUICHANGESOURCEW
-#define POLEUICHANGESOURCE POLEUICHANGESOURCEW
-#define LPOLEUICHANGESOURCE LPOLEUICHANGESOURCEW
-#define OleUIChangeSource OleUIChangeSourceW
-#define IOleUIObjInfo IOleUIObjInfoW
-#define LPOLEUIOBJINFO LPOLEUIOBJINFOW
-#define IOleUILinkInfo IOleUILinkInfoW
-#define IOleUILinkInfoVtbl IOleUILinkInfoWVtbl
-#define LPOLEUILINKINFO LPOLEUILINKINFOW
-#define tagOLEUIGNRLPROPS tagOLEUIGNRLPROPSW
-#define OLEUIGNRLPROPS OLEUIGNRLPROPSW
-#define POLEUIGNRLPROPS POLEUIGNRLPROPSW
-#define LPOLEUIGNRLPROPS LPOLEUIGNRLPROPSW
-#define tagOLEUIVIEWPROPS tagOLEUIVIEWPROPSW
-#define OLEUIVIEWPROPS OLEUIVIEWPROPSW
-#define POLEUIVIEWPROPS POLEUIVIEWPROPSW
-#define LPOLEUIVIEWPROPS LPOLEUIVIEWPROPSW
-#define tagOLEUILINKPROPS tagOLEUILINKPROPSW
-#define OLEUILINKPROPS OLEUILINKPROPSW
-#define POLEUILINKPROPS POLEUILINKPROPSW
-#define LPOLEUILINKPROPS LPOLEUILINKPROPSW
-#else
-#define IDD_SERVERNOTREG IDD_SERVERNOTREGA
-#define IDD_LINKTYPECHANGED IDD_LINKTYPECHANGEDA
-#define OleUIUpdateLinks OleUIUpdateLinksA
-#define OleUIAddVerbMenu OleUIAddVerbMenuA
-#define tagOLEUIOBJECTPROPS tagOLEUIOBJECTPROPSA
-#define OLEUIOBJECTPROPS OLEUIOBJECTPROPSA
-#define POLEUIOBJECTPROPS POLEUIOBJECTPROPSA
-#define LPOLEUIOBJECTPROPS LPOLEUIOBJECTPROPSA
-#define OleUIObjectProperties OleUIObjectPropertiesA
-#define tagOLEUIINSERTOBJECT tagOLEUIINSERTOBJECTA
-#define OLEUIINSERTOBJECT OLEUIINSERTOBJECTA
-#define POLEUIINSERTOBJECT POLEUIINSERTOBJECTA
-#define LPOLEUIINSERTOBJECT LPOLEUIINSERTOBJECTA
-#define OleUIInsertObject OleUIInsertObjectA
-#define OleUIPromptUser OleUIPromptUserA
-#define tagOLEUIPASTEENTRY tagOLEUIPASTEENTRYA
-#define OLEUIPASTEENTRY OLEUIPASTEENTRYA
-#define POLEUIPASTEENTRY POLEUIPASTEENTRYA
-#define LPOLEUIPASTEENTRY LPOLEUIPASTEENTRYA
-#define tagOLEUIPASTESPECIAL tagOLEUIPASTESPECIALA
-#define OLEUIPASTESPECIAL OLEUIPASTESPECIALA
-#define POLEUIPASTESPECIAL POLEUIPASTESPECIALA
-#define LPOLEUIPASTESPECIAL LPOLEUIPASTESPECIALA
-#define OleUIPasteSpecial OleUIPasteSpecialA
-#define IOleUILinkContainer IOleUILinkContainerA
-#define LPOLEUILINKCONTAINER LPOLEUILINKCONTAINERA
-#define tagOLEUIEDITLINKS tagOLEUIEDITLINKSA
-#define OLEUIEDITLINKS OLEUIEDITLINKSA
-#define POLEUIEDITLINKS POLEUIEDITLINKSA
-#define LPOLEUIEDITLINKS LPOLEUIEDITLINKSA
-#define OleUIEditLinks OleUIEditLinksA
-#define tagOLEUICHANGEICON tagOLEUICHANGEICONA
-#define OLEUICHANGEICON OLEUICHANGEICONA
-#define POLEUICHANGEICON POLEUICHANGEICONA
-#define LPOLEUICHANGEICON LPOLEUICHANGEICONA
-#define OleUIChangeIcon OleUIChangeIconA
-#define tagOLEUICONVERT tagOLEUICONVERTA
-#define OLEUICONVERT OLEUICONVERTA
-#define POLEUICONVERT POLEUICONVERTA
-#define LPOLEUICONVERT LPOLEUICONVERTA
-#define OleUIConvert OleUIConvertA
-#define tagOLEUIBUSY tagOLEUIBUSYA
-#define OLEUIBUSY OLEUIBUSYA
-#define POLEUIBUSY POLEUIBUSYA
-#define LPOLEUIBUSY LPOLEUIBUSYA
-#define OleUIBusy OleUIBusyA
-#define tagOLEUICHANGESOURCE tagOLEUICHANGESOURCEA
-#define OLEUICHANGESOURCE OLEUICHANGESOURCEA
-#define POLEUICHANGESOURCE POLEUICHANGESOURCEA
-#define LPOLEUICHANGESOURCE LPOLEUICHANGESOURCEA
-#define OleUIChangeSource OleUIChangeSourceA
-#define IOleUIObjInfo IOleUIObjInfoA
-#define LPOLEUIOBJINFO LPOLEUIOBJINFOA
-#define IOleUILinkInfo IOleUILinkInfoA
-#define IOleUILinkInfoVtbl IOleUILinkInfoAVtbl
-#define LPOLEUILINKINFO LPOLEUILINKINFOA
-#define tagOLEUIGNRLPROPS tagOLEUIGNRLPROPSA
-#define OLEUIGNRLPROPS OLEUIGNRLPROPSA
-#define POLEUIGNRLPROPS POLEUIGNRLPROPSA
-#define LPOLEUIGNRLPROPS LPOLEUIGNRLPROPSA
-#define tagOLEUIVIEWPROPS tagOLEUIVIEWPROPSA
-#define OLEUIVIEWPROPS OLEUIVIEWPROPSA
-#define POLEUIVIEWPROPS POLEUIVIEWPROPSA
-#define LPOLEUIVIEWPROPS LPOLEUIVIEWPROPSA
-#define tagOLEUILINKPROPS tagOLEUILINKPROPSA
-#define OLEUILINKPROPS OLEUILINKPROPSA
-#define POLEUILINKPROPS POLEUILINKPROPSA
-#define LPOLEUILINKPROPS LPOLEUILINKPROPSA
-#endif
-#pragma pack(pop)
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/oleidl.h b/winsup/w32api/include/oleidl.h
deleted file mode 100644
index 9d919b195..000000000
--- a/winsup/w32api/include/oleidl.h
+++ /dev/null
@@ -1,360 +0,0 @@
-#ifndef _OLEIDL_H
-#define _OLEIDL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <objfwd.h>
-
-#define MK_ALT	32
-
-typedef interface IParseDisplayname *LPPARSEDISPLAYNAME;
-typedef interface IOleContainer *LPOLECONTAINER;
-typedef interface IOleClientSite *LPOLECLIENTSITE;
-typedef interface IOleObject *LPOLEOBJECT;
-typedef interface IDropTarget *LPDROPTARGET;
-typedef interface IDropSource *LPDROPSOURCE;
-typedef interface IEnumOleUndoUnits *LPENUMOLEUNDOUNITS;
-typedef interface IEnumOLEVERB *LPENUMOLEVERB;
-typedef interface IOleWindow *LPOLEWINDOW;
-typedef interface IOleInPlaceUIWindow *LPOLEINPLACEUIWINDOW;
-typedef interface IOleInPlaceActiveObject *LPOLEINPLACEACTIVEOBJECT;
-typedef interface IOleInPlaceFrame *LPOLEINPLACEFRAME;
-typedef interface IOleAdviseHolder *LPOLEADVISEHOLDER;
-typedef interface IViewObject *LPVIEWOBJECT;
-typedef interface IViewObject2 *LPVIEWOBJECT2;
-
-typedef enum tagOLEWHICHMK {
-	OLEWHICHMK_CONTAINER=1,
-	OLEWHICHMK_OBJREL,
-	OLEWHICHMK_OBJFULL
-} OLEWHICHMK;
-typedef enum tagOLEGETMONIKER {
-	OLEGETMONIKER_ONLYIFTHERE=1,
-	OLEGETMONIKER_FORCEASSIGN,
-	OLEGETMONIKER_UNASSIGN,
-	OLEGETMONIKER_TEMPFORUSER
-} OLEGETMONIKER;
-typedef enum tagUSERCLASSTYPE {
-	USERCLASSTYPE_FULL=1,
-	USERCLASSTYPE_SHORT,
-	USERCLASSTYPE_APPNAME
-} USERCLASSTYPE;
-
-#ifdef __GNUC__
-__extension__  /* IS0 C says enums limited to range of int */ 
-#endif
-typedef enum tagDROPEFFECT {
-	DROPEFFECT_NONE=0,
-	DROPEFFECT_COPY=1,
-	DROPEFFECT_MOVE=2,
-	DROPEFFECT_LINK=4,
-	DROPEFFECT_SCROLL=0x80000000
-} DROPEFFECT;
-typedef struct tagOleMenuGroupWidths {
-	LONG width[6];
-} OLEMENUGROUPWIDTHS,*LPOLEMENUGROUPWIDTHS;
-typedef HGLOBAL HOLEMENU;
-typedef enum tagOLECLOSE {
-	OLECLOSE_SAVEIFDIRTY,
-	OLECLOSE_NOSAVE,
-	OLECLOSE_PROMPTSAVE
-} OLECLOSE;
-typedef struct tagOLEVERB {
-	LONG lVerb;
-	LPWSTR lpszVerbName;
-	DWORD fuFlags;
-	DWORD grfAttribs;
-} OLEVERB,*LPOLEVERB;
-typedef RECT BORDERWIDTHS;
-typedef LPRECT LPBORDERWIDTHS;
-typedef LPCRECT LPCBORDERWIDTHS;
-typedef struct tagOIFI {
-	UINT cb;
-	BOOL fMDIApp;
-	HWND hwndFrame;
-	HACCEL haccel;
-	UINT cAccelEntries;
-}OLEINPLACEFRAMEINFO,*LPOLEINPLACEFRAMEINFO;
-
-DECLARE_ENUMERATOR(OLEVERB);
-typedef IEnumOLEVERB IEnumOleVerb;
-
-EXTERN_C const IID IID_IParseDisplayName;
-#undef INTERFACE
-#define INTERFACE IParseDisplayName
-DECLARE_INTERFACE_(IParseDisplayName,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(ParseDisplayName)(THIS_ IBindCtx*,LPOLESTR,ULONG*,IMoniker**) PURE;
-};
-
-EXTERN_C const IID IID_IOleContainer;
-#undef INTERFACE
-#define INTERFACE IOleContainer
-DECLARE_INTERFACE_(IOleContainer,IParseDisplayName)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(ParseDisplayName)(THIS_ IBindCtx*,LPOLESTR,ULONG*,IMoniker**) PURE;
-	STDMETHOD(EnumObjects)(THIS_ DWORD,IEnumUnknown**) PURE;
-	STDMETHOD(LockContainer)(THIS_ BOOL) PURE;
-};
-
-EXTERN_C const IID IID_IOleItemContainer;
-#undef INTERFACE
-#define INTERFACE IOleItemContainer
-DECLARE_INTERFACE_(IOleItemContainer,IOleContainer)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(ParseDisplayName)(THIS_ IBindCtx*,LPOLESTR,ULONG*,IMoniker**) PURE;
-	STDMETHOD(EnumObjects)(THIS_ DWORD,IEnumUnknown**) PURE;
-	STDMETHOD(LockContainer)(THIS_ BOOL) PURE;
-	STDMETHOD(GetObject)(THIS_ LPOLESTR,DWORD,IBindCtx*,REFIID,void**) PURE;
-	STDMETHOD(GetObjectStorage)(THIS_ LPOLESTR,IBindCtx*,REFIID,void**) PURE;
-	STDMETHOD(IsRunning)(THIS_ LPOLESTR) PURE;
-};
-
-EXTERN_C const IID IID_IOleClientSite;
-#undef INTERFACE
-#define INTERFACE IOleClientSite
-DECLARE_INTERFACE_(IOleClientSite,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(SaveObject)(THIS) PURE;
-	STDMETHOD(GetMoniker)(THIS_ DWORD,DWORD,LPMONIKER*) PURE;
-	STDMETHOD(GetContainer)(THIS_ LPOLECONTAINER*) PURE;
-	STDMETHOD(ShowObject)(THIS) PURE;
-	STDMETHOD(OnShowWindow)(THIS_ BOOL) PURE;
-	STDMETHOD(RequestNewObjectLayout)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IOleObject;
-#undef INTERFACE
-#define INTERFACE IOleObject
-DECLARE_INTERFACE_(IOleObject,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(SetClientSite)(THIS_ LPOLECLIENTSITE) PURE;
-	STDMETHOD(GetClientSite)(THIS_ LPOLECLIENTSITE*) PURE;
-	STDMETHOD(SetHostNames)(THIS_ LPCOLESTR,LPCOLESTR) PURE;
-	STDMETHOD(Close)(THIS_ DWORD) PURE;
-	STDMETHOD(SetMoniker)(THIS_ DWORD,LPMONIKER) PURE;
-	STDMETHOD(GetMoniker)(THIS_ DWORD,DWORD,LPMONIKER*) PURE;
-	STDMETHOD(InitFromData)(THIS_ LPDATAOBJECT,BOOL,DWORD) PURE;
-	STDMETHOD(GetClipboardData)(THIS_ DWORD,LPDATAOBJECT*) PURE;
-	STDMETHOD(DoVerb)(THIS_ LONG,LPMSG,LPOLECLIENTSITE,LONG,HWND,LPCRECT) PURE;
-	STDMETHOD(EnumVerbs)(THIS_ LPENUMOLEVERB*) PURE;
-	STDMETHOD(Update)(THIS) PURE;
-	STDMETHOD(IsUpToDate)(THIS) PURE;
-	STDMETHOD(GetUserClassID)(THIS_ LPCLSID) PURE;
-	STDMETHOD(GetUserType)(THIS_ DWORD,LPOLESTR*) PURE;
-	STDMETHOD(SetExtent)(THIS_ DWORD,SIZEL*) PURE;
-	STDMETHOD(GetExtent)(THIS_ DWORD,SIZEL*) PURE;
-	STDMETHOD(Advise)(THIS_ LPADVISESINK,PDWORD) PURE;
-	STDMETHOD(Unadvise)(THIS_ DWORD) PURE;
-	STDMETHOD(EnumAdvise)(THIS_ LPENUMSTATDATA*) PURE;
-	STDMETHOD(GetMiscStatus)(THIS_ DWORD,PDWORD) PURE;
-	STDMETHOD(SetColorScheme)(THIS_ LPLOGPALETTE) PURE;
-};
-
-EXTERN_C const IID IID_IOleWindow;
-#undef INTERFACE
-#define INTERFACE IOleWindow
-DECLARE_INTERFACE_(IOleWindow,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-};
-
-EXTERN_C const IID IID_IOleInPlaceUIWindow;
-#undef INTERFACE
-#define INTERFACE IOleInPlaceUIWindow
-DECLARE_INTERFACE_(IOleInPlaceUIWindow,IOleWindow)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(GetBorder)(THIS_ LPRECT) PURE;
-	STDMETHOD(RequestBorderSpace)(THIS_ LPCBORDERWIDTHS) PURE;
-	STDMETHOD(SetBorderSpace)(THIS_ LPCBORDERWIDTHS) PURE;
-	STDMETHOD(SetActiveObject)(THIS_ LPOLEINPLACEACTIVEOBJECT,LPCOLESTR) PURE;
-};
-
-EXTERN_C const IID IID_IOleInPlaceObject;
-#undef INTERFACE
-#define INTERFACE IOleInPlaceObject
-DECLARE_INTERFACE_(IOleInPlaceObject,IOleWindow)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(InPlaceDeactivate)(THIS) PURE;
-	STDMETHOD(UIDeactivate)(THIS) PURE;
-	STDMETHOD(SetObjectRects)(THIS_ LPCRECT,LPCRECT) PURE;
-	STDMETHOD(ReactivateAndUndo)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IOleInPlaceActiveObject;
-#undef INTERFACE
-#define INTERFACE IOleInPlaceActiveObject
-DECLARE_INTERFACE_(IOleInPlaceActiveObject,IOleWindow)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(TranslateAccelerator)(THIS_ LPMSG) PURE;
-	STDMETHOD(OnFrameWindowActivate)(THIS_ BOOL) PURE;
-	STDMETHOD(OnDocWindowActivate)(THIS_ BOOL) PURE;
-	STDMETHOD(ResizeBorder)(THIS_ LPCRECT,LPOLEINPLACEUIWINDOW,BOOL) PURE;
-	STDMETHOD(EnableModeless)(THIS_ BOOL) PURE;
-};
-
-EXTERN_C const IID IID_IOleInPlaceFrame;
-#undef INTERFACE
-#define INTERFACE IOleInPlaceFrame
-DECLARE_INTERFACE_(IOleInPlaceFrame,IOleInPlaceUIWindow)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(GetBorder)(THIS_ LPRECT) PURE;
-	STDMETHOD(RequestBorderSpace)(THIS_ LPCBORDERWIDTHS) PURE;
-	STDMETHOD(SetBorderSpace)(THIS_ LPCBORDERWIDTHS) PURE;
-	STDMETHOD(SetActiveObject)(THIS_ LPOLEINPLACEACTIVEOBJECT,LPCOLESTR) PURE;
-	STDMETHOD(InsertMenus)(THIS_ HMENU,LPOLEMENUGROUPWIDTHS) PURE;
-	STDMETHOD(SetMenu)(THIS_ HMENU,HOLEMENU,HWND) PURE;
-	STDMETHOD(RemoveMenus)(THIS_ HMENU) PURE;
-	STDMETHOD(SetStatusText)(THIS_ LPCOLESTR) PURE;
-	STDMETHOD(EnableModeless)(THIS_ BOOL) PURE;
-	STDMETHOD(TranslateAccelerator)(THIS_ LPMSG,WORD) PURE;
-};
-
-EXTERN_C const IID IID_IOleInPlaceSite;
-#undef INTERFACE
-#define INTERFACE IOleInPlaceSite
-DECLARE_INTERFACE_(IOleInPlaceSite,IOleWindow)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(CanInPlaceActivate)(THIS) PURE;
-	STDMETHOD(OnInPlaceActivate)(THIS) PURE;
-	STDMETHOD(OnUIActivate)(THIS) PURE;
-	STDMETHOD(GetWindowContext)(THIS_ IOleInPlaceFrame**,IOleInPlaceUIWindow**,LPRECT,LPRECT,LPOLEINPLACEFRAMEINFO) PURE;
-	STDMETHOD(Scroll)(THIS_ SIZE) PURE;
-	STDMETHOD(OnUIDeactivate)(THIS_ BOOL) PURE;
-	STDMETHOD(OnInPlaceDeactivate)(THIS) PURE;
-	STDMETHOD(DiscardUndoState)(THIS) PURE;
-	STDMETHOD(DeactivateAndUndo)(THIS) PURE;
-	STDMETHOD(OnPosRectChange)(THIS_ LPCRECT) PURE;
-};
-
-EXTERN_C const IID IID_IOleAdviseHolder;
-#undef INTERFACE
-#define INTERFACE IOleAdviseHolder
-DECLARE_INTERFACE_(IOleAdviseHolder,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Advise)(THIS_ LPADVISESINK,PDWORD) PURE;
-	STDMETHOD(Unadvise)(THIS_ DWORD) PURE;
-	STDMETHOD(EnumAdvise)(THIS_ LPENUMSTATDATA*) PURE;
-	STDMETHOD(SendOnRename)(THIS_ LPMONIKER) PURE;
-	STDMETHOD(SendOnSave)(THIS) PURE;
-	STDMETHOD(SendOnClose)(THIS) PURE;
-};
-
-EXTERN_C const IID IID_IDropSource;
-#undef INTERFACE
-#define INTERFACE IDropSource
-DECLARE_INTERFACE_(IDropSource,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(QueryContinueDrag)(THIS_ BOOL,DWORD) PURE;
-	STDMETHOD(GiveFeedback)(THIS_ DWORD) PURE;
-};
-
-EXTERN_C const IID IID_IDropTarget;
-#undef INTERFACE
-#define INTERFACE IDropTarget
-DECLARE_INTERFACE_(IDropTarget,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(DragEnter)(THIS_ LPDATAOBJECT,DWORD,POINTL,PDWORD) PURE;
-	STDMETHOD(DragOver)(THIS_ DWORD,POINTL,PDWORD) PURE;
-	STDMETHOD(DragLeave)(THIS) PURE;
-	STDMETHOD(Drop)(THIS_ LPDATAOBJECT,DWORD,POINTL,PDWORD) PURE;
-};
-
-typedef BOOL(CALLBACK *__IView_pfncont)(DWORD);
-EXTERN_C const IID IID_IViewObject;
-#undef INTERFACE
-#define INTERFACE IViewObject
-DECLARE_INTERFACE_(IViewObject,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Draw)(THIS_ DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,HDC,LPCRECTL,LPCRECTL,__IView_pfncont pfnContinue,DWORD) PURE;
-	STDMETHOD(GetColorSet)(THIS_ DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,LPLOGPALETTE*) PURE;
-	STDMETHOD(Freeze)(THIS_ DWORD,LONG,PVOID,PDWORD) PURE;
-	STDMETHOD(Unfreeze)(THIS_ DWORD) PURE;
-	STDMETHOD(SetAdvise)(THIS_ DWORD,DWORD,IAdviseSink*) PURE;
-	STDMETHOD(GetAdvise)(THIS_ PDWORD,PDWORD,IAdviseSink**) PURE;
-};
-
-EXTERN_C const IID IID_IViewObject2;
-#undef INTERFACE
-#define INTERFACE IViewObject2
-DECLARE_INTERFACE_(IViewObject2,IViewObject)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Draw)(THIS_ DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,HDC,LPCRECTL,LPCRECTL,__IView_pfncont pfnContinue,DWORD) PURE;
-	STDMETHOD(GetColorSet)(THIS_ DWORD,LONG,PVOID,DVTARGETDEVICE*,HDC,LPLOGPALETTE*) PURE;
-	STDMETHOD(Freeze)(THIS_ DWORD,LONG,PVOID,PDWORD) PURE;
-	STDMETHOD(Unfreeze)(THIS_ DWORD) PURE;
-	STDMETHOD(SetAdvise)(THIS_ DWORD,DWORD,IAdviseSink*) PURE;
-	STDMETHOD(GetAdvise)(THIS_ PDWORD,PDWORD,IAdviseSink**) PURE;
-	STDMETHOD(GetExtent)(THIS_ DWORD,LONG,DVTARGETDEVICE*,LPSIZEL) PURE;
-};
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
diff --git a/winsup/w32api/include/pbt.h b/winsup/w32api/include/pbt.h
deleted file mode 100644
index 2001e1b29..000000000
--- a/winsup/w32api/include/pbt.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PBT_H
-#define _PBT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define PBT_APMQUERYSUSPEND 0
-#define PBT_APMQUERYSTANDBY 1
-#define PBT_APMQUERYSUSPENDFAILED 2
-#define PBT_APMQUERYSTANDBYFAILED 3
-#define PBT_APMSUSPEND 4
-#define PBT_APMSTANDBY 5
-#define PBT_APMRESUMECRITICAL 6
-#define PBT_APMRESUMESUSPEND 7
-#define PBT_APMRESUMESTANDBY 8
-#define PBTF_APMRESUMEFROMFAILURE 1
-#define PBT_APMBATTERYLOW 9
-#define PBT_APMPOWERSTATUSCHANGE 10
-#define PBT_APMOEMEVENT 11
-#endif
diff --git a/winsup/w32api/include/poppack.h b/winsup/w32api/include/poppack.h
deleted file mode 100644
index bb04d4524..000000000
--- a/winsup/w32api/include/poppack.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef RC_INVOKED
-#pragma pack(pop)
-#endif
diff --git a/winsup/w32api/include/powrprof.h b/winsup/w32api/include/powrprof.h
deleted file mode 100644
index dc7d1f356..000000000
--- a/winsup/w32api/include/powrprof.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef _POWRPROF_H
-#define _POWRPROF_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define EnableMultiBatteryDisplay 2
-#define EnablePasswordLogon 4
-#define EnableSysTrayBatteryMeter 1
-#define EnableWakeOnRing 8
-#define EnableVideoDimDisplay 16
-#define NEWSCHEME (UINT)-1
-
-#ifndef RC_INVOKED
-#include <ntdef.h>  /* for NTSTATUS */
-typedef struct _GLOBAL_MACHINE_POWER_POLICY{
-   ULONG Revision;
-   SYSTEM_POWER_STATE LidOpenWakeAc;
-   SYSTEM_POWER_STATE LidOpenWakeDc;
-   ULONG BroadcastCapacityResolution;
-} GLOBAL_MACHINE_POWER_POLICY, *PGLOBAL_MACHINE_POWER_POLICY;
-typedef struct _GLOBAL_USER_POWER_POLICY{
-   ULONG Revision;
-   POWER_ACTION_POLICY PowerButtonAc;
-   POWER_ACTION_POLICY PowerButtonDc;
-   POWER_ACTION_POLICY SleepButtonAc;
-   POWER_ACTION_POLICY SleepButtonDc;
-   POWER_ACTION_POLICY LidCloseAc;
-   POWER_ACTION_POLICY LidCloseDc;
-   SYSTEM_POWER_LEVEL DischargePolicy[NUM_DISCHARGE_POLICIES];
-   ULONG GlobalFlags;
-} GLOBAL_USER_POWER_POLICY, *PGLOBAL_USER_POWER_POLICY;
-typedef struct _GLOBAL_POWER_POLICY{
-   GLOBAL_USER_POWER_POLICY user;
-   GLOBAL_MACHINE_POWER_POLICY mach;
-} GLOBAL_POWER_POLICY, *PGLOBAL_POWER_POLICY;
-typedef struct _MACHINE_POWER_POLICY{
-   ULONG Revision;
-   SYSTEM_POWER_STATE MinSleepAc;
-   SYSTEM_POWER_STATE MinSleepDc;
-   SYSTEM_POWER_STATE ReducedLatencySleepAc;
-   SYSTEM_POWER_STATE ReducedLatencySleepDc;
-   ULONG DozeTimeoutAc;
-   ULONG DozeTimeoutDc;
-   ULONG DozeS4TimeoutAc;
-   ULONG DozeS4TimeoutDc;
-   UCHAR MinThrottleAc;
-   UCHAR MinThrottleDc;
-   UCHAR pad1[2];
-   POWER_ACTION_POLICY OverThrottledAc;
-   POWER_ACTION_POLICY OverThrottledDc;
-} MACHINE_POWER_POLICY, *PMACHINE_POWER_POLICY;
-typedef struct _MACHINE_PROCESSOR_POWER_POLICY {
-   ULONG Revision;
-   PROCESSOR_POWER_POLICY ProcessorPolicyAc;    
-   PROCESSOR_POWER_POLICY ProcessorPolicyDc;    
-} MACHINE_PROCESSOR_POWER_POLICY, *PMACHINE_PROCESSOR_POWER_POLICY;
-typedef struct _USER_POWER_POLICY{
-   ULONG Revision;
-   POWER_ACTION_POLICY IdleAc;
-   POWER_ACTION_POLICY IdleDc;
-   ULONG IdleTimeoutAc;
-   ULONG IdleTimeoutDc;
-   UCHAR IdleSensitivityAc;
-   UCHAR IdleSensitivityDc;
-   UCHAR ThrottlePolicyAc;
-   UCHAR ThrottlePolicyDc;
-   SYSTEM_POWER_STATE MaxSleepAc;
-   SYSTEM_POWER_STATE MaxSleepDc;
-   ULONG Reserved[2];
-   ULONG VideoTimeoutAc;
-   ULONG VideoTimeoutDc;
-   ULONG SpindownTimeoutAc;
-   ULONG SpindownTimeoutDc;
-   BOOLEAN OptimizeForPowerAc;
-   BOOLEAN OptimizeForPowerDc;
-   UCHAR FanThrottleToleranceAc;
-   UCHAR FanThrottleToleranceDc;
-   UCHAR ForcedThrottleAc;
-   UCHAR ForcedThrottleDc;
-} USER_POWER_POLICY, *PUSER_POWER_POLICY;
-typedef struct _POWER_POLICY{
-   USER_POWER_POLICY user;
-   MACHINE_POWER_POLICY mach;
-} POWER_POLICY, *PPOWER_POLICY;
-typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPTSTR, DWORD, LPTSTR, PPOWER_POLICY, LPARAM);
-typedef BOOLEAN (CALLBACK* PFNNTINITIATEPWRACTION)(POWER_ACTION, SYSTEM_POWER_STATE, ULONG, BOOLEAN);
-NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG);
-BOOLEAN WINAPI CanUserWritePwrScheme(VOID);
-BOOLEAN WINAPI DeletePwrScheme(UINT);
-BOOLEAN WINAPI EnumPwrSchemes(PWRSCHEMESENUMPROC, LPARAM);
-BOOLEAN WINAPI GetActivePwrScheme(PUINT);
-BOOLEAN WINAPI GetCurrentPowerPolicies(PGLOBAL_POWER_POLICY, PPOWER_POLICY);
-BOOLEAN WINAPI GetPwrCapabilities(PSYSTEM_POWER_CAPABILITIES);
-BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT, PUINT);
-BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY);
-BOOLEAN WINAPI IsPwrHibernateAllowed(VOID);
-BOOLEAN WINAPI IsPwrShutdownAllowed(VOID);
-BOOLEAN WINAPI IsPwrSuspendAllowed(VOID);
-BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY);
-BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY);
-BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY);
-BOOLEAN WINAPI SetActivePwrScheme(UINT, PGLOBAL_POWER_POLICY, PPOWER_POLICY);
-BOOLEAN WINAPI SetSuspendState(BOOLEAN, BOOLEAN, BOOLEAN);
-BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY);
-BOOLEAN WINAPI WriteProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY);
-BOOLEAN WINAPI ValidatePowerPolicies(PGLOBAL_POWER_POLICY, PPOWER_POLICY);
-BOOLEAN WINAPI WritePwrScheme(PUINT, LPTSTR, LPTSTR, PPOWER_POLICY);
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _POWRPROF_H */
diff --git a/winsup/w32api/include/prsht.h b/winsup/w32api/include/prsht.h
deleted file mode 100644
index 6039311b7..000000000
--- a/winsup/w32api/include/prsht.h
+++ /dev/null
@@ -1,304 +0,0 @@
-#ifndef _PRSHT_H
-#define _PRSHT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAXPROPPAGES	100
-#define PSP_DEFAULT	0
-#define PSP_DLGINDIRECT	1
-#define PSP_USEHICON	2
-#define PSP_USEICONID	4
-#define PSP_USETITLE	8
-#define PSP_RTLREADING	16
-#define PSP_HASHELP	32
-#define PSP_USEREFPARENT	64
-#define PSP_USECALLBACK	128
-#define PSP_PREMATURE	1024
-#if (_WIN32_IE >= 0x0400)
-#define PSP_HIDEHEADER	2048
-#define PSP_USEHEADERTITLE	4096
-#define PSP_USEHEADERSUBTITLE	8192
-#endif
-#define PSPCB_RELEASE	1
-#define PSPCB_CREATE	2
-#define PSH_DEFAULT	0
-#define PSH_PROPTITLE	1
-#define PSH_USEHICON	2
-#define PSH_USEICONID	4
-#define PSH_PROPSHEETPAGE	8
-#define PSH_WIZARDHASFINISH	16
-#define PSH_WIZARD	32
-#define PSH_USEPSTARTPAGE	64
-#define PSH_NOAPPLYNOW	128
-#define PSH_USECALLBACK	256
-#define PSH_HASHELP	512
-#define PSH_MODELESS	1024
-#define PSH_RTLREADING	2048
-#define PSH_WIZARDCONTEXTHELP	4096
-#if (_WIN32_IE >= 0x0400)
-#define PSH_WATERMARK	32768
-#define PSH_USEHBMWATERMARK	65536
-#define PSH_USEHPLWATERMARK	131072
-#define PSH_STRETCHWATERMARK	262144
-#define PSH_HEADER	524288
-#define PSH_USEHBMHEADER	1048576
-#define PSH_USEPAGELANG	2097152
-#if (_WIN32_IE < 0x0500)
-#define PSH_WIZARD97	0x00002000
-#else
-#define PSH_WIZARD97	0x01000000
-#endif
-#endif /* _WIN32_IE >= 0x0400 */
-#if (_WIN32_IE >= 0x0500)
-#define PSH_WIZARD_LITE	0x400000
-#define PSH_NOCONTEXTHELP	0x2000000
-#endif
-#define PSCB_INITIALIZED	1
-#define PSCB_PRECREATE	2
-#define PSM_GETTABCONTROL	1140
-#define PSM_GETCURRENTPAGEHWND	1142
-#define PSM_ISDIALOGMESSAGE	1141
-#define PSM_PRESSBUTTON	1137
-#define PSM_SETCURSELID	1138
-#define PSM_SETFINISHTEXTW	1145
-#define PSM_SETFINISHTEXTA	1139
-#define PSN_FIRST	(-200)
-#define PSN_LAST	(-299)
-#define PSN_APPLY	(-202)
-#define PSN_HELP	(-205)
-#define PSN_KILLACTIVE	(-201)
-#define PSN_QUERYCANCEL	(-209)
-#define PSN_RESET	(-203)
-#define PSN_SETACTIVE	(-200)
-#define PSN_WIZBACK	(-206)
-#define PSN_WIZFINISH	(-208)
-#define PSN_WIZNEXT	(-207)
-#define PSNRET_NOERROR	0
-#define PSNRET_INVALID	1
-#define PSNRET_INVALID_NOCHANGEPAGE	2
-#define ID_PSRESTARTWINDOWS	2
-#define ID_PSREBOOTSYSTEM 	3
-#define WIZ_CXDLG	276
-#define WIZ_CYDLG	140
-#define WIZ_CXBMP	80
-#define WIZ_BODYX	92
-#define WIZ_BODYCX	184
-#define PROP_SM_CXDLG	212
-#define PROP_SM_CYDLG	188
-#define PROP_MED_CXDLG	227
-#define PROP_MED_CYDLG	215
-#define PROP_LG_CXDLG	252
-#define PROP_LG_CYDLG	218
-#define PSBTN_MAX	6
-#define PSBTN_BACK	0
-#define PSBTN_NEXT	1
-#define PSBTN_FINISH	2
-#define PSBTN_OK	3
-#define PSBTN_APPLYNOW	4
-#define PSBTN_CANCEL	5
-#define PSBTN_HELP	6
-#define PSWIZB_BACK	1
-#define PSWIZB_NEXT	2
-#define PSWIZB_FINISH	4
-#define PSWIZB_DISABLEDFINISH	8
-#define PSM_SETWIZBUTTONS	(WM_USER+112)
-#define PSM_APPLY	(WM_USER+110)
-#define PSM_UNCHANGED	(WM_USER+109)
-#define PSM_QUERYSIBLINGS	(WM_USER+108)
-#define PSM_CANCELTOCLOSE	(WM_USER+107)
-#define PSM_REBOOTSYSTEM	(WM_USER+106)
-#define PSM_RESTARTWINDOWS	(WM_USER+105)
-#define PSM_CHANGED	(WM_USER+104)
-#define PSM_ADDPAGE	(WM_USER+103)
-#define PSM_REMOVEPAGE	(WM_USER+102)
-#define PSM_SETCURSEL	(WM_USER+101)
-#define PSM_SETTITLEA	(WM_USER+111)
-#define PSM_SETTITLEW	(WM_USER+120)
-
-#ifndef RC_INVOKED
-
-#pragma pack(push,8)
-typedef struct _PROPSHEETPAGEA {
-	DWORD	dwSize;
-	DWORD	dwFlags;
-	HINSTANCE	hInstance;
-	_ANONYMOUS_UNION union {
-		LPCSTR	pszTemplate;
-		LPCDLGTEMPLATE	pResource;
-	} DUMMYUNIONNAME;
-	_ANONYMOUS_UNION union {
-		HICON hIcon;
-		LPCSTR pszIcon;
-	} DUMMYUNIONNAME2;
-	LPCSTR	pszTitle;
-	DLGPROC	pfnDlgProc;
-	LPARAM	lParam;
-	UINT(CALLBACK *pfnCallback)(HWND,UINT,struct _PROPSHEETPAGEA*);
-	UINT *pcRefParent;
-#if (_WIN32_IE >= 0x0400)
-	LPCSTR pszHeaderTitle;
-	LPCSTR pszHeaderSubTitle;
-#endif
-} PROPSHEETPAGEA,*LPPROPSHEETPAGEA;
-typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA;
-typedef struct _PROPSHEETPAGEW {
-	DWORD	dwSize;
-	DWORD	dwFlags;
-	HINSTANCE	hInstance;
-	_ANONYMOUS_UNION union {
-		LPCWSTR	pszTemplate;
-		LPCDLGTEMPLATE	pResource;
-	} DUMMYUNIONNAME;
-	_ANONYMOUS_UNION union {
-		HICON hIcon;
-		LPCWSTR pszIcon;
-	} DUMMYUNIONNAME2;
-	LPCWSTR	pszTitle;
-	DLGPROC	pfnDlgProc;
-	LPARAM	lParam;
-	UINT(CALLBACK *pfnCallback)(HWND,UINT,struct _PROPSHEETPAGEW*);
-	UINT *pcRefParent;
-#if (_WIN32_IE >= 0x0400)
-	LPCWSTR pszHeaderTitle;
-	LPCWSTR pszHeaderSubTitle;
-#endif
-} PROPSHEETPAGEW,*LPPROPSHEETPAGEW;
-typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEW;
-typedef UINT(CALLBACK *LPFNPSPCALLBACKA)(HWND,UINT,LPPROPSHEETPAGEA);
-typedef UINT(CALLBACK *LPFNPSPCALLBACKW)(HWND,UINT,LPPROPSHEETPAGEW);
-typedef int(CALLBACK *PFNPROPSHEETCALLBACK)(HWND,UINT,LPARAM);
-DECLARE_HANDLE(HPROPSHEETPAGE);
-typedef struct _PROPSHEETHEADERA {
-	DWORD	dwSize;
-	DWORD	dwFlags;
-	HWND	hwndParent;
-	HINSTANCE	hInstance;
-	_ANONYMOUS_UNION union {
-		HICON	hIcon;
-		LPCSTR	pszIcon;
-	}DUMMYUNIONNAME;
-	LPCSTR	pszCaption;
-	UINT	nPages;
-	_ANONYMOUS_UNION union {
-		UINT	nStartPage;
-		LPCSTR	pStartPage;
-	}DUMMYUNIONNAME2;
-	_ANONYMOUS_UNION union {
-		LPCPROPSHEETPAGEA ppsp;
-		HPROPSHEETPAGE *phpage;
-	}DUMMYUNIONNAME3;
-	PFNPROPSHEETCALLBACK pfnCallback;
-#if (_WIN32_IE >= 0x0400)
-	_ANONYMOUS_UNION union {
-		HBITMAP hbmWatermark;
-		LPCSTR pszbmWatermark;
-	} DUMMYUNIONNAME4;
-	HPALETTE hplWatermark;
-	_ANONYMOUS_UNION union {
-		HBITMAP hbmHeader;
-		LPCSTR pszbmHeader;
-	} DUMMYUNIONNAME5;
-#endif
-} PROPSHEETHEADERA,*LPPROPSHEETHEADERA;
-typedef const PROPSHEETHEADERA *LPCPROPSHEETHEADERA;
-typedef struct _PROPSHEETHEADERW {
-	DWORD	dwSize;
-	DWORD	dwFlags;
-	HWND	hwndParent;
-	HINSTANCE	hInstance;
-	_ANONYMOUS_UNION union {
-		HICON	hIcon;
-		LPCWSTR	pszIcon;
-	}DUMMYUNIONNAME;
-	LPCWSTR	pszCaption;
-	UINT	nPages;
-	_ANONYMOUS_UNION union {
-		UINT	nStartPage;
-		LPCWSTR	pStartPage;
-	}DUMMYUNIONNAME2;
-	_ANONYMOUS_UNION union {
-		LPCPROPSHEETPAGEW ppsp;
-		HPROPSHEETPAGE *phpage;
-	}DUMMYUNIONNAME3;
-	PFNPROPSHEETCALLBACK pfnCallback;
-#if (_WIN32_IE >= 0x0400)
-	_ANONYMOUS_UNION union {
-		HBITMAP hbmWatermark;
-		LPCWSTR pszbmWatermark;
-	} DUMMYUNIONNAME4;
-	HPALETTE hplWatermark;
-	_ANONYMOUS_UNION union {
-		HBITMAP hbmHeader;
-		LPCWSTR pszbmHeader;
-	} DUMMYUNIONNAME5;
-#endif
-} PROPSHEETHEADERW,*LPPROPSHEETHEADERW;
-typedef const PROPSHEETHEADERW *LPCPROPSHEETHEADERW;
-typedef BOOL(CALLBACK *LPFNADDPROPSHEETPAGE)(HPROPSHEETPAGE,LPARAM);
-typedef BOOL(CALLBACK *LPFNADDPROPSHEETPAGES)(LPVOID,LPFNADDPROPSHEETPAGE,LPARAM);
-typedef struct _PSHNOTIFY {
-	NMHDR hdr;
-	LPARAM lParam;
-} PSHNOTIFY,*LPPSHNOTIFY;
-
-#pragma pack(pop)
-
-HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(LPCPROPSHEETPAGEA);
-HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW);
-BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE);
-int WINAPI PropertySheetA(LPCPROPSHEETHEADERA);
-int WINAPI PropertySheetW(LPCPROPSHEETHEADERW);
-#define PropSheet_AddPage(d,p) SendMessage(d,PSM_ADDPAGE,0,(LPARAM)p)
-#define PropSheet_Apply(d) SendMessage(d,PSM_APPLY,0,0)
-#define PropSheet_CancelToClose(d) SendMessage(d,PSM_CANCELTOCLOSE,0,0)
-#define PropSheet_Changed(d,w) SendMessage(d,PSM_CHANGED,(WPARAM)w,0)
-#define PropSheet_GetCurrentPageHwnd(d) (HWND)SendMessage(d,PSM_GETCURRENTPAGEHWND,0,0)
-#define PropSheet_GetTabControl(d) (HWND)SendMessage(d,PSM_GETTABCONTROL,0,0)
-#define PropSheet_IsDialogMessage(d,m) (BOOL)SendMessage(d,PSM_ISDIALOGMESSAGE,0,(LPARAM)m)
-#define PropSheet_PressButton(d,i) SendMessage(d,PSM_PRESSBUTTON,i,0)
-#define PropSheet_QuerySiblings(d,w,l) SendMessage(d,PSM_QUERYSIBLINGS,w,l)
-#define PropSheet_RebootSystem(d) SendMessage(d,PSM_REBOOTSYSTEM,0,0)
-#define PropSheet_RemovePage(d,i,p) SendMessage(d,PSM_REMOVEPAGE,i,(LPARAM)p)
-#define PropSheet_RestartWindows(d) SendMessage(d,PSM_RESTARTWINDOWS,0,0)
-#define PropSheet_SetCurSel(d,p,i) SendMessage(d,PSM_SETCURSEL,i,(LPARAM)p)
-#define PropSheet_SetCurSelByID(d,i) SendMessage(d,PSM_SETCURSELID,0,i)
-#define PropSheet_SetFinishText(d,s) SendMessage(d,PSM_SETFINISHTEXT,0,(LPARAM)s)
-#define PropSheet_SetTitle(d,w,s) SendMessage(d,PSM_SETTITLE,w,(LPARAM)s)
-#define PropSheet_SetWizButtons(d,f) PostMessage(d,PSM_SETWIZBUTTONS,0,(LPARAM)f)
-#define PropSheet_UnChanged(d,w) SendMessage(d,PSM_UNCHANGED,(WPARAM)w,0)
-#endif
-
-#ifdef UNICODE
-#define LPFNPSPCALLBACK	LPFNPSPCALLBACKW
-#define PROPSHEETPAGE	PROPSHEETPAGEW
-#define LPPROPSHEETPAGE	LPPROPSHEETPAGEW
-#define LPCPROPSHEETPAGE	LPCPROPSHEETPAGEW
-#define PROPSHEETHEADER	PROPSHEETHEADERW
-#define LPPROPSHEETHEADER	LPPROPSHEETHEADERW
-#define LPCPROPSHEETHEADER	LPCPROPSHEETHEADERW
-#define PSM_SETTITLE PSM_SETTITLEW
-#define PSM_SETFINISHTEXT PSM_SETFINISHTEXTW
-#define CreatePropertySheetPage CreatePropertySheetPageW
-#define PropertySheet PropertySheetW
-#else
-#define LPFNPSPCALLBACK	LPFNPSPCALLBACKA
-#define PROPSHEETPAGE	PROPSHEETPAGEA
-#define LPPROPSHEETPAGE	LPPROPSHEETPAGEA
-#define LPCPROPSHEETPAGE	LPCPROPSHEETPAGEA
-#define PROPSHEETHEADER	PROPSHEETHEADERA
-#define LPPROPSHEETHEADER	LPPROPSHEETHEADERA
-#define LPCPROPSHEETHEADER	LPCPROPSHEETHEADERA
-#define PSM_SETTITLE PSM_SETTITLEA
-#define PSM_SETFINISHTEXT PSM_SETFINISHTEXTA
-#define CreatePropertySheetPage CreatePropertySheetPageA
-#define PropertySheet PropertySheetA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/psapi.h b/winsup/w32api/include/psapi.h
deleted file mode 100644
index af72931ef..000000000
--- a/winsup/w32api/include/psapi.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-	psapi.h - Include file for PSAPI.DLL APIs
-
-	Written by Mumit Khan <khan@nanotech.wisc.edu>
-
-	This file is part of a free library for the Win32 API.
-
-	NOTE: This strictly does not belong in the Win32 API since it's
-	really part of Platform SDK. However,GDB needs it and we might
-	as well provide it here.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-*/
-#ifndef _PSAPI_H
-#define _PSAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef RC_INVOKED
-
-typedef struct _MODULEINFO {
-	LPVOID lpBaseOfDll;
-	DWORD SizeOfImage;
-	LPVOID EntryPoint;
-} MODULEINFO,*LPMODULEINFO;
-
-typedef struct _PSAPI_WS_WATCH_INFORMATION {
-	LPVOID FaultingPc;
-	LPVOID FaultingVa;
-} PSAPI_WS_WATCH_INFORMATION,*PPSAPI_WS_WATCH_INFORMATION;
-
-typedef struct _PROCESS_MEMORY_COUNTERS {
-	DWORD cb;
-	DWORD PageFaultCount;
-	DWORD PeakWorkingSetSize;
-	DWORD WorkingSetSize;
-	DWORD QuotaPeakPagedPoolUsage;
-	DWORD QuotaPagedPoolUsage;
-	DWORD QuotaPeakNonPagedPoolUsage;
-	DWORD QuotaNonPagedPoolUsage;
-	DWORD PagefileUsage;
-	DWORD PeakPagefileUsage;
-} PROCESS_MEMORY_COUNTERS,*PPROCESS_MEMORY_COUNTERS;
-
-/* Grouped by application,not in alphabetical order. */
-BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *);
-BOOL WINAPI EnumProcessModules(HANDLE,HMODULE *,DWORD,LPDWORD);
-DWORD WINAPI GetModuleBaseNameA(HANDLE,HMODULE,LPSTR,DWORD);
-DWORD WINAPI GetModuleBaseNameW(HANDLE,HMODULE,LPWSTR,DWORD);
-DWORD WINAPI GetModuleFileNameExA(HANDLE,HMODULE,LPSTR,DWORD);
-DWORD WINAPI GetModuleFileNameExW(HANDLE,HMODULE,LPWSTR,DWORD);
-BOOL WINAPI GetModuleInformation(HANDLE,HMODULE,LPMODULEINFO,DWORD);
-BOOL WINAPI EmptyWorkingSet(HANDLE);
-BOOL WINAPI QueryWorkingSet(HANDLE,PVOID,DWORD);
-BOOL WINAPI InitializeProcessForWsWatch(HANDLE);
-BOOL WINAPI GetWsChanges(HANDLE,PPSAPI_WS_WATCH_INFORMATION,DWORD);
-DWORD WINAPI GetMappedFileNameW(HANDLE,LPVOID,LPWSTR,DWORD);
-DWORD WINAPI GetMappedFileNameA(HANDLE,LPVOID,LPSTR,DWORD);
-BOOL WINAPI EnumDeviceDrivers(LPVOID *,DWORD,LPDWORD);
-DWORD WINAPI GetDeviceDriverBaseNameA(LPVOID,LPSTR,DWORD);
-DWORD WINAPI GetDeviceDriverBaseNameW(LPVOID,LPWSTR,DWORD);
-DWORD WINAPI GetDeviceDriverFileNameA(LPVOID,LPSTR,DWORD);
-DWORD WINAPI GetDeviceDriverFileNameW(LPVOID,LPWSTR,DWORD);
-BOOL WINAPI GetProcessMemoryInfo(HANDLE,PPROCESS_MEMORY_COUNTERS,DWORD);
-
-#endif /* not RC_INVOKED */
-
-#ifdef UNICODE
-#define GetModuleBaseName GetModuleBaseNameW
-#define GetModuleFileNameEx GetModuleFileNameExW
-#define GetMappedFilenameEx GetMappedFilenameExW
-#define GetDeviceDriverBaseName GetDeviceDriverBaseNameW
-#define GetDeviceDriverFileName GetDeviceDriverFileNameW
-#else
-#define GetModuleBaseName GetModuleBaseNameA
-#define GetModuleFileNameEx GetModuleFileNameExA
-#define GetMappedFilenameEx GetMappedFilenameExA
-#define GetDeviceDriverBaseName GetDeviceDriverBaseNameA
-#define GetDeviceDriverFileName GetDeviceDriverFileNameA
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PSAPI_H */
-
diff --git a/winsup/w32api/include/pshpack1.h b/winsup/w32api/include/pshpack1.h
deleted file mode 100644
index 3cbcf238b..000000000
--- a/winsup/w32api/include/pshpack1.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef RC_INVOKED
-#pragma pack(push,1)
-#endif
diff --git a/winsup/w32api/include/pshpack2.h b/winsup/w32api/include/pshpack2.h
deleted file mode 100644
index 4d88e004e..000000000
--- a/winsup/w32api/include/pshpack2.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef RC_INVOKED
-#pragma pack(push,2)
-#endif
diff --git a/winsup/w32api/include/pshpack4.h b/winsup/w32api/include/pshpack4.h
deleted file mode 100644
index c1c3cf959..000000000
--- a/winsup/w32api/include/pshpack4.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef RC_INVOKED
-#pragma pack(push,4)
-#endif
diff --git a/winsup/w32api/include/pshpack8.h b/winsup/w32api/include/pshpack8.h
deleted file mode 100644
index f0c4539b9..000000000
--- a/winsup/w32api/include/pshpack8.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef RC_INVOKED
-#pragma pack(push,8)
-#endif
diff --git a/winsup/w32api/include/rapi.h b/winsup/w32api/include/rapi.h
deleted file mode 100644
index 4cf6515b4..000000000
--- a/winsup/w32api/include/rapi.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* rapi.h - main header file for the RAPI API
-
-        NOTE: This strictly does not belong in the Win32 API since it's
-        really part of Platform SDK.
-
-*/
-
-#ifndef _RAPI_H
-#define _RAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-typedef struct IRAPIStream
-{
-  struct IRAPIStreamVtbl * lpVtbl;
-} IRAPIStream;
-
-typedef struct IRAPIStreamVtbl IRAPIStreamVtbl;
-
-typedef enum tagRAPISTREAMFLAG
-{
-  STREAM_TIMEOUT_READ
-} RAPISTREAMFLAG;
-
-struct IRAPIStreamVtbl
-{
-  HRESULT (__stdcall * SetRapiStat)( IRAPIStream *, RAPISTREAMFLAG, DWORD);
-  HRESULT (__stdcall * GetRapiStat)( IRAPIStream *, RAPISTREAMFLAG, DWORD *);
-};
-
-typedef  HRESULT (STDAPICALLTYPE RAPIEXT)(DWORD, BYTE, DWORD, BYTE, IRAPIStream	*);
-
-typedef struct _RAPIINIT
-{
-  DWORD cbSize;
-  HANDLE heRapiInit;
-  HRESULT hrRapiInit;
-} RAPIINIT;
-
-STDAPI CeRapiInit (void);
-STDAPI CeRapiInitEx (RAPIINIT*);
-STDAPI_(BOOL) CeCreateProcess (LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES,
-			       BOOL, DWORD, LPVOID, LPWSTR, LPSTARTUPINFO, LPPROCESS_INFORMATION);
-STDAPI CeRapiUninit (void);
-
-STDAPI_(BOOL) CeWriteFile (HANDLE, LPCVOID, DWORD, LPDWORD, LPOVERLAPPED);
-STDAPI_(HANDLE) CeCreateFile (LPCWSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE); 
-STDAPI_(BOOL) CeCreateDirectory (LPCWSTR, LPSECURITY_ATTRIBUTES); 
-STDAPI_(DWORD) CeGetLastError (void);
-STDAPI_(BOOL) CeGetFileTime (HANDLE, LPFILETIME, LPFILETIME, LPFILETIME); 
-STDAPI_(BOOL) CeCloseHandle (HANDLE); 
-
-#endif /* _RAPI_H */
diff --git a/winsup/w32api/include/ras.h b/winsup/w32api/include/ras.h
deleted file mode 100644
index 2799be3b7..000000000
--- a/winsup/w32api/include/ras.h
+++ /dev/null
@@ -1,966 +0,0 @@
-#ifndef _RAS_H
-#define _RAS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#ifndef _LMCONS_H
-#include <lmcons.h>
-#endif
-
-/* TODO
-include <basetsd.h> from winnt.h so that this typedef is not necessary
-*/
-#ifndef _BASETSD_H
-typedef unsigned long ULONG_PTR, *PULONG_PTR;
-#endif
-
-#include <pshpack4.h>
-
-#define RAS_MaxDeviceType     16
-#define RAS_MaxPhoneNumber    128
-#define RAS_MaxIpAddress      15
-#define RAS_MaxIpxAddress     21
-#define RAS_MaxEntryName      256
-#define RAS_MaxDeviceName     128
-#define RAS_MaxCallbackNumber RAS_MaxPhoneNumber
-#define RAS_MaxAreaCode       10
-#define RAS_MaxPadType        32
-#define RAS_MaxX25Address     200
-#define RAS_MaxFacilities     200
-#define RAS_MaxUserData       200
-#define RAS_MaxReplyMessage   1024
-#define RDEOPT_UsePrefixSuffix           0x00000001
-#define RDEOPT_PausedStates              0x00000002
-#define RDEOPT_IgnoreModemSpeaker        0x00000004
-#define RDEOPT_SetModemSpeaker           0x00000008
-#define RDEOPT_IgnoreSoftwareCompression 0x00000010
-#define RDEOPT_SetSoftwareCompression    0x00000020
-#define RDEOPT_DisableConnectedUI        0x00000040
-#define RDEOPT_DisableReconnectUI        0x00000080
-#define RDEOPT_DisableReconnect          0x00000100
-#define RDEOPT_NoUser                    0x00000200
-#define RDEOPT_PauseOnScript             0x00000400
-#define RDEOPT_Router                    0x00000800
-#define REN_User                         0x00000000
-#define REN_AllUsers                     0x00000001
-#define VS_Default		                0
-#define VS_PptpOnly	                    1
-#define VS_PptpFirst	                2
-#define VS_L2tpOnly 	                3
-#define VS_L2tpFirst	                4
-#define RASDIALEVENT                    "RasDialEvent"
-#define WM_RASDIALEVENT                 0xCCCD
-#define RASEO_UseCountryAndAreaCodes    0x00000001
-#define RASEO_SpecificIpAddr            0x00000002
-#define RASEO_SpecificNameServers       0x00000004
-#define RASEO_IpHeaderCompression       0x00000008
-#define RASEO_RemoteDefaultGateway      0x00000010
-#define RASEO_DisableLcpExtensions      0x00000020
-#define RASEO_TerminalBeforeDial        0x00000040
-#define RASEO_TerminalAfterDial         0x00000080
-#define RASEO_ModemLights               0x00000100
-#define RASEO_SwCompression             0x00000200
-#define RASEO_RequireEncryptedPw        0x00000400
-#define RASEO_RequireMsEncryptedPw      0x00000800
-#define RASEO_RequireDataEncryption     0x00001000
-#define RASEO_NetworkLogon              0x00002000
-#define RASEO_UseLogonCredentials       0x00004000
-#define RASEO_PromoteAlternates         0x00008000
-#define RASNP_NetBEUI                   0x00000001
-#define RASNP_Ipx                       0x00000002
-#define RASNP_Ip                        0x00000004
-#define RASFP_Ppp                       0x00000001
-#define RASFP_Slip                      0x00000002
-#define RASFP_Ras                       0x00000004
-#define RASDT_Modem                     TEXT("modem")
-#define RASDT_Isdn                      TEXT("isdn")
-#define RASDT_X25                       TEXT("x25")
-#define RASDT_Vpn                       TEXT("vpn")
-#define RASDT_Pad                       TEXT("pad")
-#define RASDT_Generic                   TEXT("GENERIC")
-#define RASDT_Serial        		TEXT("SERIAL")
-#define RASDT_FrameRelay                TEXT("FRAMERELAY")
-#define RASDT_Atm                       TEXT("ATM")
-#define RASDT_Sonet                     TEXT("SONET")
-#define RASDT_SW56                      TEXT("SW56")
-#define RASDT_Irda                      TEXT("IRDA")
-#define RASDT_Parallel                  TEXT("PARALLEL")
-#define RASET_Phone     1
-#define RASET_Vpn       2
-#define RASET_Direct    3
-#define RASET_Internet  4
-#if (WINVER >= 0x401)
-#define RASEO_SecureLocalFiles  0x00010000
-#define RASCN_Connection        0x00000001
-#define RASCN_Disconnection     0x00000002
-#define RASCN_BandwidthAdded    0x00000004
-#define RASCN_BandwidthRemoved  0x00000008
-#define RASEDM_DialAll          1
-#define RASEDM_DialAsNeeded     2
-#define RASIDS_Disabled         0xffffffff
-#define RASIDS_UseGlobalValue   0
-#define RASADFLG_PositionDlg    0x00000001
-#define RASCM_UserName       0x00000001
-#define RASCM_Password       0x00000002
-#define RASCM_Domain         0x00000004
-#define RASADP_DisableConnectionQuery   0
-#define RASADP_LoginSessionDisable      1
-#define RASADP_SavedAddressesLimit      2
-#define RASADP_FailedConnectionTimeout  3
-#define RASADP_ConnectionQueryTimeout   4
-#endif  /* (WINVER >= 0x401) */
-#if (WINVER >= 0x500)
-#define RDEOPT_CustomDial   0x00001000
-#define RASLCPAP_PAP        0xC023
-#define RASLCPAP_SPAP       0xC027
-#define RASLCPAP_CHAP       0xC223
-#define RASLCPAP_EAP        0xC227
-#define RASLCPAD_CHAP_MD5   0x05
-#define RASLCPAD_CHAP_MS    0x80
-#define RASLCPAD_CHAP_MSV2  0x81
-#define RASLCPO_PFC         0x00000001
-#define RASLCPO_ACFC        0x00000002
-#define RASLCPO_SSHF        0x00000004
-#define RASLCPO_DES_56      0x00000008
-#define RASLCPO_3_DES       0x00000010
-#define RASCCPCA_MPPC       0x00000006
-#define RASCCPCA_STAC       0x00000005
-#define RASCCPO_Compression         0x00000001
-#define RASCCPO_HistoryLess         0x00000002
-#define RASCCPO_Encryption56bit     0x00000010
-#define RASCCPO_Encryption40bit     0x00000020
-#define RASCCPO_Encryption128bit    0x00000040
-#define RASEO_RequireEAP            0x00020000
-#define RASEO_RequirePAP            0x00040000
-#define RASEO_RequireSPAP           0x00080000
-#define RASEO_Custom                0x00100000
-#define RASEO_PreviewPhoneNumber    0x00200000
-#define RASEO_SharedPhoneNumbers    0x00800000
-#define RASEO_PreviewUserPw         0x01000000
-#define RASEO_PreviewDomain         0x02000000
-#define RASEO_ShowDialingProgress   0x04000000
-#define RASEO_RequireCHAP           0x08000000
-#define RASEO_RequireMsCHAP         0x10000000
-#define RASEO_RequireMsCHAP2        0x20000000
-#define RASEO_RequireW95MSCHAP      0x40000000
-#define RASEO_CustomScript          0x80000000
-#define RASIPO_VJ                   0x00000001
-#define RCD_SingleUser              0
-#define RCD_AllUsers                0x00000001
-#define RCD_Eap                     0x00000002
-#define RASEAPF_NonInteractive      0x00000002
-#define RASEAPF_Logon               0x00000004
-#define RASEAPF_Preview             0x00000008
-#define ET_40Bit        1
-#define ET_128Bit       2
-#define ET_None         0
-#define ET_Require      1
-#define ET_RequireMax   2
-#define ET_Optional     3
-#endif /* (WINVER >= 0x500) */
-
-#define RASCS_PAUSED 0x1000
-#define RASCS_DONE   0x2000
-typedef enum tagRASCONNSTATE {
-      RASCS_OpenPort = 0,
-      RASCS_PortOpened,
-      RASCS_ConnectDevice,
-      RASCS_DeviceConnected,
-      RASCS_AllDevicesConnected,
-      RASCS_Authenticate,
-      RASCS_AuthNotify,
-      RASCS_AuthRetry,
-      RASCS_AuthCallback,
-      RASCS_AuthChangePassword,
-      RASCS_AuthProject,
-      RASCS_AuthLinkSpeed,
-      RASCS_AuthAck,
-      RASCS_ReAuthenticate,
-      RASCS_Authenticated,
-      RASCS_PrepareForCallback,
-      RASCS_WaitForModemReset,
-      RASCS_WaitForCallback,
-      RASCS_Projected,
-      RASCS_StartAuthentication,
-      RASCS_CallbackComplete,
-      RASCS_LogonNetwork,
-      RASCS_SubEntryConnected,
-      RASCS_SubEntryDisconnected,
-      RASCS_Interactive = RASCS_PAUSED,
-      RASCS_RetryAuthentication,
-      RASCS_CallbackSetByCaller,
-      RASCS_PasswordExpired,
-#if (WINVER >= 0x500)
-      RASCS_InvokeEapUI,
-#endif
-      RASCS_Connected = RASCS_DONE,
-      RASCS_Disconnected
-}  RASCONNSTATE, *LPRASCONNSTATE;
-
-typedef enum tagRASPROJECTION {
-    RASP_Amb =      0x10000,
-    RASP_PppNbf =   0x803F,
-    RASP_PppIpx =   0x802B,
-    RASP_PppIp =    0x8021,
-#if (WINVER >= 0x500)
-    RASP_PppCcp =   0x80FD,
-#endif
-    RASP_PppLcp =   0xC021,
-    RASP_Slip =     0x20000
-} RASPROJECTION, *LPRASPROJECTION;
-
-DECLARE_HANDLE (HRASCONN);
-typedef  HRASCONN* LPHRASCONN;
-
-typedef struct tagRASCONNW {
-    DWORD dwSize;
-    HRASCONN hrasconn;
-    WCHAR szEntryName[RAS_MaxEntryName + 1];
-#if (WINVER >= 0x400) 
-    WCHAR szDeviceType[RAS_MaxDeviceType + 1];
-    WCHAR szDeviceName[RAS_MaxDeviceName + 1];
-#endif
-#if (WINVER >= 0x401)
-    WCHAR szPhonebook[MAX_PATH];
-    DWORD dwSubEntry;
-#endif
-#if (WINVER >= 0x500)
-    GUID guidEntry;
-#endif
-#if (WINVER >= 0x501)
-    DWORD dwSessionId;
-    DWORD dwFlags;
-    LUID luid;
-#endif
-} RASCONNW, *LPRASCONNW;
-
-typedef struct tagRASCONNA {
-    DWORD dwSize;
-    HRASCONN hrasconn;
-    CHAR szEntryName[RAS_MaxEntryName + 1];
-#if (WINVER >= 0x400) 
-    CHAR szDeviceType[RAS_MaxDeviceType + 1];
-    CHAR szDeviceName[RAS_MaxDeviceName + 1];
-#endif
-#if (WINVER >= 0x401)
-    CHAR szPhonebook[MAX_PATH];
-    DWORD dwSubEntry;
-#endif
-#if (WINVER >= 0x500)
-    GUID guidEntry;
-#endif
-#if (WINVER >= 0x501)
-    DWORD dwSessionId;
-    DWORD dwFlags;
-    LUID luid;
-#endif
-} RASCONNA, *LPRASCONNA;
-
-typedef struct tagRASCONNSTATUSW {
-    DWORD dwSize;
-    RASCONNSTATE rasconnstate;
-    DWORD dwError;
-    WCHAR szDeviceType[RAS_MaxDeviceType + 1];
-    WCHAR szDeviceName[RAS_MaxDeviceName + 1];
-#if (WINVER >= 0x401)
-    WCHAR szPhoneNumber[RAS_MaxPhoneNumber + 1];
-#endif
-} RASCONNSTATUSW, *LPRASCONNSTATUSW;
-
-typedef struct tagRASCONNSTATUSA {
-    DWORD dwSize;
-    RASCONNSTATE rasconnstate;
-    DWORD dwError;
-    CHAR szDeviceType[RAS_MaxDeviceType + 1];
-    CHAR szDeviceName[RAS_MaxDeviceName + 1];
-#if (WINVER >= 0x401)
-    CHAR szPhoneNumber[RAS_MaxPhoneNumber + 1];
-#endif
-} RASCONNSTATUSA, *LPRASCONNSTATUSA;
-
-typedef struct tagRASDIALPARAMSW {
-    DWORD dwSize;
-    WCHAR szEntryName[RAS_MaxEntryName + 1];
-    WCHAR szPhoneNumber[RAS_MaxPhoneNumber + 1];
-    WCHAR szCallbackNumber[RAS_MaxCallbackNumber + 1];
-    WCHAR szUserName[UNLEN + 1];
-    WCHAR szPassword[PWLEN + 1];
-    WCHAR szDomain[DNLEN + 1];
-#if (WINVER >= 0x401)
-    DWORD dwSubEntry;
-    ULONG_PTR dwCallbackId;
-#endif
-} RASDIALPARAMSW, *LPRASDIALPARAMSW;
-
-typedef struct tagRASDIALPARAMSA {
-    DWORD dwSize;
-    CHAR szEntryName[RAS_MaxEntryName + 1];
-    CHAR szPhoneNumber[RAS_MaxPhoneNumber + 1];
-    CHAR szCallbackNumber[RAS_MaxCallbackNumber + 1];
-    CHAR szUserName[UNLEN + 1];
-    CHAR szPassword[PWLEN + 1];
-    CHAR szDomain[DNLEN + 1];
-#if (WINVER >= 0x401)
-    DWORD dwSubEntry;
-    ULONG_PTR dwCallbackId;
-#endif
-} RASDIALPARAMSA, *LPRASDIALPARAMSA;
-
-#if (WINVER >= 0x500)
-typedef struct tagRASEAPINFO {
-    DWORD dwSizeofEapInfo;
-    BYTE *pbEapInfo;
-} RASEAPINFO;
-#endif
-
-typedef struct tagRASDIALEXTENSIONS {
-    DWORD dwSize;
-    DWORD dwfOptions;
-    HWND hwndParent;
-    ULONG_PTR reserved;
-#if (WINVER >= 0x500)
-    ULONG_PTR reserved1;
-    RASEAPINFO RasEapInfo;
-#endif
-} RASDIALEXTENSIONS, *LPRASDIALEXTENSIONS;
-
-typedef struct tagRASENTRYNAMEW {
-    DWORD dwSize;
-    WCHAR szEntryName[RAS_MaxEntryName + 1];
-#if (WINVER >= 0x500)
-    DWORD dwFlags;
-    WCHAR szPhonebookPath[MAX_PATH + 1];
-#endif
-} RASENTRYNAMEW, *LPRASENTRYNAMEW;
-
-typedef struct tagRASENTRYNAMEA {
-    DWORD dwSize;
-    CHAR szEntryName[RAS_MaxEntryName + 1];
-#if (WINVER >= 0x500)
-    DWORD dwFlags;
-    CHAR szPhonebookPath[MAX_PATH + 1];
-#endif
-} RASENTRYNAMEA, *LPRASENTRYNAMEA;
-
-typedef struct tagRASAMBW {
-    DWORD dwSize;
-    DWORD dwError;
-    WCHAR szNetBiosError[NETBIOS_NAME_LEN + 1];
-    BYTE bLana;
-} RASAMBW, *LPRASAMBW;
-
-typedef struct tagRASAMBA {
-    DWORD dwSize;
-    DWORD dwError;
-    CHAR szNetBiosError[NETBIOS_NAME_LEN + 1];
-    BYTE bLana;
-} RASAMBA, *LPRASAMBA;
-
-typedef struct tagRASPPPNBFW {
-    DWORD dwSize;
-    DWORD dwError;
-    DWORD dwNetBiosError;
-    WCHAR szNetBiosError[NETBIOS_NAME_LEN + 1];
-    WCHAR szWorkstationName[NETBIOS_NAME_LEN + 1];
-    BYTE bLana;
-} RASPPPNBFW, *LPRASPPPNBFW;
-
-typedef struct tagRASPPPNBFA {
-    DWORD dwSize;
-    DWORD dwError;
-    DWORD dwNetBiosError;
-    CHAR szNetBiosError[NETBIOS_NAME_LEN + 1];
-    CHAR szWorkstationName[NETBIOS_NAME_LEN + 1];
-    BYTE bLana;
-} RASPPPNBFA, *LPRASPPPNBFA;
-
-typedef struct tagRASIPXW {
-    DWORD dwSize;
-    DWORD dwError;
-    WCHAR szIpxAddress[RAS_MaxIpxAddress + 1];
-} RASPPPIPXW, *LPRASPPPIPXW;
-
-typedef struct tagRASIPXA {
-    DWORD dwSize;
-    DWORD dwError;
-    CHAR szIpxAddress[RAS_MaxIpxAddress + 1];
-} RASPPPIPXA, *LPRASPPPIPXA;
-
-typedef struct tagRASPPPIPW {
-    DWORD dwSize;
-    DWORD dwError;
-    WCHAR szIpAddress[RAS_MaxIpAddress + 1];
-#ifndef WINNT35COMPATIBLE
-    WCHAR szServerIpAddress[RAS_MaxIpAddress + 1];
-#endif
-#if (WINVER >= 0x500)
-    DWORD dwOptions;
-    DWORD dwServerOptions;
-#endif
-} RASPPPIPW, *LPRASPPPIPW;
-
-typedef struct tagRASPPPIPA {
-    DWORD dwSize;
-    DWORD dwError;
-    CHAR szIpAddress[RAS_MaxIpAddress + 1];
-#ifndef WINNT35COMPATIBLE
-    CHAR szServerIpAddress[RAS_MaxIpAddress + 1];
-#endif
-#if (WINVER >= 0x500)
-    DWORD dwOptions;
-    DWORD dwServerOptions;
-#endif
-} RASPPPIPA, *LPRASPPPIPA;
-
-typedef struct tagRASPPPLCPW {
-    DWORD dwSize;
-    BOOL fBundled;
-#if (WINVER >= 0x500)
-    DWORD dwError;
-    DWORD dwAuthenticationProtocol;
-    DWORD dwAuthenticationData;
-    DWORD dwEapTypeId;
-    DWORD dwServerAuthenticationProtocol;
-    DWORD dwServerAuthenticationData;
-    DWORD dwServerEapTypeId;
-    BOOL fMultilink;
-    DWORD dwTerminateReason;
-    DWORD dwServerTerminateReason;
-    WCHAR szReplyMessage[RAS_MaxReplyMessage];
-    DWORD dwOptions;
-    DWORD dwServerOptions;
-#endif
-} RASPPPLCPW, *LPRASPPPLCPW;
-
-typedef struct tagRASPPPLCPA {
-    DWORD dwSize;
-    BOOL fBundled;
-#if (WINVER >= 0x500)
-    DWORD dwError;
-    DWORD dwAuthenticationProtocol;
-    DWORD dwAuthenticationData;
-    DWORD dwEapTypeId;
-    DWORD dwServerAuthenticationProtocol;
-    DWORD dwServerAuthenticationData;
-    DWORD dwServerEapTypeId;
-    BOOL fMultilink;
-    DWORD dwTerminateReason;
-    DWORD dwServerTerminateReason;
-    CHAR szReplyMessage[RAS_MaxReplyMessage];
-    DWORD dwOptions;
-    DWORD dwServerOptions;
-#endif
-} RASPPPLCPA, *LPRASPPPLCPA;
-
-typedef struct tagRASSLIPW {
-    DWORD dwSize;
-    DWORD dwError;
-    WCHAR szIpAddress[RAS_MaxIpAddress + 1];
-} RASSLIPW, *LPRASSLIPW;
-
-
-typedef struct tagRASSLIPA {
-    DWORD dwSize;
-    DWORD dwError;
-    CHAR szIpAddress[RAS_MaxIpAddress + 1];
-} RASSLIPA, *LPRASSLIPA;
-
-typedef struct tagRASDEVINFOW {
-    DWORD dwSize;
-    WCHAR szDeviceType[RAS_MaxDeviceType + 1];
-    WCHAR szDeviceName[RAS_MaxDeviceName + 1];
-} RASDEVINFOW, *LPRASDEVINFOW;
-
-typedef struct tagRASDEVINFOA {
-    DWORD dwSize;
-    CHAR szDeviceType[RAS_MaxDeviceType + 1];
-    CHAR szDeviceName[RAS_MaxDeviceName + 1];
-} RASDEVINFOA, *LPRASDEVINFOA;
-
-typedef struct tagRASCTRYINFO {
-    DWORD dwSize;
-    DWORD dwCountryID;
-    DWORD dwNextCountryID;
-    DWORD dwCountryCode;
-    DWORD dwCountryNameOffset;
-} RASCTRYINFO, *LPRASCTRYINFO;
-
-typedef RASCTRYINFO  RASCTRYINFOW, *LPRASCTRYINFOW;
-typedef RASCTRYINFO  RASCTRYINFOA, *LPRASCTRYINFOA;
-
-typedef struct tagRASIPADDR {
-    BYTE a;
-    BYTE b;
-    BYTE c;
-    BYTE d;
-} RASIPADDR;
-
-typedef struct tagRASENTRYW {
-    DWORD dwSize;
-    DWORD dwfOptions;
-    DWORD dwCountryID;
-    DWORD dwCountryCode;
-    WCHAR szAreaCode[RAS_MaxAreaCode + 1];
-    WCHAR szLocalPhoneNumber[RAS_MaxPhoneNumber + 1];
-    DWORD dwAlternateOffset;
-    RASIPADDR ipaddr;
-    RASIPADDR ipaddrDns;
-    RASIPADDR ipaddrDnsAlt;
-    RASIPADDR ipaddrWins;
-    RASIPADDR ipaddrWinsAlt;
-    DWORD dwFrameSize;
-    DWORD dwfNetProtocols;
-    DWORD dwFramingProtocol;
-    WCHAR szScript[MAX_PATH];
-    WCHAR szAutodialDll[MAX_PATH];
-    WCHAR szAutodialFunc[MAX_PATH];
-    WCHAR szDeviceType[RAS_MaxDeviceType + 1];
-    WCHAR szDeviceName[RAS_MaxDeviceName + 1];
-    WCHAR szX25PadType[RAS_MaxPadType + 1];
-    WCHAR szX25Address[RAS_MaxX25Address + 1];
-    WCHAR szX25Facilities[RAS_MaxFacilities + 1];
-    WCHAR szX25UserData[RAS_MaxUserData + 1];
-    DWORD dwChannels;
-    DWORD dwReserved1;
-    DWORD dwReserved2;
-#if (WINVER >= 0x401)
-    DWORD dwSubEntries;
-    DWORD dwDialMode;
-    DWORD dwDialExtraPercent;
-    DWORD dwDialExtraSampleSeconds;
-    DWORD dwHangUpExtraPercent;
-    DWORD dwHangUpExtraSampleSeconds;
-    DWORD dwIdleDisconnectSeconds;
-#endif
-#if (WINVER >= 0x500)
-    DWORD dwType;
-    DWORD dwEncryptionType;
-    DWORD dwCustomAuthKey;
-    GUID guidId;
-    WCHAR szCustomDialDll[MAX_PATH];
-    DWORD dwVpnStrategy;
-#endif
-} RASENTRYW, *LPRASENTRYW;
-
-typedef struct tagRASENTRYA {
-    DWORD dwSize;
-    DWORD dwfOptions;
-    DWORD dwCountryID;
-    DWORD dwCountryCode;
-    CHAR szAreaCode[RAS_MaxAreaCode + 1];
-    CHAR szLocalPhoneNumber[RAS_MaxPhoneNumber + 1];
-    DWORD dwAlternateOffset;
-    RASIPADDR ipaddr;
-    RASIPADDR ipaddrDns;
-    RASIPADDR ipaddrDnsAlt;
-    RASIPADDR ipaddrWins;
-    RASIPADDR ipaddrWinsAlt;
-    DWORD dwFrameSize;
-    DWORD dwfNetProtocols;
-    DWORD dwFramingProtocol;
-    CHAR szScript[MAX_PATH];
-    CHAR szAutodialDll[MAX_PATH];
-    CHAR szAutodialFunc[MAX_PATH];
-    CHAR szDeviceType[RAS_MaxDeviceType + 1];
-    CHAR szDeviceName[RAS_MaxDeviceName + 1];
-    CHAR szX25PadType[RAS_MaxPadType + 1];
-    CHAR szX25Address[RAS_MaxX25Address + 1];
-    CHAR szX25Facilities[RAS_MaxFacilities + 1];
-    CHAR szX25UserData[RAS_MaxUserData + 1];
-    DWORD dwChannels;
-    DWORD dwReserved1;
-    DWORD dwReserved2;
-#if (WINVER >= 0x401)
-    DWORD dwSubEntries;
-    DWORD dwDialMode;
-    DWORD dwDialExtraPercent;
-    DWORD dwDialExtraSampleSeconds;
-    DWORD dwHangUpExtraPercent;
-    DWORD dwHangUpExtraSampleSeconds;
-    DWORD dwIdleDisconnectSeconds;
-#endif
-#if (WINVER >= 0x500)
-    DWORD dwType;
-    DWORD dwEncryptionType;
-    DWORD dwCustomAuthKey;
-    GUID guidId;
-    CHAR szCustomDialDll[MAX_PATH];
-    DWORD dwVpnStrategy;
-#endif
-} RASENTRYA, *LPRASENTRYA;
-
-
-#if (WINVER >= 0x401)
-typedef struct tagRASADPARAMS {
-    DWORD dwSize;
-    HWND hwndOwner;
-    DWORD dwFlags;
-    LONG xDlg;
-    LONG yDlg;
-} RASADPARAMS, *LPRASADPARAMS;
-
-typedef struct tagRASSUBENTRYW {
-    DWORD dwSize;
-    DWORD dwfFlags;
-    WCHAR szDeviceType[RAS_MaxDeviceType + 1];
-    WCHAR szDeviceName[RAS_MaxDeviceName + 1];
-    WCHAR szLocalPhoneNumber[RAS_MaxPhoneNumber + 1];
-    DWORD dwAlternateOffset;
-} RASSUBENTRYW, *LPRASSUBENTRYW;
-
-typedef struct tagRASSUBENTRYA {
-    DWORD dwSize;
-    DWORD dwfFlags;
-    CHAR szDeviceType[RAS_MaxDeviceType + 1];
-    CHAR szDeviceName[RAS_MaxDeviceName + 1];
-    CHAR szLocalPhoneNumber[RAS_MaxPhoneNumber + 1];
-    DWORD dwAlternateOffset;
-} RASSUBENTRYA, *LPRASSUBENTRYA;
-
-typedef struct tagRASCREDENTIALSW {
-    DWORD dwSize;
-    DWORD dwMask;
-    WCHAR szUserName[UNLEN + 1];
-    WCHAR szPassword[PWLEN + 1];
-    WCHAR szDomain[DNLEN + 1];
-} RASCREDENTIALSW, *LPRASCREDENTIALSW;
-
-typedef struct tagRASCREDENTIALSA {
-    DWORD dwSize;
-    DWORD dwMask;
-    CHAR szUserName[UNLEN + 1];
-    CHAR szPassword[PWLEN + 1];
-    CHAR szDomain[DNLEN + 1];
-} RASCREDENTIALSA, *LPRASCREDENTIALSA;
-
-typedef struct tagRASAUTODIALENTRYW {
-    DWORD dwSize;
-    DWORD dwFlags;
-    DWORD dwDialingLocation;
-    WCHAR szEntry[RAS_MaxEntryName + 1];
-} RASAUTODIALENTRYW, *LPRASAUTODIALENTRYW;
-
-typedef struct tagRASAUTODIALENTRYA {
-    DWORD dwSize;
-    DWORD dwFlags;
-    DWORD dwDialingLocation;
-    CHAR szEntry[RAS_MaxEntryName + 1];
-} RASAUTODIALENTRYA, *LPRASAUTODIALENTRYA;
-#endif /* (WINVER >= 0x401) */
-
-#if (WINVER >= 0x500)
-typedef struct tagRASPPPCCP {
-    DWORD dwSize;
-    DWORD dwError;
-    DWORD dwCompressionAlgorithm;
-    DWORD dwOptions;
-    DWORD dwServerCompressionAlgorithm;
-    DWORD dwServerOptions;
-} RASPPPCCP, *LPRASPPPCCP;
-
-typedef struct tagRASEAPUSERIDENTITYW {
-    WCHAR szUserName[UNLEN + 1];
-    DWORD dwSizeofEapInfo;
-    BYTE pbEapInfo[1];
-} RASEAPUSERIDENTITYW, *LPRASEAPUSERIDENTITYW;
-
-typedef struct tagRASEAPUSERIDENTITYA {
-    CHAR szUserName[UNLEN + 1];
-    DWORD dwSizeofEapInfo;
-    BYTE pbEapInfo[1];
-} RASEAPUSERIDENTITYA, *LPRASEAPUSERIDENTITYA;
-
-typedef struct tagRAS_STATS {
-    DWORD dwSize;
-    DWORD dwBytesXmited;
-    DWORD dwBytesRcved;
-    DWORD dwFramesXmited;
-    DWORD dwFramesRcved;
-    DWORD dwCrcErr;
-    DWORD dwTimeoutErr;
-    DWORD dwAlignmentErr;
-    DWORD dwHardwareOverrunErr;
-    DWORD dwFramingErr;
-    DWORD dwBufferOverrunErr;
-    DWORD dwCompressionRatioIn;
-    DWORD dwCompressionRatioOut;
-    DWORD dwBps;
-    DWORD dwConnectDuration;
-} RAS_STATS, *PRAS_STATS;
-#endif /* (WINVER >= 0x500) */
-
-
-/* UNICODE typedefs for structures*/
-#ifdef UNICODE
-typedef RASCONNW RASCONN, *LPRASCONN;
-typedef RASENTRYW  RASENTRY, *LPRASENTRY;
-typedef RASCONNSTATUSW RASCONNSTATUS, *LPRASCONNSTATUS;
-typedef RASDIALPARAMSW RASDIALPARAMS, *LPRASDIALPARAMS;
-typedef RASAMBW RASAMB, *LPRASAM;
-typedef RASPPPNBFW RASPPPNBF, *LPRASPPPNBF;
-typedef RASPPPIPXW RASPPPIPX, *LPRASPPPIPX;
-typedef RASPPPIPW RASPPPIP, *LPRASPPPIP; 
-typedef RASPPPLCPW RASPPPLCP, *LPRASPPPLCP;
-typedef RASSLIPW RASSLIP, *LPRASSLIP;
-typedef RASDEVINFOW  RASDEVINFO, *LPRASDEVINFO;
-typedef RASENTRYNAMEW RASENTRYNAME, *LPRASENTRYNAME;
-
-#if (WINVER >= 0x401)
-typedef RASSUBENTRYW RASSUBENTRY, *LPRASSUBENTRY;
-typedef RASCREDENTIALSW RASCREDENTIALS, *LPRASCREDENTIALS;
-typedef RASAUTODIALENTRYW RASAUTODIALENTRY, *LPRASAUTODIALENTRY;
-#endif /* (WINVER >= 0x401) */
-
-#if (WINVER >= 0x500)
-typedef RASEAPUSERIDENTITYW RASEAPUSERIDENTITY, *LPRASEAPUSERIDENTITY;
-#endif /* (WINVER >= 0x500) */
-
-#else  /* ! defined UNICODE */
-typedef RASCONNA RASCONN, *LPRASCONN;
-typedef RASENTRYA  RASENTRY, *LPRASENTRY;
-typedef RASCONNSTATUSA RASCONNSTATUS, *LPRASCONNSTATUS;
-typedef RASDIALPARAMSA RASDIALPARAMS, *LPRASDIALPARAMS;
-typedef RASAMBA RASAMB, *LPRASAM;
-typedef RASPPPNBFA RASPPPNBF, *LPRASPPPNBF;
-typedef RASPPPIPXA RASPPPIPX, *LPRASPPPIPX;
-typedef RASPPPIPA RASPPPIP, *LPRASPPPIP;
-typedef RASPPPLCPA RASPPPLCP, *LPRASPPPLCP;
-typedef RASSLIPA RASSLIP, *LPRASSLIP;
-typedef RASDEVINFOA  RASDEVINFO, *LPRASDEVINFO;
-typedef RASENTRYNAMEA RASENTRYNAME, *LPRASENTRYNAME;
-
-#if (WINVER >= 0x401)
-typedef RASSUBENTRYA RASSUBENTRY, *LPRASSUBENTRY;
-typedef RASCREDENTIALSA RASCREDENTIALS, *LPRASCREDENTIALS;
-typedef RASAUTODIALENTRYA RASAUTODIALENTRY, *LPRASAUTODIALENTRY;
-#endif /*(WINVER >= 0x401)*/
-#if (WINVER >= 0x500)
-typedef RASEAPUSERIDENTITYA RASEAPUSERIDENTITY, *LPRASEAPUSERIDENTITY;
-#endif /* (WINVER >= 0x500) */
-#endif /* ! UNICODE */
-
-/* Callback prototypes */
-typedef BOOL (WINAPI * ORASADFUNC) (HWND, LPSTR, DWORD, LPDWORD); /* deprecated */
-typedef VOID (WINAPI * RASDIALFUNC) (UINT, RASCONNSTATE, DWORD);
-typedef VOID (WINAPI * RASDIALFUNC1) (HRASCONN, UINT, RASCONNSTATE, DWORD,
-					DWORD);
-typedef DWORD (WINAPI * RASDIALFUNC2) (ULONG_PTR, DWORD, HRASCONN, UINT,
-					RASCONNSTATE, DWORD, DWORD);
-
-/* External functions */
-DWORD APIENTRY RasDialA (LPRASDIALEXTENSIONS, LPCSTR, LPRASDIALPARAMSA,
-	    		DWORD, LPVOID, LPHRASCONN);
-DWORD APIENTRY RasDialW (LPRASDIALEXTENSIONS, LPCWSTR, LPRASDIALPARAMSW,
-    	        DWORD, LPVOID, LPHRASCONN);
-DWORD APIENTRY RasEnumConnectionsA (LPRASCONNA, LPDWORD, LPDWORD);
-DWORD APIENTRY RasEnumConnectionsW (LPRASCONNW, LPDWORD, LPDWORD);
-DWORD APIENTRY RasEnumEntriesA (LPCSTR, LPCSTR, LPRASENTRYNAMEA, LPDWORD,
-				LPDWORD);
-DWORD APIENTRY RasEnumEntriesW (LPCWSTR, LPCWSTR, LPRASENTRYNAMEW, LPDWORD,
-				LPDWORD);
-DWORD APIENTRY RasGetConnectStatusA (HRASCONN, LPRASCONNSTATUSA);
-DWORD APIENTRY RasGetConnectStatusW (HRASCONN, LPRASCONNSTATUSW);
-DWORD APIENTRY RasGetErrorStringA (UINT, LPSTR, DWORD);
-DWORD APIENTRY RasGetErrorStringW (UINT, LPWSTR, DWORD);
-DWORD APIENTRY RasHangUpA (HRASCONN);
-DWORD APIENTRY RasHangUpW (HRASCONN);
-DWORD APIENTRY RasGetProjectionInfoA (HRASCONN, RASPROJECTION, LPVOID,
- 				LPDWORD);
-DWORD APIENTRY RasGetProjectionInfoW (HRASCONN, RASPROJECTION, LPVOID,
-				LPDWORD);
-DWORD APIENTRY RasCreatePhonebookEntryA (HWND, LPCSTR);
-DWORD APIENTRY RasCreatePhonebookEntryW (HWND, LPCWSTR);
-DWORD APIENTRY RasEditPhonebookEntryA (HWND, LPCSTR, LPCSTR);
-DWORD APIENTRY RasEditPhonebookEntryW (HWND, LPCWSTR, LPCWSTR);
-DWORD APIENTRY RasSetEntryDialParamsA (LPCSTR, LPRASDIALPARAMSA, BOOL);
-DWORD APIENTRY RasSetEntryDialParamsW (LPCWSTR, LPRASDIALPARAMSW, BOOL);
-DWORD APIENTRY RasGetEntryDialParamsA (LPCSTR, LPRASDIALPARAMSA, LPBOOL);
-DWORD APIENTRY RasGetEntryDialParamsW (LPCWSTR, LPRASDIALPARAMSW, LPBOOL);
-DWORD APIENTRY RasEnumDevicesA (LPRASDEVINFOA, LPDWORD, LPDWORD);
-DWORD APIENTRY RasEnumDevicesW (LPRASDEVINFOW, LPDWORD, LPDWORD);
-DWORD APIENTRY RasGetCountryInfoA (LPRASCTRYINFOA, LPDWORD);
-DWORD APIENTRY RasGetCountryInfoW (LPRASCTRYINFOW, LPDWORD);
-DWORD APIENTRY RasGetEntryPropertiesA (LPCSTR, LPCSTR, LPRASENTRYA, LPDWORD,
-				 LPBYTE, LPDWORD);
-DWORD APIENTRY RasGetEntryPropertiesW (LPCWSTR, LPCWSTR, LPRASENTRYW,
-				 LPDWORD, LPBYTE, LPDWORD);
-DWORD APIENTRY RasSetEntryPropertiesA (LPCSTR, LPCSTR, LPRASENTRYA, DWORD,
-				 LPBYTE, DWORD);
-DWORD APIENTRY RasSetEntryPropertiesW (LPCWSTR, LPCWSTR, LPRASENTRYW, DWORD,
-				 LPBYTE, DWORD);
-DWORD APIENTRY RasRenameEntryA (LPCSTR, LPCSTR, LPCSTR);
-DWORD APIENTRY RasRenameEntryW (LPCWSTR, LPCWSTR, LPCWSTR);
-DWORD APIENTRY RasDeleteEntryA (LPCSTR, LPCSTR);
-DWORD APIENTRY RasDeleteEntryW (LPCWSTR, LPCWSTR);
-DWORD APIENTRY RasValidateEntryNameA (LPCSTR, LPCSTR);
-DWORD APIENTRY RasValidateEntryNameW (LPCWSTR, LPCWSTR);
-
-#if (WINVER >= 0x401)
-typedef BOOL (WINAPI * RASADFUNCA) (LPSTR, LPSTR, LPRASADPARAMS, LPDWORD);
-typedef BOOL (WINAPI * RASADFUNCW) (LPWSTR, LPWSTR, LPRASADPARAMS, LPDWORD);
-
-DWORD APIENTRY RasGetSubEntryHandleA (HRASCONN, DWORD, LPHRASCONN);
-DWORD APIENTRY RasGetSubEntryHandleW (HRASCONN, DWORD, LPHRASCONN);
-DWORD APIENTRY RasGetCredentialsA (LPCSTR, LPCSTR, LPRASCREDENTIALSA);
-DWORD APIENTRY RasGetCredentialsW (LPCWSTR, LPCWSTR, LPRASCREDENTIALSW);
-DWORD APIENTRY RasSetCredentialsA (LPCSTR, LPCSTR, LPRASCREDENTIALSA, BOOL);
-DWORD APIENTRY RasSetCredentialsW (LPCWSTR, LPCWSTR, LPRASCREDENTIALSW, BOOL);
-DWORD APIENTRY RasConnectionNotificationA (HRASCONN, HANDLE, DWORD);
-DWORD APIENTRY RasConnectionNotificationW (HRASCONN, HANDLE, DWORD);
-DWORD APIENTRY RasGetSubEntryPropertiesA (LPCSTR, LPCSTR, DWORD,
-					LPRASSUBENTRYA, LPDWORD, LPBYTE, LPDWORD);
-DWORD APIENTRY RasGetSubEntryPropertiesW (LPCWSTR, LPCWSTR, DWORD,
-					LPRASSUBENTRYW, LPDWORD, LPBYTE, LPDWORD);
-DWORD APIENTRY RasSetSubEntryPropertiesA (LPCSTR, LPCSTR, DWORD,
-					LPRASSUBENTRYA, DWORD, LPBYTE, DWORD);
-DWORD APIENTRY RasSetSubEntryPropertiesW (LPCWSTR, LPCWSTR, DWORD,
-					LPRASSUBENTRYW, DWORD, LPBYTE, DWORD);
-DWORD APIENTRY RasGetAutodialAddressA (LPCSTR, LPDWORD, LPRASAUTODIALENTRYA,
-			        LPDWORD, LPDWORD);
-DWORD APIENTRY RasGetAutodialAddressW (LPCWSTR, LPDWORD,
-					LPRASAUTODIALENTRYW, LPDWORD, LPDWORD);
-DWORD APIENTRY RasSetAutodialAddressA (LPCSTR, DWORD, LPRASAUTODIALENTRYA,
-					DWORD, DWORD);
-DWORD APIENTRY RasSetAutodialAddressW (LPCWSTR, DWORD, LPRASAUTODIALENTRYW,
-					DWORD, DWORD);
-DWORD APIENTRY RasEnumAutodialAddressesA (LPSTR *, LPDWORD, LPDWORD);
-DWORD APIENTRY RasEnumAutodialAddressesW (LPWSTR *, LPDWORD, LPDWORD);
-DWORD APIENTRY RasGetAutodialEnableA (DWORD, LPBOOL);
-DWORD APIENTRY RasGetAutodialEnableW (DWORD, LPBOOL);
-DWORD APIENTRY RasSetAutodialEnableA (DWORD, BOOL);
-DWORD APIENTRY RasSetAutodialEnableW (DWORD, BOOL);
-DWORD APIENTRY RasGetAutodialParamA (DWORD, LPVOID, LPDWORD);
-DWORD APIENTRY RasGetAutodialParamW (DWORD, LPVOID, LPDWORD);
-DWORD APIENTRY RasSetAutodialParamA (DWORD, LPVOID, DWORD);
-DWORD APIENTRY RasSetAutodialParamW (DWORD, LPVOID, DWORD);
-#endif
-
-#if (WINVER >= 0x500)
-typedef DWORD (WINAPI * RasCustomHangUpFn) (HRASCONN);
-typedef DWORD (WINAPI * RasCustomDeleteEntryNotifyFn) (LPCTSTR,	LPCTSTR, DWORD);
-typedef DWORD (WINAPI * RasCustomDialFn) (HINSTANCE, LPRASDIALEXTENSIONS,
-				LPCTSTR, LPRASDIALPARAMS, DWORD, LPVOID, LPHRASCONN, DWORD);
-
-DWORD APIENTRY RasInvokeEapUI (HRASCONN, DWORD, LPRASDIALEXTENSIONS, HWND);
-DWORD APIENTRY RasGetLinkStatistics (HRASCONN, DWORD, RAS_STATS*);
-DWORD APIENTRY RasGetConnectionStatistics (HRASCONN, RAS_STATS*);
-DWORD APIENTRY RasClearLinkStatistics (HRASCONN, DWORD);
-DWORD APIENTRY RasClearConnectionStatistics (HRASCONN);
-DWORD APIENTRY RasGetEapUserDataA (HANDLE, LPCSTR, LPCSTR, BYTE*, DWORD*);
-DWORD APIENTRY RasGetEapUserDataW (HANDLE, LPCWSTR, LPCWSTR, BYTE*, DWORD*);
-DWORD APIENTRY RasSetEapUserDataA (HANDLE, LPCSTR, LPCSTR, BYTE*, DWORD);
-DWORD APIENTRY RasSetEapUserDataW (HANDLE, LPCWSTR, LPCWSTR, BYTE*, DWORD);
-DWORD APIENTRY RasGetCustomAuthDataA (LPCSTR,	LPCSTR,	BYTE*,	DWORD*);
-DWORD APIENTRY RasGetCustomAuthDataW (LPCWSTR, LPCWSTR, BYTE*, DWORD*);
-DWORD APIENTRY RasSetCustomAuthDataA (LPCSTR,	LPCSTR,	BYTE*,	DWORD);
-DWORD APIENTRY RasSetCustomAuthDataW (LPCWSTR, LPCWSTR, BYTE*, DWORD);
-DWORD APIENTRY RasGetEapUserIdentityW (LPCWSTR, LPCWSTR, DWORD, HWND, LPRASEAPUSERIDENTITYW*);
-DWORD APIENTRY RasGetEapUserIdentityA (LPCSTR, LPCSTR, DWORD, HWND, LPRASEAPUSERIDENTITYA*);
-VOID APIENTRY RasFreeEapUserIdentityW (LPRASEAPUSERIDENTITYW);
-VOID APIENTRY RasFreeEapUserIdentityA (LPRASEAPUSERIDENTITYA);
-#endif  /* (WINVER >= 0x500) */
-
-
-/* UNICODE defines for functions */
-#ifdef UNICODE
-#define RasDial RasDialW
-#define RasEnumConnections RasEnumConnectionsW
-#define RasEnumEntries RasEnumEntriesW
-#define RasGetConnectStatus RasGetConnectStatusW
-#define RasGetErrorString RasGetErrorStringW
-#define RasHangUp RasHangUpW
-#define RasGetProjectionInfo RasGetProjectionInfoW
-#define RasCreatePhonebookEntry RasCreatePhonebookEntryW
-#define RasEditPhonebookEntry RasEditPhonebookEntryW
-#define RasSetEntryDialParams RasSetEntryDialParamsW
-#define RasGetEntryDialParams RasGetEntryDialParamsW
-#define RasEnumDevices RasEnumDevicesW
-#define RasGetCountryInfo RasGetCountryInfoW
-#define RasGetEntryProperties RasGetEntryPropertiesW
-#define RasSetEntryProperties RasSetEntryPropertiesW
-#define RasRenameEntry RasRenameEntryW
-#define RasDeleteEntry RasDeleteEntryW
-#define RasValidateEntryName RasValidateEntryNameW
-#if (WINVER >= 0x401)
-#define RASADFUNC RASADFUNCW
-#define RasGetSubEntryHandle RasGetSubEntryHandleW
-#define RasConnectionNotification RasConnectionNotificationW
-#define RasGetSubEntryProperties RasGetSubEntryPropertiesW
-#define RasSetSubEntryProperties RasSetSubEntryPropertiesW
-#define RasGetCredentials RasGetCredentialsW
-#define RasSetCredentials RasSetCredentialsW
-#define RasGetAutodialAddress RasGetAutodialAddressW
-#define RasSetAutodialAddress RasSetAutodialAddressW
-#define RasEnumAutodialAddresses RasEnumAutodialAddressesW
-#define RasGetAutodialEnable RasGetAutodialEnableW
-#define RasSetAutodialEnable RasSetAutodialEnableW
-#define RasGetAutodialParam RasGetAutodialParamW
-#define RasSetAutodialParam RasSetAutodialParamW
-#endif /* (WINVER >= 0x401) */
-#if (WINVER >= 0x500)
-#define RasGetEapUserData RasGetEapUserDataW
-#define RasSetEapUserData RasSetEapUserDataW
-#define RasGetCustomAuthData RasGetCustomAuthDataW
-#define RasSetCustomAuthData RasSetCustomAuthDataW
-#define RasGetEapUserIdentity RasGetEapUserIdentityW
-#define RasFreeEapUserIdentity RasFreeEapUserIdentityW
-#endif /* (WINVER >= 0x500) */
-
-#else  /* ! defined UNICODE */
-#define RasDial RasDialA
-#define RasEnumConnections RasEnumConnectionsA
-#define RasEnumEntries RasEnumEntriesA
-#define RasGetConnectStatus RasGetConnectStatusA
-#define RasGetErrorString RasGetErrorStringA
-#define RasHangUp RasHangUpA
-#define RasGetProjectionInfo RasGetProjectionInfoA
-#define RasCreatePhonebookEntry RasCreatePhonebookEntryA
-#define RasEditPhonebookEntry RasEditPhonebookEntryA
-#define RasSetEntryDialParams RasSetEntryDialParamsA
-#define RasGetEntryDialParams RasGetEntryDialParamsA
-#define RasEnumDevices RasEnumDevicesA
-#define RasGetCountryInfo RasGetCountryInfoA
-#define RasGetEntryProperties RasGetEntryPropertiesA
-#define RasSetEntryProperties RasSetEntryPropertiesA
-#define RasRenameEntry RasRenameEntryA
-#define RasDeleteEntry RasDeleteEntryA
-#define RasValidateEntryName RasValidateEntryNameA
-
-#if (WINVER >= 0x401)
-#define RASADFUNC RASADFUNCA
-#define RasGetSubEntryHandle RasGetSubEntryHandleA
-#define RasConnectionNotification RasConnectionNotificationA
-#define RasGetSubEntryProperties RasGetSubEntryPropertiesA
-#define RasSetSubEntryProperties RasSetSubEntryPropertiesA
-#define RasGetCredentials RasGetCredentialsA
-#define RasSetCredentials RasSetCredentialsA
-#define RasGetAutodialAddress RasGetAutodialAddressA
-#define RasSetAutodialAddress RasSetAutodialAddressA
-#define RasEnumAutodialAddressesRasEnumAutodialAddressesA
-#define RasGetAutodialEnable RasGetAutodialEnableA
-#define RasSetAutodialEnable RasSetAutodialEnableA
-#define RasGetAutodialParam RasGetAutodialParamA
-#define RasSetAutodialParam RasSetAutodialParamA
-#endif /*(WINVER >= 0x401)*/
-
-#if (WINVER >= 0x500)
-#define RasGetEapUserData RasGetEapUserDataA
-#define RasSetEapUserData RasSetEapUserDataA
-#define RasGetCustomAuthData RasGetCustomAuthDataA
-#define RasSetCustomAuthData RasSetCustomAuthDataA
-#define RasGetEapUserIdentity RasGetEapUserIdentityA
-#define RasFreeEapUserIdentity RasFreeEapUserIdentityA
-#endif /* (WINVER >= 0x500) */
-#endif /* ! UNICODE */
-
-#ifdef __cplusplus
-}
-#endif
-#include <poppack.h>
-#endif /* _RAS_H */ 
diff --git a/winsup/w32api/include/rasdlg.h b/winsup/w32api/include/rasdlg.h
deleted file mode 100644
index b0f4c1417..000000000
--- a/winsup/w32api/include/rasdlg.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef _RASDLG_H_
-#define _RASDLG_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ras.h>
-
-#define RASPBDEVENT_AddEntry	1
-#define RASPBDEVENT_EditEntry	2
-#define RASPBDEVENT_RemoveEntry	3
-#define RASPBDEVENT_DialEntry	4
-#define RASPBDEVENT_EditGlobals	5
-#define RASPBDEVENT_NoUser	6
-#define RASPBDEVENT_NoUserEdit	7
- 
-#define RASPBDFLAG_PositionDlg	1
-#define RASPBDFLAG_ForceCloseOnDial	2
-#define RASPBDFLAG_NoUser	16
-
-#define RASEDFLAG_PositionDlg	1
-#define RASEDFLAG_NewEntry	2
-#define RASEDFLAG_CloneEntry	4
-
-#define RASDDFLAG_PositionDlg	1
-
-#ifndef RC_INVOKED
-#include <pshpack4.h>
-
-typedef struct tagRASENTRYDLGA
-{
-	DWORD dwSize;
-	HWND  hwndOwner;
-	DWORD dwFlags;
-	LONG  xDlg;
-	LONG  yDlg;
-	CHAR  szEntry[RAS_MaxEntryName + 1];
-	DWORD dwError;
-	ULONG_PTR reserved;
-	ULONG_PTR reserved2;
-} RASENTRYDLGA, *LPRASENTRYDLGA;
-typedef struct tagRASENTRYDLGW
-{
-	DWORD dwSize;
-	HWND  hwndOwner;
-	DWORD dwFlags;
-	LONG  xDlg;
-	LONG  yDlg;
-	WCHAR szEntry[RAS_MaxEntryName + 1];
-	DWORD dwError;
-	ULONG_PTR reserved;
-	ULONG_PTR reserved2;
-} RASENTRYDLGW, *LPRASENTRYDLGW;
-
-typedef struct tagRASDIALDLG
-{
-	DWORD dwSize;
-	HWND  hwndOwner;
-	DWORD dwFlags;
-	LONG  xDlg;
-	LONG  yDlg;
-	DWORD dwSubEntry;
-	DWORD dwError;
-	ULONG_PTR reserved;
-	ULONG_PTR reserved2;
-} RASDIALDLG, *LPRASDIALDLG;
-
-/* Application-defined callback functions */
-typedef VOID (WINAPI* RASPBDLGFUNCW)(DWORD, DWORD, LPWSTR, LPVOID);
-typedef VOID (WINAPI* RASPBDLGFUNCA)(DWORD, DWORD, LPSTR, LPVOID);
-
-typedef struct tagRASPBDLGA
-{
-	DWORD         dwSize;
-	HWND          hwndOwner;
-	DWORD         dwFlags;
-	LONG          xDlg;
-	LONG          yDlg;
-	ULONG_PTR     dwCallbackId;
-	RASPBDLGFUNCA pCallback;
-	DWORD         dwError;
-	ULONG_PTR     reserved;
-	ULONG_PTR     reserved2;
-} RASPBDLGA, *LPRASPBDLGA;
-typedef struct tagRASPBDLGW
-{
-	DWORD         dwSize;
-	HWND          hwndOwner;
-	DWORD         dwFlags;
-	LONG          xDlg;
-	LONG          yDlg;
-	ULONG_PTR     dwCallbackId;
-	RASPBDLGFUNCW pCallback;
-	DWORD         dwError;
-	ULONG_PTR     reserved;
-	ULONG_PTR     reserved2;
-} RASPBDLGW, *LPRASPBDLGW;
-
-typedef struct tagRASNOUSERA
-{
-	DWORD dwSize;
-	DWORD dwFlags;
-	DWORD dwTimeoutMs;
-	CHAR  szUserName[UNLEN + 1];
-	CHAR  szPassword[PWLEN + 1];
-	CHAR  szDomain[DNLEN + 1];
-} RASNOUSERA, *LPRASNOUSERA;
-typedef struct tagRASNOUSERW
-{
-	DWORD dwSize;
-	DWORD dwFlags;
-	DWORD dwTimeoutMs;
-	WCHAR szUserName[UNLEN + 1];
-	WCHAR szPassword[PWLEN + 1];
-	WCHAR szDomain[DNLEN + 1];
-} RASNOUSERW, *LPRASNOUSERW ;
-
-#include <poppack.h>
-
-BOOL APIENTRY RasDialDlgA(LPSTR,LPSTR,LPSTR,LPRASDIALDLG);
-BOOL APIENTRY RasDialDlgW(LPWSTR,LPWSTR,LPWSTR,LPRASDIALDLG);
-BOOL APIENTRY RasEntryDlgA(LPSTR,LPSTR,LPRASENTRYDLGA);
-BOOL APIENTRY RasEntryDlgW(LPWSTR,LPWSTR,LPRASENTRYDLGW);
-BOOL APIENTRY RasPhonebookDlgA(LPSTR,LPSTR,LPRASPBDLGA);
-BOOL APIENTRY RasPhonebookDlgW(LPWSTR,LPWSTR,LPRASPBDLGW);
-
-#ifdef UNICODE
-typedef RASENTRYDLGW	RASENTRYDLG, *LPRASENTRYDLG;
-typedef RASPBDLGW	RASPBDLG, *LPRASPBDLG;
-typedef RASNOUSERW	RASNOUSER, *LPRASNOUSER;
-#define RasDialDlg	RasDialDlgW
-#define RasEntryDlg	RasEntryDlgW
-#define RasPhonebookDlg	RasPhonebookDlgW
-#else
-typedef RASENTRYDLGA	RASENTRYDLG, *LPRASENTRYDLG;
-typedef RASPBDLGA	RASPBDLG, *LPRASPBDLG;
-typedef RASNOUSERA	RASNOUSER, *LPRASNOUSER;
-#define RasDialDlg	RasDialDlgA
-#define RasEntryDlg	RasEntryDlgA
-#define RasPhonebookDlg	RasPhonebookDlgA
-#endif /* UNICODE */
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/raserror.h b/winsup/w32api/include/raserror.h
deleted file mode 100644
index 97498b059..000000000
--- a/winsup/w32api/include/raserror.h
+++ /dev/null
@@ -1,210 +0,0 @@
-#ifndef _RASERROR_H
-#define _RASERROR_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define RASBASE 600
-#define SUCCESS 0
-#define PENDING                              (RASBASE+0)
-#define ERROR_INVALID_PORT_HANDLE            (RASBASE+1)
-#define ERROR_PORT_ALREADY_OPEN              (RASBASE+2)
-#define ERROR_BUFFER_TOO_SMALL               (RASBASE+3)
-#define ERROR_WRONG_INFO_SPECIFIED           (RASBASE+4)
-#define ERROR_CANNOT_SET_PORT_INFO           (RASBASE+5)
-#define ERROR_PORT_NOT_CONNECTED             (RASBASE+6)
-#define ERROR_EVENT_INVALID                  (RASBASE+7)
-#define ERROR_DEVICE_DOES_NOT_EXIST          (RASBASE+8)
-#define ERROR_DEVICETYPE_DOES_NOT_EXIST      (RASBASE+9)
-#define ERROR_BUFFER_INVALID                 (RASBASE+10)
-#define ERROR_ROUTE_NOT_AVAILABLE            (RASBASE+11)
-#define ERROR_ROUTE_NOT_ALLOCATED            (RASBASE+12)
-#define ERROR_INVALID_COMPRESSION_SPECIFIED  (RASBASE+13)
-#define ERROR_OUT_OF_BUFFERS                 (RASBASE+14)
-#define ERROR_PORT_NOT_FOUND                 (RASBASE+15)
-#define ERROR_ASYNC_REQUEST_PENDING          (RASBASE+16)
-#define ERROR_ALREADY_DISCONNECTING          (RASBASE+17)
-#define ERROR_PORT_NOT_OPEN                  (RASBASE+18)
-#define ERROR_PORT_DISCONNECTED              (RASBASE+19)
-#define ERROR_NO_ENDPOINTS                   (RASBASE+20)
-#define ERROR_CANNOT_OPEN_PHONEBOOK          (RASBASE+21)
-#define ERROR_CANNOT_LOAD_PHONEBOOK          (RASBASE+22)
-#define ERROR_CANNOT_FIND_PHONEBOOK_ENTRY    (RASBASE+23)
-#define ERROR_CANNOT_WRITE_PHONEBOOK         (RASBASE+24)
-#define ERROR_CORRUPT_PHONEBOOK              (RASBASE+25)
-#define ERROR_CANNOT_LOAD_STRING             (RASBASE+26)
-#define ERROR_KEY_NOT_FOUND                  (RASBASE+27)
-#define ERROR_DISCONNECTION                  (RASBASE+28)
-#define ERROR_REMOTE_DISCONNECTION           (RASBASE+29)
-#define ERROR_HARDWARE_FAILURE               (RASBASE+30)
-#define ERROR_USER_DISCONNECTION             (RASBASE+31)
-#define ERROR_INVALID_SIZE                   (RASBASE+32)
-#define ERROR_PORT_NOT_AVAILABLE             (RASBASE+33)
-#define ERROR_CANNOT_PROJECT_CLIENT          (RASBASE+34)
-#define ERROR_UNKNOWN                        (RASBASE+35)
-#define ERROR_WRONG_DEVICE_ATTACHED          (RASBASE+36)
-#define ERROR_BAD_STRING                     (RASBASE+37)
-#define ERROR_REQUEST_TIMEOUT                (RASBASE+38)
-#define ERROR_CANNOT_GET_LANA                (RASBASE+39)
-#define ERROR_NETBIOS_ERROR                  (RASBASE+40)
-#define ERROR_SERVER_OUT_OF_RESOURCES        (RASBASE+41)
-#define ERROR_NAME_EXISTS_ON_NET             (RASBASE+42)
-#define ERROR_SERVER_GENERAL_NET_FAILURE     (RASBASE+43)
-#define WARNING_MSG_ALIAS_NOT_ADDED          (RASBASE+44)
-#define ERROR_AUTH_INTERNAL                  (RASBASE+45)
-#define ERROR_RESTRICTED_LOGON_HOURS         (RASBASE+46)
-#define ERROR_ACCT_DISABLED                  (RASBASE+47)
-#define ERROR_PASSWD_EXPIRED                 (RASBASE+48)
-#define ERROR_NO_DIALIN_PERMISSION           (RASBASE+49)
-#define ERROR_SERVER_NOT_RESPONDING          (RASBASE+50)
-#define ERROR_FROM_DEVICE                    (RASBASE+51)
-#define ERROR_UNRECOGNIZED_RESPONSE          (RASBASE+52)
-#define ERROR_MACRO_NOT_FOUND                (RASBASE+53)
-#define ERROR_MACRO_NOT_DEFINED              (RASBASE+54)
-#define ERROR_MESSAGE_MACRO_NOT_FOUND        (RASBASE+55)
-#define ERROR_DEFAULTOFF_MACRO_NOT_FOUND     (RASBASE+56)
-#define ERROR_FILE_COULD_NOT_BE_OPENED       (RASBASE+57)
-#define ERROR_DEVICENAME_TOO_LONG            (RASBASE+58)
-#define ERROR_DEVICENAME_NOT_FOUND           (RASBASE+59)
-#define ERROR_NO_RESPONSES                   (RASBASE+60)
-#define ERROR_NO_COMMAND_FOUND               (RASBASE+61)
-#define ERROR_WRONG_KEY_SPECIFIED            (RASBASE+62)
-#define ERROR_UNKNOWN_DEVICE_TYPE            (RASBASE+63)
-#define ERROR_ALLOCATING_MEMORY              (RASBASE+64)
-#define ERROR_PORT_NOT_CONFIGURED            (RASBASE+65)
-#define ERROR_DEVICE_NOT_READY               (RASBASE+66)
-#define ERROR_READING_INI_FILE               (RASBASE+67)
-#define ERROR_NO_CONNECTION                  (RASBASE+68)
-#define ERROR_BAD_USAGE_IN_INI_FILE          (RASBASE+69)
-#define ERROR_READING_SECTIONNAME            (RASBASE+70)
-#define ERROR_READING_DEVICETYPE             (RASBASE+71)
-#define ERROR_READING_DEVICENAME             (RASBASE+72)
-#define ERROR_READING_USAGE                  (RASBASE+73)
-#define ERROR_READING_MAXCONNECTBPS          (RASBASE+74)
-#define ERROR_READING_MAXCARRIERBPS          (RASBASE+75)
-#define ERROR_LINE_BUSY                      (RASBASE+76)
-#define ERROR_VOICE_ANSWER                   (RASBASE+77)
-#define ERROR_NO_ANSWER                      (RASBASE+78)
-#define ERROR_NO_CARRIER                     (RASBASE+79)
-#define ERROR_NO_DIALTONE                    (RASBASE+80)
-#define ERROR_IN_COMMAND                     (RASBASE+81)
-#define ERROR_WRITING_SECTIONNAME            (RASBASE+82)
-#define ERROR_WRITING_DEVICETYPE             (RASBASE+83)
-#define ERROR_WRITING_DEVICENAME             (RASBASE+84)
-#define ERROR_WRITING_MAXCONNECTBPS          (RASBASE+85)
-#define ERROR_WRITING_MAXCARRIERBPS          (RASBASE+86)
-#define ERROR_WRITING_USAGE                  (RASBASE+87)
-#define ERROR_WRITING_DEFAULTOFF             (RASBASE+88)
-#define ERROR_READING_DEFAULTOFF             (RASBASE+89)
-#define ERROR_EMPTY_INI_FILE                 (RASBASE+90)
-#define ERROR_AUTHENTICATION_FAILURE         (RASBASE+91)
-#define ERROR_PORT_OR_DEVICE                 (RASBASE+92)
-#define ERROR_NOT_BINARY_MACRO               (RASBASE+93)
-#define ERROR_DCB_NOT_FOUND                  (RASBASE+94)
-#define ERROR_STATE_MACHINES_NOT_STARTED     (RASBASE+95)
-#define ERROR_STATE_MACHINES_ALREADY_STARTED (RASBASE+96)
-#define ERROR_PARTIAL_RESPONSE_LOOPING       (RASBASE+97)
-#define ERROR_UNKNOWN_RESPONSE_KEY           (RASBASE+98)
-#define ERROR_RECV_BUF_FULL                  (RASBASE+99)
-#define ERROR_CMD_TOO_LONG                   (RASBASE+100)
-#define ERROR_UNSUPPORTED_BPS                (RASBASE+101)
-#define ERROR_UNEXPECTED_RESPONSE            (RASBASE+102)
-#define ERROR_INTERACTIVE_MODE               (RASBASE+103)
-#define ERROR_BAD_CALLBACK_NUMBER            (RASBASE+104)
-#define ERROR_INVALID_AUTH_STATE             (RASBASE+105)
-#define ERROR_WRITING_INITBPS                (RASBASE+106)
-#define ERROR_X25_DIAGNOSTIC                 (RASBASE+107)
-#define ERROR_ACCT_EXPIRED                   (RASBASE+108)
-#define ERROR_CHANGING_PASSWORD              (RASBASE+109)
-#define ERROR_OVERRUN                        (RASBASE+110)
-#define ERROR_RASMAN_CANNOT_INITIALIZE	     (RASBASE+111)
-#define ERROR_BIPLEX_PORT_NOT_AVAILABLE      (RASBASE+112)
-#define ERROR_NO_ACTIVE_ISDN_LINES           (RASBASE+113)
-#define ERROR_NO_ISDN_CHANNELS_AVAILABLE     (RASBASE+114)
-#define ERROR_TOO_MANY_LINE_ERRORS           (RASBASE+115)
-#define ERROR_IP_CONFIGURATION               (RASBASE+116)
-#define ERROR_NO_IP_ADDRESSES                (RASBASE+117)
-#define ERROR_PPP_TIMEOUT                    (RASBASE+118)
-#define ERROR_PPP_REMOTE_TERMINATED          (RASBASE+119)
-#define ERROR_PPP_NO_PROTOCOLS_CONFIGURED    (RASBASE+120)
-#define ERROR_PPP_NO_RESPONSE                (RASBASE+121)
-#define ERROR_PPP_INVALID_PACKET             (RASBASE+122)
-#define ERROR_PHONE_NUMBER_TOO_LONG          (RASBASE+123)
-#define ERROR_IPXCP_NO_DIALOUT_CONFIGURED    (RASBASE+124)
-#define ERROR_IPXCP_NO_DIALIN_CONFIGURED     (RASBASE+125)
-#define ERROR_IPXCP_DIALOUT_ALREADY_ACTIVE   (RASBASE+126)
-#define ERROR_ACCESSING_TCPCFGDLL            (RASBASE+127)
-#define ERROR_NO_IP_RAS_ADAPTER              (RASBASE+128)
-#define ERROR_SLIP_REQUIRES_IP               (RASBASE+129)
-#define ERROR_PROJECTION_NOT_COMPLETE        (RASBASE+130)
-#define ERROR_PROTOCOL_NOT_CONFIGURED        (RASBASE+131)
-#define ERROR_PPP_NOT_CONVERGING             (RASBASE+132)
-#define ERROR_PPP_CP_REJECTED                (RASBASE+133)
-#define ERROR_PPP_LCP_TERMINATED             (RASBASE+134)
-#define ERROR_PPP_REQUIRED_ADDRESS_REJECTED  (RASBASE+135)
-#define ERROR_PPP_NCP_TERMINATED             (RASBASE+136)
-#define ERROR_PPP_LOOPBACK_DETECTED          (RASBASE+137)
-#define ERROR_PPP_NO_ADDRESS_ASSIGNED        (RASBASE+138)
-#define ERROR_CANNOT_USE_LOGON_CREDENTIALS   (RASBASE+139)
-#define ERROR_TAPI_CONFIGURATION             (RASBASE+140)
-#define ERROR_NO_LOCAL_ENCRYPTION            (RASBASE+141)
-#define ERROR_NO_REMOTE_ENCRYPTION           (RASBASE+142)
-#define ERROR_REMOTE_REQUIRES_ENCRYPTION     (RASBASE+143)
-#define ERROR_IPXCP_NET_NUMBER_CONFLICT      (RASBASE+144)
-#define ERROR_INVALID_SMM                    (RASBASE+145)
-#define ERROR_SMM_UNINITIALIZED              (RASBASE+146)
-#define ERROR_NO_MAC_FOR_PORT                (RASBASE+147)
-#define ERROR_SMM_TIMEOUT                    (RASBASE+148)
-#define ERROR_BAD_PHONE_NUMBER               (RASBASE+149)
-#define ERROR_WRONG_MODULE                   (RASBASE+150)
-#define ERROR_INVALID_CALLBACK_NUMBER        (RASBASE+151)
-
-#define ERROR_SCRIPT_SYNTAX                  (RASBASE+152)
-#define ERROR_HANGUP_FAILED                  (RASBASE+153)
-#define ERROR_BUNDLE_NOT_FOUND               (RASBASE+154)
-#define ERROR_CANNOT_DO_CUSTOMDIAL           (RASBASE+155)
-#define ERROR_DIAL_ALREADY_IN_PROGRESS       (RASBASE+156)
-#define ERROR_RASAUTO_CANNOT_INITIALIZE	     (RASBASE+157)
-#define ERROR_CONNECTION_ALREADY_SHARED      (RASBASE+158)
-#define ERROR_SHARING_CHANGE_FAILED          (RASBASE+159)
-#define ERROR_SHARING_ROUTER_INSTALL         (RASBASE+160)
-#define ERROR_SHARE_CONNECTION_FAILED        (RASBASE+161)
-#define ERROR_SHARING_PRIVATE_INSTALL        (RASBASE+162)
-#define ERROR_CANNOT_SHARE_CONNECTION        (RASBASE+163)
-#define ERROR_NO_SMART_CARD_READER           (RASBASE+164)
-#define ERROR_SHARING_ADDRESS_EXISTS         (RASBASE+165)
-#define ERROR_NO_CERTIFICATE                 (RASBASE+166)
-#define ERROR_SHARING_MULTIPLE_ADDRESSES     (RASBASE+167)
-#define ERROR_FAILED_TO_ENCRYPT              (RASBASE+168)
-#define ERROR_BAD_ADDRESS_SPECIFIED          (RASBASE+169)
-#define ERROR_CONNECTION_REJECT              (RASBASE+170)
-#define ERROR_CONGESTION                     (RASBASE+171)
-#define ERROR_INCOMPATIBLE                   (RASBASE+172)
-#define ERROR_NUMBERCHANGED                  (RASBASE+173)
-#define ERROR_TEMPFAILURE                    (RASBASE+174)
-#define ERROR_BLOCKED                        (RASBASE+175)
-#define ERROR_DONOTDISTURB                   (RASBASE+176)
-#define ERROR_OUTOFORDER                     (RASBASE+177)
-#define ERROR_UNABLE_TO_AUTHENTICATE_SERVER  (RASBASE+178)
-#define ERROR_SMART_CARD_REQUIRED            (RASBASE+179)
-#define ERROR_INVALID_FUNCTION_FOR_ENTRY     (RASBASE+180)
-#define ERROR_CERT_FOR_ENCRYPTION_NOT_FOUND  (RASBASE+181)
-#define ERROR_SHARING_RRAS_CONFLICT          (RASBASE+182)
-#define ERROR_SHARING_NO_PRIVATE_LAN         (RASBASE+183)
-#define ERROR_NO_DIFF_USER_AT_LOGON          (RASBASE+184)
-#define ERROR_NO_REG_CERT_AT_LOGON           (RASBASE+185)
-#define ERROR_OAKLEY_NO_CERT                 (RASBASE+186)
-#define ERROR_OAKLEY_AUTH_FAIL               (RASBASE+187)
-#define ERROR_OAKLEY_ATTRIB_FAIL             (RASBASE+188)
-#define ERROR_OAKLEY_GENERAL_PROCESSING      (RASBASE+189)
-#define ERROR_OAKLEY_NO_PEER_CERT            (RASBASE+190)
-#define ERROR_OAKLEY_NO_POLICY               (RASBASE+191)
-#define ERROR_OAKLEY_TIMED_OUT               (RASBASE+192)
-#define ERROR_OAKLEY_ERROR                   (RASBASE+193)
-#define ERROR_UNKNOWN_FRAMED_PROTOCOL        (RASBASE+194)
-#define ERROR_WRONG_TUNNEL_TYPE              (RASBASE+195)
-#define ERROR_UNKNOWN_SERVICE_TYPE           (RASBASE+196)
-#define ERROR_CONNECTING_DEVICE_NOT_FOUND    (RASBASE+197)
-#define ERROR_NO_EAPTLS_CERTIFICATE          (RASBASE+198)
-#define RASBASEEND                           (RASBASE+198)
-#endif /* _RASERROR_H */
diff --git a/winsup/w32api/include/rassapi.h b/winsup/w32api/include/rassapi.h
deleted file mode 100644
index 9ba4afb41..000000000
--- a/winsup/w32api/include/rassapi.h
+++ /dev/null
@@ -1,182 +0,0 @@
-#ifndef _RASSAPI_H
-#define _RASSAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifndef UNLEN
-#include <lmcons.h>
-#endif
-#define RASSAPI_MAX_PHONENUMBER_SIZE    128
-#define RASSAPI_MAX_MEDIA_NAME	        16
-#define RASSAPI_MAX_PORT_NAME	        16
-#define RASSAPI_MAX_DEVICE_NAME         128
-#define RASSAPI_MAX_DEVICETYPE_NAME     16
-#define RASSAPI_MAX_PARAM_KEY_SIZE      32
-#define RASPRIV_NoCallback              0x01
-#define RASPRIV_AdminSetCallback        0x02
-#define RASPRIV_CallerSetCallback       0x04
-#define RASPRIV_DialinPrivilege         0x08
-#define RASPRIV_CallbackType (RASPRIV_AdminSetCallback \
-                             | RASPRIV_CallerSetCallback \
-                             | RASPRIV_NoCallback)
-#define	RAS_MODEM_OPERATIONAL	        1
-#define	RAS_MODEM_NOT_RESPONDING        2
-#define	RAS_MODEM_HARDWARE_FAILURE      3
-#define	RAS_MODEM_INCORRECT_RESPONSE    4
-#define	RAS_MODEM_UNKNOWN		5
-#define	RAS_PORT_NON_OPERATIONAL        1
-#define	RAS_PORT_DISCONNECTED         	2
-#define	RAS_PORT_CALLING_BACK         	3
-#define	RAS_PORT_LISTENING            	4
-#define	RAS_PORT_AUTHENTICATING         5
-#define	RAS_PORT_AUTHENTICATED	        6
-#define	RAS_PORT_INITIALIZING	        7
-#define MEDIA_UNKNOWN                   0
-#define MEDIA_SERIAL                    1
-#define MEDIA_RAS10_SERIAL              2
-#define MEDIA_X25                       3
-#define MEDIA_ISDN                      4
-#define USER_AUTHENTICATED              0x0001
-#define MESSENGER_PRESENT               0x0002
-#define PPP_CLIENT                      0x0004
-#define GATEWAY_ACTIVE                  0x0008
-#define REMOTE_LISTEN                   0x0010
-#define PORT_MULTILINKED                0x0020
-#define RAS_IPADDRESSLEN                15
-#define RAS_IPXADDRESSLEN               22
-#define RAS_ATADDRESSLEN                32
-#define RASDOWNLEVEL                    10
-#define RASADMIN_35                     35
-#define RASADMIN_CURRENT                40
-
-typedef ULONG IPADDR;
-typedef enum _RAS_PARAMS_FORMAT {
-    ParamNumber = 0,
-    ParamString = 1
-} RAS_PARAMS_FORMAT;
-typedef union RAS_PARAMS_VALUE {
-	DWORD	Number;
-	struct	{
-	    DWORD	Length;
-		PCHAR	Data;
-		} String;
-} RAS_PARAMS_VALUE;
-typedef struct RAS_PARAMETERS {
-    CHAR	            P_Key [RASSAPI_MAX_PARAM_KEY_SIZE];
-    RAS_PARAMS_FORMAT	P_Type;
-    BYTE	            P_Attributes;
-    RAS_PARAMS_VALUE	P_Value;
-} RAS_PARAMETERS;
-typedef struct _RAS_USER_0 {
-    BYTE    bfPrivilege;
-    WCHAR   szPhoneNumber[RASSAPI_MAX_PHONENUMBER_SIZE + 1];
-} RAS_USER_0, *PRAS_USER_0;
-typedef struct _RAS_PORT_0 {
-    WCHAR wszPortName[RASSAPI_MAX_PORT_NAME];
-    WCHAR wszDeviceType[RASSAPI_MAX_DEVICETYPE_NAME];
-    WCHAR wszDeviceName[RASSAPI_MAX_DEVICE_NAME];
-    WCHAR wszMediaName[RASSAPI_MAX_MEDIA_NAME];
-    DWORD reserved;
-    DWORD Flags;
-    WCHAR wszUserName[UNLEN + 1];
-    WCHAR wszComputer[NETBIOS_NAME_LEN];
-    DWORD dwStartSessionTime;          /* seconds from 1/1/1970 */
-    WCHAR wszLogonDomain[DNLEN + 1];
-    BOOL fAdvancedServer;
-} RAS_PORT_0, *PRAS_PORT_0;
-typedef struct _RAS_PPP_NBFCP_RESULT {
-    DWORD dwError;
-    DWORD dwNetBiosError;
-    CHAR  szName[ NETBIOS_NAME_LEN + 1 ];
-    WCHAR wszWksta[ NETBIOS_NAME_LEN + 1 ];
-} RAS_PPP_NBFCP_RESULT;
-typedef struct _RAS_PPP_IPCP_RESULT{
-    DWORD dwError;
-    WCHAR wszAddress[ RAS_IPADDRESSLEN + 1 ];
-} RAS_PPP_IPCP_RESULT;
-typedef struct _RAS_PPP_IPXCP_RESULT {
-    DWORD dwError;
-    WCHAR wszAddress[ RAS_IPXADDRESSLEN + 1 ];
-} RAS_PPP_IPXCP_RESULT;
-typedef struct _RAS_PPP_ATCP_RESULT {
-    DWORD dwError;
-    WCHAR wszAddress[ RAS_ATADDRESSLEN + 1 ];
-} RAS_PPP_ATCP_RESULT;
-typedef struct _RAS_PPP_PROJECTION_RESULT {
-    RAS_PPP_NBFCP_RESULT nbf;
-    RAS_PPP_IPCP_RESULT  ip;
-    RAS_PPP_IPXCP_RESULT ipx;
-    RAS_PPP_ATCP_RESULT  at;
-} RAS_PPP_PROJECTION_RESULT;
-typedef struct _RAS_PORT_1{
-    RAS_PORT_0  rasport0;
-    DWORD       LineCondition;
-    DWORD       HardwareCondition;
-    DWORD       LineSpeed;
-    WORD        NumStatistics;
-    WORD        NumMediaParms;
-    DWORD       SizeMediaParms;
-    RAS_PPP_PROJECTION_RESULT  ProjResult;
-} RAS_PORT_1, *PRAS_PORT_1;
-typedef struct _RAS_PORT_STATISTICS {
-    DWORD   dwBytesXmited;
-    DWORD   dwBytesRcved;
-    DWORD   dwFramesXmited;
-    DWORD   dwFramesRcved;
-    DWORD   dwCrcErr;
-    DWORD   dwTimeoutErr;
-    DWORD   dwAlignmentErr;
-    DWORD   dwHardwareOverrunErr;
-    DWORD   dwFramingErr;
-    DWORD   dwBufferOverrunErr;
-    DWORD   dwBytesXmitedUncompressed;
-    DWORD   dwBytesRcvedUncompressed;
-    DWORD   dwBytesXmitedCompressed;
-    DWORD   dwBytesRcvedCompressed;
-    DWORD   dwPortBytesXmited;
-    DWORD   dwPortBytesRcved;
-    DWORD   dwPortFramesXmited;
-    DWORD   dwPortFramesRcved;
-    DWORD   dwPortCrcErr;
-    DWORD   dwPortTimeoutErr;
-    DWORD   dwPortAlignmentErr;
-    DWORD   dwPortHardwareOverrunErr;
-    DWORD   dwPortFramingErr;
-    DWORD   dwPortBufferOverrunErr;
-    DWORD   dwPortBytesXmitedUncompressed;
-    DWORD   dwPortBytesRcvedUncompressed;
-    DWORD   dwPortBytesXmitedCompressed;
-    DWORD   dwPortBytesRcvedCompressed;
-} RAS_PORT_STATISTICS, *PRAS_PORT_STATISTICS;
-typedef struct _RAS_SERVER_0 {
-    WORD TotalPorts;
-    WORD PortsInUse;
-    DWORD RasVersion;
-} RAS_SERVER_0, *PRAS_SERVER_0;
-
-DWORD APIENTRY RasAdminServerGetInfo( const WCHAR*,  PRAS_SERVER_0 );
-DWORD APIENTRY RasAdminGetUserAccountServer( const WCHAR*, const WCHAR*, LPWSTR );
-DWORD APIENTRY RasAdminUserGetInfo( const WCHAR*, const WCHAR*, PRAS_USER_0 );
-DWORD APIENTRY RasAdminUserSetInfo( const WCHAR*, const WCHAR*, const PRAS_USER_0 );
-DWORD APIENTRY RasAdminPortEnum( const WCHAR*, PRAS_PORT_0*, WORD*);
-DWORD APIENTRY RasAdminPortGetInfo( const WCHAR*, const WCHAR*, RAS_PORT_1*, RAS_PORT_STATISTICS*,  RAS_PARAMETERS** );
-DWORD APIENTRY RasAdminPortClearStatistics( const WCHAR*, const WCHAR* );
-DWORD APIENTRY RasAdminPortDisconnect( const WCHAR*, const WCHAR* );
-DWORD APIENTRY RasAdminFreeBuffer(PVOID);
-DWORD APIENTRY RasAdminGetErrorString( UINT,  WCHAR*,  DWORD );
-BOOL APIENTRY RasAdminAcceptNewConnection( RAS_PORT_1*, RAS_PORT_STATISTICS*, RAS_PARAMETERS* );
-VOID APIENTRY RasAdminConnectionHangupNotification ( RAS_PORT_1*, RAS_PORT_STATISTICS*, RAS_PARAMETERS* );
-DWORD APIENTRY RasAdminGetIpAddressForUser ( WCHAR*, WCHAR*, IPADDR*, BOOL*);
-VOID APIENTRY RasAdminReleaseIpAddress ( WCHAR*, WCHAR*,IPADDR*	);
-DWORD APIENTRY RasAdminGetUserParms( WCHAR*, PRAS_USER_0 );
-DWORD APIENTRY RasAdminSetUserParms( WCHAR*, DWORD, PRAS_USER_0 );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RASSAPI_H */
diff --git a/winsup/w32api/include/regstr.h b/winsup/w32api/include/regstr.h
deleted file mode 100644
index ccf80ea40..000000000
--- a/winsup/w32api/include/regstr.h
+++ /dev/null
@@ -1,769 +0,0 @@
-#ifndef _REGSTR_H
-#define _REGSTR_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define REGSTR_KEY_CLASS TEXT("Class")
-#define REGSTR_KEY_CONFIG TEXT("Config")
-#define REGSTR_KEY_ENUM TEXT("Enum")
-#define REGSTR_KEY_ROOTENUM TEXT("Root")
-#define REGSTR_KEY_BIOSENUM TEXT("BIOS")
-#define REGSTR_KEY_PCMCIAENUM TEXT("PCMCIA")
-#define REGSTR_KEY_PCIENUM TEXT("PCI")
-#define REGSTR_KEY_LOGCONFIG	TEXT("LogConfig")
-#define REGSTR_KEY_SYSTEMBOARD	TEXT("*PNP0C01")
-#define REGSTR_KEY_APM	TEXT("*PNP0C05")
-#define REGSTR_KEY_INIUPDATE	TEXT("IniUpdate")
-#define REG_KEY_INSTDEV TEXT("Installed")
-#define REGSTR_KEY_DOSOPTCDROM	TEXT("CD-ROM")
-#define REGSTR_KEY_DOSOPTMOUSE	TEXT("MOUSE")
-#define REGSTR_DEFAULT_INSTANCE TEXT("0000")
-#define REGSTR_PATH_MOTHERBOARD REGSTR_KEY_SYSTEMBOARD TEXT("\\" REGSTR_DEFAULT_INSTANCE
-#define REGSTR_PATH_SETUP	TEXT("Software\\Microsoft\\Windows\\CurrentVersion")
-#define REGSTR_PATH_PIFCONVERT TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\PIFConvert")
-#define REGSTR_PATH_MSDOSOPTS	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\MS-DOSOptions")
-#define REGSTR_PATH_MSDOSEMU	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\MS-DOS Emulation")
-#define REGSTR_PATH_NEWDOSBOX	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\MS-DOS Emulation\\AppCompat")
-#define REGSTR_PATH_RUNONCE	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce")
-#define REGSTR_PATH_RUN	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Run")
-#define REGSTR_PATH_RUNSERVICESONCE	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunServicesOnce")
-#define REGSTR_PATH_RUNSERVICES	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunServices")
-#ifndef REGSTR_PATH_EXPLORER /* also in shlobj.h */
-#define REGSTR_PATH_EXPLORER	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")
-#endif
-#define REGSTR_PATH_DETECT	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Detect")
-#define REGSTR_PATH_APPPATHS	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths")
-#define REGSTR_PATH_UNINSTALL TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall")
-#define REGSTR_PATH_REALMODENET TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network\\Real Mode Net")
-#define REGSTR_PATH_NETEQUIV TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network\\Equivalent")
-#define REGSTR_PATH_CVNETWORK TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network")
-#define REGSTR_PATH_IDCONFIGDB	TEXT("System\\CurrentControlSet\\Control\\IDConfigDB")
-#define REGSTR_PATH_CLASS	TEXT("System\\CurrentControlSet\\Services\\Class")
-#define REGSTR_PATH_DISPLAYSETTINGS TEXT("Display\\Settings")
-#define REGSTR_PATH_FONTS	TEXT("Display\\Fonts")
-#define REGSTR_PATH_ENUM	TEXT("Enum")
-#define REGSTR_PATH_ROOT	TEXT("Enum\\Root")
-#define REGSTR_PATH_SERVICES	TEXT("System\\CurrentControlSet\\Services")
-#define REGSTR_PATH_VXD TEXT("System\\CurrentControlSet\\Services\\VxD")
-#define REGSTR_PATH_IOS TEXT("System\\CurrentControlSet\\Services\\VxD\\IOS")
-#define REGSTR_PATH_VMM TEXT("System\\CurrentControlSet\\Services\\VxD\\VMM")
-#define REGSTR_PATH_VPOWERD TEXT("System\\CurrentControlSet\\Services\\VxD\\VPOWERD")
-#define REGSTR_PATH_VNETSUP TEXT("System\\CurrentControlSet\\Services\\VxD\\VNETSUP")
-#define REGSTR_PATH_NWREDIR TEXT("System\\CurrentControlSet\\Services\\VxD\\NWREDIR")
-#define REGSTR_PATH_NCPSERVER TEXT("System\\CurrentControlSet\\Services\\NcpServer\\Parameters")
-#define REGSTR_PATH_IOARB	TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\IOArb")
-#define REGSTR_PATH_ADDRARB	TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\AddrArb")
-#define REGSTR_PATH_DMAARB	TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\DMAArb")
-#define REGSTR_PATH_IRQARB	TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\IRQArb")
-#define REGSTR_PATH_CODEPAGE	TEXT("System\\CurrentControlSet\\Control\\Nls\\Codepage")
-#define REGSTR_PATH_FILESYSTEM	TEXT("System\\CurrentControlSet\\Control\\FileSystem")
-#define REGSTR_PATH_FILESYSTEM_NOVOLTRACK	TEXT("System\\CurrentControlSet\\Control\\FileSystem\\NoVolTrack")
-#define REGSTR_PATH_CDFS	TEXT("System\\CurrentControlSet\\Control\\FileSystem\\CDFS")
-#define REGSTR_PATH_WINBOOT	TEXT("System\\CurrentControlSet\\Control\\WinBoot")
-#define REGSTR_PATH_INSTALLEDFILES	TEXT("System\\CurrentControlSet\\Control\\InstalledFiles")
-#define REGSTR_PATH_VMM32FILES	TEXT("System\\CurrentControlSet\\Control\\VMM32Files")
-#define REGSTR_MAX_VALUE_LENGTH 256
-#define REGSTR_VAL_BITSPERPIXEL	TEXT("BitsPerPixel")
-#define REGSTR_VAL_RESOLUTION TEXT("Resolution")
-#define REGSTR_VAL_DPILOGICALX	TEXT("DPILogicalX")
-#define REGSTR_VAL_DPILOGICALY	TEXT("DPILogicalY")
-#define REGSTR_VAL_DPIPHYSICALX	TEXT("DPIPhysicalX")
-#define REGSTR_VAL_DPIPHYSICALY TEXT("DPIPhysicalY")
-#define REGSTR_VAL_REFRESHRATE TEXT("RefreshRate")
-#define REGSTR_VAL_DISPLAYFLAGS TEXT("DisplayFlags")
-#define REGSTR_PATH_CONTROLPANEL TEXT("Control Panel")
-#define REGSTR_PATH_CONTROLSFOLDER TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder")
-#define REGSTR_VAL_DOSCP	TEXT("OEMCP")
-#define REGSTR_VAL_WINCP	TEXT("ACP")
-#define REGSTR_PATH_DYNA_ENUM	TEXT("Config Manager\\Enum")
-#define	REGSTR_VAL_HARDWARE_KEY	TEXT("HardWareKey")
-#define	REGSTR_VAL_ALLOCATION	TEXT("Allocation")
-#define	REGSTR_VAL_PROBLEM	TEXT("Problem")
-#define	REGSTR_VAL_STATUS	TEXT("Status")
-#define REGSTR_VAL_DONTUSEMEM	TEXT("DontAllocLastMem")
-#define REGSTR_VAL_SYSTEMROOT TEXT("SystemRoot")
-#define REGSTR_VAL_BOOTCOUNT	TEXT("BootCount")
-#define REGSTR_VAL_REALNETSTART	TEXT("RealNetStart")
-#define	REGSTR_VAL_MEDIA	TEXT("MediaPath")
-#define	REGSTR_VAL_CONFIG	TEXT("ConfigPath")
-#define REGSTR_VAL_DEVICEPATH	TEXT("DevicePath")
-#define REGSTR_VAL_SRCPATH	TEXT("SourcePath")
-#define REGSTR_VAL_OLDWINDIR	TEXT("OldWinDir")
-#define REGSTR_VAL_SETUPFLAGS	TEXT("SetupFlags")
-#define REGSTR_VAL_REGOWNER TEXT("RegisteredOwner")
-#define REGSTR_VAL_REGORGANIZATION TEXT("RegisteredOrganization")
-#define REGSTR_VAL_LICENSINGINFO TEXT("LicensingInfo")
-#define REGSTR_VAL_OLDMSDOSVER TEXT("OldMSDOSVer")
-#define REGSTR_VAL_FIRSTINSTALLDATETIME TEXT("FirstInstallDateTime")
-#define REGSTR_VAL_INSTALLTYPE	TEXT("InstallType")
-#define REGSTR_VAL_WRAPPER	TEXT("Wrapper")
-#define IT_COMPACT 0
-#define IT_TYPICAL 1
-#define IT_PORTABLE 2
-#define IT_CUSTOM 3
-#define REGSTR_KEY_SETUP	TEXT("\\Setup")
-#define REGSTR_VAL_BOOTDIR TEXT("BootDir")
-#define REGSTR_VAL_WINBOOTDIR TEXT("WinbootDir")
-#define REGSTR_VAL_WINDIR	TEXT("WinDir")
-#define REGSTR_VAL_APPINSTPATH	TEXT("AppInstallPath")
-#define REGSTR_PATH_EBD REGSTR_PATH_SETUP REGSTR_KEY_SETUP TEXT("\\EBD")
-#define REGSTR_KEY_EBDFILESLOCAL TEXT("EBDFilesLocale")
-#define REGSTR_KEY_EBDFILESKEYBOARD TEXT("EBDFilesKeyboard")
-#define REGSTR_KEY_EBDAUTOEXECBATLOCAL TEXT("EBDAutoexecBatLocale")
-#define REGSTR_KEY_EBDAUTOEXECBATKEYBOARD TEXT("EBDAutoexecBatKeyboard")
-#define REGSTR_KEY_EBDCONFIGSYSLOCAL TEXT("EBDConfigSysLocale")
-#define REGSTR_KEY_EBDCONFIGSYSKEYBOARD TEXT("EBDConfigSysKeyboard")
-#define REGSTR_VAL_MSDOSMODE TEXT("MSDOSMode")
-#define REGSTR_VAL_MSDOSMODEDISCARD TEXT("Discard")
-#define REGSTR_VAL_DOSOPTGLOBALFLAGS	TEXT("GlobalFlags")
-#define DOSOPTGF_DEFCLEAN 1
-#define REGSTR_VAL_DOSOPTFLAGS	TEXT("Flags")
-#define REGSTR_VAL_OPTORDER	TEXT("Order")
-#define REGSTR_VAL_CONFIGSYS	TEXT("Config.Sys")
-#define REGSTR_VAL_AUTOEXEC	TEXT("Autoexec.Bat")
-#define REGSTR_VAL_STDDOSOPTION TEXT("StdOption")
-#define REGSTR_VAL_DOSOPTTIP	TEXT("TipText")
-#define DOSOPTF_DEFAULT 1
-#define DOSOPTF_SUPPORTED 2
-#define DOSOPTF_ALWAYSUSE 4
-#define DOSOPTF_USESPMODE 8
-#define DOSOPTF_PROVIDESUMB 16
-#define DOSOPTF_NEEDSETUP 32
-#define DOSOPTF_INDOSSTART 64
-#define DOSOPTF_MULTIPLE 128
-#define SUF_FIRSTTIME 1
-#define SUF_EXPRESS 2
-#define SUF_BATCHINF 4
-#define SUF_CLEAN 8
-#define SUF_INSETUP 16
-#define SUF_NETSETUP 32
-#define SUF_NETHDBOOT 64
-#define SUF_NETRPLBOOT 128
-#define SUF_SBSCOPYOK 256
-#define REGSTR_VAL_DOSPAGER	TEXT("DOSPager")
-#define REGSTR_VAL_VXDGROUPS	TEXT("VXDGroups")
-#define REGSTR_VAL_VPOWERDFLAGS TEXT("Flags")
-#define VPDF_DISABLEPWRMGMT 1
-#define VPDF_FORCEAPM10MODE 2
-#define VPDF_SKIPINTELSLCHECK 4
-#define VPDF_DISABLEPWRSTATUSPOLL 8
-#define REGSTR_VAL_WORKGROUP TEXT("Workgroup")
-#define REGSTR_VAL_DIRECTHOST TEXT("DirectHost")
-#define REGSTR_VAL_FILESHARING TEXT("FileSharing")
-#define REGSTR_VAL_PRINTSHARING	TEXT("PrintSharing")
-#define REGSTR_VAL_FIRSTNETDRIVE TEXT("FirstNetworkDrive")
-#define REGSTR_VAL_MAXCONNECTIONS	TEXT("MaxConnections")
-#define REGSTR_VAL_APISUPPORT	TEXT("APISupport")
-#define REGSTR_VAL_MAXRETRY	TEXT("MaxRetry")
-#define REGSTR_VAL_MINRETRY	TEXT("MinRetry")
-#define REGSTR_VAL_SUPPORTLFN	TEXT("SupportLFN")
-#define REGSTR_VAL_SUPPORTBURST	TEXT("SupportBurst")
-#define REGSTR_VAL_SUPPORTTUNNELLING	TEXT("SupportTunnelling")
-#define REGSTR_VAL_FULLTRACE	TEXT("FullTrace")
-#define REGSTR_VAL_READCACHING	TEXT("ReadCaching")
-#define REGSTR_VAL_SHOWDOTS	TEXT("ShowDots")
-#define REGSTR_VAL_GAPTIME	TEXT("GapTime")
-#define REGSTR_VAL_SEARCHMODE	TEXT("SearchMode")
-#define REGSTR_VAL_SHELLVERSION TEXT("ShellVersion")
-#define REGSTR_VAL_MAXLIP TEXT("MaxLIP")
-#define REGSTR_VAL_PRESERVECASE TEXT("PreserveCase")
-#define REGSTR_VAL_OPTIMIZESFN TEXT("OptimizeSFN")
-#define REGSTR_VAL_NCP_BROWSEMASTER TEXT("BrowseMaster")
-#define	REGSTR_VAL_NCP_USEPEERBROWSING	TEXT("Use_PeerBrowsing")
-#define REGSTR_VAL_NCP_USESAP TEXT("Use_Sap")
-#define	REGSTR_VAL_WIN31FILESYSTEM	TEXT("Win31FileSystem")
-#define REGSTR_VAL_PRESERVELONGNAMES	TEXT("PreserveLongNames")
-#define REGSTR_VAL_DRIVEWRITEBEHIND	TEXT("DriveWriteBehind")
-#define REGSTR_VAL_ASYNCFILECOMMIT	TEXT("AsyncFileCommit")
-#define REGSTR_VAL_PATHCACHECOUNT	TEXT("PathCache")
-#define REGSTR_VAL_NAMECACHECOUNT	TEXT("NameCache")
-#define REGSTR_VAL_CONTIGFILEALLOC	TEXT("ContigFileAllocSize")
-#define REGSTR_VAL_VOLIDLETIMEOUT	TEXT("VolumeIdleTimeout")
-#define REGSTR_VAL_BUFFIDLETIMEOUT	TEXT("BufferIdleTimeout")
-#define REGSTR_VAL_BUFFAGETIMEOUT	TEXT("BufferAgeTimeout")
-#define	REGSTR_VAL_NAMENUMERICTAIL TEXT("NameNumericTail")
-#define	REGSTR_VAL_READAHEADTHRESHOLD	TEXT("ReadAheadThreshold")
-#define	REGSTR_VAL_DOUBLEBUFFER TEXT("DoubleBuffer")
-#define	REGSTR_VAL_SOFTCOMPATMODE TEXT("SoftCompatMode")
-#define REGSTR_VAL_DRIVESPINDOWN	TEXT("DriveSpinDown")
-#define	REGSTR_VAL_FORCEPMIO	TEXT("ForcePMIO")
-#define REGSTR_VAL_FORCERMIO	TEXT("ForceRMIO")
-#define REGSTR_VAL_LASTBOOTPMDRVS	TEXT("LastBootPMDrvs")
-#define REGSTR_VAL_VIRTUALHDIRQ	TEXT("VirtualHDIRQ")
-#define REGSTR_VAL_SRVNAMECACHECOUNT	TEXT("ServerNameCacheMax")
-#define REGSTR_VAL_SRVNAMECACHE	TEXT("ServerNameCache")
-#define REGSTR_VAL_SRVNAMECACHENETPROV	TEXT("ServerNameCacheNumNets")
-#define	REGSTR_VAL_AUTOMOUNT	TEXT("AutoMountDrives")
-#define	REGSTR_VAL_COMPRESSIONMETHOD	TEXT("CompressionAlgorithm")
-#define	REGSTR_VAL_COMPRESSIONTHRESHOLD	TEXT("CompressionThreshold")
-#define REGSTR_VAL_CDCACHESIZE	TEXT("CacheSize")
-#define REGSTR_VAL_CDPREFETCH	TEXT("Prefetch")
-#define REGSTR_VAL_CDPREFETCHTAIL TEXT("PrefetchTail")
-#define REGSTR_VAL_CDRAWCACHE	TEXT("RawCache")
-#define REGSTR_VAL_CDEXTERRORS	TEXT("ExtendedErrors")
-#define REGSTR_VAL_CDSVDSENSE	TEXT("SVDSense")
-#define REGSTR_VAL_CDSHOWVERSIONS TEXT("ShowVersions")
-#define REGSTR_VAL_CDCOMPATNAMES TEXT("MSCDEXCompatNames")
-#define REGSTR_VAL_CDNOREADAHEAD TEXT("NoReadAhead")
-#define REGSTR_VAL_SCSI	TEXT("SCSI\\")
-#define REGSTR_VAL_ESDI	TEXT("ESDI\\")
-#define REGSTR_VAL_FLOP TEXT("FLOP\\")
-#define	REGSTR_VAL_DISK	TEXT("GenDisk")
-#define	REGSTR_VAL_CDROM	TEXT("GenCD")
-#define	REGSTR_VAL_TAPE	TEXT("TAPE")
-#define	REGSTR_VAL_SCANNER TEXT("SCANNER")
-#define	REGSTR_VAL_FLOPPY	TEXT("FLOPPY")
-#define	REGSTR_VAL_SCSITID TEXT("SCSITargetID")
-#define	REGSTR_VAL_SCSILUN TEXT("SCSILUN")
-#define	REGSTR_VAL_REVLEVEL TEXT("RevisionLevel")
-#define	REGSTR_VAL_PRODUCTID TEXT("ProductId")
-#define	REGSTR_VAL_PRODUCTTYPE TEXT("ProductType")
-#define	REGSTR_VAL_DEVTYPE TEXT("DeviceType")
-#define	REGSTR_VAL_REMOVABLE TEXT("Removable")
-#define REGSTR_VAL_CURDRVLET TEXT("CurrentDriveLetterAssignment")
-#define	REGSTR_VAL_USRDRVLET TEXT("UserDriveLetterAssignment")
-#define	REGSTR_VAL_SYNCDATAXFER TEXT("SyncDataXfer")
-#define	REGSTR_VAL_AUTOINSNOTE	TEXT("AutoInsertNotification")
-#define	REGSTR_VAL_DISCONNECT TEXT("Disconnect")
-#define	REGSTR_VAL_INT13 TEXT("Int13")
-#define	REGSTR_VAL_PMODE_INT13 TEXT("PModeInt13")
-#define	REGSTR_VAL_USERSETTINGS TEXT("AdapterSettings")
-#define	REGSTR_VAL_NOIDE TEXT("NoIDE")
-#define	REGSTR_VAL_DISKCLASSNAME	TEXT("DiskDrive")
-#define	REGSTR_VAL_CDROMCLASSNAME	TEXT("CDROM")
-#define	REGSTR_VAL_FORCELOAD	TEXT("ForceLoadPD")
-#define	REGSTR_VAL_FORCEFIFO TEXT("ForceFIFO")
-#define	REGSTR_VAL_FORCECL TEXT("ForceChangeLine")
-#define REGSTR_VAL_NOUSECLASS TEXT("NoUseClass")
-#define REGSTR_VAL_NOINSTALLCLASS TEXT("NoInstallClass")
-#define REGSTR_VAL_NODISPLAYCLASS TEXT("NoDisplayClass")
-#define REGSTR_VAL_SILENTINSTALL TEXT("SilentInstall")
-#define REGSTR_KEY_PCMCIA_CLASS TEXT("PCMCIA")
-#define REGSTR_KEY_SCSI_CLASS TEXT("SCSIAdapter")
-#define REGSTR_KEY_PORTS_CLASS TEXT("ports")
-#define REGSTR_KEY_MEDIA_CLASS TEXT("MEDIA")
-#define REGSTR_KEY_DISPLAY_CLASS TEXT("Display")
-#define REGSTR_KEY_KEYBOARD_CLASS TEXT("Keyboard")
-#define REGSTR_KEY_MOUSE_CLASS TEXT("Mouse")
-#define REGSTR_KEY_MONITOR_CLASS TEXT("Monitor")
-#define REGSTR_VAL_PCMCIA_OPT	TEXT("Options")
-#define PCMCIA_OPT_HAVE_SOCKET	1
-#define PCMCIA_OPT_AUTOMEM	4
-#define PCMCIA_OPT_NO_SOUND	8
-#define PCMCIA_OPT_NO_AUDIO	16
-#define PCMCIA_OPT_NO_APMREMOVE 32
-#define REGSTR_VAL_PCMCIA_MEM	TEXT("Memory")
-#define PCMCIA_DEF_MEMBEGIN	0xC0000
-#define PCMCIA_DEF_MEMEND	0xFFFFFF
-#define PCMCIA_DEF_MEMLEN	0x1000
-#define REGSTR_VAL_PCMCIA_ALLOC TEXT("AllocMemWin")
-#define REGSTR_VAL_PCMCIA_ATAD	TEXT("ATADelay")
-#define REGSTR_VAL_PCMCIA_SIZ	TEXT("MinRegionSize")
-#define PCMCIA_DEF_MIN_REGION	0x10000
-#define REGSTR_VAL_P1284MDL TEXT("Model")
-#define REGSTR_VAL_P1284MFG TEXT("Manufacturer")
-#define	REGSTR_VAL_ISAPNP	TEXT("ISAPNP")
-#define	REGSTR_VAL_ISAPNP_RDP_OVERRIDE	TEXT("RDPOverRide")
-#define	REGSTR_VAL_PCI	TEXT("PCI")
-#define	REGSTR_PCI_OPTIONS	TEXT("Options")
-#define	REGSTR_PCI_DUAL_IDE	TEXT("PCIDualIDE")
-#define	PCI_OPTIONS_USE_BIOS	1
-#define	PCI_OPTIONS_USE_IRQ_STEERING	2
-#define	PCI_FLAG_NO_VIDEO_IRQ	1
-#define	PCI_FLAG_PCMCIA_WANT_IRQ	2
-#define	PCI_FLAG_DUAL_IDE	4
-#define	PCI_FLAG_NO_ENUM_AT_ALL	8
-#define	PCI_FLAG_ENUM_NO_RESOURCE	16
-#define	PCI_FLAG_NEED_DWORD_ACCESS	32
-#define	PCI_FLAG_SINGLE_FUNCTION	64
-#define	PCI_FLAG_ALWAYS_ENABLED	128
-#define	PCI_FLAG_IS_IDE	256
-#define	PCI_FLAG_IS_VIDEO	512
-#define	PCI_FLAG_FAIL_START	1024
-#define REGSTR_KEY_CRASHES	TEXT("Crashes")
-#define REGSTR_KEY_DANGERS	TEXT("Dangers")
-#define REGSTR_KEY_DETMODVARS	TEXT("DetModVars")
-#define REGSTR_KEY_NDISINFO	TEXT("NDISInfo")
-#define REGSTR_VAL_PROTINIPATH	TEXT("ProtIniPath")
-#define REGSTR_VAL_RESOURCES	TEXT("Resources")
-#define REGSTR_VAL_CRASHFUNCS	TEXT("CrashFuncs")
-#define REGSTR_VAL_CLASS	TEXT("Class")
-#define REGSTR_VAL_DEVDESC	TEXT("DeviceDesc")
-#define REGSTR_VAL_BOOTCONFIG	TEXT("BootConfig")
-#define REGSTR_VAL_DETFUNC	TEXT("DetFunc")
-#define REGSTR_VAL_DETFLAGS	TEXT("DetFlags")
-#define REGSTR_VAL_COMPATIBLEIDS TEXT("CompatibleIDs")
-#define REGSTR_VAL_DETCONFIG	TEXT("DetConfig")
-#define REGSTR_VAL_VERIFYKEY	TEXT("VerifyKey")
-#define REGSTR_VAL_COMINFO	TEXT("ComInfo")
-#define REGSTR_VAL_INFNAME	TEXT("InfName")
-#define REGSTR_VAL_CARDSPECIFIC	TEXT("CardSpecific")
-#define REGSTR_VAL_NETOSTYPE	TEXT("NetOSType")
-#define REGSTR_DATA_NETOS_NDIS	TEXT("NDIS")
-#define REGSTR_DATA_NETOS_ODI	TEXT("ODI")
-#define REGSTR_DATA_NETOS_IPX	TEXT("IPX")
-#define REGSTR_VAL_MFG TEXT("Mfg")
-#define REGSTR_VAL_SCAN_ONLY_FIRST	TEXT("ScanOnlyFirstDrive")
-#define REGSTR_VAL_SHARE_IRQ	TEXT("ForceIRQSharing")
-#define REGSTR_VAL_NONSTANDARD_ATAPI	TEXT("NonStandardATAPI")
-#define REGSTR_VAL_IDE_FORCE_SERIALIZE	TEXT("ForceSerialization")
-#define	REGSTR_VAL_MAX_HCID_LEN	1024
-#define REGSTR_VAL_HWREV TEXT("HWRevision")
-#define REGSTR_VAL_ENABLEINTS TEXT("EnableInts")
-#define REGDF_NOTDETIO	1
-#define REGDF_NOTDETMEM 2
-#define REGDF_NOTDETIRQ 4
-#define REGDF_NOTDETDMA 8
-#define REGDF_NOTDETALL	(REGDF_NOTDETIO | REGDF_NOTDETMEM | REGDF_NOTDETIRQ | REGDF_NOTDETDMA)
-#define REGDF_NEEDFULLCONFIG	16
-#define REGDF_GENFORCEDCONFIG	32
-#define REGDF_NODETCONFIG	0x8000
-#define REGDF_CONFLICTIO	0x10000
-#define REGDF_CONFLICTMEM	0x20000
-#define REGDF_CONFLICTIRQ	0x40000
-#define REGDF_CONFLICTDMA	0x80000
-#define	REGDF_CONFLICTALL	(REGDF_CONFLICTIO | REGDF_CONFLICTMEM | REGDF_CONFLICTIRQ | REGDF_CONFLICTDMA)
-#define REGDF_MAPIRQ2TO9	0x100000
-#define REGDF_NOTVERIFIED	0x80000000
-#define REGSTR_VAL_APMBIOSVER	TEXT("APMBiosVer")
-#define REGSTR_VAL_APMFLAGS	TEXT("APMFlags")
-#define REGSTR_VAL_SLSUPPORT	TEXT("SLSupport")
-#define REGSTR_VAL_MACHINETYPE	TEXT("MachineType")
-#define REGSTR_VAL_SETUPMACHINETYPE TEXT("SetupMachineType")
-#define REGSTR_MACHTYPE_UNKNOWN TEXT("Unknown")
-#define REGSTR_MACHTYPE_IBMPC	TEXT("IBM PC")
-#define REGSTR_MACHTYPE_IBMPCJR TEXT("IBM PCjr")
-#define REGSTR_MACHTYPE_IBMPCCONV	TEXT("IBM PC Convertible")
-#define REGSTR_MACHTYPE_IBMPCXT TEXT("IBM PC/XT")
-#define REGSTR_MACHTYPE_IBMPCXT_286	TEXT("IBM PC/XT 286")
-#define REGSTR_MACHTYPE_IBMPCAT TEXT("IBM PC/AT")
-#define REGSTR_MACHTYPE_IBMPS2_25	TEXT("IBM PS/2-25")
-#define REGSTR_MACHTYPE_IBMPS2_30_286	TEXT("IBM PS/2-30 286")
-#define REGSTR_MACHTYPE_IBMPS2_30	TEXT("IBM PS/2-30")
-#define REGSTR_MACHTYPE_IBMPS2_50	TEXT("IBM PS/2-50")
-#define REGSTR_MACHTYPE_IBMPS2_50Z	TEXT("IBM PS/2-50Z")
-#define REGSTR_MACHTYPE_IBMPS2_55SX	TEXT("IBM PS/2-55SX")
-#define REGSTR_MACHTYPE_IBMPS2_60	TEXT("IBM PS/2-60")
-#define REGSTR_MACHTYPE_IBMPS2_65SX	TEXT("IBM PS/2-65SX")
-#define REGSTR_MACHTYPE_IBMPS2_70	TEXT("IBM PS/2-70")
-#define REGSTR_MACHTYPE_IBMPS2_P70	TEXT("IBM PS/2-P70")
-#define REGSTR_MACHTYPE_IBMPS2_70_80	TEXT("IBM PS/2-70/80")
-#define REGSTR_MACHTYPE_IBMPS2_80	TEXT("IBM PS/2-80")
-#define REGSTR_MACHTYPE_IBMPS2_90	TEXT("IBM PS/2-90")
-#define REGSTR_MACHTYPE_IBMPS1	TEXT("IBM PS/1")
-#define REGSTR_MACHTYPE_PHOENIX_PCAT	TEXT("Phoenix PC/AT Compatible")
-#define REGSTR_MACHTYPE_HP_VECTRA	TEXT("HP Vectra")
-#define REGSTR_MACHTYPE_ATT_PC	TEXT("AT&T PC")
-#define REGSTR_MACHTYPE_ZENITH_PC	TEXT("Zenith PC")
-#define REGSTR_VAL_APMMENUSUSPEND	TEXT("APMMenuSuspend")
-#define APMMENUSUSPEND_DISABLED 0
-#define APMMENUSUSPEND_ENABLED	1
-#define APMMENUSUSPEND_UNDOCKED 2
-#define APMMENUSUSPEND_NOCHANGE 128
-#define REGSTR_VAL_BUSTYPE TEXT("BusType")
-#define REGSTR_VAL_CPU TEXT("CPU")
-#define REGSTR_VAL_NDP TEXT("NDP")
-#define REGSTR_VAL_PNPBIOSVER TEXT("PnPBIOSVer")
-#define REGSTR_VAL_PNPSTRUCOFFSET TEXT("PnPStrucOffset")
-#define REGSTR_VAL_PCIBIOSVER TEXT("PCIBIOSVer")
-#define REGSTR_VAL_HWMECHANISM TEXT("HWMechanism")
-#define REGSTR_VAL_LASTPCIBUSNUM TEXT("LastPCIBusNum")
-#define REGSTR_VAL_CONVMEM TEXT("ConvMem")
-#define REGSTR_VAL_EXTMEM TEXT("ExtMem")
-#define REGSTR_VAL_COMPUTERNAME TEXT("ComputerName")
-#define REGSTR_VAL_BIOSNAME TEXT("BIOSName")
-#define REGSTR_VAL_BIOSVERSION TEXT("BIOSVersion")
-#define REGSTR_VAL_BIOSDATE TEXT("BIOSDate")
-#define REGSTR_VAL_MODEL TEXT("Model")
-#define REGSTR_VAL_SUBMODEL TEXT("Submodel")
-#define REGSTR_VAL_REVISION TEXT("Revision")
-#define REGSTR_VAL_FIFODEPTH	TEXT("FIFODepth")
-#define REGSTR_VAL_RDINTTHRESHOLD	TEXT("RDIntThreshold")
-#define REGSTR_VAL_WRINTTHRESHOLD	TEXT("WRIntThreshold")
-#define REGSTR_VAL_PRIORITY	TEXT("Priority")
-#define REGSTR_VAL_DRIVER	TEXT("Driver")
-#define REGSTR_VAL_FUNCDESC	TEXT("FunctionDesc")
-#define REGSTR_VAL_FORCEDCONFIG TEXT("ForcedConfig")
-#define REGSTR_VAL_CONFIGFLAGS	TEXT("ConfigFlags")
-#define REGSTR_VAL_CSCONFIGFLAGS TEXT("CSConfigFlags")
-#define CONFIGFLAG_DISABLED	1
-#define CONFIGFLAG_REMOVED	2
-#define CONFIGFLAG_MANUAL_INSTALL 4
-#define CONFIGFLAG_IGNORE_BOOT_LC 8
-#define CONFIGFLAG_NET_BOOT	16
-#define CONFIGFLAG_REINSTALL	32
-#define CONFIGFLAG_FAILEDINSTALL	64
-#define CONFIGFLAG_CANTSTOPACHILD	128
-#define CONFIGFLAG_OKREMOVEROM	256
-#define CONFIGFLAG_NOREMOVEEXIT	512
-#define CSCONFIGFLAG_BITS	7
-#define CSCONFIGFLAG_DISABLED	1
-#define CSCONFIGFLAG_DO_NOT_CREATE	2
-#define CSCONFIGFLAG_DO_NOT_START	4
-#define DMSTATEFLAG_APPLYTOALL 1
-#define	REGSTR_VAL_ROOT_DEVNODE	TEXT("HTREE\\ROOT\\0")
-#define	REGSTR_VAL_RESERVED_DEVNODE	TEXT("HTREE\\RESERVED\\0")
-#define	REGSTR_PATH_READDATAPORT	REGSTR_KEY_ISAENUM TEXT("\\ReadDataPort\\0")
-#define	REGSTR_PATH_MULTI_FUNCTION	TEXT("MF")
-#define	REGSTR_VAL_RESOURCE_MAP	TEXT("ResourceMap")
-#define	REGSTR_PATH_CHILD_PREFIX	TEXT("Child")
-#define	NUM_RESOURCE_MAP	256
-#define	REGSTR_VAL_MF_FLAGS	TEXT("MFFlags")
-#define	MF_FLAGS_EVEN_IF_NO_RESOURCE	1
-#define	MF_FLAGS_NO_CREATE_IF_NO_RESOURCE	2
-#define	MF_FLAGS_FILL_IN_UNKNOWN_RESOURCE	4
-#define	MF_FLAGS_CREATE_BUT_NO_SHOW_DISABLED	8
-#define	EISAFLAG_NO_IO_MERGE	1
-#define	EISAFLAG_SLOT_IO_FIRST	2
-#define	EISA_NO_MAX_FUNCTION	0xFF
-#define	NUM_EISA_RANGES	4
-#define REGSTR_VAL_DRVDESC	TEXT("DriverDesc")
-#define REGSTR_VAL_DEVLOADER	TEXT("DevLoader")
-#define REGSTR_VAL_STATICVXD	TEXT("StaticVxD")
-#define REGSTR_VAL_PROPERTIES	TEXT("Properties")
-#define REGSTR_VAL_MANUFACTURER TEXT("Manufacturer")
-#define REGSTR_VAL_EXISTS	TEXT("Exists")
-#define REGSTR_VAL_CMENUMFLAGS	TEXT("CMEnumFlags")
-#define REGSTR_VAL_CMDRIVFLAGS	TEXT("CMDrivFlags")
-#define	REGSTR_VAL_ENUMERATOR	TEXT("Enumerator")
-#define	REGSTR_VAL_DEVICEDRIVER	TEXT("DeviceDriver")
-#define REGSTR_VAL_PORTNAME	TEXT("PortName")
-#define REGSTR_VAL_INFPATH TEXT("InfPath")
-#define REGSTR_VAL_INFSECTION	TEXT("InfSection")
-#define REGSTR_VAL_POLLING	TEXT("Polling")
-#define REGSTR_VAL_DONTLOADIFCONFLICT TEXT("DontLoadIfConflict")
-#define REGSTR_VAL_PORTSUBCLASS TEXT("PortSubClass")
-#define REGSTR_VAL_NETCLEAN TEXT("NetClean")
-#define REGSTR_VAL_IDE_NO_SERIALIZE TEXT("IDENoSerialize")
-#define REGSTR_VAL_NOCMOSORFDPT TEXT("NoCMOSorFDPT")
-#define REGSTR_VAL_COMVERIFYBASE TEXT("COMVerifyBase")
-#define REGSTR_KEY_OVERRIDE	TEXT("Override")
-#define	REGSTR_VAL_CONFIGMG	TEXT("CONFIGMG")
-#define REGSTR_VAL_SYSDM	TEXT("SysDM")
-#define REGSTR_VAL_SYSDMFUNC	TEXT("SysDMFunc")
-#define	REGSTR_VAL_PRIVATE	TEXT("Private")
-#define	REGSTR_VAL_PRIVATEFUNC	TEXT("PrivateFunc")
-#define	REGSTR_VAL_DETECT	TEXT("Detect")
-#define	REGSTR_VAL_DETECTFUNC	TEXT("DetectFunc")
-#define	REGSTR_VAL_ASKFORCONFIG	TEXT("AskForConfig")
-#define	REGSTR_VAL_ASKFORCONFIGFUNC TEXT("AskForConfigFunc")
-#define	REGSTR_VAL_WAITFORUNDOCK TEXT("WaitForUndock")
-#define	REGSTR_VAL_WAITFORUNDOCKFUNC TEXT("WaitForUndockFunc")
-#define	REGSTR_VAL_REMOVEROMOKAY TEXT("RemoveRomOkay")
-#define	REGSTR_VAL_REMOVEROMOKAYFUNC TEXT("RemoveRomOkayFunc")
-#define REGSTR_VAL_CURCONFIG	TEXT("CurrentConfig")
-#define REGSTR_VAL_FRIENDLYNAME TEXT("FriendlyName")
-#define REGSTR_VAL_CURRENTCONFIG TEXT("CurrentConfig")
-#define REGSTR_VAL_MAP	TEXT("Map")
-#define REGSTR_VAL_ID	TEXT("CurrentID")
-#define REGSTR_VAL_DOCKED	TEXT("CurrentDockedState")
-#define REGSTR_VAL_CHECKSUM	TEXT("CurrentChecksum")
-#define REGSTR_VAL_HWDETECT	TEXT("HardwareDetect")
-#define REGSTR_VAL_INHIBITRESULTS TEXT("InhibitResults")
-#define REGSTR_VAL_PROFILEFLAGS TEXT("ProfileFlags")
-#define REGSTR_KEY_PCMCIA	TEXT("PCMCIA\\")
-#define REGSTR_KEY_PCUNKNOWN	TEXT("UNKNOWN_MANUFACTURER")
-#define REGSTR_VAL_PCSSDRIVER	TEXT("Driver")
-#define REGSTR_KEY_PCMTD	TEXT("MTD-")
-#define REGSTR_VAL_PCMTDRIVER	TEXT("MTD")
-#define REGSTR_VAL_HARDWAREID	TEXT("HardwareID")
-#define REGSTR_VAL_INSTALLER	TEXT("Installer")
-#define REGSTR_VAL_INSICON	TEXT("Icon")
-#define REGSTR_VAL_ENUMPROPPAGES TEXT("EnumPropPages")
-#define REGSTR_VAL_BASICPROPERTIES TEXT("BasicProperties")
-#define REGSTR_VAL_PRIVATEPROBLEM TEXT("PrivateProblem")
-#define REGSTR_KEY_CURRENT	TEXT("Current")
-#define REGSTR_KEY_DEFAULT	TEXT("Default")
-#define REGSTR_KEY_MODES	TEXT("Modes")
-#define REGSTR_VAL_MODE TEXT("Mode")
-#define REGSTR_VAL_BPP	TEXT("BPP")
-#define REGSTR_VAL_HRES TEXT("HRes")
-#define REGSTR_VAL_VRES TEXT("VRes")
-#define REGSTR_VAL_FONTSIZE	TEXT("FontSize")
-#define REGSTR_VAL_DRV	TEXT("drv")
-#define REGSTR_VAL_GRB	TEXT("grb")
-#define REGSTR_VAL_VDD	TEXT("vdd")
-#define REGSTR_VAL_VER	TEXT("Ver")
-#define REGSTR_VAL_MAXRES	TEXT("MaxResolution")
-#define REGSTR_VAL_DPMS TEXT("DPMS")
-#define REGSTR_VAL_RESUMERESET TEXT("ResumeReset")
-#define REGSTR_VAL_DESCRIPTION TEXT("Description")
-#define REGSTR_KEY_SYSTEM	TEXT("System")
-#define REGSTR_KEY_USER TEXT("User")
-#define REGSTR_VAL_DPI	TEXT("dpi")
-#define REGSTR_VAL_PCICOPTIONS	TEXT("PCICOptions")
-#ifndef NEC_98
-#define PCIC_DEFAULT_IRQMASK	0x4EB8
-#else
-#define PCIC_DEFAULT_IRQMASK	0x1468
-#endif
-#define PCIC_DEFAULT_NUMSOCKETS 0
-#define REGSTR_VAL_PCICIRQMAP	TEXT("PCICIRQMap")
-#define REGSTR_PATH_APPEARANCE	TEXT("Control Panel\\Appearance")
-#define REGSTR_PATH_LOOKSCHEMES TEXT("Control Panel\\Appearance\\Schemes")
-#define REGSTR_VAL_CUSTOMCOLORS TEXT("CustomColors")
-#define REGSTR_PATH_SCREENSAVE TEXT("Control Panel\\Desktop")
-#define REGSTR_VALUE_USESCRPASSWORD TEXT("ScreenSaveUsePassword")
-#define REGSTR_VALUE_SCRPASSWORD TEXT("ScreenSave_Data")
-#define REGSTR_VALUE_LOWPOWERTIMEOUT	TEXT("ScreenSaveLowPowerTimeout")
-#define REGSTR_VALUE_POWEROFFTIMEOUT	TEXT("ScreenSavePowerOffTimeout")
-#define REGSTR_VALUE_LOWPOWERACTIVE	TEXT("ScreenSaveLowPowerActive")
-#define REGSTR_VALUE_POWEROFFACTIVE	TEXT("ScreenSavePowerOffActive")
-#define REGSTR_PATH_WINDOWSAPPLETS TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets")
-#define REGSTR_PATH_SYSTRAY TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\SysTray")
-#define REGSTR_VAL_SYSTRAYSVCS TEXT("Services")
-#define REGSTR_VAL_SYSTRAYBATFLAGS TEXT("PowerFlags")
-#define REGSTR_VAL_SYSTRAYPCCARDFLAGS TEXT("PCMCIAFlags")
-#define REGSTR_PATH_NETWORK_USERSETTINGS	TEXT("Network")
-#define REGSTR_KEY_NETWORK_PERSISTENT	TEXT("\\Persistent")
-#define REGSTR_KEY_NETWORK_RECENT	TEXT("\\Recent")
-#define REGSTR_VAL_REMOTE_PATH	TEXT("RemotePath")
-#define REGSTR_VAL_USER_NAME	TEXT("UserName")
-#define REGSTR_VAL_PROVIDER_NAME	TEXT("ProviderName")
-#define REGSTR_VAL_CONNECTION_TYPE	TEXT("ConnectionType")
-#define REGSTR_VAL_UPGRADE	TEXT("Upgrade")
-#define REGSTR_KEY_LOGON TEXT("\\Logon")
-#define REGSTR_VAL_MUSTBEVALIDATED TEXT("MustBeValidated")
-#define REGSTR_VAL_RUNLOGINSCRIPT	TEXT("ProcessLoginScript")
-#define REGSTR_KEY_NETWORKPROVIDER TEXT("\\NetworkProvider")
-#define REGSTR_PATH_NW32NETPROVIDER REGSTR_PATH_SERVICES TEXT("\\NWNP32" REGSTR_KEY_NETWORKPROVIDER
-#define REGSTR_PATH_MS32NETPROVIDER REGSTR_PATH_SERVICES TEXT("\\MSNP32" REGSTR_KEY_NETWORKPROVIDER
-#define REGSTR_VAL_AUTHENT_AGENT TEXT("AuthenticatingAgent")
-#define REGSTR_VAL_PREFREDIR TEXT("PreferredRedir")
-#define REGSTR_VAL_AUTOSTART TEXT("AutoStart")
-#define REGSTR_VAL_AUTOLOGON TEXT("AutoLogon")
-#define REGSTR_VAL_NETCARD TEXT("Netcard")
-#define REGSTR_VAL_TRANSPORT TEXT("Transport")
-#define REGSTR_VAL_DYNAMIC TEXT("Dynamic")
-#define REGSTR_VAL_TRANSITION TEXT("Transition")
-#define REGSTR_VAL_STATICDRIVE TEXT("StaticDrive")
-#define REGSTR_VAL_LOADHI TEXT("LoadHi")
-#define REGSTR_VAL_LOADRMDRIVERS TEXT("LoadRMDrivers")
-#define REGSTR_VAL_SETUPN TEXT("SetupN")
-#define REGSTR_VAL_SETUPNPATH TEXT("SetupNPath")
-#define REGSTR_VAL_WRKGRP_FORCEMAPPING TEXT("WrkgrpForceMapping")
-#define REGSTR_VAL_WRKGRP_REQUIRED TEXT("WrkgrpRequired")
-#define REGSTR_PATH_CURRENT_CONTROL_SET	TEXT("System\\CurrentControlSet\\Control")
-#define REGSTR_VAL_CURRENT_USER	TEXT("Current User")
-#define REGSTR_PATH_PWDPROVIDER	TEXT("System\\CurrentControlSet\\Control\\PwdProvider")
-#define REGSTR_VAL_PWDPROVIDER_PATH TEXT("ProviderPath")
-#define REGSTR_VAL_PWDPROVIDER_DESC TEXT("Description")
-#define REGSTR_VAL_PWDPROVIDER_CHANGEPWD TEXT("ChangePassword")
-#define REGSTR_VAL_PWDPROVIDER_CHANGEPWDHWND TEXT("ChangePasswordHwnd")
-#define REGSTR_VAL_PWDPROVIDER_GETPWDSTATUS TEXT("GetPasswordStatus")
-#define REGSTR_VAL_PWDPROVIDER_ISNP TEXT("NetworkProvider")
-#define REGSTR_VAL_PWDPROVIDER_CHANGEORDER TEXT("ChangeOrder")
-#define REGSTR_PATH_POLICIES	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Policies")
-#define REGSTR_PATH_UPDATE	TEXT("System\\CurrentControlSet\\Control\\Update")
-#define REGSTR_VALUE_ENABLE	TEXT("Enable")
-#define REGSTR_VALUE_VERBOSE	TEXT("Verbose")
-#define REGSTR_VALUE_NETPATH	TEXT("NetworkPath")
-#define REGSTR_VALUE_DEFAULTLOC	TEXT("UseDefaultNetLocation")
-#define REGSTR_KEY_NETWORK	TEXT("Network")
-#define REGSTR_KEY_SYSTEM	TEXT("System")
-#define REGSTR_KEY_PRINTERS	TEXT("Printers")
-#define REGSTR_KEY_WINOLDAPP	TEXT("WinOldApp")
-#define REGSTR_VAL_NOFILESHARING	TEXT("NoFileSharing")
-#define REGSTR_VAL_NOPRINTSHARING	TEXT("NoPrintSharing")
-#define REGSTR_VAL_NOFILESHARINGCTRL	TEXT("NoFileSharingControl")
-#define REGSTR_VAL_NOPRINTSHARINGCTRL	TEXT("NoPrintSharingControl")
-#define REGSTR_VAL_HIDESHAREPWDS	TEXT("HideSharePwds")
-#define REGSTR_VAL_DISABLEPWDCACHING	TEXT("DisablePwdCaching")
-#define REGSTR_VAL_ALPHANUMPWDS	TEXT("AlphanumPwds")
-#define REGSTR_VAL_NETSETUP_DISABLE	TEXT("NoNetSetup")
-#define REGSTR_VAL_NETSETUP_NOCONFIGPAGE	TEXT("NoNetSetupConfigPage")
-#define REGSTR_VAL_NETSETUP_NOIDPAGE	TEXT("NoNetSetupIDPage")
-#define REGSTR_VAL_NETSETUP_NOSECURITYPAGE	TEXT("NoNetSetupSecurityPage")
-#define REGSTR_VAL_SYSTEMCPL_NOVIRTMEMPAGE TEXT("NoVirtMemPage")
-#define REGSTR_VAL_SYSTEMCPL_NODEVMGRPAGE TEXT("NoDevMgrPage")
-#define REGSTR_VAL_SYSTEMCPL_NOCONFIGPAGE	TEXT("NoConfigPage")
-#define REGSTR_VAL_SYSTEMCPL_NOFILESYSPAGE	TEXT("NoFileSysPage")
-#define REGSTR_VAL_DISPCPL_NODISPCPL	TEXT("NoDispCPL")
-#define REGSTR_VAL_DISPCPL_NOBACKGROUNDPAGE TEXT("NoDispBackgroundPage")
-#define REGSTR_VAL_DISPCPL_NOSCRSAVPAGE TEXT("NoDispScrSavPage")
-#define REGSTR_VAL_DISPCPL_NOAPPEARANCEPAGE TEXT("NoDispAppearancePage")
-#define REGSTR_VAL_DISPCPL_NOSETTINGSPAGE TEXT("NoDispSettingsPage")
-#define REGSTR_VAL_SECCPL_NOSECCPL	TEXT("NoSecCPL")
-#define REGSTR_VAL_SECCPL_NOPWDPAGE	TEXT("NoPwdPage")
-#define REGSTR_VAL_SECCPL_NOADMINPAGE	TEXT("NoAdminPage")
-#define REGSTR_VAL_SECCPL_NOPROFILEPAGE	TEXT("NoProfilePage")
-#define REGSTR_VAL_PRINTERS_HIDETABS	TEXT("NoPrinterTabs")
-#define REGSTR_VAL_PRINTERS_NODELETE	TEXT("NoDeletePrinter")
-#define REGSTR_VAL_PRINTERS_NOADD	TEXT("NoAddPrinter")
-#define REGSTR_VAL_WINOLDAPP_DISABLED	TEXT("Disabled")
-#define REGSTR_VAL_WINOLDAPP_NOREALMODE	TEXT("NoRealMode")
-#define REGSTR_VAL_NOENTIRENETWORK	TEXT("NoEntireNetwork")
-#define REGSTR_VAL_NOWORKGROUPCONTENTS	TEXT("NoWorkgroupContents")
-#define REGSTR_VAL_MINPWDLEN	TEXT("MinPwdLen")
-#define REGSTR_VAL_PWDEXPIRATION	TEXT("PwdExpiration")
-#define REGSTR_VAL_WIN31PROVIDER	TEXT("Win31Provider")
-#define REGSTR_VAL_DISABLEREGTOOLS	TEXT("DisableRegistryTools")
-#define REGSTR_PATH_WINLOGON	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Winlogon")
-#define REGSTR_VAL_LEGALNOTICECAPTION	TEXT("LegalNoticeCaption")
-#define REGSTR_VAL_LEGALNOTICETEXT	TEXT("LegalNoticeText")
-#define REGSTR_VAL_RESTRICTRUN	TEXT("RestrictRun")
-#define REGSTR_KEY_POL_USERS	TEXT("Users")
-#define REGSTR_KEY_POL_COMPUTERS	TEXT("Computers")
-#define REGSTR_KEY_POL_USERGROUPS	TEXT("UserGroups")
-#define REGSTR_KEY_POL_DEFAULT	TEXT(".default")
-#define REGSTR_KEY_POL_USERGROUPDATA TEXT("GroupData\\UserGroups\\Priority")
-#define REGSTR_PATH_TIMEZONE	TEXT("System\\CurrentControlSet\\Control\\TimeZoneInformation")
-#define REGSTR_VAL_TZBIAS	TEXT("Bias")
-#define REGSTR_VAL_TZDLTBIAS	TEXT("DaylightBias")
-#define REGSTR_VAL_TZSTDBIAS	TEXT("StandardBias")
-#define REGSTR_VAL_TZACTBIAS	TEXT("ActiveTimeBias")
-#define REGSTR_VAL_TZDLTFLAG	TEXT("DaylightFlag")
-#define REGSTR_VAL_TZSTDSTART	TEXT("StandardStart")
-#define REGSTR_VAL_TZDLTSTART	TEXT("DaylightStart")
-#define REGSTR_VAL_TZDLTNAME	TEXT("DaylightName")
-#define REGSTR_VAL_TZSTDNAME	TEXT("StandardName")
-#define REGSTR_VAL_TZNOCHANGESTART TEXT("NoChangeStart")
-#define REGSTR_VAL_TZNOCHANGEEND TEXT("NoChangeEnd")
-#define REGSTR_VAL_TZNOAUTOTIME TEXT("DisableAutoDaylightTimeSet")
-#define REGSTR_PATH_FLOATINGPOINTPROCESSOR TEXT("HARDWARE\\DESCRIPTION\\System\\FloatingPointProcessor")
-#define REGSTR_PATH_FLOATINGPOINTPROCESSOR0 TEXT("HARDWARE\\DESCRIPTION\\System\\FloatingPointProcessor\\0")
-#define REGSTR_PATH_COMPUTRNAME TEXT("System\\CurrentControlSet\\Control\\ComputerName\\ComputerName")
-#define REGSTR_VAL_COMPUTRNAME TEXT("ComputerName")
-#define REGSTR_PATH_SHUTDOWN TEXT("System\\CurrentControlSet\\Control\\Shutdown")
-#define REGSTR_VAL_FORCEREBOOT TEXT("ForceReboot")
-#define REGSTR_VAL_SETUPPROGRAMRAN TEXT("SetupProgramRan")
-#define REGSTR_VAL_DOES_POLLING TEXT("PollingSupportNeeded")
-#define REGSTR_PATH_KNOWNDLLS	TEXT("System\\CurrentControlSet\\Control\\SessionManager\\KnownDLLs")
-#define REGSTR_PATH_KNOWN16DLLS	TEXT("System\\CurrentControlSet\\Control\\SessionManager\\Known16DLLs")
-#define REGSTR_PATH_CHECKVERDLLS TEXT("System\\CurrentControlSet\\Control\\SessionManager\\CheckVerDLLs")
-#define REGSTR_PATH_WARNVERDLLS TEXT("System\\CurrentControlSet\\Control\\SessionManager\\WarnVerDLLs")
-#define REGSTR_PATH_HACKINIFILE TEXT("System\\CurrentControlSet\\Control\\SessionManager\\HackIniFiles")
-#define REGSTR_PATH_CHECKBADAPPS TEXT("System\\CurrentControlSet\\Control\\SessionManager\\CheckBadApps")
-#define REGSTR_PATH_APPPATCH TEXT("System\\CurrentControlSet\\Control\\SessionManager\\AppPatches")
-#define REGSTR_PATH_KNOWNVXDS	TEXT("System\\CurrentControlSet\\Control\\SessionManager\\KnownVxDs")
-#define REGSTR_VAL_UNINSTALLER_DISPLAYNAME TEXT("DisplayName")
-#define REGSTR_VAL_UNINSTALLER_COMMANDLINE TEXT("UninstallString")
-#define REGSTR_PATH_DESKTOP	REGSTR_PATH_SCREENSAVE
-#define REGSTR_PATH_MOUSE	TEXT("Control Panel\\Mouse")
-#define REGSTR_PATH_KEYBOARD TEXT("Control Panel\\Keyboard")
-#define REGSTR_PATH_COLORS	TEXT("Control Panel\\Colors")
-#define REGSTR_PATH_SOUND	TEXT("Control Panel\\Sound")
-#define REGSTR_PATH_METRICS	TEXT("Control Panel\\Desktop\\WindowMetrics")
-#define REGSTR_PATH_ICONS TEXT("Control Panel\\Icons")
-#define REGSTR_PATH_CURSORS TEXT("Control Panel\\Cursors")
-#define REGSTR_PATH_CHECKDISK	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Check Drive")
-#define REGSTR_PATH_CHECKDISKSET TEXT("Settings")
-#define REGSTR_PATH_CHECKDISKUDRVS TEXT("NoUnknownDDErrDrvs")
-#define REGSTR_PATH_FAULT	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Fault")
-#define REGSTR_VAL_FAULT_LOGFILE	TEXT("LogFile")
-#define	REGSTR_PATH_AEDEBUG	TEXT("Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug")
-#define REGSTR_VAL_AEDEBUG_DEBUGGER	TEXT("Debugger")
-#define REGSTR_VAL_AEDEBUG_AUTO	TEXT("Auto")
-#define REGSTR_PATH_GRPCONV	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\GrpConv")
-#define REGSTR_VAL_REGITEMDELETEMESSAGE TEXT("Removal Message")
-#define REGSTR_PATH_LASTCHECK	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\LastCheck")
-#define REGSTR_PATH_LASTOPTIMIZE	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\LastOptimize")
-#define REGSTR_PATH_LASTBACKUP	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\LastBackup")
-#define REGSTR_PATH_CHKLASTCHECK	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Check Drive\\LastCheck")
-#define REGSTR_PATH_CHKLASTSURFAN	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Check Drive\\LastSurfaceAnalysis")
-#define DTRESULTOK	0
-#define DTRESULTFIX	1
-#define DTRESULTPROB	2
-#define DTRESULTPART	3
-#define REGSTR_KEY_SHARES	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network\\LanMan")
-#define REGSTR_VAL_SHARES_FLAGS TEXT("Flags")
-#define REGSTR_VAL_SHARES_TYPE TEXT("Type")
-#define REGSTR_VAL_SHARES_PATH TEXT("Path")
-#define REGSTR_VAL_SHARES_REMARK TEXT("Remark")
-#define REGSTR_VAL_SHARES_RW_PASS TEXT("Parm1")
-#define REGSTR_VAL_SHARES_RO_PASS TEXT("Parm2")
-#define REGSTR_PATH_PRINT TEXT("System\\CurrentControlSet\\Control\\Print")
-#define REGSTR_PATH_PRINTERS TEXT("System\\CurrentControlSet\\Control\\Print\\Printers")
-#define REGSTR_PATH_PROVIDERS TEXT("System\\CurrentControlSet\\Control\\Print\\Providers")
-#define REGSTR_PATH_MONITORS TEXT("System\\CurrentControlSet\\Control\\Print\\Monitors")
-#define REGSTR_PATH_ENVIRONMENTS TEXT("System\\CurrentControlSet\\Control\\Print\\Environments")
-#define REGSTR_VAL_START_ON_BOOT TEXT("StartOnBoot")
-#define REGSTR_VAL_PRINTERS_MASK TEXT("PrintersMask")
-#define REGSTR_VAL_DOS_SPOOL_MASK TEXT("DOSSpoolMask")
-#define REGSTR_KEY_CURRENT_ENV TEXT("\\Windows 4.0")
-#define REGSTR_KEY_DRIVERS TEXT("\\Drivers")
-#define REGSTR_KEY_PRINT_PROC TEXT("\\Print Processors")
-#define REGSTR_PATH_EVENTLABELS TEXT("AppEvents\\EventLabels")
-#define REGSTR_PATH_SCHEMES TEXT("AppEvents\\Schemes")
-#define REGSTR_PATH_APPS REGSTR_PATH_SCHEMES TEXT("\\Apps")
-#define REGSTR_PATH_APPS_DEFAULT REGSTR_PATH_SCHEMES TEXT("\\Apps\\.Default")
-#define REGSTR_PATH_NAMES REGSTR_PATH_SCHEMES TEXT("\\Names")
-#define REGSTR_PATH_MULTIMEDIA REGSTR_PATH_SETUP TEXT("\\Multimedia")
-#define REGSTR_PATH_MULTIMEDIA_AUDIO TEXT("Software\\Microsoft\\Multimedia\\Audio")
-#define REGSTR_PATH_MEDIARESOURCES REGSTR_PATH_CURRENT_CONTROL_SET TEXT("\\MediaResources")
-#define REGSTR_PATH_MEDIAPROPERTIES REGSTR_PATH_CURRENT_CONTROL_SET TEXT("\\MediaProperties")
-#define REGSTR_PATH_PRIVATEPROPERTIES REGSTR_PATH_MEDIAPROPERTIES TEXT("\\PrivateProperties")
-#define REGSTR_PATH_PUBLICPROPERTIES REGSTR_PATH_MEDIAPROPERTIES TEXT("\\PublicProperties")
-#define REGSTR_PATH_JOYOEM REGSTR_PATH_PRIVATEPROPERTIES TEXT("\\Joystick\\OEM")
-#define REGSTR_PATH_JOYCONFIG REGSTR_PATH_MEDIARESOURCES TEXT("\\Joystick")
-#define REGSTR_KEY_JOYCURR TEXT("CurrentJoystickSettings")
-#define REGSTR_KEY_JOYSETTINGS TEXT("JoystickSettings")
-#define REGSTR_VAL_JOYUSERVALUES TEXT("JoystickUserValues")
-#define REGSTR_VAL_JOYCALLOUT	TEXT("JoystickCallout")
-#define REGSTR_VAL_JOYNCONFIG	TEXT("Joystick%dConfiguration")
-#define REGSTR_VAL_JOYNOEMNAME	TEXT("Joystick%dOEMName")
-#define REGSTR_VAL_JOYNOEMCALLOUT TEXT("Joystick%dOEMCallout")
-#define REGSTR_VAL_JOYOEMCALLOUT	TEXT("OEMCallout")
-#define REGSTR_VAL_JOYOEMNAME	TEXT("OEMName")
-#define REGSTR_VAL_JOYOEMDATA	TEXT("OEMData")
-#define REGSTR_VAL_JOYOEMXYLABEL	TEXT("OEMXYLabel")
-#define REGSTR_VAL_JOYOEMZLABEL	TEXT("OEMZLabel")
-#define REGSTR_VAL_JOYOEMRLABEL	TEXT("OEMRLabel")
-#define REGSTR_VAL_JOYOEMPOVLABEL	TEXT("OEMPOVLabel")
-#define REGSTR_VAL_JOYOEMULABEL	TEXT("OEMULabel")
-#define REGSTR_VAL_JOYOEMVLABEL	TEXT("OEMVLabel")
-#define REGSTR_VAL_JOYOEMTESTMOVEDESC	TEXT("OEMTestMoveDesc")
-#define REGSTR_VAL_JOYOEMTESTBUTTONDESC	TEXT("OEMTestButtonDesc")
-#define REGSTR_VAL_JOYOEMTESTMOVECAP	TEXT("OEMTestMoveCap")
-#define REGSTR_VAL_JOYOEMTESTBUTTONCAP	TEXT("OEMTestButtonCap")
-#define REGSTR_VAL_JOYOEMTESTWINCAP	TEXT("OEMTestWinCap")
-#define REGSTR_VAL_JOYOEMCALCAP	TEXT("OEMCalCap")
-#define REGSTR_VAL_JOYOEMCALWINCAP	TEXT("OEMCalWinCap")
-#define REGSTR_VAL_JOYOEMCAL1	TEXT("OEMCal1")
-#define REGSTR_VAL_JOYOEMCAL2	TEXT("OEMCal2")
-#define REGSTR_VAL_JOYOEMCAL3	TEXT("OEMCal3")
-#define REGSTR_VAL_JOYOEMCAL4	TEXT("OEMCal4")
-#define REGSTR_VAL_JOYOEMCAL5	TEXT("OEMCal5")
-#define REGSTR_VAL_JOYOEMCAL6	TEXT("OEMCal6")
-#define REGSTR_VAL_JOYOEMCAL7	TEXT("OEMCal7")
-#define REGSTR_VAL_JOYOEMCAL8	TEXT("OEMCal8")
-#define REGSTR_VAL_JOYOEMCAL9	TEXT("OEMCal9")
-#define REGSTR_VAL_JOYOEMCAL10	TEXT("OEMCal10")
-#define REGSTR_VAL_JOYOEMCAL11	TEXT("OEMCal11")
-#define REGSTR_VAL_JOYOEMCAL12	TEXT("OEMCal12")
-#ifndef NEC_98
-#define REGSTR_KEY_ISAENUM	TEXT("ISAPnP")
-#define REGSTR_KEY_EISAENUM	TEXT("EISA")
-#define	REGSTR_VAL_EISA_RANGES	TEXT("EISARanges")
-#define	REGSTR_VAL_EISA_FUNCTIONS	TEXT("EISAFunctions")
-#define	REGSTR_VAL_EISA_FUNCTIONS_MASK	TEXT("EISAFunctionsMask")
-#define	REGSTR_VAL_EISA_FLAGS	TEXT("EISAFlags")
-#define	REGSTR_VAL_EISA_SIMULATE_INT15	TEXT("EISASimulateInt15")
-#else
-#define REGSTR_KEY_ISAENUM	TEXT("C98PnP")
-#define REGSTR_KEY_EISAENUM	TEXT("NESA")
-#define	REGSTR_VAL_EISA_RANGES	TEXT("NESARanges")
-#define	REGSTR_VAL_EISA_FUNCTIONS	TEXT("NESAFunctions")
-#define	REGSTR_VAL_EISA_FUNCTIONS_MASK	TEXT("NESAFunctionsMask")
-#define	REGSTR_VAL_EISA_FLAGS	TEXT("NESAFlags")
-#define	REGSTR_VAL_EISA_SIMULATE_INT15	TEXT("NESASimulateInt15")
-#endif
-typedef struct _DSKTLSYSTEMTIME {
-	WORD wYear;
-	WORD wMonth;
-	WORD wDayOfWeek;
-	WORD wDay;
-	WORD wHour;
-	WORD wMinute;
-	WORD wSecond;
-	WORD wMilliseconds;
-	WORD wResult;
-} DSKTLSYSTEMTIME,*PDSKTLSYSTEMTIME,*LPDSKTLSYSTEMTIME;
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/richedit.h b/winsup/w32api/include/richedit.h
deleted file mode 100644
index 580b51191..000000000
--- a/winsup/w32api/include/richedit.h
+++ /dev/null
@@ -1,513 +0,0 @@
-#ifndef _RICHEDIT_H
-#define _RICHEDIT_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#pragma pack(push,4)
-
-#ifdef UNICODE 
-#define RICHEDIT_CLASS L"RichEdit20W"
-#else
-#define RICHEDIT_CLASS "RichEdit20A"
-#endif
-#define RICHEDIT_CLASS10A    "RICHEDIT"
-#define CF_RTF TEXT("Rich Text Format")
-#define CF_RTFNOOBJS TEXT("Rich Text Format Without Objects")
-#define CF_RETEXTOBJ TEXT("RichEdit Text and Objects")
-#define CFM_BOLD	1
-#define CFM_ITALIC	2
-#define CFM_UNDERLINE	4
-#define CFM_STRIKEOUT	8
-#define CFM_PROTECTED	16
-#define CFM_LINK	32
-#define CFM_SIZE	0x80000000
-#define CFM_COLOR	0x40000000
-#define CFM_FACE	0x20000000
-#define CFM_OFFSET	0x10000000
-#define CFM_CHARSET	0x08000000
-#define CFM_SUBSCRIPT	0x00030000
-#define CFM_SUPERSCRIPT	0x00030000
-#define CFM_EFFECTS	(CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE | CFM_COLOR | CFM_STRIKEOUT | CFE_PROTECTED | CFM_LINK)
-#define CFE_BOLD	1
-#define CFE_ITALIC	2
-#define CFE_UNDERLINE	4
-#define CFE_STRIKEOUT	8
-#define CFE_PROTECTED	16
-#define CFE_AUTOCOLOR	0x40000000
-#define CFE_SUBSCRIPT	0x00010000
-#define CFE_SUPERSCRIPT	0x00020000
-#define IMF_FORCENONE	1
-#define IMF_FORCEENABLE	2
-#define IMF_FORCEDISABLE	4
-#define IMF_CLOSESTATUSWINDOW	8
-#define IMF_VERTICAL	32
-#define IMF_FORCEACTIVE	64
-#define IMF_FORCEINACTIVE	128
-#define IMF_FORCEREMEMBER	256
-#define SEL_EMPTY       0
-#define SEL_TEXT        1
-#define SEL_OBJECT      2
-#define SEL_MULTICHAR   4
-#define SEL_MULTIOBJECT 8
-#define MAX_TAB_STOPS 32
-#define PFM_ALIGNMENT 8
-#define PFM_NUMBERING 32
-#define PFM_OFFSET 4
-#define PFM_OFFSETINDENT 0x80000000
-#define PFM_RIGHTINDENT 2
-#define PFM_STARTINDENT 1
-#define PFM_TABSTOPS 16
-#define PFM_BORDER 2048
-#define PFM_LINESPACING 256
-#define PFM_NUMBERINGSTART 32768
-#define PFM_NUMBERINGSTYLE 8192
-#define PFM_NUMBERINGTAB 16384
-#define PFM_SHADING 4096
-#define PFM_SPACEAFTER 128
-#define PFM_SPACEBEFORE 64
-#define PFM_STYLE 1024
-#define PFM_DONOTHYPHEN 4194304
-#define PFM_KEEP 131072
-#define PFM_KEEPNEXT 262144
-#define PFM_NOLINENUMBER 1048576
-#define PFM_NOWIDOWCONTROL 2097152
-#define PFM_PAGEBREAKBEFORE 524288
-#define PFM_RTLPARA 65536
-#define PFM_SIDEBYSIDE 8388608
-#define PFM_TABLE 1073741824
-#define PFN_BULLET 1
-#define PFE_DONOTHYPHEN 64
-#define PFE_KEEP 2
-#define PFE_KEEPNEXT 4
-#define PFE_NOLINENUMBER 16
-#define PFE_NOWIDOWCONTROL 32
-#define PFE_PAGEBREAKBEFORE 8
-#define PFE_RTLPARA 1
-#define PFE_SIDEBYSIDE 128
-#define PFE_TABLE 16384
-#define PFA_LEFT 1
-#define PFA_RIGHT 2
-#define PFA_CENTER 3
-#define PFA_JUSTIFY 4
-#define PFA_FULL_INTERWORD 4
-#define SF_TEXT	1
-#define SF_RTF	2
-#define SF_RTFNOOBJS	3
-#define SF_TEXTIZED	4
-#define SF_UNICODE	16
-#define SF_USECODEPAGE	32
-#define SF_NCRFORNONASCII	64
-#define SF_RTFVAL	0x0700
-#define SFF_PWD	0x0800
-#define SFF_KEEPDOCINFO	0x1000
-#define SFF_PERSISTVIEWSCALE	0x2000
-#define SFF_PLAINRTF	0x4000
-#define SFF_SELECTION	0x8000
-#define WB_CLASSIFY	3
-#define WB_MOVEWORDLEFT	4
-#define WB_MOVEWORDRIGHT	5
-#define WB_LEFTBREAK	6
-#define WB_RIGHTBREAK	7
-#define WB_MOVEWORDPREV	4
-#define WB_MOVEWORDNEXT	5
-#define WB_PREVBREAK	6
-#define WB_NEXTBREAK	7
-#define WBF_WORDWRAP	16
-#define WBF_WORDBREAK	32
-#define WBF_OVERFLOW	64
-#define WBF_LEVEL1	128
-#define WBF_LEVEL2	256
-#define WBF_CUSTOM	512
-#define ES_DISABLENOSCROLL	8192
-#define ES_EX_NOCALLOLEINIT 16777216
-#define ES_NOIME 524288
-#define ES_NOOLEDRAGDROP 8
-#define ES_SAVESEL	32768
-#define ES_SELECTIONBAR 16777216
-#define ES_SELFIME 262144
-#define ES_SUNKEN 16384
-#define ES_VERTICAL 4194304
-#define EM_CANPASTE	(WM_USER+50)
-#define EM_DISPLAYBAND	(WM_USER+51)
-#define EM_EXGETSEL	(WM_USER+52)
-#define EM_EXLIMITTEXT	(WM_USER+53)
-#define EM_EXLINEFROMCHAR	(WM_USER+54)
-#define EM_EXSETSEL	(WM_USER+55)
-#define EM_FINDTEXT	(WM_USER+56)
-#define EM_FORMATRANGE	(WM_USER+57)
-#define EM_GETCHARFORMAT	(WM_USER+58)
-#define EM_GETEVENTMASK	(WM_USER+59)
-#define EM_GETOLEINTERFACE	(WM_USER+60)
-#define EM_GETPARAFORMAT	(WM_USER+61)
-#define EM_GETSELTEXT	(WM_USER+62)
-#define EM_HIDESELECTION	(WM_USER+63)
-#define EM_PASTESPECIAL	(WM_USER+64)
-#define EM_REQUESTRESIZE	(WM_USER+65)
-#define EM_SELECTIONTYPE	(WM_USER+66)
-#define EM_SETBKGNDCOLOR	(WM_USER+67)
-#define EM_SETCHARFORMAT	(WM_USER+68)
-#define EM_SETEVENTMASK	(WM_USER+69)
-#define EM_SETOLECALLBACK	(WM_USER+70)
-#define EM_SETPARAFORMAT	(WM_USER+71)
-#define EM_SETTARGETDEVICE	(WM_USER+72)
-#define EM_STREAMIN	(WM_USER+73)
-#define EM_STREAMOUT	(WM_USER+74)
-#define EM_GETTEXTRANGE	(WM_USER+75)
-#define EM_FINDWORDBREAK	(WM_USER+76)
-#define EM_SETOPTIONS	(WM_USER+77)
-#define EM_GETOPTIONS	(WM_USER+78)
-#define EM_FINDTEXTEX	(WM_USER+79)
-#define EM_GETWORDBREAKPROCEX	(WM_USER+80)
-#define EM_SETWORDBREAKPROCEX	(WM_USER+81)
-/* RichEdit 2.0 messages */
-#define EM_SETUNDOLIMIT	(WM_USER+82)
-#define EM_REDO	(WM_USER+84)
-#define EM_CANREDO	(WM_USER+85)
-#define EM_GETUNDONAME	(WM_USER+86)
-#define EM_GETREDONAME	(WM_USER+87)
-#define EM_STOPGROUPTYPING	(WM_USER+88)
-#define EM_SETTEXTMODE	(WM_USER+89)
-#define EM_GETTEXTMODE	(WM_USER+90)
-#define EM_AUTOURLDETECT	(WM_USER+91)
-#define EM_GETAUTOURLDETECT	(WM_USER + 92)
-#define EM_SETPALETTE	(WM_USER + 93)
-#define EM_GETTEXTEX	(WM_USER+94)
-#define EM_GETTEXTLENGTHEX	(WM_USER+95)
-#define EM_SHOWSCROLLBAR	(WM_USER+96)
-#define EM_SETTEXTEX	(WM_USER + 97)
-#define EM_SETPUNCTUATION	(WM_USER + 100)
-#define EM_GETPUNCTUATION	(WM_USER + 101)
-#define EM_SETWORDWRAPMODE	(WM_USER + 102)
-#define EM_GETWORDWRAPMODE	(WM_USER + 103)
-#define EM_SETIMECOLOR	(WM_USER + 104)
-#define EM_GETIMECOLOR	(WM_USER + 105)
-#define EM_SETIMEOPTIONS	(WM_USER + 106)
-#define EM_GETIMEOPTIONS	(WM_USER + 107)
-#define EM_SETLANGOPTIONS	(WM_USER+120)
-#define EM_GETLANGOPTIONS	(WM_USER+121)
-#define EM_GETIMECOMPMODE	(WM_USER+122)
-#define EM_FINDTEXTW	(WM_USER + 123)
-#define EM_FINDTEXTEXW	(WM_USER + 124)
-#define EM_RECONVERSION	(WM_USER + 125)
-#define EM_SETBIDIOPTIONS	(WM_USER + 200)
-#define EM_GETBIDIOPTIONS	(WM_USER + 201)
-#define EM_SETTYPOGRAPHYOPTIONS	(WM_USER+202)
-#define EM_GETTYPOGRAPHYOPTIONS	(WM_USER+203)
-#define EM_SETEDITSTYLE	(WM_USER + 204)
-#define EM_GETEDITSTYLE	(WM_USER + 205)
-#define EM_GETSCROLLPOS	(WM_USER+221)
-#define EM_SETSCROLLPOS	(WM_USER+222)
-#define EM_SETFONTSIZE	(WM_USER+223)
-#define EM_GETZOOM	(WM_USER+224)
-#define EM_SETZOOM	(WM_USER+225)
-
-#define EN_CORRECTTEXT 1797
-#define EN_DROPFILES 1795
-#define EN_IMECHANGE 1799
-#define EN_LINK 1803
-#define EN_MSGFILTER 1792
-#define EN_OLEOPFAILED 1801
-#define EN_PROTECTED 1796
-#define EN_REQUESTRESIZE 1793
-#define EN_SAVECLIPBOARD 1800
-#define EN_SELCHANGE 1794
-#define EN_STOPNOUNDO 1798
-#define ENM_NONE 0
-#define ENM_CHANGE 1
-#define ENM_CORRECTTEXT 4194304
-#define ENM_DRAGDROPDONE	16
-#define ENM_DROPFILES 1048576
-#define ENM_IMECHANGE 8388608
-#define ENM_KEYEVENTS 65536
-#define ENM_LANGCHANGE 16777216
-#define ENM_LINK 67108864
-#define ENM_MOUSEEVENTS 131072
-#define ENM_OBJECTPOSITIONS 33554432
-#define ENM_PROTECTED 2097152
-#define ENM_REQUESTRESIZE 262144
-#define ENM_SCROLL 4
-#define ENM_SCROLLEVENTS 8
-#define ENM_SELCHANGE 524288
-#define ENM_UPDATE 2
-#define ECO_AUTOWORDSELECTION	1
-#define ECO_AUTOVSCROLL	64
-#define ECO_AUTOHSCROLL	128
-#define ECO_NOHIDESEL	256
-#define ECO_READONLY	2048
-#define ECO_WANTRETURN	4096
-#define ECO_SAVESEL	0x8000
-#define ECO_SELECTIONBAR	0x1000000
-#define ECO_VERTICAL	0x400000
-#define ECOOP_SET	1
-#define ECOOP_OR	2
-#define ECOOP_AND	3
-#define ECOOP_XOR	4
-#define SCF_DEFAULT	0
-#define SCF_SELECTION	1
-#define SCF_WORD	2
-#define SCF_ALL	4
-#define SCF_USEUIRULES	8
-#define TM_PLAINTEXT	1
-#define TM_RICHTEXT	2
-#define TM_SINGLELEVELUNDO	4
-#define TM_MULTILEVELUNDO	8
-#define TM_SINGLECODEPAGE	16
-#define TM_MULTICODEPAGE	32
-#define GT_DEFAULT	0
-#define GT_USECRLF	1
-#define yHeightCharPtsMost 1638
-#define lDefaultTab 720
-
-typedef struct _charformat {
-	UINT cbSize;
-	DWORD dwMask;
-	DWORD dwEffects;
-	LONG yHeight;
-	LONG yOffset;
-	COLORREF crTextColor;
-	BYTE bCharSet;
-	BYTE bPitchAndFamily;
-	char szFaceName[LF_FACESIZE];
-} CHARFORMATA;
-typedef struct _charformatw {
-	UINT cbSize;
-	DWORD dwMask;
-	DWORD dwEffects;
-	LONG yHeight;
-	LONG yOffset;
-	COLORREF crTextColor;
-	BYTE bCharSet;
-	BYTE bPitchAndFamily;
-	WCHAR szFaceName[LF_FACESIZE];
-} CHARFORMATW;
-typedef struct _charformat2a {
-	UINT cbSize;
-	DWORD dwMask;
-	DWORD dwEffects;
-	LONG yHeight;
-	LONG yOffset;
-	COLORREF crTextColor;
-	BYTE bCharSet;
-	BYTE bPitchAndFamily;
-	char szFaceName[LF_FACESIZE];
-	WORD wWeight;
-	SHORT sSpacing;
-	COLORREF crBackColor;
-	LCID lcid;
-	DWORD dwReserved;
-	SHORT sStyle;
-	WORD wKerning;
-	BYTE bUnderlineType;
-	BYTE bAnimation;
-	BYTE bRevAuthor;
-} CHARFORMAT2A;
-typedef struct _charformat2w {
-	UINT cbSize;
-	DWORD dwMask;
-	DWORD dwEffects;
-	LONG yHeight;
-	LONG yOffset;
-	COLORREF crTextColor;
-	BYTE bCharSet;
-	BYTE bPitchAndFamily;
-	WCHAR szFaceName[LF_FACESIZE];
-	WORD wWeight;
-	SHORT sSpacing;
-	COLORREF crBackColor;
-	LCID lcid;
-	DWORD dwReserved;
-	SHORT sStyle;
-	WORD wKerning;
-	BYTE bUnderlineType;
-	BYTE bAnimation;
-	BYTE bRevAuthor;
-} CHARFORMAT2W;
-typedef struct _charrange {
-	LONG cpMin;
-	LONG cpMax;
-} CHARRANGE;
-typedef struct _compcolor {
-	COLORREF crText;
-	COLORREF crBackground;
-	DWORD dwEffects;
-} COMPCOLOR;
-typedef DWORD(CALLBACK *EDITSTREAMCALLBACK)(DWORD,PBYTE,LONG,LONG*);
-typedef struct _editstream {
-	DWORD dwCookie;
-	DWORD dwError;
-	EDITSTREAMCALLBACK pfnCallback;
-} EDITSTREAM;
-typedef struct _encorrecttext {
-	NMHDR nmhdr;
-	CHARRANGE chrg;
-	WORD seltyp;
-} ENCORRECTTEXT;
-typedef struct _endropfiles {
-	NMHDR nmhdr;
-	HANDLE hDrop;
-	LONG cp;
-	BOOL fProtected;
-} ENDROPFILES;
-typedef struct _enlink {
-	NMHDR nmhdr;
-	UINT msg;
-	WPARAM wParam;
-	LPARAM lParam;
-	CHARRANGE chrg;
-} ENLINK;
-typedef struct {
-	NMHDR nmhdr;
-	LONG iob;
-	LONG lOper;
-	HRESULT hr;
-} ENOLEOPFAILED;
-typedef struct _enprotected {
-	NMHDR nmhdr;
-	UINT msg;
-	WPARAM wParam;
-	LPARAM lParam;
-	CHARRANGE chrg;
-} ENPROTECTED,*LPENPROTECTED;
-typedef struct _ensaveclipboard {
-	NMHDR nmhdr;
-	LONG cObjectCount;
-	LONG cch;
-} ENSAVECLIPBOARD;
-typedef struct _findtextA {
-	CHARRANGE chrg;
-	LPSTR lpstrText;
-} FINDTEXTA;
-typedef struct _findtextW {
-	CHARRANGE chrg;
-	LPWSTR lpstrText;
-} FINDTEXTW;
-typedef struct _findtextexA {
-	CHARRANGE chrg;
-	LPSTR lpstrText;
-	CHARRANGE chrgText;
-} FINDTEXTEXA;
-typedef struct _findtextexW {
-	CHARRANGE chrg;
-	LPWSTR lpstrText;
-	CHARRANGE chrgText;
-} FINDTEXTEXW;
-typedef struct _formatrange {
-	HDC hdc;
-	HDC hdcTarget;
-	RECT rc;
-	RECT rcPage;
-	CHARRANGE chrg;
-} FORMATRANGE;
-typedef struct _msgfilter {
-	NMHDR nmhdr;
-    UINT msg;
-	WPARAM wParam;
-	LPARAM lParam;
-} MSGFILTER;
-typedef struct _paraformat {
-	UINT cbSize;
-	DWORD dwMask;
-	WORD wNumbering;
-	WORD wReserved;
-	LONG dxStartIndent;
-	LONG dxRightIndent;
-	LONG dxOffset;
-	WORD wAlignment;
-	SHORT cTabCount;
-	LONG rgxTabs[MAX_TAB_STOPS];
-} PARAFORMAT;
-typedef struct _paraformat2 {
-	UINT cbSize;
-	DWORD dwMask;
-	WORD wNumbering;
-	WORD wEffects;
-	LONG dxStartIndent;
-	LONG dxRightIndent;
-	LONG dxOffset;
-	WORD wAlignment;
-	SHORT cTabCount;
-	LONG rgxTabs[MAX_TAB_STOPS];
-	LONG dySpaceBefore;
-	LONG dySpaceAfter;
-	LONG dyLineSpacing;
-	SHORT sStype;
-	BYTE bLineSpacingRule;
-	BYTE bOutlineLevel;
-	WORD wShadingWeight;
-	WORD wShadingStyle;
-	WORD wNumberingStart;
-	WORD wNumberingStyle;
-	WORD wNumberingTab;
-	WORD wBorderSpace;
-	WORD wBorderWidth;
-	WORD wBorders;
-} PARAFORMAT2;
-typedef struct _selchange {
-	NMHDR nmhdr;
-	CHARRANGE chrg;
-	WORD seltyp;
-} SELCHANGE;
-typedef struct _textrange {
-	CHARRANGE chrg;
-	LPSTR lpstrText;
-} TEXTRANGEA;
-typedef struct _textrangew {
-	CHARRANGE chrg;
-	LPWSTR lpstrText;
-} TEXTRANGEW;
-typedef struct _reqresize {
-	NMHDR nmhdr;
-	RECT rc;
-} REQRESIZE;
-typedef struct _repastespecial {
-	DWORD dwAspect;
-	DWORD dwParam;
-} REPASTESPECIAL;
-typedef struct _punctuation {
-	UINT iSize;
-	LPSTR szPunctuation;
-} PUNCTUATION;
-typedef struct _gettextex {
-	DWORD cb;
-	DWORD flags;
-	UINT codepage;
-	LPCSTR lpDefaultChar;
-	LPBOOL lpUsedDefaultChar;
-} GETTEXTEX;
-typedef LONG (*EDITWORDBREAKPROCEX)(char*,LONG,BYTE,INT);
-/* Defines for EM_SETTYPOGRAPHYOPTIONS */
-#define	TO_ADVANCEDTYPOGRAPHY	1
-#define	TO_SIMPLELINEBREAK	2
-/* Defines for GETTEXTLENGTHEX */
-#define GTL_DEFAULT	0
-#define GTL_USECRLF	1
-#define GTL_PRECISE	2
-#define GTL_CLOSE	4
-#define GTL_NUMCHARS	8
-#define GTL_NUMBYTES	16
-typedef struct _gettextlengthex {
-	DWORD flags;
-	UINT codepage;
-} GETTEXTLENGTHEX;
-#ifdef UNICODE
-typedef CHARFORMATW CHARFORMAT;
-typedef CHARFORMAT2W CHARFORMAT2;
-typedef FINDTEXTW FINDTEXT;
-typedef FINDTEXTEXW FINDTEXTEX;
-typedef TEXTRANGEW TEXTRANGE;
-#else
-typedef CHARFORMATA CHARFORMAT;
-typedef CHARFORMAT2A CHARFORMAT2;
-typedef FINDTEXTA FINDTEXT;
-typedef FINDTEXTEXA FINDTEXTEX;
-typedef TEXTRANGEA TEXTRANGE;
-#endif
-#pragma pack(pop)
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/richole.h b/winsup/w32api/include/richole.h
deleted file mode 100644
index da2e336f8..000000000
--- a/winsup/w32api/include/richole.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef _RICHOLE_H
-#define	_RICHOLE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#pragma pack(push,4)
-#define REO_GETOBJ_NO_INTERFACES	0
-#define REO_GETOBJ_POLEOBJ	1
-#define REO_GETOBJ_PSTG	2
-#define REO_GETOBJ_POLESITE	4
-#define REO_GETOBJ_ALL_INTERFACES	7
-#define REO_CP_SELECTION ((ULONG)-1)
-#define REO_IOB_SELECTION ((ULONG)-1)
-#define REO_IOB_USE_CP ((ULONG)-2)
-#define REO_NULL	0
-#define REO_READWRITEMASK	0x3FL
-#define REO_DONTNEEDPALETTE	32
-#define REO_BLANK	16
-#define REO_DYNAMICSIZE		8
-#define REO_INVERTEDSELECT	4
-#define REO_BELOWBASELINE	2
-#define REO_RESIZABLE	1
-#define REO_LINK	0x80000000
-#define REO_STATIC	0x40000000
-#define REO_SELECTED	0x08000000
-#define REO_OPEN	0x4000000
-#define REO_INPLACEACTIVE	0x2000000
-#define REO_HILITED	0x1000000
-#define REO_LINKAVAILABLE	0x800000
-#define REO_GETMETAFILE	0x400000
-#define RECO_PASTE	0
-#define RECO_DROP	1
-#define RECO_COPY	2
-#define RECO_CUT	3
-#define RECO_DRAG	4
-
-extern const GUID IID_IRichEditOle;
-extern const GUID IID_IRichEditOleCallback;
-#ifndef INITGUID
-typedef struct _reobject {
-	DWORD cbStruct;
-	LONG	cp;
-	CLSID	clsid;
-	LPOLEOBJECT	poleobj;
-	LPSTORAGE	pstg;
-	LPOLECLIENTSITE	polesite;
-	SIZEL	sizel;
-	DWORD	dvaspect;
-	DWORD	dwFlags;
-	DWORD	dwUser;
-} REOBJECT;
-
-#undef INTERFACE
-#define INTERFACE IRichEditOle
-DECLARE_INTERFACE_(IRichEditOle, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClientSite)(THIS_ LPOLECLIENTSITE*) PURE;
-	STDMETHOD_(LONG,GetObjectCount)(THIS) PURE;
-	STDMETHOD_(LONG,GetLinkCount)(THIS) PURE;
-	STDMETHOD(GetObject)(THIS_ LONG, REOBJECT*,DWORD) PURE;
-	STDMETHOD(InsertObject)(THIS_ REOBJECT*) PURE;
-	STDMETHOD(ConvertObject)(THIS_ LONG,REFCLSID,LPCSTR) PURE;
-	STDMETHOD(ActivateAs)(THIS_ REFCLSID,REFCLSID) PURE;
-	STDMETHOD(SetHostNames)(THIS_ LPCSTR,LPCSTR) PURE;
-	STDMETHOD(SetLinkAvailable)(THIS_ LONG,BOOL) PURE;
-	STDMETHOD(SetDvaspect)(THIS_ LONG,DWORD) PURE;
-	STDMETHOD(HandsOffStorage)(THIS_ LONG) PURE;
-	STDMETHOD(SaveCompleted)(THIS_ LONG,LPSTORAGE) PURE;
-	STDMETHOD(InPlaceDeactivate)(THIS) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(GetClipboardData)(THIS_ CHARRANGE*,DWORD,LPDATAOBJECT*) PURE;
-	STDMETHOD(ImportDataObject)(THIS_ LPDATAOBJECT,CLIPFORMAT,HGLOBAL) PURE;
-};
-typedef IRichEditOle *LPRICHEDITOLE;
-
-#undef INTERFACE
-#define INTERFACE IRichEditOleCallback
-DECLARE_INTERFACE_(IRichEditOleCallback, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetNewStorage)(THIS_ LPSTORAGE*) PURE;
-	STDMETHOD(GetInPlaceContext)(THIS_ LPOLEINPLACEFRAME*,LPOLEINPLACEUIWINDOW*,LPOLEINPLACEFRAMEINFO) PURE;
-	STDMETHOD(ShowContainerUI)(THIS_ BOOL) PURE;
-	STDMETHOD(QueryInsertObject)(THIS_ LPCLSID,LPSTORAGE,LONG) PURE;
-	STDMETHOD(DeleteObject)(THIS_ LPOLEOBJECT) PURE;
-	STDMETHOD(QueryAcceptData) (THIS_ LPDATAOBJECT,CLIPFORMAT*,DWORD,BOOL,HGLOBAL) PURE;
-	STDMETHOD(ContextSensitiveHelp) (THIS_ BOOL) PURE;
-	STDMETHOD(GetClipboardData) (THIS_ CHARRANGE*,DWORD,LPDATAOBJECT*) PURE;
-	STDMETHOD(GetDragDropEffect) (THIS_ BOOL,DWORD,PDWORD) PURE;
-	STDMETHOD(GetContextMenu) (THIS_ WORD,LPOLEOBJECT,CHARRANGE*,HMENU*) PURE;
-};
-typedef IRichEditOleCallback FAR * LPRICHEDITOLECALLBACK;
-#endif
-#pragma pack(pop)
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/rpc.h b/winsup/w32api/include/rpc.h
deleted file mode 100644
index 0e3df5eaf..000000000
--- a/winsup/w32api/include/rpc.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef RPC_NO_WINDOWS_H
-#include <windows.h>
-#endif
-
-#ifndef _RPC_H
-#define _RPC_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define __RPC_WIN32__
-#ifndef _WIN95
-#define __RPC_NT__
-#define RPC_UNICODE_SUPPORTED
-#endif
-
-#ifndef __MIDL_USER_DEFINED
-#define midl_user_allocate MIDL_user_allocate
-#define midl_user_free     MIDL_user_free
-#define __MIDL_USER_DEFINED
-#endif
-#define RPC_UNICODE_SUPPORTED
-#define __RPC_FAR
-#define __RPC_API  __stdcall
-#define __RPC_USER __stdcall
-#define __RPC_STUB __stdcall
-#define RPC_ENTRY  __stdcall
-typedef void *I_RPC_HANDLE;
-typedef long RPC_STATUS;
-
-#include <rpcdce.h>
-#include <rpcnsi.h>
-#include <rpcnterr.h>
-
-#include <winerror.h>
-
-/* SEH is not supported */
-#if 0
-#include <excpt.h>
-#define RpcTryExcept __try {
-#define RpcExcept(x) } __except (x) {
-#define RpcEndExcept }
-#define RpcTryFinally __try {
-#define RpcFinally } __finally {
-#define RpcEndFinally }
-#define RpcExceptionCode() GetExceptionCode()
-#define RpcAbnormalTermination() AbnormalTermination()
-#endif /* 0 */
-
-RPC_STATUS RPC_ENTRY RpcImpersonateClient(RPC_BINDING_HANDLE);
-RPC_STATUS RPC_ENTRY RpcRevertToSelf(void);
-long RPC_ENTRY I_RpcMapWin32Status(RPC_STATUS);
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/rpcdce.h b/winsup/w32api/include/rpcdce.h
deleted file mode 100644
index f2adce40f..000000000
--- a/winsup/w32api/include/rpcdce.h
+++ /dev/null
@@ -1,392 +0,0 @@
-#ifndef _RPCDCE_H
-#define _RPCDCE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <basetyps.h>
-
-#define IN
-#define OUT
-#ifndef OPTIONAL
-#define OPTIONAL
-#endif
-#define uuid_t UUID
-#define rpc_binding_handle_t RPC_BINDING_HANDLE
-#define rpc_binding_vector_t RPC_BINDING_VECTOR
-#define uuid_vector_t UUID_VECTOR
-#define RPC_C_BINDING_INFINITE_TIMEOUT 10
-#define RPC_C_BINDING_MIN_TIMEOUT 0
-#define RPC_C_BINDING_DEFAULT_TIMEOUT 5
-#define RPC_C_BINDING_MAX_TIMEOUT 9
-#define RPC_C_CANCEL_INFINITE_TIMEOUT (-1)
-#define RPC_C_LISTEN_MAX_CALLS_DEFAULT 1234
-#define RPC_C_PROTSEQ_MAX_REQS_DEFAULT 10
-#define RPC_C_BIND_TO_ALL_NICS 1
-#define RPC_C_USE_INTERNET_PORT 1
-#define RPC_C_USE_INTRANET_PORT 2
-#define RPC_MGR_EPV void
-#define RPC_C_STATS_CALLS_IN 0
-#define RPC_C_STATS_CALLS_OUT 1
-#define RPC_C_STATS_PKTS_IN 2
-#define RPC_C_STATS_PKTS_OUT 3
-#define RPC_IF_AUTOLISTEN 0x0001
-#define RPC_IF_OLE 2
-#define RPC_C_MGMT_INQ_IF_IDS 0
-#define RPC_C_MGMT_INQ_PRINC_NAME 1
-#define RPC_C_MGMT_INQ_STATS 2
-#define RPC_C_MGMT_IS_SERVER_LISTEN 3
-#define RPC_C_MGMT_STOP_SERVER_LISTEN 4
-#define RPC_C_EP_ALL_ELTS 0
-#define RPC_C_EP_MATCH_BY_IF 1
-#define RPC_C_EP_MATCH_BY_OBJ 2
-#define RPC_C_EP_MATCH_BY_BOTH 3
-#define RPC_C_VERS_ALL 1
-#define RPC_C_VERS_COMPATIBLE 2
-#define RPC_C_VERS_EXACT 3
-#define RPC_C_VERS_MAJOR_ONLY 4
-#define RPC_C_VERS_UPTO 5
-#define DCE_C_ERROR_STRING_LEN 256
-#define RPC_C_PARM_MAX_PACKET_LENGTH 1
-#define RPC_C_PARM_BUFFER_LENGTH 2
-#define RPC_C_AUTHN_LEVEL_DEFAULT 0
-#define RPC_C_AUTHN_LEVEL_NONE 1
-#define RPC_C_AUTHN_LEVEL_CONNECT 2
-#define RPC_C_AUTHN_LEVEL_CALL 3
-#define RPC_C_AUTHN_LEVEL_PKT 4
-#define RPC_C_AUTHN_LEVEL_PKT_INTEGRITY 5
-#define RPC_C_AUTHN_LEVEL_PKT_PRIVACY 6
-#define RPC_C_IMP_LEVEL_ANONYMOUS 1
-#define RPC_C_IMP_LEVEL_IDENTIFY 2
-#define RPC_C_IMP_LEVEL_IMPERSONATE 3
-#define RPC_C_IMP_LEVEL_DELEGATE 4
-#define RPC_C_QOS_IDENTITY_STATIC 0
-#define RPC_C_QOS_IDENTITY_DYNAMIC 1
-#define RPC_C_QOS_CAPABILITIES_DEFAULT 0
-#define RPC_C_QOS_CAPABILITIES_MUTUAL_AUTH 1
-#define RPC_C_PROTECT_LEVEL_DEFAULT(RPC_C_AUTHN_LEVEL_DEFAULT)
-#define RPC_C_PROTECT_LEVEL_NONE(RPC_C_AUTHN_LEVEL_NONE)
-#define RPC_C_PROTECT_LEVEL_CONNECT(RPC_C_AUTHN_LEVEL_CONNECT)
-#define RPC_C_PROTECT_LEVEL_CALL(RPC_C_AUTHN_LEVEL_CALL)
-#define RPC_C_PROTECT_LEVEL_PKT(RPC_C_AUTHN_LEVEL_PKT)
-#define RPC_C_PROTECT_LEVEL_PKT_INTEGRITY(RPC_C_AUTHN_LEVEL_PKT_INTEGRITY)
-#define RPC_C_PROTECT_LEVEL_PKT_PRIVACY(RPC_C_AUTHN_LEVEL_PKT_PRIVACY)
-#define RPC_C_AUTHN_NONE 0
-#define RPC_C_AUTHN_DCE_PRIVATE 1
-#define RPC_C_AUTHN_DCE_PUBLIC 2
-#define RPC_C_AUTHN_DEC_PUBLIC 4
-#define RPC_C_AUTHN_WINNT 10
-#define RPC_C_AUTHN_DEFAULT 0xFFFFFFFF
-#define RPC_C_SECURITY_QOS_VERSION L
-#define SEC_WINNT_AUTH_IDENTITY_ANSI 0x1
-#define SEC_WINNT_AUTH_IDENTITY_UNICODE 0x2
-#define RPC_C_AUTHZ_NONE 0
-#define RPC_C_AUTHZ_NAME 1
-#define RPC_C_AUTHZ_DCE 2
-#define RPC_C_AUTHZ_DEFAULT 0xFFFFFFFF
-
-typedef I_RPC_HANDLE RPC_BINDING_HANDLE;
-typedef RPC_BINDING_HANDLE handle_t;
-typedef struct _RPC_BINDING_VECTOR {
-	unsigned long Count;
-	RPC_BINDING_HANDLE BindingH[1];
-} RPC_BINDING_VECTOR;
-typedef struct _UUID_VECTOR {
-	unsigned long Count;
-	UUID *Uuid[1];
-} UUID_VECTOR;
-typedef void *RPC_IF_HANDLE;
-typedef struct _RPC_IF_ID {
-	UUID Uuid;
-	unsigned short VersMajor;
-	unsigned short VersMinor;
-} RPC_IF_ID;
-typedef struct _RPC_POLICY {
-	unsigned int Length ;
-	unsigned long EndpointFlags ;
-	unsigned long NICFlags ;
-} RPC_POLICY,*PRPC_POLICY ;
-typedef void __RPC_USER RPC_OBJECT_INQ_FN(UUID*,UUID*,RPC_STATUS*);
-typedef RPC_STATUS RPC_IF_CALLBACK_FN(RPC_IF_HANDLE,void*);
-typedef struct {
-	unsigned int Count;
-	unsigned long Stats[1];
-} RPC_STATS_VECTOR;
-typedef struct {
-	unsigned long Count;
-	RPC_IF_ID*IfId[1];
-} RPC_IF_ID_VECTOR;
-typedef void *RPC_AUTH_IDENTITY_HANDLE;
-typedef void *RPC_AUTHZ_HANDLE;
-typedef struct _RPC_SECURITY_QOS {
-	unsigned long Version;
-	unsigned long Capabilities;
-	unsigned long IdentityTracking;
-	unsigned long ImpersonationType;
-} RPC_SECURITY_QOS,*PRPC_SECURITY_QOS;
-typedef struct _SEC_WINNT_AUTH_IDENTITY_W {
-	unsigned short *User;
-	unsigned long UserLength;
-	unsigned short *Domain;
-	unsigned long DomainLength;
-	unsigned short *Password;
-	unsigned long PasswordLength;
-	unsigned long Flags;
-} SEC_WINNT_AUTH_IDENTITY_W,*PSEC_WINNT_AUTH_IDENTITY_W;
-typedef struct _SEC_WINNT_AUTH_IDENTITY_A {
-	unsigned char *User;
-	unsigned long UserLength;
-	unsigned char *Domain;
-	unsigned long DomainLength;
-	unsigned char *Password;
-	unsigned long PasswordLength;
-	unsigned long Flags;
-} SEC_WINNT_AUTH_IDENTITY_A,*PSEC_WINNT_AUTH_IDENTITY_A;
-typedef struct {
-	unsigned char *UserName;
-	unsigned char *ComputerName;
-	unsigned short Privilege;
-	unsigned long AuthFlags;
-} RPC_CLIENT_INFORMATION1,* PRPC_CLIENT_INFORMATION1;
-typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE;
-typedef int(__RPC_API *RPC_MGMT_AUTHORIZATION_FN)(RPC_BINDING_HANDLE,unsigned long,RPC_STATUS*);
-
-#ifdef RPC_UNICODE_SUPPORTED
-typedef struct _RPC_PROTSEQ_VECTORA {
-	unsigned int Count;
-	unsigned char*Protseq[1];
-} RPC_PROTSEQ_VECTORA;
-typedef struct _RPC_PROTSEQ_VECTORW {
-	unsigned int Count;
-	unsigned short*Protseq[1];
-} RPC_PROTSEQ_VECTORW;
-RPC_STATUS RPC_ENTRY RpcBindingFromStringBindingA(unsigned char *,RPC_BINDING_HANDLE *);
-RPC_STATUS RPC_ENTRY RpcBindingFromStringBindingW(unsigned short *,RPC_BINDING_HANDLE *);
-RPC_STATUS RPC_ENTRY RpcBindingToStringBindingA(RPC_BINDING_HANDLE,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcBindingToStringBindingW(RPC_BINDING_HANDLE,unsigned short**);
-RPC_STATUS RPC_ENTRY RpcStringBindingComposeA(unsigned char *,unsigned char *,unsigned char *,unsigned char *,unsigned char *,unsigned char **);
-RPC_STATUS RPC_ENTRY RpcStringBindingComposeW(unsigned short *,unsigned short *,unsigned short *,unsigned short *,unsigned short *,unsigned short **);
-RPC_STATUS RPC_ENTRY RpcStringBindingParseA(unsigned char *,unsigned char **,unsigned char **,unsigned char **,unsigned char **,unsigned char **);
-RPC_STATUS RPC_ENTRY RpcStringBindingParseW(unsigned short *,unsigned short **,unsigned short **,unsigned short **,unsigned short **,unsigned short **);
-RPC_STATUS RPC_ENTRY RpcStringFreeA(unsigned char**);
-RPC_STATUS RPC_ENTRY RpcStringFreeW(unsigned short**);
-RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidA(unsigned char*);
-RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidW(unsigned short*);
-RPC_STATUS RPC_ENTRY RpcNetworkInqProtseqsA(RPC_PROTSEQ_VECTORA**);
-RPC_STATUS RPC_ENTRY RpcNetworkInqProtseqsW(RPC_PROTSEQ_VECTORW**);
-RPC_STATUS RPC_ENTRY RpcProtseqVectorFreeA(RPC_PROTSEQ_VECTORA**);
-RPC_STATUS RPC_ENTRY RpcProtseqVectorFreeW(RPC_PROTSEQ_VECTORW**);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqA(unsigned char*,unsigned int,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqW(unsigned short*,unsigned int,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqExA(unsigned char*,unsigned int MaxCalls,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqExW(unsigned short*,unsigned int,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpA(unsigned char*,unsigned int,unsigned char*,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpExA(unsigned char*,unsigned int,unsigned char*,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpW(unsigned short*,unsigned int,unsigned short*,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpExW(unsigned short*,unsigned int,unsigned short*,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqIfA(unsigned char*,unsigned int,RPC_IF_HANDLE,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqIfExA(unsigned char*,unsigned int,RPC_IF_HANDLE,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqIfW(unsigned short*,unsigned int,RPC_IF_HANDLE,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqIfExW(unsigned short*,unsigned int,RPC_IF_HANDLE,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcMgmtInqServerPrincNameA(RPC_BINDING_HANDLE,unsigned long,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcMgmtInqServerPrincNameW(RPC_BINDING_HANDLE,unsigned long,unsigned short**);
-RPC_STATUS RPC_ENTRY RpcServerInqDefaultPrincNameA(unsigned long,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcServerInqDefaultPrincNameW(unsigned long,unsigned short**);
-RPC_STATUS RPC_ENTRY RpcNsBindingInqEntryNameA(RPC_BINDING_HANDLE,unsigned long,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcNsBindingInqEntryNameW(RPC_BINDING_HANDLE,unsigned long,unsigned short**);
-RPC_STATUS RPC_ENTRY RpcBindingInqAuthClientA(RPC_BINDING_HANDLE,RPC_AUTHZ_HANDLE *,unsigned char**,unsigned long*,unsigned long*,unsigned long*);
-RPC_STATUS RPC_ENTRY RpcBindingInqAuthClientW(RPC_BINDING_HANDLE,RPC_AUTHZ_HANDLE *,unsigned short**,unsigned long*,unsigned long*,unsigned long*);
-RPC_STATUS RPC_ENTRY RpcBindingInqAuthInfoA(RPC_BINDING_HANDLE,unsigned char**,unsigned long*,unsigned long*,RPC_AUTH_IDENTITY_HANDLE*,unsigned long*);
-RPC_STATUS RPC_ENTRY RpcBindingInqAuthInfoW(RPC_BINDING_HANDLE,unsigned short**,unsigned long*,unsigned long*,RPC_AUTH_IDENTITY_HANDLE*,unsigned long*);
-RPC_STATUS RPC_ENTRY RpcBindingSetAuthInfoA(RPC_BINDING_HANDLE,unsigned char*,unsigned long,unsigned long,RPC_AUTH_IDENTITY_HANDLE,unsigned long);
-RPC_STATUS RPC_ENTRY RpcBindingSetAuthInfoExA(RPC_BINDING_HANDLE,unsigned char*,unsigned long,unsigned long,RPC_AUTH_IDENTITY_HANDLE,unsigned long,RPC_SECURITY_QOS*);
-RPC_STATUS RPC_ENTRY RpcBindingSetAuthInfoW(RPC_BINDING_HANDLE,unsigned short*,unsigned long,unsigned long,RPC_AUTH_IDENTITY_HANDLE,unsigned long);
-RPC_STATUS RPC_ENTRY RpcBindingSetAuthInfoExW(RPC_BINDING_HANDLE,unsigned short*,unsigned long,unsigned long,RPC_AUTH_IDENTITY_HANDLE,unsigned long,RPC_SECURITY_QOS*);
-RPC_STATUS RPC_ENTRY RpcBindingInqAuthInfoExA(RPC_BINDING_HANDLE,unsigned char**,unsigned long*,unsigned long*,RPC_AUTH_IDENTITY_HANDLE*,unsigned long*,unsigned long,RPC_SECURITY_QOS*);
-RPC_STATUS RPC_ENTRY RpcBindingInqAuthInfoExW(RPC_BINDING_HANDLE,unsigned short ** , unsigned long *, unsigned long *, RPC_AUTH_IDENTITY_HANDLE *, unsigned long *, unsigned long , RPC_SECURITY_QOS *);
-typedef void(__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)(void*,unsigned short*,unsigned long,void**,RPC_STATUS*);
-RPC_STATUS RPC_ENTRY RpcServerRegisterAuthInfoA(unsigned char*,unsigned long,RPC_AUTH_KEY_RETRIEVAL_FN,void*);
-RPC_STATUS RPC_ENTRY RpcServerRegisterAuthInfoW(unsigned short*,unsigned long,RPC_AUTH_KEY_RETRIEVAL_FN,void*);
-RPC_STATUS RPC_ENTRY UuidToStringA(UUID*,unsigned char**);
-RPC_STATUS RPC_ENTRY UuidFromStringA(unsigned char*,UUID*);
-RPC_STATUS RPC_ENTRY UuidToStringW(UUID*,unsigned short**);
-RPC_STATUS RPC_ENTRY UuidFromStringW(unsigned short*,UUID*);
-RPC_STATUS RPC_ENTRY RpcEpRegisterNoReplaceA(RPC_IF_HANDLE,RPC_BINDING_VECTOR*,UUID_VECTOR*,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcEpRegisterNoReplaceW(RPC_IF_HANDLE,RPC_BINDING_VECTOR*, UUID_VECTOR*,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcEpRegisterA(RPC_IF_HANDLE,RPC_BINDING_VECTOR*,UUID_VECTOR*,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcEpRegisterW(RPC_IF_HANDLE,RPC_BINDING_VECTOR*,UUID_VECTOR*,unsigned short*);
-RPC_STATUS RPC_ENTRY DceErrorInqTextA(RPC_STATUS,unsigned char*);
-RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcMgmtEpEltInqNextA(RPC_EP_INQ_HANDLE,RPC_IF_ID*,RPC_BINDING_HANDLE*,UUID*,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcMgmtEpEltInqNextW(RPC_EP_INQ_HANDLE,RPC_IF_ID*,RPC_BINDING_HANDLE*,UUID*,unsigned short**);
-#ifdef UNICODE
-#define RPC_PROTSEQ_VECTOR RPC_PROTSEQ_VECTORW
-#define SEC_WINNT_AUTH_IDENTITY SEC_WINNT_AUTH_IDENTITY_W
-#define PSEC_WINNT_AUTH_IDENTITY PSEC_WINNT_AUTH_IDENTITY_W
-#define _SEC_WINNT_AUTH_IDENTITY _SEC_WINNT_AUTH_IDENTITY_W
-#define RpcMgmtEpEltInqNext RpcMgmtEpEltInqNextW
-#define RpcBindingFromStringBinding RpcBindingFromStringBindingW
-#define RpcBindingToStringBinding RpcBindingToStringBindingW
-#define RpcStringBindingCompose RpcStringBindingComposeW
-#define RpcStringBindingParse RpcStringBindingParseW
-#define RpcStringFree RpcStringFreeW
-#define RpcNetworkIsProtseqValid RpcNetworkIsProtseqValidW
-#define RpcNetworkInqProtseqs RpcNetworkInqProtseqsW
-#define RpcProtseqVectorFree RpcProtseqVectorFreeW
-#define RpcServerUseProtseq RpcServerUseProtseqW
-#define RpcServerUseProtseqEx RpcServerUseProtseqExW
-#define RpcServerUseProtseqEp RpcServerUseProtseqEpW
-#define RpcServerUseProtseqEpEx RpcServerUseProtseqEpExW
-#define RpcServerUseProtseqIf RpcServerUseProtseqIfW
-#define RpcServerUseProtseqIfEx RpcServerUseProtseqIfExW
-#define RpcMgmtInqServerPrincName RpcMgmtInqServerPrincNameW
-#define RpcServerInqDefaultPrincName RpcServerInqDefaultPrincNameW
-#define RpcNsBindingInqEntryName RpcNsBindingInqEntryNameW
-#define RpcBindingInqAuthClient RpcBindingInqAuthClientW
-#define RpcBindingInqAuthInfo RpcBindingInqAuthInfoW
-#define RpcBindingSetAuthInfo RpcBindingSetAuthInfoW
-#define RpcServerRegisterAuthInfo RpcServerRegisterAuthInfoW
-#define RpcBindingInqAuthInfoEx RpcBindingInqAuthInfoExW
-#define RpcBindingSetAuthInfoEx RpcBindingSetAuthInfoExW
-#define UuidFromString UuidFromStringW
-#define UuidToString UuidToStringW
-#define RpcEpRegisterNoReplace RpcEpRegisterNoReplaceW
-#define RpcEpRegister RpcEpRegisterW
-#define DceErrorInqText DceErrorInqTextW
-#else /* UNICODE */
-#define RPC_PROTSEQ_VECTOR RPC_PROTSEQ_VECTORA
-#define SEC_WINNT_AUTH_IDENTITY SEC_WINNT_AUTH_IDENTITY_A
-#define PSEC_WINNT_AUTH_IDENTITY PSEC_WINNT_AUTH_IDENTITY_A
-#define _SEC_WINNT_AUTH_IDENTITY _SEC_WINNT_AUTH_IDENTITY_A
-#define RpcMgmtEpEltInqNext RpcMgmtEpEltInqNextA
-#define RpcBindingFromStringBinding RpcBindingFromStringBindingA
-#define RpcBindingToStringBinding RpcBindingToStringBindingA
-#define RpcStringBindingCompose RpcStringBindingComposeA
-#define RpcStringBindingParse RpcStringBindingParseA
-#define RpcStringFree RpcStringFreeA
-#define RpcNetworkIsProtseqValid RpcNetworkIsProtseqValidA
-#define RpcNetworkInqProtseqs RpcNetworkInqProtseqsA
-#define RpcProtseqVectorFree RpcProtseqVectorFreeA
-#define RpcServerUseProtseq RpcServerUseProtseqA
-#define RpcServerUseProtseqEx RpcServerUseProtseqExA
-#define RpcServerUseProtseqEp RpcServerUseProtseqEpA
-#define RpcServerUseProtseqEpEx RpcServerUseProtseqEpExA
-#define RpcServerUseProtseqIf RpcServerUseProtseqIfA
-#define RpcServerUseProtseqIfEx RpcServerUseProtseqIfExA
-#define RpcMgmtInqServerPrincName RpcMgmtInqServerPrincNameA
-#define RpcServerInqDefaultPrincName RpcServerInqDefaultPrincNameA
-#define RpcNsBindingInqEntryName RpcNsBindingInqEntryNameA
-#define RpcBindingInqAuthClient RpcBindingInqAuthClientA
-#define RpcBindingInqAuthInfo RpcBindingInqAuthInfoA
-#define RpcBindingSetAuthInfo RpcBindingSetAuthInfoA
-#define RpcServerRegisterAuthInfo RpcServerRegisterAuthInfoA
-#define RpcBindingInqAuthInfoEx RpcBindingInqAuthInfoExA
-#define RpcBindingSetAuthInfoEx RpcBindingSetAuthInfoExA
-#define UuidFromString UuidFromStringA
-#define UuidToString UuidToStringA
-#define RpcEpRegisterNoReplace RpcEpRegisterNoReplaceA
-#define RpcEpRegister RpcEpRegisterA
-#define DceErrorInqText DceErrorInqTextA
-#endif /* UNICODE */
-#else /* RPC_UNICODE_SUPPORTED */
-typedef struct _RPC_PROTSEQ_VECTOR {
-	unsigned int Count;
-	unsigned char* Protseq[1];
-} RPC_PROTSEQ_VECTOR;
-RPC_STATUS RPC_ENTRY RpcBindingFromStringBinding(unsigned char *,RPC_BINDING_HANDLE *);
-RPC_STATUS RPC_ENTRY RpcBindingToStringBinding(RPC_BINDING_HANDLE,unsigned char **);
-RPC_STATUS RPC_ENTRY RpcStringBindingCompose(unsigned char *,unsigned char *,unsigned char *,unsigned char *,unsigned char *,unsigned char **);
-RPC_STATUS RPC_ENTRY RpcStringBindingParse(unsigned char *,unsigned char **,unsigned char **,unsigned char **,unsigned char **,unsigned char **);
-RPC_STATUS RPC_ENTRY RpcStringFree(unsigned char**);
-RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValid(unsigned char*);
-RPC_STATUS RPC_ENTRY RpcNetworkInqProtseqs(RPC_PROTSEQ_VECTOR **);
-RPC_STATUS RPC_ENTRY RpcServerInqBindings(RPC_BINDING_VECTOR **);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseq(unsigned char*,unsigned int,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqEx(unsigned char*,unsigned int,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqEp(unsigned char*,unsigned int,unsigned char*,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpEx(unsigned char*,unsigned int,unsigned char*,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqIf(unsigned char*,unsigned int,RPC_IF_HANDLE,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseProtseqIfEx(unsigned char*,unsigned int,RPC_IF_HANDLE,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcMgmtInqServerPrincName(RPC_BINDING_HANDLE,unsigned long,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcServerInqDefaultPrincName(unsigned long,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcNsBindingInqEntryName(RPC_BINDING_HANDLE,unsigned long,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcBindingInqAuthClient(RPC_BINDING_HANDLE,RPC_AUTHZ_HANDLE*,unsigned char**,unsigned long*,unsigned long*,unsigned long*);
-RPC_STATUS RPC_ENTRY RpcBindingInqAuthInfo(RPC_BINDING_HANDLE,unsigned char **,unsigned long *,unsigned long *,RPC_AUTH_IDENTITY_HANDLE *,unsigned long *);
-RPC_STATUS RPC_ENTRY RpcBindingSetAuthInfo(RPC_BINDING_HANDLE,unsigned char *,unsigned long,unsigned long,RPC_AUTH_IDENTITY_HANDLE,unsigned long);
-typedef void(__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)(void*,unsigned char*,unsigned long,void**,RPC_STATUS*);
-RPC_STATUS RPC_ENTRY RpcServerRegisterAuthInfo(unsigned char*,unsigned long,RPC_AUTH_KEY_RETRIEVAL_FN,void*);
-RPC_STATUS RPC_ENTRY UuidToString(UUID*,unsigned char**);
-RPC_STATUS RPC_ENTRY UuidFromString(unsigned char*,UUID*);
-RPC_STATUS RPC_ENTRY RpcEpRegisterNoReplace(RPC_IF_HANDLE,RPC_BINDING_VECTOR*,UUID_VECTOR*,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcEpRegister(RPC_IF_HANDLE,RPC_BINDING_VECTOR*,UUID_VECTOR*,unsigned char*);
-RPC_STATUS RPC_ENTRY DceErrorInqText(RPC_STATUS,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcMgmtEpEltInqNext(RPC_EP_INQ_HANDLE,RPC_IF_ID *,RPC_BINDING_HANDLE *,unsigned char **);
-#endif /* RPC_UNICODE_SUPPORTED */
-
-RPC_STATUS RPC_ENTRY RpcBindingCopy(RPC_BINDING_HANDLE,RPC_BINDING_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcBindingFree(RPC_BINDING_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcBindingInqObject(RPC_BINDING_HANDLE,UUID *);
-RPC_STATUS RPC_ENTRY RpcBindingReset(RPC_BINDING_HANDLE);
-RPC_STATUS RPC_ENTRY RpcBindingSetObject(RPC_BINDING_HANDLE,UUID *);
-RPC_STATUS RPC_ENTRY RpcMgmtInqDefaultProtectLevel(unsigned long,unsigned long *);
-RPC_STATUS RPC_ENTRY RpcBindingVectorFree(RPC_BINDING_VECTOR **);
-RPC_STATUS RPC_ENTRY RpcIfInqId(RPC_IF_HANDLE,RPC_IF_ID *);
-RPC_STATUS RPC_ENTRY RpcMgmtInqComTimeout(RPC_BINDING_HANDLE,unsigned int*);
-RPC_STATUS RPC_ENTRY RpcMgmtSetComTimeout(RPC_BINDING_HANDLE,unsigned int);
-RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(long Timeout);
-RPC_STATUS RPC_ENTRY RpcObjectInqType(UUID *,UUID *);
-RPC_STATUS RPC_ENTRY RpcObjectSetInqFn(RPC_OBJECT_INQ_FN *);
-RPC_STATUS RPC_ENTRY RpcObjectSetType(UUID *,UUID *);
-RPC_STATUS RPC_ENTRY RpcProtseqVectorFree(RPC_PROTSEQ_VECTOR **);
-RPC_STATUS RPC_ENTRY RpcServerInqIf(RPC_IF_HANDLE,UUID*,RPC_MGR_EPV**);
-RPC_STATUS RPC_ENTRY RpcServerListen(unsigned int,unsigned int,unsigned int);
-RPC_STATUS RPC_ENTRY RpcServerRegisterIf(RPC_IF_HANDLE,UUID*,RPC_MGR_EPV*);
-RPC_STATUS RPC_ENTRY RpcServerRegisterIfEx(RPC_IF_HANDLE,UUID*,RPC_MGR_EPV*,unsigned int,unsigned int,RPC_IF_CALLBACK_FN*);
-RPC_STATUS RPC_ENTRY RpcServerUnregisterIf(RPC_IF_HANDLE,UUID*,unsigned int);
-RPC_STATUS RPC_ENTRY RpcServerUseAllProtseqs(unsigned int,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseAllProtseqsEx(unsigned int,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcServerUseAllProtseqsIf(unsigned int,RPC_IF_HANDLE,void*);
-RPC_STATUS RPC_ENTRY RpcServerUseAllProtseqsIfEx(unsigned int,RPC_IF_HANDLE,void*,PRPC_POLICY);
-RPC_STATUS RPC_ENTRY RpcMgmtStatsVectorFree(RPC_STATS_VECTOR**);
-RPC_STATUS RPC_ENTRY RpcMgmtInqStats(RPC_BINDING_HANDLE,RPC_STATS_VECTOR**);
-RPC_STATUS RPC_ENTRY RpcMgmtIsServerListening(RPC_BINDING_HANDLE);
-RPC_STATUS RPC_ENTRY RpcMgmtStopServerListening(RPC_BINDING_HANDLE);
-RPC_STATUS RPC_ENTRY RpcMgmtWaitServerListen(void);
-RPC_STATUS RPC_ENTRY RpcMgmtSetServerStackSize(unsigned long);
-void RPC_ENTRY RpcSsDontSerializeContext(void);
-RPC_STATUS RPC_ENTRY RpcMgmtEnableIdleCleanup(void);
-RPC_STATUS RPC_ENTRY RpcMgmtInqIfIds(RPC_BINDING_HANDLE,RPC_IF_ID_VECTOR**);
-RPC_STATUS RPC_ENTRY RpcIfIdVectorFree(RPC_IF_ID_VECTOR**);
-RPC_STATUS RPC_ENTRY RpcEpResolveBinding(RPC_BINDING_HANDLE,RPC_IF_HANDLE);
-RPC_STATUS RPC_ENTRY RpcBindingServerFromClient(RPC_BINDING_HANDLE,RPC_BINDING_HANDLE*);
-DECLSPEC_NORETURN void  RPC_ENTRY RpcRaiseException(RPC_STATUS);
-RPC_STATUS RPC_ENTRY RpcTestCancel(void);
-RPC_STATUS RPC_ENTRY RpcCancelThread(void*);
-RPC_STATUS RPC_ENTRY UuidCreate(UUID*);
-signed int RPC_ENTRY UuidCompare(UUID*,UUID*, RPC_STATUS*);
-RPC_STATUS RPC_ENTRY UuidCreateNil(UUID*);
-int RPC_ENTRY UuidEqual(UUID*,UUID*, RPC_STATUS*);
-unsigned short RPC_ENTRY UuidHash(UUID*,RPC_STATUS*);
-int RPC_ENTRY UuidIsNil(UUID*,RPC_STATUS*);
-RPC_STATUS RPC_ENTRY RpcEpUnregister(RPC_IF_HANDLE,RPC_BINDING_VECTOR*,UUID_VECTOR*);
-RPC_STATUS RPC_ENTRY RpcMgmtEpEltInqBegin(RPC_BINDING_HANDLE,unsigned long,RPC_IF_ID*,unsigned long,UUID*,RPC_EP_INQ_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcMgmtEpEltInqDone(RPC_EP_INQ_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcMgmtEpUnregister(RPC_BINDING_HANDLE,RPC_IF_ID*,RPC_BINDING_HANDLE,UUID*);
-RPC_STATUS RPC_ENTRY RpcMgmtSetAuthorizationFn(RPC_MGMT_AUTHORIZATION_FN);
-RPC_STATUS RPC_ENTRY RpcMgmtInqParameter(unsigned int,unsigned long*);
-RPC_STATUS RPC_ENTRY RpcMgmtSetParameter(unsigned int,unsigned long);
-RPC_STATUS RPC_ENTRY RpcMgmtBindingInqParameter(RPC_BINDING_HANDLE,unsigned int,unsigned long*);
-RPC_STATUS RPC_ENTRY RpcMgmtBindingSetParameter(RPC_BINDING_HANDLE,unsigned int,unsigned long);
-
-#if _WIN32_WINNT >= 0x0500
-RPC_STATUS RPC_ENTRY UuidCreateSequential(UUID*);
-#endif
-
-#include <rpcdcep.h>
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/rpcdce2.h b/winsup/w32api/include/rpcdce2.h
deleted file mode 100644
index 4d065f189..000000000
--- a/winsup/w32api/include/rpcdce2.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef _RPCDCE2_H
-#define _RPCDCE2_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <rpcdce.h>
-
-#define RPC_C_EP_ALL_ELTS 0
-#define RPC_C_EP_MATCH_BY_IF 1
-#define RPC_C_EP_MATCH_BY_OBJ 2
-#define RPC_C_EP_MATCH_BY_BOTH 3
-#define RPC_C_VERS_ALL 1
-#define RPC_C_VERS_COMPATIBLE 2
-#define RPC_C_VERS_EXACT 3
-#define RPC_C_VERS_MAJOR_ONLY 4
-#define RPC_C_VERS_UPTO 5
-#define DCE_C_ERROR_STRING_LEN 256
-#define RPC_C_MGMT_INQ_IF_IDS 0
-#define RPC_C_MGMT_INQ_PRINC_NAME 1
-#define RPC_C_MGMT_INQ_STATS 2
-#define RPC_C_MGMT_IS_SERVER_LISTEN 3
-#define RPC_C_MGMT_STOP_SERVER_LISTEN 4
-
-int RPC_ENTRY UuidCompare(UUID*,UUID*,RPC_STATUS*);
-RPC_STATUS RPC_ENTRY UuidCreateNil(UUID*);
-int RPC_ENTRY UuidEqual(UUID*,UUID*,RPC_STATUS*);
-unsigned short RPC_ENTRY UuidHash(UUID*,RPC_STATUS*);
-int RPC_ENTRY UuidIsNil(UUID*,RPC_STATUS*);
-#ifdef RPC_UNICODE_SUPPORTED
-RPC_STATUS RPC_ENTRY DceErrorInqTextA(RPC_STATUS,unsigned char*);
-RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcMgmtEpEltInqNextA(RPC_EP_INQ_HANDLE,RPC_IF_ID*,RPC_BINDING_HANDLE*,UUID*,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcMgmtEpEltInqNextW(RPC_EP_INQ_HANDLE,RPC_IF_ID*,RPC_BINDING_HANDLE*,UUID*,unsigned short**);
-#ifdef UNICODE
-#define RpcMgmtEpEltInqNext RpcMgmtEpEltInqNextW
-#define DceErrorInqText DceErrorInqTextW
-#else
-#define RpcMgmtEpEltInqNext RpcMgmtEpEltInqNextA
-#define DceErrorInqText DceErrorInqTextA
-#endif /* UNICODE */
-#else /* RPC_UNICODE_SUPPORTED */
-RPC_STATUS RPC_ENTRY DceErrorInqText(RPC_STATUS,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcMgmtEpEltInqNext(RPC_EP_INQ_HANDLE,RPC_IF_ID*,RPC_BINDING_HANDLE*,UUID*,unsigned char**);
-#endif
-RPC_STATUS RPC_ENTRY RpcMgmtEpEltInqBegin(RPC_BINDING_HANDLE,unsigned long,RPC_IF_ID*,unsigned long,UUID*,RPC_EP_INQ_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcMgmtEpEltInqDone(RPC_EP_INQ_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcMgmtEpUnregister(RPC_BINDING_HANDLE,RPC_IF_ID*,RPC_BINDING_HANDLE,UUID*);
-RPC_STATUS RPC_ENTRY RpcMgmtSetAuthorizationFn(RPC_MGMT_AUTHORIZATION_FN);
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/rpcdcep.h b/winsup/w32api/include/rpcdcep.h
deleted file mode 100644
index c45bc4690..000000000
--- a/winsup/w32api/include/rpcdcep.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef _RPCDCEP_H
-#define _RPCDCEP_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define RPC_NCA_FLAGS_DEFAULT 0
-#define RPC_NCA_FLAGS_IDEMPOTENT 1
-#define RPC_NCA_FLAGS_BROADCAST 2
-#define RPC_NCA_FLAGS_MAYBE 4
-#define RPCFLG_ASYNCHRONOUS 0x40000000
-#define RPCFLG_INPUT_SYNCHRONOUS 0x20000000
-#define RPC_FLAGS_VALID_BIT 0x8000
-#define TRANSPORT_TYPE_CN 1
-#define TRANSPORT_TYPE_DG 2
-#define TRANSPORT_TYPE_LPC 4
-#define TRANSPORT_TYPE_WMSG 8
-
-typedef struct _RPC_VERSION {
-	unsigned short MajorVersion;
-	unsigned short MinorVersion;
-} RPC_VERSION;
-typedef struct _RPC_SYNTAX_IDENTIFIER {
-	GUID SyntaxGUID;
-	RPC_VERSION SyntaxVersion;
-} RPC_SYNTAX_IDENTIFIER, *PRPC_SYNTAX_IDENTIFIER;
-typedef struct _RPC_MESSAGE {
-	HANDLE Handle;
-	unsigned long DataRepresentation;
-	void *Buffer;
-	unsigned int BufferLength;
-	unsigned int ProcNum;
-	PRPC_SYNTAX_IDENTIFIER TransferSyntax;
-	void *RpcInterfaceInformation;
-	void *ReservedForRuntime;
-	void *ManagerEpv;
-	void *ImportContext;
-	unsigned long RpcFlags;
-} RPC_MESSAGE,*PRPC_MESSAGE;
-typedef long __stdcall RPC_FORWARD_FUNCTION(GUID*,RPC_VERSION*,GUID*,unsigned char*,void**);
-typedef void(__stdcall *RPC_DISPATCH_FUNCTION) ( PRPC_MESSAGE Message);
-typedef struct {
-	unsigned int DispatchTableCount;
-	RPC_DISPATCH_FUNCTION *DispatchTable;
-	int Reserved;
-} RPC_DISPATCH_TABLE,*PRPC_DISPATCH_TABLE;
-typedef struct _RPC_PROTSEQ_ENDPOINT {
-	unsigned char *RpcProtocolSequence;
-	unsigned char *Endpoint;
-} RPC_PROTSEQ_ENDPOINT,*PRPC_PROTSEQ_ENDPOINT;
-typedef struct _RPC_SERVER_INTERFACE {
-	unsigned int Length;
-	RPC_SYNTAX_IDENTIFIER InterfaceId;
-	RPC_SYNTAX_IDENTIFIER TransferSyntax;
-	PRPC_DISPATCH_TABLE DispatchTable;
-	unsigned int RpcProtseqEndpointCount;
-	PRPC_PROTSEQ_ENDPOINT RpcProtseqEndpoint;
-	void *DefaultManagerEpv;
-	void const *InterpreterInfo;
-} RPC_SERVER_INTERFACE,*PRPC_SERVER_INTERFACE;
-typedef struct _RPC_CLIENT_INTERFACE {
-	unsigned int Length;
-	RPC_SYNTAX_IDENTIFIER InterfaceId;
-	RPC_SYNTAX_IDENTIFIER TransferSyntax;
-	PRPC_DISPATCH_TABLE DispatchTable;
-	unsigned int RpcProtseqEndpointCount;
-	PRPC_PROTSEQ_ENDPOINT RpcProtseqEndpoint;
-	unsigned long Reserved;
-	void const *InterpreterInfo;
-} RPC_CLIENT_INTERFACE,*PRPC_CLIENT_INTERFACE;
-typedef void *I_RPC_MUTEX;
-typedef struct _RPC_TRANSFER_SYNTAX {
-	GUID Uuid;
-	unsigned short VersMajor;
-	unsigned short VersMinor;
-} RPC_TRANSFER_SYNTAX;
-typedef long(__stdcall *RPC_BLOCKING_FUNCTION)(void*,void*);
-
-long __stdcall I_RpcGetBuffer(RPC_MESSAGE*);
-long __stdcall I_RpcSendReceive(RPC_MESSAGE*);
-long __stdcall I_RpcFreeBuffer(RPC_MESSAGE*);
-void __stdcall I_RpcRequestMutex(I_RPC_MUTEX*);
-void __stdcall I_RpcClearMutex(I_RPC_MUTEX);
-void __stdcall I_RpcDeleteMutex(I_RPC_MUTEX);
-DECLARE_STDCALL_P(void *) I_RpcAllocate(unsigned int);
-void __stdcall I_RpcFree(void*);
-void __stdcall I_RpcPauseExecution(unsigned long);
-typedef void(__stdcall *PRPC_RUNDOWN) (void*);
-long __stdcall I_RpcMonitorAssociation(HANDLE,PRPC_RUNDOWN,void*);
-long __stdcall I_RpcStopMonitorAssociation(HANDLE);
-HANDLE __stdcall I_RpcGetCurrentCallHandle(void);
-long __stdcall I_RpcGetAssociationContext(void**);
-long __stdcall I_RpcSetAssociationContext(void*);
-#ifdef __RPC_NT__
-long __stdcall I_RpcNsBindingSetEntryName(HANDLE,unsigned long,unsigned short*);
-long __stdcall I_RpcBindingInqDynamicEndpoint(HANDLE, unsigned short**);
-#else
-long __stdcall I_RpcNsBindingSetEntryName(HANDLE,unsigned long,unsigned char*);
-long __stdcall I_RpcBindingInqDynamicEndpoint(HANDLE,unsigned char**);
-#endif
-long __stdcall I_RpcBindingInqTransportType(HANDLE,unsigned int*);
-long __stdcall I_RpcIfInqTransferSyntaxes(HANDLE,RPC_TRANSFER_SYNTAX*,unsigned int,unsigned int*);
-long __stdcall I_UuidCreate(GUID*);
-long __stdcall I_RpcBindingCopy(HANDLE,HANDLE*);
-long __stdcall I_RpcBindingIsClientLocal(HANDLE,unsigned int*);
-void __stdcall I_RpcSsDontSerializeContext(void);
-long __stdcall I_RpcServerRegisterForwardFunction(RPC_FORWARD_FUNCTION*);
-long __stdcall I_RpcConnectionInqSockBuffSize(unsigned long*,unsigned long*);
-long __stdcall I_RpcConnectionSetSockBuffSize(unsigned long,unsigned long);
-long __stdcall I_RpcBindingSetAsync(HANDLE,RPC_BLOCKING_FUNCTION);
-long __stdcall I_RpcAsyncSendReceive(RPC_MESSAGE*,void*);
-long __stdcall I_RpcGetThreadWindowHandle(void**);
-long __stdcall I_RpcServerThreadPauseListening(void);
-long __stdcall I_RpcServerThreadContinueListening(void);
-long __stdcall I_RpcServerUnregisterEndpointA(unsigned char*,unsigned char*);
-long __stdcall I_RpcServerUnregisterEndpointW(unsigned short*,unsigned short*);
-#ifdef UNICODE
-#define I_RpcServerUnregisterEndpoint I_RpcServerUnregisterEndpointW
-#else
-#define I_RpcServerUnregisterEndpoint I_RpcServerUnregisterEndpointA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/rpcndr.h b/winsup/w32api/include/rpcndr.h
deleted file mode 100644
index 8b728bbb5..000000000
--- a/winsup/w32api/include/rpcndr.h
+++ /dev/null
@@ -1,473 +0,0 @@
-#ifndef __RPCNDR_H__
-#define __RPCNDR_H__
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifndef __RPCNDR_H_VERSION__
-#define __RPCNDR_H_VERSION__        ( 450 )
-#endif /* __RPCNDR_H_VERSION__ */
-#include <rpcnsip.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <objfwd.h>
-#define DECLSPEC_UUID(x)
-#define MIDL_INTERFACE(x) struct
-#define NDR_CHAR_REP_MASK (unsigned long)0xFL
-#define NDR_INT_REP_MASK (unsigned long)0xF0L
-#define NDR_FLOAT_REP_MASK (unsigned long)0xFF00L
-#define NDR_LITTLE_ENDIAN (unsigned long)0x10L
-#define NDR_BIG_ENDIAN (unsigned long)0
-#define NDR_IEEE_FLOAT (unsigned long)0
-#define NDR_VAX_FLOAT (unsigned long)0x100L
-#define NDR_ASCII_CHAR (unsigned long)0
-#define NDR_EBCDIC_CHAR (unsigned long)1
-#define NDR_LOCAL_DATA_REPRESENTATION (unsigned long)0x10L
-#define NDR_LOCAL_ENDIAN NDR_LITTLE_ENDIAN
-#define __RPC_CALLEE __stdcall
-#ifndef __MIDL_USER_DEFINED
-#define midl_user_allocate MIDL_user_allocate
-#define midl_user_free MIDL_user_free
-#define __MIDL_USER_DEFINED
-#endif
-#define RPC_VAR_ENTRY __cdecl
-#ifdef _M_IX86
-#define __MIDL_DECLSPEC_DLLIMPORT __declspec(dllimport)
-#define __MIDL_DECLSPEC_DLLEXPORT __declspec(dllexport)
-#else
-#define __MIDL_DECLSPEC_DLLIMPORT
-#define __MIDL_DECLSPEC_DLLEXPORT
-#endif
-#if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64)
-#define hyper __int64
-#define MIDL_uhyper unsigned __int64
-#else
-#define hyper double
-#define MIDL_uhyper double
-#endif
-#define small char
-typedef unsigned char byte;
-#define NDRSContextValue(hContext) (&(hContext)->userContext)
-#define cbNDRContext 20
-#define byte_from_ndr(source, target) { *(target) = *(*(char**)&(source)->Buffer)++; }
-#define byte_array_from_ndr(Source, LowerIndex, UpperIndex, Target) { NDRcopy ((((char *)(Target))+(LowerIndex)), (Source)->Buffer, (unsigned int)((UpperIndex)-(LowerIndex))); *(unsigned long *)&(Source)->Buffer += ((UpperIndex)-(LowerIndex)); }
-#define boolean_from_ndr(source, target) { *(target) = *(*(char**)&(source)->Buffer)++; }
-#define boolean_array_from_ndr(Source, LowerIndex, UpperIndex, Target) { NDRcopy ((((char *)(Target))+(LowerIndex)), (Source)->Buffer, (unsigned int)((UpperIndex)-(LowerIndex))); *(unsigned long *)&(Source)->Buffer += ((UpperIndex)-(LowerIndex)); }
-#define small_from_ndr(source, target) { *(target) = *(*(char**)&(source)->Buffer)++; }
-#define small_from_ndr_temp(source, target, format) { *(target) = *(*(char**)(source))++; }
-#define small_array_from_ndr(Source, LowerIndex, UpperIndex, Target) { NDRcopy ((((char *)(Target))+(LowerIndex)), (Source)->Buffer, (unsigned int)((UpperIndex)-(LowerIndex))); *(unsigned long *)&(Source)->Buffer += ((UpperIndex)-(LowerIndex)); }
-#define MIDL_ascii_strlen(string) strlen(string)
-#define MIDL_ascii_strcpy(target,source) strcpy(target,source)
-#define MIDL_memset(s,c,n) memset(s,c,n)
-#define _midl_ma1( p, cast ) *(*( cast **)&p)++
-#define _midl_ma2( p, cast ) *(*( cast **)&p)++
-#define _midl_ma4( p, cast ) *(*( cast **)&p)++
-#define _midl_ma8( p, cast ) *(*( cast **)&p)++
-#define _midl_unma1( p, cast ) *(( cast *)p)++
-#define _midl_unma2( p, cast ) *(( cast *)p)++
-#define _midl_unma3( p, cast ) *(( cast *)p)++
-#define _midl_unma4( p, cast ) *(( cast *)p)++
-#define _midl_fa2( p ) (p = (RPC_BUFPTR )((unsigned long)(p+1) & 0xfffffffe))
-#define _midl_fa4( p ) (p = (RPC_BUFPTR )((unsigned long)(p+3) & 0xfffffffc))
-#define _midl_fa8( p ) (p = (RPC_BUFPTR )((unsigned long)(p+7) & 0xfffffff8))
-#define _midl_addp( p, n ) (p += n)
-#define _midl_marsh_lhs( p, cast ) *(*( cast **)&p)++
-#define _midl_marsh_up( mp, p ) *(*(unsigned long **)&mp)++ = (unsigned long)p
-#define _midl_advmp( mp ) *(*(unsigned long **)&mp)++
-#define _midl_unmarsh_up( p ) (*(*(unsigned long **)&p)++)
-#define NdrMarshConfStringHdr( p, s, l ) (_midl_ma4( p, unsigned long) = s, _midl_ma4( p, unsigned long) = 0, _midl_ma4( p, unsigned long) = l)
-#define NdrUnMarshConfStringHdr(p, s, l) ((s=_midl_unma4(p,unsigned long), (_midl_addp(p,4)), (l=_midl_unma4(p,unsigned long))
-#define NdrMarshCCtxtHdl(pc,p) (NDRCContextMarshall( (NDR_CCONTEXT)pc, p ),p+20)
-#define NdrUnMarshCCtxtHdl(pc,p,h,drep) (NDRCContextUnmarshall((NDR_CONTEXT)pc,h,p,drep), p+20)
-#define NdrUnMarshSCtxtHdl(pc, p,drep) (pc = NdrSContextUnMarshall(p,drep ))
-#define NdrMarshSCtxtHdl(pc,p,rd) (NdrSContextMarshall((NDR_SCONTEXT)pc,p, (NDR_RUNDOWN)rd)
-#define NdrFieldOffset(s,f) (long)(& (((s *)0)->f))
-#define NdrFieldPad(s,f,p,t) (NdrFieldOffset(s,f) - NdrFieldOffset(s,p) - sizeof(t))
-#define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)(s >> 8)
-#define NdrFcLong(s) (unsigned char)(s & 0xff), (unsigned char)((s & 0x0000ff00) >> 8), (unsigned char)((s & 0x00ff0000) >> 16), (unsigned char)(s >> 24)
-#ifdef CONST_VTABLE
-#define CONST_VTBL const
-#else
-#define CONST_VTBL
-#endif
-typedef void *NDR_CCONTEXT;
-typedef struct {
-	void *pad[2];
-	void *userContext;
-} *NDR_SCONTEXT;
-typedef void (__RPC_USER *NDR_RUNDOWN)(void*);
-typedef struct _SCONTEXT_QUEUE {
-	unsigned long NumberOfObjects;
-	NDR_SCONTEXT *ArrayOfObjects;
-} SCONTEXT_QUEUE,*PSCONTEXT_QUEUE;
-struct _MIDL_STUB_MESSAGE;
-struct _MIDL_STUB_DESC;
-struct _FULL_PTR_XLAT_TABLES;
-typedef unsigned char *RPC_BUFPTR;
-typedef unsigned long RPC_LENGTH;
-typedef void(__RPC_USER *EXPR_EVAL)(struct _MIDL_STUB_MESSAGE*);
-typedef const unsigned char *PFORMAT_STRING;
-typedef struct {
-	long Dimension;
-	unsigned long *BufferConformanceMark;
-	unsigned long *BufferVarianceMark;
-	unsigned long *MaxCountArray;
-	unsigned long *OffsetArray;
-	unsigned long *ActualCountArray;
-} ARRAY_INFO,*PARRAY_INFO;
-
-RPC_BINDING_HANDLE RPC_ENTRY NDRCContextBinding(NDR_CCONTEXT);
-void RPC_ENTRY NDRCContextMarshall(NDR_CCONTEXT,void*);
-void RPC_ENTRY NDRCContextUnmarshall(NDR_CCONTEXT*,RPC_BINDING_HANDLE,void*,unsigned long);
-void RPC_ENTRY NDRSContextMarshall(NDR_SCONTEXT,void*,NDR_RUNDOWN);
-NDR_SCONTEXT RPC_ENTRY NDRSContextUnmarshall(void*pBuff,unsigned long);
-void RPC_ENTRY RpcSsDestroyClientContext(void**);
-void RPC_ENTRY NDRcopy(void*,void*,unsigned int);
-unsigned int RPC_ENTRY MIDL_wchar_strlen(wchar_t*);
-void RPC_ENTRY MIDL_wchar_strcpy(void*,wchar_t*);
-void RPC_ENTRY char_from_ndr(PRPC_MESSAGE,unsigned char*);
-void RPC_ENTRY char_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,unsigned char*);
-void RPC_ENTRY short_from_ndr(PRPC_MESSAGE,unsigned short*);
-void RPC_ENTRY short_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,unsigned short*);
-void RPC_ENTRY short_from_ndr_temp(unsigned char**,unsigned short*,unsigned long);
-void RPC_ENTRY long_from_ndr(PRPC_MESSAGE,unsigned long*);
-void RPC_ENTRY long_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,unsigned long*);
-void RPC_ENTRY long_from_ndr_temp(unsigned char**,unsigned long*,unsigned long);
-void RPC_ENTRY enum_from_ndr(PRPC_MESSAGE,unsigned int*);
-void RPC_ENTRY float_from_ndr(PRPC_MESSAGE,void*);
-void RPC_ENTRY float_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,void*);
-void RPC_ENTRY double_from_ndr(PRPC_MESSAGE,void*);
-void RPC_ENTRY double_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,void*);
-void RPC_ENTRY hyper_from_ndr(PRPC_MESSAGE,hyper*);
-void RPC_ENTRY hyper_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,hyper*);
-void RPC_ENTRY hyper_from_ndr_temp(unsigned char**,hyper*,unsigned long);
-void RPC_ENTRY data_from_ndr(PRPC_MESSAGE,void*,char*,unsigned char);
-void RPC_ENTRY data_into_ndr(void*,PRPC_MESSAGE,char*,unsigned char);
-void RPC_ENTRY tree_into_ndr(void*,PRPC_MESSAGE,char*,unsigned char);
-void RPC_ENTRY data_size_ndr(void*,PRPC_MESSAGE,char*,unsigned char);
-void RPC_ENTRY tree_size_ndr(void*,PRPC_MESSAGE,char*,unsigned char);
-void RPC_ENTRY tree_peek_ndr(PRPC_MESSAGE,unsigned char**,char*,unsigned char);
-void *RPC_ENTRY midl_allocate(int);
-
-#pragma pack(push,4)
-typedef struct _MIDL_STUB_MESSAGE {
-	PRPC_MESSAGE RpcMsg;
-	unsigned char *Buffer;
-	unsigned char *BufferStart;
-	unsigned char *BufferEnd;
-	unsigned char *BufferMark;
-	unsigned long BufferLength;
-	unsigned long MemorySize;
-	unsigned char *Memory;
-	int IsClient;
-	int ReuseBuffer;
-	unsigned char *AllocAllNodesMemory;
-	unsigned char *AllocAllNodesMemoryEnd;
-	int IgnoreEmbeddedPointers;
-	unsigned char *PointerBufferMark;
-	unsigned char fBufferValid;
-	unsigned char Unused;
-	unsigned long MaxCount;
-	unsigned long Offset;
-	unsigned long ActualCount;
-	void*(__RPC_API *pfnAllocate)(unsigned int);
-	void(__RPC_API *pfnFree)(void*);
-	unsigned char *StackTop;
-	unsigned char *pPresentedType;
-	unsigned char *pTransmitType;
-	handle_t SavedHandle;
-	const struct _MIDL_STUB_DESC *StubDesc;
-	struct _FULL_PTR_XLAT_TABLES *FullPtrXlatTables;
-	unsigned long FullPtrRefId;
-	int fCheckBounds;
-	int fInDontFree :1;
-	int fDontCallFreeInst :1;
-	int fInOnlyParam :1;
-	int fHasReturn :1;
-	unsigned long dwDestContext;
-	void*pvDestContext;
-	NDR_SCONTEXT *SavedContextHandles;
-	long ParamNumber;
-	struct IRpcChannelBuffer *pRpcChannelBuffer;
-	PARRAY_INFO pArrayInfo;
-	unsigned long *SizePtrCountArray;
-	unsigned long *SizePtrOffsetArray;
-	unsigned long *SizePtrLengthArray;
-	void*pArgQueue;
-	unsigned long dwStubPhase;
-	unsigned long Reserved[5];
-} MIDL_STUB_MESSAGE,*PMIDL_STUB_MESSAGE;
-#pragma pack(pop)
-typedef void*(__RPC_API *GENERIC_BINDING_ROUTINE)(void*);
-typedef void (__RPC_API *GENERIC_UNBIND_ROUTINE)(void*,unsigned char*);
-typedef struct _GENERIC_BINDING_ROUTINE_PAIR {
-	GENERIC_BINDING_ROUTINE pfnBind;
-	GENERIC_UNBIND_ROUTINE pfnUnbind;
-} GENERIC_BINDING_ROUTINE_PAIR,*PGENERIC_BINDING_ROUTINE_PAIR;
-typedef struct __GENERIC_BINDING_INFO {
-	void *pObj;
-	unsigned int Size;
-	GENERIC_BINDING_ROUTINE pfnBind;
-	GENERIC_UNBIND_ROUTINE pfnUnbind;
-} GENERIC_BINDING_INFO,*PGENERIC_BINDING_INFO;
-typedef void(__RPC_USER *XMIT_HELPER_ROUTINE)(PMIDL_STUB_MESSAGE);
-typedef struct _XMIT_ROUTINE_QUINTUPLE {
-	XMIT_HELPER_ROUTINE pfnTranslateToXmit;
-	XMIT_HELPER_ROUTINE pfnTranslateFromXmit;
-	XMIT_HELPER_ROUTINE pfnFreeXmit;
-	XMIT_HELPER_ROUTINE pfnFreeInst;
-} XMIT_ROUTINE_QUINTUPLE,*PXMIT_ROUTINE_QUINTUPLE;
-typedef struct _MALLOC_FREE_STRUCT {
-void*(__RPC_USER *pfnAllocate)(unsigned int);
-void(__RPC_USER *pfnFree)(void*);
-} MALLOC_FREE_STRUCT;
-typedef struct _COMM_FAULT_OFFSETS {
-	short CommOffset;
-	short FaultOffset;
-} COMM_FAULT_OFFSETS;
-typedef struct _MIDL_STUB_DESC {
-	void*RpcInterfaceInformation;
-	void*(__RPC_API *pfnAllocate)(unsigned int);
-	void(__RPC_API *pfnFree)(void*);
-	union {
-		handle_t *pAutoHandle;
-		handle_t *pPrimitiveHandle;
-		PGENERIC_BINDING_INFO pGenericBindingInfo;
-	} IMPLICIT_HANDLE_INFO;
-	const NDR_RUNDOWN *apfnNdrRundownRoutines;
-	const GENERIC_BINDING_ROUTINE_PAIR *aGenericBindingRoutinePairs;
-	const EXPR_EVAL *apfnExprEval;
-	const XMIT_ROUTINE_QUINTUPLE *aXmitQuintuple;
-	const unsigned char *pFormatTypes;
-	int fCheckBounds;
-	unsigned long Version;
-	MALLOC_FREE_STRUCT *pMallocFreeStruct;
-	long MIDLVersion;
-	const COMM_FAULT_OFFSETS *CommFaultOffsets;
-} MIDL_STUB_DESC;
-typedef const MIDL_STUB_DESC *PMIDL_STUB_DESC;
-typedef void*PMIDL_XMIT_TYPE;
-typedef struct _MIDL_FORMAT_STRING {
-	short Pad;
-	unsigned char Format[1];
-} MIDL_FORMAT_STRING;
-typedef void(__RPC_API *STUB_THUNK)(PMIDL_STUB_MESSAGE);
-typedef long(__RPC_API *SERVER_ROUTINE)(void);
-typedef struct _MIDL_SERVER_INFO_ {
-	PMIDL_STUB_DESC pStubDesc;
-	const SERVER_ROUTINE *DispatchTable;
-	PFORMAT_STRING ProcString;
-	const unsigned short *FmtStringOffset;
-	const STUB_THUNK *ThunkTable;
-} MIDL_SERVER_INFO,*PMIDL_SERVER_INFO;
-typedef struct _MIDL_STUBLESS_PROXY_INFO {
-	PMIDL_STUB_DESC pStubDesc;
-	PFORMAT_STRING ProcFormatString;
-	const unsigned short *FormatStringOffset;
-} MIDL_STUBLESS_PROXY_INFO;
-typedef MIDL_STUBLESS_PROXY_INFO *PMIDL_STUBLESS_PROXY_INFO;
-typedef union _CLIENT_CALL_RETURN {
-	void *Pointer;
-	long Simple;
-} CLIENT_CALL_RETURN;
-typedef enum { XLAT_SERVER = 1,XLAT_CLIENT } XLAT_SIDE;
-typedef struct _FULL_PTR_TO_REFID_ELEMENT {
-	struct _FULL_PTR_TO_REFID_ELEMENT *Next;
-	void*Pointer;
-	unsigned long RefId;
-	unsigned char State;
-} FULL_PTR_TO_REFID_ELEMENT,*PFULL_PTR_TO_REFID_ELEMENT;
-typedef struct _FULL_PTR_XLAT_TABLES {
-	struct {
-		void **XlatTable;
-		unsigned char *StateTable;
-		unsigned long NumberOfEntries;
-	} RefIdToPointer;
-	struct {
-		PFULL_PTR_TO_REFID_ELEMENT *XlatTable;
-		unsigned long NumberOfBuckets;
-		unsigned long HashMask;
-	} PointerToRefId;
-	unsigned long NextRefId;
-	XLAT_SIDE XlatSide;
-} FULL_PTR_XLAT_TABLES,*PFULL_PTR_XLAT_TABLES;
-void RPC_ENTRY NdrSimpleTypeMarshall(PMIDL_STUB_MESSAGE,unsigned char*,unsigned char);
-unsigned char *RPC_ENTRY NdrPointerMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING pFormat);
-unsigned char *RPC_ENTRY NdrSimpleStructMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrConformantStructMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrConformantVaryingStructMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrHardStructMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrComplexStructMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrFixedArrayMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrConformantArrayMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrConformantVaryingArrayMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrVaryingArrayMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrConformantStringMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrNonEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrByteCountPointerMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrXmitOrRepAsMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned char *RPC_ENTRY NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrClientContextMarshall(PMIDL_STUB_MESSAGE,NDR_CCONTEXT,int);
-void RPC_ENTRY NdrServerContextMarshall(PMIDL_STUB_MESSAGE,NDR_SCONTEXT,NDR_RUNDOWN);
-void RPC_ENTRY NdrSimpleTypeUnmarshall(PMIDL_STUB_MESSAGE,unsigned char*,unsigned char);
-unsigned char *RPC_ENTRY NdrPointerUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrHardStructUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrConformantVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrConformantStringUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrByteCountPointerUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrXmitOrRepAsUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-unsigned char *RPC_ENTRY NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE,unsigned char**,PFORMAT_STRING,unsigned char);
-void RPC_ENTRY NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE,NDR_CCONTEXT*,RPC_BINDING_HANDLE);
-NDR_SCONTEXT RPC_ENTRY NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE);
-void RPC_ENTRY NdrPointerBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrSimpleStructBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrConformantStructBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrConformantVaryingStructBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrHardStructBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrComplexStructBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrFixedArrayBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrConformantArrayBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrConformantVaryingArrayBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrVaryingArrayBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrConformantStringBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrNonEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrByteCountPointerBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrXmitOrRepAsBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrContextHandleSize(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrPointerMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrSimpleStructMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrConformantStructMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrConformantVaryingStructMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrHardStructMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrComplexStructMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrFixedArrayMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrConformantArrayMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrConformantVaryingArrayMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrVaryingArrayMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrConformantStringMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrXmitOrRepAsMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-unsigned long RPC_ENTRY NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-void RPC_ENTRY NdrPointerFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrSimpleStructFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrConformantStructFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrHardStructFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrComplexStructFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrFixedArrayFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrConformantArrayFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrConformantVaryingArrayFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrVaryingArrayFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrComplexArrayFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrNonEncapsulatedUnionFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrByteCountPointerFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrInterfacePointerFree(PMIDL_STUB_MESSAGE,unsigned char*,PFORMAT_STRING);
-void RPC_ENTRY NdrConvert(PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-void RPC_ENTRY NdrClientInitializeNew(PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC,unsigned int);
-unsigned char *RPC_ENTRY NdrServerInitializeNew(PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC);
-void RPC_ENTRY NdrClientInitialize(PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC,unsigned int);
-unsigned char *RPC_ENTRY NdrServerInitialize(PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC);
-unsigned char *RPC_ENTRY NdrServerInitializeUnmarshall(PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC,PRPC_MESSAGE);
-void RPC_ENTRY NdrServerInitializeMarshall(PRPC_MESSAGE,PMIDL_STUB_MESSAGE);
-unsigned char *RPC_ENTRY NdrGetBuffer(PMIDL_STUB_MESSAGE,unsigned long,RPC_BINDING_HANDLE);
-unsigned char *RPC_ENTRY NdrNsGetBuffer(PMIDL_STUB_MESSAGE,unsigned long,RPC_BINDING_HANDLE);
-unsigned char *RPC_ENTRY NdrSendReceive(PMIDL_STUB_MESSAGE,unsigned char*);
-unsigned char *RPC_ENTRY NdrNsSendReceive(PMIDL_STUB_MESSAGE,unsigned char*,RPC_BINDING_HANDLE*);
-void RPC_ENTRY NdrFreeBuffer(PMIDL_STUB_MESSAGE);
-CLIENT_CALL_RETURN RPC_VAR_ENTRY NdrClientCall(PMIDL_STUB_DESC,PFORMAT_STRING,...);
-typedef enum {
-	STUB_UNMARSHAL,
-	STUB_CALL_SERVER,
-	STUB_MARSHAL,
-	STUB_CALL_SERVER_NO_HRESULT
-} STUB_PHASE;
-typedef enum {
-	PROXY_CALCSIZE,
-	PROXY_GETBUFFER,
-	PROXY_MARSHAL,
-	PROXY_SENDRECEIVE,
-	PROXY_UNMARSHAL
-} PROXY_PHASE;
-long RPC_ENTRY NdrStubCall(struct IRpcStubBuffer*,struct IRpcChannelBuffer*,PRPC_MESSAGE,unsigned long*);
-void RPC_ENTRY NdrServerCall(PRPC_MESSAGE);
-int RPC_ENTRY NdrServerUnmarshall(struct IRpcChannelBuffer*,PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC,PFORMAT_STRING,void*);
-void RPC_ENTRY NdrServerMarshall(struct IRpcStubBuffer*,struct IRpcChannelBuffer*,PMIDL_STUB_MESSAGE,PFORMAT_STRING);
-RPC_STATUS RPC_ENTRY NdrMapCommAndFaultStatus(PMIDL_STUB_MESSAGE,unsigned long*,unsigned long*,RPC_STATUS);
-int RPC_ENTRY NdrSH_UPDecision(PMIDL_STUB_MESSAGE,unsigned char**,RPC_BUFPTR);
-int RPC_ENTRY NdrSH_TLUPDecision(PMIDL_STUB_MESSAGE,unsigned char**);
-int RPC_ENTRY NdrSH_TLUPDecisionBuffer(PMIDL_STUB_MESSAGE,unsigned char**);
-int RPC_ENTRY NdrSH_IfAlloc(PMIDL_STUB_MESSAGE,unsigned char**,unsigned long);
-int RPC_ENTRY NdrSH_IfAllocRef(PMIDL_STUB_MESSAGE,unsigned char**,unsigned long);
-int RPC_ENTRY NdrSH_IfAllocSet(PMIDL_STUB_MESSAGE,unsigned char**,unsigned long);
-RPC_BUFPTR RPC_ENTRY NdrSH_IfCopy(PMIDL_STUB_MESSAGE,unsigned char**,unsigned long);
-RPC_BUFPTR RPC_ENTRY NdrSH_IfAllocCopy(PMIDL_STUB_MESSAGE,unsigned char**,unsigned long);
-unsigned long RPC_ENTRY NdrSH_Copy(unsigned char*,unsigned char*,unsigned long);
-void RPC_ENTRY NdrSH_IfFree(PMIDL_STUB_MESSAGE,unsigned char*);
-RPC_BUFPTR RPC_ENTRY NdrSH_StringMarshall(PMIDL_STUB_MESSAGE,unsigned char*,unsigned long,int);
-RPC_BUFPTR RPC_ENTRY NdrSH_StringUnMarshall(PMIDL_STUB_MESSAGE,unsigned char**,int);
-typedef void *RPC_SS_THREAD_HANDLE;
-typedef void* __RPC_API RPC_CLIENT_ALLOC(unsigned int);
-typedef void __RPC_API RPC_CLIENT_FREE(void*);
-void*RPC_ENTRY RpcSsAllocate(unsigned int);
-void RPC_ENTRY RpcSsDisableAllocate(void);
-void RPC_ENTRY RpcSsEnableAllocate(void);
-void RPC_ENTRY RpcSsFree(void*);
-RPC_SS_THREAD_HANDLE RPC_ENTRY RpcSsGetThreadHandle(void);
-void RPC_ENTRY RpcSsSetClientAllocFree(RPC_CLIENT_ALLOC*,RPC_CLIENT_FREE*);
-void RPC_ENTRY RpcSsSetThreadHandle(RPC_SS_THREAD_HANDLE);
-void RPC_ENTRY RpcSsSwapClientAllocFree(RPC_CLIENT_ALLOC*,RPC_CLIENT_FREE*,RPC_CLIENT_ALLOC**,RPC_CLIENT_FREE**);
-void*RPC_ENTRY RpcSmAllocate(unsigned int,RPC_STATUS*);
-RPC_STATUS RPC_ENTRY RpcSmClientFree(void*);
-RPC_STATUS RPC_ENTRY RpcSmDestroyClientContext(void**);
-RPC_STATUS RPC_ENTRY RpcSmDisableAllocate(void);
-RPC_STATUS RPC_ENTRY RpcSmEnableAllocate(void);
-RPC_STATUS RPC_ENTRY RpcSmFree(void*);
-RPC_SS_THREAD_HANDLE RPC_ENTRY RpcSmGetThreadHandle(RPC_STATUS*);
-RPC_STATUS RPC_ENTRY RpcSmSetClientAllocFree(RPC_CLIENT_ALLOC*,RPC_CLIENT_FREE*);
-RPC_STATUS RPC_ENTRY RpcSmSetThreadHandle(RPC_SS_THREAD_HANDLE);
-RPC_STATUS RPC_ENTRY RpcSmSwapClientAllocFree(RPC_CLIENT_ALLOC*,RPC_CLIENT_FREE*,RPC_CLIENT_ALLOC**,RPC_CLIENT_FREE**);
-void RPC_ENTRY NdrRpcSsEnableAllocate(PMIDL_STUB_MESSAGE);
-void RPC_ENTRY NdrRpcSsDisableAllocate(PMIDL_STUB_MESSAGE);
-void RPC_ENTRY NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE);
-void*RPC_ENTRY NdrRpcSmClientAllocate(unsigned int);
-void RPC_ENTRY NdrRpcSmClientFree(void*);
-void*RPC_ENTRY NdrRpcSsDefaultAllocate(unsigned int);
-void RPC_ENTRY NdrRpcSsDefaultFree(void*);
-PFULL_PTR_XLAT_TABLES RPC_ENTRY NdrFullPointerXlatInit(unsigned long,XLAT_SIDE);
-void RPC_ENTRY NdrFullPointerXlatFree(PFULL_PTR_XLAT_TABLES);
-int RPC_ENTRY NdrFullPointerQueryPointer(PFULL_PTR_XLAT_TABLES,void*,unsigned char,unsigned long*);
-int RPC_ENTRY NdrFullPointerQueryRefId(PFULL_PTR_XLAT_TABLES,unsigned long,unsigned char,void**);
-void RPC_ENTRY NdrFullPointerInsertRefId(PFULL_PTR_XLAT_TABLES,unsigned long,void*);
-int RPC_ENTRY NdrFullPointerFree(PFULL_PTR_XLAT_TABLES,void*);
-void*RPC_ENTRY NdrAllocate(PMIDL_STUB_MESSAGE,unsigned int);
-void RPC_ENTRY NdrClearOutParameters(PMIDL_STUB_MESSAGE,PFORMAT_STRING,void*);
-void*RPC_ENTRY NdrOleAllocate(unsigned int);
-void RPC_ENTRY NdrOleFree(void*);
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/rpcnsi.h b/winsup/w32api/include/rpcnsi.h
deleted file mode 100644
index 079d7b2a2..000000000
--- a/winsup/w32api/include/rpcnsi.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#ifndef _RPCNSI_H
-#define _RPCNSI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef void *RPC_NS_HANDLE;
-#define RPC_C_NS_SYNTAX_DEFAULT 0
-#define RPC_C_NS_SYNTAX_DCE 3
-#define RPC_C_PROFILE_DEFAULT_ELT 0
-#define RPC_C_PROFILE_ALL_ELT 1
-#define RPC_C_PROFILE_MATCH_BY_IF 2
-#define RPC_C_PROFILE_MATCH_BY_MBR 3
-#define RPC_C_PROFILE_MATCH_BY_BOTH 4
-#define RPC_C_NS_DEFAULT_EXP_AGE -1
-
-RPC_STATUS RPC_ENTRY RpcNsBindingExportA(unsigned long,unsigned char*,RPC_IF_HANDLE,RPC_BINDING_VECTOR*,UUID_VECTOR*);
-RPC_STATUS RPC_ENTRY RpcNsBindingUnexportA(unsigned long,unsigned char*,RPC_IF_HANDLE,UUID_VECTOR*);
-RPC_STATUS RPC_ENTRY RpcNsBindingLookupBeginA(unsigned long,unsigned char*,RPC_IF_HANDLE,UUID*,unsigned long,RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsBindingLookupNext(RPC_NS_HANDLE,RPC_BINDING_VECTOR**);
-RPC_STATUS RPC_ENTRY RpcNsBindingLookupDone(RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsGroupDeleteA(unsigned long,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcNsGroupMbrAddA(unsigned long,unsigned char*,unsigned long,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcNsGroupMbrRemoveA(unsigned long,unsigned char*,unsigned long,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcNsGroupMbrInqBeginA(unsigned long,unsigned char*,unsigned long,RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsGroupMbrInqNextA(RPC_NS_HANDLE,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcNsGroupMbrInqDone(RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsProfileDeleteA(unsigned long,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcNsProfileEltAddA(unsigned long,unsigned char*,RPC_IF_ID*,unsigned long,unsigned char*,unsigned long,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcNsProfileEltRemoveA(unsigned long,unsigned char*,RPC_IF_ID*,unsigned long,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcNsProfileEltInqBeginA(unsigned long,unsigned char*,unsigned long,RPC_IF_ID*,unsigned long,unsigned long,unsigned char*,RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsProfileEltInqNextA(RPC_NS_HANDLE,RPC_IF_ID*,unsigned char**,unsigned long*,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcNsProfileEltInqDone(RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsEntryObjectInqNext(IN  RPC_NS_HANDLE,OUT UUID*);
-RPC_STATUS RPC_ENTRY RpcNsEntryObjectInqDone(IN OUT RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsEntryExpandNameA(unsigned long,unsigned char*,unsigned char**);
-RPC_STATUS RPC_ENTRY RpcNsMgmtBindingUnexportA(unsigned long,unsigned char*,RPC_IF_ID*,unsigned long,UUID_VECTOR*);
-RPC_STATUS RPC_ENTRY RpcNsMgmtEntryCreateA(unsigned long,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcNsMgmtEntryDeleteA(unsigned long,unsigned char*);
-RPC_STATUS RPC_ENTRY RpcNsMgmtEntryInqIfIdsA(unsigned long,unsigned char*,RPC_IF_ID_VECTOR**);
-RPC_STATUS RPC_ENTRY RpcNsMgmtHandleSetExpAge(RPC_NS_HANDLE,unsigned long);
-RPC_STATUS RPC_ENTRY RpcNsMgmtInqExpAge(unsigned long*);
-RPC_STATUS RPC_ENTRY RpcNsMgmtSetExpAge(unsigned long);
-RPC_STATUS RPC_ENTRY RpcNsBindingImportNext(RPC_NS_HANDLE,RPC_BINDING_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsBindingImportDone(RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsBindingSelect(RPC_BINDING_VECTOR*,RPC_BINDING_HANDLE*);
-#ifndef UNICODE_ONLY
-RPC_STATUS RPC_ENTRY RpcNsEntryObjectInqBeginA(unsigned long,unsigned char*,RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsBindingImportBeginA(unsigned long,unsigned char*,RPC_IF_HANDLE,UUID*,RPC_NS_HANDLE*);
-#endif
-#ifdef RPC_UNICODE_SUPPORTED
-RPC_STATUS RPC_ENTRY RpcNsBindingExportW(unsigned long,unsigned short*,RPC_IF_HANDLE,RPC_BINDING_VECTOR*,UUID_VECTOR*);
-RPC_STATUS RPC_ENTRY RpcNsBindingUnexportW(unsigned long,unsigned short*,RPC_IF_HANDLE,UUID_VECTOR*);
-RPC_STATUS RPC_ENTRY RpcNsBindingLookupBeginW(unsigned long,unsigned short*,RPC_IF_HANDLE,UUID*,unsigned long,RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsGroupDeleteW(unsigned long,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcNsGroupMbrAddW(unsigned long,unsigned short*,unsigned long,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcNsGroupMbrRemoveW(unsigned long,unsigned short*,unsigned long,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcNsGroupMbrInqBeginW(unsigned long,unsigned short*,unsigned long,RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsGroupMbrInqNextW(RPC_NS_HANDLE,unsigned short**);
-RPC_STATUS RPC_ENTRY RpcNsProfileDeleteW(unsigned long,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcNsProfileEltAddW(unsigned long,unsigned short*, RPC_IF_ID*,unsigned long,unsigned short*,unsigned long,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcNsProfileEltRemoveW(unsigned long,unsigned short*, RPC_IF_ID*,unsigned long,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcNsProfileEltInqBeginW(unsigned long,unsigned short*, unsigned long,RPC_IF_ID*,unsigned long,unsigned long,unsigned short*, RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsProfileEltInqNextW(RPC_NS_HANDLE,RPC_IF_ID*, unsigned short**,unsigned long*,unsigned short**);
-RPC_STATUS RPC_ENTRY RpcNsEntryObjectInqBeginW(unsigned long,unsigned short*,RPC_NS_HANDLE*);
-RPC_STATUS RPC_ENTRY RpcNsEntryExpandNameW(unsigned long,unsigned short*,unsigned short**);
-RPC_STATUS RPC_ENTRY RpcNsMgmtBindingUnexportW(unsigned long,unsigned short*,RPC_IF_ID*,unsigned long,UUID_VECTOR*);
-RPC_STATUS RPC_ENTRY RpcNsMgmtEntryCreateW(unsigned long,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcNsMgmtEntryDeleteW(unsigned long,unsigned short*);
-RPC_STATUS RPC_ENTRY RpcNsMgmtEntryInqIfIdsW(unsigned long,unsigned short , RPC_IF_ID_VECTOR**);
-RPC_STATUS RPC_ENTRY RpcNsBindingImportBeginW(unsigned long,unsigned short*,RPC_IF_HANDLE,UUID*,RPC_NS_HANDLE*);
-#endif /* RPC_UNICODE_SUPPORTED */
-#ifdef UNICODE
-#define RpcNsBindingLookupBegin RpcNsBindingLookupBeginW
-#define RpcNsBindingImportBegin RpcNsBindingImportBeginW
-#define RpcNsBindingExport RpcNsBindingExportW
-#define RpcNsBindingUnexport RpcNsBindingUnexportW
-#define RpcNsGroupDelete RpcNsGroupDeleteW
-#define RpcNsGroupMbrAdd RpcNsGroupMbrAddW
-#define RpcNsGroupMbrRemove RpcNsGroupMbrRemoveW
-#define RpcNsGroupMbrInqBegin RpcNsGroupMbrInqBeginW
-#define RpcNsGroupMbrInqNext RpcNsGroupMbrInqNextW
-#define RpcNsEntryExpandName RpcNsEntryExpandNameW
-#define RpcNsEntryObjectInqBegin RpcNsEntryObjectInqBeginW
-#define RpcNsMgmtBindingUnexport RpcNsMgmtBindingUnexportW
-#define RpcNsMgmtEntryCreate RpcNsMgmtEntryCreateW
-#define RpcNsMgmtEntryDelete RpcNsMgmtEntryDeleteW
-#define RpcNsMgmtEntryInqIfIds RpcNsMgmtEntryInqIfIdsW
-#define RpcNsProfileDelete RpcNsProfileDeleteW
-#define RpcNsProfileEltAdd RpcNsProfileEltAddW
-#define RpcNsProfileEltRemove RpcNsProfileEltRemoveW
-#define RpcNsProfileEltInqBegin RpcNsProfileEltInqBeginW
-#define RpcNsProfileEltInqNext RpcNsProfileEltInqNextW
-#else
-#define RpcNsBindingLookupBegin RpcNsBindingLookupBeginA
-#define RpcNsBindingImportBegin RpcNsBindingImportBeginA
-#define RpcNsBindingExport RpcNsBindingExportA
-#define RpcNsBindingUnexport RpcNsBindingUnexportA
-#define RpcNsGroupDelete RpcNsGroupDeleteA
-#define RpcNsGroupMbrAdd RpcNsGroupMbrAddA
-#define RpcNsGroupMbrRemove RpcNsGroupMbrRemoveA
-#define RpcNsGroupMbrInqBegin RpcNsGroupMbrInqBeginA
-#define RpcNsGroupMbrInqNext RpcNsGroupMbrInqNextA
-#define RpcNsEntryExpandName RpcNsEntryExpandNameA
-#define RpcNsEntryObjectInqBegin RpcNsEntryObjectInqBeginA
-#define RpcNsMgmtBindingUnexport RpcNsMgmtBindingUnexportA
-#define RpcNsMgmtEntryCreate RpcNsMgmtEntryCreateA
-#define RpcNsMgmtEntryDelete RpcNsMgmtEntryDeleteA
-#define RpcNsMgmtEntryInqIfIds RpcNsMgmtEntryInqIfIdsA
-#define RpcNsProfileDelete RpcNsProfileDeleteA
-#define RpcNsProfileEltAdd RpcNsProfileEltAddA
-#define RpcNsProfileEltRemove RpcNsProfileEltRemoveA
-#define RpcNsProfileEltInqBegin RpcNsProfileEltInqBeginA
-#define RpcNsProfileEltInqNext RpcNsProfileEltInqNextA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/rpcnsip.h b/winsup/w32api/include/rpcnsip.h
deleted file mode 100644
index 15ed76104..000000000
--- a/winsup/w32api/include/rpcnsip.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _RPCNSIP_H
-#define _RPCNSIP_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef struct {
-	RPC_NS_HANDLE LookupContext;
-	RPC_BINDING_HANDLE ProposedHandle;
-	RPC_BINDING_VECTOR *Bindings;
-} RPC_IMPORT_CONTEXT_P,*PRPC_IMPORT_CONTEXT_P;
-RPC_STATUS RPC_ENTRY I_RpcNsGetBuffer(IN PRPC_MESSAGE);
-RPC_STATUS RPC_ENTRY I_RpcNsSendReceive(IN PRPC_MESSAGE,OUT RPC_BINDING_HANDLE*);
-void RPC_ENTRY I_RpcNsRaiseException(IN PRPC_MESSAGE,IN RPC_STATUS);
-RPC_STATUS RPC_ENTRY I_RpcReBindBuffer(IN PRPC_MESSAGE);
-RPC_STATUS RPC_ENTRY I_NsServerBindSearch(void);
-RPC_STATUS RPC_ENTRY I_NsClientBindSearch(void);
-void RPC_ENTRY I_NsClientBindDone(void);
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/rpcnterr.h b/winsup/w32api/include/rpcnterr.h
deleted file mode 100644
index b23c429c6..000000000
--- a/winsup/w32api/include/rpcnterr.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _RPCNTERR_H
-#define _RPCNTERR_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define RPC_S_OK ERROR_SUCCESS
-#define RPC_S_INVALID_ARG ERROR_INVALID_PARAMETER
-#define RPC_S_OUT_OF_MEMORY ERROR_OUTOFMEMORY
-#define RPC_S_OUT_OF_THREADS ERROR_MAX_THRDS_REACHED
-#define RPC_S_INVALID_LEVEL ERROR_INVALID_PARAMETER
-#define RPC_S_BUFFER_TOO_SMALL ERROR_INSUFFICIENT_BUFFER
-#define RPC_S_INVALID_SECURITY_DESC ERROR_INVALID_SECURITY_DESCR
-#define RPC_S_ACCESS_DENIED ERROR_ACCESS_DENIED
-#define RPC_S_SERVER_OUT_OF_MEMORY ERROR_NOT_ENOUGH_SERVER_MEMORY
-#define RPC_X_NO_MEMORY RPC_S_OUT_OF_MEMORY
-#define RPC_X_INVALID_BOUND RPC_S_INVALID_BOUND
-#define RPC_X_INVALID_TAG RPC_S_INVALID_TAG
-#define RPC_X_ENUM_VALUE_TOO_LARGE RPC_X_ENUM_VALUE_OUT_OF_RANGE
-#define RPC_X_SS_CONTEXT_MISMATCH ERROR_INVALID_HANDLE
-#define RPC_X_INVALID_BUFFER ERROR_INVALID_USER_BUFFER
-#define RPC_X_INVALID_PIPE_OPERATION RPC_X_WRONG_PIPE_ORDER
-#endif
diff --git a/winsup/w32api/include/rpcproxy.h b/winsup/w32api/include/rpcproxy.h
deleted file mode 100644
index 5700e541a..000000000
--- a/winsup/w32api/include/rpcproxy.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-    -DREGISTER_PROXY_DLL Generates DllMain, DllRegisterServer, and DllUnregisterServer
-    -DPROXY_CLSID=clsid Specifies a class ID to be used by the proxy DLL.
-    -DPROXY_CLSID_IS={..} Specifies the class ID to be used by the proxy DLL.
-    -DNT35_STRICT No new features
-*/
-#ifndef _RPCPROXY_H
-#define _RPCPROXY_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#if defined  __cplusplus  && !defined CINTERFACE
-#warning "rpcproxy type definitions require CINTERFACE"
-#else
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <rpc.h>
-#include <rpcndr.h>
-#include <string.h>
-
-#define CStdStubBuffer_METHODS CStdStubBuffer_QueryInterface,CStdStubBuffer_AddRef,\
-CStdStubBuffer_Release,CStdStubBuffer_Connect,CStdStubBuffer_Disconnect,CStdStubBuffer_Invoke,\
-CStdStubBuffer_IsIIDSupported,CStdStubBuffer_CountRefs,CStdStubBuffer_DebugServerQueryInterface,\
-CStdStubBuffer_DebugServerRelease
-#define IID_GENERIC_CHECK_IID(name,pIID,index) memcmp(pIID,name##_ProxyVtblList[index]->header.piid,16)
-#define IID_BS_LOOKUP_SETUP int result, low=-1;
-#define IID_BS_LOOKUP_INITIAL_TEST(name,sz,split) if ((result = name##_CHECK_IID(split))>0) { low=sz-split;} else if (!result) { low = split; goto found_label; }
-#define IID_BS_LOOKUP_NEXT_TEST(name,split) if ((result = name##_CHECK_IID(low+split))>=0) { low=low+split; if (!result) goto found_label; }
-#define IID_BS_LOOKUP_RETURN_RESULT(name,sz,index) low+=1; if ((low>=sz )||(result=name##_CHECK_IID(low))) goto not_found_label; found_label: (index)=low; return 1; not_found_label: return 0;
-#define REGISTER_PROXY_DLL_ROUTINES(pProxyFileList, pClsID) \
-HINSTANCE hProxyDll = 0; \
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) \
-{ \
-if(fdwReason == DLL_PROCESS_ATTACH) hProxyDll = hinstDLL; \
-return TRUE; \
-} \
-HRESULT STDAPICALLTYPE DllRegisterServer(void) \
-{\
-return NdrDllRegisterProxy(hProxyDll, pProxyFileList, pClsID); \
-}\
-HRESULT STDAPICALLTYPE DllUnregisterServer(void)\
-{\
-return NdrDllUnregisterProxy(hProxyDll, pProxyFileList, pClsID);\
-}
-#ifdef PROXY_CLSID
-#define CLSID_PSFACTORYBUFFER extern CLSID PROXY_CLSID;
-#else
-#ifdef PROXY_CLSID_IS
-#define CLSID_PSFACTORYBUFFER const CLSID CLSID_PSFactoryBuffer = PROXY_CLSID_IS;
-#define PROXY_CLSID CLSID_PSFactoryBuffer
-#else
-#define CLSID_PSFACTORYBUFFER
-#endif
-#endif
-#ifndef PROXY_CLSID
-#define GET_DLL_CLSID (aProxyFileList[0]->pStubVtblList[0] != 0 ? aProxyFileList[0]->pStubVtblList[0]->header.piid : 0)
-#else
-#define GET_DLL_CLSID &PROXY_CLSID
-#endif
-#define EXTERN_PROXY_FILE(name) EXTERN_C const ProxyFileInfo name##_ProxyFileInfo;
-#define PROXYFILE_LIST_START const ProxyFileInfo * aProxyFileList[] = {
-#define REFERENCE_PROXY_FILE(name) & name##_ProxyFileInfo
-#define PROXYFILE_LIST_END 0 };
-#define DLLDATA_GETPROXYDLLINFO(pPFList,pClsid) \
-void RPC_ENTRY GetProxyDllInfo( const ProxyFileInfo*** pInfo, const CLSID ** pId ) \
-{ *pInfo = pPFList; *pId = pClsid; };
-#define DLLGETCLASSOBJECTROUTINE(pPFlist, pClsid,pFactory) HRESULT STDAPICALLTYPE DllGetClassObject(REFCLSID rclsid,REFIID riid,void **ppv) \
-{ return NdrDllGetClassObject(rclsid,riid,ppv,pPFlist,pClsid,pFactory ); }
-#define DLLCANUNLOADNOW(pFactory) HRESULT STDAPICALLTYPE DllCanUnloadNow(void) \
-{ return NdrDllCanUnloadNow( pFactory ); }
-#define DLLDUMMYPURECALL void __cdecl _purecall(void) { }
-#define CSTDSTUBBUFFERRELEASE(pFactory) ULONG STDMETHODCALLTYPE CStdStubBuffer_Release(IRpcStubBuffer *This) \
-{ return NdrCStdStubBuffer_Release(This,(IPSFactoryBuffer *)pFactory); }
-#ifdef PROXY_DELEGATION
-#define CSTDSTUBBUFFER2RELEASE(pFactory) ULONG STDMETHODCALLTYPE CStdStubBuffer2_Release(IRpcStubBuffer *This) \
-{ return NdrCStdStubBuffer2_Release(This,(IPSFactoryBuffer *)pFactory); }
-#else
-#define CSTDSTUBBUFFER2RELEASE(pFactory)
-#endif
-
-#ifdef REGISTER_PROXY_DLL
-#define DLLREGISTRY_ROUTINES(pProxyFileList,pClsID ) REGISTER_PROXY_DLL_ROUTINES(pProxyFileList,pClsID)
-#else
-#define DLLREGISTRY_ROUTINES(pProxyFileList,pClsID)
-#endif
-#define DLLDATA_ROUTINES(pProxyFileList,pClsID) \
-CLSID_PSFACTORYBUFFER \
-CStdPSFactoryBuffer gPFactory = {0,0,0,0}; \
-DLLDATA_GETPROXYDLLINFO(pProxyFileList,pClsID) \
-DLLGETCLASSOBJECTROUTINE(pProxyFileList,pClsID,&gPFactory) \
-DLLCANUNLOADNOW(&gPFactory) \
-CSTDSTUBBUFFERRELEASE(&gPFactory) \
-CSTDSTUBBUFFER2RELEASE(&gPFactory) \
-DLLDUMMYPURECALL \
-DLLREGISTRY_ROUTINES(pProxyFileList, pClsID)
-
-#define DLLDATA_STANDARD_ROUTINES DLLDATA_ROUTINES( (const ProxyFileInfo**) pProxyFileList, &CLSID_PSFactoryBuffer)
-
-struct tagCInterfaceStubVtbl;
-struct tagCInterfaceProxyVtbl;
-typedef struct tagCInterfaceStubVtbl *PCInterfaceStubVtblList;
-typedef struct tagCInterfaceProxyVtbl *PCInterfaceProxyVtblList;
-typedef const char *PCInterfaceName;
-typedef int __stdcall IIDLookupRtn(const IID*,int*);
-typedef IIDLookupRtn *PIIDLookup;
-typedef struct tagProxyFileInfo {
-    const PCInterfaceProxyVtblList *pProxyVtblList;
-    const PCInterfaceStubVtblList *pStubVtblList;
-    const PCInterfaceName * pNamesArray;
-    const IID ** pDelegatedIIDs;
-    const PIIDLookup pIIDLookupRtn;
-    unsigned short TableSize;
-    unsigned short TableVersion;
-    unsigned long Filler1;
-    unsigned long Filler2;
-    unsigned long Filler3;
-    unsigned long Filler4;
-}ProxyFileInfo;
-typedef ProxyFileInfo ExtendedProxyFileInfo;
-
-typedef struct tagCInterfaceProxyHeader {
-#ifdef USE_STUBLESS_PROXY
-    const void *pStublessProxyInfo;
-#endif
-    const IID *piid;
-} CInterfaceProxyHeader;
-typedef struct tagCInterfaceProxyVtbl {
-    CInterfaceProxyHeader header;
-#if defined(__WATCOMC__)
-    void *Vtbl[1];
-#else
-#ifdef __GNUC__
-__extension__
-#endif
-    void *Vtbl[0];
-#endif
-} CInterfaceProxyVtbl;
-typedef void (__RPC_STUB *PRPC_STUB_FUNCTION)(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,DWORD*);
-typedef struct tagCInterfaceStubHeader {
-    const IID *piid;
-    const MIDL_SERVER_INFO *pServerInfo;
-    unsigned long DispatchTableCount;
-    const PRPC_STUB_FUNCTION *pDispatchTable;
-} CInterfaceStubHeader;
-typedef struct tagCInterfaceStubVtbl {
-    CInterfaceStubHeader header;
-    IRpcStubBufferVtbl Vtbl;
-} CInterfaceStubVtbl;
-typedef struct tagCStdStubBuffer {
-    const struct IRpcStubBufferVtbl * lpVtbl;
-    long RefCount;
-    struct IUnknown *pvServerObject;
-} CStdStubBuffer;
-typedef struct tagCStdPSFactoryBuffer {
-    const IPSFactoryBufferVtbl *lpVtbl;
-    long RefCount;
-    const ProxyFileInfo ** pProxyFileList;
-    long Filler1;
-} CStdPSFactoryBuffer;
-void RPC_ENTRY NdrProxyInitialize(void*,PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC,unsigned int);
-void RPC_ENTRY NdrProxyGetBuffer(void*,PMIDL_STUB_MESSAGE);
-void RPC_ENTRY NdrProxySendReceive(void*,MIDL_STUB_MESSAGE*);
-void RPC_ENTRY NdrProxyFreeBuffer(void*,MIDL_STUB_MESSAGE*);
-HRESULT RPC_ENTRY NdrProxyErrorHandler(DWORD);
-void RPC_ENTRY NdrStubInitialize(PRPC_MESSAGE,PMIDL_STUB_MESSAGE,PMIDL_STUB_DESC,IRpcChannelBuffer*);
-void __RPC_STUB NdrStubForwardingFunction(IRpcStubBuffer*,IRpcChannelBuffer*,PRPC_MESSAGE,DWORD*);
-void RPC_ENTRY NdrStubGetBuffer(IRpcStubBuffer*,IRpcChannelBuffer*,PMIDL_STUB_MESSAGE);
-HRESULT RPC_ENTRY NdrStubErrorHandler(DWORD);
-HRESULT STDMETHODCALLTYPE CStdStubBuffer_QueryInterface(IRpcStubBuffer*,REFIID,void**);
-ULONG STDMETHODCALLTYPE CStdStubBuffer_AddRef(IRpcStubBuffer*);
-ULONG STDMETHODCALLTYPE CStdStubBuffer_Release(IRpcStubBuffer*);
-ULONG STDMETHODCALLTYPE NdrCStdStubBuffer_Release(IRpcStubBuffer*,IPSFactoryBuffer*);
-HRESULT STDMETHODCALLTYPE CStdStubBuffer_Connect(IRpcStubBuffer*,IUnknown*);
-void STDMETHODCALLTYPE CStdStubBuffer_Disconnect(IRpcStubBuffer*);
-HRESULT STDMETHODCALLTYPE CStdStubBuffer_Invoke(IRpcStubBuffer*,RPCOLEMESSAGE*,IRpcChannelBuffer*);
-IRpcStubBuffer* STDMETHODCALLTYPE CStdStubBuffer_IsIIDSupported(IRpcStubBuffer*,REFIID);
-ULONG STDMETHODCALLTYPE CStdStubBuffer_CountRefs(IRpcStubBuffer*);
-HRESULT STDMETHODCALLTYPE CStdStubBuffer_DebugServerQueryInterface(IRpcStubBuffer*,void**);
-void STDMETHODCALLTYPE CStdStubBuffer_DebugServerRelease(IRpcStubBuffer*,void*);
-HRESULT RPC_ENTRY NdrDllGetClassObject(REFCLSID,REFIID,void**,const ProxyFileInfo**,const CLSID*,CStdPSFactoryBuffer*);
-HRESULT RPC_ENTRY NdrDllCanUnloadNow(CStdPSFactoryBuffer*);
-#ifndef NT35_STRICT
-HRESULT RPC_ENTRY NdrDllRegisterProxy(HMODULE,const ProxyFileInfo**,const CLSID*);
-HRESULT RPC_ENTRY NdrDllUnregisterProxy(HMODULE,const ProxyFileInfo**,const CLSID*);
-#define STUB_FORWARDING_FUNCTION NdrStubForwardingFunction
-ULONG STDMETHODCALLTYPE
-CStdStubBuffer2_Release(IRpcStubBuffer*);
-ULONG STDMETHODCALLTYPE
-NdrCStdStubBuffer2_Release(IRpcStubBuffer*,IPSFactoryBuffer*);
-#define CStdStubBuffer_DELEGATING_METHODS 0, 0, CStdStubBuffer2_Release, 0, 0, 0, 0, 0, 0, 0
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif  /* defined  __cplusplus  && !defined CINTERFACE  */
-#endif  /* ndef _RPCPROXY_H  */
-
diff --git a/winsup/w32api/include/schannel.h b/winsup/w32api/include/schannel.h
deleted file mode 100644
index e01055517..000000000
--- a/winsup/w32api/include/schannel.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef _SCHANNEL_H
-#define _SCHANNEL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <wincrypt.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SCHANNEL_CRED_VERSION 4
-#define SCHANNEL_SHUTDOWN 1
-/* ? Do these belong here or in wincrypt.h */
-#define AUTHTYPE_CLIENT 1
-#define AUTHTYPE_SERVER 2
-
-#define SP_PROT_TLS1_CLIENT 128
-#define SP_PROT_TLS1_SERVER 64
-#define SP_PROT_SSL3_CLIENT 32
-#define SP_PROT_SSL3_SERVER 16
-#define SP_PROT_SSL2_CLIENT 8
-#define SP_PROT_SSL2_SERVER 4
-#define SP_PROT_PCT1_SERVER 1
-#define SP_PROT_PCT1_CLIENT 2
-
-#define SP_PROT_PCT1 (SP_PROT_PCT1_CLIENT|SP_PROT_PCT1_SERVER)
-#define SP_PROT_TLS1 (SP_PROT_TLS1_CLIENT|SP_PROT_TLS1_SERVER)
-#define SP_PROT_SSL2 (SP_PROT_SSL2_CLIENT|SP_PROT_SSL2_SERVER)
-#define SP_PROT_SSL3 (SP_PROT_SSL3_CLIENT|SP_PROT_SSL3_SERVER)
-
-#define SCH_CRED_NO_SYSTEM_MAPPER 2
-#define SCH_CRED_NO_SERVERNAME_CHECK 4
-#define SCH_CRED_MANUAL_CRED_VALIDATION 8
-#define SCH_CRED_NO_DEFAULT_CREDS 16
-#define SCH_CRED_AUTO_CRED_VALIDATION 32
-#define SCH_CRED_REVOCATION_CHECK_CHAIN 512
-#define SCH_CRED_REVOCATION_CHECK_END_CERT 256
-#define SCH_CRED_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT 1024
-#define SCH_CRED_IGNORE_NO_REVOCATION_CHECK 2048
-#define SCH_CRED_IGNORE_REVOCATION_OFFLINE 4096
-#define SCH_CRED_USE_DEFAULT_CREDS 64
-
-typedef struct _SCHANNEL_CRED {
-	DWORD dwVersion;
-	DWORD cCreds;
-	PCCERT_CONTEXT* paCred;
-	HCERTSTORE hRootStore;
-	DWORD cMappers;
-	struct _HMAPPER** aphMappers;
-	DWORD cSupportedAlgs;
-	ALG_ID* palgSupportedAlgs;
-	DWORD grbitEnabledProtocols;
-	DWORD dwMinimumCypherStrength;
-	DWORD dwMaximumCypherStrength;
-	DWORD dwSessionLifespan;
-	DWORD dwFlags;
-	DWORD reserved;
-} SCHANNEL_CRED, *PSCHANNEL_CRED;
-typedef struct _SecPkgCred_SupportedAlgs {
-	DWORD cSupportedAlgs;
-	ALG_ID* palgSupportedAlgs;
-} SecPkgCred_SupportedAlgs, *PSecPkgCred_SupportedAlgs;
-typedef struct _SecPkgCred_CypherStrengths {
-	DWORD dwMinimumCypherStrength;
-	DWORD dwMaximumCypherStrength;
-} SecPkgCred_CypherStrengths, *PSecPkgCred_CypherStrengths;
-typedef struct _SecPkgCred_SupportedProtocols {
-	DWORD grbitProtocol;
-} SecPkgCred_SupportedProtocols, *PSecPkgCred_SupportedProtocols;
-typedef struct _SecPkgContext_IssuerListInfoEx {
-	PCERT_NAME_BLOB aIssuers;
-	DWORD cIssuers;
-} SecPkgContext_IssuerListInfoEx, *PSecPkgContext_IssuerListInfoEx;
-typedef struct _SecPkgContext_ConnectionInfo {
-	DWORD dwProtocol;
-	ALG_ID aiCipher;
-	DWORD dwCipherStrength;
-	ALG_ID aiHash;
-	DWORD dwHashStrength;
-	ALG_ID aiExch;
-	DWORD dwExchStrength;
-} SecPkgContext_ConnectionInfo, *PSecPkgContext_ConnectionInfo;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SCHANNEL_H */
diff --git a/winsup/w32api/include/schnlsp.h b/winsup/w32api/include/schnlsp.h
deleted file mode 100644
index 8e9e09574..000000000
--- a/winsup/w32api/include/schnlsp.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _SCHNLSP_H
-#define _SCHNLSP_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-
-#define SECPKG_ATTR_SUPPORTED_ALGS 86
-#define SECPKG_ATTR_CIPHER_STRENGTHS 87
-#define SECPKG_ATTR_SUPPORTED_PROTOCOLS 88
-
-#include <schannel.h>
-
-#endif /* _SCHNLSP_H */
diff --git a/winsup/w32api/include/scrnsave.h b/winsup/w32api/include/scrnsave.h
deleted file mode 100644
index 5cee4b66e..000000000
--- a/winsup/w32api/include/scrnsave.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-  Screen saver library by Anders Norlander <anorland@hem2.passagen.se>
-
-  This library is (hopefully) compatible with Microsoft's
-  screen saver library.
-
-  This is public domain software.
-
- */
-#ifndef _SCRNSAVE_H
-#define _SCRNSAVE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* configure dialog identifier */
-#define DLG_SCRNSAVECONFIGURE 2003
-
-#define idsIsPassword		1000
-#define idsIniFile		1001
-#define idsScreenSaver		1002
-#define idsPassword		1003
-#define idsDifferentPW		1004
-#define idsChangePW		1005
-#define idsBadOldPW		1006
-#define idsAppName		1007
-#define idsNoHelpMemory		1008
-#define idsHelpFile		1009
-#define idsDefKeyword		1010
-
-#define IDS_DESCRIPTION 1
-#define ID_APP 100
-
-#define WS_GT (WS_GROUP | WS_TABSTOP)
-#define SCRM_VERIFYPW		WM_APP
-#define MAXFILELEN		13
-#define TITLEBARNAMELEN		40
-#define APPNAMEBUFFERLEN	40
-#define BUFFLEN			255
-
-#ifndef RC_INVOKED
-
-/* functions provided by the aothor of the screen saver */
-BOOL WINAPI ScreenSaverConfigureDialog(HWND,UINT,WPARAM,LPARAM);
-BOOL WINAPI RegisterDialogClasses(HANDLE);
-LONG WINAPI ScreenSaverProc(HWND,UINT,WPARAM,LPARAM);
-
-/* Change name of function if we are using UNICODE */
-#ifdef UNICODE
-#define DefScreenSaverProc DefScreenSaverProcW
-#endif
-
-/* default screen saver proc; call instead of DefWindowProc */
-LONG WINAPI DefScreenSaverProc(HWND,UINT,WPARAM,LPARAM);
-
-/* change password */
-void WINAPI ScreenSaverChangePassword(HWND);
-
-/* globals that may be used by screen saver */
-extern HINSTANCE	hMainInstance;
-extern HWND		hMainWindow;
-extern BOOL		fChildPreview;
-extern TCHAR		szName[];
-extern TCHAR		szAppName[];
-extern TCHAR		szIniFile[];
-extern TCHAR		szScreenSaver[];
-extern TCHAR		szHelpFile[];
-extern TCHAR		szNoHelpMemory[];
-extern UINT		MyHelpMessage;
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SCRNSAVE_H */
diff --git a/winsup/w32api/include/secext.h b/winsup/w32api/include/secext.h
deleted file mode 100644
index 1919f4fef..000000000
--- a/winsup/w32api/include/secext.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _SECEXT_H
-#define _SECEXT_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifndef RC_INVOKED
-#if (_WIN32_WINNT >= 0x0500)
-typedef enum 
-{
-  NameUnknown = 0, 
-  NameFullyQualifiedDN = 1, 
-  NameSamCompatible = 2, 
-  NameDisplay = 3, 
-  NameUniqueId = 6, 
-  NameCanonical = 7, 
-  NameUserPrincipal = 8, 
-  NameCanonicalEx = 9, 
-  NameServicePrincipal = 10, 
-  NameDnsDomain = 12
-} EXTENDED_NAME_FORMAT, *PEXTENDED_NAME_FORMAT;
-
-BOOLEAN WINAPI GetComputerObjectNameA(EXTENDED_NAME_FORMAT,LPSTR,PULONG);
-BOOLEAN WINAPI GetComputerObjectNameW(EXTENDED_NAME_FORMAT,LPWSTR,PULONG);
-BOOLEAN WINAPI GetUserNameExA(EXTENDED_NAME_FORMAT,LPSTR,PULONG);
-BOOLEAN WINAPI GetUserNameExW(EXTENDED_NAME_FORMAT,LPWSTR,PULONG);
-BOOLEAN WINAPI TranslateNameA(LPCSTR,EXTENDED_NAME_FORMAT,EXTENDED_NAME_FORMAT,LPSTR,PULONG);
-BOOLEAN WINAPI TranslateNameW(LPCWSTR,EXTENDED_NAME_FORMAT,EXTENDED_NAME_FORMAT,LPWSTR,PULONG);
-
-#ifdef UNICODE
-#define GetComputerObjectName GetComputerObjectNameW
-#define GetUserNameEx GetUserNameExW
-#define TranslateName TranslateNameW
-#else
-#define GetComputerObjectName GetComputerObjectNameA
-#define GetUserNameEx GetUserNameExA
-#define TranslateName TranslateNameA
-#endif
-
-
-#endif /* ! RC_INVOKED */
-#endif /* _WIN32_WINNT >= 0x0500 */
-#endif /* ! _SECEXT_H */
diff --git a/winsup/w32api/include/security.h b/winsup/w32api/include/security.h
deleted file mode 100644
index 9685cf051..000000000
--- a/winsup/w32api/include/security.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _SECURITY_H
-#define _SECURITY_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-
-#define SEC_E_OK 0
-#define SEC_E_CERT_EXPIRED (-2146893016)
-#define SEC_E_INCOMPLETE_MESSAGE (-2146893032)
-#define SEC_E_INSUFFICIENT_MEMORY (-2146893056)
-#define SEC_E_INTERNAL_ERROR (-2146893052)
-#define SEC_E_INVALID_HANDLE (-2146893055)
-#define SEC_E_INVALID_TOKEN (-2146893048)
-#define SEC_E_LOGON_DENIED (-2146893044)
-#define SEC_E_NO_AUTHENTICATING_AUTHORITY (-2146893039)
-#define SEC_E_NO_CREDENTIALS (-2146893042)
-#define SEC_E_TARGET_UNKNOWN (-2146893053)
-#define SEC_E_UNSUPPORTED_FUNCTION (-2146893054)
-#define SEC_E_UNTRUSTED_ROOT (-2146893019)
-#define SEC_E_WRONG_PRINCIPAL (-2146893022)
-#define SEC_E_SECPKG_NOT_FOUND (-2146893051)
-#define SEC_E_QOP_NOT_SUPPORTED (-2146893046)
-#define SEC_E_UNKNOWN_CREDENTIALS (-2146893043)
-#define SEC_E_NOT_OWNER (-2146893050)
-#define SEC_I_RENEGOTIATE 590625
-#define SEC_I_COMPLETE_AND_CONTINUE 590612
-#define SEC_I_COMPLETE_NEEDED 590611
-#define SEC_I_CONTINUE_NEEDED 590610
-#define SEC_I_INCOMPLETE_CREDENTIALS 590624
-
-/* always a char */
-typedef char SEC_CHAR;
-typedef wchar_t SEC_WCHAR;
-typedef long SECURITY_STATUS;
-#define SEC_FAR
-
-#include <sspi.h>
-#include <ntsecpkg.h>
-#include <secext.h>
-
-#endif /* _SECURITY_H */
diff --git a/winsup/w32api/include/servprov.h b/winsup/w32api/include/servprov.h
deleted file mode 100644
index b12e5d7a7..000000000
--- a/winsup/w32api/include/servprov.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _SERVPROV_H
-#define _SERVPROV_H
-#define _OLEIDL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EXTERN_C const IID IID_IServiceProvider;
-#undef INTERFACE
-#define INTERFACE IServiceProvider
-DECLARE_INTERFACE_(IServiceProvider,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(QueryService)(THIS_ REFGUID,REFIID,void**) PURE;
-};
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/setupapi.h b/winsup/w32api/include/setupapi.h
deleted file mode 100644
index 0fbc4626d..000000000
--- a/winsup/w32api/include/setupapi.h
+++ /dev/null
@@ -1,1553 +0,0 @@
-#ifndef _SETUPAPI_H_
-#define _SETUPAPI_H_
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <commctrl.h>
-#include <pshpack1.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define WINSETUPAPI DECLSPEC_IMPORT
-
-#define LINE_LEN	256
-#define MAX_INF_STRING_LENGTH	4096
-#define MAX_TITLE_LEN	60
-#define MAX_INSTRUCTION_LEN	256
-#define MAX_LABEL_LEN	30
-#define MAX_SERVICE_NAME_LEN	256
-#define MAX_SUBTITLE_LEN	256
-#define SP_MAX_MACHINENAME_LENGTH	(MAX_PATH + 3)
-
-#define COPYFLG_WARN_IF_SKIP	0x00000001
-#define COPYFLG_NOSKIP	0x00000002
-#define COPYFLG_NOVERSIONCHECK	0x00000004
-#define COPYFLG_FORCE_FILE_IN_USE	0x00000008
-#define COPYFLG_NO_OVERWRITE	0x00000010
-#define COPYFLG_NO_VERSION_DIALOG	0x00000020
-#define COPYFLG_OVERWRITE_OLDER_ONLY	0x00000040
-#define COPYFLG_REPLACEONLY	0x00000400
-#define COPYFLG_NODECOMP	0x00000800
-#define COPYFLG_REPLACE_BOOT_FILE	0x00001000
-#define COPYFLG_NOPRUNE	0x00002000
-#define DELFLG_IN_USE	0x00000001
-#define DELFLG_IN_USE1	0x00010000
-#define DI_REMOVEDEVICE_GLOBAL	0x00000001
-#define DI_REMOVEDEVICE_CONFIGSPECIFIC	0x00000002
-#define DI_UNREMOVEDEVICE_CONFIGSPECIFIC	0x00000002
-#define DI_SHOWOEM	0x00000001
-#define DI_SHOWCOMPAT	0x00000002
-#define DI_SHOWCLASS	0x00000004
-#define DI_SHOWALL	0x00000007
-#define DI_NOVCP	0x00000008
-#define DI_DIDCOMPAT	0x00000010
-#define DI_DIDCLASS	0x00000020
-#define DI_AUTOASSIGNRES	0x00000040
-#define DI_NEEDRESTART	0x00000080
-#define DI_NEEDREBOOT	0x00000100
-#define DI_NOBROWSE	0x00000200
-#define DI_MULTMFGS	0x00000400
-#define DI_DISABLED	0x00000800
-#define DI_GENERALPAGE_ADDED	0x00001000
-#define DI_RESOURCEPAGE_ADDED	0x00002000
-#define DI_PROPERTIES_CHANGE	0x00004000
-#define DI_INF_IS_SORTED	0x00008000
-#define DI_ENUMSINGLEINF	0x00010000
-#define DI_DONOTCALLCONFIGMG	0x00020000
-#define DI_INSTALLDISABLED	0x00040000
-#define DI_COMPAT_FROM_CLASS	0x00080000
-#define DI_CLASSINSTALLPARAMS	0x00100000
-#define DI_NODI_DEFAULTACTION	0x00200000
-#define DI_QUIETINSTALL	0x00800000
-#define DI_NOFILECOPY	0x01000000
-#define DI_FORCECOPY	0x02000000
-#define DI_DRIVERPAGE_ADDED	0x04000000
-#define DI_USECI_SELECTSTRINGS	0x08000000
-#define DI_OVERRIDE_INFFLAGS	0x10000000
-#define DI_PROPS_NOCHANGEUSAGE	0x20000000
-#define DI_NOSELECTICONS	0x40000000
-#define DI_NOWRITE_IDS	0x80000000
-#define DI_FLAGSEX_USEOLDINFSEARCH	0x00000001
-#define DI_FLAGSEX_AUTOSELECTRANK0	0x00000002
-#define DI_FLAGSEX_CI_FAILED	0x00000004
-#define DI_FLAGSEX_DIDINFOLIST	0x00000010
-#define DI_FLAGSEX_DIDCOMPATINFO	0x00000020
-#define DI_FLAGSEX_FILTERCLASSES	0x00000040
-#define DI_FLAGSEX_SETFAILEDINSTALL	0x00000080
-#define DI_FLAGSEX_DEVICECHANGE	0x00000100
-#define DI_FLAGSEX_ALWAYSWRITEIDS	0x00000200
-#define DI_FLAGSEX_PROPCHANGE_PENDING	0x00000400
-#define DI_FLAGSEX_ALLOWEXCLUDEDDRVS	0x00000800
-#define DI_FLAGSEX_NOUIONQUERYREMOVE	0x00001000
-#define DI_FLAGSEX_USECLASSFORCOMPAT	0x00002000
-#define DI_FLAGSEX_OLDINF_IN_CLASSLIST	0x00004000
-#define DI_FLAGSEX_NO_DRVREG_MODIFY	0x00008000
-#define DI_FLAGSEX_IN_SYSTEM_SETUP	0x00010000
-#define DI_FLAGSEX_INET_DRIVER	0x00020000
-#define DI_FLAGSEX_APPENDDRIVERLIST	0x00040000
-#define DI_FLAGSEX_PREINSTALLBACKUP	0x00080000
-#define DI_FLAGSEX_BACKUPONREPLACE	0x00100000
-#define DI_FLAGSEX_DRIVERLIST_FROM_URL	0x00200000
-#define DI_FLAGSEX_RESERVED1	0x00400000
-#define DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS	0x00800000
-#define DI_FLAGSEX_POWERPAGE_ADDED	0x01000000
-#define DIBCI_NOINSTALLCLASS	0x00000001
-#define DIBCI_NODISPLAYCLASS	0x00000002
-#define DICD_GENERATE_ID	0x00000001
-#define DICD_INHERIT_CLASSDRVS	0x00000002
-#define DICS_ENABLE	1
-#define DICS_FLAG_GLOBAL	1
-#define DICS_DISABLE	2
-#define DICS_FLAG_CONFIGSPECIFIC	2
-#define DICS_PROPCHANGE	3
-#define DICS_START	4
-#define DICS_FLAG_CONFIGGENERAL	4
-#define DICS_STOP	5
-#define DIF_SELECTDEVICE	1
-#define DIF_INSTALLDEVICE	2
-#define DIF_ASSIGNRESOURCES	3
-#define DIF_PROPERTIES	4
-#define DIF_REMOVE	5
-#define DIF_FIRSTTIMESETUP	6
-#define DIF_FOUNDDEVICE	7
-#define DIF_SELECTCLASSDRIVERS	8
-#define DIF_VALIDATECLASSDRIVERS	9
-#define DIF_INSTALLCLASSDRIVERS	10
-#define DIF_CALCDISKSPACE	11
-#define DIF_DESTROYPRIVATEDATA	12
-#define DIF_VALIDATEDRIVER	13
-#define DIF_MOVEDEVICE	14
-#define DIF_DETECT	15
-#define DIF_INSTALLWIZARD	16
-#define DIF_DESTROYWIZARDDATA	17
-#define DIF_PROPERTYCHANGE	18
-#define DIF_ENABLECLASS	19
-#define DIF_DETECTVERIFY	20
-#define DIF_INSTALLDEVICEFILES	21
-#define DIF_UNREMOVE	22
-#define DIF_SELECTBESTCOMPATDRV	23
-#define DIF_ALLOW_INSTALL	24
-#define DIF_REGISTERDEVICE	25
-#define DIF_NEWDEVICEWIZARD_PRESELECT	26
-#define DIF_NEWDEVICEWIZARD_SELECT	27
-#define DIF_NEWDEVICEWIZARD_PREANALYZE	28
-#define DIF_NEWDEVICEWIZARD_POSTANALYZE	29
-#define DIF_NEWDEVICEWIZARD_FINISHINSTALL	30
-#define DIF_UNUSED1	31
-#define DIF_INSTALLINTERFACES	32
-#define DIF_DETECTCANCEL	33
-#define DIF_REGISTER_COINSTALLERS	34
-#define DIF_ADDPROPERTYPAGE_ADVANCED	35
-#define DIF_ADDPROPERTYPAGE_BASIC	36
-#define DIF_RESERVED1	37
-#define DIF_TROUBLESHOOTER	38
-#define DIF_POWERMESSAGEWAKE	39
-#define DIGCF_DEFAULT	0x00000001
-#define DIGCDP_FLAG_BASIC	0x00000001
-#define DIGCF_PRESENT	0x00000002
-#define DIGCDP_FLAG_ADVANCED	0x00000002
-#define DIGCF_ALLCLASSES	0x00000004
-#define DIGCF_PROFILE	0x00000008
-#define DIGCF_DEVICEINTERFACE	0x00000010
-#define DIGCF_INTERFACEDEVICE	0x00000010
-#define DIOCR_INSTALLER	0x00000001
-#define DIOCR_INTERFACE	0x00000002
-#define DIODI_NO_ADD	0x00000001
-#define DIOD_INHERIT_CLASSDRVS	0x00000002
-#define DIOD_CANCEL_REMOVE	0x00000004
-#define DIREG_DEV	0x00000001
-#define DIREG_DRV	0x00000002
-#define DIREG_BOTH	0x00000004
-#define DIRID_ABSOLUTE	-1
-#define DIRID_NULL	0
-#define DIRID_SRCPATH	1
-#define DIRID_WINDOWS	10
-#define DIRID_SYSTEM	11
-#define DIRID_DRIVERS	12
-#define DIRID_INF	17
-#define DIRID_HELP	18
-#define DIRID_FONTS	20
-#define DIRID_VIEWERS	21
-#define DIRID_COLOR	23
-#define DIRID_APPS	24
-#define DIRID_SHARED	25
-#define DIRID_BOOT	30
-#define DIRID_SYSTEM16	50
-#define DIRID_SPOOL	51
-#define DIRID_SPOOLDRIVERS	52
-#define DIRID_USERPROFILE	53
-#define DIRID_LOADER	54
-#define DIRID_PRINTPROCESSOR	55
-#define DIRID_COMMON_STARTMENU	16406
-#define DIRID_COMMON_PROGRAMS	16407
-#define DIRID_COMMON_STARTUP	16408
-#define DIRID_COMMON_DESKTOPDIRECTORY	16409
-#define DIRID_COMMON_FAVORITES	16415
-#define DIRID_COMMON_APPDATA	16419
-#define DIRID_PROGRAM_FILES	16422
-#define DIRID_SYSTEM_X86	16425
-#define DIRID_PROGRAM_FILES_X86	16426
-#define DIRID_PROGRAM_FILES_COMMON	16427
-#define DIRID_PROGRAM_FILES_COMMONX86	16428
-#define DIRID_COMMON_TEMPLATES	16429
-#define DIRID_COMMON_DOCUMENTS	16430
-#define DIRID_USER	0x8000
-#define DIRID_ABSOLUTE_16BIT	0xffff
-#define DIRID_IOSUBSYS	DIRID_DRIVERS
-#define DIRID_DEFAULT	DIRID_SYSTEM
-#define DMI_MASK	0x00000001
-#define DMI_BKCOLOR	0x00000002
-#define DMI_USERECT	0x00000004
-#define DNF_DUPDESC	0x00000001
-#define DNF_OLDDRIVER	0x00000002
-#define DNF_EXCLUDEFROMLIST	0x00000004
-#define DNF_NODRIVER	0x00000008
-#define DNF_LEGACYINF	0x00000010
-#define DNF_CLASS_DRIVER	0x00000020
-#define DNF_COMPATIBLE_DRIVER	0x00000040
-#define DNF_INET_DRIVER	0x00000080
-#define DNF_UNUSED1	0x00000100
-#define DNF_INDEXED_DRIVER	0x00000200
-#define DNF_OLD_INET_DRIVER	0x00000400
-#define DNF_BAD_DRIVER	0x00000800
-#define DNF_DUPPROVIDER	0x00001000
-#define DPROMPT_SUCCESS	0
-#define DPROMPT_CANCEL	1
-#define DPROMPT_SKIPFILE	2
-#define DPROMPT_BUFFERTOOSMALL	3
-#define DPROMPT_OUTOFMEMORY	4
-#define DRIVER_HARDWAREID_RANK	0x00000FFF
-#define DYNAWIZ_FLAG_PAGESADDED	0x00000001
-#define DYNAWIZ_FLAG_INSTALLDET_NEXT	0x00000002
-#define DYNAWIZ_FLAG_INSTALLDET_PREV	0x00000004
-#define DYNAWIZ_FLAG_ANALYZE_HANDLECONFLICT	0x00000008
-#define ENABLECLASS_QUERY	0
-#define ENABLECLASS_SUCCESS	1
-#define ENABLECLASS_FAILURE	2
-#define ERROR_EXPECTED_SECTION_NAME	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0)
-#define ERROR_BAD_SECTION_NAME_LINE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|1)
-#define ERROR_SECTION_NAME_TOO_LONG	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|2)
-#define ERROR_GENERAL_SYNTAX	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|3)
-#define ERROR_WRONG_INF_STYLE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x100)
-#define ERROR_NOT_INSTALLED	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x1000)
-#define ERROR_SECTION_NOT_FOUND	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x101)
-#define ERROR_LINE_NOT_FOUND	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x102)
-#define ERROR_NO_BACKUP	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x103)
-#define ERROR_NO_ASSOCIATED_CLASS	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x200)
-#define ERROR_CLASS_MISMATCH	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x201)
-#define ERROR_DUPLICATE_FOUND	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x202)
-#define ERROR_NO_DRIVER_SELECTED	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x203)
-#define ERROR_KEY_DOES_NOT_EXIST	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x204)
-#define ERROR_INVALID_DEVINST_NAME	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x205)
-#define ERROR_INVALID_CLASS	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x206)
-#define ERROR_DEVINST_ALREADY_EXISTS	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x207)
-#define ERROR_DEVINFO_NOT_REGISTERED	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x208)
-#define ERROR_INVALID_REG_PROPERTY	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x209)
-#define ERROR_NO_INF	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x20A)
-#define ERROR_NO_SUCH_DEVINST	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x20B)
-#define ERROR_CANT_LOAD_CLASS_ICON	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x20C)
-#define ERROR_INVALID_CLASS_INSTALLER	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x20D)
-#define ERROR_DI_DO_DEFAULT	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x20E)
-#define ERROR_DI_NOFILECOPY	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x20F)
-#define ERROR_INVALID_HWPROFILE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x210)
-#define ERROR_NO_DEVICE_SELECTED	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x211)
-#define ERROR_DEVINFO_LIST_LOCKED	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x212)
-#define ERROR_DEVINFO_DATA_LOCKED	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x213)
-#define ERROR_DI_BAD_PATH	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x214)
-#define ERROR_NO_CLASSINSTALL_PARAMS	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x215)
-#define ERROR_FILEQUEUE_LOCKED	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x216)
-#define ERROR_BAD_SERVICE_INSTALLSECT	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x217)
-#define ERROR_NO_CLASS_DRIVER_LIST	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x218)
-#define ERROR_NO_ASSOCIATED_SERVICE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x219)
-#define ERROR_NO_DEFAULT_DEVICE_INTERFACE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x21A)
-#define ERROR_DEVICE_INTERFACE_ACTIVE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x21B)
-#define ERROR_DEVICE_INTERFACE_REMOVED	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x21C)
-#define ERROR_BAD_INTERFACE_INSTALLSECT	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x21D)
-#define ERROR_NO_SUCH_INTERFACE_CLASS	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x21E)
-#define ERROR_INVALID_REFERENCE_STRING	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x21F)
-#define ERROR_INVALID_MACHINENAME	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x220)
-#define ERROR_REMOTE_COMM_FAILURE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x221)
-#define ERROR_MACHINE_UNAVAILABLE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x222)
-#define ERROR_NO_CONFIGMGR_SERVICES	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x223)
-#define ERROR_INVALID_PROPPAGE_PROVIDER	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x224)
-#define ERROR_NO_SUCH_DEVICE_INTERFACE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x225)
-#define ERROR_DI_POSTPROCESSING_REQUIRED	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x226)
-#define ERROR_INVALID_COINSTALLER	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x227)
-#define ERROR_NO_COMPAT_DRIVERS	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x228)
-#define ERROR_NO_DEVICE_ICON	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x229)
-#define ERROR_INVALID_INF_LOGCONFIG	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x22A)
-#define ERROR_DI_DONT_INSTALL	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x22B)
-#define ERROR_INVALID_FILTER_DRIVER	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x22C)
-#define ERROR_NON_WINDOWS_NT_DRIVER	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x22D)
-#define ERROR_NON_WINDOWS_DRIVER	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x22E)
-#define ERROR_NO_CATALOG_FOR_OEM_INF	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x22F)
-#define ERROR_DEVINSTALL_QUEUE_NONNATIVE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x230)
-#define ERROR_NOT_DISABLEABLE	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x231)
-#define ERROR_CANT_REMOVE_DEVINST	(APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x232)
-#define ERROR_INTERFACE_DEVICE_ACTIVE	ERROR_DEVICE_INTERFACE_ACTIVE
-#define ERROR_INTERFACE_DEVICE_REMOVED	ERROR_DEVICE_INTERFACE_REMOVED
-#define ERROR_NO_DEFAULT_INTERFACE_DEVICE	ERROR_NO_DEFAULT_DEVICE_INTERFACE
-#define ERROR_NO_SUCH_INTERFACE_DEVICE	ERROR_NO_SUCH_DEVICE_INTERFACE
-
-#define FILEOP_COPY	0
-#define FILEOP_ABORT	0
-#define FILE_COMPRESSION_NONE	0
-#define FILEOP_RENAME	1
-#define FILEOP_DOIT	1
-#define FILE_COMPRESSION_WINLZA	1
-#define FILEOP_DELETE	2
-#define FILEOP_SKIP	2
-#define FILE_COMPRESSION_MSZIP	2
-#define FILEOP_BACKUP	3
-#define FILE_COMPRESSION_NTCAB	3
-#define FILEOP_NEWPATH	4
-#define FILEOP_RETRY	FILEOP_DOIT
-#define FLG_ADDREG_TYPE_SZ	0x00000000
-#define FLG_ADDREG_BINVALUETYPE	0x00000001
-#define FLG_ADDREG_NOCLOBBER	0x00000002
-#define FLG_ADDREG_DELVAL	0x00000004
-#define FLG_ADDREG_APPEND	0x00000008
-#define FLG_ADDREG_KEYONLY	0x00000010
-#define FLG_ADDREG_OVERWRITEONLY	0x00000020
-#define FLG_ADDREG_TYPE_MULTI_SZ	0x00010000
-#define FLG_ADDREG_TYPE_EXPAND_SZ	0x00020000
-#define FLG_ADDREG_TYPE_BINARY	(0x00000000|FLG_ADDREG_BINVALUETYPE)
-#define FLG_ADDREG_TYPE_DWORD	(0x00010000|FLG_ADDREG_BINVALUETYPE)
-#define FLG_ADDREG_TYPE_NONE	(0x00020000|FLG_ADDREG_BINVALUETYPE)
-#define FLG_ADDREG_TYPE_MASK	(0xFFFF0000|FLG_ADDREG_BINVALUETYPE)
-#define FLG_BITREG_CLEARBITS	0x00000000
-#define FLG_BITREG_SETBITS	0x00000001
-#define FLG_PROFITEM_CURRENTUSER	0x00000001
-#define FLG_PROFITEM_DELETE	0x00000002
-#define FLG_PROFITEM_GROUP	0x00000004
-#define FLG_PROFITEM_CSIDL	0x00000008
-#define FLG_REGSVR_DLLREGISTER	0x00000001
-#define FLG_REGSVR_DLLINSTALL	0x00000002
-#define MIN_IDD_DYNAWIZ_RESOURCE_ID	10000
-#define MAX_IDD_DYNAWIZ_RESOURCE_ID	11000
-#define IDD_DYNAWIZ_FIRSTPAGE	10000
-#define IDD_DYNAWIZ_SELECT_PREVPAGE	10001
-#define IDD_DYNAWIZ_SELECT_NEXTPAGE	10002
-#define IDD_DYNAWIZ_ANALYZE_PREVPAGE	10003
-#define IDD_DYNAWIZ_ANALYZE_NEXTPAGE	10004
-#define IDD_DYNAWIZ_INSTALLDETECTED_PREVPAGE	10006
-#define IDD_DYNAWIZ_INSTALLDETECTED_NEXTPAGE	10007
-#define IDD_DYNAWIZ_INSTALLDETECTED_NODEVS	10008
-#define IDD_DYNAWIZ_SELECTDEV_PAGE	10009
-#define IDD_DYNAWIZ_ANALYZEDEV_PAGE	10010
-#define IDD_DYNAWIZ_INSTALLDETECTEDDEVS_PAGE	10011
-#define IDD_DYNAWIZ_SELECTCLASS_PAGE	10012
-#define IDF_NOBROWSE	0x00000001
-#define IDF_NOSKIP	0x00000002
-#define IDF_NODETAILS	0x00000004
-#define IDF_NOCOMPRESSED	0x00000008
-#define IDF_CHECKFIRST	0x00000100
-#define IDF_NOBEEP	0x00000200
-#define IDF_NOFOREGROUND	0x00000400
-#define IDF_WARNIFSKIP	0x00000800
-#define IDF_OEMDISK	0x80000000
-#define IDI_RESOURCEFIRST	159
-#define IDI_RESOURCE	159
-#define IDI_RESOURCELAST	161
-#define IDI_RESOURCEOVERLAYFIRST	161
-#define IDI_RESOURCEOVERLAYLAST	161
-#define IDI_CONFLICT	161
-#define IDI_PROBLEM_OVL	500
-#define IDI_DISABLED_OVL	501
-#define IDI_FORCED_OVL	502
-#define IDI_CLASSICON_OVERLAYFIRST	500
-#define IDI_CLASSICON_OVERLAYLAST	502
-#define INF_STYLE_NONE	0x00000000
-#define INF_STYLE_OLDNT	0x00000001
-#define INF_STYLE_WIN4	0x00000002
-#define INF_STYLE_CACHE_ENABLE	0x00000010
-#define INF_STYLE_CACHE_DISABLE	0x00000020
-#define INFINFO_INF_SPEC_IS_HINF	1
-#define INFINFO_INF_NAME_IS_ABSOLUTE	2
-#define INFINFO_DEFAULT_SEARCH	3
-#define INFINFO_REVERSE_DEFAULT_SEARCH	4
-#define INFINFO_INF_PATH_LIST_SEARCH	5
-#define LogSevInformation	0
-#define LogSevWarning	1
-#define LogSevError	2
-#define LogSevFatalError	3
-#define LogSevMaximum	4
-#define LogSeverity	DWORD
-#define MAX_INSTALLWIZARD_DYNAPAGES	20
-#define NDW_INSTALLFLAG_DIDFACTDEFS	0x00000001
-#define NDW_INSTALLFLAG_HARDWAREALLREADYIN	0x00000002
-#define NDW_INSTALLFLAG_NEEDSHUTDOWN	0x00000200
-#define NDW_INSTALLFLAG_EXPRESSINTRO	0x00000400
-#define NDW_INSTALLFLAG_SKIPISDEVINSTALLED	0x00000800
-#define NDW_INSTALLFLAG_NODETECTEDDEVS	0x00001000
-#define NDW_INSTALLFLAG_INSTALLSPECIFIC	0x00002000
-#define NDW_INSTALLFLAG_SKIPCLASSLIST	0x00004000
-#define NDW_INSTALLFLAG_CI_PICKED_OEM	0x00008000
-#define NDW_INSTALLFLAG_PCMCIAMODE	0x00010000
-#define NDW_INSTALLFLAG_PCMCIADEVICE	0x00020000
-#define NDW_INSTALLFLAG_USERCANCEL	0x00040000
-#define NDW_INSTALLFLAG_KNOWNCLASS	0x00080000
-#define NDW_INSTALLFLAG_NEEDRESTART	0x00000080
-#define NDW_INSTALLFLAG_NEEDREBOOT	0x00000100
-#define SETDIRID_NOT_FULL_PATH	0x00000001
-#define SP_COPY_DELETESOURCE	0x0000001
-#define SP_COPY_REPLACEONLY	0x0000002
-#define SP_COPY_NEWER	0x0000004
-#define SP_COPY_NEWER_OR_SAME	0x0000004
-#define SP_COPY_NOOVERWRITE	0x0000008
-#define SP_COPY_NODECOMP	0x0000010
-#define SP_COPY_LANGUAGEAWARE	0x0000020
-#define SP_COPY_SOURCE_ABSOLUTE	0x0000040
-#define SP_COPY_SOURCEPATH_ABSOLUTE	0x0000080
-#define SP_COPY_IN_USE_NEEDS_REBOOT	0x0000100
-#define SP_COPY_FORCE_IN_USE	0x0000200
-#define SP_COPY_NOSKIP	0x0000400
-#define SP_COPY_FORCE_NOOVERWRITE	0x0001000
-#define SP_COPY_FORCE_NEWER	0x0002000
-#define SP_COPY_WARNIFSKIP	0x0004000
-#define SP_COPY_NOBROWSE	0x0008000
-#define SP_COPY_NEWER_ONLY	0x0010000
-#define SP_COPY_SOURCE_SIS_MASTER	0x0020000
-#define SP_COPY_OEMINF_CATALOG_ONLY	0x0040000
-#define SP_COPY_REPLACE_BOOT_FILE	0x0080000
-#define SP_COPY_NOPRUNE	0x0100000
-#define SP_FLAG_CABINETCONTINUATION	0x0000800
-#define SPCRP_SECURITY	23
-#define SPCRP_SECURITY_SDS	24
-#define SPCRP_DEVTYPE	25
-#define SPCRP_EXCLUSIVE	26
-#define SPCRP_CHARACTERISTICS	27
-#define SPCRP_MAXIMUM_PROPERTY	28
-#define SPDIT_NODRIVER	0
-#define SPDIT_CLASSDRIVER	1
-#define SPDIT_COMPATDRIVER	2
-#define SPDRP_DEVICEDESC	0
-#define SPDRP_HARDWAREID	1
-#define SPDRP_COMPATIBLEIDS	2
-#define SPDRP_UNUSED0	3
-#define SPDRP_SERVICE	4
-#define SPDRP_UNUSED1	5
-#define SPDRP_UNUSED2	6
-#define SPDRP_CLASS	7
-#define SPDRP_CLASSGUID	8
-#define SPDRP_DRIVER	9
-#define SPDRP_CONFIGFLAGS	10
-#define SPDRP_MFG	11
-#define SPDRP_FRIENDLYNAME	12
-#define SPDRP_LOCATION_INFORMATION	13
-#define SPDRP_PHYSICAL_DEVICE_OBJECT_NAME	14
-#define SPDRP_CAPABILITIES	15
-#define SPDRP_UI_NUMBER	16
-#define SPDRP_UPPERFILTERS	17
-#define SPDRP_LOWERFILTERS	18
-#define SPDRP_BUSTYPEGUID	19
-#define SPDRP_LEGACYBUSTYPE	20
-#define SPDRP_BUSNUMBER	21
-#define SPDRP_ENUMERATOR_NAME	22
-#define SPDRP_SECURITY	23
-#define SPDRP_SECURITY_SDS	24
-#define SPDRP_DEVTYPE	25
-#define SPDRP_EXCLUSIVE	26
-#define SPDRP_CHARACTERISTICS	27
-#define SPDRP_ADDRESS	28
-#define SPDRP_UI_NUMBER_DESC_FORMAT	30
-#define SPDRP_MAXIMUM_PROPERTY	31
-#define SPDSL_IGNORE_DISK	1
-#define SPDSL_DISALLOW_NEGATIVE_ADJUST	2
-
-#define SPFILENOTIFY_STARTQUEUE	1
-#define SPFILENOTIFY_ENDQUEUE	2
-#define SPFILENOTIFY_STARTSUBQUEUE	3
-#define SPFILENOTIFY_ENDSUBQUEUE	4
-#define SPFILENOTIFY_STARTDELETE	5
-#define SPFILENOTIFY_ENDDELETE	6
-#define SPFILENOTIFY_DELETEERROR	7
-#define SPFILENOTIFY_STARTRENAME	8
-#define SPFILENOTIFY_ENDRENAME	9
-#define SPFILENOTIFY_RENAMEERROR	10
-#define SPFILENOTIFY_STARTCOPY	11
-#define SPFILENOTIFY_ENDCOPY	12
-#define SPFILENOTIFY_COPYERROR	13
-#define SPFILENOTIFY_NEEDMEDIA	14
-#define SPFILENOTIFY_QUEUESCAN	15
-#define SPFILENOTIFY_CABINETINFO	16
-#define SPFILENOTIFY_FILEINCABINET	17
-#define SPFILENOTIFY_NEEDNEWCABINET	18
-#define SPFILENOTIFY_FILEEXTRACTED	19
-#define SPFILENOTIFY_FILEOPDELAYED	20
-#define SPFILENOTIFY_STARTBACKUP	21
-#define SPFILENOTIFY_BACKUPERROR	22
-#define SPFILENOTIFY_ENDBACKUP	23
-#define SPFILENOTIFY_QUEUESCAN_EX	24
-#define SPFILENOTIFY_LANGMISMATCH	0x00010000
-#define SPFILENOTIFY_TARGETEXISTS	0x00020000
-#define SPFILENOTIFY_TARGETNEWER	0x00040000
-#define SPFILELOG_SYSTEMLOG	0x00000001
-#define SPFILELOG_OEMFILE	0x00000001
-#define SPFILELOG_FORCENEW	0x00000002
-#define SPFILELOG_QUERYONLY	0x00000004
-#define SPFILEQ_FILE_IN_USE	0x00000001
-#define SPFILEQ_REBOOT_RECOMMENDED	0x00000002
-#define SPFILEQ_REBOOT_IN_PROGRESS	0x00000004
-#define SPINT_ACTIVE	0x00000001
-#define SPINT_DEFAULT	0x00000002
-#define SPINT_REMOVED	0x00000004
-#define SPID_ACTIVE	0x00000001
-#define SPID_DEFAULT	0x00000002
-#define SPID_REMOVED	0x00000004
-#define SPINST_LOGCONFIG	0x00000001
-#define SPINST_INIFILES	0x00000002
-#define SPINST_REGISTRY	0x00000004
-#define SPINST_INI2REG	0x00000008
-#define SPINST_FILES	0x00000010
-#define SPINST_BITREG	0x00000020
-#define SPINST_REGSVR	0x00000040
-#define SPINST_UNREGSVR	0x00000080
-#define SPINST_PROFILEITEMS	0x00000100
-#define SPINST_ALL	0x000001ff
-#define SPINST_SINGLESECTION	0x00010000
-#define SPINST_LOGCONFIG_IS_FORCED	0x00020000
-#define SPINST_LOGCONFIGS_ARE_OVERRIDES	0x00040000
-#define SPOST_NONE	0
-#define SPOST_PATH	1
-#define SPOST_URL	2
-#define SPOST_MAX	3
-#define SPPSR_SELECT_DEVICE_RESOURCES	1
-#define SPPSR_ENUM_BASIC_DEVICE_PROPERTIES	2
-#define SPPSR_ENUM_ADV_DEVICE_PROPERTIES	3
-#define SPQ_SCAN_FILE_PRESENCE	0x00000001
-#define SPQ_DELAYED_COPY	0x00000001
-#define SPQ_SCAN_FILE_VALIDITY	0x00000002
-#define SPQ_SCAN_USE_CALLBACK	0x00000004
-#define SPQ_SCAN_USE_CALLBACKEX	0x00000008
-#define SPQ_SCAN_INFORM_USER	0x00000010
-#define SPQ_SCAN_PRUNE_COPY_QUEUE	0x00000020
-#define SPRDI_FIND_DUPS	0x00000001
-#define SPSVCINST_TAGTOFRONT	0x00000001
-#define SPSVCINST_ASSOCSERVICE	0x00000002
-#define SPSVCINST_DELETEEVENTLOGENTRY	0x00000004
-#define SPSVCINST_NOCLOBBER_DISPLAYNAME	0x00000008
-#define SPSVCINST_NOCLOBBER_STARTTYPE	0x00000010
-#define SPSVCINST_NOCLOBBER_ERRORCONTROL	0x00000020
-#define SPSVCINST_NOCLOBBER_LOADORDERGROUP	0x00000040
-#define SPSVCINST_NOCLOBBER_DEPENDENCIES	0x00000080
-#define SPSVCINST_NOCLOBBER_DESCRIPTION	0x00000100
-#define SPSVCINST_STOPSERVICE	0x00000200
-#define SPWPT_SELECTDEVICE	0x00000001
-#define SPWP_USE_DEVINFO_DATA	0x00000001
-#define SRCINFO_PATH	1
-#define SRCINFO_TAGFILE	2
-#define SRCINFO_DESCRIPTION	3
-#define SRCINFO_FLAGS	4
-#define SRCLIST_TEMPORARY	0x00000001
-#define SRCLIST_NOBROWSE	0x00000002
-#define SRCLIST_SYSTEM	0x00000010
-#define SRCLIST_USER	0x00000020
-#define SRCLIST_SYSIFADMIN	0x00000040
-#define SRCLIST_SUBDIRS	0x00000100
-#define SRCLIST_APPEND	0x00000200
-#define SRCLIST_NOSTRIPPLATFORM	0x00000400
-
-#ifndef RC_INVOKED
-typedef PVOID HINF;
-typedef PVOID HDSKSPC;
-typedef PVOID HDEVINFO;
-typedef PVOID HSPFILEQ;
-typedef PVOID HSPFILELOG;
-typedef UINT DI_FUNCTION;
-
-typedef enum {
-    SetupFileLogSourceFilename,
-    SetupFileLogChecksum,
-    SetupFileLogDiskTagfile,
-    SetupFileLogDiskDescription,
-    SetupFileLogOtherInfo,
-    SetupFileLogMax
-} SetupFileLogInfo;
-typedef struct _INFCONTEXT {
-    PVOID Inf;
-    PVOID CurrentInf;
-    UINT Section;
-    UINT Line;
-} INFCONTEXT, *PINFCONTEXT;
-typedef struct _SP_INF_INFORMATION {
-    DWORD InfStyle;
-    DWORD InfCount;
-    BYTE VersionData[ANYSIZE_ARRAY];
-} SP_INF_INFORMATION, *PSP_INF_INFORMATION;
-typedef struct _SP_ALTPLATFORM_INFO {
-    DWORD cbSize;
-    DWORD Platform;
-    DWORD MajorVersion;
-    DWORD MinorVersion;
-    WORD  ProcessorArchitecture;
-    WORD  Reserved;
-} SP_ALTPLATFORM_INFO, *PSP_ALTPLATFORM_INFO;
-typedef struct _SP_ORIGINAL_FILE_INFO_A {
-    DWORD  cbSize;
-    CHAR   OriginalInfName[MAX_PATH];
-    CHAR   OriginalCatalogName[MAX_PATH];
-} SP_ORIGINAL_FILE_INFO_A, *PSP_ORIGINAL_FILE_INFO_A;
-typedef struct _SP_ORIGINAL_FILE_INFO_W {
-    DWORD  cbSize;
-    WCHAR  OriginalInfName[MAX_PATH];
-    WCHAR  OriginalCatalogName[MAX_PATH];
-} SP_ORIGINAL_FILE_INFO_W, *PSP_ORIGINAL_FILE_INFO_W;
-typedef struct _FILEPATHS_A {
-    PCSTR  Target;
-    PCSTR  Source;
-    UINT   Win32Error;
-    DWORD  Flags;
-} FILEPATHS_A, *PFILEPATHS_A;
-typedef struct _FILEPATHS_W {
-    PCWSTR Target;
-    PCWSTR Source;
-    UINT   Win32Error;
-    DWORD  Flags;
-} FILEPATHS_W, *PFILEPATHS_W;
-typedef struct _SOURCE_MEDIA_A {
-    PCSTR Reserved;
-    PCSTR Tagfile;
-    PCSTR Description;
-    PCSTR SourcePath;
-    PCSTR SourceFile;
-    DWORD Flags;
-} SOURCE_MEDIA_A, *PSOURCE_MEDIA_A;
-typedef struct _SOURCE_MEDIA_W {
-    PCWSTR Reserved;
-    PCWSTR Tagfile;
-    PCWSTR Description;
-    PCWSTR SourcePath;
-    PCWSTR SourceFile;
-    DWORD  Flags;
-} SOURCE_MEDIA_W, *PSOURCE_MEDIA_W;
-typedef struct _CABINET_INFO_A {
-    PCSTR CabinetPath;
-    PCSTR CabinetFile;
-    PCSTR DiskName;
-    USHORT SetId;
-    USHORT CabinetNumber;
-} CABINET_INFO_A, *PCABINET_INFO_A;
-typedef struct _CABINET_INFO_W {
-    PCWSTR CabinetPath;
-    PCWSTR CabinetFile;
-    PCWSTR DiskName;
-    USHORT SetId;
-    USHORT CabinetNumber;
-} CABINET_INFO_W, *PCABINET_INFO_W;
-typedef struct _FILE_IN_CABINET_INFO_A {
-    PCSTR NameInCabinet;
-    DWORD FileSize;
-    DWORD Win32Error;
-    WORD  DosDate;
-    WORD  DosTime;
-    WORD  DosAttribs;
-    CHAR  FullTargetName[MAX_PATH];
-} FILE_IN_CABINET_INFO_A, *PFILE_IN_CABINET_INFO_A;
-typedef struct _FILE_IN_CABINET_INFO_W {
-    PCWSTR NameInCabinet;
-    DWORD  FileSize;
-    DWORD  Win32Error;
-    WORD   DosDate;
-    WORD   DosTime;
-    WORD   DosAttribs;
-    WCHAR  FullTargetName[MAX_PATH];
-} FILE_IN_CABINET_INFO_W, *PFILE_IN_CABINET_INFO_W;
-typedef struct _SP_FILE_COPY_PARAMS_A {
-    DWORD    cbSize;
-    HSPFILEQ QueueHandle;
-    PCSTR    SourceRootPath;
-    PCSTR    SourcePath;
-    PCSTR    SourceFilename;
-    PCSTR    SourceDescription;
-    PCSTR    SourceTagfile;
-    PCSTR    TargetDirectory;
-    PCSTR    TargetFilename;
-    DWORD    CopyStyle;
-    HINF     LayoutInf;
-    PCSTR    SecurityDescriptor;
-} SP_FILE_COPY_PARAMS_A, *PSP_FILE_COPY_PARAMS_A;
-typedef struct _SP_FILE_COPY_PARAMS_W {
-    DWORD    cbSize;
-    HSPFILEQ QueueHandle;
-    PCWSTR   SourceRootPath;
-    PCWSTR   SourcePath;
-    PCWSTR   SourceFilename;
-    PCWSTR   SourceDescription;
-    PCWSTR   SourceTagfile;
-    PCWSTR   TargetDirectory;
-    PCWSTR   TargetFilename;
-    DWORD    CopyStyle;
-    HINF     LayoutInf;
-    PCWSTR   SecurityDescriptor;
-} SP_FILE_COPY_PARAMS_W, *PSP_FILE_COPY_PARAMS_W;
-typedef struct _SP_DEVINFO_DATA {
-    DWORD cbSize;
-    GUID  ClassGuid;
-    DWORD DevInst;
-    ULONG_PTR Reserved;
-} SP_DEVINFO_DATA, *PSP_DEVINFO_DATA;
-typedef struct _SP_DEVICE_INTERFACE_DATA {
-    DWORD cbSize;
-    GUID  InterfaceClassGuid;
-    DWORD Flags;
-    ULONG_PTR Reserved;
-} SP_DEVICE_INTERFACE_DATA, *PSP_DEVICE_INTERFACE_DATA;
-/* For backward compatability */
-typedef SP_DEVICE_INTERFACE_DATA  SP_INTERFACE_DEVICE_DATA, *PSP_INTERFACE_DEVICE_DATA;
-
-typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATA_A {
-    DWORD  cbSize;
-    CHAR   DevicePath[ANYSIZE_ARRAY];
-} SP_DEVICE_INTERFACE_DETAIL_DATA_A, *PSP_DEVICE_INTERFACE_DETAIL_DATA_A;
-typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATA_W {
-    DWORD  cbSize;
-    WCHAR  DevicePath[ANYSIZE_ARRAY];
-} SP_DEVICE_INTERFACE_DETAIL_DATA_W, *PSP_DEVICE_INTERFACE_DETAIL_DATA_W;
-/* For backward compatability */
-typedef SP_DEVICE_INTERFACE_DETAIL_DATA_A SP_INTERFACE_DEVICE_DETAIL_DATA_A,
-    *PSP_INTERFACE_DEVICE_DETAIL_DATA_A;
-typedef SP_DEVICE_INTERFACE_DETAIL_DATA_W SP_INTERFACE_DEVICE_DETAIL_DATA_W,
-    *PSP_INTERFACE_DEVICE_DETAIL_DATA_W;
-
-typedef struct _SP_DEVINFO_LIST_DETAIL_DATA_A {
-    DWORD  cbSize;
-    GUID   ClassGuid;
-    HANDLE RemoteMachineHandle;
-    CHAR   RemoteMachineName[SP_MAX_MACHINENAME_LENGTH];
-} SP_DEVINFO_LIST_DETAIL_DATA_A, *PSP_DEVINFO_LIST_DETAIL_DATA_A;
-typedef struct _SP_DEVINFO_LIST_DETAIL_DATA_W {
-    DWORD  cbSize;
-    GUID   ClassGuid;
-    HANDLE RemoteMachineHandle;
-    WCHAR  RemoteMachineName[SP_MAX_MACHINENAME_LENGTH];
-} SP_DEVINFO_LIST_DETAIL_DATA_W, *PSP_DEVINFO_LIST_DETAIL_DATA_W;
-
-typedef UINT (CALLBACK* PSP_FILE_CALLBACK_A)(PVOID,UINT,UINT_PTR,UINT_PTR);
-typedef UINT (CALLBACK* PSP_FILE_CALLBACK_W)(PVOID,UINT,UINT_PTR,UINT_PTR);
-typedef struct _SP_DEVINSTALL_PARAMS_A {
-    DWORD             cbSize;
-    DWORD             Flags;
-    DWORD             FlagsEx;
-    HWND              hwndParent;
-    PSP_FILE_CALLBACK_A InstallMsgHandler;
-    PVOID             InstallMsgHandlerContext;
-    HSPFILEQ          FileQueue;
-    ULONG_PTR         ClassInstallReserved;
-    DWORD             Reserved;
-    CHAR              DriverPath[MAX_PATH];
-} SP_DEVINSTALL_PARAMS_A, *PSP_DEVINSTALL_PARAMS_A;
-typedef struct _SP_DEVINSTALL_PARAMS_W {
-    DWORD             cbSize;
-    DWORD             Flags;
-    DWORD             FlagsEx;
-    HWND              hwndParent;
-    PSP_FILE_CALLBACK_W InstallMsgHandler;
-    PVOID             InstallMsgHandlerContext;
-    HSPFILEQ          FileQueue;
-    ULONG_PTR         ClassInstallReserved;
-    DWORD             Reserved;
-    WCHAR             DriverPath[MAX_PATH];
-} SP_DEVINSTALL_PARAMS_W, *PSP_DEVINSTALL_PARAMS_W;
-typedef struct _SP_CLASSINSTALL_HEADER {
-    DWORD       cbSize;
-    DI_FUNCTION InstallFunction;
-} SP_CLASSINSTALL_HEADER, *PSP_CLASSINSTALL_HEADER;
-typedef struct _SP_ENABLECLASS_PARAMS {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    GUID                   ClassGuid;
-    DWORD                  EnableMessage;
-} SP_ENABLECLASS_PARAMS, *PSP_ENABLECLASS_PARAMS;
-typedef struct _SP_MOVEDEV_PARAMS {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    SP_DEVINFO_DATA        SourceDeviceInfoData;
-} SP_MOVEDEV_PARAMS, *PSP_MOVEDEV_PARAMS;
-typedef struct _SP_PROPCHANGE_PARAMS {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    DWORD                  StateChange;
-    DWORD                  Scope;
-    DWORD                  HwProfile;
-} SP_PROPCHANGE_PARAMS, *PSP_PROPCHANGE_PARAMS;
-typedef struct _SP_REMOVEDEVICE_PARAMS {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    DWORD Scope;
-    DWORD HwProfile;
-} SP_REMOVEDEVICE_PARAMS, *PSP_REMOVEDEVICE_PARAMS;
-typedef struct _SP_UNREMOVEDEVICE_PARAMS {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    DWORD Scope;
-    DWORD HwProfile;
-} SP_UNREMOVEDEVICE_PARAMS, *PSP_UNREMOVEDEVICE_PARAMS;
-typedef struct _SP_SELECTDEVICE_PARAMS_A {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    CHAR                   Title[MAX_TITLE_LEN];
-    CHAR                   Instructions[MAX_INSTRUCTION_LEN];
-    CHAR                   ListLabel[MAX_LABEL_LEN];
-    CHAR                   SubTitle[MAX_SUBTITLE_LEN];
-    BYTE                   Reserved[2];
-} SP_SELECTDEVICE_PARAMS_A, *PSP_SELECTDEVICE_PARAMS_A;
-typedef struct _SP_SELECTDEVICE_PARAMS_W {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    WCHAR                  Title[MAX_TITLE_LEN];
-    WCHAR                  Instructions[MAX_INSTRUCTION_LEN];
-    WCHAR                  ListLabel[MAX_LABEL_LEN];
-    WCHAR                  SubTitle[MAX_SUBTITLE_LEN];
-} SP_SELECTDEVICE_PARAMS_W, *PSP_SELECTDEVICE_PARAMS_W;
-
-typedef BOOL (CALLBACK* PDETECT_PROGRESS_NOTIFY)(PVOID,DWORD);
-typedef struct _SP_DETECTDEVICE_PARAMS {
-    SP_CLASSINSTALL_HEADER  ClassInstallHeader;
-    PDETECT_PROGRESS_NOTIFY DetectProgressNotify;
-    PVOID                   ProgressNotifyParam;
-} SP_DETECTDEVICE_PARAMS, *PSP_DETECTDEVICE_PARAMS;
-typedef struct _SP_INSTALLWIZARD_DATA {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    DWORD                  Flags;
-    HPROPSHEETPAGE         DynamicPages[MAX_INSTALLWIZARD_DYNAPAGES];
-    DWORD                  NumDynamicPages;
-    DWORD                  DynamicPageFlags;
-    DWORD                  PrivateFlags;
-    LPARAM                 PrivateData;
-    HWND                   hwndWizardDlg;
-} SP_INSTALLWIZARD_DATA, *PSP_INSTALLWIZARD_DATA;
-typedef struct _SP_NEWDEVICEWIZARD_DATA {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    DWORD                  Flags;
-    HPROPSHEETPAGE         DynamicPages[MAX_INSTALLWIZARD_DYNAPAGES];
-    DWORD                  NumDynamicPages;
-    HWND                   hwndWizardDlg;
-} SP_NEWDEVICEWIZARD_DATA, *PSP_NEWDEVICEWIZARD_DATA;
-typedef SP_NEWDEVICEWIZARD_DATA SP_ADDPROPERTYPAGE_DATA,
-    *PSP_ADDPROPERTYPAGE_DATA;
-typedef struct _SP_TROUBLESHOOTER_PARAMS_A {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    CHAR                   ChmFile[MAX_PATH];
-    CHAR                   HtmlTroubleShooter[MAX_PATH];
-} SP_TROUBLESHOOTER_PARAMS_A, *PSP_TROUBLESHOOTER_PARAMS_A;
-typedef struct _SP_TROUBLESHOOTER_PARAMS_W {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    WCHAR                  ChmFile[MAX_PATH];
-    WCHAR                  HtmlTroubleShooter[MAX_PATH];
-} SP_TROUBLESHOOTER_PARAMS_W, *PSP_TROUBLESHOOTER_PARAMS_W;
-typedef struct _SP_POWERMESSAGEWAKE_PARAMS_A {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    CHAR                   PowerMessageWake[LINE_LEN*2];
-} SP_POWERMESSAGEWAKE_PARAMS_A, *PSP_POWERMESSAGEWAKE_PARAMS_A;
-typedef struct _SP_POWERMESSAGEWAKE_PARAMS_W {
-    SP_CLASSINSTALL_HEADER ClassInstallHeader;
-    WCHAR                  PowerMessageWake[LINE_LEN*2];
-} SP_POWERMESSAGEWAKE_PARAMS_W, *PSP_POWERMESSAGEWAKE_PARAMS_W;
-typedef struct _SP_DRVINFO_DATA_V2_A {
-    DWORD     cbSize;
-    DWORD     DriverType;
-    ULONG_PTR Reserved;
-    CHAR      Description[LINE_LEN];
-    CHAR      MfgName[LINE_LEN];
-    CHAR      ProviderName[LINE_LEN];
-    FILETIME  DriverDate;
-    DWORDLONG DriverVersion;
-} SP_DRVINFO_DATA_V2_A, *PSP_DRVINFO_DATA_V2_A;
-typedef struct _SP_DRVINFO_DATA_V2_W {
-    DWORD     cbSize;
-    DWORD     DriverType;
-    ULONG_PTR Reserved;
-    WCHAR     Description[LINE_LEN];
-    WCHAR     MfgName[LINE_LEN];
-    WCHAR     ProviderName[LINE_LEN];
-    FILETIME  DriverDate;
-    DWORDLONG DriverVersion;
-} SP_DRVINFO_DATA_V2_W, *PSP_DRVINFO_DATA_V2_W;
-typedef struct _SP_DRVINFO_DATA_V1_A {
-    DWORD     cbSize;
-    DWORD     DriverType;
-    ULONG_PTR Reserved;
-    CHAR      Description[LINE_LEN];
-    CHAR      MfgName[LINE_LEN];
-    CHAR      ProviderName[LINE_LEN];
-} SP_DRVINFO_DATA_V1_A, *PSP_DRVINFO_DATA_V1_A;
-typedef struct _SP_DRVINFO_DATA_V1_W {
-    DWORD     cbSize;
-    DWORD     DriverType;
-    ULONG_PTR Reserved;
-    WCHAR     Description[LINE_LEN];
-    WCHAR     MfgName[LINE_LEN];
-    WCHAR     ProviderName[LINE_LEN];
-} SP_DRVINFO_DATA_V1_W, *PSP_DRVINFO_DATA_V1_W;
-
-#ifdef UNICODE
-typedef SP_DRVINFO_DATA_V1_W SP_DRVINFO_DATA_V1, *PSP_DRVINFO_DATA_V1;
-typedef SP_DRVINFO_DATA_V2_W SP_DRVINFO_DATA_V2, *PSP_DRVINFO_DATA_V2;
-#else
-typedef SP_DRVINFO_DATA_V1_A SP_DRVINFO_DATA_V1, *PSP_DRVINFO_DATA_V1;
-typedef SP_DRVINFO_DATA_V2_A SP_DRVINFO_DATA_V2, *PSP_DRVINFO_DATA_V2;
-#endif
-
-#if USE_SP_DRVINFO_DATA_V1
-typedef SP_DRVINFO_DATA_V1_A SP_DRVINFO_DATA_A, *PSP_DRVINFO_DATA_A;
-typedef SP_DRVINFO_DATA_V1_W SP_DRVINFO_DATA_W, *PSP_DRVINFO_DATA_W;
-typedef SP_DRVINFO_DATA_V1 SP_DRVINFO_DATA, *PSP_DRVINFO_DATA;
-#else
-typedef SP_DRVINFO_DATA_V2_A SP_DRVINFO_DATA_A, *PSP_DRVINFO_DATA_A;
-typedef SP_DRVINFO_DATA_V2_W SP_DRVINFO_DATA_W, *PSP_DRVINFO_DATA_W;
-typedef SP_DRVINFO_DATA_V2 SP_DRVINFO_DATA, *PSP_DRVINFO_DATA;
-#endif
-
-typedef DWORD (CALLBACK* PSP_DETSIG_CMPPROC)(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINFO_DATA,PVOID);
-
-typedef struct _SP_DRVINFO_DETAIL_DATA_A {
-    DWORD    cbSize;
-    FILETIME InfDate;
-    DWORD    CompatIDsOffset;
-    DWORD    CompatIDsLength;
-    ULONG_PTR Reserved;
-    CHAR     SectionName[LINE_LEN];
-    CHAR     InfFileName[MAX_PATH];
-    CHAR     DrvDescription[LINE_LEN];
-    CHAR     HardwareID[ANYSIZE_ARRAY];
-} SP_DRVINFO_DETAIL_DATA_A, *PSP_DRVINFO_DETAIL_DATA_A;
-typedef struct _SP_DRVINFO_DETAIL_DATA_W {
-    DWORD    cbSize;
-    FILETIME InfDate;
-    DWORD    CompatIDsOffset;
-    DWORD    CompatIDsLength;
-    ULONG_PTR Reserved;
-    WCHAR    SectionName[LINE_LEN];
-    WCHAR    InfFileName[MAX_PATH];
-    WCHAR    DrvDescription[LINE_LEN];
-    WCHAR    HardwareID[ANYSIZE_ARRAY];
-} SP_DRVINFO_DETAIL_DATA_W, *PSP_DRVINFO_DETAIL_DATA_W;
-typedef struct _SP_DRVINSTALL_PARAMS {
-    DWORD cbSize;
-    DWORD Rank;
-    DWORD Flags;
-    DWORD_PTR PrivateData;
-    DWORD Reserved;
-} SP_DRVINSTALL_PARAMS, *PSP_DRVINSTALL_PARAMS;
-
-
-typedef struct _COINSTALLER_CONTEXT_DATA {
-    BOOL  PostProcessing;
-    DWORD InstallResult;
-    PVOID PrivateData;
-} COINSTALLER_CONTEXT_DATA, *PCOINSTALLER_CONTEXT_DATA;
-typedef struct _SP_CLASSIMAGELIST_DATA {
-    DWORD      cbSize;
-    HIMAGELIST ImageList;
-    ULONG_PTR  Reserved;
-} SP_CLASSIMAGELIST_DATA, *PSP_CLASSIMAGELIST_DATA;
-typedef struct _SP_PROPSHEETPAGE_REQUEST {
-    DWORD            cbSize;
-    DWORD            PageRequested;
-    HDEVINFO         DeviceInfoSet;
-    PSP_DEVINFO_DATA DeviceInfoData;
-} SP_PROPSHEETPAGE_REQUEST, *PSP_PROPSHEETPAGE_REQUEST;
-typedef struct _SP_BACKUP_QUEUE_PARAMS_A {
-    DWORD    cbSize;
-    CHAR     FullInfPath[MAX_PATH];
-    INT      FilenameOffset;
-} SP_BACKUP_QUEUE_PARAMS_A, *PSP_BACKUP_QUEUE_PARAMS_A;
-typedef struct _SP_BACKUP_QUEUE_PARAMS_W {
-    DWORD    cbSize;
-    WCHAR    FullInfPath[MAX_PATH];
-    INT      FilenameOffset;
-} SP_BACKUP_QUEUE_PARAMS_W, *PSP_BACKUP_QUEUE_PARAMS_W;
-
-
-#ifdef UNICODE
-typedef SP_ORIGINAL_FILE_INFO_W SP_ORIGINAL_FILE_INFO, *PSP_ORIGINAL_FILE_INFO;
-typedef FILEPATHS_W FILEPATHS, *PFILEPATHS;
-typedef SOURCE_MEDIA_W SOURCE_MEDIA, *PSOURCE_MEDIA;
-typedef CABINET_INFO_W CABINET_INFO, *PCABINET_INFO;
-typedef FILE_IN_CABINET_INFO_W FILE_IN_CABINET_INFO, *PFILE_IN_CABINET_INFO;
-typedef SP_FILE_COPY_PARAMS_W SP_FILE_COPY_PARAMS, PSP_FILE_COPY_PARAMS;
-typedef SP_DEVICE_INTERFACE_DETAIL_DATA_W SP_DEVICE_INTERFACE_DETAIL_DATA,
-    *PSP_DEVICE_INTERFACE_DETAIL_DATA;
-typedef SP_INTERFACE_DEVICE_DETAIL_DATA_W SP_INTERFACE_DEVICE_DETAIL_DATA,
-    *PSP_INTERFACE_DEVICE_DETAIL_DATA; /* deprecated */
-typedef SP_DEVINFO_LIST_DETAIL_DATA_W SP_DEVINFO_LIST_DETAIL_DATA,
-    *PSP_DEVINFO_LIST_DETAIL_DATA;
-typedef SP_DEVINSTALL_PARAMS_W SP_DEVINSTALL_PARAMS, *PSP_DEVINSTALL_PARAMS;
-typedef SP_SELECTDEVICE_PARAMS_W SP_SELECTDEVICE_PARAMS, *PSP_SELECTDEVICE_PARAMS;
-typedef SP_TROUBLESHOOTER_PARAMS_W SP_TROUBLESHOOTER_PARAMS,
-    *PSP_TROUBLESHOOTER_PARAMS;
-typedef SP_POWERMESSAGEWAKE_PARAMS_W SP_POWERMESSAGEWAKE_PARAMS,
-    *PSP_POWERMESSAGEWAKE_PARAMS;
-typedef SP_DRVINFO_DETAIL_DATA_W SP_DRVINFO_DETAIL_DATA,
-     *PSP_DRVINFO_DETAIL_DATA;
-typedef SP_BACKUP_QUEUE_PARAMS_W SP_BACKUP_QUEUE_PARAMS,
-    *PSP_BACKUP_QUEUE_PARAMS;
-#else
-typedef SP_ORIGINAL_FILE_INFO_A SP_ORIGINAL_FILE_INFO, *PSP_ORIGINAL_FILE_INFO;
-typedef FILEPATHS_A FILEPATHS, *PFILEPATHS;
-typedef SOURCE_MEDIA_A SOURCE_MEDIA, *PSOURCE_MEDIA;
-typedef CABINET_INFO_A CABINET_INFO, *PCABINET_INFO;
-typedef FILE_IN_CABINET_INFO_A FILE_IN_CABINET_INFO, *PFILE_IN_CABINET_INFO;
-typedef SP_FILE_COPY_PARAMS_A SP_FILE_COPY_PARAMS, *PSP_FILE_COPY_PARAMS;
-typedef SP_DEVICE_INTERFACE_DETAIL_DATA_A SP_DEVICE_INTERFACE_DETAIL_DATA,
-    *PSP_DEVICE_INTERFACE_DETAIL_DATA;
-typedef SP_INTERFACE_DEVICE_DETAIL_DATA_A SP_INTERFACE_DEVICE_DETAIL_DATA,
-    *PSP_INTERFACE_DEVICE_DETAIL_DATA; /* deprecated */
-typedef SP_DEVINFO_LIST_DETAIL_DATA_A SP_DEVINFO_LIST_DETAIL_DATA,
-    *PSP_DEVINFO_LIST_DETAIL_DATA;
-typedef SP_DEVINSTALL_PARAMS_A SP_DEVINSTALL_PARAMS, *PSP_DEVINSTALL_PARAMS;
-typedef SP_SELECTDEVICE_PARAMS_A SP_SELECTDEVICE_PARAMS,
-    *PSP_SELECTDEVICE_PARAMS;
-typedef SP_TROUBLESHOOTER_PARAMS_A SP_TROUBLESHOOTER_PARAMS,
-    *PSP_TROUBLESHOOTER_PARAMS;
-typedef SP_POWERMESSAGEWAKE_PARAMS_A SP_POWERMESSAGEWAKE_PARAMS,
-    *PSP_POWERMESSAGEWAKE_PARAMS;
-typedef SP_DRVINFO_DETAIL_DATA_A SP_DRVINFO_DETAIL_DATA,
-    *PSP_DRVINFO_DETAIL_DATA;
-typedef SP_BACKUP_QUEUE_PARAMS_A SP_BACKUP_QUEUE_PARAMS,
-    *PSP_BACKUP_QUEUE_PARAMS;
-#endif /* UNICODE */
-
-WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC,HINF,HINF,PCSTR,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupAddInstallSectionToDiskSpaceListW(HDSKSPC,HINF,HINF,PCWSTR,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC,HINF,HINF,PCSTR,UINT,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupAddSectionToDiskSpaceListW(HDSKSPC,HINF,HINF,PCWSTR,UINT,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupAddToDiskSpaceListA(HDSKSPC,PCSTR,LONGLONG,UINT,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupAddToDiskSpaceListW(HDSKSPC,PCWSTR,LONGLONG,UINT,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupAddToSourceListA(DWORD,PCSTR);
-WINSETUPAPI BOOL WINAPI SetupAddToSourceListW(DWORD,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupAdjustDiskSpaceListA(HDSKSPC,LPCSTR,LONGLONG,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupAdjustDiskSpaceListW(HDSKSPC,LPCWSTR,LONGLONG,PVOID,UINT);
-WINSETUPAPI UINT WINAPI SetupBackupErrorA(HWND,PCSTR,PCSTR,PCSTR,UINT,DWORD);
-WINSETUPAPI UINT WINAPI SetupBackupErrorW(HWND,PCWSTR,PCWSTR,PCWSTR,UINT,DWORD);
-WINSETUPAPI BOOL WINAPI SetupCancelTemporary(VOID);
-WINSETUPAPI BOOL WINAPI SetupCloseFileQueue(HSPFILEQ);
-WINSETUPAPI VOID WINAPI SetupCloseInfFile(HINF);
-WINSETUPAPI VOID WINAPI SetupCloseLog(VOID);
-WINSETUPAPI BOOL WINAPI SetupCommitFileQueueA(HWND,HSPFILEQ,PSP_FILE_CALLBACK_A,PVOID);
-WINSETUPAPI BOOL WINAPI SetupCommitFileQueueW(HWND,HSPFILEQ,PSP_FILE_CALLBACK_W,PVOID);
-WINSETUPAPI UINT WINAPI SetupCopyErrorA(HWND,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,UINT,DWORD,PSTR,DWORD,PDWORD);
-WINSETUPAPI UINT WINAPI SetupCopyErrorW(HWND,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,UINT,DWORD,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupCopyOEMInfA(PCSTR,PCSTR,DWORD,DWORD,PSTR,DWORD,PDWORD,PSTR*);
-WINSETUPAPI BOOL WINAPI SetupCopyOEMInfW(PCWSTR,PCWSTR,DWORD,DWORD,PWSTR,DWORD,PDWORD,PWSTR*);
-WINSETUPAPI HDSKSPC WINAPI SetupCreateDiskSpaceListA(PVOID,DWORD,UINT);
-WINSETUPAPI HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID,DWORD,UINT);
-WINSETUPAPI DWORD WINAPI SetupDecompressOrCopyFileA(PCSTR,PCSTR,PUINT);
-WINSETUPAPI DWORD WINAPI SetupDecompressOrCopyFileW(PCWSTR,PCWSTR,PUINT);
-WINSETUPAPI UINT WINAPI SetupDefaultQueueCallbackA(PVOID,UINT,UINT_PTR,UINT_PTR);
-WINSETUPAPI UINT WINAPI SetupDefaultQueueCallbackW(PVOID,UINT,UINT_PTR,UINT_PTR);
-WINSETUPAPI UINT WINAPI SetupDeleteErrorA(HWND,PCSTR,PCSTR,UINT,DWORD);
-WINSETUPAPI UINT WINAPI SetupDeleteErrorW(HWND,PCWSTR,PCWSTR,UINT,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC);
-WINSETUPAPI BOOL WINAPI SetupDiAskForOEMDisk(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiBuildClassInfoList(DWORD,LPGUID,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiBuildClassInfoListExA(DWORD,LPGUID,DWORD,PDWORD,PCSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiBuildClassInfoListExW(DWORD,LPGUID,DWORD,PDWORD,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO,PSP_DEVINFO_DATA,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION,HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiCancelDriverInfoSearch(HDEVINFO);
-WINSETUPAPI BOOL WINAPI SetupDiChangeState(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiClassGuidsFromNameA(PCSTR,LPGUID,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiClassGuidsFromNameW(PCWSTR,LPGUID,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiClassGuidsFromNameExA(PCSTR,LPGUID,DWORD,PDWORD,PCSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiClassGuidsFromNameExW(PCWSTR,LPGUID,DWORD,PDWORD,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiClassNameFromGuidA(CONST GUID*,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiClassNameFromGuidW(CONST GUID*,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiClassNameFromGuidExA(CONST GUID*,PSTR,DWORD,PDWORD,PCSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiClassNameFromGuidExW(CONST GUID*,PWSTR,DWORD,PDWORD,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO,PCSTR,CONST GUID*,PCSTR,HWND,DWORD,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO,PCWSTR,CONST GUID*,PCWSTR,HWND,DWORD,PSP_DEVINFO_DATA);
-WINSETUPAPI HDEVINFO WINAPI SetupDiCreateDeviceInfoList(CONST GUID*,HWND);
-WINSETUPAPI HDEVINFO WINAPI SetupDiCreateDeviceInfoListExA(CONST GUID*,HWND,PCSTR,PVOID);
-WINSETUPAPI HDEVINFO WINAPI SetupDiCreateDeviceInfoListExW(CONST GUID*,HWND,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInterfaceA(HDEVINFO,PSP_DEVINFO_DATA,CONST GUID*,PCSTR,DWORD,PSP_DEVICE_INTERFACE_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiCreateDeviceInterfaceW(HDEVINFO,PSP_DEVINFO_DATA,CONST GUID*,PCWSTR,DWORD,PSP_DEVICE_INTERFACE_DATA);
-WINSETUPAPI HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,DWORD,REGSAM,HINF,PCSTR);
-WINSETUPAPI HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,DWORD,REGSAM,HINF,PCWSTR);
-WINSETUPAPI HKEY WINAPI SetupDiCreateDevRegKeyA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,DWORD,HINF,PCSTR);
-WINSETUPAPI HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,DWORD,HINF,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO,PSP_DEVICE_INTERFACE_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDiDestroyClassImageList(PSP_CLASSIMAGELIST_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO);
-WINSETUPAPI BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO,PSP_DEVINFO_DATA,DWORD);
-WINSETUPAPI INT WINAPI SetupDiDrawMiniIcon(HDC,RECT,INT,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO,DWORD,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiEnumDeviceInterfaces(HDEVINFO,PSP_DEVINFO_DATA,CONST GUID*,DWORD,PSP_DEVICE_INTERFACE_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,PSP_DRVINFO_DATA_A);
-WINSETUPAPI BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,PSP_DRVINFO_DATA_W);
-WINSETUPAPI BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF,PCSTR,PSTR,DWORD,PDWORD,PSTR*);
-WINSETUPAPI BOOL WINAPI SetupDiGetActualSectionToInstallW(HINF,PCWSTR,PWSTR,DWORD,PDWORD,PWSTR*);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassBitmapIndex(CONST GUID*,PINT);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassDescriptionA(CONST GUID*,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassDescriptionW(CONST GUID*,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassDescriptionExA(CONST GUID*,PSTR,DWORD,PDWORD,PCSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassDescriptionExW(CONST GUID*,PWSTR,DWORD,PDWORD,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassDevPropertySheetsA(HDEVINFO,PSP_DEVINFO_DATA,LPPROPSHEETHEADERA,DWORD,PDWORD,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassDevPropertySheetsW(HDEVINFO,PSP_DEVINFO_DATA,LPPROPSHEETHEADERW,DWORD,PDWORD,DWORD);
-WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsA(CONST GUID*,PCSTR,HWND,DWORD);
-WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsW(CONST GUID*,PCWSTR,HWND,DWORD);
-WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsExA(CONST GUID*,PCSTR,HWND,DWORD,HDEVINFO,PCSTR,PVOID);
-WINSETUPAPI HDEVINFO WINAPI SetupDiGetClassDevsExW(CONST GUID*,PCWSTR,HWND,DWORD,HDEVINFO,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA,CONST GUID*,PINT);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassImageList(PSP_CLASSIMAGELIST_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassImageListExA(PSP_CLASSIMAGELIST_DATA,PCSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassImageListExW(PSP_CLASSIMAGELIST_DATA,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_CLASSINSTALL_HEADER,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_CLASSINSTALL_HEADER,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassRegistryPropertyA(LPGUID,DWORD,PDWORD,PBYTE,DWORD,PDWORD,PCSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetClassRegistryPropertyW(LPGUID,DWORD,PDWORD,PBYTE,DWORD,PDWORD,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInfoListClass(HDEVINFO,LPGUID);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInfoListDetailA(HDEVINFO,PSP_DEVINFO_LIST_DETAIL_DATA_A);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInfoListDetailW(HDEVINFO,PSP_DEVINFO_LIST_DETAIL_DATA_W);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINSTALL_PARAMS_A);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINSTALL_PARAMS_W);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInstanceIdA(HDEVINFO,PSP_DEVINFO_DATA,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO,PSP_DEVINFO_DATA,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceAlias(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,CONST GUID*,PSP_DEVICE_INTERFACE_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,PSP_DEVICE_INTERFACE_DETAIL_DATA_A,DWORD,PDWORD,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,PSP_DEVICE_INTERFACE_DETAIL_DATA_W,DWORD,PDWORD,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,PDWORD,PBYTE,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,PDWORD,PBYTE,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetDriverInfoDetailA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A,PSP_DRVINFO_DETAIL_DATA_A,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetDriverInfoDetailW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W,PSP_DRVINFO_DETAIL_DATA_W,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetDriverInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A,PSP_DRVINSTALL_PARAMS);
-WINSETUPAPI BOOL WINAPI SetupDiGetDriverInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W,PSP_DRVINSTALL_PARAMS);
-WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileFriendlyNameA(DWORD,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileFriendlyNameExA(DWORD,PSTR,DWORD,PDWORD,PCSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileFriendlyNameExW(DWORD,PWSTR,DWORD,PDWORD,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileFriendlyNameW(DWORD,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileList(PDWORD,DWORD,PDWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileListExA(PDWORD,DWORD,PDWORD,PDWORD,PCSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetHwProfileListExW(PDWORD,DWORD,PDWORD,PDWORD,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiGetINFClassA(PCSTR,LPGUID,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetINFClassW(PCWSTR,LPGUID,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDevice(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A);
-WINSETUPAPI BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W);
-WINSETUPAPI HPROPSHEETPAGE WINAPI SetupDiGetWizardage(HDEVINFO,PSP_DEVINFO_DATA,PSP_INSTALLWIZARD_DATA,DWORD,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDiInstallClassA(HWND,PCSTR,DWORD,HSPFILEQ);
-WINSETUPAPI BOOL WINAPI SetupDiInstallClassW(HWND,PCWSTR,DWORD,HSPFILEQ);
-WINSETUPAPI BOOL WINAPI SetupDiInstallClassExA(HWND,PCSTR,DWORD,HSPFILEQ,CONST GUID*,PVOID,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiInstallClassExW(HWND,PCWSTR,DWORD,HSPFILEQ,CONST GUID*,PVOID,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiInstallDevice(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiInstallDriverFiles(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiLoadClassIcon(CONST GUID*,HICON*,PINT);
-WINSETUPAPI BOOL WINAPI SetupDiMoveDuplicateDevice(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI HKEY WINAPI SetupDiOpenClassRegKey(CONST GUID*,REGSAM);
-WINSETUPAPI HKEY WINAPI SetupDiOpenClassRegKeyExA(CONST GUID*,REGSAM,DWORD,PCSTR,PVOID);
-WINSETUPAPI HKEY WINAPI SetupDiOpenClassRegKeyExW(CONST GUID*,REGSAM,DWORD,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO,PCSTR,HWND,DWORD,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO,PCWSTR,HWND,DWORD,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInterfaceA(HDEVINFO,PCSTR,DWORD,PSP_DEVICE_INTERFACE_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiOpenDeviceInterfaceW(HDEVINFO,PCWSTR,DWORD,PSP_DEVICE_INTERFACE_DATA);
-WINSETUPAPI HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO,PSP_DEVICE_INTERFACE_DATA,DWORD,REGSAM);
-WINSETUPAPI HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO,PSP_DEVINFO_DATA,DWORD,DWORD,DWORD,REGSAM);
-WINSETUPAPI BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO,PSP_DEVINFO_DATA,DWORD,PSP_DETSIG_CMPPROC,PVOID,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiRemoveDevice(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiRemoveDeviceInterface(HDEVINFO,PSP_DEVICE_INTERFACE_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiSelectDevice(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiSelectOEMDrv(HWND,HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiSetClassInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_CLASSINSTALL_HEADER,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDiSetClassInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_CLASSINSTALL_HEADER,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDiSetClassRegistryPropertyA(LPGUID,DWORD,CONST BYTE*,DWORD,PCSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiSetClassRegistryPropertyW(LPGUID,DWORD,CONST BYTE*,DWORD,PCWSTR,PVOID);
-WINSETUPAPI BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINSTALL_PARAMS_A);
-WINSETUPAPI BOOL WINAPI SetupDiSetDeviceInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DEVINSTALL_PARAMS_W);
-WINSETUPAPI BOOL WINAPI SetupDiSetDeviceRegistryPropertyA(HDEVINFO,PSP_DEVINFO_DATA,DWORD,CONST BYTE*,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO,PSP_DEVINFO_DATA,DWORD,CONST BYTE*,DWORD);
-WINSETUPAPI BOOL WINAPI SetupDiSetDriverInstallParamsA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A,PSP_DRVINSTALL_PARAMS);
-WINSETUPAPI BOOL WINAPI SetupDiSetDriverInstallParamsW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W,PSP_DRVINSTALL_PARAMS);
-WINSETUPAPI BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupDiSetSelectedDriverA(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_A);
-WINSETUPAPI BOOL WINAPI SetupDiSetSelectedDriverW(HDEVINFO,PSP_DEVINFO_DATA,PSP_DRVINFO_DATA_W);
-WINSETUPAPI BOOL WINAPI SetupDiUnremoveDevice(HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI HDSKSPC WINAPI SetupDuplicateDiskSpaceListA(HDSKSPC,PVOID,DWORD,UINT);
-WINSETUPAPI HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC,PVOID,DWORD,UINT);
-WINSETUPAPI BOOL WINAPI SetupFindFirstLineA(HINF,PCSTR,PCSTR,PINFCONTEXT);
-WINSETUPAPI BOOL WINAPI SetupFindFirstLineW(HINF,PCWSTR,PCWSTR,PINFCONTEXT);
-WINSETUPAPI BOOL WINAPI SetupFindNextLine(PINFCONTEXT,PINFCONTEXT);
-WINSETUPAPI BOOL WINAPI SetupFindNextMatchLineA(PINFCONTEXT,PCSTR,PINFCONTEXT);
-WINSETUPAPI BOOL WINAPI SetupFindNextMatchLineW(PINFCONTEXT,PCWSTR,PINFCONTEXT);
-WINSETUPAPI BOOL WINAPI SetupFreeA(PCSTR**,UINT);
-WINSETUPAPI BOOL WINAPI SetupFreeW(PCWSTR**,UINT);
-WINSETUPAPI BOOL WINAPI SetupGetBackupInformationA(HSPFILEQ,PSP_BACKUP_QUEUE_PARAMS_A);
-WINSETUPAPI BOOL WINAPI SetupGetBackupInformationW(HSPFILEQ,PSP_BACKUP_QUEUE_PARAMS_W);
-WINSETUPAPI BOOL WINAPI SetupGetBinaryField(PINFCONTEXT,DWORD,PBYTE,DWORD,LPDWORD);
-WINSETUPAPI DWORD WINAPI SetupGetFieldCount(PINFCONTEXT);
-WINSETUPAPI DWORD WINAPI SetupGetFileCompressionInfoA(PCSTR,PSTR*,PDWORD,PDWORD,PUINT);
-WINSETUPAPI DWORD WINAPI SetupGetFileCompressionInfoW(PCWSTR,PWSTR*,PDWORD,PDWORD,PUINT);
-WINSETUPAPI BOOL WINAPI SetupGetInfFileListA(PCSTR,DWORD,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetInfFileListW(PCWSTR,DWORD,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetInfInformationA(LPCVOID,DWORD,PSP_INF_INFORMATION,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetInfInformationW(LPCVOID,DWORD,PSP_INF_INFORMATION,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetIntField(PINFCONTEXT,DWORD,PINT);
-WINSETUPAPI BOOL WINAPI SetupGetLineByIndexA(HINF,PCSTR,DWORD,PINFCONTEXT);
-WINSETUPAPI BOOL WINAPI SetupGetLineByIndexW(HINF,PCWSTR,DWORD,PINFCONTEXT);
-WINSETUPAPI LONG WINAPI SetupGetLineCountA(HINF,PCSTR);
-WINSETUPAPI LONG WINAPI SetupGetLineCountW(HINF,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupGetLineTextA(PINFCONTEXT,HINF,PCSTR,PCSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetLineTextW(PINFCONTEXT,HINF,PCWSTR,PCWSTR,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetMultiSzFieldA(PINFCONTEXT,DWORD,PSTR,DWORD,LPDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetMultiSzFieldW(PINFCONTEXT,DWORD,PWSTR,DWORD,LPDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetSourceFileLocationA(HINF,PINFCONTEXT,PCSTR,PUINT,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetSourceFileLocationW(HINF,PINFCONTEXT,PCWSTR,PUINT,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetSourceFileSizeA(HINF,PINFCONTEXT,PCSTR,PCSTR,PDWORD,UINT);
-WINSETUPAPI BOOL WINAPI SetupGetSourceFileSizeW(HINF,PINFCONTEXT,PCWSTR,PCWSTR,PDWORD,UINT);
-WINSETUPAPI BOOL WINAPI SetupGetSourceInfoA(HINF,UINT,UINT,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetSourceInfoW(HINF,UINT,UINT,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetStringFieldA(PINFCONTEXT,DWORD,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetStringFieldW(PINFCONTEXT,DWORD,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetTargetPathA(HINF,PINFCONTEXT,PCSTR,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupGetTargetPathW(HINF,PINFCONTEXT,PCWSTR,PWSTR,DWORD,PDWORD);
-WINSETUPAPI PVOID WINAPI SetupInitDefaultQueueCallback(HWND);
-WINSETUPAPI PVOID WINAPI SetupInitDefaultQueueCallbackEx(HWND,HWND,UINT,DWORD,PVOID);
-WINSETUPAPI HSPFILELOG WINAPI SetupInitializeFileLogA(PCSTR,DWORD);
-WINSETUPAPI HSPFILELOG WINAPI SetupInitializeFileLogW(PCWSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupInstallFileA(HINF,PINFCONTEXT,PCSTR,PCSTR,PCSTR,DWORD,PSP_FILE_CALLBACK_A,PVOID);
-WINSETUPAPI BOOL WINAPI SetupInstallFileW(HINF,PINFCONTEXT,PCWSTR,PCWSTR,PCWSTR,DWORD,PSP_FILE_CALLBACK_W,PVOID);
-WINSETUPAPI BOOL WINAPI SetupInstallFileExA(HINF,PINFCONTEXT,PCSTR,PCSTR,PCSTR,DWORD,PSP_FILE_CALLBACK_A,PVOID,PBOOL);
-WINSETUPAPI BOOL WINAPI SetupInstallFileExW(HINF,PINFCONTEXT,PCWSTR,PCWSTR,PCWSTR,DWORD,PSP_FILE_CALLBACK_W,PVOID,PBOOL);
-WINSETUPAPI BOOL WINAPI SetupInstallFilesFromInfSectionA(HINF,HINF,HSPFILEQ,PCSTR,PCSTR,UINT);
-WINSETUPAPI BOOL WINAPI SetupInstallFilesFromInfSectionW(HINF,HINF,HSPFILEQ,PCWSTR,PCWSTR,UINT);
-WINSETUPAPI BOOL WINAPI SetupInstallFromInfSectionA(HWND,HINF,PCSTR,UINT,HKEY,PCSTR,UINT,PSP_FILE_CALLBACK_A,PVOID,HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupInstallFromInfSectionW(HWND,HINF,PCWSTR,UINT,HKEY,PCWSTR,UINT,PSP_FILE_CALLBACK_W,PVOID,HDEVINFO,PSP_DEVINFO_DATA);
-WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionA(HINF,PCSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionW(HINF,PCWSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionExA(HINF,PCSTR,DWORD,HDEVINFO,PSP_DEVINFO_DATA,PVOID,PVOID);
-WINSETUPAPI BOOL WINAPI SetupInstallServicesFromInfSectionExW(HINF,PCWSTR,DWORD,HDEVINFO,PSP_DEVINFO_DATA,PVOID,PVOID);
-WINSETUPAPI BOOL WINAPI SetupIterateCabinetA(PCSTR,DWORD,PSP_FILE_CALLBACK_A,PVOID);
-WINSETUPAPI BOOL WINAPI SetupIterateCabinetW(PCWSTR,DWORD,PSP_FILE_CALLBACK_W,PVOID);
-WINSETUPAPI BOOL WINAPI SetupLogErrorA(LPCSTR,LogSeverity);
-WINSETUPAPI BOOL WINAPI SetupLogErrorW(LPCWSTR,LogSeverity);
-WINSETUPAPI BOOL WINAPI SetupLogFileA(HSPFILELOG,PCSTR,PCSTR,PCSTR,DWORD,PCSTR,PCSTR,PCSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupLogFileW(HSPFILELOG,PCWSTR,PCWSTR,PCWSTR,DWORD,PCWSTR,PCWSTR,PCWSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupOpenAppendInfFileA(PCSTR,HINF,PUINT);
-WINSETUPAPI BOOL WINAPI SetupOpenAppendInfFileW(PCWSTR,HINF,PUINT);
-WINSETUPAPI HSPFILEQ WINAPI SetupOpenFileQueue(VOID);
-WINSETUPAPI HINF WINAPI SetupOpenInfFileA(PCSTR,PCSTR,DWORD,PUINT);
-WINSETUPAPI HINF WINAPI SetupOpenInfFileW(PCWSTR,PCWSTR,DWORD,PUINT);
-WINSETUPAPI BOOL WINAPI SetupOpenLog(BOOL);
-WINSETUPAPI HINF WINAPI SetupOpenMasterInf(VOID);
-WINSETUPAPI UINT WINAPI SetupPromptForDiskA(HWND,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,DWORD,PSTR,DWORD,PDWORD);
-WINSETUPAPI UINT WINAPI SetupPromptForDiskW(HWND,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,DWORD,PWSTR,DWORD,PDWORD);
-WINSETUPAPI INT WINAPI SetupPromptReboot(HSPFILEQ,HWND,BOOL);
-WINSETUPAPI BOOL WINAPI SetupQueryA(DWORD,PCSTR**,PUINT);
-WINSETUPAPI BOOL WINAPI SetupQueryW(DWORD,PCWSTR**,PUINT);
-WINSETUPAPI BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupQueryFileLogA(HSPFILELOG,PCSTR,PCSTR,SetupFileLogInfo,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupQueryFileLogW(HSPFILELOG,PCWSTR,PCWSTR,SetupFileLogInfo,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION,UINT,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION,UINT,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupQueryInfOriginalFileInformationA(PSP_INF_INFORMATION,UINT,PSP_ALTPLATFORM_INFO,PSP_ORIGINAL_FILE_INFO_A);
-WINSETUPAPI BOOL WINAPI SetupQueryInfOriginalFileInformationW(PSP_INF_INFORMATION,UINT,PSP_ALTPLATFORM_INFO,PSP_ORIGINAL_FILE_INFO_W);
-WINSETUPAPI BOOL WINAPI SetupQueryInfVersionInformationA(PSP_INF_INFORMATION,UINT,PSTR,PSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupQueryInfVersionInformationW(PSP_INF_INFORMATION,UINT,PCWSTR,PWSTR,DWORD,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC,PCSTR,LONGLONG*,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC,PCWSTR,LONGLONG*,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupQueueCopyA(HSPFILEQ,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,PCSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupQueueCopyW(HSPFILEQ,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,PCWSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupQueueCopyIndirectA(PSP_FILE_COPY_PARAMS_A);
-WINSETUPAPI BOOL WINAPI SetupQueueCopyIndirectW(PSP_FILE_COPY_PARAMS_W);
-WINSETUPAPI BOOL WINAPI SetupQueueCopySectionA(HSPFILEQ,PCSTR,HINF,HINF,PCSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupQueueCopySectionW(HSPFILEQ,PCWSTR,HINF,HINF,PCWSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupQueueDefaultCopyA(HSPFILEQ,HINF,PCSTR,PCSTR,PCSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupQueueDefaultCopyW(HSPFILEQ,HINF,PCWSTR,PCWSTR,PCWSTR,DWORD);
-WINSETUPAPI BOOL WINAPI SetupQueueDeleteA(HSPFILEQ,PCSTR,PCSTR);
-WINSETUPAPI BOOL WINAPI SetupQueueDeleteW(HSPFILEQ,PCWSTR,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupQueueDeleteSectionA(HSPFILEQ,HINF,HINF,PCSTR);
-WINSETUPAPI BOOL WINAPI SetupQueueDeleteSectionW(HSPFILEQ,HINF,HINF,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupQueueRenameA(HSPFILEQ,PCSTR,PCSTR,PCSTR,PCSTR);
-WINSETUPAPI BOOL WINAPI SetupQueueRenameW(HSPFILEQ,PCWSTR,PCWSTR,PCWSTR,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupQueueRenameSectionA(HSPFILEQ,HINF,HINF,PCSTR);
-WINSETUPAPI BOOL WINAPI SetupQueueRenameSectionW(HSPFILEQ,HINF,HINF,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupRemoveFileLogEntryA(HSPFILELOG,PCSTR,PCSTR);
-WINSETUPAPI BOOL WINAPI SetupRemoveFileLogEntryW(HSPFILELOG,PCWSTR,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupRemoveFromDiskSpaceListA(HDSKSPC,PCSTR,UINT,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupRemoveFromDiskSpaceListW(HDSKSPC,PCWSTR,UINT,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupRemoveFromSourceListA(DWORD,PCSTR);
-WINSETUPAPI BOOL WINAPI SetupRemoveFromSourceListW(DWORD,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupRemoveInstallSectionFromDiskSpaceListA(HDSKSPC,HINF,HINF,PCSTR,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupRemoveInstallSectionFromDiskSpaceListW(HDSKSPC,HINF,HINF,PCWSTR,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupRemoveSectionFromDiskSpaceListA(HDSKSPC,HINF,HINF,PCSTR,UINT,PVOID,UINT);
-WINSETUPAPI BOOL WINAPI SetupRemoveSectionFromDiskSpaceListW(HDSKSPC,HINF,HINF,PCWSTR,UINT,PVOID,UINT);
-WINSETUPAPI UINT WINAPI SetupRenameErrorA(HWND,PCSTR,PCSTR,PCSTR,UINT,DWORD);
-WINSETUPAPI UINT WINAPI SetupRenameErrorW(HWND,PCWSTR,PCWSTR,PCWSTR,UINT,DWORD);
-WINSETUPAPI BOOL WINAPI SetupScanFileQueueA(HSPFILEQ,DWORD,HWND,PSP_FILE_CALLBACK_A,PVOID,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupScanFileQueueW(HSPFILEQ,DWORD,HWND,PSP_FILE_CALLBACK_W,PVOID,PDWORD);
-WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdA(HINF,DWORD,PCSTR);
-WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdW(HINF,DWORD,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdExA(HINF,DWORD,PCSTR,DWORD,DWORD,PVOID);
-WINSETUPAPI BOOL WINAPI SetupSetDirectoryIdExW(HINF,DWORD,PCWSTR,DWORD,DWORD,PVOID);
-WINSETUPAPI BOOL WINAPI SetupSetFileQueueAlternatePlatformA(HSPFILEQ,PSP_ALTPLATFORM_INFO,PCSTR);
-WINSETUPAPI BOOL WINAPI SetupSetFileQueueAlternatePlatformW(HSPFILEQ,PSP_ALTPLATFORM_INFO,PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupSetPlatformPathOverrideA(PCSTR);
-WINSETUPAPI BOOL WINAPI SetupSetPlatformPathOverrideW(PCWSTR);
-WINSETUPAPI BOOL WINAPI SetupSetSourceListA(DWORD,PCSTR*,UINT);
-WINSETUPAPI BOOL WINAPI SetupSetSourceListW(DWORD,PCWSTR*,UINT);
-WINSETUPAPI VOID WINAPI SetupTermDefaultQueueCallback(PVOID);
-WINSETUPAPI BOOL WINAPI SetupTerminateFileLog(HSPFILELOG);
-
-/* for backward compatability */
-#define SetupDiCreateInterfaceDeviceW	SetupDiCreateDeviceInterfaceW
-#define SetupDiCreateInterfaceDeviceRegKeyW	SetupDiCreateDeviceInterfaceRegKeyW
-#define SetupDiOpenInterfaceDeviceW	SetupDiOpenDeviceInterfaceW
-#define SetupDiGetInterfaceDeviceDetailW	SetupDiGetDeviceInterfaceDetailW
-#define SetupDiCreateInterfaceDeviceA	SetupDiCreateDeviceInterfaceA
-#define SetupDiCreateInterfaceDeviceRegKeyA	SetupDiCreateDeviceInterfaceRegKeyA
-#define SetupDiOpenInterfaceDeviceA	SetupDiOpenDeviceInterfaceA
-#define SetupDiGetInterfaceDeviceDetailA	SetupDiGetDeviceInterfaceDetailA
-
-#ifdef UNICODE		
-#define PSP_FILE_CALLBACK PSP_FILE_CALLBACK_W
-#define SetupAddInstallSectionToDiskSpaceList	SetupAddInstallSectionToDiskSpaceListW
-#define SetupAddSectionToDiskSpaceList	SetupAddSectionToDiskSpaceListW
-#define SetupAddToDiskSpaceList	SetupAddToDiskSpaceListW
-#define SetupAddToSourceList	SetupAddToSourceListW
-#define SetupAdjustDiskSpaceList	SetupAdjustDiskSpaceListW
-#define SetupBackupError	SetupBackupErrorW
-#define SetupCommitFileQueue	SetupCommitFileQueueW
-#define SetupCopyError	SetupCopyErrorW
-#define SetupCopyOEMInf	SetupCopyOEMInfW
-#define SetupCreateDiskSpaceList	SetupCreateDiskSpaceListW
-#define SetupDecompressOrCopyFile	SetupDecompressOrCopyFileW
-#define SetupDefaultQueueCallback	SetupDefaultQueueCallbackW
-#define SetupDeleteError	SetupDeleteErrorW
-#define SetupDiBuildClassInfoListEx	SetupDiBuildClassInfoListExW
-#define SetupDiClassGuidsFromNameEx	SetupDiClassGuidsFromNameExW
-#define SetupDiClassGuidsFromName	SetupDiClassGuidsFromNameW
-#define SetupDiClassNameFromGuidEx	SetupDiClassNameFromGuidExW
-#define SetupDiClassNameFromGuid	SetupDiClassNameFromGuidW
-#define SetupDiCreateDeviceInfoListEx	SetupDiCreateDeviceInfoListExW
-#define SetupDiCreateDeviceInfo	SetupDiCreateDeviceInfoW
-#define SetupDiCreateDeviceInterfaceRegKey	SetupDiCreateDeviceInterfaceRegKeyW
-#define SetupDiCreateInterfaceDeviceRegKey	SetupDiCreateDeviceInterfaceRegKeyW
-#define SetupDiCreateDeviceInterface	SetupDiCreateDeviceInterfaceW
-#define SetupDiCreateInterfaceDevice	SetupDiCreateDeviceInterfaceW
-#define SetupDiCreateDevRegKey	SetupDiCreateDevRegKeyW
-#define SetupDiEnumDriverInfo	SetupDiEnumDriverInfoW
-#define SetupDiGetActualSectionToInstall	SetupDiGetActualSectionToInstallW
-#define SetupDiGetClassDescriptionEx	SetupDiGetClassDescriptionExW
-#define SetupDiGetClassDescription	SetupDiGetClassDescriptionW
-#define SetupDiGetClassDevPropertySheets	SetupDiGetClassDevPropertySheetsW
-#define SetupDiGetClassDevsEx	SetupDiGetClassDevsExW
-#define SetupDiGetClassDevs	SetupDiGetClassDevsW
-#define SetupDiGetClassImageListEx	SetupDiGetClassImageListExW
-#define SetupDiGetClassInstallParams	SetupDiGetClassInstallParamsW
-#define SetupDiGetClassRegistryProperty	SetupDiGetClassRegistryPropertyW
-#define SetupDiGetDeviceInfoListDetail	SetupDiGetDeviceInfoListDetailW
-#define SetupDiGetDeviceInstallParams	SetupDiGetDeviceInstallParamsW
-#define SetupDiGetDeviceInstanceId	SetupDiGetDeviceInstanceIdW
-#define SetupDiGetDeviceInterfaceDetail	SetupDiGetDeviceInterfaceDetailW
-#define SetupDiGetInterfaceDeviceDetail	SetupDiGetDeviceInterfaceDetailW
-#define SetupDiGetDeviceRegistryProperty	SetupDiGetDeviceRegistryPropertyW
-#define SetupDiGetDriverInfoDetail	SetupDiGetDriverInfoDetailW
-#define SetupDiGetDriverInstallParams	SetupDiGetDriverInstallParamsW
-#define SetupDiGetHwProfileFriendlyNameEx	SetupDiGetHwProfileFriendlyNameExW
-#define SetupDiGetHwProfileFriendlyName	SetupDiGetHwProfileFriendlyNameW
-#define SetupDiGetHwProfileListEx	SetupDiGetHwProfileListExW
-#define SetupDiGetINFClass	SetupDiGetINFClassW
-#define SetupDiGetSelectedDriver	SetupDiGetSelectedDriverW
-#define SetupDiInstallClassEx	SetupDiInstallClassExW
-#define SetupDiInstallClass	SetupDiInstallClassW
-#define SetupDiOpenClassRegKeyEx	SetupDiOpenClassRegKeyExW
-#define SetupDiOpenDeviceInfo	SetupDiOpenDeviceInfoW
-#define SetupDiOpenDeviceInterface	SetupDiOpenDeviceInterfaceW
-#define SetupDiOpenInterfaceDevice	SetupDiOpenDeviceInterfaceW
-#define SetupDiSetClassInstallParams	SetupDiSetClassInstallParamsW
-#define SetupDiSetClassRegistryProperty	SetupDiSetClassRegistryPropertyW
-#define SetupDiSetDeviceInstallParams	SetupDiSetDeviceInstallParamsW
-#define SetupDiSetDeviceRegistryProperty	SetupDiSetDeviceRegistryPropertyW
-#define SetupDiSetDriverInstallParams	SetupDiSetDriverInstallParamsW
-#define SetupDiSetSelectedDriver	SetupDiSetSelectedDriverW
-#define SetupDuplicateDiskSpaceList	SetupDuplicateDiskSpaceListW
-#define SetupFindFirstLine	SetupFindFirstLineW
-#define SetupFindNextMatchLine	SetupFindNextMatchLineW
-#define SetupFreeSourceList	SetupFreeSourceListW
-#define SetupGetBackupInformation	SetupGetBackupInformationW
-#define SetupGetFileCompressionInfo	SetupGetFileCompressionInfoW
-#define SetupGetInfFileList	SetupGetInfFileListW
-#define SetupGetInfInformation	SetupGetInfInformationW
-#define SetupGetLineByIndex	SetupGetLineByIndexW
-#define SetupGetLineCount	SetupGetLineCountW
-#define SetupGetLineText	SetupGetLineTextW
-#define SetupGetMultiSzField	SetupGetMultiSzFieldW
-#define SetupGetSourceFileLocation	SetupGetSourceFileLocationW
-#define SetupGetSourceFileSize	SetupGetSourceFileSizeW
-#define SetupGetSourceInfo	SetupGetSourceInfoW
-#define SetupGetStringField	SetupGetStringFieldW
-#define SetupGetTargetPath	SetupGetTargetPathW
-#define SetupInitializeFileLog	SetupInitializeFileLogW
-#define SetupInstallFileEx	SetupInstallFileExW
-#define SetupInstallFilesFromInfSection	SetupInstallFilesFromInfSectionW
-#define SetupInstallFile	SetupInstallFileW
-#define SetupInstallFromInfSection	SetupInstallFromInfSectionW
-#define SetupInstallServicesFromInfSectionEx	SetupInstallServicesFromInfSectionExW
-#define SetupInstallServicesFromInfSection	SetupInstallServicesFromInfSectionW
-#define SetupIterateCabinet	SetupIterateCabinetW
-#define SetupLogError	SetupLogErrorW
-#define SetupLogFile	SetupLogFileW
-#define SetupOpenAppendInfFile	SetupOpenAppendInfFileW
-#define SetupOpenInfFile	SetupOpenInfFileW
-#define SetupPromptForDisk	SetupPromptForDiskW
-#define SetupQueryDrivesInDiskSpaceList	SetupQueryDrivesInDiskSpaceListW
-#define SetupQueryFileLog	SetupQueryFileLogW
-#define SetupQueryInfFileInformation	SetupQueryInfFileInformationW
-#define SetupQueryInfOriginalFileInformation	SetupQueryInfOriginalFileInformationW
-#define SetupQueryInfVersionInformation	SetupQueryInfVersionInformationW
-#define SetupQuerySourceList	SetupQuerySourceListW
-#define SetupQuerySpaceRequiredOnDrive	SetupQuerySpaceRequiredOnDriveW
-#define SetupQueueCopyIndirect	SetupQueueCopyIndirectW
-#define SetupQueueCopySection	SetupQueueCopySectionW
-#define SetupQueueCopy	SetupQueueCopyW
-#define SetupQueueDefaultCopy	SetupQueueDefaultCopyW
-#define SetupQueueDeleteSection	SetupQueueDeleteSectionW
-#define SetupQueueDelete	SetupQueueDeleteW
-#define SetupQueueRenameSection	SetupQueueRenameSectionW
-#define SetupQueueRename	SetupQueueRenameW
-#define SetupRemoveFileLogEntry	SetupRemoveFileLogEntryW
-#define SetupRemoveFromDiskSpaceList	SetupRemoveFromDiskSpaceListW
-#define SetupRemoveFromSourceList	SetupRemoveFromSourceListW
-#define SetupRemoveInstallSectionFromDiskSpaceList	SetupRemoveInstallSectionFromDiskSpaceListW
-#define SetupRemoveSectionFromDiskSpaceList	SetupRemoveSectionFromDiskSpaceListW
-#define SetupRenameError	SetupRenameErrorW
-#define SetupScanFileQueue	SetupScanFileQueueW
-#define SetupSetDirectoryIdEx	SetupSetDirectoryIdExW
-#define SetupSetDirectoryId	SetupSetDirectoryIdW
-#define SetupSetFileQueueAlternatePlatform	SetupSetFileQueueAlternatePlatformW
-#define SetupSetPlatformPathOverride	SetupSetPlatformPathOverrideW
-#define SetupSetSourceList	SetupSetSourceListW
-#else		
-#define PSP_FILE_CALLBACK PSP_FILE_CALLBACK_A
-#define SetupAddInstallSectionToDiskSpaceList	SetupAddInstallSectionToDiskSpaceListA
-#define SetupAddSectionToDiskSpaceList	SetupAddSectionToDiskSpaceListA
-#define SetupAddToDiskSpaceList	SetupAddToDiskSpaceListA
-#define SetupAddToSourceList	SetupAddToSourceListA
-#define SetupAdjustDiskSpaceList	SetupAdjustDiskSpaceListA
-#define SetupBackupError	SetupBackupErrorA
-#define SetupCommitFileQueue	SetupCommitFileQueueA
-#define SetupCopyError	SetupCopyErrorA
-#define SetupCopyOEMInf	SetupCopyOEMInfA
-#define SetupCreateDiskSpaceList	SetupCreateDiskSpaceListA
-#define SetupDecompressOrCopyFile	SetupDecompressOrCopyFileA
-#define SetupDefaultQueueCallback	SetupDefaultQueueCallbackA
-#define SetupDeleteError	SetupDeleteErrorA
-#define SetupDiBuildClassInfoListEx	SetupDiBuildClassInfoListExA
-#define SetupDiClassGuidsFromName	SetupDiClassGuidsFromNameA
-#define SetupDiClassGuidsFromNameEx	SetupDiClassGuidsFromNameExA
-#define SetupDiClassNameFromGuid	SetupDiClassNameFromGuidA
-#define SetupDiClassNameFromGuidEx	SetupDiClassNameFromGuidExA
-#define SetupDiCreateDeviceInfo	SetupDiCreateDeviceInfoA
-#define SetupDiCreateDeviceInfoListEx	SetupDiCreateDeviceInfoListExA
-#define SetupDiCreateDeviceInterface	SetupDiCreateDeviceInterfaceA
-#define SetupDiCreateInterfaceDevice	SetupDiCreateDeviceInterfaceA
-#define SetupDiCreateDeviceInterfaceRegKey	SetupDiCreateDeviceInterfaceRegKeyA
-#define SetupDiCreateInterfaceDeviceRegKey	SetupDiCreateDeviceInterfaceRegKeyA
-#define SetupDiCreateDevRegKey	SetupDiCreateDevRegKeyA
-#define SetupDiDeleteInterfaceDeviceData	SetupDiDeleteDeviceInterfaceData
-#define SetupDiEnumDriverInfo	SetupDiEnumDriverInfoA
-#define SetupDiGetActualSectionToInstall	SetupDiGetActualSectionToInstallA
-#define SetupDiGetClassDescription	SetupDiGetClassDescriptionA
-#define SetupDiGetClassDescriptionEx	SetupDiGetClassDescriptionExA
-#define SetupDiGetClassDevPropertySheets	SetupDiGetClassDevPropertySheetsA
-#define SetupDiGetClassDevs	SetupDiGetClassDevsA
-#define SetupDiGetClassDevsEx	SetupDiGetClassDevsExA
-#define SetupDiGetClassImageListEx	SetupDiGetClassImageListExA
-#define SetupDiGetClassInstallParams	SetupDiGetClassInstallParamsA
-#define SetupDiGetClassRegistryProperty	SetupDiGetClassRegistryPropertyA
-#define SetupDiGetDeviceInfoListDetail	SetupDiGetDeviceInfoListDetailA
-#define SetupDiGetDeviceInstallParams	SetupDiGetDeviceInstallParamsA
-#define SetupDiGetDeviceInstanceId	SetupDiGetDeviceInstanceIdA
-#define SetupDiGetDeviceInterfaceDetail	SetupDiGetDeviceInterfaceDetailA
-#define SetupDiGetInterfaceDeviceDetail	SetupDiGetDeviceInterfaceDetailA
-#define SetupDiGetDeviceRegistryProperty	SetupDiGetDeviceRegistryPropertyA
-#define SetupDiGetDriverInfoDetail	SetupDiGetDriverInfoDetailA
-#define SetupDiGetDriverInstallParams	SetupDiGetDriverInstallParamsA
-#define SetupDiGetHwProfileFriendlyName	SetupDiGetHwProfileFriendlyNameA
-#define SetupDiGetHwProfileFriendlyNameEx	SetupDiGetHwProfileFriendlyNameExA
-#define SetupDiGetHwProfileListEx	SetupDiGetHwProfileListExA
-#define SetupDiGetINFClass	SetupDiGetINFClassA
-#define SetupDiGetSelectedDriver	SetupDiGetSelectedDriverA
-#define SetupDiInstallClass	SetupDiInstallClassA
-#define SetupDiInstallClassEx	SetupDiInstallClassExA
-#define SetupDiOpenClassRegKeyEx	SetupDiOpenClassRegKeyExA
-#define SetupDiOpenDeviceInfo	SetupDiOpenDeviceInfoA
-#define SetupDiOpenDeviceInterface	SetupDiOpenDeviceInterfaceA
-#define SetupDiOpenInterfaceDevice	SetupDiOpenDeviceInterfaceA
-#define SetupDiSetClassInstallParams	SetupDiSetClassInstallParamsA
-#define SetupDiSetClassRegistryProperty	SetupDiSetClassRegistryPropertyA
-#define SetupDiSetDeviceInstallParams	SetupDiSetDeviceInstallParamsA
-#define SetupDiSetDeviceRegistryProperty	SetupDiSetDeviceRegistryPropertyA
-#define SetupDiSetDriverInstallParams	SetupDiSetDriverInstallParamsA
-#define SetupDiSetSelectedDriver	SetupDiSetSelectedDriverA
-#define SetupDuplicateDiskSpaceList	SetupDuplicateDiskSpaceListA
-#define SetupFindFirstLine	SetupFindFirstLineA
-#define SetupFindNextMatchLine	SetupFindNextMatchLineA
-#define SetupFreeSourceList	SetupFreeSourceListA
-#define SetupGetBackupInformation	SetupGetBackupInformationA
-#define SetupGetFileCompressionInfo	SetupGetFileCompressionInfoA
-#define SetupGetInfFileList	SetupGetInfFileListA
-#define SetupGetInfInformation	SetupGetInfInformationA
-#define SetupGetLineByIndex	SetupGetLineByIndexA
-#define SetupGetLineCount	SetupGetLineCountA
-#define SetupGetLineText	SetupGetLineTextA
-#define SetupGetMultiSzField	SetupGetMultiSzFieldA
-#define SetupGetSourceFileLocation	SetupGetSourceFileLocationA
-#define SetupGetSourceFileSize	SetupGetSourceFileSizeA
-#define SetupGetSourceInfo	SetupGetSourceInfoA
-#define SetupGetStringField	SetupGetStringFieldA
-#define SetupGetTargetPath	SetupGetTargetPathA
-#define SetupInitializeFileLog	SetupInitializeFileLogA
-#define SetupInstallFile	SetupInstallFileA
-#define SetupInstallFileEx	SetupInstallFileExA
-#define SetupInstallFilesFromInfSection	SetupInstallFilesFromInfSectionA
-#define SetupInstallFromInfSection	SetupInstallFromInfSectionA
-#define SetupInstallServicesFromInfSection	SetupInstallServicesFromInfSectionA
-#define SetupInstallServicesFromInfSectionEx	SetupInstallServicesFromInfSectionExA
-#define SetupIterateCabinet	SetupIterateCabinetA
-#define SetupLogError	SetupLogErrorA
-#define SetupLogFile	SetupLogFileA
-#define SetupOpenAppendInfFile	SetupOpenAppendInfFileA
-#define SetupOpenInfFile	SetupOpenInfFileA
-#define SetupPromptForDisk	SetupPromptForDiskA
-#define SetupQueryDrivesInDiskSpaceList	SetupQueryDrivesInDiskSpaceListA
-#define SetupQueryFileLog	SetupQueryFileLogA
-#define SetupQueryInfFileInformation	SetupQueryInfFileInformationA
-#define SetupQueryInfOriginalFileInformation	SetupQueryInfOriginalFileInformationA
-#define SetupQueryInfVersionInformation	SetupQueryInfVersionInformationA
-#define SetupQuerySourceList	SetupQuerySourceListA
-#define SetupQuerySpaceRequiredOnDrive	SetupQuerySpaceRequiredOnDriveA
-#define SetupQueueCopy	SetupQueueCopyA
-#define SetupQueueCopyIndirect	SetupQueueCopyIndirectA
-#define SetupQueueCopySection	SetupQueueCopySectionA
-#define SetupQueueDefaultCopy	SetupQueueDefaultCopyA
-#define SetupQueueDelete	SetupQueueDeleteA
-#define SetupQueueDeleteSection	SetupQueueDeleteSectionA
-#define SetupQueueRename	SetupQueueRenameA
-#define SetupQueueRenameSection	SetupQueueRenameSectionA
-#define SetupRemoveFileLogEntry	SetupRemoveFileLogEntryA
-#define SetupRemoveFromDiskSpaceList	SetupRemoveFromDiskSpaceListA
-#define SetupRemoveFromSourceList	SetupRemoveFromSourceListA
-#define SetupRemoveInstallSectionFromDiskSpaceList	SetupRemoveInstallSectionFromDiskSpaceListA
-#define SetupRemoveSectionFromDiskSpaceList	SetupRemoveSectionFromDiskSpaceListA
-#define SetupRenameError	SetupRenameErrorA
-#define SetupScanFileQueue	SetupScanFileQueueA
-#define SetupSetDirectoryId	SetupSetDirectoryIdA
-#define SetupSetDirectoryIdEx	SetupSetDirectoryIdExA
-#define SetupSetFileQueueAlternatePlatform	SetupSetFileQueueAlternatePlatformA
-#define SetupSetPlatformPathOverride	SetupSetPlatformPathOverrideA
-#define SetupSetSourceList	SetupSetSourceListA
-#endif	/* UNICODE */	
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-
-#include <poppack.h>
-#endif /* _SETUPAPI_H_ */
-
diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h
deleted file mode 100644
index 2de41657e..000000000
--- a/winsup/w32api/include/shellapi.h
+++ /dev/null
@@ -1,276 +0,0 @@
-#ifndef _SHELLAPI_H
-#define _SHELLAPI_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define WINSHELLAPI DECLSPEC_IMPORT
-#define ABE_LEFT	0
-#define ABE_TOP	1
-#define ABE_RIGHT	2
-#define ABE_BOTTOM	3
-#define SEE_MASK_CLASSNAME	1
-#define SEE_MASK_CLASSKEY	3
-#define SEE_MASK_IDLIST	4
-#define SEE_MASK_INVOKEIDLIST   12
-#define SEE_MASK_ICON	16
-#define SEE_MASK_HOTKEY	32
-#define SEE_MASK_NOCLOSEPROCESS	64
-#define SEE_MASK_CONNECTNETDRV	128
-#define SEE_MASK_FLAG_DDEWAIT	256
-#define SEE_MASK_DOENVSUBST	512
-#define SEE_MASK_FLAG_NO_UI	1024
-#define SEE_MASK_UNICODE	65536
-#define ABM_NEW	0
-#define ABM_REMOVE	1
-#define ABM_QUERYPOS	2
-#define ABM_SETPOS	3
-#define ABM_GETSTATE	4
-#define ABM_GETTASKBARPOS	5
-#define ABM_ACTIVATE	6
-#define ABM_GETAUTOHIDEBAR	7
-#define ABM_SETAUTOHIDEBAR	8
-#define ABM_WINDOWPOSCHANGED	9
-#define ABN_STATECHANGE		0
-#define ABN_POSCHANGED		1
-#define ABN_FULLSCREENAPP	2
-#define ABN_WINDOWARRANGE	3
-#define NIM_ADD	0
-#define NIM_MODIFY	1
-#define NIM_DELETE	2
-#define NIF_MESSAGE	1
-#define NIF_ICON	2
-#define NIF_TIP	4
-#define SE_ERR_FNF	2
-#define SE_ERR_PNF	3
-#define SE_ERR_ACCESSDENIED	5
-#define SE_ERR_OOM	8
-#define SE_ERR_DLLNOTFOUND	32
-#define SE_ERR_SHARE	26
-#define SE_ERR_ASSOCINCOMPLETE	27
-#define SE_ERR_DDETIMEOUT	28
-#define SE_ERR_DDEFAIL	29
-#define SE_ERR_DDEBUSY	30
-#define SE_ERR_NOASSOC	31
-#define FO_MOVE	1
-#define FO_COPY	2
-#define FO_DELETE	3
-#define FO_RENAME	4
-#define FOF_MULTIDESTFILES	1
-#define FOF_CONFIRMMOUSE	2
-#define FOF_SILENT	4
-#define FOF_RENAMEONCOLLISION	8
-#define FOF_NOCONFIRMATION	16
-#define FOF_WANTMAPPINGHANDLE	32
-#define FOF_ALLOWUNDO	64
-#define FOF_FILESONLY	128
-#define FOF_SIMPLEPROGRESS	256
-#define FOF_NOCONFIRMMKDIR	512
-#define FOF_NOERRORUI	1024
-#define PO_DELETE 19
-#define PO_RENAME 20
-#define PO_PORTCHANGE 32
-#define PO_REN_PORT 52
-#define SHGFI_ICON	256
-#define SHGFI_DISPLAYNAME	512
-#define SHGFI_TYPENAME	1024
-#define SHGFI_ATTRIBUTES	2048
-#define SHGFI_ICONLOCATION	4096
-#define SHGFI_EXETYPE 8192
-#define SHGFI_SYSICONINDEX 16384
-#define SHGFI_LINKOVERLAY 32768
-#define SHGFI_SELECTED 65536
-#define SHGFI_ATTR_SPECIFIED 131072
-#define SHGFI_LARGEICON	0
-#define SHGFI_SMALLICON	1
-#define SHGFI_OPENICON	2
-#define SHGFI_SHELLICONSIZE	4
-#define SHGFI_PIDL	8
-#define SHGFI_USEFILEATTRIBUTES	16
-#define SHERB_NOCONFIRMATION 1
-#define SHERB_NOPROGRESSUI 2
-#define SHERB_NOSOUND 4
-
-typedef WORD FILEOP_FLAGS;
-typedef WORD PRINTEROP_FLAGS;
-#include <pshpack2.h>
-typedef struct _AppBarData {
-	DWORD	cbSize;
-	HWND	hWnd;
-	UINT	uCallbackMessage;
-	UINT	uEdge;
-	RECT	rc;
-	LPARAM lParam;
-} APPBARDATA,*PAPPBARDATA;
-DECLARE_HANDLE(HDROP);
-typedef struct _NOTIFYICONDATAA {
-	DWORD cbSize;
-	HWND hWnd;
-	UINT uID;
-	UINT uFlags;
-	UINT uCallbackMessage;
-	HICON hIcon;
-	CHAR szTip[64];
-} NOTIFYICONDATAA,*PNOTIFYICONDATAA;
-typedef struct _NOTIFYICONDATAW {
-	DWORD cbSize;
-	HWND hWnd;
-	UINT uID;
-	UINT uFlags;
-	UINT uCallbackMessage;
-	HICON hIcon;
-	WCHAR szTip[64];
-} NOTIFYICONDATAW,*PNOTIFYICONDATAW;
-typedef struct _SHELLEXECUTEINFOA {
-	DWORD cbSize;
-	ULONG fMask;
-	HWND hwnd;
-	LPCSTR lpVerb;
-	LPCSTR lpFile;
-	LPCSTR lpParameters;
-	LPCSTR lpDirectory;
-	int nShow;
-	HINSTANCE hInstApp;
-	PVOID lpIDList;
-	LPCSTR lpClass;
-	HKEY hkeyClass;
-	DWORD dwHotKey;
-	HANDLE hIcon;
-	HANDLE hProcess;
-} SHELLEXECUTEINFOA,*LPSHELLEXECUTEINFOA;
-typedef struct _SHELLEXECUTEINFOW {
-	DWORD cbSize;
-	ULONG fMask;
-	HWND hwnd;
-	LPCWSTR lpVerb;
-	LPCWSTR lpFile;
-	LPCWSTR lpParameters;
-	LPCWSTR lpDirectory;
-	int nShow;
-	HINSTANCE hInstApp;
-	PVOID lpIDList;
-	LPCWSTR lpClass;
-	HKEY hkeyClass;
-	DWORD dwHotKey;
-	HANDLE hIcon;
-	HANDLE hProcess;
-} SHELLEXECUTEINFOW,*LPSHELLEXECUTEINFOW;
-typedef struct _SHFILEOPSTRUCTA {
-	HWND hwnd;
-	UINT wFunc;
-	LPCSTR pFrom;
-	LPCSTR pTo;
-	FILEOP_FLAGS fFlags;
-	BOOL fAnyOperationsAborted;
-	PVOID hNameMappings;
-	LPCSTR lpszProgressTitle;
-} SHFILEOPSTRUCTA,*LPSHFILEOPSTRUCTA;
-typedef struct _SHFILEOPSTRUCTW {
-	HWND hwnd;
-	UINT wFunc;
-	LPCWSTR pFrom;
-	LPCWSTR pTo;
-	FILEOP_FLAGS fFlags;
-	BOOL fAnyOperationsAborted;
-	PVOID hNameMappings;
-	LPCWSTR lpszProgressTitle;
-} SHFILEOPSTRUCTW,*LPSHFILEOPSTRUCTW;
-typedef struct _SHFILEINFOA {
-	HICON hIcon;
-	int iIcon;
-	DWORD dwAttributes;
-	CHAR szDisplayName[MAX_PATH];
-	CHAR szTypeName[80];
-} SHFILEINFOA;
-typedef struct _SHFILEINFOW {
-	HICON hIcon;
-	int iIcon;
-	DWORD dwAttributes;
-	WCHAR szDisplayName[MAX_PATH];
-	WCHAR szTypeName[80];
-} SHFILEINFOW;
-typedef struct _SHQUERYRBINFO {
-	DWORD   cbSize;
-	__int64 i64Size;
-	__int64 i64NumItems;
-} SHQUERYRBINFO, *LPSHQUERYRBINFO;
-#include <poppack.h>
-
-LPWSTR * WINAPI CommandLineToArgvW(LPCWSTR,int*);
-void WINAPI DragAcceptFiles(HWND,BOOL);
-void WINAPI DragFinish(HDROP);
-UINT WINAPI DragQueryFileA(HDROP,UINT,LPSTR,UINT);
-UINT WINAPI DragQueryFileW(HDROP,UINT,LPWSTR,UINT);
-BOOL WINAPI DragQueryPoint(HDROP,LPPOINT);
-HICON WINAPI ExtractAssociatedIconA(HINSTANCE,LPCSTR,PWORD);
-HICON WINAPI ExtractAssociatedIconW(HINSTANCE,LPCWSTR,PWORD);
-HICON WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT);
-HICON WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT);
-UINT WINAPI ExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT);
-UINT WINAPI ExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT);
-HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR);
-HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR);
-UINT WINAPI SHAppBarMessage(DWORD,PAPPBARDATA);
-BOOL WINAPI Shell_NotifyIconA(DWORD,PNOTIFYICONDATAA);
-BOOL WINAPI Shell_NotifyIconW(DWORD,PNOTIFYICONDATAW);
-int WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON);
-int WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON);
-HINSTANCE WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT);
-HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT);
-BOOL WINAPI ShellExecuteExA(LPSHELLEXECUTEINFOA);
-BOOL WINAPI ShellExecuteExW(LPSHELLEXECUTEINFOW);
-int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA);
-int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW);
-void WINAPI SHFreeNameMappings(HANDLE);
-DWORD WINAPI SHGetFileInfoA(LPCSTR,DWORD,SHFILEINFOA*,UINT,UINT);
-DWORD WINAPI SHGetFileInfoW(LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT);
-HRESULT WINAPI SHQueryRecycleBinA(LPCSTR, LPSHQUERYRBINFO);
-HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR, LPSHQUERYRBINFO);
-HRESULT WINAPI SHEmptyRecycleBinA(HWND,LPCSTR,DWORD);
-HRESULT WINAPI SHEmptyRecycleBinW(HWND,LPCWSTR,DWORD);
-
-#ifdef UNICODE
-typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA;
-typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
-typedef SHFILEOPSTRUCTW SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT;
-typedef SHFILEINFOW SHFILEINFO;
-#define DragQueryFile DragQueryFileW
-#define ExtractAssociatedIcon ExtractAssociatedIconW
-#define ExtractIcon ExtractIconW
-#define ExtractIconEx ExtractIconExW
-#define FindExecutable FindExecutableW
-#define Shell_NotifyIcon Shell_NotifyIconW
-#define ShellAbout ShellAboutW
-#define ShellExecute ShellExecuteW
-#define ShellExecuteEx ShellExecuteExW
-#define SHFileOperation SHFileOperationW
-#define SHGetFileInfo SHGetFileInfoW
-#define SHQueryRecycleBin SHQueryRecycleBinW
-#define SHEmptyRecycleBin SHEmptyRecycleBinW
-
-#else
-typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA;
-typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO;
-typedef SHFILEOPSTRUCTA SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT;
-typedef SHFILEINFOA SHFILEINFO;
-#define DragQueryFile DragQueryFileA
-#define ExtractAssociatedIcon ExtractAssociatedIconA
-#define ExtractIcon ExtractIconA
-#define ExtractIconEx ExtractIconExA
-#define FindExecutable FindExecutableA
-#define Shell_NotifyIcon Shell_NotifyIconA
-#define ShellAbout ShellAboutA
-#define ShellExecute ShellExecuteA
-#define ShellExecuteEx ShellExecuteExA
-#define SHFileOperation SHFileOperationA
-#define SHGetFileInfo SHGetFileInfoA
-#define SHQueryRecycleBin SHQueryRecycleBinA
-#define SHEmptyRecycleBin SHEmptyRecycleBinA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/shlguid.h b/winsup/w32api/include/shlguid.h
deleted file mode 100644
index db42c8822..000000000
--- a/winsup/w32api/include/shlguid.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef _SHLGUID_H
-#define _SHLGUID_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define DEFINE_SHLGUID(n,l,w1,w2) DEFINE_GUID(n,l,w1,w2,0xC0,0,0,0,0,0,0,0x46)
-#define SID_SShellBrowser IID_IShellBrowser
-extern const GUID CLSID_ShellDesktop;
-extern const GUID CLSID_ShellLink;
-extern const GUID FMTID_Intshcut;
-extern const GUID FMTID_InternetSite;
-extern const GUID CGID_Explorer;
-extern const GUID CGID_ShellDocView;
-extern const GUID CGID_ShellServiceObject;
-extern const GUID IID_INewShortcutHookA;
-extern const GUID IID_IShellBrowser;
-extern const GUID IID_IShellView;
-extern const GUID IID_IContextMenu;
-extern const GUID IID_IColumnProvider;
-extern const GUID IID_IQueryInfo;
-extern const GUID IID_IShellIcon;
-extern const GUID IID_IShellIconOverlayIdentifier;
-extern const GUID IID_IShellFolder;
-extern const GUID IID_IShellExtInit;
-extern const GUID IID_IShellPropSheetExt;
-extern const GUID IID_IPersistFolder;
-extern const GUID IID_IExtractIconA;
-extern const GUID IID_IShellLinkA;
-extern const GUID IID_IShellCopyHookA;
-extern const GUID IID_IFileViewerA;
-extern const GUID IID_ICommDlgBrowser;
-extern const GUID IID_IEnumIDList;
-extern const GUID IID_IFileViewerSite;
-extern const GUID IID_IContextMenu2;
-extern const GUID IID_IShellExecuteHookA;
-extern const GUID IID_IPropSheetPage;
-extern const GUID IID_INewShortcutHookW;
-extern const GUID IID_IFileViewerW;
-extern const GUID IID_IShellLinkW;
-extern const GUID IID_IExtractIconW;
-extern const GUID IID_IShellExecuteHookW;
-extern const GUID IID_IShellCopyHookW;
-extern const GUID IID_IShellView2;
-extern const GUID LIBID_SHDocVw;
-extern const GUID IID_IShellExplorer;
-extern const GUID DIID_DShellExplorerEvents;
-extern const GUID CLSID_ShellExplorer;
-extern const GUID IID_ISHItemOC;
-extern const GUID DIID_DSHItemOCEvents;
-extern const GUID CLSID_SHItemOC;
-extern const GUID IID_DHyperLink;
-extern const GUID IID_DIExplorer;
-extern const GUID DIID_DExplorerEvents;
-extern const GUID CLSID_InternetExplorer;
-extern const GUID CLSID_StdHyperLink;
-extern const GUID CLSID_FileTypes;
-extern const GUID CLSID_InternetShortcut;
-extern const GUID IID_IUniformResourceLocator;
-extern const GUID CLSID_DragDropHelper;
-extern const GUID IID_IDropTargetHelper;
-extern const GUID IID_IDragSourceHelper;
-#ifdef UNICODE
-#define IID_IFileViewer	IID_IFileViewerW
-#define IID_IShellLink	IID_IShellLinkW
-#define IID_IExtractIcon	IID_IExtractIconW
-#define IID_IShellCopyHook	IID_IShellCopyHookW
-#define IID_IShellExecuteHook	IID_IShellExecuteHookW
-#define IID_INewShortcutHook	IID_INewShortcutHookW
-#else
-#define IID_IFileViewer	IID_IFileViewerA
-#define IID_IShellLink	IID_IShellLinkA
-#define IID_IExtractIcon	IID_IExtractIconA
-#define IID_IShellCopyHook	IID_IShellCopyHookA
-#define IID_IShellExecuteHook	IID_IShellExecuteHookA
-#define IID_INewShortcutHook	IID_INewShortcutHookA
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h
deleted file mode 100644
index 7386e58f5..000000000
--- a/winsup/w32api/include/shlobj.h
+++ /dev/null
@@ -1,1060 +0,0 @@
-#ifndef _SHLOBJ_H
-#define _SHLOBJ_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <ole2.h>
-#include <shlguid.h>
-#include <shellapi.h>
-#pragma pack(push,1)
-#include <commctrl.h>
-
-#define BIF_RETURNONLYFSDIRS 1
-#define BIF_DONTGOBELOWDOMAIN 2
-#define BIF_STATUSTEXT 4
-#define BIF_RETURNFSANCESTORS 8
-#define BIF_EDITBOX 16
-#define BIF_VALIDATE 32
-#define BIF_NEWDIALOGSTYLE 64
-#define BIF_BROWSEINCLUDEURLS 128
-#define BIF_USENEWUI ( BIF_EDITBOX | BIF_NEWDIALOGSTYLE )
-#define BIF_BROWSEFORCOMPUTER 0x1000
-#define BIF_BROWSEFORPRINTER 0x2000
-#define BIF_BROWSEINCLUDEFILES 0x4000
-#define BIF_SHAREABLE 0x8000
-#define BFFM_INITIALIZED 1
-#define BFFM_SELCHANGED 2
-#define BFFM_VALIDATEFAILEDA 3
-#define BFFM_VALIDATEFAILEDW 4
-#define BFFM_SETSTATUSTEXTA (WM_USER + 100)
-#define BFFM_SETSTATUSTEXTW (WM_USER + 104)
-#define BFFM_ENABLEOK (WM_USER + 101)
-#define BFFM_SETSELECTIONA (WM_USER + 102)
-#define BFFM_SETSELECTIONW (WM_USER + 103)
-#ifdef UNICODE
-#define BFFM_SETSTATUSTEXT  BFFM_SETSTATUSTEXTW
-#define BFFM_SETSELECTION   BFFM_SETSELECTIONW
-#define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDW
-#else
-#define BFFM_SETSTATUSTEXT  BFFM_SETSTATUSTEXTA
-#define BFFM_SETSELECTION   BFFM_SETSELECTIONA
-#define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDA
-#endif
-#define DVASPECT_SHORTNAME 2
-#define SHARD_PIDL	1
-#define SHARD_PATH	2
-#define SHCNE_RENAMEITEM	1
-#define SHCNE_CREATE	2
-#define SHCNE_DELETE	4
-#define SHCNE_MKDIR	8
-#define SHCNE_RMDIR	16
-#define SHCNE_MEDIAINSERTED	32
-#define SHCNE_MEDIAREMOVED	64
-#define SHCNE_DRIVEREMOVED	128
-#define SHCNE_DRIVEADD	256
-#define SHCNE_NETSHARE	512
-#define SHCNE_NETUNSHARE	1024
-#define SHCNE_ATTRIBUTES	2048
-#define SHCNE_UPDATEDIR	4096
-#define SHCNE_UPDATEITEM	8192
-#define SHCNE_SERVERDISCONNECT	16384
-#define SHCNE_UPDATEIMAGE	32768
-#define SHCNE_DRIVEADDGUI	65536
-#define SHCNE_RENAMEFOLDER	0x20000
-#define SHCNE_FREESPACE	0x40000
-#define SHCNE_ASSOCCHANGED	0x8000000
-#define SHCNE_DISKEVENTS	0x2381F
-#define SHCNE_GLOBALEVENTS	0xC0581E0
-#define SHCNE_ALLEVENTS	0x7FFFFFFF
-#define SHCNE_INTERRUPT	0x80000000
-#define SHCNF_IDLIST	0
-#define SHCNF_PATH	1
-#define SHCNF_PRINTER	2
-#define SHCNF_DWORD	3
-#define SHCNF_TYPE	0xFF
-#define SHCNF_FLUSH	0x1000
-#define SHCNF_FLUSHNOWAIT	0x2000
-#define SFGAO_CANCOPY	DROPEFFECT_COPY
-#define SFGAO_CANMOVE	DROPEFFECT_MOVE
-#define SFGAO_CANLINK	DROPEFFECT_LINK
-#define SFGAO_CANRENAME		0x00000010L
-#define SFGAO_CANDELETE		0x00000020L
-#define SFGAO_HASPROPSHEET	0x00000040L
-#define SFGAO_DROPTARGET	0x00000100L
-#define SFGAO_CAPABILITYMASK	0x00000177L
-#define SFGAO_GHOSTED		0x00008000L
-#define SFGAO_LINK		0x00010000L
-#define SFGAO_SHARE		0x00020000L
-#define SFGAO_READONLY		0x00040000L
-#define SFGAO_HIDDEN		0x00080000L
-#define SFGAO_DISPLAYATTRMASK	0x000F0000L
-#define SFGAO_FILESYSANCESTOR	0x10000000L
-#define SFGAO_FOLDER		0x20000000L
-#define SFGAO_FILESYSTEM	0x40000000L
-#define SFGAO_HASSUBFOLDER	0x80000000L
-#define SFGAO_CONTENTSMASK	0x80000000L
-#define SFGAO_VALIDATE		0x01000000L
-#define SFGAO_REMOVABLE		0x02000000L
-#define SFGAO_COMPRESSED	0x04000000L
-#define STRRET_WSTR	0
-#define STRRET_OFFSET	1
-#define STRRET_CSTR	2
-#define SHGDFIL_FINDDATA	1
-#define SHGDFIL_NETRESOURCE	2
-#define SHGDFIL_DESCRIPTIONID	3
-#define SHDID_ROOT_REGITEM	1
-#define SHDID_FS_FILE	2
-#define SHDID_FS_DIRECTORY	3
-#define SHDID_FS_OTHER	4
-#define SHDID_COMPUTER_DRIVE35	5
-#define SHDID_COMPUTER_DRIVE525	6
-#define SHDID_COMPUTER_REMOVABLE	7
-#define SHDID_COMPUTER_FIXED	8
-#define SHDID_COMPUTER_NETDRIVE	9
-#define SHDID_COMPUTER_CDROM	10
-#define SHDID_COMPUTER_RAMDISK	11
-#define SHDID_COMPUTER_OTHER	12
-#define SHDID_NET_DOMAIN	13
-#define SHDID_NET_SERVER	14
-#define SHDID_NET_SHARE	15
-#define SHDID_NET_RESTOFNET	16
-#define SHDID_NET_OTHER	17
-#ifndef REGSTR_PATH_EXPLORER
-#define REGSTR_PATH_EXPLORER	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")
-#endif
-#define REGSTR_PATH_SPECIAL_FOLDERS	REGSTR_PATH_EXPLORER TEXT("\\Shell Folders")
-#define CSIDL_DESKTOP	0
-#define CSIDL_INTERNET  1
-#define CSIDL_PROGRAMS	2
-#define CSIDL_CONTROLS	3
-#define CSIDL_PRINTERS	4
-#define CSIDL_PERSONAL	5
-#define CSIDL_FAVORITES	6
-#define CSIDL_STARTUP	7
-#define CSIDL_RECENT	8
-#define CSIDL_SENDTO	9
-#define CSIDL_BITBUCKET	10
-#define CSIDL_STARTMENU	11
-#define CSIDL_DESKTOPDIRECTORY	16
-#define CSIDL_DRIVES	17
-#define CSIDL_NETWORK	18
-#define CSIDL_NETHOOD	19
-#define CSIDL_FONTS	20
-#define CSIDL_TEMPLATES	21
-#define CSIDL_COMMON_STARTMENU	22
-#define CSIDL_COMMON_PROGRAMS	23
-#define CSIDL_COMMON_STARTUP	24
-#define CSIDL_COMMON_DESKTOPDIRECTORY	25
-#define CSIDL_APPDATA   26
-#define CSIDL_PRINTHOOD 27
-#define CSIDL_LOCAL_APPDATA 28
-#define CSIDL_ALTSTARTUP    29
-#define CSIDL_COMMON_ALTSTARTUP	30
-#define CSIDL_COMMON_FAVORITES	31
-#define CSIDL_INTERNET_CACHE   32
-#define CSIDL_COOKIES	33
-#define CSIDL_HISTORY	34
-#define CSIDL_COMMON_APPDATA	35
-#define CSIDL_WINDOWS	36
-#define CSIDL_SYSTEM	37
-#define CSIDL_PROGRAM_FILES	38
-#define CSIDL_MYPICTURES	39
-#define CSIDL_PROFILE	40
-#define CSIDL_SYSTEMX86	41
-#define CSIDL_PROGRAM_FILESX86	42
-#define CSIDL_PROGRAM_FILES_COMMON	43
-#define CSIDL_PROGRAM_FILES_COMMONX86	44
-#define CSIDL_COMMON_TEMPLATES	45
-#define CSIDL_COMMON_DOCUMENTS	46
-#define CSIDL_COMMON_ADMINTOOLS	47
-#define CSIDL_ADMINTOOLS	48
-#define CSIDL_CONNECTIONS	49
-#define CSIDL_COMMON_MUSIC	53
-#define CSIDL_COMMON_PICTURES	54
-#define CSIDL_COMMON_VIDEO	55
-#define CSIDL_RESOURCES	56
-#define CSIDL_RESOURCES_LOCALIZED	57
-#define CSIDL_COMMON_OEM_LINKS	58
-#define CSIDL_CDBURN_AREA	59
-#define CSIDL_COMPUTERSNEARME	61
-#define CFSTR_SHELLIDLIST	TEXT("Shell IDList Array")
-#define CFSTR_SHELLIDLISTOFFSET	TEXT("Shell Object Offsets")
-#define CFSTR_NETRESOURCES	TEXT("Net Resource")
-#define CFSTR_FILECONTENTS	TEXT("FileContents")
-#ifdef UNICODE
-#define CFSTR_FILENAME		L"FileNameW"
-#define CFSTR_FILENAMEMAP	L"FileNameMapW"
-#define CFSTR_FILEDESCRIPTOR	L"FileGroupDescriptorW"
-#define CFSTR_SHELLURL		L"UniformResourceLocatorW"
-#else
-#define CFSTR_FILENAME		"FileName"
-#define CFSTR_FILENAMEMAP	"FileNameMap"
-#define CFSTR_FILEDESCRIPTOR	"FileGroupDescriptor"
-#define CFSTR_SHELLURL		"UniformResourceLocator"
-#endif
-#define CFSTR_PRINTERGROUP	TEXT("PrinterFriendlyName")
-#define CFSTR_INDRAGLOOP	TEXT("InShellDragLoop")
-#define CFSTR_PASTESUCCEEDED	TEXT("Paste Succeeded")
-#define CFSTR_PERFORMEDDROPEFFECT	TEXT("Performed DropEffect")
-#define CFSTR_PREFERREDDROPEFFECT	TEXT("Preferred DropEffect")
-#define CMF_NORMAL	0
-#define CMF_DEFAULTONLY	1
-#define CMF_VERBSONLY	2
-#define CMF_EXPLORE	4
-#define CMF_NOVERBS	8
-#define CMF_CANRENAME	16
-#define CMF_NODEFAULT	32
-#define CMF_INCLUDESTATIC	64
-#define CMF_RESERVED	0xffff0000
-#define GCS_VERBA        0
-#define GCS_HELPTEXTA    1
-#define GCS_VALIDATEA    2
-#define GCS_VERBW        4
-#define GCS_HELPTEXTW    5
-#define GCS_VALIDATEW    6
-#define GCS_UNICODE      4
-#ifdef UNICODE
-#define GCS_VERB        GCS_VERBW
-#define GCS_HELPTEXT    GCS_HELPTEXTW
-#define GCS_VALIDATE    GCS_VALIDATEW
-#else
-#define GCS_VERB        GCS_VERBA
-#define GCS_HELPTEXT    GCS_HELPTEXTA
-#define GCS_VALIDATE    GCS_VALIDATEA
-#endif
-#define CMDSTR_NEWFOLDER	TEXT("NewFolder")
-#define CMDSTR_VIEWLIST		TEXT("ViewList")
-#define CMDSTR_VIEWDETAILS	TEXT("ViewDetails")
-#define CMIC_MASK_HOTKEY	SEE_MASK_HOTKEY
-#define CMIC_MASK_ICON	SEE_MASK_ICON
-#define CMIC_MASK_FLAG_NO_UI	SEE_MASK_FLAG_NO_UI
-#define CMIC_MASK_MODAL	0x80000000
-#define CMIC_VALID_SEE_FLAGS	SEE_VALID_CMIC_FLAGS
-#define GIL_OPENICON	1
-#define GIL_FORSHELL	2
-#define GIL_SIMULATEDOC	1
-#define GIL_PERINSTANCE	2
-#define GIL_PERCLASS	4
-#define GIL_NOTFILENAME	8
-#define GIL_DONTCACHE	16
-#define FVSIF_RECT	1
-#define FVSIF_PINNED	2
-#define FVSIF_NEWFAILED 0x8000000
-#define FVSIF_NEWFILE	0x80000000
-#define FVSIF_CANVIEWIT 0x40000000
-#define CDBOSC_SETFOCUS	0
-#define CDBOSC_KILLFOCUS	1
-#define CDBOSC_SELCHANGE	2
-#define CDBOSC_RENAME	3
-#define FCIDM_SHVIEWFIRST	0
-#define FCIDM_SHVIEWLAST	0x7fff
-#define FCIDM_BROWSERFIRST	0xa000
-#define FCIDM_BROWSERLAST	0xbf00
-#define FCIDM_GLOBALFIRST	0x8000
-#define FCIDM_GLOBALLAST	0x9fff
-#define FCIDM_MENU_FILE	FCIDM_GLOBALFIRST
-#define FCIDM_MENU_EDIT	(FCIDM_GLOBALFIRST+0x0040)
-#define FCIDM_MENU_VIEW	(FCIDM_GLOBALFIRST+0x0080)
-#define FCIDM_MENU_VIEW_SEP_OPTIONS	(FCIDM_GLOBALFIRST+0x0081)
-#define FCIDM_MENU_TOOLS	(FCIDM_GLOBALFIRST+0x00c0)
-#define FCIDM_MENU_TOOLS_SEP_GOTO	(FCIDM_GLOBALFIRST+0x00c1)
-#define FCIDM_MENU_HELP	(FCIDM_GLOBALFIRST+0x0100)
-#define FCIDM_MENU_FIND	(FCIDM_GLOBALFIRST+0x0140)
-#define FCIDM_MENU_EXPLORE	(FCIDM_GLOBALFIRST+0x0150)
-#define FCIDM_MENU_FAVORITES	(FCIDM_GLOBALFIRST+0x0170)
-#define FCIDM_TOOLBAR	FCIDM_BROWSERFIRST
-#define FCIDM_STATUS	(FCIDM_BROWSERFIRST+1)
-#define SBSP_DEFBROWSER	0
-#define SBSP_SAMEBROWSER	1
-#define SBSP_NEWBROWSER	2
-#define SBSP_DEFMODE	0
-#define SBSP_OPENMODE	16
-#define SBSP_EXPLOREMODE	32
-#define SBSP_ABSOLUTE	0
-#define SBSP_RELATIVE	0x1000
-#define SBSP_PARENT	0x2000
-#define SBSP_INITIATEDBYHLINKFRAME	0x80000000
-#define SBSP_REDIRECT	0x40000000
-#define FCW_STATUS	1
-#define FCW_TOOLBAR	2
-#define FCW_TREE	3
-#define FCT_MERGE	1
-#define FCT_CONFIGABLE	2
-#define FCT_ADDTOEND	4
-#define SVSI_DESELECT	0
-#define SVSI_SELECT	1
-#define SVSI_EDIT	3
-#define SVSI_DESELECTOTHERS	4
-#define SVSI_ENSUREVISIBLE	8
-#define SVSI_FOCUSED	16
-#define SVGIO_BACKGROUND	0
-#define SVGIO_SELECTION	1
-#define SVGIO_ALLVIEW	2
-#define SV2GV_CURRENTVIEW ((UINT)-1)
-#define SV2GV_DEFAULTVIEW ((UINT)-2)
-
-typedef ULONG SFGAOF;
-typedef DWORD SHGDNF;
-
-typedef struct _IDA {
-	UINT cidl;
-	UINT aoffset[1];
-} CIDA,*LPIDA;
-typedef struct _SHITEMID {
-	USHORT	cb;
-	BYTE	abID[1];
-} SHITEMID, * LPSHITEMID;
-typedef const SHITEMID *LPCSHITEMID;
-typedef struct _ITEMIDLIST {
-	SHITEMID mkid;
-} ITEMIDLIST,*LPITEMIDLIST;
-typedef const ITEMIDLIST *LPCITEMIDLIST;
-typedef int (CALLBACK* BFFCALLBACK)(HWND,UINT,LPARAM,LPARAM);
-typedef struct _browseinfoA {
-	HWND	hwndOwner;
-	LPCITEMIDLIST	pidlRoot;
-	LPSTR	pszDisplayName;
-	LPCSTR	lpszTitle;
-	UINT	ulFlags;
-	BFFCALLBACK	lpfn;
-	LPARAM	lParam;
-	int	iImage;
-} BROWSEINFOA,*PBROWSEINFOA,*LPBROWSEINFOA;
-typedef struct _browseinfoW {
-	HWND	hwndOwner;
-	LPCITEMIDLIST	pidlRoot;
-	LPWSTR	pszDisplayName;
-	LPCWSTR	lpszTitle;
-	UINT	ulFlags;
-	BFFCALLBACK	lpfn;
-	LPARAM	lParam;
-	int	iImage;
-} BROWSEINFOW,*PBROWSEINFOW,*LPBROWSEINFOW;
-typedef struct _CMInvokeCommandInfo {
-	DWORD cbSize;
-	DWORD fMask;
-	HWND hwnd;
-	LPCSTR lpVerb;
-	LPCSTR lpParameters;
-	LPCSTR lpDirectory;
-	int nShow;
-	DWORD dwHotKey;
-	HANDLE hIcon;
-} CMINVOKECOMMANDINFO,*LPCMINVOKECOMMANDINFO;
-typedef struct _DROPFILES {
-	DWORD pFiles;
-	POINT pt;
-	BOOL fNC;
-	BOOL fWide;
-} DROPFILES,*LPDROPFILES;
-typedef enum tagSHGDN {
-	SHGDN_NORMAL=0,
-	SHGDN_INFOLDER,
-	SHGDN_FORPARSING=0x8000
-} SHGNO;
-typedef enum tagSHCONTF {
-	SHCONTF_FOLDERS = 32,
-	SHCONTF_NONFOLDERS = 64,
-	SHCONTF_INCLUDEHIDDEN = 128,
-	SHCONTF_INIT_ON_FIRST_NEXT = 256,
-	SHCONTF_NETPRINTERSRCH = 512,
-	SHCONTF_SHAREABLE = 1024,
-	SHCONTF_STORAGE = 2048
-} SHCONTF;
-typedef struct _STRRET {
-	UINT uType;
-	_ANONYMOUS_UNION union {
-		LPWSTR pOleStr;
-		UINT uOffset;
-		char cStr[MAX_PATH];
-	} DUMMYUNIONNAME;
-} STRRET,*LPSTRRET;
-typedef enum {
-	FD_CLSID=1,FD_SIZEPOINT=2,FD_ATTRIBUTES=4,FD_CREATETIME=8,FD_ACCESSTIME=16,
-	FD_WRITESTIME=32,FD_FILESIZE=64,FD_LINKUI=0x8000
-} FD_FLAGS;
-typedef struct _FILEDESCRIPTOR {
-	DWORD dwFlags;
-	CLSID clsid;
-	SIZEL sizel;
-	POINTL pointl;
-	DWORD dwFileAttributes;
-	FILETIME ftCreationTime;
-	FILETIME ftLastAccessTime;
-	FILETIME ftLastWriteTime;
-	DWORD nFileSizeHigh;
-	DWORD nFileSizeLow;
-	CHAR cFileName[MAX_PATH];
-} FILEDESCRIPTOR,*LPFILEDESCRIPTOR;
-typedef struct _FILEGROUPDESCRIPTOR {
-	UINT cItems;
-	FILEDESCRIPTOR fgd[1];
-} FILEGROUPDESCRIPTOR,*LPFILEGROUPDESCRIPTOR;
-typedef enum {
-	SLR_NO_UI=1,
-	SLR_ANY_MATCH=2,
-	SLR_UPDATE=4,
-	SLR_NOUPDATE=8,
-	SLR_NOSEARCH=16,
-	SLR_NOTRACK=32,
-	SLR_NOLINKINFO=64,
-	SLR_INVOKE_MSI=128
-} SLR_FLAGS;
-typedef enum {
-	SLGP_SHORTPATH=1,
-	SLGP_UNCPRIORITY
-} SLGP_FLAGS;
-typedef PBYTE LPVIEWSETTINGS;
-typedef enum {
-	FWF_AUTOARRANGE=1,FWF_ABBREVIATEDNAMES=2,FWF_SNAPTOGRID=4,FWF_OWNERDATA=8,
-	FWF_BESTFITWINDOW=16,FWF_DESKTOP=32,FWF_SINGLESEL=64,FWF_NOSUBFOLDERS=128,
-	FWF_TRANSPARENT=256,FWF_NOCLIENTEDGE=512,FWF_NOSCROLL=0x400,FWF_ALIGNLEFT=0x800,
-	FWF_SINGLECLICKACTIVATE=0x8000
-} FOLDERFLAGS;
-typedef enum {
-	FVM_ICON=1,
-	FVM_SMALLICON,
-	FVM_LIST,
-	FVM_DETAILS
-} FOLDERVIEWMODE;
-typedef struct {
-	UINT ViewMode;
-	UINT fFlags;
-} FOLDERSETTINGS,*LPFOLDERSETTINGS;
-typedef const FOLDERSETTINGS *LPCFOLDERSETTINGS;
-typedef struct {
-    DWORD cbSize;
-	HWND hwndOwner;
-	int iShow;
-	DWORD dwFlags;
-	RECT rect;
-	LPUNKNOWN punkRel;
-	OLECHAR strNewFile[MAX_PATH];
-} FVSHOWINFO,*LPFVSHOWINFO;
-typedef struct _NRESARRAY {
-	UINT cItems;
-	NETRESOURCE nr[1];
-} NRESARRAY, *LPNRESARRAY;
-enum { SBSC_HIDE,SBSC_SHOW,SBSC_TOGGLE,SBSC_QUERY };
-enum {
-	SBCMDID_ENABLESHOWTREE,SBCMDID_SHOWCONTROL,SBCMDID_CANCELNAVIGATION,
-	SBCMDID_MAYSAVECHANGES,SBCMDID_SETHLINKFRAME,SBCMDID_ENABLESTOP,SBCMDID_OPTIONS
-};
-typedef enum {
-	SVUIA_DEACTIVATE,SVUIA_ACTIVATE_NOFOCUS,SVUIA_ACTIVATE_FOCUS,
-	SVUIA_INPLACEACTIVATE
-} SVUIA_STATUS;
-
-DECLARE_ENUMERATOR_(IEnumIDList,LPITEMIDLIST);
-typedef IEnumIDList *LPENUMIDLIST;
-
-#undef INTERFACE
-#define INTERFACE IContextMenu
-DECLARE_INTERFACE_(IContextMenu,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(QueryContextMenu)(THIS_ HMENU,UINT,UINT,UINT,UINT) PURE;
-	STDMETHOD(InvokeCommand)(THIS_ LPCMINVOKECOMMANDINFO) PURE;
-	STDMETHOD(GetCommandString)(THIS_ UINT,UINT,PUINT,LPSTR,UINT) PURE;
-};
-typedef IContextMenu *LPCONTEXTMENU;
-
-#undef INTERFACE
-#define INTERFACE IContextMenu2
-DECLARE_INTERFACE_(IContextMenu2,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(QueryContextMenu)(THIS_ HMENU,UINT,UINT,UINT,UINT) PURE;
-	STDMETHOD(InvokeCommand)(THIS_ LPCMINVOKECOMMANDINFO) PURE;
-	STDMETHOD(GetCommandString)(THIS_ UINT,UINT,PUINT,LPSTR,UINT) PURE;
-	STDMETHOD(HandleMenuMsg)(THIS_ UINT,WPARAM,LPARAM) PURE;
-};
-typedef IContextMenu2 *LPCONTEXTMENU2;
-
-#if (_WIN32_IE >= 0x0500)
-#pragma pack(push,8)
-typedef struct {
-	ULONG dwFlags;
-	ULONG dwReserved;
-	WCHAR wszFolder[MAX_PATH];
-} SHCOLUMNINIT,*LPSHCOLUMNINIT;
-typedef const SHCOLUMNINIT* LPCSHCOLUMNINIT;
-typedef struct {
-	ULONG dwFlags;
-	DWORD dwFileAttributes;
-	ULONG dwReserved;
-	WCHAR *pwszExt;
-	WCHAR wszFile[MAX_PATH];
-} SHCOLUMNDATA,*LPSHCOLUMNDATA;
-typedef const SHCOLUMNDATA* LPCSHCOLUMNDATA;
-#pragma pack(pop)
-
-typedef struct {
-	GUID fmtid;
-	DWORD pid;
-} SHCOLUMNID,*LPSHCOLUMNID;
-typedef const SHCOLUMNID *LPCSHCOLUMNID;
-
-#define MAX_COLUMN_NAME_LEN 80
-#define MAX_COLUMN_DESC_LEN 128
-
-#pragma pack(push,1)
-typedef struct {
-	SHCOLUMNID scid;
-	VARTYPE vt;
-	DWORD fmt;
-	UINT cChars;
-	DWORD csFlags;
-	WCHAR wszTitle[MAX_COLUMN_NAME_LEN];
-	WCHAR wszDescription[MAX_COLUMN_DESC_LEN];
-} SHCOLUMNINFO,*LPSHCOLUMNINFO;
-typedef const SHCOLUMNINFO* LPCSHCOLUMNINFO;
-#pragma pack(pop)
-
-typedef enum {
-	SHCOLSTATE_TYPE_STR = 0x00000001,
-	SHCOLSTATE_TYPE_INT = 0x00000002,
-	SHCOLSTATE_TYPE_DATE = 0x00000003,
-	SHCOLSTATE_TYPEMASK = 0x0000000f,
-	SHCOLSTATE_ONBYDEFAULT = 0x00000010,
-	SHCOLSTATE_SLOW = 0x00000020,
-	SHCOLSTATE_EXTENDED = 0x00000040,
-	SHCOLSTATE_SECONDARYUI = 0x00000080,
-	SHCOLSTATE_HIDDEN = 0x00000100,
-	SHCOLSTATE_PREFER_VARCMP = 0x00000200
-} SHCOLSTATE;
-
-#undef INTERFACE
-#define INTERFACE IColumnProvider
-DECLARE_INTERFACE_(IColumnProvider,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Initialize)(THIS_ LPCSHCOLUMNINIT) PURE;
-	STDMETHOD(GetColumnInfo)(THIS_ DWORD,SHCOLUMNINFO*) PURE;
-	STDMETHOD(GetItemData)(THIS_ LPCSHCOLUMNID,LPCSHCOLUMNDATA,VARIANT*) PURE;
-};
-#endif  /* _WIN32_IE >= 0x0500 */
-
-#undef INTERFACE
-#define INTERFACE IQueryInfo
-DECLARE_INTERFACE_(IQueryInfo,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetInfoTip)(THIS_ DWORD,WCHAR**) PURE;
-	STDMETHOD(GetInfoFlags)(THIS_ DWORD*) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IShellExtInit
-DECLARE_INTERFACE_(IShellExtInit, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Initialize)(THIS_ LPCITEMIDLIST,LPDATAOBJECT,HKEY) PURE;
-};
-typedef IShellExtInit *LPSHELLEXTINIT;
-
-#undef INTERFACE
-#define INTERFACE IShellPropSheetExt
-DECLARE_INTERFACE_(IShellPropSheetExt, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(AddPages)(THIS_ LPFNADDPROPSHEETPAGE,LPARAM) PURE;
-	STDMETHOD(ReplacePage)(THIS_ UINT,LPFNADDPROPSHEETPAGE,LPARAM) PURE;
-};
-typedef IShellPropSheetExt *LPSHELLPROPSHEETEXT;
-
-#undef INTERFACE
-#define INTERFACE IExtractIconA
-DECLARE_INTERFACE_(IExtractIconA, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetIconLocation)(THIS_ UINT,LPSTR,UINT,int*,PUINT) PURE;
-	STDMETHOD(Extract)(THIS_ LPCSTR,UINT,HICON*,HICON*,UINT) PURE;
-};
-typedef IExtractIconA *LPEXTRACTICONA;
-
-#undef INTERFACE
-#define INTERFACE IExtractIconW
-DECLARE_INTERFACE_(IExtractIconW, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetIconLocation)(THIS_ UINT,LPWSTR,UINT,int*,PUINT) PURE;
-	STDMETHOD(Extract)(THIS_ LPCWSTR,UINT,HICON*,HICON*,UINT) PURE;
-};
-typedef IExtractIconW *LPEXTRACTICONW;
-
-#ifdef UNICODE
-#define IExtractIcon IExtractIconW
-#define LPEXTRACTICON LPEXTRACTICONW
-#else
-#define IExtractIcon IExtractIconA
-#define LPEXTRACTICON LPEXTRACTICONA
-#endif
-
-#undef INTERFACE
-#define INTERFACE IShellLinkA
-DECLARE_INTERFACE_(IShellLinkA, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetPath)(THIS_ LPSTR,int,WIN32_FIND_DATAA*,DWORD) PURE;
-	STDMETHOD(GetIDList)(THIS_ LPITEMIDLIST*) PURE;
-	STDMETHOD(SetIDList)(THIS_ LPCITEMIDLIST) PURE;
-	STDMETHOD(GetDescription)(THIS_ LPSTR,int) PURE;
-	STDMETHOD(SetDescription)(THIS_ LPCSTR) PURE;
-	STDMETHOD(GetWorkingDirectory)(THIS_ LPSTR,int) PURE;
-	STDMETHOD(SetWorkingDirectory)(THIS_ LPCSTR) PURE;
-	STDMETHOD(GetArguments)(THIS_ LPSTR,int) PURE;
-	STDMETHOD(SetArguments)(THIS_ LPCSTR) PURE;
-	STDMETHOD(GetHotkey)(THIS_ PWORD) PURE;
-	STDMETHOD(SetHotkey)(THIS_ WORD) PURE;
-	STDMETHOD(GetShowCmd)(THIS_ int*) PURE;
-	STDMETHOD(SetShowCmd)(THIS_ int) PURE;
-	STDMETHOD(GetIconLocation)(THIS_ LPSTR,int,int*) PURE;
-	STDMETHOD(SetIconLocation)(THIS_ LPCSTR,int) PURE;
-	STDMETHOD(SetRelativePath)(THIS_ LPCSTR ,DWORD) PURE;
-	STDMETHOD(Resolve)(THIS_ HWND,DWORD) PURE;
-	STDMETHOD(SetPath)(THIS_ LPCSTR) PURE;
-};
-#undef INTERFACE
-#define INTERFACE IShellLinkW
-DECLARE_INTERFACE_(IShellLinkW, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetPath)(THIS_ LPWSTR,int,WIN32_FIND_DATAW*,DWORD) PURE;
-	STDMETHOD(GetIDList)(THIS_ LPITEMIDLIST*) PURE;
-	STDMETHOD(SetIDList)(THIS_ LPCITEMIDLIST) PURE;
-	STDMETHOD(GetDescription)(THIS_ LPWSTR,int) PURE;
-	STDMETHOD(SetDescription)(THIS_ LPCWSTR) PURE;
-	STDMETHOD(GetWorkingDirectory)(THIS_ LPWSTR,int) PURE;
-	STDMETHOD(SetWorkingDirectory)(THIS_ LPCWSTR) PURE;
-	STDMETHOD(GetArguments)(THIS_ LPWSTR,int) PURE;
-	STDMETHOD(SetArguments)(THIS_ LPCWSTR) PURE;
-	STDMETHOD(GetHotkey)(THIS_ PWORD) PURE;
-	STDMETHOD(SetHotkey)(THIS_ WORD) PURE;
-	STDMETHOD(GetShowCmd)(THIS_ int*) PURE;
-	STDMETHOD(SetShowCmd)(THIS_ int) PURE;
-	STDMETHOD(GetIconLocation)(THIS_ LPWSTR,int,int*) PURE;
-	STDMETHOD(SetIconLocation)(THIS_ LPCWSTR,int) PURE;
-	STDMETHOD(SetRelativePath)(THIS_ LPCWSTR ,DWORD) PURE;
-	STDMETHOD(Resolve)(THIS_ HWND,DWORD) PURE;
-	STDMETHOD(SetPath)(THIS_ LPCWSTR) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IShellFolder
-DECLARE_INTERFACE_(IShellFolder, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(ParseDisplayName)(THIS_ HWND,LPBC,LPOLESTR,PULONG,LPITEMIDLIST*,PULONG) PURE;
-	STDMETHOD(EnumObjects)(THIS_ HWND,DWORD,LPENUMIDLIST*) PURE;
-	STDMETHOD(BindToObject)(THIS_ LPCITEMIDLIST,LPBC,REFIID,PVOID*) PURE;
-	STDMETHOD(BindToStorage)(THIS_ LPCITEMIDLIST,LPBC,REFIID,PVOID*) PURE;
-	STDMETHOD(CompareIDs)(THIS_ LPARAM,LPCITEMIDLIST,LPCITEMIDLIST) PURE;
-	STDMETHOD(CreateViewObject)(THIS_ HWND,REFIID,PVOID*) PURE;
-	STDMETHOD(GetAttributesOf)(THIS_ UINT,LPCITEMIDLIST*,PULONG) PURE;
-	STDMETHOD(GetUIObjectOf)(THIS_ HWND,UINT,LPCITEMIDLIST*,REFIID,PUINT,PVOID*) PURE;
-	STDMETHOD(GetDisplayNameOf)(THIS_ LPCITEMIDLIST,DWORD,LPSTRRET) PURE;
-	STDMETHOD(SetNameOf)(THIS_ HWND,LPCITEMIDLIST,LPCOLESTR,DWORD,LPITEMIDLIST*) PURE;
-};
-typedef IShellFolder *LPSHELLFOLDER;
-
-#undef INTERFACE
-#define INTERFACE ICopyHook
-DECLARE_INTERFACE_(ICopyHook, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(UINT,CopyCallback)(THIS_ HWND,UINT,UINT,LPCSTR,DWORD,LPCSTR,DWORD) PURE;
-};
-typedef ICopyHook *LPCOPYHOOK;
-
-#undef INTERFACE
-#define INTERFACE IFileViewerSite
-DECLARE_INTERFACE(IFileViewerSite)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(SetPinnedWindow)(THIS_ HWND) PURE;
-	STDMETHOD(GetPinnedWindow)(THIS_ HWND*) PURE;
-};
-typedef IFileViewerSite *LPFILEVIEWERSITE;
-
-#undef INTERFACE
-#define INTERFACE IFileViewer
-DECLARE_INTERFACE(IFileViewer)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(ShowInitialize)(THIS_ LPFILEVIEWERSITE) PURE;
-	STDMETHOD(Show)(THIS_ LPFVSHOWINFO) PURE;
-	STDMETHOD(PrintTo)(THIS_ LPSTR,BOOL) PURE;
-};
-typedef IFileViewer *LPFILEVIEWER;
-
-#undef INTERFACE
-#define INTERFACE IPersistFolder
-DECLARE_INTERFACE_(IPersistFolder,IPersist)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetClassID)(THIS_ CLSID*) PURE;
-	STDMETHOD(Initialize)(THIS_ LPCITEMIDLIST) PURE;
-};
-typedef IPersistFolder *LPPERSISTFOLDER;
-
-typedef interface IShellBrowser *LPSHELLBROWSER;
-typedef interface IShellView *LPSHELLVIEW;
-
-#undef INTERFACE
-#define INTERFACE IShellBrowser
-DECLARE_INTERFACE_(IShellBrowser,IOleWindow)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(InsertMenusSB)(THIS_ HMENU,LPOLEMENUGROUPWIDTHS) PURE;
-	STDMETHOD(SetMenuSB)(THIS_ HMENU,HOLEMENU,HWND) PURE;
-	STDMETHOD(RemoveMenusSB)(THIS_ HMENU) PURE;
-	STDMETHOD(SetStatusTextSB) (THIS_ LPCOLESTR) PURE;
-	STDMETHOD(EnableModelessSB) (THIS_ BOOL	) PURE;
-	STDMETHOD(TranslateAcceleratorSB) (THIS_ LPMSG,WORD) PURE;
-	STDMETHOD(BrowseObject)(THIS_ LPCITEMIDLIST,UINT) PURE;
-	STDMETHOD(GetViewStateStream)(THIS_ DWORD,LPSTREAM*) PURE;
-	STDMETHOD(GetControlWindow)(THIS_ UINT,HWND*) PURE;
-	STDMETHOD(SendControlMsg)(THIS_ UINT,UINT,WPARAM,LPARAM,LRESULT*) PURE;
-	STDMETHOD(QueryActiveShellView)(THIS_ LPSHELLVIEW*) PURE;
-	STDMETHOD(OnViewWindowActive)(THIS_ LPSHELLVIEW) PURE;
-	STDMETHOD(SetToolbarItems)(THIS_ LPTBBUTTON,UINT,UINT) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IShellView
-DECLARE_INTERFACE_(IShellView,IOleWindow)
-{
-
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(TranslateAccelerator) (THIS_ LPMSG) PURE;
-#ifdef _FIX_ENABLEMODELESS_CONFLICT
-	STDMETHOD(EnableModelessSV)(THIS_ BOOL) PURE;
-#else
-	STDMETHOD(EnableModeless)(THIS_ BOOL) PURE;
-#endif
-	STDMETHOD(UIActivate)(THIS_ UINT) PURE;
-	STDMETHOD(Refresh) (THIS) PURE;
-	STDMETHOD(CreateViewWindow)(THIS_ IShellView*,LPCFOLDERSETTINGS,LPSHELLBROWSER,RECT*,HWND*) PURE;
-	STDMETHOD(DestroyViewWindow)(THIS) PURE;
-	STDMETHOD(GetCurrentInfo)(THIS_ LPFOLDERSETTINGS) PURE;
-	STDMETHOD(AddPropertySheetPages)(THIS_ DWORD,LPFNADDPROPSHEETPAGE,LPARAM) PURE;
-	STDMETHOD(SaveViewState)(THIS) PURE;
-	STDMETHOD(SelectItem)(THIS_ LPCITEMIDLIST,UINT) PURE;
-	STDMETHOD(GetItemObject)(THIS_ UINT,REFIID,PVOID*) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE ICommDlgBrowser
-DECLARE_INTERFACE_(ICommDlgBrowser,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(OnDefaultCommand)(THIS_ IShellView*) PURE;
-	STDMETHOD(OnStateChange)(THIS_ IShellView*,ULONG) PURE;
-	STDMETHOD(IncludeObject)(THIS_ IShellView*,LPCITEMIDLIST) PURE;
-};
-typedef ICommDlgBrowser *LPCOMMDLGBROWSER;
-
-typedef GUID SHELLVIEWID;
-typedef struct _SV2CVW2_PARAMS {
-	DWORD cbSize;
-	IShellView *psvPrev;
-	FOLDERSETTINGS const *pfs;
-	IShellBrowser *psbOwner;
-	RECT *prcView;
-	SHELLVIEWID const *pvid;
-	HWND hwndView;
-} SV2CVW2_PARAMS,*LPSV2CVW2_PARAMS;
-#undef INTERFACE
-#define INTERFACE IShellView2
-DECLARE_INTERFACE_(IShellView2,IShellView)
-{
-
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
-	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
-	STDMETHOD(TranslateAccelerator) (THIS_ LPMSG) PURE;
-#ifdef _FIX_ENABLEMODELESS_CONFLICT
-	STDMETHOD(EnableModelessSV)(THIS_ BOOL) PURE;
-#else
-	STDMETHOD(EnableModeless)(THIS_ BOOL) PURE;
-#endif
-	STDMETHOD(UIActivate)(THIS_ UINT) PURE;
-	STDMETHOD(Refresh) (THIS) PURE;
-	STDMETHOD(CreateViewWindow)(THIS_ IShellView*,LPCFOLDERSETTINGS,LPSHELLBROWSER,RECT*,HWND*) PURE;
-	STDMETHOD(DestroyViewWindow)(THIS) PURE;
-	STDMETHOD(GetCurrentInfo)(THIS_ LPFOLDERSETTINGS) PURE;
-	STDMETHOD(AddPropertySheetPages)(THIS_ DWORD,LPFNADDPROPSHEETPAGE,LPARAM) PURE;
-	STDMETHOD(SaveViewState)(THIS) PURE;
-	STDMETHOD(SelectItem)(THIS_ LPCITEMIDLIST,UINT) PURE;
-	STDMETHOD(GetItemObject)(THIS_ UINT,REFIID,PVOID*) PURE;
-	STDMETHOD(GetView)(THIS_ SHELLVIEWID*,ULONG) PURE;
-	STDMETHOD(CreateViewWindow2)(THIS_ LPSV2CVW2_PARAMS) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IShellExecuteHookA
-DECLARE_INTERFACE_(IShellExecuteHookA,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Execute)(THIS_ LPSHELLEXECUTEINFOA) PURE;
-};
-#undef INTERFACE
-#define INTERFACE IShellExecuteHookW
-DECLARE_INTERFACE_(IShellExecuteHookW,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Execute)(THIS_ LPSHELLEXECUTEINFOW) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IShellIcon
-DECLARE_INTERFACE_(IShellIcon,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(GetIconOf)(THIS_ LPCITEMIDLIST,UINT,PINT) PURE;
-};
-typedef IShellIcon *LPSHELLICON;
-
-typedef struct {
-	BOOL fShowAllObjects : 1;
-	BOOL fShowExtensions : 1;
-	BOOL fNoConfirmRecycle : 1;
-	BOOL fShowSysFiles : 1;
-	BOOL fShowCompColor : 1;
-	BOOL fDoubleClickInWebView : 1;
-	BOOL fDesktopHTML : 1;
-	BOOL fWin95Classic : 1;
-	BOOL fDontPrettyPath : 1;
-	BOOL fShowAttribCol : 1;
-	BOOL fMapNetDrvBtn : 1;
-	BOOL fShowInfoTip : 1;
-	BOOL fHideIcons : 1;
-	UINT fRestFlags : 3;
-} SHELLFLAGSTATE, * LPSHELLFLAGSTATE;
-
-#undef  INTERFACE
-#define INTERFACE   IShellIconOverlayIdentifier
-DECLARE_INTERFACE_(IShellIconOverlayIdentifier,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(IsMemberOf)(THIS_ LPCWSTR,DWORD) PURE;
-	STDMETHOD(GetOverlayInfo)(THIS_ LPWSTR,int,int*,DWORD*) PURE;
-	STDMETHOD(GetPriority)(THIS_ int*) PURE;
-};
-
-#define ISIOI_ICONFILE 0x00000001
-#define ISIOI_ICONINDEX 0x00000002
-
-
-#if (_WIN32_WINNT >= 0x0500) /* W2K */
-typedef struct {
-	BOOL fShowAllObjects : 1;
-	BOOL fShowExtensions : 1;
-	BOOL fNoConfirmRecycle : 1;
-	BOOL fShowSysFiles : 1;
-	BOOL fShowCompColor : 1;
-	BOOL fDoubleClickInWebView : 1;
-	BOOL fDesktopHTML : 1;
-	BOOL fWin95Classic : 1;
-	BOOL fDontPrettyPath : 1;
-	BOOL fShowAttribCol : 1;
-	BOOL fMapNetDrvBtn : 1;
-	BOOL fShowInfoTip : 1;
-	BOOL fHideIcons : 1;
-	BOOL fWebView : 1;
-	BOOL fFilter : 1;
-	BOOL fShowSuperHidden : 1;
-	BOOL fNoNetCrawling : 1;
-	DWORD dwWin95Unused;
-	UINT uWin95Unused;
-	LONG lParamSort;
-	int iSortDirection;
-	UINT version;
-	UINT uNotUsed;
-	BOOL fSepProcess : 1;
-	BOOL fStartPanelOn : 1;
-	BOOL fShowStartPage : 1;
-	UINT fSpareFlags : 13;
-} SHELLSTATE, *LPSHELLSTATE;
-#endif /* _WIN32_WINNT >= 0x0500 */
-
-#if (_WIN32_IE >= 0x0500)
-#pragma pack(push,8)
-typedef struct
-{
-	SIZE sizeDragImage;
-	POINT ptOffset;
-	HBITMAP hbmpDragImage;
-	COLORREF crColorKey;
-} SHDRAGIMAGE, *LPSHDRAGIMAGE;
-#pragma pack(pop)
-
-#undef INTERFACE
-#define INTERFACE IDragSourceHelper
-DECLARE_INTERFACE_(IDragSourceHelper, IUnknown)
-{
-	STDMETHOD (QueryInterface)(THIS_ REFIID riid, void **ppv) PURE;
-	STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-	STDMETHOD_(ULONG, Release) (THIS) PURE;
-	STDMETHOD (InitializeFromBitmap)(THIS_ LPSHDRAGIMAGE pshdi, IDataObject* pDataObject) PURE;
-	STDMETHOD (InitializeFromWindow)(THIS_ HWND hwnd, POINT* ppt, IDataObject* pDataObject) PURE;
-};
-
-#undef INTERFACE
-#define INTERFACE IDropTargetHelper
-DECLARE_INTERFACE_(IDropTargetHelper, IUnknown)
-{
-	STDMETHOD (QueryInterface)(THIS_ REFIID riid, void** ppv) PURE;
-	STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-	STDMETHOD_(ULONG, Release) (THIS) PURE;
-	STDMETHOD (DragEnter)(THIS_ HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) PURE;
-	STDMETHOD (DragLeave)(THIS) PURE;
-	STDMETHOD (DragOver)(THIS_ POINT* ppt, DWORD dwEffect) PURE;
-	STDMETHOD (Drop)(THIS_ IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) PURE;
-	STDMETHOD (Show)(THIS_ BOOL fShow) PURE;
-};
-#endif /* _WIN32_IE >= 0x0500 */
-
-void WINAPI SHAddToRecentDocs(UINT,PCVOID);
-LPITEMIDLIST WINAPI SHBrowseForFolderA(PBROWSEINFOA);
-LPITEMIDLIST WINAPI SHBrowseForFolderW(PBROWSEINFOW);
-void WINAPI SHChangeNotify(LONG,UINT,PCVOID,PCVOID);
-HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int);
-HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER,LPCITEMIDLIST,int,PVOID,int);
-HRESULT WINAPI SHGetDesktopFolder(LPSHELLFOLDER*);
-HRESULT WINAPI SHGetInstanceExplorer(IUnknown **);
-HRESULT WINAPI SHGetMalloc(LPMALLOC*);
-BOOL WINAPI SHGetPathFromIDListA(LPCITEMIDLIST,LPSTR);
-BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST,LPWSTR);
-HRESULT WINAPI SHGetSpecialFolderLocation(HWND,int,LPITEMIDLIST*);
-HRESULT WINAPI SHLoadInProc(REFCLSID);
-#if (_WIN32_IE >= 0x0400)
-BOOL WINAPI SHGetSpecialFolderPathA(HWND,LPSTR,int,BOOL);
-BOOL WINAPI SHGetSpecialFolderPathW(HWND,LPWSTR,int,BOOL);
-#endif 
-/* SHGetFolderPath in shfolder.dll on W9x, NT4, also in shell32.dll on W2K */
-HRESULT WINAPI SHGetFolderPathA(HWND,int,HANDLE,DWORD,LPSTR);
-HRESULT WINAPI SHGetFolderPathW(HWND,int,HANDLE,DWORD,LPWSTR);
-#if (_WIN32_WINDOWS >= 0x0490) || (_WIN32_WINNT >= 0x0500) /* ME or W2K */
-HRESULT WINAPI SHGetFolderLocation(HWND,int,HANDLE,DWORD,LPITEMIDLIST*);
-#endif
-#if (_WIN32_WINNT >= 0x0501) /* XP */
-HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR);
-HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR);
-#endif
-void WINAPI SHGetSettings(LPSHELLFLAGSTATE,DWORD);
-#if (_WIN32_WINNT >= 0x0500) /* W2K */
-void WINAPI SHGetSetSettings(LPSHELLSTATE,DWORD,BOOL);
-#endif
-
-#if (_WIN32_WINNT >= 0x0500) /* W2K */
-BOOL WINAPI ILIsEqual(LPCITEMIDLIST, LPCITEMIDLIST);
-BOOL WINAPI ILIsParent(LPCITEMIDLIST, LPCITEMIDLIST, BOOL);
-BOOL WINAPI ILRemoveLastID(LPITEMIDLIST);
-HRESULT WINAPI ILLoadFromStream(IStream*, LPITEMIDLIST*);
-HRESULT WINAPI ILSaveToStream(IStream*, LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILAppendID(LPITEMIDLIST, LPCSHITEMID, BOOL);
-LPITEMIDLIST WINAPI ILClone(LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILCombine(LPCITEMIDLIST, LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILFindChild(LPCITEMIDLIST, LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILFindLastID(LPCITEMIDLIST);
-LPITEMIDLIST WINAPI ILGetNext(LPCITEMIDLIST);
-UINT WINAPI ILGetSize(LPCITEMIDLIST);
-void WINAPI ILFree(LPITEMIDLIST);
-#endif
-
-#ifdef UNICODE
-typedef IShellExecuteHookW IShellExecuteHook;
-typedef IShellLinkW IShellLink;
-typedef BROWSEINFOW BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
-#define SHBrowseForFolder SHBrowseForFolderW
-#define SHGetDataFromIDList SHGetDataFromIDListW
-#define SHGetPathFromIDList SHGetPathFromIDListW
-#if (_WIN32_IE >= 0x0400)
-#define SHGetSpecialFolderPath SHGetSpecialFolderPathW
-#endif
-#define SHGetFolderPath SHGetFolderPathW 
-#if (_WIN32_WINNT >= 0x0501)
-#define SHGetFolderPathAndSubDir SHGetFolderPathAndSubDirW
-#endif
-
-#else
-typedef IShellExecuteHookA IShellExecuteHook;
-typedef IShellLinkA IShellLink;
-typedef BROWSEINFOA BROWSEINFO,*PBROWSEINFO,*LPBROWSEINFO;
-#define SHBrowseForFolder SHBrowseForFolderA
-#define SHGetDataFromIDList SHGetDataFromIDListA
-#define SHGetPathFromIDList SHGetPathFromIDListA
-#if (_WIN32_IE >= 0x0400)
-#define SHGetSpecialFolderPath SHGetSpecialFolderPathA
-#endif
-#define SHGetFolderPath SHGetFolderPathA
-#if (_WIN32_WINNT >= 0x0501)
-#define SHGetFolderPathAndSubDir SHGetFolderPathAndSubDirA
-#endif
-#endif /* UNICODE */
-
-#pragma pack(pop)
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _SHLOBJ_H */
diff --git a/winsup/w32api/include/shlwapi.h b/winsup/w32api/include/shlwapi.h
deleted file mode 100644
index b28b88490..000000000
--- a/winsup/w32api/include/shlwapi.h
+++ /dev/null
@@ -1,712 +0,0 @@
-#ifndef _SHLWAPI_H
-#define _SHLWAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __OBJC__
-#include <objbase.h>
-#include <shlobj.h>
-#endif
-
-#ifndef WINSHLWAPI
-#define WINSHLWAPI DECLSPEC_IMPORT
-#endif
-
-#define DLLVER_PLATFORM_WINDOWS	0x00000001
-#define DLLVER_PLATFORM_NT	0x00000002
-
-#define URL_DONT_ESCAPE_EXTRA_INFO 0x02000000
-#define URL_DONT_SIMPLIFY	0x08000000
-#define URL_ESCAPE_PERCENT	0x00001000
-#define URL_ESCAPE_SEGMENT_ONLY	0x00002000
-#define URL_ESCAPE_SPACES_ONLY	0x04000000
-#define URL_ESCAPE_UNSAFE	0x20000000
-#define URL_INTERNAL_PATH	0x00800000
-#define URL_PARTFLAG_KEEPSCHEME	0x00000001
-#define URL_PLUGGABLE_PROTOCOL	0x40000000
-#define URL_UNESCAPE		0x10000000
-#define URL_UNESCAPE_HIGH_ANSI_ONLY 0x00400000
-#define URL_UNESCAPE_INPLACE	0x00100000
-
-#ifndef RC_INVOKED
-#include <pshpack1.h>
-typedef struct _DllVersionInfo
-{
-    DWORD cbSize;
-    DWORD dwMajorVersion;
-    DWORD dwMinorVersion;
-    DWORD dwBuildNumber;
-    DWORD dwPlatformID;
-} DLLVERSIONINFO;
-typedef struct _DLLVERSIONINFO2
-{
-    DLLVERSIONINFO info1;
-    DWORD dwFlags;
-    ULONGLONG ullVersion;
-} DLLVERSIONINFO2;
-#include <poppack.h>
-
-#define MAKEDLLVERULL(major, minor, build, qfe) \
-        (((ULONGLONG)(major) << 48) | \
-         ((ULONGLONG)(minor) << 32) | \
-         ((ULONGLONG)(build) << 16) | \
-         ((ULONGLONG)(  qfe) <<  0))
-
-typedef enum {
-    ASSOCSTR_COMMAND,
-    ASSOCSTR_EXECUTABLE,
-    ASSOCSTR_FRIENDLYDOCNAME,
-    ASSOCSTR_FRIENDLYAPPNAME,
-    ASSOCSTR_NOOPEN,
-    ASSOCSTR_SHELLNEWVALUE,
-    ASSOCSTR_DDECOMMAND,
-    ASSOCSTR_DDEIFEXEC,
-    ASSOCSTR_DDEAPPLICATION,
-    ASSOCSTR_DDETOPIC
-} ASSOCSTR;
-typedef enum
-{
-    ASSOCKEY_SHELLEXECCLASS = 1,
-    ASSOCKEY_APP,
-    ASSOCKEY_CLASS,
-    ASSOCKEY_BASECLASS
-} ASSOCKEY;
-typedef enum
-{
-    ASSOCDATA_MSIDESCRIPTOR = 1,
-    ASSOCDATA_NOACTIVATEHANDLER,
-    ASSOCDATA_QUERYCLASSSTORE
-} ASSOCDATA;
-typedef DWORD ASSOCF;
-typedef enum
-{
-    SHREGDEL_DEFAULT = 0x00000000,
-    SHREGDEL_HKCU    = 0x00000001,
-    SHREGDEL_HKLM    = 0x00000010,
-    SHREGDEL_BOTH    = 0x00000011
-} SHREGDEL_FLAGS;
-typedef enum
-{
-    SHREGENUM_DEFAULT = 0x00000000,
-    SHREGENUM_HKCU    = 0x00000001,
-    SHREGENUM_HKLM    = 0x00000010,
-    SHREGENUM_BOTH    = 0x00000011
-} SHREGENUM_FLAGS;
-typedef enum
-{
-    URLIS_URL,
-    URLIS_OPAQUE,
-    URLIS_NOHISTORY,
-    URLIS_FILEURL,
-    URLIS_APPLIABLE,
-    URLIS_DIRECTORY,
-    URLIS_HASQUERY
-} URLIS;
-
-typedef HANDLE HUSKEY, *PHUSKEY;
-
-typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
-
-WINSHLWAPI BOOL WINAPI ChrCmpIA(WORD,WORD);
-WINSHLWAPI BOOL WINAPI ChrCmpIW(WCHAR,WCHAR);
-#define IntlStrEqNA(pStr1, pStr2, nChar) IntlStrEqWorkerA(TRUE, pStr1, pStr2, nChar);
-#define IntlStrEqNW(pStr1, pStr2, nChar) IntlStrEqWorkerW(TRUE, pStr1, pStr2, nChar);
-#define IntlStrEqNIA(pStr1, pStr2, nChar) IntlStrEqWorkerA(FALSE, pStr1, pStr2, nChar);
-#define IntlStrEqNIW(pStr1, pStr2, nChar) IntlStrEqWorkerW(FALSE, pStr1, pStr2, nChar);
-WINSHLWAPI BOOL WINAPI IntlStrEqWorkerA(BOOL,LPCSTR,LPCSTR,int);
-WINSHLWAPI BOOL WINAPI IntlStrEqWorkerW(BOOL,LPCWSTR,LPCWSTR,int);
-WINSHLWAPI HRESULT WINAPI SHStrDupA(LPCSTR,LPWSTR*);
-WINSHLWAPI HRESULT WINAPI SHStrDupW(LPCWSTR,LPWSTR*);
-WINSHLWAPI LPSTR WINAPI StrCatA(LPSTR,LPCSTR);
-WINSHLWAPI LPWSTR WINAPI StrCatW(LPWSTR,LPCWSTR);
-WINSHLWAPI LPSTR WINAPI StrCatBuffA(LPSTR,LPCSTR,int);
-WINSHLWAPI LPWSTR WINAPI StrCatBuffW(LPWSTR,LPCWSTR,int);
-WINSHLWAPI DWORD WINAPI StrCatChainW(LPWSTR,DWORD,DWORD,LPCWSTR);
-WINSHLWAPI LPSTR WINAPI StrChrA(LPCSTR,WORD);
-WINSHLWAPI LPWSTR WINAPI StrChrW(LPCWSTR,WCHAR);
-WINSHLWAPI LPSTR WINAPI StrChrIA(LPCSTR,WORD);
-WINSHLWAPI LPWSTR WINAPI StrChrIW(LPCWSTR,WCHAR);
-#define StrCmpIA lstrcmpiA
-#define StrCmpA lstrcmpA
-#define StrCpyA lstrcpyA
-#define StrCpyNA lstrcpynA
-WINSHLWAPI int WINAPI StrCmpIW(LPCWSTR,LPCWSTR);
-WINSHLWAPI int WINAPI StrCmpW(LPCWSTR,LPCWSTR);
-WINSHLWAPI LPWSTR WINAPI StrCpyW(LPWSTR,LPCWSTR);
-WINSHLWAPI LPWSTR WINAPI StrCpyNW(LPWSTR,LPCWSTR,int);
-WINSHLWAPI int WINAPI StrCmpNA(LPCSTR,LPCSTR,int);
-WINSHLWAPI int WINAPI StrCmpNW(LPCWSTR,LPCWSTR,int);
-WINSHLWAPI int WINAPI StrCmpNIA(LPCSTR,LPCSTR,int);
-WINSHLWAPI int WINAPI StrCmpNIW(LPCWSTR,LPCWSTR,int);
-WINSHLWAPI int WINAPI StrCSpnA(LPCSTR,LPCSTR);
-WINSHLWAPI int WINAPI StrCSpnW(LPCWSTR,LPCWSTR);
-WINSHLWAPI int WINAPI StrCSpnIA(LPCSTR,LPCSTR);
-WINSHLWAPI int WINAPI StrCSpnIW(LPCWSTR,LPCWSTR);
-WINSHLWAPI LPSTR WINAPI StrDupA(LPCSTR);
-WINSHLWAPI LPWSTR WINAPI StrDupW(LPCWSTR);
-WINSHLWAPI LPSTR WINAPI StrFormatByteSize64A(LONGLONG,LPSTR,UINT);
-WINSHLWAPI LPSTR WINAPI StrFormatByteSizeA(DWORD,LPSTR,UINT);
-WINSHLWAPI LPWSTR WINAPI StrFormatByteSizeW(LONGLONG,LPWSTR,UINT);
-WINSHLWAPI LPSTR WINAPI StrFormatKBSizeA(LONGLONG,LPSTR,UINT);
-WINSHLWAPI LPWSTR WINAPI StrFormatKBSizeW(LONGLONG,LPWSTR,UINT);
-WINSHLWAPI int WINAPI StrFromTimeIntervalA(LPSTR,UINT,DWORD,int);
-WINSHLWAPI int WINAPI StrFromTimeIntervalW(LPWSTR,UINT,DWORD,int);
-WINSHLWAPI BOOL WINAPI StrIsIntlEqualA(BOOL,LPCSTR,LPCSTR,int);
-WINSHLWAPI BOOL WINAPI StrIsIntlEqualW(BOOL,LPCWSTR,LPCWSTR,int);
-WINSHLWAPI LPSTR WINAPI StrNCatA(LPSTR,LPCSTR,int);
-WINSHLWAPI LPWSTR WINAPI StrNCatW(LPWSTR,LPCWSTR,int);
-WINSHLWAPI LPSTR WINAPI StrPBrkA(LPCSTR,LPCSTR);
-WINSHLWAPI LPWSTR WINAPI StrPBrkW(LPCWSTR,LPCWSTR);
-WINSHLWAPI LPSTR WINAPI StrRChrA(LPCSTR,LPCSTR,WORD);
-WINSHLWAPI LPWSTR WINAPI StrRChrW(LPCWSTR,LPCWSTR,WCHAR);
-WINSHLWAPI LPSTR WINAPI StrRChrIA(LPCSTR,LPCSTR,WORD);
-WINSHLWAPI LPWSTR WINAPI StrRChrIW(LPCWSTR,LPCWSTR,WCHAR);
-#ifndef __OBJC__
-WINSHLWAPI HRESULT WINAPI StrRetToBufA(LPSTRRET,LPCITEMIDLIST,LPSTR,UINT);
-WINSHLWAPI HRESULT WINAPI StrRetToBufW(LPSTRRET,LPCITEMIDLIST,LPWSTR,UINT);
-WINSHLWAPI HRESULT WINAPI StrRetToStrA(LPSTRRET,LPCITEMIDLIST,LPSTR*);
-WINSHLWAPI HRESULT WINAPI StrRetToStrW(LPSTRRET,LPCITEMIDLIST,LPWSTR*);
-#endif
-WINSHLWAPI LPSTR WINAPI StrRStrIA(LPCSTR,LPCSTR,LPCSTR);
-WINSHLWAPI LPWSTR WINAPI StrRStrIW(LPCWSTR,LPCWSTR,LPCWSTR);
-WINSHLWAPI int WINAPI StrSpnA(LPCSTR,LPCSTR);
-WINSHLWAPI int WINAPI StrSpnW(LPCWSTR,LPCWSTR);
-WINSHLWAPI LPSTR WINAPI StrStrA(LPCSTR, LPCSTR);
-WINSHLWAPI LPSTR WINAPI StrStrIA(LPCSTR,LPCSTR);
-WINSHLWAPI LPWSTR WINAPI StrStrIW(LPCWSTR,LPCWSTR);
-WINSHLWAPI LPWSTR WINAPI StrStrW(LPCWSTR,LPCWSTR);
-WINSHLWAPI int WINAPI StrToIntA(LPCSTR);
-WINSHLWAPI int WINAPI StrToIntW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI StrToIntExA(LPCSTR,DWORD,int*);
-WINSHLWAPI BOOL WINAPI StrToIntExW(LPCWSTR,DWORD,int*);
-WINSHLWAPI BOOL WINAPI StrTrimA(LPSTR,LPCSTR);
-WINSHLWAPI BOOL WINAPI StrTrimW(LPWSTR,LPCWSTR);
-WINSHLWAPI LPSTR WINAPI PathAddBackslashA(LPSTR);
-WINSHLWAPI LPWSTR WINAPI PathAddBackslashW(LPWSTR);
-WINSHLWAPI BOOL WINAPI PathAddExtensionA(LPSTR,LPCSTR);
-WINSHLWAPI BOOL WINAPI PathAddExtensionW(LPWSTR,LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathAppendA(LPSTR,LPCSTR);
-WINSHLWAPI BOOL WINAPI PathAppendW(LPWSTR,LPCWSTR);
-WINSHLWAPI LPSTR WINAPI PathBuildRootA(LPSTR,int);
-WINSHLWAPI LPWSTR WINAPI PathBuildRootW(LPWSTR,int);
-WINSHLWAPI BOOL WINAPI PathCanonicalizeA(LPSTR,LPCSTR);
-WINSHLWAPI BOOL WINAPI PathCanonicalizeW(LPWSTR,LPCWSTR);
-WINSHLWAPI LPSTR WINAPI PathCombineA(LPSTR,LPCSTR,LPCSTR);
-WINSHLWAPI LPWSTR WINAPI PathCombineW(LPWSTR,LPCWSTR,LPCWSTR);
-WINSHLWAPI int WINAPI PathCommonPrefixA(LPCSTR,LPCSTR,LPSTR);
-WINSHLWAPI int WINAPI PathCommonPrefixW(LPCWSTR,LPCWSTR,LPWSTR);
-WINSHLWAPI BOOL WINAPI PathCompactPathA(HDC,LPSTR,UINT);
-WINSHLWAPI BOOL WINAPI PathCompactPathW(HDC,LPWSTR,UINT);
-WINSHLWAPI BOOL WINAPI PathCompactPathExA(LPSTR,LPCSTR,UINT,DWORD);
-WINSHLWAPI BOOL WINAPI PathCompactPathExW(LPWSTR,LPCWSTR,UINT,DWORD);
-WINSHLWAPI HRESULT WINAPI PathCreateFromUrlA(LPCSTR,LPSTR,LPDWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI PathCreateFromUrlW(LPCWSTR,LPWSTR,LPDWORD,DWORD);
-WINSHLWAPI BOOL WINAPI PathFileExistsA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathFileExistsW(LPCWSTR);
-WINSHLWAPI LPSTR WINAPI PathFindExtensionA(LPCSTR);
-WINSHLWAPI LPWSTR WINAPI PathFindExtensionW(LPCWSTR);
-WINSHLWAPI LPSTR WINAPI PathFindFileNameA(LPCSTR);
-WINSHLWAPI LPWSTR WINAPI PathFindFileNameW(LPCWSTR);
-WINSHLWAPI LPSTR WINAPI PathFindNextComponentA(LPCSTR);
-WINSHLWAPI LPWSTR WINAPI PathFindNextComponentW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathFindOnPathA(LPSTR,LPCSTR*);
-WINSHLWAPI BOOL WINAPI PathFindOnPathW(LPWSTR,LPCWSTR*);
-WINSHLWAPI LPCSTR WINAPI PathFindSuffixArrayA(LPCSTR,LPCSTR*,int);
-WINSHLWAPI LPCWSTR WINAPI PathFindSuffixArrayW(LPCWSTR,LPCWSTR*,int);
-WINSHLWAPI LPSTR WINAPI PathGetArgsA(LPCSTR);
-WINSHLWAPI LPWSTR WINAPI PathGetArgsW(LPCWSTR);
-WINSHLWAPI UINT WINAPI PathGetCharTypeA(UCHAR);
-WINSHLWAPI UINT WINAPI PathGetCharTypeW(WCHAR);
-WINSHLWAPI int WINAPI PathGetDriveNumberA(LPCSTR);
-WINSHLWAPI int WINAPI PathGetDriveNumberW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsContentTypeA(LPCSTR,LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsContentTypeW(LPCWSTR,LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsDirectoryA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsDirectoryEmptyA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsDirectoryEmptyW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsDirectoryW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsFileSpecA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsFileSpecW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsLFNFileSpecA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsLFNFileSpecW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsNetworkPathA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsNetworkPathW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsPrefixA(LPCSTR,LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsPrefixW(LPCWSTR,LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsRelativeA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsRelativeW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsRootA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsRootW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsSameRootA(LPCSTR,LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsSameRootW(LPCWSTR,LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsSystemFolderA(LPCSTR,DWORD);
-WINSHLWAPI BOOL WINAPI PathIsSystemFolderW(LPCWSTR,DWORD);
-WINSHLWAPI BOOL WINAPI PathIsUNCA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsUNCServerA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsUNCServerShareA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsUNCServerShareW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsUNCServerW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsUNCW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathIsURLA(LPCSTR);
-WINSHLWAPI BOOL WINAPI PathIsURLW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathMakePrettyA(LPSTR);
-WINSHLWAPI BOOL WINAPI PathMakePrettyW(LPWSTR);
-WINSHLWAPI BOOL WINAPI PathMakeSystemFolderA(LPSTR);
-WINSHLWAPI BOOL WINAPI PathMakeSystemFolderW(LPWSTR);
-WINSHLWAPI BOOL WINAPI PathMatchSpecA(LPCSTR,LPCSTR);
-WINSHLWAPI BOOL WINAPI PathMatchSpecW(LPCWSTR,LPCWSTR);
-WINSHLWAPI int WINAPI PathParseIconLocationA(LPSTR);
-WINSHLWAPI int WINAPI PathParseIconLocationW(LPWSTR);
-WINSHLWAPI void WINAPI PathQuoteSpacesA(LPSTR);
-WINSHLWAPI void WINAPI PathQuoteSpacesW(LPWSTR);
-WINSHLWAPI BOOL WINAPI PathRelativePathToA(LPSTR,LPCSTR,DWORD,LPCSTR,DWORD);
-WINSHLWAPI BOOL WINAPI PathRelativePathToW(LPWSTR,LPCWSTR,DWORD,LPCWSTR,DWORD);
-WINSHLWAPI void WINAPI PathRemoveArgsA(LPSTR);
-WINSHLWAPI void WINAPI PathRemoveArgsW(LPWSTR);
-WINSHLWAPI LPSTR WINAPI PathRemoveBackslashA(LPSTR);
-WINSHLWAPI LPWSTR WINAPI PathRemoveBackslashW(LPWSTR);
-WINSHLWAPI void WINAPI PathRemoveBlanksA(LPSTR);
-WINSHLWAPI void WINAPI PathRemoveBlanksW(LPWSTR);
-WINSHLWAPI void WINAPI PathRemoveExtensionA(LPSTR);
-WINSHLWAPI void WINAPI PathRemoveExtensionW(LPWSTR);
-WINSHLWAPI BOOL WINAPI PathRemoveFileSpecA(LPSTR);
-WINSHLWAPI BOOL WINAPI PathRemoveFileSpecW(LPWSTR);
-WINSHLWAPI BOOL WINAPI PathRenameExtensionA(LPSTR,LPCSTR);
-WINSHLWAPI BOOL WINAPI PathRenameExtensionW(LPWSTR,LPCWSTR);
-WINSHLWAPI BOOL WINAPI PathSearchAndQualifyA(LPCSTR,LPSTR,UINT);
-WINSHLWAPI BOOL WINAPI PathSearchAndQualifyW(LPCWSTR,LPWSTR,UINT);
-WINSHLWAPI void WINAPI PathSetDlgItemPathA(HWND,int,LPCSTR);
-WINSHLWAPI void WINAPI PathSetDlgItemPathW(HWND,int,LPCWSTR);
-WINSHLWAPI LPSTR WINAPI PathSkipRootA(LPCSTR);
-WINSHLWAPI LPWSTR WINAPI PathSkipRootW(LPCWSTR);
-WINSHLWAPI void WINAPI PathStripPathA(LPSTR);
-WINSHLWAPI void WINAPI PathStripPathW(LPWSTR);
-WINSHLWAPI BOOL WINAPI PathStripToRootA(LPSTR);
-WINSHLWAPI BOOL WINAPI PathStripToRootW(LPWSTR);
-WINSHLWAPI void WINAPI PathUndecorateA(LPSTR);
-WINSHLWAPI void WINAPI PathUndecorateW(LPWSTR);
-WINSHLWAPI BOOL WINAPI PathUnExpandEnvStringsA(LPCSTR,LPSTR,UINT);
-WINSHLWAPI BOOL WINAPI PathUnExpandEnvStringsW(LPCWSTR,LPWSTR,UINT);
-WINSHLWAPI BOOL WINAPI PathUnmakeSystemFolderA(LPSTR);
-WINSHLWAPI BOOL WINAPI PathUnmakeSystemFolderW(LPWSTR);
-WINSHLWAPI void WINAPI PathUnquoteSpacesA(LPSTR);
-WINSHLWAPI void WINAPI PathUnquoteSpacesW(LPWSTR);
-WINSHLWAPI HRESULT WINAPI SHAutoComplete(HWND,DWORD);
-#ifndef __OBJC__
-WINSHLWAPI HRESULT WINAPI SHCreateStreamOnFileA(LPCSTR,DWORD,struct IStream**);
-WINSHLWAPI HRESULT WINAPI SHCreateStreamOnFileW(LPCWSTR,DWORD,struct IStream**);
-WINSHLWAPI struct IStream* WINAPI SHOpenRegStream2A(HKEY,LPCSTR,LPCSTR,DWORD);
-WINSHLWAPI struct IStream* WINAPI SHOpenRegStream2W(HKEY,LPCWSTR,LPCWSTR,DWORD);
-WINSHLWAPI struct IStream* WINAPI SHOpenRegStreamA(HKEY,LPCSTR,LPCSTR,DWORD);
-WINSHLWAPI struct IStream* WINAPI SHOpenRegStreamW(HKEY,LPCWSTR,LPCWSTR,DWORD);
-#endif
-WINSHLWAPI BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE,void*,DWORD,LPTHREAD_START_ROUTINE);
-WINSHLWAPI DWORD WINAPI SHCopyKeyA(HKEY,LPCSTR,HKEY,DWORD);
-WINSHLWAPI DWORD WINAPI SHCopyKeyW(HKEY,LPCWSTR,HKEY,DWORD);
-WINSHLWAPI DWORD WINAPI SHDeleteEmptyKeyA(HKEY,LPCSTR);
-WINSHLWAPI DWORD WINAPI SHDeleteEmptyKeyW(HKEY,LPCWSTR);
-WINSHLWAPI DWORD WINAPI SHDeleteKeyA(HKEY,LPCSTR);
-WINSHLWAPI DWORD WINAPI SHDeleteKeyW(HKEY,LPCWSTR);
-WINSHLWAPI DWORD WINAPI SHEnumKeyExA(HKEY,DWORD,LPSTR,LPDWORD);
-WINSHLWAPI DWORD WINAPI SHEnumKeyExW(HKEY,DWORD,LPWSTR,LPDWORD);
-WINSHLWAPI DWORD WINAPI SHQueryInfoKeyA(HKEY,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
-WINSHLWAPI DWORD WINAPI SHQueryInfoKeyW(HKEY,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
-WINSHLWAPI DWORD WINAPI SHQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPVOID,LPDWORD);
-WINSHLWAPI DWORD WINAPI SHQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPVOID,LPDWORD);
-#ifndef __OBJC__
-WINSHLWAPI HRESULT WINAPI SHGetThreadRef(IUnknown**);
-WINSHLWAPI HRESULT WINAPI SHSetThreadRef(IUnknown*);
-WINSHLWAPI BOOL WINAPI SHSkipJunction(IBindCtx*,const CLSID*);
-#endif
-WINSHLWAPI DWORD WINAPI SHEnumValueA(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPVOID,LPDWORD);
-WINSHLWAPI DWORD WINAPI SHEnumValueW(HKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPVOID,LPDWORD);
-WINSHLWAPI DWORD WINAPI SHGetValueA(HKEY,LPCSTR,LPCSTR,LPDWORD,LPVOID,LPDWORD);
-WINSHLWAPI DWORD WINAPI SHGetValueW(HKEY,LPCWSTR,LPCWSTR,LPDWORD,LPVOID,LPDWORD);
-WINSHLWAPI DWORD WINAPI SHSetValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPCVOID,DWORD);
-WINSHLWAPI DWORD WINAPI SHSetValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPCVOID,DWORD);
-WINSHLWAPI DWORD WINAPI SHDeleteValueA(HKEY,LPCSTR,LPCSTR);
-WINSHLWAPI DWORD WINAPI SHDeleteValueW(HKEY,LPCWSTR,LPCWSTR);
-WINSHLWAPI HRESULT WINAPI AssocCreate(CLSID,const IID* const,LPVOID*);
-WINSHLWAPI HRESULT WINAPI AssocQueryKeyA(ASSOCF,ASSOCKEY,LPCSTR,LPCSTR,HKEY*);
-WINSHLWAPI HRESULT WINAPI AssocQueryKeyW(ASSOCF,ASSOCKEY,LPCWSTR,LPCWSTR,HKEY*);
-WINSHLWAPI HRESULT WINAPI AssocQueryStringA(ASSOCF,ASSOCSTR,LPCSTR,LPCSTR,LPSTR,DWORD*);
-WINSHLWAPI HRESULT WINAPI AssocQueryStringByKeyA(ASSOCF,ASSOCSTR,HKEY,LPCSTR,LPSTR,DWORD*);
-WINSHLWAPI HRESULT WINAPI AssocQueryStringByKeyW(ASSOCF,ASSOCSTR,HKEY,LPCWSTR,LPWSTR,DWORD*);
-WINSHLWAPI HRESULT WINAPI AssocQueryStringW(ASSOCF,ASSOCSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD*);
-   
-WINSHLWAPI HRESULT WINAPI UrlApplySchemeA(LPCSTR,LPSTR,LPDWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlApplySchemeW(LPCWSTR,LPWSTR,LPDWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlCanonicalizeA(LPCSTR,LPSTR,LPDWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlCanonicalizeW(LPCWSTR,LPWSTR,LPDWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlCombineA(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlCombineW(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD);
-WINSHLWAPI int WINAPI UrlCompareA(LPCSTR,LPCSTR,BOOL);
-WINSHLWAPI int WINAPI UrlCompareW(LPCWSTR,LPCWSTR,BOOL);
-WINSHLWAPI HRESULT WINAPI UrlCreateFromPathA(LPCSTR,LPSTR,LPDWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlCreateFromPathW(LPCWSTR,LPWSTR,LPDWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlEscapeA(LPCSTR,LPSTR,LPDWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlEscapeW(LPCWSTR,LPWSTR,LPDWORD,DWORD);
-WINSHLWAPI LPCSTR WINAPI UrlGetLocationA(LPCSTR);
-WINSHLWAPI LPCWSTR WINAPI UrlGetLocationW(LPCWSTR);
-WINSHLWAPI HRESULT WINAPI UrlGetPartA(LPCSTR,LPSTR,LPDWORD,DWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlGetPartW(LPCWSTR,LPWSTR,LPDWORD,DWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlHashA(LPCSTR,LPBYTE,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlHashW(LPCWSTR,LPBYTE,DWORD);
-WINSHLWAPI BOOL WINAPI UrlIsA(LPCSTR,URLIS);
-WINSHLWAPI BOOL WINAPI UrlIsW(LPCWSTR,URLIS);
-#define UrlIsFileUrlA(pszURL) UrlIsA(pzURL, URLIS_FILEURL)
-#define UrlIsFileUrlW(pszURL) UrlIsW(pszURL, URLIS_FILEURL)
-WINSHLWAPI BOOL WINAPI UrlIsNoHistoryA(LPCSTR);
-WINSHLWAPI BOOL WINAPI UrlIsNoHistoryW(LPCWSTR);
-WINSHLWAPI BOOL WINAPI UrlIsOpaqueA(LPCSTR);
-WINSHLWAPI BOOL WINAPI UrlIsOpaqueW(LPCWSTR);
-WINSHLWAPI HRESULT WINAPI UrlUnescapeA(LPSTR,LPSTR,LPDWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI UrlUnescapeW(LPWSTR,LPWSTR,LPDWORD,DWORD);
-#define UrlUnescapeInPlaceA(pszUrl,dwFlags )\
-	UrlUnescapeA(pszUrl, NULL, NULL, dwFlags | URL_UNESCAPE_INPLACE)
-#define UrlUnescapeInPlaceW(pszUrl,dwFlags )\
-	UrlUnescapeW(pszUrl, NULL, NULL, dwFlags | URL_UNESCAPE_INPLACE)
-WINSHLWAPI DWORD WINAPI SHRegCloseUSKey(HUSKEY);
-WINSHLWAPI LONG WINAPI SHRegCreateUSKeyA(LPCSTR,REGSAM,HUSKEY,PHUSKEY,DWORD);
-WINSHLWAPI LONG WINAPI SHRegCreateUSKeyW(LPCWSTR,REGSAM,HUSKEY,PHUSKEY,DWORD);
-WINSHLWAPI LONG WINAPI SHRegDeleteEmptyUSKeyA(HUSKEY,LPCSTR,SHREGDEL_FLAGS);
-WINSHLWAPI LONG WINAPI SHRegDeleteEmptyUSKeyW(HUSKEY,LPCWSTR,SHREGDEL_FLAGS);
-WINSHLWAPI LONG WINAPI SHRegDeleteUSValueA(HUSKEY,LPCSTR,SHREGDEL_FLAGS);
-WINSHLWAPI LONG WINAPI SHRegDeleteUSValueW(HUSKEY,LPCWSTR,SHREGDEL_FLAGS);
-WINSHLWAPI HKEY WINAPI SHRegDuplicateHKey(HKEY);
-WINSHLWAPI DWORD WINAPI SHRegEnumUSKeyA(HUSKEY,DWORD,LPSTR,LPDWORD,SHREGENUM_FLAGS);
-WINSHLWAPI DWORD WINAPI SHRegEnumUSKeyW(HUSKEY,DWORD,LPWSTR,LPDWORD,SHREGENUM_FLAGS);
-WINSHLWAPI DWORD WINAPI SHRegEnumUSValueA(HUSKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPVOID,LPDWORD,SHREGENUM_FLAGS);
-WINSHLWAPI DWORD WINAPI SHRegEnumUSValueW(HUSKEY,DWORD,LPWSTR,LPDWORD,LPDWORD,LPVOID,LPDWORD,SHREGENUM_FLAGS);
-WINSHLWAPI BOOL WINAPI SHRegGetBoolUSValueA(LPCSTR,LPCSTR,BOOL,BOOL);
-WINSHLWAPI BOOL WINAPI SHRegGetBoolUSValueW(LPCWSTR,LPCWSTR,BOOL,BOOL);
-WINSHLWAPI DWORD WINAPI SHRegGetPathA(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD);
-WINSHLWAPI DWORD WINAPI SHRegGetPathW(HKEY,LPCWSTR,LPCWSTR,LPWSTR,DWORD);
-WINSHLWAPI LONG WINAPI SHRegGetUSValueA(LPCSTR,LPCSTR,LPDWORD,LPVOID,LPDWORD,BOOL,LPVOID,DWORD);
-WINSHLWAPI LONG WINAPI SHRegGetUSValueW(LPCWSTR,LPCWSTR,LPDWORD,LPVOID,LPDWORD,BOOL,LPVOID,DWORD);
-WINSHLWAPI LONG WINAPI SHRegOpenUSKeyA(LPCSTR,REGSAM,HUSKEY,PHUSKEY,BOOL);
-WINSHLWAPI LONG WINAPI SHRegOpenUSKeyW(LPCWSTR,REGSAM,HUSKEY,PHUSKEY,BOOL);
-WINSHLWAPI DWORD WINAPI SHRegQueryInfoUSKeyA(HUSKEY,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
-WINSHLWAPI DWORD WINAPI SHRegQueryInfoUSKeyW(HUSKEY,LPDWORD,LPDWORD,LPDWORD,LPDWORD);
-WINSHLWAPI LONG WINAPI SHRegQueryUSValueA(HUSKEY,LPCSTR,LPDWORD,LPVOID,LPDWORD,BOOL,LPVOID,DWORD);
-WINSHLWAPI LONG WINAPI SHRegQueryUSValueW(HUSKEY,LPCWSTR,LPDWORD,LPVOID,LPDWORD,BOOL,LPVOID,DWORD);
-WINSHLWAPI DWORD WINAPI SHRegSetPathA(HKEY,LPCSTR,LPCSTR,LPCSTR,DWORD);
-WINSHLWAPI DWORD WINAPI SHRegSetPathW(HKEY,LPCWSTR,LPCWSTR,LPCWSTR,DWORD);
-WINSHLWAPI LONG WINAPI SHRegSetUSValueA(LPCSTR,LPCSTR,DWORD,LPVOID,DWORD,DWORD);
-WINSHLWAPI LONG WINAPI SHRegSetUSValueW(LPCWSTR,LPCWSTR,DWORD,LPVOID,DWORD,DWORD);
-WINSHLWAPI LONG WINAPI SHRegWriteUSValueA(HUSKEY,LPCSTR,DWORD,LPVOID,DWORD,DWORD);
-WINSHLWAPI LONG WINAPI SHRegWriteUSValueW(HUSKEY,LPCWSTR,DWORD,LPVOID,DWORD,DWORD);
-WINSHLWAPI HRESULT WINAPI HashData(LPBYTE,DWORD,LPBYTE,DWORD);
-WINSHLWAPI HPALETTE WINAPI SHCreateShellPalette(HDC);
-WINSHLWAPI COLORREF WINAPI ColorHLSToRGB(WORD,WORD,WORD);
-WINSHLWAPI COLORREF WINAPI ColorAdjustLuma(COLORREF,int,BOOL);
-WINSHLWAPI void WINAPI ColorRGBToHLS(COLORREF,WORD*,WORD*,WORD*);  
-WINSHLWAPI int __cdecl wnsprintfA(LPSTR,int,LPCSTR,...);
-WINSHLWAPI int __cdecl wnsprintfW(LPWSTR,int,LPCWSTR,...);
-WINSHLWAPI int WINAPI wvnsprintfA(LPSTR,int,LPCSTR,va_list);
-WINSHLWAPI int WINAPI wvnsprintfW(LPWSTR,int,LPCWSTR,va_list);
-
-HINSTANCE WINAPI MLLoadLibraryA(LPCSTR,HANDLE,DWORD,LPCSTR,BOOL);
-HINSTANCE WINAPI MLLoadLibraryW(LPCWSTR,HANDLE,DWORD,LPCWSTR,BOOL);
-
-HRESULT WINAPI DllInstall(BOOL,LPCWSTR);
-
-#ifdef UNICODE
-#define ChrCmpI ChrCmpIW
-#define IntlStrEqN IntlStrEqNW
-#define IntlStrEqNI IntlStrEqNIW
-#define IntlStrEqWorker IntlStrEqWorkerW
-#define SHStrDup SHStrDupW
-#define StrCat StrCatW
-#define StrCatBuff StrCatBuffW
-#define StrChr StrChrW
-#define StrChrI StrChrIW
-#define StrCmp StrCmpW
-#define StrCmpI StrCmpIW
-#define StrCmpNI StrCmpNIW
-#define StrCmpN StrCmpNW
-#define StrCpyN StrCpyNW
-#define StrCpy StrCpyW
-#define StrCSpnI StrCSpnIW
-#define StrCSpn StrCSpnW
-#define StrDup StrDupW
-#define StrFormatByteSize StrFormatByteSizeW
-#define StrFormatKBSize StrFormatKBSizeW
-#define StrFromTimeInterval StrFromTimeIntervalW
-#define StrIsIntlEqual StrIsIntlEqualW
-#define StrNCat StrNCatW
-#define StrPBrk StrPBrkW
-#define StrRChr StrRChrW
-#define StrRChrI StrRChrIW
-#ifndef __OBJC__
-#define StrRetToBuf StrRetToBufW
-#define StrRetToStr StrRetToStrW
-#endif
-#define StrRStrI StrRStrIW
-#define StrSpn StrSpnW
-#define StrStrI StrStrIW
-#define StrStr StrStrW
-#define StrToInt StrToIntW
-#define StrToIntEx StrToIntExW
-#define StrTrim StrTrimW
-#define PathAddBackslash PathAddBackslashW
-#define PathAddExtension PathAddExtensionW
-#define PathAppend PathAppendW
-#define PathBuildRoot PathBuildRootW
-#define PathCanonicalize PathCanonicalizeW
-#define PathCombine PathCombineW
-#define PathCommonPrefix PathCommonPrefixW
-#define PathCompactPath PathCompactPathW
-#define PathCompactPathEx PathCompactPathExW
-#define PathCreateFromUrl PathCreateFromUrlW
-#define PathFileExists PathFileExistsW
-#define PathFindExtension PathFindExtensionW
-#define PathFindFileName PathFindFileNameW
-#define PathFindNextComponent PathFindNextComponentW
-#define PathFindOnPath PathFindOnPathW
-#define PathFindSuffixArray PathFindSuffixArrayW
-#define PathGetArgs PathGetArgsW
-#define PathGetCharType PathGetCharTypeW
-#define PathGetDriveNumber PathGetDriveNumberW
-#define PathIsContentType PathIsContentTypeW
-#define PathIsDirectoryEmpty PathIsDirectoryEmptyW
-#define PathIsDirectory PathIsDirectoryW
-#define PathIsFileSpec PathIsFileSpecW
-#define PathIsLFNFileSpec PathIsLFNFileSpecW
-#define PathIsNetworkPath PathIsNetworkPathW
-#define PathIsPrefix PathIsPrefixW
-#define PathIsRelative PathIsRelativeW
-#define PathIsRoot PathIsRootW
-#define PathIsSameRoot PathIsSameRootW
-#define PathIsSystemFolder PathIsSystemFolderW
-#define PathIsUNCServerShare PathIsUNCServerShareW
-#define PathIsUNCServer PathIsUNCServerW
-#define PathIsUNC PathIsUNCW
-#define PathIsURL PathIsURLW
-#define PathMakePretty PathMakePrettyW
-#define PathMakeSystemFolder PathMakeSystemFolderW
-#define PathMatchSpec PathMatchSpecW
-#define PathParseIconLocation PathParseIconLocationW
-#define PathQuoteSpaces PathQuoteSpacesW
-#define PathRelativePathTo PathRelativePathToW
-#define PathRemoveArgs PathRemoveArgsW
-#define PathRemoveBackslash PathRemoveBackslashW
-#define PathRemoveBlanks PathRemoveBlanksW
-#define PathRemoveExtension PathRemoveExtensionW
-#define PathRemoveFileSpec PathRemoveFileSpecW
-#define PathRenameExtension PathRenameExtensionW
-#define PathSearchAndQualify PathSearchAndQualifyW
-#define PathSetDlgItemPath PathSetDlgItemPathW
-#define PathSkipRoot PathSkipRootW
-#define PathStripPath PathStripPathW
-#define PathStripToRoot PathStripToRootW
-#define PathUndecorate PathUndecorateW
-#define PathUnExpandEnvStrings PathUnExpandEnvStringsW
-#define PathUnmakeSystemFolder PathUnmakeSystemFolderW
-#define PathUnquoteSpaces PathUnquoteSpacesW
-#ifndef __OBJC__
-#define SHCreateStreamOnFile SHCreateStreamOnFileW
-#define SHOpenRegStream SHOpenRegStreamW
-#define SHOpenRegStream2 SHOpenRegStream2W
-#endif
-#define SHCopyKey SHCopyKeyW
-#define SHDeleteEmptyKey SHDeleteEmptyKeyW
-#define SHDeleteKey SHDeleteKeyW
-#define SHEnumKeyEx SHEnumKeyExW
-#define SHQueryInfoKey SHRegQueryInfoKeyW
-#define SHQueryValueEx SHQueryValueExW
-#define SHEnumValue SHEnumValueW
-#define SHGetValue SHGetValueW
-#define SHSetValue SHSetValueW
-#define SHDeleteValue SHDeleteValueW
-#define AssocQueryKey AssocQueryKeyW
-#define AssocQueryStringByKey AssocQueryStringByKeyW
-#define AssocQueryString AssocQueryStringW
-#define UrlApplyScheme UrlApplySchemeW
-#define UrlCanonicalize UrlCanonicalizeW
-#define UrlCombine UrlCombineW
-#define UrlCompare UrlCompareW
-#define UrlCreateFromPath UrlCreateFromPathW
-#define UrlEscape UrlEscapeW
-#define UrlGetLocation UrlGetLocationW
-#define UrlGetPart UrlGetPartW
-#define UrlHash UrlHashW
-#define UrlIs UrlIsW
-#define UrlIsFileUrl UrlIsFileUrlW
-#define UrlIsNoHistory UrlIsNoHistoryW
-#define UrlIsOpaque UrlIsOpaqueW
-#define UrlUnescape UrlUnescapeW
-#define UrlUnescapeInPlace UrlUnescapeInPlaceW
-#define SHRegCreateUSKey SHRegCreateUSKeyW
-#define SHRegDeleteEmptyUSKey SHRegDeleteEmptyUSKeyW
-#define SHRegDeleteUSValue SHRegDeleteUSValueW
-#define SHRegEnumUSKey SHRegEnumUSKeyW
-#define SHRegEnumUSValue SHRegEnumUSValueW
-#define SHRegGetBoolUSValue SHRegGetBoolUSValueW
-#define SHRegGetPath SHRegGetPathW
-#define SHRegGetUSValue SHRegGetUSValueW
-#define SHRegOpenUSKey SHRegOpenUSKeyW
-#define SHRegQueryInfoUSKey SHRegQueryInfoUSKeyW
-#define SHRegQueryUSValue SHRegQueryUSValueW
-#define SHRegSetPath SHRegSetPathW
-#define SHRegSetUSValue SHRegSetUSValueW
-#define SHRegWriteUSValue SHRegWriteUSValueW
-#define wnsprintf wnsprintfW
-#define wvnsprintf wvnsprintfW
-#else /* UNICODE */
-#define ChrCmpI ChrCmpIA
-#define IntlStrEqN IntlStrEqNA
-#define IntlStrEqNI IntlStrEqNIA
-#define IntlStrEqWorker IntlStrEqWorkerA
-#define SHStrDup SHStrDupA
-#define StrCat lstrcatA
-#define StrCatBuff StrCatBuffA
-#define StrChr StrChrA
-#define StrChrI StrChrIA
-#define StrCmp lstrcmpA
-#define StrCmpI lstrcmpiA
-#define StrCmpNI StrCmpNIA
-#define StrCmpN StrCmpNA
-#define StrCpyN lstrcpynA
-#define StrCpy lstrcpyA
-#define StrCSpnI StrCSpnIA
-#define StrCSpn StrCSpnA
-#define StrDup StrDupA
-#define StrFormatByteSize StrFormatByteSizeA
-#define StrFormatKBSize StrFormatKBSizeA
-#define StrFromTimeInterval StrFromTimeIntervalA
-#define StrIsIntlEqual StrIsIntlEqualA
-#define StrNCat StrNCatA
-#define StrPBrk StrPBrkA
-#define StrRChr StrRChrA
-#define StrRChrI StrRChrIA
-#ifndef __OBJC__
-#define StrRetToBuf StrRetToBufA
-#define StrRetToStr StrRetToStrA
-#endif
-#define StrRStrI StrRStrIA
-#define StrSpn StrSpnA
-#define StrStrI StrStrIA
-#define StrStr StrStrA
-#define StrToInt StrToIntA
-#define StrToIntEx StrToIntExA
-#define StrTrim StrTrimA
-#define PathAddBackslash PathAddBackslashA
-#define PathAddExtension PathAddExtensionA
-#define PathAppend PathAppendA
-#define PathBuildRoot PathBuildRootA
-#define PathCanonicalize PathCanonicalizeA
-#define PathCombine PathCombineA
-#define PathCommonPrefix PathCommonPrefixA
-#define PathCompactPath PathCompactPathA
-#define PathCompactPathEx PathCompactPathExA
-#define PathCreateFromUrl PathCreateFromUrlA
-#define PathFileExists PathFileExistsA
-#define PathFindExtension PathFindExtensionA
-#define PathFindFileName PathFindFileNameA
-#define PathFindNextComponent PathFindNextComponentA
-#define PathFindOnPath PathFindOnPathA
-#define PathFindSuffixArray PathFindSuffixArrayA
-#define PathGetArgs PathGetArgsA
-#define PathGetCharType PathGetCharTypeA
-#define PathGetDriveNumber PathGetDriveNumberA
-#define PathIsContentType PathIsContentTypeA
-#define PathIsDirectoryEmpty PathIsDirectoryEmptyA
-#define PathIsDirectory PathIsDirectoryA
-#define PathIsFileSpec PathIsFileSpecA
-#define PathIsLFNFileSpec PathIsLFNFileSpecA
-#define PathIsNetworkPath PathIsNetworkPathA
-#define PathIsPrefix PathIsPrefixA
-#define PathIsRelative PathIsRelativeA
-#define PathIsRoot PathIsRootA
-#define PathIsSameRoot PathIsSameRootA
-#define PathIsSystemFolder PathIsSystemFolderA
-#define PathIsUNCServerShare PathIsUNCServerShareA
-#define PathIsUNCServer PathIsUNCServerA
-#define PathIsUNC PathIsUNCA
-#define PathIsURL PathIsURLA
-#define PathMakePretty PathMakePrettyA
-#define PathMakeSystemFolder PathMakeSystemFolderA
-#define PathMatchSpec PathMatchSpecA
-#define PathParseIconLocation PathParseIconLocationA
-#define PathQuoteSpaces PathQuoteSpacesA
-#define PathRelativePathTo PathRelativePathToA
-#define PathRemoveArgs PathRemoveArgsA
-#define PathRemoveBackslash PathRemoveBackslashA
-#define PathRemoveBlanks PathRemoveBlanksA
-#define PathRemoveExtension PathRemoveExtensionA
-#define PathRemoveFileSpec PathRemoveFileSpecA
-#define PathRenameExtension PathRenameExtensionA
-#define PathSearchAndQualify PathSearchAndQualifyA
-#define PathSetDlgItemPath PathSetDlgItemPathA
-#define PathSkipRoot PathSkipRootA
-#define PathStripPath PathStripPathA
-#define PathStripToRoot PathStripToRootA
-#define PathUndecorate PathUndecorateA
-#define PathUnExpandEnvStrings PathUnExpandEnvStringsA
-#define PathUnmakeSystemFolder PathUnmakeSystemFolderA
-#define PathUnquoteSpaces PathUnquoteSpacesA
-#ifndef __OBJC__
-#define SHCreateStreamOnFile SHCreateStreamOnFileA
-#define SHOpenRegStream SHOpenRegStreamA
-#define SHOpenRegStream2 SHOpenRegStream2A
-#endif
-#define SHCopyKey SHCopyKeyA
-#define SHDeleteEmptyKey SHDeleteEmptyKeyA
-#define SHDeleteKey SHDeleteKeyA
-#define SHEnumKeyEx SHEnumKeyExA
-#define SHQueryInfoKey SHRegQueryInfoKeyA
-#define SHQueryValueEx SHQueryValueExA
-#define SHEnumValue SHEnumValueA
-#define SHGetValue SHGetValueA
-#define SHSetValue SHSetValueA
-#define SHDeleteValue SHDeleteValueA
-#define AssocQueryKey AssocQueryKeyA
-#define AssocQueryStringByKey AssocQueryStringByKeyA
-#define AssocQueryString AssocQueryStringA
-#define UrlApplyScheme UrlApplySchemeA
-#define UrlCanonicalize UrlCanonicalizeA
-#define UrlCombine UrlCombineA
-#define UrlCompare UrlCompareA
-#define UrlCreateFromPath UrlCreateFromPathA
-#define UrlEscape UrlEscapeA
-#define UrlGetLocation UrlGetLocationA
-#define UrlGetPart UrlGetPartA
-#define UrlHash UrlHashA
-#define UrlIs UrlIsA
-#define UrlIsFileUrl UrlIsFileUrl
-#define UrlIsNoHistory UrlIsNoHistoryA
-#define UrlIsOpaque UrlIsOpaqueA
-#define UrlUnescape UrlUnescapeA
-#define UrlUnescapeInPlace UrlUnescapeInPlaceA
-#define SHRegCreateUSKey SHRegCreateUSKeyA
-#define SHRegDeleteEmptyUSKey SHRegDeleteEmptyUSKeyA
-#define SHRegDeleteUSValue SHRegDeleteUSValueA
-#define SHRegEnumUSKey SHRegEnumUSKeyA
-#define SHRegEnumUSValue SHRegEnumUSValueA
-#define SHRegGetBoolUSValue SHRegGetBoolUSValueA
-#define SHRegGetPath SHRegGetPathA
-#define SHRegGetUSValue SHRegGetUSValueA
-#define SHRegOpenUSKey SHRegOpenUSKeyA
-#define SHRegQueryInfoUSKey SHRegQueryInfoUSKeyA
-#define SHRegQueryUSValue SHRegQueryUSValueA
-#define SHRegSetPath SHRegSetPathA
-#define SHRegSetUSValue SHRegSetUSValueA
-#define SHRegWriteUSValue SHRegWriteUSValueA
-#define wnsprintf wnsprintfA
-#define wvnsprintf wvnsprintfA
-#endif /* UNICODE */
-
-#define StrToLong StrToInt
-
-#endif /* !RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* ! defined _SHLWAPI_H */
diff --git a/winsup/w32api/include/snmp.h b/winsup/w32api/include/snmp.h
deleted file mode 100644
index f35a2be08..000000000
--- a/winsup/w32api/include/snmp.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
-  snmp.h - Header file for the Windows SNMP API
-
-  Written by Filip Navara <xnavara@volny.cz>
-
-  References (2003-08-25):
-    http://msdn.microsoft.com/library/en-us/snmp/snmp/snmp_reference.asp
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#ifndef _SNMP_H
-#define _SNMP_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifndef _WINDOWS_H
-#include <windows.h>
-#endif
-
-#include <pshpack4.h>
-
-#ifndef WINSNMPAPI
-#define WINSNMPAPI WINAPI
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DEFAULT_SNMP_PORT_UDP	161
-#define DEFAULT_SNMP_PORT_IPX	36879
-#define DEFAULT_SNMPTRAP_PORT_UDP	162
-#define DEFAULT_SNMPTRAP_PORT_IPX	36880
-#ifndef _SNMP_ASN_DEFINED
-#define _SNMP_ASN_DEFINED
-#define ASN_UNIVERSAL	0x00
-#define ASN_PRIMITIVE	0x00
-#define ASN_CONSTRUCTOR	0x20
-#define ASN_APPLICATION	0x40
-#define ASN_CONTEXT	0x80
-#define ASN_PRIVATE	0xC0
-#define SNMP_PDU_GET	(ASN_CONTEXT | ASN_CONSTRUCTOR | 0)
-#define SNMP_PDU_GETNEXT	(ASN_CONTEXT | ASN_CONSTRUCTOR | 1)
-#define SNMP_PDU_RESPONSE	(ASN_CONTEXT | ASN_CONSTRUCTOR | 2)
-#define SNMP_PDU_SET	(ASN_CONTEXT | ASN_CONSTRUCTOR | 3)
-#define SNMP_PDU_GETBULK	(ASN_CONTEXT | ASN_CONSTRUCTOR | 4)
-#define SNMP_PDU_V1TRAP	(ASN_CONTEXT | ASN_CONSTRUCTOR | 4)
-#define SNMP_PDU_INFORM	(ASN_CONTEXT | ASN_CONSTRUCTOR | 6)
-#define SNMP_PDU_TRAP	(ASN_CONTEXT | ASN_CONSTRUCTOR | 7) 
-#define SNMP_PDU_REPORT	(ASN_CONTEXT | ASN_CONSTRUCTOR | 8)
-#endif /* _SNMP_ASN_DEFINED */
-#define ASN_INTEGER	(ASN_UNIVERSAL | ASN_PRIMITIVE | 2)
-#define ASN_BITS	(ASN_UNIVERSAL | ASN_PRIMITIVE | 3)
-#define ASN_OCTETSTRING	(ASN_UNIVERSAL | ASN_PRIMITIVE | 4)
-#define ASN_NULL	(ASN_UNIVERSAL | ASN_PRIMITIVE | 5)
-#define ASN_OBJECTIDENTIFIER	(ASN_UNIVERSAL | ASN_PRIMITIVE | 6)
-#define ASN_INTEGER32	ASN_INTEGER
-#define ASN_SEQUENCE	(ASN_UNIVERSAL | ASN_CONSTRUCTOR | 0x10)
-#define ASN_SEQUENCEOF	ASN_SEQUENCE
-#define ASN_IPADDRESS	(ASN_APPLICATION | ASN_PRIMITIVE | 0x00)
-#define ASN_COUNTER32	(ASN_APPLICATION | ASN_PRIMITIVE | 0x01)
-#define ASN_GAUGE32	(ASN_APPLICATION | ASN_PRIMITIVE | 0x02)
-#define ASN_TIMETICKS	(ASN_APPLICATION | ASN_PRIMITIVE | 0x03)
-#define ASN_OPAQUE	(ASN_APPLICATION | ASN_PRIMITIVE | 0x04)
-#define ASN_COUNTER64	(ASN_APPLICATION | ASN_PRIMITIVE | 0x06)
-#define ASN_UNSIGNED32	(ASN_APPLICATION | ASN_PRIMITIVE | 0x07)
-#define SNMP_EXCEPTION_NOSUCHOBJECT	(ASN_CONTEXT | ASN_PRIMITIVE | 0x00)
-#define SNMP_EXCEPTION_NOSUCHINSTANCE	(ASN_CONTEXT | ASN_PRIMITIVE | 0x01)
-#define SNMP_EXCEPTION_ENDOFMIBVIEW	(ASN_CONTEXT | ASN_PRIMITIVE | 0x02)
-#define SNMP_EXTENSION_GET	SNMP_PDU_GET
-#define SNMP_EXTENSION_GET_NEXT	SNMP_PDU_GETNEXT
-#define SNMP_EXTENSION_GET_BULK	SNMP_PDU_GETBULK
-#define SNMP_EXTENSION_SET_TEST	(ASN_PRIVATE | ASN_CONSTRUCTOR | 0x0)
-#define SNMP_EXTENSION_SET_COMMIT	SNMP_PDU_SET
-#define SNMP_EXTENSION_SET_UNDO	(ASN_PRIVATE | ASN_CONSTRUCTOR | 0x1)
-#define SNMP_EXTENSION_SET_CLEANUP	(ASN_PRIVATE | ASN_CONSTRUCTOR | 0x2)
-#define SNMP_ERRORSTATUS_NOERROR	0
-#define SNMP_ERRORSTATUS_TOOBIG	1
-#define SNMP_ERRORSTATUS_NOSUCHNAME	2
-#define SNMP_ERRORSTATUS_BADVALUE	3
-#define SNMP_ERRORSTATUS_READONLY	4
-#define SNMP_ERRORSTATUS_GENERR	5
-#define SNMP_ERRORSTATUS_NOACCESS	6
-#define SNMP_ERRORSTATUS_WRONGTYPE	7
-#define SNMP_ERRORSTATUS_WRONGLENGTH	8
-#define SNMP_ERRORSTATUS_WRONGENCODING	9
-#define SNMP_ERRORSTATUS_WRONGVALUE	10
-#define SNMP_ERRORSTATUS_NOCREATION	11
-#define SNMP_ERRORSTATUS_INCONSISTENTVALUE	12
-#define SNMP_ERRORSTATUS_RESOURCEUNAVAILABLE	13
-#define SNMP_ERRORSTATUS_COMMITFAILED	14
-#define SNMP_ERRORSTATUS_UNDOFAILED	15
-#define SNMP_ERRORSTATUS_AUTHORIZATIONERROR	16
-#define SNMP_ERRORSTATUS_NOTWRITABLE	17
-#define SNMP_ERRORSTATUS_INCONSISTENTNAME	18
-#define SNMP_GENERICTRAP_COLDSTART	0
-#define SNMP_GENERICTRAP_WARMSTART	1
-#define SNMP_GENERICTRAP_LINKDOWN	2
-#define SNMP_GENERICTRAP_LINKUP	3
-#define SNMP_GENERICTRAP_AUTHFAILURE	4
-#define SNMP_GENERICTRAP_EGPNEIGHLOSS	5
-#define SNMP_GENERICTRAP_ENTERSPECIFIC	6
-#define SNMP_ACCESS_NONE	0
-#define SNMP_ACCESS_NOTIFY	1
-#define SNMP_ACCESS_READ_ONLY	2
-#define SNMP_ACCESS_READ_WRITE	3
-#define SNMP_ACCESS_READ_CREATE	4
-#define SNMPAPI_ERROR	FALSE
-#define SNMPAPI_NOERROR	TRUE
-#define SNMP_LOG_SILENT	0
-#define SNMP_LOG_FATAL	1
-#define SNMP_LOG_ERROR	2
-#define SNMP_LOG_WARNING	3
-#define SNMP_LOG_TRACE	4
-#define SNMP_LOG_VERBOSE	5
-#define SNMP_OUTPUT_TO_CONSOLE	1
-#define SNMP_OUTPUT_TO_LOGFILE	2
-#define SNMP_OUTPUT_TO_EVENTLOG	4 
-#define SNMP_OUTPUT_TO_DEBUGGER	8
-#define SNMP_MAX_OID_LEN	128
-#define SNMP_MEM_ALLOC_ERROR	1
-#define SNMP_BERAPI_INVALID_LENGTH	10
-#define SNMP_BERAPI_INVALID_TAG	11
-#define SNMP_BERAPI_OVERFLOW	12
-#define SNMP_BERAPI_SHORT_BUFFER	13
-#define SNMP_BERAPI_INVALID_OBJELEM	14
-#define SNMP_PDUAPI_UNRECOGNIZED_PDU	20
-#define SNMP_PDUAPI_INVALID_ES	21
-#define SNMP_PDUAPI_INVALID_GT	22
-#define SNMP_AUTHAPI_INVALID_VERSION	30
-#define SNMP_AUTHAPI_INVALID_MSG_TYPE	31
-#define SNMP_AUTHAPI_TRIV_AUTH_FAILED	32
-
-#ifndef RC_INVOKED
-
-typedef INT SNMPAPI;
-typedef LONG AsnInteger32;
-typedef ULONG AsnUnsigned32;
-typedef ULARGE_INTEGER AsnCounter64;
-typedef AsnUnsigned32 AsnCounter32;
-typedef AsnUnsigned32 AsnGauge32;
-typedef AsnUnsigned32 AsnTimeticks;
-typedef struct {
-	BYTE *stream;
-	UINT length;
-	BOOL dynamic;
-} AsnOctetString, AsnBits, AsnSequence, AsnImplicitSequence, AsnIPAddress, AsnNetworkAddress, AsnDisplayString, AsnOpaque;
-typedef struct {
-	UINT idLength;
-	UINT *ids;
-} AsnObjectIdentifier, AsnObjectName;
-typedef struct {
-	BYTE asnType;
-	union {
-		AsnInteger32 number; 
-		AsnUnsigned32 unsigned32; 
-		AsnCounter64 counter64; 
-		AsnOctetString string; 
-		AsnBits bits; 
-		AsnObjectIdentifier object; 
-		AsnSequence sequence; 
-		AsnIPAddress address; 
-		AsnCounter32 counter; 
-		AsnGauge32 gauge; 
-		AsnTimeticks ticks; 
-		AsnOpaque arbitrary; 
-	} asnValue;
-} AsnAny, AsnObjectSyntax;
-typedef struct {
-	AsnObjectName name;
-	AsnObjectSyntax value;
-} SnmpVarBind;
-typedef struct {
-	SnmpVarBind *list;
-	UINT len;
-} SnmpVarBindList;
-
-VOID WINSNMPAPI SnmpExtensionClose(void);
-BOOL WINSNMPAPI SnmpExtensionInit(DWORD,HANDLE*,AsnObjectIdentifier*);
-BOOL WINSNMPAPI SnmpExtensionInitEx(AsnObjectIdentifier*);
-BOOL WINSNMPAPI SnmpExtensionMonitor(LPVOID);
-BOOL WINSNMPAPI SnmpExtensionQuery(BYTE,SnmpVarBindList*,AsnInteger32*,AsnInteger32*);
-BOOL WINSNMPAPI SnmpExtensionQueryEx(DWORD,DWORD,SnmpVarBindList*,AsnOctetString*,AsnInteger32*,AsnInteger32*);
-BOOL WINSNMPAPI SnmpExtensionTrap(AsnObjectIdentifier*,AsnInteger32*,AsnInteger32*,AsnTimeticks*,SnmpVarBindList*);
-DWORD WINSNMPAPI SnmpSvcGetUptime(void);
-VOID WINSNMPAPI SnmpSvcSetLogLevel(INT);
-VOID WINSNMPAPI SnmpSvcSetLogType(INT);
-SNMPAPI WINSNMPAPI SnmpUtilAsnAnyCpy(AsnAny*,AsnAny*);
-VOID WINSNMPAPI SnmpUtilAsnAnyFree(AsnAny*);
-VOID WINSNMPAPI SnmpUtilDbgPrint(INT,LPSTR,...);
-LPSTR WINSNMPAPI SnmpUtilIdsToA(UINT*,UINT);
-LPVOID WINSNMPAPI SnmpUtilMemAlloc(UINT);
-VOID WINSNMPAPI SnmpUtilMemFree(LPVOID);
-LPVOID WINSNMPAPI SnmpUtilMemReAlloc(LPVOID,UINT);
-SNMPAPI WINSNMPAPI SnmpUtilOctetsCmp(AsnOctetString*,AsnOctetString*);
-SNMPAPI WINSNMPAPI SnmpUtilOctetsCpy(AsnOctetString*,AsnOctetString*);
-VOID WINSNMPAPI SnmpUtilOctetsFree(AsnOctetString*);
-SNMPAPI WINSNMPAPI SnmpUtilOctetsNCmp(AsnOctetString*,AsnOctetString*,UINT);
-SNMPAPI WINSNMPAPI SnmpUtilOidAppend(AsnObjectIdentifier*,AsnObjectIdentifier*);
-SNMPAPI WINSNMPAPI SnmpUtilOidCmp(AsnObjectIdentifier*,AsnObjectIdentifier*);
-SNMPAPI WINSNMPAPI SnmpUtilOidCpy(AsnObjectIdentifier*,AsnObjectIdentifier*);
-VOID WINSNMPAPI SnmpUtilOidFree(AsnObjectIdentifier*);
-SNMPAPI WINSNMPAPI SnmpUtilOidNCmp(AsnObjectIdentifier*,AsnObjectIdentifier*,UINT);
-LPSTR WINSNMPAPI SnmpUtilOidToA(AsnObjectIdentifier*);
-VOID WINSNMPAPI SnmpUtilPrintAsnAny(AsnAny*);
-VOID WINSNMPAPI SnmpUtilPrintOid(AsnObjectIdentifier*);
-SNMPAPI WINSNMPAPI SnmpUtilVarBindCpy(  SnmpVarBind*,SnmpVarBind*);
-SNMPAPI WINSNMPAPI SnmpUtilVarBindListCpy(SnmpVarBindList*,SnmpVarBindList*);
-VOID WINSNMPAPI SnmpUtilVarBindFree(SnmpVarBind*);
-VOID WINSNMPAPI SnmpUtilVarBindListFree(SnmpVarBindList*);
-
-#ifndef SNMPSTRICT
-#define SNMP_malloc SnmpUtilMemAlloc
-#define SNMP_free SnmpUtilMemFree
-#define SNMP_realloc SnmpUtilMemReAlloc
-#define SNMP_DBG_malloc SnmpUtilMemAlloc
-#define SNMP_DBG_free SnmpUtilMemFree
-#define SNMP_DBG_realloc SnmpUtilMemReAlloc
-#define SNMP_oidappend SnmpUtilOidAppend
-#define SNMP_oidcmp SnmpUtilOidCmp
-#define SNMP_oidcpy SnmpUtilOidCpy
-#define SNMP_oidfree SnmpUtilOidFree
-#define SNMP_oidncmp SnmpUtilOidNCmp
-#define SNMP_printany SnmpUtilPrintAsnAny
-#define SNMP_CopyVarBind SnmpUtilVarBindCpy
-#define SNMP_CopyVarBindList SnmpUtilVarBindListCpy
-#define SNMP_FreeVarBind SnmpUtilVarBindFree
-#define SNMP_FreeVarBindList SnmpUtilVarBindListFree
-#define ASN_RFC1155_IPADDRESS ASN_IPADDRESS
-#define ASN_RFC1155_COUNTER ASN_COUNTER32
-#define ASN_RFC1155_GAUGE ASN_GAUGE32
-#define ASN_RFC1155_TIMETICKS ASN_TIMETICKS
-#define ASN_RFC1155_OPAQUE ASN_OPAQUE
-#define ASN_RFC1213_DISPSTRING ASN_OCTETSTRING
-#define ASN_RFC1157_GETREQUEST SNMP_PDU_GET
-#define ASN_RFC1157_GETNEXTREQUEST SNMP_PDU_GETNEXT
-#define ASN_RFC1157_GETRESPONSE SNMP_PDU_RESPONSE
-#define ASN_RFC1157_SETREQUEST SNMP_PDU_SET
-#define ASN_RFC1157_TRAP SNMP_PDU_V1TRAP
-#define ASN_CONTEXTSPECIFIC ASN_CONTEXT
-#define ASN_PRIMATIVE ASN_PRIMITIVE
-#define RFC1157VarBindList SnmpVarBindList
-#define RFC1157VarBind SnmpVarBind
-#define AsnInteger AsnInteger32
-#define AsnCounter AsnCounter32
-#define AsnGauge AsnGauge32
-#endif /* SNMPSTRICT */
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-#include <poppack.h>
-#endif
diff --git a/winsup/w32api/include/sql.h b/winsup/w32api/include/sql.h
deleted file mode 100644
index 2f0391b75..000000000
--- a/winsup/w32api/include/sql.h
+++ /dev/null
@@ -1,408 +0,0 @@
-#ifndef _SQL_H
-#define _SQL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifndef ODBCVER
-#define ODBCVER 0x0351
-#endif
-#include <sqltypes.h>
-#define SQL_ACCESSIBLE_PROCEDURES 20
-#define SQL_ACCESSIBLE_TABLES 19
-#define SQL_ALL_TYPES 0
-#define SQL_ALTER_TABLE 86
-#define SQL_API_SQLALLOCCONNECT 1
-#define SQL_API_SQLALLOCENV 2
-#define SQL_API_SQLALLOCSTMT 3
-#define SQL_API_SQLBINDCOL 4
-#define SQL_API_SQLCANCEL 5
-#define SQL_API_SQLCOLUMNS 40
-#define SQL_API_SQLCONNECT 7
-#define SQL_API_SQLDATASOURCES 57
-#define SQL_API_SQLDESCRIBECOL 8
-#define SQL_API_SQLDISCONNECT 9
-#define SQL_API_SQLERROR 10
-#define SQL_API_SQLEXECDIRECT 11
-#define SQL_API_SQLEXECUTE 12
-#define SQL_API_SQLFETCH 13
-#define SQL_API_SQLFREECONNECT 14
-#define SQL_API_SQLFREEENV 15
-#define SQL_API_SQLFREESTMT 16
-#define SQL_API_SQLGETCONNECTOPTION 42
-#define SQL_API_SQLGETCURSORNAME 17
-#define SQL_API_SQLGETDATA 43
-#define SQL_API_SQLGETFUNCTIONS 44
-#define SQL_API_SQLGETINFO 45
-#define SQL_API_SQLGETSTMTOPTION 46
-#define SQL_API_SQLGETTYPEINFO 47
-#define SQL_API_SQLNUMRESULTCOLS 18
-#define SQL_API_SQLPARAMDATA 48
-#define SQL_API_SQLPREPARE 19
-#define SQL_API_SQLPUTDATA 49
-#define SQL_API_SQLROWCOUNT 20
-#define SQL_API_SQLSETCONNECTOPTION 50
-#define SQL_API_SQLSETCURSORNAME 21
-#define SQL_API_SQLSETPARAM 22
-#define SQL_API_SQLSETSTMTOPTION 51
-#define SQL_API_SQLSPECIALCOLUMNS 52
-#define SQL_API_SQLSTATISTICS 53
-#define SQL_API_SQLTABLES 54
-#define SQL_API_SQLTRANSACT 23
-#define SQL_CB_CLOSE 1
-#define SQL_CB_DELETE 0
-#define SQL_CB_PRESERVE 2
-#define SQL_CHAR 1
-#define SQL_CLOSE 0
-#define SQL_COMMIT 0
-#define SQL_CURSOR_COMMIT_BEHAVIOR 23
-#define SQL_DATA_AT_EXEC (-2)
-#define SQL_DATA_SOURCE_NAME 2
-#define SQL_DATA_SOURCE_READ_ONLY 25
-#define SQL_DBMS_NAME 17
-#define SQL_DBMS_VER 18
-#define SQL_DECIMAL 3
-#define SQL_DEFAULT_TXN_ISOLATION 26
-#define SQL_DOUBLE 8
-#define SQL_DROP 1
-#define SQL_ERROR (-1)
-#define SQL_FD_FETCH_ABSOLUTE 16
-#define SQL_FD_FETCH_FIRST 2
-#define SQL_FD_FETCH_LAST 4
-#define SQL_FD_FETCH_NEXT 1
-#define SQL_FD_FETCH_PRIOR 8
-#define SQL_FD_FETCH_RELATIVE 32
-#define SQL_FETCH_ABSOLUTE 5
-#define SQL_FETCH_DIRECTION 8
-#define SQL_FETCH_FIRST 2
-#define SQL_FETCH_LAST 3
-#define SQL_FETCH_NEXT 1
-#define SQL_FETCH_PRIOR 4
-#define SQL_FETCH_RELATIVE 6
-#define SQL_FLOAT 6
-#define SQL_GD_ANY_COLUMN 1
-#define SQL_GD_ANY_ORDER 2
-#define SQL_GETDATA_EXTENSIONS 81
-#define SQL_IC_LOWER 2
-#define SQL_IC_MIXED 4
-#define SQL_IC_SENSITIVE 3
-#define SQL_IC_UPPER 1
-#define SQL_IDENTIFIER_CASE 28
-#define SQL_IDENTIFIER_QUOTE_CHAR 29
-#define SQL_INDEX_ALL 1
-#define SQL_INDEX_CLUSTERED 1
-#define SQL_INDEX_HASHED 2
-#define SQL_INDEX_OTHER 3
-#define SQL_INDEX_UNIQUE 0
-#define SQL_INTEGER 4
-#define SQL_INTEGRITY 73
-#define SQL_INVALID_HANDLE (-2)
-#define SQL_MAX_CATALOG_NAME_LEN 34
-#define SQL_MAX_COLUMN_NAME_LEN 30
-#define SQL_MAX_COLUMNS_IN_GROUP_BY 97
-#define SQL_MAX_COLUMNS_IN_INDEX 98
-#define SQL_MAX_COLUMNS_IN_ORDER_BY 99
-#define SQL_MAX_COLUMNS_IN_SELECT 100
-#define SQL_MAX_COLUMNS_IN_TABLE 101
-#define SQL_MAX_CURSOR_NAME_LEN 31
-#define SQL_MAX_INDEX_SIZE 102
-#define SQL_MAX_MESSAGE_LENGTH 512
-#define SQL_MAX_ROW_SIZE 104
-#define SQL_MAX_SCHEMA_NAME_LEN 32
-#define SQL_MAX_STATEMENT_LEN 105
-#define SQL_MAX_TABLE_NAME_LEN 35
-#define SQL_MAX_TABLES_IN_SELECT 106
-#define SQL_MAX_USER_NAME_LEN 107
-#define SQL_MAXIMUM_CATALOG_NAME_LENGTH SQL_MAX_CATALOG_NAME_LEN
-#define SQL_MAXIMUM_COLUMN_NAME_LENGTH SQL_MAX_COLUMN_NAME_LEN
-#define SQL_MAXIMUM_COLUMNS_IN_GROUP_BY SQL_MAX_COLUMNS_IN_GROUP_BY
-#define SQL_MAXIMUM_COLUMNS_IN_INDEX SQL_MAX_COLUMNS_IN_INDEX
-#define SQL_MAXIMUM_COLUMNS_IN_ORDER_BY SQL_MAX_COLUMNS_IN_ORDER_BY
-#define SQL_MAXIMUM_COLUMNS_IN_SELECT SQL_MAX_COLUMNS_IN_SELECT
-#define SQL_MAXIMUM_CURSOR_NAME_LENGTH SQL_MAX_CURSOR_NAME_LEN
-#define SQL_MAXIMUM_INDEX_SIZE SQL_MAX_INDEX_SIZE
-#define SQL_MAXIMUM_ROW_SIZE SQL_MAX_ROW_SIZE
-#define SQL_MAXIMUM_SCHEMA_NAME_LENGTH SQL_MAX_SCHEMA_NAME_LEN
-#define SQL_MAXIMUM_STATEMENT_LENGTH SQL_MAX_STATEMENT_LEN
-#define SQL_MAXIMUM_TABLES_IN_SELECT SQL_MAX_TABLES_IN_SELECT
-#define SQL_MAXIMUM_USER_NAME_LENGTH SQL_MAX_USER_NAME_LEN
-#define SQL_NC_HIGH 0
-#define SQL_NC_LOW 1
-#define SQL_NEED_DATA 99
-#define SQL_NO_NULLS 0
-#define SQL_NTS (-3)
-#define SQL_NTSL (-3L)
-#define SQL_NULL_COLLATION 85
-#define SQL_NULL_DATA (-1)
-#define SQL_NULL_HDBC 0
-#define SQL_NULL_HENV 0
-#define SQL_NULL_HSTMT 0
-#define SQL_NULLABLE 1
-#define SQL_NULLABLE_UNKNOWN 2
-#define SQL_NUMERIC 2
-#define SQL_ORDER_BY_COLUMNS_IN_SELECT 90
-#define SQL_PC_PSEUDO 2
-#define SQL_PC_UNKNOWN 0
-#define SQL_REAL 7
-#define SQL_RESET_PARAMS 3
-#define SQL_ROLLBACK 1
-#define SQL_SCCO_LOCK 2
-#define SQL_SCCO_OPT_ROWVER 4
-#define SQL_SCCO_OPT_VALUES 8
-#define SQL_SCCO_READ_ONLY 1
-#define SQL_SCOPE_CURROW 0
-#define SQL_SCOPE_SESSION 2
-#define SQL_SCOPE_TRANSACTION 1
-#define SQL_SCROLL_CONCURRENCY 43
-#define SQL_SEARCH_PATTERN_ESCAPE 14
-#define SQL_SERVER_NAME 13
-#define SQL_SMALLINT 5
-#define SQL_SPECIAL_CHARACTERS 94
-#define SQL_STILL_EXECUTING 2
-#define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
-#define SQL_SUCCESS 0
-#define SQL_SUCCESS_WITH_INFO 1
-#define SQL_TC_ALL 2
-#define SQL_TC_DDL_COMMIT 3
-#define SQL_TC_DDL_IGNORE 4
-#define SQL_TC_DML 1
-#define SQL_TC_NONE 0
-#define SQL_TRANSACTION_CAPABLE SQL_TXN_CAPABLE
-#define SQL_TRANSACTION_ISOLATION_OPTION SQL_TXN_ISOLATION_OPTION
-#define SQL_TRANSACTION_READ_COMMITTED SQL_TXN_READ_COMMITTED
-#define SQL_TRANSACTION_READ_UNCOMMITTED SQL_TXN_READ_UNCOMMITTED
-#define SQL_TRANSACTION_REPEATABLE_READ SQL_TXN_REPEATABLE_READ
-#define SQL_TRANSACTION_SERIALIZABLE SQL_TXN_SERIALIZABLE
-#define SQL_TXN_CAPABLE 46
-#define SQL_TXN_ISOLATION_OPTION 72
-#define SQL_TXN_READ_COMMITTED 2
-#define SQL_TXN_READ_UNCOMMITTED 1
-#define SQL_TXN_REPEATABLE_READ 4
-#define SQL_TXN_SERIALIZABLE 8
-#define SQL_UNBIND 2
-#define SQL_UNKNOWN_TYPE 0
-#define SQL_USER_NAME 47
-#define SQL_VARCHAR 12
-#if (ODBCVER >= 0x0200)
-#define SQL_AT_ADD_COLUMN 1
-#define SQL_AT_DROP_COLUMN 2
-#endif /* ODBCVER >= 0x0200 */
-#if (ODBCVER >= 0x0201)
-#define SQL_OJ_LEFT 1
-#define SQL_OJ_RIGHT 2
-#define SQL_OJ_FULL 4
-#define SQL_OJ_NESTED 8
-#define SQL_OJ_NOT_ORDERED 16
-#define SQL_OJ_INNER 32
-#define SQL_OJ_ALL_COMPARISON_OPS 64
-#endif /* ODBCVER >= 0x0201 */ 
-#if (ODBCVER >= 0x0300)   
-#define SQL_AM_CONNECTION 1
-#define SQL_AM_NONE 0
-#define SQL_AM_STATEMENT 2
-#define SQL_API_SQLALLOCHANDLE 1001
-#define SQL_API_SQLBINDPARAM 1002
-#define SQL_API_SQLCLOSECURSOR 1003
-#define SQL_API_SQLCOLATTRIBUTE 6
-#define SQL_API_SQLCOPYDESC 1004
-#define SQL_API_SQLENDTRAN 1005
-#define SQL_API_SQLFETCHSCROLL 1021
-#define SQL_API_SQLFREEHANDLE 1006
-#define SQL_API_SQLGETCONNECTATTR 1007
-#define SQL_API_SQLGETDESCFIELD 1008
-#define SQL_API_SQLGETDESCREC 1009
-#define SQL_API_SQLGETDIAGFIELD 1010
-#define SQL_API_SQLGETDIAGREC 1011
-#define SQL_API_SQLGETENVATTR 1012
-#define SQL_API_SQLGETSTMTATTR 1014
-#define SQL_API_SQLSETCONNECTATTR 1016
-#define SQL_API_SQLSETDESCFIELD 1017
-#define SQL_API_SQLSETDESCREC 1018
-#define SQL_API_SQLSETENVATTR 1019
-#define SQL_API_SQLSETSTMTATTR 1020
-#define SQL_ARD_TYPE (-99)
-#define SQL_AT_ADD_CONSTRAINT 8
-#define SQL_ATTR_APP_PARAM_DESC 10011
-#define SQL_ATTR_APP_ROW_DESC 10010
-#define SQL_ATTR_AUTO_IPD 10001
-#define SQL_ATTR_CURSOR_SCROLLABLE (-1)
-#define SQL_ATTR_CURSOR_SENSITIVITY (-2)
-#define SQL_ATTR_IMP_PARAM_DESC 10013
-#define SQL_ATTR_IMP_ROW_DESC 10012
-#define SQL_ATTR_METADATA_ID 10014
-#define SQL_ATTR_OUTPUT_NTS 10001
-#define SQL_CATALOG_NAME 10003
-#define SQL_CODE_DATE 1
-#define SQL_CODE_TIME 2
-#define SQL_CODE_TIMESTAMP 3
-#define SQL_COLLATION_SEQ 10004
-#define SQL_CURSOR_SENSITIVITY 10001
-#define SQL_DATE_LEN 10
-#define SQL_DATETIME 9
-#define SQL_DEFAULT 99
-#define SQL_DESC_ALLOC_AUTO 1
-#define SQL_DESC_ALLOC_TYPE 1099
-#define SQL_DESC_ALLOC_USER 2
-#define SQL_DESC_COUNT 1001
-#define SQL_DESC_DATA_PTR 1010
-#define SQL_DESC_DATETIME_INTERVAL_CODE 1007
-#define SQL_DESC_INDICATOR_PTR 1009
-#define SQL_DESC_LENGTH 1003
-#define SQL_DESC_NAME 1011
-#define SQL_DESC_NULLABLE 1008
-#define SQL_DESC_OCTET_LENGTH 1013
-#define SQL_DESC_OCTET_LENGTH_PTR 1004
-#define SQL_DESC_PRECISION 1005
-#define SQL_DESC_SCALE 1006
-#define SQL_DESC_TYPE 1002
-#define SQL_DESC_UNNAMED 1012
-#define SQL_DESCRIBE_PARAMETER 10002
-#define SQL_DIAG_ALTER_DOMAIN 3
-#define SQL_DIAG_ALTER_TABLE 4
-#define SQL_DIAG_CALL 7
-#define SQL_DIAG_CLASS_ORIGIN 8
-#define SQL_DIAG_CONNECTION_NAME 10
-#define SQL_DIAG_CREATE_ASSERTION 6
-#define SQL_DIAG_CREATE_CHARACTER_SET 8
-#define SQL_DIAG_CREATE_COLLATION 10
-#define SQL_DIAG_CREATE_DOMAIN 23
-#define SQL_DIAG_CREATE_INDEX (-1)
-#define SQL_DIAG_CREATE_SCHEMA 64
-#define SQL_DIAG_CREATE_TABLE 77
-#define SQL_DIAG_CREATE_TRANSLATION 79
-#define SQL_DIAG_CREATE_VIEW 84
-#define SQL_DIAG_DELETE_WHERE 19
-#define SQL_DIAG_DROP_ASSERTION 24
-#define SQL_DIAG_DROP_CHARACTER_SET 25
-#define SQL_DIAG_DROP_COLLATION 26
-#define SQL_DIAG_DROP_DOMAIN 27
-#define SQL_DIAG_DROP_INDEX (-2)
-#define SQL_DIAG_DROP_SCHEMA 31
-#define SQL_DIAG_DROP_TABLE 32
-#define SQL_DIAG_DROP_TRANSLATION 33
-#define SQL_DIAG_DROP_VIEW 36
-#define SQL_DIAG_DYNAMIC_DELETE_CURSOR 38
-#define SQL_DIAG_DYNAMIC_FUNCTION 7
-#define SQL_DIAG_DYNAMIC_FUNCTION_CODE 12
-#define SQL_DIAG_DYNAMIC_UPDATE_CURSOR 81
-#define SQL_DIAG_GRANT 48
-#define SQL_DIAG_INSERT 50
-#define SQL_DIAG_MESSAGE_TEXT 6
-#define SQL_DIAG_NATIVE 5
-#define SQL_DIAG_NUMBER 2
-#define SQL_DIAG_RETURNCODE 1
-#define SQL_DIAG_REVOKE 59
-#define SQL_DIAG_ROW_COUNT 3
-#define SQL_DIAG_SELECT_CURSOR 85
-#define SQL_DIAG_SERVER_NAME 11
-#define SQL_DIAG_SQLSTATE 4
-#define SQL_DIAG_SUBCLASS_ORIGIN 9
-#define SQL_DIAG_UNKNOWN_STATEMENT 0
-#define SQL_DIAG_UPDATE_WHERE 82
-#define SQL_FALSE 0
-#define SQL_HANDLE_DBC 2
-#define SQL_HANDLE_DESC 4
-#define SQL_HANDLE_ENV 1
-#define SQL_HANDLE_STMT 3
-#define SQL_INSENSITIVE 1
-#define SQL_MAX_CONCURRENT_ACTIVITIES 1
-#define SQL_MAX_DRIVER_CONNECTIONS 0
-#define SQL_MAX_IDENTIFIER_LEN 10005
-#define SQL_MAXIMUM_CONCURRENT_ACTIVITIES SQL_MAX_CONCURRENT_ACTIVITIES
-#define SQL_MAXIMUM_DRIVER_CONNECTIONS SQL_MAX_DRIVER_CONNECTIONS
-#define SQL_MAXIMUM_IDENTIFIER_LENGTH SQL_MAX_IDENTIFIER_LEN
-#define SQL_NAMED 0
-#define SQL_NO_DATA 100
-#define SQL_NONSCROLLABLE 0
-#define SQL_NULL_HANDLE 0L
-#define SQL_NULL_HDESC 0
-#define SQL_OJ_CAPABILITIES 115
-#define SQL_OUTER_JOIN_CAPABILITIES SQL_OJ_CAPABILITIES
-#define SQL_PC_NON_PSEUDO 1
-#define SQL_PRED_BASIC 2
-#define SQL_PRED_CHAR 1
-#define SQL_PRED_NONE 0
-#define SQL_ROW_IDENTIFIER 1
-#define SQL_SCROLLABLE 1
-#define SQL_SENSITIVE 2
-#define SQL_TIME_LEN 8
-#define SQL_TIMESTAMP_LEN 19
-#define SQL_TRUE 1
-#define SQL_TYPE_DATE 91
-#define SQL_TYPE_TIME 92
-#define SQL_TYPE_TIMESTAMP 93
-#define SQL_UNNAMED 1
-#define SQL_UNSPECIFIED 0
-#define SQL_XOPEN_CLI_YEAR 10000
-#endif /* ODBCVER >= 0x0300 */
-
-#ifndef RC_INVOKED
-SQLRETURN SQL_API SQLAllocConnect(SQLHENV,SQLHDBC*); /* deprecated */
-SQLRETURN SQL_API SQLAllocEnv(SQLHENV*); /* deprecated */
-SQLRETURN SQL_API SQLAllocStmt(SQLHDBC,SQLHSTMT*); /* deprecated */
-SQLRETURN SQL_API SQLBindCol(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLLEN,SQLLEN*);
-SQLRETURN SQL_API SQLCancel(SQLHSTMT);
-SQLRETURN SQL_API SQLConnect(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLDescribeCol(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*);
-SQLRETURN SQL_API SQLDisconnect(SQLHDBC);
-SQLRETURN SQL_API SQLError(SQLHENV,SQLHDBC,SQLHSTMT,SQLCHAR*,SQLINTEGER*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); /* deprecated */
-SQLRETURN SQL_API SQLExecDirect(SQLHSTMT,SQLCHAR*,SQLINTEGER);
-SQLRETURN SQL_API SQLExecute(SQLHSTMT);
-SQLRETURN SQL_API SQLFetch(SQLHSTMT);
-SQLRETURN SQL_API SQLFreeConnect(SQLHDBC); /* deprecated */
-SQLRETURN SQL_API SQLFreeEnv(SQLHENV); /* deprecated */
-SQLRETURN SQL_API SQLFreeStmt(SQLHSTMT,SQLUSMALLINT); 
-SQLRETURN SQL_API SQLGetCursorName(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLNumResultCols(SQLHSTMT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLPrepare(SQLHSTMT,SQLCHAR*,SQLINTEGER);
-SQLRETURN SQL_API SQLRowCount(SQLHSTMT,SQLLEN*);
-SQLRETURN SQL_API SQLSetCursorName(SQLHSTMT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLTransact(SQLHENV,SQLHDBC,SQLUSMALLINT);
-SQLRETURN SQL_API SQLSetParam(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,SQLSMALLINT,SQLPOINTER,SQLLEN*); /* deprecated */
-SQLRETURN SQL_API SQLColumns(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLGetConnectOption(SQLHDBC,SQLUSMALLINT,SQLPOINTER); /* deprecated */
-SQLRETURN SQL_API SQLGetData(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLPOINTER,SQLLEN,SQLLEN*);
-SQLRETURN SQL_API SQLGetFunctions(SQLHDBC,SQLUSMALLINT,SQLUSMALLINT*);
-SQLRETURN SQL_API SQLGetInfo(SQLHDBC,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetStmtOption(SQLHSTMT,SQLUSMALLINT,SQLPOINTER); /* deprecated */
-SQLRETURN SQL_API SQLGetTypeInfo(SQLHSTMT,SQLSMALLINT);
-SQLRETURN SQL_API SQLParamData(SQLHSTMT,SQLPOINTER*);
-SQLRETURN SQL_API SQLPutData(SQLHSTMT,SQLPOINTER,SQLLEN);
-SQLRETURN SQL_API SQLSetConnectOption(SQLHDBC,SQLUSMALLINT,SQLULEN); /* deprecated */
-SQLRETURN SQL_API SQLSetStmtOption(SQLHSTMT,SQLUSMALLINT,SQLROWCOUNT); /* deprecated */
-SQLRETURN SQL_API SQLSpecialColumns(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLUSMALLINT,SQLUSMALLINT);
-SQLRETURN SQL_API SQLStatistics(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLUSMALLINT,SQLUSMALLINT);
-SQLRETURN SQL_API SQLTables(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLDataSources(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-#if (ODBCVER >= 0x0300)
-SQLRETURN SQL_API SQLAllocHandle(SQLSMALLINT,SQLHANDLE,SQLHANDLE*);
-SQLRETURN SQL_API SQLBindParam(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,SQLSMALLINT,SQLPOINTER,SQLLEN*);
-SQLRETURN SQL_API SQLCloseCursor(SQLHSTMT); 
-SQLRETURN SQL_API SQLColAttribute(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLPOINTER);
-SQLRETURN SQL_API SQLCopyDesc(SQLHDESC,SQLHDESC);
-SQLRETURN SQL_API SQLEndTran(SQLSMALLINT,SQLHANDLE,SQLSMALLINT);
-SQLRETURN SQL_API SQLFetchScroll(SQLHSTMT,SQLSMALLINT,SQLROWOFFSET);
-SQLRETURN SQL_API SQLFreeHandle(SQLSMALLINT,SQLHANDLE);
-SQLRETURN SQL_API SQLGetConnectAttr(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLGetDescField(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*); 
-SQLRETURN SQL_API SQLGetDescRec(SQLHDESC,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,
-    SQLSMALLINT*,SQLSMALLINT*,SQLLEN*,SQLSMALLINT*,SQLSMALLINT*,SQLSMALLINT*); 
-SQLRETURN SQL_API SQLGetDiagField(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*); 
-SQLRETURN SQL_API SQLGetDiagRec(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLCHAR*,SQLINTEGER*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*); 
-SQLRETURN SQL_API SQLGetEnvAttr(SQLHENV,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLGetStmtAttr(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLSetConnectAttr(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER);
-SQLRETURN SQL_API SQLSetDescField(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER); 
-SQLRETURN SQL_API SQLSetDescRec(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLLEN,SQLSMALLINT,
-    SQLSMALLINT,SQLPOINTER,SQLLEN*,SQLLEN*); 
-SQLRETURN SQL_API SQLSetEnvAttr(SQLHENV,SQLINTEGER,SQLPOINTER,SQLINTEGER);
-SQLRETURN SQL_API SQLSetStmtAttr(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER);
-#endif  /* (ODBCVER >= 0x0300) */
-#endif /* ndef RC_INVOKED */
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/sqlext.h b/winsup/w32api/include/sqlext.h
deleted file mode 100644
index 884260781..000000000
--- a/winsup/w32api/include/sqlext.h
+++ /dev/null
@@ -1,1218 +0,0 @@
-#ifndef _SQLEXT_H
-#define _SQLEXT_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <sql.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define SQL_SPEC_MAJOR 3
-#define SQL_SPEC_MINOR	51
-#define SQL_SPEC_STRING "03.51"
-#define SQL_ACCESS_MODE 101
-#define SQL_ACTIVE_CONNECTIONS 0
-#define SQL_ACTIVE_STATEMENTS 1
-#define SQL_ADD 4
-#define SQL_ALL_EXCEPT_LIKE 2
-#define SQL_API_ALL_FUNCTIONS 0
-#define SQL_API_LOADBYORDINAL 199
-#define SQL_API_SQLBINDPARAMETER 72
-#define SQL_API_SQLBROWSECONNECT 55
-#define SQL_API_SQLCOLATTRIBUTES 6
-#define SQL_API_SQLCOLUMNPRIVILEGES 56
-#define SQL_API_SQLDESCRIBEPARAM 58
-#define SQL_API_SQLDRIVERCONNECT 41
-#define SQL_API_SQLDRIVERS 71
-#define SQL_API_SQLEXTENDEDFETCH 59
-#define SQL_API_SQLFOREIGNKEYS 60
-#define SQL_API_SQLMORERESULTS 61
-#define SQL_API_SQLNATIVESQL 62
-#define SQL_API_SQLNUMPARAMS 63
-#define SQL_API_SQLPARAMOPTIONS 64
-#define SQL_API_SQLPRIMARYKEYS 65
-#define SQL_API_SQLPROCEDURECOLUMNS 66
-#define SQL_API_SQLPROCEDURES 67
-#define SQL_API_SQLSETPOS 68
-#define SQL_API_SQLSETSCROLLOPTIONS 69
-#define SQL_API_SQLTABLEPRIVILEGES 70
-#define SQL_ASYNC_ENABLE 4
-#define SQL_ASYNC_ENABLE_DEFAULT SQL_ASYNC_ENABLE_OFF
-#define SQL_ASYNC_ENABLE_OFF 0UL
-#define SQL_ASYNC_ENABLE_ON 1UL
-#define SQL_ATTR_CONNECTION_DEAD 1209
-#define SQL_ATTR_READONLY 0
-#define SQL_ATTR_READWRITE_UNKNOWN 2
-#define SQL_ATTR_WRITE 1
-#define SQL_AUTOCOMMIT 102
-#define SQL_AUTOCOMMIT_DEFAULT SQL_AUTOCOMMIT_ON
-#define SQL_AUTOCOMMIT_OFF 0UL
-#define SQL_AUTOCOMMIT_ON 1UL
-#define SQL_BEST_ROWID 1
-#define SQL_BIGINT (-5)
-#define SQL_BINARY (-2)
-#define SQL_BIND_BY_COLUMN 0UL
-#define SQL_BIND_TYPE 5
-#define SQL_BIND_TYPE_DEFAULT SQL_BIND_BY_COLUMN
-#define SQL_BIT (-7)
-#define SQL_BOOKMARK_PERSISTENCE 82
-#define SQL_BP_CLOSE 1
-#define SQL_BP_DELETE 2
-#define SQL_BP_DROP 4
-#define SQL_BP_OTHER_HSTMT 32
-#define SQL_BP_SCROLL 64
-#define SQL_BP_TRANSACTION 8
-#define SQL_BP_UPDATE 16
-#define SQL_C_BINARY SQL_BINARY
-#define SQL_C_BIT SQL_BIT
-#define SQL_C_BOOKMARK SQL_C_ULONG
-#define SQL_C_CHAR SQL_CHAR
-#define SQL_C_DATE SQL_DATE
-#define SQL_C_DEFAULT 99
-#define SQL_C_DOUBLE SQL_DOUBLE
-#define SQL_C_FLOAT SQL_REAL
-#define SQL_C_LONG SQL_INTEGER
-#define SQL_C_SHORT SQL_SMALLINT
-#define SQL_C_SLONG (SQL_C_LONG+SQL_SIGNED_OFFSET)
-#define SQL_C_SSHORT (SQL_C_SHORT+SQL_SIGNED_OFFSET)
-#define SQL_C_STINYINT (SQL_TINYINT+SQL_SIGNED_OFFSET)
-#define SQL_C_TIME SQL_TIME
-#define SQL_C_TIMESTAMP SQL_TIMESTAMP
-#define SQL_C_TINYINT SQL_TINYINT
-#define SQL_C_ULONG (SQL_C_LONG+SQL_UNSIGNED_OFFSET)
-#define SQL_C_USHORT (SQL_C_SHORT+SQL_UNSIGNED_OFFSET)
-#define SQL_C_UTINYINT (SQL_TINYINT+SQL_UNSIGNED_OFFSET)
-#define SQL_CASCADE 0
-#define SQL_CB_NON_NULL 1
-#define SQL_CB_NULL 0
-#define SQL_CC_CLOSE SQL_CB_CLOSE /* deprecated */
-#define SQL_CC_DELETE SQL_CB_DELETE /* deprecated */
-#define SQL_CC_PRESERVE SQL_CB_PRESERVE /* deprecated */
-#define SQL_CD_FALSE 0L
-#define SQL_CD_TRUE 1L
-#define SQL_CN_ANY 2
-#define SQL_CN_DIFFERENT 1
-#define SQL_CN_NONE 0
-#define SQL_COLATT_OPT_MAX SQL_COLUMN_LABEL
-#define SQL_COLATT_OPT_MIN SQL_COLUMN_COUNT
-#define SQL_COLUMN_ALIAS 87
-#define SQL_COLUMN_AUTO_INCREMENT 11
-#define SQL_COLUMN_CASE_SENSITIVE 12
-#define SQL_COLUMN_COUNT 0
-#define SQL_COLUMN_DISPLAY_SIZE 6
-#define SQL_COLUMN_LABEL 18
-#define SQL_COLUMN_LENGTH 3
-#define SQL_COLUMN_MONEY 9
-#define SQL_COLUMN_NAME 1
-#define SQL_COLUMN_NULLABLE 7
-#define SQL_COLUMN_OWNER_NAME 16
-#define SQL_COLUMN_PRECISION 4
-#define SQL_COLUMN_QUALIFIER_NAME 17
-#define SQL_COLUMN_SCALE 5
-#define SQL_COLUMN_SEARCHABLE 13
-#define SQL_COLUMN_TABLE_NAME 15
-#define SQL_COLUMN_TYPE 2
-#define SQL_COLUMN_TYPE_NAME 14
-#define SQL_COLUMN_UNSIGNED 8
-#define SQL_COLUMN_UPDATABLE 10
-#define SQL_CONCAT_NULL_BEHAVIOR 22
-#define SQL_CONCUR_DEFAULT SQL_CONCUR_READ_ONLY
-#define SQL_CONCUR_LOCK 2
-#define SQL_CONCUR_READ_ONLY 1
-#define SQL_CONCUR_ROWVER 3
-#define SQL_CONCUR_TIMESTAMP SQL_CONCUR_ROWVER /* deprecated */
-#define SQL_CONCUR_VALUES 4
-#define SQL_CONCURRENCY 7
-#define SQL_CONVERT_BIGINT 53
-#define SQL_CONVERT_BINARY 54
-#define SQL_CONVERT_BIT 55
-#define SQL_CONVERT_CHAR 56
-#define SQL_CONVERT_DATE 57
-#define SQL_CONVERT_DECIMAL 58
-#define SQL_CONVERT_DOUBLE 59
-#define SQL_CONVERT_FLOAT 60
-#define SQL_CONVERT_FUNCTIONS 48
-#define SQL_CONVERT_INTEGER 61
-#define SQL_CONVERT_LONGVARBINARY 71
-#define SQL_CONVERT_LONGVARCHAR 62
-#define SQL_CONVERT_NUMERIC 63
-#define SQL_CONVERT_REAL 64
-#define SQL_CONVERT_SMALLINT 65
-#define SQL_CONVERT_TIME 66
-#define SQL_CONVERT_TIMESTAMP 67
-#define SQL_CONVERT_TINYINT 68
-#define SQL_CONVERT_VARBINARY 69
-#define SQL_CONVERT_VARCHAR 70
-#define SQL_CORRELATION_NAME 74
-#define SQL_CR_CLOSE SQL_CB_CLOSE /* deprecated */
-#define SQL_CR_DELETE SQL_CB_DELETE /* deprecated */
-#define SQL_CR_PRESERVE SQL_CB_PRESERVE /* deprecated */
-#define SQL_CUR_DEFAULT SQL_CUR_USE_DRIVER
-#define SQL_CUR_USE_DRIVER 2UL
-#define SQL_CUR_USE_IF_NEEDED 0UL
-#define SQL_CUR_USE_ODBC 1UL
-#define SQL_CURRENT_QUALIFIER 109
-#define SQL_CURSOR_DYNAMIC 2UL
-#define SQL_CURSOR_FORWARD_ONLY 0UL
-#define SQL_CURSOR_KEYSET_DRIVEN 1UL
-#define SQL_CURSOR_ROLLBACK_BEHAVIOR 24
-#define SQL_CURSOR_STATIC 3UL
-#define SQL_CURSOR_TYPE 6
-#define SQL_CURSOR_TYPE_DEFAULT SQL_CURSOR_FORWARD_ONLY
-#define SQL_CV_CASCADED 0x00000004L
-#define SQL_CV_CHECK_OPTION 0x00000002L
-#define SQL_CV_CREATE_VIEW 0x00000001L
-#define SQL_CV_LOCAL 0x00000008L
-#define SQL_CVT_BIGINT 0x00004000L
-#define SQL_CVT_BINARY 0x00000400L
-#define SQL_CVT_BIT 0x00001000L
-#define SQL_CVT_CHAR 0x00000001L
-#define SQL_CVT_DATE 0x00008000L
-#define SQL_CVT_DECIMAL 0x00000004L
-#define SQL_CVT_DOUBLE 0x00000080L
-#define SQL_CVT_FLOAT 0x00000020L
-#define SQL_CVT_INTEGER 0x00000008L
-#define SQL_CVT_LONGVARBINARY 0x00040000L
-#define SQL_CVT_LONGVARCHAR 0x00000200L
-#define SQL_CVT_NUMERIC 0x00000002L
-#define SQL_CVT_REAL 0x00000040L
-#define SQL_CVT_SMALLINT 0x00000010L
-#define SQL_CVT_TIME 0x00010000L
-#define SQL_CVT_TIMESTAMP 0x00020000L
-#define SQL_CVT_TINYINT 0x00002000L
-#define SQL_CVT_VARBINARY 0x00000800L
-#define SQL_CVT_VARCHAR 0x00000100L
-#define SQL_DATABASE_NAME 16 /* deprecated */
-#define SQL_DATE 9
-#define SQL_DEFAULT_PARAM (-5)
-#define SQL_DELETE 3
-#define SQL_DRIVER_COMPLETE 1
-#define SQL_DRIVER_COMPLETE_REQUIRED 3
-#define SQL_DRIVER_HDBC 3
-#define SQL_DRIVER_HENV 4
-#define SQL_DRIVER_HLIB 76
-#define SQL_DRIVER_HSTMT 5
-#define SQL_DRIVER_NAME 6
-#define SQL_DRIVER_NOPROMPT 0
-#define SQL_DRIVER_ODBC_VER 77
-#define SQL_DRIVER_PROMPT 2
-#define SQL_DRIVER_VER 7
-#define SQL_DTC_ENLIST_EXPENSIVE 1
-#define SQL_DTC_TRANSITION_COST 1750
-#define SQL_DTC_UNENLIST_EXPENSIVE 2
-#define SQL_ENSURE 1
-#define SQL_ENTIRE_ROWSET 0
-#define SQL_EXPRESSIONS_IN_ORDERBY 27
-#define SQL_FD_FETCH_BOOKMARK 128
-#define SQL_FD_FETCH_PREV SQL_FD_FETCH_PRIOR /* deprecated */
-#define SQL_FD_FETCH_RESUME 64
-#define SQL_FETCH_BOOKMARK 8
-#define SQL_FETCH_PREV SQL_FETCH_PRIOR /* deprecated */
-#define SQL_FETCH_RESUME 7 /* deprecated */
-#define SQL_FILE_CATALOG SQL_FILE_QUALIFIER
-#define SQL_FILE_NOT_SUPPORTED 0x0000
-#define SQL_FILE_QUALIFIER 0x0002
-#define SQL_FILE_TABLE 0x0001
-#define SQL_FILE_USAGE 84
-#define SQL_FN_CVT_CONVERT 0x00000001L
-#define SQL_FN_NUM_ABS 0x00000001L
-#define SQL_FN_NUM_ACOS 0x00000002L
-#define SQL_FN_NUM_ASIN 0x00000004L
-#define SQL_FN_NUM_ATAN 0x00000008L
-#define SQL_FN_NUM_ATAN2 0x00000010L
-#define SQL_FN_NUM_CEILING 0x00000020L
-#define SQL_FN_NUM_COS 0x00000040L
-#define SQL_FN_NUM_COT 0x00000080L
-#define SQL_FN_NUM_DEGREES 0x00040000L
-#define SQL_FN_NUM_EXP 0x00000100L
-#define SQL_FN_NUM_FLOOR 0x00000200L
-#define SQL_FN_NUM_LOG 0x00000400L
-#define SQL_FN_NUM_LOG10 0x00080000L
-#define SQL_FN_NUM_MOD 0x00000800L
-#define SQL_FN_NUM_PI 0x00010000L
-#define SQL_FN_NUM_POWER 0x00100000L
-#define SQL_FN_NUM_RADIANS 0x00200000L
-#define SQL_FN_NUM_RAND 0x00020000L
-#define SQL_FN_NUM_ROUND 0x00400000L
-#define SQL_FN_NUM_SIGN 0x00001000L
-#define SQL_FN_NUM_SIN 0x00002000L
-#define SQL_FN_NUM_SQRT 0x00004000L
-#define SQL_FN_NUM_TAN 0x00008000L
-#define SQL_FN_NUM_TRUNCATE 0x00800000L
-#define SQL_FN_STR_ASCII 0x00002000L
-#define SQL_FN_STR_CHAR 0x00004000L
-#define SQL_FN_STR_CONCAT 0x00000001L
-#define SQL_FN_STR_DIFFERENCE 0x00008000L
-#define SQL_FN_STR_INSERT 0x00000002L
-#define SQL_FN_STR_LCASE 0x00000040L
-#define SQL_FN_STR_LEFT 0x00000004L
-#define SQL_FN_STR_LENGTH 0x00000010L
-#define SQL_FN_STR_LOCATE 0x00000020L
-#define SQL_FN_STR_LOCATE_2 0x00010000L
-#define SQL_FN_STR_LTRIM 0x00000008L
-#define SQL_FN_STR_REPEAT 0x00000080L
-#define SQL_FN_STR_REPLACE 0x00000100L
-#define SQL_FN_STR_RIGHT 0x00000200L
-#define SQL_FN_STR_RTRIM 0x00000400L
-#define SQL_FN_STR_SOUNDEX 0x00020000L
-#define SQL_FN_STR_SPACE 0x00040000L
-#define SQL_FN_STR_SUBSTRING 0x00000800L
-#define SQL_FN_STR_UCASE 0x00001000L
-#define SQL_FN_SYS_DBNAME 0x00000002L
-#define SQL_FN_SYS_IFNULL 0x00000004L
-#define SQL_FN_SYS_USERNAME 0x00000001L
-#define SQL_FN_TD_CURDATE 0x00000002L
-#define SQL_FN_TD_CURTIME 0x00000200L
-#define SQL_FN_TD_DAYNAME 0x00008000L
-#define SQL_FN_TD_DAYOFMONTH 0x00000004L
-#define SQL_FN_TD_DAYOFWEEK 0x00000008L
-#define SQL_FN_TD_DAYOFYEAR 0x00000010L
-#define SQL_FN_TD_HOUR 0x00000400L
-#define SQL_FN_TD_MINUTE 0x00000800L
-#define SQL_FN_TD_MONTH 0x00000020L
-#define SQL_FN_TD_MONTHNAME 0x00010000L
-#define SQL_FN_TD_NOW 0x00000001L
-#define SQL_FN_TD_QUARTER 0x00000040L
-#define SQL_FN_TD_SECOND 0x00001000L
-#define SQL_FN_TD_TIMESTAMPADD 0x00002000L
-#define SQL_FN_TD_TIMESTAMPDIFF 0x00004000L
-#define SQL_FN_TD_WEEK 0x00000080L
-#define SQL_FN_TD_YEAR 0x00000100L
-#define SQL_FN_TSI_DAY 0x00000010L
-#define SQL_FN_TSI_FRAC_SECOND 0x00000001L
-#define SQL_FN_TSI_HOUR 0x00000008L
-#define SQL_FN_TSI_MINUTE 0x00000004L
-#define SQL_FN_TSI_MONTH 0x00000040L
-#define SQL_FN_TSI_QUARTER 0x00000080L
-#define SQL_FN_TSI_SECOND 0x00000002L
-#define SQL_FN_TSI_WEEK 0x00000020L
-#define SQL_FN_TSI_YEAR 0x00000100L
-#define SQL_GB_GROUP_BY_CONTAINS_SELECT 2
-#define SQL_GB_GROUP_BY_EQUALS_SELECT 1
-#define SQL_GB_NO_RELATION 3
-#define SQL_GB_NOT_SUPPORTED 0
-#define SQL_GD_BLOCK 4
-#define SQL_GD_BOUND 8
-#define SQL_GET_BOOKMARK 13
-#define SQL_GROUP_BY 88
-#define SQL_IGNORE (-6)
-#define SQL_INFO_FIRST 0
-#define SQL_KEYSET_SIZE 8
-#define SQL_KEYSET_SIZE_DEFAULT 0UL
-#define SQL_KEYWORDS 89
-#define SQL_LCK_EXCLUSIVE 2
-#define SQL_LCK_NO_CHANGE 1
-#define SQL_LCK_UNLOCK 4
-#define SQL_LEN_BINARY_ATTR(length) (-(length)+SQL_LEN_BINARY_ATTR_OFFSET)
-#define SQL_LEN_BINARY_ATTR_OFFSET (-100)
-#define SQL_LEN_DATA_AT_EXEC(length) (-(length)+SQL_LEN_DATA_AT_EXEC_OFFSET)
-#define SQL_LEN_DATA_AT_EXEC_OFFSET (-100)
-#define SQL_LIKE_ESCAPE_CLAUSE 113
-#define SQL_LIKE_ONLY 1
-#define SQL_LOCK_EXCLUSIVE 1
-#define SQL_LOCK_NO_CHANGE 0
-#define SQL_LOCK_TYPES 78
-#define SQL_LOCK_UNLOCK 2
-#define SQL_LOGIN_TIMEOUT 103
-#define SQL_LOGIN_TIMEOUT_DEFAULT 15UL
-#define SQL_LONGVARBINARY (-4)
-#define SQL_LONGVARCHAR (-1)
-#define SQL_MAX_BINARY_LITERAL_LEN 112
-#define SQL_MAX_CHAR_LITERAL_LEN 108
-#define SQL_MAX_DSN_LENGTH 32
-#define SQL_MAX_LENGTH 3
-#define SQL_MAX_LENGTH_DEFAULT 0UL
-#define SQL_MAX_OPTION_STRING_LENGTH 256
-#define SQL_MAX_OWNER_NAME_LEN 32
-#define SQL_MAX_PROCEDURE_NAME_LEN 33
-#define SQL_MAX_QUALIFIER_NAME_LEN 34
-#define SQL_MAX_ROW_SIZE_INCLUDES_LONG 103
-#define SQL_MAX_ROWS 1
-#define SQL_MAX_ROWS_DEFAULT 0UL
-#define SQL_MODE_DEFAULT SQL_MODE_READ_WRITE
-#define SQL_MODE_READ_ONLY 1UL
-#define SQL_MODE_READ_WRITE 0UL
-#define SQL_MULT_RESULT_SETS 36
-#define SQL_MULTIPLE_ACTIVE_TXN 37
-#define SQL_NC_END 0x0004
-#define SQL_NC_START 0x0002
-#define SQL_NEED_LONG_DATA_LEN 111
-#define SQL_NNC_NON_NULL 0x0001
-#define SQL_NNC_NULL 0x0000
-#define SQL_NO_TOTAL (-4)
-#define SQL_NON_NULLABLE_COLUMNS 75
-#define SQL_NOSCAN 2
-#define SQL_NOSCAN_DEFAULT SQL_NOSCAN_OFF
-#define SQL_NOSCAN_OFF 0UL
-#define SQL_NOSCAN_ON 1UL
-#define SQL_NUMERIC_FUNCTIONS 49
-#define SQL_OAC_LEVEL1 0x0001
-#define SQL_OAC_LEVEL2 0x0002
-#define SQL_OAC_NONE 0x0000
-#define SQL_ODBC_API_CONFORMANCE 9
-#define SQL_ODBC_CURSORS 110
-#define SQL_ODBC_SAG_CLI_CONFORMANCE 12
-#define SQL_ODBC_SQL_CONFORMANCE 15
-#define SQL_ODBC_SQL_OPT_IEF 73
-#define SQL_ODBC_VER 10
-#define SQL_OPT_TRACE 104
-#define SQL_OPT_TRACE_DEFAULT SQL_OPT_TRACE_OFF
-#define SQL_OPT_TRACE_FILE_DEFAULT "\\SQL.LOG"
-#define SQL_OPT_TRACE_OFF 0UL
-#define SQL_OPT_TRACE_ON 1UL
-#define SQL_OPT_TRACEFILE 105
-#define SQL_OSC_CORE 1
-#define SQL_OSC_EXTENDED 2
-#define SQL_OSC_MINIMUM 0
-#define SQL_OSCC_COMPLIANT 1
-#define SQL_OSCC_NOT_COMPLIANT 0
-#define SQL_OU_DML_STATEMENTS 1
-#define SQL_OU_INDEX_DEFINITION 8
-#define SQL_OU_PRIVILEGE_DEFINITION 16
-#define SQL_OU_PROCEDURE_INVOCATION 2
-#define SQL_OU_TABLE_DEFINITION 4
-#define SQL_OUTER_JOINS 38
-#define SQL_OWNER_TERM 39
-#define SQL_OWNER_USAGE 91
-#define SQL_PACKET_SIZE 112
-#define SQL_PARAM_INPUT 1
-#define SQL_PARAM_INPUT_OUTPUT 2
-#define SQL_PARAM_OUTPUT 4
-#define SQL_PARAM_TYPE_DEFAULT SQL_PARAM_INPUT_OUTPUT
-#define SQL_PARAM_TYPE_UNKNOWN 0
-#define SQL_PC_NOT_PSEUDO 1
-#define SQL_POS_ADD 16
-#define SQL_POS_DELETE 8
-#define SQL_POS_OPERATIONS 79
-#define SQL_POS_POSITION 1
-#define SQL_POS_REFRESH 2
-#define SQL_POS_UPDATE 4
-#define SQL_POSITION 0
-#define SQL_POSITIONED_STATEMENTS 80
-#define SQL_PRED_SEARCHABLE SQL_SEARCHABLE
-#define SQL_PROCEDURE_TERM 40
-#define SQL_PROCEDURES 21
-#define SQL_PS_POSITIONED_DELETE 1
-#define SQL_PS_POSITIONED_UPDATE 2
-#define SQL_PS_SELECT_FOR_UPDATE 4
-#define SQL_PT_FUNCTION 2
-#define SQL_PT_PROCEDURE 1
-#define SQL_PT_UNKNOWN 0
-#define SQL_QL_END 0x0002
-#define SQL_QL_START 0x0001
-#define SQL_QU_DML_STATEMENTS 1
-#define SQL_QU_INDEX_DEFINITION 8
-#define SQL_QU_PRIVILEGE_DEFINITION 16
-#define SQL_QU_PROCEDURE_INVOCATION 2
-#define SQL_QU_TABLE_DEFINITION 4
-#define SQL_QUALIFIER_LOCATION 114
-#define SQL_QUALIFIER_NAME_SEPARATOR 41
-#define SQL_QUALIFIER_TERM 42
-#define SQL_QUALIFIER_USAGE 92
-#define SQL_QUERY_TIMEOUT 0
-#define SQL_QUERY_TIMEOUT_DEFAULT 0UL
-#define SQL_QUICK 0
-#define SQL_QUIET_MODE 111
-#define SQL_QUOTED_IDENTIFIER_CASE 93
-#define SQL_RD_DEFAULT SQL_RD_ON
-#define SQL_RD_OFF 0UL
-#define SQL_RD_ON 1UL
-#define SQL_REFRESH 1
-#define SQL_RESTRICT 1
-#define SQL_RESULT_COL 3
-#define SQL_RETRIEVE_DATA 11
-#define SQL_RETURN_VALUE 5
-#define SQL_ROW_ADDED 4
-#define SQL_ROW_DELETED 1
-#define SQL_ROW_ERROR 5
-#define SQL_ROW_NOROW 3
-#define SQL_ROW_NUMBER 14
-#define SQL_ROW_SUCCESS 0
-#define SQL_ROW_UPDATED 2
-#define SQL_ROW_UPDATES 11
-#define SQL_ROWSET_SIZE 9
-#define SQL_ROWSET_SIZE_DEFAULT 1UL
-#define SQL_ROWVER 2
-#define SQL_SC_NON_UNIQUE 0UL
-#define SQL_SC_TRY_UNIQUE 1UL
-#define SQL_SC_UNIQUE 2UL
-#define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER /* deprecated */ 
-#define SQL_SCROLL_DYNAMIC (-2L) /* deprecated */   
-#define SQL_SCROLL_FORWARD_ONLY 0L /* deprecated */   
-#define SQL_SCROLL_KEYSET_DRIVEN (-1L) /* deprecated */   
-#define SQL_SCROLL_OPTIONS 44
-#define SQL_SCROLL_STATIC (-3L) /* deprecated */   
-#define SQL_SEARCHABLE 3
-#define SQL_SET_NULL 2
-#define SQL_SETPARAM_VALUE_MAX (-1L)
-#define SQL_SETPOS_MAX_LOCK_VALUE SQL_LOCK_UNLOCK
-#define SQL_SETPOS_MAX_OPTION_VALUE SQL_ADD
-#define SQL_SIGNED_OFFSET (-20)
-#define SQL_SIMULATE_CURSOR 10
-#define SQL_SO_DYNAMIC 4
-#define SQL_SO_FORWARD_ONLY 1
-#define SQL_SO_KEYSET_DRIVEN 2
-#define SQL_SO_MIXED 8
-#define SQL_SO_STATIC 16
-#define SQL_SQ_COMPARISON 1
-#define SQL_SQ_CORRELATED_SUBQUERIES 16
-#define SQL_SQ_EXISTS 2
-#define SQL_SQ_IN 4
-#define SQL_SQ_QUANTIFIED 8
-#define SQL_SQLSTATE_SIZE 5
-#define SQL_SS_ADDITIONS 1
-#define SQL_SS_DELETIONS 2
-#define SQL_SS_UPDATES 4
-#define SQL_STATIC_SENSITIVITY 83
-#define SQL_STRING_FUNCTIONS 50
-#define SQL_SUBQUERIES 95
-#define SQL_SYSTEM_FUNCTIONS 51
-#define SQL_TABLE_STAT 0
-#define SQL_TABLE_TERM 45
-#define SQL_TIME 10
-#define SQL_TIMEDATE_ADD_INTERVALS 109
-#define SQL_TIMEDATE_DIFF_INTERVALS 110
-#define SQL_TIMEDATE_FUNCTIONS 52
-#define SQL_TIMESTAMP 11
-#define SQL_TINYINT (-6)
-#define SQL_TRANSLATE_DLL 106
-#define SQL_TRANSLATE_OPTION 107
-#define SQL_TXN_ISOLATION 108
-#define SQL_TXN_VERSIONING 16
-#define SQL_TYPE_NULL 0
-#define SQL_U_UNION 1
-#define SQL_U_UNION_ALL 2
-#define SQL_UB_DEFAULT SQL_UB_OFF
-#define SQL_UB_OFF 0UL
-#define SQL_UB_ON 01UL
-#define SQL_UNION 96
-#define SQL_UNSEARCHABLE 0
-#define SQL_UNSIGNED_OFFSET (-22)
-#define SQL_UPDATE 2 
-#define SQL_USE_BOOKMARKS 12
-#define SQL_VARBINARY (-3)
-#define SQL_POSITION_TO(s,r) SQLSetPos(s,r,SQL_POSITION,SQL_LOCK_NO_CHANGE)
-#define SQL_LOCK_RECORD(s,r,l) SQLSetPos(s,r,SQL_POSITION,l)
-#define SQL_REFRESH_RECORD(s,r,l) SQLSetPos(s,r,SQL_REFRESH,l)
-#define SQL_UPDATE_RECORD(s,r) SQLSetPos(s,r,SQL_UPDATE,SQL_LOCK_NO_CHANGE)
-#define SQL_DELETE_RECORD(s,r) SQLSetPos(s,r,SQL_DELETE,SQL_LOCK_NO_CHANGE)
-#define SQL_ADD_RECORD(s,r) SQLSetPos(s,r,SQL_ADD,SQL_LOCK_NO_CHANGE)
-
-#if (ODBCVER < 0x0300)
-#define SQL_CONNECT_OPT_DRVR_START 1000
-#define SQL_CONN_OPT_MAX SQL_PACKET_SIZE
-#define SQL_CONN_OPT_MIN SQL_ACCESS_MODE
-#define SQL_STMT_OPT_MAX SQL_ROW_NUMBER
-#define SQL_STMT_OPT_MIN SQL_QUERY_TIMEOUT
-#define SQL_TYPE_DRIVER_START SQL_INTERVAL_YEAR
-#define SQL_TYPE_DRIVER_END SQL_UNICODE_LONGVARCHAR
-#define SQL_TYPE_MIN SQL_BIT
-#define SQL_TYPE_MAX SQL_VARCHAR
-#endif
-
-#if (ODBCVER < 0x0300)
-#define SQL_NO_DATA_FOUND 100
-#define SQL_INTERVAL_YEAR (-80)
-#define SQL_INTERVAL_MONTH (-81)
-#define SQL_INTERVAL_YEAR_TO_MONTH (-82)
-#define SQL_INTERVAL_DAY (-83)
-#define SQL_INTERVAL_HOUR (-84)
-#define SQL_INTERVAL_MINUTE (-85)
-#define SQL_INTERVAL_SECOND (-86)
-#define SQL_INTERVAL_DAY_TO_HOUR (-87)
-#define SQL_INTERVAL_DAY_TO_MINUTE (-88)
-#define SQL_INTERVAL_DAY_TO_SECOND (-89)
-#define SQL_INTERVAL_HOUR_TO_MINUTE (-90)
-#define SQL_INTERVAL_HOUR_TO_SECOND (-91)
-#define SQL_INTERVAL_MINUTE_TO_SECOND (-92)
-#else  
-#define SQL_NO_DATA_FOUND SQL_NO_DATA
-#define SQL_CODE_YEAR 1
-#define SQL_CODE_MONTH 2
-#define SQL_CODE_DAY 3
-#define SQL_CODE_HOUR 4
-#define SQL_CODE_MINUTE 5
-#define SQL_CODE_SECOND 6
-#define SQL_CODE_YEAR_TO_MONTH 7
-#define SQL_CODE_DAY_TO_HOUR 8
-#define SQL_CODE_DAY_TO_MINUTE 9
-#define SQL_CODE_DAY_TO_SECOND 10
-#define SQL_CODE_HOUR_TO_MINUTE 11
-#define SQL_CODE_HOUR_TO_SECOND 12
-#define SQL_CODE_MINUTE_TO_SECOND 13
-#define SQL_INTERVAL_YEAR (100 + SQL_CODE_SECOND)
-#define SQL_INTERVAL_MONTH (100 + SQL_CODE_YEAR_TO_MONTH)
-#define SQL_INTERVAL_DAY (100 + SQL_CODE_DAY_TO_HOUR)
-#define SQL_INTERVAL_HOUR (100 + SQL_CODE_DAY_TO_MINUTE)
-#define SQL_INTERVAL_MINUTE (100 + SQL_CODE_DAY_TO_SECOND)
-#define SQL_INTERVAL_SECOND (100 + SQL_CODE_HOUR_TO_MINUTE)
-#define SQL_INTERVAL_YEAR_TO_MONTH (100 + SQL_CODE_HOUR_TO_SECOND)  
-#define SQL_INTERVAL_DAY_TO_HOUR (100 + SQL_CODE_MINUTE_TO_SECOND)
-#define SQL_INTERVAL_DAY_TO_MINUTE (100 + SQL_CODE_DAY_TO_MINUTE)
-#define SQL_INTERVAL_DAY_TO_SECOND (100 + SQL_CODE_DAY_TO_SECOND)
-#define SQL_INTERVAL_HOUR_TO_MINUTE (100 + SQL_CODE_HOUR_TO_MINUTE)
-#define SQL_INTERVAL_HOUR_TO_SECOND (100 + SQL_CODE_HOUR_TO_SECOND)
-#define SQL_INTERVAL_MINUTE_TO_SECOND (100 + SQL_CODE_MINUTE_TO_SECOND)
-#endif
-
-#if (ODBCVER <= 0x0300)
-#define SQL_UNICODE (-95)
-#define SQL_UNICODE_VARCHAR (-96)
-#define SQL_UNICODE_LONGVARCHAR (-97)
-#define SQL_UNICODE_CHAR SQL_UNICODE
-#else
-#define SQL_UNICODE SQL_WCHAR
-#define SQL_UNICODE_VARCHAR SQL_WVARCHAR
-#define SQL_UNICODE_LONGVARCHAR SQL_WLONGVARCHAR
-#define SQL_UNICODE_CHAR SQL_WCHAR
-#endif
-
-#if (ODBCVER >= 0x0201) && (ODBCVER < 0x0300) 
-#define SQL_OJ_CAPABILITIES 65003  
-#endif /* ODBCVER < 0x0300 */
-
-#if (ODBCVER >= 0x0250)
-#define SQL_NO_ACTION 3
-#define SQL_SET_DEFAULT 4
-#endif /* ODBCVER >= 0x0250 */
-
-#if (ODBCVER >= 0x0300)
-#define SQL_ACTIVE_ENVIRONMENTS 116
-#define SQL_AD_ADD_CONSTRAINT_DEFERRABLE 0x00000080L
-#define SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
-#define SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
-#define SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE 0x00000100L
-#define SQL_AD_ADD_DOMAIN_CONSTRAINT 0x00000002L
-#define SQL_AD_ADD_DOMAIN_DEFAULT 0x00000008L
-#define SQL_AD_CONSTRAINT_NAME_DEFINITION 0x00000001L
-#define SQL_AD_DROP_DOMAIN_CONSTRAINT 0x00000004L
-#define SQL_AD_DROP_DOMAIN_DEFAULT 0x00000010L
-#define SQL_AF_ALL 0x00000040L
-#define SQL_AF_AVG 0x00000001L
-#define SQL_AF_COUNT 0x00000002L
-#define SQL_AF_DISTINCT 0x00000020L
-#define SQL_AF_MAX 0x00000004L
-#define SQL_AF_MIN 0x00000008L
-#define SQL_AF_SUM 0x00000010L
-#define SQL_AGGREGATE_FUNCTIONS 169
-#define SQL_ALL_CATALOGS "%"
-#define SQL_ALL_SCHEMAS "%"
-#define SQL_ALL_TABLE_TYPES "%"
-#define SQL_ALTER_DOMAIN 117
-#define SQL_AM_CONNECTION 1
-#define SQL_AM_NONE 0
-#define SQL_AM_STATEMENT 2
-#define SQL_API_ODBC3_ALL_FUNCTIONS 999
-#define SQL_API_ODBC3_ALL_FUNCTIONS_SIZE 250
-#define SQL_API_SQLALLOCHANDLESTD 73
-#define SQL_API_SQLBULKOPERATIONS 24
-#define SQL_ASYNC_MODE 10021
-#define SQL_AT_ADD_COLUMN_COLLATION 0x00000080L
-#define SQL_AT_ADD_COLUMN_DEFAULT 0x00000040L
-#define SQL_AT_ADD_COLUMN_SINGLE 0x00000020L
-#define SQL_AT_ADD_TABLE_CONSTRAINT 0x00001000L
-#define SQL_AT_CONSTRAINT_DEFERRABLE 0x00040000L
-#define SQL_AT_CONSTRAINT_INITIALLY_DEFERRED 0x00010000L
-#define SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00020000L
-#define SQL_AT_CONSTRAINT_NAME_DEFINITION 0x00008000L
-#define SQL_AT_CONSTRAINT_NON_DEFERRABLE 0x00080000L
-#define SQL_AT_DROP_COLUMN_CASCADE 0x00000400L
-#define SQL_AT_DROP_COLUMN_DEFAULT 0x00000200L
-#define SQL_AT_DROP_COLUMN_RESTRICT 0x00000800L
-#define SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE 0x00002000L
-#define SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT 0x00004000L
-#define SQL_AT_SET_COLUMN_DEFAULT 0x00000100L
-#define SQL_ATTR_ACCESS_MODE SQL_ACCESS_MODE
-#define SQL_ATTR_ASYNC_ENABLE 4
-#define SQL_ATTR_AUTOCOMMIT SQL_AUTOCOMMIT
-#define SQL_ATTR_CONCURRENCY SQL_CONCURRENCY
-#define SQL_ATTR_CONNECTION_POOLING 201
-#define SQL_ATTR_CONNECTION_TIMEOUT 113
-#define SQL_ATTR_CP_MATCH 202
-#define SQL_ATTR_CURRENT_CATALOG SQL_CURRENT_QUALIFIER
-#define SQL_ATTR_CURSOR_TYPE SQL_CURSOR_TYPE
-#define SQL_ATTR_DISCONNECT_BEHAVIOR 114
-#define SQL_ATTR_ENABLE_AUTO_IPD 15
-#define SQL_ATTR_ENLIST_IN_DTC 1207
-#define SQL_ATTR_ENLIST_IN_XA 1208
-#define SQL_ATTR_FETCH_BOOKMARK_PTR 16
-#define SQL_ATTR_KEYSET_SIZE SQL_KEYSET_SIZE
-#define SQL_ATTR_LOGIN_TIMEOUT SQL_LOGIN_TIMEOUT
-#define SQL_ATTR_MAX_LENGTH SQL_MAX_LENGTH
-#define SQL_ATTR_MAX_ROWS SQL_MAX_ROWS
-#define SQL_ATTR_NOSCAN SQL_NOSCAN
-#define SQL_ATTR_ODBC_CURSORS SQL_ODBC_CURSORS
-#define SQL_ATTR_ODBC_VERSION 200
-#define SQL_ATTR_PACKET_SIZE SQL_PACKET_SIZE
-#define SQL_ATTR_PARAM_BIND_OFFSET_PTR 17
-#define SQL_ATTR_PARAM_BIND_TYPE 18
-#define SQL_ATTR_PARAM_OPERATION_PTR 19
-#define SQL_ATTR_PARAM_STATUS_PTR 20
-#define SQL_ATTR_PARAMS_PROCESSED_PTR 21
-#define SQL_ATTR_PARAMSET_SIZE 22
-#define SQL_ATTR_QUERY_TIMEOUT SQL_QUERY_TIMEOUT
-#define SQL_ATTR_QUIET_MODE SQL_QUIET_MODE
-#define SQL_ATTR_RETRIEVE_DATA SQL_RETRIEVE_DATA
-#define SQL_ATTR_ROW_ARRAY_SIZE 27
-#define SQL_ATTR_ROW_BIND_OFFSET_PTR 23
-#define SQL_ATTR_ROW_BIND_TYPE SQL_BIND_TYPE
-#define SQL_ATTR_ROW_NUMBER SQL_ROW_NUMBER
-#define SQL_ATTR_ROW_OPERATION_PTR 24
-#define SQL_ATTR_ROW_STATUS_PTR 25
-#define SQL_ATTR_ROWS_FETCHED_PTR 26
-#define SQL_ATTR_SIMULATE_CURSOR SQL_SIMULATE_CURSOR
-#define SQL_ATTR_TRACE SQL_OPT_TRACE
-#define SQL_ATTR_TRACEFILE SQL_OPT_TRACEFILE
-#define SQL_ATTR_TRANSLATE_LIB SQL_TRANSLATE_DLL
-#define SQL_ATTR_TRANSLATE_OPTION SQL_TRANSLATE_OPTION
-#define SQL_ATTR_TXN_ISOLATION SQL_TXN_ISOLATION
-#define SQL_ATTR_USE_BOOKMARKS SQL_USE_BOOKMARKS
-#define SQL_BATCH_ROW_COUNT 120
-#define SQL_BATCH_SUPPORT 121
-#define SQL_BRC_EXPLICIT 0x0000002
-#define SQL_BRC_PROCEDURES 0x0000001
-#define SQL_BRC_ROLLED_UP 0x0000004
-#define SQL_BS_ROW_COUNT_EXPLICIT 0x00000002L
-#define SQL_BS_ROW_COUNT_PROC 0x00000008L
-#define SQL_BS_SELECT_EXPLICIT 0x00000001L
-#define SQL_BS_SELECT_PROC 0x00000004L
-#define SQL_C_INTERVAL_DAY SQL_INTERVAL_DAY
-#define SQL_C_INTERVAL_DAY_TO_HOUR SQL_INTERVAL_DAY_TO_HOUR
-#define SQL_C_INTERVAL_DAY_TO_MINUTE SQL_INTERVAL_DAY_TO_MINUTE
-#define SQL_C_INTERVAL_DAY_TO_SECOND SQL_INTERVAL_DAY_TO_SECOND
-#define SQL_C_INTERVAL_HOUR SQL_INTERVAL_HOUR
-#define SQL_C_INTERVAL_HOUR_TO_MINUTE SQL_INTERVAL_HOUR_TO_MINUTE
-#define SQL_C_INTERVAL_HOUR_TO_SECOND SQL_INTERVAL_HOUR_TO_SECOND
-#define SQL_C_INTERVAL_MINUTE SQL_INTERVAL_MINUTE
-#define SQL_C_INTERVAL_MINUTE_TO_SECOND SQL_INTERVAL_MINUTE_TO_SECOND
-#define SQL_C_INTERVAL_MONTH SQL_INTERVAL_MONTH
-#define SQL_C_INTERVAL_SECOND SQL_INTERVAL_SECOND
-#define SQL_C_INTERVAL_YEAR SQL_INTERVAL_YEAR
-#define SQL_C_INTERVAL_YEAR_TO_MONTH SQL_INTERVAL_YEAR_TO_MONTH
-#define SQL_C_NUMERIC SQL_NUMERIC
-#define SQL_C_SBIGINT (SQL_BIGINT+SQL_SIGNED_OFFSET)
-#define SQL_C_TYPE_DATE SQL_TYPE_DATE
-#define SQL_C_TYPE_TIME SQL_TYPE_TIME
-#define SQL_C_TYPE_TIMESTAMP SQL_TYPE_TIMESTAMP
-#define SQL_C_UBIGINT (SQL_BIGINT+SQL_UNSIGNED_OFFSET)
-#define SQL_C_VARBOOKMARK SQL_C_BINARY
-#define SQL_CA_CONSTRAINT_DEFERRABLE 0x00000040L
-#define SQL_CA_CONSTRAINT_INITIALLY_DEFERRED 0x00000010L
-#define SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000020L
-#define SQL_CA_CONSTRAINT_NON_DEFERRABLE 0x00000080L
-#define SQL_CA_CREATE_ASSERTION 0x00000001L
-#define SQL_CA1_ABSOLUTE 0x00000002L
-#define SQL_CA1_BOOKMARK 0x00000008L
-#define SQL_CA1_BULK_ADD 0x00010000L
-#define SQL_CA1_BULK_DELETE_BY_BOOKMARK 0x00040000L
-#define SQL_CA1_BULK_FETCH_BY_BOOKMARK 0x00080000L
-#define SQL_CA1_BULK_UPDATE_BY_BOOKMARK 0x00020000L
-#define SQL_CA1_LOCK_EXCLUSIVE 0x00000080L
-#define SQL_CA1_LOCK_NO_CHANGE 0x00000040L
-#define SQL_CA1_LOCK_UNLOCK 0x00000100L
-#define SQL_CA1_NEXT 0x00000001L
-#define SQL_CA1_POS_DELETE 0x00000800L
-#define SQL_CA1_POS_POSITION 0x00000200L
-#define SQL_CA1_POS_REFRESH 0x00001000L
-#define SQL_CA1_POS_UPDATE 0x00000400L
-#define SQL_CA1_POSITIONED_DELETE 0x00004000L
-#define SQL_CA1_POSITIONED_UPDATE 0x00002000L
-#define SQL_CA1_RELATIVE 0x00000004L
-#define SQL_CA1_SELECT_FOR_UPDATE 0x00008000L
-#define SQL_CA2_CRC_APPROXIMATE 0x00002000L
-#define SQL_CA2_CRC_EXACT 0x00001000L
-#define SQL_CA2_LOCK_CONCURRENCY 0x00000002L
-#define SQL_CA2_MAX_ROWS_AFFECTS_ALL (SQL_CA2_MAX_ROWS_SELECT | SQL_CA2_MAX_ROWS_INSERT | \
-    SQL_CA2_MAX_ROWS_DELETE | SQL_CA2_MAX_ROWS_UPDATE | SQL_CA2_MAX_ROWS_CATALOG)
-#define SQL_CA2_MAX_ROWS_CATALOG 0x00000800L
-#define SQL_CA2_MAX_ROWS_DELETE 0x00000200L
-#define SQL_CA2_MAX_ROWS_INSERT 0x00000100L
-#define SQL_CA2_MAX_ROWS_SELECT 0x00000080L
-#define SQL_CA2_MAX_ROWS_UPDATE 0x00000400L
-#define SQL_CA2_OPT_ROWVER_CONCURRENCY 0x00000004L
-#define SQL_CA2_OPT_VALUES_CONCURRENCY 0x00000008L
-#define SQL_CA2_READ_ONLY_CONCURRENCY 0x00000001L
-#define SQL_CA2_SENSITIVITY_ADDITIONS 0x00000010L
-#define SQL_CA2_SENSITIVITY_DELETIONS 0x00000020L
-#define SQL_CA2_SENSITIVITY_UPDATES 0x00000040L
-#define SQL_CA2_SIMULATE_NON_UNIQUE 0x00004000L
-#define SQL_CA2_SIMULATE_TRY_UNIQUE 0x00008000L
-#define SQL_CA2_SIMULATE_UNIQUE 0x00010000L
-#define SQL_CATALOG_LOCATION SQL_QUALIFIER_LOCATION
-#define SQL_CATALOG_NAME_SEPARATOR SQL_QUALIFIER_NAME_SEPARATOR
-#define SQL_CATALOG_TERM SQL_QUALIFIER_TERM
-#define SQL_CATALOG_USAGE SQL_QUALIFIER_USAGE
-#define SQL_CCOL_CREATE_COLLATION 0x00000001L
-#define SQL_CCS_COLLATE_CLAUSE 0x00000002L
-#define SQL_CCS_CREATE_CHARACTER_SET 0x00000001L
-#define SQL_CCS_LIMITED_COLLATION 0x00000004L
-#define SQL_CDO_COLLATION 0x00000008L
-#define SQL_CDO_CONSTRAINT 0x00000004L
-#define SQL_CDO_CONSTRAINT_DEFERRABLE 0x00000080L
-#define SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
-#define SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
-#define SQL_CDO_CONSTRAINT_NAME_DEFINITION 0x00000010L
-#define SQL_CDO_CONSTRAINT_NON_DEFERRABLE 0x00000100L
-#define SQL_CDO_CREATE_DOMAIN 0x00000001L
-#define SQL_CDO_DEFAULT 0x00000002L
-#define SQL_CL_END SQL_QL_END
-#define SQL_CL_START SQL_QL_START
-#define SQL_COL_PRED_BASIC SQL_ALL_EXCEPT_LIKE
-#define SQL_COL_PRED_CHAR SQL_LIKE_ONLY
-#define SQL_COLUMN_DRIVER_START 1000
-#define SQL_COLUMN_IGNORE SQL_IGNORE
-#define SQL_COLUMN_NUMBER_UNKNOWN (-2)
-#define SQL_CONVERT_GUID 173
-#define SQL_CONVERT_INTERVAL_DAY_TIME 123
-#define SQL_CONVERT_INTERVAL_YEAR_MONTH 124
-#define SQL_CONVERT_WCHAR 122
-#define SQL_CONVERT_WLONGVARCHAR 125
-#define SQL_CONVERT_WVARCHAR 126
-#define SQL_CP_DEFAULT SQL_CP_OFF
-#define SQL_CP_MATCH_DEFAULT SQL_CP_STRICT_MATCH
-#define SQL_CP_OFF 0UL
-#define SQL_CP_ONE_PER_DRIVER 1UL
-#define SQL_CP_ONE_PER_HENV 2UL
-#define SQL_CP_RELAXED_MATCH 1UL
-#define SQL_CP_STRICT_MATCH 0UL
-#define SQL_CREATE_ASSERTION 127
-#define SQL_CREATE_CHARACTER_SET 128
-#define SQL_CREATE_COLLATION 129
-#define SQL_CREATE_DOMAIN 130
-#define SQL_CREATE_SCHEMA 131
-#define SQL_CREATE_TABLE 132
-#define SQL_CREATE_TRANSLATION 133
-#define SQL_CREATE_VIEW 134
-#define SQL_CS_AUTHORIZATION 0x00000002L
-#define SQL_CS_CREATE_SCHEMA 0x00000001L
-#define SQL_CS_DEFAULT_CHARACTER_SET 0x00000004L
-#define SQL_CT_COLUMN_COLLATION 0x00000800L
-#define SQL_CT_COLUMN_CONSTRAINT 0x00000200L
-#define SQL_CT_COLUMN_DEFAULT 0x00000400L
-#define SQL_CT_COMMIT_DELETE 0x00000004L
-#define SQL_CT_COMMIT_PRESERVE 0x00000002L
-#define SQL_CT_CONSTRAINT_DEFERRABLE 0x00000080L
-#define SQL_CT_CONSTRAINT_INITIALLY_DEFERRED 0x00000020L
-#define SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE 0x00000040L
-#define SQL_CT_CONSTRAINT_NAME_DEFINITION 0x00002000L
-#define SQL_CT_CONSTRAINT_NON_DEFERRABLE 0x00000100L
-#define SQL_CT_CREATE_TABLE 0x00000001L
-#define SQL_CT_GLOBAL_TEMPORARY 0x00000008L
-#define SQL_CT_LOCAL_TEMPORARY 0x00000010L
-#define SQL_CT_TABLE_CONSTRAINT 0x00001000L
-#define SQL_CTR_CREATE_TRANSLATION 0x00000001L
-#define SQL_CU_DML_STATEMENTS SQL_QU_DML_STATEMENTS
-#define SQL_CU_INDEX_DEFINITION SQL_QU_INDEX_DEFINITION
-#define SQL_CU_PRIVILEGE_DEFINITION SQL_QU_PRIVILEGE_DEFINITION
-#define SQL_CU_PROCEDURE_INVOCATION SQL_QU_PROCEDURE_INVOCATION
-#define SQL_CU_TABLE_DEFINITION SQL_QU_TABLE_DEFINITION
-#define	SQL_CVT_GUID 0x1000000L
-#define SQL_CVT_INTERVAL_DAY_TIME 0x00100000L
-#define SQL_CVT_INTERVAL_YEAR_MONTH 0x00080000L
-#define SQL_CVT_WCHAR 0x00200000L
-#define SQL_CVT_WLONGVARCHAR 0x00400000L
-#define SQL_CVT_WVARCHAR 0x00800000L
-#define SQL_DA_DROP_ASSERTION 0x00000001L
-#define SQL_DATETIME_LITERALS 119
-#define SQL_DB_DEFAULT SQL_DB_RETURN_TO_POOL
-#define SQL_DB_DISCONNECT 1UL
-#define SQL_DB_RETURN_TO_POOL 0UL
-#define SQL_DC_DROP_COLLATION 0x00000001L
-#define SQL_DCS_DROP_CHARACTER_SET 0x00000001L
-#define SQL_DD_CASCADE 0x00000004L
-#define SQL_DD_DROP_DOMAIN 0x00000001L
-#define SQL_DD_RESTRICT 0x00000002L
-#define SQL_DDL_INDEX 170
-#define SQL_DELETE_BY_BOOKMARK 6
-#define SQL_DESC_ARRAY_SIZE 20
-#define SQL_DESC_ARRAY_STATUS_PTR 21
-#define SQL_DESC_AUTO_UNIQUE_VALUE SQL_COLUMN_AUTO_INCREMENT
-#define SQL_DESC_BASE_COLUMN_NAME 22
-#define SQL_DESC_BASE_TABLE_NAME 23
-#define SQL_DESC_BIND_OFFSET_PTR 24
-#define SQL_DESC_BIND_TYPE 25
-#define SQL_DESC_CASE_SENSITIVE SQL_COLUMN_CASE_SENSITIVE
-#define SQL_DESC_CATALOG_NAME SQL_COLUMN_QUALIFIER_NAME
-#define SQL_DESC_CONCISE_TYPE SQL_COLUMN_TYPE
-#define SQL_DESC_DATETIME_INTERVAL_PRECISION 26
-#define SQL_DESC_DISPLAY_SIZE SQL_COLUMN_DISPLAY_SIZE
-#define SQL_DESC_FIXED_PREC_SCALE SQL_COLUMN_MONEY
-#define SQL_DESC_LABEL SQL_COLUMN_LABEL
-#define SQL_DESC_LITERAL_PREFIX 27
-#define SQL_DESC_LITERAL_SUFFIX 28
-#define SQL_DESC_LOCAL_TYPE_NAME 29
-#define SQL_DESC_MAXIMUM_SCALE 30
-#define SQL_DESC_MINIMUM_SCALE 31
-#define SQL_DESC_NUM_PREC_RADIX 32
-#define SQL_DESC_PARAMETER_TYPE 33
-#define SQL_DESC_ROWS_PROCESSED_PTR 34
-#define SQL_DESC_SCHEMA_NAME SQL_COLUMN_OWNER_NAME
-#define SQL_DESC_SEARCHABLE SQL_COLUMN_SEARCHABLE
-#define SQL_DESC_TABLE_NAME SQL_COLUMN_TABLE_NAME
-#define SQL_DESC_TYPE_NAME SQL_COLUMN_TYPE_NAME
-#define SQL_DESC_UNSIGNED SQL_COLUMN_UNSIGNED
-#define SQL_DESC_UPDATABLE SQL_COLUMN_UPDATABLE
-#define SQL_DI_CREATE_INDEX 0x00000001L
-#define SQL_DI_DROP_INDEX 0x00000002L
-#define SQL_DIAG_COLUMN_NUMBER (-1247)
-#define SQL_DIAG_CURSOR_ROW_COUNT (-1249)
-#define SQL_DIAG_ROW_NUMBER (-1248)
-#define SQL_DL_SQL92_DATE 0x00000001L
-#define SQL_DL_SQL92_INTERVAL_DAY 0x00000020L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR 0x00000400L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE 0x00000800L
-#define SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND 0x00001000L
-#define SQL_DL_SQL92_INTERVAL_HOUR 0x00000040L
-#define SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE 0x00002000L
-#define SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND 0x00004000L
-#define SQL_DL_SQL92_INTERVAL_MINUTE 0x00000080L
-#define SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND 0x00008000L
-#define SQL_DL_SQL92_INTERVAL_MONTH 0x00000010L
-#define SQL_DL_SQL92_INTERVAL_SECOND 0x00000100L
-#define SQL_DL_SQL92_INTERVAL_YEAR 0x00000008L
-#define SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH 0x00000200L
-#define SQL_DL_SQL92_TIME 0x00000002L
-#define SQL_DL_SQL92_TIMESTAMP 0x00000004L
-#define SQL_DM_VER 171
-#define SQL_DRIVER_HDESC 135
-#define SQL_DROP_ASSERTION 136
-#define SQL_DROP_CHARACTER_SET 137
-#define SQL_DROP_COLLATION 138
-#define SQL_DROP_DOMAIN 139
-#define SQL_DROP_SCHEMA 140
-#define SQL_DROP_TABLE 141
-#define SQL_DROP_TRANSLATION 142
-#define SQL_DROP_VIEW 143
-#define SQL_DS_CASCADE 0x00000004L
-#define SQL_DS_DROP_SCHEMA 0x00000001L
-#define SQL_DS_RESTRICT 0x00000002L
-#define SQL_DT_CASCADE 0x00000004L
-#define SQL_DT_DROP_TABLE 0x00000001L
-#define SQL_DT_RESTRICT 0x00000002L
-#define SQL_DTC_DONE 0L
-#define SQL_DTR_DROP_TRANSLATION 0x00000001L
-#define SQL_DV_CASCADE 0x00000004L
-#define SQL_DV_DROP_VIEW 0x00000001L
-#define SQL_DV_RESTRICT 0x00000002L
-#define SQL_DYNAMIC_CURSOR_ATTRIBUTES1 144
-#define SQL_DYNAMIC_CURSOR_ATTRIBUTES2 145
-#define SQL_EXT_API_LAST SQL_API_SQLBINDPARAMETER
-#define SQL_EXT_API_START 40
-#define SQL_FETCH_BY_BOOKMARK 7
-#define SQL_FETCH_FIRST_SYSTEM 32
-#define SQL_FETCH_FIRST_USER 31  
-#define SQL_FN_CVT_CAST 0x00000002L
-#define SQL_FN_STR_BIT_LENGTH 0x00080000L
-#define SQL_FN_STR_CHAR_LENGTH 0x00100000L
-#define SQL_FN_STR_CHARACTER_LENGTH 0x00200000L
-#define SQL_FN_STR_OCTET_LENGTH 0x00400000L
-#define SQL_FN_STR_POSITION 0x00800000L
-#define SQL_FN_TD_CURRENT_DATE 0x00020000L
-#define SQL_FN_TD_CURRENT_TIME 0x00040000L
-#define SQL_FN_TD_CURRENT_TIMESTAMP 0x00080000L
-#define SQL_FN_TD_EXTRACT 0x00100000L
-#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1 146
-#define SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 147
-#define SQL_FUNC_EXISTS(exists, api) \
-   ((*(((UWORD*) (exists)) + ((api) >> 4)) & (1 << ((api) & 15)) ) ? \
-   SQL_TRUE : SQL_FALSE )
-#define SQL_GB_COLLATE 0x0004
-#define SQL_HANDLE_SENV 5
-#define SQL_IK_ALL (SQL_IK_ASC | SQL_IK_DESC)
-#define SQL_IK_ASC 1
-#define SQL_IK_DESC 2
-#define SQL_IK_NONE 0
-#define SQL_INDEX_KEYWORDS 148
-#define SQL_INFO_DRIVER_START 1000
-#define SQL_INFO_LAST SQL_QUALIFIER_LOCATION
-#define SQL_INFO_SCHEMA_VIEWS 149
-#define SQL_INITIALLY_DEFERRED 5
-#define SQL_INITIALLY_IMMEDIATE 6
-#define SQL_INSERT_STATEMENT 172
-#define SQL_INTERVAL 10
-#define SQL_IS_INSERT_LITERALS 0x00000001L
-#define SQL_IS_INSERT_SEARCHED 0x00000002L
-#define SQL_IS_INTEGER (-6)
-#define SQL_IS_POINTER (-4)
-#define SQL_IS_SELECT_INTO 0x00000004L
-#define SQL_IS_SMALLINT (-8)
-#define SQL_IS_UINTEGER (-5)
-#define SQL_IS_USMALLINT (-7)
-#define SQL_ISV_ASSERTIONS 0x00000001L
-#define SQL_ISV_CHARACTER_SETS 0x00000002L
-#define SQL_ISV_CHECK_CONSTRAINTS 0x00000004L
-#define SQL_ISV_COLLATIONS 0x00000008L
-#define SQL_ISV_COLUMN_DOMAIN_USAGE 0x00000010L
-#define SQL_ISV_COLUMN_PRIVILEGES 0x00000020L
-#define SQL_ISV_COLUMNS 0x00000040L
-#define SQL_ISV_CONSTRAINT_COLUMN_USAGE 0x00000080L
-#define SQL_ISV_CONSTRAINT_TABLE_USAGE 0x00000100L
-#define SQL_ISV_DOMAIN_CONSTRAINTS 0x00000200L
-#define SQL_ISV_DOMAINS 0x00000400L
-#define SQL_ISV_KEY_COLUMN_USAGE 0x00000800L
-#define SQL_ISV_REFERENTIAL_CONSTRAINTS 0x00001000L
-#define SQL_ISV_SCHEMATA 0x00002000L
-#define SQL_ISV_SQL_LANGUAGES 0x00004000L
-#define SQL_ISV_TABLE_CONSTRAINTS 0x00008000L
-#define SQL_ISV_TABLE_PRIVILEGES 0x00010000L
-#define SQL_ISV_TABLES 0x00020000L
-#define SQL_ISV_TRANSLATIONS 0x00040000L
-#define SQL_ISV_USAGE_PRIVILEGES 0x00080000L
-#define SQL_ISV_VIEW_COLUMN_USAGE 0x00100000L
-#define SQL_ISV_VIEW_TABLE_USAGE 0x00200000L
-#define SQL_ISV_VIEWS 0x00400000L
-#define SQL_KEYSET_CURSOR_ATTRIBUTES1 150
-#define SQL_KEYSET_CURSOR_ATTRIBUTES2 151
-#define SQL_MAX_ASYNC_CONCURRENT_STATEMENTS 10022
-#define SQL_NO_COLUMN_NUMBER (-1)
-#define SQL_NO_ROW_NUMBER (-1)
-#define SQL_NOT_DEFERRABLE 7
-#define SQL_NUM_EXTENSIONS (SQL_EXT_API_LAST-SQL_EXT_API_START+1)
-#define SQL_NUM_FUNCTIONS 23
-#define SQL_ODBC_INTERFACE_CONFORMANCE 152
-#define SQL_OIC_CORE 1UL
-#define SQL_OIC_LEVEL1 2UL
-#define SQL_OIC_LEVEL2 3UL
-#define SQL_OV_ODBC2 2UL
-#define SQL_OV_ODBC3 3UL
-#define SQL_PARAM_ARRAY_ROW_COUNTS 153
-#define SQL_PARAM_ARRAY_SELECTS 154
-#define SQL_PARAM_BIND_BY_COLUMN 0UL
-#define SQL_PARAM_BIND_TYPE_DEFAULT SQL_PARAM_BIND_BY_COLUMN
-#define SQL_PARAM_DIAG_UNAVAILABLE 1
-#define SQL_PARAM_ERROR 5
-#define SQL_PARAM_IGNORE 1
-#define SQL_PARAM_PROCEED 0
-#define SQL_PARAM_SUCCESS 0
-#define SQL_PARAM_SUCCESS_WITH_INFO 6
-#define SQL_PARAM_UNUSED 7
-#define SQL_PARC_BATCH 1
-#define SQL_PARC_NO_BATCH 2
-#define SQL_PAS_BATCH 1
-#define SQL_PAS_NO_BATCH 2
-#define SQL_PAS_NO_SELECT 3
-#define SQL_ROW_IGNORE 1
-#define SQL_ROW_NUMBER_UNKNOWN (-2)
-#define SQL_ROW_PROCEED 0
-#define SQL_ROW_SUCCESS_WITH_INFO 6
-#define SQL_SC_FIPS127_2_TRANSITIONAL 0x00000002L
-#define SQL_SC_SQL92_ENTRY 0x00000001L
-#define SQL_SC_SQL92_FULL 0x00000008L
-#define SQL_SC_SQL92_INTERMEDIATE 0x00000004L
-#define SQL_SCC_ISO92_CLI 0x00000002L
-#define SQL_SCC_XOPEN_CLI_VERSION1 0x00000001L
-#define SQL_SCHEMA_TERM SQL_OWNER_TERM
-#define SQL_SCHEMA_USAGE SQL_OWNER_USAGE
-#define SQL_SDF_CURRENT_DATE 0x00000001L
-#define SQL_SDF_CURRENT_TIME 0x00000002L
-#define SQL_SDF_CURRENT_TIMESTAMP 0x00000004L
-#define SQL_SFKD_CASCADE 0x00000001L
-#define SQL_SFKD_NO_ACTION 0x00000002L
-#define SQL_SFKD_SET_DEFAULT 0x00000004L
-#define SQL_SFKD_SET_NULL 0x00000008L
-#define SQL_SFKU_CASCADE 0x00000001L
-#define SQL_SFKU_NO_ACTION 0x00000002L
-#define SQL_SFKU_SET_DEFAULT 0x00000004L
-#define SQL_SFKU_SET_NULL 0x00000008L
-#define SQL_SG_DELETE_TABLE 0x00000020L
-#define SQL_SG_INSERT_COLUMN 0x00000080L
-#define SQL_SG_INSERT_TABLE 0x00000040L
-#define SQL_SG_REFERENCES_COLUMN 0x00000200L
-#define SQL_SG_REFERENCES_TABLE 0x00000100L
-#define SQL_SG_SELECT_TABLE 0x00000400L
-#define SQL_SG_UPDATE_COLUMN 0x00001000L
-#define SQL_SG_UPDATE_TABLE 0x00000800L
-#define SQL_SG_USAGE_ON_CHARACTER_SET 0x00000002L
-#define SQL_SG_USAGE_ON_COLLATION 0x00000004L
-#define SQL_SG_USAGE_ON_DOMAIN 0x00000001L
-#define SQL_SG_USAGE_ON_TRANSLATION 0x00000008L
-#define SQL_SG_WITH_GRANT_OPTION 0x00000010L
-#define SQL_SNVF_BIT_LENGTH 0x00000001L
-#define SQL_SNVF_CHAR_LENGTH 0x00000002L
-#define SQL_SNVF_CHARACTER_LENGTH 0x00000004L
-#define SQL_SNVF_EXTRACT 0x00000008L
-#define SQL_SNVF_OCTET_LENGTH 0x00000010L
-#define SQL_SNVF_POSITION 0x00000020L
-#define SQL_SP_BETWEEN 0x00000800L
-#define SQL_SP_COMPARISON 0x00001000L
-#define SQL_SP_EXISTS 0x00000001L
-#define SQL_SP_IN 0x00000400L
-#define SQL_SP_ISNOTNULL 0x00000002L
-#define SQL_SP_ISNULL 0x00000004L
-#define SQL_SP_LIKE 0x00000200L
-#define SQL_SP_MATCH_FULL 0x00000008L
-#define SQL_SP_MATCH_PARTIAL 0x00000010L
-#define SQL_SP_MATCH_UNIQUE_FULL 0x00000020L
-#define SQL_SP_MATCH_UNIQUE_PARTIAL 0x00000040L
-#define SQL_SP_OVERLAPS 0x00000080L
-#define SQL_SP_QUANTIFIED_COMPARISON 0x00002000L
-#define SQL_SP_UNIQUE 0x00000100L
-#define SQL_SQL_CONFORMANCE 118
-#define SQL_SQL92_DATETIME_FUNCTIONS 155
-#define SQL_SQL92_FOREIGN_KEY_DELETE_RULE 156
-#define SQL_SQL92_FOREIGN_KEY_UPDATE_RULE 157
-#define SQL_SQL92_GRANT 158
-#define SQL_SQL92_NUMERIC_VALUE_FUNCTIONS 159
-#define SQL_SQL92_PREDICATES 160
-#define SQL_SQL92_RELATIONAL_JOIN_OPERATORS 161
-#define SQL_SQL92_REVOKE 162
-#define SQL_SQL92_ROW_VALUE_CONSTRUCTOR 163
-#define SQL_SQL92_STRING_FUNCTIONS 164
-#define SQL_SQL92_VALUE_EXPRESSIONS 165
-#define SQL_SR_CASCADE 0x00000020L
-#define SQL_SR_DELETE_TABLE 0x00000080L
-#define SQL_SR_GRANT_OPTION_FOR 0x00000010L
-#define SQL_SR_INSERT_COLUMN 0x00000200L
-#define SQL_SR_INSERT_TABLE 0x00000100L
-#define SQL_SR_REFERENCES_COLUMN 0x00000800L
-#define SQL_SR_REFERENCES_TABLE 0x00000400L
-#define SQL_SR_RESTRICT 0x00000040L
-#define SQL_SR_SELECT_TABLE 0x00001000L
-#define SQL_SR_UPDATE_COLUMN 0x00004000L
-#define SQL_SR_UPDATE_TABLE 0x00002000L
-#define SQL_SR_USAGE_ON_CHARACTER_SET 0x00000002L
-#define SQL_SR_USAGE_ON_COLLATION 0x00000004L
-#define SQL_SR_USAGE_ON_DOMAIN 0x00000001L
-#define SQL_SR_USAGE_ON_TRANSLATION 0x00000008L
-#define SQL_SRJO_CORRESPONDING_CLAUSE 0x00000001L
-#define SQL_SRJO_CROSS_JOIN 0x00000002L
-#define SQL_SRJO_EXCEPT_JOIN 0x00000004L
-#define SQL_SRJO_FULL_OUTER_JOIN 0x00000008L
-#define SQL_SRJO_INNER_JOIN 0x00000010L
-#define SQL_SRJO_INTERSECT_JOIN 0x00000020L
-#define SQL_SRJO_LEFT_OUTER_JOIN 0x00000040L
-#define SQL_SRJO_NATURAL_JOIN 0x00000080L
-#define SQL_SRJO_RIGHT_OUTER_JOIN 0x00000100L
-#define SQL_SRJO_UNION_JOIN 0x00000200L
-#define SQL_SRVC_DEFAULT 0x00000004L
-#define SQL_SRVC_NULL 0x00000002L
-#define SQL_SRVC_ROW_SUBQUERY 0x00000008L
-#define SQL_SRVC_VALUE_EXPRESSION 0x00000001L
-#define SQL_SSF_CONVERT 0x00000001L
-#define SQL_SSF_LOWER 0x00000002L
-#define SQL_SSF_SUBSTRING 0x00000008L
-#define SQL_SSF_TRANSLATE 0x00000010L
-#define SQL_SSF_TRIM_BOTH 0x00000020L
-#define SQL_SSF_TRIM_LEADING 0x00000040L
-#define SQL_SSF_TRIM_TRAILING 0x00000080L
-#define SQL_SSF_UPPER 0x00000004L
-#define SQL_STANDARD_CLI_CONFORMANCE 166
-#define SQL_STATIC_CURSOR_ATTRIBUTES1 167
-#define SQL_STATIC_CURSOR_ATTRIBUTES2 168
-#define SQL_SU_DML_STATEMENTS SQL_OU_DML_STATEMENTS
-#define SQL_SU_INDEX_DEFINITION SQL_OU_INDEX_DEFINITION
-#define SQL_SU_PRIVILEGE_DEFINITION SQL_OU_PRIVILEGE_DEFINITION
-#define SQL_SU_PROCEDURE_INVOCATION SQL_OU_PROCEDURE_INVOCATION
-#define SQL_SU_TABLE_DEFINITION SQL_OU_TABLE_DEFINITION
-#define SQL_SVE_CASE 0x00000001L
-#define SQL_SVE_CAST 0x00000002L
-#define SQL_SVE_COALESCE 0x00000004L
-#define SQL_SVE_NULLIF 0x00000008L
-#define SQL_UB_FIXED SQL_UB_ON
-#define SQL_UB_VARIABLE 2UL
-#define SQL_UNION_STATEMENT SQL_UNION
-#define SQL_UPDATE_BY_BOOKMARK 5
-#define SQL_US_UNION SQL_U_UNION
-#define SQL_US_UNION_ALL SQL_U_UNION_ALL
-#endif /* ODBCVER >= 0x300 */
-#if (ODBCVER >= 0x0350)
-#define SQL_DESC_ROWVER 35
-#define SQL_GUID (-11)
-#define SQL_C_GUID SQL_GUID
-#ifdef ODBC_STD
-#define SQLAllocHandle SQLAllocHandleStd
-#define SQLAllocEnv(p) SQLAllocHandleStd(SQL_HANDLE_ENV,SQL_NULL_HANDLE,p)
-#define SQL_YEAR SQL_CODE_YEAR
-#define SQL_MONTH SQL_CODE_MONTH
-#define SQL_DAY SQL_CODE_DAY
-#define SQL_HOUR SQL_CODE_HOUR
-#define SQL_MINUTE SQL_CODE_MINUTE
-#define SQL_SECOND SQL_CODE_SECOND
-#define SQL_YEAR_TO_MONTH SQL_CODE_YEAR_TO_MONTH
-#define SQL_DAY_TO_HOUR SQL_CODE_DAY_TO_HOUR
-#define SQL_DAY_TO_MINUTE SQL_CODE_DAY_TO_MINUTE
-#define SQL_DAY_TO_SECOND SQL_CODE_DAY_TO_SECOND
-#define SQL_HOUR_TO_MINUTE SQL_CODE_HOUR_TO_MINUTE
-#define SQL_HOUR_TO_SECOND SQL_CODE_HOUR_TO_SECOND
-#define SQL_MINUTE_TO_SECOND SQL_CODE_MINUTE_TO_SECOND
-#endif /* ODBC_STD */
-#endif /* ODBCVER >= 0x0350 */
-#if (ODBCVER >= 0x0351)
-#define SQL_ATTR_ANSI_APP 115
-#define SQL_AA_TRUE 1L
-#define SQL_AA_FALSE 0L
-#endif
-
-#define	TRACE_VERSION 1000
-#define TRACE_ON 1
-
-#ifndef RC_INVOKED
-#define SQL_ODBC_KEYWORDS \
-"ABSOLUTE,ACTION,ADA,ADD,ALL,ALLOCATE,ALTER,AND,ANY,ARE,AS,"\
-"ASC,ASSERTION,AT,AUTHORIZATION,AVG,"\
-"BEGIN,BETWEEN,BIT,BIT_LENGTH,BOTH,BY,CASCADE,CASCADED,CASE,CAST,CATALOG,"\
-"CHAR,CHAR_LENGTH,CHARACTER,CHARACTER_LENGTH,CHECK,CLOSE,COALESCE,"\
-"COLLATE,COLLATION,COLUMN,COMMIT,CONNECT,CONNECTION,CONSTRAINT,"\
-"CONSTRAINTS,CONTINUE,CONVERT,CORRESPONDING,COUNT,CREATE,CROSS,CURRENT,"\
-"CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURRENT_USER,CURSOR,"\
-"DATE,DAY,DEALLOCATE,DEC,DECIMAL,DECLARE,DEFAULT,DEFERRABLE,"\
-"DEFERRED,DELETE,DESC,DESCRIBE,DESCRIPTOR,DIAGNOSTICS,DISCONNECT,"\
-"DISTINCT,DOMAIN,DOUBLE,DROP,"\
-"ELSE,END,END-EXEC,ESCAPE,EXCEPT,EXCEPTION,EXEC,EXECUTE,"\
-"EXISTS,EXTERNAL,EXTRACT,"\
-"FALSE,FETCH,FIRST,FLOAT,FOR,FOREIGN,FORTRAN,FOUND,FROM,FULL,"\
-"GET,GLOBAL,GO,GOTO,GRANT,GROUP,HAVING,HOUR,"\
-"IDENTITY,IMMEDIATE,IN,INCLUDE,INDEX,INDICATOR,INITIALLY,INNER,"\
-"INPUT,INSENSITIVE,INSERT,INT,INTEGER,INTERSECT,INTERVAL,INTO,IS,ISOLATION,"\
-"JOIN,KEY,LANGUAGE,LAST,LEADING,LEFT,LEVEL,LIKE,LOCAL,LOWER,"\
-"MATCH,MAX,MIN,MINUTE,MODULE,MONTH,"\
-"NAMES,NATIONAL,NATURAL,NCHAR,NEXT,NO,NONE,NOT,NULL,NULLIF,NUMERIC,"\
-"OCTET_LENGTH,OF,ON,ONLY,OPEN,OPTION,OR,ORDER,OUTER,OUTPUT,OVERLAPS,"\
-"PAD,PARTIAL,PASCAL,PLI,POSITION,PRECISION,PREPARE,PRESERVE,"\
-"PRIMARY,PRIOR,PRIVILEGES,PROCEDURE,PUBLIC,"\
-"READ,REAL,REFERENCES,RELATIVE,RESTRICT,REVOKE,RIGHT,ROLLBACK,ROWS"\
-"SCHEMA,SCROLL,SECOND,SECTION,SELECT,SESSION,SESSION_USER,SET,SIZE,"\
-"SMALLINT,SOME,SPACE,SQL,SQLCA,SQLCODE,SQLERROR,SQLSTATE,SQLWARNING,"\
-"SUBSTRING,SUM,SYSTEM_USER,"\
-"TABLE,TEMPORARY,THEN,TIME,TIMESTAMP,TIMEZONE_HOUR,TIMEZONE_MINUTE,"\
-"TO,TRAILING,TRANSACTION,TRANSLATE,TRANSLATION,TRIM,TRUE,"\
-"UNION,UNIQUE,UNKNOWN,UPDATE,UPPER,USAGE,USER,USING,"\
-"VALUE,VALUES,VARCHAR,VARYING,VIEW,WHEN,WHENEVER,WHERE,WITH,WORK,WRITE,"\
-"YEAR,ZONE"
-
-SQLRETURN SQL_API SQLDriverConnect(SQLHDBC,SQLHWND,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLUSMALLINT);
-SQLRETURN SQL_API SQLBrowseConnect(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLColumnPrivileges(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLColAttributes(SQLHSTMT,SQLUSMALLINT, SQLUSMALLINT, SQLPOINTER, SQLSMALLINT, SQLSMALLINT*, SQLLEN*);
-SQLRETURN SQL_API SQLDescribeParam(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*);
-SQLRETURN SQL_API SQLExtendedFetch(SQLHSTMT,SQLUSMALLINT,SQLINTEGER,SQLUINTEGER*,SQLUSMALLINT*);
-SQLRETURN SQL_API SQLForeignKeys(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLMoreResults(SQLHSTMT);
-SQLRETURN SQL_API SQLNativeSql(SQLHDBC,SQLCHAR*,SQLINTEGER,SQLCHAR*,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLNumParams(SQLHSTMT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLParamOptions(SQLHSTMT,SQLUINTEGER,SQLUINTEGER*);
-SQLRETURN SQL_API SQLPrimaryKeys(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLProcedureColumns(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLProcedures(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLSetPos(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLUSMALLINT);
-SQLRETURN SQL_API SQLTablePrivileges(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLDrivers(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLBindParameter(SQLHSTMT,SQLUSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLSMALLINT,SQLULEN,SQLSMALLINT,SQLPOINTER,SQLLEN,SQLLEN*);
-SQLRETURN SQL_API SQLSetScrollOptions(SQLHSTMT,SQLUSMALLINT,SQLLEN,SQLUSMALLINT); /* deprecated */
-DWORD SQL_API ODBCGetTryWaitValue(void);
-BOOL SQL_API ODBCSetTryWaitValue(DWORD);
-RETCODE	SQL_API TraceOpenLogFile(LPWSTR,LPWSTR,DWORD);
-RETCODE	SQL_API TraceCloseLogFile(void);
-VOID SQL_API TraceReturn(RETCODE,RETCODE);
-DWORD SQL_API TraceVersion(void);
-#if (ODBCVER >= 0x0300)
-SQLRETURN SQL_API SQLBulkOperations(SQLHSTMT,SQLSMALLINT);
-SQLRETURN SQL_API SQLAllocHandleStd( SQLSMALLINT,SQLHANDLE,SQLHANDLE*);
-#endif
-#endif /* ndef RC_INVOKED */
-#include <sqlucode.h>
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/sqltypes.h b/winsup/w32api/include/sqltypes.h
deleted file mode 100644
index fcc713550..000000000
--- a/winsup/w32api/include/sqltypes.h
+++ /dev/null
@@ -1,165 +0,0 @@
-#ifndef _SQLTYPES_H
-#define _SQLTYPES_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define SQL_API __stdcall
-#ifndef RC_INVOKED
-#define __need_wchar_t
-#include <stddef.h>
-typedef signed char SCHAR;
-typedef long SDWORD;
-typedef short SWORD;
-typedef ULONG UDWORD;
-typedef USHORT UWORD;
-typedef signed long SLONG;
-typedef signed short SSHORT;
-typedef double SDOUBLE;
-typedef double LDOUBLE;
-typedef float SFLOAT;
-typedef PVOID PTR;
-typedef PVOID HENV;
-typedef PVOID HDBC;
-typedef PVOID HSTMT;
-typedef short RETCODE;
-typedef UCHAR SQLCHAR;
-typedef SCHAR SQLSCHAR;
-typedef SDWORD SQLINTEGER;
-typedef SWORD SQLSMALLINT;
-#ifndef __WIN64
-typedef UDWORD SQLUINTEGER;
-#endif
-typedef UWORD SQLUSMALLINT;
-typedef PVOID SQLPOINTER;
-#if (ODBCVER >= 0x0300)
-typedef void* SQLHANDLE;
-typedef SQLHANDLE SQLHENV;
-typedef SQLHANDLE SQLHDBC;
-typedef SQLHANDLE SQLHSTMT;
-typedef SQLHANDLE SQLHDESC;
-#else
-typedef void* SQLHENV;
-typedef void* SQLHDBC;
-typedef void* SQLHSTMT;
-#endif
-typedef SQLSMALLINT SQLRETURN;
-typedef HWND SQLHWND;
-typedef ULONG BOOKMARK;
-#ifdef _WIN64
-typedef INT64 SQLLEN;
-typedef INT64 SQLROWOFFSET;
-typedef UINT64 SQLROWCOUNT;
-typedef UINT64 SQLULEN;
-typedef UINT64 SQLTRANSID;
-typedef unsigned long SQLSETPOSIROW;
-#else
-#define SQLLEN SQLINTEGER
-#define SQLROWOFFSET SQLINTEGER
-#define SQLROWCOUNT SQLUINTEGER
-#define SQLULEN SQLUINTEGER
-#define SQLTRANSID DWORD
-#define SQLSETPOSIROW SQLUSMALLINT
-#endif
-typedef wchar_t SQLWCHAR;
-#ifdef UNICODE
-typedef SQLWCHAR        SQLTCHAR;
-#else
-typedef SQLCHAR         SQLTCHAR;
-#endif  /* UNICODE */
-#if (ODBCVER >= 0x0300)
-typedef unsigned char   SQLDATE;
-typedef unsigned char   SQLDECIMAL;
-typedef double          SQLDOUBLE;
-typedef double          SQLFLOAT;
-typedef unsigned char   SQLNUMERIC;
-typedef float           SQLREAL;
-typedef unsigned char   SQLTIME;
-typedef unsigned char   SQLTIMESTAMP;
-typedef unsigned char   SQLVARCHAR;
-#define ODBCINT64	__int64
-typedef __int64 SQLBIGINT;
-typedef unsigned __int64 SQLUBIGINT;
-#endif
-
-typedef struct tagDATE_STRUCT {
-	SQLSMALLINT year;
-	SQLUSMALLINT month;
-	SQLUSMALLINT day;
-} DATE_STRUCT;
-typedef struct tagTIME_STRUCT {
-	SQLUSMALLINT hour;
-	SQLUSMALLINT minute;
-	SQLUSMALLINT second;
-} TIME_STRUCT;
-typedef struct tagTIMESTAMP_STRUCT {
-	SQLSMALLINT year;
-	SQLUSMALLINT month;
-	SQLUSMALLINT day;
-	SQLUSMALLINT hour;
-	SQLUSMALLINT minute;
-	SQLUSMALLINT second;
-	SQLUINTEGER fraction;
-} TIMESTAMP_STRUCT;
-#if (ODBCVER >= 0x0300)
-typedef DATE_STRUCT	SQL_DATE_STRUCT;
-typedef TIME_STRUCT	SQL_TIME_STRUCT;
-typedef TIMESTAMP_STRUCT SQL_TIMESTAMP_STRUCT;
-typedef enum {
-	SQL_IS_YEAR = 1,SQL_IS_MONTH,SQL_IS_DAY,SQL_IS_HOUR,
-	SQL_IS_MINUTE,SQL_IS_SECOND,SQL_IS_YEAR_TO_MONTH,SQL_IS_DAY_TO_HOUR,
-	SQL_IS_DAY_TO_MINUTE,SQL_IS_DAY_TO_SECOND,SQL_IS_HOUR_TO_MINUTE,
-	SQL_IS_HOUR_TO_SECOND,SQL_IS_MINUTE_TO_SECOND
-} SQLINTERVAL;
-typedef struct tagSQL_YEAR_MONTH {
-	SQLUINTEGER year;
-	SQLUINTEGER month;
-} SQL_YEAR_MONTH_STRUCT;
-typedef struct tagSQL_DAY_SECOND {
-	SQLUINTEGER day;
-	SQLUINTEGER	hour;
-	SQLUINTEGER minute;
-	SQLUINTEGER second;
-	SQLUINTEGER fraction;
-} SQL_DAY_SECOND_STRUCT;
-typedef struct tagSQL_INTERVAL_STRUCT {
-	SQLINTERVAL interval_type;
-	SQLSMALLINT interval_sign;
-	union {
-		SQL_YEAR_MONTH_STRUCT year_month;
-		SQL_DAY_SECOND_STRUCT day_second;
-	} intval;
-} SQL_INTERVAL_STRUCT;
-#define SQL_MAX_NUMERIC_LEN 16
-typedef struct tagSQL_NUMERIC_STRUCT {
-	SQLCHAR precision;
-	SQLSCHAR scale;
-	SQLCHAR sign;
-	SQLCHAR val[SQL_MAX_NUMERIC_LEN];
-} SQL_NUMERIC_STRUCT;
-#endif  /* ODBCVER >= 0x0300 */
-#if (ODBCVER >= 0x0350)
-
-#ifdef _GUID_DEFINED
-# warning _GUID_DEFINED is deprecated, use GUID_DEFINED instead
-#endif
-
-#if defined _GUID_DEFINED || defined GUID_DEFINED
-typedef GUID SQLGUID;
-#else
-typedef struct tagSQLGUID{
-    DWORD Data1;
-    WORD Data2;
-    WORD Data3;
-    BYTE Data4[ 8 ];
-} SQLGUID;
-#endif  /* GUID_DEFINED */
-#endif  /* ODBCVER >= 0x0350 */
-#endif     /* RC_INVOKED */
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/sqlucode.h b/winsup/w32api/include/sqlucode.h
deleted file mode 100644
index 78c0490ed..000000000
--- a/winsup/w32api/include/sqlucode.h
+++ /dev/null
@@ -1,142 +0,0 @@
-#ifndef _SQLUCODE_H
-#define _SQLUCODE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <sqlext.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define SQL_WCHAR (-8)
-#define SQL_WVARCHAR (-9)
-#define SQL_WLONGVARCHAR (-10)
-#define SQL_C_WCHAR SQL_WCHAR
-#define SQL_SQLSTATE_SIZEW	10
-#ifdef UNICODE
-#define SQL_C_TCHAR SQL_C_WCHAR
-#else
-#define SQL_C_TCHAR SQL_C_CHAR
-#endif 
-#ifndef RC_INVOKED
-SQLRETURN SQL_API SQLBrowseConnectA(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLBrowseConnectW(SQLHDBC,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLColAttributeA(SQLHSTMT,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLPOINTER);	
-SQLRETURN SQL_API SQLColAttributeW(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLPOINTER);	
-SQLRETURN SQL_API SQLColAttributesA(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLLEN*);
-SQLRETURN SQL_API SQLColAttributesW(SQLHSTMT,SQLUSMALLINT,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*,SQLLEN*);
-SQLRETURN SQL_API SQLColumnPrivilegesA( SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT ,SQLCHAR*,SQLSMALLINT );
-SQLRETURN SQL_API SQLColumnPrivilegesW( SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT );
-SQLRETURN SQL_API SQLColumnsA(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT ,SQLCHAR*,SQLSMALLINT );
-SQLRETURN SQL_API SQLColumnsW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT ,SQLWCHAR*,SQLSMALLINT );
-SQLRETURN SQL_API SQLConnectA(SQLHDBC,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLConnectW(SQLHDBC,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLDataSourcesA(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLDataSourcesW(SQLHENV,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLDescribeColA(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*);
-SQLRETURN SQL_API SQLDescribeColW(SQLHSTMT,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLULEN*,SQLSMALLINT*,SQLSMALLINT*);
-SQLRETURN SQL_API SQLDriverConnectA(SQLHDBC,SQLHWND,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLUSMALLINT);
-SQLRETURN SQL_API SQLDriverConnectW(SQLHDBC,SQLHWND,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLUSMALLINT);
-SQLRETURN SQL_API SQLDriversA(SQLHENV,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLDriversW(SQLHENV,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLErrorA(SQLHENV,SQLHDBC,SQLHSTMT,SQLCHAR*,SQLINTEGER*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLErrorW(SQLHENV,SQLHDBC,SQLHSTMT,SQLWCHAR*,SQLINTEGER*,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLExecDirectA(SQLHSTMT,SQLCHAR*,SQLINTEGER);
-SQLRETURN SQL_API SQLExecDirectW(SQLHSTMT,SQLWCHAR*,SQLINTEGER);
-SQLRETURN SQL_API SQLForeignKeysA(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLForeignKeysW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLGetConnectAttrA(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLGetConnectAttrW(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLGetConnectOptionA(SQLHDBC,SQLUSMALLINT,SQLPOINTER);
-SQLRETURN SQL_API SQLGetConnectOptionW(SQLHDBC,SQLUSMALLINT,SQLPOINTER);
-SQLRETURN SQL_API SQLGetCursorNameA(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetCursorNameW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetInfoA(SQLHDBC,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetInfoW(SQLHDBC,SQLUSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetStmtAttrA(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLGetStmtAttrW(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLGetTypeInfoA(SQLHSTMT,SQLSMALLINT);
-SQLRETURN SQL_API SQLGetTypeInfoW(SQLHSTMT,SQLSMALLINT);
-SQLRETURN SQL_API SQLNativeSqlA(SQLHDBC,SQLCHAR*,SQLINTEGER,SQLCHAR*,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLNativeSqlW(SQLHDBC,SQLWCHAR*,SQLINTEGER,SQLWCHAR*,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLPrepareA(SQLHSTMT,SQLCHAR*,SQLINTEGER);
-SQLRETURN SQL_API SQLPrepareW(SQLHSTMT,SQLWCHAR*,SQLINTEGER);
-SQLRETURN SQL_API SQLPrimaryKeysA(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT );
-SQLRETURN SQL_API SQLPrimaryKeysW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLProcedureColumnsA(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLProcedureColumnsW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLProceduresA(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLProceduresW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLSetConnectAttrA(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER);
-SQLRETURN SQL_API SQLSetConnectAttrW(SQLHDBC,SQLINTEGER,SQLPOINTER,SQLINTEGER);
-SQLRETURN SQL_API SQLSetConnectOptionA(SQLHDBC,SQLUSMALLINT,SQLULEN);
-SQLRETURN SQL_API SQLSetConnectOptionW(SQLHDBC,SQLUSMALLINT,SQLULEN);
-SQLRETURN SQL_API SQLSetCursorNameA(SQLHSTMT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLSetCursorNameW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLSetStmtAttrA(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER);
-SQLRETURN SQL_API SQLSetStmtAttrW(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER);
-SQLRETURN SQL_API SQLSpecialColumnsA(SQLHSTMT,SQLUSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT ,SQLUSMALLINT,SQLUSMALLINT);
-SQLRETURN SQL_API SQLSpecialColumnsW(SQLHSTMT,SQLUSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT ,SQLUSMALLINT,SQLUSMALLINT);
-SQLRETURN SQL_API SQLStatisticsA(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT ,SQLUSMALLINT,SQLUSMALLINT);
-SQLRETURN SQL_API SQLStatisticsW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT ,SQLUSMALLINT,SQLUSMALLINT);
-SQLRETURN SQL_API SQLTablePrivilegesA(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLTablePrivilegesW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT );
-SQLRETURN SQL_API SQLTablesA(SQLHSTMT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLCHAR*,SQLSMALLINT);
-SQLRETURN SQL_API SQLTablesW(SQLHSTMT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT);
-#if (ODBCVER >= 0x0300)
-SQLRETURN SQL_API SQLGetDescFieldA(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLSetDescFieldW(SQLHDESC,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLGetDescRecA(SQLHDESC,SQLSMALLINT,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLSMALLINT*,SQLLEN*,SQLSMALLINT*,SQLSMALLINT*,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetDescRecW(SQLHDESC,SQLSMALLINT,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*,SQLSMALLINT*,SQLSMALLINT*,SQLLEN*,SQLSMALLINT*,SQLSMALLINT*,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetDiagFieldA(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetDiagFieldW(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLSMALLINT,SQLPOINTER,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetDiagRecA(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLCHAR*,SQLINTEGER*,SQLCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetDiagRecW(SQLSMALLINT,SQLHANDLE,SQLSMALLINT,SQLWCHAR*,SQLINTEGER*,SQLWCHAR*,SQLSMALLINT,SQLSMALLINT*);
-SQLRETURN SQL_API SQLGetStmtAttrA(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-SQLRETURN SQL_API SQLGetStmtAttrW(SQLHSTMT,SQLINTEGER,SQLPOINTER,SQLINTEGER,SQLINTEGER*);
-#endif /* (ODBCVER >= 0x0300) */
-
-#if defined (UNICODE) && !defined (SQL_NOUNICODEMAP) 
-#define SQLBrowseConnect SQLBrowseConnectW
-#define SQLColAttribute SQLColAttributeW
-#define SQLColAttributes SQLColAttributesW
-#define SQLColumnPrivileges SQLColumnPrivilegesW
-#define SQLColumns SQLColumnsW
-#define SQLConnect SQLConnectW
-#define SQLDataSources SQLDataSourcesW
-#define SQLDescribeCol SQLDescribeColW
-#define SQLDriverConnect SQLDriverConnectW
-#define SQLDrivers SQLDriversW
-#define SQLError SQLErrorW
-#define SQLExecDirect SQLExecDirectW
-#define SQLForeignKeys SQLForeignKeysW
-#define SQLGetConnectAttr SQLGetConnectAttrW
-#define SQLGetConnectOption SQLGetConnectOptionW
-#define SQLGetCursorName SQLGetCursorNameW
-#define SQLGetDescField SQLGetDescFieldW
-#define SQLGetDescRec SQLGetDescRecW
-#define SQLGetDiagField SQLGetDiagFieldW
-#define SQLGetDiagRec SQLGetDiagRecW
-#define SQLGetInfo SQLGetInfoW
-#define SQLGetStmtAttr SQLGetStmtAttrW
-#define SQLGetTypeInfo SQLGetTypeInfoW
-#define SQLNativeSql SQLNativeSqlW
-#define SQLPrepare SQLPrepareW
-#define SQLPrimaryKeys SQLPrimaryKeysW
-#define SQLProcedureColumns SQLProcedureColumnsW
-#define SQLProcedures SQLProceduresW
-#define SQLSetConnectAttr SQLSetConnectAttrW
-#define SQLSetConnectOption SQLSetConnectOptionW
-#define SQLSetCursorName SQLSetCursorNameW
-#define SQLSetDescField SQLSetDescFieldW
-#define SQLSetStmtAttr SQLSetStmtAttrW
-#define SQLSpecialColumns SQLSpecialColumnsW
-#define SQLStatistics SQLStatisticsW
-#define SQLTablePrivileges SQLTablePrivilegesW
-#define SQLTables SQLTablesW
-#endif /* UNICODE && ! SQL_NOUNICODEMAP */
-#endif /* RC_INVOKED */
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus*/
-#endif  /* ndef _SQLUCODE_H */
diff --git a/winsup/w32api/include/sspi.h b/winsup/w32api/include/sspi.h
deleted file mode 100644
index 7f63e1ca7..000000000
--- a/winsup/w32api/include/sspi.h
+++ /dev/null
@@ -1,338 +0,0 @@
-#ifndef _SSPI_H
-#define _SSPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SECPKG_CRED_INBOUND 1
-#define SECPKG_CRED_OUTBOUND 2
-#define SECPKG_CRED_BOTH (SECPKG_CRED_OUTBOUND|SECPKG_CRED_INBOUND)
-#define SECPKG_CRED_ATTR_NAMES 1
-
-#define SECPKG_FLAG_INTEGRITY 1
-#define SECPKG_FLAG_PRIVACY 2
-#define SECPKG_FLAG_TOKEN_ONLY 4
-#define SECPKG_FLAG_DATAGRAM 8
-#define SECPKG_FLAG_CONNECTION 16
-#define SECPKG_FLAG_MULTI_REQUIRED 32
-#define SECPKG_FLAG_CLIENT_ONLY 64
-#define SECPKG_FLAG_EXTENDED_ERROR 128
-#define SECPKG_FLAG_IMPERSONATION 256
-#define SECPKG_FLAG_ACCEPT_WIN32_NAME 512
-#define SECPKG_FLAG_STREAM 1024
-
-#define SECPKG_ATTR_AUTHORITY 6
-#define SECPKG_ATTR_CONNECTION_INFO 90
-#define SECPKG_ATTR_ISSUER_LIST 80
-#define SECPKG_ATTR_ISSUER_LIST_EX 89
-#define SECPKG_ATTR_KEY_INFO 5
-#define SECPKG_ATTR_LIFESPAN 2
-#define SECPKG_ATTR_LOCAL_CERT_CONTEXT 84
-#define SECPKG_ATTR_LOCAL_CRED 82
-#define SECPKG_ATTR_NAMES 1
-#define SECPKG_ATTR_PROTO_INFO 7
-#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 83
-#define SECPKG_ATTR_REMOTE_CRED 81
-#define SECPKG_ATTR_SIZES 0
-#define SECPKG_ATTR_STREAM_SIZES 4
-
-#define SECBUFFER_EMPTY 0
-#define SECBUFFER_DATA 1
-#define SECBUFFER_TOKEN 2
-#define SECBUFFER_PKG_PARAMS 3
-#define SECBUFFER_MISSING 4
-#define SECBUFFER_EXTRA 5
-#define SECBUFFER_STREAM_TRAILER 6
-#define SECBUFFER_STREAM_HEADER 7
-#define SECBUFFER_PADDING 9
-#define SECBUFFER_STREAM 10
-#define SECBUFFER_READONLY 0x80000000
-#define SECBUFFER_ATTRMASK 0xf0000000
-
-#define UNISP_NAME_A "Microsoft Unified Security Protocol Provider"
-#define UNISP_NAME_W L"Microsoft Unified Security Protocol Provider"
-#define SECBUFFER_VERSION 0
-
-typedef struct _SecHandle {
-	ULONG_PTR dwLower;
-	ULONG_PTR dwUpper;
-} SecHandle, *PSecHandle;
-typedef struct _SecBuffer {
-	ULONG cbBuffer;
-	ULONG BufferType;
-	PVOID pvBuffer;
-} SecBuffer, *PSecBuffer;
-typedef SecHandle CredHandle;
-typedef PSecHandle PCredHandle;
-typedef SecHandle CtxtHandle;
-typedef PSecHandle PCtxtHandle;
-typedef struct _SECURITY_INTEGER {
-	unsigned long LowPart;
-	long HighPart;
-} SECURITY_INTEGER;
-typedef SECURITY_INTEGER TimeStamp, *PTimeStamp;
-typedef struct _SecBufferDesc {
-	ULONG ulVersion;
-	ULONG cBuffers;
-	PSecBuffer pBuffers;
-} SecBufferDesc, *PSecBufferDesc;
-typedef struct _SecPkgContext_StreamSizes {
-	ULONG cbHeader;
-	ULONG cbTrailer;
-	ULONG cbMaximumMessage;
-	ULONG cBuffers;
-	ULONG cbBlockSize;
-} SecPkgContext_StreamSizes, *PSecPkgContext_StreamSizes;
-typedef struct _SecPkgContext_Sizes {
-	ULONG cbMaxToken;
-	ULONG cbMaxSIgnature;
-	ULONG cbBlockSize;
-	ULONG cbSecurityTrailer;
-} SecPkgContext_Sizes, *PSecPkgContext_Sizes;
-typedef struct _SecPkgContext_AuthorityW {
-	SEC_WCHAR* sAuthorityName;
-} SecPkgContext_AuthorityW, *PSecPkgContext_AuthorityW;
-typedef struct _SecPkgContext_AuthorityA {
-	SEC_CHAR* sAuthorityName;
-} SecPkgContext_AuthorityA, *PSecPkgContext_AuthorityA;
-typedef struct _SecPkgContext_KeyInfoW {
-	SEC_WCHAR* sSignatureAlgorithmName;
-	SEC_WCHAR* sEncryptAlgorithmName;
-	ULONG KeySize;
-	ULONG SignatureAlgorithm;
-	ULONG EncryptAlgorithm;
-} SecPkgContext_KeyInfoW, *PSecPkgContext_KeyInfoW;
-typedef struct _SecPkgContext_KeyInfoA {
-	SEC_CHAR* sSignatureAlgorithmName;
-	SEC_CHAR* sEncryptAlgorithmName;
-	ULONG KeySize;
-	ULONG SignatureAlgorithm;
-	ULONG EncryptAlgorithm;
-} SecPkgContext_KeyInfoA, *PSecPkgContext_KeyInfoA;
-typedef struct _SecPkgContext_LifeSpan {
-	TimeStamp tsStart;
-	TimeStamp tsExpiry;
-} SecPkgContext_LifeSpan, *PSecPkgContext_LifeSpan;
-typedef struct _SecPkgContext_NamesW {
-	SEC_WCHAR* sUserName;
-} SecPkgContext_NamesW, *PSecPkgContext_NamesW;
-typedef struct _SecPkgContext_NamesA {
-	SEC_CHAR* sUserName;
-} SecPkgContext_NamesA, *PSecPkgContext_NamesA;
-typedef struct _SecPkgInfoW {
-	ULONG fCapabilities;
-	USHORT wVersion;
-	USHORT wRPCID;
-	ULONG cbMaxToken;
-	SEC_WCHAR* Name;
-	SEC_WCHAR* Comment;
-} SecPkgInfoW, *PSecPkgInfoW;
-typedef struct _SecPkgInfoA {
-	ULONG fCapabilities;
-	USHORT wVersion;
-	USHORT wRPCID;
-	ULONG cbMaxToken;
-	SEC_CHAR* Name;
-	SEC_CHAR* Comment;
-} SecPkgInfoA, *PSecPkgInfoA;
-/* supported only in win2k+, so it should be a PSecPkgInfoW */
-/* PSDK does not say it has ANSI/Unicode versions */
-typedef struct _SecPkgContext_PackageInfo {
-	PSecPkgInfoW PackageInfo;
-} SecPkgContext_PackageInfo, *PSecPkgContext_PackageInfo;
-typedef struct _SecPkgCredentials_NamesW {
-	SEC_WCHAR* sUserName;
-} SecPkgCredentialsNamesW, *PSecPkgCredentialsNamesW;
-typedef struct _SecPkgCredentials_NamesA {
-	SEC_CHAR* sUserName;
-} SecPkgCredentialsNamesA, *PSecPkgCredentialsNamesA;
-
-/* TODO: missing type in SDK */
-typedef void (*SEC_GET_KEY_FN)();
-
-typedef SECURITY_STATUS (WINAPI *ENUMERATE_SECURITY_PACKAGES_FN_W)(PULONG,PSecPkgInfoW*);
-typedef SECURITY_STATUS (WINAPI *ENUMERATE_SECURITY_PACKAGES_FN_A)(PULONG,PSecPkgInfoA*);
-typedef SECURITY_STATUS (WINAPI *QUERY_CREDENTIALS_ATTRIBUTES_FN_W)(PCredHandle,ULONG,PVOID);
-typedef SECURITY_STATUS (WINAPI *QUERY_CREDENTIALS_ATTRIBUTES_FN_A)(PCredHandle,ULONG,PVOID);
-typedef SECURITY_STATUS (WINAPI *ACQUIRE_CREDENTIALS_HANDLE_FN_W)(SEC_WCHAR*,SEC_WCHAR*,ULONG,PLUID,PVOID,SEC_GET_KEY_FN,PVOID,PCredHandle,PTimeStamp);
-typedef SECURITY_STATUS (WINAPI *ACQUIRE_CREDENTIALS_HANDLE_FN_A)(SEC_CHAR*,SEC_CHAR*,ULONG,PLUID,PVOID,SEC_GET_KEY_FN,PVOID,PCredHandle,PTimeStamp);
-typedef SECURITY_STATUS (WINAPI *FREE_CREDENTIALS_HANDLE_FN)(PCredHandle);
-typedef SECURITY_STATUS (WINAPI *INITIALIZE_SECURITY_CONTEXT_FN_W)(PCredHandle,PCtxtHandle,SEC_WCHAR*,ULONG,ULONG,ULONG,PSecBufferDesc,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp);
-typedef SECURITY_STATUS (WINAPI *INITIALIZE_SECURITY_CONTEXT_FN_A)(PCredHandle,PCtxtHandle,SEC_CHAR*,ULONG,ULONG,ULONG,PSecBufferDesc,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp);
-typedef SECURITY_STATUS (WINAPI *ACCEPT_SECURITY_CONTEXT_FN)(PCredHandle,PCtxtHandle,PSecBufferDesc,ULONG,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp);
-typedef SECURITY_STATUS (WINAPI *COMPLETE_AUTH_TOKEN_FN)(PCtxtHandle,PSecBufferDesc);
-typedef SECURITY_STATUS (WINAPI *DELETE_SECURITY_CONTEXT_FN)(PCtxtHandle);
-typedef SECURITY_STATUS (WINAPI *APPLY_CONTROL_TOKEN_FN_W)(PCtxtHandle,PSecBufferDesc);
-typedef SECURITY_STATUS (WINAPI *APPLY_CONTROL_TOKEN_FN_A)(PCtxtHandle,PSecBufferDesc);
-typedef SECURITY_STATUS (WINAPI *QUERY_CONTEXT_ATTRIBUTES_FN_A)(PCtxtHandle,ULONG,PVOID);
-typedef SECURITY_STATUS (WINAPI *QUERY_CONTEXT_ATTRIBUTES_FN_W)(PCtxtHandle,ULONG,PVOID);
-typedef SECURITY_STATUS (WINAPI *IMPERSONATE_SECURITY_CONTEXT_FN)(PCtxtHandle);
-typedef SECURITY_STATUS (WINAPI *REVERT_SECURITY_CONTEXT_FN)(PCtxtHandle);
-typedef SECURITY_STATUS (WINAPI *MAKE_SIGNATURE_FN)(PCtxtHandle,ULONG,PSecBufferDesc,ULONG);
-typedef SECURITY_STATUS (WINAPI *VERIFY_SIGNATURE_FN)(PCtxtHandle,PSecBufferDesc,ULONG,PULONG);
-typedef SECURITY_STATUS (WINAPI *FREE_CONTEXT_BUFFER_FN)(PVOID);
-typedef SECURITY_STATUS (WINAPI *QUERY_SECURITY_PACKAGE_INFO_FN_A)(SEC_CHAR*,PSecPkgInfoA*);
-typedef SECURITY_STATUS (WINAPI *QUERY_SECURITY_PACKAGE_INFO_FN_W)(SEC_WCHAR*,PSecPkgInfoW*);
-typedef SECURITY_STATUS (WINAPI *ENCRYPT_MESSAGE_FN)(PCtxtHandle,ULONG,PSecBufferDesc,ULONG);
-typedef SECURITY_STATUS (WINAPI *DECRYPT_MESSAGE_FN)(PCtxtHandle,PSecBufferDesc,ULONG,PULONG);
-
-/* No, it really is FreeCredentialsHandle, see the thread beginning 
- * http://sourceforge.net/mailarchive/message.php?msg_id=4321080 for a
- * discovery discussion. */
-typedef struct _SECURITY_FUNCTION_TABLEW {
-	unsigned long dwVersion;
-	ENUMERATE_SECURITY_PACKAGES_FN_W EnumerateSecurityPackagesW;
-	QUERY_CREDENTIALS_ATTRIBUTES_FN_W QueryCredentialsAttributesW;
-	ACQUIRE_CREDENTIALS_HANDLE_FN_W AcquireCredentialsHandleW;
-	FREE_CREDENTIALS_HANDLE_FN FreeCredentialsHandle;
-	void SEC_FAR* Reserved2;
-	INITIALIZE_SECURITY_CONTEXT_FN_A InitializeSecurityContextA;
-	ACCEPT_SECURITY_CONTEXT_FN AcceptSecurityContext;
-	COMPLETE_AUTH_TOKEN_FN CompleteAuthToken;
-	DELETE_SECURITY_CONTEXT_FN DeleteSecurityContext;
-	APPLY_CONTROL_TOKEN_FN_W ApplyControlTokenW;
-	QUERY_CONTEXT_ATTRIBUTES_FN_W QueryContextAttributesW;
-	IMPERSONATE_SECURITY_CONTEXT_FN ImpersonateSecurityContext;
-	REVERT_SECURITY_CONTEXT_FN RevertSecurityContext;
-	MAKE_SIGNATURE_FN MakeSignature;
-	VERIFY_SIGNATURE_FN VerifySignature;
-	FREE_CONTEXT_BUFFER_FN FreeContextBuffer;
-	QUERY_SECURITY_PACKAGE_INFO_FN_A QuerySecurityPackageInfoA;
-	void SEC_FAR* Reserved3;
-	void SEC_FAR* Reserved4;
-        void SEC_FAR* Unknown1;
-        void SEC_FAR* Unknown2;
-        void SEC_FAR* Unknown3;
-        void SEC_FAR* Unknown4;
-        void SEC_FAR* Unknown5;
-        ENCRYPT_MESSAGE_FN EncryptMessage;
-        DECRYPT_MESSAGE_FN DecryptMessage;
-} SecurityFunctionTableW, *PSecurityFunctionTableW;
-typedef struct _SECURITY_FUNCTION_TABLEA {
-	unsigned long dwVersion;
-	ENUMERATE_SECURITY_PACKAGES_FN_A EnumerateSecurityPackagesA;
-	QUERY_CREDENTIALS_ATTRIBUTES_FN_A QueryCredentialsAttributesA;
-	ACQUIRE_CREDENTIALS_HANDLE_FN_A AcquireCredentialsHandleA;
-	FREE_CREDENTIALS_HANDLE_FN FreeCredentialsHandle;
-	void SEC_FAR* Reserved2;
-	INITIALIZE_SECURITY_CONTEXT_FN_A InitializeSecurityContextA;
-	ACCEPT_SECURITY_CONTEXT_FN AcceptSecurityContext;
-	COMPLETE_AUTH_TOKEN_FN CompleteAuthToken;
-	DELETE_SECURITY_CONTEXT_FN DeleteSecurityContext;
-	APPLY_CONTROL_TOKEN_FN_A ApplyControlTokenA;
-	QUERY_CONTEXT_ATTRIBUTES_FN_A QueryContextAttributesA;
-	IMPERSONATE_SECURITY_CONTEXT_FN ImpersonateSecurityContext;
-	REVERT_SECURITY_CONTEXT_FN RevertSecurityContext;
-	MAKE_SIGNATURE_FN MakeSignature;
-	VERIFY_SIGNATURE_FN VerifySignature;
-	FREE_CONTEXT_BUFFER_FN FreeContextBuffer;
-	QUERY_SECURITY_PACKAGE_INFO_FN_A QuerySecurityPackageInfoA;
-	void SEC_FAR* Reserved3;
-	void SEC_FAR* Reserved4;
-        void SEC_FAR* Unknown1;
-        void SEC_FAR* Unknown2;
-        void SEC_FAR* Unknown3;
-        void SEC_FAR* Unknown4;
-        void SEC_FAR* Unknown5;
-        ENCRYPT_MESSAGE_FN EncryptMessage;
-        DECRYPT_MESSAGE_FN DecryptMessage;
-} SecurityFunctionTableA, *PSecurityFunctionTableA;
-typedef PSecurityFunctionTableA (WINAPI *INIT_SECURITY_INTERFACE_A)(VOID);
-typedef PSecurityFunctionTableW (WINAPI *INIT_SECURITY_INTERFACE_W)(VOID);
-
-SECURITY_STATUS WINAPI FreeCredentialsHandle(PCredHandle);
-SECURITY_STATUS WINAPI EnumerateSecurityPackagesA(PULONG,PSecPkgInfoA*);
-SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG,PSecPkgInfoW*);
-SECURITY_STATUS WINAPI AcquireCredentialsHandleA(SEC_CHAR*,SEC_CHAR*,ULONG,PLUID,PVOID,SEC_GET_KEY_FN,PVOID,PCredHandle,PTimeStamp);
-SECURITY_STATUS WINAPI AcquireCredentialsHandleW(SEC_WCHAR*,SEC_WCHAR*,ULONG,PLUID,PVOID,SEC_GET_KEY_FN,PVOID,PCredHandle,PTimeStamp);
-SECURITY_STATUS WINAPI AcceptSecurityContext(PCredHandle,PCtxtHandle,PSecBufferDesc,ULONG,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp);
-SECURITY_STATUS WINAPI InitializeSecurityContextA(PCredHandle,PCtxtHandle,SEC_CHAR*,ULONG,ULONG,ULONG,PSecBufferDesc,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp);
-SECURITY_STATUS WINAPI InitializeSecurityContextW(PCredHandle,PCtxtHandle,SEC_WCHAR*,ULONG,ULONG,ULONG,PSecBufferDesc,ULONG,PCtxtHandle,PSecBufferDesc,PULONG,PTimeStamp);
-SECURITY_STATUS WINAPI FreeContextBuffer(PVOID);
-SECURITY_STATUS WINAPI QueryContextAttributesA(PCtxtHandle,ULONG,PVOID);
-SECURITY_STATUS WINAPI QueryContextAttributesW(PCtxtHandle,ULONG,PVOID);
-SECURITY_STATUS WINAPI QueryCredentialsAttributesA(PCredHandle,ULONG,PVOID);
-SECURITY_STATUS WINAPI QueryCredentialsAttributesW(PCredHandle,ULONG,PVOID);
-SECURITY_STATUS WINAPI DecryptMessage(PCtxtHandle,PSecBufferDesc,ULONG,PULONG);
-SECURITY_STATUS WINAPI EncryptMessage(PCtxtHandle,ULONG,PSecBufferDesc,ULONG);
-SECURITY_STATUS WINAPI DeleteSecurityContext(PCtxtHandle);
-SECURITY_STATUS WINAPI CompleteAuthToken(PCtxtHandle,PSecBufferDesc);
-SECURITY_STATUS WINAPI ApplyControlTokenA(PCtxtHandle,PSecBufferDesc);
-SECURITY_STATUS WINAPI ApplyControlTokenW(PCtxtHandle,PSecBufferDesc);
-SECURITY_STATUS WINAPI ImpersonateSecurityContext(PCtxtHandle);
-SECURITY_STATUS WINAPI RevertSecurityContext(PCtxtHandle);
-SECURITY_STATUS WINAPI MakeSignature(PCtxtHandle,ULONG,PSecBufferDesc,ULONG);
-SECURITY_STATUS WINAPI VerifySignature(PCtxtHandle,PSecBufferDesc,ULONG,PULONG);
-SECURITY_STATUS WINAPI QuerySecurityPackageInfoA(SEC_CHAR*,PSecPkgInfoA*);
-SECURITY_STATUS WINAPI QuerySecurityPackageInfoW(SEC_WCHAR*,PSecPkgInfoW*);
-PSecurityFunctionTableA WINAPI InitSecurityInterfaceA(VOID);
-PSecurityFunctionTableW WINAPI InitSecurityInterfaceW(VOID);
-
-#ifdef UNICODE
-#define UNISP_NAME UNISP_NAME_W
-#define SecPkgInfo SecPkgInfoW
-#define PSecPkgInfo PSecPkgInfoW
-#define SecPkgCredentialsNames SecPkgCredentialsNamesW
-#define PSecPkgCredentialsNames PSecPkgCredentialsNamesW
-#define SecPkgContext_Authority SecPkgContext_AuthorityW
-#define PSecPkgContext_Authority PSecPkgContext_AuthorityW
-#define SecPkgContext_KeyInfo SecPkgContext_KeyInfoW
-#define PSecPkgContext_KeyInfo PSecPkgContext_KeyInfoW
-#define SecPkgContext_Names SecPkgContext_NamesW
-#define PSecPkgContext_Names PSecPkgContext_NamesW
-#define SecurityFunctionTable SecurityFunctionTableW
-#define PSecurityFunctionTable PSecurityFunctionTableW
-#define AcquireCredentialsHandle AcquireCredentialsHandleW
-#define EnumerateSecurityPackages EnumerateSecurityPackagesW
-#define InitializeSecurityContext InitializeSecurityContextW
-#define QueryContextAttributes QueryContextAttributesW
-#define QueryCredentialsAttributes QueryCredentialsAttributesW
-#define QuerySecurityPackageInfo QuerySecurityPackageInfoW
-#define ApplyControlToken ApplyControlTokenW
-#define ENUMERATE_SECURITY_PACKAGES_FN ENUMERATE_SECURITY_PACKAGES_FN_W
-#define QUERY_CREDENTIALS_ATTRIBUTES_FN QUERY_CREDENTIALS_ATTRIBUTES_FN_W
-#define ACQUIRE_CREDENTIALS_HANDLE_FN ACQUIRE_CREDENTIALS_HANDLE_FN_W
-#define INITIALIZE_SECURITY_CONTEXT_FN INITIALIZE_SECURITY_CONTEXT_FN_W
-#define APPLY_CONTROL_TOKEN_FN APPLY_CONTROL_TOKEN_FN_W
-#define QUERY_CONTEXT_ATTRIBUTES_FN QUERY_CONTEXT_ATTRIBUTES_FN_W
-#define QUERY_SECURITY_PACKAGE_INFO_FN QUERY_SECURITY_PACKAGE_INFO_FN_W
-#define INIT_SECURITY_INTERFACE INIT_SECURITY_INTERFACE_W
-#else
-#define UNISP_NAME UNISP_NAME_A
-#define SecPkgInfo SecPkgInfoA
-#define PSecPkgInfo PSecPkgInfoA
-#define SecPkgCredentialsNames SecPkgCredentialsNamesA
-#define PSecPkgCredentialsNames PSecPkgCredentialsNamesA
-#define SecPkgContext_Authority SecPkgContext_AuthorityA
-#define PSecPkgContext_Authority PSecPkgContext_AuthorityA
-#define SecPkgContext_KeyInfo SecPkgContext_KeyInfoA
-#define PSecPkgContext_KeyInfo PSecPkgContext_KeyInfoA
-#define SecPkgContext_Names SecPkgContext_NamesA
-#define PSecPkgContext_Names PSecPkgContext_NamesA
-#define SecurityFunctionTable SecurityFunctionTableA
-#define PSecurityFunctionTable PSecurityFunctionTableA
-#define AcquireCredentialsHandle AcquireCredentialsHandleA
-#define EnumerateSecurityPackages EnumerateSecurityPackagesA
-#define InitializeSecurityContext InitializeSecurityContextA
-#define QueryContextAttributes QueryContextAttributesA
-#define QueryCredentialsAttributes QueryCredentialsAttributesA
-#define QuerySecurityPackageInfo QuerySecurityPackageInfoA
-#define ApplyControlToken ApplyControlTokenA
-#define ENUMERATE_SECURITY_PACKAGES_FN ENUMERATE_SECURITY_PACKAGES_FN_A
-#define QUERY_CREDENTIALS_ATTRIBUTES_FN QUERY_CREDENTIALS_ATTRIBUTES_FN_A
-#define ACQUIRE_CREDENTIALS_HANDLE_FN ACQUIRE_CREDENTIALS_HANDLE_FN_A
-#define INITIALIZE_SECURITY_CONTEXT_FN INITIALIZE_SECURITY_CONTEXT_FN_A
-#define APPLY_CONTROL_TOKEN_FN APPLY_CONTROL_TOKEN_FN_A
-#define QUERY_CONTEXT_ATTRIBUTES_FN QUERY_CONTEXT_ATTRIBUTES_FN_A
-#define QUERY_SECURITY_PACKAGE_INFO_FN QUERY_SECURITY_PACKAGE_INFO_FN_A
-#define INIT_SECURITY_INTERFACE INIT_SECURITY_INTERFACE_A
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/subauth.h b/winsup/w32api/include/subauth.h
deleted file mode 100644
index 2c87f288f..000000000
--- a/winsup/w32api/include/subauth.h
+++ /dev/null
@@ -1,209 +0,0 @@
-#ifndef _SUBAUTH_H
-#define _SUBAUTH_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifndef NT_SUCCESS
-#define NT_SUCCESS(x) ((x)>=0)
-#define STATUS_SUCCESS 0 
-#endif
-#define CYPHER_BLOCK_LENGTH 8
-#define USER_SESSION_KEY_LENGTH (CYPHER_BLOCK_LENGTH*2)
-#define CLEAR_BLOCK_LENGTH 8
-#define MSV1_0_PASSTHRU 1
-#define MSV1_0_GUEST_LOGON 2
-#define MSV1_0_VALIDATION_LOGOFF_TIME 1
-#define MSV1_0_VALIDATION_KICKOFF_TIME 2
-#define MSV1_0_VALIDATION_LOGON_SERVER 4
-#define MSV1_0_VALIDATION_LOGON_DOMAIN 8
-#define MSV1_0_VALIDATION_SESSION_KEY 16
-#define MSV1_0_VALIDATION_USER_FLAGS 32
-#define MSV1_0_VALIDATION_USER_ID 64
-#define MSV1_0_SUBAUTH_ACCOUNT_DISABLED 1
-#define MSV1_0_SUBAUTH_PASSWORD 2
-#define MSV1_0_SUBAUTH_WORKSTATIONS 4
-#define MSV1_0_SUBAUTH_LOGON_HOURS 8
-#define MSV1_0_SUBAUTH_ACCOUNT_EXPIRY 16
-#define MSV1_0_SUBAUTH_PASSWORD_EXPIRY 32
-#define MSV1_0_SUBAUTH_ACCOUNT_TYPE 64
-#define MSV1_0_SUBAUTH_LOCKOUT 128
-#define NEXT_FREE_ACCOUNT_CONTROL_BIT 131072
-#define SAM_DAYS_PER_WEEK 7
-#define SAM_HOURS_PER_WEEK 168
-#define SAM_MINUTES_PER_WEEK 10080
-#define STATUS_INVALID_INFO_CLASS 0xC0000003L
-#define STATUS_NO_SUCH_USER 0xC0000064L
-#define STATUS_WRONG_PASSWORD 0xC000006AL
-#define STATUS_PASSWORD_RESTRICTION 0xC000006CL
-#define STATUS_LOGON_FAILURE 0xC000006DL
-#define STATUS_ACCOUNT_RESTRICTION 0xC000006EL
-#define STATUS_INVALID_LOGON_HOURS 0xC000006FL
-#define STATUS_INVALID_WORKSTATION 0xC0000070L
-#define STATUS_PASSWORD_EXPIRED 0xC0000071L
-#define STATUS_ACCOUNT_DISABLED 0xC0000072L
-#define STATUS_INSUFFICIENT_RESOURCES 0xC000009AL
-#define STATUS_ACCOUNT_EXPIRED 0xC0000193L
-#define STATUS_PASSWORD_MUST_CHANGE 0xC0000224L
-#define STATUS_ACCOUNT_LOCKED_OUT 0xC0000234L
-#define USER_ACCOUNT_DISABLED 1
-#define USER_HOME_DIRECTORY_REQUIRED 2
-#define USER_PASSWORD_NOT_REQUIRED 4
-#define USER_TEMP_DUPLICATE_ACCOUNT 8
-#define USER_NORMAL_ACCOUNT 16
-#define USER_MNS_LOGON_ACCOUNT 32
-#define USER_INTERDOMAIN_TRUST_ACCOUNT 64
-#define USER_WORKSTATION_TRUST_ACCOUNT 128
-#define USER_SERVER_TRUST_ACCOUNT 256
-#define USER_DONT_EXPIRE_PASSWORD 512
-#define USER_ACCOUNT_AUTO_LOCKED 1024
-#define USER_ENCRYPTED_TEXT_PASSWORD_ALLOWED 2048
-#define USER_SMARTCARD_REQUIRED 4096
-#define USER_TRUSTED_FOR_DELEGATION 8192
-#define USER_NOT_DELEGATED 16384
-#define USER_USE_DES_KEY_ONLY 32768
-#define USER_DONT_REQUIRE_PREAUTH 65536
-#define USER_MACHINE_ACCOUNT_MASK 448
-#define USER_ACCOUNT_TYPE_MASK 472
-#define USER_ALL_PARAMETERS 2097152
-#if !defined(_NTDEF_H) && !defined(_NTSECAPI_H)
-typedef LONG NTSTATUS, *PNTSTATUS;
-typedef struct _UNICODE_STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PWSTR Buffer;
-} UNICODE_STRING, *PUNICODE_STRING;
-typedef struct _STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PCHAR Buffer;
-} STRING, *PSTRING;
-#endif
-typedef PVOID SAM_HANDLE, *PSAM_HANDLE;  
-typedef struct _OLD_LARGE_INTEGER {
-  ULONG LowPart;
-  LONG HighPart;
-} OLD_LARGE_INTEGER, *POLD_LARGE_INTEGER;
-typedef enum _NETLOGON_LOGON_INFO_CLASS {
-  NetlogonInteractiveInformation = 1,NetlogonNetworkInformation,
-  NetlogonServiceInformation,NetlogonGenericInformation,
-  NetlogonInteractiveTransitiveInformation,NetlogonNetworkTransitiveInformation,
-  NetlogonServiceTransitiveInformation
-} NETLOGON_LOGON_INFO_CLASS;
-typedef struct _CYPHER_BLOCK {
-  CHAR data[CYPHER_BLOCK_LENGTH];
-} CYPHER_BLOCK, *PCYPHER_BLOCK;
-typedef struct _CLEAR_BLOCK {
-  CHAR data[CLEAR_BLOCK_LENGTH];
-} CLEAR_BLOCK, *PCLEAR_BLOCK;
-typedef struct _LM_OWF_PASSWORD {
-  CYPHER_BLOCK data[2];
-} LM_OWF_PASSWORD, *PLM_OWF_PASSWORD;
-typedef struct _USER_SESSION_KEY {
-  CYPHER_BLOCK data[2];
-} USER_SESSION_KEY, *PUSER_SESSION_KEY;
-typedef CLEAR_BLOCK LM_CHALLENGE, *PLM_CHALLENGE;
-typedef LM_OWF_PASSWORD NT_OWF_PASSWORD, *PNT_OWF_PASSWORD;
-typedef LM_CHALLENGE NT_CHALLENGE, *PNT_CHALLENGE;
-typedef struct _LOGON_HOURS {
-  USHORT UnitsPerWeek;
-  PUCHAR LogonHours;
-} LOGON_HOURS, *PLOGON_HOURS;
-typedef struct _SR_SECURITY_DESCRIPTOR {
-  ULONG Length;
-  PUCHAR SecurityDescriptor;
-} SR_SECURITY_DESCRIPTOR, *PSR_SECURITY_DESCRIPTOR;
-#pragma pack(push,4)
-typedef struct _USER_ALL_INFORMATION {
-  LARGE_INTEGER LastLogon;
-  LARGE_INTEGER LastLogoff;
-  LARGE_INTEGER PasswordLastSet;
-  LARGE_INTEGER AccountExpires;
-  LARGE_INTEGER PasswordCanChange;
-  LARGE_INTEGER PasswordMustChange;
-  UNICODE_STRING UserName;
-  UNICODE_STRING FullName;
-  UNICODE_STRING HomeDirectory;
-  UNICODE_STRING HomeDirectoryDrive;
-  UNICODE_STRING ScriptPath;
-  UNICODE_STRING ProfilePath;
-  UNICODE_STRING AdminComment;
-  UNICODE_STRING WorkStations;
-  UNICODE_STRING UserComment;
-  UNICODE_STRING Parameters;
-  UNICODE_STRING LmPassword;
-  UNICODE_STRING NtPassword;
-  UNICODE_STRING PrivateData;
-  SR_SECURITY_DESCRIPTOR SecurityDescriptor;
-  ULONG UserId;
-  ULONG PrimaryGroupId;
-  ULONG UserAccountControl;
-  ULONG WhichFields;
-  LOGON_HOURS LogonHours;
-  USHORT BadPasswordCount;
-  USHORT LogonCount;
-  USHORT CountryCode;
-  USHORT CodePage;
-  BOOLEAN LmPasswordPresent;
-  BOOLEAN NtPasswordPresent;
-  BOOLEAN PasswordExpired;
-  BOOLEAN PrivateDataSensitive;
-} USER_ALL_INFORMATION, *PUSER_ALL_INFORMATION;
-#pragma pack(pop)
-typedef struct _MSV1_0_VALIDATION_INFO {
-  LARGE_INTEGER LogoffTime;
-  LARGE_INTEGER KickoffTime;
-  UNICODE_STRING LogonServer;
-  UNICODE_STRING LogonDomainName;
-  USER_SESSION_KEY SessionKey;
-  BOOLEAN Authoritative;
-  ULONG UserFlags;
-  ULONG WhichFields;
-  ULONG UserId;
-} MSV1_0_VALIDATION_INFO, *PMSV1_0_VALIDATION_INFO;
-typedef struct _NETLOGON_LOGON_IDENTITY_INFO {
-  UNICODE_STRING LogonDomainName;
-  ULONG ParameterControl;
-  OLD_LARGE_INTEGER LogonId;
-  UNICODE_STRING UserName;
-  UNICODE_STRING Workstation;
-} NETLOGON_LOGON_IDENTITY_INFO, *PNETLOGON_LOGON_IDENTITY_INFO;
-typedef struct _NETLOGON_INTERACTIVE_INFO {
-  NETLOGON_LOGON_IDENTITY_INFO Identity;
-  LM_OWF_PASSWORD LmOwfPassword;
-  NT_OWF_PASSWORD NtOwfPassword;
-} NETLOGON_INTERACTIVE_INFO, *PNETLOGON_INTERACTIVE_INFO;
-typedef struct _NETLOGON_GENERIC_INFO {
-  NETLOGON_LOGON_IDENTITY_INFO Identity;
-  UNICODE_STRING PackageName;
-  ULONG DataLength;
-  PUCHAR LogonData;
-} NETLOGON_GENERIC_INFO, *PNETLOGON_GENERIC_INFO;
-typedef struct _NETLOGON_NETWORK_INFO {
-  NETLOGON_LOGON_IDENTITY_INFO Identity;
-  LM_CHALLENGE LmChallenge;
-  STRING NtChallengeResponse;
-  STRING LmChallengeResponse;
-} NETLOGON_NETWORK_INFO, *PNETLOGON_NETWORK_INFO;
-typedef struct _NETLOGON_SERVICE_INFO {
-  NETLOGON_LOGON_IDENTITY_INFO Identity;
-  LM_OWF_PASSWORD LmOwfPassword;
-  NT_OWF_PASSWORD NtOwfPassword;
-} NETLOGON_SERVICE_INFO, *PNETLOGON_SERVICE_INFO;
-NTSTATUS NTAPI Msv1_0SubAuthenticationRoutine(NETLOGON_LOGON_INFO_CLASS,PVOID,
-                              ULONG,PUSER_ALL_INFORMATION,PULONG,PULONG,
-                              PBOOLEAN,PLARGE_INTEGER,PLARGE_INTEGER);
-NTSTATUS NTAPI Msv1_0SubAuthenticationFilter(NETLOGON_LOGON_INFO_CLASS,PVOID,
-                              ULONG,PUSER_ALL_INFORMATION,PULONG,PULONG,
-                              PBOOLEAN,PLARGE_INTEGER,PLARGE_INTEGER);
-NTSTATUS NTAPI Msv1_0SubAuthenticationRoutineGeneric(PVOID,ULONG,PULONG,PVOID*);
-NTSTATUS NTAPI Msv1_0SubAuthenticationRoutineEx(NETLOGON_LOGON_INFO_CLASS,PVOID,
-                              ULONG,PUSER_ALL_INFORMATION,SAM_HANDLE,
-                              PMSV1_0_VALIDATION_INFO,PULONG);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _SUBAUTH_H */
diff --git a/winsup/w32api/include/svcguid.h b/winsup/w32api/include/svcguid.h
deleted file mode 100644
index 65072808c..000000000
--- a/winsup/w32api/include/svcguid.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _SVCGUID_H
-#define _SVCGUID_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SVCID_NETWARE(_SapId) \
-	{ (0x000B << 16) | (_SapId), 0, 0, { 0xC0,0,0,0,0,0,0,0x46 } }
-
-#define SAPID_FROM_SVCID_NETWARE(_g) \
-	((WORD)(_g->Data1 & 0xFFFF))
-
-#define SET_NETWARE_SVCID(_g,_SapId) { \
-	(_g)->Data1 = (0x000B << 16 ) | (_SapId); \
-	(_g)->Data2 = 0; \
-	(_g)->Data3 = 0; \
-	(_g)->Data4[0] = 0xC0; \
-	(_g)->Data4[1] = 0x0; \
-	(_g)->Data4[2] = 0x0; \
-	(_g)->Data4[3] = 0x0; \
-	(_g)->Data4[4] = 0x0; \
-	(_g)->Data4[5] = 0x0; \
-	(_g)->Data4[6] = 0x0; \
-	(_g)->Data4[7] = 0x46; }
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/tlhelp32.h b/winsup/w32api/include/tlhelp32.h
deleted file mode 100644
index e92838006..000000000
--- a/winsup/w32api/include/tlhelp32.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-	tlhelp32.h - Include file for Tool help functions.
-
-	Written by Mumit Khan <khan@nanotech.wisc.edu>
-
-	This file is part of a free library for the Win32 API. 
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-*/
-#ifndef _TLHELP32_H
-#define _TLHELP32_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define HF32_DEFAULT	1
-#define HF32_SHARED	2
-#define LF32_FIXED	0x1
-#define LF32_FREE	0x2
-#define LF32_MOVEABLE	0x4
-#define MAX_MODULE_NAME32	255
-#define TH32CS_SNAPHEAPLIST	0x1
-#define TH32CS_SNAPPROCESS	0x2
-#define TH32CS_SNAPTHREAD	0x4
-#define TH32CS_SNAPMODULE	0x8
-#define TH32CS_SNAPALL	(TH32CS_SNAPHEAPLIST|TH32CS_SNAPPROCESS|TH32CS_SNAPTHREAD|TH32CS_SNAPMODULE)
-#define TH32CS_INHERIT	0x80000000
-typedef struct tagHEAPLIST32 {
-	DWORD dwSize;
-	DWORD th32ProcessID;
-	DWORD th32HeapID;
-	DWORD dwFlags;
-} HEAPLIST32,*PHEAPLIST32,*LPHEAPLIST32;
-typedef struct tagHEAPENTRY32 {
-	DWORD dwSize;
-	HANDLE hHandle;
-	DWORD dwAddress;
-	DWORD dwBlockSize;
-	DWORD dwFlags;
-	DWORD dwLockCount;
-	DWORD dwResvd;
-	DWORD th32ProcessID;
-	DWORD th32HeapID;
-} HEAPENTRY32,*PHEAPENTRY32,*LPHEAPENTRY32;
-typedef struct tagPROCESSENTRY32W {
-	DWORD dwSize;
-	DWORD cntUsage;
-	DWORD th32ProcessID;
-	DWORD th32DefaultHeapID;
-	DWORD th32ModuleID;
-	DWORD cntThreads;
-	DWORD th32ParentProcessID;
-	LONG pcPriClassBase;
-	DWORD dwFlags;
-	WCHAR szExeFile[MAX_PATH];
-} PROCESSENTRY32W,*PPROCESSENTRY32W,*LPPROCESSENTRY32W;
-typedef struct tagPROCESSENTRY32 {
-	DWORD dwSize;
-	DWORD cntUsage;
-	DWORD th32ProcessID;
-	DWORD th32DefaultHeapID;
-	DWORD th32ModuleID;
-	DWORD cntThreads;
-	DWORD th32ParentProcessID;
-	LONG pcPriClassBase;
-	DWORD dwFlags;
-	CHAR  szExeFile[MAX_PATH];
-} PROCESSENTRY32,*PPROCESSENTRY32,*LPPROCESSENTRY32;
-typedef struct tagTHREADENTRY32 {
-	DWORD dwSize;
-	DWORD cntUsage;
-	DWORD th32ThreadID;
-	DWORD th32OwnerProcessID;
-	LONG tpBasePri;
-	LONG tpDeltaPri;
-	DWORD dwFlags;
-} THREADENTRY32,*PTHREADENTRY32,*LPTHREADENTRY32;
-typedef struct tagMODULEENTRY32W {
-	DWORD dwSize;
-	DWORD th32ModuleID;
-	DWORD th32ProcessID;
-	DWORD GlblcntUsage;
-	DWORD ProccntUsage;
-	BYTE *modBaseAddr;
-	DWORD modBaseSize;
-	HMODULE hModule; 
-	WCHAR szModule[MAX_MODULE_NAME32 + 1];
-	WCHAR szExePath[MAX_PATH];
-} MODULEENTRY32W,*PMODULEENTRY32W,*LPMODULEENTRY32W;
-typedef struct tagMODULEENTRY32 {
-	DWORD dwSize;
-	DWORD th32ModuleID;
-	DWORD th32ProcessID;
-	DWORD GlblcntUsage;
-	DWORD ProccntUsage;
-	BYTE *modBaseAddr;
-	DWORD modBaseSize;
-	HMODULE hModule;
-	char szModule[MAX_MODULE_NAME32 + 1];
-	char szExePath[MAX_PATH];
-} MODULEENTRY32,*PMODULEENTRY32,*LPMODULEENTRY32;
-BOOL WINAPI Heap32First(LPHEAPENTRY32,DWORD,DWORD);
-BOOL WINAPI Heap32ListFirst(HANDLE,LPHEAPLIST32);
-BOOL WINAPI Heap32ListNext(HANDLE,LPHEAPLIST32);
-BOOL WINAPI Heap32Next(LPHEAPENTRY32);
-BOOL WINAPI Module32First(HANDLE,LPMODULEENTRY32);
-BOOL WINAPI Module32FirstW(HANDLE,LPMODULEENTRY32W);
-BOOL WINAPI Module32Next(HANDLE,LPMODULEENTRY32);
-BOOL WINAPI Module32NextW(HANDLE,LPMODULEENTRY32W);
-BOOL WINAPI Process32First(HANDLE,LPPROCESSENTRY32);
-BOOL WINAPI Process32FirstW(HANDLE,LPPROCESSENTRY32W);
-BOOL WINAPI Process32Next(HANDLE,LPPROCESSENTRY32);
-BOOL WINAPI Process32NextW(HANDLE,LPPROCESSENTRY32W);
-BOOL WINAPI Thread32First(HANDLE,LPTHREADENTRY32);
-BOOL WINAPI Thread32Next(HANDLE,LPTHREADENTRY32);
-BOOL WINAPI Toolhelp32ReadProcessMemory(DWORD,LPCVOID,LPVOID,DWORD,LPDWORD);
-HANDLE WINAPI CreateToolhelp32Snapshot(DWORD,DWORD);
-#ifdef UNICODE
-#define LPMODULEENTRY32 LPMODULEENTRY32W
-#define LPPROCESSENTRY32 LPPROCESSENTRY32W
-#define MODULEENTRY32 MODULEENTRY32W
-#define Module32First Module32FirstW
-#define Module32Next Module32NextW
-#define PMODULEENTRY32 PMODULEENTRY32W
-#define PPROCESSENTRY32 PPROCESSENTRY32W
-#define PROCESSENTRY32 PROCESSENTRY32W
-#define Process32First Process32FirstW
-#define Process32Next Process32NextW
-#endif /* UNICODE */
-#ifdef __cplusplus
-}
-#endif
-#endif /* _TLHELP32_H */
-
diff --git a/winsup/w32api/include/tmschema.h b/winsup/w32api/include/tmschema.h
deleted file mode 100644
index 58cf8fa17..000000000
--- a/winsup/w32api/include/tmschema.h
+++ /dev/null
@@ -1,664 +0,0 @@
-#ifndef _TMSCHEMA_H

-#define _TMSCHEMA_H

-#if __GNUC__ >= 3

-#pragma GCC system_header

-#endif

-

-/* BUTTON parts */

-enum {

-	BP_PUSHBUTTON = 1,

-	BP_RADIOBUTTON = 2,

-	BP_CHECKBOX = 3,

-	BP_GROUPBOX = 4,

-	BP_USERBUTTON = 5

-};

-enum {

-	CBS_UNCHECKEDNORMAL = 1,

-	CBS_UNCHECKEDHOT = 2,

-	CBS_UNCHECKEDPRESSED = 3,

-	CBS_UNCHECKEDDISABLED = 4,

-	CBS_CHECKEDNORMAL = 5,

-	CBS_CHECKEDHOT = 6,

-	CBS_CHECKEDPRESSED = 7,

-	CBS_CHECKEDDISABLED = 8,

-	CBS_MIXEDNORMAL = 9,

-	CBS_MIXEDHOT = 10,

-	CBS_MIXEDPRESSED = 11,

-	CBS_MIXEDDISABLED = 12

-};

-enum {

-	GBS_NORMAL = 1,

-	GBS_DISABLED = 2

-};

-enum {

-	PBS_NORMAL = 1,

-	PBS_HOT = 2,

-	PBS_PRESSED = 3,

-	PBS_DISABLED = 4,

-	PBS_DEFAULTED = 5

-};

-enum {

-	RBS_UNCHECKEDNORMAL = 1,

-	RBS_UNCHECKEDHOT = 2,

-	RBS_UNCHECKEDPRESSED = 3,

-	RBS_UNCHECKEDDISABLED = 4,

-	RBS_CHECKEDNORMAL = 5,

-	RBS_CHECKEDHOT = 6,

-	RBS_CHECKEDPRESSED = 7,

-	RBS_CHECKEDDISABLED = 8

-};

-/* CLOCK parts */

-enum {

-	CLP_TIME = 1

-};

-enum {

-	CLS_NORMAL = 1

-};

-/* COMBOBOX parts */

-enum {

-	CP_DROPDOWNBUTTON = 1

-};

-enum {

-	CBXS_NORMAL = 1,

-	CBXS_HOT = 2,

-	CBXS_PRESSED = 3,

-	CBXS_DISABLED = 4

-};

-/* EDIT parts */

-enum {

-	EP_EDITTEXT = 1,

-	EP_CARET = 2

-};

-enum {

-	ETS_NORMAL = 1,

-	ETS_HOT = 2,

-	ETS_SELECTED = 3,

-	ETS_DISABLED = 4,

-	ETS_FOCUSED = 5,

-	ETS_READONLY = 6,

-	ETS_ASSIST = 7

-};

-/* EXPLORERBAR parts */

-enum {

-	EBP_HEADERBACKGROUND = 1,

-	EBP_HEADERCLOSE = 2,

-	EBP_HEADERPIN = 3,

-	EBP_IEBARMENU = 4,

-	EBP_NORMALGROUPBACKGROUND = 5,

-	EBP_NORMALGROUPCOLLAPSE = 6,

-	EBP_NORMALGROUPEXPAND = 7,

-	EBP_NORMALGROUPHEAD = 8,

-	EBP_SPECIALGROUPBACKGROUND = 9,

-	EBP_SPECIALGROUPCOLLAPSE = 10,

-	EBP_SPECIALGROUPEXPAND = 11,

-	EBP_SPECIALGROUPHEAD = 12

-};

-enum {

-	EBHC_NORMAL = 1,

-	EBHC_HOT = 2,

-	EBHC_PRESSED = 3

-};

-enum {

-	EBHP_NORMAL = 1,

-	EBHP_HOT = 2,

-	EBHP_PRESSED = 3,

-	EBHP_SELECTEDNORMAL = 4,

-	EBHP_SELECTEDHOT = 5,

-	EBHP_SELECTEDPRESSED = 6

-};

-enum {

-	EBM_NORMAL = 1,

-	EBM_HOT = 2,

-	EBM_PRESSED = 3

-};

-enum {

-	EBNGC_NORMAL = 1,

-	EBNGC_HOT = 2,

-	EBNGC_PRESSED = 3

-};

-enum {

-	EBNGE_NORMAL = 1,

-	EBNGE_HOT = 2,

-	EBNGE_PRESSED = 3

-};

-enum {

-	EBSGC_NORMAL = 1,

-	EBSGC_HOT = 2,

-	EBSGC_PRESSED = 3

-};

-enum {

-	EBSGE_NORMAL = 1,

-	EBSGE_HOT = 2,

-	EBSGE_PRESSED = 3

-};

-/* HEADER parts */

-enum {

-	HP_HEADERITEM = 1,

-	HP_HEADERITEMLEFT = 2,

-	HP_HEADERITEMRIGHT = 3,

-	HP_HEADERSORTARROW = 4

-};

-enum {

-	HIS_NORMAL = 1,

-	HIS_HOT = 2,

-	HIS_PRESSED = 3

-};

-enum {

-	HILS_NORMAL = 1,

-	HILS_HOT = 2,

-	HILS_PRESSED = 3

-};

-enum {

-	HIRS_NORMAL = 1,

-	HIRS_HOT = 2,

-	HIRS_PRESSED = 3

-};

-enum {

-	HSAS_SORTEDUP = 1,

-	HSAS_SORTEDDOWN = 2

-};

-/* LISTVIEW parts */

-enum {

-	LVP_LISTITEM = 1,

-	LVP_LISTGROUP = 2,

-	LVP_LISTDETAIL = 3,

-	LVP_LISTSORTEDDETAIL = 4,

-	LVP_EMPTYTEXT = 5

-};

-enum {

-	LIS_NORMAL = 1,

-	LIS_HOT = 2,

-	LIS_SELECTED = 3,

-	LIS_DISABLED = 4,

-	LIS_SELECTEDNOTFOCUS = 5

-};

-/* MENU parts */

-enum {

-	MP_MENUITEM = 1,

-	MP_MENUDROPDOWN = 2,

-	MP_MENUBARITEM = 3,

-	MP_MENUBARDROPDOWN = 4,

-	MP_CHEVRON = 5,

-	MP_SEPARATOR = 6

-};

-enum {

-	MS_NORMAL = 1,

-	MS_SELECTED = 2,

-	MS_DEMOTED = 3

-};

-/* MENUBAND parts */

-enum {

-	MDP_NEWAPPBUTTON = 1,

-	MDP_SEPERATOR = 2

-};

-enum {

-	MDS_NORMAL = 1,

-	MDS_HOT = 2,

-	MDS_PRESSED = 3,

-	MDS_DISABLED = 4,

-	MDS_CHECKED = 5,

-	MDS_HOTCHECKED = 6

-};

-/* PAGE parts */

-enum {

-	PGRP_UP = 1,

-	PGRP_DOWN = 2,

-	PGRP_UPHORZ = 3,

-	PGRP_DOWNHORZ = 4

-};

-enum {

-	DNS_NORMAL = 1,

-	DNS_HOT = 2,

-	DNS_PRESSED = 3,

-	DNS_DISABLED = 4

-};

-enum {

-	DNHZS_NORMAL = 1,

-	DNHZS_HOT = 2,

-	DNHZS_PRESSED = 3,

-	DNHZS_DISABLED = 4

-};

-enum {

-	UPS_NORMAL = 1,

-	UPS_HOT = 2,

-	UPS_PRESSED = 3,

-	UPS_DISABLED = 4

-};

-enum {

-	UPHZS_NORMAL = 1,

-	UPHZS_HOT = 2,

-	UPHZS_PRESSED = 3,

-	UPHZS_DISABLED = 4

-};

-/* PROGRESS parts */

-enum {

-	PP_BAR = 1,

-	PP_BARVERT = 2,

-	PP_CHUNK = 3,

-	PP_CHUNKVERT = 4

-};

-/* REBAR parts */

-enum {

-	RP_GRIPPER = 1,

-	RP_GRIPPERVERT = 2,

-	RP_BAND = 3,

-	RP_CHEVRON = 4,

-	RP_CHEVRONVERT = 5

-};

-enum {

-	CHEVS_NORMAL = 1,

-	CHEVS_HOT = 2,

-	CHEVS_PRESSED = 3

-};

-/* SCROLLBAR parts */

-enum {

-	SBP_ARROWBTN = 1,

-	SBP_THUMBBTNHORZ = 2,

-	SBP_THUMBBTNVERT = 3,

-	SBP_LOWERTRACKHORZ = 4,

-	SBP_UPPERTRACKHORZ = 5,

-	SBP_LOWERTRACKVERT = 6,

-	SBP_UPPERTRACKVERT = 7,

-	SBP_GRIPPERHORZ = 8,

-	SBP_GRIPPERVERT = 9,

-	SBP_SIZEBOX = 10

-};

-enum {

-	ABS_UPNORMAL = 1,

-	ABS_UPHOT = 2,

-	ABS_UPPRESSED = 3,

-	ABS_UPDISABLED = 4,

-	ABS_DOWNNORMAL = 5,

-	ABS_DOWNHOT = 6,

-	ABS_DOWNPRESSED = 7,

-	ABS_DOWNDISABLED = 8,

-	ABS_LEFTNORMAL = 9,

-	ABS_LEFTHOT = 10,

-	ABS_LEFTPRESSED = 11,

-	ABS_LEFTDISABLED = 12,

-	ABS_RIGHTNORMAL = 13,

-	ABS_RIGHTHOT = 14,

-	ABS_RIGHTPRESSED = 15,

-	ABS_RIGHTDISABLED = 16

-};

-enum {

-	SCRBS_NORMAL = 1,

-	SCRBS_HOT = 2,

-	SCRBS_PRESSED = 3,

-	SCRBS_DISABLED = 4

-};

-enum {

-	SZB_RIGHTALIGN = 1,

-	SZB_LEFTALIGN = 2

-};

-/* SPIN parts */

-enum {

-	SPNP_UP = 1,

-	SPNP_DOWN = 2,

-	SPNP_UPHORZ = 3,

-	SPNP_DOWNHORZ = 4

-};

-/* STARTPANEL parts */

-enum {

-	SPP_USERPANE = 1,

-	SPP_MOREPROGRAMS = 2,

-	SPP_MOREPROGRAMSARROW = 3,

-	SPP_PROGLIST = 4,

-	SPP_PROGLISTSEPARATOR = 5,

-	SPP_PLACESLIST = 6,

-	SPP_PLACESLISTSEPARATOR = 7,

-	SPP_LOGOFF = 8,

-	SPP_LOGOFFBUTTONS = 9,

-	SPP_USERPICTURE = 10,

-	SPP_PREVIEW = 11

-};

-enum {

-	SPLS_NORMAL = 1,

-	SPLS_HOT = 2,

-	SPLS_PRESSED = 3

-};

-enum {

-	SPS_NORMAL = 1,

-	SPS_HOT = 2,

-	SPS_PRESSED = 3

-};

-/* STATUS parts */

-enum {

-	SP_PANE = 1,

-	SP_GRIPPERPANE = 2,

-	SP_GRIPPER = 3

-};

-/* TAB parts */

-enum {

-	TABP_TABITEM = 1,

-	TABP_TABITEMLEFTEDGE = 2,

-	TABP_TABITEMRIGHTEDGE = 3,

-	TABP_TABITEMBOTHEDGE = 4,

-	TABP_TOPTABITEM = 5,

-	TABP_TOPTABITEMLEFTEDGE = 6,

-	TABP_TOPTABITEMRIGHTEDGE = 7,

-	TABP_TOPTABITEMBOTHEDGE = 8,

-	TABP_PANE = 9,

-	TABP_BODY = 10

-};

-enum {

-	TIS_NORMAL = 1,

-	TIS_HOT = 2,

-	TIS_SELECTED = 3,

-	TIS_DISABLED = 4,

-	TIS_FOCUSED = 5

-};

-enum {

-	TIBES_NORMAL = 1,

-	TIBES_HOT = 2,

-	TIBES_SELECTED = 3,

-	TIBES_DISABLED = 4,

-	TIBES_FOCUSED = 5

-};

-enum {

-	TILES_NORMAL = 1,

-	TILES_HOT = 2,

-	TILES_SELECTED = 3,

-	TILES_DISABLED = 4,

-	TILES_FOCUSED = 5

-};

-enum {

-	TIRES_NORMAL = 1,

-	TIRES_HOT = 2,

-	TIRES_SELECTED = 3,

-	TIRES_DISABLED = 4,

-	TIRES_FOCUSED = 5

-};

-enum {

-	TTIS_NORMAL = 1,

-	TTIS_HOT = 2,

-	TTIS_SELECTED = 3,

-	TTIS_DISABLED = 4,

-	TTIS_FOCUSED = 5

-};

-enum {

-	TTIBES_NORMAL = 1,

-	TTIBES_HOT = 2,

-	TTIBES_SELECTED = 3,

-	TTIBES_DISABLED = 4,

-	TTIBES_FOCUSED = 5

-};

-enum {

-	TTILES_NORMAL = 1,

-	TTILES_HOT = 2,

-	TTILES_SELECTED = 3,

-	TTILES_DISABLED = 4,

-	TTILES_FOCUSED = 5

-};

-enum {

-	TTIRES_NORMAL = 1,

-	TTIRES_HOT = 2,

-	TTIRES_SELECTED = 3,

-	TTIRES_DISABLED = 4,

-	TTIRES_FOCUSED = 5

-};

-/* TASKBAND parts */

-enum {

-	TDP_GROUPCOUNT = 1,

-	TDP_FLASHBUTTON = 2,

-	TDP_FLASHBUTTONGROUPMENU = 3

-};

-/* TASKBAR parts */

-enum {

-	TBP_BACKGROUNDBOTTOM = 1,

-	TBP_BACKGROUNDRIGHT = 2,

-	TBP_BACKGROUNDTOP = 3,

-	TBP_BACKGROUNDLEFT = 4,

-	TBP_SIZINGBARBOTTOM = 5,

-	TBP_SIZINGBARRIGHT = 6,

-	TBP_SIZINGBARTOP = 7,

-	TBP_SIZINGBARLEFT = 8

-};

-/* TOOLBAR parts */

-enum {

-	TP_BUTTON = 1,

-	TP_DROPDOWNBUTTON = 2,

-	TP_SPLITBUTTON = 3,

-	TP_SPLITBUTTONDROPDOWN = 4,

-	TP_SEPARATOR = 5,

-	TP_SEPARATORVERT = 6

-};

-enum {

-	TS_NORMAL = 1,

-	TS_HOT = 2,

-	TS_PRESSED = 3,

-	TS_DISABLED = 4,

-	TS_CHECKED = 5,

-	TS_HOTCHECKED = 6

-};

-/* TOOLTIP parts */

-enum {

-	TTP_STANDARD = 1,

-	TTP_STANDARDTITLE = 2,

-	TTP_BALLOON = 3,

-	TTP_BALLOONTITLE = 4,

-	TTP_CLOSE = 5

-};

-enum {

-	TTBS_NORMAL = 1,

-	TTBS_LINK = 2

-};

-enum {

-	TTCS_NORMAL = 1,

-	TTCS_HOT = 2,

-	TTCS_PRESSED = 3

-};

-enum {

-	TTSS_NORMAL = 1,

-	TTSS_LINK = 2

-};

-/* TRACKBAR parts */

-enum {

-	TKP_TRACK = 1,

-	TKP_TRACKVERT = 2,

-	TKP_THUMB = 3,

-	TKP_THUMBBOTTOM = 4,

-	TKP_THUMBTOP = 5,

-	TKP_THUMBVERT = 6,

-	TKP_THUMBLEFT = 7,

-	TKP_THUMBRIGHT = 8,

-	TKP_TICS = 9,

-	TKP_TICSVERT = 10

-};

-enum {

-	TUS_NORMAL = 1,

-	TUS_HOT = 2,

-	TUS_PRESSED = 3,

-	TUS_FOCUSED = 4,

-	TUS_DISABLED = 5

-};

-enum {

-	TUBS_NORMAL = 1,

-	TUBS_HOT = 2,

-	TUBS_PRESSED = 3,

-	TUBS_FOCUSED = 4,

-	TUBS_DISABLED = 5

-};

-enum {

-	TUVLS_NORMAL = 1,

-	TUVLS_HOT = 2,

-	TUVLS_PRESSED = 3,

-	TUVLS_FOCUSED = 4,

-	TUVLS_DISABLED = 5

-};

-enum {

-	TUVRS_NORMAL = 1,

-	TUVRS_HOT = 2,

-	TUVRS_PRESSED = 3,

-	TUVRS_FOCUSED = 4,

-	TUVRS_DISABLED = 5

-};

-enum {

-	TUTS_NORMAL = 1,

-	TUTS_HOT = 2,

-	TUTS_PRESSED = 3,

-	TUTS_FOCUSED = 4,

-	TUTS_DISABLED = 5

-};

-enum {

-	TUVS_NORMAL = 1,

-	TUVS_HOT = 2,

-	TUVS_PRESSED = 3,

-	TUVS_FOCUSED = 4,

-	TUVS_DISABLED = 5

-};

-enum {

-	TSS_NORMAL = 1

-};

-enum {

-	TSVS_NORMAL = 1

-};

-enum {

-	TRS_NORMAL = 1

-};

-enum {

-	TRVS_NORMAL = 1

-};

-/* TRAYNOTIFY parts */

-enum {

-	TNP_BACKGROUND = 1,

-	TNP_ANIMBACKGROUND = 2

-};

-/* TREEVIEW parts */

-enum {

-	TVP_TREEITEM = 1,

-	TVP_GLYPH = 2,

-	TVP_BRANCH = 3

-};

-enum {

-	GLPS_CLOSED = 1,

-	GLPS_OPENED = 2

-};

-enum {

-	TREIS_NORMAL = 1,

-	TREIS_HOT = 2,

-	TREIS_SELECTED = 3,

-	TREIS_DISABLED = 4,

-	TREIS_SELECTEDNOTFOCUS = 5

-};

-/* WINDOW parts */

-enum {

-	WP_CAPTION = 1,

-	WP_SMALLCAPTION = 2,

-	WP_MINCAPTION = 3,

-	WP_SMALLMINCAPTION = 4,

-	WP_MAXCAPTION = 5,

-	WP_SMALLMAXCAPTION = 6,

-	WP_FRAMELEFT = 7,

-	WP_FRAMERIGHT = 8,

-	WP_FRAMEBOTTOM = 9,

-	WP_SMALLFRAMELEFT = 10,

-	WP_SMALLFRAMERIGHT = 11,

-	WP_SMALLFRAMEBOTTOM = 12,

-	WP_SYSBUTTON = 13,

-	WP_MDISYSBUTTON = 14,

-	WP_MINBUTTON = 15,

-	WP_MDIMINBUTTON = 16,

-	WP_MAXBUTTON = 17,

-	WP_CLOSEBUTTON = 18,

-	WP_SMALLCLOSEBUTTON = 19,

-	WP_MDICLOSEBUTTON = 20,

-	WP_RESTOREBUTTON = 21,

-	WP_MDIRESTOREBUTTON = 22,

-	WP_HELPBUTTON = 23,

-	WP_MDIHELPBUTTON = 24,

-	WP_HORZSCROLL = 25,

-	WP_HORZTHUMB = 26,

-	WP_VERTSCROLL = 27,

-	WP_VERTTHUMB = 28,

-	WP_DIALOG = 29,

-	WP_CAPTIONSIZINGTEMPLATE = 30,

-	WP_SMALLCAPTIONSIZINGTEMPLATE = 31,

-	WP_FRAMELEFTSIZINGTEMPLATE = 32,

-	WP_SMALLFRAMELEFTSIZINGTEMPLATE = 33,

-	WP_FRAMERIGHTSIZINGTEMPLATE = 34,

-	WP_SMALLFRAMERIGHTSIZINGTEMPLATE = 35,

-	WP_FRAMEBOTTOMSIZINGTEMPLATE = 36,

-	WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE = 37

-};

-enum {

-	CS_ACTIVE = 1,

-	CS_INACTIVE = 2,

-	CS_DISABLED = 3

-};

-enum {

-	CBS_NORMAL = 1,

-	CBS_HOT = 2,

-	CBS_PUSHED = 3,

-	CBS_DISABLED = 4

-};

-enum {

-	FS_ACTIVE = 1,

-	FS_INACTIVE = 2

-};

-enum {

-	HBS_NORMAL = 1,

-	HBS_HOT = 2,

-	HBS_PUSHED = 3,

-	HBS_DISABLED = 4

-};

-enum {

-	HSS_NORMAL = 1,

-	HSS_HOT = 2,

-	HSS_PUSHED = 3,

-	HSS_DISABLED = 4

-};

-enum {

-	HTS_NORMAL = 1,

-	HTS_HOT = 2,

-	HTS_PUSHED = 3,

-	HTS_DISABLED = 4

-};

-enum {

-	MAXBS_NORMAL = 1,

-	MAXBS_HOT = 2,

-	MAXBS_PUSHED = 3,

-	MAXBS_DISABLED = 4

-};

-enum {

-	MXCS_ACTIVE = 1,

-	MXCS_INACTIVE = 2,

-	MXCS_DISABLED = 3

-};

-enum {

-	MINBS_NORMAL = 1,

-	MINBS_HOT = 2,

-	MINBS_PUSHED = 3,

-	MINBS_DISABLED = 4

-};

-enum {

-	RBS_NORMAL = 1,

-	RBS_HOT = 2,

-	RBS_PUSHED = 3,

-	RBS_DISABLED = 4

-};

-enum {

-	SBS_NORMAL = 1,

-	SBS_HOT = 2,

-	SBS_PUSHED = 3,

-	SBS_DISABLED = 4

-};

-enum {

-	MNCS_ACTIVE = 1,

-	MNCS_INACTIVE = 2,

-	MNCS_DISABLED = 3

-};

-enum {

-	VSS_NORMAL = 1,

-	VSS_HOT = 2,

-	VSS_PUSHED = 3,

-	VSS_DISABLED = 4

-};

-enum {

-	VTS_NORMAL = 1,

-	VTS_HOT = 2,

-	VTS_PUSHED = 3,

-	VTS_DISABLED = 4

-};

-

-#endif

diff --git a/winsup/w32api/include/unknwn.h b/winsup/w32api/include/unknwn.h
deleted file mode 100644
index 20a75afc5..000000000
--- a/winsup/w32api/include/unknwn.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef COM_NO_WINDOWS_H
-#include <windows.h>
-#endif
-
-#ifndef _UNKNWN_H
-#define _UNKNWN_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C"{
-#endif
-#include <objfwd.h>
-#include <wtypes.h>
-
-void * __RPC_USER MIDL_user_allocate(size_t);
-void __RPC_USER MIDL_user_free(void*);
-EXTERN_C const IID IID_IUnknown;
-EXTERN_C const IID IID_IClassFactory;
-#ifndef __IUnknown_INTERFACE_DEFINED__
-#define __IUnknown_INTERFACE_DEFINED__
-#undef INTERFACE
-#define INTERFACE IUnknown
-DECLARE_INTERFACE(IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-};
-typedef IUnknown *LPUNKNOWN;
-#endif
-#ifndef __IClassFactory_INTERFACE_DEFINED__
-#define __IClassFactory_INTERFACE_DEFINED__
-#undef INTERFACE
-#define INTERFACE IClassFactory
-DECLARE_INTERFACE_(IClassFactory,IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(CreateInstance)(THIS_ LPUNKNOWN,REFIID,PVOID*) PURE;
-	STDMETHOD(LockServer)(THIS_ BOOL) PURE;
-};
-typedef IClassFactory *LPCLASSFACTORY;
-#endif
-HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown*,REFIID,void**);
-void __RPC_STUB IUnknown_QueryInterface_Stub(LPRPCSTUBBUFFER,LPRPCCHANNELBUFFER,PRPC_MESSAGE,PDWORD);
-ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown*);
-void __RPC_STUB IUnknown_AddRef_Stub(LPRPCSTUBBUFFER,LPRPCCHANNELBUFFER,PRPC_MESSAGE,PDWORD);
-ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown*);
-void __RPC_STUB IUnknown_Release_Stub(LPRPCSTUBBUFFER,LPRPCCHANNELBUFFER,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IClassFactory_RemoteCreateInstance_Proxy(IClassFactory*,REFIID,IUnknown**);
-void __RPC_STUB IClassFactory_RemoteCreateInstance_Stub(LPRPCSTUBBUFFER,LPRPCCHANNELBUFFER,PRPC_MESSAGE,PDWORD);
-HRESULT __stdcall IClassFactory_RemoteLockServer_Proxy(IClassFactory*,BOOL);
-void __RPC_STUB IClassFactory_RemoteLockServer_Stub(LPRPCSTUBBUFFER,LPRPCCHANNELBUFFER,PRPC_MESSAGE,PDWORD);
-HRESULT STDMETHODCALLTYPE IClassFactory_CreateInstance_Proxy(IClassFactory*,IUnknown*,REFIID,void**);
-HRESULT STDMETHODCALLTYPE IClassFactory_CreateInstance_Stub(IClassFactory*,REFIID,IUnknown**);
-HRESULT STDMETHODCALLTYPE IClassFactory_LockServer_Proxy(IClassFactory*,BOOL);
-HRESULT STDMETHODCALLTYPE IClassFactory_LockServer_Stub(IClassFactory*,BOOL);
-
-#if (!defined (__cplusplus) || defined (CINTERFACE)) \
-    && defined (COBJMACROS)
-#define IUnknown_QueryInterface(T,r,O) (T)->lpVtbl->QueryInterface(T,r,O)
-#define IUnknown_AddRef(T) (T)->lpVtbl->AddRef(T)
-#define IUnknown_Release(T) (T)->lpVtbl->Release(T)
-#define IClassFactory_QueryInterface(T,r,O) (T)->lpVtbl->QueryInterface(T,r,O)
-#define IClassFactory_AddRef(T) (T)->lpVtbl->AddRef(T)
-#define IClassFactory_Release(T) (T)->lpVtbl->Release(T)
-#define IClassFactory_CreateInstance(T,p,r,O) (T)->lpVtbl->CreateInstance(T,p,r,O)
-#define IClassFactory_LockServer(T,f) (T)->lpVtbl->LockServer(T,f)
-#endif /* COBJMACROS */
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/userenv.h b/winsup/w32api/include/userenv.h
deleted file mode 100644
index fad9f813b..000000000
--- a/winsup/w32api/include/userenv.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef _USERENV_H
-#define _USERENV_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define PI_NOUI (1)
-#define PI_APPLYPOLICY (2)
-typedef struct _PROFILEINFOA {
-  DWORD dwSize;
-  DWORD dwFlags;
-  LPSTR lpUserName;
-  LPSTR lpProfilePath;
-  LPSTR lpDefaultPath;
-  LPSTR lpServerName;
-  LPSTR lpPolicyPath;
-  HANDLE hProfile;
-} PROFILEINFOA, *LPPROFILEINFOA;
-typedef struct _PROFILEINFOW {
-  DWORD dwSize;
-  DWORD dwFlags;
-  LPWSTR lpUserName;
-  LPWSTR lpProfilePath;
-  LPWSTR lpDefaultPath;
-  LPWSTR lpServerName;
-  LPWSTR lpPolicyPath;
-  HANDLE hProfile;
-} PROFILEINFOW, *LPPROFILEINFOW;
-BOOL WINAPI LoadUserProfileA(HANDLE,LPPROFILEINFOA);
-BOOL WINAPI LoadUserProfileW(HANDLE,LPPROFILEINFOW);
-BOOL WINAPI UnloadUserProfile(HANDLE,HANDLE);
-BOOL WINAPI GetProfilesDirectoryA(LPSTR,LPDWORD);
-BOOL WINAPI GetProfilesDirectoryW(LPWSTR,LPDWORD);
-BOOL WINAPI GetUserProfileDirectoryA(HANDLE,LPSTR,LPDWORD);
-BOOL WINAPI GetUserProfileDirectoryW(HANDLE,LPWSTR,LPDWORD);
-BOOL WINAPI CreateEnvironmentBlock(LPVOID*,HANDLE,BOOL);
-BOOL WINAPI DestroyEnvironmentBlock(LPVOID);
-#ifdef UNICODE
-typedef PROFILEINFOW PROFILEINFO;
-typedef LPPROFILEINFOW LPPROFILEINFO;
-#define LoadUserProfile  LoadUserProfileW
-#define GetProfilesDirectory  GetProfilesDirectoryW
-#define GetUserProfileDirectory  GetUserProfileDirectoryW
-#else
-typedef PROFILEINFOA PROFILEINFO;
-typedef LPPROFILEINFOA LPPROFILEINFO;
-#define LoadUserProfile  LoadUserProfileA
-#define GetProfilesDirectory  GetProfilesDirectoryA
-#define GetUserProfileDirectory  GetUserProfileDirectoryA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif /* _USERENV_H */
diff --git a/winsup/w32api/include/uxtheme.h b/winsup/w32api/include/uxtheme.h
deleted file mode 100644
index f7054bd44..000000000
--- a/winsup/w32api/include/uxtheme.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef _UXTHEME_H

-#define _UXTHEME_H

-#if __GNUC__ >= 3

-#pragma GCC system_header

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#if (_WIN32_WINNT >= 0x0501)

-#define DTBG_CLIPRECT 0x00000001

-#define DTBG_DRAWSOLID 0x00000002

-#define DTBG_OMITBORDER 0x00000004

-#define DTBG_OMITCONTENT 0x00000008

-#define DTBG_COMPUTINGREGION 0x00000010

-#define DTBG_MIRRORDC 0x00000020

-#define DTT_GRAYED 0x00000001

-#define ETDT_DISABLE 0x00000001

-#define ETDT_ENABLE 0x00000002

-#define ETDT_USETABTEXTURE 0x00000004

-#define ETDT_ENABLETAB (ETDT_ENABLE|ETDT_USETABTEXTURE)

-#define STAP_ALLOW_NONCLIENT 0x00000001

-#define STAP_ALLOW_CONTROLS 0x00000002

-#define STAP_ALLOW_WEBCONTENT 0x00000004

-#define HTTB_BACKGROUNDSEG 0x0000  

-#define HTTB_FIXEDBORDER 0x0002

-#define HTTB_CAPTION 0x0004

-#define HTTB_RESIZINGBORDER_LEFT 0x0010

-#define HTTB_RESIZINGBORDER_TOP 0x0020

-#define HTTB_RESIZINGBORDER_RIGHT 0x0040

-#define HTTB_RESIZINGBORDER_BOTTOM 0x0080

-#define HTTB_RESIZINGBORDER (HTTB_RESIZINGBORDER_LEFT|HTTB_RESIZINGBORDER_TOP|HTTB_RESIZINGBORDER_RIGHT|HTTB_RESIZINGBORDER_BOTTOM)

-#define HTTB_SIZINGTEMPLATE 0x0100

-#define HTTB_SYSTEMSIZINGMARGINS 0x0200

-

-typedef enum PROPERTYORIGIN {

-	PO_STATE = 0,

-	PO_PART = 1,

-	PO_CLASS = 2,

-	PO_GLOBAL = 3,

-	PO_NOTFOUND = 4

-} PROPERTYORIGIN;

-typedef enum THEMESIZE {

-	TS_MIN,

-	TS_TRUE,

-	TS_DRAW

-} THEME_SIZE;

-typedef struct _DTBGOPTS {

-	DWORD dwSize;

-	DWORD dwFlags;

-	RECT rcClip;

-} DTBGOPTS, *PDTBGOPTS;

-#define MAX_INTLIST_COUNT 10

-typedef struct _INTLIST {

-	int iValueCount;

-	int iValues[MAX_INTLIST_COUNT];

-} INTLIST, *PINTLIST;

-typedef struct _MARGINS {

-	int cxLeftWidth;

-	int cxRightWidth;

-	int cyTopHeight;

-	int cyBottomHeight;

-} MARGINS, *PMARGINS;

-typedef HANDLE HTHEME;

-

-HRESULT WINAPI CloseThemeData(HTHEME);

-HRESULT WINAPI DrawThemeBackground(HTHEME,HDC,int,int,const RECT*,const RECT*);

-HRESULT WINAPI DrawThemeBackgroundEx(HTHEME,HDC,int,int,const RECT*,const DTBGOPTS*);

-HRESULT WINAPI DrawThemeEdge(HTHEME,HDC,int,int,const RECT*,UINT,UINT,RECT*);

-HRESULT WINAPI DrawThemeIcon(HTHEME,HDC,int,int,const RECT*,HIMAGELIST,int);

-HRESULT WINAPI DrawThemeParentBackground(HWND,HDC,RECT*);

-HRESULT WINAPI DrawThemeText(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,DWORD,const RECT*);

-HRESULT WINAPI EnableThemeDialogTexture(HWND,DWORD);

-HRESULT WINAPI EnableTheming(BOOL);

-HRESULT WINAPI GetCurrentThemeName(LPWSTR,int,LPWSTR,int,LPWSTR,int);

-DWORD WINAPI GetThemeAppProperties();

-HRESULT WINAPI GetThemeBackgroundContentRect(HTHEME,HDC,int,int,const RECT*,RECT*);

-HRESULT WINAPI GetThemeBackgroundExtent(HTHEME,HDC,int,int,const RECT*,RECT*);

-HRESULT WINAPI GetThemeBackgroundRegion(HTHEME,HDC,int,int,const RECT*,HRGN*);

-HRESULT WINAPI GetThemeBool(HTHEME,int,int,int,BOOL*);

-HRESULT WINAPI GetThemeColor(HTHEME,int,int,int,COLORREF*);

-HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR,LPCWSTR,LPWSTR,int);

-HRESULT WINAPI GetThemeEnumValue(HTHEME,int,int,int,int*);

-HRESULT WINAPI GetThemeFilename(HTHEME,int,int,int,LPWSTR,int);

-HRESULT WINAPI GetThemeFont(HTHEME,HDC,int,int,int,LOGFONT*);

-HRESULT WINAPI GetThemeInt(HTHEME,int,int,int,int*);

-HRESULT WINAPI GetThemeIntList(HTHEME,int,int,int,INTLIST*);

-HRESULT WINAPI GetThemeMargins(HTHEME,HDC,int,int,int,RECT*,MARGINS*);

-HRESULT WINAPI GetThemeMetric(HTHEME,HDC,int,int,int,int*);

-HRESULT WINAPI GetThemePartSize(HTHEME,HDC,int,int,RECT*,THEME_SIZE,SIZE*);

-HRESULT WINAPI GetThemePosition(HTHEME,int,int,int,POINT*);

-HRESULT WINAPI GetThemePropertyOrigin(HTHEME,int,int,int,PROPERTYORIGIN*);

-HRESULT WINAPI GetThemeRect(HTHEME,int,int,int,RECT*);

-HRESULT WINAPI GetThemeString(HTHEME,int,int,int,LPWSTR,int);

-BOOL WINAPI GetThemeSysBool(HTHEME,int);

-COLORREF WINAPI GetThemeSysColor(HTHEME,int);

-HBRUSH WINAPI GetThemeSysColorBrush(HTHEME,int);

-HRESULT WINAPI GetThemeSysFont(HTHEME,int,LOGFONT*);

-HRESULT WINAPI GetThemeSysInt(HTHEME,int,int*);

-int WINAPI GetThemeSysSize(HTHEME,int);

-HRESULT WINAPI GetThemeSysString(HTHEME,int,LPWSTR,int);

-HRESULT WINAPI GetThemeTextExtent(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,const RECT*,RECT*);

-HRESULT WINAPI GetThemeTextMetrics(HTHEME,HDC,int,int,TEXTMETRIC*);

-HTHEME WINAPI GetWindowTheme(HWND);

-HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*,HRGN,POINT,WORD*);

-BOOL WINAPI IsAppThemed();

-BOOL WINAPI IsThemeActive();

-BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME,int,int);

-BOOL WINAPI IsThemeDialogTextureEnabled(HWND);

-BOOL WINAPI IsThemePartDefined(HTHEME,int,int);

-HTHEME WINAPI OpenThemeData(HWND,LPCWSTR);

-void WINAPI SetThemeAppProperties(DWORD);

-HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR);

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-#endif

diff --git a/winsup/w32api/include/vfw.h b/winsup/w32api/include/vfw.h
deleted file mode 100644
index cce5e3126..000000000
--- a/winsup/w32api/include/vfw.h
+++ /dev/null
@@ -1,1130 +0,0 @@
-#ifndef _VFW_H
-#define _VFW_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifndef _WINDOWS_H
-#include <windows.h>
-#endif
-#ifndef _MMSYSTEM_H
-#include <mmsystem.h>
-#endif
-#if !defined  (_OLE2_H) && !defined (__OBJC__)
-#include <ole2.h>
-#endif
-
-#define VFWAPI WINAPI
-#define VFWAPIV WINAPIV
-
-#include <pshpack8.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	ICERR_OK	0
-#define	ICERR_DONTDRAW	1
-#define	ICERR_NEWPALETTE	2
-#define	ICERR_GOTOKEYFRAME	3
-#define	ICERR_STOPDRAWING	4
-#define	ICERR_UNSUPPORTED	-1
-#define	ICERR_BADFORMAT	-2
-#define	ICERR_MEMORY	-3
-#define	ICERR_INTERNAL	-4
-#define	ICERR_BADFLAGS	-5
-#define	ICERR_BADPARAM	-6
-#define	ICERR_BADSIZE	-7
-#define	ICERR_BADHANDLE	-8
-#define	ICERR_CANTUPDATE	-9
-#define	ICERR_ABORT	-10
-#define	ICERR_ERROR	-100
-#define	ICERR_BADBITDEPTH	-200
-#define	ICERR_BADIMAGESIZE	-201
-#define	ICERR_CUSTOM	-400
-#define ICCOMPRESSFRAMES_PADDING	0x01
-#define	ICM_USER	(DRV_USER+0x0000)
-#define	ICM_RESERVED_LOW	(DRV_USER+0x1000)
-#define	ICM_RESERVED_HIGH	(DRV_USER+0x2000)
-#define	ICM_RESERVED	ICM_RESERVED_LOW
-#define	ICM_GETSTATE	(ICM_RESERVED+0)
-#define	ICM_SETSTATE	(ICM_RESERVED+1)
-#define	ICM_GETINFO	(ICM_RESERVED+2)
-#define	ICM_CONFIGURE	(ICM_RESERVED+10)
-#define	ICM_ABOUT	(ICM_RESERVED+11)
-#define	ICM_GETDEFAULTQUALITY	(ICM_RESERVED+30)
-#define	ICM_GETQUALITY	(ICM_RESERVED+31)
-#define	ICM_SETQUALITY	(ICM_RESERVED+32)
-#define	ICM_SET	(ICM_RESERVED+40)
-#define	ICM_GET	(ICM_RESERVED+41)
-#define ICM_FRAMERATE	mmioFOURCC('F','r','m','R')
-#define ICM_KEYFRAMERATE	mmioFOURCC('K','e','y','R')
-#define	ICM_COMPRESS_GET_FORMAT	(ICM_USER+4)
-#define	ICM_COMPRESS_GET_SIZE	(ICM_USER+5)
-#define	ICM_COMPRESS_QUERY	(ICM_USER+6)
-#define	ICM_COMPRESS_BEGIN	(ICM_USER+7)
-#define	ICM_COMPRESS	(ICM_USER+8)
-#define	ICM_COMPRESS_END	(ICM_USER+9)
-#define	ICM_DECOMPRESS_GET_FORMAT	(ICM_USER+10)
-#define	ICM_DECOMPRESS_QUERY	(ICM_USER+11)
-#define	ICM_DECOMPRESS_BEGIN	(ICM_USER+12)
-#define	ICM_DECOMPRESS	(ICM_USER+13)
-#define	ICM_DECOMPRESS_END	(ICM_USER+14)
-#define	ICM_DECOMPRESS_SET_PALETTE	(ICM_USER+29)
-#define	ICM_DECOMPRESS_GET_PALETTE	(ICM_USER+30)
-#define	ICM_DRAW_QUERY	(ICM_USER+31)
-#define	ICM_DRAW_BEGIN	(ICM_USER+15)
-#define	ICM_DRAW_GET_PALETTE	(ICM_USER+16)
-#define	ICM_DRAW_START	(ICM_USER+18)
-#define	ICM_DRAW_STOP	(ICM_USER+19)
-#define	ICM_DRAW_END	(ICM_USER+21)
-#define	ICM_DRAW_GETTIME	(ICM_USER+32)
-#define	ICM_DRAW	(ICM_USER+33)
-#define	ICM_DRAW_WINDOW	(ICM_USER+34)
-#define	ICM_DRAW_SETTIME	(ICM_USER+35)
-#define	ICM_DRAW_REALIZE	(ICM_USER+36)
-#define	ICM_DRAW_FLUSH	(ICM_USER+37)
-#define	ICM_DRAW_RENDERBUFFER	(ICM_USER+38)
-#define	ICM_DRAW_START_PLAY	(ICM_USER+39)
-#define	ICM_DRAW_STOP_PLAY	(ICM_USER+40)
-#define	ICM_DRAW_SUGGESTFORMAT	(ICM_USER+50)
-#define	ICM_DRAW_CHANGEPALETTE	(ICM_USER+51)
-#define	ICM_GETBUFFERSWANTED	(ICM_USER+41)
-#define	ICM_GETDEFAULTKEYFRAMERATE	(ICM_USER+42)
-#define	ICM_DECOMPRESSEX_BEGIN	(ICM_USER+60)
-#define	ICM_DECOMPRESSEX_QUERY	(ICM_USER+61)
-#define	ICM_DECOMPRESSEX	(ICM_USER+62)
-#define	ICM_DECOMPRESSEX_END	(ICM_USER+63)
-#define	ICM_COMPRESS_FRAMES_INFO	(ICM_USER+70)
-#define	ICM_SET_STATUS_PROC	(ICM_USER+72)
-#define ICMF_CONFIGURE_QUERY	0x01
-#define ICCOMPRESS_KEYFRAME	0x01
-#define ICSTATUS_START	0
-#define ICSTATUS_STATUS	1
-#define ICSTATUS_END	2
-#define ICSTATUS_ERROR	3
-#define ICSTATUS_YIELD	4
-#define	ICMODE_COMPRESS	1
-#define	ICMODE_DECOMPRESS	2
-#define	ICMODE_FASTDECOMPRESS	3
-#define	ICMODE_QUERY	4
-#define	ICMODE_FASTCOMPRESS	5
-#define	ICMODE_DRAW	8
-#define ICQUALITY_LOW	0
-#define ICQUALITY_HIGH	10000
-#define ICQUALITY_DEFAULT	-1
-#define	VIDCF_QUALITY	0x01
-#define	VIDCF_CRUNCH	0x02
-#define	VIDCF_TEMPORAL	0x04
-#define	VIDCF_COMPRESSFRAMES	0x08
-#define	VIDCF_DRAW	0x10
-#define	VIDCF_FASTTEMPORALC	0x20
-#define	VIDCF_FASTTEMPORALD	0x80
-#define	VIDCF_QUALITYTIME	0x40
-#define	VIDCF_FASTTEMPORAL	(VIDCF_FASTTEMPORALC|VIDCF_FASTTEMPORALD)
-#define ICMF_ABOUT_QUERY	0x01
-#define ICDECOMPRESS_HURRYUP	0x80000000
-#define ICDECOMPRESS_UPDATE	0x40000000
-#define ICDECOMPRESS_PREROLL	0x20000000
-#define ICDECOMPRESS_NULLFRAME	0x10000000
-#define ICDECOMPRESS_NOTKEYFRAME	0x8000000
-#define ICDRAW_QUERY	0x01L
-#define ICDRAW_FULLSCREEN	0x02L
-#define ICDRAW_HDC	0x04L
-#define ICDRAW_ANIMATE	0x08L
-#define ICDRAW_CONTINUE	0x10L
-#define ICDRAW_MEMORYDC	0x20L
-#define ICDRAW_UPDATING	0x40L
-#define ICDRAW_RENDER	0x80L
-#define ICDRAW_BUFFER	0x100L
-#define ICINSTALL_UNICODE	0x8000
-#define ICINSTALL_FUNCTION	0x01
-#define ICINSTALL_DRIVER	0x02
-#define ICINSTALL_HDRV	0x04
-#define ICINSTALL_DRIVERW	0x8002
-#define ICDRAW_HURRYUP	0x80000000L
-#define ICDRAW_UPDATE	0x40000000L
-#define ICDRAW_PREROLL	0x20000000L
-#define ICDRAW_NULLFRAME	0x10000000L
-#define ICDRAW_NOTKEYFRAME	0x8000000L
-#define ICMF_COMPVARS_VALID	0x01
-#define ICMF_CHOOSE_KEYFRAME	0x01
-#define ICMF_CHOOSE_DATARATE	0x02
-#define ICMF_CHOOSE_PREVIEW	0x04
-#define ICMF_CHOOSE_ALLCOMPRESSORS	0x08
-#define ICTYPE_VIDEO	mmioFOURCC('v','i','d','c')
-#define ICTYPE_AUDIO	mmioFOURCC('a','u','d','c')
-#define formtypeAVI	mmioFOURCC('A','V','I',' ')
-#define listtypeAVIHEADER	mmioFOURCC('h','d','r','l')
-#define ckidAVIMAINHDR	mmioFOURCC('a','v','i','h')
-#define listtypeSTREAMHEADER	mmioFOURCC('s','t','r','l')
-#define ckidSTREAMHEADER	mmioFOURCC('s','t','r','h')
-#define ckidSTREAMFORMAT	mmioFOURCC('s','t','r','f')
-#define ckidSTREAMHANDLERDATA	mmioFOURCC('s','t','r','d')
-#define ckidSTREAMNAME	mmioFOURCC('s','t','r','n')
-#define listtypeAVIMOVIE	mmioFOURCC('m','o','v','i')
-#define listtypeAVIRECORD	mmioFOURCC('r','e','c',' ')
-#define ckidAVINEWINDEX	mmioFOURCC('i', 'd', 'x', '1')
-#define streamtypeANY	0UL
-#define streamtypeVIDEO	mmioFOURCC('v','i','d','s')
-#define streamtypeAUDIO	mmioFOURCC('a','u','d','s')
-#define streamtypeMIDI	mmioFOURCC('m','i','d','s')
-#define streamtypeTEXT	mmioFOURCC('t','x','t','s')
-#define cktypeDIBbits	aviTWOCC('d','b')
-#define cktypeDIBcompressed	aviTWOCC('d','c')
-#define cktypePALchange	aviTWOCC('p','c')
-#define cktypeWAVEbytes	aviTWOCC('w','b')
-#define ckidAVIPADDING	mmioFOURCC('J','U','N','K')
-#define FromHex(n) (((n)>='A')?((n)+10-'A'):((n)-'0'))
-#define StreamFromFOURCC(fcc) ((WORD)((FromHex(LOBYTE(LOWORD(fcc)))<<4)+(FromHex(HIBYTE(LOWORD(fcc))))))
-#define TWOCCFromFOURCC(fcc) HIWORD(fcc)
-#define ToHex(n) ((BYTE)(((n)>9)?((n)-10+'A'):((n)+'0')))
-#define MAKEAVICKID(tcc, stream) MAKELONG((ToHex((stream)&0x0f)<<8)|(ToHex(((stream)&0xf0)>>4)),tcc)
-#define AVIF_HASINDEX	0x10
-#define AVIF_MUSTUSEINDEX	0x20
-#define AVIF_ISINTERLEAVED	0x100
-#define AVIF_TRUSTCKTYPE	0x800
-#define AVIF_WASCAPTUREFILE	0x10000
-#define AVIF_COPYRIGHTED	0x20000
-#define AVI_HEADERSIZE	2048
-#define AVISF_DISABLED	0x01
-#define AVISF_VIDEO_PALCHANGES	0x10000
-#define AVIIF_LIST	0x01
-#define AVIIF_TWOCC	0x02
-#define AVIIF_KEYFRAME	0x10
-#define AVIIF_NOTIME	0x100
-#define AVIIF_COMPUSE	0xfff0000
-#define AVIIF_KEYFRAME	0x10
-#define	AVIGETFRAMEF_BESTDISPLAYFMT	1
-#define AVISTREAMINFO_DISABLED	0x01
-#define AVISTREAMINFO_FORMATCHANGES	0x10000
-#define AVIFILEINFO_HASINDEX	0x10
-#define AVIFILEINFO_MUSTUSEINDEX	0x20
-#define AVIFILEINFO_ISINTERLEAVED	0x100
-#define AVIFILEINFO_TRUSTCKTYPE	0x800
-#define AVIFILEINFO_WASCAPTUREFILE	0x10000
-#define AVIFILEINFO_COPYRIGHTED	0x20000
-#define AVIFILECAPS_CANREAD	0x01
-#define AVIFILECAPS_CANWRITE	0x02
-#define AVIFILECAPS_ALLKEYFRAMES	0x10
-#define AVIFILECAPS_NOCOMPRESSION	0x20
-#define AVICOMPRESSF_INTERLEAVE	0x01
-#define AVICOMPRESSF_DATARATE	0x02
-#define AVICOMPRESSF_KEYFRAMES	0x04
-#define AVICOMPRESSF_VALID	0x08
-#define FIND_DIR	0x0000000fL
-#define FIND_NEXT	0x00000001L
-#define FIND_PREV	0x00000004L
-#define FIND_FROM_START	0x00000008L
-#define FIND_TYPE	0x000000f0L
-#define FIND_KEY	0x00000010L
-#define FIND_ANY	0x00000020L
-#define FIND_FORMAT	0x00000040L
-#define FIND_RET	0x0000f000L
-#define FIND_POS	0x00000000L
-#define FIND_LENGTH	0x00001000L
-#define FIND_OFFSET	0x00002000L
-#define FIND_SIZE	0x00003000L
-#define FIND_INDEX	0x00004000L
-#define AVIERR_OK	0
-#define MAKE_AVIERR(e)	MAKE_SCODE(SEVERITY_ERROR,FACILITY_ITF,0x4000+e)
-#define AVIERR_UNSUPPORTED	MAKE_AVIERR(101)
-#define AVIERR_BADFORMAT	MAKE_AVIERR(102)
-#define AVIERR_MEMORY	MAKE_AVIERR(103)
-#define AVIERR_INTERNAL	MAKE_AVIERR(104)
-#define AVIERR_BADFLAGS	MAKE_AVIERR(105)
-#define AVIERR_BADPARAM	MAKE_AVIERR(106)
-#define AVIERR_BADSIZE	MAKE_AVIERR(107)
-#define AVIERR_BADHANDLE	MAKE_AVIERR(108)
-#define AVIERR_FILEREAD	MAKE_AVIERR(109)
-#define AVIERR_FILEWRITE	MAKE_AVIERR(110)
-#define AVIERR_FILEOPEN	MAKE_AVIERR(111)
-#define AVIERR_COMPRESSOR	MAKE_AVIERR(112)
-#define AVIERR_NOCOMPRESSOR	MAKE_AVIERR(113)
-#define AVIERR_READONLY	MAKE_AVIERR(114)
-#define AVIERR_NODATA	MAKE_AVIERR(115)
-#define AVIERR_BUFFERTOOSMALL	MAKE_AVIERR(116)
-#define AVIERR_CANTCOMPRESS	MAKE_AVIERR(117)
-#define AVIERR_USERABORT	MAKE_AVIERR(198)
-#define AVIERR_ERROR	MAKE_AVIERR(199)
-#define MCIWNDOPENF_NEW	0x0001
-#define MCIWNDF_NOAUTOSIZEWINDOW	0x0001
-#define MCIWNDF_NOPLAYBAR	0x0002
-#define MCIWNDF_NOAUTOSIZEMOVIE	0x0004
-#define MCIWNDF_NOMENU	0x0008
-#define MCIWNDF_SHOWNAME	0x0010
-#define MCIWNDF_SHOWPOS	0x0020
-#define MCIWNDF_SHOWMODE	0x0040
-#define MCIWNDF_SHOWALL	0x0070
-#define MCIWNDF_NOTIFYMODE	0x0100
-#define MCIWNDF_NOTIFYPOS	0x0200
-#define MCIWNDF_NOTIFYSIZE	0x0400
-#define MCIWNDF_NOTIFYERROR	0x1000
-#define MCIWNDF_NOTIFYALL	0x1F00
-#define MCIWNDF_NOTIFYANSI	0x0080
-#define MCIWNDF_NOTIFYMEDIAA	0x0880
-#define MCIWNDF_NOTIFYMEDIAW	0x0800
-#define MCIWNDF_RECORD	0x2000
-#define MCIWNDF_NOERRORDLG	0x4000
-#define MCIWNDF_NOOPEN	0x8000
-#define MCIWNDM_GETDEVICEID	(WM_USER + 100)
-#define MCIWNDM_GETSTART	(WM_USER + 103)
-#define MCIWNDM_GETLENGTH	(WM_USER + 104)
-#define MCIWNDM_GETEND	(WM_USER + 105)
-#define MCIWNDM_EJECT	(WM_USER + 107)
-#define MCIWNDM_SETZOOM	(WM_USER + 108)
-#define MCIWNDM_GETZOOM	(WM_USER + 109)
-#define MCIWNDM_SETVOLUME	(WM_USER + 110)
-#define MCIWNDM_GETVOLUME	(WM_USER + 111)
-#define MCIWNDM_SETSPEED	(WM_USER + 112)
-#define MCIWNDM_GETSPEED	(WM_USER + 113)
-#define MCIWNDM_SETREPEAT	(WM_USER + 114)
-#define MCIWNDM_GETREPEAT	(WM_USER + 115)
-#define MCIWNDM_REALIZE	(WM_USER + 118)
-#define MCIWNDM_VALIDATEMEDIA	(WM_USER + 121)
-#define MCIWNDM_PLAYFROM	(WM_USER + 122)
-#define MCIWNDM_PLAYTO	(WM_USER + 123)
-#define MCIWNDM_GETPALETTE	(WM_USER + 126)
-#define MCIWNDM_SETPALETTE	(WM_USER + 127)
-#define MCIWNDM_SETTIMERS	(WM_USER + 129)
-#define MCIWNDM_SETACTIVETIMER	(WM_USER + 130)
-#define MCIWNDM_SETINACTIVETIMER	(WM_USER + 131)
-#define MCIWNDM_GETACTIVETIMER	(WM_USER + 132)
-#define MCIWNDM_GETINACTIVETIMER	(WM_USER + 133)
-#define MCIWNDM_CHANGESTYLES	(WM_USER + 135)
-#define MCIWNDM_GETSTYLES	(WM_USER + 136)
-#define MCIWNDM_GETALIAS	(WM_USER + 137)
-#define MCIWNDM_PLAYREVERSE	(WM_USER + 139)
-#define MCIWNDM_GET_SOURCE	(WM_USER + 140)
-#define MCIWNDM_PUT_SOURCE	(WM_USER + 141)
-#define MCIWNDM_GET_DEST	(WM_USER + 142)
-#define MCIWNDM_PUT_DEST	(WM_USER + 143)
-#define MCIWNDM_CAN_PLAY	(WM_USER + 144)
-#define MCIWNDM_CAN_WINDOW	(WM_USER + 145)
-#define MCIWNDM_CAN_RECORD	(WM_USER + 146)
-#define MCIWNDM_CAN_SAVE	(WM_USER + 147)
-#define MCIWNDM_CAN_EJECT	(WM_USER + 148)
-#define MCIWNDM_CAN_CONFIG	(WM_USER + 149)
-#define MCIWNDM_PALETTEKICK	(WM_USER + 150)
-#define MCIWNDM_OPENINTERFACE	(WM_USER + 151)
-#define MCIWNDM_SETOWNER	(WM_USER + 152)
-#define MCIWNDM_SENDSTRINGA	(WM_USER + 101)
-#define MCIWNDM_GETPOSITIONA	(WM_USER + 102)
-#define MCIWNDM_GETMODEA	(WM_USER + 106)
-#define MCIWNDM_SETTIMEFORMATA	(WM_USER + 119)
-#define MCIWNDM_GETTIMEFORMATA	(WM_USER + 120)
-#define MCIWNDM_GETFILENAMEA	(WM_USER + 124)
-#define MCIWNDM_GETDEVICEA	(WM_USER + 125)
-#define MCIWNDM_GETERRORA	(WM_USER + 128)
-#define MCIWNDM_NEWA	(WM_USER + 134)
-#define MCIWNDM_RETURNSTRINGA	(WM_USER + 138)
-#define MCIWNDM_OPENA	(WM_USER + 153)
-#define MCIWNDM_SENDSTRINGW	(WM_USER + 201)
-#define MCIWNDM_GETPOSITIONW	(WM_USER + 202)
-#define MCIWNDM_GETMODEW	(WM_USER + 206)
-#define MCIWNDM_SETTIMEFORMATW	(WM_USER + 219)
-#define MCIWNDM_GETTIMEFORMATW	(WM_USER + 220)
-#define MCIWNDM_GETFILENAMEW	(WM_USER + 224)
-#define MCIWNDM_GETDEVICEW	(WM_USER + 225)
-#define MCIWNDM_GETERRORW	(WM_USER + 228)
-#define MCIWNDM_NEWW	(WM_USER + 234)
-#define MCIWNDM_RETURNSTRINGW	(WM_USER + 238)
-#define MCIWNDM_OPENW	(WM_USER + 252)
-#define MCIWNDM_NOTIFYMODE	(WM_USER + 200)
-#define MCIWNDM_NOTIFYPOS	(WM_USER + 201)
-#define MCIWNDM_NOTIFYSIZE	(WM_USER + 202)
-#define MCIWNDM_NOTIFYMEDIA	(WM_USER + 203)
-#define MCIWNDM_NOTIFYERROR	(WM_USER + 205)
-#define MCIWND_START	-1
-#define MCIWND_END	-2
-#define DDF_UPDATE	0x02
-#define DDF_SAME_HDC	0x04
-#define DDF_SAME_DRAW	0x08
-#define DDF_DONTDRAW	0x10
-#define DDF_ANIMATE	0x20
-#define DDF_BUFFER	0x40
-#define DDF_JUSTDRAWIT	0x80
-#define DDF_FULLSCREEN	0x100
-#define DDF_BACKGROUNDPAL	0x200
-#define DDF_NOTKEYFRAME	0x400
-#define DDF_HURRYUP	0x800
-#define DDF_HALFTONE	0x1000
-#define DDF_PREROLL	DDF_DONTDRAW
-#define DDF_SAME_DIB	DDF_SAME_DRAW
-#define DDF_SAME_SIZE	DDF_SAME_DRAW
-#define PD_CAN_DRAW_DIB	0x01
-#define PD_CAN_STRETCHDIB	0x02
-#define PD_STRETCHDIB_1_1_OK	0x04
-#define PD_STRETCHDIB_1_2_OK	0x08
-#define PD_STRETCHDIB_1_N_OK	0x10
-#ifndef mmioFOURCC
-#define mmioFOURCC(c0,c1,c2,c3) ((DWORD)(BYTE)(c0)|((DWORD)(BYTE)(c1)<<8)|((DWORD)(BYTE)(c2)<<16)|((DWORD)(BYTE)(c3)<<24))
-#endif
-#ifndef aviTWOCC
-#define aviTWOCC(ch0,ch1) ((WORD)(BYTE)(ch0)|((WORD)(BYTE)(ch1)<<8))
-#endif
-
-#ifndef RC_INVOKED
-DECLARE_HANDLE(HIC);
-DECLARE_HANDLE(HDRAWDIB);
-typedef WORD TWOCC;
-typedef BOOL (CALLBACK *AVISAVECALLBACK)(INT);
-typedef struct {
-	DWORD dwSize;
-	DWORD fccType;
-	DWORD fccHandler;
-	DWORD dwVersion;
-	DWORD dwFlags;
-	LRESULT dwError;
-	LPVOID pV1Reserved;
-	LPVOID pV2Reserved;
-	DWORD dnDevNode;
-} ICOPEN,*LPICOPEN;
-typedef struct {
-	DWORD dwFlags;
-	LPBITMAPINFOHEADER lpbiOutput;
-	LPVOID lpOutput;
-	LPBITMAPINFOHEADER lpbiInput;
-	LPVOID lpInput;
-	LPDWORD lpckid;
-	LPDWORD lpdwFlags;
-	LONG lFrameNum;
-	DWORD dwFrameSize;
-	DWORD dwQuality;
-	LPBITMAPINFOHEADER lpbiPrev;
-	LPVOID lpPrev;
-} ICCOMPRESS;
-typedef struct {
-	DWORD dwFlags;
-	LPBITMAPINFOHEADER lpbiOutput;
-	LPARAM lOutput;
-	LPBITMAPINFOHEADER lpbiInput;
-	LPARAM lInput;
-	LONG lStartFrame;
-	LONG lFrameCount;
-	LONG lQuality;
-	LONG lDataRate;
-	LONG lKeyRate;
-	DWORD dwRate;
-	DWORD dwScale;
-	DWORD dwOverheadPerFrame;
-	DWORD dwReserved2;
-	LONG (CALLBACK *GetData)(LPARAM,LONG,LPVOID,LONG);
-	LONG (CALLBACK *PutData)(LPARAM,LONG,LPVOID,LONG);
-} ICCOMPRESSFRAMES;
-typedef struct {
-	DWORD dwFlags;
-	LPARAM lParam;
-	LONG (CALLBACK *Status)(LPARAM,UINT,LONG);
-} ICSETSTATUSPROC;
-typedef struct {
-	DWORD dwSize;
-	DWORD fccType;
-	DWORD fccHandler;
-	DWORD dwFlags;
-	DWORD dwVersion;
-	DWORD dwVersionICM;
-	WCHAR szName[16];
-	WCHAR szDescription[128];
-	WCHAR szDriver[128];
-} ICINFO;
-typedef struct {
-	DWORD dwFlags;
-	LPBITMAPINFOHEADER lpbiInput;
-	LPVOID lpInput;
-	LPBITMAPINFOHEADER lpbiOutput;
-	LPVOID lpOutput;
-	DWORD ckid;
-} ICDECOMPRESS;
-typedef struct {
-	DWORD dwFlags;
-	LPBITMAPINFOHEADER lpbiSrc;
-	LPVOID lpSrc;
-	LPBITMAPINFOHEADER lpbiDst;
-	LPVOID lpDst;
-	INT xDst;
-	INT yDst;
-	INT dxDst;
-	INT dyDst;
-	INT xSrc;
-	INT ySrc;
-	INT dxSrc;
-	INT dySrc;
-} ICDECOMPRESSEX;
-typedef struct {
-	DWORD dwFlags;
-	LPBITMAPINFOHEADER lpbiIn;
-	LPBITMAPINFOHEADER lpbiSuggest;
-	INT dxSrc;
-	INT dySrc;
-	INT dxDst;
-	INT dyDst;
-	HIC hicDecompressor;
-} ICDRAWSUGGEST;
-typedef struct {
-	DWORD dwFlags;
-	INT iStart;
-	INT iLen;
-	LPPALETTEENTRY lppe;
-} ICPALETTE;
-typedef struct {
-	DWORD dwFlags;
-	HPALETTE hpal;
-	HWND hwnd;
-	HDC hdc;
-	INT xDst;
-	INT yDst;
-	INT dxDst;
-	INT dyDst;
-	LPBITMAPINFOHEADER lpbi;
-	INT xSrc;
-	INT ySrc;
-	INT dxSrc;
-	INT dySrc;
-	DWORD dwRate;
-	DWORD dwScale;
-} ICDRAWBEGIN;
-typedef struct {
-	DWORD dwFlags;
-	LPVOID lpFormat;
-	LPVOID lpData;
-	DWORD cbData;
-	LONG lTime;
-} ICDRAW;
-typedef struct {
-	LONG cbSize;
-	DWORD dwFlags;
-	HIC hic;
-	DWORD fccType;
-	DWORD fccHandler;
-	LPBITMAPINFO lpbiIn;
-	LPBITMAPINFO lpbiOut;
-	LPVOID lpBitsOut;
-	LPVOID lpBitsPrev;
-	LONG lFrame;
-	LONG lKey;
-	LONG lDataRate;
-	LONG lQ;
-	LONG lKeyCount;
-	LPVOID lpState;
-	LONG cbState;
-} COMPVARS, *PCOMPVARS;
-typedef struct _MainAVIHeader
-{
-	DWORD dwMicroSecPerFrame;
-	DWORD dwMaxBytesPerSec;
-	DWORD dwPaddingGranularity;
-	DWORD dwFlags;
-	DWORD dwTotalFrames;
-	DWORD dwInitialFrames;
-	DWORD dwStreams;
-	DWORD dwSuggestedBufferSize;
-	DWORD dwWidth;
-	DWORD dwHeight;
-	DWORD dwReserved[4];
-} MainAVIHeader;
-typedef struct {
-	FOURCC fccType;
-	FOURCC fccHandler;
-	DWORD dwFlags;
-	WORD wPriority;
-	WORD wLanguage;
-	DWORD dwInitialFrames;
-	DWORD dwScale;
-	DWORD dwRate;
-	DWORD dwStart;
-	DWORD dwLength;
-	DWORD dwSuggestedBufferSize;
-	DWORD dwQuality;
-	DWORD dwSampleSize;
-	RECT rcFrame;
-} AVIStreamHeader;
-typedef struct _AVIINDEXENTRY {
-	DWORD ckid;
-	DWORD dwFlags;
-	DWORD dwChunkOffset;
-	DWORD dwChunkLength;
-} AVIINDEXENTRY;
-typedef struct _AVIPALCHANGE {
-	BYTE bFirstEntry;
-	BYTE bNumEntries;
-	WORD wFlags;
-	PALETTEENTRY peNew[1];
-} AVIPALCHANGE;
-typedef struct _AVISTREAMINFOA {
-	DWORD fccType;
-	DWORD fccHandler;
-	DWORD dwFlags;
-	DWORD dwCaps;
-	WORD wPriority;
-	WORD wLanguage;
-	DWORD dwScale;
-	DWORD dwRate;
-	DWORD dwStart;
-	DWORD dwLength;
-	DWORD dwInitialFrames;
-	DWORD dwSuggestedBufferSize;
-	DWORD dwQuality;
-	DWORD dwSampleSize;
-	RECT rcFrame;
-	DWORD dwEditCount;
-	DWORD dwFormatChangeCount;
-	CHAR szName[64];
-} AVISTREAMINFOA, * LPAVISTREAMINFOA, *PAVISTREAMINFOA;
-typedef struct _AVISTREAMINFOW {
-	DWORD fccType;
-	DWORD fccHandler;
-	DWORD dwFlags;
-	DWORD dwCaps;
-	WORD wPriority;
-	WORD wLanguage;
-	DWORD dwScale;
-	DWORD dwRate;
-	DWORD dwStart;
-	DWORD dwLength;
-	DWORD dwInitialFrames;
-	DWORD dwSuggestedBufferSize;
-	DWORD dwQuality;
-	DWORD dwSampleSize;
-	RECT rcFrame;
-	DWORD dwEditCount;
-	DWORD dwFormatChangeCount;
-	WCHAR szName[64];
-} AVISTREAMINFOW, * LPAVISTREAMINFOW, *PAVISTREAMINFOW;
-typedef struct _AVIFILEINFOW {
-	DWORD dwMaxBytesPerSec;
-	DWORD dwFlags;
-	DWORD dwCaps;
-	DWORD dwStreams;
-	DWORD dwSuggestedBufferSize;
-	DWORD dwWidth;
-	DWORD dwHeight;
-	DWORD dwScale;
-	DWORD dwRate;
-	DWORD dwLength;
-	DWORD dwEditCount;
-	WCHAR szFileType[64];
-} AVIFILEINFOW, *LPAVIFILEINFOW, *PAVIFILEINFOW;
-typedef struct _AVIFILEINFOA {
-	DWORD dwMaxBytesPerSec;
-	DWORD dwFlags;
-	DWORD dwCaps;
-	DWORD dwStreams;
-	DWORD dwSuggestedBufferSize;
-	DWORD dwWidth;
-	DWORD dwHeight;
-	DWORD dwScale;
-	DWORD dwRate;
-	DWORD dwLength;
-	DWORD dwEditCount;
-	CHAR szFileType[64];
-} AVIFILEINFOA, *LPAVIFILEINFOA, *PAVIFILEINFOA;
-typedef struct _AVICOMPRESSOPTIONS {
-	DWORD fccType;
-	DWORD fccHandler;
-	DWORD dwKeyFrameEvery;
-	DWORD dwQuality;
-	DWORD dwBytesPerSecond;
-	DWORD dwFlags;
-	LPVOID lpFormat;
-	DWORD cbFormat;
-	LPVOID lpParms;
-	DWORD cbParms;
-	DWORD dwInterleaveEvery;
-} AVICOMPRESSOPTIONS, *LPAVICOMPRESSOPTIONS,*PAVICOMPRESSOPTIONS;
-
-#if !defined (__OBJC__)
-#define DEFINE_AVIGUID(name,l,w1,w2) DEFINE_GUID(name,l,w1,w2,0xC0,0,0,0,0,0,0,0x46)
-DEFINE_AVIGUID(IID_IAVIFile,0x00020020,0,0);
-DEFINE_AVIGUID(IID_IAVIStream,0x00020021,0,0);
-DEFINE_AVIGUID(IID_IAVIStreaming,0x00020022,0,0);
-DEFINE_AVIGUID(IID_IGetFrame,0x00020023,0,0);
-DEFINE_AVIGUID(IID_IAVIEditStream,0x00020024,0,0);
-DEFINE_AVIGUID(CLSID_AVIFile,0x00020000,0,0);
-
-#undef INTERFACE
-#define INTERFACE IAVIStream
-DECLARE_INTERFACE_(IAVIStream, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Create)(THIS_ LPARAM,LPARAM) PURE;
-	STDMETHOD(Info)(THIS_ AVISTREAMINFOW*,LONG) PURE;
-	STDMETHOD_(LONG,FindSample)(THIS_ LONG,LONG) PURE;
-	STDMETHOD(ReadFormat)(THIS_ LONG,LPVOID,LONG*) PURE;
-	STDMETHOD(SetFormat)(THIS_ LONG,LPVOID,LONG) PURE;
-	STDMETHOD(Read)(THIS_ LONG,LONG,LPVOID,LONG,LONG*,LONG*) PURE;
-	STDMETHOD(Write)(THIS_ LONG,LONG,LPVOID,LONG,DWORD,LONG*,LONG*) PURE;
-	STDMETHOD(Delete)(THIS_ LONG,LONG) PURE;
-	STDMETHOD(ReadData)(THIS_ DWORD,LPVOID,LONG*) PURE;
-	STDMETHOD(WriteData)(THIS_ DWORD,LPVOID,LONG) PURE;
-	STDMETHOD(SetInfo)(THIS_ AVISTREAMINFOW*,LONG) PURE;
-};
-typedef IAVIStream *PAVISTREAM;
-
-#undef INTERFACE
-#define INTERFACE IAVIStreaming
-DECLARE_INTERFACE_(IAVIStreaming, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Begin)(THIS_ LONG,LONG,LONG) PURE;	 
-	STDMETHOD(End)(THIS) PURE;
-};
-typedef IAVIStreaming *PAVISTREAMING;
-
-#undef INTERFACE
-#define INTERFACE IAVIEditStream
-DECLARE_INTERFACE_(IAVIEditStream, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Cut)(THIS_ LONG*,LONG*,PAVISTREAM*) PURE;
-	STDMETHOD(Copy)(THIS_ LONG*,LONG*,PAVISTREAM*) PURE;
-	STDMETHOD(Paste)(THIS_ LONG*,LONG*,PAVISTREAM,LONG,LONG) PURE;
-	STDMETHOD(Clone)(THIS_ PAVISTREAM*) PURE;
-	STDMETHOD(SetInfo)(THIS_ LPAVISTREAMINFOW,LONG) PURE;
-};
-typedef IAVIEditStream *PAVIEDITSTREAM;
-
-#undef INTERFACE
-#define INTERFACE IAVIFile
-DECLARE_INTERFACE_(IAVIFile, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD(Info)(THIS_ AVIFILEINFOW*,LONG) PURE;
-	STDMETHOD(GetStream)(THIS_ PAVISTREAM*,DWORD,LONG) PURE;
-	STDMETHOD(CreateStream)(THIS_ PAVISTREAM*,AVISTREAMINFOW*) PURE;
-	STDMETHOD(WriteData)(THIS_ DWORD,LPVOID,LONG) PURE;
-	STDMETHOD(ReadData)(THIS_ DWORD,LPVOID,LONG*) PURE;
-	STDMETHOD(EndRecord)(THIS) PURE;
-	STDMETHOD(DeleteStream)(THIS_ DWORD,LONG) PURE;
-};
-typedef IAVIFile *PAVIFILE;
-
-#undef INTERFACE
-#define INTERFACE IGetFrame
-DECLARE_INTERFACE_(IGetFrame, IUnknown)
-{
-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-	STDMETHOD_(ULONG,Release)(THIS) PURE;
-	STDMETHOD_(LPVOID,GetFrame)(THIS_ LONG) PURE;
-	STDMETHOD(Begin)(THIS_ LONG,LONG,LONG) PURE;
-	STDMETHOD(End)(THIS) PURE;
-	STDMETHOD(SetFormat)(THIS_ LPBITMAPINFOHEADER,LPVOID,INT,INT,INT,INT) PURE;
-};
-typedef IGetFrame *PGETFRAME;
-#endif /* !defined (__OBJC__) */
-
-DWORD VFWAPI VideoForWindowsVersion(VOID);
-LONG VFWAPI InitVFW(VOID);
-LONG VFWAPI TermVFW(VOID);
-DWORD VFWAPIV ICCompress(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID,LPDWORD,LPDWORD,LONG,DWORD,DWORD,LPBITMAPINFOHEADER,LPVOID);
-DWORD VFWAPIV ICDecompress(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID);
-LRESULT	VFWAPI ICSendMessage(HIC,UINT,DWORD,DWORD);
-HANDLE VFWAPI ICImageCompress(HIC,UINT,LPBITMAPINFO,LPVOID,LPBITMAPINFO,LONG,LONG*);
-HANDLE VFWAPI ICImageDecompress(HIC,UINT,LPBITMAPINFO,LPVOID,LPBITMAPINFO);
-BOOL VFWAPI ICInfo(DWORD,DWORD,ICINFO*);
-BOOL VFWAPI ICInstall(DWORD,DWORD,LPARAM,LPSTR,UINT);
-BOOL VFWAPI ICRemove(DWORD,DWORD,UINT);
-LRESULT VFWAPI ICGetInfo(HIC,ICINFO*,DWORD);
-HIC VFWAPI ICOpen(DWORD,DWORD,UINT);
-HIC VFWAPI ICOpenFunction(DWORD,DWORD,UINT,FARPROC);
-LRESULT VFWAPI ICClose(HIC hic);
-HIC VFWAPI ICLocate(DWORD,DWORD,LPBITMAPINFOHEADER,LPBITMAPINFOHEADER,WORD);
-HIC VFWAPI ICGetDisplayFormat(HIC,LPBITMAPINFOHEADER,LPBITMAPINFOHEADER,INT,INT,INT);
-DWORD VFWAPIV ICDrawBegin(HIC,DWORD,HPALETTE,HWND,HDC,INT,INT,INT,INT,LPBITMAPINFOHEADER,INT,INT,INT,INT,DWORD,DWORD);
-DWORD VFWAPIV ICDraw(HIC,DWORD,LPVOID,LPVOID,DWORD,LONG);
-BOOL VFWAPI ICCompressorChoose(HWND,UINT,LPVOID,LPVOID,PCOMPVARS,LPSTR);
-BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS,LPBITMAPINFO);
-void VFWAPI ICSeqCompressFrameEnd(PCOMPVARS);
-LPVOID VFWAPI ICSeqCompressFrame(PCOMPVARS,UINT,LPVOID,BOOL*,LONG*);
-void VFWAPI ICCompressorFree(PCOMPVARS);
-#if !defined (__OBJC__)
-ULONG WINAPI AVIStreamAddRef(PAVISTREAM);
-ULONG WINAPI AVIStreamRelease(PAVISTREAM);
-HRESULT WINAPI AVIStreamCreate(PAVISTREAM*,LONG,LONG,CLSID*);
-HRESULT WINAPI AVIStreamInfoA(PAVISTREAM,AVISTREAMINFOA*,LONG);
-HRESULT WINAPI AVIStreamInfoW(PAVISTREAM,AVISTREAMINFOW*,LONG);
-HRESULT WINAPI AVIStreamFindSample(PAVISTREAM,LONG,DWORD);
-HRESULT WINAPI AVIStreamReadFormat(PAVISTREAM,LONG,LPVOID,LONG*);
-HRESULT WINAPI AVIStreamSetFormat(PAVISTREAM,LONG,LPVOID,LONG);
-HRESULT WINAPI AVIStreamRead(PAVISTREAM,LONG,LONG,LPVOID,LONG,LONG*,LONG*);
-HRESULT WINAPI AVIStreamWrite(PAVISTREAM,LONG,LONG,LPVOID,LONG,DWORD,LONG*,LONG*);
-HRESULT WINAPI AVIStreamReadData(PAVISTREAM,DWORD,LPVOID,LONG*);
-HRESULT WINAPI AVIStreamWriteData(PAVISTREAM,DWORD,LPVOID,LONG);
-PGETFRAME WINAPI AVIStreamGetFrameOpen(PAVISTREAM,LPBITMAPINFOHEADER);
-LPVOID WINAPI AVIStreamGetFrame(PGETFRAME,LONG);
-HRESULT WINAPI AVIStreamGetFrameClose(PGETFRAME);
-HRESULT WINAPI AVIMakeCompressedStream(PAVISTREAM*,PAVISTREAM,AVICOMPRESSOPTIONS*,CLSID*);
-HRESULT WINAPI AVIMakeFileFromStreams(PAVIFILE*,INT,PAVISTREAM*);
-HRESULT WINAPI AVIStreamOpenFromFileA(PAVISTREAM*,LPCSTR,DWORD,LONG,UINT,CLSID*);
-HRESULT WINAPI AVIStreamOpenFromFileW(PAVISTREAM*,LPCWSTR,DWORD,LONG,UINT,CLSID*);
-HRESULT WINAPI AVIBuildFilterA(LPSTR,LONG,BOOL);
-HRESULT WINAPI AVIBuildFilterW(LPWSTR,LONG,BOOL);
-BOOL WINAPI AVISaveOptions(HWND,UINT,INT,PAVISTREAM*,LPAVICOMPRESSOPTIONS*);
-HRESULT WINAPI AVISaveOptionsFree(INT,LPAVICOMPRESSOPTIONS*);
-HRESULT WINAPI AVISaveVA(LPCSTR,CLSID*,AVISAVECALLBACK,INT,PAVISTREAM*,LPAVICOMPRESSOPTIONS*);
-HRESULT WINAPI AVISaveVW(LPCWSTR,CLSID*,AVISAVECALLBACK,INT,PAVISTREAM*,LPAVICOMPRESSOPTIONS*);
-LONG WINAPI AVIStreamStart(PAVISTREAM);
-LONG WINAPI AVIStreamLength(PAVISTREAM);
-LONG WINAPI AVIStreamSampleToTime(PAVISTREAM,LONG);
-LONG WINAPI AVIStreamTimeToSample(PAVISTREAM,LONG);
-HRESULT WINAPI CreateEditableStream(PAVISTREAM*,PAVISTREAM);
-HRESULT WINAPI EditStreamClone(PAVISTREAM,PAVISTREAM*);
-HRESULT WINAPI EditStreamCopy(PAVISTREAM,LONG*,LONG*,PAVISTREAM*);
-HRESULT WINAPI EditStreamCut(PAVISTREAM,LONG*,LONG*,PAVISTREAM*);
-HRESULT WINAPI EditStreamPaste(PAVISTREAM,LONG*,LONG*,PAVISTREAM,LONG,LONG);
-HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM,LPAVISTREAMINFOA,LONG);
-HRESULT WINAPI EditStreamSetInfoW(PAVISTREAM,LPAVISTREAMINFOW,LONG);
-HRESULT WINAPI EditStreamSetNameA(PAVISTREAM,LPCSTR);
-HRESULT WINAPI EditStreamSetNameW(PAVISTREAM,LPCWSTR);
-HRESULT WINAPI CreateEditableStream(PAVISTREAM*,PAVISTREAM);
-HRESULT WINAPI EditStreamClone(PAVISTREAM,PAVISTREAM*);
-HRESULT WINAPI EditStreamCopy(PAVISTREAM,LONG*,LONG*,PAVISTREAM*);
-HRESULT WINAPI EditStreamCut(PAVISTREAM,LONG*,LONG*,PAVISTREAM*);
-HRESULT WINAPI EditStreamPaste(PAVISTREAM,LONG*,LONG*,PAVISTREAM,LONG,LONG);
-HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM,LPAVISTREAMINFOA,LONG);
-HRESULT WINAPI EditStreamSetInfoW(PAVISTREAM,LPAVISTREAMINFOW,LONG);
-HRESULT WINAPI EditStreamSetNameA(PAVISTREAM,LPCSTR);
-HRESULT WINAPI EditStreamSetNameW(PAVISTREAM,LPCWSTR);
-VOID WINAPI AVIFileInit(void);
-VOID WINAPI AVIFileExit(void);
-HRESULT WINAPI AVIFileOpenA(PAVIFILE*,LPCSTR,UINT,LPCLSID);
-HRESULT WINAPI AVIFileOpenW(PAVIFILE*,LPCWSTR,UINT,LPCLSID);
-ULONG WINAPI AVIFileAddRef(PAVIFILE);
-ULONG WINAPI AVIFileRelease(PAVIFILE);
-HRESULT WINAPI AVIFileInfoA(PAVIFILE,PAVIFILEINFOA,LONG);
-HRESULT WINAPI AVIFileInfoW(PAVIFILE,PAVIFILEINFOW,LONG);
-HRESULT WINAPI AVIFileGetStream(PAVIFILE,PAVISTREAM*,DWORD,LONG);
-HRESULT WINAPI AVIFileCreateStreamA(PAVIFILE,PAVISTREAM*,AVISTREAMINFOA*);
-HRESULT WINAPI AVIFileCreateStreamW(PAVIFILE,PAVISTREAM*,AVISTREAMINFOW*);
-HRESULT WINAPI AVIFileWriteData(PAVIFILE,DWORD,LPVOID,LONG);
-HRESULT WINAPI AVIFileReadData(PAVIFILE,DWORD,LPVOID,LPLONG);
-HRESULT WINAPI AVIFileEndRecord(PAVIFILE);
-HRESULT WINAPI AVIClearClipboard(VOID);
-HRESULT WINAPI AVIGetFromClipboard(PAVIFILE*);
-HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE);
-#endif /* __OBJC__ */
-#ifdef OFN_READONLY
-BOOL WINAPI GetOpenFileNamePreviewA(LPOPENFILENAMEA);
-BOOL WINAPI GetOpenFileNamePreviewW(LPOPENFILENAMEW);
-BOOL WINAPI GetSaveFileNamePreviewA(LPOPENFILENAMEA);
-BOOL WINAPI GetSaveFileNamePreviewW(LPOPENFILENAMEW);
-#endif
-HWND VFWAPIV MCIWndCreateA(HWND,HINSTANCE,DWORD,LPCSTR);
-HWND VFWAPIV MCIWndCreateW(HWND,HINSTANCE,DWORD,LPCWSTR);
-HDRAWDIB VFWAPI DrawDibOpen(VOID);
-UINT VFWAPI DrawDibRealize(HDRAWDIB,HDC,BOOL);
-BOOL VFWAPI DrawDibBegin(HDRAWDIB,HDC,INT,INT,LPBITMAPINFOHEADER,INT,INT,UINT);
-BOOL VFWAPI DrawDibDraw(HDRAWDIB,HDC,INT,INT,INT,INT,LPBITMAPINFOHEADER,LPVOID,INT,INT,INT,INT,UINT);
-BOOL VFWAPI DrawDibSetPalette(HDRAWDIB,HPALETTE);
-HPALETTE VFWAPI DrawDibGetPalette(HDRAWDIB);
-BOOL VFWAPI DrawDibChangePalette(HDRAWDIB,int,int,LPPALETTEENTRY);
-LPVOID VFWAPI DrawDibGetBuffer(HDRAWDIB,LPBITMAPINFOHEADER,DWORD,DWORD);
-BOOL VFWAPI DrawDibStart(HDRAWDIB,DWORD);
-BOOL VFWAPI DrawDibStop(HDRAWDIB);
-BOOL VFWAPI DrawDibEnd(HDRAWDIB);
-BOOL VFWAPI DrawDibClose(HDRAWDIB);
-DWORD VFWAPI DrawDibProfileDisplay(LPBITMAPINFOHEADER);
-
-#define ICCompressGetFormat(hic,lpbiInput,lpbiOutput) ICSendMessage(hic,ICM_COMPRESS_GET_FORMAT,(DWORD)(lpbiInput),(DWORD)(lpbiOutput))
-#define ICCompressGetFormatSize(hic,lpbi) ICCompressGetFormat(hic,lpbi,NULL)
-#define ICCompressBegin(hic,lpbiInput,lpbiOutput) ICSendMessage(hic,ICM_COMPRESS_BEGIN,(DWORD)(lpbiInput),(DWORD)(lpbiOutput))
-#define ICCompressGetSize(hic,lpbiInput,lpbiOutput) ICSendMessage(hic,ICM_COMPRESS_GET_SIZE,(DWORD)(lpbiInput),(DWORD)(lpbiOutput))
-#define ICCompressQuery(hic,lpbiInput,lpbiOutput) ICSendMessage(hic,ICM_COMPRESS_QUERY,(DWORD)(lpbiInput),(DWORD)(lpbiOutput))
-#define ICCompressEnd(hic) ICSendMessage(hic,ICM_COMPRESS_END,0,0)
-#define ICQueryAbout(hic) (ICSendMessage(hic,ICM_ABOUT,(DWORD)-1,ICMF_ABOUT_QUERY)==ICERR_OK)
-#define ICAbout(hic,hwnd) ICSendMessage(hic,ICM_ABOUT,(DWORD)(hwnd),0)
-#define ICQueryConfigure(hic) (ICSendMessage(hic,ICM_CONFIGURE,(DWORD)-1,ICMF_CONFIGURE_QUERY)==ICERR_OK)
-#define ICConfigure(hic,hwnd) ICSendMessage(hic,ICM_CONFIGURE,(DWORD)(hwnd),0)
-#define ICDecompressBegin(hic,lpbiInput,lpbiOutput) ICSendMessage(hic,ICM_DECOMPRESS_BEGIN,(DWORD)(lpbiInput),(DWORD)(lpbiOutput))
-#define ICDecompressQuery(hic,lpbiInput,lpbiOutput) ICSendMessage(hic,ICM_DECOMPRESS_QUERY,(DWORD)(lpbiInput),(DWORD)(lpbiOutput))
-#define ICDecompressGetFormat(hic,lpbiInput,lpbiOutput) (LONG)ICSendMessage(hic,ICM_DECOMPRESS_GET_FORMAT,(DWORD)(lpbiInput),(DWORD)(lpbiOutput))
-#define ICDecompressGetFormatSize(hic,lpbi) ICDecompressGetFormat(hic, lpbi, NULL)
-#define ICDecompressGetPalette(hic,lpbiInput,lpbiOutput) ICSendMessage(hic,ICM_DECOMPRESS_GET_PALETTE,(DWORD)(lpbiInput),(DWORD)(lpbiOutput))
-#define ICDecompressSetPalette(hic,lpbiPalette) ICSendMessage(hic,ICM_DECOMPRESS_SET_PALETTE,(DWORD)(lpbiPalette),0)
-#define ICDecompressEnd(hic) ICSendMessage(hic,ICM_DECOMPRESS_END,0,0)
-#define ICDecompressExEnd(hic) ICSendMessage(hic,ICM_DECOMPRESSEX_END,0,0)
-#define ICDecompressOpen(fccType,fccHandler,lpbiIn,lpbiOut) ICLocate(fccType,fccHandler,lpbiIn,lpbiOut,ICMODE_DECOMPRESS)
-#define ICDrawOpen(fccType,fccHandler,lpbiIn) ICLocate(fccType,fccHandler,lpbiIn,NULL,ICMODE_DRAW)
-#define ICGetState(hic,pv,cb) ICSendMessage(hic,ICM_GETSTATE,(DWORD)(pv),(DWORD)(cb))
-#define ICSetState(hic,pv,cb) ICSendMessage(hic,ICM_SETSTATE,(DWORD)(pv),(DWORD)(cb))
-#define ICGetStateSize(hic) ICGetState(hic,NULL,0)
-#define ICDrawWindow(hic,prc) ICSendMessage(hic,ICM_DRAW_WINDOW,(DWORD)(prc),sizeof(RECT))
-#define ICDrawQuery(hic,lpbiInput) ICSendMessage(hic,ICM_DRAW_QUERY,(DWORD)(lpbiInput),0)
-#define ICDrawChangePalette(hic,lpbiInput) ICSendMessage(hic,ICM_DRAW_CHANGEPALETTE,(DWORD)(lpbiInput),0)
-#define ICGetBuffersWanted(hic,lpdwBuffers) ICSendMessage(hic,ICM_GETBUFFERSWANTED,(DWORD)(lpdwBuffers),0)
-#define ICDrawEnd(hic) ICSendMessage(hic,ICM_DRAW_END,0,0)
-#define ICDrawStart(hic) ICSendMessage(hic,ICM_DRAW_START,0,0)
-#define ICDrawStartPlay(hic,lFrom,lTo) ICSendMessage(hic,ICM_DRAW_START_PLAY,(DWORD)(lFrom),(DWORD)(lTo))
-#define ICDrawStop(hic) ICSendMessage(hic,ICM_DRAW_STOP,0,0)
-#define ICDrawStopPlay(hic) ICSendMessage(hic,ICM_DRAW_STOP_PLAY,0,0)
-#define ICDrawGetTime(hic,lplTime) ICSendMessage(hic,ICM_DRAW_GETTIME,(DWORD)(lplTime),0)
-#define ICDrawSetTime(hic,lTime) ICSendMessage(hic,ICM_DRAW_SETTIME,(DWORD)lTime,0)
-#define ICDrawRealize(hic,hdc,fBackground) ICSendMessage(hic,ICM_DRAW_REALIZE,(DWORD)(hdc),(DWORD)(fBackground))
-#define ICDrawFlush(hic) ICSendMessage(hic,ICM_DRAW_FLUSH,0,0)
-#define ICDrawRenderBuffer(hic) ICSendMessage(hic,ICM_DRAW_RENDERBUFFER,0,0)
-#define AVIFileClose(pavi) AVIFileRelease(pavi)
-#define AVIStreamClose(pavi) AVIStreamRelease(pavi);
-#define AVIStreamEnd(pavi) (AVIStreamStart(pavi)+AVIStreamLength(pavi))
-#define AVIStreamEndTime(pavi) AVIStreamSampleToTime(pavi,AVIStreamEnd(pavi))
-#define AVIStreamFormatSize(pavi,lPos,plSize) AVIStreamReadFormat(pavi,lPos,NULL,plSize)
-#define AVIStreamLengthTime(pavi) AVIStreamSampleToTime(pavi,AVIStreamLength(pavi))
-#define AVIStreamSampleSize(pavi,pos,psize) AVIStreamRead(pavi,pos,1,NULL,0,psize,NULL)
-#define AVIStreamSampleToSample(pavi1,pavi2,samp2) AVIStreamTimeToSample(pavi1,AVIStreamSampleToTime(pavi2,samp2))
-#define AVIStreamStartTime(pavi) AVIStreamSampleToTime(pavi,AVIStreamStart(pavi))
-#define AVIStreamNextSample(pavi,pos) AVIStreamFindSample(pavi,pos+1,FIND_NEXT|FIND_ANY)
-#define AVIStreamPrevSample(pavi,pos) AVIStreamFindSample(pavi,pos-1,FIND_PREV|FIND_ANY)
-#define AVIStreamNearestSample(pavi, pos) AVIStreamFindSample(pavi,pos,FIND_PREV|FIND_ANY)
-#define AVStreamNextKeyFrame(pavi,pos) AVIStreamFindSample(pavi,pos+1,FIND_NEXT|FIND_KEY)
-#define AVStreamPrevKeyFrame(pavi,pos) AVIStreamFindSample(pavi,pos-1,FIND_NEXT|FIND_KEY)
-#define AVIStreamNearestKeyFrame(pavi,pos) AVIStreamFindSample(pavi,pos,FIND_PREV|FIND_KEY)
-#define AVIStreamIsKeyFrame(pavi, pos) (AVIStreamNearestKeyFrame(pavi,pos) == pos)
-#ifdef __cplusplus
-#define MCIWndSM ::SendMessage
-#else
-#define MCIWndSM SendMessage
-#endif
-#define MCIWndCanPlay(hWnd) (BOOL)MCIWndSM(hWnd,MCIWNDM_CAN_PLAY,0,0)
-#define MCIWndCanRecord(hWnd) (BOOL)MCIWndSM(hWnd,MCIWNDM_CAN_RECORD,0,0)
-#define MCIWndCanSave(hWnd) (BOOL)MCIWndSM(hWnd,MCIWNDM_CAN_SAVE,0,0)
-#define MCIWndCanWindow(hWnd) (BOOL)MCIWndSM(hWnd,MCIWNDM_CAN_WINDOW,0,0)
-#define MCIWndCanEject(hWnd) (BOOL)MCIWndSM(hWnd,MCIWNDM_CAN_EJECT,0,0)
-#define MCIWndCanConfig(hWnd) (BOOL)MCIWndSM(hWnd,MCIWNDM_CAN_CONFIG,0,0)
-#define MCIWndPaletteKick(hWnd) (BOOL)MCIWndSM(hWnd,MCIWNDM_PALETTEKICK,0,0)
-#define MCIWndSave(hWnd,szFile) (LONG)MCIWndSM(hWnd,MCI_SAVE,0,(LPARAM)(LPVOID)(szFile))
-#define MCIWndSaveDialog(hWnd) MCIWndSave(hWnd,-1)
-#define MCIWndNew(hWnd,lp) (LONG)MCIWndSM(hWnd,MCIWNDM_NEW,0,(LPARAM)(LPVOID)(lp))
-#define MCIWndRecord(hWnd) (LONG)MCIWndSM(hWnd,MCI_RECORD,0,0)
-#define MCIWndOpen(hWnd,sz,f) (LONG)MCIWndSM(hWnd,MCIWNDM_OPEN,(WPARAM)(UINT)(f),(LPARAM)(LPVOID)(sz))
-#define MCIWndOpenDialog(hWnd) MCIWndOpen(hWnd,-1,0)
-#define MCIWndClose(hWnd) (LONG)MCIWndSM(hWnd,MCI_CLOSE,0,0)
-#define MCIWndPlay(hWnd) (LONG)MCIWndSM(hWnd,MCI_PLAY,0,0)
-#define MCIWndStop(hWnd) (LONG)MCIWndSM(hWnd,MCI_STOP,0,0)
-#define MCIWndPause(hWnd) (LONG)MCIWndSM(hWnd,MCI_PAUSE,0,0)
-#define MCIWndResume(hWnd) (LONG)MCIWndSM(hWnd,MCI_RESUME,0,0)
-#define MCIWndSeek(hWnd,lPos) (LONG)MCIWndSM(hWnd,MCI_SEEK,0,(LPARAM)(LONG)(lPos))
-#define MCIWndEject(hWnd) (LONG)MCIWndSM(hWnd,MCIWNDM_EJECT,0,0)
-#define MCIWndHome(hWnd) MCIWndSeek(hWnd,MCIWND_START)
-#define MCIWndEnd(hWnd) MCIWndSeek(hWnd,MCIWND_END)
-#define MCIWndGetSource(hWnd,prc) (LONG)MCIWndSM(hWnd,MCIWNDM_GET_SOURCE,0,(LPARAM)(LPRECT)(prc))
-#define MCIWndPutSource(hWnd,prc) (LONG)MCIWndSM(hWnd,MCIWNDM_PUT_SOURCE,0,(LPARAM)(LPRECT)(prc))
-#define MCIWndGetDest(hWnd,prc) (LONG)MCIWndSM(hWnd,MCIWNDM_GET_DEST,0,(LPARAM)(LPRECT)(prc))
-#define MCIWndPutDest(hWnd,prc) (LONG)MCIWndSM(hWnd,MCIWNDM_PUT_DEST,0,(LPARAM)(LPRECT)(prc))
-#define MCIWndPlayReverse(hWnd) (LONG)MCIWndSM(hWnd,MCIWNDM_PLAYREVERSE,0,0)
-#define MCIWndPlayFrom(hWnd,lPos) (LONG)MCIWndSM(hWnd,MCIWNDM_PLAYFROM,0,(LPARAM)(LONG)(lPos))
-#define MCIWndPlayTo(hWnd,lPos) (LONG)MCIWndSM(hWnd,MCIWNDM_PLAYTO,  0,(LPARAM)(LONG)(lPos))
-#define MCIWndPlayFromTo(hWnd,lStart,lEnd) (MCIWndSeek(hWnd,lStart),MCIWndPlayTo(hWnd,lEnd))
-#define MCIWndGetDeviceID(hWnd) (UINT)MCIWndSM(hWnd,MCIWNDM_GETDEVICEID,0,0)
-#define MCIWndGetAlias(hWnd) (UINT)MCIWndSM(hWnd,MCIWNDM_GETALIAS,0,0)
-#define MCIWndGetMode(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_GETMODE,(WPARAM)(UINT)(len),(LPARAM)(LPTSTR)(lp))
-#define MCIWndGetPosition(hWnd) (LONG)MCIWndSM(hWnd,MCIWNDM_GETPOSITION,0,0)
-#define MCIWndGetPositionString(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_GETPOSITION,(WPARAM)(UINT)(len),(LPARAM)(LPTSTR)(lp))
-#define MCIWndGetStart(hWnd) (LONG)MCIWndSM(hWnd,MCIWNDM_GETSTART,0,0)
-#define MCIWndGetLength(hWnd) (LONG)MCIWndSM(hWnd,MCIWNDM_GETLENGTH,0,0)
-#define MCIWndGetEnd(hWnd) (LONG)MCIWndSM(hWnd,MCIWNDM_GETEND,0,0)
-#define MCIWndStep(hWnd,n) (LONG)MCIWndSM(hWnd,MCI_STEP,0,(LPARAM)(long)(n))
-#define MCIWndDestroy(hWnd) (VOID)MCIWndSM(hWnd,WM_CLOSE,0,0)
-#define MCIWndSetZoom(hWnd,iZoom) (VOID)MCIWndSM(hWnd,MCIWNDM_SETZOOM,0,(LPARAM)(UINT)(iZoom))
-#define MCIWndGetZoom(hWnd) (UINT)MCIWndSM(hWnd,MCIWNDM_GETZOOM,0,0)
-#define MCIWndSetVolume(hWnd,iVol) (LONG)MCIWndSM(hWnd,MCIWNDM_SETVOLUME,0,(LPARAM)(UINT)(iVol))
-#define MCIWndGetVolume(hWnd) (LONG)MCIWndSM(hWnd,MCIWNDM_GETVOLUME,0,0)
-#define MCIWndSetSpeed(hWnd,iSpeed) (LONG)MCIWndSM(hWnd,MCIWNDM_SETSPEED,0,(LPARAM)(UINT)(iSpeed))
-#define MCIWndGetSpeed(hWnd) (LONG)MCIWndSM(hWnd,MCIWNDM_GETSPEED,0,0)
-#define MCIWndSetTimeFormat(hWnd,lp) (LONG)MCIWndSM(hWnd,MCIWNDM_SETTIMEFORMAT,0,(LPARAM)(LPTSTR)(lp))
-#define MCIWndGetTimeFormat(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_GETTIMEFORMAT,(WPARAM)(UINT)(len),(LPARAM)(LPTSTR)(lp))
-#define MCIWndValidateMedia(hWnd) (VOID)MCIWndSM(hWnd,MCIWNDM_VALIDATEMEDIA,0,0)
-#define MCIWndSetRepeat(hWnd,f) (void)MCIWndSM(hWnd,MCIWNDM_SETREPEAT,0,(LPARAM)(BOOL)(f))
-#define MCIWndGetRepeat(hWnd) (BOOL)MCIWndSM(hWnd,MCIWNDM_GETREPEAT,0,0)
-#define MCIWndUseFrames(hWnd) MCIWndSetTimeFormat(hWnd,TEXT("frames"))
-#define MCIWndUseTime(hWnd) MCIWndSetTimeFormat(hWnd,TEXT("ms"))
-#define MCIWndSetActiveTimer(hWnd,active) (VOID)MCIWndSM(hWnd,MCIWNDM_SETACTIVETIMER,(WPARAM)(UINT)(active),0L)
-#define MCIWndSetInactiveTimer(hWnd,inactive) (VOID)MCIWndSM(hWnd,MCIWNDM_SETINACTIVETIMER,(WPARAM)(UINT)(inactive),0L)
-#define MCIWndSetTimers(hWnd,active,inactive) (VOID)MCIWndSM(hWnd,MCIWNDM_SETTIMERS,(WPARAM)(UINT)(active),(LPARAM)(UINT)(inactive))
-#define MCIWndGetActiveTimer(hWnd) (UINT)MCIWndSM(hWnd,MCIWNDM_GETACTIVETIMER,0,0L);
-#define MCIWndGetInactiveTimer(hWnd) (UINT)MCIWndSM(hWnd,MCIWNDM_GETINACTIVETIMER,0,0L);
-#define MCIWndRealize(hWnd,fBkgnd) (LONG)MCIWndSM(hWnd,MCIWNDM_REALIZE,(WPARAM)(BOOL)(fBkgnd),0)
-#define MCIWndSendString(hWnd,sz) (LONG)MCIWndSM(hWnd,MCIWNDM_SENDSTRING,0,(LPARAM)(LPTSTR)(sz))
-#define MCIWndReturnString(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_RETURNSTRING,(WPARAM)(UINT)(len),(LPARAM)(LPVOID)(lp))
-#define MCIWndGetError(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_GETERROR,(WPARAM)(UINT)(len),(LPARAM)(LPVOID)(lp))
-#define MCIWndGetPalette(hWnd) (HPALETTE)MCIWndSM(hWnd,MCIWNDM_GETPALETTE,0,0)
-#define MCIWndSetPalette(hWnd,hpal) (LONG)MCIWndSM(hWnd,MCIWNDM_SETPALETTE,(WPARAM)(HPALETTE)(hpal),0)
-#define MCIWndGetFileName(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_GETFILENAME,(WPARAM)(UINT)(len),(LPARAM)(LPVOID)(lp))
-#define MCIWndGetDevice(hWnd,lp,len) (LONG)MCIWndSM(hWnd,MCIWNDM_GETDEVICE,(WPARAM)(UINT)(len),(LPARAM)(LPVOID)(lp))
-#define MCIWndGetStyles(hWnd) (UINT)MCIWndSM(hWnd,MCIWNDM_GETSTYLES,0,0L)
-#define MCIWndChangeStyles(hWnd,mask,value) (LONG)MCIWndSM(hWnd,MCIWNDM_CHANGESTYLES,(WPARAM)(UINT)(mask),(LPARAM)(LONG)(value))
-#define MCIWndOpenInterface(hWnd,pUnk) (LONG)MCIWndSM(hWnd,MCIWNDM_OPENINTERFACE,0,(LPARAM)(LPUNKNOWN)(pUnk))
-#define MCIWndSetOwner(hWnd,hWndP) (LONG)MCIWndSM(hWnd,MCIWNDM_SETOWNER,(WPARAM)(hWndP),0)
-#define DrawDibUpdate(hdd,hdc,x,y) DrawDibDraw(hdd,hdc,x,y,0,0,NULL,NULL,0,0,0,0,DDF_UPDATE)
-static __inline DWORD
-ICGetDefaultQuality(HIC hic)
-{
-   DWORD dwICValue;
-   ICSendMessage(hic, ICM_GETDEFAULTQUALITY, (DWORD)(LPVOID)&dwICValue, sizeof(DWORD));
-   return dwICValue;
-}
-static __inline DWORD
-ICGetDefaultKeyFrameRate(HIC hic)
-{
-   DWORD dwICValue;
-   ICSendMessage(hic, ICM_GETDEFAULTKEYFRAMERATE, (DWORD)(LPVOID)&dwICValue, sizeof(DWORD));
-   return dwICValue;
-}
-static __inline LRESULT
-ICDrawSuggestFormat(HIC hic,LPBITMAPINFOHEADER lpbiIn,LPBITMAPINFOHEADER lpbiOut,INT dxSrc,INT dySrc,INT dxDst,INT dyDst,HIC hicDecomp)
-{
-	ICDRAWSUGGEST ic;
-	ic.lpbiIn = lpbiIn;
-	ic.lpbiSuggest = lpbiOut;
-	ic.dxSrc = dxSrc;
-	ic.dySrc = dySrc;
-	ic.dxDst = dxDst;
-	ic.dyDst = dyDst;
-	ic.hicDecompressor = hicDecomp;
-	return ICSendMessage(hic,ICM_DRAW_SUGGESTFORMAT,(DWORD)&ic,sizeof(ic));
-}
-static __inline LRESULT
-ICSetStatusProc(HIC hic,DWORD dwFlags,LRESULT lParam,LONG (CALLBACK *fpfnStatus)(LPARAM,UINT,LONG))
-{
-	ICSETSTATUSPROC ic;
-	ic.dwFlags = dwFlags;
-	ic.lParam = lParam;
-	ic.Status = fpfnStatus;
-	return ICSendMessage(hic,ICM_SET_STATUS_PROC,(DWORD)&ic,sizeof(ic));
-}
-static __inline LRESULT 
-ICDecompressEx(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiSrc,LPVOID lpSrc,INT xSrc,INT ySrc,INT dxSrc,INT dySrc,LPBITMAPINFOHEADER lpbiDst,LPVOID lpDst,INT xDst,INT yDst,INT dxDst,INT dyDst)
-{
-	ICDECOMPRESSEX ic;
-	ic.dwFlags = dwFlags;
-	ic.lpbiSrc = lpbiSrc;
-	ic.lpSrc = lpSrc;
-	ic.xSrc = xSrc;
-	ic.ySrc = ySrc;
-	ic.dxSrc = dxSrc;
-	ic.dySrc = dySrc;
-	ic.lpbiDst = lpbiDst;
-	ic.lpDst = lpDst;
-	ic.xDst = xDst;
-	ic.yDst = yDst;
-	ic.dxDst = dxDst;
-	ic.dyDst = dyDst;
-	return ICSendMessage(hic,ICM_DECOMPRESSEX,(DWORD)&ic,sizeof(ic));
-}
-static __inline LRESULT
-ICDecompressExBegin(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiSrc,LPVOID lpSrc,INT xSrc,INT ySrc,INT dxSrc,INT dySrc,LPBITMAPINFOHEADER lpbiDst,LPVOID lpDst,INT xDst,INT yDst,INT dxDst,INT dyDst)
-{
-	ICDECOMPRESSEX ic;
-	ic.dwFlags = dwFlags;
-	ic.lpbiSrc = lpbiSrc;
-	ic.lpSrc = lpSrc;
-	ic.xSrc = xSrc;
-	ic.ySrc = ySrc;
-	ic.dxSrc = dxSrc;
-	ic.dySrc = dySrc;
-	ic.lpbiDst = lpbiDst;
-	ic.lpDst = lpDst;
-	ic.xDst = xDst;
-	ic.yDst = yDst;
-	ic.dxDst = dxDst;
-	ic.dyDst = dyDst;
-	return ICSendMessage(hic,ICM_DECOMPRESSEX_BEGIN,(DWORD)&ic,sizeof(ic));
-}
-static __inline LRESULT
-ICDecompressExQuery(HIC hic,DWORD dwFlags,LPBITMAPINFOHEADER lpbiSrc,LPVOID lpSrc,INT xSrc,INT ySrc,INT dxSrc,INT dySrc,LPBITMAPINFOHEADER lpbiDst,LPVOID lpDst,INT xDst,INT yDst,INT dxDst,INT dyDst)
-{
-	ICDECOMPRESSEX ic;
-	ic.dwFlags = dwFlags;
-	ic.lpbiSrc = lpbiSrc;
-	ic.lpSrc = lpSrc;
-	ic.xSrc = xSrc;
-	ic.ySrc = ySrc;
-	ic.dxSrc = dxSrc;
-	ic.dySrc = dySrc;
-	ic.lpbiDst = lpbiDst;
-	ic.lpDst = lpDst;
-	ic.xDst = xDst;
-	ic.yDst = yDst;
-	ic.dxDst = dxDst;
-	ic.dyDst = dyDst;
-	return ICSendMessage(hic,ICM_DECOMPRESSEX_QUERY,(DWORD)&ic,sizeof(ic));
-}
-
-#ifdef UNICODE
-#define AVISTREAMINFO AVISTREAMINFOW
-#define LPAVISTREAMINFO LPAVISTREAMINFOW
-#define PAVISTREAMINFO PAVISTREAMINFOW
-#define AVIFILEINFO AVIFILEINFOW
-#define PAVIFILEINFO PAVIFILEINFOW
-#define LPAVIFILEINFO LPAVIFILEINFOW
-#define AVIStreamInfo AVIStreamInfoW
-#define AVIStreamOpenFromFile AVIStreamOpenFromFileW
-#define AVIBuildFilter AVIBuildFilterW
-#define AVISaveV AVISaveVW
-#define EditStreamSetInfo EditStreamSetInfoW
-#define EditStreamSetName EditStreamSetNameW
-#define AVIFileOpen AVIFileOpenW
-#define AVIFileInfo AVIFileInfoW
-#define AVIFileCreateStream AVIFileCreateStreamW
-#define GetOpenFileNamePreview GetOpenFileNamePreviewW
-#define GetSaveFileNamePreview GetSaveFileNamePreviewW
-#define MCIWndCreate MCIWndCreateW
-#define MCIWNDF_NOTIFYMEDIA MCIWNDF_NOTIFYMEDIAW
-#define MCIWNDM_SENDSTRING MCIWNDM_SENDSTRINGW
-#define MCIWNDM_GETPOSITION MCIWNDM_GETPOSITIONW
-#define MCIWNDM_GETMODE MCIWNDM_GETMODEW
-#define MCIWNDM_SETTIMEFORMAT MCIWNDM_SETTIMEFORMATW
-#define MCIWNDM_GETTIMEFORMAT MCIWNDM_GETTIMEFORMATW
-#define MCIWNDM_GETFILENAME MCIWNDM_GETFILENAMEW
-#define MCIWNDM_GETDEVICE MCIWNDM_GETDEVICEW
-#define MCIWNDM_GETERROR MCIWNDM_GETERRORW
-#define MCIWNDM_NEW MCIWNDM_NEWW
-#define MCIWNDM_RETURNSTRING MCIWNDM_RETURNSTRINGW
-#define MCIWNDM_OPEN MCIWNDM_OPENW
-#else
-#define AVISTREAMINFO AVISTREAMINFOA
-#define LPAVISTREAMINFO LPAVISTREAMINFOA
-#define PAVISTREAMINFO PAVISTREAMINFOA
-#define AVIFILEINFO AVIFILEINFOA
-#define PAVIFILEINFO PAVIFILEINFOA
-#define LPAVIFILEINFO LPAVIFILEINFOA
-#define AVIStreamInfo AVIStreamInfoA
-#define AVIStreamOpenFromFile AVIStreamOpenFromFileA
-#define AVIBuildFilter AVIBuildFilterA
-#define AVISaveV AVISaveVA
-#define EditStreamSetInfo EditStreamSetInfoA
-#define EditStreamSetName EditStreamSetNameA
-#define AVIFileOpen AVIFileOpenA
-#define AVIFileInfo AVIFileInfoA
-#define AVIFileCreateStream AVIFileCreateStreamA
-#define GetOpenFileNamePreview GetOpenFileNamePreviewA
-#define GetSaveFileNamePreview GetSaveFileNamePreviewA
-#define MCIWndCreate MCIWndCreateA
-#define MCIWNDF_NOTIFYMEDIA MCIWNDF_NOTIFYMEDIAA
-#define MCIWNDM_SENDSTRING MCIWNDM_SENDSTRINGA
-#define MCIWNDM_GETPOSITION MCIWNDM_GETPOSITIONA
-#define MCIWNDM_GETMODE MCIWNDM_GETMODEA
-#define MCIWNDM_SETTIMEFORMAT MCIWNDM_SETTIMEFORMATA
-#define MCIWNDM_GETTIMEFORMAT MCIWNDM_GETTIMEFORMATA
-#define MCIWNDM_GETFILENAME MCIWNDM_GETFILENAMEA
-#define MCIWNDM_GETDEVICE MCIWNDM_GETDEVICEA
-#define MCIWNDM_GETERROR MCIWNDM_GETERRORA
-#define MCIWNDM_NEW MCIWNDM_NEWA
-#define MCIWNDM_RETURNSTRING MCIWNDM_RETURNSTRINGA
-#define MCIWNDM_OPEN MCIWNDM_OPENA
-#endif
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-#include <poppack.h>
-#endif /* _VFW_H */
diff --git a/winsup/w32api/include/w32api.h b/winsup/w32api/include/w32api.h
deleted file mode 100644
index 3e0224164..000000000
--- a/winsup/w32api/include/w32api.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _W32API_H_
-#define _W32API_H_
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define __W32API_VERSION 2.5
-#define __W32API_MAJOR_VERSION 2
-#define __W32API_MINOR_VERSION 5
-
-#endif /* ndef _W32API_H_ */
diff --git a/winsup/w32api/include/winable.h b/winsup/w32api/include/winable.h
deleted file mode 100644
index 022829353..000000000
--- a/winsup/w32api/include/winable.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef _WINABLE_H
-#define _WINABLE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if (_WIN32_WINNT < 0x0403)
-#define INPUT_MOUSE 0x00000000
-#define INPUT_KEYBOARD 0x00000001
-#define INPUT_HARDWARE 0x00000002
-#endif /* (_WIN32_WINNT < 0x04030) */
-#if (WINVER < 0x0500)
-#define CHILDID_SELF 0
-#define OBJID_WINDOW 0x00000000
-#define OBJID_SYSMENU 0xFFFFFFFF
-#define OBJID_TITLEBAR 0xFFFFFFFE
-#define OBJID_MENU 0xFFFFFFFD
-#define OBJID_CLIENT 0xFFFFFFFC
-#define OBJID_VSCROLL 0xFFFFFFFB
-#define OBJID_HSCROLL 0xFFFFFFFA
-#define OBJID_SIZEGRIP 0xFFFFFFF9
-#define OBJID_CARET 0xFFFFFFF8
-#define OBJID_CURSOR 0xFFFFFFF7
-#define OBJID_ALERT 0xFFFFFFF6
-#define OBJID_SOUND 0xFFFFFFF5
-#define GUI_CARETBLINKING 0x00000001
-#define GUI_INMOVESIZE 0x00000002
-#define GUI_INMENUMODE 0x00000004
-#define GUI_SYSTEMMENUMODE 0x00000008
-#define GUI_POPUPMENUMODE 0x00000010
-#define WINEVENT_OUTOFCONTEXT 0x0000
-#define WINEVENT_SKIPOWNTHREAD 0x0001
-#define WINEVENT_SKIPOWNPROCESS 0x0002
-#define WINEVENT_INCONTEXT 0x0004
-#endif /* (WINVER < 0x0500) */
-#if (_WIN32_WINNT < 0x0403)
-typedef struct tagMOUSEINPUT {
-	LONG dx;
-	LONG dy;
-	DWORD mouseData;
-	DWORD dwFlags;
-	DWORD time;
-	ULONG_PTR dwExtraInfo;
-} MOUSEINPUT,*PMOUSEINPUT;
-typedef struct tagKEYBDINPUT {
-	WORD wVk;
-	WORD wScan;
-	DWORD dwFlags;
-	DWORD time;
-	ULONG_PTR dwExtraInfo;
-} KEYBDINPUT,*PKEYBDINPUT;
-typedef struct tagHARDWAREINPUT {
-	DWORD uMsg;
-	WORD wParamL;
-	WORD wParamH;
-} HARDWAREINPUT,*PHARDWAREINPUT;
-typedef struct tagINPUT {
-	DWORD type;
-	_ANONYMOUS_UNION union {
-		MOUSEINPUT mi;
-		KEYBDINPUT ki;
-		HARDWAREINPUT hi;
-	} DUMMYUNIONNAME;
-} INPUT,*PINPUT,*LPINPUT;
-#endif /* (_WIN32_WINNT < 0x0403) */
-#if (WINVER < 0x0500)
-typedef VOID (*WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD);
-typedef struct tagGUITHREADINFO {
-	DWORD cbSize;
-	DWORD flags;
-	HWND hwndActive;
-	HWND hwndFocus;
-	HWND hwndCapture;
-	HWND hwndMenuOwner;
-	HWND hwndMoveSize;
-	HWND hwndCaret;
-	RECT rcCaret;
-} GUITHREADINFO,*PGUITHREADINFO,*LPGUITHREADINFO;
-#endif /* (WINVER < 0x0500) */
-
-BOOL WINAPI BlockInput(BOOL);
-#if (_WIN32_WINNT < 0x0403)
-UINT WINAPI SendInput(UINT,LPINPUT,int);
-#endif
-#if (WINVER < 0x0500)
-BOOL WINAPI GetGUIThreadInfo(DWORD,LPGUITHREADINFO);
-void WINAPI NotifyWinEvent(DWORD,HWND,LONG,LONG);
-HWINEVENTHOOK WINAPI SetWinEventHook(UINT,UINT,HMODULE,WINEVENTPROC,DWORD,DWORD,UINT);
-BOOL WINAPI UnhookWinEvent(HWINEVENTHOOK);
-#endif /* (WINVER < 0x0500) */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
deleted file mode 100644
index c953afa9f..000000000
--- a/winsup/w32api/include/winbase.h
+++ /dev/null
@@ -1,2317 +0,0 @@
-#ifndef _WINBASE_H
-#define _WINBASE_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifndef WINBASEAPI
-#define WINBASEAPI DECLSPEC_IMPORT
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SP_SERIALCOMM 1
-#define PST_UNSPECIFIED	0
-#define PST_RS232	1
-#define PST_PARALLELPORT	2
-#define PST_RS422	3
-#define PST_RS423	4
-#define PST_RS449	5
-#define PST_MODEM	6
-#define PST_FAX	0x21
-#define PST_SCANNER	0x22
-#define PST_NETWORK_BRIDGE	0x100
-#define PST_LAT	0x101
-#define PST_TCPIP_TELNET	0x102
-#define PST_X25	0x103
-#define BAUD_075	1
-#define BAUD_110	2
-#define BAUD_134_5	4
-#define BAUD_150	8
-#define BAUD_300	16
-#define BAUD_600	32
-#define BAUD_1200	64
-#define BAUD_1800	128
-#define BAUD_2400	256
-#define BAUD_4800	512
-#define BAUD_7200	1024
-#define BAUD_9600	2048
-#define BAUD_14400	4096
-#define BAUD_19200	8192
-#define BAUD_38400	16384
-#define BAUD_56K	32768
-#define BAUD_128K	65536
-#define BAUD_115200	131072
-#define BAUD_57600	262144
-#define BAUD_USER	0x10000000
-#define PCF_DTRDSR	1
-#define PCF_RTSCTS	2
-#define PCF_RLSD	4
-#define PCF_PARITY_CHECK	8
-#define PCF_XONXOFF	16
-#define PCF_SETXCHAR	32
-#define PCF_TOTALTIMEOUTS	64
-#define PCF_INTTIMEOUTS	128
-#define PCF_SPECIALCHARS	256
-#define PCF_16BITMODE	512
-#define SP_PARITY	1
-#define SP_BAUD	2
-#define SP_DATABITS	4
-#define SP_STOPBITS	8
-#define SP_HANDSHAKING	16
-#define SP_PARITY_CHECK	32
-#define SP_RLSD	64
-#define DATABITS_5	1
-#define DATABITS_6	2
-#define DATABITS_7	4
-#define DATABITS_8	8
-#define DATABITS_16	16
-#define DATABITS_16X	32
-#define STOPBITS_10	1
-#define STOPBITS_15	2
-#define STOPBITS_20	4
-#define PARITY_NONE	256
-#define PARITY_ODD	512
-#define PARITY_EVEN	1024
-#define PARITY_MARK	2048
-#define PARITY_SPACE	4096
-#define EXCEPTION_DEBUG_EVENT	1
-#define CREATE_THREAD_DEBUG_EVENT	2
-#define CREATE_PROCESS_DEBUG_EVENT	3
-#define EXIT_THREAD_DEBUG_EVENT	4
-#define EXIT_PROCESS_DEBUG_EVENT	5
-#define LOAD_DLL_DEBUG_EVENT	6
-#define UNLOAD_DLL_DEBUG_EVENT	7
-#define OUTPUT_DEBUG_STRING_EVENT	8
-#define RIP_EVENT	9
-#define HFILE_ERROR ((HFILE)-1)
-#define FILE_BEGIN	0
-#define FILE_CURRENT	1
-#define FILE_END	2
-#define INVALID_SET_FILE_POINTER	((DWORD)-1)
-#define OF_READ 0
-#define OF_READWRITE	2
-#define OF_WRITE	1
-#define OF_SHARE_COMPAT	0
-#define OF_SHARE_DENY_NONE	64
-#define OF_SHARE_DENY_READ	48
-#define OF_SHARE_DENY_WRITE	32
-#define OF_SHARE_EXCLUSIVE	16
-#define OF_CANCEL	2048
-#define OF_CREATE	4096
-#define OF_DELETE	512
-#define OF_EXIST	16384
-#define OF_PARSE	256
-#define OF_PROMPT	8192
-#define OF_REOPEN	32768
-#define OF_VERIFY	1024
-#define NMPWAIT_NOWAIT	1
-#define NMPWAIT_WAIT_FOREVER	((DWORD)-1)
-#define NMPWAIT_USE_DEFAULT_WAIT	0
-#define CE_BREAK	16
-#define CE_DNS	2048
-#define CE_FRAME	8
-#define CE_IOE	1024
-#define CE_MODE	32768
-#define CE_OOP	4096
-#define CE_OVERRUN	2
-#define CE_PTO	512
-#define CE_RXOVER	1
-#define CE_RXPARITY	4
-#define CE_TXFULL	256
-#define PROGRESS_CONTINUE	0
-#define PROGRESS_CANCEL	1
-#define PROGRESS_STOP	2
-#define PROGRESS_QUIET	3
-#define CALLBACK_CHUNK_FINISHED	0
-#define CALLBACK_STREAM_SWITCH	1
-#define COPY_FILE_FAIL_IF_EXISTS	1
-#define COPY_FILE_RESTARTABLE	2
-#define OFS_MAXPATHNAME 128
-#define FILE_MAP_ALL_ACCESS     0xf001f
-#define FILE_MAP_READ   4
-#define FILE_MAP_WRITE  2
-#define FILE_MAP_COPY   1
-#define MUTEX_ALL_ACCESS	0x1f0001
-#define MUTEX_MODIFY_STATE	1
-#define SEMAPHORE_ALL_ACCESS	0x1f0003
-#define SEMAPHORE_MODIFY_STATE	2
-#define EVENT_ALL_ACCESS	0x1f0003
-#define EVENT_MODIFY_STATE	2
-#define PIPE_ACCESS_DUPLEX      3
-#define PIPE_ACCESS_INBOUND     1
-#define PIPE_ACCESS_OUTBOUND    2
-#define PIPE_TYPE_BYTE	0
-#define PIPE_TYPE_MESSAGE	4
-#define PIPE_READMODE_BYTE	0
-#define PIPE_READMODE_MESSAGE	2
-#define PIPE_WAIT	0
-#define PIPE_NOWAIT	1
-#define PIPE_CLIENT_END 0
-#define PIPE_SERVER_END 1
-#define PIPE_UNLIMITED_INSTANCES 255
-#define DEBUG_PROCESS			0x00000001
-#define DEBUG_ONLY_THIS_PROCESS		0x00000002
-#define CREATE_SUSPENDED		0x00000004
-#define DETACHED_PROCESS		0x00000008
-#define CREATE_NEW_CONSOLE		0x00000010
-#define NORMAL_PRIORITY_CLASS		0x00000020
-#define IDLE_PRIORITY_CLASS		0x00000040
-#define HIGH_PRIORITY_CLASS		0x00000080
-#define REALTIME_PRIORITY_CLASS		0x00000100
-#define CREATE_NEW_PROCESS_GROUP	0x00000200
-#define CREATE_UNICODE_ENVIRONMENT	0x00000400
-#define CREATE_SEPARATE_WOW_VDM		0x00000800
-#define CREATE_SHARED_WOW_VDM		0x00001000
-#define CREATE_FORCEDOS			0x00002000
-#define BELOW_NORMAL_PRIORITY_CLASS	0x00004000
-#define ABOVE_NORMAL_PRIORITY_CLASS	0x00008000
-#define CREATE_BREAKAWAY_FROM_JOB	0x01000000
-#define CREATE_WITH_USERPROFILE		0x02000000
-#define CREATE_DEFAULT_ERROR_MODE	0x04000000
-#define CREATE_NO_WINDOW		0x08000000
-#define PROFILE_USER			0x10000000
-#define PROFILE_KERNEL			0x20000000
-#define PROFILE_SERVER			0x40000000
-#define CONSOLE_TEXTMODE_BUFFER 1
-#define CREATE_NEW	1
-#define CREATE_ALWAYS	2
-#define OPEN_EXISTING	3
-#define OPEN_ALWAYS	4
-#define TRUNCATE_EXISTING	5
-#define FILE_FLAG_WRITE_THROUGH	0x80000000
-#define FILE_FLAG_OVERLAPPED	1073741824
-#define FILE_FLAG_NO_BUFFERING	536870912
-#define FILE_FLAG_RANDOM_ACCESS	268435456
-#define FILE_FLAG_SEQUENTIAL_SCAN	134217728
-#define FILE_FLAG_DELETE_ON_CLOSE	67108864
-#define FILE_FLAG_BACKUP_SEMANTICS	33554432
-#define FILE_FLAG_POSIX_SEMANTICS	16777216
-#define FILE_FLAG_OPEN_REPARSE_POINT	2097152
-#define FILE_FLAG_OPEN_NO_RECALL	1048576
-#if (_WIN32_WINNT >= 0x0500)
-#define FILE_FLAG_FIRST_PIPE_INSTANCE	524288
-#endif
-#define CLRDTR 6
-#define CLRRTS 4
-#define SETDTR 5
-#define SETRTS 3
-#define SETXOFF 1
-#define SETXON 2
-#define SETBREAK 8
-#define CLRBREAK 9
-#define STILL_ACTIVE 0x103
-#define FIND_FIRST_EX_CASE_SENSITIVE 1
-#define SCS_32BIT_BINARY 0
-#define SCS_DOS_BINARY 1
-#define SCS_OS216_BINARY 5
-#define SCS_PIF_BINARY 3
-#define SCS_POSIX_BINARY 4
-#define SCS_WOW_BINARY 2
-#define MAX_COMPUTERNAME_LENGTH 15
-#define HW_PROFILE_GUIDLEN	39
-#define MAX_PROFILE_LEN	80
-#define DOCKINFO_UNDOCKED	1
-#define DOCKINFO_DOCKED	2
-#define DOCKINFO_USER_SUPPLIED	4
-#define DOCKINFO_USER_UNDOCKED	(DOCKINFO_USER_SUPPLIED|DOCKINFO_UNDOCKED)
-#define DOCKINFO_USER_DOCKED	(DOCKINFO_USER_SUPPLIED|DOCKINFO_DOCKED)
-#define DRIVE_REMOVABLE 2
-#define DRIVE_FIXED 3
-#define DRIVE_REMOTE 4
-#define DRIVE_CDROM 5
-#define DRIVE_RAMDISK 6
-#define DRIVE_UNKNOWN 0
-#define DRIVE_NO_ROOT_DIR 1
-#define FILE_TYPE_UNKNOWN 0
-#define FILE_TYPE_DISK 1
-#define FILE_TYPE_CHAR 2
-#define FILE_TYPE_PIPE 3
-#define FILE_TYPE_REMOTE 0x8000
-/* also in ddk/ntapi.h */
-#define HANDLE_FLAG_INHERIT		0x01
-#define HANDLE_FLAG_PROTECT_FROM_CLOSE	0x02
-/* end ntapi.h */
-#define STD_INPUT_HANDLE (DWORD)(0xfffffff6)
-#define STD_OUTPUT_HANDLE (DWORD)(0xfffffff5)
-#define STD_ERROR_HANDLE (DWORD)(0xfffffff4)
-#define INVALID_HANDLE_VALUE (HANDLE)(-1)
-#define GET_TAPE_MEDIA_INFORMATION 0
-#define GET_TAPE_DRIVE_INFORMATION 1
-#define SET_TAPE_MEDIA_INFORMATION 0
-#define SET_TAPE_DRIVE_INFORMATION 1
-#define THREAD_PRIORITY_ABOVE_NORMAL 1
-#define THREAD_PRIORITY_BELOW_NORMAL (-1)
-#define THREAD_PRIORITY_HIGHEST 2
-#define THREAD_PRIORITY_IDLE (-15)
-#define THREAD_PRIORITY_LOWEST (-2)
-#define THREAD_PRIORITY_NORMAL 0
-#define THREAD_PRIORITY_TIME_CRITICAL 15
-#define THREAD_PRIORITY_ERROR_RETURN 2147483647
-#define TIME_ZONE_ID_UNKNOWN 0
-#define TIME_ZONE_ID_STANDARD 1
-#define TIME_ZONE_ID_DAYLIGHT 2
-#define TIME_ZONE_ID_INVALID 0xFFFFFFFF
-#define FS_CASE_IS_PRESERVED 2
-#define FS_CASE_SENSITIVE 1
-#define FS_UNICODE_STORED_ON_DISK 4
-#define FS_PERSISTENT_ACLS 8
-#define FS_FILE_COMPRESSION 16
-#define FS_VOL_IS_COMPRESSED 32768
-#define GMEM_FIXED 0
-#define GMEM_MOVEABLE 2
-#define GMEM_MODIFY 128
-#define GPTR 64
-#define GHND 66
-#define GMEM_DDESHARE 8192
-#define GMEM_DISCARDABLE 256
-#define GMEM_LOWER 4096
-#define GMEM_NOCOMPACT 16
-#define GMEM_NODISCARD 32
-#define GMEM_NOT_BANKED 4096
-#define GMEM_NOTIFY 16384
-#define GMEM_SHARE 8192
-#define GMEM_ZEROINIT 64
-#define GMEM_DISCARDED 16384
-#define GMEM_INVALID_HANDLE 32768
-#define GMEM_LOCKCOUNT 255
-#define GMEM_VALID_FLAGS 32626
-#define STATUS_WAIT_0 0
-#define STATUS_ABANDONED_WAIT_0 0x80
-#define STATUS_USER_APC 0xC0
-#define STATUS_TIMEOUT 0x102
-#define STATUS_PENDING 0x103
-#define STATUS_SEGMENT_NOTIFICATION 0x40000005
-#define STATUS_GUARD_PAGE_VIOLATION 0x80000001
-#define STATUS_DATATYPE_MISALIGNMENT 0x80000002
-#define STATUS_BREAKPOINT 0x80000003
-#define STATUS_SINGLE_STEP 0x80000004
-#define STATUS_ACCESS_VIOLATION 0xC0000005
-#define STATUS_IN_PAGE_ERROR 0xC0000006
-#define STATUS_INVALID_HANDLE 0xC0000008L
-#define STATUS_NO_MEMORY 0xC0000017
-#define STATUS_ILLEGAL_INSTRUCTION 0xC000001D
-#define STATUS_NONCONTINUABLE_EXCEPTION 0xC0000025
-#define STATUS_INVALID_DISPOSITION 0xC0000026
-#define STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008C
-#define STATUS_FLOAT_DENORMAL_OPERAND 0xC000008D
-#define STATUS_FLOAT_DIVIDE_BY_ZERO 0xC000008E
-#define STATUS_FLOAT_INEXACT_RESULT 0xC000008F
-#define STATUS_FLOAT_INVALID_OPERATION 0xC0000090
-#define STATUS_FLOAT_OVERFLOW 0xC0000091
-#define STATUS_FLOAT_STACK_CHECK 0xC0000092
-#define STATUS_FLOAT_UNDERFLOW 0xC0000093
-#define STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094
-#define STATUS_INTEGER_OVERFLOW 0xC0000095
-#define STATUS_PRIVILEGED_INSTRUCTION 0xC0000096
-#define STATUS_STACK_OVERFLOW 0xC00000FD
-#define STATUS_CONTROL_C_EXIT 0xC000013A
-#define EXCEPTION_ACCESS_VIOLATION	STATUS_ACCESS_VIOLATION
-#define EXCEPTION_DATATYPE_MISALIGNMENT	STATUS_DATATYPE_MISALIGNMENT
-#define EXCEPTION_BREAKPOINT	STATUS_BREAKPOINT
-#define EXCEPTION_SINGLE_STEP	STATUS_SINGLE_STEP
-#define EXCEPTION_ARRAY_BOUNDS_EXCEEDED	STATUS_ARRAY_BOUNDS_EXCEEDED
-#define EXCEPTION_FLT_DENORMAL_OPERAND	STATUS_FLOAT_DENORMAL_OPERAND
-#define EXCEPTION_FLT_DIVIDE_BY_ZERO	STATUS_FLOAT_DIVIDE_BY_ZERO
-#define EXCEPTION_FLT_INEXACT_RESULT	STATUS_FLOAT_INEXACT_RESULT
-#define EXCEPTION_FLT_INVALID_OPERATION	STATUS_FLOAT_INVALID_OPERATION
-#define EXCEPTION_FLT_OVERFLOW	STATUS_FLOAT_OVERFLOW
-#define EXCEPTION_FLT_STACK_CHECK	STATUS_FLOAT_STACK_CHECK
-#define EXCEPTION_FLT_UNDERFLOW	STATUS_FLOAT_UNDERFLOW
-#define EXCEPTION_INT_DIVIDE_BY_ZERO	STATUS_INTEGER_DIVIDE_BY_ZERO
-#define EXCEPTION_INT_OVERFLOW	STATUS_INTEGER_OVERFLOW
-#define EXCEPTION_PRIV_INSTRUCTION	STATUS_PRIVILEGED_INSTRUCTION
-#define EXCEPTION_IN_PAGE_ERROR	STATUS_IN_PAGE_ERROR
-#define EXCEPTION_ILLEGAL_INSTRUCTION	STATUS_ILLEGAL_INSTRUCTION
-#define EXCEPTION_NONCONTINUABLE_EXCEPTION	STATUS_NONCONTINUABLE_EXCEPTION
-#define EXCEPTION_STACK_OVERFLOW	STATUS_STACK_OVERFLOW
-#define EXCEPTION_INVALID_DISPOSITION	STATUS_INVALID_DISPOSITION
-#define EXCEPTION_GUARD_PAGE	STATUS_GUARD_PAGE_VIOLATION
-#define EXCEPTION_INVALID_HANDLE	STATUS_INVALID_HANDLE
-#define CONTROL_C_EXIT	STATUS_CONTROL_C_EXIT
-#define PROCESS_HEAP_REGION 1
-#define PROCESS_HEAP_UNCOMMITTED_RANGE 2
-#define PROCESS_HEAP_ENTRY_BUSY 4
-#define PROCESS_HEAP_ENTRY_MOVEABLE 16
-#define PROCESS_HEAP_ENTRY_DDESHARE 32
-#define DONT_RESOLVE_DLL_REFERENCES 1
-#define LOAD_LIBRARY_AS_DATAFILE 2
-#define LOAD_WITH_ALTERED_SEARCH_PATH 8
-#define LMEM_FIXED 0
-#define LMEM_MOVEABLE 2
-#define LMEM_NONZEROLHND 2
-#define LMEM_NONZEROLPTR 0
-#define LMEM_DISCARDABLE 3840
-#define LMEM_NOCOMPACT 16
-#define LMEM_NODISCARD 32
-#define LMEM_ZEROINIT 64
-#define LMEM_DISCARDED 16384
-#define LMEM_MODIFY 128
-#define LMEM_INVALID_HANDLE 32768
-#define LMEM_LOCKCOUNT 255
-#define LPTR 64
-#define LHND 66
-#define NONZEROLHND 2
-#define NONZEROLPTR 0
-#define LOCKFILE_FAIL_IMMEDIATELY 1
-#define LOCKFILE_EXCLUSIVE_LOCK 2
-#define LOGON32_PROVIDER_DEFAULT	0
-#define LOGON32_PROVIDER_WINNT35	1
-#define LOGON32_LOGON_INTERACTIVE	2
-#define LOGON32_LOGON_BATCH	4
-#define LOGON32_LOGON_SERVICE	5
-#define MOVEFILE_REPLACE_EXISTING 1
-#define MOVEFILE_COPY_ALLOWED 2
-#define MOVEFILE_DELAY_UNTIL_REBOOT 4
-#define MOVEFILE_WRITE_THROUGH 8
-#define MAXIMUM_WAIT_OBJECTS 64
-#define MAXIMUM_SUSPEND_COUNT 0x7F
-#define WAIT_OBJECT_0 0
-#define WAIT_ABANDONED_0 128
-#ifndef WAIT_TIMEOUT /* also in winerror.h */
-#define WAIT_TIMEOUT 258
-#endif
-#define WAIT_IO_COMPLETION 0xC0
-#define WAIT_ABANDONED 128
-#define WAIT_FAILED ((DWORD)0xFFFFFFFF)
-#define PURGE_TXABORT 1
-#define PURGE_RXABORT 2
-#define PURGE_TXCLEAR 4
-#define PURGE_RXCLEAR 8
-#define EVENTLOG_SUCCESS 0
-#define EVENTLOG_FORWARDS_READ 4
-#define EVENTLOG_BACKWARDS_READ 8
-#define EVENTLOG_SEEK_READ 2
-#define EVENTLOG_SEQUENTIAL_READ 1
-#define EVENTLOG_ERROR_TYPE 1
-#define EVENTLOG_WARNING_TYPE 2
-#define EVENTLOG_INFORMATION_TYPE 4
-#define EVENTLOG_AUDIT_SUCCESS 8
-#define EVENTLOG_AUDIT_FAILURE 16
-#define FORMAT_MESSAGE_ALLOCATE_BUFFER 256
-#define FORMAT_MESSAGE_IGNORE_INSERTS 512
-#define FORMAT_MESSAGE_FROM_STRING 1024
-#define FORMAT_MESSAGE_FROM_HMODULE 2048
-#define FORMAT_MESSAGE_FROM_SYSTEM 4096
-#define FORMAT_MESSAGE_ARGUMENT_ARRAY 8192
-#define FORMAT_MESSAGE_MAX_WIDTH_MASK 255
-#define EV_BREAK 64
-#define EV_CTS 8
-#define EV_DSR 16
-#define EV_ERR 128
-#define EV_EVENT1 2048
-#define EV_EVENT2 4096
-#define EV_PERR 512
-#define EV_RING 256
-#define EV_RLSD 32
-#define EV_RX80FULL 1024
-#define EV_RXCHAR 1
-#define EV_RXFLAG 2
-#define EV_TXEMPTY 4
-/* also in ddk/ntapi.h */
-#define SEM_FAILCRITICALERRORS		0x0001
-#define SEM_NOGPFAULTERRORBOX		0x0002
-#define SEM_NOALIGNMENTFAULTEXCEPT	0x0004
-#define SEM_NOOPENFILEERRORBOX		0x8000
-/* end ntapi.h */
-#define SLE_ERROR 1
-#define SLE_MINORERROR 2
-#define SLE_WARNING 3
-#define SHUTDOWN_NORETRY 1
-#define EXCEPTION_EXECUTE_HANDLER 1
-#define EXCEPTION_CONTINUE_EXECUTION (-1)
-#define EXCEPTION_CONTINUE_SEARCH 0
-#define MAXINTATOM 0xC000
-#define INVALID_ATOM ((ATOM)0)
-#define IGNORE	0
-#define INFINITE	0xFFFFFFFF
-#define NOPARITY	0
-#define ODDPARITY	1
-#define EVENPARITY	2
-#define MARKPARITY	3
-#define SPACEPARITY	4
-#define ONESTOPBIT	0
-#define ONE5STOPBITS	1
-#define TWOSTOPBITS	2
-#define CBR_110	110
-#define CBR_300	300
-#define CBR_600	600
-#define CBR_1200	1200
-#define CBR_2400	2400
-#define CBR_4800	4800
-#define CBR_9600	9600
-#define CBR_14400	14400
-#define CBR_19200	19200
-#define CBR_38400	38400
-#define CBR_56000	56000
-#define CBR_57600	57600
-#define CBR_115200	115200
-#define CBR_128000	128000
-#define CBR_256000	256000
-#define BACKUP_INVALID	0
-#define BACKUP_DATA 1
-#define BACKUP_EA_DATA 2
-#define BACKUP_SECURITY_DATA 3
-#define BACKUP_ALTERNATE_DATA 4
-#define BACKUP_LINK 5
-#define BACKUP_PROPERTY_DATA 6
-#define BACKUP_OBJECT_ID 7
-#define BACKUP_REPARSE_DATA 8
-#define BACKUP_SPARSE_BLOCK 9
-#define STREAM_NORMAL_ATTRIBUTE 0
-#define STREAM_MODIFIED_WHEN_READ 1
-#define STREAM_CONTAINS_SECURITY 2
-#define STREAM_CONTAINS_PROPERTIES 4
-#define STARTF_USESHOWWINDOW 1
-#define STARTF_USESIZE 2
-#define STARTF_USEPOSITION 4
-#define STARTF_USECOUNTCHARS 8
-#define STARTF_USEFILLATTRIBUTE 16
-#define STARTF_RUNFULLSCREEN 32
-#define STARTF_FORCEONFEEDBACK 64
-#define STARTF_FORCEOFFFEEDBACK 128
-#define STARTF_USESTDHANDLES 256
-#define STARTF_USEHOTKEY 512
-#define TC_NORMAL 0
-#define TC_HARDERR 1
-#define TC_GP_TRAP 2
-#define TC_SIGNAL 3
-#define AC_LINE_OFFLINE 0
-#define AC_LINE_ONLINE 1
-#define AC_LINE_BACKUP_POWER 2
-#define AC_LINE_UNKNOWN 255
-#define BATTERY_FLAG_HIGH 1
-#define BATTERY_FLAG_LOW 2
-#define BATTERY_FLAG_CRITICAL 4
-#define BATTERY_FLAG_CHARGING 8
-#define BATTERY_FLAG_NO_BATTERY 128
-#define BATTERY_FLAG_UNKNOWN 255
-#define BATTERY_PERCENTAGE_UNKNOWN 255
-#define BATTERY_LIFE_UNKNOWN 0xFFFFFFFF
-#define DDD_RAW_TARGET_PATH 1
-#define DDD_REMOVE_DEFINITION 2
-#define DDD_EXACT_MATCH_ON_REMOVE 4
-#define HINSTANCE_ERROR 32
-#define MS_CTS_ON 16
-#define MS_DSR_ON 32
-#define MS_RING_ON 64
-#define MS_RLSD_ON 128
-#define DTR_CONTROL_DISABLE 0
-#define DTR_CONTROL_ENABLE 1
-#define DTR_CONTROL_HANDSHAKE 2
-#define RTS_CONTROL_DISABLE 0
-#define RTS_CONTROL_ENABLE 1
-#define RTS_CONTROL_HANDSHAKE 2
-#define RTS_CONTROL_TOGGLE 3
-#define SECURITY_ANONYMOUS (SecurityAnonymous<<16)
-#define SECURITY_IDENTIFICATION (SecurityIdentification<<16)
-#define SECURITY_IMPERSONATION (SecurityImpersonation<<16)
-#define SECURITY_DELEGATION (SecurityDelegation<<16)
-#define SECURITY_CONTEXT_TRACKING 0x40000
-#define SECURITY_EFFECTIVE_ONLY 0x80000
-#define SECURITY_SQOS_PRESENT 0x100000
-#define SECURITY_VALID_SQOS_FLAGS 0x1F0000
-#define INVALID_FILE_SIZE 0xFFFFFFFF
-#define TLS_OUT_OF_INDEXES (DWORD)0xFFFFFFFF
-#if (_WIN32_WINNT >= 0x0501)
-#define ACTCTX_FLAG_PROCESSOR_ARCHITECTURE_VALID 0x00000001
-#define ACTCTX_FLAG_LANGID_VALID 0x00000002
-#define ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID 0x00000004
-#define ACTCTX_FLAG_RESOURCE_NAME_VALID 0x00000008
-#define ACTCTX_FLAG_SET_PROCESS_DEFAULT 0x00000010
-#define ACTCTX_FLAG_APPLICATION_NAME_VALID 0x00000020
-#define ACTCTX_FLAG_HMODULE_VALID 0x00000080
-#define DEACTIVATE_ACTCTX_FLAG_FORCE_EARLY_DEACTIVATION 0x00000001
-#define FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX 0x00000001
-#define QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX 0x00000004
-#define QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE 0x00000008
-#define QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS 0x00000010
-#endif /* (_WIN32_WINNT >= 0x0501) */
-#if (_WIN32_WINNT >= 0x0500)
-#define REPLACEFILE_WRITE_THROUGH 0x00000001
-#define REPLACEFILE_IGNORE_MERGE_ERRORS 0x00000002
-#endif /* (_WIN32_WINNT >= 0x0500) */
-
-#ifndef RC_INVOKED
-typedef struct _FILETIME {
-	DWORD dwLowDateTime;
-	DWORD dwHighDateTime;
-} FILETIME,*PFILETIME,*LPFILETIME;
-typedef struct _BY_HANDLE_FILE_INFORMATION {
-	DWORD	dwFileAttributes;
-	FILETIME	ftCreationTime;
-	FILETIME	ftLastAccessTime;
-	FILETIME	ftLastWriteTime;
-	DWORD	dwVolumeSerialNumber;
-	DWORD	nFileSizeHigh;
-	DWORD	nFileSizeLow;
-	DWORD	nNumberOfLinks;
-	DWORD	nFileIndexHigh;
-	DWORD	nFileIndexLow;
-} BY_HANDLE_FILE_INFORMATION,*LPBY_HANDLE_FILE_INFORMATION;
-typedef struct _DCB {
-	DWORD DCBlength;
-	DWORD BaudRate;
-	DWORD fBinary:1;
-	DWORD fParity:1;
-	DWORD fOutxCtsFlow:1;
-	DWORD fOutxDsrFlow:1;
-	DWORD fDtrControl:2;
-	DWORD fDsrSensitivity:1;
-	DWORD fTXContinueOnXoff:1;
-	DWORD fOutX:1;
-	DWORD fInX:1;
-	DWORD fErrorChar:1;
-	DWORD fNull:1;
-	DWORD fRtsControl:2;
-	DWORD fAbortOnError:1;
-	DWORD fDummy2:17;
-	WORD wReserved;
-	WORD XonLim;
-	WORD XoffLim;
-	BYTE ByteSize;
-	BYTE Parity;
-	BYTE StopBits;
-	char XonChar;
-	char XoffChar;
-	char ErrorChar;
-	char EofChar;
-	char EvtChar;
-	WORD wReserved1;
-} DCB,*LPDCB;
-typedef struct _COMM_CONFIG {
-	DWORD dwSize;
-	WORD  wVersion;
-	WORD  wReserved;
-	DCB   dcb;
-	DWORD dwProviderSubType;
-	DWORD dwProviderOffset;
-	DWORD dwProviderSize;
-	WCHAR wcProviderData[1];
-} COMMCONFIG,*LPCOMMCONFIG;
-typedef struct _COMMPROP {
-	WORD	wPacketLength;
-	WORD	wPacketVersion;
-	DWORD	dwServiceMask;
-	DWORD	dwReserved1;
-	DWORD	dwMaxTxQueue;
-	DWORD	dwMaxRxQueue;
-	DWORD	dwMaxBaud;
-	DWORD	dwProvSubType;
-	DWORD	dwProvCapabilities;
-	DWORD	dwSettableParams;
-	DWORD	dwSettableBaud;
-	WORD	wSettableData;
-	WORD	wSettableStopParity;
-	DWORD	dwCurrentTxQueue;
-	DWORD	dwCurrentRxQueue;
-	DWORD	dwProvSpec1;
-	DWORD	dwProvSpec2;
-	WCHAR	wcProvChar[1];
-} COMMPROP,*LPCOMMPROP;
-typedef struct _COMMTIMEOUTS {
-	DWORD ReadIntervalTimeout;
-	DWORD ReadTotalTimeoutMultiplier;
-	DWORD ReadTotalTimeoutConstant;
-	DWORD WriteTotalTimeoutMultiplier;
-	DWORD WriteTotalTimeoutConstant;
-} COMMTIMEOUTS,*LPCOMMTIMEOUTS;
-typedef struct _COMSTAT {
-	DWORD fCtsHold:1;
-	DWORD fDsrHold:1;
-	DWORD fRlsdHold:1;
-	DWORD fXoffHold:1;
-	DWORD fXoffSent:1;
-	DWORD fEof:1;
-	DWORD fTxim:1;
-	DWORD fReserved:25;
-	DWORD cbInQue;
-	DWORD cbOutQue;
-} COMSTAT,*LPCOMSTAT;
-typedef DWORD (WINAPI *LPTHREAD_START_ROUTINE)(LPVOID);
-typedef struct _CREATE_PROCESS_DEBUG_INFO {
-	HANDLE hFile;
-	HANDLE hProcess;
-	HANDLE hThread;
-	LPVOID lpBaseOfImage;
-	DWORD dwDebugInfoFileOffset;
-	DWORD nDebugInfoSize;
-	LPVOID lpThreadLocalBase;
-	LPTHREAD_START_ROUTINE lpStartAddress;
-	LPVOID lpImageName;
-	WORD fUnicode;
-} CREATE_PROCESS_DEBUG_INFO,*LPCREATE_PROCESS_DEBUG_INFO;
-typedef struct _CREATE_THREAD_DEBUG_INFO {
-	HANDLE hThread;
-	LPVOID lpThreadLocalBase;
-	LPTHREAD_START_ROUTINE lpStartAddress;
-} CREATE_THREAD_DEBUG_INFO,*LPCREATE_THREAD_DEBUG_INFO;
-typedef struct _EXCEPTION_DEBUG_INFO {
-	EXCEPTION_RECORD ExceptionRecord;
-	DWORD dwFirstChance;
-} EXCEPTION_DEBUG_INFO,*LPEXCEPTION_DEBUG_INFO;
-typedef struct _EXIT_THREAD_DEBUG_INFO {
-	DWORD dwExitCode;
-} EXIT_THREAD_DEBUG_INFO,*LPEXIT_THREAD_DEBUG_INFO;
-typedef struct _EXIT_PROCESS_DEBUG_INFO {
-	DWORD dwExitCode;
-} EXIT_PROCESS_DEBUG_INFO,*LPEXIT_PROCESS_DEBUG_INFO;
-typedef struct _LOAD_DLL_DEBUG_INFO {
-	HANDLE hFile;
-	LPVOID lpBaseOfDll;
-	DWORD dwDebugInfoFileOffset;
-	DWORD nDebugInfoSize;
-	LPVOID lpImageName;
-	WORD fUnicode;
-} LOAD_DLL_DEBUG_INFO,*LPLOAD_DLL_DEBUG_INFO;
-typedef struct _UNLOAD_DLL_DEBUG_INFO {
-	LPVOID lpBaseOfDll;
-} UNLOAD_DLL_DEBUG_INFO,*LPUNLOAD_DLL_DEBUG_INFO;
-typedef struct _OUTPUT_DEBUG_STRING_INFO {
-	LPSTR lpDebugStringData;
-	WORD fUnicode;
-	WORD nDebugStringLength;
-} OUTPUT_DEBUG_STRING_INFO,*LPOUTPUT_DEBUG_STRING_INFO;
-typedef struct _RIP_INFO {
-	DWORD dwError;
-	DWORD dwType;
-} RIP_INFO,*LPRIP_INFO;
-typedef struct _DEBUG_EVENT {
-	DWORD dwDebugEventCode;
-	DWORD dwProcessId;
-	DWORD dwThreadId;
-	union {
-		EXCEPTION_DEBUG_INFO Exception;
-		CREATE_THREAD_DEBUG_INFO CreateThread;
-		CREATE_PROCESS_DEBUG_INFO CreateProcessInfo;
-		EXIT_THREAD_DEBUG_INFO ExitThread;
-		EXIT_PROCESS_DEBUG_INFO ExitProcess;
-		LOAD_DLL_DEBUG_INFO LoadDll;
-		UNLOAD_DLL_DEBUG_INFO UnloadDll;
-		OUTPUT_DEBUG_STRING_INFO DebugString;
-		RIP_INFO RipInfo;
-	} u;
-} DEBUG_EVENT,*LPDEBUG_EVENT;
-typedef struct _OVERLAPPED {
-	DWORD Internal;
-	DWORD InternalHigh;
-	DWORD Offset;
-	DWORD OffsetHigh;
-	HANDLE hEvent;
-} OVERLAPPED,*POVERLAPPED,*LPOVERLAPPED;
-typedef struct _STARTUPINFOA {
-	DWORD	cb;
-	LPSTR	lpReserved;
-	LPSTR	lpDesktop;
-	LPSTR	lpTitle;
-	DWORD	dwX;
-	DWORD	dwY;
-	DWORD	dwXSize;
-	DWORD	dwYSize;
-	DWORD	dwXCountChars;
-	DWORD	dwYCountChars;
-	DWORD	dwFillAttribute;
-	DWORD	dwFlags;
-	WORD	wShowWindow;
-	WORD	cbReserved2;
-	PBYTE	lpReserved2;
-	HANDLE	hStdInput;
-	HANDLE	hStdOutput;
-	HANDLE	hStdError;
-} STARTUPINFOA,*LPSTARTUPINFOA;
-typedef struct _STARTUPINFOW {
-	DWORD	cb;
-	LPWSTR	lpReserved;
-	LPWSTR	lpDesktop;
-	LPWSTR	lpTitle;
-	DWORD	dwX;
-	DWORD	dwY;
-	DWORD	dwXSize;
-	DWORD	dwYSize;
-	DWORD	dwXCountChars;
-	DWORD	dwYCountChars;
-	DWORD	dwFillAttribute;
-	DWORD	dwFlags;
-	WORD	wShowWindow;
-	WORD	cbReserved2;
-	PBYTE	lpReserved2;
-	HANDLE	hStdInput;
-	HANDLE	hStdOutput;
-	HANDLE	hStdError;
-} STARTUPINFOW,*LPSTARTUPINFOW;
-typedef struct _PROCESS_INFORMATION {
-	HANDLE hProcess;
-	HANDLE hThread;
-	DWORD dwProcessId;
-	DWORD dwThreadId;
-} PROCESS_INFORMATION,*LPPROCESS_INFORMATION;
-typedef struct _CRITICAL_SECTION_DEBUG {
-	WORD Type;
-	WORD CreatorBackTraceIndex;
-	struct _CRITICAL_SECTION *CriticalSection;
-	LIST_ENTRY ProcessLocksList;
-	DWORD EntryCount;
-	DWORD ContentionCount;
-	DWORD Spare [2];
-} CRITICAL_SECTION_DEBUG,*PCRITICAL_SECTION_DEBUG;
-typedef struct _CRITICAL_SECTION {
-	PCRITICAL_SECTION_DEBUG DebugInfo;
-	LONG LockCount;
-	LONG RecursionCount;
-	HANDLE OwningThread;
-	HANDLE LockSemaphore;
-	DWORD SpinCount;
-} CRITICAL_SECTION,*PCRITICAL_SECTION,*LPCRITICAL_SECTION;
-typedef struct _SYSTEMTIME {
-	WORD wYear;
-	WORD wMonth;
-	WORD wDayOfWeek;
-	WORD wDay;
-	WORD wHour;
-	WORD wMinute;
-	WORD wSecond;
-	WORD wMilliseconds;
-} SYSTEMTIME,*LPSYSTEMTIME;
-typedef struct _WIN32_FILE_ATTRIBUTE_DATA {
-	DWORD	dwFileAttributes;
-	FILETIME	ftCreationTime;
-	FILETIME	ftLastAccessTime;
-	FILETIME	ftLastWriteTime;
-	DWORD	nFileSizeHigh;
-	DWORD	nFileSizeLow;
-} WIN32_FILE_ATTRIBUTE_DATA,*LPWIN32_FILE_ATTRIBUTE_DATA;
-typedef struct _WIN32_FIND_DATAA {
-	DWORD dwFileAttributes;
-	FILETIME ftCreationTime;
-	FILETIME ftLastAccessTime;
-	FILETIME ftLastWriteTime;
-	DWORD nFileSizeHigh;
-	DWORD nFileSizeLow;
-	DWORD dwReserved0;
-	DWORD dwReserved1;
-	CHAR cFileName[MAX_PATH];
-	CHAR cAlternateFileName[14];
-} WIN32_FIND_DATAA,*PWIN32_FIND_DATAA,*LPWIN32_FIND_DATAA;
-typedef struct _WIN32_FIND_DATAW {
-	DWORD dwFileAttributes;
-	FILETIME ftCreationTime;
-	FILETIME ftLastAccessTime;
-	FILETIME ftLastWriteTime;
-	DWORD nFileSizeHigh;
-	DWORD nFileSizeLow;
-	DWORD dwReserved0;
-	DWORD dwReserved1;
-	WCHAR cFileName[MAX_PATH];
-	WCHAR cAlternateFileName[14];
-} WIN32_FIND_DATAW,*PWIN32_FIND_DATAW,*LPWIN32_FIND_DATAW;
-typedef struct _WIN32_STREAM_ID {
-	DWORD dwStreamId;
-	DWORD dwStreamAttributes;
-	LARGE_INTEGER Size;
-	DWORD dwStreamNameSize;
-	WCHAR cStreamName[ANYSIZE_ARRAY];
-} WIN32_STREAM_ID, *LPWIN32_STREAM_ID;
-typedef enum _FINDEX_INFO_LEVELS {
-	FindExInfoStandard,
-	FindExInfoMaxInfoLevel
-} FINDEX_INFO_LEVELS;
-typedef enum _FINDEX_SEARCH_OPS {
-	FindExSearchNameMatch,
-	FindExSearchLimitToDirectories,
-	FindExSearchLimitToDevices,
-	FindExSearchMaxSearchOp
-} FINDEX_SEARCH_OPS;
-typedef enum _ACL_INFORMATION_CLASS {
-	AclRevisionInformation=1,
-	AclSizeInformation
-} ACL_INFORMATION_CLASS;
-typedef struct tagHW_PROFILE_INFOA {
-	DWORD dwDockInfo;
-	CHAR szHwProfileGuid[HW_PROFILE_GUIDLEN];
-	CHAR szHwProfileName[MAX_PROFILE_LEN];
-} HW_PROFILE_INFOA,*LPHW_PROFILE_INFOA;
-typedef struct tagHW_PROFILE_INFOW {
-	DWORD dwDockInfo;
-	WCHAR szHwProfileGuid[HW_PROFILE_GUIDLEN];
-	WCHAR szHwProfileName[MAX_PROFILE_LEN];
-} HW_PROFILE_INFOW,*LPHW_PROFILE_INFOW;
-typedef enum _GET_FILEEX_INFO_LEVELS {
-	GetFileExInfoStandard,
-	GetFileExMaxInfoLevel
-} GET_FILEEX_INFO_LEVELS;
-typedef struct _SYSTEM_INFO {
-	_ANONYMOUS_UNION union {
-		DWORD dwOemId;
-		_ANONYMOUS_STRUCT struct {
-			WORD wProcessorArchitecture;
-			WORD wReserved;
-		} DUMMYSTRUCTNAME;
-	} DUMMYUNIONNAME;
-	DWORD dwPageSize;
-	PVOID lpMinimumApplicationAddress;
-	PVOID lpMaximumApplicationAddress;
-	DWORD dwActiveProcessorMask;
-	DWORD dwNumberOfProcessors;
-	DWORD dwProcessorType;
-	DWORD dwAllocationGranularity;
-	WORD wProcessorLevel;
-	WORD wProcessorRevision;
-} SYSTEM_INFO,*LPSYSTEM_INFO;
-typedef struct _SYSTEM_POWER_STATUS {
-	BYTE ACLineStatus;
-	BYTE BatteryFlag;
-	BYTE BatteryLifePercent;
-	BYTE Reserved1;
-	DWORD BatteryLifeTime;
-	DWORD BatteryFullLifeTime;
-} SYSTEM_POWER_STATUS,*LPSYSTEM_POWER_STATUS;
-typedef struct _TIME_ZONE_INFORMATION {
-	LONG Bias;
-	WCHAR StandardName[32];
-	SYSTEMTIME StandardDate;
-	LONG StandardBias;
-	WCHAR DaylightName[32];
-	SYSTEMTIME DaylightDate;
-	LONG DaylightBias;
-} TIME_ZONE_INFORMATION,*LPTIME_ZONE_INFORMATION;
-typedef struct _MEMORYSTATUS {
-	DWORD dwLength;
-	DWORD dwMemoryLoad;
-	DWORD dwTotalPhys;
-	DWORD dwAvailPhys;
-	DWORD dwTotalPageFile;
-	DWORD dwAvailPageFile;
-	DWORD dwTotalVirtual;
-	DWORD dwAvailVirtual;
-} MEMORYSTATUS,*LPMEMORYSTATUS;
-#if (_WIN32_WINNT >= 0x0500)
-typedef struct _MEMORYSTATUSEX {
-	DWORD dwLength;
-	DWORD dwMemoryLoad;
-	DWORDLONG ullTotalPhys;
-	DWORDLONG ullAvailPhys;
-	DWORDLONG ullTotalPageFile;
-	DWORDLONG ullAvailPageFile;
-	DWORDLONG ullTotalVirtual;
-	DWORDLONG ullAvailVirtual;
-	DWORDLONG ullAvailExtendedVirtual;
-} MEMORYSTATUSEX, *LPMEMORYSTATUSEX;
-#endif
-typedef struct _LDT_ENTRY {
-	WORD LimitLow;
-	WORD BaseLow;
-	union {
-		struct {
-			BYTE BaseMid;
-			BYTE Flags1;
-			BYTE Flags2;
-			BYTE BaseHi;
-		} Bytes;
-		struct {
-			DWORD BaseMid:8;
-			DWORD Type:5;
-			DWORD Dpl:2;
-			DWORD Pres:1;
-			DWORD LimitHi:4;
-			DWORD Sys:1;
-			DWORD Reserved_0:1;
-			DWORD Default_Big:1;
-			DWORD Granularity:1;
-			DWORD BaseHi:8;
-		} Bits;
-	} HighWord;
-} LDT_ENTRY,*PLDT_ENTRY,*LPLDT_ENTRY;
-typedef struct _PROCESS_HEAP_ENTRY {
-	PVOID lpData;
-	DWORD cbData;
-	BYTE cbOverhead;
-	BYTE iRegionIndex;
-	WORD wFlags;
-	_ANONYMOUS_UNION union {
-		struct {
-			HANDLE hMem;
-			DWORD dwReserved[3];
-		} Block;
-		struct {
-			DWORD dwCommittedSize;
-			DWORD dwUnCommittedSize;
-			LPVOID lpFirstBlock;
-			LPVOID lpLastBlock;
-		} Region;
-	} DUMMYUNIONNAME;
-} PROCESS_HEAP_ENTRY,*LPPROCESS_HEAP_ENTRY;
-typedef struct _OFSTRUCT {
-	BYTE cBytes;
-	BYTE fFixedDisk;
-	WORD nErrCode;
-	WORD Reserved1;
-	WORD Reserved2;
-	CHAR szPathName[OFS_MAXPATHNAME];
-} OFSTRUCT,*LPOFSTRUCT,*POFSTRUCT;
-typedef struct _WIN_CERTIFICATE {
-      DWORD dwLength;
-      WORD wRevision;
-      WORD wCertificateType;
-      BYTE bCertificate[1];
-} WIN_CERTIFICATE, *LPWIN_CERTIFICATE;
-#if (_WIN32_WINNT >= 0x0501)
-typedef struct tagACTCTXA {
-	ULONG cbSize;
-	DWORD dwFlags;
-	LPCSTR lpSource;
-	USHORT wProcessorArchitecture;
-	LANGID wLangId;
-	LPCSTR lpAssemblyDirectory;
-	LPCSTR lpResourceName;
-	LPCSTR lpApplicationName;
-	HMODULE hModule;
-} ACTCTXA,*PACTCTXA;
-typedef const ACTCTXA *PCACTCTXA;
-typedef struct tagACTCTXW {
-	ULONG cbSize;
-	DWORD dwFlags;
-	LPCWSTR lpSource;
-	USHORT wProcessorArchitecture;
-	LANGID wLangId;
-	LPCWSTR lpAssemblyDirectory;
-	LPCWSTR lpResourceName;
-	LPCWSTR lpApplicationName;
-	HMODULE hModule;
-} ACTCTXW,*PACTCTXW;
-typedef const ACTCTXW *PCACTCTXW;
-typedef struct tagACTCTX_SECTION_KEYED_DATA {
-	ULONG cbSize;
-	ULONG ulDataFormatVersion;
-	PVOID lpData;
-	ULONG ulLength;
-	PVOID lpSectionGlobalData;
-	ULONG ulSectionGlobalDataLength;
-	PVOID lpSectionBase;
-	ULONG ulSectionTotalLength;
-	HANDLE hActCtx;
-	HANDLE ulAssemblyRosterIndex;
-} ACTCTX_SECTION_KEYED_DATA,*PACTCTX_SECTION_KEYED_DATA;
-typedef const ACTCTX_SECTION_KEYED_DATA *PCACTCTX_SECTION_KEYED_DATA;
-typedef enum {
-	LowMemoryResourceNotification ,
-	HighMemoryResourceNotification
-} MEMORY_RESOURCE_NOTIFICATION_TYPE;
-#endif /* (_WIN32_WINNT >= 0x0501) */
-#if (_WIN32_WINNT >= 0x0500)
-typedef enum _COMPUTER_NAME_FORMAT {
-	ComputerNameNetBIOS, 
-	ComputerNameDnsHostname, 
-	ComputerNameDnsDomain, 
-	ComputerNameDnsFullyQualified, 
-	ComputerNamePhysicalNetBIOS, 
-	ComputerNamePhysicalDnsHostname, 
-	ComputerNamePhysicalDnsDomain, 
-	ComputerNamePhysicalDnsFullyQualified, 
-	ComputerNameMax
-} COMPUTER_NAME_FORMAT;
-#endif /* (_WIN32_WINNT >= 0x0500) */
-
-typedef DWORD(WINAPI *LPPROGRESS_ROUTINE)(LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,LARGE_INTEGER,DWORD,DWORD,HANDLE,HANDLE,LPVOID);
-typedef void(WINAPI *LPFIBER_START_ROUTINE)(PVOID);
-typedef BOOL(CALLBACK *ENUMRESLANGPROC)(HMODULE,LPCTSTR,LPCTSTR,WORD,LONG);
-typedef BOOL(CALLBACK *ENUMRESNAMEPROC)(HMODULE,LPCTSTR,LPTSTR,LONG);
-typedef BOOL(CALLBACK *ENUMRESTYPEPROC)(HMODULE,LPTSTR,LONG);
-typedef void(CALLBACK *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD,DWORD,LPOVERLAPPED);
-typedef LONG(CALLBACK *PTOP_LEVEL_EXCEPTION_FILTER)(LPEXCEPTION_POINTERS);
-typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
-typedef void(APIENTRY *PAPCFUNC)(DWORD);
-typedef void(CALLBACK *PTIMERAPCROUTINE)(PVOID,DWORD,DWORD);
-#if (_WIN32_WINNT >= 0x0500)
-typedef void(CALLBACK *WAITORTIMERCALLBACK)(PVOID,BOOLEAN);   
-#endif
-#define MAKEINTATOM(i) (LPTSTR)((DWORD)((WORD)(i)))
-/* Functions */
-#ifndef UNDER_CE
-int APIENTRY WinMain(HINSTANCE,HINSTANCE,LPSTR,int);
-#else
-int APIENTRY WinMain(HINSTANCE,HINSTANCE,LPWSTR,int);
-#endif
-int APIENTRY wWinMain(HINSTANCE,HINSTANCE,LPWSTR,int);
-long WINAPI _hread(HFILE,LPVOID,long);
-long WINAPI _hwrite(HFILE,LPCSTR,long);
-HFILE WINAPI _lclose(HFILE);
-HFILE WINAPI _lcreat(LPCSTR,int);
-LONG WINAPI _llseek(HFILE,LONG,int);
-HFILE WINAPI _lopen(LPCSTR,int);
-UINT WINAPI _lread(HFILE,LPVOID,UINT);
-UINT WINAPI _lwrite(HFILE,LPCSTR,UINT);
-#define AbnormalTermination() FALSE
-BOOL WINAPI AccessCheck(PSECURITY_DESCRIPTOR,HANDLE,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,PDWORD,PDWORD,PBOOL);
-BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL);
-BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,PDWORD,PBOOL,PBOOL);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR*);
-#endif
-BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID);
-BOOL WINAPI AddAccessDeniedAce(PACL,DWORD,DWORD,PSID);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID);
-BOOL WINAPI AddAccessDeniedAceEx(PACL,DWORD,DWORD,DWORD,PSID);
-#endif
-BOOL WINAPI AddAce(PACL,DWORD,DWORD,PVOID,DWORD);
-ATOM WINAPI AddAtomA(LPCSTR);
-ATOM WINAPI AddAtomW(LPCWSTR);
-BOOL WINAPI AddAuditAccessAce(PACL,DWORD,DWORD,PSID,BOOL,BOOL);
-#if (_WIN32_WINNT >= 0x0501)
-void WINAPI AddRefActCtx(HANDLE);
-#endif
-#if (_WIN32_WINNT >= 0x0500)
-PVOID WINAPI AddVectoredExceptionHandler(ULONG,PVECTORED_EXCEPTION_HANDLER);
-#endif
-BOOL WINAPI AdjustTokenGroups(HANDLE,BOOL,PTOKEN_GROUPS,DWORD,PTOKEN_GROUPS,PDWORD);
-BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);
-BOOL WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID*);
-BOOL WINAPI AllocateLocallyUniqueId(PLUID);
-BOOL WINAPI AreAllAccessesGranted(DWORD,DWORD);
-BOOL WINAPI AreAnyAccessesGranted(DWORD,DWORD);
-BOOL WINAPI AreFileApisANSI(void);
-BOOL WINAPI BackupEventLogA(HANDLE,LPCSTR);
-BOOL WINAPI BackupEventLogW(HANDLE,LPCWSTR);
-BOOL WINAPI BackupRead(HANDLE,LPBYTE,DWORD,LPDWORD,BOOL,BOOL,LPVOID*);
-BOOL WINAPI BackupSeek(HANDLE,DWORD,DWORD,LPDWORD,LPDWORD,LPVOID*);
-BOOL WINAPI BackupWrite(HANDLE,LPBYTE,DWORD,LPDWORD,BOOL,BOOL,LPVOID*);
-BOOL WINAPI Beep(DWORD,DWORD);
-HANDLE WINAPI BeginUpdateResourceA(LPCSTR,BOOL);
-HANDLE WINAPI BeginUpdateResourceW(LPCWSTR,BOOL);
-BOOL WINAPI BuildCommDCBA(LPCSTR,LPDCB);
-BOOL WINAPI BuildCommDCBW(LPCWSTR,LPDCB);
-BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR,LPDCB,LPCOMMTIMEOUTS);
-BOOL WINAPI BuildCommDCBAndTimeoutsW(LPCWSTR,LPDCB,LPCOMMTIMEOUTS);
-BOOL WINAPI CallNamedPipeA(LPCSTR,PVOID,DWORD,PVOID,DWORD,PDWORD,DWORD);
-BOOL WINAPI CallNamedPipeW(LPCWSTR,PVOID,DWORD,PVOID,DWORD,PDWORD,DWORD);
-BOOL WINAPI CancelDeviceWakeupRequest(HANDLE);
-BOOL WINAPI CancelIo(HANDLE);
-BOOL WINAPI CancelWaitableTimer(HANDLE);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI CheckNameLegalDOS8Dot3A(LPCSTR,LPSTR,DWORD,PBOOL,PBOOL);
-BOOL WINAPI CheckNameLegalDOS8Dot3W(LPCWSTR,LPSTR,DWORD,PBOOL,PBOOL);
-BOOL WINAPI CheckRemoteDebuggerPresent(HANDLE,PBOOL);
-#endif
-BOOL WINAPI ClearCommBreak(HANDLE);
-BOOL WINAPI ClearCommError(HANDLE,PDWORD,LPCOMSTAT);
-BOOL WINAPI ClearEventLogA(HANDLE,LPCSTR);
-BOOL WINAPI ClearEventLogW(HANDLE,LPCWSTR);
-BOOL WINAPI CloseEventLog(HANDLE);
-BOOL WINAPI CloseHandle(HANDLE);
-BOOL WINAPI CommConfigDialogA(LPCSTR,HWND,LPCOMMCONFIG);
-BOOL WINAPI CommConfigDialogW(LPCWSTR,HWND,LPCOMMCONFIG);
-LONG WINAPI CompareFileTime(CONST FILETIME*,CONST FILETIME*);
-BOOL WINAPI ConnectNamedPipe(HANDLE,LPOVERLAPPED);
-BOOL WINAPI ContinueDebugEvent(DWORD,DWORD,DWORD);
-#if (_WIN32_WINNT >= 0x0400)
-BOOL WINAPI ConvertFiberToThread(void);
-#endif
-PVOID WINAPI ConvertThreadToFiber(PVOID);
-BOOL WINAPI CopyFileA(LPCSTR,LPCSTR,BOOL);
-BOOL WINAPI CopyFileW(LPCWSTR,LPCWSTR,BOOL);
-BOOL WINAPI CopyFileExA(LPCSTR,LPCSTR,LPPROGRESS_ROUTINE,LPVOID,LPBOOL,DWORD);
-BOOL WINAPI CopyFileExW(LPCWSTR,LPCWSTR,LPPROGRESS_ROUTINE,LPVOID,LPBOOL,DWORD);
-#define RtlMoveMemory memmove
-#define RtlCopyMemory memcpy
-#define RtlFillMemory(d,l,f) memset((d), (f), (l))
-#define RtlZeroMemory(d,l) RtlFillMemory((d),(l),0)
-#define MoveMemory RtlMoveMemory
-#define CopyMemory RtlCopyMemory
-#define FillMemory RtlFillMemory
-#define ZeroMemory RtlZeroMemory
-BOOL WINAPI CopySid(DWORD,PSID,PSID);
-#if (_WIN32_WINNT >= 0x0501)
-HANDLE WINAPI CreateActCtxA(PCACTCTXA);
-HANDLE WINAPI CreateActCtxW(PCACTCTXW);
-#endif
-BOOL WINAPI CreateDirectoryA(LPCSTR,LPSECURITY_ATTRIBUTES);
-BOOL WINAPI CreateDirectoryW(LPCWSTR,LPSECURITY_ATTRIBUTES);
-BOOL WINAPI CreateDirectoryExA(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES);
-BOOL WINAPI CreateDirectoryExW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES);
-HANDLE WINAPI CreateEventA(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCSTR);
-HANDLE WINAPI CreateEventW(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCWSTR);
-LPVOID WINAPI CreateFiber(SIZE_T,LPFIBER_START_ROUTINE,LPVOID);
-#if (_WIN32_WINNT >= 0x0400)
-LPVOID WINAPI CreateFiberEx(SIZE_T,SIZE_T,DWORD,LPFIBER_START_ROUTINE,LPVOID);
-#endif
-HANDLE WINAPI CreateFileA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE);
-HANDLE WINAPI CreateFileW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES,DWORD,DWORD,HANDLE);
-HANDLE WINAPI CreateFileMappingA(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCSTR);
-HANDLE WINAPI CreateFileMappingW(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,DWORD,DWORD,LPCWSTR);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI CreateHardLinkA(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES);
-BOOL WINAPI CreateHardLinkW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES);
-#endif
-HANDLE WINAPI CreateIoCompletionPort(HANDLE,HANDLE,DWORD,DWORD);
-#if (_WIN32_WINNT >= 0x0500)
-HANDLE WINAPI CreateJobObjectA(LPSECURITY_ATTRIBUTES,LPCSTR);
-HANDLE WINAPI CreateJobObjectW(LPSECURITY_ATTRIBUTES,LPCWSTR);
-BOOL WINAPI TerminateJobObject(HANDLE,UINT);
-BOOL WINAPI AssignProcessToJobObject(HANDLE,HANDLE);
-#endif
-HANDLE WINAPI CreateMailslotA(LPCSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
-HANDLE WINAPI CreateMailslotW(LPCWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
-#if (_WIN32_WINNT >= 0x0501)
-HANDLE WINAPI CreateMemoryResourceNotification(MEMORY_RESOURCE_NOTIFICATION_TYPE);
-#endif
-HANDLE WINAPI CreateMutexA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR);
-HANDLE WINAPI CreateMutexW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR);
-HANDLE WINAPI CreateNamedPipeA(LPCSTR,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
-HANDLE WINAPI CreateNamedPipeW(LPCWSTR,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
-BOOL WINAPI CreatePipe(PHANDLE,PHANDLE,LPSECURITY_ATTRIBUTES,DWORD);
-BOOL WINAPI CreatePrivateObjectSecurity(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOL,HANDLE,PGENERIC_MAPPING);
-BOOL WINAPI CreateProcessA(LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,PVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION);
-BOOL WINAPI CreateProcessW(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,PVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION);
-BOOL WINAPI CreateProcessAsUserA(HANDLE,LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,PVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION);
-BOOL WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,PVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION);
-HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD);
-HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR);
-HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR);
-DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD);
-#if (_WIN32_WINNT >= 0x0500)
-HANDLE WINAPI CreateTimerQueue(void);
-BOOL WINAPI CreateTimerQueueTimer(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,ULONG);
-#endif
-HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,DWORD,LPTHREAD_START_ROUTINE,PVOID,DWORD,PDWORD);
-HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR);
-HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI DeactivateActCtx(DWORD,ULONG_PTR);
-#endif
-BOOL WINAPI DebugActiveProcess(DWORD);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI DebugActiveProcessStop(DWORD);
-#endif
-void WINAPI DebugBreak(void);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI DebugBreakProcess(HANDLE);
-BOOL WINAPI DebugSetProcessKillOnExit(BOOL);
-#endif
-BOOL WINAPI DefineDosDeviceA(DWORD,LPCSTR,LPCSTR);
-BOOL WINAPI DefineDosDeviceW(DWORD,LPCWSTR,LPCWSTR);
-#define DefineHandleTable(w) ((w),TRUE)
-BOOL WINAPI DeleteAce(PACL,DWORD);
-ATOM WINAPI DeleteAtom(ATOM);
-void WINAPI DeleteCriticalSection(PCRITICAL_SECTION);
-void WINAPI DeleteFiber(PVOID);
-BOOL WINAPI DeleteFileA(LPCSTR);
-BOOL WINAPI DeleteFileW(LPCWSTR);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI DeleteTimerQueue(HANDLE);
-BOOL WINAPI DeleteTimerQueueEx(HANDLE,HANDLE);
-BOOL WINAPI DeleteTimerQueueTimer(HANDLE,HANDLE,HANDLE);
-BOOL WINAPI DeleteVolumeMountPointA(LPCSTR);
-BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR);
-#endif
-BOOL WINAPI DeregisterEventSource(HANDLE);
-BOOL WINAPI DestroyPrivateObjectSecurity(PSECURITY_DESCRIPTOR*);
-BOOL WINAPI DeviceIoControl(HANDLE,DWORD,PVOID,DWORD,PVOID,DWORD,PDWORD,POVERLAPPED);
-BOOL WINAPI DisableThreadLibraryCalls(HMODULE);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR,LPSTR,LPDWORD);
-BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR,LPWSTR,LPDWORD);
-#endif
-BOOL WINAPI DisconnectNamedPipe(HANDLE);
-BOOL WINAPI DosDateTimeToFileTime(WORD,WORD,LPFILETIME);
-BOOL WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,PHANDLE,DWORD,BOOL,DWORD);
-BOOL WINAPI DuplicateToken(HANDLE,SECURITY_IMPERSONATION_LEVEL,PHANDLE);
-BOOL WINAPI DuplicateTokenEx(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE);
-BOOL WINAPI EncryptFileA(LPCSTR);
-BOOL WINAPI EncryptFileW(LPCWSTR);
-BOOL WINAPI EndUpdateResourceA(HANDLE,BOOL);
-BOOL WINAPI EndUpdateResourceW(HANDLE,BOOL);
-void WINAPI EnterCriticalSection(LPCRITICAL_SECTION);
-BOOL WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROC,LONG_PTR);
-BOOL WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROC,LONG_PTR);
-BOOL WINAPI EnumResourceNamesA(HMODULE,LPCSTR,ENUMRESNAMEPROC,LONG_PTR);
-BOOL WINAPI EnumResourceNamesW(HMODULE,LPCWSTR,ENUMRESNAMEPROC,LONG_PTR);
-BOOL WINAPI EnumResourceTypesA(HMODULE,ENUMRESTYPEPROC,LONG_PTR);
-BOOL WINAPI EnumResourceTypesW(HMODULE,ENUMRESTYPEPROC,LONG_PTR);
-BOOL WINAPI EqualPrefixSid(PSID,PSID);
-BOOL WINAPI EqualSid(PSID,PSID);
-DWORD WINAPI EraseTape(HANDLE,DWORD,BOOL);
-BOOL WINAPI EscapeCommFunction(HANDLE,DWORD);
-DECLSPEC_NORETURN void WINAPI ExitProcess(UINT);
-DECLSPEC_NORETURN void WINAPI ExitThread(DWORD);
-DWORD WINAPI ExpandEnvironmentStringsA(LPCSTR,LPSTR,DWORD);
-DWORD WINAPI ExpandEnvironmentStringsW(LPCWSTR,LPWSTR,DWORD);
-void WINAPI FatalAppExitA(UINT,LPCSTR);
-void WINAPI FatalAppExitW(UINT,LPCWSTR);
-void WINAPI FatalExit(int);
-BOOL WINAPI FileEncryptionStatusA(LPCSTR,LPDWORD);
-BOOL WINAPI FileEncryptionStatusW(LPCWSTR,LPDWORD);
-BOOL WINAPI FileTimeToDosDateTime(CONST FILETIME *,LPWORD,LPWORD);
-BOOL WINAPI FileTimeToLocalFileTime(CONST FILETIME *,LPFILETIME);
-BOOL WINAPI FileTimeToSystemTime(CONST FILETIME *,LPSYSTEMTIME);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI FindActCtxSectionGuid(DWORD,const GUID*,ULONG,const GUID*,PACTCTX_SECTION_KEYED_DATA);
-BOOL WINAPI FindActCtxSectionStringA(DWORD,const GUID*,ULONG,LPCSTR,PACTCTX_SECTION_KEYED_DATA);
-BOOL WINAPI FindActCtxSectionStringW(DWORD,const GUID*,ULONG,LPCWSTR,PACTCTX_SECTION_KEYED_DATA);
-#endif
-ATOM WINAPI FindAtomA(LPCSTR);
-ATOM WINAPI FindAtomW(LPCWSTR);
-BOOL WINAPI FindClose(HANDLE);
-BOOL WINAPI FindCloseChangeNotification(HANDLE);
-HANDLE WINAPI FindFirstChangeNotificationA(LPCSTR,BOOL,DWORD);
-HANDLE WINAPI FindFirstChangeNotificationW(LPCWSTR,BOOL,DWORD);
-HANDLE WINAPI FindFirstFileA(LPCSTR,LPWIN32_FIND_DATAA);
-HANDLE WINAPI FindFirstFileW(LPCWSTR,LPWIN32_FIND_DATAW);
-HANDLE WINAPI FindFirstFileExA(LPCSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID,DWORD);
-HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID,DWORD);
-BOOL WINAPI FindFirstFreeAce(PACL,PVOID*);
-#if (_WIN32_WINNT >= 0x0500)
-HANDLE WINAPI FindFirstVolumeA(LPCSTR,DWORD);
-HANDLE WINAPI FindFirstVolumeW(LPCWSTR,DWORD);
-HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD);
-HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD);
-#endif
-BOOL WINAPI FindNextChangeNotification(HANDLE);
-BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA);
-BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI FindNextVolumeA(HANDLE,LPCSTR,DWORD);
-BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD);
-BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD);
-BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD);
-BOOL WINAPI FindVolumeClose(HANDLE);
-BOOL WINAPI FindVolumeMountPointClose(HANDLE);
-#endif
-HRSRC WINAPI FindResourceA(HMODULE,LPCSTR,LPCSTR);
-HRSRC WINAPI FindResourceW(HINSTANCE,LPCWSTR,LPCWSTR);
-HRSRC WINAPI FindResourceExA(HINSTANCE,LPCSTR,LPCSTR,WORD);
-HRSRC WINAPI FindResourceExW(HINSTANCE,LPCWSTR,LPCWSTR,WORD);
-#if (_WIN32_WINNT >= 0x0502)
-DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR,LPCSTR,PVOID,DWORD);
-DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR,LPCWSTR,PVOID,DWORD);
-#endif
-BOOL WINAPI FlushFileBuffers(HANDLE);
-BOOL WINAPI FlushInstructionCache(HANDLE,PCVOID,DWORD);
-BOOL WINAPI FlushViewOfFile(PCVOID,DWORD);
-DWORD WINAPI FormatMessageA(DWORD,PCVOID,DWORD,DWORD,LPSTR,DWORD,va_list*);
-DWORD WINAPI FormatMessageW(DWORD,PCVOID,DWORD,DWORD,LPWSTR,DWORD,va_list*);
-BOOL WINAPI FreeEnvironmentStringsA(LPSTR);
-BOOL WINAPI FreeEnvironmentStringsW(LPWSTR);
-BOOL WINAPI FreeLibrary(HMODULE);
-DECLSPEC_NORETURN void WINAPI FreeLibraryAndExitThread(HMODULE,DWORD);
-#define FreeModule(m) FreeLibrary(m)
-#define FreeProcInstance(p) (void)(p)
-#ifndef XFree86Server
-BOOL WINAPI FreeResource(HGLOBAL);
-#endif /* ndef XFree86Server */
-PVOID WINAPI FreeSid(PSID);
-BOOL WINAPI GetAce(PACL,DWORD,LPVOID*);
-BOOL WINAPI GetAclInformation(PACL,PVOID,DWORD,ACL_INFORMATION_CLASS);
-UINT WINAPI GetAtomNameA(ATOM,LPSTR,int);
-UINT WINAPI GetAtomNameW(ATOM,LPWSTR,int);
-BOOL WINAPI GetBinaryTypeA(LPCSTR,PDWORD);
-BOOL WINAPI GetBinaryTypeW(LPCWSTR,PDWORD);
-LPSTR WINAPI GetCommandLineA(VOID);
-LPWSTR WINAPI GetCommandLineW(VOID);
-BOOL WINAPI GetCommConfig(HANDLE,LPCOMMCONFIG,PDWORD);
-BOOL WINAPI GetCommMask(HANDLE,PDWORD);
-BOOL WINAPI GetCommModemStatus(HANDLE,PDWORD);
-BOOL WINAPI GetCommProperties(HANDLE,LPCOMMPROP);
-BOOL WINAPI GetCommState(HANDLE,LPDCB);
-BOOL WINAPI GetCommTimeouts(HANDLE,LPCOMMTIMEOUTS);
-DWORD WINAPI GetCompressedFileSizeA(LPCSTR,PDWORD);
-DWORD WINAPI GetCompressedFileSizeW(LPCWSTR,PDWORD);
-BOOL WINAPI GetComputerNameA(LPSTR,PDWORD);
-BOOL WINAPI GetComputerNameW(LPWSTR,PDWORD);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI GetComputerNameExA(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD);
-BOOL WINAPI GetComputerNameExW(COMPUTER_NAME_FORMAT,LPWSTR,LPDWORD);
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI GetCurrentActCtx(HANDLE*);
-#endif
-DWORD WINAPI GetCurrentDirectoryA(DWORD,LPSTR);
-DWORD WINAPI GetCurrentDirectoryW(DWORD,LPWSTR);
-BOOL WINAPI GetCurrentHwProfileA(LPHW_PROFILE_INFOA);
-BOOL WINAPI GetCurrentHwProfileW(LPHW_PROFILE_INFOW);
-HANDLE WINAPI GetCurrentProcess(void);
-DWORD WINAPI GetCurrentProcessId(void);
-HANDLE WINAPI GetCurrentThread(void);
-DWORD WINAPI GetCurrentThreadId(void);
-#define GetCurrentTime GetTickCount
-BOOL WINAPI GetDefaultCommConfigA(LPCSTR,LPCOMMCONFIG,PDWORD);
-BOOL WINAPI GetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,PDWORD);
-BOOL WINAPI GetDiskFreeSpaceA(LPCSTR,PDWORD,PDWORD,PDWORD,PDWORD);
-BOOL WINAPI GetDiskFreeSpaceW(LPCWSTR,PDWORD,PDWORD,PDWORD,PDWORD);
-BOOL WINAPI GetDiskFreeSpaceExA(LPCSTR,PULARGE_INTEGER,PULARGE_INTEGER,PULARGE_INTEGER);
-BOOL WINAPI GetDiskFreeSpaceExW(LPCWSTR,PULARGE_INTEGER,PULARGE_INTEGER,PULARGE_INTEGER);
-#if (_WIN32_WINNT >= 0x0502)
-DWORD WINAPI GetDllDirectoryA(DWORD,LPSTR);
-DWORD WINAPI GetDllDirectoryW(DWORD,LPWSTR);
-#endif
-UINT WINAPI GetDriveTypeA(LPCSTR);
-UINT WINAPI GetDriveTypeW(LPCWSTR);
-LPSTR WINAPI GetEnvironmentStrings(void);
-LPSTR WINAPI GetEnvironmentStringsA(void);
-LPWSTR WINAPI GetEnvironmentStringsW(void);
-DWORD WINAPI GetEnvironmentVariableA(LPCSTR,LPSTR,DWORD);
-DWORD WINAPI GetEnvironmentVariableW(LPCWSTR,LPWSTR,DWORD);
-BOOL WINAPI GetExitCodeProcess(HANDLE,PDWORD);
-BOOL WINAPI GetExitCodeThread(HANDLE,PDWORD);
-DWORD WINAPI GetFileAttributesA(LPCSTR);
-DWORD WINAPI GetFileAttributesW(LPCWSTR);
-BOOL WINAPI GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS,PVOID);
-BOOL WINAPI GetFileAttributesExW(LPCWSTR,GET_FILEEX_INFO_LEVELS,PVOID);
-BOOL WINAPI GetFileInformationByHandle(HANDLE,LPBY_HANDLE_FILE_INFORMATION);
-BOOL WINAPI GetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD);
-BOOL WINAPI GetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD);
-DWORD WINAPI GetFileSize(HANDLE,PDWORD);
-BOOL WINAPI GetFileSizeEx(HANDLE,PLARGE_INTEGER);
-BOOL WINAPI GetFileTime(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME);
-DWORD WINAPI GetFileType(HANDLE);
-#define GetFreeSpace(w) (0x100000L)
-DWORD WINAPI GetFullPathNameA(LPCSTR,DWORD,LPSTR,LPSTR*);
-DWORD WINAPI GetFullPathNameW(LPCWSTR,DWORD,LPWSTR,LPWSTR*);
-BOOL WINAPI GetHandleInformation(HANDLE,PDWORD);
-BOOL WINAPI GetKernelObjectSecurity(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD);
-DWORD WINAPI GetLengthSid(PSID);
-void WINAPI GetLocalTime(LPSYSTEMTIME);
-DWORD WINAPI GetLogicalDrives(void);
-DWORD WINAPI GetLogicalDriveStringsA(DWORD,LPSTR);
-DWORD WINAPI GetLogicalDriveStringsW(DWORD,LPWSTR);
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-DWORD WINAPI GetLongPathNameA(LPCSTR,LPSTR,DWORD);
-DWORD WINAPI GetLongPathNameW(LPCWSTR,LPWSTR,DWORD);
-#endif
-BOOL WINAPI GetMailslotInfo(HANDLE,PDWORD,PDWORD,PDWORD,PDWORD);
-DWORD WINAPI GetModuleFileNameA(HINSTANCE,LPSTR,DWORD);
-DWORD WINAPI GetModuleFileNameW(HINSTANCE,LPWSTR,DWORD);
-HMODULE WINAPI GetModuleHandleA(LPCSTR);
-HMODULE WINAPI GetModuleHandleW(LPCWSTR);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI GetModuleHandleExA(DWORD,LPCSTR,HMODULE*);
-BOOL WINAPI GetModuleHandleExW(DWORD,LPCWSTR,HMODULE*);
-#endif
-BOOL WINAPI GetNamedPipeHandleStateA(HANDLE,PDWORD,PDWORD,PDWORD,PDWORD,LPSTR,DWORD);
-BOOL WINAPI GetNamedPipeHandleStateW(HANDLE,PDWORD,PDWORD,PDWORD,PDWORD,LPWSTR,DWORD);
-BOOL WINAPI GetNamedPipeInfo(HANDLE,PDWORD,PDWORD,PDWORD,PDWORD);
-#if (_WIN32_WINNT >= 0x0501)
-VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO);
-#endif
-BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD);
-BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD);
-BOOL WINAPI GetOverlappedResult(HANDLE,LPOVERLAPPED,PDWORD,BOOL);
-DWORD WINAPI GetPriorityClass(HANDLE);
-BOOL WINAPI GetPrivateObjectSecurity(PSECURITY_DESCRIPTOR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD);
-UINT WINAPI GetPrivateProfileIntA(LPCSTR,LPCSTR,INT,LPCSTR);
-UINT WINAPI GetPrivateProfileIntW(LPCWSTR,LPCWSTR,INT,LPCWSTR);
-DWORD WINAPI GetPrivateProfileSectionA(LPCSTR,LPSTR,DWORD,LPCSTR);
-DWORD WINAPI GetPrivateProfileSectionW(LPCWSTR,LPWSTR,DWORD,LPCWSTR);
-DWORD WINAPI GetPrivateProfileSectionNamesA(LPSTR,DWORD,LPCSTR);
-DWORD WINAPI GetPrivateProfileSectionNamesW(LPWSTR,DWORD,LPCWSTR);
-DWORD WINAPI GetPrivateProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPSTR,DWORD,LPCSTR);
-DWORD WINAPI GetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD,LPCWSTR);
-BOOL WINAPI GetPrivateProfileStructA(LPCSTR,LPCSTR,LPVOID,UINT,LPCSTR);
-BOOL WINAPI GetPrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR);
-FARPROC WINAPI GetProcAddress(HINSTANCE,LPCSTR);
-BOOL WINAPI GetProcessAffinityMask(HANDLE,PDWORD,PDWORD);
-#if (_WIN32_WINNT >= 0x0502)
-BOOL WINAPI GetProcessHandleCount(HANDLE,PDWORD);
-#endif
-HANDLE WINAPI GetProcessHeap(VOID);
-DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE);
-#if (_WIN32_WINNT >= 0x0502)
-DWORD WINAPI GetProcessId(HANDLE);
-#endif
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI GetProcessIoCounters(HANDLE,PIO_COUNTERS);
-#endif
-BOOL WINAPI GetProcessPriorityBoost(HANDLE,PBOOL);
-BOOL WINAPI GetProcessShutdownParameters(PDWORD,PDWORD);
-BOOL WINAPI GetProcessTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME);
-DWORD WINAPI GetProcessVersion(DWORD);
-HWINSTA WINAPI GetProcessWindowStation(void);
-BOOL WINAPI GetProcessWorkingSetSize(HANDLE,PSIZE_T,PSIZE_T);
-UINT WINAPI GetProfileIntA(LPCSTR,LPCSTR,INT);
-UINT WINAPI GetProfileIntW(LPCWSTR,LPCWSTR,INT);
-DWORD WINAPI GetProfileSectionA(LPCSTR,LPSTR,DWORD);
-DWORD WINAPI GetProfileSectionW(LPCWSTR,LPWSTR,DWORD);
-DWORD WINAPI GetProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPSTR,DWORD);
-DWORD WINAPI GetProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,DWORD);
-BOOL WINAPI GetQueuedCompletionStatus(HANDLE,PDWORD,PDWORD,LPOVERLAPPED*,DWORD);
-BOOL WINAPI GetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR_CONTROL,PDWORD);
-BOOL WINAPI GetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,LPBOOL,PACL*,LPBOOL);
-BOOL WINAPI GetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR,PSID*,LPBOOL);
-DWORD WINAPI GetSecurityDescriptorLength(PSECURITY_DESCRIPTOR);
-BOOL WINAPI GetSecurityDescriptorOwner(PSECURITY_DESCRIPTOR,PSID*,LPBOOL);
-BOOL WINAPI GetSecurityDescriptorSacl(PSECURITY_DESCRIPTOR,LPBOOL,PACL*,LPBOOL);
-DWORD WINAPI GetShortPathNameA(LPCSTR,LPSTR,DWORD);
-DWORD WINAPI GetShortPathNameW(LPCWSTR,LPWSTR,DWORD);
-PSID_IDENTIFIER_AUTHORITY WINAPI GetSidIdentifierAuthority(PSID);
-DWORD WINAPI GetSidLengthRequired(UCHAR);
-PDWORD WINAPI GetSidSubAuthority(PSID,DWORD);
-PUCHAR WINAPI GetSidSubAuthorityCount(PSID);
-VOID WINAPI GetStartupInfoA(LPSTARTUPINFOA);
-VOID WINAPI GetStartupInfoW(LPSTARTUPINFOW);
-HANDLE WINAPI GetStdHandle(DWORD);
-UINT WINAPI GetSystemDirectoryA(LPSTR,UINT);
-UINT WINAPI GetSystemDirectoryW(LPWSTR,UINT);
-VOID WINAPI GetSystemInfo(LPSYSTEM_INFO);
-BOOL WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS);
-#if (_WIN32_WINNT >= 0x0502)
-BOOL WINAPI GetSystemRegistryQuota(PDWORD,PDWORD);
-#endif
-VOID WINAPI GetSystemTime(LPSYSTEMTIME);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI GetSystemTimes(LPFILETIME,LPFILETIME,LPFILETIME);
-#endif
-BOOL WINAPI GetSystemTimeAdjustment(PDWORD,PDWORD,PBOOL);
-void WINAPI GetSystemTimeAsFileTime(LPFILETIME);
-#if (_WIN32_WINNT >= 0x0500)
-UINT WINAPI GetSystemWindowsDirectoryA(LPSTR,UINT);
-UINT WINAPI GetSystemWindowsDirectoryW(LPWSTR,UINT);
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-UINT WINAPI GetSystemWow64DirectoryA(LPSTR,UINT);
-UINT WINAPI GetSystemWow64DirectoryW(LPWSTR,UINT);
-#endif
-DWORD WINAPI GetTapeParameters(HANDLE,DWORD,PDWORD,PVOID);
-DWORD WINAPI GetTapePosition(HANDLE,DWORD,PDWORD,PDWORD,PDWORD);
-DWORD WINAPI GetTapeStatus(HANDLE);
-UINT WINAPI GetTempFileNameA(LPCSTR,LPCSTR,UINT,LPSTR);
-UINT WINAPI GetTempFileNameW(LPCWSTR,LPCWSTR,UINT,LPWSTR);
-DWORD WINAPI GetTempPathA(DWORD,LPSTR);
-DWORD WINAPI GetTempPathW(DWORD,LPWSTR);
-BOOL WINAPI GetThreadContext(HANDLE,LPCONTEXT);
-#if (_WIN32_WINNT >= 0x0502)
-BOOL WINAPI GetThreadIOPendingFlag(HANDLE,PBOOL);
-#endif
-int WINAPI GetThreadPriority(HANDLE);
-BOOL WINAPI GetThreadPriorityBoost(HANDLE,PBOOL);
-BOOL WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY);
-BOOL WINAPI GetThreadTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME);
-DWORD WINAPI GetTickCount(VOID);
-DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION);
-BOOL WINAPI GetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,DWORD,PDWORD);
-BOOL WINAPI GetUserNameA (LPSTR,PDWORD);
-BOOL WINAPI GetUserNameW(LPWSTR,PDWORD);
-DWORD WINAPI GetVersion(void);
-BOOL WINAPI GetVersionExA(LPOSVERSIONINFOA);
-BOOL WINAPI GetVersionExW(LPOSVERSIONINFOW);
-BOOL WINAPI GetVolumeInformationA(LPCSTR,LPSTR,DWORD,PDWORD,PDWORD,PDWORD,LPSTR,DWORD);
-BOOL WINAPI GetVolumeInformationW(LPCWSTR,LPWSTR,DWORD,PDWORD,PDWORD,PDWORD,LPWSTR,DWORD);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI GetVolumeNameForVolumeMountPointA(LPCSTR,LPSTR,DWORD);
-BOOL WINAPI GetVolumeNameForVolumeMountPointW(LPCWSTR,LPWSTR,DWORD);
-BOOL WINAPI GetVolumePathNameA(LPCSTR,LPSTR,DWORD);
-BOOL WINAPI GetVolumePathNameW(LPCWSTR,LPWSTR,DWORD);
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI GetVolumePathNamesForVolumeNameA(LPCSTR,LPSTR,DWORD,PDWORD);
-BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR,LPWSTR,DWORD,PDWORD);
-#endif
-UINT WINAPI GetWindowsDirectoryA(LPSTR,UINT);
-UINT WINAPI GetWindowsDirectoryW(LPWSTR,UINT);
-DWORD WINAPI GetWindowThreadProcessId(HWND,PDWORD);
-UINT GetWriteWatch(DWORD,PVOID,SIZE_T,PVOID*,PULONG_PTR,PULONG);
-ATOM WINAPI GlobalAddAtomA(LPCSTR);
-ATOM WINAPI GlobalAddAtomW( LPCWSTR);
-HGLOBAL WINAPI GlobalAlloc(UINT,DWORD);
-SIZE_T WINAPI GlobalCompact(DWORD); /* Obsolete: Has no effect. */
-ATOM WINAPI GlobalDeleteAtom(ATOM);
-HGLOBAL GlobalDiscard(HGLOBAL);
-ATOM WINAPI GlobalFindAtomA(LPCSTR);
-ATOM WINAPI GlobalFindAtomW(LPCWSTR);
-VOID WINAPI GlobalFix(HGLOBAL); /* Obsolete: Has no effect. */
-UINT WINAPI GlobalFlags(HGLOBAL); /* Obsolete: Has no effect. */
-HGLOBAL WINAPI GlobalFree(HGLOBAL);
-UINT WINAPI GlobalGetAtomNameA(ATOM,LPSTR,int);
-UINT WINAPI GlobalGetAtomNameW(ATOM,LPWSTR,int);
-HGLOBAL WINAPI GlobalHandle(PCVOID);
-LPVOID WINAPI GlobalLock(HGLOBAL);
-VOID WINAPI GlobalMemoryStatus(LPMEMORYSTATUS);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI GlobalMemoryStatusEx(LPMEMORYSTATUSEX);
-#endif
-HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,DWORD,UINT);
-DWORD WINAPI GlobalSize(HGLOBAL);
-VOID WINAPI GlobalUnfix(HGLOBAL); /* Obsolete: Has no effect. */
-BOOL WINAPI GlobalUnlock(HGLOBAL); 
-BOOL WINAPI GlobalUnWire(HGLOBAL); /* Obsolete: Has no effect. */
-PVOID WINAPI GlobalWire(HGLOBAL); /* Obsolete: Has no effect. */
-#define HasOverlappedIoCompleted(lpOverlapped)  ((lpOverlapped)->Internal != STATUS_PENDING)
-PVOID WINAPI HeapAlloc(HANDLE,DWORD,DWORD);
-SIZE_T WINAPI HeapCompact(HANDLE,DWORD);
-HANDLE WINAPI HeapCreate(DWORD,DWORD,DWORD);
-BOOL WINAPI HeapDestroy(HANDLE);
-BOOL WINAPI HeapFree(HANDLE,DWORD,PVOID);
-BOOL WINAPI HeapLock(HANDLE);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI HeapQueryInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T);
-#endif
-PVOID WINAPI HeapReAlloc(HANDLE,DWORD,PVOID,DWORD);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI HeapSetInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T);
-#endif
-DWORD WINAPI HeapSize(HANDLE,DWORD,PCVOID);
-BOOL WINAPI HeapUnlock(HANDLE);
-BOOL WINAPI HeapValidate(HANDLE,DWORD,PCVOID);
-BOOL WINAPI HeapWalk(HANDLE,LPPROCESS_HEAP_ENTRY);
-BOOL WINAPI ImpersonateLoggedOnUser(HANDLE);
-BOOL WINAPI ImpersonateNamedPipeClient(HANDLE);
-BOOL WINAPI ImpersonateSelf(SECURITY_IMPERSONATION_LEVEL);
-BOOL WINAPI InitAtomTable(DWORD);
-BOOL WINAPI InitializeAcl(PACL,DWORD,DWORD);
-VOID WINAPI InitializeCriticalSection(LPCRITICAL_SECTION);
-BOOL WINAPI InitializeCriticalSectionAndSpinCount(LPCRITICAL_SECTION,DWORD);
-DWORD WINAPI SetCriticalSectionSpinCount(LPCRITICAL_SECTION,DWORD);
-BOOL WINAPI InitializeSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD);
-BOOL WINAPI InitializeSid (PSID,PSID_IDENTIFIER_AUTHORITY,BYTE);
-#if (_WIN32_WINNT >= 0x0501)
-VOID WINAPI InitializeSListHead(PSLIST_HEADER);
-#endif
-#ifndef __INTERLOCKED_DECLARED
-#define __INTERLOCKED_DECLARED
-LONG WINAPI InterlockedCompareExchange(LPLONG,LONG,LONG);
-/* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */
-#define InterlockedCompareExchangePointer(d,e,c) \
-    (PVOID)InterlockedCompareExchange((LPLONG)(d),(LONG)(e),(LONG)(c))
-LONG WINAPI InterlockedDecrement(LPLONG);
-LONG WINAPI InterlockedExchange(LPLONG,LONG);
-/* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */
-#define InterlockedExchangePointer(t,v) \
-    (PVOID)InterlockedExchange((LPLONG)(t),(LONG)(v))
-LONG WINAPI InterlockedExchangeAdd(LPLONG,LONG);
-#if (_WIN32_WINNT >= 0x0501)
-PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER);
-#endif
-LONG WINAPI InterlockedIncrement(LPLONG);
-#if (_WIN32_WINNT >= 0x0501)
-PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER);
-PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY);
-#endif
-#endif /* __INTERLOCKED_DECLARED */
-BOOL WINAPI IsBadCodePtr(FARPROC);
-BOOL WINAPI IsBadHugeReadPtr(PCVOID,UINT);
-BOOL WINAPI IsBadHugeWritePtr(PVOID,UINT);
-BOOL WINAPI IsBadReadPtr(PCVOID,UINT);
-BOOL WINAPI IsBadStringPtrA(LPCSTR,UINT);
-BOOL WINAPI IsBadStringPtrW(LPCWSTR,UINT);
-BOOL WINAPI IsBadWritePtr(PVOID,UINT);
-BOOL WINAPI IsDebuggerPresent(void);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL IsProcessInJob(HANDLE,HANDLE,PBOOL);
-#endif
-BOOL WINAPI IsProcessorFeaturePresent(DWORD);
-BOOL WINAPI IsSystemResumeAutomatic(void);
-BOOL WINAPI IsTextUnicode(PCVOID,int,LPINT);
-BOOL WINAPI IsValidAcl(PACL);
-BOOL WINAPI IsValidSecurityDescriptor(PSECURITY_DESCRIPTOR);
-BOOL WINAPI IsValidSid(PSID);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL IsWow64Process(HANDLE,PBOOL);
-#endif
-void WINAPI LeaveCriticalSection(LPCRITICAL_SECTION);
-#define LimitEmsPages(n)
-HINSTANCE WINAPI LoadLibraryA(LPCSTR);
-HINSTANCE WINAPI LoadLibraryExA(LPCSTR,HANDLE,DWORD);
-HINSTANCE WINAPI LoadLibraryExW(LPCWSTR,HANDLE,DWORD);
-HINSTANCE WINAPI LoadLibraryW(LPCWSTR);
-DWORD WINAPI LoadModule(LPCSTR,PVOID);
-HGLOBAL WINAPI LoadResource(HINSTANCE,HRSRC);
-HLOCAL WINAPI LocalAlloc(UINT,SIZE_T);
-SIZE_T WINAPI LocalCompact(UINT); /* Obsolete: Has no effect. */
-HLOCAL LocalDiscard(HLOCAL);
-BOOL WINAPI LocalFileTimeToFileTime(CONST FILETIME *,LPFILETIME);
-UINT WINAPI LocalFlags(HLOCAL); /* Obsolete: Has no effect. */
-HLOCAL WINAPI LocalFree(HLOCAL);
-HLOCAL WINAPI LocalHandle(LPCVOID);
-PVOID WINAPI LocalLock(HLOCAL);
-HLOCAL WINAPI LocalReAlloc(HLOCAL,SIZE_T,UINT);
-SIZE_T WINAPI LocalShrink(HLOCAL,UINT);  /* Obsolete: Has no effect. */
-UINT WINAPI LocalSize(HLOCAL);
-BOOL WINAPI LocalUnlock(HLOCAL);
-BOOL WINAPI LockFile(HANDLE,DWORD,DWORD,DWORD,DWORD);
-BOOL WINAPI LockFileEx(HANDLE,DWORD,DWORD,DWORD,DWORD,LPOVERLAPPED);
-PVOID WINAPI LockResource(HGLOBAL);
-#define LockSegment(w) GlobalFix((HANDLE)(w)) /* Obsolete: Has no effect. */
-BOOL WINAPI LogonUserA(LPSTR,LPSTR,LPSTR,DWORD,DWORD,PHANDLE);
-BOOL WINAPI LogonUserW(LPWSTR,LPWSTR,LPWSTR,DWORD,DWORD,PHANDLE);
-BOOL WINAPI LookupAccountNameA(LPCSTR,LPCSTR,PSID,PDWORD,LPSTR,PDWORD,PSID_NAME_USE);
-BOOL WINAPI LookupAccountNameW(LPCWSTR,LPCWSTR,PSID,PDWORD,LPWSTR,PDWORD,PSID_NAME_USE);
-BOOL WINAPI LookupAccountSidA(LPCSTR,PSID,LPSTR,PDWORD,LPSTR,PDWORD,PSID_NAME_USE);
-BOOL WINAPI LookupAccountSidW(LPCWSTR,PSID,LPWSTR,PDWORD,LPWSTR,PDWORD,PSID_NAME_USE);
-BOOL WINAPI LookupPrivilegeDisplayNameA(LPCSTR,LPCSTR,LPSTR,PDWORD,PDWORD);
-BOOL WINAPI LookupPrivilegeDisplayNameW(LPCWSTR,LPCWSTR,LPWSTR,PDWORD,PDWORD);
-BOOL WINAPI LookupPrivilegeNameA(LPCSTR,PLUID,LPSTR,PDWORD);
-BOOL WINAPI LookupPrivilegeNameW(LPCWSTR,PLUID,LPWSTR,PDWORD);
-BOOL WINAPI LookupPrivilegeValueA(LPCSTR,LPCSTR,PLUID);
-BOOL WINAPI LookupPrivilegeValueW(LPCWSTR,LPCWSTR,PLUID);
-LPSTR WINAPI lstrcatA(LPSTR,LPCSTR);
-LPWSTR WINAPI lstrcatW(LPWSTR,LPCWSTR);
-int WINAPI lstrcmpA(LPCSTR,LPCSTR);
-int WINAPI lstrcmpiA(LPCSTR,LPCSTR);
-int WINAPI lstrcmpiW( LPCWSTR,LPCWSTR);
-int WINAPI lstrcmpW(LPCWSTR,LPCWSTR);
-LPSTR WINAPI lstrcpyA(LPSTR,LPCSTR);
-LPSTR WINAPI lstrcpynA(LPSTR,LPCSTR,int);
-LPWSTR WINAPI lstrcpynW(LPWSTR,LPCWSTR,int);
-LPWSTR WINAPI lstrcpyW(LPWSTR,LPCWSTR);
-int WINAPI lstrlenA(LPCSTR);
-int WINAPI lstrlenW(LPCWSTR);
-BOOL WINAPI MakeAbsoluteSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PDWORD,PACL,PDWORD,PACL,PDWORD,PSID,PDWORD,PSID,PDWORD);
-#define MakeProcInstance(p,i) (p)
-BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PDWORD);
-VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING);
-PVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,DWORD);
-PVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,DWORD,PVOID);
-BOOL WINAPI MoveFileA(LPCSTR,LPCSTR);
-BOOL WINAPI MoveFileExA(LPCSTR,LPCSTR,DWORD);
-BOOL WINAPI MoveFileExW(LPCWSTR,LPCWSTR,DWORD);
-BOOL WINAPI MoveFileW(LPCWSTR,LPCWSTR);
-int WINAPI MulDiv(int,int,int);
-BOOL WINAPI NotifyChangeEventLog(HANDLE,HANDLE);
-BOOL WINAPI ObjectCloseAuditAlarmA(LPCSTR,PVOID,BOOL);
-BOOL WINAPI ObjectCloseAuditAlarmW(LPCWSTR,PVOID,BOOL);
-BOOL WINAPI ObjectDeleteAuditAlarmA(LPCSTR,PVOID,BOOL);
-BOOL WINAPI ObjectDeleteAuditAlarmW(LPCWSTR,PVOID,BOOL);
-BOOL WINAPI ObjectOpenAuditAlarmA(LPCSTR,PVOID,LPSTR,LPSTR,PSECURITY_DESCRIPTOR,HANDLE,DWORD,DWORD,PPRIVILEGE_SET,BOOL,BOOL,PBOOL);
-BOOL WINAPI ObjectOpenAuditAlarmW(LPCWSTR,PVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,HANDLE,DWORD,DWORD,PPRIVILEGE_SET,BOOL,BOOL,PBOOL);
-BOOL WINAPI ObjectPrivilegeAuditAlarmA(LPCSTR,PVOID,HANDLE,DWORD,PPRIVILEGE_SET,BOOL);
-BOOL WINAPI ObjectPrivilegeAuditAlarmW(LPCWSTR,PVOID,HANDLE,DWORD,PPRIVILEGE_SET,BOOL);
-HANDLE WINAPI OpenBackupEventLogA(LPCSTR,LPCSTR);
-HANDLE WINAPI OpenBackupEventLogW(LPCWSTR,LPCWSTR);
-HANDLE WINAPI OpenEventA(DWORD,BOOL,LPCSTR);
-HANDLE WINAPI OpenEventLogA (LPCSTR,LPCSTR);
-HANDLE WINAPI OpenEventLogW(LPCWSTR,LPCWSTR);
-HANDLE WINAPI OpenEventW(DWORD,BOOL,LPCWSTR);
-HFILE WINAPI OpenFile(LPCSTR,LPOFSTRUCT,UINT);
-HANDLE WINAPI OpenFileMappingA(DWORD,BOOL,LPCSTR);
-HANDLE WINAPI OpenFileMappingW(DWORD,BOOL,LPCWSTR);
-HANDLE WINAPI OpenMutexA(DWORD,BOOL,LPCSTR);
-HANDLE WINAPI OpenMutexW(DWORD,BOOL,LPCWSTR);
-HANDLE WINAPI OpenProcess(DWORD,BOOL,DWORD);
-BOOL WINAPI OpenProcessToken(HANDLE,DWORD,PHANDLE);
-HANDLE WINAPI OpenSemaphoreA(DWORD,BOOL,LPCSTR);
-HANDLE WINAPI OpenSemaphoreW(DWORD,BOOL,LPCWSTR);
-#if (_WIN32_WINNT >= 0x0500) || (_WIN32_WINDOWS >= 0x0490)
-HANDLE WINAPI OpenThread(DWORD,BOOL,DWORD);
-#endif
-BOOL WINAPI OpenThreadToken(HANDLE,DWORD,BOOL,PHANDLE);
-HANDLE WINAPI OpenWaitableTimerA(DWORD,BOOL,LPCSTR);
-HANDLE WINAPI OpenWaitableTimerW(DWORD,BOOL,LPCWSTR);
-void WINAPI OutputDebugStringA(LPCSTR);
-void WINAPI OutputDebugStringW(LPCWSTR);
-BOOL WINAPI PeekNamedPipe(HANDLE,PVOID,DWORD,PDWORD,PDWORD,PDWORD);
-BOOL WINAPI PostQueuedCompletionStatus(HANDLE,DWORD,DWORD,LPOVERLAPPED);
-DWORD WINAPI PrepareTape(HANDLE,DWORD,BOOL);
-BOOL WINAPI PrivilegeCheck (HANDLE,PPRIVILEGE_SET,PBOOL);
-BOOL WINAPI PrivilegedServiceAuditAlarmA(LPCSTR,LPCSTR,HANDLE,PPRIVILEGE_SET,BOOL);
-BOOL WINAPI PrivilegedServiceAuditAlarmW(LPCWSTR,LPCWSTR,HANDLE,PPRIVILEGE_SET,BOOL);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI ProcessIdToSessionId(DWORD,DWORD*);
-#endif
-BOOL WINAPI PulseEvent(HANDLE);
-BOOL WINAPI PurgeComm(HANDLE,DWORD);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI QueryActCtxW(DWORD,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*);
-#endif
-DWORD WINAPI QueryDosDeviceA(LPCSTR,LPSTR,DWORD);
-DWORD WINAPI QueryDosDeviceW(LPCWSTR,LPWSTR,DWORD);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI QueryMemoryResourceNotification(HANDLE,PBOOL);
-#endif
-BOOL WINAPI QueryPerformanceCounter(PLARGE_INTEGER);
-BOOL WINAPI QueryPerformanceFrequency(PLARGE_INTEGER);
-DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,DWORD);
-void WINAPI RaiseException(DWORD,DWORD,DWORD,const DWORD*);
-BOOL WINAPI ReadDirectoryChangesW(HANDLE,PVOID,DWORD,BOOL,DWORD,PDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
-BOOL WINAPI ReadEventLogA(HANDLE,DWORD,DWORD,PVOID,DWORD,DWORD *,DWORD *);
-BOOL WINAPI ReadEventLogW(HANDLE,DWORD,DWORD,PVOID,DWORD,DWORD *,DWORD *);
-BOOL WINAPI ReadFile(HANDLE,PVOID,DWORD,PDWORD,LPOVERLAPPED);
-BOOL WINAPI ReadFileEx(HANDLE,PVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
-BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED);
-BOOL WINAPI ReadProcessMemory(HANDLE,PCVOID,PVOID,DWORD,PDWORD);
-HANDLE WINAPI RegisterEventSourceA (LPCSTR,LPCSTR);
-HANDLE WINAPI RegisterEventSourceW(LPCWSTR,LPCWSTR);
-#if (_WIN32_WINNT >= 0x0501)
-void WINAPI ReleaseActCtx(HANDLE);
-#endif
-BOOL WINAPI ReleaseMutex(HANDLE);
-BOOL WINAPI ReleaseSemaphore(HANDLE,LONG,LPLONG);
-BOOL WINAPI RemoveDirectoryA(LPCSTR);
-BOOL WINAPI RemoveDirectoryW(LPCWSTR);
-#if (_WIN32_WINNT >= 0x0500)
-ULONG WINAPI RemoveVectoredExceptionHandler(PVOID);
-#endif
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI ReplaceFileA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPVOID,LPVOID);
-BOOL WINAPI ReplaceFileW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPVOID,LPVOID);
-#endif
-BOOL WINAPI ReportEventA(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWORD,LPCSTR*,PVOID);
-BOOL WINAPI ReportEventW(HANDLE,WORD,WORD,DWORD,PSID,WORD,DWORD,LPCWSTR*,PVOID);
-BOOL WINAPI ResetEvent(HANDLE);
-UINT WINAPI ResetWriteWatch(LPVOID,SIZE_T);
-#if (_WIN32_WINNT >= 0x0510)
-VOID WINAPI RestoreLastError(DWORD);
-#endif
-DWORD WINAPI ResumeThread(HANDLE);
-BOOL WINAPI RevertToSelf(void);
-DWORD WINAPI SearchPathA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*);
-DWORD WINAPI SearchPathW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*);
-BOOL WINAPI SetAclInformation(PACL,PVOID,DWORD,ACL_INFORMATION_CLASS);
-BOOL WINAPI SetCommBreak(HANDLE);
-BOOL WINAPI SetCommConfig(HANDLE,LPCOMMCONFIG,DWORD);
-BOOL WINAPI SetCommMask(HANDLE,DWORD);
-BOOL WINAPI SetCommState(HANDLE,LPDCB);
-BOOL WINAPI SetCommTimeouts(HANDLE,LPCOMMTIMEOUTS);
-BOOL WINAPI SetComputerNameA(LPCSTR);
-BOOL WINAPI SetComputerNameW(LPCWSTR);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI SetComputerNameExA(COMPUTER_NAME_FORMAT,LPCSTR);
-BOOL WINAPI SetComputerNameExW(COMPUTER_NAME_FORMAT,LPCWSTR);
-#endif
-BOOL WINAPI SetCurrentDirectoryA(LPCSTR);
-BOOL WINAPI SetCurrentDirectoryW(LPCWSTR);
-BOOL WINAPI SetDefaultCommConfigA(LPCSTR,LPCOMMCONFIG,DWORD);
-BOOL WINAPI SetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,DWORD);
-#if (_WIN32_WINNT >= 0x0502)
-BOOL WINAPI SetDllDirectoryA(LPCSTR);
-BOOL WINAPI SetDllDirectoryW(LPCWSTR);
-#endif
-BOOL WINAPI SetEndOfFile(HANDLE);
-BOOL WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR);
-BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR);
-UINT WINAPI SetErrorMode(UINT);
-BOOL WINAPI SetEvent(HANDLE);
-VOID WINAPI SetFileApisToANSI(void);
-VOID WINAPI SetFileApisToOEM(void);
-BOOL WINAPI SetFileAttributesA(LPCSTR,DWORD);
-BOOL WINAPI SetFileAttributesW(LPCWSTR,DWORD);
-DWORD WINAPI SetFilePointer(HANDLE,LONG,PLONG,DWORD);
-BOOL WINAPI SetFilePointerEx(HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD);
-BOOL WINAPI SetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-BOOL WINAPI SetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI SetFileShortNameA(HANDLE,LPCSTR);
-BOOL WINAPI SetFileShortNameW(HANDLE,LPCWSTR);
-#endif
-BOOL WINAPI SetFileTime(HANDLE,const FILETIME*,const FILETIME*,const FILETIME*);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI SetFileValidData(HANDLE,LONGLONG);
-#endif
-#if (_WIN32_WINNT >= 0x0502)
-BOOL WINAPI SetFirmwareEnvironmentVariableA(LPCSTR,LPCSTR,PVOID,DWORD);
-BOOL WINAPI SetFirmwareEnvironmentVariableW(LPCWSTR,LPCWSTR,PVOID,DWORD);
-#endif
-UINT WINAPI SetHandleCount(UINT);
-BOOL WINAPI SetHandleInformation(HANDLE,DWORD,DWORD);
-BOOL WINAPI SetKernelObjectSecurity(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-void WINAPI SetLastError(DWORD);
-void WINAPI SetLastErrorEx(DWORD,DWORD);
-BOOL WINAPI SetLocalTime(const SYSTEMTIME*);
-BOOL WINAPI SetMailslotInfo(HANDLE,DWORD);
-BOOL WINAPI SetNamedPipeHandleState(HANDLE,PDWORD,PDWORD,PDWORD);
-BOOL WINAPI SetPriorityClass(HANDLE,DWORD);
-BOOL WINAPI SetPrivateObjectSecurity(SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR *,PGENERIC_MAPPING,HANDLE);
-BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD);
-BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL);
-BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD);
-BOOL WINAPI SetProcessWorkingSetSize(HANDLE,DWORD,DWORD);
-BOOL WINAPI SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR,SECURITY_DESCRIPTOR_CONTROL,SECURITY_DESCRIPTOR_CONTROL);
-BOOL WINAPI SetSecurityDescriptorDacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL);
-BOOL WINAPI SetSecurityDescriptorGroup(PSECURITY_DESCRIPTOR,PSID,BOOL);
-BOOL WINAPI SetSecurityDescriptorOwner(PSECURITY_DESCRIPTOR,PSID,BOOL);
-BOOL WINAPI SetSecurityDescriptorSacl(PSECURITY_DESCRIPTOR,BOOL,PACL,BOOL);
-BOOL WINAPI SetStdHandle(DWORD,HANDLE);
-#define SetSwapAreaSize(w) (w)
-BOOL WINAPI SetSystemPowerState(BOOL,BOOL);
-BOOL WINAPI SetSystemTime(const SYSTEMTIME*);
-BOOL WINAPI SetSystemTimeAdjustment(DWORD,BOOL);
-DWORD WINAPI SetTapeParameters(HANDLE,DWORD,PVOID);
-DWORD WINAPI SetTapePosition(HANDLE,DWORD,DWORD,DWORD,DWORD,BOOL);
-DWORD WINAPI SetThreadAffinityMask(HANDLE,DWORD);
-BOOL WINAPI SetThreadContext(HANDLE,const CONTEXT*);
-DWORD WINAPI SetThreadIdealProcessor(HANDLE,DWORD);
-BOOL WINAPI SetThreadPriority(HANDLE,int);
-BOOL WINAPI SetThreadPriorityBoost(HANDLE,BOOL);
-BOOL WINAPI SetThreadToken (PHANDLE,HANDLE);
-BOOL WINAPI SetTimeZoneInformation(const TIME_ZONE_INFORMATION *);
-BOOL WINAPI SetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,DWORD);
-LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER);
-BOOL WINAPI SetupComm(HANDLE,DWORD,DWORD);
-BOOL WINAPI SetVolumeLabelA(LPCSTR,LPCSTR);
-BOOL WINAPI SetVolumeLabelW(LPCWSTR,LPCWSTR);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI SetVolumeMountPointA(LPCSTR,LPCSTR);
-BOOL WINAPI SetVolumeMountPointW(LPCWSTR,LPCWSTR);
-#endif
-BOOL WINAPI SetWaitableTimer(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,PVOID,BOOL);
-DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL);
-DWORD WINAPI SizeofResource(HINSTANCE,HRSRC);
-void WINAPI Sleep(DWORD);
-DWORD WINAPI SleepEx(DWORD,BOOL);
-DWORD WINAPI SuspendThread(HANDLE);
-void WINAPI SwitchToFiber(PVOID);
-BOOL WINAPI SwitchToThread(void);
-BOOL WINAPI SystemTimeToFileTime(const SYSTEMTIME*,LPFILETIME);
-BOOL WINAPI SystemTimeToTzSpecificLocalTime(LPTIME_ZONE_INFORMATION,LPSYSTEMTIME,LPSYSTEMTIME);
-BOOL WINAPI TerminateProcess(HANDLE,UINT);
-BOOL WINAPI TerminateThread(HANDLE,DWORD);
-DWORD WINAPI TlsAlloc(VOID);
-BOOL WINAPI TlsFree(DWORD);
-PVOID WINAPI TlsGetValue(DWORD);
-BOOL WINAPI TlsSetValue(DWORD,PVOID);
-BOOL WINAPI TransactNamedPipe(HANDLE,PVOID,DWORD,PVOID,DWORD,PDWORD,LPOVERLAPPED);
-BOOL WINAPI TransmitCommChar(HANDLE,char);
-BOOL WINAPI TryEnterCriticalSection(LPCRITICAL_SECTION);
-LONG WINAPI UnhandledExceptionFilter(LPEXCEPTION_POINTERS);
-BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD);
-BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED);
-#define UnlockResource(h) (h)
-#define UnlockSegment(w) GlobalUnfix((HANDLE)(w)) /* Obsolete: Has no effect. */
-BOOL WINAPI UnmapViewOfFile(PVOID);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE);
-#endif
-BOOL WINAPI UpdateResourceA(HANDLE,LPCSTR,LPCSTR,WORD,PVOID,DWORD);
-BOOL WINAPI UpdateResourceW(HANDLE,LPCWSTR,LPCWSTR,WORD,PVOID,DWORD);
-BOOL WINAPI VerifyVersionInfoA(LPOSVERSIONINFOEXA,DWORD,DWORDLONG);
-BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDLONG);
-PVOID WINAPI VirtualAlloc(PVOID,DWORD,DWORD,DWORD);
-PVOID WINAPI VirtualAllocEx(HANDLE,PVOID,DWORD,DWORD,DWORD);
-BOOL WINAPI VirtualFree(PVOID,DWORD,DWORD);
-BOOL WINAPI VirtualFreeEx(HANDLE,PVOID,DWORD,DWORD);
-BOOL WINAPI VirtualLock(PVOID,DWORD);
-BOOL WINAPI VirtualProtect(PVOID,DWORD,DWORD,PDWORD);
-BOOL WINAPI VirtualProtectEx(HANDLE,PVOID,DWORD,DWORD,PDWORD);
-DWORD WINAPI VirtualQuery(LPCVOID,PMEMORY_BASIC_INFORMATION,DWORD);
-DWORD WINAPI VirtualQueryEx(HANDLE,LPCVOID,PMEMORY_BASIC_INFORMATION,DWORD);
-BOOL WINAPI VirtualUnlock(PVOID,DWORD);
-BOOL WINAPI WaitCommEvent(HANDLE,PDWORD,LPOVERLAPPED);
-BOOL WINAPI WaitForDebugEvent(LPDEBUG_EVENT,DWORD);
-DWORD WINAPI WaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DWORD);
-DWORD WINAPI WaitForMultipleObjectsEx(DWORD,const HANDLE*,BOOL,DWORD,BOOL);
-DWORD WINAPI WaitForSingleObject(HANDLE,DWORD);
-DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL);
-BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD);
-BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD);
-BOOL WINAPI WinLoadTrustProvider(GUID*);
-BOOL WINAPI WriteFile(HANDLE,PCVOID,DWORD,PDWORD,LPOVERLAPPED);
-BOOL WINAPI WriteFileEx(HANDLE,PCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
-BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED);
-BOOL WINAPI WritePrivateProfileSectionA(LPCSTR,LPCSTR,LPCSTR);
-BOOL WINAPI WritePrivateProfileSectionW(LPCWSTR,LPCWSTR,LPCWSTR);
-BOOL WINAPI WritePrivateProfileStringA(LPCSTR,LPCSTR,LPCSTR,LPCSTR);
-BOOL WINAPI WritePrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
-BOOL WINAPI WritePrivateProfileStructA(LPCSTR,LPCSTR,LPVOID,UINT,LPCSTR);
-BOOL WINAPI WritePrivateProfileStructW(LPCWSTR,LPCWSTR,LPVOID,UINT,LPCWSTR);
-BOOL WINAPI WriteProcessMemory(HANDLE,LPVOID,LPCVOID,SIZE_T,SIZE_T*);
-BOOL WINAPI WriteProfileSectionA(LPCSTR,LPCSTR);
-BOOL WINAPI WriteProfileSectionW(LPCWSTR,LPCWSTR);
-BOOL WINAPI WriteProfileStringA(LPCSTR,LPCSTR,LPCSTR);
-BOOL WINAPI WriteProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR);
-DWORD WINAPI WriteTapemark(HANDLE,DWORD,DWORD,BOOL);
-#define Yield()
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI ZombifyActCtx(HANDLE);
-#endif
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI AllocateUserPhysicalPages(HANDLE,PULONG_PTR,PULONG_PTR);
-BOOL WINAPI FreeUserPhysicalPages(HANDLE,PULONG_PTR,PULONG_PTR);
-BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR);
-BOOL WINAPI MapUserPhysicalPagesScatter(PVOID*,ULONG_PTR,PULONG_PTR);
-#endif
-
-#ifdef UNICODE
-typedef STARTUPINFOW STARTUPINFO,*LPSTARTUPINFO;
-typedef WIN32_FIND_DATAW WIN32_FIND_DATA,*LPWIN32_FIND_DATA;
-typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
-#if (_WIN32_WINNT >= 0x0501)
-typedef ACTCTXW ACTCTX,*PACTCTX;
-typedef PCACTCTXW PCACTCTX;
-#endif
-#define AccessCheckAndAuditAlarm AccessCheckAndAuditAlarmW
-#define AddAtom AddAtomW
-#define BackupEventLog BackupEventLogW
-#define BeginUpdateResource BeginUpdateResourceW
-#define BuildCommDCB BuildCommDCBW
-#define BuildCommDCBAndTimeouts BuildCommDCBAndTimeoutsW
-#define CallNamedPipe CallNamedPipeW
-#if (_WIN32_WINNT >= 0x0501)
-#define CheckNameLegalDOS8Dot3 CheckNameLegalDOS8Dot3W
-#endif
-#define ClearEventLog ClearEventLogW
-#define CommConfigDialog CommConfigDialogW
-#define CopyFile CopyFileW
-#define CopyFileEx CopyFileExW
-#if (_WIN32_WINNT >= 0x0501)
-#define CreateActCtx CreateActCtxW
-#endif
-#define CreateDirectory CreateDirectoryW
-#define CreateDirectoryEx CreateDirectoryExW
-#define CreateEvent CreateEventW
-#define CreateFile CreateFileW
-#define CreateFileMapping CreateFileMappingW
-#if (_WIN32_WINNT >= 0x0500)
-#define CreateHardLink CreateHardLinkW
-#define CreateJobObject CreateJobObjectW
-#endif
-#define CreateMailslot CreateMailslotW
-#define CreateMutex CreateMutexW
-#define CreateNamedPipe CreateNamedPipeW
-#define CreateProcess CreateProcessW
-#define CreateProcessAsUser CreateProcessAsUserW
-#define CreateSemaphore CreateSemaphoreW
-#define CreateWaitableTimer CreateWaitableTimerW
-#define DefineDosDevice DefineDosDeviceW
-#define DeleteFile DeleteFileW
-#if (_WIN32_WINNT >= 0x0500)
-#define DeleteVolumeMountPoint DeleteVolumeMountPointW
-#define DnsHostnameToComputerName DnsHostnameToComputerNameW
-#endif
-#define EncryptFile EncryptFileW
-#define EndUpdateResource EndUpdateResourceW
-#define EnumResourceLanguages EnumResourceLanguagesW
-#define EnumResourceNames EnumResourceNamesW
-#define EnumResourceTypes EnumResourceTypesW
-#define ExpandEnvironmentStrings ExpandEnvironmentStringsW
-#define FatalAppExit FatalAppExitW
-#define FileEncryptionStatus FileEncryptionStatusW
-#if (_WIN32_WINNT >= 0x0501)
-#define FindActCtxSectionString FindActCtxSectionStringW
-#endif
-#define FindAtom FindAtomW
-#define FindFirstChangeNotification FindFirstChangeNotificationW
-#define FindFirstFile FindFirstFileW
-#define FindFirstFileEx FindFirstFileExW
-#if (_WIN32_WINNT >= 0x0500)
-#define FindFirstVolume FindFirstVolumeW
-#define FindFirstVolumeMountPoint FindFirstVolumeMountPointW
-#endif
-#define FindNextFile FindNextFileW
-#if (_WIN32_WINNT >= 0x0500)
-#define FindNextVolume FindNextVolumeW
-#define FindNextVolumeMountPoint  FindNextVolumeMountPointW
-#endif
-#define FindResource FindResourceW
-#define FindResourceEx FindResourceExW
-#define FormatMessage FormatMessageW
-#define FreeEnvironmentStrings FreeEnvironmentStringsW
-#define GetAtomName GetAtomNameW
-#define GetBinaryType GetBinaryTypeW
-#define GetCommandLine GetCommandLineW
-#define GetCompressedFileSize GetCompressedFileSizeW
-#define GetComputerName GetComputerNameW
-#define GetCurrentDirectory GetCurrentDirectoryW
-#define GetDefaultCommConfig GetDefaultCommConfigW
-#define GetDiskFreeSpace GetDiskFreeSpaceW
-#define GetDiskFreeSpaceEx GetDiskFreeSpaceExW
-#if (_WIN32_WINNT >= 0x0502)
-#define GetDllDirectory GetDllDirectoryW
-#endif
-#define GetDriveType GetDriveTypeW
-#define GetEnvironmentStrings GetEnvironmentStringsW
-#define GetEnvironmentVariable GetEnvironmentVariableW
-#define GetFileAttributes GetFileAttributesW
-#define GetFileSecurity GetFileSecurityW
-#define GetFileAttributesEx GetFileAttributesExW
-#define GetFullPathName GetFullPathNameW
-#define GetLogicalDriveStrings GetLogicalDriveStringsW
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-#define GetLongPathName GetLongPathNameW
-#endif
-#define GetModuleFileName GetModuleFileNameW
-#define GetModuleHandle GetModuleHandleW
-#if (_WIN32_WINNT >= 0x0500)
-#define GetModuleHandleEx GetModuleHandleExW
-#endif
-#define GetNamedPipeHandleState GetNamedPipeHandleStateW
-#define GetPrivateProfileInt GetPrivateProfileIntW
-#define GetPrivateProfileSection GetPrivateProfileSectionW
-#define GetPrivateProfileSectionNames GetPrivateProfileSectionNamesW
-#define GetPrivateProfileString GetPrivateProfileStringW
-#define GetPrivateProfileStruct GetPrivateProfileStructW
-#define GetProfileInt GetProfileIntW
-#define GetProfileSection GetProfileSectionW
-#define GetProfileString GetProfileStringW
-#define GetShortPathName GetShortPathNameW
-#define GetStartupInfo GetStartupInfoW
-#define GetSystemDirectory GetSystemDirectoryW
-#if (_WIN32_WINNT >= 0x0500)
-#define GetSystemWindowsDirectory GetSystemWindowsDirectoryW
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-#define GetSystemWow64Directory GetSystemWow64DirectoryW
-#endif
-#define GetTempFileName GetTempFileNameW
-#define GetTempPath GetTempPathW
-#define GetUserName GetUserNameW
-#define GetVersionEx GetVersionExW
-#define GetVolumeInformation GetVolumeInformationW
-#define GetVolumeNameForVolumeMountPoint GetVolumeNameForVolumeMountPointW
-#define GetVolumePathName GetVolumePathNameW
-#define GetVolumePathNamesForVolumeName GetVolumePathNamesForVolumeNameW
-#define GetWindowsDirectory GetWindowsDirectoryW
-#define GlobalAddAtom GlobalAddAtomW
-#define GlobalFindAtom GlobalFindAtomW
-#define GlobalGetAtomName GlobalGetAtomNameW
-#define IsBadStringPtr IsBadStringPtrW
-#define LoadLibrary LoadLibraryW
-#define LoadLibraryEx LoadLibraryExW
-#define LogonUser LogonUserW
-#define LookupAccountName LookupAccountNameW
-#define LookupAccountSid LookupAccountSidW
-#define LookupPrivilegeDisplayName LookupPrivilegeDisplayNameW
-#define LookupPrivilegeName LookupPrivilegeNameW
-#define LookupPrivilegeValue LookupPrivilegeValueW
-#define lstrcat lstrcatW
-#define lstrcmp lstrcmpW
-#define lstrcmpi lstrcmpiW
-#define lstrcpy lstrcpyW
-#define lstrcpyn lstrcpynW
-#define lstrlen lstrlenW
-#define MoveFile MoveFileW
-#define MoveFileEx MoveFileExW
-#define ObjectCloseAuditAlarm ObjectCloseAuditAlarmW
-#define ObjectDeleteAuditAlarm ObjectDeleteAuditAlarmW
-#define ObjectOpenAuditAlarm ObjectOpenAuditAlarmW
-#define ObjectPrivilegeAuditAlarm ObjectPrivilegeAuditAlarmW
-#define OpenBackupEventLog OpenBackupEventLogW
-#define OpenEvent OpenEventW
-#define OpenEventLog OpenEventLogW
-#define OpenFileMapping OpenFileMappingW
-#define OpenMutex OpenMutexW
-#define OpenSemaphore OpenSemaphoreW
-#define OutputDebugString OutputDebugStringW
-#define PrivilegedServiceAuditAlarm PrivilegedServiceAuditAlarmW
-#define QueryDosDevice QueryDosDeviceW
-#define ReadEventLog ReadEventLogW
-#define RegisterEventSource RegisterEventSourceW
-#define RemoveDirectory RemoveDirectoryW
-#if (_WIN32_WINNT >= 0x0500)
-#define ReplaceFile ReplaceFileW
-#endif
-#define ReportEvent ReportEventW
-#define SearchPath SearchPathW
-#define SetComputerName SetComputerNameW
-#define SetCurrentDirectory SetCurrentDirectoryW
-#define SetDefaultCommConfig SetDefaultCommConfigW
-#if (_WIN32_WINNT >= 0x0502)
-#define SetDllDirectory SetDllDirectoryW
-#endif
-#define SetEnvironmentVariable SetEnvironmentVariableW
-#define SetFileAttributes SetFileAttributesW
-#define SetFileSecurity SetFileSecurityW
-#if (_WIN32_WINNT >= 0x0501)
-#define SetFileShortName SetFileShortNameW
-#endif
-#if (_WIN32_WINNT >= 0x0502)
-#define SetFirmwareEnvironmentVariable SetFirmwareEnvironmentVariableW
-#endif
-#define SetVolumeLabel SetVolumeLabelW
-#define SetVolumeMountPoint SetVolumeMountPointW
-#define UpdateResource UpdateResourceW
-#define VerifyVersionInfo VerifyVersionInfoW
-#define WaitNamedPipe WaitNamedPipeW
-#define WritePrivateProfileSection WritePrivateProfileSectionW
-#define WritePrivateProfileString WritePrivateProfileStringW
-#define WritePrivateProfileStruct WritePrivateProfileStructW
-#define WriteProfileSection WriteProfileSectionW
-#define WriteProfileString WriteProfileStringW
-#else
-typedef STARTUPINFOA STARTUPINFO,*LPSTARTUPINFO;
-typedef WIN32_FIND_DATAA WIN32_FIND_DATA,*LPWIN32_FIND_DATA;
-typedef HW_PROFILE_INFOA HW_PROFILE_INFO,*LPHW_PROFILE_INFO;
-#if (_WIN32_WINNT >= 0x0501)
-typedef ACTCTXA ACTCTX,*PACTCTX;
-typedef PCACTCTXA PCACTCTX;
-#endif
-#define AccessCheckAndAuditAlarm AccessCheckAndAuditAlarmA
-#define AddAtom AddAtomA
-#define BackupEventLog BackupEventLogA
-#define BeginUpdateResource BeginUpdateResourceA
-#define BuildCommDCB BuildCommDCBA
-#define BuildCommDCBAndTimeouts BuildCommDCBAndTimeoutsA
-#define CallNamedPipe CallNamedPipeA
-#if (_WIN32_WINNT >= 0x0501)
-#define CheckNameLegalDOS8Dot3 CheckNameLegalDOS8Dot3A
-#endif
-#define ClearEventLog ClearEventLogA
-#define CommConfigDialog CommConfigDialogA
-#define CopyFile CopyFileA
-#define CopyFileEx CopyFileExA
-#if (_WIN32_WINNT >= 0x0501)
-#define CreateActCtx CreateActCtxA
-#endif
-#define CreateDirectory CreateDirectoryA
-#define CreateDirectoryEx CreateDirectoryExA
-#define CreateEvent CreateEventA
-#define CreateFile CreateFileA
-#define CreateFileMapping CreateFileMappingA
-#if (_WIN32_WINNT >= 0x0500)
-#define CreateHardLink CreateHardLinkA
-#define CreateJobObject CreateJobObjectA
-#endif
-#define CreateMailslot CreateMailslotA
-#define CreateMutex CreateMutexA
-#define CreateNamedPipe CreateNamedPipeA
-#define CreateProcess CreateProcessA
-#define CreateProcessAsUser CreateProcessAsUserA
-#define CreateSemaphore CreateSemaphoreA
-#define CreateWaitableTimer CreateWaitableTimerA
-#define DefineDosDevice DefineDosDeviceA
-#define DeleteFile DeleteFileA
-#if (_WIN32_WINNT >= 0x0500)
-#define DeleteVolumeMountPoint DeleteVolumeMountPointA
-#define DnsHostnameToComputerName DnsHostnameToComputerNameA
-#endif
-#define EncryptFile EncryptFileA
-#define EndUpdateResource EndUpdateResourceA
-#define EnumResourceLanguages EnumResourceLanguagesA
-#define EnumResourceNames EnumResourceNamesA
-#define EnumResourceTypes EnumResourceTypesA
-#define ExpandEnvironmentStrings ExpandEnvironmentStringsA
-#define FatalAppExit FatalAppExitA
-#define FileEncryptionStatus FileEncryptionStatusA
-#if (_WIN32_WINNT >= 0x0501)
-#define FindActCtxSectionString FindActCtxSectionStringA
-#endif
-#define FindAtom FindAtomA
-#define FindFirstChangeNotification FindFirstChangeNotificationA
-#define FindFirstFile FindFirstFileA
-#define FindFirstFileEx FindFirstFileExA
-#if (_WIN32_WINNT >= 0x0500)
-#define FindFirstVolume FindFirstVolumeA
-#define FindFirstVolumeMountPoint FindFirstVolumeMountPointA
-#endif
-#define FindNextFile FindNextFileA
-#if (_WIN32_WINNT >= 0x0500)
-#define FindNextVolume FindNextVolumeA
-#define FindNextVolumeMountPoint FindNextVolumeMountPointA
-#endif
-#define FindResource FindResourceA
-#define FindResourceEx FindResourceExA
-#define FormatMessage FormatMessageA
-#define FreeEnvironmentStrings FreeEnvironmentStringsA
-#define GetAtomName GetAtomNameA
-#define GetBinaryType GetBinaryTypeA
-#define GetCommandLine GetCommandLineA
-#define GetComputerName GetComputerNameA
-#define GetCompressedFileSize GetCompressedFileSizeA
-#define GetCurrentDirectory GetCurrentDirectoryA
-#define GetDefaultCommConfig GetDefaultCommConfigA
-#define GetDiskFreeSpace GetDiskFreeSpaceA
-#define GetDiskFreeSpaceEx GetDiskFreeSpaceExA
-#if (_WIN32_WINNT >= 0x0502)
-#define GetDllDirectory GetDllDirectoryA
-#endif
-#define GetDriveType GetDriveTypeA
-#define GetEnvironmentVariable GetEnvironmentVariableA
-#define GetFileAttributes GetFileAttributesA
-#define GetFileSecurity GetFileSecurityA
-#define GetFileAttributesEx GetFileAttributesExA
-#define GetFullPathName GetFullPathNameA
-#define GetLogicalDriveStrings GetLogicalDriveStringsA
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-#define GetLongPathName GetLongPathNameA
-#endif
-#define GetNamedPipeHandleState GetNamedPipeHandleStateA
-#define GetModuleHandle GetModuleHandleA
-#if (_WIN32_WINNT >= 0x0500)
-#define GetModuleHandleEx GetModuleHandleExA
-#endif
-#define GetModuleFileName GetModuleFileNameA
-#define GetPrivateProfileInt GetPrivateProfileIntA
-#define GetPrivateProfileSection GetPrivateProfileSectionA
-#define GetPrivateProfileSectionNames GetPrivateProfileSectionNamesA
-#define GetPrivateProfileString GetPrivateProfileStringA
-#define GetPrivateProfileStruct GetPrivateProfileStructA
-#define GetProfileInt GetProfileIntA
-#define GetProfileSection GetProfileSectionA
-#define GetProfileString GetProfileStringA
-#define GetShortPathName GetShortPathNameA
-#define GetStartupInfo GetStartupInfoA
-#define GetSystemDirectory GetSystemDirectoryA
-#if (_WIN32_WINNT >= 0x0500)
-#define GetSystemWindowsDirectory GetSystemWindowsDirectoryA
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-#define GetSystemWow64Directory GetSystemWow64DirectoryA
-#endif
-#define GetTempFileName GetTempFileNameA
-#define GetTempPath GetTempPathA
-#define GetUserName GetUserNameA
-#define GetVersionEx GetVersionExA
-#define GetVolumeInformation GetVolumeInformationA
-#define GetVolumeNameForVolumeMountPoint GetVolumeNameForVolumeMountPointA
-#define GetVolumePathName GetVolumePathNameA
-#define GetVolumePathNamesForVolumeName GetVolumePathNamesForVolumeNameA
-#define GetWindowsDirectory GetWindowsDirectoryA
-#define GlobalAddAtom GlobalAddAtomA
-#define GlobalFindAtom GlobalFindAtomA
-#define GlobalGetAtomName GlobalGetAtomNameA
-#define IsBadStringPtr IsBadStringPtrA
-#define LoadLibrary LoadLibraryA
-#define LoadLibraryEx LoadLibraryExA
-#define LogonUser LogonUserA
-#define LookupAccountName LookupAccountNameA
-#define LookupAccountSid LookupAccountSidA
-#define LookupPrivilegeDisplayName LookupPrivilegeDisplayNameA
-#define LookupPrivilegeName LookupPrivilegeNameA
-#define LookupPrivilegeValue LookupPrivilegeValueA
-#define lstrcat lstrcatA
-#define lstrcmp lstrcmpA
-#define lstrcmpi lstrcmpiA
-#define lstrcpy lstrcpyA
-#define lstrcpyn lstrcpynA
-#define lstrlen lstrlenA
-#define MoveFile MoveFileA
-#define MoveFileEx MoveFileExA
-#define ObjectCloseAuditAlarm ObjectCloseAuditAlarmA
-#define ObjectDeleteAuditAlarm ObjectDeleteAuditAlarmA
-#define ObjectOpenAuditAlarm ObjectOpenAuditAlarmA
-#define ObjectPrivilegeAuditAlarm ObjectPrivilegeAuditAlarmA
-#define OpenBackupEventLog OpenBackupEventLogA
-#define OpenEvent OpenEventA
-#define OpenEventLog OpenEventLogA
-#define OpenFileMapping OpenFileMappingA
-#define OpenMutex OpenMutexA
-#define OpenSemaphore OpenSemaphoreA
-#define OutputDebugString OutputDebugStringA
-#define PrivilegedServiceAuditAlarm PrivilegedServiceAuditAlarmA
-#define QueryDosDevice QueryDosDeviceA
-#define ReadEventLog ReadEventLogA
-#define RegisterEventSource RegisterEventSourceA
-#define RemoveDirectory RemoveDirectoryA
-#if (_WIN32_WINNT >= 0x0500)
-#define ReplaceFile ReplaceFileA
-#endif
-#define ReportEvent ReportEventA
-#define SearchPath SearchPathA
-#define SetComputerName SetComputerNameA
-#define SetCurrentDirectory SetCurrentDirectoryA
-#define SetDefaultCommConfig SetDefaultCommConfigA
-#if (_WIN32_WINNT >= 0x0502)
-#define SetDllDirectory SetDllDirectoryA
-#endif
-#define SetEnvironmentVariable SetEnvironmentVariableA
-#define SetFileAttributes SetFileAttributesA
-#define SetFileSecurity SetFileSecurityA
-#if (_WIN32_WINNT >= 0x0501)
-#define SetFileShortName SetFileShortNameA
-#endif
-#if (_WIN32_WINNT >= 0x0502)
-#define SetFirmwareEnvironmentVariable SetFirmwareEnvironmentVariableA
-#endif
-#define SetVolumeLabel SetVolumeLabelA
-#define SetVolumeMountPoint SetVolumeMountPointA
-#define UpdateResource UpdateResourceA
-#define VerifyVersionInfo VerifyVersionInfoA
-#define WaitNamedPipe WaitNamedPipeA
-#define WritePrivateProfileSection WritePrivateProfileSectionA
-#define WritePrivateProfileString WritePrivateProfileStringA
-#define WritePrivateProfileStruct WritePrivateProfileStructA
-#define WriteProfileSection WriteProfileSectionA
-#define WriteProfileString WriteProfileStringA
-#endif
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif /* _WINBASE_H */
diff --git a/winsup/w32api/include/winber.h b/winsup/w32api/include/winber.h
deleted file mode 100644
index 462a66d53..000000000
--- a/winsup/w32api/include/winber.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-  winber.h - Header file for the Windows LDAP Basic Encoding Rules API
-
-  Written by Filip Navara <xnavara@volny.cz>
-
-  References:
-    The C LDAP Application Program Interface
-    http://www.watersprings.org/pub/id/draft-ietf-ldapext-ldap-c-api-05.txt
-
-    Lightweight Directory Access Protocol Reference
-    http://msdn.microsoft.com/library/en-us/netdir/ldap/ldap_reference.asp
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#ifndef _WINBER_H
-#define _WINBER_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef WINBERAPI
-#define WINBERAPI DECLSPEC_IMPORT
-#endif
-
-typedef struct berelement BerElement;
-typedef ULONG ber_len_t;
-#include <pshpack4.h>
-typedef struct berval {
-	ber_len_t bv_len;
-	char *bv_val;
-} BerValue, LDAP_BERVAL, *PLDAP_BERVAL, BERVAL, *PBERVAL;
-#include <poppack.h>
-
-typedef ULONG ber_tag_t;
-typedef INT ber_int_t;
-typedef UINT ber_uint_t;
-typedef INT ber_slen_t;
-
-#define LBER_ERROR ((ber_tag_t)-1)
-#define LBER_DEFAULT ((ber_tag_t)-1)
-#define LBER_USE_DER 0x01
-
-WINBERAPI BerElement *ber_init(const BerValue*);
-WINBERAPI int ber_printf(BerElement*,const char*,...);
-WINBERAPI int ber_flatten(BerElement*,BerValue**);
-WINBERAPI ber_tag_t ber_scanf(BerElement*,const char*,...);
-WINBERAPI ber_tag_t ber_peek_tag(BerElement*,ber_len_t*);
-WINBERAPI ber_tag_t ber_skip_tag(BerElement*,ber_len_t*);
-WINBERAPI ber_tag_t ber_first_element(BerElement*,ber_len_t*,char**);
-WINBERAPI ber_tag_t ber_next_element(BerElement*,ber_len_t*,char*);
-WINBERAPI void ber_bvfree(BerValue*);
-WINBERAPI void ber_bvecfree(BerValue**);
-WINBERAPI void ber_free(BerElement*,int);
-WINBERAPI BerValue *ber_bvdup(BerValue*);
-WINBERAPI BerElement *ber_alloc_t(int);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _WINBER_H */
diff --git a/winsup/w32api/include/wincon.h b/winsup/w32api/include/wincon.h
deleted file mode 100644
index 6c92f09ce..000000000
--- a/winsup/w32api/include/wincon.h
+++ /dev/null
@@ -1,216 +0,0 @@
-#ifndef _WINCON_H
-#define _WINCON_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define FOREGROUND_BLUE	1
-#define FOREGROUND_GREEN	2
-#define FOREGROUND_RED	4
-#define FOREGROUND_INTENSITY	8
-#define BACKGROUND_BLUE	16
-#define BACKGROUND_GREEN	32
-#define BACKGROUND_RED	64
-#define BACKGROUND_INTENSITY	128
-#define CTRL_C_EVENT 0
-#define CTRL_BREAK_EVENT 1
-#define CTRL_CLOSE_EVENT 2
-#define CTRL_LOGOFF_EVENT 5
-#define CTRL_SHUTDOWN_EVENT 6
-#define ENABLE_LINE_INPUT 2
-#define ENABLE_ECHO_INPUT 4
-#define ENABLE_PROCESSED_INPUT 1
-#define ENABLE_WINDOW_INPUT 8
-#define ENABLE_MOUSE_INPUT 16
-#define ENABLE_PROCESSED_OUTPUT 1
-#define ENABLE_WRAP_AT_EOL_OUTPUT 2
-#define KEY_EVENT 1
-#define MOUSE_EVENT 2
-#define WINDOW_BUFFER_SIZE_EVENT 4
-#define MENU_EVENT 8
-#define FOCUS_EVENT 16
-#define CAPSLOCK_ON 128
-#define ENHANCED_KEY 256
-#define RIGHT_ALT_PRESSED 1
-#define LEFT_ALT_PRESSED 2
-#define RIGHT_CTRL_PRESSED 4
-#define LEFT_CTRL_PRESSED 8
-#define SHIFT_PRESSED 16
-#define NUMLOCK_ON 32
-#define SCROLLLOCK_ON 64
-#define FROM_LEFT_1ST_BUTTON_PRESSED 1
-#define RIGHTMOST_BUTTON_PRESSED 2
-#define FROM_LEFT_2ND_BUTTON_PRESSED 4
-#define FROM_LEFT_3RD_BUTTON_PRESSED 8
-#define FROM_LEFT_4TH_BUTTON_PRESSED 16
-#define MOUSE_MOVED	1
-#define DOUBLE_CLICK	2
-#define MOUSE_WHEELED	4
-
-typedef struct _CHAR_INFO {
-	union {
-		WCHAR UnicodeChar;
-		CHAR AsciiChar;
-	} Char;
-	WORD Attributes;
-} CHAR_INFO,*PCHAR_INFO;
-typedef struct _SMALL_RECT {
-	SHORT Left;
-	SHORT Top;
-	SHORT Right;
-	SHORT Bottom;
-} SMALL_RECT,*PSMALL_RECT;
-typedef struct _CONSOLE_CURSOR_INFO {
-	DWORD	dwSize;
-	BOOL	bVisible;
-} CONSOLE_CURSOR_INFO,*PCONSOLE_CURSOR_INFO;
-typedef struct _COORD {
-	SHORT X;
-	SHORT Y;
-} COORD;
-typedef struct _CONSOLE_FONT_INFO {
-	DWORD nFont;
-	COORD dwFontSize;
-} CONSOLE_FONT_INFO, *PCONSOLE_FONT_INFO;
-typedef struct _CONSOLE_SCREEN_BUFFER_INFO {
-	COORD	dwSize;
-	COORD	dwCursorPosition;
-	WORD	wAttributes;
-	SMALL_RECT srWindow;
-	COORD	dwMaximumWindowSize;
-} CONSOLE_SCREEN_BUFFER_INFO,*PCONSOLE_SCREEN_BUFFER_INFO;
-typedef BOOL(CALLBACK *PHANDLER_ROUTINE)(DWORD);
-typedef struct _KEY_EVENT_RECORD {
-	BOOL bKeyDown;
-	WORD wRepeatCount;
-	WORD wVirtualKeyCode;
-	WORD wVirtualScanCode;
-	union {
-		WCHAR UnicodeChar;
-		CHAR AsciiChar;
-	} uChar;
-	DWORD dwControlKeyState;
-} 
-#ifdef __GNUC__
-/* gcc's alignment is not what win32 expects */
- PACKED
-#endif
-KEY_EVENT_RECORD;
-
-typedef struct _MOUSE_EVENT_RECORD {
-	COORD dwMousePosition;
-	DWORD dwButtonState;
-	DWORD dwControlKeyState;
-	DWORD dwEventFlags;
-} MOUSE_EVENT_RECORD;
-typedef struct _WINDOW_BUFFER_SIZE_RECORD {	COORD dwSize; } WINDOW_BUFFER_SIZE_RECORD;
-typedef struct _MENU_EVENT_RECORD {	UINT dwCommandId; } MENU_EVENT_RECORD,*PMENU_EVENT_RECORD;
-typedef struct _FOCUS_EVENT_RECORD { BOOL bSetFocus; } FOCUS_EVENT_RECORD;
-typedef struct _INPUT_RECORD {
-	WORD EventType;
-	union {
-		KEY_EVENT_RECORD KeyEvent;
-		MOUSE_EVENT_RECORD MouseEvent;
-		WINDOW_BUFFER_SIZE_RECORD WindowBufferSizeEvent;
-		MENU_EVENT_RECORD MenuEvent;
-		FOCUS_EVENT_RECORD FocusEvent;
-	} Event;
-} INPUT_RECORD,*PINPUT_RECORD;
-
-BOOL WINAPI AllocConsole(void);
-#if (_WIN32_WINNT >= 0x05001)
-BOOL WINAPI AttachConsole(DWORD);
-#endif
-HANDLE WINAPI CreateConsoleScreenBuffer(DWORD,DWORD,CONST SECURITY_ATTRIBUTES*,DWORD,LPVOID);
-BOOL WINAPI FillConsoleOutputAttribute(HANDLE,WORD,DWORD,COORD,PDWORD);
-BOOL WINAPI FillConsoleOutputCharacterA(HANDLE,CHAR,DWORD,COORD,PDWORD);
-BOOL WINAPI FillConsoleOutputCharacterW(HANDLE,WCHAR,DWORD,COORD,PDWORD);
-BOOL WINAPI FlushConsoleInputBuffer(HANDLE);
-BOOL WINAPI FreeConsole(void);
-BOOL WINAPI GenerateConsoleCtrlEvent(DWORD,DWORD);
-UINT WINAPI GetConsoleCP(void);
-BOOL WINAPI GetConsoleCursorInfo(HANDLE,PCONSOLE_CURSOR_INFO);
-BOOL WINAPI GetConsoleMode(HANDLE,PDWORD);
-UINT WINAPI GetConsoleOutputCP(void);
-BOOL WINAPI GetConsoleScreenBufferInfo(HANDLE,PCONSOLE_SCREEN_BUFFER_INFO);
-DWORD WINAPI GetConsoleTitleA(LPSTR,DWORD);
-DWORD WINAPI GetConsoleTitleW(LPWSTR,DWORD);
-#if (_WIN32_WINNT >= 0x0500)
-HWND WINAPI GetConsoleWindow(void);
-#endif
-COORD WINAPI GetLargestConsoleWindowSize(HANDLE);
-BOOL WINAPI GetNumberOfConsoleInputEvents(HANDLE,PDWORD);
-BOOL WINAPI GetNumberOfConsoleMouseButtons(PDWORD);
-BOOL WINAPI PeekConsoleInputA(HANDLE,PINPUT_RECORD,DWORD,PDWORD);
-BOOL WINAPI PeekConsoleInputW(HANDLE,PINPUT_RECORD,DWORD,PDWORD);
-BOOL WINAPI ReadConsoleA(HANDLE,PVOID,DWORD,PDWORD,PVOID);
-BOOL WINAPI ReadConsoleW(HANDLE,PVOID,DWORD,PDWORD,PVOID);
-BOOL WINAPI ReadConsoleInputA(HANDLE,PINPUT_RECORD,DWORD,PDWORD);
-BOOL WINAPI ReadConsoleInputW(HANDLE,PINPUT_RECORD,DWORD,PDWORD);
-BOOL WINAPI ReadConsoleOutputAttribute(HANDLE,LPWORD,DWORD,COORD,LPDWORD);
-BOOL WINAPI ReadConsoleOutputCharacterA(HANDLE,LPSTR,DWORD,COORD,PDWORD);
-BOOL WINAPI ReadConsoleOutputCharacterW(HANDLE,LPWSTR,DWORD,COORD,PDWORD);
-BOOL WINAPI ReadConsoleOutputA(HANDLE,PCHAR_INFO,COORD,COORD,PSMALL_RECT);
-BOOL WINAPI ReadConsoleOutputW(HANDLE,PCHAR_INFO,COORD,COORD,PSMALL_RECT);
-BOOL WINAPI ScrollConsoleScreenBufferA(HANDLE,const SMALL_RECT*,const SMALL_RECT*,COORD,const CHAR_INFO*);
-BOOL WINAPI ScrollConsoleScreenBufferW(HANDLE,const SMALL_RECT*,const SMALL_RECT*,COORD,const CHAR_INFO*);
-BOOL WINAPI SetConsoleActiveScreenBuffer(HANDLE);
-BOOL WINAPI SetConsoleCP(UINT);
-BOOL WINAPI SetConsoleCtrlHandler(PHANDLER_ROUTINE,BOOL);
-BOOL WINAPI SetConsoleCursorInfo(HANDLE,const CONSOLE_CURSOR_INFO*);
-BOOL WINAPI SetConsoleCursorPosition(HANDLE,COORD);
-BOOL WINAPI SetConsoleMode(HANDLE,DWORD);
-BOOL WINAPI SetConsoleOutputCP(UINT);
-BOOL WINAPI SetConsoleScreenBufferSize(HANDLE,COORD);
-BOOL WINAPI SetConsoleTextAttribute(HANDLE,WORD);
-BOOL WINAPI SetConsoleTitleA(LPCSTR);
-BOOL WINAPI SetConsoleTitleW(LPCWSTR);
-BOOL WINAPI SetConsoleWindowInfo(HANDLE,BOOL,const SMALL_RECT*);
-BOOL WINAPI WriteConsoleA(HANDLE,PCVOID,DWORD,PDWORD,PVOID);
-BOOL WINAPI WriteConsoleW(HANDLE,PCVOID,DWORD,PDWORD,PVOID);
-BOOL WINAPI WriteConsoleInputA(HANDLE,const INPUT_RECORD*,DWORD,PDWORD);
-BOOL WINAPI WriteConsoleInputW(HANDLE,const INPUT_RECORD*,DWORD,PDWORD);
-BOOL WINAPI WriteConsoleOutputA(HANDLE,const CHAR_INFO*,COORD,COORD,PSMALL_RECT);
-BOOL WINAPI WriteConsoleOutputW(HANDLE,const CHAR_INFO*,COORD,COORD,PSMALL_RECT);
-BOOL WINAPI WriteConsoleOutputAttribute(HANDLE,const WORD*,DWORD,COORD,PDWORD);
-BOOL WINAPI WriteConsoleOutputCharacterA(HANDLE,LPCSTR,DWORD,COORD,PDWORD);
-BOOL WINAPI WriteConsoleOutputCharacterW(HANDLE,LPCWSTR,DWORD,COORD,PDWORD);
-
-#ifdef UNICODE
-#define FillConsoleOutputCharacter FillConsoleOutputCharacterW
-#define GetConsoleTitle GetConsoleTitleW
-#define PeekConsoleInput PeekConsoleInputW
-#define ReadConsole ReadConsoleW
-#define ReadConsoleInput ReadConsoleInputW
-#define ReadConsoleOutput ReadConsoleOutputW
-#define ReadConsoleOutputCharacter ReadConsoleOutputCharacterW
-#define ScrollConsoleScreenBuffer ScrollConsoleScreenBufferW
-#define SetConsoleTitle SetConsoleTitleW
-#define WriteConsole WriteConsoleW
-#define WriteConsoleInput WriteConsoleInputW
-#define WriteConsoleOutput WriteConsoleOutputW
-#define WriteConsoleOutputCharacter WriteConsoleOutputCharacterW
-#else
-#define FillConsoleOutputCharacter FillConsoleOutputCharacterA
-#define GetConsoleTitle GetConsoleTitleA
-#define PeekConsoleInput PeekConsoleInputA
-#define ReadConsole ReadConsoleA
-#define ReadConsoleInput ReadConsoleInputA
-#define ReadConsoleOutput ReadConsoleOutputA
-#define ReadConsoleOutputCharacter ReadConsoleOutputCharacterA
-#define ScrollConsoleScreenBuffer ScrollConsoleScreenBufferA
-#define SetConsoleTitle SetConsoleTitleA
-#define WriteConsole WriteConsoleA
-#define WriteConsoleInput WriteConsoleInputA
-#define WriteConsoleOutput WriteConsoleOutputA
-#define WriteConsoleOutputCharacter WriteConsoleOutputCharacterA
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/wincrypt.h b/winsup/w32api/include/wincrypt.h
deleted file mode 100644
index c3ebf2d5d..000000000
--- a/winsup/w32api/include/wincrypt.h
+++ /dev/null
@@ -1,695 +0,0 @@
-#ifndef _WINCRYPT_H
-#define _WINCRYPT_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define MS_DEF_PROV_A	"Microsoft Base Cryptographic Provider v1.0"
-#define MS_DEF_PROV_W	L"Microsoft Base Cryptographic Provider v1.0"
-#define MS_ENHANCED_PROV_A	"Microsoft Enhanced Cryptographic Provider v1.0"
-#define MS_ENHANCED_PROV_W	L"Microsoft Enhanced Cryptographic Provider v1.0"
-#define MS_STRONG_PROV_A	"Microsoft Strong Cryptographic Provider"
-#define MS_STRONG_PROV_W	L"Microsoft Strong Cryptographic Provider"
-#define MS_DEF_RSA_SIG_PROV_A	"Microsoft RSA Signature Cryptographic Provider"
-#define MS_DEF_RSA_SIG_PROV_W	L"Microsoft RSA Signature Cryptographic Provider"
-#define MS_DEF_RSA_SCHANNEL_PROV_A	"Microsoft RSA SChannel Cryptographic Provider"
-#define MS_DEF_RSA_SCHANNEL_PROV_W	L"Microsoft RSA SChannel Cryptographic Provider"
-#define MS_DEF_DSS_PROV_A	"Microsoft Base DSS Cryptographic Provider"
-#define MS_DEF_DSS_PROV_W	L"Microsoft Base DSS Cryptographic Provider"
-#define MS_DEF_DSS_DH_PROV_A	"Microsoft Base DSS and Diffie-Hellman Cryptographic Provider"
-#define MS_DEF_DSS_DH_PROV_W	L"Microsoft Base DSS and Diffie-Hellman Cryptographic Provider"
-#define MS_ENH_DSS_DH_PROV_A	"Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider"
-#define MS_ENH_DSS_DH_PROV_W	L"Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider"
-#define MS_DEF_DH_SCHANNEL_PROV_A	"Microsoft DH SChannel Cryptographic Provider"
-#define MS_DEF_DH_SCHANNEL_PROV_W	L"Microsoft DH SChannel Cryptographic Provider"
-#define MS_SCARD_PROV_A	"Microsoft Base Smart Card Crypto Provider"
-#define MS_SCARD_PROV_W	L"Microsoft Base Smart Card Crypto Provider"
-#define GET_ALG_CLASS(x) (x&57344)
-#define GET_ALG_TYPE(x) (x&7680)
-#define GET_ALG_SID(x) (x&511)
-#define ALG_CLASS_ANY 0
-#define ALG_CLASS_SIGNATURE  8192
-#define ALG_CLASS_MSG_ENCRYPT  16384
-#define ALG_CLASS_DATA_ENCRYPT  24576
-#define ALG_CLASS_HASH  32768
-#define ALG_CLASS_KEY_EXCHANGE  40960
-#define ALG_CLASS_ALL 57344 /* (7 << 13) */
-#define ALG_TYPE_ANY 0
-#define ALG_TYPE_DSS 512
-#define ALG_TYPE_RSA 1024
-#define ALG_TYPE_BLOCK 1536
-#define ALG_TYPE_STREAM  2048
-#define ALG_TYPE_DH 2560 /* (5 << 9) */
-#define ALG_TYPE_SECURECHANNEL 3072 /* (6 << 9) */
-#define ALG_SID_ANY 0
-#define ALG_SID_RSA_ANY 0
-#define ALG_SID_RSA_PKCS 1
-#define ALG_SID_RSA_MSATWORK 2
-#define ALG_SID_RSA_ENTRUST 3
-#define ALG_SID_RSA_PGP 4
-#define ALG_SID_DSS_ANY 0
-#define ALG_SID_DSS_PKCS 1
-#define ALG_SID_DSS_DMS 2
-#define ALG_SID_DES 1
-#define ALG_SID_3DES 3
-#define ALG_SID_DESX 4
-#define ALG_SID_IDEA 5
-#define ALG_SID_CAST 6
-#define ALG_SID_SAFERSK64 7
-#define ALG_SID_SAFERSK128 8
-#define ALG_SID_3DES_112 9
-#define ALG_SID_SKIPJACK 10
-#define ALG_SID_TEK 11
-#define ALG_SID_CYLINK_MEK 12
-#define ALG_SID_RC5 13
-#define ALG_SID_RC2 2
-#define ALG_SID_RC4 1
-#define ALG_SID_SEAL 2
-#define ALG_SID_MD2 1
-#define ALG_SID_MD4 2
-#define ALG_SID_MD5 3
-#define ALG_SID_SHA 4
-#define ALG_SID_MAC 5
-#define ALG_SID_RIPEMD 6
-#define ALG_SID_RIPEMD160 7
-#define ALG_SID_SSL3SHAMD5 8
-#define ALG_SID_HMAC 9
-#define ALG_SID_TLS1PRF 10
-#define ALG_SID_EXAMPLE 80
-
-#define CALG_MD2 (ALG_CLASS_HASH|ALG_TYPE_ANY|ALG_SID_MD2)
-#define CALG_MD4 (ALG_CLASS_HASH|ALG_TYPE_ANY|ALG_SID_MD4)
-#define CALG_MD5 (ALG_CLASS_HASH|ALG_TYPE_ANY|ALG_SID_MD5)
-#define CALG_SHA (ALG_CLASS_HASH|ALG_TYPE_ANY|ALG_SID_SHA)
-#define CALG_MAC (ALG_CLASS_HASH|ALG_TYPE_ANY|ALG_SID_MAC)
-#define CALG_3DES (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|3)
-#define CALG_CYLINK_MEK (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|12)
-#define CALG_SKIPJACK (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|10)
-#define CALG_KEA_KEYX (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_STREAM|ALG_TYPE_DSS|4)
-#define CALG_RSA_SIGN (ALG_CLASS_SIGNATURE|ALG_TYPE_RSA|ALG_SID_RSA_ANY)
-#define CALG_DSS_SIGN (ALG_CLASS_SIGNATURE|ALG_TYPE_DSS|ALG_SID_DSS_ANY)
-#define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_RSA|ALG_SID_RSA_ANY)
-#define CALG_DES (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_DES)
-#define CALG_RC2 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_RC2)
-#define CALG_RC4 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_STREAM|ALG_SID_RC4)
-#define CALG_SEAL (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_STREAM|ALG_SID_SEAL)
-#define CALG_DH_EPHEM (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_STREAM|ALG_TYPE_DSS|ALG_SID_DSS_DMS)
-#define CALG_DESX (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_DESX)
-#define CALG_TLS1PRF (ALG_CLASS_DHASH|ALG_TYPE_ANY|ALG_SID_TLS1PRF)
-
-#define CRYPT_VERIFYCONTEXT 0xF0000000
-#define CRYPT_NEWKEYSET 8
-#define CRYPT_DELETEKEYSET 16
-#define CRYPT_MACHINE_KEYSET 32
-#define CRYPT_SILENT 64
-#define CRYPT_EXPORTABLE 1
-#define CRYPT_USER_PROTECTED 2
-#define CRYPT_CREATE_SALT 4
-#define CRYPT_UPDATE_KEY 8
-#define SIMPLEBLOB 1
-#define PUBLICKEYBLOB 6
-#define PRIVATEKEYBLOB 7
-#define PLAINTEXTKEYBLOB 8
-#define OPAQUEKEYBLOB 9
-#define PUBLICKEYBLOBEX 10
-#define SYMMETRICWRAPKEYBLOB 11
-#define AT_KEYEXCHANGE 1
-#define AT_SIGNATURE 2
-#define CRYPT_USERDATA 1
-#define PKCS5_PADDING 1
-#define CRYPT_MODE_CBC 1
-#define CRYPT_MODE_ECB 2
-#define CRYPT_MODE_OFB 3
-#define CRYPT_MODE_CFB 4
-#define CRYPT_MODE_CTS 5
-#define CRYPT_MODE_CBCI 6
-#define CRYPT_MODE_CFBP 7
-#define CRYPT_MODE_OFBP 8
-#define CRYPT_MODE_CBCOFM 9
-#define CRYPT_MODE_CBCOFMI 10
-#define CRYPT_ENCRYPT 1
-#define CRYPT_DECRYPT 2
-#define CRYPT_EXPORT 4
-#define CRYPT_READ 8
-#define CRYPT_WRITE 16
-#define CRYPT_MAC 32
-#define HP_ALGID 1
-#define HP_HASHVAL 2
-#define HP_HASHSIZE 4
-#define CRYPT_FAILED FALSE
-#define CRYPT_SUCCEED TRUE
-#define RCRYPT_SUCCEEDED(r) ((r)==CRYPT_SUCCEED)
-#define RCRYPT_FAILED(r) ((r)==CRYPT_FAILED)
-#define PP_ENUMALGS 1
-#define PP_ENUMCONTAINERS 2
-#define PP_IMPTYPE 3
-#define PP_NAME 4
-#define PP_VERSION 5
-#define PP_CONTAINER 6
-#define PP_CHANGE_PASSWORD	7
-#define PP_KEYSET_SEC_DESCR	8
-#define PP_CERTCHAIN	9
-#define PP_KEY_TYPE_SUBTYPE	10
-#define PP_PROVTYPE	16
-#define PP_KEYSTORAGE	17
-#define PP_APPLI_CERT	18
-#define PP_SYM_KEYSIZE	19
-#define PP_SESSION_KEYSIZE	20
-#define PP_UI_PROMPT	21
-#define PP_ENUMALGS_EX	22
-#define PP_ENUMMANDROOTS 25
-#define PP_ENUMELECTROOTS 26
-#define PP_KEYSET_TYPE 27
-#define PP_ADMIN_PIN 31
-#define PP_KEYEXCHANGE_PIN 32
-#define PP_SIGNATURE_PIN 33
-#define PP_SIG_KEYSIZE_INC 34
-#define PP_KEYX_KEYSIZE_INC 35
-#define PP_UNIQUE_CONTAINER 36
-#define PP_SGC_INFO 37
-#define PP_USE_HARDWARE_RNG 38
-#define PP_KEYSPEC 39
-#define PP_ENUMEX_SIGNING_PROT 40
-#define CRYPT_FIRST 1
-#define CRYPT_NEXT 2
-#define CRYPT_IMPL_HARDWARE 1
-#define CRYPT_IMPL_SOFTWARE 2
-#define CRYPT_IMPL_MIXED 3
-#define CRYPT_IMPL_UNKNOWN 4
-#define PROV_RSA_FULL 1
-#define PROV_RSA_SIG 2
-#define PROV_DSS 3
-#define PROV_FORTEZZA 4
-#define PROV_MS_MAIL 5
-#define PROV_SSL 6
-#define PROV_STT_MER 7
-#define PROV_STT_ACQ 8
-#define PROV_STT_BRND 9
-#define PROV_STT_ROOT 10
-#define PROV_STT_ISS 11
-#define PROV_RSA_SCHANNEL 12
-#define PROV_DSS_DH 13
-#define PROV_EC_ECDSA_SIG 14
-#define PROV_EC_ECNRA_SIG 15
-#define PROV_EC_ECDSA_FULL 16
-#define PROV_EC_ECNRA_FULL 17
-#define PROV_DH_SCHANNEL 18
-#define PROV_SPYRUS_LYNKS 20
-#define PROV_RNG 21
-#define PROV_INTEL_SEC 22
-#define MAXUIDLEN 64
-#define CUR_BLOB_VERSION 2
-#define X509_ASN_ENCODING 1
-#define PKCS_7_ASN_ENCODING  65536
-#define CERT_V1 0
-#define CERT_V2 1
-#define CERT_V3 2
-#define CERT_E_CHAINING (-2146762486)
-#define CERT_E_CN_NO_MATCH (-2146762481)
-#define CERT_E_EXPIRED (-2146762495)
-#define CERT_E_PURPOSE (-2146762490)
-#define CERT_E_REVOCATION_FAILURE (-2146762482)
-#define CERT_E_REVOKED (-2146762484)
-#define CERT_E_ROLE (-2146762493)
-#define CERT_E_UNTRUSTEDROOT (-2146762487)
-#define CERT_E_UNTRUSTEDTESTROOT (-2146762483)
-#define CERT_E_VALIDITYPERIODNESTING (-2146762494)
-#define CERT_E_WRONG_USAGE (-2146762480)
-#define CERT_E_PATHLENCONST (-2146762492)
-#define CERT_E_CRITICAL (-2146762491)
-#define CERT_E_ISSUERCHAINING (-2146762489)
-#define CERT_E_MALFORMED (-2146762488)
-#define CRYPT_E_REVOCATION_OFFLINE (-2146885613)
-#define CRYPT_E_REVOKED (-2146885616)
-#define TRUST_E_BASIC_CONSTRAINTS (-2146869223)
-#define TRUST_E_CERT_SIGNATURE (-2146869244)
-#define TRUST_E_FAIL (-2146762485)
-#define CERT_TRUST_NO_ERROR 0
-#define CERT_TRUST_IS_NOT_TIME_VALID 1
-#define CERT_TRUST_IS_NOT_TIME_NESTED 2
-#define CERT_TRUST_IS_REVOKED 4
-#define CERT_TRUST_IS_NOT_SIGNATURE_VALID 8
-#define CERT_TRUST_IS_NOT_VALID_FOR_USAGE 16
-#define CERT_TRUST_IS_UNTRUSTED_ROOT 32
-#define CERT_TRUST_REVOCATION_STATUS_UNKNOWN 64
-#define CERT_TRUST_IS_CYCLIC 128
-#define CERT_TRUST_IS_PARTIAL_CHAIN 65536
-#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 131072
-#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 262144
-#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 524288
-#define CERT_TRUST_HAS_EXACT_MATCH_ISSUER 1
-#define CERT_TRUST_HAS_KEY_MATCH_ISSUER 2
-#define CERT_TRUST_HAS_NAME_MATCH_ISSUER 4
-#define CERT_TRUST_IS_SELF_SIGNED 8
-#define CERT_TRUST_IS_COMPLEX_CHAIN 65536
-#define CERT_CHAIN_POLICY_BASE ((LPCSTR) 1)
-#define CERT_CHAIN_POLICY_AUTHENTICODE  ((LPCSTR) 2)
-#define CERT_CHAIN_POLICY_AUTHENTICODE_TS  ((LPCSTR) 3)
-#define CERT_CHAIN_POLICY_SSL  ((LPCSTR) 4)
-#define CERT_CHAIN_POLICY_BASIC_CONSTRAINTS ((LPCSTR) 5)
-#define CERT_CHAIN_POLICY_NT_AUTH ((LPCSTR) 6)
-#define USAGE_MATCH_TYPE_AND 0
-#define USAGE_MATCH_TYPE_OR 1
-#define CERT_SIMPLE_NAME_STR 1
-#define CERT_OID_NAME_STR 2
-#define CERT_X500_NAME_STR 3
-#define CERT_NAME_STR_SEMICOLON_FLAG 1073741824
-#define CERT_NAME_STR_CRLF_FLAG 134217728
-#define CERT_NAME_STR_NO_PLUS_FLAG 536870912
-#define CERT_NAME_STR_NO_QUOTING_FLAG 268435456
-#define CERT_NAME_STR_REVERSE_FLAG 33554432
-#define CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG 131072
-#define CERT_FIND_ANY 0
-#define CERT_FIND_CERT_ID 1048576
-#define CERT_FIND_CTL_USAGE 655360
-#define CERT_FIND_ENHKEY_USAGE 655360
-#define CERT_FIND_EXISTING 851968
-#define CERT_FIND_HASH 65536
-#define CERT_FIND_ISSUER_ATTR 196612
-#define CERT_FIND_ISSUER_NAME 131076
-#define CERT_FIND_ISSUER_OF 786432
-#define CERT_FIND_KEY_IDENTIFIER 983040
-#define CERT_FIND_KEY_SPEC 589824
-#define CERT_FIND_MD5_HASH 262144
-#define CERT_FIND_PROPERTY 327680
-#define CERT_FIND_PUBLIC_KEY 393216
-#define CERT_FIND_SHA1_HASH 65536
-#define CERT_FIND_SIGNATURE_HASH 917504
-#define CERT_FIND_SUBJECT_ATTR 196615
-#define CERT_FIND_SUBJECT_CERT 720896
-#define CERT_FIND_SUBJECT_NAME 131079
-#define CERT_FIND_SUBJECT_STR_A 458759
-#define CERT_FIND_SUBJECT_STR_W 524295
-#define CERT_FIND_ISSUER_STR_A 458756
-#define CERT_FIND_ISSUER_STR_W 524292
-#define CERT_FIND_OR_ENHKEY_USAGE_FLAG 16
-#define CERT_FIND_OPTIONAL_ENHKEY_USAGE_FLAG  1
-#define CERT_FIND_NO_ENHKEY_USAGE_FLAG  8
-#define CERT_FIND_VALID_ENHKEY_USAGE_FLAG  32
-#define CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG  2
-#define CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG  2
-#define CERT_UNICODE_IS_RDN_ATTRS_FLAG 1
-#define CERT_CHAIN_FIND_BY_ISSUER 1
-#define CERT_CHAIN_FIND_BY_ISSUER_COMPARE_KEY_FLAG 1
-#define CERT_CHAIN_FIND_BY_ISSUER_COMPLEX_CHAIN_FLAG 2
-#define CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_FLAG 32768
-#define CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_URL_FLAG 4
-#define CERT_CHAIN_FIND_BY_ISSUER_LOCAL_MACHINE_FLAG 8
-#define CERT_CHAIN_FIND_BY_ISSUER_NO_KEY_FLAG 16384
-#define CERT_STORE_PROV_SYSTEM 10
-#define CERT_SYSTEM_STORE_LOCAL_MACHINE 131072
-#define szOID_PKIX_KP_SERVER_AUTH "4235600"
-#define szOID_SERVER_GATED_CRYPTO "4235658"
-#define szOID_SGC_NETSCAPE "2.16.840.1.113730.4.1"
-#define szOID_PKIX_KP_CLIENT_AUTH "1.3.6.1.5.5.7.3.2"
-#define CRYPT_NOHASHOID 0x00000001
-#define CRYPT_NO_SALT 0x10
-#define CRYPT_PREGEN 0x40
-#define CRYPT_RECIPIENT 0x10
-#define CRYPT_INITIATOR 0x40
-#define CRYPT_ONLINE 0x80
-#define CRYPT_SF 0x100
-#define CRYPT_CREATE_IV 0x200
-#define CRYPT_KEK 0x400
-#define CRYPT_DATA_KEY 0x800
-#define CRYPT_VOLATILE 0x1000
-#define CRYPT_SGCKEY 0x2000
-#define KP_IV               0x00000001
-#define KP_SALT             0x00000002
-#define KP_PADDING          0x00000003
-#define KP_MODE             0x00000004
-#define KP_MODE_BITS        0x00000005
-#define KP_PERMISSIONS      0x00000006
-#define KP_ALGID            0x00000007
-#define KP_BLOCKLEN         0x00000008
-#define KP_KEYLEN           0x00000009
-#define KP_SALT_EX          0x0000000a
-#define KP_P                0x0000000b
-#define KP_G                0x0000000c
-#define KP_Q                0x0000000d
-#define KP_X                0x0000000e
-#define KP_Y                0x0000000f
-#define KP_RA               0x00000010
-#define KP_RB               0x00000011
-#define KP_INFO             0x00000012
-#define KP_EFFECTIVE_KEYLEN 0x00000013
-#define KP_SCHANNEL_ALG     0x00000014
-#define KP_PUB_PARAMS       0x00000027
-#define CRYPT_FLAG_PCT1    0x0001
-#define CRYPT_FLAG_SSL2    0x0002
-#define CRYPT_FLAG_SSL3    0x0004
-#define CRYPT_FLAG_TLS1    0x0008
-#define CRYPT_FLAG_IPSEC   0x0010
-#define CRYPT_FLAG_SIGNING 0x0020
-#define SCHANNEL_MAC_KEY    0x00000000
-#define SCHANNEL_ENC_KEY    0x00000001
-#define INTERNATIONAL_USAGE 0x00000001
-
-typedef UINT ALG_ID;
-typedef struct _VTableProvStruc {FARPROC FuncVerifyImage;} VTableProvStruc,*PVTableProvStruc;
-typedef ULONG HCRYPTPROV;
-typedef ULONG HCRYPTKEY;
-typedef ULONG HCRYPTHASH;
-typedef PVOID HCERTSTORE;
-typedef PVOID HCRYPTMSG;
-typedef PVOID HCERTCHAINENGINE;
-typedef struct _CRYPTOAPI_BLOB {
-	DWORD cbData;
-	BYTE* pbData;
-} CRYPT_INTEGER_BLOB, *PCRYPT_INTEGER_BLOB,
-  CRYPT_UINT_BLOB,    *PCRYPT_UINT_BLOB,
-  CRYPT_OBJID_BLOB,   *PCRYPT_OBJID_BLOB,
-  CERT_NAME_BLOB,     *PCERT_NAME_BLOB,
-  CERT_RDN_VALUE_BLOB,*PCERT_RDN_VALUE_BLOB,
-  CERT_BLOB,          *PCERT_BLOB,
-  CRL_BLOB,           *PCRL_BLOB,
-  DATA_BLOB,          *PDATA_BLOB,
-  CRYPT_DATA_BLOB,    *PCRYPT_DATA_BLOB,
-  CRYPT_HASH_BLOB,    *PCRYPT_HASH_BLOB,
-  CRYPT_DIGEST_BLOB,  *PCRYPT_DIGEST_BLOB,
-  CRYPT_DER_BLOB,     *PCRYPT_DER_BLOB,
-  CRYPT_ATTR_BLOB,    *PCRYPT_ATTR_BLOB;
-/* not described in SDK; has the same layout as HTTPSPolicyCallbackData */
-typedef struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA {
-	DWORD cbStruct;
-	DWORD dwAuthType;
-	DWORD fdwChecks;
-	LPWSTR pwszServerName;
-} SSL_EXTRA_CERT_CHAIN_POLICY_PARA, *PSSL_EXTRA_CERT_CHAIN_POLICY_PARA,
-  HTTPSPolicyCallbackData, *PHTTPSPolicyCallbackData;
-/* #if (_WIN32_WINNT>=0x500) */
-typedef struct _CERT_CHAIN_POLICY_PARA {
-	DWORD cbSize;
-	DWORD dwFlags;
-	void* pvExtraPolicyPara;
-} CERT_CHAIN_POLICY_PARA, *PCERT_CHAIN_POLICY_PARA;
-typedef struct _CERT_CHAIN_POLICY_STATUS {
-	DWORD cbSize;
-	DWORD dwError;
-	LONG lChainIndex;
-	LONG lElementIndex;
-	void* pvExtraPolicyStatus;
-} CERT_CHAIN_POLICY_STATUS, *PCERT_CHAIN_POLICY_STATUS;
-/* #endif */
-typedef struct _CRYPT_ALGORITHM_IDENTIFIER {
-	LPSTR pszObjId;
-	CRYPT_OBJID_BLOB Parameters;
-} CRYPT_ALGORITHM_IDENTIFIER, *PCRYPT_ALGORITHM_IDENTIFIER;
-typedef struct _CRYPT_BIT_BLOB {
-	DWORD cbData;
-	BYTE* pbData;
-	DWORD cUnusedBits;
-} CRYPT_BIT_BLOB, *PCRYPT_BIT_BLOB;
-typedef struct _CERT_PUBLIC_KEY_INFO {
-	CRYPT_ALGORITHM_IDENTIFIER Algorithm;
-	CRYPT_BIT_BLOB PublicKey;
-} CERT_PUBLIC_KEY_INFO, *PCERT_PUBLIC_KEY_INFO;
-typedef struct _CERT_EXTENSION {
-	LPSTR pszObjId;
-	BOOL fCritical;
-	CRYPT_OBJID_BLOB Value;
-} CERT_EXTENSION, *PCERT_EXTENSION;
-typedef struct _CERT_INFO {
-	DWORD dwVersion;
-	CRYPT_INTEGER_BLOB SerialNumber;
-	CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm;
-	CERT_NAME_BLOB Issuer;
-	FILETIME NotBefore;
-	FILETIME NotAfter;
-	CERT_NAME_BLOB Subject;
-	CERT_PUBLIC_KEY_INFO SubjectPublicKeyInfo;
-	CRYPT_BIT_BLOB IssuerUniqueId;
-	CRYPT_BIT_BLOB SubjectUniqueId;
-	DWORD cExtension;
-	PCERT_EXTENSION rgExtension;
-} CERT_INFO, *PCERT_INFO;
-typedef struct _CERT_CONTEXT {
-	DWORD dwCertEncodingType;
-	BYTE* pbCertEncoded;
-	DWORD cbCertEncoded;
-	PCERT_INFO pCertInfo;
-	HCERTSTORE hCertStore;
-} CERT_CONTEXT, *PCERT_CONTEXT;
-typedef const CERT_CONTEXT *PCCERT_CONTEXT;
-typedef struct _CTL_USAGE {
-	DWORD cUsageIdentifier;
-	LPSTR *rgpszUsageIdentifier;
-} CTL_USAGE, *PCTRL_USAGE,
-  CERT_ENHKEY_USAGE, *PCERT_ENHKEY_USAGE;
-typedef struct _CERT_USAGE_MATCH {
-	DWORD dwType;
-	CERT_ENHKEY_USAGE Usage;
-} CERT_USAGE_MATCH, *PCERT_USAGE_MATCH;
-/* #if (_WIN32_WINNT>=0x500) */
-typedef struct _CERT_CHAIN_PARA {
-	DWORD cbSize;
-	CERT_USAGE_MATCH RequestedUsage;
-#if CERT_CHAIN_PARA_HAS_EXTRA_FIELDS
-	CERT_USAGE_MATCH RequestedIssuancePolicy;
-	DWORD dwUrlRetrievalTimeout;
-	BOOL fCheckRevocationFreshnessTime;
-	DWORD dwRevocationFreshnessTime;
-#endif
-} CERT_CHAIN_PARA, *PCERT_CHAIN_PARA;
-typedef BOOL (WINAPI *PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK)(PCCERT_CONTEXT,void*);
-typedef struct _CERT_CHAIN_FIND_BY_ISSUER_PARA {
-	DWORD cbSize;
-	LPCSTR pszUsageIdentifier;
-	DWORD dwKeySpec;
-	DWORD dwAcquirePrivateKeyFlags;
-	DWORD cIssuer;
-	CERT_NAME_BLOB* rgIssuer;
-	PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK pfnFIndCallback;
-	void* pvFindArg;
-	DWORD* pdwIssuerChainIndex;
-	DWORD* pdwIssuerElementIndex;
-} CERT_CHAIN_FIND_BY_ISSUER_PARA, *PCERT_CHAIN_FIND_BY_ISSUER_PARA;
-/* #endif */
-typedef struct _CERT_TRUST_STATUS {
-	DWORD dwErrorStatus;
-	DWORD dwInfoStatus;
-} CERT_TRUST_STATUS, *PCERT_TRUST_STATUS;
-typedef struct _CRL_ENTRY {
-	CRYPT_INTEGER_BLOB SerialNumber;
-	FILETIME RevocationDate;
-	DWORD cExtension;
-	PCERT_EXTENSION rgExtension;
-} CRL_ENTRY, *PCRL_ENTRY;
-typedef struct _CRL_INFO {
-	DWORD dwVersion;
-	CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm;
-	CERT_NAME_BLOB Issuer;
-	FILETIME ThisUpdate;
-	FILETIME NextUpdate;
-	DWORD cCRLEntry;
-	PCRL_ENTRY rgCRLEntry;
-	DWORD cExtension;
-	PCERT_EXTENSION rgExtension;
-} CRL_INFO, *PCRL_INFO;
-typedef struct _CRL_CONTEXT {
-	DWORD dwCertEncodingType;
-	BYTE* pbCrlEncoded;
-	DWORD cbCrlEncoded;
-	PCRL_INFO pCrlInfo;
-	HCERTSTORE hCertStore;
-} CRL_CONTEXT, *PCRL_CONTEXT;
-typedef const CRL_CONTEXT *PCCRL_CONTEXT;
-typedef struct _CERT_REVOCATION_CRL_INFO {
-	DWORD cbSize;
-	PCCRL_CONTEXT pBaseCRLContext;
-	PCCRL_CONTEXT pDeltaCRLContext;
-	PCRL_ENTRY pCrlEntry;
-	BOOL fDeltaCrlEntry;
-} CERT_REVOCATION_CRL_INFO, *PCERT_REVOCATION_CRL_INFO;
-typedef struct _CERT_REVOCATION_INFO {
-	DWORD cbSize;
-	DWORD dwRevocationResult;
-	LPCSTR pszRevocationOid;
-	LPVOID pvOidSpecificInfo;
-	BOOL fHasFreshnessTime;
-	DWORD dwFreshnessTime;
-	PCERT_REVOCATION_CRL_INFO pCrlInfo;
-} CERT_REVOCATION_INFO, *PCERT_REVOCATION_INFO;
-/* #if (_WIN32_WINNT>=0x500) */
-typedef struct _CERT_CHAIN_ELEMENT {
-	DWORD cbSize;
-	PCCERT_CONTEXT pCertContext;
-	CERT_TRUST_STATUS TrustStatus;
-	PCERT_REVOCATION_INFO pRevocationInfo;
-	PCERT_ENHKEY_USAGE pIssuanceUsage;
-	PCERT_ENHKEY_USAGE pApplicationUsage;
-} CERT_CHAIN_ELEMENT, *PCERT_CHAIN_ELEMENT;
-/* #endif */
-typedef struct _CRYPT_ATTRIBUTE {
-	LPSTR pszObjId;
-	DWORD cValue;
-	PCRYPT_ATTR_BLOB rgValue;
-} CRYPT_ATTRIBUTE, *PCRYPT_ATTRIBUTE;
-typedef struct _CTL_ENTRY {
-	CRYPT_DATA_BLOB SubjectIdentifier;
-	DWORD cAttribute;
-	PCRYPT_ATTRIBUTE rgAttribute;
-} CTL_ENTRY, *PCTL_ENTRY;
-typedef struct _CTL_INFO {
-	DWORD dwVersion;
-	CTL_USAGE SubjectUsage;
-	CRYPT_DATA_BLOB ListIdentifier;
-	CRYPT_INTEGER_BLOB SequenceNumber;
-	FILETIME ThisUpdate;
-	FILETIME NextUpdate;
-	CRYPT_ALGORITHM_IDENTIFIER SubjectAlgorithm;
-	DWORD cCTLEntry;
-	PCTL_ENTRY rgCTLEntry;
-	DWORD cExtension;
-	PCERT_EXTENSION rgExtension;
-} CTL_INFO, *PCTL_INFO;
-typedef struct _CTL_CONTEXT {
-	DWORD dwMsgAndCertEncodingType;
-	BYTE* pbCtlEncoded;
-	DWORD cbCtlEncoded;
-	PCTL_INFO pCtlInfo;
-	HCERTSTORE hCertStore;
-	HCRYPTMSG hCryptMsg;
-	BYTE* pbCtlContent;
-	DWORD cbCtlContent;
-} CTL_CONTEXT, *PCTL_CONTEXT;
-typedef const CTL_CONTEXT *PCCTL_CONTEXT;
-typedef struct _CERT_TRUST_LIST_INFO {
-	DWORD cbSize;
-	PCTL_ENTRY pCtlEntry;
-	PCCTL_CONTEXT pCtlContext;
-} CERT_TRUST_LIST_INFO, *PCERT_TRUST_LIST_INFO;
-typedef struct _CERT_SIMPLE_CHAIN {
-	DWORD cbSize;
-	CERT_TRUST_STATUS TrustStatus;
-	DWORD cElement;
-	PCERT_CHAIN_ELEMENT* rgpElement;
-	PCERT_TRUST_LIST_INFO pTrustListInfo;
-	BOOL fHasRevocationFreshnessTime;
-	DWORD dwRevocationFreshnessTime;
-} CERT_SIMPLE_CHAIN, *PCERT_SIMPLE_CHAIN;
-/* #if (_WIN32_WINNT>=0x500) */
-typedef const struct _CERT_CHAIN_CONTEXT* PCCERT_CHAIN_CONTEXT;
-typedef struct _CERT_CHAIN_CONTEXT {
-	DWORD cbSize;
-	CERT_TRUST_STATUS TrustStatus;
-	DWORD cChain;
-	PCERT_SIMPLE_CHAIN* rgpChain;
-	DWORD cLowerQualityChainContext;
-	PCCERT_CHAIN_CONTEXT* rgpLowerQualityChainContext;
-	BOOL fHasRevocationFreshnessTime;
-	DWORD dwRevocationFreshnessTime;
-} CERT_CHAIN_CONTEXT, *PCERT_CHAIN_CONTEXT;
-/* #endif */
-typedef struct _PROV_ENUMALGS {
-	ALG_ID aiAlgid;
-	DWORD dwBitLen;
-	DWORD dwNameLen;
-	CHAR szName[20];
-} PROV_ENUMALGS;
-typedef struct _PUBLICKEYSTRUC {
-	BYTE bType;
-	BYTE bVersion;
-	WORD reserved;
-	ALG_ID aiKeyAlg;
-} PUBLICKEYSTRUC;
-typedef struct _RSAPUBKEY {
-	DWORD magic;
-	DWORD bitlen;
-	DWORD pubexp;
-} RSAPUBKEY;
-
-BOOL WINAPI CertCloseStore(HCERTSTORE,DWORD);
-BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE,PCCERT_CONTEXT,LPFILETIME,HCERTSTORE,PCERT_CHAIN_PARA,DWORD,LPVOID,PCCERT_CHAIN_CONTEXT*);
-BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR,PCCERT_CHAIN_CONTEXT,PCERT_CHAIN_POLICY_PARA,PCERT_CHAIN_POLICY_STATUS);
-void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT);
-DWORD WINAPI CertNameToStrA(DWORD,PCERT_NAME_BLOB,DWORD,LPSTR,DWORD);
-DWORD WINAPI CertNameToStrW(DWORD,PCERT_NAME_BLOB,DWORD,LPWSTR,DWORD);
-HCERTSTORE WINAPI CertOpenSystemStoreA(HCRYPTPROV,LPCSTR);
-HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV,LPCWSTR);
-HCERTSTORE WINAPI CertOpenStore(LPCSTR,DWORD,HCRYPTPROV,DWORD,const void*);
-PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE,DWORD,DWORD,DWORD,const void*,PCCERT_CONTEXT);
-BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT);
-PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE,PCCERT_CONTEXT,PCCERT_CONTEXT,DWORD*);
-PCCERT_CHAIN_CONTEXT WINAPI CertFindChainInStore(HCERTSTORE,DWORD,DWORD,DWORD,const void*,PCCERT_CHAIN_CONTEXT);
-BOOL WINAPI CryptAcquireContextA(HCRYPTPROV*,LPCSTR,LPCSTR,DWORD,DWORD);
-BOOL WINAPI CryptAcquireContextW(HCRYPTPROV*,LPCWSTR,LPCWSTR,DWORD,DWORD);
-BOOL WINAPI CryptContextAddRef(HCRYPTPROV,DWORD*,DWORD);
-BOOL WINAPI CryptReleaseContext(HCRYPTPROV,DWORD);
-BOOL WINAPI CryptGenKey(HCRYPTPROV,ALG_ID,DWORD,HCRYPTKEY*);
-BOOL WINAPI CryptDeriveKey(HCRYPTPROV,ALG_ID,HCRYPTHASH,DWORD,HCRYPTKEY*);
-BOOL WINAPI CryptDestroyKey(HCRYPTKEY);
-#if (WINVER >= 0x0500)
-BOOL WINAPI CryptDuplicateHash(HCRYPTHASH,DWORD*,DWORD,HCRYPTHASH*);
-BOOL WINAPI CryptDuplicateKey(HCRYPTKEY,DWORD*,DWORD,HCRYPTKEY*);
-#endif
-BOOL WINAPI CryptSetKeyParam(HCRYPTKEY,DWORD,PBYTE,DWORD);
-BOOL WINAPI CryptGetKeyParam(HCRYPTKEY,DWORD,PBYTE,PDWORD,DWORD);
-BOOL WINAPI CryptSetHashParam(HCRYPTHASH,DWORD,PBYTE,DWORD);
-BOOL WINAPI CryptGetHashParam(HCRYPTHASH,DWORD,PBYTE,PDWORD,DWORD);
-BOOL WINAPI CryptSetProvParam(HCRYPTPROV,DWORD,PBYTE,DWORD);
-BOOL WINAPI CryptGetProvParam(HCRYPTPROV,DWORD,PBYTE,PDWORD,DWORD);
-BOOL WINAPI CryptGenRandom(HCRYPTPROV,DWORD,PBYTE);
-BOOL WINAPI CryptGetUserKey(HCRYPTPROV,DWORD,HCRYPTKEY*);
-BOOL WINAPI CryptExportKey(HCRYPTKEY,HCRYPTKEY,DWORD,DWORD,PBYTE,PDWORD);
-BOOL WINAPI CryptImportKey(HCRYPTPROV,PBYTE,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*);
-BOOL WINAPI CryptEncrypt(HCRYPTKEY,HCRYPTHASH,BOOL,DWORD,PBYTE,PDWORD,DWORD);
-BOOL WINAPI CryptDecrypt(HCRYPTKEY,HCRYPTHASH,BOOL,DWORD,PBYTE,PDWORD);
-BOOL WINAPI CryptCreateHash(HCRYPTPROV,ALG_ID,HCRYPTKEY,DWORD,HCRYPTHASH*);
-BOOL WINAPI CryptHashData(HCRYPTHASH,PBYTE,DWORD,DWORD);
-BOOL WINAPI CryptHashSessionKey(HCRYPTHASH,HCRYPTKEY,DWORD);
-BOOL WINAPI CryptGetHashValue(HCRYPTHASH,DWORD,PBYTE,PDWORD);
-BOOL WINAPI CryptDestroyHash(HCRYPTHASH);
-BOOL WINAPI CryptSignHashA(HCRYPTHASH,DWORD,LPCSTR,DWORD,PBYTE,PDWORD);
-BOOL WINAPI CryptSignHashW(HCRYPTHASH,DWORD,LPCWSTR,DWORD,PBYTE,PDWORD);
-BOOL WINAPI CryptVerifySignatureA(HCRYPTHASH,PBYTE,DWORD,HCRYPTKEY,LPCSTR,DWORD);
-BOOL WINAPI CryptVerifySignatureW(HCRYPTHASH,PBYTE,DWORD,HCRYPTKEY,LPCWSTR,DWORD);
-BOOL WINAPI CryptSetProviderA(LPCSTR,DWORD);
-BOOL WINAPI CryptSetProviderW(LPCWSTR,DWORD);
-
-#ifdef UNICODE
-#define CertNameToStr CertNameToStrW
-#define CryptAcquireContext CryptAcquireContextW
-#define CryptSignHash CryptSignHashW
-#define CryptVerifySignature CryptVerifySignatureW
-#define CryptSetProvider CryptSetProviderW
-#define CertOpenSystemStore CertOpenSystemStoreW
-#define CERT_FIND_SUBJECT_STR CERT_FIND_SUBJECT_STR_W
-#define CERT_FIND_ISSUER_STR CERT_FIND_ISSUER_STR_W
-#define MS_DEF_PROV MS_DEF_PROV_W
-#define MS_ENHANCED_PROV MS_ENHANCED_PROV_W
-#define MS_STRONG_PROV MS_STRONG_PROV_W
-#define MS_DEF_RSA_SIG_PROV MS_DEF_RSA_SIG_PROV_W
-#define MS_DEF_RSA_SCHANNEL_PROV MS_DEF_RSA_SCHANNEL_PROV_W
-#define MS_DEF_DSS_PROV MS_DEF_DSS_PROV_W
-#define MS_DEF_DSS_DH_PROV MS_DEF_DSS_DH_PROV_W
-#define MS_ENH_DSS_DH_PROV MS_ENH_DSS_DH_PROV_W
-#define MS_DEF_DH_SCHANNEL_PROV MS_DEF_DH_SCHANNEL_PROV_W
-#define MS_SCARD_PROV MS_SCARD_PROV_W
-#else
-#define CertNameToStr CertNameToStrA
-#define CryptAcquireContext CryptAcquireContextA
-#define CryptSignHash CryptSignHashA
-#define CryptVerifySignature CryptVerifySignatureA
-#define CryptSetProvider CryptSetProviderA
-#define CertOpenSystemStore CertOpenSystemStoreA
-#define CERT_FIND_SUBJECT_STR CERT_FIND_SUBJECT_STR_A
-#define CERT_FIND_ISSUER_STR CERT_FIND_ISSUER_STR_A
-#define MS_DEF_PROV MS_DEF_PROV_A
-#define MS_ENHANCED_PROV MS_ENHANCED_PROV_A
-#define MS_STRONG_PROV MS_STRONG_PROV_A
-#define MS_DEF_RSA_SIG_PROV MS_DEF_RSA_SIG_PROV_A
-#define MS_DEF_RSA_SCHANNEL_PROV MS_DEF_RSA_SCHANNEL_PROV_A
-#define MS_DEF_DSS_PROV MS_DEF_DSS_PROV_A
-#define MS_DEF_DSS_DH_PROV MS_DEF_DSS_DH_PROV_A
-#define MS_ENH_DSS_DH_PROV MS_ENH_DSS_DH_PROV_A
-#define MS_DEF_DH_SCHANNEL_PROV MS_DEF_DH_SCHANNEL_PROV_A
-#define MS_SCARD_PROV MS_SCARD_PROV_A
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif /* _WINCRYPT_H */
diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h
deleted file mode 100644
index ffc09debf..000000000
--- a/winsup/w32api/include/windef.h
+++ /dev/null
@@ -1,331 +0,0 @@
-#ifndef _WINDEF_H
-#define _WINDEF_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0400
-/*
- * If you need Win32 API features newer the Win95 and WinNT then you must
- * define WINVER before including windows.h or any other method of including
- * the windef.h header.
- */
-#endif
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT WINVER
-/*
- * There may be the need to define _WIN32_WINNT to a value different from
- * the value of WINVER.  I don't have any example of why you would do that.
- * However, if you must then define _WIN32_WINNT to the value required before
- * including windows.h or any other method of including the windef.h header.
- */
-#endif
-#ifndef WIN32
-#define WIN32
-#endif
-#ifndef _WIN32
-#define _WIN32
-#endif
-#define FAR
-#define far
-#define NEAR
-#define near
-#ifndef CONST
-#define CONST const
-#endif
-#undef MAX_PATH
-#define MAX_PATH 260
-
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void*)0)
-#endif
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-#define IN
-#define OUT
-#ifndef OPTIONAL
-#define OPTIONAL
-#endif
-
-#ifdef __GNUC__
-#define PACKED __attribute__((packed))
-#ifndef _fastcall
-#define _fastcall __attribute__((fastcall))
-#endif
-#ifndef __fastcall
-#define __fastcall __attribute__((fastcall))
-#endif
-#ifndef _stdcall
-#define _stdcall __attribute__((stdcall))
-#endif
-#ifndef __stdcall
-#define __stdcall __attribute__((stdcall))
-#endif
-#ifndef _cdecl
-#define _cdecl __attribute__((cdecl))
-#endif
-#ifndef __cdecl
-#define __cdecl __attribute__((cdecl))
-#endif
-#ifndef __declspec
-#define __declspec(e) __attribute__((e))
-#endif
-#ifndef _declspec
-#define _declspec(e) __attribute__((e))
-#endif
-#elif defined(__WATCOMC__)
-#define PACKED
-#else
-#define PACKED
-#define _cdecl
-#define __cdecl
-#endif
-
-#undef pascal
-#undef _pascal
-#undef __pascal
-#define pascal __stdcall
-#define _pascal __stdcall
-#define __pascal __stdcall
-#define PASCAL _pascal
-#define CDECL _cdecl
-#define STDCALL __stdcall
-#define FASTCALL __fastcall
-#define WINAPI __stdcall
-#define WINAPIV __cdecl
-#define APIENTRY __stdcall
-#define CALLBACK __stdcall
-#define APIPRIVATE __stdcall
-
-#define DECLSPEC_IMPORT __declspec(dllimport)
-#define DECLSPEC_EXPORT __declspec(dllexport)
-#ifdef __GNUC__
-#define DECLSPEC_NORETURN __declspec(noreturn)
-#define DECLARE_STDCALL_P( type ) __stdcall type
-#elif defined(__WATCOMC__)
-#define DECLSPEC_NORETURN
-#define DECLARE_STDCALL_P( type ) type __stdcall
-#endif /* __GNUC__/__WATCOMC__ */
-#define MAKEWORD(a,b)	((WORD)(((BYTE)(a))|(((WORD)((BYTE)(b)))<<8)))
-#define MAKELONG(a,b)	((LONG)(((WORD)(a))|(((DWORD)((WORD)(b)))<<16)))
-#define LOWORD(l)	((WORD)((DWORD)(l)))
-#define HIWORD(l)	((WORD)(((DWORD)(l)>>16)&0xFFFF))
-#define LOBYTE(w)	((BYTE)(w))
-#define HIBYTE(w)	((BYTE)(((WORD)(w)>>8)&0xFF))
-
-#ifndef __WATCOMC__
-#ifndef _export
-#define _export
-#endif
-#ifndef __export
-#define __export
-#endif
-#endif
-
-#ifndef NOMINMAX
-#ifndef max
-#define max(a,b) ((a)>(b)?(a):(b))
-#endif
-#ifndef min
-#define min(a,b) ((a)<(b)?(a):(b))
-#endif
-#endif
-
-#define UNREFERENCED_PARAMETER(P) {(P)=(P);}
-#define UNREFERENCED_LOCAL_VARIABLE(L) {(L)=(L);}
-#define DBG_UNREFERENCED_PARAMETER(P)
-#define DBG_UNREFERENCED_LOCAL_VARIABLE(L)
-
-#ifdef __GNUC__
-#ifndef NONAMELESSUNION
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) 
-#define _ANONYMOUS_UNION __extension__
-#define _ANONYMOUS_STRUCT __extension__
-#else
-#if defined(__cplusplus)
-#define _ANONYMOUS_UNION __extension__
-#endif /* __cplusplus */
-#endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */
-#endif /* NONAMELESSUNION */
-#elif defined(__WATCOMC__)
-#define _ANONYMOUS_UNION
-#define _ANONYMOUS_STRUCT
-#endif /* __GNUC__/__WATCOMC__ */
-
-#ifndef _ANONYMOUS_UNION
-#define _ANONYMOUS_UNION
-#define _UNION_NAME(x) x
-#define DUMMYUNIONNAME	u
-#define DUMMYUNIONNAME2	u2
-#define DUMMYUNIONNAME3	u3
-#define DUMMYUNIONNAME4	u4
-#define DUMMYUNIONNAME5	u5
-#define DUMMYUNIONNAME6	u6
-#define DUMMYUNIONNAME7	u7
-#define DUMMYUNIONNAME8	u8
-#else
-#define _UNION_NAME(x)
-#define DUMMYUNIONNAME
-#define DUMMYUNIONNAME2
-#define DUMMYUNIONNAME3
-#define DUMMYUNIONNAME4
-#define DUMMYUNIONNAME5
-#define DUMMYUNIONNAME6
-#define DUMMYUNIONNAME7
-#define DUMMYUNIONNAME8
-#endif
-#ifndef _ANONYMOUS_STRUCT
-#define _ANONYMOUS_STRUCT
-#define _STRUCT_NAME(x) x
-#define DUMMYSTRUCTNAME	s
-#define DUMMYSTRUCTNAME2 s2
-#define DUMMYSTRUCTNAME3 s3
-#else
-#define _STRUCT_NAME(x)
-#define DUMMYSTRUCTNAME
-#define DUMMYSTRUCTNAME2
-#define DUMMYSTRUCTNAME3
-#endif
-
-#ifndef NO_STRICT
-#ifndef STRICT
-#define STRICT 1
-#endif
-#endif
-
-/* FIXME: This will make some code compile. The programs will most
-   likely crash when an exception is raised, but at least they will
-   compile. */
-#if defined (__GNUC__) && defined (__SEH_NOOP)
-#define __try
-#define __except(x) if (0) /* don't execute handler */
-#define __finally
-
-#define _try __try
-#define _except __except
-#define _finally __finally
-#endif
-
-typedef unsigned long DWORD;
-typedef int WINBOOL,*PWINBOOL,*LPWINBOOL;
-/* FIXME: Is there a good solution to this? */
-#ifndef XFree86Server
-#ifndef __OBJC__
-typedef WINBOOL BOOL;
-#else
-#define BOOL WINBOOL
-#endif
-typedef unsigned char BYTE;
-#endif /* ndef XFree86Server */
-typedef BOOL *PBOOL,*LPBOOL;
-typedef unsigned short WORD;
-typedef float FLOAT;
-typedef FLOAT *PFLOAT;
-typedef BYTE *PBYTE,*LPBYTE;
-typedef int *PINT,*LPINT;
-typedef WORD *PWORD,*LPWORD;
-typedef long *LPLONG;
-typedef DWORD *PDWORD,*LPDWORD;
-typedef CONST void *PCVOID,*LPCVOID;
-typedef int INT;
-typedef unsigned int UINT,*PUINT,*LPUINT;
-
-#include <winnt.h>
-
-typedef UINT_PTR WPARAM;
-typedef LONG_PTR LPARAM;
-typedef LONG_PTR LRESULT;
-#ifndef _HRESULT_DEFINED
-typedef LONG HRESULT;
-#define _HRESULT_DEFINED
-#endif
-#ifndef XFree86Server
-typedef WORD ATOM;
-#endif /* XFree86Server */
-typedef HANDLE HGLOBAL;
-typedef HANDLE HLOCAL;
-typedef HANDLE GLOBALHANDLE;
-typedef HANDLE LOCALHANDLE;
-typedef void *HGDIOBJ;
-DECLARE_HANDLE(HACCEL);
-DECLARE_HANDLE(HBITMAP);
-DECLARE_HANDLE(HBRUSH);
-DECLARE_HANDLE(HCOLORSPACE);
-DECLARE_HANDLE(HDC);
-DECLARE_HANDLE(HGLRC);
-DECLARE_HANDLE(HDESK);
-DECLARE_HANDLE(HENHMETAFILE);
-DECLARE_HANDLE(HFONT);
-DECLARE_HANDLE(HICON);
-DECLARE_HANDLE(HKEY);
-/* FIXME: How to handle these. SM_CMONITORS etc in winuser.h also. */
-/* #if (WINVER >= 0x0500) */
-DECLARE_HANDLE(HMONITOR);
-#define HMONITOR_DECLARED 1
-DECLARE_HANDLE(HTERMINAL);
-DECLARE_HANDLE(HWINEVENTHOOK);
-/* #endif */
-typedef HKEY *PHKEY;
-DECLARE_HANDLE(HMENU);
-DECLARE_HANDLE(HMETAFILE);
-DECLARE_HANDLE(HINSTANCE);
-typedef HINSTANCE HMODULE;
-DECLARE_HANDLE(HPALETTE);
-DECLARE_HANDLE(HPEN);
-DECLARE_HANDLE(HRGN);
-DECLARE_HANDLE(HRSRC);
-DECLARE_HANDLE(HSTR);
-DECLARE_HANDLE(HTASK);
-DECLARE_HANDLE(HWND);
-DECLARE_HANDLE(HWINSTA);
-DECLARE_HANDLE(HKL);
-typedef int HFILE;
-typedef HICON HCURSOR;
-typedef DWORD COLORREF;
-typedef int (WINAPI *FARPROC)();
-typedef int (WINAPI *NEARPROC)();
-typedef int (WINAPI *PROC)();
-typedef struct tagRECT {
-	LONG left;
-	LONG top;
-	LONG right;
-	LONG bottom;
-} RECT,*PRECT,*LPRECT;
-typedef const RECT *LPCRECT;
-typedef struct tagRECTL {
-	LONG left;
-	LONG top;
-	LONG right;
-	LONG bottom;
-} RECTL,*PRECTL,*LPRECTL;
-typedef const RECTL *LPCRECTL;
-typedef struct tagPOINT {
-	LONG x;
-	LONG y;
-} POINT,POINTL,*PPOINT,*LPPOINT,*PPOINTL,*LPPOINTL;
-typedef struct tagSIZE {
-	LONG cx;
-	LONG cy;
-} SIZE,SIZEL,*PSIZE,*LPSIZE,*PSIZEL,*LPSIZEL;
-typedef struct tagPOINTS {
-	SHORT x;
-	SHORT y;
-} POINTS,*PPOINTS,*LPPOINTS;
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/windows.h b/winsup/w32api/include/windows.h
deleted file mode 100644
index dde83a316..000000000
--- a/winsup/w32api/include/windows.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-	windows.h - main header file for the Win32 API
-
-	Written by Anders Norlander <anorland@hem2.passagen.se>
-
-	This file is part of a free library for the Win32 API.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-*/
-#ifndef _WINDOWS_H
-#define _WINDOWS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-/* translate GCC target defines to MS equivalents. Keep this synchronized
-   with winnt.h. */
-#if defined(__i686__) && !defined(_M_IX86)
-#define _M_IX86 600
-#elif defined(__i586__) && !defined(_M_IX86)
-#define _M_IX86 500
-#elif defined(__i486__) && !defined(_M_IX86)
-#define _M_IX86 400
-#elif defined(__i386__) && !defined(_M_IX86)
-#define _M_IX86 300
-#endif
-#if defined(_M_IX86) && !defined(_X86_)
-#define _X86_
-#elif defined(_M_ALPHA) && !defined(_ALPHA_)
-#define _ALPHA_
-#elif defined(_M_PPC) && !defined(_PPC_)
-#define _PPC_
-#elif defined(_M_MRX000) && !defined(_MIPS_)
-#define _MIPS_
-#elif defined(_M_M68K) && !defined(_68K_)
-#define _68K_
-#endif
-
-#ifdef RC_INVOKED
-/* winresrc.h includes the necessary headers */
-#include <winresrc.h>
-#else
-
-#include <stdarg.h>
-#include <windef.h>
-#include <wincon.h>
-#include <winbase.h>
-#if !(defined NOGDI || defined  _WINGDI_H)
-#include <wingdi.h>
-#endif
-#ifndef _WINUSER_H
-#include <winuser.h>
-#endif
-#ifndef _WINNLS_H
-#include <winnls.h>
-#endif
-#ifndef _WINVER_H
-#include <winver.h>
-#endif
-#ifndef _WINNETWK_H
-#include <winnetwk.h>
-#endif
-#ifndef _WINREG_H
-#include <winreg.h>
-#endif
-#ifndef _WINSVC_H
-#include <winsvc.h>
-#endif
-
-#ifndef WIN32_LEAN_AND_MEAN
-#include <cderr.h>
-#include <dde.h>
-#include <ddeml.h>
-#include <dlgs.h>
-#include <imm.h>
-#include <lzexpand.h>
-#include <mmsystem.h>
-#include <nb30.h>
-#include <rpc.h>
-#include <shellapi.h>
-#include <winperf.h>
-#ifndef NOGDI
-#include <commdlg.h>
-#include <winspool.h>
-#endif
-#if defined(Win32_Winsock)
-#warning "The  Win32_Winsock macro name is deprecated.\
-    Please use __USE_W32_SOCKETS instead"
-#ifndef __USE_W32_SOCKETS
-#define __USE_W32_SOCKETS
-#endif
-#endif
-#if defined(__USE_W32_SOCKETS) || !(defined(__CYGWIN__) || defined(__MSYS__) || defined(_UWIN))
-#if (_WIN32_WINNT >= 0x0400)
-#include <winsock2.h>
-/*
- * MS likes to include mswsock.h here as well,
- * but that can cause undefined symbols if
- * winsock2.h is included before windows.h
- */
-#else
-#include <winsock.h>
-#endif /*  (_WIN32_WINNT >= 0x0400) */
-#endif
-#ifndef NOGDI
-#if !defined (__OBJC__)
-#if (__GNUC__ >= 3) || defined (__WATCOMC__)
-#include <ole2.h>
-#endif
-#endif /* __OBJC__ */
-#endif
-
-#endif /* WIN32_LEAN_AND_MEAN */
-
-#endif /* RC_INVOKED */
-
-#ifdef __OBJC__
-/* FIXME: Not undefining BOOL here causes all BOOLs to be WINBOOL (int),
-   but undefining it causes trouble as well if a file is included after
-   windows.h
-*/
-#undef BOOL
-#endif
-
-#endif
diff --git a/winsup/w32api/include/windowsx.h b/winsup/w32api/include/windowsx.h
deleted file mode 100644
index 460718e64..000000000
--- a/winsup/w32api/include/windowsx.h
+++ /dev/null
@@ -1,544 +0,0 @@
-#ifndef _WINDOWSX_H
-#define _WINDOWSX_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define WM_CTLCOLOR 25
-#define Button_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable))
-#define Button_GetCheck(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),BM_GETCHECK,0,0))
-#define Button_GetState(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),BM_GETSTATE,0,0))
-#define Button_GetText(hwndCtl,lpch,cchMax) GetWindowText((hwndCtl),(lpch),(cchMax))
-#define Button_GetTextLength(hwndCtl) GetWindowTextLength(hwndCtl)
-#define Button_SetCheck(hwndCtl,check) ((void)SendMessage((hwndCtl),BM_SETCHECK,(WPARAM)(int)(check),0))
-#define Button_SetState(hwndCtl,state) ((UINT)(DWORD)SendMessage((hwndCtl),BM_SETSTATE,(WPARAM)(int)(state),0))
-#define Button_SetStyle(hwndCtl,style,fRedraw) ((void)SendMessage((hwndCtl),BM_SETSTYLE,(WPARAM)LOWORD(style),MAKELPARAM(((fRedraw) ? TRUE : FALSE),0)))
-#define Button_SetText(hwndCtl,lpsz) SetWindowText((hwndCtl),(lpsz))
-#define CheckDefDlgRecursion(pfRecursion) if (*(pfRecursion)) {*(pfRecursion) = FALSE; return FALSE; }
-#define ComboBox_AddItemData(hwndCtl,data) ((int)(DWORD)SendMessage((hwndCtl),CB_ADDSTRING,0,(LPARAM)(data)))
-#define ComboBox_AddString(hwndCtl,lpsz) ((int)(DWORD)SendMessage((hwndCtl),CB_ADDSTRING,0,(LPARAM)(LPCTSTR)(lpsz)))
-#define ComboBox_DeleteString(hwndCtl,index) ((int)(DWORD)SendMessage((hwndCtl),CB_DELETESTRING,(WPARAM)(int)(index),0))
-#define ComboBox_Dir(hwndCtl,attrs,lpszFileSpec) ((int)(DWORD)SendMessage((hwndCtl),CB_DIR,(WPARAM)(UINT)(attrs),(LPARAM)(LPCTSTR)(lpszFileSpec)))
-#define ComboBox_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable))
-#define ComboBox_FindItemData(hwndCtl,indexStart,data) ((int)(DWORD)SendMessage((hwndCtl),CB_FINDSTRING,(WPARAM)(int)(indexStart),(LPARAM)(data)))
-#define ComboBox_FindString(hwndCtl,indexStart,lpszFind) ((int)(DWORD)SendMessage((hwndCtl),CB_FINDSTRING,(WPARAM)(int)(indexStart),(LPARAM)(LPCTSTR)(lpszFind)))
-#define ComboBox_FindStringExact(hwndCtl,indexStart,lpszFind) ((int)(DWORD)SendMessage((hwndCtl),CB_FINDSTRINGEXACT,(WPARAM)(int)(indexStart),(LPARAM)(LPCTSTR)(lpszFind)))
-#define ComboBox_GetCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),CB_GETCOUNT,0,0))
-#define ComboBox_GetCurSel(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),CB_GETCURSEL,0,0))
-#define ComboBox_GetDroppedControlRect(hwndCtl,lprc) ((void)SendMessage((hwndCtl),CB_GETDROPPEDCONTROLRECT,0,(LPARAM)(RECT*)(lprc)))
-#define ComboBox_GetDroppedState(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl),CB_GETDROPPEDSTATE,0,0))
-#define ComboBox_GetEditSel(hwndCtl) ((DWORD)SendMessage((hwndCtl),CB_GETEDITSEL,0,0))
-#define ComboBox_GetExtendedUI(hwndCtl) ((UINT)(DWORD)SendMessage((hwndCtl),CB_GETEXTENDEDUI,0,0))
-#define ComboBox_GetItemData(hwndCtl,index) ((LRESULT)(DWORD)SendMessage((hwndCtl),CB_GETITEMDATA,(WPARAM)(int)(index),0))
-#define ComboBox_GetItemHeight(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),CB_GETITEMHEIGHT,0,0))
-#define ComboBox_GetLBText(hwndCtl,index,lpszBuffer) ((int)(DWORD)SendMessage((hwndCtl),CB_GETLBTEXT,(WPARAM)(int)(index),(LPARAM)(LPCTSTR)(lpszBuffer)))
-#define ComboBox_GetLBTextLen(hwndCtl,index) ((int)(DWORD)SendMessage((hwndCtl),CB_GETLBTEXTLEN,(WPARAM)(int)(index),0))
-#define ComboBox_GetText(hwndCtl,lpch,cchMax) GetWindowText((hwndCtl),(lpch),(cchMax))
-#define ComboBox_GetTextLength(hwndCtl) GetWindowTextLength(hwndCtl)
-#define ComboBox_InsertItemData(hwndCtl,index,data) ((int)(DWORD)SendMessage((hwndCtl),CB_INSERTSTRING,(WPARAM)(int)(index),(LPARAM)(data)))
-#define ComboBox_InsertString(hwndCtl,index,lpsz) ((int)(DWORD)SendMessage((hwndCtl),CB_INSERTSTRING,(WPARAM)(int)(index),(LPARAM)(LPCTSTR)(lpsz)))
-#define ComboBox_LimitText(hwndCtl,cchLimit) ((int)(DWORD)SendMessage((hwndCtl),CB_LIMITTEXT,(WPARAM)(int)(cchLimit),0))
-#define ComboBox_ResetContent(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),CB_RESETCONTENT,0,0))
-#define ComboBox_SelectItemData(hwndCtl,indexStart,data) ((int)(DWORD)SendMessage((hwndCtl),CB_SELECTSTRING,(WPARAM)(int)(indexStart),(LPARAM)(data)))
-#define ComboBox_SelectString(hwndCtl,indexStart,lpszSelect) ((int)(DWORD)SendMessage((hwndCtl),CB_SELECTSTRING,(WPARAM)(int)(indexStart),(LPARAM)(LPCTSTR)(lpszSelect)))
-#define ComboBox_SetCurSel(hwndCtl,index) ((int)(DWORD)SendMessage((hwndCtl),CB_SETCURSEL,(WPARAM)(int)(index),0))
-#define ComboBox_SetEditSel(hwndCtl,ichStart,ichEnd) ((int)(DWORD)SendMessage((hwndCtl),CB_SETEDITSEL,0,MAKELPARAM((ichStart),(ichEnd))))
-#define ComboBox_SetExtendedUI(hwndCtl,flags) ((int)(DWORD)SendMessage((hwndCtl),CB_SETEXTENDEDUI,(WPARAM)(UINT)(flags),0))
-#define ComboBox_SetItemData(hwndCtl,index,data) ((int)(DWORD)SendMessage((hwndCtl),CB_SETITEMDATA,(WPARAM)(int)(index),(LPARAM)(data)))
-#define ComboBox_SetItemHeight(hwndCtl,index,cyItem) ((int)(DWORD)SendMessage((hwndCtl),CB_SETITEMHEIGHT,(WPARAM)(int)(index),(LPARAM)(int)cyItem))
-#define ComboBox_SetText(hwndCtl,lpsz) SetWindowText((hwndCtl),(lpsz))
-#define ComboBox_ShowDropdown(hwndCtl,fShow) ((BOOL)(DWORD)SendMessage((hwndCtl),CB_SHOWDROPDOWN,(WPARAM)(BOOL)(fShow),0))
-#define CopyRgn(hrgnDst,hrgnSrc) CombineRgn(hrgnDst,hrgnSrc,0,RGN_COPY)
-#define DECLARE_HANDLE32 DECLARE_HANDLE
-#define DefDlgProcEx(hwnd,msg,wParam,lParam,pfRecursion) (*(pfRecursion) = TRUE,DefDlgProc(hwnd,msg,wParam,lParam))
-#define DeleteBitmap(hbm) DeleteObject((HGDIOBJ)(HBITMAP)(hbm))
-#define DeleteBrush(hbr) DeleteObject((HGDIOBJ)(HBRUSH)(hbr))
-#define DeleteFont(hfont) DeleteObject((HGDIOBJ)(HFONT)(hfont))
-#define DeletePalette(hpal) DeleteObject((HGDIOBJ)(HPALETTE)(hpal))
-#define DeletePen(hpen) DeleteObject((HGDIOBJ)(HPEN)(hpen))
-#define DeleteRgn(hrgn) DeleteObject((HGDIOBJ)(HRGN)(hrgn))
-#define Edit_CanUndo(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl),EM_CANUNDO,0,0))
-#define Edit_EmptyUndoBuffer(hwndCtl) ((void)SendMessage((hwndCtl),EM_EMPTYUNDOBUFFER,0,0))
-#define Edit_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable))
-#define Edit_FmtLines(hwndCtl,fAddEOL) ((BOOL)(DWORD)SendMessage((hwndCtl),EM_FMTLINES,(WPARAM)(BOOL)(fAddEOL),0))
-#define Edit_GetFirstVisibleLine(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),EM_GETFIRSTVISIBLELINE,0,0))
-#define Edit_GetHandle(hwndCtl) ((HLOCAL)(UINT)(DWORD)SendMessage((hwndCtl),EM_GETHANDLE,0,0))
-#define Edit_GetLine(hwndCtl,line,lpch,cchMax) ((*((int*)(lpch)) = (cchMax)),((int)(DWORD)SendMessage((hwndCtl),EM_GETLINE,(WPARAM)(int)(line),(LPARAM)(LPTSTR)(lpch))))
-#define Edit_GetLineCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),EM_GETLINECOUNT,0,0))
-#define Edit_GetModify(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl),EM_GETMODIFY,0,0))
-#define Edit_GetPasswordChar(hwndCtl) ((TCHAR)(DWORD)SendMessage((hwndCtl),EM_GETPASSWORDCHAR,0,0))
-#define Edit_GetRect(hwndCtl,lprc) ((void)SendMessage((hwndCtl),EM_GETRECT,0,(LPARAM)(RECT*)(lprc)))
-#define Edit_GetSel(hwndCtl) ((DWORD)SendMessage((hwndCtl),EM_GETSEL,0,0))
-#define Edit_GetText(hwndCtl,lpch,cchMax) GetWindowText((hwndCtl),(lpch),(cchMax))
-#define Edit_GetTextLength(hwndCtl) GetWindowTextLength(hwndCtl)
-#define Edit_GetWordBreakProc(hwndCtl) ((EDITWORDBREAKPROC)SendMessage((hwndCtl),EM_GETWORDBREAKPROC,0,0))
-#define Edit_LimitText(hwndCtl,cchMax) ((void)SendMessage((hwndCtl),EM_LIMITTEXT,(WPARAM)(cchMax),0))
-#define Edit_LineFromChar(hwndCtl,ich) ((int)(DWORD)SendMessage((hwndCtl),EM_LINEFROMCHAR,(WPARAM)(int)(ich),0))
-#define Edit_LineIndex(hwndCtl,line) ((int)(DWORD)SendMessage((hwndCtl),EM_LINEINDEX,(WPARAM)(int)(line),0))
-#define Edit_LineLength(hwndCtl,line) ((int)(DWORD)SendMessage((hwndCtl),EM_LINELENGTH,(WPARAM)(int)(line),0))
-#define Edit_ReplaceSel(hwndCtl,lpszReplace) ((void)SendMessage((hwndCtl),EM_REPLACESEL,0,(LPARAM)(LPCTSTR)(lpszReplace)))
-#define Edit_Scroll(hwndCtl,dv,dh) ((void)SendMessage((hwndCtl),EM_LINESCROLL,(WPARAM)(dh),(LPARAM)(dv)))
-#define Edit_ScrollCaret(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl),EM_SCROLLCARET,0,0))
-#define Edit_SetHandle(hwndCtl,h) ((void)SendMessage((hwndCtl),EM_SETHANDLE,(WPARAM)(UINT)(HLOCAL)(h),0))
-#define Edit_SetModify(hwndCtl,fModified) ((void)SendMessage((hwndCtl),EM_SETMODIFY,(WPARAM)(UINT)(fModified),0))
-#define Edit_SetPasswordChar(hwndCtl,ch) ((void)SendMessage((hwndCtl),EM_SETPASSWORDCHAR,(WPARAM)(UINT)(ch),0))
-#define Edit_SetReadOnly(hwndCtl,fReadOnly) ((BOOL)(DWORD)SendMessage((hwndCtl),EM_SETREADONLY,(WPARAM)(BOOL)(fReadOnly),0))
-#define Edit_SetRect(hwndCtl,lprc) ((void)SendMessage((hwndCtl),EM_SETRECT,0,(LPARAM)(const RECT*)(lprc)))
-#define Edit_SetRectNoPaint(hwndCtl,lprc) ((void)SendMessage((hwndCtl),EM_SETRECTNP,0,(LPARAM)(const RECT*)(lprc)))
-#define Edit_SetSel(hwndCtl,ichStart,ichEnd) ((void)SendMessage((hwndCtl),EM_SETSEL,(ichStart),(ichEnd)))
-#define Edit_SetTabStops(hwndCtl,cTabs,lpTabs) ((void)SendMessage((hwndCtl),EM_SETTABSTOPS,(WPARAM)(int)(cTabs),(LPARAM)(const int*)(lpTabs)))
-#define Edit_SetText(hwndCtl,lpsz) SetWindowText((hwndCtl),(lpsz))
-#define Edit_SetWordBreakProc(hwndCtl,lpfnWordBreak) ((void)SendMessage((hwndCtl),EM_SETWORDBREAKPROC,0,(LPARAM)(EDITWORDBREAKPROC)(lpfnWordBreak)))
-#define Edit_Undo(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl),EM_UNDO,0,0))
-#define FORWARD_WM_ACTIVATE(hwnd,state,hwndActDeact,fMinimized,fn) (void)(fn)((hwnd),WM_ACTIVATE,MAKEWPARAM((state),(fMinimized)),(LPARAM)(HWND)(hwndActDeact))
-#define FORWARD_WM_ACTIVATEAPP(hwnd,fActivate,dwThreadId,fn) (void)(fn)((hwnd),WM_ACTIVATEAPP,(WPARAM)(BOOL)(fActivate),(LPARAM)(dwThreadId))
-#define FORWARD_WM_ASKCBFORMATNAME(hwnd,cchMax,rgchName,fn) (void)(fn)((hwnd),WM_ASKCBFORMATNAME,(WPARAM)(int)(cchMax),(LPARAM)(rgchName))
-#define FORWARD_WM_CANCELMODE(hwnd,fn) (void)(fn)((hwnd),WM_CANCELMODE,0,0)
-#define FORWARD_WM_CHANGECBCHAIN(hwnd,hwndRemove,hwndNext,fn) (void)(fn)((hwnd),WM_CHANGECBCHAIN,(WPARAM)(HWND)(hwndRemove),(LPARAM)(HWND)(hwndNext))
-#define FORWARD_WM_CHAR(hwnd,ch,cRepeat,fn) (void)(fn)((hwnd),WM_CHAR,(WPARAM)(TCHAR)(ch),MAKELPARAM((cRepeat),0))
-#define FORWARD_WM_CHARTOITEM(hwnd,ch,hwndListBox,iCaret,fn) (int)(DWORD)(fn)((hwnd),WM_CHARTOITEM,MAKEWPARAM((UINT)(iCaret),(UINT)(ch)),(LPARAM)(hwndListBox))
-#define FORWARD_WM_CHILDACTIVATE(hwnd,fn) (void)(fn)((hwnd),WM_CHILDACTIVATE,0,0)
-#define FORWARD_WM_CLEAR(hwnd,fn) (void)(fn)((hwnd),WM_CLEAR,0,0)
-#define FORWARD_WM_CLOSE(hwnd,fn) (void)(fn)((hwnd),WM_CLOSE,0,0)
-#define FORWARD_WM_COMMAND(hwnd,id,hwndCtl,codeNotify,fn) (void)(fn)((hwnd),WM_COMMAND,MAKEWPARAM((UINT)(id),(UINT)(codeNotify)),(LPARAM)(HWND)(hwndCtl))
-#define FORWARD_WM_COMMNOTIFY(hwnd,cid,flags,fn) (void)(fn)((hwnd),WM_COMMNOTIFY,(WPARAM)(cid),MAKELPARAM((flags),0))
-#define FORWARD_WM_COMPACTING(hwnd,compactRatio,fn) (void)(fn)((hwnd),WM_COMPACTING,(WPARAM)(UINT)(compactRatio),0)
-#define FORWARD_WM_COMPAREITEM(hwnd,lpCompareItem,fn) (int)(DWORD)(fn)((hwnd),WM_COMPAREITEM,(WPARAM)(((const COMPAREITEMSTRUCT*)(lpCompareItem))->CtlID),(LPARAM)(const COMPAREITEMSTRUCT*)(lpCompareItem))
-#define FORWARD_WM_COPY(hwnd,fn) (void)(fn)((hwnd),WM_COPY,0,0)
-#define FORWARD_WM_CREATE(hwnd,lpCreateStruct,fn) (BOOL)(DWORD)(fn)((hwnd),WM_CREATE,0,(LPARAM)(LPCREATESTRUCT)(lpCreateStruct))
-#define FORWARD_WM_CTLCOLORBTN(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORBTN,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild))
-#define FORWARD_WM_CTLCOLORDLG(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORDLG,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild))
-#define FORWARD_WM_CTLCOLOREDIT(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLOREDIT,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild))
-#define FORWARD_WM_CTLCOLORLISTBOX(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORLISTBOX,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild))
-#define FORWARD_WM_CTLCOLORMSGBOX(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORMSGBOX,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild))
-#define FORWARD_WM_CTLCOLORSCROLLBAR(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORSCROLLBAR,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild))
-#define FORWARD_WM_CTLCOLORSTATIC(hwnd,hdc,hwndChild,fn) (HBRUSH)(UINT)(DWORD)(fn)((hwnd),WM_CTLCOLORSTATIC,(WPARAM)(HDC)(hdc),(LPARAM)(HWND)(hwndChild))
-#define FORWARD_WM_CUT(hwnd,fn) (void)(fn)((hwnd),WM_CUT,0,0)
-#define FORWARD_WM_DEADCHAR(hwnd,ch,cRepeat,fn) (void)(fn)((hwnd),WM_DEADCHAR,(WPARAM)(TCHAR)(ch),MAKELPARAM((cRepeat),0))
-#define FORWARD_WM_DELETEITEM(hwnd,lpDeleteItem,fn) (void)(fn)((hwnd),WM_DELETEITEM,(WPARAM)(((const DELETEITEMSTRUCT*)(lpDeleteItem))->CtlID),(LPARAM)(const DELETEITEMSTRUCT*)(lpDeleteItem))
-#define FORWARD_WM_DESTROY(hwnd,fn) (void)(fn)((hwnd),WM_DESTROY,0,0)
-#define FORWARD_WM_DESTROYCLIPBOARD(hwnd,fn) (void)(fn)((hwnd),WM_DESTROYCLIPBOARD,0,0)
-#define FORWARD_WM_DEVMODECHANGE(hwnd,lpszDeviceName,fn) (void)(fn)((hwnd),WM_DEVMODECHANGE,0,(LPARAM)(LPCTSTR)(lpszDeviceName))
-#define FORWARD_WM_DRAWCLIPBOARD(hwnd,fn) (void)(fn)((hwnd),WM_DRAWCLIPBOARD,0,0)
-#define FORWARD_WM_DRAWITEM(hwnd,lpDrawItem,fn) (void)(fn)((hwnd),WM_DRAWITEM,(WPARAM)(((const DRAWITEMSTRUCT*)lpDrawItem)->CtlID),(LPARAM)(const DRAWITEMSTRUCT*)(lpDrawItem))
-#define FORWARD_WM_DROPFILES(hwnd,hdrop,fn) (void)(fn)((hwnd),WM_DROPFILES,(WPARAM)(HDROP)(hdrop),0)
-#define FORWARD_WM_ENABLE(hwnd,fEnable,fn) (void)(fn)((hwnd),WM_ENABLE,(WPARAM)(BOOL)(fEnable),0)
-#define FORWARD_WM_ENDSESSION(hwnd,fEnding,fn) (void)(fn)((hwnd),WM_ENDSESSION,(WPARAM)(BOOL)(fEnding),0)
-#define FORWARD_WM_ENTERIDLE(hwnd,source,hwndSource,fn) (void)(fn)((hwnd),WM_ENTERIDLE,(WPARAM)(UINT)(source),(LPARAM)(HWND)(hwndSource))
-#define FORWARD_WM_ERASEBKGND(hwnd,hdc,fn) (BOOL)(DWORD)(fn)((hwnd),WM_ERASEBKGND,(WPARAM)(HDC)(hdc),0)
-#define FORWARD_WM_FONTCHANGE(hwnd,fn) (void)(fn)((hwnd),WM_FONTCHANGE,0,0)
-#define FORWARD_WM_GETDLGCODE(hwnd,lpmsg,fn) (UINT)(DWORD)(fn)((hwnd),WM_GETDLGCODE,(lpmsg ? lpmsg->wParam : 0),(LPARAM)(LPMSG)(lpmsg))
-#define FORWARD_WM_GETFONT(hwnd,fn) (HFONT)(UINT)(DWORD)(fn)((hwnd),WM_GETFONT,0,0)
-#define FORWARD_WM_GETMINMAXINFO(hwnd,lpMinMaxInfo,fn) (void)(fn)((hwnd),WM_GETMINMAXINFO,0,(LPARAM)(LPMINMAXINFO)(lpMinMaxInfo))
-#define FORWARD_WM_GETTEXT(hwnd,cchTextMax,lpszText,fn) (int)(DWORD)(fn)((hwnd),WM_GETTEXT,(WPARAM)(int)(cchTextMax),(LPARAM)(LPTSTR)(lpszText))
-#define FORWARD_WM_GETTEXTLENGTH(hwnd,fn) (int)(DWORD)(fn)((hwnd),WM_GETTEXTLENGTH,0,0)
-#define FORWARD_WM_HSCROLL(hwnd,hwndCtl,code,pos,fn) (void)(fn)((hwnd),WM_HSCROLL,MAKEWPARAM((UINT)(int)(code),(UINT)(int)(pos)),(LPARAM)(UINT)(hwndCtl))
-#define FORWARD_WM_HSCROLLCLIPBOARD(hwnd,hwndCBViewer,code,pos,fn) (void)(fn)((hwnd),WM_HSCROLLCLIPBOARD,(WPARAM)(HWND)(hwndCBViewer),MAKELPARAM((code),(pos)))
-#define FORWARD_WM_ICONERASEBKGND(hwnd,hdc,fn) (BOOL)(DWORD)(fn)((hwnd),WM_ICONERASEBKGND,(WPARAM)(HDC)(hdc),0)
-#define FORWARD_WM_INITDIALOG(hwnd,hwndFocus,lParam,fn) (BOOL)(DWORD)(fn)((hwnd),WM_INITDIALOG,(WPARAM)(HWND)(hwndFocus),(lParam))
-#define FORWARD_WM_INITMENU(hwnd,hMenu,fn) (void)(fn)((hwnd),WM_INITMENU,(WPARAM)(HMENU)(hMenu),0)
-#define FORWARD_WM_INITMENUPOPUP(hwnd,hMenu,item,fSystemMenu,fn) (void)(fn)((hwnd),WM_INITMENUPOPUP,(WPARAM)(HMENU)(hMenu),MAKELPARAM((item),(fSystemMenu)))
-#define FORWARD_WM_KEYDOWN(hwnd,vk,cRepeat,flags,fn) (void)(fn)((hwnd),WM_KEYDOWN,(WPARAM)(UINT)(vk),MAKELPARAM((cRepeat),(flags)))
-#define FORWARD_WM_KEYUP(hwnd,vk,cRepeat,flags,fn) (void)(fn)((hwnd),WM_KEYUP,(WPARAM)(UINT)(vk),MAKELPARAM((cRepeat),(flags)))
-#define FORWARD_WM_KILLFOCUS(hwnd,hwndNewFocus,fn) (void)(fn)((hwnd),WM_KILLFOCUS,(WPARAM)(HWND)(hwndNewFocus),0)
-#define FORWARD_WM_LBUTTONDOWN(hwnd,fDoubleClick,x,y,keyFlags,fn) (void)(fn)((hwnd),(fDoubleClick) ? WM_LBUTTONDBLCLK : WM_LBUTTONDOWN,(WPARAM)(UINT)(keyFlags),MAKELPARAM((x),(y)))
-#define FORWARD_WM_LBUTTONUP(hwnd,x,y,keyFlags,fn) (void)(fn)((hwnd),WM_LBUTTONUP,(WPARAM)(UINT)(keyFlags),MAKELPARAM((x),(y)))
-#define FORWARD_WM_MBUTTONDOWN(hwnd,fDoubleClick,x,y,keyFlags,fn) (void)(fn)((hwnd),(fDoubleClick) ? WM_MBUTTONDBLCLK : WM_MBUTTONDOWN,(WPARAM)(UINT)(keyFlags),MAKELPARAM((x),(y)))
-#define FORWARD_WM_MBUTTONUP(hwnd,x,y,keyFlags,fn) (void)(fn)((hwnd),WM_MBUTTONUP,(WPARAM)(UINT)(keyFlags),MAKELPARAM((x),(y)))
-#define FORWARD_WM_MDIACTIVATE(hwnd,fActive,hwndActivate,hwndDeactivate,fn) (void)(fn)(hwnd,WM_MDIACTIVATE,(WPARAM)(hwndDeactivate),(LPARAM)(hwndActivate))
-#define FORWARD_WM_MDICASCADE(hwnd,cmd,fn) (BOOL)(DWORD)(fn)((hwnd),WM_MDICASCADE,(WPARAM)(cmd),0)
-#define FORWARD_WM_MDICREATE(hwnd,lpmcs,fn) (HWND)(UINT)(DWORD)(fn)((hwnd),WM_MDICREATE,0,(LPARAM)(LPMDICREATESTRUCT)(lpmcs))
-#define FORWARD_WM_MDIDESTROY(hwnd,hwndDestroy,fn) (void)(fn)((hwnd),WM_MDIDESTROY,(WPARAM)(hwndDestroy),0)
-#define FORWARD_WM_MDIGETACTIVE(hwnd,fn) (HWND)(UINT)(DWORD)(fn)((hwnd),WM_MDIGETACTIVE,0,0)
-#define FORWARD_WM_MDIICONARRANGE(hwnd,fn) (void)(fn)((hwnd),WM_MDIICONARRANGE,0,0)
-#define FORWARD_WM_MDIMAXIMIZE(hwnd,hwndMaximize,fn) (void)(fn)((hwnd),WM_MDIMAXIMIZE,(WPARAM)(hwndMaximize),0)
-#define FORWARD_WM_MDINEXT(hwnd,hwndCur,fPrev,fn) (HWND)(UINT)(DWORD)(fn)((hwnd),WM_MDINEXT,(WPARAM)(hwndCur),(LPARAM)(fPrev))
-#define FORWARD_WM_MDIRESTORE(hwnd,hwndRestore,fn) (void)(fn)((hwnd),WM_MDIRESTORE,(WPARAM)(hwndRestore),0)
-#define FORWARD_WM_MDISETMENU(hwnd,fRefresh,hmenuFrame,hmenuWindow,fn) (HMENU)(UINT)(DWORD)(fn)((hwnd),WM_MDISETMENU,(WPARAM)((fRefresh) ? (hmenuFrame) : 0),(LPARAM)(hmenuWindow))
-#define FORWARD_WM_MDITILE(hwnd,cmd,fn) (BOOL)(DWORD)(fn)((hwnd),WM_MDITILE,(WPARAM)(cmd),0)
-#define FORWARD_WM_MEASUREITEM(hwnd,lpMeasureItem,fn) (void)(fn)((hwnd),WM_MEASUREITEM,(WPARAM)(((MEASUREITEMSTRUCT*)lpMeasureItem)->CtlID),(LPARAM)(MEASUREITEMSTRUCT*)(lpMeasureItem))
-#define FORWARD_WM_MENUCHAR(hwnd,ch,flags,hmenu,fn) (DWORD)(fn)((hwnd),WM_MENUCHAR,MAKEWPARAM(flags,(WORD)(ch)),(LPARAM)(HMENU)(hmenu))
-#define FORWARD_WM_MENUSELECT(hwnd,hmenu,item,hmenuPopup,flags,fn) (void)(fn)((hwnd),WM_MENUSELECT,MAKEWPARAM((item),(flags)),(LPARAM)(HMENU)((hmenu) ? (hmenu) : (hmenuPopup)))
-#define FORWARD_WM_MOUSEACTIVATE(hwnd,hwndTopLevel,codeHitTest,msg,fn) (int)(DWORD)(fn)((hwnd),WM_MOUSEACTIVATE,(WPARAM)(HWND)(hwndTopLevel),MAKELPARAM((codeHitTest),(msg)))
-#define FORWARD_WM_MOUSEMOVE(hwnd,x,y,keyFlags,fn) (void)(fn)((hwnd),WM_MOUSEMOVE,(WPARAM)(UINT)(keyFlags),MAKELPARAM((x),(y)))
-#define FORWARD_WM_MOVE(hwnd,x,y,fn) (void)(fn)((hwnd),WM_MOVE,0,MAKELPARAM((x),(y)))
-#define FORWARD_WM_NCACTIVATE(hwnd,fActive,hwndActDeact,fMinimized,fn) (BOOL)(DWORD)(fn)((hwnd),WM_NCACTIVATE,(WPARAM)(BOOL)(fActive),0)
-#define FORWARD_WM_NCCALCSIZE(hwnd,fCalcValidRects,lpcsp,fn) (UINT)(DWORD)(fn)((hwnd),WM_NCCALCSIZE,0,(LPARAM)(NCCALCSIZE_PARAMS*)(lpcsp))
-#define FORWARD_WM_NCCREATE(hwnd,lpCreateStruct,fn) (BOOL)(DWORD)(fn)((hwnd),WM_NCCREATE,0,(LPARAM)(LPCREATESTRUCT)(lpCreateStruct))
-#define FORWARD_WM_NCDESTROY(hwnd,fn) (void)(fn)((hwnd),WM_NCDESTROY,0,0)
-#define FORWARD_WM_NCHITTEST(hwnd,x,y,fn) (UINT)(DWORD)(fn)((hwnd),WM_NCHITTEST,0,MAKELPARAM((x),(y)))
-#define FORWARD_WM_NCLBUTTONDOWN(hwnd,fDoubleClick,x,y,codeHitTest,fn) (void)(fn)((hwnd),(fDoubleClick) ? WM_NCLBUTTONDBLCLK : WM_NCLBUTTONDOWN,(WPARAM)(UINT)(codeHitTest),MAKELPARAM((x),(y)))
-#define FORWARD_WM_NCLBUTTONUP(hwnd,x,y,codeHitTest,fn) (void)(fn)((hwnd),WM_NCLBUTTONUP,(WPARAM)(UINT)(codeHitTest),MAKELPARAM((x),(y)))
-#define FORWARD_WM_NCMBUTTONDOWN(hwnd,fDoubleClick,x,y,codeHitTest,fn) (void)(fn)((hwnd),(fDoubleClick) ? WM_NCMBUTTONDBLCLK : WM_NCMBUTTONDOWN,(WPARAM)(UINT)(codeHitTest),MAKELPARAM((x),(y)) )
-#define FORWARD_WM_NCMBUTTONUP(hwnd,x,y,codeHitTest,fn) (void)(fn)((hwnd),WM_NCMBUTTONUP,(WPARAM)(UINT)(codeHitTest),MAKELPARAM((x),(y)) )
-#define FORWARD_WM_NCMOUSEMOVE(hwnd,x,y,codeHitTest,fn) (void)(fn)((hwnd),WM_NCMOUSEMOVE,(WPARAM)(UINT)(codeHitTest),MAKELPARAM((x),(y)))
-#define FORWARD_WM_NCPAINT(hwnd,hrgn,fn) (void)(fn)((hwnd),WM_NCPAINT,(WPARAM)(HRGN)(hrgn),0)
-#define FORWARD_WM_NCRBUTTONDOWN(hwnd,fDoubleClick,x,y,codeHitTest,fn) (void)(fn)((hwnd),(fDoubleClick) ? WM_NCRBUTTONDBLCLK : WM_NCRBUTTONDOWN,(WPARAM)(UINT)(codeHitTest),MAKELPARAM((x),(y)) )
-#define FORWARD_WM_NCRBUTTONUP(hwnd,x,y,codeHitTest,fn) (void)(fn)((hwnd),WM_NCRBUTTONUP,(WPARAM)(UINT)(codeHitTest),MAKELPARAM((x),(y)) )
-#define FORWARD_WM_NEXTDLGCTL(hwnd,hwndSetFocus,fNext,fn) (HWND)(UINT)(DWORD)(fn)((hwnd),WM_NEXTDLGCTL,(WPARAM)(HWND)(hwndSetFocus),(LPARAM)(fNext))
-#define FORWARD_WM_PAINT(hwnd,fn) (void)(fn)((hwnd),WM_PAINT,0,0)
-#define FORWARD_WM_PAINTCLIPBOARD(hwnd,hwndCBViewer,lpPaintStruct,fn) (void)(fn)((hwnd),WM_PAINTCLIPBOARD,(WPARAM)(HWND)(hwndCBViewer),(LPARAM)(LPPAINTSTRUCT)(lpPaintStruct))
-#define FORWARD_WM_PALETTECHANGED(hwnd,hwndPaletteChange,fn) (void)(fn)((hwnd),WM_PALETTECHANGED,(WPARAM)(HWND)(hwndPaletteChange),0)
-#define FORWARD_WM_PALETTEISCHANGING(hwnd,hwndPaletteChange,fn) (void)(fn)((hwnd),WM_PALETTEISCHANGING,(WPARAM)(HWND)(hwndPaletteChange),0)
-#define FORWARD_WM_PARENTNOTIFY(hwnd,msg,hwndChild,idChild,fn) (void)(fn)((hwnd),WM_PARENTNOTIFY,MAKEWPARAM(msg,idChild),(LPARAM)(hwndChild))
-#define FORWARD_WM_PASTE(hwnd,fn) (void)(fn)((hwnd),WM_PASTE,0,0)
-#define FORWARD_WM_POWER(hwnd,code,fn) (void)(fn)((hwnd),WM_POWER,(WPARAM)(int)(code),0)
-#define FORWARD_WM_QUERYDRAGICON(hwnd,fn) (HICON)(UINT)(DWORD)(fn)((hwnd),WM_QUERYDRAGICON,0,0)
-#define FORWARD_WM_QUERYENDSESSION(hwnd,fn) (BOOL)(DWORD)(fn)((hwnd),WM_QUERYENDSESSION,0,0)
-#define FORWARD_WM_QUERYNEWPALETTE(hwnd,fn) (BOOL)(DWORD)(fn)((hwnd),WM_QUERYNEWPALETTE,0,0)
-#define FORWARD_WM_QUERYOPEN(hwnd,fn) (BOOL)(DWORD)(fn)((hwnd),WM_QUERYOPEN,0,0)
-#define FORWARD_WM_QUEUESYNC(hwnd,fn) (void)(fn)((hwnd),WM_QUEUESYNC,0,0)
-#define FORWARD_WM_QUIT(hwnd,exitCode,fn) (void)(fn)((hwnd),WM_QUIT,(WPARAM)(exitCode),0)
-#define FORWARD_WM_RBUTTONDOWN(hwnd,fDoubleClick,x,y,keyFlags,fn) (void)(fn)((hwnd),(fDoubleClick) ? WM_RBUTTONDBLCLK : WM_RBUTTONDOWN,(WPARAM)(UINT)(keyFlags),MAKELPARAM((x),(y)))
-#define FORWARD_WM_RBUTTONUP(hwnd,x,y,keyFlags,fn) (void)(fn)((hwnd),WM_RBUTTONUP,(WPARAM)(UINT)(keyFlags),MAKELPARAM((x),(y)))
-#define FORWARD_WM_RENDERALLFORMATS(hwnd,fn) (void)(fn)((hwnd),WM_RENDERALLFORMATS,0,0)
-#define FORWARD_WM_RENDERFORMAT(hwnd,fmt,fn) (HANDLE)(UINT)(DWORD)(fn)((hwnd),WM_RENDERFORMAT,(WPARAM)(UINT)(fmt),0)
-#define FORWARD_WM_SETCURSOR(hwnd,hwndCursor,codeHitTest,msg,fn) (BOOL)(DWORD)(fn)((hwnd),WM_SETCURSOR,(WPARAM)(HWND)(hwndCursor),MAKELPARAM((codeHitTest),(msg)))
-#define FORWARD_WM_SETFOCUS(hwnd,hwndOldFocus,fn) (void)(fn)((hwnd),WM_SETFOCUS,(WPARAM)(HWND)(hwndOldFocus),0)
-#define FORWARD_WM_SETFONT(hwnd,hfont,fRedraw,fn) (void)(fn)((hwnd),WM_SETFONT,(WPARAM)(HFONT)(hfont),(LPARAM)(BOOL)(fRedraw))
-#define FORWARD_WM_SETREDRAW(hwnd,fRedraw,fn) (void)(fn)((hwnd),WM_SETREDRAW,(WPARAM)(BOOL)(fRedraw),0)
-#define FORWARD_WM_SETTEXT(hwnd,lpszText,fn) (void)(fn)((hwnd),WM_SETTEXT,0,(LPARAM)(LPCTSTR)(lpszText))
-#define FORWARD_WM_SHOWWINDOW(hwnd,fShow,status,fn) (void)(fn)((hwnd),WM_SHOWWINDOW,(WPARAM)(BOOL)(fShow),(LPARAM)(UINT)(status))
-#define FORWARD_WM_SIZE(hwnd,state,cx,cy,fn) (void)(fn)((hwnd),WM_SIZE,(WPARAM)(UINT)(state),MAKELPARAM((cx),(cy)))
-#define FORWARD_WM_SIZECLIPBOARD(hwnd,hwndCBViewer,lprc,fn) (void)(fn)((hwnd),WM_SIZECLIPBOARD,(WPARAM)(HWND)(hwndCBViewer),(LPARAM)(LPRECT)(lprc))
-#define FORWARD_WM_SPOOLERSTATUS(hwnd,status,cJobInQueue,fn) (void)(fn)((hwnd),WM_SPOOLERSTATUS,(WPARAM)(status),MAKELPARAM((cJobInQueue),0))
-#define FORWARD_WM_SYSCHAR(hwnd,ch,cRepeat,fn) (void)(fn)((hwnd),WM_SYSCHAR,(WPARAM)(TCHAR)(ch),MAKELPARAM((cRepeat),0))
-#define FORWARD_WM_SYSCOLORCHANGE(hwnd,fn) (void)(fn)((hwnd),WM_SYSCOLORCHANGE,0,0)
-#define FORWARD_WM_SYSCOMMAND(hwnd,cmd,x,y,fn) (void)(fn)((hwnd),WM_SYSCOMMAND,(WPARAM)(UINT)(cmd),MAKELPARAM((x),(y)))
-#define FORWARD_WM_SYSDEADCHAR(hwnd,ch,cRepeat,fn) (void)(fn)((hwnd),WM_SYSDEADCHAR,(WPARAM)(TCHAR)(ch),MAKELPARAM((cRepeat),0))
-#define FORWARD_WM_SYSKEYDOWN(hwnd,vk,cRepeat,flags,fn) (void)(fn)((hwnd),WM_SYSKEYDOWN,(WPARAM)(UINT)(vk),MAKELPARAM((cRepeat),(flags)))
-#define FORWARD_WM_SYSKEYUP(hwnd,vk,cRepeat,flags,fn) (void)(fn)((hwnd),WM_SYSKEYUP,(WPARAM)(UINT)(vk),MAKELPARAM((cRepeat),(flags)))
-#define FORWARD_WM_SYSTEMERROR(hwnd,errCode,fn) 0
-#define FORWARD_WM_TIMECHANGE(hwnd,fn) (void)(fn)((hwnd),WM_TIMECHANGE,0,0)
-#define FORWARD_WM_TIMER(hwnd,id,fn) (void)(fn)((hwnd),WM_TIMER,(WPARAM)(UINT)(id),0)
-#define FORWARD_WM_UNDO(hwnd,fn) (void)(fn)((hwnd),WM_UNDO,0,0)
-#define FORWARD_WM_VKEYTOITEM(hwnd,vk,hwndListBox,iCaret,fn) (int)(DWORD)(fn)((hwnd),WM_VKEYTOITEM,MAKEWPARAM((vk),(iCaret)),(LPARAM)(hwndListBox))
-#define FORWARD_WM_VSCROLL(hwnd,hwndCtl,code,pos,fn) (void)(fn)((hwnd),WM_VSCROLL,MAKEWPARAM((UINT)(int)(code),(UINT)(int)(pos)),(LPARAM)(HWND)(hwndCtl))
-#define FORWARD_WM_VSCROLLCLIPBOARD(hwnd,hwndCBViewer,code,pos,fn) (void)(fn)((hwnd),WM_VSCROLLCLIPBOARD,(WPARAM)(HWND)(hwndCBViewer),MAKELPARAM((code),(pos)))
-#define FORWARD_WM_WINDOWPOSCHANGED(hwnd,lpwpos,fn) (void)(fn)((hwnd),WM_WINDOWPOSCHANGED,0,(LPARAM)(const LPWINDOWPOS)(lpwpos))
-#define FORWARD_WM_WINDOWPOSCHANGING(hwnd,lpwpos,fn) (BOOL)(DWORD)(fn)((hwnd),WM_WINDOWPOSCHANGING,0,(LPARAM)(LPWINDOWPOS)(lpwpos))
-#define FORWARD_WM_WININICHANGE(hwnd,lpszSectionName,fn) (void)(fn)((hwnd),WM_WININICHANGE,0,(LPARAM)(LPCTSTR)(lpszSectionName))
-#define GET_EM_LINESCROLL_MPS(vert,horz) (WPARAM)horz,(LONG)vert
-#define GET_EM_SETSEL_END(wp,lp) (lp)
-#define GET_EM_SETSEL_MPS(iStart,iEnd) (WPARAM)(iStart),(LONG)(iEnd)
-#define GET_EM_SETSEL_START(wp,lp) (INT)(wp)
-#define GET_LPARAM(wp,lp) (lp)
-#define GET_WM_ACTIVATE_FMINIMIZED(wp,lp) (BOOL)HIWORD(wp)
-#define GET_WM_ACTIVATE_HWND(wp,lp) (HWND)(lp)
-#define GET_WM_ACTIVATE_MPS(s,fmin,hwnd) (WPARAM)MAKELONG((s),(fmin)),(LONG)(hwnd)
-#define GET_WM_ACTIVATE_STATE(wp,lp) LOWORD(wp)
-#define GET_WM_CHANGECBCHAIN_HWNDNEXT(wp,lp) (HWND)(lp)
-#define GET_WM_CHARTOITEM_CHAR(wp,lp) (TCHAR)LOWORD(wp)
-#define GET_WM_CHARTOITEM_HWND(wp,lp) (HWND)(lp)
-#define GET_WM_CHARTOITEM_MPS(ch,pos,hwnd) (WPARAM)MAKELONG((pos),(ch)),(LONG)(hwnd)
-#define GET_WM_CHARTOITEM_POS(wp,lp) HIWORD(wp)
-#define GET_WM_COMMAND_CMD(wp,lp) HIWORD(wp)
-#define GET_WM_COMMAND_HWND(wp,lp) (HWND)(lp)
-#define GET_WM_COMMAND_ID(wp,lp) LOWORD(wp)
-#define GET_WM_COMMAND_MPS(id,hwnd,cmd) (WPARAM)MAKELONG(id,cmd),(LONG)(hwnd)
-#define GET_WM_CTLCOLOR_HDC(wp,lp,msg) (HDC)(wp)
-#define GET_WM_CTLCOLOR_HWND(wp,lp,msg) (HWND)(lp)
-#define GET_WM_CTLCOLOR_MPS(hdc,hwnd,type) (WPARAM)(hdc),(LONG)(hwnd)
-#define GET_WM_CTLCOLOR_MSG(type) (WORD)(WM_CTLCOLORMSGBOX+(type))
-#define GET_WM_CTLCOLOR_TYPE(wp,lp,msg) (WORD)(msg - WM_CTLCOLORMSGBOX)
-#define GET_WM_HSCROLL_CODE(wp,lp) LOWORD(wp)
-#define GET_WM_HSCROLL_HWND(wp,lp) (HWND)(lp)
-#define GET_WM_HSCROLL_MPS(code,pos,hwnd) (WPARAM)MAKELONG(code,pos),(LONG)(hwnd)
-#define GET_WM_HSCROLL_POS(wp,lp) HIWORD(wp)
-#define GET_WM_MDIACTIVATE_FACTIVATE(hwnd,wp,lp) (lp == (LONG)hwnd)
-#define GET_WM_MDIACTIVATE_HWNDACTIVATE(wp,lp) (HWND)(lp)
-#define GET_WM_MDIACTIVATE_HWNDDEACT(wp,lp) (HWND)(wp)
-#define GET_WM_MDIACTIVATE_MPS(f,hwndD,hwndA) (WPARAM)(hwndA),0
-#define GET_WM_MDISETMENU_MPS(hmenuF,hmenuW) (WPARAM)hmenuF,(LONG)hmenuW
-#define GET_WM_MENUCHAR_CHAR(wp,lp) (TCHAR)LOWORD(wp)
-#define GET_WM_MENUCHAR_FMENU(wp,lp) (BOOL)HIWORD(wp)
-#define GET_WM_MENUCHAR_HMENU(wp,lp) (HMENU)(lp)
-#define GET_WM_MENUCHAR_MPS(ch,hmenu,f) (WPARAM)MAKELONG(ch,f),(LONG)(hmenu)
-#define GET_WM_MENUSELECT_CMD(wp,lp) LOWORD(wp)
-#define GET_WM_MENUSELECT_FLAGS(wp,lp) (UINT)(int)(short)HIWORD(wp)
-#define GET_WM_MENUSELECT_HMENU(wp,lp) (HMENU)(lp)
-#define GET_WM_MENUSELECT_MPS(cmd,f,hmenu) (WPARAM)MAKELONG(cmd,f),(LONG)(hmenu)
-#define GET_WM_PARENTNOTIFY2_MPS(msg,x,y) (WPARAM)MAKELONG(0,msg),MAKELONG(x,y)
-#define GET_WM_PARENTNOTIFY_HWNDCHILD(wp,lp) (HWND)(lp)
-#define GET_WM_PARENTNOTIFY_ID(wp,lp) HIWORD(wp)
-#define GET_WM_PARENTNOTIFY_MPS(msg,id,hwnd) (WPARAM)MAKELONG(id,msg),(LONG)(hwnd)
-#define GET_WM_PARENTNOTIFY_MSG(wp,lp) LOWORD(wp)
-#define GET_WM_PARENTNOTIFY_X(wp,lp) (int)(short)LOWORD(lp)
-#define GET_WM_PARENTNOTIFY_Y(wp,lp) (int)(short)HIWORD(lp)
-#define GET_WM_VKEYTOITEM_CODE(wp,lp) (int)(short)LOWORD(wp)
-#define GET_WM_VKEYTOITEM_HWND(wp,lp) (HWND)(lp)
-#define GET_WM_VKEYTOITEM_ITEM(wp,lp) HIWORD(wp)
-#define GET_WM_VKEYTOITEM_MPS(code,item,hwnd) (WPARAM)MAKELONG(item,code),(LONG)(hwnd)
-#define GET_WM_VSCROLL_CODE(wp,lp) LOWORD(wp)
-#define GET_WM_VSCROLL_HWND(wp,lp) (HWND)(lp)
-#define GET_WM_VSCROLL_MPS(code,pos,hwnd) (WPARAM)MAKELONG(code,pos),(LONG)(hwnd)
-#define GET_WM_VSCROLL_POS(wp,lp) HIWORD(wp)
-#define GET_WPARAM(wp,lp) (wp)
-#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
-#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
-#define GetFirstChild(hwnd) GetTopWindow(hwnd)
-#define GetFirstSibling(hwnd) GetWindow(hwnd,GW_HWNDFIRST)
-#define GetInstanceModule(hInstance) (HMODULE)(hInstance)
-#define GetLastSibling(hwnd) GetWindow(hwnd,GW_HWNDLAST)
-#define GetNextSibling(hwnd) GetWindow(hwnd,GW_HWNDNEXT)
-#define GetPrevSibling(hwnd) GetWindow(hwnd,GW_HWNDPREV)
-#define GetStockBrush(i) ((HBRUSH)GetStockObject(i))
-#define GetStockFont(i) ((HFONT)GetStockObject(i))
-#define GetStockPen(i) ((HPEN)GetStockObject(i))
-#define GetWindowExStyle(hwnd) ((DWORD)GetWindowLong(hwnd,GWL_EXSTYLE))
-#define GetWindowFont(hwnd) FORWARD_WM_GETFONT((hwnd),SendMessage)
-#define GetWindowID(hwnd) GetDlgCtrlID(hwnd)
-#define GetWindowInstance(hwnd) ((HMODULE)GetWindowLong(hwnd,GWL_HINSTANCE))
-#define GetWindowOwner(hwnd) GetWindow(hwnd,GW_OWNER)
-#define GetWindowStyle(hwnd) ((DWORD)GetWindowLong(hwnd,GWL_STYLE))
-#define GlobalAllocPtr(flags,cb) (GlobalLock(GlobalAlloc((flags),(cb))))
-#define GlobalFreePtr(lp) (GlobalUnlockPtr(lp),(BOOL)GlobalFree(GlobalPtrHandle(lp)))
-#define GlobalLockPtr(lp) ((BOOL)GlobalLock(GlobalPtrHandle(lp)))
-#define GlobalPtrHandle(lp) ((HGLOBAL)GlobalHandle(lp))
-#define GlobalReAllocPtr(lp,cbNew,flags) (GlobalUnlockPtr(lp),GlobalLock(GlobalReAlloc(GlobalPtrHandle(lp) ,(cbNew),(flags))))
-#define GlobalUnlockPtr(lp) GlobalUnlock(GlobalPtrHandle(lp))
-#define HANDLE_MSG(hwnd,message,fn) case (message): return HANDLE_##message((hwnd),(wParam),(lParam),(fn))
-#define HANDLE_WM_ACTIVATE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)LOWORD(wParam),(HWND)(lParam),(BOOL)HIWORD(wParam)),0)
-#define HANDLE_WM_ACTIVATEAPP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(BOOL)(wParam),(DWORD)(lParam)),0)
-#define HANDLE_WM_ASKCBFORMATNAME(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(wParam),(LPTSTR)(lParam)),0)
-#define HANDLE_WM_CANCELMODE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_CHANGECBCHAIN(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(HWND)(lParam)),0)
-#define HANDLE_WM_CHAR(hwnd,wParam,lParam,fn) ((fn)((hwnd),(TCHAR)(wParam),(int)(short)LOWORD(lParam)),0)
-#define HANDLE_WM_CHARTOITEM(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(UINT)LOWORD(wParam),(HWND)(lParam),(int)(short)HIWORD(wParam))
-#define HANDLE_WM_CHILDACTIVATE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_CLEAR(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_CLOSE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_COMMAND(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(LOWORD(wParam)),(HWND)(lParam),(UINT)HIWORD(wParam)),0)
-#define HANDLE_WM_COMMNOTIFY(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(wParam),(UINT)LOWORD(lParam)),0)
-#define HANDLE_WM_COMPACTING(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam)),0)
-#define HANDLE_WM_COMPAREITEM(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(const COMPAREITEMSTRUCT*)(lParam))
-#define HANDLE_WM_COPY(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_CREATE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPCREATESTRUCT)(lParam)) ? 0 : (LRESULT)-1L)
-#define HANDLE_WM_CTLCOLORBTN(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_BTN)
-#define HANDLE_WM_CTLCOLORDLG(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_DLG)
-#define HANDLE_WM_CTLCOLOREDIT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_EDIT)
-#define HANDLE_WM_CTLCOLORLISTBOX(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_LISTBOX)
-#define HANDLE_WM_CTLCOLORMSGBOX(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_MSGBOX)
-#define HANDLE_WM_CTLCOLORSCROLLBAR(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_SCROLLBAR)
-#define HANDLE_WM_CTLCOLORSTATIC(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HBRUSH)(fn)((hwnd),(HDC)(wParam),(HWND)(lParam),CTLCOLOR_STATIC)
-#define HANDLE_WM_CUT(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_DEADCHAR(hwnd,wParam,lParam,fn) ((fn)((hwnd),(TCHAR)(wParam),(int)(short)LOWORD(lParam)),0)
-#define HANDLE_WM_DELETEITEM(hwnd,wParam,lParam,fn) ((fn)((hwnd),(const DELETEITEMSTRUCT*)(lParam)),0)
-#define HANDLE_WM_DESTROY(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_DESTROYCLIPBOARD(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_DEVMODECHANGE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPCTSTR)(lParam)),0)
-#define HANDLE_WM_DRAWCLIPBOARD(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_DRAWITEM(hwnd,wParam,lParam,fn) ((fn)((hwnd),(const DRAWITEMSTRUCT*)(lParam)),0)
-#define HANDLE_WM_DROPFILES(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HDROP)(wParam)),0)
-#define HANDLE_WM_ENABLE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(BOOL)(wParam)),0)
-#define HANDLE_WM_ENDSESSION(hwnd,wParam,lParam,fn) ((fn)((hwnd),(BOOL)(wParam)),0)
-#define HANDLE_WM_ENTERIDLE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam),(HWND)(lParam)),0)
-#define HANDLE_WM_ERASEBKGND(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(HDC)(wParam))
-#define HANDLE_WM_FONTCHANGE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_GETDLGCODE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)(hwnd,(LPMSG)(lParam))
-#define HANDLE_WM_GETFONT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HFONT)(fn)(hwnd)
-#define HANDLE_WM_GETMINMAXINFO(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPMINMAXINFO)(lParam)),0)
-#define HANDLE_WM_GETTEXT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(int)(wParam),(LPTSTR)(lParam))
-#define HANDLE_WM_GETTEXTLENGTH(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)(hwnd)
-#define HANDLE_WM_HSCROLL(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(lParam),(UINT)(LOWORD(wParam)),(int)(short)HIWORD(wParam)),0)
-#define HANDLE_WM_HSCROLLCLIPBOARD(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(UINT)LOWORD(lParam),(int)(short)HIWORD(lParam)),0)
-#define HANDLE_WM_ICONERASEBKGND(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(HDC)(wParam))
-#define HANDLE_WM_INITDIALOG(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(BOOL)(fn)((hwnd),(HWND)(wParam),lParam)
-#define HANDLE_WM_INITMENU(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HMENU)(wParam)),0)
-#define HANDLE_WM_INITMENUPOPUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HMENU)(wParam),(UINT)LOWORD(lParam),(BOOL)HIWORD(lParam)),0)
-#define HANDLE_WM_KEYDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam),TRUE,(int)(short)LOWORD(lParam),(UINT)HIWORD(lParam)),0)
-#define HANDLE_WM_KEYUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam),FALSE,(int)(short)LOWORD(lParam),(UINT)HIWORD(lParam)),0)
-#define HANDLE_WM_KILLFOCUS(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0)
-#define HANDLE_WM_LBUTTONDBLCLK(hwnd,wParam,lParam,fn) ((fn)((hwnd),TRUE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_LBUTTONDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),FALSE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_LBUTTONUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_MBUTTONDBLCLK(hwnd,wParam,lParam,fn) ((fn)((hwnd),TRUE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_MBUTTONDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),FALSE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_MBUTTONUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_MDIACTIVATE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(BOOL)(lParam == (LPARAM)hwnd),(HWND)(lParam),(HWND)(wParam)),0)
-#define HANDLE_WM_MDICASCADE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(fn)((hwnd),(UINT)(wParam))
-#define HANDLE_WM_MDICREATE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)((hwnd),(LPMDICREATESTRUCT)(lParam))
-#define HANDLE_WM_MDIDESTROY(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0)
-#define HANDLE_WM_MDIGETACTIVE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)(hwnd)
-#define HANDLE_WM_MDIICONARRANGE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_MDIMAXIMIZE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0)
-#define HANDLE_WM_MDINEXT(hwnd,wParam,lParam,fn) (LRESULT)(HWND)(fn)((hwnd),(HWND)(wParam),(BOOL)lParam)
-#define HANDLE_WM_MDIRESTORE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0)
-#define HANDLE_WM_MDISETMENU(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)((hwnd),(BOOL)(wParam),(HMENU)(wParam),(HMENU)(lParam))
-#define HANDLE_WM_MDITILE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(fn)((hwnd),(UINT)(wParam))
-#define HANDLE_WM_MEASUREITEM(hwnd,wParam,lParam,fn) ((fn)((hwnd),(MEASUREITEMSTRUCT*)(lParam)),0)
-#define HANDLE_WM_MENUCHAR(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(fn)((hwnd),(UINT)(LOWORD(wParam)),(UINT)HIWORD(wParam),(HMENU)(lParam))
-#define HANDLE_WM_MENUSELECT(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HMENU)(lParam),(int)(LOWORD(wParam)),(HIWORD(wParam) & MF_POPUP) ? GetSubMenu((HMENU)lParam,LOWORD(wParam)) : 0,(UINT)(((short)HIWORD(wParam) == -1) ? 0xFFFFFFFF : HIWORD(wParam))),0)
-#define HANDLE_WM_MOUSEACTIVATE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(HWND)(wParam),(UINT)LOWORD(lParam),(UINT)HIWORD(lParam))
-#define HANDLE_WM_MOUSEMOVE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_MOVE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam)),0)
-#define HANDLE_WM_NCACTIVATE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(BOOL)(wParam),0,0)
-#define HANDLE_WM_NCCALCSIZE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)((hwnd),(BOOL)(0),(NCCALCSIZE_PARAMS*)(lParam))
-#define HANDLE_WM_NCCREATE(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(LPCREATESTRUCT)(lParam))
-#define HANDLE_WM_NCDESTROY(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_NCHITTEST(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam))
-#define HANDLE_WM_NCLBUTTONDBLCLK(hwnd,wParam,lParam,fn) ((fn)((hwnd),TRUE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_NCLBUTTONDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),FALSE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_NCLBUTTONUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_NCMBUTTONDBLCLK(hwnd,wParam,lParam,fn) ((fn)((hwnd),TRUE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_NCMBUTTONDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),FALSE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_NCMBUTTONUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_NCMOUSEMOVE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_NCPAINT(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HRGN)(wParam)),0)
-#define HANDLE_WM_NCRBUTTONDBLCLK(hwnd,wParam,lParam,fn) ((fn)((hwnd),TRUE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_NCRBUTTONDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),FALSE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_NCRBUTTONUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_NEXTDLGCTL(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HWND)(fn)((hwnd),(HWND)(wParam),(BOOL)(lParam))
-#define HANDLE_WM_PAINT(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_PAINTCLIPBOARD(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(const LPPAINTSTRUCT)GlobalLock((HGLOBAL)(lParam))),GlobalUnlock((HGLOBAL)(lParam)),0)
-#define HANDLE_WM_PALETTECHANGED(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0)
-#define HANDLE_WM_PALETTEISCHANGING(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0)
-#define HANDLE_WM_PARENTNOTIFY(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)LOWORD(wParam),(HWND)(lParam),(UINT)HIWORD(wParam)),0)
-#define HANDLE_WM_PASTE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_POWER(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(wParam)),0)
-#define HANDLE_WM_QUERYDRAGICON(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(fn)(hwnd)
-#define HANDLE_WM_QUERYENDSESSION(hwnd,wParam,lParam,fn) MAKELRESULT((BOOL)(fn)(hwnd),0)
-#define HANDLE_WM_QUERYNEWPALETTE(hwnd,wParam,lParam,fn) MAKELRESULT((BOOL)(fn)(hwnd),0)
-#define HANDLE_WM_QUERYOPEN(hwnd,wParam,lParam,fn) MAKELRESULT((BOOL)(fn)(hwnd),0)
-#define HANDLE_WM_QUEUESYNC(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_QUIT(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(wParam)),0)
-#define HANDLE_WM_RBUTTONDBLCLK(hwnd,wParam,lParam,fn) ((fn)((hwnd),TRUE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_RBUTTONDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),FALSE,(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_RBUTTONUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam),(UINT)(wParam)),0)
-#define HANDLE_WM_RENDERALLFORMATS(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_RENDERFORMAT(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(UINT)(HANDLE)(fn)((hwnd),(UINT)(wParam))
-#define HANDLE_WM_SETCURSOR(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(HWND)(wParam),(UINT)LOWORD(lParam),(UINT)HIWORD(lParam))
-#define HANDLE_WM_SETFOCUS(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam)),0)
-#define HANDLE_WM_SETFONT(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HFONT)(wParam),(BOOL)(lParam)),0)
-#define HANDLE_WM_SETREDRAW(hwnd,wParam,lParam,fn) ((fn)((hwnd),(BOOL)(wParam)),0)
-#define HANDLE_WM_SETTEXT(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPCTSTR)(lParam)),0)
-#define HANDLE_WM_SHOWWINDOW(hwnd,wParam,lParam,fn) ((fn)((hwnd),(BOOL)(wParam),(UINT)(lParam)),0)
-#define HANDLE_WM_SIZE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam)),0)
-#define HANDLE_WM_SIZECLIPBOARD(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(const LPRECT)GlobalLock((HGLOBAL)(lParam))),GlobalUnlock((HGLOBAL)(lParam)),0)
-#define HANDLE_WM_SPOOLERSTATUS(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam),(int)(short)LOWORD(lParam)),0)
-#define HANDLE_WM_SYSCHAR(hwnd,wParam,lParam,fn) ((fn)((hwnd),(TCHAR)(wParam),(int)(short)LOWORD(lParam)),0)
-#define HANDLE_WM_SYSCOLORCHANGE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_SYSCOMMAND(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam),(int)(short)LOWORD(lParam),(int)(short)HIWORD(lParam)),0)
-#define HANDLE_WM_SYSDEADCHAR(hwnd,wParam,lParam,fn) ((fn)((hwnd),(TCHAR)(wParam),(int)(short)LOWORD(lParam)),0)
-#define HANDLE_WM_SYSKEYDOWN(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam),TRUE,(int)(short)LOWORD(lParam),(UINT)HIWORD(lParam)),0)
-#define HANDLE_WM_SYSKEYUP(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam),FALSE,(int)(short)LOWORD(lParam),(UINT)HIWORD(lParam)),0)
-#define HANDLE_WM_SYSTEMERROR(hwnd,wParam,lParam,fn) 0
-#define HANDLE_WM_TIMECHANGE(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_TIMER(hwnd,wParam,lParam,fn) ((fn)((hwnd),(UINT)(wParam)),0)
-#define HANDLE_WM_UNDO(hwnd,wParam,lParam,fn) ((fn)(hwnd),0)
-#define HANDLE_WM_VKEYTOITEM(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(int)(fn)((hwnd),(UINT)LOWORD(wParam),(HWND)(lParam),(int)(short)HIWORD(wParam))
-#define HANDLE_WM_VSCROLL(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(lParam),(UINT)(LOWORD(wParam)),(int)(short)HIWORD(wParam)),0)
-#define HANDLE_WM_VSCROLLCLIPBOARD(hwnd,wParam,lParam,fn) ((fn)((hwnd),(HWND)(wParam),(UINT)LOWORD(lParam),(int)(short)HIWORD(lParam)),0)
-#define HANDLE_WM_WINDOWPOSCHANGED(hwnd,wParam,lParam,fn) ((fn)((hwnd),(const LPWINDOWPOS)(lParam)),0)
-#define HANDLE_WM_WINDOWPOSCHANGING(hwnd,wParam,lParam,fn) (LRESULT)(DWORD)(BOOL)(fn)((hwnd),(LPWINDOWPOS)(lParam))
-#define HANDLE_WM_WININICHANGE(hwnd,wParam,lParam,fn) ((fn)((hwnd),(LPCTSTR)(lParam)),0)
-#define InsetRect(lprc,dx,dy) InflateRect((lprc),-(dx),-(dy))
-#define IntersectRgn(hrgnResult,hrgnA,hrgnB) CombineRgn(hrgnResult,hrgnA,hrgnB,RGN_AND)
-#define IsLButtonDown() (GetKeyState(VK_LBUTTON) < 0)
-#define IsMButtonDown() (GetKeyState(VK_MBUTTON) < 0)
-#define IsMaximized(hwnd) IsZoomed(hwnd)
-#define IsMinimized(hwnd) IsIconic(hwnd)
-#define IsRButtonDown() (GetKeyState(VK_RBUTTON) < 0)
-#define IsRestored(hwnd) ((GetWindowStyle(hwnd) & (WS_MINIMIZE | WS_MAXIMIZE)) == 0)
-#define ListBox_AddItemData(hwndCtl,data) ((int)(DWORD)SendMessage((hwndCtl),LB_ADDSTRING,0,(LPARAM)(data)))
-#define ListBox_AddString(hwndCtl,lpsz) ((int)(DWORD)SendMessage((hwndCtl),LB_ADDSTRING,0,(LPARAM)(LPCTSTR)(lpsz)))
-#define ListBox_DeleteString(hwndCtl,index) ((int)(DWORD)SendMessage((hwndCtl),LB_DELETESTRING,(WPARAM)(int)(index),0))
-#define ListBox_Dir(hwndCtl,attrs,lpszFileSpec) ((int)(DWORD)SendMessage((hwndCtl),LB_DIR,(WPARAM)(UINT)(attrs),(LPARAM)(LPCTSTR)(lpszFileSpec)))
-#define ListBox_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable))
-#define ListBox_FindItemData(hwndCtl,indexStart,data) ((int)(DWORD)SendMessage((hwndCtl),LB_FINDSTRING,(WPARAM)(int)(indexStart),(LPARAM)(data)))
-#define ListBox_FindString(hwndCtl,indexStart,lpszFind) ((int)(DWORD)SendMessage((hwndCtl),LB_FINDSTRING,(WPARAM)(int)(indexStart),(LPARAM)(LPCTSTR)(lpszFind)))
-#define ListBox_FindStringExact(hwndCtl,indexStart,lpszFind) ((int)(DWORD)SendMessage((hwndCtl),LB_FINDSTRINGEXACT,(WPARAM)(int)(indexStart),(LPARAM)(LPCTSTR)(lpszFind)))
-#define ListBox_GetCaretIndex(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),LB_GETCARETINDEX,0,0))
-#define ListBox_GetCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),LB_GETCOUNT,0,0))
-#define ListBox_GetCurSel(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),LB_GETCURSEL,0,0))
-#define ListBox_GetHorizontalExtent(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),LB_GETHORIZONTALEXTENT,0,0))
-#define ListBox_GetItemData(hwndCtl,index) ((LRESULT)(DWORD)SendMessage((hwndCtl),LB_GETITEMDATA,(WPARAM)(int)(index),0))
-#define ListBox_GetItemHeight(hwndCtl,index) ((int)(DWORD)SendMessage((hwndCtl),LB_GETITEMHEIGHT,(WPARAM)(int)(index),0))
-#define ListBox_GetItemRect(hwndCtl,index,lprc) ((int)(DWORD)SendMessage((hwndCtl),LB_GETITEMRECT,(WPARAM)(int)(index),(LPARAM)(RECT*)(lprc)))
-#define ListBox_GetSel(hwndCtl,index) ((int)(DWORD)SendMessage((hwndCtl),LB_GETSEL,(WPARAM)(int)(index),0))
-#define ListBox_GetSelCount(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),LB_GETSELCOUNT,0,0))
-#define ListBox_GetSelItems(hwndCtl,cItems,lpItems) ((int)(DWORD)SendMessage((hwndCtl),LB_GETSELITEMS,(WPARAM)(int)(cItems),(LPARAM)(int*)(lpItems)))
-#define ListBox_GetText(hwndCtl,index,lpszBuffer) ((int)(DWORD)SendMessage((hwndCtl),LB_GETTEXT,(WPARAM)(int)(index),(LPARAM)(LPCTSTR)(lpszBuffer)))
-#define ListBox_GetTextLen(hwndCtl,index) ((int)(DWORD)SendMessage((hwndCtl),LB_GETTEXTLEN,(WPARAM)(int)(index),0))
-#define ListBox_GetTopIndex(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),LB_GETTOPINDEX,0,0))
-#define ListBox_InsertItemData(hwndCtl,index,data) ((int)(DWORD)SendMessage((hwndCtl),LB_INSERTSTRING,(WPARAM)(int)(index),(LPARAM)(data)))
-#define ListBox_InsertString(hwndCtl,index,lpsz) ((int)(DWORD)SendMessage((hwndCtl),LB_INSERTSTRING,(WPARAM)(int)(index),(LPARAM)(LPCTSTR)(lpsz)))
-#define ListBox_ResetContent(hwndCtl) ((BOOL)(DWORD)SendMessage((hwndCtl),LB_RESETCONTENT,0,0))
-#define ListBox_SelItemRange(hwndCtl,fSelect,first,last) ((int)(DWORD)SendMessage((hwndCtl),LB_SELITEMRANGE,(WPARAM)(BOOL)(fSelect),MAKELPARAM((first),(last))))
-#define ListBox_SelectItemData(hwndCtl,indexStart,data) ((int)(DWORD)SendMessage((hwndCtl),LB_SELECTSTRING,(WPARAM)(int)(indexStart),(LPARAM)(data)))
-#define ListBox_SelectString(hwndCtl,indexStart,lpszFind) ((int)(DWORD)SendMessage((hwndCtl),LB_SELECTSTRING,(WPARAM)(int)(indexStart),(LPARAM)(LPCTSTR)(lpszFind)))
-#define ListBox_SetCaretIndex(hwndCtl,index) ((int)(DWORD)SendMessage((hwndCtl),LB_SETCARETINDEX,(WPARAM)(int)(index),0))
-#define ListBox_SetColumnWidth(hwndCtl,cxColumn) ((void)SendMessage((hwndCtl),LB_SETCOLUMNWIDTH,(WPARAM)(int)(cxColumn),0))
-#define ListBox_SetCurSel(hwndCtl,index) ((int)(DWORD)SendMessage((hwndCtl),LB_SETCURSEL,(WPARAM)(int)(index),0))
-#define ListBox_SetHorizontalExtent(hwndCtl,cxExtent) ((void)SendMessage((hwndCtl),LB_SETHORIZONTALEXTENT,(WPARAM)(int)(cxExtent),0))
-#define ListBox_SetItemData(hwndCtl,index,data) ((int)(DWORD)SendMessage((hwndCtl),LB_SETITEMDATA,(WPARAM)(int)(index),(LPARAM)(data)))
-#define ListBox_SetItemHeight(hwndCtl,index,cy) ((int)(DWORD)SendMessage((hwndCtl),LB_SETITEMHEIGHT,(WPARAM)(int)(index),MAKELPARAM((cy),0)))
-#define ListBox_SetSel(hwndCtl,fSelect,index) ((int)(DWORD)SendMessage((hwndCtl),LB_SETSEL,(WPARAM)(BOOL)(fSelect),(LPARAM)(index)))
-#define ListBox_SetTabStops(hwndCtl,cTabs,lpTabs) ((BOOL)(DWORD)SendMessage((hwndCtl),LB_SETTABSTOPS,(WPARAM)(int)(cTabs),(LPARAM)(int*)(lpTabs)))
-#define ListBox_SetTopIndex(hwndCtl,indexTop) ((int)(DWORD)SendMessage((hwndCtl),LB_SETTOPINDEX,(WPARAM)(int)(indexTop),0))
-#define MapWindowRect(hwndFrom,hwndTo,lprc) MapWindowPoints((hwndFrom),(hwndTo),(POINT*)(lprc),2)
-#define ScrollBar_Enable(hwndCtl,flags) EnableScrollBar((hwndCtl),SB_CTL,(flags))
-#define ScrollBar_GetPos(hwndCtl) GetScrollPos((hwndCtl),SB_CTL)
-#define ScrollBar_GetRange(hwndCtl,lpposMin,lpposMax) GetScrollRange((hwndCtl),SB_CTL,(lpposMin),(lpposMax))
-#define ScrollBar_SetPos(hwndCtl,pos,fRedraw) SetScrollPos((hwndCtl),SB_CTL,(pos),(fRedraw))
-#define ScrollBar_SetRange(hwndCtl,posMin,posMax,fRedraw) SetScrollRange((hwndCtl),SB_CTL,(posMin),(posMax),(fRedraw))
-#define ScrollBar_Show(hwndCtl,fShow) ShowWindow((hwndCtl),(fShow) ? SW_SHOWNORMAL : SW_HIDE)
-#define SelectBitmap(hdc,hbm) ((HBITMAP)SelectObject((hdc),(HGDIOBJ)(HBITMAP)(hbm)))
-#define SelectBrush(hdc,hbr) ((HBRUSH)SelectObject((hdc),(HGDIOBJ)(HBRUSH)(hbr)))
-#define SelectFont(hdc,hfont) ((HFONT)SelectObject((hdc),(HGDIOBJ)(HFONT)(hfont)))
-#define SelectPen(hdc,hpen) ((HPEN)SelectObject((hdc),(HGDIOBJ)(HPEN)(hpen)))
-#define SetDlgMsgResult(hwnd,msg,result) (( (msg) == WM_CTLCOLORMSGBOX || (msg) == WM_CTLCOLOREDIT || (msg) == WM_CTLCOLORLISTBOX || (msg) == WM_CTLCOLORBTN || (msg) == WM_CTLCOLORDLG || (msg) == WM_CTLCOLORSCROLLBAR || (msg) == WM_CTLCOLORSTATIC || (msg) == WM_COMPAREITEM || (msg) == WM_VKEYTOITEM || (msg) == WM_CHARTOITEM || (msg) == WM_QUERYDRAGICON || (msg) == WM_INITDIALOG ) ? (BOOL)(result) : (SetWindowLong((hwnd),DWL_MSGRESULT,(LPARAM)(LRESULT)(result)),TRUE))
-#define SetWindowFont(hwnd,hfont,fRedraw) FORWARD_WM_SETFONT((hwnd),(hfont),(fRedraw),SendMessage)
-#define SetWindowRedraw(hwnd,fRedraw) ((void)SendMessage(hwnd,WM_SETREDRAW,(WPARAM)(BOOL)(fRedraw),0))
-#define Static_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable))
-#define Static_GetIcon(hwndCtl,hIcon) ((HICON)(UINT)(DWORD)SendMessage((hwndCtl),STM_GETICON,0,0))
-#define Static_GetText(hwndCtl,lpch,cchMax) GetWindowText((hwndCtl),(lpch),(cchMax))
-#define Static_GetTextLength(hwndCtl) GetWindowTextLength(hwndCtl)
-#define Static_SetIcon(hwndCtl,hIcon) ((HICON)(UINT)(DWORD)SendMessage((hwndCtl),STM_SETICON,(WPARAM)(HICON)(hIcon),0))
-#define Static_SetText(hwndCtl,lpsz) SetWindowText((hwndCtl),(lpsz))
-#define SubclassDialog(hwndDlg,lpfn) ((DLGPROC)SetWindowLong(hwndDlg,DWL_DLGPROC,(LPARAM)(DLGPROC)(lpfn)))
-#define SubclassWindow(hwnd,lpfn) ((WNDPROC)SetWindowLong((hwnd),GWL_WNDPROC,(LPARAM)(WNDPROC)(lpfn)))
-#define SubtractRgn(hrgnResult,hrgnA,hrgnB) CombineRgn(hrgnResult,hrgnA,hrgnB,RGN_DIFF)
-#define UnionRgn(hrgnResult,hrgnA,hrgnB) CombineRgn(hrgnResult,hrgnA,hrgnB,RGN_OR)
-#define XorRgn(hrgnResult,hrgnA,hrgnB) CombineRgn(hrgnResult,hrgnA,hrgnB,RGN_XOR)
-
-/* FAR versions of mem and string functions for porting from old code*/
-#define _ffree      free
-#define _fmalloc    malloc
-#define _frealloc   realloc
-#define _fmsize     _msize
-
-#define _fmemcpy    memcpy
-#define _fmemmove   memmove
-#define _fmemset    memset
-#define _fmemcmp    memcmp
-#define _fmemchr    memchr
-#define _fmemccpy   _memccpy
-#define _fmemicmp   _memicmp
-
-#define _fstrcat    strcat
-#define _fstrchr    strchr
-#define _fstrcmp    strcmp
-#define _fstrcpy    strcpy
-#define _fstrcspn   strcspn
-#define _fstrdup    _strdup
-#define _fstricmp   _stricmp
-#define _fstrlen    strlen
-#define _fstrlwr    _strlwr
-#define _fstrncat   strncat
-#define _fstrncmp   strncmp
-#define _fstrncpy   strncpy
-#define _fstrnicmp  _strnicmp
-#define _fstrnset   _strnset
-#define _fstrpbrk   strpbrk
-#define _fstrrchr   strrchr
-#define _fstrrev    _strrev
-#define _fstrset    _strset
-#define _fstrspn    strspn
-#define _fstrstr    strstr
-#define _fstrtok    strtok
-#define _fstrupr    _strupr
-
-#define hmemcpy MoveMemory
-
-#endif
diff --git a/winsup/w32api/include/winerror.h b/winsup/w32api/include/winerror.h
deleted file mode 100644
index 93fc2fa14..000000000
--- a/winsup/w32api/include/winerror.h
+++ /dev/null
@@ -1,2228 +0,0 @@
-#ifndef _WINERROR_H
-#define _WINERROR_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define ERROR_SUCCESS 0L
-#define NO_ERROR 0L
-#define ERROR_INVALID_FUNCTION 1L
-#define ERROR_FILE_NOT_FOUND 2L
-#define ERROR_PATH_NOT_FOUND 3L
-#define ERROR_TOO_MANY_OPEN_FILES 4L
-#define ERROR_ACCESS_DENIED 5L
-#define ERROR_INVALID_HANDLE 6L
-#define ERROR_ARENA_TRASHED 7L
-#define ERROR_NOT_ENOUGH_MEMORY 8L
-#define ERROR_INVALID_BLOCK 9L
-#define ERROR_BAD_ENVIRONMENT 10L
-#define ERROR_BAD_FORMAT 11L
-#define ERROR_INVALID_ACCESS 12L
-#define ERROR_INVALID_DATA 13L
-#define ERROR_OUTOFMEMORY 14L
-#define ERROR_INVALID_DRIVE 15L
-#define ERROR_CURRENT_DIRECTORY 16L
-#define ERROR_NOT_SAME_DEVICE 17L
-#define ERROR_NO_MORE_FILES 18L
-#define ERROR_WRITE_PROTECT 19L
-#define ERROR_BAD_UNIT 20L
-#define ERROR_NOT_READY 21L
-#define ERROR_BAD_COMMAND 22L
-#define ERROR_CRC 23L
-#define ERROR_BAD_LENGTH 24L
-#define ERROR_SEEK 25L
-#define ERROR_NOT_DOS_DISK 26L
-#define ERROR_SECTOR_NOT_FOUND 27L
-#define ERROR_OUT_OF_PAPER 28L
-#define ERROR_WRITE_FAULT 29L
-#define ERROR_READ_FAULT 30L
-#define ERROR_GEN_FAILURE 31L
-#define ERROR_SHARING_VIOLATION 32L
-#define ERROR_LOCK_VIOLATION 33L
-#define ERROR_WRONG_DISK 34L
-#define ERROR_SHARING_BUFFER_EXCEEDED 36L
-#define ERROR_HANDLE_EOF 38L
-#define ERROR_HANDLE_DISK_FULL 39L
-#define ERROR_NOT_SUPPORTED 50L
-#define ERROR_REM_NOT_LIST 51L
-#define ERROR_DUP_NAME 52L
-#define ERROR_BAD_NETPATH 53L
-#define ERROR_NETWORK_BUSY 54L
-#define ERROR_DEV_NOT_EXIST 55L
-#define ERROR_TOO_MANY_CMDS 56L
-#define ERROR_ADAP_HDW_ERR 57L
-#define ERROR_BAD_NET_RESP 58L
-#define ERROR_UNEXP_NET_ERR 59L
-#define ERROR_BAD_REM_ADAP 60L
-#define ERROR_PRINTQ_FULL 61L
-#define ERROR_NO_SPOOL_SPACE 62L
-#define ERROR_PRINT_CANCELLED 63L
-#define ERROR_NETNAME_DELETED 64L
-#define ERROR_NETWORK_ACCESS_DENIED 65L
-#define ERROR_BAD_DEV_TYPE 66L
-#define ERROR_BAD_NET_NAME 67L
-#define ERROR_TOO_MANY_NAMES 68L
-#define ERROR_TOO_MANY_SESS 69L
-#define ERROR_SHARING_PAUSED 70L
-#define ERROR_REQ_NOT_ACCEP 71L
-#define ERROR_REDIR_PAUSED 72L
-#define ERROR_FILE_EXISTS 80L
-#define ERROR_CANNOT_MAKE 82L
-#define ERROR_FAIL_I24 83L
-#define ERROR_OUT_OF_STRUCTURES 84L
-#define ERROR_ALREADY_ASSIGNED 85L
-#define ERROR_INVALID_PASSWORD 86L
-#define ERROR_INVALID_PARAMETER 87L
-#define ERROR_NET_WRITE_FAULT 88L
-#define ERROR_NO_PROC_SLOTS 89L
-#define ERROR_TOO_MANY_SEMAPHORES 100L
-#define ERROR_EXCL_SEM_ALREADY_OWNED 101L
-#define ERROR_SEM_IS_SET 102L
-#define ERROR_TOO_MANY_SEM_REQUESTS 103L
-#define ERROR_INVALID_AT_INTERRUPT_TIME 104L
-#define ERROR_SEM_OWNER_DIED 105L
-#define ERROR_SEM_USER_LIMIT 106L
-#define ERROR_DISK_CHANGE 107L
-#define ERROR_DRIVE_LOCKED 108L
-#define ERROR_BROKEN_PIPE 109L
-#define ERROR_OPEN_FAILED 110L
-#define ERROR_BUFFER_OVERFLOW 111L
-#define ERROR_DISK_FULL 112L
-#define ERROR_NO_MORE_SEARCH_HANDLES 113L
-#define ERROR_INVALID_TARGET_HANDLE 114L
-#define ERROR_INVALID_CATEGORY 117L
-#define ERROR_INVALID_VERIFY_SWITCH 118L
-#define ERROR_BAD_DRIVER_LEVEL 119L
-#define ERROR_CALL_NOT_IMPLEMENTED 120L
-#define ERROR_SEM_TIMEOUT 121L
-#define ERROR_INSUFFICIENT_BUFFER 122L
-#define ERROR_INVALID_NAME 123L
-#define ERROR_INVALID_LEVEL 124L
-#define ERROR_NO_VOLUME_LABEL 125L
-#define ERROR_MOD_NOT_FOUND 126L
-#define ERROR_PROC_NOT_FOUND 127L
-#define ERROR_WAIT_NO_CHILDREN 128L
-#define ERROR_CHILD_NOT_COMPLETE 129L
-#define ERROR_DIRECT_ACCESS_HANDLE 130L
-#define ERROR_NEGATIVE_SEEK 131L
-#define ERROR_SEEK_ON_DEVICE 132L
-#define ERROR_IS_JOIN_TARGET 133L
-#define ERROR_IS_JOINED 134L
-#define ERROR_IS_SUBSTED 135L
-#define ERROR_NOT_JOINED 136L
-#define ERROR_NOT_SUBSTED 137L
-#define ERROR_JOIN_TO_JOIN 138L
-#define ERROR_SUBST_TO_SUBST 139L
-#define ERROR_JOIN_TO_SUBST 140L
-#define ERROR_SUBST_TO_JOIN 141L
-#define ERROR_BUSY_DRIVE 142L
-#define ERROR_SAME_DRIVE 143L
-#define ERROR_DIR_NOT_ROOT 144L
-#define ERROR_DIR_NOT_EMPTY 145L
-#define ERROR_IS_SUBST_PATH 146L
-#define ERROR_IS_JOIN_PATH 147L
-#define ERROR_PATH_BUSY 148L
-#define ERROR_IS_SUBST_TARGET 149L
-#define ERROR_SYSTEM_TRACE 150L
-#define ERROR_INVALID_EVENT_COUNT 151L
-#define ERROR_TOO_MANY_MUXWAITERS 152L
-#define ERROR_INVALID_LIST_FORMAT 153L
-#define ERROR_LABEL_TOO_LONG 154L
-#define ERROR_TOO_MANY_TCBS 155L
-#define ERROR_SIGNAL_REFUSED 156L
-#define ERROR_DISCARDED 157L
-#define ERROR_NOT_LOCKED 158L
-#define ERROR_BAD_THREADID_ADDR 159L
-#define ERROR_BAD_ARGUMENTS 160L
-#define ERROR_BAD_PATHNAME 161L
-#define ERROR_SIGNAL_PENDING 162L
-#define ERROR_MAX_THRDS_REACHED 164L
-#define ERROR_LOCK_FAILED 167L
-#define ERROR_BUSY 170L
-#define ERROR_CANCEL_VIOLATION 173L
-#define ERROR_ATOMIC_LOCKS_NOT_SUPPORTED 174L
-#define ERROR_INVALID_SEGMENT_NUMBER 180L
-#define ERROR_INVALID_ORDINAL 182L
-#define ERROR_ALREADY_EXISTS 183L
-#define ERROR_INVALID_FLAG_NUMBER 186L
-#define ERROR_SEM_NOT_FOUND 187L
-#define ERROR_INVALID_STARTING_CODESEG 188L
-#define ERROR_INVALID_STACKSEG 189L
-#define ERROR_INVALID_MODULETYPE 190L
-#define ERROR_INVALID_EXE_SIGNATURE 191L
-#define ERROR_EXE_MARKED_INVALID 192L
-#define ERROR_BAD_EXE_FORMAT 193L
-#define ERROR_ITERATED_DATA_EXCEEDS_64k 194L
-#define ERROR_INVALID_MINALLOCSIZE 195L
-#define ERROR_DYNLINK_FROM_INVALID_RING 196L
-#define ERROR_IOPL_NOT_ENABLED 197L
-#define ERROR_INVALID_SEGDPL 198L
-#define ERROR_AUTODATASEG_EXCEEDS_64k 199L
-#define ERROR_RING2SEG_MUST_BE_MOVABLE 200L
-#define ERROR_RELOC_CHAIN_XEEDS_SEGLIM 201L
-#define ERROR_INFLOOP_IN_RELOC_CHAIN 202L
-#define ERROR_ENVVAR_NOT_FOUND 203L
-#define ERROR_NO_SIGNAL_SENT 205L
-#define ERROR_FILENAME_EXCED_RANGE 206L
-#define ERROR_RING2_STACK_IN_USE 207L
-#define ERROR_META_EXPANSION_TOO_LONG 208L
-#define ERROR_INVALID_SIGNAL_NUMBER 209L
-#define ERROR_THREAD_1_INACTIVE 210L
-#define ERROR_LOCKED 212L
-#define ERROR_TOO_MANY_MODULES 214L
-#define ERROR_NESTING_NOT_ALLOWED 215L
-#define ERROR_EXE_MACHINE_TYPE_MISMATCH 216L
-#define ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY 217L
-#define ERRO_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY 218L
-#define ERROR_BAD_PIPE 230L
-#define ERROR_PIPE_BUSY 231L
-#define ERROR_NO_DATA 232L
-#define ERROR_PIPE_NOT_CONNECTED 233L
-#define ERROR_MORE_DATA 234L
-#define ERROR_VC_DISCONNECTED 240L
-#define ERROR_INVALID_EA_NAME 254L
-#define ERROR_EA_LIST_INCONSISTENT 255L
-#ifndef WAIT_TIMEOUT /* also in winbase.h */
-#define WAIT_TIMEOUT 258L
-#endif
-#define ERROR_NO_MORE_ITEMS 259L
-#define ERROR_CANNOT_COPY 266L
-#define ERROR_DIRECTORY 267L
-#define ERROR_EAS_DIDNT_FIT 275L
-#define ERROR_EA_FILE_CORRUPT 276L
-#define ERROR_EA_TABLE_FULL 277L
-#define ERROR_INVALID_EA_HANDLE 278L
-#define ERROR_EAS_NOT_SUPPORTED 282L
-#define ERROR_NOT_OWNER 288L
-#define ERROR_TOO_MANY_POSTS 298L
-#define ERROR_PARTIAL_COPY 299L
-#define ERROR_OPLOCK_NOT_GRANTED 300L
-#define ERROR_INVALID_OPLOCK_PROTOCOL 301L
-#define ERROR_DISK_TOO_FRAGMENTED 302L
-#define ERROR_DELETE_PENDING 303L
-#define ERROR_MR_MID_NOT_FOUND 317L
-#define ERROR_SCOPE_NOT_FOUND 318L
-#define ERROR_INVALID_ADDRESS 487L
-#define ERROR_ARITHMETIC_OVERFLOW 534L
-#define ERROR_PIPE_CONNECTED 535L
-#define ERROR_PIPE_LISTENING 536L
-#define ERROR_EA_ACCESS_DENIED 994L
-#define ERROR_OPERATION_ABORTED 995L
-#define ERROR_IO_INCOMPLETE 996L
-#define ERROR_IO_PENDING 997L
-#define ERROR_NOACCESS 998L
-#define ERROR_SWAPERROR 999L
-#define ERROR_STACK_OVERFLOW 1001L
-#define ERROR_INVALID_MESSAGE 1002L
-#define ERROR_CAN_NOT_COMPLETE 1003L
-#define ERROR_INVALID_FLAGS 1004L
-#define ERROR_UNRECOGNIZED_VOLUME 1005L
-#define ERROR_FILE_INVALID 1006L
-#define ERROR_FULLSCREEN_MODE 1007L
-#define ERROR_NO_TOKEN 1008L
-#define ERROR_BADDB 1009L
-#define ERROR_BADKEY 1010L
-#define ERROR_CANTOPEN 1011L
-#define ERROR_CANTREAD 1012L
-#define ERROR_CANTWRITE 1013L
-#define ERROR_REGISTRY_RECOVERED 1014L
-#define ERROR_REGISTRY_CORRUPT 1015L
-#define ERROR_REGISTRY_IO_FAILED 1016L
-#define ERROR_NOT_REGISTRY_FILE 1017L
-#define ERROR_KEY_DELETED 1018L
-#define ERROR_NO_LOG_SPACE 1019L
-#define ERROR_KEY_HAS_CHILDREN 1020L
-#define ERROR_CHILD_MUST_BE_VOLATILE 1021L
-#define ERROR_NOTIFY_ENUM_DIR 1022L
-#define ERROR_DEPENDENT_SERVICES_RUNNING 1051L
-#define ERROR_INVALID_SERVICE_CONTROL 1052L
-#define ERROR_SERVICE_REQUEST_TIMEOUT 1053L
-#define ERROR_SERVICE_NO_THREAD 1054L
-#define ERROR_SERVICE_DATABASE_LOCKED 1055L
-#define ERROR_SERVICE_ALREADY_RUNNING 1056L
-#define ERROR_INVALID_SERVICE_ACCOUNT 1057L
-#define ERROR_SERVICE_DISABLED 1058L
-#define ERROR_CIRCULAR_DEPENDENCY 1059L
-#define ERROR_SERVICE_DOES_NOT_EXIST 1060L
-#define ERROR_SERVICE_CANNOT_ACCEPT_CTRL 1061L
-#define ERROR_SERVICE_NOT_ACTIVE 1062L
-#define ERROR_FAILED_SERVICE_CONTROLLER_CONNECT 1063L
-#define ERROR_EXCEPTION_IN_SERVICE 1064L
-#define ERROR_DATABASE_DOES_NOT_EXIST 1065L
-#define ERROR_SERVICE_SPECIFIC_ERROR 1066L
-#define ERROR_PROCESS_ABORTED 1067L
-#define ERROR_SERVICE_DEPENDENCY_FAIL 1068L
-#define ERROR_SERVICE_LOGON_FAILED 1069L
-#define ERROR_SERVICE_START_HANG 1070L
-#define ERROR_INVALID_SERVICE_LOCK 1071L
-#define ERROR_SERVICE_MARKED_FOR_DELETE 1072L
-#define ERROR_SERVICE_EXISTS 1073L
-#define ERROR_ALREADY_RUNNING_LKG 1074L
-#define ERROR_SERVICE_DEPENDENCY_DELETED 1075L
-#define ERROR_BOOT_ALREADY_ACCEPTED 1076L
-#define ERROR_SERVICE_NEVER_STARTED 1077L
-#define ERROR_DUPLICATE_SERVICE_NAME 1078L
-#define ERROR_DIFFERENT_SERVICE_ACCOUNT 1079L
-#define ERROR_CANNOT_DETECT_DRIVER_FAILURE 1080L
-#define ERROR_CANNOT_DETECT_PROCESS_ABORT 1081L
-#define ERROR_NO_RECOVERY_PROGRAM 1082L
-#define ERROR_SERVICE_NOT_IN_EXE 1083L
-#define ERROR_NOT_SAFEBOOT_SERVICE 1084L
-#define ERROR_END_OF_MEDIA 1100L
-#define ERROR_FILEMARK_DETECTED 1101L
-#define ERROR_BEGINNING_OF_MEDIA 1102L
-#define ERROR_SETMARK_DETECTED 1103L
-#define ERROR_NO_DATA_DETECTED 1104L
-#define ERROR_PARTITION_FAILURE 1105L
-#define ERROR_INVALID_BLOCK_LENGTH 1106L
-#define ERROR_DEVICE_NOT_PARTITIONED 1107L
-#define ERROR_UNABLE_TO_LOCK_MEDIA 1108L
-#define ERROR_UNABLE_TO_UNLOAD_MEDIA 1109L
-#define ERROR_MEDIA_CHANGED 1110L
-#define ERROR_BUS_RESET 1111L
-#define ERROR_NO_MEDIA_IN_DRIVE 1112L
-#define ERROR_NO_UNICODE_TRANSLATION 1113L
-#define ERROR_DLL_INIT_FAILED 1114L
-#define ERROR_SHUTDOWN_IN_PROGRESS 1115L
-#define ERROR_NO_SHUTDOWN_IN_PROGRESS 1116L
-#define ERROR_IO_DEVICE 1117L
-#define ERROR_SERIAL_NO_DEVICE 1118L
-#define ERROR_IRQ_BUSY 1119L
-#define ERROR_MORE_WRITES 1120L
-#define ERROR_COUNTER_TIMEOUT 1121L
-#define ERROR_FLOPPY_ID_MARK_NOT_FOUND 1122L
-#define ERROR_FLOPPY_WRONG_CYLINDER 1123L
-#define ERROR_FLOPPY_UNKNOWN_ERROR 1124L
-#define ERROR_FLOPPY_BAD_REGISTERS 1125L
-#define ERROR_DISK_RECALIBRATE_FAILED 1126L
-#define ERROR_DISK_OPERATION_FAILED 1127L
-#define ERROR_DISK_RESET_FAILED 1128L
-#define ERROR_EOM_OVERFLOW 1129L
-#define ERROR_NOT_ENOUGH_SERVER_MEMORY 1130L
-#define ERROR_POSSIBLE_DEADLOCK 1131L
-#define ERROR_MAPPED_ALIGNMENT 1132L
-#define ERROR_SET_POWER_STATE_VETOED 1140L
-#define ERROR_SET_POWER_STATE_FAILED 1141L
-#define ERROR_TOO_MANY_LINKS 1142L
-#define ERROR_OLD_WIN_VERSION 1150L
-#define ERROR_APP_WRONG_OS 1151L
-#define ERROR_SINGLE_INSTANCE_APP 1152L
-#define ERROR_RMODE_APP 1153L
-#define ERROR_INVALID_DLL 1154L
-#define ERROR_NO_ASSOCIATION 1155L
-#define ERROR_DDE_FAIL 1156L
-#define ERROR_DLL_NOT_FOUND 1157L
-#define ERROR_NO_MORE_USER_HANDLES 1158L
-#define ERROR_MESSAGE_SYNC_ONLY 1159L
-#define ERROR_SOURCE_ELEMENT_EMPTY 1160L
-#define ERROR_DESTINATION_ELEMENT_FULL 1161L
-#define ERROR_ILLEGAL_ELEMENT_ADDRESS 1162L
-#define ERROR_MAGAZINE_NOT_PRESENT 1163L
-#define ERROR_DEVICE_REINITIALIZATION_NEEDED 1164L
-#define ERROR_DEVICE_REQUIRES_CLEANING 1165L
-#define ERROR_DEVICE_DOOR_OPEN 1166L
-#define ERROR_DEVICE_NOT_CONNECTED 1167L
-#define ERROR_NOT_FOUND 1168L
-#define ERROR_NO_MATCH 1169L
-#define ERROR_SET_NOT_FOUND 1170L
-#define ERROR_POINT_NOT_FOUND 1171L
-#define ERROR_NO_TRACKING_SERVICE 1172L
-#define ERROR_NO_VOLUME_ID 1173L
-#define ERROR_UNABLE_TO_REMOVE_REPLACED 1175L
-#define ERROR_UNABLE_TO_MOVE_REPLACEMENT 1176L
-#define ERROR_UNABLE_TO_MOVE_REPLACEMENT_2 1177L
-#define ERROR_JOURNAL_DELETE_IN_PROGRESS 1178L
-#define ERROR_JOURNAL_NOT_ACTIVE 1179L
-#define ERROR_POTENTIAL_FILE_FOUND 1180L
-#define ERROR_JOURNAL_ENTRY_DELETED 1181L
-#define ERROR_BAD_DEVICE 1200L
-#define ERROR_CONNECTION_UNAVAIL 1201L
-#define ERROR_DEVICE_ALREADY_REMEMBERED 1202L
-#define ERROR_NO_NET_OR_BAD_PATH 1203L
-#define ERROR_BAD_PROVIDER 1204L
-#define ERROR_CANNOT_OPEN_PROFILE 1205L
-#define ERROR_BAD_PROFILE 1206L
-#define ERROR_NOT_CONTAINER 1207L
-#define ERROR_EXTENDED_ERROR 1208L
-#define ERROR_INVALID_GROUPNAME 1209L
-#define ERROR_INVALID_COMPUTERNAME 1210L
-#define ERROR_INVALID_EVENTNAME 1211L
-#define ERROR_INVALID_DOMAINNAME 1212L
-#define ERROR_INVALID_SERVICENAME 1213L
-#define ERROR_INVALID_NETNAME 1214L
-#define ERROR_INVALID_SHARENAME 1215L
-#define ERROR_INVALID_PASSWORDNAME 1216L
-#define ERROR_INVALID_MESSAGENAME 1217L
-#define ERROR_INVALID_MESSAGEDEST 1218L
-#define ERROR_SESSION_CREDENTIAL_CONFLICT 1219L
-#define ERROR_REMOTE_SESSION_LIMIT_EXCEEDED 1220L
-#define ERROR_DUP_DOMAINNAME 1221L
-#define ERROR_NO_NETWORK 1222L
-#define ERROR_CANCELLED 1223L
-#define ERROR_USER_MAPPED_FILE 1224L
-#define ERROR_CONNECTION_REFUSED 1225L
-#define ERROR_GRACEFUL_DISCONNECT 1226L
-#define ERROR_ADDRESS_ALREADY_ASSOCIATED 1227L
-#define ERROR_ADDRESS_NOT_ASSOCIATED 1228L
-#define ERROR_CONNECTION_INVALID 1229L
-#define ERROR_CONNECTION_ACTIVE 1230L
-#define ERROR_NETWORK_UNREACHABLE 1231L
-#define ERROR_HOST_UNREACHABLE 1232L
-#define ERROR_PROTOCOL_UNREACHABLE 1233L
-#define ERROR_PORT_UNREACHABLE 1234L
-#define ERROR_REQUEST_ABORTED 1235L
-#define ERROR_CONNECTION_ABORTED 1236L
-#define ERROR_RETRY 1237L
-#define ERROR_CONNECTION_COUNT_LIMIT 1238L
-#define ERROR_LOGIN_TIME_RESTRICTION 1239L
-#define ERROR_LOGIN_WKSTA_RESTRICTION 1240L
-#define ERROR_INCORRECT_ADDRESS 1241L
-#define ERROR_ALREADY_REGISTERED 1242L
-#define ERROR_SERVICE_NOT_FOUND 1243L
-#define ERROR_NOT_AUTHENTICATED 1244L
-#define ERROR_NOT_LOGGED_ON 1245L
-#define ERROR_CONTINUE 1246L
-#define ERROR_ALREADY_INITIALIZED 1247L
-#define ERROR_NO_MORE_DEVICES 1248L
-#define ERROR_NO_SUCH_SITE 1249L
-#define ERROR_DOMAIN_CONTROLLER_EXISTS 1250L
-#define ERROR_ONLY_IF_CONNECTED 1251L
-#define ERROR_OVERRIDE_NOCHANGES 1252L
-#define ERROR_BAD_USER_PROFILE 1253L
-#define ERROR_NOT_SUPPORTED_ON_SBS 1254L
-#define ERROR_SERVER_SHUTDOWN_IN_PROGRESS 1255L
-#define ERROR_HOST_DOWN 1256L
-#define ERROR_NON_ACCOUNT_SID 1257L
-#define ERROR_NON_DOMAIN_SID 1258L
-#define ERROR_APPHELP_BLOCK 1259L
-#define ERROR_ACCESS_DISABLED_BY_POLICY 1260L
-#define ERROR_REG_NAT_CONSUMPTION 1261L
-#define ERROR_CSCSHARE_OFFLINE 1262L
-#define ERROR_PKINIT_FAILURE 1263L
-#define ERROR_SMARTCARD_SUBSYSTEM_FAILURE 1264L
-#define ERROR_DOWNGRADE_DETECTED 1265L
-#define SEC_E_SMARTCARD_CERT_REVOKED 1266L
-#define SEC_E_ISSUING_CA_UNTRUSTED 1267L
-#define SEC_E_REVOCATION_OFFLINE_C 1268L
-#define SEC_E_PKINIT_CLIENT_FAILUR 1269L
-#define SEC_E_SMARTCARD_CERT_EXPIRED 1270L
-#define ERROR_MACHINE_LOCKED 1271L
-#define ERROR_CALLBACK_SUPPLIED_INVALID_DATA 1273L
-#define ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED 1274L
-#define ERROR_DRIVER_BLOCKED 1275L
-#define ERROR_INVALID_IMPORT_OF_NON_DLL 1276L
-#define ERROR_ACCESS_DISABLED_WEBBLADE 1277L
-#define ERROR_ACCESS_DISABLED_WEBBLADE_TAMPER 1278L
-#define ERROR_RECOVERY_FAILURE 1279L
-#define ERROR_ALREADY_FIBER 1280L
-#define ERROR_ALREADY_THREAD 1281L
-#define ERROR_STACK_BUFFER_OVERRUN 1282L
-#define ERROR_PARAMETER_QUOTA_EXCEEDED 1283L
-#define ERROR_DEBUGGER_INACTIVE 1284L
-#define ERROR_NOT_ALL_ASSIGNED 1300L
-#define ERROR_SOME_NOT_MAPPED 1301L
-#define ERROR_NO_QUOTAS_FOR_ACCOUNT 1302L
-#define ERROR_LOCAL_USER_SESSION_KEY 1303L
-#define ERROR_NULL_LM_PASSWORD 1304L
-#define ERROR_UNKNOWN_REVISION 1305L
-#define ERROR_REVISION_MISMATCH 1306L
-#define ERROR_INVALID_OWNER 1307L
-#define ERROR_INVALID_PRIMARY_GROUP 1308L
-#define ERROR_NO_IMPERSONATION_TOKEN 1309L
-#define ERROR_CANT_DISABLE_MANDATORY 1310L
-#define ERROR_NO_LOGON_SERVERS 1311L
-#define ERROR_NO_SUCH_LOGON_SESSION 1312L
-#define ERROR_NO_SUCH_PRIVILEGE 1313L
-#define ERROR_PRIVILEGE_NOT_HELD 1314L
-#define ERROR_INVALID_ACCOUNT_NAME 1315L
-#define ERROR_USER_EXISTS 1316L
-#define ERROR_NO_SUCH_USER 1317L
-#define ERROR_GROUP_EXISTS 1318L
-#define ERROR_NO_SUCH_GROUP 1319L
-#define ERROR_MEMBER_IN_GROUP 1320L
-#define ERROR_MEMBER_NOT_IN_GROUP 1321L
-#define ERROR_LAST_ADMIN 1322L
-#define ERROR_WRONG_PASSWORD 1323L
-#define ERROR_ILL_FORMED_PASSWORD 1324L
-#define ERROR_PASSWORD_RESTRICTION 1325L
-#define ERROR_LOGON_FAILURE 1326L
-#define ERROR_ACCOUNT_RESTRICTION 1327L
-#define ERROR_INVALID_LOGON_HOURS 1328L
-#define ERROR_INVALID_WORKSTATION 1329L
-#define ERROR_PASSWORD_EXPIRED 1330L
-#define ERROR_ACCOUNT_DISABLED 1331L
-#define ERROR_NONE_MAPPED 1332L
-#define ERROR_TOO_MANY_LUIDS_REQUESTED 1333L
-#define ERROR_LUIDS_EXHAUSTED 1334L
-#define ERROR_INVALID_SUB_AUTHORITY 1335L
-#define ERROR_INVALID_ACL 1336L
-#define ERROR_INVALID_SID 1337L
-#define ERROR_INVALID_SECURITY_DESCR 1338L
-#define ERROR_BAD_INHERITANCE_ACL 1340L
-#define ERROR_SERVER_DISABLED 1341L
-#define ERROR_SERVER_NOT_DISABLED 1342L
-#define ERROR_INVALID_ID_AUTHORITY 1343L
-#define ERROR_ALLOTTED_SPACE_EXCEEDED 1344L
-#define ERROR_INVALID_GROUP_ATTRIBUTES 1345L
-#define ERROR_BAD_IMPERSONATION_LEVEL 1346L
-#define ERROR_CANT_OPEN_ANONYMOUS 1347L
-#define ERROR_BAD_VALIDATION_CLASS 1348L
-#define ERROR_BAD_TOKEN_TYPE 1349L
-#define ERROR_NO_SECURITY_ON_OBJECT 1350L
-#define ERROR_CANT_ACCESS_DOMAIN_INFO 1351L
-#define ERROR_INVALID_SERVER_STATE 1352L
-#define ERROR_INVALID_DOMAIN_STATE 1353L
-#define ERROR_INVALID_DOMAIN_ROLE 1354L
-#define ERROR_NO_SUCH_DOMAIN 1355L
-#define ERROR_DOMAIN_EXISTS 1356L
-#define ERROR_DOMAIN_LIMIT_EXCEEDED 1357L
-#define ERROR_INTERNAL_DB_CORRUPTION 1358L
-#define ERROR_INTERNAL_ERROR 1359L
-#define ERROR_GENERIC_NOT_MAPPED 1360L
-#define ERROR_BAD_DESCRIPTOR_FORMAT 1361L
-#define ERROR_NOT_LOGON_PROCESS 1362L
-#define ERROR_LOGON_SESSION_EXISTS 1363L
-#define ERROR_NO_SUCH_PACKAGE 1364L
-#define ERROR_BAD_LOGON_SESSION_STATE 1365L
-#define ERROR_LOGON_SESSION_COLLISION 1366L
-#define ERROR_INVALID_LOGON_TYPE 1367L
-#define ERROR_CANNOT_IMPERSONATE 1368L
-#define ERROR_RXACT_INVALID_STATE 1369L
-#define ERROR_RXACT_COMMIT_FAILURE 1370L
-#define ERROR_SPECIAL_ACCOUNT 1371L
-#define ERROR_SPECIAL_GROUP 1372L
-#define ERROR_SPECIAL_USER 1373L
-#define ERROR_MEMBERS_PRIMARY_GROUP 1374L
-#define ERROR_TOKEN_ALREADY_IN_USE 1375L
-#define ERROR_NO_SUCH_ALIAS 1376L
-#define ERROR_MEMBER_NOT_IN_ALIAS 1377L
-#define ERROR_MEMBER_IN_ALIAS 1378L
-#define ERROR_ALIAS_EXISTS 1379L
-#define ERROR_LOGON_NOT_GRANTED 1380L
-#define ERROR_TOO_MANY_SECRETS 1381L
-#define ERROR_SECRET_TOO_LONG 1382L
-#define ERROR_INTERNAL_DB_ERROR 1383L
-#define ERROR_TOO_MANY_CONTEXT_IDS 1384L
-#define ERROR_LOGON_TYPE_NOT_GRANTED 1385L
-#define ERROR_NT_CROSS_ENCRYPTION_REQUIRED 1386L
-#define ERROR_NO_SUCH_MEMBER 1387L
-#define ERROR_INVALID_MEMBER 1388L
-#define ERROR_TOO_MANY_SIDS 1389L
-#define ERROR_LM_CROSS_ENCRYPTION_REQUIRED 1390L
-#define ERROR_NO_INHERITANCE 1391L
-#define ERROR_FILE_CORRUPT 1392L
-#define ERROR_DISK_CORRUPT 1393L
-#define ERROR_NO_USER_SESSION_KEY 1394L
-#define ERROR_LICENSE_QUOTA_EXCEEDED 1395L
-#define ERROR_WRONG_TARGET_NAME 1396L
-#define ERROR_MUTUAL_AUTH_FAILED 1397L
-#define ERROR_TIME_SKEW 1398L
-#define ERROR_CURRENT_DOMAIN_NOT_ALLOWED 1399L
-#define ERROR_INVALID_WINDOW_HANDLE 1400L
-#define ERROR_INVALID_MENU_HANDLE 1401L
-#define ERROR_INVALID_CURSOR_HANDLE 1402L
-#define ERROR_INVALID_ACCEL_HANDLE 1403L
-#define ERROR_INVALID_HOOK_HANDLE 1404L
-#define ERROR_INVALID_DWP_HANDLE 1405L
-#define ERROR_TLW_WITH_WSCHILD 1406L
-#define ERROR_CANNOT_FIND_WND_CLASS 1407L
-#define ERROR_WINDOW_OF_OTHER_THREAD 1408L
-#define ERROR_HOTKEY_ALREADY_REGISTERED 1409L
-#define ERROR_CLASS_ALREADY_EXISTS 1410L
-#define ERROR_CLASS_DOES_NOT_EXIST 1411L
-#define ERROR_CLASS_HAS_WINDOWS 1412L
-#define ERROR_INVALID_INDEX 1413L
-#define ERROR_INVALID_ICON_HANDLE 1414L
-#define ERROR_PRIVATE_DIALOG_INDEX 1415L
-#define ERROR_LISTBOX_ID_NOT_FOUND 1416L
-#define ERROR_NO_WILDCARD_CHARACTERS 1417L
-#define ERROR_CLIPBOARD_NOT_OPEN 1418L
-#define ERROR_HOTKEY_NOT_REGISTERED 1419L
-#define ERROR_WINDOW_NOT_DIALOG 1420L
-#define ERROR_CONTROL_ID_NOT_FOUND 1421L
-#define ERROR_INVALID_COMBOBOX_MESSAGE 1422L
-#define ERROR_WINDOW_NOT_COMBOBOX 1423L
-#define ERROR_INVALID_EDIT_HEIGHT 1424L
-#define ERROR_DC_NOT_FOUND 1425L
-#define ERROR_INVALID_HOOK_FILTER 1426L
-#define ERROR_INVALID_FILTER_PROC 1427L
-#define ERROR_HOOK_NEEDS_HMOD 1428L
-#define ERROR_GLOBAL_ONLY_HOOK 1429L
-#define ERROR_JOURNAL_HOOK_SET 1430L
-#define ERROR_HOOK_NOT_INSTALLED 1431L
-#define ERROR_INVALID_LB_MESSAGE 1432L
-#define ERROR_SETCOUNT_ON_BAD_LB 1433L
-#define ERROR_LB_WITHOUT_TABSTOPS 1434L
-#define ERROR_DESTROY_OBJECT_OF_OTHER_THREAD 1435L
-#define ERROR_CHILD_WINDOW_MENU 1436L
-#define ERROR_NO_SYSTEM_MENU 1437L
-#define ERROR_INVALID_MSGBOX_STYLE 1438L
-#define ERROR_INVALID_SPI_VALUE 1439L
-#define ERROR_SCREEN_ALREADY_LOCKED 1440L
-#define ERROR_HWNDS_HAVE_DIFF_PARENT 1441L
-#define ERROR_NOT_CHILD_WINDOW 1442L
-#define ERROR_INVALID_GW_COMMAND 1443L
-#define ERROR_INVALID_THREAD_ID 1444L
-#define ERROR_NON_MDICHILD_WINDOW 1445L
-#define ERROR_POPUP_ALREADY_ACTIVE 1446L
-#define ERROR_NO_SCROLLBARS 1447L
-#define ERROR_INVALID_SCROLLBAR_RANGE 1448L
-#define ERROR_INVALID_SHOWWIN_COMMAND 1449L
-#define ERROR_NO_SYSTEM_RESOURCES 1450L
-#define ERROR_NONPAGED_SYSTEM_RESOURCES 1451L
-#define ERROR_PAGED_SYSTEM_RESOURCES 1452L
-#define ERROR_WORKING_SET_QUOTA 1453L
-#define ERROR_PAGEFILE_QUOTA 1454L
-#define ERROR_COMMITMENT_LIMIT 1455L
-#define ERROR_MENU_ITEM_NOT_FOUND 1456L
-#define ERROR_INVALID_KEYBOARD_HANDLE 1457L
-#define ERROR_HOOK_TYPE_NOT_ALLOWED 1458L
-#define ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION 1459L
-#define ERROR_TIMEOUT 1460L
-#define ERROR_INVALID_MONITOR_HANDLE 1461L
-#define ERROR_EVENTLOG_FILE_CORRUPT 1500L
-#define ERROR_EVENTLOG_CANT_START 1501L
-#define ERROR_LOG_FILE_FULL 1502L
-#define ERROR_EVENTLOG_FILE_CHANGED 1503L
-#define ERROR_INSTALL_SERVICE_FAILURE 1601L
-#define ERROR_INSTALL_USEREXIT 1602L
-#define ERROR_INSTALL_FAILURE 1603L
-#define ERROR_INSTALL_SUSPEND 1604L
-#define ERROR_UNKNOWN_PRODUCT 1605L
-#define ERROR_UNKNOWN_FEATURE 1606L
-#define ERROR_UNKNOWN_COMPONENT 1607L
-#define ERROR_UNKNOWN_PROPERTY 1608L
-#define ERROR_INVALID_HANDLE_STATE 1609L
-#define ERROR_BAD_CONFIGURATION 1610L
-#define ERROR_INDEX_ABSENT 1611L
-#define ERROR_INSTALL_SOURCE_ABSENT 1612L
-#define ERROR_INSTALL_PACKAGE_VERSION 1613L
-#define ERROR_PRODUCT_UNINSTALLED 1614L
-#define ERROR_BAD_QUERY_SYNTAX 1615L
-#define ERROR_INVALID_FIELD 1616L
-#define ERROR_DEVICE_REMOVED 1617L
-#define ERROR_INSTALL_ALREADY_RUNNING 1618L
-#define ERROR_INSTALL_PACKAGE_OPEN_FAILED 1619L
-#define ERROR_INSTALL_PACKAGE_INVALID 1620L
-#define ERROR_INSTALL_UI_FAILURE 1621L
-#define ERROR_INSTALL_LOG_FAILURE 1622L
-#define ERROR_INSTALL_LANGUAGE_UNSUPPORTED 1623L
-#define ERROR_INSTALL_TRANSFORM_FAILURE 1624L
-#define ERROR_INSTALL_PACKAGE_REJECTED 1625L
-#define ERROR_FUNCTION_NOT_CALLED 1626L
-#define ERROR_FUNCTION_FAILED 1627L
-#define ERROR_INVALID_TABLE 1628L
-#define ERROR_DATATYPE_MISMATCH 1629L
-#define ERROR_UNSUPPORTED_TYPE 1630L
-#define ERROR_CREATE_FAILED 1631L
-#define ERROR_INSTALL_TEMP_UNWRITABLE 1632L
-#define ERROR_INSTALL_PLATFORM_UNSUPPORTED 1633L
-#define ERROR_INSTALL_NOTUSED 1634L
-#define ERROR_PATCH_PACKAGE_OPEN_FAILED 1635L
-#define ERROR_PATCH_PACKAGE_INVALID 1636L
-#define ERROR_PATCH_PACKAGE_UNSUPPORTED 1637L
-#define ERROR_PRODUCT_VERSION 1638L
-#define ERROR_INVALID_COMMAND_LINE 1639L
-#define ERROR_INSTALL_REMOTE_DISALLOWED 1640L
-#define ERROR_SUCCESS_REBOOT_INITIATED 1641L
-#define ERROR_PATCH_TARGET_NOT_FOUND 1642L
-#define ERROR_PATCH_PACKAGE_REJECTED 1643L
-#define ERROR_INSTALL_TRANSFORM_REJECTED 1644L
-#define ERROR_INSTALL_REMOTE_PROHIBITED 1645L
-#define RPC_S_INVALID_STRING_BINDING 1700L
-#define RPC_S_WRONG_KIND_OF_BINDING 1701L
-#define RPC_S_INVALID_BINDING 1702L
-#define RPC_S_PROTSEQ_NOT_SUPPORTED 1703L
-#define RPC_S_INVALID_RPC_PROTSEQ 1704L
-#define RPC_S_INVALID_STRING_UUID 1705L
-#define RPC_S_INVALID_ENDPOINT_FORMAT 1706L
-#define RPC_S_INVALID_NET_ADDR 1707L
-#define RPC_S_NO_ENDPOINT_FOUND 1708L
-#define RPC_S_INVALID_TIMEOUT 1709L
-#define RPC_S_OBJECT_NOT_FOUND 1710L
-#define RPC_S_ALREADY_REGISTERED 1711L
-#define RPC_S_TYPE_ALREADY_REGISTERED 1712L
-#define RPC_S_ALREADY_LISTENING 1713L
-#define RPC_S_NO_PROTSEQS_REGISTERED 1714L
-#define RPC_S_NOT_LISTENING 1715L
-#define RPC_S_UNKNOWN_MGR_TYPE 1716L
-#define RPC_S_UNKNOWN_IF 1717L
-#define RPC_S_NO_BINDINGS 1718L
-#define RPC_S_NO_PROTSEQS 1719L
-#define RPC_S_CANT_CREATE_ENDPOINT 1720L
-#define RPC_S_OUT_OF_RESOURCES 1721L
-#define RPC_S_SERVER_UNAVAILABLE 1722L
-#define RPC_S_SERVER_TOO_BUSY 1723L
-#define RPC_S_INVALID_NETWORK_OPTIONS 1724L
-#define RPC_S_NO_CALL_ACTIVE 1725L
-#define RPC_S_CALL_FAILED 1726L
-#define RPC_S_CALL_FAILED_DNE 1727L
-#define RPC_S_PROTOCOL_ERROR 1728L
-#define RPC_S_UNSUPPORTED_TRANS_SYN 1730L
-#define RPC_S_UNSUPPORTED_TYPE 1732L
-#define RPC_S_INVALID_TAG 1733L
-#define RPC_S_INVALID_BOUND 1734L
-#define RPC_S_NO_ENTRY_NAME 1735L
-#define RPC_S_INVALID_NAME_SYNTAX 1736L
-#define RPC_S_UNSUPPORTED_NAME_SYNTAX 1737L
-#define RPC_S_UUID_NO_ADDRESS 1739L
-#define RPC_S_DUPLICATE_ENDPOINT 1740L
-#define RPC_S_UNKNOWN_AUTHN_TYPE 1741L
-#define RPC_S_MAX_CALLS_TOO_SMALL 1742L
-#define RPC_S_STRING_TOO_LONG 1743L
-#define RPC_S_PROTSEQ_NOT_FOUND 1744L
-#define RPC_S_PROCNUM_OUT_OF_RANGE 1745L
-#define RPC_S_BINDING_HAS_NO_AUTH 1746L
-#define RPC_S_UNKNOWN_AUTHN_SERVICE 1747L
-#define RPC_S_UNKNOWN_AUTHN_LEVEL 1748L
-#define RPC_S_INVALID_AUTH_IDENTITY 1749L
-#define RPC_S_UNKNOWN_AUTHZ_SERVICE 1750L
-#define EPT_S_INVALID_ENTRY 1751L
-#define EPT_S_CANT_PERFORM_OP 1752L
-#define EPT_S_NOT_REGISTERED 1753L
-#define RPC_S_NOTHING_TO_EXPORT 1754L
-#define RPC_S_INCOMPLETE_NAME 1755L
-#define RPC_S_INVALID_VERS_OPTION 1756L
-#define RPC_S_NO_MORE_MEMBERS 1757L
-#define RPC_S_NOT_ALL_OBJS_UNEXPORTED 1758L
-#define RPC_S_INTERFACE_NOT_FOUND 1759L
-#define RPC_S_ENTRY_ALREADY_EXISTS 1760L
-#define RPC_S_ENTRY_NOT_FOUND 1761L
-#define RPC_S_NAME_SERVICE_UNAVAILABLE 1762L
-#define RPC_S_INVALID_NAF_ID 1763L
-#define RPC_S_CANNOT_SUPPORT 1764L
-#define RPC_S_NO_CONTEXT_AVAILABLE 1765L
-#define RPC_S_INTERNAL_ERROR 1766L
-#define RPC_S_ZERO_DIVIDE 1767L
-#define RPC_S_ADDRESS_ERROR 1768L
-#define RPC_S_FP_DIV_ZERO 1769L
-#define RPC_S_FP_UNDERFLOW 1770L
-#define RPC_S_FP_OVERFLOW 1771L
-#define RPC_X_NO_MORE_ENTRIES 1772L
-#define RPC_X_SS_CHAR_TRANS_OPEN_FAIL 1773L
-#define RPC_X_SS_CHAR_TRANS_SHORT_FILE 1774L
-#define RPC_X_SS_IN_NULL_CONTEXT 1775L
-#define RPC_X_SS_CONTEXT_DAMAGED 1777L
-#define RPC_X_SS_HANDLES_MISMATCH 1778L
-#define RPC_X_SS_CANNOT_GET_CALL_HANDLE 1779L
-#define RPC_X_NULL_REF_POINTER 1780L
-#define RPC_X_ENUM_VALUE_OUT_OF_RANGE 1781L
-#define RPC_X_BYTE_COUNT_TOO_SMALL 1782L
-#define RPC_X_BAD_STUB_DATA 1783L
-#define ERROR_INVALID_USER_BUFFER 1784L
-#define ERROR_UNRECOGNIZED_MEDIA 1785L
-#define ERROR_NO_TRUST_LSA_SECRET 1786L
-#define ERROR_NO_TRUST_SAM_ACCOUNT 1787L
-#define ERROR_TRUSTED_DOMAIN_FAILURE 1788L
-#define ERROR_TRUSTED_RELATIONSHIP_FAILURE 1789L
-#define ERROR_TRUST_FAILURE 1790L
-#define RPC_S_CALL_IN_PROGRESS 1791L
-#define ERROR_NETLOGON_NOT_STARTED 1792L
-#define ERROR_ACCOUNT_EXPIRED 1793L
-#define ERROR_REDIRECTOR_HAS_OPEN_HANDLES 1794L
-#define ERROR_PRINTER_DRIVER_ALREADY_INSTALLED 1795L
-#define ERROR_UNKNOWN_PORT 1796L
-#define ERROR_UNKNOWN_PRINTER_DRIVER 1797L
-#define ERROR_UNKNOWN_PRINTPROCESSOR 1798L
-#define ERROR_INVALID_SEPARATOR_FILE 1799L
-#define ERROR_INVALID_PRIORITY 1800L
-#define ERROR_INVALID_PRINTER_NAME 1801L
-#define ERROR_PRINTER_ALREADY_EXISTS 1802L
-#define ERROR_INVALID_PRINTER_COMMAND 1803L
-#define ERROR_INVALID_DATATYPE 1804L
-#define ERROR_INVALID_ENVIRONMENT 1805L
-#define RPC_S_NO_MORE_BINDINGS 1806L
-#define ERROR_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT 1807L
-#define ERROR_NOLOGON_WORKSTATION_TRUST_ACCOUNT 1808L
-#define ERROR_NOLOGON_SERVER_TRUST_ACCOUNT 1809L
-#define ERROR_DOMAIN_TRUST_INCONSISTENT 1810L
-#define ERROR_SERVER_HAS_OPEN_HANDLES 1811L
-#define ERROR_RESOURCE_DATA_NOT_FOUND 1812L
-#define ERROR_RESOURCE_TYPE_NOT_FOUND 1813L
-#define ERROR_RESOURCE_NAME_NOT_FOUND 1814L
-#define ERROR_RESOURCE_LANG_NOT_FOUND 1815L
-#define ERROR_NOT_ENOUGH_QUOTA 1816L
-#define RPC_S_NO_INTERFACES 1817L
-#define RPC_S_CALL_CANCELLED 1818L
-#define RPC_S_BINDING_INCOMPLETE 1819L
-#define RPC_S_COMM_FAILURE 1820L
-#define RPC_S_UNSUPPORTED_AUTHN_LEVEL 1821L
-#define RPC_S_NO_PRINC_NAME 1822L
-#define RPC_S_NOT_RPC_ERROR 1823L
-#define RPC_S_UUID_LOCAL_ONLY 1824L
-#define RPC_S_SEC_PKG_ERROR 1825L
-#define RPC_S_NOT_CANCELLED 1826L
-#define RPC_X_INVALID_ES_ACTION 1827L
-#define RPC_X_WRONG_ES_VERSION 1828L
-#define RPC_X_WRONG_STUB_VERSION 1829L
-#define RPC_X_INVALID_PIPE_OBJECT 1830L
-#define RPC_X_WRONG_PIPE_ORDER 1831L
-#define RPC_X_WRONG_PIPE_VERSION 1832L
-#define RPC_S_GROUP_MEMBER_NOT_FOUND 1898L
-#define EPT_S_CANT_CREATE 1899L
-#define RPC_S_INVALID_OBJECT 1900L
-#define ERROR_INVALID_TIME 1901L
-#define ERROR_INVALID_FORM_NAME 1902L
-#define ERROR_INVALID_FORM_SIZE 1903L
-#define ERROR_ALREADY_WAITING 1904L
-#define ERROR_PRINTER_DELETED 1905L
-#define ERROR_INVALID_PRINTER_STATE 1906L
-#define ERROR_PASSWORD_MUST_CHANGE 1907L
-#define ERROR_DOMAIN_CONTROLLER_NOT_FOUND 1908L
-#define ERROR_ACCOUNT_LOCKED_OUT 1909L
-#define OR_INVALID_OXID 1910L
-#define OR_INVALID_OID 1911L
-#define OR_INVALID_SET 1912L
-#define RPC_S_SEND_INCOMPLETE 1913L
-#define RPC_S_INVALID_ASYNC_HANDLE 1914L
-#define RPC_S_INVALID_ASYNC_CALL 1915L
-#define RPC_X_PIPE_CLOSED 1916L
-#define RPC_X_PIPE_DISCIPLINE_ERROR 1917L
-#define RPC_X_PIPE_EMPTY 1918L
-#define ERROR_NO_SITENAME 1919L
-#define ERROR_CANT_ACCESS_FILE 1920L
-#define ERROR_CANT_RESOLVE_FILENAME 1921L
-#define RPC_S_ENTRY_TYPE_MISMATCH 1922L
-#define RPC_S_NOT_ALL_OBJS_EXPORTED 1923L
-#define RPC_S_INTERFACE_NOT_EXPORTED 1924L
-#define RPC_S_PROFILE_NOT_ADDED 1925L
-#define RPC_S_PRF_ELT_NOT_ADDED 1926L
-#define RPC_S_PRF_ELT_NOT_REMOVED 1927L
-#define RPC_S_GRP_ELT_NOT_ADDED 1928L
-#define RPC_S_GRP_ELT_NOT_REMOVED 1929L
-#define ERROR_KM_DRIVER_BLOCKED 1930L
-#define ERROR_CONTEXT_EXPIRED 1931L
-#define ERROR_PER_USER_TRUST_QUOTA_EXCEEDED 1932L
-#define ERROR_ALL_USER_TRUST_QUOTA_EXCEEDED 1933L
-#define ERROR_USER_DELETE_TRUST_QUOTA_EXCEEDED 1934L
-#define ERROR_INVALID_PIXEL_FORMAT 2000L
-#define ERROR_BAD_DRIVER 2001L
-#define ERROR_INVALID_WINDOW_STYLE 2002L
-#define ERROR_METAFILE_NOT_SUPPORTED 2003L
-#define ERROR_TRANSFORM_NOT_SUPPORTED 2004L
-#define ERROR_CLIPPING_NOT_SUPPORTED 2005L
-#define ERROR_INVALID_CMM 2010L
-#define ERROR_INVALID_PROFILE 2011L
-#define ERROR_TAG_NOT_FOUND 2012L
-#define ERROR_TAG_NOT_PRESENT 2013L
-#define ERROR_DUPLICATE_TAG 2014L
-#define ERROR_PROFILE_NOT_ASSOCIATED_WITH_DEVICE 2015L
-#define ERROR_PROFILE_NOT_FOUND 2016L
-#define ERROR_INVALID_COLORSPACE 2017L
-#define ERROR_ICM_NOT_ENABLED 2018L
-#define ERROR_DELETING_ICM_XFORM 2019L
-#define ERROR_INVALID_TRANSFORM 2020L
-#define ERROR_COLORSPACE_MISMATCH 2021L
-#define ERROR_INVALID_COLORINDEX 2022L
-#define ERROR_CONNECTED_OTHER_PASSWORD 2108L
-#define ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT 2109L
-#define ERROR_BAD_USERNAME 2202L
-#define ERROR_NOT_CONNECTED 2250L
-#define ERROR_OPEN_FILES 2401L
-#define ERROR_ACTIVE_CONNECTIONS 2402L
-#define ERROR_DEVICE_IN_USE 2404L
-#define ERROR_UNKNOWN_PRINT_MONITOR 3000L
-#define ERROR_PRINTER_DRIVER_IN_USE 3001L
-#define ERROR_SPOOL_FILE_NOT_FOUND 3002L
-#define ERROR_SPL_NO_STARTDOC 3003L
-#define ERROR_SPL_NO_ADDJOB 3004L
-#define ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED 3005L
-#define ERROR_PRINT_MONITOR_ALREADY_INSTALLED 3006L
-#define ERROR_INVALID_PRINT_MONITOR 3007L
-#define ERROR_PRINT_MONITOR_IN_USE 3008L
-#define ERROR_PRINTER_HAS_JOBS_QUEUED 3009L
-#define ERROR_SUCCESS_REBOOT_REQUIRED 3010L
-#define ERROR_SUCCESS_RESTART_REQUIRED 3011L
-#define ERROR_PRINTER_NOT_FOUND 3012L
-#define ERROR_PRINTER_DRIVER_WARNED 3013L
-#define ERROR_PRINTER_DRIVER_BLOCKED 3014L
-#define ERROR_WINS_INTERNAL 4000L
-#define ERROR_CAN_NOT_DEL_LOCAL_WINS 4001L
-#define ERROR_STATIC_INIT 4002L
-#define ERROR_INC_BACKUP 4003L
-#define ERROR_FULL_BACKUP 4004L
-#define ERROR_REC_NON_EXISTENT 4005L
-#define ERROR_RPL_NOT_ALLOWED 4006L
-#define ERROR_DHCP_ADDRESS_CONFLICT 4100L
-#define ERROR_WMI_GUID_NOT_FOUND 4200L
-#define ERROR_WMI_INSTANCE_NOT_FOUND 4201L
-#define ERROR_WMI_ITEMID_NOT_FOUND 4202L
-#define ERROR_WMI_TRY_AGAIN 4203L
-#define ERROR_WMI_DP_NOT_FOUND 4204L
-#define ERROR_WMI_UNRESOLVED_INSTANCE_REF 4205L
-#define ERROR_WMI_ALREADY_ENABLED 4206L
-#define ERROR_WMI_GUID_DISCONNECTED 4207L
-#define ERROR_WMI_SERVER_UNAVAILABLE 4208L
-#define ERROR_WMI_DP_FAILED 4209L
-#define ERROR_WMI_INVALID_MOF 4210L
-#define ERROR_WMI_INVALID_REGINFO 4211L
-#define ERROR_WMI_ALREADY_DISABLED 4212L
-#define ERROR_WMI_READ_ONLY 4213L
-#define ERROR_WMI_SET_FAILURE 4214L
-#define ERROR_INVALID_MEDIA 4300L
-#define ERROR_INVALID_LIBRARY 4301L
-#define ERROR_INVALID_MEDIA_POOL 4302L
-#define ERROR_DRIVE_MEDIA_MISMATCH 4303L
-#define ERROR_MEDIA_OFFLINE 4304L
-#define ERROR_LIBRARY_OFFLINE 4305L
-#define ERROR_EMPTY 4306L
-#define ERROR_NOT_EMPTY 4307L
-#define ERROR_MEDIA_UNAVAILABLE 4308L
-#define ERROR_RESOURCE_DISABLED 4309L
-#define ERROR_INVALID_CLEANER 4310L
-#define ERROR_UNABLE_TO_CLEAN 4311L
-#define ERROR_OBJECT_NOT_FOUND 4312L
-#define ERROR_DATABASE_FAILURE 4313L
-#define ERROR_DATABASE_FULL 4314L
-#define ERROR_MEDIA_INCOMPATIBLE 4315L
-#define ERROR_RESOURCE_NOT_PRESENT 4316L
-#define ERROR_INVALID_OPERATION 4317L
-#define ERROR_MEDIA_NOT_AVAILABLE 4318L
-#define ERROR_DEVICE_NOT_AVAILABLE 4319L
-#define ERROR_REQUEST_REFUSED 4320L
-#define ERROR_INVALID_DRIVE_OBJECT 4321L
-#define ERROR_LIBRARY_FULL 4322L
-#define ERROR_MEDIUM_NOT_ACCESSIBLE 4323L
-#define ERROR_UNABLE_TO_LOAD_MEDIUM 4324L
-#define ERROR_UNABLE_TO_INVENTORY_DRIVE 4325L
-#define ERROR_UNABLE_TO_INVENTORY_SLOT 4326L
-#define ERROR_UNABLE_TO_INVENTORY_TRANSPORT 4327L
-#define ERROR_TRANSPORT_FULL 4328L
-#define ERROR_CONTROLLING_IEPORT 4329L
-#define ERROR_UNABLE_TO_EJECT_MOUNTED_MEDIA 4330L
-#define ERROR_CLEANER_SLOT_SET 4331L
-#define ERROR_CLEANER_SLOT_NOT_SET 4332L
-#define ERROR_CLEANER_CARTRIDGE_SPENT 4333L
-#define ERROR_UNEXPECTED_OMID 4334L
-#define ERROR_CANT_DELETE_LAST_ITEM 4335L
-#define ERROR_MESSAGE_EXCEEDS_MAX_SIZE 4336L
-#define ERROR_VOLUME_CONTAINS_SYS_FILES 4337L
-#define ERROR_INDIGENOUS_TYPE 4338L
-#define ERROR_NO_SUPPORTING_DRIVES 4339L
-#define ERROR_CLEANER_CARTRIDGE_INSTALLED 4340L
-#define ERROR_FILE_OFFLINE 4350L
-#define ERROR_REMOTE_STORAGE_NOT_ACTIVE 4351L
-#define ERROR_REMOTE_STORAGE_MEDIA_ERROR 4352L
-#define ERROR_NOT_A_REPARSE_POINT 4390L
-#define ERROR_REPARSE_ATTRIBUTE_CONFLICT 4391L
-#define ERROR_INVALID_REPARSE_DATA 4392L
-#define ERROR_REPARSE_TAG_INVALID 4393L
-#define ERROR_REPARSE_TAG_MISMATCH 4394L
-#define ERROR_VOLUME_NOT_SIS_ENABLED 4500L
-#define ERROR_DEPENDENT_RESOURCE_EXISTS 5001L
-#define ERROR_DEPENDENCY_NOT_FOUND 5002L
-#define ERROR_DEPENDENCY_ALREADY_EXISTS 5003L
-#define ERROR_RESOURCE_NOT_ONLINE 5004L
-#define ERROR_HOST_NODE_NOT_AVAILABLE 5005L
-#define ERROR_RESOURCE_NOT_AVAILABLE 5006L
-#define ERROR_RESOURCE_NOT_FOUND 5007L
-#define ERROR_SHUTDOWN_CLUSTER 5008L
-#define ERROR_CANT_EVICT_ACTIVE_NODE 5009L
-#define ERROR_OBJECT_ALREADY_EXISTS 5010L
-#define ERROR_OBJECT_IN_LIST 5011L
-#define ERROR_GROUP_NOT_AVAILABLE 5012L
-#define ERROR_GROUP_NOT_FOUND 5013L
-#define ERROR_GROUP_NOT_ONLINE 5014L
-#define ERROR_HOST_NODE_NOT_RESOURCE_OWNER 5015L
-#define ERROR_HOST_NODE_NOT_GROUP_OWNER 5016L
-#define ERROR_RESMON_CREATE_FAILED 5017L
-#define ERROR_RESMON_ONLINE_FAILED 5018L
-#define ERROR_RESOURCE_ONLINE 5019L
-#define ERROR_QUORUM_RESOURCE 5020L
-#define ERROR_NOT_QUORUM_CAPABLE 5021L
-#define ERROR_CLUSTER_SHUTTING_DOWN 5022L
-#define ERROR_INVALID_STATE 5023L
-#define ERROR_RESOURCE_PROPERTIES_STORED 5024L
-#define ERROR_NOT_QUORUM_CLASS 5025L
-#define ERROR_CORE_RESOURCE 5026L
-#define ERROR_QUORUM_RESOURCE_ONLINE_FAILED 5027L
-#define ERROR_QUORUMLOG_OPEN_FAILED 5028L
-#define ERROR_CLUSTERLOG_CORRUPT 5029L
-#define ERROR_CLUSTERLOG_RECORD_EXCEEDS_MAXSIZE 5030L
-#define ERROR_CLUSTERLOG_EXCEEDS_MAXSIZE 5031L
-#define ERROR_CLUSTERLOG_CHKPOINT_NOT_FOUND 5032L
-#define ERROR_CLUSTERLOG_NOT_ENOUGH_SPACE 5033L
-#define ERROR_QUORUM_OWNER_ALIVE 5034L
-#define ERROR_NETWORK_NOT_AVAILABLE 5035L
-#define ERROR_NODE_NOT_AVAILABLE 5036L
-#define ERROR_ALL_NODES_NOT_AVAILABLE 5037L
-#define ERROR_RESOURCE_FAILED 5038L
-#define ERROR_CLUSTER_INVALID_NODE 5039L
-#define ERROR_CLUSTER_NODE_EXISTS 5040L
-#define ERROR_CLUSTER_JOIN_IN_PROGRESS 5041L
-#define ERROR_CLUSTER_NODE_NOT_FOUND 5042L
-#define ERROR_CLUSTER_LOCAL_NODE_NOT_FOUND 5043L
-#define ERROR_CLUSTER_NETWORK_EXISTS 5044L
-#define ERROR_CLUSTER_NETWORK_NOT_FOUND 5045L
-#define ERROR_CLUSTER_NETINTERFACE_EXISTS 5046L
-#define ERROR_CLUSTER_NETINTERFACE_NOT_FOUND 5047L
-#define ERROR_CLUSTER_INVALID_REQUEST 5048L
-#define ERROR_CLUSTER_INVALID_NETWORK_PROVIDER 5049L
-#define ERROR_CLUSTER_NODE_DOWN 5050L
-#define ERROR_CLUSTER_NODE_UNREACHABLE 5051L
-#define ERROR_CLUSTER_NODE_NOT_MEMBER 5052L
-#define ERROR_CLUSTER_JOIN_NOT_IN_PROGRESS 5053L
-#define ERROR_CLUSTER_INVALID_NETWORK 5054L
-#define ERROR_CLUSTER_NODE_UP 5056L
-#define ERROR_CLUSTER_IPADDR_IN_USE 5057L
-#define ERROR_CLUSTER_NODE_NOT_PAUSED 5058L
-#define ERROR_CLUSTER_NO_SECURITY_CONTEXT 5059L
-#define ERROR_CLUSTER_NETWORK_NOT_INTERNAL 5060L
-#define ERROR_CLUSTER_NODE_ALREADY_UP 5061L
-#define ERROR_CLUSTER_NODE_ALREADY_DOWN 5062L
-#define ERROR_CLUSTER_NETWORK_ALREADY_ONLINE 5063L
-#define ERROR_CLUSTER_NETWORK_ALREADY_OFFLINE 5064L
-#define ERROR_CLUSTER_NODE_ALREADY_MEMBER 5065L
-#define ERROR_CLUSTER_LAST_INTERNAL_NETWORK 5066L
-#define ERROR_CLUSTER_NETWORK_HAS_DEPENDENTS 5067L
-#define ERROR_INVALID_OPERATION_ON_QUORUM 5068L
-#define ERROR_DEPENDENCY_NOT_ALLOWED 5069L
-#define ERROR_CLUSTER_NODE_PAUSED 5070L
-#define ERROR_NODE_CANT_HOST_RESOURCE 5071L
-#define ERROR_CLUSTER_NODE_NOT_READY 5072L
-#define ERROR_CLUSTER_NODE_SHUTTING_DOWN 5073L
-#define ERROR_CLUSTER_JOIN_ABORTED 5074L
-#define ERROR_CLUSTER_INCOMPATIBLE_VERSIONS 5075L
-#define ERROR_CLUSTER_MAXNUM_OF_RESOURCES_EXCEEDED 5076L
-#define ERROR_CLUSTER_SYSTEM_CONFIG_CHANGED 5077L
-#define ERROR_CLUSTER_RESOURCE_TYPE_NOT_FOUND 5078L
-#define ERROR_CLUSTER_RESTYPE_NOT_SUPPORTED 5079L
-#define ERROR_CLUSTER_RESNAME_NOT_FOUND 5080L
-#define ERROR_CLUSTER_NO_RPC_PACKAGES_REGISTERED 5081L
-#define ERROR_CLUSTER_OWNER_NOT_IN_PREFLIST 5082L
-#define ERROR_CLUSTER_DATABASE_SEQMISMATCH 5083L
-#define ERROR_RESMON_INVALID_STATE 5084L
-#define ERROR_CLUSTER_GUM_NOT_LOCKER 5085L
-#define ERROR_QUORUM_DISK_NOT_FOUND 5086L
-#define ERROR_DATABASE_BACKUP_CORRUPT 5087L
-#define ERROR_CLUSTER_NODE_ALREADY_HAS_DFS_ROOT 5088L
-#define ERROR_RESOURCE_PROPERTY_UNCHANGEABLE 5089L
-#define ERROR_CLUSTER_MEMBERSHIP_INVALID_STATE 5890L
-#define ERROR_CLUSTER_QUORUMLOG_NOT_FOUND 5891L
-#define ERROR_CLUSTER_MEMBERSHIP_HALT 5892L
-#define ERROR_CLUSTER_INSTANCE_ID_MISMATCH 5893L
-#define ERROR_CLUSTER_NETWORK_NOT_FOUND_FOR_IP 5894L
-#define ERROR_CLUSTER_PROPERTY_DATA_TYPE_MISMATCH 5895L
-#define ERROR_CLUSTER_EVICT_WITHOUT_CLEANUP 5896L
-#define ERROR_CLUSTER_PARAMETER_MISMATCH 5897L
-#define ERROR_NODE_CANNOT_BE_CLUSTERED 5898L
-#define ERROR_CLUSTER_WRONG_OS_VERSION 5899L
-#define ERROR_CLUSTER_CANT_CREATE_DUP_CLUSTER_NAME 5900L
-#define ERROR_CLUSCFG_ALREADY_COMMITTED 5901L
-#define ERROR_CLUSCFG_ROLLBACK_FAILED 5902L
-#define ERROR_CLUSCFG_SYSTEM_DISK_DRIVE_LETTER_CONFLICT 5903L
-#define ERROR_CLUSTER_OLD_VERSION 5904L
-#define ERROR_CLUSTER_MISMATCHED_COMPUTER_ACCT_NAME 5905L
-#define ERROR_ENCRYPTION_FAILED 6000L
-#define ERROR_DECRYPTION_FAILED 6001L
-#define ERROR_FILE_ENCRYPTED 6002L
-#define ERROR_NO_RECOVERY_POLICY 6003L
-#define ERROR_NO_EFS 6004L
-#define ERROR_WRONG_EFS 6005L
-#define ERROR_NO_USER_KEYS 6006L
-#define ERROR_FILE_NOT_ENCRYPTED 6007L
-#define ERROR_NOT_EXPORT_FORMAT 6008L
-#define ERROR_FILE_READ_ONLY 6009L
-#define ERROR_DIR_EFS_DISALLOWED 6010L
-#define ERROR_EFS_SERVER_NOT_TRUSTED 6011L
-#define ERROR_BAD_RECOVERY_POLICY 6012L
-#define ERROR_EFS_ALG_BLOB_TOO_BIG 6013L
-#define ERROR_VOLUME_NOT_SUPPORT_EFS 6014L
-#define ERROR_EFS_DISABLED 6015L
-#define ERROR_EFS_VERSION_NOT_SUPPORT 6016L
-#define ERROR_NO_BROWSER_SERVERS_FOUND 6118L
-#define SCHED_E_SERVICE_NOT_LOCALSYSTEM 6200L
-
-#define ERROR_CTX_WINSTATION_NAME_INVALID 7001L
-#define ERROR_CTX_INVALID_PD 7002L
-#define ERROR_CTX_PD_NOT_FOUND 7003L
-#define ERROR_CTX_WD_NOT_FOUND 7004L
-#define ERROR_CTX_CANNOT_MAKE_EVENTLOG_ENTRY 7005L
-#define ERROR_CTX_SERVICE_NAME_COLLISION 7006L
-#define ERROR_CTX_CLOSE_PENDING 7007L
-#define ERROR_CTX_NO_OUTBUF 7008L
-#define ERROR_CTX_MODEM_INF_NOT_FOUND 7009L
-#define ERROR_CTX_INVALID_MODEMNAME 7010L
-#define ERROR_CTX_MODEM_RESPONSE_ERROR 7011L
-#define ERROR_CTX_MODEM_RESPONSE_TIMEOUT 7012L
-#define ERROR_CTX_MODEM_RESPONSE_NO_CARRIER 7013L
-#define ERROR_CTX_MODEM_RESPONSE_NO_DIALTONE 7014L
-#define ERROR_CTX_MODEM_RESPONSE_BUSY 7015L
-#define ERROR_CTX_MODEM_RESPONSE_VOICE 7016L
-#define ERROR_CTX_TD_ERROR 7017L
-#define ERROR_CTX_WINSTATION_NOT_FOUND 7022L
-#define ERROR_CTX_WINSTATION_ALREADY_EXISTS 7023L
-#define ERROR_CTX_WINSTATION_BUSY 7024L
-#define ERROR_CTX_BAD_VIDEO_MODE 7025L
-#define ERROR_CTX_GRAPHICS_INVALID 7035L
-#define ERROR_CTX_LOGON_DISABLED 7037L
-#define ERROR_CTX_NOT_CONSOLE 7038L
-#define ERROR_CTX_CLIENT_QUERY_TIMEOUT 7040L
-#define ERROR_CTX_CONSOLE_DISCONNECT 7041L
-#define ERROR_CTX_CONSOLE_CONNECT 7042L
-#define ERROR_CTX_SHADOW_DENIED 7044L
-#define ERROR_CTX_WINSTATION_ACCESS_DENIED 7045L
-#define ERROR_CTX_INVALID_WD 7049L
-#define ERROR_CTX_SHADOW_INVALID 7050L
-#define ERROR_CTX_SHADOW_DISABLED 7051L
-#define ERROR_CTX_CLIENT_LICENSE_IN_USE 7052L
-#define ERROR_CTX_CLIENT_LICENSE_NOT_SET 7053L
-#define ERROR_CTX_LICENSE_NOT_AVAILABLE 7054L
-#define ERROR_CTX_LICENSE_CLIENT_INVALID 7055L
-#define ERROR_CTX_LICENSE_EXPIRED 7056L
-#define ERROR_CTX_SHADOW_NOT_RUNNING 7057L
-#define ERROR_CTX_SHADOW_ENDED_BY_MODE_CHANGE 7058L
-#define ERROR_ACTIVATION_COUNT_EXCEEDED 7059L
-
-#define FRS_ERR_INVALID_API_SEQUENCE 8001L
-#define FRS_ERR_STARTING_SERVICE 8002L
-#define FRS_ERR_STOPPING_SERVICE 8003L
-#define FRS_ERR_INTERNAL_API 8004L
-#define FRS_ERR_INTERNAL 8005L
-#define FRS_ERR_SERVICE_COMM 8006L
-#define FRS_ERR_INSUFFICIENT_PRIV 8007L
-#define FRS_ERR_AUTHENTICATION 8008L
-#define FRS_ERR_PARENT_INSUFFICIENT_PRIV 8009L
-#define FRS_ERR_PARENT_AUTHENTICATION 8010L
-#define FRS_ERR_CHILD_TO_PARENT_COMM 8011L
-#define FRS_ERR_PARENT_TO_CHILD_COMM 8012L
-#define FRS_ERR_SYSVOL_POPULATE 8013L
-#define FRS_ERR_SYSVOL_POPULATE_TIMEOUT 8014L
-#define FRS_ERR_SYSVOL_IS_BUSY 8015L
-#define FRS_ERR_SYSVOL_DEMOTE 8016L
-#define FRS_ERR_INVALID_SERVICE_PARAMETER 8017L
-#define ERROR_DS_NOT_INSTALLED 8200L
-#define ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY 8201L
-#define ERROR_DS_NO_ATTRIBUTE_OR_VALUE 8202L
-#define ERROR_DS_INVALID_ATTRIBUTE_SYNTAX 8203L
-#define ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED 8204L
-#define ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS 8205L
-#define ERROR_DS_BUSY 8206L
-#define ERROR_DS_UNAVAILABLE 8207L
-#define ERROR_DS_NO_RIDS_ALLOCATED 8208L
-#define ERROR_DS_NO_MORE_RIDS 8209L
-#define ERROR_DS_INCORRECT_ROLE_OWNER 8210L
-#define ERROR_DS_RIDMGR_INIT_ERROR 8211L
-#define ERROR_DS_OBJ_CLASS_VIOLATION 8212L
-#define ERROR_DS_CANT_ON_NON_LEAF 8213L
-#define ERROR_DS_CANT_ON_RDN 8214L
-#define ERROR_DS_CANT_MOD_OBJ_CLASS 8215L
-#define ERROR_DS_CROSS_DOM_MOVE_ERROR 8216L
-#define ERROR_DS_GC_NOT_AVAILABLE 8217L
-#define ERROR_SHARED_POLICY 8218L
-#define ERROR_POLICY_OBJECT_NOT_FOUND 8219L
-#define ERROR_POLICY_ONLY_IN_DS 8220L
-#define ERROR_PROMOTION_ACTIVE 8221L
-#define ERROR_NO_PROMOTION_ACTIVE 8222L
-#define ERROR_DS_OPERATIONS_ERROR 8224L
-#define ERROR_DS_PROTOCOL_ERROR 8225L
-#define ERROR_DS_TIMELIMIT_EXCEEDED 8226L
-#define ERROR_DS_SIZELIMIT_EXCEEDED 8227L
-#define ERROR_DS_ADMIN_LIMIT_EXCEEDED 8228L
-#define ERROR_DS_COMPARE_FALSE 8229L
-#define ERROR_DS_COMPARE_TRUE 8230L
-#define ERROR_DS_AUTH_METHOD_NOT_SUPPORTED 8231L
-#define ERROR_DS_STRONG_AUTH_REQUIRED 8232L
-#define ERROR_DS_INAPPROPRIATE_AUTH 8233L
-#define ERROR_DS_AUTH_UNKNOWN 8234L
-#define ERROR_DS_REFERRAL 8235L
-#define ERROR_DS_UNAVAILABLE_CRIT_EXTENSION 8236L
-#define ERROR_DS_CONFIDENTIALITY_REQUIRED 8237L
-#define ERROR_DS_INAPPROPRIATE_MATCHING 8238L
-#define ERROR_DS_CONSTRAINT_VIOLATION 8239L
-#define ERROR_DS_NO_SUCH_OBJECT 8240L
-#define ERROR_DS_ALIAS_PROBLEM 8241L
-#define ERROR_DS_INVALID_DN_SYNTAX 8242L
-#define ERROR_DS_IS_LEAF 8243L
-#define ERROR_DS_ALIAS_DEREF_PROBLEM 8244L
-#define ERROR_DS_UNWILLING_TO_PERFORM 8245L
-#define ERROR_DS_LOOP_DETECT 8246L
-#define ERROR_DS_NAMING_VIOLATION 8247L
-#define ERROR_DS_OBJECT_RESULTS_TOO_LARGE 8248L
-#define ERROR_DS_AFFECTS_MULTIPLE_DSAS 8249L
-#define ERROR_DS_SERVER_DOWN 8250L
-#define ERROR_DS_LOCAL_ERROR 8251L
-#define ERROR_DS_ENCODING_ERROR 8252L
-#define ERROR_DS_DECODING_ERROR 8253L
-#define ERROR_DS_FILTER_UNKNOWN 8254L
-#define ERROR_DS_PARAM_ERROR 8255L
-#define ERROR_DS_NOT_SUPPORTED 8256L
-#define ERROR_DS_NO_RESULTS_RETURNED 8257L
-#define ERROR_DS_CONTROL_NOT_FOUND 8258L
-#define ERROR_DS_CLIENT_LOOP 8259L
-#define ERROR_DS_REFERRAL_LIMIT_EXCEEDED 8260L
-#define ERROR_DS_SORT_CONTROL_MISSING 8261L
-#define ERROR_DS_OFFSET_RANGE_ERROR 8262L
-#define ERROR_DS_ROOT_MUST_BE_NC 8301L
-#define ERROR_DS_ADD_REPLICA_INHIBITED 8302L
-#define ERROR_DS_ATT_NOT_DEF_IN_SCHEMA 8303L
-#define ERROR_DS_MAX_OBJ_SIZE_EXCEEDED 8304L
-#define ERROR_DS_OBJ_STRING_NAME_EXISTS 8305L
-#define ERROR_DS_NO_RDN_DEFINED_IN_SCHEMA 8306L
-#define ERROR_DS_RDN_DOESNT_MATCH_SCHEMA 8307L
-#define ERROR_DS_NO_REQUESTED_ATTS_FOUND 8308L
-#define ERROR_DS_USER_BUFFER_TO_SMALL 8309L
-#define ERROR_DS_ATT_IS_NOT_ON_OBJ 8310L
-#define ERROR_DS_ILLEGAL_MOD_OPERATION 8311L
-#define ERROR_DS_OBJ_TOO_LARGE 8312L
-#define ERROR_DS_BAD_INSTANCE_TYPE 8313L
-#define ERROR_DS_MASTERDSA_REQUIRED 8314L
-#define ERROR_DS_OBJECT_CLASS_REQUIRED 8315L
-#define ERROR_DS_MISSING_REQUIRED_ATT 8316L
-#define ERROR_DS_ATT_NOT_DEF_FOR_CLASS 8317L
-#define ERROR_DS_ATT_ALREADY_EXISTS 8318L
-#define ERROR_DS_CANT_ADD_ATT_VALUES 8320L
-#define ERROR_DS_SINGLE_VALUE_CONSTRAINT 8321L
-#define ERROR_DS_RANGE_CONSTRAINT 8322L
-#define ERROR_DS_ATT_VAL_ALREADY_EXISTS 8323L
-#define ERROR_DS_CANT_REM_MISSING_ATT 8324L
-#define ERROR_DS_CANT_REM_MISSING_ATT_VAL 8325L
-#define ERROR_DS_ROOT_CANT_BE_SUBREF 8326L
-#define ERROR_DS_NO_CHAINING 8327L
-#define ERROR_DS_NO_CHAINED_EVAL 8328L
-#define ERROR_DS_NO_PARENT_OBJECT 8329L
-#define ERROR_DS_PARENT_IS_AN_ALIAS 8330L
-#define ERROR_DS_CANT_MIX_MASTER_AND_REPS 8331L
-#define ERROR_DS_CHILDREN_EXIST 8332L
-#define ERROR_DS_OBJ_NOT_FOUND 8333L
-#define ERROR_DS_ALIASED_OBJ_MISSING 8334L
-#define ERROR_DS_BAD_NAME_SYNTAX 8335L
-#define ERROR_DS_ALIAS_POINTS_TO_ALIAS 8336L
-#define ERROR_DS_CANT_DEREF_ALIAS 8337L
-#define ERROR_DS_OUT_OF_SCOPE 8338L
-#define ERROR_DS_OBJECT_BEING_REMOVED 8339L
-#define ERROR_DS_CANT_DELETE_DSA_OBJ 8340L
-#define ERROR_DS_GENERIC_ERROR 8341L
-#define ERROR_DS_DSA_MUST_BE_INT_MASTER 8342L
-#define ERROR_DS_CLASS_NOT_DSA 8343L
-#define ERROR_DS_INSUFF_ACCESS_RIGHTS 8344L
-#define ERROR_DS_ILLEGAL_SUPERIOR 8345L
-#define ERROR_DS_ATTRIBUTE_OWNED_BY_SAM 8346L
-#define ERROR_DS_NAME_TOO_MANY_PARTS 8347L
-#define ERROR_DS_NAME_TOO_LONG 8348L
-#define ERROR_DS_NAME_VALUE_TOO_LONG 8349L
-#define ERROR_DS_NAME_UNPARSEABLE 8350L
-#define ERROR_DS_NAME_TYPE_UNKNOWN 8351L
-#define ERROR_DS_NOT_AN_OBJECT 8352L
-#define ERROR_DS_SEC_DESC_TOO_SHORT 8353L
-#define ERROR_DS_SEC_DESC_INVALID 8354L
-#define ERROR_DS_NO_DELETED_NAME 8355L
-#define ERROR_DS_SUBREF_MUST_HAVE_PARENT 8356L
-#define ERROR_DS_NCNAME_MUST_BE_NC 8357L
-#define ERROR_DS_CANT_ADD_SYSTEM_ONLY 8358L
-#define ERROR_DS_CLASS_MUST_BE_CONCRETE 8359L
-#define ERROR_DS_INVALID_DMD 8360L
-#define ERROR_DS_OBJ_GUID_EXISTS 8361L
-#define ERROR_DS_NOT_ON_BACKLINK 8362L
-#define ERROR_DS_NO_CROSSREF_FOR_NC 8363L
-#define ERROR_DS_SHUTTING_DOWN 8364L
-#define ERROR_DS_UNKNOWN_OPERATION 8365L
-#define ERROR_DS_INVALID_ROLE_OWNER 8366L
-#define ERROR_DS_COULDNT_CONTACT_FSMO 8367L
-#define ERROR_DS_CROSS_NC_DN_RENAME 8368L
-#define ERROR_DS_CANT_MOD_SYSTEM_ONLY 8369L
-#define ERROR_DS_REPLICATOR_ONLY 8370L
-#define ERROR_DS_OBJ_CLASS_NOT_DEFINED 8371L
-#define ERROR_DS_OBJ_CLASS_NOT_SUBCLASS 8372L
-#define ERROR_DS_NAME_REFERENCE_INVALID 8373L
-#define ERROR_DS_CROSS_REF_EXISTS 8374L
-#define ERROR_DS_CANT_DEL_MASTER_CROSSREF 8375L
-#define ERROR_DS_SUBTREE_NOTIFY_NOT_NC_HEAD 8376L
-#define ERROR_DS_NOTIFY_FILTER_TOO_COMPLEX 8377L
-#define ERROR_DS_DUP_RDN 8378L
-#define ERROR_DS_DUP_OID 8379L
-#define ERROR_DS_DUP_MAPI_ID 8380L
-#define ERROR_DS_DUP_SCHEMA_ID_GUID 8381L
-#define ERROR_DS_DUP_LDAP_DISPLAY_NAME 8382L
-#define ERROR_DS_SEMANTIC_ATT_TEST 8383L
-#define ERROR_DS_SYNTAX_MISMATCH 8384L
-#define ERROR_DS_EXISTS_IN_MUST_HAVE 8385L
-#define ERROR_DS_EXISTS_IN_MAY_HAVE 8386L
-#define ERROR_DS_NONEXISTENT_MAY_HAVE 8387L
-#define ERROR_DS_NONEXISTENT_MUST_HAVE 8388L
-#define ERROR_DS_AUX_CLS_TEST_FAIL 8389L
-#define ERROR_DS_NONEXISTENT_POSS_SUP 8390L
-#define ERROR_DS_SUB_CLS_TEST_FAIL 8391L
-#define ERROR_DS_BAD_RDN_ATT_ID_SYNTAX 8392L
-#define ERROR_DS_EXISTS_IN_AUX_CLS 8393L
-#define ERROR_DS_EXISTS_IN_SUB_CLS 8394L
-#define ERROR_DS_EXISTS_IN_POSS_SUP 8395L
-#define ERROR_DS_RECALCSCHEMA_FAILED 8396L
-#define ERROR_DS_TREE_DELETE_NOT_FINISHED 8397L
-#define ERROR_DS_CANT_DELETE 8398L
-#define ERROR_DS_ATT_SCHEMA_REQ_ID 8399L
-#define ERROR_DS_BAD_ATT_SCHEMA_SYNTAX 8400L
-#define ERROR_DS_CANT_CACHE_ATT 8401L
-#define ERROR_DS_CANT_CACHE_CLASS 8402L
-#define ERROR_DS_CANT_REMOVE_ATT_CACHE 8403L
-#define ERROR_DS_CANT_REMOVE_CLASS_CACHE 8404L
-#define ERROR_DS_CANT_RETRIEVE_DN 8405L
-#define ERROR_DS_MISSING_SUPREF 8406L
-#define ERROR_DS_CANT_RETRIEVE_INSTANCE 8407L
-#define ERROR_DS_CODE_INCONSISTENCY 8408L
-#define ERROR_DS_DATABASE_ERROR 8409L
-#define ERROR_DS_GOVERNSID_MISSING 8410L
-#define ERROR_DS_MISSING_EXPECTED_ATT 8411L
-#define ERROR_DS_NCNAME_MISSING_CR_REF 8412L
-#define ERROR_DS_SECURITY_CHECKING_ERROR 8413L
-#define ERROR_DS_SCHEMA_NOT_LOADED 8414L
-#define ERROR_DS_SCHEMA_ALLOC_FAILED 8415L
-#define ERROR_DS_ATT_SCHEMA_REQ_SYNTAX 8416L
-#define ERROR_DS_GCVERIFY_ERROR 8417L
-#define ERROR_DS_DRA_SCHEMA_MISMATCH 8418L
-#define ERROR_DS_CANT_FIND_DSA_OBJ 8419L
-#define ERROR_DS_CANT_FIND_EXPECTED_NC 8420L
-#define ERROR_DS_CANT_FIND_NC_IN_CACHE 8421L
-#define ERROR_DS_CANT_RETRIEVE_CHILD 8422L
-#define ERROR_DS_SECURITY_ILLEGAL_MODIFY 8423L
-#define ERROR_DS_CANT_REPLACE_HIDDEN_REC 8424L
-#define ERROR_DS_BAD_HIERARCHY_FILE 8425L
-#define ERROR_DS_BUILD_HIERARCHY_TABLE_FAILED 8426L
-#define ERROR_DS_CONFIG_PARAM_MISSING 8427L
-#define ERROR_DS_COUNTING_AB_INDICES_FAILED 8428L
-#define ERROR_DS_HIERARCHY_TABLE_MALLOC_FAILED 8429L
-#define ERROR_DS_INTERNAL_FAILURE 8430L
-#define ERROR_DS_UNKNOWN_ERROR 8431L
-#define ERROR_DS_ROOT_REQUIRES_CLASS_TOP 8432L
-#define ERROR_DS_REFUSING_FSMO_ROLES 8433L
-#define ERROR_DS_MISSING_FSMO_SETTINGS 8434L
-#define ERROR_DS_UNABLE_TO_SURRENDER_ROLES 8435L
-#define ERROR_DS_DRA_GENERIC 8436L
-#define ERROR_DS_DRA_INVALID_PARAMETER 8437L
-#define ERROR_DS_DRA_BUSY 8438L
-#define ERROR_DS_DRA_BAD_DN 8439L
-#define ERROR_DS_DRA_BAD_NC 8440L
-#define ERROR_DS_DRA_DN_EXISTS 8441L
-#define ERROR_DS_DRA_INTERNAL_ERROR 8442L
-#define ERROR_DS_DRA_INCONSISTENT_DIT 8443L
-#define ERROR_DS_DRA_CONNECTION_FAILED 8444L
-#define ERROR_DS_DRA_BAD_INSTANCE_TYPE 8445L
-#define ERROR_DS_DRA_OUT_OF_MEM 8446L
-#define ERROR_DS_DRA_MAIL_PROBLEM 8447L
-#define ERROR_DS_DRA_REF_ALREADY_EXISTS 8448L
-#define ERROR_DS_DRA_REF_NOT_FOUND 8449L
-#define ERROR_DS_DRA_OBJ_IS_REP_SOURCE 8450L
-#define ERROR_DS_DRA_DB_ERROR 8451L
-#define ERROR_DS_DRA_NO_REPLICA 8452L
-#define ERROR_DS_DRA_ACCESS_DENIED 8453L
-#define ERROR_DS_DRA_NOT_SUPPORTED 8454L
-#define ERROR_DS_DRA_RPC_CANCELLED 8455L
-#define ERROR_DS_DRA_SOURCE_DISABLED 8456L
-#define ERROR_DS_DRA_SINK_DISABLED 8457L
-#define ERROR_DS_DRA_NAME_COLLISION 8458L
-#define ERROR_DS_DRA_SOURCE_REINSTALLED 8459L
-#define ERROR_DS_DRA_MISSING_PARENT 8460L
-#define ERROR_DS_DRA_PREEMPTED 8461L
-#define ERROR_DS_DRA_ABANDON_SYNC 8462L
-#define ERROR_DS_DRA_SHUTDOWN 8463L
-#define ERROR_DS_DRA_INCOMPATIBLE_PARTIAL_SET 8464L
-#define ERROR_DS_DRA_SOURCE_IS_PARTIAL_REPLICA 8465L
-#define ERROR_DS_DRA_EXTN_CONNECTION_FAILED 8466L
-#define ERROR_DS_INSTALL_SCHEMA_MISMATCH 8467L
-#define ERROR_DS_DUP_LINK_ID 8468L
-#define ERROR_DS_NAME_ERROR_RESOLVING 8469L
-#define ERROR_DS_NAME_ERROR_NOT_FOUND 8470L
-#define ERROR_DS_NAME_ERROR_NOT_UNIQUE 8471L
-#define ERROR_DS_NAME_ERROR_NO_MAPPING 8472L
-#define ERROR_DS_NAME_ERROR_DOMAIN_ONLY 8473L
-#define ERROR_DS_NAME_ERROR_NO_SYNTACTICAL_MAPPING 8474L
-#define ERROR_DS_CONSTRUCTED_ATT_MOD 8475L
-#define ERROR_DS_WRONG_OM_OBJ_CLASS 8476L
-#define ERROR_DS_DRA_REPL_PENDING 8477L
-#define ERROR_DS_DS_REQUIRED 8478L
-#define ERROR_DS_INVALID_LDAP_DISPLAY_NAME 8479L
-#define ERROR_DS_NON_BASE_SEARCH 8480L
-#define ERROR_DS_CANT_RETRIEVE_ATTS 8481L
-#define ERROR_DS_BACKLINK_WITHOUT_LINK 8482L
-#define ERROR_DS_EPOCH_MISMATCH 8483L
-#define ERROR_DS_SRC_NAME_MISMATCH 8484L
-#define ERROR_DS_SRC_AND_DST_NC_IDENTICAL 8485L
-#define ERROR_DS_DST_NC_MISMATCH 8486L
-#define ERROR_DS_NOT_AUTHORITIVE_FOR_DST_NC 8487L
-#define ERROR_DS_SRC_GUID_MISMATCH 8488L
-#define ERROR_DS_CANT_MOVE_DELETED_OBJECT 8489L
-#define ERROR_DS_PDC_OPERATION_IN_PROGRESS 8490L
-#define ERROR_DS_CROSS_DOMAIN_CLEANUP_REQD 8491L
-#define ERROR_DS_ILLEGAL_XDOM_MOVE_OPERATION 8492L
-#define ERROR_DS_CANT_WITH_ACCT_GROUP_MEMBERSHPS 8493L
-#define ERROR_DS_NC_MUST_HAVE_NC_PARENT 8494L
-#define ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE 8495L
-#define ERROR_DS_DST_DOMAIN_NOT_NATIVE 8496L
-#define ERROR_DS_MISSING_INFRASTRUCTURE_CONTAINER 8497L
-#define ERROR_DS_CANT_MOVE_ACCOUNT_GROUP 8498L
-#define ERROR_DS_CANT_MOVE_RESOURCE_GROUP 8499L
-#define ERROR_DS_INVALID_SEARCH_FLAG 8500L
-#define ERROR_DS_NO_TREE_DELETE_ABOVE_NC 8501L
-#define ERROR_DS_COULDNT_LOCK_TREE_FOR_DELETE 8502L
-#define ERROR_DS_COULDNT_IDENTIFY_OBJECTS_FOR_TREE_DELETE 8503L
-#define ERROR_DS_SAM_INIT_FAILURE 8504L
-#define ERROR_DS_SENSITIVE_GROUP_VIOLATION 8505L
-#define ERROR_DS_CANT_MOD_PRIMARYGROUPID 8506L
-#define ERROR_DS_ILLEGAL_BASE_SCHEMA_MOD 8507L
-#define ERROR_DS_NONSAFE_SCHEMA_CHANGE 8508L
-#define ERROR_DS_SCHEMA_UPDATE_DISALLOWED 8509L
-#define ERROR_DS_CANT_CREATE_UNDER_SCHEMA 8510L
-#define ERROR_DS_INSTALL_NO_SRC_SCH_VERSION 8511L
-#define ERROR_DS_INSTALL_NO_SCH_VERSION_IN_INIFILE 8512L
-#define ERROR_DS_INVALID_GROUP_TYPE 8513L
-#define ERROR_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN 8514L
-#define ERROR_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN 8515L
-#define ERROR_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER 8516L
-#define ERROR_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER 8517L
-#define ERROR_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER 8518L
-#define ERROR_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER 8519L
-#define ERROR_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER 8520L
-#define ERROR_DS_HAVE_PRIMARY_MEMBERS 8521L
-#define ERROR_DS_STRING_SD_CONVERSION_FAILED 8522L
-#define ERROR_DS_NAMING_MASTER_GC 8523L
-#define ERROR_DS_LOOKUP_FAILURE 8524L
-#define ERROR_DS_COULDNT_UPDATE_SPNS 8525L
-#define ERROR_DS_CANT_RETRIEVE_SD 8526L
-#define ERROR_DS_KEY_NOT_UNIQUE 8527L
-#define ERROR_DS_WRONG_LINKED_ATT_SYNTAX 8528L
-#define ERROR_DS_SAM_NEED_BOOTKEY_PASSWORD 8529L
-#define ERROR_DS_SAM_NEED_BOOTKEY_FLOPPY 8530L
-#define ERROR_DS_CANT_START 8531L
-#define ERROR_DS_INIT_FAILURE 8532L
-#define ERROR_DS_NO_PKT_PRIVACY_ON_CONNECTION 8533L
-#define ERROR_DS_SOURCE_DOMAIN_IN_FOREST 8534L
-#define ERROR_DS_DESTINATION_DOMAIN_NOT_IN_FOREST 8535L
-#define ERROR_DS_DESTINATION_AUDITING_NOT_ENABLED 8536L
-#define ERROR_DS_CANT_FIND_DC_FOR_SRC_DOMAIN 8537L
-#define ERROR_DS_SRC_OBJ_NOT_GROUP_OR_USER 8538L
-#define ERROR_DS_SRC_SID_EXISTS_IN_FOREST 8539L
-#define ERROR_DS_SRC_AND_DST_OBJECT_CLASS_MISMATCH 8540L
-#define ERROR_SAM_INIT_FAILURE 8541L
-#define ERROR_DS_DRA_SCHEMA_INFO_SHIP 8542L
-#define ERROR_DS_DRA_SCHEMA_CONFLICT 8543L
-#define ERROR_DS_DRA_EARLIER_SCHEMA_CONLICT 8544L
-#define ERROR_DS_DRA_OBJ_NC_MISMATCH 8545L
-#define ERROR_DS_NC_STILL_HAS_DSAS 8546L
-#define ERROR_DS_GC_REQUIRED 8547L
-#define ERROR_DS_LOCAL_MEMBER_OF_LOCAL_ONLY 8548L
-#define ERROR_DS_NO_FPO_IN_UNIVERSAL_GROUPS 8549L
-#define ERROR_DS_CANT_ADD_TO_GC 8550L
-#define ERROR_DS_NO_CHECKPOINT_WITH_PDC 8551L
-#define ERROR_DS_SOURCE_AUDITING_NOT_ENABLED 8552L
-#define ERROR_DS_CANT_CREATE_IN_NONDOMAIN_NC 8553L
-#define ERROR_DS_INVALID_NAME_FOR_SPN 8554L
-#define ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS 8555L
-#define ERROR_DS_UNICODEPWD_NOT_IN_QUOTES 8556L
-#define ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED 8557L
-#define ERROR_DS_MUST_BE_RUN_ON_DST_DC 8558L
-#define ERROR_DS_SRC_DC_MUST_BE_SP4_OR_GREATER 8559L
-#define ERROR_DS_CANT_TREE_DELETE_CRITICAL_OBJ 8560L
-#define ERROR_DS_INIT_FAILURE_CONSOLE 8561L
-#define ERROR_DS_SAM_INIT_FAILURE_CONSOLE 8562L
-#define ERROR_DS_FOREST_VERSION_TOO_HIGH 8563L
-#define ERROR_DS_DOMAIN_VERSION_TOO_HIGH 8564L
-#define ERROR_DS_FOREST_VERSION_TOO_LOW 8565L
-#define ERROR_DS_DOMAIN_VERSION_TOO_LOW 8566L
-#define ERROR_DS_INCOMPATIBLE_VERSION 8567L
-#define ERROR_DS_LOW_DSA_VERSION 8568L
-#define ERROR_DS_NO_BEHAVIOR_VERSION_IN_MIXEDDOMAIN 8569L
-#define ERROR_DS_NOT_SUPPORTED_SORT_ORDER 8570L
-#define ERROR_DS_NAME_NOT_UNIQUE 8571L
-#define ERROR_DS_MACHINE_ACCOUNT_CREATED_PRENT4 8572L
-#define ERROR_DS_OUT_OF_VERSION_STORE 8573L
-#define ERROR_DS_INCOMPATIBLE_CONTROLS_USED 8574L
-#define ERROR_DS_NO_REF_DOMAIN 8575L
-#define ERROR_DS_RESERVED_LINK_ID 8576L
-#define ERROR_DS_LINK_ID_NOT_AVAILABLE 8577L
-#define ERROR_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER 8578L
-#define ERROR_DS_MODIFYDN_DISALLOWED_BY_INSTANCE_TYPE 8579L
-#define ERROR_DS_NO_OBJECT_MOVE_IN_SCHEMA_NC 8580L
-#define ERROR_DS_MODIFYDN_DISALLOWED_BY_FLAG 8581L
-#define ERROR_DS_MODIFYDN_WRONG_GRANDPARENT 8582L
-#define ERROR_DS_NAME_ERROR_TRUST_REFERRAL 8583L
-#define ERROR_NOT_SUPPORTED_ON_STANDARD_SERVER 8584L
-#define ERROR_DS_CANT_ACCESS_REMOTE_PART_OF_AD 8585L
-#define ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE_V2 8586L
-#define ERROR_DS_THREAD_LIMIT_EXCEEDED 8587L
-#define ERROR_DS_NOT_CLOSEST 8588L
-#define ERROR_DS_CANT_DERIVE_SPN_WITHOUT_SERVER_REF 8589L
-#define ERROR_DS_SINGLE_USER_MODE_FAILED 8590L
-#define ERROR_DS_NTDSCRIPT_SYNTAX_ERROR 8591L
-#define ERROR_DS_NTDSCRIPT_PROCESS_ERROR 8592L
-#define ERROR_DS_DIFFERENT_REPL_EPOCHS 8593L
-#define ERROR_DS_DRS_EXTENSIONS_CHANGED 8594L
-#define ERROR_DS_REPLICA_SET_CHANGE_NOT_ALLOWED_ON_DISABLED_CR 8595L
-#define ERROR_DS_NO_MSDS_INTID 8596L
-#define ERROR_DS_DUP_MSDS_INTID 8597L
-#define ERROR_DS_EXISTS_IN_RDNATTID 8598L
-#define ERROR_DS_AUTHORIZATION_FAILED 8599L
-#define ERROR_DS_INVALID_SCRIPT 8600L
-#define ERROR_DS_REMOTE_CROSSREF_OP_FAILED 8601L
-#define ERROR_DS_CROSS_REF_BUSY 8602L
-#define ERROR_DS_CANT_DERIVE_SPN_FOR_DELETED_DOMAIN 8603L
-#define ERROR_DS_CANT_DEMOTE_WITH_WRITEABLE_NC 8604L
-#define ERROR_DS_DUPLICATE_ID_FOUND 8605L
-#define ERROR_DS_INSUFFICIENT_ATTR_TO_CREATE_OBJECT 8606L
-#define ERROR_DS_GROUP_CONVERSION_ERROR 8607L
-#define ERROR_DS_CANT_MOVE_APP_BASIC_GROUP 8608L
-#define ERROR_DS_CANT_MOVE_APP_QUERY_GROUP 8609L
-#define ERROR_DS_ROLE_NOT_VERIFIED 8610L
-#define ERROR_DS_WKO_CONTAINER_CANNOT_BE_SPECIAL 8611L
-#define ERROR_DS_DOMAIN_RENAME_IN_PROGRESS 8612L
-#define ERROR_DS_EXISTING_AD_CHILD_NC 8613L
-#define DNS_ERROR_RCODE_FORMAT_ERROR 9001L
-#define DNS_ERROR_RCODE_SERVER_FAILURE 9002L
-#define DNS_ERROR_RCODE_NAME_ERROR 9003L
-#define DNS_ERROR_RCODE_NOT_IMPLEMENTED 9004L
-#define DNS_ERROR_RCODE_REFUSED 9005L
-#define DNS_ERROR_RCODE_YXDOMAIN 9006L
-#define DNS_ERROR_RCODE_YXRRSET 9007L
-#define DNS_ERROR_RCODE_NXRRSET 9008L
-#define DNS_ERROR_RCODE_NOTAUTH 9009L
-#define DNS_ERROR_RCODE_NOTZONE 9010L
-#define DNS_ERROR_RCODE_BADSIG 9016L
-#define DNS_ERROR_RCODE_BADKEY 9017L
-#define DNS_ERROR_RCODE_BADTIME 9018L
-#define DNS_INFO_NO_RECORDS 9501L
-#define DNS_ERROR_BAD_PACKET 9502L
-#define DNS_ERROR_NO_PACKET 9503L
-#define DNS_ERROR_RCODE 9504L
-#define DNS_ERROR_UNSECURE_PACKET 9505L
-#define DNS_ERROR_INVALID_TYPE 9551L
-#define DNS_ERROR_INVALID_IP_ADDRESS 9552L
-#define DNS_ERROR_INVALID_PROPERTY 9553L
-#define DNS_ERROR_TRY_AGAIN_LATER 9554L
-#define DNS_ERROR_NOT_UNIQUE 9555L
-#define DNS_ERROR_NON_RFC_NAME 9556L
-#define DNS_STATUS_FQDN 9557L
-#define DNS_STATUS_DOTTED_NAME 9558L
-#define DNS_STATUS_SINGLE_PART_NAME 9559L
-#define DNS_ERROR_INVALID_NAME_CHAR 9560L
-#define DNS_ERROR_NUMERIC_NAME 9561L
-#define DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER 9562L
-#define DNS_ERROR_NOT_ALLOWED_UNDER_DELEGATION 9563L
-#define DNS_ERROR_CANNOT_FIND_ROOT_HINTS 9564L
-#define DNS_ERROR_INCONSISTENT_ROOT_HINTS 9565L
-#define DNS_ERROR_ZONE_DOES_NOT_EXIST 9601L
-#define DNS_ERROR_NO_ZONE_INFO 9602L
-#define DNS_ERROR_INVALID_ZONE_OPERATION 9603L
-#define DNS_ERROR_ZONE_CONFIGURATION_ERROR 9604L
-#define DNS_ERROR_ZONE_HAS_NO_SOA_RECORD 9605L
-#define DNS_ERROR_ZONE_HAS_NO_NS_RECORDS 9606L
-#define DNS_ERROR_ZONE_LOCKED 9607L
-#define DNS_ERROR_ZONE_CREATION_FAILED 9608L
-#define DNS_ERROR_ZONE_ALREADY_EXISTS 9609L
-#define DNS_ERROR_AUTOZONE_ALREADY_EXISTS 9610L
-#define DNS_ERROR_INVALID_ZONE_TYPE 9611L
-#define DNS_ERROR_SECONDARY_REQUIRES_MASTER_IP 9612L
-#define DNS_ERROR_ZONE_NOT_SECONDARY 9613L
-#define DNS_ERROR_NEED_SECONDARY_ADDRESSES 9614L
-#define DNS_ERROR_WINS_INIT_FAILED 9615L
-#define DNS_ERROR_NEED_WINS_SERVERS 9616L
-#define DNS_ERROR_NBSTAT_INIT_FAILED 9617L
-#define DNS_ERROR_SOA_DELETE_INVALID 9618L
-#define DNS_ERROR_FORWARDER_ALREADY_EXISTS 9619L
-#define DNS_ERROR_ZONE_REQUIRES_MASTER_IP 9620L
-#define DNS_ERROR_ZONE_IS_SHUTDOWN 9621L
-#define DNS_ERROR_PRIMARY_REQUIRES_DATAFILE 9651L
-#define DNS_ERROR_INVALID_DATAFILE_NAME 9652L
-#define DNS_ERROR_DATAFILE_OPEN_FAILURE 9653L
-#define DNS_ERROR_FILE_WRITEBACK_FAILED 9654L
-#define DNS_ERROR_DATAFILE_PARSING 9655L
-#define DNS_ERROR_RECORD_DOES_NOT_EXIST 9701L
-#define DNS_ERROR_RECORD_FORMAT 9702L
-#define DNS_ERROR_NODE_CREATION_FAILED 9703L
-#define DNS_ERROR_UNKNOWN_RECORD_TYPE 9704L
-#define DNS_ERROR_RECORD_TIMED_OUT 9705L
-#define DNS_ERROR_NAME_NOT_IN_ZONE 9706L
-#define DNS_ERROR_CNAME_LOOP 9707L
-#define DNS_ERROR_NODE_IS_CNAME 9708L
-#define DNS_ERROR_CNAME_COLLISION 9709L
-#define DNS_ERROR_RECORD_ONLY_AT_ZONE_ROOT 9710L
-#define DNS_ERROR_RECORD_ALREADY_EXISTS 9711L
-#define DNS_ERROR_SECONDARY_DATA 9712L
-#define DNS_ERROR_NO_CREATE_CACHE_DATA 9713L
-#define DNS_ERROR_NAME_DOES_NOT_EXIST 9714L
-#define DNS_WARNING_PTR_CREATE_FAILED 9715L
-#define DNS_WARNING_DOMAIN_UNDELETED 9716L
-#define DNS_ERROR_DS_UNAVAILABLE 9717L
-#define DNS_ERROR_DS_ZONE_ALREADY_EXISTS 9718L
-#define DNS_ERROR_NO_BOOTFILE_IF_DS_ZONE 9719L
-#define DNS_INFO_AXFR_COMPLETE 9751L
-#define DNS_ERROR_AXFR 9752L
-#define DNS_INFO_ADDED_LOCAL_WINS 9753L
-#define DNS_STATUS_CONTINUE_NEEDED 9801L
-#define DNS_ERROR_NO_TCPIP 9851L
-#define DNS_ERROR_NO_DNS_SERVERS 9852L
-#define DNS_ERROR_DP_DOES_NOT_EXIST 9901L
-#define DNS_ERROR_DP_ALREADY_EXISTS 9902L
-#define DNS_ERROR_DP_NOT_ENLISTED 9903L
-#define DNS_ERROR_DP_ALREADY_ENLISTED 9904L
-#define DNS_ERROR_DP_NOT_AVAILABLE 9905L
-
-#ifndef WSABASEERR
-#define WSABASEERR 10000
-#define WSAEINTR 10004L
-#define WSAEBADF 10009L
-#define WSAEACCES 10013L
-#define WSAEFAULT 10014L
-#define WSAEINVAL 10022L
-#define WSAEMFILE 10024L
-#define WSAEWOULDBLOCK 10035L
-#define WSAEINPROGRESS 10036L
-#define WSAEALREADY 10037L
-#define WSAENOTSOCK 10038L
-#define WSAEDESTADDRREQ 10039L
-#define WSAEMSGSIZE 10040L
-#define WSAEPROTOTYPE 10041L
-#define WSAENOPROTOOPT 10042L
-#define WSAEPROTONOSUPPORT 10043L
-#define WSAESOCKTNOSUPPORT 10044L
-#define WSAEOPNOTSUPP 10045L
-#define WSAEPFNOSUPPORT 10046L
-#define WSAEAFNOSUPPORT 10047L
-#define WSAEADDRINUSE 10048L
-#define WSAEADDRNOTAVAIL 10049L
-#define WSAENETDOWN 10050L
-#define WSAENETUNREACH 10051L
-#define WSAENETRESET 10052L
-#define WSAECONNABORTED 10053L
-#define WSAECONNRESET 10054L
-#define WSAENOBUFS 10055L
-#define WSAEISCONN 10056L
-#define WSAENOTCONN 10057L
-#define WSAESHUTDOWN 10058L
-#define WSAETOOMANYREFS 10059L
-#define WSAETIMEDOUT 10060L
-#define WSAECONNREFUSED 10061L
-#define WSAELOOP 10062L
-#define WSAENAMETOOLONG 10063L
-#define WSAEHOSTDOWN 10064L
-#define WSAEHOSTUNREACH 10065L
-#define WSAENOTEMPTY 10066L
-#define WSAEPROCLIM 10067L
-#define WSAEUSERS 10068L
-#define WSAEDQUOT 10069L
-#define WSAESTALE 10070L
-#define WSAEREMOTE 10071L
-#define WSASYSNOTREADY 10091L
-#define WSAVERNOTSUPPORTED 10092L
-#define WSANOTINITIALISED 10093L
-#define WSAEDISCON 10101L
-#define WSAENOMORE 10102L
-#define WSAECANCELLED 10103L
-#define WSAEINVALIDPROCTABLE 10104L
-#define WSAEINVALIDPROVIDER 10105L
-#define WSAEPROVIDERFAILEDINIT 10106L
-#define WSASYSCALLFAILURE 10107L
-#define WSASERVICE_NOT_FOUND 10108L
-#define WSATYPE_NOT_FOUND 10109L
-#define WSA_E_NO_MORE 10110L
-#define WSA_E_CANCELLED 10111L
-#define WSAEREFUSED 10112L
-#define WSAHOST_NOT_FOUND 11001L
-#define WSATRY_AGAIN 11002L
-#define WSANO_RECOVERY 11003L
-#define WSANO_DATA 11004L
-#define WSA_QOS_RECEIVERS 11005L
-#define WSA_QOS_SENDERS 11006L
-#define WSA_QOS_NO_SENDERS 11007L
-#define WSA_QOS_NO_RECEIVERS 11008L
-#define WSA_QOS_REQUEST_CONFIRMED 11009L
-#define WSA_QOS_ADMISSION_FAILURE 11010L
-#define WSA_QOS_POLICY_FAILURE 11011L
-#define WSA_QOS_BAD_STYLE 11012L
-#define WSA_QOS_BAD_OBJECT 11013L
-#define WSA_QOS_TRAFFIC_CTRL_ERROR 11014L
-#define WSA_QOS_GENERIC_ERROR 11015L
-#define WSA_QOS_ESERVICETYPE 11016L
-#define WSA_QOS_EFLOWSPEC 11017L
-#define WSA_QOS_EPROVSPECBUF 11018L
-#define WSA_QOS_EFILTERSTYLE 11019L
-#define WSA_QOS_EFILTERTYPE 11020L
-#define WSA_QOS_EFILTERCOUNT 11021L
-#define WSA_QOS_EOBJLENGTH 11022L
-#define WSA_QOS_EFLOWCOUNT 11023L
-#define WSA_QOS_EUNKNOWNPSOBJ 11024L
-#define WSA_QOS_EPOLICYOBJ 11025L
-#define WSA_QOS_EFLOWDESC 11026L
-#define WSA_QOS_EPSFLOWSPEC 11027L
-#define WSA_QOS_EPSFILTERSPEC 11028L
-#define WSA_QOS_ESDMODEOBJ 11029L
-#define WSA_QOS_ESHAPERATEOBJ 11030L
-#define WSA_QOS_RESERVED_PETYPE 11031L
-#endif /* !WSABASEERR */
-
-#define ERROR_IPSEC_QM_POLICY_EXISTS 13000L
-#define ERROR_IPSEC_QM_POLICY_NOT_FOUND 13001L
-#define ERROR_IPSEC_QM_POLICY_IN_USE 13002L
-#define ERROR_IPSEC_MM_POLICY_EXISTS 13003L
-#define ERROR_IPSEC_MM_POLICY_NOT_FOUND 13004L
-#define ERROR_IPSEC_MM_POLICY_IN_USE 13005L
-#define ERROR_IPSEC_MM_FILTER_EXISTS 13006L
-#define ERROR_IPSEC_MM_FILTER_NOT_FOUND 13007L
-#define ERROR_IPSEC_TRANSPORT_FILTER_EXISTS 13008L
-#define ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND 13009L
-#define ERROR_IPSEC_MM_AUTH_EXISTS 13010L
-#define ERROR_IPSEC_MM_AUTH_NOT_FOUND 13011L
-#define ERROR_IPSEC_MM_AUTH_IN_USE 13012L
-#define ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND 13013L
-#define ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND 13014L
-#define ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND 13015L
-#define ERROR_IPSEC_TUNNEL_FILTER_EXISTS 13016L
-#define ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND 13017L
-#define ERROR_IPSEC_MM_FILTER_PENDING_DELETION 13018L
-#define ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION 13019L
-#define ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION 13020L
-#define ERROR_IPSEC_MM_POLICY_PENDING_DELETION 13021L
-#define ERROR_IPSEC_MM_AUTH_PENDING_DELETION 13022L
-#define ERROR_IPSEC_QM_POLICY_PENDING_DELETION 13023L
-#define WARNING_IPSEC_MM_POLICY_PRUNED 13024L
-#define WARNING_IPSEC_QM_POLICY_PRUNED 13025L
-#define ERROR_IPSEC_IKE_AUTH_FAIL 13801L
-#define ERROR_IPSEC_IKE_ATTRIB_FAIL 13802L
-#define ERROR_IPSEC_IKE_NEGOTIATION_PENDING 13803L
-#define ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR 13804L
-#define ERROR_IPSEC_IKE_TIMED_OUT 13805L
-#define ERROR_IPSEC_IKE_NO_CERT 13806L
-#define ERROR_IPSEC_IKE_SA_DELETED 13807L
-#define ERROR_IPSEC_IKE_SA_REAPED 13808L
-#define ERROR_IPSEC_IKE_MM_ACQUIRE_DROP 13809L
-#define ERROR_IPSEC_IKE_QM_ACQUIRE_DROP 13810L
-#define ERROR_IPSEC_IKE_QUEUE_DROP_MM 13811L
-#define ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM 13812L
-#define ERROR_IPSEC_IKE_DROP_NO_RESPONSE 13813L
-#define ERROR_IPSEC_IKE_MM_DELAY_DROP 13814L
-#define ERROR_IPSEC_IKE_QM_DELAY_DROP 13815L
-#define ERROR_IPSEC_IKE_ERROR 13816L
-#define ERROR_IPSEC_IKE_CRL_FAILED 13817L
-#define ERROR_IPSEC_IKE_INVALID_KEY_USAGE 13818L
-#define ERROR_IPSEC_IKE_INVALID_CERT_TYPE 13819L
-#define ERROR_IPSEC_IKE_NO_PRIVATE_KEY 13820L
-#define ERROR_IPSEC_IKE_DH_FAIL 13822L
-#define ERROR_IPSEC_IKE_INVALID_HEADER 13824L
-#define ERROR_IPSEC_IKE_NO_POLICY 13825L
-#define ERROR_IPSEC_IKE_INVALID_SIGNATURE 13826L
-#define ERROR_IPSEC_IKE_KERBEROS_ERROR 13827L
-#define ERROR_IPSEC_IKE_NO_PUBLIC_KEY 13828L
-#define ERROR_IPSEC_IKE_PROCESS_ERR 13829L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_SA 13830L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_PROP 13831L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_TRANS 13832L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_KE 13833L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_ID 13834L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_CERT 13835L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ 13836L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_HASH 13837L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_SIG 13838L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_NONCE 13839L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY 13840L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_DELETE 13841L
-#define ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR 13842L
-#define ERROR_IPSEC_IKE_INVALID_PAYLOAD 13843L
-#define ERROR_IPSEC_IKE_LOAD_SOFT_SA 13844L
-#define ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN 13845L
-#define ERROR_IPSEC_IKE_INVALID_COOKIE 13846L
-#define ERROR_IPSEC_IKE_NO_PEER_CERT 13847L
-#define ERROR_IPSEC_IKE_PEER_CRL_FAILED 13848L
-#define ERROR_IPSEC_IKE_POLICY_CHANGE 13849L
-#define ERROR_IPSEC_IKE_NO_MM_POLICY 13850L
-#define ERROR_IPSEC_IKE_NOTCBPRIV 13851L
-#define ERROR_IPSEC_IKE_SECLOADFAIL 13852L
-#define ERROR_IPSEC_IKE_FAILSSPINIT 13853L
-#define ERROR_IPSEC_IKE_FAILQUERYSSP 13854L
-#define ERROR_IPSEC_IKE_SRVACQFAIL 13855L
-#define ERROR_IPSEC_IKE_SRVQUERYCRED 13856L
-#define ERROR_IPSEC_IKE_GETSPIFAIL 13857L
-#define ERROR_IPSEC_IKE_INVALID_FILTER 13858L
-#define ERROR_IPSEC_IKE_OUT_OF_MEMORY 13859L
-#define ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED 13860L
-#define ERROR_IPSEC_IKE_INVALID_POLICY 13861L
-#define ERROR_IPSEC_IKE_UNKNOWN_DOI 13862L
-#define ERROR_IPSEC_IKE_INVALID_SITUATION 13863L
-#define ERROR_IPSEC_IKE_DH_FAILURE 13864L
-#define ERROR_IPSEC_IKE_INVALID_GROUP 13865L
-#define ERROR_IPSEC_IKE_ENCRYPT 13866L
-#define ERROR_IPSEC_IKE_DECRYPT 13867L
-#define ERROR_IPSEC_IKE_POLICY_MATCH 13868L
-#define ERROR_IPSEC_IKE_UNSUPPORTED_ID 13869L
-#define ERROR_IPSEC_IKE_INVALID_HASH 13870L
-#define ERROR_IPSEC_IKE_INVALID_HASH_ALG 13871L
-#define ERROR_IPSEC_IKE_INVALID_HASH_SIZE 13872L
-#define ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG 13873L
-#define ERROR_IPSEC_IKE_INVALID_AUTH_ALG 13874L
-#define ERROR_IPSEC_IKE_INVALID_SIG 13875L
-#define ERROR_IPSEC_IKE_LOAD_FAILED 13876L
-#define ERROR_IPSEC_IKE_RPC_DELETE 13877L
-#define ERROR_IPSEC_IKE_BENIGN_REINIT 13878L
-#define ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY 13879L
-#define ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN 13881L
-#define ERROR_IPSEC_IKE_MM_LIMIT 13882L
-#define ERROR_IPSEC_IKE_NEGOTIATION_DISABLED 13883L
-#define ERROR_IPSEC_IKE_NEG_STATUS_END 13884L
-
-#define ERROR_SXS_SECTION_NOT_FOUND 14000L
-#define ERROR_SXS_CANT_GEN_ACTCTX 14001L
-#define ERROR_SXS_INVALID_ACTCTXDATA_FORMAT 14002L
-#define ERROR_SXS_ASSEMBLY_NOT_FOUND 14003L
-#define ERROR_SXS_MANIFEST_FORMAT_ERROR 14004L
-#define ERROR_SXS_MANIFEST_PARSE_ERROR 14005L
-#define ERROR_SXS_ACTIVATION_CONTEXT_DISABLED 14006L
-#define ERROR_SXS_KEY_NOT_FOUND 14007L
-#define ERROR_SXS_VERSION_CONFLICT 14008L
-#define ERROR_SXS_WRONG_SECTION_TYPE 14009L
-#define ERROR_SXS_THREAD_QUERIES_DISABLED 14010L
-#define ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET 14011L
-#define ERROR_SXS_UNKNOWN_ENCODING_GROUP 14012L
-#define ERROR_SXS_UNKNOWN_ENCODING 14013L
-#define ERROR_SXS_INVALID_XML_NAMESPACE_URI 14014L
-#define ERROR_SXS_ROOT_MANIFEST_DEPENDENCY_NOT_INSTALLED 14015L
-#define ERROR_SXS_LEAF_MANIFEST_DEPENDENCY_NOT_INSTALLED 14016L
-#define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE 14017L
-#define ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE 14018L
-#define ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE 14019L
-#define ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT 14020L
-#define ERROR_SXS_DUPLICATE_DLL_NAME 14021L
-#define ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME 14022L
-#define ERROR_SXS_DUPLICATE_CLSID 14023L
-#define ERROR_SXS_DUPLICATE_IID 14024L
-#define ERROR_SXS_DUPLICATE_TLBID 14025L
-#define ERROR_SXS_DUPLICATE_PROGID 14026L
-#define ERROR_SXS_DUPLICATE_ASSEMBLY_NAME 14027L
-#define ERROR_SXS_FILE_HASH_MISMATCH 14028L
-#define ERROR_SXS_POLICY_PARSE_ERROR 14029L
-#define ERROR_SXS_XML_E_MISSINGQUOTE 14030L
-#define ERROR_SXS_XML_E_COMMENTSYNTAX 14031L
-#define ERROR_SXS_XML_E_BADSTARTNAMECHAR 14032L
-#define ERROR_SXS_XML_E_BADNAMECHAR 14033L
-#define ERROR_SXS_XML_E_BADCHARINSTRING 14034L
-#define ERROR_SXS_XML_E_XMLDECLSYNTAX 14035L
-#define ERROR_SXS_XML_E_BADCHARDATA 14036L
-#define ERROR_SXS_XML_E_MISSINGWHITESPACE 14037L
-#define ERROR_SXS_XML_E_EXPECTINGTAGEND 14038L
-#define ERROR_SXS_XML_E_MISSINGSEMICOLON 14039L
-#define ERROR_SXS_XML_E_UNBALANCEDPAREN 14040L
-#define ERROR_SXS_XML_E_INTERNALERROR 14041L
-#define ERROR_SXS_XML_E_UNEXPECTED_WHITESPACE 14042L
-#define ERROR_SXS_XML_E_INCOMPLETE_ENCODING 14043L
-#define ERROR_SXS_XML_E_MISSING_PAREN 14044L
-#define ERROR_SXS_XML_E_EXPECTINGCLOSEQUOTE 14045L
-#define ERROR_SXS_XML_E_MULTIPLE_COLONS 14046L
-#define ERROR_SXS_XML_E_INVALID_DECIMAL 14047L
-#define ERROR_SXS_XML_E_INVALID_HEXIDECIMAL 14048L
-#define ERROR_SXS_XML_E_INVALID_UNICODE 14049L
-#define ERROR_SXS_XML_E_WHITESPACEORQUESTIONMARK 14050L
-#define ERROR_SXS_XML_E_UNEXPECTEDENDTAG 14051L
-#define ERROR_SXS_XML_E_UNCLOSEDTAG 14052L
-#define ERROR_SXS_XML_E_DUPLICATEATTRIBUTE 14053L
-#define ERROR_SXS_XML_E_MULTIPLEROOTS 14054L
-#define ERROR_SXS_XML_E_INVALIDATROOTLEVEL 14055L
-#define ERROR_SXS_XML_E_BADXMLDECL 14056L
-#define ERROR_SXS_XML_E_MISSINGROOT 14057L
-#define ERROR_SXS_XML_E_UNEXPECTEDEOF 14058L
-#define ERROR_SXS_XML_E_BADPEREFINSUBSET 14059L
-#define ERROR_SXS_XML_E_UNCLOSEDSTARTTAG 14060L
-#define ERROR_SXS_XML_E_UNCLOSEDENDTAG 14061L
-#define ERROR_SXS_XML_E_UNCLOSEDSTRING 14062L
-#define ERROR_SXS_XML_E_UNCLOSEDCOMMENT 14063L
-#define ERROR_SXS_XML_E_UNCLOSEDDECL 14064L
-#define ERROR_SXS_XML_E_UNCLOSEDCDATA 14065L
-#define ERROR_SXS_XML_E_RESERVEDNAMESPACE 14066L
-#define ERROR_SXS_XML_E_INVALIDENCODING 14067L
-#define ERROR_SXS_XML_E_INVALIDSWITCH 14068L
-#define ERROR_SXS_XML_E_BADXMLCASE 14069L
-#define ERROR_SXS_XML_E_INVALID_STANDALONE 14070L
-#define ERROR_SXS_XML_E_UNEXPECTED_STANDALONE 14071L
-#define ERROR_SXS_XML_E_INVALID_VERSION 14072L
-#define ERROR_SXS_XML_E_MISSINGEQUALS 14073L
-#define ERROR_SXS_PROTECTION_RECOVERY_FAILED 14074L
-#define ERROR_SXS_PROTECTION_PUBLIC_KEY_TOO_SHORT 14075L
-#define ERROR_SXS_PROTECTION_CATALOG_NOT_VALID 14076L
-#define ERROR_SXS_UNTRANSLATABLE_HRESULT 14077L
-#define ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING 14078L
-#define ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE 14079L
-#define ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME 14080L
-
-#define SEVERITY_SUCCESS 0
-#define SEVERITY_ERROR 1
-#define FACILITY_WINDOWS 8
-#define FACILITY_STORAGE 3
-#define FACILITY_RPC 1
-#define FACILITY_WIN32 7
-#define FACILITY_CONTROL 10
-#define FACILITY_NULL 0
-#define FACILITY_ITF 4
-#define FACILITY_DISPATCH 2
-#define SUCCEEDED(Status) ((HRESULT)(Status) >= 0)
-#define FAILED(Status) ((HRESULT)(Status)<0)
-#define IS_ERROR(Status) ((unsigned long)(Status) >> 31 == SEVERITY_ERROR)
-#define HRESULT_CODE(r) ((r)&0xFFFF)
-#define SCODE_CODE(c) ((c)&0xFFFF)
-#define HRESULT_FACILITY(r) (((r)>>16)&0x1fff)
-#define SCODE_FACILITY(c) (((c)>>16)&0x1fff)
-#define HRESULT_SEVERITY(r) (((r)>>31)&0x1)
-#define SCODE_SEVERITY(c) (((c)>>31)&0x1)
-#define MAKE_HRESULT(s,f,c) ((HRESULT)(((unsigned long)(s)<<31)|((unsigned long)(f)<<16)|((unsigned long)(c))))
-#define MAKE_SCODE(s,f,c) ((SCODE)(((unsigned long)(s)<<31)|((unsigned long)(f)<<16)|((unsigned long)(c))) )
-#define FACILITY_NT_BIT 0x10000000
-#define HRESULT_FROM_WIN32(x) (x?((HRESULT)(((x)&0x0000FFFF)|(FACILITY_WIN32<<16)|0x80000000)):0)
-#define HRESULT_FROM_NT(x) ((HRESULT)((x)|FACILITY_NT_BIT))
-#define GetScode(hr) ((SCODE) (hr))
-#define ResultFromScode(sc) ((HRESULT) (sc))
-#define PropagateResult(hrPrevious, scBase) ((HRESULT) scBase)
-
-#define NOERROR S_OK
-#define E_UNEXPECTED ((HRESULT)0x8000FFFFL)
-#define E_NOTIMPL ((HRESULT)0x80004001L)
-#define E_OUTOFMEMORY ((HRESULT)0x8007000EL)
-#define E_INVALIDARG ((HRESULT)0x80070057L)
-#define E_NOINTERFACE ((HRESULT)0x80004002L)
-#define E_POINTER ((HRESULT)0x80004003L)
-#define E_HANDLE ((HRESULT)0x80070006L)
-#define E_ABORT ((HRESULT)0x80004004L)
-#define E_FAIL ((HRESULT)0x80004005L)
-#define E_ACCESSDENIED ((HRESULT)0x80070005L)
-#define E_PENDING ((HRESULT)0x8000000AL)
-#define CO_E_INIT_TLS ((HRESULT)0x80004006L)
-#define CO_E_INIT_SHARED_ALLOCATOR ((HRESULT)0x80004007L)
-#define CO_E_INIT_MEMORY_ALLOCATOR ((HRESULT)0x80004008L)
-#define CO_E_INIT_CLASS_CACHE ((HRESULT)0x80004009L)
-#define CO_E_INIT_RPC_CHANNEL ((HRESULT)0x8000400AL)
-#define CO_E_INIT_TLS_SET_CHANNEL_CONTROL ((HRESULT)0x8000400BL)
-#define CO_E_INIT_TLS_CHANNEL_CONTROL ((HRESULT)0x8000400CL)
-#define CO_E_INIT_UNACCEPTED_USER_ALLOCATOR ((HRESULT)0x8000400DL)
-#define CO_E_INIT_SCM_MUTEX_EXISTS ((HRESULT)0x8000400EL)
-#define CO_E_INIT_SCM_FILE_MAPPING_EXISTS ((HRESULT)0x8000400FL)
-#define CO_E_INIT_SCM_MAP_VIEW_OF_FILE ((HRESULT)0x80004010L)
-#define CO_E_INIT_SCM_EXEC_FAILURE ((HRESULT)0x80004011L)
-#define CO_E_INIT_ONLY_SINGLE_THREADED ((HRESULT)0x80004012L)
-#define S_OK ((HRESULT)0x00000000L)
-#define S_FALSE ((HRESULT)0x00000001L)
-#define OLE_E_FIRST ((HRESULT)0x80040000L)
-#define OLE_E_LAST ((HRESULT)0x800400FFL)
-#define OLE_S_FIRST ((HRESULT)0x00040000L)
-#define OLE_S_LAST ((HRESULT)0x000400FFL)
-#define OLE_E_OLEVERB ((HRESULT)0x80040000L)
-#define OLE_E_ADVF ((HRESULT)0x80040001L)
-#define OLE_E_ENUM_NOMORE ((HRESULT)0x80040002L)
-#define OLE_E_ADVISENOTSUPPORTED ((HRESULT)0x80040003L)
-#define OLE_E_NOCONNECTION ((HRESULT)0x80040004L)
-#define OLE_E_NOTRUNNING ((HRESULT)0x80040005L)
-#define OLE_E_NOCACHE ((HRESULT)0x80040006L)
-#define OLE_E_BLANK ((HRESULT)0x80040007L)
-#define OLE_E_CLASSDIFF ((HRESULT)0x80040008L)
-#define OLE_E_CANT_GETMONIKER ((HRESULT)0x80040009L)
-#define OLE_E_CANT_BINDTOSOURCE ((HRESULT)0x8004000AL)
-#define OLE_E_STATIC ((HRESULT)0x8004000BL)
-#define OLE_E_PROMPTSAVECANCELLED ((HRESULT)0x8004000CL)
-#define OLE_E_INVALIDRECT ((HRESULT)0x8004000DL)
-#define OLE_E_WRONGCOMPOBJ ((HRESULT)0x8004000EL)
-#define OLE_E_INVALIDHWND ((HRESULT)0x8004000FL)
-#define OLE_E_NOT_INPLACEACTIVE ((HRESULT)0x80040010L)
-#define OLE_E_CANTCONVERT ((HRESULT)0x80040011L)
-#define OLE_E_NOSTORAGE ((HRESULT)0x80040012L)
-#define DV_E_FORMATETC ((HRESULT)0x80040064L)
-#define DV_E_DVTARGETDEVICE ((HRESULT)0x80040065L)
-#define DV_E_STGMEDIUM ((HRESULT)0x80040066L)
-#define DV_E_STATDATA ((HRESULT)0x80040067L)
-#define DV_E_LINDEX ((HRESULT)0x80040068L)
-#define DV_E_TYMED ((HRESULT)0x80040069L)
-#define DV_E_CLIPFORMAT ((HRESULT)0x8004006AL)
-#define DV_E_DVASPECT ((HRESULT)0x8004006BL)
-#define DV_E_DVTARGETDEVICE_SIZE ((HRESULT)0x8004006CL)
-#define DV_E_NOIVIEWOBJECT ((HRESULT)0x8004006DL)
-#define DRAGDROP_E_FIRST ((HRESULT)0x80040100L)
-#define DRAGDROP_E_LAST ((HRESULT)0x8004010FL)
-#define DRAGDROP_S_FIRST ((HRESULT)0x00040100L)
-#define DRAGDROP_S_LAST ((HRESULT)0x0004010FL)
-#define DRAGDROP_E_NOTREGISTERED ((HRESULT)0x80040100L)
-#define DRAGDROP_E_ALREADYREGISTERED ((HRESULT)0x80040101L)
-#define DRAGDROP_E_INVALIDHWND ((HRESULT)0x80040102L)
-#define CLASSFACTORY_E_FIRST ((HRESULT)0x80040110L)
-#define CLASSFACTORY_E_LAST ((HRESULT)0x8004011FL)
-#define CLASSFACTORY_S_FIRST ((HRESULT)0x00040110L)
-#define CLASSFACTORY_S_LAST ((HRESULT)0x0004011FL)
-#define CLASS_E_NOAGGREGATION ((HRESULT)0x80040110L)
-#define CLASS_E_CLASSNOTAVAILABLE ((HRESULT)0x80040111L)
-#define MARSHAL_E_FIRST ((HRESULT)0x80040120L)
-#define MARSHAL_E_LAST ((HRESULT)0x8004012FL)
-#define MARSHAL_S_FIRST ((HRESULT)0x00040120L)
-#define MARSHAL_S_LAST ((HRESULT)0x0004012FL)
-#define DATA_E_FIRST ((HRESULT)0x80040130L)
-#define DATA_E_LAST ((HRESULT)0x8004013FL)
-#define DATA_S_FIRST ((HRESULT)0x00040130L)
-#define DATA_S_LAST ((HRESULT)0x0004013FL)
-#define VIEW_E_FIRST ((HRESULT)0x80040140L)
-#define VIEW_E_LAST ((HRESULT)0x8004014FL)
-#define VIEW_S_FIRST ((HRESULT)0x00040140L)
-#define VIEW_S_LAST ((HRESULT)0x0004014FL)
-#define VIEW_E_DRAW ((HRESULT)0x80040140L)
-#define REGDB_E_FIRST ((HRESULT)0x80040150L)
-#define REGDB_E_LAST ((HRESULT)0x8004015FL)
-#define REGDB_S_FIRST ((HRESULT)0x00040150L)
-#define REGDB_S_LAST ((HRESULT)0x0004015FL)
-#define REGDB_E_READREGDB ((HRESULT)0x80040150L)
-#define REGDB_E_WRITEREGDB ((HRESULT)0x80040151L)
-#define REGDB_E_KEYMISSING ((HRESULT)0x80040152L)
-#define REGDB_E_INVALIDVALUE ((HRESULT)0x80040153L)
-#define REGDB_E_CLASSNOTREG ((HRESULT)0x80040154L)
-#define REGDB_E_IIDNOTREG ((HRESULT)0x80040155L)
-#define CACHE_E_FIRST ((HRESULT)0x80040170L)
-#define CACHE_E_LAST ((HRESULT)0x8004017FL)
-#define CACHE_S_FIRST ((HRESULT)0x00040170L)
-#define CACHE_S_LAST ((HRESULT)0x0004017FL)
-#define CACHE_E_NOCACHE_UPDATED ((HRESULT)0x80040170L)
-#define OLEOBJ_E_FIRST ((HRESULT)0x80040180L)
-#define OLEOBJ_E_LAST ((HRESULT)0x8004018FL)
-#define OLEOBJ_S_FIRST ((HRESULT)0x00040180L)
-#define OLEOBJ_S_LAST ((HRESULT)0x0004018FL)
-#define OLEOBJ_E_NOVERBS ((HRESULT)0x80040180L)
-#define OLEOBJ_E_INVALIDVERB ((HRESULT)0x80040181L)
-#define CLIENTSITE_E_FIRST ((HRESULT)0x80040190L)
-#define CLIENTSITE_E_LAST ((HRESULT)0x8004019FL)
-#define CLIENTSITE_S_FIRST ((HRESULT)0x00040190L)
-#define CLIENTSITE_S_LAST ((HRESULT)0x0004019FL)
-#define INPLACE_E_NOTUNDOABLE ((HRESULT)0x800401A0L)
-#define INPLACE_E_NOTOOLSPACE ((HRESULT)0x800401A1L)
-#define INPLACE_E_FIRST ((HRESULT)0x800401A0L)
-#define INPLACE_E_LAST ((HRESULT)0x800401AFL)
-#define INPLACE_S_FIRST ((HRESULT)0x000401A0L)
-#define INPLACE_S_LAST ((HRESULT)0x000401AFL)
-#define ENUM_E_FIRST ((HRESULT)0x800401B0L)
-#define ENUM_E_LAST ((HRESULT)0x800401BFL)
-#define ENUM_S_FIRST ((HRESULT)0x000401B0L)
-#define ENUM_S_LAST ((HRESULT)0x000401BFL)
-#define CONVERT10_E_FIRST ((HRESULT)0x800401C0L)
-#define CONVERT10_E_LAST ((HRESULT)0x800401CFL)
-#define CONVERT10_S_FIRST ((HRESULT)0x000401C0L)
-#define CONVERT10_S_LAST ((HRESULT)0x000401CFL)
-#define CONVERT10_E_OLESTREAM_GET ((HRESULT)0x800401C0L)
-#define CONVERT10_E_OLESTREAM_PUT ((HRESULT)0x800401C1L)
-#define CONVERT10_E_OLESTREAM_FMT ((HRESULT)0x800401C2L)
-#define CONVERT10_E_OLESTREAM_BITMAP_TO_DIB ((HRESULT)0x800401C3L)
-#define CONVERT10_E_STG_FMT ((HRESULT)0x800401C4L)
-#define CONVERT10_E_STG_NO_STD_STREAM ((HRESULT)0x800401C5L)
-#define CONVERT10_E_STG_DIB_TO_BITMAP ((HRESULT)0x800401C6L)
-#define CLIPBRD_E_FIRST ((HRESULT)0x800401D0L)
-#define CLIPBRD_E_LAST ((HRESULT)0x800401DFL)
-#define CLIPBRD_S_FIRST ((HRESULT)0x000401D0L)
-#define CLIPBRD_S_LAST ((HRESULT)0x000401DFL)
-#define CLIPBRD_E_CANT_OPEN ((HRESULT)0x800401D0L)
-#define CLIPBRD_E_CANT_EMPTY ((HRESULT)0x800401D1L)
-#define CLIPBRD_E_CANT_SET ((HRESULT)0x800401D2L)
-#define CLIPBRD_E_BAD_DATA ((HRESULT)0x800401D3L)
-#define CLIPBRD_E_CANT_CLOSE ((HRESULT)0x800401D4L)
-#define MK_E_FIRST ((HRESULT)0x800401E0L)
-#define MK_E_LAST ((HRESULT)0x800401EFL)
-#define MK_S_FIRST ((HRESULT)0x000401E0L)
-#define MK_S_LAST ((HRESULT)0x000401EFL)
-#define MK_E_CONNECTMANUALLY ((HRESULT)0x800401E0L)
-#define MK_E_EXCEEDEDDEADLINE ((HRESULT)0x800401E1L)
-#define MK_E_NEEDGENERIC ((HRESULT)0x800401E2L)
-#define MK_E_UNAVAILABLE ((HRESULT)0x800401E3L)
-#define MK_E_SYNTAX ((HRESULT)0x800401E4L)
-#define MK_E_NOOBJECT ((HRESULT)0x800401E5L)
-#define MK_E_INVALIDEXTENSION ((HRESULT)0x800401E6L)
-#define MK_E_INTERMEDIATEINTERFACENOTSUPPORTED ((HRESULT)0x800401E7L)
-#define MK_E_NOTBINDABLE ((HRESULT)0x800401E8L)
-#define MK_E_NOTBOUND ((HRESULT)0x800401E9L)
-#define MK_E_CANTOPENFILE ((HRESULT)0x800401EAL)
-#define MK_E_MUSTBOTHERUSER ((HRESULT)0x800401EBL)
-#define MK_E_NOINVERSE ((HRESULT)0x800401ECL)
-#define MK_E_NOSTORAGE ((HRESULT)0x800401EDL)
-#define MK_E_NOPREFIX ((HRESULT)0x800401EEL)
-#define MK_E_ENUMERATION_FAILED ((HRESULT)0x800401EFL)
-#define CO_E_FIRST ((HRESULT)0x800401F0L)
-#define CO_E_LAST ((HRESULT)0x800401FFL)
-#define CO_S_FIRST ((HRESULT)0x000401F0L)
-#define CO_S_LAST ((HRESULT)0x000401FFL)
-#define CO_E_NOTINITIALIZED ((HRESULT)0x800401F0L)
-#define CO_E_ALREADYINITIALIZED ((HRESULT)0x800401F1L)
-#define CO_E_CANTDETERMINECLASS ((HRESULT)0x800401F2L)
-#define CO_E_CLASSSTRING ((HRESULT)0x800401F3L)
-#define CO_E_IIDSTRING ((HRESULT)0x800401F4L)
-#define CO_E_APPNOTFOUND ((HRESULT)0x800401F5L)
-#define CO_E_APPSINGLEUSE ((HRESULT)0x800401F6L)
-#define CO_E_ERRORINAPP ((HRESULT)0x800401F7L)
-#define CO_E_DLLNOTFOUND ((HRESULT)0x800401F8L)
-#define CO_E_ERRORINDLL ((HRESULT)0x800401F9L)
-#define CO_E_WRONGOSFORAPP ((HRESULT)0x800401FAL)
-#define CO_E_OBJNOTREG ((HRESULT)0x800401FBL)
-#define CO_E_OBJISREG ((HRESULT)0x800401FCL)
-#define CO_E_OBJNOTCONNECTED ((HRESULT)0x800401FDL)
-#define CO_E_APPDIDNTREG ((HRESULT)0x800401FEL)
-#define CO_E_RELEASED ((HRESULT)0x800401FFL)
-#define OLE_S_USEREG ((HRESULT)0x00040000L)
-#define OLE_S_STATIC ((HRESULT)0x00040001L)
-#define OLE_S_MAC_CLIPFORMAT ((HRESULT)0x00040002L)
-#define DRAGDROP_S_DROP ((HRESULT)0x00040100L)
-#define DRAGDROP_S_CANCEL ((HRESULT)0x00040101L)
-#define DRAGDROP_S_USEDEFAULTCURSORS ((HRESULT)0x00040102L)
-#define DATA_S_SAMEFORMATETC ((HRESULT)0x00040130L)
-#define VIEW_S_ALREADY_FROZEN ((HRESULT)0x00040140L)
-#define CACHE_S_FORMATETC_NOTSUPPORTED ((HRESULT)0x00040170L)
-#define CACHE_S_SAMECACHE ((HRESULT)0x00040171L)
-#define CACHE_S_SOMECACHES_NOTUPDATED ((HRESULT)0x00040172L)
-#define OLEOBJ_S_INVALIDVERB ((HRESULT)0x00040180L)
-#define OLEOBJ_S_CANNOT_DOVERB_NOW ((HRESULT)0x00040181L)
-#define OLEOBJ_S_INVALIDHWND ((HRESULT)0x00040182L)
-#define INPLACE_S_TRUNCATED ((HRESULT)0x000401A0L)
-#define CONVERT10_S_NO_PRESENTATION ((HRESULT)0x000401C0L)
-#define MK_S_REDUCED_TO_SELF ((HRESULT)0x000401E2L)
-#define MK_S_ME ((HRESULT)0x000401E4L)
-#define MK_S_HIM ((HRESULT)0x000401E5L)
-#define MK_S_US ((HRESULT)0x000401E6L)
-#define MK_S_MONIKERALREADYREGISTERED ((HRESULT)0x000401E7L)
-#define CO_E_CLASS_CREATE_FAILED ((HRESULT)0x80080001L)
-#define CO_E_SCM_ERROR ((HRESULT)0x80080002L)
-#define CO_E_SCM_RPC_FAILURE ((HRESULT)0x80080003L)
-#define CO_E_BAD_PATH ((HRESULT)0x80080004L)
-#define CO_E_SERVER_EXEC_FAILURE ((HRESULT)0x80080005L)
-#define CO_E_OBJSRV_RPC_FAILURE ((HRESULT)0x80080006L)
-#define MK_E_NO_NORMALIZED ((HRESULT)0x80080007L)
-#define CO_E_SERVER_STOPPING ((HRESULT)0x80080008L)
-#define MEM_E_INVALID_ROOT ((HRESULT)0x80080009L)
-#define MEM_E_INVALID_LINK ((HRESULT)0x80080010L)
-#define MEM_E_INVALID_SIZE ((HRESULT)0x80080011L)
-#define DISP_E_UNKNOWNINTERFACE ((HRESULT)0x80020001L)
-#define DISP_E_MEMBERNOTFOUND ((HRESULT)0x80020003L)
-#define DISP_E_PARAMNOTFOUND ((HRESULT)0x80020004L)
-#define DISP_E_TYPEMISMATCH ((HRESULT)0x80020005L)
-#define DISP_E_UNKNOWNNAME ((HRESULT)0x80020006L)
-#define DISP_E_NONAMEDARGS ((HRESULT)0x80020007L)
-#define DISP_E_BADVARTYPE ((HRESULT)0x80020008L)
-#define DISP_E_EXCEPTION ((HRESULT)0x80020009L)
-#define DISP_E_OVERFLOW ((HRESULT)0x8002000AL)
-#define DISP_E_BADINDEX ((HRESULT)0x8002000BL)
-#define DISP_E_UNKNOWNLCID ((HRESULT)0x8002000CL)
-#define DISP_E_ARRAYISLOCKED ((HRESULT)0x8002000DL)
-#define DISP_E_BADPARAMCOUNT ((HRESULT)0x8002000EL)
-#define DISP_E_PARAMNOTOPTIONAL ((HRESULT)0x8002000FL)
-#define DISP_E_BADCALLEE ((HRESULT)0x80020010L)
-#define DISP_E_NOTACOLLECTION ((HRESULT)0x80020011L)
-#define TYPE_E_BUFFERTOOSMALL ((HRESULT)0x80028016L)
-#define TYPE_E_INVDATAREAD ((HRESULT)0x80028018L)
-#define TYPE_E_UNSUPFORMAT ((HRESULT)0x80028019L)
-#define TYPE_E_REGISTRYACCESS ((HRESULT)0x8002801CL)
-#define TYPE_E_LIBNOTREGISTERED ((HRESULT)0x8002801DL)
-#define TYPE_E_UNDEFINEDTYPE ((HRESULT)0x80028027L)
-#define TYPE_E_QUALIFIEDNAMEDISALLOWED ((HRESULT)0x80028028L)
-#define TYPE_E_INVALIDSTATE ((HRESULT)0x80028029L)
-#define TYPE_E_WRONGTYPEKIND ((HRESULT)0x8002802AL)
-#define TYPE_E_ELEMENTNOTFOUND ((HRESULT)0x8002802BL)
-#define TYPE_E_AMBIGUOUSNAME ((HRESULT)0x8002802CL)
-#define TYPE_E_NAMECONFLICT ((HRESULT)0x8002802DL)
-#define TYPE_E_UNKNOWNLCID ((HRESULT)0x8002802EL)
-#define TYPE_E_DLLFUNCTIONNOTFOUND ((HRESULT)0x8002802FL)
-#define TYPE_E_BADMODULEKIND ((HRESULT)0x800288BDL)
-#define TYPE_E_SIZETOOBIG ((HRESULT)0x800288C5L)
-#define TYPE_E_DUPLICATEID ((HRESULT)0x800288C6L)
-#define TYPE_E_INVALIDID ((HRESULT)0x800288CFL)
-#define TYPE_E_TYPEMISMATCH ((HRESULT)0x80028CA0L)
-#define TYPE_E_OUTOFBOUNDS ((HRESULT)0x80028CA1L)
-#define TYPE_E_IOERROR ((HRESULT)0x80028CA2L)
-#define TYPE_E_CANTCREATETMPFILE ((HRESULT)0x80028CA3L)
-#define TYPE_E_CANTLOADLIBRARY ((HRESULT)0x80029C4AL)
-#define TYPE_E_INCONSISTENTPROPFUNCS ((HRESULT)0x80029C83L)
-#define TYPE_E_CIRCULARTYPE ((HRESULT)0x80029C84L)
-#define STG_E_INVALIDFUNCTION ((HRESULT)0x80030001L)
-#define STG_E_FILENOTFOUND ((HRESULT)0x80030002L)
-#define STG_E_PATHNOTFOUND ((HRESULT)0x80030003L)
-#define STG_E_TOOMANYOPENFILES ((HRESULT)0x80030004L)
-#define STG_E_ACCESSDENIED ((HRESULT)0x80030005L)
-#define STG_E_INVALIDHANDLE ((HRESULT)0x80030006L)
-#define STG_E_INSUFFICIENTMEMORY ((HRESULT)0x80030008L)
-#define STG_E_INVALIDPOINTER ((HRESULT)0x80030009L)
-#define STG_E_NOMOREFILES ((HRESULT)0x80030012L)
-#define STG_E_DISKISWRITEPROTECTED ((HRESULT)0x80030013L)
-#define STG_E_SEEKERROR ((HRESULT)0x80030019L)
-#define STG_E_WRITEFAULT ((HRESULT)0x8003001DL)
-#define STG_E_READFAULT ((HRESULT)0x8003001EL)
-#define STG_E_SHAREVIOLATION ((HRESULT)0x80030020L)
-#define STG_E_LOCKVIOLATION ((HRESULT)0x80030021L)
-#define STG_E_FILEALREADYEXISTS ((HRESULT)0x80030050L)
-#define STG_E_INVALIDPARAMETER ((HRESULT)0x80030057L)
-#define STG_E_MEDIUMFULL ((HRESULT)0x80030070L)
-#define STG_E_ABNORMALAPIEXIT ((HRESULT)0x800300FAL)
-#define STG_E_INVALIDHEADER ((HRESULT)0x800300FBL)
-#define STG_E_INVALIDNAME ((HRESULT)0x800300FCL)
-#define STG_E_UNKNOWN ((HRESULT)0x800300FDL)
-#define STG_E_UNIMPLEMENTEDFUNCTION ((HRESULT)0x800300FEL)
-#define STG_E_INVALIDFLAG ((HRESULT)0x800300FFL)
-#define STG_E_INUSE ((HRESULT)0x80030100L)
-#define STG_E_NOTCURRENT ((HRESULT)0x80030101L)
-#define STG_E_REVERTED ((HRESULT)0x80030102L)
-#define STG_E_CANTSAVE ((HRESULT)0x80030103L)
-#define STG_E_OLDFORMAT ((HRESULT)0x80030104L)
-#define STG_E_OLDDLL ((HRESULT)0x80030105L)
-#define STG_E_SHAREREQUIRED ((HRESULT)0x80030106L)
-#define STG_E_NOTFILEBASEDSTORAGE ((HRESULT)0x80030107L)
-#define STG_E_EXTANTMARSHALLINGS ((HRESULT)0x80030108L)
-#define STG_S_CONVERTED ((HRESULT)0x00030200L)
-#define RPC_E_CALL_REJECTED ((HRESULT)0x80010001L)
-#define RPC_E_CALL_CANCELED ((HRESULT)0x80010002L)
-#define RPC_E_CANTPOST_INSENDCALL ((HRESULT)0x80010003L)
-#define RPC_E_CANTCALLOUT_INASYNCCALL ((HRESULT)0x80010004L)
-#define RPC_E_CANTCALLOUT_INEXTERNALCALL ((HRESULT)0x80010005L)
-#define RPC_E_CONNECTION_TERMINATED ((HRESULT)0x80010006L)
-#define RPC_E_SERVER_DIED ((HRESULT)0x80010007L)
-#define RPC_E_CLIENT_DIED ((HRESULT)0x80010008L)
-#define RPC_E_INVALID_DATAPACKET ((HRESULT)0x80010009L)
-#define RPC_E_CANTTRANSMIT_CALL ((HRESULT)0x8001000AL)
-#define RPC_E_CLIENT_CANTMARSHAL_DATA ((HRESULT)0x8001000BL)
-#define RPC_E_CLIENT_CANTUNMARSHAL_DATA ((HRESULT)0x8001000CL)
-#define RPC_E_SERVER_CANTMARSHAL_DATA ((HRESULT)0x8001000DL)
-#define RPC_E_SERVER_CANTUNMARSHAL_DATA ((HRESULT)0x8001000EL)
-#define RPC_E_INVALID_DATA ((HRESULT)0x8001000FL)
-#define RPC_E_INVALID_PARAMETER ((HRESULT)0x80010010L)
-#define RPC_E_CANTCALLOUT_AGAIN ((HRESULT)0x80010011L)
-#define RPC_E_SERVER_DIED_DNE ((HRESULT)0x80010012L)
-#define RPC_E_SYS_CALL_FAILED ((HRESULT)0x80010100L)
-#define RPC_E_OUT_OF_RESOURCES ((HRESULT)0x80010101L)
-#define RPC_E_ATTEMPTED_MULTITHREAD ((HRESULT)0x80010102L)
-#define RPC_E_NOT_REGISTERED ((HRESULT)0x80010103L)
-#define RPC_E_FAULT ((HRESULT)0x80010104L)
-#define RPC_E_SERVERFAULT ((HRESULT)0x80010105L)
-#define RPC_E_CHANGED_MODE ((HRESULT)0x80010106L)
-#define RPC_E_INVALIDMETHOD ((HRESULT)0x80010107L)
-#define RPC_E_DISCONNECTED ((HRESULT)0x80010108L)
-#define RPC_E_RETRY ((HRESULT)0x80010109L)
-#define RPC_E_SERVERCALL_RETRYLATER ((HRESULT)0x8001010AL)
-#define RPC_E_SERVERCALL_REJECTED ((HRESULT)0x8001010BL)
-#define RPC_E_INVALID_CALLDATA ((HRESULT)0x8001010CL)
-#define RPC_E_CANTCALLOUT_ININPUTSYNCCALL ((HRESULT)0x8001010DL)
-#define RPC_E_WRONG_THREAD ((HRESULT)0x8001010EL)
-#define RPC_E_THREAD_NOT_INIT ((HRESULT)0x8001010FL)
-#define RPC_E_UNEXPECTED ((HRESULT)0x8001FFFFL)
-
-#define NTE_BAD_UID ((HRESULT)0x80090001L)
-#define NTE_BAD_HASH ((HRESULT)0x80090002L)
-#define NTE_BAD_KEY ((HRESULT)0x80090003L)
-#define NTE_BAD_LEN ((HRESULT)0x80090004L)
-#define NTE_BAD_DATA ((HRESULT)0x80090005L)
-#define NTE_BAD_SIGNATURE ((HRESULT)0x80090006L)
-#define NTE_BAD_VER ((HRESULT)0x80090007L)
-#define NTE_BAD_ALGID ((HRESULT)0x80090008L)
-#define NTE_BAD_FLAGS ((HRESULT)0x80090009L)
-#define NTE_BAD_TYPE ((HRESULT)0x8009000AL)
-#define NTE_BAD_KEY_STATE ((HRESULT)0x8009000BL)
-#define NTE_BAD_HASH_STATE ((HRESULT)0x8009000CL)
-#define NTE_NO_KEY ((HRESULT)0x8009000DL)
-#define NTE_NO_MEMORY ((HRESULT)0x8009000EL)
-#define NTE_EXISTS ((HRESULT)0x8009000FL)
-#define NTE_PERM ((HRESULT)0x80090010L)
-#define NTE_NOT_FOUND ((HRESULT)0x80090011L)
-#define NTE_DOUBLE_ENCRYPT ((HRESULT)0x80090012L)
-#define NTE_BAD_PROVIDER ((HRESULT)0x80090013L)
-#define NTE_BAD_PROV_TYPE ((HRESULT)0x80090014L)
-#define NTE_BAD_PUBLIC_KEY ((HRESULT)0x80090015L)
-#define NTE_BAD_KEYSET ((HRESULT)0x80090016L)
-#define NTE_PROV_TYPE_NOT_DEF ((HRESULT)0x80090017L)
-#define NTE_PROV_TYPE_ENTRY_BAD ((HRESULT)0x80090018L)
-#define NTE_KEYSET_NOT_DEF ((HRESULT)0x80090019L)
-#define NTE_KEYSET_ENTRY_BAD ((HRESULT)0x8009001AL)
-#define NTE_PROV_TYPE_NO_MATCH ((HRESULT)0x8009001BL)
-#define NTE_SIGNATURE_FILE_BAD ((HRESULT)0x8009001CL)
-#define NTE_PROVIDER_DLL_FAIL ((HRESULT)0x8009001DL)
-#define NTE_PROV_DLL_NOT_FOUND ((HRESULT)0x8009001EL)
-#define NTE_BAD_KEYSET_PARAM ((HRESULT)0x8009001FL)
-#define NTE_FAIL ((HRESULT)0x80090020L)
-#define NTE_SYS_ERR ((HRESULT)0x80090021L)
-/* #define NTE_TOKEN_KEYSET_STORAGE ??? */
-
-#endif
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
deleted file mode 100644
index 5c5f9a084..000000000
--- a/winsup/w32api/include/wingdi.h
+++ /dev/null
@@ -1,2981 +0,0 @@
-#ifndef _WINGDI_H
-#define _WINGDI_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define WINGDIAPI
-#define BI_RGB 0
-#define BI_RLE8 1
-#define BI_RLE4 2
-#define BI_BITFIELDS 3
-#define BI_JPEG 4
-#define BI_PNG 5
-#define LF_FACESIZE	32
-#define LF_FULLFACESIZE	64
-#define CA_NEGATIVE	1
-#define CA_LOG_FILTER	2
-#define ILLUMINANT_DEVICE_DEFAULT	0
-#define ILLUMINANT_A	1
-#define ILLUMINANT_B	2
-#define ILLUMINANT_C	3
-#define ILLUMINANT_D50	4
-#define ILLUMINANT_D55	5
-#define ILLUMINANT_D65	6
-#define ILLUMINANT_D75	7
-#define ILLUMINANT_F2	8
-#define ILLUMINANT_MAX_INDEX	ILLUMINANT_F2
-#define ILLUMINANT_TUNGSTEN	ILLUMINANT_A
-#define ILLUMINANT_DAYLIGHT	ILLUMINANT_C
-#define ILLUMINANT_FLUORESCENT	ILLUMINANT_F2
-#define ILLUMINANT_NTSC	ILLUMINANT_C
-#define RGB_GAMMA_MIN	2500
-#define RGB_GAMMA_MAX	65000
-#define REFERENCE_WHITE_MIN	6000
-#define REFERENCE_WHITE_MAX	10000
-#define REFERENCE_BLACK_MIN	0
-#define REFERENCE_BLACK_MAX	4000
-#define COLOR_ADJ_MIN	(-100)
-#define COLOR_ADJ_MAX	100
-#define CCHDEVICENAME 32
-#define CCHFORMNAME 32
-#define DI_COMPAT	4
-#define DI_DEFAULTSIZE	8
-#define DI_IMAGE	2
-#define DI_MASK	1
-#define DI_NORMAL	3
-#define DI_APPBANDING 1
-#define EMR_HEADER	1
-#define EMR_POLYBEZIER 2
-#define EMR_POLYGON	3
-#define EMR_POLYLINE	4
-#define EMR_POLYBEZIERTO	5
-#define EMR_POLYLINETO 6
-#define EMR_POLYPOLYLINE	7
-#define EMR_POLYPOLYGON 8
-#define EMR_SETWINDOWEXTEX	9
-#define EMR_SETWINDOWORGEX	10
-#define EMR_SETVIEWPORTEXTEX 11
-#define EMR_SETVIEWPORTORGEX 12
-#define EMR_SETBRUSHORGEX 13
-#define EMR_EOF 14
-#define EMR_SETPIXELV 15
-#define EMR_SETMAPPERFLAGS 16
-#define EMR_SETMAPMODE 17
-#define EMR_SETBKMODE 18
-#define EMR_SETPOLYFILLMODE 19
-#define EMR_SETROP2 20
-#define EMR_SETSTRETCHBLTMODE 21
-#define EMR_SETTEXTALIGN 22
-#define EMR_SETCOLORADJUSTMENT 23
-#define EMR_SETTEXTCOLOR 24
-#define EMR_SETBKCOLOR 25
-#define EMR_OFFSETCLIPRGN 26
-#define EMR_MOVETOEX 27
-#define EMR_SETMETARGN 28
-#define EMR_EXCLUDECLIPRECT 29
-#define EMR_INTERSECTCLIPRECT 30
-#define EMR_SCALEVIEWPORTEXTEX 31
-#define EMR_SCALEWINDOWEXTEX 32
-#define EMR_SAVEDC 33
-#define EMR_RESTOREDC 34
-#define EMR_SETWORLDTRANSFORM 35
-#define EMR_MODIFYWORLDTRANSFORM 36
-#define EMR_SELECTOBJECT 37
-#define EMR_CREATEPEN 38
-#define EMR_CREATEBRUSHINDIRECT 39
-#define EMR_DELETEOBJECT 40
-#define EMR_ANGLEARC 41
-#define EMR_ELLIPSE  42
-#define EMR_RECTANGLE 43
-#define EMR_ROUNDRECT 44
-#define EMR_ARC 45
-#define EMR_CHORD 46
-#define EMR_PIE 47
-#define EMR_SELECTPALETTE 48
-#define EMR_CREATEPALETTE 49
-#define EMR_SETPALETTEENTRIES 50
-#define EMR_RESIZEPALETTE 51
-#define EMR_REALIZEPALETTE 52
-#define EMR_EXTFLOODFILL 53
-#define EMR_LINETO 54
-#define EMR_ARCTO 55
-#define EMR_POLYDRAW 56
-#define EMR_SETARCDIRECTION 57
-#define EMR_SETMITERLIMIT 58
-#define EMR_BEGINPATH 59
-#define EMR_ENDPATH 60
-#define EMR_CLOSEFIGURE 61
-#define EMR_FILLPATH 62
-#define EMR_STROKEANDFILLPATH 63
-#define EMR_STROKEPATH 64
-#define EMR_FLATTENPATH 65
-#define EMR_WIDENPATH 66
-#define EMR_SELECTCLIPPATH 67
-#define EMR_ABORTPATH 68
-#define EMR_GDICOMMENT 70
-#define EMR_FILLRGN 71
-#define EMR_FRAMERGN 72
-#define EMR_INVERTRGN 73
-#define EMR_PAINTRGN 74
-#define EMR_EXTSELECTCLIPRGN 75
-#define EMR_BITBLT 76
-#define EMR_STRETCHBLT 77
-#define EMR_MASKBLT 78
-#define EMR_PLGBLT 79
-#define EMR_SETDIBITSTODEVICE 80
-#define EMR_STRETCHDIBITS 81
-#define EMR_EXTCREATEFONTINDIRECTW 82
-#define EMR_EXTTEXTOUTA 83
-#define EMR_EXTTEXTOUTW 84
-#define EMR_POLYBEZIER16 85
-#define EMR_POLYGON16 86
-#define EMR_POLYLINE16 87
-#define EMR_POLYBEZIERTO16 88
-#define EMR_POLYLINETO16 89
-#define EMR_POLYPOLYLINE16 90
-#define EMR_POLYPOLYGON16 91
-#define EMR_POLYDRAW16 92
-#define EMR_CREATEMONOBRUSH 93
-#define EMR_CREATEDIBPATTERNBRUSHPT 94
-#define EMR_EXTCREATEPEN 95
-#define EMR_POLYTEXTOUTA 96
-#define EMR_POLYTEXTOUTW 97
-#define EMR_SETICMMODE 98
-#define EMR_CREATECOLORSPACE 99
-#define EMR_SETCOLORSPACE 100
-#define EMR_DELETECOLORSPACE 101
-#define EMR_GLSRECORD 102
-#define EMR_GLSBOUNDEDRECORD 103
-#define EMR_PIXELFORMAT 104
-#define ENHMETA_SIGNATURE 1179469088
-#define EPS_SIGNATURE 0x46535045
-#if (_WIN32_WINNT >= 0x0500)
-#define FR_PRIVATE 0x10
-#define FR_NOT_ENUM 0x20
-#endif
-#define META_SETBKCOLOR	0x201
-#define META_SETBKMODE	0x102
-#define META_SETMAPMODE	0x103
-#define META_SETROP2	0x104
-#define META_SETRELABS	0x105
-#define META_SETPOLYFILLMODE	0x106
-#define META_SETSTRETCHBLTMODE	0x107
-#define META_SETTEXTCHAREXTRA	0x108
-#define META_SETTEXTCOLOR	0x209
-#define META_SETTEXTJUSTIFICATION	0x20A
-#define META_SETWINDOWORG	0x20B
-#define META_SETWINDOWEXT	0x20C
-#define META_SETVIEWPORTORG	0x20D
-#define META_SETVIEWPORTEXT	0x20E
-#define META_OFFSETWINDOWORG	0x20F
-#define META_SCALEWINDOWEXT	0x410
-#define META_OFFSETVIEWPORTORG	0x211
-#define META_SCALEVIEWPORTEXT	0x412
-#define META_LINETO	0x213
-#define META_MOVETO	0x214
-#define META_EXCLUDECLIPRECT	0x415
-#define META_INTERSECTCLIPRECT	0x416
-#define META_ARC	0x817
-#define META_ELLIPSE	0x418
-#define META_FLOODFILL	0x419
-#define META_PIE	0x81A
-#define META_RECTANGLE	0x41B
-#define META_ROUNDRECT	0x61C
-#define META_PATBLT	0x61D
-#define META_SAVEDC	0x1E
-#define META_SETPIXEL	0x41F
-#define META_OFFSETCLIPRGN	0x220
-#define META_TEXTOUT	0x521
-#define META_BITBLT	0x922
-#define META_STRETCHBLT	0xB23
-#define META_POLYGON	0x324
-#define META_POLYLINE	0x325
-#define META_ESCAPE	0x626
-#define META_RESTOREDC	0x127
-#define META_FILLREGION	0x228
-#define META_FRAMEREGION	0x429
-#define META_INVERTREGION	0x12A
-#define META_PAINTREGION	0x12B
-#define META_SELECTCLIPREGION	0x12C
-#define META_SELECTOBJECT	0x12D
-#define META_SETTEXTALIGN	0x12E
-#define META_CHORD	0x830
-#define META_SETMAPPERFLAGS	0x231
-#define META_EXTTEXTOUT	0xa32
-#define META_SETDIBTODEV	0xd33
-#define META_SELECTPALETTE	0x234
-#define META_REALIZEPALETTE	0x35
-#define META_ANIMATEPALETTE	0x436
-#define META_SETPALENTRIES	0x37
-#define META_POLYPOLYGON	0x538
-#define META_RESIZEPALETTE	0x139
-#define META_DIBBITBLT	0x940
-#define META_DIBSTRETCHBLT	0xb41
-#define META_DIBCREATEPATTERNBRUSH	0x142
-#define META_STRETCHDIB	0xf43
-#define META_EXTFLOODFILL	0x548
-#define META_DELETEOBJECT	0x1f0
-#define META_CREATEPALETTE	0xf7
-#define META_CREATEPATTERNBRUSH	0x1F9
-#define META_CREATEPENINDIRECT	0x2FA
-#define META_CREATEFONTINDIRECT	0x2FB
-#define META_CREATEBRUSHINDIRECT	0x2FC
-#define META_CREATEREGION	0x6FF
-#define PT_MOVETO	6
-#define PT_LINETO	2
-#define PT_BEZIERTO	4
-#define PT_CLOSEFIGURE 1
-#define ELF_VENDOR_SIZE	4
-#define ELF_VERSION	0
-#define ELF_CULTURE_LATIN	0
-#define PFD_TYPE_RGBA	0
-#define PFD_TYPE_COLORINDEX	1
-#define PFD_MAIN_PLANE	0
-#define PFD_OVERLAY_PLANE	1
-#define PFD_UNDERLAY_PLANE	(-1)
-#define PFD_DOUBLEBUFFER	1
-#define PFD_STEREO	2
-#define PFD_DRAW_TO_WINDOW	4
-#define PFD_DRAW_TO_BITMAP	8
-#define PFD_SUPPORT_GDI	16
-#define PFD_SUPPORT_OPENGL	32
-#define PFD_GENERIC_FORMAT	64
-#define PFD_NEED_PALETTE	128
-#define PFD_NEED_SYSTEM_PALETTE	0x00000100
-#define PFD_SWAP_EXCHANGE	0x00000200
-#define PFD_SWAP_COPY	0x00000400
-#define PFD_SWAP_LAYER_BUFFERS	0x00000800
-#define PFD_GENERIC_ACCELERATED	0x00001000
-#define PFD_DEPTH_DONTCARE	0x20000000
-#define PFD_DOUBLEBUFFER_DONTCARE	0x40000000
-#define PFD_STEREO_DONTCARE	0x80000000
-#define SP_ERROR	(-1)
-#define SP_OUTOFDISK	(-4)
-#define SP_OUTOFMEMORY	(-5)
-#define SP_USERABORT	(-3)
-#define SP_APPABORT	(-2)
-#define BLACKNESS	0x42
-#define NOTSRCERASE	0x1100A6
-#define NOTSRCCOPY	0x330008
-#define SRCERASE	0x440328
-#define DSTINVERT	0x550009
-#define PATINVERT	0x5A0049
-#define SRCINVERT	0x660046
-#define SRCAND	0x8800C6
-#define MERGEPAINT	0xBB0226
-#define MERGECOPY	0xC000CA
-#define SRCCOPY 0xCC0020
-#define SRCPAINT	0xEE0086
-#define PATCOPY	0xF00021
-#define PATPAINT	0xFB0A09
-#define WHITENESS	0xFF0062
-#define R2_BLACK	1
-#define R2_COPYPEN	13
-#define R2_MASKNOTPEN	3
-#define R2_MASKPEN	9
-#define R2_MASKPENNOT	5
-#define R2_MERGENOTPEN	12
-#define R2_MERGEPEN	15
-#define R2_MERGEPENNOT	14
-#define R2_NOP	11
-#define R2_NOT	6
-#define R2_NOTCOPYPEN	4
-#define R2_NOTMASKPEN	8
-#define R2_NOTMERGEPEN	2
-#define R2_NOTXORPEN	10
-#define R2_WHITE	16
-#define R2_XORPEN	7
-#define CM_OUT_OF_GAMUT	255
-#define CM_IN_GAMUT	0
-#define RGN_AND 1
-#define RGN_COPY	5
-#define RGN_DIFF	4
-#define RGN_OR	2
-#define RGN_XOR	3
-#define NULLREGION	1
-#define SIMPLEREGION	2
-#define COMPLEXREGION	3
-#define ERROR 0
-#define CBM_INIT	4
-#define DIB_PAL_COLORS	1
-#define DIB_RGB_COLORS	0
-#define FW_DONTCARE	0
-#define FW_THIN	100
-#define FW_EXTRALIGHT	200
-#define FW_ULTRALIGHT	FW_EXTRALIGHT
-#define FW_LIGHT	300
-#define FW_NORMAL	400
-#define FW_REGULAR	400
-#define FW_MEDIUM	500
-#define FW_SEMIBOLD	600
-#define FW_DEMIBOLD	FW_SEMIBOLD
-#define FW_BOLD	700
-#define FW_EXTRABOLD	800
-#define FW_ULTRABOLD	FW_EXTRABOLD
-#define FW_HEAVY	900
-#define FW_BLACK	FW_HEAVY
-#define ANSI_CHARSET	0
-#define DEFAULT_CHARSET	1
-#define SYMBOL_CHARSET	2
-#define SHIFTJIS_CHARSET	128
-#define HANGEUL_CHARSET	129
-#define HANGUL_CHARSET  129
-#define GB2312_CHARSET	134
-#define CHINESEBIG5_CHARSET	136
-#define GREEK_CHARSET	161
-#define TURKISH_CHARSET	162
-#define HEBREW_CHARSET	177
-#define ARABIC_CHARSET	178
-#define BALTIC_CHARSET	186
-#define RUSSIAN_CHARSET	204
-#define THAI_CHARSET	222
-#define EASTEUROPE_CHARSET	238
-#define OEM_CHARSET	255
-#define JOHAB_CHARSET	130
-#define VIETNAMESE_CHARSET	163
-#define MAC_CHARSET 77
-#define OUT_DEFAULT_PRECIS	0
-#define OUT_STRING_PRECIS	1
-#define OUT_CHARACTER_PRECIS	2
-#define OUT_STROKE_PRECIS	3
-#define OUT_TT_PRECIS	4
-#define OUT_DEVICE_PRECIS	5
-#define OUT_RASTER_PRECIS	6
-#define OUT_TT_ONLY_PRECIS	7
-#define OUT_OUTLINE_PRECIS	8
-#define CLIP_DEFAULT_PRECIS	0
-#define CLIP_CHARACTER_PRECIS	1
-#define CLIP_STROKE_PRECIS	2
-#define CLIP_MASK	15
-#define CLIP_LH_ANGLES	16
-#define CLIP_TT_ALWAYS	32
-#define CLIP_EMBEDDED	128
-#define DEFAULT_QUALITY	0
-#define DRAFT_QUALITY	1
-#define PROOF_QUALITY	2
-#define NONANTIALIASED_QUALITY 3
-#define ANTIALIASED_QUALITY 4
-#define DEFAULT_PITCH	0
-#define FIXED_PITCH	1
-#define VARIABLE_PITCH	2
-#define MONO_FONT 8
-#define FF_DECORATIVE	80
-#define FF_DONTCARE	0
-#define FF_MODERN	48
-#define FF_ROMAN	16
-#define FF_SCRIPT	64
-#define FF_SWISS	32
-#define PANOSE_COUNT 10
-#define PAN_FAMILYTYPE_INDEX 0
-#define PAN_SERIFSTYLE_INDEX 1
-#define PAN_WEIGHT_INDEX 2
-#define PAN_PROPORTION_INDEX 3
-#define PAN_CONTRAST_INDEX 4
-#define PAN_STROKEVARIATION_INDEX 5
-#define PAN_ARMSTYLE_INDEX 6
-#define PAN_LETTERFORM_INDEX 7
-#define PAN_MIDLINE_INDEX 8
-#define PAN_XHEIGHT_INDEX 9
-#define PAN_CULTURE_LATIN 0
-#define PAN_ANY 0
-#define PAN_NO_FIT 1
-#define PAN_FAMILY_TEXT_DISPLAY 2
-#define PAN_FAMILY_SCRIPT 3
-#define PAN_FAMILY_DECORATIVE 4
-#define PAN_FAMILY_PICTORIAL 5
-#define PAN_SERIF_COVE 2
-#define PAN_SERIF_OBTUSE_COVE 3
-#define PAN_SERIF_SQUARE_COVE 4
-#define PAN_SERIF_OBTUSE_SQUARE_COVE 5
-#define PAN_SERIF_SQUARE 6
-#define PAN_SERIF_THIN 7
-#define PAN_SERIF_BONE 8
-#define PAN_SERIF_EXAGGERATED 9
-#define PAN_SERIF_TRIANGLE 10
-#define PAN_SERIF_NORMAL_SANS 11
-#define PAN_SERIF_OBTUSE_SANS 12
-#define PAN_SERIF_PERP_SANS 13
-#define PAN_SERIF_FLARED 14
-#define PAN_SERIF_ROUNDED 15
-#define PAN_WEIGHT_VERY_LIGHT 2
-#define PAN_WEIGHT_LIGHT 3
-#define PAN_WEIGHT_THIN 4
-#define PAN_WEIGHT_BOOK 5
-#define PAN_WEIGHT_MEDIUM 6
-#define PAN_WEIGHT_DEMI 7
-#define PAN_WEIGHT_BOLD 8
-#define PAN_WEIGHT_HEAVY 9
-#define PAN_WEIGHT_BLACK 10
-#define PAN_WEIGHT_NORD 11
-#define PAN_PROP_OLD_STYLE 2
-#define PAN_PROP_MODERN 3
-#define PAN_PROP_EVEN_WIDTH 4
-#define PAN_PROP_EXPANDED 5
-#define PAN_PROP_CONDENSED 6
-#define PAN_PROP_VERY_EXPANDED 7
-#define PAN_PROP_VERY_CONDENSED 8
-#define PAN_PROP_MONOSPACED 9
-#define PAN_CONTRAST_NONE 2
-#define PAN_CONTRAST_VERY_LOW 3
-#define PAN_CONTRAST_LOW 4
-#define PAN_CONTRAST_MEDIUM_LOW 5
-#define PAN_CONTRAST_MEDIUM 6
-#define PAN_CONTRAST_MEDIUM_HIGH 7
-#define PAN_CONTRAST_HIGH 8
-#define PAN_CONTRAST_VERY_HIGH 9
-#define PAN_STROKE_GRADUAL_DIAG 2
-#define PAN_STROKE_GRADUAL_TRAN 3
-#define PAN_STROKE_GRADUAL_VERT 4
-#define PAN_STROKE_GRADUAL_HORZ 5
-#define PAN_STROKE_RAPID_VERT 6
-#define PAN_STROKE_RAPID_HORZ 7
-#define PAN_STROKE_INSTANT_VERT 8
-#define PAN_STRAIGHT_ARMS_HORZ 2
-#define PAN_STRAIGHT_ARMS_WEDGE 3
-#define PAN_STRAIGHT_ARMS_VERT 4
-#define PAN_STRAIGHT_ARMS_SINGLE_SERIF 5
-#define PAN_STRAIGHT_ARMS_DOUBLE_SERIF 6
-#define PAN_BENT_ARMS_HORZ 7
-#define PAN_BENT_ARMS_WEDGE 8
-#define PAN_BENT_ARMS_VERT 9
-#define PAN_BENT_ARMS_SINGLE_SERIF 10
-#define PAN_BENT_ARMS_DOUBLE_SERIF 11
-#define PAN_LETT_NORMAL_CONTACT 2
-#define PAN_LETT_NORMAL_WEIGHTED 3
-#define PAN_LETT_NORMAL_BOXED 4
-#define PAN_LETT_NORMAL_FLATTENED 5
-#define PAN_LETT_NORMAL_ROUNDED 6
-#define PAN_LETT_NORMAL_OFF_CENTER 7
-#define PAN_LETT_NORMAL_SQUARE 8
-#define PAN_LETT_OBLIQUE_CONTACT 9
-#define PAN_LETT_OBLIQUE_WEIGHTED 10
-#define PAN_LETT_OBLIQUE_BOXED 11
-#define PAN_LETT_OBLIQUE_FLATTENED 12
-#define PAN_LETT_OBLIQUE_ROUNDED 13
-#define PAN_LETT_OBLIQUE_OFF_CENTER 14
-#define PAN_LETT_OBLIQUE_SQUARE 15
-#define PAN_MIDLINE_STANDARD_TRIMMED 2
-#define PAN_MIDLINE_STANDARD_POINTED 3
-#define PAN_MIDLINE_STANDARD_SERIFED 4
-#define PAN_MIDLINE_HIGH_TRIMMED 5
-#define PAN_MIDLINE_HIGH_POINTED 6
-#define PAN_MIDLINE_HIGH_SERIFED 7
-#define PAN_MIDLINE_CONSTANT_TRIMMED 8
-#define PAN_MIDLINE_CONSTANT_POINTED 9
-#define PAN_MIDLINE_CONSTANT_SERIFED 10
-#define PAN_MIDLINE_LOW_TRIMMED 11
-#define PAN_MIDLINE_LOW_POINTED 12
-#define PAN_MIDLINE_LOW_SERIFED 13
-#define PAN_XHEIGHT_CONSTANT_SMALL 2
-#define PAN_XHEIGHT_CONSTANT_STD 3
-#define PAN_XHEIGHT_CONSTANT_LARGE 4
-#define PAN_XHEIGHT_DUCKING_SMALL 5
-#define PAN_XHEIGHT_DUCKING_STD 6
-#define PAN_XHEIGHT_DUCKING_LARGE 7
-#define FS_LATIN1 1
-#define FS_LATIN2 2
-#define FS_CYRILLIC 4
-#define FS_GREEK 8
-#define FS_TURKISH 16
-#define FS_HEBREW 32
-#define FS_ARABIC 64
-#define FS_BALTIC 128
-#define FS_THAI 0x10000
-#define FS_JISJAPAN 0x20000
-#define FS_CHINESESIMP 0x40000
-#define FS_WANSUNG 0x80000
-#define FS_CHINESETRAD 0x100000
-#define FS_JOHAB 0x200000
-#define FS_SYMBOL 0x80000000
-#define HS_BDIAGONAL	3
-#define HS_CROSS	4
-#define HS_DIAGCROSS	5
-#define HS_FDIAGONAL	2
-#define HS_HORIZONTAL	0
-#define HS_VERTICAL	1
-#define PS_GEOMETRIC	65536
-#define PS_COSMETIC	0
-#define PS_ALTERNATE	8
-#define PS_SOLID	0
-#define PS_DASH	1
-#define PS_DOT	2
-#define PS_DASHDOT	3
-#define PS_DASHDOTDOT	4
-#define PS_NULL	5
-#define PS_USERSTYLE	7
-#define PS_INSIDEFRAME	6
-#define PS_ENDCAP_ROUND	0
-#define PS_ENDCAP_SQUARE	256
-#define PS_ENDCAP_FLAT	512
-#define PS_JOIN_BEVEL	4096
-#define PS_JOIN_MITER	8192
-#define PS_JOIN_ROUND	0
-#define PS_STYLE_MASK	15
-#define PS_ENDCAP_MASK	3840
-#define PS_TYPE_MASK	983040
-#define ALTERNATE	1
-#define WINDING	2
-#define DC_BINNAMES	12
-#define DC_BINS	6
-#define DC_COPIES	18
-#define DC_DRIVER	11
-#define DC_DATATYPE_PRODUCED	21
-#define DC_DUPLEX	7
-#define DC_EMF_COMPLIANT	20
-#define DC_ENUMRESOLUTIONS	13
-#define DC_EXTRA	9
-#define DC_FIELDS	1
-#define DC_FILEDEPENDENCIES	14
-#define DC_MAXEXTENT	5
-#define DC_MINEXTENT	4
-#define DC_ORIENTATION	17
-#define DC_PAPERNAMES	16
-#define DC_PAPERS	2
-#define DC_PAPERSIZE	3
-#define DC_SIZE	8
-#define DC_TRUETYPE	15
-#define DCTT_BITMAP	1
-#define DCTT_DOWNLOAD	2
-#define DCTT_SUBDEV	4
-#define DCTT_DOWNLOAD_OUTLINE 8
-#define DC_VERSION	10
-#define DC_BINADJUST	19
-#define DC_EMF_COMPLIANT	20
-#define DC_DATATYPE_PRODUCED	21
-#define DC_MANUFACTURER	23
-#define DC_MODEL	24
-#define DCBA_FACEUPNONE	0
-#define DCBA_FACEUPCENTER	1
-#define DCBA_FACEUPLEFT	2
-#define DCBA_FACEUPRIGHT	3
-#define DCBA_FACEDOWNNONE	256
-#define DCBA_FACEDOWNCENTER	257
-#define DCBA_FACEDOWNLEFT	258
-#define DCBA_FACEDOWNRIGHT	259
-#define FLOODFILLBORDER 0
-#define FLOODFILLSURFACE 1
-#define ETO_CLIPPED 4
-#define ETO_GLYPH_INDEX 16
-#define ETO_OPAQUE 2
-#define ETO_RTLREADING 128
-#define GDICOMMENT_WINDOWS_METAFILE (-2147483647)
-#define GDICOMMENT_BEGINGROUP 2
-#define GDICOMMENT_ENDGROUP 3
-#define GDICOMMENT_MULTIFORMATS 1073741828
-#define GDICOMMENT_IDENTIFIER 1128875079
-#define AD_COUNTERCLOCKWISE 1
-#define AD_CLOCKWISE 2
-#define RDH_RECTANGLES	1
-#define GCPCLASS_LATIN	1
-#define GCPCLASS_HEBREW	2
-#define GCPCLASS_ARABIC	2
-#define GCPCLASS_NEUTRAL	3
-#define GCPCLASS_LOCALNUMBER	4
-#define GCPCLASS_LATINNUMBER	5
-#define GCPCLASS_LATINNUMERICTERMINATOR	6
-#define GCPCLASS_LATINNUMERICSEPARATOR	7
-#define GCPCLASS_NUMERICSEPARATOR	8
-#define GCPCLASS_PREBOUNDLTR	128
-#define GCPCLASS_PREBOUNDRTL	64
-#define GCPCLASS_POSTBOUNDLTR	32
-#define GCPCLASS_POSTBOUNDRTL	16
-#define GCPGLYPH_LINKBEFORE	0x8000
-#define GCPGLYPH_LINKAFTER	0x4000
-#define DCB_DISABLE 8
-#define DCB_ENABLE 4
-#define DCB_RESET 1
-#define DCB_SET 3
-#define DCB_ACCUMULATE 2
-#define DCB_DIRTY	2
-#define OBJ_BRUSH 2
-#define OBJ_PEN 1
-#define OBJ_PAL 5
-#define OBJ_FONT 6
-#define OBJ_BITMAP 7
-#define OBJ_EXTPEN 11
-#define OBJ_REGION 8
-#define OBJ_DC 3
-#define OBJ_MEMDC 10
-#define OBJ_METAFILE 9
-#define OBJ_METADC 4
-#define OBJ_ENHMETAFILE 13
-#define OBJ_ENHMETADC 12
-#define DRIVERVERSION 0
-#define TECHNOLOGY 2
-#define DT_PLOTTER 0
-#define DT_RASDISPLAY 1
-#define DT_RASPRINTER 2
-#define DT_RASCAMERA 3
-#define DT_CHARSTREAM 4
-#define DT_METAFILE 5
-#define DT_DISPFILE 6
-#define HORZSIZE 4
-#define VERTSIZE 6
-#define HORZRES 8
-#define VERTRES 10
-#define LOGPIXELSX 88
-#define LOGPIXELSY 90
-#define BITSPIXEL 12
-#define PLANES 14
-#define NUMBRUSHES 16
-#define NUMPENS 18
-#define NUMFONTS 22
-#define NUMCOLORS 24
-#define NUMMARKERS 20
-#define ASPECTX 40
-#define ASPECTY 42
-#define ASPECTXY 44
-#define PDEVICESIZE 26
-#define CLIPCAPS 36
-#define SIZEPALETTE 104
-#define NUMRESERVED 106
-#define COLORRES 108
-#define PHYSICALWIDTH 110
-#define PHYSICALHEIGHT 111
-#define PHYSICALOFFSETX 112
-#define PHYSICALOFFSETY 113
-#define SCALINGFACTORX 114
-#define SCALINGFACTORY 115
-#define VREFRESH 116
-#define DESKTOPHORZRES 118
-#define DESKTOPVERTRES 117
-#define BLTALIGNMENT 119
-#define RASTERCAPS 38
-#define RC_BANDING 2
-#define RC_BITBLT 1
-#define RC_BITMAP64 8
-#define RC_DI_BITMAP 128
-#define RC_DIBTODEV 512
-#define RC_FLOODFILL 4096
-#define RC_GDI20_OUTPUT 16
-#define RC_PALETTE 256
-#define RC_SCALING 4
-#define RC_STRETCHBLT 2048
-#define RC_STRETCHDIB 8192
-#define RC_DEVBITS 0x8000
-#define RC_OP_DX_OUTPUT 0x4000
-#define CURVECAPS 28
-#define CC_NONE 0
-#define CC_CIRCLES 1
-#define CC_PIE 2
-#define CC_CHORD 4
-#define CC_ELLIPSES 8
-#define CC_WIDE 16
-#define CC_STYLED 32
-#define CC_WIDESTYLED 64
-#define CC_INTERIORS 128
-#define CC_ROUNDRECT 256
-#define LINECAPS 30
-#define LC_NONE 0
-#define LC_POLYLINE 2
-#define LC_MARKER 4
-#define LC_POLYMARKER 8
-#define LC_WIDE 16
-#define LC_STYLED 32
-#define LC_WIDESTYLED 64
-#define LC_INTERIORS 128
-#define POLYGONALCAPS 32
-#define RC_BANDING 2
-#define RC_BIGFONT 1024
-#define RC_BITBLT 1
-#define RC_BITMAP64 8
-#define RC_DEVBITS 0x8000
-#define RC_DI_BITMAP 128
-#define RC_GDI20_OUTPUT 16
-#define RC_GDI20_STATE 32
-#define RC_NONE 0
-#define RC_OP_DX_OUTPUT 0x4000
-#define RC_PALETTE 256
-#define RC_SAVEBITMAP 64
-#define RC_SCALING 4
-#define PC_NONE 0
-#define PC_POLYGON 1
-#define PC_POLYPOLYGON 256
-#define PC_PATHS 512
-#define PC_RECTANGLE 2
-#define PC_WINDPOLYGON 4
-#define PC_SCANLINE 8
-#define PC_TRAPEZOID 4
-#define PC_WIDE 16
-#define PC_STYLED 32
-#define PC_WIDESTYLED 64
-#define PC_INTERIORS 128
-#define PC_PATHS 512
-#define TEXTCAPS 34
-#define TC_OP_CHARACTER 1
-#define TC_OP_STROKE 2
-#define TC_CP_STROKE 4
-#define TC_CR_90 8
-#define TC_CR_ANY 16
-#define TC_SF_X_YINDEP 32
-#define TC_SA_DOUBLE 64
-#define TC_SA_INTEGER 128
-#define TC_SA_CONTIN 256
-#define TC_EA_DOUBLE 512
-#define TC_IA_ABLE 1024
-#define TC_UA_ABLE 2048
-#define TC_SO_ABLE 4096
-#define TC_RA_ABLE 8192
-#define TC_VA_ABLE 16384
-#define TC_RESERVED 32768
-#define TC_SCROLLBLT 65536
-#define GCP_DBCS 1
-#define GCP_ERROR 0x8000
-#define GCP_CLASSIN 0x80000
-#define GCP_DIACRITIC 256
-#define GCP_DISPLAYZWG 0x400000
-#define GCP_GLYPHSHAPE 16
-#define GCP_JUSTIFY 0x10000
-#define GCP_JUSTIFYIN 0x200000
-#define GCP_KASHIDA 1024
-#define GCP_LIGATE 32
-#define GCP_MAXEXTENT 0x100000
-#define GCP_NEUTRALOVERRIDE 0x2000000
-#define GCP_NUMERICOVERRIDE 0x1000000
-#define GCP_NUMERICSLATIN 0x4000000
-#define GCP_NUMERICSLOCAL 0x8000000
-#define GCP_REORDER 2
-#define GCP_SYMSWAPOFF 0x800000
-#define GCP_USEKERNING 8
-#define FLI_GLYPHS 0x40000
-#define FLI_MASK 0x103b
-#define GGO_METRICS 0
-#define GGO_BITMAP 1
-#define GGO_NATIVE 2
-#define GGO_BEZIER 3
-#define GGO_GRAY2_BITMAP 4
-#define GGO_GRAY4_BITMAP 5
-#define GGO_GRAY8_BITMAP 6
-#define GGO_GLYPH_INDEX 128
-#define GGO_UNHINTED 256
-#define GM_COMPATIBLE 1
-#define GM_ADVANCED 2
-#define MM_ANISOTROPIC 8
-#define MM_HIENGLISH 5
-#define MM_HIMETRIC 3
-#define MM_ISOTROPIC 7
-#define MM_LOENGLISH 4
-#define MM_LOMETRIC 2
-#define MM_TEXT 1
-#define MM_TWIPS 6
-#define MM_MAX_FIXEDSCALE	MM_TWIPS
-#define ABSOLUTE	1
-#define RELATIVE	2
-#define PC_EXPLICIT 2
-#define PC_NOCOLLAPSE 4
-#define PC_RESERVED 1
-#define CLR_NONE 0xffffffff
-#define CLR_INVALID CLR_NONE
-#define CLR_DEFAULT 0xff000000
-#define PT_MOVETO 6
-#define PT_LINETO 2
-#define PT_BEZIERTO 4
-#define PT_CLOSEFIGURE 1
-#define TT_AVAILABLE 1
-#define TT_ENABLED 2
-#define BLACK_BRUSH 4
-#define DKGRAY_BRUSH 3
-#define GRAY_BRUSH 2
-#define HOLLOW_BRUSH 5
-#define LTGRAY_BRUSH 1
-#define NULL_BRUSH 5
-#define WHITE_BRUSH 0
-#define BLACK_PEN 7
-#define NULL_PEN 8
-#define WHITE_PEN 6
-#define ANSI_FIXED_FONT 11
-#define ANSI_VAR_FONT 12
-#define DEVICE_DEFAULT_FONT 14
-#define DEFAULT_GUI_FONT 17
-#define OEM_FIXED_FONT 10
-#define SYSTEM_FONT 13
-#define SYSTEM_FIXED_FONT 16
-#define DEFAULT_PALETTE 15
-#if (_WIN32_WINNT >= 0x0500)
-#define DC_BRUSH	18
-#define DC_PEN	19
-#endif
-#define SYSPAL_NOSTATIC 2
-#define SYSPAL_STATIC 1
-#define SYSPAL_ERROR 0
-#define TA_BASELINE 24
-#define TA_BOTTOM 8
-#define TA_TOP 0
-#define TA_CENTER 6
-#define TA_LEFT 0
-#define TA_RIGHT 2
-#define TA_RTLREADING 256
-#define TA_NOUPDATECP 0
-#define TA_UPDATECP 1
-#define TA_MASK (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING)
-#define VTA_BASELINE 24
-#define VTA_CENTER 6
-#define VTA_LEFT TA_BOTTOM
-#define VTA_RIGHT TA_TOP
-#define VTA_BOTTOM TA_RIGHT
-#define VTA_TOP TA_LEFT
-#define MWT_IDENTITY 1
-#define MWT_LEFTMULTIPLY 2
-#define MWT_RIGHTMULTIPLY 3
-#define OPAQUE 2
-#define TRANSPARENT 1
-#define BLACKONWHITE 1
-#define WHITEONBLACK 2
-#define COLORONCOLOR 3
-#define HALFTONE 4
-#define MAXSTRETCHBLTMODE 4
-#define STRETCH_ANDSCANS 1
-#define STRETCH_DELETESCANS 3
-#define STRETCH_HALFTONE 4
-#define STRETCH_ORSCANS 2
-#define TCI_SRCCHARSET 1
-#define TCI_SRCCODEPAGE 2
-#define TCI_SRCFONTSIG 3
-#define ICM_ON 2
-#define ICM_OFF 1
-#define ICM_QUERY 3
-#define NEWFRAME	1
-#define ABORTDOC	2
-#define NEXTBAND	3
-#define SETCOLORTABLE	4
-#define GETCOLORTABLE	5
-#define FLUSHOUTPUT	6
-#define DRAFTMODE	7
-#define QUERYESCSUPPORT	8
-#define SETABORTPROC	9
-#define STARTDOC	10
-#define ENDDOC	11
-#define GETPHYSPAGESIZE	12
-#define GETPRINTINGOFFSET	13
-#define GETSCALINGFACTOR	14
-#define MFCOMMENT	15
-#define GETPENWIDTH	16
-#define SETCOPYCOUNT	17
-#define SELECTPAPERSOURCE	18
-#define DEVICEDATA	19
-#define PASSTHROUGH	19
-#define GETTECHNOLGY	20
-#define GETTECHNOLOGY	20
-#define SETLINECAP	21
-#define SETLINEJOIN	22
-#define SETMITERLIMIT	23
-#define BANDINFO	24
-#define DRAWPATTERNRECT	25
-#define GETVECTORPENSIZE	26
-#define GETVECTORBRUSHSIZE	27
-#define ENABLEDUPLEX	28
-#define GETSETPAPERBINS	29
-#define GETSETPRINTORIENT	30
-#define ENUMPAPERBINS	31
-#define SETDIBSCALING	32
-#define EPSPRINTING	33
-#define ENUMPAPERMETRICS	34
-#define GETSETPAPERMETRICS	35
-#define POSTSCRIPT_DATA	37
-#define POSTSCRIPT_IGNORE	38
-#define MOUSETRAILS	39
-#define GETDEVICEUNITS	42
-#define GETEXTENDEDTEXTMETRICS	256
-#define GETEXTENTTABLE	257
-#define GETPAIRKERNTABLE	258
-#define GETTRACKKERNTABLE	259
-#define EXTTEXTOUT	512
-#define GETFACENAME	513
-#define DOWNLOADFACE	514
-#define ENABLERELATIVEWIDTHS	768
-#define ENABLEPAIRKERNING	769
-#define SETKERNTRACK	770
-#define SETALLJUSTVALUES	771
-#define SETCHARSET	772
-#define STRETCHBLT	2048
-#define GETSETSCREENPARAMS	3072
-#define QUERYDIBSUPPORT	3073
-#define BEGIN_PATH	4096
-#define CLIP_TO_PATH	4097
-#define END_PATH	4098
-#define EXT_DEVICE_CAPS	4099
-#define RESTORE_CTM	4100
-#define SAVE_CTM	4101
-#define SET_ARC_DIRECTION	4102
-#define SET_BACKGROUND_COLOR	4103
-#define SET_POLY_MODE	4104
-#define SET_SCREEN_ANGLE	4105
-#define SET_SPREAD	4106
-#define TRANSFORM_CTM	4107
-#define SET_CLIP_BOX	4108
-#define SET_BOUNDS	4109
-#define SET_MIRROR_MODE	4110
-#define OPENCHANNEL	4110
-#define DOWNLOADHEADER	4111
-#define CLOSECHANNEL	4112
-#define POSTSCRIPT_PASSTHROUGH	4115
-#define ENCAPSULATED_POSTSCRIPT	4116
-#define QDI_SETDIBITS	1
-#define QDI_GETDIBITS	2
-#define QDI_DIBTOSCREEN	4
-#define QDI_STRETCHDIB	8
-#define SP_NOTREPORTED	0x4000
-#define PR_JOBSTATUS	0
-#define ASPECT_FILTERING	1
-#define BS_SOLID	0
-#define BS_NULL	1
-#define BS_HOLLOW	1
-#define BS_HATCHED	2
-#define BS_PATTERN	3
-#define BS_INDEXED	4
-#define BS_DIBPATTERN	5
-#define BS_DIBPATTERNPT	6
-#define BS_PATTERN8X8	7
-#define BS_DIBPATTERN8X8	8
-#define LCS_CALIBRATED_RGB	0
-#define LCS_DEVICE_RGB	1
-#define LCS_DEVICE_CMYK	2
-#define LCS_GM_BUSINESS	1
-#define LCS_GM_GRAPHICS	2
-#define LCS_GM_IMAGES	4
-#define RASTER_FONTTYPE	1
-#define DEVICE_FONTTYPE	2
-#define TRUETYPE_FONTTYPE	4
-#define DMORIENT_PORTRAIT   1
-#define DMORIENT_LANDSCAPE  2
-#define DMPAPER_FIRST	1
-#define DMPAPER_LETTER	1
-#define DMPAPER_LETTERSMALL	2
-#define DMPAPER_TABLOID	3
-#define DMPAPER_LEDGER	4
-#define DMPAPER_LEGAL	5
-#define DMPAPER_STATEMENT	6
-#define DMPAPER_EXECUTIVE	7
-#define DMPAPER_A3	8
-#define DMPAPER_A4	9
-#define DMPAPER_A4SMALL	10
-#define DMPAPER_A5	11
-#define DMPAPER_B4	12
-#define DMPAPER_B5	13
-#define DMPAPER_FOLIO	14
-#define DMPAPER_QUARTO	15
-#define DMPAPER_10X14	16
-#define DMPAPER_11X17	17
-#define DMPAPER_NOTE	18
-#define DMPAPER_ENV_9	19
-#define DMPAPER_ENV_10	20
-#define DMPAPER_ENV_11	21
-#define DMPAPER_ENV_12	22
-#define DMPAPER_ENV_14	23
-#define DMPAPER_CSHEET	24
-#define DMPAPER_DSHEET	25
-#define DMPAPER_ESHEET	26
-#define DMPAPER_ENV_DL	27
-#define DMPAPER_ENV_C5	28
-#define DMPAPER_ENV_C3	29
-#define DMPAPER_ENV_C4	30
-#define DMPAPER_ENV_C6	31
-#define DMPAPER_ENV_C65	32
-#define DMPAPER_ENV_B4	33
-#define DMPAPER_ENV_B5	34
-#define DMPAPER_ENV_B6	35
-#define DMPAPER_ENV_ITALY	36
-#define DMPAPER_ENV_MONARCH	37
-#define DMPAPER_ENV_PERSONAL	38
-#define DMPAPER_FANFOLD_US	39
-#define DMPAPER_FANFOLD_STD_GERMAN	40
-#define DMPAPER_FANFOLD_LGL_GERMAN	41
-#define DMPAPER_ISO_B4	42
-#define DMPAPER_JAPANESE_POSTCARD	43
-#define DMPAPER_9X11	44
-#define DMPAPER_10X11	45
-#define DMPAPER_15X11	46
-#define DMPAPER_ENV_INVITE	47
-#define DMPAPER_RESERVED_48	48
-#define DMPAPER_RESERVED_49	49
-#define DMPAPER_LETTER_EXTRA	50
-#define DMPAPER_LEGAL_EXTRA	51
-#define DMPAPER_TABLOID_EXTRA	52
-#define DMPAPER_A4_EXTRA	53
-#define DMPAPER_LETTER_TRANSVERSE	54
-#define DMPAPER_A4_TRANSVERSE	55
-#define DMPAPER_LETTER_EXTRA_TRANSVERSE	56
-#define DMPAPER_A_PLUS	57
-#define DMPAPER_B_PLUS	58
-#define DMPAPER_LETTER_PLUS	59
-#define DMPAPER_A4_PLUS	60
-#define DMPAPER_A5_TRANSVERSE	61
-#define DMPAPER_B5_TRANSVERSE	62
-#define DMPAPER_A3_EXTRA	63
-#define DMPAPER_A5_EXTRA	64
-#define DMPAPER_B5_EXTRA	65
-#define DMPAPER_A2	66
-#define DMPAPER_A3_TRANSVERSE	67
-#define DMPAPER_A3_EXTRA_TRANSVERSE	68
-#define DMPAPER_LAST	68
-#define DMPAPER_USER	256
-#define DMBIN_FIRST	1
-#define DMBIN_UPPER	1
-#define DMBIN_ONLYONE	1
-#define DMBIN_LOWER	2
-#define DMBIN_MIDDLE	3
-#define DMBIN_MANUAL	4
-#define DMBIN_ENVELOPE	5
-#define DMBIN_ENVMANUAL	6
-#define DMBIN_AUTO	7
-#define DMBIN_TRACTOR	8
-#define DMBIN_SMALLFMT	9
-#define DMBIN_LARGEFMT	10
-#define DMBIN_LARGECAPACITY	11
-#define DMBIN_CASSETTE	14
-#define DMBIN_FORMSOURCE	15
-#define DMBIN_LAST	15
-#define DMBIN_USER	256
-#define DMRES_DRAFT	(-1)
-#define DMRES_LOW	(-2)
-#define DMRES_MEDIUM	(-3)
-#define DMRES_HIGH	(-4)
-#define DMCOLOR_MONOCHROME	1
-#define DMCOLOR_COLOR	2
-#define DMDUP_SIMPLEX	1
-#define DMDUP_VERTICAL	2
-#define DMDUP_HORIZONTAL	3
-#define DMTT_BITMAP	1
-#define DMTT_DOWNLOAD	2
-#define DMTT_SUBDEV	3
-#define DMTT_DOWNLOAD_OUTLINE	4
-#define DMCOLLATE_FALSE	0
-#define DMCOLLATE_TRUE	1
-#define DM_SPECVERSION	800
-#define DM_GRAYSCALE	1
-#define DM_INTERLACED	2
-#define DM_UPDATE	1
-#define DM_COPY	2
-#define DM_PROMPT	4
-#define DM_MODIFY	8
-#define DM_IN_BUFFER	DM_MODIFY
-#define DM_IN_PROMPT	DM_PROMPT
-#define DM_OUT_BUFFER	DM_COPY
-#define DM_OUT_DEFAULT	DM_UPDATE
-#define DM_ORIENTATION 1
-#define DM_PAPERSIZE 2
-#define DM_PAPERLENGTH 4
-#define DM_PAPERWIDTH 8
-#define DM_SCALE 16
-#define DM_COPIES 256
-#define DM_DEFAULTSOURCE 512
-#define DM_PRINTQUALITY 1024
-#define DM_COLOR 2048
-#define DM_DUPLEX 4096
-#define DM_YRESOLUTION 8192
-#define DM_TTOPTION 16384
-#define DM_COLLATE 32768
-#define DM_FORMNAME 65536
-#define DM_LOGPIXELS 0x20000
-#define DM_BITSPERPEL 0x40000
-#define DM_PELSWIDTH 0x80000
-#define DM_PELSHEIGHT 0x100000
-#define DM_DISPLAYFLAGS 0x200000
-#define DM_DISPLAYFREQUENCY 0x400000
-#define DM_ICMMETHOD 0x800000
-#define DM_ICMINTENT 0x1000000
-#define DM_MEDIATYPE 0x2000000
-#define DM_DITHERTYPE 0x4000000
-#define DMICMMETHOD_NONE	1
-#define DMICMMETHOD_SYSTEM	2
-#define DMICMMETHOD_DRIVER	3
-#define DMICMMETHOD_DEVICE	4
-#define DMICMMETHOD_USER	256
-#define DMICM_SATURATE	1
-#define DMICM_CONTRAST	2
-#define DMICM_COLORMETRIC	3
-#define DMICM_USER	256
-#define DMMEDIA_STANDARD	1
-#define DMMEDIA_TRANSPARENCY	2
-#define DMMEDIA_GLOSSY	3
-#define DMMEDIA_USER	256
-#define DMDITHER_NONE	1
-#define DMDITHER_COARSE	2
-#define DMDITHER_FINE	3
-#define DMDITHER_LINEART	4
-#define DMDITHER_ERRORDIFFUSION	5
-#define DMDITHER_RESERVED6	6
-#define DMDITHER_RESERVED7	7
-#define DMDITHER_RESERVED8	8
-#define DMDITHER_RESERVED9	9
-#define DMDITHER_GRAYSCALE	10
-#define DMDITHER_USER	256
-#define GDI_ERROR 0xFFFFFFFF
-#define HGDI_ERROR ((HANDLE)GDI_ERROR)
-#define TMPF_FIXED_PITCH 1
-#define TMPF_VECTOR 2
-#define TMPF_TRUETYPE 4
-#define TMPF_DEVICE 8
-#define NTM_ITALIC 1
-#define NTM_BOLD 32
-#define NTM_REGULAR 64
-#define TT_POLYGON_TYPE 24
-#define TT_PRIM_LINE 1
-#define TT_PRIM_QSPLINE 2
-#define FONTMAPPER_MAX 10
-#define ENHMETA_STOCK_OBJECT 0x80000000
-#define WGL_FONT_LINES 0
-#define WGL_FONT_POLYGONS 1
-#define LPD_DOUBLEBUFFER 1
-#define LPD_STEREO 2
-#define LPD_SUPPORT_GDI 16
-#define LPD_SUPPORT_OPENGL 32
-#define LPD_SHARE_DEPTH 64
-#define LPD_SHARE_STENCIL 128
-#define LPD_SHARE_ACCUM 256
-#define LPD_SWAP_EXCHANGE 512
-#define LPD_SWAP_COPY 1024
-#define LPD_TRANSPARENT 4096
-#define LPD_TYPE_RGBA 0
-#define LPD_TYPE_COLORINDEX 1
-#define WGL_SWAP_MAIN_PLANE 1
-#define WGL_SWAP_OVERLAY1 2
-#define WGL_SWAP_OVERLAY2 4
-#define WGL_SWAP_OVERLAY3 8
-#define WGL_SWAP_OVERLAY4 16
-#define WGL_SWAP_OVERLAY5 32
-#define WGL_SWAP_OVERLAY6 64
-#define WGL_SWAP_OVERLAY7 128
-#define WGL_SWAP_OVERLAY8 256
-#define WGL_SWAP_OVERLAY9 512
-#define WGL_SWAP_OVERLAY10 1024
-#define WGL_SWAP_OVERLAY11 2048
-#define WGL_SWAP_OVERLAY12 4096
-#define WGL_SWAP_OVERLAY13 8192
-#define WGL_SWAP_OVERLAY14 16384
-#define WGL_SWAP_OVERLAY15 32768
-#define WGL_SWAP_UNDERLAY1 65536
-#define WGL_SWAP_UNDERLAY2 0x20000
-#define WGL_SWAP_UNDERLAY3 0x40000
-#define WGL_SWAP_UNDERLAY4 0x80000
-#define WGL_SWAP_UNDERLAY5 0x100000
-#define WGL_SWAP_UNDERLAY6 0x200000
-#define WGL_SWAP_UNDERLAY7 0x400000
-#define WGL_SWAP_UNDERLAY8 0x800000
-#define WGL_SWAP_UNDERLAY9 0x1000000
-#define WGL_SWAP_UNDERLAY10 0x2000000
-#define WGL_SWAP_UNDERLAY11 0x4000000
-#define WGL_SWAP_UNDERLAY12 0x8000000
-#define WGL_SWAP_UNDERLAY13 0x10000000
-#define WGL_SWAP_UNDERLAY14 0x20000000
-#define WGL_SWAP_UNDERLAY15 0x40000000
-#define AC_SRC_OVER 0
-#define LAYOUT_RTL 1
-#define LAYOUT_BITMAPORIENTATIONPRESERVED 8
-#if (WINVER > 0x400)
-#define CS_ENABLE           0x00000001
-#define CS_DISABLE          0x00000002
-#define CS_DELETE_TRANSFORM 0x00000003
-#endif
-#if (WINVER > 0x500)
-#define GRADIENT_FILL_RECT_H 0x00
-#define GRADIENT_FILL_RECT_V 0x01
-#define GRADIENT_FILL_TRIANGLE 0x02
-#define GRADIENT_FILL_OP_FLAG 0xff
-#define COLORMATCHTOTARGET_EMBEDED 0x00000001
-#define CREATECOLORSPACE_EMBEDED   0x00000001
-#define SETICMPROFILE_EMBEDED      0x00000001
-#endif
-
-#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001
-#define DISPLAY_DEVICE_MULTI_DRIVER        0x00000002
-#define DISPLAY_DEVICE_PRIMARY_DEVICE      0x00000004
-#define DISPLAY_DEVICE_MIRRORING_DRIVER    0x00000008
-#define DISPLAY_DEVICE_VGA_COMPATIBLE      0x00000010
-#define DISPLAY_DEVICE_REMOVABLE           0x00000020
-#define DISPLAY_DEVICE_MODESPRUNED         0x08000000
-#ifndef RC_INVOKED
-typedef struct _ABC {
-	int abcA;
-	UINT abcB;
-	int abcC;
-} ABC,*LPABC;
-typedef struct _ABCFLOAT {
-	FLOAT abcfA;
-	FLOAT abcfB;
-	FLOAT abcfC;
-} ABCFLOAT,*LPABCFLOAT;
-typedef struct tagBITMAP {
-	LONG	bmType;
-	LONG	bmWidth;
-	LONG	bmHeight;
-	LONG	bmWidthBytes;
-	WORD	bmPlanes;
-	WORD	bmBitsPixel;
-	LPVOID	bmBits;
-} BITMAP,*PBITMAP,*LPBITMAP;
-typedef struct tagBITMAPCOREHEADER {
-	DWORD	bcSize;
-	WORD	bcWidth;
-	WORD	bcHeight;
-	WORD	bcPlanes;
-	WORD	bcBitCount;
-} BITMAPCOREHEADER,*LPBITMAPCOREHEADER,*PBITMAPCOREHEADER;
-#pragma pack(push,1)
-typedef struct tagRGBTRIPLE {
-	BYTE rgbtBlue;
-	BYTE rgbtGreen;
-	BYTE rgbtRed;
-} RGBTRIPLE,*LPRGBTRIPLE;
-#pragma pack(pop)
-#pragma pack(push,2)
-typedef struct tagBITMAPFILEHEADER {
-	WORD	bfType;
-	DWORD	bfSize;
-	WORD	bfReserved1;
-	WORD	bfReserved2;
-	DWORD	bfOffBits;
-} BITMAPFILEHEADER,*LPBITMAPFILEHEADER,*PBITMAPFILEHEADER;
-#pragma pack(pop)
-typedef struct _BITMAPCOREINFO {
-	BITMAPCOREHEADER	bmciHeader;
-	RGBTRIPLE	bmciColors[1];
-} BITMAPCOREINFO,*LPBITMAPCOREINFO,*PBITMAPCOREINFO;
-typedef struct tagBITMAPINFOHEADER{
-	DWORD	biSize;
-	LONG	biWidth;
-	LONG	biHeight;
-	WORD	biPlanes;
-	WORD	biBitCount;
-	DWORD	biCompression;
-	DWORD	biSizeImage;
-	LONG	biXPelsPerMeter;
-	LONG	biYPelsPerMeter;
-	DWORD	biClrUsed;
-	DWORD	biClrImportant;
-} BITMAPINFOHEADER,*LPBITMAPINFOHEADER,*PBITMAPINFOHEADER;
-typedef struct tagRGBQUAD {
-	BYTE	rgbBlue;
-	BYTE	rgbGreen;
-	BYTE	rgbRed;
-	BYTE	rgbReserved;
-} RGBQUAD,*LPRGBQUAD;
-typedef struct tagBITMAPINFO {
-	BITMAPINFOHEADER bmiHeader;
-	RGBQUAD bmiColors[1];
-} BITMAPINFO,*LPBITMAPINFO,*PBITMAPINFO;
-typedef long FXPT16DOT16,*LPFXPT16DOT16;
-typedef long FXPT2DOT30,*LPFXPT2DOT30;
-typedef struct tagCIEXYZ {
-	FXPT2DOT30 ciexyzX;
-	FXPT2DOT30 ciexyzY;
-	FXPT2DOT30 ciexyzZ;
-} CIEXYZ,*LPCIEXYZ;
-typedef struct tagCIEXYZTRIPLE {
-	CIEXYZ ciexyzRed;
-	CIEXYZ ciexyzGreen;
-	CIEXYZ ciexyzBlue;
-} CIEXYZTRIPLE,*LPCIEXYZTRIPLE;
-typedef struct {
-	DWORD	bV4Size;
-	LONG	bV4Width;
-	LONG	bV4Height;
-	WORD	bV4Planes;
-	WORD	bV4BitCount;
-	DWORD	bV4V4Compression;
-	DWORD	bV4SizeImage;
-	LONG	bV4XPelsPerMeter;
-	LONG	bV4YPelsPerMeter;
-	DWORD	bV4ClrUsed;
-	DWORD	bV4ClrImportant;
-	DWORD	bV4RedMask;
-	DWORD	bV4GreenMask;
-	DWORD	bV4BlueMask;
-	DWORD	bV4AlphaMask;
-	DWORD	bV4CSType;
-	CIEXYZTRIPLE bV4Endpoints;
-	DWORD	bV4GammaRed;
-	DWORD	bV4GammaGreen;
-	DWORD	bV4GammaBlue;
-} BITMAPV4HEADER,*LPBITMAPV4HEADER,*PBITMAPV4HEADER;
-typedef struct tagFONTSIGNATURE {
-	DWORD	fsUsb[4];
-	DWORD	fsCsb[2];
-} FONTSIGNATURE,*LPFONTSIGNATURE;
-typedef struct {
-	UINT ciCharset;
-	UINT ciACP;
-	FONTSIGNATURE fs;
-} CHARSETINFO,*LPCHARSETINFO;
-typedef struct  tagCOLORADJUSTMENT {
-	WORD	caSize;
-	WORD	caFlags;
-	WORD	caIlluminantIndex;
-	WORD	caRedGamma;
-	WORD	caGreenGamma;
-	WORD	caBlueGamma;
-	WORD	caReferenceBlack;
-	WORD	caReferenceWhite;
-	SHORT	caContrast;
-	SHORT	caBrightness;
-	SHORT	caColorfulness;
-	SHORT	caRedGreenTint;
-} COLORADJUSTMENT,*LPCOLORADJUSTMENT;
-typedef struct _devicemodeA { 
-  BYTE   dmDeviceName[CCHDEVICENAME]; 
-  WORD   dmSpecVersion; 
-  WORD   dmDriverVersion; 
-  WORD   dmSize; 
-  WORD   dmDriverExtra; 
-  DWORD  dmFields; 
-  _ANONYMOUS_UNION union {
-    _ANONYMOUS_STRUCT struct {
-      short dmOrientation;
-      short dmPaperSize;
-      short dmPaperLength;
-      short dmPaperWidth;
-      short dmScale; 
-      short dmCopies; 
-      short dmDefaultSource; 
-      short dmPrintQuality; 
-    } DUMMYSTRUCTNAME;
-    POINTL dmPosition;
-    DWORD  dmDisplayOrientation;
-    DWORD  dmDisplayFixedOutput;
-  } DUMMYUNIONNAME;
-
-  short  dmColor; 
-  short  dmDuplex; 
-  short  dmYResolution; 
-  short  dmTTOption; 
-  short  dmCollate; 
-  BYTE   dmFormName[CCHFORMNAME]; 
-  WORD   dmLogPixels; 
-  DWORD  dmBitsPerPel; 
-  DWORD  dmPelsWidth; 
-  DWORD  dmPelsHeight; 
-  _ANONYMOUS_UNION union {
-    DWORD  dmDisplayFlags; 
-    DWORD  dmNup;
-  } DUMMYUNIONNAME2;
-  DWORD  dmDisplayFrequency; 
-#if(WINVER >= 0x0400) 
-  DWORD  dmICMMethod;
-  DWORD  dmICMIntent;
-  DWORD  dmMediaType;
-  DWORD  dmDitherType;
-  DWORD  dmReserved1;
-  DWORD  dmReserved2;
-#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400)
-  DWORD  dmPanningWidth;
-  DWORD  dmPanningHeight;
-#endif
-#endif /* WINVER >= 0x0400 */
-} DEVMODEA,*LPDEVMODEA,*PDEVMODEA;
-typedef struct _devicemodeW { 
-  WCHAR   dmDeviceName[CCHDEVICENAME]; 
-  WORD   dmSpecVersion; 
-  WORD   dmDriverVersion; 
-  WORD   dmSize; 
-  WORD   dmDriverExtra; 
-  DWORD  dmFields; 
-  _ANONYMOUS_UNION union {
-    _ANONYMOUS_STRUCT struct {
-      short dmOrientation;
-      short dmPaperSize;
-      short dmPaperLength;
-      short dmPaperWidth;
-      short dmScale; 
-      short dmCopies; 
-      short dmDefaultSource; 
-      short dmPrintQuality; 
-    } DUMMYSTRUCTNAME;
-    POINTL dmPosition;
-    DWORD  dmDisplayOrientation;
-    DWORD  dmDisplayFixedOutput;
-  } DUMMYUNIONNAME;
-
-  short  dmColor; 
-  short  dmDuplex; 
-  short  dmYResolution; 
-  short  dmTTOption; 
-  short  dmCollate; 
-  WCHAR  dmFormName[CCHFORMNAME]; 
-  WORD   dmLogPixels; 
-  DWORD  dmBitsPerPel; 
-  DWORD  dmPelsWidth; 
-  DWORD  dmPelsHeight; 
-  _ANONYMOUS_UNION union {
-    DWORD  dmDisplayFlags; 
-    DWORD  dmNup;
-  } DUMMYUNIONNAME2;
-  DWORD  dmDisplayFrequency; 
-#if(WINVER >= 0x0400) 
-  DWORD  dmICMMethod;
-  DWORD  dmICMIntent;
-  DWORD  dmMediaType;
-  DWORD  dmDitherType;
-  DWORD  dmReserved1;
-  DWORD  dmReserved2;
-#if (WINVER >= 0x0500) || (_WIN32_WINNT >= 0x0400)
-  DWORD  dmPanningWidth;
-  DWORD  dmPanningHeight;
-#endif
-#endif /* WINVER >= 0x0400 */
-} DEVMODEW,*LPDEVMODEW,*PDEVMODEW;
-typedef struct tagDIBSECTION {
-	BITMAP dsBm;
-	BITMAPINFOHEADER dsBmih;
-	DWORD dsBitfields[3];
-	HANDLE dshSection;
-	DWORD dsOffset;
-} DIBSECTION;
-typedef struct _DOCINFOA {
-	int cbSize;
-	LPCSTR lpszDocName;
-	LPCSTR lpszOutput;
-	LPCSTR lpszDatatype;
-	DWORD fwType;
-} DOCINFOA,*LPDOCINFOA;
-typedef struct _DOCINFOW {
-	int cbSize;
-	LPCWSTR lpszDocName;
-	LPCWSTR lpszOutput;
-	LPCWSTR lpszDatatype;
-	DWORD fwType;
-} DOCINFOW,*LPDOCINFOW;
-typedef struct tagEMR {
-	DWORD iType;
-	DWORD nSize;
-} EMR,*PEMR;
-typedef struct tagEMRANGLEARC {
-	EMR emr;
-	POINTL ptlCenter;
-	DWORD nRadius;
-	FLOAT eStartAngle;
-	FLOAT eSweepAngle;
-} EMRANGLEARC,*PEMRANGLEARC;
-typedef struct tagEMRARC {
-	EMR emr;
-	RECTL rclBox;
-	POINTL ptlStart;
-	POINTL ptlEnd;
-} EMRARC,*PEMRARC,EMRARCTO,*PEMRARCTO,EMRCHORD,*PEMRCHORD,EMRPIE,*PEMRPIE;
-typedef struct  _XFORM {
-	FLOAT eM11;
-	FLOAT eM12;
-	FLOAT eM21;
-	FLOAT eM22;
-	FLOAT eDx;
-	FLOAT eDy;
-} XFORM,*PXFORM,*LPXFORM;
-typedef struct tagEMRBITBLT {
-	EMR emr;
-	RECTL rclBounds;
-	LONG xDest;
-	LONG yDest;
-	LONG cxDest;
-	LONG cyDest;
-	DWORD dwRop;
-	LONG xSrc;
-	LONG ySrc;
-	XFORM xformSrc;
-	COLORREF crBkColorSrc;
-	DWORD iUsageSrc;
-	DWORD offBmiSrc;
-	DWORD offBitsSrc;
-	DWORD cbBitsSrc;
-} EMRBITBLT,*PEMRBITBLT;
-typedef struct tagLOGBRUSH {
-	UINT lbStyle;
-	COLORREF lbColor;
-	LONG lbHatch;
-} LOGBRUSH,*PLOGBRUSH,*LPLOGBRUSH;
-typedef LOGBRUSH PATTERN,*PPATTERN,*LPPATTERN;
-typedef struct tagEMRCREATEBRUSHINDIRECT {
-	EMR emr;
-	DWORD ihBrush;
-	LOGBRUSH lb;
-} EMRCREATEBRUSHINDIRECT,*PEMRCREATEBRUSHINDIRECT;
-typedef LONG LCSCSTYPE;
-typedef LONG LCSGAMUTMATCH;
-typedef struct tagLOGCOLORSPACEA {
-	DWORD lcsSignature;
-	DWORD lcsVersion;
-	DWORD lcsSize;
-	LCSCSTYPE lcsCSType;
-	LCSGAMUTMATCH lcsIntent;
-	CIEXYZTRIPLE lcsEndpoints;
-	DWORD lcsGammaRed;
-	DWORD lcsGammaGreen;
-	DWORD lcsGammaBlue;
-	CHAR lcsFilename[MAX_PATH];
-} LOGCOLORSPACEA,*LPLOGCOLORSPACEA;
-typedef struct tagLOGCOLORSPACEW {
-	DWORD lcsSignature;
-	DWORD lcsVersion;
-	DWORD lcsSize;
-	LCSCSTYPE lcsCSType;
-	LCSGAMUTMATCH lcsIntent;
-	CIEXYZTRIPLE lcsEndpoints;
-	DWORD lcsGammaRed;
-	DWORD lcsGammaGreen;
-	DWORD lcsGammaBlue;
-	WCHAR lcsFilename[MAX_PATH];
-} LOGCOLORSPACEW,*LPLOGCOLORSPACEW;
-typedef struct tagEMRCREATECOLORSPACE {
-	EMR emr;
-	DWORD ihCS;
-	LOGCOLORSPACEW lcs;
-} EMRCREATECOLORSPACE,*PEMRCREATECOLORSPACE;
-typedef struct tagEMRCREATEDIBPATTERNBRUSHPT {
-	EMR emr;
-	DWORD ihBrush;
-	DWORD iUsage;
-	DWORD offBmi;
-	DWORD cbBmi;
-	DWORD offBits;
-	DWORD cbBits;
-} EMRCREATEDIBPATTERNBRUSHPT,*PEMRCREATEDIBPATTERNBRUSHPT;
-typedef struct tagEMRCREATEMONOBRUSH {
-	EMR emr;
-	DWORD ihBrush;
-	DWORD iUsage;
-	DWORD offBmi;
-	DWORD cbBmi;
-	DWORD offBits;
-	DWORD cbBits;
-} EMRCREATEMONOBRUSH,*PEMRCREATEMONOBRUSH;
-typedef struct tagPALETTEENTRY {
-	BYTE peRed;
-	BYTE peGreen;
-	BYTE peBlue;
-	BYTE peFlags;
-} PALETTEENTRY,*LPPALETTEENTRY,*PPALETTEENTRY;
-typedef struct tagLOGPALETTE {
-	WORD palVersion;
-	WORD palNumEntries;
-	PALETTEENTRY palPalEntry[1];
-} LOGPALETTE,*NPLOGPALETTE,*PLOGPALETTE,*LPLOGPALETTE;
-typedef struct tagEMRCREATEPALETTE {
-	EMR emr;
-	DWORD ihPal;
-	LOGPALETTE lgpl;
-} EMRCREATEPALETTE,*PEMRCREATEPALETTE;
-typedef struct tagLOGPEN {
-	UINT lopnStyle;
-	POINT lopnWidth;
-	COLORREF lopnColor;
-} LOGPEN,*PLOGPEN,*LPLOGPEN;
-typedef struct tagEMRCREATEPEN {
-	EMR emr;
-	DWORD ihPen;
-	LOGPEN lopn;
-} EMRCREATEPEN,*PEMRCREATEPEN;
-typedef struct tagEMRELLIPSE {
-	EMR emr;
-	RECTL rclBox;
-} EMRELLIPSE,*PEMRELLIPSE,EMRRECTANGLE,*PEMRRECTANGLE;
-typedef struct tagEMREOF {
-	EMR emr;
-	DWORD nPalEntries;
-	DWORD offPalEntries;
-	DWORD nSizeLast;
-} EMREOF,*PEMREOF;
-typedef struct tagEMREXCLUDECLIPRECT {
-	EMR emr;
-	RECTL rclClip;
-} EMREXCLUDECLIPRECT,*PEMREXCLUDECLIPRECT,EMRINTERSECTCLIPRECT,*PEMRINTERSECTCLIPRECT;
-typedef struct tagPANOSE {
-	BYTE bFamilyType;
-	BYTE bSerifStyle;
-	BYTE bWeight;
-	BYTE bProportion;
-	BYTE bContrast;
-	BYTE bStrokeVariation;
-	BYTE bArmStyle;
-	BYTE bLetterform;
-	BYTE bMidline;
-	BYTE bXHeight;
-} PANOSE;
-typedef struct tagLOGFONTA {
-	LONG	lfHeight;
-	LONG	lfWidth;
-	LONG	lfEscapement;
-	LONG	lfOrientation;
-	LONG	lfWeight;
-	BYTE	lfItalic;
-	BYTE	lfUnderline;
-	BYTE	lfStrikeOut;
-	BYTE	lfCharSet;
-	BYTE	lfOutPrecision;
-	BYTE	lfClipPrecision;
-	BYTE	lfQuality;
-	BYTE	lfPitchAndFamily;
-	CHAR	lfFaceName[LF_FACESIZE];
-} LOGFONTA,*PLOGFONTA,*LPLOGFONTA;
-typedef struct tagLOGFONTW {
-	LONG	lfHeight;
-	LONG	lfWidth;
-	LONG	lfEscapement;
-	LONG	lfOrientation;
-	LONG	lfWeight;
-	BYTE	lfItalic;
-	BYTE	lfUnderline;
-	BYTE	lfStrikeOut;
-	BYTE	lfCharSet;
-	BYTE	lfOutPrecision;
-	BYTE	lfClipPrecision;
-	BYTE	lfQuality;
-	BYTE	lfPitchAndFamily;
-	WCHAR	lfFaceName[LF_FACESIZE];
-} LOGFONTW,*PLOGFONTW,*LPLOGFONTW;
-typedef struct tagEXTLOGFONTA {
-	LOGFONTA	elfLogFont;
-	BYTE	elfFullName[LF_FULLFACESIZE];
-	BYTE	elfStyle[LF_FACESIZE];
-	DWORD	elfVersion;
-	DWORD	elfStyleSize;
-	DWORD	elfMatch;
-	DWORD	elfReserved;
-	BYTE	elfVendorId[ELF_VENDOR_SIZE];
-	DWORD	elfCulture;
-	PANOSE	elfPanose;
-} EXTLOGFONTA,*PEXTLOGFONTA,*LPEXTLOGFONTA;
-typedef struct tagEXTLOGFONTW {
-	LOGFONTW	elfLogFont;
-	WCHAR	elfFullName[LF_FULLFACESIZE];
-	WCHAR	elfStyle[LF_FACESIZE];
-	DWORD	elfVersion;
-	DWORD	elfStyleSize;
-	DWORD	elfMatch;
-	DWORD	elfReserved;
-	BYTE	elfVendorId[ELF_VENDOR_SIZE];
-	DWORD	elfCulture;
-	PANOSE	elfPanose;
-} EXTLOGFONTW,*PEXTLOGFONTW,*LPEXTLOGFONTW;
-typedef struct tagEMREXTCREATEFONTINDIRECTW {
-	EMR emr;
-	DWORD ihFont;
-	EXTLOGFONTW elfw;
-} EMREXTCREATEFONTINDIRECTW,*PEMREXTCREATEFONTINDIRECTW;
-typedef struct tagEXTLOGPEN {
-	UINT elpPenStyle;
-	UINT elpWidth;
-	UINT elpBrushStyle;
-	COLORREF elpColor;
-	LONG elpHatch;
-	DWORD elpNumEntries;
-	DWORD elpStyleEntry[1];
-} EXTLOGPEN,*PEXTLOGPEN,*LPEXTLOGPEN;
-typedef struct tagEMREXTCREATEPEN {
-	EMR emr;
-	DWORD ihPen;
-	DWORD offBmi;
-	DWORD cbBmi;
-	DWORD offBits;
-	DWORD cbBits;
-	EXTLOGPEN elp;
-} EMREXTCREATEPEN,*PEMREXTCREATEPEN;
-typedef struct tagEMREXTFLOODFILL {
-	EMR emr;
-	POINTL ptlStart;
-	COLORREF crColor;
-	DWORD iMode;
-} EMREXTFLOODFILL,*PEMREXTFLOODFILL;
-typedef struct tagEMREXTSELECTCLIPRGN {
-	EMR emr;
-	DWORD cbRgnData;
-	DWORD iMode;
-	BYTE RgnData[1];
-} EMREXTSELECTCLIPRGN,*PEMREXTSELECTCLIPRGN;
-typedef struct tagEMRTEXT {
-	POINTL ptlReference;
-	DWORD nChars;
-	DWORD offString;
-	DWORD fOptions;
-	RECTL rcl;
-	DWORD offDx;
-} EMRTEXT,*PEMRTEXT;
-typedef struct tagEMREXTTEXTOUTA {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD iGraphicsMode;
-	FLOAT exScale;
-	FLOAT eyScale;
-	EMRTEXT emrtext;
-} EMREXTTEXTOUTA,*PEMREXTTEXTOUTA,EMREXTTEXTOUTW,*PEMREXTTEXTOUTW;
-typedef struct tagEMRFILLPATH {
-	EMR emr;
-	RECTL rclBounds;
-} EMRFILLPATH,*PEMRFILLPATH,EMRSTROKEANDFILLPATH,*PEMRSTROKEANDFILLPATH,EMRSTROKEPATH,*PEMRSTROKEPATH;
-typedef struct tagEMRFILLRGN {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD cbRgnData;
-	DWORD ihBrush;
-	BYTE RgnData[1];
-} EMRFILLRGN,*PEMRFILLRGN;
-typedef struct tagEMRFORMAT   {
-	DWORD dSignature;
-	DWORD nVersion;
-	DWORD cbData;
-	DWORD offData;
-} EMRFORMAT;
-typedef struct tagEMRFRAMERGN {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD cbRgnData;
-	DWORD ihBrush;
-	SIZEL szlStroke;
-	BYTE RgnData[1];
-} EMRFRAMERGN,*PEMRFRAMERGN;
-typedef struct tagEMRGDICOMMENT {
-	EMR emr;
-	DWORD cbData;
-	BYTE Data[1];
-} EMRGDICOMMENT,*PEMRGDICOMMENT;
-typedef struct tagEMRINVERTRGN {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD cbRgnData;
-	BYTE RgnData[1];
-} EMRINVERTRGN,*PEMRINVERTRGN,EMRPAINTRGN,*PEMRPAINTRGN;
-typedef struct tagEMRLINETO {
-	EMR emr;
-	POINTL ptl;
-} EMRLINETO,*PEMRLINETO,EMRMOVETOEX,*PEMRMOVETOEX;
-typedef struct tagEMRMASKBLT {
-	EMR emr;
-	RECTL rclBounds;
-	LONG xDest;
-	LONG yDest;
-	LONG cxDest;
-	LONG cyDest;
-	DWORD dwRop;
-	LONG xSrc;
-	LONG ySrc;
-	XFORM xformSrc;
-	COLORREF crBkColorSrc;
-	DWORD iUsageSrc;
-	DWORD offBmiSrc;
-	DWORD cbBmiSrc;
-	DWORD offBitsSrc;
-	DWORD cbBitsSrc;
-	LONG xMask;
-	LONG yMask;
-	DWORD iUsageMask;
-	DWORD offBmiMask;
-	DWORD cbBmiMask;
-	DWORD offBitsMask;
-	DWORD cbBitsMask;
-} EMRMASKBLT,*PEMRMASKBLT;
-typedef struct tagEMRMODIFYWORLDTRANSFORM {
-	EMR emr;
-	XFORM xform;
-	DWORD iMode;
-} EMRMODIFYWORLDTRANSFORM,*PEMRMODIFYWORLDTRANSFORM;
-typedef struct tagEMROFFSETCLIPRGN {
-	EMR emr;
-	POINTL ptlOffset;
-} EMROFFSETCLIPRGN,*PEMROFFSETCLIPRGN;
-typedef struct tagEMRPLGBLT {
-	EMR emr;
-	RECTL rclBounds;
-	POINTL aptlDest[3];
-	LONG xSrc;
-	LONG ySrc;
-	LONG cxSrc;
-	LONG cySrc;
-	XFORM xformSrc;
-	COLORREF crBkColorSrc;
-	DWORD iUsageSrc;
-	DWORD offBmiSrc;
-	DWORD cbBmiSrc;
-	DWORD offBitsSrc;
-	DWORD cbBitsSrc;
-	LONG xMask;
-	LONG yMask;
-	DWORD iUsageMask;
-	DWORD offBmiMask;
-	DWORD cbBmiMask;
-	DWORD offBitsMask;
-	DWORD cbBitsMask;
-} EMRPLGBLT,*PEMRPLGBLT;
-typedef struct tagEMRPOLYDRAW {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD cptl;
-	POINTL aptl[1];
-	BYTE abTypes[1];
-} EMRPOLYDRAW,*PEMRPOLYDRAW;
-typedef struct tagEMRPOLYDRAW16 {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD cpts;
-	POINTS apts[1];
-	BYTE abTypes[1];
-} EMRPOLYDRAW16,*PEMRPOLYDRAW16;
-typedef struct tagEMRPOLYLINE {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD cptl;
-	POINTL aptl[1];
-} EMRPOLYLINE,*PEMRPOLYLINE,EMRPOLYBEZIER,*PEMRPOLYBEZIER,EMRPOLYGON,*PEMRPOLYGON,EMRPOLYBEZIERTO,*PEMRPOLYBEZIERTO,EMRPOLYLINETO,*PEMRPOLYLINETO;
-typedef struct tagEMRPOLYLINE16 {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD cpts;
-	POINTL apts[1];
-} EMRPOLYLINE16,*PEMRPOLYLINE16,EMRPOLYBEZIER16,*PEMRPOLYBEZIER16,EMRPOLYGON16,*PEMRPOLYGON16,EMRPOLYBEZIERTO16,*PEMRPOLYBEZIERTO16,EMRPOLYLINETO16,*PEMRPOLYLINETO16;
-typedef struct tagEMRPOLYPOLYLINE {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD nPolys;
-	DWORD cptl;
-	DWORD aPolyCounts[1];
-	POINTL aptl[1];
-} EMRPOLYPOLYLINE,*PEMRPOLYPOLYLINE,EMRPOLYPOLYGON,*PEMRPOLYPOLYGON;
-typedef struct tagEMRPOLYPOLYLINE16 {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD nPolys;
-	DWORD cpts;
-	DWORD aPolyCounts[1];
-	POINTS apts[1];
-} EMRPOLYPOLYLINE16,*PEMRPOLYPOLYLINE16,EMRPOLYPOLYGON16,*PEMRPOLYPOLYGON16;
-typedef struct tagEMRPOLYTEXTOUTA {
-	EMR emr;
-	RECTL rclBounds;
-	DWORD iGraphicsMode;
-	FLOAT exScale;
-	FLOAT eyScale;
-	LONG cStrings;
-	EMRTEXT aemrtext[1];
-} EMRPOLYTEXTOUTA,*PEMRPOLYTEXTOUTA,EMRPOLYTEXTOUTW,*PEMRPOLYTEXTOUTW;
-typedef struct tagEMRRESIZEPALETTE {
-	EMR emr;
-	DWORD ihPal;
-	DWORD cEntries;
-} EMRRESIZEPALETTE,*PEMRRESIZEPALETTE;
-typedef struct tagEMRRESTOREDC {
-	EMR emr;
-	LONG iRelative;
-} EMRRESTOREDC,*PEMRRESTOREDC;
-typedef struct tagEMRROUNDRECT {
-	EMR emr;
-	RECTL rclBox;
-	SIZEL szlCorner;
-} EMRROUNDRECT,*PEMRROUNDRECT;
-typedef struct tagEMRSCALEVIEWPORTEXTEX {
-	EMR emr;
-	LONG xNum;
-	LONG xDenom;
-	LONG yNum;
-	LONG yDenom;
-} EMRSCALEVIEWPORTEXTEX,*PEMRSCALEVIEWPORTEXTEX,EMRSCALEWINDOWEXTEX,*PEMRSCALEWINDOWEXTEX;
-typedef struct tagEMRSELECTCOLORSPACE {
-	EMR emr;
-	DWORD ihCS;
-} EMRSELECTCOLORSPACE,*PEMRSELECTCOLORSPACE,EMRDELETECOLORSPACE,*PEMRDELETECOLORSPACE;
-typedef struct tagEMRSELECTOBJECT {
-	EMR emr;
-	DWORD ihObject;
-} EMRSELECTOBJECT,*PEMRSELECTOBJECT,EMRDELETEOBJECT,*PEMRDELETEOBJECT;
-typedef struct tagEMRSELECTPALETTE {
-	EMR emr;
-	DWORD ihPal;
-} EMRSELECTPALETTE,*PEMRSELECTPALETTE;
-typedef struct tagEMRSETARCDIRECTION {
-	EMR emr;
-	DWORD iArcDirection;
-} EMRSETARCDIRECTION,*PEMRSETARCDIRECTION;
-typedef struct tagEMRSETTEXTCOLOR {
-	EMR emr;
-	COLORREF crColor;
-} EMRSETBKCOLOR,*PEMRSETBKCOLOR,EMRSETTEXTCOLOR,*PEMRSETTEXTCOLOR;
-typedef struct tagEMRSETCOLORADJUSTMENT {
-	EMR emr;
-	COLORADJUSTMENT ColorAdjustment;
-} EMRSETCOLORADJUSTMENT,*PEMRSETCOLORADJUSTMENT;
-typedef struct tagEMRSETDIBITSTODEVICE {
-	EMR emr;
-	RECTL rclBounds;
-	LONG xDest;
-	LONG yDest;
-	LONG xSrc;
-	LONG ySrc;
-	LONG cxSrc;
-	LONG cySrc;
-	DWORD offBmiSrc;
-	DWORD cbBmiSrc;
-	DWORD offBitsSrc;
-	DWORD cbBitsSrc;
-	DWORD iUsageSrc;
-	DWORD iStartScan;
-	DWORD cScans;
-} EMRSETDIBITSTODEVICE,*PEMRSETDIBITSTODEVICE;
-typedef struct tagEMRSETMAPPERFLAGS {
-	EMR emr;
-	DWORD dwFlags;
-} EMRSETMAPPERFLAGS,*PEMRSETMAPPERFLAGS;
-typedef struct tagEMRSETMITERLIMIT {
-	EMR emr;
-	FLOAT eMiterLimit;
-} EMRSETMITERLIMIT,*PEMRSETMITERLIMIT;
-typedef struct tagEMRSETPALETTEENTRIES {
-	EMR emr;
-	DWORD ihPal;
-	DWORD iStart;
-	DWORD cEntries;
-	PALETTEENTRY aPalEntries[1];
-} EMRSETPALETTEENTRIES,*PEMRSETPALETTEENTRIES;
-typedef struct tagEMRSETPIXELV {
-	EMR emr;
-	POINTL ptlPixel;
-	COLORREF crColor;
-} EMRSETPIXELV,*PEMRSETPIXELV;
-typedef struct tagEMRSETVIEWPORTEXTEX {
-	EMR emr;
-	SIZEL szlExtent;
-} EMRSETVIEWPORTEXTEX,*PEMRSETVIEWPORTEXTEX,EMRSETWINDOWEXTEX,*PEMRSETWINDOWEXTEX;
-typedef struct tagEMRSETVIEWPORTORGEX {
-	EMR emr;
-	POINTL ptlOrigin;
-} EMRSETVIEWPORTORGEX,*PEMRSETVIEWPORTORGEX,EMRSETWINDOWORGEX,*PEMRSETWINDOWORGEX,EMRSETBRUSHORGEX,*PEMRSETBRUSHORGEX;
-typedef struct tagEMRSETWORLDTRANSFORM {
-	EMR emr;
-	XFORM xform;
-} EMRSETWORLDTRANSFORM,*PEMRSETWORLDTRANSFORM;
-typedef struct tagEMRSTRETCHBLT {
-	EMR emr;
-	RECTL rclBounds;
-	LONG xDest;
-	LONG yDest;
-	LONG cxDest;
-	LONG cyDest;
-	DWORD dwRop;
-	LONG xSrc;
-	LONG ySrc;
-	XFORM xformSrc;
-	COLORREF crBkColorSrc;
-	DWORD iUsageSrc;
-	DWORD offBmiSrc;
-	DWORD cbBmiSrc;
-	DWORD offBitsSrc;
-	DWORD cbBitsSrc;
-	LONG cxSrc;
-	LONG cySrc;
-} EMRSTRETCHBLT,*PEMRSTRETCHBLT;
-typedef struct tagEMRSTRETCHDIBITS {
-	EMR emr;
-	RECTL rclBounds;
-	LONG xDest;
-	LONG yDest;
-	LONG xSrc;
-	LONG ySrc;
-	LONG cxSrc;
-	LONG cySrc;
-	DWORD offBmiSrc;
-	DWORD cbBmiSrc;
-	DWORD offBitsSrc;
-	DWORD cbBitsSrc;
-	DWORD iUsageSrc;
-	DWORD dwRop;
-	LONG cxDest;
-	LONG cyDest;
-} EMRSTRETCHDIBITS,*PEMRSTRETCHDIBITS;
-typedef struct tagABORTPATH {
-	EMR emr;
-} EMRABORTPATH,*PEMRABORTPATH,EMRBEGINPATH,*PEMRBEGINPATH,EMRENDPATH,*PEMRENDPATH,EMRCLOSEFIGURE,*PEMRCLOSEFIGURE,EMRFLATTENPATH,*PEMRFLATTENPATH,EMRWIDENPATH,*PEMRWIDENPATH,EMRSETMETARGN,*PEMRSETMETARGN,EMRSAVEDC,*PEMRSAVEDC,EMRREALIZEPALETTE,*PEMRREALIZEPALETTE;
-typedef struct tagEMRSELECTCLIPPATH {
-	EMR emr;
-	DWORD iMode;
-} EMRSELECTCLIPPATH,*PEMRSELECTCLIPPATH,EMRSETBKMODE,*PEMRSETBKMODE,EMRSETMAPMODE,*PEMRSETMAPMODE,EMRSETPOLYFILLMODE,*PEMRSETPOLYFILLMODE,EMRSETROP2,*PEMRSETROP2,EMRSETSTRETCHBLTMODE,*PEMRSETSTRETCHBLTMODE,EMRSETTEXTALIGN,*PEMRSETTEXTALIGN,EMRENABLEICM,*PEMRENABLEICM;
-#pragma pack(push,2)
-typedef struct tagMETAHEADER {
-	WORD mtType;
-	WORD mtHeaderSize;
-	WORD mtVersion;
-	DWORD mtSize;
-	WORD mtNoObjects;
-	DWORD mtMaxRecord;
-	WORD mtNoParameters;
-} METAHEADER,*PMETAHEADER,*LPMETAHEADER;
-#pragma pack(pop)
-typedef struct tagENHMETAHEADER {
-	DWORD iType;
-	DWORD nSize;
-	RECTL rclBounds;
-	RECTL rclFrame;
-	DWORD dSignature;
-	DWORD nVersion;
-	DWORD nBytes;
-	DWORD nRecords;
-	WORD nHandles;
-	WORD sReserved;
-	DWORD nDescription;
-	DWORD offDescription;
-	DWORD nPalEntries;
-	SIZEL szlDevice;
-	SIZEL szlMillimeters;
-} ENHMETAHEADER,*LPENHMETAHEADER;
-typedef struct tagMETARECORD {
-	DWORD rdSize;
-	WORD rdFunction;
-	WORD rdParm[1];
-} METARECORD,*PMETARECORD,*LPMETARECORD;
-typedef struct tagENHMETARECORD {
-	DWORD iType;
-	DWORD nSize;
-	DWORD dParm[1];
-} ENHMETARECORD,*LPENHMETARECORD;
-typedef struct tagHANDLETABLE {
-	HGDIOBJ objectHandle[1];
-} HANDLETABLE,*LPHANDLETABLE;
-typedef struct tagTEXTMETRICA {
-	LONG tmHeight;
-	LONG tmAscent;
-	LONG tmDescent;
-	LONG tmInternalLeading;
-	LONG tmExternalLeading;
-	LONG tmAveCharWidth;
-	LONG tmMaxCharWidth;
-	LONG tmWeight;
-	LONG tmOverhang;
-	LONG tmDigitizedAspectX;
-	LONG tmDigitizedAspectY;
-	BYTE tmFirstChar;
-	BYTE tmLastChar;
-	BYTE tmDefaultChar;
-	BYTE tmBreakChar;
-	BYTE tmItalic;
-	BYTE tmUnderlined;
-	BYTE tmStruckOut;
-	BYTE tmPitchAndFamily;
-	BYTE tmCharSet;
-} TEXTMETRICA,*PTEXTMETRICA,*LPTEXTMETRICA;
-typedef struct tagTEXTMETRICW {
-	LONG tmHeight;
-	LONG tmAscent;
-	LONG tmDescent;
-	LONG tmInternalLeading;
-	LONG tmExternalLeading;
-	LONG tmAveCharWidth;
-	LONG tmMaxCharWidth;
-	LONG tmWeight;
-	LONG tmOverhang;
-	LONG tmDigitizedAspectX;
-	LONG tmDigitizedAspectY;
-	WCHAR tmFirstChar;
-	WCHAR tmLastChar;
-	WCHAR tmDefaultChar;
-	WCHAR tmBreakChar;
-	BYTE tmItalic;
-	BYTE tmUnderlined;
-	BYTE tmStruckOut;
-	BYTE tmPitchAndFamily;
-	BYTE tmCharSet;
-} TEXTMETRICW,*PTEXTMETRICW,*LPTEXTMETRICW;
-typedef struct _RGNDATAHEADER {
-	DWORD dwSize;
-	DWORD iType;
-	DWORD nCount;
-	DWORD nRgnSize;
-	RECT rcBound;
-} RGNDATAHEADER;
-typedef struct _RGNDATA {
-	RGNDATAHEADER rdh;
-	char Buffer[1];
-} RGNDATA,*PRGNDATA, *LPRGNDATA;
-/* for GetRandomRgn */
-#define SYSRGN  4
-typedef struct tagGCP_RESULTSA {
-	DWORD lStructSize;
-	LPSTR lpOutString;
-	UINT *lpOrder;
-	INT *lpDx;
-	INT *lpCaretPos;
-	LPSTR lpClass;
-	LPWSTR lpGlyphs;
-	UINT nGlyphs;
-	UINT nMaxFit;
-} GCP_RESULTSA,*LPGCP_RESULTSA;
-typedef struct tagGCP_RESULTSW {
-	DWORD lStructSize;
-	LPWSTR lpOutString;
-	UINT *lpOrder;
-	INT *lpDx;
-	INT *lpCaretPos;
-	LPWSTR lpClass;
-	LPWSTR lpGlyphs;
-	UINT nGlyphs;
-	UINT nMaxFit;
-} GCP_RESULTSW,*LPGCP_RESULTSW;
-typedef struct _GLYPHMETRICS {
-	UINT gmBlackBoxX;
-	UINT gmBlackBoxY;
-	POINT gmptGlyphOrigin;
-	short gmCellIncX;
-	short gmCellIncY;
-} GLYPHMETRICS,*LPGLYPHMETRICS;
-typedef struct tagKERNINGPAIR {
-	WORD wFirst;
-	WORD wSecond;
-	int iKernAmount;
-} KERNINGPAIR,*LPKERNINGPAIR;
-typedef struct _FIXED {
-	WORD fract;
-	short value;
-} FIXED;
-typedef struct _MAT2 {
-	FIXED eM11;
-	FIXED eM12;
-	FIXED eM21;
-	FIXED eM22;
-} MAT2,*LPMAT2;
-typedef struct _OUTLINETEXTMETRICA {
-	UINT otmSize;
-	TEXTMETRICA otmTextMetrics;
-	BYTE otmFiller;
-	PANOSE otmPanoseNumber;
-	UINT otmfsSelection;
-	UINT otmfsType;
-	int otmsCharSlopeRise;
-	int otmsCharSlopeRun;
-	int otmItalicAngle;
-	UINT otmEMSquare;
-	int otmAscent;
-	int otmDescent;
-	UINT otmLineGap;
-	UINT otmsCapEmHeight;
-	UINT otmsXHeight;
-	RECT otmrcFontBox;
-	int otmMacAscent;
-	int otmMacDescent;
-	UINT otmMacLineGap;
-	UINT otmusMinimumPPEM;
-	POINT otmptSubscriptSize;
-	POINT otmptSubscriptOffset;
-	POINT otmptSuperscriptSize;
-	POINT otmptSuperscriptOffset;
-	UINT otmsStrikeoutSize;
-	int otmsStrikeoutPosition;
-	int otmsUnderscoreSize;
-	int otmsUnderscorePosition;
-	PSTR otmpFamilyName;
-	PSTR otmpFaceName;
-	PSTR otmpStyleName;
-	PSTR otmpFullName;
-} OUTLINETEXTMETRICA,*POUTLINETEXTMETRICA,*LPOUTLINETEXTMETRICA;
-typedef struct _OUTLINETEXTMETRICW {
-	UINT otmSize;
-	TEXTMETRICW otmTextMetrics;
-	BYTE otmFiller;
-	PANOSE otmPanoseNumber;
-	UINT otmfsSelection;
-	UINT otmfsType;
-	int otmsCharSlopeRise;
-	int otmsCharSlopeRun;
-	int otmItalicAngle;
-	UINT otmEMSquare;
-	int otmAscent;
-	int otmDescent;
-	UINT otmLineGap;
-	UINT otmsCapEmHeight;
-	UINT otmsXHeight;
-	RECT otmrcFontBox;
-	int otmMacAscent;
-	int otmMacDescent;
-	UINT otmMacLineGap;
-	UINT otmusMinimumPPEM;
-	POINT otmptSubscriptSize;
-	POINT otmptSubscriptOffset;
-	POINT otmptSuperscriptSize;
-	POINT otmptSuperscriptOffset;
-	UINT otmsStrikeoutSize;
-	int otmsStrikeoutPosition;
-	int otmsUnderscoreSize;
-	int otmsUnderscorePosition;
-	PSTR otmpFamilyName;
-	PSTR otmpFaceName;
-	PSTR otmpStyleName;
-	PSTR otmpFullName;
-} OUTLINETEXTMETRICW,*POUTLINETEXTMETRICW,*LPOUTLINETEXTMETRICW;
-typedef struct _RASTERIZER_STATUS {
-	short nSize;
-	short wFlags;
-	short nLanguageID;
-} RASTERIZER_STATUS,*LPRASTERIZER_STATUS;
-typedef struct _POLYTEXTA {
-	int x;
-	int y;
-	UINT n;
-	LPCSTR lpstr;
-	UINT uiFlags;
-	RECT rcl;
-	int *pdx;
-} POLYTEXTA, *PPOLYTEXTA;
-typedef struct _POLYTEXTW {
-	int x;
-	int y;
-	UINT n;
-	LPCWSTR lpstr;
-	UINT uiFlags;
-	RECT rcl;
-	int *pdx;
-} POLYTEXTW, *PPOLYTEXTW;
-typedef struct tagPIXELFORMATDESCRIPTOR {
-	WORD nSize;
-	WORD nVersion;
-	DWORD dwFlags;
-	BYTE iPixelType;
-	BYTE cColorBits;
-	BYTE cRedBits;
-	BYTE cRedShift;
-	BYTE cGreenBits;
-	BYTE cGreenShift;
-	BYTE cBlueBits;
-	BYTE cBlueShift;
-	BYTE cAlphaBits;
-	BYTE cAlphaShift;
-	BYTE cAccumBits;
-	BYTE cAccumRedBits;
-	BYTE cAccumGreenBits;
-	BYTE cAccumBlueBits;
-	BYTE cAccumAlphaBits;
-	BYTE cDepthBits;
-	BYTE cStencilBits;
-	BYTE cAuxBuffers;
-	BYTE iLayerType;
-	BYTE bReserved;
-	DWORD dwLayerMask;
-	DWORD dwVisibleMask;
-	DWORD dwDamageMask;
-} PIXELFORMATDESCRIPTOR,*PPIXELFORMATDESCRIPTOR,*LPPIXELFORMATDESCRIPTOR;
-typedef struct tagMETAFILEPICT {
-	LONG mm;
-	LONG xExt;
-	LONG yExt;
-	HMETAFILE hMF;
-} METAFILEPICT,*LPMETAFILEPICT;
-typedef struct tagLOCALESIGNATURE {
-	DWORD lsUsb[4];
-	DWORD lsCsbDefault[2];
-	DWORD lsCsbSupported[2];
-} LOCALESIGNATURE,*PLOCALESIGNATURE,*LPLOCALESIGNATURE;
-typedef LONG LCSTYPE;
-#pragma pack(push,4)
-typedef struct tagNEWTEXTMETRICA {
-	LONG tmHeight;
-	LONG tmAscent;
-	LONG tmDescent;
-	LONG tmInternalLeading;
-	LONG tmExternalLeading;
-	LONG tmAveCharWidth;
-	LONG tmMaxCharWidth;
-	LONG tmWeight;
-	LONG tmOverhang;
-	LONG tmDigitizedAspectX;
-	LONG tmDigitizedAspectY;
-	BYTE tmFirstChar;
-	BYTE tmLastChar;
-	BYTE tmDefaultChar;
-	BYTE tmBreakChar;
-	BYTE tmItalic;
-	BYTE tmUnderlined;
-	BYTE tmStruckOut;
-	BYTE tmPitchAndFamily;
-	BYTE tmCharSet;
-	DWORD ntmFlags;
-	UINT ntmSizeEM;
-	UINT ntmCellHeight;
-	UINT ntmAvgWidth;
-} NEWTEXTMETRICA,*PNEWTEXTMETRICA,*LPNEWTEXTMETRICA;
-typedef struct tagNEWTEXTMETRICW {
-	LONG tmHeight;
-	LONG tmAscent;
-	LONG tmDescent;
-	LONG tmInternalLeading;
-	LONG tmExternalLeading;
-	LONG tmAveCharWidth;
-	LONG tmMaxCharWidth;
-	LONG tmWeight;
-	LONG tmOverhang;
-	LONG tmDigitizedAspectX;
-	LONG tmDigitizedAspectY;
-	WCHAR tmFirstChar;
-	WCHAR tmLastChar;
-	WCHAR tmDefaultChar;
-	WCHAR tmBreakChar;
-	BYTE tmItalic;
-	BYTE tmUnderlined;
-	BYTE tmStruckOut;
-	BYTE tmPitchAndFamily;
-	BYTE tmCharSet;
-	DWORD ntmFlags;
-	UINT ntmSizeEM;
-	UINT ntmCellHeight;
-	UINT ntmAvgWidth;
-} NEWTEXTMETRICW,*PNEWTEXTMETRICW,*LPNEWTEXTMETRICW;
-#pragma pack(pop)
-typedef struct tagNEWTEXTMETRICEXA {
-	NEWTEXTMETRICA ntmTm;
-	FONTSIGNATURE ntmFontSig;
-} NEWTEXTMETRICEXA;
-typedef struct tagNEWTEXTMETRICEXW {
-	NEWTEXTMETRICW ntmTm;
-	FONTSIGNATURE ntmFontSig;
-} NEWTEXTMETRICEXW;
-typedef struct tagPELARRAY {
-	LONG paXCount;
-	LONG paYCount;
-	LONG paXExt;
-	LONG paYExt;
-	BYTE paRGBs;
-} PELARRAY,*PPELARRAY,*LPPELARRAY;
-typedef struct tagENUMLOGFONTA {
-	LOGFONTA elfLogFont;
-	BYTE elfFullName[LF_FULLFACESIZE];
-	BYTE elfStyle[LF_FACESIZE];
-} ENUMLOGFONTA,*LPENUMLOGFONTA;
-typedef struct tagENUMLOGFONTW {
-	LOGFONTW elfLogFont;
-	WCHAR elfFullName[LF_FULLFACESIZE];
-	WCHAR elfStyle[LF_FACESIZE];
-} ENUMLOGFONTW,*LPENUMLOGFONTW;
-typedef struct tagENUMLOGFONTEXA {
-	LOGFONTA elfLogFont;
-	BYTE elfFullName[LF_FULLFACESIZE];
-	BYTE elfStyle[LF_FACESIZE];
-	BYTE elfScript[LF_FACESIZE];
-} ENUMLOGFONTEXA,*LPENUMLOGFONTEXA;
-typedef struct tagENUMLOGFONTEXW {
-	LOGFONTW elfLogFont;
-	WCHAR elfFullName[LF_FULLFACESIZE];
-	BYTE elfStyle[LF_FACESIZE];
-	BYTE elfScript[LF_FACESIZE];
-} ENUMLOGFONTEXW,*LPENUMLOGFONTEXW;
-typedef struct tagPOINTFX {
-	FIXED x;
-	FIXED y;
-} POINTFX,*LPPOINTFX;
-typedef struct tagTTPOLYCURVE {
-	WORD wType;
-	WORD cpfx;
-	POINTFX apfx[1];
-} TTPOLYCURVE,*LPTTPOLYCURVE;
-typedef struct tagTTPOLYGONHEADER {
-	DWORD cb;
-	DWORD dwType;
-	POINTFX pfxStart;
-} TTPOLYGONHEADER,*LPTTPOLYGONHEADER;
-typedef struct _POINTFLOAT {
-	FLOAT x;
-	FLOAT y;
-} POINTFLOAT,*PPOINTFLOAT;
-typedef struct _GLYPHMETRICSFLOAT {
-	FLOAT gmfBlackBoxX;
-	FLOAT gmfBlackBoxY;
-	POINTFLOAT gmfptGlyphOrigin;
-	FLOAT gmfCellIncX;
-	FLOAT gmfCellIncY;
-} GLYPHMETRICSFLOAT,*PGLYPHMETRICSFLOAT,*LPGLYPHMETRICSFLOAT;
-typedef struct tagLAYERPLANEDESCRIPTOR {
-	WORD nSize;
-	WORD nVersion;
-	DWORD dwFlags;
-	BYTE iPixelType;
-	BYTE cColorBits;
-	BYTE cRedBits;
-	BYTE cRedShift;
-	BYTE cGreenBits;
-	BYTE cGreenShift;
-	BYTE cBlueBits;
-	BYTE cBlueShift;
-	BYTE cAlphaBits;
-	BYTE cAlphaShift;
-	BYTE cAccumBits;
-	BYTE cAccumRedBits;
-	BYTE cAccumGreenBits;
-	BYTE cAccumBlueBits;
-	BYTE cAccumAlphaBits;
-	BYTE cDepthBits;
-	BYTE cStencilBits;
-	BYTE cAuxBuffers;
-	BYTE iLayerPlane;
-	BYTE bReserved;
-	COLORREF crTransparent;
-} LAYERPLANEDESCRIPTOR,*PLAYERPLANEDESCRIPTOR,*LPLAYERPLANEDESCRIPTOR;
-typedef struct _BLENDFUNCTION {
-    BYTE BlendOp;
-    BYTE BlendFlags;
-    BYTE SourceConstantAlpha;
-    BYTE AlphaFormat; 
-} BLENDFUNCTION,*PBLENDFUNCTION,*LPBLENDFUNCTION; 
-#define MM_MAX_NUMAXES  16
-typedef struct _DESIGNVECTOR {
-	DWORD dvReserved;
-	DWORD dvNumAxes;
-	LONG dvValues[MM_MAX_NUMAXES];
-} DESIGNVECTOR, *PDESIGNVECTOR, FAR *LPDESIGNVECTOR;
-typedef USHORT COLOR16;
-typedef struct _TRIVERTEX {
-	LONG x;
-	LONG y;
-	COLOR16 Red;
-	COLOR16 Green;
-	COLOR16 Blue;
-	COLOR16 Alpha;
-} TRIVERTEX, *PTRIVERTEX, *LPTRIVERTEX;
-typedef struct _GRADIENT_TRIANGLE {
-	ULONG Vertex1;
-	ULONG Vertex2;
-	ULONG Vertex3;
-} GRADIENT_TRIANGLE,*PGRADIENT_TRIANGLE,*LPGRADIENT_TRIANGLE;
-typedef struct _GRADIENT_RECT {
-	ULONG UpperLeft;
-	ULONG LowerRight;
-}GRADIENT_RECT,*PGRADIENT_RECT,*LPGRADIENT_RECT;
-typedef struct _DISPLAY_DEVICEA {
-  DWORD cb;
-  CHAR DeviceName[32];
-  CHAR DeviceString[128];
-  DWORD StateFlags;
-  CHAR DeviceID[128];
-  CHAR DeviceKey[128];
-} DISPLAY_DEVICEA, *PDISPLAY_DEVICEA, *LPDISPLAY_DEVICEA;
-typedef struct _DISPLAY_DEVICEW {
-  DWORD cb;
-  WCHAR DeviceName[32];
-  WCHAR DeviceString[128];
-  DWORD StateFlags;
-  WCHAR DeviceID[128];
-  WCHAR DeviceKey[128];
-} DISPLAY_DEVICEW, *PDISPLAY_DEVICEW, *LPDISPLAY_DEVICEW;
-
-typedef BOOL (CALLBACK *ABORTPROC)(HDC,int);
-typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM);
-typedef int (CALLBACK *ENHMFENUMPROC)(HDC,HANDLETABLE*,ENHMETARECORD*,int,LPARAM);
-typedef int (CALLBACK *OLDFONTENUMPROCA)(const LOGFONTA*,const TEXTMETRICA*,DWORD,LPARAM);
-typedef int (CALLBACK *OLDFONTENUMPROCW)(const LOGFONTW*,const TEXTMETRICW*,DWORD,LPARAM);
-typedef OLDFONTENUMPROCA FONTENUMPROCA;
-typedef OLDFONTENUMPROCW FONTENUMPROCW;
-typedef int (CALLBACK *ICMENUMPROCA)(LPSTR,LPARAM);
-typedef int (CALLBACK *ICMENUMPROCW)(LPWSTR,LPARAM);
-typedef void (CALLBACK *GOBJENUMPROC)(LPVOID,LPARAM);
-typedef void (CALLBACK *LINEDDAPROC)(int,int,LPARAM);
-typedef UINT (CALLBACK *LPFNDEVMODE)(HWND,HMODULE,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,UINT);
-typedef DWORD (CALLBACK *LPFNDEVCAPS)(LPSTR,LPSTR,UINT,LPSTR,LPDEVMODEA);
-
-
-#define RGB(r,g,b)	((DWORD)(((BYTE)(r)|((WORD)(g)<<8))|(((DWORD)(BYTE)(b))<<16)))
-#define MAKEPOINTS(l) (*((POINTS*)&(l)))
-#define MAKEROP4(f,b)	(DWORD)((((b)<<8)&0xFF000000)|(f))
-#define PALETTEINDEX(i)	((0x01000000|(COLORREF)(WORD)(i)))
-#define PALETTERGB(r,g,b)	(0x02000000|RGB(r,g,b))
-int WINAPI AbortDoc(HDC);
-BOOL WINAPI AbortPath(HDC);
-int WINAPI AddFontResourceA(LPCSTR);
-int WINAPI AddFontResourceW(LPCWSTR);
-#if (_WIN32_WINNT >= 0x0500)
-HANDLE WINAPI AddFontMemResourceEx(PVOID,DWORD,PVOID,DWORD *);
-int WINAPI AddFontResourceExA(LPCSTR,DWORD,PVOID);
-int WINAPI AddFontResourceExW(LPCWSTR,DWORD,PVOID);
-#endif
-BOOL WINAPI AngleArc(HDC,int,int,DWORD,FLOAT,FLOAT);
-BOOL WINAPI AnimatePalette(HPALETTE,UINT,UINT,const PALETTEENTRY*);
-BOOL WINAPI Arc(HDC,int,int,int,int,int,int,int,int);
-BOOL WINAPI ArcTo(HDC,int,int,int,int,int,int,int,int);
-BOOL WINAPI BeginPath(HDC);
-BOOL WINAPI BitBlt(HDC,int,int,int,int,HDC,int,int,DWORD);
-BOOL WINAPI CancelDC(HDC);
-BOOL WINAPI CheckColorsInGamut(HDC,PVOID,PVOID,DWORD);
-BOOL WINAPI Chord(HDC,int,int,int,int,int,int,int,int);
-int WINAPI ChoosePixelFormat(HDC,CONST PIXELFORMATDESCRIPTOR*);
-HENHMETAFILE WINAPI CloseEnhMetaFile(HDC);
-BOOL WINAPI CloseFigure(HDC);
-HMETAFILE WINAPI CloseMetaFile(HDC);
-BOOL WINAPI ColorMatchToTarget(HDC,HDC,DWORD);
-int WINAPI CombineRgn(HRGN,HRGN,HRGN,int);
-BOOL WINAPI CombineTransform(LPXFORM,const XFORM*,const XFORM*);
-HENHMETAFILE WINAPI CopyEnhMetaFileA(HENHMETAFILE,LPCSTR);
-HENHMETAFILE WINAPI CopyEnhMetaFileW(HENHMETAFILE,LPCWSTR);
-HMETAFILE WINAPI CopyMetaFileA(HMETAFILE,LPCSTR);
-HMETAFILE WINAPI CopyMetaFileW(HMETAFILE,LPCWSTR);
-HBITMAP WINAPI CreateBitmap(int,int,UINT,UINT,PCVOID);
-HBITMAP WINAPI CreateBitmapIndirect(const BITMAP*);
-HBRUSH WINAPI CreateBrushIndirect(const LOGBRUSH*);
-HCOLORSPACE WINAPI CreateColorSpaceA(LPLOGCOLORSPACEA);
-HCOLORSPACE WINAPI CreateColorSpaceW(LPLOGCOLORSPACEW);
-HBITMAP WINAPI CreateCompatibleBitmap(HDC,int,int);
-HDC WINAPI CreateCompatibleDC(HDC);
-HDC WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
-HDC WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
-HBITMAP WINAPI CreateDIBitmap(HDC,const BITMAPINFOHEADER*,DWORD,PCVOID,const BITMAPINFO*,UINT);
-HBRUSH WINAPI CreateDIBPatternBrush(HGLOBAL,UINT);
-HBRUSH WINAPI CreateDIBPatternBrushPt(PCVOID,UINT);
-HBITMAP WINAPI CreateDIBSection(HDC,const BITMAPINFO*,UINT,void**,HANDLE,DWORD);
-HBITMAP WINAPI CreateDiscardableBitmap(HDC,int,int);
-HRGN WINAPI CreateEllipticRgn(int,int,int,int);
-HRGN WINAPI CreateEllipticRgnIndirect(LPCRECT);
-HDC WINAPI CreateEnhMetaFileA(HDC,LPCSTR,LPCRECT,LPCSTR);
-HDC WINAPI CreateEnhMetaFileW(HDC,LPCWSTR,LPCRECT,LPCWSTR);
-HFONT WINAPI CreateFontA(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCSTR);
-HFONT WINAPI CreateFontW(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR);
-HFONT WINAPI CreateFontIndirectA(const LOGFONTA*);
-HFONT WINAPI CreateFontIndirectW(const LOGFONTW*);
-HPALETTE WINAPI CreateHalftonePalette(HDC);
-HBRUSH WINAPI CreateHatchBrush(int,COLORREF);
-HDC WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*);
-HDC WINAPI CreateICW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*);
-HDC WINAPI CreateMetaFileA(LPCSTR);
-HDC WINAPI CreateMetaFileW(LPCWSTR);
-HPALETTE WINAPI CreatePalette(const LOGPALETTE*);
-HBRUSH WINAPI CreatePatternBrush(HBITMAP);
-HPEN WINAPI CreatePen(int,int,COLORREF);
-HPEN WINAPI CreatePenIndirect(const LOGPEN*);
-HRGN WINAPI CreatePolygonRgn(const POINT*,int,int);
-HRGN WINAPI CreatePolyPolygonRgn(const POINT*,const INT*,int,int);
-HRGN WINAPI CreateRectRgn(int,int,int,int);
-HRGN WINAPI CreateRectRgnIndirect(LPCRECT);
-HRGN WINAPI CreateRoundRectRgn(int,int,int,int,int,int);
-BOOL WINAPI CreateScalableFontResourceA(DWORD,LPCSTR,LPCSTR,LPCSTR);
-BOOL WINAPI CreateScalableFontResourceW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR);
-HBRUSH WINAPI CreateSolidBrush(COLORREF);
-BOOL WINAPI DeleteColorSpace(HCOLORSPACE);
-BOOL WINAPI DeleteDC(HDC);
-BOOL WINAPI DeleteEnhMetaFile(HENHMETAFILE);
-BOOL WINAPI DeleteMetaFile(HMETAFILE);
-BOOL WINAPI DeleteObject(HGDIOBJ);
-int WINAPI DescribePixelFormat(HDC,int,UINT,LPPIXELFORMATDESCRIPTOR);
-DWORD WINAPI DeviceCapabilitiesA(LPCSTR,LPCSTR,WORD,LPSTR,const DEVMODEA*);
-DWORD WINAPI DeviceCapabilitiesW(LPCWSTR,LPCWSTR,WORD,LPWSTR,const DEVMODEW*);
-BOOL WINAPI DPtoLP(HDC,LPPOINT,int);
-int WINAPI DrawEscape(HDC,int,int,LPCSTR);
-BOOL WINAPI Ellipse(HDC,int,int,int,int);
-int WINAPI EndDoc(HDC);
-int WINAPI EndPage(HDC);
-BOOL WINAPI EndPath(HDC);
-BOOL WINAPI EnumEnhMetaFile(HDC,HENHMETAFILE,ENHMFENUMPROC,PVOID,LPCRECT);
-int WINAPI EnumFontFamiliesA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
-int WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
-int WINAPI EnumFontFamiliesExA(HDC,PLOGFONTA,FONTENUMPROCA,LPARAM,DWORD);
-int WINAPI EnumFontFamiliesExW(HDC,PLOGFONTW,FONTENUMPROCW,LPARAM,DWORD);
-int WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM);
-int WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM);
-int WINAPI EnumICMProfilesA(HDC,ICMENUMPROCA,LPARAM);
-int WINAPI EnumICMProfilesW(HDC,ICMENUMPROCW,LPARAM);
-BOOL WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM);
-int WINAPI EnumObjects(HDC,int,GOBJENUMPROC,LPARAM);
-BOOL WINAPI EqualRgn(HRGN,HRGN);
-int WINAPI Escape(HDC,int,int,LPCSTR,PVOID);
-int WINAPI ExcludeClipRect(HDC,int,int,int,int);
-int WINAPI ExcludeUpdateRgn(HDC,HWND);
-HPEN WINAPI ExtCreatePen(DWORD,DWORD,const LOGBRUSH*,DWORD,const DWORD*);
-HRGN WINAPI ExtCreateRegion(const XFORM*,DWORD,const RGNDATA*);
-int WINAPI ExtEscape(HDC,int,int,LPCSTR,int,LPSTR);
-BOOL WINAPI ExtFloodFill(HDC,int,int,COLORREF,UINT);
-int WINAPI ExtSelectClipRgn(HDC,HRGN,int);
-BOOL WINAPI ExtTextOutA(HDC,int,int,UINT,LPCRECT,LPCSTR,UINT,const INT*);
-BOOL WINAPI ExtTextOutW(HDC,int,int,UINT,LPCRECT,LPCWSTR,UINT,const INT*);
-BOOL WINAPI FillPath(HDC);
-int WINAPI FillRect(HDC,LPCRECT,HBRUSH);
-int WINAPI FillRgn(HDC,HRGN,HBRUSH);
-BOOL WINAPI FixBrushOrgEx(HDC,int,int,LPPOINT);
-BOOL WINAPI FlattenPath(HDC);
-BOOL WINAPI FloodFill(HDC,int,int,COLORREF);
-BOOL WINAPI GdiComment(HDC,UINT,const BYTE*);
-BOOL WINAPI GdiFlush(void);
-DWORD WINAPI GdiGetBatchLimit(void);
-DWORD WINAPI GdiSetBatchLimit(DWORD);
-#define GetCValue(cmyk) ((BYTE)(cmyk))
-#define GetMValue(cmyk) ((BYTE)((cmyk)>> 8))
-#define GetYValue(cmyk) ((BYTE)((cmyk)>>16))
-#define GetKValue(cmyk) ((BYTE)((cmyk)>>24))
-#define CMYK(c,m,y,k) ((COLORREF)((((BYTE)(c)|((WORD)((BYTE)(m))<<8))|(((DWORD)(BYTE)(y))<<16))|(((DWORD)(BYTE)(k))<<24)))
-#define GetRValue(c) ((BYTE)(c))
-#define GetGValue(c) ((BYTE)(((WORD)(c))>>8))
-#define GetBValue(c) ((BYTE)((c)>>16))
-int WINAPI GetArcDirection(HDC);
-BOOL WINAPI GetAspectRatioFilterEx(HDC,LPSIZE);
-LONG WINAPI GetBitmapBits(HBITMAP,LONG,PVOID);
-BOOL WINAPI GetBitmapDimensionEx(HBITMAP,LPSIZE);
-COLORREF WINAPI GetBkColor(HDC);
-int WINAPI GetBkMode(HDC);
-UINT WINAPI GetBoundsRect(HDC,LPRECT,UINT);
-BOOL WINAPI GetBrushOrgEx(HDC,LPPOINT);
-BOOL WINAPI GetCharABCWidthsA(HDC,UINT,UINT,LPABC);
-BOOL WINAPI GetCharABCWidthsW(HDC,UINT,UINT,LPABC);
-BOOL WINAPI GetCharABCWidthsFloatA(HDC,UINT,UINT,LPABCFLOAT);
-BOOL WINAPI GetCharABCWidthsFloatW(HDC,UINT,UINT,LPABCFLOAT);
-DWORD WINAPI GetCharacterPlacementA(HDC,LPCSTR,int,int,LPGCP_RESULTSA,DWORD);
-DWORD WINAPI GetCharacterPlacementW(HDC,LPCWSTR,int,int,LPGCP_RESULTSW,DWORD);
-BOOL WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT);
-BOOL WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT);
-BOOL WINAPI GetCharWidthA(HDC,UINT,UINT,LPINT);
-BOOL WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT);
-BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT);
-BOOL WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT);
-int WINAPI GetClipBox(HDC,LPRECT);
-int WINAPI GetClipRgn(HDC,HRGN);
-BOOL WINAPI GetColorAdjustment(HDC,LPCOLORADJUSTMENT);
-HANDLE WINAPI GetColorSpace(HDC);
-HGDIOBJ WINAPI GetCurrentObject(HDC,UINT);
-BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT);
-HCURSOR WINAPI GetCursor(void);
-BOOL WINAPI GetDCOrgEx(HDC,LPPOINT);
-int WINAPI GetDeviceCaps(HDC,int);
-BOOL WINAPI GetDeviceGammaRamp(HDC,PVOID);
-UINT WINAPI GetDIBColorTable(HDC,UINT,UINT,RGBQUAD*);
-int WINAPI GetDIBits(HDC,HBITMAP,UINT,UINT,PVOID,LPBITMAPINFO,UINT);
-HENHMETAFILE WINAPI GetEnhMetaFileA(LPCSTR);
-HENHMETAFILE WINAPI GetEnhMetaFileW(LPCWSTR);
-UINT WINAPI GetEnhMetaFileBits(HENHMETAFILE,UINT,LPBYTE);
-UINT WINAPI GetEnhMetaFileDescriptionA(HENHMETAFILE,UINT,LPSTR);
-UINT WINAPI GetEnhMetaFileDescriptionW(HENHMETAFILE,UINT,LPWSTR);
-UINT WINAPI GetEnhMetaFileHeader(HENHMETAFILE,UINT,LPENHMETAHEADER);
-UINT WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE,UINT,LPPALETTEENTRY);
-UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,DWORD,CONST PIXELFORMATDESCRIPTOR*);
-DWORD WINAPI GetFontData(HDC,DWORD,DWORD,PVOID,DWORD);
-DWORD WINAPI GetFontLanguageInfo(HDC);
-DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*);
-DWORD WINAPI GetGlyphOutlineW(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*);
-int WINAPI GetGraphicsMode(HDC);
-BOOL WINAPI GetICMProfileA(HDC,DWORD,LPSTR);
-BOOL WINAPI GetICMProfileW(HDC,DWORD,LPWSTR);
-DWORD WINAPI GetKerningPairsA(HDC,DWORD,LPKERNINGPAIR);
-DWORD WINAPI GetKerningPairsW(HDC,DWORD,LPKERNINGPAIR);
-BOOL WINAPI GetLogColorSpaceA(HCOLORSPACE,LPLOGCOLORSPACEA,DWORD);
-BOOL WINAPI GetLogColorSpaceW(HCOLORSPACE,LPLOGCOLORSPACEW,DWORD);
-int WINAPI GetMapMode(HDC);
-HMETAFILE WINAPI GetMetaFileA(LPCSTR);
-HMETAFILE WINAPI GetMetaFileW(LPCWSTR);
-UINT WINAPI GetMetaFileBitsEx(HMETAFILE,UINT,PVOID);
-int WINAPI GetMetaRgn(HDC,HRGN);
-BOOL WINAPI GetMiterLimit(HDC,PFLOAT);
-COLORREF WINAPI GetNearestColor(HDC,COLORREF);
-UINT WINAPI GetNearestPaletteIndex(HPALETTE,COLORREF);
-int WINAPI GetObjectA(HGDIOBJ,int,PVOID);
-int WINAPI GetObjectW(HGDIOBJ,int,PVOID);
-DWORD WINAPI GetObjectType(HGDIOBJ);
-UINT WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA);
-UINT WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW);
-UINT WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY);
-int WINAPI GetPath(HDC,LPPOINT,PBYTE,int);
-COLORREF WINAPI GetPixel(HDC,int,int);
-int WINAPI GetPixelFormat(HDC);
-int WINAPI GetPolyFillMode(HDC);
-BOOL WINAPI GetRasterizerCaps(LPRASTERIZER_STATUS,UINT);
-int WINAPI GetRandomRgn (HDC,HRGN,INT);
-DWORD WINAPI GetRegionData(HRGN,DWORD,LPRGNDATA);
-int WINAPI GetRgnBox(HRGN,LPRECT);
-int WINAPI GetROP2(HDC);
-HGDIOBJ WINAPI GetStockObject(int);
-int WINAPI GetStretchBltMode(HDC);
-UINT WINAPI GetSystemPaletteEntries(HDC,UINT,UINT,LPPALETTEENTRY);
-UINT WINAPI GetSystemPaletteUse(HDC);
-UINT WINAPI GetTextAlign(HDC);
-int WINAPI GetTextCharacterExtra(HDC);
-int WINAPI GetTextCharset(HDC);
-int WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD);
-COLORREF WINAPI GetTextColor(HDC);
-BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE);
-BOOL WINAPI GetTextExtentExPointW( HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE );
-BOOL WINAPI GetTextExtentPointA(HDC,LPCSTR,int,LPSIZE);
-BOOL WINAPI GetTextExtentPointW(HDC,LPCWSTR,int,LPSIZE);
-BOOL WINAPI GetTextExtentPoint32A(HDC,LPCSTR,int,LPSIZE);
-BOOL WINAPI GetTextExtentPoint32W( HDC,LPCWSTR,int,LPSIZE);
-int WINAPI GetTextFaceA(HDC,int,LPSTR);
-int WINAPI GetTextFaceW(HDC,int,LPWSTR);
-BOOL WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA);
-BOOL WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW);
-BOOL WINAPI GetViewportExtEx(HDC,LPSIZE);
-BOOL WINAPI GetViewportOrgEx(HDC,LPPOINT);
-BOOL WINAPI GetWindowExtEx(HDC,LPSIZE);
-BOOL WINAPI GetWindowOrgEx(HDC,LPPOINT);
-UINT WINAPI GetWinMetaFileBits(HENHMETAFILE,UINT,LPBYTE,INT,HDC);
-BOOL WINAPI GetWorldTransform(HDC,LPXFORM);
-int WINAPI IntersectClipRect(HDC,int,int,int,int);
-BOOL WINAPI InvertRgn(HDC,HRGN);
-BOOL WINAPI LineDDA(int,int,int,int,LINEDDAPROC,LPARAM);
-BOOL WINAPI LineTo(HDC,int,int);
-BOOL WINAPI LPtoDP(HDC,LPPOINT,int);
-BOOL WINAPI MaskBlt(HDC,int,int,int,int,HDC,int,int,HBITMAP,int,int,DWORD);
-BOOL WINAPI ModifyWorldTransform(HDC,const XFORM*,DWORD);
-BOOL WINAPI MoveToEx(HDC,int,int,LPPOINT);
-int WINAPI OffsetClipRgn(HDC,int,int);
-int WINAPI OffsetRgn(HRGN,int,int);
-BOOL WINAPI OffsetViewportOrgEx(HDC,int,int,LPPOINT);
-BOOL WINAPI OffsetWindowOrgEx(HDC,int,int,LPPOINT);
-BOOL WINAPI PaintRgn(HDC,HRGN);
-BOOL WINAPI PatBlt(HDC,int,int,int,int,DWORD);
-HRGN WINAPI PathToRegion(HDC);
-BOOL WINAPI Pie(HDC,int,int,int,int,int,int,int,int);
-BOOL WINAPI PlayEnhMetaFile(HDC,HENHMETAFILE,LPCRECT);
-BOOL WINAPI PlayEnhMetaFileRecord(HDC,LPHANDLETABLE,const ENHMETARECORD*,UINT);
-BOOL WINAPI PlayMetaFile(HDC,HMETAFILE);
-BOOL WINAPI PlayMetaFileRecord(HDC,LPHANDLETABLE,LPMETARECORD,UINT);
-BOOL WINAPI PlgBlt(HDC,const POINT*,HDC,int,int,int,int,HBITMAP,int,int);
-BOOL WINAPI PolyBezier(HDC,const POINT*,DWORD);
-BOOL WINAPI PolyBezierTo(HDC,const POINT*,DWORD);
-BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,int);
-BOOL WINAPI Polygon(HDC,const POINT*,int);
-BOOL WINAPI Polyline(HDC,const POINT*,int);
-BOOL WINAPI PolylineTo(HDC,const POINT*,DWORD);
-BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,int);
-BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD);
-BOOL WINAPI PolyTextOutA(HDC,const POLYTEXTA*,int);
-BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,int);
-BOOL WINAPI PtInRegion(HRGN,int,int);
-BOOL WINAPI PtVisible(HDC,int,int);
-UINT WINAPI RealizePalette(HDC);
-BOOL WINAPI Rectangle(HDC,int,int,int,int);
-BOOL WINAPI RectInRegion(HRGN,LPCRECT);
-BOOL WINAPI RectVisible(HDC,LPCRECT);
-BOOL WINAPI RemoveFontResourceA(LPCSTR);
-BOOL WINAPI RemoveFontResourceW(LPCWSTR);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI RemoveFontMemResourceEx(HANDLE);
-BOOL WINAPI RemoveFontResourceExA(LPCSTR,DWORD,PVOID);
-BOOL WINAPI RemoveFontResourceExW(LPCWSTR,DWORD,PVOID);
-#endif
-HDC WINAPI ResetDCA(HDC,const DEVMODEA*);
-HDC WINAPI ResetDCW(HDC,const DEVMODEW*);
-BOOL WINAPI ResizePalette(HPALETTE,UINT);
-BOOL WINAPI RestoreDC(HDC,int);
-BOOL WINAPI RoundRect(HDC,int,int,int,int,int,int);
-int WINAPI SaveDC(HDC);
-BOOL WINAPI ScaleViewportExtEx(HDC,int,int,int,int,LPSIZE);
-BOOL WINAPI ScaleWindowExtEx(HDC,int,int,int,int,LPSIZE);
-BOOL WINAPI SelectClipPath(HDC,int);
-int WINAPI SelectClipRgn(HDC,HRGN);
-HGDIOBJ WINAPI SelectObject(HDC,HGDIOBJ);
-HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL);
-int WINAPI SetAbortProc(HDC,ABORTPROC);
-int WINAPI SetArcDirection(HDC,int);
-LONG WINAPI SetBitmapBits(HBITMAP,DWORD,PCVOID);
-BOOL WINAPI SetBitmapDimensionEx(HBITMAP,int,int,LPSIZE);
-COLORREF WINAPI SetBkColor(HDC,COLORREF);
-int WINAPI SetBkMode(HDC,int);
-UINT WINAPI SetBoundsRect(HDC,LPCRECT,UINT);
-BOOL WINAPI SetBrushOrgEx(HDC,int,int,LPPOINT);
-BOOL WINAPI SetColorAdjustment(HDC,const COLORADJUSTMENT*);
-BOOL WINAPI SetColorSpace(HDC,HCOLORSPACE);
-#if (_WIN32_WINNT >= 0x0500)
-COLORREF WINAPI SetDCBrushColor(HDC,COLORREF);
-COLORREF WINAPI SetDCPenColor(HDC,COLORREF);
-#endif
-BOOL WINAPI SetDeviceGammaRamp(HDC,PVOID);
-UINT WINAPI SetDIBColorTable(HDC,UINT,UINT,const RGBQUAD*);
-int WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,PCVOID,const BITMAPINFO*,UINT);
-int WINAPI SetDIBitsToDevice(HDC,int,int,DWORD,DWORD,int,int,UINT,UINT,PCVOID,const BITMAPINFO*,UINT);
-HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT,const BYTE*);
-int WINAPI SetGraphicsMode(HDC,int);
-int WINAPI SetICMMode(HDC,int);
-BOOL WINAPI SetICMProfileA(HDC,LPSTR);
-BOOL WINAPI SetICMProfileW(HDC,LPWSTR);
-int WINAPI SetMapMode(HDC,int);
-DWORD WINAPI SetMapperFlags(HDC,DWORD);
-HMETAFILE WINAPI SetMetaFileBitsEx(UINT,const BYTE *);
-int WINAPI SetMetaRgn(HDC);
-BOOL WINAPI SetMiterLimit(HDC,FLOAT,PFLOAT);
-UINT WINAPI SetPaletteEntries(HPALETTE,UINT,UINT,const PALETTEENTRY*);
-COLORREF WINAPI SetPixel(HDC,int,int,COLORREF);
-BOOL WINAPI SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR*);
-BOOL WINAPI SetPixelV(HDC,int,int,COLORREF);
-int WINAPI SetPolyFillMode(HDC,int);
-BOOL WINAPI SetRectRgn(HRGN,int,int,int,int);
-int WINAPI SetROP2(HDC,int);
-int WINAPI SetStretchBltMode(HDC,int);
-UINT WINAPI SetSystemPaletteUse(HDC,UINT);
-UINT WINAPI SetTextAlign(HDC,UINT);
-int WINAPI SetTextCharacterExtra(HDC,int);
-COLORREF WINAPI SetTextColor(HDC,COLORREF);
-BOOL WINAPI SetTextJustification(HDC,int,int);
-BOOL WINAPI SetViewportExtEx(HDC,int,int,LPSIZE);
-BOOL WINAPI SetViewportOrgEx(HDC,int,int,LPPOINT);
-BOOL WINAPI SetWindowExtEx(HDC,int,int,LPSIZE);
-BOOL WINAPI SetWindowOrgEx(HDC,int,int,LPPOINT);
-HENHMETAFILE WINAPI SetWinMetaFileBits(UINT,const BYTE*,HDC,const METAFILEPICT*);
-BOOL WINAPI SetWorldTransform(HDC,const XFORM *);
-int WINAPI StartDocA(HDC,const DOCINFOA*);
-int WINAPI StartDocW(HDC,const DOCINFOW*);
-int WINAPI StartPage(HDC);
-BOOL WINAPI StretchBlt(HDC,int,int,int,int,HDC,int,int,int,int,DWORD);
-int WINAPI StretchDIBits(HDC,int,int,int,int,int,int,int,int,const VOID *,const BITMAPINFO *,UINT,DWORD);
-BOOL WINAPI StrokeAndFillPath(HDC);
-BOOL WINAPI StrokePath(HDC);
-BOOL WINAPI SwapBuffers(HDC);
-BOOL WINAPI TextOutA(HDC,int,int,LPCSTR,int);
-BOOL WINAPI TextOutW(HDC,int,int,LPCWSTR,int);
-BOOL WINAPI TranslateCharsetInfo(PDWORD,LPCHARSETINFO,DWORD);
-BOOL WINAPI UnrealizeObject(HGDIOBJ);
-BOOL WINAPI UpdateColors(HDC);
-BOOL WINAPI UpdateICMRegKeyA(DWORD,DWORD,LPSTR,UINT);
-BOOL WINAPI UpdateICMRegKeyW(DWORD,DWORD,LPWSTR,UINT);
-BOOL WINAPI WidenPath(HDC);
-BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT);
-HGLRC WINAPI wglCreateContext(HDC);
-HGLRC WINAPI wglCreateLayerContext(HDC,int);
-BOOL WINAPI wglDeleteContext(HGLRC);
-BOOL WINAPI wglDescribeLayerPlane(HDC,int,int,UINT,LPLAYERPLANEDESCRIPTOR);
-HGLRC WINAPI wglGetCurrentContext(void);
-HDC WINAPI wglGetCurrentDC(void);
-int WINAPI wglGetLayerPaletteEntries(HDC,int,int,int,COLORREF*);
-PROC WINAPI wglGetProcAddress(LPCSTR);
-BOOL WINAPI wglMakeCurrent(HDC,HGLRC);
-BOOL WINAPI wglRealizeLayerPalette(HDC,int,BOOL);
-int WINAPI wglSetLayerPaletteEntries(HDC,int,int,int,const COLORREF*);
-BOOL WINAPI wglShareLists(HGLRC,HGLRC);
-BOOL WINAPI wglSwapLayerBuffers(HDC,UINT);
-BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD);
-BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD);
-BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
-BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
-
-#if (WINVER>= 0x0500)
-BOOL WINAPI AlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
-BOOL WINAPI GradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG);
-BOOL WINAPI TransparentBlt(HDC,int,int,int,int,HDC,int,int,int,int,UINT);
-#endif
-
-#ifdef UNICODE
-typedef WCHAR BCHAR;
-typedef DOCINFOW DOCINFO, *LPDOCINFO;
-typedef LOGFONTW LOGFONT,*PLOGFONT,*LPLOGFONT;
-typedef TEXTMETRICW TEXTMETRIC,*PTEXTMETRIC,*LPTEXTMETRIC;
-#define ICMENUMPROC ICMENUMPROCW
-#define FONTENUMPROC FONTENUMPROCW
-typedef DEVMODEW DEVMODE,*PDEVMODE,*LPDEVMODE;
-typedef EXTLOGFONTW EXTLOGFONT,*PEXTLOGFONT,*LPEXTLOGFONT;
-typedef GCP_RESULTSW GCP_RESULTS,*LPGCP_RESULTS;
-typedef OUTLINETEXTMETRICW OUTLINETEXTMETRIC,*POUTLINETEXTMETRIC,*LPOUTLINETEXTMETRIC;
-typedef POLYTEXTW POLYTEXT;
-typedef LOGCOLORSPACEW LOGCOLORSPACE,*LPLOGCOLORSPACE;
-typedef NEWTEXTMETRICW NEWTEXTMETRIC,*PNEWTEXTMETRIC,*LPNEWTEXTMETRIC;
-typedef NEWTEXTMETRICEXW NEWTEXTMETRICEX;
-typedef ENUMLOGFONTW ENUMLOGFONT,*LPENUMLOGFONT;
-typedef ENUMLOGFONTEXW ENUMLOGFONTEX,*LPENUMLOGFONTEX;
-typedef DISPLAY_DEVICEW DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
-#define AddFontResource AddFontResourceW
-#if (_WIN32_WINNT >= 0x0500)
-#define AddFontResourceEx AddFontResourceExW
-#endif
-#define CopyEnhMetaFile CopyEnhMetaFileW
-#define CopyMetaFile CopyMetaFileW
-#define CreateDC CreateDCW
-#define CreateEnhMetaFile CreateEnhMetaFileW
-#define CreateFont CreateFontW
-#define CreateFontIndirect CreateFontIndirectW
-#define CreateIC CreateICW
-#define CreateMetaFile CreateMetaFileW
-#define CreateScalableFontResource CreateScalableFontResourceW
-#define DeviceCapabilities DeviceCapabilitiesW
-#define EnumFontFamilies EnumFontFamiliesW
-#define EnumFontFamiliesEx EnumFontFamiliesExW
-#define EnumFonts EnumFontsW
-#define EnumICMProfiles EnumICMProfilesW
-#define ExtTextOut ExtTextOutW
-#define GetCharABCWidthsFloat GetCharABCWidthsFloatW
-#define GetCharABCWidths GetCharABCWidthsW
-#define GetCharacterPlacement GetCharacterPlacementW
-#define GetCharWidth32 GetCharWidth32W
-#define GetCharWidthFloat GetCharWidthFloatW
-#define GetCharWidth GetCharWidthW
-#define GetEnhMetaFile GetEnhMetaFileW
-#define GetEnhMetaFileDescription GetEnhMetaFileDescriptionW
-#define GetGlyphOutline GetGlyphOutlineW
-#define GetICMProfile GetICMProfileW
-#define GetKerningPairs GetKerningPairsW
-#define GetLogColorSpace GetLogColorSpaceW
-#define GetMetaFile GetMetaFileW
-#define GetObject GetObjectW
-#define GetOutlineTextMetrics GetOutlineTextMetricsW
-#define GetTextExtentPoint GetTextExtentPointW
-#define GetTextExtentExPoint GetTextExtentExPointW
-#define GetTextExtentPoint32 GetTextExtentPoint32W
-#define GetTextFace GetTextFaceW
-#define GetTextMetrics GetTextMetricsW
-#define PolyTextOut PolyTextOutW
-#define RemoveFontResource RemoveFontResourceW
-#if (_WIN32_WINNT >= 0x0500)
-#define RemoveFontResourceEx RemoveFontResourceExW
-#endif
-#define ResetDC ResetDCW
-#define SetICMProfile SetICMProfileW
-#define StartDoc StartDocW
-#define TextOut TextOutW
-#define UpdateICMRegKey UpdateICMRegKeyW
-#define wglUseFontBitmaps wglUseFontBitmapsW
-#define wglUseFontOutlines wglUseFontOutlinesW
-#else
-typedef BYTE BCHAR;
-typedef DOCINFOA DOCINFO, *LPDOCINFO;
-typedef LOGFONTA LOGFONT,*PLOGFONT,*LPLOGFONT;
-typedef TEXTMETRICA TEXTMETRIC,*PTEXTMETRIC,*LPTEXTMETRIC;
-#define ICMENUMPROC ICMENUMPROCA
-#define FONTENUMPROC FONTENUMPROCA
-typedef DEVMODEA DEVMODE,*PDEVMODE,*LPDEVMODE;
-typedef EXTLOGFONTA EXTLOGFONT,*PEXTLOGFONT,*LPEXTLOGFONT;
-typedef GCP_RESULTSA GCP_RESULTS,*LPGCP_RESULTS;
-typedef OUTLINETEXTMETRICA OUTLINETEXTMETRIC,*POUTLINETEXTMETRIC,*LPOUTLINETEXTMETRIC;
-typedef POLYTEXTA POLYTEXT;
-typedef LOGCOLORSPACEA LOGCOLORSPACE,*LPLOGCOLORSPACE;
-typedef NEWTEXTMETRICA NEWTEXTMETRIC,*PNEWTEXTMETRIC,*LPNEWTEXTMETRIC;
-typedef NEWTEXTMETRICEXA NEWTEXTMETRICEX;
-typedef ENUMLOGFONTA ENUMLOGFONT,*LPENUMLOGFONT;
-typedef ENUMLOGFONTEXA ENUMLOGFONTEX,*LPENUMLOGFONTEX;
-typedef DISPLAY_DEVICEA DISPLAY_DEVICE, *PDISPLAY_DEVICE, *LPDISPLAY_DEVICE;
-#define AddFontResource AddFontResourceA
-#if (_WIN32_WINNT >= 0x0500)
-#define AddFontResourceEx AddFontResourceExA
-#endif
-#define CopyEnhMetaFile CopyEnhMetaFileA
-#define CopyMetaFile CopyMetaFileA
-#define CreateDC CreateDCA
-#define CreateEnhMetaFile CreateEnhMetaFileA
-#define CreateFont CreateFontA
-#define CreateFontIndirect CreateFontIndirectA
-#define CreateIC CreateICA
-#define CreateMetaFile CreateMetaFileA
-#define CreateScalableFontResource CreateScalableFontResourceA
-#define DeviceCapabilities DeviceCapabilitiesA
-#define EnumFontFamilies EnumFontFamiliesA
-#define EnumFontFamiliesEx EnumFontFamiliesExA
-#define EnumFonts EnumFontsA
-#define EnumICMProfiles EnumICMProfilesA
-#define ExtTextOut ExtTextOutA
-#define GetCharWidthFloat GetCharWidthFloatA
-#define GetCharWidth GetCharWidthA
-#define GetCharacterPlacement GetCharacterPlacementA
-#define GetCharABCWidths GetCharABCWidthsA
-#define GetCharABCWidthsFloat GetCharABCWidthsFloatA
-#define GetCharWidth32 GetCharWidth32A
-#define GetEnhMetaFile GetEnhMetaFileA
-#define GetEnhMetaFileDescription GetEnhMetaFileDescriptionA
-#define GetGlyphOutline GetGlyphOutlineA
-#define GetICMProfile GetICMProfileA
-#define GetKerningPairs GetKerningPairsA
-#define GetLogColorSpace GetLogColorSpaceA
-#define GetMetaFile GetMetaFileA
-#define GetObject GetObjectA
-#define GetOutlineTextMetrics GetOutlineTextMetricsA
-#define GetTextExtentPoint GetTextExtentPointA
-#define GetTextExtentExPoint GetTextExtentExPointA
-#define GetTextExtentPoint32 GetTextExtentPoint32A
-#define GetTextFace GetTextFaceA
-#define GetTextMetrics GetTextMetricsA
-#define PolyTextOut PolyTextOutA
-#define RemoveFontResource RemoveFontResourceA
-#if (_WIN32_WINNT >= 0x0500)
-#define RemoveFontResourceEx RemoveFontResourceExA
-#endif
-#define ResetDC ResetDCA
-#define SetICMProfile SetICMProfileA
-#define StartDoc StartDocA
-#define TextOut TextOutA
-#define UpdateICMRegKey UpdateICMRegKeyA
-#define wglUseFontBitmaps wglUseFontBitmapsA
-#define wglUseFontOutlines wglUseFontOutlinesA
-#endif
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/wininet.h b/winsup/w32api/include/wininet.h
deleted file mode 100644
index 1c3353423..000000000
--- a/winsup/w32api/include/wininet.h
+++ /dev/null
@@ -1,921 +0,0 @@
-#ifndef _WININET_H
-#define _WININET_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#include <windows.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define INTERNET_INVALID_PORT_NUMBER 0
-#define INTERNET_DEFAULT_FTP_PORT 21
-#define INTERNET_DEFAULT_GOPHER_PORT 70
-#define INTERNET_DEFAULT_HTTP_PORT 80
-#define INTERNET_DEFAULT_HTTPS_PORT 443
-#define INTERNET_DEFAULT_SOCKS_PORT 1080
-#define MAX_CACHE_ENTRY_INFO_SIZE 4096
-#define INTERNET_MAX_HOST_NAME_LENGTH 256
-#define INTERNET_MAX_USER_NAME_LENGTH 128
-#define INTERNET_MAX_PASSWORD_LENGTH 128
-#define INTERNET_MAX_PORT_NUMBER_LENGTH 5
-#define INTERNET_MAX_PORT_NUMBER_VALUE 65535
-#define INTERNET_MAX_PATH_LENGTH 2048
-#define INTERNET_MAX_SCHEME_LENGTH 32
-#define INTERNET_MAX_URL_LENGTH (INTERNET_MAX_SCHEME_LENGTH+sizeof("://")+INTERNET_MAX_PATH_LENGTH)
-#define INTERNET_KEEP_ALIVE_UNKNOWN ((DWORD)-1)
-#define INTERNET_KEEP_ALIVE_ENABLED 1
-#define INTERNET_KEEP_ALIVE_DISABLED 0
-#define INTERNET_REQFLAG_FROM_CACHE 1
-#define INTERNET_REQFLAG_ASYNC 2
-#define INTERNET_FLAG_RELOAD 0x80000000
-#define INTERNET_FLAG_RAW_DATA 0x40000000
-#define INTERNET_FLAG_EXISTING_CONNECT 0x20000000
-#define INTERNET_FLAG_ASYNC 0x10000000
-#define INTERNET_FLAG_PASSIVE 0x08000000
-#define INTERNET_FLAG_NO_CACHE_WRITE 0x04000000
-#define INTERNET_FLAG_DONT_CACHE INTERNET_FLAG_NO_CACHE_WRITE
-#define INTERNET_FLAG_MAKE_PERSISTENT 0x02000000
-#define INTERNET_FLAG_OFFLINE 0x1000000
-#define INTERNET_FLAG_SECURE 0x800000
-#define INTERNET_FLAG_KEEP_CONNECTION 0x400000
-#define INTERNET_FLAG_NO_AUTO_REDIRECT 0x200000
-#define INTERNET_FLAG_READ_PREFETCH 0x100000
-#define INTERNET_FLAG_NO_COOKIES 0x80000
-#define INTERNET_FLAG_NO_AUTH 0x40000
-#define INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP 0x8000
-#define INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS 0x4000
-#define INTERNET_FLAG_IGNORE_CERT_DATE_INVALID 0x2000
-#define INTERNET_FLAG_IGNORE_CERT_CN_INVALID 0x1000
-#define INTERNET_FLAG_MUST_CACHE_REQUEST 16
-#define INTERNET_FLAG_RESYNCHRONIZE 0x800
-#define INTERNET_FLAG_HYPERLINK 0x400
-#define INTERNET_FLAG_NO_UI 0x200
-#define INTERNET_FLAG_PRAGMA_NOCACHE 0x100
-#define INTERNET_FLAG_TRANSFER_ASCII FTP_TRANSFER_TYPE_ASCII
-#define INTERNET_FLAG_TRANSFER_BINARY FTP_TRANSFER_TYPE_BINARY
-#define SECURITY_INTERNET_MASK (INTERNET_FLAG_IGNORE_CERT_CN_INVALID|INTERNET_FLAG_IGNORE_CERT_DATE_INVALID|INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS|INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP)
-#define SECURITY_SET_MASK SECURITY_INTERNET_MASK
-#define INTERNET_FLAGS_MASK (INTERNET_FLAG_RELOAD|INTERNET_FLAG_RAW_DATA|INTERNET_FLAG_EXISTING_CONNECT|\
-INTERNET_FLAG_ASYNC|INTERNET_FLAG_PASSIVE|INTERNET_FLAG_NO_CACHE_WRITE|INTERNET_FLAG_MAKE_PERSISTENT|INTERNET_FLAG_OFFLINE|\
-INTERNET_FLAG_SECURE|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_NO_AUTO_REDIRECT|INTERNET_FLAG_READ_PREFETCH |\
-INTERNET_FLAG_NO_COOKIES|INTERNET_FLAG_NO_AUTH|SECURITY_INTERNET_MASK|INTERNET_FLAG_TRANSFER_ASCII|INTERNET_FLAG_TRANSFER_BINARY\
-|INTERNET_FLAG_RESYNCHRONIZE|INTERNET_FLAG_MUST_CACHE_REQUEST|INTERNET_FLAG_HYPERLINK|INTERNET_FLAG_NO_UI)
-#define INTERNET_OPTIONS_MASK (~INTERNET_FLAGS_MASK)
-#define INTERNET_NO_CALLBACK 0
-#define INTERNET_RFC1123_FORMAT 0
-#define INTERNET_RFC1123_BUFSIZE 30
-#define ICU_ESCAPE 0x80000000
-#define ICU_USERNAME 0x40000000
-#define ICU_NO_ENCODE 0x20000000
-#define ICU_DECODE 0x10000000
-#define ICU_NO_META 0x08000000
-#define ICU_ENCODE_SPACES_ONLY 0x04000000
-#define ICU_BROWSER_MODE 0x02000000
-#define INTERNET_OPEN_TYPE_PRECONFIG 0
-#define INTERNET_OPEN_TYPE_DIRECT 1
-#define INTERNET_OPEN_TYPE_PROXY 3
-#define PRE_CONFIG_INTERNET_ACCESS INTERNET_OPEN_TYPE_PRECONFIG
-#define LOCAL_INTERNET_ACCESS INTERNET_OPEN_TYPE_DIRECT
-#define GATEWAY_INTERNET_ACCESS 2
-#define CERN_PROXY_INTERNET_ACCESS INTERNET_OPEN_TYPE_PROXY
-#define ISO_GLOBAL 1
-#define ISO_REGISTRY 2
-#define ISO_VALID_FLAGS (ISO_GLOBAL | ISO_REGISTRY)
-#define INTERNET_OPTION_CALLBACK 1
-#define INTERNET_OPTION_CONNECT_TIMEOUT 2
-#define INTERNET_OPTION_CONNECT_RETRIES 3
-#define INTERNET_OPTION_CONNECT_BACKOFF 4
-#define INTERNET_OPTION_SEND_TIMEOUT 5
-#define INTERNET_OPTION_CONTROL_SEND_TIMEOUT INTERNET_OPTION_SEND_TIMEOUT
-#define INTERNET_OPTION_RECEIVE_TIMEOUT 6
-#define INTERNET_OPTION_CONTROL_RECEIVE_TIMEOUT INTERNET_OPTION_RECEIVE_TIMEOUT
-#define INTERNET_OPTION_DATA_SEND_TIMEOUT 7
-#define INTERNET_OPTION_DATA_RECEIVE_TIMEOUT 8
-#define INTERNET_OPTION_HANDLE_TYPE 9
-#define INTERNET_OPTION_CONTEXT_VALUE 10
-#define INTERNET_OPTION_LISTEN_TIMEOUT 11
-#define INTERNET_OPTION_READ_BUFFER_SIZE 12
-#define INTERNET_OPTION_WRITE_BUFFER_SIZE 13
-#define INTERNET_OPTION_ASYNC_ID 15
-#define INTERNET_OPTION_ASYNC_PRIORITY 16
-#define INTERNET_OPTION_PARENT_HANDLE 21
-#define INTERNET_OPTION_KEEP_CONNECTION 22
-#define INTERNET_OPTION_REQUEST_FLAGS 23
-#define INTERNET_OPTION_EXTENDED_ERROR 24
-#define INTERNET_OPTION_OFFLINE_MODE 26
-#define INTERNET_OPTION_CACHE_STREAM_HANDLE 27
-#define INTERNET_OPTION_USERNAME 28
-#define INTERNET_OPTION_PASSWORD 29
-#define INTERNET_OPTION_ASYNC 30
-#define INTERNET_OPTION_SECURITY_FLAGS 31
-#define INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT 32
-#define INTERNET_OPTION_DATAFILE_NAME 33
-#define INTERNET_OPTION_URL 34
-#define INTERNET_OPTION_SECURITY_CERTIFICATE 35
-#define INTERNET_OPTION_SECURITY_KEY_BITNESS 36
-#define INTERNET_OPTION_REFRESH 37
-#define INTERNET_OPTION_PROXY 38
-#define INTERNET_OPTION_SETTINGS_CHANGED 39
-#define INTERNET_OPTION_VERSION 40
-#define INTERNET_OPTION_USER_AGENT 41
-#define INTERNET_OPTION_END_BROWSER_SESSION 42
-#define INTERNET_OPTION_PROXY_USERNAME 43
-#define INTERNET_OPTION_PROXY_PASSWORD 44
-#define INTERNET_FIRST_OPTION INTERNET_OPTION_CALLBACK
-#define INTERNET_LAST_OPTION INTERNET_OPTION_USER_AGENT
-#define INTERNET_PRIORITY_FOREGROUND 1000
-#define INTERNET_HANDLE_TYPE_INTERNET 1
-#define INTERNET_HANDLE_TYPE_CONNECT_FTP 2
-#define INTERNET_HANDLE_TYPE_CONNECT_GOPHER 3
-#define INTERNET_HANDLE_TYPE_CONNECT_HTTP 4
-#define INTERNET_HANDLE_TYPE_FTP_FIND 5
-#define INTERNET_HANDLE_TYPE_FTP_FIND_HTML 6
-#define INTERNET_HANDLE_TYPE_FTP_FILE 7
-#define INTERNET_HANDLE_TYPE_FTP_FILE_HTML 8
-#define INTERNET_HANDLE_TYPE_GOPHER_FIND 9
-#define INTERNET_HANDLE_TYPE_GOPHER_FIND_HTML 10
-#define INTERNET_HANDLE_TYPE_GOPHER_FILE 11
-#define INTERNET_HANDLE_TYPE_GOPHER_FILE_HTML 12
-#define INTERNET_HANDLE_TYPE_HTTP_REQUEST 13
-#define SECURITY_FLAG_SECURE 1
-#define SECURITY_FLAG_SSL 2
-#define SECURITY_FLAG_SSL3 4
-#define SECURITY_FLAG_PCT 8
-#define SECURITY_FLAG_PCT4 16
-#define SECURITY_FLAG_IETFSSL4 0x20
-#define SECURITY_FLAG_IGNORE_REVOCATION 0x00000080
-#define SECURITY_FLAG_IGNORE_UNKNOWN_CA 0x00000100
-#define SECURITY_FLAG_IGNORE_WRONG_USAGE 0x00000200
-#define SECURITY_FLAG_40BIT 0x10000000
-#define SECURITY_FLAG_128BIT 0x20000000
-#define SECURITY_FLAG_56BIT 0x40000000
-#define SECURITY_FLAG_UNKNOWNBIT 0x80000000
-#define SECURITY_FLAG_NORMALBITNESS SECURITY_FLAG_40BIT
-#define SECURITY_FLAG_IGNORE_CERT_CN_INVALID INTERNET_FLAG_IGNORE_CERT_CN_INVALID
-#define SECURITY_FLAG_IGNORE_CERT_DATE_INVALID INTERNET_FLAG_IGNORE_CERT_DATE_INVALID
-#define SECURITY_FLAG_IGNORE_REDIRECT_TO_HTTPS INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTPS
-#define SECURITY_FLAG_IGNORE_REDIRECT_TO_HTTP INTERNET_FLAG_IGNORE_REDIRECT_TO_HTTP
-#define INTERNET_SERVICE_FTP 1
-#define INTERNET_SERVICE_GOPHER 2
-#define INTERNET_SERVICE_HTTP 3
-#define INTERNET_STATUS_RESOLVING_NAME 10
-#define INTERNET_STATUS_NAME_RESOLVED 11
-#define INTERNET_STATUS_CONNECTING_TO_SERVER 20
-#define INTERNET_STATUS_CONNECTED_TO_SERVER 21
-#define INTERNET_STATUS_SENDING_REQUEST 30
-#define INTERNET_STATUS_REQUEST_SENT 31
-#define INTERNET_STATUS_RECEIVING_RESPONSE 40
-#define INTERNET_STATUS_RESPONSE_RECEIVED 41
-#define INTERNET_STATUS_CTL_RESPONSE_RECEIVED 42
-#define INTERNET_STATUS_PREFETCH 43
-#define INTERNET_STATUS_CLOSING_CONNECTION 50
-#define INTERNET_STATUS_CONNECTION_CLOSED 51
-#define INTERNET_STATUS_HANDLE_CREATED 60
-#define INTERNET_STATUS_HANDLE_CLOSING 70
-#define INTERNET_STATUS_REQUEST_COMPLETE 100
-#define INTERNET_STATUS_REDIRECT 110
-#define INTERNET_INVALID_STATUS_CALLBACK ((INTERNET_STATUS_CALLBACK)(-1L))
-#define FTP_TRANSFER_TYPE_UNKNOWN 0
-#define FTP_TRANSFER_TYPE_ASCII 1
-#define FTP_TRANSFER_TYPE_BINARY 2
-#define FTP_TRANSFER_TYPE_MASK (FTP_TRANSFER_TYPE_ASCII | FTP_TRANSFER_TYPE_BINARY)
-#define MAX_GOPHER_DISPLAY_TEXT 128
-#define MAX_GOPHER_SELECTOR_TEXT 256
-#define MAX_GOPHER_HOST_NAME INTERNET_MAX_HOST_NAME_LENGTH
-#define MAX_GOPHER_LOCATOR_LENGTH (1+MAX_GOPHER_DISPLAY_TEXT+1+MAX_GOPHER_SELECTOR_TEXT+1+MAX_GOPHER_HOST_NAME+1+INTERNET_MAX_PORT_NUMBER_LENGTH+1+1+2)
-#define GOPHER_TYPE_TEXT_FILE 1
-#define GOPHER_TYPE_DIRECTORY 2
-#define GOPHER_TYPE_CSO 4
-#define GOPHER_TYPE_ERROR 8
-#define GOPHER_TYPE_MAC_BINHEX 16
-#define GOPHER_TYPE_DOS_ARCHIVE 32
-#define GOPHER_TYPE_UNIX_UUENCODED 64
-#define GOPHER_TYPE_INDEX_SERVER 128
-#define GOPHER_TYPE_TELNET 256
-#define GOPHER_TYPE_BINARY 512
-#define GOPHER_TYPE_REDUNDANT 1024
-#define GOPHER_TYPE_TN3270 0x800
-#define GOPHER_TYPE_GIF 0x1000
-#define GOPHER_TYPE_IMAGE 0x2000
-#define GOPHER_TYPE_BITMAP 0x4000
-#define GOPHER_TYPE_MOVIE 0x8000
-#define GOPHER_TYPE_SOUND 0x10000
-#define GOPHER_TYPE_HTML 0x20000
-#define GOPHER_TYPE_PDF 0x40000
-#define GOPHER_TYPE_CALENDAR 0x80000
-#define GOPHER_TYPE_INLINE 0x100000
-#define GOPHER_TYPE_UNKNOWN 0x20000000
-#define GOPHER_TYPE_ASK 0x40000000
-#define GOPHER_TYPE_GOPHER_PLUS 0x80000000
-#define IS_GOPHER_FILE(t) (BOOL)(((t)&GOPHER_TYPE_FILE_MASK)?TRUE:FALSE)
-#define IS_GOPHER_DIRECTORY(t) (BOOL)(((t)&GOPHER_TYPE_DIRECTORY)?TRUE:FALSE)
-#define IS_GOPHER_PHONE_SERVER(t) (BOOL)(((t)&GOPHER_TYPE_CSO)?TRUE:FALSE)
-#define IS_GOPHER_ERROR(t) (BOOL)(((t)&GOPHER_TYPE_ERROR)?TRUE:FALSE)
-#define IS_GOPHER_INDEX_SERVER(t) (BOOL)(((t)&GOPHER_TYPE_INDEX_SERVER)?TRUE:FALSE)
-#define IS_GOPHER_TELNET_SESSION(t) (BOOL)(((t)&GOPHER_TYPE_TELNET)?TRUE:FALSE)
-#define IS_GOPHER_BACKUP_SERVER(t) (BOOL)(((t)&GOPHER_TYPE_REDUNDANT)?TRUE:FALSE)
-#define IS_GOPHER_TN3270_SESSION(t) (BOOL)(((t)&GOPHER_TYPE_TN3270)?TRUE:FALSE)
-#define IS_GOPHER_ASK(t) (BOOL)(((t)&GOPHER_TYPE_ASK)?TRUE:FALSE)
-#define IS_GOPHER_PLUS(t) (BOOL)(((t)&GOPHER_TYPE_GOPHER_PLUS)?TRUE:FALSE)
-#define IS_GOPHER_TYPE_KNOWN(t) (BOOL)(((t)&GOPHER_TYPE_UNKNOWN)?FALSE:TRUE)
-#define GOPHER_TYPE_FILE_MASK (GOPHER_TYPE_TEXT_FILE|GOPHER_TYPE_MAC_BINHEX|GOPHER_TYPE_DOS_ARCHIVE|\
-GOPHER_TYPE_UNIX_UUENCODED|GOPHER_TYPE_BINARY|GOPHER_TYPE_GIF|GOPHER_TYPE_IMAGE|GOPHER_TYPE_BITMAP\
-|GOPHER_TYPE_MOVIE|GOPHER_TYPE_SOUND|GOPHER_TYPE_HTML|GOPHER_TYPE_PDF|GOPHER_TYPE_CALENDAR|GOPHER_TYPE_INLINE)
-#define MAX_GOPHER_CATEGORY_NAME 128
-#define MAX_GOPHER_ATTRIBUTE_NAME 128
-#define MIN_GOPHER_ATTRIBUTE_LENGTH 256
-#define GOPHER_INFO_CATEGORY TEXT("+INFO")
-#define GOPHER_ADMIN_CATEGORY TEXT("+ADMIN")
-#define GOPHER_VIEWS_CATEGORY TEXT("+VIEWS")
-#define GOPHER_ABSTRACT_CATEGORY TEXT("+ABSTRACT")
-#define GOPHER_VERONICA_CATEGORY TEXT("+VERONICA")
-#define GOPHER_ADMIN_ATTRIBUTE TEXT("Admin")
-#define GOPHER_MOD_DATE_ATTRIBUTE TEXT("Mod-Date")
-#define GOPHER_TTL_ATTRIBUTE TEXT("TTL")
-#define GOPHER_SCORE_ATTRIBUTE TEXT("Score")
-#define GOPHER_RANGE_ATTRIBUTE TEXT("Score-range")
-#define GOPHER_SITE_ATTRIBUTE TEXT("Site")
-#define GOPHER_ORG_ATTRIBUTE TEXT("Org")
-#define GOPHER_LOCATION_ATTRIBUTE TEXT("Loc")
-#define GOPHER_GEOG_ATTRIBUTE TEXT("Geog")
-#define GOPHER_TIMEZONE_ATTRIBUTE TEXT("TZ")
-#define GOPHER_PROVIDER_ATTRIBUTE TEXT("Provider")
-#define GOPHER_VERSION_ATTRIBUTE TEXT("Version")
-#define GOPHER_ABSTRACT_ATTRIBUTE TEXT("Abstract")
-#define GOPHER_VIEW_ATTRIBUTE TEXT("View")
-#define GOPHER_TREEWALK_ATTRIBUTE TEXT("treewalk")
-#define GOPHER_ATTRIBUTE_ID_BASE 0xabcccc00
-#define GOPHER_CATEGORY_ID_ALL (GOPHER_ATTRIBUTE_ID_BASE+1)
-#define GOPHER_CATEGORY_ID_INFO (GOPHER_ATTRIBUTE_ID_BASE+2)
-#define GOPHER_CATEGORY_ID_ADMIN (GOPHER_ATTRIBUTE_ID_BASE+3)
-#define GOPHER_CATEGORY_ID_VIEWS (GOPHER_ATTRIBUTE_ID_BASE+4)
-#define GOPHER_CATEGORY_ID_ABSTRACT (GOPHER_ATTRIBUTE_ID_BASE+5)
-#define GOPHER_CATEGORY_ID_VERONICA (GOPHER_ATTRIBUTE_ID_BASE+6)
-#define GOPHER_CATEGORY_ID_ASK (GOPHER_ATTRIBUTE_ID_BASE+7)
-#define GOPHER_CATEGORY_ID_UNKNOWN (GOPHER_ATTRIBUTE_ID_BASE+8)
-#define GOPHER_ATTRIBUTE_ID_ALL (GOPHER_ATTRIBUTE_ID_BASE+9)
-#define GOPHER_ATTRIBUTE_ID_ADMIN (GOPHER_ATTRIBUTE_ID_BASE+10)
-#define GOPHER_ATTRIBUTE_ID_MOD_DATE (GOPHER_ATTRIBUTE_ID_BASE+11)
-#define GOPHER_ATTRIBUTE_ID_TTL (GOPHER_ATTRIBUTE_ID_BASE+12)
-#define GOPHER_ATTRIBUTE_ID_SCORE (GOPHER_ATTRIBUTE_ID_BASE+13)
-#define GOPHER_ATTRIBUTE_ID_RANGE (GOPHER_ATTRIBUTE_ID_BASE+14)
-#define GOPHER_ATTRIBUTE_ID_SITE (GOPHER_ATTRIBUTE_ID_BASE+15)
-#define GOPHER_ATTRIBUTE_ID_ORG (GOPHER_ATTRIBUTE_ID_BASE+16)
-#define GOPHER_ATTRIBUTE_ID_LOCATION (GOPHER_ATTRIBUTE_ID_BASE+17)
-#define GOPHER_ATTRIBUTE_ID_GEOG (GOPHER_ATTRIBUTE_ID_BASE+18)
-#define GOPHER_ATTRIBUTE_ID_TIMEZONE (GOPHER_ATTRIBUTE_ID_BASE+19)
-#define GOPHER_ATTRIBUTE_ID_PROVIDER (GOPHER_ATTRIBUTE_ID_BASE+20)
-#define GOPHER_ATTRIBUTE_ID_VERSION (GOPHER_ATTRIBUTE_ID_BASE+21)
-#define GOPHER_ATTRIBUTE_ID_ABSTRACT (GOPHER_ATTRIBUTE_ID_BASE+22)
-#define GOPHER_ATTRIBUTE_ID_VIEW (GOPHER_ATTRIBUTE_ID_BASE+23)
-#define GOPHER_ATTRIBUTE_ID_TREEWALK (GOPHER_ATTRIBUTE_ID_BASE+24)
-#define GOPHER_ATTRIBUTE_ID_UNKNOWN (GOPHER_ATTRIBUTE_ID_BASE+25)
-#define HTTP_MAJOR_VERSION 1
-#define HTTP_MINOR_VERSION 0
-#define HTTP_VERSION TEXT("HTTP/1.0")
-#define HTTP_QUERY_MIME_VERSION 0
-#define HTTP_QUERY_CONTENT_TYPE 1
-#define HTTP_QUERY_CONTENT_TRANSFER_ENCODING 2
-#define HTTP_QUERY_CONTENT_ID 3
-#define HTTP_QUERY_CONTENT_DESCRIPTION 4
-#define HTTP_QUERY_CONTENT_LENGTH 5
-#define HTTP_QUERY_CONTENT_LANGUAGE 6
-#define HTTP_QUERY_ALLOW 7
-#define HTTP_QUERY_PUBLIC 8
-#define HTTP_QUERY_DATE 9
-#define HTTP_QUERY_EXPIRES 10
-#define HTTP_QUERY_LAST_MODIFIED 11
-#define HTTP_QUERY_MESSAGE_ID 12
-#define HTTP_QUERY_URI 13
-#define HTTP_QUERY_DERIVED_FROM 14
-#define HTTP_QUERY_COST 15
-#define HTTP_QUERY_LINK 16
-#define HTTP_QUERY_PRAGMA 17
-#define HTTP_QUERY_VERSION 18
-#define HTTP_QUERY_STATUS_CODE 19
-#define HTTP_QUERY_STATUS_TEXT 20
-#define HTTP_QUERY_RAW_HEADERS 21
-#define HTTP_QUERY_RAW_HEADERS_CRLF 22
-#define HTTP_QUERY_CONNECTION 23
-#define HTTP_QUERY_ACCEPT 24
-#define HTTP_QUERY_ACCEPT_CHARSET 25
-#define HTTP_QUERY_ACCEPT_ENCODING 26
-#define HTTP_QUERY_ACCEPT_LANGUAGE 27
-#define HTTP_QUERY_AUTHORIZATION 28
-#define HTTP_QUERY_CONTENT_ENCODING 29
-#define HTTP_QUERY_FORWARDED 30
-#define HTTP_QUERY_FROM 31
-#define HTTP_QUERY_IF_MODIFIED_SINCE 32
-#define HTTP_QUERY_LOCATION 33
-#define HTTP_QUERY_ORIG_URI 34
-#define HTTP_QUERY_REFERER 35
-#define HTTP_QUERY_RETRY_AFTER 36
-#define HTTP_QUERY_SERVER 37
-#define HTTP_QUERY_TITLE 38
-#define HTTP_QUERY_USER_AGENT 39
-#define HTTP_QUERY_WWW_AUTHENTICATE 40
-#define HTTP_QUERY_PROXY_AUTHENTICATE 41
-#define HTTP_QUERY_ACCEPT_RANGES 42
-#define HTTP_QUERY_SET_COOKIE 43
-#define HTTP_QUERY_COOKIE 44
-#define HTTP_QUERY_REQUEST_METHOD 45
-#define HTTP_QUERY_MAX 45
-#define HTTP_QUERY_CUSTOM 65535
-#define HTTP_QUERY_FLAG_REQUEST_HEADERS 0x80000000
-#define HTTP_QUERY_FLAG_SYSTEMTIME 0x40000000
-#define HTTP_QUERY_FLAG_NUMBER 0x20000000
-#define HTTP_QUERY_FLAG_COALESCE 0x10000000
-#define HTTP_QUERY_MODIFIER_FLAGS_MASK (HTTP_QUERY_FLAG_REQUEST_HEADERS|HTTP_QUERY_FLAG_SYSTEMTIME|HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_FLAG_COALESCE)
-#define HTTP_QUERY_HEADER_MASK (~HTTP_QUERY_MODIFIER_FLAGS_MASK)
-#define HTTP_STATUS_OK 200
-#define HTTP_STATUS_CREATED 201
-#define HTTP_STATUS_ACCEPTED 202
-#define HTTP_STATUS_PARTIAL 203
-#define HTTP_STATUS_NO_CONTENT 204
-#define HTTP_STATUS_AMBIGUOUS 300
-#define HTTP_STATUS_MOVED 301
-#define HTTP_STATUS_REDIRECT 302
-#define HTTP_STATUS_REDIRECT_METHOD 303
-#define HTTP_STATUS_NOT_MODIFIED 304
-#define HTTP_STATUS_BAD_REQUEST 400
-#define HTTP_STATUS_DENIED 401
-#define HTTP_STATUS_PAYMENT_REQ 402
-#define HTTP_STATUS_FORBIDDEN 403
-#define HTTP_STATUS_NOT_FOUND 404
-#define HTTP_STATUS_BAD_METHOD 405
-#define HTTP_STATUS_NONE_ACCEPTABLE 406
-#define HTTP_STATUS_PROXY_AUTH_REQ 407
-#define HTTP_STATUS_REQUEST_TIMEOUT 408
-#define HTTP_STATUS_CONFLICT 409
-#define HTTP_STATUS_GONE 410
-#define HTTP_STATUS_AUTH_REFUSED 411
-#define HTTP_STATUS_SERVER_ERROR 500
-#define HTTP_STATUS_NOT_SUPPORTED 501
-#define HTTP_STATUS_BAD_GATEWAY 502
-#define HTTP_STATUS_SERVICE_UNAVAIL 503
-#define HTTP_STATUS_GATEWAY_TIMEOUT 504
-#define INTERNET_PREFETCH_PROGRESS 0
-#define INTERNET_PREFETCH_COMPLETE 1
-#define INTERNET_PREFETCH_ABORTED 2
-#define FLAGS_ERROR_UI_FILTER_FOR_ERRORS 0x01
-#define FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS 0x02
-#define FLAGS_ERROR_UI_FLAGS_GENERATE_DATA 0x04
-#define FLAGS_ERROR_UI_FLAGS_NO_UI 0x08
-#define HTTP_ADDREQ_INDEX_MASK 0x0000FFFF
-#define HTTP_ADDREQ_FLAGS_MASK 0xFFFF0000
-#define HTTP_ADDREQ_FLAG_ADD_IF_NEW 0x10000000
-#define HTTP_ADDREQ_FLAG_ADD 0x20000000
-#define HTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA 0x40000000
-#define HTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON 0x01000000
-#define HTTP_ADDREQ_FLAG_COALESCE HTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA
-#define HTTP_ADDREQ_FLAG_REPLACE 0x80000000
-#define INTERNET_ERROR_BASE 12000
-#define ERROR_INTERNET_OUT_OF_HANDLES (INTERNET_ERROR_BASE+1)
-#define ERROR_INTERNET_TIMEOUT (INTERNET_ERROR_BASE+2)
-#define ERROR_INTERNET_EXTENDED_ERROR (INTERNET_ERROR_BASE+3)
-#define ERROR_INTERNET_INTERNAL_ERROR (INTERNET_ERROR_BASE+4)
-#define ERROR_INTERNET_INVALID_URL (INTERNET_ERROR_BASE+5)
-#define ERROR_INTERNET_UNRECOGNIZED_SCHEME (INTERNET_ERROR_BASE+6)
-#define ERROR_INTERNET_NAME_NOT_RESOLVED (INTERNET_ERROR_BASE+7)
-#define ERROR_INTERNET_PROTOCOL_NOT_FOUND (INTERNET_ERROR_BASE+8)
-#define ERROR_INTERNET_INVALID_OPTION (INTERNET_ERROR_BASE+9)
-#define ERROR_INTERNET_BAD_OPTION_LENGTH (INTERNET_ERROR_BASE+10)
-#define ERROR_INTERNET_OPTION_NOT_SETTABLE (INTERNET_ERROR_BASE+11)
-#define ERROR_INTERNET_SHUTDOWN (INTERNET_ERROR_BASE+12)
-#define ERROR_INTERNET_INCORRECT_USER_NAME (INTERNET_ERROR_BASE+13)
-#define ERROR_INTERNET_INCORRECT_PASSWORD (INTERNET_ERROR_BASE+14)
-#define ERROR_INTERNET_LOGIN_FAILURE (INTERNET_ERROR_BASE+15)
-#define ERROR_INTERNET_INVALID_OPERATION (INTERNET_ERROR_BASE+16)
-#define ERROR_INTERNET_OPERATION_CANCELLED (INTERNET_ERROR_BASE+17)
-#define ERROR_INTERNET_INCORRECT_HANDLE_TYPE (INTERNET_ERROR_BASE+18)
-#define ERROR_INTERNET_INCORRECT_HANDLE_STATE (INTERNET_ERROR_BASE+19)
-#define ERROR_INTERNET_NOT_PROXY_REQUEST (INTERNET_ERROR_BASE+20)
-#define ERROR_INTERNET_REGISTRY_VALUE_NOT_FOUND (INTERNET_ERROR_BASE+21)
-#define ERROR_INTERNET_BAD_REGISTRY_PARAMETER (INTERNET_ERROR_BASE+22)
-#define ERROR_INTERNET_NO_DIRECT_ACCESS (INTERNET_ERROR_BASE+23)
-#define ERROR_INTERNET_NO_CONTEXT (INTERNET_ERROR_BASE+24)
-#define ERROR_INTERNET_NO_CALLBACK (INTERNET_ERROR_BASE+25)
-#define ERROR_INTERNET_REQUEST_PENDING (INTERNET_ERROR_BASE+26)
-#define ERROR_INTERNET_INCORRECT_FORMAT (INTERNET_ERROR_BASE+27)
-#define ERROR_INTERNET_ITEM_NOT_FOUND (INTERNET_ERROR_BASE+28)
-#define ERROR_INTERNET_CANNOT_CONNECT (INTERNET_ERROR_BASE+29)
-#define ERROR_INTERNET_CONNECTION_ABORTED (INTERNET_ERROR_BASE+30)
-#define ERROR_INTERNET_CONNECTION_RESET (INTERNET_ERROR_BASE+31)
-#define ERROR_INTERNET_FORCE_RETRY (INTERNET_ERROR_BASE+32)
-#define ERROR_INTERNET_INVALID_PROXY_REQUEST (INTERNET_ERROR_BASE+33)
-#define ERROR_INTERNET_NEED_UI (INTERNET_ERROR_BASE+34)
-#define ERROR_INTERNET_HANDLE_EXISTS (INTERNET_ERROR_BASE+36)
-#define ERROR_INTERNET_SEC_CERT_DATE_INVALID (INTERNET_ERROR_BASE+37)
-#define ERROR_INTERNET_SEC_CERT_CN_INVALID (INTERNET_ERROR_BASE+38)
-#define ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR (INTERNET_ERROR_BASE+39)
-#define ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR (INTERNET_ERROR_BASE+40)
-#define ERROR_INTERNET_MIXED_SECURITY (INTERNET_ERROR_BASE+41)
-#define ERROR_INTERNET_CHG_POST_IS_NON_SECURE (INTERNET_ERROR_BASE+42)
-#define ERROR_INTERNET_POST_IS_NON_SECURE (INTERNET_ERROR_BASE+43)
-#define ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED (INTERNET_ERROR_BASE+44)
-#define ERROR_INTERNET_INVALID_CA (INTERNET_ERROR_BASE+45)
-#define ERROR_INTERNET_CLIENT_AUTH_NOT_SETUP (INTERNET_ERROR_BASE+46)
-#define ERROR_INTERNET_ASYNC_THREAD_FAILED (INTERNET_ERROR_BASE+47)
-#define ERROR_INTERNET_REDIRECT_SCHEME_CHANGE (INTERNET_ERROR_BASE+48)
-#define ERROR_FTP_TRANSFER_IN_PROGRESS (INTERNET_ERROR_BASE+110)
-#define ERROR_FTP_DROPPED (INTERNET_ERROR_BASE+111)
-#define ERROR_GOPHER_PROTOCOL_ERROR (INTERNET_ERROR_BASE+130)
-#define ERROR_GOPHER_NOT_FILE (INTERNET_ERROR_BASE+131)
-#define ERROR_GOPHER_DATA_ERROR (INTERNET_ERROR_BASE+132)
-#define ERROR_GOPHER_END_OF_DATA (INTERNET_ERROR_BASE+133)
-#define ERROR_GOPHER_INVALID_LOCATOR (INTERNET_ERROR_BASE+134)
-#define ERROR_GOPHER_INCORRECT_LOCATOR_TYPE (INTERNET_ERROR_BASE+135)
-#define ERROR_GOPHER_NOT_GOPHER_PLUS (INTERNET_ERROR_BASE+136)
-#define ERROR_GOPHER_ATTRIBUTE_NOT_FOUND (INTERNET_ERROR_BASE+137)
-#define ERROR_GOPHER_UNKNOWN_LOCATOR (INTERNET_ERROR_BASE+138)
-#define ERROR_HTTP_HEADER_NOT_FOUND (INTERNET_ERROR_BASE+150)
-#define ERROR_HTTP_DOWNLEVEL_SERVER (INTERNET_ERROR_BASE+151)
-#define ERROR_HTTP_INVALID_SERVER_RESPONSE (INTERNET_ERROR_BASE+152)
-#define ERROR_HTTP_INVALID_HEADER (INTERNET_ERROR_BASE+153)
-#define ERROR_HTTP_INVALID_QUERY_REQUEST (INTERNET_ERROR_BASE+154)
-#define ERROR_HTTP_HEADER_ALREADY_EXISTS (INTERNET_ERROR_BASE+155)
-#define ERROR_HTTP_REDIRECT_FAILED (INTERNET_ERROR_BASE+156)
-#define ERROR_HTTP_NOT_REDIRECTED (INTERNET_ERROR_BASE+160)
-#define ERROR_INTERNET_SECURITY_CHANNEL_ERROR (INTERNET_ERROR_BASE+157)
-#define ERROR_INTERNET_UNABLE_TO_CACHE_FILE (INTERNET_ERROR_BASE+158)
-#define ERROR_INTERNET_TCPIP_NOT_INSTALLED (INTERNET_ERROR_BASE+159)
-#define INTERNET_ERROR_LAST ERROR_INTERNET_TCPIP_NOT_INSTALLED
-#define URLCACHEAPI DECLSPEC_IMPORT
-#define NORMAL_CACHE_ENTRY 1
-#define STABLE_CACHE_ENTRY 2
-#define STICKY_CACHE_ENTRY 4
-#define SPARSE_CACHE_ENTRY 0x10000
-#define OCX_CACHE_ENTRY 0x20000
-#define COOKIE_CACHE_ENTRY 0x100000
-#define URLHISTORY_CACHE_ENTRY 0x200000
-#define CACHE_ENTRY_ATTRIBUTE_FC 4
-#define CACHE_ENTRY_HITRATE_FC 0x10
-#define CACHE_ENTRY_MODTIME_FC 0x40
-#define CACHE_ENTRY_EXPTIME_FC 0x80
-#define CACHE_ENTRY_ACCTIME_FC 0x100
-#define CACHE_ENTRY_SYNCTIME_FC 0x200
-#define CACHE_ENTRY_HEADERINFO_FC 0x400
-#define IRF_ASYNC WININET_API_FLAG_ASYNC
-#define IRF_SYNC WININET_API_FLAG_SYNC
-#define IRF_USE_CONTEXT WININET_API_FLAG_USE_CONTEXT
-#define IRF_NO_WAIT 8
-#define HSR_ASYNC	WININET_API_FLAG_ASYNC
-#define HSR_SYNC	WININET_API_FLAG_SYNC
-#define HSR_USE_CONTEXT WININET_API_FLAG_USE_CONTEXT
-#define HSR_INITIATE	8
-#define HSR_DOWNLOAD	16
-#define HSR_CHUNKED	32
-#define INTERNET_DIAL_UNATTENDED	0x8000
-#define INTERNET_DIALSTATE_DISCONNECTED	1
-#define INTERENT_GOONLINE_REFRESH	1
-#define INTERENT_GOONLINE_MASK	1
-#define INTERNET_AUTODIAL_FORCE_ONLINE	1
-#define INTERNET_AUTODIAL_FORCE_UNATTENDED	2
-#define INTERNET_AUTODIAL_FAILIFSECURITYCHECK	4
-#define INTERNET_CONNECTION_MODEM	1
-#define INTERNET_CONNECTION_LAN	2
-#define INTERNET_CONNECTION_PROXY	4
-#define INTERNET_CONNECTION_MODEM_BUSY	8
-
-#ifndef RC_INVOKED
-typedef PVOID HINTERNET;
-typedef HINTERNET *LPHINTERNET;
-typedef WORD INTERNET_PORT,*LPINTERNET_PORT;
-typedef enum {
-	INTERNET_SCHEME_PARTIAL = -2, INTERNET_SCHEME_UNKNOWN = -1,
-	INTERNET_SCHEME_DEFAULT = 0, INTERNET_SCHEME_FTP, INTERNET_SCHEME_GOPHER,
-	INTERNET_SCHEME_HTTP, INTERNET_SCHEME_HTTPS, INTERNET_SCHEME_FILE,
-	INTERNET_SCHEME_NEWS, INTERNET_SCHEME_MAILTO, INTERNET_SCHEME_SOCKS,
-	INTERNET_SCHEME_FIRST = INTERNET_SCHEME_FTP, INTERNET_SCHEME_LAST = INTERNET_SCHEME_SOCKS
-} INTERNET_SCHEME,*LPINTERNET_SCHEME;
-typedef struct { DWORD dwResult; DWORD dwError; } INTERNET_ASYNC_RESULT,*LPINTERNET_ASYNC_RESULT;
-typedef struct { DWORD dwStatus; DWORD dwSize; } INTERNET_PREFETCH_STATUS,*LPINTERNET_PREFETCH_STATUS;
-typedef struct {
-	DWORD dwAccessType;
-	LPCTSTR lpszProxy;
-	LPCTSTR lpszProxyBypass;
-} INTERNET_PROXY_INFO,*LPINTERNET_PROXY_INFO;
-typedef struct {
-	DWORD dwMajorVersion;
-	DWORD dwMinorVersion;
-} INTERNET_VERSION_INFO,*LPINTERNET_VERSION_INFO;
-typedef struct {
-	DWORD dwStructSize;
-	LPSTR lpszScheme;
-	DWORD dwSchemeLength;
-	INTERNET_SCHEME nScheme;
-	LPSTR lpszHostName;
-	DWORD dwHostNameLength;
-	INTERNET_PORT nPort;
-	LPSTR lpszUserName;
-	DWORD dwUserNameLength;
-	LPSTR lpszPassword;
-	DWORD dwPasswordLength;
-	LPSTR lpszUrlPath;
-	DWORD dwUrlPathLength;
-	LPSTR lpszExtraInfo;
-	DWORD dwExtraInfoLength;
-} URL_COMPONENTSA,*LPURL_COMPONENTSA;
-typedef struct {
-	DWORD dwStructSize;
-	LPWSTR lpszScheme;
-	DWORD dwSchemeLength;
-	INTERNET_SCHEME nScheme;
-	LPWSTR lpszHostName;
-	DWORD dwHostNameLength;
-	INTERNET_PORT nPort;
-	LPWSTR lpszUserName;
-	DWORD dwUserNameLength;
-	LPWSTR lpszPassword;
-	DWORD dwPasswordLength;
-	LPWSTR lpszUrlPath;
-	DWORD dwUrlPathLength;
-	LPWSTR lpszExtraInfo;
-	DWORD dwExtraInfoLength;
-} URL_COMPONENTSW,*LPURL_COMPONENTSW;
-typedef struct {
-	FILETIME ftExpiry;
-	FILETIME ftStart;
-	LPTSTR lpszSubjectInfo;
-	LPTSTR lpszIssuerInfo;
-	LPTSTR lpszProtocolName;
-	LPTSTR lpszSignatureAlgName;
-	LPTSTR lpszEncryptionAlgName;
-	DWORD dwKeySize;
-} INTERNET_CERTIFICATE_INFO,*LPINTERNET_CERTIFICATE_INFO;
-typedef VOID (CALLBACK * INTERNET_STATUS_CALLBACK)(HINTERNET,DWORD,DWORD,PVOID,DWORD);
-typedef INTERNET_STATUS_CALLBACK * LPINTERNET_STATUS_CALLBACK;
-typedef struct {
-	CHAR DisplayString[MAX_GOPHER_DISPLAY_TEXT+1];
-	DWORD GopherType;
-	DWORD SizeLow;
-	DWORD SizeHigh;
-	FILETIME LastModificationTime;
-	CHAR Locator[MAX_GOPHER_LOCATOR_LENGTH+1];
-} GOPHER_FIND_DATAA,*LPGOPHER_FIND_DATAA;
-typedef struct {
-	WCHAR DisplayString[MAX_GOPHER_DISPLAY_TEXT+1];
-	DWORD GopherType;
-	DWORD SizeLow;
-	DWORD SizeHigh;
-	FILETIME LastModificationTime;
-	WCHAR Locator[MAX_GOPHER_LOCATOR_LENGTH+1];
-} GOPHER_FIND_DATAW,*LPGOPHER_FIND_DATAW;
-typedef struct {
-	LPCTSTR Comment;
-	LPCTSTR EmailAddress;
-} GOPHER_ADMIN_ATTRIBUTE_TYPE,*LPGOPHER_ADMIN_ATTRIBUTE_TYPE;
-typedef struct {FILETIME DateAndTime;} GOPHER_MOD_DATE_ATTRIBUTE_TYPE,*LPGOPHER_MOD_DATE_ATTRIBUTE_TYPE;
-typedef struct {DWORD Ttl;} GOPHER_TTL_ATTRIBUTE_TYPE,*LPGOPHER_TTL_ATTRIBUTE_TYPE;
-typedef struct {INT Score;} GOPHER_SCORE_ATTRIBUTE_TYPE,*LPGOPHER_SCORE_ATTRIBUTE_TYPE;
-typedef struct {
-	INT LowerBound;
-	INT UpperBound;
-} GOPHER_SCORE_RANGE_ATTRIBUTE_TYPE,*LPGOPHER_SCORE_RANGE_ATTRIBUTE_TYPE;
-typedef struct {LPCTSTR Site;} GOPHER_SITE_ATTRIBUTE_TYPE,*LPGOPHER_SITE_ATTRIBUTE_TYPE;
-typedef struct {LPCTSTR Organization;} GOPHER_ORGANIZATION_ATTRIBUTE_TYPE,*LPGOPHER_ORGANIZATION_ATTRIBUTE_TYPE;
-typedef struct {LPCTSTR Location;} GOPHER_LOCATION_ATTRIBUTE_TYPE,*LPGOPHER_LOCATION_ATTRIBUTE_TYPE;
-typedef struct {
-	INT DegreesNorth;
-	INT MinutesNorth;
-	INT SecondsNorth;
-	INT DegreesEast;
-	INT MinutesEast;
-	INT SecondsEast;
-} GOPHER_GEOGRAPHICAL_LOCATION_ATTRIBUTE_TYPE,*LPGOPHER_GEOGRAPHICAL_LOCATION_ATTRIBUTE_TYPE;
-typedef struct {INT Zone;} GOPHER_TIMEZONE_ATTRIBUTE_TYPE,*LPGOPHER_TIMEZONE_ATTRIBUTE_TYPE;
-typedef struct {LPCTSTR Provider;} GOPHER_PROVIDER_ATTRIBUTE_TYPE,*LPGOPHER_PROVIDER_ATTRIBUTE_TYPE;
-typedef struct {LPCTSTR Version;} GOPHER_VERSION_ATTRIBUTE_TYPE,*LPGOPHER_VERSION_ATTRIBUTE_TYPE;
-typedef struct {
-	LPCTSTR ShortAbstract;
-	LPCTSTR AbstractFile;
-} GOPHER_ABSTRACT_ATTRIBUTE_TYPE,*LPGOPHER_ABSTRACT_ATTRIBUTE_TYPE;
-typedef struct {
-	LPCTSTR ContentType;
-	LPCTSTR Language;
-	DWORD Size;
-} GOPHER_VIEW_ATTRIBUTE_TYPE,*LPGOPHER_VIEW_ATTRIBUTE_TYPE;
-typedef struct {BOOL TreeWalk;} GOPHER_VERONICA_ATTRIBUTE_TYPE,*LPGOPHER_VERONICA_ATTRIBUTE_TYPE;
-typedef struct {
-	LPCTSTR QuestionType;
-	LPCTSTR QuestionText;
-} GOPHER_ASK_ATTRIBUTE_TYPE,*LPGOPHER_ASK_ATTRIBUTE_TYPE;
-typedef struct {LPCTSTR Text;} GOPHER_UNKNOWN_ATTRIBUTE_TYPE,*LPGOPHER_UNKNOWN_ATTRIBUTE_TYPE;
-typedef struct {
-	DWORD CategoryId;
-	DWORD AttributeId;
-	union {
-		GOPHER_ADMIN_ATTRIBUTE_TYPE Admin;
-		GOPHER_MOD_DATE_ATTRIBUTE_TYPE ModDate;
-		GOPHER_TTL_ATTRIBUTE_TYPE Ttl;
-		GOPHER_SCORE_ATTRIBUTE_TYPE Score;
-		GOPHER_SCORE_RANGE_ATTRIBUTE_TYPE ScoreRange;
-		GOPHER_SITE_ATTRIBUTE_TYPE Site;
-		GOPHER_ORGANIZATION_ATTRIBUTE_TYPE Organization;
-		GOPHER_LOCATION_ATTRIBUTE_TYPE Location;
-		GOPHER_GEOGRAPHICAL_LOCATION_ATTRIBUTE_TYPE GeographicalLocation;
-		GOPHER_TIMEZONE_ATTRIBUTE_TYPE TimeZone;
-		GOPHER_PROVIDER_ATTRIBUTE_TYPE Provider;
-		GOPHER_VERSION_ATTRIBUTE_TYPE Version;
-		GOPHER_ABSTRACT_ATTRIBUTE_TYPE Abstract;
-		GOPHER_VIEW_ATTRIBUTE_TYPE View;
-		GOPHER_VERONICA_ATTRIBUTE_TYPE Veronica;
-		GOPHER_ASK_ATTRIBUTE_TYPE Ask;
-		GOPHER_UNKNOWN_ATTRIBUTE_TYPE Unknown;
-	} AttributeType;
-} GOPHER_ATTRIBUTE_TYPE,*LPGOPHER_ATTRIBUTE_TYPE;
-typedef BOOL(CALLBACK *GOPHER_ATTRIBUTE_ENUMERATOR)(LPGOPHER_ATTRIBUTE_TYPE,DWORD);
-typedef struct _INTERNET_CACHE_ENTRY_INFOA {
-	DWORD dwStructSize;
-	LPSTR lpszSourceUrlName;
-	LPSTR lpszLocalFileName;
-	DWORD CacheEntryType;
-	DWORD dwUseCount;
-	DWORD dwHitRate;
-	DWORD dwSizeLow;
-	DWORD dwSizeHigh;
-	FILETIME LastModifiedTime;
-	FILETIME ExpireTime;
-	FILETIME LastAccessTime;
-	FILETIME LastSyncTime;
-	PBYTE lpHeaderInfo;
-	DWORD dwHeaderInfoSize;
-	LPSTR lpszFileExtension;
-	DWORD dwReserved;
-} INTERNET_CACHE_ENTRY_INFOA,*LPINTERNET_CACHE_ENTRY_INFOA;
-typedef struct _INTERNET_CACHE_ENTRY_INFOW {
-	DWORD dwStructSize;
-	LPSTR lpszSourceUrlName;
-	LPWSTR lpszLocalFileName;
-	DWORD CacheEntryType;
-	DWORD dwUseCount;
-	DWORD dwHitRate;
-	DWORD dwSizeLow;
-	DWORD dwSizeHigh;
-	FILETIME LastModifiedTime;
-	FILETIME ExpireTime;
-	FILETIME LastAccessTime;
-	FILETIME LastSyncTime;
-	PBYTE lpHeaderInfo;
-	DWORD dwHeaderInfoSize;
-	LPWSTR lpszFileExtension;
-	DWORD dwReserved;
-} INTERNET_CACHE_ENTRY_INFOW,*LPINTERNET_CACHE_ENTRY_INFOW;
-typedef struct _INTERNET_BUFFERSA {
-	DWORD dwStructSize;
-	struct _INTERNET_BUFFERSA *Next;
-	LPCSTR lpcszHeader;
-	DWORD dwHeadersLength;
-	DWORD dwHeadersTotal;
-	LPVOID lpvBuffer;
-	DWORD dwBufferLength;
-	DWORD dwBufferTotal;
-	DWORD dwOffsetLow;
-	DWORD dwOffsetHigh;
-} INTERNET_BUFFERSA,*LPINTERNET_BUFFERSA;
-typedef struct _INTERNET_BUFFERSW {
-	DWORD dwStructSize;
-	struct _INTERNET_BUFFERS *Next;
-	LPCWSTR  lpcszHeader;
-	DWORD dwHeadersLength;
-	DWORD dwHeadersTotal;
-	LPVOID lpvBuffer;
-	DWORD dwBufferLength;
-	DWORD dwBufferTotal;
-	DWORD dwOffsetLow;
-	DWORD dwOffsetHigh;
-} INTERNET_BUFFERSW,*LPINTERNET_BUFFERSW;
-
-#ifdef UNICODE
-typedef URL_COMPONENTSW URL_COMPONENTS;
-typedef LPURL_COMPONENTSW LPURL_COMPONENTS;
-typedef GOPHER_FIND_DATAW GOPHER_FIND_DATA;
-typedef LPGOPHER_FIND_DATAW LPGOPHER_FIND_DATA;
-typedef INTERNET_CACHE_ENTRY_INFOW INTERNET_CACHE_ENTRY_INFO;
-typedef LPINTERNET_CACHE_ENTRY_INFOW LPINTERNET_CACHE_ENTRY_INFO;
-typedef INTERNET_BUFFERSW INTERNET_BUFFERS,*LPINTERNET_BUFFERS;
-#else
-typedef URL_COMPONENTSA URL_COMPONENTS;
-typedef LPURL_COMPONENTSA LPURL_COMPONENTS;
-typedef GOPHER_FIND_DATAA GOPHER_FIND_DATA;
-typedef LPGOPHER_FIND_DATAA LPGOPHER_FIND_DATA;
-typedef INTERNET_CACHE_ENTRY_INFOA INTERNET_CACHE_ENTRY_INFO;
-typedef LPINTERNET_CACHE_ENTRY_INFOA LPINTERNET_CACHE_ENTRY_INFO;
-typedef INTERNET_BUFFERSA INTERNET_BUFFERS,*LPINTERNET_BUFFERS;
-#endif
-BOOL WINAPI InternetTimeFromSystemTime(SYSTEMTIME*,DWORD,LPSTR,DWORD);
-BOOL WINAPI InternetTimeToSystemTime(LPCSTR,SYSTEMTIME*,DWORD);
-BOOL WINAPI InternetDebugGetLocalTime(SYSTEMTIME*,PDWORD);
-BOOL WINAPI InternetCrackUrlA(LPCSTR,DWORD,DWORD,LPURL_COMPONENTSA);
-BOOL WINAPI InternetCrackUrlW(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTSW);
-BOOL WINAPI InternetCreateUrlA(LPURL_COMPONENTSA,DWORD,LPSTR,PDWORD);
-BOOL WINAPI InternetCreateUrlW(LPURL_COMPONENTSW,DWORD,LPWSTR,PDWORD);
-BOOL WINAPI InternetCanonicalizeUrlA(LPCSTR,LPSTR,PDWORD,DWORD);
-BOOL WINAPI InternetCanonicalizeUrlW(LPCWSTR,LPWSTR,PDWORD,DWORD);
-BOOL WINAPI InternetCombineUrlA(LPCSTR,LPCSTR,LPSTR,PDWORD,DWORD);
-BOOL WINAPI InternetCombineUrlW(LPCWSTR,LPCWSTR,LPWSTR,PDWORD,DWORD);
-HINTERNET WINAPI InternetOpenA(LPCSTR,DWORD,LPCSTR,LPCSTR,DWORD);
-HINTERNET WINAPI InternetOpenW(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD);
-BOOL WINAPI InternetCloseHandle(HINTERNET);
-HINTERNET WINAPI InternetConnectA(HINTERNET,LPCSTR,INTERNET_PORT,LPCSTR,LPCSTR,DWORD,DWORD,DWORD);
-HINTERNET WINAPI InternetConnectW(HINTERNET,LPCWSTR,INTERNET_PORT,LPCWSTR,LPCWSTR,DWORD,DWORD,DWORD);
-HINTERNET WINAPI InternetOpenUrlA(HINTERNET,LPCSTR,LPCSTR,DWORD,DWORD,DWORD);
-HINTERNET WINAPI InternetOpenUrlW(HINTERNET,LPCWSTR,LPCWSTR,DWORD,DWORD,DWORD);
-BOOL WINAPI InternetReadFile(HINTERNET,PVOID,DWORD,PDWORD);
-DWORD WINAPI InternetSetFilePointer( HINTERNET,LONG,PVOID,DWORD,DWORD);
-BOOL WINAPI InternetWriteFile(HINTERNET,LPCVOID,DWORD,PDWORD);
-BOOL WINAPI InternetQueryDataAvailable( HINTERNET,PDWORD,DWORD,DWORD);
-BOOL WINAPI InternetFindNextFileA(HINTERNET,PVOID);
-BOOL WINAPI InternetFindNextFileW(HINTERNET,PVOID);
-BOOL WINAPI InternetQueryOptionA(HINTERNET,DWORD,PVOID,PDWORD);
-BOOL WINAPI InternetQueryOptionW(HINTERNET,DWORD,PVOID,PDWORD);
-BOOL WINAPI InternetSetOptionA(HINTERNET,DWORD,PVOID,DWORD);
-BOOL WINAPI InternetSetOptionW(HINTERNET,DWORD,PVOID,DWORD);
-BOOL WINAPI InternetSetOptionExA(HINTERNET,DWORD,PVOID,DWORD,DWORD);
-BOOL WINAPI InternetSetOptionExW(HINTERNET,DWORD,PVOID,DWORD,DWORD);
-BOOL WINAPI InternetGetLastResponseInfoA(PDWORD,LPSTR,PDWORD);
-BOOL WINAPI InternetGetLastResponseInfoW(PDWORD,LPWSTR,PDWORD);
-INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallback(HINTERNET,INTERNET_STATUS_CALLBACK);
-HINTERNET WINAPI FtpFindFirstFileA(HINTERNET,LPCSTR,LPWIN32_FIND_DATA,DWORD,DWORD);
-HINTERNET WINAPI FtpFindFirstFileW(HINTERNET,LPCWSTR,LPWIN32_FIND_DATA,DWORD,DWORD);
-BOOL WINAPI FtpGetFileA(HINTERNET,LPCSTR,LPCSTR,BOOL,DWORD,DWORD,DWORD);
-BOOL WINAPI FtpGetFileW( HINTERNET,LPCWSTR,LPCWSTR,BOOL,DWORD,DWORD,DWORD);
-BOOL WINAPI FtpPutFileA(HINTERNET,LPCSTR,LPCSTR,DWORD,DWORD);
-BOOL WINAPI FtpPutFileW(HINTERNET,LPCWSTR,LPCWSTR,DWORD,DWORD);
-BOOL WINAPI FtpDeleteFileA(HINTERNET,LPCSTR);
-BOOL WINAPI FtpDeleteFileW(HINTERNET,LPCWSTR);
-BOOL WINAPI FtpRenameFileA(HINTERNET, LPCSTR,LPCSTR);
-BOOL WINAPI FtpRenameFileW(HINTERNET,LPCWSTR,LPCWSTR);
-HINTERNET WINAPI FtpOpenFileA(HINTERNET,LPCSTR,DWORD,DWORD,DWORD);
-HINTERNET WINAPI FtpOpenFileW(HINTERNET,LPCWSTR,DWORD,DWORD,DWORD);
-BOOL WINAPI FtpCreateDirectoryA(HINTERNET,LPCSTR);
-BOOL WINAPI FtpCreateDirectoryW(HINTERNET,LPCWSTR);
-BOOL WINAPI FtpRemoveDirectoryA(HINTERNET,LPCSTR);
-BOOL WINAPI FtpRemoveDirectoryW(HINTERNET,LPCWSTR);
-BOOL WINAPI FtpSetCurrentDirectoryA(HINTERNET,LPCSTR);
-BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET,LPCWSTR);
-BOOL WINAPI FtpGetCurrentDirectoryA(HINTERNET,LPSTR,PDWORD);
-BOOL WINAPI FtpGetCurrentDirectoryW(HINTERNET,LPWSTR,PDWORD);
-BOOL WINAPI FtpCommandA(HINTERNET,BOOL,DWORD,LPCSTR,DWORD);
-BOOL WINAPI FtpCommandW( HINTERNET,BOOL,DWORD,LPCWSTR,DWORD);
-BOOL WINAPI GopherCreateLocatorA(LPCSTR,INTERNET_PORT,LPCSTR,LPCSTR,DWORD,LPSTR,PDWORD);
-BOOL WINAPI GopherCreateLocatorW(LPCWSTR,INTERNET_PORT,LPCWSTR,LPCWSTR,DWORD,LPWSTR,PDWORD);
-BOOL WINAPI GopherGetLocatorTypeA(LPCSTR,PDWORD);
-BOOL WINAPI GopherGetLocatorTypeW(LPCWSTR,PDWORD);
-HINTERNET WINAPI GopherFindFirstFileA(HINTERNET,LPCSTR,LPCSTR,LPGOPHER_FIND_DATAA,DWORD,DWORD);
-HINTERNET WINAPI GopherFindFirstFileW(HINTERNET,LPCWSTR,LPCWSTR,LPGOPHER_FIND_DATAW,DWORD,DWORD);
-HINTERNET WINAPI GopherOpenFileA(HINTERNET,LPCSTR,LPCSTR,DWORD,DWORD);
-HINTERNET WINAPI GopherOpenFileW(HINTERNET,LPCWSTR,LPCWSTR,DWORD,DWORD);
-BOOL WINAPI GopherGetAttributeA(HINTERNET,LPCSTR,LPCSTR,LPBYTE,DWORD,PDWORD,GOPHER_ATTRIBUTE_ENUMERATOR,DWORD);
-BOOL WINAPI GopherGetAttributeW(HINTERNET,LPCWSTR,
-LPCWSTR, LPBYTE, DWORD, PDWORD, GOPHER_ATTRIBUTE_ENUMERATOR, DWORD);
-HINTERNET WINAPI HttpOpenRequestA(HINTERNET,LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPCSTR *,DWORD,DWORD);
-HINTERNET WINAPI HttpOpenRequestW(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR FAR * lplpszAcceptTypes , DWORD dwFlags, DWORD dwContext);
-BOOL WINAPI HttpAddRequestHeadersA(HINTERNET,LPCSTR,DWORD,DWORD);
-BOOL WINAPI HttpAddRequestHeadersW(HINTERNET,LPCWSTR,DWORD,DWORD);
-BOOL WINAPI HttpSendRequestA(HINTERNET,LPCSTR,DWORD,PVOID,DWORD);
-BOOL WINAPI HttpSendRequestW(HINTERNET,LPCWSTR,DWORD,PVOID,DWORD);
-BOOL WINAPI HttpQueryInfoA(HINTERNET,DWORD,PVOID,PDWORD,PDWORD);
-BOOL WINAPI HttpQueryInfoW(HINTERNET,DWORD,PVOID,PDWORD,PDWORD);
-BOOL WINAPI InternetSetCookieA(LPCSTR,LPCSTR,LPCSTR);
-BOOL WINAPI InternetSetCookieW(LPCSTR,LPCWSTR,LPCWSTR);
-BOOL WINAPI InternetGetCookieA(LPCSTR,LPCSTR,LPSTR,PDWORD);
-BOOL WINAPI InternetGetCookieW(LPCSTR,LPCWSTR,LPWSTR,PDWORD);
-DWORD WINAPI InternetAttemptConnect(DWORD);
-DWORD WINAPI InternetErrorDlg(HWND,HINTERNET,DWORD,DWORD,PVOID *);
-DWORD WINAPI InternetConfirmZoneCrossing(HWND,LPSTR,LPSTR,BOOL);
-BOOL WINAPI CreateUrlCacheEntryA(LPCSTR,DWORD,LPCSTR,LPSTR,DWORD);
-BOOL WINAPI CreateUrlCacheEntryW(LPCSTR,DWORD,LPCSTR,LPWSTR,DWORD);
-BOOL WINAPI CommitUrlCacheEntryA(LPCSTR,LPCSTR,FILETIME,FILETIME,DWORD,LPBYTE,DWORD,LPCSTR,DWORD);
-BOOL WINAPI CommitUrlCacheEntryW(LPCSTR,LPCWSTR,FILETIME,FILETIME,DWORD,LPBYTE,DWORD,LPCWSTR,DWORD);
-BOOL WINAPI RetrieveUrlCacheEntryFileA(LPCSTR,LPINTERNET_CACHE_ENTRY_INFOA,PDWORD,DWORD);
-BOOL WINAPI RetrieveUrlCacheEntryFileW(LPCSTR,LPINTERNET_CACHE_ENTRY_INFOW,PDWORD,DWORD);
-BOOL WINAPI UnlockUrlCacheEntryFile(LPCSTR,DWORD);
-HANDLE WINAPI RetrieveUrlCacheEntryStreamA(LPCSTR,LPINTERNET_CACHE_ENTRY_INFOA,PDWORD,BOOL,DWORD);
-HANDLE WINAPI RetrieveUrlCacheEntryStreamW( LPCSTR,LPINTERNET_CACHE_ENTRY_INFOW,PDWORD,BOOL,DWORD);
-BOOL WINAPI ReadUrlCacheEntryStream(HANDLE,DWORD,PVOID,PDWORD,DWORD);
-BOOL WINAPI UnlockUrlCacheEntryStream( HANDLE,DWORD);
-BOOL WINAPI GetUrlCacheEntryInfoA(LPCSTR,LPINTERNET_CACHE_ENTRY_INFOA,PDWORD);
-BOOL WINAPI GetUrlCacheEntryInfoW(LPCSTR,LPINTERNET_CACHE_ENTRY_INFOW,PDWORD);
-BOOL WINAPI SetUrlCacheEntryInfoA(LPCSTR,LPINTERNET_CACHE_ENTRY_INFOA,DWORD);
-BOOL WINAPI SetUrlCacheEntryInfoW(LPCSTR,LPINTERNET_CACHE_ENTRY_INFOW,DWORD);
-HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR,LPINTERNET_CACHE_ENTRY_INFOA,PDWORD);
-HANDLE WINAPI FindFirstUrlCacheEntryW(LPCSTR,LPINTERNET_CACHE_ENTRY_INFOW,PDWORD);
-BOOL WINAPI FindNextUrlCacheEntryA(HANDLE,LPINTERNET_CACHE_ENTRY_INFOA,PDWORD);
-BOOL WINAPI FindNextUrlCacheEntryW(HANDLE,LPINTERNET_CACHE_ENTRY_INFOW,PDWORD);
-BOOL WINAPI FindCloseUrlCache(HANDLE);
-BOOL WINAPI DeleteUrlCacheEntry(LPCSTR);
-DWORD AuthenticateUser(PVOID*,LPSTR,LPSTR,DWORD,LPSTR,DWORD,LPSTR,LPSTR);
-BOOL WINAPI HttpSendRequestExA(HINTERNET,LPINTERNET_BUFFERSA,LPINTERNET_BUFFERSA,DWORD,DWORD);
-BOOL WINAPI HttpSendRequestExW(HINTERNET,LPINTERNET_BUFFERSW,LPINTERNET_BUFFERSW,DWORD,DWORD);
-BOOL WINAPI HttpEndRequestA(HINTERNET,LPINTERNET_BUFFERSA,DWORD,DWORD);
-BOOL WINAPI HttpEndRequestW(HINTERNET,LPINTERNET_BUFFERSW,DWORD,DWORD);
-DWORD WINAPI InternetDial(HWND,LPTSTR,DWORD,LPDWORD,DWORD);
-DWORD WINAPI InternetHangUp(DWORD,DWORD);
-BOOL WINAPI InternetGoOnline(LPTSTR,HWND,DWORD);
-BOOL WINAPI InternetAutodial(DWORD,DWORD);
-BOOL WINAPI InternetAutodialHangup(DWORD);
-BOOL WINAPI InternetGetConnectedState(LPDWORD,DWORD);
-BOOL WINAPI InternetSetDialState(LPCTSTR,DWORD,DWORD);
-BOOL WINAPI InternetReadFileExA(HINTERNET,LPINTERNET_BUFFERSA,DWORD,DWORD_PTR);
-BOOL WINAPI InternetReadFileExW(HINTERNET,LPINTERNET_BUFFERSW,DWORD,DWORD_PTR);
-
-#ifdef UNICODE
-#define InternetCrackUrl InternetCrackUrlW
-#define InternetCreateUrl InternetCreateUrlW
-#define InternetCanonicalizeUrl InternetCanonicalizeUrlW
-#define InternetCombineUrl InternetCombineUrlW
-#define InternetOpen InternetOpenW
-#define InternetConnect InternetConnectW
-#define InternetOpenUrl InternetOpenUrlW
-#define InternetFindNextFile InternetFindNextFileW
-#define InternetQueryOption InternetQueryOptionW
-#define InternetSetOption InternetSetOptionW
-#define InternetSetOptionEx InternetSetOptionExW
-#define InternetGetLastResponseInfo InternetGetLastResponseInfoW
-#define InternetReadFileEx  InternetReadFileExW
-#define FtpFindFirstFile FtpFindFirstFileW
-#define FtpGetFile FtpGetFileW
-#define FtpPutFile FtpPutFileW
-#define FtpDeleteFile FtpDeleteFileW
-#define FtpRenameFile FtpRenameFileW
-#define FtpOpenFile FtpOpenFileW
-#define FtpCreateDirectory FtpCreateDirectoryW
-#define FtpRemoveDirectory FtpRemoveDirectoryW
-#define FtpSetCurrentDirectory FtpSetCurrentDirectoryW
-#define FtpGetCurrentDirectory FtpGetCurrentDirectoryW
-#define FtpCommand FtpCommandW
-#define GopherGetLocatorType GopherGetLocatorTypeW
-#define GopherCreateLocator GopherCreateLocatorW
-#define GopherFindFirstFile GopherFindFirstFileW
-#define GopherOpenFile GopherOpenFileW
-#define GopherGetAttribute GopherGetAttributeW
-#define HttpSendRequest HttpSendRequestW
-#define HttpOpenRequest HttpOpenRequestW
-#define HttpAddRequestHeaders HttpAddRequestHeadersW
-#define HttpQueryInfo HttpQueryInfoW
-#define InternetSetCookie InternetSetCookieW
-#define InternetGetCookie InternetGetCookieW
-#define CreateUrlCacheEntry CreateUrlCacheEntryW
-#define RetrieveUrlCacheEntryStream RetrieveUrlCacheEntryStreamW
-#define FindNextUrlCacheEntry FindNextUrlCacheEntryW
-#define CommitUrlCacheEntry CommitUrlCacheEntryW
-#define GetUrlCacheEntryInfo GetUrlCacheEntryInfoW
-#define SetUrlCacheEntryInfo SetUrlCacheEntryInfoW
-#define FindFirstUrlCacheEntry FindFirstUrlCacheEntryW
-#define RetrieveUrlCacheEntryFile RetrieveUrlCacheEntryFileW
-#define HttpSendRequestEx	 HttpSendRequestExW
-#define HttpEndRequest		 HttpEndRequestW
-#else
-#define GopherGetAttribute GopherGetAttributeA
-#define InternetCrackUrl InternetCrackUrlA
-#define InternetCreateUrl InternetCreateUrlA
-#define InternetCanonicalizeUrl InternetCanonicalizeUrlA
-#define InternetCombineUrl InternetCombineUrlA
-#define InternetOpen InternetOpenA
-#define InternetConnect InternetConnectA
-#define InternetOpenUrl InternetOpenUrlA
-#define InternetFindNextFile InternetFindNextFileA
-#define InternetQueryOption InternetQueryOptionA
-#define InternetSetOption InternetSetOptionA
-#define InternetSetOptionEx InternetSetOptionExA
-#define InternetGetLastResponseInfo InternetGetLastResponseInfoA
-#define InternetReadFileEx  InternetReadFileExA
-#define FtpFindFirstFile FtpFindFirstFileA
-#define FtpGetFile FtpGetFileA
-#define FtpPutFile FtpPutFileA
-#define FtpDeleteFile FtpDeleteFileA
-#define FtpRenameFile FtpRenameFileA
-#define FtpOpenFile FtpOpenFileA
-#define FtpCreateDirectory FtpCreateDirectoryA
-#define FtpRemoveDirectory FtpRemoveDirectoryA
-#define FtpSetCurrentDirectory FtpSetCurrentDirectoryA
-#define FtpGetCurrentDirectory FtpGetCurrentDirectoryA
-#define FtpCommand FtpCommandA
-#define GopherGetLocatorType GopherGetLocatorTypeA
-#define GopherCreateLocator GopherCreateLocatorA
-#define GopherFindFirstFile GopherFindFirstFileA
-#define GopherOpenFile GopherOpenFileA
-#define HttpSendRequest HttpSendRequestA
-#define HttpOpenRequest HttpOpenRequestA
-#define HttpAddRequestHeaders HttpAddRequestHeadersA
-#define HttpQueryInfo HttpQueryInfoA
-#define InternetSetCookie InternetSetCookieA
-#define InternetGetCookie InternetGetCookieA
-#define CreateUrlCacheEntry CreateUrlCacheEntryA
-#define RetrieveUrlCacheEntryStream RetrieveUrlCacheEntryStreamA
-#define FindNextUrlCacheEntry FindNextUrlCacheEntryA
-#define CommitUrlCacheEntry CommitUrlCacheEntryA
-#define GetUrlCacheEntryInfo GetUrlCacheEntryInfoA
-#define SetUrlCacheEntryInfo SetUrlCacheEntryInfoA
-#define FindFirstUrlCacheEntry FindFirstUrlCacheEntryA
-#define RetrieveUrlCacheEntryFile RetrieveUrlCacheEntryFileA
-#define HttpSendRequestEx	 HttpSendRequestExA
-#define HttpEndRequest		 HttpEndRequestA
-#endif /* UNICODE */
-#endif /* RC_INVOKED */
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/winioctl.h b/winsup/w32api/include/winioctl.h
deleted file mode 100644
index d32b38172..000000000
--- a/winsup/w32api/include/winioctl.h
+++ /dev/null
@@ -1,528 +0,0 @@
-#ifndef _WINIOCTL_H
-#define _WINIOCTL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define HIST_NO_OF_BUCKETS 24
-#define HISTOGRAM_BUCKET_SIZE sizeof(HISTOGRAM_BUCKET)
-#define DISK_HISTOGRAM_SIZE sizeof(DISK_HISTOGRAM)
-#define CTL_CODE(t,f,m,a) (((t)<<16)|((a)<<14)|((f)<<2)|(m))
-#define DEVICE_TYPE_FROM_CTL_CODE(c) (((DWORD)((c)&0xffff0000))>>16)
-#define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE
-#define IOCTL_STORAGE_CHECK_VERIFY     CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_STORAGE_CHECK_VERIFY2    CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_STORAGE_MEDIA_REMOVAL    CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_STORAGE_EJECT_MEDIA      CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_STORAGE_LOAD_MEDIA       CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_STORAGE_LOAD_MEDIA2      CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_STORAGE_RESERVE          CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_STORAGE_RELEASE          CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_STORAGE_FIND_NEW_DEVICES CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_STORAGE_EJECTION_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_STORAGE_MCN_CONTROL      CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_STORAGE_GET_MEDIA_TYPES  CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_STORAGE_RESET_BUS        CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_STORAGE_RESET_DEVICE     CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_STORAGE_PREDICT_FAILURE CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_DISK_BASE FILE_DEVICE_DISK
-#define IOCTL_DISK_GET_DRIVE_GEOMETRY CTL_CODE(IOCTL_DISK_BASE,0,METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_DISK_GET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE,1,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_SET_PARTITION_INFO CTL_CODE(IOCTL_DISK_BASE,2,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS)
-#define IOCTL_DISK_GET_DRIVE_LAYOUT	CTL_CODE(IOCTL_DISK_BASE,3,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_SET_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE,4,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS)
-#define IOCTL_DISK_VERIFY CTL_CODE(IOCTL_DISK_BASE,5,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_FORMAT_TRACKS CTL_CODE(IOCTL_DISK_BASE,6,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS)
-#define IOCTL_DISK_REASSIGN_BLOCKS CTL_CODE(IOCTL_DISK_BASE,7,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS)
-#define IOCTL_DISK_PERFORMANCE CTL_CODE(IOCTL_DISK_BASE,8,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_IS_WRITABLE CTL_CODE(IOCTL_DISK_BASE,9,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_LOGGING CTL_CODE(IOCTL_DISK_BASE,10,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_FORMAT_TRACKS_EX CTL_CODE(IOCTL_DISK_BASE,11,METHOD_BUFFERED,FILE_READ_ACCESS|FILE_WRITE_ACCESS)
-#define IOCTL_DISK_HISTOGRAM_STRUCTURE CTL_CODE(IOCTL_DISK_BASE,12,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_HISTOGRAM_DATA CTL_CODE(IOCTL_DISK_BASE,13,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_HISTOGRAM_RESET CTL_CODE(IOCTL_DISK_BASE,14,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_REQUEST_STRUCTURE CTL_CODE(IOCTL_DISK_BASE,15,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_REQUEST_DATA CTL_CODE(IOCTL_DISK_BASE,16,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_GET_PARTITION_INFO_EX CTL_CODE(IOCTL_DISK_BASE,0x12,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_SET_PARTITION_INFO_EX CTL_CODE(IOCTL_DISK_BASE,0x13,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_DISK_GET_DRIVE_LAYOUT_EX CTL_CODE(IOCTL_DISK_BASE,0x14,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_SET_DRIVE_LAYOUT_EX CTL_CODE(IOCTL_DISK_BASE,0x15,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_DISK_CREATE_DISK CTL_CODE(IOCTL_DISK_BASE,0x16,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_DISK_GET_LENGTH_INFO CTL_CODE(IOCTL_DISK_BASE,0x17,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_PERFORMANCE_OFF CTL_CODE(IOCTL_DISK_BASE,0x18,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_GET_DRIVE_GEOMETRY_EX CTL_CODE(IOCTL_DISK_BASE,0x28,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_GROW_PARTITION CTL_CODE(IOCTL_DISK_BASE,0x34,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_DISK_GET_CACHE_INFORMATION CTL_CODE(IOCTL_DISK_BASE,0x35,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_SET_CACHE_INFORMATION CTL_CODE(IOCTL_DISK_BASE,0x36,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_DISK_DELETE_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE,0x40,METHOD_BUFFERED,FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_DISK_UPDATE_PROPERTIES CTL_CODE(IOCTL_DISK_BASE,0x50,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_CHECK_VERIFY CTL_CODE(IOCTL_DISK_BASE,0x200,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_MEDIA_REMOVAL CTL_CODE(IOCTL_DISK_BASE,0x201,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_EJECT_MEDIA CTL_CODE(IOCTL_DISK_BASE,0x202,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_LOAD_MEDIA CTL_CODE(IOCTL_DISK_BASE,0x203,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_RESERVE CTL_CODE(IOCTL_DISK_BASE,0x204,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_RELEASE CTL_CODE(IOCTL_DISK_BASE,0x205,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_FIND_NEW_DEVICES CTL_CODE(IOCTL_DISK_BASE,0x206,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_REMOVE_DEVICE CTL_CODE(IOCTL_DISK_BASE,0x207,METHOD_BUFFERED,FILE_READ_ACCESS)
-#define IOCTL_DISK_GET_MEDIA_TYPES CTL_CODE(IOCTL_DISK_BASE,0x300,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define IOCTL_DISK_UPDATE_DRIVE_SIZE CTL_CODE(IOCTL_DISK_BASE, 0x0032, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)
-#define IOCTL_SERIAL_LSRMST_INSERT	CTL_CODE(FILE_DEVICE_SERIAL_PORT,31,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define FSCTL_LOCK_VOLUME	CTL_CODE(FILE_DEVICE_FILE_SYSTEM,6,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define FSCTL_UNLOCK_VOLUME	CTL_CODE(FILE_DEVICE_FILE_SYSTEM,7,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define FSCTL_DISMOUNT_VOLUME	CTL_CODE(FILE_DEVICE_FILE_SYSTEM,8,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define FSCTL_MOUNT_DBLS_VOLUME	CTL_CODE(FILE_DEVICE_FILE_SYSTEM,13,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define FSCTL_GET_COMPRESSION	CTL_CODE(FILE_DEVICE_FILE_SYSTEM,15,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define FSCTL_SET_COMPRESSION	CTL_CODE(FILE_DEVICE_FILE_SYSTEM,16,METHOD_BUFFERED,FILE_READ_DATA|FILE_WRITE_DATA)
-#define FSCTL_READ_COMPRESSION	CTL_CODE(FILE_DEVICE_FILE_SYSTEM,17,METHOD_NEITHER,FILE_READ_DATA)
-#define FSCTL_WRITE_COMPRESSION	CTL_CODE(FILE_DEVICE_FILE_SYSTEM,18,METHOD_NEITHER,FILE_WRITE_DATA)
-#define FSCTL_GET_VOLUME_BITMAP CTL_CODE(FILE_DEVICE_FILE_SYSTEM,27,METHOD_NEITHER,FILE_ANY_ACCESS)
-#define FSCTL_GET_RETRIEVAL_POINTERS CTL_CODE(FILE_DEVICE_FILE_SYSTEM,28,METHOD_NEITHER,FILE_ANY_ACCESS)
-#define FSCTL_MOVE_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM,29,METHOD_BUFFERED,FILE_ANY_ACCESS)
-#define FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSCTL_SET_SPARSE	CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS)
-#define DEVICE_TYPE DWORD
-#define FILE_DEVICE_BEEP	1
-#define FILE_DEVICE_CD_ROM	2
-#define FILE_DEVICE_CD_ROM_FILE_SYSTEM	3
-#define FILE_DEVICE_CONTROLLER	4
-#define FILE_DEVICE_DATALINK	5
-#define FILE_DEVICE_DFS	6
-#define FILE_DEVICE_DISK	7
-#define FILE_DEVICE_DISK_FILE_SYSTEM	8
-#define FILE_DEVICE_FILE_SYSTEM	9
-#define FILE_DEVICE_INPORT_PORT	10
-#define FILE_DEVICE_KEYBOARD	11
-#define FILE_DEVICE_MAILSLOT	12
-#define FILE_DEVICE_MIDI_IN	13
-#define FILE_DEVICE_MIDI_OUT	14
-#define FILE_DEVICE_MOUSE	15
-#define FILE_DEVICE_MULTI_UNC_PROVIDER 16
-#define FILE_DEVICE_NAMED_PIPE	17
-#define FILE_DEVICE_NETWORK	18
-#define FILE_DEVICE_NETWORK_BROWSER	19
-#define FILE_DEVICE_NETWORK_FILE_SYSTEM	20
-#define FILE_DEVICE_NULL	21
-#define FILE_DEVICE_PARALLEL_PORT	22
-#define FILE_DEVICE_PHYSICAL_NETCARD	23
-#define FILE_DEVICE_PRINTER	24
-#define FILE_DEVICE_SCANNER	25
-#define FILE_DEVICE_SERIAL_MOUSE_PORT	26
-#define FILE_DEVICE_SERIAL_PORT	27
-#define FILE_DEVICE_SCREEN	28
-#define FILE_DEVICE_SOUND	29
-#define FILE_DEVICE_STREAMS	30
-#define FILE_DEVICE_TAPE	31
-#define FILE_DEVICE_TAPE_FILE_SYSTEM	32
-#define FILE_DEVICE_TRANSPORT	33
-#define FILE_DEVICE_UNKNOWN	34
-#define FILE_DEVICE_VIDEO	35
-#define FILE_DEVICE_VIRTUAL_DISK	36
-#define FILE_DEVICE_WAVE_IN	37
-#define FILE_DEVICE_WAVE_OUT	38
-#define FILE_DEVICE_8042_PORT	39
-#define FILE_DEVICE_NETWORK_REDIRECTOR	40
-#define FILE_DEVICE_BATTERY	41
-#define FILE_DEVICE_BUS_EXTENDER	42
-#define FILE_DEVICE_MODEM           43
-#define FILE_DEVICE_VDM             44
-#define FILE_DEVICE_MASS_STORAGE    45
-#define FILE_DEVICE_SMB             46
-#define FILE_DEVICE_KS              47
-#define FILE_DEVICE_CHANGER         48
-#define FILE_DEVICE_SMARTCARD       49
-#define FILE_DEVICE_ACPI            50
-#define FILE_DEVICE_DVD             51
-#define FILE_DEVICE_FULLSCREEN_VIDEO 52
-#define FILE_DEVICE_DFS_FILE_SYSTEM  53
-#define FILE_DEVICE_DFS_VOLUME       54
-#define FILE_DEVICE_SERENUM          55
-#define FILE_DEVICE_TERMSRV          56
-#define FILE_DEVICE_KSEC             57
-#define PARTITION_ENTRY_UNUSED	0
-#define PARTITION_FAT_12	1
-#define PARTITION_XENIX_1	2
-#define PARTITION_XENIX_2	3
-#define PARTITION_FAT_16	4
-#define PARTITION_EXTENDED	5
-#define PARTITION_HUGE	6
-#define PARTITION_IFS	7
-#define PARTITION_FAT32 0x0B
-#define PARTITION_FAT32_XINT13 0x0C
-#define PARTITION_XINT13 0x0E
-#define PARTITION_XINT13_EXTENDED 0x0F
-#define PARTITION_PREP	0x41
-#define PARTITION_LDM	0x42
-#define PARTITION_UNIX	0x63
-#define PARTITION_NTFT	128
-#define VALID_NTFT	0xC0
-#define METHOD_BUFFERED	0
-#define METHOD_IN_DIRECT	1
-#define METHOD_OUT_DIRECT	2
-#define METHOD_NEITHER	    3
-#define SERIAL_LSRMST_ESCAPE	    0
-#define SERIAL_LSRMST_LSR_DATA  	1
-#define SERIAL_LSRMST_LSR_NODATA	2
-#define SERIAL_LSRMST_MST	3
-
-/*  Also in ddk/winddk.h */
-#define FILE_ANY_ACCESS		0x00000000
-#define FILE_SPECIAL_ACCESS	FILE_ANY_ACCESS
-#define FILE_READ_ACCESS	0x00000001
-#define FILE_WRITE_ACCESS	0x00000002
-
-#define DISK_LOGGING_START	0
-#define DISK_LOGGING_STOP	1
-#define DISK_LOGGING_DUMP	2
-#define DISK_BINNING	    3
-typedef WORD BAD_TRACK_NUMBER,*PBAD_TRACK_NUMBER;
-typedef enum _BIN_TYPES {RequestSize,RequestLocation} BIN_TYPES;
-typedef struct _BIN_RANGE {
-	LARGE_INTEGER StartValue;
-	LARGE_INTEGER Length;
-} BIN_RANGE,*PBIN_RANGE;
-typedef struct _BIN_COUNT {
-	BIN_RANGE BinRange;
-	DWORD BinCount;
-} BIN_COUNT,*PBIN_COUNT;
-typedef struct _BIN_RESULTS {
-	DWORD NumberOfBins;
-	BIN_COUNT BinCounts[1];
-} BIN_RESULTS,*PBIN_RESULTS;
-typedef enum _PARTITION_STYLE {
-  PARTITION_STYLE_MBR, 
-  PARTITION_STYLE_GPT, 
-  PARTITION_STYLE_RAW
-} PARTITION_STYLE;
-typedef struct {
-  GUID DiskId;
-  DWORD MaxPartitionCount;
-} CREATE_DISK_GPT,*PCREATE_DISK_GPT;
-typedef struct {
-  DWORD Signature;
-} CREATE_DISK_MBR,*PCREATE_DISK_MBR;
-typedef struct {
-  PARTITION_STYLE PartitionStyle;
-  _ANONYMOUS_UNION union {
-    CREATE_DISK_MBR Mbr;
-    CREATE_DISK_GPT Gpt;
-  };
-} CREATE_DISK,*PCREATE_DISK;
-typedef enum {
-  EqualPriority,
-  KeepPrefetchedData,
-  KeepReadData
-} DISK_CACHE_RETENTION_PRIORITY;
-typedef struct _DISK_CACHE_INFORMATION {
-  BOOLEAN ParametersSavable;
-  BOOLEAN ReadCacheEnabled;
-  BOOLEAN WriteCacheEnabled;
-  DISK_CACHE_RETENTION_PRIORITY ReadRetentionPriority;
-  DISK_CACHE_RETENTION_PRIORITY WriteRetentionPriority;
-  WORD DisablePrefetchTransferLength;
-  BOOLEAN PrefetchScalar;
-  _ANONYMOUS_UNION union {
-    struct {
-      WORD Minimum;
-      WORD Maximum;
-      WORD MaximumBlocks;
-    } ScalarPrefetch;
-    struct {
-      WORD Minimum;
-      WORD Maximum;
-    } BlockPrefetch;
-  };
-} DISK_CACHE_INFORMATION,*PDISK_CACHE_INFORMATION;
-typedef enum _DETECTION_TYPE {
-  DetectNone,
-  DetectInt13,
-  DetectExInt13
-} DETECTION_TYPE;
-typedef struct _DISK_INT13_INFO {
-  WORD DriveSelect;
-  DWORD MaxCylinders;
-  WORD SectorsPerTrack;
-  WORD MaxHeads;
-  WORD NumberDrives;
-} DISK_INT13_INFO,*PDISK_INT13_INFO;
-typedef struct _DISK_EX_INT13_INFO {
-  WORD ExBufferSize;
-  WORD ExFlags;
-  DWORD ExCylinders;
-  DWORD ExHeads;
-  DWORD ExSectorsPerTrack;
-  DWORD64 ExSectorsPerDrive;
-  WORD ExSectorSize;
-  WORD ExReserved;
-} DISK_EX_INT13_INFO,*PDISK_EX_INT13_INFO;
-typedef struct _DISK_DETECTION_INFO {
-  DWORD SizeOfDetectInfo;
-  DETECTION_TYPE DetectionType;
-  _ANONYMOUS_UNION union {
-    _ANONYMOUS_STRUCT struct {
-      DISK_INT13_INFO Int13;
-      DISK_EX_INT13_INFO ExInt13;
-    };
-  };
-} DISK_DETECTION_INFO,*PDISK_DETECTION_INFO;
-typedef enum _MEDIA_TYPE {
-  Unknown,
-  F5_1Pt2_512,
-  F3_1Pt44_512,
-  F3_2Pt88_512,
-  F3_20Pt8_512,
-  F3_720_512,
-  F5_360_512,
-  F5_320_512,
-  F5_320_1024,
-  F5_180_512,
-  F5_160_512,
-  RemovableMedia,
-  FixedMedia,
-  F3_120M_512,
-  F3_640_512,
-  F5_640_512,
-  F5_720_512,
-  F3_1Pt2_512,
-  F3_1Pt23_1024,
-  F5_1Pt23_1024,
-  F3_128Mb_512,
-  F3_230Mb_512,
-  F8_256_128,
-  F3_200Mb_512,
-  F3_240M_512,
-  F3_32M_512
-} MEDIA_TYPE,*PMEDIA_TYPE;
-typedef struct _DISK_GEOMETRY {
-  LARGE_INTEGER Cylinders;
-  MEDIA_TYPE MediaType;
-  DWORD TracksPerCylinder;
-  DWORD SectorsPerTrack;
-  DWORD BytesPerSector;
-} DISK_GEOMETRY,*PDISK_GEOMETRY;
-typedef struct _DISK_GEOMETRY_EX {
-  DISK_GEOMETRY Geometry;
-  LARGE_INTEGER DiskSize;
-  BYTE Data[1];
-} DISK_GEOMETRY_EX,*PDISK_GEOMETRY_EX;
-typedef struct _DISK_GROW_PARTITION {
-  DWORD PartitionNumber;
-  LARGE_INTEGER BytesToGrow;
-} DISK_GROW_PARTITION, *PDISK_GROW_PARTITION;
-typedef struct _DISK_PARTITION_INFO {
-  DWORD SizeOfPartitionInfo;
-  PARTITION_STYLE PartitionStyle;
-  _ANONYMOUS_UNION union {
-    struct {
-      DWORD Signature;
-    } Mbr;
-    struct {
-      GUID DiskId;
-    } Gpt;
-  };
-} DISK_PARTITION_INFO,*PDISK_PARTITION_INFO;
-typedef struct _DISK_PERFORMANCE {
-    LARGE_INTEGER BytesRead;
-    LARGE_INTEGER BytesWritten;
-    LARGE_INTEGER ReadTime;
-    LARGE_INTEGER WriteTime;
-    DWORD ReadCount;
-    DWORD WriteCount;
-    DWORD QueueDepth;
-} DISK_PERFORMANCE, *PDISK_PERFORMANCE;
-typedef struct _DISK_RECORD {
-  LARGE_INTEGER ByteOffset;
-  LARGE_INTEGER StartTime;
-  LARGE_INTEGER EndTime;
-  PVOID VirtualAddress;
-  DWORD NumberOfBytes;
-  BYTE DeviceNumber;
-  BOOLEAN ReadRequest;
-} DISK_RECORD,*PDISK_RECORD;
-typedef struct _DISK_LOGGING {
-  BYTE Function;
-  PVOID BufferAddress;
-  DWORD BufferSize;
-} DISK_LOGGING,*PDISK_LOGGING;
-typedef struct DiskQuotaUserInformation {
-  LONGLONG QuotaUsed;
-  LONGLONG QuotaThreshold;
-  LONGLONG QuotaLimit;
-} DISKQUOTA_USER_INFORMATION,*PDISKQUOTA_USER_INFORMATION;
-typedef struct _FORMAT_PARAMETERS {
-  MEDIA_TYPE MediaType;
-  DWORD StartCylinderNumber;
-  DWORD EndCylinderNumber;
-  DWORD StartHeadNumber;
-  DWORD EndHeadNumber;
-} FORMAT_PARAMETERS,*PFORMAT_PARAMETERS;
-typedef struct _FORMAT_EX_PARAMETERS {
-  MEDIA_TYPE MediaType;
-  DWORD StartCylinderNumber;
-  DWORD EndCylinderNumber;
-  DWORD StartHeadNumber;
-  DWORD EndHeadNumber;
-  WORD FormatGapLength;
-  WORD SectorsPerTrack;
-  WORD SectorNumber[1];
-} FORMAT_EX_PARAMETERS,*PFORMAT_EX_PARAMETERS;
-typedef struct {
-  LARGE_INTEGER Length;
-} GET_LENGTH_INFORMATION;
-typedef struct _HISTOGRAM_BUCKET {
-  DWORD Reads;
-  DWORD Writes;
-} HISTOGRAM_BUCKET,*PHISTOGRAM_BUCKET;
-typedef struct _DISK_HISTOGRAM {
-  LARGE_INTEGER DiskSize;
-  LARGE_INTEGER Start;
-  LARGE_INTEGER End;
-  LARGE_INTEGER Average;
-  LARGE_INTEGER AverageRead;
-  LARGE_INTEGER AverageWrite;
-  DWORD Granularity;
-  DWORD Size;
-  DWORD ReadCount;
-  DWORD WriteCount;
-  PHISTOGRAM_BUCKET Histogram;
-} DISK_HISTOGRAM,*PDISK_HISTOGRAM;
-typedef struct _DISK_EXTENT {
-  DWORD DiskNumber;
-  LARGE_INTEGER StartingOffset;
-  LARGE_INTEGER ExtentLength;
-} DISK_EXTENT,*PDISK_EXTENT;
-typedef struct _VOLUME_DISK_EXTENTS {
-  DWORD NumberOfDiskExtents;
-  DISK_EXTENT Extents[1];
-} VOLUME_DISK_EXTENTS,*PVOLUME_DISK_EXTENTS;
-typedef struct _PARTITION_INFORMATION {
-  LARGE_INTEGER StartingOffset;
-  LARGE_INTEGER PartitionLength;
-  DWORD HiddenSectors;
-  DWORD PartitionNumber;
-  BYTE PartitionType;
-  BOOLEAN BootIndicator;
-  BOOLEAN RecognizedPartition;
-  BOOLEAN RewritePartition;
-} PARTITION_INFORMATION,*PPARTITION_INFORMATION;
-typedef struct _DRIVE_LAYOUT_INFORMATION {
-  DWORD PartitionCount;
-  DWORD Signature;
-  PARTITION_INFORMATION PartitionEntry[1];
-} DRIVE_LAYOUT_INFORMATION, *PDRIVE_LAYOUT_INFORMATION;
-typedef struct _DRIVE_LAYOUT_INFORMATION_GPT {
-  GUID DiskId;
-  LARGE_INTEGER StartingUsableOffset;
-  LARGE_INTEGER UsableLength;
-  ULONG MaxPartitionCount;
-} DRIVE_LAYOUT_INFORMATION_GPT,*PDRIVE_LAYOUT_INFORMATION_GPT;
-typedef struct _DRIVE_LAYOUT_INFORMATION_MBR {
-  ULONG Signature;
-} DRIVE_LAYOUT_INFORMATION_MBR, *PDRIVE_LAYOUT_INFORMATION_MBR;
-typedef struct _PARTITION_INFORMATION_MBR {
-  BYTE PartitionType;
-  BOOLEAN BootIndicator;
-  BOOLEAN RecognizedPartition;
-  DWORD HiddenSectors;
-} PARTITION_INFORMATION_MBR;
-typedef struct _PARTITION_INFORMATION_GPT {
-  GUID PartitionType;
-  GUID PartitionId;
-  DWORD64 Attributes;
-  WCHAR Name[36];
-} PARTITION_INFORMATION_GPT;
-typedef struct _PARTITION_INFORMATION_EX {
-  PARTITION_STYLE PartitionStyle;
-  LARGE_INTEGER StartingOffset;
-  LARGE_INTEGER PartitionLength;
-  DWORD PartitionNumber;
-  BOOLEAN RewritePartition;
-  _ANONYMOUS_UNION union {
-    PARTITION_INFORMATION_MBR Mbr;
-    PARTITION_INFORMATION_GPT Gpt;
-  };
-} PARTITION_INFORMATION_EX;
-typedef struct _DRIVE_LAYOUT_INFORMATION_EX {
-  DWORD PartitionStyle;
-  DWORD PartitionCount;
-  _ANONYMOUS_UNION union {
-    DRIVE_LAYOUT_INFORMATION_MBR Mbr;
-    DRIVE_LAYOUT_INFORMATION_GPT Gpt;
-  };
-  PARTITION_INFORMATION_EX PartitionEntry[1];
-} DRIVE_LAYOUT_INFORMATION_EX,*PDRIVE_LAYOUT_INFORMATION_EX;
-typedef struct {
-  HANDLE FileHandle;
-  LARGE_INTEGER StartingVcn;
-  LARGE_INTEGER StartingLcn;
-  DWORD ClusterCount;
-} MOVE_FILE_DATA,*PMOVE_FILE_DATA;
-typedef struct _PERF_BIN {
-  DWORD NumberOfBins;
-  DWORD TypeOfBin;
-  BIN_RANGE BinsRanges[1];
-} PERF_BIN,*PPERF_BIN;
-typedef struct _PREVENT_MEDIA_REMOVAL {
-  BOOLEAN PreventMediaRemoval;
-} PREVENT_MEDIA_REMOVAL,*PPREVENT_MEDIA_REMOVAL;
-typedef struct RETRIEVAL_POINTERS_BUFFER {
-  DWORD ExtentCount;
-  LARGE_INTEGER StartingVcn;
-  struct {
-    LARGE_INTEGER NextVcn;
-    LARGE_INTEGER Lcn;
-  } Extents[1];
-} RETRIEVAL_POINTERS_BUFFER,*PRETRIEVAL_POINTERS_BUFFER;
-typedef struct _REASSIGN_BLOCKS {
-  WORD Reserved;
-  WORD Count;
-  DWORD BlockNumber[1];
-} REASSIGN_BLOCKS,*PREASSIGN_BLOCKS;
-typedef struct _SET_PARTITION_INFORMATION {
-  BYTE PartitionType;
-} SET_PARTITION_INFORMATION,*PSET_PARTITION_INFORMATION;
-typedef struct {
-  LARGE_INTEGER StartingLcn;
-} STARTING_LCN_INPUT_BUFFER,*PSTARTING_LCN_INPUT_BUFFER;
-typedef struct {
-  LARGE_INTEGER StartingVcn;
-} STARTING_VCN_INPUT_BUFFER,*PSTARTING_VCN_INPUT_BUFFER;
-typedef struct _VERIFY_INFORMATION {
-  LARGE_INTEGER StartingOffset;
-  DWORD Length;
-} VERIFY_INFORMATION,*PVERIFY_INFORMATION;
-typedef struct {
-  LARGE_INTEGER StartingLcn;
-  LARGE_INTEGER BitmapSize;
-  BYTE Buffer[1];
-} VOLUME_BITMAP_BUFFER,*PVOLUME_BITMAP_BUFFER;
-#define IsRecognizedPartition(t)\
-  (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_12))||\
-	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT_16))||\
-	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_IFS))||\
-	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_HUGE))||\
-	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32))||\
-	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_FAT32_XINT13))||\
-	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13))||\
-	((t&~PARTITION_NTFT)==PARTITION_FAT_12)||\
-	((t&~PARTITION_NTFT)==PARTITION_FAT_16)||\
-	((t&~PARTITION_NTFT)==PARTITION_IFS)||\
-	((t&~PARTITION_NTFT)==PARTITION_HUGE)||\
-	((t&~PARTITION_NTFT)==PARTITION_FAT32)||\
-	((t&~PARTITION_NTFT)==PARTITION_FAT32_XINT13)||\
-	((t&~PARTITION_NTFT)==PARTITION_XINT13))
-#define IsContainerPartition(t)\
-  (((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_EXTENDED))||\
-	((t&PARTITION_NTFT)&&((t&~VALID_NTFT)==PARTITION_XINT13_EXTENDED))||\
-	((t&~PARTITION_NTFT)==PARTITION_EXTENDED)||\
-	((t&~PARTITION_NTFT)==PARTITION_XINT13_EXTENDED))
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/winldap.h b/winsup/w32api/include/winldap.h
deleted file mode 100644
index 36b86268d..000000000
--- a/winsup/w32api/include/winldap.h
+++ /dev/null
@@ -1,713 +0,0 @@
-/*
-  winldap.h - Header file for the Windows LDAP API
-
-  Written by Filip Navara <xnavara@volny.cz>
-
-  References:
-    The C LDAP Application Program Interface
-    http://www.watersprings.org/pub/id/draft-ietf-ldapext-ldap-c-api-05.txt
-
-    Lightweight Directory Access Protocol Reference
-    http://msdn.microsoft.com/library/en-us/netdir/ldap/ldap_reference.asp
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#ifndef _WINLDAP_H
-#define _WINLDAP_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifndef _SCHANNEL_H
-#include <schannel.h>
-#endif
-
-#ifndef _WINBER_H
-#include <winber.h>
-#endif
-
-#ifndef WINLDAPAPI
-#define WINLDAPAPI DECLSPEC_IMPORT
-#endif
-
-#ifndef _WINLDAP_DEPRECATED
-#if (( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3)
-#define _WINLDAP_DEPRECATED __attribute__((__deprecated__))
-#else
-#define _WINLDAP_DEPRECATED
-#endif
-#endif
-
-#include <pshpack4.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LDAP_VERSION1	1
-#define LDAP_VERSION2	2
-#define LDAP_VERSION3	3
-#define LDAP_VERSION	LDAP_VERSION2
-#define LDAP_API_VERSION	2004
-#define LDAP_VERSION_MIN	LDAP_VERSION2
-#define LDAP_VERSION_MAX	LDAP_VERSION3
-#define LDAP_VENDOR_NAME	"Microsoft Corporation."
-#define LDAP_VENDOR_NAME_W	L"Microsoft Corporation."
-#define LDAP_VENDOR_VERSION	510
-#define LDAP_API_INFO_VERSION	1
-#define LDAP_FEATURE_INFO_VERSION	1
-#define LDAP_SUCCESS	0x00
-#define LDAP_OPERATIONS_ERROR	0x01
-#define LDAP_PROTOCOL_ERROR	0x02
-#define LDAP_TIMELIMIT_EXCEEDED	0x03
-#define LDAP_SIZELIMIT_EXCEEDED	0x04
-#define LDAP_COMPARE_FALSE	0x05
-#define LDAP_COMPARE_TRUE	0x06
-#define LDAP_STRONG_AUTH_NOT_SUPPORTED	0x07
-#define LDAP_STRONG_AUTH_REQUIRED	0x08
-#define LDAP_REFERRAL_V2	0x09
-#define LDAP_REFERRAL	0x0a
-#define LDAP_ADMIN_LIMIT_EXCEEDED	0x0b
-#define LDAP_UNAVAILABLE_CRIT_EXTENSION	0x0c
-#define LDAP_CONFIDENTIALITY_REQUIRED	0x0d
-#define LDAP_SASL_BIND_IN_PROGRESS	0x0e
-#define LDAP_NO_SUCH_ATTRIBUTE	0x10
-#define LDAP_UNDEFINED_TYPE	0x11
-#define LDAP_INAPPROPRIATE_MATCHING	0x12
-#define LDAP_CONSTRAINT_VIOLATION	0x13
-#define LDAP_TYPE_OR_VALUE_EXISTS	0x14
-#define LDAP_INVALID_SYNTAX	0x15
-#define LDAP_NO_SUCH_OBJECT	0x20
-#define LDAP_ALIAS_PROBLEM	0x21
-#define LDAP_INVALID_DN_SYNTAX	0x22
-#define LDAP_IS_LEAF	0x23
-#define LDAP_ALIAS_DEREF_PROBLEM	0x24
-#define LDAP_INAPPROPRIATE_AUTH	0x30
-#define LDAP_INVALID_CREDENTIALS	0x31
-#define LDAP_INSUFFICIENT_ACCESS	0x32
-#define LDAP_BUSY	0x33
-#define LDAP_UNAVAILABLE	0x34
-#define LDAP_UNWILLING_TO_PERFORM	0x35
-#define LDAP_LOOP_DETECT	0x36
-#define LDAP_NAMING_VIOLATION	0x40
-#define LDAP_OBJECT_CLASS_VIOLATION	0x41 
-#define LDAP_NOT_ALLOWED_ON_NONLEAF	0x42
-#define LDAP_NOT_ALLOWED_ON_RDN	0x43
-#define LDAP_ALREADY_EXISTS	0x44
-#define LDAP_NO_OBJECT_CLASS_MODS	0x45
-#define LDAP_RESULTS_TOO_LARGE	0x46
-#define LDAP_AFFECTS_MULTIPLE_DSAS	0x47
-#define LDAP_OTHER	0x50
-#define LDAP_SERVER_DOWN	0x51
-#define LDAP_LOCAL_ERROR	0x52
-#define LDAP_ENCODING_ERROR	0x53
-#define LDAP_DECODING_ERROR	0x54
-#define LDAP_TIMEOUT	0x55
-#define LDAP_AUTH_UNKNOWN	0x56
-#define LDAP_FILTER_ERROR	0x57
-#define LDAP_USER_CANCELLED	0x58
-#define LDAP_PARAM_ERROR	0x59
-#define LDAP_NO_MEMORY	0x5a
-#define LDAP_CONNECT_ERROR	0x5b
-#define LDAP_NOT_SUPPORTED	0x5c
-#define LDAP_CONTROL_NOT_FOUND	0x5d
-#define LDAP_NO_RESULTS_RETURNED	0x5e
-#define LDAP_MORE_RESULTS_TO_RETURN	0x5f
-#define LDAP_CLIENT_LOOP	0x60
-#define LDAP_REFERRAL_LIMIT_EXCEEDED	0x61
-#define LDAP_OPT_SUCCESS	LDAP_SUCCESS
-#define LDAP_AUTH_METHOD_NOT_SUPPORTED	LDAP_STRONG_AUTH_NOT_SUPPORTED
-#define LDAP_ATTRIBUTE_OR_VALUE_EXISTS	LDAP_TYPE_OR_VALUE_EXISTS
-#define LDAP_INSUFFICIENT_RIGHTS	LDAP_INSUFFICIENT_ACCESS
-#define LDAP_PARTIAL_RESULTS	LDAP_REFERRAL_V2
-#define LDAP_PORT	389
-#define LDAP_SSL_PORT	636
-#define LDAP_GC_PORT	3268
-#define LDAP_SSL_GC_PORT	3269
-#define LDAP_OPT_ON	((void*)1)
-#define LDAP_OPT_OFF	((void*)0)
-#define LDAP_OPT_API_INFO	0x00
-#define LDAP_OPT_DESC	0x01
-#define LDAP_OPT_DEREF	0x02
-#define LDAP_OPT_SIZELIMIT	0x03
-#define LDAP_OPT_TIMELIMIT	0x04
-#define LDAP_OPT_THREAD_FN_PTRS	0x05
-#define LDAP_OPT_REBIND_FN	0x06
-#define LDAP_OPT_REBIND_ARG	0x07
-#define LDAP_OPT_REFERRALS	0x08
-#define LDAP_OPT_RESTART	0x09
-#define LDAP_OPT_SSL	0x0a
-#define LDAP_OPT_IO_FN_PTRS	0x0b
-#define LDAP_OPT_CACHE_FN_PTRS	0x0d
-#define LDAP_OPT_CACHE_STRATEGY	0x0e
-#define LDAP_OPT_CACHE_ENABLE	0x0f
-#define LDAP_OPT_REFERRAL_HOP_LIMIT	0x10
-#define LDAP_OPT_PROTOCOL_VERSION	0x11
-#define LDAP_OPT_SERVER_CONTROLS	0x12
-#define LDAP_OPT_CLIENT_CONTROLS	0x13
-#define LDAP_OPT_API_FEATURE_INFO	0x15
-#define LDAP_OPT_HOST_NAME	0x30
-#define LDAP_OPT_ERROR_NUMBER	0x31
-#define LDAP_OPT_ERROR_STRING	0x32
-#define LDAP_OPT_SERVER_ERROR	0x33
-#define LDAP_OPT_SERVER_EXT_ERROR	0x34
-#define LDAP_OPT_PING_KEEP_ALIVE	0x36
-#define LDAP_OPT_PING_WAIT_TIME	0x37
-#define LDAP_OPT_PING_LIMIT	0x38
-#define LDAP_OPT_DNSDOMAIN_NAME	0x3b
-#define LDAP_OPT_GETDSNAME_FLAGS	0x3d
-#define LDAP_OPT_HOST_REACHABLE	0x3e
-#define LDAP_OPT_PROMPT_CREDENTIALS	0x3f
-#define LDAP_OPT_TCP_KEEPALIVE	0x40
-#define LDAP_OPT_REFERRAL_CALLBACK	0x70
-#define LDAP_OPT_CLIENT_CERTIFICATE	0x80
-#define LDAP_OPT_SERVER_CERTIFICATE	0x81
-#define LDAP_OPT_AUTO_RECONNECT	0x91
-#define LDAP_OPT_SSPI_FLAGS	0x92
-#define LDAP_OPT_SSL_INFO	0x93
-#define LDAP_OPT_REF_DEREF_CONN_PER_MSG	0x94
-#define LDAP_OPT_SIGN	0x95
-#define LDAP_OPT_ENCRYPT	0x96
-#define LDAP_OPT_SASL_METHOD	0x97
-#define LDAP_OPT_AREC_EXCLUSIVE	0x98
-#define LDAP_OPT_SECURITY_CONTEXT	0x99
-#define LDAP_OPT_ROOTDSE_CACHE	0x9a
-#define LDAP_OPT_VERSION	LDAP_OPT_PROTOCOL_VERSION
-#define LDAP_OPT_TLS	LDAP_OPT_SSL
-#define LDAP_OPT_TLS_INFO	LDAP_OPT_SSL_INFO
-#define LDAP_DEREF_NEVER	0x00
-#define LDAP_DEREF_SEARCHING	0x01
-#define LDAP_DEREF_FINDING	0x02
-#define LDAP_DEREF_ALWAYS	0x03
-#define LDAP_NO_LIMIT	0
-#define LDAP_CONTROL_REFERRALS	"1.2.840.113556.1.4.616"
-#define LDAP_CONTROL_REFERRALS_W	L"1.2.840.113556.1.4.616"
-#define LDAP_CHASE_SUBORDINATE_REFERRALS	0x20U
-#define LDAP_CHASE_EXTERNAL_REFERRALS	0x40U
-#define LDAP_SCOPE_DEFAULT	-1
-#define LDAP_SCOPE_BASE	0x0000
-#define LDAP_SCOPE_ONELEVEL	0x0001
-#define LDAP_SCOPE_SUBTREE	0x0002
-#define LDAP_MOD_ADD	0x00
-#define LDAP_MOD_DELETE	0x01
-#define LDAP_MOD_REPLACE	0x02
-#define LDAP_MOD_BVALUES	0x80
-#define LDAP_RES_BIND	0x61
-#define LDAP_RES_SEARCH_ENTRY	0x64
-#define LDAP_RES_SEARCH_RESULT	0x65
-#define LDAP_RES_MODIFY	0x67
-#define LDAP_RES_ADD	0x69
-#define LDAP_RES_DELETE	0x6b
-#define LDAP_RES_MODRDN	0x6d
-#define LDAP_RES_COMPARE	0x6f
-#define LDAP_RES_SEARCH_REFERENCE	0x73
-#define LDAP_RES_EXTENDED	0x78
-#define LDAP_RES_ANY	(-1L)
-#define LDAP_MSG_ONE	0x00
-#define LDAP_MSG_ALL	0x01
-#define LDAP_MSG_RECEIVED	0x02
-#define LDAP_SERVER_SORT_OID	"1.2.840.113556.1.4.473"
-#define LDAP_SERVER_SORT_OID_W	L"1.2.840.113556.1.4.473"
-#define LDAP_SERVER_RESP_SORT_OID	"1.2.840.113556.1.4.474"
-#define LDAP_SERVER_RESP_SORT_OID_W	L"1.2.840.113556.1.4.474"
-#define LDAP_PAGED_RESULT_OID_STRING	"1.2.840.113556.1.4.319"
-#define LDAP_PAGED_RESULT_OID_STRING_W	L"1.2.840.113556.1.4.319"
-#define LDAP_CONTROL_VLVREQUEST	"2.16.840.1.113730.3.4.9"
-#define LDAP_CONTROL_VLVREQUEST_W	L"2.16.840.1.113730.3.4.9"
-#define LDAP_CONTROL_VLVRESPONSE	"2.16.840.1.113730.3.4.10"
-#define LDAP_CONTROL_VLVRESPONSE_W	L"2.16.840.1.113730.3.4.10"
-#define LDAP_START_TLS_OID	"1.3.6.1.4.1.1466.20037"
-#define LDAP_START_TLS_OID_W	L"1.3.6.1.4.1.1466.20037"
-#define LDAP_TTL_EXTENDED_OP_OID	"1.3.6.1.4.1.1466.101.119.1"
-#define LDAP_TTL_EXTENDED_OP_OID_W	L"1.3.6.1.4.1.1466.101.119.1"
-#define LDAP_AUTH_NONE	0x00U
-#define LDAP_AUTH_SIMPLE	0x80U
-#define LDAP_AUTH_SASL	0x83U
-#define LDAP_AUTH_OTHERKIND	0x86U
-#define LDAP_AUTH_EXTERNAL	(LDAP_AUTH_OTHERKIND | 0x20U)
-#define LDAP_AUTH_SICILY	(LDAP_AUTH_OTHERKIND | 0x200U)
-#define LDAP_AUTH_NEGOTIATE	(LDAP_AUTH_OTHERKIND | 0x400U)
-#define LDAP_AUTH_MSN	(LDAP_AUTH_OTHERKIND | 0x800U)
-#define LDAP_AUTH_NTLM	(LDAP_AUTH_OTHERKIND | 0x1000U)
-#define LDAP_AUTH_DIGEST	(LDAP_AUTH_OTHERKIND | 0x4000U)
-#define LDAP_AUTH_DPA	(LDAP_AUTH_OTHERKIND | 0x2000U)
-#define LDAP_AUTH_SSPI	LDAP_AUTH_NEGOTIATE
-#define LDAP_FILTER_AND	0xa0
-#define LDAP_FILTER_OR	0xa1
-#define LDAP_FILTER_NOT	0xa2
-#define LDAP_FILTER_EQUALITY	0xa3
-#define LDAP_FILTER_SUBSTRINGS	0xa4
-#define LDAP_FILTER_GE	0xa5
-#define LDAP_FILTER_LE	0xa6
-#define LDAP_FILTER_APPROX	0xa8
-#define LDAP_FILTER_EXTENSIBLE	0xa9
-#define LDAP_FILTER_PRESENT	0x87
-#define LDAP_SUBSTRING_INITIAL	0x80
-#define LDAP_SUBSTRING_ANY	0x81
-#define LDAP_SUBSTRING_FINAL	0x82
-
-typedef struct ldap {
-	char Reserved[76];
-	PCHAR ld_host;
-	ULONG ld_version;
-	UCHAR ld_lberoptions;
-	int ld_deref;
-	int ld_timelimit;
-	int ld_sizelimit;
-	int ld_errno;
-	PCHAR ld_matched;
-	PCHAR ld_error;
-} LDAP, *PLDAP;
-typedef struct ldapmsg {
-	ULONG lm_msgid;
-	ULONG lm_msgtype;
-	BerElement *lm_ber;
-	struct ldapmsg *lm_chain;
-	struct ldapmsg *lm_next;
-	ULONG lm_time;
-} LDAPMessage, *PLDAPMessage;
-typedef struct l_timeval {
-	LONG tv_sec;
-	LONG tv_usec;
-} LDAP_TIMEVAL, *PLDAP_TIMEVAL;
-typedef struct ldapapiinfoA {
-	int ldapai_info_version;
-	int ldapai_api_version;
-	int ldapai_protocol_version;
-	char **ldapai_extensions;
-	char *ldapai_vendor_name;
-	int ldapai_vendor_version;
-} LDAPAPIInfoA, *PLDAPAPIInfoA;
-typedef struct ldapapiinfoW {
-	int ldapai_info_version;
-	int ldapai_api_version;
-	int ldapai_protocol_version;
-	PWCHAR *ldapai_extensions;
-	PWCHAR ldapai_vendor_name;
-	int ldapai_vendor_version;
-} LDAPAPIInfoW, *PLDAPAPIInfoW;
-typedef struct ldap_apifeature_infoA {
-	int ldapaif_info_version;
-	char *ldapaif_name;
-	int ldapaif_version;
-} LDAPAPIFeatureInfoA, *PLDAPAPIFeatureInfoA;
-typedef struct ldap_apifeature_infoW {
-	int ldapaif_info_version;
-	PWCHAR ldapaif_name;
-	int ldapaif_version;
-} LDAPAPIFeatureInfoW, *PLDAPAPIFeatureInfoW;
-typedef struct ldapcontrolA {
-	PCHAR ldctl_oid;
-	BerValue ldctl_value;
-	BOOLEAN ldctl_iscritical;
-} LDAPControlA, *PLDAPControlA;
-typedef struct ldapcontrolW {
-	PWCHAR ldctl_oid;
-	BerValue ldctl_value;
-	BOOLEAN ldctl_iscritical;
-} LDAPControlW, *PLDAPControlW;
-typedef union mod_vals_uA {
-	PCHAR *modv_strvals;
-	BerValue **modv_bvals;
-} mod_vals_u_tA;
-typedef union mod_vals_uW {
-	PWCHAR *modv_strvals;
-	BerValue **modv_bvals;
-} mod_vals_u_tW;
-typedef struct ldapmodA {
-	ULONG mod_op;
-	PCHAR mod_type;
-	mod_vals_u_tA mod_vals;
-} LDAPModA, *PLDAPModA;
-typedef struct ldapmodW {
-	ULONG mod_op;
-	PWCHAR mod_type;
-	mod_vals_u_tW mod_vals;
-} LDAPModW, *PLDAPModW;
-
-#define mod_values      mod_vals.modv_strvals
-#define mod_bvalues     mod_vals.modv_bvals
-
-typedef struct ldapsearch LDAPSearch, *PLDAPSearch;
-typedef struct ldapsortkeyA {
-	PCHAR sk_attrtype;
-	PCHAR sk_matchruleoid;
-	BOOLEAN sk_reverseorder;
-} LDAPSortKeyA, *PLDAPSortKeyA;
-typedef struct ldapsortkeyW {
-	PWCHAR sk_attrtype;
-	PWCHAR sk_matchruleoid;
-	BOOLEAN sk_reverseorder;
-} LDAPSortKeyW, *PLDAPSortKeyW;
-typedef ULONG (__cdecl QUERYFORCONNECTION)(PLDAP,PLDAP,PWCHAR,PCHAR,ULONG,PVOID,PVOID,PLDAP*);
-typedef BOOLEAN (__cdecl NOTIFYOFNEWCONNECTION)(PLDAP,PLDAP,PWCHAR,PCHAR,PLDAP,ULONG,PVOID,PVOID,ULONG);
-typedef ULONG (__cdecl DEREFERENCECONNECTION)(PLDAP,PLDAP);
-typedef BOOLEAN (__cdecl QUERYCLIENTCERT)(PLDAP,PSecPkgContext_IssuerListInfoEx,PCCERT_CONTEXT*);
-typedef struct LdapReferralCallback {
-	ULONG SizeOfCallbacks;
-	QUERYFORCONNECTION *QueryForConnection;
-	NOTIFYOFNEWCONNECTION *NotifyRoutine;
-	DEREFERENCECONNECTION *DereferenceRoutine;
-} LDAP_REFERRAL_CALLBACK, *PLDAP_REFERRAL_CALLBACK;
-typedef struct ldapvlvinfo {
-	int ldvlv_version;
-	unsigned long ldvlv_before_count;
-	unsigned long ldvlv_after_count;
-	unsigned long ldvlv_offset;
-	unsigned long ldvlv_count;
-	BerValue *ldvlv_attrvalue;
-	BerValue *ldvlv_context;
-	void *ldvlv_extradata;
-} LDAPVLVInfo;
-
-/*
- * Under Microsoft WinLDAP the function ldap_error is only stub.
- * This macro uses LDAP structure to get error string and pass it to the user.
- */
-#define ldap_perror(handle,message) printf("%s: %s\n", message, handle->ld_error);
-
-WINLDAPAPI PLDAP ldap_initA(PCHAR,ULONG);
-WINLDAPAPI PLDAP ldap_initW(PWCHAR,ULONG);
-WINLDAPAPI PLDAP ldap_openA(const PCHAR,ULONG);
-WINLDAPAPI PLDAP ldap_openW(const PWCHAR,ULONG);
-WINLDAPAPI PLDAP cldap_openA(const PCHAR,ULONG);
-WINLDAPAPI PLDAP cldap_openW(const PWCHAR,ULONG);
-WINLDAPAPI ULONG ldap_connect(LDAP*,struct l_timeval*);
-WINLDAPAPI PLDAP ldap_sslinitA(PCHAR,ULONG,int);
-WINLDAPAPI PLDAP ldap_sslinitW(PWCHAR,ULONG,int);
-WINLDAPAPI ULONG ldap_start_tls_sA(LDAP*,PLDAPControlA*,PLDAPControlA*);
-WINLDAPAPI ULONG ldap_start_tls_sW(LDAP*,PLDAPControlW*,PLDAPControlW*);
-WINLDAPAPI BOOLEAN ldap_stop_tls_s(LDAP*);
-WINLDAPAPI ULONG ldap_get_optionA(LDAP*,int,void*);
-WINLDAPAPI ULONG ldap_get_optionW(LDAP*,int,void*);
-WINLDAPAPI ULONG ldap_set_optionA(LDAP*,int,const void*);
-WINLDAPAPI ULONG ldap_set_optionW(LDAP*,int,const void*);
-WINLDAPAPI ULONG ldap_control_freeA(LDAPControlA*);
-WINLDAPAPI ULONG ldap_control_freeW(LDAPControlW*);
-WINLDAPAPI ULONG ldap_controls_freeA(LDAPControlA**);
-WINLDAPAPI ULONG ldap_controls_freeW(LDAPControlW**);
-WINLDAPAPI ULONG ldap_free_controlsA(LDAPControlA**);
-WINLDAPAPI ULONG ldap_free_controlsW(LDAPControlW**);
-WINLDAPAPI ULONG ldap_sasl_bindA(LDAP*,const PCHAR, const PCHAR,const BERVAL*,PLDAPControlA*,PLDAPControlA*,int*);
-WINLDAPAPI ULONG ldap_sasl_bindW(LDAP*,const PWCHAR, const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,int*);
-WINLDAPAPI ULONG ldap_sasl_bind_sA(LDAP*,const PCHAR,const PCHAR,const BERVAL*,PLDAPControlA*,PLDAPControlA*,PBERVAL*);
-WINLDAPAPI ULONG ldap_sasl_bind_sW(LDAP*,const PWCHAR,const PWCHAR,const BERVAL*,PLDAPControlW*,PLDAPControlW*,PBERVAL*);
-WINLDAPAPI ULONG ldap_simple_bindA(LDAP*,const PCHAR,const PCHAR);
-WINLDAPAPI ULONG ldap_simple_bindW(LDAP*,const PWCHAR,const PCHAR);
-WINLDAPAPI ULONG ldap_simple_bind_sA(LDAP*,const PCHAR,const PCHAR);
-WINLDAPAPI ULONG ldap_simple_bind_sW(LDAP*,const PWCHAR,const PCHAR);
-WINLDAPAPI ULONG ldap_bindA(LDAP*,const PCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_bindW(LDAP*,const PWCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_bind_sA(LDAP*,const PCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_bind_sW(LDAP*,const PWCHAR,const PCHAR,ULONG) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_unbind(LDAP*);
-WINLDAPAPI ULONG ldap_unbind_s(LDAP*);
-WINLDAPAPI ULONG ldap_search_extA(LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,PLDAPControlW*,PLDAPControlW*,ULONG,ULONG,ULONG*);
-WINLDAPAPI ULONG ldap_search_extW(LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,PLDAPControlW*,ULONG,ULONG,ULONG*);
-WINLDAPAPI ULONG ldap_search_ext_sA(LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,PLDAPControlA*,PLDAPControlA*,struct l_timeval*,ULONG,LDAPMessage**);
-WINLDAPAPI ULONG ldap_search_ext_sW(LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,PLDAPControlW*,struct l_timeval*,ULONG,LDAPMessage**);
-WINLDAPAPI ULONG ldap_searchA(LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG);
-WINLDAPAPI ULONG ldap_searchW(LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG);
-WINLDAPAPI ULONG ldap_search_sA(LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,LDAPMessage**);
-WINLDAPAPI ULONG ldap_search_sW(LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,LDAPMessage**);
-WINLDAPAPI ULONG ldap_search_stA(LDAP*,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,struct l_timeval*,LDAPMessage**);
-WINLDAPAPI ULONG ldap_search_stW(LDAP*,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,struct l_timeval*,LDAPMessage**);
-WINLDAPAPI ULONG ldap_compare_extA(LDAP*,const PCHAR,const PCHAR,PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*,ULONG*);
-WINLDAPAPI ULONG ldap_compare_extW(LDAP*,const PWCHAR,const PWCHAR,PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*,ULONG*);
-WINLDAPAPI ULONG ldap_compare_ext_sA(LDAP*,const PCHAR,const PCHAR,const PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*);
-WINLDAPAPI ULONG ldap_compare_ext_sW(LDAP*,const PWCHAR,const PWCHAR,const PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*);
-WINLDAPAPI ULONG ldap_compareA(LDAP*,const PCHAR,const PCHAR,PCHAR);
-WINLDAPAPI ULONG ldap_compareW(LDAP*,const PWCHAR,const PWCHAR,PWCHAR);
-WINLDAPAPI ULONG ldap_compare_sA(LDAP*,const PCHAR,const PCHAR,PCHAR);
-WINLDAPAPI ULONG ldap_compare_sW(LDAP*,const PWCHAR,const PWCHAR,PWCHAR);
-WINLDAPAPI ULONG ldap_modify_extA(LDAP*,const PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*);
-WINLDAPAPI ULONG ldap_modify_extW(LDAP*,const PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*);
-WINLDAPAPI ULONG ldap_modify_ext_sA(LDAP*,const PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*);
-WINLDAPAPI ULONG ldap_modify_ext_sW(LDAP*,const PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*);
-WINLDAPAPI ULONG ldap_modifyA(LDAP*,const PCHAR,LDAPModA*[]);
-WINLDAPAPI ULONG ldap_modifyW(LDAP*,const PWCHAR,LDAPModW*[]);
-WINLDAPAPI ULONG ldap_modify_sA(LDAP*,const PCHAR,LDAPModA*[]);
-WINLDAPAPI ULONG ldap_modify_sW(LDAP*,const PWCHAR,LDAPModW*[]);
-WINLDAPAPI ULONG ldap_rename_extA(LDAP*,const PCHAR,const PCHAR,const PCHAR,INT,PLDAPControlA*,PLDAPControlA*,ULONG*);
-WINLDAPAPI ULONG ldap_rename_extW(LDAP*,const PWCHAR,const PWCHAR,const PWCHAR,INT,PLDAPControlW*,PLDAPControlW*,ULONG*);
-WINLDAPAPI ULONG ldap_rename_ext_sA(LDAP*,const PCHAR,const PCHAR,const PCHAR,INT,PLDAPControlA*,PLDAPControlA*);
-WINLDAPAPI ULONG ldap_rename_ext_sW(LDAP*,const PWCHAR,const PWCHAR,const PWCHAR,INT,PLDAPControlW*,PLDAPControlW*);
-WINLDAPAPI ULONG ldap_modrdnA(LDAP*,PCHAR,PCHAR) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_modrdnW(LDAP*,PWCHAR,PWCHAR) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_modrdn_sA(LDAP*,PCHAR,PCHAR) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_modrdn_sW(LDAP*,PWCHAR,PWCHAR) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_modrdn2A(LDAP*,PCHAR,PCHAR,INT) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_modrdn2W(LDAP*,PWCHAR,PWCHAR,INT) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_modrdn2_sA(LDAP*,PCHAR,PCHAR,INT) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_modrdn2_sW(LDAP*,PWCHAR,PWCHAR,INT) _WINLDAP_DEPRECATED;
-WINLDAPAPI ULONG ldap_add_extA(LDAP*,const PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*,ULONG*);
-WINLDAPAPI ULONG ldap_add_extW(LDAP*,const PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*,ULONG*);
-WINLDAPAPI ULONG ldap_add_ext_sA(LDAP*,const PCHAR,LDAPModA*[],PLDAPControlA*,PLDAPControlA*);
-WINLDAPAPI ULONG ldap_add_ext_sW(LDAP*,const PWCHAR,LDAPModW*[],PLDAPControlW*,PLDAPControlW*);
-WINLDAPAPI ULONG ldap_addA(LDAP*,const PCHAR,LDAPModA*[]);
-WINLDAPAPI ULONG ldap_addW(LDAP*,const PWCHAR,LDAPModW*[]);
-WINLDAPAPI ULONG ldap_add_sA(LDAP*,const PCHAR,LDAPModA*[]);
-WINLDAPAPI ULONG ldap_add_sW(LDAP*,const PWCHAR,LDAPModW*[]);
-WINLDAPAPI ULONG ldap_delete_extA(LDAP*,const PCHAR,PLDAPControlA*,PLDAPControlA*,ULONG*);
-WINLDAPAPI ULONG ldap_delete_extW(LDAP*,const PWCHAR,PLDAPControlW*,PLDAPControlW*,ULONG*);
-WINLDAPAPI ULONG ldap_delete_ext_sA(LDAP*,const PCHAR,PLDAPControlA*,PLDAPControlA*);
-WINLDAPAPI ULONG ldap_delete_ext_sW(LDAP*,const PWCHAR,PLDAPControlW*,PLDAPControlW*);
-WINLDAPAPI ULONG ldap_deleteA(LDAP*,const PCHAR);
-WINLDAPAPI ULONG ldap_deleteW(LDAP*,const PWCHAR);
-WINLDAPAPI ULONG ldap_delete_sA(LDAP*,const PCHAR);
-WINLDAPAPI ULONG ldap_delete_sW(LDAP*,const PWCHAR);
-WINLDAPAPI ULONG ldap_extended_operationA(LDAP*,const PCHAR,const struct berval*,PLDAPControlA*,PLDAPControlA*,ULONG*);
-WINLDAPAPI ULONG ldap_extended_operationW(LDAP*,const PWCHAR,const struct berval*,PLDAPControlW*,PLDAPControlW*,ULONG*);
-WINLDAPAPI ULONG ldap_extended_operation_sA(LDAP*,const PCHAR,const struct berval*,PLDAPControlA*,PLDAPControlA*,PCHAR*,struct berval**);
-WINLDAPAPI ULONG ldap_extended_operation_sW(LDAP*,const PWCHAR,const struct berval*,PLDAPControlW*,PLDAPControlW*,PWCHAR*,struct berval**);
-WINLDAPAPI ULONG ldap_close_extended_op(LDAP*,ULONG);
-WINLDAPAPI ULONG ldap_abandon(LDAP*,ULONG);
-WINLDAPAPI ULONG ldap_result(LDAP*,ULONG,ULONG,struct l_timeval*,LDAPMessage**);
-WINLDAPAPI ULONG ldap_msgfree(LDAPMessage*);
-WINLDAPAPI ULONG ldap_parse_resultA(LDAP*,LDAPMessage*,ULONG*,PCHAR*,PCHAR*,PCHAR**,PLDAPControlA**,BOOLEAN);
-WINLDAPAPI ULONG ldap_parse_resultW(LDAP*,LDAPMessage*,ULONG*,PWCHAR*,PWCHAR*,PWCHAR**,PLDAPControlW**,BOOLEAN);
-WINLDAPAPI ULONG ldap_parse_extended_resultA(LDAP,LDAPMessage*,PCHAR*,struct berval**,BOOLEAN);
-WINLDAPAPI ULONG ldap_parse_extended_resultW(LDAP,LDAPMessage*,PWCHAR*,struct berval**,BOOLEAN);
-WINLDAPAPI PCHAR ldap_err2stringA(ULONG);
-WINLDAPAPI PWCHAR ldap_err2stringW(ULONG);
-WINLDAPAPI ULONG LdapGetLastError(void);
-WINLDAPAPI ULONG LdapMapErrorToWin32(ULONG);
-WINLDAPAPI ULONG ldap_result2error(LDAP*,LDAPMessage*,ULONG);
-WINLDAPAPI PLDAPMessage ldap_first_entry(LDAP*,LDAPMessage*);
-WINLDAPAPI PLDAPMessage ldap_next_entry(LDAP*,LDAPMessage*);
-WINLDAPAPI PLDAPMessage ldap_first_reference(LDAP*,LDAPMessage*);
-WINLDAPAPI PLDAPMessage ldap_next_reference(LDAP*,LDAPMessage*);
-WINLDAPAPI ULONG ldap_count_entries(LDAP*,LDAPMessage*);
-WINLDAPAPI ULONG ldap_count_references(LDAP*,LDAPMessage*);
-WINLDAPAPI PCHAR ldap_first_attributeA(LDAP*,LDAPMessage*,BerElement**);
-WINLDAPAPI PWCHAR ldap_first_attributeW(LDAP*,LDAPMessage*,BerElement**);
-WINLDAPAPI PCHAR ldap_next_attributeA(LDAP*,LDAPMessage*,BerElement*);
-WINLDAPAPI PWCHAR ldap_next_attributeW(LDAP*,LDAPMessage*,BerElement*);
-WINLDAPAPI VOID ldap_memfreeA(PCHAR);
-WINLDAPAPI VOID ldap_memfreeW(PWCHAR);
-WINLDAPAPI PCHAR* ldap_get_valuesA(LDAP*,LDAPMessage*,const PCHAR);
-WINLDAPAPI PWCHAR* ldap_get_valuesW(LDAP*,LDAPMessage*,const PWCHAR);
-WINLDAPAPI BerValue** ldap_get_values_lenA(LDAP*,LDAPMessage*,const PCHAR);
-WINLDAPAPI BerValue** ldap_get_values_lenW(LDAP*,LDAPMessage*,const PWCHAR);
-WINLDAPAPI ULONG ldap_count_valuesA(PCHAR*);
-WINLDAPAPI ULONG ldap_count_valuesW(PWCHAR*);
-WINLDAPAPI ULONG ldap_count_values_len(struct berval**);
-WINLDAPAPI ULONG ldap_value_freeA(PCHAR*);
-WINLDAPAPI ULONG ldap_value_freeW(PWCHAR*);
-WINLDAPAPI ULONG ldap_value_free_len(struct berval**);
-WINLDAPAPI PCHAR ldap_get_dnA(LDAP*,LDAPMessage*);
-WINLDAPAPI PWCHAR ldap_get_dnW(LDAP*,LDAPMessage*);
-WINLDAPAPI PCHAR ldap_explode_dnA(PCHAR,ULONG);
-WINLDAPAPI PWCHAR ldap_explode_dnW(PWCHAR,ULONG);
-WINLDAPAPI PCHAR ldap_dn2ufnA(PCHAR);
-WINLDAPAPI PWCHAR ldap_dn2ufnW(PWCHAR);
-WINLDAPAPI ULONG ldap_ufn2dnA(const PCHAR,PCHAR*);
-WINLDAPAPI ULONG ldap_ufn2dnW(const PWCHAR,PWCHAR*);
-WINLDAPAPI ULONG ldap_parse_referenceA(LDAP*,LDAPMessage*,PCHAR**);
-WINLDAPAPI ULONG ldap_parse_referenceW(LDAP*,LDAPMessage*,PWCHAR**);
-WINLDAPAPI ULONG ldap_check_filterA(LDAP*,PCHAR);
-WINLDAPAPI ULONG ldap_check_filterW(LDAP*,PWCHAR);
-WINLDAPAPI ULONG ldap_create_page_controlA(PLDAP,ULONG,struct berval*,UCHAR,PLDAPControlA*);
-WINLDAPAPI ULONG ldap_create_page_controlW(PLDAP,ULONG,struct berval*,UCHAR,PLDAPControlW*);
-WINLDAPAPI ULONG ldap_create_sort_controlA(PLDAP,PLDAPSortKeyA*,UCHAR,PLDAPControlA*);
-WINLDAPAPI ULONG ldap_create_sort_controlW(PLDAP,PLDAPSortKeyW*,UCHAR,PLDAPControlW*);
-WINLDAPAPI INT ldap_create_vlv_controlA(LDAP*,LDAPVLVInfo*,UCHAR,LDAPControlA**);
-WINLDAPAPI INT ldap_create_vlv_controlW(LDAP*,LDAPVLVInfo*,UCHAR,LDAPControlW**);
-WINLDAPAPI ULONG ldap_encode_sort_controlA(PLDAP,PLDAPSortKeyA*,PLDAPControlA,BOOLEAN);
-WINLDAPAPI ULONG ldap_encode_sort_controlW(PLDAP,PLDAPSortKeyW*,PLDAPControlW,BOOLEAN);
-WINLDAPAPI ULONG ldap_escape_filter_elementA(PCHAR,ULONG,PCHAR,ULONG);
-WINLDAPAPI ULONG ldap_escape_filter_elementW(PWCHAR,ULONG,PWCHAR,ULONG);
-WINLDAPAPI ULONG ldap_get_next_page(PLDAP,PLDAPSearch,ULONG,ULONG*);
-WINLDAPAPI ULONG ldap_get_next_page_s(PLDAP,PLDAPSearch,struct l_timeval*,ULONG,ULONG*,LDAPMessage**);
-WINLDAPAPI ULONG ldap_get_paged_count(PLDAP,PLDAPSearch,ULONG*,PLDAPMessage);
-WINLDAPAPI ULONG ldap_parse_page_controlA(PLDAP,PLDAPControlA*,ULONG*,struct berval**);
-WINLDAPAPI ULONG ldap_parse_page_controlW(PLDAP,PLDAPControlW*,ULONG*,struct berval**);
-WINLDAPAPI ULONG ldap_parse_sort_controlA(PLDAP,PLDAPControlA*,ULONG*,PCHAR*);
-WINLDAPAPI ULONG ldap_parse_sort_controlW(PLDAP,PLDAPControlW*,ULONG*,PWCHAR*);
-WINLDAPAPI INT ldap_parse_vlv_controlA(LDAP*,LDAPControlA**,unsigned long*,unsigned long*,struct berval**,int*);
-WINLDAPAPI INT ldap_parse_vlv_controlW(LDAP*,LDAPControlW**,unsigned long*,unsigned long*,struct berval**,int*);
-WINLDAPAPI PLDAPSearch ldap_search_init_pageA(PLDAP,const PCHAR,ULONG,const PCHAR,PCHAR[],ULONG,PLDAPControlA*,PLDAPControlA*,ULONG,ULONG,PLDAPSortKeyA*);
-WINLDAPAPI PLDAPSearch ldap_search_init_pageW(PLDAP,const PWCHAR,ULONG,const PWCHAR,PWCHAR[],ULONG,PLDAPControlW*,PLDAPControlW*,ULONG,ULONG,PLDAPSortKeyW*);
-WINLDAPAPI ULONG ldap_search_abandon_page(PLDAP,PLDAPSearch);
-WINLDAPAPI LDAP ldap_conn_from_msg(LDAP*,LDAPMessage*);
-WINLDAPAPI INT LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int);
-WINLDAPAPI INT LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int);
-
-#if UNICODE
-#define LDAPControl LDAPControlW
-#define PLDAPControl PLDAPControlW
-#define LDAPMod LDAPModW
-#define PLDAPMod LDAPModW
-#define LDAPSortKey LDAPSortKeyW
-#define PLDAPSortKey PLDAPSortKeyW
-#define LDAPAPIInfo LDAPAPIInfoW
-#define PLDAPAPIInfo PLDAPAPIInfoW
-#define LDAPAPIFeatureInfo LDAPAPIFeatureInfoW
-#define PLDAPAPIFeatureInfo PLDAPAPIFeatureInfoW
-#define cldap_open cldap_openW
-#define ldap_open ldap_openW
-#define ldap_bind ldap_bindW
-#define ldap_bind_s ldap_bind_sW
-#define ldap_simple_bind ldap_simple_bindW
-#define ldap_simple_bind_s ldap_simple_bind_sW
-#define ldap_sasl_bind ldap_sasl_bindW
-#define ldap_sasl_bind_s ldap_sasl_bind_sW
-#define ldap_init ldap_initW
-#define ldap_sslinit ldap_sslinitW
-#define ldap_get_option ldap_get_optionW
-#define ldap_set_option ldap_set_optionW
-#define ldap_start_tls_s ldap_start_tls_sW
-#define ldap_add ldap_addW
-#define ldap_add_ext ldap_add_extW
-#define ldap_add_s ldap_add_sW
-#define ldap_add_ext_s ldap_add_ext_sW
-#define ldap_compare ldap_compareW
-#define ldap_compare_ext ldap_compare_extW
-#define ldap_compare_s ldap_compare_sW
-#define ldap_compare_ext_s ldap_compare_ext_sW
-#define ldap_delete ldap_deleteW
-#define ldap_delete_ext ldap_delete_extW
-#define ldap_delete_s ldap_delete_sW
-#define ldap_delete_ext_s ldap_delete_ext_sW
-#define ldap_extended_operation_s ldap_extended_operation_sW
-#define ldap_extended_operation ldap_extended_operationW
-#define ldap_modify ldap_modifyW
-#define ldap_modify_ext ldap_modify_extW
-#define ldap_modify_s ldap_modify_sW
-#define ldap_modify_ext_s ldap_modify_ext_sW
-#define ldap_check_filter ldap_check_filterW
-#define ldap_count_values ldap_count_valuesW
-#define ldap_create_page_control ldap_create_page_controlW
-#define ldap_create_sort_control ldap_create_sort_controlW
-#define ldap_create_vlv_control ldap_create_vlv_controlW
-#define ldap_encode_sort_control ldap_encode_sort_controlW
-#define ldap_escape_filter_element ldap_escape_filter_elementW
-#define ldap_first_attribute ldap_first_attributeW
-#define ldap_next_attribute ldap_next_attributeW
-#define ldap_get_values ldap_get_valuesW
-#define ldap_get_values_len ldap_get_values_lenW
-#define ldap_parse_extended_result ldap_parse_extended_resultW
-#define ldap_parse_page_control ldap_parse_page_controlW
-#define ldap_parse_reference ldap_parse_referenceW
-#define ldap_parse_result ldap_parse_resultW
-#define ldap_parse_sort_control ldap_parse_sort_controlW
-#define ldap_parse_vlv_control ldap_parse_vlv_controlW
-#define ldap_search ldap_searchW
-#define ldap_search_s ldap_search_sW
-#define ldap_search_st ldap_search_stW
-#define ldap_search_ext ldap_search_extW
-#define ldap_search_ext_s ldap_search_ext_sW
-#define ldap_search_init_page ldap_search_init_pageW
-#define ldap_err2string ldap_err2stringW
-#define ldap_control_free ldap_control_freeW
-#define ldap_controls_free ldap_controls_freeW
-#define ldap_free_controls ldap_free_controlsW
-#define ldap_memfree ldap_memfreeW
-#define ldap_value_free ldap_value_freeW
-#define ldap_dn2ufn ldap_dn2ufnW
-#define ldap_ufn2dn ldap_ufn2dnW
-#define ldap_explode_dn ldap_explode_dnW
-#define ldap_get_dn ldap_get_dnW
-#define ldap_modrdn ldap_modrdnW
-#define ldap_modrdn_s ldap_modrdn_sW
-#define ldap_modrdn2 ldap_modrdn2W
-#define ldap_modrdn2_s ldap_modrdn2_sW
-#define ldap_rename ldap_rename_extW
-#define ldap_rename_s ldap_rename_ext_sW
-#define ldap_rename_ext ldap_rename_extW
-#define ldap_rename_ext_s ldap_rename_ext_sW
-#else
-#define LDAPControl LDAPControlA
-#define PLDAPControl PLDAPControlA
-#define LDAPMod LDAPModA
-#define PLDAPMod LDAPModA
-#define LDAPSortKey LDAPSortKeyA
-#define PLDAPSortKey PLDAPSortKeyA
-#define LDAPAPIInfo LDAPAPIInfoA
-#define PLDAPAPIInfo PLDAPAPIInfoA
-#define LDAPAPIFeatureInfo LDAPAPIFeatureInfoA
-#define PLDAPAPIFeatureInfo PLDAPAPIFeatureInfoA
-#define cldap_open cldap_openA
-#define ldap_open ldap_openA
-#define ldap_bind ldap_bindA
-#define ldap_bind_s ldap_bind_sA
-#define ldap_simple_bind ldap_simple_bindA
-#define ldap_simple_bind_s ldap_simple_bind_sA
-#define ldap_sasl_bind ldap_sasl_bindA
-#define ldap_sasl_bind_s ldap_sasl_bind_sA
-#define ldap_init ldap_initA
-#define ldap_sslinit ldap_sslinitA
-#define ldap_get_option ldap_get_optionA
-#define ldap_set_option ldap_set_optionA
-#define ldap_start_tls_s ldap_start_tls_sA
-#define ldap_add ldap_addA
-#define ldap_add_ext ldap_add_extA
-#define ldap_add_s ldap_add_sA
-#define ldap_add_ext_s ldap_add_ext_sA
-#define ldap_compare ldap_compareA
-#define ldap_compare_ext ldap_compare_extA
-#define ldap_compare_s ldap_compare_sA
-#define ldap_compare_ext_s ldap_compare_ext_sA
-#define ldap_delete ldap_deleteA
-#define ldap_delete_ext ldap_delete_extA
-#define ldap_delete_s ldap_delete_sA
-#define ldap_delete_ext_s ldap_delete_ext_sA
-#define ldap_extended_operation_s ldap_extended_operation_sA
-#define ldap_extended_operation ldap_extended_operationA
-#define ldap_modify ldap_modifyA
-#define ldap_modify_ext ldap_modify_extA
-#define ldap_modify_s ldap_modify_sA
-#define ldap_modify_ext_s ldap_modify_ext_sA
-#define ldap_check_filter ldap_check_filterA
-#define ldap_count_values ldap_count_valuesA
-#define ldap_create_page_control ldap_create_page_controlA
-#define ldap_create_sort_control ldap_create_sort_controlA
-#define ldap_create_vlv_control ldap_create_vlv_controlA
-#define ldap_encode_sort_control ldap_encode_sort_controlA
-#define ldap_escape_filter_element ldap_escape_filter_elementA
-#define ldap_first_attribute ldap_first_attributeA
-#define ldap_next_attribute ldap_next_attributeA
-#define ldap_get_values ldap_get_valuesA
-#define ldap_get_values_len ldap_get_values_lenA
-#define ldap_parse_extended_result ldap_parse_extended_resultA
-#define ldap_parse_page_control ldap_parse_page_controlA
-#define ldap_parse_reference ldap_parse_referenceA
-#define ldap_parse_result ldap_parse_resultA
-#define ldap_parse_sort_control ldap_parse_sort_controlA
-#define ldap_parse_vlv_control ldap_parse_vlv_controlA
-#define ldap_search ldap_searchA
-#define ldap_search_s ldap_search_sA
-#define ldap_search_st ldap_search_stA
-#define ldap_search_ext ldap_search_extA
-#define ldap_search_ext_s ldap_search_ext_sA
-#define ldap_search_init_page ldap_search_init_pageA
-#define ldap_err2string ldap_err2stringA
-#define ldap_control_free ldap_control_freeA
-#define ldap_controls_free ldap_controls_freeA
-#define ldap_free_controls ldap_free_controlsA
-#define ldap_memfree ldap_memfreeA
-#define ldap_value_free ldap_value_freeA
-#define ldap_dn2ufn ldap_dn2ufnA
-#define ldap_ufn2dn ldap_ufn2dnA
-#define ldap_explode_dn ldap_explode_dnA
-#define ldap_get_dn ldap_get_dnA
-#define ldap_modrdn ldap_modrdnA
-#define ldap_modrdn_s ldap_modrdn_sA
-#define ldap_modrdn2 ldap_modrdn2A
-#define ldap_modrdn2_s ldap_modrdn2_sA
-#define ldap_rename ldap_rename_extA
-#define ldap_rename_s ldap_rename_ext_sA
-#define ldap_rename_ext ldap_rename_extA
-#define ldap_rename_ext_s ldap_rename_ext_sA
-#endif 
-
-#ifdef __cplusplus
-}
-#endif
-
-#include <poppack.h>
-
-#endif /* _WINLDAP_H */
diff --git a/winsup/w32api/include/winnetwk.h b/winsup/w32api/include/winnetwk.h
deleted file mode 100644
index 0e7344625..000000000
--- a/winsup/w32api/include/winnetwk.h
+++ /dev/null
@@ -1,346 +0,0 @@
-#ifndef _WINNETWK_H
-#define _WINNETWK_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define WNNC_NET_MSNET      0x00010000
-#define WNNC_NET_LANMAN     0x00020000
-#define WNNC_NET_NETWARE    0x00030000
-#define WNNC_NET_VINES      0x00040000
-#define WNNC_NET_10NET      0x00050000
-#define WNNC_NET_LOCUS      0x00060000
-#define WNNC_NET_SUN_PC_NFS 0x00070000
-#define WNNC_NET_LANSTEP    0x00080000
-#define WNNC_NET_9TILES     0x00090000
-#define WNNC_NET_LANTASTIC  0x000A0000
-#define WNNC_NET_AS400      0x000B0000
-#define WNNC_NET_FTP_NFS    0x000C0000
-#define WNNC_NET_PATHWORKS  0x000D0000
-#define WNNC_NET_LIFENET    0x000E0000
-#define WNNC_NET_POWERLAN   0x000F0000
-#define WNNC_NET_BWNFS      0x00100000
-#define WNNC_NET_COGENT     0x00110000
-#define WNNC_NET_FARALLON	0x00120000
-#define WNNC_NET_APPLETALK	0x00130000
-#define WNNC_NET_INTERGRAPH	0x00140000
-#define WNNC_NET_SYMFONET   0x00150000
-#define WNNC_NET_CLEARCASE  0x00160000
-#define WNNC_NET_FRONTIER   0x00170000
-#define WNNC_NET_BMC        0x00180000
-#define WNNC_NET_DCE        0x00190000
-#define WNNC_NET_AVID       0x001A0000
-#define WNNC_NET_DOCUSPACE  0x001B0000
-#define WNNC_NET_MANGOSOFT  0x001C0000
-#define WNNC_NET_SERNET     0x001D0000
-#define WNNC_NET_DECORB     0x00200000
-#define WNNC_NET_PROTSTOR   0x00210000
-#define WNNC_NET_FJ_REDIR   0x00220000
-#define WNNC_NET_DISTINCT   0x00230000
-#define WNNC_NET_TWINS      0x00240000
-#define WNNC_NET_RDR2SAMPLE 0x00250000
-#define WNNC_NET_CSC        0x00260000
-#define WNNC_NET_3IN1       0x00270000
-#define WNNC_NET_EXTENDNET  0x00290000
-#define WNNC_NET_OBJECT_DIRE 0x00300000
-#define WNNC_NET_MASFAX     0x00310000
-#define WNNC_NET_HOB_NFS    0x00320000
-#define WNNC_NET_SHIVA      0x00330000
-#define WNNC_NET_IBMAL      0x00340000
-#define WNNC_CRED_MANAGER   0xFFFF0000
-
-#define RESOURCE_CONNECTED 1
-#define RESOURCE_GLOBALNET 2
-#define RESOURCE_REMEMBERED 3
-#define RESOURCE_RECENT 4
-#define RESOURCE_CONTEXT 5
-#define RESOURCETYPE_ANY 0
-#define RESOURCETYPE_DISK 1
-#define RESOURCETYPE_PRINT 2
-#define RESOURCETYPE_RESERVED 8
-#define RESOURCETYPE_UNKNOWN        0xFFFFFFFF
-#define RESOURCEUSAGE_CONNECTABLE   0x00000001
-#define RESOURCEUSAGE_CONTAINER     0x00000002
-#define RESOURCEUSAGE_NOLOCALDEVICE 0x00000004
-#define RESOURCEUSAGE_SIBLING       0x00000008
-#define RESOURCEUSAGE_ATTACHED      0x00000010
-#define RESOURCEUSAGE_ALL           (RESOURCEUSAGE_CONNECTABLE | RESOURCEUSAGE_CONTAINER | RESOURCEUSAGE_ATTACHED)
-#define RESOURCEUSAGE_RESERVED      0x80000000
-#define RESOURCEDISPLAYTYPE_GENERIC 0
-#define RESOURCEDISPLAYTYPE_DOMAIN 1
-#define RESOURCEDISPLAYTYPE_SERVER 2
-#define RESOURCEDISPLAYTYPE_SHARE 3
-#define RESOURCEDISPLAYTYPE_FILE 4
-#define RESOURCEDISPLAYTYPE_GROUP 5
-#define RESOURCEDISPLAYTYPE_NETWORK 6
-#define RESOURCEDISPLAYTYPE_ROOT 7
-#define RESOURCEDISPLAYTYPE_SHAREADMIN 8
-#define RESOURCEDISPLAYTYPE_DIRECTORY 9
-#define RESOURCEDISPLAYTYPE_TREE 10
-#define NETPROPERTY_PERSISTENT 1
-#define CONNECT_UPDATE_PROFILE 1
-#define CONNECT_UPDATE_RECENT 2
-#define CONNECT_TEMPORARY 4
-#define CONNECT_INTERACTIVE 8
-#define CONNECT_PROMPT 16
-#define CONNECT_NEED_DRIVE 32
-#define CONNECT_REFCOUNT 64
-#define CONNECT_REDIRECT 128
-#define CONNECT_LOCALDRIVE 256
-#define CONNECT_CURRENT_MEDIA 512
-#define CONNDLG_RO_PATH 1
-#define CONNDLG_CONN_POINT 2
-#define CONNDLG_USE_MRU 4
-#define CONNDLG_HIDE_BOX 8
-#define CONNDLG_PERSIST 16
-#define CONNDLG_NOT_PERSIST 32
-#define DISC_UPDATE_PROFILE 1
-#define DISC_NO_FORCE 64
-#define WNFMT_MULTILINE 1
-#define WNFMT_ABBREVIATED 2
-#define WNFMT_INENUM 16
-#define WNFMT_CONNECTION 32
-#define WN_SUCCESS NO_ERROR
-#define WN_NO_ERROR NO_ERROR
-#define WN_NOT_SUPPORTED ERROR_NOT_SUPPORTED
-#define WN_CANCEL ERROR_CANCELLED
-#define WN_RETRY ERROR_RETRY
-#define WN_NET_ERROR ERROR_UNEXP_NET_ERR
-#define WN_MORE_DATA ERROR_MORE_DATA
-#define WN_BAD_POINTER ERROR_INVALID_ADDRESS
-#define WN_BAD_VALUE ERROR_INVALID_PARAMETER
-#define WN_BAD_USER ERROR_BAD_USERNAME
-#define WN_BAD_PASSWORD ERROR_INVALID_PASSWORD
-#define WN_ACCESS_DENIED ERROR_ACCESS_DENIED
-#define WN_FUNCTION_BUSY ERROR_BUSY
-#define WN_WINDOWS_ERROR ERROR_UNEXP_NET_ERR
-#define WN_OUT_OF_MEMORY ERROR_NOT_ENOUGH_MEMORY
-#define WN_NO_NETWORK ERROR_NO_NETWORK
-#define WN_EXTENDED_ERROR ERROR_EXTENDED_ERROR
-#define WN_BAD_LEVEL ERROR_INVALID_LEVEL
-#define WN_BAD_HANDLE ERROR_INVALID_HANDLE
-#define WN_NOT_INITIALIZING ERROR_ALREADY_INITIALIZED
-#define WN_NO_MORE_DEVICES ERROR_NO_MORE_DEVICES
-#define WN_NOT_CONNECTED ERROR_NOT_CONNECTED
-#define WN_OPEN_FILES ERROR_OPEN_FILES
-#define WN_DEVICE_IN_USE ERROR_DEVICE_IN_USE
-#define WN_BAD_NETNAME ERROR_BAD_NET_NAME
-#define WN_BAD_LOCALNAME ERROR_BAD_DEVICE
-#define WN_ALREADY_CONNECTED ERROR_ALREADY_ASSIGNED
-#define WN_DEVICE_ERROR ERROR_GEN_FAILURE
-#define WN_CONNECTION_CLOSED ERROR_CONNECTION_UNAVAIL
-#define WN_NO_NET_OR_BAD_PATH ERROR_NO_NET_OR_BAD_PATH
-#define WN_BAD_PROVIDER ERROR_BAD_PROVIDER
-#define WN_CANNOT_OPEN_PROFILE ERROR_CANNOT_OPEN_PROFILE
-#define WN_BAD_PROFILE ERROR_BAD_PROFILE
-#define WN_BAD_DEV_TYPE ERROR_BAD_DEV_TYPE
-#define WN_DEVICE_ALREADY_REMEMBERED ERROR_DEVICE_ALREADY_REMEMBERED
-#define WN_NO_MORE_ENTRIES ERROR_NO_MORE_ITEMS
-#define WN_NOT_CONTAINER ERROR_NOT_CONTAINER
-#define WN_NOT_AUTHENTICATED ERROR_NOT_AUTHENTICATED
-#define WN_NOT_LOGGED_ON ERROR_NOT_LOGGED_ON
-#define WN_NOT_VALIDATED ERROR_NO_LOGON_SERVERS
-#define UNIVERSAL_NAME_INFO_LEVEL 1
-#define REMOTE_NAME_INFO_LEVEL 2
-#define NETINFO_DLL16 1
-#define NETINFO_DISKRED 4
-#define NETINFO_PRINTERRED 8
-#define RP_LOGON 1
-#define RP_INIFILE 2
-#define PP_DISPLAYERRORS 1
-#define WNCON_FORNETCARD 1
-#define WNCON_NOTROUTED 2
-#define WNCON_SLOWLINK 4
-#define WNCON_DYNAMIC 8
-
-#ifndef RC_INVOKED
-typedef struct _NETRESOURCEA {
-	DWORD dwScope;
-	DWORD dwType;
-	DWORD dwDisplayType;
-	DWORD dwUsage;
-	LPSTR lpLocalName;
-	LPSTR lpRemoteName;
-	LPSTR lpComment ;
-	LPSTR lpProvider;
-}NETRESOURCEA,*LPNETRESOURCEA;
-typedef struct _NETRESOURCEW {
-	DWORD dwScope;
-	DWORD dwType;
-	DWORD dwDisplayType;
-	DWORD dwUsage;
-	LPWSTR lpLocalName;
-	LPWSTR lpRemoteName;
-	LPWSTR lpComment ;
-	LPWSTR lpProvider;
-}NETRESOURCEW,*LPNETRESOURCEW;
-typedef struct _CONNECTDLGSTRUCTA{
-	DWORD cbStructure;
-	HWND hwndOwner;
-	LPNETRESOURCEA lpConnRes;
-	DWORD dwFlags;
-	DWORD dwDevNum;
-} CONNECTDLGSTRUCTA,*LPCONNECTDLGSTRUCTA;
-typedef struct _CONNECTDLGSTRUCTW{
-	DWORD cbStructure;
-	HWND hwndOwner;
-	LPNETRESOURCEW lpConnRes;
-	DWORD dwFlags;
-	DWORD dwDevNum;
-} CONNECTDLGSTRUCTW,*LPCONNECTDLGSTRUCTW;
-typedef struct _DISCDLGSTRUCTA{
-	DWORD cbStructure;
-	HWND hwndOwner;
-	LPSTR lpLocalName;
-	LPSTR lpRemoteName;
-	DWORD dwFlags;
-} DISCDLGSTRUCTA,*LPDISCDLGSTRUCTA;
-typedef struct _DISCDLGSTRUCTW{
-	DWORD cbStructure;
-	HWND hwndOwner;
-	LPWSTR lpLocalName;
-	LPWSTR lpRemoteName;
-	DWORD dwFlags;
-} DISCDLGSTRUCTW,*LPDISCDLGSTRUCTW;
-typedef struct _UNIVERSAL_NAME_INFOA { LPSTR lpUniversalName; }UNIVERSAL_NAME_INFOA,*LPUNIVERSAL_NAME_INFOA;
-typedef struct _UNIVERSAL_NAME_INFOW { LPWSTR lpUniversalName; }UNIVERSAL_NAME_INFOW,*LPUNIVERSAL_NAME_INFOW;
-typedef struct _REMOTE_NAME_INFOA {
-	LPSTR lpUniversalName;
-	LPSTR lpConnectionName;
-	LPSTR lpRemainingPath;
-}REMOTE_NAME_INFOA,*LPREMOTE_NAME_INFOA;
-typedef struct _REMOTE_NAME_INFOW {
-	LPWSTR lpUniversalName;
-	LPWSTR lpConnectionName;
-	LPWSTR lpRemainingPath;
-}REMOTE_NAME_INFOW,*LPREMOTE_NAME_INFOW;
-typedef struct _NETINFOSTRUCT{
-	DWORD cbStructure;
-	DWORD dwProviderVersion;
-	DWORD dwStatus;
-	DWORD dwCharacteristics;
-	DWORD dwHandle;
-	WORD wNetType;
-	DWORD dwPrinters;
-	DWORD dwDrives;
-} NETINFOSTRUCT,*LPNETINFOSTRUCT;
-typedef UINT(PASCAL *PFNGETPROFILEPATHA)(LPCSTR,LPSTR,UINT);
-typedef UINT(PASCAL *PFNGETPROFILEPATHW)(LPCWSTR,LPWSTR,UINT);
-typedef UINT(PASCAL *PFNRECONCILEPROFILEA)(LPCSTR,LPCSTR,DWORD);
-typedef UINT(PASCAL *PFNRECONCILEPROFILEW)(LPCWSTR,LPCWSTR,DWORD);
-typedef BOOL(PASCAL *PFNPROCESSPOLICIESA)(HWND,LPCSTR,LPCSTR,LPCSTR,DWORD);
-typedef BOOL(PASCAL *PFNPROCESSPOLICIESW)(HWND,LPCWSTR,LPCWSTR,LPCWSTR,DWORD);
-typedef struct _NETCONNECTINFOSTRUCT{
-	DWORD cbStructure;
-	DWORD dwFlags;
-	DWORD dwSpeed;
-	DWORD dwDelay;
-	DWORD dwOptDataSize;
-} NETCONNECTINFOSTRUCT,*LPNETCONNECTINFOSTRUCT;
-
-DWORD APIENTRY WNetAddConnectionA(LPCSTR,LPCSTR,LPCSTR);
-DWORD APIENTRY WNetAddConnectionW(LPCWSTR,LPCWSTR,LPCWSTR);
-DWORD APIENTRY WNetAddConnection2A(LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD);
-DWORD APIENTRY WNetAddConnection2W(LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD);
-DWORD APIENTRY WNetAddConnection3A(HWND,LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD);
-DWORD APIENTRY WNetAddConnection3W(HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD);
-DWORD APIENTRY WNetCancelConnectionA(LPCSTR,BOOL);
-DWORD APIENTRY WNetCancelConnectionW(LPCWSTR,BOOL);
-DWORD APIENTRY WNetCancelConnection2A(LPCSTR,DWORD,BOOL);
-DWORD APIENTRY WNetCancelConnection2W(LPCWSTR,DWORD,BOOL);
-DWORD APIENTRY WNetGetConnectionA(LPCSTR,LPSTR,PDWORD);
-DWORD APIENTRY WNetGetConnectionW(LPCWSTR,LPWSTR,PDWORD);
-DWORD APIENTRY WNetUseConnectionA(HWND,LPNETRESOURCEA,LPCSTR,LPCSTR,DWORD,LPSTR,PDWORD,PDWORD);
-DWORD APIENTRY WNetUseConnectionW(HWND,LPNETRESOURCEW,LPCWSTR,LPCWSTR,DWORD,LPWSTR,PDWORD,PDWORD);
-DWORD APIENTRY WNetSetConnectionA(LPCSTR,DWORD,PVOID);
-DWORD APIENTRY WNetSetConnectionW(LPCWSTR,DWORD,PVOID);
-DWORD APIENTRY WNetConnectionDialog(HWND,DWORD);
-DWORD APIENTRY WNetDisconnectDialog(HWND,DWORD);
-DWORD APIENTRY WNetConnectionDialog1A(LPCONNECTDLGSTRUCTA);
-DWORD APIENTRY WNetConnectionDialog1W(LPCONNECTDLGSTRUCTW);
-DWORD APIENTRY WNetDisconnectDialog1A(LPDISCDLGSTRUCTA);
-DWORD APIENTRY WNetDisconnectDialog1W(LPDISCDLGSTRUCTW);
-DWORD APIENTRY WNetOpenEnumA(DWORD,DWORD,DWORD,LPNETRESOURCEA,LPHANDLE);
-DWORD APIENTRY WNetOpenEnumW(DWORD,DWORD,DWORD,LPNETRESOURCEW,LPHANDLE);
-DWORD APIENTRY WNetEnumResourceA(HANDLE,PDWORD,PVOID,PDWORD);
-DWORD APIENTRY WNetEnumResourceW(HANDLE,PDWORD,PVOID,PDWORD);
-DWORD APIENTRY WNetCloseEnum(HANDLE);
-DWORD APIENTRY WNetGetUniversalNameA(LPCSTR,DWORD,PVOID,PDWORD);
-DWORD APIENTRY WNetGetUniversalNameW(LPCWSTR,DWORD,PVOID,PDWORD);
-DWORD APIENTRY WNetGetUserA(LPCSTR,LPSTR,PDWORD);
-DWORD APIENTRY WNetGetUserW(LPCWSTR,LPWSTR,PDWORD);
-DWORD APIENTRY WNetGetProviderNameA(DWORD,LPSTR,PDWORD);
-DWORD APIENTRY WNetGetProviderNameW(DWORD,LPWSTR,PDWORD);
-DWORD APIENTRY WNetGetNetworkInformationA(LPCSTR,LPNETINFOSTRUCT);
-DWORD APIENTRY WNetGetNetworkInformationW(LPCWSTR,LPNETINFOSTRUCT);
-DWORD APIENTRY WNetGetResourceInformationA(LPNETRESOURCEA,LPVOID,LPDWORD,LPSTR*);
-DWORD APIENTRY WNetGetResourceInformationW(LPNETRESOURCEA,LPVOID,LPDWORD,LPWSTR*);
-DWORD APIENTRY WNetGetLastErrorA(PDWORD,LPSTR,DWORD,LPSTR,DWORD);
-DWORD APIENTRY WNetGetLastErrorW(PDWORD,LPWSTR,DWORD,LPWSTR,DWORD);
-DWORD APIENTRY MultinetGetConnectionPerformanceA(LPNETRESOURCEA,LPNETCONNECTINFOSTRUCT);
-DWORD APIENTRY MultinetGetConnectionPerformanceW(LPNETRESOURCEW,LPNETCONNECTINFOSTRUCT);
-#ifdef UNICODE
-#define PFNPROCESSPOLICIES PFNPROCESSPOLICIESW
-#define PFNRECONCILEPROFILE PFNRECONCILEPROFILEW
-#define PFNGETPROFILEPATH PFNGETPROFILEPATHW
-typedef NETRESOURCEW NETRESOURCE,*LPNETRESOURCE;
-typedef CONNECTDLGSTRUCTW CONNECTDLGSTRUCT,*LPCONNECTDLGSTRUCT;
-typedef DISCDLGSTRUCTW DISCDLGSTRUCT,*LPDISCDLGSTRUCT;
-typedef REMOTE_NAME_INFOW REMOTE_NAME_INFO,*LPREMOTE_NAME_INFO;
-typedef UNIVERSAL_NAME_INFOW UNIVERSAL_NAME_INFO,*LPUNIVERSAL_NAME_INFO;
-#define WNetEnumResource WNetEnumResourceW
-#define WNetOpenEnum WNetOpenEnumW
-#define WNetGetResourceInformation WNetGetResourceInformationW
-#define WNetGetUniversalName WNetGetUniversalNameW
-#define WNetSetConnection WNetSetConnectionW
-#define WNetUseConnection WNetUseConnectionW
-#define WNetGetConnection WNetGetConnectionW
-#define WNetCancelConnection2 WNetCancelConnection2W
-#define WNetCancelConnection WNetCancelConnectionW
-#define WNetAddConnection3 WNetAddConnection3W
-#define WNetAddConnection2 WNetAddConnection2W
-#define WNetAddConnection WNetAddConnectionW
-#define WNetConnectionDialog1 WNetConnectionDialog1W
-#define WNetDisconnectDialog1 WNetDisconnectDialog1W
-#define WNetGetNetworkInformation WNetGetNetworkInformationW
-#define WNetGetProviderName WNetGetProviderNameW
-#define WNetGetUser WNetGetUserW
-#define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceW
-#define WNetGetLastError WNetGetLastErrorW
-#else
-#define PFNGETPROFILEPATH PFNGETPROFILEPATHA
-#define PFNRECONCILEPROFILE PFNRECONCILEPROFILEA
-#define PFNPROCESSPOLICIES PFNPROCESSPOLICIESA
-typedef NETRESOURCEA NETRESOURCE,*LPNETRESOURCE;
-typedef CONNECTDLGSTRUCTA CONNECTDLGSTRUCT,*LPCONNECTDLGSTRUCT;
-typedef DISCDLGSTRUCTA DISCDLGSTRUCT,*LPDISCDLGSTRUCT;
-typedef UNIVERSAL_NAME_INFOA UNIVERSAL_NAME_INFO,*LPUNIVERSAL_NAME_INFO;
-typedef REMOTE_NAME_INFOA REMOTE_NAME_INFO,*LPREMOTE_NAME_INFO;
-#define WNetOpenEnum WNetOpenEnumA
-#define WNetEnumResource WNetEnumResourceA
-#define WNetGetResourceInformation WNetGetResourceInformationA
-#define WNetGetUniversalName WNetGetUniversalNameA
-#define WNetConnectionDialog1 WNetConnectionDialog1A
-#define WNetDisconnectDialog1 WNetDisconnectDialog1A
-#define WNetAddConnection2 WNetAddConnection2A
-#define WNetAddConnection3 WNetAddConnection3A
-#define WNetCancelConnection WNetCancelConnectionA
-#define WNetCancelConnection2 WNetCancelConnection2A
-#define WNetGetConnection WNetGetConnectionA
-#define WNetUseConnection WNetUseConnectionA
-#define WNetSetConnection WNetSetConnectionA
-#define WNetAddConnection WNetAddConnectionA
-#define WNetGetUser WNetGetUserA
-#define WNetGetProviderName WNetGetProviderNameA
-#define WNetGetNetworkInformation WNetGetNetworkInformationA
-#define WNetGetLastError WNetGetLastErrorA
-#define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceA
-#endif
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/winnls.h b/winsup/w32api/include/winnls.h
deleted file mode 100644
index acdaf516c..000000000
--- a/winsup/w32api/include/winnls.h
+++ /dev/null
@@ -1,705 +0,0 @@
-#ifndef _WINNLS_H
-#define _WINNLS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAX_LEADBYTES 	12
-#define MAX_DEFAULTCHAR	2
-#define LOCALE_NOUSEROVERRIDE	0x80000000
-#define LOCALE_USE_CP_ACP	0x40000000
-#if (WINVER >= 0x0400)
-#define LOCALE_RETURN_NUMBER	0x20000000
-#endif
-#define LOCALE_ILANGUAGE	1
-#define LOCALE_SLANGUAGE	2
-#define LOCALE_SENGLANGUAGE	0x1001
-#define LOCALE_SABBREVLANGNAME	3
-#define LOCALE_SNATIVELANGNAME	4
-#define LOCALE_ICOUNTRY	5
-#define LOCALE_SCOUNTRY	6
-#define LOCALE_SENGCOUNTRY	0x1002
-#define LOCALE_SABBREVCTRYNAME	7
-#define LOCALE_SNATIVECTRYNAME	8
-#define LOCALE_IDEFAULTLANGUAGE	9
-#define LOCALE_IDEFAULTCOUNTRY	10
-#define LOCALE_IDEFAULTCODEPAGE	11
-#define LOCALE_IDEFAULTANSICODEPAGE 0x1004
-#define LOCALE_SLIST	12
-#define LOCALE_IMEASURE	13
-#define LOCALE_SDECIMAL	14
-#define LOCALE_STHOUSAND	15
-#define LOCALE_SGROUPING	16
-#define LOCALE_IDIGITS	17
-#define LOCALE_ILZERO	18
-#define LOCALE_INEGNUMBER	0x1010
-#define LOCALE_SNATIVEDIGITS	19
-#define LOCALE_SCURRENCY	20
-#define LOCALE_SINTLSYMBOL	21
-#define LOCALE_SMONDECIMALSEP	22
-#define LOCALE_SMONTHOUSANDSEP	23
-#define LOCALE_SMONGROUPING	24
-#define LOCALE_ICURRDIGITS	25
-#define LOCALE_IINTLCURRDIGITS	26
-#define LOCALE_ICURRENCY	27
-#define LOCALE_INEGCURR	28
-#define LOCALE_SDATE	29
-#define LOCALE_STIME	30
-#define LOCALE_SSHORTDATE	31
-#define LOCALE_SLONGDATE	32
-#define LOCALE_STIMEFORMAT	0x1003
-#define LOCALE_IDATE	33
-#define LOCALE_ILDATE	34
-#define LOCALE_ITIME	35
-#define LOCALE_ITIMEMARKPOSN	0x1005
-#define LOCALE_ICENTURY	36
-#define LOCALE_ITLZERO	37
-#define LOCALE_IDAYLZERO	38
-#define LOCALE_IMONLZERO	39
-#define LOCALE_S1159	40
-#define LOCALE_S2359	41
-#define LOCALE_ICALENDARTYPE	0x1009
-#define LOCALE_IOPTIONALCALENDAR	0x100B
-#define LOCALE_IFIRSTDAYOFWEEK	0x100C
-#define LOCALE_IFIRSTWEEKOFYEAR	0x100D
-#define LOCALE_SDAYNAME1	42
-#define LOCALE_SDAYNAME2	43
-#define LOCALE_SDAYNAME3	44
-#define LOCALE_SDAYNAME4	45
-#define LOCALE_SDAYNAME5	46
-#define LOCALE_SDAYNAME6	47
-#define LOCALE_SDAYNAME7	48
-#define LOCALE_SABBREVDAYNAME1	49
-#define LOCALE_SABBREVDAYNAME2	50
-#define LOCALE_SABBREVDAYNAME3	51
-#define LOCALE_SABBREVDAYNAME4	52
-#define LOCALE_SABBREVDAYNAME5	53
-#define LOCALE_SABBREVDAYNAME6	54
-#define LOCALE_SABBREVDAYNAME7	55
-#define LOCALE_SMONTHNAME1	56
-#define LOCALE_SMONTHNAME2	57
-#define LOCALE_SMONTHNAME3	58
-#define LOCALE_SMONTHNAME4	59
-#define LOCALE_SMONTHNAME5	60
-#define LOCALE_SMONTHNAME6	61
-#define LOCALE_SMONTHNAME7	62
-#define LOCALE_SMONTHNAME8	63
-#define LOCALE_SMONTHNAME9	64
-#define LOCALE_SMONTHNAME10	65
-#define LOCALE_SMONTHNAME11	66
-#define LOCALE_SMONTHNAME12	67
-#define LOCALE_SMONTHNAME13	0x100E
-#define LOCALE_SABBREVMONTHNAME1	68
-#define LOCALE_SABBREVMONTHNAME2	69
-#define LOCALE_SABBREVMONTHNAME3	70
-#define LOCALE_SABBREVMONTHNAME4	71
-#define LOCALE_SABBREVMONTHNAME5	72
-#define LOCALE_SABBREVMONTHNAME6	73
-#define LOCALE_SABBREVMONTHNAME7	74
-#define LOCALE_SABBREVMONTHNAME8	75
-#define LOCALE_SABBREVMONTHNAME9	76
-#define LOCALE_SABBREVMONTHNAME10	77
-#define LOCALE_SABBREVMONTHNAME11	78
-#define LOCALE_SABBREVMONTHNAME12	79
-#define LOCALE_SABBREVMONTHNAME13	0x100F
-#define LOCALE_SPOSITIVESIGN	80
-#define LOCALE_SNEGATIVESIGN	81
-#define LOCALE_IPOSSIGNPOSN	82
-#define LOCALE_INEGSIGNPOSN	83
-#define LOCALE_IPOSSYMPRECEDES	84
-#define LOCALE_IPOSSEPBYSPACE	85
-#define LOCALE_INEGSYMPRECEDES	86
-#define LOCALE_INEGSEPBYSPACE	87
-#define LOCALE_FONTSIGNATURE	88
-#define LOCALE_SISO639LANGNAME 89
-#define LOCALE_SISO3166CTRYNAME 90
-#define LOCALE_SYSTEM_DEFAULT	0x800
-#define LOCALE_USER_DEFAULT	0x400
-#define NORM_IGNORECASE	1
-#define NORM_IGNOREKANATYPE	65536
-#define NORM_IGNORENONSPACE	2
-#define NORM_IGNORESYMBOLS	4
-#define NORM_IGNOREWIDTH	131072
-#define SORT_STRINGSORT	4096
-#define LCMAP_LOWERCASE 0x00000100
-#define LCMAP_UPPERCASE 0x00000200
-#define LCMAP_SORTKEY 0x00000400
-#define LCMAP_BYTEREV 0x00000800
-#define LCMAP_HIRAGANA 0x00100000
-#define LCMAP_KATAKANA 0x00200000
-#define LCMAP_HALFWIDTH 0x00400000
-#define LCMAP_FULLWIDTH 0x00800000
-#define LCMAP_LINGUISTIC_CASING 0x01000000
-#define LCMAP_SIMPLIFIED_CHINESE 0x02000000
-#define LCMAP_TRADITIONAL_CHINESE 0x04000000
-#define ENUM_ALL_CALENDARS (-1)
-#define DATE_SHORTDATE 1
-#define DATE_LONGDATE 2
-#define DATE_USE_ALT_CALENDAR 4
-#define CP_INSTALLED 1
-#define CP_SUPPORTED 2
-#define LCID_INSTALLED 1
-#define LCID_SUPPORTED 2
-#define LCID_ALTERNATE_SORTS 4
-#define MAP_FOLDCZONE 16
-#define MAP_FOLDDIGITS 128
-#define MAP_PRECOMPOSED 32
-#define MAP_COMPOSITE 64
-#define CP_ACP 0
-#define CP_OEMCP 1
-#define CP_MACCP 2
-#define CP_THREAD_ACP 3
-#define CP_SYMBOL 42
-#define CP_UTF7 65000
-#define CP_UTF8 65001
-#define CT_CTYPE1 1
-#define CT_CTYPE2 2
-#define CT_CTYPE3 4
-#define C1_UPPER 1
-#define C1_LOWER 2
-#define C1_DIGIT 4
-#define C1_SPACE 8
-#define C1_PUNCT 16
-#define C1_CNTRL 32
-#define C1_BLANK 64
-#define C1_XDIGIT 128
-#define C1_ALPHA 256
-#define C2_LEFTTORIGHT 1
-#define C2_RIGHTTOLEFT 2
-#define C2_EUROPENUMBER 3
-#define C2_EUROPESEPARATOR 4
-#define C2_EUROPETERMINATOR 5
-#define C2_ARABICNUMBER 6
-#define C2_COMMONSEPARATOR 7
-#define C2_BLOCKSEPARATOR 8
-#define C2_SEGMENTSEPARATOR 9
-#define C2_WHITESPACE 10
-#define C2_OTHERNEUTRAL 11
-#define C2_NOTAPPLICABLE 0
-#define C3_NONSPACING 1
-#define C3_DIACRITIC 2
-#define C3_VOWELMARK 4
-#define C3_SYMBOL 8
-#define C3_KATAKANA 16
-#define C3_HIRAGANA 32
-#define C3_HALFWIDTH 64
-#define C3_FULLWIDTH 128
-#define C3_IDEOGRAPH 256
-#define C3_KASHIDA 512
-#define C3_LEXICAL 1024
-#define C3_ALPHA 32768
-#define C3_NOTAPPLICABLE 0
-#define TIME_NOMINUTESORSECONDS 1
-#define TIME_NOSECONDS 2
-#define TIME_NOTIMEMARKER 4
-#define TIME_FORCE24HOURFORMAT 8
-#define MB_PRECOMPOSED 1
-#define MB_COMPOSITE 2
-#define MB_ERR_INVALID_CHARS 8
-#define MB_USEGLYPHCHARS 4
-#define WC_COMPOSITECHECK 512
-#define WC_DISCARDNS 16
-#define WC_SEPCHARS 32
-#define WC_DEFAULTCHAR 64
-#define CTRY_DEFAULT 0
-#define CTRY_ALBANIA 355
-#define CTRY_ALGERIA 213
-#define CTRY_ARGENTINA 54
-#define CTRY_ARMENIA 374
-#define CTRY_AUSTRALIA 61
-#define CTRY_AUSTRIA 43
-#define CTRY_AZERBAIJAN 994
-#define CTRY_BAHRAIN 973
-#define CTRY_BELARUS 375
-#define CTRY_BELGIUM 32
-#define CTRY_BELIZE 501
-#define CTRY_BOLIVIA 591
-#define CTRY_BRAZIL 55
-#define CTRY_BRUNEI_DARUSSALAM 673
-#define CTRY_BULGARIA 359
-#define CTRY_CANADA 2
-#define CTRY_CARIBBEAN 1
-#define CTRY_CHILE 56
-#define CTRY_COLOMBIA 57
-#define CTRY_COSTA_RICA 506
-#define CTRY_CROATIA 385
-#define CTRY_CZECH 420
-#define CTRY_DENMARK 45
-#define CTRY_DOMINICAN_REPUBLIC 1
-#define CTRY_ECUADOR 593
-#define CTRY_EGYPT 20
-#define CTRY_EL_SALVADOR 503
-#define CTRY_ESTONIA 372
-#define CTRY_FAEROE_ISLANDS 298
-#define CTRY_FINLAND 358
-#define CTRY_FRANCE 33
-#define CTRY_GEORGIA 995
-#define CTRY_GERMANY 49
-#define CTRY_GREECE 30
-#define CTRY_GUATEMALA 502
-#define CTRY_HONDURAS 504
-#define CTRY_HONG_KONG 852
-#define CTRY_HUNGARY 36
-#define CTRY_ICELAND 354
-#define CTRY_INDIA 91
-#define CTRY_INDONESIA 62
-#define CTRY_IRAN 981
-#define CTRY_IRAQ 964
-#define CTRY_IRELAND 353
-#define CTRY_ISRAEL 972
-#define CTRY_ITALY 39
-#define CTRY_JAMAICA 1
-#define CTRY_JAPAN 81
-#define CTRY_JORDAN 962
-#define CTRY_KAZAKSTAN 7
-#define CTRY_KENYA 254
-#define CTRY_KUWAIT 965
-#define CTRY_KYRGYZSTAN 996
-#define CTRY_LATVIA 371
-#define CTRY_LEBANON 961
-#define CTRY_LIBYA 218
-#define CTRY_LIECHTENSTEIN 41
-#define CTRY_LITHUANIA 370
-#define CTRY_LUXEMBOURG 352
-#define CTRY_MACAU 853
-#define CTRY_MACEDONIA 389
-#define CTRY_MALAYSIA 60
-#define CTRY_MALDIVES 960
-#define CTRY_MEXICO 52
-#define CTRY_MONACO 33
-#define CTRY_MONGOLIA 976
-#define CTRY_MOROCCO 212
-#define CTRY_NETHERLANDS 31
-#define CTRY_NEW_ZEALAND 64
-#define CTRY_NICARAGUA 505
-#define CTRY_NORWAY 47
-#define CTRY_OMAN 968
-#define CTRY_PAKISTAN 92
-#define CTRY_PANAMA 507
-#define CTRY_PARAGUAY 595
-#define CTRY_PERU 51
-#define CTRY_PHILIPPINES 63
-#define CTRY_POLAND 48
-#define CTRY_PORTUGAL 351
-#define CTRY_PRCHINA 86
-#define CTRY_PUERTO_RICO 1
-#define CTRY_QATAR 974
-#define CTRY_ROMANIA 40
-#define CTRY_RUSSIA 7
-#define CTRY_SAUDI_ARABIA 966
-#define CTRY_SERBIA 381
-#define CTRY_SINGAPORE 65
-#define CTRY_SLOVAK 421
-#define CTRY_SLOVENIA 386
-#define CTRY_SOUTH_AFRICA 27
-#define CTRY_SOUTH_KOREA 82
-#define CTRY_SPAIN 34
-#define CTRY_SWEDEN 46
-#define CTRY_SWITZERLAND 41
-#define CTRY_SYRIA 963
-#define CTRY_TAIWAN 886
-#define CTRY_TATARSTAN 7
-#define CTRY_THAILAND 66
-#define CTRY_TRINIDAD_Y_TOBAGO 1
-#define CTRY_TUNISIA 216
-#define CTRY_TURKEY 90
-#define CTRY_UAE 971
-#define CTRY_UKRAINE 380
-#define CTRY_UNITED_KINGDOM 44
-#define CTRY_UNITED_STATES 1
-#define CTRY_URUGUAY 598
-#define CTRY_UZBEKISTAN 7
-#define CTRY_VENEZUELA 58
-#define CTRY_VIET_NAM 84
-#define CTRY_YEMEN 967
-#define CTRY_ZIMBABWE 263
-#define CAL_ICALINTVALUE 1
-#define CAL_SCALNAME 2
-#define CAL_IYEAROFFSETRANGE 3
-#define CAL_SERASTRING 4
-#define CAL_SSHORTDATE 5
-#define CAL_SLONGDATE 6
-#define CAL_SDAYNAME1 7
-#define CAL_SDAYNAME2 8
-#define CAL_SDAYNAME3 9
-#define CAL_SDAYNAME4 10
-#define CAL_SDAYNAME5 11
-#define CAL_SDAYNAME6 12
-#define CAL_SDAYNAME7 13
-#define CAL_SABBREVDAYNAME1 14
-#define CAL_SABBREVDAYNAME2 15
-#define CAL_SABBREVDAYNAME3 16
-#define CAL_SABBREVDAYNAME4 17
-#define CAL_SABBREVDAYNAME5 18
-#define CAL_SABBREVDAYNAME6 19
-#define CAL_SABBREVDAYNAME7 20
-#define CAL_SMONTHNAME1 21
-#define CAL_SMONTHNAME2 22
-#define CAL_SMONTHNAME3 23
-#define CAL_SMONTHNAME4 24
-#define CAL_SMONTHNAME5 25
-#define CAL_SMONTHNAME6 26
-#define CAL_SMONTHNAME7 27
-#define CAL_SMONTHNAME8 28
-#define CAL_SMONTHNAME9 29
-#define CAL_SMONTHNAME10 30
-#define CAL_SMONTHNAME11 31
-#define CAL_SMONTHNAME12 32
-#define CAL_SMONTHNAME13 33
-#define CAL_SABBREVMONTHNAME1 34
-#define CAL_SABBREVMONTHNAME2 35
-#define CAL_SABBREVMONTHNAME3 36
-#define CAL_SABBREVMONTHNAME4 37
-#define CAL_SABBREVMONTHNAME5 38
-#define CAL_SABBREVMONTHNAME6 39
-#define CAL_SABBREVMONTHNAME7 40
-#define CAL_SABBREVMONTHNAME8 41
-#define CAL_SABBREVMONTHNAME9 42
-#define CAL_SABBREVMONTHNAME10 43
-#define CAL_SABBREVMONTHNAME11 44
-#define CAL_SABBREVMONTHNAME12 45
-#define CAL_SABBREVMONTHNAME13 46
-#define CAL_GREGORIAN 1
-#define CAL_GREGORIAN_US 2
-#define CAL_JAPAN 3
-#define CAL_TAIWAN 4
-#define CAL_KOREA 5
-#define CAL_HIJRI 6
-#define CAL_THAI 7
-#define CAL_HEBREW 8
-#define CAL_GREGORIAN_ME_FRENCH 9
-#define CAL_GREGORIAN_ARABIC 10
-#define CAL_GREGORIAN_XLIT_ENGLISH 11
-#define CAL_GREGORIAN_XLIT_FRENCH 12
-#define CSTR_LESS_THAN 1
-#define CSTR_EQUAL 2
-#define CSTR_GREATER_THAN 3
-#define LGRPID_INSTALLED 1
-#define LGRPID_SUPPORTED 2
-#define LGRPID_WESTERN_EUROPE 1
-#define LGRPID_CENTRAL_EUROPE 2
-#define LGRPID_BALTIC 3
-#define LGRPID_GREEK 4
-#define LGRPID_CYRILLIC 5
-#define LGRPID_TURKISH 6
-#define LGRPID_JAPANESE 7
-#define LGRPID_KOREAN 8
-#define LGRPID_TRADITIONAL_CHINESE 9
-#define LGRPID_SIMPLIFIED_CHINESE 10
-#define LGRPID_THAI 11
-#define LGRPID_HEBREW 12
-#define LGRPID_ARABIC 13
-#define LGRPID_VIETNAMESE 14
-#define LGRPID_INDIC 15
-#define LGRPID_GEORGIAN 16
-#define LGRPID_ARMENIAN 17
-
-#if (WINVER >= 0x0500)
-#define LOCALE_SYEARMONTH 0x1006
-#define LOCALE_SENGCURRNAME 0x1007
-#define LOCALE_SNATIVECURRNAME 0x1008
-#define LOCALE_IDEFAULTEBCDICCODEPAGE 0x1012
-#define LOCALE_SSORTNAME 0x1013
-#define LOCALE_IDIGITSUBSTITUTION 0x1014
-#define LOCALE_IPAPERSIZE 0x100A
-#define DATE_YEARMONTH 8
-#define DATE_LTRREADING 16
-#define DATE_RTLREADING 32
-#define MAP_EXPAND_LIGATURES   0x2000
-#define WC_NO_BEST_FIT_CHARS 1024
-#define CAL_SYEARMONTH 47
-#define CAL_ITWODIGITYEARMAX 48
-#define CAL_NOUSEROVERRIDE LOCALE_NOUSEROVERRIDE
-#define CAL_RETURN_NUMBER LOCALE_RETURN_NUMBER
-#define CAL_USE_CP_ACP LOCALE_USE_CP_ACP
-#endif /* (WINVER >= 0x0500) */
-#ifndef  _BASETSD_H
-typedef long LONG_PTR;
-#endif 
-
-#ifndef RC_INVOKED
-typedef DWORD LCTYPE;
-typedef DWORD CALTYPE;
-typedef DWORD CALID;
-typedef DWORD LGRPID;
-typedef DWORD GEOID;
-typedef DWORD GEOTYPE;
-typedef DWORD GEOCLASS;
-typedef BOOL (CALLBACK *CALINFO_ENUMPROCA)(LPSTR);
-typedef BOOL (CALLBACK *CALINFO_ENUMPROCW)(LPWSTR);
-typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXA)(LPSTR, CALID);
-typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXW)(LPWSTR, CALID);
-typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCA)(LGRPID, LPSTR, LPSTR, DWORD, LONG_PTR);
-typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCW)(LGRPID, LPWSTR, LPWSTR, DWORD, LONG_PTR);
-typedef BOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCA)(LGRPID, LCID, LPSTR, LONG_PTR);
-typedef BOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCW)(LGRPID, LCID, LPWSTR, LONG_PTR);
-typedef BOOL (CALLBACK *UILANGUAGE_ENUMPROCW)(LPWSTR, LONG_PTR);
-typedef BOOL (CALLBACK *UILANGUAGE_ENUMPROCA)(LPSTR, LONG_PTR);
-typedef BOOL (CALLBACK *LOCALE_ENUMPROCA)(LPSTR);
-typedef BOOL (CALLBACK *LOCALE_ENUMPROCW)(LPWSTR);
-typedef BOOL (CALLBACK *CODEPAGE_ENUMPROCA)(LPSTR);
-typedef BOOL (CALLBACK *CODEPAGE_ENUMPROCW)(LPWSTR);
-typedef BOOL (CALLBACK *DATEFMT_ENUMPROCA)(LPSTR);
-typedef BOOL (CALLBACK *DATEFMT_ENUMPROCW)(LPWSTR);
-typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXA)(LPSTR, CALID);
-typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXW)(LPWSTR, CALID);
-typedef BOOL (CALLBACK *TIMEFMT_ENUMPROCA)(LPSTR);
-typedef BOOL (CALLBACK *TIMEFMT_ENUMPROCW)(LPWSTR);
-typedef BOOL (CALLBACK *GEO_ENUMPROC)(GEOID);
-
-enum NLS_FUNCTION {
-	COMPARE_STRING = 0x0001
-};
-typedef enum NLS_FUNCTION NLS_FUNCTION;
-enum SYSGEOCLASS {
-	GEOCLASS_NATION = 16,
-	GEOCLASS_REGION = 14
-};
-enum SYSGEOTYPE {
-	GEO_NATION            = 0x0001,
-	GEO_LATITUDE          = 0x0002,
-	GEO_LONGITUDE         = 0x0003,
-	GEO_ISO2              = 0x0004,
-	GEO_ISO3              = 0x0005,
-	GEO_RFC1766           = 0x0006,
-	GEO_LCID              = 0x0007,
-	GEO_FRIENDLYNAME      = 0x0008,
-	GEO_OFFICIALNAME      = 0x0009,
-	GEO_TIMEZONES         = 0x000a,
-	GEO_OFFICIALLANGUAGES = 0x000a
-};
-
-typedef struct _cpinfo {
-	UINT MaxCharSize;
-	BYTE DefaultChar[MAX_DEFAULTCHAR];
-	BYTE LeadByte[MAX_LEADBYTES];
-} CPINFO,*LPCPINFO;
-typedef struct _cpinfoexA {
-	UINT MaxCharSize;
-	BYTE DefaultChar[MAX_DEFAULTCHAR];
-	BYTE LeadByte[MAX_LEADBYTES];
-	WCHAR UnicodeDefaultChar;
-	UINT CodePage;
-	CHAR CodePageName[MAX_PATH];
-} CPINFOEXA,*LPCPINFOEXA;
-typedef struct _cpinfoexW {
-	UINT MaxCharSize;
-	BYTE DefaultChar[MAX_DEFAULTCHAR];
-	BYTE LeadByte[MAX_LEADBYTES];
-	WCHAR UnicodeDefaultChar;
-	UINT CodePage;
-	WCHAR CodePageName[MAX_PATH];
-} CPINFOEXW,*LPCPINFOEXW;
-typedef struct _currencyfmtA {
-	UINT NumDigits;
-	UINT LeadingZero;
-	UINT Grouping;
-	LPSTR lpDecimalSep;
-	LPSTR lpThousandSep;
-	UINT NegativeOrder;
-	UINT PositiveOrder;
-	LPSTR lpCurrencySymbol;
-} CURRENCYFMTA,*LPCURRENCYFMTA;
-typedef struct _currencyfmtW {
-	UINT NumDigits;
-	UINT LeadingZero;
-	UINT Grouping;
-	LPWSTR lpDecimalSep;
-	LPWSTR lpThousandSep;
-	UINT NegativeOrder;
-	UINT PositiveOrder;
-	LPWSTR lpCurrencySymbol;
-} CURRENCYFMTW,*LPCURRENCYFMTW;
-typedef struct nlsversioninfo { 
-	DWORD dwNLSVersionInfoSize; 
-	DWORD dwNLSVersion; 
-	DWORD dwDefinedVersion; 
-} NLSVERSIONINFO,*LPNLSVERSIONINFO; 
-typedef struct _numberfmtA {
-	UINT NumDigits;
-	UINT LeadingZero;
-	UINT Grouping;
-	LPSTR lpDecimalSep;
-	LPSTR lpThousandSep;
-	UINT NegativeOrder;
-} NUMBERFMTA,*LPNUMBERFMTA;
-typedef struct _numberfmtW {
-	UINT NumDigits;
-	UINT LeadingZero;
-	UINT Grouping;
-	LPWSTR lpDecimalSep;
-	LPWSTR lpThousandSep;
-	UINT NegativeOrder;
-} NUMBERFMTW,*LPNUMBERFMTW;
-
-int WINAPI CompareStringA(LCID,DWORD,LPCSTR,int,LPCSTR,int);
-int WINAPI CompareStringW(LCID,DWORD,LPCWSTR,int,LPCWSTR,int);
-LCID WINAPI ConvertDefaultLocale(LCID);
-BOOL WINAPI EnumCalendarInfoA(CALINFO_ENUMPROCA,LCID,CALID,CALTYPE);
-BOOL WINAPI EnumCalendarInfoW(CALINFO_ENUMPROCW,LCID,CALID,CALTYPE);
-BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA,LCID,DWORD);
-BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW,LCID,DWORD);
-BOOL WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA,DWORD);
-BOOL WINAPI EnumSystemCodePagesW(CODEPAGE_ENUMPROCW,DWORD);
-BOOL WINAPI EnumSystemGeoID(GEOCLASS,GEOID,GEO_ENUMPROC);
-BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD);
-BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD);
-BOOL WINAPI EnumTimeFormatsA(TIMEFMT_ENUMPROCA,LCID,DWORD);
-BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW,LCID,DWORD);
-int WINAPI FoldStringA(DWORD,LPCSTR,int,LPSTR,int);
-int WINAPI FoldStringW(DWORD,LPCWSTR,int,LPWSTR,int);
-UINT WINAPI GetACP(void);
-int WINAPI GetCalendarInfoA(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD);
-int WINAPI GetCalendarInfoW(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD);
-BOOL WINAPI GetCPInfo(UINT,LPCPINFO);
-BOOL WINAPI GetCPInfoExA(UINT,DWORD,LPCPINFOEXA);
-BOOL WINAPI GetCPInfoExW(UINT,DWORD,LPCPINFOEXW);
-int WINAPI GetCurrencyFormatA(LCID,DWORD,LPCSTR,const CURRENCYFMTA*,LPSTR,int);
-int WINAPI GetCurrencyFormatW(LCID,DWORD,LPCWSTR,const CURRENCYFMTW*,LPWSTR,int);
-int WINAPI GetDateFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,int);
-int WINAPI GetDateFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int);
-int WINAPI GetGeoInfoA(GEOID,GEOTYPE,LPSTR,int,LANGID);
-int WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,int,LANGID);
-int WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,int);
-int WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,int);
-BOOL WINAPI GetNLSVersion(NLS_FUNCTION,LCID,LPNLSVERSIONINFO);
-int WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMTA*,LPSTR,int);
-int WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,int);
-UINT WINAPI GetOEMCP(void);
-BOOL WINAPI GetStringTypeA(LCID,DWORD,LPCSTR,int,LPWORD);
-BOOL WINAPI GetStringTypeW(DWORD,LPCWSTR,int,LPWORD);
-BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,int,LPWORD);
-BOOL WINAPI GetStringTypeExW(LCID,DWORD,LPCWSTR,int,LPWORD);
-LANGID WINAPI GetSystemDefaultLangID(void);
-LCID WINAPI GetSystemDefaultLCID(void);
-LCID WINAPI GetThreadLocale(void);
-int WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,int);
-int WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int);
-LANGID WINAPI GetUserDefaultLangID(void);
-LCID WINAPI GetUserDefaultLCID(void);
-GEOID WINAPI GetUserGeoID(GEOCLASS);
-BOOL WINAPI IsDBCSLeadByte(BYTE);
-BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE);
-BOOL WINAPI IsNLSDefinedString(NLS_FUNCTION,DWORD,LPNLSVERSIONINFO,LPCWSTR,int);
-BOOL WINAPI IsValidCodePage(UINT);
-BOOL WINAPI IsValidLocale(LCID,DWORD);
-int WINAPI LCMapStringA(LCID,DWORD,LPCSTR,int,LPSTR,int);
-int WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,int,LPWSTR,int);
-int WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,int,LPWSTR,int);
-int WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR);
-int WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR);
-BOOL WINAPI SetLocaleInfoA(LCID,LCTYPE,LPCSTR);
-BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR);
-BOOL WINAPI SetThreadLocale(LCID);
-BOOL WINAPI SetUserGeoID(GEOID);
-int WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,int,LPSTR,int,LPCSTR,LPBOOL);
-#if (WINVER >= 0x0500)
-BOOL WINAPI EnumCalendarInfoExA(CALINFO_ENUMPROCEXA,LCID,CALID,CALTYPE);
-BOOL WINAPI EnumCalendarInfoExW(CALINFO_ENUMPROCEXW,LCID,CALID,CALTYPE);
-BOOL WINAPI EnumDateFormatsExA(DATEFMT_ENUMPROCEXA,LCID,DWORD);
-BOOL WINAPI EnumDateFormatsExW(DATEFMT_ENUMPROCEXW,LCID,DWORD);
-BOOL WINAPI EnumSystemLanguageGroupsA(LANGUAGEGROUP_ENUMPROCA,DWORD,LONG_PTR);
-BOOL WINAPI EnumSystemLanguageGroupsW(LANGUAGEGROUP_ENUMPROCW,DWORD,LONG_PTR);
-BOOL WINAPI EnumLanguageGroupLocalesA(LANGGROUPLOCALE_ENUMPROCA,LGRPID,DWORD,LONG_PTR);
-BOOL WINAPI EnumLanguageGroupLocalesW(LANGGROUPLOCALE_ENUMPROCW,LGRPID,DWORD,LONG_PTR);
-BOOL WINAPI EnumUILanguagesA(UILANGUAGE_ENUMPROCA,DWORD,LONG_PTR);
-BOOL WINAPI EnumUILanguagesW(UILANGUAGE_ENUMPROCW,DWORD,LONG_PTR);
-LANGID WINAPI GetSystemDefaultUILanguage(void);
-LANGID WINAPI GetUserDefaultUILanguage(void);
-BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD);
-#endif /* (WINVER >= 0x0500) */
-
-#ifdef UNICODE
-#define CALINFO_ENUMPROC CALINFO_ENUMPROCW
-#define CALINFO_ENUMPROCEX CALINFO_ENUMPROCEXW
-#define LOCALE_ENUMPROC LOCALE_ENUMPROCW
-#define CODEPAGE_ENUMPROC CODEPAGE_ENUMPROCW
-#define DATEFMT_ENUMPROC DATEFMT_ENUMPROCW
-#define DATEFMT_ENUMPROCEX DATEFMT_ENUMPROCEXW
-#define TIMEFMT_ENUMPROC TIMEFMT_ENUMPROCW
-#define LANGUAGEGROUP_ENUMPROC LANGUAGEGROUP_ENUMPROCW
-#define LANGGROUPLOCALE_ENUMPROC LANGGROUPLOCALE_ENUMPROCW
-#define UILANGUAGE_ENUMPROC UILANGUAGE_ENUMPROCW
-typedef CPINFOEXW CPINFOEX;
-typedef LPCPINFOEXW LPCPINFOEX;
-typedef CURRENCYFMTW CURRENCYFMT;
-typedef LPCURRENCYFMTW LPCURRENCYFMT;
-typedef NUMBERFMTW NUMBERFMT;
-typedef LPNUMBERFMTW LPNUMBERFMT;
-#define CompareString CompareStringW
-#define EnumCalendarInfo EnumCalendarInfoW
-#define EnumSystemCodePages EnumSystemCodePagesW
-#define EnumSystemLocales EnumSystemLocalesW
-#define EnumTimeFormats EnumTimeFormatsW
-#define FoldString FoldStringW
-#define GetCalendarInfo GetCalendarInfoW
-#define GetCPInfoEx GetCPInfoExW
-#define GetCurrencyFormat GetCurrencyFormatW
-#define GetDateFormat GetDateFormatW
-#define GetGeoInfo GetGeoInfoW
-#define GetLocaleInfo GetLocaleInfoW
-#define GetNumberFormat GetNumberFormatW
-#define GetStringTypeEx GetStringTypeExW
-#define GetTimeFormat GetTimeFormatW
-#define LCMapString LCMapStringW
-#define SetCalendarInfo  SetCalendarInfoW
-#define SetLocaleInfo SetLocaleInfoW
-#if (WINVER >= 0x0500)
-#define EnumCalendarInfoEx EnumCalendarInfoExW;
-#define EnumDateFormatsEx EnumDateFormatsExW;
-#define EnumSystemLanguageGroups EnumSystemLanguageGroupsW;
-#define EnumLanguageGroupLocales EnumLanguageGroupLocalesW;
-#define EnumUILanguages EnumUILanguagesW;
-#endif /* (WINVER >= 0x0500) */
-#else
-#define CALINFO_ENUMPROC CALINFO_ENUMPROCA
-#define CALINFO_ENUMPROCEX CALINFO_ENUMPROCEXA
-#define LOCALE_ENUMPROC LOCALE_ENUMPROCA
-#define CODEPAGE_ENUMPROC CODEPAGE_ENUMPROCA
-#define DATEFMT_ENUMPROC DATEFMT_ENUMPROCA
-#define DATEFMT_ENUMPROCEX DATEFMT_ENUMPROCEXA
-#define TIMEFMT_ENUMPROC TIMEFMT_ENUMPROCA
-#define LANGUAGEGROUP_ENUMPROC LANGUAGEGROUP_ENUMPROCA
-#define LANGGROUPLOCALE_ENUMPROC LANGGROUPLOCALE_ENUMPROCA
-#define UILANGUAGE_ENUMPROC UILANGUAGE_ENUMPROCA
-typedef CPINFOEXA CPINFOEX;
-typedef LPCPINFOEXA LPCPINFOEX;
-typedef CURRENCYFMTA CURRENCYFMT;
-typedef LPCURRENCYFMTA LPCURRENCYFMT;
-typedef NUMBERFMTA NUMBERFMT;
-typedef LPNUMBERFMTA LPNUMBERFMT;
-#define CompareString CompareStringA
-#define EnumCalendarInfo EnumCalendarInfoA
-#define EnumSystemCodePages EnumSystemCodePagesA
-#define EnumSystemLocales EnumSystemLocalesA
-#define EnumTimeFormats EnumTimeFormatsA
-#define FoldString FoldStringA
-#define GetCalendarInfo GetCalendarInfoA
-#define GetCPInfoEx GetCPInfoExA
-#define GetCurrencyFormat GetCurrencyFormatA
-#define GetDateFormat GetDateFormatA
-#define GetGeoInfo GetGeoInfoA
-#define GetLocaleInfo GetLocaleInfoA
-#define GetNumberFormat GetNumberFormatA
-#define GetStringTypeEx GetStringTypeExA
-#define GetTimeFormat GetTimeFormatA
-#define LCMapString LCMapStringA
-#define SetCalendarInfo SetCalendarInfoA
-#define SetLocaleInfo SetLocaleInfoA
-#if (WINVER >= 0x0500)
-#define EnumCalendarInfoEx EnumCalendarInfoExA;
-#define EnumDateFormatsEx EnumDateFormatsExA;
-#define EnumSystemLanguageGroups EnumSystemLanguageGroupsA;
-#define EnumLanguageGroupLocales EnumLanguageGroupLocalesA;
-#define EnumUILanguages EnumUILanguagesA;
-#endif /* (WINVER >= 0x0500) */
-#endif /* UNICODE */
-#endif /* RC_INVOKED */
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
deleted file mode 100644
index 683d01027..000000000
--- a/winsup/w32api/include/winnt.h
+++ /dev/null
@@ -1,3328 +0,0 @@
-#ifndef _WINNT_H
-#define _WINNT_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-/* translate GCC target defines to MS equivalents. Keep this synchronized
-   with windows.h. */
-#if defined(__i686__) && !defined(_M_IX86)
-#define _M_IX86 600
-#elif defined(__i586__) && !defined(_M_IX86)
-#define _M_IX86 500
-#elif defined(__i486__) && !defined(_M_IX86)
-#define _M_IX86 400
-#elif defined(__i386__) && !defined(_M_IX86)
-#define _M_IX86 300
-#endif
-#if defined(_M_IX86) && !defined(_X86_)
-#define _X86_
-#elif defined(_M_ALPHA) && !defined(_ALPHA_)
-#define _ALPHA_
-#elif defined(_M_PPC) && !defined(_PPC_)
-#define _PPC_
-#elif defined(_M_MRX000) && !defined(_MIPS_)
-#define _MIPS_
-#elif defined(_M_M68K) && !defined(_68K_)
-#define _68K_
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <winerror.h>
-
-#ifndef RC_INVOKED
-#include <string.h>
-
-/* FIXME: add more architectures. Is there a way to specify this in GCC? */
-#ifdef _X86_
-#define UNALIGNED
-#else
-#define UNALIGNED
-#endif
-
-#ifndef VOID
-#define VOID void
-#endif
-typedef char CHAR;
-typedef short SHORT;
-typedef long LONG;
-typedef char CCHAR, *PCCHAR;
-typedef unsigned char UCHAR,*PUCHAR;
-typedef unsigned short USHORT,*PUSHORT;
-typedef unsigned long ULONG,*PULONG;
-typedef char *PSZ;
-
-typedef void *PVOID,*LPVOID;
-
-/* FIXME for __WIN64 */
-#ifndef  __ptr64
-#define __ptr64
-#endif
-typedef void* __ptr64 PVOID64;
-
-#ifndef _WCHAR_T_DEFINED
-#define _WCHAR_T_DEFINED
-#ifndef _WCHAR_T_
-#define _WCHAR_T_
-#undef __need_wchar_t
-#ifndef __cplusplus
-typedef unsigned short wchar_t;
-#endif
-#endif
-#endif
-
-typedef wchar_t WCHAR;
-typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR;
-typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR;
-typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR;
-typedef CONST CHAR *LPCCH,*PCSTR,*LPCSTR;
-#ifndef _TCHAR_DEFINED
-#define _TCHAR_DEFINED
-#ifdef UNICODE
-/*
- * NOTE: This tests UNICODE, which is different from the _UNICODE define
- *       used to differentiate standard C runtime calls.
- */
-typedef WCHAR TCHAR;
-typedef WCHAR _TCHAR;
-#else
-typedef CHAR TCHAR;
-typedef CHAR _TCHAR;
-#endif
-#endif
-typedef TCHAR TBYTE,*PTCH,*PTBYTE;
-typedef TCHAR *LPTCH,*PTSTR,*LPTSTR,*LP,*PTCHAR;
-typedef const TCHAR *LPCTSTR;
-#ifdef UNICODE
-/*
- * __TEXT is a private macro whose specific use is to force the expansion of a
- * macro passed as an argument to the macro TEXT.  DO NOT use this
- * macro within your programs.  It's name and function could change without
- * notice.
- */
-#define __TEXT(q) L##q
-#else
-#define __TEXT(q) q
-#endif
-/*
- * UNICODE a constant string when UNICODE is defined, else returns the string
- * unmodified.
- * The corresponding macros  _TEXT() and _T() for mapping _UNICODE strings
- * passed to C runtime functions are defined in mingw/tchar.h
- */
-#define TEXT(q) __TEXT(q)    
-typedef SHORT *PSHORT;
-typedef LONG *PLONG;
-#ifdef STRICT
-typedef void *HANDLE;
-#define DECLARE_HANDLE(n) typedef struct n##__{int i;}*n
-#else
-typedef PVOID HANDLE;
-#define DECLARE_HANDLE(n) typedef HANDLE n
-#endif
-typedef HANDLE *PHANDLE,*LPHANDLE;
-typedef DWORD LCID;
-typedef PDWORD PLCID;
-typedef WORD LANGID;
-#ifdef __GNUC__
-#define _HAVE_INT64
-#define _INTEGRAL_MAX_BITS 64
-#undef __int64
-#define __int64 long long
-#elif defined(__WATCOMC__) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 )
-#define _HAVE_INT64
-#endif /* __GNUC__/__WATCOMC */
-#if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64)
-typedef __int64 LONGLONG;
-typedef unsigned __int64 DWORDLONG;
-#else
-typedef double LONGLONG,DWORDLONG;
-#endif
-typedef LONGLONG *PLONGLONG;
-typedef DWORDLONG *PDWORDLONG;
-typedef DWORDLONG ULONGLONG,*PULONGLONG;
-typedef LONGLONG USN;
-#ifdef _HAVE_INT64
-#define Int32x32To64(a,b) ((LONGLONG)(a)*(LONGLONG)(b))
-#define UInt32x32To64(a,b) ((DWORDLONG)(a)*(DWORDLONG)(b))
-#define Int64ShllMod32(a,b) ((DWORDLONG)(a)<<(b))
-#define Int64ShraMod32(a,b) ((LONGLONG)(a)>>(b))
-#define Int64ShrlMod32(a,b) ((DWORDLONG)(a)>>(b))
-#endif
-#define ANSI_NULL '\0'
-#define UNICODE_NULL L'\0'
-typedef BYTE BOOLEAN,*PBOOLEAN;
-#endif
-typedef BYTE FCHAR;
-typedef WORD FSHORT;
-typedef DWORD FLONG;
-
-#define NTAPI __stdcall
-#include <basetsd.h>
-#define ACE_OBJECT_TYPE_PRESENT           0x00000001
-#define ACE_INHERITED_OBJECT_TYPE_PRESENT 0x00000002
-#define APPLICATION_ERROR_MASK       0x20000000
-#define ERROR_SEVERITY_SUCCESS       0x00000000
-#define ERROR_SEVERITY_INFORMATIONAL 0x40000000
-#define ERROR_SEVERITY_WARNING       0x80000000
-#define ERROR_SEVERITY_ERROR         0xC0000000
-/* also in ddk/ntifs.h */
-#define COMPRESSION_FORMAT_NONE         (0x0000)
-#define COMPRESSION_FORMAT_DEFAULT      (0x0001)
-#define COMPRESSION_FORMAT_LZNT1        (0x0002)
-#define COMPRESSION_ENGINE_STANDARD     (0x0000)
-#define COMPRESSION_ENGINE_MAXIMUM      (0x0100)
-#define COMPRESSION_ENGINE_HIBER        (0x0200)
-#define ACCESS_ALLOWED_ACE_TYPE         (0x0)
-#define ACCESS_DENIED_ACE_TYPE          (0x1)
-#define SYSTEM_AUDIT_ACE_TYPE           (0x2)
-#define SYSTEM_ALARM_ACE_TYPE           (0x3)
-/*end ntifs.h */
-#define ANYSIZE_ARRAY 1
-#define OBJECT_INHERIT_ACE	1
-#define CONTAINER_INHERIT_ACE	2
-#define NO_PROPAGATE_INHERIT_ACE	4
-#define INHERIT_ONLY_ACE	8
-#define VALID_INHERIT_FLAGS	16
-#define SUCCESSFUL_ACCESS_ACE_FLAG	64
-#define FAILED_ACCESS_ACE_FLAG	128
-#define DELETE	0x00010000L
-#define READ_CONTROL	0x20000L
-#define WRITE_DAC	0x40000L
-#define WRITE_OWNER	0x80000L
-#define SYNCHRONIZE	0x100000L
-#define STANDARD_RIGHTS_REQUIRED	0xF0000
-#define STANDARD_RIGHTS_READ	0x20000
-#define STANDARD_RIGHTS_WRITE	0x20000
-#define STANDARD_RIGHTS_EXECUTE	0x20000
-#define STANDARD_RIGHTS_ALL	0x1F0000
-#define SPECIFIC_RIGHTS_ALL	0xFFFF
-#define ACCESS_SYSTEM_SECURITY	0x1000000
-
-#define MAXIMUM_ALLOWED	0x2000000
-#define GENERIC_READ	0x80000000
-#define GENERIC_WRITE	0x40000000
-#define GENERIC_EXECUTE	0x20000000
-#define GENERIC_ALL	0x10000000
-
-#define INVALID_FILE_ATTRIBUTES	((DWORD)-1)
-
-/* Also in ddk/winddk.h */
-#define FILE_LIST_DIRECTORY		0x00000001
-#define FILE_READ_DATA			0x00000001
-#define FILE_ADD_FILE			0x00000002
-#define FILE_WRITE_DATA			0x00000002
-#define FILE_ADD_SUBDIRECTORY		0x00000004
-#define FILE_APPEND_DATA		0x00000004
-#define FILE_CREATE_PIPE_INSTANCE	0x00000004
-#define FILE_READ_EA			0x00000008
-#define FILE_READ_PROPERTIES		0x00000008
-#define FILE_WRITE_EA			0x00000010
-#define FILE_WRITE_PROPERTIES		0x00000010
-#define FILE_EXECUTE			0x00000020
-#define FILE_TRAVERSE			0x00000020
-#define FILE_DELETE_CHILD		0x00000040
-#define FILE_READ_ATTRIBUTES		0x00000080
-#define FILE_WRITE_ATTRIBUTES		0x00000100
-
-#define FILE_SHARE_READ			0x00000001
-#define FILE_SHARE_WRITE		0x00000002
-#define FILE_SHARE_DELETE		0x00000004
-#define FILE_SHARE_VALID_FLAGS		0x00000007
-			
-#define FILE_ATTRIBUTE_READONLY			0x00000001
-#define FILE_ATTRIBUTE_HIDDEN			0x00000002
-#define FILE_ATTRIBUTE_SYSTEM			0x00000004
-#define FILE_ATTRIBUTE_DIRECTORY		0x00000010
-#define FILE_ATTRIBUTE_ARCHIVE			0x00000020
-#define FILE_ATTRIBUTE_DEVICE			0x00000040
-#define FILE_ATTRIBUTE_NORMAL			0x00000080
-#define FILE_ATTRIBUTE_TEMPORARY		0x00000100
-#define FILE_ATTRIBUTE_SPARSE_FILE		0x00000200
-#define FILE_ATTRIBUTE_REPARSE_POINT		0x00000400
-#define FILE_ATTRIBUTE_COMPRESSED		0x00000800
-#define FILE_ATTRIBUTE_OFFLINE			0x00001000
-#define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED	0x00002000
-#define FILE_ATTRIBUTE_ENCRYPTED		0x00004000
-#define FILE_ATTRIBUTE_VALID_FLAGS		0x00007fb7
-#define FILE_ATTRIBUTE_VALID_SET_FLAGS		0x000031a7
-				
-#define FILE_COPY_STRUCTURED_STORAGE		0x00000041
-#define FILE_STRUCTURED_STORAGE			0x00000441
-			
-#define FILE_VALID_OPTION_FLAGS			0x00ffffff
-#define FILE_VALID_PIPE_OPTION_FLAGS		0x00000032
-#define FILE_VALID_MAILSLOT_OPTION_FLAGS	0x00000032
-#define FILE_VALID_SET_FLAGS			0x00000036
-			
-#define FILE_SUPERSEDE			0x00000000
-#define FILE_OPEN			0x00000001
-#define FILE_CREATE			0x00000002
-#define FILE_OPEN_IF			0x00000003
-#define FILE_OVERWRITE			0x00000004
-#define FILE_OVERWRITE_IF		0x00000005
-#define FILE_MAXIMUM_DISPOSITION	0x00000005
-			
-#define FILE_DIRECTORY_FILE		0x00000001
-#define FILE_WRITE_THROUGH		0x00000002
-#define FILE_SEQUENTIAL_ONLY		0x00000004
-#define FILE_NO_INTERMEDIATE_BUFFERING	0x00000008
-#define FILE_SYNCHRONOUS_IO_ALERT	0x00000010
-#define FILE_SYNCHRONOUS_IO_NONALERT	0x00000020
-#define FILE_NON_DIRECTORY_FILE		0x00000040
-#define FILE_CREATE_TREE_CONNECTION	0x00000080
-#define FILE_COMPLETE_IF_OPLOCKED	0x00000100
-#define FILE_NO_EA_KNOWLEDGE		0x00000200
-#define FILE_OPEN_FOR_RECOVERY		0x00000400
-#define FILE_RANDOM_ACCESS		0x00000800
-#define FILE_DELETE_ON_CLOSE		0x00001000
-#define FILE_OPEN_BY_FILE_ID		0x00002000
-#define FILE_OPEN_FOR_BACKUP_INTENT	0x00004000
-#define FILE_NO_COMPRESSION		0x00008000
-#define FILE_RESERVE_OPFILTER		0x00100000
-#define FILE_OPEN_REPARSE_POINT		0x00200000
-#define FILE_OPEN_NO_RECALL		0x00400000
-#define FILE_OPEN_FOR_FREE_SPACE_QUERY	0x00800000
-
-#define FILE_ALL_ACCESS \
-  (STANDARD_RIGHTS_REQUIRED | \
-   SYNCHRONIZE | \
-   0x1FF)
-
-#define FILE_GENERIC_EXECUTE \
-  (STANDARD_RIGHTS_EXECUTE | \
-   FILE_READ_ATTRIBUTES | \
-   FILE_EXECUTE | \
-   SYNCHRONIZE)
-
-#define FILE_GENERIC_READ \
-  (STANDARD_RIGHTS_READ | \
-   FILE_READ_DATA | \
-   FILE_READ_ATTRIBUTES | \
-   FILE_READ_EA | \
-   SYNCHRONIZE)
-
-#define FILE_GENERIC_WRITE \
-  (STANDARD_RIGHTS_WRITE | \
-   FILE_WRITE_DATA | \
-   FILE_WRITE_ATTRIBUTES | \
-   FILE_WRITE_EA | \
-   FILE_APPEND_DATA | \
-   SYNCHRONIZE)
-/* end winddk.h */
-/* also in ddk/ntifs.h */
-#define FILE_NOTIFY_CHANGE_FILE_NAME	0x00000001
-#define FILE_NOTIFY_CHANGE_DIR_NAME	0x00000002
-#define FILE_NOTIFY_CHANGE_NAME		0x00000003
-#define FILE_NOTIFY_CHANGE_ATTRIBUTES	0x00000004
-#define FILE_NOTIFY_CHANGE_SIZE		0x00000008
-#define FILE_NOTIFY_CHANGE_LAST_WRITE	0x00000010
-#define FILE_NOTIFY_CHANGE_LAST_ACCESS	0x00000020
-#define FILE_NOTIFY_CHANGE_CREATION	0x00000040
-#define FILE_NOTIFY_CHANGE_EA		0x00000080
-#define FILE_NOTIFY_CHANGE_SECURITY	0x00000100
-#define FILE_NOTIFY_CHANGE_STREAM_NAME	0x00000200
-#define FILE_NOTIFY_CHANGE_STREAM_SIZE	0x00000400
-#define FILE_NOTIFY_CHANGE_STREAM_WRITE	0x00000800
-#define FILE_NOTIFY_VALID_MASK		0x00000fff
-
-#define FILE_CASE_SENSITIVE_SEARCH      0x00000001
-#define FILE_CASE_PRESERVED_NAMES       0x00000002
-#define FILE_UNICODE_ON_DISK            0x00000004
-#define FILE_PERSISTENT_ACLS            0x00000008
-#define FILE_FILE_COMPRESSION           0x00000010
-#define FILE_VOLUME_QUOTAS              0x00000020
-#define FILE_SUPPORTS_SPARSE_FILES      0x00000040
-#define FILE_SUPPORTS_REPARSE_POINTS    0x00000080
-#define FILE_SUPPORTS_REMOTE_STORAGE    0x00000100
-#define FS_LFN_APIS                     0x00004000
-#define FILE_VOLUME_IS_COMPRESSED       0x00008000
-#define FILE_SUPPORTS_OBJECT_IDS        0x00010000
-#define FILE_SUPPORTS_ENCRYPTION        0x00020000
-#define FILE_NAMED_STREAMS              0x00040000
-
-#define IO_COMPLETION_QUERY_STATE       0x0001
-#define IO_COMPLETION_MODIFY_STATE      0x0002
-#define IO_COMPLETION_ALL_ACCESS        (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3)
-/* end ntifs.h */
-
-/* also in ddk/winddk.h */
-#define DUPLICATE_CLOSE_SOURCE		0x00000001
-#define DUPLICATE_SAME_ACCESS		0x00000002
-#define DUPLICATE_SAME_ATTRIBUTES	0x00000004
-/* end winddk.k */
-
-#define MAILSLOT_NO_MESSAGE	((DWORD)-1)
-#define MAILSLOT_WAIT_FOREVER	((DWORD)-1)
-#define PROCESS_TERMINATE	1
-#define PROCESS_CREATE_THREAD	2
-#define PROCESS_SET_SESSIONID	4
-#define PROCESS_VM_OPERATION	8
-#define PROCESS_VM_READ	16
-#define PROCESS_VM_WRITE	32
-#define PROCESS_DUP_HANDLE	64
-#define PROCESS_CREATE_PROCESS	128
-#define PROCESS_SET_QUOTA	256
-#define PROCESS_SET_INFORMATION	512
-#define PROCESS_QUERY_INFORMATION	1024
-#define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xFFF)
-#define THREAD_TERMINATE	1
-#define THREAD_SUSPEND_RESUME	2
-#define THREAD_GET_CONTEXT	8
-#define THREAD_SET_CONTEXT	16
-#define THREAD_SET_INFORMATION	32
-#define THREAD_QUERY_INFORMATION	64
-#define THREAD_SET_THREAD_TOKEN	128
-#define THREAD_IMPERSONATE	256
-#define THREAD_DIRECT_IMPERSONATION	0x200
-#define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3FF)
-#define THREAD_BASE_PRIORITY_LOWRT	15
-#define THREAD_BASE_PRIORITY_MAX	2
-#define THREAD_BASE_PRIORITY_MIN	(-2)
-#define THREAD_BASE_PRIORITY_IDLE	(-15)
-#define EXCEPTION_NONCONTINUABLE	1
-#define EXCEPTION_MAXIMUM_PARAMETERS 15
-#define MUTANT_QUERY_STATE	0x0001
-#define MUTANT_ALL_ACCESS	(STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|MUTANT_QUERY_STATE)
-#define TIMER_QUERY_STATE	0x0001
-#define TIMER_MODIFY_STATE	0x0002
-#define TIMER_ALL_ACCESS	(STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|TIMER_QUERY_STATE|TIMER_MODIFY_STATE)
-/*
- * To prevent gcc compiler warnings, bracket these defines when initialising
- * a  SID_IDENTIFIER_AUTHORITY, eg.
- * SID_IDENTIFIER_AUTHORITY aNullSidAuthority = {SECURITY_NULL_SID_AUTHORITY};
- */
-#define SECURITY_NULL_SID_AUTHORITY	{0,0,0,0,0,0}
-#define SECURITY_WORLD_SID_AUTHORITY	{0,0,0,0,0,1}
-#define SECURITY_LOCAL_SID_AUTHORITY	{0,0,0,0,0,2}
-#define SECURITY_CREATOR_SID_AUTHORITY	{0,0,0,0,0,3}
-#define SECURITY_NON_UNIQUE_AUTHORITY	{0,0,0,0,0,4}
-#define SECURITY_NT_AUTHORITY	{0,0,0,0,0,5}
-#define SECURITY_NULL_RID	0
-#define SECURITY_WORLD_RID	(0x00000000L)
-#define SECURITY_LOCAL_RID	0
-#define SECURITY_CREATOR_OWNER_RID	0
-#define SECURITY_CREATOR_GROUP_RID	1
-#define SECURITY_DIALUP_RID	1
-#define SECURITY_NETWORK_RID	2
-#define SECURITY_BATCH_RID	3
-#define SECURITY_INTERACTIVE_RID	4
-#define SECURITY_LOGON_IDS_RID	5
-#define SECURITY_SERVICE_RID	6
-#define SECURITY_LOCAL_SYSTEM_RID	18
-#define SECURITY_BUILTIN_DOMAIN_RID   32
-#define SECURITY_PRINCIPAL_SELF_RID   10
-#define SECURITY_CREATOR_OWNER_SERVER_RID 0x2
-#define SECURITY_CREATOR_GROUP_SERVER_RID 0x3
-#define SECURITY_LOGON_IDS_RID_COUNT 0x3
-#define SECURITY_ANONYMOUS_LOGON_RID 0x7
-#define SECURITY_PROXY_RID 0x8
-#define SECURITY_ENTERPRISE_CONTROLLERS_RID 0x9
-#define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID
-#define SECURITY_AUTHENTICATED_USER_RID 0xB
-#define SECURITY_RESTRICTED_CODE_RID 0xC
-#define SECURITY_NT_NON_UNIQUE_RID 0x15
-#define SID_REVISION 1
-#define DOMAIN_USER_RID_ADMIN 0x1F4L
-#define DOMAIN_USER_RID_GUEST 0x1F5L
-#define DOMAIN_GROUP_RID_ADMINS	0x200L
-#define DOMAIN_GROUP_RID_USERS	0x201L
-#define DOMAIN_ALIAS_RID_ADMINS	0x220L
-#define DOMAIN_ALIAS_RID_USERS	0x221L
-#define DOMAIN_ALIAS_RID_GUESTS	0x222L
-#define DOMAIN_ALIAS_RID_POWER_USERS	0x223L
-#define DOMAIN_ALIAS_RID_ACCOUNT_OPS	0x224L
-#define DOMAIN_ALIAS_RID_SYSTEM_OPS	0x225L
-#define DOMAIN_ALIAS_RID_PRINT_OPS	0x226L
-#define DOMAIN_ALIAS_RID_BACKUP_OPS	0x227L
-#define DOMAIN_ALIAS_RID_REPLICATOR	0x228L
-#define SE_CREATE_TOKEN_NAME	TEXT("SeCreateTokenPrivilege")
-#define SE_ASSIGNPRIMARYTOKEN_NAME	TEXT("SeAssignPrimaryTokenPrivilege")
-#define SE_LOCK_MEMORY_NAME	TEXT("SeLockMemoryPrivilege")
-#define SE_INCREASE_QUOTA_NAME	TEXT("SeIncreaseQuotaPrivilege")
-#define SE_UNSOLICITED_INPUT_NAME	TEXT("SeUnsolicitedInputPrivilege")
-#define SE_MACHINE_ACCOUNT_NAME TEXT("SeMachineAccountPrivilege")
-#define SE_TCB_NAME	TEXT("SeTcbPrivilege")
-#define SE_SECURITY_NAME	TEXT("SeSecurityPrivilege")
-#define SE_TAKE_OWNERSHIP_NAME	TEXT("SeTakeOwnershipPrivilege")
-#define SE_LOAD_DRIVER_NAME	TEXT("SeLoadDriverPrivilege")
-#define SE_SYSTEM_PROFILE_NAME	TEXT("SeSystemProfilePrivilege")
-#define SE_SYSTEMTIME_NAME	TEXT("SeSystemtimePrivilege")
-#define SE_PROF_SINGLE_PROCESS_NAME	TEXT("SeProfileSingleProcessPrivilege")
-#define SE_INC_BASE_PRIORITY_NAME	TEXT("SeIncreaseBasePriorityPrivilege")
-#define SE_CREATE_PAGEFILE_NAME TEXT("SeCreatePagefilePrivilege")
-#define SE_CREATE_PERMANENT_NAME	TEXT("SeCreatePermanentPrivilege")
-#define SE_BACKUP_NAME TEXT("SeBackupPrivilege")
-#define SE_RESTORE_NAME	TEXT("SeRestorePrivilege")
-#define SE_SHUTDOWN_NAME	TEXT("SeShutdownPrivilege")
-#define SE_DEBUG_NAME	TEXT("SeDebugPrivilege")
-#define SE_AUDIT_NAME	TEXT("SeAuditPrivilege")
-#define SE_SYSTEM_ENVIRONMENT_NAME	TEXT("SeSystemEnvironmentPrivilege")
-#define SE_CHANGE_NOTIFY_NAME	TEXT("SeChangeNotifyPrivilege")
-#define SE_REMOTE_SHUTDOWN_NAME	TEXT("SeRemoteShutdownPrivilege")
-#define SE_CREATE_GLOBAL_NAME TEXT("SeCreateGlobalPrivilege")
-#define SE_GROUP_MANDATORY 1
-#define SE_GROUP_ENABLED_BY_DEFAULT 2
-#define SE_GROUP_ENABLED 4
-#define SE_GROUP_OWNER 8
-#define SE_GROUP_USE_FOR_DENY_ONLY 16
-#define SE_GROUP_LOGON_ID 3221225472U
-#define SE_GROUP_RESOURCE 536870912
-#define LANG_NEUTRAL	0x00
-#define LANG_ARABIC 	0x01
-#define LANG_BULGARIAN 	0x02
-#define LANG_CATALAN 	0x03
-#define LANG_CHINESE	0x04
-#define LANG_CZECH	0x05
-#define LANG_DANISH	0x06
-#define LANG_GERMAN	0x07
-#define LANG_GREEK	0x08
-#define LANG_ENGLISH	0x09
-#define LANG_SPANISH	0x0a
-#define LANG_FINNISH	0x0b
-#define LANG_FRENCH	0x0c
-#define LANG_HEBREW	0x0d
-#define LANG_HUNGARIAN	0x0e
-#define LANG_ICELANDIC	0x0f
-#define LANG_ITALIAN	0x10
-#define LANG_JAPANESE	0x11
-#define LANG_KOREAN	0x12
-#define LANG_DUTCH	0x13
-#define LANG_NORWEGIAN	0x14
-#define LANG_POLISH	0x15
-#define LANG_PORTUGUESE	0x16
-#define LANG_ROMANIAN	0x18
-#define LANG_RUSSIAN	0x19
-#define LANG_CROATIAN	0x1a
-#define LANG_SERBIAN	0x1a
-#define LANG_SLOVAK	0x1b
-#define LANG_ALBANIAN	0x1c
-#define LANG_SWEDISH	0x1d
-#define LANG_THAI	0x1e
-#define LANG_TURKISH	0x1f
-#define LANG_URDU	0x20
-#define LANG_INDONESIAN	0x21
-#define LANG_UKRAINIAN	0x22
-#define LANG_BELARUSIAN	0x23
-#define LANG_SLOVENIAN	0x24
-#define LANG_ESTONIAN	0x25
-#define LANG_LATVIAN	0x26
-#define LANG_LITHUANIAN	0x27
-#define LANG_FARSI	0x29
-#define LANG_VIETNAMESE	0x2a
-#define LANG_ARMENIAN	0x2b
-#define LANG_AZERI	0x2c
-#define LANG_BASQUE	0x2d
-#define LANG_MACEDONIAN	0x2f
-#define LANG_AFRIKAANS	0x36
-#define LANG_GEORGIAN	0x37
-#define LANG_FAEROESE	0x38
-#define LANG_HINDI	0x39
-#define LANG_MALAY	0x3e
-#define LANG_KAZAK	0x3f
-#define LANG_KYRGYZ	0x40
-#define LANG_SWAHILI	0x41
-#define LANG_UZBEK	0x43
-#define LANG_TATAR	0x44
-#define LANG_BENGALI	0x45
-#define LANG_PUNJABI	0x46
-#define LANG_GUJARATI	0x47
-#define LANG_ORIYA	0x48
-#define LANG_TAMIL	0x49
-#define LANG_TELUGU	0x4a
-#define LANG_KANNADA	0x4b
-#define LANG_MALAYALAM	0x4c
-#define LANG_ASSAMESE	0x4d
-#define LANG_MARATHI	0x4e
-#define LANG_SANSKRIT	0x4f
-#define LANG_MONGOLIAN	0x50
-#define LANG_GALICIAN	0x56
-#define LANG_KONKANI	0x57
-#define LANG_MANIPURI	0x58
-#define LANG_SINDHI	0x59
-#define LANG_SYRIAC	0x5a
-#define LANG_KASHMIRI	0x60
-#define LANG_NEPALI	0x61
-#define LANG_DIVEHI	0x65
-#define LANG_INVARIANT	0x7f
-#define SUBLANG_NEUTRAL	0x00
-#define SUBLANG_DEFAULT	0x01
-#define SUBLANG_SYS_DEFAULT	0x02
-#define SUBLANG_ARABIC_SAUDI_ARABIA	0x01
-#define SUBLANG_ARABIC_IRAQ	0x02
-#define SUBLANG_ARABIC_EGYPT	0x03
-#define SUBLANG_ARABIC_LIBYA	0x04
-#define SUBLANG_ARABIC_ALGERIA	0x05
-#define SUBLANG_ARABIC_MOROCCO	0x06
-#define SUBLANG_ARABIC_TUNISIA	0x07
-#define SUBLANG_ARABIC_OMAN	0x08
-#define SUBLANG_ARABIC_YEMEN	0x09
-#define SUBLANG_ARABIC_SYRIA	0x0a
-#define SUBLANG_ARABIC_JORDAN	0x0b
-#define SUBLANG_ARABIC_LEBANON	0x0c
-#define SUBLANG_ARABIC_KUWAIT	0x0d
-#define SUBLANG_ARABIC_UAE	0x0e
-#define SUBLANG_ARABIC_BAHRAIN	0x0f
-#define SUBLANG_ARABIC_QATAR	0x10
-#define SUBLANG_AZERI_LATIN	0x01
-#define SUBLANG_AZERI_CYRILLIC	0x02
-#define SUBLANG_CHINESE_TRADITIONAL	0x01
-#define SUBLANG_CHINESE_SIMPLIFIED	0x02
-#define SUBLANG_CHINESE_HONGKONG	0x03
-#define SUBLANG_CHINESE_SINGAPORE	0x04
-#define SUBLANG_CHINESE_MACAU	0x05
-#define SUBLANG_DUTCH	0x01
-#define SUBLANG_DUTCH_BELGIAN	0x02
-#define SUBLANG_ENGLISH_US	0x01
-#define SUBLANG_ENGLISH_UK	0x02
-#define SUBLANG_ENGLISH_AUS	0x03
-#define SUBLANG_ENGLISH_CAN	0x04
-#define SUBLANG_ENGLISH_NZ	0x05
-#define SUBLANG_ENGLISH_EIRE	0x06
-#define SUBLANG_ENGLISH_SOUTH_AFRICA	0x07
-#define SUBLANG_ENGLISH_JAMAICA	0x08
-#define SUBLANG_ENGLISH_CARIBBEAN	0x09
-#define SUBLANG_ENGLISH_BELIZE	0x0a
-#define SUBLANG_ENGLISH_TRINIDAD	0x0b
-#define SUBLANG_ENGLISH_ZIMBABWE	0x0c
-#define SUBLANG_ENGLISH_PHILIPPINES	0x0d
-#define SUBLANG_FRENCH	0x01
-#define SUBLANG_FRENCH_BELGIAN	0x02
-#define SUBLANG_FRENCH_CANADIAN	0x03
-#define SUBLANG_FRENCH_SWISS	0x04
-#define SUBLANG_FRENCH_LUXEMBOURG	0x05
-#define SUBLANG_FRENCH_MONACO	0x06
-#define SUBLANG_GERMAN	0x01
-#define SUBLANG_GERMAN_SWISS	0x02
-#define SUBLANG_GERMAN_AUSTRIAN	0x03
-#define SUBLANG_GERMAN_LUXEMBOURG	0x04
-#define SUBLANG_GERMAN_LIECHTENSTEIN	0x05
-#define SUBLANG_ITALIAN	0x01
-#define SUBLANG_ITALIAN_SWISS	0x02
-#define SUBLANG_KASHMIRI_INDIA	0x02
-#define SUBLANG_KASHMIRI_SASIA	0x02
-#define SUBLANG_KOREAN	0x01
-#define SUBLANG_LITHUANIAN	0x01
-#define SUBLANG_MALAY_MALAYSIA	0x01
-#define SUBLANG_MALAY_BRUNEI_DARUSSALAM	0x02
-#define SUBLANG_NEPALI_INDIA	0x02
-#define SUBLANG_NORWEGIAN_BOKMAL	0x01
-#define SUBLANG_NORWEGIAN_NYNORSK	0x02
-#define SUBLANG_PORTUGUESE	0x01
-#define SUBLANG_PORTUGUESE_BRAZILIAN	0x02
-#define SUBLANG_SERBIAN_LATIN	0x02
-#define SUBLANG_SERBIAN_CYRILLIC	0x03
-#define SUBLANG_SPANISH	0x01
-#define SUBLANG_SPANISH_MEXICAN	0x02
-#define SUBLANG_SPANISH_MODERN	0x03
-#define SUBLANG_SPANISH_GUATEMALA	0x04
-#define SUBLANG_SPANISH_COSTA_RICA	0x05
-#define SUBLANG_SPANISH_PANAMA	0x06
-#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC	0x07
-#define SUBLANG_SPANISH_VENEZUELA	0x08
-#define SUBLANG_SPANISH_COLOMBIA	0x09
-#define SUBLANG_SPANISH_PERU	0x0a
-#define SUBLANG_SPANISH_ARGENTINA	0x0b
-#define SUBLANG_SPANISH_ECUADOR	0x0c
-#define SUBLANG_SPANISH_CHILE	0x0d
-#define SUBLANG_SPANISH_URUGUAY	0x0e
-#define SUBLANG_SPANISH_PARAGUAY	0x0f
-#define SUBLANG_SPANISH_BOLIVIA	0x10
-#define SUBLANG_SPANISH_EL_SALVADOR	0x11
-#define SUBLANG_SPANISH_HONDURAS	0x12
-#define SUBLANG_SPANISH_NICARAGUA	0x13
-#define SUBLANG_SPANISH_PUERTO_RICO	0x14
-#define SUBLANG_SWEDISH	0x01
-#define SUBLANG_SWEDISH_FINLAND	0x02
-#define SUBLANG_URDU_PAKISTAN	0x01
-#define SUBLANG_URDU_INDIA	0x02
-#define SUBLANG_UZBEK_LATIN	0x01
-#define SUBLANG_UZBEK_CYRILLIC	0x02
-#define NLS_VALID_LOCALE_MASK	1048575
-#define SORT_DEFAULT	0
-#define SORT_JAPANESE_XJIS	0
-#define SORT_JAPANESE_UNICODE	1
-#define SORT_CHINESE_BIG5	0
-#define SORT_CHINESE_PRCP	0
-#define SORT_CHINESE_UNICODE	1
-#define SORT_CHINESE_PRC	2
-#define SORT_CHINESE_BOPOMOFO	3
-#define SORT_KOREAN_KSC	0
-#define SORT_KOREAN_UNICODE	1
-#define SORT_GERMAN_PHONE_BOOK	1
-#define SORT_HUNGARIAN_DEFAULT	0
-#define SORT_HUNGARIAN_TECHNICAL	1
-#define SORT_GEORGIAN_TRADITIONAL	0
-#define SORT_GEORGIAN_MODERN	1
-#define MAKELANGID(p,s)	((((WORD)(s))<<10)|(WORD)(p))
-#define MAKELCID(l,s) ((DWORD)((((DWORD)((WORD)(s)))<<16)|((DWORD)((WORD)(l)))))
-#define PRIMARYLANGID(l)	((WORD)(l)&0x3ff)
-#define SORTIDFROMLCID(l)	((WORD)((((DWORD)(l))&NLS_VALID_LOCALE_MASK)>>16))
-#define SORTVERSIONFROMLCID(l) ((WORD)((((DWORD)(l))>>20)&0xf))
-#define SUBLANGID(l)	((WORD)(l)>>10)
-#define LANGIDFROMLCID(l)	((WORD)(l))
-#define LANG_SYSTEM_DEFAULT	MAKELANGID(LANG_NEUTRAL,SUBLANG_SYS_DEFAULT)
-#define LANG_USER_DEFAULT	MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT)
-#define LOCALE_NEUTRAL	MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT)
-#define ACL_REVISION	2
-#define ACL_REVISION_DS 4
-#define ACL_REVISION1 1
-#define ACL_REVISION2 2
-#define ACL_REVISION3 3
-#define ACL_REVISION4 4
-#define MIN_ACL_REVISION 2
-#define MAX_ACL_REVISION 4
-#define MINCHAR	0x80
-#define MAXCHAR	0x7f
-#define MINSHORT	0x8000
-#define MAXSHORT	0x7fff
-#define MINLONG	0x80000000
-#define MAXLONG	0x7fffffff
-#define MAXBYTE	0xff
-#define MAXWORD	0xffff
-#define MAXDWORD	0xffffffff
-#define PROCESSOR_INTEL_386 386
-#define PROCESSOR_INTEL_486 486
-#define PROCESSOR_INTEL_PENTIUM 586
-#define PROCESSOR_MIPS_R4000 4000
-#define PROCESSOR_ALPHA_21064 21064
-#define PROCESSOR_INTEL_IA64 2200
-
-#define PROCESSOR_ARCHITECTURE_INTEL 0
-#define PROCESSOR_ARCHITECTURE_MIPS 1
-#define PROCESSOR_ARCHITECTURE_ALPHA 2
-#define PROCESSOR_ARCHITECTURE_PPC 3
-#define PROCESSOR_ARCHITECTURE_SHX 4
-#define PROCESSOR_ARCHITECTURE_ARM 5
-#define PROCESSOR_ARCHITECTURE_IA64 6
-#define PROCESSOR_ARCHITECTURE_ALPHA64 7
-#define PROCESSOR_ARCHITECTURE_MSIL8
-#define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF
-#define PF_FLOATING_POINT_PRECISION_ERRATA 0
-#define PF_FLOATING_POINT_EMULATED 1
-#define PF_COMPARE_EXCHANGE_DOUBLE 2
-#define PF_MMX_INSTRUCTIONS_AVAILABLE 3
-#define PF_PPC_MOVEMEM_64BIT_OK 4
-#define PF_ALPHA_BYTE_INSTRUCTIONS 5
-#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6
-#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7
-#define PF_RDTSC_INSTRUCTION_AVAILABLE 8
-#define PF_PAE_ENABLED 9
-#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10
-/* also in ddk/ntifs.h */
-#define FILE_ACTION_ADDED                   0x00000001
-#define FILE_ACTION_REMOVED                 0x00000002
-#define FILE_ACTION_MODIFIED                0x00000003
-#define FILE_ACTION_RENAMED_OLD_NAME        0x00000004
-#define FILE_ACTION_RENAMED_NEW_NAME        0x00000005
-#define FILE_ACTION_ADDED_STREAM            0x00000006
-#define FILE_ACTION_REMOVED_STREAM          0x00000007
-#define FILE_ACTION_MODIFIED_STREAM         0x00000008
-#define FILE_ACTION_REMOVED_BY_DELETE       0x00000009
-#define FILE_ACTION_ID_NOT_TUNNELLED        0x0000000A
-#define FILE_ACTION_TUNNELLED_ID_COLLISION  0x0000000B
-/* end ntifs.h */
-#define HEAP_NO_SERIALIZE 1
-#define HEAP_GROWABLE 2
-#define HEAP_GENERATE_EXCEPTIONS 4
-#define HEAP_ZERO_MEMORY 8
-#define HEAP_REALLOC_IN_PLACE_ONLY 16
-#define HEAP_TAIL_CHECKING_ENABLED 32
-#define HEAP_FREE_CHECKING_ENABLED 64
-#define HEAP_DISABLE_COALESCE_ON_FREE 128
-#define HEAP_CREATE_ALIGN_16 0x0000
-#define HEAP_CREATE_ENABLE_TRACING 0x20000
-#define HEAP_MAXIMUM_TAG 0xFFF
-#define HEAP_PSEUDO_TAG_FLAG 0x8000
-#define HEAP_TAG_SHIFT 16
-#define HEAP_MAKE_TAG_FLAGS(b,o) ((DWORD)((b)+(o)<<16)))
-#define KEY_QUERY_VALUE 1
-#define KEY_SET_VALUE 2
-#define KEY_CREATE_SUB_KEY 4
-#define KEY_ENUMERATE_SUB_KEYS 8
-#define KEY_NOTIFY 16
-#define KEY_CREATE_LINK 32
-#define KEY_WRITE 0x20006
-#define KEY_EXECUTE 0x20019
-#define KEY_READ 0x20019
-#define KEY_ALL_ACCESS 0xf003f
-#define REG_WHOLE_HIVE_VOLATILE	1
-#define REG_REFRESH_HIVE	2
-#define REG_NO_LAZY_FLUSH	4
-#define REG_OPTION_RESERVED	0
-#define REG_OPTION_NON_VOLATILE	0
-#define REG_OPTION_VOLATILE	1
-#define REG_OPTION_CREATE_LINK	2
-#define REG_OPTION_BACKUP_RESTORE	4
-#define REG_OPTION_OPEN_LINK	8
-#define REG_LEGAL_OPTION	15
-#define OWNER_SECURITY_INFORMATION 1
-#define GROUP_SECURITY_INFORMATION 2
-#define DACL_SECURITY_INFORMATION 4
-#define SACL_SECURITY_INFORMATION 8
-#define MAXIMUM_PROCESSORS 32
-#define PAGE_NOACCESS	0x0001
-#define PAGE_READONLY	0x0002
-#define PAGE_READWRITE	0x0004
-#define PAGE_WRITECOPY	0x0008
-#define PAGE_EXECUTE	0x0010
-#define PAGE_EXECUTE_READ	0x0020
-#define PAGE_EXECUTE_READWRITE	0x0040
-#define PAGE_EXECUTE_WRITECOPY	0x0080
-#define PAGE_GUARD		0x0100
-#define PAGE_NOCACHE		0x0200
-#define MEM_COMMIT           0x1000
-#define MEM_RESERVE          0x2000
-#define MEM_DECOMMIT         0x4000
-#define MEM_RELEASE          0x8000
-#define MEM_FREE            0x10000
-#define MEM_PRIVATE         0x20000
-#define MEM_MAPPED          0x40000
-#define MEM_RESET           0x80000
-#define MEM_TOP_DOWN       0x100000
-#define MEM_WRITE_WATCH	   0x200000 /* 98/Me */
-#define MEM_PHYSICAL	   0x400000
-#define MEM_4MB_PAGES    0x80000000
-/* also in ddk/ntifs.h */
-#define MEM_IMAGE        SEC_IMAGE
-#define SEC_BASED	0x00200000
-#define SEC_NO_CHANGE	0x00400000
-#define SEC_FILE	0x00800000
-#define SEC_IMAGE	0x01000000
-#define SEC_VLM		0x02000000
-#define SEC_RESERVE	0x04000000
-#define SEC_COMMIT	0x08000000
-#define SEC_NOCACHE	0x10000000
-/* end ntifs.h */
-#define SECTION_EXTEND_SIZE 16
-#define SECTION_MAP_READ 4
-#define SECTION_MAP_WRITE 2
-#define SECTION_QUERY 1
-#define SECTION_MAP_EXECUTE 8
-#define SECTION_ALL_ACCESS 0xf001f
-#define MESSAGE_RESOURCE_UNICODE 1
-#define RTL_CRITSECT_TYPE 0
-#define RTL_RESOURCE_TYPE 1
-/* Also in winddk.h */
-#define FIELD_OFFSET(t,f) ((LONG)&(((t*)0)->f))
-#ifndef CONTAINING_RECORD
-#define CONTAINING_RECORD(address, type, field) \
-  ((type*)((PCHAR)(address) - (PCHAR)(&((type *)0)->field)))
-#endif
-/* end winddk.h */
-#define IMAGE_SIZEOF_FILE_HEADER	20
-#define IMAGE_FILE_RELOCS_STRIPPED	1
-#define IMAGE_FILE_EXECUTABLE_IMAGE	2
-#define IMAGE_FILE_LINE_NUMS_STRIPPED	4
-#define IMAGE_FILE_LOCAL_SYMS_STRIPPED	8
-#define IMAGE_FILE_AGGRESIVE_WS_TRIM 	16
-#define IMAGE_FILE_LARGE_ADDRESS_AWARE	32
-#define IMAGE_FILE_BYTES_REVERSED_LO	128
-#define IMAGE_FILE_32BIT_MACHINE	256
-#define IMAGE_FILE_DEBUG_STRIPPED	512
-#define IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP	1024
-#define IMAGE_FILE_NET_RUN_FROM_SWAP	2048
-#define IMAGE_FILE_SYSTEM	4096
-#define IMAGE_FILE_DLL	8192
-#define IMAGE_FILE_UP_SYSTEM_ONLY	16384
-#define IMAGE_FILE_BYTES_REVERSED_HI	32768
-#define IMAGE_FILE_MACHINE_UNKNOWN	0
-#define IMAGE_FILE_MACHINE_I386	332
-#define IMAGE_FILE_MACHINE_R3000	354
-#define IMAGE_FILE_MACHINE_R4000	358
-#define IMAGE_FILE_MACHINE_R10000	360
-#define IMAGE_FILE_MACHINE_ALPHA	388
-#define IMAGE_FILE_MACHINE_POWERPC	496
-#define IMAGE_DOS_SIGNATURE 0x5A4D
-#define IMAGE_OS2_SIGNATURE 0x454E
-#define IMAGE_OS2_SIGNATURE_LE 0x454C
-#define IMAGE_VXD_SIGNATURE 0x454C
-#define IMAGE_NT_SIGNATURE 0x00004550
-#define IMAGE_NT_OPTIONAL_HDR_MAGIC 0x10b
-#define IMAGE_ROM_OPTIONAL_HDR_MAGIC 0x107
-#define IMAGE_SEPARATE_DEBUG_SIGNATURE 0x4944
-#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
-#define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER 56
-#define IMAGE_SIZEOF_STD_OPTIONAL_HEADER 28
-#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER 224
-#define IMAGE_SIZEOF_SHORT_NAME 8
-#define IMAGE_SIZEOF_SECTION_HEADER 40
-#define IMAGE_SIZEOF_SYMBOL 18
-#define IMAGE_SIZEOF_AUX_SYMBOL 18
-#define IMAGE_SIZEOF_RELOCATION 10
-#define IMAGE_SIZEOF_BASE_RELOCATION 8
-#define IMAGE_SIZEOF_LINENUMBER 6
-#define IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR 60
-#define SIZEOF_RFPO_DATA 16
-#define IMAGE_SUBSYSTEM_UNKNOWN	0
-#define IMAGE_SUBSYSTEM_NATIVE	1
-#define IMAGE_SUBSYSTEM_WINDOWS_GUI	2
-#define IMAGE_SUBSYSTEM_WINDOWS_CUI	3
-#define IMAGE_SUBSYSTEM_OS2_CUI	5
-#define IMAGE_SUBSYSTEM_POSIX_CUI	7
-#define IMAGE_SUBSYSTEM_XBOX	14
-#define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((DWORD)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader))
-#define IMAGE_DIRECTORY_ENTRY_EXPORT	0
-#define IMAGE_DIRECTORY_ENTRY_IMPORT	1
-#define IMAGE_DIRECTORY_ENTRY_RESOURCE	2
-#define IMAGE_DIRECTORY_ENTRY_EXCEPTION	3
-#define IMAGE_DIRECTORY_ENTRY_SECURITY	4
-#define IMAGE_DIRECTORY_ENTRY_BASERELOC	5
-#define IMAGE_DIRECTORY_ENTRY_DEBUG	6
-#define IMAGE_DIRECTORY_ENTRY_COPYRIGHT	7
-#define IMAGE_DIRECTORY_ENTRY_GLOBALPTR	8
-#define IMAGE_DIRECTORY_ENTRY_TLS	9
-#define IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG	10
-#define IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT	11
-#define IMAGE_DIRECTORY_ENTRY_IAT	12
-#define IMAGE_SCN_TYPE_NO_PAD 8
-#define IMAGE_SCN_CNT_CODE 32
-#define IMAGE_SCN_CNT_INITIALIZED_DATA 64
-#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 128
-#define IMAGE_SCN_LNK_OTHER 256
-#define IMAGE_SCN_LNK_INFO 512
-#define IMAGE_SCN_LNK_REMOVE 2048
-#define IMAGE_SCN_LNK_COMDAT 4096
-#define IMAGE_SCN_MEM_FARDATA 0x8000
-#define IMAGE_SCN_MEM_PURGEABLE 0x20000
-#define IMAGE_SCN_MEM_16BIT 0x20000
-#define IMAGE_SCN_MEM_LOCKED  0x40000
-#define IMAGE_SCN_MEM_PRELOAD 0x80000
-#define IMAGE_SCN_ALIGN_1BYTES 0x100000
-#define IMAGE_SCN_ALIGN_2BYTES 0x200000
-#define IMAGE_SCN_ALIGN_4BYTES 0x300000
-#define IMAGE_SCN_ALIGN_8BYTES 0x400000
-#define IMAGE_SCN_ALIGN_16BYTES 0x500000
-#define IMAGE_SCN_ALIGN_32BYTES 0x600000
-#define IMAGE_SCN_ALIGN_64BYTES 0x700000
-#define IMAGE_SCN_LNK_NRELOC_OVFL 0x1000000
-#define IMAGE_SCN_MEM_DISCARDABLE 0x2000000
-#define IMAGE_SCN_MEM_NOT_CACHED 0x4000000
-#define IMAGE_SCN_MEM_NOT_PAGED 0x8000000
-#define IMAGE_SCN_MEM_SHARED 0x10000000
-#define IMAGE_SCN_MEM_EXECUTE 0x20000000
-#define IMAGE_SCN_MEM_READ 0x40000000
-#define IMAGE_SCN_MEM_WRITE 0x80000000
-#define IMAGE_SYM_UNDEFINED	0
-#define IMAGE_SYM_ABSOLUTE (-1)
-#define IMAGE_SYM_DEBUG	(-2)
-#define IMAGE_SYM_TYPE_NULL 0
-#define IMAGE_SYM_TYPE_VOID 1
-#define IMAGE_SYM_TYPE_CHAR 2
-#define IMAGE_SYM_TYPE_SHORT 3
-#define IMAGE_SYM_TYPE_INT 4
-#define IMAGE_SYM_TYPE_LONG 5
-#define IMAGE_SYM_TYPE_FLOAT 6
-#define IMAGE_SYM_TYPE_DOUBLE 7
-#define IMAGE_SYM_TYPE_STRUCT 8
-#define IMAGE_SYM_TYPE_UNION 9
-#define IMAGE_SYM_TYPE_ENUM 10
-#define IMAGE_SYM_TYPE_MOE 11
-#define IMAGE_SYM_TYPE_BYTE 12
-#define IMAGE_SYM_TYPE_WORD 13
-#define IMAGE_SYM_TYPE_UINT 14
-#define IMAGE_SYM_TYPE_DWORD 15
-#define IMAGE_SYM_TYPE_PCODE 32768
-#define IMAGE_SYM_DTYPE_NULL 0
-#define IMAGE_SYM_DTYPE_POINTER 1
-#define IMAGE_SYM_DTYPE_FUNCTION 2
-#define IMAGE_SYM_DTYPE_ARRAY 3
-#define IMAGE_SYM_CLASS_END_OF_FUNCTION	(-1)
-#define IMAGE_SYM_CLASS_NULL 0
-#define IMAGE_SYM_CLASS_AUTOMATIC 1
-#define IMAGE_SYM_CLASS_EXTERNAL 2
-#define IMAGE_SYM_CLASS_STATIC 3
-#define IMAGE_SYM_CLASS_REGISTER 4
-#define IMAGE_SYM_CLASS_EXTERNAL_DEF 5
-#define IMAGE_SYM_CLASS_LABEL 6
-#define IMAGE_SYM_CLASS_UNDEFINED_LABEL 7
-#define IMAGE_SYM_CLASS_MEMBER_OF_STRUCT 8
-#define IMAGE_SYM_CLASS_ARGUMENT 9
-#define IMAGE_SYM_CLASS_STRUCT_TAG 10
-#define IMAGE_SYM_CLASS_MEMBER_OF_UNION 11
-#define IMAGE_SYM_CLASS_UNION_TAG 12
-#define IMAGE_SYM_CLASS_TYPE_DEFINITION 13
-#define IMAGE_SYM_CLASS_UNDEFINED_STATIC 14
-#define IMAGE_SYM_CLASS_ENUM_TAG 15
-#define IMAGE_SYM_CLASS_MEMBER_OF_ENUM 16
-#define IMAGE_SYM_CLASS_REGISTER_PARAM 17
-#define IMAGE_SYM_CLASS_BIT_FIELD 18
-#define IMAGE_SYM_CLASS_FAR_EXTERNAL 68
-#define IMAGE_SYM_CLASS_BLOCK 100
-#define IMAGE_SYM_CLASS_FUNCTION 101
-#define IMAGE_SYM_CLASS_END_OF_STRUCT 102
-#define IMAGE_SYM_CLASS_FILE 103
-#define IMAGE_SYM_CLASS_SECTION 104
-#define IMAGE_SYM_CLASS_WEAK_EXTERNAL 105
-#define IMAGE_COMDAT_SELECT_NODUPLICATES 1
-#define IMAGE_COMDAT_SELECT_ANY 2
-#define IMAGE_COMDAT_SELECT_SAME_SIZE 3
-#define IMAGE_COMDAT_SELECT_EXACT_MATCH 4
-#define IMAGE_COMDAT_SELECT_ASSOCIATIVE 5
-#define IMAGE_COMDAT_SELECT_LARGEST 6
-#define IMAGE_COMDAT_SELECT_NEWEST 7
-#define IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY 1
-#define IMAGE_WEAK_EXTERN_SEARCH_LIBRARY 2
-#define IMAGE_WEAK_EXTERN_SEARCH_ALIAS 3
-#define IMAGE_REL_I386_ABSOLUTE 0
-#define IMAGE_REL_I386_DIR16 1
-#define IMAGE_REL_I386_REL16 2
-#define IMAGE_REL_I386_DIR32 6
-#define IMAGE_REL_I386_DIR32NB 7
-#define IMAGE_REL_I386_SEG12 9
-#define IMAGE_REL_I386_SECTION 10
-#define IMAGE_REL_I386_SECREL 11
-#define IMAGE_REL_I386_REL32 20
-#define IMAGE_REL_MIPS_ABSOLUTE 0
-#define IMAGE_REL_MIPS_REFHALF 1
-#define IMAGE_REL_MIPS_REFWORD 2
-#define IMAGE_REL_MIPS_JMPADDR 3
-#define IMAGE_REL_MIPS_REFHI 4
-#define IMAGE_REL_MIPS_REFLO 5
-#define IMAGE_REL_MIPS_GPREL 6
-#define IMAGE_REL_MIPS_LITERAL 7
-#define IMAGE_REL_MIPS_SECTION 10
-#define IMAGE_REL_MIPS_SECREL 11
-#define IMAGE_REL_MIPS_SECRELLO 12
-#define IMAGE_REL_MIPS_SECRELHI 13
-#define IMAGE_REL_MIPS_REFWORDNB 34
-#define IMAGE_REL_MIPS_PAIR 35
-#define IMAGE_REL_ALPHA_ABSOLUTE 0
-#define IMAGE_REL_ALPHA_REFLONG 1
-#define IMAGE_REL_ALPHA_REFQUAD 2
-#define IMAGE_REL_ALPHA_GPREL32 3
-#define IMAGE_REL_ALPHA_LITERAL 4
-#define IMAGE_REL_ALPHA_LITUSE 5
-#define IMAGE_REL_ALPHA_GPDISP 6
-#define IMAGE_REL_ALPHA_BRADDR 7
-#define IMAGE_REL_ALPHA_HINT 8
-#define IMAGE_REL_ALPHA_INLINE_REFLONG 9
-#define IMAGE_REL_ALPHA_REFHI 10
-#define IMAGE_REL_ALPHA_REFLO 11
-#define IMAGE_REL_ALPHA_PAIR 12
-#define IMAGE_REL_ALPHA_MATCH 13
-#define IMAGE_REL_ALPHA_SECTION 14
-#define IMAGE_REL_ALPHA_SECREL 15
-#define IMAGE_REL_ALPHA_REFLONGNB 16
-#define IMAGE_REL_ALPHA_SECRELLO 17
-#define IMAGE_REL_ALPHA_SECRELHI 18
-#define IMAGE_REL_PPC_ABSOLUTE 0
-#define IMAGE_REL_PPC_ADDR64 1
-#define IMAGE_REL_PPC_ADDR32 2
-#define IMAGE_REL_PPC_ADDR24 3
-#define IMAGE_REL_PPC_ADDR16 4
-#define IMAGE_REL_PPC_ADDR14 5
-#define IMAGE_REL_PPC_REL24 6
-#define IMAGE_REL_PPC_REL14 7
-#define IMAGE_REL_PPC_TOCREL16 8
-#define IMAGE_REL_PPC_TOCREL14 9
-#define IMAGE_REL_PPC_ADDR32NB 10
-#define IMAGE_REL_PPC_SECREL 11
-#define IMAGE_REL_PPC_SECTION 12
-#define IMAGE_REL_PPC_IFGLUE 13
-#define IMAGE_REL_PPC_IMGLUE 14
-#define IMAGE_REL_PPC_SECREL16 15
-#define IMAGE_REL_PPC_REFHI 16
-#define IMAGE_REL_PPC_REFLO 17
-#define IMAGE_REL_PPC_PAIR 18
-#define IMAGE_REL_PPC_TYPEMASK 255
-#define IMAGE_REL_PPC_NEG 256
-#define IMAGE_REL_PPC_BRTAKEN 512
-#define IMAGE_REL_PPC_BRNTAKEN 1024
-#define IMAGE_REL_PPC_TOCDEFN 2048
-#define IMAGE_REL_BASED_ABSOLUTE 0
-#define IMAGE_REL_BASED_HIGH 1
-#define IMAGE_REL_BASED_LOW 2
-#define IMAGE_REL_BASED_HIGHLOW 3
-#define IMAGE_REL_BASED_HIGHADJ 4
-#define IMAGE_REL_BASED_MIPS_JMPADDR 5
-#define IMAGE_ARCHIVE_START_SIZE 8
-#define IMAGE_ARCHIVE_START "!<arch>\n"
-#define IMAGE_ARCHIVE_END "`\n"
-#define IMAGE_ARCHIVE_PAD "\n"
-#define IMAGE_ARCHIVE_LINKER_MEMBER "/               "
-#define IMAGE_ARCHIVE_LONGNAMES_MEMBER "//              "
-#define IMAGE_ORDINAL_FLAG 0x80000000
-#define IMAGE_SNAP_BY_ORDINAL(o) ((o&IMAGE_ORDINAL_FLAG)!=0)
-#define IMAGE_ORDINAL(o) (o&0xffff)
-#define IMAGE_RESOURCE_NAME_IS_STRING 0x80000000
-#define IMAGE_RESOURCE_DATA_IS_DIRECTORY 0x80000000
-#define IMAGE_DEBUG_TYPE_UNKNOWN 0
-#define IMAGE_DEBUG_TYPE_COFF 1
-#define IMAGE_DEBUG_TYPE_CODEVIEW 2
-#define IMAGE_DEBUG_TYPE_FPO 3
-#define IMAGE_DEBUG_TYPE_MISC 4
-#define IMAGE_DEBUG_TYPE_EXCEPTION 5
-#define IMAGE_DEBUG_TYPE_FIXUP 6
-#define IMAGE_DEBUG_TYPE_OMAP_TO_SRC 7
-#define IMAGE_DEBUG_TYPE_OMAP_FROM_SRC 8
-#define FRAME_FPO 0
-#define FRAME_TRAP 1
-#define FRAME_TSS 2
-#define FRAME_NONFPO 3
-#define IMAGE_DEBUG_MISC_EXENAME 1
-#define N_BTMASK 0x000F
-#define N_TMASK 0x0030
-#define N_TMASK1 0x00C0
-#define N_TMASK2 0x00F0
-#define N_BTSHFT 4
-#define N_TSHIFT 2
-#define IS_TEXT_UNICODE_ASCII16 1
-#define IS_TEXT_UNICODE_REVERSE_ASCII16 16
-#define IS_TEXT_UNICODE_STATISTICS 2
-#define IS_TEXT_UNICODE_REVERSE_STATISTICS 32
-#define IS_TEXT_UNICODE_CONTROLS 4
-#define IS_TEXT_UNICODE_REVERSE_CONTROLS 64
-#define IS_TEXT_UNICODE_SIGNATURE 8
-#define IS_TEXT_UNICODE_REVERSE_SIGNATURE 128
-#define IS_TEXT_UNICODE_ILLEGAL_CHARS 256
-#define IS_TEXT_UNICODE_ODD_LENGTH 512
-#define IS_TEXT_UNICODE_NULL_BYTES 4096
-#define IS_TEXT_UNICODE_UNICODE_MASK 15
-#define IS_TEXT_UNICODE_REVERSE_MASK 240
-#define IS_TEXT_UNICODE_NOT_UNICODE_MASK 3840
-#define IS_TEXT_UNICODE_NOT_ASCII_MASK 61440
-#define SERVICE_KERNEL_DRIVER 1
-#define SERVICE_FILE_SYSTEM_DRIVER 2
-#define SERVICE_ADAPTER 4
-#define SERVICE_RECOGNIZER_DRIVER 8
-#define SERVICE_DRIVER (SERVICE_KERNEL_DRIVER|SERVICE_FILE_SYSTEM_DRIVER|SERVICE_RECOGNIZER_DRIVER)
-#define SERVICE_WIN32_OWN_PROCESS 16
-#define SERVICE_WIN32_SHARE_PROCESS 32
-#define SERVICE_WIN32 (SERVICE_WIN32_OWN_PROCESS|SERVICE_WIN32_SHARE_PROCESS)
-#define SERVICE_INTERACTIVE_PROCESS 256
-#define SERVICE_TYPE_ALL (SERVICE_WIN32|SERVICE_ADAPTER|SERVICE_DRIVER|SERVICE_INTERACTIVE_PROCESS)
-#define SERVICE_BOOT_START 0
-#define SERVICE_SYSTEM_START 1
-#define SERVICE_AUTO_START 2
-#define SERVICE_DEMAND_START 3
-#define SERVICE_DISABLED 4
-#define SERVICE_ERROR_IGNORE 0
-#define SERVICE_ERROR_NORMAL 1
-#define SERVICE_ERROR_SEVERE 2
-#define SERVICE_ERROR_CRITICAL 3
-#define SE_OWNER_DEFAULTED 1
-#define SE_GROUP_DEFAULTED 2
-#define SE_DACL_PRESENT 4
-#define SE_DACL_DEFAULTED 8
-#define SE_SACL_PRESENT 16
-#define SE_SACL_DEFAULTED 32
-#define SE_DACL_AUTO_INHERIT_REQ 256
-#define SE_SACL_AUTO_INHERIT_REQ 512
-#define SE_DACL_AUTO_INHERITED 1024
-#define SE_SACL_AUTO_INHERITED 2048
-#define SE_DACL_PROTECTED 4096
-#define SE_SACL_PROTECTED 8192
-#define SE_SELF_RELATIVE 0x8000
-#define SECURITY_DESCRIPTOR_MIN_LENGTH 20
-#define SECURITY_DESCRIPTOR_REVISION 1
-#define SECURITY_DESCRIPTOR_REVISION1 1
-#define SE_PRIVILEGE_ENABLED_BY_DEFAULT 1
-#define SE_PRIVILEGE_ENABLED 2
-#define SE_PRIVILEGE_USED_FOR_ACCESS 0x80000000
-#define PRIVILEGE_SET_ALL_NECESSARY 1
-#define SECURITY_MAX_IMPERSONATION_LEVEL SecurityDelegation
-#define DEFAULT_IMPERSONATION_LEVEL SecurityImpersonation
-#define SECURITY_DYNAMIC_TRACKING TRUE
-#define SECURITY_STATIC_TRACKING FALSE
-/* also in ddk/ntifs.h */
-#define TOKEN_ASSIGN_PRIMARY            (0x0001)
-#define TOKEN_DUPLICATE                 (0x0002)
-#define TOKEN_IMPERSONATE               (0x0004)
-#define TOKEN_QUERY                     (0x0008)
-#define TOKEN_QUERY_SOURCE              (0x0010)
-#define TOKEN_ADJUST_PRIVILEGES         (0x0020)
-#define TOKEN_ADJUST_GROUPS             (0x0040)
-#define TOKEN_ADJUST_DEFAULT            (0x0080)
-#define TOKEN_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED |\
-                          TOKEN_ASSIGN_PRIMARY     |\
-                          TOKEN_DUPLICATE          |\
-                          TOKEN_IMPERSONATE        |\
-                          TOKEN_QUERY              |\
-                          TOKEN_QUERY_SOURCE       |\
-                          TOKEN_ADJUST_PRIVILEGES  |\
-                          TOKEN_ADJUST_GROUPS      |\
-                          TOKEN_ADJUST_DEFAULT)
-#define TOKEN_READ       (STANDARD_RIGHTS_READ     |\
-                          TOKEN_QUERY)
-#define TOKEN_WRITE      (STANDARD_RIGHTS_WRITE    |\
-                          TOKEN_ADJUST_PRIVILEGES  |\
-                          TOKEN_ADJUST_GROUPS      |\
-                          TOKEN_ADJUST_DEFAULT)
-
-#define TOKEN_EXECUTE    (STANDARD_RIGHTS_EXECUTE)
-#define TOKEN_SOURCE_LENGTH 8
-/* end ddk/ntifs.h */
-#define DLL_PROCESS_DETACH	0
-#define DLL_PROCESS_ATTACH	1
-#define DLL_THREAD_ATTACH	2
-#define DLL_THREAD_DETACH	3
-#define DBG_CONTINUE 0x10002
-#define DBG_TERMINATE_THREAD 0x40010003
-#define DBG_TERMINATE_PROCESS 0x40010004
-#define DBG_CONTROL_C 0x40010005
-#define DBG_CONTROL_BREAK 0x40010008
-#define DBG_EXCEPTION_NOT_HANDLED 0x80010001
-#define TAPE_ABSOLUTE_POSITION 0
-#define TAPE_LOGICAL_POSITION 1
-#define TAPE_PSEUDO_LOGICAL_POSITION 2
-#define TAPE_REWIND 0
-#define TAPE_ABSOLUTE_BLOCK 1
-#define TAPE_LOGICAL_BLOCK 2
-#define TAPE_PSEUDO_LOGICAL_BLOCK 3
-#define TAPE_SPACE_END_OF_DATA 4
-#define TAPE_SPACE_RELATIVE_BLOCKS 5
-#define TAPE_SPACE_FILEMARKS 6
-#define TAPE_SPACE_SEQUENTIAL_FMKS 7
-#define TAPE_SPACE_SETMARKS 8
-#define TAPE_SPACE_SEQUENTIAL_SMKS 9
-#define TAPE_DRIVE_FIXED 1
-#define TAPE_DRIVE_SELECT 2
-#define TAPE_DRIVE_INITIATOR 4
-#define TAPE_DRIVE_ERASE_SHORT 16
-#define TAPE_DRIVE_ERASE_LONG 32
-#define TAPE_DRIVE_ERASE_BOP_ONLY 64
-#define TAPE_DRIVE_ERASE_IMMEDIATE 128
-#define TAPE_DRIVE_TAPE_CAPACITY 256
-#define TAPE_DRIVE_TAPE_REMAINING 512
-#define TAPE_DRIVE_FIXED_BLOCK 1024
-#define TAPE_DRIVE_VARIABLE_BLOCK 2048
-#define TAPE_DRIVE_WRITE_PROTECT 4096
-#define TAPE_DRIVE_EOT_WZ_SIZE 8192
-#define TAPE_DRIVE_ECC 0x10000
-#define TAPE_DRIVE_COMPRESSION 0x20000
-#define TAPE_DRIVE_PADDING 0x40000
-#define TAPE_DRIVE_REPORT_SMKS 0x80000
-#define TAPE_DRIVE_GET_ABSOLUTE_BLK 0x100000
-#define TAPE_DRIVE_GET_LOGICAL_BLK 0x200000
-#define TAPE_DRIVE_SET_EOT_WZ_SIZE 0x400000
-#define TAPE_DRIVE_EJECT_MEDIA 0x1000000
-#define TAPE_DRIVE_CLEAN_REQUESTS 0x2000000
-#define TAPE_DRIVE_SET_CMP_BOP_ONLY 0x4000000
-#define TAPE_DRIVE_RESERVED_BIT 0x80000000
-#define TAPE_DRIVE_LOAD_UNLOAD 0x80000001
-#define TAPE_DRIVE_TENSION 0x80000002
-#define TAPE_DRIVE_LOCK_UNLOCK 0x80000004
-#define TAPE_DRIVE_REWIND_IMMEDIATE 0x80000008
-#define TAPE_DRIVE_SET_BLOCK_SIZE 0x80000010
-#define TAPE_DRIVE_LOAD_UNLD_IMMED 0x80000020
-#define TAPE_DRIVE_TENSION_IMMED 0x80000040
-#define TAPE_DRIVE_LOCK_UNLK_IMMED 0x80000080
-#define TAPE_DRIVE_SET_ECC 0x80000100
-#define TAPE_DRIVE_SET_COMPRESSION 0x80000200
-#define TAPE_DRIVE_SET_PADDING 0x80000400
-#define TAPE_DRIVE_SET_REPORT_SMKS 0x80000800
-#define TAPE_DRIVE_ABSOLUTE_BLK 0x80001000
-#define TAPE_DRIVE_ABS_BLK_IMMED 0x80002000
-#define TAPE_DRIVE_LOGICAL_BLK 0x80004000
-#define TAPE_DRIVE_LOG_BLK_IMMED 0x80008000
-#define TAPE_DRIVE_END_OF_DATA 0x80010000
-#define TAPE_DRIVE_RELATIVE_BLKS 0x80020000
-#define TAPE_DRIVE_FILEMARKS 0x80040000
-#define TAPE_DRIVE_SEQUENTIAL_FMKS 0x80080000
-#define TAPE_DRIVE_SETMARKS 0x80100000
-#define TAPE_DRIVE_SEQUENTIAL_SMKS 0x80200000
-#define TAPE_DRIVE_REVERSE_POSITION 0x80400000
-#define TAPE_DRIVE_SPACE_IMMEDIATE 0x80800000
-#define TAPE_DRIVE_WRITE_SETMARKS 0x81000000
-#define TAPE_DRIVE_WRITE_FILEMARKS 0x82000000
-#define TAPE_DRIVE_WRITE_SHORT_FMKS 0x84000000
-#define TAPE_DRIVE_WRITE_LONG_FMKS 0x88000000
-#define TAPE_DRIVE_WRITE_MARK_IMMED 0x90000000
-#define TAPE_DRIVE_FORMAT 0xA0000000
-#define TAPE_DRIVE_FORMAT_IMMEDIATE 0xC0000000
-#define TAPE_DRIVE_HIGH_FEATURES 0x80000000
-#define TAPE_FIXED_PARTITIONS	0
-#define TAPE_INITIATOR_PARTITIONS	2
-#define TAPE_SELECT_PARTITIONS	1
-#define TAPE_FILEMARKS	1
-#define TAPE_LONG_FILEMARKS	3
-#define TAPE_SETMARKS	0
-#define TAPE_SHORT_FILEMARKS	2
-#define TAPE_ERASE_LONG 1
-#define TAPE_ERASE_SHORT 0
-#define TAPE_LOAD 0
-#define TAPE_UNLOAD 1
-#define TAPE_TENSION 2
-#define TAPE_LOCK 3
-#define TAPE_UNLOCK 4
-#define TAPE_FORMAT 5
-#if (_WIN32_WINNT >= 0x0500)
-#define VER_MINORVERSION 0x0000001
-#define VER_MAJORVERSION 0x0000002
-#define VER_BUILDNUMBER 0x0000004
-#define VER_PLATFORMID 0x0000008
-#define VER_SERVICEPACKMINOR 0x0000010
-#define VER_SERVICEPACKMAJOR 0x0000020
-#define VER_SUITENAME 0x0000040
-#define VER_PRODUCT_TYPE 0x0000080
-#define VER_EQUAL 1
-#define VER_GREATER 2
-#define VER_GREATER_EQUAL 3
-#define VER_LESS 4
-#define VER_LESS_EQUAL 5
-#define VER_AND 6
-#define VER_OR 7
-#endif
-#define VER_PLATFORM_WIN32s 0
-#define VER_PLATFORM_WIN32_WINDOWS 1
-#define VER_PLATFORM_WIN32_NT 2
-#define VER_NT_WORKSTATION 1
-#define VER_NT_DOMAIN_CONTROLLER 2
-#define VER_NT_SERVER 3
-#define VER_SUITE_SMALLBUSINESS 1
-#define VER_SUITE_ENTERPRISE 2
-#define VER_SUITE_BACKOFFICE 4
-#define VER_SUITE_TERMINAL 16
-#define VER_SUITE_SMALLBUSINESS_RESTRICTED 32
-#define VER_SUITE_DATACENTER 128
-#define VER_SUITE_PERSONAL 512
-#define VER_SUITE_BLADE 1024
-#define WT_EXECUTEDEFAULT 0x00000000                           
-#define WT_EXECUTEINIOTHREAD 0x00000001                           
-#define WT_EXECUTEINWAITTHREAD 0x00000004                           
-#define WT_EXECUTEONLYONCE 0x00000008                           
-#define WT_EXECUTELONGFUNCTION 0x00000010                           
-#define WT_EXECUTEINTIMERTHREAD 0x00000020                           
-#define WT_EXECUTEINPERSISTENTTHREAD 0x00000080                      
-#define WT_TRANSFER_IMPERSONATION 0x00000100                         
-#if (_WIN32_WINNT >= 0x0501)
-#define ACTIVATION_CONTEXT_SECTION_ASSEMBLY_INFORMATION 1
-#define ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION 2
-#define ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION 3
-#define ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION 4
-#define ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION 5
-#define ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION 6
-#define ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION 7
-#define ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES 9
-#endif /* (_WIN32_WINNT >= 0x0501) */
-#define BTYPE(x) ((x)&N_BTMASK)
-#define ISPTR(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT))
-#define ISFCN(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_FUNCTION<<N_BTSHFT))
-#define ISARY(x) (((x)&N_TMASK)==(IMAGE_SYM_DTYPE_ARRAY<<N_BTSHFT))
-#define ISTAG(x) ((x)==IMAGE_SYM_CLASS_STRUCT_TAG||(x)==IMAGE_SYM_CLASS_UNION_TAG||(x)==IMAGE_SYM_CLASS_ENUM_TAG)
-#define INCREF(x) ((((x)&~N_BTMASK)<<N_TSHIFT)|(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT)|((x)&N_BTMASK))
-#define DECREF(x) ((((x)>>N_TSHIFT)&~N_BTMASK)|((x)&N_BTMASK))
-#define TLS_MINIMUM_AVAILABLE 64
-#define REPARSE_DATA_BUFFER_HEADER_SIZE   FIELD_OFFSET(REPARSE_DATA_BUFFER, GenericReparseBuffer)
-#define REPARSE_GUID_DATA_BUFFER_HEADER_SIZE   FIELD_OFFSET(REPARSE_GUID_DATA_BUFFER, GenericReparseBuffer)
-#define MAXIMUM_REPARSE_DATA_BUFFER_SIZE 16384
-#define IO_REPARSE_TAG_RESERVED_ZERO 0
-#define IO_REPARSE_TAG_RESERVED_ONE 1
-#define IO_REPARSE_TAG_RESERVED_RANGE IO_REPARSE_TAG_RESERVED_ONE
-#define IsReparseTagMicrosoft(x) ((x)&0x80000000)
-#define IsReparseTagHighLatency(x) ((x)&0x40000000)
-#define IsReparseTagNameSurrogate(x) ((x)&0x20000000)
-#define IO_REPARSE_TAG_VALID_VALUES 0xE000FFFF
-#define IsReparseTagValid(x) (!((x)&~IO_REPARSE_TAG_VALID_VALUES)&&((x)>IO_REPARSE_TAG_RESERVED_RANGE))
-#define IO_REPARSE_TAG_SYMBOLIC_LINK IO_REPARSE_TAG_RESERVED_ZERO
-#define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003
-#ifndef RC_INVOKED
-typedef DWORD ACCESS_MASK, *PACCESS_MASK;
-
-#ifdef _GUID_DEFINED
-# warning _GUID_DEFINED is deprecated, use GUID_DEFINED instead
-#endif
-
-#if ! (defined _GUID_DEFINED || defined GUID_DEFINED) /* also defined in basetyps.h */
-#define GUID_DEFINED
-typedef struct _GUID {
-	unsigned long  Data1;
-	unsigned short Data2;
-	unsigned short Data3;
-	unsigned char  Data4[8];
-} GUID, *REFGUID, *LPGUID;
-#define SYSTEM_LUID { QuadPart:999 }
-#endif /* GUID_DEFINED */
-typedef struct _GENERIC_MAPPING {
-	ACCESS_MASK GenericRead;
-	ACCESS_MASK GenericWrite;
-	ACCESS_MASK GenericExecute;
-	ACCESS_MASK GenericAll;
-} GENERIC_MAPPING, *PGENERIC_MAPPING;
-typedef struct _ACE_HEADER {
-	BYTE AceType;
-	BYTE AceFlags;
-	WORD AceSize;
-} ACE_HEADER, *PACE_HEADER;
-typedef struct _ACCESS_ALLOWED_ACE {
-	ACE_HEADER Header;
-	ACCESS_MASK Mask;
-	DWORD SidStart;
-} ACCESS_ALLOWED_ACE, *PACCESS_ALLOWED_ACE;
-typedef struct _ACCESS_DENIED_ACE {
-	ACE_HEADER Header;
-	ACCESS_MASK Mask;
-	DWORD SidStart;
-} ACCESS_DENIED_ACE, *PACCESS_DENIED_ACE;
-typedef struct _SYSTEM_AUDIT_ACE {
-	ACE_HEADER Header;
-	ACCESS_MASK Mask;
-	DWORD SidStart;
-} SYSTEM_AUDIT_ACE;
-typedef SYSTEM_AUDIT_ACE *PSYSTEM_AUDIT_ACE;
-typedef struct _SYSTEM_ALARM_ACE {
-	ACE_HEADER Header;
-	ACCESS_MASK Mask;
-	DWORD SidStart;
-} SYSTEM_ALARM_ACE,*PSYSTEM_ALARM_ACE;
-typedef struct _ACCESS_ALLOWED_OBJECT_ACE {
-	ACE_HEADER Header;
-	ACCESS_MASK Mask;
-	DWORD Flags;
-	GUID ObjectType;
-	GUID InheritedObjectType;
-	DWORD SidStart;
-} ACCESS_ALLOWED_OBJECT_ACE,*PACCESS_ALLOWED_OBJECT_ACE;
-typedef struct _ACCESS_DENIED_OBJECT_ACE {
-	ACE_HEADER Header;
-	ACCESS_MASK Mask;
-	DWORD Flags;
-	GUID ObjectType;
-	GUID InheritedObjectType;
-	DWORD SidStart;
-} ACCESS_DENIED_OBJECT_ACE,*PACCESS_DENIED_OBJECT_ACE;
-typedef struct _SYSTEM_AUDIT_OBJECT_ACE {
-	ACE_HEADER Header;
-	ACCESS_MASK Mask;
-	DWORD Flags;
-	GUID ObjectType;
-	GUID InheritedObjectType;
-	DWORD SidStart;
-} SYSTEM_AUDIT_OBJECT_ACE,*PSYSTEM_AUDIT_OBJECT_ACE;
-typedef struct _SYSTEM_ALARM_OBJECT_ACE {
-	ACE_HEADER Header;
-	ACCESS_MASK Mask;
-	DWORD Flags;
-	GUID ObjectType;
-	GUID InheritedObjectType;
-	DWORD SidStart;
-} SYSTEM_ALARM_OBJECT_ACE,*PSYSTEM_ALARM_OBJECT_ACE;
-typedef struct _ACL {
-	BYTE AclRevision;
-	BYTE Sbz1;
-	WORD AclSize;
-	WORD AceCount;
-	WORD Sbz2;
-} ACL,*PACL;
-typedef struct _ACL_REVISION_INFORMATION {
-	DWORD AclRevision;
-} ACL_REVISION_INFORMATION;
-typedef struct _ACL_SIZE_INFORMATION {
-	DWORD   AceCount;
-	DWORD   AclBytesInUse;
-	DWORD   AclBytesFree;
-} ACL_SIZE_INFORMATION;
-
-/* FIXME: add more machines */
-#ifdef _X86_
-#define SIZE_OF_80387_REGISTERS	80
-#define CONTEXT_i386	0x10000
-#define CONTEXT_i486	0x10000
-#define CONTEXT_CONTROL	(CONTEXT_i386|0x00000001L)
-#define CONTEXT_INTEGER	(CONTEXT_i386|0x00000002L)
-#define CONTEXT_SEGMENTS	(CONTEXT_i386|0x00000004L)
-#define CONTEXT_FLOATING_POINT	(CONTEXT_i386|0x00000008L)
-#define CONTEXT_DEBUG_REGISTERS	(CONTEXT_i386|0x00000010L)
-#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386|0x00000020L)
-#define CONTEXT_FULL	(CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_SEGMENTS)
-#define MAXIMUM_SUPPORTED_EXTENSION  512
-typedef struct _FLOATING_SAVE_AREA {
-	DWORD	ControlWord;
-	DWORD	StatusWord;
-	DWORD	TagWord;
-	DWORD	ErrorOffset;
-	DWORD	ErrorSelector;
-	DWORD	DataOffset;
-	DWORD	DataSelector;
-	BYTE	RegisterArea[80];
-	DWORD	Cr0NpxState;
-} FLOATING_SAVE_AREA;
-typedef struct _CONTEXT {
-	DWORD	ContextFlags;
-	DWORD	Dr0;
-	DWORD	Dr1;
-	DWORD	Dr2;
-	DWORD	Dr3;
-	DWORD	Dr6;
-	DWORD	Dr7;
-	FLOATING_SAVE_AREA FloatSave;
-	DWORD	SegGs;
-	DWORD	SegFs;
-	DWORD	SegEs;
-	DWORD	SegDs;
-	DWORD	Edi;
-	DWORD	Esi;
-	DWORD	Ebx;
-	DWORD	Edx;
-	DWORD	Ecx;
-	DWORD	Eax;
-	DWORD	Ebp;
-	DWORD	Eip;
-	DWORD	SegCs;
-	DWORD	EFlags;
-	DWORD	Esp;
-	DWORD	SegSs;
-	BYTE	ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION];
-} CONTEXT;
-#elif defined(_PPC_)
-#define CONTEXT_CONTROL	1L
-#define CONTEXT_FLOATING_POINT	2L
-#define CONTEXT_INTEGER	4L
-#define CONTEXT_DEBUG_REGISTERS	8L
-#define CONTEXT_FULL (CONTEXT_CONTROL|CONTEXT_FLOATING_POINT|CONTEXT_INTEGER)
-typedef struct {
-	double Fpr0;
-	double Fpr1;
-	double Fpr2;
-	double Fpr3;
-	double Fpr4;
-	double Fpr5;
-	double Fpr6;
-	double Fpr7;
-	double Fpr8;
-	double Fpr9;
-	double Fpr10;
-	double Fpr11;
-	double Fpr12;
-	double Fpr13;
-	double Fpr14;
-	double Fpr15;
-	double Fpr16;
-	double Fpr17;
-	double Fpr18;
-	double Fpr19;
-	double Fpr20;
-	double Fpr21;
-	double Fpr22;
-	double Fpr23;
-	double Fpr24;
-	double Fpr25;
-	double Fpr26;
-	double Fpr27;
-	double Fpr28;
-	double Fpr29;
-	double Fpr30;
-	double Fpr31;
-	double Fpscr;
-	DWORD Gpr0;
-	DWORD Gpr1;
-	DWORD Gpr2;
-	DWORD Gpr3;
-	DWORD Gpr4;
-	DWORD Gpr5;
-	DWORD Gpr6;
-	DWORD Gpr7;
-	DWORD Gpr8;
-	DWORD Gpr9;
-	DWORD Gpr10;
-	DWORD Gpr11;
-	DWORD Gpr12;
-	DWORD Gpr13;
-	DWORD Gpr14;
-	DWORD Gpr15;
-	DWORD Gpr16;
-	DWORD Gpr17;
-	DWORD Gpr18;
-	DWORD Gpr19;
-	DWORD Gpr20;
-	DWORD Gpr21;
-	DWORD Gpr22;
-	DWORD Gpr23;
-	DWORD Gpr24;
-	DWORD Gpr25;
-	DWORD Gpr26;
-	DWORD Gpr27;
-	DWORD Gpr28;
-	DWORD Gpr29;
-	DWORD Gpr30;
-	DWORD Gpr31;
-	DWORD Cr;
-	DWORD Xer;
-	DWORD Msr;
-	DWORD Iar;
-	DWORD Lr;
-	DWORD Ctr;
-	DWORD ContextFlags;
-	DWORD Fill[3];
-	DWORD Dr0;
-	DWORD Dr1;
-	DWORD Dr2;
-	DWORD Dr3;
-	DWORD Dr4;
-	DWORD Dr5;
-	DWORD Dr6;
-	DWORD Dr7;
-} CONTEXT;
-#elif defined(_ALPHA_)
-#define CONTEXT_ALPHA	0x20000
-#define CONTEXT_CONTROL	(CONTEXT_ALPHA|1L)
-#define CONTEXT_FLOATING_POINT	(CONTEXT_ALPHA|2L)
-#define CONTEXT_INTEGER	(CONTEXT_ALPHA|4L)
-#define CONTEXT_FULL	(CONTEXT_CONTROL|CONTEXT_FLOATING_POINT|CONTEXT_INTEGER)
-typedef struct _CONTEXT {
-	ULONGLONG FltF0;
-	ULONGLONG FltF1;
-	ULONGLONG FltF2;
-	ULONGLONG FltF3;
-	ULONGLONG FltF4;
-	ULONGLONG FltF5;
-	ULONGLONG FltF6;
-	ULONGLONG FltF7;
-	ULONGLONG FltF8;
-	ULONGLONG FltF9;
-	ULONGLONG FltF10;
-	ULONGLONG FltF11;
-	ULONGLONG FltF12;
-	ULONGLONG FltF13;
-	ULONGLONG FltF14;
-	ULONGLONG FltF15;
-	ULONGLONG FltF16;
-	ULONGLONG FltF17;
-	ULONGLONG FltF18;
-	ULONGLONG FltF19;
-	ULONGLONG FltF20;
-	ULONGLONG FltF21;
-	ULONGLONG FltF22;
-	ULONGLONG FltF23;
-	ULONGLONG FltF24;
-	ULONGLONG FltF25;
-	ULONGLONG FltF26;
-	ULONGLONG FltF27;
-	ULONGLONG FltF28;
-	ULONGLONG FltF29;
-	ULONGLONG FltF30;
-	ULONGLONG FltF31;
-	ULONGLONG IntV0;
-	ULONGLONG IntT0;
-	ULONGLONG IntT1;
-	ULONGLONG IntT2;
-	ULONGLONG IntT3;
-	ULONGLONG IntT4;
-	ULONGLONG IntT5;
-	ULONGLONG IntT6;
-	ULONGLONG IntT7;
-	ULONGLONG IntS0;
-	ULONGLONG IntS1;
-	ULONGLONG IntS2;
-	ULONGLONG IntS3;
-	ULONGLONG IntS4;
-	ULONGLONG IntS5;
-	ULONGLONG IntFp;
-	ULONGLONG IntA0;
-	ULONGLONG IntA1;
-	ULONGLONG IntA2;
-	ULONGLONG IntA3;
-	ULONGLONG IntA4;
-	ULONGLONG IntA5;
-	ULONGLONG IntT8;
-	ULONGLONG IntT9;
-	ULONGLONG IntT10;
-	ULONGLONG IntT11;
-	ULONGLONG IntRa;
-	ULONGLONG IntT12;
-	ULONGLONG IntAt;
-	ULONGLONG IntGp;
-	ULONGLONG IntSp;
-	ULONGLONG IntZero;
-	ULONGLONG Fpcr;
-	ULONGLONG SoftFpcr;
-	ULONGLONG Fir;
-	DWORD Psr;
-	DWORD ContextFlags;
-	DWORD Fill[4];
-} CONTEXT;
-#elif defined(SHx)
-
-/* These are the debug or break registers on the SH3 */
-typedef struct _DEBUG_REGISTERS {
-	ULONG  BarA;
-	UCHAR  BasrA;
-	UCHAR  BamrA;
-	USHORT BbrA;
-	ULONG  BarB;
-	UCHAR  BasrB;
-	UCHAR  BamrB;
-	USHORT BbrB;
-	ULONG  BdrB;
-	ULONG  BdmrB;
-	USHORT Brcr;
-	USHORT Align;
-} DEBUG_REGISTERS, *PDEBUG_REGISTERS;
-
-/* The following flags control the contents of the CONTEXT structure. */
-
-#define CONTEXT_SH3		0x00000040
-#define CONTEXT_SH4		0x000000c0	/* CONTEXT_SH3 | 0x80 - must contain the SH3 bits */
-
-#ifdef SH3
-#define CONTEXT_CONTROL         (CONTEXT_SH3 | 0x00000001L)
-#define CONTEXT_INTEGER         (CONTEXT_SH3 | 0x00000002L)
-#define CONTEXT_DEBUG_REGISTERS (CONTEXT_SH3 | 0x00000008L)
-#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_DEBUG_REGISTERS)
-#else	/* SH4 */
-#define CONTEXT_CONTROL         (CONTEXT_SH4 | 0x00000001L)
-#define CONTEXT_INTEGER         (CONTEXT_SH4 | 0x00000002L)
-#define CONTEXT_DEBUG_REGISTERS (CONTEXT_SH4 | 0x00000008L)
-#define CONTEXT_FLOATING_POINT  (CONTEXT_SH4 | 0x00000004L)
-#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_DEBUG_REGISTERS | CONTEXT_FLOATING_POINT)
-#endif
-
-/* Context Frame */
-
-/*  This frame is used to store a limited processor context into the */
-/* Thread structure for CPUs which have no floating point support. */
-
-typedef struct _CONTEXT {
-	/* The flags values within this flag control the contents of */
-	/* a CONTEXT record. */
-
-	/* If the context record is used as an input parameter, then */
-	/* for each portion of the context record controlled by a flag */
-	/* whose value is set, it is assumed that that portion of the */
-	/* context record contains valid context. If the context record */
-	/* is being used to modify a thread's context, then only that */
-	/* portion of the threads context will be modified. */
-
-	/* If the context record is used as an IN OUT parameter to capture */
-	/* the context of a thread, then only those portions of the thread's */
-	/* context corresponding to set flags will be returned. */
-
-	/* The context record is never used as an OUT only parameter. */
-
-
-	ULONG ContextFlags;
-
-	/* This section is specified/returned if the ContextFlags word contains */
-	/* the flag CONTEXT_INTEGER. */
-
-	/* N.B. The registers RA and R15 are defined in this section, but are */
-	/*  considered part of the control context rather than part of the integer */
-	/*  context. */
-
-	ULONG PR;
-	ULONG MACH;
-	ULONG MACL;
-	ULONG GBR;
-	ULONG R0;
-	ULONG R1;
-	ULONG R2;
-	ULONG R3;
-	ULONG R4;
-	ULONG R5;
-	ULONG R6;
-	ULONG R7;
-	ULONG R8;
-	ULONG R9;
-	ULONG R10;
-	ULONG R11;
-	ULONG R12;
-	ULONG R13;
-	ULONG R14;
-	ULONG R15;
-
-	/* This section is specified/returned if the ContextFlags word contains */
-	/* the flag CONTEXT_CONTROL. */
-
-	/* N.B. The registers r15 and ra are defined in the integer section, */
-	/*   but are considered part of the control context rather than part of */
-	/*   the integer context. */
-
-	ULONG Fir;
-	ULONG Psr;
-
-#if !defined(SH3e) && !defined(SH4)
-	ULONG	OldStuff[2];
-	DEBUG_REGISTERS DebugRegisters;
-#else
-	ULONG	Fpscr;
-	ULONG	Fpul;
-	ULONG	FRegs[16];
-#if defined(SH4)
-	ULONG	xFRegs[16];
-#endif
-#endif
-} CONTEXT;
-
-#elif defined(MIPS)
-
-/* The following flags control the contents of the CONTEXT structure. */
-
-#define CONTEXT_R4000   0x00010000    /* r4000 context */
-
-#define CONTEXT_CONTROL         (CONTEXT_R4000 | 0x00000001L)
-#define CONTEXT_FLOATING_POINT  (CONTEXT_R4000 | 0x00000002L)
-#define CONTEXT_INTEGER         (CONTEXT_R4000 | 0x00000004L)
-
-#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER)
-
-/* Context Frame */
-
-/*  N.B. This frame must be exactly a multiple of 16 bytes in length. */
-
-/*  This frame has a several purposes: 1) it is used as an argument to */
-/*  NtContinue, 2) it is used to constuct a call frame for APC delivery, */
-/*  3) it is used to construct a call frame for exception dispatching */
-/*  in user mode, and 4) it is used in the user level thread creation */
-/*  routines. */
-
-/*  The layout of the record conforms to a standard call frame. */
-
-
-typedef struct _CONTEXT {
-
-	/* This section is always present and is used as an argument build */
-	/* area. */
-
-	DWORD Argument[4];
-
-	/* This section is specified/returned if the ContextFlags word contains */
-	/* the flag CONTEXT_FLOATING_POINT. */
-
-	DWORD FltF0;
-	DWORD FltF1;
-	DWORD FltF2;
-	DWORD FltF3;
-	DWORD FltF4;
-	DWORD FltF5;
-	DWORD FltF6;
-	DWORD FltF7;
-	DWORD FltF8;
-	DWORD FltF9;
-	DWORD FltF10;
-	DWORD FltF11;
-	DWORD FltF12;
-	DWORD FltF13;
-	DWORD FltF14;
-	DWORD FltF15;
-	DWORD FltF16;
-	DWORD FltF17;
-	DWORD FltF18;
-	DWORD FltF19;
-	DWORD FltF20;
-	DWORD FltF21;
-	DWORD FltF22;
-	DWORD FltF23;
-	DWORD FltF24;
-	DWORD FltF25;
-	DWORD FltF26;
-	DWORD FltF27;
-	DWORD FltF28;
-	DWORD FltF29;
-	DWORD FltF30;
-	DWORD FltF31;
-
-	/* This section is specified/returned if the ContextFlags word contains */
-	/* the flag CONTEXT_INTEGER. */
-
-	/* N.B. The registers gp, sp, and ra are defined in this section, but are */
-	/*  considered part of the control context rather than part of the integer */
-	/*  context. */
-
-	/* N.B. Register zero is not stored in the frame. */
-
-	DWORD IntZero;
-	DWORD IntAt;
-	DWORD IntV0;
-	DWORD IntV1;
-	DWORD IntA0;
-	DWORD IntA1;
-	DWORD IntA2;
-	DWORD IntA3;
-	DWORD IntT0;
-	DWORD IntT1;
-	DWORD IntT2;
-	DWORD IntT3;
-	DWORD IntT4;
-	DWORD IntT5;
-	DWORD IntT6;
-	DWORD IntT7;
-	DWORD IntS0;
-	DWORD IntS1;
-	DWORD IntS2;
-	DWORD IntS3;
-	DWORD IntS4;
-	DWORD IntS5;
-	DWORD IntS6;
-	DWORD IntS7;
-	DWORD IntT8;
-	DWORD IntT9;
-	DWORD IntK0;
-	DWORD IntK1;
-	DWORD IntGp;
-	DWORD IntSp;
-	DWORD IntS8;
-	DWORD IntRa;
-	DWORD IntLo;
-	DWORD IntHi;
-
-	/* This section is specified/returned if the ContextFlags word contains */
-	/* the flag CONTEXT_FLOATING_POINT. */
-
-	DWORD Fsr;
-
-	/* This section is specified/returned if the ContextFlags word contains */
-	/* the flag CONTEXT_CONTROL. */
-
-	/* N.B. The registers gp, sp, and ra are defined in the integer section, */
-	/*   but are considered part of the control context rather than part of */
-	/*   the integer context. */
-
-	DWORD Fir;
-	DWORD Psr;
-
-	/* The flags values within this flag control the contents of */
-	/* a CONTEXT record. */
-
-	/* If the context record is used as an input parameter, then */
-	/* for each portion of the context record controlled by a flag */
-	/* whose value is set, it is assumed that that portion of the */
-	/* context record contains valid context. If the context record */
-	/* is being used to modify a thread's context, then only that */
-	/* portion of the threads context will be modified. */
-
-	/* If the context record is used as an IN OUT parameter to capture */
-	/* the context of a thread, then only those portions of the thread's */
-	/* context corresponding to set flags will be returned. */
-
-	/* The context record is never used as an OUT only parameter. */
-
-	DWORD ContextFlags;
-
-	DWORD Fill[2];
-
-} CONTEXT;
-#elif defined(ARM)
-
-/* The following flags control the contents of the CONTEXT structure. */
-
-#define CONTEXT_ARM    0x0000040
-#define CONTEXT_CONTROL         (CONTEXT_ARM | 0x00000001L)
-#define CONTEXT_INTEGER         (CONTEXT_ARM | 0x00000002L)
-
-#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER)
-
-typedef struct _CONTEXT {
-	/* The flags values within this flag control the contents of
-	   a CONTEXT record.
-	  
-	   If the context record is used as an input parameter, then
-	   for each portion of the context record controlled by a flag
-	   whose value is set, it is assumed that that portion of the
-	   context record contains valid context. If the context record
-	   is being used to modify a thread's context, then only that
-	   portion of the threads context will be modified.
-	  
-	   If the context record is used as an IN OUT parameter to capture
-	   the context of a thread, then only those portions of the thread's
-	   context corresponding to set flags will be returned.
-	  
-	   The context record is never used as an OUT only parameter. */
-
-	ULONG ContextFlags;
-
-	/* This section is specified/returned if the ContextFlags word contains
-	   the flag CONTEXT_INTEGER. */
-	ULONG R0;
-	ULONG R1;
-	ULONG R2;
-	ULONG R3;
-	ULONG R4;
-	ULONG R5;
-	ULONG R6;
-	ULONG R7;
-	ULONG R8;
-	ULONG R9;
-	ULONG R10;
-	ULONG R11;
-	ULONG R12;
-
-	ULONG Sp;
-	ULONG Lr;
-	ULONG Pc;
-	ULONG Psr;
-} CONTEXT;
-
-#else
-#error "undefined processor type"
-#endif
-typedef CONTEXT *PCONTEXT,*LPCONTEXT;
-typedef struct _EXCEPTION_RECORD {
-	DWORD ExceptionCode;
-	DWORD ExceptionFlags;
-	struct _EXCEPTION_RECORD *ExceptionRecord;
-	PVOID ExceptionAddress;
-	DWORD NumberParameters;
-	DWORD ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS];
-} EXCEPTION_RECORD,*PEXCEPTION_RECORD,*LPEXCEPTION_RECORD;
-typedef struct _EXCEPTION_POINTERS {
-	PEXCEPTION_RECORD ExceptionRecord;
-	PCONTEXT ContextRecord;
-} EXCEPTION_POINTERS,*PEXCEPTION_POINTERS,*LPEXCEPTION_POINTERS;
-typedef union _LARGE_INTEGER {
-  struct {
-    DWORD LowPart;
-    LONG  HighPart;
-  } u;
-#if ! defined(NONAMELESSUNION) || defined(__cplusplus)
-  _ANONYMOUS_STRUCT struct {
-    DWORD LowPart;
-    LONG  HighPart;
-  };
-#endif /* NONAMELESSUNION */
-  LONGLONG QuadPart;
-} LARGE_INTEGER, *PLARGE_INTEGER;
-typedef union _ULARGE_INTEGER {
-  struct {
-    DWORD LowPart;
-    DWORD HighPart;
-  } u;
-#if ! defined(NONAMELESSUNION) || defined(__cplusplus)
-  _ANONYMOUS_STRUCT struct {
-    DWORD LowPart;
-    DWORD HighPart;
-  };
-#endif /* NONAMELESSUNION */
-  ULONGLONG QuadPart;
-} ULARGE_INTEGER, *PULARGE_INTEGER;
-typedef LARGE_INTEGER LUID,*PLUID;
-#pragma pack(push,4)
-typedef struct _LUID_AND_ATTRIBUTES {
-	LUID   Luid;
-	DWORD  Attributes;
-} LUID_AND_ATTRIBUTES, *PLUID_AND_ATTRIBUTES;
-#pragma pack(pop)
-typedef LUID_AND_ATTRIBUTES LUID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY];
-typedef LUID_AND_ATTRIBUTES_ARRAY *PLUID_AND_ATTRIBUTES_ARRAY;
-typedef struct _PRIVILEGE_SET {
-	DWORD PrivilegeCount;
-	DWORD Control;
-	LUID_AND_ATTRIBUTES Privilege[ANYSIZE_ARRAY];
-} PRIVILEGE_SET,*PPRIVILEGE_SET;
-typedef struct _SECURITY_ATTRIBUTES {
-	DWORD nLength;
-	LPVOID lpSecurityDescriptor;
-	BOOL bInheritHandle;
-} SECURITY_ATTRIBUTES,*PSECURITY_ATTRIBUTES,*LPSECURITY_ATTRIBUTES;
-typedef enum _SECURITY_IMPERSONATION_LEVEL {
-	SecurityAnonymous,
-	SecurityIdentification,
-	SecurityImpersonation,
-	SecurityDelegation
-} SECURITY_IMPERSONATION_LEVEL,*PSECURITY_IMPERSONATION_LEVEL;
-typedef BOOLEAN SECURITY_CONTEXT_TRACKING_MODE,*PSECURITY_CONTEXT_TRACKING_MODE;
-typedef struct _SECURITY_QUALITY_OF_SERVICE {
-	DWORD Length;
-	SECURITY_IMPERSONATION_LEVEL ImpersonationLevel;
-	SECURITY_CONTEXT_TRACKING_MODE ContextTrackingMode;
-	BOOLEAN EffectiveOnly;
-} SECURITY_QUALITY_OF_SERVICE,*PSECURITY_QUALITY_OF_SERVICE;
-typedef PVOID PACCESS_TOKEN;
-typedef struct _SE_IMPERSONATION_STATE {
-	PACCESS_TOKEN Token;
-	BOOLEAN CopyOnOpen;
-	BOOLEAN EffectiveOnly;
-	SECURITY_IMPERSONATION_LEVEL Level;
-} SE_IMPERSONATION_STATE,*PSE_IMPERSONATION_STATE;
-typedef struct _SID_IDENTIFIER_AUTHORITY {
-	BYTE Value[6];
-} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY,*LPSID_IDENTIFIER_AUTHORITY;
-typedef PVOID PSID;
-typedef struct _SID {
-   BYTE  Revision;
-   BYTE  SubAuthorityCount;
-   SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
-   DWORD SubAuthority[ANYSIZE_ARRAY];
-} SID, *PISID;
-typedef struct _SID_AND_ATTRIBUTES {
-	PSID Sid;
-	DWORD Attributes;
-} SID_AND_ATTRIBUTES, *PSID_AND_ATTRIBUTES;
-typedef SID_AND_ATTRIBUTES SID_AND_ATTRIBUTES_ARRAY[ANYSIZE_ARRAY];
-typedef SID_AND_ATTRIBUTES_ARRAY *PSID_AND_ATTRIBUTES_ARRAY;
-typedef struct _TOKEN_SOURCE {
-	CHAR SourceName[TOKEN_SOURCE_LENGTH];
-	LUID SourceIdentifier;
-} TOKEN_SOURCE,*PTOKEN_SOURCE;
-typedef struct _TOKEN_CONTROL {
-	LUID TokenId;
-	LUID AuthenticationId;
-	LUID ModifiedId;
-	TOKEN_SOURCE TokenSource;
-} TOKEN_CONTROL,*PTOKEN_CONTROL;
-typedef struct _TOKEN_DEFAULT_DACL {
-	PACL DefaultDacl;
-} TOKEN_DEFAULT_DACL,*PTOKEN_DEFAULT_DACL;
-typedef struct _TOKEN_GROUPS {
-	DWORD GroupCount;
-	SID_AND_ATTRIBUTES Groups[ANYSIZE_ARRAY];
-} TOKEN_GROUPS,*PTOKEN_GROUPS,*LPTOKEN_GROUPS;
-typedef struct _TOKEN_OWNER {
-	PSID Owner;
-} TOKEN_OWNER,*PTOKEN_OWNER;
-typedef struct _TOKEN_PRIMARY_GROUP {
-	PSID PrimaryGroup;
-} TOKEN_PRIMARY_GROUP,*PTOKEN_PRIMARY_GROUP;
-typedef struct _TOKEN_PRIVILEGES {
-	DWORD PrivilegeCount;
-	LUID_AND_ATTRIBUTES Privileges[ANYSIZE_ARRAY];
-} TOKEN_PRIVILEGES,*PTOKEN_PRIVILEGES,*LPTOKEN_PRIVILEGES;
-typedef enum tagTOKEN_TYPE {
-	TokenPrimary = 1,
-	TokenImpersonation
-} TOKEN_TYPE,*PTOKEN_TYPE;
-typedef struct _TOKEN_STATISTICS {
-	LUID TokenId;
-	LUID AuthenticationId;
-	LARGE_INTEGER ExpirationTime;
-	TOKEN_TYPE TokenType;
-	SECURITY_IMPERSONATION_LEVEL ImpersonationLevel;
-	DWORD DynamicCharged;
-	DWORD DynamicAvailable;
-	DWORD GroupCount;
-	DWORD PrivilegeCount;
-	LUID ModifiedId;
-} TOKEN_STATISTICS, *PTOKEN_STATISTICS;
-typedef struct _TOKEN_USER {
-	SID_AND_ATTRIBUTES User;
-} TOKEN_USER, *PTOKEN_USER;
-typedef DWORD SECURITY_INFORMATION,*PSECURITY_INFORMATION;
-typedef WORD SECURITY_DESCRIPTOR_CONTROL,*PSECURITY_DESCRIPTOR_CONTROL;
-typedef struct _SECURITY_DESCRIPTOR {
-	BYTE Revision;
-	BYTE Sbz1;
-	SECURITY_DESCRIPTOR_CONTROL Control;
-	PSID Owner;
-	PSID Group;
-	PACL Sacl;
-	PACL Dacl;
-} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR;
-typedef enum _TOKEN_INFORMATION_CLASS {
-	TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner,
-	TokenPrimaryGroup,TokenDefaultDacl,TokenSource,TokenType,
-	TokenImpersonationLevel,TokenStatistics,TokenRestrictedSids,
-	TokenSessionId
-} TOKEN_INFORMATION_CLASS;
-typedef enum _SID_NAME_USE {
-	SidTypeUser=1,SidTypeGroup,SidTypeDomain,SidTypeAlias,
-	SidTypeWellKnownGroup,SidTypeDeletedAccount,SidTypeInvalid,
-	SidTypeUnknown
-} SID_NAME_USE,*PSID_NAME_USE;
-typedef struct _QUOTA_LIMITS {
-	SIZE_T PagedPoolLimit;
-	SIZE_T NonPagedPoolLimit;
-	SIZE_T MinimumWorkingSetSize;
-	SIZE_T MaximumWorkingSetSize;
-	SIZE_T PagefileLimit;
-	LARGE_INTEGER TimeLimit;
-} QUOTA_LIMITS,*PQUOTA_LIMITS;
-typedef struct _IO_COUNTERS {
-	ULONGLONG  ReadOperationCount;
-	ULONGLONG  WriteOperationCount;
-	ULONGLONG  OtherOperationCount;
-	ULONGLONG ReadTransferCount;
-	ULONGLONG WriteTransferCount;
-	ULONGLONG OtherTransferCount;
-} IO_COUNTERS, *PIO_COUNTERS;
-typedef struct _FILE_NOTIFY_INFORMATION {
-	DWORD NextEntryOffset;
-	DWORD Action;
-	DWORD FileNameLength;
-	WCHAR FileName[1];
-} FILE_NOTIFY_INFORMATION,*PFILE_NOTIFY_INFORMATION;
-typedef struct _TAPE_ERASE {
-	DWORD Type;
-	BOOLEAN Immediate;
-} TAPE_ERASE,*PTAPE_ERASE;
-typedef struct _TAPE_GET_DRIVE_PARAMETERS {
-	BOOLEAN ECC;
-	BOOLEAN Compression;
-	BOOLEAN DataPadding;
-	BOOLEAN ReportSetmarks;
- 	DWORD DefaultBlockSize;
- 	DWORD MaximumBlockSize;
- 	DWORD MinimumBlockSize;
- 	DWORD MaximumPartitionCount;
- 	DWORD FeaturesLow;
- 	DWORD FeaturesHigh;
- 	DWORD EOTWarningZoneSize;
-} TAPE_GET_DRIVE_PARAMETERS,*PTAPE_GET_DRIVE_PARAMETERS;
-typedef struct _TAPE_GET_MEDIA_PARAMETERS {
-	LARGE_INTEGER Capacity;
-	LARGE_INTEGER Remaining;
-	DWORD BlockSize;
-	DWORD PartitionCount;
-	BOOLEAN WriteProtected;
-} TAPE_GET_MEDIA_PARAMETERS,*PTAPE_GET_MEDIA_PARAMETERS;
-typedef struct _TAPE_GET_POSITION {
-	ULONG Type;
-	ULONG Partition;
-	ULONG OffsetLow;
-	ULONG OffsetHigh;
-} TAPE_GET_POSITION,*PTAPE_GET_POSITION;
-typedef struct _TAPE_PREPARE {
-	DWORD Operation;
-	BOOLEAN Immediate;
-} TAPE_PREPARE,*PTAPE_PREPARE;
-typedef struct _TAPE_SET_DRIVE_PARAMETERS {
-	BOOLEAN ECC;
-	BOOLEAN Compression;
-	BOOLEAN DataPadding;
-	BOOLEAN ReportSetmarks;
-	ULONG EOTWarningZoneSize;
-} TAPE_SET_DRIVE_PARAMETERS,*PTAPE_SET_DRIVE_PARAMETERS;
-typedef struct _TAPE_SET_MEDIA_PARAMETERS {
-	ULONG BlockSize;
-} TAPE_SET_MEDIA_PARAMETERS,*PTAPE_SET_MEDIA_PARAMETERS;
-typedef struct _TAPE_SET_POSITION {
-	DWORD Method;
-	DWORD Partition;
-	LARGE_INTEGER Offset;
-	BOOLEAN Immediate;
-} TAPE_SET_POSITION,*PTAPE_SET_POSITION;
-typedef struct _TAPE_WRITE_MARKS {
-	DWORD Type;
-	DWORD Count;
-	BOOLEAN Immediate;
-} TAPE_WRITE_MARKS,*PTAPE_WRITE_MARKS;
-typedef struct _TAPE_CREATE_PARTITION {
-	DWORD Method;
-	DWORD Count;
-	DWORD Size;
-} TAPE_CREATE_PARTITION,*PTAPE_CREATE_PARTITION;
-typedef struct _MEMORY_BASIC_INFORMATION {
-	PVOID BaseAddress;
-	PVOID AllocationBase;
-	DWORD AllocationProtect;
-	DWORD RegionSize;
-	DWORD State;
-	DWORD Protect;
-	DWORD Type;
-} MEMORY_BASIC_INFORMATION,*PMEMORY_BASIC_INFORMATION;
-typedef struct _MESSAGE_RESOURCE_ENTRY {
-	WORD Length;
-	WORD Flags;
-	BYTE Text[1];
-} MESSAGE_RESOURCE_ENTRY,*PMESSAGE_RESOURCE_ENTRY;
-typedef struct _MESSAGE_RESOURCE_BLOCK {
-	DWORD LowId;
-	DWORD HighId;
-	DWORD OffsetToEntries;
-} MESSAGE_RESOURCE_BLOCK,*PMESSAGE_RESOURCE_BLOCK;
-typedef struct _MESSAGE_RESOURCE_DATA {
-	DWORD NumberOfBlocks;
-	MESSAGE_RESOURCE_BLOCK Blocks[1];
-} MESSAGE_RESOURCE_DATA,*PMESSAGE_RESOURCE_DATA;
-typedef struct _LIST_ENTRY {
-	struct _LIST_ENTRY *Flink;
-	struct _LIST_ENTRY *Blink;
-} LIST_ENTRY,*PLIST_ENTRY;
-typedef struct _SINGLE_LIST_ENTRY {
-	struct _SINGLE_LIST_ENTRY *Next;
-} SINGLE_LIST_ENTRY,*PSINGLE_LIST_ENTRY;
-
-#ifndef _SLIST_HEADER_
-#define _SLIST_HEADER_
-#define SLIST_ENTRY SINGLE_LIST_ENTRY
-#define _SLIST_ENTRY _SINGLE_LIST_ENTRY
-#define PSLIST_ENTRY PSINGLE_LIST_ENTRY
-typedef union _SLIST_HEADER {
-	ULONGLONG Alignment;
-	_ANONYMOUS_STRUCT struct {
-		SLIST_ENTRY Next;
-		WORD Depth;
-		WORD Sequence;
-	} DUMMYSTRUCTNAME;
-} SLIST_HEADER,*PSLIST_HEADER;
-#endif /* !_SLIST_HEADER_ */
-
-typedef struct _RTL_CRITICAL_SECTION_DEBUG {
-	WORD Type;
-	WORD CreatorBackTraceIndex;
-	struct _RTL_CRITICAL_SECTION *CriticalSection;
-	LIST_ENTRY ProcessLocksList;
-	DWORD EntryCount;
-	DWORD ContentionCount;
-	DWORD Spare[2];
-} RTL_CRITICAL_SECTION_DEBUG,*PRTL_CRITICAL_SECTION_DEBUG;
-typedef struct _RTL_CRITICAL_SECTION {
-	PRTL_CRITICAL_SECTION_DEBUG DebugInfo;
-	LONG LockCount;
-	LONG RecursionCount;
-	HANDLE OwningThread;
-	HANDLE LockSemaphore;
-	DWORD Reserved;
-} RTL_CRITICAL_SECTION,*PRTL_CRITICAL_SECTION;
-typedef struct _EVENTLOGRECORD {
-	DWORD Length;
-	DWORD Reserved;
-	DWORD RecordNumber;
-	DWORD TimeGenerated;
-	DWORD TimeWritten;
-	DWORD EventID;
-	WORD EventType;
-	WORD NumStrings;
-	WORD EventCategory;
-	WORD ReservedFlags;
-	DWORD ClosingRecordNumber;
-	DWORD StringOffset;
-	DWORD UserSidLength;
-	DWORD UserSidOffset;
-	DWORD DataLength;
-	DWORD DataOffset;
-} EVENTLOGRECORD,*PEVENTLOGRECORD;
-typedef struct _OSVERSIONINFOA {
-	DWORD dwOSVersionInfoSize;
-	DWORD dwMajorVersion;
-	DWORD dwMinorVersion;
-	DWORD dwBuildNumber;
-	DWORD dwPlatformId;
-	CHAR szCSDVersion[128];
-} OSVERSIONINFOA,*POSVERSIONINFOA,*LPOSVERSIONINFOA;
-typedef struct _OSVERSIONINFOW {
-	DWORD dwOSVersionInfoSize;
-	DWORD dwMajorVersion;
-	DWORD dwMinorVersion;
-	DWORD dwBuildNumber;
-	DWORD dwPlatformId;
-	WCHAR szCSDVersion[128];
-} OSVERSIONINFOW,*POSVERSIONINFOW,*LPOSVERSIONINFOW;
-typedef struct _OSVERSIONINFOEXA {
-	DWORD dwOSVersionInfoSize;
-	DWORD dwMajorVersion;
-	DWORD dwMinorVersion;
-	DWORD dwBuildNumber;
-	DWORD dwPlatformId;
-	CHAR szCSDVersion[128];
-	WORD wServicePackMajor;
-	WORD wServicePackMinor;
-	WORD wSuiteMask;
-	BYTE wProductType;
-	BYTE wReserved;
-} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA;
-typedef struct _OSVERSIONINFOEXW {
-	DWORD dwOSVersionInfoSize;
-	DWORD dwMajorVersion;
-	DWORD dwMinorVersion;
-	DWORD dwBuildNumber;
-	DWORD dwPlatformId;
-	WCHAR szCSDVersion[128];
-	WORD wServicePackMajor;
-	WORD wServicePackMinor;
-	WORD wSuiteMask;
-	BYTE wProductType;
-	BYTE wReserved;
-} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW;
-#pragma pack(push,2)
-typedef struct _IMAGE_VXD_HEADER {
-	WORD e32_magic;
-	BYTE e32_border;
-	BYTE e32_worder;
-	DWORD e32_level;
-	WORD e32_cpu;
-	WORD e32_os;
-	DWORD e32_ver;
-	DWORD e32_mflags;
-	DWORD e32_mpages;
-	DWORD e32_startobj;
-	DWORD e32_eip;
-	DWORD e32_stackobj;
-	DWORD e32_esp;
-	DWORD e32_pagesize;
-	DWORD e32_lastpagesize;
-	DWORD e32_fixupsize;
-	DWORD e32_fixupsum;
-	DWORD e32_ldrsize;
-	DWORD e32_ldrsum;
-	DWORD e32_objtab;
-	DWORD e32_objcnt;
-	DWORD e32_objmap;
-	DWORD e32_itermap;
-	DWORD e32_rsrctab;
-	DWORD e32_rsrccnt;
-	DWORD e32_restab;
-	DWORD e32_enttab;
-	DWORD e32_dirtab;
-	DWORD e32_dircnt;
-	DWORD e32_fpagetab;
-	DWORD e32_frectab;
-	DWORD e32_impmod;
-	DWORD e32_impmodcnt;
-	DWORD e32_impproc;
-	DWORD e32_pagesum;
-	DWORD e32_datapage;
-	DWORD e32_preload;
-	DWORD e32_nrestab;
-	DWORD e32_cbnrestab;
-	DWORD e32_nressum;
-	DWORD e32_autodata;
-	DWORD e32_debuginfo;
-	DWORD e32_debuglen;
-	DWORD e32_instpreload;
-	DWORD e32_instdemand;
-	DWORD e32_heapsize;
-	BYTE e32_res3[12];
-	DWORD e32_winresoff;
-	DWORD e32_winreslen;
-	WORD e32_devid;
-	WORD e32_ddkver;
-} IMAGE_VXD_HEADER,*PIMAGE_VXD_HEADER;
-#pragma pack(pop)
-#pragma pack(push,4)
-typedef struct _IMAGE_FILE_HEADER {
-	WORD Machine;
-	WORD NumberOfSections;
-	DWORD TimeDateStamp;
-	DWORD PointerToSymbolTable;
-	DWORD NumberOfSymbols;
-	WORD SizeOfOptionalHeader;
-	WORD Characteristics;
-} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER;
-typedef struct _IMAGE_DATA_DIRECTORY {
-	DWORD VirtualAddress;
-	DWORD Size;
-} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY;
-typedef struct _IMAGE_OPTIONAL_HEADER {
-	WORD Magic;
-	BYTE MajorLinkerVersion;
-	BYTE MinorLinkerVersion;
-	DWORD SizeOfCode;
-	DWORD SizeOfInitializedData;
-	DWORD SizeOfUninitializedData;
-	DWORD AddressOfEntryPoint;
-	DWORD BaseOfCode;
-	DWORD BaseOfData;
-	DWORD ImageBase;
-	DWORD SectionAlignment;
-	DWORD FileAlignment;
-	WORD MajorOperatingSystemVersion;
-	WORD MinorOperatingSystemVersion;
-	WORD MajorImageVersion;
-	WORD MinorImageVersion;
-	WORD MajorSubsystemVersion;
-	WORD MinorSubsystemVersion;
-	DWORD Reserved1;
-	DWORD SizeOfImage;
-	DWORD SizeOfHeaders;
-	DWORD CheckSum;
-	WORD Subsystem;
-	WORD DllCharacteristics;
-	DWORD SizeOfStackReserve;
-	DWORD SizeOfStackCommit;
-	DWORD SizeOfHeapReserve;
-	DWORD SizeOfHeapCommit;
-	DWORD LoaderFlags;
-	DWORD NumberOfRvaAndSizes;
-	IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
-} IMAGE_OPTIONAL_HEADER,*PIMAGE_OPTIONAL_HEADER;
-typedef struct _IMAGE_ROM_OPTIONAL_HEADER {
-	WORD Magic;
-	BYTE MajorLinkerVersion;
-	BYTE MinorLinkerVersion;
-	DWORD SizeOfCode;
-	DWORD SizeOfInitializedData;
-	DWORD SizeOfUninitializedData;
-	DWORD AddressOfEntryPoint;
-	DWORD BaseOfCode;
-	DWORD BaseOfData;
-	DWORD BaseOfBss;
-	DWORD GprMask;
-	DWORD CprMask[4];
-	DWORD GpValue;
-} IMAGE_ROM_OPTIONAL_HEADER,*PIMAGE_ROM_OPTIONAL_HEADER;
-#pragma pack(pop)
-#pragma pack(push,2)
-typedef struct _IMAGE_DOS_HEADER {
-	WORD e_magic;
-	WORD e_cblp;
-	WORD e_cp;
-	WORD e_crlc;
-	WORD e_cparhdr;
-	WORD e_minalloc;
-	WORD e_maxalloc;
-	WORD e_ss;
-	WORD e_sp;
-	WORD e_csum;
-	WORD e_ip;
-	WORD e_cs;
-	WORD e_lfarlc;
-	WORD e_ovno;
-	WORD e_res[4];
-	WORD e_oemid;
-	WORD e_oeminfo;
-	WORD e_res2[10];
-	LONG e_lfanew;
-} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
-typedef struct _IMAGE_OS2_HEADER {
-	WORD ne_magic;
-	CHAR ne_ver;
-	CHAR ne_rev;
-	WORD ne_enttab;
-	WORD ne_cbenttab;
-	LONG ne_crc;
-	WORD ne_flags;
-	WORD ne_autodata;
-	WORD ne_heap;
-	WORD ne_stack;
-	LONG ne_csip;
-	LONG ne_sssp;
-	WORD ne_cseg;
-	WORD ne_cmod;
-	WORD ne_cbnrestab;
-	WORD ne_segtab;
-	WORD ne_rsrctab;
-	WORD ne_restab;
-	WORD ne_modtab;
-	WORD ne_imptab;
-	LONG ne_nrestab;
-	WORD ne_cmovent;
-	WORD ne_align;
-	WORD ne_cres;
-	BYTE ne_exetyp;
-	BYTE ne_flagsothers;
-	WORD ne_pretthunks;
-	WORD ne_psegrefbytes;
-	WORD ne_swaparea;
-	WORD ne_expver;
-} IMAGE_OS2_HEADER,*PIMAGE_OS2_HEADER;
-#pragma pack(pop)
-#pragma pack(push,4)
-typedef struct _IMAGE_NT_HEADERS {
-	DWORD Signature;
-	IMAGE_FILE_HEADER FileHeader;
-	IMAGE_OPTIONAL_HEADER OptionalHeader;
-} IMAGE_NT_HEADERS,*PIMAGE_NT_HEADERS;
-typedef struct _IMAGE_ROM_HEADERS {
-	IMAGE_FILE_HEADER FileHeader;
-	IMAGE_ROM_OPTIONAL_HEADER OptionalHeader;
-} IMAGE_ROM_HEADERS,*PIMAGE_ROM_HEADERS;
-typedef struct _IMAGE_SECTION_HEADER {
-	BYTE Name[IMAGE_SIZEOF_SHORT_NAME];
-	union {
-		DWORD PhysicalAddress;
-		DWORD VirtualSize;
-	} Misc;
-	DWORD VirtualAddress;
-	DWORD SizeOfRawData;
-	DWORD PointerToRawData;
-	DWORD PointerToRelocations;
-	DWORD PointerToLinenumbers;
-	WORD NumberOfRelocations;
-	WORD NumberOfLinenumbers;
-	DWORD Characteristics;
-} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER;
-#pragma pack(pop)
-#pragma pack(push,2)
-typedef struct _IMAGE_SYMBOL {
-	union {
-		BYTE ShortName[8];
-		struct {
-			DWORD Short;
-			DWORD Long;
-		} Name;
-		PBYTE LongName[2];
-	} N;
-	DWORD Value;
-	SHORT SectionNumber;
-	WORD Type;
-	BYTE StorageClass;
-	BYTE NumberOfAuxSymbols;
-} IMAGE_SYMBOL,*PIMAGE_SYMBOL;
-typedef union _IMAGE_AUX_SYMBOL {
-	struct {
-		DWORD TagIndex;
-		union {
-			struct {
-				WORD Linenumber;
-				WORD Size;
-			} LnSz;
-			DWORD TotalSize;
-		} Misc;
-		union {
-			struct {
-				DWORD PointerToLinenumber;
-				DWORD PointerToNextFunction;
-			} Function;
-			struct {
-				WORD Dimension[4];
-			} Array;
-		} FcnAry;
-		WORD TvIndex;
-	} Sym;
-	struct {
-		BYTE Name[IMAGE_SIZEOF_SYMBOL];
-	} File;
-	struct {
-		DWORD Length;
-		WORD NumberOfRelocations;
-		WORD NumberOfLinenumbers;
-		DWORD CheckSum;
-		SHORT Number;
-		BYTE Selection;
-	} Section;
-} IMAGE_AUX_SYMBOL,*PIMAGE_AUX_SYMBOL;
-typedef struct _IMAGE_COFF_SYMBOLS_HEADER {
-	DWORD NumberOfSymbols;
-	DWORD LvaToFirstSymbol;
-	DWORD NumberOfLinenumbers;
-	DWORD LvaToFirstLinenumber;
-	DWORD RvaToFirstByteOfCode;
-	DWORD RvaToLastByteOfCode;
-	DWORD RvaToFirstByteOfData;
-	DWORD RvaToLastByteOfData;
-} IMAGE_COFF_SYMBOLS_HEADER,*PIMAGE_COFF_SYMBOLS_HEADER;
-typedef struct _IMAGE_RELOCATION {
-	_ANONYMOUS_UNION union {
-		DWORD VirtualAddress;
-		DWORD RelocCount;
-	} DUMMYUNIONNAME;
-	DWORD SymbolTableIndex;
-	WORD Type;
-} IMAGE_RELOCATION,*PIMAGE_RELOCATION;
-#pragma pack(pop)
-#pragma pack(push,4)
-typedef struct _IMAGE_BASE_RELOCATION {
-	DWORD VirtualAddress;
-	DWORD SizeOfBlock;
-} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION;
-#pragma pack(pop)
-#pragma pack(push,2)
-typedef struct _IMAGE_LINENUMBER {
-	union {
-		DWORD SymbolTableIndex;
-		DWORD VirtualAddress;
-	} Type;
-	WORD Linenumber;
-} IMAGE_LINENUMBER,*PIMAGE_LINENUMBER;
-#pragma pack(pop)
-#pragma pack(push,4)
-typedef struct _IMAGE_ARCHIVE_MEMBER_HEADER {
-	BYTE Name[16];
-	BYTE Date[12];
-	BYTE UserID[6];
-	BYTE GroupID[6];
-	BYTE Mode[8];
-	BYTE Size[10];
-	BYTE EndHeader[2];
-} IMAGE_ARCHIVE_MEMBER_HEADER,*PIMAGE_ARCHIVE_MEMBER_HEADER;
-typedef struct _IMAGE_EXPORT_DIRECTORY {
-	DWORD Characteristics;
-	DWORD TimeDateStamp;
-	WORD MajorVersion;
-	WORD MinorVersion;
-	DWORD Name;
-	DWORD Base;
-	DWORD NumberOfFunctions;
-	DWORD NumberOfNames;
-	PDWORD *AddressOfFunctions;
-	PDWORD *AddressOfNames;
-	PWORD *AddressOfNameOrdinals;
-} IMAGE_EXPORT_DIRECTORY,*PIMAGE_EXPORT_DIRECTORY;
-typedef struct _IMAGE_IMPORT_BY_NAME {
-	WORD Hint;
-	BYTE Name[1];
-} IMAGE_IMPORT_BY_NAME,*PIMAGE_IMPORT_BY_NAME;
-typedef struct _IMAGE_THUNK_DATA {
-	union {
-		PBYTE ForwarderString;
-		PDWORD Function;
-		DWORD Ordinal;
-		PIMAGE_IMPORT_BY_NAME AddressOfData;
-	} u1;
-} IMAGE_THUNK_DATA,*PIMAGE_THUNK_DATA;
-typedef struct _IMAGE_IMPORT_DESCRIPTOR {
-	_ANONYMOUS_UNION union {
-		DWORD Characteristics;
-		PIMAGE_THUNK_DATA OriginalFirstThunk;
-	} DUMMYUNIONNAME;
-	DWORD TimeDateStamp;
-	DWORD ForwarderChain;
-	DWORD Name;
-	PIMAGE_THUNK_DATA FirstThunk;
-} IMAGE_IMPORT_DESCRIPTOR,*PIMAGE_IMPORT_DESCRIPTOR;
-typedef struct _IMAGE_BOUND_IMPORT_DESCRIPTOR {
-	DWORD TimeDateStamp;
-	WORD OffsetModuleName;
-	WORD NumberOfModuleForwarderRefs;
-} IMAGE_BOUND_IMPORT_DESCRIPTOR,*PIMAGE_BOUND_IMPORT_DESCRIPTOR;
-typedef struct _IMAGE_BOUND_FORWARDER_REF {
-	DWORD TimeDateStamp;
-	WORD OffsetModuleName;
-	WORD Reserved;
-} IMAGE_BOUND_FORWARDER_REF,*PIMAGE_BOUND_FORWARDER_REF;
-typedef void(NTAPI *PIMAGE_TLS_CALLBACK)(PVOID,DWORD,PVOID);
-typedef struct _IMAGE_TLS_DIRECTORY {
-	DWORD StartAddressOfRawData;
-	DWORD EndAddressOfRawData;
-	PDWORD AddressOfIndex;
-	PIMAGE_TLS_CALLBACK *AddressOfCallBacks;
-	DWORD SizeOfZeroFill;
-	DWORD Characteristics;
-} IMAGE_TLS_DIRECTORY,*PIMAGE_TLS_DIRECTORY;
-typedef struct _IMAGE_RESOURCE_DIRECTORY {
-	DWORD Characteristics;
-	DWORD TimeDateStamp;
-	WORD MajorVersion;
-	WORD MinorVersion;
-	WORD NumberOfNamedEntries;
-	WORD NumberOfIdEntries;
-} IMAGE_RESOURCE_DIRECTORY,*PIMAGE_RESOURCE_DIRECTORY;
-_ANONYMOUS_STRUCT typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY {
-	_ANONYMOUS_UNION union {
-		_ANONYMOUS_STRUCT struct {
-			DWORD NameOffset:31;
-			DWORD NameIsString:1;
-		}DUMMYSTRUCTNAME;
-		DWORD Name;
-		WORD Id;
-	} DUMMYUNIONNAME;
-	_ANONYMOUS_UNION union {
-		DWORD OffsetToData;
-		_ANONYMOUS_STRUCT struct {
-			DWORD OffsetToDirectory:31;
-			DWORD DataIsDirectory:1;
-		} DUMMYSTRUCTNAME2;
-	} DUMMYUNIONNAME2;
-} IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY;
-typedef struct _IMAGE_RESOURCE_DIRECTORY_STRING {
-	WORD Length;
-	CHAR NameString[1];
-} IMAGE_RESOURCE_DIRECTORY_STRING,*PIMAGE_RESOURCE_DIRECTORY_STRING;
-typedef struct _IMAGE_RESOURCE_DIR_STRING_U {
-	WORD Length;
-	WCHAR NameString[1];
-} IMAGE_RESOURCE_DIR_STRING_U,*PIMAGE_RESOURCE_DIR_STRING_U;
-typedef struct _IMAGE_RESOURCE_DATA_ENTRY {
-	DWORD OffsetToData;
-	DWORD Size;
-	DWORD CodePage;
-	DWORD Reserved;
-} IMAGE_RESOURCE_DATA_ENTRY,*PIMAGE_RESOURCE_DATA_ENTRY;
-typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY {
-	DWORD Characteristics;
-	DWORD TimeDateStamp;
-	WORD MajorVersion;
-	WORD MinorVersion;
-	DWORD GlobalFlagsClear;
-	DWORD GlobalFlagsSet;
-	DWORD CriticalSectionDefaultTimeout;
-	DWORD DeCommitFreeBlockThreshold;
-	DWORD DeCommitTotalFreeThreshold;
-	PVOID LockPrefixTable;
-	DWORD MaximumAllocationSize;
-	DWORD VirtualMemoryThreshold;
-	DWORD ProcessHeapFlags;
-	DWORD Reserved[4];
-} IMAGE_LOAD_CONFIG_DIRECTORY,*PIMAGE_LOAD_CONFIG_DIRECTORY;
-typedef struct _IMAGE_RUNTIME_FUNCTION_ENTRY {
-	DWORD BeginAddress;
-	DWORD EndAddress;
-	PVOID ExceptionHandler;
-	PVOID HandlerData;
-	DWORD PrologEndAddress;
-} IMAGE_RUNTIME_FUNCTION_ENTRY,*PIMAGE_RUNTIME_FUNCTION_ENTRY;
-typedef struct _IMAGE_DEBUG_DIRECTORY {
-	DWORD Characteristics;
-	DWORD TimeDateStamp;
-	WORD MajorVersion;
-	WORD MinorVersion;
-	DWORD Type;
-	DWORD SizeOfData;
-	DWORD AddressOfRawData;
-	DWORD PointerToRawData;
-} IMAGE_DEBUG_DIRECTORY,*PIMAGE_DEBUG_DIRECTORY;
-typedef struct _FPO_DATA {
-	DWORD ulOffStart;
-	DWORD cbProcSize;
-	DWORD cdwLocals;
-	WORD cdwParams;
-	WORD cbProlog:8;
-	WORD cbRegs:3;
-	WORD fHasSEH:1;
-	WORD fUseBP:1;
-	WORD reserved:1;
-	WORD cbFrame:2;
-} FPO_DATA,*PFPO_DATA;
-typedef struct _IMAGE_DEBUG_MISC {
-	DWORD DataType;
-	DWORD Length;
-	BOOLEAN Unicode;
-	BYTE Reserved[3];
-	BYTE Data[1];
-} IMAGE_DEBUG_MISC,*PIMAGE_DEBUG_MISC;
-typedef struct _IMAGE_FUNCTION_ENTRY {
-	DWORD StartingAddress;
-	DWORD EndingAddress;
-	DWORD EndOfPrologue;
-} IMAGE_FUNCTION_ENTRY,*PIMAGE_FUNCTION_ENTRY;
-typedef struct _IMAGE_SEPARATE_DEBUG_HEADER {
-	WORD Signature;
-	WORD Flags;
-	WORD Machine;
-	WORD Characteristics;
-	DWORD TimeDateStamp;
-	DWORD CheckSum;
-	DWORD ImageBase;
-	DWORD SizeOfImage;
-	DWORD NumberOfSections;
-	DWORD ExportedNamesSize;
-	DWORD DebugDirectorySize;
-	DWORD SectionAlignment;
-	DWORD Reserved[2];
-} IMAGE_SEPARATE_DEBUG_HEADER,*PIMAGE_SEPARATE_DEBUG_HEADER;
-#pragma pack(pop)
-typedef enum _CM_SERVICE_NODE_TYPE {
-	DriverType=SERVICE_KERNEL_DRIVER,
-	FileSystemType=SERVICE_FILE_SYSTEM_DRIVER,
-	Win32ServiceOwnProcess=SERVICE_WIN32_OWN_PROCESS,
-	Win32ServiceShareProcess=SERVICE_WIN32_SHARE_PROCESS,
-	AdapterType=SERVICE_ADAPTER,
-	RecognizerType=SERVICE_RECOGNIZER_DRIVER
-} SERVICE_NODE_TYPE;
-typedef enum _CM_SERVICE_LOAD_TYPE {
-	BootLoad=SERVICE_BOOT_START,
-	SystemLoad=SERVICE_SYSTEM_START,
-	AutoLoad=SERVICE_AUTO_START,
-	DemandLoad=SERVICE_DEMAND_START,
-	DisableLoad=SERVICE_DISABLED
-} SERVICE_LOAD_TYPE;
-typedef enum _CM_ERROR_CONTROL_TYPE {
-	IgnoreError=SERVICE_ERROR_IGNORE,
-	NormalError=SERVICE_ERROR_NORMAL,
-	SevereError=SERVICE_ERROR_SEVERE,
-	CriticalError=SERVICE_ERROR_CRITICAL
-} SERVICE_ERROR_TYPE;
-typedef struct _NT_TIB {
-	struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList;
-	PVOID StackBase;
-	PVOID StackLimit;
-	PVOID SubSystemTib;
-	_ANONYMOUS_UNION union {
-		PVOID FiberData;
-		DWORD Version;
-	} DUMMYUNIONNAME;
-	PVOID ArbitraryUserPointer;
-	struct _NT_TIB *Self;
-} NT_TIB,*PNT_TIB;
-typedef struct _REPARSE_DATA_BUFFER {
-	DWORD  ReparseTag;
-	WORD   ReparseDataLength;
-	WORD   Reserved;
-	_ANONYMOUS_UNION union {
-		struct {
-			WORD   SubstituteNameOffset;
-			WORD   SubstituteNameLength;
-			WORD   PrintNameOffset;
-			WORD   PrintNameLength;
-			WCHAR PathBuffer[1];
-		} SymbolicLinkReparseBuffer;
-		struct {
-			WORD   SubstituteNameOffset;
-			WORD   SubstituteNameLength;
-			WORD   PrintNameOffset;
-			WORD   PrintNameLength;
-			WCHAR PathBuffer[1];
-		} MountPointReparseBuffer;
-		struct {
-			BYTE   DataBuffer[1];
-		} GenericReparseBuffer;
-	} DUMMYUNIONNAME;
-} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
-typedef struct _REPARSE_GUID_DATA_BUFFER {
-	DWORD  ReparseTag;
-	WORD   ReparseDataLength;
-	WORD   Reserved;
-	GUID   ReparseGuid;
-	struct {
-		BYTE   DataBuffer[1];
-	} GenericReparseBuffer;
-} REPARSE_GUID_DATA_BUFFER, *PREPARSE_GUID_DATA_BUFFER;
-typedef struct _REPARSE_POINT_INFORMATION {
-	WORD   ReparseDataLength;
-	WORD   UnparsedNameLength;
-} REPARSE_POINT_INFORMATION, *PREPARSE_POINT_INFORMATION;
-
-typedef union _FILE_SEGMENT_ELEMENT {
-	PVOID64 Buffer;
-	ULONGLONG Alignment;
-}FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT;
-
-/* JOBOBJECT_BASIC_LIMIT_INFORMATION.LimitFlags constants */
-#define JOB_OBJECT_LIMIT_WORKINGSET                 0x0001
-#define JOB_OBJECT_LIMIT_PROCESS_TIME               0x0002
-#define JOB_OBJECT_LIMIT_JOB_TIME                   0x0004
-#define JOB_OBJECT_LIMIT_ACTIVE_PROCESS             0x0008
-#define JOB_OBJECT_LIMIT_AFFINITY                   0x0010
-#define JOB_OBJECT_LIMIT_PRIORITY_CLASS             0x0020
-#define JOB_OBJECT_LIMIT_PRESERVE_JOB_TIME          0x0040
-#define JOB_OBJECT_LIMIT_SCHEDULING_CLASS           0x0080
-#define JOB_OBJECT_LIMIT_PROCESS_MEMORY             0x0100
-#define JOB_OBJECT_LIMIT_JOB_MEMORY                 0x0200
-#define JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION 0x0400
-#define JOB_OBJECT_BREAKAWAY_OK                     0x0800
-#define JOB_OBJECT_SILENT_BREAKAWAY                 0x1000
-
-/* JOBOBJECT_BASIC_UI_RESTRICTIONS.UIRestrictionsClass constants */
-#define JOB_OBJECT_UILIMIT_HANDLES          0x0001
-#define JOB_OBJECT_UILIMIT_READCLIPBOARD    0x0002
-#define JOB_OBJECT_UILIMIT_WRITECLIPBOARD   0x0004
-#define JOB_OBJECT_UILIMIT_SYSTEMPARAMETERS 0x0008
-#define JOB_OBJECT_UILIMIT_DISPLAYSETTINGS  0x0010
-#define JOB_OBJECT_UILIMIT_GLOBALATOMS      0x0020
-#define JOB_OBJECT_UILIMIT_DESKTOP          0x0040
-#define JOB_OBJECT_UILIMIT_EXITWINDOWS      0x0080
-
-/* JOBOBJECT_SECURITY_LIMIT_INFORMATION.SecurityLimitFlags constants */
-#define JOB_OBJECT_SECURITY_NO_ADMIN          0x0001
-#define JOB_OBJECT_SECURITY_RESTRICTED_TOKEN  0x0002
-#define JOB_OBJECT_SECURITY_ONLY_TOKEN        0x0004
-#define JOB_OBJECT_SECURITY_FILTER_TOKENS     0x0008
-
-/* JOBOBJECT_END_OF_JOB_TIME_INFORMATION.EndOfJobTimeAction constants */
-#define JOB_OBJECT_TERMINATE_AT_END_OF_JOB  0
-#define JOB_OBJECT_POST_AT_END_OF_JOB       1
-
-#define JOB_OBJECT_MSG_END_OF_JOB_TIME        1
-#define JOB_OBJECT_MSG_END_OF_PROCESS_TIME    2
-#define JOB_OBJECT_MSG_ACTIVE_PROCESS_LIMIT   3
-#define JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO    4
-#define JOB_OBJECT_MSG_NEW_PROCESS            6
-#define JOB_OBJECT_MSG_EXIT_PROCESS           7
-#define JOB_OBJECT_MSG_ABNORMAL_EXIT_PROCESS  8
-#define JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT   9
-#define JOB_OBJECT_MSG_JOB_MEMORY_LIMIT       10
-
-typedef enum _JOBOBJECTINFOCLASS {
-	JobObjectBasicAccountingInformation = 1,
-	JobObjectBasicLimitInformation,
-	JobObjectBasicProcessIdList,
-	JobObjectBasicUIRestrictions,
-	JobObjectSecurityLimitInformation,
-	JobObjectEndOfJobTimeInformation,
-	JobObjectAssociateCompletionPortInformation,
-	JobObjectBasicAndIoAccountingInformation,
-	JobObjectExtendedLimitInformation,
-	JobObjectJobSetInformation,
-	MaxJobObjectInfoClass
-} JOBOBJECTINFOCLASS;
-typedef struct _JOBOBJECT_BASIC_ACCOUNTING_INFORMATION {
-	LARGE_INTEGER TotalUserTime;
-	LARGE_INTEGER TotalKernelTime;
-	LARGE_INTEGER ThisPeriodTotalUserTime;
-	LARGE_INTEGER ThisPeriodTotalKernelTime;
-	DWORD TotalPageFaultCount;
-	DWORD TotalProcesses;
-	DWORD ActiveProcesses;
-	DWORD TotalTerminatedProcesses;
-} JOBOBJECT_BASIC_ACCOUNTING_INFORMATION,*PJOBOBJECT_BASIC_ACCOUNTING_INFORMATION;
-typedef struct _JOBOBJECT_BASIC_LIMIT_INFORMATION {
-	LARGE_INTEGER PerProcessUserTimeLimit;
-	LARGE_INTEGER PerJobUserTimeLimit;
-	DWORD LimitFlags;
-	SIZE_T MinimumWorkingSetSize;
-	SIZE_T MaximumWorkingSetSize;
-	DWORD ActiveProcessLimit;
-	ULONG_PTR Affinity;
-	DWORD PriorityClass;
-	DWORD SchedulingClass;
-} JOBOBJECT_BASIC_LIMIT_INFORMATION,*PJOBOBJECT_BASIC_LIMIT_INFORMATION;
-typedef struct _JOBOBJECT_BASIC_PROCESS_ID_LIST {
-	DWORD NumberOfAssignedProcesses;
-	DWORD NumberOfProcessIdsInList;
-	ULONG_PTR ProcessIdList[1];
-} JOBOBJECT_BASIC_PROCESS_ID_LIST, *PJOBOBJECT_BASIC_PROCESS_ID_LIST;
-typedef struct _JOBOBJECT_BASIC_UI_RESTRICTIONS {
-	DWORD UIRestrictionsClass;
-} JOBOBJECT_BASIC_UI_RESTRICTIONS,*PJOBOBJECT_BASIC_UI_RESTRICTIONS;
-typedef struct _JOBOBJECT_SECURITY_LIMIT_INFORMATION {
-	DWORD SecurityLimitFlags;
-	HANDLE JobToken;
-	PTOKEN_GROUPS SidsToDisable;
-	PTOKEN_PRIVILEGES PrivilegesToDelete;
-	PTOKEN_GROUPS RestrictedSids;
-} JOBOBJECT_SECURITY_LIMIT_INFORMATION,*PJOBOBJECT_SECURITY_LIMIT_INFORMATION;
-typedef struct _JOBOBJECT_END_OF_JOB_TIME_INFORMATION {
-	DWORD EndOfJobTimeAction;
-} JOBOBJECT_END_OF_JOB_TIME_INFORMATION,*PJOBOBJECT_END_OF_JOB_TIME_INFORMATION;
-typedef struct _JOBOBJECT_ASSOCIATE_COMPLETION_PORT {
-	PVOID CompletionKey;
-	HANDLE CompletionPort;
-} JOBOBJECT_ASSOCIATE_COMPLETION_PORT,*PJOBOBJECT_ASSOCIATE_COMPLETION_PORT;
-typedef struct _JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION {
-	JOBOBJECT_BASIC_ACCOUNTING_INFORMATION BasicInfo;
-	IO_COUNTERS IoInfo;
-} JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION,*PJOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION;
-typedef struct _JOBOBJECT_EXTENDED_LIMIT_INFORMATION {
-	JOBOBJECT_BASIC_LIMIT_INFORMATION BasicLimitInformation;
-	IO_COUNTERS IoInfo;
-	SIZE_T ProcessMemoryLimit;
-	SIZE_T JobMemoryLimit;
-	SIZE_T PeakProcessMemoryUsed;
-	SIZE_T PeakJobMemoryUsed;
-} JOBOBJECT_EXTENDED_LIMIT_INFORMATION,*PJOBOBJECT_EXTENDED_LIMIT_INFORMATION;
-typedef struct _JOBOBJECT_JOBSET_INFORMATION {
-	DWORD MemberLevel;
-} JOBOBJECT_JOBSET_INFORMATION,*PJOBOBJECT_JOBSET_INFORMATION;
-
-/* Fixme: Making these defines conditional on WINVER will break ddk includes */ 
-#if 1 /* (WINVER >= 0x0500) */
-#include <pshpack4.h>
-
-#define ES_SYSTEM_REQUIRED                0x00000001
-#define ES_DISPLAY_REQUIRED               0x00000002
-#define ES_USER_PRESENT                   0x00000004
-#define ES_CONTINUOUS                     0x80000000
-
-typedef enum _LATENCY_TIME {
-	LT_DONT_CARE,
-	LT_LOWEST_LATENCY
-} LATENCY_TIME, *PLATENCY_TIME;
-
-typedef enum _SYSTEM_POWER_STATE {
-	PowerSystemUnspecified,
-	PowerSystemWorking,
-	PowerSystemSleeping1,
-	PowerSystemSleeping2,
-	PowerSystemSleeping3,
-	PowerSystemHibernate,
-	PowerSystemShutdown,
-	PowerSystemMaximum
-} SYSTEM_POWER_STATE, *PSYSTEM_POWER_STATE;
-#define POWER_SYSTEM_MAXIMUM PowerSystemMaximum
-
-typedef enum {
-	PowerActionNone,
-	PowerActionReserved,
-	PowerActionSleep,
-	PowerActionHibernate,
-	PowerActionShutdown,
-	PowerActionShutdownReset,
-	PowerActionShutdownOff,
-	PowerActionWarmEject
-} POWER_ACTION, *PPOWER_ACTION;
-
-typedef enum _DEVICE_POWER_STATE {
-	PowerDeviceUnspecified,
-	PowerDeviceD0,
-	PowerDeviceD1,
-	PowerDeviceD2,
-	PowerDeviceD3,
-	PowerDeviceMaximum
-} DEVICE_POWER_STATE, *PDEVICE_POWER_STATE;
-
-typedef struct {
-	DWORD  Granularity;
-	DWORD  Capacity;
-} BATTERY_REPORTING_SCALE, *PBATTERY_REPORTING_SCALE;
-
-typedef struct _POWER_ACTION_POLICY {
-	POWER_ACTION  Action;
-	ULONG  Flags;
-	ULONG  EventCode;
-} POWER_ACTION_POLICY, *PPOWER_ACTION_POLICY;
-
-/* POWER_ACTION_POLICY.Flags constants */
-#define POWER_ACTION_QUERY_ALLOWED        0x00000001
-#define POWER_ACTION_UI_ALLOWED           0x00000002
-#define POWER_ACTION_OVERRIDE_APPS        0x00000004
-#define POWER_ACTION_LIGHTEST_FIRST       0x10000000
-#define POWER_ACTION_LOCK_CONSOLE         0x20000000
-#define POWER_ACTION_DISABLE_WAKES        0x40000000
-#define POWER_ACTION_CRITICAL             0x80000000
-
-/* POWER_ACTION_POLICY.EventCode constants */
-#define POWER_LEVEL_USER_NOTIFY_TEXT      0x00000001
-#define POWER_LEVEL_USER_NOTIFY_SOUND     0x00000002
-#define POWER_LEVEL_USER_NOTIFY_EXEC      0x00000004
-#define POWER_USER_NOTIFY_BUTTON          0x00000008
-#define POWER_USER_NOTIFY_SHUTDOWN        0x00000010
-#define POWER_FORCE_TRIGGER_RESET         0x80000000
-
-#define DISCHARGE_POLICY_CRITICAL	0
-#define DISCHARGE_POLICY_LOW		1
-#define NUM_DISCHARGE_POLICIES		4
-
-#define PO_THROTTLE_NONE	0
-#define PO_THROTTLE_CONSTANT	1
-#define PO_THROTTLE_DEGRADE	2
-#define PO_THROTTLE_ADAPTIVE	3
-#define PO_THROTTLE_MAXIMUM	4
-
-typedef struct _SYSTEM_POWER_LEVEL {
-	BOOLEAN  Enable;
-	UCHAR  Spare[3];
-	ULONG  BatteryLevel;
-	POWER_ACTION_POLICY  PowerPolicy;
-	SYSTEM_POWER_STATE  MinSystemState;
-} SYSTEM_POWER_LEVEL, *PSYSTEM_POWER_LEVEL;
-
-typedef struct _SYSTEM_POWER_POLICY {
-	ULONG  Revision;
-	POWER_ACTION_POLICY  PowerButton;
-	POWER_ACTION_POLICY  SleepButton;
-	POWER_ACTION_POLICY  LidClose;
-	SYSTEM_POWER_STATE  LidOpenWake;
-	ULONG  Reserved;
-	POWER_ACTION_POLICY  Idle;
-	ULONG  IdleTimeout;
-	UCHAR  IdleSensitivity;
-	UCHAR  DynamicThrottle;
-	UCHAR  Spare2[2];
-	SYSTEM_POWER_STATE  MinSleep;
-	SYSTEM_POWER_STATE  MaxSleep;
-	SYSTEM_POWER_STATE  ReducedLatencySleep;
-	ULONG  WinLogonFlags;
-	ULONG  Spare3;
-	ULONG  DozeS4Timeout;
-	ULONG  BroadcastCapacityResolution;
-	SYSTEM_POWER_LEVEL  DischargePolicy[NUM_DISCHARGE_POLICIES];
-	ULONG  VideoTimeout;
-	BOOLEAN  VideoDimDisplay;
-	ULONG  VideoReserved[3];
-	ULONG  SpindownTimeout;
-	BOOLEAN  OptimizeForPower;
-	UCHAR  FanThrottleTolerance;
-	UCHAR  ForcedThrottle;
-	UCHAR  MinThrottle;
-	POWER_ACTION_POLICY  OverThrottled;
-} SYSTEM_POWER_POLICY, *PSYSTEM_POWER_POLICY;
-
-typedef struct _SYSTEM_POWER_CAPABILITIES {
-	BOOLEAN  PowerButtonPresent;
-	BOOLEAN  SleepButtonPresent;
-	BOOLEAN  LidPresent;
-	BOOLEAN  SystemS1;
-	BOOLEAN  SystemS2;
-	BOOLEAN  SystemS3;
-	BOOLEAN  SystemS4;
-	BOOLEAN  SystemS5;
-	BOOLEAN  HiberFilePresent;
-	BOOLEAN  FullWake;
-	BOOLEAN  VideoDimPresent;
-	BOOLEAN  ApmPresent;
-	BOOLEAN  UpsPresent;
-	BOOLEAN  ThermalControl;
-	BOOLEAN  ProcessorThrottle;
-	UCHAR  ProcessorMinThrottle;
-	UCHAR  ProcessorMaxThrottle;
-	UCHAR  spare2[4];
-	BOOLEAN  DiskSpinDown;
-	UCHAR  spare3[8];
-	BOOLEAN  SystemBatteriesPresent;
-	BOOLEAN  BatteriesAreShortTerm;
-	BATTERY_REPORTING_SCALE  BatteryScale[3];
-	SYSTEM_POWER_STATE  AcOnLineWake;
-	SYSTEM_POWER_STATE  SoftLidWake;
-	SYSTEM_POWER_STATE  RtcWake;
-	SYSTEM_POWER_STATE  MinDeviceWakeState;
-	SYSTEM_POWER_STATE  DefaultLowLatencyWake;
-} SYSTEM_POWER_CAPABILITIES, *PSYSTEM_POWER_CAPABILITIES;
-
-typedef struct _SYSTEM_BATTERY_STATE {
-	BOOLEAN  AcOnLine;
-	BOOLEAN  BatteryPresent;
-	BOOLEAN  Charging;
-	BOOLEAN  Discharging;
-	BOOLEAN  Spare1[4];
-	ULONG  MaxCapacity;
-	ULONG  RemainingCapacity;
-	ULONG  Rate;
-	ULONG  EstimatedTime;
-	ULONG  DefaultAlert1;
-	ULONG  DefaultAlert2;
-} SYSTEM_BATTERY_STATE, *PSYSTEM_BATTERY_STATE;
-
-typedef enum _POWER_INFORMATION_LEVEL {
-	SystemPowerPolicyAc,
-	SystemPowerPolicyDc,
-	VerifySystemPolicyAc,
-	VerifySystemPolicyDc,
-	SystemPowerCapabilities,
-	SystemBatteryState,
-	SystemPowerStateHandler,
-	ProcessorStateHandler,
-	SystemPowerPolicyCurrent,
-	AdministratorPowerPolicy,
-	SystemReserveHiberFile,
-	ProcessorInformation,
-	SystemPowerInformation,
-	ProcessorStateHandler2,
-	LastWakeTime,
-	LastSleepTime,
-	SystemExecutionState,
-	SystemPowerStateNotifyHandler,
-	ProcessorPowerPolicyAc,
-	ProcessorPowerPolicyDc,
-	VerifyProcessorPowerPolicyAc,
-	VerifyProcessorPowerPolicyDc,
-	ProcessorPowerPolicyCurrent
-} POWER_INFORMATION_LEVEL;
-
-#if (_WIN32_WINNT >= 0x0500)
-typedef LONG (WINAPI *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS);
-#endif
-#if 1 /* (WIN32_WINNT >= 0x0500) */
-typedef struct _SYSTEM_POWER_INFORMATION {
-	ULONG  MaxIdlenessAllowed;
-	ULONG  Idleness;
-	ULONG  TimeRemaining;
-	UCHAR  CoolingMode;
-} SYSTEM_POWER_INFORMATION,*PSYSTEM_POWER_INFORMATION;
-#endif
-
-#if (_WIN32_WINNT >= 0x0501)
-typedef enum _HEAP_INFORMATION_CLASS {
-	HeapCompatibilityInformation
-} HEAP_INFORMATION_CLASS;
-typedef enum _ACTIVATION_CONTEXT_INFO_CLASS {
-	ActivationContextBasicInformation = 1,
-	ActivationContextDetailedInformation,
-	AssemblyDetailedInformationInActivationContext,
-	FileInformationInAssemblyOfAssemblyInActivationContext
-} ACTIVATION_CONTEXT_INFO_CLASS;
-typedef struct _ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION {
-	DWORD ulFlags;
-	DWORD ulEncodedAssemblyIdentityLength;
-	DWORD ulManifestPathType;
-	DWORD ulManifestPathLength;
-	LARGE_INTEGER liManifestLastWriteTime;
-	DWORD ulPolicyPathType;
-	DWORD ulPolicyPathLength;
-	LARGE_INTEGER liPolicyLastWriteTime;
-	DWORD ulMetadataSatelliteRosterIndex;
-	DWORD ulManifestVersionMajor;
-	DWORD ulManifestVersionMinor;
-	DWORD ulPolicyVersionMajor;
-	DWORD ulPolicyVersionMinor;
-	DWORD ulAssemblyDirectoryNameLength;
-	PCWSTR lpAssemblyEncodedAssemblyIdentity;
-	PCWSTR lpAssemblyManifestPath;
-	PCWSTR lpAssemblyPolicyPath;
-	PCWSTR lpAssemblyDirectoryName;
-} ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION,*PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;
-typedef const ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *PCACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;
-typedef struct _ACTIVATION_CONTEXT_DETAILED_INFORMATION {
-	DWORD dwFlags;
-	DWORD ulFormatVersion;
-	DWORD ulAssemblyCount;
-	DWORD ulRootManifestPathType;
-	DWORD ulRootManifestPathChars;
-	DWORD ulRootConfigurationPathType;
-	DWORD ulRootConfigurationPathChars;
-	DWORD ulAppDirPathType;
-	DWORD ulAppDirPathChars;
-	PCWSTR lpRootManifestPath;
-	PCWSTR lpRootConfigurationPath;
-	PCWSTR lpAppDirPath;
-} ACTIVATION_CONTEXT_DETAILED_INFORMATION,*PACTIVATION_CONTEXT_DETAILED_INFORMATION;
-typedef const ACTIVATION_CONTEXT_DETAILED_INFORMATION *PCACTIVATION_CONTEXT_DETAILED_INFORMATION;
-typedef struct _ACTIVATION_CONTEXT_QUERY_INDEX {
-	ULONG ulAssemblyIndex;
-	ULONG ulFileIndexInAssembly;
-} ACTIVATION_CONTEXT_QUERY_INDEX,*PACTIVATION_CONTEXT_QUERY_INDEX;
-typedef const ACTIVATION_CONTEXT_QUERY_INDEX *PCACTIVATION_CONTEXT_QUERY_INDEX;
-typedef struct _ASSEMBLY_FILE_DETAILED_INFORMATION {
-	DWORD ulFlags;
-	DWORD ulFilenameLength;
-	DWORD ulPathLength;
-	PCWSTR lpFileName;
-	PCWSTR lpFilePath;
-} ASSEMBLY_FILE_DETAILED_INFORMATION,*PASSEMBLY_FILE_DETAILED_INFORMATION;
-typedef const ASSEMBLY_FILE_DETAILED_INFORMATION *PCASSEMBLY_FILE_DETAILED_INFORMATION;
-#endif /* (WIN32_WINNT >= 0x0501) */
-
-typedef struct _PROCESSOR_POWER_POLICY_INFO {
-	ULONG  TimeCheck;
-	ULONG  DemoteLimit;
-	ULONG  PromoteLimit;
-	UCHAR  DemotePercent;
-	UCHAR  PromotePercent;
-	UCHAR  Spare[2];
-	ULONG  AllowDemotion : 1;
-	ULONG  AllowPromotion : 1;
-	ULONG  Reserved : 30;
-} PROCESSOR_POWER_POLICY_INFO, *PPROCESSOR_POWER_POLICY_INFO;
-typedef struct _PROCESSOR_POWER_POLICY {
-	ULONG  Revision;
-	UCHAR  DynamicThrottle;
-	UCHAR  Spare[3];
-	ULONG  Reserved;
-	ULONG  PolicyCount;
-	PROCESSOR_POWER_POLICY_INFO  Policy[3];
-} PROCESSOR_POWER_POLICY, *PPROCESSOR_POWER_POLICY;
-typedef struct _ADMINISTRATOR_POWER_POLICY {
-	SYSTEM_POWER_STATE  MinSleep;
-	SYSTEM_POWER_STATE  MaxSleep;
-	ULONG  MinVideoTimeout;
-	ULONG  MaxVideoTimeout;
-	ULONG  MinSpindownTimeout;
-	ULONG  MaxSpindownTimeout;
-} ADMINISTRATOR_POWER_POLICY, *PADMINISTRATOR_POWER_POLICY;
-#include <poppack.h>
-#endif /* WINVER >= 0x0500 */
-
-typedef VOID (NTAPI *WAITORTIMERCALLBACKFUNC)(PVOID,BOOLEAN);
-
-#ifdef UNICODE
-typedef OSVERSIONINFOW OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO;
-typedef OSVERSIONINFOEXW OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX;
-#else
-typedef OSVERSIONINFOA OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO;
-typedef OSVERSIONINFOEXA OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX;
-#endif
-
-#if (WIN32_WINNT >= 0x0500)
-ULONGLONG WINAPI VerSetConditionMask(ULONGLONG,DWORD,BYTE);
-#endif
-
-#if defined(__GNUC__)
-
-PVOID GetCurrentFiber(void);
-extern __inline__ PVOID GetCurrentFiber(void)
-{
-    void* ret;
-    __asm__ __volatile__ (
-	"movl	%%fs:0x10,%0"
-	: "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */
-	);
-    return ret;
-}
-
-PVOID GetFiberData(void);
-extern __inline__ PVOID GetFiberData(void)
-{
-    void* ret;
-    __asm__ __volatile__ (
-	"movl	%%fs:0x10,%0\n"
-	"movl	(%0),%0"
-	: "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */
-	);
-    return ret;
-}
-
-#else
-
-extern PVOID GetCurrentFiber(void);
-#pragma aux GetCurrentFiber = \
-        "mov	eax, dword ptr fs:0x10" \
-        value [eax] \
-        modify [eax];
-
-extern PVOID GetFiberData(void);
-#pragma aux GetFiberData = \
-	"mov	eax, dword ptr fs:0x10" \
-	"mov	eax, [eax]" \
-        value [eax] \
-        modify [eax];
-        
-#endif /* __GNUC__ */
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/winperf.h b/winsup/w32api/include/winperf.h
deleted file mode 100644
index 75e29a8ec..000000000
--- a/winsup/w32api/include/winperf.h
+++ /dev/null
@@ -1,139 +0,0 @@
-#ifndef _WINPERF_H
-#define _WINPERF_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define PERF_DATA_VERSION 1
-#define PERF_DATA_REVISION 1
-#define PERF_NO_INSTANCES -1 
-#define PERF_SIZE_DWORD 0
-#define PERF_SIZE_LARGE 256
-#define PERF_SIZE_ZERO 512
-#define PERF_SIZE_VARIABLE_LEN 768
-#define PERF_TYPE_NUMBER 0
-#define PERF_TYPE_COUNTER 1024
-#define PERF_TYPE_TEXT 2048
-#define PERF_TYPE_ZERO 0xC00
-#define PERF_NUMBER_HEX 0
-#define PERF_NUMBER_DECIMAL 0x10000
-#define PERF_NUMBER_DEC_1000 0x20000
-#define PERF_COUNTER_VALUE 0
-#define PERF_COUNTER_RATE 0x10000
-#define PERF_COUNTER_FRACTION 0x20000
-#define PERF_COUNTER_BASE 0x30000
-#define PERF_COUNTER_ELAPSED 0x40000
-#define PERF_COUNTER_QUEUELEN 0x50000
-#define PERF_COUNTER_HISTOGRAM 0x60000
-#define PERF_TEXT_UNICODE 0
-#define PERF_TEXT_ASCII 0x10000
-#define PERF_TIMER_TICK 0
-#define PERF_TIMER_100NS 0x100000
-#define PERF_OBJECT_TIMER 0x200000
-#define PERF_DELTA_COUNTER 0x400000
-#define PERF_DELTA_BASE 0x800000
-#define PERF_INVERSE_COUNTER 0x1000000
-#define PERF_MULTI_COUNTER 0x2000000
-#define PERF_DISPLAY_NO_SUFFIX 0
-#define PERF_DISPLAY_PER_SEC 0x10000000
-#define PERF_DISPLAY_PERCENT 0x20000000
-#define PERF_DISPLAY_SECONDS 0x30000000
-#define PERF_DISPLAY_NOSHOW 0x40000000
-#define PERF_COUNTER_HISTOGRAM_TYPE 0x80000000
-#define PERF_NO_UNIQUE_ID (-1)
-#define PERF_DETAIL_NOVICE 100
-#define PERF_DETAIL_ADVANCED 200
-#define PERF_DETAIL_EXPERT 300
-#define PERF_DETAIL_WIZARD 400
-#define PERF_COUNTER_COUNTER (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_TICK|PERF_DELTA_COUNTER|PERF_DISPLAY_PER_SEC)
-#define PERF_COUNTER_TIMER (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_TICK|PERF_DELTA_COUNTER|PERF_DISPLAY_PERCENT)
-#define PERF_COUNTER_QUEUELEN_TYPE (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_QUEUELEN|PERF_TIMER_TICK|PERF_DELTA_COUNTER|PERF_DISPLAY_NO_SUFFIX)
-#define PERF_COUNTER_BULK_COUNT (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_TICK|PERF_DELTA_COUNTER|PERF_DISPLAY_PER_SEC)
-#define PERF_COUNTER_TEXT (PERF_SIZE_VARIABLE_LEN|PERF_TYPE_TEXT|PERF_TEXT_UNICODE|PERF_DISPLAY_NO_SUFFIX)
-#define PERF_COUNTER_RAWCOUNT (PERF_SIZE_DWORD|PERF_TYPE_NUMBER|PERF_NUMBER_DECIMAL|PERF_DISPLAY_NO_SUFFIX)
-#define PERF_COUNTER_LARGE_RAWCOUNT (PERF_SIZE_LARGE|PERF_TYPE_NUMBER|PERF_NUMBER_DECIMAL|PERF_DISPLAY_NO_SUFFIX)
-#define PERF_COUNTER_RAWCOUNT_HEX (PERF_SIZE_DWORD|PERF_TYPE_NUMBER|PERF_NUMBER_HEX|PERF_DISPLAY_NO_SUFFIX)
-#define PERF_COUNTER_LARGE_RAWCOUNT_HEX (PERF_SIZE_LARGE|PERF_TYPE_NUMBER|PERF_NUMBER_HEX|PERF_DISPLAY_NO_SUFFIX)
-#define PERF_SAMPLE_FRACTION (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_FRACTION|PERF_DELTA_COUNTER|PERF_DELTA_BASE|PERF_DISPLAY_PERCENT)
-#define PERF_SAMPLE_COUNTER (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_TICK|PERF_DELTA_COUNTER|PERF_DISPLAY_NO_SUFFIX)
-#define PERF_COUNTER_NODATA (PERF_SIZE_ZERO|PERF_DISPLAY_NOSHOW)
-#define PERF_COUNTER_TIMER_INV (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_TICK|PERF_DELTA_COUNTER|PERF_INVERSE_COUNTER|PERF_DISPLAY_PERCENT)
-#define PERF_SAMPLE_BASE (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_BASE|PERF_DISPLAY_NOSHOW|1) 
-#define PERF_AVERAGE_TIMER (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_FRACTION|PERF_DISPLAY_SECONDS)
-#define PERF_AVERAGE_BASE (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_BASE|PERF_DISPLAY_NOSHOW|2) 
-#define PERF_AVERAGE_BULK (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_FRACTION|PERF_DISPLAY_NOSHOW)
-#define PERF_100NSEC_TIMER (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_100NS|PERF_DELTA_COUNTER|PERF_DISPLAY_PERCENT)
-#define PERF_100NSEC_TIMER_INV (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_100NS|PERF_DELTA_COUNTER|PERF_INVERSE_COUNTER|PERF_DISPLAY_PERCENT)
-#define PERF_COUNTER_MULTI_TIMER (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_DELTA_COUNTER|PERF_TIMER_TICK|PERF_MULTI_COUNTER|PERF_DISPLAY_PERCENT)
-#define PERF_COUNTER_MULTI_TIMER_INV (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_RATE|PERF_DELTA_COUNTER|PERF_MULTI_COUNTER|PERF_TIMER_TICK|PERF_INVERSE_COUNTER|PERF_DISPLAY_PERCENT)
-#define PERF_COUNTER_MULTI_BASE (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_BASE|PERF_MULTI_COUNTER|PERF_DISPLAY_NOSHOW)
-#define PERF_100NSEC_MULTI_TIMER (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_DELTA_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_100NS|PERF_MULTI_COUNTER|PERF_DISPLAY_PERCENT)
-#define PERF_100NSEC_MULTI_TIMER_INV (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_DELTA_COUNTER|PERF_COUNTER_RATE|PERF_TIMER_100NS|PERF_MULTI_COUNTER|PERF_INVERSE_COUNTER|PERF_DISPLAY_PERCENT)
-#define PERF_RAW_FRACTION (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_FRACTION|PERF_DISPLAY_PERCENT)
-#define PERF_RAW_BASE (PERF_SIZE_DWORD|PERF_TYPE_COUNTER|PERF_COUNTER_BASE|PERF_DISPLAY_NOSHOW|3)
-#define PERF_ELAPSED_TIME (PERF_SIZE_LARGE|PERF_TYPE_COUNTER|PERF_COUNTER_ELAPSED|PERF_OBJECT_TIMER|PERF_DISPLAY_SECONDS)
-typedef struct _PERF_DATA_BLOCK {
-	WCHAR Signature[4];
-	DWORD LittleEndian;
-	DWORD Version;
-	DWORD Revision;
-	DWORD TotalByteLength;
-	DWORD HeaderLength;
-	DWORD NumObjectTypes;
-	LONG DefaultObject;
-	SYSTEMTIME SystemTime;
-	LARGE_INTEGER PerfTime;
-	LARGE_INTEGER PerfFreq;
-	LARGE_INTEGER PerfTime100nSec;
-	DWORD SystemNameLength;
-	DWORD SystemNameOffset;
-} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK;
-typedef struct _PERF_OBJECT_TYPE {
-	DWORD TotalByteLength;
-	DWORD DefinitionLength;
-	DWORD HeaderLength;
-	DWORD ObjectNameTitleIndex;
-	LPWSTR ObjectNameTitle;
-	DWORD ObjectHelpTitleIndex;
-	LPWSTR ObjectHelpTitle;
-	DWORD DetailLevel;
-	DWORD NumCounters;
-	LONG DefaultCounter;
-	LONG NumInstances;
-	DWORD CodePage;
-	LARGE_INTEGER PerfTime;
-	LARGE_INTEGER PerfFreq;
-} PERF_OBJECT_TYPE, *PPERF_OBJECT_TYPE;
-typedef struct _PERF_COUNTER_DEFINITION {
-	DWORD ByteLength;
-	DWORD CounterNameTitleIndex;
-	LPWSTR CounterNameTitle;
-	DWORD CounterHelpTitleIndex;
-	LPWSTR CounterHelpTitle;
-	LONG DefaultScale;
-	DWORD DetailLevel;
-	DWORD CounterType;
-	DWORD CounterSize;
-	DWORD CounterOffset;
-} PERF_COUNTER_DEFINITION,*PPERF_COUNTER_DEFINITION;
-typedef struct _PERF_INSTANCE_DEFINITION {
-	DWORD ByteLength;
-	DWORD ParentObjectTitleIndex;
-	DWORD ParentObjectInstance;
-	LONG UniqueID;
-	DWORD NameOffset;
-	DWORD NameLength;
-} PERF_INSTANCE_DEFINITION,*PPERF_INSTANCE_DEFINITION;
-typedef struct _PERF_COUNTER_BLOCK {
-	DWORD ByteLength;
-} PERF_COUNTER_BLOCK, *PPERF_COUNTER_BLOCK;
-typedef DWORD(CALLBACK PM_OPEN_PROC)(LPWSTR);
-typedef DWORD(CALLBACK PM_COLLECT_PROC)(LPWSTR,PVOID*,PDWORD,PDWORD);
-typedef DWORD(CALLBACK PM_CLOSE_PROC)(void);
-#ifdef __cplusplus
-}
-#endif
-#endif 
diff --git a/winsup/w32api/include/winreg.h b/winsup/w32api/include/winreg.h
deleted file mode 100644
index c82adf5d7..000000000
--- a/winsup/w32api/include/winreg.h
+++ /dev/null
@@ -1,161 +0,0 @@
-#ifndef _WINREG_H
-#define _WINREG_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define HKEY_CLASSES_ROOT	((HKEY)0x80000000)
-#define HKEY_CURRENT_USER	((HKEY)0x80000001)
-#define HKEY_LOCAL_MACHINE	((HKEY)0x80000002)
-#define HKEY_USERS	((HKEY)0x80000003)
-#define HKEY_PERFORMANCE_DATA	((HKEY)0x80000004)
-#define HKEY_CURRENT_CONFIG	((HKEY)0x80000005)
-#define HKEY_DYN_DATA	((HKEY)0x80000006)
-#define REG_OPTION_VOLATILE 1
-#define REG_OPTION_NON_VOLATILE 0
-#define REG_CREATED_NEW_KEY 1
-#define REG_OPENED_EXISTING_KEY 2
-#define REG_NONE 0
-#define REG_SZ 1
-#define REG_EXPAND_SZ 2
-#define REG_BINARY 3
-#define REG_DWORD_LITTLE_ENDIAN 4
-#define REG_DWORD 4
-#define REG_DWORD_BIG_ENDIAN 5
-#define REG_LINK 6
-#define REG_MULTI_SZ 7
-#define REG_RESOURCE_LIST 8
-#define REG_FULL_RESOURCE_DESCRIPTOR 9
-#define REG_RESOURCE_REQUIREMENTS_LIST 10
-#define REG_QWORD_LITTLE_ENDIAN 11
-#define REG_QWORD 11
-#define REG_NOTIFY_CHANGE_NAME 1
-#define REG_NOTIFY_CHANGE_ATTRIBUTES 2
-#define REG_NOTIFY_CHANGE_LAST_SET 4
-#define REG_NOTIFY_CHANGE_SECURITY 8
-
-#ifndef RC_INVOKED
-typedef ACCESS_MASK REGSAM;
-typedef struct value_entA {
-	LPSTR ve_valuename;
-	DWORD ve_valuelen;
-	DWORD ve_valueptr;
-	DWORD ve_type;
-} VALENTA,*PVALENTA;
-typedef struct value_entW {
-	LPWSTR ve_valuename;
-	DWORD ve_valuelen;
-	DWORD ve_valueptr;
-	DWORD ve_type;
-} VALENTW,*PVALENTW;
-BOOL WINAPI AbortSystemShutdownA(LPCSTR);
-BOOL WINAPI AbortSystemShutdownW(LPCWSTR);
-BOOL WINAPI InitiateSystemShutdownA(LPSTR,LPSTR,DWORD,BOOL,BOOL);
-BOOL WINAPI InitiateSystemShutdownW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL);
-LONG WINAPI RegCloseKey(HKEY);
-LONG WINAPI RegConnectRegistryA(LPCSTR,HKEY,PHKEY);
-LONG WINAPI RegConnectRegistryW(LPCWSTR,HKEY,PHKEY);
-LONG WINAPI RegCreateKeyA(HKEY,LPCSTR,PHKEY);
-LONG WINAPI RegCreateKeyExA(HKEY,LPCSTR,DWORD,LPSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,PDWORD);
-LONG WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM,LPSECURITY_ATTRIBUTES,PHKEY,PDWORD);
-LONG WINAPI RegCreateKeyW(HKEY,LPCWSTR,PHKEY);
-LONG WINAPI RegDeleteKeyA(HKEY,LPCSTR);
-LONG WINAPI RegDeleteKeyW(HKEY,LPCWSTR);
-LONG WINAPI RegDeleteValueA(HKEY,LPCSTR);
-LONG WINAPI RegDeleteValueW(HKEY,LPCWSTR);
-LONG WINAPI RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD);
-LONG WINAPI RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD);
-LONG WINAPI RegEnumKeyExA(HKEY,DWORD,LPSTR,PDWORD,PDWORD,LPSTR,PDWORD,PFILETIME);
-LONG WINAPI RegEnumKeyExW(HKEY,DWORD,LPWSTR,PDWORD,PDWORD,LPWSTR,PDWORD,PFILETIME);
-LONG WINAPI RegEnumValueA(HKEY,DWORD,LPSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD);
-LONG WINAPI RegEnumValueW(HKEY,DWORD,LPWSTR,PDWORD,PDWORD,PDWORD,LPBYTE,PDWORD);
-LONG WINAPI RegFlushKey(HKEY);
-LONG WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PDWORD);
-LONG WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR);
-LONG WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR);
-LONG WINAPI RegNotifyChangeKeyValue(HKEY,BOOL,DWORD,HANDLE,BOOL);
-LONG WINAPI RegOpenKeyA(HKEY,LPCSTR,PHKEY);
-LONG WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,PHKEY);
-LONG WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY);
-LONG WINAPI RegOpenKeyW(HKEY,LPCWSTR,PHKEY);
-LONG WINAPI RegQueryInfoKeyA(HKEY,LPSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME);
-LONG WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PFILETIME);
-LONG WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD);
-LONG WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD);
-LONG WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,PLONG);
-LONG WINAPI RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-LONG WINAPI RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
-LONG WINAPI RegQueryValueW(HKEY,LPCWSTR,LPWSTR,PLONG);
-LONG WINAPI RegReplaceKeyA(HKEY,LPCSTR,LPCSTR,LPCSTR);
-LONG WINAPI RegReplaceKeyW(HKEY,LPCWSTR,LPCWSTR,LPCWSTR);
-LONG WINAPI RegRestoreKeyA(HKEY,LPCSTR,DWORD);
-LONG WINAPI RegRestoreKeyW(HKEY,LPCWSTR,DWORD);
-LONG WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES);
-LONG WINAPI RegSaveKeyW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES);
-LONG WINAPI RegSetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-LONG WINAPI RegSetValueA(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
-LONG WINAPI RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,const BYTE*,DWORD);
-LONG WINAPI RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,const BYTE*,DWORD);
-LONG WINAPI RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD);
-LONG WINAPI RegUnLoadKeyA(HKEY,LPCSTR);
-LONG WINAPI RegUnLoadKeyW(HKEY,LPCWSTR);
-
-#ifdef UNICODE
-typedef VALENTW VALENT,*PVALENT;
-#define AbortSystemShutdown AbortSystemShutdownW
-#define InitiateSystemShutdown InitiateSystemShutdownW
-#define RegConnectRegistry RegConnectRegistryW
-#define RegCreateKey RegCreateKeyW
-#define RegCreateKeyEx RegCreateKeyExW
-#define RegDeleteKey RegDeleteKeyW
-#define RegDeleteValue RegDeleteValueW
-#define RegEnumKey RegEnumKeyW
-#define RegEnumKeyEx RegEnumKeyExW
-#define RegEnumValue RegEnumValueW
-#define RegLoadKey RegLoadKeyW
-#define RegOpenKey RegOpenKeyW
-#define RegOpenKeyEx RegOpenKeyExW
-#define RegQueryInfoKey RegQueryInfoKeyW
-#define RegQueryMultipleValues RegQueryMultipleValuesW
-#define RegQueryValue RegQueryValueW
-#define RegQueryValueEx RegQueryValueExW
-#define RegReplaceKey RegReplaceKeyW
-#define RegRestoreKey RegRestoreKeyW
-#define RegSaveKey RegSaveKeyW
-#define RegSetValue RegSetValueW
-#define RegSetValueEx RegSetValueExW
-#define RegUnLoadKey RegUnLoadKeyW
-#else
-typedef VALENTA VALENT,*PVALENT;
-#define AbortSystemShutdown AbortSystemShutdownA
-#define InitiateSystemShutdown InitiateSystemShutdownA
-#define RegConnectRegistry RegConnectRegistryA
-#define RegCreateKey RegCreateKeyA
-#define RegCreateKeyEx RegCreateKeyExA
-#define RegDeleteKey RegDeleteKeyA
-#define RegDeleteValue RegDeleteValueA
-#define RegEnumKey RegEnumKeyA
-#define RegEnumKeyEx RegEnumKeyExA
-#define RegEnumValue RegEnumValueA
-#define RegLoadKey RegLoadKeyA
-#define RegOpenKey RegOpenKeyA
-#define RegOpenKeyEx RegOpenKeyExA
-#define RegQueryInfoKey RegQueryInfoKeyA
-#define RegQueryMultipleValues RegQueryMultipleValuesA
-#define RegQueryValue RegQueryValueA
-#define RegQueryValueEx RegQueryValueExA
-#define RegReplaceKey RegReplaceKeyA
-#define RegRestoreKey RegRestoreKeyA
-#define RegSaveKey RegSaveKeyA
-#define RegSetValue RegSetValueA
-#define RegSetValueEx RegSetValueExA
-#define RegUnLoadKey RegUnLoadKeyA
-#endif
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/winresrc.h b/winsup/w32api/include/winresrc.h
deleted file mode 100644
index 79a5d8e03..000000000
--- a/winsup/w32api/include/winresrc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _WINRESRC_H
-#define _WINRESRC_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define WIN32_LEAN_AND_MEAN
-#include <winuser.h>
-#include <winnt.h>
-#include <winver.h>
-#include <dde.h>
-#include <dlgs.h>
-#include <commctrl.h>
-#endif
diff --git a/winsup/w32api/include/winsnmp.h b/winsup/w32api/include/winsnmp.h
deleted file mode 100644
index bfed3864c..000000000
--- a/winsup/w32api/include/winsnmp.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
-  winsnmp.h - Header file for the Windows SNMP API
-
-  Written by Filip Navara <xnavara@volny.cz>
-
-  References (2003-08-25):
-    Windows SNMP
-    http://www.winsnmp.com/docs/winsnmp.doc
-
-    WinSNMP v2.0 Addendum
-    http://www.winsnmp.com/docs/winsnmp2.txt
-
-    WinSNMP v3.0 API Addendum
-    http://www.winsnmp.com/docs/winsnmp3.htm
-
-    WinSNMP Reference
-    http://msdn.microsoft.com/library/en-us/snmp/snmp/winsnmp_api_reference.asp
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-#ifndef _WINSNMP_H
-#define _WINSNMP_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifndef _WINDOWS_H
-#include <windows.h>
-#endif
-
-#include <pshpack4.h>
-
-#ifndef WINSNMPAPI
-#define WINSNMPAPI WINAPI
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAXOBJIDSIZE	128
-#define MAXOBJIDSTRSIZE	1408
-#define MAXVENDORINFO	32
-#ifndef _SNMP_ASN_DEFINED
-#define _SNMP_ASN_DEFINED
-#define ASN_UNIVERSAL	0x00
-#define ASN_PRIMITIVE	0x00
-#define ASN_CONSTRUCTOR	0x20
-#define ASN_APPLICATION	0x40
-#define ASN_CONTEXT	0x80
-#define ASN_PRIVATE	0xC0
-#define SNMP_PDU_GET	(ASN_CONTEXT | ASN_CONSTRUCTOR | 0)
-#define SNMP_PDU_GETNEXT	(ASN_CONTEXT | ASN_CONSTRUCTOR | 1)
-#define SNMP_PDU_RESPONSE	(ASN_CONTEXT | ASN_CONSTRUCTOR | 2)
-#define SNMP_PDU_SET	(ASN_CONTEXT | ASN_CONSTRUCTOR | 3)
-#define SNMP_PDU_GETBULK	(ASN_CONTEXT | ASN_CONSTRUCTOR | 4)
-#define SNMP_PDU_V1TRAP	(ASN_CONTEXT | ASN_CONSTRUCTOR | 4)
-#define SNMP_PDU_INFORM	(ASN_CONTEXT | ASN_CONSTRUCTOR | 6)
-#define SNMP_PDU_TRAP	(ASN_CONTEXT | ASN_CONSTRUCTOR | 7) 
-#define SNMP_PDU_REPORT	(ASN_CONTEXT | ASN_CONSTRUCTOR | 8)
-#endif /* _SNMP_ASN_DEFINED */
-#define SNMP_SYNTAX_SEQUENCE	(ASN_UNIVERSAL | ASN_CONSTRUCTOR | 0x10)
-#define SNMP_SYNTAX_INT	(ASN_UNIVERSAL | ASN_PRIMITIVE | 0x02)
-#define SNMP_SYNTAX_BITS	(ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03)
-#define SNMP_SYNTAX_OCTETS	(ASN_UNIVERSAL | ASN_PRIMITIVE | 0x04)
-#define SNMP_SYNTAX_NULL	(ASN_UNIVERSAL | ASN_PRIMITIVE | 0x05)
-#define SNMP_SYNTAX_OID	(ASN_UNIVERSAL | ASN_PRIMITIVE | 0x06)
-#define SNMP_SYNTAX_IPADDR	(ASN_APPLICATION | ASN_PRIMITIVE | 0x00)
-#define SNMP_SYNTAX_CNTR32	(ASN_APPLICATION | ASN_PRIMITIVE | 0x01)
-#define SNMP_SYNTAX_GAUGE32	(ASN_APPLICATION | ASN_PRIMITIVE | 0x02)
-#define SNMP_SYNTAX_TIMETICKS	(ASN_APPLICATION | ASN_PRIMITIVE | 0x03)
-#define SNMP_SYNTAX_OPAQUE	(ASN_APPLICATION | ASN_PRIMITIVE | 0x04)
-#define SNMP_SYNTAX_NSAPADDR	(ASN_APPLICATION | ASN_PRIMITIVE | 0x05)
-#define SNMP_SYNTAX_CNTR64	(ASN_APPLICATION | ASN_PRIMITIVE | 0x06)
-#define SNMP_SYNTAX_UINT32	(ASN_APPLICATION | ASN_PRIMITIVE | 0x07)
-#define SNMP_SYNTAX_NOSUCHOBJECT	(ASN_CONTEXT | ASN_PRIMITIVE | 0x00)
-#define SNMP_SYNTAX_NOSUCHINSTANCE	(ASN_CONTEXT | ASN_PRIMITIVE | 0x01)
-#define SNMP_SYNTAX_ENDOFMIBVIEW	(ASN_CONTEXT | ASN_PRIMITIVE | 0x02)
-#define SNMP_SYNTAX_INT32	SNMP_SYNTAX_INT
-#define SNMP_TRAP_COLDSTART	0
-#define SNMP_TRAP_WARMSTART	1
-#define SNMP_TRAP_LINKDOWN	2
-#define SNMP_TRAP_LINKUP	3
-#define SNMP_TRAP_AUTHFAIL	4
-#define SNMP_TRAP_EGPNEIGHBORLOSS	5
-#define SNMP_TRAP_ENTERPRISESPECIFIC	6
-#define SNMP_ERROR_NOERROR	0
-#define SNMP_ERROR_TOOBIG	1
-#define SNMP_ERROR_NOSUCHNAME	2
-#define SNMP_ERROR_BADVALUE	3
-#define SNMP_ERROR_READONLY	4
-#define SNMP_ERROR_GENERR	5
-#define SNMP_ERROR_NOACCESS	6
-#define SNMP_ERROR_WRONGTYPE	7
-#define SNMP_ERROR_WRONGLENGTH	8
-#define SNMP_ERROR_WRONGENCODING	9
-#define SNMP_ERROR_WRONGVALUE	10
-#define SNMP_ERROR_NOCREATION	11
-#define SNMP_ERROR_INCONSISTENTVALUE	12
-#define SNMP_ERROR_RESOURCEUNAVAILABLE	13
-#define SNMP_ERROR_COMMITFAILED	14
-#define SNMP_ERROR_UNDOFAILED	15
-#define SNMP_ERROR_AUTHORIZATIONERROR	16
-#define SNMP_ERROR_NOTWRITABLE	17
-#define SNMP_ERROR_INCONSISTENTNAME	18
-#define SNMP_SEC_MODEL_V1	1
-#define SNMP_SEC_MODEL_V2	2
-#define SNMP_SEC_MODEL_USM	3
-#define SNMP_NOAUTH_NOPRIV	0
-#define SNMP_AUTH_NOPRIV	1
-#define SNMP_AUTH_PRIV	3
-#define SNMP_USM_NO_AUTH_PROTOCOL	1
-#define SNMP_USM_HMACMD5_AUTH_PROTOCOL	2
-#define SNMP_USM_HMACSHA_AUTH_PROTOCOL	3
-#define SNMP_USM_NO_PRIV_PROTOCOL	1
-#define SNMP_USM_DES_PRIV_PROTOCOL	2
-#define SNMPAPI_TRANSLATED	0
-#define SNMPAPI_UNTRANSLATED_V1	1
-#define SNMPAPI_UNTRANSLATED_V2	2
-#define SNMPAPI_UNTRANSLATED_V3	3
-#define SNMPAPI_OFF 0
-#define SNMPAPI_ON 1
-#define SNMPAPI_FAILURE 0
-#define SNMPAPI_SUCCESS 1
-#define SNMPAPI_NO_SUPPORT	0
-#define SNMPAPI_V1_SUPPORT	1
-#define SNMPAPI_V2_SUPPORT	2
-#define SNMPAPI_M2M_SUPPORT	3
-#define SNMPAPI_V3_SUPPORT	3
-#define SNMPAPI_ALLOC_ERROR	2
-#define SNMPAPI_CONTEXT_INVALID	3
-#define SNMPAPI_CONTEXT_UNKNOWN	4
-#define SNMPAPI_ENTITY_INVALID	5
-#define SNMPAPI_ENTITY_UNKNOWN	6
-#define SNMPAPI_INDEX_INVALID	7
-#define SNMPAPI_NOOP	8
-#define SNMPAPI_OID_INVALID	9
-#define SNMPAPI_OPERATION_INVALID	10
-#define SNMPAPI_OUTPUT_TRUNCATED	11
-#define SNMPAPI_PDU_INVALID	12
-#define SNMPAPI_SESSION_INVALID	13
-#define SNMPAPI_SYNTAX_INVALID	14
-#define SNMPAPI_VBL_INVALID	15
-#define SNMPAPI_MODE_INVALID	16
-#define SNMPAPI_SIZE_INVALID	17
-#define SNMPAPI_NOT_INITIALIZED	18
-#define SNMPAPI_MESSAGE_INVALID	19
-#define SNMPAPI_HWND_INVALID	20
-#define SNMPAPI_ENGINE_INVALID	30
-#define SNMPAPI_ENGINE_DISCOVERY_FAILED	31
-#define SNMPAPI_OTHER_ERROR	99
-#define SNMPAPI_TL_NOT_INITIALIZED	100
-#define SNMPAPI_TL_NOT_SUPPORTED	101
-#define SNMPAPI_TL_NOT_AVAILABLE	102
-#define SNMPAPI_TL_RESOURCE_ERROR	103
-#define SNMPAPI_TL_UNDELIVERABLE	104
-#define SNMPAPI_TL_SRC_INVALID	105
-#define SNMPAPI_TL_INVALID_PARAM	106
-#define SNMPAPI_TL_IN_USE	107
-#define SNMPAPI_TL_TIMEOUT	108
-#define SNMPAPI_TL_PDU_TOO_BIG	109
-#define SNMPAPI_TL_OTHER	199
-#define SNMPAPI_RPT_INVALIDMSG	200
-#define SNMPAPI_RPT_INASNPARSEERR	201
-#define SNMPAPI_RPT_UNKNOWNSECMODEL	202
-#define SNMPAPI_RPT_UNKNOWNENGINEID	203
-#define SNMPAPI_RPT_UNSUPPSECLEVEL	204
-#define SNMPAPI_RPT_UNKNOWNUSERNAME	205
-#define SNMPAPI_RPT_WRONGDIGEST	206
-#define SNMPAPI_RPT_NOTINTIMEWINDOW	207
-#define SNMPAPI_RPT_DECRYPTIONERROR	208
-#define SNMPAPI_RPT_OTHER	299
-
-#ifndef RC_INVOKED
-
-typedef HANDLE HSNMP_SESSION, *LPHSNMP_SESSION;
-typedef HANDLE HSNMP_CONTEXT, *LPHSNMP_CONTEXT;
-typedef HANDLE HSNMP_VBL, *LPHSNMP_VBL;
-typedef HANDLE HSNMP_PDU, *LPHSNMP_PDU;
-typedef HANDLE HSNMP_ENTITY, *LPHSNMP_ENTITY;
-typedef unsigned char smiBYTE, *smiLPBYTE;
-typedef signed int smiINT, *smiLPINT;
-typedef signed int smiINT32, *smiLPINT32;
-typedef unsigned int smiUINT32, *smiLPUINT32;
-typedef smiUINT32 smiCNTR32, *smiLPCNTR32;
-typedef smiUINT32 smiGAUGE32, *smiLPGAUGE32;
-typedef smiUINT32 smiTIMETICKS, *smiLPTIMETICKS;
-typedef smiUINT32 SNMPAPI_STATUS;
-typedef struct {
-	smiUINT32 len;
-	smiLPBYTE ptr;
-} smiOCTETS, *smiLPOCTETS, smiOPAQUE, *smiLPOPAQUE, smiBITS, *smiLPBITS, smiIPADDR, *smiLPIPADDR, smiNSAPADDR, *smiLPNSAPADDR;
-typedef const smiLPOCTETS smiLPCOCTETS;
-typedef struct {
-	smiUINT32 len;
-	smiLPUINT32 ptr;
-} smiOID, *smiLPOID; 
-typedef const smiLPOID smiLPCOID;
-typedef struct {
-	smiUINT32 hipart;
-	smiUINT32 lopart;
-} smiCNTR64, *smiLPCNTR64; 
-typedef struct {
-	smiUINT32 syntax;
-	union {
-		smiINT sNumber;
-		smiUINT32 uNumber;
-		smiCNTR64 hNumber;
-		smiOCTETS string;
-		smiOID oid;
-		smiBYTE empty;
-	} value;
-} smiVALUE, *smiLPVALUE; 
-typedef const smiLPVALUE smiLPCVALUE;
-typedef struct {
-	CHAR vendorName[MAXVENDORINFO*2];
-	CHAR vendorContact[MAXVENDORINFO*2];
-	CHAR vendorVersionId[MAXVENDORINFO];
-	CHAR vendorVersionDate[MAXVENDORINFO];
-	smiUINT32 vendorEnterprise; 
-} smiVENDORINFO, FAR *smiLPVENDORINFO; 
-typedef SNMPAPI_STATUS (CALLBACK *SNMPAPI_CALLBACK)(HSNMP_SESSION,HWND,UINT,WPARAM,LPARAM,LPVOID);
-typedef struct
-{
-	HSNMP_ENTITY hEntity;
-	HSNMP_SESSION hSession;
-	smiUINT32 nTranslateMode;
-	smiUINT32 nSnmpVersion;
-	smiOCTETS dFriendlyName;
-	smiUINT32 nAddressFamily;
-	smiOCTETS dAddressString;
-	smiUINT32 nRequestPort;
-	smiUINT32 nNotificationPort;
-	smiUINT32 nMaxMsgSize;
-	smiOCTETS dEngineID;
-	smiUINT32 nEngineBoots;
-	smiUINT32 nEngineTime;
-	smiUINT32 nEngineSeconds;
-	smiUINT32 nRetransmitMode;
-	smiTIMETICKS nPolicyTimeout;
-	smiUINT32 nPolicyRetry;
-	smiTIMETICKS nActualTimeout;
-	smiUINT32 nActualRetry;
-} smiENTITYINFO, *smiLPENTITYINFO;
-typedef struct
-{
-	HSNMP_CONTEXT hContext;
-	HSNMP_SESSION hSession;
-	smiUINT32 nTranslateMode;
-	smiUINT32 nSnmpVersion;
-	smiOCTETS dFriendlyName;
-	smiOCTETS dContextEngineID;
-	smiOCTETS dContextName;
-	smiOCTETS dSecurityName;
-	smiUINT32 nSecurityModel;
-	smiUINT32 nSecurityLevel;
-	smiUINT32 nSecurityAuthProtocol;
-	smiOCTETS dSecurityAuthKey;
-	smiUINT32 nSecurityPrivProtocol;
-	smiOCTETS dSecurityPrivKey;
-} smiCONTEXTINFO, *smiLPCONTEXTINFO;
-
-SNMPAPI_STATUS WINSNMPAPI SnmpCancelMsg(HSNMP_SESSION,smiINT32);
-SNMPAPI_STATUS WINSNMPAPI SnmpCleanup(VOID);
-SNMPAPI_STATUS WINSNMPAPI SnmpClose(HSNMP_SESSION);
-SNMPAPI_STATUS WINSNMPAPI SnmpContextToStr(HSNMP_CONTEXT,smiLPOCTETS);
-SNMPAPI_STATUS WINSNMPAPI SnmpCountVbl(HSNMP_VBL);
-HSNMP_PDU WINSNMPAPI SnmpCreatePdu(HSNMP_SESSION,smiINT,smiINT32,smiINT,smiINT,HSNMP_VBL);
-HSNMP_SESSION WINSNMPAPI SnmpCreateSession(HWND,UINT,SNMPAPI_CALLBACK,LPVOID);
-HSNMP_VBL WINSNMPAPI SnmpCreateVbl(HSNMP_SESSION,smiLPCOID,smiLPCVALUE);
-SNMPAPI_STATUS WINSNMPAPI SnmpDecodeMsg(HSNMP_SESSION,LPHSNMP_ENTITY,LPHSNMP_ENTITY,LPHSNMP_CONTEXT,LPHSNMP_PDU,smiLPCOCTETS);
-SNMPAPI_STATUS WINSNMPAPI SnmpDeleteVb(HSNMP_VBL,smiUINT32);
-HSNMP_PDU WINSNMPAPI SnmpDuplicatePdu(HSNMP_SESSION,HSNMP_PDU);
-HSNMP_VBL WINSNMPAPI SnmpDuplicateVbl(HSNMP_SESSION,HSNMP_VBL);
-SNMPAPI_STATUS WINSNMPAPI SnmpEncodeMsg(HSNMP_SESSION,HSNMP_ENTITY,HSNMP_ENTITY,HSNMP_CONTEXT,HSNMP_PDU,smiLPOCTETS);
-SNMPAPI_STATUS WINSNMPAPI SnmpEntityToStr(HSNMP_ENTITY,smiUINT32,LPSTR);
-SNMPAPI_STATUS WINSNMPAPI SnmpFreeContext(HSNMP_CONTEXT);
-SNMPAPI_STATUS WINSNMPAPI SnmpFreeDescriptor(smiUINT32,smiLPOPAQUE);
-SNMPAPI_STATUS WINSNMPAPI SnmpFreeEntity(HSNMP_ENTITY);
-SNMPAPI_STATUS WINSNMPAPI SnmpFreePdu(HSNMP_PDU);
-SNMPAPI_STATUS WINSNMPAPI SnmpFreeVbl(HSNMP_VBL);
-SNMPAPI_STATUS WINSNMPAPI SnmpGetLastError(HSNMP_SESSION);
-SNMPAPI_STATUS WINSNMPAPI SnmpGetPduData(HSNMP_PDU,smiLPINT,smiLPINT32,smiLPINT,smiLPINT,LPHSNMP_VBL);
-SNMPAPI_STATUS WINSNMPAPI SnmpGetRetransmitMode(smiLPUINT32);
-SNMPAPI_STATUS WINSNMPAPI SnmpGetRetry(HSNMP_ENTITY,smiLPUINT32,smiLPUINT32);
-SNMPAPI_STATUS WINSNMPAPI SnmpGetTimeout(HSNMP_ENTITY,smiLPTIMETICKS,smiLPTIMETICKS);
-SNMPAPI_STATUS WINSNMPAPI SnmpGetTranslateMode(smiLPUINT32);
-SNMPAPI_STATUS WINSNMPAPI SnmpGetVb(HSNMP_VBL,smiUINT32,smiLPOID,smiLPVALUE);
-SNMPAPI_STATUS WINSNMPAPI SnmpGetVendorInfo(smiLPVENDORINFO);
-SNMPAPI_STATUS WINSNMPAPI SnmpListen(HSNMP_ENTITY,SNMPAPI_STATUS);
-SNMPAPI_STATUS WINSNMPAPI SnmpOidCompare(smiLPCOID,smiLPCOID,smiUINT32,smiLPINT);
-SNMPAPI_STATUS WINSNMPAPI SnmpOidCopy(smiLPCOID,smiLPOID);
-SNMPAPI_STATUS WINSNMPAPI SnmpOidToStr(smiLPCOID,smiUINT32,LPSTR);
-HSNMP_SESSION WINSNMPAPI SnmpOpen(HWND,UINT);
-SNMPAPI_STATUS WINSNMPAPI SnmpRecvMsg(HSNMP_SESSION,LPHSNMP_ENTITY,LPHSNMP_ENTITY,LPHSNMP_CONTEXT,LPHSNMP_PDU);
-SNMPAPI_STATUS WINSNMPAPI SnmpRegister(HSNMP_SESSION,HSNMP_ENTITY,HSNMP_ENTITY,HSNMP_CONTEXT,smiLPCOID,smiUINT32);
-SNMPAPI_STATUS WINSNMPAPI SnmpSendMsg(HSNMP_SESSION,HSNMP_ENTITY,HSNMP_ENTITY,HSNMP_CONTEXT,HSNMP_PDU);
-SNMPAPI_STATUS WINSNMPAPI SnmpSetPduData(HSNMP_PDU,const smiINT *,const smiINT32 *,const smiINT *,const smiINT *,const HSNMP_VBL *);
-SNMPAPI_STATUS WINSNMPAPI SnmpSetPort(HSNMP_ENTITY,UINT);
-SNMPAPI_STATUS WINSNMPAPI SnmpSetRetransmitMode(smiUINT32);
-SNMPAPI_STATUS WINSNMPAPI SnmpSetRetry(HSNMP_ENTITY,smiUINT32);
-SNMPAPI_STATUS WINSNMPAPI SnmpSetTimeout(HSNMP_ENTITY,smiTIMETICKS);
-SNMPAPI_STATUS WINSNMPAPI SnmpSetTranslateMode(smiUINT32);
-SNMPAPI_STATUS WINSNMPAPI SnmpSetVb(HSNMP_VBL,smiUINT32,smiLPCOID,smiLPCVALUE);
-SNMPAPI_STATUS WINSNMPAPI SnmpStartup(smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32);
-HSNMP_CONTEXT WINSNMPAPI SnmpStrToContext(HSNMP_SESSION,smiLPCOCTETS);
-HSNMP_ENTITY WINSNMPAPI SnmpStrToEntity(HSNMP_SESSION,LPCSTR);
-SNMPAPI_STATUS WINSNMPAPI SnmpStrToOid(LPCSTR,smiLPOID);
-/* Added in WinSNMP v3.0, not present in some (all?) versions of MS wsnmp32.dll */
-HSNMP_ENTITY WINSNMPAPI SnmpCreateEntity(HSNMP_SESSION,smiLPENTITYINFO);
-SNMPAPI_STATUS WINSNMPAPI SnmpGetEntityInfo(HSNMP_ENTITY,smiLPENTITYINFO);
-SNMPAPI_STATUS WINSNMPAPI SnmpSetEntityInfo(HSNMP_ENTITY,smiLPENTITYINFO);
-SNMPAPI_STATUS WINSNMPAPI SnmpFreeEntityInfo(smiLPENTITYINFO);
-HSNMP_CONTEXT WINSNMPAPI SnmpCreateContext(HSNMP_SESSION,smiLPCONTEXTINFO);
-SNMPAPI_STATUS WINSNMPAPI SnmpGetContextInfo(HSNMP_CONTEXT,smiLPCONTEXTINFO);
-SNMPAPI_STATUS WINSNMPAPI SnmpSetContextInfo(HSNMP_CONTEXT,smiLPCONTEXTINFO);
-SNMPAPI_STATUS WINSNMPAPI SnmpFreeContextInfo(smiLPCONTEXTINFO);
-SNMPAPI_STATUS WINSNMPAPI SnmpPasswordToKey(smiLPOCTETS,smiINT32,smiLPOCTETS);
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-#include <poppack.h>
-#endif
diff --git a/winsup/w32api/include/winsock.h b/winsup/w32api/include/winsock.h
deleted file mode 100644
index 36eb713e4..000000000
--- a/winsup/w32api/include/winsock.h
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
-
-  Definitions for winsock 1.1
-  
-  Portions Copyright (c) 1980, 1983, 1988, 1993
-  The Regents of the University of California.  All rights reserved.
-
-  Portions Copyright (c) 1993 by Digital Equipment Corporation.
- */
-
-#ifndef _WINSOCK_H
-#define _WINSOCK_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define _GNU_H_WINDOWS32_SOCKETS
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined ( _BSDTYPES_DEFINED )
-/* also defined in gmon.h and in cygwin's sys/types */
-typedef unsigned char	u_char;
-typedef unsigned short	u_short;
-typedef unsigned int	u_int;
-typedef unsigned long	u_long;
-#define _BSDTYPES_DEFINED
-#endif /* !defined  _BSDTYPES_DEFINED */
-typedef u_int	SOCKET;
-#ifndef FD_SETSIZE
-#define FD_SETSIZE	64
-#endif
-
-/* shutdown() how types */
-#define SD_RECEIVE      0x00
-#define SD_SEND         0x01
-#define SD_BOTH         0x02
-
-#ifndef _SYS_TYPES_FD_SET
-/* fd_set may have be defined by the newlib <sys/types.h>
- * if  __USE_W32_SOCKETS not defined.
- */
-#ifdef fd_set
-#undef fd_set
-#endif
-typedef struct fd_set {
-	u_int   fd_count;
-	SOCKET  fd_array[FD_SETSIZE];
-} fd_set;
-int PASCAL __WSAFDIsSet(SOCKET,fd_set*);
-#ifndef FD_CLR
-#define FD_CLR(fd,set) do { u_int __i;\
-for (__i = 0; __i < ((fd_set *)(set))->fd_count ; __i++) {\
-	if (((fd_set *)(set))->fd_array[__i] == (fd)) {\
-	while (__i < ((fd_set *)(set))->fd_count-1) {\
-		((fd_set*)(set))->fd_array[__i] = ((fd_set*)(set))->fd_array[__i+1];\
-		__i++;\
-	}\
-	((fd_set*)(set))->fd_count--;\
-	break;\
-	}\
-}\
-} while (0)
-#endif
-#ifndef FD_SET
-#define FD_SET(fd, set) do { \
-    if (((fd_set *)(set))->fd_count < FD_SETSIZE) \
-	((fd_set *)(set))->fd_array[((fd_set *)(set))->fd_count++]=(fd);\
-}while (0)
-#endif
-#ifndef FD_ZERO
-#define FD_ZERO(set) (((fd_set *)(set))->fd_count=0)
-#endif
-#ifndef FD_ISSET
-#define FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)(fd), (fd_set *)(set))
-#endif
-#elif !defined(USE_SYS_TYPES_FD_SET)
-#warning "fd_set and associated macros have been defined in sys/types.  \
-    This can cause runtime problems with W32 sockets" 
-#endif /* ndef _SYS_TYPES_FD_SET */
-
-#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#ifndef _TIMEVAL_DEFINED /* also in sys/time.h */
-#define _TIMEVAL_DEFINED
-struct timeval {
-	long    tv_sec;
-	long    tv_usec;
-};
-#define timerisset(tvp)	 ((tvp)->tv_sec || (tvp)->tv_usec)
-#define timercmp(tvp, uvp, cmp) \
-	(((tvp)->tv_sec != (uvp)->tv_sec) ? \
-	((tvp)->tv_sec cmp (uvp)->tv_sec) : \
-	((tvp)->tv_usec cmp (uvp)->tv_usec))
-#define timerclear(tvp)	 (tvp)->tv_sec = (tvp)->tv_usec = 0
-#endif /* _TIMEVAL_DEFINED */
-struct  hostent {
-	char	*h_name;
-	char	**h_aliases;
-	short	h_addrtype;
-	short	h_length;
-	char	**h_addr_list;
-#define h_addr h_addr_list[0]
-};
-struct linger {
-	u_short l_onoff;
-	u_short l_linger;
-};
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-#define IOCPARM_MASK	0x7f
-#define IOC_VOID	0x20000000
-#define IOC_OUT	0x40000000
-#define IOC_IN	0x80000000
-#define IOC_INOUT	(IOC_IN|IOC_OUT)
-
-#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#define _IO(x,y)	(IOC_VOID|((x)<<8)|(y))
-#define _IOR(x,y,t)	(IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
-#define _IOW(x,y,t)	(IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
-#define FIONBIO	_IOW('f', 126, u_long)
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-
-#define FIONREAD	_IOR('f', 127, u_long)
-#define FIOASYNC	_IOW('f', 125, u_long)
-#define SIOCSHIWAT	_IOW('s',  0, u_long)
-#define SIOCGHIWAT	_IOR('s',  1, u_long)
-#define SIOCSLOWAT	_IOW('s',  2, u_long)
-#define SIOCGLOWAT	_IOR('s',  3, u_long)
-#define SIOCATMARK	_IOR('s',  7, u_long)
-
-#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-struct netent {
-	char	* n_name;
-	char	**n_aliases;
-	short	n_addrtype;
-	u_long n_net;
-};
-struct  servent {
-	char	*s_name;
-	char	**s_aliases;
-	short	s_port;
-	char	*s_proto;
-};
-struct  protoent {
-	char	*p_name;
-	char	**p_aliases;
-	short	p_proto;
-};
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-
-#define IPPROTO_IP	0
-#define IPPROTO_ICMP	1
-#define IPPROTO_IGMP 2
-#define IPPROTO_GGP 3
-#define IPPROTO_TCP	6
-#define IPPROTO_PUP	12
-#define IPPROTO_UDP	17
-#define IPPROTO_IDP	22
-#define IPPROTO_ND	77
-#define IPPROTO_RAW	255
-#define IPPROTO_MAX	256
-#define IPPORT_ECHO	7
-#define IPPORT_DISCARD	9
-#define IPPORT_SYSTAT	11
-#define IPPORT_DAYTIME  13
-#define IPPORT_NETSTAT  15
-#define IPPORT_FTP      21
-#define IPPORT_TELNET   23
-#define IPPORT_SMTP     25
-#define IPPORT_TIMESERVER 37
-#define IPPORT_NAMESERVER 42
-#define IPPORT_WHOIS	43
-#define IPPORT_MTP	57
-#define IPPORT_TFTP	69
-#define IPPORT_RJE	77
-#define IPPORT_FINGER	79
-#define IPPORT_TTYLINK	87
-#define IPPORT_SUPDUP	95
-#define IPPORT_EXECSERVER	512
-#define IPPORT_LOGINSERVER	513
-#define IPPORT_CMDSERVER	514
-#define IPPORT_EFSSERVER	520
-#define IPPORT_BIFFUDP	512
-#define IPPORT_WHOSERVER	513
-#define IPPORT_ROUTESERVER	520
-#define IPPORT_RESERVED	1024
-#define IMPLINK_IP	155
-#define IMPLINK_LOWEXPER	156
-#define IMPLINK_HIGHEXPER       158
-struct in_addr {
-	union {
-		struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b;
-		struct { u_short s_w1,s_w2; } S_un_w;
-		u_long S_addr;
-	} S_un;
-#define s_addr  S_un.S_addr
-#define s_host  S_un.S_un_b.s_b2
-#define s_net   S_un.S_un_b.s_b1
-#define s_imp   S_un.S_un_w.s_w2
-#define s_impno S_un.S_un_b.s_b4
-#define s_lh    S_un.S_un_b.s_b3
-};
-#define IN_CLASSA(i)	((long)(i)&0x80000000)
-#define IN_CLASSA_NET	0xff000000
-#define IN_CLASSA_NSHIFT	24
-#define IN_CLASSA_HOST	0x00ffffff
-#define IN_CLASSA_MAX	128
-#define IN_CLASSB(i)	(((long)(i)&0xc0000000)==0x80000000)
-#define IN_CLASSB_NET	   0xffff0000
-#define IN_CLASSB_NSHIFT	16
-#define IN_CLASSB_HOST	  0x0000ffff
-#define IN_CLASSB_MAX	   65536
-#define IN_CLASSC(i)	(((long)(i)&0xe0000000)==0xc0000000)
-#define IN_CLASSC_NET	   0xffffff00
-#define IN_CLASSC_NSHIFT	8
-#define IN_CLASSC_HOST	  0xff
-#define INADDR_ANY	      (u_long)0
-#define INADDR_LOOPBACK	 0x7f000001
-#define INADDR_BROADCAST	(u_long)0xffffffff
-#define INADDR_NONE	0xffffffff
-struct sockaddr_in {
-	short	sin_family;
-	u_short	sin_port;
-	struct	in_addr sin_addr;
-	char	sin_zero[8];
-};
-#define WSADESCRIPTION_LEN	256
-#define WSASYS_STATUS_LEN	128
-typedef struct WSAData {
-	WORD	wVersion;
-	WORD	wHighVersion;
-	char	szDescription[WSADESCRIPTION_LEN+1];
-	char	szSystemStatus[WSASYS_STATUS_LEN+1];
-	unsigned short	iMaxSockets;
-	unsigned short	iMaxUdpDg;
-	char * 	lpVendorInfo;
-} WSADATA;
-typedef WSADATA *LPWSADATA;
-
-#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#define IP_OPTIONS	1
-#define SO_DEBUG	1
-#define SO_ACCEPTCONN	2
-#define SO_REUSEADDR	4
-#define SO_KEEPALIVE	8
-#define SO_DONTROUTE	16
-#define SO_BROADCAST	32
-#define SO_USELOOPBACK	64
-#define SO_LINGER	128
-#define SO_OOBINLINE	256
-#define SO_DONTLINGER	(u_int)(~SO_LINGER)
-#define SO_SNDBUF	0x1001
-#define SO_RCVBUF	0x1002
-#define SO_SNDLOWAT	0x1003
-#define SO_RCVLOWAT	0x1004
-#define SO_SNDTIMEO	0x1005
-#define SO_RCVTIMEO	0x1006
-#define SO_ERROR	0x1007
-#define SO_TYPE	0x1008
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-/*
- * Note that the next 5 IP defines are specific to WinSock 1.1 (wsock32.dll).
- * They will cause errors or unexpected results if used with the
- * (gs)etsockopts exported from the WinSock 2 lib, ws2_32.dll. Refer ws2tcpip.h.
- */         
-#define IP_MULTICAST_IF	2
-#define IP_MULTICAST_TTL	3
-#define IP_MULTICAST_LOOP	4
-#define IP_ADD_MEMBERSHIP	5
-#define IP_DROP_MEMBERSHIP  6
-
-#define IP_DEFAULT_MULTICAST_TTL   1
-#define IP_DEFAULT_MULTICAST_LOOP  1
-#define IP_MAX_MEMBERSHIPS	 20
-struct ip_mreq {
-	struct in_addr imr_multiaddr;
-	struct in_addr imr_interface;
-};
-#define INVALID_SOCKET (SOCKET)(~0)
-#define SOCKET_ERROR	(-1)
-#define SOCK_STREAM	1
-#define SOCK_DGRAM	2
-#define SOCK_RAW	3
-#define SOCK_RDM	4
-#define SOCK_SEQPACKET	5
-#define TCP_NODELAY	0x0001
-#define AF_UNSPEC	0
-#define AF_UNIX	1
-#define AF_INET	2
-#define AF_IMPLINK	3
-#define AF_PUP	4
-#define AF_CHAOS	5
-#define AF_IPX	6
-#define AF_NS	6
-#define AF_ISO	7
-#define AF_OSI	AF_ISO
-#define AF_ECMA	8
-#define AF_DATAKIT	9
-#define AF_CCITT	10
-#define AF_SNA	11
-#define AF_DECnet	12
-#define AF_DLI	13
-#define AF_LAT	14
-#define AF_HYLINK	15
-#define AF_APPLETALK	16
-#define AF_NETBIOS	17
-#define AF_VOICEVIEW	18
-#define	AF_FIREFOX	19
-#define	AF_UNKNOWN1	20
-#define	AF_BAN	21
-#define AF_ATM	22
-#define AF_INET6	23
-#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#define AF_MAX	24
-struct sockaddr {
-	u_short sa_family;
-	char	sa_data[14];
-};
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-
-struct sockproto {
-	u_short sp_family;
-	u_short sp_protocol;
-};
-#define PF_UNSPEC	AF_UNSPEC
-#define PF_UNIX	AF_UNIX
-#define PF_INET	AF_INET
-#define PF_IMPLINK	AF_IMPLINK
-#define PF_PUP	AF_PUP
-#define PF_CHAOS	AF_CHAOS
-#define PF_NS	AF_NS
-#define PF_IPX	AF_IPX
-#define PF_ISO	AF_ISO
-#define PF_OSI	AF_OSI
-#define PF_ECMA	AF_ECMA
-#define PF_DATAKIT	AF_DATAKIT
-#define PF_CCITT	AF_CCITT
-#define PF_SNA	AF_SNA
-#define PF_DECnet	AF_DECnet
-#define PF_DLI	AF_DLI
-#define PF_LAT	AF_LAT
-#define PF_HYLINK	AF_HYLINK
-#define PF_APPLETALK	AF_APPLETALK
-#define PF_VOICEVIEW	AF_VOICEVIEW
-#define PF_FIREFOX	AF_FIREFOX
-#define PF_UNKNOWN1	AF_UNKNOWN1
-#define PF_BAN	AF_BAN
-#define PF_ATM	AF_ATM
-#define PF_INET6	AF_INET6
-#define PF_MAX	AF_MAX
-#define SOL_SOCKET	0xffff
-#define SOMAXCONN	5
-#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#define MSG_OOB	1
-#define MSG_PEEK	2
-#define MSG_DONTROUTE	4
-#endif  /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-#define MSG_MAXIOVLEN	16
-#define MSG_PARTIAL	0x8000
-#define MAXGETHOSTSTRUCT	1024
-#define FD_READ	1
-#define FD_WRITE	2
-#define FD_OOB	4
-#define FD_ACCEPT	8
-#define FD_CONNECT	16
-#define FD_CLOSE	32
-#ifndef WSABASEERR
-#define WSABASEERR	10000
-#define WSAEINTR	(WSABASEERR+4)
-#define WSAEBADF	(WSABASEERR+9)
-#define WSAEACCES	(WSABASEERR+13)
-#define WSAEFAULT	(WSABASEERR+14)
-#define WSAEINVAL	(WSABASEERR+22)
-#define WSAEMFILE	(WSABASEERR+24)
-#define WSAEWOULDBLOCK	(WSABASEERR+35)
-#define WSAEINPROGRESS	(WSABASEERR+36)
-#define WSAEALREADY	(WSABASEERR+37)
-#define WSAENOTSOCK	(WSABASEERR+38)
-#define WSAEDESTADDRREQ	(WSABASEERR+39)
-#define WSAEMSGSIZE	(WSABASEERR+40)
-#define WSAEPROTOTYPE	(WSABASEERR+41)
-#define WSAENOPROTOOPT	(WSABASEERR+42)
-#define WSAEPROTONOSUPPORT	(WSABASEERR+43)
-#define WSAESOCKTNOSUPPORT	(WSABASEERR+44)
-#define WSAEOPNOTSUPP	(WSABASEERR+45)
-#define WSAEPFNOSUPPORT	(WSABASEERR+46)
-#define WSAEAFNOSUPPORT	(WSABASEERR+47)
-#define WSAEADDRINUSE	(WSABASEERR+48)
-#define WSAEADDRNOTAVAIL	(WSABASEERR+49)
-#define WSAENETDOWN	(WSABASEERR+50)
-#define WSAENETUNREACH	(WSABASEERR+51)
-#define WSAENETRESET	(WSABASEERR+52)
-#define WSAECONNABORTED	(WSABASEERR+53)
-#define WSAECONNRESET	(WSABASEERR+54)
-#define WSAENOBUFS	(WSABASEERR+55)
-#define WSAEISCONN	(WSABASEERR+56)
-#define WSAENOTCONN	(WSABASEERR+57)
-#define WSAESHUTDOWN	(WSABASEERR+58)
-#define WSAETOOMANYREFS	(WSABASEERR+59)
-#define WSAETIMEDOUT	(WSABASEERR+60)
-#define WSAECONNREFUSED	(WSABASEERR+61)
-#define WSAELOOP	(WSABASEERR+62)
-#define WSAENAMETOOLONG	(WSABASEERR+63)
-#define WSAEHOSTDOWN	(WSABASEERR+64)
-#define WSAEHOSTUNREACH	(WSABASEERR+65)
-#define WSAENOTEMPTY	(WSABASEERR+66)
-#define WSAEPROCLIM	(WSABASEERR+67)
-#define WSAEUSERS	(WSABASEERR+68)
-#define WSAEDQUOT	(WSABASEERR+69)
-#define WSAESTALE	(WSABASEERR+70)
-#define WSAEREMOTE	(WSABASEERR+71)
-#define WSAEDISCON	(WSABASEERR+101)
-#define WSASYSNOTREADY	(WSABASEERR+91)
-#define WSAVERNOTSUPPORTED	(WSABASEERR+92)
-#define WSANOTINITIALISED	(WSABASEERR+93)
-#define WSAHOST_NOT_FOUND	(WSABASEERR+1001)
-#define WSATRY_AGAIN	(WSABASEERR+1002)
-#define WSANO_RECOVERY	(WSABASEERR+1003)
-#define WSANO_DATA	(WSABASEERR+1004)
-#endif /* !WSABASEERR */
-
-#define WSANO_ADDRESS	WSANO_DATA
-#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#define h_errno WSAGetLastError()
-#define HOST_NOT_FOUND	WSAHOST_NOT_FOUND
-#define TRY_AGAIN	WSATRY_AGAIN
-#define NO_RECOVERY	WSANO_RECOVERY
-#define NO_DATA	WSANO_DATA
-#define NO_ADDRESS	WSANO_ADDRESS
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-SOCKET PASCAL accept(SOCKET,struct sockaddr*,int*);
-int PASCAL bind(SOCKET,const struct sockaddr*,int);
-int PASCAL closesocket(SOCKET);
-int PASCAL connect(SOCKET,const struct sockaddr*,int);
-int PASCAL ioctlsocket(SOCKET,long,u_long *);
-int PASCAL getpeername(SOCKET,struct sockaddr*,int*);
-int PASCAL getsockname(SOCKET,struct sockaddr*,int*);
-int PASCAL getsockopt(SOCKET,int,int,char*,int*);
-unsigned long PASCAL inet_addr(const char*);
-DECLARE_STDCALL_P(char *) inet_ntoa(struct in_addr);
-int PASCAL listen(SOCKET,int);
-int PASCAL recv(SOCKET,char*,int,int);
-int PASCAL recvfrom(SOCKET,char*,int,int,struct sockaddr*,int*);
-int PASCAL send(SOCKET,const char*,int,int);
-int PASCAL sendto(SOCKET,const char*,int,int,const struct sockaddr*,int);
-int PASCAL setsockopt(SOCKET,int,int,const char*,int);
-int PASCAL shutdown(SOCKET,int);
-SOCKET PASCAL socket(int,int,int);
-DECLARE_STDCALL_P(struct hostent *) gethostbyaddr(const char*,int,int);
-DECLARE_STDCALL_P(struct hostent *) gethostbyname(const char*);
-DECLARE_STDCALL_P(struct servent *) getservbyport(int,const char*);
-DECLARE_STDCALL_P(struct servent *) getservbyname(const char*,const char*);
-DECLARE_STDCALL_P(struct protoent *) getprotobynumber(int);
-DECLARE_STDCALL_P(struct protoent *) getprotobyname(const char*);
-int PASCAL WSAStartup(WORD,LPWSADATA);
-int PASCAL WSACleanup(void);
-void PASCAL WSASetLastError(int);
-int PASCAL WSAGetLastError(void);
-BOOL PASCAL WSAIsBlocking(void);
-int PASCAL WSAUnhookBlockingHook(void);
-FARPROC PASCAL WSASetBlockingHook(FARPROC);
-int PASCAL WSACancelBlockingCall(void);
-HANDLE PASCAL WSAAsyncGetServByName(HWND,u_int,const char*,const char*,char*,int);
-HANDLE PASCAL WSAAsyncGetServByPort(HWND,u_int,int,const char*,char*,int);
-HANDLE PASCAL WSAAsyncGetProtoByName(HWND,u_int,const char*,char*,int);
-HANDLE PASCAL WSAAsyncGetProtoByNumber(HWND,u_int,int,char*,int);
-HANDLE PASCAL WSAAsyncGetHostByName(HWND,u_int,const char*,char*,int);
-HANDLE PASCAL WSAAsyncGetHostByAddr(HWND,u_int,const char*,int,int,char*,int);
-int PASCAL WSACancelAsyncRequest(HANDLE);
-int PASCAL WSAAsyncSelect(SOCKET,HWND,u_int,long);
-#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-u_long PASCAL htonl(u_long);
-u_long PASCAL ntohl(u_long);
-u_short PASCAL htons(u_short);
-u_short PASCAL ntohs(u_short);
-int PASCAL select(int nfds,fd_set*,fd_set*,fd_set*,const struct timeval*);
-int PASCAL gethostname(char*,int);
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-
-#define WSAMAKEASYNCREPLY(b,e)	MAKELONG(b,e)
-#define WSAMAKESELECTREPLY(e,error)	MAKELONG(e,error)
-#define WSAGETASYNCBUFLEN(l)	LOWORD(l)
-#define WSAGETASYNCERROR(l)	HIWORD(l)
-#define WSAGETSELECTEVENT(l)	LOWORD(l)
-#define WSAGETSELECTERROR(l)	HIWORD(l)
-
-typedef struct sockaddr SOCKADDR;
-typedef struct sockaddr *PSOCKADDR;
-typedef struct sockaddr *LPSOCKADDR;
-typedef struct sockaddr_in SOCKADDR_IN;
-typedef struct sockaddr_in *PSOCKADDR_IN;
-typedef struct sockaddr_in *LPSOCKADDR_IN;
-typedef struct linger LINGER;
-typedef struct linger *PLINGER;
-typedef struct linger *LPLINGER;
-typedef struct in_addr IN_ADDR;
-typedef struct in_addr *PIN_ADDR;
-typedef struct in_addr *LPIN_ADDR;
-typedef struct fd_set FD_SET;
-typedef struct fd_set *PFD_SET;
-typedef struct fd_set *LPFD_SET;
-typedef struct hostent HOSTENT;
-typedef struct hostent *PHOSTENT;
-typedef struct hostent *LPHOSTENT;
-typedef struct servent SERVENT;
-typedef struct servent *PSERVENT;
-typedef struct servent *LPSERVENT;
-typedef struct protoent PROTOENT;
-typedef struct protoent *PPROTOENT;
-typedef struct protoent *LPPROTOENT;
-typedef struct timeval TIMEVAL;
-typedef struct timeval *PTIMEVAL;
-typedef struct timeval *LPTIMEVAL;
-
-#ifdef __cplusplus
-}
-#endif
-/*
- * Recent MSDN docs indicate that the MS-specific extensions exported from
- * mswsock.dll (AcceptEx, TransmitFile. WSARecEx and GetAcceptExSockaddrs) are
- * declared in mswsock.h. These extensions are not supported on W9x or WinCE.
- * However, code using WinSock 1.1 API may expect the declarations and
- * associated defines to be in this header. Thus we include mswsock.h here.
- *
- * When linking against the WinSock 1.1 lib, wsock32.dll, the mswsock functions
- * are automatically routed to mswsock.dll (on platforms with support).
- * The WinSock 2 lib, ws2_32.dll, does not contain any references to
- * the mswsock extensions. 
- */
-
-#include <mswsock.h>
-
-#endif
diff --git a/winsup/w32api/include/winsock2.h b/winsup/w32api/include/winsock2.h
deleted file mode 100644
index 3cae8a935..000000000
--- a/winsup/w32api/include/winsock2.h
+++ /dev/null
@@ -1,1218 +0,0 @@
-/*
-
-  Definitions for winsock 2
-
-  Initially taken from the Wine project.
-  
-  Portions Copyright (c) 1980, 1983, 1988, 1993
-  The Regents of the University of California.  All rights reserved.
-
-  Portions Copyright (c) 1993 by Digital Equipment Corporation.
- */
-
-#if !(defined _WINSOCK2_H || defined _WINSOCK_H)
-#define _WINSOCK2_H
-#define _WINSOCK_H /* to prevent later inclusion of winsock.h */
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define _GNU_H_WINDOWS32_SOCKETS
-
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*   Names common to Winsock1.1 and Winsock2  */
-#if !defined ( _BSDTYPES_DEFINED )
-/* also defined in gmon.h and in cygwin's sys/types */
-typedef unsigned char	u_char;
-typedef unsigned short	u_short;
-typedef unsigned int	u_int;
-typedef unsigned long	u_long;
-#define _BSDTYPES_DEFINED
-#endif /* ! def _BSDTYPES_DEFINED  */
-typedef u_int	SOCKET;
-#ifndef FD_SETSIZE
-#define FD_SETSIZE	64
-#endif
-
-/* shutdown() how types */
-#define SD_RECEIVE      0x00
-#define SD_SEND         0x01
-#define SD_BOTH         0x02
-
-#ifndef _SYS_TYPES_FD_SET
-/* fd_set may be defined by the newlib <sys/types.h>
- * if __USE_W32_SOCKETS not defined.   
- */
-#ifdef fd_set
-#undef fd_set
-#endif
-typedef struct fd_set {
-	u_int   fd_count;
-	SOCKET  fd_array[FD_SETSIZE];
-} fd_set;
-int PASCAL __WSAFDIsSet(SOCKET,fd_set*);
-#ifndef FD_CLR
-#define FD_CLR(fd,set) do { u_int __i;\
-for (__i = 0; __i < ((fd_set *)(set))->fd_count ; __i++) {\
-	if (((fd_set *)(set))->fd_array[__i] == (fd)) {\
-	while (__i < ((fd_set *)(set))->fd_count-1) {\
-		((fd_set*)(set))->fd_array[__i] = ((fd_set*)(set))->fd_array[__i+1];\
-		__i++;\
-	}\
-	((fd_set*)(set))->fd_count--;\
-	break;\
-	}\
-}\
-} while (0)
-#endif
-#ifndef FD_SET
-/* this differs from the define in winsock.h and in cygwin sys/types.h */
-#define FD_SET(fd, set) do { u_int __i;\
-for (__i = 0; __i < ((fd_set *)(set))->fd_count ; __i++) {\
-	if (((fd_set *)(set))->fd_array[__i] == (fd)) {\
-		break;\
-	}\
-}\
-if (__i == ((fd_set *)(set))->fd_count) {\
-	if (((fd_set *)(set))->fd_count < FD_SETSIZE) {\
-		((fd_set *)(set))->fd_array[__i] = (fd);\
-		((fd_set *)(set))->fd_count++;\
-	}\
-}\
-} while(0)
-#endif
-#ifndef FD_ZERO
-#define FD_ZERO(set) (((fd_set *)(set))->fd_count=0)
-#endif
-#ifndef FD_ISSET
-#define FD_ISSET(fd, set) __WSAFDIsSet((SOCKET)(fd), (fd_set *)(set))
-#endif
-#elif !defined (USE_SYS_TYPES_FD_SET)
-#warning "fd_set and associated macros have been defined in sys/types.  \
-    This may cause runtime problems with W32 sockets" 
-#endif /* ndef _SYS_TYPES_FD_SET */
-#if !(defined (__INSIDE_CYGWIN__) || (__INSIDE_MSYS__))
-#ifndef _TIMEVAL_DEFINED /* also in sys/time.h */
-#define _TIMEVAL_DEFINED
-struct timeval {
-	long    tv_sec;
-	long    tv_usec;
-};
-#define timerisset(tvp)	 ((tvp)->tv_sec || (tvp)->tv_usec)
-#define timercmp(tvp, uvp, cmp) \
-	(((tvp)->tv_sec != (uvp)->tv_sec) ? \
-	((tvp)->tv_sec cmp (uvp)->tv_sec) : \
-	((tvp)->tv_usec cmp (uvp)->tv_usec))
-#define timerclear(tvp)	 (tvp)->tv_sec = (tvp)->tv_usec = 0
-#endif /* _TIMEVAL_DEFINED */
-struct  hostent {
-	char	*h_name;
-	char	**h_aliases;
-	short	h_addrtype;
-	short	h_length;
-	char	**h_addr_list;
-#define h_addr h_addr_list[0]
-};
-struct linger {
-	u_short l_onoff;
-	u_short l_linger;
-};
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-#define IOCPARM_MASK	0x7f
-#define IOC_VOID	0x20000000
-#define IOC_OUT	0x40000000
-#define IOC_IN	0x80000000
-#define IOC_INOUT	(IOC_IN|IOC_OUT)
-
-#if ! (defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#define _IO(x,y)	(IOC_VOID|((x)<<8)|(y))
-#define _IOR(x,y,t)	(IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
-#define _IOW(x,y,t)	(IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
-#define FIONBIO	_IOW('f', 126, u_long)
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-
-#define FIONREAD	_IOR('f', 127, u_long)
-#define FIOASYNC	_IOW('f', 125, u_long)
-#define SIOCSHIWAT	_IOW('s',  0, u_long)
-#define SIOCGHIWAT	_IOR('s',  1, u_long)
-#define SIOCSLOWAT	_IOW('s',  2, u_long)
-#define SIOCGLOWAT	_IOR('s',  3, u_long)
-#define SIOCATMARK	_IOR('s',  7, u_long)
-
-#if ! (defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-struct netent {
-	char	* n_name;
-	char	**n_aliases;
-	short	n_addrtype;
-	u_long n_net;
-};
-struct  servent {
-	char	*s_name;
-	char	**s_aliases;
-	short	s_port;
-	char	*s_proto;
-};
-struct  protoent {
-	char	*p_name;
-	char	**p_aliases;
-	short	p_proto;
-};
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-
-#define IPPROTO_IP	0
-#define IPPROTO_ICMP 1
-#define IPPROTO_IGMP 2
-#define IPPROTO_GGP 3
-#define IPPROTO_TCP	6
-#define IPPROTO_PUP	12
-#define IPPROTO_UDP	17
-#define IPPROTO_IDP	22
-#define IPPROTO_ND	77
-#define IPPROTO_RAW	255
-#define IPPROTO_MAX	256
-/* IPv6 options */
-#define IPPROTO_HOPOPTS		0  /* IPv6 Hop-by-Hop options */
-#define IPPROTO_IPV6		41 /* IPv6 header */
-#define IPPROTO_ROUTING		43 /* IPv6 Routing header */
-#define IPPROTO_FRAGMENT	44 /* IPv6 fragmentation header */
-#define IPPROTO_ESP		50 /* encapsulating security payload */
-#define IPPROTO_AH		51 /* authentication header */
-#define IPPROTO_ICMPV6		58 /* ICMPv6 */
-#define IPPROTO_NONE		59 /* IPv6 no next header */
-#define IPPROTO_DSTOPTS		60 /* IPv6 Destination options */
-#define IPPORT_ECHO	7
-#define IPPORT_DISCARD	9
-#define IPPORT_SYSTAT	11
-#define IPPORT_DAYTIME  13
-#define IPPORT_NETSTAT  15
-#define IPPORT_FTP      21
-#define IPPORT_TELNET   23
-#define IPPORT_SMTP     25
-#define IPPORT_TIMESERVER 37
-#define IPPORT_NAMESERVER 42
-#define IPPORT_WHOIS	43
-#define IPPORT_MTP	57
-#define IPPORT_TFTP	69
-#define IPPORT_RJE	77
-#define IPPORT_FINGER	79
-#define IPPORT_TTYLINK	87
-#define IPPORT_SUPDUP	95
-#define IPPORT_EXECSERVER	512
-#define IPPORT_LOGINSERVER	513
-#define IPPORT_CMDSERVER	514
-#define IPPORT_EFSSERVER	520
-#define IPPORT_BIFFUDP	512
-#define IPPORT_WHOSERVER	513
-#define IPPORT_ROUTESERVER	520
-#define IPPORT_RESERVED	1024
-#define IMPLINK_IP	155
-#define IMPLINK_LOWEXPER	156
-#define IMPLINK_HIGHEXPER       158
-struct in_addr {
-	union {
-		struct { u_char s_b1,s_b2,s_b3,s_b4; } S_un_b;
-		struct { u_short s_w1,s_w2; } S_un_w;
-		u_long S_addr;
-	} S_un;
-#define s_addr  S_un.S_addr
-#define s_host  S_un.S_un_b.s_b2
-#define s_net   S_un.S_un_b.s_b1
-#define s_imp   S_un.S_un_w.s_w2
-#define s_impno S_un.S_un_b.s_b4
-#define s_lh    S_un.S_un_b.s_b3
-};
-#define IN_CLASSA(i)	((long)(i)&0x80000000)
-#define IN_CLASSA_NET	0xff000000
-#define IN_CLASSA_NSHIFT	24
-#define IN_CLASSA_HOST	0x00ffffff
-#define IN_CLASSA_MAX	128
-#define IN_CLASSB(i)	(((long)(i)&0xc0000000)==0x80000000)
-#define IN_CLASSB_NET	   0xffff0000
-#define IN_CLASSB_NSHIFT	16
-#define IN_CLASSB_HOST	  0x0000ffff
-#define IN_CLASSB_MAX	   65536
-#define IN_CLASSC(i)	(((long)(i)&0xe0000000)==0xc0000000)
-#define IN_CLASSC_NET	   0xffffff00
-#define IN_CLASSC_NSHIFT	8
-#define IN_CLASSC_HOST	  0xff
-#define INADDR_ANY	      (u_long)0
-#define INADDR_LOOPBACK	 0x7f000001
-#define INADDR_BROADCAST	(u_long)0xffffffff
-#define INADDR_NONE	0xffffffff
-struct sockaddr_in {
-	short	sin_family;
-	u_short	sin_port;
-	struct	in_addr sin_addr;
-	char	sin_zero[8];
-};
-#define WSADESCRIPTION_LEN	256
-#define WSASYS_STATUS_LEN	128
-typedef struct WSAData {
-	WORD	wVersion;
-	WORD	wHighVersion;
-	char	szDescription[WSADESCRIPTION_LEN+1];
-	char	szSystemStatus[WSASYS_STATUS_LEN+1];
-	unsigned short	iMaxSockets;
-	unsigned short	iMaxUdpDg;
-	char * 	lpVendorInfo;
-} WSADATA;
-typedef WSADATA *LPWSADATA;
-
-#if ! (defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#define IP_OPTIONS	1
-#define SO_DEBUG	1
-#define SO_ACCEPTCONN	2
-#define SO_REUSEADDR	4
-#define SO_KEEPALIVE	8
-#define SO_DONTROUTE	16
-#define SO_BROADCAST	32
-#define SO_USELOOPBACK	64
-#define SO_LINGER	128
-#define SO_OOBINLINE	256
-#define SO_DONTLINGER	(u_int)(~SO_LINGER)
-#define SO_SNDBUF	0x1001
-#define SO_RCVBUF	0x1002
-#define SO_SNDLOWAT	0x1003
-#define SO_RCVLOWAT	0x1004
-#define SO_SNDTIMEO	0x1005
-#define SO_RCVTIMEO	0x1006
-#define SO_ERROR	0x1007
-#define SO_TYPE	0x1008
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-
-#define INVALID_SOCKET (SOCKET)(~0)
-#define SOCKET_ERROR	(-1)
-#define SOCK_STREAM	1
-#define SOCK_DGRAM	2
-#define SOCK_RAW	3
-#define SOCK_RDM	4
-#define SOCK_SEQPACKET	5
-#define TCP_NODELAY	0x0001
-#define AF_UNSPEC	0
-#define AF_UNIX	1
-#define AF_INET	2
-#define AF_IMPLINK	3
-#define AF_PUP	4
-#define AF_CHAOS	5
-#define AF_IPX	6
-#define AF_NS	6
-#define AF_ISO	7
-#define AF_OSI	AF_ISO
-#define AF_ECMA	8
-#define AF_DATAKIT	9
-#define AF_CCITT	10
-#define AF_SNA	11
-#define AF_DECnet	12
-#define AF_DLI	13
-#define AF_LAT	14
-#define AF_HYLINK	15
-#define AF_APPLETALK	16
-#define AF_NETBIOS	17
-#define AF_VOICEVIEW	18
-#define	AF_FIREFOX	19
-#define	AF_UNKNOWN1	20
-#define	AF_BAN	21
-#define AF_ATM	22
-#define AF_INET6	23
-#define AF_CLUSTER  24
-#define AF_12844    25
-#define AF_IRDA     26
-#define AF_NETDES   28                     
-#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#define AF_MAX	29
-struct sockaddr {
-	u_short sa_family;
-	char	sa_data[14];
-};
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-
-/* Portable IPv6/IPv4 version of sockaddr.
-   Uses padding to force 8 byte alignment
-   and maximum size of 128 bytes */
-struct sockaddr_storage {
-    short ss_family;
-    char __ss_pad1[6];    /* pad to 8 */
-    __int64 __ss_align; /* force alignment */
-    char __ss_pad2[112];  /* pad to 128 */
-};
-
-struct sockproto {
-	u_short sp_family;
-	u_short sp_protocol;
-};
-#define PF_UNSPEC	AF_UNSPEC
-#define PF_UNIX	AF_UNIX
-#define PF_INET	AF_INET
-#define PF_IMPLINK	AF_IMPLINK
-#define PF_PUP	AF_PUP
-#define PF_CHAOS	AF_CHAOS
-#define PF_NS	AF_NS
-#define PF_IPX	AF_IPX
-#define PF_ISO	AF_ISO
-#define PF_OSI	AF_OSI
-#define PF_ECMA	AF_ECMA
-#define PF_DATAKIT	AF_DATAKIT
-#define PF_CCITT	AF_CCITT
-#define PF_SNA	AF_SNA
-#define PF_DECnet	AF_DECnet
-#define PF_DLI	AF_DLI
-#define PF_LAT	AF_LAT
-#define PF_HYLINK	AF_HYLINK
-#define PF_APPLETALK	AF_APPLETALK
-#define PF_VOICEVIEW	AF_VOICEVIEW
-#define PF_FIREFOX	AF_FIREFOX
-#define PF_UNKNOWN1	AF_UNKNOWN1
-#define PF_BAN	AF_BAN
-#define PF_ATM	AF_ATM
-#define PF_INET6	AF_INET6
-#define PF_MAX	AF_MAX
-#define SOL_SOCKET	0xffff
-#if ! (defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#define SOMAXCONN	0x7fffffff /* (5) in WinSock1.1 */
-#define MSG_OOB	1
-#define MSG_PEEK	2
-#define MSG_DONTROUTE	4
-#endif  /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-#define MSG_MAXIOVLEN	16
-#define MSG_PARTIAL	0x8000
-#define MAXGETHOSTSTRUCT	1024
-
-#define FD_READ_BIT      0
-#define FD_READ          (1 << FD_READ_BIT)  
-#define FD_WRITE_BIT     1
-#define FD_WRITE         (1 << FD_WRITE_BIT)
-#define FD_OOB_BIT       2
-#define FD_OOB           (1 << FD_OOB_BIT)
-#define FD_ACCEPT_BIT    3
-#define FD_ACCEPT        (1 << FD_ACCEPT_BIT)
-#define FD_CONNECT_BIT   4
-#define FD_CONNECT       (1 << FD_CONNECT_BIT)
-#define FD_CLOSE_BIT     5
-#define FD_CLOSE         (1 << FD_CLOSE_BIT)
-/* winsock1.1 defines stop at FD_CLOSE (32) */
-#define FD_QOS_BIT       6
-#define FD_QOS           (1 << FD_QOS_BIT)
-#define FD_GROUP_QOS_BIT 7
-#define FD_GROUP_QOS     (1 << FD_GROUP_QOS_BIT)
-#define FD_ROUTING_INTERFACE_CHANGE_BIT 8
-#define FD_ROUTING_INTERFACE_CHANGE     (1 << FD_ROUTING_INTERFACE_CHANGE_BIT)
-#define FD_ADDRESS_LIST_CHANGE_BIT 9
-#define FD_ADDRESS_LIST_CHANGE     (1 << FD_ADDRESS_LIST_CHANGE_BIT)
-#define FD_MAX_EVENTS    10
-#define FD_ALL_EVENTS    ((1 << FD_MAX_EVENTS) - 1)
-
-#ifndef WSABASEERR
-#define WSABASEERR	10000
-#define WSAEINTR	(WSABASEERR+4)
-#define WSAEBADF	(WSABASEERR+9)
-#define WSAEACCES	(WSABASEERR+13)
-#define WSAEFAULT	(WSABASEERR+14)
-#define WSAEINVAL	(WSABASEERR+22)
-#define WSAEMFILE	(WSABASEERR+24)
-#define WSAEWOULDBLOCK	(WSABASEERR+35)
-#define WSAEINPROGRESS	(WSABASEERR+36) /* deprecated on WinSock2 */ 
-#define WSAEALREADY	(WSABASEERR+37)
-#define WSAENOTSOCK	(WSABASEERR+38)
-#define WSAEDESTADDRREQ	(WSABASEERR+39)
-#define WSAEMSGSIZE	(WSABASEERR+40)
-#define WSAEPROTOTYPE	(WSABASEERR+41)
-#define WSAENOPROTOOPT	(WSABASEERR+42)
-#define WSAEPROTONOSUPPORT	(WSABASEERR+43)
-#define WSAESOCKTNOSUPPORT	(WSABASEERR+44)
-#define WSAEOPNOTSUPP	(WSABASEERR+45)
-#define WSAEPFNOSUPPORT	(WSABASEERR+46)
-#define WSAEAFNOSUPPORT	(WSABASEERR+47)
-#define WSAEADDRINUSE	(WSABASEERR+48)
-#define WSAEADDRNOTAVAIL	(WSABASEERR+49)
-#define WSAENETDOWN	(WSABASEERR+50)
-#define WSAENETUNREACH	(WSABASEERR+51)
-#define WSAENETRESET	(WSABASEERR+52)
-#define WSAECONNABORTED	(WSABASEERR+53)
-#define WSAECONNRESET	(WSABASEERR+54)
-#define WSAENOBUFS	(WSABASEERR+55)
-#define WSAEISCONN	(WSABASEERR+56)
-#define WSAENOTCONN	(WSABASEERR+57)
-#define WSAESHUTDOWN	(WSABASEERR+58)
-#define WSAETOOMANYREFS	(WSABASEERR+59)
-#define WSAETIMEDOUT	(WSABASEERR+60)
-#define WSAECONNREFUSED	(WSABASEERR+61)
-#define WSAELOOP	(WSABASEERR+62)
-#define WSAENAMETOOLONG	(WSABASEERR+63)
-#define WSAEHOSTDOWN	(WSABASEERR+64)
-#define WSAEHOSTUNREACH	(WSABASEERR+65)
-#define WSAENOTEMPTY	(WSABASEERR+66)
-#define WSAEPROCLIM	(WSABASEERR+67)
-#define WSAEUSERS	(WSABASEERR+68)
-#define WSAEDQUOT	(WSABASEERR+69)
-#define WSAESTALE	(WSABASEERR+70)
-#define WSAEREMOTE	(WSABASEERR+71)
-#define WSAEDISCON	(WSABASEERR+101)
-#define WSASYSNOTREADY	(WSABASEERR+91)
-#define WSAVERNOTSUPPORTED	(WSABASEERR+92)
-#define WSANOTINITIALISED	(WSABASEERR+93)
-#define WSAHOST_NOT_FOUND	(WSABASEERR+1001)
-#define WSATRY_AGAIN	(WSABASEERR+1002)
-#define WSANO_RECOVERY	(WSABASEERR+1003)
-#define WSANO_DATA	(WSABASEERR+1004)
-
-/* WinSock2 specific error codes */
-#define WSAENOMORE	(WSABASEERR+102)
-#define WSAECANCELLED	(WSABASEERR+103)
-#define WSAEINVALIDPROCTABLE	(WSABASEERR+104)
-#define WSAEINVALIDPROVIDER	(WSABASEERR+105)
-#define WSAEPROVIDERFAILEDINIT	(WSABASEERR+106)
-#define WSASYSCALLFAILURE	(WSABASEERR+107)
-#define WSASERVICE_NOT_FOUND	(WSABASEERR+108)
-#define WSATYPE_NOT_FOUND	(WSABASEERR+109)
-#define WSA_E_NO_MORE	(WSABASEERR+110)
-#define WSA_E_CANCELLED	(WSABASEERR+111)
-#define WSAEREFUSED	(WSABASEERR+112)
- 
-/* WS QualityofService errors */
-#define WSA_QOS_RECEIVERS	(WSABASEERR + 1005)
-#define WSA_QOS_SENDERS	(WSABASEERR + 1006)
-#define WSA_QOS_NO_SENDERS	(WSABASEERR + 1007)
-#define WSA_QOS_NO_RECEIVERS	(WSABASEERR + 1008)
-#define WSA_QOS_REQUEST_CONFIRMED	(WSABASEERR + 1009)
-#define WSA_QOS_ADMISSION_FAILURE	(WSABASEERR + 1010)
-#define WSA_QOS_POLICY_FAILURE	(WSABASEERR + 1011)
-#define WSA_QOS_BAD_STYLE	(WSABASEERR + 1012)
-#define WSA_QOS_BAD_OBJECT	(WSABASEERR + 1013)
-#define WSA_QOS_TRAFFIC_CTRL_ERROR	(WSABASEERR + 1014)
-#define WSA_QOS_GENERIC_ERROR	(WSABASEERR + 1015)
-#define WSA_QOS_ESERVICETYPE	(WSABASEERR + 1016)
-#define WSA_QOS_EFLOWSPEC	(WSABASEERR + 1017)
-#define WSA_QOS_EPROVSPECBUF	(WSABASEERR + 1018)
-#define WSA_QOS_EFILTERSTYLE	(WSABASEERR + 1019)
-#define WSA_QOS_EFILTERTYPE	(WSABASEERR + 1020)
-#define WSA_QOS_EFILTERCOUNT	(WSABASEERR + 1021)
-#define WSA_QOS_EOBJLENGTH	(WSABASEERR + 1022)
-#define WSA_QOS_EFLOWCOUNT	(WSABASEERR + 1023)
-#define WSA_QOS_EUNKOWNPSOBJ	(WSABASEERR + 1024)
-#define WSA_QOS_EPOLICYOBJ	(WSABASEERR + 1025)
-#define WSA_QOS_EFLOWDESC	(WSABASEERR + 1026)
-#define WSA_QOS_EPSFLOWSPEC	(WSABASEERR + 1027)
-#define WSA_QOS_EPSFILTERSPEC	(WSABASEERR + 1028)
-#define WSA_QOS_ESDMODEOBJ	(WSABASEERR + 1029)
-#define WSA_QOS_ESHAPERATEOBJ	(WSABASEERR + 1030)
-#define WSA_QOS_RESERVED_PETYPE	(WSABASEERR + 1031)
-
-#endif /* !WSABASEERR */
-
-#define WSANO_ADDRESS	WSANO_DATA
-#if !(defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-#define h_errno WSAGetLastError()
-#define HOST_NOT_FOUND	WSAHOST_NOT_FOUND
-#define TRY_AGAIN	WSATRY_AGAIN
-#define NO_RECOVERY	WSANO_RECOVERY
-#define NO_DATA	WSANO_DATA
-#define NO_ADDRESS	WSANO_ADDRESS
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-SOCKET PASCAL accept(SOCKET,struct sockaddr*,int*);
-int PASCAL bind(SOCKET,const struct sockaddr*,int);
-int PASCAL closesocket(SOCKET);
-int PASCAL connect(SOCKET,const struct sockaddr*,int);
-int PASCAL ioctlsocket(SOCKET,long,u_long *);
-int PASCAL getpeername(SOCKET,struct sockaddr*,int*);
-int PASCAL getsockname(SOCKET,struct sockaddr*,int*);
-int PASCAL getsockopt(SOCKET,int,int,char*,int*);
-unsigned long PASCAL inet_addr(const char*);
-DECLARE_STDCALL_P(char *) inet_ntoa(struct in_addr);
-int PASCAL listen(SOCKET,int);
-int PASCAL recv(SOCKET,char*,int,int);
-int PASCAL recvfrom(SOCKET,char*,int,int,struct sockaddr*,int*);
-int PASCAL send(SOCKET,const char*,int,int);
-int PASCAL sendto(SOCKET,const char*,int,int,const struct sockaddr*,int);
-int PASCAL setsockopt(SOCKET,int,int,const char*,int);
-int PASCAL shutdown(SOCKET,int);
-SOCKET PASCAL socket(int,int,int);
-DECLARE_STDCALL_P(struct hostent *) gethostbyaddr(const char*,int,int);
-DECLARE_STDCALL_P(struct hostent *) gethostbyname(const char*);
-DECLARE_STDCALL_P(struct servent *) getservbyport(int,const char*);
-DECLARE_STDCALL_P(struct servent *) getservbyname(const char*,const char*);
-DECLARE_STDCALL_P(struct protoent *) getprotobynumber(int);
-DECLARE_STDCALL_P(struct protoent *) getprotobyname(const char*);
-int PASCAL WSAStartup(WORD,LPWSADATA);
-int PASCAL WSACleanup(void);
-void PASCAL WSASetLastError(int);
-int PASCAL WSAGetLastError(void);
-/*
- * Pseudo-blocking functions are deprecated in WinSock2
- * spec. Use threads instead.
- */
-BOOL PASCAL WSAIsBlocking(void);
-int PASCAL WSAUnhookBlockingHook(void);
-FARPROC PASCAL WSASetBlockingHook(FARPROC);
-int PASCAL WSACancelBlockingCall(void);
-
-HANDLE PASCAL WSAAsyncGetServByName(HWND,u_int,const char*,const char*,char*,int);
-HANDLE PASCAL WSAAsyncGetServByPort(HWND,u_int,int,const char*,char*,int);
-HANDLE PASCAL WSAAsyncGetProtoByName(HWND,u_int,const char*,char*,int);
-HANDLE PASCAL WSAAsyncGetProtoByNumber(HWND,u_int,int,char*,int);
-HANDLE PASCAL WSAAsyncGetHostByName(HWND,u_int,const char*,char*,int);
-HANDLE PASCAL WSAAsyncGetHostByAddr(HWND,u_int,const char*,int,int,char*,int);
-int PASCAL WSACancelAsyncRequest(HANDLE);
-int PASCAL WSAAsyncSelect(SOCKET,HWND,u_int,long);
-#if ! (defined (__INSIDE_CYGWIN__) || defined (__INSIDE_MSYS__))
-u_long PASCAL htonl(u_long);
-u_long PASCAL ntohl(u_long);
-u_short PASCAL htons(u_short);
-u_short PASCAL ntohs(u_short);
-int PASCAL select(int nfds,fd_set*,fd_set*,fd_set*,const struct timeval*);
-#endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */
-
-int PASCAL gethostname(char*,int);
-
-#define WSAMAKEASYNCREPLY(b,e)	MAKELONG(b,e)
-#define WSAMAKESELECTREPLY(e,error)	MAKELONG(e,error)
-#define WSAGETASYNCBUFLEN(l)	LOWORD(l)
-#define WSAGETASYNCERROR(l)	HIWORD(l)
-#define WSAGETSELECTEVENT(l)	LOWORD(l)
-#define WSAGETSELECTERROR(l)	HIWORD(l)
-
-typedef struct sockaddr SOCKADDR;
-typedef struct sockaddr *PSOCKADDR;
-typedef struct sockaddr *LPSOCKADDR;
-typedef struct sockaddr_storage SOCKADDR_STORAGE, *PSOCKADDR_STORAGE;
-typedef struct sockaddr_in SOCKADDR_IN;
-typedef struct sockaddr_in *PSOCKADDR_IN;
-typedef struct sockaddr_in *LPSOCKADDR_IN;
-typedef struct linger LINGER;
-typedef struct linger *PLINGER;
-typedef struct linger *LPLINGER;
-typedef struct in_addr IN_ADDR;
-typedef struct in_addr *PIN_ADDR;
-typedef struct in_addr *LPIN_ADDR;
-typedef struct fd_set FD_SET;
-typedef struct fd_set *PFD_SET;
-typedef struct fd_set *LPFD_SET;
-typedef struct hostent HOSTENT;
-typedef struct hostent *PHOSTENT;
-typedef struct hostent *LPHOSTENT;
-typedef struct servent SERVENT;
-typedef struct servent *PSERVENT;
-typedef struct servent *LPSERVENT;
-typedef struct protoent PROTOENT;
-typedef struct protoent *PPROTOENT;
-typedef struct protoent *LPPROTOENT;
-typedef struct timeval TIMEVAL;
-typedef struct timeval *PTIMEVAL;
-typedef struct timeval *LPTIMEVAL;
-
-/* winsock2 additions */
-#define ADDR_ANY	INADDR_ANY
-
-#define	IN_CLASSD(i)	(((long)(i) & 0xf0000000) == 0xe0000000)
-#define	IN_CLASSD_NET	0xf0000000
-#define	IN_CLASSD_NSHIFT	28
-#define	IN_CLASSD_HOST	0x0fffffff
-#define	IN_MULTICAST(i)	IN_CLASSD(i)
-
-#define	FROM_PROTOCOL_INFO	(-1)
-
-#define SO_DONTLINGER	(u_int)(~SO_LINGER)
-#define SO_GROUP_ID	0x2001
-#define SO_GROUP_PRIORITY	0x2002
-#define SO_MAX_MSG_SIZE	0x2003
-#define SO_PROTOCOL_INFOA	0x2004
-#define SO_PROTOCOL_INFOW	0x2005
-#ifdef UNICODE
-#define SO_PROTOCOL_INFO	SO_PROTOCOL_INFOW
-#else
-#define SO_PROTOCOL_INFO	SO_PROTOCOL_INFOA
-#endif
-#define PVD_CONFIG        0x3001
-
-#define	MSG_INTERRUPT	0x10
-#define	MSG_MAXIOVLEN	16
-
-#define	WSAAPI	WINAPI
-#define WSAEVENT	HANDLE
-#define	LPWSAEVENT	LPHANDLE
-#define	WSAOVERLAPPED	OVERLAPPED
-typedef	struct _OVERLAPPED	*LPWSAOVERLAPPED;
-
-#define	WSA_IO_PENDING	(ERROR_IO_PENDING)
-#define	WSA_IO_INCOMPLETE	(ERROR_IO_INCOMPLETE)
-#define	WSA_INVALID_HANDLE	(ERROR_INVALID_HANDLE)
-#define	WSA_INVALID_PARAMETER	(ERROR_INVALID_PARAMETER)
-#define	WSA_NOT_ENOUGH_MEMORY	(ERROR_NOT_ENOUGH_MEMORY)
-#define	WSA_OPERATION_ABORTED	(ERROR_OPERATION_ABORTED)
-
-#define	WSA_INVALID_EVENT	((WSAEVENT)NULL)
-#define	WSA_MAXIMUM_WAIT_EVENTS	(MAXIMUM_WAIT_OBJECTS)
-#define	WSA_WAIT_FAILED	((DWORD)-1L)
-#define	WSA_WAIT_EVENT_0	(WAIT_OBJECT_0)
-#define	WSA_WAIT_IO_COMPLETION	(WAIT_IO_COMPLETION)
-#define	WSA_WAIT_TIMEOUT	(WAIT_TIMEOUT)
-#define	WSA_INFINITE	(INFINITE)
-
-typedef struct _WSABUF {
-	unsigned long len;
-	char *buf;
-} WSABUF, *LPWSABUF;
-
-typedef enum
-{
-	BestEffortService,
-	ControlledLoadService,
-	PredictiveService,
-	GuaranteedDelayService,
-	GuaranteedService
-} GUARANTEE;
-
-/* TODO: FLOWSPEC and related definitions belong in qos.h */
-
-/*
-   Windows Sockets 2 Application Programming Interface,
-   revision 2.2.2 (1997) uses the type uint32 for SERVICETYPE
-   and the elements of _flowspec, but the type uint32 is not defined
-   or used anywhere else in the w32api. For now, just use
-   unsigned int, which is 32 bits on _WIN32 and _WIN64.
-*/
-
-typedef unsigned int	SERVICETYPE;
-typedef struct _flowspec
-{
-	unsigned int	TokenRate;
-	unsigned int	TokenBucketSize;
-	unsigned int	PeakBandwidth;
-	unsigned int	Latency;
-	unsigned int	DelayVariation;
-	SERVICETYPE	ServiceType;
-	unsigned int	MaxSduSize;
-	unsigned int	MinimumPolicedSize;
-   } FLOWSPEC, *PFLOWSPEC, *LPFLOWSPEC;
-
-typedef struct _QualityOfService
-{
-	FLOWSPEC	SendingFlowspec;
-	FLOWSPEC	ReceivingFlowspec;
-	WSABUF	ProviderSpecific;
-} QOS, *LPQOS;
-
-#define	CF_ACCEPT	0x0000
-#define	CF_REJECT	0x0001
-#define	CF_DEFER	0x0002
-#define	SD_RECEIVE	0x00
-#define	SD_SEND	0x01
-#define	SD_BOTH	0x02
-typedef unsigned int	GROUP;
-
-#define SG_UNCONSTRAINED_GROUP	0x01
-#define SG_CONSTRAINED_GROUP	0x02
-typedef struct _WSANETWORKEVENTS {
-	long	lNetworkEvents;
-	int	iErrorCode[FD_MAX_EVENTS];
-} WSANETWORKEVENTS, *LPWSANETWORKEVENTS;
-
-#define	MAX_PROTOCOL_CHAIN 7
-
-#define	BASE_PROTOCOL      1
-#define	LAYERED_PROTOCOL   0
-
-typedef enum _WSAESETSERVICEOP
-{
-	RNRSERVICE_REGISTER=0,
-	RNRSERVICE_DEREGISTER,
-	RNRSERVICE_DELETE
-} WSAESETSERVICEOP, *PWSAESETSERVICEOP, *LPWSAESETSERVICEOP;
-
-typedef struct _AFPROTOCOLS {
-	INT iAddressFamily;
-	INT iProtocol;
-} AFPROTOCOLS, *PAFPROTOCOLS, *LPAFPROTOCOLS;
-
-typedef enum _WSAEcomparator
-{
-	COMP_EQUAL = 0,
-	COMP_NOTLESS
-} WSAECOMPARATOR, *PWSAECOMPARATOR, *LPWSAECOMPARATOR;
-
-typedef struct _WSAVersion
-{
-	DWORD	dwVersion;
-	WSAECOMPARATOR	ecHow;
-} WSAVERSION, *PWSAVERSION, *LPWSAVERSION;
-
-#ifndef __CSADDR_T_DEFINED /* also in nspapi.h */
-#define __CSADDR_T_DEFINED
-typedef struct _SOCKET_ADDRESS {
-	LPSOCKADDR lpSockaddr;
-	INT iSockaddrLength;
-} SOCKET_ADDRESS,*PSOCKET_ADDRESS,*LPSOCKET_ADDRESS;
-typedef struct _CSADDR_INFO {
-	SOCKET_ADDRESS LocalAddr;
-	SOCKET_ADDRESS RemoteAddr;
-	INT iSocketType;
-	INT iProtocol;
-} CSADDR_INFO,*PCSADDR_INFO,*LPCSADDR_INFO;
-#endif
-
-typedef struct _SOCKET_ADDRESS_LIST {
-    INT             iAddressCount;
-    SOCKET_ADDRESS  Address[1];
-} SOCKET_ADDRESS_LIST, * LPSOCKET_ADDRESS_LIST;
-
-#ifndef __BLOB_T_DEFINED /* also in wtypes.h and nspapi.h */
-#define __BLOB_T_DEFINED
-typedef struct _BLOB {
-	ULONG	cbSize;
-	BYTE	*pBlobData;
-} BLOB,*PBLOB,*LPBLOB;
-#endif
-
-typedef struct _WSAQuerySetA
-{
-	DWORD	dwSize;
-	LPSTR	lpszServiceInstanceName;
-	LPGUID	lpServiceClassId;
-	LPWSAVERSION	lpVersion;
-	LPSTR	lpszComment;
-	DWORD	dwNameSpace;
-	LPGUID	lpNSProviderId;
-	LPSTR	lpszContext;
-	DWORD	dwNumberOfProtocols;
-	LPAFPROTOCOLS	lpafpProtocols;
-	LPSTR	lpszQueryString;
-	DWORD	dwNumberOfCsAddrs;
-	LPCSADDR_INFO	lpcsaBuffer;
-	DWORD	dwOutputFlags;
-	LPBLOB	lpBlob;
-} WSAQUERYSETA, *PWSAQUERYSETA, *LPWSAQUERYSETA;
-
-typedef struct _WSAQuerySetW
-{
-	DWORD	dwSize;
-	LPWSTR	lpszServiceInstanceName;
-	LPGUID	lpServiceClassId;
-	LPWSAVERSION	lpVersion;
-	LPWSTR	lpszComment;
-	DWORD	dwNameSpace;
-	LPGUID	lpNSProviderId;
-	LPWSTR	lpszContext;
-	DWORD	dwNumberOfProtocols;
-	LPAFPROTOCOLS	lpafpProtocols;
-	LPWSTR	lpszQueryString;
-	DWORD	dwNumberOfCsAddrs;
-	LPCSADDR_INFO	lpcsaBuffer;
-	DWORD	dwOutputFlags;
-	LPBLOB	lpBlob;
-} WSAQUERYSETW, *PWSAQUERYSETW, *LPWSAQUERYSETW;
-
-#ifdef UNICODE
-typedef WSAQUERYSETW WSAQUERYSET;
-typedef PWSAQUERYSETW PWSAQUERYSET;
-typedef LPWSAQUERYSETW LPWSAQUERYSET;
-#else
-typedef WSAQUERYSETA WSAQUERYSET;
-typedef PWSAQUERYSETA PWSAQUERYSET;
-typedef LPWSAQUERYSETA LPWSAQUERYSET;
-#endif
-
-typedef struct _WSANSClassInfoA
-{
-	LPSTR	lpszName;
-	DWORD	dwNameSpace;
-	DWORD	dwValueType;
-	DWORD	dwValueSize;
-	LPVOID	lpValue;
-} WSANSCLASSINFOA, *PWSANSCLASSINFOA, *LPWSANSCLASSINFOA;
-
-typedef struct _WSANSClassInfoW
-{
-	LPWSTR	lpszName;
-	DWORD	dwNameSpace;
-	DWORD	dwValueType;
-	DWORD	dwValueSize;
-	LPVOID	lpValue;
-} WSANSCLASSINFOW, *PWSANSCLASSINFOW, *LPWSANSCLASSINFOW;
-
-#ifdef UNICODE
-typedef WSANSCLASSINFOW WSANSCLASSINFO;
-typedef PWSANSCLASSINFOW PWSANSCLASSINFO;
-typedef LPWSANSCLASSINFOW LPWSANSCLASSINFO;
-#else
-typedef WSANSCLASSINFOA WSANSCLASSINFO;
-typedef PWSANSCLASSINFOA PWSANSCLASSINFO;
-typedef LPWSANSCLASSINFOA LPWSANSCLASSINFO;
-#endif
-
-typedef struct _WSAServiceClassInfoA
-{
-	LPGUID	lpServiceClassId;
-	LPSTR	lpszServiceClassName;
-	DWORD	dwCount;
-	LPWSANSCLASSINFOA	lpClassInfos;
-} WSASERVICECLASSINFOA, *PWSASERVICECLASSINFOA, *LPWSASERVICECLASSINFOA;
-
-typedef struct _WSAServiceClassInfoW
-{
-	LPGUID	lpServiceClassId;
-	LPWSTR	lpszServiceClassName;
-	DWORD	dwCount;
-	LPWSANSCLASSINFOW	lpClassInfos;
-} WSASERVICECLASSINFOW, *PWSASERVICECLASSINFOW, *LPWSASERVICECLASSINFOW;
-
-#ifdef UNICODE
-typedef WSASERVICECLASSINFOW WSASERVICECLASSINFO;
-typedef PWSASERVICECLASSINFOW PWSASERVICECLASSINFO;
-typedef LPWSASERVICECLASSINFOW LPWSASERVICECLASSINFO;
-#else
-typedef WSASERVICECLASSINFOA WSASERVICECLASSINFO;
-typedef PWSASERVICECLASSINFOA PWSASERVICECLASSINFO;
-typedef LPWSASERVICECLASSINFOA LPWSASERVICECLASSINFO;
-#endif
-
-typedef struct _WSANAMESPACE_INFOA {
-	GUID	NSProviderId;
-	DWORD	dwNameSpace;
-	BOOL	fActive;
-	DWORD	dwVersion;
-	LPSTR	lpszIdentifier;
-} WSANAMESPACE_INFOA, *PWSANAMESPACE_INFOA, *LPWSANAMESPACE_INFOA;
-
-typedef struct _WSANAMESPACE_INFOW {
-	GUID	NSProviderId;
-	DWORD	dwNameSpace;
-	BOOL	fActive;
-	DWORD	dwVersion;
-	LPWSTR	lpszIdentifier;
-} WSANAMESPACE_INFOW, *PWSANAMESPACE_INFOW, *LPWSANAMESPACE_INFOW;
-
-#ifdef UNICODE
-typedef WSANAMESPACE_INFOW WSANAMESPACE_INFO;
-typedef PWSANAMESPACE_INFOW PWSANAMESPACE_INFO;
-typedef LPWSANAMESPACE_INFOW LPWSANAMESPACE_INFO;
-#else
-typedef WSANAMESPACE_INFOA WSANAMESPACE_INFO;
-typedef PWSANAMESPACE_INFOA PWSANAMESPACE_INFO;
-typedef LPWSANAMESPACE_INFOA LPWSANAMESPACE_INFO;
-#endif
-
-typedef struct _WSAPROTOCOLCHAIN {
-	int ChainLen;
-	DWORD ChainEntries[MAX_PROTOCOL_CHAIN];
-} WSAPROTOCOLCHAIN, *LPWSAPROTOCOLCHAIN;
-
-#define WSAPROTOCOL_LEN  255
-
-typedef struct _WSAPROTOCOL_INFOA {
-	DWORD dwServiceFlags1;
-	DWORD dwServiceFlags2;
-	DWORD dwServiceFlags3;
-	DWORD dwServiceFlags4;
-	DWORD dwProviderFlags;
-	GUID ProviderId;
-	DWORD dwCatalogEntryId;
-	WSAPROTOCOLCHAIN ProtocolChain;
-	int iVersion;
-	int iAddressFamily;
-	int iMaxSockAddr;
-	int iMinSockAddr;
-	int iSocketType;
-	int iProtocol;
-	int iProtocolMaxOffset;
-	int iNetworkByteOrder;
-	int iSecurityScheme;
-	DWORD dwMessageSize;
-	DWORD dwProviderReserved;
-	CHAR szProtocol[WSAPROTOCOL_LEN+1];
-} WSAPROTOCOL_INFOA, *LPWSAPROTOCOL_INFOA;
-
-typedef struct _WSAPROTOCOL_INFOW {
-	DWORD dwServiceFlags1;
-	DWORD dwServiceFlags2;
-	DWORD dwServiceFlags3;
-	DWORD dwServiceFlags4;
-	DWORD dwProviderFlags;
-	GUID ProviderId;
-	DWORD dwCatalogEntryId;
-	WSAPROTOCOLCHAIN ProtocolChain;
-	int iVersion;
-	int iAddressFamily;
-	int iMaxSockAddr;
-	int iMinSockAddr;
-	int iSocketType;
-	int iProtocol;
-	int iProtocolMaxOffset;
-	int iNetworkByteOrder;
-	int iSecurityScheme;
-	DWORD dwMessageSize;
-	DWORD dwProviderReserved;
-	WCHAR  szProtocol[WSAPROTOCOL_LEN+1];
-} WSAPROTOCOL_INFOW, * LPWSAPROTOCOL_INFOW;
-
-typedef int (CALLBACK *LPCONDITIONPROC)(LPWSABUF, LPWSABUF, LPQOS, LPQOS, LPWSABUF, LPWSABUF, GROUP *, DWORD);
-typedef void (WINAPI *LPWSAOVERLAPPED_COMPLETION_ROUTINE)(DWORD, DWORD, LPWSAOVERLAPPED, DWORD);
-
-
-#ifdef UNICODE
-typedef WSAPROTOCOL_INFOW WSAPROTOCOL_INFO;
-typedef LPWSAPROTOCOL_INFOW LPWSAPROTOCOL_INFO;
-#else
-typedef WSAPROTOCOL_INFOA WSAPROTOCOL_INFO;
-typedef LPWSAPROTOCOL_INFOA LPWSAPROTOCOL_INFO;
-#endif
-
-/* Needed for XP & .NET Server function WSANSPIoctl.  */
-typedef enum _WSACOMPLETIONTYPE {
-    NSP_NOTIFY_IMMEDIATELY = 0,
-    NSP_NOTIFY_HWND,
-    NSP_NOTIFY_EVENT,
-    NSP_NOTIFY_PORT,
-    NSP_NOTIFY_APC
-} WSACOMPLETIONTYPE, * PWSACOMPLETIONTYPE, * LPWSACOMPLETIONTYPE;
-typedef struct _WSACOMPLETION {
-    WSACOMPLETIONTYPE Type;
-    union {
-        struct {
-            HWND hWnd;
-            UINT uMsg;
-            WPARAM context;
-        } WindowMessage;
-        struct {
-            LPWSAOVERLAPPED lpOverlapped;
-        } Event;
-        struct {
-            LPWSAOVERLAPPED lpOverlapped;
-            LPWSAOVERLAPPED_COMPLETION_ROUTINE lpfnCompletionProc;
-        } Apc;
-        struct {
-            LPWSAOVERLAPPED lpOverlapped;
-            HANDLE hPort;
-            ULONG_PTR Key;
-        } Port;
-    } Parameters;
-} WSACOMPLETION, *PWSACOMPLETION, *LPWSACOMPLETION;
-
-#define PFL_MULTIPLE_PROTO_ENTRIES          0x00000001
-#define PFL_RECOMMENDED_PROTO_ENTRY         0x00000002
-#define PFL_HIDDEN                          0x00000004
-#define PFL_MATCHES_PROTOCOL_ZERO           0x00000008
-#define XP1_CONNECTIONLESS                  0x00000001
-#define XP1_GUARANTEED_DELIVERY             0x00000002
-#define XP1_GUARANTEED_ORDER                0x00000004
-#define XP1_MESSAGE_ORIENTED                0x00000008
-#define XP1_PSEUDO_STREAM                   0x00000010
-#define XP1_GRACEFUL_CLOSE                  0x00000020
-#define XP1_EXPEDITED_DATA                  0x00000040
-#define XP1_CONNECT_DATA                    0x00000080
-#define XP1_DISCONNECT_DATA                 0x00000100
-#define XP1_SUPPORT_BROADCAST               0x00000200
-#define XP1_SUPPORT_MULTIPOINT              0x00000400
-#define XP1_MULTIPOINT_CONTROL_PLANE        0x00000800
-#define XP1_MULTIPOINT_DATA_PLANE           0x00001000
-#define XP1_QOS_SUPPORTED                   0x00002000
-#define XP1_INTERRUPT                       0x00004000
-#define XP1_UNI_SEND                        0x00008000
-#define XP1_UNI_RECV                        0x00010000
-#define XP1_IFS_HANDLES                     0x00020000
-#define XP1_PARTIAL_MESSAGE                 0x00040000
-
-#define BIGENDIAN                           0x0000
-#define LITTLEENDIAN                        0x0001
-
-#define SECURITY_PROTOCOL_NONE              0x0000
-#define JL_SENDER_ONLY    0x01
-#define JL_RECEIVER_ONLY  0x02
-#define JL_BOTH           0x04
-#define WSA_FLAG_OVERLAPPED           0x01
-#define WSA_FLAG_MULTIPOINT_C_ROOT    0x02
-#define WSA_FLAG_MULTIPOINT_C_LEAF    0x04
-#define WSA_FLAG_MULTIPOINT_D_ROOT    0x08
-#define WSA_FLAG_MULTIPOINT_D_LEAF    0x10
-#define IOC_UNIX                      0x00000000
-#define IOC_WS2                       0x08000000
-#define IOC_PROTOCOL                  0x10000000
-#define IOC_VENDOR                    0x18000000
-
-#define _WSAIO(x,y)                   (IOC_VOID|(x)|(y))
-#define _WSAIOR(x,y)                  (IOC_OUT|(x)|(y))
-#define _WSAIOW(x,y)                  (IOC_IN|(x)|(y))
-#define _WSAIORW(x,y)                 (IOC_INOUT|(x)|(y))
-
-#define SIO_ASSOCIATE_HANDLE          _WSAIOW(IOC_WS2,1)
-#define SIO_ENABLE_CIRCULAR_QUEUEING  _WSAIO(IOC_WS2,2)
-#define SIO_FIND_ROUTE                _WSAIOR(IOC_WS2,3)
-#define SIO_FLUSH                     _WSAIO(IOC_WS2,4)
-#define SIO_GET_BROADCAST_ADDRESS     _WSAIOR(IOC_WS2,5)
-#define SIO_GET_EXTENSION_FUNCTION_POINTER  _WSAIORW(IOC_WS2,6)
-#define SIO_GET_QOS                   _WSAIORW(IOC_WS2,7)
-#define SIO_GET_GROUP_QOS             _WSAIORW(IOC_WS2,8)
-#define SIO_MULTIPOINT_LOOPBACK       _WSAIOW(IOC_WS2,9)
-#define SIO_MULTICAST_SCOPE           _WSAIOW(IOC_WS2,10)
-#define SIO_SET_QOS                   _WSAIOW(IOC_WS2,11)
-#define SIO_SET_GROUP_QOS             _WSAIOW(IOC_WS2,12)
-#define SIO_TRANSLATE_HANDLE          _WSAIORW(IOC_WS2,13)
-#define SIO_ROUTING_INTERFACE_QUERY   _WSAIORW(IOC_WS2,20)
-#define SIO_ROUTING_INTERFACE_CHANGE  _WSAIOW(IOC_WS2,21)
-#define SIO_ADDRESS_LIST_QUERY        _WSAIOR(IOC_WS2,22)
-#define SIO_ADDRESS_LIST_CHANGE       _WSAIO(IOC_WS2,23)
-#define SIO_QUERY_TARGET_PNP_HANDLE   _WSAIOR(IOC_WS2,24)
-#define SIO_NSP_NOTIFY_CHANGE         _WSAIOW(IOC_WS2,25)
-
-#define TH_NETDEV	0x00000001
-#define TH_TAPI	0x00000002
-
-SOCKET WINAPI WSAAccept(SOCKET, struct sockaddr *, LPINT, LPCONDITIONPROC, DWORD);
-INT WINAPI WSAAddressToStringA(LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFOA, LPSTR, LPDWORD);
-INT WINAPI WSAAddressToStringW(LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFOW, LPWSTR, LPDWORD);
-BOOL WINAPI WSACloseEvent(WSAEVENT);
-int WINAPI WSAConnect(SOCKET, const struct sockaddr *, int, LPWSABUF, LPWSABUF, LPQOS, LPQOS);
-WSAEVENT WINAPI WSACreateEvent(void);
-int WINAPI WSADuplicateSocketA(SOCKET, DWORD, LPWSAPROTOCOL_INFOA);
-int WINAPI WSADuplicateSocketW(SOCKET, DWORD, LPWSAPROTOCOL_INFOW);
-INT WINAPI WSAEnumNameSpaceProvidersA(LPDWORD, LPWSANAMESPACE_INFOA);
-INT WINAPI WSAEnumNameSpaceProvidersW(LPDWORD, LPWSANAMESPACE_INFOW);
-int WINAPI WSAEnumNetworkEvents(SOCKET, WSAEVENT, LPWSANETWORKEVENTS);
-int WINAPI WSAEnumProtocolsA(LPINT, LPWSAPROTOCOL_INFOA, LPDWORD);
-int WINAPI WSAEnumProtocolsW(LPINT, LPWSAPROTOCOL_INFOW, LPDWORD);
-int WINAPI WSAEventSelect(SOCKET, WSAEVENT, long);
-BOOL WINAPI WSAGetOverlappedResult(SOCKET, LPWSAOVERLAPPED, LPDWORD, BOOL, LPDWORD);
-BOOL WINAPI WSAGetQOSByName(SOCKET, LPWSABUF, LPQOS);
-INT WINAPI WSAGetServiceClassInfoA(LPGUID, LPGUID, LPDWORD, LPWSASERVICECLASSINFOA);
-INT WINAPI WSAGetServiceClassInfoW(LPGUID, LPGUID, LPDWORD, LPWSASERVICECLASSINFOW);
-INT WINAPI WSAGetServiceClassNameByClassIdA(LPGUID, LPSTR, LPDWORD);
-INT WINAPI WSAGetServiceClassNameByClassIdW(LPGUID, LPWSTR, LPDWORD);
-int WINAPI WSAHtonl(SOCKET, unsigned long, unsigned long *);
-int WINAPI WSAHtons(SOCKET, unsigned short, unsigned short *);
-INT WINAPI WSAInstallServiceClassA(LPWSASERVICECLASSINFOA);
-INT WINAPI WSAInstallServiceClassW(LPWSASERVICECLASSINFOW);
-int WINAPI WSAIoctl(SOCKET, DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-SOCKET WINAPI WSAJoinLeaf(SOCKET, const struct sockaddr *, int, LPWSABUF, LPWSABUF, LPQOS, LPQOS, DWORD);
-INT WINAPI WSALookupServiceBeginA(LPWSAQUERYSETA, DWORD, LPHANDLE);
-INT WINAPI WSALookupServiceBeginW(LPWSAQUERYSETW lpqsRestrictions, DWORD, LPHANDLE);
-INT WINAPI WSALookupServiceNextA(HANDLE, DWORD, LPDWORD, LPWSAQUERYSETA);
-INT WINAPI WSALookupServiceNextW(HANDLE, DWORD, LPDWORD, LPWSAQUERYSETW);
-INT WINAPI WSALookupServiceEnd(HANDLE);
-int WINAPI WSANSPIoctl(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION); /* XP or .NET Server */
-int WINAPI WSANtohl(SOCKET, unsigned long, unsigned long *);
-int WINAPI WSANtohs(SOCKET, unsigned short, unsigned short *);
-int WINAPI WSARecv(SOCKET, LPWSABUF, DWORD, LPDWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-int WINAPI WSARecvDisconnect(SOCKET, LPWSABUF);
-int WINAPI WSARecvFrom(SOCKET, LPWSABUF, DWORD, LPDWORD, LPDWORD, struct sockaddr *, LPINT, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-INT WINAPI WSARemoveServiceClass(LPGUID);
-BOOL WINAPI WSAResetEvent(WSAEVENT);
-int WINAPI WSASend(SOCKET, LPWSABUF, DWORD, LPDWORD, DWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-int WINAPI WSASendDisconnect(SOCKET, LPWSABUF);
-int WINAPI WSASendTo(SOCKET, LPWSABUF, DWORD, LPDWORD, DWORD, const struct sockaddr *, int, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-BOOL WINAPI WSASetEvent(WSAEVENT);
-INT WSAAPI WSASetServiceA(LPWSAQUERYSETA, WSAESETSERVICEOP, DWORD);
-INT WINAPI WSASetServiceW(LPWSAQUERYSETW, WSAESETSERVICEOP, DWORD);
-SOCKET WINAPI WSASocketA(int, int, int, LPWSAPROTOCOL_INFOA, GROUP, DWORD);
-SOCKET WINAPI WSASocketW(int, int, int, LPWSAPROTOCOL_INFOW, GROUP, DWORD);
-INT WINAPI WSAStringToAddressA(LPSTR, INT, LPWSAPROTOCOL_INFOA, LPSOCKADDR, LPINT);
-INT WINAPI WSAStringToAddressW(LPWSTR, INT, LPWSAPROTOCOL_INFOW, LPSOCKADDR, LPINT);
-DWORD WINAPI WSAWaitForMultipleEvents(DWORD, const WSAEVENT *, BOOL, DWORD, BOOL);
-typedef SOCKET (WINAPI *LPFN_WSAACCEPT)(SOCKET, struct sockaddr *, LPINT, LPCONDITIONPROC, DWORD);
-typedef INT (WINAPI *LPFN_WSAADDRESSTOSTRINGA)(LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFOA, LPSTR, LPDWORD);
-typedef INT (WINAPI *LPFN_WSAADDRESSTOSTRINGW)(LPSOCKADDR, DWORD, LPWSAPROTOCOL_INFOW, LPWSTR, LPDWORD);
-typedef BOOL (WINAPI *LPFN_WSACLOSEEVENT)(WSAEVENT);
-typedef int (WINAPI *LPFN_WSACONNECT)(SOCKET, const struct sockaddr *, int, LPWSABUF, LPWSABUF, LPQOS, LPQOS);
-typedef WSAEVENT (WINAPI *LPFN_WSACREATEEVENT)(void);
-typedef int (WINAPI *LPFN_WSADUPLICATESOCKETA)(SOCKET, DWORD, LPWSAPROTOCOL_INFOA);
-typedef int (WINAPI *LPFN_WSADUPLICATESOCKETW)(SOCKET, DWORD, LPWSAPROTOCOL_INFOW);
-typedef INT (WINAPI *LPFN_WSAENUMNAMESPACEPROVIDERSA)(LPDWORD, LPWSANAMESPACE_INFOA);
-typedef INT (WINAPI *LPFN_WSAENUMNAMESPACEPROVIDERSW)(LPDWORD, LPWSANAMESPACE_INFOW);
-typedef int (WINAPI *LPFN_WSAENUMNETWORKEVENTS)(SOCKET, WSAEVENT, LPWSANETWORKEVENTS);
-typedef int (WINAPI *LPFN_WSAENUMPROTOCOLSA)(LPINT, LPWSAPROTOCOL_INFOA, LPDWORD);
-typedef int (WINAPI *LPFN_WSAENUMPROTOCOLSW)(LPINT, LPWSAPROTOCOL_INFOW, LPDWORD);
-typedef int (WINAPI *LPFN_WSAEVENTSELECT)(SOCKET, WSAEVENT, long);
-typedef BOOL (WINAPI *LPFN_WSAGETOVERLAPPEDRESULT)(SOCKET, LPWSAOVERLAPPED, LPDWORD, BOOL, LPDWORD);
-typedef BOOL (WINAPI *LPFN_WSAGETQOSBYNAME)(SOCKET, LPWSABUF, LPQOS);
-typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSINFOA)(LPGUID, LPGUID, LPDWORD, LPWSASERVICECLASSINFOA);
-typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSINFOW)(LPGUID, LPGUID, LPDWORD, LPWSASERVICECLASSINFOW);
-typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA)(LPGUID, LPSTR, LPDWORD);
-typedef INT (WINAPI *LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW)(LPGUID, LPWSTR, LPDWORD);
-typedef int (WINAPI *LPFN_WSAHTONL)(SOCKET, unsigned long, unsigned long *);
-typedef int (WINAPI *LPFN_WSAHTONS)(SOCKET, unsigned short, unsigned short *);
-typedef INT (WINAPI *LPFN_WSAINSTALLSERVICECLASSA)(LPWSASERVICECLASSINFOA);
-typedef INT (WINAPI *LPFN_WSAINSTALLSERVICECLASSW)(LPWSASERVICECLASSINFOW);
-typedef int (WINAPI *LPFN_WSAIOCTL)(SOCKET, DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-typedef SOCKET (WINAPI *LPFN_WSAJOINLEAF)(SOCKET, const struct sockaddr *, int, LPWSABUF, LPWSABUF, LPQOS, LPQOS, DWORD);
-typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEBEGINA)(LPWSAQUERYSETA, DWORD, LPHANDLE);
-typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEBEGINW)(LPWSAQUERYSETW, DWORD, LPHANDLE);
-typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTA)(HANDLE, DWORD, LPDWORD, LPWSAQUERYSETA);
-typedef INT (WINAPI *LPFN_WSALOOKUPSERVICENEXTW)(HANDLE, DWORD, LPDWORD, LPWSAQUERYSETW);
-typedef INT (WINAPI *LPFN_WSALOOKUPSERVICEEND)(HANDLE);
-typedef int (WINAPI *LPFN_WSANSPIoctl)(HANDLE, DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPWSACOMPLETION);
-typedef int (WINAPI *LPFN_WSANTOHL)(SOCKET, unsigned long, unsigned long *);
-typedef int (WINAPI *LPFN_WSANTOHS)(SOCKET, unsigned short, unsigned short *);
-typedef int (WINAPI *LPFN_WSARECV)(SOCKET, LPWSABUF, DWORD, LPDWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-typedef int (WINAPI *LPFN_WSARECVDISCONNECT)(SOCKET, LPWSABUF);
-typedef int (WINAPI *LPFN_WSARECVFROM)(SOCKET, LPWSABUF, DWORD, LPDWORD, LPDWORD, struct sockaddr *, LPINT, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-typedef INT (WINAPI *LPFN_WSAREMOVESERVICECLASS)(LPGUID);
-typedef BOOL (WINAPI *LPFN_WSARESETEVENT)(WSAEVENT);
-typedef int (WINAPI *LPFN_WSASEND)(SOCKET, LPWSABUF, DWORD, LPDWORD, DWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-typedef int (WINAPI *LPFN_WSASENDDISCONNECT)(SOCKET, LPWSABUF);
-typedef int (WINAPI *LPFN_WSASENDTO)(SOCKET, LPWSABUF, DWORD, LPDWORD, DWORD, const struct sockaddr *, int, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE);
-typedef BOOL (WINAPI *LPFN_WSASETEVENT)(WSAEVENT);
-typedef INT (WINAPI *LPFN_WSASETSERVICEA)(LPWSAQUERYSETA, WSAESETSERVICEOP, DWORD);
-typedef INT (WINAPI *LPFN_WSASETSERVICEW)(LPWSAQUERYSETW, WSAESETSERVICEOP, DWORD);
-typedef SOCKET (WINAPI *LPFN_WSASOCKETA)(int, int, int, LPWSAPROTOCOL_INFOA, GROUP, DWORD);
-typedef SOCKET (WINAPI *LPFN_WSASOCKETW)(int, int, int, LPWSAPROTOCOL_INFOW, GROUP, DWORD);
-typedef INT (WINAPI *LPFN_WSASTRINGTOADDRESSA)(LPSTR, INT, LPWSAPROTOCOL_INFOA, LPSOCKADDR, LPINT);
-typedef INT (WINAPI *LPFN_WSASTRINGTOADDRESSW)(LPWSTR, INT, LPWSAPROTOCOL_INFOW, LPSOCKADDR, LPINT);
-typedef DWORD (WINAPI *LPFN_WSAWAITFORMULTIPLEEVENTS)(DWORD, const WSAEVENT *, BOOL, DWORD, BOOL);
-
-#ifdef UNICODE
-#define LPFN_WSAADDRESSTOSTRING LPFN_WSAADDRESSTOSTRINGW
-#define LPFN_WSADUPLICATESOCKET LPFN_WSADUPLICATESOCKETW
-#define LPFN_WSAENUMNAMESPACEPROVIDERS LPFN_WSAENUMNAMESPACEPROVIDERSW
-#define LPFN_WSAENUMPROTOCOLS LPFN_WSAENUMPROTOCOLSW
-#define LPFN_WSAGETSERVICECLASSINFO LPFN_WSAGETSERVICECLASSINFOW
-#define LPFN_WSAGETSERVICECLASSNAMEBYCLASSID LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDW
-#define LPFN_WSAINSTALLSERVICECLASS LPFN_WSAINSTALLSERVICECLASSW
-#define LPFN_WSALOOKUPSERVICEBEGIN LPFN_WSALOOKUPSERVICEBEGINW
-#define LPFN_WSALOOKUPSERVICENEXT LPFN_WSALOOKUPSERVICENEXTW
-#define LPFN_WSASETSERVICE  LPFN_WSASETSERVICEW
-#define LPFN_WSASOCKET LPFN_WSASOCKETW
-#define LPFN_WSASTRINGTOADDRESS LPFN_WSASTRINGTOADDRESSW
-#define WSAAddressToString WSAAddressToStringW
-#define WSADuplicateSocket WSADuplicateSocketW
-#define WSAEnumNameSpaceProviders WSAEnumNameSpaceProvidersW
-#define WSAEnumProtocols WSAEnumProtocolsW
-#define WSAGetServiceClassInfo WSAGetServiceClassInfoW
-#define WSAGetServiceClassNameByClassId WSAGetServiceClassNameByClassIdW
-#define WSASetService WSASetServiceW
-#define WSASocket WSASocketW
-#define WSAStringToAddress WSAStringToAddressW
-#define WSALookupServiceBegin WSALookupServiceBeginW
-#define WSALookupServiceNext WSALookupServiceNextW
-#define WSAInstallServiceClass WSAInstallServiceClassW
-#else
-#define LPFN_WSAADDRESSTOSTRING LPFN_WSAADDRESSTOSTRINGA
-#define LPFN_WSADUPLICATESOCKET LPFN_WSADUPLICATESOCKETW
-#define LPFN_WSAENUMNAMESPACEPROVIDERS LPFN_WSAENUMNAMESPACEPROVIDERSA
-#define LPFN_WSAENUMPROTOCOLS LPFN_WSAENUMPROTOCOLSA
-#define LPFN_WSAGETSERVICECLASSINFO LPFN_WSAGETSERVICECLASSINFOA
-#define LPFN_WSAGETSERVICECLASSNAMEBYCLASSID LPFN_WSAGETSERVICECLASSNAMEBYCLASSIDA
-#define LPFN_WSAINSTALLSERVICECLASS LPFN_WSAINSTALLSERVICECLASSA
-#define LPFN_WSALOOKUPSERVICEBEGIN LPFN_WSALOOKUPSERVICEBEGINA
-#define LPFN_WSALOOKUPSERVICENEXT LPFN_WSALOOKUPSERVICENEXTA
-#define LPFN_WSASETSERVICE  LPFN_WSASETSERVICEA
-#define LPFN_WSASOCKET LPFN_WSASOCKETA
-#define LPFN_WSASTRINGTOADDRESS LPFN_WSASTRINGTOADDRESSA
-#define WSAAddressToString WSAAddressToStringA
-#define WSADuplicateSocket WSADuplicateSocketA
-#define WSAEnumNameSpaceProviders WSAEnumNameSpaceProvidersA
-#define WSAEnumProtocols WSAEnumProtocolsA
-#define WSAGetServiceClassInfo WSAGetServiceClassInfoA
-#define WSAGetServiceClassNameByClassId WSAGetServiceClassNameByClassIdA
-#define WSAInstallServiceClass WSAInstallServiceClassA
-#define WSALookupServiceBegin WSALookupServiceBeginA
-#define WSALookupServiceNext WSALookupServiceNextA
-#define WSASocket WSASocketA
-#define WSAStringToAddress WSAStringToAddressA
-#define WSASetService WSASetServiceA
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/winspool.h b/winsup/w32api/include/winspool.h
deleted file mode 100644
index cc803ca27..000000000
--- a/winsup/w32api/include/winspool.h
+++ /dev/null
@@ -1,791 +0,0 @@
-#ifndef _WINSPOOL_H
-#define _WINSPOOL_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define DI_CHANNEL 1
-#define DI_CHANNEL_WRITE 2
-#define DI_READ_SPOOL_JOB 3
-#define	FORM_BUILTIN	1
-#define	JOB_CONTROL_PAUSE	1
-#define	JOB_CONTROL_RESUME	2
-#define	JOB_CONTROL_CANCEL	3
-#define	JOB_CONTROL_RESTART	4
-#define	JOB_CONTROL_DELETE	5
-#define	JOB_STATUS_PAUSED	1
-#define	JOB_STATUS_ERROR	2
-#define	JOB_STATUS_DELETING	4
-#define	JOB_STATUS_SPOOLING	8
-#define	JOB_STATUS_PRINTING	16
-#define	JOB_STATUS_OFFLINE	32
-#define	JOB_STATUS_PAPEROUT	0x40
-#define	JOB_STATUS_PRINTED	0x80
-#define	JOB_STATUS_DELETED	0x100
-#define	JOB_STATUS_BLOCKED_DEVQ	0x200
-#define	JOB_STATUS_USER_INTERVENTION	0x400
-#define	JOB_POSITION_UNSPECIFIED	0
-#define	JOB_NOTIFY_TYPE	1
-#define	JOB_NOTIFY_FIELD_PRINTER_NAME	0
-#define	JOB_NOTIFY_FIELD_MACHINE_NAME	1
-#define	JOB_NOTIFY_FIELD_PORT_NAME	2
-#define	JOB_NOTIFY_FIELD_USER_NAME	3
-#define	JOB_NOTIFY_FIELD_NOTIFY_NAME	4
-#define	JOB_NOTIFY_FIELD_DATATYPE	5
-#define	JOB_NOTIFY_FIELD_PRINT_PROCESSOR	6
-#define	JOB_NOTIFY_FIELD_PARAMETERS	7
-#define	JOB_NOTIFY_FIELD_DRIVER_NAME	8
-#define	JOB_NOTIFY_FIELD_DEVMODE	9
-#define	JOB_NOTIFY_FIELD_STATUS	10
-#define	JOB_NOTIFY_FIELD_STATUS_STRING	11
-#define	JOB_NOTIFY_FIELD_SECURITY_DESCRIPTOR	12
-#define	JOB_NOTIFY_FIELD_DOCUMENT	13
-#define	JOB_NOTIFY_FIELD_PRIORITY	14
-#define	JOB_NOTIFY_FIELD_POSITION	15
-#define	JOB_NOTIFY_FIELD_SUBMITTED	16
-#define	JOB_NOTIFY_FIELD_START_TIME	17
-#define	JOB_NOTIFY_FIELD_UNTIL_TIME	18
-#define	JOB_NOTIFY_FIELD_TIME	19
-#define	JOB_NOTIFY_FIELD_TOTAL_PAGES	20
-#define	JOB_NOTIFY_FIELD_PAGES_PRINTED	21
-#define	JOB_NOTIFY_FIELD_TOTAL_BYTES	22
-#define	JOB_NOTIFY_FIELD_BYTES_PRINTED	23
-#define	JOB_ACCESS_ADMINISTER	16
-#define	JOB_ALL_ACCESS	(STANDARD_RIGHTS_REQUIRED|JOB_ACCESS_ADMINISTER)
-#define	JOB_READ	(STANDARD_RIGHTS_READ|	JOB_ACCESS_ADMINISTER)
-#define	JOB_WRITE	(STANDARD_RIGHTS_WRITE|JOB_ACCESS_ADMINISTER)
-#define	JOB_EXECUTE	(STANDARD_RIGHTS_EXECUTE|JOB_ACCESS_ADMINISTER)
-#define	PRINTER_NOTIFY_OPTIONS_REFRESH	1
-#define	PRINTER_ACCESS_ADMINISTER	4
-#define	PRINTER_ACCESS_USE	8
-#define	PRINTER_ERROR_INFORMATION	0x80000000
-#define	PRINTER_ERROR_WARNING	0x40000000
-#define	PRINTER_ERROR_SEVERE	0x20000000
-#define	PRINTER_ERROR_OUTOFPAPER	1
-#define	PRINTER_ERROR_JAM	2
-#define	PRINTER_ERROR_OUTOFTONER	4
-#define	PRINTER_CONTROL_PAUSE	1
-#define	PRINTER_CONTROL_RESUME	2
-#define	PRINTER_CONTROL_PURGE	3
-#define	PRINTER_CONTROL_SET_STATUS	4
-#define	PRINTER_STATUS_PAUSED	1
-#define	PRINTER_STATUS_ERROR	2
-#define	PRINTER_STATUS_PENDING_DELETION	4
-#define	PRINTER_STATUS_PAPER_JAM	8
-#define	PRINTER_STATUS_PAPER_OUT	0x10
-#define	PRINTER_STATUS_MANUAL_FEED	0x20
-#define	PRINTER_STATUS_PAPER_PROBLEM	0x40
-#define	PRINTER_STATUS_OFFLINE	0x80
-#define	PRINTER_STATUS_IO_ACTIVE	0x100
-#define	PRINTER_STATUS_BUSY	0x200
-#define	PRINTER_STATUS_PRINTING	0x400
-#define	PRINTER_STATUS_OUTPUT_BIN_FULL	0x800
-#define	PRINTER_STATUS_NOT_AVAILABLE	0x1000
-#define	PRINTER_STATUS_WAITING	0x2000
-#define	PRINTER_STATUS_PROCESSING	0x4000
-#define	PRINTER_STATUS_INITIALIZING	0x8000
-#define	PRINTER_STATUS_WARMING_UP	0x10000
-#define	PRINTER_STATUS_TONER_LOW	0x20000
-#define	PRINTER_STATUS_NO_TONER	0x40000
-#define	PRINTER_STATUS_PAGE_PUNT	0x80000
-#define	PRINTER_STATUS_USER_INTERVENTION	0x100000
-#define	PRINTER_STATUS_OUT_OF_MEMORY	0x200000
-#define	PRINTER_STATUS_DOOR_OPEN	0x400000
-#define	PRINTER_STATUS_SERVER_UNKNOWN	0x800000
-#define	PRINTER_STATUS_POWER_SAVE	0x1000000
-#define	PRINTER_ATTRIBUTE_QUEUED	1
-#define	PRINTER_ATTRIBUTE_DIRECT	2
-#define	PRINTER_ATTRIBUTE_DEFAULT	4
-#define	PRINTER_ATTRIBUTE_SHARED	8
-#define	PRINTER_ATTRIBUTE_NETWORK	0x10
-#define	PRINTER_ATTRIBUTE_HIDDEN	0x20
-#define	PRINTER_ATTRIBUTE_LOCAL	0x40
-#define	PRINTER_ATTRIBUTE_ENABLE_DEVQ	0x80
-#define	PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS	0x100
-#define	PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST	0x200
-#define	PRINTER_ATTRIBUTE_WORK_OFFLINE	0x400
-#define	PRINTER_ATTRIBUTE_ENABLE_BIDI	0x800
-#define	PRINTER_ATTRIBUTE_RAW_ONLY	0x1000
-#define	PRINTER_ATTRIBUTE_PUBLISHED	0x2000
-#define	PRINTER_ENUM_DEFAULT	1
-#define	PRINTER_ENUM_LOCAL	2
-#define	PRINTER_ENUM_CONNECTIONS	4
-#define	PRINTER_ENUM_FAVORITE	4
-#define	PRINTER_ENUM_NAME	8
-#define	PRINTER_ENUM_REMOTE	16
-#define	PRINTER_ENUM_SHARED	32
-#define	PRINTER_ENUM_NETWORK	0x40
-#define	PRINTER_ENUM_EXPAND	0x4000
-#define	PRINTER_ENUM_CONTAINER	0x8000
-#define	PRINTER_ENUM_ICONMASK	0xff0000
-#define	PRINTER_ENUM_ICON1	0x10000
-#define	PRINTER_ENUM_ICON2	0x20000
-#define	PRINTER_ENUM_ICON3	0x40000
-#define	PRINTER_ENUM_ICON4	0x80000
-#define	PRINTER_ENUM_ICON5	0x100000
-#define	PRINTER_ENUM_ICON6	0x200000
-#define	PRINTER_ENUM_ICON7	0x400000
-#define	PRINTER_ENUM_ICON8	0x800000
-#define PRINTER_NOTIFY_TYPE	0
-#define PRINTER_NOTIFY_FIELD_SERVER_NAME	0
-#define PRINTER_NOTIFY_FIELD_PRINTER_NAME	1
-#define PRINTER_NOTIFY_FIELD_SHARE_NAME	2
-#define PRINTER_NOTIFY_FIELD_PORT_NAME	3
-#define PRINTER_NOTIFY_FIELD_DRIVER_NAME	4
-#define PRINTER_NOTIFY_FIELD_COMMENT	5
-#define PRINTER_NOTIFY_FIELD_LOCATION	6
-#define PRINTER_NOTIFY_FIELD_DEVMODE	7
-#define PRINTER_NOTIFY_FIELD_SEPFILE	8
-#define PRINTER_NOTIFY_FIELD_PRINT_PROCESSOR	9
-#define PRINTER_NOTIFY_FIELD_PARAMETERS	10
-#define PRINTER_NOTIFY_FIELD_DATATYPE	11
-#define PRINTER_NOTIFY_FIELD_SECURITY_DESCRIPTOR	12
-#define PRINTER_NOTIFY_FIELD_ATTRIBUTES	13
-#define PRINTER_NOTIFY_FIELD_PRIORITY	14
-#define PRINTER_NOTIFY_FIELD_DEFAULT_PRIORITY	15
-#define PRINTER_NOTIFY_FIELD_START_TIME	16
-#define PRINTER_NOTIFY_FIELD_UNTIL_TIME	17
-#define PRINTER_NOTIFY_FIELD_STATUS	18
-#define PRINTER_NOTIFY_FIELD_STATUS_STRING	19
-#define PRINTER_NOTIFY_FIELD_CJOBS	20
-#define PRINTER_NOTIFY_FIELD_AVERAGE_PPM	21
-#define PRINTER_NOTIFY_FIELD_TOTAL_PAGES	22
-#define PRINTER_NOTIFY_FIELD_PAGES_PRINTED	23
-#define PRINTER_NOTIFY_FIELD_TOTAL_BYTES	24
-#define PRINTER_NOTIFY_FIELD_BYTES_PRINTED	25
-#define PRINTER_CHANGE_ADD_PRINTER	1
-#define PRINTER_CHANGE_SET_PRINTER	2
-#define PRINTER_CHANGE_DELETE_PRINTER	4
-#define PRINTER_CHANGE_FAILED_CONNECTION_PRINTER	8
-#define PRINTER_CHANGE_PRINTER	0xFF
-#define PRINTER_CHANGE_ADD_JOB	0x100
-#define PRINTER_CHANGE_SET_JOB	0x200
-#define PRINTER_CHANGE_DELETE_JOB	0x400
-#define PRINTER_CHANGE_WRITE_JOB	0x800
-#define PRINTER_CHANGE_JOB	0xFF00
-#define PRINTER_CHANGE_ADD_FORM	0x10000
-#define PRINTER_CHANGE_SET_FORM	0x20000
-#define PRINTER_CHANGE_DELETE_FORM	0x40000
-#define PRINTER_CHANGE_FORM	0x70000
-#define PRINTER_CHANGE_ADD_PORT	0x100000
-#define PRINTER_CHANGE_CONFIGURE_PORT	0x200000
-#define PRINTER_CHANGE_DELETE_PORT	0x400000
-#define PRINTER_CHANGE_PORT	0x700000
-#define PRINTER_CHANGE_ADD_PRINT_PROCESSOR	0x1000000
-#define PRINTER_CHANGE_DELETE_PRINT_PROCESSOR	0x4000000
-#define PRINTER_CHANGE_PRINT_PROCESSOR	0x7000000
-#define PRINTER_CHANGE_ADD_PRINTER_DRIVER	0x10000000
-#define PRINTER_CHANGE_SET_PRINTER_DRIVER	0x20000000
-#define PRINTER_CHANGE_DELETE_PRINTER_DRIVER	0x40000000
-#define PRINTER_CHANGE_PRINTER_DRIVER	0x70000000
-#define PRINTER_CHANGE_TIMEOUT	0x80000000
-#define PRINTER_CHANGE_ALL	0x7777FFFF
-#define PRINTER_NOTIFY_INFO_DISCARDED	1
-#define PRINTER_ALL_ACCESS	(STANDARD_RIGHTS_REQUIRED|PRINTER_ACCESS_ADMINISTER|PRINTER_ACCESS_USE)
-#define PRINTER_READ	(STANDARD_RIGHTS_READ|PRINTER_ACCESS_USE)
-#define PRINTER_WRITE	(STANDARD_RIGHTS_WRITE|PRINTER_ACCESS_USE)
-#define PRINTER_EXECUTE	(STANDARD_RIGHTS_EXECUTE|PRINTER_ACCESS_USE)
-#define NO_PRIORITY	0
-#define MAX_PRIORITY	99
-#define MIN_PRIORITY	1
-#define DEF_PRIORITY	1
-#define PORT_TYPE_WRITE	1
-#define PORT_TYPE_READ	2
-#define PORT_TYPE_REDIRECTED	4
-#define PORT_TYPE_NET_ATTACHED	8
-#define SERVER_ACCESS_ADMINISTER	1
-#define SERVER_ACCESS_ENUMERATE	2
-#define SERVER_ALL_ACCESS	(STANDARD_RIGHTS_REQUIRED|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE)
-#define SERVER_READ	(STANDARD_RIGHTS_READ|SERVER_ACCESS_ENUMERATE)
-#define SERVER_WRITE	(STANDARD_RIGHTS_WRITE|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE)
-#define SERVER_EXECUTE	(STANDARD_RIGHTS_EXECUTE|SERVER_ACCESS_ENUMERATE)
-#define PORT_STATUS_TYPE_ERROR	1
-#define PORT_STATUS_TYPE_WARNING	2
-#define PORT_STATUS_TYPE_INFO	3
-#define PORT_STATUS_OFFLINE	1
-#define PORT_STATUS_PAPER_JAM	2
-#define PORT_STATUS_PAPER_OUT	3
-#define PORT_STATUS_OUTPUT_BIN_FULL	4
-#define PORT_STATUS_PAPER_PROBLEM	5
-#define PORT_STATUS_NO_TONER	6
-#define PORT_STATUS_DOOR_OPEN	7
-#define PORT_STATUS_USER_INTERVENTION	8
-#define PORT_STATUS_OUT_OF_MEMORY	9
-#define PORT_STATUS_TONER_LOW	10
-#define PORT_STATUS_WARMING_UP	11
-#define PORT_STATUS_POWER_SAVE	12
-#ifndef RC_INVOKED
-typedef struct _ADDJOB_INFO_1A {
-	LPSTR Path;
-	DWORD JobId;
-} ADDJOB_INFO_1A,*PADDJOB_INFO_1A,*LPADDJOB_INFO_1A;
-typedef struct _ADDJOB_INFO_1W {
-	LPWSTR Path;
-	DWORD JobId;
-} ADDJOB_INFO_1W,*PADDJOB_INFO_1W,*LPADDJOB_INFO_1W;
-typedef struct _DATATYPES_INFO_1A{LPSTR pName;} DATATYPES_INFO_1A,*PDATATYPES_INFO_1A,*LPDATATYPES_INFO_1A;
-typedef struct _DATATYPES_INFO_1W{LPWSTR pName;} DATATYPES_INFO_1W,*PDATATYPES_INFO_1W,*LPDATATYPES_INFO_1W;
-typedef struct _JOB_INFO_1A {
-	DWORD JobId;
-	LPSTR pPrinterName;
-	LPSTR pMachineName;
-	LPSTR pUserName;
-	LPSTR pDocument;
-	LPSTR pDatatype;
-	LPSTR pStatus;
-	DWORD Status;
-	DWORD Priority;
-	DWORD Position;
-	DWORD TotalPages;
-	DWORD PagesPrinted;
-	SYSTEMTIME Submitted;
-} JOB_INFO_1A,*PJOB_INFO_1A,*LPJOB_INFO_1A;
-typedef struct _JOB_INFO_1W {
-	DWORD JobId;
-	LPWSTR pPrinterName;
-	LPWSTR pMachineName;
-	LPWSTR pUserName;
-	LPWSTR pDocument;
-	LPWSTR pDatatype;
-	LPWSTR pStatus;
-	DWORD Status;
-	DWORD Priority;
-	DWORD Position;
-	DWORD TotalPages;
-	DWORD PagesPrinted;
-	SYSTEMTIME Submitted;
-} JOB_INFO_1W,*PJOB_INFO_1W,*LPJOB_INFO_1W;
-typedef struct _JOB_INFO_2A {
-	DWORD JobId;
-	LPSTR pPrinterName;
-	LPSTR pMachineName;
-	LPSTR pUserName;
-	LPSTR pDocument;
-	LPSTR pNotifyName;
-	LPSTR pDatatype;
-	LPSTR pPrintProcessor;
-	LPSTR pParameters;
-	LPSTR pDriverName;
-	LPDEVMODEA pDevMode;
-	LPSTR pStatus;
-	PSECURITY_DESCRIPTOR pSecurityDescriptor;
-	DWORD Status;
-	DWORD Priority;
-	DWORD Position;
-	DWORD StartTime;
-	DWORD UntilTime;
-	DWORD TotalPages;
-	DWORD Size;
-	SYSTEMTIME Submitted;
-	DWORD Time;
-	DWORD PagesPrinted;
-} JOB_INFO_2A,*PJOB_INFO_2A,*LPJOB_INFO_2A;
-typedef struct _JOB_INFO_2W {
-	DWORD JobId;
-	LPWSTR pPrinterName;
-	LPWSTR pMachineName;
-	LPWSTR pUserName;
-	LPWSTR pDocument;
-	LPWSTR pNotifyName;
-	LPWSTR pDatatype;
-	LPWSTR pPrintProcessor;
-	LPWSTR pParameters;
-	LPWSTR pDriverName;
-	LPDEVMODEW pDevMode;
-	LPWSTR pStatus;
-	PSECURITY_DESCRIPTOR pSecurityDescriptor;
-	DWORD Status;
-	DWORD Priority;
-	DWORD Position;
-	DWORD StartTime;
-	DWORD UntilTime;
-	DWORD TotalPages;
-	DWORD Size;
-	SYSTEMTIME Submitted;
-	DWORD Time;
-	DWORD PagesPrinted;
-} JOB_INFO_2W,*PJOB_INFO_2W,*LPJOB_INFO_2W;
-typedef struct _DOC_INFO_1A {
-	LPSTR pDocName;
-	LPSTR pOutputFile;
-	LPSTR pDatatype;
-} DOC_INFO_1A,*PDOC_INFO_1A,*LPDOC_INFO_1A;
-typedef struct _DOC_INFO_1W {
-	LPWSTR pDocName;
-	LPWSTR pOutputFile;
-	LPWSTR pDatatype;
-} DOC_INFO_1W,*PDOC_INFO_1W,*LPDOC_INFO_1W;
-typedef struct _DOC_INFO_2A {
-	LPSTR pDocName;
-	LPSTR pOutputFile;
-	LPSTR pDatatype;
-	DWORD dwMode;
-	DWORD JobId;
-} DOC_INFO_2A,*PDOC_INFO_2A,*LPDOC_INFO_2A;
-typedef struct _DOC_INFO_2W {
-	LPWSTR pDocName;
-	LPWSTR pOutputFile;
-	LPWSTR pDatatype;
-	DWORD dwMode;
-	DWORD JobId;
-} DOC_INFO_2W,*PDOC_INFO_2W,*LPDOC_INFO_2W;
-typedef	struct	_DRIVER_INFO_1A	{LPSTR	pName;} DRIVER_INFO_1A,*PDRIVER_INFO_1A,*LPDRIVER_INFO_1A;
-typedef	struct	_DRIVER_INFO_1W	{LPWSTR	pName;} DRIVER_INFO_1W,*PDRIVER_INFO_1W,*LPDRIVER_INFO_1W;
-typedef	struct	_DRIVER_INFO_2A	{
-	DWORD cVersion;
-	LPSTR pName;
-	LPSTR pEnvironment;
-	LPSTR pDriverPath;
-	LPSTR pDataFile;
-	LPSTR pConfigFile;
-} DRIVER_INFO_2A,*PDRIVER_INFO_2A,*LPDRIVER_INFO_2A;
-typedef	struct	_DRIVER_INFO_2W	{
-	DWORD cVersion;
-	LPWSTR pName;
-	LPWSTR pEnvironment;
-	LPWSTR pDriverPath;
-	LPWSTR pDataFile;
-	LPWSTR pConfigFile;
-}	DRIVER_INFO_2W,*PDRIVER_INFO_2W,*LPDRIVER_INFO_2W;
-typedef	struct	_DRIVER_INFO_3A	{
-	DWORD cVersion;
-	LPSTR pName;
-	LPSTR pEnvironment;
-	LPSTR pDriverPath;
-	LPSTR pDataFile;
-	LPSTR pConfigFile;
-	LPSTR pHelpFile;
-	LPSTR pDependentFiles;
-	LPSTR pMonitorName;
-	LPSTR pDefaultDataType;
-} DRIVER_INFO_3A,*PDRIVER_INFO_3A,*LPDRIVER_INFO_3A;
-typedef	struct	_DRIVER_INFO_3W	{
-	DWORD cVersion;
-	LPWSTR pName;
-	LPWSTR pEnvironment;
-	LPWSTR pDriverPath;
-	LPWSTR pDataFile;
-	LPWSTR pConfigFile;
-	LPWSTR pHelpFile;
-	LPWSTR pDependentFiles;
-	LPWSTR pMonitorName;
-	LPWSTR pDefaultDataType;
-} DRIVER_INFO_3W,*PDRIVER_INFO_3W,*LPDRIVER_INFO_3W;
-typedef struct _MONITOR_INFO_1A{LPSTR pName;} MONITOR_INFO_1A,*PMONITOR_INFO_1A,*LPMONITOR_INFO_1A;
-typedef struct _MONITOR_INFO_1W{LPWSTR pName;} MONITOR_INFO_1W,*PMONITOR_INFO_1W,*LPMONITOR_INFO_1W;
-typedef struct _PORT_INFO_1A {LPSTR pName;} PORT_INFO_1A,*PPORT_INFO_1A,*LPPORT_INFO_1A;
-typedef struct _PORT_INFO_1W {LPWSTR pName;} PORT_INFO_1W,*PPORT_INFO_1W,*LPPORT_INFO_1W;
-typedef struct _MONITOR_INFO_2A{
-	LPSTR pName;
-	LPSTR pEnvironment;
-	LPSTR pDLLName;
-} MONITOR_INFO_2A,*PMONITOR_INFO_2A,*LPMONITOR_INFO_2A;
-typedef struct _MONITOR_INFO_2W{
-	LPWSTR pName;
-	LPWSTR pEnvironment;
-	LPWSTR pDLLName;
-} MONITOR_INFO_2W,*PMONITOR_INFO_2W,*LPMONITOR_INFO_2W;
-typedef struct _PORT_INFO_2A {
-	LPSTR pPortName;
-	LPSTR pMonitorName;
-	LPSTR pDescription;
-	DWORD fPortType;
-	DWORD Reserved;
-} PORT_INFO_2A,*PPORT_INFO_2A,*LPPORT_INFO_2A;
-typedef struct _PORT_INFO_2W {
-	LPWSTR pPortName;
-	LPWSTR pMonitorName;
-	LPWSTR pDescription;
-	DWORD fPortType;
-	DWORD Reserved;
-} PORT_INFO_2W,*PPORT_INFO_2W,*LPPORT_INFO_2W;
-typedef struct _PORT_INFO_3A {
-	DWORD dwStatus;
-	LPSTR pszStatus;
-	DWORD dwSeverity;
-} PORT_INFO_3A,*PPORT_INFO_3A,*LPPORT_INFO_3A;
-typedef struct _PORT_INFO_3W {
-	DWORD dwStatus;
-	LPWSTR pszStatus;
-	DWORD dwSeverity;
-} PORT_INFO_3W,*PPORT_INFO_3W,*LPPORT_INFO_3W;
-typedef	struct _PRINTER_INFO_1A {
-	DWORD Flags;
-	LPSTR pDescription;
-	LPSTR pName;
-	LPSTR pComment;
-} PRINTER_INFO_1A,*PPRINTER_INFO_1A,*LPPRINTER_INFO_1A;
-typedef	struct _PRINTER_INFO_1W	{
-	DWORD Flags;
-	LPWSTR pDescription;
-	LPWSTR pName;
-	LPWSTR pComment;
-} PRINTER_INFO_1W,*PPRINTER_INFO_1W,*LPPRINTER_INFO_1W;
-typedef	struct _PRINTER_INFO_2A {
-	LPSTR pServerName;
-	LPSTR pPrinterName;
-	LPSTR pShareName;
-	LPSTR pPortName;
-	LPSTR pDriverName;
-	LPSTR pComment;
-	LPSTR pLocation;
-	LPDEVMODEA pDevMode;
-	LPSTR pSepFile;
-	LPSTR pPrintProcessor;
-	LPSTR pDatatype;
-	LPSTR pParameters;
-	PSECURITY_DESCRIPTOR pSecurityDescriptor;
-	DWORD Attributes;
-	DWORD Priority;
-	DWORD DefaultPriority;
-	DWORD StartTime;
-	DWORD UntilTime;
-	DWORD Status;
-	DWORD cJobs;
-	DWORD AveragePPM;
-} PRINTER_INFO_2A,*PPRINTER_INFO_2A,*LPPRINTER_INFO_2A;
-typedef	struct _PRINTER_INFO_2W {
-	LPWSTR pServerName;
-	LPWSTR pPrinterName;
-	LPWSTR pShareName;
-	LPWSTR pPortName;
-	LPWSTR pDriverName;
-	LPWSTR pComment;
-	LPWSTR pLocation;
-	LPDEVMODEW pDevMode;
-	LPWSTR pSepFile;
-	LPWSTR pPrintProcessor;
-	LPWSTR pDatatype;
-	LPWSTR pParameters;
-	PSECURITY_DESCRIPTOR pSecurityDescriptor;
-	DWORD Attributes;
-	DWORD Priority;
-	DWORD DefaultPriority;
-	DWORD StartTime;
-	DWORD UntilTime;
-	DWORD Status;
-	DWORD cJobs;
-	DWORD AveragePPM;
-} PRINTER_INFO_2W,*PPRINTER_INFO_2W,*LPPRINTER_INFO_2W;
-typedef	struct _PRINTER_INFO_3	{
-	PSECURITY_DESCRIPTOR pSecurityDescriptor;
-} PRINTER_INFO_3,*PPRINTER_INFO_3,*LPPRINTER_INFO_3;
-typedef	struct _PRINTER_INFO_4A {
-	LPSTR pPrinterName;
-	LPSTR pServerName;
-	DWORD Attributes;
-} PRINTER_INFO_4A,*PPRINTER_INFO_4A,*LPPRINTER_INFO_4A;
-typedef	struct _PRINTER_INFO_4W	{
-	LPWSTR pPrinterName;
-	LPWSTR pServerName;
-	DWORD Attributes;
-} PRINTER_INFO_4W,*PPRINTER_INFO_4W,*LPPRINTER_INFO_4W;
-typedef	struct _PRINTER_INFO_5A	{
-	LPSTR pPrinterName;
-	LPSTR pPortName;
-	DWORD Attributes;
-	DWORD DeviceNotSelectedTimeout;
-	DWORD TransmissionRetryTimeout;
-} PRINTER_INFO_5A,*PPRINTER_INFO_5A,*LPPRINTER_INFO_5A;
-typedef	struct _PRINTER_INFO_5W	{
-	LPWSTR pPrinterName;
-	LPWSTR pPortName;
-	DWORD Attributes;
-	DWORD DeviceNotSelectedTimeout;
-	DWORD TransmissionRetryTimeout;
-} PRINTER_INFO_5W,*PPRINTER_INFO_5W,*LPPRINTER_INFO_5W;
-typedef struct _PRINTER_INFO_6 {
-	DWORD	dwStatus;
-} PRINTER_INFO_6,*PPRINTER_INFO_6,*LPPRINTER_INFO_6;
-typedef	struct _PRINTPROCESSOR_INFO_1A {LPSTR pName;} PRINTPROCESSOR_INFO_1A,*PPRINTPROCESSOR_INFO_1A,*LPPRINTPROCESSOR_INFO_1A;
-typedef	struct _PRINTPROCESSOR_INFO_1W {LPWSTR pName;} PRINTPROCESSOR_INFO_1W,*PPRINTPROCESSOR_INFO_1W,*LPPRINTPROCESSOR_INFO_1W;
-typedef	struct	_PRINTER_NOTIFY_INFO_DATA {
-	WORD Type;
-	WORD Field;
-	DWORD Reserved;
-	DWORD Id;
-	union {
-		DWORD adwData[2];
-		struct {
-			DWORD cbBuf;
-			PVOID pBuf;
-		} Data;
-	} NotifyData;
-} PRINTER_NOTIFY_INFO_DATA,*PPRINTER_NOTIFY_INFO_DATA,*LPPRINTER_NOTIFY_INFO_DATA;
-typedef	struct	_PRINTER_NOTIFY_INFO {
-	DWORD Version;
-	DWORD Flags;
-	DWORD Count;
-	PRINTER_NOTIFY_INFO_DATA aData[1];
-} PRINTER_NOTIFY_INFO,*PPRINTER_NOTIFY_INFO,*LPPRINTER_NOTIFY_INFO;
-typedef	struct _FORM_INFO_1A {
-	DWORD	Flags;
-	LPSTR	pName;
-	SIZEL	Size;
-	RECTL	ImageableArea;
-} FORM_INFO_1A,*PFORM_INFO_1A,*LPFORM_INFO_1A;
-typedef	struct _FORM_INFO_1W {
-	DWORD	Flags;
-	LPWSTR	pName;
-	SIZEL	Size;
-	RECTL	ImageableArea;
-} FORM_INFO_1W,*PFORM_INFO_1W,*LPFORM_INFO_1W;
-typedef	struct _PRINTER_DEFAULTSA {
-	LPSTR pDatatype;
-	LPDEVMODE pDevMode;
-	ACCESS_MASK	DesiredAccess;
-} PRINTER_DEFAULTSA,*PPRINTER_DEFAULTSA,*LPPRINTER_DEFAULTSA;
-typedef	struct _PRINTER_DEFAULTSW {
-	LPWSTR pDatatype;
-	LPDEVMODE pDevMode;
-	ACCESS_MASK DesiredAccess;
-} PRINTER_DEFAULTSW,*PPRINTER_DEFAULTSW,*LPPRINTER_DEFAULTSW;
-
-BOOL WINAPI AbortPrinter(HANDLE);
-BOOL WINAPI AddFormA(HANDLE,DWORD,PBYTE);
-BOOL WINAPI AddFormW(HANDLE,DWORD,PBYTE);
-BOOL WINAPI AddJobA(HANDLE,DWORD,PBYTE,DWORD,PDWORD);
-BOOL WINAPI AddJobW(HANDLE,DWORD,PBYTE,DWORD,PDWORD);
-BOOL WINAPI AddMonitorA(LPSTR,DWORD,PBYTE);
-BOOL WINAPI AddMonitorW(LPWSTR,DWORD,PBYTE);
-BOOL WINAPI AddPortA(LPSTR,HWND,LPSTR);
-BOOL WINAPI AddPortW(LPWSTR,HWND,LPWSTR);
-HANDLE WINAPI AddPrinterA(LPSTR,DWORD,PBYTE);
-HANDLE WINAPI AddPrinterW(LPWSTR,DWORD,PBYTE);
-BOOL WINAPI AddPrinterConnectionA(LPSTR);
-BOOL WINAPI AddPrinterConnectionW(LPWSTR);
-BOOL WINAPI AddPrinterDriverA(LPSTR,DWORD,PBYTE);
-BOOL WINAPI AddPrinterDriverW(LPWSTR,DWORD,PBYTE);
-BOOL WINAPI AddPrintProcessorA(LPSTR,LPSTR,LPSTR,LPSTR);
-BOOL WINAPI AddPrintProcessorW(LPWSTR,LPWSTR,LPWSTR,LPWSTR);
-BOOL WINAPI AddPrintProvidorA(LPSTR,DWORD,PBYTE);
-BOOL WINAPI AddPrintProvidorW(LPWSTR,DWORD,PBYTE);
-LONG WINAPI AdvancedDocumentPropertiesA(HWND,HANDLE,LPSTR,PDEVMODE,PDEVMODEA);
-LONG WINAPI AdvancedDocumentPropertiesW(HWND,HANDLE,LPWSTR,PDEVMODE,PDEVMODEW);
-BOOL WINAPI ClosePrinter(HANDLE);
-BOOL WINAPI ConfigurePortA(LPSTR,HWND,LPSTR);
-BOOL WINAPI ConfigurePortW(LPWSTR,HWND,LPWSTR);
-HANDLE WINAPI ConnectToPrinterDlg(HWND,DWORD);
-BOOL WINAPI DeleteFormA(HANDLE,LPSTR);
-BOOL WINAPI DeleteFormW(HANDLE,LPWSTR);
-BOOL WINAPI DeleteMonitorA(LPSTR,LPSTR,LPSTR);
-BOOL WINAPI DeleteMonitorW(LPWSTR,LPWSTR,LPWSTR);
-BOOL WINAPI DeletePortA(LPSTR,HWND,LPSTR);
-BOOL WINAPI DeletePortW(LPWSTR,HWND,LPWSTR);
-BOOL WINAPI DeletePrinter(HANDLE);
-BOOL WINAPI DeletePrinterConnectionA(LPSTR);
-BOOL WINAPI DeletePrinterConnectionW(LPWSTR);
-DWORD WINAPI DeletePrinterDataA(HANDLE,LPSTR);
-DWORD WINAPI DeletePrinterDataW(HANDLE,LPWSTR);
-BOOL WINAPI DeletePrinterDriverA(LPSTR,LPSTR,LPSTR);
-BOOL WINAPI DeletePrinterDriverW(LPWSTR,LPWSTR,LPWSTR);
-BOOL WINAPI DeletePrintProcessorA(LPSTR,LPSTR,LPSTR);
-BOOL WINAPI DeletePrintProcessorW(LPWSTR,LPWSTR,LPWSTR);
-BOOL WINAPI DeletePrintProvidorA(LPSTR,LPSTR,LPSTR);
-BOOL WINAPI DeletePrintProvidorW(LPWSTR,LPWSTR,LPWSTR);
-LONG WINAPI DocumentPropertiesA(HWND,HANDLE,LPSTR,PDEVMODEA,PDEVMODEA,DWORD);
-LONG WINAPI DocumentPropertiesW(HWND,HANDLE,LPWSTR,PDEVMODEA,PDEVMODEA,DWORD);
-BOOL WINAPI EndDocPrinter(HANDLE);
-BOOL WINAPI EndPagePrinter(HANDLE);
-BOOL WINAPI EnumFormsA(HANDLE,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumFormsW(HANDLE,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumJobsA(HANDLE,DWORD,DWORD,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumJobsW(HANDLE,DWORD,DWORD,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumMonitorsA(LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumMonitorsW(LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumPortsA(LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumPortsW(LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-DWORD WINAPI EnumPrinterDataA(HANDLE,DWORD,LPSTR,DWORD,PDWORD,PDWORD,PBYTE,DWORD,PDWORD);
-DWORD WINAPI EnumPrinterDataW(HANDLE,DWORD,LPWSTR,DWORD,PDWORD,PDWORD,PBYTE,DWORD,PDWORD);
-BOOL WINAPI EnumPrinterDriversA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumPrinterDriversW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumPrintersA(DWORD,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumPrintersW(DWORD,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumPrintProcessorDatatypesA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumPrintProcessorDatatypesW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumPrintProcessorsA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumPrintProcessorsW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD);
-BOOL WINAPI FindClosePrinterChangeNotification(HANDLE);
-HANDLE WINAPI FindFirstPrinterChangeNotification(HANDLE,DWORD,DWORD,PVOID);
-HANDLE WINAPI FindNextPrinterChangeNotification(HANDLE,PDWORD,PVOID,PVOID*);
-BOOL WINAPI FreePrinterNotifyInfo(PPRINTER_NOTIFY_INFO);
-#if _WIN32_WINNT >= 0x0500
-BOOL WINAPI GetDefaultPrinterA(LPSTR,LPDWORD);
-BOOL WINAPI GetDefaultPrinterW(LPWSTR,LPDWORD);
-#endif
-BOOL WINAPI GetFormA(HANDLE,LPSTR,DWORD,PBYTE,DWORD,PDWORD);
-BOOL WINAPI GetFormW(HANDLE,LPWSTR,DWORD,PBYTE,DWORD,PDWORD);
-BOOL WINAPI GetJobA(HANDLE,DWORD,DWORD,PBYTE,DWORD,PDWORD);
-BOOL WINAPI GetJobW(HANDLE,DWORD,DWORD,PBYTE,DWORD,PDWORD);
-BOOL WINAPI GetPrinterA(HANDLE,DWORD,PBYTE,DWORD,PDWORD);
-BOOL WINAPI GetPrinterW(HANDLE,DWORD,PBYTE,DWORD,PDWORD);
-DWORD WINAPI GetPrinterDataA(HANDLE,LPSTR,PDWORD,PBYTE,DWORD,PDWORD);
-DWORD WINAPI GetPrinterDataW(HANDLE,LPWSTR,PDWORD,PBYTE,DWORD,PDWORD);
-DWORD WINAPI GetPrinterDriverA(HANDLE,LPSTR,DWORD,PBYTE,DWORD,PDWORD);
-DWORD WINAPI GetPrinterDriverW(HANDLE,LPWSTR,DWORD,PBYTE,DWORD,PDWORD);
-DWORD WINAPI GetPrinterDriverDirectoryA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD);
-DWORD WINAPI GetPrinterDriverDirectoryW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD);
-DWORD WINAPI GetPrintProcessorDirectoryA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD);
-DWORD WINAPI GetPrintProcessorDirectoryW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD);
-BOOL WINAPI OpenPrinterA(LPSTR,PHANDLE,LPPRINTER_DEFAULTSA);
-BOOL WINAPI OpenPrinterW(LPWSTR,PHANDLE,LPPRINTER_DEFAULTSW);
-DWORD WINAPI PrinterMessageBoxA(HANDLE,DWORD,HWND,LPSTR,LPSTR,DWORD);
-DWORD WINAPI PrinterMessageBoxW(HANDLE,DWORD,HWND,LPWSTR,LPWSTR,DWORD);
-BOOL WINAPI PrinterProperties(HWND,HANDLE);
-BOOL WINAPI ReadPrinter(HANDLE,PVOID,DWORD,PDWORD);
-BOOL WINAPI ResetPrinterA(HANDLE,LPPRINTER_DEFAULTSA);
-BOOL WINAPI ResetPrinterW(HANDLE,LPPRINTER_DEFAULTSW);
-BOOL WINAPI ScheduleJob(HANDLE,DWORD);
-BOOL WINAPI SetFormA(HANDLE,LPSTR,DWORD,PBYTE);
-BOOL WINAPI SetFormW(HANDLE,LPWSTR,DWORD,PBYTE);
-BOOL WINAPI SetJobA(HANDLE,DWORD,DWORD,PBYTE,DWORD);
-BOOL WINAPI SetJobW(HANDLE,DWORD,DWORD,PBYTE,DWORD);
-BOOL WINAPI SetPrinterA(HANDLE,DWORD,PBYTE,DWORD);
-BOOL WINAPI SetPrinterW(HANDLE,DWORD,PBYTE,DWORD);
-BOOL WINAPI SetPrinterDataA(HANDLE,LPSTR,DWORD,PBYTE,DWORD);
-BOOL WINAPI SetPrinterDataW(HANDLE,LPWSTR,DWORD,PBYTE,DWORD);
-DWORD WINAPI StartDocPrinterA(HANDLE,DWORD,PBYTE);
-DWORD WINAPI StartDocPrinterW(HANDLE,DWORD,PBYTE);
-BOOL WINAPI StartPagePrinter(HANDLE);
-DWORD WINAPI WaitForPrinterChange(HANDLE,DWORD);
-BOOL WINAPI WritePrinter(HANDLE,PVOID,DWORD,PDWORD);
-
-#ifdef UNICODE
-typedef JOB_INFO_1W JOB_INFO_1,*PJOB_INFO_1,*LPJOB_INFO_1;
-typedef JOB_INFO_2W JOB_INFO_2,*PJOB_INFO_2,*LPJOB_INFO_2;
-typedef ADDJOB_INFO_1W ADDJOB_INFO_1,*PADDJOB_INFO_1,*LPADDJOB_INFO_1;
-typedef DATATYPES_INFO_1W DATATYPES_INFO_1,*PDATATYPES_INFO_1,*LPDATATYPES_INFO_1;
-typedef MONITOR_INFO_1W MONITOR_INFO_1,*PMONITOR_INFO_1,*LPMONITOR_INFO_1;
-typedef MONITOR_INFO_2W MONITOR_INFO_2,*PMONITOR_INFO_2,*LPMONITOR_INFO_2;
-typedef DOC_INFO_1W DOC_INFO_1,*PDOC_INFO_1,*LPDOC_INFO_1;
-typedef DOC_INFO_2W DOC_INFO_2,*PDOC_INFO_2,*LPDOC_INFO_2;
-typedef PORT_INFO_1W PORT_INFO_1,*PPORT_INFO_1,*LPPORT_INFO_1;
-typedef PORT_INFO_2W PORT_INFO_2,*PPORT_INFO_2,*LPPORT_INFO_2;
-typedef PORT_INFO_3W PORT_INFO_3,*PPORT_INFO_3,*LPPORT_INFO_3;
-typedef DRIVER_INFO_2W DRIVER_INFO_2,*PDRIVER_INFO_2,*LPDRIVER_INFO_2;
-typedef PRINTER_INFO_1W PRINTER_INFO_1,*PPRINTER_INFO_1,*LPPRINTER_INFO_1;
-typedef PRINTER_INFO_2W PRINTER_INFO_2,*PPRINTER_INFO_2,*LPPRINTER_INFO_2;
-typedef PRINTER_INFO_4W PRINTER_INFO_4,*PPRINTER_INFO_4,*LPPRINTER_INFO_4;
-typedef PRINTER_INFO_5W PRINTER_INFO_5,*PPRINTER_INFO_5,*LPPRINTER_INFO_5;
-typedef PRINTPROCESSOR_INFO_1W PRINTPROCESSOR_INFO_1,*PPRINTPROCESSOR_INFO_1,*LPPRINTPROCESSOR_INFO_1;
-typedef FORM_INFO_1W FORM_INFO_1,*PFORM_INFO_1,*LPFORM_INFO_1;
-typedef PRINTER_DEFAULTSW PRINTER_DEFAULTS,*PPRINTER_DEFAULTS,*LPPRINTER_DEFAULTS;
-#define AddForm AddFormW
-#define AddJob AddJobW
-#define AddMonitor AddMonitorW
-#define AddPort AddPortW
-#define AddPrinter AddPrinterW
-#define AddPrinterConnection AddPrinterConnectionW
-#define AddPrinterDriver AddPrinterDriverW
-#define AddPrintProcessor AddPrintProcessorW
-#define AddPrintProvidor AddPrintProvidorW
-#define AdvancedDocumentProperties AdvancedDocumentPropertiesW
-#define ConfigurePort ConfigurePortW
-#define DeleteForm DeleteFormW
-#define DeleteMonitor DeleteMonitorW
-#define DeletePort DeletePortW
-#define DeletePrinterConnection DeletePrinterConnectionW
-#define DeletePrinterData DeletePrinterDataW
-#define DeletePrinterDriver DeletePrinterDriverW
-#define DeletePrintProcessor DeletePrinterProcessorW
-#define DeletePrintProvidor DeletePrinterProvidorW
-#define DocumentProperties DocumentPropertiesW
-#define EnumForms EnumFormsW
-#define EnumJobs EnumJobsW
-#define EnumMonitors EnumMonitorsW
-#define EnumPorts EnumPortsW
-#define EnumPrinterData EnumPrinterDataW
-#define EnumPrinterDrivers EnumPrinterDriversW
-#define EnumPrinters EnumPrintersW
-#define EnumPrintProcessorDatatypes EnumPrintProcessorDatatypesW
-#define EnumPrintProcessors EnumPrintProcessorsW
-#define GetDefaultPrinter GetDefaultPrinterW
-#define	GetForm	GetFormW
-#define GetJob GetJobW
-#define GetPrinter GetPrinterW
-#define GetPrinterData GetPrinterDataW
-#define GetPrinterDriver GetPrinterDriverW
-#define GetPrinterDriverDirectory GetPrinterDriverDirectoryW
-#define GetPrintProcessorDirectory GetPrintProcessorDirectoryW
-#define OpenPrinter OpenPrinterW
-#define PrinterMessageBox PrinterMessageBoxW
-#define ResetPrinter ResetPrinterW
-#define SetForm SetFormW
-#define SetJob SetJobW
-#define SetPrinter SetPrinterW
-#define SetPrinterData SetPrinterDataW
-#define StartDocPrinter StartDocPrinterW
-#else
-typedef JOB_INFO_1A JOB_INFO_1,*PJOB_INFO_1,*LPJOB_INFO_1;
-typedef JOB_INFO_2A JOB_INFO_2,*PJOB_INFO_2,*LPJOB_INFO_2;
-typedef ADDJOB_INFO_1A ADDJOB_INFO_1,*PADDJOB_INFO_1,*LPADDJOB_INFO_1;
-typedef DATATYPES_INFO_1A DATATYPES_INFO_1,*PDATATYPES_INFO_1,*LPDATATYPES_INFO_1;
-typedef MONITOR_INFO_1A MONITOR_INFO_1,*PMONITOR_INFO_1,*LPMONITOR_INFO_1;
-typedef MONITOR_INFO_2A MONITOR_INFO_2,*PMONITOR_INFO_2,*LPMONITOR_INFO_2;
-typedef DOC_INFO_1A DOC_INFO_1,*PDOC_INFO_1,*LPDOC_INFO_1;
-typedef DOC_INFO_2A DOC_INFO_2,*PDOC_INFO_2,*LPDOC_INFO_2;
-typedef PORT_INFO_1A PORT_INFO_1,*PPORT_INFO_1,*LPPORT_INFO_1;
-typedef PORT_INFO_2A PORT_INFO_2,*PPORT_INFO_2,*LPPORT_INFO_2;
-typedef PORT_INFO_3A PORT_INFO_3,*PPORT_INFO_3,*LPPORT_INFO_3;
-typedef DRIVER_INFO_2A DRIVER_INFO_2,*PDRIVER_INFO_2,*LPDRIVER_INFO_2;
-typedef PRINTER_INFO_1A PRINTER_INFO_1,*PPRINTER_INFO_1,*LPPRINTER_INFO_1;
-typedef PRINTER_INFO_2A PRINTER_INFO_2,*PPRINTER_INFO_2,*LPPRINTER_INFO_2;
-typedef PRINTER_INFO_4A PRINTER_INFO_4,*PPRINTER_INFO_4,*LPPRINTER_INFO_4;
-typedef PRINTER_INFO_5A PRINTER_INFO_5,*PPRINTER_INFO_5,*LPPRINTER_INFO_5;
-typedef PRINTPROCESSOR_INFO_1A PRINTPROCESSOR_INFO_1,*PPRINTPROCESSOR_INFO_1,*LPPRINTPROCESSOR_INFO_1;
-typedef FORM_INFO_1A FORM_INFO_1,*PFORM_INFO_1,*LPFORM_INFO_1;
-typedef PRINTER_DEFAULTSA PRINTER_DEFAULTS,*PPRINTER_DEFAULTS,*LPPRINTER_DEFAULTS;
-#define AddForm AddFormA
-#define AddJob AddJobA
-#define AddMonitor AddMonitorA
-#define AddPort AddPortA
-#define AddPrinter AddPrinterA
-#define AddPrinterConnection AddPrinterConnectionA
-#define AddPrinterDriver AddPrinterDriverA
-#define AddPrintProcessor AddPrintProcessorA
-#define AddPrintProvidor AddPrintProvidorA
-#define AdvancedDocumentProperties AdvancedDocumentPropertiesA
-#define ConfigurePort ConfigurePortA
-#define DeleteForm DeleteFormA
-#define DeleteMonitor DeleteMonitorA
-#define DeletePort DeletePortA
-#define DeletePrinterConnection DeletePrinterConnectionA
-#define DeletePrinterData DeletePrinterDataA
-#define DeletePrinterDriver DeletePrinterDriverA
-#define DeletePrintProcessor DeletePrinterProcessorA
-#define DeletePrintProvidor DeletePrinterProvidorA
-#define DocumentProperties DocumentPropertiesA
-#define EnumForms EnumFormsA
-#define EnumJobs EnumJobsA
-#define EnumMonitors EnumMonitorsA
-#define EnumPorts EnumPortsA
-#define EnumPrinterData EnumPrinterDataA
-#define EnumPrinterDrivers EnumPrinterDriversA
-#define EnumPrinters EnumPrintersA
-#define EnumPrintProcessorDatatypes EnumPrintProcessorDatatypesA
-#define EnumPrintProcessors EnumPrintProcessorsA
-#define GetDefaultPrinter GetDefaultPrinterA
-#define	GetForm	GetFormA
-#define GetJob GetJobA
-#define GetPrinter GetPrinterA
-#define GetPrinterData GetPrinterDataA
-#define GetPrinterDriver GetPrinterDriverA
-#define GetPrinterDriverDirectory GetPrinterDriverDirectoryA
-#define GetPrintProcessorDirectory GetPrintProcessorDirectoryA
-#define OpenPrinter OpenPrinterA
-#define PrinterMessageBox PrinterMessageBoxA
-#define ResetPrinter ResetPrinterA
-#define SetForm SetFormA
-#define SetJob SetJobA
-#define SetPrinter SetPrinterA
-#define SetPrinterData SetPrinterDataA
-#define StartDocPrinter StartDocPrinterA
-#endif
-#endif /* RC_INVOKED */
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/winsvc.h b/winsup/w32api/include/winsvc.h
deleted file mode 100644
index cfc3f57a9..000000000
--- a/winsup/w32api/include/winsvc.h
+++ /dev/null
@@ -1,309 +0,0 @@
-#ifndef _WINSVC_H
-#define _WINSVC_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define SERVICES_ACTIVE_DATABASEA "ServicesActive"
-#define SERVICES_ACTIVE_DATABASEW L"ServicesActive"
-#define SERVICES_FAILED_DATABASEA "ServicesFailed"
-#define SERVICES_FAILED_DATABASEW L"ServicesFailed"
-#define SC_GROUP_IDENTIFIERA '+'
-#define SC_GROUP_IDENTIFIERW L'+'
-#define SC_MANAGER_ALL_ACCESS	0xf003f
-#define SC_MANAGER_CONNECT	1
-#define SC_MANAGER_CREATE_SERVICE	2
-#define SC_MANAGER_ENUMERATE_SERVICE	4
-#define SC_MANAGER_LOCK	8
-#define SC_MANAGER_QUERY_LOCK_STATUS	16
-#define SC_MANAGER_MODIFY_BOOT_CONFIG	32
-#define SERVICE_NO_CHANGE 0xffffffff
-#define SERVICE_STOPPED	1
-#define SERVICE_START_PENDING	2
-#define SERVICE_STOP_PENDING	3
-#define SERVICE_RUNNING	4
-#define SERVICE_CONTINUE_PENDING	5
-#define SERVICE_PAUSE_PENDING	6
-#define SERVICE_PAUSED	7
-#define SERVICE_ACCEPT_STOP	1
-#define SERVICE_ACCEPT_PAUSE_CONTINUE	2
-#define SERVICE_ACCEPT_SHUTDOWN 4
-#define SERVICE_ACCEPT_PARAMCHANGE    8
-#define SERVICE_ACCEPT_NETBINDCHANGE  16
-#define SERVICE_ACCEPT_HARDWAREPROFILECHANGE   32
-#define SERVICE_ACCEPT_POWEREVENT              64
-#define SERVICE_ACCEPT_SESSIONCHANGE           128
-#define SERVICE_CONTROL_STOP	1
-#define SERVICE_CONTROL_PAUSE	2
-#define SERVICE_CONTROL_CONTINUE	3
-#define SERVICE_CONTROL_INTERROGATE	4
-#define SERVICE_CONTROL_SHUTDOWN	5
-#define SERVICE_CONTROL_PARAMCHANGE     6
-#define SERVICE_CONTROL_NETBINDADD      7
-#define SERVICE_CONTROL_NETBINDREMOVE   8
-#define SERVICE_CONTROL_NETBINDENABLE   9
-#define SERVICE_CONTROL_NETBINDDISABLE  10
-#define SERVICE_CONTROL_DEVICEEVENT     11
-#define SERVICE_CONTROL_HARDWAREPROFILECHANGE 12
-#define SERVICE_CONTROL_POWEREVENT            13
-#define SERVICE_CONTROL_SESSIONCHANGE         14
-#define SERVICE_ACTIVE 1
-#define SERVICE_INACTIVE 2
-#define SERVICE_STATE_ALL 3
-#define SERVICE_QUERY_CONFIG 1
-#define SERVICE_CHANGE_CONFIG 2
-#define SERVICE_QUERY_STATUS 4
-#define SERVICE_ENUMERATE_DEPENDENTS 8
-#define SERVICE_START 16
-#define SERVICE_STOP 32
-#define SERVICE_PAUSE_CONTINUE 64
-#define SERVICE_INTERROGATE 128
-#define SERVICE_USER_DEFINED_CONTROL 256
-#define SERVICE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SERVICE_QUERY_CONFIG|SERVICE_CHANGE_CONFIG|SERVICE_QUERY_STATUS|SERVICE_ENUMERATE_DEPENDENTS|SERVICE_START|SERVICE_STOP|SERVICE_PAUSE_CONTINUE|SERVICE_INTERROGATE|SERVICE_USER_DEFINED_CONTROL)
-#define SERVICE_RUNS_IN_SYSTEM_PROCESS 1
-#define SERVICE_CONFIG_DESCRIPTION     1
-#define SERVICE_CONFIG_FAILURE_ACTIONS 2
-
-typedef struct _SERVICE_STATUS {
-	DWORD dwServiceType;
-	DWORD dwCurrentState;
-	DWORD dwControlsAccepted;
-	DWORD dwWin32ExitCode;
-	DWORD dwServiceSpecificExitCode;
-	DWORD dwCheckPoint;
-	DWORD dwWaitHint;
-} SERVICE_STATUS,*LPSERVICE_STATUS;
-typedef struct _SERVICE_STATUS_PROCESS {
-	DWORD dwServiceType;
-	DWORD dwCurrentState;
-	DWORD dwControlsAccepted;
-	DWORD dwWin32ExitCode;
-	DWORD dwServiceSpecificExitCode;
-	DWORD dwCheckPoint;
-	DWORD dwWaitHint;
-	DWORD dwProcessId;
-	DWORD dwServiceFlags;
-} SERVICE_STATUS_PROCESS, *LPSERVICE_STATUS_PROCESS;
-typedef enum _SC_STATUS_TYPE {
-	SC_STATUS_PROCESS_INFO = 0
-} SC_STATUS_TYPE;
-typedef enum _SC_ENUM_TYPE {
-        SC_ENUM_PROCESS_INFO = 0
-} SC_ENUM_TYPE;
-typedef struct _ENUM_SERVICE_STATUSA {
-	LPSTR lpServiceName;
-	LPSTR lpDisplayName;
-	SERVICE_STATUS ServiceStatus;
-} ENUM_SERVICE_STATUSA,*LPENUM_SERVICE_STATUSA;
-typedef struct _ENUM_SERVICE_STATUSW {
-	LPWSTR lpServiceName;
-	LPWSTR lpDisplayName;
-	SERVICE_STATUS ServiceStatus;
-} ENUM_SERVICE_STATUSW,*LPENUM_SERVICE_STATUSW;
-typedef struct _ENUM_SERVICE_STATUS_PROCESSA {
-	LPSTR lpServiceName;
-	LPSTR lpDisplayName;
-	SERVICE_STATUS_PROCESS ServiceStatusProcess;
-} ENUM_SERVICE_STATUS_PROCESSA,*LPENUM_SERVICE_STATUS_PROCESSA;
-typedef struct _ENUM_SERVICE_STATUS_PROCESSW {
-	LPWSTR lpServiceName;
-	LPWSTR lpDisplayName;
-	SERVICE_STATUS_PROCESS ServiceStatusProcess;
-} ENUM_SERVICE_STATUS_PROCESSW,*LPENUM_SERVICE_STATUS_PROCESSW;
-typedef struct _QUERY_SERVICE_CONFIGA {
-	DWORD dwServiceType;
-	DWORD dwStartType;
-	DWORD dwErrorControl;
-	LPSTR lpBinaryPathName;
-	LPSTR lpLoadOrderGroup;
-	DWORD dwTagId;
-	LPSTR lpDependencies;
-	LPSTR lpServiceStartName;
-	LPSTR lpDisplayName;
-} QUERY_SERVICE_CONFIGA,*LPQUERY_SERVICE_CONFIGA;
-typedef struct _QUERY_SERVICE_CONFIGW {
-	DWORD dwServiceType;
-	DWORD dwStartType;
-	DWORD dwErrorControl;
-	LPWSTR lpBinaryPathName;
-	LPWSTR lpLoadOrderGroup;
-	DWORD dwTagId;
-	LPWSTR lpDependencies;
-	LPWSTR lpServiceStartName;
-	LPWSTR lpDisplayName;
-} QUERY_SERVICE_CONFIGW,*LPQUERY_SERVICE_CONFIGW;
-typedef struct _QUERY_SERVICE_LOCK_STATUSA {
-	DWORD fIsLocked;
-	LPSTR lpLockOwner;
-	DWORD dwLockDuration;
-} QUERY_SERVICE_LOCK_STATUSA,*LPQUERY_SERVICE_LOCK_STATUSA;
-typedef struct _QUERY_SERVICE_LOCK_STATUSW {
-	DWORD fIsLocked;
-	LPWSTR lpLockOwner;
-	DWORD dwLockDuration;
-} QUERY_SERVICE_LOCK_STATUSW,*LPQUERY_SERVICE_LOCK_STATUSW;
-typedef void (WINAPI *LPSERVICE_MAIN_FUNCTIONA)(DWORD,LPSTR*);
-typedef void (WINAPI *LPSERVICE_MAIN_FUNCTIONW)(DWORD,LPWSTR*);
-typedef struct _SERVICE_TABLE_ENTRYA {
-	LPSTR lpServiceName;
-	LPSERVICE_MAIN_FUNCTIONA lpServiceProc;
-} SERVICE_TABLE_ENTRYA,*LPSERVICE_TABLE_ENTRYA;
-typedef struct _SERVICE_TABLE_ENTRYW {
-	LPWSTR lpServiceName;
-	LPSERVICE_MAIN_FUNCTIONW lpServiceProc;
-} SERVICE_TABLE_ENTRYW,*LPSERVICE_TABLE_ENTRYW;
-DECLARE_HANDLE(SC_HANDLE);
-typedef SC_HANDLE *LPSC_HANDLE;
-typedef PVOID SC_LOCK;
-typedef DWORD SERVICE_STATUS_HANDLE;
-typedef VOID(WINAPI *LPHANDLER_FUNCTION)(DWORD);
-typedef DWORD (WINAPI *LPHANDLER_FUNCTION_EX)(DWORD,DWORD,LPVOID,LPVOID);
-typedef struct _SERVICE_DESCRIPTIONA {
-	LPSTR lpDescription;
-} SERVICE_DESCRIPTIONA,*LPSERVICE_DESCRIPTIONA;
-typedef struct _SERVICE_DESCRIPTIONW {
-	LPWSTR lpDescription;
-} SERVICE_DESCRIPTIONW,*LPSERVICE_DESCRIPTIONW;
-typedef enum _SC_ACTION_TYPE {
-        SC_ACTION_NONE          = 0,
-        SC_ACTION_RESTART       = 1,
-        SC_ACTION_REBOOT        = 2,
-        SC_ACTION_RUN_COMMAND   = 3
-} SC_ACTION_TYPE;
-typedef struct _SC_ACTION {
-	SC_ACTION_TYPE	Type;
-	DWORD		Delay;
-} SC_ACTION,*LPSC_ACTION;
-typedef struct _SERVICE_FAILURE_ACTIONSA {
-	DWORD	dwResetPeriod;
-	LPSTR	lpRebootMsg;
-	LPSTR	lpCommand;
-	DWORD	cActions;
-	SC_ACTION * lpsaActions;
-} SERVICE_FAILURE_ACTIONSA,*LPSERVICE_FAILURE_ACTIONSA;
-typedef struct _SERVICE_FAILURE_ACTIONSW {
-	DWORD	dwResetPeriod;
-	LPWSTR	lpRebootMsg;
-	LPWSTR	lpCommand;
-	DWORD	cActions;
-	SC_ACTION * lpsaActions;
-} SERVICE_FAILURE_ACTIONSW,*LPSERVICE_FAILURE_ACTIONSW;
-
-BOOL WINAPI ChangeServiceConfigA(SC_HANDLE,DWORD,DWORD,DWORD,LPCSTR,LPCSTR,LPDWORD,LPCSTR,LPCSTR,LPCSTR,LPCSTR);
-BOOL WINAPI ChangeServiceConfigW(SC_HANDLE,DWORD,DWORD,DWORD,LPCWSTR,LPCWSTR,LPDWORD,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR);
-BOOL WINAPI ChangeServiceConfig2A(SC_HANDLE,DWORD,LPVOID);
-BOOL WINAPI ChangeServiceConfig2W(SC_HANDLE,DWORD,LPVOID);
-BOOL WINAPI CloseServiceHandle(SC_HANDLE);
-BOOL WINAPI ControlService(SC_HANDLE,DWORD,LPSERVICE_STATUS);
-SC_HANDLE WINAPI CreateServiceA(SC_HANDLE,LPCSTR,LPCSTR,DWORD,DWORD,DWORD,DWORD,LPCSTR,LPCSTR,PDWORD,LPCSTR,LPCSTR,LPCSTR);
-SC_HANDLE WINAPI CreateServiceW(SC_HANDLE,LPCWSTR,LPCWSTR,DWORD,DWORD,DWORD,DWORD,LPCWSTR,LPCWSTR,PDWORD,LPCWSTR,LPCWSTR,LPCWSTR);
-BOOL WINAPI DeleteService(SC_HANDLE);
-BOOL WINAPI EnumDependentServicesA(SC_HANDLE,DWORD,LPENUM_SERVICE_STATUSA,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumDependentServicesW(SC_HANDLE,DWORD,LPENUM_SERVICE_STATUSW,DWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumServicesStatusA(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSA,DWORD,PDWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumServicesStatusW(SC_HANDLE,DWORD,DWORD,LPENUM_SERVICE_STATUSW,DWORD,PDWORD,PDWORD,PDWORD);
-BOOL WINAPI EnumServicesStatusExA(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD,LPDWORD,LPCSTR);
-BOOL WINAPI EnumServicesStatusExW(SC_HANDLE,SC_ENUM_TYPE,DWORD,DWORD,LPBYTE,DWORD,LPDWORD,LPDWORD,LPDWORD,LPCWSTR);
-BOOL WINAPI GetServiceDisplayNameA(SC_HANDLE,LPCSTR,LPSTR,PDWORD);
-BOOL WINAPI GetServiceDisplayNameW(SC_HANDLE,LPCWSTR,LPWSTR,PDWORD);
-BOOL WINAPI GetServiceKeyNameA(SC_HANDLE,LPCSTR,LPSTR,PDWORD);
-BOOL WINAPI GetServiceKeyNameW(SC_HANDLE,LPCWSTR,LPWSTR,PDWORD);
-SC_LOCK WINAPI LockServiceDatabase(SC_HANDLE);
-BOOL WINAPI NotifyBootConfigStatus(BOOL);
-SC_HANDLE WINAPI OpenSCManagerA(LPCSTR,LPCSTR,DWORD);
-SC_HANDLE WINAPI OpenSCManagerW(LPCWSTR,LPCWSTR,DWORD);
-SC_HANDLE WINAPI OpenServiceA(SC_HANDLE,LPCSTR,DWORD);
-SC_HANDLE WINAPI OpenServiceW(SC_HANDLE,LPCWSTR,DWORD);
-BOOL WINAPI QueryServiceConfigA(SC_HANDLE,LPQUERY_SERVICE_CONFIGA,DWORD,PDWORD);
-BOOL WINAPI QueryServiceConfigW(SC_HANDLE,LPQUERY_SERVICE_CONFIGW,DWORD,PDWORD);
-BOOL WINAPI QueryServiceConfig2A(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD);
-BOOL WINAPI QueryServiceConfig2W(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD);
-BOOL WINAPI QueryServiceLockStatusA(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSA,DWORD,PDWORD);
-BOOL WINAPI QueryServiceLockStatusW(SC_HANDLE,LPQUERY_SERVICE_LOCK_STATUSW,DWORD,PDWORD);
-BOOL WINAPI QueryServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD);
-BOOL WINAPI QueryServiceStatus(SC_HANDLE,LPSERVICE_STATUS);
-BOOL WINAPI QueryServiceStatusEx(SC_HANDLE,SC_STATUS_TYPE,LPBYTE,DWORD,LPDWORD);
-SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerA(LPCSTR,LPHANDLER_FUNCTION);
-SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerW(LPCWSTR,LPHANDLER_FUNCTION);
-SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExA(LPCSTR,LPHANDLER_FUNCTION_EX,LPVOID);
-SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerExW(LPCWSTR,LPHANDLER_FUNCTION_EX,LPVOID);
-BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-BOOL WINAPI SetServiceStatus(SERVICE_STATUS_HANDLE,LPSERVICE_STATUS);
-BOOL WINAPI StartServiceA(SC_HANDLE,DWORD,LPCSTR*);
-BOOL WINAPI StartServiceCtrlDispatcherA(LPSERVICE_TABLE_ENTRYA);
-BOOL WINAPI StartServiceCtrlDispatcherW(LPSERVICE_TABLE_ENTRYW);
-BOOL WINAPI StartServiceW(SC_HANDLE,DWORD,LPCWSTR*);
-BOOL WINAPI UnlockServiceDatabase(SC_LOCK);
-
-#ifdef UNICODE
-typedef ENUM_SERVICE_STATUSW ENUM_SERVICE_STATUS,*LPENUM_SERVICE_STATUS;
-typedef ENUM_SERVICE_STATUS_PROCESSW ENUM_SERVICE_STATUS_PROCESS;
-typedef LPENUM_SERVICE_STATUS_PROCESSW LPENUM_SERVICE_STATUS_PROCESS;
-typedef QUERY_SERVICE_CONFIGW QUERY_SERVICE_CONFIG,*LPQUERY_SERVICE_CONFIG;
-typedef QUERY_SERVICE_LOCK_STATUSW QUERY_SERVICE_LOCK_STATUS,*LPQUERY_SERVICE_LOCK_STATUS;
-typedef SERVICE_TABLE_ENTRYW SERVICE_TABLE_ENTRY,*LPSERVICE_TABLE_ENTRY;
-typedef LPSERVICE_MAIN_FUNCTIONW LPSERVICE_MAIN_FUNCTION;
-typedef SERVICE_DESCRIPTIONW SERVICE_DESCRIPTION;
-typedef LPSERVICE_DESCRIPTIONW LPSERVICE_DESCRIPTION;
-typedef SERVICE_FAILURE_ACTIONSW SERVICE_FAILURE_ACTIONS;
-typedef LPSERVICE_FAILURE_ACTIONSW LPSERVICE_FAILURE_ACTIONS;
-#define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEW
-#define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEW
-#define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERW
-#define ChangeServiceConfig ChangeServiceConfigW
-#define ChangeServiceConfig2 ChangeServiceConfig2W
-#define CreateService CreateServiceW
-#define EnumDependentServices EnumDependentServicesW
-#define EnumServicesStatus EnumServicesStatusW
-#define EnumServicesStatusEx  EnumServicesStatusExW
-#define GetServiceDisplayName GetServiceDisplayNameW
-#define GetServiceKeyName GetServiceKeyNameW
-#define OpenSCManager OpenSCManagerW
-#define OpenService OpenServiceW
-#define QueryServiceConfig QueryServiceConfigW
-#define QueryServiceConfig2 QueryServiceConfig2W
-#define QueryServiceLockStatus QueryServiceLockStatusW
-#define RegisterServiceCtrlHandler RegisterServiceCtrlHandlerW
-#define RegisterServiceCtrlHandlerEx RegisterServiceCtrlHandlerExW
-#define StartService StartServiceW
-#define StartServiceCtrlDispatcher StartServiceCtrlDispatcherW
-#else
-typedef ENUM_SERVICE_STATUSA ENUM_SERVICE_STATUS,*LPENUM_SERVICE_STATUS;
-typedef ENUM_SERVICE_STATUS_PROCESSA ENUM_SERVICE_STATUS_PROCESS;
-typedef LPENUM_SERVICE_STATUS_PROCESSA LPENUM_SERVICE_STATUS_PROCESS;
-typedef QUERY_SERVICE_CONFIGA QUERY_SERVICE_CONFIG,*LPQUERY_SERVICE_CONFIG;
-typedef QUERY_SERVICE_LOCK_STATUSA QUERY_SERVICE_LOCK_STATUS,*LPQUERY_SERVICE_LOCK_STATUS;
-typedef SERVICE_TABLE_ENTRYA SERVICE_TABLE_ENTRY,*LPSERVICE_TABLE_ENTRY;
-typedef LPSERVICE_MAIN_FUNCTIONA LPSERVICE_MAIN_FUNCTION;
-typedef SERVICE_DESCRIPTIONA SERVICE_DESCRIPTION;
-typedef LPSERVICE_DESCRIPTIONA LPSERVICE_DESCRIPTION;
-typedef SERVICE_FAILURE_ACTIONSA SERVICE_FAILURE_ACTIONS;
-typedef LPSERVICE_FAILURE_ACTIONSA LPSERVICE_FAILURE_ACTIONS;
-#define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEA
-#define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEA
-#define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERA
-#define ChangeServiceConfig ChangeServiceConfigA
-#define ChangeServiceConfig2 ChangeServiceConfig2A
-#define CreateService CreateServiceA
-#define EnumDependentServices EnumDependentServicesA
-#define EnumServicesStatus EnumServicesStatusA
-#define EnumServicesStatusEx  EnumServicesStatusExA
-#define GetServiceDisplayName GetServiceDisplayNameA
-#define GetServiceKeyName GetServiceKeyNameA
-#define OpenSCManager OpenSCManagerA
-#define OpenService OpenServiceA
-#define QueryServiceConfig QueryServiceConfigA
-#define QueryServiceConfig2 QueryServiceConfig2A
-#define QueryServiceLockStatus QueryServiceLockStatusA
-#define RegisterServiceCtrlHandler RegisterServiceCtrlHandlerA
-#define RegisterServiceCtrlHandlerEx RegisterServiceCtrlHandlerExA
-#define StartService StartServiceA
-#define StartServiceCtrlDispatcher StartServiceCtrlDispatcherA
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif /* _WINSVC_H */
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
deleted file mode 100644
index c32cee91e..000000000
--- a/winsup/w32api/include/winuser.h
+++ /dev/null
@@ -1,4098 +0,0 @@
-#ifndef _WINUSER_H
-#define _WINUSER_H
-#if __GNUC__ >= 3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define WC_DIALOG MAKEINTATOM(0x8002)
-#define FALT	16
-#define FCONTROL	8
-#define FNOINVERT	2
-#define FSHIFT	4
-#define FVIRTKEY	1
-#define ATF_TIMEOUTON	1
-#define ATF_ONOFFFEEDBACK	2
-#define ATF_AVAILABLE	4 /* May be obsolete. Not in recent MS docs. */
-#define WH_MIN	(-1)
-#define WH_MSGFILTER	(-1)
-#define WH_JOURNALRECORD	0
-#define WH_JOURNALPLAYBACK	1
-#define WH_KEYBOARD	2
-#define WH_GETMESSAGE	3
-#define WH_CALLWNDPROC	4
-#define WH_CBT	5
-#define WH_SYSMSGFILTER	6
-#define WH_MOUSE	7
-#define WH_HARDWARE	8
-#define WH_DEBUG	9
-#define WH_SHELL	10
-#define WH_FOREGROUNDIDLE	11
-#define WH_CALLWNDPROCRET	12
-#define WH_KEYBOARD_LL	13
-#define WH_MOUSE_LL	14
-#define WH_MAX		14
-#define WH_MINHOOK	WH_MIN
-#define WH_MAXHOOK	WH_MAX
-#define HC_ACTION	0
-#define HC_GETNEXT	1
-#define HC_SKIP	2
-#define HC_NOREMOVE	3
-#define HC_NOREM	3
-#define HC_SYSMODALON	4
-#define HC_SYSMODALOFF	5
-#define HCBT_MOVESIZE	0
-#define HCBT_MINMAX	1
-#define HCBT_QS	2
-#define HCBT_CREATEWND	3
-#define HCBT_DESTROYWND	4
-#define HCBT_ACTIVATE	5
-#define HCBT_CLICKSKIPPED	6
-#define HCBT_KEYSKIPPED	7
-#define HCBT_SYSCOMMAND	8
-#define HCBT_SETFOCUS	9
-#define CF_TEXT	1
-#define CF_BITMAP	2
-#define CF_METAFILEPICT	3
-#define CF_SYLK	4
-#define CF_DIF	5
-#define CF_TIFF	6
-#define CF_OEMTEXT	7
-#define CF_DIB	8
-#define CF_PALETTE	9
-#define CF_PENDATA	10
-#define CF_RIFF	11
-#define CF_WAVE	12
-#define CF_UNICODETEXT	13
-#define CF_ENHMETAFILE	14
-#define CF_HDROP	15
-#define CF_LOCALE	16
-#define CF_MAX	17
-#define CF_OWNERDISPLAY	128
-#define CF_DSPTEXT	129
-#define CF_DSPBITMAP	130
-#define CF_DSPMETAFILEPICT	131
-#define CF_DSPENHMETAFILE	142
-#define CF_PRIVATEFIRST	512
-#define CF_PRIVATELAST	767
-#define CF_GDIOBJFIRST	768
-#define CF_GDIOBJLAST	1023
-#define HKL_NEXT	1
-#define HKL_PREV	0
-#define KLF_ACTIVATE	1
-#define KLF_SUBSTITUTE_OK	2
-#define KLF_UNLOADPREVIOUS	4
-#define KLF_REORDER	8
-#define KLF_REPLACELANG	16
-#define KLF_NOTELLSHELL	128
-#define KLF_SETFORPROCESS	256
-#define KL_NAMELENGTH 9
-#define MF_ENABLED	0
-#define MF_GRAYED	1
-#define MF_DISABLED	2
-#define MF_BITMAP	4
-#define MF_CHECKED	8
-#define MF_MENUBARBREAK 32
-#define MF_MENUBREAK	64
-#define MF_OWNERDRAW	256
-#define MF_POPUP	16
-#define MF_SEPARATOR	0x800
-#define MF_STRING	0
-#define MF_UNCHECKED	0
-#define MF_DEFAULT	4096
-#define MF_SYSMENU	0x2000
-#define MF_HELP	0x4000
-#define MF_END	128
-#define MF_RIGHTJUSTIFY	0x4000
-#define MF_MOUSESELECT	0x8000
-#define MF_INSERT 0
-#define MF_CHANGE 128
-#define MF_APPEND 256
-#define MF_DELETE 512
-#define MF_REMOVE 4096
-#define MF_USECHECKBITMAPS 512
-#define MF_UNHILITE 0
-#define MF_HILITE 128
-
-/* Also defined in dbt.h */
-#define BSM_ALLCOMPONENTS	0
-#define BSM_APPLICATIONS	8
-#define BSM_ALLDESKTOPS		16
-#define BSM_INSTALLABLEDRIVERS	4
-#define BSM_NETDRIVER	2
-#define BSM_VXDS	1
-#define BSF_FLUSHDISK 0x00000004
-#define BSF_FORCEIFHUNG 0x00000020
-#define BSF_IGNORECURRENTTASK 0x00000002
-#define BSF_NOHANG 0x00000008
-#define BSF_NOTIMEOUTIFNOTHUNG 0x00000040
-#define BSF_POSTMESSAGE 0x00000010
-#define BSF_QUERY 0x00000001
-#if (_WIN32_WINNT >= 0x0500)
-#define BSF_ALLOWSFW 0x00000080
-#define BSF_SENDNOTIFYMESSAGE 0x00000100
-#endif /* (_WIN32_WINNT >= 0x0500) */
-#if (_WIN32_WINNT >= 0x0501)
-#define BSF_LUID 0x00000400
-#define BSF_RETURNHDESK 0x00000200
-#endif /* (_WIN32_WINNT >= 0x0501) */
-
-#define BROADCAST_QUERY_DENY	1112363332
-#define ENUM_CURRENT_SETTINGS	((DWORD)-1)
-#define ENUM_REGISTRY_SETTINGS	((DWORD)-2)
-#define DM_BITSPERPEL	0x40000
-#define DM_PELSWIDTH	0x80000
-#define DM_PELSHEIGHT	0x100000
-#define DM_DISPLAYFLAGS 0x200000
-#define DM_DISPLAYFREQUENCY 0x400000
-#define CDS_UPDATEREGISTRY	1
-#define CDS_TEST	2
-#define CDS_FULLSCREEN	4
-#define CDS_GLOBAL	8
-#define CDS_SET_PRIMARY	16
-#define CDS_RESET	0x40000000
-#define CDS_SETRECT	0x20000000
-#define CDS_NORESET	0x10000000
-#define DISP_CHANGE_SUCCESSFUL	0
-#define DISP_CHANGE_RESTART	1
-#define DISP_CHANGE_BADFLAGS	(-4)
-#define DISP_CHANGE_BADPARAM	(-5)
-#define DISP_CHANGE_FAILED	(-1)
-#define DISP_CHANGE_BADMODE	(-2)
-#define DISP_CHANGE_NOTUPDATED	(-3)
-#define BST_CHECKED	1
-#define BST_INDETERMINATE	2
-#define BST_UNCHECKED	0
-#define BST_FOCUS	8
-#define BST_PUSHED	4
-#define MF_BYCOMMAND	0
-#define MF_BYPOSITION	1024
-#define MF_UNCHECKED	0
-#define MF_HILITE	128
-#define MF_UNHILITE	0
-#define CWP_ALL 0
-#define CWP_SKIPINVISIBLE	1
-#define CWP_SKIPDISABLED	2
-#define CWP_SKIPTRANSPARENT	4
-#define IMAGE_BITMAP	0
-#define IMAGE_ICON	1
-#define IMAGE_CURSOR	2
-#define IMAGE_ENHMETAFILE	3
-#define DF_ALLOWOTHERACCOUNTHOOK	1
-#define DESKTOP_CREATEMENU	4
-#define DESKTOP_CREATEWINDOW	2
-#define DESKTOP_ENUMERATE	64
-#define DESKTOP_HOOKCONTROL	8
-#define DESKTOP_JOURNALPLAYBACK	32
-#define DESKTOP_JOURNALRECORD	16
-#define DESKTOP_READOBJECTS	1
-#define DESKTOP_SWITCHDESKTOP	256
-#define DESKTOP_WRITEOBJECTS	128
-#define CW_USEDEFAULT	0x80000000
-#define WS_BORDER	0x800000
-#define WS_CAPTION	0xc00000
-#define WS_CHILD	0x40000000
-#define WS_CHILDWINDOW	0x40000000
-#define WS_CLIPCHILDREN 0x2000000
-#define WS_CLIPSIBLINGS 0x4000000
-#define WS_DISABLED	0x8000000
-#define WS_DLGFRAME	0x400000
-#define WS_GROUP	0x20000
-#define WS_HSCROLL	0x100000
-#define WS_ICONIC	0x20000000
-#define WS_MAXIMIZE	0x1000000
-#define WS_MAXIMIZEBOX	0x10000
-#define WS_MINIMIZE	0x20000000
-#define WS_MINIMIZEBOX	0x20000
-#define WS_OVERLAPPED	0
-#define WS_OVERLAPPEDWINDOW	0xcf0000
-#define WS_POPUP	0x80000000
-#define WS_POPUPWINDOW	0x80880000
-#define WS_SIZEBOX	0x40000
-#define WS_SYSMENU	0x80000
-#define WS_TABSTOP	0x10000
-#define WS_THICKFRAME	0x40000
-#define WS_TILED	0
-#define WS_TILEDWINDOW	0xcf0000
-#define WS_VISIBLE	0x10000000
-#define WS_VSCROLL	0x200000
-#define MDIS_ALLCHILDSTYLES	1
-#define BS_3STATE	5
-#define BS_AUTO3STATE	6
-#define BS_AUTOCHECKBOX	3
-#define BS_AUTORADIOBUTTON	9
-#define BS_BITMAP	128
-#define BS_BOTTOM	0x800
-#define BS_CENTER	0x300
-#define BS_CHECKBOX	2
-#define BS_DEFPUSHBUTTON	1
-#define BS_GROUPBOX	7
-#define BS_ICON	64
-#define BS_LEFT	256
-#define BS_LEFTTEXT	32
-#define BS_MULTILINE	0x2000
-#define BS_NOTIFY	0x4000
-#define BS_OWNERDRAW	0xb
-#define BS_PUSHBUTTON	0
-#define BS_PUSHLIKE	4096
-#define BS_RADIOBUTTON 4
-#define BS_RIGHT	512
-#define BS_RIGHTBUTTON	32
-#define BS_TEXT	0
-#define BS_TOP	0x400
-#define BS_USERBUTTON	8
-#define BS_VCENTER	0xc00
-#define BS_FLAT	0x8000
-#define CBS_AUTOHSCROLL	64
-#define CBS_DISABLENOSCROLL	0x800
-#define CBS_DROPDOWN	2
-#define CBS_DROPDOWNLIST	3
-#define CBS_HASSTRINGS	512
-#define CBS_LOWERCASE	0x4000
-#define CBS_NOINTEGRALHEIGHT	0x400
-#define CBS_OEMCONVERT	128
-#define CBS_OWNERDRAWFIXED	16
-#define CBS_OWNERDRAWVARIABLE	32
-#define CBS_SIMPLE	1
-#define CBS_SORT	256
-#define CBS_UPPERCASE	0x2000
-#define ES_AUTOHSCROLL	128
-#define ES_AUTOVSCROLL	64
-#define ES_CENTER	1
-#define ES_LEFT	0
-#define ES_LOWERCASE 16
-#define ES_MULTILINE 4
-#define ES_NOHIDESEL 256
-#define ES_NUMBER 0x2000
-#define ES_OEMCONVERT 0x400
-#define ES_PASSWORD 32
-#define ES_READONLY 0x800
-#define ES_RIGHT 2
-#define ES_UPPERCASE 8
-#define ES_WANTRETURN 4096
-#define LBS_DISABLENOSCROLL 4096
-#define LBS_EXTENDEDSEL 0x800
-#define LBS_HASSTRINGS 64
-#define LBS_MULTICOLUMN 512
-#define LBS_MULTIPLESEL 8
-#define LBS_NODATA	0x2000
-#define LBS_NOINTEGRALHEIGHT 256
-#define LBS_NOREDRAW 4
-#define LBS_NOSEL 0x4000
-#define LBS_NOTIFY 1
-#define LBS_OWNERDRAWFIXED 16
-#define LBS_OWNERDRAWVARIABLE 32
-#define LBS_SORT 2
-#define LBS_STANDARD 0xa00003
-#define LBS_USETABSTOPS 128
-#define LBS_WANTKEYBOARDINPUT 0x400
-#define SBS_BOTTOMALIGN 4
-#define SBS_HORZ 0
-#define SBS_LEFTALIGN 2
-#define SBS_RIGHTALIGN 4
-#define SBS_SIZEBOX 8
-#define SBS_SIZEBOXBOTTOMRIGHTALIGN 4
-#define SBS_SIZEBOXTOPLEFTALIGN 2
-#define SBS_SIZEGRIP 16
-#define SBS_TOPALIGN 2
-#define SBS_VERT 1
-#define SS_BITMAP 14
-#define SS_BLACKFRAME 7
-#define SS_BLACKRECT 4
-#define SS_CENTER 1
-#define SS_CENTERIMAGE 512
-#define SS_ENHMETAFILE 15
-#define SS_ETCHEDFRAME 18
-#define SS_ETCHEDHORZ 16
-#define SS_ETCHEDVERT 17
-#define SS_GRAYFRAME 8
-#define SS_GRAYRECT 5
-#define SS_ICON 3
-#define SS_LEFT 0
-#define SS_LEFTNOWORDWRAP 0xc
-#define SS_NOPREFIX 128
-#define SS_NOTIFY 256
-#define SS_OWNERDRAW 0xd
-#define SS_REALSIZEIMAGE 0x800
-#define SS_RIGHT 2
-#define SS_RIGHTJUST 0x400
-#define SS_SIMPLE 11
-#define SS_SUNKEN 4096
-#define SS_WHITEFRAME 9
-#define SS_WHITERECT	6
-#define SS_USERITEM	10
-#define SS_TYPEMASK	0x0000001FL
-#define SS_ENDELLIPSIS	0x00004000L
-#define SS_PATHELLIPSIS	0x00008000L
-#define SS_WORDELLIPSIS	0x0000C000L
-#define SS_ELLIPSISMASK 0x0000C000L
-#define DS_3DLOOK 4
-#define DS_ABSALIGN 1
-#define DS_CENTER 0x800
-#define DS_CENTERMOUSE 4096
-#define DS_CONTEXTHELP 0x2000
-#define DS_CONTROL 0x400
-#define DS_FIXEDSYS 8
-#define DS_LOCALEDIT 32
-#define DS_MODALFRAME 128
-#define DS_NOFAILCREATE 16
-#define DS_NOIDLEMSG	256
-#define DS_SETFONT 64
-#define DS_SETFOREGROUND 512
-#define DS_SYSMODAL 2
-#define DS_SHELLFONT (DS_SETFONT | DS_FIXEDSYS)
-#define WS_EX_ACCEPTFILES 16
-#define WS_EX_APPWINDOW	0x40000
-#define WS_EX_CLIENTEDGE 512
-#define WS_EX_COMPOSITED 0x2000000 /* XP */
-#define WS_EX_CONTEXTHELP 0x400
-#define WS_EX_CONTROLPARENT 0x10000
-#define WS_EX_DLGMODALFRAME 1
-#define WS_EX_LAYERED 0x80000   /* w2k */
-#define WS_EX_LAYOUTRTL 0x400000 /* w98, w2k */
-#define WS_EX_LEFT	0
-#define WS_EX_LEFTSCROLLBAR	0x4000
-#define WS_EX_LTRREADING	0
-#define WS_EX_MDICHILD	64
-#define WS_EX_NOACTIVATE 0x8000000 /* w2k */
-#define WS_EX_NOINHERITLAYOUT 0x100000 /* w2k */
-#define WS_EX_NOPARENTNOTIFY	4
-#define WS_EX_OVERLAPPEDWINDOW	0x300
-#define WS_EX_PALETTEWINDOW	0x188
-#define WS_EX_RIGHT	0x1000
-#define WS_EX_RIGHTSCROLLBAR	0
-#define WS_EX_RTLREADING	0x2000
-#define WS_EX_STATICEDGE	0x20000
-#define WS_EX_TOOLWINDOW	128
-#define WS_EX_TOPMOST	8
-#define WS_EX_TRANSPARENT	32
-#define WS_EX_WINDOWEDGE	256
-#define WINSTA_ACCESSCLIPBOARD	4
-#define WINSTA_ACCESSGLOBALATOMS	32
-#define WINSTA_CREATEDESKTOP	8
-#define WINSTA_ENUMDESKTOPS	1
-#define WINSTA_ENUMERATE	256
-#define WINSTA_EXITWINDOWS	64
-#define WINSTA_READATTRIBUTES	2
-#define WINSTA_READSCREEN	512
-#define WINSTA_WRITEATTRIBUTES	16
-#define DDL_READWRITE	0
-#define DDL_READONLY	1
-#define DDL_HIDDEN	2
-#define DDL_SYSTEM	4
-#define DDL_DIRECTORY	16
-#define DDL_ARCHIVE	32
-#define DDL_POSTMSGS	8192
-#define DDL_DRIVES	16384
-#define DDL_EXCLUSIVE	32768
-#define DC_ACTIVE	0x00000001
-#define DC_SMALLCAP	0x00000002
-#define DC_ICON	0x00000004
-#define DC_TEXT	0x00000008
-#define DC_INBUTTON	0x00000010
-#if (_WIN32_WINDOWS >= 0x0410 || _WIN32_WINNT >= 0x0500)
-#define DC_GRADIENT	0x00000020
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-#define DC_BUTTONS	0x00001000
-#endif
-/* Where are these documented? */
-#define DC_CAPTION	(DC_ICON|DC_TEXT|DC_BUTTONS)
-#define DC_NC	(DC_CAPTION|DC_FRAME)
-
-#define BDR_RAISEDOUTER	1
-#define BDR_SUNKENOUTER	2
-#define BDR_RAISEDINNER	4
-#define BDR_SUNKENINNER	8
-#define BDR_OUTER	3
-#define BDR_INNER	0xc
-#define BDR_RAISED	5
-#define BDR_SUNKEN	10
-#define EDGE_RAISED	(BDR_RAISEDOUTER|BDR_RAISEDINNER)
-#define EDGE_SUNKEN	(BDR_SUNKENOUTER|BDR_SUNKENINNER)
-#define EDGE_ETCHED	(BDR_SUNKENOUTER|BDR_RAISEDINNER)
-#define EDGE_BUMP	(BDR_RAISEDOUTER|BDR_SUNKENINNER)
-#define BF_LEFT	1
-#define BF_TOP	2
-#define BF_RIGHT	4
-#define BF_BOTTOM	8
-#define BF_TOPLEFT	(BF_TOP|BF_LEFT)
-#define BF_TOPRIGHT	(BF_TOP|BF_RIGHT)
-#define BF_BOTTOMLEFT	(BF_BOTTOM|BF_LEFT)
-#define BF_BOTTOMRIGHT	(BF_BOTTOM|BF_RIGHT)
-#define BF_RECT	(BF_LEFT|BF_TOP|BF_RIGHT|BF_BOTTOM)
-#define BF_DIAGONAL	16
-#define BF_DIAGONAL_ENDTOPRIGHT	(BF_DIAGONAL|BF_TOP|BF_RIGHT)
-#define BF_DIAGONAL_ENDTOPLEFT	(BF_DIAGONAL|BF_TOP|BF_LEFT)
-#define BF_DIAGONAL_ENDBOTTOMLEFT	(BF_DIAGONAL|BF_BOTTOM|BF_LEFT)
-#define BF_DIAGONAL_ENDBOTTOMRIGHT	(BF_DIAGONAL|BF_BOTTOM|BF_RIGHT)
-#define BF_MIDDLE	0x800
-#define BF_SOFT	0x1000
-#define BF_ADJUST	0x2000
-#define BF_FLAT	0x4000
-#define BF_MONO	0x8000
-#define DFC_CAPTION	1
-#define DFC_MENU	2
-#define DFC_SCROLL	3
-#define DFC_BUTTON	4
-#define DFCS_CAPTIONCLOSE	0
-#define DFCS_CAPTIONMIN	1
-#define DFCS_CAPTIONMAX	2
-#define DFCS_CAPTIONRESTORE	3
-#define DFCS_CAPTIONHELP	4
-#define DFCS_MENUARROW	0
-#define DFCS_MENUCHECK	1
-#define DFCS_MENUBULLET	2
-#define DFCS_MENUARROWRIGHT	4
-#define DFCS_SCROLLUP	0
-#define DFCS_SCROLLDOWN	1
-#define DFCS_SCROLLLEFT	2
-#define DFCS_SCROLLRIGHT	3
-#define DFCS_SCROLLCOMBOBOX	5
-#define DFCS_SCROLLSIZEGRIP	8
-#define DFCS_SCROLLSIZEGRIPRIGHT	16
-#define DFCS_BUTTONCHECK	0
-#define DFCS_BUTTONRADIOIMAGE	1
-#define DFCS_BUTTONRADIOMASK	2
-#define DFCS_BUTTONRADIO	4
-#define DFCS_BUTTON3STATE	8
-#define DFCS_BUTTONPUSH	16
-#define DFCS_INACTIVE	256
-#define DFCS_PUSHED	512
-#define DFCS_CHECKED	1024
-#if (WINVER >= 0x0500)
-#define DFCS_TRANSPARENT	0x800
-#define DFCS_HOT	0x1000
-#endif
-#define DFCS_ADJUSTRECT	0x2000
-#define DFCS_FLAT	0x4000
-#define DFCS_MONO	0x8000
-#define DST_COMPLEX	0
-#define DST_TEXT	1
-#define DST_PREFIXTEXT	2
-#define DST_ICON	3
-#define DST_BITMAP	4
-#define DSS_NORMAL	0
-#define DSS_UNION	16
-#define DSS_DISABLED	32
-#define DSS_MONO	128
-#define DSS_RIGHT	0x8000
-#define DT_BOTTOM	8
-#define DT_CALCRECT	1024
-#define DT_CENTER	1
-#define DT_EDITCONTROL	8192
-#define DT_END_ELLIPSIS	32768
-#define DT_PATH_ELLIPSIS	16384
-#define DT_WORD_ELLIPSIS 0x40000
-#define DT_EXPANDTABS	64
-#define DT_EXTERNALLEADING	512
-#define DT_LEFT	0
-#define DT_MODIFYSTRING	65536
-#define DT_NOCLIP	256
-#define DT_NOPREFIX	2048
-#define DT_RIGHT	2
-#define DT_RTLREADING	131072
-#define DT_SINGLELINE	32
-#define DT_TABSTOP	128
-#define DT_TOP	0
-#define DT_VCENTER	4
-#define DT_WORDBREAK	16
-#define DT_INTERNAL	4096
-#define WB_ISDELIMITER	2
-#define WB_LEFT	0
-#define WB_RIGHT	1
-#define SB_HORZ	0
-#define SB_VERT	1
-#define SB_CTL	2
-#define SB_BOTH	3
-#define ESB_DISABLE_BOTH	3
-#define ESB_DISABLE_DOWN	2
-#define ESB_DISABLE_LEFT	1
-#define ESB_DISABLE_LTUP	1
-#define ESB_DISABLE_RIGHT	2
-#define ESB_DISABLE_RTDN	2
-#define ESB_DISABLE_UP	1
-#define ESB_ENABLE_BOTH	0
-#define SB_LINEUP	0
-#define SB_LINEDOWN	1
-#define SB_LINELEFT	0
-#define SB_LINERIGHT	1
-#define SB_PAGEUP	2
-#define SB_PAGEDOWN	3
-#define SB_PAGELEFT	2
-#define SB_PAGERIGHT	3
-#define SB_THUMBPOSITION	4
-#define SB_THUMBTRACK	5
-#define SB_ENDSCROLL	8
-#define SB_LEFT	6
-#define SB_RIGHT	7
-#define SB_BOTTOM	7
-#define SB_TOP	6
-#define MAKEINTRESOURCEA(i) (LPSTR)((DWORD)((WORD)(i)))
-#define MAKEINTRESOURCEW(i) (LPWSTR)((DWORD)((WORD)(i)))
-#ifndef XFree86Server
-# define RT_CURSOR MAKEINTRESOURCE(1)
-# define RT_FONT MAKEINTRESOURCE(8)
-#endif /* ndef XFree86Server */
-#define RT_BITMAP MAKEINTRESOURCE(2)
-#define RT_ICON MAKEINTRESOURCE(3)
-#define RT_MENU MAKEINTRESOURCE(4)
-#define RT_DIALOG MAKEINTRESOURCE(5)
-#define RT_STRING MAKEINTRESOURCE(6)
-#define RT_FONTDIR MAKEINTRESOURCE(7)
-#define RT_ACCELERATOR MAKEINTRESOURCE(9)
-#define RT_RCDATA MAKEINTRESOURCE(10)
-#define RT_MESSAGETABLE MAKEINTRESOURCE(11)
-#define DIFFERENCE 11
-#define RT_GROUP_CURSOR MAKEINTRESOURCE((DWORD)RT_CURSOR+DIFFERENCE)
-#define RT_GROUP_ICON MAKEINTRESOURCE((DWORD)RT_ICON+DIFFERENCE)
-#define RT_VERSION MAKEINTRESOURCE(16)
-#define RT_DLGINCLUDE MAKEINTRESOURCE(17)
-#define RT_PLUGPLAY MAKEINTRESOURCE(19)
-#define RT_VXD MAKEINTRESOURCE(20)
-#define RT_ANICURSOR MAKEINTRESOURCE(21)
-#define RT_ANIICON MAKEINTRESOURCE(22)
-#define RT_HTML MAKEINTRESOURCE(23)
-#define RT_MANIFEST MAKEINTRESOURCE(24)
-#define EWX_FORCE 4
-#define EWX_LOGOFF 0
-#define EWX_POWEROFF 8
-#define EWX_REBOOT 2
-#define EWX_SHUTDOWN 1
-#if (_WIN32_WINNT >= 0x0500)
-#define EWX_FORCEIFHUNG 16
-#endif
-#define CS_BYTEALIGNCLIENT 4096
-#define CS_BYTEALIGNWINDOW 8192
-#define CS_KEYCVTWINDOW 4
-#define CS_NOKEYCVT 256
-#define CS_CLASSDC 64
-#define CS_DBLCLKS 8
-#define CS_GLOBALCLASS 16384
-#define CS_HREDRAW 2
-#define CS_NOCLOSE 512
-#define CS_OWNDC 32
-#define CS_PARENTDC 128
-#define CS_SAVEBITS 2048
-#define CS_VREDRAW 1
-#define CS_IME 0x10000
-#define GCW_ATOM (-32)
-#define GCL_CBCLSEXTRA (-20)
-#define GCL_CBWNDEXTRA (-18)
-#define GCL_HBRBACKGROUND (-10)
-#define GCL_HCURSOR (-12)
-#define GCL_HICON (-14)
-#define GCL_HICONSM (-34)
-#define GCL_HMODULE (-16)
-#define GCL_MENUNAME (-8)
-#define GCL_STYLE (-26)
-#define GCL_WNDPROC (-24)
-#if 0
-    /* This is supposed to be defined by the program using it not defined
-       in the w32api headers.  I've left it here for documentation purposes.
-    */
-#ifndef IDC_STATIC  /* May be predefined by resource compiler. */
-#define IDC_STATIC (-1)
-#endif
-#endif
-#define IDC_ARROW MAKEINTRESOURCE(32512)
-#define IDC_IBEAM MAKEINTRESOURCE(32513)
-#define IDC_WAIT MAKEINTRESOURCE(32514)
-#define IDC_CROSS MAKEINTRESOURCE(32515)
-#define IDC_UPARROW MAKEINTRESOURCE(32516)
-#define IDC_SIZENWSE MAKEINTRESOURCE(32642)
-#define IDC_SIZENESW MAKEINTRESOURCE(32643)
-#define IDC_SIZEWE MAKEINTRESOURCE(32644)
-#define IDC_SIZENS MAKEINTRESOURCE(32645)
-#define IDC_SIZEALL MAKEINTRESOURCE(32646)
-#define IDC_NO MAKEINTRESOURCE(32648)
-#define IDC_HAND MAKEINTRESOURCE(32649)
-#define IDC_APPSTARTING MAKEINTRESOURCE(32650)
-#define IDC_HELP MAKEINTRESOURCE(32651)
-#define IDC_ICON MAKEINTRESOURCE(32641)
-#define IDC_SIZE MAKEINTRESOURCE(32640)
-#ifndef RC_INVOKED
-#define IDI_APPLICATION MAKEINTRESOURCE(32512)
-#define IDI_HAND MAKEINTRESOURCE(32513)
-#define IDI_QUESTION MAKEINTRESOURCE(32514)
-#define IDI_EXCLAMATION MAKEINTRESOURCE(32515)
-#define IDI_ASTERISK MAKEINTRESOURCE(32516)
-#define IDI_WINLOGO MAKEINTRESOURCE(32517)
-#else
-#define IDI_APPLICATION 32512
-#define IDI_HAND 32513
-#define IDI_QUESTION 32514
-#define IDI_EXCLAMATION 32515
-#define IDI_ASTERISK 32516
-#define IDI_WINLOGO 32517
-#endif
-#define IDI_WARNING IDI_EXCLAMATION
-#define IDI_ERROR IDI_HAND
-#define IDI_INFORMATION IDI_ASTERISK
-#define MIIM_STATE 1
-#define MIIM_ID 2
-#define MIIM_SUBMENU 4
-#define MIIM_CHECKMARKS 8
-#define MIIM_TYPE 16
-#define MIIM_DATA 32
-#define MIIM_STRING 64
-#define MIIM_BITMAP 128
-#define MIIM_FTYPE 256
-#define MFT_BITMAP 4
-#define MFT_MENUBARBREAK 32
-#define MFT_MENUBREAK 64
-#define MFT_OWNERDRAW 256
-#define MFT_RADIOCHECK 512
-#define MFT_RIGHTJUSTIFY 0x4000
-#define MFT_SEPARATOR 0x800
-#define MFT_RIGHTORDER 0x2000L
-#define MFT_STRING 0
-#define MFS_CHECKED 8
-#define MFS_DEFAULT 4096
-#define MFS_DISABLED 3
-#define MFS_ENABLED 0
-#define MFS_GRAYED 3
-#define MFS_HILITE 128
-#define MFS_UNCHECKED 0
-#define MFS_UNHILITE 0
-#define GW_HWNDNEXT 2
-#define GW_HWNDPREV 3
-#define GW_CHILD 5
-#define GW_HWNDFIRST 0
-#define GW_HWNDLAST 1
-#define GW_OWNER 4
-#define SW_HIDE 0
-#define SW_NORMAL 1
-#define SW_SHOWNORMAL 1
-#define SW_SHOWMINIMIZED 2
-#define SW_MAXIMIZE 3
-#define SW_SHOWMAXIMIZED 3
-#define SW_SHOWNOACTIVATE 4
-#define SW_SHOW 5
-#define SW_MINIMIZE 6
-#define SW_SHOWMINNOACTIVE 7
-#define SW_SHOWNA 8
-#define SW_RESTORE 9
-#define SW_SHOWDEFAULT 10
-#define SW_FORCEMINIMIZE 11
-#define SW_MAX 11
-#define MB_USERICON 128
-#define MB_ICONASTERISK 64
-#define MB_ICONEXCLAMATION 0x30
-#define MB_ICONWARNING 0x30
-#define MB_ICONERROR 16
-#define MB_ICONHAND 16
-#define MB_ICONQUESTION 32
-#define MB_OK 0
-#define MB_ABORTRETRYIGNORE 2
-#define MB_APPLMODAL 0
-#define MB_DEFAULT_DESKTOP_ONLY 0x20000
-#define MB_HELP 0x4000
-#define MB_RIGHT 0x80000
-#define MB_RTLREADING 0x100000
-#define MB_TOPMOST 0x40000
-#define MB_DEFBUTTON1 0
-#define MB_DEFBUTTON2 256
-#define MB_DEFBUTTON3 512
-#define MB_DEFBUTTON4 0x300
-#define MB_ICONINFORMATION 64
-#define MB_ICONSTOP 16
-#define MB_OKCANCEL 1
-#define MB_RETRYCANCEL 5
-#ifdef _WIN32_WINNT
-#if (_WIN32_WINNT >= 0x0400)
-#define MB_SERVICE_NOTIFICATION 0x00200000
-#else
-#define MB_SERVICE_NOTIFICATION 0x00040000
-#endif
-#define MB_SERVICE_NOTIFICATION_NT3X 0x00040000
-#endif
-#define MB_SETFOREGROUND 0x10000
-#define MB_SYSTEMMODAL 4096
-#define MB_TASKMODAL 0x2000
-#define MB_YESNO 4
-#define MB_YESNOCANCEL 3
-#define MB_ICONMASK 240
-#define MB_DEFMASK 3840
-#define MB_MODEMASK 0x00003000
-#define MB_MISCMASK 0x0000C000
-#define MB_NOFOCUS 0x00008000
-#define MB_TYPEMASK 15
-#define MB_TOPMOST 0x40000
-
-#define IDOK 1
-#define IDCANCEL 2
-#define IDABORT 3
-#define IDRETRY 4
-#define IDIGNORE 5
-#define IDYES 6
-#define IDNO 7
-#if (WINVER >= 0x0400)
-#define IDCLOSE 8
-#define IDHELP 9
-#endif
-#if (WINVER >= 0x0500)
-#define IDTRYAGAIN 10
-#define IDCONTINUE 11
-#endif
-
-#define GWL_EXSTYLE (-20)
-#define GWL_STYLE (-16)
-#define GWL_WNDPROC (-4)
-#define GWLP_WNDPROC (-4)
-#define GWL_HINSTANCE (-6)
-#define GWLP_HINSTANCE (-6)
-#define GWL_HWNDPARENT (-8)
-#define GWLP_HWNDPARENT (-8)
-#define GWL_ID (-12)
-#define GWLP_ID (-12)
-#define GWL_USERDATA (-21)
-#define GWLP_USERDATA (-21)
-#define DWL_DLGPROC 4
-#define DWLP_DLGPROC 4
-#define DWL_MSGRESULT 0
-#define DWLP_MSGRESULT 0
-#define DWL_USER 8
-#define DWLP_USER 8
-#if (_WIN32_WINNT >= 0x0501)
-#define QS_ALLEVENTS 1215
-#define QS_ALLINPUT 1279
-#else
-#define QS_ALLEVENTS 191
-#define QS_ALLINPUT 255
-#endif
-#define QS_ALLPOSTMESSAGE 256
-#define QS_HOTKEY 128
-#if (_WIN32_WINNT >= 0x0501)
-#define QS_INPUT 1031
-#else
-#define QS_INPUT 7
-#endif
-#define QS_KEY 1
-#define QS_MOUSE 6
-#define QS_MOUSEBUTTON 4
-#define QS_MOUSEMOVE 2
-#define QS_PAINT 32
-#define QS_POSTMESSAGE 8
-#if (_WIN32_WINNT >= 0x0501)
-#define QS_RAWINPUT 1024
-#endif
-#define QS_SENDMESSAGE 64
-#define QS_TIMER 16
-#define MWMO_WAITALL 1
-#define MWMO_ALERTABLE 2
-#define MWMO_INPUTAVAILABLE 4
-#define COLOR_3DDKSHADOW 21
-#define COLOR_3DFACE 15
-#define COLOR_3DHILIGHT 20
-#define COLOR_3DHIGHLIGHT 20
-#define COLOR_3DLIGHT 22
-#define COLOR_BTNHILIGHT 20
-#define COLOR_3DSHADOW 16
-#define COLOR_ACTIVEBORDER 10
-#define COLOR_ACTIVECAPTION 2
-#define COLOR_APPWORKSPACE 12
-#define COLOR_BACKGROUND 1
-#define COLOR_DESKTOP 1
-#define COLOR_BTNFACE 15
-#define COLOR_BTNHIGHLIGHT 20
-#define COLOR_BTNSHADOW 16
-#define COLOR_BTNTEXT 18
-#define COLOR_CAPTIONTEXT 9
-#define COLOR_GRAYTEXT 17
-#define COLOR_HIGHLIGHT 13
-#define COLOR_HIGHLIGHTTEXT 14
-#define COLOR_INACTIVEBORDER 11
-#define COLOR_INACTIVECAPTION 3
-#define COLOR_INACTIVECAPTIONTEXT 19
-#define COLOR_INFOBK 24
-#define COLOR_INFOTEXT 23
-#define COLOR_MENU 4
-#define COLOR_MENUTEXT 7
-#define COLOR_SCROLLBAR 0
-#define COLOR_WINDOW 5
-#define COLOR_WINDOWFRAME 6
-#define COLOR_WINDOWTEXT 8
-#define CTLCOLOR_MSGBOX 0
-#define CTLCOLOR_EDIT 1
-#define CTLCOLOR_LISTBOX 2
-#define CTLCOLOR_BTN 3
-#define CTLCOLOR_DLG 4
-#define CTLCOLOR_SCROLLBAR 5
-#define CTLCOLOR_STATIC 6
-#define CTLCOLOR_MAX 7
-#define SM_CXSCREEN 0
-#define SM_CYSCREEN 1
-#define SM_CXVSCROLL 2
-#define SM_CYHSCROLL 3
-#define SM_CYCAPTION 4
-#define SM_CXBORDER 5
-#define SM_CYBORDER 6
-#define SM_CXDLGFRAME 7
-#define SM_CXFIXEDFRAME 7
-#define SM_CYDLGFRAME 8
-#define SM_CYFIXEDFRAME 8
-#define SM_CYVTHUMB 9
-#define SM_CXHTHUMB 10
-#define SM_CXICON 11
-#define SM_CYICON 12
-#define SM_CXCURSOR 13
-#define SM_CYCURSOR 14
-#define SM_CYMENU 15
-#define SM_CXFULLSCREEN 16
-#define SM_CYFULLSCREEN 17
-#define SM_CYKANJIWINDOW 18
-#define SM_MOUSEPRESENT 19
-#define SM_CYVSCROLL 20
-#define SM_CXHSCROLL 21
-#define SM_DEBUG 22
-#define SM_SWAPBUTTON 23
-#define SM_RESERVED1 24
-#define SM_RESERVED2 25
-#define SM_RESERVED3 26
-#define SM_RESERVED4 27
-#define SM_CXMIN 28
-#define SM_CYMIN 29
-#define SM_CXSIZE 30
-#define SM_CYSIZE 31
-#define SM_CXSIZEFRAME 32
-#define SM_CXFRAME 32
-#define SM_CYSIZEFRAME 33
-#define SM_CYFRAME 33
-#define SM_CXMINTRACK 34
-#define SM_CYMINTRACK 35
-#define SM_CXDOUBLECLK 36
-#define SM_CYDOUBLECLK 37
-#define SM_CXICONSPACING 38
-#define SM_CYICONSPACING 39
-#define SM_MENUDROPALIGNMENT 40
-#define SM_PENWINDOWS 41
-#define SM_DBCSENABLED 42
-#define SM_CMOUSEBUTTONS 43
-#define SM_SECURE 44
-#define SM_CXEDGE 45
-#define SM_CYEDGE 46
-#define SM_CXMINSPACING 47
-#define SM_CYMINSPACING 48
-#define SM_CXSMICON 49
-#define SM_CYSMICON 50
-#define SM_CYSMCAPTION 51
-#define SM_CXSMSIZE 52
-#define SM_CYSMSIZE 53
-#define SM_CXMENUSIZE 54
-#define SM_CYMENUSIZE 55
-#define SM_ARRANGE 56
-#define SM_CXMINIMIZED 57
-#define SM_CYMINIMIZED 58
-#define SM_CXMAXTRACK 59
-#define SM_CYMAXTRACK 60
-#define SM_CXMAXIMIZED 61
-#define SM_CYMAXIMIZED 62
-#define SM_NETWORK 63
-#define LR_DEFAULTSIZE 64
-#define SM_CLEANBOOT 67
-#define SM_CXDRAG 68
-#define SM_CYDRAG 69
-#define SM_SHOWSOUNDS 70
-#define SM_CXMENUCHECK 71
-#define SM_CYMENUCHECK 72
-#define SM_SLOWMACHINE 73
-#define SM_MIDEASTENABLED 74
-#define SM_MOUSEWHEELPRESENT 75
-#define SM_XVIRTUALSCREEN 76
-#define SM_YVIRTUALSCREEN 77
-#define SM_CXVIRTUALSCREEN 78
-#define SM_CYVIRTUALSCREEN 79
-#define SM_CMONITORS 80
-#define SM_SAMEDISPLAYFORMAT 81
-#if (_WIN32_WINNT < 0x0400)
-#define SM_CMETRICS 76
-#else
-#define SM_CMETRICS 83
-#endif
-#define SM_REMOTESESSION 0X1000
-#define ARW_BOTTOMLEFT 0
-#define ARW_BOTTOMRIGHT 1
-#define ARW_HIDE 8
-#define ARW_TOPLEFT 2
-#define ARW_TOPRIGHT 3
-#define ARW_DOWN 4
-#define ARW_LEFT 0
-#define ARW_RIGHT 0
-#define ARW_UP 4
-#define UOI_FLAGS 1
-#define UOI_NAME 2
-#define UOI_TYPE 3
-#define UOI_USER_SID 4
-#define LR_DEFAULTCOLOR 0
-#define LR_MONOCHROME 1
-#define LR_COLOR 2
-#define LR_COPYRETURNORG 4
-#define LR_COPYDELETEORG 8
-#define LR_LOADFROMFILE 16
-#define LR_LOADTRANSPARENT 32
-#define LR_LOADREALSIZE 128
-#define LR_LOADMAP3DCOLORS 4096
-#define LR_CREATEDIBSECTION 8192
-#define LR_COPYFROMRESOURCE 0x4000
-#define LR_SHARED 32768
-#define KEYEVENTF_EXTENDEDKEY 0x00000001
-#define KEYEVENTF_KEYUP 00000002
-#if (_WIN32_WINNT >= 0x0500)
-#define KEYEVENTF_UNICODE 0x00000004
-#define KEYEVENTF_SCANCODE 0x00000008
-#endif
-#define OBM_BTNCORNERS 32758
-#define OBM_BTSIZE 32761
-#define OBM_CHECK 32760
-#define OBM_CHECKBOXES 32759
-#define OBM_CLOSE 32754
-#define OBM_COMBO 32738
-#define OBM_DNARROW 32752
-#define OBM_DNARROWD 32742
-#define OBM_DNARROWI 32736
-#define OBM_LFARROW 32750
-#define OBM_LFARROWI 32734
-#define OBM_LFARROWD 32740
-#define OBM_MNARROW 32739
-#define OBM_OLD_CLOSE 32767
-#define OBM_OLD_DNARROW 32764
-#define OBM_OLD_LFARROW 32762
-#define OBM_OLD_REDUCE 32757
-#define OBM_OLD_RESTORE 32755
-#define OBM_OLD_RGARROW 32763
-#define OBM_OLD_UPARROW 32765
-#define OBM_OLD_ZOOM 32756
-#define OBM_REDUCE 32749
-#define OBM_REDUCED 32746
-#define OBM_RESTORE 32747
-#define OBM_RESTORED 32744
-#define OBM_RGARROW 32751
-#define OBM_RGARROWD 32741
-#define OBM_RGARROWI 32735
-#define OBM_SIZE 32766
-#define OBM_UPARROW 32753
-#define OBM_UPARROWD 32743
-#define OBM_UPARROWI 32737
-#define OBM_ZOOM 32748
-#define OBM_ZOOMD 32745
-#define OCR_NORMAL 32512
-#define OCR_IBEAM 32513
-#define OCR_WAIT 32514
-#define OCR_CROSS 32515
-#define OCR_UP 32516
-#define OCR_SIZE 32640
-#define OCR_ICON 32641
-#define OCR_SIZENWSE 32642
-#define OCR_SIZENESW 32643
-#define OCR_SIZEWE 32644
-#define OCR_SIZENS 32645
-#define OCR_SIZEALL 32646
-#define OCR_NO 32648
-#define OCR_APPSTARTING 32650
-#define OIC_SAMPLE 32512
-#define OIC_HAND 32513
-#define OIC_QUES 32514
-#define OIC_BANG 32515
-#define OIC_NOTE 32516
-#define OIC_WINLOGO 32517
-#define OIC_WARNING OIC_BANG
-#define OIC_ERROR OIC_HAND
-#define OIC_INFORMATION OIC_NOTE
-#define HELPINFO_MENUITEM 2
-#define HELPINFO_WINDOW 1
-#define MSGF_DIALOGBOX 0
-#define MSGF_MESSAGEBOX 1
-#define MSGF_MENU 2
-#define MSGF_MOVE 3
-#define MSGF_SIZE 4
-#define MSGF_SCROLLBAR 5
-#define MSGF_NEXTWINDOW 6
-#define MSGF_MAINLOOP 8
-#define MSGF_USER 4096
-#define MOUSEEVENTF_MOVE 1
-#define MOUSEEVENTF_LEFTDOWN 2
-#define MOUSEEVENTF_LEFTUP 4
-#define MOUSEEVENTF_RIGHTDOWN 8
-#define MOUSEEVENTF_RIGHTUP 16
-#define MOUSEEVENTF_MIDDLEDOWN 32
-#define MOUSEEVENTF_MIDDLEUP 64
-#define MOUSEEVENTF_WHEEL 0x0800
-#define MOUSEEVENTF_ABSOLUTE 32768
-#define PM_NOREMOVE 0
-#define PM_REMOVE 1
-#define PM_NOYIELD 2
-#if (WINVER >= 0x0500)
-# define PM_QS_INPUT (QS_INPUT << 16)
-# define PM_QS_POSTMESSAGE ((QS_POSTMESSAGE|QS_HOTKEY|QS_TIMER) << 16)
-# define PM_QS_PAINT (QS_PAINT << 16)
-# define PM_QS_SENDMESSAGE (QS_SENDMESSAGE << 16)
-#endif
-#define HWND_BROADCAST  ((HWND)0xffff)
-#define HWND_BOTTOM ((HWND)1)
-#define HWND_NOTOPMOST ((HWND)(-2))
-#define HWND_TOP ((HWND)0)
-#define HWND_TOPMOST ((HWND)(-1))
-#define HWND_DESKTOP (HWND)0
-#define HWND_MESSAGE ((HWND)(-3)) /* w2k */
-#define RDW_ERASE 4
-#define RDW_FRAME 1024
-#define RDW_INTERNALPAINT 2
-#define RDW_INVALIDATE 1
-#define RDW_NOERASE 32
-#define RDW_NOFRAME 2048
-#define RDW_NOINTERNALPAINT 16
-#define RDW_VALIDATE 8
-#define RDW_ERASENOW 512
-#define RDW_UPDATENOW 256
-#define RDW_ALLCHILDREN 128
-#define RDW_NOCHILDREN 64
-#define SMTO_ABORTIFHUNG 2
-#define SMTO_BLOCK 1
-#define SMTO_NORMAL 0
-#define SIF_ALL 23
-#define SIF_PAGE 2
-#define SIF_POS 4
-#define SIF_RANGE 1
-#define SIF_DISABLENOSCROLL 8
-#define SIF_TRACKPOS   16
-#define SWP_DRAWFRAME 32
-#define SWP_FRAMECHANGED 32
-#define SWP_HIDEWINDOW 128
-#define SWP_NOACTIVATE 16
-#define SWP_NOCOPYBITS 256
-#define SWP_NOMOVE 2
-#define SWP_NOSIZE 1
-#define SWP_NOREDRAW 8
-#define SWP_NOZORDER 4
-#define SWP_SHOWWINDOW 64
-#define SWP_NOOWNERZORDER 512
-#define SWP_NOREPOSITION 512
-#define SWP_NOSENDCHANGING 1024
-#define SWP_DEFERERASE 8192
-#define SWP_ASYNCWINDOWPOS  16384
-#define HSHELL_ACTIVATESHELLWINDOW 3
-#define HSHELL_GETMINRECT 5
-#define HSHELL_LANGUAGE 8
-#define HSHELL_REDRAW 6
-#define HSHELL_TASKMAN 7
-#define HSHELL_WINDOWACTIVATED 4
-#define HSHELL_WINDOWCREATED 1
-#define HSHELL_WINDOWDESTROYED 2
-#define SPI_GETACCESSTIMEOUT 60
-#define SPI_GETACTIVEWINDOWTRACKING 4096
-#define SPI_GETACTIVEWNDTRKTIMEOUT 8194
-#define SPI_GETACTIVEWNDTRKZORDER 4108
-#define SPI_GETANIMATION 72
-#define SPI_GETBEEP 1
-#define SPI_GETBORDER 5
-#define SPI_GETDEFAULTINPUTLANG 89
-#define SPI_GETDRAGFULLWINDOWS 38
-#define SPI_GETFASTTASKSWITCH 35
-#define SPI_GETFILTERKEYS 50
-#define SPI_GETFONTSMOOTHING 74
-#define SPI_GETGRIDGRANULARITY 18
-#define SPI_GETHIGHCONTRAST 66
-#define SPI_GETICONMETRICS 45
-#define SPI_GETICONTITLELOGFONT 31
-#define SPI_GETICONTITLEWRAP 25
-#define SPI_GETKEYBOARDDELAY 22
-#define SPI_GETKEYBOARDPREF 68
-#define SPI_GETKEYBOARDSPEED 10
-#define SPI_GETLOWPOWERACTIVE 83
-#define SPI_GETLOWPOWERTIMEOUT 79
-#define SPI_GETMENUDROPALIGNMENT 27
-#define SPI_GETMINIMIZEDMETRICS 43
-#define SPI_GETMOUSE 3
-#define SPI_GETMOUSEKEYS 54
-#define SPI_GETMOUSETRAILS 94
-#define SPI_GETNONCLIENTMETRICS 41
-#define SPI_GETPOWEROFFACTIVE 84
-#define SPI_GETPOWEROFFTIMEOUT 80
-#define SPI_GETSCREENREADER 70
-#define SPI_GETSCREENSAVEACTIVE 16
-#define SPI_GETSCREENSAVETIMEOUT 14
-#define SPI_GETSERIALKEYS 62
-#define SPI_GETSHOWSOUNDS 56
-#define SPI_GETSOUNDSENTRY 64
-#define SPI_GETSTICKYKEYS 58
-#define SPI_GETTOGGLEKEYS 52
-#define SPI_GETWHEELSCROLLLINES 104 
-#define SPI_GETWINDOWSEXTENSION 92
-#define SPI_GETWORKAREA 48
-#define SPI_ICONHORIZONTALSPACING 13
-#define SPI_ICONVERTICALSPACING 24
-#define SPI_LANGDRIVER 12
-#define SPI_SCREENSAVERRUNNING 97
-#define SPI_SETACCESSTIMEOUT 61
-#define SPI_SETACTIVEWINDOWTRACKING 4097
-#define SPI_SETACTIVEWNDTRKTIMEOUT 8195
-#define SPI_SETACTIVEWNDTRKZORDER 4109
-#define SPI_SETANIMATION 73
-#define SPI_SETBEEP 2
-#define SPI_SETBORDER 6
-#define SPI_SETDEFAULTINPUTLANG 90
-#define SPI_SETDESKPATTERN 21
-#define SPI_SETDESKWALLPAPER 20
-#define SPI_SETDOUBLECLICKTIME 32
-#define SPI_SETDOUBLECLKHEIGHT 30
-#define SPI_SETDOUBLECLKWIDTH 29
-#define SPI_SETDRAGFULLWINDOWS 37
-#define SPI_SETDRAGHEIGHT 77
-#define SPI_SETDRAGWIDTH 76
-#define SPI_SETFASTTASKSWITCH 36
-#define SPI_SETFILTERKEYS 51
-#define SPI_SETFONTSMOOTHING 75
-#define SPI_SETGRIDGRANULARITY 19
-#define SPI_SETHANDHELD 78
-#define SPI_SETHIGHCONTRAST 67
-#define SPI_SETICONMETRICS 46
-#define SPI_SETICONTITLELOGFONT 34
-#define SPI_SETICONTITLEWRAP 26
-#define SPI_SETKEYBOARDDELAY 23
-#define SPI_SETKEYBOARDPREF 69
-#define SPI_SETKEYBOARDSPEED 11
-#define SPI_SETLANGTOGGLE 91
-#define SPI_SETLOWPOWERACTIVE 85
-#define SPI_SETLOWPOWERTIMEOUT 81
-#define SPI_SETMENUDROPALIGNMENT 28
-#define SPI_SETMINIMIZEDMETRICS 44
-#define SPI_SETMOUSE 4
-#define SPI_SETMOUSEBUTTONSWAP 33
-#define SPI_SETMOUSEKEYS 55
-#define SPI_SETMOUSETRAILS 93
-#define SPI_SETNONCLIENTMETRICS 42
-#define SPI_SETPENWINDOWS 49
-#define SPI_SETPOWEROFFACTIVE 86
-#define SPI_SETPOWEROFFTIMEOUT 82
-#define SPI_SETSCREENREADER 71
-#define SPI_SETSCREENSAVEACTIVE 17
-#define SPI_SETSCREENSAVERRUNNING 97
-#define SPI_SETSCREENSAVETIMEOUT 15
-#define SPI_SETSERIALKEYS 63
-#define SPI_SETSHOWSOUNDS 57
-#define SPI_SETSOUNDSENTRY 65
-#define SPI_SETSTICKYKEYS 59
-#define SPI_SETTOGGLEKEYS 53
-#define SPI_SETWHEELSCROLLLINES 105
-#define SPI_SETWORKAREA 47
-#define SPIF_UPDATEINIFILE 1
-#define SPIF_SENDWININICHANGE 2
-#define SPIF_SENDCHANGE 2
-#define ATF_ONOFFFEEDBACK 2
-#define ATF_TIMEOUTON 1
-#define WM_APP 32768
-#define WM_ACTIVATE 6
-#define WM_ACTIVATEAPP 28
-/* FIXME/CHECK: Are WM_AFX{FIRST,LAST} valid for WINVER < 0x400? */
-#define WM_AFXFIRST 864
-#define WM_AFXLAST 895
-#define WM_ASKCBFORMATNAME 780
-#define WM_CANCELJOURNAL 75
-#define WM_CANCELMODE 31
-#define WM_CAPTURECHANGED 533
-#define WM_CHANGECBCHAIN 781
-#define WM_CHAR 258
-#define WM_CHARTOITEM 47
-#define WM_CHILDACTIVATE 34
-#define WM_CLEAR 771
-#define WM_CLOSE 16
-#define WM_COMMAND 273
-#define WM_COMMNOTIFY 68		/* obsolete */
-#define WM_COMPACTING 65
-#define WM_COMPAREITEM 57
-#define WM_CONTEXTMENU 123
-#define WM_COPY 769
-#define WM_COPYDATA 74
-#define WM_CREATE 1
-#define WM_CTLCOLORBTN 309
-#define WM_CTLCOLORDLG 310
-#define WM_CTLCOLOREDIT 307
-#define WM_CTLCOLORLISTBOX 308
-#define WM_CTLCOLORMSGBOX 306
-#define WM_CTLCOLORSCROLLBAR 311
-#define WM_CTLCOLORSTATIC 312
-#define WM_CUT 768
-#define WM_DEADCHAR 259
-#define WM_DELETEITEM 45
-#define WM_DESTROY 2
-#define WM_DESTROYCLIPBOARD 775
-#define WM_DEVICECHANGE 537
-#define WM_DEVMODECHANGE 27
-#define WM_DISPLAYCHANGE 126
-#define WM_DRAWCLIPBOARD 776
-#define WM_DRAWITEM 43
-#define WM_DROPFILES 563
-#define WM_ENABLE 10
-#define WM_ENDSESSION 22
-#define WM_ENTERIDLE 289
-#define WM_ENTERMENULOOP 529
-#define WM_ENTERSIZEMOVE 561
-#define WM_ERASEBKGND 20
-#define WM_EXITMENULOOP 530
-#define WM_EXITSIZEMOVE 562
-#define WM_FONTCHANGE 29
-#define WM_GETDLGCODE 135
-#define WM_GETFONT 49
-#define WM_GETHOTKEY 51
-#define WM_GETICON 127
-#define WM_GETMINMAXINFO 36
-#define WM_GETTEXT 13
-#define WM_GETTEXTLENGTH 14
-/* FIXME/CHECK: Are WM_HANDHEL{FIRST,LAST} valid for WINVER < 0x400? */
-#define WM_HANDHELDFIRST 856
-#define WM_HANDHELDLAST 863
-#define WM_HELP 83
-#define WM_HOTKEY 786
-#define WM_HSCROLL 276
-#define WM_HSCROLLCLIPBOARD 782
-#define WM_ICONERASEBKGND 39
-#define WM_INITDIALOG 272
-#define WM_INITMENU 278
-#define WM_INITMENUPOPUP 279
-#define WM_INPUTLANGCHANGE 81
-#define WM_INPUTLANGCHANGEREQUEST 80
-#define WM_KEYDOWN 256
-#define WM_KEYUP 257
-#define WM_KILLFOCUS 8
-#define WM_MDIACTIVATE 546
-#define WM_MDICASCADE 551
-#define WM_MDICREATE 544
-#define WM_MDIDESTROY 545
-#define WM_MDIGETACTIVE 553
-#define WM_MDIICONARRANGE 552
-#define WM_MDIMAXIMIZE 549
-#define WM_MDINEXT 548
-#define WM_MDIREFRESHMENU 564
-#define WM_MDIRESTORE 547
-#define WM_MDISETMENU 560
-#define WM_MDITILE 550
-#define WM_MEASUREITEM 44
-#if (WINVER >= 0x0500)
-#define WM_MENURBUTTONUP 290
-#endif
-#define WM_MENUCHAR 288
-#define WM_MENUSELECT 287
-#define WM_NEXTMENU 531
-#define WM_MOVE 3
-#define WM_MOVING 534
-#define WM_NCACTIVATE 134
-#define WM_NCCALCSIZE 131
-#define WM_NCCREATE 129
-#define WM_NCDESTROY 130
-#define WM_NCHITTEST 132
-#define WM_NCLBUTTONDBLCLK 163
-#define WM_NCLBUTTONDOWN 161
-#define WM_NCLBUTTONUP 162
-#define WM_NCMBUTTONDBLCLK 169
-#define WM_NCMBUTTONDOWN 167
-#define WM_NCMBUTTONUP 168
-#define WM_NCMOUSEMOVE 160
-#define WM_NCPAINT 133
-#define WM_NCRBUTTONDBLCLK 166
-#define WM_NCRBUTTONDOWN 164
-#define WM_NCRBUTTONUP 165
-#define WM_NEXTDLGCTL 40
-#define WM_NEXTMENU 531
-#define WM_NOTIFY 78
-#define WM_NOTIFYFORMAT 85
-#define WM_NULL 0
-#define WM_PAINT 15
-#define WM_PAINTCLIPBOARD 777
-#define WM_PAINTICON 38
-#define WM_PALETTECHANGED 785
-#define WM_PALETTEISCHANGING 784
-#define WM_PARENTNOTIFY 528
-#define WM_PASTE 770
-#define WM_PENWINFIRST 896
-#define WM_PENWINLAST 911
-#define WM_POWER 72
-#define WM_POWERBROADCAST 536
-#define WM_PRINT 791
-#define WM_PRINTCLIENT 792
-#define WM_QUERYDRAGICON 55
-#define WM_QUERYENDSESSION 17
-#define WM_QUERYNEWPALETTE 783
-#define WM_QUERYOPEN 19
-#define WM_QUEUESYNC 35
-#define WM_QUIT 18
-#define WM_RENDERALLFORMATS 774
-#define WM_RENDERFORMAT 773
-#define WM_SETCURSOR 32
-#define WM_SETFOCUS 7
-#define WM_SETFONT 48
-#define WM_SETHOTKEY 50
-#define WM_SETICON 128
-#define WM_SETREDRAW 11
-#define WM_SETTEXT 12
-#define WM_SETTINGCHANGE 26
-#define WM_SHOWWINDOW 24
-#define WM_SIZE 5
-#define WM_SIZECLIPBOARD 779
-#define WM_SIZING 532
-#define WM_SPOOLERSTATUS 42
-#define WM_STYLECHANGED 125
-#define WM_STYLECHANGING 124
-#define WM_SYSCHAR 262
-#define WM_SYSCOLORCHANGE 21
-#define WM_SYSCOMMAND 274
-#define WM_SYSDEADCHAR 263
-#define WM_SYSKEYDOWN 260
-#define WM_SYSKEYUP 261
-#define WM_TCARD 82
-#define WM_TIMECHANGE 30
-#define WM_TIMER 275
-#define WM_UNDO 772
-#define WM_USER 1024
-#define WM_USERCHANGED 84
-#define WM_VKEYTOITEM 46
-#define WM_VSCROLL 277
-#define WM_VSCROLLCLIPBOARD 778
-#define WM_WINDOWPOSCHANGED 71
-#define WM_WINDOWPOSCHANGING 70
-#define WM_WININICHANGE 26
-#define WM_KEYFIRST 256
-#define WM_KEYLAST 264
-#define WM_SYNCPAINT  136
-#define WM_MOUSEACTIVATE 33
-#define WM_MOUSEMOVE 512
-#define WM_LBUTTONDOWN 513
-#define WM_LBUTTONUP 514
-#define WM_LBUTTONDBLCLK 515
-#define WM_RBUTTONDOWN 516
-#define WM_RBUTTONUP 517
-#define WM_RBUTTONDBLCLK 518
-#define WM_MBUTTONDOWN 519
-#define WM_MBUTTONUP 520
-#define WM_MBUTTONDBLCLK 521
-#define WM_MOUSEWHEEL 522
-#define WM_MOUSEFIRST 512
-#define WM_MOUSELAST 522
-#define WM_MOUSEHOVER	0x2A1
-#define WM_MOUSELEAVE	0x2A3
-#if (_WIN32_WINNT >= 0x0400)
-#define WHEEL_DELTA 120
-#define GET_WHEEL_DELTA_WPARAM(wparam) ((short)HIWORD (wparam))
-#define WHEEL_PAGESCROLL UINT_MAX
-#endif
-#define BM_CLICK 245
-#define BM_GETCHECK 240
-#define BM_GETIMAGE 246
-#define BM_GETSTATE 242
-#define BM_SETCHECK 241
-#define BM_SETIMAGE 247
-#define BM_SETSTATE 243
-#define BM_SETSTYLE 244
-#define BN_CLICKED 0
-#define BN_DBLCLK 5
-#define BN_DISABLE 4
-#define BN_DOUBLECLICKED 5
-#define BN_HILITE 2
-#define BN_KILLFOCUS 7
-#define BN_PAINT 1
-#define BN_PUSHED 2
-#define BN_SETFOCUS 6
-#define BN_UNHILITE 3
-#define BN_UNPUSHED 3
-#define CB_ADDSTRING 323
-#define CB_DELETESTRING 324
-#define CB_DIR 325
-#define CB_FINDSTRING 332
-#define CB_FINDSTRINGEXACT 344
-#define CB_GETCOUNT 326
-#define CB_GETCURSEL 327
-#define CB_GETDROPPEDCONTROLRECT 338
-#define CB_GETDROPPEDSTATE 343
-#define CB_GETDROPPEDWIDTH 351
-#define CB_GETEDITSEL 320
-#define CB_GETEXTENDEDUI 342
-#define CB_GETHORIZONTALEXTENT 349
-#define CB_GETITEMDATA 336
-#define CB_GETITEMHEIGHT 340
-#define CB_GETLBTEXT 328
-#define CB_GETLBTEXTLEN 329
-#define CB_GETLOCALE 346
-#define CB_GETTOPINDEX 347
-#define CB_INITSTORAGE 353
-#define CB_INSERTSTRING 330
-#define CB_LIMITTEXT 321
-#define CB_RESETCONTENT 331
-#define CB_SELECTSTRING 333
-#define CB_SETCURSEL 334
-#define CB_SETDROPPEDWIDTH 352
-#define CB_SETEDITSEL 322
-#define CB_SETEXTENDEDUI 341
-#define CB_SETHORIZONTALEXTENT 350
-#define CB_SETITEMDATA 337
-#define CB_SETITEMHEIGHT 339
-#define CB_SETLOCALE 345
-#define CB_SETTOPINDEX 348
-#define CB_SHOWDROPDOWN 335
-#define CBN_CLOSEUP 8
-#define CBN_DBLCLK 2
-#define CBN_DROPDOWN 7
-#define CBN_EDITCHANGE 5
-#define CBN_EDITUPDATE 6
-#define CBN_ERRSPACE (-1)
-#define CBN_KILLFOCUS 4
-#define CBN_SELCHANGE 1
-#define CBN_SELENDCANCEL 10
-#define CBN_SELENDOK 9
-#define CBN_SETFOCUS 3
-#define EM_CANUNDO 198
-#define EM_CHARFROMPOS 215
-#define EM_EMPTYUNDOBUFFER 205
-#define EM_FMTLINES 200
-#define EM_GETFIRSTVISIBLELINE 206
-#define EM_GETHANDLE 189
-#define EM_GETLIMITTEXT 213
-#define EM_GETLINE 196
-#define EM_GETLINECOUNT 186
-#define EM_GETMARGINS 212
-#define EM_GETMODIFY 184
-#define EM_GETPASSWORDCHAR 210
-#define EM_GETRECT 178
-#define EM_GETSEL 176
-#define EM_GETTHUMB 190
-#define EM_GETWORDBREAKPROC 209
-#define EM_LIMITTEXT 197
-#define EM_LINEFROMCHAR 201
-#define EM_LINEINDEX 187
-#define EM_LINELENGTH 193
-#define EM_LINESCROLL 182
-#define EM_POSFROMCHAR 214
-#define EM_REPLACESEL 194
-#define EM_SCROLL 181
-#define EM_SCROLLCARET 183
-#define EM_SETHANDLE 188
-#define EM_SETLIMITTEXT 197
-#define EM_SETMARGINS 211
-#define EM_SETMODIFY 185
-#define EM_SETPASSWORDCHAR 204
-#define EM_SETREADONLY 207
-#define EM_SETRECT 179
-#define EM_SETRECTNP 180
-#define EM_SETSEL 177
-#define EM_SETTABSTOPS 203
-#define EM_SETWORDBREAKPROC 208
-#define EM_UNDO 199
-#define EN_CHANGE 768
-#define EN_ERRSPACE 1280
-#define EN_HSCROLL 1537
-#define EN_KILLFOCUS 512
-#define EN_MAXTEXT 1281
-#define EN_SETFOCUS 256
-#define EN_UPDATE 1024
-#define EN_VSCROLL 1538
-#define LB_ADDFILE 406
-#define LB_ADDSTRING 384
-#define LB_DELETESTRING 386
-#define LB_DIR 397
-#define LB_FINDSTRING 399
-#define LB_FINDSTRINGEXACT 418
-#define LB_GETANCHORINDEX 413
-#define LB_GETCARETINDEX 415
-#define LB_GETCOUNT 395
-#define LB_GETCURSEL 392
-#define LB_GETHORIZONTALEXTENT 403
-#define LB_GETITEMDATA 409
-#define LB_GETITEMHEIGHT 417
-#define LB_GETITEMRECT 408
-#define LB_GETLOCALE 422
-#define LB_GETSEL 391
-#define LB_GETSELCOUNT 400
-#define LB_GETSELITEMS 401
-#define LB_GETTEXT 393
-#define LB_GETTEXTLEN 394
-#define LB_GETTOPINDEX 398
-#define LB_INITSTORAGE 424
-#define LB_INSERTSTRING 385
-#define LB_ITEMFROMPOINT 425
-#define LB_RESETCONTENT 388
-#define LB_SELECTSTRING 396
-#define LB_SELITEMRANGE 411
-#define LB_SELITEMRANGEEX 387
-#define LB_SETANCHORINDEX 412
-#define LB_SETCARETINDEX 414
-#define LB_SETCOLUMNWIDTH 405
-#define LB_SETCOUNT 423
-#define LB_SETCURSEL 390
-#define LB_SETHORIZONTALEXTENT 404
-#define LB_SETITEMDATA 410
-#define LB_SETITEMHEIGHT 416
-#define LB_SETLOCALE 421
-#define LB_SETSEL 389
-#define LB_SETTABSTOPS 402
-#define LB_SETTOPINDEX 407
-#define LBN_DBLCLK 2
-#define LBN_ERRSPACE (-2)
-#define LBN_KILLFOCUS 5
-#define LBN_SELCANCEL 3
-#define LBN_SELCHANGE 1
-#define LBN_SETFOCUS 4
-#define SBM_ENABLE_ARROWS 228
-#define SBM_GETPOS 225
-#define SBM_GETRANGE 227
-#define SBM_GETSCROLLINFO 234
-#define SBM_SETPOS 224
-#define SBM_SETRANGE 226
-#define SBM_SETRANGEREDRAW 230
-#define SBM_SETSCROLLINFO 233
-#define STM_GETICON 369
-#define STM_GETIMAGE 371
-#define STM_SETICON 368
-#define STM_SETIMAGE 370
-#define STN_CLICKED 0
-#define STN_DBLCLK 1
-#define STN_DISABLE 3
-#define STN_ENABLE 2
-#define DM_GETDEFID WM_USER
-#define DM_SETDEFID (WM_USER+1)
-#define DM_REPOSITION (WM_USER+2)
-#define PSM_PAGEINFO (WM_USER+100)
-#define PSM_SHEETINFO (WM_USER+101)
-#define PSI_SETACTIVE 1
-#define PSI_KILLACTIVE 2
-#define PSI_APPLY 3
-#define PSI_RESET 4
-#define PSI_HASHELP 5
-#define PSI_HELP 6
-#define PSI_CHANGED 1
-#define PSI_GUISTART 2
-#define PSI_REBOOT 3
-#define PSI_GETSIBLINGS 4
-#define DCX_WINDOW 1
-#define DCX_CACHE 2
-#define DCX_PARENTCLIP 32
-#define DCX_CLIPSIBLINGS 16
-#define DCX_CLIPCHILDREN 8
-#define DCX_NORESETATTRS 4
-#define DCX_LOCKWINDOWUPDATE 0x400
-#define DCX_EXCLUDERGN 64
-#define DCX_INTERSECTRGN 128
-#define DCX_VALIDATE 0x200000
-#define GMDI_GOINTOPOPUPS 2
-#define GMDI_USEDISABLED 1
-#define FKF_AVAILABLE 2
-#define FKF_CLICKON 64
-#define FKF_FILTERKEYSON 1
-#define FKF_HOTKEYACTIVE 4
-#define FKF_HOTKEYSOUND 16
-#define FKF_CONFIRMHOTKEY 8
-#define FKF_INDICATOR 32
-#define HCF_HIGHCONTRASTON 1
-#define HCF_AVAILABLE 2
-#define HCF_HOTKEYACTIVE 4
-#define HCF_CONFIRMHOTKEY 8
-#define HCF_HOTKEYSOUND 16
-#define HCF_INDICATOR 32
-#define HCF_HOTKEYAVAILABLE 64
-#define MKF_AVAILABLE 2
-#define MKF_CONFIRMHOTKEY 8
-#define MKF_HOTKEYACTIVE 4
-#define MKF_HOTKEYSOUND 16
-#define MKF_INDICATOR 32
-#define MKF_MOUSEKEYSON 1
-#define MKF_MODIFIERS 64
-#define MKF_REPLACENUMBERS 128
-#define SERKF_ACTIVE 8 /* May be obsolete. Not in recent MS docs. */
-#define SERKF_AVAILABLE 2
-#define SERKF_INDICATOR 4
-#define SERKF_SERIALKEYSON 1
-#define SSF_AVAILABLE 2
-#define SSF_SOUNDSENTRYON 1
-#define SSTF_BORDER 2
-#define SSTF_CHARS 1
-#define SSTF_DISPLAY 3
-#define SSTF_NONE 0
-#define SSGF_DISPLAY 3
-#define SSGF_NONE 0
-#define SSWF_CUSTOM 4
-#define SSWF_DISPLAY 3
-#define SSWF_NONE 0
-#define SSWF_TITLE 1
-#define SSWF_WINDOW 2
-#define SKF_AUDIBLEFEEDBACK 64
-#define SKF_AVAILABLE 2
-#define SKF_CONFIRMHOTKEY 8
-#define SKF_HOTKEYACTIVE 4
-#define SKF_HOTKEYSOUND 16
-#define SKF_INDICATOR 32
-#define SKF_STICKYKEYSON 1
-#define SKF_TRISTATE 128
-#define SKF_TWOKEYSOFF 256
-#define TKF_AVAILABLE 2
-#define TKF_CONFIRMHOTKEY 8
-#define TKF_HOTKEYACTIVE 4
-#define TKF_HOTKEYSOUND 16
-#define TKF_TOGGLEKEYSON 1
-#define MDITILE_SKIPDISABLED 2
-#define MDITILE_HORIZONTAL 1
-#define MDITILE_VERTICAL 0
-#define VK_LBUTTON	1
-#define VK_RBUTTON	2
-#define VK_CANCEL	3
-#define VK_MBUTTON	4
-#if (_WIN32_WINNT >= 0x0500)
-#define VK_XBUTTON1	5
-#define VK_XBUTTON2	6
-#endif
-#define VK_BACK	8
-#define VK_TAB	9
-#define VK_CLEAR	12
-#define VK_RETURN	13
-#define VK_SHIFT	16
-#define VK_CONTROL	17
-#define VK_MENU	18
-#define VK_PAUSE	19
-#define VK_CAPITAL	20
-#define VK_KANA	0x15
-#define VK_HANGEUL	0x15
-#define VK_HANGUL	0x15
-#define VK_JUNJA	0x17
-#define VK_FINAL	0x18
-#define VK_HANJA	0x19
-#define VK_KANJI	0x19
-#define VK_ESCAPE	0x1B
-#define VK_CONVERT	0x1C
-#define VK_NONCONVERT	0x1D
-#define VK_ACCEPT	0x1E
-#define VK_MODECHANGE	0x1F
-#define VK_SPACE	32
-#define VK_PRIOR	33
-#define VK_NEXT	34
-#define VK_END	35
-#define VK_HOME	36
-#define VK_LEFT	37
-#define VK_UP	38
-#define VK_RIGHT	39
-#define VK_DOWN	40
-#define VK_SELECT	41
-#define VK_PRINT	42
-#define VK_EXECUTE	43
-#define VK_SNAPSHOT	44
-#define VK_INSERT	45
-#define VK_DELETE	46
-#define VK_HELP	47
-#define VK_LWIN	0x5B
-#define VK_RWIN	0x5C
-#define VK_APPS	0x5D
-#define VK_SLEEP	0x5F
-#define VK_NUMPAD0	0x60
-#define VK_NUMPAD1	0x61
-#define VK_NUMPAD2	0x62
-#define VK_NUMPAD3	0x63
-#define VK_NUMPAD4	0x64
-#define VK_NUMPAD5	0x65
-#define VK_NUMPAD6	0x66
-#define VK_NUMPAD7	0x67
-#define VK_NUMPAD8	0x68
-#define VK_NUMPAD9	0x69
-#define VK_MULTIPLY	0x6A
-#define VK_ADD	0x6B
-#define VK_SEPARATOR	0x6C
-#define VK_SUBTRACT	0x6D
-#define VK_DECIMAL	0x6E
-#define VK_DIVIDE	0x6F
-#define VK_F1	0x70
-#define VK_F2	0x71
-#define VK_F3	0x72
-#define VK_F4	0x73
-#define VK_F5	0x74
-#define VK_F6	0x75
-#define VK_F7	0x76
-#define VK_F8	0x77
-#define VK_F9	0x78
-#define VK_F10	0x79
-#define VK_F11	0x7A
-#define VK_F12	0x7B
-#define VK_F13	0x7C
-#define VK_F14	0x7D
-#define VK_F15	0x7E
-#define VK_F16	0x7F
-#define VK_F17	0x80
-#define VK_F18	0x81
-#define VK_F19	0x82
-#define VK_F20	0x83
-#define VK_F21	0x84
-#define VK_F22	0x85
-#define VK_F23	0x86
-#define VK_F24	0x87
-#define VK_NUMLOCK	0x90
-#define VK_SCROLL	0x91
-#define VK_LSHIFT	0xA0
-#define VK_RSHIFT	0xA1
-#define VK_LCONTROL	0xA2
-#define VK_RCONTROL	0xA3
-#define VK_LMENU	0xA4
-#define VK_RMENU	0xA5
-#if (_WIN32_WINNT >= 0x0500)
-#define VK_BROWSER_BACK	0xA6
-#define VK_BROWSER_FORWARD	0xA7
-#define VK_BROWSER_REFRESH	0xA8
-#define VK_BROWSER_STOP	0xA9
-#define VK_BROWSER_SEARCH	0xAA
-#define VK_BROWSER_FAVORITES	0xAB
-#define VK_BROWSER_HOME	0xAC
-#define VK_VOLUME_MUTE	0xAD
-#define VK_VOLUME_DOWN	0xAE
-#define VK_VOLUME_UP	0xAF
-#define VK_MEDIA_NEXT_TRACK	0xB0
-#define VK_MEDIA_PREV_TRACK	0xB1
-#define VK_MEDIA_STOP	0xB2
-#define VK_MEDIA_PLAY_PAUSE	0xB3
-#define VK_LAUNCH_MAIL	0xB4
-#define VK_LAUNCH_MEDIA_SELECT	0xB5
-#define VK_LAUNCH_APP1	0xB6
-#define VK_LAUNCH_APP2	0xB7
-#endif
-#define VK_OEM_1	0xBA
-#if (_WIN32_WINNT >= 0x0500)
-#define VK_OEM_PLUS	0xBB
-#define VK_OEM_COMMA	0xBC
-#define VK_OEM_MINUS	0xBD
-#define VK_OEM_PERIOD	0xBE
-#endif
-#define VK_OEM_2	0xBF
-#define VK_OEM_3	0xC0
-#define VK_OEM_4	0xDB
-#define VK_OEM_5	0xDC
-#define VK_OEM_6	0xDD
-#define VK_OEM_7	0xDE
-#define VK_OEM_8	0xDF
-#if (_WIN32_WINNT >= 0x0500)
-#define VK_OEM_102	0xE2
-#endif
-#define VK_PROCESSKEY	0xE5
-#if (_WIN32_WINNT >= 0x0500)
-#define VK_PACKET	0xE7
-#endif
-#define VK_ATTN	0xF6
-#define VK_CRSEL	0xF7
-#define VK_EXSEL	0xF8
-#define VK_EREOF	0xF9
-#define VK_PLAY	0xFA
-#define VK_ZOOM	0xFB
-#define VK_NONAME	0xFC
-#define VK_PA1	0xFD
-#define VK_OEM_CLEAR	0xFE
-#define TME_HOVER	1
-#define TME_LEAVE	2
-#define TME_QUERY	0x40000000
-#define TME_CANCEL	0x80000000
-#define HOVER_DEFAULT	0xFFFFFFFF
-#define MK_LBUTTON	1
-#define MK_RBUTTON	2
-#define MK_SHIFT	4
-#define MK_CONTROL	8
-#define MK_MBUTTON	16
-#define TPM_CENTERALIGN 4
-#define TPM_LEFTALIGN 0
-#define TPM_RIGHTALIGN 8
-#define TPM_LEFTBUTTON 0
-#define TPM_RIGHTBUTTON 2
-#define TPM_HORIZONTAL 0
-#define TPM_VERTICAL 64
-#define TPM_TOPALIGN 0
-#define TPM_VCENTERALIGN 16
-#define TPM_BOTTOMALIGN 32
-#define TPM_NONOTIFY 128
-#define TPM_RETURNCMD 256
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-#define TPM_RECURSE 1
-#endif
-#define HELP_COMMAND 0x102
-#define HELP_CONTENTS 3
-#define HELP_CONTEXT 1
-#define HELP_CONTEXTPOPUP 8
-#define HELP_FORCEFILE 9
-#define HELP_HELPONHELP 4
-#define HELP_INDEX 3
-#define HELP_KEY 0x101
-#define HELP_MULTIKEY 0x201
-#define HELP_PARTIALKEY 0x105
-#define HELP_QUIT 2
-#define HELP_SETCONTENTS 5
-#define HELP_SETINDEX 5
-#define HELP_CONTEXTMENU 0xa
-#define HELP_FINDER 0xb
-#define HELP_WM_HELP 0xc
-#define HELP_TCARD 0x8000
-#define HELP_TCARD_DATA 16
-#define HELP_TCARD_OTHER_CALLER 0x11
-#define IDH_NO_HELP	28440
-#define IDH_MISSING_CONTEXT	28441
-#define IDH_GENERIC_HELP_BUTTON	28442
-#define IDH_OK	28443
-#define IDH_CANCEL	28444
-#define IDH_HELP	28445
-#define LB_CTLCODE 0
-#define LB_OKAY 0
-#define LB_ERR (-1)
-#define LB_ERRSPACE (-2)
-#define CB_OKAY 0
-#define CB_ERR (-1)
-#define CB_ERRSPACE (-2)
-#define HIDE_WINDOW 0
-#define SHOW_OPENWINDOW 1
-#define SHOW_ICONWINDOW 2
-#define SHOW_FULLSCREEN 3
-#define SHOW_OPENNOACTIVATE 4
-#define SW_PARENTCLOSING 1
-#define SW_OTHERZOOM 2
-#define SW_PARENTOPENING 3
-#define SW_OTHERUNZOOM 4
-#define KF_EXTENDED 256
-#define KF_DLGMODE 2048
-#define KF_MENUMODE 4096
-#define KF_ALTDOWN 8192
-#define KF_REPEAT 16384
-#define KF_UP 32768
-#define WSF_VISIBLE 1
-#define PWR_OK 1
-#define PWR_FAIL (-1)
-#define PWR_SUSPENDREQUEST 1
-#define PWR_SUSPENDRESUME 2
-#define PWR_CRITICALRESUME 3
-#define NFR_ANSI 1
-#define NFR_UNICODE 2
-#define NF_QUERY 3
-#define NF_REQUERY 4
-#define MENULOOP_WINDOW 0
-#define MENULOOP_POPUP 1
-#define WMSZ_LEFT 1
-#define WMSZ_RIGHT 2
-#define WMSZ_TOP 3
-#define WMSZ_TOPLEFT 4
-#define WMSZ_TOPRIGHT 5
-#define WMSZ_BOTTOM 6
-#define WMSZ_BOTTOMLEFT 7
-#define WMSZ_BOTTOMRIGHT 8
-#define HTERROR (-2)
-#define HTTRANSPARENT (-1)
-#define HTNOWHERE 0
-#define HTCLIENT 1
-#define HTCAPTION 2
-#define HTSYSMENU 3
-#define HTGROWBOX 4
-#define HTSIZE 4
-#define HTMENU 5
-#define HTHSCROLL 6
-#define HTVSCROLL 7
-#define HTMINBUTTON 8
-#define HTMAXBUTTON 9
-#define HTREDUCE 8
-#define HTZOOM 9
-#define HTLEFT 10
-#define HTSIZEFIRST 10
-#define HTRIGHT 11
-#define HTTOP 12
-#define HTTOPLEFT 13
-#define HTTOPRIGHT 14
-#define HTBOTTOM 15
-#define HTBOTTOMLEFT 16
-#define HTBOTTOMRIGHT 17
-#define HTSIZELAST 17
-#define HTBORDER 18
-#define HTOBJECT 19
-#define HTCLOSE 20
-#define HTHELP 21
-#define MA_ACTIVATE 1
-#define MA_ACTIVATEANDEAT 2
-#define MA_NOACTIVATE 3
-#define MA_NOACTIVATEANDEAT 4
-#define SIZE_RESTORED 0
-#define SIZE_MINIMIZED 1
-#define SIZE_MAXIMIZED 2
-#define SIZE_MAXSHOW 3
-#define SIZE_MAXHIDE 4
-#define SIZENORMAL 0
-#define SIZEICONIC 1
-#define SIZEFULLSCREEN 2
-#define SIZEZOOMSHOW 3
-#define SIZEZOOMHIDE 4
-#define WVR_ALIGNTOP 16
-#define WVR_ALIGNLEFT 32
-#define WVR_ALIGNBOTTOM 64
-#define WVR_ALIGNRIGHT 128
-#define WVR_HREDRAW 256
-#define WVR_VREDRAW 512
-#define WVR_REDRAW (WVR_HREDRAW|WVR_VREDRAW)
-#define WVR_VALIDRECTS 1024
-#define PRF_CHECKVISIBLE 1
-#define PRF_NONCLIENT 2
-#define PRF_CLIENT 4
-#define PRF_ERASEBKGND 8
-#define PRF_CHILDREN 16
-#define PRF_OWNED 32
-#define IDANI_OPEN 1
-#define IDANI_CLOSE 2
-#define IDANI_CAPTION 3
-#define WPF_RESTORETOMAXIMIZED 2
-#define WPF_SETMINPOSITION 1
-#define ODT_MENU 1
-#define ODT_LISTBOX 2
-#define ODT_COMBOBOX 3
-#define ODT_BUTTON 4
-#define ODT_STATIC 5
-#define ODA_DRAWENTIRE 1
-#define ODA_SELECT 2
-#define ODA_FOCUS 4
-#define ODS_SELECTED 1
-#define ODS_GRAYED 2
-#define ODS_DISABLED 4
-#define ODS_CHECKED 8
-#define ODS_FOCUS 16
-#define ODS_DEFAULT 32
-#define ODS_COMBOBOXEDIT 4096
-#define IDHOT_SNAPWINDOW (-1)
-#define IDHOT_SNAPDESKTOP (-2)
-#define DBWF_LPARAMPOINTER 0x8000
-#define DLGWINDOWEXTRA 30
-#define MNC_IGNORE 0
-#define MNC_CLOSE 1
-#define MNC_EXECUTE 2
-#define MNC_SELECT 3
-#define DOF_EXECUTABLE 0x8001
-#define DOF_DOCUMENT 0x8002
-#define DOF_DIRECTORY 0x8003
-#define DOF_MULTIPLE 0x8004
-#define DOF_PROGMAN 1
-#define DOF_SHELLDATA 2
-#define DO_DROPFILE 0x454C4946
-#define DO_PRINTFILE 0x544E5250
-#define SW_SCROLLCHILDREN 1
-#define SW_INVALIDATE 2
-#define SW_ERASE 4
-#define SC_SIZE 0xF000
-#define SC_MOVE 0xF010
-#define SC_MINIMIZE 0xF020
-#define SC_ICON 0xf020
-#define SC_MAXIMIZE 0xF030
-#define SC_ZOOM 0xF030
-#define SC_NEXTWINDOW 0xF040
-#define SC_PREVWINDOW 0xF050
-#define SC_CLOSE 0xF060
-#define SC_VSCROLL 0xF070
-#define SC_HSCROLL 0xF080
-#define SC_MOUSEMENU 0xF090
-#define SC_KEYMENU 0xF100
-#define SC_ARRANGE 0xF110
-#define SC_RESTORE 0xF120
-#define SC_TASKLIST 0xF130
-#define SC_SCREENSAVE 0xF140
-#define SC_HOTKEY 0xF150
-#define SC_DEFAULT 0xF160
-#define SC_MONITORPOWER 0xF170
-#define SC_CONTEXTHELP 0xF180
-#define SC_SEPARATOR 0xF00F
-#define EC_LEFTMARGIN 1
-#define EC_RIGHTMARGIN 2
-#define EC_USEFONTINFO 0xffff
-#define DC_HASDEFID 0x534B
-#define DLGC_WANTARROWS 1
-#define DLGC_WANTTAB 2
-#define DLGC_WANTALLKEYS 4
-#define DLGC_WANTMESSAGE 4
-#define DLGC_HASSETSEL 8
-#define DLGC_DEFPUSHBUTTON 16
-#define DLGC_UNDEFPUSHBUTTON 32
-#define DLGC_RADIOBUTTON 64
-#define DLGC_WANTCHARS 128
-#define DLGC_STATIC 256
-#define DLGC_BUTTON 0x2000
-#define LB_CTLCODE 0
-#define WA_INACTIVE 0
-#define WA_ACTIVE 1
-#define WA_CLICKACTIVE 2
-#define ICON_SMALL 0
-#define ICON_BIG 1
-#if (_WIN32_WINNT >= 0x0501)
-#define ICON_SMALL2 2
-#endif
-#define HBMMENU_CALLBACK ((HBITMAP) -1)
-#define HBMMENU_SYSTEM ((HBITMAP)1)
-#define HBMMENU_MBAR_RESTORE ((HBITMAP)2)
-#define HBMMENU_MBAR_MINIMIZE ((HBITMAP)3)
-#define HBMMENU_MBAR_CLOSE ((HBITMAP)5)
-#define HBMMENU_MBAR_CLOSE_D ((HBITMAP)6)
-#define HBMMENU_MBAR_MINIMIZE_D ((HBITMAP)7)
-#define HBMMENU_POPUP_CLOSE ((HBITMAP)8)
-#define HBMMENU_POPUP_RESTORE ((HBITMAP)9)
-#define HBMMENU_POPUP_MAXIMIZE ((HBITMAP)10)
-#define HBMMENU_POPUP_MINIMIZE ((HBITMAP)11)
-#define MOD_ALT 1
-#define MOD_CONTROL 2
-#define MOD_SHIFT 4
-#define MOD_WIN 8
-#define MOD_IGNORE_ALL_MODIFIER 1024
-#define MOD_ON_KEYUP  2048
-#define MOD_RIGHT 16384
-#define MOD_LEFT 32768
-#define LLKHF_ALTDOWN  0x00000020
-#if (WINVER >= 0x0500)
-#define FLASHW_STOP 0
-#define FLASHW_CAPTION 1
-#define FLASHW_TRAY 2
-#define FLASHW_ALL (FLASHW_CAPTION|FLASHW_TRAY)
-#define FLASHW_TIMER 4
-#define FLASHW_TIMERNOFG 12
-#endif /* (WINVER >= 0x0500) */
-#define CURSOR_SHOWING 0x00000001
-#define WS_ACTIVECAPTION 0x00000001
-#if (_WIN32_WINNT >= 0x0403)
-#define INPUT_MOUSE 0x00000000
-#define INPUT_KEYBOARD 0x00000001
-#define INPUT_HARDWARE 0x00000002
-#endif /* (_WIN32_WINNT >= 0x0403) */
-#if (WINVER >= 0x0400)
-#define ENDSESSION_LOGOFF 0x80000000
-#endif
-#if (WINVER >= 0x0500)
-#define CHILDID_SELF 0
-#define OBJID_WINDOW 0x00000000
-#define OBJID_SYSMENU 0xFFFFFFFF
-#define OBJID_TITLEBAR 0xFFFFFFFE
-#define OBJID_MENU 0xFFFFFFFD
-#define OBJID_CLIENT 0xFFFFFFFC
-#define OBJID_VSCROLL 0xFFFFFFFB
-#define OBJID_HSCROLL 0xFFFFFFFA
-#define OBJID_SIZEGRIP 0xFFFFFFF9
-#define OBJID_CARET 0xFFFFFFF8
-#define OBJID_CURSOR 0xFFFFFFF7
-#define OBJID_ALERT 0xFFFFFFF6
-#define OBJID_SOUND 0xFFFFFFF5
-#define GUI_CARETBLINKING 0x00000001
-#define GUI_INMOVESIZE 0x00000002
-#define GUI_INMENUMODE 0x00000004
-#define GUI_SYSTEMMENUMODE 0x00000008
-#define GUI_POPUPMENUMODE 0x00000010
-#if (_WIN32_WINNT >= 0x0501)
-#define GUI_16BITTASK 0x00000020
-#endif
-#define WINEVENT_OUTOFCONTEXT   0x0000
-#define WINEVENT_SKIPOWNTHREAD  0x0001
-#define WINEVENT_SKIPOWNPROCESS 0x0002
-#define WINEVENT_INCONTEXT      0x0004
-#define AW_HOR_POSITIVE 0x00000001
-#define AW_HOR_NEGATIVE 0x00000002
-#define AW_VER_POSITIVE 0x00000004
-#define AW_VER_NEGATIVE 0x00000008
-#define AW_CENTER 0x00000010
-#define AW_HIDE 0x00010000
-#define AW_ACTIVATE 0x00020000
-#define AW_SLIDE 0x00040000
-#define AW_BLEND 0x00080000
-#define DEVICE_NOTIFY_WINDOW_HANDLE 0x00000000
-#define DEVICE_NOTIFY_SERVICE_HANDLE 0x00000001
-#if (_WIN32_WINNT >= 0x0501)
-#define DEVICE_NOTIFY_ALL_INTERFACE_CLASSES 0x00000004
-#endif
-#define EVENT_MIN                       0x00000001
-#define EVENT_SYSTEM_SOUND              0x00000001
-#define EVENT_SYSTEM_ALERT              0x00000002
-#define EVENT_SYSTEM_FOREGROUND         0x00000003
-#define EVENT_SYSTEM_MENUSTART          0x00000004
-#define EVENT_SYSTEM_MENUEND            0x00000005
-#define EVENT_SYSTEM_MENUPOPUPSTART     0x00000006
-#define EVENT_SYSTEM_MENUPOPUPEND       0x00000007
-#define EVENT_SYSTEM_CAPTURESTART       0x00000008
-#define EVENT_SYSTEM_CAPTUREEND         0x00000009
-#define EVENT_SYSTEM_MOVESIZESTART      0x0000000a
-#define EVENT_SYSTEM_MOVESIZEEND        0x0000000b
-#define EVENT_SYSTEM_CONTEXTHELPSTART   0x0000000c
-#define EVENT_SYSTEM_CONTEXTHELPEND     0x0000000d
-#define EVENT_SYSTEM_DRAGDROPSTART      0x0000000e
-#define EVENT_SYSTEM_DRAGDROPEND        0x0000000f
-#define EVENT_SYSTEM_DIALOGSTART        0x00000010
-#define EVENT_SYSTEM_DIALOGEND          0x00000011
-#define EVENT_SYSTEM_SCROLLINGSTART     0x00000012
-#define EVENT_SYSTEM_SCROLLINGEND       0x00000013
-#define EVENT_SYSTEM_SWITCHSTART        0x00000014
-#define EVENT_SYSTEM_SWITCHEND          0x00000015
-#define EVENT_SYSTEM_MINIMIZESTART      0x00000016
-#define EVENT_SYSTEM_MINIMIZEEND        0x00000017
-#define EVENT_OBJECT_CREATE             0x00008000
-#define EVENT_OBJECT_DESTROY            0x00008001
-#define EVENT_OBJECT_SHOW               0x00008002
-#define EVENT_OBJECT_HIDE               0x00008003
-#define EVENT_OBJECT_REORDER            0x00008004
-#define EVENT_OBJECT_FOCUS              0x00008005
-#define EVENT_OBJECT_SELECTION          0x00008006
-#define EVENT_OBJECT_SELECTIONADD       0x00008007
-#define EVENT_OBJECT_SELECTIONREMOVE    0x00008008
-#define EVENT_OBJECT_SELECTIONWITHIN    0x00008009
-#define EVENT_OBJECT_STATECHANGE        0x0000800a
-#define EVENT_OBJECT_LOCATIONCHANGE     0x0000800b
-#define EVENT_OBJECT_NAMECHANGE         0x0000800c
-#define EVENT_OBJECT_DESCRIPTIONCHANGE  0x0000800d
-#define EVENT_OBJECT_VALUECHANGE        0x0000800e
-#define EVENT_OBJECT_PARENTCHANGE       0x0000800f
-#define EVENT_OBJECT_HELPCHANGE         0x00008010
-#define EVENT_OBJECT_DEFACTIONCHANGE    0x00008011
-#define EVENT_OBJECT_ACCELERATORCHANGE  0x00008012
-#if (_WIN32_WINNT >= 0x0501)
-#define EVENT_CONSOLE_CARET             0x00004001
-#define CONSOLE_CARET_SELECTION         0x00000001
-#define CONSOLE_CARET_VISIBLE           0x00000002
-#define EVENT_CONSOLE_UPDATE_REGION     0x00004002
-#define EVENT_CONSOLE_UPDATE_SIMPLE     0x00004003
-#define EVENT_CONSOLE_UPDATE_SCROLL     0x00004004
-#define EVENT_CONSOLE_LAYOUT            0x00004005
-#define EVENT_CONSOLE_START_APPLICATION 0x00004006
-#define CONSOLE_APPLICATION_16BIT       0x00000001
-#define EVENT_CONSOLE_END_APPLICATION   0x00004007
-#endif /* (_WIN32_WINNT >= 0x0501) */
-#define EVENT_MAX                       0x7fffffff
-#endif /* (WINVER >= 0x0500) */
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490)
-#define ASFW_ANY ((DWORD)-1)
-#define LSFW_LOCK 1
-#define LSFW_UNLOCK 2
-#endif
-#if (_WIN32_WINNT >= 0x0500)
-#define LWA_COLORKEY 1
-#define LWA_ALPHA 2
-#endif
-#define GA_PARENT 1
-#define GA_ROOT 2
-#define GA_ROOTOWNER 3
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-#define MONITOR_DEFAULTTONULL 0 
-#define MONITOR_DEFAULTTOPRIMARY 1 
-#define MONITOR_DEFAULTTONEAREST 2 
-#define MONITORINFOF_PRIMARY 1 
-#define EDS_RAWMODE 0x00000002
-#define ISMEX_NOSEND 0x00000000
-#define ISMEX_CALLBACK 0x00000004
-#define ISMEX_NOTIFY 0x00000002
-#define ISMEX_REPLIED 0x00000008
-#define ISMEX_SEND 0x00000001
-#endif
-#if (_WIN32_WINNT >= 0x0500)
-#define GR_GDIOBJECTS 0
-#define GR_USEROBJECTS 1
-#endif
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490)
-#define GMMP_USE_DISPLAY_POINTS 1
-#define GMMP_USE_HIGH_RESOLUTION_POINTS 2
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-#define PW_CLIENTONLY 0x00000001
-#define RIM_INPUT     0x00000000
-#define RIM_INPUTSINK 0x00000001
-#define RIM_TYPEMOUSE    0x00000000
-#define RIM_TYPEKEYBOARD 0x00000001
-#define RIM_TYPEHID      0x00000002
-#define MOUSE_MOVE_RELATIVE      0x00000000
-#define MOUSE_MOVE_ABSOLUTE      0x00000001
-#define MOUSE_VIRTUAL_DESKTOP    0x00000002
-#define MOUSE_ATTRIBUTES_CHANGED 0x00000004
-#define RI_MOUSE_LEFT_BUTTON_DOWN   0x0001
-#define RI_MOUSE_LEFT_BUTTON_UP     0x0002
-#define RI_MOUSE_RIGHT_BUTTON_DOWN  0x0004
-#define RI_MOUSE_RIGHT_BUTTON_UP    0x0008
-#define RI_MOUSE_MIDDLE_BUTTON_DOWN 0x0010
-#define RI_MOUSE_MIDDLE_BUTTON_UP   0x0020
-#define RI_MOUSE_BUTTON_1_DOWN      RI_MOUSE_LEFT_BUTTON_DOWN
-#define RI_MOUSE_BUTTON_1_UP        RI_MOUSE_LEFT_BUTTON_UP
-#define RI_MOUSE_BUTTON_2_DOWN      RI_MOUSE_RIGHT_BUTTON_DOWN
-#define RI_MOUSE_BUTTON_2_UP        RI_MOUSE_RIGHT_BUTTON_UP
-#define RI_MOUSE_BUTTON_3_DOWN      RI_MOUSE_MIDDLE_BUTTON_DOWN
-#define RI_MOUSE_BUTTON_3_UP        RI_MOUSE_MIDDLE_BUTTON_UP
-#define RI_MOUSE_BUTTON_4_DOWN      0x0040
-#define RI_MOUSE_BUTTON_4_UP        0x0080
-#define RI_MOUSE_BUTTON_5_DOWN      0x0100
-#define RI_MOUSE_BUTTON_5_UP        0x0200
-#define RI_MOUSE_WHEEL              0x0400
-#define KEYBOARD_OVERRUN_MAKE_CODE 0x00ff
-#define RI_KEY_MAKE            0x0000
-#define RI_KEY_BREAK           0x0001
-#define RI_KEY_E0              0x0002
-#define RI_KEY_E1              0x0004
-#define RI_KEY_TERMSRV_SET_LED 0x0008
-#define RI_KEY_TERMSRV_SHADOW  0x0010
-#define RID_INPUT  0x10000003
-#define RID_HEADER 0x10000005
-#define RIDI_PREPARSEDDATA 0x20000005
-#define RIDI_DEVICENAME    0x20000007
-#define RIDI_DEVICEINFO    0x2000000b
-#define RIDEV_REMOVE       0x00000001
-#define RIDEV_EXCLUDE      0x00000010
-#define RIDEV_PAGEONLY     0x00000020
-#define RIDEV_NOLEGACY     0x00000030
-#define RIDEV_INPUTSINK    0x00000100
-#define RIDEV_CAPTUREMOUSE 0x00000200
-#define RIDEV_NOHOTKEYS    0x00000200
-#define RIDEV_APPKEYS      0x00000400
-#endif
-
-#ifndef RC_INVOKED
-typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
-typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD);
-typedef BOOL(CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,int);
-typedef LRESULT(CALLBACK *HOOKPROC)(int,WPARAM,LPARAM);
-typedef BOOL(CALLBACK *PROPENUMPROCA)(HWND,LPCSTR,HANDLE);
-typedef BOOL(CALLBACK *PROPENUMPROCW)(HWND,LPCWSTR,HANDLE);
-typedef BOOL(CALLBACK *PROPENUMPROCEXA)(HWND,LPSTR,HANDLE,DWORD);
-typedef BOOL(CALLBACK *PROPENUMPROCEXW)(HWND,LPWSTR,HANDLE,DWORD);
-typedef int(CALLBACK *EDITWORDBREAKPROCA)(LPSTR,int,int,int);
-typedef int(CALLBACK *EDITWORDBREAKPROCW)(LPWSTR,int,int,int);
-typedef LRESULT(CALLBACK *WNDPROC)(HWND,UINT,WPARAM,LPARAM);
-typedef BOOL(CALLBACK *DRAWSTATEPROC)(HDC,LPARAM,WPARAM,int,int);
-typedef BOOL(CALLBACK *WNDENUMPROC)(HWND,LPARAM);
-typedef BOOL(CALLBACK *ENUMWINDOWSPROC)(HWND,LPARAM);
-typedef BOOL(CALLBACK* MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM);
-typedef BOOL(CALLBACK *NAMEENUMPROCA)(LPSTR,LPARAM);
-typedef BOOL(CALLBACK *NAMEENUMPROCW)(LPWSTR,LPARAM);
-typedef NAMEENUMPROCA DESKTOPENUMPROCA;
-typedef NAMEENUMPROCW DESKTOPENUMPROCW;
-typedef NAMEENUMPROCA WINSTAENUMPROCA;
-typedef NAMEENUMPROCW WINSTAENUMPROCW;
-typedef void(CALLBACK *SENDASYNCPROC)(HWND,UINT,DWORD,LRESULT);
-DECLARE_HANDLE(HHOOK);
-DECLARE_HANDLE(HDWP);
-DECLARE_HANDLE(HDEVNOTIFY);
-typedef struct tagACCEL {
-	BYTE fVirt;
-	WORD key;
-	WORD cmd;
-} ACCEL,*LPACCEL;
-typedef struct tagACCESSTIMEOUT {
-	UINT cbSize;
-	DWORD dwFlags;
-	DWORD iTimeOutMSec;
-} ACCESSTIMEOUT, *LPACCESSTIMEOUT;
-typedef struct tagANIMATIONINFO {
-	UINT cbSize;
-	int iMinAnimate;
-} ANIMATIONINFO,*LPANIMATIONINFO;
-typedef struct tagCREATESTRUCTA {
-	LPVOID	lpCreateParams;
-	HINSTANCE	hInstance;
-	HMENU	hMenu;
-	HWND	hwndParent;
-	int	cy;
-	int	cx;
-	int	y;
-	int	x;
-	LONG	style;
-	LPCSTR	lpszName;
-	LPCSTR	lpszClass;
-	DWORD	dwExStyle;
-} CREATESTRUCTA,*LPCREATESTRUCTA;
-typedef struct tagCREATESTRUCTW {
-	LPVOID	lpCreateParams;
-	HINSTANCE	hInstance;
-	HMENU	hMenu;
-	HWND	hwndParent;
-	int	cy;
-	int	cx;
-	int	y;
-	int	x;
-	LONG	style;
-	LPCWSTR	lpszName;
-	LPCWSTR	lpszClass;
-	DWORD	dwExStyle;
-} CREATESTRUCTW,*LPCREATESTRUCTW;
-typedef struct tagCBT_CREATEWNDA {
-	LPCREATESTRUCTA lpcs;
-	HWND	hwndInsertAfter;
-} CBT_CREATEWNDA, *LPCBT_CREATEWNDA;
-typedef struct tagCBT_CREATEWNDW {
-	LPCREATESTRUCTW lpcs;
-	HWND	hwndInsertAfter;
-} CBT_CREATEWNDW, *LPCBT_CREATEWNDW;
-typedef struct tagCBTACTIVATESTRUCT {
-	BOOL fMouse;
-	HWND hWndActive;
-} CBTACTIVATESTRUCT,*LPCBTACTIVATESTRUCT;
-typedef struct tagCLIENTCREATESTRUCT {
-	HANDLE	hWindowMenu;
-	UINT	idFirstChild;
-} CLIENTCREATESTRUCT,*LPCLIENTCREATESTRUCT;
-typedef struct tagCOMPAREITEMSTRUCT {
-	UINT	CtlType;
-	UINT	CtlID;
-	HWND	hwndItem;
-	UINT	itemID1;
-	DWORD	itemData1;
-	UINT	itemID2;
-	DWORD	itemData2;
-	DWORD	dwLocaleId;
-} COMPAREITEMSTRUCT,*LPCOMPAREITEMSTRUCT;
-typedef struct tagCOPYDATASTRUCT {
-	DWORD dwData;
-	DWORD cbData;
-	PVOID lpData;
-} COPYDATASTRUCT,*PCOPYDATASTRUCT;
-typedef struct tagCURSORSHAPE {
-	int xHotSpot;
-	int yHotSpot;
-	int cx;
-	int cy;
-	int cbWidth;
-    BYTE Planes;
-    BYTE BitsPixel;
-} CURSORSHAPE,*LPCURSORSHAPE;
-typedef struct tagCWPRETSTRUCT {
-	LRESULT lResult;
-	LPARAM lParam;
-	WPARAM wParam;
-	DWORD message;
-	HWND hwnd;
-} CWPRETSTRUCT;
-typedef struct tagCWPSTRUCT {
-	LPARAM lParam;
-	WPARAM wParam;
-	UINT message;
-	HWND hwnd;
-} CWPSTRUCT,*PCWPSTRUCT;
-typedef struct tagDEBUGHOOKINFO {
-	DWORD idThread;
-	DWORD idThreadInstaller;
-	LPARAM lParam;
-	WPARAM wParam;
-	int code;
-} DEBUGHOOKINFO,*PDEBUGHOOKINFO,*LPDEBUGHOOKINFO;
-typedef struct tagDELETEITEMSTRUCT {
-	UINT CtlType;
-	UINT CtlID;
-	UINT itemID;
-	HWND hwndItem;
-	UINT itemData;
-} DELETEITEMSTRUCT,*PDELETEITEMSTRUCT,*LPDELETEITEMSTRUCT;
-#pragma pack(push,2)
-typedef struct {
-	DWORD style;
-	DWORD dwExtendedStyle;
-	short x;
-	short y;
-	short cx;
-	short cy;
-	WORD id;
-} DLGITEMTEMPLATE,*LPDLGITEMTEMPLATE;
-typedef struct {
-	DWORD style;
-	DWORD dwExtendedStyle;
-	WORD cdit;
-	short x;
-	short y;
-	short cx;
-	short cy;
-} DLGTEMPLATE,*LPDLGTEMPLATE,*LPDLGTEMPLATEA,*LPDLGTEMPLATEW;
-typedef const DLGTEMPLATE *LPCDLGTEMPLATE;
-#pragma pack(pop)
-typedef struct tagDRAWITEMSTRUCT {
-	UINT CtlType;
-	UINT CtlID;
-	UINT itemID;
-	UINT itemAction;
-	UINT itemState;
-	HWND hwndItem;
-	HDC	hDC;
-	RECT rcItem;
-	DWORD itemData;
-} DRAWITEMSTRUCT,*LPDRAWITEMSTRUCT,*PDRAWITEMSTRUCT;
-typedef struct {
-	UINT cbSize;
-	int iTabLength;
-	int iLeftMargin;
-	int iRightMargin;
-	UINT uiLengthDrawn;
-} DRAWTEXTPARAMS,*LPDRAWTEXTPARAMS;
-typedef struct tagPAINTSTRUCT {
-	HDC	hdc;
-	BOOL fErase;
-	RECT rcPaint;
-	BOOL fRestore;
-	BOOL fIncUpdate;
-	BYTE rgbReserved[32];
-} PAINTSTRUCT,*LPPAINTSTRUCT;
-typedef struct tagMSG {
-	HWND hwnd;
-	UINT message;
-	WPARAM wParam;
-	LPARAM lParam;
-	DWORD time;
-	POINT pt;
-} MSG,*LPMSG,*PMSG;
-typedef struct _ICONINFO {
-	BOOL fIcon;
-	DWORD xHotspot;
-	DWORD yHotspot;
-	HBITMAP hbmMask;
-	HBITMAP hbmColor;
-} ICONINFO,*PICONINFO;
-typedef struct tagNMHDR {
-	HWND hwndFrom;
-	UINT idFrom;
-	UINT code;
-} NMHDR,*LPNMHDR;
-typedef struct _WNDCLASSA {
-	UINT style;
-	WNDPROC lpfnWndProc;
-	int cbClsExtra;
-	int cbWndExtra;
-	HINSTANCE hInstance;
-	HICON hIcon;
-	HCURSOR hCursor;
-	HBRUSH hbrBackground;
-	LPCSTR lpszMenuName;
-	LPCSTR lpszClassName;
-} WNDCLASSA,*LPWNDCLASSA,*PWNDCLASSA;
-typedef struct _WNDCLASSW {
-	UINT style;
-	WNDPROC lpfnWndProc;
-	int cbClsExtra;
-	int cbWndExtra;
-	HINSTANCE hInstance;
-	HICON hIcon;
-	HCURSOR hCursor;
-	HBRUSH hbrBackground;
-	LPCWSTR lpszMenuName;
-	LPCWSTR lpszClassName;
-} WNDCLASSW,*LPWNDCLASSW,*PWNDCLASSW;
-typedef struct _WNDCLASSEXA {
-	UINT cbSize;
-	UINT style;
-	WNDPROC lpfnWndProc;
-	int cbClsExtra;
-	int cbWndExtra;
-	HINSTANCE hInstance;
-	HICON hIcon;
-	HCURSOR hCursor;
-	HBRUSH hbrBackground;
-	LPCSTR lpszMenuName;
-	LPCSTR lpszClassName;
-	HICON hIconSm;
-} WNDCLASSEXA,*LPWNDCLASSEXA,*PWNDCLASSEXA;
-typedef struct _WNDCLASSEXW {
-	UINT cbSize;
-	UINT style;
-	WNDPROC lpfnWndProc;
-	int cbClsExtra;
-	int cbWndExtra;
-	HINSTANCE hInstance;
-	HICON hIcon;
-	HCURSOR hCursor;
-	HBRUSH hbrBackground;
-	LPCWSTR lpszMenuName;
-	LPCWSTR lpszClassName;
-	HICON hIconSm;
-} WNDCLASSEXW,*LPWNDCLASSEXW,*PWNDCLASSEXW;
-typedef struct tagMENUITEMINFOA {
-	UINT cbSize;
-	UINT fMask;
-	UINT fType;
-	UINT fState;
-	UINT wID;
-	HMENU hSubMenu;
-	HBITMAP hbmpChecked;
-	HBITMAP hbmpUnchecked;
-	DWORD dwItemData;
-	LPSTR dwTypeData;
-	UINT cch;
-#if (_WIN32_WINNT >= 0x0500)
-	HBITMAP hbmpItem;
-#endif
-} MENUITEMINFOA,*LPMENUITEMINFOA;
-typedef const MENUITEMINFOA *LPCMENUITEMINFOA;
-typedef struct tagMENUITEMINFOW {
-	UINT cbSize;
-	UINT fMask;
-	UINT fType;
-	UINT fState;
-	UINT wID;
-	HMENU hSubMenu;
-	HBITMAP hbmpChecked;
-	HBITMAP hbmpUnchecked;
-	DWORD dwItemData;
-	LPWSTR dwTypeData;
-	UINT cch;
-#if (_WIN32_WINNT >= 0x0500)
-	HBITMAP hbmpItem;
-#endif
-} MENUITEMINFOW,*LPMENUITEMINFOW;
-typedef const MENUITEMINFOW *LPCMENUITEMINFOW;
-typedef struct tagSCROLLINFO {
-	UINT cbSize;
-	UINT fMask;
-	int nMin;
-	int nMax;
-	UINT nPage;
-	int nPos;
-	int nTrackPos;
-} SCROLLINFO,*LPSCROLLINFO;
-typedef const SCROLLINFO *LPCSCROLLINFO;
-typedef struct _WINDOWPLACEMENT {
-	UINT length;
-	UINT flags;
-	UINT showCmd;
-	POINT ptMinPosition;
-	POINT ptMaxPosition;
-	RECT rcNormalPosition;
-} WINDOWPLACEMENT,*LPWINDOWPLACEMENT,*PWINDOWPLACEMENT;
-typedef struct {
-	WORD versionNumber;
-	WORD offset;
-} MENUITEMTEMPLATEHEADER;
-typedef struct {
-	WORD mtOption;
-	WORD mtID;
-	WCHAR mtString[1];
-} MENUITEMTEMPLATE;
-typedef void MENUTEMPLATE,MENUTEMPLATEA,MENUTEMPLATEW,*LPMENUTEMPLATEA,*LPMENUTEMPLATEW,*LPMENUTEMPLATE;
-typedef struct tagHELPINFO {
-	UINT cbSize;
-	int iContextType;
-	int iCtrlId;
-	HANDLE hItemHandle;
-	DWORD dwContextId;
-	POINT MousePos;
-} HELPINFO,*LPHELPINFO;
-typedef void(CALLBACK *MSGBOXCALLBACK)(LPHELPINFO);
-typedef struct {
-	UINT cbSize;
-	HWND hwndOwner;
-	HINSTANCE hInstance;
-	LPCSTR lpszText;
-	LPCSTR lpszCaption;
-	DWORD dwStyle;
-	LPCSTR lpszIcon;
-	DWORD dwContextHelpId;
-	MSGBOXCALLBACK lpfnMsgBoxCallback;
-	DWORD dwLanguageId;
-} MSGBOXPARAMSA,*PMSGBOXPARAMSA,*LPMSGBOXPARAMSA;
-typedef struct {
-	UINT cbSize;
-	HWND hwndOwner;
-	HINSTANCE hInstance;
-	LPCWSTR lpszText;
-	LPCWSTR lpszCaption;
-	DWORD dwStyle;
-	LPCWSTR lpszIcon;
-	DWORD dwContextHelpId;
-	MSGBOXCALLBACK lpfnMsgBoxCallback;
-	DWORD dwLanguageId;
-} MSGBOXPARAMSW,*PMSGBOXPARAMSW,*LPMSGBOXPARAMSW;
-typedef struct tagUSEROBJECTFLAGS {
-	BOOL fInherit;
-	BOOL fReserved;
-	DWORD dwFlags;
-} USEROBJECTFLAGS;
-typedef struct tagFILTERKEYS {
-	UINT cbSize;
-	DWORD dwFlags;
-	DWORD iWaitMSec;
-	DWORD iDelayMSec;
-	DWORD iRepeatMSec;
-	DWORD iBounceMSec;
-} FILTERKEYS;
-typedef struct tagHIGHCONTRASTA {
-	UINT cbSize;
-	DWORD dwFlags;
-	LPSTR lpszDefaultScheme;
-} HIGHCONTRASTA,*LPHIGHCONTRASTA;
-typedef struct tagHIGHCONTRASTW {
-	UINT cbSize;
-	DWORD dwFlags;
-	LPWSTR lpszDefaultScheme;
-} HIGHCONTRASTW,*LPHIGHCONTRASTW;
-#ifndef NOGDI
-typedef struct tagICONMETRICSA {
-	UINT cbSize;
-	int iHorzSpacing;
-	int iVertSpacing;
-	int iTitleWrap;
-	LOGFONTA lfFont;
-} ICONMETRICSA,*LPICONMETRICSA;
-typedef struct tagICONMETRICSW {
-	UINT cbSize;
-	int iHorzSpacing;
-	int iVertSpacing;
-	int iTitleWrap;
-	LOGFONTW lfFont;
-} ICONMETRICSW,*LPICONMETRICSW;
-#endif /*  NOGDI */
-typedef struct tagMINIMIZEDMETRICS {
-	UINT cbSize;
-	int iWidth;
-	int iHorzGap;
-	int iVertGap;
-	int iArrange;
-} MINIMIZEDMETRICS,*LPMINIMIZEDMETRICS;
-typedef struct tagMOUSEKEYS{
-	UINT cbSize;
-	DWORD dwFlags;
-	DWORD iMaxSpeed;
-	DWORD iTimeToMaxSpeed;
-	DWORD iCtrlSpeed;
-	DWORD dwReserved1;
-	DWORD dwReserved2;
-} MOUSEKEYS,*LPMOUSEKEYS;
-#ifndef NOGDI
-typedef struct tagNONCLIENTMETRICSA {
-	UINT cbSize;
-	int iBorderWidth;
-	int iScrollWidth;
-	int iScrollHeight;
-	int iCaptionWidth;
-	int iCaptionHeight;
-	LOGFONTA lfCaptionFont;
-	int iSmCaptionWidth;
-	int iSmCaptionHeight;
-	LOGFONTA lfSmCaptionFont;
-	int iMenuWidth;
-	int iMenuHeight;
-	LOGFONTA lfMenuFont;
-	LOGFONTA lfStatusFont;
-	LOGFONTA lfMessageFont;
-} NONCLIENTMETRICSA,*LPNONCLIENTMETRICSA;
-typedef struct tagNONCLIENTMETRICSW {
-	UINT cbSize;
-	int iBorderWidth;
-	int iScrollWidth;
-	int iScrollHeight;
-	int iCaptionWidth;
-	int iCaptionHeight;
-	LOGFONTW lfCaptionFont;
-	int iSmCaptionWidth;
-	int iSmCaptionHeight;
-	LOGFONTW lfSmCaptionFont;
-	int iMenuWidth;
-	int iMenuHeight;
-	LOGFONTW lfMenuFont;
-	LOGFONTW lfStatusFont;
-	LOGFONTW lfMessageFont;
-} NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW;
-#endif
-typedef struct tagSERIALKEYSA {
-	UINT cbSize;
-	DWORD dwFlags;
-	LPSTR lpszActivePort;
-	LPSTR lpszPort;
-	UINT iBaudRate;
-	UINT iPortState;
-	UINT iActive;
-} SERIALKEYSA,*LPSERIALKEYSA;
-typedef struct tagSERIALKEYSW {
-	UINT cbSize;
-	DWORD dwFlags;
-	LPWSTR lpszActivePort;
-	LPWSTR lpszPort;
-	UINT iBaudRate;
-	UINT iPortState;
-	UINT iActive;
-} SERIALKEYSW,*LPSERIALKEYSW;
-typedef struct tagSOUNDSENTRYA {
-	UINT cbSize;
-	DWORD dwFlags;
-	DWORD iFSTextEffect;
-	DWORD iFSTextEffectMSec;
-	DWORD iFSTextEffectColorBits;
-	DWORD iFSGrafEffect;
-	DWORD iFSGrafEffectMSec;
-	DWORD iFSGrafEffectColor;
-	DWORD iWindowsEffect;
-	DWORD iWindowsEffectMSec;
-	LPSTR lpszWindowsEffectDLL;
-	DWORD iWindowsEffectOrdinal;
-} SOUNDSENTRYA,*LPSOUNDSENTRYA;
-typedef struct tagSOUNDSENTRYW {
-	UINT cbSize;
-	DWORD dwFlags;
-	DWORD iFSTextEffect;
-	DWORD iFSTextEffectMSec;
-	DWORD iFSTextEffectColorBits;
-	DWORD iFSGrafEffect;
-	DWORD iFSGrafEffectMSec;
-	DWORD iFSGrafEffectColor;
-	DWORD iWindowsEffect;
-	DWORD iWindowsEffectMSec;
-	LPWSTR lpszWindowsEffectDLL;
-	DWORD iWindowsEffectOrdinal;
-} SOUNDSENTRYW,*LPSOUNDSENTRYW;
-typedef struct tagSTICKYKEYS {
-	DWORD cbSize;
-	DWORD dwFlags;
-} STICKYKEYS,*LPSTICKYKEYS;
-typedef struct tagTOGGLEKEYS {
-	DWORD cbSize;
-	DWORD dwFlags;
-} TOGGLEKEYS;
-typedef struct tagMOUSEHOOKSTRUCT {
-	POINT pt;
-	HWND hwnd;
-	UINT wHitTestCode;
-	DWORD dwExtraInfo;
-} MOUSEHOOKSTRUCT,*LPMOUSEHOOKSTRUCT,*PMOUSEHOOKSTRUCT;
-typedef struct tagTRACKMOUSEEVENT {
-	DWORD cbSize;
-	DWORD dwFlags;
-	HWND  hwndTrack;
-	DWORD dwHoverTime;
-} TRACKMOUSEEVENT,*LPTRACKMOUSEEVENT;
-typedef struct tagTPMPARAMS {
-	UINT cbSize;
-	RECT rcExclude;
-} TPMPARAMS,*LPTPMPARAMS;
-typedef struct tagEVENTMSG {
-	UINT message;
-	UINT paramL;
-	UINT paramH;
-	DWORD time;
-	HWND hwnd;
-} EVENTMSG,*PEVENTMSGMSG,*LPEVENTMSGMSG,*PEVENTMSG,*LPEVENTMSG;
-typedef struct _WINDOWPOS {
-	HWND hwnd;
-	HWND hwndInsertAfter;
-	int x;
-	int y;
-	int cx;
-	int cy;
-	UINT flags;
-} WINDOWPOS,*PWINDOWPOS,*LPWINDOWPOS;
-typedef struct tagMDICREATESTRUCTA {
-	LPCSTR szClass;
-	LPCSTR szTitle;
-	HANDLE hOwner;
-	int x;
-	int y;
-	int cx;
-	int cy;
-	DWORD style;
-	LPARAM lParam;
-} MDICREATESTRUCTA,*LPMDICREATESTRUCTA;
-typedef struct tagMDICREATESTRUCTW {
-	LPCWSTR szClass;
-	LPCWSTR szTitle;
-	HANDLE hOwner;
-	int x;
-	int y;
-	int cx;
-	int cy;
-	DWORD style;
-	LPARAM lParam;
-} MDICREATESTRUCTW,*LPMDICREATESTRUCTW;
-typedef struct tagMINMAXINFO {
-	POINT ptReserved;
-	POINT ptMaxSize;
-	POINT ptMaxPosition;
-	POINT ptMinTrackSize;
-	POINT ptMaxTrackSize;
-} MINMAXINFO,*PMINMAXINFO,*LPMINMAXINFO;
-typedef struct tagMDINEXTMENU {
-	HMENU hmenuIn;
-	HMENU hmenuNext;
-	HWND hwndNext;
-} MDINEXTMENU,*PMDINEXTMENU,*LPMDINEXTMENU;
-typedef struct tagMEASUREITEMSTRUCT {
-	UINT CtlType;
-	UINT CtlID;
-	UINT itemID;
-	UINT itemWidth;
-	UINT itemHeight;
-	DWORD itemData;
-} MEASUREITEMSTRUCT,*PMEASUREITEMSTRUCT,*LPMEASUREITEMSTRUCT;
-typedef struct tagDROPSTRUCT {
-	HWND hwndSource;
-	HWND hwndSink;
-	DWORD wFmt;
-	DWORD dwData;
-	POINT ptDrop;
-	DWORD dwControlData;
-} DROPSTRUCT,*PDROPSTRUCT,*LPDROPSTRUCT;
-typedef DWORD HELPPOLY;
-typedef struct tagMULTIKEYHELPA {
-	DWORD mkSize;
-	CHAR mkKeylist;
-	CHAR szKeyphrase[1];
-} MULTIKEYHELPA,*PMULTIKEYHELPA,*LPMULTIKEYHELPA;
-typedef struct tagMULTIKEYHELPW {
-	DWORD mkSize;
-	WCHAR mkKeylist;
-	WCHAR szKeyphrase[1];
-} MULTIKEYHELPW,*PMULTIKEYHELPW,*LPMULTIKEYHELPW;
-typedef struct tagHELPWININFOA {
-	int wStructSize;
-	int x;
-	int y;
-	int dx;
-	int dy;
-	int wMax;
-	CHAR rgchMember[2];
-} HELPWININFOA,*PHELPWININFOA,*LPHELPWININFOA;
-typedef struct tagHELPWININFOW {
-	int wStructSize;
-	int x;
-	int y;
-	int dx;
-	int dy;
-	int wMax;
-	WCHAR rgchMember[2];
-} HELPWININFOW,*PHELPWININFOW,*LPHELPWININFOW;
-typedef struct tagSTYLESTRUCT { 
-	DWORD styleOld;
-	DWORD styleNew;
-} STYLESTRUCT,*LPSTYLESTRUCT;
-typedef struct tagALTTABINFO {
-	DWORD cbSize;
-	int   cItems;
-	int   cColumns;
-	int   cRows;
-	int   iColFocus;
-	int   iRowFocus;
-	int   cxItem;
-	int   cyItem;
-	POINT ptStart;
-} ALTTABINFO,*PALTTABINFO,*LPALTTABINFO;
-typedef struct tagCOMBOBOXINFO {
-	DWORD cbSize;
-	RECT rcItem;
-	RECT rcButton;
-	DWORD stateButton;
-	HWND hwndCombo;
-	HWND hwndItem;
-	HWND hwndList;
-} COMBOBOXINFO,*PCOMBOBOXINFO,*LPCOMBOBOXINFO;
-typedef struct tagCURSORINFO {
-	DWORD cbSize;
-	DWORD flags;
-	HCURSOR hCursor;
-	POINT ptScreenPos;
-} CURSORINFO,*PCURSORINFO,*LPCURSORINFO;
-typedef struct tagMENUBARINFO {
-	DWORD cbSize;
-	RECT  rcBar;
-	HMENU hMenu;
-	HWND  hwndMenu;
-	BOOL  fBarFocused:1;
-	BOOL  fFocused:1;
-} MENUBARINFO,*PMENUBARINFO;
-typedef struct tagMENUINFO {
-	DWORD cbSize;
-	DWORD fMask;
-	DWORD dwStyle;
-	UINT cyMax;
-	HBRUSH  hbrBack;
-	DWORD   dwContextHelpID;
-	ULONG_PTR dwMenuData;
-} MENUINFO,*LPMENUINFO;
-typedef MENUINFO CONST *LPCMENUINFO;
-#define CCHILDREN_SCROLLBAR 5
-typedef struct tagSCROLLBARINFO {
-	DWORD cbSize;
-	RECT  rcScrollBar;
-	int   dxyLineButton;
-	int   xyThumbTop;
-	int   xyThumbBottom;
-	int   reserved;
-	DWORD rgstate[CCHILDREN_SCROLLBAR+1];
-} SCROLLBARINFO,*PSCROLLBARINFO,*LPSCROLLBARINFO;
-#define CCHILDREN_TITLEBAR 5
-typedef struct tagTITLEBARINFO {
-	DWORD cbSize;
-	RECT  rcTitleBar;
-	DWORD rgstate[CCHILDREN_TITLEBAR+1];
-} TITLEBARINFO,*PTITLEBARINFO,*LPTITLEBARINFO;
-typedef struct tagWINDOWINFO {
-	DWORD cbSize;
-	RECT  rcWindow;
-	RECT  rcClient;
-	DWORD dwStyle;
-	DWORD dwExStyle;
-	DWORD dwWindowStatus;
-	UINT  cxWindowBorders;
-	UINT  cyWindowBorders;
-	ATOM  atomWindowType;
-	WORD  wCreatorVersion;
-} WINDOWINFO,*PWINDOWINFO,*LPWINDOWINFO;
-typedef struct tagLASTINPUTINFO {
-	UINT cbSize;
-	DWORD dwTime;
-} LASTINPUTINFO,*PLASTINPUTINFO;
-typedef struct tagMONITORINFO {
-	DWORD cbSize;
-	RECT rcMonitor;
-	RECT rcWork;
-	DWORD dwFlags;
-} MONITORINFO,*LPMONITORINFO;
-#define CCHDEVICENAME 32
-typedef struct tagMONITORINFOEXA {
-	DWORD	cbSize;
-	RECT	rcMonitor;
-	RECT	rcWork;
-	DWORD	dwFlags;
-	CHAR	szDevice[CCHDEVICENAME];
-} MONITORINFOEXA,*LPMONITORINFOEXA;
-typedef struct tagMONITORINFOEXW {
-	DWORD	cbSize;
-	RECT	rcMonitor;
-	RECT	rcWork;
-	DWORD	dwFlags;
-	WCHAR	szDevice[CCHDEVICENAME];
-} MONITORINFOEXW,*LPMONITORINFOEXW;
-typedef struct tagKBDLLHOOKSTRUCT {
-	DWORD vkCode;
-	DWORD scanCode;
-	DWORD flags;
-	DWORD time;
-	DWORD dwExtraInfo;
-} KBDLLHOOKSTRUCT,*LPKBDLLHOOKSTRUCT,*PKBDLLHOOKSTRUCT;
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-typedef struct {
-  UINT  cbSize;
-  HWND  hwnd;
-  DWORD dwFlags;
-  UINT  uCount;
-  DWORD dwTimeout;
-} FLASHWINFO,*PFLASHWINFO;
-#endif /* (WINVER >= 0x0500 || _WIN32_WINDOWS >= 0x0410) */
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490)
-typedef struct tagMOUSEMOVEPOINT {
-  int x;
-  int y;
-  DWORD time;
-  ULONG_PTR dwExtraInfo;
-} MOUSEMOVEPOINT,*PMOUSEMOVEPOINT,*LPMOUSEMOVEPOINT;
-#endif
-#if (_WIN32_WINNT >= 0x0403)
-typedef struct tagMOUSEINPUT {
-  LONG dx;
-  LONG dy;
-  DWORD mouseData;
-  DWORD dwFlags;
-  DWORD time;
-  ULONG_PTR dwExtraInfo;
-} MOUSEINPUT,*PMOUSEINPUT;
-typedef struct tagKEYBDINPUT {
-  WORD wVk;
-  WORD wScan;
-  DWORD dwFlags;
-  DWORD time;
-  ULONG_PTR dwExtraInfo;
-} KEYBDINPUT,*PKEYBDINPUT;
-typedef struct tagHARDWAREINPUT {
-  DWORD uMsg;
-  WORD wParamL;
-  WORD wParamH;
-} HARDWAREINPUT,*PHARDWAREINPUT;
-typedef struct tagINPUT {
-  DWORD type;
-  _ANONYMOUS_UNION union {
-		MOUSEINPUT mi;
-		KEYBDINPUT ki;
-		HARDWAREINPUT hi;
-  } DUMMYUNIONNAME;
-} INPUT,*PINPUT,*LPINPUT;
-#endif /* (_WIN32_WINNT >= 0x0403) */
-#if (WINVER >= 0x0500)
-typedef struct tagGUITHREADINFO {
-	DWORD cbSize;
-	DWORD flags;
-	HWND hwndActive;
-	HWND hwndFocus;
-	HWND hwndCapture;
-	HWND hwndMenuOwner;
-	HWND hwndMoveSize;
-	HWND hwndCaret;
-	RECT rcCaret;
-} GUITHREADINFO,*PGUITHREADINFO,*LPGUITHREADINFO;
-typedef VOID (*WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD);
-#endif /* (WINVER >= 0x0500) */
-#if (_WIN32_WINNT >= 0x0501)
-typedef struct {
-	UINT  cbSize;
-	HDESK hdesk;
-	HWND  hwnd;
-	LUID  luid;
-} BSMINFO,*PBSMINFO;
-DECLARE_HANDLE(HRAWINPUT);
-typedef struct tagRAWINPUTHEADER {
-	DWORD dwType;
-	DWORD dwSize;
-	HANDLE hDevice;
-	WPARAM wParam;
-} RAWINPUTHEADER,*PRAWINPUTHEADER;
-typedef struct tagRAWMOUSE {
-	USHORT usFlags;
-	_ANONYMOUS_UNION union {
-		ULONG ulButtons;
-		_ANONYMOUS_STRUCT struct {
-			USHORT usButtonFlags;
-			USHORT usButtonData;
-		};
-	};
-	ULONG ulRawButtons;
-	LONG lLastX;
-	LONG lLastY;
-	ULONG ulExtraInformation;
-} RAWMOUSE,*PRAWMOUSE,*LPRAWMOUSE;
-typedef struct tagRAWKEYBOARD {
-	USHORT MakeCode;
-	USHORT Flags;
-	USHORT Reserved;
-	USHORT VKey;
-	UINT Message;
-	ULONG ExtraInformation;
-} RAWKEYBOARD,*PRAWKEYBOARD,*LPRAWKEYBOARD;
-typedef struct tagRAWHID {
-	DWORD dwSizeHid;
-	DWORD dwCount;
-	BYTE bRawData;
-} RAWHID,*PRAWHID,*LPRAWHID;
-typedef struct tagRAWINPUT {
-	RAWINPUTHEADER header;
-	union {
-		RAWMOUSE    mouse;
-		RAWKEYBOARD keyboard;
-		RAWHID      hid;
-	} data;
-} RAWINPUT,*PRAWINPUT,*LPRAWINPUT;
-typedef struct tagRAWINPUTDEVICE {
-	USHORT usUsagePage;
-	USHORT usUsage;
-	DWORD dwFlags;
-	HWND hwndTarget;
-} RAWINPUTDEVICE,*PRAWINPUTDEVICE,*LPRAWINPUTDEVICE;
-typedef const RAWINPUTDEVICE *PCRAWINPUTDEVICE;
-typedef struct tagRAWINPUTDEVICELIST {
-	HANDLE hDevice;
-	DWORD dwType;
-} RAWINPUTDEVICELIST,*PRAWINPUTDEVICELIST;
-#endif /* (_WIN32_WINNT >= 0x0501) */
-
-#define AnsiToOem CharToOemA
-#define OemToAnsi OemToCharA
-#define AnsiToOemBuff CharToOemBuffA
-#define OemToAnsiBuff OemToCharBuffA
-#define AnsiUpper CharUpperA
-#define AnsiUpperBuff CharUpperBuffA
-#define AnsiLower CharLowerA
-#define AnsiLowerBuff CharLowerBuffA
-#define AnsiNext CharNextA
-#define AnsiPrev CharPrevA
-#define MAKELPARAM(l,h) ((LPARAM)MAKELONG(l,h))
-#define MAKEWPARAM(l,h) ((WPARAM)MAKELONG(l,h))
-#define MAKELRESULT(l,h) ((LRESULT)MAKELONG(l,h))
-#define POINTSTOPOINT(p,ps) { \
-  (p).x=LOWORD(*(DWORD *)&ps); \
-  (p).y=HIWORD(*(DWORD *)&ps); \
-}
-#define POINTTOPOINTS(p) ((POINTS)MAKELONG((p).x,(p).y))
-
-HKL WINAPI ActivateKeyboardLayout(HKL,UINT);
-BOOL WINAPI AdjustWindowRect(LPRECT,DWORD,BOOL);
-BOOL WINAPI AdjustWindowRectEx(LPRECT,DWORD,BOOL,DWORD);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI AnimateWindow(HWND,DWORD,DWORD);
-#endif /* (_WIN32_WINNT >= 0x0500) */
-BOOL WINAPI AnyPopup(void);
-BOOL WINAPI AppendMenuA(HMENU,UINT,UINT_PTR,LPCSTR);
-BOOL WINAPI AppendMenuW(HMENU,UINT,UINT_PTR,LPCWSTR);
-UINT WINAPI ArrangeIconicWindows(HWND);
-BOOL WINAPI AttachThreadInput(DWORD,DWORD,BOOL);
-HDWP WINAPI BeginDeferWindowPos(int);
-HDC WINAPI BeginPaint(HWND,LPPAINTSTRUCT);
-BOOL WINAPI BringWindowToTop(HWND);
-long WINAPI BroadcastSystemMessage(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
-#if (_WIN32_WINNT >= 0x0400)
-long WINAPI BroadcastSystemMessageA(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
-long WINAPI BroadcastSystemMessageW(DWORD,LPDWORD,UINT,WPARAM,LPARAM);
-#endif /* (_WIN32_WINNT >= 0x0400) */
-#if (_WIN32_WINNT >= 0x0501)
-long WINAPI BroadcastSystemMessageExA(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
-long WINAPI BroadcastSystemMessageExW(DWORD,LPDWORD,UINT,WPARAM,LPARAM,PBSMINFO);
-#endif /* (_WIN32_WINNT >= 0x0501) */
-BOOL WINAPI CallMsgFilter(PMSG,int);
-LRESULT WINAPI CallNextHookEx(HHOOK,int,WPARAM,LPARAM);
-LRESULT WINAPI CallWindowProcA(WNDPROC,HWND,UINT,WPARAM,LPARAM);
-LRESULT WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM);
-WORD WINAPI CascadeWindows(HWND,UINT,LPCRECT,UINT,const HWND*);
-BOOL WINAPI ChangeClipboardChain(HWND,HWND);
-#ifndef NOGDI
-LONG WINAPI ChangeDisplaySettingsA(PDEVMODEA,DWORD);
-LONG WINAPI ChangeDisplaySettingsW(PDEVMODEW,DWORD);
-LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID);
-LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
-#endif
-BOOL WINAPI ChangeMenuA(HMENU,UINT,LPCSTR,UINT,UINT);
-BOOL WINAPI ChangeMenuW(HMENU,UINT,LPCWSTR,UINT,UINT);
-LPSTR WINAPI CharLowerA(LPSTR);
-LPWSTR WINAPI CharLowerW(LPWSTR);
-DWORD WINAPI CharLowerBuffA(LPSTR,DWORD);
-DWORD WINAPI CharLowerBuffW(LPWSTR,DWORD);
-LPSTR WINAPI CharNextA(LPCSTR);
-LPWSTR WINAPI CharNextW(LPCWSTR);
-LPSTR WINAPI CharNextExA(WORD,LPCSTR,DWORD);
-LPWSTR WINAPI CharNextExW(WORD,LPCWSTR,DWORD);
-LPSTR WINAPI CharPrevA(LPCSTR,LPCSTR);
-LPWSTR WINAPI CharPrevW(LPCWSTR,LPCWSTR);
-LPSTR WINAPI CharPrevExA(WORD,LPCSTR,LPCSTR,DWORD);
-LPWSTR WINAPI CharPrevExW(WORD,LPCWSTR,LPCWSTR,DWORD);
-BOOL WINAPI CharToOemA(LPCSTR,LPSTR);
-BOOL WINAPI CharToOemW(LPCWSTR,LPSTR);
-BOOL WINAPI CharToOemBuffA(LPCSTR,LPSTR,DWORD);
-BOOL WINAPI CharToOemBuffW(LPCWSTR,LPSTR,DWORD);
-LPSTR WINAPI CharUpperA(LPSTR);
-LPWSTR WINAPI CharUpperW(LPWSTR);
-DWORD WINAPI CharUpperBuffA(LPSTR,DWORD);
-DWORD WINAPI CharUpperBuffW(LPWSTR,DWORD);
-BOOL WINAPI CheckDlgButton(HWND,int,UINT);
-DWORD WINAPI CheckMenuItem(HMENU,UINT,UINT);
-BOOL WINAPI CheckMenuRadioItem(HMENU,UINT,UINT,UINT,UINT);
-BOOL WINAPI CheckRadioButton(HWND,int,int,int);
-HWND WINAPI ChildWindowFromPoint(HWND,POINT);
-HWND WINAPI ChildWindowFromPointEx(HWND,POINT,UINT);
-BOOL WINAPI ClientToScreen(HWND,LPPOINT);
-BOOL WINAPI ClipCursor(LPCRECT);
-BOOL WINAPI CloseClipboard(void);
-BOOL WINAPI CloseDesktop(HDESK);
-BOOL WINAPI CloseWindow(HWND);
-BOOL WINAPI CloseWindowStation(HWINSTA);
-int WINAPI CopyAcceleratorTableA(HACCEL,LPACCEL,int);
-int WINAPI CopyAcceleratorTableW(HACCEL,LPACCEL,int);
-#define CopyCursor(c) ((HCURSOR)CopyIcon((HICON)(c)))
-HICON WINAPI CopyIcon(HICON);
-HANDLE WINAPI CopyImage(HANDLE,UINT,int,int,UINT);
-BOOL WINAPI CopyRect(LPRECT,LPCRECT);
-int WINAPI CountClipboardFormats(void);
-HACCEL WINAPI CreateAcceleratorTableA(LPACCEL,int);
-HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int);
-BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int);
-HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID);
-#ifndef NOGDI
-HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
-HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES);
-#endif
-#define CreateDialogA(h,n,w,f) CreateDialogParamA(h,n,w,f,0)
-#define CreateDialogW(h,n,w,f) CreateDialogParamW(h,n,w,f,0)
-#define CreateDialogIndirectA(h,t,w,f) CreateDialogIndirectParamA(h,t,w,f,0)
-#define CreateDialogIndirectW(h,t,w,f) CreateDialogIndirectParamW(h,t,w,f,0)
-HWND WINAPI CreateDialogIndirectParamA(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM);
-HWND WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM);
-HWND WINAPI CreateDialogParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
-HWND WINAPI CreateDialogParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
-HICON WINAPI CreateIcon(HINSTANCE,int,int,BYTE,BYTE,const BYTE*,const BYTE*);
-HICON WINAPI CreateIconFromResource(PBYTE,DWORD,BOOL,DWORD);
-HICON WINAPI CreateIconFromResourceEx(PBYTE,DWORD,BOOL,DWORD,int,int,UINT);
-HICON WINAPI CreateIconIndirect(PICONINFO);
-HWND WINAPI CreateMDIWindowA(LPCSTR,LPCSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM);
-HWND WINAPI CreateMDIWindowW(LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HINSTANCE,LPARAM);
-HMENU WINAPI CreateMenu(void);
-HMENU WINAPI CreatePopupMenu(void);
-#define CreateWindowA(a,b,c,d,e,f,g,h,i,j,k) CreateWindowExA(0,a,b,c,d,e,f,g,h,i,j,k)
-#define CreateWindowW(a,b,c,d,e,f,g,h,i,j,k) CreateWindowExW(0,a,b,c,d,e,f,g,h,i,j,k)
-HWND WINAPI CreateWindowExA(DWORD,LPCSTR,LPCSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID);
-HWND WINAPI CreateWindowExW(DWORD,LPCWSTR,LPCWSTR,DWORD,int,int,int,int,HWND,HMENU,HINSTANCE,LPVOID);
-HWINSTA WINAPI CreateWindowStationA(LPSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
-HWINSTA WINAPI CreateWindowStationW(LPWSTR,DWORD,DWORD,LPSECURITY_ATTRIBUTES);
-LRESULT WINAPI DefDlgProcA(HWND,UINT,WPARAM,LPARAM);
-LRESULT WINAPI DefDlgProcW(HWND,UINT,WPARAM,LPARAM);
-HDWP WINAPI DeferWindowPos(HDWP,HWND,HWND,int,int,int,int,UINT);
-LRESULT WINAPI DefFrameProcA(HWND,HWND,UINT,WPARAM,LPARAM);
-LRESULT WINAPI DefFrameProcW(HWND,HWND,UINT,WPARAM,LPARAM);
-#define DefHookProc(c,p,lp,h) CallNextHookEx((HHOOK)*h,c,p,lp)
-LRESULT WINAPI DefMDIChildProcA(HWND,UINT,WPARAM,LPARAM);
-LRESULT WINAPI DefMDIChildProcW(HWND,UINT,WPARAM,LPARAM);
-#if (_WIN32_WINNT >= 0x0501)
-LRESULT WINAPI DefRawInputProc(PRAWINPUT*,INT,UINT);
-#endif
-LRESULT WINAPI DefWindowProcA(HWND,UINT,WPARAM,LPARAM);
-LRESULT WINAPI DefWindowProcW(HWND,UINT,WPARAM,LPARAM);
-BOOL WINAPI DeleteMenu(HMENU,UINT,UINT);
-BOOL WINAPI DeregisterShellHookWindow(HWND);
-BOOL WINAPI DestroyAcceleratorTable(HACCEL);
-BOOL WINAPI DestroyCaret(void);
-BOOL WINAPI DestroyCursor(HCURSOR);
-BOOL WINAPI DestroyIcon(HICON);
-BOOL WINAPI DestroyMenu(HMENU);
-BOOL WINAPI DestroyWindow(HWND);
-#define DialogBoxA(i,t,p,f) DialogBoxParamA(i,t,p,f,0)
-#define DialogBoxW(i,t,p,f) DialogBoxParamW(i,t,p,f,0)
-#define DialogBoxIndirectA(i,t,p,f) DialogBoxIndirectParamA(i,t,p,f,0)
-#define DialogBoxIndirectW(i,t,p,f) DialogBoxIndirectParamW(i,t,p,f,0)
-int WINAPI DialogBoxIndirectParamA(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM);
-int WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM);
-int WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);
-int WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);
-LONG WINAPI DispatchMessageA(const MSG*);
-LONG WINAPI DispatchMessageW(const MSG*);
-int WINAPI DlgDirListA(HWND,LPSTR,int,int,UINT);
-int WINAPI DlgDirListW(HWND,LPWSTR,int,int,UINT);
-int WINAPI DlgDirListComboBoxA(HWND,LPSTR,int,int,UINT);
-int WINAPI DlgDirListComboBoxW(HWND,LPWSTR,int,int,UINT);
-BOOL WINAPI DlgDirSelectComboBoxExA(HWND,LPSTR,int,int);
-BOOL WINAPI DlgDirSelectComboBoxExW(HWND,LPWSTR,int,int);
-BOOL WINAPI DlgDirSelectExA(HWND,LPSTR,int,int);
-BOOL WINAPI DlgDirSelectExW(HWND,LPWSTR,int,int);
-BOOL WINAPI DragDetect(HWND,POINT);
-DWORD WINAPI DragObject(HWND,HWND,UINT,DWORD,HCURSOR);
-BOOL WINAPI DrawAnimatedRects(HWND,int,LPCRECT,LPCRECT);
-BOOL WINAPI DrawCaption(HWND,HDC,LPCRECT,UINT);
-BOOL WINAPI DrawEdge(HDC,LPRECT,UINT,UINT);
-BOOL WINAPI DrawFocusRect(HDC,LPCRECT);
-BOOL WINAPI DrawFrameControl(HDC,LPRECT,UINT,UINT);
-BOOL WINAPI DrawIcon(HDC,int,int,HICON);
-BOOL WINAPI DrawIconEx(HDC,int,int,HICON,int,int,UINT,HBRUSH,UINT);
-BOOL WINAPI DrawMenuBar(HWND);
-BOOL WINAPI DrawStateA(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,int,int,int,int,UINT);
-BOOL WINAPI DrawStateW(HDC,HBRUSH,DRAWSTATEPROC,LPARAM,WPARAM,int,int,int,int,UINT);
-int WINAPI DrawTextA(HDC,LPCSTR,int,LPRECT,UINT);
-int WINAPI DrawTextW(HDC,LPCWSTR,int,LPRECT,UINT);
-int WINAPI DrawTextExA(HDC,LPSTR,int,LPRECT,UINT,LPDRAWTEXTPARAMS);
-int WINAPI DrawTextExW(HDC,LPWSTR,int,LPRECT,UINT,LPDRAWTEXTPARAMS);
-BOOL WINAPI EmptyClipboard(void);
-BOOL WINAPI EnableMenuItem(HMENU,UINT,UINT);
-BOOL WINAPI EnableScrollBar(HWND,UINT,UINT);
-BOOL WINAPI EnableWindow(HWND,BOOL);
-BOOL WINAPI EndDeferWindowPos(HDWP);
-BOOL WINAPI EndDialog(HWND,int);
-BOOL WINAPI EndMenu(void);
-BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI EndTask(HWND,BOOL,BOOL);
-#endif
-BOOL WINAPI EnumChildWindows(HWND,ENUMWINDOWSPROC,LPARAM);
-UINT WINAPI EnumClipboardFormats(UINT);
-BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM);
-BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM);
-BOOL WINAPI EnumDesktopWindows(HDESK,ENUMWINDOWSPROC,LPARAM);
-BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
-#ifndef NOGDI
-BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA);
-BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW);
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-BOOL WINAPI EnumDisplaySettingsExA(LPCSTR,DWORD,LPDEVMODEA,DWORD);
-BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR,DWORD,LPDEVMODEW,DWORD);
-#endif
-BOOL WINAPI EnumDisplayDevicesA(LPCSTR,DWORD,PDISPLAY_DEVICEA,DWORD);
-BOOL WINAPI EnumDisplayDevicesW(LPCWSTR,DWORD,PDISPLAY_DEVICEW,DWORD);
-#endif
-int WINAPI EnumPropsA(HWND,PROPENUMPROCA);
-int WINAPI EnumPropsW(HWND,PROPENUMPROCW);
-int WINAPI EnumPropsExA(HWND,PROPENUMPROCEXA,LPARAM);
-int WINAPI EnumPropsExW(HWND,PROPENUMPROCEXW,LPARAM);
-#define EnumTaskWindows(h,f,p) EnumThreadWindows((DWORD)h,f,p)
-BOOL WINAPI EnumThreadWindows(DWORD,WNDENUMPROC,LPARAM);
-BOOL WINAPI EnumWindows(WNDENUMPROC,LPARAM);
-BOOL WINAPI EnumWindowStationsA(WINSTAENUMPROCA,LPARAM);
-BOOL WINAPI EnumWindowStationsW(WINSTAENUMPROCW,LPARAM);
-BOOL WINAPI EqualRect(LPCRECT,LPCRECT);
-#define ExitWindows(r,c) ExitWindowsEx(EWX_LOGOFF,0)
-BOOL WINAPI ExitWindowsEx(UINT,DWORD);
-HWND WINAPI FindWindowA(LPCSTR,LPCSTR);
-HWND WINAPI FindWindowExA(HWND,HWND,LPCSTR,LPCSTR);
-HWND WINAPI FindWindowExW(HWND,HWND,LPCWSTR,LPCWSTR);
-HWND WINAPI FindWindowW(LPCWSTR,LPCWSTR);
-BOOL WINAPI FlashWindow(HWND,BOOL);
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-BOOL WINAPI FlashWindowEx(PFLASHWINFO);
-#endif
-int WINAPI FrameRect(HDC,LPCRECT,HBRUSH);
-BOOL WINAPI FrameRgn(HDC,HRGN,HBRUSH,int,int);
-HWND WINAPI GetActiveWindow(void);
-HWND WINAPI GetAncestor(HWND,UINT);
-SHORT WINAPI GetAsyncKeyState(int);
-HWND WINAPI GetCapture(void);
-UINT WINAPI GetCaretBlinkTime(void);
-BOOL WINAPI GetCaretPos(LPPOINT);
-BOOL WINAPI GetClassInfoA(HINSTANCE,LPCSTR,LPWNDCLASSA);
-BOOL WINAPI GetClassInfoExA(HINSTANCE,LPCSTR,LPWNDCLASSEXA);
-BOOL WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,LPWNDCLASSW);
-BOOL WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,LPWNDCLASSEXW);
-DWORD WINAPI GetClassLongA(HWND,int);
-DWORD WINAPI GetClassLongW(HWND,int);
-int WINAPI GetClassNameA(HWND,LPSTR,int);
-int WINAPI GetClassNameW(HWND,LPWSTR,int);
-WORD WINAPI GetClassWord(HWND,int);
-BOOL WINAPI GetClientRect(HWND,LPRECT);
-HANDLE WINAPI GetClipboardData(UINT);
-int WINAPI GetClipboardFormatNameA(UINT,LPSTR,int);
-int WINAPI GetClipboardFormatNameW(UINT,LPWSTR,int);
-HWND WINAPI GetClipboardOwner(void);
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-DWORD WINAPI GetClipboardSequenceNumber(void);
-#endif
-HWND WINAPI GetClipboardViewer(void);
-BOOL WINAPI GetClipCursor(LPRECT);
-BOOL WINAPI GetCursorPos(LPPOINT);
-HDC WINAPI GetDC(HWND);
-HDC WINAPI GetDCEx(HWND,HRGN,DWORD);
-HWND WINAPI GetDesktopWindow(void);
-long WINAPI GetDialogBaseUnits(void);
-int WINAPI GetDlgCtrlID(HWND);
-HWND WINAPI GetDlgItem(HWND,int);
-UINT WINAPI GetDlgItemInt(HWND,int,PBOOL,BOOL);
-UINT WINAPI GetDlgItemTextA(HWND,int,LPSTR,int);
-UINT WINAPI GetDlgItemTextW(HWND,int,LPWSTR,int);
-UINT WINAPI GetDoubleClickTime(void);
-HWND WINAPI GetFocus(void);
-HWND WINAPI GetForegroundWindow(void);
-#if (_WIN32_WINNT >= 0x0500)
-DWORD WINAPI GetGuiResources(HANDLE,DWORD);
-#endif
-BOOL WINAPI GetIconInfo(HICON,PICONINFO);
-BOOL WINAPI GetInputState(void);
-UINT WINAPI GetKBCodePage(void);
-HKL WINAPI GetKeyboardLayout(DWORD);
-UINT WINAPI GetKeyboardLayoutList(int,HKL*);
-BOOL WINAPI GetKeyboardLayoutNameA(LPSTR);
-BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR);
-BOOL WINAPI GetKeyboardState(PBYTE);
-int WINAPI GetKeyboardType(int);
-int WINAPI GetKeyNameTextA(LONG,LPSTR,int);
-int WINAPI GetKeyNameTextW(LONG,LPWSTR,int);
-SHORT WINAPI GetKeyState(int);
-HWND WINAPI GetLastActivePopup(HWND);
-DWORD WINAPI GetLastError(void);
-HMENU WINAPI GetMenu(HWND);
-LONG WINAPI GetMenuCheckMarkDimensions(void);
-DWORD WINAPI GetMenuContextHelpId(HMENU);
-UINT WINAPI GetMenuDefaultItem(HMENU,UINT,UINT);
-int WINAPI GetMenuItemCount(HMENU);
-UINT WINAPI GetMenuItemID(HMENU,int);
-BOOL WINAPI GetMenuItemInfoA(HMENU,UINT,BOOL,LPMENUITEMINFOA);
-BOOL WINAPI GetMenuItemInfoW(HMENU,UINT,BOOL,LPMENUITEMINFOW);
-BOOL WINAPI GetMenuItemRect(HWND,HMENU,UINT,LPRECT);
-UINT WINAPI GetMenuState(HMENU,UINT,UINT);
-int WINAPI GetMenuStringA(HMENU,UINT,LPSTR,int,UINT);
-int WINAPI GetMenuStringW(HMENU,UINT,LPWSTR,int,UINT);
-BOOL WINAPI GetMessageA(LPMSG,HWND,UINT,UINT);
-BOOL WINAPI GetMessageW(LPMSG,HWND,UINT,UINT);
-LONG WINAPI GetMessageExtraInfo(void);
-DWORD WINAPI GetMessagePos(void);
-LONG WINAPI GetMessageTime(void);
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490)
-int WINAPI GetMouseMovePointsEx(UINT,LPMOUSEMOVEPOINT,LPMOUSEMOVEPOINT,int,DWORD);
-#endif
-HWND WINAPI GetNextDlgGroupItem(HWND,HWND,BOOL);
-HWND WINAPI GetNextDlgTabItem(HWND,HWND,BOOL);
-#define GetNextWindow(h,c) GetWindow(h,c)
-HWND WINAPI GetOpenClipboardWindow(void);
-HWND WINAPI GetParent(HWND);
-int WINAPI GetPriorityClipboardFormat(UINT*,int);
-HANDLE WINAPI GetPropA(HWND,LPCSTR);
-HANDLE WINAPI GetPropW(HWND,LPCWSTR);
-#if (_WIN32_WINNT >= 0x0501)
-UINT WINAPI GetRawInputBuffer(PRAWINPUT,PUINT,UINT);
-UINT WINAPI GetRawInputData(HRAWINPUT,UINT,LPVOID,PUINT,UINT);
-UINT WINAPI GetRawInputDeviceInfoA(HANDLE,UINT,LPVOID,PUINT);
-UINT WINAPI GetRawInputDeviceInfoW(HANDLE,UINT,LPVOID,PUINT);
-UINT WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST,PUINT,UINT);
-UINT WINAPI GetRegisteredRawInputDevices(PRAWINPUTDEVICE,PUINT,UINT);
-#endif
-DWORD WINAPI GetQueueStatus(UINT);
-BOOL WINAPI GetScrollInfo(HWND,int,LPSCROLLINFO);
-int WINAPI GetScrollPos(HWND,int);
-BOOL WINAPI GetScrollRange(HWND,int,LPINT,LPINT);
-#if (_WIN32_WINNT >= 0x0500)
-HWND WINAPI GetShellWindow(void);
-#endif
-HMENU WINAPI GetSubMenu(HMENU,int);
-DWORD WINAPI GetSysColor(int);
-HBRUSH WINAPI GetSysColorBrush(int);
-#define GetSysModalWindow() (NULL)
-HMENU WINAPI GetSystemMenu(HWND,BOOL);
-int WINAPI GetSystemMetrics(int);
-DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,LPINT);
-DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,LPINT);
-LONG WINAPI GetWindowLongA(HWND,int);
-LONG WINAPI GetWindowLongW(HWND,int);
-#ifdef _WIN64
-LONG_PTR WINAPI GetWindowLongPtrA(HWND,int);
-LONG_PTR WINAPI GetWindowLongPtrW(HWND,int);
-#else
-#define GetWindowLongPtrA GetWindowLongA
-#define GetWindowLongPtrW GetWindowLongW
-#endif
-HDESK WINAPI GetThreadDesktop(DWORD);
-HWND WINAPI GetTopWindow(HWND);
-BOOL WINAPI GetUpdateRect(HWND,LPRECT,BOOL);
-int WINAPI GetUpdateRgn(HWND,HRGN,BOOL);
-BOOL WINAPI GetUserObjectInformationA(HANDLE,int,PVOID,DWORD,PDWORD);
-BOOL WINAPI GetUserObjectInformationW(HANDLE,int,PVOID,DWORD,PDWORD);
-BOOL WINAPI GetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,PDWORD);
-HWND WINAPI GetWindow(HWND,UINT);
-DWORD WINAPI GetWindowContextHelpId(HWND);
-HDC WINAPI GetWindowDC(HWND);
-BOOL WINAPI GetWindowExtEx(HDC,LPSIZE);
-BOOL WINAPI GetWindowPlacement(HWND,WINDOWPLACEMENT*);
-BOOL WINAPI GetWindowRect(HWND,LPRECT);
-int WINAPI GetWindowRgn(HWND,HRGN);
-#define GetWindowTask(hWnd) ((HANDLE)GetWindowThreadProcessId(hWnd, NULL))
-int WINAPI GetWindowTextA(HWND,LPSTR,int);
-int WINAPI GetWindowTextLengthA(HWND);
-int WINAPI GetWindowTextLengthW(HWND);
-int WINAPI GetWindowTextW(HWND,LPWSTR,int);
-WORD WINAPI GetWindowWord(HWND,int);
-BOOL WINAPI GetAltTabInfoA(HWND,int,PALTTABINFO,LPSTR,UINT);
-BOOL WINAPI GetAltTabInfoW(HWND,int,PALTTABINFO,LPWSTR,UINT);
-BOOL WINAPI GetComboBoxInfo(HWND,PCOMBOBOXINFO);
-BOOL WINAPI GetCursorInfo(PCURSORINFO);
-#if (WINVER >= 0x0500)
-BOOL WINAPI GetGUIThreadInfo(DWORD,LPGUITHREADINFO);
-#endif
-BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO);
-DWORD WINAPI GetListBoxInfo(HWND);
-BOOL WINAPI GetMenuBarInfo(HWND,LONG,LONG,PMENUBARINFO);
-BOOL WINAPI GetMenuInfo(HMENU,LPMENUINFO);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI GetProcessDefaultLayout(DWORD*);
-#endif
-BOOL WINAPI GetScrollBarInfo(HWND,LONG,PSCROLLBARINFO);
-BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO);
-BOOL WINAPI GetWindowInfo(HWND,PWINDOWINFO);
-BOOL WINAPI GetMonitorInfoA(HMONITOR,LPMONITORINFO);
-BOOL WINAPI GetMonitorInfoW(HMONITOR,LPMONITORINFO);
-UINT WINAPI GetWindowModuleFileNameA(HWND,LPSTR,UINT);
-UINT WINAPI GetWindowModuleFileNameW(HWND,LPWSTR,UINT);
-BOOL WINAPI GrayStringA(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,int,int,int,int,int);
-BOOL WINAPI GrayStringW(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,int,int,int,int,int);
-BOOL WINAPI HideCaret(HWND);
-BOOL WINAPI HiliteMenuItem(HWND,HMENU,UINT,UINT);
-BOOL WINAPI InflateRect(LPRECT,int,int);
-BOOL WINAPI InSendMessage(void);
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410)
-DWORD WINAPI InSendMessageEx(LPVOID);
-#endif
-BOOL WINAPI InsertMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
-BOOL WINAPI InsertMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
-BOOL WINAPI InsertMenuItemA(HMENU,UINT,BOOL,LPCMENUITEMINFOA);
-BOOL WINAPI InsertMenuItemW(HMENU,UINT,BOOL,LPCMENUITEMINFOW);
-BOOL WINAPI IntersectRect(LPRECT,LPCRECT,LPCRECT);
-BOOL WINAPI InvalidateRect(HWND,LPCRECT,BOOL);
-BOOL WINAPI InvalidateRgn(HWND,HRGN,BOOL);
-BOOL WINAPI InvertRect(HDC,LPCRECT);
-BOOL WINAPI IsCharAlphaA(CHAR ch);
-BOOL WINAPI IsCharAlphaNumericA(CHAR);
-BOOL WINAPI IsCharAlphaNumericW(WCHAR);
-BOOL WINAPI IsCharAlphaW(WCHAR);
-BOOL WINAPI IsCharLowerA(CHAR);
-BOOL WINAPI IsCharLowerW(WCHAR);
-BOOL WINAPI IsCharUpperA(CHAR);
-BOOL WINAPI IsCharUpperW(WCHAR);
-BOOL WINAPI IsChild(HWND,HWND);
-BOOL WINAPI IsClipboardFormatAvailable(UINT);
-BOOL WINAPI IsDialogMessageA(HWND,LPMSG);
-BOOL WINAPI IsDialogMessageW(HWND,LPMSG);
-UINT WINAPI IsDlgButtonChecked(HWND,int);
-#if(_WIN32_WINNT >= 0x0501)
-BOOL WINAPI IsGUIThread(BOOL);
-#endif
-#if(_WIN32_WINNT >= 0x0500)
-BOOL WINAPI IsHungAppWindow(HWND);
-#endif
-BOOL WINAPI IsIconic(HWND);
-BOOL WINAPI IsMenu(HMENU);
-BOOL WINAPI IsRectEmpty(LPCRECT);
-BOOL WINAPI IsWindow(HWND);
-BOOL WINAPI IsWindowEnabled(HWND);
-BOOL WINAPI IsWindowUnicode(HWND);
-BOOL WINAPI IsWindowVisible(HWND);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI IsWinEventHookInstalled(DWORD);
-#endif
-BOOL WINAPI IsZoomed(HWND);
-VOID WINAPI keybd_event(BYTE,BYTE,DWORD,DWORD);
-BOOL WINAPI KillTimer(HWND,UINT);
-HACCEL WINAPI LoadAcceleratorsA(HINSTANCE,LPCSTR);
-HACCEL WINAPI LoadAcceleratorsW(HINSTANCE,LPCWSTR);
-HBITMAP WINAPI LoadBitmapA(HINSTANCE,LPCSTR);
-HBITMAP WINAPI LoadBitmapW(HINSTANCE,LPCWSTR);
-HCURSOR WINAPI LoadCursorA(HINSTANCE,LPCSTR);
-HCURSOR WINAPI LoadCursorFromFileA(LPCSTR);
-HCURSOR WINAPI LoadCursorFromFileW(LPCWSTR);
-HCURSOR WINAPI LoadCursorW(HINSTANCE,LPCWSTR);
-HICON WINAPI LoadIconA(HINSTANCE,LPCSTR);
-HICON WINAPI LoadIconW(HINSTANCE,LPCWSTR);
-HANDLE WINAPI LoadImageA(HINSTANCE,LPCSTR,UINT,int,int,UINT);
-HANDLE WINAPI LoadImageW(HINSTANCE,LPCWSTR,UINT,int,int,UINT);
-HKL WINAPI LoadKeyboardLayoutA(LPCSTR,UINT);
-HKL WINAPI LoadKeyboardLayoutW(LPCWSTR,UINT);
-HMENU WINAPI LoadMenuA(HINSTANCE,LPCSTR);
-HMENU WINAPI LoadMenuIndirectA(const MENUTEMPLATE*);
-HMENU WINAPI LoadMenuIndirectW(const MENUTEMPLATE*);
-HMENU WINAPI LoadMenuW(HINSTANCE,LPCWSTR);
-int WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,int);
-int WINAPI LoadStringW(HINSTANCE,UINT,LPWSTR,int);
-BOOL WINAPI LockWindowUpdate(HWND);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI LockWorkStation(void);
-#endif
-int WINAPI LookupIconIdFromDirectory(PBYTE,BOOL);
-int WINAPI LookupIconIdFromDirectoryEx(PBYTE,BOOL,int,int,UINT);
-BOOL WINAPI MapDialogRect(HWND,LPRECT);
-UINT WINAPI MapVirtualKeyA(UINT,UINT);
-UINT WINAPI MapVirtualKeyExA(UINT,UINT,HKL);
-UINT WINAPI MapVirtualKeyExW(UINT,UINT,HKL);
-UINT WINAPI MapVirtualKeyW(UINT,UINT);
-int WINAPI MapWindowPoints(HWND,HWND,LPPOINT,UINT);
-int WINAPI MenuItemFromPoint(HWND,HMENU,POINT);
-BOOL WINAPI MessageBeep(UINT);
-int WINAPI MessageBoxA(HWND,LPCSTR,LPCSTR,UINT);
-int WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT);
-int WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD);
-int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD);
-int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*);
-int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*);
-BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
-BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
-void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR);
-BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL);
-DWORD WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD);
-DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD,CONST HANDLE*,DWORD,DWORD,DWORD);
-#if (WINVER >= 0x0500)
-void WINAPI NotifyWinEvent(DWORD,HWND,LONG,LONG);
-#endif
-DWORD WINAPI OemKeyScan(WORD);
-BOOL WINAPI OemToCharA(LPCSTR,LPSTR);
-BOOL WINAPI OemToCharBuffA(LPCSTR,LPSTR,DWORD);
-BOOL WINAPI OemToCharBuffW(LPCSTR,LPWSTR,DWORD);
-BOOL WINAPI OemToCharW(LPCSTR,LPWSTR);
-BOOL WINAPI OffsetRect(LPRECT,int,int);
-BOOL WINAPI OpenClipboard(HWND);
-HDESK WINAPI OpenDesktopA(LPSTR,DWORD,BOOL,DWORD);
-HDESK WINAPI OpenDesktopW(LPWSTR,DWORD,BOOL,DWORD);
-BOOL WINAPI OpenIcon(HWND);
-HDESK WINAPI OpenInputDesktop(DWORD,BOOL,DWORD);
-HWINSTA WINAPI OpenWindowStationA(LPSTR,BOOL,DWORD);
-HWINSTA WINAPI OpenWindowStationW(LPWSTR,BOOL,DWORD);
-BOOL WINAPI PaintDesktop(HDC);
-BOOL WINAPI PeekMessageA(LPMSG,HWND,UINT,UINT,UINT);
-BOOL WINAPI PeekMessageW(LPMSG,HWND,UINT,UINT,UINT);
-#define PostAppMessageA(t,m,w,l) PostThreadMessageA((DWORD)t,m,w,l)
-#define PostAppMessageW(t,m,w,l) PostThreadMessageW((DWORD)t,m,w,l)
-BOOL WINAPI PostMessageA(HWND,UINT,WPARAM,LPARAM);
-BOOL WINAPI PostMessageW(HWND,UINT,WPARAM,LPARAM);
-void WINAPI PostQuitMessage(int);
-BOOL WINAPI PostThreadMessageA(DWORD,UINT,WPARAM,LPARAM);
-BOOL WINAPI PostThreadMessageW(DWORD,UINT,WPARAM,LPARAM);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI PrintWindow(HWND,HDC,UINT);
-#endif
-BOOL WINAPI PtInRect(LPCRECT,POINT);
-HWND WINAPI RealChildWindowFromPoint(HWND,POINT);
-UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT);
-UINT WINAPI RealGetWindowClassW(HWND,LPWSTR,UINT);
-BOOL WINAPI RedrawWindow(HWND,LPCRECT,HRGN,UINT);
-ATOM WINAPI RegisterClassA(CONST WNDCLASSA*);
-ATOM WINAPI RegisterClassW(CONST WNDCLASSW*);
-ATOM WINAPI RegisterClassExA(CONST WNDCLASSEXA*);
-ATOM WINAPI RegisterClassExW(CONST WNDCLASSEXW*);
-UINT WINAPI RegisterClipboardFormatA(LPCSTR);
-UINT WINAPI RegisterClipboardFormatW(LPCWSTR);
-#if (WINVER >= 0x0500)
-HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE,LPVOID,DWORD);
-HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE,LPVOID,DWORD);
-#endif
-BOOL WINAPI RegisterHotKey(HWND,int,UINT,UINT);
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI RegisterRawInputDevices(PCRAWINPUTDEVICE,UINT,UINT);
-#endif
-UINT WINAPI RegisterWindowMessageA(LPCSTR);
-UINT WINAPI RegisterWindowMessageW(LPCWSTR);
-BOOL WINAPI ReleaseCapture(void);
-int WINAPI ReleaseDC(HWND,HDC);
-BOOL WINAPI RemoveMenu(HMENU,UINT,UINT);
-HANDLE WINAPI RemovePropA(HWND,LPCSTR);
-HANDLE WINAPI RemovePropW(HWND,LPCWSTR);
-BOOL WINAPI ReplyMessage(LRESULT);
-BOOL WINAPI ScreenToClient(HWND,LPPOINT);
-BOOL WINAPI ScrollDC(HDC,int,int,LPCRECT,LPCRECT,HRGN,LPRECT);
-BOOL WINAPI ScrollWindow(HWND,int,int,LPCRECT,LPCRECT);
-int WINAPI ScrollWindowEx(HWND,int,int,LPCRECT,LPCRECT,HRGN,LPRECT,UINT);
-LONG WINAPI SendDlgItemMessageA(HWND,int,UINT,WPARAM,LPARAM);
-LONG WINAPI SendDlgItemMessageW(HWND,int,UINT,WPARAM,LPARAM);
-#if (_WIN32_WINNT >= 0x0403)
-UINT WINAPI SendInput(UINT,LPINPUT,int);
-#endif
-LRESULT WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM);
-BOOL WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD);
-BOOL WINAPI SendMessageCallbackW(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD);
-LRESULT WINAPI SendMessageTimeoutA(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD);
-LRESULT WINAPI SendMessageTimeoutW(HWND,UINT,WPARAM,LPARAM,UINT,UINT,PDWORD);
-LRESULT WINAPI SendMessageW(HWND,UINT,WPARAM,LPARAM);
-BOOL WINAPI SendNotifyMessageA(HWND,UINT,WPARAM,LPARAM);
-BOOL WINAPI SendNotifyMessageW(HWND,UINT,WPARAM,LPARAM);
-HWND WINAPI SetActiveWindow(HWND);
-HWND WINAPI SetCapture(HWND hWnd);
-BOOL WINAPI SetCaretBlinkTime(UINT);
-BOOL WINAPI SetCaretPos(int,int);
-DWORD WINAPI SetClassLongA(HWND,int,LONG);
-DWORD WINAPI SetClassLongW(HWND,int,LONG);
-WORD WINAPI SetClassWord(HWND,int,WORD);
-HANDLE WINAPI SetClipboardData(UINT,HANDLE);
-HWND WINAPI SetClipboardViewer(HWND);
-HCURSOR WINAPI SetCursor(HCURSOR);
-BOOL WINAPI SetCursorPos(int,int);
-VOID WINAPI SetDebugErrorLevel(DWORD);
-BOOL WINAPI SetDlgItemInt(HWND,int,UINT,BOOL);
-BOOL WINAPI SetDlgItemTextA(HWND,int,LPCSTR);
-BOOL WINAPI SetDlgItemTextW(HWND,int,LPCWSTR);
-BOOL WINAPI SetDoubleClickTime(UINT);
-HWND WINAPI SetFocus(HWND);
-BOOL WINAPI SetForegroundWindow(HWND);
-BOOL WINAPI SetKeyboardState(PBYTE);
-BOOL WINAPI SetMenu(HWND,HMENU);
-BOOL WINAPI SetMenuContextHelpId(HMENU,DWORD);
-BOOL WINAPI SetMenuDefaultItem(HMENU,UINT,UINT);
-BOOL WINAPI SetMenuInfo(HMENU,LPCMENUINFO);
-BOOL WINAPI SetMenuItemBitmaps(HMENU,UINT,UINT,HBITMAP,HBITMAP);
-BOOL WINAPI SetMenuItemInfoA(HMENU,UINT,BOOL,LPCMENUITEMINFOA);
-BOOL WINAPI SetMenuItemInfoW( HMENU,UINT,BOOL,LPCMENUITEMINFOW);
-LPARAM WINAPI SetMessageExtraInfo(LPARAM);
-BOOL WINAPI SetMessageQueue(int);
-HWND WINAPI SetParent(HWND,HWND);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI SetProcessDefaultLayout(DWORD);
-#endif /* (_WIN32_WINNT >= 0x0500) */
-BOOL WINAPI SetProcessWindowStation(HWINSTA);
-BOOL WINAPI SetPropA(HWND,LPCSTR,HANDLE);
-BOOL WINAPI SetPropW(HWND,LPCWSTR,HANDLE);
-BOOL WINAPI SetRect(LPRECT,int,int,int,int);
-BOOL WINAPI SetRectEmpty(LPRECT);
-int WINAPI SetScrollInfo(HWND,int,LPCSCROLLINFO,BOOL);
-int WINAPI SetScrollPos(HWND,int,int,BOOL);
-BOOL WINAPI SetScrollRange(HWND,int,int,int,BOOL);
-BOOL WINAPI SetSysColors(int,const INT *,const COLORREF *);
-#define SetSysModalWindow(h) (NULL)
-BOOL WINAPI SetSystemCursor(HCURSOR,DWORD);
-BOOL WINAPI SetThreadDesktop(HDESK);
-UINT WINAPI SetTimer(HWND,UINT,UINT,TIMERPROC);
-BOOL WINAPI SetUserObjectInformationA(HANDLE,int,PVOID,DWORD);
-BOOL WINAPI SetUserObjectInformationW(HANDLE,int,PVOID,DWORD);
-BOOL WINAPI SetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR);
-#if (WINVER >= 0x0500)
-HWINEVENTHOOK WINAPI SetWinEventHook(UINT,UINT,HMODULE,WINEVENTPROC,DWORD,DWORD,UINT);
-#endif
-BOOL WINAPI SetWindowContextHelpId(HWND,DWORD);
-LONG WINAPI SetWindowLongA(HWND,int,LONG);
-LONG WINAPI SetWindowLongW(HWND,int,LONG);
-#ifdef _WIN64
-LONG_PTR WINAPI SetWindowLongPtrA(HWND,int,LONG_PTR);
-LONG_PTR WINAPI SetWindowLongPtrW(HWND,int,LONG_PTR);
-#else
-#define SetWindowLongPtrA SetWindowLongA
-#define SetWindowLongPtrW SetWindowLongW
-#endif
-BOOL WINAPI SetWindowPlacement(HWND hWnd,const WINDOWPLACEMENT*);
-BOOL WINAPI SetWindowPos(HWND,HWND,int,int,int,int,UINT);
-int WINAPI SetWindowRgn(HWND,HRGN,BOOL);
-HOOKPROC WINAPI SetWindowsHookA(int,HOOKPROC);
-HHOOK WINAPI SetWindowsHookExA(int,HOOKPROC,HINSTANCE,DWORD);
-HHOOK WINAPI SetWindowsHookExW(int,HOOKPROC,HINSTANCE,DWORD);
-BOOL WINAPI SetWindowTextA(HWND,LPCSTR);
-BOOL WINAPI SetWindowTextW(HWND,LPCWSTR);
-WORD WINAPI SetWindowWord(HWND,int,WORD);
-BOOL WINAPI ShowCaret(HWND);
-int WINAPI ShowCursor(BOOL);
-BOOL WINAPI ShowOwnedPopups(HWND,BOOL);
-BOOL WINAPI ShowScrollBar(HWND,int,BOOL);
-BOOL WINAPI ShowWindow(HWND,int);
-BOOL WINAPI ShowWindowAsync(HWND,int);
-BOOL WINAPI SubtractRect(LPRECT,LPCRECT,LPCRECT);
-BOOL WINAPI SwapMouseButton(BOOL);
-BOOL WINAPI SwitchDesktop(HDESK);
-#if(_WIN32_WINNT >= 0x0500)
-VOID WINAPI SwitchToThisWindow(HWND,BOOL);
-#endif /* (_WIN32_WINNT >= 0x0500) */
-BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT);
-BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT);
-LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,LPINT,int);
-LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,LPINT,int);
-WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *);
-int WINAPI ToAscii(UINT,UINT,PBYTE,LPWORD,UINT);
-int WINAPI ToAsciiEx(UINT,UINT,PBYTE,LPWORD,UINT,HKL);
-int WINAPI ToUnicode(UINT,UINT,PBYTE,LPWSTR,int,UINT);
-int WINAPI ToUnicodeEx(UINT,UINT,PBYTE,LPWSTR,int,UINT,HKL);
-BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
-BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT);
-BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS);
-int WINAPI TranslateAcceleratorA(HWND,HACCEL,LPMSG);
-int WINAPI TranslateAcceleratorW(HWND,HACCEL,LPMSG);
-BOOL WINAPI TranslateMDISysAccel(HWND,LPMSG);
-BOOL WINAPI TranslateMessage(const MSG*);
-BOOL WINAPI UnhookWindowsHook(int,HOOKPROC);
-BOOL WINAPI UnhookWindowsHookEx(HHOOK);
-#if (WINVER >= 0x0500)
-BOOL WINAPI UnhookWinEvent(HWINEVENTHOOK);
-#endif
-BOOL WINAPI UnionRect(LPRECT,LPCRECT,LPCRECT);
-BOOL WINAPI UnloadKeyboardLayout(HKL);
-BOOL WINAPI UnregisterClassA(LPCSTR,HINSTANCE);
-BOOL WINAPI UnregisterClassW(LPCWSTR,HINSTANCE);
-BOOL WINAPI UnregisterHotKey(HWND,int);
-BOOL WINAPI UpdateWindow(HWND);
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI UserHandleGrantAccess(HANDLE,HANDLE,BOOL);
-#endif
-BOOL WINAPI ValidateRect(HWND,LPCRECT);
-BOOL WINAPI ValidateRgn(HWND,HRGN);
-SHORT WINAPI VkKeyScanA(CHAR);
-SHORT WINAPI VkKeyScanExA(CHAR,HKL);
-SHORT WINAPI VkKeyScanExW(WCHAR,HKL);
-SHORT WINAPI VkKeyScanW(WCHAR);
-DWORD WINAPI WaitForInputIdle(HANDLE,DWORD);
-BOOL WINAPI WaitMessage(void);
-HWND WINAPI WindowFromDC(HDC hDC);
-HWND WINAPI WindowFromPoint(POINT);
-UINT WINAPI WinExec(LPCSTR,UINT);
-BOOL WINAPI WinHelpA(HWND,LPCSTR,UINT,DWORD);
-BOOL WINAPI WinHelpW(HWND,LPCWSTR,UINT,DWORD);
-int WINAPIV wsprintfA(LPSTR,LPCSTR,...);
-int WINAPIV wsprintfW(LPWSTR,LPCWSTR,...);
-int WINAPI wvsprintfA(LPSTR,LPCSTR,va_list arglist);
-int WINAPI wvsprintfW(LPWSTR,LPCWSTR,va_list arglist);
-#if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490)
-BOOL WINAPI AllowSetForegroundWindow(DWORD);
-BOOL WINAPI LockSetForegroundWindow(UINT);
-#endif
-#if (_WIN32_WINNT >= 0x0500)
-BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD);
-#ifndef NOGDI
-BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD);
-#endif
-#endif
-#if (_WIN32_WINNT >= 0x0501)
-BOOL WINAPI GetLayeredWindowAttributes(HWND,COLORREF*,BYTE*,DWORD*);
-#endif
-#ifdef UNICODE
-#define EDITWORDBREAKPROC EDITWORDBREAKPROCW
-#define PROPENUMPROC PROPENUMPROCW
-#define PROPENUMPROCEX PROPENUMPROCEXW
-#define DEKSTOPENUMPROC DEKSTOPENUMPROCW
-#define WINSTAENUMPROC WINSTAENUMPROCW
-#define PROPENUMPROC PROPENUMPROCW
-#define PROPENUMPROCEX PROPENUMPROCEXW
-#define MAKEINTRESOURCE MAKEINTRESOURCEW
-typedef WNDCLASSW WNDCLASS,*LPWNDCLASS,*PWNDCLASS;
-typedef WNDCLASSEXW WNDCLASSEX,*LPWNDCLASSEX,*PWNDCLASSEX;
-typedef MENUITEMINFOW MENUITEMINFO,*LPMENUITEMINFO;
-typedef LPCMENUITEMINFOW LPCMENUITEMINFO;
-typedef MSGBOXPARAMSW MSGBOXPARAMS,*PMSGBOXPARAMS,*LPMSGBOXPARAMS;
-typedef HIGHCONTRASTW HIGHCONTRAST,*LPHIGHCONTRAST;
-typedef SERIALKEYSW SERIALKEYS,*LPSERIALKEYS;
-typedef SOUNDSENTRYW SOUNDSENTRY,*LPSOUNDSENTRY;
-typedef CREATESTRUCTW CREATESTRUCT, *LPCREATESTRUCT;
-typedef CBT_CREATEWNDW CBT_CREATEWND, *LPCBT_CREATEWND;
-typedef MDICREATESTRUCTW MDICREATESTRUCT,*LPMDICREATESTRUCT;
-typedef MULTIKEYHELPW MULTIKEYHELP,*PMULTIKEYHELP,*LPMULTIKEYHELP;
-typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
-#define AppendMenu AppendMenuW
-#define BroadcastSystemMessage BroadcastSystemMessageW
-#define BroadcastSystemMessageEx BroadcastSystemMessageExW
-#define CallWindowProc CallWindowProcW
-#define ChangeMenu ChangeMenuW
-#define CharLower CharLowerW
-#define CharLowerBuff CharLowerBuffW
-#define CharNext CharNextW
-#define CharNextEx CharNextExW
-#define CharPrev CharPrevW
-#define CharPrevEx CharPrevExW
-#define CharToOem CharToOemW
-#define CharToOemBuff CharToOemBuffW
-#define CharUpper CharUpperW
-#define CharUpperBuff CharUpperBuffW
-#define CopyAcceleratorTable CopyAcceleratorTableW
-#define CreateAcceleratorTable CreateAcceleratorTableW
-#define CreateDialog CreateDialogW
-#define CreateDialogIndirect CreateDialogIndirectW
-#define CreateDialogIndirectParam CreateDialogIndirectParamW
-#define CreateDialogParam CreateDialogParamW
-#define CreateMDIWindow CreateMDIWindowW
-#define CreateWindow CreateWindowW
-#define CreateWindowEx CreateWindowExW
-#define CreateWindowStation CreateWindowStationW
-#define DefDlgProc DefDlgProcW
-#define DefFrameProc DefFrameProcW
-#define DefMDIChildProc DefMDIChildProcW
-#define DefWindowProc DefWindowProcW
-#define DialogBox DialogBoxW
-#define DialogBoxIndirect DialogBoxIndirectW
-#define DialogBoxIndirectParam DialogBoxIndirectParamW
-#define DialogBoxParam DialogBoxParamW
-#define DispatchMessage DispatchMessageW
-#define DlgDirList DlgDirListW
-#define DlgDirListComboBox DlgDirListComboBoxW
-#define DlgDirSelectComboBoxEx DlgDirSelectComboBoxExW
-#define DlgDirSelectEx DlgDirSelectExW
-#define DrawState DrawStateW
-#define DrawText DrawTextW
-#define DrawTextEx DrawTextExW
-#define EnumDesktops EnumDesktopsW
-#define EnumProps EnumPropsW
-#define EnumPropsEx EnumPropsExW
-#define EnumWindowStations EnumWindowStationsW
-#define FindWindow FindWindowW
-#define FindWindowEx FindWindowExW
-#define GetClassInfo GetClassInfoW
-#define GetClassInfoEx GetClassInfoExW
-#define GetClassLong GetClassLongW
-#define GetClassName GetClassNameW
-#define GetClipboardFormatName GetClipboardFormatNameW
-#define GetDlgItemText GetDlgItemTextW
-#define GetKeyboardLayoutName GetKeyboardLayoutNameW
-#define GetKeyNameText GetKeyNameTextW
-#define GetMenuItemInfo GetMenuItemInfoW
-#define GetMenuString GetMenuStringW
-#define GetMessage GetMessageW
-#define GetMonitorInfo GetMonitorInfoW
-#define GetProp GetPropW
-#define GetRawInputDeviceInfo GetRawInputDeviceInfoW
-#define GetTabbedTextExtent GetTabbedTextExtentW
-#define GetUserObjectInformation GetUserObjectInformationW
-#define GetWindowLong GetWindowLongW
-#define GetWindowLongPtr GetWindowLongPtrW
-#define GetWindowText GetWindowTextW
-#define GetWindowTextLength GetWindowTextLengthW
-#define GetAltTabInfo GetAltTabInfoW
-#define GetWindowModuleFileName GetWindowModuleFileNameW
-#define GrayString GrayStringW
-#define InsertMenu InsertMenuW
-#define InsertMenuItem InsertMenuItemW
-#define IsCharAlpha IsCharAlphaW
-#define IsCharAlphaNumeric IsCharAlphaNumericW
-#define IsCharLower IsCharLowerW
-#define IsCharUpper IsCharUpperW
-#define IsDialogMessage IsDialogMessageW
-#define LoadAccelerators LoadAcceleratorsW
-#define LoadBitmap LoadBitmapW
-#define LoadCursor LoadCursorW
-#define LoadCursorFromFile LoadCursorFromFileW
-#define LoadIcon LoadIconW
-#define LoadImage LoadImageW
-#define LoadKeyboardLayout LoadKeyboardLayoutW
-#define LoadMenu LoadMenuW
-#define LoadMenuIndirect LoadMenuIndirectW
-#define LoadString LoadStringW
-#define MapVirtualKey MapVirtualKeyW
-#define MapVirtualKeyEx MapVirtualKeyExW
-#define MessageBox MessageBoxW
-#define MessageBoxEx MessageBoxExW
-#define MessageBoxIndirect MessageBoxIndirectW
-#define ModifyMenu ModifyMenuW
-#define OemToChar OemToCharW
-#define OemToCharBuff OemToCharBuffW
-#define OpenDesktop OpenDesktopW
-#define OpenWindowStation OpenWindowStationW
-#define PeekMessage PeekMessageW
-#define PostAppMessage PostAppMessageW
-#define PostMessage PostMessageW
-#define PostThreadMessage PostThreadMessageW
-#define RealGetWindowClass RealGetWindowClassW
-#define RegisterClass RegisterClassW
-#define RegisterClassEx RegisterClassExW
-#define RegisterClipboardFormat RegisterClipboardFormatW
-#define RegisterDeviceNotification RegisterDeviceNotificationW
-#define RegisterWindowMessage RegisterWindowMessageW
-#define RemoveProp RemovePropW
-#define SendDlgItemMessage SendDlgItemMessageW
-#define SendMessage SendMessageW
-#define SendMessageCallback SendMessageCallbackW
-#define SendMessageTimeout SendMessageTimeoutW
-#define SendNotifyMessage SendNotifyMessageW
-#define SetClassLong SetClassLongW
-#define SetDlgItemText SetDlgItemTextW
-#define SetMenuItemInfo SetMenuItemInfoW
-#define SetProp SetPropW
-#define SetUserObjectInformation SetUserObjectInformationW
-#define SetWindowLong SetWindowLongW
-#define SetWindowLongPtr SetWindowLongPtrW
-#define SetWindowsHook SetWindowsHookW
-#define SetWindowsHookEx SetWindowsHookExW
-#define SetWindowText SetWindowTextW
-#define SystemParametersInfo SystemParametersInfoW
-#define TabbedTextOut TabbedTextOutW
-#define TranslateAccelerator TranslateAcceleratorW
-#define UnregisterClass UnregisterClassW
-#define VkKeyScan VkKeyScanW
-#define VkKeyScanEx VkKeyScanExW
-#define WinHelp WinHelpW
-#define wsprintf wsprintfW
-#define wvsprintf wvsprintfW
-#ifndef NOGDI
-typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
-typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
-#define ChangeDisplaySettings ChangeDisplaySettingsW
-#define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
-#define CreateDesktop CreateDesktopW
-#define EnumDisplaySettings EnumDisplaySettingsW
-#define EnumDisplaySettingsEx EnumDisplaySettingsExW
-#define EnumDisplayDevices EnumDisplayDevicesW
-#endif /* NOGDI */
-#else /* UNICODE */
-#define EDITWORDBREAKPROC EDITWORDBREAKPROCA
-#define PROPENUMPROC PROPENUMPROCA
-#define PROPENUMPROCEX PROPENUMPROCEXA
-#define DEKSTOPENUMPROC DEKSTOPENUMPROCA
-#define WINSTAENUMPROC WINSTAENUMPROCA
-#define PROPENUMPROC PROPENUMPROCA
-#define PROPENUMPROCEX PROPENUMPROCEXA
-#define MAKEINTRESOURCE MAKEINTRESOURCEA
-typedef WNDCLASSA WNDCLASS,*LPWNDCLASS,*PWNDCLASS;
-typedef WNDCLASSEXA WNDCLASSEX,*LPWNDCLASSEX,*PWNDCLASSEX;
-typedef MENUITEMINFOA MENUITEMINFO,*LPMENUITEMINFO;
-typedef LPCMENUITEMINFOA LPCMENUITEMINFO;
-typedef MSGBOXPARAMSA MSGBOXPARAMS,*PMSGBOXPARAMS,*LPMSGBOXPARAMS;
-typedef HIGHCONTRASTA HIGHCONTRAST,*LPHIGHCONTRAST;
-typedef SERIALKEYSA SERIALKEYS,*LPSERIALKEYS;
-typedef SOUNDSENTRYA SOUNDSENTRY,*LPSOUNDSENTRY;
-typedef CREATESTRUCTA CREATESTRUCT, *LPCREATESTRUCT;
-typedef CBT_CREATEWNDA CBT_CREATEWND, *LPCBT_CREATEWND;
-typedef MDICREATESTRUCTA MDICREATESTRUCT,*LPMDICREATESTRUCT;
-typedef MULTIKEYHELPA MULTIKEYHELP,*PMULTIKEYHELP,*LPMULTIKEYHELP;
-typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
-#define AppendMenu AppendMenuA
-#define BroadcastSystemMessage BroadcastSystemMessageA
-#define BroadcastSystemMessageEx BroadcastSystemMessageExA
-#define CallWindowProc CallWindowProcA
-#define ChangeMenu ChangeMenuA
-#define CharLower CharLowerA
-#define CharLowerBuff CharLowerBuffA
-#define CharNext CharNextA
-#define CharNextEx CharNextExA
-#define CharPrev CharPrevA
-#define CharPrevEx CharPrevExA
-#define CharToOem CharToOemA
-#define CharToOemBuff CharToOemBuffA
-#define CharUpper CharUpperA
-#define CharUpperBuff CharUpperBuffA
-#define CopyAcceleratorTable CopyAcceleratorTableA
-#define CreateAcceleratorTable CreateAcceleratorTableA
-#define CreateDialog CreateDialogA
-#define CreateDialogIndirect CreateDialogIndirectA
-#define CreateDialogIndirectParam CreateDialogIndirectParamA
-#define CreateDialogParam CreateDialogParamA
-#define CreateMDIWindow CreateMDIWindowA
-#define CreateWindow CreateWindowA
-#define CreateWindowEx CreateWindowExA
-#define CreateWindowStation CreateWindowStationA
-#define DefDlgProc DefDlgProcA
-#define DefFrameProc DefFrameProcA
-#define DefMDIChildProc DefMDIChildProcA
-#define DefWindowProc DefWindowProcA
-#define DialogBox DialogBoxA
-#define DialogBoxIndirect DialogBoxIndirectA
-#define DialogBoxIndirectParam DialogBoxIndirectParamA
-#define DialogBoxParam DialogBoxParamA
-#define DispatchMessage DispatchMessageA
-#define DlgDirList DlgDirListA
-#define DlgDirListComboBox DlgDirListComboBoxA
-#define DlgDirSelectComboBoxEx DlgDirSelectComboBoxExA
-#define DlgDirSelectEx DlgDirSelectExA
-#define DrawState DrawStateA
-#define DrawText DrawTextA
-#define DrawTextEx DrawTextExA
-#define EnumDesktops EnumDesktopsA
-#define EnumProps EnumPropsA
-#define EnumPropsEx EnumPropsExA
-#define EnumWindowStations EnumWindowStationsA
-#define FindWindow FindWindowA
-#define FindWindowEx FindWindowExA
-#define GetClassInfo GetClassInfoA
-#define GetClassInfoEx GetClassInfoExA
-#define GetClassLong GetClassLongA
-#define GetClassName GetClassNameA
-#define GetClipboardFormatName GetClipboardFormatNameA
-#define GetDlgItemText GetDlgItemTextA
-#define GetKeyboardLayoutName GetKeyboardLayoutNameA
-#define GetKeyNameText GetKeyNameTextA
-#define GetMenuItemInfo GetMenuItemInfoA
-#define GetMenuString GetMenuStringA
-#define GetMessage GetMessageA
-#define GetMonitorInfo GetMonitorInfoA
-#define GetProp GetPropA
-#define GetRawInputDeviceInfo GetRawInputDeviceInfoA
-#define GetTabbedTextExtent GetTabbedTextExtentA
-#define GetUserObjectInformation GetUserObjectInformationA
-#define GetWindowLong GetWindowLongA
-#define GetWindowLongPtr GetWindowLongPtrA
-#define GetWindowText GetWindowTextA
-#define GetWindowTextLength GetWindowTextLengthA
-#define GetAltTabInfo GetAltTabInfoA
-#define GetWindowModuleFileName GetWindowModuleFileNameA
-#define GrayString GrayStringA
-#define InsertMenu InsertMenuA
-#define InsertMenuItem InsertMenuItemA
-#define IsCharAlpha IsCharAlphaA
-#define IsCharAlphaNumeric IsCharAlphaNumericA
-#define IsCharLower IsCharLowerA
-#define IsCharUpper IsCharUpperA
-#define IsDialogMessage IsDialogMessageA
-#define LoadAccelerators LoadAcceleratorsA
-#define LoadBitmap LoadBitmapA
-#define LoadCursor LoadCursorA
-#define LoadIcon LoadIconA
-#define LoadCursorFromFile LoadCursorFromFileA
-#define LoadImage LoadImageA
-#define LoadKeyboardLayout LoadKeyboardLayoutA
-#define LoadMenu LoadMenuA
-#define LoadMenuIndirect LoadMenuIndirectA
-#define LoadString LoadStringA
-#define MapVirtualKey MapVirtualKeyA
-#define MapVirtualKeyEx MapVirtualKeyExA
-#define MessageBox MessageBoxA
-#define MessageBoxEx MessageBoxExA
-#define MessageBoxIndirect MessageBoxIndirectA
-#define ModifyMenu ModifyMenuA
-#define OemToChar OemToCharA
-#define OemToCharBuff OemToCharBuffA
-#define OpenDesktop OpenDesktopA
-#define OpenWindowStation OpenWindowStationA
-#define PeekMessage PeekMessageA
-#define PostAppMessage PostAppMessageA
-#define PostMessage PostMessageA
-#define PostThreadMessage PostThreadMessageA
-#define RealGetWindowClass RealGetWindowClassA
-#define RegisterClass RegisterClassA
-#define RegisterClassEx RegisterClassExA
-#define RegisterClipboardFormat RegisterClipboardFormatA
-#define RegisterDeviceNotification RegisterDeviceNotificationA
-#define RegisterWindowMessage RegisterWindowMessageA
-#define RemoveProp RemovePropA
-#define SendDlgItemMessage SendDlgItemMessageA
-#define SendMessage SendMessageA
-#define SendMessageCallback SendMessageCallbackA
-#define SendMessageTimeout SendMessageTimeoutA
-#define SendNotifyMessage SendNotifyMessageA
-#define SetClassLong SetClassLongA
-#define SetDlgItemText SetDlgItemTextA
-#define SetMenuItemInfo SetMenuItemInfoA
-#define SetProp SetPropA
-#define SetUserObjectInformation SetUserObjectInformationA
-#define SetWindowLong SetWindowLongA
-#define SetWindowLongPtr SetWindowLongPtrA
-#define SetWindowsHook SetWindowsHookA
-#define SetWindowsHookEx SetWindowsHookExA
-#define SetWindowText SetWindowTextA
-#define SystemParametersInfo SystemParametersInfoA
-#define TabbedTextOut TabbedTextOutA
-#define TranslateAccelerator TranslateAcceleratorA
-#define UnregisterClass UnregisterClassA
-#define VkKeyScan VkKeyScanA
-#define VkKeyScanEx VkKeyScanExA
-#define WinHelp WinHelpA
-#define wsprintf wsprintfA
-#define wvsprintf wvsprintfA
-#ifndef NOGDI
-typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
-typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
-#define ChangeDisplaySettings ChangeDisplaySettingsA
-#define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
-#define CreateDesktop CreateDesktopA
-#define EnumDisplaySettings EnumDisplaySettingsA
-#define EnumDisplaySettingsEx EnumDisplaySettingsExA
-#define EnumDisplayDevices EnumDisplayDevicesA
-#endif /* NOGDI */
-#endif /* UNICODE */
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/winver.h b/winsup/w32api/include/winver.h
deleted file mode 100644
index 913a35561..000000000
--- a/winsup/w32api/include/winver.h
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef _WINVER_H
-#define _WINVER_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#define VS_FILE_INFO RT_VERSION
-#define VS_VERSION_INFO 1
-#define VS_USER_DEFINED 100
-#define VS_FFI_SIGNATURE 0xFEEF04BD
-#define VS_FFI_STRUCVERSION 0x10000
-#define VS_FFI_FILEFLAGSMASK 0x3F
-#define VS_FF_DEBUG 1
-#define VS_FF_PRERELEASE 2
-#define VS_FF_PATCHED 4
-#define VS_FF_PRIVATEBUILD 8
-#define VS_FF_INFOINFERRED 16
-#define VS_FF_SPECIALBUILD 32
-#define VOS_UNKNOWN 0
-#define VOS_DOS 0x10000
-#define VOS_OS216 0x20000
-#define VOS_OS232 0x30000
-#define VOS_NT 0x40000
-#define VOS__BASE 0
-#define VOS__WINDOWS16 1
-#define VOS__PM16 2
-#define VOS__PM32 3
-#define VOS__WINDOWS32 4
-#define VOS_DOS_WINDOWS16 0x10001
-#define VOS_DOS_WINDOWS32 0x10004
-#define VOS_OS216_PM16 0x20002
-#define VOS_OS232_PM32 0x30003
-#define VOS_NT_WINDOWS32 0x40004
-#define VFT_UNKNOWN 0
-#define VFT_APP 1
-#define VFT_DLL 2
-#define VFT_DRV 3
-#define VFT_FONT 4
-#define VFT_VXD 5
-#define VFT_STATIC_LIB 7
-#define VFT2_UNKNOWN 0
-#define VFT2_DRV_PRINTER 1
-#define VFT2_DRV_KEYBOARD 2
-#define VFT2_DRV_LANGUAGE 3
-#define VFT2_DRV_DISPLAY 4
-#define VFT2_DRV_MOUSE 5
-#define VFT2_DRV_NETWORK 6
-#define VFT2_DRV_SYSTEM 7
-#define VFT2_DRV_INSTALLABLE 8
-#define VFT2_DRV_SOUND 9
-#define VFT2_DRV_COMM 10
-#define VFT2_DRV_INPUTMETHOD 11
-#define VFT2_FONT_RASTER 1
-#define VFT2_FONT_VECTOR 2
-#define VFT2_FONT_TRUETYPE 3
-#define VFFF_ISSHAREDFILE 1
-#define VFF_CURNEDEST 1
-#define VFF_FILEINUSE 2
-#define VFF_BUFFTOOSMALL 4
-#define VIFF_FORCEINSTALL 1
-#define VIFF_DONTDELETEOLD 2
-#define VIF_TEMPFILE 1
-#define VIF_MISMATCH 2
-#define VIF_SRCOLD 4
-#define VIF_DIFFLANG 8
-#define VIF_DIFFCODEPG 16
-#define VIF_DIFFTYPE 32
-#define VIF_WRITEPROT 64
-#define VIF_FILEINUSE 128
-#define VIF_OUTOFSPACE 256
-#define VIF_ACCESSVIOLATION 512
-#define VIF_SHARINGVIOLATION 1024
-#define VIF_CANNOTCREATE 2048
-#define VIF_CANNOTDELETE 4096
-#define VIF_CANNOTRENAME 8192
-#define VIF_CANNOTDELETECUR 16384
-#define VIF_OUTOFMEMORY 32768
-#define VIF_CANNOTREADSRC  65536
-#define VIF_CANNOTREADDST 0x20000
-#define VIF_BUFFTOOSMALL 0x40000
-#ifndef RC_INVOKED
-typedef struct tagVS_FIXEDFILEINFO {
-	DWORD dwSignature;
-	DWORD dwStrucVersion;
-	DWORD dwFileVersionMS;
-	DWORD dwFileVersionLS;
-	DWORD dwProductVersionMS;
-	DWORD dwProductVersionLS;
-	DWORD dwFileFlagsMask;
-	DWORD dwFileFlags;
-	DWORD dwFileOS;
-	DWORD dwFileType;
-	DWORD dwFileSubtype;
-	DWORD dwFileDateMS;
-	DWORD dwFileDateLS;
-} VS_FIXEDFILEINFO;
-DWORD WINAPI VerFindFileA(DWORD,LPSTR,LPSTR,LPSTR,LPSTR,PUINT,LPSTR,PUINT);
-DWORD WINAPI VerFindFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT);
-DWORD WINAPI VerInstallFileA(DWORD,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,PUINT);
-DWORD WINAPI VerInstallFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT);
-DWORD WINAPI GetFileVersionInfoSizeA(LPSTR,PDWORD);
-DWORD WINAPI GetFileVersionInfoSizeW(LPWSTR,PDWORD);
-BOOL WINAPI GetFileVersionInfoA(LPSTR,DWORD,DWORD,PVOID);
-BOOL WINAPI GetFileVersionInfoW(LPWSTR,DWORD,DWORD,PVOID);
-DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD);
-DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD);
-BOOL WINAPI VerQueryValueA(const LPVOID,LPSTR,LPVOID*,PUINT);
-BOOL WINAPI VerQueryValueW(const LPVOID,LPWSTR,LPVOID*,PUINT);
-#ifdef UNICODE
-#define VerFindFile VerFindFileW
-#define VerQueryValue VerQueryValueW
-#define VerInstallFile VerInstallFileW
-#define GetFileVersionInfoSize GetFileVersionInfoSizeW
-#define GetFileVersionInfo GetFileVersionInfoW
-#define VerLanguageName VerLanguageNameW
-#define VerQueryValue VerQueryValueW
-#else
-#define VerQueryValue VerQueryValueA
-#define VerFindFile VerFindFileA
-#define VerInstallFile VerInstallFileA
-#define GetFileVersionInfoSize GetFileVersionInfoSizeA
-#define GetFileVersionInfo GetFileVersionInfoA
-#define VerLanguageName VerLanguageNameA
-#define VerQueryValue VerQueryValueA
-#endif
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/ws2spi.h b/winsup/w32api/include/ws2spi.h
deleted file mode 100644
index 49b7c4afc..000000000
--- a/winsup/w32api/include/ws2spi.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * ws2spi.h
- *
- * Winsock 2 Service Provider interface.
- *
- *
- * THIS SOFTWARE IS NOT COPYRIGHTED
- *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
- *
- * This code is distributed in the hope that it will be useful but
- * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
- * DISCLAIMED. This includes but is not limited to warranties of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-#ifndef _WS2SPI_H
-#define _WS2SPI_H
-
-#include <winsock2.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define WSPAPI WSAAPI
-#define WSPDESCRIPTION_LEN 255
-
-#ifndef RC_INVOKED
-
-typedef struct WSPData {
-	WORD wVersion;
-	WORD wHighVersion;
-	WCHAR szDescription[WSPDESCRIPTION_LEN+1];
-} WSPDATA, FAR *LPWSPDATA;
-typedef struct _WSATHREADID {
-	HANDLE ThreadHandle;
-	DWORD Reserved;
-} WSATHREADID, FAR *LPWSATHREADID;
-
-typedef BOOL (CALLBACK FAR *LPBLOCKINGCALLBACK)(DWORD);
-typedef VOID (CALLBACK FAR *LPWSAUSERAPC)(DWORD);
-
-/* Prototypes for service provider procedure table */
-typedef SOCKET (WSPAPI *LPWSPACCEPT)(SOCKET,LPSOCKADDR,LPINT,LPCONDITIONPROC,DWORD,LPINT);
-typedef INT (WSPAPI *LPWSPADDRESSTOSTRING)(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD,LPINT);
-typedef INT (WSPAPI *LPWSPASYNCSELECT)(SOCKET,HWND,UINT,LONG,LPINT);
-typedef INT (WSPAPI *LPWSPBIND)(SOCKET,const struct sockaddr*,INT,LPINT);
-typedef INT (WSPAPI *LPWSPCANCELBLOCKINGCALL)(LPINT);
-typedef INT (WSPAPI *LPWSPCLEANUP)(LPINT);
-typedef INT (WSPAPI *LPWSPCLOSESOCKET)(SOCKET,LPINT);
-typedef INT (WSPAPI *LPWSPCONNECT)(SOCKET,const struct sockaddr*,INT,LPWSABUF,LPWSABUF,LPQOS,LPQOS,LPINT);
-typedef INT (WSPAPI *LPWSPDUPLICATESOCKET)(SOCKET,DWORD,LPWSAPROTOCOL_INFOW,LPINT);
-typedef INT (WSPAPI *LPWSPENUMNETWORKEVENTS)(SOCKET,WSAEVENT,LPWSANETWORKEVENTS,LPINT);
-typedef INT (WSPAPI *LPWSPEVENTSELECT)(SOCKET,WSAEVENT,LONG,LPINT);
-typedef BOOL (WSPAPI *LPWSPGETOVERLAPPEDRESULT)(SOCKET,LPWSAOVERLAPPED,LPDWORD,BOOL,LPDWORD,LPINT);
-typedef INT (WSPAPI *LPWSPGETPEERNAME)(SOCKET,LPSOCKADDR,LPINT,LPINT);
-typedef BOOL (WSPAPI *LPWSPGETQOSBYNAME)(SOCKET,LPWSABUF,LPQOS,LPINT);
-typedef INT (WSPAPI *LPWSPGETSOCKNAME)(SOCKET,LPSOCKADDR,LPINT,LPINT);
-typedef INT (WSPAPI *LPWSPGETSOCKOPT)(SOCKET,INT,INT,CHAR FAR*,LPINT,LPINT);
-typedef INT (WSPAPI *LPWSPIOCTL)(SOCKET,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,
-	     LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT);
-typedef SOCKET (WSPAPI *LPWSPJOINLEAF)(SOCKET,const struct sockaddr*,INT,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD,LPINT);
-typedef INT (WSPAPI *LPWSPLISTEN)(SOCKET,INT,LPINT);
-typedef INT (WSPAPI *LPWSPRECV)(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD,
-LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT);
-typedef INT (WSPAPI *LPWSPRECVDISCONNECT)(SOCKET,LPWSABUF,LPINT);
-typedef INT (WSPAPI *LPWSPRECVFROM)(SOCKET,LPWSABUF,DWORD,LPDWORD,LPDWORD,LPSOCKADDR,
-LPINT,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT);
-typedef INT (WSPAPI *LPWSPSELECT)(INT,LPFD_SET,LPFD_SET,LPFD_SET,CONST LPTIMEVAL,LPINT);
-typedef INT (WSPAPI *LPWSPSEND)(SOCKET,LPWSABUF,DWORD,LPDWORD,DWORD,
-LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT);
-typedef INT (WSPAPI *LPWSPSENDDISCONNECT)(SOCKET,LPWSABUF,LPINT);
-typedef INT (WSPAPI *LPWSPSENDTO)(SOCKET,LPWSABUF,DWORD,LPDWORD,DWORD,const struct sockaddr*,
-	     INT,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPWSATHREADID,LPINT);
-typedef INT (WSPAPI *LPWSPSETSOCKOPT)(SOCKET,INT,INT,CONST CHAR FAR*,INT,LPINT);
-typedef INT (WSPAPI *LPWSPSHUTDOWN)(SOCKET,INT,LPINT);
-typedef SOCKET (WSPAPI *LPWSPSOCKET)(INT,INT,INT,LPWSAPROTOCOL_INFOW,GROUP,DWORD,LPINT);
-typedef INT (WSPAPI *LPWSPSTRINGTOADDRESS)(LPWSTR,INT,LPWSAPROTOCOL_INFOW,LPSOCKADDR,LPINT,LPINT);
-
-/* Service provider procedure table */
-typedef struct _WSPPROC_TABLE {
-  LPWSPACCEPT lpWSPAccept;
-  LPWSPADDRESSTOSTRING lpWSPAddressToString;
-  LPWSPASYNCSELECT lpWSPAsyncSelect;
-  LPWSPBIND lpWSPBind;
-  LPWSPCANCELBLOCKINGCALL lpWSPCancelBlockingCall;
-  LPWSPCLEANUP lpWSPCleanup;
-  LPWSPCLOSESOCKET lpWSPCloseSocket;
-  LPWSPCONNECT lpWSPConnect;
-  LPWSPDUPLICATESOCKET lpWSPDuplicateSocket;
-  LPWSPENUMNETWORKEVENTS lpWSPEnumNetworkEvents;
-  LPWSPEVENTSELECT lpWSPEventSelect;
-  LPWSPGETOVERLAPPEDRESULT lpWSPGetOverlappedResult;
-  LPWSPGETPEERNAME lpWSPGetPeerName;
-  LPWSPGETSOCKNAME lpWSPGetSockName;
-  LPWSPGETSOCKOPT lpWSPGetSockOpt;
-  LPWSPGETQOSBYNAME lpWSPGetQOSByName;
-  LPWSPIOCTL lpWSPIoctl;
-  LPWSPJOINLEAF lpWSPJoinLeaf;
-  LPWSPLISTEN lpWSPListen;
-  LPWSPRECV lpWSPRecv;
-  LPWSPRECVDISCONNECT lpWSPRecvDisconnect;
-  LPWSPRECVFROM lpWSPRecvFrom;
-  LPWSPSELECT lpWSPSelect;
-  LPWSPSEND lpWSPSend;
-  LPWSPSENDDISCONNECT lpWSPSendDisconnect;
-  LPWSPSENDTO lpWSPSendTo;
-  LPWSPSETSOCKOPT lpWSPSetSockOpt;
-  LPWSPSHUTDOWN lpWSPShutdown;
-  LPWSPSOCKET lpWSPSocket;
-  LPWSPSTRINGTOADDRESS lpWSPStringToAddress;
-} WSPPROC_TABLE, FAR* LPWSPPROC_TABLE;
-
-/* Prototypes for service provider upcall procedure table */
-typedef BOOL (WSPAPI *LPWPUCLOSEEVENT)(WSAEVENT,LPINT);
-typedef INT (WSPAPI *LPWPUCLOSESOCKETHANDLE)(SOCKET,LPINT);
-typedef INT (WSPAPI *LPWPUCLOSETHREAD)(LPWSATHREADID,LPINT);
-typedef WSAEVENT (WSPAPI *LPWPUCREATEEVENT)(LPINT);
-typedef SOCKET (WSPAPI *LPWPUCREATESOCKETHANDLE)(DWORD,DWORD,LPINT);
-typedef SOCKET (WSPAPI *LPWPUFDISSET)(SOCKET,LPFD_SET);
-typedef INT (WSPAPI *LPWPUGETPROVIDERPATH)(LPGUID,LPWSTR,LPINT,LPINT);
-typedef SOCKET (WSPAPI *LPWPUMODIFYIFSHANDLE)(DWORD,SOCKET,LPINT);
-typedef INT (WSPAPI *LPWPUOPENCURRENTTHREAD)(LPWSATHREADID,LPINT);
-typedef BOOL (WSPAPI *LPWPUPOSTMESSAGE)(HWND,UINT,WPARAM,LPARAM);
-typedef INT (WSPAPI *LPWPUQUERYBLOCKINGCALLBACK)(DWORD,LPBLOCKINGCALLBACK FAR*,LPDWORD,LPINT);
-typedef INT (WSPAPI *LPWPUQUERYSOCKETHANDLECONTEXT)(SOCKET,LPDWORD,LPINT);
-typedef INT (WSPAPI *LPWPUQUEUEAPC)(LPWSATHREADID,LPWSAUSERAPC,DWORD,LPINT);
-typedef BOOL (WSPAPI *LPWPURESETEVENT)(WSAEVENT,LPINT);
-typedef BOOL (WSPAPI *LPWPUSETEVENT)(WSAEVENT,LPINT);
-/* Available only directly from the DLL */
-typedef INT (WSPAPI *LPWPUCOMPLETEOVERLAPPEDREQUEST)(SOCKET,LPWSAOVERLAPPED,DWORD,DWORD,LPINT);
-
-/* Service Provider upcall table */
-typedef struct _WSPUPCALLTABLE {
-	LPWPUCLOSEEVENT lpWPUCloseEvent;
-	LPWPUCLOSESOCKETHANDLE lpWPUCloseSocketHandle;
-	LPWPUCREATEEVENT lpWPUCreateEvent;
-	LPWPUCREATESOCKETHANDLE lpWPUCreateSocketHandle;
-	LPWPUFDISSET lpWPUFDIsSet;
-	LPWPUGETPROVIDERPATH lpWPUGetProviderPath;
-	LPWPUMODIFYIFSHANDLE lpWPUModifyIFSHandle;
-	LPWPUPOSTMESSAGE lpWPUPostMessage;
-	LPWPUQUERYBLOCKINGCALLBACK lpWPUQueryBlockingCallback;
-	LPWPUQUERYSOCKETHANDLECONTEXT lpWPUQuerySocketHandleContext;
-	LPWPUQUEUEAPC lpWPUQueueApc;
-	LPWPURESETEVENT lpWPUResetEvent;
-	LPWPUSETEVENT lpWPUSetEvent;
-	LPWPUOPENCURRENTTHREAD lpWPUOpenCurrentThread;
-	LPWPUCLOSETHREAD lpWPUCloseThread;
-} WSPUPCALLTABLE, FAR* LPWSPUPCALLTABLE;
-
-typedef INT (WSPAPI *LPWSPSTARTUP)(WORD,LPWSPDATA,LPWSAPROTOCOL_INFOW,WSPUPCALLTABLE,LPWSPPROC_TABLE);
-
-/* Prototypes for service provider namespace procedure table */
-typedef INT (WSPAPI *LPNSPCLEANUP)(LPGUID);
-typedef INT (WSPAPI *LPNSPGETSERVICECLASSINFO)(LPGUID,LPDWORD,LPWSASERVICECLASSINFOW);
-typedef INT (WSPAPI *LPNSPINSTALLSERVICECLASS)(LPGUID,LPWSASERVICECLASSINFOW);
-typedef INT (WSPAPI *LPNSPLOOKUPSERVICEBEGIN)(LPGUID,LPWSAQUERYSETW,LPWSASERVICECLASSINFOW,DWORD,LPHANDLE);
-typedef INT (WSPAPI *LPNSPLOOKUPSERVICEEND)(HANDLE);
-typedef INT (WSPAPI *LPNSPLOOKUPSERVICENEXT)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSET);
-typedef INT (WSPAPI *LPNSPREMOVESERVICECLASS)(LPGUID,LPGUID);
-typedef INT (WSPAPI *LPNSPSETSERVICE)(LPGUID,LPWSASERVICECLASSINFOW,LPWSAQUERYSETW,WSAESETSERVICEOP,DWORD);
-
-typedef struct _NSP_ROUTINE {
-  DWORD cbSize;
-  DWORD dwMajorVersion;
-  DWORD dwMinorVersion;
-  LPNSPCLEANUP NSPCleanup;
-  LPNSPLOOKUPSERVICEBEGIN NSPLookupServiceBegin;
-  LPNSPLOOKUPSERVICENEXT NSPLookupServiceNext;
-  LPNSPLOOKUPSERVICEEND NSPLookupServiceEnd;
-  LPNSPSETSERVICE NSPSetService;
-  LPNSPINSTALLSERVICECLASS NSPInstallServiceClass;
-  LPNSPREMOVESERVICECLASS NSPRemoveServiceClass;
-  LPNSPGETSERVICECLASSINFO NSPGetServiceClassInfo;
-} NSP_ROUTINE, *PNSP_ROUTINE, *LPNSP_ROUTINE; 
-
-INT WSPAPI NSPStartup(LPGUID,LPNSP_ROUTINE);
-
-/* WinSock 2 DLL function prototypes */
-INT WSPAPI WPUCompleteOverlappedRequest(SOCKET,LPWSAOVERLAPPED,DWORD,DWORD,LPINT);
-INT WSPAPI WSPStartup(WORD,LPWSPDATA,LPWSAPROTOCOL_INFOW,WSPUPCALLTABLE,LPWSPPROC_TABLE);
-INT WSPAPI WSCDeinstallProvider(LPGUID,LPINT);
-INT WSPAPI WSCEnumProtocols(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD,LPINT);
-INT WSPAPI WSCGetProviderPath(LPGUID,LPWSTR,LPINT,LPINT);
-INT WSPAPI WSCInstallProvider(CONST LPGUID,CONST LPWSTR,CONST LPWSAPROTOCOL_INFOW,DWORD,LPINT);
-INT WSPAPI WSCEnableNSProvider(LPGUID,BOOL);
-INT WSPAPI WSCInstallNameSpace(LPWSTR,LPWSTR,DWORD,DWORD,LPGUID);
-INT WSPAPI WSCUnInstallNameSpace(LPGUID);
-INT WSPAPI WSCWriteProviderOrder(LPDWORD,DWORD);
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _WS2SPI_H */
diff --git a/winsup/w32api/include/ws2tcpip.h b/winsup/w32api/include/ws2tcpip.h
deleted file mode 100644
index ac66fb0be..000000000
--- a/winsup/w32api/include/ws2tcpip.h
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- *  ws2tcpip.h : TCP/IP specific extensions in Windows Sockets 2
- *
- * Portions Copyright (c) 1980, 1983, 1988, 1993
- * The Regents of the University of California.  All rights reserved.
- *
- */
-
-#ifndef _WS2TCPIP_H
-#define _WS2TCPIP_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#if (defined _WINSOCK_H && !defined _WINSOCK2_H)
-#error "ws2tcpip.h is not compatable with winsock.h. Include winsock2.h instead."
-#endif
-
-#include <winsock2.h>
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* 
- * The IP_* macros are also defined in winsock.h, but some values are different there.
- * The values defined in winsock.h for 1.1 and used in wsock32.dll are consistent
- * with the original values Steve Deering defined in his document "IP Multicast Extensions
- * for 4.3BSD UNIX related systems (MULTICAST 1.2 Release)." However, these conflicted with
- * the definitions for some IPPROTO_IP level socket options already assigned by BSD,
- * so Berkeley changed all the values by adding 7.  WinSock2 (ws2_32.dll)  uses
- * the BSD 4.4 compatible values defined here.
- *
- * See also: msdn kb article Q257460
- * http://support.microsoft.com/support/kb/articles/Q257/4/60.asp
- */
-
-/* This is also defined in winsock.h; value hasn't changed */
-#define	IP_OPTIONS  1
-
-#define	IP_HDRINCL  2
-/*
- * These are also be defined in winsock.h,
- * but values have changed for WinSock2 interface
- */
-#define IP_TOS			3   /* old (winsock 1.1) value 8 */
-#define IP_TTL			4   /* old value 7 */
-#define IP_MULTICAST_IF		9   /* old value 2 */
-#define IP_MULTICAST_TTL	10  /* old value 3 */
-#define IP_MULTICAST_LOOP	11  /* old value 4 */
-#define IP_ADD_MEMBERSHIP	12  /* old value 5 */
-#define IP_DROP_MEMBERSHIP	13  /* old value 6 */
-#define IP_DONTFRAGMENT		14  /* old value 9 */
-#define IP_ADD_SOURCE_MEMBERSHIP	15
-#define IP_DROP_SOURCE_MEMBERSHIP	16
-#define IP_BLOCK_SOURCE			17
-#define IP_UNBLOCK_SOURCE		18
-#define IP_PKTINFO			19
-
-/*
- * As with BSD implementation, IPPROTO_IPV6 level socket options have
- * same values as IPv4 counterparts.
- */
-#define IPV6_UNICAST_HOPS	4
-#define IPV6_MULTICAST_IF	9
-#define IPV6_MULTICAST_HOPS	10
-#define IPV6_MULTICAST_LOOP	11
-#define IPV6_ADD_MEMBERSHIP	12
-#define IPV6_DROP_MEMBERSHIP	13
-#define IPV6_JOIN_GROUP		IPV6_ADD_MEMBERSHIP
-#define IPV6_LEAVE_GROUP	IPV6_DROP_MEMBERSHIP
-#define IPV6_PKTINFO		19
-
-#define IP_DEFAULT_MULTICAST_TTL 1 
-#define IP_DEFAULT_MULTICAST_LOOP 1 
-#define IP_MAX_MEMBERSHIPS 20 
-
-#define TCP_EXPEDITED_1122  2
-
-#define UDP_NOCHECKSUM 1
-
-/* INTERFACE_INFO iiFlags */
-#define IFF_UP  1
-#define IFF_BROADCAST   2
-#define IFF_LOOPBACK    4
-#define IFF_POINTTOPOINT    8
-#define IFF_MULTICAST   16
-
-#define SIO_GET_INTERFACE_LIST  _IOR('t', 127, u_long)
-
-#define INET_ADDRSTRLEN  16
-#define INET6_ADDRSTRLEN 46
-
-/* getnameinfo constants */ 
-#define NI_MAXHOST	1025
-#define NI_MAXSERV	32
-
-#define NI_NOFQDN 	0x01
-#define NI_NUMERICHOST	0x02
-#define NI_NAMEREQD	0x04
-#define NI_NUMERICSERV	0x08
-#define NI_DGRAM	0x10
-
-/* getaddrinfo constants */
-#define AI_PASSIVE	1
-#define AI_CANONNAME	2
-#define AI_NUMERICHOST	4
-
-/* getaddrinfo error codes */
-#define EAI_AGAIN	WSATRY_AGAIN
-#define EAI_BADFLAGS	WSAEINVAL
-#define EAI_FAIL	WSANO_RECOVERY
-#define EAI_FAMILY	WSAEAFNOSUPPORT
-#define EAI_MEMORY	WSA_NOT_ENOUGH_MEMORY
-#define EAI_NODATA	WSANO_DATA
-#define EAI_NONAME	WSAHOST_NOT_FOUND
-#define EAI_SERVICE	WSATYPE_NOT_FOUND
-#define EAI_SOCKTYPE	WSAESOCKTNOSUPPORT
-
-/*
- *   ip_mreq also in winsock.h for WinSock1.1,
- *   but online msdn docs say it is defined here for WinSock2.
- */ 
-
-struct ip_mreq {
-	struct in_addr	imr_multiaddr;
-	struct in_addr	imr_interface;
-};
-
-struct ip_mreq_source {
-	struct in_addr	imr_multiaddr;
-	struct in_addr	imr_sourceaddr;
-	struct in_addr	imr_interface;
-};
-
-struct ip_msfilter {
-	struct in_addr	imsf_multiaddr;
-	struct in_addr	imsf_interface;
-	u_long		imsf_fmode;
-	u_long		imsf_numsrc;
-	struct in_addr	imsf_slist[1];
-};
-
-#define IP_MSFILTER_SIZE(numsrc) \
-   (sizeof(struct ip_msfilter) - sizeof(struct in_addr) \
-   + (numsrc) * sizeof(struct in_addr))
-
-struct in_pktinfo {
-	IN_ADDR ipi_addr;
-	UINT    ipi_ifindex;
-};
-typedef struct in_pktinfo IN_PKTINFO;
-
-
-/* ipv6 */ 
-/* These require XP or .NET Server or use of add-on IPv6 stacks on NT 4
-  or higher */
-
-/* This is based on the example given in RFC 2553 with stdint types
-   changed to BSD types.  For now, use these  field names until there
-   is some consistency in MS docs. In this file, we only use the
-   in6_addr structure start address, with casts to get the right offsets
-   when testing addresses */
-  
-struct in6_addr {
-    union {
-        u_char	_S6_u8[16];
-        u_short	_S6_u16[8];
-        u_long	_S6_u32[4];
-        } _S6_un;
-};
-/* s6_addr is the standard name */
-#define s6_addr		_S6_un._S6_u8
-
-/* These are GLIBC names */ 
-#define s6_addr16	_S6_un._S6_u16
-#define s6_addr32	_S6_un._S6_u16
-
-/* These are used in some MS code */
-#define in_addr6	in6_addr
-#define _s6_bytes	_S6_un._S6_u8
-#define _s6_words	_S6_un._S6_u16
-
-typedef struct in6_addr IN6_ADDR,  *PIN6_ADDR, *LPIN6_ADDR;
-
-struct sockaddr_in6 {
-	short sin6_family;	/* AF_INET6 */
-	u_short sin6_port; 	/* transport layer port # */
-	u_long sin6_flowinfo;	/* IPv6 traffic class & flow info */
-	struct in6_addr sin6_addr;  /* IPv6 address */
-	u_long sin6_scope_id;	/* set of interfaces for a scope */
-};
-typedef struct sockaddr_in6 SOCKADDR_IN6, *PSOCKADDR_IN6, *LPSOCKADDR_IN6;
-
-extern const struct in6_addr in6addr_any;
-extern const struct in6_addr in6addr_loopback;
-/* the above can get initialised using: */ 
-#define IN6ADDR_ANY_INIT        { 0 }
-#define IN6ADDR_LOOPBACK_INIT   { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }
-
-/* Described in RFC 2292, but not in 2553 */
-/* int IN6_ARE_ADDR_EQUAL(const struct in6_addr * a, const struct in6_addr * b) */
-#define IN6_ARE_ADDR_EQUAL(a, b)	\
-    (memcmp ((void*)(a), (void*)(b), sizeof (struct in6_addr)) == 0)
-
-
-/* Address Testing Macros 
-
- These macro functions all take const struct in6_addr* as arg.
- Static inlines would allow type checking, but RFC 2553 says they
- macros.	 
- NB: These are written specifically for little endian host */
-
-#define IN6_IS_ADDR_UNSPECIFIED(_addr) \
-	(   (((const u_long *)(_addr))[0] == 0)	\
-	 && (((const u_long *)(_addr))[1] == 0)	\
-	 && (((const u_long *)(_addr))[2] == 0)	\
-	 && (((const u_long *)(_addr))[3] == 0))
-
-#define IN6_IS_ADDR_LOOPBACK(_addr) \
-	(   (((const u_long *)(_addr))[0] == 0)	\
-	 && (((const u_long *)(_addr))[1] == 0)	\
-	 && (((const u_long *)(_addr))[2] == 0)	\
-	 && (((const u_long *)(_addr))[3] == 0x01000000)) /* Note byte order reversed */
-/*	    (((const u_long *)(_addr))[3] == ntohl(1))  */
-
-#define IN6_IS_ADDR_MULTICAST(_addr) (((const u_char *) (_addr))[0] == 0xff)
-
-#define IN6_IS_ADDR_LINKLOCAL(_addr) \
-	(   (((const u_char *)(_addr))[0] == 0xfe)	\
-	 && ((((const u_char *)(_addr))[1] & 0xc0) == 0x80))
-
-#define IN6_IS_ADDR_SITELOCAL(_addr) \
-	(   (((const u_char *)(_addr))[0] == 0xfe)	\
-	 && ((((const u_char *)(_addr))[1] & 0xc0) == 0xc0))
-
-#define IN6_IS_ADDR_V4MAPPED(_addr) \
-	(   (((const u_long *)(_addr))[0] == 0)		\
-	 && (((const u_long *)(_addr))[1] == 0)		\
-	 && (((const u_long *)(_addr))[2] == 0xffff0000)) /* Note byte order reversed */
-/* 	    (((const u_long *)(_addr))[2] == ntohl(0x0000ffff))) */
-
-#define IN6_IS_ADDR_V4COMPAT(_addr) \
-	(   (((const u_long *)(_addr))[0] == 0)		\
-	 && (((const u_long *)(_addr))[1] == 0)		\
-	 && (((const u_long *)(_addr))[2] == 0)		\
-	 && (((const u_long *)(_addr))[3] != 0)		\
-	 && (((const u_long *)(_addr))[3] != 0x01000000)) /* Note byte order reversed */
-/*           (ntohl (((const u_long *)(_addr))[3]) > 1 ) */
-
-
-#define IN6_IS_ADDR_MC_NODELOCAL(_addr)	\
-	(   IN6_IS_ADDR_MULTICAST(_addr)		\
-	 && ((((const u_char *)(_addr))[1] & 0xf) == 0x1)) 
-
-#define IN6_IS_ADDR_MC_LINKLOCAL(_addr)	\
-	(   IN6_IS_ADDR_MULTICAST (_addr)		\
-	 && ((((const u_char *)(_addr))[1] & 0xf) == 0x2))
-
-#define IN6_IS_ADDR_MC_SITELOCAL(_addr)	\
-	(   IN6_IS_ADDR_MULTICAST(_addr)		\
-	 && ((((const u_char *)(_addr))[1] & 0xf) == 0x5))
-
-#define IN6_IS_ADDR_MC_ORGLOCAL(_addr)	\
-	(   IN6_IS_ADDR_MULTICAST(_addr)		\
-	 && ((((const u_char *)(_addr))[1] & 0xf) == 0x8))
-
-#define IN6_IS_ADDR_MC_GLOBAL(_addr)	\
-	(   IN6_IS_ADDR_MULTICAST(_addr)	\
-	 && ((((const u_char *)(_addr))[1] & 0xf) == 0xe))
-
-
-typedef int socklen_t;
-
-struct ipv6_mreq {
-	struct in6_addr ipv6mr_multiaddr;
-	unsigned int    ipv6mr_interface;
-};
-typedef struct ipv6_mreq IPV6_MREG;
-
-struct in6_pktinfo {
-	IN6_ADDR ipi6_addr;
-	UINT     ipi6_ifindex;
-};
-typedef struct  in6_pktinfo IN6_PKTINFO;
-
-struct addrinfo {
-	int     ai_flags;
-	int     ai_family;
-	int     ai_socktype;
-	int     ai_protocol;
-	size_t  ai_addrlen;
-	char   *ai_canonname;
-	struct sockaddr  *ai_addr;
-	struct addrinfo  *ai_next;
-};
-
-void WSAAPI freeaddrinfo (struct addrinfo*);
-int WSAAPI getaddrinfo (const char*,const char*,const struct addrinfo*,
-		        struct addrinfo**);
-
-char* WSAAPI gai_strerrorA(int);
-WCHAR* WSAAPI gai_strerrorW(int);
-#ifdef UNICODE
-#define gai_strerror   gai_strerrorW
-#else
-#define gai_strerror   gai_strerrorA
-#endif  /* UNICODE */
-
-int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD,
-		       char*,DWORD,int);
-
-
-/* Some older IPv4/IPv6 compatability stuff */
-
-/* This struct lacks sin6_scope_id; retained for use in sockaddr_gen */
-struct sockaddr_in6_old {
-	short   sin6_family;
-	u_short sin6_port;
-	u_long  sin6_flowinfo;
-	struct in6_addr sin6_addr;
-};
-
-typedef union sockaddr_gen{
-	struct sockaddr		Address;
-	struct sockaddr_in	AddressIn;
-	struct sockaddr_in6_old	AddressIn6;
-} sockaddr_gen;
-
-
-typedef struct _INTERFACE_INFO {
-	u_long		iiFlags;
-	sockaddr_gen	iiAddress;
-	sockaddr_gen	iiBroadcastAddress;
-	sockaddr_gen	iiNetmask;
-} INTERFACE_INFO, *LPINTERFACE_INFO;
-
-/*
-   The definition above can cause problems on NT4,prior to sp4.
-   To workaround, include the following struct and typedef and
-   #define INTERFACE_INFO OLD_INTERFACE_INFO
-   See: FIX: WSAIoctl SIO_GET_INTERFACE_LIST Option Problem
-   (Q181520) in MSDN KB.
-
-   The old definition causes problems on newer NT and on XP.
-
-typedef struct _OLD_INTERFACE_INFO {
-	u_long		iiFlags;
-	struct sockaddr	iiAddress;
- 	struct sockaddr	iiBroadcastAddress;
- 	struct sockaddr	iiNetmask;
-} OLD_INTERFACE_INFO;
-*/
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif	/* _WS2TCPIP_H */
diff --git a/winsup/w32api/include/wsahelp.h b/winsup/w32api/include/wsahelp.h
deleted file mode 100644
index 3c715e622..000000000
--- a/winsup/w32api/include/wsahelp.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef _WSAHELP_H
-#define _WSAHELP_H
-
-#include <winsock2.h>
-#include <ntsecapi.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define WSH_NOTIFY_BIND 0x00000001
-#define WSH_NOTIFY_LISTEN 0x00000002
-#define WSH_NOTIFY_CONNECT 0x00000004
-#define WSH_NOTIFY_ACCEPT 0x00000008
-#define WSH_NOTIFY_SHUTDOWN_RECEIVE 0x00000010
-#define WSH_NOTIFY_SHUTDOWN_SEND 0x00000020
-#define WSH_NOTIFY_SHUTDOWN_ALL 0x00000040
-#define WSH_NOTIFY_CLOSE 0x00000080
-#define WSH_NOTIFY_CONNECT_ERROR 0x00000100
-#define SOL_INTERNAL 0xFFFE
-#define SO_CONTEXT 1
-
-#ifndef RC_INVOKED
-typedef enum _SOCKADDR_ADDRESS_INFO {
-  SockaddrAddressInfoNormal,
-  SockaddrAddressInfoWildcard,
-  SockaddrAddressInfoBroadcast,
-  SockaddrAddressInfoLoopback
-} SOCKADDR_ADDRESS_INFO, *PSOCKADDR_ADDRESS_INFO;
-typedef enum _SOCKADDR_ENDPOINT_INFO {
-  SockaddrEndpointInfoNormal,
-  SockaddrEndpointInfoWildcard,
-  SockaddrEndpointInfoReserved
-} SOCKADDR_ENDPOINT_INFO, *PSOCKADDR_ENDPOINT_INFO;
-typedef struct _WINSOCK_MAPPING {
-	DWORD Rows;
-	DWORD Columns;
-	struct {
-		DWORD AddressFamily;
-		DWORD SocketType;
-		DWORD Protocol;
-	} Mapping[1];
-} WINSOCK_MAPPING, *PWINSOCK_MAPPING;
-typedef struct _SOCKADDR_INFO {
-  SOCKADDR_ADDRESS_INFO AddressInfo;
-  SOCKADDR_ENDPOINT_INFO EndpointInfo;
-} SOCKADDR_INFO, *PSOCKADDR_INFO;
-
-INT WINAPI WSHAddressToString(LPSOCKADDR,INT,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD);
-INT WINAPI WSHEnumProtocols(LPINT,LPWSTR,LPVOID,LPDWORD);
-INT WINAPI WSHGetBroadcastSockaddr(PVOID,PSOCKADDR,PINT);
-INT WINAPI WSHGetProviderGuid(LPWSTR,LPGUID);
-INT WINAPI WSHGetSockaddrType(PSOCKADDR,DWORD,PSOCKADDR_INFO);
-INT WINAPI WSHGetSocketInformation(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT);
-INT WINAPI WSHGetWildcardSockaddr(PVOID,PSOCKADDR,PINT);
-DWORD WINAPI WSHGetWinsockMapping(PWINSOCK_MAPPING,DWORD);
-INT WINAPI WSHGetWSAProtocolInfo(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD);
-INT WINAPI WSHIoctl(PVOID,SOCKET,HANDLE,HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,
-LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPBOOL);
-INT WINAPI WSHJoinLeaf(PVOID,SOCKET,HANDLE,HANDLE,PVOID,SOCKET,PSOCKADDR,
-DWORD,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD);
-INT WINAPI WSHNotify(PVOID,SOCKET,HANDLE,HANDLE,DWORD);
-INT WINAPI WSHOpenSocket(PINT,PINT,PINT,PUNICODE_STRING,PVOID,PDWORD);
-INT WINAPI WSHOpenSocket2(PINT,PINT,PINT,GROUP,DWORD,PUNICODE_STRING,PVOID*,PDWORD);
-INT WINAPI WSHSetSocketInformation(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT);
-INT WINAPI WSHStringToAddress(LPWSTR,DWORD,LPWSAPROTOCOL_INFOW,LPSOCKADDR,LPDWORD);
-
-typedef INT (WINAPI *PWSH_ADDRESS_TO_STRING)(LPSOCKADDR,INT,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD);
-typedef INT (WINAPI *PWSH_ENUM_PROTOCOLS)(LPINT,LPWSTR,LPVOID,LPDWORD);
-typedef INT (WINAPI *PWSH_GET_BROADCAST_SOCKADDR)(PVOID,PSOCKADDR,PINT);
-typedef INT (WINAPI *PWSH_GET_PROVIDER_GUID)(LPWSTR,LPGUID);
-typedef INT (WINAPI *PWSH_GET_SOCKADDR_TYPE)(PSOCKADDR,DWORD,PSOCKADDR_INFO);
-typedef INT (WINAPI *PWSH_GET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT);
-typedef INT (WINAPI *PWSH_GET_WILDCARD_SOCKEADDR)(PVOID,PSOCKADDR,PINT);
-typedef DWORD (WINAPI *PWSH_GET_WINSOCK_MAPPING)(PWINSOCK_MAPPING,DWORD);
-typedef INT (WINAPI *PWSH_GET_WSAPROTOCOL_INFO)(LPWSTR,LPWSAPROTOCOL_INFOW*,LPDWORD);
-typedef INT (WINAPI *PWSH_IOCTL)(PVOID,SOCKET,HANDLE,HANDLE,DWORD,LPVOID,DWORD,
-	     LPVOID,DWORD,LPDWORD,LPWSAOVERLAPPED,LPWSAOVERLAPPED_COMPLETION_ROUTINE,LPBOOL);
-typedef INT (WINAPI *PWSH_JOIN_LEAF)(PVOID,SOCKET,HANDLE,HANDLE,PVOID,SOCKET,
-	     PSOCKADDR,DWORD,LPWSABUF,LPWSABUF,LPQOS,LPQOS,DWORD);
-typedef INT (WINAPI *PWSH_NOTIFY)(PVOID,SOCKET,HANDLE,HANDLE,DWORD);
-typedef INT (WINAPI *PWSH_OPEN_SOCKET)(PINT,PINT,PINT,PUNICODE_STRING,PVOID,PDWORD);
-typedef INT (WINAPI *PWSH_OPEN_SOCKET2)(PINT,PINT,PINT,GROUP,DWORD,PUNICODE_STRING,PVOID*,PDWORD);
-typedef INT (WINAPI *PWSH_SET_SOCKET_INFORMATION)(PVOID,SOCKET,HANDLE,HANDLE,INT,INT,PCHAR,INT);
-typedef INT (WINAPI *PWSH_STRING_TO_ADDRESS)(LPWSTR,DWORD,LPWSAPROTOCOL_INFOW,LPSOCKADDR,LPDWORD);
-
-#endif /* RC_INVOKED */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _WSAHELP_H */
diff --git a/winsup/w32api/include/wsipx.h b/winsup/w32api/include/wsipx.h
deleted file mode 100644
index 4f24db43b..000000000
--- a/winsup/w32api/include/wsipx.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* WSIPX.H - initially taken from the Wine project
- */
-
-#ifndef _WSIPX_H
-#define _WSIPX_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define NSPROTO_IPX	1000
-#define NSPROTO_SPX	1256
-#define NSPROTO_SPXII	1257
-
-typedef struct sockaddr_ipx {
-	short sa_family;
-	char sa_netnum[4];
-	char sa_nodenum[6];
-	unsigned short sa_socket;
-} SOCKADDR_IPX, *PSOCKADDR_IPX, *LPSOCKADDR_IPX;
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/wsnetbs.h b/winsup/w32api/include/wsnetbs.h
deleted file mode 100644
index e435b5daf..000000000
--- a/winsup/w32api/include/wsnetbs.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef _WSNETBS_H
-#define _WSNETBS_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#define NETBIOS_NAME_LENGTH	16
-#define NETBIOS_UNIQUE_NAME	0
-#define NETBIOS_GROUP_NAME	1
-#define NETBIOS_TYPE_QUICK_UNIQUE	2
-#define NETBIOS_TYPE_QUICK_GROUP	3
-
-#ifndef RC_INVOKED
-typedef struct sockaddr_nb {
-	short	snb_family;
-	u_short	snb_type;
-	char	snb_name[NETBIOS_NAME_LENGTH];
-} SOCKADDR_NB, *PSOCKADDR_NB, *LPSOCKADDR_NB;
-#define SET_NETBIOS_SOCKADDR(_snb,_type,_name,_port) \
-{ \
-	register int _i; \
-	register char *_n = (_name); \
-	register PSOCKADDR_NB _s = (_snb); \
-	_s->snb_family = AF_NETBIOS; \
-	_s->snb_type = (_type); \
-	for (_i=0; _n[_i] != '\0' && _i<NETBIOS_NAME_LENGTH-1; _i++) { \
-		_s->snb_name[_i] = _n[_i]; \
-	} \
-	for (; _i<NETBIOS_NAME_LENGTH-1; _i++) { \
-		_s->snb_name[_i] = ' '; \
-	} \
-	_s->snb_name[NETBIOS_NAME_LENGTH-1] = (_port); \
-}
-#endif   /* RC_INVOKED */
-#endif
diff --git a/winsup/w32api/include/wtypes.h b/winsup/w32api/include/wtypes.h
deleted file mode 100644
index f9409a894..000000000
--- a/winsup/w32api/include/wtypes.h
+++ /dev/null
@@ -1,171 +0,0 @@
-#include <rpc.h>
-#include <rpcndr.h>
-
-#ifndef _WTYPES_H
-#define _WTYPES_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define IID_NULL GUID_NULL
-#define CLSID_NULL GUID_NULL
-#define CBPCLIPDATA(d) ((d).cbSize-sizeof((d).ulClipFmt))
-#define DECIMAL_NEG ((BYTE)0x80)
-#define DECIMAL_SETZERO(d) {(d).Lo64=(d).Hi32=(d).signscale=0;}
-#define ROTFLAGS_REGISTRATIONKEEPSALIVE	0x01
-#define ROTFLAGS_ALLOWANYCLIENT		0x02
-
-#ifndef __BLOB_T_DEFINED /* also in winsock2.h */
-#define __BLOB_T_DEFINED
-typedef struct _BLOB {
-	ULONG	cbSize;
-	BYTE	*pBlobData;
-} BLOB,*PBLOB,*LPBLOB;
-#endif
-typedef enum tagDVASPECT {
-	DVASPECT_CONTENT=1,
-	DVASPECT_THUMBNAIL=2,
-	DVASPECT_ICON=4,
-	DVASPECT_DOCPRINT=8
-} DVASPECT;
-typedef enum tagDVASPECT2 {
-	DVASPECT_OPAQUE=16,
-	DVASPECT_TRANSPARENT=32
-} DVASPECT2;
-typedef enum tagSTATFLAG {
-	STATFLAG_DEFAULT=0,
-	STATFLAG_NONAME=1
-} STATFLAG;
-typedef enum tagMEMCTX {
-	MEMCTX_TASK=1,
-	MEMCTX_SHARED,
-	MEMCTX_MACSYSTEM,
-	MEMCTX_UNKNOWN=-1,
-	MEMCTX_SAME=-2
-} MEMCTX;
-typedef enum tagMSHCTX {
-	MSHCTX_LOCAL,
-	MSHCTX_NOSHAREDMEM,
-	MSHCTX_DIFFERENTMACHINE,
-	MSHCTX_INPROC
-} MSHCTX;
-typedef enum tagCLSCTX {
-	CLSCTX_INPROC_SERVER=1,CLSCTX_INPROC_HANDLER=2,CLSCTX_LOCAL_SERVER=4,
-	CLSCTX_INPROC_SERVER16=8,CLSCTX_REMOTE_SERVER=16
-} CLSCTX;
-typedef enum tagMSHLFLAGS {
-	MSHLFLAGS_NORMAL,MSHLFLAGS_TABLESTRONG,MSHLFLAGS_TABLEWEAK
-} MSHLFLAGS;
-typedef struct _FLAGGED_WORD_BLOB {
-	unsigned long fFlags;
-	unsigned long clSize;
-	unsigned short asData[1];
-}FLAGGED_WORD_BLOB;
-
-#ifndef OLE2ANSI
-typedef WCHAR OLECHAR;
-typedef LPWSTR LPOLESTR;
-typedef LPCWSTR LPCOLESTR;
-#define OLESTR(s) L##s
-#else
-typedef char OLECHAR;
-typedef LPSTR LPOLESTR;
-typedef LPCSTR LPCOLESTR;
-#define OLESTR(s) s
-#endif
-typedef unsigned short VARTYPE;
-typedef short VARIANT_BOOL;
-typedef VARIANT_BOOL _VARIANT_BOOL;
-#define VARIANT_TRUE ((VARIANT_BOOL)0xffff)
-#define VARIANT_FALSE ((VARIANT_BOOL)0)
-typedef OLECHAR *BSTR;
-typedef FLAGGED_WORD_BLOB *wireBSTR;
-typedef BSTR *LPBSTR;
-typedef LONG SCODE;
-typedef void *HCONTEXT;
-typedef union tagCY {
-	_ANONYMOUS_STRUCT struct {
-		unsigned long Lo;
-		long Hi;
-	}_STRUCT_NAME(s);
-	LONGLONG int64;
-} CY;
-typedef double DATE;
-typedef struct  tagBSTRBLOB {
-	ULONG cbSize;
-	PBYTE pData;
-}BSTRBLOB;
-typedef struct tagBSTRBLOB *LPBSTRBLOB;
-typedef struct tagCLIPDATA {
-	ULONG cbSize;
-	long ulClipFmt;
-	PBYTE pClipData;
-}CLIPDATA;
-typedef enum tagSTGC {
-	STGC_DEFAULT,STGC_OVERWRITE,STGC_ONLYIFCURRENT,
-	STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE
-}STGC;
-typedef enum tagSTGMOVE {
-	STGMOVE_MOVE,STGMOVE_COPY,STGMOVE_SHALLOWCOPY
-}STGMOVE;
-enum VARENUM {
-	VT_EMPTY,VT_NULL,VT_I2,VT_I4,VT_R4,VT_R8,VT_CY,VT_DATE,VT_BSTR,VT_DISPATCH,
-	VT_ERROR,VT_BOOL,VT_VARIANT,VT_UNKNOWN,VT_DECIMAL,VT_I1=16,VT_UI1,VT_UI2,VT_UI4,VT_I8,
-	VT_UI8,VT_INT,VT_UINT,VT_VOID,VT_HRESULT,VT_PTR,VT_SAFEARRAY,VT_CARRAY,VT_USERDEFINED,
-	VT_LPSTR,VT_LPWSTR,VT_RECORD=36,VT_FILETIME=64,VT_BLOB,VT_STREAM,VT_STORAGE,VT_STREAMED_OBJECT,
-	VT_STORED_OBJECT,VT_BLOB_OBJECT,VT_CF,VT_CLSID,VT_BSTR_BLOB=0xfff,VT_VECTOR=0x1000,
-	VT_ARRAY=0x2000,VT_BYREF=0x4000,VT_RESERVED=0x8000,VT_ILLEGAL= 0xffff,VT_ILLEGALMASKED=0xfff,
-	VT_TYPEMASK=0xfff
-};
-#ifdef _WIN64
-#define VT_INT_PTR  VT_I8
-#define VT_UINT_PTR VT_UI8
-#else
-#define VT_INT_PTR  VT_I4
-#define VT_UINT_PTR VT_UI4
-#endif
-
-typedef struct _BYTE_SIZEDARR {
-	unsigned long clSize;
-	byte *pData;
-}BYTE_SIZEDARR;
-typedef struct _SHORT_SIZEDARR {
-	unsigned long clSize;
-	unsigned short *pData;
-}WORD_SIZEDARR;
-typedef struct _LONG_SIZEDARR {
-	unsigned long clSize;
-	unsigned long *pData;
-}DWORD_SIZEDARR;
-typedef struct _HYPER_SIZEDARR {
-	unsigned long clSize;
-	hyper *pData;
-}HYPER_SIZEDARR;
-typedef double DOUBLE;
-typedef struct tagDEC {
-	USHORT wReserved;
-	_ANONYMOUS_UNION union {
-		_ANONYMOUS_STRUCT struct {
-			BYTE scale;
-			BYTE sign;
-		}_STRUCT_NAME(s);
-		USHORT signscale;
-	} DUMMYUNIONNAME;
-	ULONG Hi32;
-	_ANONYMOUS_UNION union {
-		_ANONYMOUS_STRUCT struct {
-			ULONG Lo32;
-			ULONG Mid32;
-		}_STRUCT_NAME(s2);
-		ULONGLONG Lo64;
-	} DUMMYUNIONNAME2;
-} DECIMAL;
-typedef void *HMETAFILEPICT;
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/winsup/w32api/include/zmouse.h b/winsup/w32api/include/zmouse.h
deleted file mode 100644
index 764d43d13..000000000
--- a/winsup/w32api/include/zmouse.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-       zmouse.h - Header for IntelliMouse.
-
-       This file is part of a free library for the Win32 API.
-
-       This library is distributed in the hope that it will be useful,
-       but WITHOUT ANY WARRANTY; without even the implied warranty of
-       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-       FIXME: This file is obviously horribly incomplete!
-
-*/
-
-#ifndef _ZMOUSE_H
-#define _ZMOUSE_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifndef WM_MOUSEWHEEL
-# define WM_MOUSEWHEEL (WM_MOUSELAST + 1)
-#endif
-
-#ifndef WHEEL_DELTA
-# define WHEEL_DELTA 120
-#endif
-
-#ifndef WHEEL_PAGESCROLL
-# define WHEEL_PAGESCROLL UINT_MAX
-#endif
-
-#ifndef SPI_SETWHEELSCROLLLINES
-# define SPI_SETWHEELSCROLLLINES 105
-#endif
-
-#endif /* _ZMOUSE_H */
diff --git a/winsup/w32api/install-sh b/winsup/w32api/install-sh
deleted file mode 100755
index e9de23842..000000000
--- a/winsup/w32api/install-sh
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
deleted file mode 100644
index 377a60bc6..000000000
--- a/winsup/w32api/lib/Makefile.in
+++ /dev/null
@@ -1,267 +0,0 @@
-#
-#	Makefile.in
-#
-#	This file is part of a free library for the Win32 API.
-# 
-#	This library is distributed in the hope that it will be useful,
-#	but WITHOUT ANY WARANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-# start config section
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-SUBDIRS := ddk
-subdirs := ddk
-
-host_alias = @host@
-build_alias = @build@
-target_alias = @target@
-prefix = @prefix@
-includedir:=@includedir@
-
-program_transform_name = @program_transform_name@
-exec_prefix = @exec_prefix@
-libdir:=@libdir@
-bindir = @bindir@
-ifeq ($(target_alias),$(host_alias))
-ifeq ($(build_alias),$(host_alias))
-tooldir:=$(exec_prefix)
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-datadir = @datadir@
-infodir = @infodir@
-ifneq (,$(findstring cygwin,$(target_alias)))
-inst_includedir:=$(tooldir)/include/w32api
-inst_libdir:=$(tooldir)/lib/w32api
-else
-inst_includedir:=$(includedir)
-inst_libdir:=$(libdir)
-endif
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-mkinstalldirs = mkdir -p
-
-CC = @CC@
-CC_FOR_TARGET = $(CC)
-
-DLLTOOL = @DLLTOOL@
-DLLTOOL_FLAGS = --as=$(AS) -k
-AS = @AS@
-AS_FOR_TARGET = $(AS_FOR_TARGET)
-WINDRES = @WINDRES@
-
-# Depending on if we build as part of winsup or mingw we need to
-# add additional include paths in order to get the correct headers
-# from the C library.
-BUILDENV = @BUILDENV@
-
-ifeq ($(BUILDENV), cygwin)
-# winsup/include
-# winsup/../newlib/libc/include
-# winsup/../newlib/libc/sys/cygwin
-EXTRA_INCLUDES = -I$(srcdir)/../../include -I$(srcdir)/../../../newlib/libc/include -I$(srcdir)/../../../newlib/libc/sys/cygwin
-endif
-ifeq ($(BUILDENV), mingw)
-EXTRA_INCLUDES = -I$(srcdir)/../../mingw/include
-endif
-
-INCLUDES = -I$(srcdir)/../include $(EXTRA_INCLUDES)
-
-CFLAGS = @CFLAGS@
-ALL_CFLAGS = $(CFLAGS) $(INCLUDES)
-
-RANLIB = @RANLIB@
-AR = @AR@
-LD = @LD@
-
-FLAGS_TO_PASS = \
-	AS="$(AS)" \
-	CC="$(CC)" \
-	CPPFLAGS="$(CPPFLAGS)" \
-	CFLAGS="$(CFLAGS)" \
-	CXXFLAGS="$(CXXFLAGS)" \
-	AR="$(AR)" \
-	RANLIB="$(RANLIB)" \
-	LD="$(LD)" \
-	DLLTOOL="$(DLLTOOL)" \
-	TAR="$(TAR)" \
-	TARFLAGS="$(TARFLAGS)" \
-	TARFILEEXT="$(TARFILEEXT)" \
-	WINDRES="$(WINDRES)"
-
-# end config section
-
-# headers
-
-HEADERS = $(notdir $(wildcard $(srcdir)/../include/*.h))
-GL_HEADERS = $(notdir $(wildcard $(srcdir)/../include/GL/*.h))
-
-# libraries
-
-DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def))
-MRI_FILES = $(notdir $(wildcard $(srcdir)/*.mri))
-IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES)))
-MIMPLIBS = $(addprefix lib,$(subst .mri,.a,$(MRI_FILES)))
-EXTRA_LIBS=libuuid.a libscrnsave.a libscrnsavw.a libdxguid.a liblargeint.a
-LIBS = $(IMPLIBS) $(MIMPLIBS) $(EXTRA_LIBS)
-UUID_OBJS = uuid.o mshtml-uuid.o
-EXTRA_OBJS = shell32.o dxguid.o scrnsave.o scrnsavw.o largeint.o \
-	$(UUID_OBJS) dinput.o kernel32.o
-UUID_SOURCES = uuid.c mshtml-uuid.c
-SOURCES = scrnsave.c shell32.c  largeint.c dinput.c $(UUID_SOURCES)\
-dxguid.c res.rc test.c kernel32.c
-
-DISTFILES = Makefile.in $(DEF_FILES) $(MRI_FILES) $(SOURCES)
-
-.NOTPARALLEL:
-
-# targets
-all: $(LIBS) $(EXTRA_OBJS) ddk
-
-%-subdirs:
-	for i in $(SUBDIRS); do \
-	  $(MAKE) $(FLAGS_TO_PASS) -C $$i $*; \
-	done
-
-ddk:
-	$(MAKE) $(FLAGS_TO_PASS) -C $@
-
-TEST_OPTIONS = $(ALL_CFLAGS) -DWINVER=0x0666  \
-	-Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o
-.PHONY: test ddk
-test:
-	@echo "Testing w32api..."
-	@for lang in c c++ objective-c ; do \
-		echo "$$lang..."; \
-		$(CC) -x$$lang $(TEST_OPTIONS) ; \
-		echo "$$lang UNICODE..."; \
-		$(CC) -x$$lang -DUNICODE $(TEST_OPTIONS) ; \
-	done
-	@echo "windres..."
-	@$(WINDRES) --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
-	@echo "windres UNICODE..."
-	@$(WINDRES) --define UNICODE --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
-	@rm -f test.o
-
-scrnsavw.o: scrnsave.c
-	$(CC) -c $(ALL_CFLAGS) -DUNICODE -o $@ $<
-
-# make rules
-
-.SUFFIXES: .c .o .def .a
-
-.c.o:
-	$(CC) -c $(ALL_CFLAGS) -o $@ $<
-
-libuuid.a : $(UUID_OBJS)
-	$(AR) rc $@ $(UUID_OBJS)
-	$(RANLIB) $@
-
-# libvfw32.a contains import stubs for 3 dll's.  Using an MRI script
-# seems to be the simplest way to combine them into one archive.
-# NB: With older dlltool, the object file members will not have unique
-# names.
-libvfw32.a : vfw32.mri libmsvfw32.a libavifil32.a libavicap32.a
-	rm -f $@
-	$(AR) -M < ${word 1,$^}
-	$(RANLIB) $@
-
-lib%.a : %.def %.o
-	$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $(srcdir)/$*.def
-	$(AR) r $@ $*.o
-	$(RANLIB) $@
-
-lib%.a: %.def
-	$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $<
-
-lib%.a: %.o
-	$(AR) rc $@ $*.o
-	$(RANLIB) $@
-
-.PHONY: install install-libraries install-headers install-ddk
-# install headers and libraries in a target specified directory.
-install: install-libraries install-headers install-ddk
-
-install-libraries: all
-	$(mkinstalldirs) $(inst_libdir)
-	for i in $(LIBS); do \
-		$(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
-	done
-
-install-headers:
-	$(mkinstalldirs) $(inst_includedir)
-	for i in $(HEADERS); do \
-		$(INSTALL_DATA) $(srcdir)/../include/$$i $(inst_includedir)/$$i ; \
-	done
-	$(mkinstalldirs) $(inst_includedir)/GL
-	for i in $(GL_HEADERS); do \
-		$(INSTALL_DATA) $(srcdir)/../include/GL/$$i $(inst_includedir)/GL/$$i ; \
-	done
-
-install-ddk: install-libraries install-headers
-	cd ddk && $(MAKE) install $(FLAGS_TO_PASS)
-
-# uninstall headers and libraries from a target specified directory
-uninstall: uninstall-ddk uninstall-libraries uninstall-headers
-
-uninstall-libraries:
-	@for i in $(LIBS); do \
-		rm -f $(inst_libdir)/$$i ; \
-	done
-	rmdir $(inst_libdir)
-
-uninstall-headers:
-	@for i in $(HEADERS); do \
-		rm -r $(inst_includedir)/$$i ; \
-	done
-	rmdir $(inst_includedir)
-
-uninstall-ddk:
-	cd ddk && $(MAKE) -C uninstall $(FLAGS_TO_PASS)
-
-dist:
-	mkdir $(distdir)/include
-	chmod 755 $(distdir)/include
-	@for i in $(HEADERS); do \
-		cp -p $(srcdir)/../include/$$i $(distdir)/include/$$i ; \
-	done
-	mkdir $(distdir)/include/GL
-	@for i in $(GL_HEADERS); do \
-		cp -p $(srcdir)/../include/GL/$$i $(distdir)/include/GL/$$i ; \
-	done
-	mkdir $(distdir)/lib
-	chmod 755 $(distdir)/lib
-	@for i in $(DISTFILES); do \
-		cp -p $(srcdir)/$$i $(distdir)/lib/$$i ; \
-	done
-	for i in $(SUBDIRS); do \
-		(cd $$i; $(MAKE) distdir=../$(distdir) dist); \
-	done
-
-Makefile: Makefile.in ../config.status ../configure
-	cd ..; $(SHELL) config.status
-
-# clean
-
-mostlyclean:
-	rm -f *~ *.o *.s
-
-clean:
-	rm -f *.o *.a *.s *~
-
-distclean: clean
-	rm -f config.cache config.status config.log Makefile
-
-maintainer-clean: distclean
-
diff --git a/winsup/w32api/lib/advapi32.def b/winsup/w32api/lib/advapi32.def
deleted file mode 100644
index 99fc62bad..000000000
--- a/winsup/w32api/lib/advapi32.def
+++ /dev/null
@@ -1,533 +0,0 @@
-LIBRARY ADVAPI32.DLL
-EXPORTS
-AbortSystemShutdownA@4
-AbortSystemShutdownW@4
-AccessCheck@32
-AccessCheckAndAuditAlarmA@44
-AccessCheckAndAuditAlarmW@44
-AccessCheckByType@44
-AccessCheckByTypeAndAuditAlarmA@64
-AccessCheckByTypeAndAuditAlarmW@64
-AccessCheckByTypeResultList@44
-AccessCheckByTypeResultListAndAuditAlarmA@64
-AccessCheckByTypeResultListAndAuditAlarmByHandleA@68
-AccessCheckByTypeResultListAndAuditAlarmByHandleW@68
-AccessCheckByTypeResultListAndAuditAlarmW@64
-AddAccessAllowedAce@16
-AddAccessAllowedAceEx@20
-AddAccessAllowedObjectAce@28
-AddAccessDeniedAce@16
-AddAccessDeniedAceEx@20
-AddAccessDeniedObjectAce@28
-AddAce@20
-AddAuditAccessAce@24
-AddAuditAccessAceEx@28
-AddAuditAccessObjectAce@36
-AddUsersToEncryptedFile@8
-AdjustTokenGroups@24
-AdjustTokenPrivileges@24
-AllocateAndInitializeSid@44
-AllocateLocallyUniqueId@4
-AreAllAccessesGranted@8
-AreAnyAccessesGranted@8
-BackupEventLogA@8
-BackupEventLogW@8
-BuildExplicitAccessWithNameA@20
-BuildExplicitAccessWithNameW@20
-BuildImpersonateExplicitAccessWithNameA@24
-BuildImpersonateExplicitAccessWithNameW@24
-BuildImpersonateTrusteeA@8
-BuildImpersonateTrusteeW@8
-BuildSecurityDescriptorA@36
-BuildSecurityDescriptorW@36
-BuildTrusteeWithNameA@8
-BuildTrusteeWithNameW@8
-BuildTrusteeWithObjectsAndNameA@24
-BuildTrusteeWithObjectsAndNameW@24
-BuildTrusteeWithObjectsAndSidA@20
-BuildTrusteeWithObjectsAndSidW@20
-BuildTrusteeWithSidA@8
-BuildTrusteeWithSidW@8
-CancelOverlappedAccess@4
-ChangeServiceConfig2A@12
-ChangeServiceConfig2W@12
-ChangeServiceConfigA@44
-ChangeServiceConfigW@44
-CheckTokenMembership@12
-ClearEventLogA@8
-ClearEventLogW@8
-CloseEncryptedFileRaw@4
-CloseEventLog@4
-CloseServiceHandle@4
-CloseTrace@8
-CommandLineFromMsiDescriptor@12
-ControlService@12
-ControlTraceA@20
-ControlTraceW@20
-ConvertAccessToSecurityDescriptorA@20
-ConvertAccessToSecurityDescriptorW@20
-ConvertSDToStringSDRootDomainA@24
-ConvertSDToStringSDRootDomainW@24
-ConvertSecurityDescriptorToAccessA@28
-ConvertSecurityDescriptorToAccessNamedA@28
-ConvertSecurityDescriptorToAccessNamedW@28
-ConvertSecurityDescriptorToAccessW@28
-ConvertSecurityDescriptorToStringSecurityDescriptorA@20
-ConvertSecurityDescriptorToStringSecurityDescriptorW@20
-ConvertSidToStringSidA@8
-ConvertSidToStringSidW@8
-ConvertStringSDToSDRootDomainA@20
-ConvertStringSDToSDRootDomainW@20
-ConvertStringSecurityDescriptorToSecurityDescriptorA@16
-ConvertStringSecurityDescriptorToSecurityDescriptorW@16
-ConvertStringSidToSidA@8
-ConvertStringSidToSidW@8
-ConvertToAutoInheritPrivateObjectSecurity@24
-CopySid@12
-CreatePrivateObjectSecurity@24
-CreatePrivateObjectSecurityEx@32
-CreateProcessAsUserA@44
-CreateProcessAsUserW@44
-CreateProcessWithLogonW@44
-CreateRestrictedToken@36
-CreateServiceA@52
-CreateServiceW@52
-CreateTraceInstanceId@8
-CryptAcquireContextA@20
-CryptAcquireContextW@20
-CryptContextAddRef@12
-CryptCreateHash@20
-CryptDecrypt@24
-CryptDeriveKey@20
-CryptDestroyHash@4
-CryptDestroyKey@4
-CryptDuplicateHash@16
-CryptDuplicateKey@16
-CryptEncrypt@28
-CryptEnumProviderTypesA@24
-CryptEnumProviderTypesW@24
-CryptEnumProvidersA@24
-CryptEnumProvidersW@24
-CryptExportKey@24
-CryptGenKey@16
-CryptGenRandom@12
-CryptGetDefaultProviderA@20
-CryptGetDefaultProviderW@20
-CryptGetHashParam@20
-CryptGetKeyParam@20
-CryptGetProvParam@20
-CryptGetUserKey@12
-CryptHashData@16
-CryptHashSessionKey@12
-CryptImportKey@24
-CryptReleaseContext@8
-CryptSetHashParam@16
-CryptSetKeyParam@16
-CryptSetProvParam@16
-CryptSetProviderA@8
-CryptSetProviderExA@16
-CryptSetProviderExW@16
-CryptSetProviderW@8
-CryptSignHashA@24
-CryptSignHashW@24
-CryptVerifySignatureA@24
-CryptVerifySignatureW@24
-DecryptFileA@8
-DecryptFileW@8
-DeleteAce@8
-DeleteService@4
-DeregisterEventSource@4
-DestroyPrivateObjectSecurity@4
-DuplicateEncryptionInfoFile@8
-DuplicateToken@12
-DuplicateTokenEx@24
-ElfBackupEventLogFileA@8
-ElfBackupEventLogFileW@8
-ElfChangeNotify@8
-ElfClearEventLogFileA@8
-ElfClearEventLogFileW@8
-ElfCloseEventLog@4
-ElfDeregisterEventSource@4
-ElfNumberOfRecords@8
-ElfOldestRecord@8
-ElfOpenBackupEventLogA@12
-ElfOpenBackupEventLogW@12
-ElfOpenEventLogA@12
-ElfOpenEventLogW@12
-ElfReadEventLogA@28
-ElfReadEventLogW@28
-ElfRegisterEventSourceA@12
-ElfRegisterEventSourceW@12
-ElfReportEventA@48
-ElfReportEventW@48
-EnableTrace@24
-EncryptFileA@4
-EncryptFileW@4
-EncryptionDisable@8
-EnumDependentServicesA@24
-EnumDependentServicesW@24
-EnumServiceGroupW@36
-EnumServicesStatusA@32
-EnumServicesStatusExA@40
-EnumServicesStatusExW@40
-EnumServicesStatusW@32
-EqualPrefixSid@8
-EqualSid@8
-FileEncryptionStatusA@8
-FileEncryptionStatusW@8
-FindFirstFreeAce@8
-FreeEncryptionCertificateHashList@4
-FreeSid@4
-GetAccessPermissionsForObjectA@36
-GetAccessPermissionsForObjectW@36
-GetAce@12
-GetAclInformation@16
-GetAuditedPermissionsFromAclA@16
-GetAuditedPermissionsFromAclW@16
-GetCurrentHwProfileA@4
-GetCurrentHwProfileW@4
-GetEffectiveRightsFromAclA@12
-GetEffectiveRightsFromAclW@12
-GetEventLogInformation@20
-GetExplicitEntriesFromAclA@12
-GetExplicitEntriesFromAclW@12
-GetFileSecurityA@20
-GetFileSecurityW@20
-GetInheritanceSourceA@40
-GetInheritanceSourceW@40
-GetKernelObjectSecurity@20
-GetLengthSid@4
-GetLocalManagedApplications@12
-GetManagedApplications@20
-GetMangledSiteSid@12
-GetMultipleTrusteeA@4
-GetMultipleTrusteeOperationA@4
-GetMultipleTrusteeOperationW@4
-GetMultipleTrusteeW@4
-GetNamedSecurityInfoA@32
-GetNamedSecurityInfoExA@36
-GetNamedSecurityInfoExW@36
-GetNamedSecurityInfoW@32
-GetNumberOfEventLogRecords@8
-GetOldestEventLogRecord@8
-GetOverlappedAccessResults@16
-GetPrivateObjectSecurity@20
-GetSecurityDescriptorControl@12
-GetSecurityDescriptorDacl@16
-GetSecurityDescriptorGroup@12
-GetSecurityDescriptorLength@4
-GetSecurityDescriptorOwner@12
-GetSecurityDescriptorRMControl@8
-GetSecurityDescriptorSacl@16
-GetSecurityInfo@32
-GetSecurityInfoExA@36
-GetSecurityInfoExW@36
-GetServiceDisplayNameA@16
-GetServiceDisplayNameW@16
-GetServiceKeyNameA@16
-GetServiceKeyNameW@16
-GetSidIdentifierAuthority@4
-GetSidLengthRequired@4
-GetSidSubAuthority@8
-GetSidSubAuthorityCount@4
-GetSiteDirectoryA@12
-GetSiteDirectoryW@12
-GetSiteNameFromSid@8
-GetSiteSidFromToken@4
-GetSiteSidFromUrl@4
-GetTokenInformation@20
-GetTraceEnableFlags@8
-GetTraceEnableLevel@8
-GetTraceLoggerHandle@4
-GetTrusteeFormA@4
-GetTrusteeFormW@4
-GetTrusteeNameA@4
-GetTrusteeNameW@4
-GetTrusteeTypeA@4
-GetTrusteeTypeW@4
-GetUserNameA@8
-GetUserNameW@8
-I_ScSetServiceBitsA@20
-I_ScSetServiceBitsW@20
-ImpersonateAnonymousToken@4
-ImpersonateLoggedOnUser@4
-ImpersonateNamedPipeClient@4
-ImpersonateSelf@4
-InitializeAcl@12
-InitializeSecurityDescriptor@8
-InitializeSid@12
-InitiateSystemShutdownA@20
-InitiateSystemShutdownExA@24
-InitiateSystemShutdownExW@24
-InitiateSystemShutdownW@20
-InstallApplication@4
-IsProcessRestricted@0
-IsTextUnicode@12
-IsTokenRestricted@4
-IsValidAcl@4
-IsValidSecurityDescriptor@4
-IsValidSid@4
-LockServiceDatabase@4
-LogonUserA@24
-LogonUserW@24
-LookupAccountNameA@28
-LookupAccountNameW@28
-LookupAccountSidA@28
-LookupAccountSidW@28
-LookupPrivilegeDisplayNameA@20
-LookupPrivilegeDisplayNameW@20
-LookupPrivilegeNameA@16
-LookupPrivilegeNameW@16
-LookupPrivilegeValueA@12
-LookupPrivilegeValueW@12
-LookupSecurityDescriptorPartsA@28
-LookupSecurityDescriptorPartsW@28
-LsaAddAccountRights@16
-LsaAddPrivilegesToAccount@8
-LsaClearAuditLog@4
-LsaClose@4
-LsaCreateAccount@16
-LsaCreateSecret@16
-LsaCreateTrustedDomain@16
-LsaCreateTrustedDomainEx@20
-LsaDelete@4
-LsaDeleteTrustedDomain@8
-LsaEnumerateAccountRights@16
-LsaEnumerateAccounts@20
-LsaEnumerateAccountsWithUserRight@16
-LsaEnumeratePrivileges@20
-LsaEnumeratePrivilegesOfAccount@8
-LsaEnumerateTrustedDomains@20
-LsaEnumerateTrustedDomainsEx@20
-LsaFreeMemory@4
-LsaGetQuotasForAccount@8
-LsaGetRemoteUserName@12
-LsaGetSystemAccessAccount@8
-LsaGetUserName@8
-LsaICLookupNames@32
-LsaICLookupSids@32
-LsaLookupNames@20
-LsaLookupPrivilegeDisplayName@16
-LsaLookupPrivilegeName@12
-LsaLookupPrivilegeValue@12
-LsaLookupSids@20
-LsaNtStatusToWinError@4
-LsaOpenAccount@16
-LsaOpenPolicy@16
-LsaOpenSecret@16
-LsaOpenTrustedDomain@16
-LsaOpenTrustedDomainByName@16
-LsaQueryDomainInformationPolicy@12
-LsaQueryInfoTrustedDomain@12
-LsaQueryInformationPolicy@12
-LsaQuerySecret@20
-LsaQuerySecurityObject@12
-LsaQueryTrustedDomainInfo@16
-LsaQueryTrustedDomainInfoByName@16
-LsaRemoveAccountRights@20
-LsaRemovePrivilegesFromAccount@12
-LsaRetrievePrivateData@12
-LsaSetDomainInformationPolicy@12
-LsaSetInformationPolicy@12
-LsaSetInformationTrustedDomain@12
-LsaSetQuotasForAccount@8
-LsaSetSecret@12
-LsaSetSecurityObject@12
-LsaSetSystemAccessAccount@8
-LsaSetTrustedDomainInfoByName@16
-LsaSetTrustedDomainInformation@16
-LsaStorePrivateData@12
-MakeAbsoluteSD2@8
-MakeAbsoluteSD@44
-MakeSelfRelativeSD@12
-MapGenericMask@8
-NotifyBootConfigStatus@4
-NotifyChangeEventLog@8
-ObjectCloseAuditAlarmA@12
-ObjectCloseAuditAlarmW@12
-ObjectDeleteAuditAlarmA@12
-ObjectDeleteAuditAlarmW@12
-ObjectOpenAuditAlarmA@48
-ObjectOpenAuditAlarmW@48
-ObjectPrivilegeAuditAlarmA@24
-ObjectPrivilegeAuditAlarmW@24
-OpenBackupEventLogA@8
-OpenBackupEventLogW@8
-OpenEncryptedFileRawA@12
-OpenEncryptedFileRawW@12
-OpenEventLogA@8
-OpenEventLogW@8
-OpenProcessToken@12
-OpenSCManagerA@12
-OpenSCManagerW@12
-OpenServiceA@12
-OpenServiceW@12
-OpenThreadToken@16
-OpenTraceA@4
-OpenTraceW@4
-PrivilegeCheck@12
-PrivilegedServiceAuditAlarmA@20
-PrivilegedServiceAuditAlarmW@20
-ProcessTrace@16
-QueryAllTracesA@12
-QueryAllTracesW@12
-QueryRecoveryAgentsOnEncryptedFile@8
-QueryServiceConfig2A@20
-QueryServiceConfig2W@20
-QueryServiceConfigA@16
-QueryServiceConfigW@16
-QueryServiceLockStatusA@16
-QueryServiceLockStatusW@16
-QueryServiceObjectSecurity@20
-QueryServiceStatus@8
-QueryServiceStatusEx@20
-QueryUsersOnEncryptedFile@8
-QueryWindows31FilesMigration@4
-ReadEncryptedFileRaw@12
-ReadEventLogA@28
-ReadEventLogW@28
-RegCloseKey@4
-RegConnectRegistryA@12
-RegConnectRegistryW@12
-RegCreateKeyA@12
-RegCreateKeyExA@36
-RegCreateKeyExW@36
-RegCreateKeyW@12
-RegDeleteKeyA@8
-RegDeleteKeyW@8
-RegDeleteValueA@8
-RegDeleteValueW@8
-RegDisablePredefinedCache@0
-RegEnumKeyA@16
-RegEnumKeyExA@32
-RegEnumKeyExW@32
-RegEnumKeyW@16
-RegEnumValueA@32
-RegEnumValueW@32
-RegFlushKey@4
-RegGetKeySecurity@16
-RegLoadKeyA@12
-RegLoadKeyW@12
-RegNotifyChangeKeyValue@20
-RegOpenCurrentUser@8
-RegOpenKeyA@12
-RegOpenKeyExA@20
-RegOpenKeyExW@20
-RegOpenKeyW@12
-RegOpenUserClassesRoot@16
-RegOverridePredefKey@8
-RegQueryInfoKeyA@48
-RegQueryInfoKeyW@48
-RegQueryMultipleValuesA@20
-RegQueryMultipleValuesW@20
-RegQueryValueA@16
-RegQueryValueExA@24
-RegQueryValueExW@24
-RegQueryValueW@16
-RegReplaceKeyA@16
-RegReplaceKeyW@16
-RegRestoreKeyA@12
-RegRestoreKeyW@12
-RegSaveKeyA@12
-RegSaveKeyW@12
-RegSetKeySecurity@12
-RegSetValueA@20
-RegSetValueExA@24
-RegSetValueExW@24
-RegSetValueW@20
-RegUnLoadKeyA@8
-RegUnLoadKeyW@8
-RegisterEventSourceA@8
-RegisterEventSourceW@8
-RegisterServiceCtrlHandlerA@8
-RegisterServiceCtrlHandlerExA@12
-RegisterServiceCtrlHandlerExW@12
-RegisterServiceCtrlHandlerW@8
-RegisterTraceGuidsA@32
-RegisterTraceGuidsW@32
-RemoveTraceCallback@4
-RemoveUsersFromEncryptedFile@8
-ReportEventA@36
-ReportEventW@36
-RevertToSelf@0
-SetAclInformation@16
-SetEntriesInAccessListA@24
-SetEntriesInAccessListW@24
-SetEntriesInAclA@16
-SetEntriesInAclW@16
-SetEntriesInAuditListA@24
-SetEntriesInAuditListW@24
-SetFileSecurityA@12
-SetFileSecurityW@12
-SetKernelObjectSecurity@12
-SetNamedSecurityInfoA@28
-SetNamedSecurityInfoExA@36
-SetNamedSecurityInfoExW@36
-SetNamedSecurityInfoW@28
-SetPrivateObjectSecurity@20
-SetPrivateObjectSecurityEx@24
-SetSecurityDescriptorControl@12
-SetSecurityDescriptorDacl@16
-SetSecurityDescriptorGroup@12
-SetSecurityDescriptorOwner@12
-SetSecurityDescriptorRMControl@8
-SetSecurityDescriptorSacl@16
-SetSecurityInfo@28
-SetSecurityInfoExA@36
-SetSecurityInfoExW@36
-SetServiceBits@16
-SetServiceObjectSecurity@12
-SetServiceStatus@8
-SetThreadToken@8
-SetTokenInformation@16
-SetTraceCallback@8
-SetUserFileEncryptionKey@4
-StartServiceA@12
-StartServiceCtrlDispatcherA@4
-StartServiceCtrlDispatcherW@4
-StartServiceW@12
-StartTraceA@12
-StartTraceW@12
-SynchronizeWindows31FilesAndWindowsNTRegistry@16
-SystemFunction001@12
-SystemFunction002@12
-SystemFunction003@8
-SystemFunction004@12
-SystemFunction005@12
-SystemFunction006@8
-SystemFunction007@8
-SystemFunction008@12
-SystemFunction009@12
-SystemFunction010@12
-SystemFunction011@12
-SystemFunction012@12
-SystemFunction013@12
-SystemFunction014@12
-SystemFunction015@12
-SystemFunction016@12
-SystemFunction017@12
-SystemFunction018@12
-SystemFunction019@12
-SystemFunction020@12
-SystemFunction021@12
-SystemFunction022@12
-SystemFunction023@12
-SystemFunction024@12
-SystemFunction025@12
-SystemFunction026@12
-SystemFunction027@12
-SystemFunction028@8
-SystemFunction029@8
-SystemFunction030@8
-SystemFunction031@8
-SystemFunction032@8
-SystemFunction033@8
-SystemFunction034@12
-TraceEvent@12
-TraceEventInstance@20
-TrusteeAccessToObjectA@24
-TrusteeAccessToObjectW@24
-UninstallApplication@4
-UnlockServiceDatabase@4
-UnregisterTraceGuids@8
-WriteEncryptedFileRaw@12
diff --git a/winsup/w32api/lib/avicap32.def b/winsup/w32api/lib/avicap32.def
deleted file mode 100644
index cde12a472..000000000
--- a/winsup/w32api/lib/avicap32.def
+++ /dev/null
@@ -1,8 +0,0 @@
-LIBRARY AVICAP32.DLL
-EXPORTS
-videoThunk32@20
-capGetDriverDescriptionW@20
-capGetDriverDescriptionA@20
-capCreateCaptureWindowW@32
-capCreateCaptureWindowA@32
-AppCleanup@4
diff --git a/winsup/w32api/lib/avifil32.def b/winsup/w32api/lib/avifil32.def
deleted file mode 100644
index 32f8cb633..000000000
--- a/winsup/w32api/lib/avifil32.def
+++ /dev/null
@@ -1,77 +0,0 @@
-LIBRARY AVIFIL32.DLL
-EXPORTS
-IID_IGetFrame
-IID_IAVIStream
-IID_IAVIFile
-IID_IAVIEditStream
-EditStreamSetNameW@8
-EditStreamSetNameA@8
-EditStreamSetName@8
-EditStreamSetInfoW@12
-EditStreamSetInfoA@12
-EditStreamSetInfo@12
-EditStreamPaste@24
-EditStreamCut@16
-EditStreamCopy@16
-EditStreamClone@8
-CreateEditableStream@8
-AVIStreamWriteData@16
-AVIStreamWrite@32
-AVIStreamTimeToSample@8
-AVIStreamStart@4
-AVIStreamSetFormat@16
-AVIStreamSampleToTime@8
-AVIStreamRelease@4
-AVIStreamReadFormat@16
-AVIStreamReadData@16
-AVIStreamRead@28
-AVIStreamOpenFromFileW@24
-AVIStreamOpenFromFileA@24
-AVIStreamOpenFromFile@24
-AVIStreamLength@4
-AVIStreamInfoW@12
-AVIStreamInfoA@12
-AVIStreamInfo@12
-AVIStreamGetFrameOpen@8
-AVIStreamGetFrameClose@4
-AVIStreamGetFrame@8
-AVIStreamFindSample@12
-AVIStreamEndStreaming@4
-AVIStreamCreate@16
-AVIStreamBeginStreaming@16
-AVIStreamAddRef@4
-AVISaveW
-AVISaveVW@24
-AVISaveVA@24
-AVISaveV@24
-AVISaveOptionsFree@8
-AVISaveOptions@20
-AVISaveA
-AVISave
-AVIPutFileOnClipboard@4
-AVIMakeStreamFromClipboard@12
-AVIMakeFileFromStreams@12
-AVIMakeCompressedStream@16
-AVIGetFromClipboard@4
-AVIFileWriteData@16
-AVIFileRelease@4
-AVIFileReadData@16
-AVIFileOpenW@16
-AVIFileOpenA@16
-AVIFileOpen@16
-AVIFileInit@0
-AVIFileInfoW@12
-AVIFileInfoA@12
-AVIFileInfo@12
-AVIFileGetStream@16
-AVIFileExit@0
-AVIFileEndRecord@4
-AVIFileCreateStreamW@12
-AVIFileCreateStreamA@12
-AVIFileCreateStream@12
-AVIFileAddRef@4
-AVIClearClipboard@0
-AVIBuildFilterW@12
-AVIBuildFilterA@12
-AVIBuildFilter@12
-
diff --git a/winsup/w32api/lib/cap.def b/winsup/w32api/lib/cap.def
deleted file mode 100644
index 8732ca0cc..000000000
--- a/winsup/w32api/lib/cap.def
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY CAP.DLL
-EXPORTS
-DumpCAP@0
-StartCAP@0
-StopCAP@0
-_penter
diff --git a/winsup/w32api/lib/comctl32.def b/winsup/w32api/lib/comctl32.def
deleted file mode 100644
index 00f5d52d8..000000000
--- a/winsup/w32api/lib/comctl32.def
+++ /dev/null
@@ -1,129 +0,0 @@
-LIBRARY COMCTL32.DLL
-EXPORTS
-_TrackMouseEvent@4
-AddMRUData@12
-AddMRUStringA@8
-AddMRUStringW@8
-Alloc@4
-CreateMRUListA@4
-CreateMRUListW@4
-CreateMappedBitmap@20
-CreatePage@8
-CreatePropertySheetPage@4
-CreatePropertySheetPageA@4
-CreatePropertySheetPageW@4
-CreateProxyPage@8
-CreateStatusWindow@16
-CreateStatusWindowA@16
-CreateStatusWindowW@16
-CreateToolbar@32
-CreateToolbarEx@52
-CreateUpDownControl@48
-DPA_Clone@8
-DPA_Create@4
-DPA_CreateEx@8
-DPA_DeleteAllPtrs@4
-DPA_DeletePtr@8
-DPA_Destroy@4
-DPA_GetPtr@8
-DPA_GetPtrIndex@8
-DPA_Grow@8
-DPA_InsertPtr@12
-DPA_Search@24
-DPA_SetPtr@12
-DPA_Sort@12
-DSA_Create@8
-DSA_DeleteAllItems@4
-DSA_DeleteItem@8
-DSA_Destroy@4
-DSA_GetItem@12
-DSA_GetItemPtr@8
-DSA_InsertItem@12
-DSA_SetItem@12
-DelMRUString@8
-DestroyPropertySheetPage@4
-DrawInsert@12
-DrawStatusText@16
-DrawStatusTextA@16
-DrawStatusTextW@16
-EnumMRUListA@16
-EnumMRUListW@16
-FindMRUData@16
-FindMRUStringA@12
-FindMRUStringW@12
-Free@4
-FreeMRUList@4
-GetEffectiveClientRect@12
-GetSize@4
-ImageList_Add@12
-ImageList_AddIcon@8
-ImageList_AddMasked@12
-ImageList_BeginDrag@16
-ImageList_Create@20
-ImageList_Destroy@4
-ImageList_DragEnter@12
-ImageList_DragLeave@4
-ImageList_DragMove@8
-ImageList_DragShowNolock@4
-ImageList_Draw@24
-ImageList_DrawEx@40
-ImageList_EndDrag@0
-ImageList_GetBkColor@4
-ImageList_GetDragImage@8
-ImageList_GetIcon@12
-ImageList_GetIconSize@12
-ImageList_GetImageCount@4
-ImageList_GetImageInfo@12
-ImageList_GetImageRect@12
-ImageList_LoadImage@28
-ImageList_LoadImageA@28
-ImageList_LoadImageW@28
-ImageList_Merge@24
-ImageList_Read@4
-ImageList_Remove@8
-ImageList_Replace@16
-ImageList_ReplaceIcon@12
-ImageList_SetBkColor@8
-ImageList_SetDragCursorImage@16
-ImageList_SetIconSize@12
-ImageList_SetImageCount@8
-ImageList_SetOverlayImage@12
-ImageList_Write@8
-InitCommonControls@0
-InitCommonControlsEx@4
-LBItemFromPt@16
-MakeDragList@4
-MenuHelp@28
-PropertySheet@4
-PropertySheetA@4
-PropertySheetW@4
-ReAlloc@8
-SendNotify@16
-SendNotifyEx@20
-ShowHideMenuCtl@12
-StrCSpnA@8
-StrCSpnIA@8
-StrCSpnW@8
-StrChrA@8
-StrChrIA@8
-StrChrIW@8
-StrChrW@8
-StrCmpNA@12
-StrCmpNIA@12
-StrCmpNIW@12
-StrCmpNW@12
-StrRChrA@12
-StrRChrIA@12
-StrRChrW@12
-StrRStrIA@12
-StrRStrIW@12
-StrStrA@8
-StrStrIA@8
-StrStrIW@8
-StrStrW@8
-StrToIntA@4
-StrToIntW@4
-Str_GetPtrA@12
-Str_GetPtrW@12
-Str_SetPtrA@8
-Str_SetPtrW@8
diff --git a/winsup/w32api/lib/comdlg32.def b/winsup/w32api/lib/comdlg32.def
deleted file mode 100644
index 82806aa03..000000000
--- a/winsup/w32api/lib/comdlg32.def
+++ /dev/null
@@ -1,27 +0,0 @@
-LIBRARY COMDLG32.DLL
-EXPORTS
-ChooseColorA@4
-ChooseColorW@4
-ChooseFontA@4
-ChooseFontW@4
-CommDlgExtendedError@0
-FindTextA@4
-FindTextW@4
-GetFileTitleA@12
-GetFileTitleW@12
-GetOpenFileNameA@4
-GetOpenFileNameW@4
-GetSaveFileNameA@4
-GetSaveFileNameW@4
-LoadAlterBitmap@12
-PageSetupDlgA@4
-PageSetupDlgW@4
-PrintDlgA@4
-PrintDlgExA@4
-PrintDlgExW@4
-PrintDlgW@4
-ReplaceTextA@4
-ReplaceTextW@4
-WantArrows@16
-dwLBSubclass@16
-dwOKSubclass@16
diff --git a/winsup/w32api/lib/crypt32.def b/winsup/w32api/lib/crypt32.def
deleted file mode 100644
index c778f1d06..000000000
--- a/winsup/w32api/lib/crypt32.def
+++ /dev/null
@@ -1,15 +0,0 @@
-LIBRARY CRYPT32.DLL
-EXPORTS
-CertFreeCertificateChain@4
-CertGetCertificateChain@32
-CertNameToStrA@20
-CertNameToStrW@20
-CertVerifyCertificateChainPolicy@16
-CertCloseStore@8
-CertOpenSystemStoreA@8
-CertOpenSystemStoreW@8
-CertFindCertificateInStore@24
-CertFreeCertificateContext@4
-CertGetIssuerCertificateFromStore@16
-CertFindChainInStore@24
-CertOpenStore@20
diff --git a/winsup/w32api/lib/ctl3d32.def b/winsup/w32api/lib/ctl3d32.def
deleted file mode 100644
index 130c0a567..000000000
--- a/winsup/w32api/lib/ctl3d32.def
+++ /dev/null
@@ -1,27 +0,0 @@
-LIBRARY CTL3D32.DLL
-EXPORTS
-BtnWndProc3d@16
-ComboWndProc3d@16
-Ctl3dAutoSubclass@4
-Ctl3dAutoSubclassEx@8
-Ctl3dColorChange@0
-Ctl3dCtlColor@8
-Ctl3dCtlColorEx@12
-Ctl3dDlgFramePaint@16
-Ctl3dDlgProc@16
-Ctl3dEnabled@0
-Ctl3dGetVer@0
-Ctl3dIsAutoSubclass@0
-Ctl3dRegister@4
-Ctl3dSetStyle@12
-Ctl3dSubclassCtl@4
-Ctl3dSubclassCtlEx@8
-Ctl3dSubclassDlg@8
-Ctl3dSubclassDlgEx@8
-Ctl3dUnAutoSubclass@0
-Ctl3dUnregister@4
-Ctl3dUnsubclassCtl@4
-Ctl3dWinIniChange@0
-EditWndProc3d@16
-ListWndProc3d@16
-StaticWndProc3d@16
diff --git a/winsup/w32api/lib/d3dim.def b/winsup/w32api/lib/d3dim.def
deleted file mode 100644
index 4cdfbb6e9..000000000
--- a/winsup/w32api/lib/d3dim.def
+++ /dev/null
@@ -1,8 +0,0 @@
-; from DirectX 6.1
-LIBRARY d3dim.dll
-EXPORTS
-Direct3DCreate@12
-Direct3D_HALCleanUp@8
-SpanInit
-g_fOneMinusEps
-g_fTwoPow31
diff --git a/winsup/w32api/lib/d3drm.def b/winsup/w32api/lib/d3drm.def
deleted file mode 100644
index 2dd1693b5..000000000
--- a/winsup/w32api/lib/d3drm.def
+++ /dev/null
@@ -1,24 +0,0 @@
-; from DirectX 6.1
-LIBRARY d3drm.dll
-EXPORTS
-D3DRMColorGetAlpha@4
-D3DRMColorGetBlue@4
-D3DRMColorGetGreen@4
-D3DRMColorGetRed@4
-D3DRMCreateColorRGB@12
-D3DRMCreateColorRGBA@16
-D3DRMMatrixFromQuaternion@8
-D3DRMQuaternionFromRotation@12
-D3DRMQuaternionMultiply@12
-D3DRMQuaternionSlerp@16
-D3DRMVectorAdd@12
-D3DRMVectorCrossProduct@12
-D3DRMVectorDotProduct@8
-D3DRMVectorModulus@4
-D3DRMVectorNormalize@4
-D3DRMVectorRandom@4
-D3DRMVectorReflect@12
-D3DRMVectorRotate@16
-D3DRMVectorScale@12
-D3DRMVectorSubtract@12
-Direct3DRMCreate@4
diff --git a/winsup/w32api/lib/d3dxof.def b/winsup/w32api/lib/d3dxof.def
deleted file mode 100644
index e2b9b9aa6..000000000
--- a/winsup/w32api/lib/d3dxof.def
+++ /dev/null
@@ -1,4 +0,0 @@
-; from DirectX 6.1
-LIBRARY d3dxof.dll
-EXPORTS
-DirectXFileCreate@4
diff --git a/winsup/w32api/lib/ddk/Makefile.in b/winsup/w32api/lib/ddk/Makefile.in
deleted file mode 100644
index fa2ebcff4..000000000
--- a/winsup/w32api/lib/ddk/Makefile.in
+++ /dev/null
@@ -1,195 +0,0 @@
-# Makefile.in
-#
-# This file is part of a free library building Windows NT drivers.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-# start config section
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-host_alias = @host@
-build_alias = @build@
-target_alias = @target@
-prefix = @prefix@
-includedir:=@includedir@
-
-program_transform_name = @program_transform_name@
-exec_prefix = @exec_prefix@
-libdir:=@libdir@
-bindir = @bindir@
-ifeq ($(target_alias),$(host_alias))
-ifeq ($(build_alias),$(host_alias))
-tooldir:=$(exec_prefix)
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-else
-tooldir:=$(exec_prefix)/$(target_alias)
-endif
-datadir = @datadir@
-infodir = @infodir@
-ifneq (,$(findstring cygwin,$(target_alias)))
-inst_includedir:=$(tooldir)/include/w32api/ddk
-inst_libdir:=$(tooldir)/lib/w32api
-else
-inst_includedir:=$(includedir)/ddk
-inst_libdir:=$(libdir)
-endif
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-mkinstalldirs = mkdir -p
-
-CC = @CC@
-CC_FOR_TARGET = $(CC)
-
-DLLTOOL = @DLLTOOL@
-DLLTOOL_FLAGS = --as=$(AS) -k
-AS = @AS@
-AS_FOR_TARGET = $(AS_FOR_TARGET)
-WINDRES = @WINDRES@
-
-# Depending on if we build as part of winsup or mingw we need to
-# add additional include paths in order to get the correct headers
-# from the C library.
-BUILDENV = @BUILDENV@
-
-ifeq ($(BUILDENV), cygwin)
-# winsup/include
-# winsup/../newlib/libc/include
-# winsup/../newlib/libc/sys/cygwin
-EXTRA_INCLUDES = -I$(srcdir)/../../include -I$(srcdir)/../../../newlib/libc/include -I$(srcdir)/../../../newlib/libc/sys/cygwin
-endif
-ifeq ($(BUILDENV), mingw)
-EXTRA_INCLUDES = -I$(srcdir)/../../mingw/include
-endif
-
-INCLUDES = -I$(srcdir)/../include $(EXTRA_INCLUDES)
-
-CFLAGS = @CFLAGS@
-ALL_CFLAGS = $(CFLAGS) $(INCLUDES)
-
-RANLIB = @RANLIB@
-AR = @AR@
-LD = @LD@
-
-# end config section
-
-# headers
-
-HEADERS = $(notdir $(wildcard $(srcdir)/../../include/ddk/*.h))
-
-# libraries
-
-DEF_FILES = $(notdir $(wildcard $(srcdir)/*.def))
-IMPLIBS = $(addprefix lib,$(subst .def,.a,$(DEF_FILES)))
-LIBS = $(IMPLIBS)
-
-DISTFILES = Makefile.in $(DEF_FILES)
-
-.NOTPARALLEL:
-
-# targets
-all: $(LIBS)
-
-TEST_OPTIONS = $(ALL_CFLAGS) -Wall -pedantic -Wsystem-headers -c $(srcdir)/test.c -o test.o
-.PHONY: test
-test:
-	@echo "Testing ddk..."
-	@for lang in c c++ objective-c ; do \
-		echo "$$lang..."; \
-		$(CC) -x$$lang $(TEST_OPTIONS) ; \
-		echo "$$lang UNICODE..."; \
-		$(CC) -x$$lang -DUNICODE $(TEST_OPTIONS) ; \
-	done
-	@echo "windres..."
-	@$(WINDRES) --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
-	@echo "windres UNICODE..."
-	@$(WINDRES) --define UNICODE --include-dir $(INCDIR) -i $(srcdir)/res.rc -o test.o
-	@rm -f test.o
-
-# make rules
-
-.SUFFIXES: .c .o .def .a
-
-.c.o:
-	$(CC) -c $(ALL_CFLAGS) -o $@ $<
-
-lib%.a : %.def %.o
-	$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $(srcdir)/$*.def
-	$(AR) r $@ $*.o
-	$(RANLIB) $@
-
-lib%.a: %.def
-	$(DLLTOOL) $(DLLTOOL_FLAGS) --output-lib $@ --def $<
-
-lib%.a: %.o
-	$(AR) rc $@ $*.o
-	$(RANLIB) $@
-
-# install headers and libraries in a target specified directory.
-install: install-libraries install-headers
-
-install-libraries: all
-	$(mkinstalldirs) $(inst_libdir)
-	for i in $(LIBS); do \
-		$(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
-	done
-
-install-headers:
-	$(mkinstalldirs) $(inst_includedir)
-	for i in $(HEADERS); do \
-		$(INSTALL_DATA) $(srcdir)/../../include/ddk/$$i $(inst_includedir)/$$i ; \
-	done
-
-# uninstall headers and libraries from a target specified directory
-uninstall: uninstall-libraries uninstall-headers
-
-uninstall-libraries:
-	@for i in $(LIBS); do \
-		rm -f $(inst_libdir)/$$i ; \
-	done
-	rmdir $(inst_libdir)
-
-uninstall-headers:
-	@for i in $(HEADERS); do \
-		rm -r $(inst_includedir)/$$i ; \
-	done
-	rmdir $(inst_includedir)
-
-
-dist:
-	mkdir $(distdir)/include/ddk
-	chmod 755 $(distdir)/include/ddk
-	@for i in $(HEADERS); do \
-		cp -p $(srcdir)/../../include/ddk/$$i $(distdir)/include/ddk/$$i ; \
-	done
-	mkdir $(distdir)/lib/ddk
-	chmod 755 $(distdir)/lib/ddk
-	@for i in $(DISTFILES); do \
-		cp -p $(srcdir)/$$i $(distdir)/lib/ddk/$$i ; \
-	done
-
-Makefile: Makefile.in ../../config.status ../../configure
-	cd ../..; $(SHELL) config.status
-
-# clean
-
-mostlyclean:
-	rm -f *~ *.o *.s
-
-clean:
-	rm -f *.o *.a *.s *~
-
-distclean: clean
-	rm -f config.cache config.status config.log Makefile
-
-maintainer-clean: distclean
diff --git a/winsup/w32api/lib/ddk/apcups.def b/winsup/w32api/lib/ddk/apcups.def
deleted file mode 100644
index b82d09991..000000000
--- a/winsup/w32api/lib/ddk/apcups.def
+++ /dev/null
@@ -1,8 +0,0 @@
-LIBRARY apcups.dll
-EXPORTS
-UPSCancelWait@0
-UPSGetState@0
-UPSInit@0
-UPSStop@0
-UPSTurnOff@4
-UPSWaitForStateChange@8
diff --git a/winsup/w32api/lib/ddk/cfgmgr32.def b/winsup/w32api/lib/ddk/cfgmgr32.def
deleted file mode 100644
index 412c3f54b..000000000
--- a/winsup/w32api/lib/ddk/cfgmgr32.def
+++ /dev/null
@@ -1,394 +0,0 @@
-LIBRARY cfgmgr32.dll
-EXPORTS
-;CMP_Init_Detection
-;CMP_RegisterNotification
-;CMP_Report_LogOn
-;CMP_UnregisterNotification
-CMP_WaitNoPendingInstallEvents@4
-;CMP_WaitServicesAvailable
-CM_Add_Empty_Log_Conf@16
-CM_Add_Empty_Log_Conf_Ex@20
-CM_Add_IDA@16
-CM_Add_IDW@16
-CM_Add_ID_ExA@16
-CM_Add_ID_ExW@16
-;CM_Add_Range
-CM_Add_Res_Des@24
-CM_Add_Res_Des_Ex@28
-CM_Connect_MachineA@8
-CM_Connect_MachineW@8
-;CM_Create_DevNodeA
-;CM_Create_DevNodeW
-;CM_Create_DevNode_ExA
-;CM_Create_DevNode_ExW
-;CM_Create_Range_List
-;CM_Delete_Class_Key
-;CM_Delete_Class_Key_Ex
-;CM_Delete_DevNode_Key
-;CM_Delete_DevNode_Key_Ex
-;CM_Delete_Range
-;CM_Detect_Resource_Conflict
-;CM_Detect_Resource_Conflict_Ex
-;CM_Disable_DevNode
-;CM_Disable_DevNode_Ex
-CM_Disconnect_Machine@4
-;CM_Dup_Range_List
-;CM_Enable_DevNode
-;CM_Enable_DevNode_Ex
-CM_Enumerate_Classes@12
-CM_Enumerate_Classes_Ex@16
-CM_Enumerate_EnumeratorsA@16
-CM_Enumerate_EnumeratorsW@16
-CM_Enumerate_Enumerators_ExA@20
-CM_Enumerate_Enumerators_ExW@20
-;CM_Find_Range
-;CM_First_Range
-CM_Free_Log_Conf@8
-CM_Free_Log_Conf_Ex@12
-CM_Free_Log_Conf_Handle@4
-;CM_Free_Range_List
-CM_Free_Res_Des@12
-CM_Free_Res_Des_Ex@16
-CM_Free_Res_Des_Handle@4
-CM_Free_Resource_Conflict_Handle@4
-CM_Get_Child@12
-CM_Get_Child_Ex@16
-;CM_Get_Class_Key_NameA
-;CM_Get_Class_Key_NameW
-;CM_Get_Class_Key_Name_ExA
-;CM_Get_Class_Key_Name_ExW
-;CM_Get_Class_NameA
-;CM_Get_Class_NameW
-;CM_Get_Class_Name_ExA
-;CM_Get_Class_Name_ExW
-;CM_Get_Class_Registry_PropertyA
-;CM_Get_Class_Registry_PropertyW
-CM_Get_Depth@12
-CM_Get_Depth_Ex@16
-;CM_Get_DevNode_Registry_PropertyA
-;CM_Get_DevNode_Registry_PropertyW
-;CM_Get_DevNode_Registry_Property_ExA
-;CM_Get_DevNode_Registry_Property_ExW
-CM_Get_DevNode_Status@16
-CM_Get_DevNode_Status_Ex@20
-CM_Get_Device_IDA@16
-CM_Get_Device_IDW@16
-CM_Get_Device_ID_ExA@20
-CM_Get_Device_ID_ExW@20
-CM_Get_Device_ID_ListA@16
-CM_Get_Device_ID_ListW@16
-CM_Get_Device_ID_List_ExA@20
-CM_Get_Device_ID_List_ExW@20
-CM_Get_Device_ID_List_SizeA@12
-CM_Get_Device_ID_List_SizeW@12
-CM_Get_Device_ID_List_Size_ExA@16
-CM_Get_Device_ID_List_Size_ExW@16
-CM_Get_Device_ID_Size@12
-CM_Get_Device_ID_Size_Ex@16
-;CM_Get_Device_Interface_AliasA
-;CM_Get_Device_Interface_AliasW
-;CM_Get_Device_Interface_Alias_ExA
-;CM_Get_Device_Interface_Alias_ExW
-;CM_Get_Device_Interface_ListA
-;CM_Get_Device_Interface_ListW
-;CM_Get_Device_Interface_List_ExA
-;CM_Get_Device_Interface_List_ExW
-;CM_Get_Device_Interface_List_SizeA
-;CM_Get_Device_Interface_List_SizeW
-;CM_Get_Device_Interface_List_Size_ExA
-;CM_Get_Device_Interface_List_Size_ExW
-CM_Get_First_Log_Conf@12
-CM_Get_First_Log_Conf_Ex@16
-;CM_Get_Global_State
-;CM_Get_Global_State_Ex
-;CM_Get_HW_Prof_FlagsA
-;CM_Get_HW_Prof_FlagsW
-;CM_Get_HW_Prof_Flags_ExA
-;CM_Get_HW_Prof_Flags_ExW
-;CM_Get_Hardware_Profile_InfoA
-;CM_Get_Hardware_Profile_InfoW
-;CM_Get_Hardware_Profile_Info_ExA
-;CM_Get_Hardware_Profile_Info_ExW
-CM_Get_Log_Conf_Priority@12
-CM_Get_Log_Conf_Priority_Ex@16
-CM_Get_Next_Log_Conf@12
-CM_Get_Next_Log_Conf_Ex@16
-CM_Get_Next_Res_Des@20
-CM_Get_Next_Res_Des_Ex@24
-CM_Get_Parent@12
-CM_Get_Parent_Ex@16
-CM_Get_Res_Des_Data@16
-CM_Get_Res_Des_Data_Ex@20
-CM_Get_Res_Des_Data_Size@12
-CM_Get_Res_Des_Data_Size_Ex@16
-CM_Get_Resource_Conflict_Count@8
-CM_Get_Resource_Conflict_DetailsA@12
-CM_Get_Resource_Conflict_DetailsW@12
-CM_Get_Sibling@12
-CM_Get_Sibling_Ex@16
-CM_Get_Version@0
-CM_Get_Version_Ex@4
-;CM_Intersect_Range_List
-;CM_Invert_Range_List
-;CM_Is_Dock_Station_Present
-;CM_Is_Dock_Station_Present_Ex
-CM_Locate_DevNodeA@12
-CM_Locate_DevNodeW@12
-CM_Locate_DevNode_ExA@16
-CM_Locate_DevNode_ExW@16
-;CM_Merge_Range_List
-CM_Modify_Res_Des@24
-CM_Modify_Res_Des_Ex@28
-;CM_Move_DevNode
-;CM_Move_DevNode_Ex
-;CM_Next_Range
-;CM_Open_Class_KeyA
-;CM_Open_Class_KeyW
-;CM_Open_Class_Key_ExA
-;CM_Open_Class_Key_ExW
-;CM_Open_DevNode_Key
-;CM_Open_DevNode_Key_Ex
-CM_Query_And_Remove_SubTreeA@20
-CM_Query_And_Remove_SubTreeW@20
-CM_Query_And_Remove_SubTree_ExA@0
-CM_Query_And_Remove_SubTree_ExW@0
-;CM_Query_Arbitrator_Free_Data
-;CM_Query_Arbitrator_Free_Data_Ex
-;CM_Query_Arbitrator_Free_Size
-;CM_Query_Arbitrator_Free_Size_Ex
-;CM_Query_Remove_SubTree
-;CM_Query_Remove_SubTree_Ex
-CM_Query_Resource_Conflict_List@28
-CM_Reenumerate_DevNode@8
-CM_Reenumerate_DevNode_Ex@12
-;CM_Register_Device_Driver
-;CM_Register_Device_Driver_Ex
-;CM_Register_Device_InterfaceA
-;CM_Register_Device_InterfaceW
-;CM_Register_Device_Interface_ExA
-;CM_Register_Device_Interface_ExW
-;CM_Remove_SubTree
-;CM_Remove_SubTree_Ex
-;CM_Request_Eject_PC
-;CM_Request_Eject_PC_Ex
-;CM_Run_Detection
-;CM_Run_Detection_Ex
-;CM_Set_Class_Registry_PropertyA
-;CM_Set_Class_Registry_PropertyW
-;CM_Set_DevNode_Problem
-;CM_Set_DevNode_Problem_Ex
-;CM_Set_DevNode_Registry_PropertyA
-;CM_Set_DevNode_Registry_PropertyW
-;CM_Set_DevNode_Registry_Property_ExA
-;CM_Set_DevNode_Registry_Property_ExW
-;CM_Set_HW_Prof
-;CM_Set_HW_Prof_Ex
-;CM_Set_HW_Prof_FlagsA
-;CM_Set_HW_Prof_FlagsW
-;CM_Set_HW_Prof_Flags_ExA
-;CM_Set_HW_Prof_Flags_ExW
-;CM_Setup_DevNode
-;CM_Setup_DevNode_Ex
-;CM_Test_Range_Available
-;CM_Uninstall_DevNode
-;CM_Uninstall_DevNode_Ex
-;CM_Unregister_Device_InterfaceA
-;CM_Unregister_Device_InterfaceW
-;CM_Unregister_Device_Interface_ExA
-;CM_Unregister_Device_Interface_ExW
-;CMP_Init_Detection
-;CMP_RegisterNotification
-;CMP_Report_LogOn
-;CMP_UnregisterNotification
-CMP_WaitNoPendingInstallEvents@4
-;CMP_WaitServicesAvailable
-CM_Add_Empty_Log_Conf@16
-CM_Add_Empty_Log_Conf_Ex@20
-CM_Add_IDA@16
-CM_Add_IDW@16
-CM_Add_ID_ExA@16
-CM_Add_ID_ExW@16
-;CM_Add_Range
-CM_Add_Res_Des@24
-CM_Add_Res_Des_Ex@28
-CM_Connect_MachineA@8
-CM_Connect_MachineW@8
-;CM_Create_DevNodeA
-;CM_Create_DevNodeW
-;CM_Create_DevNode_ExA
-;CM_Create_DevNode_ExW
-;CM_Create_Range_List
-;CM_Delete_Class_Key
-;CM_Delete_Class_Key_Ex
-;CM_Delete_DevNode_Key
-;CM_Delete_DevNode_Key_Ex
-;CM_Delete_Range
-;CM_Detect_Resource_Conflict
-;CM_Detect_Resource_Conflict_Ex
-;CM_Disable_DevNode
-;CM_Disable_DevNode_Ex
-CM_Disconnect_Machine@4
-;CM_Dup_Range_List
-;CM_Enable_DevNode
-;CM_Enable_DevNode_Ex
-CM_Enumerate_Classes@12
-CM_Enumerate_Classes_Ex@16
-CM_Enumerate_EnumeratorsA@16
-CM_Enumerate_EnumeratorsW@16
-CM_Enumerate_Enumerators_ExA@20
-CM_Enumerate_Enumerators_ExW@20
-;CM_Find_Range
-;CM_First_Range
-CM_Free_Log_Conf@8
-CM_Free_Log_Conf_Ex@12
-CM_Free_Log_Conf_Handle@4
-;CM_Free_Range_List
-CM_Free_Res_Des@12
-CM_Free_Res_Des_Ex@16
-CM_Free_Res_Des_Handle@4
-CM_Free_Resource_Conflict_Handle@4
-CM_Get_Child@12
-CM_Get_Child_Ex@16
-;CM_Get_Class_Key_NameA
-;CM_Get_Class_Key_NameW
-;CM_Get_Class_Key_Name_ExA
-;CM_Get_Class_Key_Name_ExW
-;CM_Get_Class_NameA
-;CM_Get_Class_NameW
-;CM_Get_Class_Name_ExA
-;CM_Get_Class_Name_ExW
-;CM_Get_Class_Registry_PropertyA
-;CM_Get_Class_Registry_PropertyW
-CM_Get_Depth@12
-CM_Get_Depth_Ex@16
-;CM_Get_DevNode_Registry_PropertyA
-;CM_Get_DevNode_Registry_PropertyW
-;CM_Get_DevNode_Registry_Property_ExA
-;CM_Get_DevNode_Registry_Property_ExW
-CM_Get_DevNode_Status@16
-CM_Get_DevNode_Status_Ex@20
-CM_Get_Device_IDA@16
-CM_Get_Device_IDW@16
-CM_Get_Device_ID_ExA@20
-CM_Get_Device_ID_ExW@20
-CM_Get_Device_ID_ListA@16
-CM_Get_Device_ID_ListW@16
-CM_Get_Device_ID_List_ExA@20
-CM_Get_Device_ID_List_ExW@20
-CM_Get_Device_ID_List_SizeA@12
-CM_Get_Device_ID_List_SizeW@12
-CM_Get_Device_ID_List_Size_ExA@16
-CM_Get_Device_ID_List_Size_ExW@16
-CM_Get_Device_ID_Size@12
-CM_Get_Device_ID_Size_Ex@16
-;CM_Get_Device_Interface_AliasA
-;CM_Get_Device_Interface_AliasW
-;CM_Get_Device_Interface_Alias_ExA
-;CM_Get_Device_Interface_Alias_ExW
-;CM_Get_Device_Interface_ListA
-;CM_Get_Device_Interface_ListW
-;CM_Get_Device_Interface_List_ExA
-;CM_Get_Device_Interface_List_ExW
-;CM_Get_Device_Interface_List_SizeA
-;CM_Get_Device_Interface_List_SizeW
-;CM_Get_Device_Interface_List_Size_ExA
-;CM_Get_Device_Interface_List_Size_ExW
-CM_Get_First_Log_Conf@12
-CM_Get_First_Log_Conf_Ex@16
-;CM_Get_Global_State
-;CM_Get_Global_State_Ex
-;CM_Get_HW_Prof_FlagsA
-;CM_Get_HW_Prof_FlagsW
-;CM_Get_HW_Prof_Flags_ExA
-;CM_Get_HW_Prof_Flags_ExW
-;CM_Get_Hardware_Profile_InfoA
-;CM_Get_Hardware_Profile_InfoW
-;CM_Get_Hardware_Profile_Info_ExA
-;CM_Get_Hardware_Profile_Info_ExW
-CM_Get_Log_Conf_Priority@12
-CM_Get_Log_Conf_Priority_Ex@16
-CM_Get_Next_Log_Conf@12
-CM_Get_Next_Log_Conf_Ex@16
-CM_Get_Next_Res_Des@20
-CM_Get_Next_Res_Des_Ex@24
-CM_Get_Parent@12
-CM_Get_Parent_Ex@16
-CM_Get_Res_Des_Data@16
-CM_Get_Res_Des_Data_Ex@20
-CM_Get_Res_Des_Data_Size@12
-CM_Get_Res_Des_Data_Size_Ex@16
-CM_Get_Resource_Conflict_Count@8
-CM_Get_Resource_Conflict_DetailsA@12
-CM_Get_Resource_Conflict_DetailsW@12
-CM_Get_Sibling@12
-CM_Get_Sibling_Ex@16
-CM_Get_Version@0
-CM_Get_Version_Ex@4
-;CM_Intersect_Range_List
-;CM_Invert_Range_List
-;CM_Is_Dock_Station_Present
-;CM_Is_Dock_Station_Present_Ex
-CM_Locate_DevNodeA@12
-CM_Locate_DevNodeW@12
-CM_Locate_DevNode_ExA@16
-CM_Locate_DevNode_ExW@16
-;CM_Merge_Range_List
-CM_Modify_Res_Des@24
-CM_Modify_Res_Des_Ex@28
-;CM_Move_DevNode
-;CM_Move_DevNode_Ex
-;CM_Next_Range
-;CM_Open_Class_KeyA
-;CM_Open_Class_KeyW
-;CM_Open_Class_Key_ExA
-;CM_Open_Class_Key_ExW
-;CM_Open_DevNode_Key
-;CM_Open_DevNode_Key_Ex
-CM_Query_And_Remove_SubTreeA@20
-CM_Query_And_Remove_SubTreeW@20
-CM_Query_And_Remove_SubTree_ExA@0
-CM_Query_And_Remove_SubTree_ExW@0
-;CM_Query_Arbitrator_Free_Data
-;CM_Query_Arbitrator_Free_Data_Ex
-;CM_Query_Arbitrator_Free_Size
-;CM_Query_Arbitrator_Free_Size_Ex
-;CM_Query_Remove_SubTree
-;CM_Query_Remove_SubTree_Ex
-CM_Query_Resource_Conflict_List@28
-CM_Reenumerate_DevNode@8
-CM_Reenumerate_DevNode_Ex@12
-;CM_Register_Device_Driver
-;CM_Register_Device_Driver_Ex
-;CM_Register_Device_InterfaceA
-;CM_Register_Device_InterfaceW
-;CM_Register_Device_Interface_ExA
-;CM_Register_Device_Interface_ExW
-;CM_Remove_SubTree
-;CM_Remove_SubTree_Ex
-;CM_Request_Eject_PC
-;CM_Request_Eject_PC_Ex
-;CM_Run_Detection
-;CM_Run_Detection_Ex
-;CM_Set_Class_Registry_PropertyA
-;CM_Set_Class_Registry_PropertyW
-;CM_Set_DevNode_Problem
-;CM_Set_DevNode_Problem_Ex
-;CM_Set_DevNode_Registry_PropertyA
-;CM_Set_DevNode_Registry_PropertyW
-;CM_Set_DevNode_Registry_Property_ExA
-;CM_Set_DevNode_Registry_Property_ExW
-;CM_Set_HW_Prof
-;CM_Set_HW_Prof_Ex
-;CM_Set_HW_Prof_FlagsA
-;CM_Set_HW_Prof_FlagsW
-;CM_Set_HW_Prof_Flags_ExA
-;CM_Set_HW_Prof_Flags_ExW
-;CM_Setup_DevNode
-;CM_Setup_DevNode_Ex
-;CM_Test_Range_Available
-;CM_Uninstall_DevNode
-;CM_Uninstall_DevNode_Ex
-;CM_Unregister_Device_InterfaceA
-;CM_Unregister_Device_InterfaceW
-;CM_Unregister_Device_Interface_ExA
-;CM_Unregister_Device_Interface_ExW
diff --git a/winsup/w32api/lib/ddk/dxapi.def b/winsup/w32api/lib/ddk/dxapi.def
deleted file mode 100644
index bff4d1bb1..000000000
--- a/winsup/w32api/lib/ddk/dxapi.def
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBRARY dxapi.sys
-EXPORTS
-;_DxApi@20
-;_DxApiGetVersion@0
-;_DxApiInitialize@32
-;_DxAutoflipUpdate@20
-;_DxEnableIRQ@8
-;_DxLoseObject@8
-;_DxUpdateCapture@12
diff --git a/winsup/w32api/lib/ddk/hal.def b/winsup/w32api/lib/ddk/hal.def
deleted file mode 100644
index 2a2119c3e..000000000
--- a/winsup/w32api/lib/ddk/hal.def
+++ /dev/null
@@ -1,94 +0,0 @@
-LIBRARY hal.dll
-EXPORTS
-@ExAcquireFastMutex@4
-@ExReleaseFastMutex@4
-@ExTryToAcquireFastMutex@4
-;HalAcquireDisplayOwnership
-;HalAdjustResourceList
-;HalAllProcessorsStarted
-;HalAllocateAdapterChannel
-HalAllocateCommonBuffer@16
-;HalAllocateCrashDumpRegisters
-HalAssignSlotResources@32
-;HalBeginSystemInterrupt
-;HalCalibratePerformanceCounter
-;HalClearSoftwareInterrupt
-;HalDisableSystemInterrupt
-;HalDisplayString
-;HalEnableSystemInterrupt
-;HalEndSystemInterrupt
-;HalFlushCommonBuffer
-HalFreeCommonBuffer@20
-HalGetAdapter@8
-HalGetBusData@20
-HalGetBusDataByOffset@24
-;HalGetEnvironmentVariable
-HalGetInterruptVector@24
-;HalHandleNMI
-;HalInitSystem
-;HalInitializeProcessor
-;HalMakeBeep
-;HalProcessorIdle
-;HalQueryDisplayParameters
-;HalQueryRealTimeClock
-HalReadDmaCounter@4
-;HalReportResourceUsage
-;HalRequestIpi
-;HalRequestSoftwareInterrupt
-;HalReturnToFirmware
-HalSetBusData@20
-HalSetBusDataByOffset@24
-;HalSetDisplayParameters
-;HalSetEnvironmentVariable
-;HalSetProfileInterval
-;HalSetRealTimeClock
-;HalSetTimeIncrement
-;HalStartNextProcessor
-;HalStartProfileInterrupt
-;HalStopProfileInterrupt
-;HalSystemVectorDispatchEntry
-HalTranslateBusAddress@20
-;IoAssignDriveLetters
-IoFlushAdapterBuffers@24
-IoFreeAdapterChannel@4
-IoFreeMapRegisters@12
-IoMapTransfer@24
-IoReadPartitionTable@16
-IoSetPartitionInformation@16
-IoWritePartitionTable@20
-;KdComPortInUse DATA
-@KeAcquireInStackQueuedSpinLock@8
-;KeAcquireInStackQueuedSpinLockRaiseToSynch
-;KeAcquireQueuedSpinLock
-;KeAcquireQueuedSpinLockRaiseToSynch
-KeAcquireSpinLock@8
-;KeAcquireSpinLockRaiseToSynch
-;KeFlushWriteBuffer
-KeGetCurrentIrql@0
-KeLowerIrql@4
-KeQueryPerformanceCounter@4
-KeRaiseIrql@8
-KeRaiseIrqlToDpcLevel@0
-;KeRaiseIrqlToSynchLevel
-@KeReleaseInStackQueuedSpinLock@4
-;KeReleaseQueuedSpinLock
-KeReleaseSpinLock@8
-KeStallExecutionProcessor@4
-;KeTryToAcquireQueuedSpinLock
-;KeTryToAcquireQueuedSpinLockRaiseToSynch
-;KfAcquireSpinLock
-;KfLowerIrql
-;KfRaiseIrql
-;KfReleaseSpinLock
-READ_PORT_BUFFER_UCHAR@12
-READ_PORT_BUFFER_ULONG@12
-READ_PORT_BUFFER_USHORT@12
-READ_PORT_UCHAR@4
-READ_PORT_ULONG@4
-READ_PORT_USHORT@4
-WRITE_PORT_BUFFER_UCHAR@12
-WRITE_PORT_BUFFER_ULONG@12
-WRITE_PORT_BUFFER_USHORT@12
-WRITE_PORT_UCHAR@8
-WRITE_PORT_ULONG@8
-WRITE_PORT_USHORT@8
diff --git a/winsup/w32api/lib/ddk/hid.def b/winsup/w32api/lib/ddk/hid.def
deleted file mode 100644
index f33616826..000000000
--- a/winsup/w32api/lib/ddk/hid.def
+++ /dev/null
@@ -1,47 +0,0 @@
-LIBRARY hid.dll
-EXPORTS
-;HidD_FlushQueue
-;HidD_FreePreparsedData
-;HidD_GetAttributes
-;HidD_GetConfiguration
-;HidD_GetFeature
-;HidD_GetHidGuid
-;HidD_GetIndexedString
-;HidD_GetInputReport
-;HidD_GetManufacturerString
-;HidD_GetMsGenreDescriptor
-;HidD_GetNumInputBuffers
-;HidD_GetPhysicalDescriptor
-;HidD_GetPreparsedData
-;HidD_GetProductString
-;HidD_GetSerialNumberString
-;HidD_Hello
-;HidD_SetConfiguration
-;HidD_SetFeature
-;HidD_SetNumInputBuffers
-;HidD_SetOutputReport
-;HidP_GetButtonCaps
-HidP_GetCaps@8
-HidP_GetData@24
-HidP_GetExtendedAttributes@20
-HidP_GetLinkCollectionNodes@12
-HidP_GetScaledUsageValue@32
-HidP_GetSpecificButtonCaps@28
-HidP_GetSpecificValueCaps@28
-HidP_GetUsageValue@32
-HidP_GetUsageValueArray@36
-HidP_GetUsages@32
-HidP_GetUsagesEx@28
-;HidP_GetValueCaps
-HidP_InitializeReportForID@20
-HidP_MaxDataListLength@8
-HidP_MaxUsageListLength@12
-HidP_SetData@24
-HidP_SetScaledUsageValue@32
-HidP_SetUsageValue@32
-HidP_SetUsageValueArray@36
-HidP_SetUsages@32
-HidP_TranslateUsagesToI8042ScanCodes@24
-HidP_UnsetUsages@32
-HidP_UsageListDifference@20
-;HidservInstaller
diff --git a/winsup/w32api/lib/ddk/hidparse.def b/winsup/w32api/lib/ddk/hidparse.def
deleted file mode 100644
index 34da10824..000000000
--- a/winsup/w32api/lib/ddk/hidparse.def
+++ /dev/null
@@ -1,32 +0,0 @@
-LIBRARY hidparse.sys
-EXPORTS
-;HidP_FreeCollectionDescription
-;HidP_GetButtonCaps
-HidP_GetCaps@8
-;HidP_GetCollectionDescription
-HidP_GetData@24
-HidP_GetExtendedAttributes@20
-HidP_GetLinkCollectionNodes@12
-HidP_GetScaledUsageValue@32
-HidP_GetSpecificButtonCaps@28
-HidP_GetSpecificValueCaps@28
-HidP_GetUsageValue@32
-HidP_GetUsageValueArray@36
-HidP_GetUsages@32
-HidP_GetUsagesEx@28
-;HidP_GetValueCaps
-HidP_InitializeReportForID@20
-HidP_MaxDataListLength@8
-HidP_MaxUsageListLength@12
-HidP_SetData@24
-HidP_SetScaledUsageValue@32
-HidP_SetUsageValue@32
-HidP_SetUsageValueArray@36
-HidP_SetUsages@32
-;HidP_SysPowerCaps
-;HidP_SysPowerEvent
-HidP_TranslateUsageAndPagesToI8042ScanCodes@24
-HidP_TranslateUsagesToI8042ScanCodes@24
-HidP_UnsetUsages@32
-HidP_UsageAndPageListDifference@20
-HidP_UsageListDifference@20
diff --git a/winsup/w32api/lib/ddk/mcd.def b/winsup/w32api/lib/ddk/mcd.def
deleted file mode 100644
index 69b6c60c0..000000000
--- a/winsup/w32api/lib/ddk/mcd.def
+++ /dev/null
@@ -1,7 +0,0 @@
-LIBRARY mcd.sys
-EXPORTS
-ChangerClassAllocatePool@8
-ChangerClassDebugPrint@8
-ChangerClassFreePool@4
-ChangerClassInitialize@12
-ChangerClassSendSrbSynchronous@20
diff --git a/winsup/w32api/lib/ddk/ndis.def b/winsup/w32api/lib/ddk/ndis.def
deleted file mode 100644
index 100ee492a..000000000
--- a/winsup/w32api/lib/ddk/ndis.def
+++ /dev/null
@@ -1,277 +0,0 @@
-LIBRARY ndis.sys
-EXPORTS
-;ArcFilterDprIndicateReceive
-;ArcFilterDprIndicateReceiveComplete
-;EthFilterDprIndicateReceive
-;EthFilterDprIndicateReceiveComplete
-;FddiFilterDprIndicateReceive
-;FddiFilterDprIndicateReceiveComplete
-NDIS_BUFFER_TO_SPAN_PAGES@4
-NdisAcquireReadWriteLock@12
-;NdisAcquireSpinLock
-NdisAdjustBufferLength@8
-NdisAllocateBuffer@20
-NdisAllocateBufferPool@12
-;NdisAllocateFromBlockPool
-NdisAllocateMemory@20
-NdisAllocateMemoryWithTag@12
-NdisAllocatePacket@12
-NdisAllocatePacketPool@16
-NdisAllocatePacketPoolEx@20
-;NdisAllocateSpinLock
-NdisAnsiStringToUnicodeString@8
-NdisBufferLength@4
-NdisBufferVirtualAddress@4
-;NdisCancelSendPackets
-;NdisCancelTimer
-NdisClAddParty@16
-NdisClCloseAddressFamily@4
-NdisClCloseCall@16
-NdisClDeregisterSap@4
-NdisClDropParty@12
-;NdisClGetProtocolVcContextFromTapiCallId
-NdisClIncomingCallComplete@12
-NdisClMakeCall@16
-NdisClModifyCallQoS@8
-NdisClOpenAddressFamily@24
-NdisClRegisterSap@16
-NdisCloseAdapter@8
-NdisCloseConfiguration@4
-;NdisCloseFile
-NdisCmActivateVc@8
-NdisCmAddPartyComplete@16
-NdisCmCloseAddressFamilyComplete@8
-NdisCmCloseCallComplete@12
-NdisCmDeactivateVc@4
-NdisCmDeregisterSapComplete@8
-NdisCmDispatchCallConnected@4
-NdisCmDispatchIncomingCall@12
-NdisCmDispatchIncomingCallQoSChange@8
-NdisCmDispatchIncomingCloseCall@16
-NdisCmDispatchIncomingDropParty@16
-NdisCmDropPartyComplete@8
-NdisCmMakeCallComplete@20
-NdisCmModifyCallQoSComplete@12
-NdisCmOpenAddressFamilyComplete@12
-NdisCmRegisterAddressFamily@16
-NdisCmRegisterSapComplete@12
-;NdisCoAssignInstanceName
-NdisCoCreateVc@16
-NdisCoDeleteVc@4
-;NdisCoGetTapiCallId
-NdisCoRequest@20
-NdisCoRequestComplete@20
-NdisCoSendPackets@12
-;NdisCompareAnsiString DATA
-;NdisCompareUnicodeString DATA
-NdisCompleteBindAdapter@12
-;NdisCompleteDmaTransfer
-NdisCompletePnPEvent@12
-NdisCompleteUnbindAdapter@8
-;NdisConvertStringToAtmAddress
-NdisCopyBuffer@24
-NdisCopyFromPacketToPacket@24
-;NdisCopyFromPacketToPacketSafe
-;NdisCreateBlockPool
-NdisDeregisterProtocol@8
-;NdisDestroyBlockPool
-;NdisDprAcquireSpinLock
-NdisDprAllocatePacket@12
-NdisDprAllocatePacketNonInterlocked@12
-NdisDprFreePacket@4
-NdisDprFreePacketNonInterlocked@4
-;NdisDprReleaseSpinLock
-;NdisEqualString DATA
-NdisFreeBuffer@4
-NdisFreeBufferPool@4
-NdisFreeMemory@12
-NdisFreePacket@4
-NdisFreePacketPool@4
-;NdisFreeSpinLock
-;NdisFreeToBlockPool
-;NdisGeneratePartialCancelId
-NdisGetBufferPhysicalArraySize@8
-NdisGetCurrentProcessorCounts@12
-NdisGetCurrentProcessorCpuUsage@4
-;NdisGetCurrentSystemTime
-NdisGetDriverHandle@8
-NdisGetFirstBufferFromPacket@20
-;NdisGetFirstBufferFromPacketSafe
-;NdisGetPacketCancelId
-;NdisGetPoolFromPacket
-NdisGetReceivedPacket@8
-;NdisGetRoutineAddress
-;NdisGetSharedDataAlignment
-NdisGetSystemUpTime@4
-;NdisGetVersion
-NdisIMAssociateMiniport@8
-NdisIMCancelInitializeDeviceInstance@8
-NdisIMCopySendCompletePerPacketInfo@8
-NdisIMCopySendPerPacketInfo@8
-NdisIMDeInitializeDeviceInstance@4
-NdisIMDeregisterLayeredMiniport@4
-NdisIMGetBindingContext@4
-;NdisIMGetCurrentPacketStack
-NdisIMGetDeviceContext@4
-;NdisIMInitializeDeviceInstance
-NdisIMInitializeDeviceInstanceEx@12
-;NdisIMNotifyPnPEvent
-;NdisIMQueueMiniportCallback
-NdisIMRegisterLayeredMiniport@16
-;NdisIMRevertBack
-;NdisIMSwitchToMiniport
-;NdisImmediateReadPciSlotInformation
-;NdisImmediateReadPortUchar
-;NdisImmediateReadPortUlong
-;NdisImmediateReadPortUshort
-NdisImmediateReadSharedMemory@16
-;NdisImmediateWritePciSlotInformation
-;NdisImmediateWritePortUchar
-;NdisImmediateWritePortUlong
-;NdisImmediateWritePortUshort
-NdisImmediateWriteSharedMemory@16
-;NdisInitAnsiString DATA
-;NdisInitUnicodeString DATA
-;NdisInitializeEvent
-NdisInitializeReadWriteLock@4
-;NdisInitializeString
-;NdisInitializeTimer
-NdisInitializeWrapper@16
-;NdisInterlockedAddLargeInterger DATA
-;NdisInterlockedAddUlong
-;NdisInterlockedDecrement
-;NdisInterlockedIncrement
-;NdisInterlockedInsertHeadList
-;NdisInterlockedInsertTailList
-;NdisInterlockedPopEntryList
-;NdisInterlockedPushEntryList
-;NdisInterlockedRemoveHeadList
-NdisMAllocateMapRegisters@20
-NdisMAllocateSharedMemory@20
-NdisMAllocateSharedMemoryAsync@16
-;NdisMCancelTimer
-NdisMCloseLog@4
-NdisMCmActivateVc@8
-NdisMCmCreateVc@16
-NdisMCmDeactivateVc@4
-NdisMCmDeleteVc@4
-NdisMCmRegisterAddressFamily@16
-NdisMCmRequest@16
-NdisMCoActivateVcComplete@12
-NdisMCoDeactivateVcComplete@8
-NdisMCoIndicateReceivePacket@12
-NdisMCoIndicateStatus@20
-NdisMCoReceiveComplete@4
-NdisMCoRequestComplete@12
-NdisMCoSendComplete@12
-;NdisMCompleteBufferPhysicalMapping
-NdisMCreateLog@12
-NdisMDeregisterAdapterShutdownHandler@4
-NdisMDeregisterDevice@4
-;NdisMDeregisterDmaChannel
-NdisMDeregisterInterrupt@4
-NdisMDeregisterIoPortRange@16
-NdisMFlushLog@4
-NdisMFreeMapRegisters@4
-NdisMFreeSharedMemory@24
-NdisMGetDeviceProperty@24
-;NdisMGetDmaAlignment
-;NdisMIndicateStatus
-;NdisMIndicateStatusComplete
-NdisMInitializeScatterGatherDma@12
-;NdisMInitializeTimer
-NdisMMapIoSpace@20
-;NdisMPciAssignResources
-NdisMPromoteMiniport@4
-NdisMQueryAdapterInstanceName@8
-NdisMQueryAdapterResources@16
-;NdisMQueryInformationComplete
-;NdisMReadDmaCounter
-NdisMRegisterAdapterShutdownHandler@12
-NdisMRegisterDevice@24
-;NdisMRegisterDmaChannel
-NdisMRegisterInterrupt@28
-NdisMRegisterIoPortRange@16
-NdisMRegisterMiniport@12
-NdisMRegisterUnloadHandler@8
-NdisMRemoveMiniport@4
-;NdisMResetComplete
-;NdisMSendComplete
-;NdisMSendResourcesAvailable
-;NdisMSetAttributes
-NdisMSetAttributesEx@20
-;NdisMSetInformationComplete
-NdisMSetMiniportSecondary@8
-;NdisMSetPeriodicTimer
-;NdisMSetTimer
-NdisMSleep@4
-;NdisMStartBufferPhysicalMapping
-NdisMSynchronizeWithInterrupt@12
-;NdisMTransferDataComplete
-NdisMUnmapIoSpace@12
-NdisMWanIndicateReceive@20
-NdisMWanIndicateReceiveComplete@4
-NdisMWanSendComplete@12
-NdisMWriteLogData@12
-;NdisMapFile
-;NdisMatchPdoWithPacket
-NdisOpenAdapter@44
-NdisOpenConfiguration@12
-NdisOpenConfigurationKeyByIndex@20
-NdisOpenConfigurationKeyByName@16
-;NdisOpenFile
-NdisOpenProtocolConfiguration@12
-;NdisOverrideBusNumber
-NdisPacketPoolUsage@4
-;NdisPacketSize
-NdisQueryAdapterInstanceName@8
-;NdisQueryBindInstanceName
-NdisQueryBuffer@12
-NdisQueryBufferOffset@12
-NdisQueryBufferSafe@16
-;NdisQueryMapRegisterCount
-;NdisQueryPendingIOCount
-;NdisReEnumerateProtocolBindings
-NdisReadConfiguration@20
-NdisReadEisaSlotInformation@16
-NdisReadEisaSlotInformationEx@20
-;NdisReadMcaPosInformation
-NdisReadNetworkAddress@16
-NdisReadPciSlotInformation@20
-NdisReadPcmciaAttributeMemory@16
-NdisRegisterProtocol@16
-;NdisRegisterTdiCallBack
-NdisReleaseReadWriteLock@8
-;NdisReleaseSpinLock
-NdisRequest@12
-NdisReset@8
-;NdisResetEvent
-NdisReturnPackets@8
-;NdisScheduleWorkItem
-NdisSend@12
-NdisSendPackets@12
-;NdisSetEvent
-;NdisSetPacketCancelId
-;NdisSetPacketPoolProtocolId
-;NdisSetPacketStatus
-;NdisSetProtocolFilter
-;NdisSetTimer
-;NdisSetTimerEx
-NdisSetupDmaTransfer@24
-;NdisSystemProcessorCount
-NdisTerminateWrapper@8
-NdisTransferData@28
-NdisUnchainBufferAtBack@8
-NdisUnchainBufferAtFront@8
-NdisUnicodeStringToAnsiString@8
-;NdisUnmapFile
-NdisUpcaseUnicodeString@8
-NdisUpdateSharedMemory@20
-;NdisWaitEvent
-NdisWriteConfiguration@16
-NdisWriteErrorLogEntry
-NdisWriteEventLogEntry@28
-NdisWritePciSlotInformation@20
-NdisWritePcmciaAttributeMemory@16
-;TrFilterDprIndicateReceive
-;TrFilterDprIndicateReceiveComplete
diff --git a/winsup/w32api/lib/ddk/ntoskrnl.def b/winsup/w32api/lib/ddk/ntoskrnl.def
deleted file mode 100644
index bd8c767ec..000000000
--- a/winsup/w32api/lib/ddk/ntoskrnl.def
+++ /dev/null
@@ -1,1460 +0,0 @@
-LIBRARY ntoskrnl.exe
-EXPORTS
-;CcCanIWrite
-;CcCopyRead
-;CcCopyWrite
-;CcDeferWrite
-;CcFastCopyRead
-;CcFastCopyWrite
-;CcFastMdlReadWait
-;CcFastReadNotPossible
-;CcFastReadWait
-;CcFlushCache
-;CcGetDirtyPages
-;CcGetFileObjectFromBcb
-;CcGetFileObjectFromSectionPtrs
-;CcGetFlushedValidData
-;CcGetLsnForFileObject
-;CcInitializeCacheMap
-;CcIsThereDirtyData
-;CcMapData
-;CcMdlRead
-;CcMdlReadComplete
-;CcMdlWriteAbort
-;CcMdlWriteComplete
-;CcPinMappedData
-;CcPinRead
-;CcPrepareMdlWrite
-;CcPreparePinWrite
-;CcPurgeCacheSection
-;CcRemapBcb
-;CcRepinBcb
-;CcScheduleReadAhead
-;CcSetAdditionalCacheAttributes
-;CcSetBcbOwnerPointer
-;CcSetDirtyPageThreshold
-;CcSetDirtyPinnedData
-;CcSetFileSizes
-;CcSetLogHandleForFile
-;CcSetReadAheadGranularity
-;CcUninitializeCacheMap
-;CcUnpinData
-;CcUnpinDataForThread
-;CcUnpinRepinnedBcb
-;CcWaitForCurrentLazyWriterActivity
-;CcZeroData
-CmRegisterCallback@12
-CmUnRegisterCallback@4
-DbgBreakPoint@0
-DbgBreakPointWithStatus@4
-;DbgLoadImageSymbols
-DbgPrint
-DbgPrintEx
-DbgPrintReturnControlC
-;DbgPrompt
-DbgQueryDebugFilterState@8
-DbgSetDebugFilterState@12
-@ExAcquireFastMutexUnsafe@4
-ExAcquireResourceExclusiveLite@8
-ExAcquireResourceSharedLite@8
-;ExAcquireRundownProtection
-ExAcquireSharedStarveExclusive@8
-ExAcquireSharedWaitForExclusive@8
-ExAllocateFromPagedLookasideList@4
-ExAllocatePool@8
-ExAllocatePoolWithQuota@8
-ExAllocatePoolWithQuotaTag@12
-ExAllocatePoolWithTag@12
-ExAllocatePoolWithTagPriority@16
-ExConvertExclusiveToSharedLite@4
-ExCreateCallback@16
-ExDeleteNPagedLookasideList@4
-ExDeletePagedLookasideList@4
-ExDeleteResourceLite@4
-;ExDesktopObjectType DATA
-;ExDisableResourceBoostLite
-;ExEnumHandleTable
-;ExEventObjectType DATA
-ExExtendZone@12
-ExFreePool@4
-ExFreePoolWithTag@8
-ExFreeToPagedLookasideList@8
-;ExGetCurrentProcessorCounts
-;ExGetCurrentProcessorCpuUsage
-ExGetExclusiveWaiterCount@4
-ExGetPreviousMode@0
-ExGetSharedWaiterCount@4
-ExInitializeNPagedLookasideList@28
-ExInitializePagedLookasideList@28
-ExInitializeResourceLite@4
-;ExInitializeRundownProtection
-ExInitializeZone@16
-ExInterlockedAddLargeInteger@12
-@ExInterlockedAddLargeStatistic@8
-@ExInterlockedAddUlong@12
-@ExInterlockedCompareExchange64@16
-ExInterlockedDecrementLong@8
-ExInterlockedExchangeUlong@12
-ExInterlockedExtendZone@16
-@ExInterlockedFlushSList@4
-@ExInterlockedIncrementLong@8
-@ExInterlockedInsertHeadList@12
-@ExInterlockedInsertTailList@12
-@ExInterlockedPopEntryList@8
-;ExInterlockedPopEntrySList
-@ExInterlockedPushEntryList@12
-;ExInterlockedPushEntrySList
-@ExInterlockedRemoveHeadList@8
-ExIsProcessorFeaturePresent@4
-ExIsResourceAcquiredExclusiveLite@4
-ExIsResourceAcquiredSharedLite@4
-ExLocalTimeToSystemTime@8
-ExNotifyCallback@12
-;ExQueryPoolBlockSize
-ExQueueWorkItem@8
-ExRaiseAccessViolation@0
-ExRaiseDatatypeMisalignment@0
-;ExRaiseException
-;ExRaiseHardError
-ExRaiseStatus@4
-;ExReInitializeRundownProtection
-ExRegisterCallback@12
-ExReinitializeResourceLite@4
-@ExReleaseFastMutexUnsafe@4
-ExReleaseResourceForThreadLite@8
-@ExReleaseResourceLite@4
-;ExReleaseRundownProtection
-;ExRundownCompleted
-;ExSemaphoreObjectType DATA
-ExSetResourceOwnerPointer@8
-ExSetTimerResolution@8
-;ExSystemExceptionFilter
-ExSystemTimeToLocalTime@8
-ExUnregisterCallback@4
-ExUuidCreate@4
-ExVerifySuite@4
-;ExWaitForRundownProtectionRelease
-;ExWindowStationObjectType DATA
-;ExfInterlockedAddUlong
-;ExfInterlockedCompareExchange64
-;ExfInterlockedInsertHeadList
-;ExfInterlockedInsertTailList
-;ExfInterlockedPopEntryList
-;ExfInterlockedPushEntryList
-;ExfInterlockedRemoveHeadList
-@Exfi386InterlockedDecrementLong@4
-@Exfi386InterlockedExchangeUlong@8
-@Exfi386InterlockedIncrementLong@4
-;Exi386InterlockedDecrementLong
-;Exi386InterlockedExchangeUlong
-;Exi386InterlockedIncrementLong
-;FsRtlAcquireFileExclusive
-;FsRtlAddLargeMcbEntry
-;FsRtlAddMcbEntry
-;FsRtlAddToTunnelCache
-;FsRtlAllocateFileLock
-;FsRtlAllocatePool
-;FsRtlAllocatePoolWithQuota
-;FsRtlAllocatePoolWithQuotaTag
-;FsRtlAllocatePoolWithTag
-;FsRtlAllocateResource
-;FsRtlAreNamesEqual
-;FsRtlBalanceReads
-;FsRtlCheckLockForReadAccess
-;FsRtlCheckLockForWriteAccess
-;FsRtlCheckOplock
-;FsRtlCopyRead
-;FsRtlCopyWrite
-;FsRtlCurrentBatchOplock
-;FsRtlDeleteKeyFromTunnelCache
-;FsRtlDeleteTunnelCache
-;FsRtlDeregisterUncProvider
-;FsRtlDissectDbcs
-;FsRtlDissectName
-;FsRtlDoesDbcsContainWildCards
-;FsRtlDoesNameContainWildCards
-;FsRtlFastCheckLockForRead
-;FsRtlFastCheckLockForWrite
-;FsRtlFastUnlockAll
-;FsRtlFastUnlockAllByKey
-;FsRtlFastUnlockSingle
-;FsRtlFindInTunnelCache
-;FsRtlFreeFileLock
-;FsRtlGetFileSize
-;FsRtlGetNextFileLock
-;FsRtlGetNextLargeMcbEntry
-;FsRtlGetNextMcbEntry
-;FsRtlIncrementCcFastReadNoWait
-;FsRtlIncrementCcFastReadNotPossible
-;FsRtlIncrementCcFastReadResourceMiss
-;FsRtlIncrementCcFastReadWait
-;FsRtlInitializeFileLock
-;FsRtlInitializeLargeMcb
-;FsRtlInitializeMcb
-;FsRtlInitializeOplock
-;FsRtlInitializeTunnelCache
-;FsRtlInsertPerFileObjectContext
-;FsRtlInsertPerStreamContext
-;FsRtlIsDbcsInExpression
-;FsRtlIsFatDbcsLegal
-;FsRtlIsHpfsDbcsLegal
-;FsRtlIsNameInExpression
-;FsRtlIsNtstatusExpected
-;FsRtlIsPagingFile
-FsRtlIsTotalDeviceFailure@4
-;FsRtlLegalAnsiCharacterArray
-;FsRtlLookupLargeMcbEntry
-;FsRtlLookupLastLargeMcbEntry
-;FsRtlLookupLastLargeMcbEntryAndIndex
-;FsRtlLookupLastMcbEntry
-;FsRtlLookupMcbEntry
-;FsRtlLookupPerFileObjectContext
-;FsRtlLookupPerStreamContextInternal
-;FsRtlMdlRead
-;FsRtlMdlReadComplete
-;FsRtlMdlReadCompleteDev
-;FsRtlMdlReadDev
-;FsRtlMdlWriteComplete
-;FsRtlMdlWriteCompleteDev
-;FsRtlNormalizeNtstatus
-;FsRtlNotifyChangeDirectory
-;FsRtlNotifyCleanup
-;FsRtlNotifyFilterChangeDirectory
-;FsRtlNotifyFilterReportChange
-;FsRtlNotifyFullChangeDirectory
-;FsRtlNotifyFullReportChange
-;FsRtlNotifyInitializeSync
-;FsRtlNotifyReportChange
-;FsRtlNotifyUninitializeSync
-;FsRtlNotifyVolumeEvent
-;FsRtlNumberOfRunsInLargeMcb
-;FsRtlNumberOfRunsInMcb
-;FsRtlOplockFsctrl
-;FsRtlOplockIsFastIoPossible
-;FsRtlPostPagingFileStackOverflow
-;FsRtlPostStackOverflow
-;FsRtlPrepareMdlWrite
-;FsRtlPrepareMdlWriteDev
-;FsRtlPrivateLock
-;FsRtlProcessFileLock
-;FsRtlRegisterFileSystemFilterCallbacks
-;FsRtlRegisterUncProvider
-;FsRtlReleaseFile
-;FsRtlRemoveLargeMcbEntry
-;FsRtlRemoveMcbEntry
-;FsRtlRemovePerFileObjectContext
-;FsRtlRemovePerStreamContext
-;FsRtlResetLargeMcb
-;FsRtlSplitLargeMcb
-;FsRtlSyncVolumes
-;FsRtlTeardownPerStreamContexts
-;FsRtlTruncateLargeMcb
-;FsRtlTruncateMcb
-;FsRtlUninitializeFileLock
-;FsRtlUninitializeLargeMcb
-;FsRtlUninitializeMcb
-;FsRtlUninitializeOplock
-;HalDispatchTable DATA
-@HalExamineMBR@16
-;HalPrivateDispatchTable DATA
-;HeadlessDispatch
-;InbvAcquireDisplayOwnership
-;InbvCheckDisplayOwnership
-;InbvDisplayString
-;InbvEnableBootDriver
-;InbvEnableDisplayString
-;InbvInstallDisplayStringFilter
-;InbvIsBootDriverInstalled
-;InbvNotifyDisplayOwnershipLost
-;InbvResetDisplay
-;InbvSetScrollRegion
-;InbvSetTextColor
-;InbvSolidColorFill
-;InitSafeBootMode DATA
-@InterlockedCompareExchange@12
-@InterlockedDecrement@4
-@InterlockedExchange@8
-@InterlockedExchangeAdd@8
-@InterlockedIncrement@4
-@InterlockedPopEntrySList@4
-@InterlockedPushEntrySList@8
-IoAcquireCancelSpinLock@4
-IoAcquireRemoveLockEx@20
-;IoAcquireVpbSpinLock
-;IoAdapterObjectType DATA
-IoAllocateAdapterChannel@20
-IoAllocateController@16
-IoAllocateDriverObjectExtension@16
-IoAllocateErrorLogEntry@8
-IoAllocateIrp@8
-IoAllocateMdl@20
-IoAllocateWorkItem@4
-;IoAssignDriveLetters
-IoAssignResources@24
-IoAttachDevice@12
-IoAttachDeviceByPointer@8
-IoAttachDeviceToDeviceStack@8
-;IoAttachDeviceToDeviceStackSafe
-IoBuildAsynchronousFsdRequest@24
-IoBuildDeviceIoControlRequest@36
-IoBuildPartialMdl@16
-IoBuildSynchronousFsdRequest@28
-;IoCallDriver
-IoCancelFileOpen@8
-IoCancelIrp@4
-;IoCheckDesiredAccess
-;IoCheckEaBufferValidity
-;IoCheckFunctionAccess
-;IoCheckQuerySetFileInformation
-;IoCheckQuerySetVolumeInformation
-;IoCheckQuotaBufferValidity
-IoCheckShareAccess@20
-;IoCompleteRequest
-IoConnectInterrupt@44
-IoCreateController@4
-IoCreateDevice@28
-IoCreateDisk@8
-;IoCreateDriver
-IoCreateFile@56
-;IoCreateFileSpecifyDeviceObjectHint
-IoCreateNotificationEvent@8
-;IoCreateStreamFileObject
-;IoCreateStreamFileObjectEx
-;IoCreateStreamFileObjectLite
-IoCreateSymbolicLink@8
-IoCreateSynchronizationEvent@8
-IoCreateUnprotectedSymbolicLink@8
-IoCsqInitialize@28
-IoCsqInsertIrp@12
-IoCsqRemoveIrp@8
-IoCsqRemoveNextIrp@8
-IoDeleteController@4
-IoDeleteDevice@4
-;IoDeleteDriver
-IoDeleteSymbolicLink@4
-IoDetachDevice@4
-;IoDeviceHandlerObjectSize DATA
-;IoDeviceHandlerObjectType DATA
-;IoDeviceObjectType DATA
-IoDisconnectInterrupt@4
-;IoDriverObjectType DATA
-;IoEnqueueIrp
-;IoEnumerateDeviceObjectList
-;IoFastQueryNetworkAttributes
-;IoFileObjectType DATA
-;IoForwardAndCatchIrp
-IoForwardIrpSynchronously@8
-IoFreeController@4
-IoFreeErrorLogEntry@4
-IoFreeIrp@4
-IoFreeMdl@4
-IoFreeWorkItem@4
-IoGetAttachedDevice@4
-IoGetAttachedDeviceReference@4
-;IoGetBaseFileSystemDeviceObject
-IoGetBootDiskInformation@8
-IoGetConfigurationInformation@0
-IoGetCurrentProcess@0
-;IoGetDeviceAttachmentBaseRef
-IoGetDeviceInterfaceAlias@12
-IoGetDeviceInterfaces@16
-IoGetDeviceObjectPointer@16
-IoGetDeviceProperty@20
-IoGetDeviceToVerify@4
-;IoGetDiskDeviceObject
-IoGetDmaAdapter@12
-IoGetDriverObjectExtension@8
-IoGetFileObjectGenericMapping@0
-IoGetInitialStack@0
-;IoGetLowerDeviceObject
-IoGetRelatedDeviceObject@4
-;IoGetRequestorProcess
-;IoGetRequestorProcessId
-;IoGetRequestorSessionId
-IoGetStackLimits@8
-;IoGetTopLevelIrp
-IoInitializeIrp@12
-IoInitializeRemoveLockEx@20
-IoInitializeTimer@12
-IoInvalidateDeviceRelations@8
-IoInvalidateDeviceState@4
-;IoIsFileOriginRemote
-;IoIsOperationSynchronous
-;IoIsSystemThread
-;IoIsValidNameGraftingBuffer
-IoIsWdmVersionAvailable@8
-IoMakeAssociatedIrp@8
-IoOpenDeviceInterfaceRegistryKey@12
-IoOpenDeviceRegistryKey@16
-;IoPageRead
-;IoPnPDeliverServicePowerNotification
-IoQueryDeviceDescription@32
-;IoQueryFileDosDeviceName
-;IoQueryFileInformation
-;IoQueryVolumeInformation
-;IoQueueThreadIrp
-IoQueueWorkItem@16
-IoRaiseHardError@12
-IoRaiseInformationalHardError@12
-IoReadDiskSignature@12
-;IoReadOperationCount DATA
-@IoReadPartitionTable@16
-IoReadPartitionTableEx@8
-;IoReadTransferCount DATA
-IoRegisterBootDriverReinitialization@12
-IoRegisterDeviceInterface@16
-IoRegisterDriverReinitialization@12
-;IoRegisterFileSystem
-;IoRegisterFsRegistrationChange
-;IoRegisterLastChanceShutdownNotification
-IoRegisterPlugPlayNotification@28
-IoRegisterShutdownNotification@4
-IoReleaseCancelSpinLock@4
-IoReleaseRemoveLockAndWaitEx@12
-IoReleaseRemoveLockEx@12
-;IoReleaseVpbSpinLock
-IoRemoveShareAccess@8
-IoReportDetectedDevice@32
-;IoReportHalResourceUsage
-IoReportResourceForDetection@28
-IoReportResourceUsage@36
-IoReportTargetDeviceChange@8
-IoReportTargetDeviceChangeAsynchronous@16
-IoRequestDeviceEject@4
-IoReuseIrp@8
-IoSetCompletionRoutineEx@28
-IoSetDeviceInterfaceState@8
-;IoSetDeviceToVerify
-;IoSetFileOrigin
-IoSetHardErrorOrVerifyDevice@8
-;IoSetInformation
-;IoSetIoCompletion
-@IoSetPartitionInformation@16
-IoSetPartitionInformationEx@12
-IoSetShareAccess@16
-IoSetStartIoAttributes@12
-IoSetSystemPartition@4
-IoSetThreadHardErrorMode@4
-;IoSetTopLevelIrp
-IoStartNextPacket@8
-IoStartNextPacketByKey@12
-IoStartPacket@16
-IoStartTimer@4
-;IoStatisticsLock DATA
-IoStopTimer@4
-;IoSynchronousInvalidateDeviceRelations
-;IoSynchronousPageWrite
-;IoThreadToProcess
-;IoUnregisterFileSystem
-;IoUnregisterFsRegistrationChange
-IoUnregisterPlugPlayNotification@4
-IoUnregisterShutdownNotification@4
-IoUpdateShareAccess@8
-IoVerifyPartitionTable@8
-;IoVerifyVolume
-IoVolumeDeviceToDosName@8
-IoWMIAllocateInstanceIds@12
-IoWMIDeviceObjectToInstanceName@12
-IoWMIExecuteMethod@24
-IoWMIHandleToInstanceName@12
-IoWMIOpenBlock@12
-IoWMIQueryAllData@12
-IoWMIQueryAllDataMultiple@16
-IoWMIQuerySingleInstance@16
-IoWMIQuerySingleInstanceMultiple@20
-IoWMIRegistrationControl@8
-IoWMISetNotificationCallback@12
-IoWMISetSingleInstance@20
-IoWMISetSingleItem@24
-IoWMISuggestInstanceName@16
-IoWMIWriteEvent@4
-IoWriteErrorLogEntry@4
-;IoWriteOperationCount DATA
-@IoWritePartitionTable@20
-IoWritePartitionTableEx@8
-;IoWriteTransferCount DATA
-@IofCallDriver@8
-@IofCompleteRequest@8
-;KdDebuggerEnabled DATA
-;KdDebuggerNotPresent DATA
-KdDisableDebugger@0
-KdEnableDebugger@0
-;KdEnteredDebugger DATA
-;KdPollBreakIn
-;KdPowerTransition
-;Ke386CallBios
-Ke386IoSetAccessProcess@8
-Ke386QueryIoAccessMap@8
-Ke386SetIoAccessMap@8
-@KeAcquireInStackQueuedSpinLockAtDpcLevel@8
-KeAcquireInterruptSpinLock@4
-;KeAcquireSpinLockAtDpcLevel
-KeAddSystemServiceTable@20
-KeAreApcsDisabled@0
-KeAttachProcess@4
-KeBugCheck@4
-KeBugCheckEx@20
-KeCancelTimer@4
-KeClearEvent@4
-;KeConnectInterrupt
-;KeDcacheFlushCount DATA
-KeDelayExecutionThread@12
-KeDeregisterBugCheckCallback@4
-KeDetachProcess@0
-;KeDisconnectInterrupt
-KeEnterCriticalRegion@0
-;KeEnterKernelDebugger
-;KeFindConfigurationEntry
-;KeFindConfigurationNextEntry
-;KeFlushEntireTb
-KeGetCurrentThread@0
-KeGetPreviousMode@0
-KeGetRecommendedSharedDataAlignment@0
-;KeI386AbiosCall
-;KeI386AllocateGdtSelectors
-;KeI386Call16BitCStyleFunction
-;KeI386Call16BitFunction
-;KeI386FlatToGdtSelector
-;KeI386GetLid
-;KeI386MachineType DATA
-;KeI386ReleaseGdtSelectors
-;KeI386ReleaseLid
-;KeI386SetGdtSelector
-;KeIcacheFlushCount DATA
-KeInitializeApc@32
-KeInitializeDeviceQueue@4
-KeInitializeDpc@12
-KeInitializeEvent@12
-;KeInitializeInterrupt
-;KeInitializeMutant
-KeInitializeMutex@8
-;KeInitializeQueue
-KeInitializeSemaphore@12
-KeInitializeSpinLock@4
-KeInitializeTimer@4
-KeInitializeTimerEx@8
-KeInsertByKeyDeviceQueue@12
-KeInsertDeviceQueue@8
-;KeInsertHeadQueue
-;KeInsertQueue
-;KeInsertQueueApc
-KeInsertQueueDpc@12
-;KeIsAttachedProcess
-;KeIsExecutingDpc
-KeLeaveCriticalRegion@0
-;KeLoaderBlock DATA
-;KeNumberProcessors DATA
-;KeProfileInterrupt
-;KeProfileInterruptWithSource
-KePulseEvent@12
-;KeQueryActiveProcessors
-KeQueryInterruptTime@0
-KeQueryPriorityThread@4
-;KeQueryRuntimeThread
-KeQuerySystemTime@4
-KeQueryTickCount@4
-KeQueryTimeIncrement@0
-;KeRaiseUserException
-KeReadStateEvent@4
-;KeReadStateMutant
-KeReadStateMutex@4
-;KeReadStateQueue
-KeReadStateSemaphore@4
-KeReadStateTimer@4
-KeRegisterBugCheckCallback@20
-KeReleaseInStackQueuedSpinLockFromDpcLevel@4
-KeReleaseInterruptSpinLock@8
-;KeReleaseMutant
-KeReleaseMutex@8
-KeReleaseSemaphore@16
-;KeReleaseSpinLockFromDpcLevel
-KeRemoveByKeyDeviceQueue@8
-;KeRemoveByKeyDeviceQueueIfBusy
-KeRemoveDeviceQueue@4
-KeRemoveEntryDeviceQueue@8
-;KeRemoveQueue
-KeRemoveQueueDpc@4
-;KeRemoveSystemServiceTable
-KeResetEvent@4
-KeRestoreFloatingPointState@4
-;KeRevertToUserAffinityThread
-;KeRundownQueue
-KeSaveFloatingPointState@4
-;KeSaveStateForHibernate
-;KeServiceDescriptorTable DATA
-;KeSetAffinityThread
-KeSetBasePriorityThread@8
-;KeSetDmaIoCoherency
-KeSetEvent@12
-;KeSetEventBoostPriority
-;KeSetIdealProcessorThread
-KeSetImportanceDpc@8
-;KeSetKernelStackSwapEnable
-KeSetPriorityThread@8
-;KeSetProfileIrql
-;KeSetSystemAffinityThread
-KeSetTargetProcessorDpc@8
-;KeSetTimeIncrement
-@KeSetTimeUpdateNotifyRoutine@4
-KeSetTimer@12
-KeSetTimerEx@16
-;KeStackAttachProcess
-KeSynchronizeExecution@12
-;KeTerminateThread
-;KeTickCount DATA
-;KeUnstackDetachProcess
-;KeUpdateRunTime
-;KeUpdateSystemTime
-;KeUserModeCallback
-KeWaitForMultipleObjects@32
-KeWaitForMutexObject@20
-KeWaitForSingleObject@20
-@KefAcquireSpinLockAtDpcLevel@4
-@KefReleaseSpinLockFromDpcLevel@4
-;Kei386EoiHelper
-;KiAcquireSpinLock
-;KiBugCheckData DATA
-;KiCoprocessorError
-;KiDeliverApc
-;KiDispatchInterrupt
-;KiEnableTimerWatchdog DATA
-;KiIpiServiceRoutine
-;KiReleaseSpinLock
-;KiUnexpectedInterrupt
-;Kii386SpinOnSpinLock
-;LdrAccessResource
-;LdrEnumResources
-;LdrFindResourceDirectory_U
-;LdrFindResource_U
-;LpcPortObjectType DATA
-;LpcRequestPort
-;LpcRequestWaitReplyPort
-;LsaCallAuthenticationPackage
-;LsaDeregisterLogonProcess
-;LsaFreeReturnBuffer
-;LsaLogonUser
-;LsaLookupAuthenticationPackage
-;LsaRegisterLogonProcess
-;Mm64BitPhysicalAddress DATA
-;MmAddPhysicalMemory
-;MmAddVerifierThunks
-;MmAdjustWorkingSetSize
-MmAdvanceMdl@8
-MmAllocateContiguousMemory@8
-MmAllocateContiguousMemorySpecifyCache@20
-MmAllocateMappingAddress@8
-MmAllocateNonCachedMemory@4
-MmAllocatePagesForMdl@16
-MmBuildMdlForNonPagedPool@4
-;MmCanFileBeTruncated
-MmCreateMdl@12
-MmCreateSection@32
-;MmDisableModifiedWriteOfSection
-MmFlushImageSection@8
-;MmForceSectionClosed
-MmFreeContiguousMemory@4
-MmFreeContiguousMemorySpecifyCache@12
-MmFreeMappingAddress@8
-MmFreeNonCachedMemory@8
-MmFreePagesFromMdl@4
-MmGetPhysicalAddress@4
-MmGetPhysicalMemoryRanges@0
-MmGetSystemRoutineAddress@4
-MmGetVirtualForPhysical@4
-;MmGrowKernelStack
-;MmHighestUserAddress DATA
-MmIsAddressValid@4
-MmIsDriverVerifying@4
-MmIsNonPagedSystemAddressValid@4
-;MmIsRecursiveIoFault
-MmIsThisAnNtAsSystem@0
-MmIsVerifierEnabled@4
-MmLockPagableDataSection@4
-MmLockPagableImageSection@4
-MmLockPagableSectionByHandle@4
-MmMapIoSpace@12
-MmMapLockedPages@8
-MmMapLockedPagesSpecifyCache@24
-MmMapLockedPagesWithReservedMapping@16
-;MmMapMemoryDumpMdl
-MmMapUserAddressesToPage@12
-MmMapVideoDisplay@12
-MmMapViewInSessionSpace@12
-MmMapViewInSystemSpace@12
-;MmMapViewOfSection
-MmMarkPhysicalMemoryAsBad@8
-MmMarkPhysicalMemoryAsGood@8
-MmPageEntireDriver@4
-;MmPrefetchPages
-MmProbeAndLockPages@12
-MmProbeAndLockProcessPages@16
-;MmProbeAndLockSelectedPages
-MmProtectMdlSystemAddress@8
-MmQuerySystemSize@0
-MmRemovePhysicalMemory@8
-MmResetDriverPaging@4
-;MmSectionObjectType DATA
-MmSecureVirtualMemory@12
-;MmSetAddressRangeModified
-;MmSetBankedSection
-MmSizeOfMdl@8
-;MmSystemRangeStart DATA
-;MmTrimAllSystemPagableMemory
-MmUnlockPagableImageSection@4
-MmUnlockPages@4
-MmUnmapIoSpace@8
-MmUnmapLockedPages@8
-MmUnmapReservedMapping@12
-MmUnmapVideoDisplay@8
-MmUnmapViewInSessionSpace@4
-MmUnmapViewInSystemSpace@4
-;MmUnmapViewOfSection
-MmUnsecureVirtualMemory@4
-;MmUserProbeAddress DATA
-;NlsAnsiCodePage DATA
-;NlsLeadByteInfo
-;NlsMbCodePageTag DATA
-;NlsMbOemCodePageTag DATA
-;NlsOemCodePage DATA
-;NlsOemLeadByteInfo
-NtAddAtom@12
-NtAdjustPrivilegesToken@24
-NtAllocateLocallyUniqueId@4
-NtAllocateUuids@16
-NtAllocateVirtualMemory@24
-;NtBuildNumber DATA
-NtClose@4
-NtConnectPort@32
-NtCreateEvent@20
-;NtCreateFile
-NtCreateSection@28
-NtDeleteAtom@4
-NtDeleteFile@4
-NtDeviceIoControlFile@40
-NtDuplicateObject@28
-NtDuplicateToken@24
-NtFindAtom@12
-NtFreeVirtualMemory@16
-;NtFsControlFile
-;NtGlobalFlag DATA
-;NtLockFile
-;NtMakePermanentObject
-NtMapViewOfSection@40
-;NtNotifyChangeDirectoryFile
-NtOpenFile@24
-NtOpenProcess@16
-NtOpenProcessToken@12
-;NtOpenProcessTokenEx
-NtOpenThread@16
-NtOpenThreadToken@16
-;NtOpenThreadTokenEx
-;NtQueryDirectoryFile
-;NtQueryEaFile
-NtQueryInformationAtom@20
-;NtQueryInformationFile
-NtQueryInformationProcess@20
-NtQueryInformationThread@20
-NtQueryInformationToken@20
-;NtQueryQuotaInformationFile
-NtQuerySecurityObject@20
-NtQuerySystemInformation@16
-;NtQueryVolumeInformationFile
-NtReadFile@36
-NtRequestPort@8
-NtRequestWaitReplyPort@12
-;NtSetEaFile
-NtSetEvent@8
-;NtSetInformationFile
-NtSetInformationProcess@16
-NtSetInformationThread@16
-;NtSetQuotaInformationFile
-NtSetSecurityObject@12
-;NtSetVolumeInformationFile
-NtShutdownSystem@4
-;NtTraceEvent
-;NtUnlockFile
-NtVdmControl@8
-NtWaitForSingleObject@12
-NtWriteFile@36
-ObAssignSecurity@16
-;ObCheckCreateObjectAccess
-;ObCheckObjectAccess
-;ObCloseHandle
-ObCreateObject@36
-;ObCreateObjectType
-;ObDereferenceObject
-ObDereferenceSecurityDescriptor@8
-;ObFindHandleForObject
-ObGetObjectSecurity@12
-ObInsertObject@24
-ObLogSecurityDescriptor@12
-ObMakeTemporaryObject@4
-ObOpenObjectByName@28
-ObOpenObjectByPointer@28
-;ObQueryNameString
-ObQueryObjectAuditingByHandle@8
-ObReferenceObjectByHandle@24
-ObReferenceObjectByName@32
-ObReferenceObjectByPointer@16
-ObReferenceSecurityDescriptor@8
-ObReleaseObjectSecurity@8
-;ObSetHandleAttributes
-;ObSetSecurityDescriptorInfo
-;ObSetSecurityObjectByPointer
-@ObfDereferenceObject@4
-@ObfReferenceObject@4
-;PfxFindPrefix
-;PfxInitialize
-;PfxInsertPrefix
-;PfxRemovePrefix
-PoCallDriver@8
-;PoCancelDeviceNotify
-;PoQueueShutdownWorkItem
-PoRegisterDeviceForIdleDetection@16
-;PoRegisterDeviceNotify
-PoRegisterSystemState@8
-PoRequestPowerIrp@24
-PoRequestShutdownEvent@4
-;PoSetHiberRange
-PoSetPowerState@12
-PoSetSystemState@4
-;PoShutdownBugCheck
-PoStartNextPowerIrp@4
-PoUnregisterSystemState@4
-ProbeForRead@12
-ProbeForWrite@12
-;PsAssignImpersonationToken
-;PsChargePoolQuota
-;PsChargeProcessNonPagedPoolQuota
-;PsChargeProcessPagedPoolQuota
-;PsChargeProcessPoolQuota
-PsCreateSystemProcess@12
-PsCreateSystemThread@28
-;PsDereferenceImpersonationToken
-;PsDereferencePrimaryToken
-;PsDisableImpersonation
-;PsEstablishWin32Callouts
-;PsGetCurrentProcess
-PsGetCurrentProcessId@0
-;PsGetCurrentProcessSessionId
-;PsGetCurrentThread
-PsGetCurrentThreadId@0
-;PsGetCurrentThreadPreviousMode
-;PsGetCurrentThreadStackBase
-;PsGetCurrentThreadStackLimit
-;PsGetJobLock
-;PsGetJobSessionId
-;PsGetJobUIRestrictionsClass
-;PsGetProcessCreateTimeQuadPart
-;PsGetProcessDebugPort
-;PsGetProcessExitProcessCalled
-;PsGetProcessExitStatus
-;PsGetProcessExitTime
-;PsGetProcessId
-;PsGetProcessImageFileName
-;PsGetProcessInheritedFromUniqueProcessId
-;PsGetProcessJob
-;PsGetProcessPeb
-;PsGetProcessPriorityClass
-;PsGetProcessSectionBaseAddress
-;PsGetProcessSecurityPort
-;PsGetProcessSessionId
-;PsGetProcessWin32Process
-;PsGetProcessWin32WindowStation
-;PsGetThreadFreezeCount
-;PsGetThreadHardErrorsAreDisabled
-;PsGetThreadId
-;PsGetThreadProcess
-;PsGetThreadProcessId
-;PsGetThreadSessionId
-;PsGetThreadTeb
-;PsGetThreadWin32Thread
-PsGetVersion@16
-;PsImpersonateClient
-;PsInitialSystemProcess DATA
-;PsIsProcessBeingDebugged
-;PsIsSystemThread
-;PsIsThreadImpersonating
-;PsIsThreadTerminating
-;PsJobType DATA
-;PsLookupProcessByProcessId
-;PsLookupProcessThreadByCid
-;PsLookupThreadByThreadId
-;PsProcessType DATA
-;PsReferenceImpersonationToken
-;PsReferencePrimaryToken
-PsRemoveCreateThreadNotifyRoutine@4
-PsRemoveLoadImageNotifyRoutine@4
-;PsRestoreImpersonation
-;PsReturnPoolQuota
-;PsReturnProcessNonPagedPoolQuota
-;PsReturnProcessPagedPoolQuota
-;PsRevertThreadToSelf
-;PsRevertToSelf
-PsSetCreateProcessNotifyRoutine@8
-PsSetCreateThreadNotifyRoutine@4
-;PsSetJobUIRestrictionsClass
-;PsSetLegoNotifyRoutine
-PsSetLoadImageNotifyRoutine@4
-;PsSetProcessPriorityByClass
-;PsSetProcessPriorityClass
-;PsSetProcessSecurityPort
-;PsSetProcessWin32Process
-;PsSetProcessWindowStation
-;PsSetThreadHardErrorsAreDisabled
-;PsSetThreadWin32Thread
-PsTerminateSystemThread@4
-;PsThreadType DATA
-READ_REGISTER_BUFFER_UCHAR@12
-READ_REGISTER_BUFFER_ULONG@12
-READ_REGISTER_BUFFER_USHORT@12
-READ_REGISTER_UCHAR@4
-READ_REGISTER_ULONG@4
-READ_REGISTER_USHORT@4
-;RtlAbsoluteToSelfRelativeSD
-;RtlAddAccessAllowedAce
-;RtlAddAce
-;RtlAddAtomToAtomTable
-RtlAddRange@28
-;RtlAllocateHeap
-;RtlAnsiCharToUnicodeChar
-RtlAnsiStringToUnicodeSize@4
-RtlAnsiStringToUnicodeString@12
-;RtlAppendAsciizToString
-;RtlAppendStringToString
-RtlAppendUnicodeStringToString@8
-RtlAppendUnicodeToString@8
-;RtlAreAllAccessesGranted
-;RtlAreAnyAccessesGranted
-RtlAreBitsClear@12
-RtlAreBitsSet@12
-RtlAssert@16
-;RtlCaptureContext
-;RtlCaptureStackBackTrace
-RtlCharToInteger@12
-RtlCheckRegistryKey@8
-RtlClearAllBits@4
-RtlClearBit@8
-RtlClearBits@12
-RtlCompareMemory@12
-;RtlCompareMemoryUlong
-RtlCompareString@12
-RtlCompareUnicodeString@12
-;RtlCompressBuffer
-;RtlCompressChunks
-RtlConvertLongToLargeInteger@4
-;RtlConvertSidToUnicodeString
-RtlConvertUlongToLargeInteger@4
-;RtlCopyLuid
-RtlCopyRangeList@8
-;RtlCopySid
-RtlCopyString@8
-RtlCopyUnicodeString@8
-;RtlCreateAcl
-;RtlCreateAtomTable
-;RtlCreateHeap
-RtlCreateRegistryKey@8
-RtlCreateSecurityDescriptor@8
-;RtlCreateSystemVolumeInformationFolder
-;RtlCreateUnicodeString
-;RtlCustomCPToUnicodeN
-;RtlDecompressBuffer
-;RtlDecompressChunks
-;RtlDecompressFragment
-;RtlDelete
-;RtlDeleteAce
-;RtlDeleteAtomFromAtomTable
-;RtlDeleteElementGenericTable
-;RtlDeleteElementGenericTableAvl
-;RtlDeleteNoSplay
-RtlDeleteOwnersRanges@8
-RtlDeleteRange@16
-RtlDeleteRegistryValue@12
-;RtlDescribeChunk
-;RtlDestroyAtomTable
-;RtlDestroyHeap
-;RtlDowncaseUnicodeString
-;RtlEmptyAtomTable
-RtlEnlargedIntegerMultiply@8
-RtlEnlargedUnsignedDivide@12
-RtlEnlargedUnsignedMultiply@8
-;RtlEnumerateGenericTable
-;RtlEnumerateGenericTableAvl
-;RtlEnumerateGenericTableLikeADirectory
-;RtlEnumerateGenericTableWithoutSplaying
-;RtlEnumerateGenericTableWithoutSplayingAvl
-;RtlEqualLuid
-;RtlEqualSid
-RtlEqualString@12
-RtlEqualUnicodeString@12
-RtlExtendedIntegerMultiply@8
-RtlExtendedLargeIntegerDivide@12
-RtlExtendedMagicDivide@12
-;RtlFillMemory
-;RtlFillMemoryUlong
-RtlFindClearBits@12
-RtlFindClearBitsAndSet@12
-RtlFindClearRuns@16
-RtlFindFirstRunClear@8
-RtlFindLastBackwardRunClear@12
-RtlFindLeastSignificantBit@4
-RtlFindLongestRunClear@8
-;RtlFindMessage
-RtlFindMostSignificantBit@4
-RtlFindNextForwardRunClear@12
-RtlFindRange@40
-RtlFindSetBits@12
-RtlFindSetBitsAndClear@12
-;RtlFindUnicodePrefix
-;RtlFormatCurrentUserKeyPath
-RtlFreeAnsiString@4
-;RtlFreeHeap
-;RtlFreeOemString
-RtlFreeRangeList@4
-RtlFreeUnicodeString@4
-RtlGUIDFromString@8
-;RtlGenerate8dot3Name
-;RtlGetAce
-RtlGetCallersAddress@8
-;RtlGetCompressionWorkSpaceSize
-;RtlGetDaclSecurityDescriptor
-;RtlGetDefaultCodePage
-;RtlGetElementGenericTable
-;RtlGetElementGenericTableAvl
-RtlGetFirstRange@12
-;RtlGetGroupSecurityDescriptor
-RtlGetNextRange@12
-;RtlGetNtGlobalFlags
-;RtlGetOwnerSecurityDescriptor
-;RtlGetSaclSecurityDescriptor
-;RtlGetSetBootStatusData
-RtlGetVersion@4
-RtlHashUnicodeString@16
-;RtlImageDirectoryEntryToData
-;RtlImageNtHeader
-RtlInitAnsiString@8
-;RtlInitCodePageTable
-RtlInitString@8
-RtlInitUnicodeString@8
-RtlInitializeBitMap@12
-;RtlInitializeGenericTable
-;RtlInitializeGenericTableAvl
-RtlInitializeRangeList@4
-;RtlInitializeSid
-;RtlInitializeUnicodePrefix
-;RtlInsertElementGenericTable
-;RtlInsertElementGenericTableAvl
-;RtlInsertElementGenericTableFull
-;RtlInsertElementGenericTableFullAvl
-;RtlInsertUnicodePrefix
-RtlInt64ToUnicodeString@12
-;RtlIntegerToChar
-;RtlIntegerToUnicode
-RtlIntegerToUnicodeString@12
-RtlInvertRangeList@8
-;RtlIpv4AddressToStringA
-;RtlIpv4AddressToStringW
-;RtlIpv4StringToAddressA
-;RtlIpv4StringToAddressW
-;RtlIpv6AddressToStringA
-;RtlIpv6AddressToStringW
-;RtlIpv6StringToAddressA
-;RtlIpv6StringToAddressW
-;RtlIsGenericTableEmpty
-;RtlIsGenericTableEmptyAvl
-;RtlIsNameLegalDOS8Dot3
-RtlIsRangeAvailable@32
-;RtlIsValidOemCharacter
-RtlLargeIntegerAdd@8
-RtlLargeIntegerArithmeticShift@8
-RtlLargeIntegerDivide@12
-RtlLargeIntegerNegate@4
-RtlLargeIntegerShiftLeft@8
-RtlLargeIntegerShiftRight@8
-RtlLargeIntegerSubtract@8
-;RtlLengthRequiredSid
-RtlLengthSecurityDescriptor@4
-;RtlLengthSid
-;RtlLockBootStatusData
-;RtlLookupAtomInAtomTable
-;RtlLookupElementGenericTable
-;RtlLookupElementGenericTableAvl
-;RtlLookupElementGenericTableFull
-;RtlLookupElementGenericTableFullAvl
-RtlMapGenericMask@8
-;RtlMapSecurityErrorToNtStatus
-RtlMergeRangeLists@16
-;RtlMoveMemory
-;RtlMultiByteToUnicodeN
-;RtlMultiByteToUnicodeSize
-;RtlNextUnicodePrefix
-;RtlNtStatusToDosError
-;RtlNtStatusToDosErrorNoTeb
-;RtlNumberGenericTableElements
-;RtlNumberGenericTableElementsAvl
-RtlNumberOfClearBits@4
-RtlNumberOfSetBits@4
-;RtlOemStringToCountedUnicodeString
-;RtlOemStringToUnicodeSize
-;RtlOemStringToUnicodeString
-;RtlOemToUnicodeN
-;RtlPinAtomInAtomTable
-@RtlPrefetchMemoryNonTemporal@8
-;RtlPrefixString
-RtlPrefixUnicodeString@12
-;RtlQueryAtomInAtomTable
-RtlQueryRegistryValues@20
-;RtlQueryTimeZoneInformation
-;RtlRaiseException
-;RtlRandom
-;RtlRandomEx
-;RtlRealPredecessor
-;RtlRealSuccessor
-;RtlRemoveUnicodePrefix
-;RtlReserveChunk
-;RtlSecondsSince1970ToTime
-;RtlSecondsSince1980ToTime
-;RtlSelfRelativeToAbsoluteSD
-;RtlSelfRelativeToAbsoluteSD2
-RtlSetAllBits@4
-RtlSetBit@8
-RtlSetBits@12
-RtlSetDaclSecurityDescriptor@16
-;RtlSetGroupSecurityDescriptor
-;RtlSetOwnerSecurityDescriptor
-;RtlSetSaclSecurityDescriptor
-;RtlSetTimeZoneInformation
-;RtlSizeHeap
-;RtlSplay
-RtlStringFromGUID@8
-;RtlSubAuthorityCountSid
-;RtlSubAuthoritySid
-;RtlSubtreePredecessor
-;RtlSubtreeSuccessor
-RtlTestBit@8
-RtlTimeFieldsToTime@8
-;RtlTimeToElapsedTimeFields
-;RtlTimeToSecondsSince1970
-;RtlTimeToSecondsSince1980
-RtlTimeToTimeFields@8
-;RtlTraceDatabaseAdd
-;RtlTraceDatabaseCreate
-;RtlTraceDatabaseDestroy
-;RtlTraceDatabaseEnumerate
-;RtlTraceDatabaseFind
-;RtlTraceDatabaseLock
-;RtlTraceDatabaseUnlock
-;RtlTraceDatabaseValidate
-@RtlUlongByteSwap@4
-@RtlUlonglongByteSwap@4
-RtlUnicodeStringToAnsiSize@4
-RtlUnicodeStringToAnsiString@12
-;RtlUnicodeStringToCountedOemString
-RtlUnicodeStringToInteger@12
-;RtlUnicodeStringToOemSize
-;RtlUnicodeStringToOemString
-;RtlUnicodeToCustomCPN
-;RtlUnicodeToMultiByteN
-;RtlUnicodeToMultiByteSize
-;RtlUnicodeToOemN
-;RtlUnlockBootStatusData
-;RtlUnwind
-RtlUpcaseUnicodeChar@4
-RtlUpcaseUnicodeString@12
-;RtlUpcaseUnicodeStringToAnsiString
-;RtlUpcaseUnicodeStringToCountedOemString
-;RtlUpcaseUnicodeStringToOemString
-;RtlUpcaseUnicodeToCustomCPN
-;RtlUpcaseUnicodeToMultiByteN
-;RtlUpcaseUnicodeToOemN
-RtlUpperChar@4
-RtlUpperString@8
-RtlUshortByteSwap@4
-RtlValidRelativeSecurityDescriptor@12
-RtlValidSecurityDescriptor@4
-;RtlValidSid
-RtlVerifyVersionInfo@12
-RtlVolumeDeviceToDosName@8
-RtlWalkFrameChain@12
-RtlWriteRegistryValue@24
-;RtlZeroHeap
-;RtlZeroMemory
-;RtlxAnsiStringToUnicodeSize
-;RtlxOemStringToUnicodeSize
-RtlxUnicodeStringToAnsiSize@4
-;RtlxUnicodeStringToOemSize
-SeAccessCheck@40
-;SeAppendPrivileges
-SeAssignSecurity@28
-SeAssignSecurityEx@36
-;SeAuditHardLinkCreation
-;SeAuditingFileEvents
-;SeAuditingFileOrGlobalEvents
-;SeAuditingHardLinkEvents
-;SeCaptureSecurityDescriptor
-;SeCaptureSubjectContext
-;SeCloseObjectAuditAlarm
-;SeCreateAccessState
-;SeCreateClientSecurity
-;SeCreateClientSecurityFromSubjectContext
-SeDeassignSecurity@4
-;SeDeleteAccessState
-;SeDeleteObjectAuditAlarm
-;SeExports DATA
-;SeFilterToken
-;SeFreePrivileges
-;SeImpersonateClient
-;SeImpersonateClientEx
-;SeLockSubjectContext
-;SeMarkLogonSessionForTerminationNotification
-;SeOpenObjectAuditAlarm
-;SeOpenObjectForDeleteAuditAlarm
-;SePrivilegeCheck
-;SePrivilegeObjectAuditAlarm
-;SePublicDefaultDacl DATA
-;SeQueryAuthenticationIdToken
-;SeQueryInformationToken
-;SeQuerySecurityDescriptorInfo
-;SeQuerySessionIdToken
-;SeRegisterLogonSessionTerminatedRoutine
-;SeReleaseSecurityDescriptor
-;SeReleaseSubjectContext
-;SeSetAccessStateGenericMapping
-;SeSetSecurityDescriptorInfo
-;SeSetSecurityDescriptorInfoEx
-SeSinglePrivilegeCheck@8
-;SeSystemDefaultDacl DATA
-;SeTokenImpersonationLevel
-;SeTokenIsAdmin
-;SeTokenIsRestricted
-;SeTokenObjectType DATA
-;SeTokenType
-;SeUnlockSubjectContext
-;SeUnregisterLogonSessionTerminatedRoutine
-SeValidSecurityDescriptor@8
-VerSetConditionMask@12
-;VfFailDeviceNode
-;VfFailDriver
-;VfFailSystemBIOS
-;VfIsVerificationEnabled
-WRITE_REGISTER_BUFFER_UCHAR@12
-WRITE_REGISTER_BUFFER_ULONG@12
-WRITE_REGISTER_BUFFER_USHORT@12
-WRITE_REGISTER_UCHAR@8
-WRITE_REGISTER_ULONG@8
-WRITE_REGISTER_USHORT@8
-;WmiFlushTrace
-;WmiGetClock
-;WmiQueryTrace
-WmiQueryTraceInformation@20
-;WmiStartTrace
-;WmiStopTrace
-WmiTraceMessage
-;WmiTraceMessageVa
-;WmiUpdateTrace
-;XIPDispatch
-ZwAccessCheckAndAuditAlarm@44
-;ZwAddBootEntry
-ZwAdjustPrivilegesToken@24
-ZwAlertThread@4
-ZwAllocateVirtualMemory@24
-ZwAssignProcessToJobObject@8
-ZwCancelIoFile@8
-ZwCancelTimer@8
-;ZwClearEvent
-ZwClose@4
-ZwCloseObjectAuditAlarm@12
-ZwConnectPort@32
-ZwCreateDirectoryObject@12
-ZwCreateEvent@20
-ZwCreateFile@44
-ZwCreateJobObject@12
-ZwCreateKey@28
-ZwCreateSection@28
-ZwCreateSymbolicLinkObject@16
-ZwCreateTimer@16
-;ZwDeleteBootEntry
-ZwDeleteFile@4
-ZwDeleteKey@4
-ZwDeleteValueKey@8
-ZwDeviceIoControlFile@40
-ZwDisplayString@4
-ZwDuplicateObject@28
-ZwDuplicateToken@24
-;ZwEnumerateBootEntries
-ZwEnumerateKey@24
-ZwEnumerateValueKey@24
-ZwFlushInstructionCache@12
-ZwFlushKey@4
-ZwFlushVirtualMemory@16
-ZwFreeVirtualMemory@16
-;ZwFsControlFile
-ZwInitiatePowerAction@16
-;ZwIsProcessInJob
-ZwLoadDriver@4
-ZwLoadKey@8
-ZwMakeTemporaryObject@4
-ZwMapViewOfSection@40
-ZwNotifyChangeKey@40
-ZwOpenDirectoryObject@12
-;ZwOpenEvent
-ZwOpenFile@24
-ZwOpenJobObject@12
-ZwOpenKey@12
-;ZwOpenProcess
-ZwOpenProcessToken@12
-;ZwOpenProcessTokenEx
-ZwOpenSection@12
-ZwOpenSymbolicLinkObject@12
-ZwOpenThread@16
-ZwOpenThreadToken@16
-;ZwOpenThreadTokenEx
-ZwOpenTimer@12
-ZwPowerInformation@20
-;ZwPulseEvent
-;ZwQueryBootEntryOrder
-;ZwQueryBootOptions
-ZwQueryDefaultLocale@8
-ZwQueryDefaultUILanguage@4
-;ZwQueryDirectoryFile
-ZwQueryDirectoryObject@28
-;ZwQueryEaFile
-;ZwQueryFullAttributesFile
-ZwQueryInformationFile@20
-ZwQueryInformationJobObject@20
-ZwQueryInformationProcess@20
-ZwQueryInformationThread@20
-ZwQueryInformationToken@20
-ZwQueryInstallUILanguage@4
-ZwQueryKey@20
-ZwQueryObject@20
-ZwQuerySection@20
-ZwQuerySecurityObject@20
-ZwQuerySymbolicLinkObject@12
-ZwQuerySystemInformation@16
-ZwQueryValueKey@24
-;ZwQueryVolumeInformationFile
-ZwReadFile@36
-ZwReplaceKey@12
-ZwRequestWaitReplyPort@12
-;ZwResetEvent
-ZwRestoreKey@12
-ZwSaveKey@8
-;ZwSaveKeyEx
-;ZwSetBootEntryOrder
-;ZwSetBootOptions
-ZwSetDefaultLocale@8
-ZwSetDefaultUILanguage@4
-;ZwSetEaFile
-ZwSetEvent@8
-ZwSetInformationFile@20
-ZwSetInformationJobObject@16
-ZwSetInformationObject@16
-ZwSetInformationProcess@16
-ZwSetInformationThread@16
-ZwSetSecurityObject@12
-ZwSetSystemInformation@12
-ZwSetSystemTime@8
-ZwSetTimer@28
-ZwSetValueKey@24
-;ZwSetVolumeInformationFile
-ZwTerminateJobObject@8
-ZwTerminateProcess@8
-;ZwTranslateFilePath
-ZwUnloadDriver@4
-ZwUnloadKey@4
-ZwUnmapViewOfSection@8
-;ZwWaitForMultipleObjects
-ZwWaitForSingleObject@12
-ZwWriteFile@36
-ZwYieldExecution@0
-;_CIcos
-;_CIsin
-;_CIsqrt
-;_abnormal_termination
-;_alldiv
-;_alldvrm
-;_allmul
-;_alloca_probe
-;_allrem
-;_allshl
-;_allshr
-;_aulldiv
-;_aulldvrm
-;_aullrem
-;_aullshr
-;_except_handler2
-;_except_handler3
-;_global_unwind2
-;_itoa
-;_itow
-;_local_unwind2
-;_purecall
-;_snprintf
-;_snwprintf
-_stricmp
-_strlwr
-_strnicmp
-_strnset
-_strrev
-_strset
-_strupr
-;_vsnprintf
-;_vsnwprintf
-_wcsicmp@8
-_wcslwr@4
-_wcsnicmp@12
-_wcsnset@12
-_wcsrev@4
-_wcsupr@4
-;atoi
-;atol
-;isdigit
-;islower
-;isprint
-;isspace
-;isupper
-;isxdigit
-;mbstowcs
-;mbtowc
-memchr
-memcpy
-memmove
-memset
-;qsort
-;rand
-;sprintf
-;srand
-strcat
-strchr
-strcmp
-strcpy
-strlen
-strncat
-strncmp
-strncpy
-strrchr
-strspn
-strstr
-;swprintf
-;tolower
-;toupper
-;towlower
-;towupper
-;vDbgPrintEx
-;vDbgPrintExWithPrefix
-;vsprintf
-wcscat
-wcschr
-wcscmp
-wcscpy
-wcscspn
-wcslen
-wcsncat
-wcsncmp
-wcsncpy
-wcsrchr
-wcsspn
-wcsstr
-;wcstombs
-;wctomb
diff --git a/winsup/w32api/lib/ddk/scsiport.def b/winsup/w32api/lib/ddk/scsiport.def
deleted file mode 100644
index 1965161f3..000000000
--- a/winsup/w32api/lib/ddk/scsiport.def
+++ /dev/null
@@ -1,49 +0,0 @@
-LIBRARY scsiport.sys
-EXPORTS
-DllInitialize@4
-ScsiDebugPrint
-ScsiPortCompleteRequest@20
-;ScsiPortConvertPhysicalAddressToUlong
-ScsiPortConvertUlongToPhysicalAddress@4
-ScsiPortFlushDma@4
-ScsiPortFreeDeviceBase@8
-ScsiPortGetBusData@24
-ScsiPortGetDeviceBase@24
-ScsiPortGetLogicalUnit@16
-ScsiPortGetPhysicalAddress@16
-ScsiPortGetSrb@20
-ScsiPortGetUncachedExtension@12
-ScsiPortGetVirtualAddress@8
-ScsiPortInitialize@16
-ScsiPortIoMapTransfer@16
-ScsiPortLogError@28
-ScsiPortMoveMemory@12
-ScsiPortNotification
-ScsiPortQuerySystemTime@4
-ScsiPortReadPortBufferUchar@12
-ScsiPortReadPortBufferUlong@12
-ScsiPortReadPortBufferUshort@12
-ScsiPortReadPortUchar@4
-ScsiPortReadPortUlong@4
-ScsiPortReadPortUshort@4
-ScsiPortReadRegisterBufferUchar@12
-ScsiPortReadRegisterBufferUlong@12
-ScsiPortReadRegisterBufferUshort@12
-ScsiPortReadRegisterUchar@4
-ScsiPortReadRegisterUlong@4
-ScsiPortReadRegisterUshort@4
-ScsiPortSetBusDataByOffset@28
-ScsiPortStallExecution@4
-ScsiPortValidateRange@24
-ScsiPortWritePortBufferUchar@12
-ScsiPortWritePortBufferUlong@12
-ScsiPortWritePortBufferUshort@12
-ScsiPortWritePortUchar@8
-ScsiPortWritePortUlong@8
-ScsiPortWritePortUshort@8
-ScsiPortWriteRegisterBufferUchar@12
-ScsiPortWriteRegisterBufferUlong@12
-ScsiPortWriteRegisterBufferUshort@12
-ScsiPortWriteRegisterUchar@8
-ScsiPortWriteRegisterUlong@8
-ScsiPortWriteRegisterUshort@8
diff --git a/winsup/w32api/lib/ddk/tdi.def b/winsup/w32api/lib/ddk/tdi.def
deleted file mode 100644
index ee90642f8..000000000
--- a/winsup/w32api/lib/ddk/tdi.def
+++ /dev/null
@@ -1,50 +0,0 @@
-LIBRARY tdi.sys
-EXPORTS
-;CTEAllocateString
-;CTEBlock
-;CTEInitEvent
-;CTEInitString
-;CTEInitTimer
-;CTEInitialize
-;CTELogEvent
-;CTEScheduleDelayedEvent
-;CTEScheduleEvent
-;CTESignal
-;CTEStartTimer
-;CTESystemUpTime
-TdiBuildNetbiosAddress@12
-TdiBuildNetbiosAddressEa@12
-TdiCopyBufferToMdl@24
-TdiCopyMdlChainToMdlChain@20
-TdiCopyMdlToBuffer@24
-TdiDefaultChainedRcvDatagramHandler@40
-TdiDefaultChainedRcvExpeditedHandler@28
-TdiDefaultChainedReceiveHandler@28
-TdiDefaultConnectHandler@36
-TdiDefaultDisconnectHandler@28
-TdiDefaultErrorHandler@8
-TdiDefaultRcvDatagramHandler@44
-TdiDefaultRcvExpeditedHandler@32
-TdiDefaultReceiveHandler@32
-TdiDefaultSendPossibleHandler@12
-TdiDeregisterAddressChangeHandler@4
-TdiDeregisterDeviceObject@4
-TdiDeregisterNetAddress@4
-;TdiDeregisterNotificationHandler
-TdiDeregisterPnPHandlers@4
-TdiDeregisterProvider@4
-TdiEnumerateAddresses@4
-TdiInitialize@0
-TdiMapUserRequest@12
-TdiMatchPdoWithChainedReceiveContext@8
-;TdiOpenNetbiosAddress
-TdiPnPPowerComplete@12
-TdiPnPPowerRequest@20
-TdiProviderReady@4
-TdiRegisterAddressChangeHandler@12
-TdiRegisterDeviceObject@8
-TdiRegisterNetAddress@16
-TdiRegisterNotificationHandler@12
-TdiRegisterPnPHandlers@12
-TdiRegisterProvider@8
-TdiReturnChainedReceives@8
diff --git a/winsup/w32api/lib/ddk/usbcamd.def b/winsup/w32api/lib/ddk/usbcamd.def
deleted file mode 100644
index 5b052e20f..000000000
--- a/winsup/w32api/lib/ddk/usbcamd.def
+++ /dev/null
@@ -1,10 +0,0 @@
-LIBRARY usbcamd.sys
-EXPORTS
-DllUnload@0
-USBCAMD_AdapterReceivePacket@16
-USBCAMD_ControlVendorCommand@36
-;USBCAMD_Debug_LogEntry
-USBCAMD_DriverEntry@20
-USBCAMD_GetRegistryKeyValue@20
-USBCAMD_InitializeNewInterface@16
-USBCAMD_SelectAlternateInterface@8
diff --git a/winsup/w32api/lib/ddk/usbcamd2.def b/winsup/w32api/lib/ddk/usbcamd2.def
deleted file mode 100644
index 199d21e18..000000000
--- a/winsup/w32api/lib/ddk/usbcamd2.def
+++ /dev/null
@@ -1,10 +0,0 @@
-LIBRARY usbcamd2.sys
-EXPORTS
-DllUnload@0
-USBCAMD_AdapterReceivePacket@16
-USBCAMD_ControlVendorCommand@36
-;USBCAMD_Debug_LogEntry
-USBCAMD_DriverEntry@20
-USBCAMD_GetRegistryKeyValue@20
-USBCAMD_InitializeNewInterface@16
-USBCAMD_SelectAlternateInterface@8
diff --git a/winsup/w32api/lib/ddk/videoprt.def b/winsup/w32api/lib/ddk/videoprt.def
deleted file mode 100644
index 2082d4caa..000000000
--- a/winsup/w32api/lib/ddk/videoprt.def
+++ /dev/null
@@ -1,115 +0,0 @@
-LIBRARY videoprt.sys
-EXPORTS
-VideoPortAcquireDeviceLock@4
-VideoPortAcquireSpinLock@12
-VideoPortAcquireSpinLockAtDpcLevel@8
-VideoPortAllocateBuffer@12
-VideoPortAllocateCommonBuffer@24
-VideoPortAllocateContiguousMemory@12
-VideoPortAllocatePool@16
-VideoPortAssociateEventsWithDmaHandle@16
-;VideoPortCheckForDeviceExistance
-VideoPortCheckForDeviceExistence@28
-VideoPortClearEvent@8
-VideoPortCompareMemory@12
-VideoPortCompleteDma@16
-VideoPortCreateEvent@16
-VideoPortCreateSecondaryDisplay@12
-VideoPortCreateSpinLock@8
-VideoPortDDCMonitorHelper@16
-VideoPortDebugPrint
-VideoPortDeleteEvent@8
-VideoPortDeleteSpinLock@8
-VideoPortDisableInterrupt@4
-VideoPortDoDma@12
-VideoPortEnableInterrupt@4
-VideoPortEnumerateChildren@8
-;VideoPortFlushRegistry
-VideoPortFreeCommonBuffer@20
-VideoPortFreeDeviceBase@8
-VideoPortFreePool@8
-VideoPortGetAccessRanges@32
-VideoPortGetAgpServices@8
-VideoPortGetAssociatedDeviceExtension@4
-VideoPortGetAssociatedDeviceID@4
-VideoPortGetBusData@24
-VideoPortGetBytesUsed@8
-VideoPortGetCommonBuffer@24
-VideoPortGetCurrentIrql@0
-VideoPortGetDeviceBase@16
-VideoPortGetDeviceData@16
-VideoPortGetDmaAdapter@8
-VideoPortGetDmaContext@8
-VideoPortGetMdl@8
-VideoPortGetRegistryParameters@20
-VideoPortGetRomImage@16
-VideoPortGetVersion@8
-VideoPortGetVgaStatus@8
-VideoPortInitialize@16
-VideoPortInt10@8
-@VideoPortInterlockedDecrement@4
-@VideoPortInterlockedExchange@8
-@VideoPortInterlockedIncrement@4
-VideoPortLockBuffer@16
-VideoPortLockPages@20
-VideoPortLogError@16
-VideoPortMapBankedMemory@36
-VideoPortMapDmaMemory@32
-VideoPortMapMemory@20
-VideoPortMoveMemory@12
-VideoPortPutDmaAdapter@8
-VideoPortQueryPerformanceCounter@8
-VideoPortQueryServices@12
-VideoPortQuerySystemTime@4
-VideoPortQueueDpc@12
-VideoPortReadPortBufferUchar@12
-VideoPortReadPortBufferUlong@12
-VideoPortReadPortBufferUshort@12
-VideoPortReadPortUchar@4
-VideoPortReadPortUlong@4
-VideoPortReadPortUshort@4
-VideoPortReadRegisterBufferUchar@12
-VideoPortReadRegisterBufferUlong@12
-VideoPortReadRegisterBufferUshort@12
-VideoPortReadRegisterUchar@4
-VideoPortReadRegisterUlong@4
-VideoPortReadRegisterUshort@4
-VideoPortReadStateEvent@8
-VideoPortReleaseBuffer@8
-VideoPortReleaseCommonBuffer@24
-VideoPortReleaseDeviceLock@4
-VideoPortReleaseSpinLock@12
-VideoPortReleaseSpinLockFromDpcLevel@8
-VideoPortScanRom@16
-VideoPortSetBusData@24
-VideoPortSetBytesUsed@12
-VideoPortSetDmaContext@12
-VideoPortSetEvent@8
-VideoPortSetRegistryParameters@16
-VideoPortSetTrappedEmulatorPorts@12
-VideoPortSignalDmaComplete@8
-VideoPortStallExecution@4
-VideoPortStartDma@32
-VideoPortStartTimer@4
-VideoPortStopTimer@4
-VideoPortSynchronizeExecution@16
-VideoPortUnlockBuffer@8
-VideoPortUnlockPages@8
-VideoPortUnmapDmaMemory@16
-VideoPortUnmapMemory@12
-VideoPortVerifyAccessRanges@12
-VideoPortWaitForSingleObject@12
-VideoPortWritePortBufferUchar@12
-VideoPortWritePortBufferUlong@12
-VideoPortWritePortBufferUshort@12
-VideoPortWritePortUchar@8
-VideoPortWritePortUlong@8
-VideoPortWritePortUshort@8
-VideoPortWriteRegisterBufferUchar@12
-VideoPortWriteRegisterBufferUlong@12
-VideoPortWriteRegisterBufferUshort@12
-VideoPortWriteRegisterUchar@8
-VideoPortWriteRegisterUlong@8
-VideoPortWriteRegisterUshort@8
-VideoPortZeroDeviceMemory@8
-VideoPortZeroMemory@8
diff --git a/winsup/w32api/lib/ddk/win32k.def b/winsup/w32api/lib/ddk/win32k.def
deleted file mode 100644
index 2c7f14749..000000000
--- a/winsup/w32api/lib/ddk/win32k.def
+++ /dev/null
@@ -1,226 +0,0 @@
-LIBRARY win32k.sys
-EXPORTS
-BRUSHOBJ_hGetColorTransform@4
-BRUSHOBJ_pvAllocRbrush@8
-BRUSHOBJ_pvGetRbrush@4
-BRUSHOBJ_ulGetBrushColor@4
-CLIPOBJ_bEnum@12
-CLIPOBJ_cEnumStart@20
-CLIPOBJ_ppoGetPath@4
-EngAcquireSemaphore@4
-EngAllocMem@12
-EngAllocPrivateUserMem@12
-;EngAllocSectionMem
-EngAllocUserMem@8
-EngAlphaBlend@28
-EngAssociateSurface@12
-EngBitBlt@44
-EngCheckAbort@4
-EngClearEvent@4
-EngComputeGlyphSet@12
-EngControlSprites@8
-EngCopyBits@24
-EngCreateBitmap@20
-EngCreateClip@0
-EngCreateDeviceBitmap@12
-EngCreateDeviceSurface@12
-;EngCreateDriverObj
-EngCreateEvent@4
-EngCreatePalette@24
-EngCreatePath@0
-EngCreateSemaphore@0
-EngCreateWnd@20
-EngDebugBreak@0
-EngDebugPrint@12
-EngDeleteClip@4
-EngDeleteDriverObj@12
-EngDeleteEvent@4
-EngDeleteFile@4
-EngDeletePalette@4
-EngDeletePath@4
-EngDeleteSafeSemaphore@4
-EngDeleteSemaphore@4
-EngDeleteSurface@4
-EngDeleteWnd@4
-EngDeviceIoControl@28
-EngDitherColor@16
-;EngDxIoctl
-EngEnumForms@24
-EngEraseSurface@12
-;EngFileIoControl
-;EngFileWrite
-EngFillPath@28
-EngFindImageProcAddress@8
-EngFindResource@16
-EngFntCacheAlloc@8
-EngFntCacheFault@8
-EngFntCacheLookUp@8
-EngFreeMem@4
-EngFreeModule@4
-EngFreePrivateUserMem@8
-;EngFreeSectionMem
-EngFreeUserMem@4
-EngGetCurrentCodePage@8
-EngGetCurrentProcessId@0
-EngGetCurrentThreadId@0
-EngGetDriverName@4
-EngGetFileChangeTime@8
-EngGetFilePath@8
-EngGetForm@24
-EngGetLastError@0
-EngGetPrinter@20
-EngGetPrinterData@24
-EngGetPrinterDataFileName@4
-EngGetPrinterDriver@24
-EngGetProcessHandle@0
-;EngGetTickCount
-EngGetType1FontList@24
-EngGradientFill@40
-EngHangNotification@8
-EngInitializeSafeSemaphore@4
-EngIsSemaphoreOwned@4
-EngIsSemaphoreOwnedByCurrentThread@4
-EngLineTo@36
-EngLoadImage@4
-EngLoadModule@4
-EngLoadModuleForWrite@8
-EngLockDirectDrawSurface@4
-;EngLockDriverObj
-EngLockSurface@4
-EngLpkInstalled@0
-EngMapEvent@20
-EngMapFile@12
-EngMapFontFile@12
-EngMapFontFileFD@12
-EngMapModule@8
-;EngMapSection
-EngMarkBandingSurface@4
-EngModifySurface@32
-EngMovePointer@16
-EngMulDiv@12
-EngMultiByteToUnicodeN@20
-EngMultiByteToWideChar@20
-;EngNineGrid
-EngPaint@20
-EngPlgBlt@44
-EngProbeForRead@12
-EngProbeForReadAndWrite@12
-EngQueryDeviceAttribute@24
-EngQueryLocalTime@4
-EngQueryPalette@16
-EngQueryPerformanceCounter@4
-EngQueryPerformanceFrequency@4
-EngQuerySystemAttribute@8
-EngReadStateEvent@4
-EngReleaseSemaphore@4
-EngRestoreFloatingPointState@4
-EngSaveFloatingPointState@8
-EngSecureMem@8
-EngSetEvent@4
-EngSetLastError@4
-EngSetPointerShape@40
-EngSetPointerTag@20
-EngSetPrinterData@20
-EngSort@16
-EngStretchBlt@44
-EngStretchBltROP@52
-EngStrokeAndFillPath@40
-EngStrokePath@32
-EngTextOut@40
-EngTransparentBlt@32
-EngUnicodeToMultiByteN@20
-EngUnloadImage@4
-EngUnlockDirectDrawSurface@4
-EngUnlockDriverObj@4
-EngUnlockSurface@4
-EngUnmapEvent@4
-EngUnmapFile@4
-EngUnmapFontFile@4
-EngUnmapFontFileFD@4
-EngUnsecureMem@4
-EngWaitForSingleObject@8
-EngWideCharToMultiByte@20
-EngWritePrinter@16
-FLOATOBJ_Add@8
-FLOATOBJ_AddFloat@8
-;FLOATOBJ_AddFloatObj
-FLOATOBJ_AddLong@8
-FLOATOBJ_Div@8
-FLOATOBJ_DivFloat@8
-;FLOATOBJ_DivFloatObj
-FLOATOBJ_DivLong@8
-FLOATOBJ_Equal@8
-FLOATOBJ_EqualLong@8
-FLOATOBJ_GetFloat@4
-FLOATOBJ_GetLong@4
-FLOATOBJ_GreaterThan@8
-FLOATOBJ_GreaterThanLong@8
-FLOATOBJ_LessThan@8
-FLOATOBJ_LessThanLong@8
-FLOATOBJ_Mul@8
-FLOATOBJ_MulFloat@8
-;FLOATOBJ_MulFloatObj
-FLOATOBJ_MulLong@8
-FLOATOBJ_Neg@4
-FLOATOBJ_SetFloat@8
-FLOATOBJ_SetLong@8
-FLOATOBJ_Sub@8
-FLOATOBJ_SubFloat@8
-;FLOATOBJ_SubFloatObj
-FLOATOBJ_SubLong@8
-FONTOBJ_cGetAllGlyphHandles@8
-FONTOBJ_cGetGlyphs@20
-FONTOBJ_pQueryGlyphAttrs@8
-FONTOBJ_pfdg@4
-FONTOBJ_pifi@4
-FONTOBJ_pjOpenTypeTablePointer@12
-FONTOBJ_pvTrueTypeFontFile@8
-FONTOBJ_pwszFontFilePaths@8
-FONTOBJ_pxoGetXform@4
-FONTOBJ_vGetInfo@12
-HT_ComputeRGBGammaTable@24
-HT_Get8BPPFormatPalette@16
-HT_Get8BPPMaskPalette@24
-HeapVidMemAllocAligned@20
-PALOBJ_cGetColors@16
-PATHOBJ_bCloseFigure@4
-PATHOBJ_bEnum@8
-PATHOBJ_bEnumClipLines@12
-PATHOBJ_bMoveTo@8
-PATHOBJ_bPolyBezierTo@12
-PATHOBJ_bPolyLineTo@12
-PATHOBJ_vEnumStart@4
-PATHOBJ_vEnumStartClipLines@16
-PATHOBJ_vGetBounds@8
-;RtlAnsiCharToUnicodeChar
-;RtlMultiByteToUnicodeN
-;RtlRaiseException
-;RtlUnicodeToMultiByteN
-;RtlUnicodeToMultiByteSize
-;RtlUnwind
-RtlUpcaseUnicodeChar@4
-;RtlUpcaseUnicodeToMultiByteN
-STROBJ_bEnum@12
-STROBJ_bEnumPositionsOnly@12
-STROBJ_bGetAdvanceWidths@16
-STROBJ_dwGetCodePage@4
-STROBJ_fxBreakExtra@4
-STROBJ_fxCharacterExtra@4
-STROBJ_vEnumStart@4
-VidMemFree@8
-WNDOBJ_bEnum@12
-WNDOBJ_cEnumStart@16
-WNDOBJ_vSetConsumer@8
-XFORMOBJ_bApplyXform@20
-XFORMOBJ_iGetFloatObjXform@8
-XFORMOBJ_iGetXform@8
-XLATEOBJ_cGetPalette@16
-XLATEOBJ_hGetColorTransform@4
-XLATEOBJ_iXlate@8
-XLATEOBJ_piVector@4
-;_abnormal_termination
-;_except_handler2
-;_global_unwind2
-;_itoa
-;_itow
-;_local_unwind2
diff --git a/winsup/w32api/lib/ddraw.def b/winsup/w32api/lib/ddraw.def
deleted file mode 100644
index 9e0ee0c44..000000000
--- a/winsup/w32api/lib/ddraw.def
+++ /dev/null
@@ -1,28 +0,0 @@
-; from DirectX 6.1
-LIBRARY DDRAW.dll
-EXPORTS
-D3DParseUnknownCommand@8
-DDHAL32_VidMemAlloc@16
-DDHAL32_VidMemFree@12
-DDInternalLock@8
-DDInternalUnlock@4
-DSoundHelp@12
-DirectDrawCreate@12
-DirectDrawCreateClipper@12
-DirectDrawEnumerateA@8
-DirectDrawEnumerateExA@12
-DirectDrawEnumerateExW@12
-DirectDrawEnumerateW@8
-GetAliasedVidMem
-GetNextMipMap
-GetSurfaceFromDC@12 
-HeapVidMemAllocAligned@20 
-InternalLock 
-InternalUnlock 
-LateAllocateSurfaceMem@16
-VidMemAlloc@12
-VidMemAmountFree@4
-VidMemFini@4
-VidMemFree@8
-VidMemInit@20
-VidMemLargestFree@4
diff --git a/winsup/w32api/lib/dhcpcsvc.def b/winsup/w32api/lib/dhcpcsvc.def
deleted file mode 100644
index a1cd3b984..000000000
--- a/winsup/w32api/lib/dhcpcsvc.def
+++ /dev/null
@@ -1,8 +0,0 @@
-LIBRARY DHCPCSVC.DLL

-EXPORTS

-DhcpCApiCleanup@0

-DhcpCApiInitialize@4

-DhcpDeRegisterParamChange@12

-DhcpRegisterParamChange@28

-DhcpRemoveDNSRegistrations@0

-DhcpUndoRequestParams@16

diff --git a/winsup/w32api/lib/dinput.c b/winsup/w32api/lib/dinput.c
deleted file mode 100644
index 40e98ec4a..000000000
--- a/winsup/w32api/lib/dinput.c
+++ /dev/null
@@ -1,2487 +0,0 @@
-/*
-   DINPUT.C
-
-   Author: Daniel Guerrero Miralles (daguer@geocities.com)
-   Version: 1.1.2
-   Date: 12/98
-
-   ABSTRACT:
-   DirectInput library static data source code. For DirectX 6.1 and
-   earlier versions.
-
-   LEGAL INFORMATION:
-   This is PUBLIC DOMAIN source code. The source code in this file is
-   provided "as is", without any warranty, including but not limited to,
-   fitness for any particular purpose.
-
-   REMARKS:
-   - Fixed bug in c_dfDIMouse definition.
-
-   TODO:
-   Nothing.
-*/
-
-#if defined(__LCC__) || defined(__GNUC__) || defined(__WATCOMC__)
-#include <windows.h>
-#else
-#include <basetyps.h>
-#endif
-
-/* --- Types and constants --- */
-
-typedef struct DIOBJECTDATAFORMAT_TAG
-{
-	const GUID * pguid;
-	DWORD dwOfw;
-	DWORD dwType;
-	DWORD dwFlags;
-} DIOBJECTDATAFORMAT;
-
-typedef struct DIDATAFORMAT_TAG {
-	DWORD dwSize;
-	DWORD dwObjSize;
-	DWORD dwFlags;
-	DWORD dwDataSize;
-	DWORD dwNumObjs;
-	DIOBJECTDATAFORMAT * rgodf;
-} DIDATAFORMAT;
-
-#define DIDF_ABSAXIS 1L
-#define DIDF_RELAXIS 2L
-#define DIDFT_AXIS 3L
-#define DIDFT_BUTTON 12L
-#define DIDFT_POV 16L
-#define DIDFT_MAKEINSTANCE(x) ((WORD)(x)<<8)
-#define DIDFT_ANYINSTANCE (DIDFT_MAKEINSTANCE(-1))
-#define DIDOI_ASPECTPOSITION (1L<<8)
-#define DIDOI_ASPECTVELOCITY (2L<<8)
-#define DIDOI_ASPECTACCEL (3L<<8)
-#define DIDOI_ASPECTFORCE (4L<<8)
-
-extern GUID GUID_XAxis;
-extern GUID GUID_YAxis;
-extern GUID GUID_ZAxis;
-extern GUID GUID_RxAxis;
-extern GUID GUID_RyAxis;
-extern GUID GUID_RzAxis;
-extern GUID GUID_Slider;
-extern GUID GUID_Key;
-extern GUID GUID_POV;
-
-/* --- Static data --- */
-
-static DIOBJECTDATAFORMAT diodfKeyData[] =
-{
-	{
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 0,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(0),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 1,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(1),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 2,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(2),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 3,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(3),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 4,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(4),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 5,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(5),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 6,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(6),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 7,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(7),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 8,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(8),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 9,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(9),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 10,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(10),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 11,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(11),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 12,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(12),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 13,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(13),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 14,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(14),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 15,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(15),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 16,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(16),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 17,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(17),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 18,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(18),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 19,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(19),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 20,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(20),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 21,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(21),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 22,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(22),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 23,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(23),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 24,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(24),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 25,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(25),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 26,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(26),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 27,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(27),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 28,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(28),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 29,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(29),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 30,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(30),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 31,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(31),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 32,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(32),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 33,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(33),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 34,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(34),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 35,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(35),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 36,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(36),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 37,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(37),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 38,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(38),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 39,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(39),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 40,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(40),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 41,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(41),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 42,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(42),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 43,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(43),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 44,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(44),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 45,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(45),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 46,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(46),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 47,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(47),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 48,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(48),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 49,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(49),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 50,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(50),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 51,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(51),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 52,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(52),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 53,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(53),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 54,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(54),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 55,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(55),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 56,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(56),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 57,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(57),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 58,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(58),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 59,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(59),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 60,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(60),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 61,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(61),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 62,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(62),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 63,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(63),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 64,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(64),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 65,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(65),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 66,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(66),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 67,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(67),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 68,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(68),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 69,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(69),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 70,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(70),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 71,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(71),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 72,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(72),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 73,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(73),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 74,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(74),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 75,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(75),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 76,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(76),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 77,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(77),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 78,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(78),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 79,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(79),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 80,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(80),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 81,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(81),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 82,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(82),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 83,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(83),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 84,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(84),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 85,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(85),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 86,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(86),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 87,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(87),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 88,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(88),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 89,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(89),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 90,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(90),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 91,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(91),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 92,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(92),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 93,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(93),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 94,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(94),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 95,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(95),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 96,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(96),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 97,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(97),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 98,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(98),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 99,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(99),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 100,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(100),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 101,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(101),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 102,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(102),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 103,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(103),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 104,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(104),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 105,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(105),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 106,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(106),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 107,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(107),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 108,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(108),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 109,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(109),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 110,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(110),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 111,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(111),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 112,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(112),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 113,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(113),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 114,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(114),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 115,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(115),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 116,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(116),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 117,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(117),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 118,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(118),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 119,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(119),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 120,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(120),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 121,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(121),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 122,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(122),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 123,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(123),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 124,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(124),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 125,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(125),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 126,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(126),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 127,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(127),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 128,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(128),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 129,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(129),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 130,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(130),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 131,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(131),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 132,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(132),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 133,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(133),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 134,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(134),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 135,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(135),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 136,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(136),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 137,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(137),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 138,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(138),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 139,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(139),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 140,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(140),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 141,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(141),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 142,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(142),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 143,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(143),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 144,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(144),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 145,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(145),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 146,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(146),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 147,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(147),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 148,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(148),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 149,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(149),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 150,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(150),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 151,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(151),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 152,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(152),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 153,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(153),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 154,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(154),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 155,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(155),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 156,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(156),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 157,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(157),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 158,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(158),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 159,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(159),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 160,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(160),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 161,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(161),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 162,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(162),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 163,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(163),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 164,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(164),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 165,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(165),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 166,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(166),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 167,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(167),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 168,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(168),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 169,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(169),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 170,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(170),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 171,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(171),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 172,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(172),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 173,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(173),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 174,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(174),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 175,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(175),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 176,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(176),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 177,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(177),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 178,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(178),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 179,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(179),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 180,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(180),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 181,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(181),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 182,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(182),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 183,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(183),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 184,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(184),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 185,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(185),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 186,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(186),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 187,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(187),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 188,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(188),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 189,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(189),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 190,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(190),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 191,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(191),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 192,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(192),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 193,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(193),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 194,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(194),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 195,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(195),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 196,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(196),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 197,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(197),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 198,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(198),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 199,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(199),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 200,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(200),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 201,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(201),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 202,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(202),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 203,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(203),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 204,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(204),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 205,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(205),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 206,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(206),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 207,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(207),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 208,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(208),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 209,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(209),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 210,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(210),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 211,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(211),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 212,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(212),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 213,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(213),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 214,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(214),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 215,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(215),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 216,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(216),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 217,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(217),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 218,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(218),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 219,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(219),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 220,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(220),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 221,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(221),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 222,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(222),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 223,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(223),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 224,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(224),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 225,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(225),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 226,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(226),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 227,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(227),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 228,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(228),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 229,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(229),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 230,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(230),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 231,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(231),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 232,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(232),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 233,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(233),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 234,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(234),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 235,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(235),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 236,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(236),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 237,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(237),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 238,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(238),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 239,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(239),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 240,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(240),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 241,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(241),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 242,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(242),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 243,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(243),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 244,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(244),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 245,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(245),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 246,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(246),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 247,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(247),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 248,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(248),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 249,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(249),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 250,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(250),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 251,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(251),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 252,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(252),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 253,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(253),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 254,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(254),
-	/* dwFlags = */ 0
-	}, {
-	/* pguid =   */ &GUID_Key,
-	/* dwOfw =   */ 255,
-	/* dwType =  */ 0x80000000|DIDFT_BUTTON|DIDFT_MAKEINSTANCE(255),
-	/* dwFlags = */ 0
-        }
-};
-
-static DIOBJECTDATAFORMAT diodfJoyData[] =
-{
-        {
-        /* pguid =   */ &GUID_XAxis,
-        /* dwOfw =   */ 0,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_YAxis,
-        /* dwOfw =   */ 4,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_ZAxis,
-        /* dwOfw =   */ 8,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_RxAxis,
-        /* dwOfw =   */ 12,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_RyAxis,
-        /* dwOfw =   */ 16,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_RzAxis,
-        /* dwOfw =   */ 20,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_Slider,
-        /* dwOfw =   */ 24,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_Slider,
-        /* dwOfw =   */ 28,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_POV,
-        /* dwOfw =   */ 32,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_POV,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ &GUID_POV,
-        /* dwOfw =   */ 36,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_POV,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ &GUID_POV,
-        /* dwOfw =   */ 40,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_POV,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ &GUID_POV,
-        /* dwOfw =   */ 44,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_POV,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 48,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 49,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 50,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 51,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 52,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 53,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 54,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 55,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 56,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 57,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 58,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 59,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 60,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 61,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 62,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 63,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 64,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 65,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 66,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 67,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 68,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 69,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 70,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 71,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 72,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 73,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 74,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 75,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 76,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 77,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 78,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 79,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }
-};
-
-static DIOBJECTDATAFORMAT diodfJoy2Data[] =
-{
-        {
-        /* pguid =   */ &GUID_XAxis,
-        /* dwOfw =   */ 0,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_YAxis,
-        /* dwOfw =   */ 4,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_ZAxis,
-        /* dwOfw =   */ 8,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_RxAxis,
-        /* dwOfw =   */ 12,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_RyAxis,
-        /* dwOfw =   */ 16,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_RzAxis,
-        /* dwOfw =   */ 20,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_Slider,
-        /* dwOfw =   */ 24,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_Slider,
-        /* dwOfw =   */ 28,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTPOSITION
-        }, {
-        /* pguid =   */ &GUID_POV,
-        /* dwOfw =   */ 32,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_POV,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ &GUID_POV,
-        /* dwOfw =   */ 36,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_POV,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ &GUID_POV,
-        /* dwOfw =   */ 40,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_POV,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ &GUID_POV,
-        /* dwOfw =   */ 44,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_POV,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 48,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 49,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 50,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 51,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 52,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 53,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 54,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 55,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 56,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 57,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 58,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 59,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 60,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 61,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 62,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 63,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 64,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 65,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 66,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 67,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 68,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 69,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 70,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 71,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 72,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 73,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 74,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 75,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 76,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 77,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 78,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 79,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 80,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 81,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 82,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 83,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 84,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 85,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 86,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 87,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 88,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 89,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 90,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 91,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 92,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 93,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 94,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 95,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 96,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 97,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 98,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 99,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 100,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 101,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 102,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 103,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 104,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 105,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 106,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 107,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 108,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 109,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 110,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 111,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 112,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 113,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 114,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 115,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 116,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 117,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 118,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 119,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 120,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 121,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 122,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 123,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 124,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 125,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 126,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 127,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 128,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 129,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 130,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 131,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 132,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 133,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 134,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 135,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 136,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 137,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 138,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 139,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 140,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 141,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 142,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 143,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 144,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 145,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 146,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 147,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 148,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 149,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 150,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 151,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 152,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 153,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 154,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 155,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 156,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 157,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 158,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 159,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 160,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 161,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 162,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 163,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 164,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 165,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 166,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 167,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 168,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 169,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 170,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 171,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 172,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 173,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 174,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 175,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ &GUID_XAxis,
-        /* dwOfw =   */ 176,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTVELOCITY
-        }, {
-        /* pguid =   */ &GUID_YAxis,
-        /* dwOfw =   */ 180,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTVELOCITY
-        }, {
-        /* pguid =   */ &GUID_ZAxis,
-        /* dwOfw =   */ 184,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTVELOCITY
-        }, {
-        /* pguid =   */ &GUID_RxAxis,
-        /* dwOfw =   */ 188,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTVELOCITY
-        }, {
-        /* pguid =   */ &GUID_RyAxis,
-        /* dwOfw =   */ 192,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTVELOCITY
-        }, {
-        /* pguid =   */ &GUID_RzAxis,
-        /* dwOfw =   */ 196,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTVELOCITY
-        }, {
-        /* pguid =   */ &GUID_Slider,
-        /* dwOfw =   */ 24,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTVELOCITY
-        }, {
-        /* pguid =   */ &GUID_Slider,
-        /* dwOfw =   */ 28,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTVELOCITY
-        }, {
-        /* pguid =   */ &GUID_XAxis,
-        /* dwOfw =   */ 208,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTACCEL
-        }, {
-        /* pguid =   */ &GUID_YAxis,
-        /* dwOfw =   */ 212,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTACCEL
-        }, {
-        /* pguid =   */ &GUID_ZAxis,
-        /* dwOfw =   */ 216,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTACCEL
-        }, {
-        /* pguid =   */ &GUID_RxAxis,
-        /* dwOfw =   */ 220,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTACCEL
-        }, {
-        /* pguid =   */ &GUID_RyAxis,
-        /* dwOfw =   */ 224,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTACCEL
-        }, {
-        /* pguid =   */ &GUID_RzAxis,
-        /* dwOfw =   */ 228,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTACCEL
-        }, {
-        /* pguid =   */ &GUID_Slider,
-        /* dwOfw =   */ 24,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTACCEL
-        }, {
-        /* pguid =   */ &GUID_Slider,
-        /* dwOfw =   */ 28,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTACCEL
-        }, {
-        /* pguid =   */ &GUID_XAxis,
-        /* dwOfw =   */ 240,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTFORCE
-        }, {
-        /* pguid =   */ &GUID_YAxis,
-        /* dwOfw =   */ 244,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTFORCE
-        }, {
-        /* pguid =   */ &GUID_ZAxis,
-        /* dwOfw =   */ 248,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTFORCE
-        }, {
-        /* pguid =   */ &GUID_RxAxis,
-        /* dwOfw =   */ 252,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTFORCE
-        }, {
-        /* pguid =   */ &GUID_RyAxis,
-        /* dwOfw =   */ 256,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTFORCE
-        }, {
-        /* pguid =   */ &GUID_RzAxis,
-        /* dwOfw =   */ 260,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTFORCE
-        }, {
-        /* pguid =   */ &GUID_Slider,
-        /* dwOfw =   */ 24,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTFORCE
-        }, {
-        /* pguid =   */ &GUID_Slider,
-        /* dwOfw =   */ 28,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ DIDOI_ASPECTFORCE
-        }
-};
-
-static DIOBJECTDATAFORMAT diodfMouseData[] =
-{
-        {
-        /* pguid =   */ &GUID_XAxis,
-        /* dwOfw =   */ 0,
-        /* dwType =  */ DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ &GUID_YAxis,
-        /* dwOfw =   */ 4,
-        /* dwType =  */ DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ &GUID_ZAxis,
-        /* dwOfw =   */ 8,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_AXIS,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 12,
-        /* dwType =  */ DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 13,
-        /* dwType =  */ DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 14,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }, {
-        /* pguid =   */ NULL,
-        /* dwOfw =   */ 15,
-        /* dwType =  */ 0x80000000|DIDFT_ANYINSTANCE|DIDFT_BUTTON,
-        /* dwFlags = */ 0
-        }
-};
-
-/* --- Library global variables --- */
-
-const DIDATAFORMAT c_dfDIKeyboard =
-{
-        /* dwSize =     */ 24,
-        /* dwObjSize =  */ 16,
-        /* dwFlags =    */ DIDF_RELAXIS,
-        /* dwDataSize = */ 256,
-        /* dwNumObjs =  */ 256,
-        /* rgodf =      */ &diodfKeyData[0]
-};
-
-const DIDATAFORMAT c_dfDIJoystick =
-{
-        /* dwSize =     */ 24,
-        /* dwObjSize =  */ 16,
-        /* dwFlags =    */ DIDF_ABSAXIS,
-        /* dwDataSize = */ 80,
-        /* dwNumObjs =  */ 44,
-        /* rgodf =      */ &diodfJoyData[0]
-};
-
-const DIDATAFORMAT c_dfDIJoystick2 = {
-        /* dwSize =     */ 24,
-        /* dwObjSize =  */ 16,
-        /* dwFlags =    */ DIDF_ABSAXIS,
-        /* dwDataSize = */ 272,
-        /* dwNumObjs =  */ 164,
-        /* rgodf =      */ &diodfJoy2Data[0]
-};
-
-const DIDATAFORMAT c_dfDIMouse =
-{
-	/* dwSize =     */ 24,
-	/* dwObjSize =  */ 16,
-	/* dwFlags =    */ DIDF_RELAXIS,
-	/* dwDataSize = */ 16,
-	/* dwNumObjs =  */ 7,
-	/* rgodf =      */ &diodfMouseData[0]
-};
diff --git a/winsup/w32api/lib/dinput.def b/winsup/w32api/lib/dinput.def
deleted file mode 100644
index db8c2c187..000000000
--- a/winsup/w32api/lib/dinput.def
+++ /dev/null
@@ -1,6 +0,0 @@
-; from DirectX 6.1
-LIBRARY DINPUT.dll
-EXPORTS
-DirectInputCreateA@16
-DirectInputCreateW@16
-DirectInputCreateEx@20
diff --git a/winsup/w32api/lib/dlcapi.def b/winsup/w32api/lib/dlcapi.def
deleted file mode 100644
index 501ecd766..000000000
--- a/winsup/w32api/lib/dlcapi.def
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY DLCAPI.DLL
-EXPORTS
-AcsLan@8
-DlcCallDriver@24
-NtAcsLan@16
diff --git a/winsup/w32api/lib/dplayx.def b/winsup/w32api/lib/dplayx.def
deleted file mode 100644
index 0166ed161..000000000
--- a/winsup/w32api/lib/dplayx.def
+++ /dev/null
@@ -1,10 +0,0 @@
-; from DirectX 6.1
-LIBRARY DPLAYX.dll
-EXPORTS
-DirectPlayCreate@12
-DirectPlayEnumerate@8
-DirectPlayEnumerateA@8
-DirectPlayEnumerateW@8
-DirectPlayLobbyCreateA@20
-DirectPlayLobbyCreateW@20
-gdwDPlaySPRefCount
diff --git a/winsup/w32api/lib/dsetup.def b/winsup/w32api/lib/dsetup.def
deleted file mode 100644
index f5a6054a6..000000000
--- a/winsup/w32api/lib/dsetup.def
+++ /dev/null
@@ -1,18 +0,0 @@
-; from DirectX 6.1
-LIBRARY DSETUP.dll
-EXPORTS
-DirectXDeviceDriverSetupA@16
-DirectXDeviceDriverSetupW@16
-DirectXLoadString@12
-DirectXRegisterApplicationA@8
-DirectXRegisterApplicationW@8
-DirectXSetupA@12
-DirectXSetupCallback@20
-DirectXSetupGetFileVersion
-DirectXSetupGetVersion@8
-DirectXSetupIsEng@0
-DirectXSetupIsJapan@0
-DirectXSetupIsJapanNec@0
-DirectXSetupSetCallback@4
-DirectXSetupW@12
-DirectXUnRegisterApplication@8
diff --git a/winsup/w32api/lib/dsound.def b/winsup/w32api/lib/dsound.def
deleted file mode 100644
index 1e11cffe5..000000000
--- a/winsup/w32api/lib/dsound.def
+++ /dev/null
@@ -1,9 +0,0 @@
-; from DirectX 6.1
-LIBRARY DSOUND.dll
-EXPORTS
-DirectSoundCaptureCreate@12
-DirectSoundCaptureEnumerateA@8
-DirectSoundCaptureEnumerateW@8
-DirectSoundCreate@12
-DirectSoundEnumerateA@8
-DirectSoundEnumerateW@8
diff --git a/winsup/w32api/lib/dxguid.c b/winsup/w32api/lib/dxguid.c
deleted file mode 100644
index 940e7069b..000000000
--- a/winsup/w32api/lib/dxguid.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
-   DXGUID.C
-
-   Author: Daniel Guerrero Miralles (daguer@geocities.com)
-   Version: 1.0.0
-   Date: April 27, 1999
-
-   ABSTRACT:
-   Source code to generate a library with DirectX GUIDs. For DirectX 6.1
-   and earlier versions.
-
-   LEGAL INFORMATION:
-   This is PUBLIC DOMAIN source code. The source code in this file is
-   provided "as is", without any warranty, including but not limited to,
-   fitness for any particular purpose.
-
-   REMARKS:
-   - This file may have more GUIDs than the original one. It was made by
-   recollecting GUIDs defined in the DirectX header files.
-
-   TODO:
-   Nothing.
-*/
-
-#if defined(__LCC__) || defined(__GNUC__)
-#define INITGUID 1
-#include <windows.h>
-#else
-#include <basetyps.h>
-#endif 
-
-/////////////////////////////////////////////////////////////////////
-// File D3D.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(IID_IDirect3D,0x3BBA0080,0x2421,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
-DEFINE_GUID(IID_IDirect3D2,0x6aae1ec1,0x662a,0x11d0,0x88,0x9d,0x00,0xaa,0x00,0xbb,0xb7,0x6a);
-DEFINE_GUID(IID_IDirect3D3,0xbb223240,0xe72b,0x11d0,0xa9,0xb4,0x00,0xaa,0x00,0xc0,0x99,0x3e);
-DEFINE_GUID(IID_IDirect3DRampDevice,0xF2086B20,0x259F,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
-DEFINE_GUID(IID_IDirect3DRGBDevice,0xA4665C60,0x2673,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
-DEFINE_GUID(IID_IDirect3DHALDevice,0x84E63dE0,0x46AA,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
-DEFINE_GUID(IID_IDirect3DMMXDevice,0x881949a1,0xd6f3,0x11d0,0x89,0xab,0x00,0xa0,0xc9,0x05,0x41,0x29);
-DEFINE_GUID(IID_IDirect3DRefDevice,0x50936643,0x13e9,0x11d1,0x89,0xaa,0x0,0xa0,0xc9,0x5,0x41,0x29);
-DEFINE_GUID(IID_IDirect3DNullDevice,0x8767df22,0xbacc,0x11d1,0x89,0x69,0x0,0xa0,0xc9,0x6,0x29,0xa8);
-DEFINE_GUID(IID_IDirect3DDevice,0x64108800,0x957d,0X11d0,0x89,0xab,0x00,0xa0,0xc9,0x05,0x41,0x29);
-DEFINE_GUID(IID_IDirect3DDevice2,0x93281501,0x8cf8,0x11d0,0x89,0xab,0x0,0xa0,0xc9,0x5,0x41,0x29);
-DEFINE_GUID(IID_IDirect3DDevice3,0xb0ab3b60,0x33d7,0x11d1,0xa9,0x81,0x0,0xc0,0x4f,0xd7,0xb1,0x74);
-DEFINE_GUID(IID_IDirect3DTexture,0x2CDCD9E0,0x25A0,0x11CF,0xA3,0x1A,0x00,0xAA,0x00,0xB9,0x33,0x56);
-DEFINE_GUID(IID_IDirect3DTexture2,0x93281502,0x8cf8,0x11d0,0x89,0xab,0x0,0xa0,0xc9,0x5,0x41,0x29);
-DEFINE_GUID(IID_IDirect3DLight,0x4417C142,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
-DEFINE_GUID(IID_IDirect3DMaterial,0x4417C144,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
-DEFINE_GUID(IID_IDirect3DMaterial2,0x93281503,0x8cf8,0x11d0,0x89,0xab,0x0,0xa0,0xc9,0x5,0x41,0x29);
-DEFINE_GUID(IID_IDirect3DMaterial3,0xca9c46f4,0xd3c5,0x11d1,0xb7,0x5a,0x0,0x60,0x8,0x52,0xb3,0x12);
-DEFINE_GUID(IID_IDirect3DExecuteBuffer,0x4417C145,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
-DEFINE_GUID(IID_IDirect3DViewport,0x4417C146,0x33AD,0x11CF,0x81,0x6F,0x00,0x00,0xC0,0x20,0x15,0x6E);
-DEFINE_GUID(IID_IDirect3DViewport2,0x93281500,0x8cf8,0x11d0,0x89,0xab,0x0,0xa0,0xc9,0x5,0x41,0x29);
-DEFINE_GUID(IID_IDirect3DViewport3,0xb0ab3b61,0x33d7,0x11d1,0xa9,0x81,0x0,0xc0,0x4f,0xd7,0xb1,0x74);
-DEFINE_GUID(IID_IDirect3DVertexBuffer,0x7a503555,0x4a83,0x11d1,0xa5,0xdb,0x0,0xa0,0xc9,0x3,0x67,0xf8);
-
-/////////////////////////////////////////////////////////////////////
-// File D3DRM.H:
-/////////////////////////////////////////////////////////////////////
-
-
-DEFINE_GUID(IID_IDirect3DRM,0x2bc49361,0x8327,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRM2,0x4516ecc8,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirect3DRM3,0x4516ec83,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(CLSID_CDirect3DRM,0x4516ec41,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
-
-/////////////////////////////////////////////////////////////////////
-// File D3DRMOBJ.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(CLSID_CDirect3DRMDevice,0x4fa3568e,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMViewport,0x4fa3568f,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMFrame,0x4fa35690,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMMesh,0x4fa35691,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMMeshBuilder,0x4fa35692,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMFace,0x4fa35693,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMLight,0x4fa35694,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMTexture,0x4fa35695,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMWrap,0x4fa35696,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMMaterial,0x4fa35697,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMAnimation,0x4fa35698,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMAnimationSet,0x4fa35699,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMUserVisual,0x4fa3569a,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMShadow,0x4fa3569b,0x623f,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(CLSID_CDirect3DRMViewportInterpolator,0xde9eaa1,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(CLSID_CDirect3DRMFrameInterpolator,0xde9eaa2,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(CLSID_CDirect3DRMMeshInterpolator,0xde9eaa3,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(CLSID_CDirect3DRMLightInterpolator,0xde9eaa6,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(CLSID_CDirect3DRMMaterialInterpolator,0xde9eaa7,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(CLSID_CDirect3DRMTextureInterpolator,0xde9eaa8,0x3b84,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(CLSID_CDirect3DRMProgressiveMesh,0x4516ec40,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(CLSID_CDirect3DRMClippedVisual,0x5434e72d,0x6d66,0x11d1,0xbb,0xb,0x0,0x0,0xf8,0x75,0x86,0x5a);
-DEFINE_GUID(IID_IDirect3DRMObject,0xeb16cb00,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMObject2,0x4516ec7c,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirect3DRMDevice,0xe9e19280,0x6e05,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMDevice2,0x4516ec78,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirect3DRMDevice3,0x549f498b,0xbfeb,0x11d1,0x8e,0xd8,0x0,0xa0,0xc9,0x67,0xa4,0x82);
-DEFINE_GUID(IID_IDirect3DRMViewport,0xeb16cb02,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMViewport2,0x4a1b1be6,0xbfed,0x11d1,0x8e,0xd8,0x0,0xa0,0xc9,0x67,0xa4,0x82);
-DEFINE_GUID(IID_IDirect3DRMFrame,0xeb16cb03,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMFrame2,0xc3dfbd60,0x3988,0x11d0,0x9e,0xc2,0x0,0x0,0xc0,0x29,0x1a,0xc3);
-DEFINE_GUID(IID_IDirect3DRMFrame3,0xff6b7f70,0xa40e,0x11d1,0x91,0xf9,0x0,0x0,0xf8,0x75,0x8e,0x66);
-DEFINE_GUID(IID_IDirect3DRMVisual,0xeb16cb04,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMMesh,0xa3a80d01,0x6e12,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMMeshBuilder,0xa3a80d02,0x6e12,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMMeshBuilder2,0x4516ec77,0x8f20,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirect3DRMMeshBuilder3,0x4516ec82,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirect3DRMFace,0xeb16cb07,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMFace2,0x4516ec81,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirect3DRMLight,0xeb16cb08,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMTexture,0xeb16cb09,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMTexture2,0x120f30c0,0x1629,0x11d0,0x94,0x1c,0x0,0x80,0xc8,0xc,0xfa,0x7b);
-DEFINE_GUID(IID_IDirect3DRMTexture3,0xff6b7f73,0xa40e,0x11d1,0x91,0xf9,0x0,0x0,0xf8,0x75,0x8e,0x66);
-DEFINE_GUID(IID_IDirect3DRMWrap,0xeb16cb0a,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMMaterial,0xeb16cb0b,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMMaterial2,0xff6b7f75,0xa40e,0x11d1,0x91,0xf9,0x0,0x0,0xf8,0x75,0x8e,0x66);
-DEFINE_GUID(IID_IDirect3DRMAnimation,0xeb16cb0d,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMAnimation2,0xff6b7f77,0xa40e,0x11d1,0x91,0xf9,0x0,0x0,0xf8,0x75,0x8e,0x66);
-DEFINE_GUID(IID_IDirect3DRMAnimationSet,0xeb16cb0e,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMAnimationSet2,0xff6b7f79,0xa40e,0x11d1,0x91,0xf9,0x0,0x0,0xf8,0x75,0x8e,0x66);
-DEFINE_GUID(IID_IDirect3DRMObjectArray,0x242f6bc2,0x3849,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirect3DRMDeviceArray,0xeb16cb10,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMViewportArray,0xeb16cb11,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMFrameArray,0xeb16cb12,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMVisualArray,0xeb16cb13,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMLightArray,0xeb16cb14,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMPickedArray,0xeb16cb16,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMFaceArray,0xeb16cb17,0xd271,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMAnimationArray,0xd5f1cae0,0x4bd7,0x11d1,0xb9,0x74,0x0,0x60,0x8,0x3e,0x45,0xf3);
-DEFINE_GUID(IID_IDirect3DRMUserVisual,0x59163de0,0x6d43,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMShadow,0xaf359780,0x6ba3,0x11cf,0xac,0x4a,0x0,0x0,0xc0,0x38,0x25,0xa1);
-DEFINE_GUID(IID_IDirect3DRMShadow2,0x86b44e25,0x9c82,0x11d1,0xbb,0xb,0x0,0xa0,0xc9,0x81,0xa0,0xa6);
-DEFINE_GUID(IID_IDirect3DRMInterpolator,0x242f6bc1,0x3849,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirect3DRMProgressiveMesh,0x4516ec79,0x8f20,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirect3DRMPicked2Array,0x4516ec7b,0x8f20,0x11d0,0x9b,0x6d,0x0,0x0,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirect3DRMClippedVisual,0x5434e733,0x6d66,0x11d1,0xbb,0xb,0x0,0x0,0xf8,0x75,0x86,0x5a);
-
-/////////////////////////////////////////////////////////////////////
-// File D3DRMWIN.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(IID_IDirect3DRMWinDevice,0xc5016cc0,0xd273,0x11ce,0xac,0x48,0x0,0x0,0xc0,0x38,0x25,0xa1);
-
-/////////////////////////////////////////////////////////////////////
-// File DDRAW.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(CLSID_DirectDraw,0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35);
-DEFINE_GUID(CLSID_DirectDrawClipper,0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xb9,0x33,0x56);
-DEFINE_GUID(IID_IDirectDraw,0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-DEFINE_GUID(IID_IDirectDraw2,0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56);
-DEFINE_GUID(IID_IDirectDraw4,0x9c59509a,0x39bd,0x11d1,0x8c,0x4a,0x00,0xc0,0x4f,0xd9,0x30,0xc5);
-DEFINE_GUID(IID_IDirectDrawSurface,0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-DEFINE_GUID(IID_IDirectDrawSurface2,0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x23,0x03,0xc1,0x0e,0x27);
-DEFINE_GUID(IID_IDirectDrawSurface3,0xDA044E00,0x69B2,0x11D0,0xA1,0xD5,0x00,0xAA,0x00,0xB8,0xDF,0xBB);
-DEFINE_GUID(IID_IDirectDrawSurface4,0x0B2B8630,0xAD35,0x11D0,0x8E,0xA6,0x00,0x60,0x97,0x97,0xEA,0x5B);
-DEFINE_GUID(IID_IDirectDrawPalette,0x6C14DB84,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-DEFINE_GUID(IID_IDirectDrawClipper,0x6C14DB85,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-DEFINE_GUID(IID_IDirectDrawColorControl,0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
-DEFINE_GUID(IID_IDirectDrawGammaControl,0x69C11C3E,0xB46B,0x11D1,0xAD,0x7A,0x00,0xC0,0x4F,0xC2,0x9B,0x4E);
-
-/////////////////////////////////////////////////////////////////////
-// File DINPUT.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(CLSID_DirectInput,0x25E609E0,0xB259,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(CLSID_DirectInputDevice,0x25E609E1,0xB259,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInputA,0x89521360,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInputW,0x89521361,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInput2A,0x5944E662,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInput2W,0x5944E663,0xAA8A,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInputDeviceA,0x5944E680,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInputDeviceW,0x5944E681,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInputDevice2A,0x5944E682,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInputDevice2W,0x5944E683,0xC92E,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(IID_IDirectInputEffect,0xE7E1F7C0,0x88D2,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_XAxis,0xA36D02E0,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_YAxis,0xA36D02E1,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_ZAxis,0xA36D02E2,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_RxAxis,0xA36D02F4,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_RyAxis,0xA36D02F5,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_RzAxis,0xA36D02E3,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_Slider,0xA36D02E4,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_Button,0xA36D02F0,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_Key,0x55728220,0xD33C,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_POV,0xA36D02F2,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_Unknown,0xA36D02F3,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_SysMouse,0x6F1D2B60,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_SysKeyboard,0x6F1D2B61,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_Joystick,0x6F1D2B70,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_ConstantForce,0x13541C20,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_RampForce,0x13541C21,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_Square,0x13541C22,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_Sine,0x13541C23,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_Triangle,0x13541C24,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_SawtoothUp,0x13541C25,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_SawtoothDown,0x13541C26,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_Spring,0x13541C27,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_Damper,0x13541C28,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_Inertia,0x13541C29,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_Friction,0x13541C2A,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-DEFINE_GUID(GUID_CustomForce,0x13541C2B,0x8E33,0x11D0,0x9A,0xD0,0x00,0xA0,0xC9,0xA0,0x6E,0x35);
-
-/////////////////////////////////////////////////////////////////////
-// File DMKSCTRL.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(IID_IKsControl,0x28F54685,0x06FD,0x11D2,0xB2,0x7A,0x00,0xA0,0xC9,0x22,0x31,0x96);
-DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI,0x1D262760L,0xE957,0x11CF,0xA5,0xD6,0x28,0xDB,0x04,0xC1,0x00,0x00);
-DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DIRECTMUSIC,0x1a82f8bc,0x3f8b,0x11d2,0xb7,0x74,0x00,0x60,0x08,0x33,0x16,0xc1);
-
-/////////////////////////////////////////////////////////////////////
-// File DMUSICC.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(IID_IReferenceClock,0x56a86897,0x0ad4,0x11ce,0xb0,0x3a,0x00,0x20,0xaf,0x0b,0xa7,0x70);
-DEFINE_GUID(CLSID_DirectMusic,0x636b9f10,0x0c7d,0x11d1,0x95,0xb2,0x00,0x20,0xaf,0xdc,0x74,0x21);
-DEFINE_GUID(CLSID_DirectMusicCollection,0x480ff4b0,0x28b2,0x11d1,0xbe,0xf7,0x0,0xc0,0x4f,0xbf,0x8f,0xef);
-DEFINE_GUID(CLSID_DirectMusicSynth,0x58C2B4D0,0x46E7,0x11D1,0x89,0xAC,0x00,0xA0,0xC9,0x05,0x41,0x29);
-DEFINE_GUID(IID_IDirectMusic,0x6536115a,0x7b2d,0x11d2,0xba,0x18,0x00,0x00,0xf8,0x75,0xac,0x12);
-DEFINE_GUID(IID_IDirectMusicBuffer,0xd2ac2878,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicPort,0x08f2d8c9,0x37c2,0x11d2,0xb9,0xf9,0x00,0x00,0xf8,0x75,0xac,0x12);
-DEFINE_GUID(IID_IDirectMusicThru,0xced153e7,0x3606,0x11d2,0xb9,0xf9,0x00,0x00,0xf8,0x75,0xac,0x12);
-DEFINE_GUID(IID_IDirectMusicPortDownload,0xd2ac287a,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicDownload,0xd2ac287b,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicCollection,0xd2ac287c,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicInstrument,0xd2ac287d,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicDownloadedInstrument,0xd2ac287e,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_DMUS_PROP_GM_Hardware,0x178f2f24,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12);
-DEFINE_GUID(GUID_DMUS_PROP_GS_Hardware,0x178f2f25,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12);
-DEFINE_GUID(GUID_DMUS_PROP_XG_Hardware,0x178f2f26,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12);
-DEFINE_GUID(GUID_DMUS_PROP_XG_Capable,0x6496aba1,0x61b0,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
-DEFINE_GUID(GUID_DMUS_PROP_GS_Capable,0x6496aba2,0x61b0,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
-DEFINE_GUID(GUID_DMUS_PROP_DLS1,0x178f2f27,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12);
-DEFINE_GUID(GUID_DMUS_PROP_SynthSink_DSOUND,0xaa97844,0xc877,0x11d1,0x87,0xc,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_DMUS_PROP_SynthSink_WAVE,0xaa97845,0xc877,0x11d1,0x87,0xc,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_DMUS_PROP_WriteLatency,0x268a0fa0,0x60f2,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
-DEFINE_GUID(GUID_DMUS_PROP_WritePeriod,0x268a0fa1,0x60f2,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
-DEFINE_GUID(GUID_DMUS_PROP_MemorySize,0x178f2f28,0xc364,0x11d1,0xa7,0x60,0x00,0x00,0xf8,0x75,0xac,0x12);
-DEFINE_GUID(GUID_DMUS_PROP_WavesReverb,0x4cb5622,0x32e5,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
-DEFINE_GUID(GUID_DMUS_PROP_Effects,0xcda8d611,0x684a,0x11d2,0x87,0x1e,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_DMUS_PROP_LegacyCaps,0xcfa7cdc2,0x00a1,0x11d2,0xaa,0xd5,0x00,0x00,0xf8,0x75,0xac,0x12);
-DEFINE_GUID(GUID_DMUS_PROP_Volume,0xfedfae25L,0xe46e,0x11d1,0xaa,0xce,0x00,0x00,0xf8,0x75,0xac,0x12);
-
-/////////////////////////////////////////////////////////////////////
-// File DMUSICI.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(CLSID_DirectMusicPerformance,0xd2ac2881,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicSegment,0xd2ac2882,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicSegmentState,0xd2ac2883,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicGraph,0xd2ac2884,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicTempoTrack,0xd2ac2885,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicSeqTrack,0xd2ac2886,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicSysExTrack,0xd2ac2887,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicTimeSigTrack,0xd2ac2888,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicStyle,0xd2ac288a,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicChordTrack,0xd2ac288b,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicCommandTrack,0xd2ac288c,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicStyleTrack,0xd2ac288d,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicMotifTrack,0xd2ac288e,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicChordMap,0xd2ac288f,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicComposer,0xd2ac2890,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicSignPostTrack,0xf17e8672,0xc3b4,0x11d1,0x87,0xb,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicLoader,0xd2ac2892,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicBandTrack,0xd2ac2894,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicBand,0x79ba9e00,0xb6ee,0x11d1,0x86,0xbe,0x0,0xc0,0x4f,0xbf,0x8f,0xef);
-DEFINE_GUID(CLSID_DirectMusicChordMapTrack,0xd2ac2896,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(CLSID_DirectMusicMuteTrack,0xd2ac2898,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_DirectMusicAllTypes,0xd2ac2893,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_NOTIFICATION_SEGMENT,0xd2ac2899,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_NOTIFICATION_PERFORMANCE,0x81f75bc5,0x4e5d,0x11d2,0xbc,0xc7,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
-DEFINE_GUID(GUID_NOTIFICATION_MEASUREANDBEAT,0xd2ac289a,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_NOTIFICATION_CHORD,0xd2ac289b,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_NOTIFICATION_COMMAND,0xd2ac289c,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_CommandParam,0xd2ac289d,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_ChordParam,0xd2ac289e,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_RhythmParam,0xd2ac289f,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_IDirectMusicStyle,0xd2ac28a1,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_TimeSignature,0xd2ac28a4,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_TempoParam,0xd2ac28a5,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_IDirectMusicBand,0xd2ac28ac,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_IDirectMusicChordMap,0xd2ac28ad,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_MuteParam,0xd2ac28af,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_Download,0xd2ac28a7,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_Unload,0xd2ac28a8,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_ConnectToDLSCollection,0x1db1ae6b,0xe92e,0x11d1,0xa8,0xc5,0x0,0xc0,0x4f,0xa3,0x72,0x6e);
-DEFINE_GUID(GUID_Enable_Auto_Download,0xd2ac28a9,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_Disable_Auto_Download,0xd2ac28aa,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_Clear_All_Bands,0xd2ac28ab,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_StandardMIDIFile,0x6621075,0xe92e,0x11d1,0xa8,0xc5,0x0,0xc0,0x4f,0xa3,0x72,0x6e);
-DEFINE_GUID(GUID_DisableTimeSig,0x45fc707b,0x1db4,0x11d2,0xbc,0xac,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
-DEFINE_GUID(GUID_EnableTimeSig,0x45fc707c,0x1db4,0x11d2,0xbc,0xac,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
-DEFINE_GUID(GUID_DisableTempo,0x45fc707d,0x1db4,0x11d2,0xbc,0xac,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
-DEFINE_GUID(GUID_EnableTempo,0x45fc707e,0x1db4,0x11d2,0xbc,0xac,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
-DEFINE_GUID(GUID_PerfMasterTempo,0xd2ac28b0,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_PerfMasterVolume,0xd2ac28b1,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_PerfMasterGrooveLevel,0xd2ac28b2,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(GUID_PerfAutoDownload,0xfb09565b,0x3631,0x11d2,0xbc,0xb8,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
-DEFINE_GUID(GUID_DefaultGMCollection,0xf17e8673,0xc3b4,0x11d1,0x87,0xb,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicLoader,0x2ffaaca2,0x5dca,0x11d2,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
-DEFINE_GUID(IID_IDirectMusicGetLoader,0x68a04844,0xd13d,0x11d1,0xaf,0xa6,0x0,0xaa,0x0,0x24,0xd8,0xb6);
-DEFINE_GUID(IID_IDirectMusicObject,0xd2ac28b5,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicSegment,0xf96029a2,0x4282,0x11d2,0x87,0x17,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicSegmentState,0xa3afdcc7,0xd3ee,0x11d1,0xbc,0x8d,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
-DEFINE_GUID(IID_IDirectMusicTrack,0xf96029a1,0x4282,0x11d2,0x87,0x17,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicPerformance,0x7d43d03,0x6523,0x11d2,0x87,0x1d,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicTool,0xd2ac28ba,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicGraph,0x2befc277,0x5497,0x11d2,0xbc,0xcb,0x0,0xa0,0xc9,0x22,0xe6,0xeb);
-DEFINE_GUID(IID_IDirectMusicStyle,0xd2ac28bd,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicChordMap,0xd2ac28be,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicComposer,0xd2ac28bf,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-DEFINE_GUID(IID_IDirectMusicBand,0xd2ac28c0,0xb39b,0x11d1,0x87,0x4,0x0,0x60,0x8,0x93,0xb1,0xbd);
-
-/////////////////////////////////////////////////////////////////////
-// File DPLAY.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(IID_IDirectPlay2,0x2b74f7c0,0x9154,0x11cf,0xa9,0xcd,0x0,0xaa,0x0,0x68,0x86,0xe3);
-DEFINE_GUID(IID_IDirectPlay2A,0x9d460580,0xa822,0x11cf,0x96,0xc,0x0,0x80,0xc7,0x53,0x4e,0x82);
-DEFINE_GUID(IID_IDirectPlay3,0x133efe40,0x32dc,0x11d0,0x9c,0xfb,0x0,0xa0,0xc9,0xa,0x43,0xcb);
-DEFINE_GUID(IID_IDirectPlay3A,0x133efe41,0x32dc,0x11d0,0x9c,0xfb,0x0,0xa0,0xc9,0xa,0x43,0xcb);
-DEFINE_GUID(IID_IDirectPlay4,0xab1c530,0x4745,0x11d1,0xa7,0xa1,0x0,0x0,0xf8,0x3,0xab,0xfc);
-DEFINE_GUID(IID_IDirectPlay4A,0xab1c531,0x4745,0x11d1,0xa7,0xa1,0x0,0x0,0xf8,0x3,0xab,0xfc);
-DEFINE_GUID(CLSID_DirectPlay,0xd1eb6d20,0x8923,0x11d0,0x9d,0x97,0x0,0xa0,0xc9,0xa,0x43,0xcb);
-DEFINE_GUID(DPSPGUID_IPX,0x685bc400,0x9d2c,0x11cf,0xa9,0xcd,0x0,0xaa,0x0,0x68,0x86,0xe3);
-DEFINE_GUID(DPSPGUID_TCPIP,0x36E95EE0,0x8577,0x11cf,0x96,0xc,0x0,0x80,0xc7,0x53,0x4e,0x82);
-DEFINE_GUID(DPSPGUID_SERIAL,0xf1d6860,0x88d9,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(DPSPGUID_MODEM,0x44eaa760,0xcb68,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(IID_IDirectPlay,0x5454e9a0,0xdb65,0x11ce,0x92,0x1c,0x00,0xaa,0x00,0x6c,0x49,0x72);
-
-/////////////////////////////////////////////////////////////////////
-// File DPLOBBY.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(IID_IDirectPlayLobby,0xaf465c71,0x9588,0x11cf,0xa0,0x20,0x0,0xaa,0x0,0x61,0x57,0xac);
-DEFINE_GUID(IID_IDirectPlayLobbyA,0x26c66a70,0xb367,0x11cf,0xa0,0x24,0x0,0xaa,0x0,0x61,0x57,0xac);
-DEFINE_GUID(IID_IDirectPlayLobby2,0x194c220,0xa303,0x11d0,0x9c,0x4f,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(IID_IDirectPlayLobby2A,0x1bb4af80,0xa303,0x11d0,0x9c,0x4f,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(IID_IDirectPlayLobby3,0x2db72490,0x652c,0x11d1,0xa7,0xa8,0x0,0x0,0xf8,0x3,0xab,0xfc);
-DEFINE_GUID(IID_IDirectPlayLobby3A,0x2db72491,0x652c,0x11d1,0xa7,0xa8,0x0,0x0,0xf8,0x3,0xab,0xfc);
-DEFINE_GUID(CLSID_DirectPlayLobby,0x2fe8f810,0xb2a5,0x11d0,0xa7,0x87,0x0,0x0,0xf8,0x3,0xab,0xfc);
-DEFINE_GUID(DPLPROPERTY_MessagesSupported,0x762ccda1,0xd916,0x11d0,0xba,0x39,0x0,0xc0,0x4f,0xd7,0xed,0x67);
-DEFINE_GUID(DPLPROPERTY_LobbyGuid,0xf56920a0,0xd218,0x11d0,0xba,0x39,0x0,0xc0,0x4f,0xd7,0xed,0x67);
-DEFINE_GUID(DPLPROPERTY_PlayerGuid,0xb4319322,0xd20d,0x11d0,0xba,0x39,0x0,0xc0,0x4f,0xd7,0xed,0x67);
-DEFINE_GUID(DPLPROPERTY_PlayerScore,0x48784000,0xd219,0x11d0,0xba,0x39,0x0,0xc0,0x4f,0xd7,0xed,0x67);
-DEFINE_GUID(DPAID_TotalSize,0x1318f560,0x912c,0x11d0,0x9d,0xaa,0x0,0xa0,0xc9,0xa,0x43,0xcb);
-DEFINE_GUID(DPAID_ServiceProvider,0x7d916c0,0xe0af,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(DPAID_LobbyProvider,0x59b95640,0x9667,0x11d0,0xa7,0x7d,0x0,0x0,0xf8,0x3,0xab,0xfc);
-DEFINE_GUID(DPAID_Phone,0x78ec89a0,0xe0af,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(DPAID_PhoneW,0xba5a7a70,0x9dbf,0x11d0,0x9c,0xc1,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(DPAID_Modem,0xf6dcc200,0xa2fe,0x11d0,0x9c,0x4f,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(DPAID_ModemW,0x1fd92e0,0xa2ff,0x11d0,0x9c,0x4f,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(DPAID_INet,0xc4a54da0,0xe0af,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(DPAID_INetW,0xe63232a0,0x9dbf,0x11d0,0x9c,0xc1,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-DEFINE_GUID(DPAID_INetPort,0xe4524541,0x8ea5,0x11d1,0x8a,0x96,0x0,0x60,0x97,0xb0,0x14,0x11);
-DEFINE_GUID(DPAID_ComPort,0xf2f0ce00,0xe0af,0x11cf,0x9c,0x4e,0x0,0xa0,0xc9,0x5,0x42,0x5e);
-
-/////////////////////////////////////////////////////////////////////
-// File DSOUND.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(CLSID_DirectSound,0x47d4d946,0x62e8,0x11cf,0x93,0xbc,0x44,0x45,0x53,0x54,0x0,0x0);
-DEFINE_GUID(CLSID_DirectSoundCapture,0xb0210780,0x89cd,0x11d0,0xaf,0x8,0x0,0xa0,0xc9,0x25,0xcd,0x16);
-DEFINE_GUID(IID_IDirectSound,0x279AFA83,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-DEFINE_GUID(IID_IDirectSoundBuffer,0x279AFA85,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-DEFINE_GUID(IID_IDirectSound3DListener,0x279AFA84,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-DEFINE_GUID(IID_IDirectSound3DBuffer,0x279AFA86,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-DEFINE_GUID(IID_IDirectSoundCapture,0xb0210781,0x89cd,0x11d0,0xaf,0x8,0x0,0xa0,0xc9,0x25,0xcd,0x16);
-DEFINE_GUID(IID_IDirectSoundCaptureBuffer,0xb0210782,0x89cd,0x11d0,0xaf,0x8,0x0,0xa0,0xc9,0x25,0xcd,0x16);
-DEFINE_GUID(IID_IDirectSoundNotify,0xb0210783,0x89cd,0x11d0,0xaf,0x8,0x0,0xa0,0xc9,0x25,0xcd,0x16);
-DEFINE_GUID(IID_IKsPropertySet,0x31efac30,0x515c,0x11d0,0xa9,0xaa,0x00,0xaa,0x00,0x61,0xbe,0x93);
-
-/////////////////////////////////////////////////////////////////////
-// File DVP.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(IID_IDDVideoPortContainer,0x6C142760,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
-DEFINE_GUID(IID_IDirectDrawVideoPort,0xB36D93E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56);
-DEFINE_GUID(DDVPTYPE_E_HREFH_VREFH,0x54F39980L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
-DEFINE_GUID(DDVPTYPE_E_HREFH_VREFL,0x92783220L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
-DEFINE_GUID(DDVPTYPE_E_HREFL_VREFH,0xA07A02E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
-DEFINE_GUID(DDVPTYPE_E_HREFL_VREFL,0xE09C77E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
-DEFINE_GUID(DDVPTYPE_CCIR656,0xFCA326A0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
-DEFINE_GUID(DDVPTYPE_BROOKTREE,0x1352A560L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
-DEFINE_GUID(DDVPTYPE_PHILIPS,0x332CF160L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8);
-
-/////////////////////////////////////////////////////////////////////
-// File DXFILE.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(CLSID_CDirectXFile,0x4516ec43,0x8f20,0x11d0,0x9b,0x6d,0x00,0x00,0xc0,0x78,0x1b,0xc3);
-DEFINE_GUID(IID_IDirectXFile,0x3d82ab40,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(IID_IDirectXFileEnumObject,0x3d82ab41,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(IID_IDirectXFileSaveObject,0x3d82ab42,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(IID_IDirectXFileObject,0x3d82ab43,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(IID_IDirectXFileData,0x3d82ab44,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(IID_IDirectXFileDataReference,0x3d82ab45,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(IID_IDirectXFileBinary,0x3d82ab46,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_DXFILEHeader,0x3d82ab43,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-
-/////////////////////////////////////////////////////////////////////
-// File RMXFGUID.H:
-/////////////////////////////////////////////////////////////////////
-
-DEFINE_GUID(TID_D3DRMInfo,0x2b957100,0x9e9a,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMMesh,0x3d82ab44,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMVector,0x3d82ab5e,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMMeshFace,0x3d82ab5f,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMMaterial,0x3d82ab4d,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMMaterialArray,0x35ff44e1,0x6c7c,0x11cf,0x8F,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMFrame,0x3d82ab46,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMFrameTransformMatrix,0xf6f23f41,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMMeshMaterialList,0xf6f23f42,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMMeshTextureCoords,0xf6f23f40,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMMeshNormals,0xf6f23f43,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMCoords2d,0xf6f23f44,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMMatrix4x4,0xf6f23f45,0x7686,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMAnimation,0x3d82ab4f,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMAnimationSet,0x3d82ab50,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMAnimationKey,0x10dd46a8,0x775b,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
-DEFINE_GUID(TID_D3DRMFloatKeys,0x10dd46a9,0x775b,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
-DEFINE_GUID(TID_D3DRMMaterialAmbientColor,0x01411840,0x7786,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
-DEFINE_GUID(TID_D3DRMMaterialDiffuseColor,0x01411841,0x7786,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
-DEFINE_GUID(TID_D3DRMMaterialSpecularColor,0x01411842,0x7786,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
-DEFINE_GUID(TID_D3DRMMaterialEmissiveColor,0xd3e16e80,0x7835,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMMaterialPower,0x01411843,0x7786,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
-DEFINE_GUID(TID_D3DRMColorRGBA,0x35ff44e0,0x6c7c,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xA3);
-DEFINE_GUID(TID_D3DRMColorRGB,0xd3e16e81,0x7835,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMGuid,0xa42790e0,0x7810,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMTextureFilename,0xa42790e1,0x7810,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMTextureReference,0xa42790e2,0x7810,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMIndexedColor,0x1630b820,0x7842,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMMeshVertexColors,0x1630b821,0x7842,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMMaterialWrap,0x4885ae60,0x78e8,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMBoolean,0x537da6a0,0xca37,0x11d0,0x94,0x1c,0x0,0x80,0xc8,0xc,0xfa,0x7b);
-DEFINE_GUID(TID_D3DRMMeshFaceWraps,0xed1ec5c0,0xc0a8,0x11d0,0x94,0x1c,0x0,0x80,0xc8,0xc,0xfa,0x7b);
-DEFINE_GUID(TID_D3DRMBoolean2d,0x4885ae63,0x78e8,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMTimedFloatKeys,0xf406b180,0x7b3b,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMAnimationOptions,0xe2bf56c0,0x840f,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMFramePosition,0xe2bf56c1,0x840f,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMFrameVelocity,0xe2bf56c2,0x840f,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMFrameRotation,0xe2bf56c3,0x840f,0x11cf,0x8f,0x52,0x0,0x40,0x33,0x35,0x94,0xa3);
-DEFINE_GUID(TID_D3DRMLight,0x3d82ab4a,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMCamera,0x3d82ab51,0x62da,0x11cf,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMAppData,0xe5745280,0xb24f,0x11cf,0x9d,0xd5,0x0,0xaa,0x0,0xa7,0x1a,0x2f);
-DEFINE_GUID(TID_D3DRMLightUmbra,0xaed22740,0xb31f,0x11cf,0x9d,0xd5,0x0,0xaa,0x0,0xa7,0x1a,0x2f);
-DEFINE_GUID(TID_D3DRMLightRange,0xaed22742,0xb31f,0x11cf,0x9d,0xd5,0x0,0xaa,0x0,0xa7,0x1a,0x2f);
-DEFINE_GUID(TID_D3DRMLightPenumbra,0xaed22741,0xb31f,0x11cf,0x9d,0xd5,0x0,0xaa,0x0,0xa7,0x1a,0x2f);
-DEFINE_GUID(TID_D3DRMLightAttenuation,0xa8a98ba0,0xc5e5,0x11cf,0xb9,0x41,0x0,0x80,0xc8,0xc,0xfa,0x7b);
-DEFINE_GUID(TID_D3DRMInlineData,0x3a23eea0,0x94b1,0x11d0,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMUrl,0x3a23eea1,0x94b1,0x11d0,0xab,0x39,0x0,0x20,0xaf,0x71,0xe4,0x33);
-DEFINE_GUID(TID_D3DRMProgressiveMesh,0x8A63C360,0x997D,0x11d0,0x94,0x1C,0x0,0x80,0xC8,0x0C,0xFA,0x7B);
-DEFINE_GUID(TID_D3DRMExternalVisual,0x98116AA0,0xBDBA,0x11d1,0x82,0xC0,0x00,0xA0,0xC9,0x69,0x72,0x71);
-DEFINE_GUID(TID_D3DRMStringProperty,0x7f0f21e0,0xbfe1,0x11d1,0x82,0xc0,0x0,0xa0,0xc9,0x69,0x72,0x71);
-DEFINE_GUID(TID_D3DRMPropertyBag,0x7f0f21e1,0xbfe1,0x11d1,0x82,0xc0,0x0,0xa0,0xc9,0x69,0x72,0x71);
-DEFINE_GUID(TID_D3DRMRightHanded,0x7f5d5ea0,0xd53a,0x11d1,0x82,0xc0,0x0,0xa0,0xc9,0x69,0x72,0x71);
diff --git a/winsup/w32api/lib/faultrep.def b/winsup/w32api/lib/faultrep.def
deleted file mode 100644
index dbc72725f..000000000
--- a/winsup/w32api/lib/faultrep.def
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY faultrep.DLL
-EXPORTS
-AddERExcludedApplicationA@4
-AddERExcludedApplicationW@4
-ReportFault@8
diff --git a/winsup/w32api/lib/gdi32.def b/winsup/w32api/lib/gdi32.def
deleted file mode 100644
index 927664c95..000000000
--- a/winsup/w32api/lib/gdi32.def
+++ /dev/null
@@ -1,342 +0,0 @@
-LIBRARY GDI32.dll
-EXPORTS
-AbortDoc@4
-AbortPath@4
-AddFontMemResourceEx@16
-AddFontResourceA@4
-AddFontResourceW@4
-AddFontResourceExA@12
-AddFontResourceExW@12
-AngleArc@24
-AnimatePalette@16
-Arc@36
-ArcTo@36
-BeginPath@4
-BitBlt@36
-CancelDC@4
-CheckColorsInGamut@16
-ChoosePixelFormat@8
-Chord@36
-CloseEnhMetaFile@4
-CloseFigure@4
-CloseMetaFile@4
-ColorMatchToTarget@12
-CombineRgn@16
-CombineTransform@12
-CopyEnhMetaFileA@8
-CopyEnhMetaFileW@8
-CopyMetaFileA@8
-CopyMetaFileW@8
-CreateBitmap@20
-CreateBitmapIndirect@4
-CreateBrushIndirect@4
-CreateColorSpaceA@4
-CreateColorSpaceW@4
-CreateCompatibleBitmap@12
-CreateCompatibleDC@4
-CreateDCA@16
-CreateDCW@16
-CreateDIBPatternBrush@8
-CreateDIBPatternBrushPt@8
-CreateDIBSection@24
-CreateDIBitmap@24
-CreateDiscardableBitmap@12
-CreateEllipticRgn@16
-CreateEllipticRgnIndirect@4
-CreateEnhMetaFileA@16
-CreateEnhMetaFileW@16
-CreateFontA@56
-CreateFontIndirectA@4
-CreateFontIndirectW@4
-CreateFontW@56
-CreateHalftonePalette@4
-CreateHatchBrush@8
-CreateICA@16
-CreateICW@16
-CreateMetaFileA@4
-CreateMetaFileW@4
-CreatePalette@4
-CreatePatternBrush@4
-CreatePen@12
-CreatePenIndirect@4
-CreatePolyPolygonRgn@16
-CreatePolygonRgn@12
-CreateRectRgn@16
-CreateRectRgnIndirect@4
-CreateRoundRectRgn@24
-CreateScalableFontResourceA@16
-CreateScalableFontResourceW@16
-CreateSolidBrush@4
-DPtoLP@12
-DeleteColorSpace@4
-DeleteDC@4
-DeleteEnhMetaFile@4
-DeleteMetaFile@4
-DeleteObject@4
-DescribePixelFormat@16
-DeviceCapabilitiesEx@24
-DeviceCapabilitiesExA@24
-DeviceCapabilitiesExW@24
-DrawEscape@16
-Ellipse@20
-EndDoc@4
-EndPage@4
-EndPath@4
-EnumEnhMetaFile@20
-EnumFontFamiliesA@16
-EnumFontFamiliesExA@20
-EnumFontFamiliesExW@20
-EnumFontFamiliesW@16
-EnumFontsA@16
-EnumFontsW@16
-EnumICMProfilesA@12
-EnumICMProfilesW@12
-EnumMetaFile@16
-EnumObjects@16
-EqualRgn@8
-Escape@20
-ExcludeClipRect@20
-ExtCreatePen@20
-ExtCreateRegion@12
-ExtEscape@24
-ExtFloodFill@20
-ExtSelectClipRgn@12
-ExtTextOutA@32
-ExtTextOutW@32
-FillPath@4
-FillRgn@12
-FixBrushOrgEx@16
-FlattenPath@4
-FloodFill@16
-FrameRgn@20
-GdiComment@12
-GdiFlush@0
-GdiGetBatchLimit@0
-GdiPlayDCScript@24
-GdiPlayJournal@20
-GdiPlayScript@28
-GdiSetBatchLimit@4
-GetArcDirection@4
-GetAspectRatioFilterEx@8
-GetBitmapBits@12
-GetBitmapDimensionEx@8
-GetBkColor@4
-GetBkMode@4
-GetBoundsRect@12
-GetBrushOrgEx@8
-GetCharABCWidthsA@16
-GetCharABCWidthsFloatA@16
-GetCharABCWidthsFloatW@16
-GetCharABCWidthsW@16
-GetCharWidth32A@16
-GetCharWidth32W@16
-GetCharWidthA@16
-GetCharWidthFloatA@16
-GetCharWidthFloatW@16
-GetCharWidthW@16
-GetCharacterPlacementA@24
-GetCharacterPlacementW@24
-GetClipBox@8
-GetClipRgn@8
-GetColorAdjustment@8
-GetColorSpace@4
-GetCurrentObject@8
-GetCurrentPositionEx@8
-GetDCOrgEx@8
-GetDIBColorTable@16
-GetDIBits@28
-GetDeviceCaps@8
-GetDeviceGammaRamp@8
-GetEnhMetaFileA@4
-GetEnhMetaFileBits@12
-GetEnhMetaFileDescriptionA@12
-GetEnhMetaFileDescriptionW@12
-GetEnhMetaFileHeader@12
-GetEnhMetaFilePaletteEntries@12
-GetEnhMetaFilePixelFormat@12
-GetEnhMetaFileW@4
-GetFontData@20
-GetFontLanguageInfo@4
-GetFontResourceInfo@16
-GetFontResourceInfoW@16
-GetGlyphOutline@28
-GetGlyphOutlineA@28
-GetGlyphOutlineW@28
-GetGlyphOutlineWow@28
-GetGraphicsMode@4
-GetICMProfileA@12
-GetICMProfileW@12
-GetKerningPairs@12
-GetKerningPairsA@12
-GetKerningPairsW@12
-GetLogColorSpaceA@12
-GetLogColorSpaceW@12
-GetMapMode@4
-GetMetaFileA@4
-GetMetaFileBitsEx@12
-GetMetaFileW@4
-GetMetaRgn@8
-GetMiterLimit@8
-GetNearestColor@8
-GetNearestPaletteIndex@8
-GetObjectA@12
-GetObjectType@4
-GetObjectW@12
-GetOutlineTextMetricsA@12
-GetOutlineTextMetricsW@12
-GetPaletteEntries@16
-GetPath@16
-GetPixel@12
-GetPixelFormat@4
-GetPolyFillMode@4
-GetROP2@4
-GetRandomRgn@12
-GetRasterizerCaps@8
-GetRegionData@12
-GetRelAbs@8
-GetRgnBox@8
-GetStockObject@4
-GetStretchBltMode@4
-GetSystemPaletteEntries@16
-GetSystemPaletteUse@4
-GetTextAlign@4
-GetTextCharacterExtra@4
-GetTextCharset@4
-GetTextCharsetInfo@12
-GetTextColor@4
-GetTextExtentExPointA@28
-GetTextExtentExPointW@28
-GetTextExtentPoint32A@16
-GetTextExtentPoint32W@16
-GetTextExtentPointA@16
-GetTextExtentPointW@16
-GetTextFaceA@12
-GetTextFaceW@12
-GetTextMetricsA@8
-GetTextMetricsW@8
-GetViewportExtEx@8
-GetViewportOrgEx@8
-GetWinMetaFileBits@20
-GetWindowExtEx@8
-GetWindowOrgEx@8
-GetWorldTransform@8
-IntersectClipRect@20
-InvertRgn@8
-LPtoDP@12
-LineDDA@24
-LineTo@12
-MaskBlt@48
-ModifyWorldTransform@12
-MoveToEx@16
-OffsetClipRgn@12
-OffsetRgn@12
-OffsetViewportOrgEx@16
-OffsetWindowOrgEx@16
-PaintRgn@8
-PatBlt@24
-PathToRegion@4
-Pie@36
-PlayEnhMetaFile@12
-PlayEnhMetaFileRecord@16
-PlayMetaFile@8
-PlayMetaFileRecord@16
-PlgBlt@40
-PolyBezier@12
-PolyBezierTo@12
-PolyDraw@16
-PolyPolygon@16
-PolyPolyline@16
-PolyTextOutA@12
-PolyTextOutW@12
-Polygon@12
-Polyline@12
-PolylineTo@12
-PtInRegion@12
-PtVisible@12
-RealizePalette@4
-RectInRegion@8
-RectVisible@8
-Rectangle@20
-RemoveFontMemResourceEx@4
-RemoveFontResourceA@4
-RemoveFontResourceW@4
-RemoveFontResourceExA@12
-RemoveFontResourceExW@12
-ResetDCA@8
-ResetDCW@8
-ResizePalette@8
-RestoreDC@8
-RoundRect@28
-SaveDC@4
-ScaleViewportExtEx@24
-ScaleWindowExtEx@24
-SelectBrushLocal@8
-SelectClipPath@8
-SelectClipRgn@8
-SelectFontLocal@8
-SelectObject@8
-SelectPalette@12
-SetAbortProc@8
-SetArcDirection@8
-SetBitmapBits@12
-SetBitmapDimensionEx@16
-SetBkColor@8
-SetBkMode@8
-SetBoundsRect@12
-SetBrushOrgEx@16
-SetColorAdjustment@8
-SetColorSpace@8
-SetDCBrushColor@8
-SetDCPenColor@8
-SetDIBColorTable@16
-SetDIBits@28
-SetDIBitsToDevice@48
-SetDeviceGammaRamp@8
-SetEnhMetaFileBits@8
-SetFontEnumeration@4
-SetGraphicsMode@8
-SetICMMode@8
-SetICMProfileA@8
-SetICMProfileW@8
-SetMapMode@8
-SetMapperFlags@8
-SetMetaFileBitsEx@8
-SetMetaRgn@4
-SetMiterLimit@12
-SetPaletteEntries@16
-SetPixel@16
-SetPixelFormat@12
-SetPixelV@16
-SetPolyFillMode@8
-SetROP2@8
-SetRectRgn@20
-SetRelAbs@8
-SetStretchBltMode@8
-SetSystemPaletteUse@8
-SetTextAlign@8
-SetTextCharacterExtra@8
-SetTextColor@8
-SetTextJustification@12
-SetViewportExtEx@16
-SetViewportOrgEx@16
-SetWinMetaFileBits@16
-SetWindowExtEx@16
-SetWindowOrgEx@16
-SetWorldTransform@8
-StartDocA@8
-StartDocW@8
-StartPage@4
-StretchBlt@44
-StretchDIBits@52
-StrokeAndFillPath@4
-StrokePath@4
-SwapBuffers@4
-TextOutA@20
-TextOutW@20
-TranslateCharsetInfo@12
-UnrealizeObject@4
-UpdateColors@4
-UpdateICMRegKeyA@16
-UpdateICMRegKeyW@16
-WidenPath@4
-gdiPlaySpoolStream@24
diff --git a/winsup/w32api/lib/glaux.def b/winsup/w32api/lib/glaux.def
deleted file mode 100644
index 87f72371e..000000000
--- a/winsup/w32api/lib/glaux.def
+++ /dev/null
@@ -1,173 +0,0 @@
-LIBRARY GLAUX.DLL
-EXPORTS
-AllocateMemory@4
-AllocateZeroedMemory@4
-CleanUp@0
-ComponentFromIndex@12
-CreateCIPalette@4
-CreateRGBPalette@4
-DelayPaletteRealization@0
-DestroyThisWindow@4
-FillRgbPaletteEntries@12
-FindBestPixelFormat@12
-FindExactPixelFormat@12
-FindPixelFormat@8
-FlushPalette@8
-ForceRedraw@4
-FreeMemory@4
-GetRegistrySysColors@8
-GrabStaticEntries@4
-IsPixelFormatValid@12
-PixelFormatDescriptorFromDc@8
-PrintMessage
-RealizePaletteNow@12
-ReleaseStaticEntries@4
-UpdateStaticMapping@4
-tkCloseWindow@0
-tkDisplayFunc@4
-tkErrorPopups@4
-tkExec@0
-tkExposeFunc@4
-tkGetColorMapSize@0
-tkGetDisplayMode@0
-tkGetDisplayModeID@0
-tkGetDisplayModePolicy@0
-tkGetHDC@0
-tkGetHRC@0
-tkGetHWND@0
-tkGetMouseLoc@8
-tkIdleFunc@4
-tkInitDisplayMode@4
-tkInitDisplayModeID@4
-tkInitDisplayModePolicy@4
-tkInitPosition@16
-tkInitWindow@4
-tkInitWindowAW@8
-tkKeyDownFunc@4
-tkMouseDownFunc@4
-tkMouseMoveFunc@4
-tkMouseUpFunc@4
-tkQuit@0
-tkReshapeFunc@4
-tkSetFogRamp@8
-tkSetGreyRamp@0
-tkSetOneColor@16
-tkSetRGBMap@8
-tkSwapBuffers@0
-tkWndProc@16
-RawImageClose@4
-RawImageGetData@8
-RawImageGetRow@16
-RawImageOpenAW@8
-tkRGBImageLoad@4
-tkRGBImageLoadAW@8
-tkCreateBitmapFont@4
-tkCreateFilledFont@4
-tkCreateOutlineFont@4
-tkCreateStrokeFont@4
-tkDrawStr@8
-DibNumColors@4
-tkDIBImageLoad@4
-tkDIBImageLoadAW@8
-m_popmatrix@0
-m_pushmatrix@0
-m_scale@24
-m_translate@24
-m_xformpt@16
-m_xformptonly@8
-add3@12
-copy3@8
-copymat3@8
-crossprod@12
-diff3@12
-dist3@8
-dot3@8
-error@4
-identifymat3@4
-length3@4
-normalize@4
-perpnorm@16
-samepoint@8
-scalarmult@16
-seterrorfunc@4
-xformvec3@12
-auxSolidTeapot@8
-auxWireTeapot@8
-solidTeapot@12
-wireTeapot@12
-auxSolidBox@24
-auxSolidCone@16
-auxSolidCube@8
-auxSolidCylinder@16
-auxSolidDodecahedron@8
-auxSolidIcosahedron@8
-auxSolidOctahedron@8
-auxSolidSphere@8
-auxSolidTetrahedron@8
-auxSolidTorus@16
-auxWireBox@24
-auxWireCone@16
-auxWireCube@8
-auxWireCylinder@16
-auxWireDodecahedron@8
-auxWireIcosahedron@8
-auxWireOctahedron@8
-auxWireSphere@8
-auxWireTetrahedron@8
-auxWireTorus@16
-compareParams@12
-dodecahedron@16
-doughnut@28
-drawbox@52
-drawtriangle@32
-findList@12
-icosahedron@16
-initdodec@0
-makeModelPtr@12
-octahedron@16
-pentagon@24
-recorditem@32
-subdivide@36
-tetrahedron@16
-auxDIBImageLoadA@4
-auxDIBImageLoadW@4
-auxRGBImageLoadA@4
-auxRGBImageLoadW@4
-auxCreateFont@0
-auxDrawStrA@4
-auxDrawStrAW@8
-auxDrawStrW@4
-DefaultHandleExpose@8
-DefaultHandleReshape@8
-KeyDown@8
-MouseDown@12
-MouseLoc@12
-MouseUp@12
-auxCloseWindow@0
-auxExposeFunc@4
-auxGetColorMapSize@0
-auxGetDisplayMode@0
-auxGetDisplayModeID@0
-auxGetDisplayModePolicy@0
-auxGetHDC@0
-auxGetHGLRC@0
-auxGetHWND@0
-auxGetMouseLoc@8
-auxIdleFunc@4
-auxInitDisplayMode@4
-auxInitDisplayModeID@4
-auxInitDisplayModePolicy@4
-auxInitPosition@16
-auxInitWindowA@4
-auxInitWindowAW@8
-auxInitWindowW@4
-auxKeyFunc@8
-auxMainLoop@4
-auxMouseFunc@12
-auxQuit@0
-auxReshapeFunc@4
-auxSetFogRamp@8
-auxSetGreyRamp@0
-auxSetOneColor@16
-auxSetRGBMap@8
-auxSwapBuffers@0
diff --git a/winsup/w32api/lib/glu32.def b/winsup/w32api/lib/glu32.def
deleted file mode 100644
index d0f091fd1..000000000
--- a/winsup/w32api/lib/glu32.def
+++ /dev/null
@@ -1,54 +0,0 @@
-LIBRARY GLU32.DLL
-EXPORTS
-gluBeginCurve@4
-gluBeginPolygon@4
-gluBeginSurface@4
-gluBeginTrim@4
-gluBuild1DMipmaps@24
-gluBuild2DMipmaps@28
-gluCylinder@36
-gluDeleteNurbsRenderer@4
-gluDeleteQuadric@4
-gluDeleteTess@4
-gluDisk@28
-gluEndCurve@4
-gluEndPolygon@4
-gluEndSurface@4
-gluEndTrim@4
-gluErrorString@4
-gluErrorUnicodeStringEXT@4
-gluGetNurbsProperty@12
-gluGetString@4
-gluGetTessProperty@12
-gluLoadSamplingMatrices@16
-gluLookAt@72
-gluNewNurbsRenderer@0
-gluNewQuadric@0
-gluNewTess@0
-gluNextContour@8
-gluNurbsCallback@12
-gluNurbsCurve@28
-gluNurbsProperty@12
-gluNurbsSurface@44
-gluOrtho2D@32
-gluPartialDisk@44
-gluPerspective@32
-gluPickMatrix@36
-gluProject@48
-gluPwlCurve@20
-gluQuadricCallback@12
-gluQuadricDrawStyle@8
-gluQuadricNormals@8
-gluQuadricOrientation@8
-gluQuadricTexture@8
-gluScaleImage@36
-gluSphere@20
-gluTessBeginContour@4
-gluTessBeginPolygon@8
-gluTessCallback@12
-gluTessEndContour@4
-gluTessEndPolygon@4
-gluTessNormal@28
-gluTessProperty@16
-gluTessVertex@12
-gluUnProject@48
diff --git a/winsup/w32api/lib/glut.def b/winsup/w32api/lib/glut.def
deleted file mode 100644
index 369ca5d14..000000000
--- a/winsup/w32api/lib/glut.def
+++ /dev/null
@@ -1,116 +0,0 @@
-LIBRARY glut.dll
-EXPORTS
-glutAddMenuEntry@8
-glutAddSubMenu@8
-glutAttachMenu@4
-glutBitmapCharacter@8
-glutBitmapLength@8
-glutBitmapWidth@8
-glutButtonBoxFunc@4
-glutChangeToMenuEntry@12
-glutChangeToSubMenu@12
-glutCopyColormap@4
-glutCreateMenu@4
-glutCreateSubWindow@20
-glutCreateWindow@4
-glutDestroyMenu@4
-glutDestroyWindow@4
-glutDetachMenu@4
-glutDeviceGet@4
-glutDialsFunc@4
-glutDisplayFunc@4
-glutEnterGameMode@0
-glutEntryFunc@4
-glutEstablishOverlay@0
-glutExtensionSupported@4
-glutForceJoystickFunc@0
-glutFullScreen@0
-glutGameModeGet@4
-glutGameModeString@4
-glutGet@4
-glutGetColor@8
-glutGetMenu@0
-glutGetModifiers@0
-glutGetWindow@0
-glutHideOverlay@0
-glutHideWindow@0
-glutIconifyWindow@0
-glutIdleFunc@4
-glutIgnoreKeyRepeat@4
-glutInit@8
-glutInitDisplayMode@4
-glutInitDisplayString@4
-glutInitWindowPosition@8
-glutInitWindowSize@8
-glutJoystickFunc@8
-glutKeyboardFunc@4
-glutKeyboardUpFunc@4
-glutLayerGet@4
-glutLeaveGameMode@0
-glutMainLoop@0
-glutMenuStateFunc@4
-glutMenuStatusFunc@4
-glutMotionFunc@4
-glutMouseFunc@4
-glutOverlayDisplayFunc@4
-glutPassiveMotionFunc@4
-glutPopWindow@0
-glutPositionWindow@8
-glutPostOverlayRedisplay@0
-glutPostRedisplay@0
-glutPostWindowOverlayRedisplay@4
-glutPostWindowRedisplay@4
-glutPushWindow@0
-glutRemoveMenuItem@4
-glutRemoveOverlay@0
-glutReportErrors@0
-glutReshapeFunc@4
-glutReshapeWindow@8
-glutSetColor@16
-glutSetCursor@4
-glutSetIconTitle@4
-glutSetKeyRepeat@4
-glutSetMenu@4
-glutSetWindow@4
-glutSetWindowTitle@4
-glutSetupVideoResizing@0
-glutShowOverlay@0
-glutShowWindow@0
-glutSolidCone@24
-glutSolidCube@8
-glutSolidDodecahedron@0
-glutSolidIcosahedron@0
-glutSolidOctahedron@0
-glutSolidSphere@16
-glutSolidTeapot@8
-glutSolidTetrahedron@0
-glutSolidTorus@24
-glutSpaceballButtonFunc@4
-glutSpaceballMotionFunc@4
-glutSpaceballRotateFunc@4
-glutSpecialFunc@4
-glutSpecialUpFunc@4
-glutStopVideoResizing@0
-glutStrokeCharacter@8
-glutStrokeLength@8
-glutStrokeWidth@8
-glutSwapBuffers@0
-glutTabletButtonFunc@4
-glutTabletMotionFunc@4
-glutTimerFunc@12
-glutUseLayer@4
-glutVideoPan@16
-glutVideoResize@16
-glutVideoResizeGet@4
-glutVisibilityFunc@4
-glutWarpPointer@8
-glutWindowStatusFunc@4
-glutWireCone@24
-glutWireCube@8
-glutWireDodecahedron@0
-glutWireIcosahedron@0
-glutWireOctahedron@0
-glutWireSphere@16
-glutWireTeapot@8
-glutWireTetrahedron@0
-glutWireTorus@24
diff --git a/winsup/w32api/lib/glut32.def b/winsup/w32api/lib/glut32.def
deleted file mode 100644
index 427e32bc3..000000000
--- a/winsup/w32api/lib/glut32.def
+++ /dev/null
@@ -1,116 +0,0 @@
-LIBRARY glut32.dll
-EXPORTS
-glutAddMenuEntry@8
-glutAddSubMenu@8
-glutAttachMenu@4
-glutBitmapCharacter@8
-glutBitmapLength@8
-glutBitmapWidth@8
-glutButtonBoxFunc@4
-glutChangeToMenuEntry@12
-glutChangeToSubMenu@12
-glutCopyColormap@4
-glutCreateMenu@4
-glutCreateSubWindow@20
-glutCreateWindow@4
-glutDestroyMenu@4
-glutDestroyWindow@4
-glutDetachMenu@4
-glutDeviceGet@4
-glutDialsFunc@4
-glutDisplayFunc@4
-glutEnterGameMode@0
-glutEntryFunc@4
-glutEstablishOverlay@0
-glutExtensionSupported@4
-glutForceJoystickFunc@0
-glutFullScreen@0
-glutGameModeGet@4
-glutGameModeString@4
-glutGet@4
-glutGetColor@8
-glutGetMenu@0
-glutGetModifiers@0
-glutGetWindow@0
-glutHideOverlay@0
-glutHideWindow@0
-glutIconifyWindow@0
-glutIdleFunc@4
-glutIgnoreKeyRepeat@4
-glutInit@8
-glutInitDisplayMode@4
-glutInitDisplayString@4
-glutInitWindowPosition@8
-glutInitWindowSize@8
-glutJoystickFunc@8
-glutKeyboardFunc@4
-glutKeyboardUpFunc@4
-glutLayerGet@4
-glutLeaveGameMode@0
-glutMainLoop@0
-glutMenuStateFunc@4
-glutMenuStatusFunc@4
-glutMotionFunc@4
-glutMouseFunc@4
-glutOverlayDisplayFunc@4
-glutPassiveMotionFunc@4
-glutPopWindow@0
-glutPositionWindow@8
-glutPostOverlayRedisplay@0
-glutPostRedisplay@0
-glutPostWindowOverlayRedisplay@4
-glutPostWindowRedisplay@4
-glutPushWindow@0
-glutRemoveMenuItem@4
-glutRemoveOverlay@0
-glutReportErrors@0
-glutReshapeFunc@4
-glutReshapeWindow@8
-glutSetColor@16
-glutSetCursor@4
-glutSetIconTitle@4
-glutSetKeyRepeat@4
-glutSetMenu@4
-glutSetWindow@4
-glutSetWindowTitle@4
-glutSetupVideoResizing@0
-glutShowOverlay@0
-glutShowWindow@0
-glutSolidCone@24
-glutSolidCube@8
-glutSolidDodecahedron@0
-glutSolidIcosahedron@0
-glutSolidOctahedron@0
-glutSolidSphere@16
-glutSolidTeapot@8
-glutSolidTetrahedron@0
-glutSolidTorus@24
-glutSpaceballButtonFunc@4
-glutSpaceballMotionFunc@4
-glutSpaceballRotateFunc@4
-glutSpecialFunc@4
-glutSpecialUpFunc@4
-glutStopVideoResizing@0
-glutStrokeCharacter@8
-glutStrokeLength@8
-glutStrokeWidth@8
-glutSwapBuffers@0
-glutTabletButtonFunc@4
-glutTabletMotionFunc@4
-glutTimerFunc@12
-glutUseLayer@4
-glutVideoPan@16
-glutVideoResize@16
-glutVideoResizeGet@4
-glutVisibilityFunc@4
-glutWarpPointer@8
-glutWindowStatusFunc@4
-glutWireCone@24
-glutWireCube@8
-glutWireDodecahedron@0
-glutWireIcosahedron@0
-glutWireOctahedron@0
-glutWireSphere@16
-glutWireTeapot@8
-glutWireTetrahedron@0
-glutWireTorus@24
diff --git a/winsup/w32api/lib/igmpagnt.def b/winsup/w32api/lib/igmpagnt.def
deleted file mode 100644
index 803ee3503..000000000
--- a/winsup/w32api/lib/igmpagnt.def
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY igmpagnt.dll
-EXPORTS
-SnmpExtensionClose@0
-SnmpExtensionInit@12
-SnmpExtensionQuery@16
-SnmpExtensionTrap@20
diff --git a/winsup/w32api/lib/imagehlp.def b/winsup/w32api/lib/imagehlp.def
deleted file mode 100644
index 411a360bd..000000000
--- a/winsup/w32api/lib/imagehlp.def
+++ /dev/null
@@ -1,114 +0,0 @@
-LIBRARY IMAGEHLP.DLL
-EXPORTS
-BindImage@12
-BindImageEx@20
-CheckSumMappedFile@16
-CopyPdb@12
-EnumerateLoadedModules32@12
-EnumerateLoadedModules64@12
-EnumerateLoadedModules@12
-FindDebugInfoFile@12
-FindDebugInfoFileEx@20
-FindExecutableImage@12
-GetImageConfigInformation@8
-GetImageUnusedHeaderBytes@8
-GetTimestampForLoadedLibrary@4
-ImageAddCertificate@12
-ImageDirectoryEntryToData@16
-ImageDirectoryEntryToDataEx@20
-ImageEnumerateCertificates@20
-ImageGetCertificateData@16
-ImageGetCertificateHeader@12
-ImageGetDigestStream@16
-ImageLoad@8
-ImageNtHeader@4
-ImageRemoveCertificate@8
-ImageRvaToSection@12
-ImageRvaToVa@16
-ImageUnload@4
-ImagehlpApiVersion@0
-ImagehlpApiVersionEx@4
-MakeSureDirectoryPathExists@4
-MapAndLoad@20
-MapDebugInformation32@16
-MapDebugInformation64@20
-MapDebugInformation@16
-MapFileAndCheckSumA@12
-MapFileAndCheckSumW@12
-MarkImageAsRunFromSwap@8
-ReBaseImage@44
-RemovePrivateCvSymbolic@12
-RemovePrivateCvSymbolicEx@16
-RemoveRelocations@4
-SearchTreeForFile@12
-SetImageConfigInformation@8
-SplitSymbols@16
-StackWalk32@36
-StackWalk64@36
-StackWalk@36
-SymCleanup@4
-SymEnumerateModules32@12
-SymEnumerateModules64@12
-SymEnumerateModules@12
-SymEnumerateSymbols32@16
-SymEnumerateSymbols64@20
-SymEnumerateSymbols@16
-SymFunctionTableAccess32@8
-SymFunctionTableAccess64@12
-SymFunctionTableAccess@8
-SymGetLineFromAddr32@16
-SymGetLineFromAddr64@20
-SymGetLineFromAddr@16
-SymGetLineFromName32@24
-SymGetLineFromName64@24
-SymGetLineFromName@24
-SymGetLineNext32@8
-SymGetLineNext64@8
-SymGetLineNext@8
-SymGetLinePrev32@8
-SymGetLinePrev64@8
-SymGetLinePrev@8
-SymGetModuleBase32@8
-SymGetModuleBase64@12
-SymGetModuleBase@8
-SymGetModuleInfo32@12
-SymGetModuleInfo64@16
-SymGetModuleInfo@12
-SymGetOptions@0
-SymGetSearchPath@12
-SymGetSymFromAddr32@16
-SymGetSymFromAddr64@20
-SymGetSymFromAddr@16
-SymGetSymFromName32@12
-SymGetSymFromName64@12
-SymGetSymFromName@12
-SymGetSymNext32@8
-SymGetSymNext64@8
-SymGetSymNext@8
-SymGetSymPrev32@8
-SymGetSymPrev64@8
-SymGetSymPrev@8
-SymInitialize@12
-SymLoadModule32@24
-SymLoadModule64@28
-SymLoadModule@24
-SymMatchFileName@16
-SymRegisterCallback32@12
-SymRegisterCallback64@16
-SymRegisterCallback@12
-SymSetOptions@4
-SymSetSearchPath@8
-SymUnDName32@12
-SymUnDName64@12
-SymUnDName@12
-SymUnloadModule32@8
-SymUnloadModule64@12
-SymUnloadModule@8
-TouchFileTimes@8
-UnDecorateSymbolName@16
-UnMapAndLoad@4
-UnmapDebugInformation32@4
-UnmapDebugInformation64@4
-UnmapDebugInformation@4
-UpdateDebugInfoFile@16
-UpdateDebugInfoFileEx@20
diff --git a/winsup/w32api/lib/imm32.def b/winsup/w32api/lib/imm32.def
deleted file mode 100644
index 1d8ee8fcc..000000000
--- a/winsup/w32api/lib/imm32.def
+++ /dev/null
@@ -1,77 +0,0 @@
-LIBRARY IMM32.DLL
-EXPORTS
-ImmAssociateContext@8
-ImmConfigureIMEA@16
-ImmConfigureIMEW@16
-ImmCreateContext@0
-ImmCreateIMCC@4
-ImmCreateSoftKeyboard@16
-ImmDestroyContext@4
-ImmDestroyIMCC@4
-ImmDestroySoftKeyboard@4
-ImmEnumRegisterWordA@24
-ImmEnumRegisterWordW@24
-ImmEscapeA@16
-ImmEscapeW@16
-ImmGenerateMessage@4
-ImmGetCandidateListA@16
-ImmGetCandidateListCountA@8
-ImmGetCandidateListCountW@8
-ImmGetCandidateListW@16
-ImmGetCandidateWindow@12
-ImmGetCompositionFontA@8
-ImmGetCompositionFontW@8
-ImmGetCompositionStringA@16
-ImmGetCompositionStringW@16
-ImmGetCompositionWindow@8
-ImmGetContext@4
-ImmGetConversionListA@24
-ImmGetConversionListW@24
-ImmGetConversionStatus@12
-ImmGetDefaultIMEWnd@4
-ImmGetDescriptionA@12
-ImmGetDescriptionW@12
-ImmGetGuideLineA@16
-ImmGetGuideLineW@16
-ImmGetHotKey@16
-ImmGetIMCCLockCount@4
-ImmGetIMCCSize@4
-ImmGetIMCLockCount@4
-ImmGetIMEFileNameA@12
-ImmGetIMEFileNameW@12
-ImmGetImeMenuItemsA@24
-ImmGetImeMenuItemsW@24
-ImmGetOpenStatus@4
-ImmGetProperty@8
-ImmGetRegisterWordStyleA@12
-ImmGetRegisterWordStyleW@12
-ImmGetStatusWindowPos@8
-ImmGetVirtualKey@4
-ImmInstallIMEA@8
-ImmInstallIMEW@8
-ImmIsIME@4
-ImmIsUIMessageA@16
-ImmIsUIMessageW@16
-ImmLockIMC@4
-ImmLockIMCC@4
-ImmNotifyIME@16
-ImmReSizeIMCC@8
-ImmRegisterWordA@16
-ImmRegisterWordW@16
-ImmReleaseContext@8
-ImmSetCandidateWindow@8
-ImmSetCompositionFontA@8
-ImmSetCompositionFontW@8
-ImmSetCompositionStringA@24
-ImmSetCompositionStringW@24
-ImmSetCompositionWindow@8
-ImmSetConversionStatus@12
-ImmSetHotKey@16
-ImmSetOpenStatus@8
-ImmSetStatusWindowPos@8
-ImmShowSoftKeyboard@8
-ImmSimulateHotKey@8
-ImmUnlockIMC@4
-ImmUnlockIMCC@4
-ImmUnregisterWordA@16
-ImmUnregisterWordW@16
diff --git a/winsup/w32api/lib/iphlpapi.def b/winsup/w32api/lib/iphlpapi.def
deleted file mode 100644
index 33342e195..000000000
--- a/winsup/w32api/lib/iphlpapi.def
+++ /dev/null
@@ -1,45 +0,0 @@
-LIBRARY IPHLPAPI.DLL
-EXPORTS
-AddIPAddress@20
-CreateIpForwardEntry@4
-CreateIpNetEntry@4
-CreateProxyArpEntry@12
-DeleteIPAddress@4
-DeleteIpForwardEntry@4
-DeleteIpNetEntry@4
-DeleteProxyArpEntry@12
-EnableRouter@8
-FlushIpNetTable@4
-GetAdapterIndex@8
-GetAdaptersInfo@8
-GetBestInterface@8
-GetBestRoute@12
-GetFriendlyIfIndex@4
-GetIcmpStatistics@4
-GetIfEntry@4
-GetIfTable@12
-GetInterfaceInfo@8
-GetIpAddrTable@12
-GetIpForwardTable@12
-GetIpNetTable@12
-GetIpStatistics@4
-GetNetworkParams@8
-GetNumberOfInterfaces@4
-GetPerAdapterInfo@12
-GetRTTAndHopCount@16
-GetTcpStatistics@4
-GetTcpTable@12
-GetUdpStatistics@4
-GetUdpTable@12
-GetUniDirectionalAdapterInfo@8
-IpReleaseAddress@4
-IpRenewAddress@4
-SendARP@16
-SetAdapterIpAddress@20
-SetIfEntry@4
-SetIpForwardEntry@4
-SetIpNetEntry@4
-SetIpStatistics@4
-SetIpTTL@4
-SetTcpEntry@4
-UnenableRouter@8
diff --git a/winsup/w32api/lib/kernel32.c b/winsup/w32api/lib/kernel32.c
deleted file mode 100644
index 08ff86c25..000000000
--- a/winsup/w32api/lib/kernel32.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* extern (library) versions of inline functions defined in winnt.h */
-
-#if defined(__GNUC__)
-
-void* GetCurrentFiber(void)
-{
-    void* ret;
-    __asm__ volatile (
-	"movl	%%fs:0x10,%0"
-	: "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */
-	);
-    return ret;
-}
-
-void* GetFiberData(void)
-{
-    void* ret;
-    __asm__ volatile (            
-	"movl	%%fs:0x10,%0\n"
-	"movl	(%0),%0"
-	: "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */
-	);
-    return ret;
-}
-
-#elif !defined (__WATCOMC__)
-
-void* GetCurrentFiber(void)
-{
-    void* res;
-    _asm {
-    	mov	eax, dword ptr fs:0x10
-    	mov	res, eax
-    };
-    return res;
-}
-
-void* GetFiberData(void)
-{
-    void* res;
-    _asm {
-	mov	eax, dword ptr fs:0x10
-	mov	eax, [eax]
-	mov	res, eax
-    };
-    return res;
-}
-
-#endif /* __GNUC__ */
diff --git a/winsup/w32api/lib/kernel32.def b/winsup/w32api/lib/kernel32.def
deleted file mode 100644
index f22e83c1c..000000000
--- a/winsup/w32api/lib/kernel32.def
+++ /dev/null
@@ -1,868 +0,0 @@
-LIBRARY KERNEL32.dll
-EXPORTS
-ActivateActCtx@8
-AddAtomA@4
-AddAtomW@4
-AddConsoleAliasA@12
-AddConsoleAliasW@12
-AddLocalAlternateComputerNameA@8
-AddLocalAlternateComputerNameW@8
-AddRefActCtx@4
-AddVectoredExceptionHandler@8
-AllocConsole@0
-AllocateUserPhysicalPages@12
-AreFileApisANSI@0
-AssignProcessToJobObject@8
-AttachConsole@4
-BackupRead@28
-BackupSeek@24
-BackupWrite@28
-BaseAttachCompleteThunk@0
-Beep@8
-BeginUpdateResourceA@8
-BeginUpdateResourceW@8
-BuildCommDCBA@8
-BuildCommDCBAndTimeoutsA@12
-BuildCommDCBAndTimeoutsW@12
-BuildCommDCBW@8
-CallNamedPipeA@28
-CallNamedPipeW@28
-CancelDeviceWakeupRequest@4
-CancelIo@4
-CancelTimerQueueTimer@8
-CancelWaitableTimer@4
-ChangeTimerQueueTimer@16
-CheckNameLegalDOS8Dot3A@20
-CheckNameLegalDOS8Dot3W@20
-CheckRemoteDebuggerPresent@8
-ClearCommBreak@4
-ClearCommError@12
-CloseConsoleHandle@4
-CloseHandle@4
-CloseProfileUserMapping@0
-CmdBatNotification@4
-CommConfigDialogA@12
-CommConfigDialogW@12
-CompareFileTime@8
-CompareStringA@24
-CompareStringW@24
-ConnectNamedPipe@8
-ConsoleMenuControl@12
-ContinueDebugEvent@12
-ConvertDefaultLocale@4
-ConvertFiberToThread@0
-ConvertThreadToFiber@4
-ConvertToGlobalHandle@4
-CopyFileA@12
-CopyFileW@12
-CopyFileExA@24
-CopyFileExW@24
-CreateActCtxA@4
-CreateActCtxW@4
-CreateConsoleScreenBuffer@20
-CreateDirectoryA@8
-CreateDirectoryExA@12
-CreateDirectoryExW@12
-CreateDirectoryW@8
-CreateEventA@16
-CreateEventW@16
-CreateFiber@12
-CreateFiberEx@12
-CreateFileA@28
-CreateFileMappingA@24
-CreateFileMappingW@24
-CreateFileW@28
-CreateHardLinkA@12
-CreateHardLinkW@12
-CreateIoCompletionPort@16
-CreateJobObjectA@8
-CreateJobObjectW@8
-CreateMailslotA@16
-CreateMailslotW@16
-CreateMutexA@12
-CreateMutexW@12
-CreateNamedPipeA@32
-CreateNamedPipeW@32
-CreatePipe@16
-CreateProcessA@40
-CreateProcessW@40
-CreateRemoteThread@28
-CreateSemaphoreA@16
-CreateSemaphoreW@16
-CreateTapePartition@16
-CreateThread@24
-CreateTimerQueue@0
-CreateTimerQueueTimer@28
-CreateToolhelp32Snapshot@8
-CreateVirtualBuffer@12
-CreateWaitableTimerA@12
-CreateWaitableTimerW@12
-DeactivateActCtx@8
-DebugActiveProcess@4
-DebugActiveProcessStop@4
-DebugBreak@0
-DebugBreakProcess@4
-DebugSetProcessKillOnExit@4
-DefineDosDeviceA@12
-DefineDosDeviceW@12
-DeleteAtom@4
-DeleteCriticalSection@4
-DeleteFiber@4
-DeleteFileA@4
-DeleteFileW@4
-DeleteTimerQueue@4
-DeleteTimerQueueEx@8
-DeleteTimerQueueTimer@12
-DeleteVolumeMountPointA@4
-DeleteVolumeMountPointW@4
-DeviceIoControl@32
-DisableThreadLibraryCalls@4
-DisconnectNamedPipe@4
-DnsHostnameToComputerNameA@12
-DnsHostnameToComputerNameW@12
-DosDateTimeToFileTime@12
-DuplicateConsoleHandle@16
-DuplicateHandle@28
-EndUpdateResourceA@8
-EndUpdateResourceW@8
-EnterCriticalSection@4
-EnumCalendarInfoA@16
-EnumCalendarInfoW@16
-EnumCalendarInfoExA@16
-EnumCalendarInfoExW@16
-EnumDateFormatsA@12
-EnumDateFormatsW@12
-EnumDateFormatsExA@12
-EnumDateFormatsExW@12
-EnumLanguageGroupLocalesA@16
-EnumLanguageGroupLocalesW@16
-EnumResourceLanguagesA@20
-EnumResourceLanguagesW@20
-EnumResourceNamesA@16
-EnumResourceNamesW@16
-EnumResourceTypesA@12
-EnumResourceTypesW@12
-EnumSystemCodePagesA@8
-EnumSystemCodePagesW@8
-EnumSystemGeoID@12
-EnumSystemLanguageGroupsA@12
-EnumSystemLanguageGroupsW@12
-EnumSystemLocalesA@8
-EnumSystemLocalesW@8
-EnumTimeFormatsA@12
-EnumTimeFormatsW@12
-EnumUILanguagesA@12
-EnumUILanguagesW@12
-EraseTape@12
-EscapeCommFunction@8
-ExitProcess@4
-ExitThread@4
-ExitVDM@8
-ExpandEnvironmentStringsA@12
-ExpandEnvironmentStringsW@12
-ExpungeConsoleCommandHistoryA@4
-ExpungeConsoleCommandHistoryW@4
-ExtendVirtualBuffer@8
-FatalAppExitA@8
-FatalAppExitW@8
-FatalExit@4
-FileTimeToDosDateTime@12
-FileTimeToLocalFileTime@8
-FileTimeToSystemTime@8
-FillConsoleOutputAttribute@20
-FillConsoleOutputCharacterA@20
-FillConsoleOutputCharacterW@20
-FindActCtxSectionGuid@20
-FindActCtxSectionStringA@20
-FindActCtxSectionStringW@20
-FindAtomA@4
-FindAtomW@4
-FindClose@4
-FindCloseChangeNotification@4
-FindFirstChangeNotificationA@12
-FindFirstChangeNotificationW@12
-FindFirstFileA@8
-FindFirstFileW@8
-FindFirstFileExA@24
-FindFirstFileExW@24
-FindFirstVolumeA@8
-FindFirstVolumeW@8
-FindFirstVolumeMountPointA@12
-FindFirstVolumeMountPointW@12
-FindNextChangeNotification@4
-FindNextFileA@8
-FindNextFileW@8
-FindNextVolumeA@12
-FindNextVolumeW@12
-FindNextVolumeMountPointA@12
-FindNextVolumeMountPointW@12
-FindResourceA@12
-FindResourceExA@16
-FindResourceExW@16
-FindResourceW@12
-FindVolumeClose@4
-FindVolumeMountPointClose@4
-FlushConsoleInputBuffer@4
-FlushFileBuffers@4
-FlushInstructionCache@12
-FlushViewOfFile@8
-FoldStringA@20
-FoldStringW@20
-FormatMessageA@28
-FormatMessageW@28
-FreeConsole@0
-FreeEnvironmentStringsA@4
-FreeEnvironmentStringsW@4
-FreeLibrary@4
-FreeLibraryAndExitThread@8
-FreeResource@4
-FreeUserPhysicalPages@12
-FreeVirtualBuffer@4
-GenerateConsoleCtrlEvent@8
-GetACP@0
-GetAtomNameA@12
-GetAtomNameW@12
-GetBinaryType@8
-GetBinaryTypeA@8
-GetBinaryTypeW@8
-GetCPInfo@8
-GetCPInfoExA@12
-GetCPInfoExW@12
-GetCalendarInfoA@24
-GetCalendarInfoW@24
-GetCommConfig@12
-GetCommMask@8
-GetCommModemStatus@8
-GetCommProperties@8
-GetCommState@8
-GetCommTimeouts@8
-GetCommandLineA@0
-GetCommandLineW@0
-GetCompressedFileSizeA@8
-GetCompressedFileSizeW@8
-GetComputerNameA@8
-GetComputerNameW@8
-GetComputerNameExA@12
-GetComputerNameExW@12
-GetConsoleAliasA@16
-GetConsoleAliasExesA@8
-GetConsoleAliasExesLengthA@0
-GetConsoleAliasExesLengthW@0
-GetConsoleAliasExesW@8
-GetConsoleAliasW@16
-GetConsoleAliasesA@12
-GetConsoleAliasesLengthA@4
-GetConsoleAliasesLengthW@4
-GetConsoleAliasesW@12
-GetConsoleCP@0
-GetConsoleCommandHistoryA@12
-GetConsoleCommandHistoryLengthA@4
-GetConsoleCommandHistoryLengthW@4
-GetConsoleCommandHistoryW@12
-GetConsoleCursorInfo@8
-GetConsoleDisplayMode@4
-GetConsoleFontInfo@16
-GetConsoleFontSize@8
-GetConsoleHardwareState@12
-GetConsoleInputExeNameA@8
-GetConsoleInputExeNameW@8
-GetConsoleInputWaitHandle@0
-GetConsoleKeyboardLayoutNameA@4
-GetConsoleKeyboardLayoutNameW@4
-GetConsoleMode@8
-GetConsoleOutputCP@0
-GetConsoleScreenBufferInfo@8
-GetConsoleTitleA@8
-GetConsoleTitleW@8
-GetConsoleWindow@0
-GetCurrencyFormatA@24
-GetCurrencyFormatW@24
-GetCurrentActCtx@4
-GetCurrentConsoleFont@12
-GetCurrentDirectoryA@8
-GetCurrentDirectoryW@8
-GetCurrentProcess@0
-GetCurrentProcessId@0
-GetCurrentThread@0
-GetCurrentThreadId@0
-GetDateFormatA@24
-GetDateFormatW@24
-GetDefaultCommConfigA@12
-GetDefaultCommConfigW@12
-GetDevicePowerState@4
-GetDiskFreeSpaceA@20
-GetDiskFreeSpaceW@20
-GetDiskFreeSpaceExA@16
-GetDiskFreeSpaceExW@16
-GetDllDirectoryA@8
-GetDllDirectoryW@8
-GetDriveTypeA@4
-GetDriveTypeW@4
-GetErrorMode@0
-GetEnvironmentStrings@0
-GetEnvironmentStringsA@0
-GetEnvironmentStringsW@0
-GetEnvironmentVariableA@12
-GetEnvironmentVariableW@12
-GetExitCodeProcess@8
-GetExitCodeThread@8
-GetFileAttributesA@4
-GetFileAttributesW@4
-GetFileAttributesExA@12
-GetFileAttributesExW@12
-GetFileInformationByHandle@8
-GetFileSize@8
-GetFileSizeEx@8
-GetFileTime@16
-GetFileType@4
-GetFirmwareEnvironmentVariableA@16
-GetFirmwareEnvironmentVariableW@16
-GetFullPathNameA@16
-GetFullPathNameW@16
-GetGeoInfoA@20
-GetGeoInfoW@20
-GetHandleInformation@8
-GetLargestConsoleWindowSize@4
-GetLastError@0
-GetLocalTime@4
-GetLocaleInfoA@16
-GetLocaleInfoW@16
-GetLogicalDriveStringsA@8
-GetLogicalDriveStringsW@8
-GetLogicalDrives@0
-GetLongPathNameA@12
-GetLongPathNameW@12
-GetMailslotInfo@20
-GetModuleFileNameA@12
-GetModuleFileNameW@12
-GetModuleHandleA@4
-GetModuleHandleW@4
-GetModuleHandleExA@12
-GetModuleHandleExW@12
-GetNamedPipeHandleStateA@28
-GetNamedPipeHandleStateW@28
-GetNamedPipeInfo@20
-GetNativeSystemInfo@4
-GetNextVDMCommand@4
-GetNumberFormatA@24
-GetNumberFormatW@24
-GetNumberOfConsoleFonts@0
-GetNumberOfConsoleInputEvents@8
-GetNumberOfConsoleMouseButtons@4
-GetOEMCP@0
-GetOverlappedResult@16
-GetPriorityClass@4
-GetPrivateProfileIntA@16
-GetPrivateProfileIntW@16
-GetPrivateProfileSectionA@16
-GetPrivateProfileSectionNamesA@12
-GetPrivateProfileSectionNamesW@12
-GetPrivateProfileSectionW@16
-GetPrivateProfileStringA@24
-GetPrivateProfileStringW@24
-GetPrivateProfileStructA@20
-GetPrivateProfileStructW@20
-GetProcAddress@8
-GetProcessAffinityMask@12
-GetProcessHandleCount@8
-GetProcessHeap@0
-GetProcessHeaps@8
-GetProcessId@4
-GetProcessIoCounters@8
-GetProcessPriorityBoost@8
-GetProcessShutdownParameters@8
-GetProcessTimes@20
-GetProcessVersion@4
-GetProcessWorkingSetSize@12
-GetProductName@8
-GetProfileIntA@12
-GetProfileIntW@12
-GetProfileSectionA@12
-GetProfileSectionW@12
-GetProfileStringA@20
-GetProfileStringW@20
-GetQueuedCompletionStatus@20
-GetShortPathNameA@12
-GetShortPathNameW@12
-GetStartupInfoA@4
-GetStartupInfoW@4
-GetStdHandle@4
-GetStringTypeA@20
-GetStringTypeExA@20
-GetStringTypeExW@20
-GetStringTypeW@16
-GetSystemDefaultLCID@0
-GetSystemDefaultLangID@0
-GetSystemDefaultUILanguage@0
-GetSystemDirectoryA@8
-GetSystemDirectoryW@8
-GetSystemInfo@4
-GetSystemPowerStatus@4
-GetSystemRegistryQuota@8
-GetSystemTime@4
-GetSystemTimes@12
-GetSystemTimeAdjustment@12
-GetSystemTimeAsFileTime@4
-GetSystemWindowsDirectoryA@8
-GetSystemWindowsDirectoryW@8
-GetSystemWow64DirectoryA@8
-GetSystemWow64DirectoryW@8
-GetTapeParameters@16
-GetTapePosition@20
-GetTapeStatus@4
-GetTempFileNameA@16
-GetTempFileNameW@16
-GetTempPathA@8
-GetTempPathW@8
-GetThreadContext@8
-GetThreadIOPendingFlag@8
-GetThreadLocale@0
-GetThreadPriority@4
-GetThreadPriorityBoost@8
-GetThreadSelectorEntry@12
-GetThreadTimes@20
-GetTickCount@0
-GetTimeFormatA@24
-GetTimeFormatW@24
-GetTimeZoneInformation@4
-GetUserDefaultLCID@0
-GetUserDefaultLangID@0
-GetUserDefaultUILanguage@0
-GetUserGeoID@12
-GetVDMCurrentDirectories@8
-GetVersion@0
-GetVersionExA@4
-GetVersionExW@4
-GetVolumeInformationA@32
-GetVolumeInformationW@32
-GetVolumeNameForVolumeMountPointA@12
-GetVolumeNameForVolumeMountPointW@12
-GetVolumePathNameA@12
-GetVolumePathNameW@12
-GetVolumePathNamesForVolumeNameA@16
-GetVolumePathNamesForVolumeNameW@16
-GetWindowsDirectoryA@8
-GetWindowsDirectoryW@8
-GetWriteWatch@24
-GlobalAddAtomA@4
-GlobalAddAtomW@4
-GlobalAlloc@8
-GlobalCompact@4
-GlobalDeleteAtom@4
-GlobalFindAtomA@4
-GlobalFindAtomW@4
-GlobalFix@4
-GlobalFlags@4
-GlobalFree@4
-GlobalGetAtomNameA@12
-GlobalGetAtomNameW@12
-GlobalHandle@4
-GlobalLock@4
-GlobalMemoryStatus@4
-GlobalMemoryStatusEx@4
-GlobalMemoryStatusVlm@4
-GlobalReAlloc@12
-GlobalSize@4
-GlobalUnWire@4
-GlobalUnfix@4
-GlobalUnlock@4
-GlobalWire@4
-Heap32First@12
-Heap32ListFirst@8
-Heap32ListNext@8
-Heap32Next@4
-HeapAlloc@12
-HeapCompact@8
-HeapCreate@12
-HeapCreateTagsW@16
-HeapDestroy@4
-HeapExtend@16
-HeapFree@12
-HeapLock@4
-HeapQueryInformation@20
-HeapQueryTagW@20
-HeapReAlloc@16
-HeapSetInformation@16
-HeapSize@12
-HeapSummary@12
-HeapUnlock@4
-HeapUsage@20
-HeapValidate@12
-HeapWalk@8
-InitAtomTable@4
-InitializeCriticalSection@4
-InitializeCriticalSectionAndSpinCount@8
-InitializeSListHead@4
-InterlockedCompareExchange@12
-InterlockedDecrement@4
-InterlockedExchange@8
-InterlockedExchangeAdd@8
-InterlockedFlushSList@4
-InterlockedIncrement@4
-InterlockedPopEntrySList@4
-InterlockedPushEntrySList@8
-InvalidateConsoleDIBits@8
-IsBadCodePtr@4
-IsBadHugeReadPtr@8
-IsBadHugeWritePtr@8
-IsBadReadPtr@8
-IsBadStringPtrA@8
-IsBadStringPtrW@8
-IsBadWritePtr@8
-IsDBCSLeadByte@4
-IsDBCSLeadByteEx@8
-IsDebuggerPresent@0
-IsProcessInJob@12
-IsProcessorFeaturePresent@4
-IsSystemResumeAutomatic@0
-IsValidCodePage@4
-IsValidLanguageGroup@8
-IsValidLocale@8
-IsWow64Process@8
-LCMapStringA@24
-LCMapStringW@24
-LeaveCriticalSection@4
-LoadLibraryA@4
-LoadLibraryExA@12
-LoadLibraryExW@12
-LoadLibraryW@4
-LoadModule@8
-LoadResource@8
-LocalAlloc@8
-LocalCompact@4
-LocalFileTimeToFileTime@8
-LocalFlags@4
-LocalFree@4
-LocalHandle@4
-LocalLock@4
-LocalReAlloc@12
-LocalShrink@8
-LocalSize@4
-LocalUnlock@4
-LockFile@20
-LockFileEx@24
-LockResource@4
-MapUserPhysicalPages@12
-MapUserPhysicalPagesScatter@12
-MapViewOfFile@20
-MapViewOfFileEx@24
-MapViewOfFileVlm@28
-Module32First@8
-Module32FirstW@8
-Module32Next@8
-Module32NextW@8
-MoveFileA@8
-MoveFileW@8
-MoveFileExA@12
-MoveFileExW@12
-MoveFileWithProgressA@20
-MoveFileWithProgressW@20
-MulDiv@12
-MultiByteToWideChar@24
-OpenConsoleW@16
-OpenEventA@12
-OpenEventW@12
-OpenFile@12
-OpenFileMappingA@12
-OpenFileMappingW@12
-OpenJobObjectA@12
-OpenJobObjectW@12
-OpenMutexA@12
-OpenMutexW@12
-OpenProcess@12
-OpenProfileUserMapping@0
-OpenSemaphoreA@12
-OpenSemaphoreW@12
-OpenThread@12
-OpenWaitableTimerA@12
-OpenWaitableTimerW@12
-OutputDebugStringA@4
-OutputDebugStringW@4
-PeekConsoleInputA@16
-PeekConsoleInputW@16
-PeekNamedPipe@24
-PostQueuedCompletionStatus@16
-PrepareTape@12
-Process32First@8
-Process32FirstW@8
-Process32Next@8
-Process32NextW@8
-ProcessIdToSessionId@8
-PulseEvent@4
-PurgeComm@8
-QueryActCtxW@28
-QueryDosDeviceA@12
-QueryDosDeviceW@12
-QueryInformationJobObject@20
-QueryMemoryResourceNotification@8
-QueryPerformanceCounter@4
-QueryPerformanceFrequency@4
-QueryWin31IniFilesMappedToRegistry@16
-QueueUserAPC@12
-QueueUserWorkItem@12
-RaiseException@16
-ReadConsoleA@20
-ReadConsoleInputA@16
-ReadConsoleInputW@16
-ReadConsoleInputExA@20
-ReadConsoleInputExW@20
-ReadConsoleOutputA@20
-ReadConsoleOutputAttribute@20
-ReadConsoleOutputCharacterA@20
-ReadConsoleOutputCharacterW@20
-ReadConsoleOutputW@20
-ReadConsoleW@20
-ReadDirectoryChangesW@32
-ReadFile@20
-ReadFileEx@20
-ReadFileScatter@20
-ReadFileVlm@20
-ReadProcessMemory@20
-ReadProcessMemoryVlm@20
-RegisterConsoleVDM@44
-RegisterWaitForInputIdle@4
-RegisterWaitForSingleObject@16
-RegisterWowBaseHandlers@4
-RegisterWowExec@4
-ReleaseActCtx@4
-ReleaseMutex@4
-ReleaseSemaphore@12
-RemoveDirectoryA@4
-RemoveDirectoryW@4
-RemoveVectoredExceptionHandler@4
-ReplaceFile@24
-ReplaceFileA@24
-ReplaceFileW@24
-RequestWakeupLatency@4
-ResetEvent@4
-ResetWriteWatch@8
-RestoreLastError@4
-ResumeThread@4
-RtlFillMemory@12
-RtlMoveMemory@12
-RtlUnwind@16
-RtlZeroMemory@8
-ScrollConsoleScreenBufferA@20
-ScrollConsoleScreenBufferW@20
-SearchPathA@24
-SearchPathW@24
-SetCalendarInfoA@16
-SetCalendarInfoW@16
-SetCommBreak@4
-SetCommConfig@12
-SetCommMask@8
-SetCommState@8
-SetCommTimeouts@8
-SetComputerNameA@4
-SetComputerNameW@4
-SetComputerNameExA@8
-SetComputerNameExW@8
-SetConsoleActiveScreenBuffer@4
-SetConsoleCP@4
-SetConsoleCommandHistoryMode@4
-SetConsoleCtrlHandler@8
-SetConsoleCursor@8
-SetConsoleCursorInfo@8
-SetConsoleCursorPosition@8
-SetConsoleDisplayMode@12
-SetConsoleFont@8
-SetConsoleHardwareState@12
-SetConsoleIcon@4
-SetConsoleInputExeNameA@4
-SetConsoleInputExeNameW@4
-SetConsoleKeyShortcuts@16
-SetConsoleMaximumWindowSize@8
-SetConsoleMenuClose@4
-SetConsoleMode@8
-SetConsoleNumberOfCommandsA@8
-SetConsoleNumberOfCommandsW@8
-SetConsoleOutputCP@4
-SetConsolePalette@12
-SetConsoleScreenBufferSize@8
-SetConsoleTextAttribute@8
-SetConsoleTitleA@4
-SetConsoleTitleW@4
-SetConsoleWindowInfo@12
-SetCriticalSectionSpinCount@8
-SetCurrentDirectoryA@4
-SetCurrentDirectoryW@4
-SetDefaultCommConfigA@12
-SetDefaultCommConfigW@12
-SetDllDirectoryA@4
-SetDllDirectoryW@4
-SetEndOfFile@4
-SetEnvironmentVariableA@8
-SetEnvironmentVariableW@8
-SetErrorMode@4
-SetEvent@4
-SetFileApisToANSI@0
-SetFileApisToOEM@0
-SetFileAttributesA@8
-SetFileAttributesW@8
-SetFilePointer@16
-SetFilePointerEx@20
-SetFileShortNameA@8
-SetFileShortNameW@8
-SetFileTime@16
-SetFileValidData@12
-SetHandleCount@4
-SetHandleInformation@12
-SetInformationJobObject@16
-SetLastConsoleEventActive@0
-SetLastError@4
-SetLocalTime@4
-SetLocaleInfoA@12
-SetLocaleInfoW@12
-SetMailslotInfo@8
-SetNamedPipeHandleState@16
-SetPriorityClass@8
-SetProcessAffinityMask@8
-SetProcessPriorityBoost@8
-SetProcessShutdownParameters@8
-SetProcessWorkingSetSize@12
-SetStdHandle@8
-SetSystemPowerState@8
-SetSystemTime@4
-SetSystemTimeAdjustment@8
-SetTapeParameters@12
-SetTapePosition@24
-SetThreadAffinityMask@8
-SetThreadContext@8
-SetThreadExecutionState@4
-SetThreadIdealProcessor@8
-SetThreadLocale@4
-SetThreadPriority@8
-SetThreadPriorityBoost@8
-SetTimeZoneInformation@4
-SetTimerQueueTimer@24
-SetUnhandledExceptionFilter@4
-SetUserGeoID@4
-SetVDMCurrentDirectories@8
-SetVolumeLabelA@8
-SetVolumeLabelW@8
-SetVolumeMountPointA@8
-SetVolumeMountPointW@8
-SetWaitableTimer@24
-SetupComm@12
-ShowConsoleCursor@8
-SignalObjectAndWait@16
-SizeofResource@8
-Sleep@4
-SleepEx@8
-SuspendThread@4
-SwitchToFiber@4
-SwitchToThread@0
-SystemTimeToFileTime@8
-SystemTimeToTzSpecificLocalTime@12
-TerminateJobObject@8
-TerminateProcess@8
-TerminateThread@8
-Thread32First@8
-Thread32Next@8
-TlsAlloc@0
-TlsFree@4
-TlsGetValue@4
-TlsSetValue@8
-TransactNamedPipe@28
-TransmitCommChar@8
-TrimVirtualBuffer@4
-TryEnterCriticalSection@4
-UTRegister@28
-UTUnRegister@4
-UnhandledExceptionFilter@4
-UnlockFile@20
-UnlockFileEx@20
-UnmapViewOfFile@4
-UnmapViewOfFileVlm@4
-UnregisterWait@4
-UnregisterWaitEx@8
-UpdateResourceA@24
-UpdateResourceW@24
-VDMConsoleOperation@8
-VDMOperationStarted@4
-VerLanguageNameA@12
-VerLanguageNameW@12
-VerSetConditionMask@13
-VerifyConsoleIoHandle@4
-VerifyVersionInfoA@16
-VerifyVersionInfoW@16
-VirtualAlloc@16
-VirtualAllocEx@20
-VirtualAllocVlm@24
-VirtualBufferExceptionHandler@12
-VirtualFree@12
-VirtualFreeEx@16
-VirtualFreeVlm@20
-VirtualLock@8
-VirtualProtect@16
-VirtualProtectEx@20
-VirtualProtectVlm@24
-VirtualQuery@12
-VirtualQueryEx@16
-VirtualQueryVlm@16
-VirtualUnlock@8
-WaitCommEvent@12
-WaitForDebugEvent@8
-WaitForMultipleObjects@16
-WaitForMultipleObjectsEx@20
-WaitForSingleObject@8
-WaitForSingleObjectEx@12
-WaitNamedPipeA@8
-WaitNamedPipeW@8
-WideCharToMultiByte@32
-WinExec@8
-WriteConsoleA@20
-WriteConsoleInputA@16
-WriteConsoleInputVDMA@16
-WriteConsoleInputVDMW@16
-WriteConsoleInputW@16
-WriteConsoleOutputA@20
-WriteConsoleOutputAttribute@20
-WriteConsoleOutputCharacterA@20
-WriteConsoleOutputCharacterW@20
-WriteConsoleOutputW@20
-WriteConsoleW@20
-WriteFile@20
-WriteFileEx@20
-WriteFileGather@20
-WriteFileVlm@20
-WritePrivateProfileSectionA@12
-WritePrivateProfileSectionW@12
-WritePrivateProfileStringA@16
-WritePrivateProfileStringW@16
-WritePrivateProfileStructA@20
-WritePrivateProfileStructW@20
-WriteProcessMemory@20
-WriteProcessMemoryVlm@20
-WriteProfileSectionA@8
-WriteProfileSectionW@8
-WriteProfileStringA@12
-WriteProfileStringW@12
-WriteTapemark@16
-ZombifyActCtx@4
-_hread@12
-_hwrite@12
-_lclose@4
-_lcreat@8
-_llseek@12
-_lopen@8
-_lread@12
-_lwrite@12
-lstrcat@8
-lstrcatA@8
-lstrcatW@8
-lstrcmp@8
-lstrcmpA@8
-lstrcmpW@8
-lstrcmpi@8
-lstrcmpiA@8
-lstrcmpiW@8
-lstrcpy@8
-lstrcpyA@8
-lstrcpyW@8
-lstrcpyn@12
-lstrcpynA@12
-lstrcpynW@12
-lstrlen@4
-lstrlenA@4
-lstrlenW@4
diff --git a/winsup/w32api/lib/largeint.c b/winsup/w32api/lib/largeint.c
deleted file mode 100644
index 531937e23..000000000
--- a/winsup/w32api/lib/largeint.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-  largeint.c
-
-  Large (64 bits) integer arithmetics library
-
-  Written by Anders Norlander <anorland@hem2.passagen.se>
-
-  This file is part of a free library for the Win32 API.
-  
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-*/
-
-#define __COMPILING_LARGEINT
-
-#include <largeint.h>
-
-__int64 WINAPI
-LargeIntegerAdd (__int64 i1, __int64 i2)
-{
-  return i1 + i2;
-}
-
-__int64 WINAPI
-LargeIntegerSubtract (__int64 i1, __int64 i2)
-{
-  return i1 - i2;
-}
-
-__int64 WINAPI
-LargeIntegerArithmeticShift (__int64 i, int n)
-{
-  return i >> n;
-}
-
-__int64 WINAPI
-LargeIntegerShiftLeft (__int64 i, int n)
-{
-  return i << n;
-}
-
-__int64 WINAPI
-LargeIntegerShiftRight (__int64 i, int n)
-{
-  return i >> n;
-}
-
-__int64 WINAPI
-LargeIntegerNegate (__int64 i)
-{
-  return -i;
-}
-
-__int64 WINAPI
-ConvertLongToLargeInteger (LONG l)
-{
-  return (__int64) l;
-}
-
-__int64 WINAPI
-ConvertUlongToLargeInteger (ULONG ul)
-{
-  return _toi(_toui(ul));
-}
-
-__int64 WINAPI
-EnlargedIntegerMultiply (LONG l1, LONG l2)
-{
-  return _toi(l1) * _toi(l2);
-}
-
-__int64 WINAPI
-EnlargedUnsignedMultiply (ULONG ul1, ULONG ul2)
-{
-  return _toi(_toui(ul1) * _toui(ul2));
-}
-
-__int64 WINAPI
-ExtendedIntegerMultiply (__int64 i, LONG l)
-{
-  return i * _toi(l);
-}
-
-__int64 WINAPI
-LargeIntegerMultiply (__int64 i1, __int64 i2)
-{
-  return i1 * i2;
-}
-
-__int64 WINAPI LargeIntegerDivide (__int64 i1, __int64 i2, __int64 *remainder)
-{
-  if (remainder)
-    *remainder = i1 % i2;
-  return i1 / i2;
-}
-
-ULONG WINAPI
-EnlargedUnsignedDivide (unsigned __int64 i1, ULONG i2, PULONG remainder)
-{
-  if (remainder)
-    *remainder = i1 % _toi(i2);
-  return i1 / _toi(i2);
-}
-__int64 WINAPI
-ExtendedLargeIntegerDivide (__int64 i1, ULONG i2, PULONG remainder)
-{
-  if (remainder)
-    *remainder = i1 % _toi(i2);
-  return i1 / _toi(i2);
-}
-
-/* FIXME: what is this function supposed to do? */
-__int64 WINAPI ExtendedMagicDivide (__int64 i1, __int64 i2, int n)
-{
-  return 0;
-}
diff --git a/winsup/w32api/lib/lz32.def b/winsup/w32api/lib/lz32.def
deleted file mode 100644
index 7ea621312..000000000
--- a/winsup/w32api/lib/lz32.def
+++ /dev/null
@@ -1,14 +0,0 @@
-LIBRARY LZ32.DLL
-EXPORTS
-CopyLZFile@8
-GetExpandedNameA@8
-GetExpandedNameW@8
-LZClose@4
-LZCopy@8
-LZDone@0
-LZInit@4
-LZOpenFileA@12
-LZOpenFileW@12
-LZRead@12
-LZSeek@12
-LZStart@0
diff --git a/winsup/w32api/lib/mapi32.def b/winsup/w32api/lib/mapi32.def
deleted file mode 100644
index 2e4fe42fb..000000000
--- a/winsup/w32api/lib/mapi32.def
+++ /dev/null
@@ -1,164 +0,0 @@
-LIBRARY MAPI32.DLL
-EXPORTS
-BuildDisplayTable@40
-CbOfEncoded@4
-CchOfEncoding@4
-ChangeIdleRoutine@28
-CloseIMsgSession@4
-CreateIProp@24
-CreateTable@36
-DeinitMapiUtil@0
-DeregisterIdleRoutine@4
-EnableIdleRoutine@8
-EncodeID@12
-FBadColumnSet@4
-FBadEntryList@4
-FBadProp@4
-FBadPropTag@4
-FBadRestriction@4
-FBadRglpNameID@8
-FBadRglpszA@8
-FBadRglpszW@8
-FBadRow@4
-FBadRowSet@4
-FBadSortOrderSet@4
-FBinFromHex@8
-FDecodeID@12
-FEqualNames@8
-FPropCompareProp@12
-FPropContainsProp@12
-FPropExists@8
-FreePadrlist@4
-FreeProws@4
-FtAdcFt@20
-FtAddFt@16
-FtDivFtBogus@20
-FtMulDw@12
-FtMulDwDw@8
-FtNegFt@8
-FtSubFt@16
-FtgRegisterIdleRoutine@20
-GetAttribIMsgOnIStg@12
-GetTnefStreamCodepage
-GetTnefStreamCodepage@12
-HexFromBin@12
-HrAddColumns@16
-HrAddColumnsEx@20
-HrAllocAdviseSink@12
-HrComposeEID@28
-HrComposeMsgID@24
-HrDecomposeEID@28
-HrDecomposeMsgID@24
-HrDispatchNotifications@4
-HrEntryIDFromSz@12
-HrGetOneProp@12
-HrIStorageFromStream@16
-HrQueryAllRows@24
-HrSetOneProp@8
-HrSzFromEntryID@12
-HrThisThreadAdviseSink@8
-HrValidateIPMSubtree@20
-HrValidateParameters@8
-InstallFilterHook@4
-IsBadBoundedStringPtr@8
-LAUNCHWIZARD
-LPropCompareProp@8
-LaunchWizard@20
-LpValFindProp@12
-MAPI_NSCP_SynchronizeClient@8
-MAPIAddress@44
-MAPIAdminProfiles
-MAPIAdminProfiles@8
-MAPIAllocateBuffer
-MAPIAllocateBuffer@8
-MAPIAllocateMore
-MAPIAllocateMore@12
-MAPIDeinitIdle@0
-MAPIDeleteMail@20
-MAPIDetails@20
-MAPIFindNext@28
-MAPIFreeBuffer
-MAPIFreeBuffer@4
-MAPIGetDefaultMalloc@0
-MAPIGetNetscapeVersion@0
-MAPIInitIdle@4
-MAPIInitialize
-MAPIInitialize@4
-MAPILogoff@16
-MAPILogon@24
-MAPILogonEx
-MAPILogonEx@20
-MAPIOpenFormMgr
-MAPIOpenFormMgr@8
-MAPIOpenLocalFormContainer
-MAPIOpenLocalFormContainer@4
-MAPIReadMail@24
-MAPIResolveName@24
-MAPISaveMail@24
-MAPISendDocuments@20
-MAPISendMail
-MAPISendMail@20
-MAPIUninitialize
-MAPIUninitialize@0
-MNLS_CompareStringW@24
-MNLS_IsBadStringPtrW@8
-MNLS_MultiByteToWideChar@24
-MNLS_WideCharToMultiByte@32
-MNLS_lstrcmpW@8
-MNLS_lstrcpyW@8
-MNLS_lstrlenW@4
-MapStorageSCode@4
-OpenIMsgOnIStg@44
-OpenIMsgSession@12
-OpenStreamOnFile
-OpenStreamOnFile@24
-OpenTnefStream
-OpenTnefStream@28
-OpenTnefStreamEx
-OpenTnefStreamEx@32
-PRProviderInit
-PpropFindProp@12
-PropCopyMore@16
-RTFSync
-RTFSync@12
-ScBinFromHexBounded@12
-ScCopyNotifications@16
-ScCopyProps@16
-ScCountNotifications@12
-ScCountProps@12
-ScCreateConversationIndex@16
-ScDupPropset@16
-ScGenerateMuid@4
-ScInitMapiUtil@4
-ScLocalPathFromUNC@12
-ScMAPIXFromCMC
-ScMAPIXFromSMAPI
-ScRelocNotifications@20
-ScRelocProps@20
-ScSplEntry
-ScUNCFromLocalPath@12
-SetAttribIMsgOnIStg@16
-SwapPlong@8
-SwapPword@8
-SzFindCh@8
-SzFindLastCh@8
-SzFindSz@8
-UFromSz@4
-UNKOBJ_COFree@8
-UNKOBJ_Free@8
-UNKOBJ_FreeRows@8
-UNKOBJ_ScAllocate@12
-UNKOBJ_ScAllocateMore@16
-UNKOBJ_ScCOAllocate@12
-UNKOBJ_ScCOReallocate@12
-UNKOBJ_ScSzFromIdsAlloc@20
-UlAddRef@4
-UlFromSzHex@4
-UlPropSize@4
-UlRelease@4
-WrapCompressedRTFStream
-WrapCompressedRTFStream@12
-WrapProgress@20
-WrapStoreEntryID@24
-__CPPValidateParameters@8
-__ValidateParameters@8
diff --git a/winsup/w32api/lib/mfcuia32.def b/winsup/w32api/lib/mfcuia32.def
deleted file mode 100644
index fb954e367..000000000
--- a/winsup/w32api/lib/mfcuia32.def
+++ /dev/null
@@ -1,12 +0,0 @@
-LIBRARY MFCUIA32.DLL
-EXPORTS
-OleUIAddVerbMenu@36
-OleUIBusy@4
-OleUICanConvertOrActivateAs@12
-OleUIChangeIcon@4
-OleUIConvert@4
-OleUIEditLinks@4
-OleUIInsertObject@4
-OleUIPasteSpecial@4
-OleUIPromptUser
-OleUIUpdateLinks@16
diff --git a/winsup/w32api/lib/mgmtapi.def b/winsup/w32api/lib/mgmtapi.def
deleted file mode 100644
index 652621c90..000000000
--- a/winsup/w32api/lib/mgmtapi.def
+++ /dev/null
@@ -1,14 +0,0 @@
-LIBRARY MGMTAPI.DLL
-EXPORTS
-SnmpMgrClose@4
-SnmpMgrCtl@28
-SnmpMgrGetTrap@24
-SnmpMgrGetTrapEx@32
-;SnmpMgrMIB2Disk@8
-SnmpMgrOidToStr@8
-SnmpMgrOpen@16
-SnmpMgrRequest@20
-SnmpMgrStrToOid@8
-SnmpMgrTrapListen@4
-serverTrapThread@4
-;dbginit@8
diff --git a/winsup/w32api/lib/mpr.def b/winsup/w32api/lib/mpr.def
deleted file mode 100644
index f8dde41f7..000000000
--- a/winsup/w32api/lib/mpr.def
+++ /dev/null
@@ -1,72 +0,0 @@
-LIBRARY MPR.DLL
-EXPORTS
-MultinetGetConnectionPerformanceA@8
-MultinetGetConnectionPerformanceW@8
-RestoreConnectionA0@8
-WNetAddConnection2A@16
-WNetAddConnection2W@16
-WNetAddConnection3A@20
-WNetAddConnection3W@20
-WNetAddConnectionA@12
-WNetAddConnectionW@12
-WNetCancelConnection2A@12
-WNetCancelConnection2W@12
-WNetCancelConnectionA@8
-WNetCancelConnectionW@8
-WNetClearConnections@4
-WNetCloseEnum@4
-WNetConnectionDialog1A@4
-WNetConnectionDialog1W@4
-WNetConnectionDialog2@16
-WNetConnectionDialog@8
-WNetDirectoryNotifyA@12
-WNetDirectoryNotifyW@12
-WNetDisconnectDialog1A@4
-WNetDisconnectDialog1W@4
-WNetDisconnectDialog2@16
-WNetDisconnectDialog@8
-WNetEnumResourceA@16
-WNetEnumResourceW@16
-WNetFMXEditPerm@12
-WNetFMXGetPermCaps@4
-WNetFMXGetPermHelp@24
-WNetFormatNetworkNameA@24
-WNetFormatNetworkNameW@24
-WNetGetConnection2A@12
-WNetGetConnection2W@12
-WNetGetConnectionA@12
-WNetGetConnectionW@12
-WNetGetDirectoryTypeA@12
-WNetGetDirectoryTypeW@12
-WNetGetFormatNameProc@4
-WNetGetLastErrorA@20
-WNetGetLastErrorW@20
-WNetGetNetworkInformationA@8
-WNetGetNetworkInformationW@8
-WNetGetPropertyTextA@24
-WNetGetPropertyTextW@24
-WNetGetProviderNameA@12
-WNetGetProviderNameW@12
-WNetGetResourceInformationA@16
-WNetGetResourceInformationW@16
-WNetGetResourceParentA@12
-WNetGetResourceParentW@12
-WNetGetSearchDialog@4
-WNetGetUniversalNameA@16
-WNetGetUniversalNameW@16
-WNetGetUserA@12
-WNetGetUserW@12
-WNetLogonNotify@36
-WNetOpenEnumA@20
-WNetOpenEnumW@20
-WNetPasswordChangeNotify@32
-WNetPropertyDialogA@20
-WNetPropertyDialogW@20
-WNetRestoreConnection@8
-WNetSetConnectionA@12
-WNetSetConnectionW@12
-WNetSetLastErrorA@12
-WNetSetLastErrorW@12
-WNetSupportGlobalEnum@4
-WNetUseConnectionA@32
-WNetUseConnectionW@32
diff --git a/winsup/w32api/lib/msacm32.def b/winsup/w32api/lib/msacm32.def
deleted file mode 100644
index 356b3aff1..000000000
--- a/winsup/w32api/lib/msacm32.def
+++ /dev/null
@@ -1,46 +0,0 @@
-LIBRARY MSACM32.DLL
-EXPORTS
-XRegThunkEntry@36
-acmDriverAddA@20
-acmDriverAddW@20
-acmDriverClose@8
-acmDriverDetailsA@12
-acmDriverDetailsW@12
-acmDriverEnum@12
-acmDriverID@12
-acmDriverMessage@16
-acmDriverOpen@12
-acmDriverPriority@12
-acmDriverRemove@8
-acmFilterChooseA@4
-acmFilterChooseW@4
-acmFilterDetailsA@12
-acmFilterDetailsW@12
-acmFilterEnumA@20
-acmFilterEnumW@20
-acmFilterTagDetailsA@12
-acmFilterTagDetailsW@12
-acmFilterTagEnumA@20
-acmFilterTagEnumW@20
-acmFormatChooseA@4
-acmFormatChooseW@4
-acmFormatDetailsA@12
-acmFormatDetailsW@12
-acmFormatEnumA@20
-acmFormatEnumW@20
-acmFormatSuggest@20
-acmFormatTagDetailsA@12
-acmFormatTagDetailsW@12
-acmFormatTagEnumA@20
-acmFormatTagEnumW@20
-acmGetVersion@0
-acmMessage32@24
-acmMetrics@12
-acmStreamClose@8
-acmStreamConvert@12
-acmStreamMessage@16
-acmStreamOpen@32
-acmStreamPrepareHeader@12
-acmStreamReset@8
-acmStreamSize@16
-acmStreamUnprepareHeader@12
diff --git a/winsup/w32api/lib/mshtml-uuid.c b/winsup/w32api/lib/mshtml-uuid.c
deleted file mode 100644
index a2e0d6b21..000000000
--- a/winsup/w32api/lib/mshtml-uuid.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* mshtml-uuid.c */
-/* Generate GUIDs for MSHTML interfaces */
-
-#define INITGUID
-#include <basetyps.h>
-DEFINE_GUID(IID_IHTMLDocument,0x626fc520,0xa41e,0x11cf,0xa7,0x31,0x0,0xa0,0xc9,0x8,0x26,0x37);
-DEFINE_GUID(IID_IHTMLDocument2,0x332c4425,0x26cb,0x11d0,0xb4,0x83,0x0,0xc0,0x4f,0xd9,0x1,0x19);
-DEFINE_GUID(IID_IHTMLElement,0x3050f1ff,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0xb);
-DEFINE_GUID(IID_IHTMLSelectionObject,0x3050f25a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0xb);
-DEFINE_GUID(IID_IHTMLTxtRange,0x3050f220,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLImgElement,0x3050f240,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLBodyElement,0x3050f1d8,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFontElement,0x3050f1d9,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLAnchorElement,0x3050f1da,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLUListElement,0x3050f1dd,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLOListElement,0x3050f1de,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLLIElement,0x3050f1e0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLBRElement,0x3050f1f0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDListElement,0x3050f1f1,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDDElement,0x3050f1f2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDTElement,0x3050f1f3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLHRElement,0x3050f1f4,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLParaElement,0x3050f1f5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLHeaderElement,0x3050f1f6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFormElement,0x3050f1f7,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDivElement,0x3050f200,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLBaseFontElement,0x3050f202,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLMetaElement,0x3050f203,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLBaseElement,0x3050f204,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLLinkElement,0x3050f205,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLIsIndexElement,0x3050f206,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLNextIdElement,0x3050f207,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLBlockElement,0x3050f208,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLUnknownElement,0x3050f209,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLPhraseElement,0x3050f20a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLCommentElement,0x3050f20c,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLListElement,0x3050f20e,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLOptionElement,0x3050f211,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDivPosition,0x3050f212,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDialog,0x3050f216,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTextElement,0x3050f218,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTable,0x3050f21e,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLElementCollection,0x3050f21f,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTextContainer,0x3050f230,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTableCol,0x3050f23a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTableSection,0x3050f23b,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTableRow,0x3050f23c,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTableCell,0x3050f23d,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLSelectElement,0x3050f244,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLObjectElement,0x3050f24f,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLStyle,0x3050f25e,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLEmbedElement,0x3050f25f,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLAreaElement,0x3050f265,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLMapElement,0x3050f266,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLScriptElement,0x3050f28b,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLControlRange,0x3050f29c,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLInputHiddenElement,0x3050f2a4,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLInputTextElement,0x3050f2a6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTextAreaElement,0x3050f2aa,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLInputFileElement,0x3050f2ad,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLInputButtonElement,0x3050f2b2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLMarqueeElement,0x3050f2b5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLButtonElement,0x3050f2bb,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLOptionButtonElement,0x3050f2bc,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLInputImage,0x3050f2c2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLStyleSheet,0x3050f2e3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLStyleSheetRulesCollection,0x3050f2e5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTableCaption,0x3050f2eb,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFrameBase,0x3050f311,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFrameElement,0x3050f313,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLIFrameElement,0x3050f315,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFrameSetElement,0x3050f319,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTitleElement,0x3050f322,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLLabelElement,0x3050f32a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLEventObj,0x3050f32d,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLStyleSheetRule,0x3050f357,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLScreen,0x3050f35c,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLBGsound,0x3050f369,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLStyleElement,0x3050f375,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFontNamesCollection,0x3050f376,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFontSizesCollection,0x3050f377,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLOptionsHolder,0x3050f378,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLStyleSheetsCollection,0x3050f37e,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLAreasCollection,0x3050f383,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLNoShowElement,0x3050f38a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLOptionElementFactory,0x3050f38c,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLImageElementFactory,0x3050f38e,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLRuleStyle,0x3050f3cf,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLStyleFontFace,0x3050f3d5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLCurrentStyle,0x3050f3db,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLSpanFlow,0x3050f3e5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFieldSetElement,0x3050f3e7,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLLegendElement,0x3050f3ea,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFiltersCollection,0x3050f3ee,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDatabinding,0x3050f3f2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLSpanElement,0x3050f3f3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLMimeTypesCollection,0x3050f3fc,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLPluginsCollection,0x3050f3fd,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLOpsProfile,0x3050f401,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTextRangeMetrics,0x3050f40b,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTableRowMetrics,0x3050f413,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLElement2,0x3050f434,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDocument3,0x3050f485,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLEventObj2,0x3050f48b,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLUserDataOM,0x3050f48f,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTableRow2,0x3050f4a1,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLStyle2,0x3050f4a2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLRect,0x3050f4a3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLRectCollection,0x3050f4a4,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTextRangeMetrics2,0x3050f4a6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLRuleStyle2,0x3050f4ac,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTable2,0x3050f4ad,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLWindow3,0x3050f4ae,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDOMAttribute,0x3050f4b0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDOMTextNode,0x3050f4b1,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDataTransfer,0x3050f4b3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLGenericElement,0x3050f4b7,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLPersistDataOM,0x3050f4c0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLAttributeCollection,0x3050f4c3,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLPersistData,0x3050f4c5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLObjectElement2,0x3050f4cd,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLBookmarkCollection,0x3050f4ce,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLUniqueName,0x3050f4d0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLLinkElement2,0x3050f4e5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLIFrameElement2,0x3050f4e6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLControlElement,0x3050f4e9,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFormElement2,0x3050f4f6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDOMChildrenCollection,0x3050f5ab,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLBodyElement2,0x3050f5c5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFrameSetElement2,0x3050f5c6,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLTableSection2,0x3050f5c7,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLAppBehavior2,0x3050f5c9,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLAppBehavior,0x3050f5ca,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLInputElement,0x3050f5d2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDOMNode,0x3050f5da,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDialog2,0x3050f5e0,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLUrnCollection,0x3050f5e2,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLModelessInit,0x3050f5e4,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLDocumentFragment,0x3050f5e5,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLAreasCollection2,0x3050f5ec,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLSelectElement2,0x3050f5ed,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLElementCollection2,0x3050f5ee,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
-DEFINE_GUID(IID_IHTMLFramesCollection2,0x332c4426,0x26cb,0x11d0,0xb4,0x83,0x0,0xc0,0x4f,0xd9,0x01,0x19);
-DEFINE_GUID(IID_IHTMLWindow2,0x332c4427,0x26cb,0x11d0,0xb4,0x83,0x0,0xc0,0x4f,0xd9,0x01,0x19);
-DEFINE_GUID(IID_IHTMLLocation,0x163bb1e0,0x6e00,0x11cf,0x83,0x7a,0x48,0xdc,0x04,0xc1,0x0,0x0);
diff --git a/winsup/w32api/lib/msimg32.def b/winsup/w32api/lib/msimg32.def
deleted file mode 100644
index 4f722a15b..000000000
--- a/winsup/w32api/lib/msimg32.def
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY MSIMG32.DLL
-EXPORTS
-AlphaBlend@44
-GradientFill@24
-TransparentBlt@44
diff --git a/winsup/w32api/lib/msvcp60.def b/winsup/w32api/lib/msvcp60.def
deleted file mode 100644
index f6a5dc93f..000000000
--- a/winsup/w32api/lib/msvcp60.def
+++ /dev/null
@@ -1,71 +0,0 @@
-;Submitted by: Danny Smith <danny_r_smith_2001@yahoo.co.nz>
-;Only the C functions are listed.  Most of these have been commented out since
-;I don't know what they are and can't test them.  Some look like data exports
-;for C++ math functions (E.G.: _Xbig).
-LIBRARY MSVCP60.DLL
-EXPORTS
-;_Cosh
-;_Denorm
-;_Dnorm
-;_Dscale
-;_Dtest
-;_Eps
-;_Exp
-;_FCosh
-;_FDenorm
-;_FDnorm
-;_FDscale
-;_FDtest
-;_FEps
-;_FExp
-;_FInf
-;_FNan
-;_FRteps
-;_FSinh
-;_FSnan
-;_FXbig
-;_Getcoll
-;_Getctype
-;_Getcvt
-;_Hugeval
-;_Inf
-;_LCosh
-;_LDenorm
-;_LDscale
-;_LDtest
-;_LEps
-;_LExp
-;_LInf
-;_LNan
-;_LPoly
-;_LRteps
-;_LSinh
-;_LSnan
-;_LXbig
-;_Mbrtowc
-;_Nan
-;_Poly
-;_Rteps
-;_Sinh
-;_Snan
-;_Stod
-;_Stof
-;_Stold
-;_Strcoll
-;_Strxfrm
-;_Tolower
-;_Toupper
-;_Wcrtomb
-;__Wcrtomb_lk
-;_Xbig
-
-btowc
-mbrlen
-mbrtowc
-mbsrtowcs
-towctrans
-wcrtomb
-wcsrtombs
-wctob
-wctrans
-wctype
\ No newline at end of file
diff --git a/winsup/w32api/lib/msvfw32.def b/winsup/w32api/lib/msvfw32.def
deleted file mode 100644
index 7428c6e35..000000000
--- a/winsup/w32api/lib/msvfw32.def
+++ /dev/null
@@ -1,49 +0,0 @@
-LIBRARY MSVFW32.DLL
-EXPORTS
-VideoForWindowsVersion@0
-StretchDIB@48
-MCIWndRegisterClass
-MCIWndCreateW
-MCIWndCreateA
-MCIWndCreate
-ICSeqCompressFrameStart@8
-ICSeqCompressFrameEnd@4
-ICSeqCompressFrame@20
-ICSendMessage@16
-ICRemove@12
-ICOpenFunction@16
-ICOpen@12
-ICMThunk32@20
-ICLocate@20
-ICInstall@20
-ICInfo@12
-ICImageDecompress@20
-ICImageCompress@28
-ICGetInfo@12
-ICGetDisplayFormat@24
-ICDrawBegin
-ICDraw
-ICDecompress
-ICCompressorFree@4
-ICCompressorChoose@24
-ICCompress
-ICClose@4
-GetSaveFileNamePreviewW@4
-GetSaveFileNamePreviewA@4
-GetOpenFileNamePreviewW@4
-GetOpenFileNamePreviewA@4
-GetOpenFileNamePreview@4
-DrawDibTime@8
-DrawDibStop@4
-DrawDibStart@8
-DrawDibSetPalette@8
-DrawDibRealize@12
-DrawDibProfileDisplay@4
-DrawDibOpen@0
-DrawDibGetPalette@4
-DrawDibGetBuffer@16
-DrawDibEnd@4
-DrawDibDraw@52
-DrawDibClose@4
-DrawDibChangePalette@16
-DrawDibBegin@32
diff --git a/winsup/w32api/lib/mswsock.def b/winsup/w32api/lib/mswsock.def
deleted file mode 100644
index 3e74f87a1..000000000
--- a/winsup/w32api/lib/mswsock.def
+++ /dev/null
@@ -1,28 +0,0 @@
-LIBRARY MSWSOCK.DLL
-EXPORTS
-AcceptEx@32
-EnumProtocolsA@12
-EnumProtocolsW@12
-GetAcceptExSockaddrs@32
-GetAddressByNameA@40
-GetAddressByNameW@40
-GetNameByTypeA@12
-GetNameByTypeW@12
-GetServiceA@28
-GetServiceW@28
-GetTypeByNameA@8
-GetTypeByNameW@8
-MigrateWinsockConfiguration@12
-NPLoadNameSpaces@12
-SetServiceA@24
-SetServiceW@24
-TransmitFile@28
-WSARecvEx@16
-dn_expand@20
-getnetbyname@4
-inet_network@4
-rcmd@24
-rexec@24
-rresvport@4
-s_perror@8
-sethostname@8
diff --git a/winsup/w32api/lib/nddeapi.def b/winsup/w32api/lib/nddeapi.def
deleted file mode 100644
index 4016baf53..000000000
--- a/winsup/w32api/lib/nddeapi.def
+++ /dev/null
@@ -1,30 +0,0 @@
-LIBRARY NDDEAPI.DLL
-EXPORTS
-NDdeGetErrorStringA@12
-NDdeGetErrorStringW@12
-NDdeGetShareSecurityA@24
-NDdeGetShareSecurityW@24
-NDdeGetTrustedShareA@20
-NDdeGetTrustedShareW@20
-NDdeIsValidAppTopicListA@4
-NDdeIsValidAppTopicListW@4
-NDdeIsValidShareNameA@4
-NDdeIsValidShareNameW@4
-NDdeSetShareSecurityA@16
-NDdeSetShareSecurityW@16
-NDdeSetTrustedShareA@12
-NDdeSetTrustedShareW@12
-NDdeShareAddA@20
-NDdeShareAddW@20
-NDdeShareDelA@12
-NDdeShareDelW@12
-NDdeShareEnumA@24
-NDdeShareEnumW@24
-NDdeShareGetInfoA@28
-NDdeShareGetInfoW@28
-NDdeShareSetInfoA@24
-NDdeShareSetInfoW@24
-NDdeSpecialCommandA@24
-NDdeSpecialCommandW@24
-NDdeTrustedShareEnumA@24
-NDdeTrustedShareEnumW@24
diff --git a/winsup/w32api/lib/netapi32.def b/winsup/w32api/lib/netapi32.def
deleted file mode 100644
index e8d0ef438..000000000
--- a/winsup/w32api/lib/netapi32.def
+++ /dev/null
@@ -1,247 +0,0 @@
-LIBRARY NETAPI32.DLL
-EXPORTS
-I_BrowserDebugCall@12
-I_BrowserDebugTrace@8
-I_BrowserQueryOtherDomains@16
-I_BrowserQueryStatistics@8
-I_BrowserResetNetlogonState@4
-I_BrowserResetStatistics@4
-I_BrowserServerEnum@44
-I_BrowserSetNetlogonState@16
-I_NetAccountDeltas@48
-I_NetAccountSync@48
-I_NetDatabaseDeltas@32
-I_NetDatabaseRedo@28
-I_NetDatabaseSync2@36
-I_NetDatabaseSync@32
-I_NetGetDCList@16
-I_NetListCanonicalize@36
-I_NetListTraverse@12
-I_NetLogonControl2@20
-I_NetLogonControl@16
-I_NetLogonSamLogoff@24
-I_NetLogonSamLogon@36
-I_NetLogonUasLogoff@12
-I_NetLogonUasLogon@12
-I_NetNameCanonicalize@24
-I_NetNameCompare@20
-I_NetNameValidate@16
-I_NetPathCanonicalize@28
-I_NetPathCompare@20
-I_NetPathType@16
-I_NetServerAuthenticate2@28
-I_NetServerAuthenticate@24
-I_NetServerPasswordSet@28
-I_NetServerReqChallenge@16
-I_NetServerSetServiceBits@16
-NetAlertRaise@12
-NetAlertRaiseEx@16
-NetApiBufferAllocate@8
-NetApiBufferFree@4
-NetApiBufferReallocate@12
-NetApiBufferSize@8
-NetAuditClear@12
-NetAuditRead@44
-NetAuditWrite@20
-NetBrowserStatisticsGet@12
-NetConfigGet@16
-NetConfigGetAll@12
-NetConfigSet@28
-NetConnectionEnum@32
-NetErrorLogClear@12
-NetErrorLogRead@44
-NetErrorLogWrite@32
-NetFileClose@8
-NetFileEnum@36
-NetFileGetInfo@16
-NetGetAnyDCName@12
-NetGetDCName@12
-NetGetDisplayInformationIndex@16
-NetGroupAdd@16
-NetGroupAddUser@12
-NetGroupDel@8
-NetGroupDelUser@12
-NetGroupEnum@28
-NetGroupGetInfo@16
-NetGroupGetUsers@32
-NetGroupSetInfo@20
-NetGroupSetUsers@20
-NetLocalGroupAdd@16
-NetLocalGroupAddMember@12
-NetLocalGroupAddMembers@20
-NetLocalGroupDel@8
-NetLocalGroupDelMember@12
-NetLocalGroupDelMembers@20
-NetLocalGroupEnum@28
-NetLocalGroupGetInfo@16
-NetLocalGroupGetMembers@32
-NetLocalGroupSetInfo@20
-NetLocalGroupSetMembers@20
-NetMessageBufferSend@20
-NetMessageNameAdd@8
-NetMessageNameDel@8
-NetMessageNameEnum@28
-NetMessageNameGetInfo@16
-NetQueryDisplayInformation@28
-NetRemoteComputerSupports@12
-NetRemoteTOD@8
-NetReplExportDirAdd@16
-NetReplExportDirDel@8
-NetReplExportDirEnum@28
-NetReplExportDirGetInfo@16
-NetReplExportDirLock@8
-NetReplExportDirSetInfo@20
-NetReplExportDirUnlock@12
-NetReplGetInfo@12
-NetReplImportDirAdd@16
-NetReplImportDirDel@8
-NetReplImportDirEnum@28
-NetReplImportDirGetInfo@16
-NetReplImportDirLock@8
-NetReplImportDirUnlock@12
-NetReplSetInfo@16
-NetRplAdapterAdd@16
-NetRplAdapterDel@8
-NetRplAdapterEnum@28
-NetRplBootAdd@16
-NetRplBootDel@12
-NetRplBootEnum@28
-NetRplClose@4
-NetRplConfigAdd@16
-NetRplConfigDel@8
-NetRplConfigEnum@32
-NetRplGetInfo@12
-NetRplOpen@8
-NetRplProfileAdd@16
-NetRplProfileClone@16
-NetRplProfileDel@8
-NetRplProfileEnum@32
-NetRplProfileGetInfo@16
-NetRplProfileSetInfo@20
-NetRplSetInfo@16
-NetRplSetSecurity@16
-NetRplVendorAdd@16
-NetRplVendorDel@8
-NetRplVendorEnum@28
-NetRplWkstaAdd@16
-NetRplWkstaClone@24
-NetRplWkstaDel@8
-NetRplWkstaEnum@32
-NetRplWkstaGetInfo@16
-NetRplWkstaSetInfo@20
-NetScheduleJobAdd@12
-NetScheduleJobDel@12
-NetScheduleJobEnum@24
-NetScheduleJobGetInfo@12
-NetServerDiskEnum@28
-NetServerEnum@36
-NetServerGetInfo@12
-NetServerSetInfo@16
-NetServerTransportAdd@12
-NetServerTransportDel@12
-NetServerTransportEnum@28
-NetServiceControl@20
-NetServiceEnum@28
-NetServiceGetInfo@16
-NetServiceInstall@20
-NetSessionDel@12
-NetSessionEnum@36
-NetSessionGetInfo@20
-NetShareAdd@16
-NetShareCheck@12
-NetShareDel@12
-NetShareDelSticky@12
-NetShareEnum@28
-NetShareEnumSticky@28
-NetShareGetInfo@16
-NetShareSetInfo@20
-NetStatisticsGet@20
-NetUseAdd@16
-NetUseDel@12
-NetUseEnum@28
-NetUseGetInfo@16
-NetUserAdd@16
-NetUserChangePassword@16
-NetUserDel@8
-NetUserEnum@32
-NetUserGetGroups@28
-NetUserGetInfo@16
-NetUserGetLocalGroups@32
-NetUserModalsGet@12
-NetUserModalsSet@16
-NetUserSetGroups@20
-NetUserSetInfo@20
-NetWkstaGetInfo@12
-NetWkstaSetInfo@16
-NetWkstaTransportAdd@16
-NetWkstaTransportDel@12
-NetWkstaTransportEnum@28
-NetWkstaUserEnum@28
-NetWkstaUserGetInfo@12
-NetWkstaUserSetInfo@16
-NetapipBufferAllocate@8
-Netbios@4
-NetpAccessCheckAndAudit@20
-NetpAllocConfigName@16
-NetpAllocStrFromWStr@4
-NetpAllocWStrFromStr@4
-NetpAllocWStrFromWStr@4
-NetpApiStatusToNtStatus@4
-NetpAssertFailed@16
-NetpCloseConfigData@4
-NetpCopyStringToBuffer@20
-NetpCreateSecurityObject@24
-NetpDbgDisplayServerInfo@8
-NetpDbgPrint
-NetpDeleteSecurityObject@4
-NetpGetComputerName@4
-NetpGetConfigBool@16
-NetpGetConfigDword@16
-NetpGetConfigTStrArray@12
-NetpGetConfigValue@12
-NetpGetDomainName@4
-NetpGetFileSecurity@16
-NetpGetPrivilege@8
-NetpHexDump@8
-NetpInitOemString@8
-NetpIsRemote@16
-NetpIsUncComputerNameValid@4
-NetpLocalTimeZoneOffset@0
-NetpLogonPutUnicodeString@12
-NetpNetBiosAddName@12
-NetpNetBiosCall@16
-NetpNetBiosDelName@8
-NetpNetBiosGetAdapterNumbers@8
-NetpNetBiosHangup@8
-NetpNetBiosReceive@24
-NetpNetBiosReset@4
-NetpNetBiosSend@16
-NetpNetBiosStatusToApiStatus@4
-NetpNtStatusToApiStatus@4
-NetpOpenConfigData@16
-NetpPackString@12
-NetpReleasePrivilege@0
-NetpSetConfigBool@12
-NetpSetConfigDword@12
-NetpSetConfigTStrArray@12
-NetpSetFileSecurity@12
-NetpSmbCheck@20
-NetpStringToNetBiosName@16
-NetpTStrArrayEntryCount@4
-NetpwNameCanonicalize@20
-NetpwNameCompare@16
-NetpwNameValidate@12
-NetpwPathCanonicalize@24
-NetpwPathCompare@16
-NetpwPathType@12
-NlBindingAddServerToCache@4
-NlBindingRemoveServerFromCache@4
-RxNetAccessAdd@16
-RxNetAccessDel@8
-RxNetAccessEnum@36
-RxNetAccessGetInfo@16
-RxNetAccessGetUserPerms@16
-RxNetAccessSetInfo@20
-RxNetServerEnum@40
-RxNetUserPasswordSet@16
-RxRemoteApi
diff --git a/winsup/w32api/lib/ntdll.def b/winsup/w32api/lib/ntdll.def
deleted file mode 100644
index d87cf392d..000000000
--- a/winsup/w32api/lib/ntdll.def
+++ /dev/null
@@ -1,1017 +0,0 @@
-;note that the Zw... functions are alternate names for the
-;Nt... functions.  (see www.sysinternals.com for details)
-;if you change a Nt.. function DON'T FORGET to change the
-;Zw one too.
-
-LIBRARY ntdll.dll
-EXPORTS
-CsrAllocateCaptureBuffer@8
-CsrAllocateMessagePointer@12
-CsrCaptureMessageBuffer@16
-CsrCaptureMessageString@20
-CsrCaptureTimeout@8
-CsrClientCallServer@16
-CsrClientConnectToServer@24
-CsrFreeCaptureBuffer@4
-CsrIdentifyAlertableThread@0
-CsrNewThread@0
-CsrProbeForRead@12
-CsrProbeForWrite@12
-CsrSetPriorityClass@8
-DbgBreakPoint@0
-DbgPrint
-DbgPrintReturnControlC
-DbgPrompt@12
-DbgSsHandleKmApiMsg@8
-DbgSsInitialize@16
-DbgUiConnectToDbg@0
-DbgUiContinue@8
-DbgUiWaitStateChange@8
-DbgUserBreakPoint@0
-KiRaiseUserExceptionDispatcher@0
-KiUserApcDispatcher@20
-KiUserCallbackDispatcher@12
-KiUserExceptionDispatcher@8
-LdrAccessResource@16
-LdrAlternateResourcesEnabled@0
-LdrDisableThreadCalloutsForDll@4
-LdrEnumResources@20
-LdrFindEntryForAddress@8
-LdrFindResourceDirectory_U@16
-LdrFindResource_U@16
-LdrFlushAlternateResourceModules@0
-LdrGetDllHandle@16
-LdrGetProcedureAddress@16
-LdrInitializeThunk@16
-LdrLoadAlternateResourceModule@8
-LdrLoadDll@16
-LdrProcessRelocationBlock@16
-LdrQueryImageFileExecutionOptions@24
-LdrQueryProcessModuleInformation@12
-LdrShutdownProcess@0
-LdrShutdownThread@0
-LdrUnloadAlternateResourceModule@4
-LdrUnloadDll@4
-LdrVerifyImageMatchesChecksum@16
-NlsAnsiCodePage
-NlsMbCodePageTag
-NlsMbOemCodePageTag
-NtAcceptConnectPort@24
-NtAccessCheck@32
-NtAccessCheckAndAuditAlarm@44
-NtAccessCheckByType@44
-NtAccessCheckByTypeAndAuditAlarm@64
-NtAccessCheckByTypeResultList@44
-NtAccessCheckByTypeResultListAndAuditAlarm@64
-NtAccessCheckByTypeResultListAndAuditAlarmByHandle@68
-NtAddAtom@12
-NtAdjustGroupsToken@24
-NtAdjustPrivilegesToken@24
-NtAlertResumeThread@8
-NtAlertThread@4
-NtAllocateLocallyUniqueId@4
-NtAllocateUserPhysicalPages@12
-NtAllocateUuids@16
-NtAllocateVirtualMemory@24
-NtAreMappedFilesTheSame@8
-NtAssignProcessToJobObject@8
-NtCallbackReturn@12
-NtCancelDeviceWakeupRequest@4
-NtCancelIoFile@8
-NtCancelTimer@8
-NtClearEvent@4
-NtClose@4
-NtCloseObjectAuditAlarm@12
-NtCompleteConnectPort@4
-NtConnectPort@32
-NtContinue@8
-NtCreateDirectoryObject@12
-NtCreateEvent@20
-NtCreateEventPair@12
-NtCreateFile@44
-NtCreateIoCompletion@16
-NtCreateJobObject@12
-NtCreateKey@28
-NtCreateMailslotFile@32
-NtCreateMutant@16
-NtCreateNamedPipeFile@56
-NtCreatePagingFile@16
-NtCreatePort@20
-NtCreateProcess@32
-NtCreateProfile@36
-NtCreateSection@28
-NtCreateSemaphore@20
-NtCreateSymbolicLinkObject@16
-NtCreateThread@32
-NtCreateTimer@16
-NtCreateToken@52
-NtCreateWaitablePort@20
-NtDelayExecution@8
-NtDeleteAtom@4
-NtDeleteFile@4
-NtDeleteKey@4
-NtDeleteObjectAuditAlarm@12
-NtDeleteValueKey@8
-NtDeviceIoControlFile@40
-NtDisplayString@4
-NtDuplicateObject@28
-NtDuplicateToken@24
-NtEnumerateKey@24
-NtEnumerateValueKey@24
-NtExtendSection@8
-NtFilterToken@24
-NtFindAtom@12
-NtFlushBuffersFile@8
-NtFlushInstructionCache@12
-NtFlushKey@4
-NtFlushVirtualMemory@16
-NtFlushWriteBuffer@0
-NtFreeUserPhysicalPages@12
-NtFreeVirtualMemory@16
-NtFsControlFile@40
-NtGetContextThread@8
-NtGetDevicePowerState@8
-NtGetPlugPlayEvent@16
-NtGetTickCount@0
-NtGetWriteWatch@28
-NtImpersonateAnonymousToken@8
-NtImpersonateClientOfPort@8
-NtImpersonateThread@12
-NtInitializeRegistry@4
-NtInitiatePowerAction@16
-NtIsSystemResumeAutomatic@0
-NtListenPort@8
-NtLoadDriver@4
-NtLoadKey@8
-NtLoadKey2@12
-NtLockFile@40
-NtLockVirtualMemory@16
-NtMakeTemporaryObject@4
-NtMapUserPhysicalPages@12
-NtMapUserPhysicalPagesScatter@12
-NtMapViewOfSection@40
-NtNotifyChangeDirectoryFile@36
-NtNotifyChangeKey@40
-NtNotifyChangeMultipleKeys@48
-NtOpenDirectoryObject@12
-NtOpenEvent@12
-NtOpenEventPair@12
-NtOpenFile@24
-NtOpenIoCompletion@12
-NtOpenJobObject@12
-NtOpenKey@12
-NtOpenMutant@12
-NtOpenObjectAuditAlarm@48
-NtOpenProcess@16
-NtOpenProcessToken@12
-NtOpenSection@12
-NtOpenSemaphore@12
-NtOpenSymbolicLinkObject@12
-NtOpenThread@16
-NtOpenThreadToken@16
-NtOpenTimer@12
-NtPowerInformation@20
-NtPrivilegeCheck@12
-NtPrivilegedServiceAuditAlarm@20
-NtPrivilegeObjectAuditAlarm@24
-NtProtectVirtualMemory@20
-NtPulseEvent@8
-NtQueryAttributesFile@8
-NtQueryDefaultLocale@8
-NtQueryDefaultUILanguage@4
-NtQueryDirectoryFile@44
-NtQueryDirectoryObject@28
-NtQueryEaFile@36
-NtQueryEvent@20
-NtQueryFullAttributesFile@8
-NtQueryInformationAtom@20
-NtQueryInformationFile@20
-NtQueryInformationJobObject@20
-NtQueryInformationPort@20
-NtQueryInformationProcess@20
-NtQueryInformationThread@20
-NtQueryInformationToken@20
-NtQueryIntervalProfile@8
-NtQueryIoCompletion@20
-NtQueryKey@20
-NtQueryMultipleValueKey@24
-NtQueryMutant@20
-NtQueryObject@20
-NtQueryOpenSubKeys@8
-NtQueryPerformanceCounter@8
-NtQueryQuotaInformationFile@36
-NtQuerySection@20
-NtQuerySecurityObject@20
-NtQuerySemaphore@20
-NtQuerySymbolicLinkObject@12
-NtQuerySystemEnvironmentValue@16
-NtQuerySystemInformation@16
-NtQuerySystemTime@4
-NtQueryTimer@20
-NtQueryTimerResolution@12
-NtQueryValueKey@24
-NtQueryVirtualMemory@24
-NtQueryVolumeInformationFile@20
-NtQueueApcThread@20
-NtRaiseException@12
-NtRaiseHardError@24
-NtReadFile@36
-NtReadFileScatter@36
-NtReadRequestData@24
-NtReadVirtualMemory@20
-NtRegisterThreadTerminatePort@4
-NtReleaseMutant@8
-NtReleaseSemaphore@12
-NtRemoveIoCompletion@20
-NtReplaceKey@12
-NtReplyPort@8
-NtReplyWaitReceivePort@16
-NtReplyWaitReceivePortEx@20
-NtReplyWaitReplyPort@8
-NtRequestDeviceWakeup@4
-NtRequestPort@8
-NtRequestWaitReplyPort@12
-NtRequestWakeupLatency@4
-NtResetEvent@8
-NtResetWriteWatch@12
-NtRestoreKey@12
-NtResumeThread@8
-NtSaveKey@8
-NtSaveMergedKeys@12
-NtSecureConnectPort@36
-NtSetContextThread@8
-NtSetDefaultHardErrorPort@4
-NtSetDefaultLocale@8
-NtSetDefaultUILanguage@4
-NtSetEaFile@16
-NtSetEvent@8
-NtSetHighEventPair@4
-NtSetHighWaitLowEventPair@4
-NtSetInformationFile@20
-NtSetInformationJobObject@16
-NtSetInformationKey@16
-NtSetInformationObject@16
-NtSetInformationProcess@16
-NtSetInformationThread@16
-NtSetInformationToken@16
-NtSetIntervalProfile@8
-NtSetIoCompletion@20
-NtSetLdtEntries@16
-NtSetLowEventPair@4
-NtSetLowWaitHighEventPair@4
-NtSetQuotaInformationFile@16
-NtSetSecurityObject@12
-NtSetSystemEnvironmentValue@8
-NtSetSystemInformation@12
-NtSetSystemPowerState@12
-NtSetSystemTime@8
-NtSetThreadExecutionState@8
-NtSetTimer@28
-NtSetTimerResolution@12
-NtSetUuidSeed@4
-NtSetValueKey@24
-NtSetVolumeInformationFile@20
-NtShutdownSystem@4
-NtSignalAndWaitForSingleObject@16
-NtStartProfile@4
-NtStopProfile@4
-NtSuspendThread@8
-NtSystemDebugControl@24
-NtTerminateJobObject@8
-NtTerminateProcess@8
-NtTerminateThread@8
-NtTestAlert@0
-NtUnloadDriver@4
-NtUnloadKey@4
-NtUnlockFile@20
-NtUnlockVirtualMemory@16
-NtUnmapViewOfSection@8
-NtVdmControl@8
-NtWaitForMultipleObjects@20
-NtWaitForSingleObject@12
-NtWaitHighEventPair@4
-NtWaitLowEventPair@4
-NtWriteFile@36
-NtWriteFileGather@36
-NtWriteRequestData@24
-NtWriteVirtualMemory@20
-NtYieldExecution@0
-RtlAbortRXact@4
-RtlAbsoluteToSelfRelativeSD@12
-RtlAcquirePebLock@0
-RtlAcquireResourceExclusive@8
-RtlAcquireResourceShared@8
-RtlAddAccessAllowedAce@16
-RtlAddAccessAllowedAceEx@20
-RtlAddAccessAllowedObjectAce@28
-RtlAddAccessDeniedAce@16
-RtlAddAccessDeniedAceEx@20
-RtlAddAccessDeniedObjectAce@28
-RtlAddAce@20
-RtlAddActionToRXact@24
-RtlAddAtomToAtomTable@12
-RtlAddAttributeActionToRXact@32
-RtlAddAuditAccessAce@24
-RtlAddAuditAccessAceEx@28
-RtlAddAuditAccessObjectAce@36
-RtlAddCompoundAce@24
-RtlAddRange@36
-RtlAdjustPrivilege@16
-RtlAllocateAndInitializeSid@44
-RtlAllocateHandle@8
-RtlAllocateHeap@12
-RtlAnsiCharToUnicodeChar@4
-RtlAnsiStringToUnicodeSize@4
-RtlAnsiStringToUnicodeString@12
-RtlAppendAsciizToString@8
-RtlAppendStringToString@8
-RtlAppendUnicodeStringToString@8
-RtlAppendUnicodeToString@8
-RtlApplyRXact@4
-RtlApplyRXactNoFlush@4
-RtlAreAllAccessesGranted@8
-RtlAreAnyAccessesGranted@8
-RtlAreBitsClear@12
-RtlAreBitsSet@12
-RtlAssert@16
-RtlCallbackLpcClient@12
-RtlCancelTimer@8
-RtlCaptureStackBackTrace@16
-RtlCharToInteger@12
-RtlCheckForOrphanedCriticalSections@4
-RtlCheckRegistryKey@8
-RtlClearAllBits@4
-RtlClearBits@12
-RtlCompactHeap@8
-RtlCompareMemory@12
-RtlCompareMemoryUlong@12
-RtlCompareString@12
-RtlCompareUnicodeString@12
-RtlCompressBuffer@32
-RtlConsoleMultiByteToUnicodeN@24
-RtlConvertExclusiveToShared@4
-RtlConvertSharedToExclusive@4
-RtlConvertSidToUnicodeString@12
-RtlConvertToAutoInheritSecurityObject@24
-RtlConvertUiListToApiList@12
-RtlConvertUlongToLargeInteger@4
-RtlConvertVariantToProperty@28
-RtlCopyLuid@8
-RtlCopyLuidAndAttributesArray@12
-RtlCopyRangeList@8
-RtlCopySecurityDescriptor@8
-RtlCopySid@12
-RtlCopySidAndAttributesArray@28
-RtlCopyString@8
-RtlCopyUnicodeString@8
-RtlCreateAcl@12
-RtlCreateAndSetSD@20
-RtlCreateAtomTable@8
-RtlCreateEnvironment@8
-RtlCreateHeap@24
-RtlCreateLpcServer@24
-RtlCreateProcessParameters@40
-RtlCreateQueryDebugBuffer@8
-RtlCreateRegistryKey@8
-RtlCreateSecurityDescriptor@8
-RtlCreateTagHeap@16
-RtlCreateTimer@28
-RtlCreateTimerQueue@4
-RtlCreateUnicodeString@8
-RtlCreateUnicodeStringFromAsciiz@8
-RtlCreateUserProcess@40
-RtlCreateUserThread@40
-RtlCustomCPToUnicodeN@24
-RtlCutoverTimeToSystemTime@16
-RtlDebugPrintTimes@0
-RtlDecompressBuffer@24
-RtlDecompressFragment@32
-RtlDefaultNpAcl@4
-RtlDelete@4
-RtlDeleteAce@8
-RtlDeleteAtomFromAtomTable@8
-RtlDeleteCriticalSection@4
-RtlDeleteElementGenericTable@8
-RtlDeleteNoSplay@8
-RtlDeleteOwnersRanges@8
-RtlDeleteRange@24
-RtlDeleteResource@4
-RtlDeleteSecurityObject@4
-RtlDeleteTimer@12
-RtlDeleteTimerQueue@4
-RtlDeleteTimerQueueEx@8
-RtlDeNormalizeProcessParams@4
-RtlDeregisterWait@4
-RtlDeregisterWaitEx@8
-RtlDestroyAtomTable@4
-RtlDestroyEnvironment@4
-RtlDestroyHandleTable@4
-RtlDestroyHeap@4
-RtlDestroyProcessParameters@4
-RtlDestroyQueryDebugBuffer@4
-RtlDetermineDosPathNameType_U@4
-RtlDoesFileExists_U@4
-RtlDosPathNameToNtPathName_U@16
-RtlDosSearchPath_U@24
-RtlDowncaseUnicodeString@12
-RtlEmptyAtomTable@8
-RtlEnableEarlyCriticalSectionEventCreation@0
-RtlEnlargedIntegerMultiply@8
-RtlEnlargedUnsignedDivide@16
-RtlEnlargedUnsignedMultiply@8
-RtlEnterCriticalSection@4
-RtlEnumerateGenericTable@8
-RtlEnumerateGenericTableWithoutSplaying@8
-RtlEnumProcessHeaps@8
-RtlEqualComputerName@8
-RtlEqualDomainName@8
-RtlEqualLuid@8
-RtlEqualPrefixSid@8
-RtlEqualSid@8
-RtlEqualString@12
-RtlEqualUnicodeString@12
-RtlEraseUnicodeString@4
-RtlExpandEnvironmentStrings_U@16
-RtlExtendedLargeIntegerDivide@16
-RtlExtendedMagicDivide@20
-RtlExtendHeap@16
-RtlFillMemory@12
-RtlFillMemoryUlong@12
-RtlFindClearBits@12
-RtlFindClearBitsAndSet@12
-RtlFindLeastSignificantBit@8
-RtlFindLongestRunClear@8
-RtlFindLongestRunSet@8
-RtlFindMessage@20
-RtlFindMostSignificantBit@8
-RtlFindNextForwardRunClear@12
-RtlFindRange@48
-RtlFindSetBits@12
-RtlFindSetBitsAndClear@12
-RtlFirstFreeAce@8
-RtlFormatCurrentUserKeyPath@4
-RtlFormatMessage@36
-RtlFreeAnsiString@4
-RtlFreeHandle@8
-RtlFreeHeap@12
-RtlFreeOemString@4
-RtlFreeSid@4
-RtlFreeUnicodeString@4
-RtlFreeUserThreadStack@8
-RtlGenerate8dot3Name@16
-RtlGetAce@12
-RtlGetCallersAddress@8
-RtlGetCompressionWorkSpaceSize@12
-RtlGetControlSecurityDescriptor@12
-RtlGetCurrentDirectory_U@8
-RtlGetDaclSecurityDescriptor@16
-RtlGetElementGenericTable@8
-RtlGetFirstRange@12
-RtlGetFullPathName_U@16
-RtlGetGroupSecurityDescriptor@12
-RtlGetLongestNtPathLength@0
-RtlGetNextRange@12
-RtlGetNtGlobalFlags@0
-RtlGetNtProductType@4
-RtlGetOwnerSecurityDescriptor@12
-RtlGetProcessHeaps@8
-RtlGetSaclSecurityDescriptor@16
-RtlGetSecurityDescriptorRMControl@8
-RtlGetUserInfoHeap@20
-RtlGetVersion@4
-RtlGUIDFromString@8
-RtlIdentifierAuthoritySid@4
-RtlImageDirectoryEntryToData@16
-RtlImageNtHeader@4
-RtlImageRvaToSection@12
-RtlImageRvaToVa@16
-RtlImpersonateLpcClient@8
-RtlImpersonateSelf@4
-RtlInitAnsiString@8
-RtlInitCodePageTable@8
-RtlInitNlsTables@16
-RtlInitString@8
-RtlInitUnicodeString@8
-RtlInitializeAtomPackage@4
-RtlInitializeBitMap@12
-RtlInitializeContext@20
-RtlInitializeCriticalSection@4
-RtlInitializeCriticalSectionAndSpinCount@8
-RtlInitializeGenericTable@20
-RtlInitializeHandleTable@12
-RtlInitializeRXact@12
-RtlInitializeRangeList@4
-RtlInitializeResource@4
-RtlInitializeSid@12
-RtlInsertElementGenericTable@16
-RtlIntegerToChar@16
-RtlIntegerToUnicodeString@12
-RtlInvertRangeList@8
-RtlIsDosDeviceName_U@4
-RtlIsNameLegalDOS8Dot3@12
-RtlIsRangeAvailable@40
-RtlIsTextUnicode@12
-RtlIsValidHandle@8
-RtlIsValidIndexHandle@12
-RtlLargeIntegerAdd@16
-RtlLargeIntegerArithmeticShift@12
-RtlLargeIntegerDivide@20
-RtlLargeIntegerNegate@8
-RtlLargeIntegerShiftLeft@12
-RtlLargeIntegerShiftRight@12
-RtlLargeIntegerSubtract@16
-RtlLargeIntegerToChar@16
-RtlLeaveCriticalSection@4
-RtlLengthRequiredSid@4
-RtlLengthSecurityDescriptor@4
-RtlLengthSid@4
-RtlLocalTimeToSystemTime@8
-RtlLockHeap@4
-RtlLookupAtomInAtomTable@12
-RtlLookupElementGenericTable@8
-RtlMakeSelfRelativeSD@12
-RtlMapGenericMask@8
-RtlMergeRangeLists@16
-RtlMoveMemory@12
-RtlMultiByteToUnicodeN@20
-RtlMultiByteToUnicodeSize@12
-RtlNewInstanceSecurityObject@40
-RtlNewSecurityGrantedAccess@24
-RtlNewSecurityObject@24
-RtlNewSecurityObjectEx@32
-RtlNormalizeProcessParams@4
-RtlNtStatusToDosError@4
-RtlNumberGenericTableElements@4
-RtlNumberOfClearBits@4
-RtlNumberOfSetBits@4
-RtlOemStringToUnicodeSize@4
-RtlOemStringToUnicodeString@12
-RtlOemToUnicodeN@12
-RtlOpenCurrentUser@8
-RtlPcToFileHeader@8
-RtlPinAtomInAtomTable@8
-RtlPrefixString@12
-RtlPrefixUnicodeString@12
-RtlProtectHeap@8
-RtlQueryAtomInAtomTable@24
-RtlQueryEnvironmentVariable_U@12
-RtlQueryInformationAcl@16
-RtlQueryProcessBackTraceInformation@4
-RtlQueryProcessDebugInformation@12
-RtlQueryProcessHeapInformation@4
-RtlQueryProcessLockInformation@4
-RtlQueryRegistryValues@20
-RtlQuerySecurityObject@20
-RtlQueryTagHeap@20
-RtlQueryTimeZoneInformation@4
-RtlQueueWorkItem@12
-RtlRaiseException@4
-RtlRaiseStatus@4
-RtlReAllocateHeap@16
-RtlRealPredecessor@4
-RtlRegisterWait@24
-RtlReleasePebLock@0
-RtlReleaseResource@4
-RtlRemoteCall@28
-RtlResetRtlTranslations@4
-RtlRunDecodeUnicodeString@8
-RtlRunEncodeUnicodeString@8
-RtlSecondsSince1970ToTime@8
-RtlSecondsSince1980ToTime@8
-RtlSelfRelativeToAbsoluteSD2@8
-RtlSelfRelativeToAbsoluteSD@44
-RtlSetAllBits@4
-RtlSetAttributesSecurityDescriptor@12
-RtlSetBits@12
-RtlSetControlSecurityDescriptor@12
-RtlSetCriticalSectionSpinCount@8
-RtlSetCurrentDirectory_U@4
-RtlSetCurrentEnvironment@8
-RtlSetDaclSecurityDescriptor@16
-RtlSetEnvironmentVariable@12
-RtlSetGroupSecurityDescriptor@12
-RtlSetInformationAcl@16
-RtlSetIoCompletionCallback@12
-RtlSetOwnerSecurityDescriptor@12
-RtlSetSaclSecurityDescriptor@16
-RtlSetSecurityDescriptorRMControl@8
-RtlSetSecurityObject@20
-RtlSetSecurityObjectEx@24
-RtlSetThreadPoolStartFunc@8
-RtlSetTimeZoneInformation@4
-RtlSetTimer@28
-RtlSetUnicodeCallouts@4
-RtlSetUserFlagsHeap@20
-RtlSetUserValueHeap@16
-RtlShutdownLpcServer@4
-RtlSizeHeap@12
-RtlSplay@4
-RtlStartRXact@4
-RtlStringFromGUID@8
-RtlSubAuthorityCountSid@4
-RtlSubAuthoritySid@8
-RtlSubtreePredecessor@4
-RtlSubtreeSuccessor@4
-RtlSystemTimeToLocalTime@8
-RtlTimeFieldsToTime@8
-RtlTimeToElapsedTimeFields@8
-RtlTimeToSecondsSince1970@8
-RtlTimeToSecondsSince1980@8
-RtlTimeToTimeFields@8
-RtlTraceDatabaseAdd@16
-RtlTraceDatabaseCreate@20
-RtlTraceDatabaseDestroy@4
-RtlTraceDatabaseEnumerate@12
-RtlTraceDatabaseFind@16
-RtlTraceDatabaseLock@4
-RtlTraceDatabaseUnlock@4
-RtlTraceDatabaseValidate@4
-RtlTryEnterCriticalSection@4
-RtlUlongByteSwap@4
-RtlUlonglongByteSwap@4
-RtlUnicodeStringToAnsiSize@4
-RtlUnicodeStringToAnsiString@12
-RtlUnicodeStringToCountedOemString@12
-RtlUnicodeStringToInteger@12
-RtlUnicodeStringToOemSize@4
-RtlUnicodeStringToOemString@12
-RtlUnicodeToMultiByteN@20
-RtlUnicodeToMultiByteSize@12
-RtlUnicodeToOemN@20
-RtlUniform@4
-RtlUnlockHeap@4
-RtlUnwind@16
-RtlUpcaseUnicodeChar@4
-RtlUpcaseUnicodeString@12
-RtlUpcaseUnicodeStringToAnsiString@12
-RtlUpcaseUnicodeStringToCountedOemString@12
-RtlUpcaseUnicodeStringToOemString@12
-RtlUpcaseUnicodeToCustomCPN@24
-RtlUpcaseUnicodeToMultiByteN@20
-RtlUpcaseUnicodeToOemN@20
-RtlUpdateTimer@16
-RtlUpperChar@4
-RtlUpperString@12
-RtlUsageHeap@12
-RtlUshortByteSwap@4
-RtlValidAcl@4
-RtlValidRelativeSecurityDescriptor@12
-RtlValidSecurityDescriptor@4
-RtlValidSid@4
-RtlValidateHeap@12
-RtlValidateProcessHeaps@0
-RtlVerifyVersionInfo@16
-RtlWalkFrameChain@12
-RtlWalkHeap@8
-RtlWriteRegistryValue@24
-RtlZeroHeap@8
-RtlZeroMemory@8
-RtlpNtCreateKey@24
-RtlpNtEnumerateSubKey@16
-RtlpNtMakeTemporaryKey@4
-RtlpNtOpenKey@16
-RtlpNtQueryValueKey@20
-RtlpNtSetValueKey@16
-RtlpUnWaitCriticalSection@4
-RtlpWaitForCriticalSection@4
-RtlxAnsiStringToUnicodeSize@4
-RtlxOemStringToUnicodeSize@4
-RtlxUnicodeStringToAnsiSize@4
-RtlxUnicodeStringToOemSize@4
-ZwAcceptConnectPort@24
-ZwAccessCheck@32
-ZwAccessCheckAndAuditAlarm@44
-ZwAccessCheckByType@44
-ZwAccessCheckByTypeAndAuditAlarm@64
-ZwAccessCheckByTypeResultList@44
-ZwAccessCheckByTypeResultListAndAuditAlarm@64
-ZwAccessCheckByTypeResultListAndAuditAlarmByHandle@68
-ZwAddAtom@12
-ZwAdjustGroupsToken@24
-ZwAdjustPrivilegesToken@24
-ZwAlertResumeThread@8
-ZwAlertThread@4
-ZwAllocateLocallyUniqueId@4
-ZwAllocateUserPhysicalPages@12
-ZwAllocateUuids@16
-ZwAllocateVirtualMemory@24
-ZwAreMappedFilesTheSame@8
-ZwAssignProcessToJobObject@8
-ZwCallbackReturn@12
-ZwCancelDeviceWakeupRequest@4
-ZwCancelIoFile@8
-ZwCancelTimer@8
-ZwClearEvent@4
-ZwClose@4
-ZwCloseObjectAuditAlarm@12
-ZwCompleteConnectPort@4
-ZwConnectPort@32
-ZwContinue@8
-ZwCreateDirectoryObject@12
-ZwCreateEvent@20
-ZwCreateEventPair@12
-ZwCreateFile@44
-ZwCreateIoCompletion@16
-ZwCreateJobObject@12
-ZwCreateKey@28
-ZwCreateMailslotFile@32
-ZwCreateMutant@16
-ZwCreateNamedPipeFile@56
-ZwCreatePagingFile@16
-ZwCreatePort@20
-ZwCreateProcess@32
-ZwCreateProfile@36
-ZwCreateSection@28
-ZwCreateSemaphore@20
-ZwCreateSymbolicLinkObject@16
-ZwCreateThread@32
-ZwCreateTimer@16
-ZwCreateToken@52
-ZwCreateWaitablePort@20
-ZwDelayExecution@8
-ZwDeleteAtom@4
-ZwDeleteFile@4
-ZwDeleteKey@4
-ZwDeleteObjectAuditAlarm@12
-ZwDeleteValueKey@8
-ZwDeviceIoControlFile@40
-ZwDisplayString@4
-ZwDuplicateObject@28
-ZwDuplicateToken@24
-ZwEnumerateKey@24
-ZwEnumerateValueKey@24
-ZwExtendSection@8
-ZwFilterToken@24
-ZwFindAtom@12
-ZwFlushBuffersFile@8
-ZwFlushInstructionCache@12
-ZwFlushKey@4
-ZwFlushVirtualMemory@16
-ZwFlushWriteBuffer@0
-ZwFreeUserPhysicalPages@12
-ZwFreeVirtualMemory@16
-ZwFsControlFile@40
-ZwGetContextThread@8
-ZwGetDevicePowerState@8
-ZwGetPlugPlayEvent@16
-ZwGetTickCount@0
-ZwGetWriteWatch@28
-ZwImpersonateAnonymousToken@8
-ZwImpersonateClientOfPort@8
-ZwImpersonateThread@12
-ZwInitializeRegistry@4
-ZwInitiatePowerAction@16
-ZwIsSystemResumeAutomatic@0
-ZwListenPort@8
-ZwLoadDriver@4
-ZwLoadKey@8
-ZwLoadKey2@12
-ZwLockFile@40
-ZwLockVirtualMemory@16
-ZwMakeTemporaryObject@4
-ZwMapUserPhysicalPages@12
-ZwMapUserPhysicalPagesScatter@12
-ZwMapViewOfSection@40
-ZwNotifyChangeDirectoryFile@36
-ZwNotifyChangeKey@40
-ZwNotifyChangeMultipleKeys@48
-ZwOpenDirectoryObject@12
-ZwOpenEvent@12
-ZwOpenEventPair@12
-ZwOpenFile@24
-ZwOpenIoCompletion@12
-ZwOpenJobObject@12
-ZwOpenKey@12
-ZwOpenMutant@12
-ZwOpenObjectAuditAlarm@48
-ZwOpenProcess@16
-ZwOpenProcessToken@12
-ZwOpenSection@12
-ZwOpenSemaphore@12
-ZwOpenSymbolicLinkObject@12
-ZwOpenThread@16
-ZwOpenThreadToken@16
-ZwOpenTimer@12
-ZwPowerInformation@20
-ZwPrivilegeCheck@12
-ZwPrivilegedServiceAuditAlarm@20
-ZwPrivilegeObjectAuditAlarm@24
-ZwProtectVirtualMemory@20
-ZwPulseEvent@8
-ZwQueryAttributesFile@8
-ZwQueryDefaultLocale@8
-ZwQueryDefaultUILanguage@4
-ZwQueryDirectoryFile@44
-ZwQueryDirectoryObject@28
-ZwQueryEaFile@36
-ZwQueryEvent@20
-ZwQueryFullAttributesFile@8
-ZwQueryInformationAtom@20
-ZwQueryInformationFile@20
-ZwQueryInformationJobObject@20
-ZwQueryInformationPort@20
-ZwQueryInformationProcess@20
-ZwQueryInformationThread@20
-ZwQueryInformationToken@20
-ZwQueryIntervalProfile@8
-ZwQueryIoCompletion@20
-ZwQueryKey@20
-ZwQueryMultipleValueKey@24
-ZwQueryMutant@20
-ZwQueryObject@20
-ZwQueryOpenSubKeys@8
-ZwQueryPerformanceCounter@8
-ZwQueryQuotaInformationFile@36
-ZwQuerySection@20
-ZwQuerySecurityObject@20
-ZwQuerySemaphore@20
-ZwQuerySymbolicLinkObject@12
-ZwQuerySystemEnvironmentValue@16
-ZwQuerySystemInformation@16
-ZwQuerySystemTime@4
-ZwQueryTimer@20
-ZwQueryTimerResolution@12
-ZwQueryValueKey@24
-ZwQueryVirtualMemory@24
-ZwQueryVolumeInformationFile@20
-ZwQueueApcThread@20
-ZwRaiseException@12
-ZwRaiseHardError@24
-ZwReadFile@36
-ZwReadFileScatter@36
-ZwReadRequestData@24
-ZwReadVirtualMemory@20
-ZwRegisterThreadTerminatePort@4
-ZwReleaseMutant@8
-ZwReleaseSemaphore@12
-ZwRemoveIoCompletion@20
-ZwReplaceKey@12
-ZwReplyPort@8
-ZwReplyWaitReceivePort@16
-ZwReplyWaitReceivePortEx@20
-ZwReplyWaitReplyPort@8
-ZwRequestDeviceWakeup@4
-ZwRequestPort@8
-ZwRequestWaitReplyPort@12
-ZwRequestWakeupLatency@4
-ZwResetEvent@8
-ZwResetWriteWatch@12
-ZwRestoreKey@12
-ZwResumeThread@8
-ZwSaveKey@8
-ZwSaveMergedKeys@12
-ZwSecureConnectPort@36
-ZwSetContextThread@8
-ZwSetDefaultHardErrorPort@4
-ZwSetDefaultLocale@8
-ZwSetDefaultUILanguage@4
-ZwSetEaFile@16
-ZwSetEvent@8
-ZwSetHighEventPair@4
-ZwSetHighWaitLowEventPair@4
-ZwSetInformationFile@20
-ZwSetInformationJobObject@16
-ZwSetInformationKey@16
-ZwSetInformationObject@16
-ZwSetInformationProcess@16
-ZwSetInformationThread@16
-ZwSetInformationToken@16
-ZwSetIntervalProfile@8
-ZwSetIoCompletion@20
-ZwSetLdtEntries@16
-ZwSetLowEventPair@4
-ZwSetLowWaitHighEventPair@4
-ZwSetQuotaInformationFile@16
-ZwSetSecurityObject@12
-ZwSetSystemEnvironmentValue@8
-ZwSetSystemInformation@12
-ZwSetSystemPowerState@12
-ZwSetSystemTime@8
-ZwSetThreadExecutionState@8
-ZwSetTimer@28
-ZwSetTimerResolution@12
-ZwSetUuidSeed@4
-ZwSetValueKey@24
-ZwSetVolumeInformationFile@20
-ZwShutdownSystem@4
-ZwSignalAndWaitForSingleObject@16
-ZwStartProfile@4
-ZwStopProfile@4
-ZwSuspendThread@8
-ZwSystemDebugControl@24
-ZwTerminateJobObject@8
-ZwTerminateProcess@8
-ZwTerminateThread@8
-ZwTestAlert@0
-ZwUnloadDriver@4
-ZwUnloadKey@4
-ZwUnlockFile@20
-ZwUnlockVirtualMemory@16
-ZwUnmapViewOfSection@8
-ZwVdmControl@8
-ZwWaitForMultipleObjects@20
-ZwWaitForSingleObject@12
-ZwWaitHighEventPair@4
-ZwWaitLowEventPair@4
-ZwWriteFile@36
-ZwWriteFileGather@36
-ZwWriteRequestData@24
-ZwWriteVirtualMemory@20
-ZwYieldExecution@0
-__isascii
-__iscsym
-__iscsymf
-__toascii
-_itoa
-_itow
-_ltoa
-_ltow
-_snprintf
-_snwprintf
-_strcmpi
-_stricmp
-_strlwr
-_strnicmp
-_strupr
-_tolower
-_toupper
-_ultoa
-_ultow
-_vsnprintf
-_wcsicmp
-_wcslwr
-_wcsnicmp
-_wcsupr
-_wtoi
-_wtol
-abs
-atan
-atoi
-atol
-ceil
-cos
-fabs
-floor
-isalnum
-isalpha
-iscntrl
-isdigit
-isgraph
-islower
-isprint
-ispunct
-isspace
-isupper
-iswalpha
-iswctype
-isxdigit
-labs
-log
-mbstowcs
-memchr
-memcmp
-memcpy
-memmove
-memset
-pow
-sin
-sprintf
-sqrt
-strcat
-strchr
-strcmp
-strcpy
-strcspn
-strlen
-strncat
-strncmp
-strncpy
-strpbrk
-strrchr
-strspn
-strstr
-strtol
-strtoul
-swprintf
-tan
-tolower
-toupper
-towlower
-towupper
-vsprintf
-wcscat
-wcschr
-wcscmp
-wcscpy
-wcscspn
-wcslen
-wcsncat
-wcsncmp
-wcsncpy
-wcspbrk
-wcsrchr
-wcsspn
-wcsstr
-wcstol
-wcstombs
-wcstoul
diff --git a/winsup/w32api/lib/odbc32.def b/winsup/w32api/lib/odbc32.def
deleted file mode 100644
index d9205174c..000000000
--- a/winsup/w32api/lib/odbc32.def
+++ /dev/null
@@ -1,185 +0,0 @@
-LIBRARY ODBC32.dll
-EXPORTS
-CloseODBCPerfData@0
-CollectODBCPerfData@16
-CursorLibLockDbc@8
-CursorLibLockDesc@8
-CursorLibLockStmt@8
-CursorLibTransact@12
-LockHandle@12
-MpHeapAlloc
-MpHeapCompact
-MpHeapCreate
-MpHeapDestroy
-MpHeapFree
-MpHeapReAlloc
-MpHeapSize
-MpHeapValidate
-ODBCGetTryWaitValue@0
-ODBCInternalConnectW@36
-ODBCQualifyFileDSNW@4
-ODBCSetTryWaitValue@4
-ODBCSharedPerfMon
-ODBCSharedTraceFlag
-ODBCSharedVSFlag
-OpenODBCPerfData@4
-PostComponentError@4
-PostODBCComponentError@4
-PostODBCError@16
-SQLAllocConnect@8
-SQLAllocEnv@4
-SQLAllocHandle@12
-SQLAllocHandleStd@12
-SQLAllocStmt@8
-SQLBindCol@24
-SQLBindParam@32
-SQLBindParameter@40
-SQLBrowseConnect@24
-SQLBrowseConnectA@24
-SQLBrowseConnectW@24
-SQLBulkOperations@8
-SQLCancel@4
-SQLCloseCursor@4
-SQLColAttribute@28
-SQLColAttributeA@28
-SQLColAttributeW@28
-SQLColAttributes@28
-SQLColAttributesA@28
-SQLColAttributesW@28
-SQLColumnPrivileges@36
-SQLColumnPrivilegesA@36
-SQLColumnPrivilegesW@36
-SQLColumns@36
-SQLColumnsA@36
-SQLColumnsW@36
-SQLConnect@28
-SQLConnectA@28
-SQLConnectW@28
-SQLCopyDesc@8
-SQLDataSources@32
-SQLDataSourcesA@32
-SQLDataSourcesW@32
-SQLDescribeCol@36
-SQLDescribeColA@36
-SQLDescribeColW@36
-SQLDescribeParam@24
-SQLDisconnect@4
-SQLDriverConnect@32
-SQLDriverConnectA@32
-SQLDriverConnectW@32
-SQLDrivers@32
-SQLDriversA@32
-SQLDriversW@32
-SQLEndTran@12
-SQLError@32
-SQLErrorA@32
-SQLErrorW@32
-SQLExecDirect@12
-SQLExecDirectA@12
-SQLExecDirectW@12
-SQLExecute@4
-SQLExtendedFetch@20
-SQLFetch@4
-SQLFetchScroll@12
-SQLForeignKeys@52
-SQLForeignKeysA@52
-SQLForeignKeysW@52
-SQLFreeConnect@4
-SQLFreeEnv@4
-SQLFreeHandle@8
-SQLFreeStmt@8
-SQLGetConnectAttr@20
-SQLGetConnectAttrA@20
-SQLGetConnectAttrW@20
-SQLGetConnectOption@12
-SQLGetConnectOptionA@12
-SQLGetConnectOptionW@12
-SQLGetCursorName@16
-SQLGetCursorNameA@16
-SQLGetCursorNameW@16
-SQLGetData@24
-SQLGetDescField@24
-SQLGetDescFieldA@24
-SQLGetDescFieldW@24
-SQLGetDescRec@44
-SQLGetDescRecA@44
-SQLGetDescRecW@44
-SQLGetDiagField@28
-SQLGetDiagFieldA@28
-SQLGetDiagFieldW@28
-SQLGetDiagRec@32
-SQLGetDiagRecA@32
-SQLGetDiagRecW@32
-SQLGetEnvAttr@20
-SQLGetFunctions@12
-SQLGetInfo@20
-SQLGetInfoA@20
-SQLGetInfoW@20
-SQLGetStmtAttr@20
-SQLGetStmtAttrA@20
-SQLGetStmtAttrW@20
-SQLGetStmtOption@12
-SQLGetTypeInfo@8
-SQLGetTypeInfoA@8
-SQLGetTypeInfoW@8
-SQLMoreResults@4
-SQLNativeSql@24
-SQLNativeSqlA@24
-SQLNativeSqlW@24
-SQLNumParams@8
-SQLNumResultCols@8
-SQLParamData@8
-SQLParamOptions@12
-SQLPrepare@12
-SQLPrepareA@12
-SQLPrepareW@12
-SQLPrimaryKeys@28
-SQLPrimaryKeysA@28
-SQLPrimaryKeysW@28
-SQLProcedureColumns@36
-SQLProcedureColumnsA@36
-SQLProcedureColumnsW@36
-SQLProcedures@28
-SQLProceduresA@28
-SQLProceduresW@28
-SQLPutData@12
-SQLRowCount@8
-SQLSetConnectAttr@16
-SQLSetConnectAttrA@16
-SQLSetConnectAttrW@16
-SQLSetConnectOption@12
-SQLSetConnectOptionA@12
-SQLSetConnectOptionW@12
-SQLSetCursorName@12
-SQLSetCursorNameA@12
-SQLSetCursorNameW@12
-SQLSetDescField@20
-SQLSetDescFieldA@20
-SQLSetDescFieldW@20
-SQLSetDescRec@40
-SQLSetEnvAttr@16
-SQLSetParam@32
-SQLSetPos@16
-SQLSetScrollOptions@16
-SQLSetStmtAttr@16
-SQLSetStmtAttrA@16
-SQLSetStmtAttrW@16
-SQLSetStmtOption@12
-SQLSpecialColumns@40
-SQLSpecialColumnsA@40
-SQLSpecialColumnsW@40
-SQLStatistics@36
-SQLStatisticsA@36
-SQLStatisticsW@36
-SQLTablePrivileges@28
-SQLTablePrivilegesA@28
-SQLTablePrivilegesW@28
-SQLTables@36
-SQLTablesA@36
-SQLTablesW@36
-SQLTransact@12
-SearchStatusCode@8
-VFreeErrors@4
-VRetrieveDriverErrorsRowCol@24
-ValidateErrorQueue@8
-g_hHeapMalloc
diff --git a/winsup/w32api/lib/odbccp32.def b/winsup/w32api/lib/odbccp32.def
deleted file mode 100644
index f8fdfd738..000000000
--- a/winsup/w32api/lib/odbccp32.def
+++ /dev/null
@@ -1,54 +0,0 @@
-LIBRARY ODBCCP32.dll
-EXPORTS
-SQLConfigDataSource@16
-SQLConfigDataSourceW@16
-SQLConfigDriver@28
-SQLConfigDriverW@28
-SQLCreateDataSource@8
-SQLCreateDataSourceW@8
-SQLGetAvailableDrivers@16
-SQLGetAvailableDriversW@16
-SQLGetConfigMode@4
-SQLGetInstalledDrivers@12
-SQLGetInstalledDriversW@12
-SQLGetPrivateProfileString@24
-SQLGetPrivateProfileStringW@24
-SQLGetTranslator@32
-SQLGetTranslatorW@32
-SQLInstallDriver@20
-SQLInstallDriverEx@28
-SQLInstallDriverExW@28
-SQLInstallDriverManager@12
-SQLInstallDriverManagerW@12
-SQLInstallDriverW@20
-SQLInstallODBC@16
-SQLInstallODBCW@16
-SQLInstallTranslator@32
-SQLInstallTranslatorEx@28
-SQLInstallTranslatorExW@28
-SQLInstallTranslatorW@32
-SQLInstallerError@20
-SQLInstallerErrorW@20
-SQLManageDataSources@4
-SQLPostInstallerError@8
-SQLPostInstallerErrorW@8
-SQLReadFileDSN@24
-SQLReadFileDSNW@24
-SQLRemoveDSNFromIni@4
-SQLRemoveDSNFromIniW@4
-SQLRemoveDefaultDataSource@0
-SQLRemoveDriver@12
-SQLRemoveDriverManager@4
-SQLRemoveDriverW@12
-SQLRemoveTranslator@8
-SQLRemoveTranslatorW@8
-SQLSetConfigMode@4
-SQLValidDSN@4
-SQLValidDSNW@4
-SQLWriteDSNToIni@8
-SQLWriteDSNToIniW@8
-SQLWriteFileDSN@16
-SQLWriteFileDSNW@16
-SQLWritePrivateProfileString@16
-SQLWritePrivateProfileStringW@16
-ODBC___GetSetupProc@4
\ No newline at end of file
diff --git a/winsup/w32api/lib/ole32.def b/winsup/w32api/lib/ole32.def
deleted file mode 100644
index ebac6bf7f..000000000
--- a/winsup/w32api/lib/ole32.def
+++ /dev/null
@@ -1,253 +0,0 @@
-LIBRARY OLE32.dll
-EXPORTS
-BindMoniker@16
-CLIPFORMAT_UserFree@8
-CLIPFORMAT_UserMarshal@12
-CLIPFORMAT_UserSize@12
-CLIPFORMAT_UserUnmarshal@12
-CLSIDFromProgID@8
-CLSIDFromString@8
-CoAddRefServerProcess@0
-CoBuildVersion@0
-CoCopyProxy@8
-CoCreateFreeThreadedMarshaler@8
-CoCreateGuid@4
-CoCreateInstance@20
-CoCreateInstanceEx@24
-CoDisconnectObject@8
-CoDosDateTimeToFileTime@12
-CoFileTimeNow@4
-CoFileTimeToDosDateTime@12
-CoFreeAllLibraries@0
-CoFreeLibrary@4
-CoFreeUnusedLibraries@0
-CoGetCallContext@8
-CoGetCallerTID@4
-CoGetClassObject@20
-CoGetCurrentLogicalThreadId@4
-CoGetCurrentProcess@0
-CoGetInstanceFromFile@32
-CoGetInstanceFromIStorage@28
-CoGetInterfaceAndReleaseStream@12
-CoGetMalloc@8
-CoGetMarshalSizeMax@24
-CoGetObject@16
-CoGetPSClsid@8
-CoGetStandardMarshal@24
-CoGetState@4
-CoGetTreatAsClass@8
-CoImpersonateClient@0
-CoInitialize@4
-CoInitializeEx@8
-CoInitializeSecurity@36
-CoInitializeWOW@8
-CoIsHandlerConnected@4
-CoIsOle1Class@4
-CoLoadLibrary@8
-CoLockObjectExternal@12
-CoMarshalHresult@8
-CoMarshalInterThreadInterfaceInStream@12
-CoMarshalInterface@24
-CoQueryAuthenticationServices@8
-CoQueryClientBlanket@28
-CoQueryProxyBlanket@32
-CoQueryReleaseObject@4
-CoRegisterChannelHook@8
-CoRegisterClassObject@20
-CoRegisterMallocSpy@4
-CoRegisterMessageFilter@8
-CoRegisterPSClsid@8
-CoRegisterSurrogate@4
-CoReleaseMarshalData@4
-CoReleaseServerProcess@0
-CoResumeClassObjects@0
-CoRevertToSelf@0
-CoRevokeClassObject@4
-CoRevokeMallocSpy@0
-CoSetProxyBlanket@32
-CoSetState@4
-CoSuspendClassObjects@0
-CoSwitchCallContext@8
-CoTaskMemAlloc@4
-CoTaskMemFree@4
-CoTaskMemRealloc@8
-CoTreatAsClass@8
-CoUninitialize@0
-CoUnloadingWOW@4
-CoUnmarshalHresult@8
-CoUnmarshalInterface@12
-CreateAntiMoniker@4
-CreateBindCtx@8
-CreateClassMoniker@8
-CreateDataAdviseHolder@4
-CreateDataCache@16
-CreateFileMoniker@8
-CreateGenericComposite@12
-CreateILockBytesOnHGlobal@12
-CreateItemMoniker@12
-CreateOleAdviseHolder@4
-CreatePointerMoniker@8
-CreateStreamOnHGlobal@12
-DllDebugObjectRPCHook@8
-DllGetClassObjectWOW@12
-DoDragDrop@16
-EnableHookObject@8
-FreePropVariantArray@8
-GetClassFile@8
-GetConvertStg@4
-GetDocumentBitStg@4
-GetHGlobalFromILockBytes@8
-GetHGlobalFromStream@8
-GetHookInterface@4
-GetRunningObjectTable@8
-HACCEL_UserFree@8
-HACCEL_UserMarshal@12
-HACCEL_UserSize@12
-HACCEL_UserUnmarshal@12
-HBITMAP_UserFree@8
-HBITMAP_UserMarshal@12
-HBITMAP_UserSize@12
-HBITMAP_UserUnmarshal@12
-HBRUSH_UserFree@8
-HBRUSH_UserMarshal@12
-HBRUSH_UserSize@12
-HBRUSH_UserUnmarshal@12
-HENHMETAFILE_UserFree@8
-HENHMETAFILE_UserMarshal@12
-HENHMETAFILE_UserSize@12
-HENHMETAFILE_UserUnmarshal@12
-HGLOBAL_UserFree@8
-HGLOBAL_UserMarshal@12
-HGLOBAL_UserSize@12
-HGLOBAL_UserUnmarshal@12
-HMENU_UserFree@8
-HMENU_UserMarshal@12
-HMENU_UserSize@12
-HMENU_UserUnmarshal@12
-HMETAFILEPICT_UserFree@8
-HMETAFILEPICT_UserMarshal@12
-HMETAFILEPICT_UserSize@12
-HMETAFILEPICT_UserUnmarshal@12
-HMETAFILE_UserFree@8
-HMETAFILE_UserMarshal@12
-HMETAFILE_UserSize@12
-HMETAFILE_UserUnmarshal@12
-HPALETTE_UserFree@8
-HPALETTE_UserMarshal@12
-HPALETTE_UserSize@12
-HPALETTE_UserUnmarshal@12
-HWND_UserFree@8
-HWND_UserMarshal@12
-HWND_UserSize@12
-HWND_UserUnmarshal@12
-IIDFromString@8
-IsAccelerator@16
-IsEqualGUID@8
-IsValidIid@4
-IsValidInterface@4
-IsValidPtrIn@8
-IsValidPtrOut@8
-MkParseDisplayName@16
-MonikerCommonPrefixWith@12
-MonikerRelativePathTo@16
-OleBuildVersion@0
-OleConvertIStorageToOLESTREAM@8
-OleConvertIStorageToOLESTREAMEx@28
-OleConvertOLESTREAMToIStorage@12
-OleConvertOLESTREAMToIStorageEx@28
-OleCreate@28
-OleCreateDefaultHandler@16
-OleCreateEmbeddingHelper@24
-OleCreateEx@48
-OleCreateFromData@28
-OleCreateFromDataEx@48
-OleCreateFromFile@32
-OleCreateFromFileEx@52
-OleCreateLink@28
-OleCreateLinkEx@48
-OleCreateLinkFromData@28
-OleCreateLinkFromDataEx@48
-OleCreateLinkToFile@28
-OleCreateLinkToFileEx@48
-OleCreateMenuDescriptor@8
-OleCreateStaticFromData@28
-OleDestroyMenuDescriptor@4
-OleDoAutoConvert@8
-OleDraw@16
-OleDuplicateData@12
-OleFlushClipboard@0
-OleGetAutoConvert@8
-OleGetClipboard@4
-OleGetIconOfClass@12
-OleGetIconOfFile@8
-OleInitialize@4
-OleInitializeWOW@8
-OleIsCurrentClipboard@4
-OleIsRunning@4
-OleLoad@16
-OleLoadFromStream@12
-OleLockRunning@12
-OleMetafilePictFromIconAndLabel@16
-OleNoteObjectVisible@8
-OleQueryCreateFromData@4
-OleQueryLinkFromData@4
-OleRegEnumFormatEtc@12
-OleRegEnumVerbs@8
-OleRegGetMiscStatus@12
-OleRegGetUserType@12
-OleRun@4
-OleSave@12
-OleSaveToStream@8
-OleSetAutoConvert@8
-OleSetClipboard@4
-OleSetContainedObject@8
-OleSetMenuDescriptor@20
-OleTranslateAccelerator@12
-OleUninitialize@0
-OpenOrCreateStream@12
-ProgIDFromCLSID@8
-PropSysAllocString@4
-PropSysFreeString@4
-PropVariantClear@4
-PropVariantCopy@8
-ReadClassStg@8
-ReadClassStm@8
-ReadFmtUserTypeStg@12
-ReadOleStg@24
-ReadStringStream@8
-RegisterDragDrop@8
-ReleaseStgMedium@4
-RevokeDragDrop@4
-SNB_UserFree@8
-SNB_UserMarshal@12
-SNB_UserSize@12
-SNB_UserUnmarshal@12
-STGMEDIUM_UserFree@8
-STGMEDIUM_UserMarshal@12
-STGMEDIUM_UserSize@12
-STGMEDIUM_UserUnmarshal@12
-SetConvertStg@8
-SetDocumentBitStg@8
-StgCreateDocfile@16
-StgCreateDocfileOnILockBytes@16
-StgGetIFillLockBytesOnFile@8
-StgGetIFillLockBytesOnILockBytes@8
-StgIsStorageFile@4
-StgIsStorageILockBytes@4
-StgOpenAsyncDocfileOnIFillLockBytes@16
-StgOpenStorage@24
-StgOpenStorageOnILockBytes@24
-StgSetTimes@16
-StringFromCLSID@8
-StringFromGUID2@12
-StringFromIID@8
-UpdateDCOMSettings@0
-UtConvertDvtd16toDvtd32@12
-UtConvertDvtd32toDvtd16@12
-UtGetDvtd16Info@8
-UtGetDvtd32Info@8
-WriteClassStg@8
-WriteClassStm@8
-WriteFmtUserTypeStg@12
-WriteOleStg@16
-WriteStringStream@8
diff --git a/winsup/w32api/lib/oleacc.def b/winsup/w32api/lib/oleacc.def
deleted file mode 100644
index c7ea13924..000000000
--- a/winsup/w32api/lib/oleacc.def
+++ /dev/null
@@ -1,17 +0,0 @@
-LIBRARY Oleacc.dll
-EXPORTS
-AccessibleChildren@20
-AccessibleObjectFromEvent@20
-AccessibleObjectFromPoint@16
-AccessibleObjectFromWindow@16
-CreateStdAccessibleObject@16
-CreateStdAccessibleProxyA@20
-CreateStdAccessibleProxyW@20
-GetOleaccVersionInfo@8
-GetRoleTextA@12
-GetRoleTextW@12
-GetStateTextA@12
-GetStateTextW@12
-LresultFromObject@12
-ObjectFromLresult@16
-WindowFromAccessibleObject@8
diff --git a/winsup/w32api/lib/oleaut32.def b/winsup/w32api/lib/oleaut32.def
deleted file mode 100644
index fed406574..000000000
--- a/winsup/w32api/lib/oleaut32.def
+++ /dev/null
@@ -1,355 +0,0 @@
-LIBRARY OLEAUT32.DLL
-EXPORTS
-BSTR_UserFree@8
-BSTR_UserMarshal@12
-BSTR_UserSize@12
-BSTR_UserUnmarshal@12
-BstrFromVector@8
-ClearCustData@4
-CreateDispTypeInfo@12
-CreateErrorInfo@4
-CreateStdDispatch@16
-CreateTypeLib@12
-CreateTypeLib2@12
-DispCallFunc@32
-DispGetIDsOfNames@16
-DispGetParam@20
-DispInvoke@32
-DosDateTimeToVariantTime@12
-GetActiveObject@12
-GetAltMonthNames@8
-GetErrorInfo@8
-GetRecordInfoFromGuids@24
-GetRecordInfoFromTypeInfo@8
-LHashValOfNameSys@12
-LHashValOfNameSysA@12
-LoadRegTypeLib@20
-LoadTypeLib@8
-LoadTypeLibEx@12
-LPSAFEARRAY_Marshal@16
-LPSAFEARRAY_Size@16
-LPSAFEARRAY_Unmarshal@16
-LPSAFEARRAY_UserFree@8
-LPSAFEARRAY_UserMarshal@12
-LPSAFEARRAY_UserSize@12
-LPSAFEARRAY_UserUnmarshal@12
-OaBuildVersion@0
-OleCreateFontIndirect@12
-OleCreatePictureIndirect@16
-OleCreatePropertyFrame@44
-OleCreatePropertyFrameIndirect@4
-OleIconToCursor@8
-OleLoadPicture@20
-OleLoadPictureEx@32
-OleLoadPictureFile@20
-OleLoadPictureFileEx@32
-OleLoadPicturePath@24
-OleSavePictureFile@8
-OleTranslateColor@12
-QueryPathOfRegTypeLib@20
-RegisterActiveObject@16
-RegisterTypeLib@12
-RevokeActiveObject@8
-SafeArrayAccessData@8
-SafeArrayAllocData@4
-SafeArrayAllocDescriptor@8
-SafeArrayAllocDescriptorEx@12
-SafeArrayCopy@8
-SafeArrayCopyData@8
-SafeArrayCreate@12
-SafeArrayCreateEx@16
-SafeArrayCreateVector@12
-SafeArrayCreateVectorEx@16
-SafeArrayDestroy@4
-SafeArrayDestroyData@4
-SafeArrayDestroyDescriptor@4
-SafeArrayGetDim@4
-SafeArrayGetElement@12
-SafeArrayGetElemsize@4
-SafeArrayGetIID@8
-SafeArrayGetLBound@12
-SafeArrayGetRecordInfo@8
-SafeArrayGetUBound@12
-SafeArrayGetVartype@8
-SafeArrayLock@4
-SafeArrayPtrOfIndex@12
-SafeArrayPutElement@12
-SafeArrayRedim@8
-SafeArraySetIID@8
-SafeArraySetRecordInfo@8
-SafeArrayUnaccessData@4
-SafeArrayUnlock@4
-SetErrorInfo@8
-SysAllocString@4
-SysAllocStringByteLen@8
-SysAllocStringLen@8
-SysFreeString@4
-SysReAllocString@8
-SysReAllocStringLen@12
-SysStringByteLen@4
-SysStringLen@4
-SystemTimeToVariantTime@8
-UnRegisterTypeLib@20
-UserBSTR_free_inst@4
-UserBSTR_free_local@4
-UserBSTR_from_local@8
-UserBSTR_to_local@8
-UserEXCEPINFO_free_inst@4
-UserEXCEPINFO_free_local@4
-UserEXCEPINFO_from_local@8
-UserEXCEPINFO_to_local@8
-UserHWND_free_inst@4
-UserHWND_free_local@4
-UserHWND_from_local@8
-UserHWND_to_local@8
-UserMSG_free_inst@4
-UserMSG_free_local@4
-UserMSG_from_local@8
-UserMSG_to_local@8
-UserVARIANT_free_inst@4
-UserVARIANT_free_local@4
-UserVARIANT_from_local@8
-UserVARIANT_to_local@8
-VarAbs@8
-VarAdd@12
-VarAnd@12
-VarBoolFromCy@12
-VarBoolFromDate@12
-VarBoolFromDec@8
-VarBoolFromDisp@12
-VarBoolFromI1@8
-VarBoolFromI2@8
-VarBoolFromI4@8
-VarBoolFromR4@8
-VarBoolFromR8@12
-VarBoolFromStr@16
-VarBoolFromUI1@8
-VarBoolFromUI2@8
-VarBoolFromUI4@8
-VarBstrCat@12
-VarBstrCmp@16
-VarBstrFromBool@16
-VarBstrFromCy@20
-VarBstrFromDate@20
-VarBstrFromDec@16
-VarBstrFromDisp@16
-VarBstrFromI1@16
-VarBstrFromI2@16
-VarBstrFromI4@16
-VarBstrFromR4@16
-VarBstrFromR8@20
-VarBstrFromUI1@16
-VarBstrFromUI2@16
-VarBstrFromUI4@16
-VarCat@12
-VarCmp@16
-VarCyAbs@12
-VarCyAdd@20
-VarCyCmp@16
-VarCyCmpR8@16
-VarCyFix@12
-VarCyFromBool@8
-VarCyFromDate@12
-VarCyFromDec@8
-VarCyFromDisp@12
-VarCyFromI1@8
-VarCyFromI2@8
-VarCyFromI4@8
-VarCyFromR4@8
-VarCyFromR8@12
-VarCyFromStr@16
-VarCyFromUI1@8
-VarCyFromUI2@8
-VarCyFromUI4@8
-VarCyInt@12
-VarCyMul@20
-VarCyMulI4@16
-VarCyNeg@12
-VarCyRound@16
-VarCySub@20
-VarDateFromBool@8
-VarDateFromCy@12
-VarDateFromDec@8
-VarDateFromDisp@12
-VarDateFromI1@8
-VarDateFromI2@8
-VarDateFromI4@8
-VarDateFromR4@8
-VarDateFromR8@12
-VarDateFromStr@16
-VarDateFromUdate@12
-VarDateFromUdateEx@16
-VarDateFromUI1@8
-VarDateFromUI2@8
-VarDateFromUI4@8
-VarDecAbs@8
-VarDecAdd@12
-VarDecCmp@8
-VarDecCmpR8@12
-VarDecDiv@12
-VarDecFix@8
-VarDecFromBool@8
-VarDecFromCy@12
-VarDecFromDate@12
-VarDecFromDisp@12
-VarDecFromI1@8
-VarDecFromI2@8
-VarDecFromI4@8
-VarDecFromR4@8
-VarDecFromR8@12
-VarDecFromStr@16
-VarDecFromUI1@8
-VarDecFromUI2@8
-VarDecFromUI4@8
-VarDecInt@8
-VarDecMul@12
-VarDecNeg@8
-VarDecRound@12
-VarDecSub@12
-VarDiv@12
-VarEqv@12
-VarFix@8
-VarFormat@24
-VarFormatCurrency@28
-VarFormatDateTime@16
-VarFormatFromTokens@24
-VarFormatNumber@28
-VarFormatPercent@28
-VarI1FromBool@8
-VarI1FromCy@12
-VarI1FromDate@12
-VarI1FromDec@8
-VarI1FromDisp@12
-VarI1FromI2@8
-VarI1FromI4@8
-VarI1FromR4@8
-VarI1FromR8@12
-VarI1FromStr@16
-VarI1FromUI1@8
-VarI1FromUI2@8
-VarI1FromUI4@8
-VarI2FromBool@8
-VarI2FromCy@12
-VarI2FromDate@12
-VarI2FromDec@8
-VarI2FromDisp@12
-VarI2FromI1@8
-VarI2FromI4@8
-VarI2FromR4@8
-VarI2FromR8@12
-VarI2FromStr@16
-VarI2FromUI1@8
-VarI2FromUI2@8
-VarI2FromUI4@8
-VarI4FromBool@8
-VarI4FromCy@12
-VarI4FromDate@12
-VarI4FromDec@8
-VarI4FromDisp@12
-VarI4FromI1@8
-VarI4FromI2@8
-VarI4FromR4@8
-VarI4FromR8@12
-VarI4FromStr@16
-VarI4FromUI1@8
-VarI4FromUI2@8
-VarI4FromUI4@8
-VARIANT_UserFree@8
-VARIANT_UserMarshal@12
-VARIANT_UserSize@12
-VARIANT_UserUnmarshal@12
-VariantChangeType@16
-VariantChangeTypeEx@20
-VariantClear@4
-VariantCopy@8
-VariantCopyInd@8
-VariantInit@4
-VariantTimeToDosDateTime@16
-VariantTimeToSystemTime@12
-VarIdiv@12
-VarImp@12
-VarInt@8
-VarMod@12
-VarMonthName@16
-VarMul@12
-VarNeg@8
-VarNot@8
-VarNumFromParseNum@16
-VarOr@12
-VarParseNumFromStr@20
-VarPow@12
-VarR4CmpR8@12
-VarR4FromBool@8
-VarR4FromCy@12
-VarR4FromDate@12
-VarR4FromDec@8
-VarR4FromDisp@12
-VarR4FromI1@8
-VarR4FromI2@8
-VarR4FromI4@8
-VarR4FromR8@12
-VarR4FromStr@16
-VarR4FromUI1@8
-VarR4FromUI2@8
-VarR4FromUI4@8
-VarR8FromBool@8
-VarR8FromCy@12
-VarR8FromDate@12
-VarR8FromDec@8
-VarR8FromDisp@12
-VarR8FromI1@8
-VarR8FromI2@8
-VarR8FromI4@8
-VarR8FromR4@8
-VarR8FromStr@16
-VarR8FromUI1@8
-VarR8FromUI2@8
-VarR8FromUI4@8
-VarR8Pow@20
-VarR8Round@16
-VarRound@12
-VarSub@12
-VarTokenizeFormatString@28
-VarUdateFromDate@16
-VarUI1FromBool@8
-VarUI1FromCy@12
-VarUI1FromDate@12
-VarUI1FromDec@8
-VarUI1FromDisp@12
-VarUI1FromI1@8
-VarUI1FromI2@8
-VarUI1FromI4@8
-VarUI1FromR4@8
-VarUI1FromR8@12
-VarUI1FromStr@16
-VarUI1FromUI2@8
-VarUI1FromUI4@8
-VarUI2FromBool@8
-VarUI2FromCy@12
-VarUI2FromDate@12
-VarUI2FromDec@8
-VarUI2FromDisp@12
-VarUI2FromI1@8
-VarUI2FromI2@8
-VarUI2FromI4@8
-VarUI2FromR4@8
-VarUI2FromR8@12
-VarUI2FromStr@16
-VarUI2FromUI1@8
-VarUI2FromUI4@8
-VarUI4FromBool@8
-VarUI4FromCy@12
-VarUI4FromDate@12
-VarUI4FromDec@8
-VarUI4FromDisp@12
-VarUI4FromI1@8
-VarUI4FromI2@8
-VarUI4FromI4@8
-VarUI4FromR4@8
-VarUI4FromR8@12
-VarUI4FromStr@16
-VarUI4FromUI1@8
-VarUI4FromUI2@8
-VarWeekdayName@20
-VarXor@12
-VectorFromBstr@8
diff --git a/winsup/w32api/lib/olecli32.def b/winsup/w32api/lib/olecli32.def
deleted file mode 100644
index f02f35e00..000000000
--- a/winsup/w32api/lib/olecli32.def
+++ /dev/null
@@ -1,57 +0,0 @@
-LIBRARY OLECLI32.DLL
-EXPORTS
-OleActivate@24
-OleClone@20
-OleClose@4
-OleCopyFromLink@24
-OleCopyToClipboard@4
-OleCreate@32
-OleCreateFromClip@28
-OleCreateFromFile@36
-OleCreateFromTemplate@32
-OleCreateInvisible@36
-OleCreateLinkFromClip@28
-OleCreateLinkFromFile@40
-OleDelete@4
-OleDraw@20
-OleEnumFormats@8
-OleEnumObjects@8
-OleEqual@8
-OleExecute@12
-OleGetData@12
-OleGetLinkUpdateOptions@8
-OleIsDcMeta@4
-OleLoadFromStream@24
-OleLockServer@8
-OleObjectConvert@24
-OleQueryBounds@8
-OleQueryClientVersion@0
-OleQueryCreateFromClip@12
-OleQueryLinkFromClip@12
-OleQueryName@12
-OleQueryOpen@4
-OleQueryOutOfDate@4
-OleQueryProtocol@8
-OleQueryReleaseError@4
-OleQueryReleaseMethod@4
-OleQueryReleaseStatus@4
-OleQuerySize@8
-OleQueryType@8
-OleReconnect@4
-OleRegisterClientDoc@16
-OleRelease@4
-OleRename@8
-OleRenameClientDoc@8
-OleRequestData@8
-OleRevertClientDoc@4
-OleRevokeClientDoc@4
-OleSaveToStream@8
-OleSavedClientDoc@4
-OleSetBounds@8
-OleSetColorScheme@8
-OleSetData@12
-OleSetHostNames@12
-OleSetLinkUpdateOptions@8
-OleSetTargetDevice@8
-OleUnlockServer@4
-OleUpdate@4
diff --git a/winsup/w32api/lib/oledlg.def b/winsup/w32api/lib/oledlg.def
deleted file mode 100644
index 6ae8ace10..000000000
--- a/winsup/w32api/lib/oledlg.def
+++ /dev/null
@@ -1,25 +0,0 @@
-LIBRARY OLEDLG.DLL
-EXPORTS
-OleUIAddVerbMenuA@36
-OleUIAddVerbMenuW@36
-OleUIBusyA@4
-OleUIBusyW@4
-OleUICanConvertOrActivateAs@12
-OleUIChangeIconA@4
-OleUIChangeIconW@4
-OleUIChangeSourceA@4
-OleUIChangeSourceW@4
-OleUIConvertA@4
-OleUIConvertW@4
-OleUIEditLinksA@4
-OleUIEditLinksW@4
-OleUIInsertObjectA@4
-OleUIInsertObjectW@4
-OleUIObjectPropertiesA@4
-OleUIObjectPropertiesW@4
-OleUIPasteSpecialA@4
-OleUIPasteSpecialW@4
-OleUIPromptUserA
-OleUIPromptUserW
-OleUIUpdateLinksA@16
-OleUIUpdateLinksW@16
diff --git a/winsup/w32api/lib/olepro32.def b/winsup/w32api/lib/olepro32.def
deleted file mode 100644
index ebfbbc588..000000000
--- a/winsup/w32api/lib/olepro32.def
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBRARY OLEPRO32.DLL
-EXPORTS
-OleCreateFontIndirect@12
-OleCreatePictureIndirect@16
-OleCreatePropertyFrame@44
-OleCreatePropertyFrameIndirect@4
-OleIconToCursor@8
-OleLoadPicture@20
-OleTranslateColor@12
diff --git a/winsup/w32api/lib/olesvr32.def b/winsup/w32api/lib/olesvr32.def
deleted file mode 100644
index 04d5ba699..000000000
--- a/winsup/w32api/lib/olesvr32.def
+++ /dev/null
@@ -1,13 +0,0 @@
-LIBRARY OLESVR32.DLL
-EXPORTS
-OleBlockServer@4
-OleQueryServerVersion@0
-OleRegisterServer@20
-OleRegisterServerDoc@16
-OleRenameServerDoc@8
-OleRevertServerDoc@4
-OleRevokeObject@4
-OleRevokeServer@4
-OleRevokeServerDoc@4
-OleSavedServerDoc@4
-OleUnblockServer@8
diff --git a/winsup/w32api/lib/opengl32.def b/winsup/w32api/lib/opengl32.def
deleted file mode 100644
index e612a5753..000000000
--- a/winsup/w32api/lib/opengl32.def
+++ /dev/null
@@ -1,369 +0,0 @@
-LIBRARY OPENGL32.DLL
-EXPORTS
-GlmfBeginGlsBlock@4
-GlmfCloseMetaFile@4
-GlmfEndGlsBlock@4
-GlmfEndPlayback@4
-GlmfInitPlayback@12
-GlmfPlayGlsRecord@16
-glAccum@8
-glAlphaFunc@8
-glAreTexturesResident@12
-glArrayElement@4
-glBegin@4
-glBindTexture@8
-glBitmap@28
-glBlendFunc@8
-glCallList@4
-glCallLists@12
-glClear@4
-glClearAccum@16
-glClearColor@16
-glClearDepth@8
-glClearIndex@4
-glClearStencil@4
-glClipPlane@8
-glColor3b@12
-glColor3bv@4
-glColor3d@24
-glColor3dv@4
-glColor3f@12
-glColor3fv@4
-glColor3i@12
-glColor3iv@4
-glColor3s@12
-glColor3sv@4
-glColor3ub@12
-glColor3ubv@4
-glColor3ui@12
-glColor3uiv@4
-glColor3us@12
-glColor3usv@4
-glColor4b@16
-glColor4bv@4
-glColor4d@32
-glColor4dv@4
-glColor4f@16
-glColor4fv@4
-glColor4i@16
-glColor4iv@4
-glColor4s@16
-glColor4sv@4
-glColor4ub@16
-glColor4ubv@4
-glColor4ui@16
-glColor4uiv@4
-glColor4us@16
-glColor4usv@4
-glColorMask@16
-glColorMaterial@8
-glColorPointer@16
-glCopyPixels@20
-glCopyTexImage1D@28
-glCopyTexImage2D@32
-glCopyTexSubImage1D@24
-glCopyTexSubImage2D@32
-glCullFace@4
-glDebugEntry@8
-glDeleteLists@8
-glDeleteTextures@8
-glDepthFunc@4
-glDepthMask@4
-glDepthRange@16
-glDisable@4
-glDisableClientState@4
-glDrawArrays@12
-glDrawBuffer@4
-glDrawElements@16
-glDrawPixels@20
-glEdgeFlag@4
-glEdgeFlagPointer@8
-glEdgeFlagv@4
-glEnable@4
-glEnableClientState@4
-glEnd@0
-glEndList@0
-glEvalCoord1d@8
-glEvalCoord1dv@4
-glEvalCoord1f@4
-glEvalCoord1fv@4
-glEvalCoord2d@16
-glEvalCoord2dv@4
-glEvalCoord2f@8
-glEvalCoord2fv@4
-glEvalMesh1@12
-glEvalMesh2@20
-glEvalPoint1@4
-glEvalPoint2@8
-glFeedbackBuffer@12
-glFinish@0
-glFlush@0
-glFogf@8
-glFogfv@8
-glFogi@8
-glFogiv@8
-glFrontFace@4
-glFrustum@48
-glGenLists@4
-glGenTextures@8
-glGetBooleanv@8
-glGetClipPlane@8
-glGetDoublev@8
-glGetError@0
-glGetFloatv@8
-glGetIntegerv@8
-glGetLightfv@12
-glGetLightiv@12
-glGetMapdv@12
-glGetMapfv@12
-glGetMapiv@12
-glGetMaterialfv@12
-glGetMaterialiv@12
-glGetPixelMapfv@8
-glGetPixelMapuiv@8
-glGetPixelMapusv@8
-glGetPointerv@8
-glGetPolygonStipple@4
-glGetString@4
-glGetTexEnvfv@12
-glGetTexEnviv@12
-glGetTexGendv@12
-glGetTexGenfv@12
-glGetTexGeniv@12
-glGetTexImage@20
-glGetTexLevelParameterfv@16
-glGetTexLevelParameteriv@16
-glGetTexParameterfv@12
-glGetTexParameteriv@12
-glHint@8
-glIndexMask@4
-glIndexPointer@12
-glIndexd@8
-glIndexdv@4
-glIndexf@4
-glIndexfv@4
-glIndexi@4
-glIndexiv@4
-glIndexs@4
-glIndexsv@4
-glIndexub@4
-glIndexubv@4
-glInitNames@0
-glInterleavedArrays@12
-glIsEnabled@4
-glIsList@4
-glIsTexture@4
-glLightModelf@8
-glLightModelfv@8
-glLightModeli@8
-glLightModeliv@8
-glLightf@12
-glLightfv@12
-glLighti@12
-glLightiv@12
-glLineStipple@8
-glLineWidth@4
-glListBase@4
-glLoadIdentity@0
-glLoadMatrixd@4
-glLoadMatrixf@4
-glLoadName@4
-glLogicOp@4
-glMap1d@32
-glMap1f@24
-glMap2d@56
-glMap2f@40
-glMapGrid1d@20
-glMapGrid1f@12
-glMapGrid2d@40
-glMapGrid2f@24
-glMaterialf@12
-glMaterialfv@12
-glMateriali@12
-glMaterialiv@12
-glMatrixMode@4
-glMultMatrixd@4
-glMultMatrixf@4
-glNewList@8
-glNormal3b@12
-glNormal3bv@4
-glNormal3d@24
-glNormal3dv@4
-glNormal3f@12
-glNormal3fv@4
-glNormal3i@12
-glNormal3iv@4
-glNormal3s@12
-glNormal3sv@4
-glNormalPointer@12
-glOrtho@48
-glPassThrough@4
-glPixelMapfv@12
-glPixelMapuiv@12
-glPixelMapusv@12
-glPixelStoref@8
-glPixelStorei@8
-glPixelTransferf@8
-glPixelTransferi@8
-glPixelZoom@8
-glPointSize@4
-glPolygonMode@8
-glPolygonOffset@8
-glPolygonStipple@4
-glPopAttrib@0
-glPopClientAttrib@0
-glPopMatrix@0
-glPopName@0
-glPrioritizeTextures@12
-glPushAttrib@4
-glPushClientAttrib@4
-glPushMatrix@0
-glPushName@4
-glRasterPos2d@16
-glRasterPos2dv@4
-glRasterPos2f@8
-glRasterPos2fv@4
-glRasterPos2i@8
-glRasterPos2iv@4
-glRasterPos2s@8
-glRasterPos2sv@4
-glRasterPos3d@24
-glRasterPos3dv@4
-glRasterPos3f@12
-glRasterPos3fv@4
-glRasterPos3i@12
-glRasterPos3iv@4
-glRasterPos3s@12
-glRasterPos3sv@4
-glRasterPos4d@32
-glRasterPos4dv@4
-glRasterPos4f@16
-glRasterPos4fv@4
-glRasterPos4i@16
-glRasterPos4iv@4
-glRasterPos4s@16
-glRasterPos4sv@4
-glReadBuffer@4
-glReadPixels@28
-glRectd@32
-glRectdv@8
-glRectf@16
-glRectfv@8
-glRecti@16
-glRectiv@8
-glRects@16
-glRectsv@8
-glRenderMode@4
-glRotated@32
-glRotatef@16
-glScaled@24
-glScalef@12
-glScissor@16
-glSelectBuffer@8
-glShadeModel@4
-glStencilFunc@12
-glStencilMask@4
-glStencilOp@12
-glTexCoord1d@8
-glTexCoord1dv@4
-glTexCoord1f@4
-glTexCoord1fv@4
-glTexCoord1i@4
-glTexCoord1iv@4
-glTexCoord1s@4
-glTexCoord1sv@4
-glTexCoord2d@16
-glTexCoord2dv@4
-glTexCoord2f@8
-glTexCoord2fv@4
-glTexCoord2i@8
-glTexCoord2iv@4
-glTexCoord2s@8
-glTexCoord2sv@4
-glTexCoord3d@24
-glTexCoord3dv@4
-glTexCoord3f@12
-glTexCoord3fv@4
-glTexCoord3i@12
-glTexCoord3iv@4
-glTexCoord3s@12
-glTexCoord3sv@4
-glTexCoord4d@32
-glTexCoord4dv@4
-glTexCoord4f@16
-glTexCoord4fv@4
-glTexCoord4i@16
-glTexCoord4iv@4
-glTexCoord4s@16
-glTexCoord4sv@4
-glTexCoordPointer@16
-glTexEnvf@12
-glTexEnvfv@12
-glTexEnvi@12
-glTexEnviv@12
-glTexGend@16
-glTexGendv@12
-glTexGenf@12
-glTexGenfv@12
-glTexGeni@12
-glTexGeniv@12
-glTexImage1D@32
-glTexImage2D@36
-glTexParameterf@12
-glTexParameterfv@12
-glTexParameteri@12
-glTexParameteriv@12
-glTexSubImage1D@28
-glTexSubImage2D@36
-glTranslated@24
-glTranslatef@12
-glVertex2d@16
-glVertex2dv@4
-glVertex2f@8
-glVertex2fv@4
-glVertex2i@8
-glVertex2iv@4
-glVertex2s@8
-glVertex2sv@4
-glVertex3d@24
-glVertex3dv@4
-glVertex3f@12
-glVertex3fv@4
-glVertex3i@12
-glVertex3iv@4
-glVertex3s@12
-glVertex3sv@4
-glVertex4d@32
-glVertex4dv@4
-glVertex4f@16
-glVertex4fv@4
-glVertex4i@16
-glVertex4iv@4
-glVertex4s@16
-glVertex4sv@4
-glVertexPointer@16
-glViewport@16
-wglChoosePixelFormat@8
-wglCopyContext@12
-wglCreateContext@4
-wglCreateLayerContext@8
-wglDeleteContext@4
-wglDescribeLayerPlane@20
-wglDescribePixelFormat@16
-wglGetCurrentContext@0
-wglGetCurrentDC@0
-wglGetDefaultProcAddress@4
-wglGetLayerPaletteEntries@20
-wglGetPixelFormat@4
-wglGetProcAddress@4
-wglMakeCurrent@8
-wglRealizeLayerPalette@12
-wglSetLayerPaletteEntries@20
-wglSetPixelFormat@12
-wglShareLists@8
-wglSwapBuffers@4
-wglSwapLayerBuffers@8
-wglUseFontBitmapsA@16
-wglUseFontBitmapsW@16
-wglUseFontOutlinesA@32
-wglUseFontOutlinesW@32
diff --git a/winsup/w32api/lib/penwin32.def b/winsup/w32api/lib/penwin32.def
deleted file mode 100644
index 0efc7f73a..000000000
--- a/winsup/w32api/lib/penwin32.def
+++ /dev/null
@@ -1,101 +0,0 @@
-LIBRARY PENWIN32.DLL
-EXPORTS
-AddInksetInterval@8
-AddPenDataHRC@8
-AddPenInputHRC@20
-AddPointsPenData@16
-AddWordsHWL@12
-BoundingRectFromPoints@12
-CharacterToSymbol@12
-CompressPenData@12
-ConfigHREC@16
-CorrectWriting@24
-CreateCompatibleHRC@8
-CreateHWL@16
-CreateInkset@4
-CreateInksetHRCRESULT@12
-CreatePenDataEx@16
-CreatePenDataHRC@4
-CreatePenDataRegion@8
-DPtoTP@8
-DestroyHRC@4
-DestroyHRCRESULT@4
-DestroyHWL@4
-DestroyInkset@4
-DestroyPenData@4
-DoDefaultPenInput@8
-DrawPenDataEx@40
-DuplicatePenData@8
-EnableGestureSetHRC@12
-EnableSystemDictionaryHRC@8
-EndPenInputHRC@4
-ExtractPenDataPoints@28
-ExtractPenDataStrokes@20
-GetAlphabetHRC@12
-GetAlphabetPriorityHRC@12
-GetAlternateWordsHRCRESULT@20
-GetBoxMappingHRCRESULT@16
-GetBoxResultsHRC@24
-GetGuideHRC@12
-GetHRECFromHRC@4
-GetHotspotsHRCRESULT@16
-GetInksetInterval@12
-GetInksetIntervalCount@4
-GetInternationalHRC@20
-GetMaxResultsHRC@4
-GetPenAppFlags@0
-GetPenAsyncState@4
-GetPenDataAttributes@12
-GetPenDataInfo@16
-GetPenInput@24
-GetPenMiscInfo@8
-GetPointsFromPenData@20
-GetResultsHRC@16
-GetStrokeAttributes@16
-GetStrokeTableAttributes@16
-GetSymbolCountHRCRESULT@4
-GetSymbolsHRCRESULT@16
-GetVersionPenWin@0
-GetWordlistCoercionHRC@4
-GetWordlistHRC@8
-HitTestPenData@20
-InsertPenData@12
-InsertPenDataPoints@24
-InsertPenDataStroke@20
-InstallRecognizer@4
-IsPenEvent@8
-MetricScalePenData@8
-OffsetPenData@12
-PeekPenInput@20
-PenDataFromBuffer@20
-PenDataToBuffer@16
-ProcessHRC@8
-ReadHWL@8
-RedisplayPenData@24
-RemovePenDataStrokes@12
-ResizePenData@8
-SetAlphabetHRC@12
-SetAlphabetPriorityHRC@12
-SetBoxAlphabetHRC@12
-SetGuideHRC@12
-SetInternationalHRC@20
-SetMaxResultsHRC@8
-SetPenAppFlags@8
-SetPenMiscInfo@8
-SetResultsHookHREC@8
-SetStrokeAttributes@16
-SetStrokeTableAttributes@16
-SetWordlistCoercionHRC@8
-SetWordlistHRC@8
-StartInking@12
-StartPenInput@16
-StopInking@4
-StopPenInput@12
-SymbolToCharacter@16
-TPtoDP@8
-TargetPoints@20
-TrainHREC@20
-TrimPenData@12
-UnhookResultsHookHREC@8
-UninstallRecognizer@4
-WriteHWL@8
diff --git a/winsup/w32api/lib/pkpd32.def b/winsup/w32api/lib/pkpd32.def
deleted file mode 100644
index 58fbc27ab..000000000
--- a/winsup/w32api/lib/pkpd32.def
+++ /dev/null
@@ -1,36 +0,0 @@
-LIBRARY PKPD32.DLL
-EXPORTS
-AddInksetInterval@8
-AddPointsPenData@16
-BoundingRectFromPoints@12
-CompressPenData@12
-CreateInkset@4
-CreatePenDataEx@16
-CreatePenDataRegion@8
-DestroyInkset@4
-DestroyPenData@4
-DrawPenDataEx@40
-DuplicatePenData@8
-ExtractPenDataPoints@28
-ExtractPenDataStrokes@20
-GetInksetInterval@12
-GetInksetIntervalCount@4
-GetPenDataAttributes@12
-GetPenDataInfo@16
-GetPointsFromPenData@20
-GetStrokeAttributes@16
-GetStrokeTableAttributes@16
-HitTestPenData@20
-InsertPenData@12
-InsertPenDataPoints@24
-InsertPenDataStroke@20
-MetricScalePenData@8
-OffsetPenData@12
-PenDataFromBuffer@20
-PenDataToBuffer@16
-RedisplayPenData@24
-RemovePenDataStrokes@12
-ResizePenData@8
-SetStrokeAttributes@16
-SetStrokeTableAttributes@16
-TrimPenData@12
diff --git a/winsup/w32api/lib/powrprof.def b/winsup/w32api/lib/powrprof.def
deleted file mode 100644
index d2ad939dd..000000000
--- a/winsup/w32api/lib/powrprof.def
+++ /dev/null
@@ -1,25 +0,0 @@
-LIBRARY POWRPROF.dll
-EXPORTS
-CallNtPowerInformation@20
-CanUserWritePwrScheme@0
-DeletePwrScheme@4
-EnumPwrSchemes@8
-GetActivePwrScheme@4
-GetCurrentPowerPolicies@8
-GetPwrCapabilities@4
-GetPwrDiskSpindownRange@8
-IsAdminOverrideActive@4
-IsPwrHibernateAllowed@0
-IsPwrShutdownAllowed@0
-IsPwrSuspendAllowed@0
-LoadCurrentPwrScheme@16
-MergeLegacyPwrScheme@16
-ReadGlobalPwrPolicy@4
-ReadProcessorPwrScheme@8
-ReadPwrScheme@8
-SetActivePwrScheme@12
-SetSuspendState@12
-ValidatePowerPolicies@8
-WriteGlobalPwrPolicy@4
-WriteProcessorPwrScheme@8
-WritePwrScheme@16
diff --git a/winsup/w32api/lib/psapi.def b/winsup/w32api/lib/psapi.def
deleted file mode 100644
index 9d79fe82c..000000000
--- a/winsup/w32api/lib/psapi.def
+++ /dev/null
@@ -1,21 +0,0 @@
-LIBRARY PSAPI.DLL
-EXPORTS
-EmptyWorkingSet@4
-EnumDeviceDrivers@12
-EnumProcesses@12
-EnumProcessModules@16
-GetDeviceDriverBaseNameA@12
-GetDeviceDriverBaseNameW@12
-GetDeviceDriverFileNameA@12
-GetDeviceDriverFileNameW@12
-GetMappedFileNameA@16
-GetMappedFileNameW@16
-GetModuleBaseNameA@16
-GetModuleBaseNameW@16
-GetModuleFileNameExA@16
-GetModuleFileNameExW@16
-GetModuleInformation@16
-GetProcessMemoryInfo@12
-GetWsChanges@12
-InitializeProcessForWsWatch@4
-QueryWorkingSet@12
diff --git a/winsup/w32api/lib/rapi.def b/winsup/w32api/lib/rapi.def
deleted file mode 100644
index 730faa294..000000000
--- a/winsup/w32api/lib/rapi.def
+++ /dev/null
@@ -1,84 +0,0 @@
-LIBRARY RAPI.DLL
-EXPORTS
-CeCheckPassword@4
-CeCloseHandle@4
-CeCopyFile@12
-CeCreateDatabase@16
-CeCreateDirectory@8
-CeCreateFile@28
-CeCreateProcess@40
-CeDeleteDatabase@4
-CeDeleteFile@4
-CeDeleteRecord@8
-CeFindAllDatabases@16
-CeFindAllFiles@16
-CeFindClose@4
-CeFindFirstDatabase@4
-CeFindFirstFile@8
-CeFindNextDatabase@4
-CeFindNextFile@8
-CeGetClassName@12
-CeGetDesktopDeviceCaps@4
-CeGetFileAttributes@4
-CeGetFileSize@8
-CeGetFileTime@16
-CeGetLastError@0
-CeGetSpecialFolderPath@12
-CeGetStoreInformation@4
-CeGetSystemInfo@4
-CeGetSystemMetrics@4
-CeGetSystemPowerStatusEx@8
-CeGetTempPath@8
-CeGetVersionEx@4
-CeGetWindow@8
-CeGetWindowLong@8
-CeGetWindowText@12
-CeGlobalMemoryStatus@4
-CeMoveFile@8
-CeOidGetInfo@8
-CeOpenDatabase@20
-CeRapiFreeBuffer@4
-CeRapiGetError@0
-CeRapiInit@0
-CeRapiInitEx@4
-CeRapiInvoke@32
-CeRapiUninit@0
-CeReadFile@20
-CeReadRecordProps@24
-CeRegCloseKey@4
-CeRegCreateKeyEx@36
-CeRegDeleteKey@8
-CeRegDeleteValue@8
-CeRegEnumKeyEx@32
-CeRegEnumValue@32
-CeRegOpenKeyEx@20
-CeRegQueryInfoKey@48
-CeRegQueryValueEx@24
-CeRegSetValueEx@24
-CeRemoveDirectory@4
-CeSHCreateShortcut@8
-CeSHGetShortcutTarget@12
-CeSeekDatabase@16
-CeSetDatabaseInfo@8
-CeSetEndOfFile@4
-CeSetFileAttributes@8
-CeSetFilePointer@16
-CeSetFileTime@16
-CeWriteFile@20
-CeWriteRecordProps@16
-GetRapiError@0
-RAPI_EXP_10@4
-RAPI_EXP_11@8
-RAPI_EXP_12@4
-RAPI_EXP_13@0
-RAPI_EXP_14@4
-RAPI_EXP_15@4
-RAPI_EXP_16@0
-RAPI_EXP_17@8
-RAPI_EXP_18@8
-RAPI_EXP_19@12
-RAPI_EXP_20@4
-RAPI_EXP_21@8
-RAPI_EXP_22@8
-RAPI_EXP_23@12
-RapiFreeBuffer@4
diff --git a/winsup/w32api/lib/rasapi32.def b/winsup/w32api/lib/rasapi32.def
deleted file mode 100644
index 492f2a5fe..000000000
--- a/winsup/w32api/lib/rasapi32.def
+++ /dev/null
@@ -1,146 +0,0 @@
-LIBRARY RASAPI32.DLL
-EXPORTS
-DDMGetPhonebookInfo@32
-DwCloneEntry@12
-DwDeleteSubEntry@12
-DwEnumEntriesForAllUsers@12
-DwEnumEntryDetails@16
-FreeSharedAccessApplication@4
-FreeSharedAccessServer@4
-RasAutoDialSharedConnection@0
-RasAutodialAddressToNetwork@12
-RasAutodialEntryToNetwork@12
-RasClearConnectionStatistics@4
-RasClearLinkStatistics@8
-RasConnectionNotificationA@12
-RasConnectionNotificationW@12
-RasCreatePhonebookEntryA@8
-RasCreatePhonebookEntryW@8
-RasDeleteEntryA@8
-RasDeleteEntryW@8
-RasDialA@24
-RasDialW@24
-RasDialWow@20
-RasEditPhonebookEntryA@12
-RasEditPhonebookEntryW@12
-RasEnumAutodialAddressesA@12
-RasEnumAutodialAddressesW@12
-RasEnumConnectionsA@12
-RasEnumConnectionsW@12
-RasEnumConnectionsWow@12
-RasEnumDevicesA@12
-RasEnumDevicesW@12
-RasEnumEntriesA@20
-RasEnumEntriesW@20
-RasEnumEntriesWow@20
-RasFreeEapUserIdentityA@4
-RasFreeEapUserIdentityW@4
-RasFreeLanConnTable@8
-RasFreeSharedAccessSettings@4
-RasGetAutodialAddressA@20
-RasGetAutodialAddressW@20
-RasGetAutodialEnableA@8
-RasGetAutodialEnableW@8
-RasGetAutodialParamA@12
-RasGetAutodialParamW@12
-RasGetConnectResponse@8
-RasGetConnectStatusA@8
-RasGetConnectStatusW@8
-RasGetConnectStatusWow@8
-RasGetConnectionStatistics@8
-RasGetCountryInfoA@8
-RasGetCountryInfoW@8
-RasGetCredentialsA@12
-RasGetCredentialsW@12
-RasGetCustomAuthDataA@16
-RasGetCustomAuthDataW@16
-RasGetEapUserDataA@20
-RasGetEapUserDataW@20
-RasGetEapUserIdentityA@20
-RasGetEapUserIdentityW@20
-RasGetEntryDialParamsA@12
-RasGetEntryDialParamsW@12
-RasGetEntryHrasconnA@12
-RasGetEntryHrasconnW@12
-RasGetEntryPropertiesA@24
-RasGetEntryPropertiesW@24
-RasGetErrorStringA@12
-RasGetErrorStringW@12
-RasGetErrorStringWow@12
-RasGetHport@4
-RasGetLinkStatistics@12
-RasGetProjectionInfoA@16
-RasGetProjectionInfoW@16
-RasGetSubEntryHandleA@12
-RasGetSubEntryHandleW@12
-RasGetSubEntryPropertiesA@28
-RasGetSubEntryPropertiesW@28
-RasHangUpA@4
-RasHangUpW@4
-RasHangUpWow@4
-RasInvokeEapUI@16
-RasIsRouterConnection@4
-RasIsSharedConnection@8
-RasLoadSharedAccessSettings@4
-RasNameFromSharedConnection@8
-RasQueryLanConnTable@12
-RasQueryRedialOnLinkFailure@12
-RasQuerySharedAutoDial@4
-RasQuerySharedConnection@4
-RasQuerySharedConnectionCredentials@8
-RasQuerySharedPrivateLan@4
-RasQuerySharedPrivateLanAddress@4
-RasRenameEntryA@12
-RasRenameEntryW@12
-RasSaveSharedAccessSettings@4
-RasSetAutodialAddressA@20
-RasSetAutodialAddressW@20
-RasSetAutodialEnableA@8
-RasSetAutodialEnableW@8
-RasSetAutodialParamA@12
-RasSetAutodialParamW@12
-RasSetCredentialsA@16
-RasSetCredentialsW@16
-RasSetCustomAuthDataA@16
-RasSetCustomAuthDataW@16
-RasSetEapUserDataA@20
-RasSetEapUserDataW@20
-RasSetEntryDialParamsA@12
-RasSetEntryDialParamsW@12
-RasSetEntryPropertiesA@24
-RasSetEntryPropertiesW@24
-RasSetOldPassword@8
-RasSetSharedAutoDial@4
-RasSetSharedConnectionCredentials@8
-RasSetSubEntryPropertiesA@28
-RasSetSubEntryPropertiesW@28
-RasShareConnection@8
-RasUnshareConnection@4
-RasValidateEntryNameA@8
-RasValidateEntryNameW@8
-RasfileClose@4
-RasfileDeleteLine@4
-RasfileFindFirstLine@12
-RasfileFindLastLine@12
-RasfileFindMarkedLine@8
-RasfileFindNextKeyLine@12
-RasfileFindNextLine@12
-RasfileFindPrevLine@12
-RasfileFindSectionLine@12
-RasfileGetKeyValueFields@12
-RasfileGetLine@4
-RasfileGetLineMark@4
-RasfileGetLineText@8
-RasfileGetLineType@4
-RasfileGetSectionName@8
-RasfileInsertLine@12
-RasfileLoad@16
-RasfileLoadInfo@8
-RasfilePutKeyValueFields@12
-RasfilePutLineMark@8
-RasfilePutLineText@8
-RasfilePutSectionName@8
-RasfileWrite@8
-SharedAccessResponseListToString@8
-SharedAccessResponseStringToList@12
-UnInitializeRAS@0
diff --git a/winsup/w32api/lib/rasdlg.def b/winsup/w32api/lib/rasdlg.def
deleted file mode 100644
index 099c1a777..000000000
--- a/winsup/w32api/lib/rasdlg.def
+++ /dev/null
@@ -1,8 +0,0 @@
-LIBRARY RASDLG.DLL
-EXPORTS
-RasDialDlgA@16
-RasDialDlgW@16
-RasEntryDlgA@12
-RasEntryDlgW@12
-RasPhonebookDlgA@12
-RasPhonebookDlgW@12
diff --git a/winsup/w32api/lib/res.rc b/winsup/w32api/lib/res.rc
deleted file mode 100644
index 1a3f751de..000000000
--- a/winsup/w32api/lib/res.rc
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <windows.h>
-
-STRINGTABLE
-{
-	100 "Dummy string"
-}
diff --git a/winsup/w32api/lib/rpcdce4.def b/winsup/w32api/lib/rpcdce4.def
deleted file mode 100644
index 43e96a7f3..000000000
--- a/winsup/w32api/lib/rpcdce4.def
+++ /dev/null
@@ -1,26 +0,0 @@
-LIBRARY RPCDCE4.dll
-EXPORTS
-DceErrorInqTextA@8
-DceErrorInqTextW@8
-MIDL_user_allocate@4
-MIDL_user_free@4
-RpcBindingToStringBindingA@8
-RpcBindingToStringBindingW@8
-RpcMgmtEpEltInqBegin@24
-RpcMgmtEpEltInqDone@4
-RpcMgmtEpEltInqNextA@20
-RpcMgmtEpEltInqNextW@20
-RpcMgmtEpUnregister@16
-RpcMgmtInqIfIds@8
-RpcMgmtInqServerPrincNameA@12
-RpcMgmtInqServerPrincNameW@12
-RpcMgmtInqStats@8
-RpcMgmtIsServerListening@4
-RpcMgmtSetAuthorizationFn@4
-RpcMgmtStopServerListening@4
-RpcServerListen@12
-UuidCompare@12
-UuidCreateNil@4
-UuidEqual@12
-UuidHash@8
-UuidIsNil@8
diff --git a/winsup/w32api/lib/rpcns4.def b/winsup/w32api/lib/rpcns4.def
deleted file mode 100644
index 7d005c365..000000000
--- a/winsup/w32api/lib/rpcns4.def
+++ /dev/null
@@ -1,60 +0,0 @@
-LIBRARY RPCNS4.dll
-EXPORTS
-I_GetDefaultEntrySyntax@0
-I_RpcNsGetBuffer@4
-I_RpcNsRaiseException@8
-I_RpcNsSendReceive@8
-I_RpcReBindBuffer@4
-RpcIfIdVectorFree@4
-RpcNsBindingExportA@20
-RpcNsBindingExportW@20
-RpcNsBindingImportBeginA@20
-RpcNsBindingImportBeginW@20
-RpcNsBindingImportDone@4
-RpcNsBindingImportNext@8
-RpcNsBindingLookupBeginA@24
-RpcNsBindingLookupBeginW@24
-RpcNsBindingLookupDone@4
-RpcNsBindingLookupNext@8
-RpcNsBindingSelect@8
-RpcNsBindingUnexportA@16
-RpcNsBindingUnexportW@16
-RpcNsEntryExpandNameA@12
-RpcNsEntryExpandNameW@12
-RpcNsEntryObjectInqBeginA@12
-RpcNsEntryObjectInqBeginW@12
-RpcNsEntryObjectInqDone@4
-RpcNsEntryObjectInqNext@8
-RpcNsGroupDeleteA@8
-RpcNsGroupDeleteW@8
-RpcNsGroupMbrAddA@16
-RpcNsGroupMbrAddW@16
-RpcNsGroupMbrInqBeginA@16
-RpcNsGroupMbrInqBeginW@16
-RpcNsGroupMbrInqDone@4
-RpcNsGroupMbrInqNextA@8
-RpcNsGroupMbrInqNextW@8
-RpcNsGroupMbrRemoveA@16
-RpcNsGroupMbrRemoveW@16
-RpcNsMgmtBindingUnexportA@20
-RpcNsMgmtBindingUnexportW@20
-RpcNsMgmtEntryCreateA@8
-RpcNsMgmtEntryCreateW@8
-RpcNsMgmtEntryDeleteA@8
-RpcNsMgmtEntryDeleteW@8
-RpcNsMgmtEntryInqIfIdsA@12
-RpcNsMgmtEntryInqIfIdsW@12
-RpcNsMgmtHandleSetExpAge@8
-RpcNsMgmtInqExpAge@4
-RpcNsMgmtSetExpAge@4
-RpcNsProfileDeleteA@8
-RpcNsProfileDeleteW@8
-RpcNsProfileEltAddA@28
-RpcNsProfileEltAddW@28
-RpcNsProfileEltInqBeginA@32
-RpcNsProfileEltInqBeginW@32
-RpcNsProfileEltInqDone@4
-RpcNsProfileEltInqNextA@20
-RpcNsProfileEltInqNextW@20
-RpcNsProfileEltRemoveA@20
-RpcNsProfileEltRemoveW@20
diff --git a/winsup/w32api/lib/rpcrt4.def b/winsup/w32api/lib/rpcrt4.def
deleted file mode 100644
index cc47f7d25..000000000
--- a/winsup/w32api/lib/rpcrt4.def
+++ /dev/null
@@ -1,373 +0,0 @@
-LIBRARY RPCRT4.dll
-EXPORTS
-CStdStubBuffer_AddRef@4
-CStdStubBuffer_Connect@8
-CStdStubBuffer_CountRefs@4
-CStdStubBuffer_DebugServerQueryInterface@8
-CStdStubBuffer_DebugServerRelease@8
-CStdStubBuffer_Disconnect@4
-CStdStubBuffer_Invoke@12
-CStdStubBuffer_IsIIDSupported@8
-CStdStubBuffer_QueryInterface@12
-DceErrorInqTextA@8
-DceErrorInqTextW@8
-IUnknown_AddRef_Proxy@4
-IUnknown_QueryInterface_Proxy@12
-IUnknown_Release_Proxy@4
-I_RpcAllocate@4
-I_RpcBindingCopy@8
-I_RpcBindingInqDynamicEndpoint@8
-I_RpcBindingInqTransportType@8
-I_RpcBindingIsClientLocal@8
-I_RpcClearMutex@4
-I_RpcConnectionInqSockBuffSize2@4
-I_RpcConnectionInqSockBuffSize@8
-I_RpcConnectionSetSockBuffSize@8
-I_RpcDeleteMutex@4
-I_RpcFree@4
-I_RpcFreeBuffer@4
-I_RpcGetAssociationContext@4
-_imp__I_RpcGetAssociationContext@4
-I_RpcGetBuffer@4
-I_RpcGetCurrentCallHandle@0
-I_RpcIOAlerted@4
-I_RpcIfInqTransferSyntaxes@16
-I_RpcMapWin32Status@4
-I_RpcMonitorAssociation@12
-I_RpcNsBindingSetEntryName@12
-I_RpcParseSecurity@8
-I_RpcPauseExecution@4
-I_RpcRequestMutex@4
-I_RpcSendReceive@4
-I_RpcServerRegisterForwardFunction@4
-I_RpcSetAssociationContext@4
-_imp__I_RpcSetAssociationContext@4
-I_RpcSsDontSerializeContext@0
-_imp__I_RpcSsDontSerializeContext@0
-I_RpcStopMonitorAssociation@4
-I_RpcTransClientMaxFrag@4
-I_RpcTransClientReallocBuffer@16
-I_RpcTransServerFindConnection@8
-I_RpcTransServerFreeBuffer@8
-I_RpcTransServerMaxFrag@4
-I_RpcTransServerNewConnection@12
-I_RpcTransServerProtectThread@0
-I_RpcTransServerReallocBuffer@16
-I_RpcTransServerReceiveDirectReady@4
-I_RpcTransServerUnprotectThread@4
-I_UuidCreate@4
-MIDL_wchar_strcpy@8
-MIDL_wchar_strlen@4
-MesBufferHandleReset@24
-MesDecodeBufferHandleCreate@12
-MesDecodeIncrementalHandleCreate@12
-MesEncodeDynBufferHandleCreate@12
-MesEncodeFixedBufferHandleCreate@16
-MesEncodeIncrementalHandleCreate@16
-MesHandleFree@4
-MesIncrementalHandleReset@24
-MesInqProcEncodingId@12
-NDRCContextBinding@4
-_imp__NDRCContextBinding@4
-NDRCContextMarshall@8
-_imp__NDRCContextMarshall@8
-NDRCContextUnmarshall@16
-_imp__NDRCContextUnmarshall@16
-NDRSContextMarshall@12
-_imp__NDRSContextMarshall@12
-NDRSContextUnmarshall@8
-_imp__NDRSContextUnmarshall@8
-NDRcopy@12
-NdrAllocate@8
-NdrByteCountPointerBufferSize@12
-NdrByteCountPointerFree@12
-NdrByteCountPointerMarshall@12
-NdrByteCountPointerUnmarshall@16
-NdrCStdStubBuffer2_Release@8
-NdrCStdStubBuffer_Release@8
-NdrClearOutParameters@12
-NdrClientCall
-NdrClientContextMarshall@12
-_imp__NdrClientContextMarshall@12
-NdrClientContextUnmarshall@12
-_imp__NdrClientContextUnmarshall@12
-NdrClientInitialize@16
-NdrClientInitializeNew@16
-NdrComplexArrayBufferSize@12
-NdrComplexArrayFree@12
-NdrComplexArrayMarshall@12
-NdrComplexArrayMemorySize@8
-NdrComplexArrayUnmarshall@16
-NdrComplexStructBufferSize@12
-NdrComplexStructFree@12
-NdrComplexStructMarshall@12
-NdrComplexStructMemorySize@8
-NdrComplexStructUnmarshall@16
-NdrConformantArrayBufferSize@12
-NdrConformantArrayFree@12
-NdrConformantArrayMarshall@12
-NdrConformantArrayMemorySize@8
-NdrConformantArrayUnmarshall@16
-NdrConformantStringBufferSize@12
-NdrConformantStringMarshall@12
-NdrConformantStringMemorySize@8
-NdrConformantStringUnmarshall@16
-NdrConformantStructBufferSize@12
-NdrConformantStructFree@12
-NdrConformantStructMarshall@12
-NdrConformantStructMemorySize@8
-NdrConformantStructUnmarshall@16
-NdrConformantVaryingArrayBufferSize@12
-NdrConformantVaryingArrayFree@12
-NdrConformantVaryingArrayMarshall@12
-NdrConformantVaryingArrayMemorySize@8
-NdrConformantVaryingArrayUnmarshall@16
-NdrConformantVaryingStructBufferSize@12
-NdrConformantVaryingStructFree@12
-NdrConformantVaryingStructMarshall@12
-NdrConformantVaryingStructMemorySize@8
-NdrConformantVaryingStructUnmarshall@16
-NdrContextHandleSize@12
-_imp__NdrContextHandleSize@12
-NdrConvert@8
-NdrDllCanUnloadNow@4
-NdrDllGetClassObject@24
-NdrDllRegisterProxy@12
-NdrDllUnregisterProxy@12
-NdrEncapsulatedUnionBufferSize@12
-NdrEncapsulatedUnionFree@12
-NdrEncapsulatedUnionMarshall@12
-NdrEncapsulatedUnionMemorySize@8
-NdrEncapsulatedUnionUnmarshall@16
-NdrFixedArrayBufferSize@12
-NdrFixedArrayFree@12
-NdrFixedArrayMarshall@12
-NdrFixedArrayMemorySize@8
-NdrFixedArrayUnmarshall@16
-NdrFreeBuffer@4
-NdrFullPointerFree@8
-NdrFullPointerInsertRefId@12
-NdrFullPointerQueryPointer@16
-NdrFullPointerQueryRefId@16
-NdrFullPointerXlatFree@4
-NdrFullPointerXlatInit@8
-NdrGetBuffer@12
-NdrHardStructBufferSize@12
-NdrHardStructFree@12
-NdrHardStructMarshall@12
-NdrHardStructMemorySize@8
-NdrHardStructUnmarshall@16
-NdrInterfacePointerBufferSize@12
-NdrInterfacePointerFree@12
-NdrInterfacePointerMarshall@12
-NdrInterfacePointerMemorySize@8
-NdrInterfacePointerUnmarshall@16
-NdrMapCommAndFaultStatus@16
-NdrMesProcEncodeDecode
-NdrMesSimpleTypeAlignSize@4
-NdrMesSimpleTypeDecode@12
-NdrMesSimpleTypeEncode@16
-NdrMesTypeAlignSize@16
-NdrMesTypeDecode@16
-NdrMesTypeEncode@16
-NdrNonConformantStringBufferSize@12
-NdrNonConformantStringMarshall@12
-NdrNonConformantStringMemorySize@8
-NdrNonConformantStringUnmarshall@16
-NdrNonEncapsulatedUnionBufferSize@12
-NdrNonEncapsulatedUnionFree@12
-NdrNonEncapsulatedUnionMarshall@12
-NdrNonEncapsulatedUnionMemorySize@8
-NdrNonEncapsulatedUnionUnmarshall@16
-NdrNsGetBuffer@12
-NdrNsSendReceive@12
-NdrOleAllocate@4
-NdrOleFree@4
-NdrPointerBufferSize@12
-NdrPointerFree@12
-NdrPointerMarshall@12
-NdrPointerMemorySize@8
-NdrPointerUnmarshall@16
-NdrProxyErrorHandler@4
-NdrProxyFreeBuffer@8
-NdrProxyGetBuffer@8
-NdrProxyInitialize@20
-NdrProxySendReceive@8
-NdrRpcSmClientAllocate@4
-NdrRpcSmClientFree@4
-NdrRpcSmSetClientToOsf@4
-NdrRpcSsDefaultAllocate@4
-NdrRpcSsDefaultFree@4
-NdrRpcSsDisableAllocate@4
-NdrRpcSsEnableAllocate@4
-NdrSendReceive@8
-NdrServerCall@4
-NdrServerContextMarshall@12
-_imp__NdrServerContextMarshall@12
-NdrServerContextUnmarshall@4
-_imp__NdrServerContextUnmarshall@4
-NdrServerInitialize@12
-NdrServerInitializeMarshall@8
-NdrServerInitializeNew@12
-NdrServerInitializeUnmarshall@12
-NdrServerMarshall@16
-NdrServerUnmarshall@24
-NdrSimpleStructBufferSize@12
-NdrSimpleStructFree@12
-NdrSimpleStructMarshall@12
-NdrSimpleStructMemorySize@8
-NdrSimpleStructUnmarshall@16
-NdrSimpleTypeMarshall@12
-NdrSimpleTypeUnmarshall@12
-NdrStubCall@16
-NdrStubForwardingFunction@16
-NdrStubGetBuffer@12
-NdrStubInitialize@16
-NdrStubInitializeMarshall@12
-NdrVaryingArrayBufferSize@12
-NdrVaryingArrayFree@12
-NdrVaryingArrayMarshall@12
-NdrVaryingArrayMemorySize@8
-NdrVaryingArrayUnmarshall@16
-NdrXmitOrRepAsBufferSize@12
-NdrXmitOrRepAsFree@12
-NdrXmitOrRepAsMarshall@12
-NdrXmitOrRepAsMemorySize@8
-NdrXmitOrRepAsUnmarshall@16
-RpcBindingCopy@8
-RpcBindingFree@4
-RpcBindingFromStringBindingA@8
-RpcBindingFromStringBindingW@8
-RpcBindingInqAuthClientA@24
-RpcBindingInqAuthClientW@24
-RpcBindingInqAuthInfoA@24
-RpcBindingInqAuthInfoW@24
-RpcBindingInqObject@8
-RpcBindingReset@4
-RpcBindingServerFromClient@8
-RpcBindingSetAuthInfoA@24
-RpcBindingSetAuthInfoW@24
-RpcBindingSetObject@8
-RpcBindingToStringBindingA@8
-RpcBindingToStringBindingW@8
-RpcBindingVectorFree@4
-RpcCancelThread@4
-RpcEpRegisterA@16
-RpcEpRegisterNoReplaceA@16
-RpcEpRegisterNoReplaceW@16
-RpcEpRegisterW@16
-RpcEpResolveBinding@8
-RpcEpUnregister@12
-RpcIfIdVectorFree@4
-RpcIfInqId@8
-RpcImpersonateClient@4
-RpcMgmtEnableIdleCleanup@0
-RpcMgmtEpEltInqBegin@24
-RpcMgmtEpEltInqDone@4
-RpcMgmtEpEltInqNextA@20
-RpcMgmtEpEltInqNextW@20
-RpcMgmtEpUnregister@16
-RpcMgmtInqComTimeout@8
-RpcMgmtInqDefaultProtectLevel@8
-RpcMgmtInqIfIds@8
-RpcMgmtInqServerPrincNameA@12
-RpcMgmtInqServerPrincNameW@12
-RpcMgmtInqStats@8
-RpcMgmtIsServerListening@4
-RpcMgmtSetAuthorizationFn@4
-RpcMgmtSetCancelTimeout@4
-RpcMgmtSetComTimeout@8
-RpcMgmtSetServerStackSize@4
-RpcMgmtStatsVectorFree@4
-RpcMgmtStopServerListening@4
-RpcMgmtWaitServerListen@0
-RpcNetworkInqProtseqsA@4
-RpcNetworkInqProtseqsW@4
-RpcNetworkIsProtseqValidA@4
-RpcNetworkIsProtseqValidW@4
-RpcNsBindingInqEntryNameA@12
-RpcNsBindingInqEntryNameW@12
-RpcObjectInqType@8
-RpcObjectSetInqFn@4
-RpcObjectSetType@8
-RpcProtseqVectorFreeA@4
-RpcProtseqVectorFreeW@4
-RpcRaiseException@4
-RpcRevertToSelf@0
-RpcServerInqBindings@4
-RpcServerInqDefaultPrincNameA@8
-RpcServerInqDefaultPrincNameW@8
-RpcServerInqIf@12
-RpcServerListen@12
-RpcServerRegisterAuthInfoA@16
-RpcServerRegisterAuthInfoW@16
-RpcServerRegisterIf@12
-RpcServerUnregisterIf@12
-RpcServerUseAllProtseqs@8
-RpcServerUseAllProtseqsIf@12
-RpcServerUseProtseqA@12
-RpcServerUseProtseqEpA@16
-RpcServerUseProtseqEpW@16
-RpcServerUseProtseqIfA@16
-RpcServerUseProtseqIfW@16
-RpcServerUseProtseqW@12
-RpcSmAllocate@8
-RpcSmClientFree@4
-RpcSmDestroyClientContext@4
-_imp__RpcSmDestroyClientContext@4
-RpcSmDisableAllocate@0
-RpcSmEnableAllocate@0
-RpcSmFree@4
-RpcSmGetThreadHandle@4
-RpcSmSetClientAllocFree@8
-RpcSmSetThreadHandle@4
-RpcSmSwapClientAllocFree@16
-RpcSsAllocate@4
-RpcSsDestroyClientContext@4
-_imp__RpcSsDestroyClientContext@4
-RpcSsDisableAllocate@0
-RpcSsEnableAllocate@0
-RpcSsFree@4
-RpcSsGetThreadHandle@0
-RpcSsSetClientAllocFree@8
-RpcSsSetThreadHandle@4
-RpcSsSwapClientAllocFree@16
-RpcStringBindingComposeA@24
-RpcStringBindingComposeW@24
-RpcStringBindingParseA@24
-RpcStringBindingParseW@24
-RpcStringFreeA@4
-RpcStringFreeW@4
-RpcTestCancel@0
-TowerConstruct@24
-TowerExplode@24
-UuidCompare@12
-UuidCreate@4
-UuidCreateNil@4
-UuidCreateSequential@4
-UuidEqual@12
-UuidFromStringA@8
-UuidFromStringW@8
-UuidHash@8
-UuidIsNil@8
-UuidToStringA@8
-UuidToStringW@8
-char_array_from_ndr@16
-char_from_ndr@8
-data_from_ndr@16
-data_into_ndr@16
-data_size_ndr@16
-double_array_from_ndr@16
-double_from_ndr@8
-enum_from_ndr@8
-float_array_from_ndr@16
-float_from_ndr@8
-long_array_from_ndr@16
-long_from_ndr@8
-long_from_ndr_temp@12
-short_array_from_ndr@16
-short_from_ndr@8
-short_from_ndr_temp@12
-tree_into_ndr@16
-tree_peek_ndr@16
-tree_size_ndr@16
diff --git a/winsup/w32api/lib/scrnsave.c b/winsup/w32api/lib/scrnsave.c
deleted file mode 100644
index 53e555d7d..000000000
--- a/winsup/w32api/lib/scrnsave.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
-  Screen saver library by Anders Norlander <anorland@hem2.passagen.se>
-
-  This library is (hopefully) compatible with Microsoft's
-  screen saver library.
-
-  This is public domain software.
-
- */
-#include <windows.h>
-#include <scrnsave.h>
-#include <regstr.h>
-
-/* screen saver window class */
-#define CLASS_SCRNSAVE TEXT("WindowsScreenSaverClass")
-
-/* globals */
-HWND		hMainWindow = NULL;
-BOOL		fChildPreview = FALSE;
-HINSTANCE	hMainInstance;
-TCHAR		szName[TITLEBARNAMELEN];
-TCHAR		szAppName[APPNAMEBUFFERLEN];
-TCHAR		szIniFile[MAXFILELEN];
-TCHAR		szScreenSaver[22];
-TCHAR		szHelpFile[MAXFILELEN];
-TCHAR		szNoHelpMemory[BUFFLEN];
-UINT		MyHelpMessage;
-
-/* local house keeping */
-static HINSTANCE hPwdLib = NULL;
-static POINT pt_orig;
-static BOOL checking_pwd = FALSE;
-static BOOL closing = FALSE;
-static BOOL w95 = FALSE;
-
-typedef BOOL (WINAPI *VERIFYPWDPROC)(HWND);
-typedef DWORD (WINAPI *CHPWDPROC)(LPCTSTR, HWND, DWORD, PVOID);
-static VERIFYPWDPROC VerifyScreenSavePwd = NULL;
-
-/* function names */
-#define szVerifyPassword "VerifyScreenSavePwd"
-
-#ifdef UNICODE
-#define szPwdChangePassword "PwdChangePasswordW"
-#else
-#define szPwdChangePassword "PwdChangePasswordA"
-#endif
-
-static void TerminateScreenSaver(HWND hWnd);
-static BOOL RegisterClasses(void);
-static LRESULT WINAPI SysScreenSaverProc(HWND,UINT,WPARAM,LPARAM);
-static int LaunchScreenSaver(HWND hParent);
-static void LaunchConfig(void);
-
-static int ISSPACE(char c)
-{
-  return (c == ' ' || c == '\t');
-}
-
-#define ISNUM(c) ((c) >= '0' && c <= '9')
-static unsigned long
-_toul(const char *s)
-{
-  unsigned long res;
-  unsigned long n;
-  const char *p;
-  for (p = s; *p; p++)
-    if (!ISNUM(*p)) break;
-  p--;
-  res = 0;
-  for (n = 1; p >= s; p--, n *= 10)
-    res += (*p - '0') * n;
-  return res;
-}
-
-/* screen saver entry point */
-int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
-                     LPSTR CmdLine, int nCmdShow)
-{
-  LPSTR p;
-  OSVERSIONINFO vi;
-
-  /* initialize */
-  hMainInstance = hInst;
-
-  vi.dwOSVersionInfoSize = sizeof(vi);
-  GetVersionEx(&vi);
-  /* check if we are going to check for passwords */
-  if (vi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
-    {
-      HKEY hKey;
-      /* we are using windows 95 */
-      w95 = TRUE;
-      if (RegOpenKey(HKEY_CURRENT_USER, REGSTR_PATH_SCREENSAVE ,&hKey) ==
-          ERROR_SUCCESS)
-        {
-          DWORD check_pwd;
-          DWORD size = sizeof(DWORD);
-          DWORD type;
-          LONG res;
-          res = RegQueryValueEx(hKey, REGSTR_VALUE_USESCRPASSWORD,
-                                NULL, &type, (PBYTE) &check_pwd, &size);
-          if (check_pwd && res == ERROR_SUCCESS)
-            {
-              hPwdLib = LoadLibrary(TEXT("PASSWORD.CPL"));
-              if (hPwdLib)
-                VerifyScreenSavePwd = GetProcAddress(hPwdLib, szVerifyPassword);
-            }
-          RegCloseKey(hKey);
-        }
-    }
-
-  /* parse arguments */
-  for (p = CmdLine; *p; p++)
-    {
-      switch (*p)
-        {
-        case 'S':
-        case 's':
-          /* start screen saver */
-          return LaunchScreenSaver(NULL);
-          
-        case 'P':
-        case 'p':
-          {
-            /* start screen saver in preview window */
-            HWND hParent;
-            fChildPreview = TRUE;
-            while (ISSPACE(*++p));
-            hParent = (HWND) _toul(p);
-            if (hParent && IsWindow(hParent))
-              return LaunchScreenSaver(hParent);
-          }
-          return 0;
-
-        case 'C':
-        case 'c':
-          /* display configure dialog */
-          LaunchConfig();
-          return 0;
-
-        case 'A':
-        case 'a':
-          {
-            /* change screen saver password */
-            HWND hParent;
-            while (ISSPACE(*++p));
-            hParent = (HWND) _toul(p);
-            if (!hParent || !IsWindow(hParent))
-              hParent = GetForegroundWindow();
-            ScreenSaverChangePassword(hParent);
-          }
-          return 0;
-
-        case '-':
-        case '/':
-        case ' ':
-        default: 
-	  break;
-        }
-    }
-  LaunchConfig();
-  return 0;
-}
-
-static void LaunchConfig(void)
-{
-  /* FIXME: should this be called */
-  RegisterDialogClasses(hMainInstance);
-  /* display configure dialog */
-  DialogBox(hMainInstance, MAKEINTRESOURCE(DLG_SCRNSAVECONFIGURE),
-            GetForegroundWindow(), (DLGPROC) ScreenSaverConfigureDialog);
-}
-
-
-static int LaunchScreenSaver(HWND hParent)
-{
-  BOOL foo;
-  UINT style;
-  RECT rc;
-  MSG msg;
-
-  /* don't allow other tasks to get into the foreground */
-  if (w95 && !fChildPreview)
-    SystemParametersInfo(SPI_SCREENSAVERRUNNING, TRUE, &foo, 0);
-
-  msg.wParam = 0;
-
-  /* register classes, both user defined and classes used by screen saver
-     library */
-  if (!RegisterClasses())
-    {
-      MessageBox(NULL, TEXT("RegisterClasses() failed"), NULL, MB_ICONHAND);
-      goto restore;
-    }
-
-  /* a slightly different approach needs to be used when displaying
-     in a preview window */
-  if (hParent)
-    {
-      style = WS_CHILD;
-      GetClientRect(hParent, &rc);
-    }
-  else
-    {
-      style = WS_POPUP;
-      rc.right = GetSystemMetrics(SM_CXSCREEN);
-      rc.bottom = GetSystemMetrics(SM_CYSCREEN);
-      style |= WS_VISIBLE;
-    }
-
-  /* create main screen saver window */
-  hMainWindow = CreateWindowEx(hParent ? 0 : WS_EX_TOPMOST, CLASS_SCRNSAVE,
-                               TEXT("SCREENSAVER"), style,
-                               0, 0, rc.right, rc.bottom, hParent, NULL,
-                               hMainInstance, NULL);
-
-  /* display window and start pumping messages */
-  if (hMainWindow)
-    {
-      UpdateWindow(hMainWindow);
-      ShowWindow(hMainWindow, SW_SHOW);
-
-      while (GetMessage(&msg, NULL, 0, 0) == TRUE)
-        {
-          TranslateMessage(&msg);
-          DispatchMessage(&msg);
-        }
-    }
-
-restore:
-  /* restore system */
-  if (w95 && !fChildPreview)
-    SystemParametersInfo(SPI_SCREENSAVERRUNNING, FALSE, &foo, 0);
-  FreeLibrary(hPwdLib);
-  return msg.wParam;
-}
-
-/* this function takes care of *must* do tasks, like terminating
-   screen saver */
-static LRESULT WINAPI SysScreenSaverProc(HWND hWnd, UINT msg,
-                                  WPARAM wParam, LPARAM lParam)
-{
-  switch (msg)
-    {
-    case WM_CREATE:
-      if (!fChildPreview)
-        SetCursor(NULL);
-      /* mouse is not supposed to move from this position */
-      GetCursorPos(&pt_orig);
-      break;
-    case WM_DESTROY:
-      PostQuitMessage(0);
-      break;
-    case WM_TIMER:
-      if (closing)
-        return 0;
-      break;
-    case WM_PAINT:
-      if (closing)
-        return DefWindowProc(hWnd, msg, wParam, lParam);
-      break;
-    case WM_SYSCOMMAND:
-      if (!fChildPreview)
-        switch (wParam)
-          {
-          case SC_CLOSE:
-          case SC_SCREENSAVE:
-          case SC_NEXTWINDOW:
-          case SC_PREVWINDOW:
-            return FALSE;
-          }
-      break;
-    case WM_MOUSEMOVE:
-    case WM_LBUTTONDOWN:
-    case WM_RBUTTONDOWN:
-    case WM_MBUTTONDOWN:
-    case WM_KEYDOWN:
-    case WM_SYSKEYDOWN:
-    case WM_NCACTIVATE:
-    case WM_ACTIVATE:
-    case WM_ACTIVATEAPP:
-      if (closing)
-        return DefWindowProc(hWnd, msg, wParam, lParam);
-      break;
-    }
-  return ScreenSaverProc(hWnd, msg, wParam, lParam);
-}
-
-LONG WINAPI DefScreenSaverProc(HWND hWnd, UINT msg,
-                               WPARAM wParam, LPARAM lParam)
-{
-  /* don't do any special processing when in preview mode */
-  if (fChildPreview || closing)
-    return DefWindowProc(hWnd, msg, wParam, lParam);
-
-  switch (msg)
-    {
-    case WM_CLOSE:
-      TerminateScreenSaver(hWnd);
-      /* do NOT pass this to DefWindowProc; it will terminate even if
-         an invalid password was given.
-       */
-      return 0;
-    case SCRM_VERIFYPW: 
-      /* verify password or return TRUE if password checking is turned off */
-      if (VerifyScreenSavePwd) 
-        return VerifyScreenSavePwd(hWnd);
-      else
-        return TRUE;
-    case WM_SETCURSOR:
-      if (checking_pwd)
-        break;
-      SetCursor(NULL);
-      return TRUE;
-    case WM_NCACTIVATE:
-    case WM_ACTIVATE:
-    case WM_ACTIVATEAPP:
-      if (wParam != FALSE)
-        break;
-    case WM_MOUSEMOVE:
-      {
-        POINT pt;
-        GetCursorPos(&pt);
-        if (pt.x == pt_orig.x && pt.y == pt_orig.y)
-          break;
-      }
-    case WM_LBUTTONDOWN:
-    case WM_RBUTTONDOWN:
-    case WM_MBUTTONDOWN:
-    case WM_KEYDOWN:
-    case WM_SYSKEYDOWN:
-      /* try to terminate screen saver */
-      if (!checking_pwd)
-        PostMessage(hWnd, WM_CLOSE, 0, 0);
-      break;
-    }
-  return DefWindowProc(hWnd, msg, wParam, lParam);
-}
-
-static void TerminateScreenSaver(HWND hWnd)
-{
-  /* don't allow recursion */
-  if (checking_pwd || closing)
-    return;
-
-  /* verify password */
-  if (VerifyScreenSavePwd)
-    {
-      checking_pwd = TRUE;
-      closing = SendMessage(hWnd, SCRM_VERIFYPW, 0, 0);
-      checking_pwd = FALSE;
-    }
-  else
-    closing = TRUE;
-
-  /* are we closing? */
-  if (closing)
-    {
-      DestroyWindow(hWnd);
-    }
-  else
-    GetCursorPos(&pt_orig); /* if not: get new mouse position */
-}
-
-/*
-  Register screen saver window class and call user
-  supplied hook.
- */
-static BOOL RegisterClasses(void)
-{
-  WNDCLASS cls;
-  
-  cls.hCursor = NULL; 
-  cls.hIcon = LoadIcon(hMainInstance, MAKEINTATOM(ID_APP)); 
-  cls.lpszMenuName = NULL;
-  cls.lpszClassName = CLASS_SCRNSAVE;
-  cls.hbrBackground = GetStockObject(BLACK_BRUSH);
-  cls.hInstance = hMainInstance;
-  cls.style = CS_VREDRAW | CS_HREDRAW | CS_SAVEBITS | CS_PARENTDC;
-  cls.lpfnWndProc = (WNDPROC) SysScreenSaverProc;
-  cls.cbWndExtra = 0;
-  cls.cbClsExtra = 0;
-  
-  if (!RegisterClass(&cls))
-    return FALSE;
-
-  return RegisterDialogClasses(hMainInstance);
-}
-
-void WINAPI ScreenSaverChangePassword(HWND hParent)
-{
-  /* load Master Password Router (MPR) */
-  HINSTANCE hMpr = LoadLibrary(TEXT("MPR.DLL"));
-  
-  if (hMpr)
-    {
-      CHPWDPROC ChangePassword;
-      ChangePassword = (CHPWDPROC) GetProcAddress(hMpr, szPwdChangePassword);
-
-      /* change password for screen saver provider */
-      if (ChangePassword)
-        ChangePassword(TEXT("SCRSAVE"), hParent, 0, NULL);
-
-      FreeLibrary(hMpr);
-    }
-}
diff --git a/winsup/w32api/lib/secur32.def b/winsup/w32api/lib/secur32.def
deleted file mode 100644
index 2628f05cf..000000000
--- a/winsup/w32api/lib/secur32.def
+++ /dev/null
@@ -1,39 +0,0 @@
-LIBRARY SECUR32.dll
-EXPORTS
-AcceptSecurityContext@36
-AcquireCredentialsHandleA@36
-AcquireCredentialsHandleW@36
-ApplyControlTokenA@8
-ApplyControlTokenW@8
-CompleteAuthToken@8
-DecryptMessage@16
-DeleteSecurityContext@4
-EncryptMessage@16
-EnumerateSecurityPackagesA@8
-EnumerateSecurityPackagesW@8
-FreeContextBuffer@4
-FreeCredentialsHandle@4
-GetComputerObjectNameA@12
-GetComputerObjectNameW@12
-GetUserNameExA@12
-GetUserNameExW@12
-ImpersonateSecurityContext@4
-InitializeSecurityContextA@48
-InitializeSecurityContextW@48
-LsaCallAuthenticationPackage@28
-LsaDeregisterLogonProcess@4
-LsaFreeReturnBuffer@4
-LsaLogonUser@56
-LsaLookupAuthenticationPackage@12
-LsaRegisterLogonProcess@12
-MakeSignature@16
-QueryContextAttributesA@12
-QueryContextAttributesW@12
-QueryCredentialsAttributesA@12
-QueryCredentialsAttributesW@12
-QuerySecurityPackageInfoA@8
-QuerySecurityPackageInfoW@8
-RevertSecurityContext@4
-TranslateNameA@20
-TranslateNameW@20
-VerifySignature@16
diff --git a/winsup/w32api/lib/setupapi.def b/winsup/w32api/lib/setupapi.def
deleted file mode 100644
index 50eb3c962..000000000
--- a/winsup/w32api/lib/setupapi.def
+++ /dev/null
@@ -1,375 +0,0 @@
-LIBRARY setupapi.dll
-EXPORTS
-AcquireSCMLock@8
-AddMiniIconToList@8
-AddTagToGroupOrderListEntry@12
-AppendStringToMultiSz@24
-AssertFail@12
-CaptureAndConvertAnsiArg@8
-CaptureStringArg@8
-CenterWindowRelativeToParent@4
-ConcatenatePaths@16
-DelayedMove@8
-DelimStringToMultiSz@12
-DestroyTextFileReadBuffer@4
-DoInstallActionWithParams@24
-DoesUserHavePrivilege@4
-DuplicateString@4
-EnablePrivilege@8
-ExtensionPropSheetPageProc@12
-FileExists@8
-FreeStringArray@8
-GetCurrentDriverSigningPolicy@4
-GetSetFileTimestamp@20
-GetVersionInfoFromImage@12
-HandleFailedVerification@40
-InfIsFromOemLocation@8
-InstallCatalog@12
-InstallHinfSection@16
-InstallHinfSectionA@16
-InstallHinfSectionW@16
-InstallStop@4
-InstallStopEx@12
-IsUserAdmin@0
-LookUpStringInTable@12
-MemoryInitialize@4
-MultiByteToUnicode@8
-MultiSzFromSearchControl@16
-MyFree@4
-MyGetFileTitle@4
-MyMalloc@4
-MyRealloc@8
-OpenAndMapFileForRead@20
-OutOfMemory@4
-QueryMultiSzValueToArray@24
-QueryRegistryValue@20
-ReadAsciiOrUnicodeTextFile@8
-RegistryDelnode@8
-RetreiveFileSecurity@8
-RetrieveServiceConfig@8
-SearchForInfFile@24
-SetArrayToMultiSzValue@20
-SetupAddInstallSectionToDiskSpaceListA@24
-SetupAddInstallSectionToDiskSpaceListW@24
-SetupAddSectionToDiskSpaceListA@28
-SetupAddSectionToDiskSpaceListW@28
-SetupAddToDiskSpaceListA@28
-SetupAddToDiskSpaceListW@28
-SetupAddToSourceListA@8
-SetupAddToSourceListW@8
-SetupAdjustDiskSpaceListA@24
-SetupAdjustDiskSpaceListW@24
-SetupBackupErrorA@24
-SetupBackupErrorW@24
-SetupCancelTemporarySourceList@0
-SetupCloseFileQueue@4
-SetupCloseInfFile@4
-SetupCloseLog@0
-SetupCommitFileQueue@16
-SetupCommitFileQueueA@16
-SetupCommitFileQueueW@16
-SetupCopyErrorA@44
-SetupCopyErrorW@44
-SetupCopyOEMInfA@32
-SetupCopyOEMInfW@32
-SetupCreateDiskSpaceListA@12
-SetupCreateDiskSpaceListW@12
-SetupDecompressOrCopyFileA@12
-SetupDecompressOrCopyFileW@12
-SetupDefaultQueueCallback@16
-SetupDefaultQueueCallbackA@16
-SetupDefaultQueueCallbackW@16
-SetupDeleteErrorA@20
-SetupDeleteErrorW@20
-SetupDestroyDiskSpaceList@4
-SetupDiAskForOEMDisk@8
-SetupDiBuildClassInfoList@16
-SetupDiBuildClassInfoListExA@24
-SetupDiBuildClassInfoListExW@24
-SetupDiBuildDriverInfoList@12
-SetupDiCallClassInstaller@12
-SetupDiCancelDriverInfoSearch@4
-SetupDiChangeState@8
-SetupDiClassGuidsFromNameA@16
-SetupDiClassGuidsFromNameExA@24
-SetupDiClassGuidsFromNameExW@24
-SetupDiClassGuidsFromNameW@16
-SetupDiClassNameFromGuidA@16
-SetupDiClassNameFromGuidExA@24
-SetupDiClassNameFromGuidExW@24
-SetupDiClassNameFromGuidW@16
-SetupDiCreateDevRegKeyA@28
-SetupDiCreateDevRegKeyW@28
-SetupDiCreateDeviceInfoA@28
-SetupDiCreateDeviceInfoList@8
-SetupDiCreateDeviceInfoListExA@16
-SetupDiCreateDeviceInfoListExW@16
-SetupDiCreateDeviceInfoW@28
-SetupDiCreateDeviceInterfaceA@24
-SetupDiCreateDeviceInterfaceRegKeyA@24
-SetupDiCreateDeviceInterfaceRegKeyW@24
-SetupDiCreateDeviceInterfaceW@24
-SetupDiDeleteDevRegKey@20
-SetupDiDeleteDeviceInfo@8
-SetupDiDeleteDeviceInterfaceData@8
-SetupDiDeleteDeviceInterfaceRegKey@12
-SetupDiDestroyClassImageList@4
-SetupDiDestroyDeviceInfoList@4
-SetupDiDestroyDriverInfoList@12
-SetupDiDrawMiniIcon@28
-SetupDiEnumDeviceInfo@12
-SetupDiEnumDeviceInterfaces@20
-SetupDiEnumDriverInfoA@20
-SetupDiEnumDriverInfoW@20
-SetupDiGetActualSectionToInstallA@24
-SetupDiGetActualSectionToInstallW@24
-SetupDiGetClassBitmapIndex@8
-SetupDiGetClassDescriptionA@16
-SetupDiGetClassDescriptionExA@24
-SetupDiGetClassDescriptionExW@24
-SetupDiGetClassDescriptionW@16
-SetupDiGetClassDevPropertySheetsA@24
-SetupDiGetClassDevPropertySheetsW@24
-SetupDiGetClassDevsA@16
-SetupDiGetClassDevsExA@28
-SetupDiGetClassDevsExW@28
-SetupDiGetClassDevsW@16
-SetupDiGetClassImageIndex@12
-SetupDiGetClassImageList@4
-SetupDiGetClassImageListExA@12
-SetupDiGetClassImageListExW@12
-SetupDiGetClassInstallParamsA@20
-SetupDiGetClassInstallParamsW@20
-SetupDiGetDeviceInfoListClass@8
-SetupDiGetDeviceInfoListDetailA@8
-SetupDiGetDeviceInfoListDetailW@8
-SetupDiGetDeviceInstallParamsA@12
-SetupDiGetDeviceInstallParamsW@12
-SetupDiGetDeviceInstanceIdA@20
-SetupDiGetDeviceInstanceIdW@20
-SetupDiGetDeviceInterfaceAlias@16
-SetupDiGetDeviceInterfaceDetailA@24
-SetupDiGetDeviceInterfaceDetailW@24
-SetupDiGetDeviceRegistryPropertyA@28
-SetupDiGetDeviceRegistryPropertyW@28
-SetupDiGetDriverInfoDetailA@24
-SetupDiGetDriverInfoDetailW@24
-SetupDiGetDriverInstallParamsA@16
-SetupDiGetDriverInstallParamsW@16
-SetupDiGetHwProfileFriendlyNameA@16
-SetupDiGetHwProfileFriendlyNameExA@24
-SetupDiGetHwProfileFriendlyNameExW@24
-SetupDiGetHwProfileFriendlyNameW@16
-SetupDiGetHwProfileList@16
-SetupDiGetHwProfileListExA@24
-SetupDiGetHwProfileListExW@24
-SetupDiGetINFClassA@20
-SetupDiGetINFClassW@20
-SetupDiGetSelectedDevice@8
-SetupDiGetSelectedDriverA@12
-SetupDiGetSelectedDriverW@12
-SetupDiGetWizardPage@20
-SetupDiInstallClassA@16
-SetupDiInstallClassExA@28
-SetupDiInstallClassExW@28
-SetupDiInstallClassW@16
-SetupDiInstallDevice@8
-SetupDiInstallDeviceInterfaces@8
-SetupDiInstallDriverFiles@8
-SetupDiLoadClassIcon@12
-SetupDiMoveDuplicateDevice@8
-SetupDiOpenClassRegKey@8
-SetupDiOpenClassRegKeyExA@20
-SetupDiOpenClassRegKeyExW@20
-SetupDiOpenDevRegKey@24
-SetupDiOpenDeviceInfoA@20
-SetupDiOpenDeviceInfoW@20
-SetupDiOpenDeviceInterfaceA@16
-SetupDiOpenDeviceInterfaceRegKey@16
-SetupDiOpenDeviceInterfaceW@16
-SetupDiRegisterCoDeviceInstallers@8
-SetupDiRegisterDeviceInfo@24
-SetupDiRemoveDevice@8
-SetupDiRemoveDeviceInterface@8
-SetupDiSelectBestCompatDrv@8
-SetupDiSelectDevice@8
-SetupDiSelectOEMDrv@12
-SetupDiSetClassInstallParamsA@16
-SetupDiSetClassInstallParamsW@16
-SetupDiSetDeviceInstallParamsA@12
-SetupDiSetDeviceInstallParamsW@12
-SetupDiSetDeviceRegistryPropertyA@20
-SetupDiSetDeviceRegistryPropertyW@20
-SetupDiSetDriverInstallParamsA@16
-SetupDiSetDriverInstallParamsW@16
-SetupDiSetSelectedDevice@8
-SetupDiSetSelectedDriverA@12
-SetupDiSetSelectedDriverW@12
-SetupDiUnremoveDevice@8
-SetupDuplicateDiskSpaceListA@16
-SetupDuplicateDiskSpaceListW@16
-SetupFindFirstLineA@16
-SetupFindFirstLineW@16
-SetupFindNextLine@8
-SetupFindNextMatchLineA@12
-SetupFindNextMatchLineW@12
-SetupFreeSourceListA@8
-SetupFreeSourceListW@8
-SetupGetBackupInformationA@8
-SetupGetBackupInformationW@8
-SetupGetBinaryField@20
-SetupGetFieldCount@4
-SetupGetFileCompressionInfoA@20
-SetupGetFileCompressionInfoW@20
-SetupGetInfFileListA@20
-SetupGetInfFileListW@20
-SetupGetInfInformationA@20
-SetupGetInfInformationW@20
-SetupGetInfSections@16
-SetupGetIntField@12
-SetupGetLineByIndexA@16
-SetupGetLineByIndexW@16
-SetupGetLineCountA@8
-SetupGetLineCountW@8
-SetupGetLineTextA@28
-SetupGetLineTextW@28
-SetupGetMultiSzFieldA@20
-SetupGetMultiSzFieldW@20
-SetupGetSourceFileLocationA@28
-SetupGetSourceFileLocationW@28
-SetupGetSourceFileSizeA@24
-SetupGetSourceFileSizeW@24
-SetupGetSourceInfoA@24
-SetupGetSourceInfoW@24
-SetupGetStringFieldA@20
-SetupGetStringFieldW@20
-SetupGetTargetPathA@24
-SetupGetTargetPathW@24
-SetupInitDefaultQueueCallback@4
-SetupInitDefaultQueueCallbackEx@20
-SetupInitializeFileLogA@8
-SetupInitializeFileLogW@8
-SetupInstallFileA@32
-SetupInstallFileExA@36
-SetupInstallFileExW@36
-SetupInstallFileW@32
-SetupInstallFilesFromInfSectionA@24
-SetupInstallFilesFromInfSectionW@24
-SetupInstallFromInfSectionA@44
-SetupInstallFromInfSectionW@44
-SetupInstallServicesFromInfSectionA@12
-SetupInstallServicesFromInfSectionExA@28
-SetupInstallServicesFromInfSectionExW@28
-SetupInstallServicesFromInfSectionW@12
-SetupIterateCabinetA@16
-SetupIterateCabinetW@16
-SetupLogErrorA@8
-SetupLogErrorW@8
-SetupLogFileA@36
-SetupLogFileW@36
-SetupOpenAppendInfFileA@12
-SetupOpenAppendInfFileW@12
-SetupOpenFileQueue@0
-SetupOpenInfFileA@16
-SetupOpenInfFileW@16
-SetupOpenLog@4
-SetupOpenMasterInf@0
-SetupPromptForDiskA@40
-SetupPromptForDiskW@40
-SetupPromptReboot@12
-SetupQueryDrivesInDiskSpaceListA@16
-SetupQueryDrivesInDiskSpaceListW@16
-SetupQueryFileLogA@28
-SetupQueryFileLogW@28
-SetupQueryInfFileInformationA@20
-SetupQueryInfFileInformationW@20
-SetupQueryInfOriginalFileInformationA@16
-SetupQueryInfOriginalFileInformationW@16
-SetupQueryInfVersionInformationA@24
-SetupQueryInfVersionInformationW@24
-SetupQuerySourceListA@12
-SetupQuerySourceListW@12
-SetupQuerySpaceRequiredOnDriveA@20
-SetupQuerySpaceRequiredOnDriveW@20
-SetupQueueCopyA@36
-SetupQueueCopyIndirectA@4
-SetupQueueCopyIndirectW@4
-SetupQueueCopySectionA@24
-SetupQueueCopySectionW@24
-SetupQueueCopyW@36
-SetupQueueDefaultCopyA@24
-SetupQueueDefaultCopyW@24
-SetupQueueDeleteA@12
-SetupQueueDeleteSectionA@16
-SetupQueueDeleteSectionW@16
-SetupQueueDeleteW@12
-SetupQueueRenameA@20
-SetupQueueRenameSectionA@16
-SetupQueueRenameSectionW@16
-SetupQueueRenameW@20
-SetupRemoveFileLogEntryA@12
-SetupRemoveFileLogEntryW@12
-SetupRemoveFromDiskSpaceListA@20
-SetupRemoveFromDiskSpaceListW@20
-SetupRemoveFromSourceListA@8
-SetupRemoveFromSourceListW@8
-SetupRemoveInstallSectionFromDiskSpaceListA@24
-SetupRemoveInstallSectionFromDiskSpaceListW@24
-SetupRemoveSectionFromDiskSpaceListA@28
-SetupRemoveSectionFromDiskSpaceListW@28
-SetupRenameErrorA@24
-SetupRenameErrorW@24
-SetupScanFileQueue@24
-SetupScanFileQueueA@24
-SetupScanFileQueueW@24
-SetupSetDirectoryIdA@12
-SetupSetDirectoryIdExA@24
-SetupSetDirectoryIdExW@24
-SetupSetDirectoryIdW@12
-SetupSetFileQueueAlternatePlatformA@12
-SetupSetFileQueueAlternatePlatformW@12
-SetupSetPlatformPathOverrideA@4
-SetupSetPlatformPathOverrideW@4
-SetupSetSourceListA@12
-SetupSetSourceListW@12
-SetupTermDefaultQueueCallback@4
-SetupTerminateFileLog@4
-ShouldDeviceBeExcluded@12
-StampFileSecurity@8
-StringTableAddString@12
-StringTableAddStringEx@20
-StringTableDestroy@4
-StringTableDuplicate@4
-StringTableEnum@20
-StringTableGetExtraData@16
-StringTableInitialize@0
-StringTableInitializeEx@8
-StringTableLookUpString@12
-StringTableLookUpStringEx@20
-StringTableSetExtraData@16
-StringTableStringFromId@8
-StringTableStringFromIdEx@16
-StringTableTrim@4
-TakeOwnershipOfFile@4
-UnicodeToMultiByte@8
-UnmapAndCloseFile@12
-VerifyCatalogFile@4
-VerifyFile@48
-pSetupAccessRunOnceNodeList@0
-pSetupDestroyRunOnceNodeList@0
-pSetupDiGetDeviceInfoContext@12
-pSetupDiSetDeviceInfoContext@12
-pSetupDirectoryIdToPath@20
-pSetupGetField@8
-pSetupGetGlobalFlags@0
-pSetupGetOsLoaderDriveAndPath@16
-pSetupGetQueueFlags@4
-pSetupGetVersionDatum@8
-pSetupGuidFromString@8
-pSetupIsGuidNull@4
-pSetupMakeSurePathExists@4
-pSetupSetGlobalFlags@4
-pSetupSetQueueFlags@8
-pSetupSetSystemSourcePath@8
-pSetupStringFromGuid@12
-pSetupVerifyQueuedCatalogs@4
diff --git a/winsup/w32api/lib/shell32.c b/winsup/w32api/lib/shell32.c
deleted file mode 100644
index c65442453..000000000
--- a/winsup/w32api/lib/shell32.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#define INITGUID
-#include <basetyps.h>
-#include <shlguid.h>
-
-DEFINE_SHLGUID(CLSID_ShellDesktop,0x00021400L,0,0);
-DEFINE_SHLGUID(CLSID_ShellLink,0x00021401L,0,0);
-DEFINE_SHLGUID(FMTID_Intshcut,0x000214A0L,0,0);
-DEFINE_SHLGUID(FMTID_InternetSite,0x000214A1L,0,0);
-DEFINE_SHLGUID(CGID_Explorer,0x000214D0L,0,0);
-DEFINE_SHLGUID(CGID_ShellDocView,0x000214D1L,0,0);
-DEFINE_SHLGUID(CGID_ShellServiceObject,0x000214D2L,0,0);
-DEFINE_SHLGUID(IID_INewShortcutHookA,0x000214E1L,0,0);
-DEFINE_SHLGUID(IID_IShellBrowser,0x000214E2L,0,0);
-DEFINE_SHLGUID(IID_IShellView,0x000214E3L,0,0);
-DEFINE_SHLGUID(IID_IContextMenu,0x000214E4L,0,0);
-DEFINE_SHLGUID(IID_IQueryInfo,0x00021500L,0,0);
-DEFINE_SHLGUID(IID_IShellIcon,0x000214E5L,0,0);
-DEFINE_SHLGUID(IID_IShellFolder,0x000214E6L,0,0);
-DEFINE_SHLGUID(IID_IShellExtInit,0x000214E8L,0,0);
-DEFINE_SHLGUID(IID_IShellPropSheetExt,0x000214E9L,0,0);
-DEFINE_SHLGUID(IID_IPersistFolder,0x000214EAL,0,0);
-DEFINE_SHLGUID(IID_IExtractIconA,0x000214EBL,0,0);
-DEFINE_SHLGUID(IID_IShellLinkA,0x000214EEL,0,0);
-DEFINE_SHLGUID(IID_IShellCopyHookA,0x000214EFL,0,0);
-DEFINE_SHLGUID(IID_IFileViewerA,0x000214F0L,0,0);
-DEFINE_SHLGUID(IID_ICommDlgBrowser,0x000214F1L,0,0);
-DEFINE_SHLGUID(IID_IEnumIDList,0x000214F2L,0,0);
-DEFINE_SHLGUID(IID_IFileViewerSite,0x000214F3L,0,0);
-DEFINE_SHLGUID(IID_IContextMenu2,0x000214F4L,0,0);
-DEFINE_SHLGUID(IID_IShellExecuteHookA,0x000214F5L,0,0);
-DEFINE_SHLGUID(IID_IPropSheetPage,0x000214F6L,0,0);
-DEFINE_SHLGUID(IID_INewShortcutHookW,0x000214F7L,0,0);
-DEFINE_SHLGUID(IID_IFileViewerW,0x000214F8L,0,0);
-DEFINE_SHLGUID(IID_IShellLinkW,0x000214F9L,0,0);
-DEFINE_SHLGUID(IID_IExtractIconW,0x000214FAL,0,0);
-DEFINE_SHLGUID(IID_IShellExecuteHookW,0x000214FBL,0,0);
-DEFINE_SHLGUID(IID_IShellCopyHookW,0x000214FCL,0,0);
-DEFINE_GUID(IID_IShellView2,0x88E39E80L,0x3578,0x11CF,0xAE,0x69,0x08,0x00,0x2B,0x2E,0x12,0x62);
-DEFINE_GUID(LIBID_SHDocVw,0xEAB22AC0,0x30C1,0x11CF,0xA7,0xEB,0x00,0x00,0xC0,0x5B,0xAE,0x0B);
-DEFINE_GUID(IID_IShellExplorer,0xEAB22AC1,0x30C1,0x11CF,0xA7,0xEB,0x00,0x00,0xC0,0x5B,0xAE,0x0B);
-DEFINE_GUID(DIID_DShellExplorerEvents,0xEAB22AC2,0x30C1,0x11CF,0xA7,0xEB,0x00,0x00,0xC0,0x5B,0xAE,0x0B);
-DEFINE_GUID(CLSID_ShellExplorer,0xEAB22AC3,0x30C1,0x11CF,0xA7,0xEB,0x00,0x00,0xC0,0x5B,0xAE,0x0B);
-DEFINE_GUID(IID_ISHItemOC,0xEAB22AC4,0x30C1,0x11CF,0xA7,0xEB,0x00,0x00,0xC0,0x5B,0xAE,0x0B);
-DEFINE_GUID(DIID_DSHItemOCEvents,0xEAB22AC5,0x30C1,0x11CF,0xA7,0xEB,0x00,0x00,0xC0,0x5B,0xAE,0x0B);
-DEFINE_GUID(CLSID_SHItemOC,0xEAB22AC6,0x30C1,0x11CF,0xA7,0xEB,0x00,0x00,0xC0,0x5B,0xAE,0x0B);
-DEFINE_GUID(IID_DHyperLink,0x0002DF07,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
-DEFINE_GUID(IID_DIExplorer,0x0002DF05,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
-DEFINE_GUID(DIID_DExplorerEvents,0x0002DF06,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
-DEFINE_GUID(CLSID_InternetExplorer,0x0002DF01,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
-DEFINE_GUID(CLSID_StdHyperLink,0x0002DF09,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46);
-DEFINE_GUID(CLSID_FileTypes,0xB091E540,0x83E3,0x11CF,0xA7,0x13,0x00,0x20,0xAF,0xD7,0x97,0x62);
-DEFINE_GUID(CLSID_InternetShortcut,0xFBF23B40L,0xE3F0,0x101B,0x84,0x88,0x00,0xAA,0x00,0x3E,0x56,0xF8);
-DEFINE_GUID(IID_IUniformResourceLocator,0xFBF23B80L,0xE3F0,0x101B,0x84,0x88,0x00,0xAA,0x00,0x3E,0x56,0xF8);
-DEFINE_GUID(CLSID_DragDropHelper,0x4657278AL,0x411B,0x11D2,0x83,0x9A,0x0,0xC0,0x4F,0xD9,0x18,0xD0);
-DEFINE_GUID(IID_IDropTargetHelper,0x4657278BL,0x411B,0x11D2,0x83,0x9A,0x0,0xC0,0x4F,0xD9,0x18,0xD0);
-DEFINE_GUID(IID_IDragSourceHelper,0xDE5BF786L,0x477A,0x11D2,0x83,0x9D,0x0,0xC0,0x4F,0xD9,0x18,0xD0);
-DEFINE_GUID(IID_IColumnProvider,0xE8025004,0x1C42,0x11D2,0xBE,0x2C,0x0,0xA0,0xC9,0xA8,0x3D,0xA1);
-DEFINE_GUID(IID_IShellIconOverlayIdentifier,0x0C6C4200L,0xC589,0x11D0,0x99,0x9A,0x00,0xC0,0x4F,0xD6,0x55,0xE1);
diff --git a/winsup/w32api/lib/shell32.def b/winsup/w32api/lib/shell32.def
deleted file mode 100644
index 6684f7a5a..000000000
--- a/winsup/w32api/lib/shell32.def
+++ /dev/null
@@ -1,182 +0,0 @@
-LIBRARY SHELL32.DLL
-EXPORTS
-WOWShellExecute@28
-StrStrW@8
-StrStrIW@8
-StrStrIA@8
-StrStrA@8
-StrRStrW@12
-StrRStrIW@12
-StrRStrIA@12
-StrRStrA@12
-StrRChrW@12
-StrRChrIW@12
-StrRChrIA@12
-StrRChrA@12
-StrNCpyW@12
-StrNCpyA@12
-StrNCmpW@12
-StrNCmpIW@12
-StrNCmpIA@12
-StrNCmpA@12
-StrCpyNW@12
-StrCpyNA@12
-StrCmpNW@12
-StrCmpNIW@12
-StrCmpNIA@12
-StrCmpNA@12
-StrChrW@8
-StrChrIW@8
-StrChrIA@8
-StrChrA@8
-SHUpdateRecycleBinIcon@0
-SHSetUnreadMailCountW@12
-SHSetLocalizedName@12
-SHQueryRecycleBinW@8
-SHQueryRecycleBinA@8
-SHPathPrepareForWriteW@16
-SHPathPrepareForWriteA@16
-SHParseDisplayName@20
-SHOpenFolderAndSelectItems@16
-SHLoadNonloadedIconOverlayIdentifiers@0
-SHLoadInProc@4
-SHIsFileAvailableOffline@8
-SHInvokePrinterCommandW@20
-SHInvokePrinterCommandA@20
-SHHelpShortcuts_RunDLL@16
-SHGetUnreadMailCountW@24
-SHGetSpecialFolderPathW@16
-SHGetSpecialFolderPathA@16
-SHGetSpecialFolderLocation@12
-SHGetSetSettings@12
-SHGetSettings@8
-SHGetPathFromIDListW@8
-SHGetPathFromIDListA@8
-SHGetPathFromIDList@8
-SHGetNewLinkInfoW@20
-SHGetNewLinkInfoA@20
-SHGetNewLinkInfo@20
-SHGetMalloc@4
-SHGetInstanceExplorer@4
-SHGetIconOverlayIndexW@8
-SHGetIconOverlayIndexA@8
-SHGetFolderPathAndSubDirW@24
-SHGetFolderPathAndSubDirA@24
-; SHGetFolder is in shell32.dll on W2K up,
-; but in redistributable shfolder.dll for earlier OS versions.
-SHGetFolderPathW@20
-SHGetFolderPathA@20
-SHGetFolderLocation@20
-SHGetFileInfoW@20
-SHGetFileInfoA@20
-SHGetFileInfo@20
-SHGetDiskFreeSpaceExW@16
-SHGetDiskFreeSpaceExA@16
-SHGetDiskFreeSpaceA@16
-SHGetDesktopFolder@4
-SHGetDataFromIDListW@20
-SHGetDataFromIDListA@20
-SHFreeNameMappings@4
-SHFormatDrive@16
-SHFileOperationW@4
-SHFileOperationA@4
-SHFileOperation@4
-SHExtractIconsW@32
-SheShortenPathW@8
-SheShortenPathA@8
-SheSetCurDrive@4
-SheRemoveQuotesW@4
-SheRemoveQuotesA@4
-SHEnumerateUnreadMailAccountsW@16
-SHEmptyRecycleBinW@12
-SHEmptyRecycleBinA@12
-ShellHookProc@12
-ShellExecuteW@24
-ShellExecuteExW@4
-ShellExecuteExA@4
-ShellExecuteEx@4
-ShellExecuteA@24
-ShellAboutW@16
-ShellAboutA@16
-Shell_NotifyIconW@8
-Shell_NotifyIconA@8
-Shell_NotifyIcon@8
-SheGetPathOffsetW@4
-SheGetDirW@8
-SheGetDirExW@12
-SheGetDirA@8
-SheGetCurDrive@0
-SheFullPathW@12
-SheFullPathA@12
-SheConvertPathW@12
-SheChangeDirW@4
-SheChangeDirExW@4
-SheChangeDirExA@4
-SheChangeDirA@4
-SHCreateShellItem@16
-SHCreateQueryCancelAutoPlayMoniker@4
-SHCreateProcessAsUserW@4
-SHCreateDirectoryExW@12
-SHCreateDirectoryExA@12
-SHChangeNotify@16
-SHBrowseForFolderW@4
-SHBrowseForFolderA@4
-SHBrowseForFolder@4
-SHBindToParent@16
-SHAppBarMessage@8
-SHAddToRecentDocs@8
-RegisterShellHook@8
-RegenerateUserEnvironment@8
-RealShellExecuteW@40
-RealShellExecuteExW@44
-RealShellExecuteExA@44
-RealShellExecuteA@40
-PrintersGetCommand_RunDLL@16
-OpenAs_RunDLL@16
-InternalExtractIconListW@12
-InternalExtractIconListA@12
-FreeIconList@8
-FindExeDlgProc@16
-FindExecutableW@12
-FindExecutableA@12
-ExtractVersionResource16W@8
-ExtractIconW@12
-ExtractIconResInfoW@20
-ExtractIconResInfoA@20
-ExtractIconExW@20
-ExtractIconExA@20
-ExtractIconEx@20
-ExtractIconA@12
-ExtractAssociatedIconW@12
-ExtractAssociatedIconExW@16
-ExtractAssociatedIconExA@16
-ExtractAssociatedIconA@12
-DuplicateIcon@8
-DragQueryPoint@8
-DragQueryFileW@16
-DragQueryFileAorW@24
-DragQueryFileA@16
-DragQueryFile@16
-DragFinish@4
-DragAcceptFiles@8
-DoEnvironmentSubstW@8
-DoEnvironmentSubstA@8
-Control_RunDLL@16
-Control_FillCache_RunDLL@16
-CommandLineToArgvW@8
-CheckEscapesW@8
-CheckEscapesA@8
-ILAppendID@12
-ILClone@4
-ILCloneFirst@4
-ILCombine@8
-ILFindChild@8
-ILFindLastID@4
-ILFree@4
-ILGetNext@4
-ILGetSize@4
-ILIsEqual@8
-ILIsParent@12
-ILLoadFromStream@8
-ILRemoveLastID@4
-ILSaveToStream@8
diff --git a/winsup/w32api/lib/shfolder.def b/winsup/w32api/lib/shfolder.def
deleted file mode 100644
index edcf7060b..000000000
--- a/winsup/w32api/lib/shfolder.def
+++ /dev/null
@@ -1,4 +0,0 @@
-LIBRARY SHFOLDER.DLL
-EXPORTS
-SHGetFolderPathA@20
-SHGetFolderPathW@20
diff --git a/winsup/w32api/lib/shlwapi.def b/winsup/w32api/lib/shlwapi.def
deleted file mode 100644
index e29f72f34..000000000
--- a/winsup/w32api/lib/shlwapi.def
+++ /dev/null
@@ -1,296 +0,0 @@
-LIBRARY SHLWAPI.DLL
-EXPORTS
-AssocCreate@24
-AssocQueryKeyA@20
-AssocQueryKeyW@20
-AssocQueryStringA@24
-AssocQueryStringByKeyA@24
-AssocQueryStringByKeyW@24
-AssocQueryStringW@24
-ChrCmpIA@8
-ChrCmpIW@8
-ColorAdjustLuma@12
-ColorHLSToRGB@12
-ColorRGBToHLS@16
-GetMenuPosFromID@8
-HashData@16
-IntlStrEqWorkerA@16
-IntlStrEqWorkerW@16
-PathAddBackslashA@4
-PathAddBackslashW@4
-PathAddExtensionA@8
-PathAddExtensionW@8
-PathAppendA@8
-PathAppendW@8
-PathBuildRootA@8
-PathBuildRootW@8
-PathCanonicalizeA@8
-PathCanonicalizeW@8
-PathCombineA@12
-PathCombineW@12
-PathCommonPrefixA@12
-PathCommonPrefixW@12
-PathCompactPathA@12
-PathCompactPathExA@16
-PathCompactPathExW@16
-PathCompactPathW@12
-PathCreateFromUrlA@16
-PathCreateFromUrlW@16
-PathFileExistsA@4
-PathFileExistsW@4
-PathFindExtensionA@4
-PathFindExtensionW@4
-PathFindFileNameA@4
-PathFindFileNameW@4
-PathFindNextComponentA@4
-PathFindNextComponentW@4
-PathFindOnPathA@8
-PathFindOnPathW@8
-PathFindSuffixArrayA@12
-PathFindSuffixArrayW@12
-PathGetArgsA@4
-PathGetArgsW@4
-PathGetCharTypeA@4
-PathGetCharTypeW@4
-PathGetDriveNumberA@4
-PathGetDriveNumberW@4
-PathIsContentTypeA@8
-PathIsContentTypeW@8
-PathIsDirectoryA@4
-PathIsDirectoryEmptyA@4
-PathIsDirectoryEmptyW@4
-PathIsDirectoryW@4
-PathIsFileSpecA@4
-PathIsFileSpecW@4
-PathIsLFNFileSpecA@4
-PathIsLFNFileSpecW@4
-PathIsNetworkPathA@4
-PathIsNetworkPathW@4
-PathIsPrefixA@8
-PathIsPrefixW@8
-PathIsRelativeA@4
-PathIsRelativeW@4
-PathIsRootA@4
-PathIsRootW@4
-PathIsSameRootA@8
-PathIsSameRootW@8
-PathIsSystemFolderA@8
-PathIsSystemFolderW@8
-PathIsUNCA@4
-PathIsUNCServerA@4
-PathIsUNCServerShareA@4
-PathIsUNCServerShareW@4
-PathIsUNCServerW@4
-PathIsUNCW@4
-PathIsURLA@4
-PathIsURLW@4
-PathMakePrettyA@4
-PathMakePrettyW@4
-PathMakeSystemFolderA@4
-PathMakeSystemFolderW@4
-PathMatchSpecA@8
-PathMatchSpecW@8
-PathParseIconLocationA@4
-PathParseIconLocationW@4
-PathQuoteSpacesA@4
-PathQuoteSpacesW@4
-PathRelativePathToA@20
-PathRelativePathToW@20
-PathRemoveArgsA@4
-PathRemoveArgsW@4
-PathRemoveBackslashA@4
-PathRemoveBackslashW@4
-PathRemoveBlanksA@4
-PathRemoveBlanksW@4
-PathRemoveExtensionA@4
-PathRemoveExtensionW@4
-PathRemoveFileSpecA@4
-PathRemoveFileSpecW@4
-PathRenameExtensionA@8
-PathRenameExtensionW@8
-PathSearchAndQualifyA@12
-PathSearchAndQualifyW@12
-PathSetDlgItemPathA@12
-PathSetDlgItemPathW@12
-PathSkipRootA@4
-PathSkipRootW@4
-PathStripPathA@4
-PathStripPathW@4
-PathStripToRootA@4
-PathStripToRootW@4
-PathUnExpandEnvStringsA@12
-PathUnExpandEnvStringsW@12
-PathUndecorateA@4
-PathUndecorateW@4
-PathUnmakeSystemFolderA@4
-PathUnmakeSystemFolderW@4
-PathUnquoteSpacesA@4
-PathUnquoteSpacesW@4
-SHAutoComplete@8
-SHCopyKeyA@16
-SHCopyKeyW@16
-SHCreateShellPalette@4
-SHCreateStreamOnFileA@12
-SHCreateStreamOnFileEx@24
-SHCreateStreamOnFileW@12
-SHCreateStreamWrapper@16
-SHCreateThread@16
-SHDeleteEmptyKeyA@8
-SHDeleteEmptyKeyW@8
-SHDeleteKeyA@8
-SHDeleteKeyW@8
-SHDeleteOrphanKeyA@8
-SHDeleteOrphanKeyW@8
-SHDeleteValueA@12
-SHDeleteValueW@12
-SHEnumKeyExA@16
-SHEnumKeyExW@16
-SHEnumValueA@28
-SHEnumValueW@28
-SHGetInverseCMAP@8
-SHGetThreadRef@4
-SHGetValueA@24
-SHGetValueW@24
-SHIsLowMemoryMachine@4
-SHLoadIndirectString@16
-SHOpenRegStream2A@16
-SHOpenRegStream2W@16
-SHOpenRegStreamA@16
-SHOpenRegStreamW@16
-SHQueryInfoKeyA@20
-SHQueryInfoKeyW@20
-SHQueryValueExA@24
-SHQueryValueExW@24
-SHRegCloseUSKey@4
-SHRegCreateUSKeyA@20
-SHRegCreateUSKeyW@20
-SHRegDeleteEmptyUSKeyA@12
-SHRegDeleteEmptyUSKeyW@12
-SHRegDeleteUSValueA@12
-SHRegDeleteUSValueW@12
-SHRegDuplicateHKey@4
-SHRegEnumUSKeyA@20
-SHRegEnumUSKeyW@20
-SHRegEnumUSValueA@32
-SHRegEnumUSValueW@32
-SHRegGetBoolUSValueA@16
-SHRegGetBoolUSValueW@16
-SHRegGetPathA@20
-SHRegGetPathW@20
-SHRegGetUSValueA@32
-SHRegGetUSValueW@32
-SHRegOpenUSKeyA@20
-SHRegOpenUSKeyW@20
-SHRegQueryInfoUSKeyA@24
-SHRegQueryInfoUSKeyW@24
-SHRegQueryUSValueA@32
-SHRegQueryUSValueW@32
-SHRegSetPathA@20
-SHRegSetPathW@20
-SHRegSetUSValueA@24
-SHRegSetUSValueW@24
-SHRegWriteUSValueA@24
-SHRegWriteUSValueW@24
-SHRegisterValidateTemplate@8
-SHReleaseThreadRef@0
-SHSetThreadRef@4
-SHSetValueA@24
-SHSetValueW@24
-SHSkipJunction@8
-SHStrDupA@8
-SHStrDupW@8
-StrCSpnA@8
-StrCSpnIA@8
-StrCSpnIW@8
-StrCSpnW@8
-StrCatBuffA@12
-StrCatBuffW@12
-StrCatChainW@16
-StrCatW@8
-StrChrA@8
-StrChrIA@8
-StrChrIW@8
-StrChrNIW@12
-StrChrNW@12
-StrChrW@8
-StrCmpIW@8
-StrCmpLogicalW@8
-StrCmpNA@12
-StrCmpNIA@12
-StrCmpNIW@12
-StrCmpNW@12
-StrCmpW@8
-StrCpyNW@12
-StrCpyW@8
-StrDupA@4
-StrDupW@4
-StrFormatByteSize64A@16
-StrFormatByteSizeA@12
-StrFormatByteSizeW@16
-StrFormatKBSizeA@16
-StrFormatKBSizeW@16
-StrFromTimeIntervalA@16
-StrFromTimeIntervalW@16
-StrIsIntlEqualA@16
-StrIsIntlEqualW@16
-StrNCatA@12
-StrNCatW@12
-StrPBrkA@8
-StrPBrkW@8
-StrRChrA@12
-StrRChrIA@12
-StrRChrIW@12
-StrRChrW@12
-StrRStrIA@12
-StrRStrIW@12
-StrRetToBSTR@12
-StrRetToBufA@16
-StrRetToBufW@16
-StrRetToStrA@12
-StrRetToStrW@12
-StrSpnA@8
-StrSpnW@8
-StrStrA@8
-StrStrIA@8
-StrStrIW@8
-StrStrNIW@12
-StrStrNW@12
-StrStrW@8
-StrToInt64ExA@12
-StrToInt64ExW@12
-StrToIntA@4
-StrToIntExA@12
-StrToIntExW@12
-StrToIntW@4
-StrTrimA@8
-StrTrimW@8
-UrlApplySchemeA@16
-UrlApplySchemeW@16
-UrlCanonicalizeA@16
-UrlCanonicalizeW@16
-UrlCombineA@20
-UrlCombineW@20
-UrlCompareA@12
-UrlCompareW@12
-UrlCreateFromPathA@16
-UrlCreateFromPathW@16
-UrlEscapeA@16
-UrlEscapeW@16
-UrlGetLocationA@4
-UrlGetLocationW@4
-UrlGetPartA@20
-UrlGetPartW@20
-UrlHashA@12
-UrlHashW@12
-UrlIsA@8
-UrlIsNoHistoryA@4
-UrlIsNoHistoryW@4
-UrlIsOpaqueA@4
-UrlIsOpaqueW@4
-UrlIsW@8
-UrlUnescapeA@16
-UrlUnescapeW@16
-wnsprintfA
-wnsprintfW
-wvnsprintfA@16
-wvnsprintfW@16
diff --git a/winsup/w32api/lib/snmpapi.def b/winsup/w32api/lib/snmpapi.def
deleted file mode 100644
index 0c16c1c29..000000000
--- a/winsup/w32api/lib/snmpapi.def
+++ /dev/null
@@ -1,40 +0,0 @@
-LIBRARY snmpapi.dll
-EXPORTS
-SnmpSvcAddrIsIpx@12
-SnmpSvcAddrToSocket@8
-SnmpSvcBufRevAndCpy@12
-SnmpSvcBufRevInPlace@8
-SnmpSvcDecodeMessage@20
-SnmpSvcEncodeMessage@16
-SnmpSvcGenerateAuthFailTrap@4
-SnmpSvcGenerateColdStartTrap@4
-SnmpSvcGenerateLinkDownTrap@8
-SnmpSvcGenerateLinkUpTrap@8
-SnmpSvcGenerateTrap@20
-SnmpSvcGenerateWarmStartTrap@4
-SnmpSvcGetUptime@0
-SnmpSvcInitUptime@0
-SnmpSvcReleaseMessage@4
-SnmpSvcReportEvent@16
-SnmpSvcSetLogLevel@4
-SnmpSvcSetLogType@4
-SnmpUtilAnsiToUnicode@12
-SnmpUtilDbgPrint
-SnmpUtilIdsToA@8
-SnmpUtilMemAlloc@4
-SnmpUtilMemFree@4
-SnmpUtilMemReAlloc@8
-SnmpUtilOidAppend@8
-SnmpUtilOidCmp@8
-SnmpUtilOidCpy@8
-SnmpUtilOidFree@4
-SnmpUtilOidNCmp@12
-SnmpUtilOidToA@4
-SnmpUtilPrintAsnAny@4
-SnmpUtilPrintOid@4
-SnmpUtilStrlenW@4
-SnmpUtilUnicodeToAnsi@12
-SnmpUtilVarBindCpy@8
-SnmpUtilVarBindFree@4
-SnmpUtilVarBindListCpy@8
-SnmpUtilVarBindListFree@4
diff --git a/winsup/w32api/lib/svrapi.def b/winsup/w32api/lib/svrapi.def
deleted file mode 100644
index 4a7b0dba6..000000000
--- a/winsup/w32api/lib/svrapi.def
+++ /dev/null
@@ -1,22 +0,0 @@
-LIBRARY SVRAPI.DLL
-EXPORTS
-NetAccessAdd@16
-NetAccessCheck@20
-NetAccessDel@8
-NetAccessEnum@32
-NetAccessGetInfo@24
-NetAccessGetUserPerms@16
-NetAccessSetInfo@24
-NetConnectionEnum@28
-NetFileClose2@8
-NetFileEnum@28
-NetSecurityGetInfo@20
-NetServerGetInfo@20
-NetSessionDel@12
-NetSessionEnum@24
-NetSessionGetInfo@24
-NetShareAdd@16
-NetShareDel@12
-NetShareEnum@24
-NetShareGetInfo@24
-NetShareSetInfo@24
diff --git a/winsup/w32api/lib/tapi32.def b/winsup/w32api/lib/tapi32.def
deleted file mode 100644
index e4f0d9c8d..000000000
--- a/winsup/w32api/lib/tapi32.def
+++ /dev/null
@@ -1,116 +0,0 @@
-LIBRARY TAPI32.DLL
-EXPORTS
-lineAccept@12
-lineAddProvider@12
-lineAddToConference@8
-lineAnswer@12
-lineBlindTransfer@12
-lineClose@4
-lineCompleteCall@16
-lineCompleteTransfer@16
-lineConfigDialog@12
-lineConfigDialogEdit@24
-lineConfigProvider@8
-lineDeallocateCall@4
-lineDevSpecific@20
-lineDevSpecificFeature@16
-lineDial@12
-lineDrop@12
-lineForward@28
-lineGatherDigits@28
-lineGenerateDigits@16
-lineGenerateTone@20
-lineGetAddressCaps@24
-lineGetAddressID@20
-lineGetAddressStatus@12
-lineGetAppPriority@24
-lineGetCallInfo@8
-lineGetCallStatus@8
-lineGetConfRelatedCalls@8
-lineGetCountry@12
-lineGetDevCaps@20
-lineGetDevConfig@12
-lineGetID@24
-lineGetIcon@12
-lineGetLineDevStatus@8
-lineGetNewCalls@16
-lineGetNumRings@12
-lineGetProviderList@8
-lineGetRequest@12
-lineGetStatusMessages@12
-lineGetTranslateCaps@12
-lineHandoff@12
-lineHold@4
-lineInitialize@20
-lineMakeCall@20
-lineMonitorDigits@8
-lineMonitorMedia@8
-lineMonitorTones@12
-lineNegotiateAPIVersion@24
-lineNegotiateExtVersion@24
-lineOpen@36
-linePark@16
-linePickup@20
-linePrepareAddToConference@12
-lineRedirect@12
-lineRegisterRequestRecipient@16
-lineReleaseUserUserInfo@4
-lineRemoveFromConference@4
-lineRemoveProvider@8
-lineSecureCall@4
-lineSendUserUserInfo@12
-lineSetAppPriority@24
-lineSetAppSpecific@8
-lineSetCallParams@20
-lineSetCallPrivilege@8
-lineSetCurrentLocation@8
-lineSetDevConfig@16
-lineSetMediaControl@48
-lineSetMediaMode@8
-lineSetNumRings@12
-lineSetStatusMessages@12
-lineSetTerminal@28
-lineSetTollList@16
-lineSetupConference@24
-lineSetupTransfer@12
-lineShutdown@4
-lineSwapHold@8
-lineTranslateAddress@28
-lineTranslateDialog@20
-lineUncompleteCall@8
-lineUnhold@4
-lineUnpark@16
-phoneClose@4
-phoneConfigDialog@12
-phoneDevSpecific@12
-phoneGetButtonInfo@12
-phoneGetData@16
-phoneGetDevCaps@20
-phoneGetDisplay@8
-phoneGetGain@12
-phoneGetHookSwitch@8
-phoneGetID@12
-phoneGetIcon@12
-phoneGetLamp@12
-phoneGetRing@12
-phoneGetStatus@8
-phoneGetStatusMessages@16
-phoneGetVolume@12
-phoneInitialize@20
-phoneNegotiateAPIVersion@24
-phoneNegotiateExtVersion@24
-phoneOpen@28
-phoneSetButtonInfo@12
-phoneSetData@16
-phoneSetDisplay@20
-phoneSetGain@12
-phoneSetHookSwitch@12
-phoneSetLamp@12
-phoneSetRing@12
-phoneSetStatusMessages@16
-phoneSetVolume@12
-phoneShutdown@4
-tapiGetLocationInfo@8
-tapiRequestDrop@8
-tapiRequestMakeCall@16
-tapiRequestMediaCall@40
diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c
deleted file mode 100644
index 4be8bc1fe..000000000
--- a/winsup/w32api/lib/test.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Perform simple test of headers to avoid typos and such */
-#define __USE_W32_SOCKETS
-#include <w32api.h>
-#include <windows.h>
-
-#ifdef __OBJC__
-#define BOOL WINBOOL
-#endif
-#include <windowsx.h>
-#include <commctrl.h>
-#include <largeint.h>
-#include <mmsystem.h>
-#include <mciavi.h>
-#include <mcx.h>
-#include <sql.h>
-#include <sqlext.h>
-#include <imm.h>
-#include <lm.h>
-#include <zmouse.h>
-#include <scrnsave.h>
-#include <cpl.h>
-#include <cplext.h>
-#include <wincrypt.h>
-#include <pbt.h>
-#include <wininet.h>
-#include <regstr.h>
-#include <custcntl.h>
-#include <mapi.h>
-
-#include <dbt.h>
-#include <httpext.h>
-#include <imagehlp.h>
-#include <initguid.h>
-#include <ipexport.h>
-#include <iphlpapi.h>
-#include <ipifcons.h>
-#include <iprtrmib.h>
-#include <iptypes.h>
-#include <isguids.h>
-#include <lmbrowsr.h>
-#include <mswsock.h>
-#include <nddeapi.h>
-#include <ntdef.h>
-#include <ntsecapi.h>
-#include <odbcinst.h>
-#include <powrprof.h>
-#include <psapi.h>
-#include <ras.h>
-#include <rasdlg.h>
-#include <raserror.h>
-#include <rassapi.h>
-#include <richedit.h>
-#include <rpcdce2.h>
-#include <subauth.h>
-#include <tlhelp32.h>
-#include <userenv.h>
-#include <winioctl.h>
-#include <winresrc.h>
-#include <winsock.h>
-#ifdef _WINSOCK2_H
-#include <ws2tcpip.h>
-#include <ws2spi.h>
-#include <wsahelp.h>
-#endif
-#include <wsipx.h>
-#include <wsnetbs.h>
-#include <svcguid.h>
-#include <setupapi.h>
-#include <aclapi.h>
-#include <security.h>
-#include <secext.h>
-#include <schnlsp.h>
-#include <ntldap.h>
-#include <winber.h>
-#include <winldap.h>
-#include <shlwapi.h>
-#include <snmp.h>
-#include <winsnmp.h>
-#include <mgmtapi.h>
-#include <vfw.h>
-#include <uxtheme.h>
-#include <tmschema.h>
-#include <dhcpcsdk.h>
-#include <errorrep.h>
-
-#ifndef __OBJC__  /* problems with BOOL */
-#include <ole2.h>
-#include <comcat.h>
-#include <shlobj.h>
-#include <intshcut.h>
-#include <ocidl.h>
-#include <ole2ver.h>
-#include <oleacc.h>
-#include <winable.h>
-#include <olectl.h>
-#include <oledlg.h>
-#include <docobj.h>
-#include <idispids.h>
-#include <rapi.h>
-#include <richole.h>
-#include <rpcproxy.h>
-#include <exdisp.h>
-#include <mshtml.h>
-#include <servprov.h>
-
-#else
-#undef BOOL
-#endif
-
-#include <stdio.h>
-
-int main()
-{
-  return 0;
-}
diff --git a/winsup/w32api/lib/th32.def b/winsup/w32api/lib/th32.def
deleted file mode 100644
index 4137bf61f..000000000
--- a/winsup/w32api/lib/th32.def
+++ /dev/null
@@ -1,14 +0,0 @@
-LIBRARY Kernel32.dll
-EXPORTS
-CreateToolhelp32Snapshot@8
-Heap32First@12
-Heap32ListFirst@8
-Heap32ListNext@8
-Heap32Next@4
-Module32First@8
-Module32Next@8
-Process32First@8
-Process32Next@8
-Thread32First@8
-Thread32Next@8
-Toolhelp32ReadProcessMemory@20
diff --git a/winsup/w32api/lib/thunk32.def b/winsup/w32api/lib/thunk32.def
deleted file mode 100644
index abdeb4606..000000000
--- a/winsup/w32api/lib/thunk32.def
+++ /dev/null
@@ -1,68 +0,0 @@
-LIBRARY KERNEL32.dll
-EXPORTS
-Callback12@12
-Callback16@16
-Callback20@20
-Callback24@24
-Callback28@28
-Callback32@32
-Callback36@36
-Callback40@40
-Callback44@44
-Callback48@48
-Callback4@4
-Callback52@52
-Callback56@56
-Callback60@60
-Callback64@64
-Callback8@8
-FT_Exit0
-FT_Exit12
-FT_Exit16
-FT_Exit20
-FT_Exit24
-FT_Exit28
-FT_Exit32
-FT_Exit36
-FT_Exit4
-FT_Exit40
-FT_Exit44
-FT_Exit48
-FT_Exit52
-FT_Exit56
-FT_Exit8
-FT_Prolog
-FT_Thunk
-K32Thk1632Epilog@0
-K32Thk1632Prolog@0
-MapHInstLS
-MapHInstLS_PN
-MapHInstSL
-MapHInstSL_PN
-MapLS@4
-MapSL@4
-MapSLFix@4
-QT_Thunk
-SMapLS
-SMapLS_IP_EBP_12
-SMapLS_IP_EBP_16
-SMapLS_IP_EBP_20
-SMapLS_IP_EBP_24
-SMapLS_IP_EBP_28
-SMapLS_IP_EBP_32
-SMapLS_IP_EBP_36
-SMapLS_IP_EBP_40
-SMapLS_IP_EBP_8
-SUnMapLS
-SUnMapLS_IP_EBP_12
-SUnMapLS_IP_EBP_16
-SUnMapLS_IP_EBP_20
-SUnMapLS_IP_EBP_24
-SUnMapLS_IP_EBP_28
-SUnMapLS_IP_EBP_32
-SUnMapLS_IP_EBP_36
-SUnMapLS_IP_EBP_40
-SUnMapLS_IP_EBP_8
-ThunkConnect32@24
-UnMapLS@4
-UnMapSLFixArray@8
diff --git a/winsup/w32api/lib/url.def b/winsup/w32api/lib/url.def
deleted file mode 100644
index 202073259..000000000
--- a/winsup/w32api/lib/url.def
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBRARY URL.DLL
-EXPORTS
-URLAssociationDialogW@24
-URLAssociationDialogA@24
-TranslateURLW@12
-TranslateURLA@12
-MIMEAssociationDialogW@24
-MIMEAssociationDialogA@24
-InetIsOffline@4
diff --git a/winsup/w32api/lib/user32.def b/winsup/w32api/lib/user32.def
deleted file mode 100644
index 837995dc0..000000000
--- a/winsup/w32api/lib/user32.def
+++ /dev/null
@@ -1,633 +0,0 @@
-LIBRARY USER32.dll
-EXPORTS
-ActivateKeyboardLayout@8
-AdjustWindowRect@12
-AdjustWindowRectEx@16
-AllowSetForegroundWindow@4
-AnimateWindow@12
-AnyPopup@0
-AppendMenuA@16
-AppendMenuW@16
-ArrangeIconicWindows@4
-AttachThreadInput@12
-BeginDeferWindowPos@4
-BeginPaint@8
-BlockInput@4
-BringWindowToTop@4
-BroadcastSystemMessage@20
-BroadcastSystemMessageA@20
-BroadcastSystemMessageExA@24
-BroadcastSystemMessageExW@24
-BroadcastSystemMessageW@20
-CalcChildScroll@8
-CallMsgFilter@8
-CallMsgFilterA@8
-CallMsgFilterW@8
-CallNextHookEx@16
-CallWindowProcA@20
-CallWindowProcW@20
-CascadeChildWindows@8
-CascadeWindows@20
-ChangeClipboardChain@8
-ChangeDisplaySettingsA@8
-ChangeDisplaySettingsW@8
-ChangeDisplaySettingsExA@20
-ChangeDisplaySettingsExW@20
-ChangeMenuA@20
-ChangeMenuW@20
-CharLowerA@4
-CharLowerBuffA@8
-CharLowerBuffW@8
-CharLowerW@4
-CharNextA@4
-CharNextExA@12
-CharNextW@4
-CharPrevA@8
-CharPrevExA@16
-CharPrevW@8
-CharToOemA@8
-CharToOemBuffA@12
-CharToOemBuffW@12
-CharToOemW@8
-CharUpperA@4
-CharUpperBuffA@8
-CharUpperBuffW@8
-CharUpperW@4
-CheckDlgButton@12
-CheckMenuItem@12
-CheckMenuRadioItem@20
-CheckRadioButton@16
-ChildWindowFromPoint@12
-ChildWindowFromPointEx@16
-ClientToScreen@8
-ClipCursor@4
-CloseClipboard@0
-CloseDesktop@4
-CloseWindow@4
-CloseWindowStation@4
-CopyAcceleratorTableA@12
-CopyAcceleratorTableW@12
-CopyIcon@4
-CopyImage@20
-CopyRect@8
-CountClipboardFormats@0
-CreateAcceleratorTableA@8
-CreateAcceleratorTableW@8
-CreateCaret@16
-CreateCursor@28
-CreateDesktopA@24
-CreateDesktopW@24
-CreateDialogIndirectParamA@20
-CreateDialogIndirectParamW@20
-CreateDialogParamA@20
-CreateDialogParamW@20
-CreateIcon@28
-CreateIconFromResource@16
-CreateIconFromResourceEx@28
-CreateIconIndirect@4
-CreateMDIWindowA@40
-CreateMDIWindowW@40
-CreateMenu@0
-CreatePopupMenu@0
-CreateWindowExA@48
-CreateWindowExW@48
-CreateWindowStationA@16
-CreateWindowStationW@16
-DdeAbandonTransaction@12
-DdeAccessData@8
-DdeAddData@16
-DdeClientTransaction@32
-DdeCmpStringHandles@8
-DdeConnect@16
-DdeConnectList@20
-DdeCreateDataHandle@28
-DdeCreateStringHandleA@12
-DdeCreateStringHandleW@12
-DdeDisconnect@4
-DdeDisconnectList@4
-DdeEnableCallback@12
-DdeFreeDataHandle@4
-DdeFreeStringHandle@8
-DdeGetData@16
-DdeGetLastError@4
-DdeGetQualityOfService@12
-DdeImpersonateClient@4
-DdeInitializeA@16
-DdeInitializeW@16
-DdeKeepStringHandle@8
-DdeNameService@16
-DdePostAdvise@12
-DdeQueryConvInfo@12
-DdeQueryNextServer@8
-DdeQueryStringA@20
-DdeQueryStringW@20
-DdeReconnect@4
-DdeSetQualityOfService@12
-DdeSetUserHandle@12
-DdeUnaccessData@4
-DdeUninitialize@4
-DefDlgProcA@16
-DefDlgProcW@16
-DefFrameProcA@20
-DefFrameProcW@20
-DefMDIChildProcA@16
-DefMDIChildProcW@16
-DefRawInputProc@12
-DefWindowProcA@16
-DefWindowProcW@16
-DeferWindowPos@32
-DeleteMenu@12
-DeregisterShellHookWindow@4
-DestroyAcceleratorTable@4
-DestroyCaret@0
-DestroyCursor@4
-DestroyIcon@4
-DestroyMenu@4
-DestroyWindow@4
-DialogBoxIndirectParamA@20
-DialogBoxIndirectParamW@20
-DialogBoxParamA@20
-DialogBoxParamW@20
-DispatchMessageA@4
-DispatchMessageW@4
-DlgDirListA@20
-DlgDirListComboBoxA@20
-DlgDirListComboBoxW@20
-DlgDirListW@20
-DlgDirSelectComboBoxExA@16
-DlgDirSelectComboBoxExW@16
-DlgDirSelectExA@16
-DlgDirSelectExW@16
-DragDetect@12
-DragObject@20
-DrawAnimatedRects@16
-DrawCaption@16
-DrawEdge@16
-DrawFocusRect@8
-DrawFrame@16
-DrawFrameControl@16
-DrawIcon@16
-DrawIconEx@36
-DrawMenuBar@4
-DrawStateA@40
-DrawStateW@40
-DrawTextA@20
-DrawTextExA@24
-DrawTextExW@24
-DrawTextW@20
-EditWndProc@16
-EmptyClipboard@0
-EnableMenuItem@12
-EnableScrollBar@12
-EnableWindow@8
-EndDeferWindowPos@4
-EndDialog@8
-EndMenu@0
-EndPaint@8
-EndTask@12
-EnumChildWindows@12
-EnumClipboardFormats@4
-EnumDesktopWindows@12
-EnumDesktopsA@12
-EnumDesktopsW@12
-EnumDisplayDevicesA@16
-EnumDisplayDevicesW@16
-EnumDisplayMonitors@16
-EnumDisplaySettingsA@12
-EnumDisplaySettingsExA@16
-EnumDisplaySettingsExW@16
-EnumDisplaySettingsW@12
-EnumPropsA@8
-EnumPropsExA@12
-EnumPropsExW@12
-EnumPropsW@8
-EnumThreadWindows@12
-EnumWindowStationsA@8
-EnumWindowStationsW@8
-EnumWindows@8
-EqualRect@8
-ExcludeUpdateRgn@8
-ExitWindowsEx@8
-FillRect@12
-FindWindowA@8
-FindWindowExA@16
-FindWindowExW@16
-FindWindowW@8
-FlashWindow@8
-FlashWindowEx@4
-FrameRect@12
-FreeDDElParam@8
-GetActiveWindow@0
-GetAltTabInfo@20
-GetAltTabInfoA@20	
-GetAltTabInfoW@20	
-GetAncestor@8
-GetAsyncKeyState@4
-GetCapture@0
-GetCaretBlinkTime@0
-GetCaretPos@4
-GetClassInfoA@12
-GetClassInfoExA@12
-GetClassInfoExW@12
-GetClassInfoW@12
-GetClassLongA@8
-GetClassLongW@8
-GetClassNameA@12
-GetClassNameW@12
-GetClassWord@8
-GetClientRect@8
-GetClipCursor@4
-GetClipboardData@4
-GetClipboardFormatNameA@12
-GetClipboardFormatNameW@12
-GetClipboardOwner@0
-GetClipboardSequenceNumber@0
-GetClipboardViewer@0
-GetComboBoxInfo@8
-GetCursor@0
-GetCursorInfo@4
-GetCursorPos@4
-GetDC@4
-GetDCEx@12
-GetDesktopWindow@0
-GetDialogBaseUnits@0
-GetDlgCtrlID@4
-GetDlgItem@8
-GetDlgItemInt@16
-GetDlgItemTextA@16
-GetDlgItemTextW@16
-GetDoubleClickTime@0
-GetFocus@0
-GetForegroundWindow@0
-GetGUIThreadInfo@8
-GetGuiResources@8
-GetIconInfo@8
-GetInputDesktop@0
-GetInputState@0
-GetKBCodePage@0
-GetKeyNameTextA@12
-GetKeyNameTextW@12
-GetKeyState@4
-GetKeyboardLayout@4
-GetKeyboardLayoutList@8
-GetKeyboardLayoutNameA@4
-GetKeyboardLayoutNameW@4
-GetKeyboardState@4
-GetKeyboardType@4
-GetLastActivePopup@4
-GetLastInputInfo@4
-GetLayeredWindowAttributes@16
-GetListBoxInfo@4
-GetMenu@4
-GetMenuBarInfo@16
-GetMenuCheckMarkDimensions@0
-GetMenuContextHelpId@4
-GetMenuDefaultItem@12
-GetMenuInfo@8
-GetMenuItemCount@4
-GetMenuItemID@8
-GetMenuItemInfoA@16
-GetMenuItemInfoW@16
-GetMenuItemRect@16
-GetMenuState@12
-GetMenuStringA@20
-GetMenuStringW@20
-GetMessageA@16
-GetMessageExtraInfo@0
-GetMessagePos@0
-GetMessageTime@0
-GetMessageW@16
-GetMonitorInfoA@8
-GetMonitorInfoW@8
-GetMouseMovePointsEx@20
-GetNextDlgGroupItem@12
-GetNextDlgTabItem@12
-GetOpenClipboardWindow@0
-GetParent@4
-GetPriorityClipboardFormat@8
-GetProcessDefaultLayout@4
-GetProcessWindowStation@0
-GetPropA@8
-GetPropW@8
-GetRawInputBuffer@12
-GetRawInputData@20
-GetRawInputDeviceInfoA@16
-GetRawInputDeviceInfoW@16
-GetRawInputDeviceList@12
-GetRegisteredRawInputDevices@12
-GetQueueStatus@4
-GetScrollBarInfo@12
-GetScrollInfo@12
-GetScrollPos@8
-GetScrollRange@16
-GetShellWindow@0
-GetSubMenu@8
-GetSysColor@4
-GetSysColorBrush@4
-GetSystemMenu@8
-GetSystemMetrics@4
-GetTabbedTextExtentA@20
-GetTabbedTextExtentW@20
-GetThreadDesktop@4
-GetTitleBarInfo@8
-GetTopWindow@4
-GetUpdateRect@12
-GetUpdateRgn@12
-GetUserObjectInformationA@20
-GetUserObjectInformationW@20
-GetUserObjectSecurity@20
-GetWindow@8
-GetWindowContextHelpId@4
-_imp__GetWindowContextHelpId@4
-GetWindowDC@4
-GetWindowInfo@8
-GetWindowLongA@8
-GetWindowLongW@8
-GetWindowModuleFileName@12
-GetWindowModuleFileNameA@12
-GetWindowModuleFileNameW@12
-GetWindowPlacement@8
-GetWindowRect@8
-GetWindowRgn@8
-GetWindowTextA@12
-GetWindowTextLengthA@4
-GetWindowTextLengthW@4
-GetWindowTextW@12
-GetWindowThreadProcessId@8
-GetWindowWord@8
-GrayStringA@36
-GrayStringW@36
-HideCaret@4
-HiliteMenuItem@16
-ImpersonateDdeClientWindow@8
-InSendMessage@0
-InSendMessageEx@4
-InflateRect@12
-InsertMenuA@20
-InsertMenuItemA@16
-InsertMenuItemW@16
-InsertMenuW@20
-IntersectRect@12
-InvalidateRect@12
-InvalidateRgn@12
-InvertRect@8
-IsCharAlphaA@4
-IsCharAlphaNumericA@4
-IsCharAlphaNumericW@4
-IsCharAlphaW@4
-IsCharLowerA@4
-IsCharLowerW@4
-IsCharUpperA@4
-IsCharUpperW@4
-IsChild@8
-IsClipboardFormatAvailable@4
-IsDialogMessage@8
-IsDialogMessageA@8
-IsDialogMessageW@8
-IsDlgButtonChecked@8
-IsGUIThread@4
-IsHungAppWindow@4
-IsIconic@4
-IsMenu@4
-IsRectEmpty@4
-IsWinEventHookInstalled@4
-IsWindow@4
-IsWindowEnabled@4
-IsWindowUnicode@4
-IsWindowVisible@4
-IsZoomed@4
-KillSystemTimer@8
-KillTimer@8
-LoadAcceleratorsA@8
-LoadAcceleratorsW@8
-LoadBitmapA@8
-LoadBitmapW@8
-LoadCursorA@8
-LoadCursorFromFileA@4
-LoadCursorFromFileW@4
-LoadCursorW@8
-LoadIconA@8
-LoadIconW@8
-LoadImageA@24
-LoadImageW@24
-LoadKeyboardLayoutA@8
-LoadKeyboardLayoutW@8
-LoadMenuA@8
-LoadMenuIndirectA@4
-LoadMenuIndirectW@4
-LoadMenuW@8
-LoadStringA@16
-LoadStringW@16
-LockSetForegroundWindow@4
-LockWindowUpdate@4
-LockWorkStation@0
-LookupIconIdFromDirectory@8
-LookupIconIdFromDirectoryEx@20
-MapDialogRect@8
-MapVirtualKeyA@8
-MapVirtualKeyExA@12
-MapVirtualKeyExW@12
-MapVirtualKeyW@8
-MapWindowPoints@16
-MenuItemFromPoint@16
-MessageBeep@4
-MessageBoxA@16
-MessageBoxExA@20
-MessageBoxExW@20
-MessageBoxIndirectA@4
-MessageBoxIndirectW@4
-MessageBoxW@16
-ModifyMenuA@20
-ModifyMenuW@20
-MoveWindow@24
-MsgWaitForMultipleObjects@20
-MsgWaitForMultipleObjectsEx@20
-NotifyWinEvent@16
-OemKeyScan@4
-OemToCharA@8
-OemToCharBuffA@12
-OemToCharBuffW@12
-OemToCharW@8
-OffsetRect@12
-OpenClipboard@4
-OpenDesktopA@16
-OpenDesktopW@16
-OpenIcon@4
-OpenInputDesktop@12
-OpenWindowStationA@12
-OpenWindowStationW@12
-PackDDElParam@12
-PaintDesktop@4
-PeekMessageA@20
-PeekMessageW@20
-PostMessageA@16
-PostMessageW@16
-PostQuitMessage@4
-PostThreadMessageA@16
-PostThreadMessageW@16
-PrintWindow@12
-PtInRect@12
-RealChildWindowFromPoint@12
-RealGetWindowClassA@12
-RealGetWindowClassW@12
-RedrawWindow@16
-RegisterClassA@4
-RegisterClassExA@4
-RegisterClassExW@4
-RegisterClassW@4
-RegisterClipboardFormatA@4
-RegisterClipboardFormatW@4
-RegisterDeviceNotificationA@12
-RegisterDeviceNotificationW@12
-RegisterHotKey@16
-RegisterRawInputDevices@12
-RegisterWindowMessageA@4
-RegisterWindowMessageW@4
-ReleaseCapture@0
-ReleaseDC@8
-RemoveMenu@12
-RemovePropA@8
-RemovePropW@8
-ReplyMessage@4
-ReuseDDElParam@20
-ScreenToClient@8
-ScrollChildren@12
-ScrollDC@28
-ScrollWindow@20
-ScrollWindowEx@32
-SendDlgItemMessageA@20
-SendDlgItemMessageW@20
-SendInput@12
-SendMessageA@16
-SendMessageCallbackA@24
-SendMessageCallbackW@24
-SendMessageTimeoutA@28
-SendMessageTimeoutW@28
-SendMessageW@16
-SendNotifyMessageA@16
-SendNotifyMessageW@16
-SetActiveWindow@4
-SetCapture@4
-SetCaretBlinkTime@4
-SetCaretPos@8
-SetClassLongA@12
-SetClassLongW@12
-SetClassWord@12
-SetClipboardData@8
-SetClipboardViewer@4
-SetCursor@4
-SetCursorPos@8
-SetDebugErrorLevel@4
-SetDeskWallpaper@4
-SetDlgItemInt@16
-SetDlgItemTextA@12
-SetDlgItemTextW@12
-SetDoubleClickTime@4
-SetFocus@4
-SetForegroundWindow@4
-SetKeyboardState@4
-SetLastErrorEx@8
-SetLayeredWindowAttributes@16
-SetMenu@8
-SetMenuContextHelpId@8
-_imp__SetMenuContextHelpId@8
-SetMenuDefaultItem@12
-SetMenuInfo@8
-SetMenuItemBitmaps@20
-SetMenuItemInfoA@16
-SetMenuItemInfoW@16
-SetMessageExtraInfo@4
-SetMessageQueue@4
-SetParent@8
-SetProcessDefaultLayout@4
-SetProcessWindowStation@4
-SetPropA@12
-SetPropW@12
-SetRect@20
-SetRectEmpty@4
-SetScrollInfo@16
-SetScrollPos@16
-SetScrollRange@20
-SetShellWindow@4
-SetSysColors@12
-SetSystemCursor@8
-SetSystemMenu@8
-SetSystemTimer@16
-SetThreadDesktop@4
-SetTimer@16
-SetUserObjectInformationA@16
-SetUserObjectInformationW@16
-SetUserObjectSecurity@12
-SetWinEventHook@28
-SetWindowContextHelpId@8
-_imp__SetWindowContextHelpId@8
-SetWindowLongA@12
-SetWindowLongW@12
-SetWindowPlacement@8
-SetWindowPos@28
-SetWindowRgn@12
-SetWindowTextA@8
-SetWindowTextW@8
-SetWindowWord@12
-SetWindowsHookA@8
-SetWindowsHookExA@16
-SetWindowsHookExW@16
-SetWindowsHookW@8
-ShowCaret@4
-ShowCursor@4
-ShowOwnedPopups@8
-ShowScrollBar@12
-ShowWindow@8
-ShowWindowAsync@8
-SubtractRect@12
-SwapMouseButton@4
-SwitchDesktop@4
-SwitchToThisWindow@8
-SystemParametersInfoA@16
-SystemParametersInfoW@16
-TabbedTextOutA@32
-TabbedTextOutW@32
-TileChildWindows@8
-TileWindows@20
-ToAscii@20
-ToAsciiEx@24
-ToUnicode@24
-ToUnicodeEx@28
-TrackMouseEvent@4
-TrackPopupMenu@28
-TrackPopupMenuEx@24
-TranslateAccelerator@12
-TranslateAcceleratorA@12
-TranslateAcceleratorW@12
-TranslateMDISysAccel@8
-TranslateMessage@4
-UnhookWinEvent@4
-UnhookWindowsHook@8
-UnhookWindowsHookEx@4
-UnionRect@12
-UnloadKeyboardLayout@4
-UnpackDDElParam@16
-UnregisterClassA@8
-UnregisterClassW@8
-UnregisterHotKey@8
-UpdateLayeredWindow@36
-UpdateWindow@4
-UserHandleGrantAccess@12
-ValidateRect@8
-ValidateRgn@8
-VkKeyScanA@4
-VkKeyScanExA@8
-VkKeyScanExW@8
-VkKeyScanW@4
-WaitForInputIdle@8
-WaitMessage@0
-WinHelpA@16
-WinHelpW@16
-WindowFromDC@4
-WindowFromPoint@8
-keybd_event@16
-mouse_event@20
-wsprintfA
-wsprintfW
-wvsprintfA@12
-wvsprintfW@12
diff --git a/winsup/w32api/lib/userenv.def b/winsup/w32api/lib/userenv.def
deleted file mode 100644
index b74cb9236..000000000
--- a/winsup/w32api/lib/userenv.def
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBRARY USERENV.dll
-EXPORTS
-LoadUserProfileA@8
-LoadUserProfileW@8
-UnloadUserProfile@8
-GetProfilesDirectoryA@8
-GetProfilesDirectoryW@8
-GetUserProfileDirectoryA@12
-GetUserProfileDirectoryW@12
-CreateEnvironmentBlock@12
-DestroyEnvironmentBlock@4
diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c
deleted file mode 100644
index ee2bf1d5b..000000000
--- a/winsup/w32api/lib/uuid.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
-  Generate GUIDs for OLE and other interfaces.
-
-  This file was generated by extracting the names of all GUIDs
-  from uuid.lib. The names were in turn processed by a script
-  to build a C program that when run generated this file.
-  Some definitions were added by hand afterwards.
-*/
-
-/*
-  TODO: Break up into smaller units, based on declarations in headers.
-*/
-
-#define INITGUID
-#include <basetyps.h>
-DEFINE_GUID(ARRAYID_PathProperties,0x7ecbba04,0x2d97,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CATID_Control,0x40fc6ed4,0x2438,0x11cf,0xa3,0xdb,0x8,0,0x36,0xf1,0x25,0x2);
-DEFINE_GUID(CATID_DocObject,0x40fc6ed8,0x2438,0x11cf,0xa3,0xdb,0x8,0,0x36,0xf1,0x25,0x2);
-DEFINE_GUID(CATID_Insertable,0x40fc6ed3,0x2438,0x11cf,0xa3,0xdb,0x8,0,0x36,0xf1,0x25,0x2);
-DEFINE_GUID(CATID_InternetAware,0xde86a58,0x2baa,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CATID_IsShortcut,0x40fc6ed6,0x2438,0x11cf,0xa3,0xdb,0x8,0,0x36,0xf1,0x25,0x2);
-DEFINE_GUID(CATID_NeverShowExt,0x40fc6ed7,0x2438,0x11cf,0xa3,0xdb,0x8,0,0x36,0xf1,0x25,0x2);
-DEFINE_GUID(CATID_PersistsToFile,0xde86a56,0x2baa,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CATID_PersistsToMemory,0xde86a55,0x2baa,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CATID_PersistsToMoniker,0xde86a51,0x2baa,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CATID_PersistsToPropertyBag,0xde86a57,0x2baa,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CATID_PersistsToStorage,0xde86a52,0x2baa,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CATID_PersistsToStream,0xde86a54,0x2baa,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CATID_PersistsToStreamInit,0xde86a53,0x2baa,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CATID_Printable,0x40fc6ed9,0x2438,0x11cf,0xa3,0xdb,0x8,0,0x36,0xf1,0x25,0x2);
-DEFINE_GUID(CATID_Programmable,0x40fc6ed5,0x2438,0x11cf,0xa3,0xdb,0x8,0,0x36,0xf1,0x25,0x2);
-DEFINE_GUID(CATID_RequiresDataPathHost,0xde86a50,0x2baa,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(CATID_SafeForInitializing,0x7dd95802,0x9882,0x11cf,0x9f,0xa9,0,0xaa,0,0x6c,0x42,0xc4);
-DEFINE_GUID(CATID_SafeForScripting,0x7dd95801,0x9882,0x11cf,0x9f,0xa9,0,0xaa,0,0x6c,0x42,0xc4);
-DEFINE_GUID(CLSID_AllClasses,0x330,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_CColorPropPage,0xbe35201,0x8f91,0x11ce,0x9d,0xe3,0,0xaa,0,0x4b,0xb8,0x51);
-DEFINE_GUID(CLSID_CFontPropPage, 0x0be35200,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0x00,0x4b,0xb8,0x51);
-DEFINE_GUID(CLSID_CPicturePropPage,0xbe35202,0x8f91,0x11ce,0x9d,0xe3,0,0xaa,0,0x4b,0xb8,0x51);
-DEFINE_GUID(CLSID_ConvertVBX,0xfb8f0822,0x164,0x101b,0x84,0xed,0x8,0,0x2b,0x2e,0xc7,0x13);
-DEFINE_GUID(CLSID_CurrentUserClasses,0x332,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_FileProtocol,0x79eac9e7,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_FtpProtocol,0x79eac9e3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_GopherProtocol,0x79eac9e4,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_HttpProtocol,0x79eac9e2,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_HttpSProtocol,0x79eac9e5,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_IdentityUnmarshal,0x1b,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_InProcFreeMarshaler,0x1c,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_LocalMachineClasses,0x331,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_MkProtocol,0x79eac9e6,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_PSBindCtx,0x312,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_PSClassObject,0x30E,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_PSClientSite,0x30d,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_PSDragDrop,0x311,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_PSEnumerators,0x313,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_PSGenObject,0x30c,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_PSInPlaceActive,0x30f,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_PSInPlaceFrame,0x310,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_PSUrlMonProxy,0x79eac9f1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_PersistPropset,0xfb8f0821,0x164,0x101b,0x84,0xed,0x8,0,0x2b,0x2e,0xc7,0x13);
-DEFINE_GUID(CLSID_Picture_Dib,0x316,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_Picture_EnhMetafile,0x319,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_Picture_Metafile,0x315,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_StaticDib,0x316,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_StaticMetafile,0x315,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_StdComponentCategoriesMgr,0x2e005,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_StdFont,0xbe35203,0x8f91,0x11ce,0x9d,0xe3,0,0xaa,0,0x4b,0xb8,0x51);
-DEFINE_GUID(CLSID_StdHlink,0x79eac9d0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_StdHlinkBrowseContext,0x79eac9d1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_StdMarshal,0x17,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(CLSID_StdPicture,0xbe35204,0x8f91,0x11ce,0x9d,0xe3,0,0xaa,0,0x4b,0xb8,0x51);
-DEFINE_GUID(CLSID_StdURLMoniker,0x79eac9e0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_StdURLProtocol,0x79eac9e1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(CLSID_WebBrowser,0x8856f961,0x340a,0x11d0,0xa9,0x6b,0x0,0xc0,0x4f,0xd7,0x5,0xa2);
-DEFINE_GUID(DIID_DWebBrowserEvents,0xeab22ac2,0x30c1,0x11cf,0xa7,0xeb,0x0,0x0,0xc0,0x5b,0xae,0x0b);
-DEFINE_GUID(DIID_DWebBrowserEvents2,0x34a715a0,0x6587,0x11d0,0x92,0x4a,0x0,0x20,0xaf,0xc7,0xac,0x4d);
-DEFINE_GUID(FLAGID_Internet,0x96300da0,0x2bab,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(FMTID_DocSummaryInformation,0xd5cdd502,0x2e9c,0x101b,0x93,0x97,0x8,0,0x2b,0x2c,0xf9,0xae);
-DEFINE_GUID(FMTID_SummaryInformation,0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x8,0,0x2b,0x27,0xb3,0xd9);
-DEFINE_GUID(FMTID_UserDefinedProperties,0xd5cdd505,0x2e9c,0x101b,0x93,0x97,0x8,0,0x2b,0x2c,0xf9,0xae);
-DEFINE_GUID(GUID_CHECKVALUEEXCLUSIVE,0x6650430c,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_COLOR,0x66504301,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_FONTBOLD,0x6650430f,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_FONTITALIC,0x66504310,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_FONTNAME,0x6650430d,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_FONTSIZE,0x6650430e,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_FONTSTRIKETHROUGH,0x66504312,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_FONTUNDERSCORE,0x66504311,0xBE0F,0x101A,0x8B,0xBB,0x00,0xAA,0x00,0x30,0x0C,0xAB);
-DEFINE_GUID(GUID_HANDLE,0x66504313,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_HIMETRIC,0x66504300,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_HasPathProperties,0x2de81,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
-DEFINE_GUID(GUID_OPTIONVALUEEXCLUSIVE,0x6650430b,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_PathProperty,0x2de80,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(GUID_TRISTATE,0x6650430a,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_XPOS,0x66504306,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_XPOSPIXEL,0x66504302,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_XSIZE,0x66504308,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_XSIZEPIXEL,0x66504304,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_YPOS,0x66504307,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_YPOSPIXEL,0x66504303,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_YSIZE,0x66504309,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(GUID_YSIZEPIXEL,0x66504305,0xbe0f,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(IID_IAccessible,0x618736e0,0x3c3d,0x11cf,0x81,0x0c,0x00,0xaa,0x00,0x38,0x9b,0x71);
-DEFINE_GUID(IID_IActiveScript,0xbb1a2ae1,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
-DEFINE_GUID(IID_IActiveScriptError,0xeae1ba61,0xa4ed,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
-DEFINE_GUID(IID_IActiveScriptParse,0xbb1a2ae2,0xa4f9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
-DEFINE_GUID(IID_IActiveScriptSite,0xdb01a1e3,0xa42b,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
-DEFINE_GUID(IID_IActiveScriptSiteWindow,0xd10f6761,0x83e9,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
-DEFINE_GUID(IID_IAdviseSink,0x10f,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IAdviseSink2,0x125,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IAdviseSinkEx,0x3af24290,0xc96,0x11ce,0xa0,0xcf,0,0xaa,0,0x60,0xa,0xb8);
-DEFINE_GUID(IID_IAsyncMoniker,0x79eac9d3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IAuthenticate,0x79eac9d0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IBindCtx,0xe,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IBindHost,0xfc4801a1,0x2ba9,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(IID_IBindProtocol,0x79eac9cd,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IBindStatusCallback,0x79eac9c1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IBindStatusCallbackMsg,0x79eac9cb,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IBinding,0x79eac9c0,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_ICatInformation,0x2e013,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ICatRegister,0x2e012,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IChannelHook,0x1008c4a0,0x7613,0x11cf,0x9a,0xf1,0,0x20,0xaf,0x6e,0x72,0xf4);
-DEFINE_GUID(IID_IClassActivator,0x140,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IClassFactory,0x1,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IClassFactory2,0xb196b28f,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IClientSecurity,0x13D,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IClientSiteHandler,0xf4f569d1,0x593b,0x101a,0xb5,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a);
-DEFINE_GUID(IID_ICodeInstall,0x79eac9d1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IConnectionPoint,0xb196b286,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IConnectionPointContainer,0xb196b284,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IContinue,0x12a,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IContinueCallback,0xb722bcca,0x4e68,0x101b,0xa2,0xbc,0,0xaa,0,0x40,0x47,0x70);
-DEFINE_GUID(IID_ICreateErrorInfo,0x22f03340,0x547d,0x101b,0x8e,0x65,0x8,0,0x2b,0x2b,0xd1,0x19);
-DEFINE_GUID(IID_ICreateTypeInfo,0x20405,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ICreateTypeInfo2,0x2040e,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ICreateTypeLib,0x20406,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ICreateTypeLib2,0x2040F,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IDataAdviseHolder,0x110,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IDataObject,0x10e,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IDebug,0x123,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IDebugStream,0x124,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IDfReserved1,0x13,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IDfReserved2,0x14,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IDfReserved3,0x15,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IDispatch,0x20400,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IDropSource,0x121,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IDropTarget,0x122,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumCATEGORYINFO,0x2e011,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumCallback,0x108,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumConnectionPoints,0xb196b285,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IEnumConnections,0xb196b287,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IEnumFORMATETC,0x103,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumGUID,0x2e000,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumGeneric,0x106,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumHLITEM,0x79eac9c6,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IEnumHolder,0x107,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumMoniker,0x102,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumOLEVERB,0x104,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumOleDocumentViews,0xb722bcc8,0x4e68,0x101b,0xa2,0xbc,0,0xaa,0,0x40,0x47,0x70);
-DEFINE_GUID(IID_IEnumOleUndoUnits,0xb3e7c340,0xef97,0x11ce,0x9b,0xc9,0,0xaa,0,0x60,0x8e,0x1);
-DEFINE_GUID(IID_IEnumSTATDATA,0x105,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumSTATPROPSETSTG,0x13b,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumSTATPROPSTG,0x139,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumSTATSTG,0xd,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumSTATURL,0x3c374a42,0xbae4,0x11cf,0xbf,0x7d,0,0xaa,0,0x69,0x46,0xee);
-DEFINE_GUID(IID_IEnumString,0x101,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumUnknown,0x100,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IEnumVARIANT,0x20404,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IErrorInfo,0x1cf2b120,0x547d,0x101b,0x8e,0x65,0x8,0,0x2b,0x2b,0xd1,0x19);
-DEFINE_GUID(IID_IErrorLog,0x3127ca40,0x446e,0x11ce,0x81,0x35,0,0xaa,0,0x4b,0xb8,0x51);
-DEFINE_GUID(IID_IExternalConnection,0x19,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IFillLockBytes,0x99caf010,0x415e,0x11cf,0x88,0x14,0,0xaa,0,0xb5,0x69,0xf5);
-DEFINE_GUID(IID_IFilter,0x89bcb740,0x6119,0x101a,0xbc,0xb7,0,0xdd,0x1,0x6,0x55,0xaf);
-DEFINE_GUID(IID_IFont,0xbef6e002,0xa874,0x101a,0x8b,0xba,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(IID_IFontDisp,0xbef6e003,0xa874,0x101a,0x8b,0xba,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(IID_IHlink,0x79eac9c3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IHlinkBrowseContext,0x79eac9c7,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IHlinkFrame,0x79eac9c5,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IHlinkSite,0x79eac9c2,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IHlinkTarget,0x79eac9c4,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IHttpNegotiate,0x79eac9d2,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IHttpSecurity,0x79eac9d7,0xbafa,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IInternalMoniker,0x11,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ILayoutStorage,0xe6d4d90,0x6738,0x11cf,0x96,0x8,0,0xaa,0,0x68,0xd,0xb4);
-DEFINE_GUID(IID_ILockBytes,0xa,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IMalloc,0x2,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IMallocSpy,0x1d,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IMarshal,0x3,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IMessageFilter,0x16,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IMimeInfo,0xf77459a0,0xbf9a,0x11cf,0xba,0x4e,0,0xc0,0x4f,0xd7,0x8,0x16);
-DEFINE_GUID(IID_IMoniker,0xf,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IMultiQI,0x20,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IObjectSafety,0xcb5bdc81,0x93c1,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
-DEFINE_GUID(IID_IObjectWithSite,0xfc4801a3,0x2ba9,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
-DEFINE_GUID(IID_IOleAdviseHolder,0x111,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleCache,0x11e,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleCache2,0x128,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleCacheControl,0x129,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleClientSite,0x118,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleCommandTarget,0xb722bccb,0x4e68,0x101b,0xa2,0xbc,0,0xaa,0,0x40,0x47,0x70);
-DEFINE_GUID(IID_IOleContainer,0x11b,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleControl,0xb196b288,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IOleControlSite,0xB196B289,0xBAB4,0x101A,0xB6,0x9C,0x00,0xAA,0x00,0x34,0x1D,0x07);
-DEFINE_GUID(IID_IOleDocument,0xb722bcc5,0x4e68,0x101b,0xa2,0xbc,0,0xaa,0,0x40,0x47,0x70);
-DEFINE_GUID(IID_IOleDocumentSite,0xb722bcc7,0x4e68,0x101b,0xa2,0xbc,0,0xaa,0,0x40,0x47,0x70);
-DEFINE_GUID(IID_IOleDocumentView,0xb722bcc6,0x4e68,0x101b,0xa2,0xbc,0,0xaa,0,0x40,0x47,0x70);
-DEFINE_GUID(IID_IOleInPlaceActiveObject,0x117,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleInPlaceFrame,0x116,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleInPlaceObject,0x113,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleInPlaceObjectWindowless,0x1c2056cc,0x5ef4,0x101b,0x8b,0xc8,0,0xaa,0,0x3e,0x3b,0x29);
-DEFINE_OLEGUID(IID_IOleInPlaceSite,0x00000119,0,0);
-DEFINE_GUID(IID_IOleInPlaceSiteEx,0x9c2cad80,0x3424,0x11cf,0xb6,0x70,0,0xaa,0,0x4c,0xd6,0xd8);
-DEFINE_GUID(IID_IOleInPlaceSiteWindowless,0x922eada0,0x3424,0x11cf,0xb6,0x70,0,0xaa,0,0x4c,0xd6,0xd8);
-DEFINE_GUID(IID_IOleInPlaceUIWindow,0x115,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleItemContainer,0x11c,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleLink,0x11d,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleManager,0x11f,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleObject,0x112,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleParentUndoUnit,0xa1faf330,0xef97,0x11ce,0x9b,0xc9,0,0xaa,0,0x60,0x8e,0x1);
-DEFINE_GUID(IID_IOlePresObj,0x120,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOleUndoManager00,0x97d001f2,0xceef,0x9b11,0xc9,0,0xaa,0,0x60,0x8e,0x1,0);
-DEFINE_GUID(IID_IOleUndoUnit,0x894ad3b0,0xef97,0x11ce,0x9b,0xc9,0,0xaa,0,0x60,0x8e,0x1);
-DEFINE_GUID(IID_IOleWindow,0x114,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IOverlappedCompletion,0x521a28f0,0xe40b,0x11ce,0xb2,0xc9,0,0xaa,0,0x68,0x9,0x37);
-DEFINE_GUID(IID_IOverlappedStream,0x49384070,0xe40a,0x11ce,0xb2,0xc9,0,0xaa,0,0x68,0x9,0x37);
-DEFINE_GUID(IID_IPSFactory,0x9,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IPSFactoryBuffer,0xd5f569d0,0x593b,0x101a,0xb5,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a);
-DEFINE_GUID(IID_IParseDisplayName,0x11a,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IPerPropertyBrowsing,0x376bd3aa,0x3845,0x101b,0x84,0xed,0x8,0,0x2b,0x2e,0xc7,0x13);
-DEFINE_GUID(IID_IPersist,0x10c,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IPersistFile,0x10b,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IPersistMemory,0xbd1ae5e0,0xa6ae,0x11ce,0xbd,0x37,0x50,0x42,0,0xc1,0,0);
-DEFINE_GUID(IID_IPersistMoniker,0x79eac9c9,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0x0b);
-DEFINE_GUID(IID_IPersistPropertyBag,0x37d84f60,0x42cb,0x11ce,0x81,0x35,0,0xaa,0,0x4b,0xb8,0x51);
-DEFINE_OLEGUID(IID_IPersistStorage,0x0000010a,0,0);
-DEFINE_GUID(IID_IPersistStream,0x109,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IPersistStreamInit,0x7fd52380,0x4e07,0x101b,0xae,0x2d,0x8,0,0x2b,0x2e,0xc7,0x13);
-DEFINE_GUID(IID_IPicture,0x7bf80980,0xbf32,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(IID_IPictureDisp,0x7bf80981,0xbf32,0x101a,0x8b,0xbb,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(IID_IPointerInactive,0x55980ba0,0x35aa,0x11cf,0xb6,0x71,0,0xaa,0,0x4c,0xd6,0xd8);
-DEFINE_GUID(IID_IPrint,0xb722bcc9,0x4e68,0x101b,0xa2,0xbc,0,0xaa,0,0x40,0x47,0x70);
-DEFINE_GUID(IID_IProgressNotify,0xa9d758a0,0x4617,0x11cf,0x95,0xfc,0,0xaa,0,0x68,0xd,0xb4);
-DEFINE_GUID(IID_IPropertyBag,0x55272a00,0x42cb,0x11ce,0x81,0x35,0,0xaa,0,0x4b,0xb8,0x51);
-DEFINE_GUID(IID_IPropertyFrame,0xb196b28a,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IPropertyNotifySink,0x9bfbbc02,0xeff1,0x101a,0x84,0xed,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IPropertyPage,0xb196b28d,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IPropertyPage2,0x1e44665,0x24ac,0x101b,0x84,0xed,0x8,0,0x2b,0x2e,0xc7,0x13);
-DEFINE_GUID(IID_IPropertyPageSite,0xb196b28c,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IPropertySetStorage,0x13a,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IPropertyStorage,0x138,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IProvideClassInfo,0xb196b283,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_GUID(IID_IProvideClassInfo2,0xa6bc3ac0,0xdbaa,0x11ce,0x9d,0xe3,0,0xaa,0,0x4b,0xb8,0x51);
-DEFINE_GUID(IID_IProxy,0x27,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IProxyManager,0x8,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IQuickActivate,0xcf51ed10,0x62fe,0x11cf,0xbf,0x86,0,0xa0,0xc9,0x3,0x48,0x36);
-DEFINE_GUID(IID_IROTData,0xf29f6bc0,0x5021,0x11ce,0xaa,0x15,0,0,0x69,0x1,0x29,0x3f);
-DEFINE_GUID(IID_IRichEditOle,0x20d00,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IRichEditOleCallback,0x20d03,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IRootStorage,0x12,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IRpcChannel,0x4,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IRpcChannelBuffer,0xd5f56b60,0x593b,0x101a,0xb5,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a);
-DEFINE_GUID(IID_IRpcProxy,0x7,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IRpcProxyBuffer34,0x3bd5f56a,0x1a59,0xb510,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a,0);
-DEFINE_GUID(IID_IRpcStub,0x5,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IRpcStubBuffer,0xd5f56afc,0x593b,0x101a,0xb5,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a);
-DEFINE_OLEGUID(IID_IRunnableObject,0x00000126,0,0);
-DEFINE_GUID(IID_IRunningObjectTable,0x10,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ISequentialStream,0xc733a30,0x2a1c,0x11ce,0xad,0xe5,0,0xaa,0,0x44,0x77,0x3d);
-DEFINE_GUID(IID_IServerHandler,0xf4f569d0,0x593b,0x101a,0xb5,0x69,0x8,0,0x2b,0x2d,0xbf,0x7a);
-DEFINE_GUID(IID_IServerSecurity,0x13E,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IServiceProvider,0x6d5140c1,0x7436,0x11ce,0x80,0x34,0,0xaa,0,0x60,0x9,0xfa);
-DEFINE_GUID(IID_ISimpleFrameSite,0x742b0e01,0x14e6,0x101b,0x91,0x4e,0,0xaa,0,0x30,0xc,0xab);
-DEFINE_GUID(IID_ISpecifyPropertyPages,0xb196b28b,0xbab4,0x101a,0xb6,0x9c,0,0xaa,0,0x34,0x1d,0x7);
-DEFINE_OLEGUID(IID_IStdMarshalInfo,24,0,0);
-DEFINE_GUID(IID_IStorage,0xb,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IStream,0xc,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IStub,0x26,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IStubManager,0x6,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ISupportErrorInfo,0xdf0b3d60,0x548f,0x101b,0x8e,0x65,0x8,0,0x2b,0x2b,0xd1,0x19);
-DEFINE_GUID(IID_ITargetEmbedding,0x548793c0,0x9e74,0x11cf,0x96,0x55,0,0xa0,0xc9,0x3,0x49,0x23);
-DEFINE_GUID(IID_ITargetFrame,0xd5f78c80,0x5252,0x11cf,0x90,0xfa,0,0xaa,0,0x42,0x10,0x6e);
-DEFINE_GUID(IID_ITypeChangeEvents,0x20410,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ITypeComp,0x20403,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ITypeInfo,0x20401,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ITypeInfo2,0x20412,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ITypeLib,0x20402,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_ITypeLib2,0x20411,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IUnknown,0,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IUrlHistoryStg,0x3c374a41,0xbae4,0x11cf,0xbf,0x7d,0,0xaa,0,0x69,0x46,0xee);
-DEFINE_GUID(IID_IViewObject,0x10d,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IViewObject2,0x127,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(IID_IViewObjectEx,0x3af24292,0xc96,0x11ce,0xa0,0xcf,0,0xaa,0,0x60,0xa,0xb8);
-DEFINE_GUID(IID_IWebBrowser,0xeab22ac1,0x30c1,0x11cf,0xa7,0xeb,0x0,0x0,0xc0,0x5b,0xae,0x0b);
-DEFINE_GUID(IID_IWebBrowser2,0xd30c1661,0xcdaf,0x11d0,0x8a,0x3e,0x0,0xc0,0x4f,0xc9,0xe2,0x6e);
-DEFINE_GUID(IID_IWebBrowserApp,0x2df05,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x46);
-DEFINE_GUID(IID_IWinInetHttpInfo,0x79eac9d8,0xbafa,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IWinInetInfo,0x79eac9d6,0xbafa,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IWindowForBindingUI,0x79eac9d5,0xbafa,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_StdOle,0x20430,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_ALLIMAGE,0x2de0e,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_ALLMM,0x2de18,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_ALLTEXT,0x2de1e,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_ANSITEXT,0x2de19,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_AVI,0x2de0f,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_BASICAUDIO,0x2de12,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_BIFF,0x2de21,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_BMP,0x2de01,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_CGM,0x2de0b,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_COMMONIMAGE,0x2de0d,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_DIB,0x2de02,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_DIF,0x2de1f,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_ENHMF,0x2de04,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_EPS,0x2de0c,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_GIF,0x2de05,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_HTML,0x2de1c,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_JPEG,0x2de06,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_MIDI,0x2de13,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_MPEG,0x2de10,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_PALETTE,0x2de22,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_PCX,0x2de09,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_PENDATA,0x2de23,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_PICT,0x2de0a,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_POSTSCRIPT,0x2de1d,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_QUICKTIME,0x2de11,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_RIFF,0x2de15,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_RTF,0x2de1b,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_SOUND,0x2de16,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_SYLK,0x2de20,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_TIFF,0x2de07,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_UNICODE,0x2de1a,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_VIDEO,0x2de17,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_WAV,0x2de14,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_WMF,0x2de03,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(OLE_DATAPATH_XBM,0x2de08,0,0,0xc0,0,0,0,0,0,0,0x46);
-DEFINE_GUID(SID_SContainerDispatch,0xb722be00,0x4e68,0x101b,0xa2,0xbc,0,0xaa,0,0x40,0x47,0x70);
-DEFINE_GUID(SID_SDataPathBrowser,0xfc4801a5,0x2ba9,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
diff --git a/winsup/w32api/lib/uxtheme.def b/winsup/w32api/lib/uxtheme.def
deleted file mode 100644
index 3a83beb17..000000000
--- a/winsup/w32api/lib/uxtheme.def
+++ /dev/null
@@ -1,50 +0,0 @@
-LIBRARY UxTheme.dll

-EXPORTS

-CloseThemeData@4

-DrawThemeBackground@24

-DrawThemeBackgroundEx@24

-DrawThemeEdge@32

-DrawThemeIcon@28

-DrawThemeParentBackground@12

-DrawThemeText@36

-EnableThemeDialogTexture@8

-EnableTheming@4

-GetCurrentThemeName@24

-GetThemeAppProperties@0

-GetThemeBackgroundContentRect@24

-GetThemeBackgroundExtent@24

-GetThemeBackgroundRegion@24

-GetThemeBool@20

-GetThemeColor@20

-GetThemeDocumentationProperty@16

-GetThemeEnumValue@20

-GetThemeFilename@24

-GetThemeFont@24

-GetThemeInt@20

-GetThemeIntList@20

-GetThemeMargins@28

-GetThemeMetric@24

-GetThemePartSize@28

-GetThemePosition@20

-GetThemePropertyOrigin@20

-GetThemeRect@20

-GetThemeString@24

-GetThemeSysBool@8

-GetThemeSysColor@8

-GetThemeSysColorBrush@8

-GetThemeSysFont@12

-GetThemeSysInt@12

-GetThemeSysSize@8

-GetThemeSysString@16

-GetThemeTextExtent@36

-GetThemeTextMetrics@20

-GetWindowTheme@4

-HitTestThemeBackground@40

-IsAppThemed@0

-IsThemeActive@0

-IsThemeBackgroundPartiallyTransparent@12

-IsThemeDialogTextureEnabled@4

-IsThemePartDefined@12

-OpenThemeData@8

-SetThemeAppProperties@4

-SetWindowTheme@12

diff --git a/winsup/w32api/lib/vdmdbg.def b/winsup/w32api/lib/vdmdbg.def
deleted file mode 100644
index fbd1b4fe6..000000000
--- a/winsup/w32api/lib/vdmdbg.def
+++ /dev/null
@@ -1,18 +0,0 @@
-LIBRARY VDMDBG.dll
-EXPORTS
-VDMBreakThread@8
-VDMDetectWOW@0
-VDMEnumProcessWOW@8
-VDMEnumTaskWOW@12
-VDMGetModuleSelector@20
-VDMGetPointer@20
-VDMGetSelectorModule@32
-VDMGetThreadContext@8
-VDMGetThreadSelectorEntry@16
-VDMGlobalFirst@24
-VDMGlobalNext@24
-VDMKillWOW@0
-VDMModuleFirst@20
-VDMModuleNext@20
-VDMProcessException@4
-VDMSetThreadContext@8
diff --git a/winsup/w32api/lib/version.def b/winsup/w32api/lib/version.def
deleted file mode 100644
index 35a087e5d..000000000
--- a/winsup/w32api/lib/version.def
+++ /dev/null
@@ -1,16 +0,0 @@
-LIBRARY "VERSION.dll"
-EXPORTS
-GetFileVersionInfoA@16
-GetFileVersionInfoSizeA@8
-GetFileVersionInfoSizeW@8
-GetFileVersionInfoW@16
-VerFindFileA@32
-VerFindFileW@32
-VerInstallFileA@32
-VerInstallFileW@32
-VerLanguageNameA@12
-VerLanguageNameW@12
-VerQueryValueA@16
-VerQueryValueIndexA@24
-VerQueryValueIndexW@24
-VerQueryValueW@16
diff --git a/winsup/w32api/lib/vfw32.mri b/winsup/w32api/lib/vfw32.mri
deleted file mode 100644
index ee01b1225..000000000
--- a/winsup/w32api/lib/vfw32.mri
+++ /dev/null
@@ -1,6 +0,0 @@
-CREATE libvfw32.a
-ADDLIB libmsvfw32.a
-ADDLIB libavicap32.a
-ADDLIB libavifil32.a
-SAVE
-END
diff --git a/winsup/w32api/lib/win32spl.def b/winsup/w32api/lib/win32spl.def
deleted file mode 100644
index ea00cad1c..000000000
--- a/winsup/w32api/lib/win32spl.def
+++ /dev/null
@@ -1,16 +0,0 @@
-LIBRARY WIN32SPL.DLL
-EXPORTS
-AddPortExW@16
-AddPortW@12
-ClosePort@4
-ConfigurePortW@12
-DeletePortW@12
-EndDocPort@4
-EnumPortsW@24
-InitializeMonitor@4
-InitializePrintProvidor@12
-LibMain@12
-OpenPort@8
-ReadPort@16
-StartDocPort@20
-WritePort@16
diff --git a/winsup/w32api/lib/wininet.def b/winsup/w32api/lib/wininet.def
deleted file mode 100644
index 0bcf06970..000000000
--- a/winsup/w32api/lib/wininet.def
+++ /dev/null
@@ -1,244 +0,0 @@
-; Which header declares the functions not in wininet?
-LIBRARY WININET.DLL
-EXPORTS
-CommitUrlCacheEntryA@44
-CommitUrlCacheEntryW@44
-CreateMD5SSOHash@16
-CreateUrlCacheContainerA@32
-CreateUrlCacheContainerW@32
-CreateUrlCacheEntryA@20
-CreateUrlCacheEntryW@20
-CreateUrlCacheGroup@8
-DeleteIE3Cache@16
-DeleteUrlCacheContainerA@8
-DeleteUrlCacheContainerW@8
-DeleteUrlCacheEntry@4
-DeleteUrlCacheEntryA@4
-DeleteUrlCacheEntryW@4
-DeleteUrlCacheGroup@16
-DetectAutoProxyUrl@12
-DoConnectoidsExist@0
-ExportCookieFileA@8
-ExportCookieFileW@8
-FindCloseUrlCache@4
-FindFirstUrlCacheContainerA@16
-FindFirstUrlCacheContainerW@16
-FindFirstUrlCacheEntryA@12
-FindFirstUrlCacheEntryExA@40
-FindFirstUrlCacheEntryExW@40
-FindFirstUrlCacheEntryW@12
-FindFirstUrlCacheGroup@24
-FindNextUrlCacheContainerA@12
-FindNextUrlCacheContainerW@12
-FindNextUrlCacheEntryA@12
-FindNextUrlCacheEntryExA@24
-FindNextUrlCacheEntryExW@24
-FindNextUrlCacheEntryW@12
-FindNextUrlCacheGroup@12
-FindP3PPolicySymbol@4
-ForceNexusLookup@0
-ForceNexusLookupExW@20
-FreeP3PObject@4
-FreeUrlCacheSpaceA@12
-FreeUrlCacheSpaceW@12
-FtpCommandA@24
-FtpCommandW@24
-FtpCreateDirectoryA@8
-FtpCreateDirectoryW@8
-FtpDeleteFileA@8
-FtpDeleteFileW@8
-FtpFindFirstFileA@20
-FtpFindFirstFileW@20
-FtpGetCurrentDirectoryA@12
-FtpGetCurrentDirectoryW@12
-FtpGetFileA@28
-FtpGetFileEx@28
-FtpGetFileSize@8
-FtpGetFileW@28
-FtpOpenFileA@20
-FtpOpenFileW@20
-FtpPutFileA@20
-FtpPutFileEx@20
-FtpPutFileW@20
-FtpRemoveDirectoryA@8
-FtpRemoveDirectoryW@8
-FtpRenameFileA@12
-FtpRenameFileW@12
-FtpSetCurrentDirectoryA@8
-FtpSetCurrentDirectoryW@8
-GetDiskInfoA@16
-GetP3PPolicy@16
-GetP3PRequestStatus@4
-GetUrlCacheConfigInfoA@12
-GetUrlCacheConfigInfoW@12
-GetUrlCacheEntryInfoA@12
-GetUrlCacheEntryInfoExA@28
-GetUrlCacheEntryInfoExW@28
-GetUrlCacheEntryInfoW@12
-GetUrlCacheGroupAttributeA@28
-GetUrlCacheGroupAttributeW@28
-GetUrlCacheHeaderData@8
-GopherCreateLocatorA@28
-GopherCreateLocatorW@28
-GopherFindFirstFileA@24
-GopherFindFirstFileW@24
-GopherGetAttributeA@32
-GopherGetAttributeW@32
-GopherGetLocatorTypeA@8
-GopherGetLocatorTypeW@8
-GopherOpenFileA@20
-GopherOpenFileW@20
-HttpAddRequestHeadersA@16
-HttpAddRequestHeadersW@16
-HttpCheckDavCompliance@20
-HttpCheckDavComplianceA@20
-HttpCheckDavComplianceW@20
-HttpEndRequestA@16
-HttpEndRequestW@16
-HttpOpenRequestA@32
-HttpOpenRequestW@32
-HttpQueryInfoA@20
-HttpQueryInfoW@20
-HttpSendRequestA@20
-HttpSendRequestExA@20
-HttpSendRequestExW@20
-HttpSendRequestW@20
-ImportCookieFileA@4
-ImportCookieFileW@4
-IncrementUrlCacheHeaderData@8
-InternetAlgIdToStringA@16
-InternetAlgIdToStringW@16
-InternetAttemptConnect@4
-InternetAutodial@8
-InternetAutodialCallback@8
-InternetAutodialHangup@4
-InternetCanonicalizeUrlA@16
-InternetCanonicalizeUrlW@16
-InternetCheckConnectionA@12
-InternetCheckConnectionW@12
-InternetClearAllPerSiteCookieDecisions@0
-InternetCloseHandle@4
-InternetCombineUrlA@20
-InternetCombineUrlW@20
-InternetConfirmZoneCrossing@16
-InternetConfirmZoneCrossingA@16
-InternetConfirmZoneCrossingW@16
-InternetConnectA@32
-InternetConnectW@32
-InternetCrackUrlA@16
-InternetCrackUrlW@16
-InternetCreateUrlA@16
-InternetCreateUrlW@16
-;InternetDebugGetLocalTime@8
-InternetDial@20
-InternetDialA@20
-InternetDialW@20
-InternetEnumPerSiteCookieDecisionA@16
-InternetEnumPerSiteCookieDecisionW@16
-InternetErrorDlg@20
-InternetFindNextFileA@8
-InternetFindNextFileW@8
-InternetFortezzaCommand@12
-InternetGetCertByURL@12
-InternetGetCertByURLA@12
-InternetGetConnectedState@8
-InternetGetConnectedStateEx@16
-InternetGetConnectedStateExA@16
-InternetGetConnectedStateExW@16
-InternetGetCookieA@16
-InternetGetCookieExA@24
-InternetGetCookieExW@24
-InternetGetCookieW@16
-InternetGetLastResponseInfoA@12
-InternetGetLastResponseInfoW@12
-InternetGetPerSiteCookieDecisionA@8
-InternetGetPerSiteCookieDecisionW@8
-InternetGoOnline@12
-InternetGoOnlineA@12
-InternetGoOnlineW@12
-InternetHangUp@8
-InternetInitializeAutoProxyDll@4
-InternetLockRequestFile@8
-InternetOpenA@20
-InternetOpenUrlA@24
-InternetOpenUrlW@24
-InternetOpenW@20
-InternetQueryDataAvailable@16
-InternetQueryFortezzaStatus@8
-InternetQueryOptionA@16
-InternetQueryOptionW@16
-InternetReadFile@16
-InternetReadFileExA@16
-InternetReadFileExW@16
-InternetSecurityProtocolToStringA@16
-InternetSecurityProtocolToStringW@16
-InternetSetCookieA@12
-InternetSetCookieExA@20
-InternetSetCookieExW@20
-InternetSetCookieW@12
-InternetSetDialState@12
-InternetSetDialStateA@12
-InternetSetDialStateW@12
-InternetSetFilePointer@20
-InternetSetOptionA@16
-InternetSetOptionExA@20
-InternetSetOptionExW@20
-InternetSetOptionW@16
-InternetSetPerSiteCookieDecisionA@8
-InternetSetPerSiteCookieDecisionW@8
-InternetSetStatusCallback@8
-InternetSetStatusCallbackA@8
-InternetSetStatusCallbackW@8
-InternetShowSecurityInfoByURL@8
-InternetShowSecurityInfoByURLA@8
-InternetShowSecurityInfoByURLW@8
-InternetTimeFromSystemTime@16
-InternetTimeFromSystemTimeA@16
-InternetTimeFromSystemTimeW@16
-InternetTimeToSystemTime@12
-InternetTimeToSystemTimeA@12
-InternetTimeToSystemTimeW@12
-InternetUnlockRequestFile@4
-InternetWriteFile@16
-InternetWriteFileExA@16
-InternetWriteFileExW@16
-IsDomainLegalCookieDomainA@8
-IsDomainLegalCookieDomainW@8
-IsHostInProxyBypassList@12
-IsProfilesEnabled@0
-IsUrlCacheEntryExpiredA@12
-IsUrlCacheEntryExpiredW@12
-LoadUrlCacheContent@0
-MapResourceToPolicy@16
-ParseX509EncodedCertificateForListBoxEntry@16
-PerformOperationOverUrlCacheA@40
-PrivacyGetZonePreferenceW@20
-PrivacySetZonePreferenceW@16
-ReadUrlCacheEntryStream@20
-RegisterUrlCacheNotification@24
-ResumeSuspendedDownload@8
-RetrieveUrlCacheEntryFileA@16
-RetrieveUrlCacheEntryFileW@16
-RetrieveUrlCacheEntryStreamA@20
-RetrieveUrlCacheEntryStreamW@20
-RunOnceUrlCache@16
-SetUrlCacheConfigInfoA@8
-SetUrlCacheConfigInfoW@8
-SetUrlCacheEntryGroup@28
-SetUrlCacheEntryGroupA@28
-SetUrlCacheEntryGroupW@28
-SetUrlCacheEntryInfoA@12
-SetUrlCacheEntryInfoW@12
-SetUrlCacheGroupAttributeA@24
-SetUrlCacheGroupAttributeW@24
-SetUrlCacheHeaderData@8
-ShowCertificate@8
-ShowClientAuthCerts@4
-ShowSecurityInfo@8
-ShowX509EncodedCertificate@12
-UnlockUrlCacheEntryFile@8
-UnlockUrlCacheEntryFileA@8
-UnlockUrlCacheEntryFileW@8
-UnlockUrlCacheEntryStream@8
-UpdateUrlCacheContentPath@4
-UrlZonesDetach@0
diff --git a/winsup/w32api/lib/winmm.def b/winsup/w32api/lib/winmm.def
deleted file mode 100644
index 4de3638e5..000000000
--- a/winsup/w32api/lib/winmm.def
+++ /dev/null
@@ -1,196 +0,0 @@
-LIBRARY WINMM.DLL
-EXPORTS
-CloseDriver@12
-DefDriverProc@20
-DriverCallback@28
-DrvGetModuleHandle@4
-GetDriverModuleHandle@4
-NotifyCallbackData@20
-OpenDriver@12
-PlaySound@12
-PlaySoundA@12
-PlaySoundW@12
-SendDriverMessage@16
-WOW32DriverCallback@28
-WOW32ResolveMultiMediaHandle@24
-WOWAppExit@4
-aux32Message@20
-auxGetDevCapsA@12
-auxGetDevCapsW@12
-auxGetNumDevs@0
-auxGetVolume@8
-auxOutMessage@16
-auxSetVolume@8
-joy32Message@20
-joyConfigChanged@4
-joyGetDevCapsA@12
-joyGetDevCapsW@12
-joyGetNumDevs@0
-joyGetPos@8
-joyGetPosEx@8
-joyGetThreshold@8
-joyReleaseCapture@4
-joySetCapture@16
-joySetThreshold@8
-mci32Message@20
-mciDriverNotify@12
-mciDriverYield@4
-mciExecute@4
-mciFreeCommandResource@4
-mciGetCreatorTask@4
-mciGetDeviceIDA@4
-mciGetDeviceIDFromElementIDA@8
-mciGetDeviceIDFromElementIDW@8
-mciGetDeviceIDW@4
-mciGetDriverData@4
-mciGetErrorStringA@12
-mciGetErrorStringW@12
-mciGetYieldProc@8
-mciLoadCommandResource@12
-mciSendCommandA@16
-mciSendCommandW@16
-mciSendStringA@16
-mciSendStringW@16
-mciSetDriverData@8
-mciSetYieldProc@12
-mid32Message@20
-midiConnect@12
-midiDisconnect@12
-midiInAddBuffer@12
-midiInClose@4
-midiInGetDevCapsA@12
-midiInGetDevCapsW@12
-midiInGetErrorTextA@12
-midiInGetErrorTextW@12
-midiInGetID@8
-midiInGetNumDevs@0
-midiInMessage@16
-midiInOpen@20
-midiInPrepareHeader@12
-midiInReset@4
-midiInStart@4
-midiInStop@4
-midiInUnprepareHeader@12
-midiOutCacheDrumPatches@16
-midiOutCachePatches@16
-midiOutClose@4
-midiOutGetDevCapsA@12
-midiOutGetDevCapsW@12
-midiOutGetErrorTextA@12
-midiOutGetErrorTextW@12
-midiOutGetID@8
-midiOutGetNumDevs@0
-midiOutGetVolume@8
-midiOutLongMsg@12
-midiOutMessage@16
-midiOutOpen@20
-midiOutPrepareHeader@12
-midiOutReset@4
-midiOutSetVolume@8
-midiOutShortMsg@8
-midiOutUnprepareHeader@12
-midiStreamClose@4
-midiStreamOpen@24
-midiStreamOut@12
-midiStreamPause@4
-midiStreamPosition@12
-midiStreamProperty@12
-midiStreamRestart@4
-midiStreamStop@4
-mixerClose@4
-mixerGetControlDetailsA@12
-mixerGetControlDetailsW@12
-mixerGetDevCapsA@12
-mixerGetDevCapsW@12
-mixerGetID@12
-mixerGetLineControlsA@12
-mixerGetLineControlsW@12
-mixerGetLineInfoA@12
-mixerGetLineInfoW@12
-mixerGetNumDevs@0
-mixerMessage@16
-mixerOpen@20
-mixerSetControlDetails@12
-mmDrvInstall@12
-mmGetCurrentTask@0
-mmTaskBlock@4
-mmTaskCreate@12
-mmTaskSignal@4
-mmTaskYield@0
-mmioAdvance@12
-mmioAscend@12
-mmioClose@8
-mmioCreateChunk@12
-mmioDescend@16
-mmioFlush@8
-mmioGetInfo@12
-mmioInstallIOProcA@12
-mmioInstallIOProcW@12
-mmioOpenA@12
-mmioOpenW@12
-mmioRead@12
-mmioRenameA@16
-mmioRenameW@16
-mmioSeek@12
-mmioSendMessage@16
-mmioSetBuffer@16
-mmioSetInfo@12
-mmioStringToFOURCCA@8
-mmioStringToFOURCCW@8
-mmioWrite@12
-mmsystemGetVersion@0
-mod32Message@20
-mxd32Message@20
-sndPlaySoundA@8
-sndPlaySoundW@8
-tid32Message@20
-timeBeginPeriod@4
-timeEndPeriod@4
-timeGetDevCaps@8
-timeGetSystemTime@8
-timeGetTime@0
-timeKillEvent@4
-timeSetEvent@20
-waveInAddBuffer@12
-waveInClose@4
-waveInGetDevCapsA@12
-waveInGetDevCapsW@12
-waveInGetErrorTextA@12
-waveInGetErrorTextW@12
-waveInGetID@8
-waveInGetNumDevs@0
-waveInGetPosition@12
-waveInMessage@16
-waveInOpen@24
-waveInPrepareHeader@12
-waveInReset@4
-waveInStart@4
-waveInStop@4
-waveInUnprepareHeader@12
-waveOutBreakLoop@4
-waveOutClose@4
-waveOutGetDevCapsA@12
-waveOutGetDevCapsW@12
-waveOutGetErrorTextA@12
-waveOutGetErrorTextW@12
-waveOutGetID@8
-waveOutGetNumDevs@0
-waveOutGetPitch@8
-waveOutGetPlaybackRate@8
-waveOutGetPosition@12
-waveOutGetVolume@8
-waveOutMessage@16
-waveOutOpen@24
-waveOutPause@4
-waveOutPrepareHeader@12
-waveOutReset@4
-waveOutRestart@4
-waveOutSetPitch@8
-waveOutSetPlaybackRate@8
-waveOutSetVolume@8
-waveOutUnprepareHeader@12
-waveOutWrite@12
-wid32Message@20
-winmmDbgOut
-winmmSetDebugLevel@4
-wod32Message@20
diff --git a/winsup/w32api/lib/winspool.def b/winsup/w32api/lib/winspool.def
deleted file mode 100644
index b6375b174..000000000
--- a/winsup/w32api/lib/winspool.def
+++ /dev/null
@@ -1,133 +0,0 @@
-LIBRARY WINSPOOL.DRV
-EXPORTS
-ADVANCEDSETUPDIALOG@16
-AbortPrinter@4
-AddFormA@12
-AddFormW@12
-AddJobA@20
-AddJobW@20
-AddMonitorA@12
-AddMonitorW@12
-AddPortA@12
-AddPortExA@16
-AddPortExW@16
-AddPortW@12
-AddPrintProcessorA@16
-AddPrintProcessorW@16
-AddPrintProvidorA@12
-AddPrintProvidorW@12
-AddPrinterA@12
-AddPrinterConnectionA@4
-AddPrinterConnectionW@4
-AddPrinterDriverA@12
-AddPrinterDriverW@12
-AddPrinterW@12
-AdvancedDocumentPropertiesA@20
-AdvancedDocumentPropertiesW@20
-AdvancedSetupDialog@16
-ClosePrinter@4
-ConfigurePortA@12
-ConfigurePortW@12
-ConnectToPrinterDlg@8
-CreatePrinterIC@8
-DEVICECAPABILITIES@20
-DEVICEMODE@16
-DeleteFormA@8
-DeleteFormW@8
-DeleteMonitorA@12
-DeleteMonitorW@12
-DeletePortA@12
-DeletePortW@12
-DeletePrinterDataA@8
-DeletePrinterDataW@8
-DeletePrintProcessorA@12
-DeletePrintProcessorW@12
-DeletePrintProvidorA@12
-DeletePrintProvidorW@12
-DeletePrinter@4
-DeletePrinterConnectionA@4
-DeletePrinterConnectionW@4
-DeletePrinterDriverA@12
-DeletePrinterDriverW@12
-DeletePrinterIC@4
-DevQueryPrint@12
-DeviceCapabilities@20
-DeviceCapabilitiesA@20
-DeviceCapabilitiesW@20
-DeviceMode@16
-DocumentEvent@28
-DocumentPropertiesA@24
-DocumentPropertiesW@24
-EXTDEVICEMODE@32
-EndDocPrinter@4
-EndPagePrinter@4
-EnumFormsA@24
-EnumFormsW@24
-EnumJobsA@32
-EnumJobsW@32
-EnumMonitorsA@24
-EnumMonitorsW@24
-EnumPortsA@24
-EnumPortsW@24
-EnumPrintProcessorDatatypesA@28
-EnumPrintProcessorDatatypesW@28
-EnumPrintProcessorsA@28
-EnumPrintProcessorsW@28
-EnumPrinterDriversA@28
-EnumPrinterDriversW@28
-EnumPrinterPropertySheets@16
-EnumPrintersA@28
-EnumPrintersW@28
-EnumPrinterDataA@36
-EnumPrinterDataW@36
-ExtDeviceMode@32
-FindClosePrinterChangeNotification@4
-FindFirstPrinterChangeNotification@16
-FindNextPrinterChangeNotification@16
-FreePrinterNotifyInfo@4
-GetDefaultPrinterA@8
-GetDefaultPrinterW@8
-GetFormA@24
-GetFormW@24
-GetJobA@24
-GetJobW@24
-GetPrintProcessorDirectoryA@24
-GetPrintProcessorDirectoryW@24
-GetPrinterA@20
-GetPrinterDataA@24
-GetPrinterDataW@24
-GetPrinterDriverA@24
-GetPrinterDriverDirectoryA@24
-GetPrinterDriverDirectoryW@24
-GetPrinterDriverW@24
-GetPrinterW@20
-InitializeDll@12
-OpenPrinterA@12
-OpenPrinterW@12
-PlayGdiScriptOnPrinterIC@24
-PrinterMessageBoxA@24
-PrinterMessageBoxW@24
-PrinterProperties@8
-ReadPrinter@16
-ResetPrinterA@8
-ResetPrinterW@8
-ScheduleJob@8
-SetAllocFailCount@20
-SetFormA@16
-SetFormW@16
-SetJobA@20
-SetJobW@20
-SetPort@16
-SetPrinterA@16
-SetPrinterDataA@20
-SetPrinterDataW@20
-SetPrinterW@16
-SpoolerDevQueryPrintW@20
-SpoolerInit@0
-StartDocDlgA@8
-StartDocDlgW@8
-StartDocPrinterA@12
-StartDocPrinterW@12
-StartPagePrinter@4
-WaitForPrinterChange@8
-WritePrinter@16
diff --git a/winsup/w32api/lib/winstrm.def b/winsup/w32api/lib/winstrm.def
deleted file mode 100644
index 27531a0b9..000000000
--- a/winsup/w32api/lib/winstrm.def
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBRARY WINSTRM.DLL
-EXPORTS
-OpenStream@4
-getmsg@16
-poll@12
-putmsg@16
-s_ioctl@12
-s_open@12
-s_perror@8
diff --git a/winsup/w32api/lib/wldap32.def b/winsup/w32api/lib/wldap32.def
deleted file mode 100644
index 3c8889d54..000000000
--- a/winsup/w32api/lib/wldap32.def
+++ /dev/null
@@ -1,257 +0,0 @@
-;

-;	wldap32.def - Import definition file for the Windows LDAP API

-; 

-;	Written by Filip Navara <xnavara@volny.cz>

-;

-;	This library is distributed in the hope that it will be useful,

-;	but WITHOUT ANY WARRANTY; without even the implied warranty of

-;	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-;

-

-LIBRARY wldap32.dll

-EXPORTS

-  ldap_abandon

-  ldap_add

-  ldap_get_optionW

-  ldap_unbind

-  ldap_set_optionW

-  LdapGetLastError

-  cldap_open

-  LdapMapErrorToWin32

-  ldap_compare

-  ldap_delete

-  ldap_result2error

-  ldap_err2string

-  ldap_modify

-  ldap_modrdn

-  ldap_open

-  ldap_first_entry

-  ldap_next_entry

-  cldap_openW

-  LdapUTF8ToUnicode

-  ldap_get_dn

-  ldap_dn2ufn

-  ldap_first_attribute

-  ldap_next_attribute

-  ldap_get_values

-  ldap_get_values_len

-  ldap_count_entries

-  ldap_count_values

-  ldap_value_free

-  ldap_explode_dn

-  ldap_result

-  ldap_msgfree

-  ldap_addW

-  ldap_search

-  ldap_add_s

-  ldap_bind_s

-  ldap_unbind_s

-  ldap_delete_s

-  ldap_modify_s

-  ldap_modrdn_s

-  ldap_search_s

-  ldap_search_st

-  ldap_compare_s

-  LdapUnicodeToUTF8

-  ber_bvfree

-  cldap_openA

-  ldap_addA

-  ldap_add_ext

-  ldap_add_extA

-  ldap_simple_bind

-  ldap_simple_bind_s

-  ldap_bind

-  ldap_add_extW

-  ldap_add_ext_s

-  ldap_add_ext_sA

-  ldap_add_ext_sW

-  ldap_add_sA

-  ldap_modrdn2

-  ldap_modrdn2_s

-  ldap_add_sW

-  ldap_bindA

-  ldap_bindW

-  ldap_bind_sA

-  ldap_bind_sW

-  ldap_close_extended_op

-  ldap_compareA

-  ldap_compareW

-  ldap_count_values_len

-  ldap_compare_ext

-  ldap_value_free_len

-  ldap_compare_extA

-  ldap_compare_extW

-  ldap_perror

-  ldap_compare_ext_s

-  ldap_compare_ext_sA

-  ldap_compare_ext_sW

-  ldap_compare_sA

-  ldap_compare_sW

-  ldap_connect

-  ldap_control_free

-  ldap_control_freeA

-  ldap_control_freeW

-  ldap_controls_free

-  ldap_controls_freeA

-  ldap_controls_freeW

-  ldap_count_references

-  ldap_count_valuesA

-  ldap_count_valuesW

-  ldap_create_page_control

-  ldap_create_page_controlA

-  ldap_create_page_controlW

-  ldap_create_sort_control

-  ldap_create_sort_controlA

-  ldap_create_sort_controlW

-  ldap_deleteA

-  ldap_deleteW

-  ldap_delete_ext

-  ldap_delete_extA

-  ldap_delete_extW

-  ldap_delete_ext_s

-  ldap_delete_ext_sA

-  ldap_delete_ext_sW

-  ldap_delete_sA

-  ldap_delete_sW

-  ldap_dn2ufnW

-  ldap_encode_sort_controlA

-  ldap_encode_sort_controlW

-  ldap_err2stringA

-  ldap_err2stringW

-  ldap_escape_filter_elementA

-  ldap_escape_filter_elementW

-  ldap_explode_dnA

-  ldap_explode_dnW

-  ldap_extended_operation

-  ldap_extended_operationA

-  ldap_extended_operationW

-  ldap_first_attributeA

-  ldap_first_attributeW

-  ldap_first_reference

-  ldap_free_controls

-  ldap_free_controlsA

-  ldap_free_controlsW

-  ldap_get_dnA

-  ldap_get_dnW

-  ldap_get_next_page

-  ldap_get_next_page_s

-  ldap_get_option

-  ldap_get_optionA

-  ldap_get_paged_count

-  ldap_get_valuesA

-  ldap_get_valuesW

-  ldap_get_values_lenA

-  ldap_get_values_lenW

-  ldap_init

-  ldap_initA

-  ldap_initW

-  ldap_memfreeA

-  ldap_memfreeW

-  ldap_modifyA

-  ldap_modifyW

-  ldap_modify_ext

-  ldap_modify_extA

-  ldap_modify_extW

-  ldap_modify_ext_s

-  ldap_modify_ext_sA

-  ldap_modify_ext_sW

-  ldap_modify_sA

-  ldap_modify_sW

-  ldap_modrdn2A

-  ldap_modrdn2W

-  ldap_modrdn2_sA

-  ldap_modrdn2_sW

-  ldap_modrdnA

-  ldap_modrdnW

-  ldap_modrdn_sA

-  ldap_modrdn_sW

-  ldap_next_attributeA

-  ldap_next_attributeW

-  ldap_next_reference

-  ldap_openA

-  ldap_openW

-  ldap_parse_page_control

-  ldap_parse_page_controlA

-  ldap_parse_page_controlW

-  ldap_parse_reference

-  ldap_parse_referenceA

-  ldap_parse_referenceW

-  ldap_parse_result

-  ldap_parse_resultA

-  ldap_parse_resultW

-  ldap_parse_sort_control

-  ldap_parse_sort_controlA

-  ldap_parse_sort_controlW

-  ldap_rename_ext

-  ldap_rename_extA

-  ldap_rename_extW

-  ldap_rename_ext_s

-  ldap_rename_ext_sA

-  ldap_rename_ext_sW

-  ldap_searchA

-  ldap_searchW

-  ldap_search_abandon_page

-  ldap_search_ext

-  ldap_search_extA

-  ldap_search_extW

-  ldap_search_ext_s

-  ldap_search_ext_sA

-  ldap_escape_filter_element

-  ldap_set_dbg_flags

-  ldap_set_dbg_routine

-  ldap_memfree

-  ldap_startup

-  ldap_cleanup

-  ldap_search_ext_sW

-  ldap_search_init_page

-  ldap_search_init_pageA

-  ldap_search_init_pageW

-  ldap_search_sA

-  ldap_search_sW

-  ldap_search_stA

-  ldap_search_stW

-  ldap_set_option

-  ldap_set_optionA

-  ldap_simple_bindA

-  ldap_simple_bindW

-  ldap_simple_bind_sA

-  ldap_simple_bind_sW

-  ldap_sslinit

-  ldap_sslinitA

-  ldap_sslinitW

-  ldap_ufn2dn

-  ldap_ufn2dnA

-  ldap_ufn2dnW

-  ldap_value_freeA

-  ldap_value_freeW

-  ldap_check_filterA

-  ldap_check_filterW

-  ldap_dn2ufnA

-  ber_init

-  ber_free

-  ber_bvecfree

-  ber_bvdup

-  ber_alloc_t

-  ber_skip_tag

-  ber_peek_tag

-  ber_first_element

-  ber_next_element

-  ber_flatten

-  ber_printf

-  ber_scanf

-  ldap_conn_from_msg

-  ldap_sasl_bindW

-  ldap_sasl_bind_sW

-  ldap_sasl_bindA

-  ldap_sasl_bind_sA

-  ldap_parse_extended_resultW

-  ldap_parse_extended_resultA

-  ldap_create_vlv_controlW

-  ldap_create_vlv_controlA

-  ldap_parse_vlv_controlW

-  ldap_parse_vlv_controlA

-  ldap_start_tls_sW

-  ldap_start_tls_sA

-  ldap_stop_tls_s

-  ldap_extended_operation_sW

-  ldap_extended_operation_sA

diff --git a/winsup/w32api/lib/wow32.def b/winsup/w32api/lib/wow32.def
deleted file mode 100644
index cd814c633..000000000
--- a/winsup/w32api/lib/wow32.def
+++ /dev/null
@@ -1,19 +0,0 @@
-LIBRARY WOW32.DLL
-EXPORTS
-WOWCallback16@8
-WOWCallback16Ex@20
-WOWDirectedYield16@4
-WOWGetDescriptor@8
-WOWGetVDMPointer@12
-WOWGetVDMPointerFix@12
-WOWGetVDMPointerUnfix@4
-WOWGlobalAlloc16@8
-WOWGlobalAllocLock16@12
-WOWGlobalFree16@4
-WOWGlobalLock16@4
-WOWGlobalLockSize16@8
-WOWGlobalUnlock16@4
-WOWGlobalUnlockFree16@4
-WOWHandle16@8
-WOWHandle32@8
-WOWYield16@0
diff --git a/winsup/w32api/lib/ws2_32.def b/winsup/w32api/lib/ws2_32.def
deleted file mode 100644
index 2146d83bf..000000000
--- a/winsup/w32api/lib/ws2_32.def
+++ /dev/null
@@ -1,111 +0,0 @@
-LIBRARY WS2_32.DLL
-EXPORTS
-WEP@0
-WPUCompleteOverlappedRequest@20
-WSAAccept@20
-WSAAddressToStringA@20
-WSAAddressToStringW@20
-WSAAsyncGetHostByAddr@28
-WSAAsyncGetHostByName@20
-WSAAsyncGetProtoByName@20
-WSAAsyncGetProtoByNumber@20
-WSAAsyncGetServByName@24
-WSAAsyncGetServByPort@24
-WSAAsyncSelect@16
-WSACancelAsyncRequest@4
-WSACancelBlockingCall@0
-WSACleanup@0
-WSACloseEvent@4
-WSAConnect@28
-WSACreateEvent@0
-WSADuplicateSocketA@12
-WSADuplicateSocketW@12
-WSAEnumNameSpaceProvidersA@8
-WSAEnumNameSpaceProvidersW@8
-WSAEnumNetworkEvents@12
-WSAEnumProtocolsA@12
-WSAEnumProtocolsW@12
-WSAEventSelect@12
-WSAGetLastError@0
-WSAGetOverlappedResult@20
-WSAGetQOSByName@12
-WSAGetServiceClassInfoA@16
-WSAGetServiceClassInfoW@16
-WSAGetServiceClassNameByClassIdA@12
-WSAGetServiceClassNameByClassIdW@12
-WSAHtonl@12
-WSAHtons@12
-WSAInstallServiceClassA@4
-WSAInstallServiceClassW@4
-WSAIoctl@36
-WSAIsBlocking@0
-WSAJoinLeaf@32
-WSALookupServiceBeginA@12
-WSALookupServiceBeginW@12
-WSALookupServiceEnd@4
-WSALookupServiceNextA@16
-WSALookupServiceNextW@16
-WSANtohl@12
-WSANtohs@12
-WSAProviderConfigChange@12
-WSARecv@28
-WSARecvDisconnect@8
-WSARecvFrom@36
-WSARemoveServiceClass@4
-WSAResetEvent@4
-WSASend@28
-WSASendDisconnect@8
-WSASendTo@36
-WSASetBlockingHook@4
-WSASetEvent@4
-WSASetLastError@4
-WSASetServiceA@12
-WSASetServiceW@12
-WSASocketA@24
-WSASocketW@24
-WSAStartup@8
-WSAStringToAddressA@20
-WSAStringToAddressW@20
-WSAUnhookBlockingHook@0
-WSAWaitForMultipleEvents@20
-WSCDeinstallProvider@8
-WSCEnableNSProvider@8
-WSCEnumProtocols@16
-WSCGetProviderPath@16
-WSCInstallNameSpace@20
-WSCInstallProvider@20
-WSCUnInstallNameSpace@4
-__WSAFDIsSet@8
-accept@12
-bind@12
-closesocket@4
-connect@12
-freeaddrinfo@4
-getaddrinfo@16
-gethostbyaddr@12
-gethostbyname@4
-gethostname@8
-getnameinfo@28
-getpeername@12
-getprotobyname@4
-getprotobynumber@4
-getservbyname@8
-getservbyport@8
-getsockname@12
-getsockopt@20
-htonl@4
-htons@4
-inet_addr@4
-inet_ntoa@4
-ioctlsocket@12
-listen@8
-ntohl@4
-ntohs@4
-recv@16
-recvfrom@24
-select@20
-send@16
-sendto@24
-setsockopt@20
-shutdown@8
-socket@12
diff --git a/winsup/w32api/lib/wsnmp32.def b/winsup/w32api/lib/wsnmp32.def
deleted file mode 100644
index d209d8945..000000000
--- a/winsup/w32api/lib/wsnmp32.def
+++ /dev/null
@@ -1,48 +0,0 @@
-LIBRARY wsnmp32.dll
-EXPORTS
-SnmpCancelMsg@8
-SnmpCleanup@0
-SnmpClose@4
-SnmpContextToStr@8
-SnmpCountVbl@4
-SnmpCreatePdu@24
-SnmpCreateSession@16
-SnmpCreateVbl@12
-SnmpDecodeMsg@24
-SnmpDeleteVb@8
-SnmpDuplicatePdu@8
-SnmpDuplicateVbl@8
-SnmpEncodeMsg@24
-SnmpEntityToStr@12
-SnmpFreeContext@4
-SnmpFreeDescriptor@8
-SnmpFreeEntity@4
-SnmpFreePdu@4
-SnmpFreeVbl@4
-SnmpGetLastError@4
-SnmpGetPduData@24
-SnmpGetRetransmitMode@4
-SnmpGetRetry@12
-SnmpGetTimeout@12
-SnmpGetTranslateMode@4
-SnmpGetVb@16
-SnmpGetVendorInfo@4
-SnmpListen@8
-SnmpOidCompare@16
-SnmpOidCopy@8
-SnmpOidToStr@12
-SnmpOpen@8
-SnmpRecvMsg@20
-SnmpRegister@24
-SnmpSendMsg@20
-SnmpSetPduData@24
-SnmpSetPort@8
-SnmpSetRetransmitMode@4
-SnmpSetRetry@8
-SnmpSetTimeout@8
-SnmpSetTranslateMode@4
-SnmpSetVb@16
-SnmpStartup@20
-SnmpStrToContext@8
-SnmpStrToEntity@8
-SnmpStrToOid@8
diff --git a/winsup/w32api/lib/wsock32.def b/winsup/w32api/lib/wsock32.def
deleted file mode 100644
index 67a8a750f..000000000
--- a/winsup/w32api/lib/wsock32.def
+++ /dev/null
@@ -1,75 +0,0 @@
-LIBRARY WSOCK32.DLL
-EXPORTS
-AcceptEx@32
-EnumProtocolsA@12
-EnumProtocolsW@12
-GetAcceptExSockaddrs@32
-GetAddressByNameA@40
-GetAddressByNameW@40
-GetNameByTypeA@12
-GetNameByTypeW@12
-GetServiceA@28
-GetServiceW@28
-GetTypeByNameA@8
-GetTypeByNameW@8
-NPLoadNameSpaces@12
-SetServiceA@24
-SetServiceW@24
-TransmitFile@28
-WSAAsyncGetHostByAddr@28
-WSAAsyncGetHostByName@20
-WSAAsyncGetProtoByName@20
-WSAAsyncGetProtoByNumber@20
-WSAAsyncGetServByName@24
-WSAAsyncGetServByPort@24
-WSAAsyncSelect@16
-WSACancelAsyncRequest@4
-WSACancelBlockingCall@0
-WSACleanup@0
-WSAGetLastError@0
-WSAIsBlocking@0
-WSARecvEx@16
-WSASetBlockingHook@4
-WSASetLastError@4
-WSAStartup@8
-WSAUnhookBlockingHook@0
-WSApSetPostRoutine@4
-__WSAFDIsSet@8
-accept@12
-bind@12
-closesocket@4
-connect@12
-dn_expand@20
-gethostbyaddr@12
-gethostbyname@4
-gethostname@8
-getnetbyname@4
-getpeername@12
-getprotobyname@4
-getprotobynumber@4
-getservbyname@8
-getservbyport@8
-getsockname@12
-getsockopt@20
-htonl@4
-htons@4
-inet_addr@4
-inet_network@4
-inet_ntoa@4
-ioctlsocket@12
-listen@8
-ntohl@4
-ntohs@4
-rcmd@24
-recv@16
-recvfrom@24
-rexec@24
-rresvport@4
-s_perror@8
-select@20
-send@16
-sendto@24
-sethostname@8
-setsockopt@20
-shutdown@8
-socket@12
diff --git a/winsup/w32api/lib/wst.def b/winsup/w32api/lib/wst.def
deleted file mode 100644
index e80170ada..000000000
--- a/winsup/w32api/lib/wst.def
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBRARY WST.DLL
-EXPORTS
-_penter